From 971f0b45ef7129073a6e996f1c63a1f2b470a7e0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <michael@primeos.dev>
Date: Sat, 10 Oct 2020 11:30:47 +0000
Subject: [PATCH 001/956] nixos/networking: Add a read-only option for the FQDN

This is a convenience option that can be used to quickly obtain the
configured FQDN.
---
 nixos/modules/tasks/network-interfaces.nix | 18 ++++++++++++++++++
 nixos/tests/hostname.nix                   | 14 ++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index d369aab5457..63a704e31f4 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -394,6 +394,24 @@ in
       '';
     };
 
+    networking.fqdn = mkOption {
+      readOnly = true;
+      type = types.str;
+      default = if (cfg.hostName != "" && cfg.domain != null)
+        then "${cfg.hostName}.${cfg.domain}"
+        else throw ''
+          The FQDN is required but cannot be determined. Please make sure that
+          both networking.hostName and networking.domain are set properly.
+        '';
+      defaultText = literalExample ''''${networking.hostName}.''${networking.domain}'';
+      description = ''
+        The fully qualified domain name (FQDN) of this host. It is the result
+        of combining networking.hostName and networking.domain. Using this
+        option will result in an evaluation error if the hostname is empty or
+        no domain is specified.
+      '';
+    };
+
     networking.hostId = mkOption {
       default = null;
       example = "4e98920d";
diff --git a/nixos/tests/hostname.nix b/nixos/tests/hostname.nix
index 3b87303d73e..8a77afc2173 100644
--- a/nixos/tests/hostname.nix
+++ b/nixos/tests/hostname.nix
@@ -7,9 +7,12 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
 with pkgs.lib;
 
 let
-  makeHostNameTest = hostName: domain:
+  makeHostNameTest = hostName: domain: fqdnOrNull:
     let
       fqdn = hostName + (optionalString (domain != null) ".${domain}");
+      getStr = str: # maybeString2String
+        let res = builtins.tryEval str;
+        in if (res.success && res.value != null) then res.value else "null";
     in
       makeTest {
         name = "hostname-${fqdn}";
@@ -26,13 +29,16 @@ let
           ];
         };
 
-        testScript = ''
+        testScript = { nodes, ... }: ''
           start_all()
 
           machine = ${hostName}
 
           machine.wait_for_unit("network-online.target")
 
+          # Test if NixOS computes the correct FQDN (either a FQDN or an error/null):
+          assert "${getStr nodes.machine.config.networking.fqdn}" == "${getStr fqdnOrNull}"
+
           # The FQDN, domain name, and hostname detection should work as expected:
           assert "${fqdn}" == machine.succeed("hostname --fqdn").strip()
           assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip()
@@ -60,7 +66,7 @@ let
 
 in
 {
-  noExplicitDomain = makeHostNameTest "ahost" null;
+  noExplicitDomain = makeHostNameTest "ahost" null null;
 
-  explicitDomain = makeHostNameTest "ahost" "adomain";
+  explicitDomain = makeHostNameTest "ahost" "adomain" "ahost.adomain";
 }

From 6217cc92b513b5c66f1dbe38d9b8d2d6835ecbe6 Mon Sep 17 00:00:00 2001
From: Steven Pease <peasteven@gmail.com>
Date: Thu, 15 Oct 2020 23:17:55 -0700
Subject: [PATCH 002/956] Add newer xcode versions

---
 lib/systems/examples.nix                  | 16 ++++++++--------
 pkgs/os-specific/darwin/xcode/default.nix | 11 ++++++++++-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 87c05a0b052..5a31b8d91e4 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -179,8 +179,8 @@ rec {
   iphone64 = {
     config = "aarch64-apple-ios";
     # config = "aarch64-apple-darwin14";
-    sdkVer = "13.2";
-    xcodeVer = "11.3.1";
+    sdkVer = "14.0";
+    xcodeVer = "12.0.1";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
     platform = {};
@@ -189,8 +189,8 @@ rec {
   iphone32 = {
     config = "armv7a-apple-ios";
     # config = "arm-apple-darwin10";
-    sdkVer = "13.2";
-    xcodeVer = "11.3.1";
+    sdkVer = "14.0";
+    xcodeVer = "12.0.1";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
     platform = {};
@@ -199,8 +199,8 @@ rec {
   iphone64-simulator = {
     config = "x86_64-apple-ios";
     # config = "x86_64-apple-darwin14";
-    sdkVer = "13.2";
-    xcodeVer = "11.3.1";
+    sdkVer = "14.0";
+    xcodeVer = "12.0.1";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
     platform = {};
@@ -209,8 +209,8 @@ rec {
   iphone32-simulator = {
     config = "i686-apple-ios";
     # config = "i386-apple-darwin11";
-    sdkVer = "13.2";
-    xcodeVer = "11.3.1";
+    sdkVer = "14.0";
+    xcodeVer = "12.0.1";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
     platform = {};
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 34e3b2dfeea..7bb004958d5 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -53,6 +53,15 @@ in lib.makeExtensible (self: {
   xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg";
   xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb";
   xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh";
+  xcode_11_1 = requireXcode "11.1" "1c2gzc4jhhx5a7ncg19sh1r99izhipybaqxl1ll52x5y8689awc1";
+  xcode_11_2 = requireXcode "11.2" "1lm3q8zpvm184246h5j9mw4c1y9kk9sxnr3j98kfm0312n0l98gj";
+  xcode_11_3 = requireXcode "11.3" "04rv6xlywy8xqfx9ma8ygsdw4yhckk2mq0qnklxnfly899iw4wza";
   xcode_11_3_1 = requireXcode "11.3.1" "1p6nicj91kr6ad3rmycahd1i7z4hj7ccjs93ixsiximjzaahx3q4";
-  xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "11.3.1")}";
+  xcode_11_4 = requireXcode "11.4" "065rpb3rdk19nv3rwyf9bk32ccbd0lld12gj12l89cyg65mhpyy7";
+  xcode_11_5 = requireXcode "11.5" "1dizazq9nz1vjkc5gy7dd4x760mkfjiifk1hf6d9mscchdq8rfkw";
+  xcode_11_6 = requireXcode "11.6" "1y4fhw1kiphzxdb4wpv697z5r0algvaldwq5iqv266797rnfql4x";
+  xcode_11_7 = requireXcode "11.7" "0422rdc4j5qwyk59anbybxyfv0p26x0xryszm0wd8i44g66smlmj";
+  xcode_12 = requireXcode "12" "1w3xm268pyn5m04wv22invd5kr2k4jqllgrzapv6n1sxxynxrh8z";
+  xcode_12_0_1 = requireXcode "12.0.1" "1p6vd5ai0hh3cq6aflh4h21ar0shxnz8wlkaxwq7liwsdmkwzbl0";
+  xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.0.1")}";
 })

From ec61ccd52559e5c8f5bd04ddd7421bb864f16df2 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Tue, 6 Oct 2020 20:48:06 +0200
Subject: [PATCH 003/956] shattered-pixel-dungeon: 0.8.2d -> 0.9.0b

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

diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index f3808102bd1..50aca1671f9 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -10,13 +10,13 @@
 
 let
   pname = "shattered-pixel-dungeon";
-  version = "0.8.2d";
+  version = "0.9.0b";
 
   src = fetchFromGitHub {
     owner = "00-Evan";
     repo = "shattered-pixel-dungeon";
     rev = "v${version}";
-    sha256 = "11lgalam1aacw01ar7nawiim4pbxqzrdrnxvj6wq9mg83hgsz65l";
+    sha256 = "1cjrs1k2wkhaby8qprx2m9nhlcmnbrjlalsaj9vwgq1s7szzl2w4";
   };
 
   postPatch = ''

From 11da668a9fe547896f201e7c94ee53f3f26e911e Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 27 Nov 2019 19:01:05 +0200
Subject: [PATCH 004/956] pythonPackages.testing-common-database: init at 2.0.3

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

diff --git a/pkgs/development/python-modules/testing-common-database/default.nix b/pkgs/development/python-modules/testing-common-database/default.nix
new file mode 100644
index 00000000000..1d50ed1ec49
--- /dev/null
+++ b/pkgs/development/python-modules/testing-common-database/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi  }:
+
+buildPythonPackage rec {
+  pname = "testing.common.database";
+  version = "2.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wvdv0frl7xib05sixjv9m6jywaa2wdhdhsqqdfk45akk2r80pcn";
+  };
+
+  # There are no unit tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "utilities for testing.* packages";
+    homepage = "https://github.com/tk0miya/testing.common.database";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b5f211684e..2926eb9d817 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7120,6 +7120,8 @@ in {
 
   textfsm = callPackage ../development/python-modules/textfsm { };
 
+  testing-common-database = callPackage ../development/python-modules/testing-common-database { };
+
   testpath = callPackage ../development/python-modules/testpath { };
 
   testrepository = callPackage ../development/python-modules/testrepository { };

From 0a15ad3eb932d8047c0a213c339c88836e6f462c Mon Sep 17 00:00:00 2001
From: pulsation <philippe.sam-long@laposte.net>
Date: Tue, 3 Nov 2020 22:33:42 +0100
Subject: [PATCH 005/956] klog: init at 1.3.2

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

diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix
new file mode 100644
index 00000000000..8a062c591b5
--- /dev/null
+++ b/pkgs/applications/radio/klog/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, hamlib, pkgconfig, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "klog";
+  version = "1.3.2";
+
+  src = fetchurl {
+    url = "https://download.savannah.nongnu.org/releases/klog/${pname}-${version}.tar.gz";
+    sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapQtAppsHook qmake qttools ];
+  buildInputs = [ hamlib qtbase qtserialport qtcharts ];
+
+  qmakeFlags = [ "KLog.pro" ];
+
+  meta = with stdenv.lib; {
+    description = "A multiplatform free hamradio logger";
+    longDescription = ''
+      KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management,
+      ClubLog integration, WSJT-X, DX-Marathon support and much more.
+      '';
+    homepage = "https://www.klog.xyz/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pulsation ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95007595ddb..176d296ca60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2302,6 +2302,8 @@ in
 
   klipper = callPackage ../servers/klipper { };
 
+  klog = qt5.callPackage ../applications/radio/klog { };
+
   lcdproc = callPackage ../servers/monitoring/lcdproc { };
 
   languagetool = callPackage ../tools/text/languagetool {  };

From 9682c1d0da2c64042c274a590aed52f0ac7c571d Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sun, 22 Nov 2020 14:31:38 -0800
Subject: [PATCH 006/956] linux bootstrap tools: fix tests on ppc64

The dynamic loader on powerpc64 is called ld64.so.2 rather than
ld-linux.so.*, and was not matched by the existing pattern.

We reuse the dynamicLinker name from binutils to match a wider set
of platforms and to avoid specifying this information in two places.
---
 pkgs/build-support/bintools-wrapper/default.nix | 1 +
 pkgs/stdenv/linux/make-bootstrap-tools.nix      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 3b1b8ff570a..15fcc374293 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -56,6 +56,7 @@ let
     else if targetPlatform.libc == "nblibc"           then "${libc_lib}/libexec/ld.elf_so"
     else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
     else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
+    else if targetPlatform.system == "powerpc64le-linux" then "${libc_lib}/lib/ld64.so.2"
     # ARM with a wildcard, which can be "" or "-armhf".
     else if (with targetPlatform; isAarch32 && isLinux)   then "${libc_lib}/lib/ld-linux*.so.3"
     else if targetPlatform.system == "aarch64-linux"  then "${libc_lib}/lib/ld-linux-aarch64.so.1"
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 421bb8502a4..d88c6f513b4 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -246,7 +246,7 @@ in with pkgs; rec {
       gcc --version
 
     '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
-      ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?)
+      ldlinux=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker})
       export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}"
       export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"
       export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"

From f2e84260db34d062f54dfa1a12f5ce1021549928 Mon Sep 17 00:00:00 2001
From: bb2020 <bb2020@users.noreply.github.com>
Date: Thu, 26 Nov 2020 00:56:43 +0300
Subject: [PATCH 007/956] pkgs/qemu: add qemu_full package

qemu_full enables samba and ceph support because otherwise enabling
them triggers recompilation of qemu package that takes a long time.
Similar options can be enabled later on. qemu_full is based on complete
qemu package, so hostCpuOnly is not enabled.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08c463ba835..2a7d9fd0839 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18870,6 +18870,7 @@ in
   prototool = callPackage ../development/tools/prototool { };
 
   qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
+  qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; });
 
   # See `xenPackages` source for explanations.
   # Building with `xen` instead of `xen-slim` is possible, but makes no sense.

From a199759150d8425634555a74a73181b7f0347132 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 4 Dec 2020 07:21:30 +0000
Subject: [PATCH 008/956] bitwarden: 1.23.0 -> 1.23.1

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

diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index c35a4d60e9e..6afd3c06829 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -17,11 +17,11 @@ let
   pname = "bitwarden";
 
   version = {
-    x86_64-linux = "1.23.0";
+    x86_64-linux = "1.23.1";
   }.${system} or "";
 
   sha256 = {
-    x86_64-linux = "1z1r8327xymqf2h98wb2fb02s41pxc6fh5w4bxmdgpx7k1jx5kvg";
+    x86_64-linux = "1jv6w1g6b9c4xa5zy7pgzrkn8k4pyy3cdkh0nw2czn1cw2gaccs1";
   }.${system} or "";
 
   meta = with stdenv.lib; {

From 8d623c6312d9604d387c63dea7778e797d111403 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Dec 2020 12:46:56 +0000
Subject: [PATCH 009/956] ocamlPackages.optint: 0.0.3 -> 0.0.4

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

diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix
index 508bbfba605..18e4bd1ae86 100644
--- a/pkgs/development/ocaml-modules/optint/default.nix
+++ b/pkgs/development/ocaml-modules/optint/default.nix
@@ -2,11 +2,11 @@
 
 buildDunePackage rec {
   minimumOCamlVersion = "4.03";
-  version = "0.0.3";
+  version = "0.0.4";
   pname = "optint";
   src = fetchurl {
     url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz";
-    sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj";
+    sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a";
   };
 
   meta = {

From 357ef10f544766af3347a7534a0c244e7603292f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sun, 6 Dec 2020 22:42:08 +0100
Subject: [PATCH 010/956] gnustep: make llvmPackages easily overridable

---
 pkgs/desktops/gnustep/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix
index 4f7c13e8e4a..abbabd4abf2 100644
--- a/pkgs/desktops/gnustep/default.nix
+++ b/pkgs/desktops/gnustep/default.nix
@@ -1,21 +1,22 @@
-{ pkgs, newScope, llvmPackages_6 }:
+{ newScope
+, llvmPackages
+, giflib_4_1
+}:
 
 let
   callPackage = newScope self;
 
   self = rec {
-    stdenv = pkgs.clangStdenv;
+    stdenv = llvmPackages.stdenv;
 
     gsmakeDerivation = callPackage ./make/gsmakeDerivation.nix {};
     gorm = callPackage ./gorm {};
     projectcenter = callPackage ./projectcenter {};
     system_preferences = callPackage ./systempreferences {};
-    libobjc = callPackage ./libobjc2 {
-      stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
-    };
+    libobjc = callPackage ./libobjc2 {};
     make = callPackage ./make {};
     back = callPackage ./back {};
-    base = callPackage ./base { giflib = pkgs.giflib_4_1; };
+    base = callPackage ./base { giflib = giflib_4_1; };
     gui = callPackage ./gui {};
     gworkspace = callPackage ./gworkspace {};
   };

From ae16a68336da531f3104a0c0bc93cc729e56276d Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sun, 6 Dec 2020 22:42:40 +0100
Subject: [PATCH 011/956] pikopixel: init at 1.0-b9e

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

diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix
new file mode 100644
index 00000000000..a20a0a2db61
--- /dev/null
+++ b/pkgs/applications/graphics/pikopixel/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, fetchurl
+, gnustep
+, gcc
+, llvmPackages_9
+}:
+
+let
+  # Earlier llvm than 9 segfaults
+  gnustep' = gnustep.override { llvmPackages = llvmPackages_9; };
+
+in gnustep'.gsmakeDerivation rec {
+  pname = "pikopixel";
+  version = "1.0-b9e";
+
+  src = fetchurl {
+    url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz";
+    sha256 = "1gmgb5ch7s6fwvg85l6pl6fsx0maqwd8yvg7sz3r9lj32g2pz5wn";
+  };
+
+  sourceRoot = "PikoPixel.Sources.${version}/PikoPixel";
+
+  buildInputs = [
+    gnustep'.base
+    gnustep'.gui
+    gnustep'.back
+  ];
+
+  # Fix the Exec and Icon paths in the .desktop file, and save the file in the
+  # correct place.
+  # postInstall gets redefined in gnustep.make's builder.sh, so we use preFixup
+  preFixup = ''
+    mkdir -p $out/share/applications
+    sed \
+      -e "s@^Exec=.*\$@Exec=$out/bin/PikoPixel %F@" \
+      -e "s@^Icon=.*/local@Icon=$out@" \
+      PikoPixel.app/Resources/PikoPixel.desktop > $out/share/applications/PikoPixel.desktop
+  '';
+
+  meta = with lib; {
+    description = "Application for drawing and editing pixel-art images";
+    homepage = "http://twilightedge.com/mac/pikopixel/";
+    downloadPage = "http://twilightedge.com/mac/pikopixel/";
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3c3330ae37..7d32f6598db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23289,6 +23289,8 @@ in
 
   purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { };
 
+  pikopixel = callPackage ../applications/graphics/pikopixel { };
+
   pithos = callPackage ../applications/audio/pithos {
     pythonPackages = python3Packages;
   };

From b25ba4a6329c6f3e4b4a75889e47f59020630bc4 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:42:42 +0100
Subject: [PATCH 012/956] archi: unbreak build

Additionally make a wrapper to put the jdk in the PATH to avoid
needed a global JDK
---
 pkgs/tools/misc/archi/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix
index 41562ccbf71..f0a2a56668a 100644
--- a/pkgs/tools/misc/archi/default.nix
+++ b/pkgs/tools/misc/archi/default.nix
@@ -2,6 +2,8 @@
 , fetchurl
 , fetchzip
 , autoPatchelfHook
+, makeWrapper
+, jdk
 , libsecret
 }:
 
@@ -29,17 +31,20 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoPatchelfHook
+    makeWrapper
   ];
 
   installPhase =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       ''
-      mkdir -p $out/bin
-        for f in configuration features p2 plugins Archi.ini Archi; do
-          cp $f $out/bin/
+        mkdir -p $out/bin $out/libexec
+        for f in configuration features p2 plugins Archi.ini; do
+          cp -r $f $out/libexec
         done
 
-        install -D -m755 Archi $out/bin/Archi
+        install -D -m755 Archi $out/libexec/Archi
+        makeWrapper $out/libexec/Archi $out/bin/Archi \
+          --prefix PATH : ${jdk}/bin
       ''
     else
       ''

From 531bd054eaef0902dc62f0d88c9b52ce995feb62 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Mon, 21 Dec 2020 03:24:59 +0100
Subject: [PATCH 013/956] apple-music-electron: init at 1.5.2

---
 .../audio/apple-music-electron/default.nix    | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/audio/apple-music-electron/default.nix

diff --git a/pkgs/applications/audio/apple-music-electron/default.nix b/pkgs/applications/audio/apple-music-electron/default.nix
new file mode 100644
index 00000000000..1c6180ac211
--- /dev/null
+++ b/pkgs/applications/audio/apple-music-electron/default.nix
@@ -0,0 +1,32 @@
+{ appimageTools, lib, fetchurl }:
+let
+  pname = "apple-music-electron";
+  version = "1.5.2";
+  name = "Apple.Music-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/iiFir3z/Apple-Music-Electron/releases/download/${version}/${name}.AppImage";
+    sha256 = "1jl0wgwy6ajmfkzygwb7cm9m49nkhp3x6vd8kwmh6ccs3jy4ayp5";
+  };
+
+  appimageContents = appimageTools.extract { inherit name src; };
+in appimageTools.wrapType2 {
+  inherit name src;
+
+  extraInstallCommands = ''
+    mv $out/bin/${name} $out/bin/${pname}
+
+    install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace 'Exec=AppRun' 'Exec=$out/bin/apple-music-electron'
+    cp -r ${appimageContents}/usr/share/icons $out/share
+  '';
+
+  meta = with lib; {
+    description = "Unofficial Apple Music application without having to bother with a Web Browser or iTunes";
+    homepage = "https://github.com/iiFir3z/Apple-Music-Electron";
+    license = licenses.mit;
+    maintainers = [ maintainers.ivar ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5a9c02b734..fdc49775b2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2710,6 +2710,8 @@ in
 
   appleseed = callPackage ../tools/graphics/appleseed { };
 
+  apple-music-electron = callPackage ../applications/audio/apple-music-electron { };
+
   arping = callPackage ../tools/networking/arping { };
 
   arpoison = callPackage ../tools/networking/arpoison { };

From 70ea8a18913211794b09786647032bf7e597166d Mon Sep 17 00:00:00 2001
From: scalavision <scalavision@gmail.com>
Date: Mon, 21 Dec 2020 20:24:21 +0100
Subject: [PATCH 014/956] scalameta.metals: 1.9.7->1.9.10

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

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 4c644643658..23df8d30a7c 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -253,8 +253,8 @@ let
         mktplcRef = {
           name = "metals";
           publisher = "scalameta";
-          version = "1.9.7";
-          sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr";
+          version = "1.9.10";
+          sha256 = "1afmqzlw3bl9bv59l9b2jrljhbq8djb7vl8rjv58c5wi7nvm2qab";
         };
         meta = {
           license = stdenv.lib.licenses.asl20;

From 7acfdc40e1d9e9c9c7feb50e125849b3b75bddd8 Mon Sep 17 00:00:00 2001
From: Artur Taranchiev <ewok@ewok.ru>
Date: Sun, 27 Dec 2020 00:21:45 +0300
Subject: [PATCH 015/956] maintainers: add ewok

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 856d2280efe..1482e8be606 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2863,6 +2863,12 @@
     githubId = 30512529;
     name = "Evils";
   };
+  ewok = {
+    email = "ewok@ewok.ru";
+    github = "ewok";
+    githubId = 454695;
+    name = "Artur Taranchiev";
+  };
   exfalso = {
     email = "0slemi0@gmail.com";
     github = "exfalso";

From 3de56b05a38a2d3dacaf282e9ae9b18413ea8b72 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Mon, 28 Dec 2020 08:25:17 +0000
Subject: [PATCH 016/956] metamath: 0.193 -> 0.194

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

diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index cccb7434797..8c916f1b1b3 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation {
   pname = "metamath";
-  version = "0.193";
+  version = "0.194";
 
   buildInputs = [ autoreconfHook ];
 
   src = fetchFromGitHub {
     owner = "metamath";
     repo = "metamath-exe";
-    rev = "f973c81222ebe36580a24f0fa7bbb600990af7d6";
-    sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b";
+    rev = "01ff8f0d7a4b4e90c9885f9021fe8a944771cee6";
+    sha256 = "1bc5h2jdqbgna8zbhqyphlqcldz4vddg72r2rnjjjzxnxb2skvj7";
   };
 
   meta = with stdenv.lib; {

From a856e800f7a019c10598b11496cf21890f856fb6 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Mon, 28 Dec 2020 17:41:20 +0000
Subject: [PATCH 017/956] metamath: refer to tag rather than commit

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/interpreters/metamath/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index 8c916f1b1b3..526ed66a7f9 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
-stdenv.mkDerivation {
-  pname = "metamath";
+let
   version = "0.194";
+in stdenv.mkDerivation {
+  pname = "metamath";
+  inherit version;
 
   buildInputs = [ autoreconfHook ];
 
   src = fetchFromGitHub {
     owner = "metamath";
     repo = "metamath-exe";
-    rev = "01ff8f0d7a4b4e90c9885f9021fe8a944771cee6";
+    rev = "v${version}";
     sha256 = "1bc5h2jdqbgna8zbhqyphlqcldz4vddg72r2rnjjjzxnxb2skvj7";
   };
 

From ed299a44e00ce8df083d5e9e83253296b9a19e4d Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Mon, 28 Dec 2020 17:51:38 +0000
Subject: [PATCH 018/956] metamath: correct license to gpl2Only

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

diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index 526ed66a7f9..46edd945712 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
     '';
     homepage = "http://us.metamath.org";
     downloadPage = "http://us.metamath.org/#downloads";
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
     maintainers = [ maintainers.taneb ];
     platforms = platforms.all;
   };

From 817cca7ef9ab2866b7c4948cc8335865a13b98e3 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@svends.net>
Date: Sun, 26 Jul 2020 10:13:06 -0700
Subject: [PATCH 019/956] Add myself to maintainers list

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 93c6422744f..424c12f5900 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8577,6 +8577,12 @@
     githubId = 1040871;
     name = "Mathis Antony";
   };
+  svend = {
+    email = "svend@svends.net";
+    github = "svend";
+    githubId = 306190;
+    name = "Svend Sorensen";
+  };
   svrana = {
     email = "shaw@vranix.com";
     github = "svrana";

From 802ec1b556a1c54a5252bfed200c8a4424f430a6 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@svends.net>
Date: Sun, 26 Jul 2020 10:18:15 -0700
Subject: [PATCH 020/956] dual-function-keys: init at 1.1.0

---
 .../interception-tools/dual-function-keys.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix

diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
new file mode 100644
index 00000000000..c8798901905
--- /dev/null
+++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }:
+
+stdenv.mkDerivation rec {
+  pname = "dual-function-keys";
+  version = "1.1.0";
+
+  src = fetchFromGitLab {
+    owner = "interception/linux/plugins";
+    repo = pname;
+    rev = version;
+    sha256 = "07hksca4g7v4zsvhmhc9j725j3n63fzrkx9sb4a0wrd7rwgr25rz";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ libevdev libyamlcpp ];
+
+  prePatch = ''
+    substituteInPlace config.mk --replace \
+      '/usr/include/libevdev-1.0' \
+      "$(pkg-config --cflags libevdev | cut -c 3-)"
+  '';
+
+  installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://gitlab.com/interception/linux/plugins/dual-function-keys";
+    description = "Tap for one key, hold for another.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ svend ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0242b005a1..c7c622cb425 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3118,6 +3118,7 @@ in
   interception-tools = callPackage ../tools/inputmethods/interception-tools { };
   interception-tools-plugins = {
     caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };
+    dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { };
   };
 
   age = callPackage ../tools/security/age { };

From 46db54706358d84d4bb7eef9a61d28bb2aca7588 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 29 Dec 2020 16:58:38 -0600
Subject: [PATCH 021/956] duti: 1.5.4pre -> 1.5.5pre

This adds changes including support for macOS Big Sur.
---
 pkgs/os-specific/darwin/duti/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index 5c63b8e0dfb..8c523d8a220 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -2,13 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "duti";
-  version = "1.5.4pre";
+  version = "1.5.5pre";
   src = fetchFromGitHub {
     owner = "moretension";
     repo = pname;
-    rev = "7dbcae86f99fedef5a6c4311f032a0f1ca0539cc";
-    sha256 = "1z9sa0yk87vs57d5338y6lvm1v1vvynxb7dy1x5aqzkcr0imhljl";
+    rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2";
+    sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9";
   };
+
   nativeBuildInputs = [autoreconfHook];
   buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices];
   configureFlags = ["--with-macosx-sdk=/homeless-shelter"];

From c9c3dd4950bcd623c0db83e6ce871e3ce7c3adc2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 29 Dec 2020 16:59:11 -0600
Subject: [PATCH 022/956] duti: set kernel to darwin18
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unfortunately, we can’t do arm64 multi-arch with the current nixpkgs
sdk, which duti assumes if your kernel is darwin20 (Big Sur). To fix
this, we can just hardcode to darwin18 which should be compatible with
Nixpkgs Darwin.

Fixes #105751
---
 pkgs/os-specific/darwin/duti/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index 8c523d8a220..c56dd20243b 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -12,7 +12,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [autoreconfHook];
   buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices];
-  configureFlags = ["--with-macosx-sdk=/homeless-shelter"];
+  configureFlags = [
+    "--with-macosx-sdk=/homeless-shelter"
+
+    # needed to prevent duti from trying to guess our sdk
+    # NOTE: this is different than stdenv.hostPlatform.config!
+    "--host=x86_64-apple-darwin18"
+  ];
+
   meta = with lib; {
     description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X";
     longDescription = ''

From 08135a3caa45ed8d278099b60d64bdaf6987d5b9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 Dec 2020 13:28:01 -0600
Subject: [PATCH 023/956] nixos/binfmt.nix: fix running commands in binfmt

To allow arguments in binfmt, we need to put the command in a shell
script. This uses exec to run the binfmt interpreter.

Fixes #90683
---
 nixos/modules/system/boot/binfmt.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index 9eeae0c3ef4..5bcc95be324 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -20,8 +20,14 @@ let
                  optionalString fixBinary "F";
   in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}";
 
-  activationSnippet = name: { interpreter, ... }:
-    "ln -sf ${interpreter} /run/binfmt/${name}";
+  activationSnippet = name: { interpreter, ... }: ''
+    rm -f /run/binfmt/${name}
+    cat > /run/binfmt/${name} << 'EOF'
+    #!/usr/bin/env sh
+    exec -- ${interpreter} "$@"
+    EOF
+    chmod +x /run/binfmt/${name}
+  '';
 
   getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs;
 

From 771ba47d564b734ac7644c19032b19a95a9e840e Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Sat, 2 Jan 2021 18:23:49 +0100
Subject: [PATCH 024/956] boot.loader.grub: add extraInstallCommands option

---
 .../modules/system/boot/loader/grub/grub.nix  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index df5dfaa554b..289c2b19986 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -327,6 +327,26 @@ in
         '';
       };
 
+      extraInstallCommands = mkOption {
+        default = "";
+        example = literalExample ''
+          # the example below generates detached signatures that GRUB can verify
+          # https://www.gnu.org/software/grub/manual/grub/grub.html#Using-digital-signatures
+          ''${pkgs.findutils}/bin/find /boot -not -path "/boot/efi/*" -type f -name '*.sig' -delete
+          old_gpg_home=$GNUPGHOME
+          export GNUPGHOME="$(mktemp -d)"
+          ''${pkgs.gnupg}/bin/gpg --import ''${priv_key} > /dev/null 2>&1
+          ''${pkgs.findutils}/bin/find /boot -not -path "/boot/efi/*" -type f -exec ''${pkgs.gnupg}/bin/gpg --detach-sign "{}" \; > /dev/null 2>&1
+          rm -rf $GNUPGHOME
+          export GNUPGHOME=$old_gpg_home
+        '';
+        type = types.lines;
+        description = ''
+          Additional shell commands inserted in the bootloader installer
+          script after generating menu entries.
+        '';
+      };
+
       extraPerEntryConfig = mkOption {
         default = "";
         example = "root (hd0)";
@@ -715,7 +735,7 @@ in
         ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
       '' + flip concatMapStrings cfg.mirroredBoots (args: ''
         ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@
-      ''));
+      '') + cfg.extraInstallCommands);
 
       system.build.grub = grub;
 

From 1eabc4cff1bc5e3d7ce536e266ddd6223352965d Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 18 Dec 2020 21:59:51 +0100
Subject: [PATCH 025/956] nixosTests.vault: increase memorySize to 512

---
 nixos/tests/vault.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
index ac8cf0703da..20cc8f4c692 100644
--- a/nixos/tests/vault.nix
+++ b/nixos/tests/vault.nix
@@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
     environment.systemPackages = [ pkgs.vault ];
     environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
     services.vault.enable = true;
+    virtualisation.memorySize = 512;
   };
 
   testScript =

From b413e7fd2a4ece5d23b78cc04ec19378ee11ceba Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 4 Jan 2021 16:28:16 +0100
Subject: [PATCH 026/956] nixos/vault: Allow multiple config files

---
 nixos/modules/services/security/vault.nix | 46 ++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 64622454b9d..c2b714d7c26 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -27,6 +27,11 @@ let
       ''}
     ${cfg.extraConfig}
   '';
+
+  allConfigPaths = [configFile] ++ cfg.extraConfigPaths;
+
+  configOptions = escapeShellArgs (concatMap (p: ["-config" p]) allConfigPaths);
+
 in
 
 {
@@ -84,7 +89,14 @@ in
       storageConfig = mkOption {
         type = types.nullOr types.lines;
         default = null;
-        description = "Storage configuration";
+        description = ''
+          HCL configuration to insert in the storageBackend section.
+
+          Confidential values should not be specified here because this option's
+          value is written to the Nix store, which is publicly readable.
+          Provide credentials and such in a separate file using
+          <xref linkend="opt-services.vault.extraConfigPaths"/>.
+        '';
       };
 
       telemetryConfig = mkOption {
@@ -98,6 +110,36 @@ in
         default = "";
         description = "Extra text appended to <filename>vault.hcl</filename>.";
       };
+
+      extraConfigPaths = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = ''
+          Configuration files to load besides the immutable one defined by the NixOS module.
+          This can be used to avoid putting credentials in the Nix store, which can be read by any user.
+
+          Each path can point to a JSON- or HCL-formatted file, or a directory
+          to be scanned for files with <literal>.hcl</literal> or
+          <literal>.json</literal> extensions.
+
+          To upload the confidential file with NixOps, use for example:
+
+          <programlisting><![CDATA[
+          # https://releases.nixos.org/nixops/latest/manual/manual.html#opt-deployment.keys
+          deployment.keys."vault.hcl" = let db = import ./db-credentials.nix; in {
+            text = ${"''"}
+              storage "postgresql" {
+                connection_url = "postgres://''${db.username}:''${db.password}@host.example.com/exampledb?sslmode=verify-ca"
+              }
+            ${"''"};
+            user = "vault";
+          };
+          services.vault.extraConfigPaths = ["/run/keys/vault.hcl"];
+          services.vault.storageBackend = "postgresql";
+          users.users.vault.extraGroups = ["keys"];
+          ]]></programlisting>
+        '';
+      };
     };
   };
 
@@ -136,7 +178,7 @@ in
       serviceConfig = {
         User = "vault";
         Group = "vault";
-        ExecStart = "${cfg.package}/bin/vault server -config ${configFile}";
+        ExecStart = "${cfg.package}/bin/vault server ${configOptions}";
         ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
         PrivateDevices = true;
         PrivateTmp = true;

From 653f18b48fa6bd6b3e51a05c8ca0d93042c19785 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 4 Jan 2021 17:54:03 +0100
Subject: [PATCH 027/956] nixosTests.vault-postgresql: init

---
 nixos/tests/all-tests.nix        |  1 +
 nixos/tests/vault-postgresql.nix | 70 ++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 nixos/tests/vault-postgresql.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index c491b559213..871b800a74b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -401,6 +401,7 @@ in
   uwsgi = handleTest ./uwsgi.nix {};
   v2ray = handleTest ./v2ray.nix {};
   vault = handleTest ./vault.nix {};
+  vault-postgresql = handleTest ./vault-postgresql.nix {};
   vector = handleTest ./vector.nix {};
   victoriametrics = handleTest ./victoriametrics.nix {};
   virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
diff --git a/nixos/tests/vault-postgresql.nix b/nixos/tests/vault-postgresql.nix
new file mode 100644
index 00000000000..185a9515d61
--- /dev/null
+++ b/nixos/tests/vault-postgresql.nix
@@ -0,0 +1,70 @@
+/* This test checks that
+    - multiple config files can be loaded
+    - the storage backend can be in a file outside the nix store
+      as is required for security (required because while confidentiality is
+      always covered, availability isn't)
+    - the postgres integration works
+ */
+import ./make-test-python.nix ({ pkgs, ... }:
+{
+  name = "vault-postgresql";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lnl7 roberth ];
+  };
+  machine = { lib, pkgs, ... }: {
+    virtualisation.memorySize = 512;
+    environment.systemPackages = [ pkgs.vault ];
+    environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
+    services.vault.enable = true;
+    services.vault.extraConfigPaths = [ "/run/vault.hcl" ];
+
+    systemd.services.vault = {
+      after = [
+        "postgresql.service"
+      ];
+      # Try for about 10 minutes rather than the default of 5 attempts.
+      serviceConfig.RestartSec = 1;
+      serviceConfig.StartLimitBurst = 600;
+    };
+    # systemd.services.vault.unitConfig.RequiresMountsFor = "/run/keys/";
+
+    services.postgresql.enable = true;
+    services.postgresql.initialScript = pkgs.writeText "init.psql" ''
+      CREATE USER vaultuser WITH ENCRYPTED PASSWORD 'thisisthepass';
+      GRANT CONNECT ON DATABASE postgres TO vaultuser;
+
+      -- https://www.vaultproject.io/docs/configuration/storage/postgresql
+      CREATE TABLE vault_kv_store (
+        parent_path TEXT COLLATE "C" NOT NULL,
+        path        TEXT COLLATE "C",
+        key         TEXT COLLATE "C",
+        value       BYTEA,
+        CONSTRAINT pkey PRIMARY KEY (path, key)
+      );
+      CREATE INDEX parent_path_idx ON vault_kv_store (parent_path);
+
+      GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO vaultuser;
+    '';
+  };
+
+  testScript =
+    ''
+      secretConfig = """
+          storage "postgresql" {
+            connection_url = "postgres://vaultuser:thisisthepass@localhost/postgres?sslmode=disable"
+          }
+          """
+
+      start_all()
+
+      machine.wait_for_unit("multi-user.target")
+      machine.succeed("cat >/root/vault.hcl <<EOF\n%s\nEOF\n" % secretConfig)
+      machine.succeed(
+          "install --owner vault --mode 0400 /root/vault.hcl /run/vault.hcl; rm /root/vault.hcl"
+      )
+      machine.wait_for_unit("vault.service")
+      machine.wait_for_open_port(8200)
+      machine.succeed("vault operator init")
+      machine.succeed("vault status | grep Sealed | grep true")
+    '';
+})

From b28e5f3c9a60ac2ae89390660671530221fbfd2a Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Mon, 4 Jan 2021 12:00:00 +0000
Subject: [PATCH 028/956] appimage-run: add regression test

---
 .../appimage-run/default.nix                  |  4 +++-
 .../package-management/appimage-run/test.nix  | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +++++-
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/package-management/appimage-run/test.nix

diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index 3bc59f2ad14..98a04dff8f8 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -1,4 +1,4 @@
-{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }:
+{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [], appimage-run-tests ? null }:
 
 let
   fhsArgs = appimageTools.defaultFhsEnvArgs;
@@ -8,4 +8,6 @@ in buildFHSUserEnv (fhsArgs // {
   targetPkgs = pkgs: [ appimageTools.appimage-exec ]
     ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
   runScript = "appimage-exec.sh";
+
+  passthru.tests.appimage-run = appimage-run-tests;
 })
diff --git a/pkgs/tools/package-management/appimage-run/test.nix b/pkgs/tools/package-management/appimage-run/test.nix
new file mode 100644
index 00000000000..c9bc63c08a8
--- /dev/null
+++ b/pkgs/tools/package-management/appimage-run/test.nix
@@ -0,0 +1,24 @@
+{ runCommand, fetchurl, appimage-run, glibcLocales, file }:
+let
+  # any AppImage usable on cli, really
+  sample-appImage = fetchurl {
+    url = "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage";
+    sha256 =  "04ws94q71bwskmhizhwmaf41ma4wabvfgjgkagr8wf3vakgv866r";
+  };
+in
+  runCommand "appimage-run-tests" {
+    buildInputs = [ appimage-run glibcLocales file ];
+    meta.platforms = [ "x86_64-linux" ];
+  }
+  ''
+    export HOME=$(mktemp -d)
+    set -x
+    # regression test for #101137, must come first
+    LANG=fr_FR appimage-run ${sample-appImage} --list ${sample-appImage}
+    # regression test for #108426
+    cp ${sample-appImage} foo.appImage
+    LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage
+    set +x
+    touch $out
+  ''
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65ac1da5030..70b124a7b2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -852,7 +852,12 @@ in
     inherit (androidenv.androidPkgs_9_0) build-tools;
   };
 
-  appimage-run = callPackage ../tools/package-management/appimage-run {};
+  appimage-run = callPackage ../tools/package-management/appimage-run { };
+  appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {
+    appimage-run = appimage-run.override {
+      appimage-run-tests = null; /* break boostrap cycle for passthru.tests */
+    };
+  };
 
   appimagekit = callPackage ../tools/package-management/appimagekit {};
 

From f54f718871ed34cc8e6a71905349d34f00d6fd6d Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Mon, 4 Jan 2021 12:00:00 +0000
Subject: [PATCH 029/956] appimage-run: don't chdir to the appimage

this allows to pass relative paths to appimages as argument

fixes #108426
---
 pkgs/build-support/appimage/appimage-exec.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh
index 7986c589667..4ff6802e645 100755
--- a/pkgs/build-support/appimage/appimage-exec.sh
+++ b/pkgs/build-support/appimage/appimage-exec.sh
@@ -75,15 +75,15 @@ apprun() {
 
 wrap() {
 
-  cd "$APPDIR" || exit
   # quite same in appimageTools
   export APPIMAGE_SILENT_INSTALL=1
 
   if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
+    cd "$APPDIR" || true
     exec "$APPIMAGE_DEBUG_EXEC"
   fi
 
-  exec ./AppRun "$@"
+  exec "$APPDIR/AppRun" "$@"
 }
 
 usage() {

From 9550d865e9ecf2d3e0767231a68548865da34f87 Mon Sep 17 00:00:00 2001
From: Ctem <c@ctem.me>
Date: Wed, 6 Jan 2021 19:33:39 +0900
Subject: [PATCH 030/956] nixos/chrony: add option to enable NTS authentication

---
 nixos/modules/services/networking/ntp/chrony.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index e6fa48daf46..5842761ba7e 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -10,7 +10,7 @@ let
   keyFile = "${stateDir}/chrony.keys";
 
   configFile = pkgs.writeText "chrony.conf" ''
-    ${concatMapStringsSep "\n" (server: "server " + server + " iburst") cfg.servers}
+    ${concatMapStringsSep "\n" (server: "server " + server + " iburst" + optionalString (cfg.enableNTS) " nts") cfg.servers}
 
     ${optionalString
       (cfg.initstepslew.enabled && (cfg.servers != []))
@@ -19,6 +19,7 @@ let
 
     driftfile ${driftFile}
     keyfile ${keyFile}
+    ${optionalString (cfg.enableNTS) "ntsdumpdir ${stateDir}"}
 
     ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
 
@@ -46,6 +47,15 @@ in
         '';
       };
 
+      enableNTS = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Network Time Security authentication.
+          Make sure it is supported by your selected NTP server(s).
+        '';
+      };
+
       initstepslew = mkOption {
         default = {
           enabled = true;

From 2e131e1f45dd01bef5231744745931afadccdf90 Mon Sep 17 00:00:00 2001
From: Ctem <c@ctem.me>
Date: Wed, 6 Jan 2021 19:38:56 +0900
Subject: [PATCH 031/956] nixos/chrony: add option to choose between two
 commonly used server directive options

---
 nixos/modules/services/networking/ntp/chrony.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index 5842761ba7e..42dbc5c5612 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -10,7 +10,7 @@ let
   keyFile = "${stateDir}/chrony.keys";
 
   configFile = pkgs.writeText "chrony.conf" ''
-    ${concatMapStringsSep "\n" (server: "server " + server + " iburst" + optionalString (cfg.enableNTS) " nts") cfg.servers}
+    ${concatMapStringsSep "\n" (server: "server " + server + " " + cfg.serverOption + optionalString (cfg.enableNTS) " nts") cfg.servers}
 
     ${optionalString
       (cfg.initstepslew.enabled && (cfg.servers != []))
@@ -47,6 +47,20 @@ in
         '';
       };
 
+      serverOption = mkOption {
+        default = "iburst";
+        type = types.enum [ "iburst" "offline" ];
+        description = ''
+          Set option for server directives.
+
+          Use "iburst" to rapidly poll on startup. Recommended if your machine
+          is consistently online.
+
+          Use "offline" to prevent polling on startup. Recommended if your
+          machine boots offline or is otherwise frequently offline.
+        '';
+      };
+
       enableNTS = mkOption {
         type = types.bool;
         default = false;

From 2aec205bd2bb23d0b1230e7639d9ff4134a2f656 Mon Sep 17 00:00:00 2001
From: Ctem <c@ctem.me>
Date: Wed, 6 Jan 2021 19:40:48 +0900
Subject: [PATCH 032/956] nixos/chrony: add option to change state directory

---
 nixos/modules/services/networking/ntp/chrony.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index 42dbc5c5612..d568a7aed88 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -5,7 +5,7 @@ with lib;
 let
   cfg = config.services.chrony;
 
-  stateDir = "/var/lib/chrony";
+  stateDir = cfg.directory;
   driftFile = "${stateDir}/chrony.drift";
   keyFile = "${stateDir}/chrony.keys";
 
@@ -82,6 +82,12 @@ in
         '';
       };
 
+      directory = mkOption {
+        type = types.str;
+        default = "/var/lib/chrony";
+        description = "Directory where chrony state is stored.";
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";

From 54778551d6029e5ffdb6c530915477095a3f564f Mon Sep 17 00:00:00 2001
From: Ctem <c@ctem.me>
Date: Wed, 6 Jan 2021 19:42:28 +0900
Subject: [PATCH 033/956] nixos/chrony: add option to change package

---
 nixos/modules/services/networking/ntp/chrony.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index d568a7aed88..b36484fed10 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.chrony;
+  chronyPkg = cfg.package;
 
   stateDir = cfg.directory;
   driftFile = "${stateDir}/chrony.drift";
@@ -40,6 +41,15 @@ in
         '';
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.chrony;
+        defaultText = "pkgs.chrony";
+        description = ''
+          Which chrony package to use.
+        '';
+      };
+
       servers = mkOption {
         default = config.networking.timeServers;
         description = ''
@@ -109,7 +119,7 @@ in
   config = mkIf cfg.enable {
     meta.maintainers = with lib.maintainers; [ thoughtpolice ];
 
-    environment.systemPackages = [ pkgs.chrony ];
+    environment.systemPackages = [ chronyPkg ];
 
     users.groups.chrony.gid = config.ids.gids.chrony;
 
@@ -139,12 +149,12 @@ in
         after    = [ "network.target" ];
         conflicts = [ "ntpd.service" "systemd-timesyncd.service" ];
 
-        path = [ pkgs.chrony ];
+        path = [ chronyPkg ];
 
         unitConfig.ConditionCapability = "CAP_SYS_TIME";
         serviceConfig =
           { Type = "simple";
-            ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
+            ExecStart = "${chronyPkg}/bin/chronyd ${chronyFlags}";
 
             ProtectHome = "yes";
             ProtectSystem = "full";

From 6e098fa12e6fe28737f14425af23decb135a8e92 Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Sun, 10 Jan 2021 14:30:21 +0900
Subject: [PATCH 034/956] powerline-symbols: init at 2.8.1

---
 pkgs/data/fonts/powerline-symbols/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/data/fonts/powerline-symbols/default.nix

diff --git a/pkgs/data/fonts/powerline-symbols/default.nix b/pkgs/data/fonts/powerline-symbols/default.nix
new file mode 100644
index 00000000000..69e3bb59df6
--- /dev/null
+++ b/pkgs/data/fonts/powerline-symbols/default.nix
@@ -0,0 +1,18 @@
+{ lib, runCommandNoCC, powerline }:
+
+let
+  inherit (powerline) version;
+in runCommandNoCC "powerline-symbols-${version}" {
+  meta = {
+    inherit (powerline.meta) license;
+    priority = (powerline.meta.priority or 0) + 1;
+    maintainers = with lib.maintainers; [ midchildan ];
+  };
+} ''
+  install -Dm644 \
+    ${powerline.src}/font/PowerlineSymbols.otf \
+    $out/share/fonts/OTF/PowerlineSymbols.otf
+  install -Dm644 \
+    ${powerline.src}/font/10-powerline-symbols.conf \
+    $out/etc/fonts/conf.d/10-powerline-symbols.conf
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c460379c313..3f48babaa24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20278,6 +20278,8 @@ in
 
   powerline-fonts = callPackage ../data/fonts/powerline-fonts { };
 
+  powerline-symbols = callPackage ../data/fonts/powerline-symbols { };
+
   powerline-go = callPackage ../tools/misc/powerline-go { };
 
   powerline-rs = callPackage ../tools/misc/powerline-rs {

From 1a6b1c58dd23c3001b8cf40e01c1b3749523560a Mon Sep 17 00:00:00 2001
From: Justus K <justus.k@protonmail.com>
Date: Sun, 10 Jan 2021 16:51:01 +0100
Subject: [PATCH 035/956] maintainers: add stupremee

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4e7d4746385..124e77ac5e3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8599,6 +8599,12 @@
     githubId = 1315818;
     name = "Felix Bühler";
   };
+  stupremee = {
+      email = "jutus.k@protonmail.com";
+      github = "Stupremee";
+      githubId = 39732259;
+      name = "Justus K";
+  };
   suhr = {
     email = "suhr@i2pmail.org";
     github = "suhr";

From 40d00ff00553417dd23395fba4cc204f7a321531 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 11 Jan 2021 04:20:00 +0000
Subject: [PATCH 036/956] lxc: 4.0.5 -> 4.0.6

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 16e7ef0a804..ccbdbae6979 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -9,11 +9,11 @@
 with lib;
 stdenv.mkDerivation rec {
   pname = "lxc";
-  version = "4.0.5";
+  version = "4.0.6";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
-    sha256 = "1976l9308rx1ria1gazasypk5rmmf5jiqdh54dfrws5bslbdcb5g";
+    sha256 = "0qz4l7mlhq7hx53q606qgvkyzyr01glsw290v8ppzvxn1fydlrci";
   };
 
   nativeBuildInputs = [

From 530f90d8625a75261ad502db796f221d315993a4 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 11 Jan 2021 11:15:12 -0300
Subject: [PATCH 037/956] rambox: migrate to use AppImage

The motivation comes from PR #108787: AppImage is the official and
using it should avoid some issues.

Also, migrating both packages (instead of only rambox-pro like #108787)
can make maintaining both packages better. There is now a `mkRambox`
function that abstract most of the build process.
---
 .../instant-messengers/rambox/default.nix     | 42 ++++-----------
 .../instant-messengers/rambox/pro.nix         | 53 ++++---------------
 .../instant-messengers/rambox/rambox.nix      | 30 +++++++++++
 3 files changed, 50 insertions(+), 75 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/rambox/rambox.nix

diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index bc26b68d2db..5525805c2e4 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,46 +1,22 @@
-{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
-, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook
-}:
+{ stdenv, callPackage, fetchurl, lib }:
 
 let
-  version = "0.7.7";
-in stdenv.mkDerivation rec {
+  mkRambox = opts: callPackage (import ./rambox.nix opts) { };
+in mkRambox rec {
   pname = "rambox";
-  inherit version;
+  version = "0.7.7";
+
   src = {
     x86_64-linux = fetchurl {
-      url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
-      sha256 = "0bij4f1bkg94gc8pq7r6yfym5zcvwc2ymdnmnmh5m4h1pa1gk6x9";
+      url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage";
+      sha256 = "0f82hq0dzcjicdz6lkzj8889y100yqciqrwh8wjjy9pxkhjcdini";
     };
     i686-linux = fetchurl {
-      url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
-      sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd51rfs";
+      url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage";
+      sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd52rfs";
     };
   }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 
-  nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
-  buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ];
-  runtimeDependencies = [ (lib.getLib udev) libnotify ];
-
-  unpackPhase = "dpkg-deb -x $src .";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -r opt $out
-    ln -s $out/opt/Rambox/rambox $out/bin
-
-    # provide resources
-    cp -r usr/share $out
-    substituteInPlace $out/share/applications/rambox.desktop \
-      --replace Exec=/opt/Rambox/rambox Exec=rambox
-  '';
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PATH : ${xdg_utils}/bin
-    )
-  '';
-
   meta = with lib; {
     description = "Free and Open Source messaging and emailing app that combines common web applications into one";
     homepage = "https://rambox.pro";
diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
index 1df0b597ae2..7051799a277 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
@@ -1,56 +1,25 @@
-{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, lib, stdenv, xdg_utils, xorg }:
+{ stdenv, callPackage, fetchurl, lib }:
 
 let
-  electron = electron_7;
-in
-stdenv.mkDerivation rec {
+  mkRambox = opts: callPackage (import ./rambox.nix opts) { };
+in mkRambox rec {
   pname = "rambox-pro";
   version = "1.4.1";
 
-  dontBuild = true;
-  dontStrip = true;
+  desktopName = "Rambox Pro";
 
-  buildInputs = [ nss xorg.libXext xorg.libxkbfile xorg.libXScrnSaver ];
-  nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ];
-
-  src = fetchurl {
-    url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
-    sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e";
-  };
-
-  installPhase = ''
-    mkdir -p $out/{bin,resources/dist/renderer/assets/images/app,share/applications,share/icons/hicolor/256x256/apps}
-
-    asar e resources/app.asar $out/resources
-
-    substituteInPlace "$out/resources/dist/electron/main.js" \
-      --replace ",isHidden:" ",path:\"$out/bin/ramboxpro\",isHidden:"
-
-    cp $desktopItem/share/applications/* $out/share/applications
-    cp $out/resources/dist/electron/imgs/256x256.png $out/share/icons/hicolor/256x256/apps/ramboxpro.png
-    cp $out/resources/dist/electron/imgs/256x256.png $out/resources/dist/renderer/assets/images/app/icon.png
-  '';
-
-  postFixup = ''
-    makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \
-      --add-flags "$out/resources --without-update" \
-      --prefix PATH : ${xdg_utils}/bin
-  '';
-
-  desktopItem = makeDesktopItem {
-    name = "rambox-pro";
-    exec = "ramboxpro";
-    icon = "ramboxpro";
-    type = "Application";
-    desktopName = "Rambox Pro";
-    categories = "Network;";
-  };
+  src = {
+    x86_64-linux = fetchurl {
+      url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.AppImage";
+      sha256 = "18383v3g26hd1czvw06gmjn8bdw2w9c7zb04zkfl6szgakrv26x4";
+    };
+  }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 
   meta = with lib; {
     description = "Messaging and emailing app that combines common web applications into one";
     homepage = "https://rambox.pro";
     license = licenses.unfree;
     maintainers = with maintainers; [ chrisaw ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
new file mode 100644
index 00000000000..6881ae270f9
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
@@ -0,0 +1,30 @@
+{ pname, version, src, meta, desktopName ? "Rambox" }:
+
+{ appimageTools, stdenv, lib, fetchurl, makeDesktopItem }:
+
+let
+  name = "${pname}-${version}";
+
+  desktopItem = (makeDesktopItem {
+    inherit desktopName;
+    name = pname;
+    exec = pname;
+    icon = pname;
+    type = "Application";
+    categories = "Network;";
+  });
+
+  appimageContents = appimageTools.extractType2 {
+    inherit name src;
+  };
+in appimageTools.wrapType2 rec {
+  inherit name src meta;
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps
+    # CE uses rambox-<version>, Pro uses rambox
+    mv $out/bin/rambox* $out/bin/${pname}
+    install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png
+    install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
+  '';
+}

From 1e70c4fd41372ac3f439f0515ac6d91225365122 Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Date: Sat, 2 Jan 2021 14:26:33 +0300
Subject: [PATCH 038/956] maintainers: add PlushBeaver

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 07b231f175f..072feb576ec 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7125,6 +7125,12 @@
     githubId = 13000278;
     name = "Maksim Bronsky";
   };
+  PlushBeaver = {
+    name = "Dmitry Kozlyuk";
+    email = "dmitry.kozliuk+nixpkgs@gmail.com";
+    github = "PlushBeaver";
+    githubId = 8988269;
+  };
   pmahoney = {
     email = "pat@polycrystal.org";
     github = "pmahoney";

From ef19c4d18174143896be418ad34de924dde376c6 Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Date: Sat, 2 Jan 2021 14:31:36 +0300
Subject: [PATCH 039/956] catboost: init at 0.24.4

---
 .../python-modules/catboost/default.nix       |  56 ++++++
 .../python-modules/catboost/nix-support.patch | 181 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 239 insertions(+)
 create mode 100644 pkgs/development/python-modules/catboost/default.nix
 create mode 100644 pkgs/development/python-modules/catboost/nix-support.patch

diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix
new file mode 100644
index 00000000000..8c5184240f6
--- /dev/null
+++ b/pkgs/development/python-modules/catboost/default.nix
@@ -0,0 +1,56 @@
+{ buildPythonPackage, fetchFromGitHub, fetchpatch, lib, pythonOlder
+, clang_7, python2
+, graphviz, matplotlib, numpy, pandas, plotly, scipy, six
+, withCuda ? false, cudatoolkit }:
+
+buildPythonPackage rec {
+  pname = "catboost";
+  version = "0.24.4";
+
+  disabled = pythonOlder "3.4";
+
+  src = fetchFromGitHub {
+    owner = "catboost";
+    repo = "catboost";
+    rev = "v${version}";
+    sha256 = "sha256-pzmwEiKziB4ldnKgeCsP2HdnisX8sOkLssAzNfcSEx8=";
+  };
+
+  nativeBuildInputs = [ clang_7 python2 ];
+
+  propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ]
+    ++ lib.optional withCuda [ cudatoolkit ];
+
+  patches = [
+    ./nix-support.patch
+    (fetchpatch {
+      name = "format.patch";
+      url = "https://github.com/catboost/catboost/pull/1528/commits/a692ba42e5c0f62e5da82b2f6fccfa77deb3419c.patch";
+      sha256 = "sha256-fNGucHxsSDFRLk3hFH7rm+zzTdDpY9/QjRs8K+AzVvo=";
+    })
+  ];
+
+  preBuild = ''
+    cd catboost/python-package
+    '';
+  setupPyBuildFlags = [ "--with-ymake=no" ];
+  CUDA_ROOT = lib.optional withCuda cudatoolkit;
+  enableParallelBuilding = true;
+
+  # Tests use custom "ya" tool, not yet supported.
+  dontUseSetuptoolsCheck = true;
+  pythonImportsCheck = [ "catboost" ];
+
+  meta = with lib; {
+    description = "High-performance library for gradient boosting on decision trees.";
+    longDescription = ''
+      A fast, scalable, high performance Gradient Boosting on Decision Trees
+      library, used for ranking, classification, regression and other machine
+      learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU.
+    '';
+    license = licenses.asl20;
+    platforms = [ "x86_64-linux" ];
+    homepage = "https://catboost.ai";
+    maintainers = with maintainers; [ PlushBeaver ];
+  };
+}
diff --git a/pkgs/development/python-modules/catboost/nix-support.patch b/pkgs/development/python-modules/catboost/nix-support.patch
new file mode 100644
index 00000000000..feaf97d5707
--- /dev/null
+++ b/pkgs/development/python-modules/catboost/nix-support.patch
@@ -0,0 +1,181 @@
+diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py
+index 17f1d8ff14..07da618cd1 100644
+--- a/catboost/python-package/setup.py
++++ b/catboost/python-package/setup.py
+@@ -80,7 +80,7 @@ class Helper(object):
+         self.with_cuda = os.environ.get('CUDA_PATH') or os.environ.get('CUDA_ROOT') or None
+         self.os_sdk = 'local'
+         self.with_ymake = True
+-        self.parallel = None
++        self.parallel = os.environ.get('NIX_BUILD_CORES') or None
+ 
+     def finalize_options(self):
+         if os.path.exists(str(self.with_cuda)):
+@@ -222,11 +222,12 @@ class build_ext(_build_ext):
+ 
+     def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run):
+         logging.info('Buildling {} with gnu make'.format(catboost_ext))
+-        makefile = 'python{}.{}CLANG50-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')
++        makefile = 'python{}.{}CLANG7-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')
+         make_cmd = [
+             'make', '-f', '../../make/' + makefile,
+-            'CC=clang-5.0',
+-            'CXX=clang++-5.0',
++            'CC=clang',
++            'CXX=clang++',
++            'PYTHON=python2',
+             'BUILD_ROOT=' + build_dir,
+             'SOURCE_ROOT=' + topsrc_dir,
+         ]
+diff --git a/make/python2.CLANG7-LINUX-X86_64.makefile b/make/python2.CLANG7-LINUX-X86_64.makefile
+index e54b7078e8..fb7b208af9 100644
+--- a/make/python2.CLANG7-LINUX-X86_64.makefile
++++ b/make/python2.CLANG7-LINUX-X86_64.makefile
+@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
+ SOURCE_ROOT = $(shell pwd)
+ PYTHON = $(shell which python)
+ 
+-ifneq ($(MAKECMDGOALS),help)
+-define _CC_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
+-$(info _CC_VERSION = '$(_CC_VERSION)')
+-
+-ifneq '$(_CC_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-ifneq ($(MAKECMDGOALS),help)
+-define _CXX_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
+-$(info _CXX_VERSION = '$(_CXX_VERSION)')
+-
+-ifneq '$(_CXX_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-
+ all\
+         ::\
+         $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
+diff --git a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
+index 2a22a79b25..522fb54a7c 100644
+--- a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
++++ b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
+@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
+ SOURCE_ROOT = $(shell pwd)
+ PYTHON = $(shell which python)
+ 
+-ifneq ($(MAKECMDGOALS),help)
+-define _CC_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
+-$(info _CC_VERSION = '$(_CC_VERSION)')
+-
+-ifneq '$(_CC_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-ifneq ($(MAKECMDGOALS),help)
+-define _CXX_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
+-$(info _CXX_VERSION = '$(_CXX_VERSION)')
+-
+-ifneq '$(_CXX_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-
+ all\
+         ::\
+         $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
+diff --git a/make/python3.CLANG7-LINUX-X86_64.makefile b/make/python3.CLANG7-LINUX-X86_64.makefile
+index fee6750bcb..dc55908371 100644
+--- a/make/python3.CLANG7-LINUX-X86_64.makefile
++++ b/make/python3.CLANG7-LINUX-X86_64.makefile
+@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
+ SOURCE_ROOT = $(shell pwd)
+ PYTHON = $(shell which python)
+ 
+-ifneq ($(MAKECMDGOALS),help)
+-define _CC_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
+-$(info _CC_VERSION = '$(_CC_VERSION)')
+-
+-ifneq '$(_CC_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-ifneq ($(MAKECMDGOALS),help)
+-define _CXX_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
+-$(info _CXX_VERSION = '$(_CXX_VERSION)')
+-
+-ifneq '$(_CXX_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-
+ all\
+         ::\
+         $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
+diff --git a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
+index 5146830476..ff8535b03e 100644
+--- a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
++++ b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
+@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
+ SOURCE_ROOT = $(shell pwd)
+ PYTHON = $(shell which python)
+ 
+-ifneq ($(MAKECMDGOALS),help)
+-define _CC_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
+-$(info _CC_VERSION = '$(_CC_VERSION)')
+-
+-ifneq '$(_CC_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-ifneq ($(MAKECMDGOALS),help)
+-define _CXX_TEST
+-__clang_major__ __clang_minor__
+-endef
+-
+-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
+-$(info _CXX_VERSION = '$(_CXX_VERSION)')
+-
+-ifneq '$(_CXX_VERSION)' '7 0'
+-    $(error clang 7.0 is required)
+-endif
+-endif
+-
+-
+ all\
+         ::\
+         $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64652bb430f..30087acdb88 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1135,6 +1135,8 @@ in {
 
   catalogue = callPackage ../development/python-modules/catalogue { };
 
+  catboost = callPackage ../development/python-modules/catboost { };
+
   cbeams = callPackage ../misc/cbeams { };
 
   cbor2 = callPackage ../development/python-modules/cbor2 { };

From a13064ae2733f727e5e0fec70213e4c0b69567d2 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Sun, 10 Jan 2021 23:42:02 -0500
Subject: [PATCH 040/956] nixos/xdg/portal: fix loading portals from systemd
 service

---
 nixos/modules/config/xdg/portal.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index 3c7cd729c60..80ec3126ca5 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -62,7 +62,7 @@ with lib;
       services.dbus.packages  = packages;
       systemd.packages = packages;
 
-      environment.variables = {
+      environment.sessionVariables = {
         GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1";
         XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals";
       };

From 5d7b2427bdcc52378de1048e1b490778507ad47b Mon Sep 17 00:00:00 2001
From: Giorgi Lekveishvili <giolekva@gmail.com>
Date: Wed, 13 Jan 2021 11:49:14 +0400
Subject: [PATCH 041/956] kube3d: k3sVersion 1.19.4-k3s1 -> 1.20.0+k3s2

---
 pkgs/applications/networking/cluster/kube3d/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index a97bf509fe4..f38e3135ecb 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 let
-  k3sVersion = "1.19.4-k3s1";
+  k3sVersion = "1.20.0-k3s2";
 in
 buildGoModule rec {
   pname = "kube3d";

From b249fd1b46e48dc9a4b12e37073d949f5507ad77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= <esm@eduardosm.net>
Date: Wed, 13 Jan 2021 11:19:36 +0100
Subject: [PATCH 042/956] ruffle: nightly-2020-11-30 -> nightly-2021-01-12

---
 pkgs/misc/emulators/ruffle/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix
index b817716075c..475e54076fc 100644
--- a/pkgs/misc/emulators/ruffle/default.nix
+++ b/pkgs/misc/emulators/ruffle/default.nix
@@ -1,5 +1,6 @@
 { alsaLib
 , fetchFromGitHub
+, makeWrapper
 , openssl
 , pkg-config
 , python3
@@ -7,20 +8,22 @@
 , lib, stdenv
 , wayland
 , xorg
+, vulkan-loader
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "ruffle";
-  version = "nightly-2020-11-30";
+  version = "nightly-2021-01-12";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = pname;
     rev = version;
-    sha256 = "0z54swzy47laq3smficd3dyrs2zdi3cj2kb0b4hppjxpkkhiw4x0";
+    sha256 = "1lywxn61w0b3pb8vjpavd9f3v58gq35ypwp41b7rjkc4rjxmf3cd";
   };
 
   nativeBuildInputs = [
+    makeWrapper
     pkg-config
     python3
   ];
@@ -35,9 +38,14 @@ rustPlatform.buildRustPackage rec {
     xorg.libXi
     xorg.libxcb
     xorg.libXrender
+    vulkan-loader
   ];
 
-  cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw";
+  postInstall = ''
+    wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
+  '';
+
+  cargoSha256 = "113gh8nf2fs9shfvnzpwlc7zaq1l9l9jhlybcc4dq0wr4r8qpff5";
 
   meta = with lib; {
     description = "An Adobe Flash Player emulator written in the Rust programming language.";

From cd15b3a30a6f95b83f1e4cff11f6ebaf8d0ba66e Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 10 Jan 2021 00:46:13 -0300
Subject: [PATCH 043/956] nixos/libinput: separate settings by mouse/touchpad

This commits deprecates `services.xserver.libinput` for multiple
settings, one for each kind of device:

- `services.xserver.libinput.mouse`
- `services.xserver.libinput.touchpad`

Looking at `man 4 libinput`, they basically have the same options so I
simply replicated them, even if some options doesn't make sense for
mouse (`tapping` for example).

With this commit this is now possible:

```nix
{
  services.xserver.libinput = {
    enable = true;
    mouse = {
      accelProfile = "flat";
    };
    touchpad = {
      naturalScrolling = true;
    };
  };
}
```

And you will have a mouse with no natural scrolling but with accel
profile flat, while touchpad will have natural scrolling but accel
profile adaptative (default).

It is possible to support more device types
(tablets/keyboards/touchscreens), but at least looking at the
libinput manual for those devices it doesn't seem that it has any
configuration options for them. They can still be configured using
`services.xserver.inputClassSections` though, and this will work now
since there is no rule by default that matches them.

Closes issue #75007, while also making configuration of mouses and
touchpads using Nix attrs possible like said in PR #73785.
---
 .../services/x11/hardware/libinput.nix        | 96 ++++++++++++-------
 1 file changed, 59 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 9548ecb8ef6..631fb824768 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -3,23 +3,18 @@
 with lib;
 
 let cfg = config.services.xserver.libinput;
+
     xorgBool = v: if v then "on" else "off";
-in {
-
-  options = {
-
-    services.xserver.libinput = {
-
-      enable = mkEnableOption "libinput";
 
+    mkConfigForDevice = deviceType: {
       dev = mkOption {
         type = types.nullOr types.str;
         default = null;
         example = "/dev/input/event0";
         description =
           ''
-            Path for touchpad device.  Set to null to apply to any
-            auto-detected touchpad.
+            Path for ${deviceType} device.  Set to null to apply to any
+            auto-detected ${deviceType}.
           '';
       };
 
@@ -185,14 +180,63 @@ in {
           Option "DragLockButtons" "L1 B1 L2 B2"
         '';
         description = ''
-          Additional options for libinput touchpad driver. See
+          Additional options for libinput ${deviceType} driver. See
           <citerefentry><refentrytitle>libinput</refentrytitle><manvolnum>4</manvolnum></citerefentry>
           for available options.";
         '';
       };
-
     };
 
+    mkX11ConfigForDevice = deviceType: matchIs: ''
+        Identifier "libinput ${deviceType} configuration"
+        MatchDriver "libinput"
+        MatchIs${matchIs} "${xorgBool true}"
+        ${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''}
+        Option "AccelProfile" "${cfg.${deviceType}.accelProfile}"
+        ${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''}
+        ${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''}
+        ${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''}
+        ${optionalString (cfg.${deviceType}.clickMethod != null) ''Option "ClickMethod" "${cfg.${deviceType}.clickMethod}"''}
+        Option "LeftHanded" "${xorgBool cfg.${deviceType}.leftHanded}"
+        Option "MiddleEmulation" "${xorgBool cfg.${deviceType}.middleEmulation}"
+        Option "NaturalScrolling" "${xorgBool cfg.${deviceType}.naturalScrolling}"
+        ${optionalString (cfg.${deviceType}.scrollButton != null) ''Option "ScrollButton" "${toString cfg.${deviceType}.scrollButton}"''}
+        Option "ScrollMethod" "${cfg.${deviceType}.scrollMethod}"
+        Option "HorizontalScrolling" "${xorgBool cfg.${deviceType}.horizontalScrolling}"
+        Option "SendEventsMode" "${cfg.${deviceType}.sendEventsMode}"
+        Option "Tapping" "${xorgBool cfg.${deviceType}.tapping}"
+        Option "TappingDragLock" "${xorgBool cfg.${deviceType}.tappingDragLock}"
+        Option "DisableWhileTyping" "${xorgBool cfg.${deviceType}.disableWhileTyping}"
+        ${cfg.${deviceType}.additionalOptions}
+  '';
+in {
+
+  imports =
+    (map (option: mkRenamedOptionModule ([ "services" "xserver" "libinput" option ]) [ "services" "xserver" "libinput" "touchpad" option ]) [
+      "accelProfile"
+      "accelSpeed"
+      "buttonMapping"
+      "calibrationMatrix"
+      "clickMethod"
+      "leftHanded"
+      "middleEmulation"
+      "naturalScrolling"
+      "scrollButton"
+      "scrollMethod"
+      "horizontalScrolling"
+      "sendEventsMode"
+      "tapping"
+      "disableWhileTyping"
+      "additionalOptions"
+    ]);
+
+  options = {
+
+    services.xserver.libinput = {
+      enable = mkEnableOption "libinput";
+      mouse = mkConfigForDevice "mouse";
+      touchpad = mkConfigForDevice "touchpad";
+    };
   };
 
 
@@ -212,32 +256,10 @@ in {
 
     services.udev.packages = [ pkgs.libinput.out ];
 
-    services.xserver.config =
-      ''
-        # General libinput configuration.
-        # See CONFIGURATION DETAILS section of man:libinput(4).
-        Section "InputClass"
-          Identifier "libinputConfiguration"
-          MatchDriver "libinput"
-          ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
-          Option "AccelProfile" "${cfg.accelProfile}"
-          ${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
-          ${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
-          ${optionalString (cfg.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.calibrationMatrix}"''}
-          ${optionalString (cfg.clickMethod != null) ''Option "ClickMethod" "${cfg.clickMethod}"''}
-          Option "LeftHanded" "${xorgBool cfg.leftHanded}"
-          Option "MiddleEmulation" "${xorgBool cfg.middleEmulation}"
-          Option "NaturalScrolling" "${xorgBool cfg.naturalScrolling}"
-          ${optionalString (cfg.scrollButton != null) ''Option "ScrollButton" "${toString cfg.scrollButton}"''}
-          Option "ScrollMethod" "${cfg.scrollMethod}"
-          Option "HorizontalScrolling" "${xorgBool cfg.horizontalScrolling}"
-          Option "SendEventsMode" "${cfg.sendEventsMode}"
-          Option "Tapping" "${xorgBool cfg.tapping}"
-          Option "TappingDragLock" "${xorgBool cfg.tappingDragLock}"
-          Option "DisableWhileTyping" "${xorgBool cfg.disableWhileTyping}"
-          ${cfg.additionalOptions}
-        EndSection
-      '';
+    services.xserver.inputClassSections = [
+      (mkX11ConfigForDevice "mouse" "Pointer")
+      (mkX11ConfigForDevice "touchpad" "Touchpad")
+    ];
 
     assertions = [
       # already present in synaptics.nix

From 887386fbbebd4ef2969e65dd9e49ea5af6e57748 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 10 Jan 2021 01:03:30 -0300
Subject: [PATCH 044/956] nixos/doc: fix manual reference to libinput

---
 nixos/doc/manual/configuration/x-windows.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index b33f6cf82b5..dd879702d7d 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -186,7 +186,7 @@
    The driver has many options (see <xref linkend="ch-options"/>). For
    instance, the following disables tap-to-click behavior:
 <programlisting>
-<xref linkend="opt-services.xserver.libinput.tapping"/> = false;
+<xref linkend="opt-services.xserver.libinput.touchpad.tapping"/> = false;
 </programlisting>
    Note: the use of <literal>services.xserver.synaptics</literal> is deprecated
    since NixOS 17.09.

From 0f762e558249529a6a55db3eebf6c2e943db3649 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 13 Jan 2021 10:17:23 -0300
Subject: [PATCH 045/956] nixos/doc: document services.xserver.libinput changes

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

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index e46d1ca403f..94e42369b60 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -430,6 +430,17 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e
       dynamically allocated uid.
     </para>
    </listitem>
+   <listitem>
+     <para>
+      The libinput module has been updated with the ability to configure mouse and touchpad settings separately.
+      The options in <literal>services.xserver.libinput</literal> have been renamed to <literal>services.xserver.libinput.touchpad</literal>,
+      while there is a new <literal>services.xserver.libinput.mouse</literal> for mouse related configuration.
+     </para>
+     <para>
+      Since touchpad options no longer apply to all devices, you may want to replicate your touchpad configuration in
+      mouse section.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From c7102b26ce83c675b67c7a0fca24f4c275435473 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Fri, 8 Jan 2021 01:34:58 +0000
Subject: [PATCH 046/956] buildBazelPackage: only rewrite relevant symlinks

---
 pkgs/build-support/build-bazel-package/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 10a331bcc9e..3be72bd22c3 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -172,7 +172,9 @@ in stdenv.mkDerivation (fBuildAttrs // {
 
     chmod -R +w $bazelOut
     find $bazelOut -type l | while read symlink; do
-      ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
+      if [[ $(readlink "$symlink") == *NIX_BUILD_TOP* ]]; then
+        ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
+      fi
     done
   '' + fBuildAttrs.preConfigure or "";
 

From 6e684ca91e89b224572736746470f44431cd956a Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Fri, 8 Jan 2021 01:35:50 +0000
Subject: [PATCH 047/956] envoy: init at 1.16.2

---
 .../0001-quiche-update-QUICHE-tar-13949.patch | 2980 +++++++++++++++++
 ...patch-to-make-it-compile-under-GCC10.patch |   91 +
 pkgs/servers/http/envoy/default.nix           |  119 +
 pkgs/top-level/all-packages.nix               |    2 +
 4 files changed, 3192 insertions(+)
 create mode 100644 pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch
 create mode 100644 pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch
 create mode 100644 pkgs/servers/http/envoy/default.nix

diff --git a/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch b/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch
new file mode 100644
index 00000000000..4bf0a0d0e95
--- /dev/null
+++ b/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch
@@ -0,0 +1,2980 @@
+From 97d7c456e03d4a11157fac17c7b8cbcee1d8a657 Mon Sep 17 00:00:00 2001
+From: danzh <danzh2010@users.noreply.github.com>
+Date: Mon, 16 Nov 2020 14:27:13 -0500
+Subject: [PATCH] quiche: update QUICHE tar (#13949)
+
+Signed-off-by: Dan Zhang <danzh@google.com>
+---
+ bazel/envoy_internal.bzl                      |   2 +
+ bazel/external/quiche.BUILD                   |  85 +--
+ bazel/repository_locations.bzl                |   6 +-
+ source/extensions/quic_listeners/quiche/BUILD |   1 +
+ .../quiche/active_quic_listener.cc            |   2 +-
+ .../quiche/envoy_quic_client_connection.cc    |   2 +-
+ .../quiche/envoy_quic_client_stream.cc        |   1 +
+ .../quiche/envoy_quic_connection.cc           |   6 +-
+ .../quiche/envoy_quic_connection.h            |   1 +
+ .../quiche/envoy_quic_dispatcher.cc           |   6 +-
+ .../quiche/envoy_quic_dispatcher.h            |   2 +-
+ .../quiche/envoy_quic_proof_source.cc         |   2 +-
+ .../quiche/envoy_quic_proof_source.h          |   2 +-
+ .../quiche/envoy_quic_proof_source_base.cc    |   7 +-
+ .../quiche/envoy_quic_proof_source_base.h     |   6 +-
+ .../quiche/envoy_quic_proof_verifier_base.cc  |   4 +-
+ .../quiche/envoy_quic_server_connection.cc    |  10 +-
+ .../quiche/envoy_quic_server_connection.h     |   1 +
+ .../quic_listeners/quiche/platform/BUILD      |  42 +-
+ .../quiche/platform/flags_impl.cc             | 108 +++-
+ .../quiche/platform/flags_impl.h              |  46 +-
+ .../quiche/platform/flags_list.h              | 502 ------------------
+ .../quiche/platform/http2_flags_impl.h        |   4 +-
+ .../quiche/platform/quic_aligned_impl.h       |  18 -
+ .../quiche/platform/quic_cert_utils_impl.cc   |  38 +-
+ .../quiche/platform/quic_cert_utils_impl.h    |   9 +-
+ .../quiche/platform/quic_fallthrough_impl.h   |  11 -
+ .../quiche/platform/quic_file_utils_impl.cc   |   4 +-
+ .../quiche/platform/quic_file_utils_impl.h    |   6 +-
+ .../quiche/platform/quic_flags_impl.h         |   6 +-
+ .../platform/quic_hostname_utils_impl.cc      |   6 +-
+ .../platform/quic_hostname_utils_impl.h       |   8 +-
+ .../quiche/platform/quic_macros_impl.h        |  13 -
+ .../platform/quic_mem_slice_span_impl.cc      |   3 +-
+ .../platform/quic_mem_slice_span_impl.h       |   9 +-
+ ..._ptr_util_impl.h => quic_testvalue_impl.h} |  11 +-
+ .../platform/quic_udp_socket_platform_impl.h  |   3 +
+ .../quiche/platform/quiche_arraysize_impl.h   |  11 -
+ .../quiche/platform/quiche_optional_impl.h    |  17 -
+ .../quiche/platform/quiche_text_utils_impl.h  |  63 +--
+ .../quiche/platform/quiche_time_utils_impl.cc |   4 +-
+ .../quiche/platform/quiche_time_utils_impl.h  |   4 +-
+ .../platform/spdy_endianness_util_impl.h      |  29 -
+ .../quiche/platform/spdy_flags_impl.h         |   4 +-
+ .../quiche/platform/spdy_string_utils_impl.h  |   2 +-
+ .../spdy_server_push_utils_for_envoy.cc       |  10 +-
+ .../quiche/envoy_quic_client_session_test.cc  |   2 +-
+ .../quiche/envoy_quic_client_stream_test.cc   |  44 +-
+ .../quiche/envoy_quic_proof_source_test.cc    |   6 +-
+ .../quiche/envoy_quic_proof_verifier_test.cc  |   8 +-
+ .../quiche/envoy_quic_server_session_test.cc  |   3 +-
+ .../quiche/envoy_quic_server_stream_test.cc   |  53 +-
+ .../quic_listeners/quiche/platform/BUILD      |  22 -
+ .../quiche/platform/http2_platform_test.cc    |  22 +-
+ .../quiche/platform/quic_platform_test.cc     |  61 +--
+ .../quiche/platform/quic_test_output_impl.cc  |  15 +-
+ .../quiche/platform/quic_test_output_impl.h   |  12 +-
+ .../quiche/platform/quiche_platform_test.cc   |  39 --
+ .../quiche/platform/spdy_platform_test.cc     |  20 +-
+ .../quic_listeners/quiche/test_proof_source.h |   2 +-
+ .../quic_listeners/quiche/test_utils.h        |   4 +-
+ 61 files changed, 396 insertions(+), 1054 deletions(-)
+ delete mode 100644 source/extensions/quic_listeners/quiche/platform/flags_list.h
+ delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h
+ delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h
+ delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h
+ rename source/extensions/quic_listeners/quiche/platform/{quiche_ptr_util_impl.h => quic_testvalue_impl.h} (52%)
+ delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h
+ delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h
+ delete mode 100644 source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h
+ delete mode 100644 test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc
+
+diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl
+index 5ad86609a..3f9ddfd23 100644
+--- a/bazel/envoy_internal.bzl
++++ b/bazel/envoy_internal.bzl
+@@ -54,6 +54,8 @@ def envoy_copts(repository, test = False):
+            }) + select({
+                repository + "//bazel:clang_build": ["-fno-limit-debug-info", "-Wgnu-conditional-omitted-operand", "-Wc++2a-extensions", "-Wrange-loop-analysis"],
+                repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"],
++               # TODO: Replace with /Zc:preprocessor for cl.exe versions >= 16.5
++               repository + "//bazel:windows_x86_64": ["-experimental:preprocessor", "-Wv:19.4"],
+                "//conditions:default": [],
+            }) + select({
+                repository + "//bazel:no_debug_info": ["-g0"],
+diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD
+index 7541909aa..b6b208fc5 100644
+--- a/bazel/external/quiche.BUILD
++++ b/bazel/external/quiche.BUILD
+@@ -57,16 +57,12 @@ quiche_common_copts = [
+     "-Wno-unused-function",
+     # quic_inlined_frame.h uses offsetof() to optimize memory usage in frames.
+     "-Wno-invalid-offsetof",
+-    "-Wno-range-loop-analysis",
+ ]
+ 
+ quiche_copts = select({
+     # Ignore unguarded #pragma GCC statements in QUICHE sources
+     "@envoy//bazel:windows_x86_64": ["-wd4068"],
+     # Remove these after upstream fix.
+-    "@envoy//bazel:gcc_build": [
+-        "-Wno-sign-compare",
+-    ] + quiche_common_copts,
+     "//conditions:default": quiche_common_copts,
+ })
+ 
+@@ -737,7 +733,6 @@ envoy_cc_library(
+     hdrs = [
+         "quiche/spdy/platform/api/spdy_bug_tracker.h",
+         "quiche/spdy/platform/api/spdy_containers.h",
+-        "quiche/spdy/platform/api/spdy_endianness_util.h",
+         "quiche/spdy/platform/api/spdy_estimate_memory_usage.h",
+         "quiche/spdy/platform/api/spdy_flags.h",
+         "quiche/spdy/platform/api/spdy_logging.h",
+@@ -935,6 +930,7 @@ envoy_cc_library(
+     copts = quiche_copts,
+     repository = "@envoy",
+     deps = [
++        ":http2_hpack_huffman_hpack_huffman_encoder_lib",
+         ":spdy_core_protocol_lib",
+         ":spdy_platform",
+     ],
+@@ -1049,19 +1045,16 @@ envoy_cc_library(
+ envoy_cc_library(
+     name = "quic_platform_base",
+     hdrs = [
+-        "quiche/quic/platform/api/quic_aligned.h",
+         "quiche/quic/platform/api/quic_bug_tracker.h",
+         "quiche/quic/platform/api/quic_client_stats.h",
+         "quiche/quic/platform/api/quic_containers.h",
+         "quiche/quic/platform/api/quic_error_code_wrappers.h",
+         "quiche/quic/platform/api/quic_estimate_memory_usage.h",
+         "quiche/quic/platform/api/quic_exported_stats.h",
+-        "quiche/quic/platform/api/quic_fallthrough.h",
+         "quiche/quic/platform/api/quic_flag_utils.h",
+         "quiche/quic/platform/api/quic_flags.h",
+         "quiche/quic/platform/api/quic_iovec.h",
+         "quiche/quic/platform/api/quic_logging.h",
+-        "quiche/quic/platform/api/quic_macros.h",
+         "quiche/quic/platform/api/quic_map_util.h",
+         "quiche/quic/platform/api/quic_mem_slice.h",
+         "quiche/quic/platform/api/quic_prefetch.h",
+@@ -1072,6 +1065,7 @@ envoy_cc_library(
+         "quiche/quic/platform/api/quic_stream_buffer_allocator.h",
+         "quiche/quic/platform/api/quic_string_utils.h",
+         "quiche/quic/platform/api/quic_uint128.h",
++        "quiche/quic/platform/api/quic_testvalue.h",
+         # TODO: uncomment the following files as implementations are added.
+         # "quiche/quic/platform/api/quic_fuzzed_data_provider.h",
+         # "quiche/quic/platform/api/quic_test_loopback.h",
+@@ -1147,7 +1141,6 @@ envoy_cc_test_library(
+     hdrs = ["quiche/quic/platform/api/quic_port_utils.h"],
+     repository = "@envoy",
+     tags = ["nofips"],
+-    deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"],
+ )
+ 
+ envoy_cc_library(
+@@ -1216,15 +1209,14 @@ envoy_cc_test_library(
+ )
+ 
+ envoy_cc_library(
+-    name = "quiche_common_platform_endian",
+-    hdrs = ["quiche/common/platform/api/quiche_endian.h"],
++    name = "quiche_common_endian_lib",
++    hdrs = ["quiche/common/quiche_endian.h"],
+     repository = "@envoy",
+     tags = ["nofips"],
+     visibility = ["//visibility:public"],
+     deps =
+         [
+             ":quiche_common_platform_export",
+-            "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_endian_impl_lib",
+         ],
+ )
+ 
+@@ -1932,6 +1924,7 @@ envoy_cc_library(
+     visibility = ["//visibility:public"],
+     deps = [
+         ":quic_core_clock_lib",
++        ":quic_core_crypto_certificate_view_lib",
+         ":quic_core_crypto_encryption_lib",
+         ":quic_core_crypto_hkdf_lib",
+         ":quic_core_crypto_proof_source_interface_lib",
+@@ -2167,6 +2160,15 @@ envoy_cc_library(
+     ],
+ )
+ 
++envoy_cc_library(
++    name = "quic_core_flags_list_lib",
++    hdrs = ["quiche/quic/core/quic_flags_list.h"],
++    copts = quiche_copts,
++    repository = "@envoy",
++    tags = ["nofips"],
++    visibility = ["//visibility:public"],
++)
++
+ envoy_cc_library(
+     name = "quic_core_framer_lib",
+     srcs = ["quiche/quic/core/quic_framer.cc"],
+@@ -2339,6 +2341,7 @@ envoy_cc_library(
+     repository = "@envoy",
+     tags = ["nofips"],
+     deps = [
++        ":http2_constants_lib",
+         ":quic_core_data_lib",
+         ":quic_core_error_codes_lib",
+         ":quic_core_http_http_frames_lib",
+@@ -2723,6 +2726,27 @@ envoy_cc_library(
+     ],
+ )
+ 
++envoy_cc_library(
++    name = "quic_core_path_validator_lib",
++    srcs = ["quiche/quic/core/quic_path_validator.cc"],
++    hdrs = ["quiche/quic/core/quic_path_validator.h"],
++    copts = quiche_copts,
++    repository = "@envoy",
++    tags = ["nofips"],
++    deps = [
++        ":quic_core_alarm_factory_interface_lib",
++        ":quic_core_alarm_interface_lib",
++        ":quic_core_arena_scoped_ptr_lib",
++        ":quic_core_clock_lib",
++        ":quic_core_constants_lib",
++        ":quic_core_crypto_random_lib",
++        ":quic_core_one_block_arena_lib",
++        ":quic_core_packet_writer_interface_lib",
++        ":quic_core_types_lib",
++        ":quic_platform",
++    ],
++)
++
+ envoy_cc_library(
+     name = "quic_core_process_packet_interface_lib",
+     hdrs = ["quiche/quic/core/quic_process_packet_interface.h"],
+@@ -2735,6 +2759,15 @@ envoy_cc_library(
+     ],
+ )
+ 
++envoy_cc_library(
++    name = "quic_core_protocol_flags_list_lib",
++    hdrs = ["quiche/quic/core/quic_protocol_flags_list.h"],
++    copts = quiche_copts,
++    repository = "@envoy",
++    tags = ["nofips"],
++    visibility = ["//visibility:public"],
++)
++
+ envoy_cc_library(
+     name = "quic_core_qpack_blocking_manager_lib",
+     srcs = ["quiche/quic/core/qpack/qpack_blocking_manager.cc"],
+@@ -2896,6 +2929,7 @@ envoy_cc_library(
+     deps = [
+         ":http2_decoder_decode_buffer_lib",
+         ":http2_decoder_decode_status_lib",
++        ":quic_core_error_codes_lib",
+         ":quic_core_qpack_qpack_instruction_decoder_lib",
+         ":quic_core_qpack_qpack_instructions_lib",
+         ":quic_core_qpack_qpack_stream_receiver_lib",
+@@ -3368,7 +3402,7 @@ envoy_cc_library(
+         ":quic_core_error_codes_lib",
+         ":quic_core_time_lib",
+         ":quic_platform_base",
+-        ":quiche_common_platform_endian",
++        ":quiche_common_endian_lib",
+     ],
+ )
+ 
+@@ -3420,6 +3454,7 @@ envoy_cc_library(
+     repository = "@envoy",
+     tags = ["nofips"],
+     deps = [
++        ":quic_core_circular_deque_lib",
+         ":quic_core_connection_stats_lib",
+         ":quic_core_packets_lib",
+         ":quic_core_session_notifier_interface_lib",
+@@ -3459,6 +3494,7 @@ envoy_cc_library(
+     deps = [
+         ":quic_core_versions_lib",
+         ":quic_platform_base",
++        ":quiche_common_endian_lib",
+     ],
+ )
+ 
+@@ -3475,7 +3511,6 @@ envoy_cc_library(
+         ":quic_core_tag_lib",
+         ":quic_core_types_lib",
+         ":quic_platform_base",
+-        ":quiche_common_platform_endian",
+     ],
+ )
+ 
+@@ -3746,6 +3781,7 @@ envoy_cc_test_library(
+         ":quic_core_packet_creator_lib",
+         ":quic_core_packet_writer_interface_lib",
+         ":quic_core_packets_lib",
++        ":quic_core_path_validator_lib",
+         ":quic_core_received_packet_manager_lib",
+         ":quic_core_sent_packet_manager_lib",
+         ":quic_core_server_id_lib",
+@@ -3836,25 +3872,10 @@ envoy_cc_test_library(
+     deps = [":epoll_server_platform"],
+ )
+ 
+-envoy_cc_library(
+-    name = "quiche_common_platform_optional",
+-    hdrs = ["quiche/common/platform/api/quiche_optional.h"],
+-    repository = "@envoy",
+-    tags = ["nofips"],
+-    visibility = ["//visibility:public"],
+-    deps = [
+-        ":quiche_common_platform_export",
+-        "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_optional_impl_lib",
+-    ],
+-)
+-
+ envoy_cc_library(
+     name = "quiche_common_platform",
+     hdrs = [
+-        "quiche/common/platform/api/quiche_arraysize.h",
+         "quiche/common/platform/api/quiche_logging.h",
+-        "quiche/common/platform/api/quiche_optional.h",
+-        "quiche/common/platform/api/quiche_ptr_util.h",
+         "quiche/common/platform/api/quiche_str_cat.h",
+         "quiche/common/platform/api/quiche_string_piece.h",
+         "quiche/common/platform/api/quiche_text_utils.h",
+@@ -3866,7 +3887,6 @@ envoy_cc_library(
+     visibility = ["//visibility:public"],
+     deps = [
+         ":quiche_common_platform_export",
+-        ":quiche_common_platform_optional",
+         "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_impl_lib",
+     ],
+ )
+@@ -3874,7 +3894,6 @@ envoy_cc_library(
+ envoy_cc_test_library(
+     name = "quiche_common_platform_test",
+     srcs = [
+-        "quiche/common/platform/api/quiche_endian_test.cc",
+         "quiche/common/platform/api/quiche_str_cat_test.cc",
+         "quiche/common/platform/api/quiche_text_utils_test.cc",
+         "quiche/common/platform/api/quiche_time_utils_test.cc",
+@@ -3884,7 +3903,6 @@ envoy_cc_test_library(
+     tags = ["nofips"],
+     deps = [
+         ":quiche_common_platform",
+-        ":quiche_common_platform_endian",
+         "@envoy//test/extensions/quic_listeners/quiche/platform:quiche_common_platform_test_impl_lib",
+     ],
+ )
+@@ -3904,8 +3922,8 @@ envoy_cc_library(
+     tags = ["nofips"],
+     visibility = ["//visibility:public"],
+     deps = [
++        ":quiche_common_endian_lib",
+         ":quiche_common_platform",
+-        ":quiche_common_platform_endian",
+     ],
+ )
+ 
+@@ -3944,6 +3962,7 @@ envoy_cc_test(
+     deps = [
+         ":http2_platform",
+         ":http2_test_tools_random",
++        ":quiche_common_test_tools_test_utils_lib",
+     ],
+ )
+ 
+diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
+index 6eba5a821..19ddc76e8 100644
+--- a/bazel/repository_locations.bzl
++++ b/bazel/repository_locations.bzl
+@@ -671,9 +671,9 @@ DEPENDENCY_REPOSITORIES_SPEC = dict(
+         project_name = "QUICHE",
+         project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols",
+         project_url = "https://quiche.googlesource.com/quiche",
+-        # Static snapshot of https://quiche.googlesource.com/quiche/+archive/f555d99a084cdd086a349548c70fb558ac5847cf.tar.gz
+-        version = "f555d99a084cdd086a349548c70fb558ac5847cf",
+-        sha256 = "1833f08e7b0f18b49d7498b029b7f3e6559a82113ec82a98a9e945553756e351",
++        # Static snapshot of https://quiche.googlesource.com/quiche/+archive/ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea.tar.gz
++        version = "ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea",
++        sha256 = "52680dea984dbe899c27176155578b97276e1f1516b7c3a63fb16ba593061859",
+         urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"],
+         use_category = ["dataplane_ext"],
+         extensions = ["envoy.transport_sockets.quic"],
+diff --git a/source/extensions/quic_listeners/quiche/BUILD b/source/extensions/quic_listeners/quiche/BUILD
+index 29eb78d15..a90cfde6d 100644
+--- a/source/extensions/quic_listeners/quiche/BUILD
++++ b/source/extensions/quic_listeners/quiche/BUILD
+@@ -212,6 +212,7 @@ envoy_cc_library(
+         "//source/common/buffer:buffer_lib",
+         "//source/common/common:assert_lib",
+         "//source/common/http:header_map_lib",
++        "//source/common/http:header_utility_lib",
+         "//source/extensions/quic_listeners/quiche/platform:quic_platform_mem_slice_storage_impl_lib",
+         "@com_googlesource_quiche//:quic_core_http_client_lib",
+     ],
+diff --git a/source/extensions/quic_listeners/quiche/active_quic_listener.cc b/source/extensions/quic_listeners/quiche/active_quic_listener.cc
+index f4808adc5..86912292a 100644
+--- a/source/extensions/quic_listeners/quiche/active_quic_listener.cc
++++ b/source/extensions/quic_listeners/quiche/active_quic_listener.cc
+@@ -55,7 +55,7 @@ ActiveQuicListener::ActiveQuicListener(
+   quic::QuicRandom* const random = quic::QuicRandom::GetInstance();
+   random->RandBytes(random_seed_, sizeof(random_seed_));
+   crypto_config_ = std::make_unique<quic::QuicCryptoServerConfig>(
+-      quiche::QuicheStringPiece(reinterpret_cast<char*>(random_seed_), sizeof(random_seed_)),
++      absl::string_view(reinterpret_cast<char*>(random_seed_), sizeof(random_seed_)),
+       quic::QuicRandom::GetInstance(),
+       std::make_unique<EnvoyQuicProofSource>(listen_socket_, listener_config.filterChainManager(),
+                                              stats_),
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc
+index e79b08ad9..95d63729d 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc
+@@ -43,7 +43,7 @@ EnvoyQuicClientConnection::EnvoyQuicClientConnection(
+     const quic::ParsedQuicVersionVector& supported_versions, Event::Dispatcher& dispatcher,
+     Network::ConnectionSocketPtr&& connection_socket)
+     : EnvoyQuicConnection(
+-          server_connection_id,
++          server_connection_id, quic::QuicSocketAddress(),
+           envoyIpAddressToQuicSocketAddress(connection_socket->remoteAddress()->ip()), helper,
+           alarm_factory, writer, owns_writer, quic::Perspective::IS_CLIENT, supported_versions,
+           std::move(connection_socket)),
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc
+index 866e35416..a759b26b1 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc
+@@ -20,6 +20,7 @@
+ 
+ #include "common/buffer/buffer_impl.h"
+ #include "common/http/header_map_impl.h"
++#include "common/http/header_utility.h"
+ #include "common/common/assert.h"
+ 
+ namespace Envoy {
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc
+index dcc311a6e..d813dfe4b 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc
+@@ -6,6 +6,7 @@ namespace Envoy {
+ namespace Quic {
+ 
+ EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id,
++                                         quic::QuicSocketAddress initial_self_address,
+                                          quic::QuicSocketAddress initial_peer_address,
+                                          quic::QuicConnectionHelperInterface& helper,
+                                          quic::QuicAlarmFactory& alarm_factory,
+@@ -13,8 +14,9 @@ EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_co
+                                          quic::Perspective perspective,
+                                          const quic::ParsedQuicVersionVector& supported_versions,
+                                          Network::ConnectionSocketPtr&& connection_socket)
+-    : quic::QuicConnection(server_connection_id, initial_peer_address, &helper, &alarm_factory,
+-                           writer, owns_writer, perspective, supported_versions),
++    : quic::QuicConnection(server_connection_id, initial_self_address, initial_peer_address,
++                           &helper, &alarm_factory, writer, owns_writer, perspective,
++                           supported_versions),
+       connection_socket_(std::move(connection_socket)) {}
+ 
+ EnvoyQuicConnection::~EnvoyQuicConnection() { connection_socket_->close(); }
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h
+index f4c8589d7..f8543bc93 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h
+@@ -26,6 +26,7 @@ class EnvoyQuicConnection : public quic::QuicConnection,
+                             protected Logger::Loggable<Logger::Id::connection> {
+ public:
+   EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id,
++                      quic::QuicSocketAddress initial_self_address,
+                       quic::QuicSocketAddress initial_peer_address,
+                       quic::QuicConnectionHelperInterface& helper,
+                       quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer,
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc
+index ba8f7f3a8..e6351f643 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc
+@@ -48,11 +48,11 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i
+ }
+ 
+ std::unique_ptr<quic::QuicSession> EnvoyQuicDispatcher::CreateQuicSession(
+-    quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& /*self_address*/,
+-    const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece /*alpn*/,
++    quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& self_address,
++    const quic::QuicSocketAddress& peer_address, absl::string_view /*alpn*/,
+     const quic::ParsedQuicVersion& version) {
+   auto quic_connection = std::make_unique<EnvoyQuicServerConnection>(
+-      server_connection_id, peer_address, *helper(), *alarm_factory(), writer(),
++      server_connection_id, self_address, peer_address, *helper(), *alarm_factory(), writer(),
+       /*owns_writer=*/false, quic::ParsedQuicVersionVector{version}, listen_socket_);
+   auto quic_session = std::make_unique<EnvoyQuicServerSession>(
+       config(), quic::ParsedQuicVersionVector{version}, std::move(quic_connection), this,
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h
+index 589ff5327..d59307f41 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h
+@@ -62,7 +62,7 @@ protected:
+   std::unique_ptr<quic::QuicSession>
+   CreateQuicSession(quic::QuicConnectionId server_connection_id,
+                     const quic::QuicSocketAddress& self_address,
+-                    const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece alpn,
++                    const quic::QuicSocketAddress& peer_address, absl::string_view alpn,
+                     const quic::ParsedQuicVersion& version) override;
+ 
+ private:
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc
+index 1f65e4e7e..967765829 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc
+@@ -36,7 +36,7 @@ EnvoyQuicProofSource::GetCertChain(const quic::QuicSocketAddress& server_address
+ 
+ void EnvoyQuicProofSource::signPayload(
+     const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address,
+-    const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in,
++    const std::string& hostname, uint16_t signature_algorithm, absl::string_view in,
+     std::unique_ptr<quic::ProofSource::SignatureCallback> callback) {
+   CertConfigWithFilterChain res =
+       getTlsCertConfigAndFilterChain(server_address, client_address, hostname);
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h
+index 6e1c74c92..e22bf3465 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h
+@@ -28,7 +28,7 @@ protected:
+   // quic::ProofSource
+   void signPayload(const quic::QuicSocketAddress& server_address,
+                    const quic::QuicSocketAddress& client_address, const std::string& hostname,
+-                   uint16_t signature_algorithm, quiche::QuicheStringPiece in,
++                   uint16_t signature_algorithm, absl::string_view in,
+                    std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override;
+ 
+ private:
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc
+index 2c82c04d9..9ad3cb07f 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc
+@@ -21,7 +21,7 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad
+                                         const std::string& hostname,
+                                         const std::string& server_config,
+                                         quic::QuicTransportVersion /*transport_version*/,
+-                                        quiche::QuicheStringPiece chlo_hash,
++                                        absl::string_view chlo_hash,
+                                         std::unique_ptr<quic::ProofSource::Callback> callback) {
+   quic::QuicReferenceCountedPointer<quic::ProofSource::Chain> chain =
+       GetCertChain(server_address, client_address, hostname);
+@@ -68,13 +68,12 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad
+   auto signature_callback = std::make_unique<SignatureCallback>(std::move(callback), chain);
+ 
+   signPayload(server_address, client_address, hostname, sign_alg,
+-              quiche::QuicheStringPiece(payload.get(), payload_size),
+-              std::move(signature_callback));
++              absl::string_view(payload.get(), payload_size), std::move(signature_callback));
+ }
+ 
+ void EnvoyQuicProofSourceBase::ComputeTlsSignature(
+     const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address,
+-    const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in,
++    const std::string& hostname, uint16_t signature_algorithm, absl::string_view in,
+     std::unique_ptr<quic::ProofSource::SignatureCallback> callback) {
+   signPayload(server_address, client_address, hostname, signature_algorithm, in,
+               std::move(callback));
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h
+index b7d76981e..a9e7e8c3f 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h
+@@ -57,7 +57,7 @@ public:
+   void GetProof(const quic::QuicSocketAddress& server_address,
+                 const quic::QuicSocketAddress& client_address, const std::string& hostname,
+                 const std::string& server_config, quic::QuicTransportVersion /*transport_version*/,
+-                quiche::QuicheStringPiece chlo_hash,
++                absl::string_view chlo_hash,
+                 std::unique_ptr<quic::ProofSource::Callback> callback) override;
+ 
+   TicketCrypter* GetTicketCrypter() override { return nullptr; }
+@@ -65,14 +65,14 @@ public:
+   void ComputeTlsSignature(const quic::QuicSocketAddress& server_address,
+                            const quic::QuicSocketAddress& client_address,
+                            const std::string& hostname, uint16_t signature_algorithm,
+-                           quiche::QuicheStringPiece in,
++                           absl::string_view in,
+                            std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override;
+ 
+ protected:
+   virtual void signPayload(const quic::QuicSocketAddress& server_address,
+                            const quic::QuicSocketAddress& client_address,
+                            const std::string& hostname, uint16_t signature_algorithm,
+-                           quiche::QuicheStringPiece in,
++                           absl::string_view in,
+                            std::unique_ptr<quic::ProofSource::SignatureCallback> callback) PURE;
+ 
+ private:
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc
+index 229b3ab36..e37590529 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc
+@@ -58,8 +58,8 @@ bool EnvoyQuicProofVerifierBase::verifySignature(const std::string& server_confi
+     *error_details = "QuicPacketWriter error.";
+     return false;
+   }
+-  bool valid = cert_view->VerifySignature(quiche::QuicheStringPiece(payload.get(), payload_size),
+-                                          signature, sign_alg);
++  bool valid = cert_view->VerifySignature(absl::string_view(payload.get(), payload_size), signature,
++                                          sign_alg);
+   if (!valid) {
+     *error_details = "Signature is not valid.";
+   }
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc
+index b8fa94221..974c6c8eb 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc
+@@ -11,11 +11,13 @@ namespace Quic {
+ 
+ EnvoyQuicServerConnection::EnvoyQuicServerConnection(
+     const quic::QuicConnectionId& server_connection_id,
+-    quic::QuicSocketAddress initial_peer_address, quic::QuicConnectionHelperInterface& helper,
+-    quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, bool owns_writer,
++    quic::QuicSocketAddress initial_self_address, quic::QuicSocketAddress initial_peer_address,
++    quic::QuicConnectionHelperInterface& helper, quic::QuicAlarmFactory& alarm_factory,
++    quic::QuicPacketWriter* writer, bool owns_writer,
+     const quic::ParsedQuicVersionVector& supported_versions, Network::Socket& listen_socket)
+-    : EnvoyQuicConnection(server_connection_id, initial_peer_address, helper, alarm_factory, writer,
+-                          owns_writer, quic::Perspective::IS_SERVER, supported_versions,
++    : EnvoyQuicConnection(server_connection_id, initial_self_address, initial_peer_address, helper,
++                          alarm_factory, writer, owns_writer, quic::Perspective::IS_SERVER,
++                          supported_versions,
+                           std::make_unique<Network::ConnectionSocketImpl>(
+                               // Wraps the real IoHandle instance so that if the connection socket
+                               // gets closed, the real IoHandle won't be affected.
+diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h
+index 7b7fac05e..7625fad02 100644
+--- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h
++++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h
+@@ -10,6 +10,7 @@ namespace Quic {
+ class EnvoyQuicServerConnection : public EnvoyQuicConnection {
+ public:
+   EnvoyQuicServerConnection(const quic::QuicConnectionId& server_connection_id,
++                            quic::QuicSocketAddress initial_self_address,
+                             quic::QuicSocketAddress initial_peer_address,
+                             quic::QuicConnectionHelperInterface& helper,
+                             quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer,
+diff --git a/source/extensions/quic_listeners/quiche/platform/BUILD b/source/extensions/quic_listeners/quiche/platform/BUILD
+index f53e07b58..839664d52 100644
+--- a/source/extensions/quic_listeners/quiche/platform/BUILD
++++ b/source/extensions/quic_listeners/quiche/platform/BUILD
+@@ -36,15 +36,16 @@ envoy_extension_package()
+ envoy_cc_library(
+     name = "flags_impl_lib",
+     srcs = ["flags_impl.cc"],
+-    hdrs = [
+-        "flags_impl.h",
+-        "flags_list.h",
+-    ],
++    hdrs = ["flags_impl.h"],
+     external_deps = [
+         "abseil_base",
+         "abseil_synchronization",
+     ],
+     visibility = ["//visibility:public"],
++    deps = [
++        "@com_googlesource_quiche//:quic_core_flags_list_lib",
++        "@com_googlesource_quiche//:quic_core_protocol_flags_list_lib",
++    ],
+ )
+ 
+ envoy_cc_library(
+@@ -62,7 +63,6 @@ envoy_cc_library(
+ envoy_cc_library(
+     name = "http2_platform_impl_lib",
+     hdrs = [
+-        "http2_arraysize_impl.h",
+         "http2_bug_tracker_impl.h",
+         "http2_containers_impl.h",
+         "http2_estimate_memory_usage_impl.h",
+@@ -74,7 +74,6 @@ envoy_cc_library(
+     ],
+     external_deps = [
+         "abseil_base",
+-        "abseil_optional",
+         "abseil_str_format",
+     ],
+     visibility = ["//visibility:public"],
+@@ -114,16 +113,13 @@ envoy_cc_library(
+         "quic_mem_slice_impl.cc",
+     ],
+     hdrs = [
+-        "quic_aligned_impl.h",
+         "quic_client_stats_impl.h",
+         "quic_containers_impl.h",
+         "quic_error_code_wrappers_impl.h",
+         "quic_estimate_memory_usage_impl.h",
+-        "quic_fallthrough_impl.h",
+         "quic_flag_utils_impl.h",
+         "quic_flags_impl.h",
+         "quic_iovec_impl.h",
+-        "quic_macros_impl.h",
+         "quic_map_util_impl.h",
+         "quic_mem_slice_impl.h",
+         "quic_prefetch_impl.h",
+@@ -132,6 +128,7 @@ envoy_cc_library(
+         "quic_server_stats_impl.h",
+         "quic_stack_trace_impl.h",
+         "quic_stream_buffer_allocator_impl.h",
++        "quic_testvalue_impl.h",
+         "quic_uint128_impl.h",
+     ],
+     external_deps = [
+@@ -141,7 +138,6 @@ envoy_cc_library(
+         "abseil_memory",
+         "abseil_node_hash_map",
+         "abseil_node_hash_set",
+-        "abseil_optional",
+     ],
+     tags = ["nofips"],
+     visibility = ["//visibility:public"],
+@@ -236,6 +232,7 @@ envoy_cc_library(
+     }),
+     repository = "@envoy",
+     tags = ["nofips"],
++    visibility = ["//visibility:public"],
+ )
+ 
+ envoy_cc_library(
+@@ -250,23 +247,12 @@ envoy_cc_library(
+     ],
+ )
+ 
+-envoy_cc_library(
+-    name = "quiche_common_platform_optional_impl_lib",
+-    hdrs = ["quiche_optional_impl.h"],
+-    external_deps = [
+-        "abseil_node_hash_map",
+-    ],
+-    visibility = ["//visibility:public"],
+-)
+-
+ envoy_cc_library(
+     name = "quiche_common_platform_impl_lib",
+     srcs = ["quiche_time_utils_impl.cc"],
+     hdrs = [
+-        "quiche_arraysize_impl.h",
+         "quiche_logging_impl.h",
+         "quiche_map_util_impl.h",
+-        "quiche_ptr_util_impl.h",
+         "quiche_str_cat_impl.h",
+         "quiche_string_piece_impl.h",
+         "quiche_text_utils_impl.h",
+@@ -281,17 +267,14 @@ envoy_cc_library(
+     deps = [
+         ":quic_platform_logging_impl_lib",
+         ":string_utils_lib",
+-        "@com_googlesource_quiche//:quiche_common_platform_optional",
+     ],
+ )
+ 
+ envoy_cc_library(
+     name = "spdy_platform_impl_lib",
+     hdrs = [
+-        "spdy_arraysize_impl.h",
+         "spdy_bug_tracker_impl.h",
+         "spdy_containers_impl.h",
+-        "spdy_endianness_util_impl.h",
+         "spdy_estimate_memory_usage_impl.h",
+         "spdy_flags_impl.h",
+         "spdy_logging_impl.h",
+@@ -331,14 +314,3 @@ envoy_cc_library(
+     tags = ["nofips"],
+     visibility = ["//visibility:public"],
+ )
+-
+-envoy_cc_library(
+-    name = "quiche_common_platform_endian_impl_lib",
+-    hdrs = ["quiche_endian_impl.h"],
+-    tags = ["nofips"],
+-    visibility = ["//visibility:public"],
+-    deps = [
+-        "quiche_common_platform_export_impl_lib",
+-        "//source/common/common:byte_order_lib",
+-    ],
+-)
+diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc
+index 70fb182d6..9d4ea89ce 100644
+--- a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc
++++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc
+@@ -15,12 +15,24 @@ namespace quiche {
+ 
+ namespace {
+ 
+-absl::flat_hash_map<std::string, Flag*> MakeFlagMap() {
++absl::flat_hash_map<std::string, Flag*> makeFlagMap() {
+   absl::flat_hash_map<std::string, Flag*> flags;
+ 
+-#define QUICHE_FLAG(type, flag, value, help) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag);
+-#include "extensions/quic_listeners/quiche/platform/flags_list.h"
+-#undef QUICHE_FLAG
++#define QUIC_FLAG(flag, ...) flags.emplace(flag->name(), flag);
++#include "quiche/quic/core/quic_flags_list.h"
++  QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false)
++  QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true)
++  QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false)
++  QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true)
++  QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false)
++  QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true)
++  QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false)
++  QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true)
++#undef QUIC_FLAG
++
++#define QUIC_PROTOCOL_FLAG(type, flag, ...) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag);
++#include "quiche/quic/core/quic_protocol_flags_list.h"
++#undef QUIC_PROTOCOL_FLAG
+ 
+   return flags;
+ }
+@@ -28,75 +40,123 @@ absl::flat_hash_map<std::string, Flag*> MakeFlagMap() {
+ } // namespace
+ 
+ // static
+-FlagRegistry& FlagRegistry::GetInstance() {
++FlagRegistry& FlagRegistry::getInstance() {
+   static auto* instance = new FlagRegistry();
+   return *instance;
+ }
+ 
+-FlagRegistry::FlagRegistry() : flags_(MakeFlagMap()) {}
++FlagRegistry::FlagRegistry() : flags_(makeFlagMap()) {}
+ 
+-void FlagRegistry::ResetFlags() const {
++void FlagRegistry::resetFlags() const {
+   for (auto& kv : flags_) {
+-    kv.second->ResetValue();
++    kv.second->resetValue();
+   }
+ }
+ 
+-Flag* FlagRegistry::FindFlag(const std::string& name) const {
++Flag* FlagRegistry::findFlag(const std::string& name) const {
+   auto it = flags_.find(name);
+   return (it != flags_.end()) ? it->second : nullptr;
+ }
+ 
+-template <> bool TypedFlag<bool>::SetValueFromString(const std::string& value_str) {
++template <> bool TypedFlag<bool>::setValueFromString(const std::string& value_str) {
+   static const auto* kTrueValues = new std::set<std::string>({"1", "t", "true", "y", "yes"});
+   static const auto* kFalseValues = new std::set<std::string>({"0", "f", "false", "n", "no"});
+   auto lower = absl::AsciiStrToLower(value_str);
+   if (kTrueValues->find(lower) != kTrueValues->end()) {
+-    SetValue(true);
++    setValue(true);
+     return true;
+   }
+   if (kFalseValues->find(lower) != kFalseValues->end()) {
+-    SetValue(false);
++    setValue(false);
+     return true;
+   }
+   return false;
+ }
+ 
+-template <> bool TypedFlag<int32_t>::SetValueFromString(const std::string& value_str) {
++template <> bool TypedFlag<int32_t>::setValueFromString(const std::string& value_str) {
+   int32_t value;
+   if (absl::SimpleAtoi(value_str, &value)) {
+-    SetValue(value);
++    setValue(value);
+     return true;
+   }
+   return false;
+ }
+ 
+-template <> bool TypedFlag<int64_t>::SetValueFromString(const std::string& value_str) {
++template <> bool TypedFlag<int64_t>::setValueFromString(const std::string& value_str) {
+   int64_t value;
+   if (absl::SimpleAtoi(value_str, &value)) {
+-    SetValue(value);
++    setValue(value);
+     return true;
+   }
+   return false;
+ }
+ 
+-template <> bool TypedFlag<double>::SetValueFromString(const std::string& value_str) {
++template <> bool TypedFlag<double>::setValueFromString(const std::string& value_str) {
+   double value;
+   if (absl::SimpleAtod(value_str, &value)) {
+-    SetValue(value);
++    setValue(value);
+     return true;
+   }
+   return false;
+ }
+ 
+-template <> bool TypedFlag<std::string>::SetValueFromString(const std::string& value_str) {
+-  SetValue(value_str);
++template <> bool TypedFlag<std::string>::setValueFromString(const std::string& value_str) {
++  setValue(value_str);
+   return true;
+ }
+ 
++template <> bool TypedFlag<unsigned long>::setValueFromString(const std::string& value_str) {
++  unsigned long value;
++  if (absl::SimpleAtoi(value_str, &value)) {
++    setValue(value);
++    return true;
++  }
++  return false;
++}
++
++template <> bool TypedFlag<unsigned long long>::setValueFromString(const std::string& value_str) {
++  unsigned long long value;
++  if (absl::SimpleAtoi(value_str, &value)) {
++    setValue(value);
++    return true;
++  }
++  return false;
++}
++
+ // Flag definitions
+-#define QUICHE_FLAG(type, flag, value, help)                                                       \
+-  TypedFlag<type>* FLAGS_##flag = new TypedFlag<type>(#flag, value, help);
+-#include "extensions/quic_listeners/quiche/platform/flags_list.h"
+-#undef QUICHE_FLAG
++#define QUIC_FLAG(flag, value) TypedFlag<bool>* flag = new TypedFlag<bool>(#flag, value, "");
++#include "quiche/quic/core/quic_flags_list.h"
++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false)
++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true)
++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false)
++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true)
++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false)
++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true)
++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false)
++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true)
++
++#undef QUIC_FLAG
++
++#define STRINGIFY(X) #X
++
++#define DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, help)                                    \
++  TypedFlag<type>* FLAGS_##flag = new TypedFlag<type>(STRINGIFY(FLAGS_##flag), value, help);
++
++#define DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE(type, flag, value, doc)                             \
++  DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, doc)
++
++#define DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES(type, flag, internal_value, external_value, doc)      \
++  DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, external_value, doc)
++
++// Select the right macro based on the number of arguments.
++#define GET_6TH_ARG(arg1, arg2, arg3, arg4, arg5, arg6, ...) arg6
++
++#define QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(...)                                                      \
++  GET_6TH_ARG(__VA_ARGS__, DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES,                                   \
++              DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE)
++
++#define QUIC_PROTOCOL_FLAG(...) QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
++#include "quiche/quic/core/quic_protocol_flags_list.h"
++#undef QUIC_PROTOCOL_FLAG
+ 
+ } // namespace quiche
+diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.h b/source/extensions/quic_listeners/quiche/platform/flags_impl.h
+index 5db939925..83ed8430c 100644
+--- a/source/extensions/quic_listeners/quiche/platform/flags_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.h
+@@ -26,13 +26,13 @@ public:
+   ~FlagRegistry() = default;
+ 
+   // Return singleton instance.
+-  static FlagRegistry& GetInstance();
++  static FlagRegistry& getInstance();
+ 
+   // Reset all registered flags to their default values.
+-  void ResetFlags() const;
++  void resetFlags() const;
+ 
+   // Look up a flag by name.
+-  Flag* FindFlag(const std::string& name) const;
++  Flag* findFlag(const std::string& name) const;
+ 
+ private:
+   FlagRegistry();
+@@ -48,10 +48,10 @@ public:
+   virtual ~Flag() = default;
+ 
+   // Set flag value from given string, returning true iff successful.
+-  virtual bool SetValueFromString(const std::string& value_str) = 0;
++  virtual bool setValueFromString(const std::string& value_str) = 0;
+ 
+   // Reset flag to default value.
+-  virtual void ResetValue() = 0;
++  virtual void resetValue() = 0;
+ 
+   // Return flag name.
+   std::string name() const { return name_; }
+@@ -70,15 +70,15 @@ public:
+   TypedFlag(const char* name, T default_value, const char* help)
+       : Flag(name, help), value_(default_value), default_value_(default_value) {}
+ 
+-  bool SetValueFromString(const std::string& value_str) override;
++  bool setValueFromString(const std::string& value_str) override;
+ 
+-  void ResetValue() override {
++  void resetValue() override {
+     absl::MutexLock lock(&mutex_);
+     value_ = default_value_;
+   }
+ 
+   // Set flag value.
+-  void SetValue(T value) {
++  void setValue(T value) {
+     absl::MutexLock lock(&mutex_);
+     value_ = value;
+   }
+@@ -96,15 +96,29 @@ private:
+ };
+ 
+ // SetValueFromString specializations
+-template <> bool TypedFlag<bool>::SetValueFromString(const std::string& value_str);
+-template <> bool TypedFlag<int32_t>::SetValueFromString(const std::string& value_str);
+-template <> bool TypedFlag<int64_t>::SetValueFromString(const std::string& value_str);
+-template <> bool TypedFlag<double>::SetValueFromString(const std::string& value_str);
+-template <> bool TypedFlag<std::string>::SetValueFromString(const std::string& value_str);
++template <> bool TypedFlag<bool>::setValueFromString(const std::string& value_str);
++template <> bool TypedFlag<int32_t>::setValueFromString(const std::string& value_str);
++template <> bool TypedFlag<int64_t>::setValueFromString(const std::string& value_str);
++template <> bool TypedFlag<double>::setValueFromString(const std::string& value_str);
++template <> bool TypedFlag<std::string>::setValueFromString(const std::string& value_str);
++template <> bool TypedFlag<unsigned long>::setValueFromString(const std::string& value_str);
++template <> bool TypedFlag<unsigned long long>::setValueFromString(const std::string& value_str);
+ 
+ // Flag declarations
+-#define QUICHE_FLAG(type, flag, value, help) extern TypedFlag<type>* FLAGS_##flag;
+-#include "extensions/quic_listeners/quiche/platform/flags_list.h"
+-#undef QUICHE_FLAG
++#define QUIC_FLAG(flag, ...) extern TypedFlag<bool>* flag;
++#include "quiche/quic/core/quic_flags_list.h"
++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false)
++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true)
++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false)
++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true)
++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false)
++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true)
++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false)
++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true)
++#undef QUIC_FLAG
++
++#define QUIC_PROTOCOL_FLAG(type, flag, ...) extern TypedFlag<type>* FLAGS_##flag;
++#include "quiche/quic/core/quic_protocol_flags_list.h"
++#undef QUIC_PROTOCOL_FLAG
+ 
+ } // namespace quiche
+diff --git a/source/extensions/quic_listeners/quiche/platform/flags_list.h b/source/extensions/quic_listeners/quiche/platform/flags_list.h
+deleted file mode 100644
+index 7e9e20a7c..000000000
+--- a/source/extensions/quic_listeners/quiche/platform/flags_list.h
++++ /dev/null
+@@ -1,502 +0,0 @@
+-// This file intentionally does not have header guards. It is intended to be
+-// included multiple times, each time with a different definition of
+-// QUICHE_FLAG.
+-
+-// NOLINT(namespace-envoy)
+-
+-// This file is part of the QUICHE platform implementation, and is not to be
+-// consumed or referenced directly by other Envoy code. It serves purely as a
+-// porting layer for QUICHE.
+-
+-// This file is generated by //third_party/quic/tools:quic_flags_list in
+-// Google3.
+-
+-#if defined(QUICHE_FLAG)
+-
+-QUICHE_FLAG(
+-    bool, http2_reloadable_flag_http2_backend_alpn_failure_error_code, false,
+-    "If true, the GFE will return a new ResponseCodeDetails error when ALPN to the backend fails.")
+-
+-QUICHE_FLAG(bool, http2_reloadable_flag_http2_ip_based_cwnd_exp, true,
+-            "If true, enable IP address based CWND bootstrapping experiment with different "
+-            "bandwidth models and priorities in HTTP2.")
+-
+-QUICHE_FLAG(
+-    bool, http2_reloadable_flag_http2_load_based_goaway_warning, false,
+-    "If true, load-based connection closures will send a warning GOAWAY before the actual GOAWAY.")
+-
+-QUICHE_FLAG(bool, http2_reloadable_flag_http2_security_requirement_for_client3, false,
+-            "If true, check whether client meets security requirements during SSL handshake. If "
+-            "flag is true and client does not meet security requirements, do not negotiate HTTP/2 "
+-            "with client or terminate the session with SPDY_INADEQUATE_SECURITY if HTTP/2 is "
+-            "already negotiated. The spec contains both cipher and TLS version requirements.")
+-
+-QUICHE_FLAG(bool, http2_reloadable_flag_http2_websocket_detection, false,
+-            "If true, uses a HTTP/2-specific method of detecting websocket upgrade requests.")
+-
+-QUICHE_FLAG(bool, http2_reloadable_flag_permissive_http2_switch, false,
+-            "If true, the GFE allows both HTTP/1.0 and HTTP/1.1 versions in HTTP/2 upgrade "
+-            "requests/responses.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_debugips, false, "")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_external_users, false, "")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_gclb_quic_allow_alia, true,
+-            "If gfe2_reloadable_flag_gclb_use_alia is also true, use Alia for GCLB QUIC "
+-            "handshakes. To be used as a big red button if there's a problem with Alia/QUIC.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_abort_qpack_on_stream_close, false,
+-            "If true, abort async QPACK header decompression in QuicSpdyStream::OnClose().")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_ack_delay_alarm_granularity, false,
+-            "When true, ensure the ACK delay is never less than the alarm granularity when ACK "
+-            "decimation is enabled.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_missing_connected_checks, false,
+-            "If true, add missing connected checks.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_silent_idle_timeout, true,
+-            "If true, when server is silently closing connections due to idle timeout, serialize "
+-            "the connection close packets which will be added to time wait list.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, false,
+-            "If true, include stream information in idle timeout connection close detail.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_backend_set_stream_ttl, false,
+-            "If true, check backend response header for X-Response-Ttl. If it is provided, the "
+-            "stream TTL is set. A QUIC stream will be immediately canceled when tries to write "
+-            "data if this TTL expired.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, true,
+-            "If true, allow client to enable BBRv2 on server via connection option 'B2ON'.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_alpn_dispatch, false,
+-            "Support different QUIC sessions, as indicated by ALPN. Used for QBONE.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false,
+-            "If true, QUIC BBRv2's PROBE_BW mode will not reduce cwnd below BDP+ack_height.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, false,
+-            "When true, the 1RTT and 2RTT connection options decrease the number of round trips in "
+-            "BBRv2 STARTUP without a 25% bandwidth increase to 1 or 2 round trips respectively.")
+-
+-QUICHE_FLAG(
+-    bool, quic_reloadable_flag_quic_bbr2_limit_inflight_hi, false,
+-    "When true, the B2HI connection option limits reduction of inflight_hi to (1-Beta)*CWND.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_use_post_inflight_to_detect_queuing, false,
+-            "If true, QUIC BBRv2 will use inflight byte after congestion event to detect queuing "
+-            "during PROBE_UP.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr_no_bytes_acked_in_startup_recovery, false,
+-            "When in STARTUP and recovery, do not add bytes_acked to QUIC BBR's CWND in "
+-            "CalculateCongestionWindow()")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true,
+-            "If true, bootstrap initial QUIC cwnd by SPDY priorities.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_cap_large_client_initial_rtt, true,
+-            "If true, cap client suggested initial RTT to 1s if it is longer than 1s.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_clean_up_spdy_session_destructor, false,
+-            "If true, QuicSpdySession's destructor won't need to do cleanup.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_in_on_can_write_with_blocked_writer,
+-            false,
+-            "If true, close connection if writer is still blocked while OnCanWrite is called.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_on_serialization_failure, false,
+-            "If true, close connection on packet serialization failures.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_bursts, false,
+-            "If true, set burst token to 2 in cwnd bootstrapping experiment.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false,
+-            "If true, uses conservative cwnd gain and pacing gain when cwnd gets bootstrapped.")
+-
+-QUICHE_FLAG(
+-    bool, quic_reloadable_flag_quic_copy_bbr_cwnd_to_bbr2, false,
+-    "If true, when switching from BBR to BBRv2, BBRv2 will use BBR's cwnd as its initial cwnd.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true,
+-            "If true, default-enable 5RTO blachole detection.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_on_pto, false,
+-            "If true, default on PTO which unifies TLP + RTO loss recovery.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr, true,
+-            "When true, defaults to BBR congestion control instead of Cubic.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr_v2, false,
+-            "If true, use BBRv2 as the default congestion controller. Takes precedence over "
+-            "--quic_default_to_bbr.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_server_blackhole_detection, false,
+-            "If true, disable blackhole detection on server side.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_27, false,
+-            "If true, disable QUIC version h3-27.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_29, false,
+-            "If true, disable QUIC version h3-29.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q043, false,
+-            "If true, disable QUIC version Q043.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q046, false,
+-            "If true, disable QUIC version Q046.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q050, false,
+-            "If true, disable QUIC version Q050.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t050, false,
+-            "If true, disable QUIC version h3-T050.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t051, false,
+-            "If true, disable QUIC version h3-T051.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_discard_initial_packet_with_key_dropped, false,
+-            "If true, discard INITIAL packet if the key has been dropped.")
+-
+-QUICHE_FLAG(
+-    bool, quic_reloadable_flag_quic_do_not_accept_stop_waiting, false,
+-    "In v44 and above, where STOP_WAITING is never sent, close the connection if it's received.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_donot_reset_ideal_next_packet_send_time, false,
+-            "If true, stop resetting ideal_next_packet_send_time_ in pacing sender.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_experiment_at_gfe, false,
+-            "If ture, enable GFE-picked loss detection experiment.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_tuner, false,
+-            "If true, allow QUIC loss detection tuning to be enabled by connection option ELDT.")
+-
+-QUICHE_FLAG(
+-    bool, quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false,
+-    "If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enabled, false, "")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_arm_pto_for_application_data, false,
+-            "If true, do not arm PTO for application data until handshake confirmed.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_bytes_left_for_batch_write, false,
+-            "If true, convert bytes_left_for_batch_write_ to unsigned int.")
+-
+-QUICHE_FLAG(
+-    bool, quic_reloadable_flag_quic_fix_http3_goaway_stream_id, false,
+-    "If true, send the lowest stream ID that can be retried by the client in a GOAWAY frame. If "
+-    "false, send the highest received stream ID, which actually should not be retried.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_out_of_order_sending, false,
+-            "If true, fix a potential out of order sending caused by handshake gets confirmed "
+-            "while the coalescer is not empty.")
+-
+-QUICHE_FLAG(
+-    bool, quic_reloadable_flag_quic_fix_pto_pending_timer_count, false,
+-    "If true, make sure there is pending timer credit when trying to PTO retransmit any packets.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_undecryptable_packets2, false,
+-            "If true, remove processed undecryptable packets.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_get_stream_information_from_stream_map, true,
+-            "If true, gQUIC will only consult stream_map in QuicSession::GetNumActiveStreams().")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_give_sent_packet_to_debug_visitor_after_sent, false,
+-            "If true, QUIC connection will pass sent packet information to the debug visitor after "
+-            "a packet is recorded as sent in sent packet manager.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_http3_new_default_urgency_value, false,
+-            "If true, QuicStream::kDefaultUrgency is 3, otherwise 1.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_ip_based_cwnd_exp, true,
+-            "If true, enable IP address based CWND bootstrapping experiment with different "
+-            "bandwidth models and priorities. ")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_listener_never_fake_epollout, false,
+-            "If true, QuicListener::OnSocketIsWritable will always return false, which means there "
+-            "will never be a fake EPOLLOUT event in the next epoll iteration.")
+-
+-QUICHE_FLAG(bool,
+-            quic_reloadable_flag_quic_neuter_initial_packet_in_coalescer_with_initial_key_discarded,
+-            false, "If true, neuter initial packet in the coalescer when discarding initial keys.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_dup_experiment_id_2, false,
+-            "If true, transport connection stats doesn't report duplicated experiments for same "
+-            "connection.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_silent_close_for_idle_timeout, true,
+-            "If true, always send connection close for idle timeout if NSLC is received.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_set_uaid_in_tcs_visitor, false,
+-            "If true, QuicTransportConnectionStatsVisitor::PopulateTransportConnectionStats will "
+-            "be the only place where TCS's uaid field is set.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_truncate_long_cids, true,
+-            "In IETF QUIC, only truncate long CIDs from the client's Initial, don't modify them.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_preferred_altsvc_version, false,
+-            "When true, we will send a preferred QUIC version at the start of our Alt-Svc list.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_proxy_write_packed_strings, false,
+-            "If true, QuicProxyDispatcher will write packed_client_address and packed_server_vip "
+-            "in TcpProxyHeaderProto.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_frontend_service_vip_mapping, true,
+-            "If true, for L1 GFE, as requests come in, record frontend service to VIP mapping "
+-            "which is used to announce VIP in SHLO for proxied sessions. ")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_received_min_ack_delay, false,
+-            "If true, record the received min_ack_delay in transport parameters to QUIC config.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_reject_all_traffic, false, "")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_remove_zombie_streams, true,
+-            "If true, QuicSession doesn't keep a separate zombie_streams. Instead, all streams are "
+-            "stored in stream_map_.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_require_handshake_confirmation, false,
+-            "If true, require handshake confirmation for QUIC connections, functionally disabling "
+-            "0-rtt handshakes.")
+-
+-QUICHE_FLAG(
+-    bool, quic_reloadable_flag_quic_send_key_update_not_yet_supported, false,
+-    "When true, QUIC+TLS versions will send the key_update_not_yet_supported transport parameter.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_path_response, false,
+-            "If true, send PATH_RESPONSE upon receiving PATH_CHALLENGE regardless of perspective. "
+-            "--gfe2_reloadable_flag_quic_start_peer_migration_earlier has to be true before turn "
+-            "on this flag.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_timestamps, false,
+-            "When the STMP connection option is sent by the client, timestamps in the QUIC ACK "
+-            "frame are sent and processed.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_server_push, false,
+-            "If true, enable server push feature on QUIC.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_set_resumed_ssl_session_early, false,
+-            "If true, set resumed_ssl_session if this is a 0-RTT connection.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_start_peer_migration_earlier, false,
+-            "If true, while reading an IETF quic packet, start peer migration immediately when "
+-            "detecting the existence of any non-probing frame instead of at the end of the packet.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_stop_sending_uses_ietf_error_code, false,
+-            "If true, use IETF QUIC application error codes in STOP_SENDING frames. If false, use "
+-            "QuicRstStreamErrorCodes.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_false, false,
+-            "A testonly reloadable flag that will always default to false.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_true, true,
+-            "A testonly reloadable flag that will always default to true.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_unified_iw_options, false,
+-            "When true, set the initial congestion control window from connection options in "
+-            "QuicSentPacketManager rather than TcpCubicSenderBytes.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_header_stage_idle_list2, false,
+-            "If true, use header stage idle list for QUIC connections in GFE.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_leto_key_exchange, false,
+-            "If true, QUIC will attempt to use the Leto key exchange service and only fall back to "
+-            "local key exchange if that fails.")
+-
+-QUICHE_FLAG(bool, quic_reloadable_flag_send_quic_fallback_server_config_on_leto_error, false,
+-            "If true and using Leto for QUIC shared-key calculations, GFE will react to a failure "
+-            "to contact Leto by sending a REJ containing a fallback ServerConfig, allowing the "
+-            "client to continue the handshake.")
+-
+-QUICHE_FLAG(
+-    bool, quic_restart_flag_dont_fetch_quic_private_keys_from_leto, false,
+-    "If true, GFE will not request private keys when fetching QUIC ServerConfigs from Leto.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_adjust_initial_cwnd_by_gws, true,
+-            "If true, GFE informs backend that a client request is the first one on the connection "
+-            "via frontline header \"first_request=1\". Also, adjust initial cwnd based on "
+-            "X-Google-Gws-Initial-Cwnd-Mode sent by GWS.")
+-
+-QUICHE_FLAG(
+-    bool, quic_restart_flag_quic_allow_loas_multipacket_chlo, false,
+-    "If true, inspects QUIC CHLOs for kLOAS and early creates sessions to allow multi-packet CHLOs")
+-
+-QUICHE_FLAG(
+-    bool, quic_restart_flag_quic_disable_gws_cwnd_experiment, false,
+-    "If true, X-Google-Gws-Initial-Cwnd-Mode related header sent by GWS becomes no-op for QUIC.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_enable_tls_resumption_v4, true,
+-            "If true, enables support for TLS resumption in QUIC.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_enable_zero_rtt_for_tls_v2, true,
+-            "If true, support for IETF QUIC 0-rtt is enabled.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_offload_pacing_to_usps2, false,
+-            "If true, QUIC offload pacing when using USPS as egress method.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_rx_ring_use_tpacket_v3, false,
+-            "If true, use TPACKET_V3 for QuicRxRing instead of TPACKET_V2.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_should_accept_new_connection, false,
+-            "If true, reject QUIC CHLO packets when dispatcher is asked to do so.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_support_release_time_for_gso, false,
+-            "If true, QuicGsoBatchWriter will support release time if it is available and the "
+-            "process has the permission to do so.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_false, false,
+-            "A testonly restart flag that will always default to false.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_true, true,
+-            "A testonly restart flag that will always default to true.")
+-
+-QUICHE_FLAG(
+-    bool, quic_restart_flag_quic_use_leto_for_quic_configs, false,
+-    "If true, use Leto to fetch QUIC server configs instead of using the seeds from Memento.")
+-
+-QUICHE_FLAG(bool, quic_restart_flag_quic_use_pigeon_socket_to_backend, false,
+-            "If true, create a shared pigeon socket for all quic to backend connections and switch "
+-            "to use it after successful handshake.")
+-
+-QUICHE_FLAG(bool, spdy_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true,
+-            "If true, bootstrap initial QUIC cwnd by SPDY priorities.")
+-
+-QUICHE_FLAG(bool, spdy_reloadable_flag_quic_clean_up_spdy_session_destructor, false,
+-            "If true, QuicSpdySession's destructor won't need to do cleanup.")
+-
+-QUICHE_FLAG(
+-    bool, spdy_reloadable_flag_spdy_discard_response_body_if_disallowed, false,
+-    "If true, SPDY will discard all response body bytes when response code indicates no response "
+-    "body should exist. Previously, we only discard partial bytes on the first response processing "
+-    "and the rest of the response bytes would still be delivered even though the response code "
+-    "said there should not be any body associated with the response code.")
+-
+-QUICHE_FLAG(bool, quic_allow_chlo_buffering, true,
+-            "If true, allows packets to be buffered in anticipation of a "
+-            "future CHLO, and allow CHLO packets to be buffered until next "
+-            "iteration of the event loop.")
+-
+-QUICHE_FLAG(bool, quic_disable_pacing_for_perf_tests, false, "If true, disable pacing in QUIC")
+-
+-QUICHE_FLAG(bool, quic_enforce_single_packet_chlo, true,
+-            "If true, enforce that QUIC CHLOs fit in one packet")
+-
+-QUICHE_FLAG(int64_t, quic_time_wait_list_max_connections, 600000,
+-            "Maximum number of connections on the time-wait list. "
+-            "A negative value implies no configured limit.")
+-
+-QUICHE_FLAG(int64_t, quic_time_wait_list_seconds, 200,
+-            "Time period for which a given connection_id should live in "
+-            "the time-wait state.")
+-
+-QUICHE_FLAG(double, quic_bbr_cwnd_gain, 2.0f,
+-            "Congestion window gain for QUIC BBR during PROBE_BW phase.")
+-
+-QUICHE_FLAG(int32_t, quic_buffered_data_threshold, 8 * 1024,
+-            "If buffered data in QUIC stream is less than this "
+-            "threshold, buffers all provided data or asks upper layer for more data")
+-
+-QUICHE_FLAG(int32_t, quic_send_buffer_max_data_slice_size, 4 * 1024,
+-            "Max size of data slice in bytes for QUIC stream send buffer.")
+-
+-QUICHE_FLAG(int32_t, quic_lumpy_pacing_size, 2,
+-            "Number of packets that the pacing sender allows in bursts during "
+-            "pacing. This flag is ignored if a flow's estimated bandwidth is "
+-            "lower than 1200 kbps.")
+-
+-QUICHE_FLAG(double, quic_lumpy_pacing_cwnd_fraction, 0.25f,
+-            "Congestion window fraction that the pacing sender allows in bursts "
+-            "during pacing.")
+-
+-QUICHE_FLAG(int32_t, quic_max_pace_time_into_future_ms, 10,
+-            "Max time that QUIC can pace packets into the future in ms.")
+-
+-QUICHE_FLAG(double, quic_pace_time_into_future_srtt_fraction, 0.125f,
+-            "Smoothed RTT fraction that a connection can pace packets into the future.")
+-
+-QUICHE_FLAG(bool, quic_export_server_num_packets_per_write_histogram, false,
+-            "If true, export number of packets written per write operation histogram.")
+-
+-QUICHE_FLAG(bool, quic_disable_version_negotiation_grease_randomness, false,
+-            "If true, use predictable version negotiation versions.")
+-
+-QUICHE_FLAG(bool, quic_enable_http3_grease_randomness, true,
+-            "If true, use random greased settings and frames.")
+-
+-QUICHE_FLAG(int64_t, quic_max_tracked_packet_count, 10000, "Maximum number of tracked packets.")
+-
+-QUICHE_FLAG(bool, quic_prober_uses_length_prefixed_connection_ids, false,
+-            "If true, QuicFramer::WriteClientVersionNegotiationProbePacket uses "
+-            "length-prefixed connection IDs.")
+-
+-QUICHE_FLAG(bool, quic_client_convert_http_header_name_to_lowercase, true,
+-            "If true, HTTP request header names sent from QuicSpdyClientBase(and "
+-            "descendents) will be automatically converted to lower case.")
+-
+-QUICHE_FLAG(bool, quic_enable_http3_server_push, false,
+-            "If true, server push will be allowed in QUIC versions that use HTTP/3.")
+-
+-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_base_duration_ms, 2000,
+-            "The default minimum duration for BBRv2-native probes, in milliseconds.")
+-
+-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_max_rand_duration_ms, 1000,
+-            "The default upper bound of the random amount of BBRv2-native "
+-            "probes, in milliseconds.")
+-
+-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_rtt_period_ms, 10000,
+-            "The default period for entering PROBE_RTT, in milliseconds.")
+-
+-QUICHE_FLAG(double, quic_bbr2_default_loss_threshold, 0.02,
+-            "The default loss threshold for QUIC BBRv2, should be a value "
+-            "between 0 and 1.")
+-
+-QUICHE_FLAG(int32_t, quic_bbr2_default_startup_full_loss_count, 8,
+-            "The default minimum number of loss marking events to exit STARTUP.")
+-
+-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_full_loss_count, 2,
+-            "The default minimum number of loss marking events to exit PROBE_UP phase.")
+-
+-QUICHE_FLAG(double, quic_bbr2_default_inflight_hi_headroom, 0.01,
+-            "The default fraction of unutilized headroom to try to leave in path "
+-            "upon high loss.")
+-
+-QUICHE_FLAG(int32_t, quic_bbr2_default_initial_ack_height_filter_window, 10,
+-            "The default initial value of the max ack height filter's window length.")
+-
+-QUICHE_FLAG(double, quic_ack_aggregation_bandwidth_threshold, 1.0,
+-            "If the bandwidth during ack aggregation is smaller than (estimated "
+-            "bandwidth * this flag), consider the current aggregation completed "
+-            "and starts a new one.")
+-
+-QUICHE_FLAG(int32_t, quic_anti_amplification_factor, 5,
+-            "Anti-amplification factor. Before address validation, server will "
+-            "send no more than factor times bytes received.")
+-
+-QUICHE_FLAG(int32_t, quic_max_buffered_crypto_bytes, 16 * 1024,
+-            "The maximum amount of CRYPTO frame data that can be buffered.")
+-
+-QUICHE_FLAG(int32_t, quic_max_aggressive_retransmittable_on_wire_ping_count, 0,
+-            "If set to non-zero, the maximum number of consecutive pings that "
+-            "can be sent with aggressive initial retransmittable on wire timeout "
+-            "if there is no new data received. After which, the timeout will be "
+-            "exponentially back off until exceeds the default ping timeout.")
+-
+-QUICHE_FLAG(int32_t, quic_max_congestion_window, 2000, "The maximum congestion window in packets.")
+-
+-QUICHE_FLAG(int32_t, quic_max_streams_window_divisor, 2,
+-            "The divisor that controls how often MAX_STREAMS frame is sent.")
+-
+-QUICHE_FLAG(bool, http2_reloadable_flag_http2_testonly_default_false, false,
+-            "A testonly reloadable flag that will always default to false.")
+-
+-QUICHE_FLAG(bool, http2_restart_flag_http2_testonly_default_false, false,
+-            "A testonly restart flag that will always default to false.")
+-
+-QUICHE_FLAG(bool, spdy_reloadable_flag_spdy_testonly_default_false, false,
+-            "A testonly reloadable flag that will always default to false.")
+-
+-QUICHE_FLAG(bool, spdy_restart_flag_spdy_testonly_default_false, false,
+-            "A testonly restart flag that will always default to false.")
+-
+-#endif
+diff --git a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h
+index 7d2561469..dc6fe5429 100644
+--- a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h
+@@ -8,10 +8,10 @@
+ 
+ #include "extensions/quic_listeners/quiche/platform/flags_impl.h"
+ 
+-#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_http2_reloadable_flag_##flag->value()
++#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value()
+ 
+ #define SetHttp2ReloadableFlagImpl(flag, value)                                                    \
+-  quiche::FLAGS_http2_reloadable_flag_##flag->SetValue(value)
++  quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value)
+ 
+ #define HTTP2_CODE_COUNT_N_IMPL(flag, instance, total)                                             \
+   do {                                                                                             \
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h
+deleted file mode 100644
+index 3f595380b..000000000
+--- a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h
++++ /dev/null
+@@ -1,18 +0,0 @@
+-#pragma once
+-
+-#include "absl/base/optimization.h"
+-
+-// NOLINT(namespace-envoy)
+-
+-// This file is part of the QUICHE platform implementation, and is not to be
+-// consumed or referenced directly by other Envoy code. It serves purely as a
+-// porting layer for QUICHE.
+-
+-#define QUIC_ALIGN_OF_IMPL alignof
+-#ifdef _MSC_VER
+-#define QUIC_ALIGNED_IMPL(X) __declspec(align(X))
+-#else
+-#define QUIC_ALIGNED_IMPL(X) __attribute__((aligned(X)))
+-#endif
+-#define QUIC_CACHELINE_ALIGNED_IMPL ABSL_CACHELINE_ALIGNED
+-#define QUIC_CACHELINE_SIZE_IMPL ABSL_CACHELINE_SIZE
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc
+index 2a886a12c..27b977908 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc
++++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc
+@@ -10,25 +10,7 @@
+ 
+ namespace quic {
+ 
+-// static
+-bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert,
+-                                                      quiche::QuicheStringPiece* subject_out) {
+-  CBS tbs_certificate;
+-  if (!SeekToSubject(cert, &tbs_certificate)) {
+-    return false;
+-  }
+-
+-  CBS subject;
+-  if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) {
+-    return false;
+-  }
+-  *subject_out =
+-      absl::string_view(reinterpret_cast<const char*>(CBS_data(&subject)), CBS_len(&subject));
+-  return true;
+-}
+-
+-// static
+-bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate) {
++bool seekToSubject(absl::string_view cert, CBS* tbs_certificate) {
+   CBS der;
+   CBS_init(&der, reinterpret_cast<const uint8_t*>(cert.data()), cert.size());
+   CBS certificate;
+@@ -65,4 +47,22 @@ bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_c
+   return true;
+ }
+ 
++// static
++// NOLINTNEXTLINE(readability-identifier-naming)
++bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(absl::string_view cert,
++                                                      absl::string_view* subject_out) {
++  CBS tbs_certificate;
++  if (!seekToSubject(cert, &tbs_certificate)) {
++    return false;
++  }
++
++  CBS subject;
++  if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) {
++    return false;
++  }
++  *subject_out =
++      absl::string_view(reinterpret_cast<const char*>(CBS_data(&subject)), CBS_len(&subject));
++  return true;
++}
++
+ } // namespace quic
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h
+index 0c41b9dbc..29b882b7d 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h
+@@ -6,18 +6,15 @@
+ // consumed or referenced directly by other Envoy code. It serves purely as a
+ // porting layer for QUICHE.
+ 
++#include "absl/strings/string_view.h"
+ #include "openssl/base.h"
+-#include "quiche/common/platform/api/quiche_string_piece.h"
+ 
+ namespace quic {
+ 
+ class QuicCertUtilsImpl {
+ public:
+-  static bool ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert,
+-                                            quiche::QuicheStringPiece* subject_out);
+-
+-private:
+-  static bool SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate);
++  // NOLINTNEXTLINE(readability-identifier-naming)
++  static bool ExtractSubjectNameFromDERCert(absl::string_view cert, absl::string_view* subject_out);
+ };
+ 
+ } // namespace quic
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h
+deleted file mode 100644
+index aa9d6bc36..000000000
+--- a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#pragma once
+-
+-// NOLINT(namespace-envoy)
+-
+-// This file is part of the QUICHE platform implementation, and is not to be
+-// consumed or referenced directly by other Envoy code. It serves purely as a
+-// porting layer for QUICHE.
+-
+-#include "absl/base/macros.h"
+-
+-#define QUIC_FALLTHROUGH_INTENDED_IMPL ABSL_FALLTHROUGH_INTENDED
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc
+index 91d52c44a..b2e396fab 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc
++++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc
+@@ -36,6 +36,7 @@ void depthFirstTraverseDirectory(const std::string& dirname, std::vector<std::st
+ } // namespace
+ 
+ // Traverses the directory |dirname| and returns all of the files it contains.
++// NOLINTNEXTLINE(readability-identifier-naming)
+ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname) {
+   std::vector<std::string> files;
+   depthFirstTraverseDirectory(dirname, files);
+@@ -43,7 +44,8 @@ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname) {
+ }
+ 
+ // Reads the contents of |filename| as a string into |contents|.
+-void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents) {
++// NOLINTNEXTLINE(readability-identifier-naming)
++void ReadFileContentsImpl(absl::string_view filename, std::string* contents) {
+ #ifdef WIN32
+   Envoy::Filesystem::InstanceImplWin32 fs;
+ #else
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h
+index 654c1ad18..25c31e9de 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h
+@@ -8,7 +8,7 @@
+ 
+ #include <vector>
+ 
+-#include "quiche/common/platform/api/quiche_string_piece.h"
++#include "absl/strings/string_view.h"
+ 
+ namespace quic {
+ 
+@@ -16,6 +16,7 @@ namespace quic {
+  * Traverses the directory |dirname| and returns all of the files it contains.
+  * @param dirname full path without trailing '/'.
+  */
++// NOLINTNEXTLINE(readability-identifier-naming)`
+ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname);
+ 
+ /**
+@@ -23,6 +24,7 @@ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname);
+  *  @param filename the full path to the file.
+  *  @param contents output location of the file content.
+  */
+-void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents);
++// NOLINTNEXTLINE(readability-identifier-naming)
++void ReadFileContentsImpl(absl::string_view filename, std::string* contents);
+ 
+ } // namespace quic
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h
+index 872495f2d..d562bb1a4 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h
+@@ -15,16 +15,16 @@
+ #define GetQuicFlagImpl(flag) (quiche::flag)->value()
+ 
+ // |flag| is the global flag variable, which is a pointer to TypedFlag<type>.
+-#define SetQuicFlagImpl(flag, value) (quiche::flag)->SetValue(value)
++#define SetQuicFlagImpl(flag, value) (quiche::flag)->setValue(value)
+ 
+ #define GetQuicReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value()
+ 
+ #define SetQuicReloadableFlagImpl(flag, value)                                                     \
+-  quiche::FLAGS_quic_reloadable_flag_##flag->SetValue(value)
++  quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value)
+ 
+ #define GetQuicRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value()
+ 
+-#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->SetValue(value)
++#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->setValue(value)
+ 
+ // Not wired into command-line parsing.
+ #define DEFINE_QUIC_COMMAND_LINE_FLAG_IMPL(type, flag, value, help)                                \
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc
+index bcbafb566..75849611d 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc
++++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc
+@@ -19,7 +19,8 @@
+ namespace quic {
+ 
+ // static
+-bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) {
++// NOLINTNEXTLINE(readability-identifier-naming)
++bool QuicHostnameUtilsImpl::IsValidSNI(absl::string_view sni) {
+   // TODO(wub): Implement it on top of GoogleUrl, once it is available.
+ 
+   return sni.find_last_of('.') != std::string::npos &&
+@@ -27,7 +28,8 @@ bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) {
+ }
+ 
+ // static
+-std::string QuicHostnameUtilsImpl::NormalizeHostname(quiche::QuicheStringPiece hostname) {
++// NOLINTNEXTLINE(readability-identifier-naming)
++std::string QuicHostnameUtilsImpl::NormalizeHostname(absl::string_view hostname) {
+   // TODO(wub): Implement it on top of GoogleUrl, once it is available.
+   std::string host = absl::AsciiStrToLower(hostname);
+ 
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h
+index 2b7ed4357..67cd787d0 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h
+@@ -6,7 +6,7 @@
+ // consumed or referenced directly by other Envoy code. It serves purely as a
+ // porting layer for QUICHE.
+ 
+-#include "quiche/common/platform/api/quiche_string_piece.h"
++#include "absl/strings/string_view.h"
+ #include "quiche/quic/platform/api/quic_export.h"
+ 
+ namespace quic {
+@@ -18,7 +18,8 @@ public:
+   //  (2) check that the hostname contains valid characters only; and
+   //  (3) contains at least one dot.
+   // NOTE(wub): Only (3) is implemented for now.
+-  static bool IsValidSNI(quiche::QuicheStringPiece sni);
++  // NOLINTNEXTLINE(readability-identifier-naming)
++  static bool IsValidSNI(absl::string_view sni);
+ 
+   // Normalize a hostname:
+   //  (1) Canonicalize it, similar to what Chromium does in
+@@ -27,7 +28,8 @@ public:
+   //  (3) Remove the trailing '.'.
+   // WARNING: May mutate |hostname| in place.
+   // NOTE(wub): Only (2) and (3) are implemented for now.
+-  static std::string NormalizeHostname(quiche::QuicheStringPiece hostname);
++  // NOLINTNEXTLINE(readability-identifier-naming)
++  static std::string NormalizeHostname(absl::string_view hostname);
+ 
+ private:
+   QuicHostnameUtilsImpl() = delete;
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h
+deleted file mode 100644
+index b8b70a042..000000000
+--- a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#pragma once
+-
+-// NOLINT(namespace-envoy)
+-
+-// This file is part of the QUICHE platform implementation, and is not to be
+-// consumed or referenced directly by other Envoy code. It serves purely as a
+-// porting layer for QUICHE.
+-
+-#include "absl/base/attributes.h"
+-
+-#define QUIC_MUST_USE_RESULT_IMPL ABSL_MUST_USE_RESULT
+-#define QUIC_UNUSED_IMPL ABSL_ATTRIBUTE_UNUSED
+-#define QUIC_CONST_INIT_IMPL ABSL_CONST_INIT
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc
+index c2eb527d6..9e46c37df 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc
++++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc
+@@ -10,7 +10,8 @@
+ 
+ namespace quic {
+ 
+-quiche::QuicheStringPiece QuicMemSliceSpanImpl::GetData(size_t index) {
++// NOLINTNEXTLINE(readability-identifier-naming)
++absl::string_view QuicMemSliceSpanImpl::GetData(size_t index) {
+   Envoy::Buffer::RawSliceVector slices = buffer_->getRawSlices(/*max_slices=*/index + 1);
+   ASSERT(slices.size() > index);
+   return {reinterpret_cast<char*>(slices[index].mem_), slices[index].len_};
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h
+index 1824fb8d1..ef40e6387 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h
+@@ -9,7 +9,7 @@
+ #include "envoy/buffer/buffer.h"
+ 
+ #include "absl/container/fixed_array.h"
+-#include "quiche/common/platform/api/quiche_string_piece.h"
++#include "absl/strings/string_view.h"
+ #include "quiche/quic/core/quic_types.h"
+ #include "quiche/quic/platform/api/quic_mem_slice.h"
+ 
+@@ -43,9 +43,13 @@ public:
+   }
+ 
+   // QuicMemSliceSpan
+-  quiche::QuicheStringPiece GetData(size_t index);
++  // NOLINTNEXTLINE(readability-identifier-naming)
++  absl::string_view GetData(size_t index);
++  // NOLINTNEXTLINE(readability-identifier-naming)
+   QuicByteCount total_length() { return buffer_->length(); };
++  // NOLINTNEXTLINE(readability-identifier-naming)
+   size_t NumSlices() { return buffer_->getRawSlices().size(); }
++  // NOLINTNEXTLINE(readability-identifier-naming)
+   template <typename ConsumeFunction> QuicByteCount ConsumeAll(ConsumeFunction consume);
+   bool empty() const { return buffer_->length() == 0; }
+ 
+@@ -54,6 +58,7 @@ private:
+ };
+ 
+ template <typename ConsumeFunction>
++// NOLINTNEXTLINE(readability-identifier-naming)
+ QuicByteCount QuicMemSliceSpanImpl::ConsumeAll(ConsumeFunction consume) {
+   size_t saved_length = 0;
+   for (auto& slice : buffer_->getRawSlices()) {
+diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h
+similarity index 52%
+rename from source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h
+rename to source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h
+index aaebe5d5c..4b0201c35 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h
+@@ -6,12 +6,11 @@
+ // consumed or referenced directly by other Envoy code. It serves purely as a
+ // porting layer for QUICHE.
+ 
+-#include "absl/memory/memory.h"
++#include "absl/strings/string_view.h"
+ 
+-namespace quiche {
++namespace quic {
+ 
+-template <typename T> std::unique_ptr<T> QuicheWrapUniqueImpl(T* ptr) {
+-  return absl::WrapUnique<T>(ptr);
+-}
++// NOLINTNEXTLINE(readability-identifier-naming)
++template <class T> void AdjustTestValueImpl(absl::string_view /*label*/, T* /*var*/) {}
+ 
+-} // namespace quiche
++} // namespace quic
+diff --git a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h
+index 248cfc193..1e88abe46 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h
+@@ -19,4 +19,7 @@ inline bool GetGooglePacketHeadersFromControlMessageImpl(struct ::cmsghdr* /*cms
+   return false;
+ }
+ 
++// NOLINTNEXTLINE(readability-identifier-naming)
++inline void SetGoogleSocketOptionsImpl(int /*fd*/) {}
++
+ } // namespace quic
+diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h
+deleted file mode 100644
+index 7a23b53da..000000000
+--- a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#pragma once
+-
+-#include "absl/base/macros.h"
+-
+-// NOLINT(namespace-envoy)
+-
+-// This file is part of the QUICHE platform implementation, and is not to be
+-// consumed or referenced directly by other Envoy code. It serves purely as a
+-// porting layer for QUICHE.
+-
+-#define QUICHE_ARRAYSIZE_IMPL(array) ABSL_ARRAYSIZE(array)
+diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h
+deleted file mode 100644
+index f8b2b6c08..000000000
+--- a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#pragma once
+-
+-#include "absl/types/optional.h"
+-
+-// NOLINT(namespace-envoy)
+-
+-// This file is part of the QUICHE platform implementation, and is not to be
+-// consumed or referenced directly by other Envoy code. It serves purely as a
+-// porting layer for QUICHE.
+-
+-namespace quiche {
+-
+-template <typename T> using QuicheOptionalImpl = absl::optional<T>;
+-
+-#define QUICHE_NULLOPT_IMPL absl::nullopt
+-
+-} // namespace quiche
+diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h
+index 3a6d1a393..7b87c1cd6 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h
+@@ -2,7 +2,6 @@
+ 
+ #include "common/common/base64.h"
+ 
+-#include "extensions/quic_listeners/quiche/platform/quiche_optional_impl.h"
+ #include "extensions/quic_listeners/quiche/platform/quiche_string_piece_impl.h"
+ #include "extensions/quic_listeners/quiche/platform/string_utils.h"
+ 
+@@ -13,6 +12,7 @@
+ #include "absl/strings/str_cat.h"
+ #include "absl/strings/str_format.h"
+ #include "absl/strings/str_split.h"
++#include "absl/types/optional.h"
+ 
+ // NOLINT(namespace-envoy)
+ 
+@@ -25,58 +25,16 @@ namespace quiche {
+ class QuicheTextUtilsImpl {
+ public:
+   // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool StartsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl prefix) {
+-    return absl::StartsWith(data, prefix);
+-  }
+-
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool EndsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) {
+-    return absl::EndsWith(data, suffix);
+-  }
+-
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool EndsWithIgnoreCase(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) {
+-    return absl::EndsWithIgnoreCase(data, suffix);
+-  }
+-
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static std::string ToLower(QuicheStringPieceImpl data) { return absl::AsciiStrToLower(data); }
++  static std::string ToLower(absl::string_view data) { return absl::AsciiStrToLower(data); }
+ 
+   // NOLINTNEXTLINE(readability-identifier-naming)
+-  static void RemoveLeadingAndTrailingWhitespace(QuicheStringPieceImpl* data) {
++  static void RemoveLeadingAndTrailingWhitespace(absl::string_view* data) {
+     *data = absl::StripAsciiWhitespace(*data);
+   }
+ 
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool StringToUint64(QuicheStringPieceImpl in, uint64_t* out) {
+-    return absl::SimpleAtoi(in, out);
+-  }
+-
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool StringToInt(QuicheStringPieceImpl in, int* out) { return absl::SimpleAtoi(in, out); }
+-
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool StringToUint32(QuicheStringPieceImpl in, uint32_t* out) {
+-    return absl::SimpleAtoi(in, out);
+-  }
+-
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool StringToSizeT(QuicheStringPieceImpl in, size_t* out) {
+-    return absl::SimpleAtoi(in, out);
+-  }
+-
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); }
+-
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static std::string HexEncode(QuicheStringPieceImpl data) { return absl::BytesToHexString(data); }
+-
+   // NOLINTNEXTLINE(readability-identifier-naming)
+   static std::string Hex(uint32_t v) { return absl::StrCat(absl::Hex(v)); }
+ 
+-  // NOLINTNEXTLINE(readability-identifier-naming)
+-  static std::string HexDecode(QuicheStringPieceImpl data) { return absl::HexStringToBytes(data); }
+-
+   // NOLINTNEXTLINE(readability-identifier-naming)
+   static void Base64Encode(const uint8_t* data, size_t data_len, std::string* output) {
+     *output =
+@@ -84,27 +42,28 @@ public:
+   }
+ 
+   // NOLINTNEXTLINE(readability-identifier-naming)
+-  static QuicheOptionalImpl<std::string> Base64Decode(QuicheStringPieceImpl input) {
++  static absl::optional<std::string> Base64Decode(absl::string_view input) {
+     return Envoy::Base64::decodeWithoutPadding(input);
+   }
+ 
+   // NOLINTNEXTLINE(readability-identifier-naming)
+-  static std::string HexDump(QuicheStringPieceImpl binary_data) {
+-    return quiche::HexDump(binary_data);
+-  }
++  static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); }
++
++  // NOLINTNEXTLINE(readability-identifier-naming)
++  static std::string HexDump(absl::string_view binary_data) { return quiche::HexDump(binary_data); }
+ 
+   // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool ContainsUpperCase(QuicheStringPieceImpl data) {
++  static bool ContainsUpperCase(absl::string_view data) {
+     return std::any_of(data.begin(), data.end(), absl::ascii_isupper);
+   }
+ 
+   // NOLINTNEXTLINE(readability-identifier-naming)
+-  static bool IsAllDigits(QuicheStringPieceImpl data) {
++  static bool IsAllDigits(absl::string_view data) {
+     return std::all_of(data.begin(), data.end(), absl::ascii_isdigit);
+   }
+ 
+   // NOLINTNEXTLINE(readability-identifier-naming)
+-  static std::vector<QuicheStringPieceImpl> Split(QuicheStringPieceImpl data, char delim) {
++  static std::vector<absl::string_view> Split(absl::string_view data, char delim) {
+     return absl::StrSplit(data, delim);
+   }
+ };
+diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc
+index 3260eafee..5387e0598 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc
++++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc
+@@ -9,7 +9,7 @@
+ namespace quiche {
+ 
+ namespace {
+-QuicheOptional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour,
++absl::optional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour,
+                                                             int minute, int second) {
+   const absl::CivilSecond civil_time(year, month, day, hour, minute, second);
+   if (second != 60 && (civil_time.year() != year || civil_time.month() != month ||
+@@ -24,7 +24,7 @@ QuicheOptional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month,
+ } // namespace
+ 
+ // NOLINTNEXTLINE(readability-identifier-naming)
+-QuicheOptional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour,
++absl::optional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour,
+                                                            int minute, int second) {
+   // Handle leap seconds without letting any other irregularities happen.
+   if (second == 60) {
+diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h
+index a1b70b70a..5e2ef7956 100644
+--- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h
+@@ -10,12 +10,12 @@
+ 
+ #include "absl/time/civil_time.h"
+ #include "absl/time/time.h"
+-#include "quiche/common/platform/api/quiche_optional.h"
++#include "absl/types/optional.h"
+ 
+ namespace quiche {
+ 
+ // NOLINTNEXTLINE(readability-identifier-naming)
+-QuicheOptional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour,
++absl::optional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour,
+                                                            int minute, int second);
+ 
+ } // namespace quiche
+diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h
+deleted file mode 100644
+index 737b81ee2..000000000
+--- a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h
++++ /dev/null
+@@ -1,29 +0,0 @@
+-#pragma once
+-
+-#include <cstdint>
+-
+-#include "envoy/common/platform.h"
+-
+-// NOLINT(namespace-envoy)
+-
+-// This file is part of the QUICHE platform implementation, and is not to be
+-// consumed or referenced directly by other Envoy code. It serves purely as a
+-// porting layer for QUICHE.
+-
+-namespace spdy {
+-
+-inline uint16_t SpdyNetToHost16Impl(uint16_t x) { return ntohs(x); }
+-
+-inline uint32_t SpdyNetToHost32Impl(uint32_t x) { return ntohl(x); }
+-
+-// TODO: implement
+-inline uint64_t SpdyNetToHost64Impl(uint64_t /*x*/) { return 0; }
+-
+-inline uint16_t SpdyHostToNet16Impl(uint16_t x) { return htons(x); }
+-
+-inline uint32_t SpdyHostToNet32Impl(uint32_t x) { return htonl(x); }
+-
+-// TODO: implement
+-inline uint64_t SpdyHostToNet64Impl(uint64_t /*x*/) { return 0; }
+-
+-} // namespace spdy
+diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h
+index a3cbd680f..833562fab 100644
+--- a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h
+@@ -8,9 +8,9 @@
+ 
+ #include "extensions/quic_listeners/quiche/platform/flags_impl.h"
+ 
+-#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_spdy_reloadable_flag_##flag->value()
++#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value()
+ 
+-#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_spdy_restart_flag_##flag->value()
++#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value()
+ 
+ #define SPDY_CODE_COUNT_N_IMPL(flag, instance, total)                                              \
+   do {                                                                                             \
+diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h
+index 41fa3cad8..4b01b2dbd 100644
+--- a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h
++++ b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h
+@@ -50,7 +50,7 @@ inline std::string SpdyHexEncodeUInt32AndTrimImpl(uint32_t data) {
+ inline std::string SpdyHexDumpImpl(absl::string_view data) { return quiche::HexDump(data); }
+ 
+ struct SpdyStringPieceCaseHashImpl {
+-  size_t operator()(quiche::QuicheStringPiece data) const {
++  size_t operator()(absl::string_view data) const {
+     std::string lower = absl::AsciiStrToLower(data);
+     return absl::Hash<std::string>()(lower);
+   }
+diff --git a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc
+index 3bd0bc295..5ac5738c4 100644
+--- a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc
++++ b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc
+@@ -12,25 +12,29 @@ using spdy::SpdyHeaderBlock;
+ namespace quic {
+ 
+ // static
++// NOLINTNEXTLINE(readability-identifier-naming)
+ std::string SpdyServerPushUtils::GetPromisedUrlFromHeaders(const SpdyHeaderBlock& /*headers*/) {
+   NOT_IMPLEMENTED_GCOVR_EXCL_LINE;
+ }
+ 
+ // static
+ std::string
++// NOLINTNEXTLINE(readability-identifier-naming)
+ SpdyServerPushUtils::GetPromisedHostNameFromHeaders(const SpdyHeaderBlock& /*headers*/) {
+   NOT_IMPLEMENTED_GCOVR_EXCL_LINE;
+ }
+ 
+ // static
++// NOLINTNEXTLINE(readability-identifier-naming)
+ bool SpdyServerPushUtils::PromisedUrlIsValid(const SpdyHeaderBlock& /*headers*/) {
+   NOT_IMPLEMENTED_GCOVR_EXCL_LINE;
+ }
+ 
+ // static
+-std::string SpdyServerPushUtils::GetPushPromiseUrl(quiche::QuicheStringPiece /*scheme*/,
+-                                                   quiche::QuicheStringPiece /*authority*/,
+-                                                   quiche::QuicheStringPiece /*path*/) {
++// NOLINTNEXTLINE(readability-identifier-naming)
++std::string SpdyServerPushUtils::GetPushPromiseUrl(absl::string_view /*scheme*/,
++                                                   absl::string_view /*authority*/,
++                                                   absl::string_view /*path*/) {
+   NOT_IMPLEMENTED_GCOVR_EXCL_LINE;
+ }
+ 
+diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc
+index e2d90d916..8fa7d9fe9 100644
+--- a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc
++++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc
+@@ -49,9 +49,9 @@ public:
+                                 Network::ConnectionSocketPtr&& connection_socket)
+       : EnvoyQuicClientConnection(server_connection_id, helper, alarm_factory, &writer, false,
+                                   supported_versions, dispatcher, std::move(connection_socket)) {
+-    SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
+     SetEncrypter(quic::ENCRYPTION_FORWARD_SECURE,
+                  std::make_unique<quic::NullEncrypter>(quic::Perspective::IS_CLIENT));
++    SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
+   }
+ 
+   MOCK_METHOD(void, SendConnectionClosePacket, (quic::QuicErrorCode, const std::string&));
+diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc
+index 98359c618..f3b02f4cc 100644
+--- a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc
++++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc
+@@ -48,11 +48,11 @@ public:
+     quic_session_.ActivateStream(std::unique_ptr<EnvoyQuicClientStream>(quic_stream_));
+     EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false));
+     EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-        .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
+-                                  quic::StreamSendingState state, bool,
+-                                  quiche::QuicheOptional<quic::EncryptionLevel>) {
+-          return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
+-        }));
++        .WillRepeatedly(
++            Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
++                      quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++              return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
++            }));
+     EXPECT_CALL(writer_, WritePacket(_, _, _, _, _))
+         .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&,
+                                   const quic::QuicSocketAddress&, quic::PerPacketOptions*) {
+@@ -146,7 +146,7 @@ TEST_P(EnvoyQuicClientStreamTest, PostRequestAndResponse) {
+     std::unique_ptr<char[]> data_buffer;
+     quic::QuicByteCount data_frame_header_length =
+         quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer);
+-    quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length);
++    absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length);
+     data = absl::StrCat(data_frame_header, response_body_);
+   }
+   quic::QuicStreamFrame frame(stream_id_, false, 0, data);
+@@ -184,7 +184,7 @@ TEST_P(EnvoyQuicClientStreamTest, OutOfOrderTrailers) {
+     std::unique_ptr<char[]> data_buffer;
+     quic::QuicByteCount data_frame_header_length =
+         quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer);
+-    quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length);
++    absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length);
+     data = absl::StrCat(data_frame_header, response_body_);
+   }
+   quic::QuicStreamFrame frame(stream_id_, false, 0, data);
+@@ -301,11 +301,11 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) {
+   // Unblock writing now, and this will write out 16kB data and cause stream to
+   // be blocked by the flow control limit.
+   EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-      .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
+-                          quic::StreamSendingState state, bool,
+-                          quiche::QuicheOptional<quic::EncryptionLevel>) {
+-        return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
+-      }));
++      .WillOnce(
++          Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
++                    quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++            return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
++          }));
+   EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark());
+   quic_session_.OnCanWrite();
+   EXPECT_TRUE(quic_stream_->IsFlowControlBlocked());
+@@ -315,20 +315,20 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) {
+                                              32 * 1024);
+   quic_stream_->OnWindowUpdateFrame(window_update1);
+   EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-      .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
+-                          quic::StreamSendingState state, bool,
+-                          quiche::QuicheOptional<quic::EncryptionLevel>) {
+-        return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
+-      }));
++      .WillOnce(
++          Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
++                    quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++            return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
++          }));
+   quic_session_.OnCanWrite();
+   // No data should be buffered at this point.
+ 
+   EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-      .WillOnce(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset,
+-                          quic::StreamSendingState state, bool,
+-                          quiche::QuicheOptional<quic::EncryptionLevel>) {
+-        return quic::QuicConsumedData{0u, state != quic::NO_FIN};
+-      }));
++      .WillOnce(
++          Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset,
++                    quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++            return quic::QuicConsumedData{0u, state != quic::NO_FIN};
++          }));
+   // Send more data. If watermark bytes counting were not cleared in previous
+   // OnCanWrite, this write would have caused the stream to exceed its high watermark.
+   std::string request1(16 * 1024 - 3, 'a');
+diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc
+index cbf66f511..8a493a8e8 100644
+--- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc
++++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc
+@@ -25,7 +25,7 @@ namespace Quic {
+ class TestGetProofCallback : public quic::ProofSource::Callback {
+ public:
+   TestGetProofCallback(bool& called, bool should_succeed, const std::string& server_config,
+-                       quic::QuicTransportVersion& version, quiche::QuicheStringPiece chlo_hash,
++                       quic::QuicTransportVersion& version, absl::string_view chlo_hash,
+                        Network::FilterChain& filter_chain)
+       : called_(called), should_succeed_(should_succeed), server_config_(server_config),
+         version_(version), chlo_hash_(chlo_hash), expected_filter_chain_(filter_chain) {
+@@ -100,7 +100,7 @@ private:
+   bool should_succeed_;
+   const std::string& server_config_;
+   const quic::QuicTransportVersion& version_;
+-  quiche::QuicheStringPiece chlo_hash_;
++  absl::string_view chlo_hash_;
+   Network::FilterChain& expected_filter_chain_;
+   NiceMock<Stats::MockStore> store_;
+   Event::GlobalTimeSystem time_system_;
+@@ -178,7 +178,7 @@ protected:
+   quic::QuicSocketAddress server_address_;
+   quic::QuicSocketAddress client_address_;
+   quic::QuicTransportVersion version_{quic::QUIC_VERSION_UNSUPPORTED};
+-  quiche::QuicheStringPiece chlo_hash_{"aaaaa"};
++  absl::string_view chlo_hash_{"aaaaa"};
+   std::string server_config_{"Server Config"};
+   std::string expected_certs_{quic::test::kTestCertificateChainPem};
+   std::string pkey_{quic::test::kTestCertificatePrivateKeyPem};
+diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc
+index 4a1dfe144..9cdc169cd 100644
+--- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc
++++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc
+@@ -163,7 +163,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureEmptyCertChain) {
+   std::unique_ptr<quic::CertificateView> cert_view =
+       quic::CertificateView::ParseSingleCertificate(leaf_cert_);
+   quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED};
+-  quiche::QuicheStringPiece chlo_hash{"aaaaa"};
++  absl::string_view chlo_hash{"aaaaa"};
+   std::string server_config{"Server Config"};
+   const std::string ocsp_response;
+   const std::string cert_sct;
+@@ -181,7 +181,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) {
+   std::unique_ptr<quic::CertificateView> cert_view =
+       quic::CertificateView::ParseSingleCertificate(leaf_cert_);
+   quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED};
+-  quiche::QuicheStringPiece chlo_hash{"aaaaa"};
++  absl::string_view chlo_hash{"aaaaa"};
+   std::string server_config{"Server Config"};
+   const std::string ocsp_response;
+   const std::string cert_sct;
+@@ -197,7 +197,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) {
+ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureUnsupportedECKey) {
+   configCertVerificationDetails(true);
+   quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED};
+-  quiche::QuicheStringPiece chlo_hash{"aaaaa"};
++  absl::string_view chlo_hash{"aaaaa"};
+   std::string server_config{"Server Config"};
+   const std::string ocsp_response;
+   const std::string cert_sct;
+@@ -236,7 +236,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidSignature) {
+   std::unique_ptr<quic::CertificateView> cert_view =
+       quic::CertificateView::ParseSingleCertificate(leaf_cert_);
+   quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED};
+-  quiche::QuicheStringPiece chlo_hash{"aaaaa"};
++  absl::string_view chlo_hash{"aaaaa"};
+   std::string server_config{"Server Config"};
+   const std::string ocsp_response;
+   const std::string cert_sct;
+diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc
+index 05307c6b9..4fc376857 100644
+--- a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc
++++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc
+@@ -61,6 +61,7 @@ public:
+                                 const quic::ParsedQuicVersionVector& supported_versions,
+                                 Network::Socket& listen_socket)
+       : EnvoyQuicServerConnection(quic::test::TestConnectionId(),
++                                  quic::QuicSocketAddress(quic::QuicIpAddress::Any4(), 12345),
+                                   quic::QuicSocketAddress(quic::QuicIpAddress::Loopback4(), 12345),
+                                   helper, alarm_factory, &writer, /*owns_writer=*/false,
+                                   supported_versions, listen_socket) {}
+@@ -201,10 +202,10 @@ public:
+       crypto_stream_ = test_crypto_stream;
+     }
+     quic::test::QuicServerSessionBasePeer::SetCryptoStream(&envoy_quic_session_, crypto_stream);
+-    quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
+     quic_connection_->SetEncrypter(
+         quic::ENCRYPTION_FORWARD_SECURE,
+         std::make_unique<quic::NullEncrypter>(quic::Perspective::IS_SERVER));
++    quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
+   }
+ 
+   bool installReadFilter() {
+diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc
+index c2fd31c6f..f602e2c9a 100644
+--- a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc
++++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc
+@@ -51,6 +51,7 @@ public:
+                                             POOL_GAUGE(listener_config_.listenerScope()),
+                                             POOL_HISTOGRAM(listener_config_.listenerScope()))}),
+         quic_connection_(quic::test::TestConnectionId(),
++                         quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 123),
+                          quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 12345),
+                          connection_helper_, alarm_factory_, &writer_,
+                          /*owns_writer=*/false, {quic_version_}, *listener_config_.socket_),
+@@ -66,11 +67,11 @@ public:
+     quic_session_.ActivateStream(std::unique_ptr<EnvoyQuicServerStream>(quic_stream_));
+     EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false));
+     EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-        .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
+-                                  quic::StreamSendingState state, bool,
+-                                  quiche::QuicheOptional<quic::EncryptionLevel>) {
+-          return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
+-        }));
++        .WillRepeatedly(
++            Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
++                      quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++              return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
++            }));
+     EXPECT_CALL(writer_, WritePacket(_, _, _, _, _))
+         .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&,
+                                   const quic::QuicSocketAddress&, quic::PerPacketOptions*) {
+@@ -110,7 +111,7 @@ public:
+       std::unique_ptr<char[]> data_buffer;
+       quic::QuicByteCount data_frame_header_length =
+           quic::HttpEncoder::SerializeDataFrameHeader(body.length(), &data_buffer);
+-      quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length);
++      absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length);
+       data = absl::StrCat(data_frame_header, body);
+     }
+     return data;
+@@ -397,11 +398,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) {
+ 
+   // Make the stream blocked by congestion control.
+   EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-      .WillOnce(Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset,
+-                          quic::StreamSendingState state, bool,
+-                          quiche::QuicheOptional<quic::EncryptionLevel>) {
+-        return quic::QuicConsumedData{0u, state != quic::NO_FIN};
+-      }));
++      .WillOnce(
++          Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset,
++                    quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++            return quic::QuicConsumedData{0u, state != quic::NO_FIN};
++          }));
+   quic_stream_->encodeHeaders(response_headers_, /*end_stream=*/false);
+ 
+   // Encode 16kB -10 bytes request body. Because the high watermark is 16KB, with previously
+@@ -415,11 +416,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) {
+   // Unblock writing now, and this will write out 16kB data and cause stream to
+   // be blocked by the flow control limit.
+   EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-      .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
+-                          quic::StreamSendingState state, bool,
+-                          quiche::QuicheOptional<quic::EncryptionLevel>) {
+-        return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
+-      }));
++      .WillOnce(
++          Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
++                    quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++            return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
++          }));
+   EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark());
+   quic_session_.OnCanWrite();
+   EXPECT_TRUE(quic_stream_->IsFlowControlBlocked());
+@@ -429,20 +430,20 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) {
+                                              32 * 1024);
+   quic_stream_->OnWindowUpdateFrame(window_update1);
+   EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-      .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
+-                          quic::StreamSendingState state, bool,
+-                          quiche::QuicheOptional<quic::EncryptionLevel>) {
+-        return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
+-      }));
++      .WillOnce(
++          Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset,
++                    quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++            return quic::QuicConsumedData{write_length, state != quic::NO_FIN};
++          }));
+   quic_session_.OnCanWrite();
+   // No data should be buffered at this point.
+ 
+   EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _))
+-      .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset,
+-                                quic::StreamSendingState state, bool,
+-                                quiche::QuicheOptional<quic::EncryptionLevel>) {
+-        return quic::QuicConsumedData{0u, state != quic::NO_FIN};
+-      }));
++      .WillRepeatedly(
++          Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset,
++                    quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) {
++            return quic::QuicConsumedData{0u, state != quic::NO_FIN};
++          }));
+   // Send more data. If watermark bytes counting were not cleared in previous
+   // OnCanWrite, this write would have caused the stream to exceed its high watermark.
+   std::string response1(16 * 1024 - 3, 'a');
+diff --git a/test/extensions/quic_listeners/quiche/platform/BUILD b/test/extensions/quic_listeners/quiche/platform/BUILD
+index 420e812b8..7dbb08d82 100644
+--- a/test/extensions/quic_listeners/quiche/platform/BUILD
++++ b/test/extensions/quic_listeners/quiche/platform/BUILD
+@@ -9,16 +9,6 @@ licenses(["notice"])  # Apache 2
+ 
+ envoy_package()
+ 
+-envoy_cc_test(
+-    name = "quiche_platform_test",
+-    srcs = ["quiche_platform_test.cc"],
+-    external_deps = ["quiche_common_platform"],
+-    deps = [
+-        "@com_googlesource_quiche//:quiche_common_platform",
+-        "@com_googlesource_quiche//:quiche_common_platform_endian",
+-    ],
+-)
+-
+ envoy_cc_test(
+     name = "http2_platform_test",
+     srcs = ["http2_platform_test.cc"],
+@@ -63,7 +53,6 @@ envoy_cc_test(
+         "@com_googlesource_quiche//:quic_platform_mem_slice_span",
+         "@com_googlesource_quiche//:quic_platform_mem_slice_storage",
+         "@com_googlesource_quiche//:quic_platform_mock_log",
+-        "@com_googlesource_quiche//:quic_platform_port_utils",
+         "@com_googlesource_quiche//:quic_platform_sleep",
+         "@com_googlesource_quiche//:quic_platform_system_event_loop",
+         "@com_googlesource_quiche//:quic_platform_test",
+@@ -150,17 +139,6 @@ envoy_cc_test_library(
+     deps = ["@com_googlesource_quiche//:quic_platform_base"],
+ )
+ 
+-envoy_cc_test_library(
+-    name = "quic_platform_port_utils_impl_lib",
+-    srcs = ["quic_port_utils_impl.cc"],
+-    hdrs = ["quic_port_utils_impl.h"],
+-    tags = ["nofips"],
+-    deps = [
+-        "//source/common/network:utility_lib",
+-        "//test/test_common:environment_lib",
+-    ],
+-)
+-
+ envoy_cc_test_library(
+     name = "quic_platform_test_mem_slice_vector_impl_lib",
+     hdrs = ["quic_test_mem_slice_vector_impl.h"],
+diff --git a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc
+index 069a79eab..35aee5d27 100644
+--- a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc
++++ b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc
+@@ -72,20 +72,14 @@ TEST(Http2PlatformTest, Http2Log) {
+   HTTP2_DLOG_EVERY_N(ERROR, 2) << "DLOG_EVERY_N(ERROR, 2)";
+ }
+ 
+-TEST(Http2PlatformTest, Http2StringPiece) {
+-  std::string s = "bar";
+-  quiche::QuicheStringPiece sp(s);
+-  EXPECT_EQ('b', sp[0]);
+-}
+-
+ TEST(Http2PlatformTest, Http2Macro) {
+   EXPECT_DEBUG_DEATH(HTTP2_UNREACHABLE(), "");
+   EXPECT_DEATH(HTTP2_DIE_IF_NULL(nullptr), "");
+ }
+ 
+ TEST(Http2PlatformTest, Http2Flags) {
+-  auto& flag_registry = quiche::FlagRegistry::GetInstance();
+-  flag_registry.ResetFlags();
++  auto& flag_registry = quiche::FlagRegistry::getInstance();
++  flag_registry.resetFlags();
+   EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false));
+   SetHttp2ReloadableFlag(http2_testonly_default_false, true);
+   EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false));
+@@ -93,22 +87,22 @@ TEST(Http2PlatformTest, Http2Flags) {
+   for (std::string s : {"1", "t", "true", "TRUE", "y", "yes", "Yes"}) {
+     SetHttp2ReloadableFlag(http2_testonly_default_false, false);
+     EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false));
+-    EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false")
+-                    ->SetValueFromString(s));
++    EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false")
++                    ->setValueFromString(s));
+     EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false));
+   }
+   for (std::string s : {"0", "f", "false", "FALSE", "n", "no", "No"}) {
+     SetHttp2ReloadableFlag(http2_testonly_default_false, true);
+     EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false));
+-    EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false")
+-                    ->SetValueFromString(s));
++    EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false")
++                    ->setValueFromString(s));
+     EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false));
+   }
+   for (std::string s : {"some", "invalid", "values", ""}) {
+     SetHttp2ReloadableFlag(http2_testonly_default_false, false);
+     EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false));
+-    EXPECT_FALSE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false")
+-                     ->SetValueFromString(s));
++    EXPECT_FALSE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false")
++                     ->setValueFromString(s));
+     EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false));
+   }
+ }
+diff --git a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc
+index 68141aa94..902ad1a9e 100644
+--- a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc
++++ b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc
+@@ -30,7 +30,6 @@
+ #include "gtest/gtest.h"
+ #include "quiche/common/platform/api/quiche_string_piece.h"
+ #include "quiche/epoll_server/fake_simple_epoll_server.h"
+-#include "quiche/quic/platform/api/quic_aligned.h"
+ #include "quiche/quic/platform/api/quic_bug_tracker.h"
+ #include "quiche/quic/platform/api/quic_cert_utils.h"
+ #include "quiche/quic/platform/api/quic_client_stats.h"
+@@ -42,7 +41,6 @@
+ #include "quiche/quic/platform/api/quic_flags.h"
+ #include "quiche/quic/platform/api/quic_hostname_utils.h"
+ #include "quiche/quic/platform/api/quic_logging.h"
+-#include "quiche/quic/platform/api/quic_macros.h"
+ #include "quiche/quic/platform/api/quic_map_util.h"
+ #include "quiche/quic/platform/api/quic_mem_slice.h"
+ #include "quiche/quic/platform/api/quic_mem_slice_span.h"
+@@ -50,7 +48,6 @@
+ #include "quiche/quic/platform/api/quic_mock_log.h"
+ #include "quiche/quic/platform/api/quic_mutex.h"
+ #include "quiche/quic/platform/api/quic_pcc_sender.h"
+-#include "quiche/quic/platform/api/quic_port_utils.h"
+ #include "quiche/quic/platform/api/quic_ptr_util.h"
+ #include "quiche/quic/platform/api/quic_server_stats.h"
+ #include "quiche/quic/platform/api/quic_sleep.h"
+@@ -92,8 +89,6 @@ protected:
+   const int verbosity_log_threshold_;
+ };
+ 
+-TEST_F(QuicPlatformTest, QuicAlignOf) { EXPECT_LT(0, QUIC_ALIGN_OF(int)); }
+-
+ enum class TestEnum { ZERO = 0, ONE, TWO, COUNT };
+ 
+ TEST_F(QuicPlatformTest, QuicBugTracker) {
+@@ -468,9 +463,9 @@ TEST_F(QuicPlatformTest, QuicCertUtils) {
+   unsigned char* der = nullptr;
+   int len = i2d_X509(x509_cert.get(), &der);
+   ASSERT_GT(len, 0);
+-  quiche::QuicheStringPiece out;
++  absl::string_view out;
+   QuicCertUtils::ExtractSubjectNameFromDERCert(
+-      quiche::QuicheStringPiece(reinterpret_cast<const char*>(der), len), &out);
++      absl::string_view(reinterpret_cast<const char*>(der), len), &out);
+   EXPECT_EQ("0z1\v0\t\x6\x3U\x4\x6\x13\x2US1\x13"
+             "0\x11\x6\x3U\x4\b\f\nCalifornia1\x16"
+             "0\x14\x6\x3U\x4\a\f\rSan Francisco1\r"
+@@ -566,8 +561,8 @@ TEST_F(QuicPlatformTest, MonotonicityWithFakeEpollClock) {
+ }
+ 
+ TEST_F(QuicPlatformTest, QuicFlags) {
+-  auto& flag_registry = quiche::FlagRegistry::GetInstance();
+-  flag_registry.ResetFlags();
++  auto& flag_registry = quiche::FlagRegistry::getInstance();
++  flag_registry.resetFlags();
+ 
+   EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false));
+   EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_true));
+@@ -583,14 +578,15 @@ TEST_F(QuicPlatformTest, QuicFlags) {
+   SetQuicFlag(FLAGS_quic_time_wait_list_seconds, 100);
+   EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds));
+ 
+-  flag_registry.ResetFlags();
++  flag_registry.resetFlags();
+   EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false));
+   EXPECT_TRUE(GetQuicRestartFlag(quic_testonly_default_true));
+   EXPECT_EQ(200, GetQuicFlag(FLAGS_quic_time_wait_list_seconds));
+-  flag_registry.FindFlag("quic_reloadable_flag_quic_testonly_default_false")
+-      ->SetValueFromString("true");
+-  flag_registry.FindFlag("quic_restart_flag_quic_testonly_default_true")->SetValueFromString("0");
+-  flag_registry.FindFlag("quic_time_wait_list_seconds")->SetValueFromString("100");
++  flag_registry.findFlag("FLAGS_quic_reloadable_flag_quic_testonly_default_false")
++      ->setValueFromString("true");
++  flag_registry.findFlag("FLAGS_quic_restart_flag_quic_testonly_default_true")
++      ->setValueFromString("0");
++  flag_registry.findFlag("FLAGS_quic_time_wait_list_seconds")->setValueFromString("100");
+   EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_false));
+   EXPECT_FALSE(GetQuicRestartFlag(quic_testonly_default_true));
+   EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds));
+@@ -661,35 +657,6 @@ TEST_F(FileUtilsTest, ReadFileContents) {
+   EXPECT_EQ(data, output);
+ }
+ 
+-TEST_F(QuicPlatformTest, PickUnsedPort) {
+-  int port = QuicPickServerPortForTestsOrDie();
+-  std::vector<Envoy::Network::Address::IpVersion> supported_versions =
+-      Envoy::TestEnvironment::getIpVersionsForTest();
+-  for (auto ip_version : supported_versions) {
+-    Envoy::Network::Address::InstanceConstSharedPtr addr =
+-        Envoy::Network::Test::getCanonicalLoopbackAddress(ip_version);
+-    Envoy::Network::Address::InstanceConstSharedPtr addr_with_port =
+-        Envoy::Network::Utility::getAddressWithPort(*addr, port);
+-    Envoy::Network::SocketImpl sock(Envoy::Network::Socket::Type::Datagram, addr_with_port);
+-    // binding of given port should success.
+-    EXPECT_EQ(0, sock.bind(addr_with_port).rc_);
+-  }
+-}
+-
+-TEST_F(QuicPlatformTest, FailToPickUnsedPort) {
+-  Envoy::Api::MockOsSysCalls os_sys_calls;
+-  Envoy::TestThreadsafeSingletonInjector<Envoy::Api::OsSysCallsImpl> os_calls(&os_sys_calls);
+-  // Actually create sockets.
+-  EXPECT_CALL(os_sys_calls, socket(_, _, _)).WillRepeatedly([](int domain, int type, int protocol) {
+-    os_fd_t fd = ::socket(domain, type, protocol);
+-    return Envoy::Api::SysCallSocketResult{fd, errno};
+-  });
+-  // Fail bind call's to mimic port exhaustion.
+-  EXPECT_CALL(os_sys_calls, bind(_, _, _))
+-      .WillRepeatedly(Return(Envoy::Api::SysCallIntResult{-1, SOCKET_ERROR_ADDR_IN_USE}));
+-  EXPECT_DEATH(QuicPickServerPortForTestsOrDie(), "Failed to pick a port for test.");
+-}
+-
+ TEST_F(QuicPlatformTest, TestEnvoyQuicBufferAllocator) {
+   QuicStreamBufferAllocator allocator;
+   Envoy::Stats::TestUtil::MemoryTest memory_test;
+@@ -711,14 +678,6 @@ TEST_F(QuicPlatformTest, TestSystemEventLoop) {
+   QuicSystemEventLoop("dummy");
+ }
+ 
+-QUIC_MUST_USE_RESULT bool dummyTestFunction() { return false; }
+-
+-TEST_F(QuicPlatformTest, TestQuicMacros) {
+-  // Just make sure it compiles.
+-  EXPECT_FALSE(dummyTestFunction());
+-  int a QUIC_UNUSED;
+-}
+-
+ TEST(EnvoyQuicMemSliceTest, ConstructMemSliceFromBuffer) {
+   std::string str(512, 'b');
+   // Fragment needs to out-live buffer.
+diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc
+index 556f6cd3e..9eaf8532a 100644
+--- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc
++++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc
+@@ -19,7 +19,7 @@
+ namespace quic {
+ namespace {
+ 
+-void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStringPiece data) {
++void quicRecordTestOutputToFile(const std::string& filename, absl::string_view data) {
+   const char* output_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR");
+   if (output_dir_env == nullptr) {
+     QUIC_LOG(WARNING) << "Could not save test output since QUIC_TEST_OUTPUT_DIR is not set";
+@@ -64,11 +64,13 @@ void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStrin
+ }
+ } // namespace
+ 
+-void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data) {
+-  QuicRecordTestOutputToFile(filename.data(), data);
++// NOLINTNEXTLINE(readability-identifier-naming)
++void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data) {
++  quicRecordTestOutputToFile(filename.data(), data);
+ }
+ 
+-bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data) {
++// NOLINTNEXTLINE(readability-identifier-naming)
++bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data) {
+   const char* read_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR");
+   if (read_dir_env == nullptr) {
+     QUIC_LOG(WARNING) << "Could not load test output since QUIC_TEST_OUTPUT_DIR is not set";
+@@ -96,7 +98,8 @@ bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* dat
+   return true;
+ }
+ 
+-void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data) {
++// NOLINTNEXTLINE(readability-identifier-naming)
++void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data) {
+   const testing::TestInfo* test_info = testing::UnitTest::GetInstance()->current_test_info();
+ 
+   std::string timestamp = absl::FormatTime("%Y%m%d%H%M%S", absl::Now(), absl::LocalTimeZone());
+@@ -104,7 +107,7 @@ void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStr
+   std::string filename = fmt::sprintf("%s.%s.%s.%s.qtr", test_info->name(),
+                                       test_info->test_case_name(), identifier.data(), timestamp);
+ 
+-  QuicRecordTestOutputToFile(filename, data);
++  quicRecordTestOutputToFile(filename, data);
+ }
+ 
+ } // namespace quic
+diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h
+index a1c6c7305..fcf0c47b3 100644
+--- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h
++++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h
+@@ -6,14 +6,16 @@
+ // consumed or referenced directly by other Envoy code. It serves purely as a
+ // porting layer for QUICHE.
+ 
+-#include "quiche/common/platform/api/quiche_string_piece.h"
++#include "absl/strings/string_view.h"
+ 
+ namespace quic {
++// NOLINTNEXTLINE(readability-identifier-naming)
++void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data);
+ 
+-void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data);
++// NOLINTNEXTLINE(readability-identifier-naming)
++bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data);
+ 
+-bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data);
+-
+-void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data);
++// NOLINTNEXTLINE(readability-identifier-naming)
++void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data);
+ 
+ } // namespace quic
+diff --git a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc
+deleted file mode 100644
+index a733894b5..000000000
+--- a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc
++++ /dev/null
+@@ -1,39 +0,0 @@
+-// NOLINT(namespace-envoy)
+-
+-// This file is part of the QUICHE platform implementation, and is not to be
+-// consumed or referenced directly by other Envoy code. It serves purely as a
+-// porting layer for QUICHE.
+-
+-#include "gtest/gtest.h"
+-#include "quiche/common/platform/api/quiche_arraysize.h"
+-#include "quiche/common/platform/api/quiche_endian.h"
+-#include "quiche/common/platform/api/quiche_optional.h"
+-#include "quiche/common/platform/api/quiche_ptr_util.h"
+-#include "quiche/common/platform/api/quiche_string_piece.h"
+-
+-namespace quiche {
+-
+-TEST(QuichePlatformTest, Arraysize) {
+-  int array[] = {0, 1, 2, 3, 4};
+-  EXPECT_EQ(5, QUICHE_ARRAYSIZE(array));
+-}
+-
+-TEST(QuichePlatformTest, StringPiece) {
+-  std::string s = "bar";
+-  QuicheStringPiece sp(s);
+-  EXPECT_EQ('b', sp[0]);
+-}
+-
+-TEST(QuichePlatformTest, WrapUnique) {
+-  auto p = QuicheWrapUnique(new int(6));
+-  EXPECT_EQ(6, *p);
+-}
+-
+-TEST(QuichePlatformTest, TestQuicheOptional) {
+-  QuicheOptional<int32_t> maybe_a;
+-  EXPECT_FALSE(maybe_a.has_value());
+-  maybe_a = 1;
+-  EXPECT_EQ(1, *maybe_a);
+-}
+-
+-} // namespace quiche
+diff --git a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc
+index 56453e232..eeae58c0a 100644
+--- a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc
++++ b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc
+@@ -8,7 +8,6 @@
+ #include "gtest/gtest.h"
+ #include "quiche/spdy/platform/api/spdy_bug_tracker.h"
+ #include "quiche/spdy/platform/api/spdy_containers.h"
+-#include "quiche/spdy/platform/api/spdy_endianness_util.h"
+ #include "quiche/spdy/platform/api/spdy_estimate_memory_usage.h"
+ #include "quiche/spdy/platform/api/spdy_flags.h"
+ #include "quiche/spdy/platform/api/spdy_logging.h"
+@@ -47,11 +46,6 @@ TEST(SpdyPlatformTest, SpdyHashSet) {
+   EXPECT_EQ(0, hset.count("qux"));
+ }
+ 
+-TEST(SpdyPlatformTest, SpdyEndianness) {
+-  EXPECT_EQ(0x1234, spdy::SpdyNetToHost16(spdy::SpdyHostToNet16(0x1234)));
+-  EXPECT_EQ(0x12345678, spdy::SpdyNetToHost32(spdy::SpdyHostToNet32(0x12345678)));
+-}
+-
+ TEST(SpdyPlatformTest, SpdyEstimateMemoryUsage) {
+   std::string s = "foo";
+   // Stubbed out to always return 0.
+@@ -92,19 +86,19 @@ TEST(SpdyPlatformTest, SpdyTestHelpers) {
+ }
+ 
+ TEST(SpdyPlatformTest, SpdyFlags) {
+-  auto& flag_registry = quiche::FlagRegistry::GetInstance();
+-  flag_registry.ResetFlags();
++  auto& flag_registry = quiche::FlagRegistry::getInstance();
++  flag_registry.resetFlags();
+   EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false));
+   EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false));
+ 
+-  flag_registry.FindFlag("spdy_reloadable_flag_spdy_testonly_default_false")
+-      ->SetValueFromString("true");
++  flag_registry.findFlag("FLAGS_quic_reloadable_flag_spdy_testonly_default_false")
++      ->setValueFromString("true");
+   EXPECT_TRUE(GetSpdyReloadableFlag(spdy_testonly_default_false));
+   EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false));
+ 
+-  flag_registry.ResetFlags();
+-  flag_registry.FindFlag("spdy_restart_flag_spdy_testonly_default_false")
+-      ->SetValueFromString("yes");
++  flag_registry.resetFlags();
++  flag_registry.findFlag("FLAGS_quic_restart_flag_spdy_testonly_default_false")
++      ->setValueFromString("yes");
+   EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false));
+   EXPECT_TRUE(GetSpdyRestartFlag(spdy_testonly_default_false));
+ }
+diff --git a/test/extensions/quic_listeners/quiche/test_proof_source.h b/test/extensions/quic_listeners/quiche/test_proof_source.h
+index a249b4314..bbedfd6c7 100644
+--- a/test/extensions/quic_listeners/quiche/test_proof_source.h
++++ b/test/extensions/quic_listeners/quiche/test_proof_source.h
+@@ -36,7 +36,7 @@ protected:
+   void signPayload(const quic::QuicSocketAddress& /*server_address*/,
+                    const quic::QuicSocketAddress& /*client_address*/,
+                    const std::string& /*hostname*/, uint16_t /*signature_algorithm*/,
+-                   quiche::QuicheStringPiece in,
++                   absl::string_view in,
+                    std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override {
+     callback->Run(true, absl::StrCat("Fake signature for { ", in, " }"),
+                   std::make_unique<EnvoyQuicProofSourceDetails>(filter_chain_));
+diff --git a/test/extensions/quic_listeners/quiche/test_utils.h b/test/extensions/quic_listeners/quiche/test_utils.h
+index 102f7608e..7f0ea78e8 100644
+--- a/test/extensions/quic_listeners/quiche/test_utils.h
++++ b/test/extensions/quic_listeners/quiche/test_utils.h
+@@ -46,7 +46,7 @@ public:
+   MOCK_METHOD(quic::QuicConsumedData, WritevData,
+               (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset,
+                quic::StreamSendingState state, quic::TransmissionType type,
+-               quiche::QuicheOptional<quic::EncryptionLevel> level));
++               absl::optional<quic::EncryptionLevel> level));
+   MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id));
+ 
+   absl::string_view requestedServerName() const override {
+@@ -90,7 +90,7 @@ public:
+   MOCK_METHOD(quic::QuicConsumedData, WritevData,
+               (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset,
+                quic::StreamSendingState state, quic::TransmissionType type,
+-               quiche::QuicheOptional<quic::EncryptionLevel> level));
++               absl::optional<quic::EncryptionLevel> level));
+   MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id));
+ 
+   absl::string_view requestedServerName() const override {
+-- 
+2.29.2
+
diff --git a/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch b/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch
new file mode 100644
index 00000000000..370682efaa3
--- /dev/null
+++ b/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch
@@ -0,0 +1,91 @@
+From 8b531c41f956b27e4be32b430db2e7a44e0cdd3e Mon Sep 17 00:00:00 2001
+From: Luke Granger-Brown <git@lukegb.com>
+Date: Thu, 7 Jan 2021 11:09:18 +0000
+Subject: [PATCH] Add upb patch to make it compile under GCC10
+
+---
+ bazel/repositories.bzl |  5 +++-
+ bazel/upb2.patch       | 55 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 59 insertions(+), 1 deletion(-)
+ create mode 100644 bazel/upb2.patch
+
+diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
+index 64d61ea49..c6cadc9df 100644
+--- a/bazel/repositories.bzl
++++ b/bazel/repositories.bzl
+@@ -811,7 +811,10 @@ def _com_github_grpc_grpc():
+ def _upb():
+     _repository_impl(
+         name = "upb",
+-        patches = ["@envoy//bazel:upb.patch"],
++        patches = [
++            "@envoy//bazel:upb.patch",
++            "@envoy//bazel:upb2.patch",
++        ],
+         patch_args = ["-p1"],
+     )
+ 
+diff --git a/bazel/upb2.patch b/bazel/upb2.patch
+new file mode 100644
+index 000000000..6e436c61b
+--- /dev/null
++++ b/bazel/upb2.patch
+@@ -0,0 +1,55 @@
++From 9bd23dab4240b015321a53c45b3c9e4847fbf020 Mon Sep 17 00:00:00 2001
++From: Joshua Haberman <jhaberman@gmail.com>
++Date: Tue, 7 Apr 2020 15:22:11 -0700
++Subject: [PATCH] Changed upb status to suit GCC10's warning about strncpy().
++ (#268)
++
++Added tests for all cases. Also removed ellipses from truncated
++messages, they were more trouble than they are worth.
++---
++ tests/test_generated_code.c | 33 +++++++++++++++++++++++++++++++++
++ upb/upb.c                   | 17 +++--------------
++ 2 files changed, 36 insertions(+), 14 deletions(-)
++
++diff --git a/upb/upb.c b/upb/upb.c
++index cb2cdfd9d..258192d79 100644
++--- a/upb/upb.c
+++++ b/upb/upb.c
++@@ -11,17 +11,6 @@
++ 
++ #include "upb/port_def.inc"
++ 
++-/* Guarantee null-termination and provide ellipsis truncation.
++- * It may be tempting to "optimize" this by initializing these final
++- * four bytes up-front and then being careful never to overwrite them,
++- * this is safer and simpler. */
++-static void nullz(upb_status *status) {
++-  const char *ellipsis = "...";
++-  size_t len = strlen(ellipsis);
++-  UPB_ASSERT(sizeof(status->msg) > len);
++-  memcpy(status->msg + sizeof(status->msg) - len, ellipsis, len);
++-}
++-
++ /* upb_status *****************************************************************/
++ 
++ void upb_status_clear(upb_status *status) {
++@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; }
++ void upb_status_seterrmsg(upb_status *status, const char *msg) {
++   if (!status) return;
++   status->ok = false;
++-  strncpy(status->msg, msg, sizeof(status->msg));
++-  nullz(status);
+++  strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1);
+++  status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0';
++ }
++ 
++ void upb_status_seterrf(upb_status *status, const char *fmt, ...) {
++@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) {
++   if (!status) return;
++   status->ok = false;
++   _upb_vsnprintf(status->msg, sizeof(status->msg), fmt, args);
++-  nullz(status);
+++  status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0';
++ }
++ 
++ /* upb_alloc ******************************************************************/
+-- 
+2.29.2
+
diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix
new file mode 100644
index 00000000000..0da0cb23d76
--- /dev/null
+++ b/pkgs/servers/http/envoy/default.nix
@@ -0,0 +1,119 @@
+{ buildBazelPackage
+, fetchFromGitHub
+, stdenv
+, cmake
+, go
+, ninja
+, python3
+}:
+
+let
+  srcVer = {
+    # We need the commit hash, since Bazel stamps the build with it.
+    # However, the version string is more useful for end-users.
+    # These are contained in a attrset of their own to make it obvious that
+    # people should update both.
+    version = "1.16.2";
+    commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3";
+  };
+in
+buildBazelPackage rec {
+  pname = "envoy";
+  version = srcVer.version;
+  src = fetchFromGitHub {
+    owner = "envoyproxy";
+    repo = "envoy";
+    rev = srcVer.commit;
+    hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ=";
+
+    extraPostFetch = ''
+      chmod -R +w $out
+      rm $out/.bazelversion
+      echo ${srcVer.commit} > $out/SOURCE_VERSION
+      sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl
+    '';
+  };
+
+  patches = [
+    # Quiche needs to be updated to compile under newer GCC.
+    # This is a manual backport of http://github.com/envoyproxy/envoy/pull/13949.
+    ./0001-quiche-update-QUICHE-tar-13949.patch
+
+    # upb needs to be updated to compile under newer GCC.
+    # This is a manual backport of https://github.com/protocolbuffers/upb/commit/9bd23dab4240b015321a53c45b3c9e4847fbf020.
+    ./0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch
+  ];
+  postPatch = ''
+    sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    python3
+    go
+    ninja
+  ];
+
+  fetchAttrs = {
+    sha256 = "sha256-mct7anzErY9eSujZyGORfRJqzAO9XuFAv04DS8VRZKM=";
+    dontUseCmakeConfigure = true;
+    preInstall = ''
+      # Strip out the path to the build location (by deleting the comment line).
+      find $bazelOut/external -name requirements.bzl | while read requirements; do
+        sed -i '/# Generated from /d' "$requirements"
+      done
+
+      # Remove references to paths in the Nix store.
+      sed -i \
+        -e 's,${python3},__NIXPYTHON__,' \
+        -e 's,${stdenv.shellPackage},__NIXSHELL__,' \
+        $bazelOut/external/com_github_luajit_luajit/build.py \
+        $bazelOut/external/local_config_sh/BUILD
+      rm -r $bazelOut/external/go_sdk
+
+      # Replace some wheels which are only used for tests with empty files;
+      # they're nondeterministically built and packed.
+      >$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
+      >$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
+      >$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl
+    '';
+  };
+  buildAttrs = {
+    dontUseCmakeConfigure = true;
+    dontUseNinjaInstall = true;
+    preConfigure = ''
+      sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl
+
+      # Add paths to Nix store back.
+      sed -i \
+        -e 's,__NIXPYTHON__,${python3},' \
+        -e 's,__NIXSHELL__,${stdenv.shellPackage},' \
+        $bazelOut/external/com_github_luajit_luajit/build.py \
+        $bazelOut/external/local_config_sh/BUILD
+    '';
+    installPhase = ''
+      install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy
+    '';
+  };
+
+  fetchConfigured = true;
+  removeRulesCC = false;
+  removeLocalConfigCc = true;
+  removeLocal = false;
+  bazelTarget = "//source/exe:envoy-static";
+  bazelBuildFlags = [
+    "-c opt"
+    "--spawn_strategy=standalone"
+    "--noexperimental_strict_action_env"
+    "--cxxopt=-Wno-maybe-uninitialized"
+    "--cxxopt=-Wno-uninitialized"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://envoyproxy.io";
+    description = "Cloud-native edge and service proxy";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lukegb ];
+    platforms = [ "x86_64-linux" ];  # Other platforms will generate different fetch hashes.
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30787fac2c2..4f0f3f5fdad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17401,6 +17401,8 @@ in
 
   engelsystem = callPackage ../servers/web-apps/engelsystem { };
 
+  envoy = callPackage ../servers/http/envoy { };
+
   etcd = callPackage ../servers/etcd { };
   etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
 

From 88b72c33d73a5fdc176cec6b50b3034fc3e7a4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= <esm@eduardosm.net>
Date: Thu, 14 Jan 2021 10:08:13 +0100
Subject: [PATCH 048/956] maintainers: add eduardosm

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b48648dfd4e..c9ef0460332 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2565,6 +2565,12 @@
     githubId = 119483;
     name = "Matthew Brown";
   };
+  eduardosm = {
+    email = "esm@eduardosm.net";
+    github = "eduardosm";
+    githubId = 761151;
+    name = "Eduardo Sánchez Muñoz";
+  };
   eduarrrd = {
     email = "e.bachmakov@gmail.com";
     github = "eduarrrd";

From fb7b08de3220cd383165fcf5a7ccf9b93b54e9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= <esm@eduardosm.net>
Date: Thu, 31 Dec 2020 12:57:27 +0100
Subject: [PATCH 049/956] sip_5: init at 5.5.0

---
 pkgs/development/python-modules/sip/5.x.nix | 26 +++++++++++++++++++++
 pkgs/top-level/python-packages.nix          |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/sip/5.x.nix

diff --git a/pkgs/development/python-modules/sip/5.x.nix b/pkgs/development/python-modules/sip/5.x.nix
new file mode 100644
index 00000000000..cebffd5765b
--- /dev/null
+++ b/pkgs/development/python-modules/sip/5.x.nix
@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage, packaging, toml }:
+
+buildPythonPackage rec {
+  pname = "sip";
+  version = "5.5.0";
+
+  src = fetchPypi {
+    pname = "sip";
+    inherit version;
+    sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx";
+  };
+
+  propagatedBuildInputs = [ packaging toml ];
+
+  # There aren't tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "sipbuild" ];
+
+  meta = with lib; {
+    description = "Creates C++ bindings for Python modules";
+    homepage    = "http://www.riverbankcomputing.co.uk/";
+    license     = licenses.gpl3Only;
+    maintainers = with maintainers; [ eduardosm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ae237047c9..a719d761a6e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6939,6 +6939,8 @@ in {
 
   sip = callPackage ../development/python-modules/sip { };
 
+  sip_5 = callPackage ../development/python-modules/sip/5.x.nix { };
+
   sipsimple = callPackage ../development/python-modules/sipsimple { };
 
   six = callPackage ../development/python-modules/six { };

From eda8c11e208a61b12466c8a3720c087c361cb9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 14 Jan 2021 13:47:23 -0600
Subject: [PATCH 050/956] nvidia-settings.stable: 460.27.04 -> 460.32.03

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 4b0c060f9ce..1b67ae15412 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -24,8 +24,7 @@ rec {
     then generic {
       version = "460.32.03";
       sha256_64bit = "0qb0f8djys55b7qgvpbwafw5lkwvmcslqz3i2kr3jm354gy248ag";
-      settingsVersion = "460.27.04";
-      settingsSha256 = "1z9ibkhyjqzhhzi3gj88f5jlpc1d76jsncsy6wxpnbdbak8ljkw5";
+      settingsSha256 = "0mfkw0s4gy1dx671cp1kbpkpkf9c4271w5dz0ykiacz22simi83l";
       persistencedSha256 = "1zrnmwlwqg3pgy1jvldy9iv994wr823rl7vjr1kqnngdmn7bflxl";
     }
     else legacy_390;

From 78e40c4a065d5c86c00354e998ff1caa2352bc35 Mon Sep 17 00:00:00 2001
From: Hector Escobedo <hector.escobedo@obsidian.systems>
Date: Thu, 14 Jan 2021 15:19:00 -0800
Subject: [PATCH 051/956] fast-cpp-csv-parser: init at 2021-01-03

---
 .../libraries/fast-cpp-csv-parser/default.nix | 26 +++++++++++++++++++
 .../fast-cpp-csv-parser.pc.in                 |  8 ++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/fast-cpp-csv-parser/default.nix
 create mode 100644 pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in

diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix
new file mode 100644
index 00000000000..80306bf506b
--- /dev/null
+++ b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "fast-cpp-csv-parser";
+  version = "2021-01-03";
+
+  src = fetchFromGitHub {
+    owner = "ben-strasser";
+    repo = pname;
+    rev = "75600d0b77448e6c410893830df0aec1dbacf8e3";
+    sha256 = "04kalwgsr8khqr1j5j13vzwaml268c5dvc9wfcwfs13wp3snqwf2";
+  };
+
+  installPhase = ''
+    mkdir -p $out/lib/pkgconfig $out/include
+    cp -r *.h $out/include/
+    substituteAll ${./fast-cpp-csv-parser.pc.in} $out/lib/pkgconfig/fast-cpp-csv-parser.pc
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files";
+    homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bhipple ];
+  };
+}
diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
new file mode 100644
index 00000000000..4a8e57d20ff
--- /dev/null
+++ b/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
@@ -0,0 +1,8 @@
+prefix=@out@
+includedir=${prefix}/include
+
+Name: fast-cpp-csv-parser
+Description: Fast header-only library for reading CSV files
+URL: https://github.com/ben-strasser/fast-cpp-csv-parser
+Version: @version@
+Cflags: -isystem${includedir}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aedbddf1269..754d90c3ae0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2191,6 +2191,8 @@ in
 
   fast-cli = nodePackages.fast-cli;
 
+  fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { };
+
   faudio = callPackage ../development/libraries/faudio { };
 
   fd = callPackage ../tools/misc/fd { };

From c6b22ca28866bfbe2d5a4ba797156f546e3f8259 Mon Sep 17 00:00:00 2001
From: Hector Escobedo <hector.escobedo@obsidian.systems>
Date: Thu, 14 Jan 2021 14:35:58 -0800
Subject: [PATCH 052/956] networking-ts-cxx: init at 2019-02-27

---
 .../libraries/networking-ts-cxx/default.nix   | 28 +++++++++++++++++++
 .../networking-ts-cxx/networking_ts.pc.in     |  8 ++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/networking-ts-cxx/default.nix
 create mode 100644 pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in

diff --git a/pkgs/development/libraries/networking-ts-cxx/default.nix b/pkgs/development/libraries/networking-ts-cxx/default.nix
new file mode 100644
index 00000000000..72981175c0b
--- /dev/null
+++ b/pkgs/development/libraries/networking-ts-cxx/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "networking-ts-cxx";
+  version = "2019-02-27";
+
+  # Used until https://github.com/chriskohlhoff/networking-ts-impl/issues/17 is
+  # resolved and we can generate in Nix.
+  src = fetchFromGitHub {
+    owner = "chriskohlhoff";
+    repo = "networking-ts-impl";
+    rev = "c97570e7ceef436581be3c138868a19ad96e025b";
+    sha256 = "12b5lg989nn1b8v6x9fy3cxsf3hs5hr67bd1mfyh8pjikir7zv6j";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{include,lib/pkgconfig}
+    cp -r include $out/
+    substituteAll ${./networking_ts.pc.in} $out/lib/pkgconfig/networking_ts.pc
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Experimental implementation of the C++ Networking Technical Specification";
+    homepage = "https://github.com/chriskohlhoff/networking-ts-impl";
+    license = licenses.boost;
+    maintainers = with maintainers; [ bhipple ];
+  };
+}
diff --git a/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in b/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in
new file mode 100644
index 00000000000..d52f68f4c15
--- /dev/null
+++ b/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in
@@ -0,0 +1,8 @@
+prefix=@out@
+includedir=${prefix}/include
+
+Name: networking_ts
+Description: Experimental implementation of the C++ Networking Technical Specification
+URL: https://github.com/chriskohlhoff/networking-ts-impl
+Version: ${networking_ts_version}
+Cflags: -isystem${includedir}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aedbddf1269..3c21222262a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6283,6 +6283,8 @@ in
 
   netcdffortran = callPackage ../development/libraries/netcdf-fortran { };
 
+  networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { };
+
   nco = callPackage ../development/libraries/nco { };
 
   ncftp = callPackage ../tools/networking/ncftp { };

From 9120da4c4a836dc5a9fb696488ac03646f6b37d1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 14 Jan 2021 19:06:22 -0500
Subject: [PATCH 053/956] binutils: enable gold when cross compiling on darwin

This basically reverts:
 - 3c5188cc ('binutils: disable gold when building on darwin')
 - 457b48cc ('binutils: apply patch when cross compiling from darwin')

Tested by building:
 - nix build -f . pkgsCross.i686-embedded.buildPackages.binutils
 - nix build -f . pkgsCross.aarch64-embedded.buildPackages.binutils
---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 55926852146..68a8bfa68cb 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -4,7 +4,7 @@
 , withAllTargets ? false, libbfd, libopcodes
 , enableShared ? !stdenv.hostPlatform.isStatic
 , noSysDirs
-, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform
+, gold ? true
 , bison ? null
 , flex
 , texinfo

From 6347fdf07101e636c4d79bb26f23b064b9d778d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= <esm@eduardosm.net>
Date: Thu, 7 Jan 2021 16:56:39 +0100
Subject: [PATCH 054/956] pyqt5: use sip_5 for Python 3

---
 pkgs/development/python-modules/pyqt/5.x.nix | 73 +++++++++++---------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 0c32985cfaa..8dab57949e2 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -15,18 +15,35 @@ let
 
   inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
 
-  sip = (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
-    # If we install sip in another folder, then we need to create a __init__.py as well
-    # if we want to be able to import it with Python 2.
-    # Python 3 could rely on it being an implicit namespace package, however,
-    # PyQt5 we made an explicit namespace package so sip should be as well.
-    postInstall = ''
-      cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
-      from pkgutil import extend_path
-      __path__ = extend_path(__path__, __name__)
-      EOF
-    '';
-  });
+  sip = if isPy3k then
+    pythonPackages.sip_5
+  else
+    (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
+      # If we install sip in another folder, then we need to create a __init__.py as well
+      # if we want to be able to import it with Python 2.
+      # Python 3 could rely on it being an implicit namespace package, however,
+      # PyQt5 we made an explicit namespace package so sip should be as well.
+      postInstall = ''
+        cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
+        from pkgutil import extend_path
+        __path__ = extend_path(__path__, __name__)
+        EOF
+      '';
+    });
+
+  pyqt5_sip = buildPythonPackage rec {
+    pname = "PyQt5_sip";
+    version = "12.8.1";
+
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd";
+    };
+
+    # There is no test code and the check phase fails with:
+    # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory
+    doCheck = false;
+  };
 
 in buildPythonPackage rec {
   pname = "PyQt5";
@@ -69,8 +86,7 @@ in buildPythonPackage rec {
 
   propagatedBuildInputs = [
     dbus-python
-    sip
-  ] ++ lib.optional (!isPy3k) enum34;
+  ] ++ (if isPy3k then [ pyqt5_sip ] else [ sip enum34 ]);
 
   patches = [
     # Fix some wrong assumptions by ./configure.py
@@ -103,7 +119,7 @@ in buildPythonPackage rec {
     runHook postConfigure
   '';
 
-  postInstall = ''
+  postInstall = lib.optionalString (!isPy3k) ''
     ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
@@ -116,26 +132,21 @@ in buildPythonPackage rec {
     EOF
   '';
 
-  installCheckPhase = let
-    modules = [
-      "PyQt5"
-      "PyQt5.QtCore"
-      "PyQt5.QtQml"
-      "PyQt5.QtWidgets"
-      "PyQt5.QtGui"
-    ]
+  # Checked using pythonImportsCheck
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "PyQt5"
+    "PyQt5.QtCore"
+    "PyQt5.QtQml"
+    "PyQt5.QtWidgets"
+    "PyQt5.QtGui"
+  ]
     ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
     ++ lib.optional withWebKit "PyQt5.QtWebKit"
     ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
     ++ lib.optional withConnectivity "PyQt5.QtConnectivity"
-    ;
-    imports = lib.concatMapStrings (module: "import ${module};") modules;
-  in ''
-    echo "Checking whether modules can be imported..."
-    ${python.interpreter} -c "${imports}"
-  '';
-
-  doCheck = true;
+  ;
 
   enableParallelBuilding = true;
 

From 13f5c8013f62c1f4dc24221ca4b0dad7c105641a Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:13:51 +0800
Subject: [PATCH 055/956] Add an update script for fcitx packages

---
 pkgs/tools/inputmethods/fcitx5/default.nix |  2 ++
 pkgs/tools/inputmethods/fcitx5/update.py   | 29 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100755 pkgs/tools/inputmethods/fcitx5/update.py

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index b3dd2260d1c..cce48914e69 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -90,6 +90,8 @@ stdenv.mkDerivation rec {
     libxkbfile
   ];
 
+  passthru.updateScript = ./update.py;
+
   meta = with lib; {
     description = "Next generation of fcitx";
     homepage = "https://github.com/fcitx/fcitx5";
diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py
new file mode 100755
index 00000000000..e3513c747fc
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/update.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests
+
+from nix_prefetch_github import *
+import json
+import requests
+import subprocess
+
+REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-configtool", "fcitx5-lua",
+          "fcitx5-rime", "fcitx5-chinese-addons", "fcitx5-table-extra", "fcitx5-table-other" ]
+
+OWNER = "fcitx"
+
+def get_latest_tag(repo, owner=OWNER):
+    r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo)
+                    , auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265'))
+    return r.json()[0].get("name")
+
+def main():
+    sources = dict()
+    for repo in REPOS:
+        rev = get_latest_tag(repo)
+        if repo == "fcitx5-qt":
+            subprocess.run(["nix-update", "--commit", "--version", rev, "libsForQt5.{}".format(repo)])
+        else:
+            subprocess.run(["nix-update", "--commit", "--version", rev, repo])
+
+if __name__ == "__main__":
+    main ()

From 63e22d6af0671d69e1887cfb6eea0ac17207b25a Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:15:39 +0800
Subject: [PATCH 056/956] libime: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix
index 476d2419ef3..6400d8aa3a3 100644
--- a/pkgs/development/libraries/libime/default.nix
+++ b/pkgs/development/libraries/libime/default.nix
@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libime";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "libime";
     rev = version;
-    sha256 = "hDfxuDIj9qx5d+UFwxDdP2PCboPnUV1n+VVoEIGsucM=";
+    sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg=";
     fetchSubmodules = true;
   };
 

From a111fe00b9bf881a2883bd3c34e4425acd96616c Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:15:46 +0800
Subject: [PATCH 057/956] xcb-imdkit: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix
index 72ce94d98f1..87d562bee36 100644
--- a/pkgs/development/libraries/xcb-imdkit/default.nix
+++ b/pkgs/development/libraries/xcb-imdkit/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xcb-imdkit";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "xcb-imdkit";
     rev = version;
-    sha256 = "dvax+Wj8+tHdiL6txcuugrOlRnxdIW25DYO4iNAYK8M=";
+    sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8=";
   };
 
   nativeBuildInputs = [

From c0e0b5217402a04a8e5553f8e67fca477a02ebb3 Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:15:53 +0800
Subject: [PATCH 058/956] fcitx5: 5.0.3 -> 5.0.4

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

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index cce48914e69..e578fbf1443 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -41,13 +41,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5";
-  version = "5.0.3";
+  version = "5.0.4";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5";
     rev = version;
-    sha256 = "QYMH0WbhHqDKUvpj1VOB8U5sbBD89H6moLFkQBJijZA=";
+    sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg=";
   };
 
   prePatch = ''

From 15f2be29d6bd56333dd69c08855044eee5fe03ed Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:15:59 +0800
Subject: [PATCH 059/956] fcitx5-gtk: 5.0.1 -> 5.0.3

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
index f153c238c53..3f42894ef9f 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -24,18 +24,20 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-gtk";
-  version = "5.0.1";
+  version = "5.0.3";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-gtk";
     rev = version;
-    sha256 = "rkusIqMRQMTjcpJR335as1xUQrzD9dLVB/wrLstPXPY=";
+    sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4=";
   };
 
   cmakeFlags = [
     "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0"
     "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
+    # disabled since we currently don't have gtk4 in nixpkgs
+    "-DENABLE_GTK4_IM_MODULE=off"
   ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
 
   buildInputs = [

From 937ea70a98f92f4d2ac2789b7254b0c38c923c56 Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:16:04 +0800
Subject: [PATCH 060/956] libsForQt5.fcitx5-qt: 5.0.1 -> 5.0.2

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index e0499304889..462543d167c 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -11,13 +11,13 @@
 
 mkDerivation rec {
   pname = "fcitx5-qt";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-qt";
     rev = version;
-    sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM=";
+    sha256 = "sha256-QylvjhjiIujYGKFtL4bKVXpobkN5t6Q2MGf16dsL24A=";
   };
 
   cmakeFlags = [

From eb6007055d46a616b49ed863b4fb67f05164fe56 Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:16:10 +0800
Subject: [PATCH 061/956] fcitx5-configtool: 5.0.1 -> 5.0.2

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index 92563e89013..ba006873c40 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -6,6 +6,7 @@
 , fcitx5
 , fcitx5-qt
 , qtx11extras
+, qtquickcontrols2
 , kwidgetsaddons
 , kdeclarative
 , kirigami2
@@ -18,13 +19,13 @@
 
 mkDerivation rec {
   pname = "fcitx5-configtool";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-configtool";
     rev = version;
-    sha256 = "npSqd0R6bqKc+JxYCGcfVzgNLpuLtnHq6zM58smZ8/I=";
+    sha256 = "sha256-kw0KIbS5SVMf6kR/9xsYiChHXQBM0enSVXyh0QfiiPY=";
   };
 
   cmakeFlags = [
@@ -40,6 +41,7 @@ mkDerivation rec {
     fcitx5
     fcitx5-qt
     qtx11extras
+    qtquickcontrols2
     kirigami2
     isocodes
     xkeyboardconfig

From c2de5a5f61c2dca9b43db16eac74e87e78d54318 Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:16:15 +0800
Subject: [PATCH 062/956] fcitx5-lua: 5.0.1 -> 5.0.2

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
index 3a11e6f319d..5bf1cc76632 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-lua";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-lua";
     rev = "${version}";
-    sha256 = "OiTk9ldqBqF7WT1KY71hacLD6OQQNO05F7+cSXlli40=";
+    sha256 = "sha256-lFlHn2q/kpq1EIKKhYVdJofXqtOHnpLz7PoWuNAhmhE=";
   };
 
   nativeBuildInputs = [

From 1d89ec0c2c6b8e6197379253a844ca976ca1cc3c Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:16:20 +0800
Subject: [PATCH 063/956] fcitx5-rime: 5.0.2 -> 5.0.3

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
index ebbee817998..7b4a0f6a013 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-rime";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-rime";
     rev = version;
-    sha256 = "cVCTsD1Iw6OtyYFpxff3ix2CubRTnDaBevAYA4I9Ai8=";
+    sha256 = "sha256-mPNZ/B5bpxua+E1T+oz9v2QKAzGraA2cfT8oJacC35U=";
   };
 
   cmakeFlags = [

From f0766ab3aeed5775c1649c636428c19128a734c1 Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:16:26 +0800
Subject: [PATCH 064/956] fcitx5-chinese-addons: 5.0.2 -> 5.0.3

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index b5955be3cb0..923fd7c7a74 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -31,13 +31,13 @@ in
 
 mkDerivation rec {
   pname = "fcitx5-chinese-addons";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-chinese-addons";
     rev = version;
-    sha256 = "11UIMrwzZqO8nrQx5oubeoQN8hspL1mvHw5Dc9sVOqQ=";
+    sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c=";
   };
 
   cmakeFlags = [

From b46049c09a138a28dbd821b1419abd912c6ad050 Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:16:36 +0800
Subject: [PATCH 065/956] fcitx5-table-extra: 5.0.1 -> 5.0.2

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
index 3415ed40345..355ac97d8a1 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-table-extra";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-table-extra";
     rev = version;
-    sha256 = "UHhiWm2Khh6JBB9jz0ZKFofkAJPlqn6SqHeK9etoaxs=";
+    sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M=";
   };
 
   nativeBuildInputs = [

From e5d652a32d4a85988270b14757fc13bdad00668b Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Sat, 16 Jan 2021 11:16:41 +0800
Subject: [PATCH 066/956] fcitx5-table-other: 5.0.1 -> 5.0.2

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
index f5957135718..4feae0d4acc 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-table-other";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-table-other";
     rev = version;
-    sha256 = "hQlrjDPImDof2+3/uOtTdJ27cInevbxH9B+lNwquKbs=";
+    sha256 = "sha256-P+KaUmjAHe1CZ5rNMQAxwKSW5ZMVgQcwkgdlungXTLM=";
   };
 
   nativeBuildInputs = [

From 94235b625649a4707b1a6117d220e06aa3390723 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 14 Jan 2021 13:36:43 +0000
Subject: [PATCH 067/956] python3Packages.diskcache: 4.1.0 -> 5.1.0

---
 .../python-modules/diskcache/default.nix       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix
index 793b0edd697..8b968c3272f 100644
--- a/pkgs/development/python-modules/diskcache/default.nix
+++ b/pkgs/development/python-modules/diskcache/default.nix
@@ -1,7 +1,8 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchFromGitHub
-, pytest
+, pytestCheckHook
 , pytestcov
 , pytest_xdist
 , pytest-django
@@ -11,28 +12,25 @@
 
 buildPythonPackage rec {
   pname = "diskcache";
-  version = "4.1.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "python-diskcache";
     rev = "v${version}";
-    sha256 = "0xy2vpk4hixb4gg871d9sx9wxdz8pi0pmnfdwg4bf8jqfjg022w8";
+    sha256 = "0xwqw60dbn1x2294galcs08vm6ydcr677lr8slqz8a3ry6sgkhn9";
   };
 
   checkInputs = [
-    pytest
+    pytestCheckHook
     pytestcov
     pytest_xdist
     pytest-django
     mock
   ];
 
-  disabled = lib.versionAtLeast django.version "2.0";
-
-  checkPhase = ''
-    pytest
-  '';
+  # Darwin sandbox causes most tests to fail.
+  doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
     description = "Disk and file backed persistent cache";

From 483ce5ce9c1cea6e04353b6f5072312fc82f2c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 16 Jan 2021 11:01:21 +0100
Subject: [PATCH 068/956] python3Packages.transformers: 4.1.1 -> 4.2.1

Changelog:
https://github.com/huggingface/transformers/releases/tag/v4.2.0
https://github.com/huggingface/transformers/releases/tag/v4.2.1

Changes to the derivation:

- Enable on Python 3.9.
- Disable checks and use pythonImportsCheck instead. The list of
  excluded tests was getting silly. The vast majority of tests
  require internet access (to download models). I guess at this
  point we just have to accept that it is not practical to run
  the tests.
---
 .../python-modules/transformers/default.nix   | 66 +++----------------
 1 file changed, 8 insertions(+), 58 deletions(-)

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 743cbebea75..e2409c155c9 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -1,32 +1,28 @@
 { buildPythonPackage
 , lib, stdenv
 , fetchFromGitHub
-, isPy39
+, pythonOlder
 , cookiecutter
 , filelock
+, importlib-metadata
 , regex
 , requests
 , numpy
-, pandas
-, parameterized
 , protobuf
 , sacremoses
-, timeout-decorator
 , tokenizers
 , tqdm
-, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.1.1";
-  disabled = isPy39;
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1l1gxdsakjmzsgggypq45pnwm87brhlccjfzafs43460pz0wbd6k";
+    sha256 = "0yf5s878i6v298wxm4cwkb33qyxz5bdr75jmsnldpdw4ml31c3nn";
   };
 
   propagatedBuildInputs = [
@@ -39,63 +35,17 @@ buildPythonPackage rec {
     sacremoses
     tokenizers
     tqdm
-  ];
+  ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
-  checkInputs = [
-    pandas
-    parameterized
-    pytestCheckHook
-    timeout-decorator
-  ];
+  # Many tests require internet access.
+  doCheck = false;
 
   postPatch = ''
     substituteInPlace setup.py \
       --replace "tokenizers == 0.9.4" "tokenizers"
   '';
 
-  preCheck = ''
-    export HOME="$TMPDIR"
-
-    # This test requires the `datasets` module to download test
-    # data. However, since we cannot download in the Nix sandbox
-    # and `dataset` is an optional dependency for transformers
-    # itself, we will just remove the tests files that import
-    # `dataset`.
-    rm tests/test_retrieval_rag.py
-    rm tests/test_trainer.py
-  '';
-
-  # We have to run from the main directory for the tests. However,
-  # letting pytest discover tests leads to errors.
-  pytestFlagsArray = [ "tests" ];
-
-  # Disable tests that require network access.
-  disabledTests = [
-    "BlenderbotSmallTokenizerTest"
-    "Blenderbot3BTokenizerTests"
-    "GetFromCacheTests"
-    "TokenizationTest"
-    "TestTokenizationBart"
-    "test_all_tokenizers"
-    "test_batch_encoding_is_fast"
-    "test_batch_encoding_pickle"
-    "test_batch_encoding_word_to_tokens"
-    "test_config_from_model_shortcut"
-    "test_config_model_type_from_model_identifier"
-    "test_from_pretrained_use_fast_toggle"
-    "test_hf_api"
-    "test_outputs_can_be_shorter"
-    "test_outputs_not_longer_than_maxlen"
-    "test_padding_accepts_tensors"
-    "test_pretokenized_tokenizers"
-    "test_tokenizer_equivalence_en_de"
-    "test_tokenizer_from_model_type"
-    "test_tokenizer_from_model_type"
-    "test_tokenizer_from_pretrained"
-    "test_tokenizer_from_tokenizer_class"
-    "test_tokenizer_identifier_with_correct_config"
-    "test_tokenizer_identifier_non_existent"
-  ];
+  pythonImportsCheck = [ "transformers" ];
 
   meta = with lib; {
     homepage = "https://github.com/huggingface/transformers";

From 327e535e95f2235575fe7421b84b2b9a9924aa79 Mon Sep 17 00:00:00 2001
From: Sergey Makarov <setser200018@gmail.com>
Date: Sun, 17 Jan 2021 01:23:13 +0300
Subject: [PATCH 069/956] telega: Fix build

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 93e215753c7..68869113b92 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -341,6 +341,7 @@ let
         # Telega has a server portion for it's network protocol
         telega = super.telega.overrideAttrs (old: {
           buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
+          nativeBuildInputs = [ external.pkgconfig ];
 
           postBuild = ''
             cd source/server

From e44b3c518793fcd742ed432dcfe1a700c4825716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Tue, 1 Sep 2020 19:35:34 +0200
Subject: [PATCH 070/956] evolution-with-plugins: added support for
 evolution-ews.

---
 .../desktops/gnome3/evolution-data-server.nix | 13 +++---
 .../evolution/evolution-ews/default.nix       |  4 +-
 .../evolution}/evolution/default.nix          | 10 +++--
 .../evolution/moduledir_from_env.patch        | 21 ++++++++++
 .../evolution/evolution/wrapper.nix           | 41 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 -
 pkgs/top-level/all-packages.nix               |  2 +
 7 files changed, 78 insertions(+), 15 deletions(-)
 rename pkgs/{desktops/gnome-3/apps => applications/networking/mailreaders/evolution}/evolution/default.nix (95%)
 create mode 100644 pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch
 create mode 100644 pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix

diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index bd62d16f61c..b8ad7a343c9 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -32,14 +32,13 @@ with lib;
 
   ###### implementation
 
-  config = mkIf config.services.gnome3.evolution-data-server.enable {
+  config =
+  let evolution-with-plugins = (import ../../../../.. {}).evolution-with-plugins; in
+  mkIf config.services.gnome3.evolution-data-server.enable {
+    environment.systemPackages = [ evolution-with-plugins ];
 
-    environment.systemPackages = [ pkgs.gnome3.evolution-data-server ];
-
-    services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];
-
-    systemd.packages = [ pkgs.gnome3.evolution-data-server ];
+    services.dbus.packages = [ evolution-with-plugins ];
 
+    systemd.packages = [ evolution-with-plugins ];
   };
-
 }
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
index fbd6d1d924c..8deb7e84a2c 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server
+{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution
 , sqlite, gtk3, webkitgtk, libgdata, libmspack }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake gettext intltool pkg-config ];
 
   buildInputs = [
-    evolution-data-server gnome3.evolution
+    evolution-data-server evolution
     sqlite libgdata
     gtk3 webkitgtk
     libmspack
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
similarity index 95%
rename from pkgs/desktops/gnome-3/apps/evolution/default.nix
rename to pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 4bede93ebb7..c9fdbf3a913 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -12,8 +12,6 @@
 , libnotify
 , gspell
 , evolution-data-server
-, adwaita-icon-theme
-, gnome-desktop
 , libgdata
 , libgweather
 , glib-networking
@@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    adwaita-icon-theme
+    gnome3.adwaita-icon-theme
     bogofilter
     db
     evolution-data-server
@@ -69,7 +67,7 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     glib
     glib-networking
-    gnome-desktop
+    gnome3.gnome-desktop
     gsettings-desktop-schemas
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
@@ -115,6 +113,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  patches = [
+    ./moduledir_from_env.patch
+  ];
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "evolution";
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch b/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch
new file mode 100644
index 00000000000..2a5edfb9a5a
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch
@@ -0,0 +1,21 @@
+diff --git a/src/shell/main.c b/src/shell/main.c
+index 5d089225ca..030908d684 100644
+--- a/src/shell/main.c
++++ b/src/shell/main.c
+@@ -407,7 +407,15 @@ create_default_shell (void)
+ 	}
+
+ 	/* Load all shared library modules. */
+-	module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR);
++	const gchar *modules_directory = EVOLUTION_MODULEDIR;
++	const gchar *modules_directory_env;
++
++	modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR");
++	if (modules_directory_env &&
++	    g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR))
++		modules_directory = g_strdup (modules_directory_env);
++
++	module_types = e_module_load_all_in_directory (modules_directory);
+ 	g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse);
+
+ 	flags = G_APPLICATION_HANDLES_OPEN |
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
new file mode 100644
index 00000000000..4f5278fce97
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
@@ -0,0 +1,41 @@
+{ lib, makeWrapper, symlinkJoin, evolution, evolution-ews, gnome3 }:
+
+symlinkJoin {
+  name = "evolution-with-plugins";
+  paths = [ evolution evolution-ews gnome3.evolution-data-server];
+
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    for i in $out/bin/* $out/libexec/**; do
+    if [ ! -d $i ]; then
+      echo wrapping $i
+      wrapProgram $i \
+        --set LD_LIBRARY_PATH "$out/lib" \
+        --set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \
+        --set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \
+        --set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \
+        --set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \
+        --set EVOLUTION_MODULEDIR "$out/lib/evolution/modules"
+    fi
+    done
+
+    fixSymlink () {
+     local link=$1
+     local target=$(readlink $link);
+     local newtarget=$(sed "s@/nix/store/[^/]*/@$out/@" <<< "$target")
+     if [[ $target != $newtarget ]] && [[ -d $newtarget ]]; then
+       echo fixing link to point to $newtarget instead of $target
+       rm $link
+       ln -s $newtarget $link
+     fi
+    }
+
+    fixSymlink $out/share/dbus-1/service
+    fixSymlink $out/lib/systemd/user
+    for i in $out/share/dbus-1/services/*.service $out/lib/systemd/user/*.service; do
+      echo fixing service file $i
+      sed -i "s@/nix/store/[^/]*/@$out/@" $i
+    done
+  '';
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 2bc825d8149..c4e203913be 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -158,8 +158,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   cheese = callPackage ./apps/cheese { };
 
-  evolution = callPackage ./apps/evolution { };
-
   file-roller = callPackage ./apps/file-roller { };
 
   gedit = callPackage ./apps/gedit { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 313cfa208d7..f130c92f3b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21822,6 +21822,8 @@ in
   inherit (gnome3) evince;
   evolution-data-server = gnome3.evolution-data-server;
   evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
+  evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
+  evolution-with-plugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { };
 
   keepass = callPackage ../applications/misc/keepass { };
 

From d671677eab09fcd18c3cdac72849b8eb86efe2f4 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 25 Oct 2020 16:09:56 +0100
Subject: [PATCH 071/956] nixos: rework evolution-data-server module

---
 .../desktops/gnome3/evolution-data-server.nix | 46 ++++++++++++-------
 .../evolution/evolution/wrapper.nix           |  6 +--
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index b8ad7a343c9..12f13f72979 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -15,30 +15,44 @@ with lib;
   options = {
 
     services.gnome3.evolution-data-server = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable Evolution Data Server, a collection of services for
-          storing addressbooks and calendars.
-        '';
+      enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars.";
+      plugins = mkOption {
+        type = types.listOf types.package;
+        default = [ ];
+        description = "Plugins for Evolution Data Server.";
+      };
+    };
+    programs.evolution = {
+      enable = mkEnableOption "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality.";
+      plugins = mkOption {
+        type = types.listOf types.package;
+        default = [ ];
+        example = literalExample "[ pkgs.evolution-ews ]";
+        description = "Plugins for Evolution.";
       };
 
     };
-
   };
 
-
   ###### implementation
 
   config =
-  let evolution-with-plugins = (import ../../../../.. {}).evolution-with-plugins; in
-  mkIf config.services.gnome3.evolution-data-server.enable {
-    environment.systemPackages = [ evolution-with-plugins ];
+    let
+      bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome3.evolution-data-server) plugins; };
+    in
+    mkMerge [
+      (mkIf config.services.gnome3.evolution-data-server.enable {
+        environment.systemPackages = [ bundle ];
 
-    services.dbus.packages = [ evolution-with-plugins ];
+        services.dbus.packages = [ bundle ];
 
-    systemd.packages = [ evolution-with-plugins ];
-  };
+        systemd.packages = [ bundle ];
+      })
+      (mkIf config.programs.evolution.enable {
+        services.gnome3.evolution-data-server = {
+          enable = true;
+          plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins;
+        };
+      })
+    ];
 }
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
index 4f5278fce97..050082c6f93 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
@@ -1,8 +1,8 @@
-{ lib, makeWrapper, symlinkJoin, evolution, evolution-ews, gnome3 }:
+{ lib, makeWrapper, symlinkJoin, gnome3, plugins }:
 
 symlinkJoin {
   name = "evolution-with-plugins";
-  paths = [ evolution evolution-ews gnome3.evolution-data-server];
+  paths = [ gnome3.evolution-data-server ] ++ plugins;
 
   buildInputs = [ makeWrapper ];
 
@@ -34,7 +34,7 @@ symlinkJoin {
     fixSymlink $out/share/dbus-1/service
     fixSymlink $out/lib/systemd/user
     for i in $out/share/dbus-1/services/*.service $out/lib/systemd/user/*.service; do
-      echo fixing service file $i
+      echo fixing service file $i to point to $out
       sed -i "s@/nix/store/[^/]*/@$out/@" $i
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f130c92f3b9..b6a9a0cf192 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21823,7 +21823,7 @@ in
   evolution-data-server = gnome3.evolution-data-server;
   evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
   evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
-  evolution-with-plugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { };
+  evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; };
 
   keepass = callPackage ../applications/misc/keepass { };
 

From b241f7fc58d2ec2b61dfa3819acc04a9bd23c867 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 8 Nov 2020 14:36:54 +0100
Subject: [PATCH 072/956] almanah: fix evaluation

---
 pkgs/applications/misc/almanah/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix
index 3a5c3756320..b8029b6229d 100644
--- a/pkgs/applications/misc/almanah/default.nix
+++ b/pkgs/applications/misc/almanah/default.nix
@@ -4,6 +4,7 @@
 , cairo
 , desktop-file-utils
 , evolution-data-server
+, evolution
 , gcr
 , gettext
 , glib
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
     evolution-data-server
     gcr
     glib
-    gnome3.evolution
+    evolution
     gpgme
     gtk3
     gtksourceview3

From 66dc9dbb59f03975a9d2f4940f2f2bf9867e09d6 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 17 Jan 2021 21:14:59 +0100
Subject: [PATCH 073/956] nixos/modules: stdenv.lib -> lib

---
 maintainers/scripts/nixpkgs-lint.nix               |  8 ++++----
 nixos/modules/config/gnu.nix                       | 10 ++++------
 .../installer/tools/nixos-option/default.nix       |  6 +++---
 .../sane_extra_backends/brscan4_etc_files.nix      | 14 ++++++--------
 .../virtualisation/google-compute-image.nix        |  2 +-
 nixos/tests/searx.nix                              |  2 +-
 6 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix
index 6d99c94bf33..b0267281b38 100644
--- a/maintainers/scripts/nixpkgs-lint.nix
+++ b/maintainers/scripts/nixpkgs-lint.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, perl, perlPackages }:
+{ stdenv, lib, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation {
   name = "nixpkgs-lint-1";
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
       wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
     '';
 
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+  meta = with lib; {
+    maintainers = [ maintainers.eelco ];
     description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index 93d13097019..255d9741ba7 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -1,11 +1,9 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 {
   options = {
-    gnu = mkOption {
-      type = types.bool;
+    gnu = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         When enabled, GNU software is chosen by default whenever a there is
@@ -15,7 +13,7 @@ with lib;
     };
   };
 
-  config = mkIf config.gnu {
+  config = lib.mkIf config.gnu {
 
     environment.systemPackages = with pkgs;
       # TODO: Adjust `requiredPackages' from `system-path.nix'.
@@ -26,7 +24,7 @@ with lib;
         nano zile
         texinfo # for the stand-alone Info reader
       ]
-      ++ stdenv.lib.optional (!stdenv.isAarch32) grub2;
+      ++ lib.optional (!stdenv.isAarch32) grub2;
 
 
     # GNU GRUB, where available.
diff --git a/nixos/modules/installer/tools/nixos-option/default.nix b/nixos/modules/installer/tools/nixos-option/default.nix
index 753fd92c7bb..f18f6911c97 100644
--- a/nixos/modules/installer/tools/nixos-option/default.nix
+++ b/nixos/modules/installer/tools/nixos-option/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   src = ./.;
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ boost nix ];
-  meta = {
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ chkno ];
+  meta = with lib; {
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ chkno ];
   };
 }
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
index ec0457bbd58..556f6bbb419 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
@@ -19,18 +19,16 @@ nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files.override{netDevices=[
 
 */
 
-with lib;
-
 let
 
   addNetDev = nd: ''
     brsaneconfig4 -a \
     name="${nd.name}" \
     model="${nd.model}" \
-    ${if (hasAttr "nodename" nd && nd.nodename != null) then
+    ${if (lib.hasAttr "nodename" nd && nd.nodename != null) then
       ''nodename="${nd.nodename}"'' else
       ''ip="${nd.ip}"''}'';
-  addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs);
+  addAllNetDev = xs: lib.concatStringsSep "\n" (map addNetDev xs);
 in
 
 stdenv.mkDerivation {
@@ -61,11 +59,11 @@ stdenv.mkDerivation {
   dontStrip = true;
   dontPatchELF = true;
 
-  meta = {
+  meta = with lib; {
     description = "Brother brscan4 sane backend driver etc files";
     homepage = "http://www.brother.com";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
+    platforms = platforms.linux;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ jraygauthier ];
   };
 }
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index d172ae38fdc..e2332df611a 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -43,7 +43,7 @@ in
     system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
       name = "google-compute-image";
       postVM = ''
-        PATH=$PATH:${with pkgs; stdenv.lib.makeBinPath [ gnutar gzip ]}
+        PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]}
         pushd $out
         mv $diskImage disk.raw
         tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw
diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix
index 357ade10535..22c1967b816 100644
--- a/nixos/tests/searx.nix
+++ b/nixos/tests/searx.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
 
 {
   name = "searx";
-  meta = with pkgs.stdenv.lib.maintainers; {
+  meta = with pkgs.lib.maintainers; {
     maintainers = [ rnhmjoj ];
   };
 

From 7358662028a82db4715868fdd3610383f84ea6e7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 17 Jan 2021 23:32:36 +0100
Subject: [PATCH 074/956] python3Packages.censys: init at 1.1.0

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

diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
new file mode 100644
index 00000000000..561d9651fed
--- /dev/null
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, backoff
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, requests
+, pytestcov
+, requests-mock
+, parameterized
+}:
+
+buildPythonPackage rec {
+  pname = "censys";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "censys";
+    repo = "censys-python";
+    rev = "v${version}";
+    sha256 = "0vvd13g48i4alnqil98zc09zi5kv6l2s3kdfyg5syjxvq4lfd476";
+  };
+
+  propagatedBuildInputs = [
+    backoff
+    requests
+  ];
+
+  checkInputs = [
+    pytestcov
+    pytestCheckHook
+    requests-mock
+    parameterized
+  ];
+
+  # The tests want to write a configuration file
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    mkdir -p $HOME
+    '';
+  # All other tests require an API key
+  pytestFlagsArray = [ "tests/test_config.py" ];
+  pythonImportsCheck = [ "censys" ];
+
+  meta = with lib; {
+    description = "Python API wrapper for the Censys Search Engine (censys.io)";
+    homepage = "https://github.com/censys/censys-python";
+    license = with licenses; [ asl20 ];
+    maintainers = [ maintainers.fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 195fee99a90..21abf91b483 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1171,6 +1171,8 @@ in {
 
   cement = callPackage ../development/python-modules/cement { };
 
+  censys = callPackage ../development/python-modules/censys { };
+
   connect-box = callPackage ../development/python-modules/connect_box { };
 
   cerberus = callPackage ../development/python-modules/cerberus { };

From 36e3173b19e2b2aa02d49c814f5f0cd33a4e5d78 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 17 Jan 2021 22:48:06 +0000
Subject: [PATCH 075/956] plexRaw: 1.21.1.3842-b0c7a97d9 ->
 1.21.1.3876-3c3adfcb4

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 77ce52db91f..b040c86c9fa 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.21.1.3842-b0c7a97d9";
+  version = "1.21.1.3876-3c3adfcb4";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "0wq8q9dvdwciazidvh9plxjzngjr6ibg077yksxhy41dv14vkw7s";
+    sha256 = "1xpsmk5l0f0blqp5ba9n1w0npsk692p07hp4ipkq7yz3mfag50p0";
   } else fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "14pa50kvgi4m5hbw4a0q7y3s4xn9ghvnm4vdim9g18p1khfmwmwp";
+    sha256 = "0dyw84x9h295428l7r8iqfb2vxkv0f1d68z1j2ka3wsw7cj1yq78";
   };
 
   outputs = [ "out" "basedb" ];

From 2c574332bb2e84c3258e535010baead7d215f372 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@mailfence.com>
Date: Fri, 15 Jan 2021 12:08:42 -0800
Subject: [PATCH 076/956] maintainers: add leungbk

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 30dc99c21a5..035678623ac 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5134,6 +5134,12 @@
     githubId = 480920;
     name = "Luca Bruno";
   };
+  leungbk = {
+    email = "leungbk@mailfence.com";
+    github = "leungbk";
+    githubId = 29217594;
+    name = "Brian Leung";
+  };
   lewo = {
     email = "lewo@abesis.fr";
     github = "nlewo";

From dcfc3b1d229410833deaa65f0427aac357c551e5 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@mailfence.com>
Date: Sat, 16 Jan 2021 11:49:31 -0800
Subject: [PATCH 077/956] graph-cli: init at 0.1.7

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/tools/graphics/graph-cli/default.nix | 31 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/graphics/graph-cli/default.nix

diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/tools/graphics/graph-cli/default.nix
new file mode 100644
index 00000000000..4da4f50cef8
--- /dev/null
+++ b/pkgs/tools/graphics/graph-cli/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, python3Packages
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "graph-cli";
+  version = "0.1.7";
+
+  src = python3Packages.fetchPypi {
+    inherit version;
+    pname = "graph_cli";
+    sha256 = "sha256-/v9COgAjuunJ06HHl55J0moV1p4uO+N+w2QwE8tgebQ=";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    numpy
+    pandas
+    matplotlib
+  ];
+
+  # does not contain tests despite reference in Makefile
+  doCheck = false;
+  pythonImportsCheck = [ "graph_cli" ];
+
+  meta = with lib; {
+    description = "CLI to create graphs from CSV files";
+    homepage = "https://github.com/mcastorina/graph-cli/";
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [ leungbk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59e6df5b75d..7df9f3d3994 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17744,6 +17744,8 @@ in
 
   gobetween = callPackage ../servers/gobetween { };
 
+  graph-cli = callPackage ../tools/graphics/graph-cli { };
+
   h2o = callPackage ../servers/http/h2o { };
 
   haka = callPackage ../tools/security/haka { };

From 66b02724260d4ca34dccd1c685946f40f0d094af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jan 2021 00:55:13 +0000
Subject: [PATCH 078/956] python37Packages.MechanicalSoup: 0.12.0 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix
index 07330ebbca9..e4ce48158f6 100644
--- a/pkgs/development/python-modules/MechanicalSoup/default.nix
+++ b/pkgs/development/python-modules/MechanicalSoup/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "MechanicalSoup";
-  version = "0.12.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1g976rk79apz6rc338zq3ml2yps8hb88nyw3a698d0brm4khd9ir";
+    sha256 = "37d3b15c1957917d3ae171561e77f4dd4c08c35eb4500b8781f6e7e1bb6c4d07";
   };
 
   checkInputs = [ pytest pytestrunner requests-mock pytestcov ];

From c48a355030363bd0614c69a417213984f7b42411 Mon Sep 17 00:00:00 2001
From: "Bryan A. S" <bryanasdev000@gmail.com>
Date: Sat, 16 Jan 2021 03:23:50 -0300
Subject: [PATCH 079/956] jmeter: 5.1.1 > 5.4

Update Jmeter to the latest version, also add myself as a maintainer

I have been using the package for 5 months daily, at the moment I am aware of 3 bugs.

1. Jmeter fails to save test plan in /nix/store (by default it saves it where Jmeter was installed).

2. The test fails to run on the latest version complaining about some missing libraries, for example log4j.

3. Jmeter fails to generate the report from a JTL file, for some reason it is not copying the needed files sometimes it fails without any log or error.

The rest works perfectly, but I still plan to fix it at somepoint, as I only use it for development, I didn't find any other bugs, and in the case of the report generator it is possible to generate it during the test run (in my case, the test is run on a non-NIXOS machine) or in a container.

Also add why tests are disabled.

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
---
 pkgs/applications/networking/jmeter/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index a8f947aebf7..995070066e0 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jmeter";
-  version = "5.1.1";
+  version = "5.4";
   src = fetchurl {
     url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
-    sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4";
+    sha256 = "1hbyvh0hrvfvrsf7wpnwqsry5gaziac632s0bwb5zbq6y5b0z41a";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper jre ];
 
   installPhase = ''
     mkdir $out
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}"
   '';
 
-  doInstallCheck = true;
+  doInstallCheck = false; #NoClassDefFoundError: org/apache/logging/log4j/Level for tests
 
   checkInputs = [ coreutils ];
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       Applications but has since expanded to other test functions.
     '';
     license = licenses.asl20;
-    maintainers = [ ];
+    maintainers = [ maintainers.bryanasdev000 ];
     priority = 1;
     platforms = platforms.unix;
   };

From d27be236f11c05da21322cb0d00a97f56c6be450 Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@posteo.de>
Date: Sun, 3 Jan 2021 13:03:19 +0100
Subject: [PATCH 080/956] nitrokey-app: 1.3.2 -> 1.4.2

The optional argument group was removed because it is no longer used
in the udev-rules that come with the libnitrokey.
---
 pkgs/tools/security/nitrokey-app/default.nix    | 9 ++-------
 pkgs/tools/security/nitrokey-app/udev-rules.nix | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index c3aebc782d8..bc7731a0a7a 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -3,21 +3,16 @@
 
 stdenv.mkDerivation rec {
   pname = "nitrokey-app";
-  version = "1.3.2";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-app";
     rev = "v${version}";
-    sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2";
+    sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv";
     fetchSubmodules = true;
   };
 
-  postPatch = ''
-    substituteInPlace libnitrokey/CMakeLists.txt \
-      --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules'
-  '';
-
   buildInputs = [
     bash-completion
     hidapi
diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix
index a8143ae6925..11dcd63d776 100644
--- a/pkgs/tools/security/nitrokey-app/udev-rules.nix
+++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix
@@ -1,6 +1,5 @@
-{ lib, stdenv, nitrokey-app
-, group ? "nitrokey"
-}:
+{ lib, stdenv, nitrokey-app }:
+
 
 stdenv.mkDerivation {
   name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}";
@@ -9,10 +8,6 @@ stdenv.mkDerivation {
 
   dontBuild = true;
 
-  patchPhase = ''
-    substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}"
-  '';
-
   installPhase = ''
     mkdir -p $out/etc/udev/rules.d
     cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d

From 991aba30f81235c0d8221c069a9ff20bdbf6c904 Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@posteo.de>
Date: Sun, 3 Jan 2021 15:16:26 +0100
Subject: [PATCH 081/956] module nitrokey: drop option group

Since the update of the nitrokey-app to 1.4.2 the group option is no
longer supported.
---
 nixos/modules/hardware/nitrokey.nix | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix
index 02e4c3f46f8..baa07203118 100644
--- a/nixos/modules/hardware/nitrokey.nix
+++ b/nixos/modules/hardware/nitrokey.nix
@@ -19,23 +19,9 @@ in
         nitrokey-app package, depending on your device and needs.
       '';
     };
-
-    group = mkOption {
-      type = types.str;
-      default = "nitrokey";
-      example = "wheel";
-      description = ''
-        Grant access to Nitrokey devices to users in this group.
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
-    services.udev.packages = [
-      (pkgs.nitrokey-udev-rules.override (attrs:
-        { inherit (cfg) group; }
-      ))
-    ];
-    users.groups.${cfg.group} = {};
+    services.udev.packages = [ pkgs.nitrokey-udev-rules ];
   };
 }

From 0bd552d791e0be7fc7aa33e6228a4b76391cb71d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Jan 2021 07:49:46 +0100
Subject: [PATCH 082/956] theHarvester: 3.1 -> 3.2.2

---
 pkgs/tools/security/theharvester/default.nix | 33 ++++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix
index 4153ddafbf4..7a03649859e 100644
--- a/pkgs/tools/security/theharvester/default.nix
+++ b/pkgs/tools/security/theharvester/default.nix
@@ -1,8 +1,11 @@
-{ lib, fetchFromGitHub, python3 }:
+{ lib
+, fetchFromGitHub
+, python3
+}:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "theHarvester";
-  version = "3.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "laramies";
@@ -11,9 +14,27 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "0lxzxfa9wbzim50d2jmd27i57szd0grm1dfayhnym86jn01qpvn3";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [ 
-    aiodns beautifulsoup4 dns grequests netaddr
-    plotly pyyaml requests retrying shodan texttable
+  propagatedBuildInputs = with python3.pkgs; [
+    aiodns
+    aiohttp
+    aiomultiprocess
+    aiosqlite
+    beautifulsoup4
+    censys
+    certifi
+    dns
+    gevent
+    grequests
+    lxml
+    netaddr
+    plotly
+    pyppeteer
+    pyyaml
+    requests
+    retrying
+    shodan
+    texttable
+    uvloop
   ];
 
   checkInputs = [ python3.pkgs.pytest ];
@@ -31,6 +52,6 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://github.com/laramies/theHarvester";
     maintainers = with maintainers; [ c0bw3b treemo ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
   };
 }

From 955e258c059caeaa47da07e1278af2f268c3dbff Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 27 Dec 2020 14:27:54 +0100
Subject: [PATCH 083/956] burpsuite: change derivtion to ease src overriding

---
 pkgs/tools/networking/burpsuite/default.nix | 38 ++++++++++++---------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 8e185eeaa62..55bd5910054 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -1,28 +1,34 @@
-{ lib, stdenv, fetchurl, jdk11, runtimeShell }:
+{ lib, stdenv, fetchurl, jdk11, runtimeShell, unzip, chromium }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "burpsuite";
   version = "2020.12.1";
-  jar = fetchurl {
+
+  src = fetchurl {
     name = "burpsuite.jar";
     url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
-    sha256 = "1vdxwasvcyxyyidq3cfjphzkir358sxikgvxgl36czylap4hzjh1";
+    sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0=";
   };
-  launcher = ''
-    #!${runtimeShell}
-    exec ${jdk11}/bin/java -jar ${jar} "$@"
-  '';
-in stdenv.mkDerivation {
-  pname = "burpsuite";
-  inherit version;
-  buildCommand = ''
+
+  dontUnpack = true;
+  dontBuild = true;
+  installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
-    echo "${launcher}" > $out/bin/burpsuite
+    echo '#!${runtimeShell}
+    eval "$(${unzip}/bin/unzip -p ${src} chromium.properties)"
+    mkdir -p "$HOME/.BurpSuite/burpbrowser/$linux64"
+    ln -sf "${chromium}/bin/chromium" "$HOME/.BurpSuite/burpbrowser/$linux64/chrome"
+    exec ${jdk11}/bin/java -jar ${src} "$@"' > $out/bin/burpsuite
     chmod +x $out/bin/burpsuite
+
+    runHook postInstall
   '';
 
   preferLocalBuild = true;
 
-  meta = {
+  meta = with lib; {
     description = "An integrated platform for performing security testing of web applications";
     longDescription = ''
       Burp Suite is an integrated platform for performing security testing of web applications.
@@ -32,9 +38,9 @@ in stdenv.mkDerivation {
     '';
     homepage = "https://portswigger.net/burp/";
     downloadPage = "https://portswigger.net/burp/freedownload";
-    license = [ lib.licenses.unfree ];
+    license = licenses.unfree;
     platforms = jdk11.meta.platforms;
     hydraPlatforms = [];
-    maintainers = with lib.maintainers; [ bennofs ];
+    maintainers = with maintainers; [ bennofs ];
   };
 }

From 9df436f7a0da1e00d3c3986206632473f7180b85 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Jan 2021 09:50:26 +0100
Subject: [PATCH 084/956] enum4linux-ng: init at 1.0.0

---
 pkgs/tools/security/enum4linux-ng/default.nix | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/security/enum4linux-ng/default.nix

diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix
new file mode 100644
index 00000000000..33694ad79ae
--- /dev/null
+++ b/pkgs/tools/security/enum4linux-ng/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, impacket
+, ldap3
+, pyyaml
+, samba
+}:
+
+buildPythonApplication rec {
+  pname = "enum4linux-ng";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "cddmp";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0dhg8cwbdn0vlnchhscx31ay4mgj5p6rf73wzgs8nvqg0shsawmy";
+  };
+
+  propagatedBuildInputs = [
+    impacket
+    ldap3
+    pyyaml
+    samba
+  ];
+
+  # It's only a script and not a Python module. Project has no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Windows/Samba enumeration tool";
+    longDescription = ''
+      enum4linux-ng.py is a rewrite of Mark Lowe's enum4linux.pl, a tool for
+      enumerating information from Windows and Samba systems.
+    '';
+    homepage = "https://github.com/cddmp/enum4linux-ng";
+    license = with licenses; [ gpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5cf5f776cad..2a7e1d2e0af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -236,6 +236,8 @@ in
 
   enum4linux = callPackage ../tools/security/enum4linux {};
 
+  enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { };
+
   onesixtyone = callPackage ../tools/security/onesixtyone {};
 
   creddump = callPackage ../tools/security/creddump {};

From 4a0070fc9f4f008fed843818dfb3c2db10c54e0c Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Mon, 18 Jan 2021 10:45:22 +0100
Subject: [PATCH 085/956] zen-kernels: refactor suffix

Changing it required modifications in multiple places which is error-prone
---
 pkgs/os-specific/linux/kernel/linux-lqx.nix | 5 +++--
 pkgs/os-specific/linux/kernel/linux-zen.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index c8f5df788b7..057a957e620 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -2,17 +2,18 @@
 
 let
   version = "5.10.6";
+  suffix = "lqx1";
 in
 
 buildLinux (args // {
-  modDirVersion = "${version}-lqx1";
+  modDirVersion = "${version}-${suffix}";
   inherit version;
   isZen = true;
 
   src = fetchFromGitHub {
     owner = "zen-kernel";
     repo = "zen-kernel";
-    rev = "v${version}-lqx1";
+    rev = "v${version}-${suffix}";
     sha256 = "0vvb00311yhf08ib3yvkjwk2j45f8r268ywg5299yjgbyl6g95kg";
   };
 
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 118272d2876..6409e90ea32 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,17 +2,18 @@
 
 let
   version = "5.10.6";
+  suffix = "zen1";
 in
 
 buildLinux (args // {
-  modDirVersion = "${version}-zen1";
+  modDirVersion = "${version}-${suffix}";
   inherit version;
   isZen = true;
 
   src = fetchFromGitHub {
     owner = "zen-kernel";
     repo = "zen-kernel";
-    rev = "v${version}-zen1";
+    rev = "v${version}-${suffix}";
     sha256 = "0asn4ysnzv845g35ca9sdi89sc7clcc88xmx64pcxmh033civ5fw";
   };
 

From 993c9fad7b4bcfbea0a52f33b403736cebd7f3cd Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Wed, 16 Dec 2020 17:11:27 +0100
Subject: [PATCH 086/956] dstat: 0.7.3 -> 0.7.4

This change also switches dstat to python3. The patches introduced in this
commit are inspired by archlinux[0][1].

[0]:
https://github.com/archlinux/svntogit-community/blob/e688b126c561e842b459ea1cc88e725f1f2a29cc/trunk/PKGBUILD
[1]: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/dstat&id=e688b126c561e842b459ea1cc88e725f1f2a29cc
---
 pkgs/os-specific/linux/dstat/default.nix | 31 ++++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index 7d0b87609b3..76abeff42db 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -1,21 +1,36 @@
-{ lib, stdenv, fetchurl, python2Packages }:
+{ lib, fetchFromGitHub, fetchpatch, python3Packages }:
 
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "dstat";
   format = "other";
-  version = "0.7.3";
+  version = "0.7.4";
 
-  src = fetchurl {
-    url = "https://github.com/dagwieers/dstat/archive/${version}.tar.gz";
-    sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6";
+  src = fetchFromGitHub {
+    owner = "dstat-real";
+    repo = "dstat";
+    rev = "v${version}";
+    sha256 = "1qnmkhqmjd1m3if05jj29dvr5hn6kayq9bkkkh881w472c0zhp8v";
   };
 
-  propagatedBuildInputs = with python2Packages; [ python-wifi ];
+  propagatedBuildInputs = with python3Packages; [ six ];
 
-  patches = [ ./fix_pluginpath.patch ];
+  patches = [
+    ./fix_pluginpath.patch
+    # this fixes another bug with python3
+    (fetchpatch {
+      url = https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch ;
+      sha256 = "08kcz3yxvl35m55y7g1pr73x3bjcqnv0qlswxqyq8cqxg9zd64cn";
+    })
+  ];
 
   makeFlags = [ "prefix=$(out)" ];
 
+  # remove deprecation warnings
+  preFixup = ''
+    sed -i "s/import collections/import collections.abc/g" $out/share/dstat/dstat.py $out/bin/dstat
+    sed -i "s/collections.Sequence/collections.abc.Sequence/g" "$out"/bin/dstat
+  '';
+
   meta = with lib; {
     homepage = "http://dag.wieers.com/home-made/dstat/";
     description = "Versatile resource statistics tool";

From 90febc0e345d854d1e5487ab6cc4430bc16444b9 Mon Sep 17 00:00:00 2001
From: Sergey <SeTSeR200018@gmail.com>
Date: Mon, 18 Jan 2021 12:36:18 +0300
Subject: [PATCH 087/956] telega: Fix pkg-config dependency

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 68869113b92..7156bb86d61 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -341,7 +341,7 @@ let
         # Telega has a server portion for it's network protocol
         telega = super.telega.overrideAttrs (old: {
           buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
-          nativeBuildInputs = [ external.pkgconfig ];
+          nativeBuildInputs = [ external.pkg-config ];
 
           postBuild = ''
             cd source/server

From a10b00e080415531e09eb4c9ec6b195f54a50625 Mon Sep 17 00:00:00 2001
From: Phil Dyer <phildyer@protonmail.com>
Date: Mon, 18 Jan 2021 20:49:27 +1000
Subject: [PATCH 088/956] r-modules: fix gert build

gert requires pkgs.libgit2 to build.
---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 362e7b81da4..e48b3032b7a 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -263,6 +263,7 @@ let
     gmp = [ pkgs.gmp.dev ];
     graphscan = [ pkgs.gsl_1 ];
     gsl = [ pkgs.gsl_1 ];
+    gert = [ pkgs.libgit2 ];
     haven = [ pkgs.libiconv pkgs.zlib.dev ];
     h5vc = [ pkgs.zlib.dev ];
     HiCseg = [ pkgs.gsl_1 ];

From e8d46839092848fd4fdd89dfe97c4877eb1f46e3 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 18 Jan 2021 21:49:24 +0100
Subject: [PATCH 089/956] home-manager: 2020-09-06 -> 2020-01-16

It has been a while since the last update. This includes some new
features [1] and at least one compatibility fix [2].

[1] https://github.com/nix-community/home-manager/blob/73506f947c3a2f63306233358231b069865d1d56/modules/misc/news.nix#L1653
[2] https://github.com/nix-community/home-manager/pull/1703
---
 pkgs/tools/package-management/home-manager/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index b8b4de36eb4..8897a313e8d 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
 
   pname = "home-manager";
-  version = "2020-09-06";
+  version = "2021-01-16";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "home-manager";
-    rev = "249650a07ee2d949fa599f3177a8c234adbd1bee";
-    sha256 = "0x858b7i15kx74aqwgi2n5ls7zjhcky95z9vbxfdlawmaz371dma";
+    rev = "8127799f79ee96129b295d78294f40a54078131f";
+    sha256 = "0iji8nxa66s409pvjwi370ycsw4m74w6b3ywnjpfkl2filpapjns";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From fd9714bb640b9025f7c39dc7cd5ea73a63c44971 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jan 2021 22:11:33 +0000
Subject: [PATCH 090/956] gleam: 0.12.1 -> 0.13.2

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

diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index f96f2f724a6..b2529986f6e 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
-  version = "0.12.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0n23pn7jk4i2waczw5cczsb7v4lal4x6xqmp01y280hb2vk176fg";
+    sha256 = "sha256-ka1GxukX3HR40fMeiiXHguyPKrpGngG2tXDColR7eQA=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++
     stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "0rnf9agpzlvk53x8zrg32w6r0gxcbank3fs32ydv53frvqv1spj3";
+  cargoSha256 = "sha256-/l54ezS68loljKNh7AdYMIuCiyIbsMI3jqD9ktjZLfc=";
 
   meta = with stdenv.lib; {
     description = "A statically typed language for the Erlang VM";

From aed967d8dba47c206876ef6de0cff8aa69ba165b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jan 2021 22:18:04 +0000
Subject: [PATCH 091/956] gmailctl: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix
index 30a25dc9f70..1dfd1f62fb0 100644
--- a/pkgs/applications/networking/gmailctl/default.nix
+++ b/pkgs/applications/networking/gmailctl/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "gmailctl";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "mbrt";
     repo = "gmailctl";
     rev = "v${version}";
-    sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j";
+    sha256 = "sha256-UZzpecW4vW1JYUDCcwDIJXCGjw80fgZC4wvCh0DdE98=";
   };
 
-  vendorSha256 = "0qp8n7z3vcsbc6safp7i18i0i3r4hy4nidzwl85i981sg12vcg6b";
+  vendorSha256 = "sha256-5oVr1qazTzsSNVLvcAsAN8UyrJOeqLjSVinImLOyJlk=";
 
   doCheck = false;
 

From 762622c3c941c377f1513811f8926fff383e8937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 16 Jan 2021 10:53:01 +0100
Subject: [PATCH 092/956] pythonPackages.graphviz: 0.14.1 -> 0.16

---
 .../python-modules/graphviz/default.nix       | 12 ++--
 .../graphviz/hardcode-graphviz-path.patch     | 56 ++++++++++++-------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
index f531c547f9c..1a0e6d903a4 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -6,21 +6,21 @@
 , makeFontsConf
 , freefont_ttf
 , mock
-, pytest
+, pytestCheckHook
 , pytest-mock
 , pytestcov
 }:
 
 buildPythonPackage rec {
   pname = "graphviz";
-  version = "0.14.1";
+  version = "0.16";
 
   # patch does not apply to PyPI tarball due to different line endings
   src = fetchFromGitHub {
     owner = "xflr6";
     repo = "graphviz";
     rev = version;
-    sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c";
+    sha256 = "147vi60mi57z623lhllwwzczzicv2iwj1yrmllj5xx5788i73j6g";
   };
 
   patches = [
@@ -35,11 +35,7 @@ buildPythonPackage rec {
     fontDirectories = [ freefont_ttf ];
   };
 
-  checkInputs = [ mock pytest pytest-mock pytestcov ];
-
-  checkPhase = ''
-    pytest
-  '';
+  checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ];
 
   meta = with lib; {
     description = "Simple Python interface for Graphviz";
diff --git a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
index d6da1ff47ce..fa2f634bbc2 100644
--- a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
+++ b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
@@ -1,19 +1,28 @@
 diff --git a/graphviz/backend.py b/graphviz/backend.py
-index 6f4cc0c..bc4781e 100644
+index d2c4b97..f7175cd 100644
 --- a/graphviz/backend.py
 +++ b/graphviz/backend.py
 @@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None):
          raise ValueError('unknown formatter: %r' % formatter)
  
      output_format = [f for f in (format_, renderer, formatter) if f is not None]
--    cmd = [engine, '-T%s' % ':'.join(output_format)]
-+    cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)]
+-    cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
++    cmd = ['@graphviz@/bin/dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
  
      if filepath is None:
          rendered = None
-@@ -255,7 +255,7 @@ def version():
-         subprocess.CalledProcessError: If the exit status is non-zero.
-         RuntimmeError: If the output cannot be parsed into a version number.
+@@ -275,7 +275,7 @@ def unflatten(source,
+     if fanout and stagger is None:
+         raise RequiredArgumentError('fanout given without stagger')
+ 
+-    cmd = ['unflatten']
++    cmd = ['@graphviz@/bin/unflatten']
+     if stagger is not None:
+         cmd += ['-l', str(stagger)]
+     if fanout:
+@@ -304,7 +304,7 @@ def version():
+         Graphviz Release version entry format
+         https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20
      """
 -    cmd = ['dot', '-V']
 +    cmd = ['@graphviz@/bin/dot', '-V']
@@ -21,10 +30,10 @@ index 6f4cc0c..bc4781e 100644
                   stdout=subprocess.PIPE,
                   stderr=subprocess.STDOUT)
 diff --git a/tests/test_backend.py b/tests/test_backend.py
-index 9f307f5..e43bf5b 100644
+index d10ef1a..e4aba58 100644
 --- a/tests/test_backend.py
 +++ b/tests/test_backend.py
-@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
+@@ -52,7 +52,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
          m.decode.assert_called_once_with(encoding)
  
  
@@ -33,34 +42,43 @@ index 9f307f5..e43bf5b 100644
  @pytest.mark.usefixtures('empty_path')
  @pytest.mark.parametrize('func, args', [
      (render, ['dot', 'pdf', 'nonfilepath']),
-@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet):  # noqa: N803
+@@ -146,7 +146,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet):  # noqa: N803
  
      assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf'
  
--    Popen.assert_called_once_with(['dot', '-Tpdf', '-O', 'nonfilepath'],
-+    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'],
+-    Popen.assert_called_once_with(['dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
++    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE,
                                    cwd=None, startupinfo=mocker.ANY)
-@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet):  # noqa: N803
+@@ -208,7 +208,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet):  # noqa: N803
      assert e.value.stdout is mocker.sentinel.out
      e.value.stdout = mocker.sentinel.new_stdout
      assert e.value.stdout is mocker.sentinel.new_stdout
--    Popen.assert_called_once_with(['dot', '-Tpng'],
-+    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
+-    Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
++    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
                                    stdin=subprocess.PIPE,
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE,
-@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet):  # noqa: N803
+@@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet):  # noqa: N803
  
      assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out
  
--    Popen.assert_called_once_with(['dot', '-Tpng'],
-+    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
+-    Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
++    Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
                                    stdin=subprocess.PIPE,
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE,
-@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen):  # noqa: N803
+@@ -259,7 +259,7 @@ def test_unflatten_mocked(capsys, mocker, Popen):
+     proc.communicate.return_value = (b'nonresult', b'')
+ 
+     assert unflatten('nonsource') == 'nonresult'
+-    Popen.assert_called_once_with(['unflatten'],
++    Popen.assert_called_once_with(['@graphviz@/bin/unflatten'],
+                                   stdin=subprocess.PIPE,
+                                   stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE,
+@@ -290,7 +290,7 @@ def test_version_parsefail_mocked(mocker, Popen):  # noqa: N803
      with pytest.raises(RuntimeError, match=r'nonversioninfo'):
          version()
  
@@ -69,7 +87,7 @@ index 9f307f5..e43bf5b 100644
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT,
                                    startupinfo=mocker.ANY)
-@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected):  # noqa: N803
+@@ -312,7 +312,7 @@ def test_version_mocked(mocker, Popen, stdout, expected):  # noqa: N803
  
      assert version() == expected
  

From 1cebb00fa86c0144afef470c8a6cdb7b37807520 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jan 2021 22:27:20 +0000
Subject: [PATCH 093/956] go-chromecast: 0.2.6 -> 0.2.7

---
 pkgs/applications/video/go-chromecast/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix
index 8dd10fff89a..782f0016106 100644
--- a/pkgs/applications/video/go-chromecast/default.nix
+++ b/pkgs/applications/video/go-chromecast/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "go-chromecast";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "vishen";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0frvj1van1qn7hi96m0l7pzm4jf0v49xl4r4fi2lh1yqzgsgzy9f";
+    sha256 = "sha256-OCykgy49RZL2aAE0OeHxj8zkFnr32sIYjtoFMwESqLg=";
   };
 
-  vendorSha256 = "0vgbmgk07kqmhhmcssy1ibr2hzk07hf32kkdyj2b9jqj9sb49p49";
+  vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620=";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];
 

From b17123a0de80d424916cd25b8e9bd578593016fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 18 Jan 2021 23:12:19 +0100
Subject: [PATCH 094/956] python3Packages.prov: update dependencies

---
 pkgs/development/python-modules/prov/default.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index fba5a41389c..9ab4cbf72bd 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -4,11 +4,8 @@
 , lxml
 , networkx
 , dateutil
-, six
-, pydotplus
 , rdflib
 , pydot
-, glibcLocales
 }:
 
 buildPythonPackage rec {
@@ -20,28 +17,17 @@ buildPythonPackage rec {
     sha256 = "b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee";
   };
 
-  prePatch = ''
-    substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
-  '';
-
   propagatedBuildInputs = [
     lxml
     networkx
     dateutil
-    six
-    pydotplus
     rdflib
   ];
 
   checkInputs = [
     pydot
-    glibcLocales
   ];
 
-  preCheck = ''
-    export LC_ALL="en_US.utf-8"
-  '';
-
   meta = with lib; {
     description = "A Python library for W3C Provenance Data Model (PROV)";
     homepage = "https://github.com/trungdong/prov";

From cfa8f9a389608916ebc6208ad80809c743b7796f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 18 Jan 2021 23:16:30 +0100
Subject: [PATCH 095/956] pythonPackages.pydotplus: drop

It is no longer maintained whereas pydot is.
---
 .../python-modules/pydotplus/default.nix      | 28 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pydotplus/default.nix

diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix
deleted file mode 100644
index f794a150ec1..00000000000
--- a/pkgs/development/python-modules/pydotplus/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv
-, buildPythonPackage
-, fetchPypi
-, pyparsing
-, graphviz
-}:
-
-buildPythonPackage rec {
-  pname = "pydotplus";
-  version = "2.0.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1i05cnk3yh722fdyaq0asr7z9xf7v7ikbmnpxa8j6pdqx6g5xs4i";
-  };
-
-  propagatedBuildInputs = [
-    pyparsing
-    graphviz
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/erocarrera/pydot";
-    description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ashgillman ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2076ae2ec54..1641b5305b9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5272,8 +5272,6 @@ in {
 
   pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; };
 
-  pydotplus = callPackage ../development/python-modules/pydotplus { };
-
   pydrive = callPackage ../development/python-modules/pydrive { };
 
   pydsdl = callPackage ../development/python-modules/pydsdl { };

From 126463c37855e705de87d52f811d6247109c132f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jan 2021 22:45:54 +0000
Subject: [PATCH 096/956] goreleaser: 0.149.0 -> 0.155.0

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

diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index 58a7ce619c5..6611b3e9210 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "goreleaser";
-  version = "0.149.0";
+  version = "0.155.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "14yvxnl2ap1hizpk3pfzlh36399df1z2zgsc63qdh1h4ixyav6cy";
+    sha256 = "sha256-wVHBcxbrU6WvBAegQYDRDvLbuoU49/Cm19ujghNyi2A=";
   };
 
-  vendorSha256 = "17l15z2wyxzh7h7hvb1fysdnyg8wr8ww827vvmki73s1plfgr80d";
+  vendorSha256 = "sha256-k4TphR8z3DtoqJm6o6QILvQ1rHIldi1BpQJbEyWKv9U=";
 
   buildFlagsArray = [
     "-ldflags="

From 4838079482df18db3b43f3e865b4dc5cea6b8d51 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jan 2021 23:44:42 +0000
Subject: [PATCH 097/956] gtk-layer-shell: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix
index 87f9698bec0..1aef590bb92 100644
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gtk-layer-shell";
-  version = "0.5.1";
+  version = "0.5.2";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "wmww";
     repo = "gtk-layer-shell";
     rev = "v${version}";
-    sha256 = "1yfqfv3hn92cy9y5zgvz7qhq2ypill2z5857ki5snjimhjdz0cnw";
+    sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk=";
   };
 
   nativeBuildInputs = [

From 93da8aa55c0b84f338d4b1825c23bcdfbd01f93b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jan 2021 23:52:17 +0000
Subject: [PATCH 098/956] halfempty: 0.30 -> 0.40

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

diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/development/tools/halfempty/default.nix
index c8c267f9187..0e9e47c5567 100644
--- a/pkgs/development/tools/halfempty/default.nix
+++ b/pkgs/development/tools/halfempty/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "halfempty";
-  version = "0.30";
+  version = "0.40";
 
   src = fetchFromGitHub {
     owner = "googleprojectzero";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc";
+    sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY=";
   };
 
   nativeBuildInputs = [ pkgconfig util-linux ];

From 0e1dedba4bb5310fa5c938ebc9c05879c229a9b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 00:01:27 +0000
Subject: [PATCH 099/956] hebcal: 4.22 -> 4.24

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

diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
index e7a9ccd6358..050cc63f6a5 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "4.22";
+  version = "4.24";
   pname = "hebcal";
 
   src = fetchFromGitHub {
     owner = "hebcal";
     repo = "hebcal";
     rev = "v${version}";
-    sha256 = "0bm29n51qi9q4vx4qsz3l9l1wvpvsk138zixfl5f5yz4kngzbx24";
+    sha256 = "sha256-iWp2S3s8z/y4dZ66Ogqu7Yf4gTUvSS1J5F7d0ifRbcY=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 359c01e90d3df825f5a94b43c15d84688b84cf49 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 00:05:00 +0000
Subject: [PATCH 100/956] heimer: 2.0.0 -> 2.2.0

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

diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index 07907752478..9d8dc1eaa03 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "heimer";
-  version = "2.0.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "juzzlin";
     repo = pname;
     rev = version;
-    sha256 = "0lxypgwgl64d4sw9kn0ncyik3whpq8iif0sbvi4r5kasx6wgs4qz";
+    sha256 = "sha256-upsOmf46bCO8sVp5dBHPLUBZYZP3JyXa7H5KXbd76qo=";
   };
 
   nativeBuildInputs = [ cmake ];

From 501816ab980693ea9b8c8d8f2fa65b3321d30e6f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 00:09:00 +0000
Subject: [PATCH 101/956] helmfile: 0.135.0 -> 0.137.0

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 2516370430e..2073916ffe1 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helmfile";
-  version = "0.135.0";
+  version = "0.137.0";
 
   src = fetchFromGitHub {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "1ky9mh5n6n84g77ax1dn1cisgxjwyrhnapaikyj4q53zcbyai3ng";
+    sha256 = "sha256-HrVQS09lllUC4HClWahMV72j2TiQnzEUkV16YKm6984=";
   };
 
-  vendorSha256 = "0dycngvk4nymcrkn6pn2q2h2zfvhc69m1zs2pspl58sa0mkakk2p";
+  vendorSha256 = "sha256-dL36mcYCs92USf18BMB6vXd+qLsk2BYmAEm1bwx+o5k=";
 
   doCheck = false;
 

From 41009ec5a212b5ff906f0d1ffa6a77b2cedfeec3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 00:12:46 +0000
Subject: [PATCH 102/956] helmsman: 3.6.2 -> 3.6.3

---
 pkgs/applications/networking/cluster/helmsman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix
index 21a9608db2c..15ccd065e2f 100644
--- a/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/pkgs/applications/networking/cluster/helmsman/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helmsman";
-  version = "3.6.2";
+  version = "3.6.3";
 
   src = fetchFromGitHub {
     owner = "Praqma";
     repo = "helmsman";
     rev = "v${version}";
-    sha256 = "0a9f6745f17sws7fyhz0d8wnriv69d6nrci9j5nhysnzg97ky1np";
+    sha256 = "sha256-CvepOpAI40eTS5p5gjtbzahn0tX/z4CId1DDqlaMSMw=";
   };
 
-  vendorSha256 = "04csmw5zpansb30amr3i6vlwxc3z38q4g69cklh44cr37glm04sm";
+  vendorSha256 = "sha256-VRNQ6TsjM0IgnSyZRzAaf7DO6TZx5KrAWNqq+wuvmhE=";
 
   doCheck = false;
 

From f0af99a20f9bc2b9ce738d285afcdffd230df8f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 00:31:49 +0000
Subject: [PATCH 103/956] i3lock-color: 2.12.c.5 -> 2.13.c.1

---
 pkgs/applications/window-managers/i3/lock-color.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 7fe48189752..bec4f58c33e 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.12.c.5";
+  version = "2.13.c.1";
   pname = "i3lock-color";
 
   src = fetchFromGitHub {
     owner = "PandorasFox";
     repo = "i3lock-color";
     rev = version;
-    sha256 = "10h50a6p9ivqjz8hd5pn9l03vz6y9dxdx68bprqssfzdkzqnzaiv";
+    sha256 = "sha256-E+ejc26eyCJ0PnMpDgQrouaBIaUH0SWlzB08fQs8lDw=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 83370b5920bff3fb4a7e6eb20ff0e970dc88084f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 00:39:30 +0000
Subject: [PATCH 104/956] igmpproxy: 0.2.1 -> 0.3

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

diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/tools/networking/igmpproxy/default.nix
index 0c4279b6f64..9f924964907 100644
--- a/pkgs/tools/networking/igmpproxy/default.nix
+++ b/pkgs/tools/networking/igmpproxy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "igmpproxy";
-  version = "0.2.1";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "pali";
     repo = "igmpproxy";
     rev = version;
-    sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf";
+    sha256 = "sha256-B7mq+5pKWMO4dJeFPB7tiyjDQjj90g/kmYB2ApBE3Ic=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From fdb8bd5299ccd9c678858e55fc97355f5a39b06b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 00:46:29 +0000
Subject: [PATCH 105/956] indilib: 1.8.7 -> 1.8.8

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

diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 1635827340e..1663542521c 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "indilib";
-  version = "1.8.7";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "indilib";
     repo = "indi";
     rev = "v${version}";
-    sha256 = "0cy9l1vpsnfilxslvmn88hhq8iw8cnx3xpbnl78c0dgjyfv5xmhz";
+    sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU=";
   };
 
   patches = [

From a404cf946ea1ee29194be60f8067b24d8d3e30b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 00:57:49 +0000
Subject: [PATCH 106/956] ior: 3.2.1 -> 3.3.0

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

diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix
index 330bf35e553..326602e3d4d 100644
--- a/pkgs/tools/system/ior/default.nix
+++ b/pkgs/tools/system/ior/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ior";
-  version = "3.2.1";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "hpc";
     repo = pname;
     rev = version;
-    sha256 = "036cg75c5vq6kijfv8f918vpm9sf1h7lyg6xr9fba7n0dwbbmycv";
+    sha256 = "sha256-pSjptDfiPlaToXe1yHyk9MQMC9PqcVSjqAmWLD11iOM=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 6b2d7c11abe3ad0cf18d4b70469653a709fa40d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 01:10:35 +0000
Subject: [PATCH 107/956] istioctl: 1.8.1 -> 1.8.2

---
 pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index 5d293df9157..5f136fef807 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "1m97hszmw0hfzj3jvd1is7fa3mpqkm7jbq3ik337rb9yq1f0gasv";
+    sha256 = "sha256-9mQYJvZU/Ra+LyzfDbWGfopkdGBD7DpS9/yvRvGHDKg=";
   };
-  vendorSha256 = "0ividxxmil69vpvyjlgyzb2jzipmh9rpvk19kv7266d29ky3q7s6";
+  vendorSha256 = "sha256-7LQY32hNXLxg/IUBbzzgb67yrbPGLCTNtmNvjE9tUno=";
 
   doCheck = false;
 

From 77ccc6da3faa9b2d3da1568ac83ec8c3bcc9040f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 01:44:30 +0000
Subject: [PATCH 108/956] jx: 2.1.149 -> 2.1.155

---
 pkgs/applications/networking/cluster/jx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index 1f1eb3e8548..d7fc1cb2242 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "2.1.149";
+  version = "2.1.155";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "0jgny09wpfab8mkxkhv9swp1baqx3lxsx75a5i78cypkj6xadc69";
+    sha256 = "sha256-kwcmZSOA26XuSgNSHitGaMohalnLobabXf4z3ybSJtk=";
   };
 
-  vendorSha256 = "1fswrf14nwjm0z8qqgdx236w7w1m451lyfinhx9pyp89fw2h5mv6";
+  vendorSha256 = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs=";
 
   doCheck = false;
 

From 94515f0c0ee6d8df25fbaa2cca5783848d08bdb6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 01:48:14 +0000
Subject: [PATCH 109/956] k4dirstat: 3.2.1 -> 3.2.2

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

diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix
index 1d6a6097d27..341341c3ca8 100644
--- a/pkgs/applications/misc/k4dirstat/default.nix
+++ b/pkgs/applications/misc/k4dirstat/default.nix
@@ -11,13 +11,13 @@
 
 mkDerivation rec {
   pname = "k4dirstat";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "jeromerobert";
     repo = pname;
     rev = version;
-    sha256 = "15xjb80jq6vhzvzx4l341f40d8a23w1334qh6cczqm9adfnzycp7";
+    sha256 = "sha256-U5p/gW5GPxRoM9XknP8G7iVhLDoqmvgspeRsmCRdxDg=";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ];

From 3741134baae198b6da0944fef97f1f2433db6638 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 01:51:56 +0000
Subject: [PATCH 110/956] kanboard: 1.2.16 -> 1.2.18

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

diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index 722f2364ab3..ffb787a9bd9 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kanboard";
-  version = "1.2.16";
+  version = "1.2.18";
 
   src = fetchFromGitHub {
     owner = "kanboard";
     repo = "kanboard";
     rev = "v${version}";
-    sha256 = "1nps7xcw1gp7kfdp13wyj2sprc8hn5iamdb0xj4202qygpzm63wq";
+    sha256 = "sha256-raXPRoydd3CfciF7S0cZiuY7EPFKfE8IU3qj2dOztHU=";
   };
 
   dontBuild = true;

From bf9e9185cd32964e8e6a0aa9fbed427e1fe6525d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 01:57:35 +0000
Subject: [PATCH 111/956] kapowbang: 0.5.4 -> 0.6.0

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

diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix
index a0096eab026..b52018b64f4 100644
--- a/pkgs/servers/kapowbang/default.nix
+++ b/pkgs/servers/kapowbang/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kapowbang";
-  version = "0.5.4";
+  version = "0.6.0";
 
   subPackages = [ "." ];
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "BBVA";
     repo = "kapow";
     rev = "v${version}";
-    sha256 = "09qr631vzlgibz6q64f35lqzz9h1g3gxqfbapkrci5i0n3h04yr4";
+    sha256 = "sha256-+GZarnG+SlxynoXYTvI1f9eki3DobiDt7vUdWlC0ECk=";
   };
 
-  vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy";
+  vendorSha256 = "sha256-vXu64o/MTmw9oZL4MIHB+PEfYLcKVh5A5iGZ1RW1Xd4=";
 
   doCheck = false;
 

From 36a0baf0441e2557c624f2a042b5bf892fdc23df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 02:41:45 +0000
Subject: [PATCH 112/956] atlassian-confluence: 7.9.0 -> 7.10.1

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

diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index a3a59906437..a7c9464fcae 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
 
 stdenvNoCC.mkDerivation rec {
   pname = "atlassian-confluence";
-  version = "7.9.0";
+  version = "7.10.1";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
-    sha256 = "0y21ivvzzs6mq2p96csmhbvz1jzwp1x4zrw26qrwavf84l2v7nlh";
+    sha256 = "sha256-ScE0UXmoxHb7HOJhSfOLXj3Wb3/XitFuOR36Iktmgxk=";
   };
 
   buildPhase = ''

From a444c334ad7e1d61d773f3a09a8c1ff3223cd57f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 02:54:06 +0000
Subject: [PATCH 113/956] atlassian-cli: 9.4.0 -> 9.5.0

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

diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index d743baaed7e..8c1245a99ac 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atlassian-cli";
-  version = "9.4.0";
+  version = "9.5.0";
 
   src = fetchzip {
     url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
-    sha256  = "091dhjkx7fdn23cj7c4071swncsbmknpvidmmjzhc0355l3p4k2g";
+    sha256  = "sha256-EAoydA2lg4K1gTgzn9patNw7pcCdU/OPfaEG1OfEJ18=";
   };
 
   tools = [

From a27f0df8dcda505a6af7ed52d8a10bdb95a5bbf6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 02:57:51 +0000
Subject: [PATCH 114/956] go-2fa: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix
index 41e4439eeb3..c8518ef0a9f 100644
--- a/pkgs/tools/security/2fa/default.nix
+++ b/pkgs/tools/security/2fa/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  version = "1.1.0";
+  version = "1.2.0";
   pname = "2fa";
 
   goPackagePath = "rsc.io/2fa";
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "rsc";
     repo = "2fa";
     rev = "v${version}";
-    sha256 = "0827vl2bxd6m2rbj00x7857cs7cic3mlg5nlhqzd0n73dm5vk2za";
+    sha256 = "sha256-cB5iADZwvJQwwK1GockE2uicFlqFMEAY6xyeXF5lnUY=";
   };
 
   meta = with lib; {

From aa61094aecb857b61a6d8d765b8f100e4d3d3969 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 03:14:48 +0000
Subject: [PATCH 115/956] aws-sdk-cpp: 1.8.113 -> 1.8.121

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

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index fc3f7896dbe..ffe15652a3d 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-sdk-cpp";
-  version = "1.8.113";
+  version = "1.8.121";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0y784cjrxgrin3ck5f2lk0riyy9kv928kcb9y0gzka65imgma48c";
+    sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ=";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From cbff1ad157763138977f5c18226e860aea888a8e Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Tue, 19 Jan 2021 11:18:23 +0800
Subject: [PATCH 116/956] bpytop: 1.0.50 -> 1.0.59

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

diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix
index abcc1593988..b59222200c1 100644
--- a/pkgs/tools/system/bpytop/default.nix
+++ b/pkgs/tools/system/bpytop/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bpytop";
-  version = "1.0.50";
+  version = "1.0.59";
 
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "10j2g19sh2hl5lzbcllr862hkzr0mc1z8n24afzaycn1sphri8fc";
+    sha256 = "sha256-RlrUUIbZRNTvxU8LVW0/ZcARlKDVvSMlkN0+6BgAink=";
   };
 
   buildInputs = [ makeWrapper ];

From ea7e4b3486be8b0380236ff2bbcbaa0e85aa6f83 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@svends.net>
Date: Mon, 18 Jan 2021 19:30:22 -0800
Subject: [PATCH 117/956] Apply suggestions from code review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../inputmethods/interception-tools/dual-function-keys.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
index c8798901905..730135e4a7d 100644
--- a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
+++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }:
+{ stdenv, lib, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }:
 
 stdenv.mkDerivation rec {
   pname = "dual-function-keys";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.com/interception/linux/plugins/dual-function-keys";
     description = "Tap for one key, hold for another.";
     license = licenses.mit;

From a47a55e4338d6221232e12ad6edcac0d3b8cda0a Mon Sep 17 00:00:00 2001
From: Peter Woodman <peter@shortbus.org>
Date: Mon, 18 Jan 2021 23:03:08 -0500
Subject: [PATCH 118/956] sysklogd: fix building against musl

taking guidance from alpine linux's patch[1], removed a few ifdefs and
fixed up some includes.

[1]: https://git.alpinelinux.org/aports/tree/main/sysklogd/fix-includes.patch
---
 pkgs/os-specific/linux/sysklogd/default.nix   |   2 +-
 .../linux/sysklogd/fix-includes.patch         | 118 ++++++++++++++++++
 pkgs/os-specific/linux/sysklogd/systemd.patch |   2 +-
 3 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/sysklogd/fix-includes.patch

diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix
index 454527321fb..2ee7daca0eb 100644
--- a/pkgs/os-specific/linux/sysklogd/default.nix
+++ b/pkgs/os-specific/linux/sysklogd/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji";
   };
 
-  patches = [ ./systemd.patch ./union-wait.patch ];
+  patches = [ ./systemd.patch ./union-wait.patch ./fix-includes.patch ];
 
   NIX_CFLAGS_COMPILE = "-DSYSV";
 
diff --git a/pkgs/os-specific/linux/sysklogd/fix-includes.patch b/pkgs/os-specific/linux/sysklogd/fix-includes.patch
new file mode 100644
index 00000000000..e7dbe431275
--- /dev/null
+++ b/pkgs/os-specific/linux/sysklogd/fix-includes.patch
@@ -0,0 +1,118 @@
+diff -u sysklogd-1.5.1.orig/klogd.c sysklogd-1.5.1/klogd.c
+--- sysklogd-1.5.1.orig/klogd.c	2014-10-04 15:47:18.000000000 -0400
++++ sysklogd-1.5.1/klogd.c	2021-01-18 23:09:23.000000000 -0500
+@@ -260,11 +260,8 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <errno.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/stat.h>
+-#if !defined(__GLIBC__)
+-#include <linux/time.h>
+-#endif /* __GLIBC__ */
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
+@@ -277,13 +274,8 @@
+ 
+ #define __LIBRARY__
+ #include <linux/unistd.h>
+-#if !defined(__GLIBC__)
+-# define __NR_ksyslog __NR_syslog
+-_syscall3(int,ksyslog,int, type, char *, buf, int, len);
+-#else
+ #include <sys/klog.h>
+ #define ksyslog klogctl
+-#endif
+ 
+ #define LOG_BUFFER_SIZE 4096
+ #define LOG_LINE_LENGTH 1000
+diff -u sysklogd-1.5.1.orig/ksym_mod.c sysklogd-1.5.1/ksym_mod.c
+--- sysklogd-1.5.1.orig/ksym_mod.c	2014-10-04 15:47:18.000000000 -0400
++++ sysklogd-1.5.1/ksym_mod.c	2021-01-18 23:09:57.000000000 -0500
+@@ -113,12 +113,9 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <errno.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/stat.h>
+ #include "module.h"
+-#if !defined(__GLIBC__)
+-#include <linux/time.h>
+-#endif /* __GLIBC__ */
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <linux/version.h>
+diff -u sysklogd-1.5.1.orig/pidfile.c sysklogd-1.5.1/pidfile.c
+--- sysklogd-1.5.1.orig/pidfile.c	2014-10-04 15:47:18.000000000 -0400
++++ sysklogd-1.5.1/pidfile.c	2021-01-18 23:23:55.000000000 -0500
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
+diff -u sysklogd-1.5.1.orig/syslog.c sysklogd-1.5.1/syslog.c
+--- sysklogd-1.5.1.orig/syslog.c	2014-10-04 15:47:18.000000000 -0400
++++ sysklogd-1.5.1/syslog.c	2021-01-18 23:11:45.000000000 -0500
+@@ -55,7 +55,6 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/file.h>
+-#include <sys/signal.h>
+ #include <sys/syslog.h>
+ #if 0
+ #include "syslog.h"
+@@ -64,6 +63,8 @@
+ 
+ #include <sys/uio.h>
+ #include <sys/wait.h>
++#include <signal.h>
++#include <fcntl.h>
+ #include <netdb.h>
+ #include <string.h>
+ #include <time.h>
+diff -u sysklogd-1.5.1.orig/syslogd.c sysklogd-1.5.1/syslogd.c
+--- sysklogd-1.5.1.orig/syslogd.c	2014-10-04 15:47:18.000000000 -0400
++++ sysklogd-1.5.1/syslogd.c	2021-01-18 23:13:25.000000000 -0500
+@@ -519,9 +519,9 @@
+ #include <time.h>
+ 
+ #define SYSLOG_NAMES
++#include <errno.h>
+ #include <sys/syslog.h>
+ #include <sys/param.h>
+-#include <sys/errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+@@ -818,9 +818,7 @@
+ void init();
+ void cfline(char *line, register struct filed *f);
+ int decode(char *name, struct code *codetab);
+-#if defined(__GLIBC__)
+ #define dprintf mydprintf
+-#endif /* __GLIBC__ */
+ static void dprintf(char *, ...);
+ static void allocate_log(void);
+ void sighup_handler();
+@@ -840,15 +838,9 @@
+ 	register char *p;
+ #ifndef TESTING
+ 	ssize_t msglen;
+-#endif
+-#if !defined(__GLIBC__)
+-	int len, num_fds;
+-#else /* __GLIBC__ */
+-#ifndef TESTING
+ 	socklen_t len;
+ #endif
+ 	int num_fds;
+-#endif /* __GLIBC__ */
+ 	/*
+ 	 * It took me quite some time to figure out how this is
+ 	 * supposed to work so I guess I should better write it down.
diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/os-specific/linux/sysklogd/systemd.patch
index 0a7fb166bd7..a170f67cadb 100644
--- a/pkgs/os-specific/linux/sysklogd/systemd.patch
+++ b/pkgs/os-specific/linux/sysklogd/systemd.patch
@@ -71,9 +71,9 @@ diff -ruN -x '*~' sysklogd-1.5-old/sd-daemon.c sysklogd-1.5/sd-daemon.c
 +#include <sys/stat.h>
 +#include <sys/socket.h>
 +#include <sys/un.h>
-+#include <sys/fcntl.h>
 +#include <netinet/in.h>
 +#include <stdlib.h>
++#include <fcntl.h>
 +#include <errno.h>
 +#include <unistd.h>
 +#include <string.h>

From 02f5e051391debbb3d06979e9c30c68d0c7204a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 04:34:30 +0000
Subject: [PATCH 119/956] belcard: 4.4.13 -> 4.4.24

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

diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix
index 35de9fb9347..df4e5329018 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "belcard";
-  version = "4.4.13";
+  version = "4.4.24";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     group = "BC";
     repo = pname;
     rev = version;
-    sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m";
+    sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops=";
   };
 
   buildInputs = [ bctoolbox belr ];

From a1fc4e52b7ccb73c7a724ae95df374f1fec75f21 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 05:21:26 +0000
Subject: [PATCH 120/956] aws-c-common: 0.4.63 -> 0.4.64

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

diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix
index 5473867a6ad..23d7f9d8629 100644
--- a/pkgs/development/libraries/aws-c-common/default.nix
+++ b/pkgs/development/libraries/aws-c-common/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-c-common";
-  version = "0.4.63";
+  version = "0.4.64";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9";
+    sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A=";
   };
 
   nativeBuildInputs = [ cmake ];

From bbdad5fa19532d596a55feaf28021f55e856c89c Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Mon, 28 Sep 2020 07:07:51 +0000
Subject: [PATCH 121/956] terraform-provider-libvirt: base volume snapshot or
 copy

---
 .../cluster/terraform-providers/libvirt/default.nix    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 6efdf77bfce..6a1f895c053 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkg-config, makeWrapper, cdrtools }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }:
 
 # USAGE:
 # install the following package globally or in nix-shell:
@@ -23,6 +23,14 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
 
+  patches = [
+    (fetchpatch {
+      name = "base_volume_copy.patch";
+      url = "https://github.com/cyril-s/terraform-provider-libvirt/commit/52df264e8a28c40ce26e2b614ee3daea882931c3.patch";
+      sha256 = "1fg7ii2fi4c93hl41nhcncy9bpw3avbh6yiq99p1vkf87hhrw72n";
+    })
+  ];
+
   src = fetchFromGitHub {
     owner = "dmacvicar";
     repo = "terraform-provider-libvirt";

From 1e2cd67fe9178cfd4da6c92d8d844e02a706eb11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 05:45:26 +0000
Subject: [PATCH 122/956] blueberry: 1.4.0 -> 1.4.2

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

diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix
index e954163b9e8..71ce9060b25 100644
--- a/pkgs/tools/bluetooth/blueberry/default.nix
+++ b/pkgs/tools/bluetooth/blueberry/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "blueberry";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "19kmjp686h7lwmw5n7fc9giqbqm757pkbn42nfwlmasvzqsqlnz6";
+    sha256 = "sha256-YwJQryIK92/Tc1s49jM3pCs7dmO3l+RbbFBtuXvhYbQ=";
   };
 
   nativeBuildInputs = [

From e5ad3c2b4e682f13046c7dcac896b2a44a248e6d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 05:55:46 +0000
Subject: [PATCH 123/956] aws-c-io: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix
index eda87ba2c53..e2074cc835a 100644
--- a/pkgs/development/libraries/aws-c-io/default.nix
+++ b/pkgs/development/libraries/aws-c-io/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-c-io";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wagc1205r57llqd39wqjasq3bgc8h1mfdqk4r5lcrnn4jbpcill";
+    sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4=";
   };
 
   nativeBuildInputs = [ cmake ];

From 18fd20b30520a1ed623bac63aa08b435bcc8796d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 06:21:58 +0000
Subject: [PATCH 124/956] babl: 0.1.82 -> 0.1.84

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

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 9bb6e9e1c5e..c1a63854b92 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "babl";
-  version = "0.1.82";
+  version = "0.1.84";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1iddkwdfw1bmfl6n8y1d4kkm3rb15rzvrfri6a7cnx37mpa96bf6";
+    sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo=";
   };
 
   nativeBuildInputs = [

From 1b0e552fad7dff80c323c1d93bd073afdd1bc7e5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 06:35:38 +0000
Subject: [PATCH 125/956] angle-grinder: 0.15.0 -> 0.16

---
 pkgs/tools/text/angle-grinder/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix
index e04530b8110..82ca3ff0f60 100644
--- a/pkgs/tools/text/angle-grinder/default.nix
+++ b/pkgs/tools/text/angle-grinder/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "angle-grinder";
-  version = "0.15.0";
+  version = "0.16";
 
   src = fetchFromGitHub {
     owner = "rcoh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1m5yj9412kjlnqi1nwh44i627ip0kqcbhvwgh87gl5vgd2a0m091";
+    sha256 = "sha256-cGYhGcNalmc/Gr7mY1Fycs8cZYaIy622DFIL64LT+gE=";
   };
 
-  cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8";
+  cargoSha256 = "sha256-NkghuZHNT3Rq2wqiyKzjP+u9ZpeHU5H6oBLS0oQ7LcU=";
 
   meta = with lib; {
     description = "Slice and dice logs on the command line";

From 06623ebd6eeb5fab054e74d09eef33e033e813e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 06:59:09 +0000
Subject: [PATCH 126/956] libsForQt5.alkimia: 8.0.2 -> 8.0.4

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

diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
index d7d8c268928..18c40c5b5fb 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -5,11 +5,11 @@
 
 mkDerivation rec {
   pname = "alkimia";
-  version = "8.0.2";
+  version = "8.0.4";
 
   src = fetchurl {
     url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0al5k9irmg9gsjc234qxjsqfzgzsavl18pspqk78mkp8zlv7fvv1";
+    sha256 = "sha256-AASnBo3/CqLLb0f3DSHBKQc74R8u2yHxRRK8RHBIfR8=";
   };
 
   nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];

From 2f9d71e05c028bd9820a8edebd3afdbba5d19eca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 08:11:04 +0100
Subject: [PATCH 127/956] gandi-cli: 1.5 -> 1.6

---
 pkgs/tools/networking/gandi-cli/default.nix | 26 +++++++++++++++------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
index 724e367d35d..d7394ac94d8 100644
--- a/pkgs/tools/networking/gandi-cli/default.nix
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -1,21 +1,33 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
-
-with python3Packages;
+{ lib
+, buildPythonApplication
+, click
+, fetchFromGitHub
+, ipy
+, pyyaml
+, requests
+}:
 
 buildPythonApplication rec {
   pname = "gandi-cli";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "Gandi";
     repo = "gandi.cli";
     rev = version;
-    sha256 = "1jcabpphlm6qajw8dz0h4gynm03g1mxi0cn900i3v7wdfww1gfab";
+    sha256 = "sha256-KLeEbbzgqpmBjeTc5RYsFScym8xtMqVjU+H0lyDM0+o=";
   };
 
-  propagatedBuildInputs = [ click ipy pyyaml requests ];
+  propagatedBuildInputs = [
+    click
+    ipy
+    pyyaml
+    requests
+  ];
 
-  doCheck = false;    # Tests try to contact the actual remote API
+  # Tests try to contact the actual remote API
+  doCheck = false;
+  pythonImportsCheck = [ "gandi" ];
 
   meta = with lib; {
     description = "Command-line interface to the public Gandi.net API";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 393bb16da56..7f8581938ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4272,7 +4272,7 @@ in
 
   gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { };
 
-  gandi-cli = callPackage ../tools/networking/gandi-cli { };
+  gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { };
 
   gandom-fonts = callPackage ../data/fonts/gandom-fonts { };
 

From 0b8620e9b6f8ecabe4a531200901d04626c058b2 Mon Sep 17 00:00:00 2001
From: Peter Woodman <peter@shortbus.org>
Date: Tue, 19 Jan 2021 02:26:45 -0500
Subject: [PATCH 128/956] rust: add musl-libc targets to bootstrapping

---
 pkgs/development/compilers/rust/1_45.nix        | 1 +
 pkgs/development/compilers/rust/1_49.nix        | 2 ++
 pkgs/development/compilers/rust/print-hashes.sh | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix
index 25ecb1dc001..13b1b3ef488 100644
--- a/pkgs/development/compilers/rust/1_45.nix
+++ b/pkgs/development/compilers/rust/1_45.nix
@@ -37,6 +37,7 @@ import ./default.nix {
   bootstrapHashes = {
     i686-unknown-linux-gnu = "e69689b0a1b66599cf83e7dd54f839419007e44376195e93e301a3175da3d854";
     x86_64-unknown-linux-gnu = "a41df89a461a580536aeb42755e43037556fba2e527dd13a1e1bb0749de28202";
+    x86_64-unknown-linux-musl = "7eeef2b7488ee96015db10bc52c43f6e023debc9a955ccb8efb382522bf35be9";
     arm-unknown-linux-gnueabihf = "ea18ccdfb62a153c2d43d013fdec56993cc9267f1cdc6f3834df8a2b9b468f08";
     armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54";
     aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49";
diff --git a/pkgs/development/compilers/rust/1_49.nix b/pkgs/development/compilers/rust/1_49.nix
index a085d2b3022..3e76cdfe969 100644
--- a/pkgs/development/compilers/rust/1_49.nix
+++ b/pkgs/development/compilers/rust/1_49.nix
@@ -39,9 +39,11 @@ import ./default.nix {
   bootstrapHashes = {
     i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f";
     x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b";
+    x86_64-unknown-linux-musl = "4ed9627f57b4e0b9807fc5e7513d9731f4791668b7f875b9e44e65e21072c56f";
     arm-unknown-linux-gnueabihf = "e68a81eebd4570343a0fc35cb8ee24cad911d6cee2e374f284b76546ca6636d5";
     armv7-unknown-linux-gnueabihf = "3aed4a63ebdd57690a31d11afbe95e6407edc224a6769be5694a1ed43bf899cb";
     aarch64-unknown-linux-gnu = "c4769418d8d89f432e4a3a21ad60f99629e4b13bbfc29aef7d9d51c4e8ee8a8a";
+    aarch64-unknown-linux-musl = "ac4de580a28e45a9773b389b296d13bfeeb08263cb1f8343859577a54940dae9";
     x86_64-apple-darwin = "20e727cad10f43e3abcedb2a80979ae26923038e0e8a855e8a783da255054113";
     powerpc64le-unknown-linux-gnu = "e6457a0214f3b1b04bd5b2618bba7e3826e254216420dede2971b571a1c13bb1";
   };
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index 9180ccb67d9..0639726f48d 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -10,9 +10,11 @@ set -euo pipefail
 PLATFORMS=(
   i686-unknown-linux-gnu
   x86_64-unknown-linux-gnu
+  x86_64-unknown-linux-musl
   arm-unknown-linux-gnueabihf
   armv7-unknown-linux-gnueabihf
   aarch64-unknown-linux-gnu
+  aarch64-unknown-linux-musl
   x86_64-apple-darwin
   powerpc64le-unknown-linux-gnu
 )

From a51b7570d46e3c21e2e322cfc1928fd52e4b6c77 Mon Sep 17 00:00:00 2001
From: Peter Woodman <peter@shortbus.org>
Date: Tue, 19 Jan 2021 01:19:51 -0500
Subject: [PATCH 129/956] linux-pam: remove broken musl pam_exec patch

it looks like this build wasn't tested with musl-libc after upgrading to
1.5.1, and has been broken in this configuration since, as the removed
patch does not apply cleanly. the good news is it's been fixed upstream,
rendering it unnecessary.
---
 pkgs/os-specific/linux/pam/default.nix        |  3 --
 .../linux/pam/musl-fix-pam_exec.patch         | 33 -------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 45f901b42f0..42b7ea91092 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -20,9 +20,6 @@ stdenv.mkDerivation rec {
       url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
       sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81";
     })
-    # From adelie's package repo, using local copy since it seems to be currently offline.
-    # (we previously used similar patch from void, but stopped working with update to 1.3.1)
-    ./musl-fix-pam_exec.patch
   ];
 
   outputs = [ "out" "doc" "man" /* "modules" */ ];
diff --git a/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch b/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch
deleted file mode 100644
index 194e47b9e5b..00000000000
--- a/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./modules/pam_exec/pam_exec.c.orig
-+++ ./modules/pam_exec/pam_exec.c
-@@ -103,11 +103,14 @@
-   int optargc;
-   const char *logfile = NULL;
-   const char *authtok = NULL;
-+  char authtok_buf[PAM_MAX_RESP_SIZE+1];
-+
-   pid_t pid;
-   int fds[2];
-   int stdout_fds[2];
-   FILE *stdout_file = NULL;
- 
-+  memset(authtok_buf, 0, sizeof(authtok_buf));
-   if (argc < 1) {
-     pam_syslog (pamh, LOG_ERR,
- 		"This module needs at least one argument");
-@@ -180,12 +183,12 @@
- 	      if (resp)
- 		{
- 		  pam_set_item (pamh, PAM_AUTHTOK, resp);
--		  authtok = strndupa (resp, PAM_MAX_RESP_SIZE);
-+		  authtok = strncpy(authtok_buf, resp, sizeof(authtok_buf));
- 		  _pam_drop (resp);
- 		}
- 	    }
- 	  else
--	    authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE);
-+	    authtok = strncpy(authtok_buf, void_pass, sizeof(authtok_buf));
- 
- 	  if (pipe(fds) != 0)
- 	    {
-

From f020af824d7ced8a7972618bf64fd8382072c5a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 08:25:00 +0000
Subject: [PATCH 130/956] bup: 0.31 -> 0.32

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

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 3cd68e6ef45..3b81295ccf2 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -5,7 +5,7 @@
 
 assert par2Support -> par2cmdline != null;
 
-let version = "0.31"; in
+let version = "0.32"; in
 
 with lib;
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     repo = "bup";
     owner = "bup";
     rev = version;
-    sha256 = "03kmmdlgg0p5z39bhckkf91mmq55wghb93ghqvv9f9gaby1diw4z";
+    sha256 = "sha256-SWnEJ5jwu/Jr2NLsTS8ajWay0WX/gYbOc3J6w00DndI=";
   };
 
   buildInputs = [

From 8b442c70f5b59dc04535595243abf3557bba9985 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 08:59:05 +0000
Subject: [PATCH 131/956] crispyDoom: 5.9.2 -> 5.10.0

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

diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix
index 2b04e31f548..432600e879f 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/pkgs/games/crispy-doom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "crispy-doom";
-  version = "5.9.2";
+  version = "5.10.0";
 
   src = fetchFromGitHub {
     owner = "fabiangreffrath";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "0fkw9z66sjcz7k528wyla6mgi4impqimn93yhqmc194ycrjirraa";
+    sha256 = "sha256-hRdd5ZrcVBU7tn1juvrLdbenULzu6OsXefG0oLjjFIg=";
   };
 
   postPatch = ''

From 1510391b92482418ddb3ad5b16fc38dffaf6bcc9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 09:23:00 +0000
Subject: [PATCH 132/956] chkrootkit: 0.53 -> 0.54

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

diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix
index 5753784542d..f9f0dd96a11 100644
--- a/pkgs/tools/security/chkrootkit/default.nix
+++ b/pkgs/tools/security/chkrootkit/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "chkrootkit-0.53";
+  name = "chkrootkit-0.54";
 
   src = fetchurl {
     url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz";
-    sha256 = "1da5ry3p7jb6xs6xlfml1ly09q2rs5q6n5axif17d29k7gixlqkj";
+    sha256 = "sha256-FUySaSH1PbYHKKfLyXyohli2lMFLfSiO/jg+CEmRVgc=";
   };
 
   # TODO: a lazy work-around for linux build failure ...

From a299826a27d7c059f06fdbc80fccf27cb025eeab Mon Sep 17 00:00:00 2001
From: Justus K <justus.k@protonmail.com>
Date: Tue, 19 Jan 2021 10:55:54 +0100
Subject: [PATCH 133/956] cargo-binutils: init at 0.3.3

---
 .../tools/rust/cargo-binutils/Cargo.lock      | 419 ++++++++++++++++++
 .../tools/rust/cargo-binutils/default.nix     |  29 ++
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 449 insertions(+)
 create mode 100644 pkgs/development/tools/rust/cargo-binutils/Cargo.lock
 create mode 100644 pkgs/development/tools/rust/cargo-binutils/default.nix

diff --git a/pkgs/development/tools/rust/cargo-binutils/Cargo.lock b/pkgs/development/tools/rust/cargo-binutils/Cargo.lock
new file mode 100644
index 00000000000..a1e4cdde3b8
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-binutils/Cargo.lock
@@ -0,0 +1,419 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "addr2line"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "backtrace"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "cargo-binutils"
+version = "0.3.3"
+dependencies = [
+ "anyhow",
+ "cargo_metadata",
+ "clap",
+ "regex",
+ "rustc-cfg",
+ "rustc-demangle",
+ "rustc_version",
+ "serde",
+ "toml",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3a567c24b86754d629addc2db89e340ac9398d07b5875efcff837e3878e17ec"
+dependencies = [
+ "semver 0.10.0",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "failure"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
+dependencies = [
+ "backtrace",
+ "failure_derive",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "gimli"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+dependencies = [
+ "adler",
+ "autocfg",
+]
+
+[[package]]
+name = "object"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+
+[[package]]
+name = "rustc-cfg"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ad221fe7cd09334f8735dcc157b1178e343f43dfaefcd1b09d7fd4fc0921b6f"
+dependencies = [
+ "failure",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
+dependencies = [
+ "semver-parser",
+ "serde",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "syn"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicode-xid",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix
new file mode 100644
index 00000000000..b79611ff5ec
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-binutils/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform, runCommand }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-binutils";
+  version = "0.3.3";
+
+  # Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99
+  src = let
+    repo = fetchFromGitHub {
+      owner = "rust-embedded";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo=";
+    };
+  in runCommand "source" { } ''
+    cp -R ${repo} $out
+    chmod -R +w $out
+    cp ${./Cargo.lock} $out/Cargo.lock
+  '';
+
+  cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw=";
+
+  meta = with lib; {
+    description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain";
+    homepage = "https://github.com/rust-embedded/cargo-binutils";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ stupremee ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97a3bf3a330..9e798fd4254 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10261,6 +10261,7 @@ in
   cargo-asm = callPackage ../development/tools/rust/cargo-asm {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
+  cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { };
   cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { };
   cargo-cache = callPackage ../development/tools/rust/cargo-cache {
     inherit (darwin.apple_sdk.frameworks) Security;

From f1a052390e2083a668bfd2d235590a77950641bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 10:14:03 +0000
Subject: [PATCH 134/956] cdk: 5.0-20200923 -> 5.0-20210109

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

diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 4613eefd3b9..a95e22645cb 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "cdk";
-  version ="5.0-20200923";
+  version ="5.0-20210109";
 
   buildInputs = [
     ncurses
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz"
       "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz"
     ];
-    sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0";
+    sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY=";
   };
 
   meta = with stdenv.lib; {

From c37e8d19e3d0ea4ba04ecd08c1675b33e249cb72 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 10:21:47 +0000
Subject: [PATCH 135/956] cargo-release: 0.13.8 -> 0.13.10

---
 pkgs/tools/package-management/cargo-release/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index d2a13305292..7a900860110 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-release";
-  version = "0.13.8";
+  version = "0.13.10";
 
   src = fetchFromGitHub {
     owner = "sunng87";
     repo = "cargo-release";
     rev = "v${version}";
-    sha256 = "16v93k8d1aq0as4ab1i972bjw410k07gb3s6xdzb1r019gxg2i2h";
+    sha256 = "sha256-WWU+aNMNOOstHiGRE5nj2biWCL3uwyqJKgt0xCAfS0s=";
   };
 
-  cargoSha256 = "1jbp8jbpxnchzinjzv36crszdipxp1myknmrxn7r0ijfjdpigk9r";
+  cargoSha256 = "sha256-G3UgcFW0WxvCYRvHCTuRpSCOT3XdvdZCN53HhpWQxS4=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]

From f19581d0ee258bb32437827784e90a473843a949 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 10:30:06 +0000
Subject: [PATCH 136/956] enlightenment.evisum: 0.5.8 -> 0.5.9

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

diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix
index e4b2a7ac205..8222c6ed843 100644
--- a/pkgs/desktops/enlightenment/evisum/default.nix
+++ b/pkgs/desktops/enlightenment/evisum/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evisum";
-  version = "0.5.8";
+  version = "0.5.9";
 
   src = fetchurl {
     url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx";
+    sha256 = "sha256-ao5b4Mhr+fhY19X1g0gupcU8LayR55/kgHSwhGUAfys=";
   };
 
   nativeBuildInputs = [

From b531c7a385536a234032111d8cc442e19beffced Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 29 Dec 2020 22:07:45 +0300
Subject: [PATCH 137/956] =?UTF-8?q?cudatext:=201.118.2=20=E2=86=92=201.122?=
 =?UTF-8?q?.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applications/editors/cudatext/default.nix | 12 +++----
 pkgs/applications/editors/cudatext/deps.json  | 32 +++++++++----------
 .../editors/cudatext/dont-check-update.patch  | 12 -------
 3 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/applications/editors/cudatext/dont-check-update.patch

diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index bcdff1eff1f..2d9138bc32e 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -38,24 +38,20 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cudatext";
-  version = "1.118.2";
+  version = "1.122.3";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     rev = version;
-    sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm";
+    sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b";
   };
 
-  patches = [
-    # Don't check for update
-    ./dont-check-update.patch
-  ];
-
   postPatch = ''
     substituteInPlace app/proc_globdata.pas \
       --replace "/usr/share/cudatext" "$out/share/cudatext" \
-      --replace "libpython3.so" "${python3}/lib/libpython3.so"
+      --replace "libpython3.so" "${python3}/lib/libpython${python3.pythonVersion}.so" \
+      --replace "AllowProgramUpdates:= true;" "AllowProgramUpdates:= false;"
   '';
 
   nativeBuildInputs = [ lazarus fpc ]
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index fc82ec4b8d1..89f6dbc75fa 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -1,33 +1,33 @@
 {
   "EncConv": {
     "owner": "Alexey-T",
-    "rev": "2020.06.15",
-    "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3"
+    "rev": "2021.01.01",
+    "sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6"
   },
   "ATBinHex-Lazarus": {
     "owner": "Alexey-T",
-    "rev": "2020.09.05",
-    "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072"
+    "rev": "2020.11.22",
+    "sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7"
   },
   "ATFlatControls": {
     "owner": "Alexey-T",
-    "rev": "2020.11.02",
-    "sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy"
+    "rev": "2021.01.12",
+    "sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9"
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "6560bc35a2cf31399be8713ac189216afabf9f01",
-    "sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x"
+    "rev": "2021.01.19",
+    "sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1"
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
-    "rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433",
-    "sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr"
+    "rev": "2021.01.17",
+    "sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly"
   },
   "EControl": {
     "owner": "Alexey-T",
-    "rev": "2020.10.04",
-    "sha256": "0ypbaca3y5biw2207yh3x5p28gm8g51qf7glm5622w3cgbrf9mdq"
+    "rev": "2021.01.12",
+    "sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq"
   },
   "ATSynEdit_Ex": {
     "owner": "Alexey-T",
@@ -36,8 +36,8 @@
   },
   "Python-for-Lazarus": {
     "owner": "Alexey-T",
-    "rev": "2020.10.23",
-    "sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn"
+    "rev": "2021.01.16",
+    "sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5"
   },
   "Emmet-Pascal": {
     "owner": "Alexey-T",
@@ -46,8 +46,8 @@
   },
   "CudaText-lexers": {
     "owner": "Alexey-T",
-    "rev": "2020.08.10",
-    "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6"
+    "rev": "2021.01.16",
+    "sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh"
   },
   "bgrabitmap": {
     "owner": "bgrabitmap",
diff --git a/pkgs/applications/editors/cudatext/dont-check-update.patch b/pkgs/applications/editors/cudatext/dont-check-update.patch
deleted file mode 100644
index 5c896bc046c..00000000000
--- a/pkgs/applications/editors/cudatext/dont-check-update.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git i/app/formmain.pas w/app/formmain.pas
-index f6f37febb..cf993d75e 100644
---- i/app/formmain.pas
-+++ w/app/formmain.pas
-@@ -2156,6 +2156,7 @@ begin
-     false
-     {$endif};
-     *)
-+  mnuHelpCheckUpd.Enabled:=false;
- 
-   with AppPanels[cPaneSide] do
-   begin

From 3d4bd8b8c538bd50b07e155d0bc8bd3373a88b0f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 10:40:19 +0000
Subject: [PATCH 138/956] eksctl: 0.35.0 -> 0.36.0

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

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 54d78d8fab7..2c5dca4a2fa 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.35.0";
+  version = "0.36.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "0l4wlg6x074slndkihvwdvw4frsyzwxfqm1pkzqwc3x8awa9nlbv";
+    sha256 = "sha256-wjYO/tu+QrztGPvtz3YBZJ7/e+9TDEwJ542xIBuNaQo=";
   };
 
-  vendorSha256 = "0sfx8x1iwdqwbyiid5hc9wiwjc16aig8vplpjlqxkmcvig8qlwff";
+  vendorSha256 = "sha256-woEa/h6TKQD32BslmPBuILvBAObhWjT8XqnQmuweUx0=";
 
   doCheck = false;
 

From 1771e8810e854869f83d411fd9d6b5ddb14c7d1b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 10:44:27 +0000
Subject: [PATCH 139/956] dpic: 2020.09.15 -> 2021.01.01

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

diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix
index c0dc7661715..fa6880f6f91 100644
--- a/pkgs/tools/graphics/dpic/default.nix
+++ b/pkgs/tools/graphics/dpic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dpic";
-  version = "2020.09.15";
+  version = "2021.01.01";
 
   src = fetchurl {
     url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";
-    sha256 = "0gmmp4dlir3bn892nm55a3q8cfsj8yg7fp1dixmhsdhsrgmg1b83";
+    sha256 = "sha256-vrBiTQqdaIslDd/WWMbdgornRkZmC2m+RF2J78F5Pm8=";
   };
 
   # The prefix passed to configure is not used.

From 1548abff2595964eab11884042557d03723cadc3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 10:58:29 +0000
Subject: [PATCH 140/956] eclipse-mat: 1.10.0.20200225 -> 1.11.0.20201202

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

diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix
index e424c5ce70b..025b7413ceb 100644
--- a/pkgs/development/tools/eclipse-mat/default.nix
+++ b/pkgs/development/tools/eclipse-mat/default.nix
@@ -21,7 +21,7 @@
 
 with lib;
 let
-  pVersion = "1.10.0.20200225";
+  pVersion = "1.11.0.20201202";
   pVersionTriple = splitVersion pVersion;
   majorVersion = elemAt pVersionTriple 0;
   minorVersion = elemAt pVersionTriple 1;
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip";
-    sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx";
+    sha256 = "sha256-HtIKcGfdjb2wovGGSxv16ud7y1cPQFBn77pkhiekAkI=";
   };
 
   desktopItem = makeDesktopItem {

From a196b0c291cea70f96d38a130167533a3be4c684 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 11:24:55 +0000
Subject: [PATCH 141/956] diffstat: 1.63 -> 1.64

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

diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix
index b558386536e..c8ff1e973a5 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/pkgs/tools/text/diffstat/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "diffstat-1.63";
+  name = "diffstat-1.64";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/diffstat/${name}.tgz"
       "https://invisible-mirror.net/archives/diffstat/${name}.tgz"
     ];
-    sha256 = "0vyw200s5dv1257pmrh6c6fdkmw3slyz5szpqfx916xr04sdbpby";
+    sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w=";
   };
 
   meta = with lib; {

From 9509da46e79015088f7e5724f1c31b348ecdf179 Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 00:52:53 +0800
Subject: [PATCH 142/956] fcitx5-qt: fix missing
 libfcitx5platforminputcontextplugin.so

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index e0499304889..ad4fd1fa617 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -7,6 +7,7 @@
 , qtx11extras
 , libxcb
 , libXdmcp
+, qtbase
 }:
 
 mkDerivation rec {
@@ -20,8 +21,14 @@ mkDerivation rec {
     sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM=";
   };
 
+  preConfigure = ''
+    substituteInPlace qt5/platforminputcontext/CMakeLists.txt \
+      --replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix}
+  '';
+
   cmakeFlags = [
     "-DENABLE_QT4=0"
+    "-DENABLE_QT6=0"
   ];
 
   nativeBuildInputs = [
@@ -34,6 +41,7 @@ mkDerivation rec {
     qtx11extras
     libxcb
     libXdmcp
+    qtbase
   ];
 
   meta = with lib; {

From 61615cc4ea7cb87e184a673d05a3201963c6a16c Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 00:53:58 +0800
Subject: [PATCH 143/956] fcitx5-with-addons: patch .desktop files

---
 pkgs/tools/inputmethods/fcitx5/with-addons.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
index 854020effea..2ee363f4fec 100644
--- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
@@ -12,6 +12,14 @@ symlinkJoin {
       --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
       --suffix XDG_DATA_DIRS : "$out/share" \
       --suffix PATH : "$out/bin"
+
+    desktop=share/applications/org.fcitx.Fcitx5.desktop
+    autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop
+    rm $out/$desktop
+    rm $out/$autostart
+    cp ${fcitx5}/$desktop $out/$desktop
+    sed -i $out/$desktop -e "s|^Exec=.*|Exec=$out/bin/fcitx5|g"
+    cp $out/$desktop $out/$autostart
   '';
 
   meta = fcitx5.meta;

From 9e58c856a0f73529bef7b0c260c9c3290b02b85a Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 10:20:50 +0800
Subject: [PATCH 144/956] fcitx5-with-addons: symlink .desktop to autostart

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/tools/inputmethods/fcitx5/with-addons.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
index 2ee363f4fec..17501d5f362 100644
--- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
@@ -19,7 +19,7 @@ symlinkJoin {
     rm $out/$autostart
     cp ${fcitx5}/$desktop $out/$desktop
     sed -i $out/$desktop -e "s|^Exec=.*|Exec=$out/bin/fcitx5|g"
-    cp $out/$desktop $out/$autostart
+    ln -s $out/$desktop $out/$autostart
   '';
 
   meta = fcitx5.meta;

From a6123808ccfd590ed5a3fd9fe4aacb18a1ddb51e Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 10:33:18 +0800
Subject: [PATCH 145/956] fcitx5-with-addons: remove unnecessary qtbase from
 buildInputs

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index ad4fd1fa617..30b08a13ade 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -41,7 +41,6 @@ mkDerivation rec {
     qtx11extras
     libxcb
     libXdmcp
-    qtbase
   ];
 
   meta = with lib; {

From 4ab22d3b81f71789afdff5733e30ce562448ce1d Mon Sep 17 00:00:00 2001
From: Andy Richardson <andy.john.richardson@gmail.com>
Date: Tue, 19 Jan 2021 11:31:47 +0000
Subject: [PATCH 146/956] vscode-extensions.mikestead.dotenv: Init at 1.0.1

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index ae34596fc71..0b31f067243 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -333,6 +333,18 @@ let
         };
       };
 
+      mikestead.dotenv = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "dotenv";
+          publisher = "mikestead";
+          version = "1.0.1";
+          sha256 = "sha256-dieCzNOIcZiTGu4Mv5zYlG7jLhaEsJR05qbzzzQ7RWc=";
+        };
+        meta = {
+          license = lib.licenses.mit;
+        };
+      };
+
       mskelton.one-dark-theme = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "one-dark-theme";

From 6f7fe093973640dd66f33ea5758f7d0f383229d5 Mon Sep 17 00:00:00 2001
From: Andy Richardson <andy.john.richardson@gmail.com>
Date: Tue, 19 Jan 2021 11:34:24 +0000
Subject: [PATCH 147/956] vscode-extensions.graphql.vscode-graphql: Init at
 0.3.13

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index ae34596fc71..4464ec7ab04 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -268,6 +268,18 @@ let
         };
       };
 
+      graphql.vscode-graphql = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-graphql";
+          publisher = "GraphQL";
+          version = "0.3.13";
+          sha256 = "sha256-JjEefVHQUYidUsr8Ce/dh7hLDm21WkyS+2RwsXHoY04=";
+        };
+        meta = {
+          license = lib.licenses.mit;
+        };
+      };
+
       haskell.haskell = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "haskell";

From 2ed911999cacb93c8ebc6ca51c013ccb680f1aeb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 12:17:33 +0000
Subject: [PATCH 148/956] dumb-init: 1.2.4 -> 1.2.5

---
 pkgs/applications/virtualization/dumb-init/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/applications/virtualization/dumb-init/default.nix
index 80a76432f08..bb265dc5488 100644
--- a/pkgs/applications/virtualization/dumb-init/default.nix
+++ b/pkgs/applications/virtualization/dumb-init/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dumb-init";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0v6ggfjl3q5p4hf002ygs8rryyzrg0fqy836p403fq2fgm30k0xx";
+    sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs=";
   };
 
   buildInputs = [ glibc.static ];

From 101d42849dfa2edaf8d2180c1cf49fb727856e9c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 19 Jan 2021 13:25:15 +0100
Subject: [PATCH 149/956] chromiumBeta: 88.0.4324.87 -> 88.0.4324.96

---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index eb5baf1902e..69ab7e71067 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
     }
   },
   "beta": {
-    "version": "88.0.4324.87",
-    "sha256": "0pfrx8b2rmrxx5dfv4kc1ggrgi7kj7gbxrzqzd7rsvjpasyidbxg",
-    "sha256bin64": "07xl02zg5pi89l6dqrbqx2ibl8pm9v6njqfl8p4l2hwsb881hx8g",
+    "version": "88.0.4324.96",
+    "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9",
+    "sha256bin64": "1v7bpidqs8y3k7kzfp52q8xsdc515mnf9arfw9pp5bsp79fl3rik",
     "deps": {
       "gn": {
         "version": "2020-11-05",

From 449100b24a9db5f276b7ad066acc096d0918e836 Mon Sep 17 00:00:00 2001
From: Samir Hafez <me@samirhafez.com>
Date: Mon, 4 Jan 2021 12:13:53 +0000
Subject: [PATCH 150/956] yaml-language-server: Fails to start due to missing
 `prettier` dependency

---
 pkgs/development/node-packages/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index c8694a46bd1..ea105b452ad 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -258,5 +258,13 @@ let
         echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
       '';
     };
+
+    yaml-language-server = super.yaml-language-server.override {
+      nativeBuildInputs = [ pkgs.makeWrapper ];
+      postInstall = ''
+        wrapProgram "$out/bin/yaml-language-server" \
+        --prefix NODE_PATH : ${self.prettier}/lib/node_modules
+      '';
+    };
   };
 in self

From 83db53885769c2e888c764438d81b391eb0b52b8 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 19 Jan 2021 13:50:35 +0100
Subject: [PATCH 151/956] gnomeExtensions.dynamic-panel-transparency: init at
 35

---
 .../dynamic-panel-transparency/default.nix    | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix

diff --git a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix
new file mode 100644
index 00000000000..bf637ecab18
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix
@@ -0,0 +1,38 @@
+{ lib, stdenv, fetchFromGitHub, gnome3, glib }:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-shell-extension-dynamic-panel-transparency";
+  version = "35";
+
+  src = fetchFromGitHub {
+    owner = "ewlsh";
+    repo = "dynamic-panel-transparency";
+    rev = "0800c0a921bb25f51f6a5ca2e6981b1669a69aec";
+    sha256 = "0200mx861mlsi9lf7h108yam02jfqqw55r521chkgmk4fy6z99pq";
+  };
+
+  uuid = "dynamic-panel-transparency@rockon999.github.io";
+
+  nativeBuildInputs = [ glib ];
+
+  buildPhase = ''
+    runHook preBuild
+    glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/gnome-shell/extensions/${uuid}
+    cp -r ${uuid} $out/share/gnome-shell/extensions
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "This extension fades your top panel to nothingness when there are no maximized windows present";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ rhoriguchi ];
+    homepage = "https://github.com/ewlsh/dynamic-panel-transparency";
+    broken = versionOlder gnome3.gnome-shell.version "3.36";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 182c6f90454..2146d74a35c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27264,6 +27264,7 @@ in
     dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
     draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { };
     drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
+    dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { };
     easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { };
     emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { };
     freon = callPackage ../desktops/gnome-3/extensions/freon { };

From c946e9c8db1427ec30ed0356066545e3863f0c8e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 19 Jan 2021 13:50:40 +0100
Subject: [PATCH 152/956] tangram: Use pkg-config instead of pkgconfig

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

diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix
index 0985f74b915..e7ca8c320ac 100644
--- a/pkgs/applications/networking/instant-messengers/tangram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, appstream-glib, desktop-file-utils, gdk-pixbuf
 , gettext, gjs, glib, gobject-introspection, gsettings-desktop-schemas, gtk3
-, hicolor-icon-theme, meson, ninja, pkgconfig, python3, webkitgtk, wrapGAppsHook
+, hicolor-icon-theme, meson, ninja, pkg-config, python3, webkitgtk, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     wrapGAppsHook
   ];

From 956f1a8e711d1991c87202961e9e2ec568523877 Mon Sep 17 00:00:00 2001
From: Yannick Markus <ym@ymarkus.dev>
Date: Mon, 18 Jan 2021 12:00:17 +0100
Subject: [PATCH 153/956] rpi-imager: init at 1.5

---
 pkgs/tools/misc/rpi-imager/default.nix        | 55 +++++++++++++++++++
 .../tools/misc/rpi-imager/lsblkCheckFix.patch | 16 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 73 insertions(+)
 create mode 100644 pkgs/tools/misc/rpi-imager/default.nix
 create mode 100644 pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch

diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix
new file mode 100644
index 00000000000..a18a8d6d38d
--- /dev/null
+++ b/pkgs/tools/misc/rpi-imager/default.nix
@@ -0,0 +1,55 @@
+{ mkDerivation,
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  curl,
+  libarchive,
+  util-linux,
+  qtbase,
+  qtdeclarative,
+  qtsvg,
+  qttools,
+  qtquickcontrols2,
+  qtgraphicaleffects
+}:
+
+mkDerivation rec {
+  pname = "rpi-imager";
+  version = "1.5";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0596c7rpkykmjr3gsz9yczqsj7fzq04kc97s0rqkygjnwiqh2rwz";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    curl
+    libarchive
+    util-linux
+    qtbase
+    qtdeclarative
+    qtsvg
+    qttools
+    qtquickcontrols2
+    qtgraphicaleffects
+  ];
+
+  /* By default, the builder checks for JSON support in lsblk by running "lsblk --json",
+    but that throws an error, as /sys/dev doesn't exist in the sandbox.
+    This patch removes the check. */
+  patches = [ ./lsblkCheckFix.patch ];
+
+  meta = with lib; {
+    description = "Raspberry Pi Imaging Utility";
+    homepage = "https://www.raspberrypi.org/software/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ymarkus ];
+    platforms = platforms.all;
+    # does not build on darwin
+    broken = stdenv.isDarwin;
+  };
+}
diff --git a/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch
new file mode 100644
index 00000000000..98fd2a659dc
--- /dev/null
+++ b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d7fc79..8ce72b9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,11 +229,6 @@ else()
+         if (NOT LSBLK)
+             message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)")
+         endif()
+-
+-        execute_process(COMMAND "${LSBLK}" "--json" RESULT_VARIABLE ret)
+-        if (ret EQUAL "1")
+-            message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)")
+-        endif()
+     endif()
+ 
+     configure_file(
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cb8685d773..6824ab5611a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7439,6 +7439,8 @@ in
 
   rpPPPoE = callPackage ../tools/networking/rp-pppoe { };
 
+  rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { };
+
   rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { };
 
   rpm = callPackage ../tools/package-management/rpm {

From af2a8552a093eb2e9cf52150ef57e65aef8cd868 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 19 Jan 2021 22:06:30 +0800
Subject: [PATCH 154/956] rust-analyzer: 2021-01-04 -> 2021-01-18

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

diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index a031d552253..8ff596d475c 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -2,10 +2,10 @@
 
 {
   rust-analyzer-unwrapped = callPackage ./generic.nix rec {
-    rev = "2021-01-04";
+    rev = "2021-01-18";
     version = "unstable-${rev}";
-    sha256 = "sha256-VRnmx5SfmdMIVQjixWBSaMioqFUlo9VOIKsPvC5t3t4=";
-    cargoSha256 = "sha256-X63FjFpfwjvQayw4X6Sqfyh4FHsc3flE3OtQpzqowjc=";
+    sha256 = "sha256-eFiZdFBJZuBfwH8tqZTayNaWiq8fWUzlzBRRvdPbmW8=";
+    cargoSha256 = "sha256-rRoo0TrXa03okJ8wktzVSAn8tRO1d9kcDprotZ1hZ6w=";
   };
 
   rust-analyzer = callPackage ./wrapper.nix {} {

From 6de3a588334fd8fe0c0c4f2b42d4091a81758f8c Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 19 Jan 2021 13:10:44 +0100
Subject: [PATCH 155/956] emacs-modes: Add missing 'lib' arguments

---
 pkgs/applications/editors/emacs-modes/cedet/default.nix         | 2 +-
 .../editors/emacs-modes/ess-R-object-popup/default.nix          | 2 +-
 pkgs/applications/editors/emacs-modes/helm-words/default.nix    | 2 +-
 pkgs/applications/editors/emacs-modes/hsc3/default.nix          | 2 +-
 pkgs/applications/editors/emacs-modes/org-mac-link/default.nix  | 2 +-
 .../editors/emacs-modes/perl-completion/default.nix             | 2 +-
 pkgs/applications/editors/emacs-modes/prolog/default.nix        | 2 +-
 pkgs/applications/editors/emacs-modes/railgun/default.nix       | 2 +-
 pkgs/applications/editors/emacs-modes/rect-mark/default.nix     | 2 +-
 .../editors/emacs-modes/sunrise-commander/default.nix           | 2 +-
 pkgs/applications/editors/emacs-modes/tramp/default.nix         | 2 +-
 pkgs/applications/editors/emacs-modes/zeitgeist/default.nix     | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix
index 9ba9e070d08..18dcef129cc 100644
--- a/pkgs/applications/editors/emacs-modes/cedet/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, emacs, python }:
+{ lib, fetchurl, stdenv, emacs, python }:
 
 stdenv.mkDerivation rec {
   name = "cedet-1.1";
diff --git a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
index 5eb81197c8b..a92471a9493 100644
--- a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   name = "ess-R-object-popup-20130302";
diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
index a8a1274737a..0678492500d 100644
--- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix
+++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   name = "helm-words-20190917";
diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
index 972d3b8a6f9..3b20326d96f 100644
--- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs }:
+{ lib, stdenv, fetchurl, emacs }:
 
 # this package installs the emacs-mode which
 # resides in the hsc3 sources.
diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
index dba6e10a590..600e44eb8ab 100644
--- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, emacs}:
+{ lib, stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation {
   name = "org-mac-link-1.2";
diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
index 815783aabea..e14e5ed8cc2 100644
--- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
+++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "perl-completion";
diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix
index 7be3b1ca3c7..deac73a194e 100644
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "prolog-mode";
diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/pkgs/applications/editors/emacs-modes/railgun/default.nix
index 4cf4d18d8cc..240a2f29edf 100644
--- a/pkgs/applications/editors/emacs-modes/railgun/default.nix
+++ b/pkgs/applications/editors/emacs-modes/railgun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   name = "railgun-2012-10-17";
diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
index d2785ef0363..1275c51b99e 100644
--- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, emacs}:
+{ lib, stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation {
   name = "rect-mark-1.4";
diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
index 710c33a96ec..412ed59f2ac 100644
--- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchgit, emacs}:
+{ lib, stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation {
   name = "sunrise-commander-6r435";
diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix
index f67efb80bf9..237c05c5fa7 100644
--- a/pkgs/applications/editors/emacs-modes/tramp/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs, texinfo }:
+{ lib, stdenv, fetchurl, emacs, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "tramp-2.4.2";
diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
index 352c46718dd..67bf7b500ff 100644
--- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
+++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs }:
+{ lib, stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation {
   name = "zeitgeist-20120221";

From 80bf06e78b1488bccb1c34602e42a6f10131e00c Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Wed, 13 Jan 2021 14:43:47 -0800
Subject: [PATCH 156/956] dune_2: 2.7.1 -> 2.8.0

---
 pkgs/development/tools/ocaml/dune/2.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index 177fa96f5b9..8183e106aa7 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, fetchpatch }:
+{ stdenv, fetchurl, ocaml, findlib }:
 
 if stdenv.lib.versionOlder ocaml.version "4.08"
 then throw "dune is not available for OCaml ${ocaml.version}"
@@ -6,25 +6,17 @@ else
 
 stdenv.mkDerivation rec {
   pname = "dune";
-  version = "2.7.1";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3";
+    sha256 = "12yly2lp93ijhy7b72p6y2q3cr3yy3hk7rlmrh072py8a6d4s407";
   };
 
   buildInputs = [ ocaml findlib ];
 
   buildFlags = "release";
 
-  patches = [
-    # Fix setup.ml configure path. Remove with the next release.
-    (fetchpatch {
-      url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch";
-      sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28";
-    })
-  ];
-
   dontAddPrefix = true;
 
   installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];

From 8605813232bea5f656315dbd40015be648ecc93e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 14:33:36 +0000
Subject: [PATCH 157/956] kcollectd: 0.11.99.0 -> 0.12.0

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

diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix
index ffc64b1455a..e38cb6f5a79 100644
--- a/pkgs/tools/misc/kcollectd/default.nix
+++ b/pkgs/tools/misc/kcollectd/default.nix
@@ -18,12 +18,12 @@
 
 mkDerivation rec {
   pname = "kcollectd";
-  version = "0.11.99.0";
+  version = "0.12.0";
   src = fetchFromGitLab {
     owner = "aerusso";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0h4ymvzihzbmyv3z0bp28g94wxc6c7lgi3my0xbka3advxr811gn";
+    sha256 = "sha256-Ihd4Ps4t9+sNB3joO3vTxDR/25t7Ecl6yvHQ15QiUdY=";
   };
 
   nativeBuildInputs = [

From 6f882ac2c443171e6dd8fd2b47af10a4757c5037 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 15:37:14 +0100
Subject: [PATCH 158/956] python3Packages.pymata-express: init at 1.19

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

diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix
new file mode 100644
index 00000000000..1a50a91a309
--- /dev/null
+++ b/pkgs/development/python-modules/pymata-express/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pymata-express";
+  version = "1.19";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "MrYsLab";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0gfjmqcxwsnfjgll6ql5xd1n3xp4klf4fcaajaivh053i02p0a79";
+  };
+
+  propagatedBuildInputs = [ pyserial ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pymata_express" ];
+
+  meta = with lib; {
+    description = "Python Asyncio Arduino Firmata Client";
+    longDescription = ''
+      Pymata-Express is a Python Firmata Protocol client. When used in conjunction
+      with an Arduino Firmata sketch, it permits you to control and monitor Arduino
+      hardware remotely over a serial link.
+    '';
+    homepage = "https://mryslab.github.io/pymata-express/";
+    license = with licenses; [ agpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8105cfbe0da..d0d63aa7f25 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5536,6 +5536,8 @@ in {
 
   pymaging_png = callPackage ../development/python-modules/pymaging_png { };
 
+  pymata-express = callPackage ../development/python-modules/pymata-express { };
+
   pymatgen = callPackage ../development/python-modules/pymatgen { };
 
   pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { };

From d02c68855785f257f8a1802e9d2b4fd524eacc30 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 14:37:16 +0000
Subject: [PATCH 159/956] jamulus: 3.6.1 -> 3.6.2

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

diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix
index 55427ccfda4..c6510f5469c 100644
--- a/pkgs/applications/audio/jamulus/default.nix
+++ b/pkgs/applications/audio/jamulus/default.nix
@@ -3,12 +3,12 @@
 
 mkDerivation rec {
   pname = "jamulus";
-  version = "3.6.1";
+  version = "3.6.2";
   src = fetchFromGitHub {
     owner = "corrados";
     repo = "jamulus";
     rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15";
+    sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4=";
   };
 
   nativeBuildInputs = [ pkg-config qmake ];

From 6f1bbb090f330cf4ef6fd8b408da3743adac35be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 15:39:44 +0100
Subject: [PATCH 160/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d057d1fbc71..c735d0b1e32 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -253,7 +253,7 @@
     "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ];
     "fints" = ps: with ps; [ fints ];
     "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota
-    "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express
+    "firmata" = ps: with ps; [ pymata-express ];
     "fitbit" = ps: with ps; [ aiohttp-cors fitbit ];
     "fixer" = ps: with ps; [ fixerio ];
     "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist

From 98873022d4265c8ed77b1e2942c46ebea5afd93a Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 19 Jan 2021 11:18:21 -0300
Subject: [PATCH 161/956] opentabletdriver: improve update.sh script

Allow it to update deb package sha256 automatically.
---
 pkgs/tools/X11/opentabletdriver/default.nix | 7 +++++--
 pkgs/tools/X11/opentabletdriver/update.sh   | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix
index dc527f47dd3..0450635b654 100644
--- a/pkgs/tools/X11/opentabletdriver/default.nix
+++ b/pkgs/tools/X11/opentabletdriver/default.nix
@@ -155,8 +155,11 @@ stdenv.mkDerivation rec {
   dontWrapGApps = true;
   dontStrip = true;
 
-  passthru.tests = {
-    otd-runs = nixosTests.opentabletdriver;
+  passthru = {
+    updateScript = ./update.sh;
+    tests = {
+      otd-runs = nixosTests.opentabletdriver;
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh
index 04fae30c05a..715857cf8f4 100755
--- a/pkgs/tools/X11/opentabletdriver/update.sh
+++ b/pkgs/tools/X11/opentabletdriver/update.sh
@@ -14,6 +14,14 @@ if [[ "$new_version" == "$old_version" ]]; then
   [[ "${1}" != "--force" ]] && exit 0
 fi
 
+# Updating the hash of deb package manually since there seems to be no way to do it automatically
+oldDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${old_version}/OpenTabletDriver.deb";
+newDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${new_version}/OpenTabletDriver.deb";
+oldDebSha256=$(nix-prefetch-url "$oldDebPkgUrl")
+newDebSha256=$(nix-prefetch-url "$newDebPkgUrl")
+echo "oldDebSha256: $oldDebSha256 newDebSha256: $newDebSha256"
+sed -i ./default.nix -re "s|\"$oldDebSha256\"|\"$newDebSha256\"|"
+
 cd ../../../..
 update-source-version opentabletdriver "$new_version"
 store_src="$(nix-build . -A opentabletdriver.src --no-out-link)"

From 3ed044408a51dd2ae8c0c059d9a1a1dde5e07b45 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 19 Jan 2021 09:11:02 -0500
Subject: [PATCH 162/956] coursier: 2.0.8 -> 2.0.9

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

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index a0f69033923..54836216c54 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -2,7 +2,7 @@
 , coreutils, git, gnused, nix, nixfmt }:
 
 let
-  version = "2.0.8";
+  version = "2.0.9";
 
   zshCompletion = fetchurl {
     url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
       "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    sha256 = "sha256-7dNJUMZu6YY3076cnjWHRisJZVn1NPRH1VC+cJjfI/8=";
+    sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c15c3e61ef78055851b9d5e47818d37483c0bd00 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 19 Jan 2021 14:17:01 +0000
Subject: [PATCH 163/956] =?UTF-8?q?minecraft:=202.2.909=20=E2=86=92=202.2.?=
 =?UTF-8?q?1262?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 462cbc48af6..1c700de7b43 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -88,11 +88,11 @@ in
 stdenv.mkDerivation rec {
   pname = "minecraft-launcher";
 
-  version = "2.2.909";
+  version = "2.2.1262";
 
   src = fetchurl {
     url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
-    sha256 = "15x2imr8c4m2bjfs9y1l34fpvixxdf09gqls4bqb4rdvj1vhdrh2";
+    sha256 = "09fklcnqmpvwykbfwg4lgwl82khr2wimvgyz7ssficm802xkicnc";
   };
 
   icon = fetchurl {

From e61e82e6c5fc7b5cd935d22f186b3d8f8f55ec27 Mon Sep 17 00:00:00 2001
From: bitmappergit <30481775+bitmappergit@users.noreply.github.com>
Date: Tue, 19 Jan 2021 10:24:30 -0400
Subject: [PATCH 164/956] maude: 3.0 -> 3.1

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

diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index e4e984fc4ac..d824d29c35c 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -4,11 +4,11 @@
 
 let
 
-  version = "3.0";
+  version = "3.1";
 
   fullMaude = fetchurl {
-    url = "http://maude.cs.illinois.edu/w/images/0/04/Full-Maude-${version}.zip";
-    sha256 = "0gf36wlkkl343vlxgryqdhxmgyn8z0cc2zayccd7ac3inmj1iayw";
+    url = "http://maude.cs.illinois.edu/w/images/0/0a/Full-Maude-${version}.zip";
+    sha256 = "8b13af02c6243116c2ef9592622ecaa06d05dbe1dd6b1e595551ff33855948f2";
   };
 
 in
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchurl {
-    url = "http://maude.cs.illinois.edu/w/images/9/92/Maude-${version}.tar.gz";
-    sha256 = "0vhn3lsck6ji9skrgm67hqrn3k4f6y442q73jbw65qqznm321k5a";
+    url = "http://maude.cs.illinois.edu/w/images/d/d3/Maude-${version}.tar.gz";
+    sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f";
   };
 
   buildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   postInstall = ''
     for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
     unzip ${fullMaude}
-    install -D -m 444 full-maude3.maude $out/share/maude/full-maude.maude
+    install -D -m 444 full-maude31.maude $out/share/maude/full-maude.maude
   '';
 
   # bison -dv surface.yy -o surface.c

From d7257afaf25edc10ad4ea808b75252a155628eb6 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 18 Jan 2021 19:36:30 -0300
Subject: [PATCH 165/956] tecoc: 20150606 -> unstable-2020-11-03

---
 pkgs/applications/editors/tecoc/default.nix | 54 +++++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index 50cad500c95..f5ad8d947c7 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -1,37 +1,47 @@
-{ lib, stdenv, fetchFromGitHub
-, ncurses }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, ncurses
+}:
 
 stdenv.mkDerivation rec {
-
-  pname = "tecoc-git";
-  version = "20150606";
+  pname = "tecoc";
+  version = "unstable-2020-11-03";
 
   src = fetchFromGitHub {
     owner = "blakemcbride";
     repo = "TECOC";
-    rev = "d7dffdeb1dfb812e579d6d3b518545b23e1b50cb";
-    sha256 = "11zfa73dlx71c0hmjz5n3wqcvk6082rpb4sss877nfiayisc0njj";
+    rev = "79fcb6cfd6c5f9759f6ec46aeaf86d5806b13a0b";
+    sha256 = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw=";
   };
 
   buildInputs = [ ncurses ];
 
   makefile = if stdenv.hostPlatform.isDarwin
-  	     then "makefile.osx"
-	     else if stdenv.hostPlatform.isFreeBSD
-  	     then "makefile.bsd"
-  	     else if stdenv.hostPlatform.isOpenBSD
-  	     then "makefile.bsd"
-  	     else if stdenv.hostPlatform.isWindows
-  	     then "makefile.win"
-	     else "makefile.linux"; # I think Linux is a safe default...
+             then "makefile.osx"
+             else if stdenv.hostPlatform.isFreeBSD
+             then "makefile.bsd"
+             else if stdenv.hostPlatform.isOpenBSD
+             then "makefile.bsd"
+             else if stdenv.hostPlatform.isWindows
+             then "makefile.win"
+             else "makefile.linux"; # I think Linux is a safe default...
 
   makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
 
+  preInstall = ''
+    install -d $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
+  '';
+
   installPhase = ''
-    mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
-    cp src/tecoc $out/bin
-    cp src/aaout.txt doc/* $out/share/doc/${pname}-${version}
-    cp lib/* lib2/* $out/lib/teco/macros
+    runHook preInstall
+    install -m755 src/tecoc $out/bin
+    install -m644 src/aaout.txt doc/* $out/share/doc/${pname}-${version}
+    install -m644 lib/* lib2/* $out/lib/teco/macros
+    runHook postInstall
+  '';
+
+  postInstall = ''
     (cd $out/bin
      ln -s tecoc Make
      ln -s tecoc mung
@@ -54,9 +64,11 @@ stdenv.mkDerivation rec {
       of Editor MACroS for TECO.
 
       TECOC is a portable C implementation of TECO-11.
- '';
+    '';
     homepage = "https://github.com/blakemcbride/TECOC";
-    license = {  url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; };
+    license = {
+      url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt";
+    };
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
   };

From 3936d85ec3015bd91e9d605b26767b3c47964851 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 19 Jan 2021 16:29:29 +0100
Subject: [PATCH 166/956] nixos/systemd: allow preStart with other ExecStartPre
 cmdlines

Declaring them as lists enables the concatenation, supporting
lib.mkBefore, lib.mkOrder, etc.

This is useful when you need to extend a service with a pre-start
script that needs to run as root.
---
 nixos/modules/system/boot/systemd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index cbf9e7b49d3..6b672c7b2eb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -263,7 +263,7 @@ let
         }
         (mkIf (config.preStart != "")
           { serviceConfig.ExecStartPre =
-              makeJobScript "${name}-pre-start" config.preStart;
+              [ (makeJobScript "${name}-pre-start" config.preStart) ];
           })
         (mkIf (config.script != "")
           { serviceConfig.ExecStart =
@@ -271,7 +271,7 @@ let
           })
         (mkIf (config.postStart != "")
           { serviceConfig.ExecStartPost =
-              makeJobScript "${name}-post-start" config.postStart;
+              [ (makeJobScript "${name}-post-start" config.postStart) ];
           })
         (mkIf (config.reload != "")
           { serviceConfig.ExecReload =

From 2c53320e4174a227226cd19ad3b3162f90a246b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 15:27:47 +0000
Subject: [PATCH 167/956] jenkins-job-builder: 3.7.0 -> 3.8.0

---
 .../python-modules/jenkins-job-builder/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 3cc2bb69e0e..371fd4b8830 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "jenkins-job-builder";
-  version = "3.7.0";
+  version = "3.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bca1f458206fc8be82d790685b603d4158e2034a651f2e148e31526984b9d551";
+    sha256 = "sha256-uRyeRP1y3GS7tXb0kHLBi7+trJRme/Ke3xgOY+LqZ6k=";
   };
 
   postPatch = ''

From c6f1f30548bc4924c745500e43f243ebf6fbc50c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 16:15:16 +0100
Subject: [PATCH 168/956] python3Packages.aioflo: init at 0.4.2

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

diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix
new file mode 100644
index 00000000000..60288178def
--- /dev/null
+++ b/pkgs/development/python-modules/aioflo/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, aiohttp
+, aresponses
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-aiohttp
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "aioflo";
+  version = "0.4.2";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "bachya";
+    repo = pname;
+    rev = version;
+    sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz";
+  };
+
+  nativeBuildInputs = [ poetry-core ];
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  checkInputs = [
+    aresponses
+    pytest-aiohttp
+    pytest-asyncio
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aioflo" ];
+
+  meta = with lib; {
+    description = "Python library for Flo by Moen Smart Water Detectors";
+    homepage = "https://github.com/bachya/aioflo";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 17a9808f66c..6f7d4bcde94 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -214,6 +214,8 @@ in {
 
   aiofiles = callPackage ../development/python-modules/aiofiles { };
 
+  aioflo = callPackage ../development/python-modules/aioflo { };
+
   aioftp = callPackage ../development/python-modules/aioftp { };
 
   aioguardian = callPackage ../development/python-modules/aioguardian { };

From e286885b0f2a45f42ef1d99cb5632bbb11de9b7a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 16:16:18 +0100
Subject: [PATCH 169/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d057d1fbc71..609bac0ec44 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -260,7 +260,7 @@
     "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit
     "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant
     "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick
-    "flo" = ps: with ps; [ ]; # missing inputs: aioflo
+    "flo" = ps: with ps; [ aioflo ];
     "flock" = ps: with ps; [ ];
     "flume" = ps: with ps; [ ]; # missing inputs: pyflume
     "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou

From a1bb960c13a05c95821a5f44a09881f21325a475 Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Tue, 19 Jan 2021 10:57:30 -0500
Subject: [PATCH 170/956] kakounePlugins.quickscope-kak: Fix stdenv.lib -> lib
 breakage

---
 pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix
index deeaa8a9f15..8e60e17e792 100644
--- a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix
+++ b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, lua5_3 }:
+{ lib, stdenv, fetchgit, lua5_3 }:
 
 stdenv.mkDerivation rec {
   pname = "quickscope-kak";

From 4c2363851fa5ccd48b5eae83ae08342111653c95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 16:21:09 +0000
Subject: [PATCH 171/956] java-service-wrapper: 3.5.43 -> 3.5.45

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

diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix
index 8c87f64d745..4d1417b4b83 100644
--- a/pkgs/tools/system/java-service-wrapper/default.nix
+++ b/pkgs/tools/system/java-service-wrapper/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "java-service-wrapper";
-  version = "3.5.43";
+  version = "3.5.45";
 
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
-    sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b";
+    sha256 = "sha256-rnlloa0DicWT1RlP2szDvBINvT5/RZ17GOarUzvX1AI=";
   };
 
   buildInputs = [ jdk ];

From 313ee6bd963a2136479c30199e97f1e942eee003 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 19 Jan 2021 11:33:01 -0300
Subject: [PATCH 172/956] opentabletdriver: 0.4.2 -> 0.5.0

---
 nixos/tests/opentabletdriver.nix            | 13 ++++----
 pkgs/tools/X11/opentabletdriver/default.nix | 10 +++----
 pkgs/tools/X11/opentabletdriver/deps.nix    | 33 +++++++++------------
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/nixos/tests/opentabletdriver.nix b/nixos/tests/opentabletdriver.nix
index 832d4c25a54..fe345a7bec7 100644
--- a/nixos/tests/opentabletdriver.nix
+++ b/nixos/tests/opentabletdriver.nix
@@ -1,4 +1,6 @@
-import ./make-test-python.nix ( { pkgs, ... }: {
+import ./make-test-python.nix ( { pkgs, ... }: let
+  testUser = "alice";
+in {
   name = "opentabletdriver";
   meta = {
     maintainers = with pkgs.lib.maintainers; [ thiagokokada ];
@@ -10,7 +12,7 @@ import ./make-test-python.nix ( { pkgs, ... }: {
         ./common/user-account.nix
         ./common/x11.nix
       ];
-      test-support.displayManager.auto.user = "alice";
+      test-support.displayManager.auto.user = testUser;
       hardware.opentabletdriver.enable = true;
     };
 
@@ -18,10 +20,11 @@ import ./make-test-python.nix ( { pkgs, ... }: {
     ''
       machine.start()
       machine.wait_for_x()
-      machine.wait_for_unit("opentabletdriver.service", "alice")
+      machine.wait_for_unit("opentabletdriver.service", "${testUser}")
 
-      machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules")
+      machine.succeed("cat /etc/udev/rules.d/99-opentabletdriver.rules")
       # Will fail if service is not running
-      machine.succeed("otd detect")
+      # Needs to run as the same user that started the service
+      machine.succeed("su - ${testUser} -c 'otd detect'")
     '';
 })
diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix
index 0450635b654..6955f36b8f1 100644
--- a/pkgs/tools/X11/opentabletdriver/default.nix
+++ b/pkgs/tools/X11/opentabletdriver/default.nix
@@ -23,18 +23,18 @@
 
 stdenv.mkDerivation rec {
   pname = "OpenTabletDriver";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "InfinityGhost";
     repo = "OpenTabletDriver";
     rev = "v${version}";
-    sha256 = "048y7gjlk2yw4vh62px1d9w0va6ap1a0cndcpbirlyj9q6b8jxax";
+    sha256 = "1xi97nn5zb4fs3pyyqznvxnz07j30j3p967s7jigjmlm9321vkqp";
   };
 
   debPkg = fetchurl {
     url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb";
-    sha256 = "13gg0dhvjy88h9lhcrp30fjiwgb9dzjsgk1k760pi1ki71a5vz2r";
+    sha256 = "06m2g5qvc02ga9f98f2ssa7wr2b7b2qm90qwaf17fz5z8rr0qmp0";
   };
 
   nativeBuildInputs = [
@@ -134,8 +134,8 @@ stdenv.mkDerivation rec {
     install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps
 
     # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead
-    dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules
-    install -Dm644 ./usr/lib/udev/rules.d/30-opentabletdriver.rules -t $out/lib/udev/rules.d
+    dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/99-opentabletdriver.rules
+    install -Dm644 ./usr/lib/udev/rules.d/99-opentabletdriver.rules -t $out/lib/udev/rules.d
 
     runHook postInstall
   '';
diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix
index 34d2981cff5..ccb7097153b 100644
--- a/pkgs/tools/X11/opentabletdriver/deps.nix
+++ b/pkgs/tools/X11/opentabletdriver/deps.nix
@@ -11,13 +11,13 @@
   })
   (fetchNuGet {
     name = "Eto.Forms";
-    version = "2.5.6";
-    sha256 = "035ny8jlanchwq16gcq0xb6ywabjl71c7qbpv26sjwg96na8vz51";
+    version = "2.5.10";
+    sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7";
   })
   (fetchNuGet {
     name = "Eto.Platform.Gtk";
-    version = "2.5.6";
-    sha256 = "1ijkjd3lc7x59yk369kxipzgk1zhyr9g6k319wc0n033vij26mwl";
+    version = "2.5.10";
+    sha256 = "1pkqvlfx7bzracnw19bl50i9jg4ym376vihmy9qq7m5z5nfdqn4g";
   })
   (fetchNuGet {
     name = "GdkSharp";
@@ -41,8 +41,8 @@
   })
   (fetchNuGet {
     name = "HidSharpCore";
-    version = "1.1.0";
-    sha256 = "122s5j3wrv8hcgnbxrnjqydvcfz7gdm8xq0wlwzrgwdjk44lr45a";
+    version = "1.2.1";
+    sha256 = "0vcw38skr9g691gxbzv3cf6y9rk11vh5pvcyjshdgii2z1z8a4g2";
   })
   (fetchNuGet {
     name = "MessagePack.Annotations";
@@ -120,9 +120,9 @@
     sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5";
   })
   (fetchNuGet {
-    name = "Newtonsoft.Json";
-    version = "12.0.3";
-    sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x";
+    name = "Octokit";
+    version = "0.48.0";
+    sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8";
   })
   (fetchNuGet {
     name = "PangoSharp";
@@ -204,6 +204,11 @@
     version = "4.3.2";
     sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c";
   })
+  (fetchNuGet {
+    name = "SharpZipLib";
+    version = "1.3.1";
+    sha256 = "09zypjfils38143da507s5fi4hzvdlz32wfav219hksnpl35y8x0";
+  })
   (fetchNuGet {
     name = "StreamJsonRpc";
     version = "2.6.121";
@@ -229,11 +234,6 @@
     version = "2.0.0-beta1.20253.1";
     sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r";
   })
-  (fetchNuGet {
-    name = "System.CommandLine";
-    version = "2.0.0-beta1.20303.1";
-    sha256 = "0isnz8ipqlqim06hf56zlaq2vnsy5facvf5nvq6kzm5h1dm3l2vn";
-  })
   (fetchNuGet {
     name = "System.ComponentModel.Annotations";
     version = "4.7.0";
@@ -319,11 +319,6 @@
     version = "4.3.0";
     sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p";
   })
-  (fetchNuGet {
-    name = "System.Numerics.Vectors";
-    version = "4.5.0";
-    sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59";
-  })
   (fetchNuGet {
     name = "System.Reflection.Emit.Lightweight";
     version = "4.6.0";

From 04946f42468a8698c0c42aad9086c4671949916a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 19 Jan 2021 18:14:29 +0100
Subject: [PATCH 173/956] nixos/vault: extraConfigPaths -> extraSettingsPaths

Align with RFC42 language, even if in advance of the actual settings
attribute.
---
 nixos/modules/services/security/vault.nix | 8 ++++----
 nixos/tests/vault-postgresql.nix          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index c2b714d7c26..5a20f6413b1 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -28,7 +28,7 @@ let
     ${cfg.extraConfig}
   '';
 
-  allConfigPaths = [configFile] ++ cfg.extraConfigPaths;
+  allConfigPaths = [configFile] ++ cfg.extraSettingsPaths;
 
   configOptions = escapeShellArgs (concatMap (p: ["-config" p]) allConfigPaths);
 
@@ -95,7 +95,7 @@ in
           Confidential values should not be specified here because this option's
           value is written to the Nix store, which is publicly readable.
           Provide credentials and such in a separate file using
-          <xref linkend="opt-services.vault.extraConfigPaths"/>.
+          <xref linkend="opt-services.vault.extraSettingsPaths"/>.
         '';
       };
 
@@ -111,7 +111,7 @@ in
         description = "Extra text appended to <filename>vault.hcl</filename>.";
       };
 
-      extraConfigPaths = mkOption {
+      extraSettingsPaths = mkOption {
         type = types.listOf types.path;
         default = [];
         description = ''
@@ -134,7 +134,7 @@ in
             ${"''"};
             user = "vault";
           };
-          services.vault.extraConfigPaths = ["/run/keys/vault.hcl"];
+          services.vault.extraSettingsPaths = ["/run/keys/vault.hcl"];
           services.vault.storageBackend = "postgresql";
           users.users.vault.extraGroups = ["keys"];
           ]]></programlisting>
diff --git a/nixos/tests/vault-postgresql.nix b/nixos/tests/vault-postgresql.nix
index 185a9515d61..daa71976338 100644
--- a/nixos/tests/vault-postgresql.nix
+++ b/nixos/tests/vault-postgresql.nix
@@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
     environment.systemPackages = [ pkgs.vault ];
     environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
     services.vault.enable = true;
-    services.vault.extraConfigPaths = [ "/run/vault.hcl" ];
+    services.vault.extraSettingsPaths = [ "/run/vault.hcl" ];
 
     systemd.services.vault = {
       after = [

From 983f28360067fa28f732dacd151892f8a74238bd Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 13 Mar 2020 13:52:27 +0100
Subject: [PATCH 174/956] hivelytracker: init at unstable-2020-02-10

---
 .../audio/hivelytracker/default.nix           | 89 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 91 insertions(+)
 create mode 100644 pkgs/applications/audio/hivelytracker/default.nix

diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix
new file mode 100644
index 00000000000..4cf20e3c898
--- /dev/null
+++ b/pkgs/applications/audio/hivelytracker/default.nix
@@ -0,0 +1,89 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, makeWrapper
+, SDL
+, SDL_image
+, SDL_ttf
+, gtk2
+, glib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "hivelytracker";
+  version = "unstable-2020-08-19";
+
+  src = fetchFromGitHub {
+    owner = "pete-gordon";
+    repo = "hivelytracker";
+    rev = "c8e3c7a5ee9f4a07cb4a941caecf7e4c4f4d40e0";
+    sha256 = "1nqianlf1msir6wqwapi7ys1vbmf6aik58wa54b6cn5v6kwxh75a";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    SDL
+    SDL_image
+    SDL_ttf
+    gtk2
+    glib
+  ];
+
+  makeFlags = [
+    "-C sdl"
+    "-f Makefile.linux"
+    "PREFIX=$(out)"
+  ];
+
+  # TODO: try to exclude gtk and glib from darwin builds
+  NIX_CFLAGS_COMPILE = [
+    "-I${SDL}/include/SDL"
+    "-I${SDL_image}/include/SDL"
+    "-I${SDL_ttf}/include/SDL"
+    "-I${gtk2.dev}/include/gtk-2.0"
+    "-I${glib.dev}/include/glib-2.0"
+  ];
+
+  # Also build the hvl2wav tool
+  postBuild = ''
+    make -C hvl2wav
+  '';
+
+  postInstall = ''
+    # https://github.com/pete-gordon/hivelytracker/issues/43
+    # Ideally we should patch the sources, but the program can't open
+    # files passed as arguments anyway, so this works well enough until the
+    # issue is fixed.
+    wrapProgram $out/bin/hivelytracker \
+      --run "cd $out/share/hivelytracker"
+
+    # Also install the hvl2wav tool
+    install -Dm755 hvl2wav/hvl2wav $out/bin/hvl2wav
+  '';
+
+  meta = with lib; {
+    homepage = "http://www.hivelytracker.co.uk/";
+    downloadPage = "http://www.hivelytracker.co.uk/downl.php";
+    description = "Chip music tracker based upon the AHX format";
+    longDescription = ''
+      Hively Tracker is a tracker program based upon the AHX format created in
+      the mid '90s by Dexter and Pink of Abyss. The format was relatively
+      popular, and many songs were created and used in scene productions and
+      games. AHX was designed to create a very SID-like sound on the Amiga.
+
+      HivelyTracker can import and export modules and instruments in the AHX
+      format, but it also improves on AHX in several ways and therefore has
+      its own instrument and module formats.
+    '';
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ fgaz ];
+    broken = stdenv.isDarwin; # TODO: try to use xcbuild
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4dfdcfd3ae0..6b6d073db7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22012,6 +22012,8 @@ in
 
   hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
 
+  hivelytracker = callPackage ../applications/audio/hivelytracker { };
+
   hledger = haskell.lib.justStaticExecutables haskellPackages.hledger;
   hledger-iadd = haskell.lib.justStaticExecutables haskellPackages.hledger-iadd;
   hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest;

From 90872de6c4f08fed1464db12aa8afe4ee968b211 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Mon, 18 Jan 2021 12:11:22 -0700
Subject: [PATCH 175/956] deadd-notification-center: 1.7.2 -> 1.7.3

---
 .../deadd-notification-center/default.nix     | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix
index 8414e02eb88..35627b28d15 100644
--- a/pkgs/applications/misc/deadd-notification-center/default.nix
+++ b/pkgs/applications/misc/deadd-notification-center/default.nix
@@ -1,44 +1,46 @@
-{ lib, stdenv
-, fetchurl
+{ lib
+, stdenv
+, fetchFromGitHub
 , autoPatchelfHook
+, wrapGAppsHook
+, hicolor-icon-theme
 , gtk3
 , gobject-introspection
 , libxml2
 }:
-
-let
-  version = "1.7.2";
-
-  dbusService = fetchurl {
-    url = "https://github.com/phuhl/linux_notification_center/raw/${version}/com.ph-uhl.deadd.notification.service.in";
-    sha256 = "0jvmi1c98hm8x1x7kw9ws0nbf4y56yy44c3bqm6rjj4lrm89l83s";
-  };
-in
 stdenv.mkDerivation rec {
-  inherit version;
   pname = "deadd-notification-center";
+  version = "1.7.3";
 
-  src = fetchurl {
-    url = "https://github.com/phuhl/linux_notification_center/releases/download/${version}/${pname}";
-    sha256 = "13f15slkjiw2n5dnqj13dprhqm3nf1k11jqaqda379yhgygyp9zm";
+  src = fetchFromGitHub {
+    owner = "phuhl";
+    repo = "linux_notification_center";
+    rev = version;
+    sha256 = "QaOLrtlhQyhMOirk6JO1yMGRrgycHmF9FAdKNbN2TRk=";
   };
 
   dontUnpack = true;
 
-  nativeBuildInputs = [ autoPatchelfHook ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    wrapGAppsHook
+  ];
 
   buildInputs = [
     gtk3
     gobject-introspection
     libxml2
+    hicolor-icon-theme
   ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/dbus-1/services
-    cp $src $out/bin/deadd-notification-center
-    chmod +x $out/bin/deadd-notification-center
 
-    sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
+    cp $src/.out/${pname} $out/bin/
+    chmod +x $out/bin/${pname}
+
+    sed "s|##PREFIX##|$out|g" $src/${pname}.service.in > \
+      $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
   '';
 
   meta = with lib; {

From f01989af57f8eba207c20b26e765fcb0333bc227 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 19 Jan 2021 17:40:35 +0000
Subject: [PATCH 176/956] python3Packages.aioh2: mark broken (#109409)

---
 pkgs/development/python-modules/aioh2/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix
index 6af4c4230b0..1ae997c60e8 100644
--- a/pkgs/development/python-modules/aioh2/default.nix
+++ b/pkgs/development/python-modules/aioh2/default.nix
@@ -19,5 +19,6 @@ buildPythonPackage rec {
     description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio";
     license = licenses.bsd3;
     maintainers = [ maintainers.qyliss ];
+    broken = true; # requires h2<4
   };
 }

From 795ecae08649129be7afd4690b158e44558622a1 Mon Sep 17 00:00:00 2001
From: Artur Taranchiev <ewok@ewok.ru>
Date: Sun, 27 Dec 2020 00:22:14 +0300
Subject: [PATCH 177/956] carps-cups: init at unstable-2018-03-05

---
 pkgs/misc/cups/drivers/carps-cups/default.nix | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/carps-cups/default.nix

diff --git a/pkgs/misc/cups/drivers/carps-cups/default.nix b/pkgs/misc/cups/drivers/carps-cups/default.nix
new file mode 100644
index 00000000000..32e92da1608
--- /dev/null
+++ b/pkgs/misc/cups/drivers/carps-cups/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cups
+}:
+
+stdenv.mkDerivation {
+  pname = "carps-cups";
+  version = "unstable-2018-03-05";
+
+  src = fetchFromGitHub {
+    owner = "ondrej-zary";
+    repo = "carps-cups";
+    rev = "18d80d1d6f473dd9132e4b6d8b5c592c74982f17";
+    sha256 = "0mjj9hs5lqxi0qamgb4sxfz4fvf7ggi66bxd37bkz3fl0g9xff70";
+  };
+
+  preBuild = ''
+    export CUPS_DATADIR="${cups}/share/cups"
+  '';
+
+  installPhase = ''
+    CUPSDIR="$out/lib/cups"
+    CUPSDATADIR="$out/share/cups"
+
+    mkdir -p "$CUPSDIR/filter" "$CUPSDATADIR/drv" "$CUPSDATADIR/usb"
+
+    install -s rastertocarps $CUPSDIR/filter
+    install -m 644 carps.drv $CUPSDATADIR/drv/
+    install -m 644 carps.usb-quirks $CUPSDATADIR/usb/
+  '';
+
+  buildInputs = [ cups ];
+
+  meta = with lib; {
+    description = "CUPS Linux drivers for Canon printers";
+    homepage = "https://www.canon.com/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [
+      ewok
+    ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b8b051d19a..4e1d83a184d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27609,6 +27609,8 @@ in
 
   gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };
 
+  carps-cups = callPackage ../misc/cups/drivers/carps-cups { };
+
   cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
 
   cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { };

From 86235815b3e0b1be6964fe7487ee169ebd917fd5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 09:23:29 +0100
Subject: [PATCH 178/956] python3Packages.virtualenv: 20.2.1 -> 20.3.1

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

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 233101728f8..215cc853101 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.2.1";
+  version = "20.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5";
+    sha256 = "sha256-DBEaIjaxkUIrN/6MKLjIKM7TmqtL9WJ/pcMxrv+1cNk=";
   };
 
   nativeBuildInputs = [

From c030d1b85bbcc2772ea432b713d699710c8b537e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 10:40:47 +0100
Subject: [PATCH 179/956] python3Packages.virtualenv: enable tests

---
 .../python-modules/virtualenv/default.nix     | 47 +++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 215cc853101..6869d16d5a4 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -1,18 +1,26 @@
 { buildPythonPackage
-, fetchPypi
-, lib
-, stdenv
-, pythonOlder
-, isPy27
 , appdirs
 , contextlib2
+, cython
 , distlib
+, fetchPypi
 , filelock
+, fish
+, flaky
 , importlib-metadata
 , importlib-resources
+, isPy27
+, lib
 , pathlib2
+, pytest-freezegun
+, pytest-mock
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
 , setuptools_scm
 , six
+, stdenv
+, xonsh
 }:
 
 buildPythonPackage rec {
@@ -47,10 +55,33 @@ buildPythonPackage rec {
     ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch
   ];
 
-  meta = {
+  checkInputs = [
+    cython
+    fish
+    flaky
+    pytest-freezegun
+    pytest-mock
+    pytest-timeout
+    pytestCheckHook
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    xonsh
+  ];
+
+  preCheck = "export HOME=$(mktemp -d)";
+
+  # Ignore tests which requires network access
+  pytestFlagsArray = [
+    "--ignore tests/unit/create/test_creator.py"
+    "--ignore tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
+  ];
+
+  disabledTests = [ "test_can_build_c_extensions" ];
+  pythonImportsCheck = [ "virtualenv" ];
+
+  meta = with lib; {
     description = "A tool to create isolated Python environments";
     homepage = "http://www.virtualenv.org";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ goibhniu ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ goibhniu ];
   };
 }

From 94f850c3d1dc08fac3addad38573c422594dab59 Mon Sep 17 00:00:00 2001
From: greizgh <greizgh@ephax.org>
Date: Tue, 19 Jan 2021 18:46:51 +0100
Subject: [PATCH 180/956] doc: fix shell.nix (#109816)

---
 doc/shell.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/shell.nix b/doc/shell.nix
index 8ac2019f9d6..5fa2b442489 100644
--- a/doc/shell.nix
+++ b/doc/shell.nix
@@ -1,5 +1,3 @@
-{ pkgs ? import ../. {} }:
-(import ./default.nix {}).overrideAttrs (x: {
-  buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ];
-
-})
+{ pkgs ? import ../. { } }:
+(import ./default.nix { }).overrideAttrs
+(x: { buildInputs = (x.buildInputs or [ ]) ++ [ pkgs.xmloscopy pkgs.ruby ]; })

From 98dcad33fa45a47442d32f641f3b435c1dd62ced Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 18:41:54 +0100
Subject: [PATCH 181/956] python3Packages.devolo-home-control-api: init at
 0.16.0

---
 .../devolo-home-control-api/default.nix       | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/devolo-home-control-api/default.nix

diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix
new file mode 100644
index 00000000000..1e388fd3a11
--- /dev/null
+++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pytest-cov
+, pytest-mock
+, requests
+, zeroconf
+, websocket_client
+, pytest-runner
+}:
+
+buildPythonPackage rec {
+  pname = "devolo-home-control-api";
+  version = "0.16.0";
+
+  src = fetchFromGitHub {
+    owner = "2Fake";
+    repo = "devolo_home_control_api";
+    rev = "v${version}";
+    sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb";
+  };
+
+  nativeBuildInputs = [ pytest-runner ];
+
+  propagatedBuildInputs = [
+    requests
+    zeroconf
+    websocket_client
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-cov
+    pytest-mock
+  ];
+
+  # Disable test that requires network access
+  disabledTests = [ "test__on_pong" ];
+  pythonImportsCheck = [ "devolo_home_control_api" ];
+
+  meta = with lib; {
+    description = "Python library to work with devolo Home Control";
+    homepage = "https://github.com/2Fake/devolo_home_control_api";
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5465181662c..f2f4b9d16b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1671,6 +1671,8 @@ in {
 
   detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
 
+  devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { };
+
   devpi-common = callPackage ../development/python-modules/devpi-common { };
 
   dftfit = callPackage ../development/python-modules/dftfit { };

From 138ff1de3dbda55aa0d73046f5387446982d52cc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 18:42:35 +0100
Subject: [PATCH 182/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 9d4dbe7b8ea..a822cb4a623 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -164,7 +164,7 @@
     "device_automation" = ps: with ps; [ ];
     "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ];
     "device_tracker" = ps: with ps; [ ];
-    "devolo_home_control" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: devolo-home-control-api
+    "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ];
     "dexcom" = ps: with ps; [ pydexcom ];
     "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
     "dialogflow" = ps: with ps; [ aiohttp-cors ];

From 6298817fa2e1759176fc8569afee7e2b13537f7f Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Tue, 19 Jan 2021 17:15:09 +0000
Subject: [PATCH 183/956] vimPlugins.galaxyline-nvim: fix branch

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

diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index d35f647126c..ba3344f9b6e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -132,7 +132,7 @@ gentoo/gentoo-syntax
 GEverding/vim-hocon
 gfanto/fzf-lsp.nvim@main
 gibiansky/vim-textobj-haskell
-glepnir/galaxyline.nvim
+glepnir/galaxyline.nvim@main
 glts/vim-textobj-comment
 godlygeek/csapprox
 godlygeek/tabular

From 6d1dc503fbfcf7bbfe07ab5fb1331d9c72705306 Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Tue, 19 Jan 2021 17:15:42 +0000
Subject: [PATCH 184/956] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 156 ++++++++++++++--------------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index b44d408dd14..7da60cfcac8 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -461,12 +461,12 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2021-01-16";
+    version = "2021-01-18";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "2dc88ca328de4e00b37586aaf532b2cd90b5c3a0";
-      sha256 = "0zjryprw2qdshshw7f8dkk7jf515sq11gc1w0lvssimkqdi47zaj";
+      rev = "272d783f338107426cf75fa48b6f0a30860a8ac4";
+      sha256 = "07dyy8v0j07w6gi89p08l0vcc0ba6d3qnz4wpsfj4hzf6cgifsw4";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -521,12 +521,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2021-01-15";
+    version = "2021-01-18";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "a150d49a46ea85b4c78813e6ba0fcf9a2b0d86ea";
-      sha256 = "067fhgvfnrvzw67hyag0fxv61m1fbl8160klgy5l0kjy7nx6hwiw";
+      rev = "a9b682ad79cc4b7b836fc7e31f7d01ecd88d7c51";
+      sha256 = "1gpz1d6cy4pmaqzgp5bq8dndpzq9qiwq0794vgi58hnk65sbjai9";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -594,12 +594,12 @@ let
 
   completion-buffers = buildVimPluginFrom2Nix {
     pname = "completion-buffers";
-    version = "2020-09-26";
+    version = "2021-01-17";
     src = fetchFromGitHub {
       owner = "steelsojka";
       repo = "completion-buffers";
-      rev = "441a58b77c04409e8ccb35fd4970598ae551462f";
-      sha256 = "14q5n7h5kaqf71cfd9mlhwb0xsihm6d3kizrxhlfnzxk6zkn8p0s";
+      rev = "c36871b2a44b59761387f4972c617b44dcec5e75";
+      sha256 = "14rxmy3cjrl7lr4yvrk7nkhc5h8rlpj7xjixzgr0vmnbsl885kyh";
     };
     meta.homepage = "https://github.com/steelsojka/completion-buffers/";
   };
@@ -690,12 +690,12 @@ let
 
   Coqtail = buildVimPluginFrom2Nix {
     pname = "Coqtail";
-    version = "2021-01-15";
+    version = "2021-01-18";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "50c34a24bb6638fdf8f604f75cd036ec5252864d";
-      sha256 = "1b5cs4yznz8vcmba6vk67kpd6071cz1m5jbfjpvyinvld5ipnapn";
+      rev = "c58071ff5ad86baad107f43737c64a18b574cd3a";
+      sha256 = "1pbkvxcwzvyy47bfv1r1ldzcf0qqkbbx2bq4jl93di5bg7kl57qb";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
   };
@@ -894,12 +894,12 @@ let
 
   deol-nvim = buildVimPluginFrom2Nix {
     pname = "deol-nvim";
-    version = "2021-01-14";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "f1bf4b1dc68d441936019f97a2f306327c52f5c4";
-      sha256 = "0gd23blp723gybzp0g466kkf3rf9d0bd2zs76hadmw7w7992im2z";
+      rev = "bd8d4d03d81d03db13d4b6eeb40c8a5c422c3ce6";
+      sha256 = "19kk5mpisbil3jarl93sjq97jxb29sxbw5s2zsh1gih6dfp659d5";
     };
     meta.homepage = "https://github.com/Shougo/deol.nvim/";
   };
@@ -1475,12 +1475,12 @@ let
 
   galaxyline-nvim = buildVimPluginFrom2Nix {
     pname = "galaxyline-nvim";
-    version = "2020-12-14";
+    version = "2021-01-17";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "galaxyline.nvim";
-      rev = "528bb65b00f9ef5081cb524638b3337c4e5f26b5";
-      sha256 = "069ksz4nfhlr5zlkpawh1yak4yk3vc2cd9mgy5f0r6in3wh0iypc";
+      rev = "64d6b8e31459057ba4f9b03a977fce0d2cc3d748";
+      sha256 = "1w5cggvxvmnm3zparnsgb3iz1pkw7d8bwvflcxaxg4pilgsniqsa";
     };
     meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
   };
@@ -1631,12 +1631,12 @@ let
 
   gruvbox-community = buildVimPluginFrom2Nix {
     pname = "gruvbox-community";
-    version = "2020-11-13";
+    version = "2021-01-17";
     src = fetchFromGitHub {
       owner = "gruvbox-community";
       repo = "gruvbox";
-      rev = "2636a0344d3fbacc62d9d914a456fcfdba8ca4cb";
-      sha256 = "1w9j97g3dzadwnqyal1zw12ia61b512hz8mhywqy5xq6v9f6zkw6";
+      rev = "c73e63203f76ab8e39b2b05369c0a8877a981435";
+      sha256 = "0lwvv5chxq0fb9k1y73g5zr8v54xghlqnq64k0vx2v2ravp3313r";
     };
     meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
   };
@@ -1667,12 +1667,12 @@ let
 
   haskell-vim = buildVimPluginFrom2Nix {
     pname = "haskell-vim";
-    version = "2018-05-22";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "neovimhaskell";
       repo = "haskell-vim";
-      rev = "b1ac46807835423c4a4dd063df6d5b613d89c731";
-      sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br";
+      rev = "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e";
+      sha256 = "1q3hf0vr5gpmymmvm208sl0r8nb69m7f3bdrkqrp7fwc2v1ylnz0";
     };
     meta.homepage = "https://github.com/neovimhaskell/haskell-vim/";
   };
@@ -2688,24 +2688,24 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2021-01-12";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "nerdcommenter";
-      rev = "7d2fb974a36b3c7773a90a749fcb92a40669e444";
-      sha256 = "1vq4wkywidmjr2g8z9js5173b15lr6zawxb0z12fmvaiwxpbli4z";
+      rev = "7be3292b8de5127a386bf20f1198704e90cf24e9";
+      sha256 = "0bz6q80bbq1pl45ch37rcnnakljv6877qasqvdzb09w3jn6hz2vl";
     };
     meta.homepage = "https://github.com/preservim/nerdcommenter/";
   };
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2020-12-20";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "nerdtree";
-      rev = "aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9";
-      sha256 = "1fhwfwqlvz0pm5qdpjbmjx4dqlnchbp170jw63dc5fxin90h4ivh";
+      rev = "7099f638edd3eda5cd5687b4e13d342bb7f9949d";
+      sha256 = "1109acmcxwr6kfrw6ganpqwwarsf5l9vd3vxmmafz3c86ha6kkvw";
     };
     meta.homepage = "https://github.com/preservim/nerdtree/";
   };
@@ -2880,12 +2880,12 @@ let
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2021-01-15";
+    version = "2021-01-18";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "87900ffcccd47bb6a09483ccf0d6840dc1d0d0d6";
-      sha256 = "18qj8ql48fnncghm0p6wnbjggmkvs9gdf6lgffhdqinlrnrja9ry";
+      rev = "1f88798c0efe9331e83243ce05605fbac0433e9d";
+      sha256 = "042bgy356v7yy4zm76mngp55n53rnqrlclpm4lafjvl788fny7k4";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -2928,12 +2928,12 @@ let
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree-lua";
-    version = "2021-01-15";
+    version = "2021-01-17";
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-tree.lua";
-      rev = "787cef2a1d4ccdd1058cd1486dfea509fab1d291";
-      sha256 = "1n1cvrfz2vfx5rjslx4brv3rfqjmxymy9yxyvzhi5p3vwn0phr6f";
+      rev = "bf59dd4a86f13eeb32ac04d7d1fadadd48662647";
+      sha256 = "19kjxdspiylp5ww2h1xnhzd57fhlpzdbkyglg79a86xlsf1r1c7x";
     };
     meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
   };
@@ -3168,24 +3168,24 @@ let
 
   playground = buildVimPluginFrom2Nix {
     pname = "playground";
-    version = "2020-12-17";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "playground";
-      rev = "0cba1b99cd6cfcd0379e57c317ea1df0c1c82b3a";
-      sha256 = "1xs2g7inlmcjchzzmsa4qh1mf61xz6gdn96mzfkr8fs65g78861b";
+      rev = "4a11cf237a6e505feb747f6097d48bf0195888b3";
+      sha256 = "0d9xm63spsaa580n2nyqiiq2p81ilmm0dwzqg6jhw9c020r5rzg1";
     };
     meta.homepage = "https://github.com/nvim-treesitter/playground/";
   };
 
   plenary-nvim = buildVimPluginFrom2Nix {
     pname = "plenary-nvim";
-    version = "2021-01-11";
+    version = "2021-01-18";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "e9b81e2bb98e00e9f6ca2b6a698cc8452fe2943e";
-      sha256 = "00j5gnx5jgrx7qmbxhrjsrdzp9krc5c7zij9a25jhz3l2j98xpdg";
+      rev = "fecbbd23e425db8cc60b85d8298f02935d69940d";
+      sha256 = "0q5hsg2rlzhldr221krvxppspdl04rj5qbiq3nk1a25nf5r24d0z";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -3878,12 +3878,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2021-01-17";
+    version = "2021-01-18";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "c2039ca78d261392b0ab7bef85b3c5f1c8f507b9";
-      sha256 = "0ca93m1nl14js4wgbqhgc786mr9is0zkiwkzp4fv5ny03nhd025w";
+      rev = "7d4d3462e990e2af489eb285aa7041d0b787c560";
+      sha256 = "013m8k7s5d2ix83q1d7x6nqi7s9vn5g221wnbngd41ywbdn61a9a";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -4611,12 +4611,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2021-01-17";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "a9d1ccd9a3e9807d600abccab706634594ed0d2e";
-      sha256 = "0smmgbsrqm757hgijq76y4yra0b68qhnxnyswfs37vrarcrqkfq3";
+      rev = "7442976f0c5dea79f8cfb342e7abb25cea9a8daa";
+      sha256 = "1gzc800i4zsxav4h7smqgapnrallarbgrq9arfhydrq41hy2h6wr";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -5079,48 +5079,48 @@ let
 
   vim-erlang-compiler = buildVimPluginFrom2Nix {
     pname = "vim-erlang-compiler";
-    version = "2020-11-16";
+    version = "2021-01-16";
     src = fetchFromGitHub {
       owner = "vim-erlang";
       repo = "vim-erlang-compiler";
-      rev = "17e47d28141c961e567b39d8d9956cbdb6e720d0";
-      sha256 = "1j27zk2gfig3zv7cg7dwg5x0c3nsik5blcci8a16wq050pi8bsr1";
+      rev = "a99e75f792650c8dae86d9a44c7af2411ea2ead7";
+      sha256 = "13400kjf90sxlpx1pqs379ihdn65i3gpck3dwkjnf1xiv1p9rzvz";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/";
   };
 
   vim-erlang-omnicomplete = buildVimPluginFrom2Nix {
     pname = "vim-erlang-omnicomplete";
-    version = "2020-08-29";
+    version = "2021-01-16";
     src = fetchFromGitHub {
       owner = "vim-erlang";
       repo = "vim-erlang-omnicomplete";
-      rev = "2f980dd8f1861e00ea14dcd5ecc370e71af695fb";
-      sha256 = "1i3c7ybahmb4az2njzvfnvx39bqiyqhf43n32rhpc3xg05y3bk7d";
+      rev = "924a50ed0ad93141063d0f27c9f62b1bea991baf";
+      sha256 = "0zh730wsb0n9nk1x5qdbx78zgzhamd2a6fa5gxl4milvr5ddvdy9";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/";
   };
 
   vim-erlang-runtime = buildVimPluginFrom2Nix {
     pname = "vim-erlang-runtime";
-    version = "2020-11-22";
+    version = "2021-01-08";
     src = fetchFromGitHub {
       owner = "vim-erlang";
       repo = "vim-erlang-runtime";
-      rev = "8a8ec7cb54d52be5fc5dce2a028888c2a2f50e35";
-      sha256 = "13qfyl9v0a82hn574x6h7rq9kl3rhg6ivlpj69n2jn0lf33ij8qq";
+      rev = "47c643f51e4480541fc81e352ec5b2a361544d0b";
+      sha256 = "0xlxkdqjq8fp9fpkhqv5nd2ipiq8nw1bdzd7hqibizwcdsisf91s";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/";
   };
 
   vim-erlang-tags = buildVimPluginFrom2Nix {
     pname = "vim-erlang-tags";
-    version = "2020-10-16";
+    version = "2021-01-09";
     src = fetchFromGitHub {
       owner = "vim-erlang";
       repo = "vim-erlang-tags";
-      rev = "a5bc6a90a166073d74e5103f40735740ae40a3cb";
-      sha256 = "02d3y2296nh8qv0kgx119c1niim6ci2bahi7q3k0jsl2f86fl7dy";
+      rev = "22f7fbf1e4b669a305d93cedd85baf63253f3b78";
+      sha256 = "1dvk0dim8vam8xsqlz9pjky22mhqi9ca5criyz7zvgj46hqj1wy3";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";
   };
@@ -5415,12 +5415,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2021-01-10";
+    version = "2021-01-17";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "d68fc4d71d7c254c8fbd666a470b2d92c8a6d610";
-      sha256 = "04py4c52hlb8adkgywkn4hnibrsiczvmmf8b82wfr2sa1k5b9hbx";
+      rev = "3a8e3f6ded412b25fb3c13eecf76d5809fa175e8";
+      sha256 = "0vj6wcvx87kkykmlxjdwnbnfiq8bbqjnki8x3qaiv4gx028m778d";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -6041,24 +6041,24 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2021-01-16";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "104813da45c5bb620b9c6ce48cb918872f968dab";
-      sha256 = "1x06zb9xa9v9ycg3vq1il45ylm7p2d3vflv347hpssmwcjzd6xyv";
+      rev = "3012f39ce120ffdc5b89a85f074fc66d6f4905bf";
+      sha256 = "157jm2wwvp4dp7rzilhrb4040paldjx7qkp116v4q5kj699w42i7";
     };
     meta.homepage = "https://github.com/natebosch/vim-lsc/";
   };
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2021-01-16";
+    version = "2021-01-18";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "90d61f11149ffb380eabcb66f66a160f4fc31a5d";
-      sha256 = "1gr9y12fjw89ym6kdzjki12j21bhwy4ch4gpsy4gzb04xhjqllgf";
+      rev = "7380d31c4f49d76ce3895c386e2a7a40b2b2df08";
+      sha256 = "082il6bk7rnqvxqqy1070y3182kqk34i1bgcczj4k43llnghskx9";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -7110,12 +7110,12 @@ let
 
   vim-smoothie = buildVimPluginFrom2Nix {
     pname = "vim-smoothie";
-    version = "2020-12-25";
+    version = "2021-01-17";
     src = fetchFromGitHub {
       owner = "psliwka";
       repo = "vim-smoothie";
-      rev = "1f5ee84b789384a273b3e27b6a5a7e2f54dbc30e";
-      sha256 = "0977qb31hgss38g01m7ikx3qdqial3c7zw9cv72k7rnmcgy761wz";
+      rev = "f83a157552a3bf393a7c034df1d21e3555123a4c";
+      sha256 = "090rl4mfww5rmv04v25f58jfv3yx23bwi0pijkwxr442yhbg3rg2";
     };
     meta.homepage = "https://github.com/psliwka/vim-smoothie/";
   };
@@ -7940,12 +7940,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2021-01-16";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "7c7d6020f848864e091ac437e55f72139f9a59b4";
-      sha256 = "10fl44xpjfsrfqr3sz2mbxhigmkz5ivky96smxp4yp9av0zvvcm4";
+      rev = "5d3d96dcdf0f87273978c482e9c1b39201f4516f";
+      sha256 = "04rn9w17mmf2ka4wqdl8x4nzwg5imnb0q1mnsm1hx8bvlr8zs0h6";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -8170,12 +8170,12 @@ let
 
   zig-vim = buildVimPluginFrom2Nix {
     pname = "zig-vim";
-    version = "2020-12-31";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "ziglang";
       repo = "zig.vim";
-      rev = "ef331a76f0d660a67504e1cd0d981c345db3607f";
-      sha256 = "0976539h1zsxrnihp5x5lvra12iwvjbbrl5nw6f914yh09jqbgjf";
+      rev = "17170fd1c31f00132a91fb1598d0f3df5927e28d";
+      sha256 = "0k8s5via1frpgdb94kgsk29g7h6fjq3cazyfa8zww7vra418acsh";
     };
     meta.homepage = "https://github.com/ziglang/zig.vim/";
   };

From ed09337bdbc923fa1ad6e7a6aa920763d0190536 Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Tue, 19 Jan 2021 17:16:05 +0000
Subject: [PATCH 185/956] vimPlugins: resolve github repository redirects

---
 pkgs/misc/vim-plugins/generated.nix    | 4 ++--
 pkgs/misc/vim-plugins/vim-plugin-names | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 7da60cfcac8..82a794619b5 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1030,12 +1030,12 @@ let
     pname = "deoplete-lsp";
     version = "2020-12-26";
     src = fetchFromGitHub {
-      owner = "Shougo";
+      owner = "deoplete-plugins";
       repo = "deoplete-lsp";
       rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e";
       sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a";
     };
-    meta.homepage = "https://github.com/Shougo/deoplete-lsp/";
+    meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/";
   };
 
   deoplete-notmuch = buildVimPluginFrom2Nix {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ba3344f9b6e..29a33258d2e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -79,6 +79,7 @@ deoplete-plugins/deoplete-clang
 deoplete-plugins/deoplete-dictionary
 deoplete-plugins/deoplete-go
 deoplete-plugins/deoplete-jedi
+deoplete-plugins/deoplete-lsp
 deoplete-plugins/deoplete-zsh
 derekelkins/agda-vim
 derekwyatt/vim-scala
@@ -494,7 +495,6 @@ Shougo/context_filetype.vim
 Shougo/defx.nvim
 Shougo/denite.nvim
 Shougo/deol.nvim
-Shougo/deoplete-lsp
 Shougo/deoplete.nvim
 Shougo/echodoc.vim
 Shougo/neco-syntax

From afcb1b715975a33d57b8a7174fec044b91197a36 Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Tue, 19 Jan 2021 17:16:30 +0000
Subject: [PATCH 186/956] vimPlugins.telescope-fzf-writer-nvim: init at
 2021-01-10

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 82a794619b5..a892e00ac42 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3876,6 +3876,18 @@ let
     meta.homepage = "https://github.com/tomtom/tcomment_vim/";
   };
 
+  telescope-fzf-writer-nvim = buildVimPluginFrom2Nix {
+    pname = "telescope-fzf-writer-nvim";
+    version = "2021-01-10";
+    src = fetchFromGitHub {
+      owner = "nvim-telescope";
+      repo = "telescope-fzf-writer.nvim";
+      rev = "9535863f519be3d5e57fd50916f96594241bfe16";
+      sha256 = "0jmkzjqlcz47hzp44407xwkmirgprzkwrz6x8ax771gpk8cghfrx";
+    };
+    meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/";
+  };
+
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
     version = "2021-01-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 29a33258d2e..c2de2d19d11 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -404,6 +404,7 @@ nvim-lua/lsp-status.nvim
 nvim-lua/lsp_extensions.nvim
 nvim-lua/plenary.nvim
 nvim-lua/popup.nvim
+nvim-telescope/telescope-fzf-writer.nvim
 nvim-telescope/telescope.nvim
 nvim-treesitter/completion-treesitter
 nvim-treesitter/nvim-treesitter

From f14a087dd842d14e082967f1cb48c247bba68591 Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Tue, 19 Jan 2021 17:36:09 +0000
Subject: [PATCH 187/956] vimPlugins.vim-clap: updated cargoSha256

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

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 9640869ad1d..0debd6ba6fc 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -654,7 +654,7 @@ self: super: {
           libiconv
         ];
 
-        cargoSha256 = "6tgSdIC9ThKvyiX1Unihwozhez6+HsQiqebugzNrKVc=";
+        cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c=";
       };
     in ''
       ln -s ${maple-bin}/bin/maple $target/bin/maple

From 5821cd7c063f4a97e625938505cfc93e31f9720c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 18:02:08 +0000
Subject: [PATCH 188/956] latex2html: 2020.2 -> 2021

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

diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix
index 6f532533f99..5bb4f41a5de 100644
--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/pkgs/tools/misc/latex2html/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "latex2html";
-  version = "2020.2";
+  version = "2021";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1icyl6kl60wh7cavprgbd8q6lpjwr7wn24m34kpiif7ahknhcbcm";
+    sha256 = "sha256-n7VbK/S9EkWxb4fbIXp3tIfX7N+9bvZ/odBylqTuzUU=";
   };
 
   buildInputs = [ ghostscript netpbm perl ];

From 2837ce664fd0a6e13b33599fb0a61c0652d3d8ff Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 19:07:14 +0100
Subject: [PATCH 189/956] python3Packages.url-normalize: init at 1.4.3

---
 .../python-modules/url-normalize/default.nix  | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/url-normalize/default.nix

diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix
new file mode 100644
index 00000000000..ea7825d9ffd
--- /dev/null
+++ b/pkgs/development/python-modules/url-normalize/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry
+, pytest-cov
+, pytest-flakes
+, pytest-mock
+, pytest-socket
+, pytestCheckHook
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "url-normalize";
+  version = "1.4.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "niksite";
+    repo = pname;
+    rev = version;
+    sha256 = "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [
+    pytest-cov
+    pytest-flakes
+    pytest-mock
+    pytest-socket
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "url_normalize" ];
+
+  meta = with lib; {
+    description = "URL normalization for Python";
+    homepage = "https://github.com/niksite/url-normalize";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8105cfbe0da..393d65f828f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7924,6 +7924,8 @@ in {
 
   uritools = callPackage ../development/python-modules/uritools { };
 
+  url-normalize = callPackage ../development/python-modules/url-normalize { };
+
   urlgrabber = callPackage ../development/python-modules/urlgrabber { };
 
   urllib3 = callPackage ../development/python-modules/urllib3 { };

From ef4e9a208510f8f159cd4cb4562d81ac2e7a48e6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 19:07:41 +0100
Subject: [PATCH 190/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d057d1fbc71..a1e3ef67425 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -361,7 +361,7 @@
     "html5" = ps: with ps; [ aiohttp-cors pywebpush ];
     "http" = ps: with ps; [ aiohttp-cors ];
     "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
-    "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize
+    "huawei_lte" = ps: with ps; [ getmac stringcase url-normalize ]; # missing inputs: huawei-lte-api
     "huawei_router" = ps: with ps; [ ];
     "hue" = ps: with ps; [ aiohue ];
     "humidifier" = ps: with ps; [ ];
@@ -801,7 +801,7 @@
     "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot
     "switcher_kis" = ps: with ps; [ aioswitcher ];
     "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
-    "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize
+    "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru
     "synology" = ps: with ps; [ ]; # missing inputs: py-synology
     "synology_chat" = ps: with ps; [ ];
     "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api

From 586b32bc57d47c684d92201e1d29a41517e62db1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Jan 2021 12:59:31 +0100
Subject: [PATCH 191/956] python3Packages.segments: 2.1.3 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix
index 8c2e22708aa..00953a8e909 100644
--- a/pkgs/development/python-modules/segments/default.nix
+++ b/pkgs/development/python-modules/segments/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "segments";
-  version = "2.1.3";
+  version = "2.2.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "cldf";
     repo = pname;
     rev = "v${version}";
-    sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0";
+    sha256 = "04yc8q79zk09xj0wnal0vdg5azi9jlarfmf2iyljqyr80p79gwvv";
   };
 
   patchPhase = ''

From 942b28dec0e9c1a18b99b570741d448dcb23f557 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Jan 2021 13:00:57 +0100
Subject: [PATCH 192/956] python3Packages.csvw: 1.8.1 -> 1.10.0

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

diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix
index 70e817dc299..410248b0193 100644
--- a/pkgs/development/python-modules/csvw/default.nix
+++ b/pkgs/development/python-modules/csvw/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "csvw";
-  version = "1.8.1";
+  version = "1.10.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "cldf";
     repo = "csvw";
     rev = "v${version}";
-    sha256 = "1cafwgkspkc299shsa5x8wfzkx1d63p9rvslj9jwr68fipd1830w";
+    sha256 = "0cvfzfi1a2m1xqpm34mwp9r3bhgsnfz4pmslvgn81i42n5grbnis";
   };
 
   patchPhase = ''

From ec2c3053ded12c3dbfed1ccb93177c5ab572b07f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Jan 2021 13:03:51 +0100
Subject: [PATCH 193/956] python3Packages.mocket: 3.9.35 -> 3.9.39

---
 .../python-modules/mocket/default.nix         | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index f7e97bb955c..2102718ab6e 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -5,23 +5,25 @@
 , python
 , python_magic
 , six
-, urllib3 }:
+, urllib3
+, pytestCheckHook
+, pytest-mock
+, aiohttp
+, gevent
+, redis
+, requests
+, sure
+}:
 
 buildPythonPackage rec {
   pname = "mocket";
-  version = "3.9.35";
+  version = "3.9.39";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d822a2adfd8e028a2856785fbfe78e7dd8c7a3b623516298aef6d42a4c9149d1";
+    sha256 = "1mbcgfy1vfwwzn54vkq8xmfzdyc28brfpqk4d55r3a6abwwsn6a4";
   };
 
-  patchPhase = ''
-    sed -iE "s,python-magic==.*,python-magic," requirements.txt
-    sed -iE "s,urllib3==.*,urllib3," requirements.txt
-    substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]"
-  '';
-
   propagatedBuildInputs = [
     decorator
     http-parser
@@ -30,8 +32,36 @@ buildPythonPackage rec {
     six
   ] ++ lib.optionals (isPy27) [ six ];
 
-  # Pypi has no runtests.py, github has no requirements.txt. No way to test, no way to install.
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+    pytest-mock
+    aiohttp
+    gevent
+    redis
+    requests
+    sure
+  ];
+
+  pytestFlagsArray = [
+    "--ignore=tests/main/test_pook.py" # pook is not packaged
+    "--ignore=tests/main/test_redis.py" # requires a live redis instance
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    # uses IsolatedAsyncioTestCase which is only available >= 3.8
+    "--ignore=tests/tests38/test_http_aiohttp.py"
+  ];
+
+  disabledTests = [
+    # tests that require network access (like DNS lookups)
+    "test_truesendall"
+    "test_truesendall_with_chunk_recording"
+    "test_truesendall_with_gzip_recording"
+    "test_truesendall_with_recording"
+    "test_wrongpath_truesendall"
+    "test_truesendall_with_dump_from_recording"
+    "test_truesendall_with_recording_https"
+    "test_truesendall_after_mocket_session"
+    "test_real_request_session"
+  ];
 
   pythonImportsCheck = [ "mocket" ];
 

From a6b7d68a9eec47801c5cad4eb118c945602f1795 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Jan 2021 13:05:15 +0100
Subject: [PATCH 194/956] python3Packages.samsungtvws: 1.5.3 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix
index b41935c5825..3a12568c4d6 100644
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@@ -5,18 +5,14 @@
 
 buildPythonPackage rec {
   pname = "samsungtvws";
-  version = "1.5.3";
+  version = "1.6.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n";
+    sha256 = "09nls4n0lbnr8nj8105lagr9h2my8lb1s2k285kmsbli36ywd8lj";
   };
 
-  patchPhase = ''
-    substituteInPlace setup.py --replace "websocket-client==" "websocket-client>="
-  '';
-
   propagatedBuildInputs = [
     websocket_client
     requests

From 6333fbeb83c3dfa15e50972a4e730dc1707718e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Tue, 19 Jan 2021 18:55:19 +0100
Subject: [PATCH 195/956] vimPlugins.gitsigns-nvim: init at 2021-19-01

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a892e00ac42..8f62fee5463 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1557,6 +1557,18 @@ let
     meta.homepage = "https://github.com/vim-scripts/gitignore.vim/";
   };
 
+  gitsigns-nvim = buildVimPluginFrom2Nix {
+    pname = "gitsigns-nvim";
+    version = "2021-19-01";
+    src = fetchFromGitHub {
+      owner = "lewis6991";
+      repo = "gitsigns.nvim";
+      rev = "4440a0f716b76132f365f5ef5c7f7cdad4b7c98c";
+      sha256 = "19hyqga7xj3dc7p629gih80c72a04z1my8qav37myz0jq3bllg2v";
+    };
+    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";
+  };
+
   gitv = buildVimPluginFrom2Nix {
     pname = "gitv";
     version = "2019-08-22";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c2de2d19d11..24ab147c11a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -275,6 +275,7 @@ leanprover/lean.vim
 ledger/vim-ledger
 lepture/vim-jinja
 lervag/vimtex
+lewis6991/gitsigns.nvim
 lfilho/cosco.vim
 lifepillar/vim-mucomplete
 lighttiger2505/deoplete-vim-lsp

From 337475b19928203eac8f7a1eded5f3aeef232134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Tue, 19 Jan 2021 18:52:31 +0100
Subject: [PATCH 196/956] vimPlugins.nvim-jdtls: init at 2021-01-19

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8f62fee5463..8ebf6cf6a5d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2890,6 +2890,18 @@ let
     meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/";
   };
 
+  nvim-jdtls = buildVimPluginFrom2Nix {
+    pname = "nvim-jdtls";
+    version = "2021-01-19";
+    src = fetchFromGitHub {
+      owner = "mfussenegger";
+      repo = "nvim-jdtls";
+      rev = "357d0b405235e3dfb0b15450f33ad6d10cbf2122";
+      sha256 = "1gd4kjxpb73d6ixxgg4qyzj5alca590whx1i905j3m8j4sjb7vib";
+    };
+    meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
+  };
+
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
     version = "2021-01-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 24ab147c11a..82695aaa30d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -334,6 +334,7 @@ mengelbrecht/lightline-bufferline
 metakirby5/codi.vim
 mfukar/robotframework-vim
 mfussenegger/nvim-dap
+mfussenegger/nvim-jdtls
 mg979/vim-visual-multi
 mhartington/oceanic-next
 mhinz/vim-crates

From 237dcf208abe8e29676d1928ce7b0691f6a55dbf Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 3 Oct 2020 10:09:17 +0200
Subject: [PATCH 197/956] python3Packages.crccheck: 0.6 -> 1.0

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

diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix
index 1ddf2a2ba68..8dc03801285 100644
--- a/pkgs/development/python-modules/crccheck/default.nix
+++ b/pkgs/development/python-modules/crccheck/default.nix
@@ -1,21 +1,24 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , nose }:
 
-buildPythonPackage rec {
+let
   pname = "crccheck";
-  version = "0.6";
+  version = "1.0";
+in buildPythonPackage {
+  inherit pname version;
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ckymm6s5kw08i1j35fy2cfha1hyq94pq1kc66brb552qgjs91jn";
-    extension = "zip";
+    sha256 = "1ay9lgy80j7lklm07iw2wq7giwnv9fbv50mncblqlc39y322vi0p";
   };
 
+  disabled = !isPy3k;
+
   meta = with lib; {
     description = "Python library for CRCs and checksums";
-    homepage = "https://bitbucket.org/martin_scharrer/crccheck";
+    homepage = "https://sourceforge.net/projects/crccheck/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ etu ];
     platforms = platforms.linux;

From 502357ecb903903d6a4c9a9ff0576b4fa5fbe2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 19 Jan 2021 19:22:29 +0100
Subject: [PATCH 198/956] gperftools: drop an option that seems no longer
 supported

> warning: unknown warning option '-Wno-aligned-allocation-unavailable';
>   did you mean '-Wno-debug-compression-unavailable'? [-Wunknown-warning-option]
---
 pkgs/development/libraries/gperftools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 91b2c2929a4..140cd10473a 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
-    "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable";
+    "-D_XOPEN_SOURCE";
 
   # some packages want to link to the static tcmalloc_minimal
   # to drop the runtime dependency on gperftools

From 2540a4111ff42f7222f6b06766063c0feb3aebc5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 18:48:20 +0000
Subject: [PATCH 199/956] kpt: 0.37.0 -> 0.37.1

---
 pkgs/applications/networking/cluster/kpt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix
index 712761eeef2..ae9380c5139 100644
--- a/pkgs/applications/networking/cluster/kpt/default.nix
+++ b/pkgs/applications/networking/cluster/kpt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kpt";
-  version = "0.37.0";
+  version = "0.37.1";
 
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn";
+    sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM=";
   };
 
-  vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv";
+  vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI=";
 
   subPackages = [ "." ];
 

From 5eeafdb3adf41bbeb7eeff5670469a88d5bf1413 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 18:56:23 +0000
Subject: [PATCH 200/956] kstars: 3.5.0 -> 3.5.1

---
 pkgs/applications/science/astronomy/kstars/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix
index c32d671cb05..33f00979c97 100644
--- a/pkgs/applications/science/astronomy/kstars/default.nix
+++ b/pkgs/applications/science/astronomy/kstars/default.nix
@@ -14,11 +14,11 @@
 
 mkDerivation rec {
   pname = "kstars";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
-    sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1";
+    sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU=";
   };
 
   patches = [

From 9e403b19a1444b373874b6e9efdd728613c6badc Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 15 Dec 2020 13:25:55 -0500
Subject: [PATCH 201/956] qemu: 5.1.0 -> 5.2.0

Updates to latest version of QEMU.
The build system has changed to ninja.
There are several configuration flags that aren't enabled. I will
defer to maintainers on those.

Adds autoPatchelfHook for patching output dynamically linked binaries.

qemu: use Nix's meson vs bundled

qemu: remove custom directory locations

It appears that these directories are no longer automatically prefixed
with $out/, so they are now trying to write to the system /etc/, /var/
directories, which is not permitted in sandbox.
The default directories seem to work OK, so using those.
---
 .../virtualization/qemu/CVE-2020-27617.patch  | 43 -------------------
 .../virtualization/qemu/default.nix           | 38 ++++++----------
 .../virtualization/qemu/no-etc-install.patch  | 12 ------
 3 files changed, 12 insertions(+), 81 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/qemu/CVE-2020-27617.patch
 delete mode 100644 pkgs/applications/virtualization/qemu/no-etc-install.patch

diff --git a/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch b/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch
deleted file mode 100644
index fa708b29836..00000000000
--- a/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6d19c0cc6c5a9bba308fc29d7c0edc2dc372c41b Mon Sep 17 00:00:00 2001
-From: Prasad J Pandit <pjp@fedoraproject.org>
-Date: Wed, 21 Oct 2020 11:35:50 +0530
-Subject: [PATCH] net: remove an assert call in eth_get_gso_type
-
-eth_get_gso_type() routine returns segmentation offload type based on
-L3 protocol type. It calls g_assert_not_reached if L3 protocol is
-unknown, making the following return statement unreachable. Remove the
-g_assert call, it maybe triggered by a guest user.
-
-Reported-by: Gaoning Pan <pgn@zju.edu.cn>
-Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
----
- net/eth.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/net/eth.c b/net/eth.c
-index 0c1d413ee2..eee77071f9 100644
---- a/net/eth.c
-+++ b/net/eth.c
-@@ -16,6 +16,7 @@
-  */
- 
- #include "qemu/osdep.h"
-+#include "qemu/log.h"
- #include "net/eth.h"
- #include "net/checksum.h"
- #include "net/tap.h"
-@@ -71,9 +72,8 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto)
-             return VIRTIO_NET_HDR_GSO_TCPV6 | ecn_state;
-         }
-     }
--
--    /* Unsupported offload */
--    g_assert_not_reached();
-+    qemu_log_mask(LOG_GUEST_ERROR, "%s: probably not GSO frame, "
-+        "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto);
- 
-     return VIRTIO_NET_HDR_GSO_NONE | ecn_state;
- }
--- 
-2.28.0
-
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index beb388afa7d..61ebe2ceec7 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib
 , perl, pixman, vde2, alsaLib, texinfo, flex
-, bison, lzo, snappy, libaio, gnutls, nettle, curl
-, makeWrapper
+, bison, lzo, snappy, libaio, gnutls, nettle, curl, ninja, meson
+, makeWrapper, autoPatchelfHook
 , attr, libcap, libcap_ng
 , CoreServices, Cocoa, Hypervisor, rez, setfile
 , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
 , seccompSupport ? stdenv.isLinux, libseccomp
 , alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner
 , pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio
-, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2
+, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2, SDL2_image
 , gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook
 , vncSupport ? !nixosTestRunner, libjpeg, libpng
 , smartcardSupport ? !nixosTestRunner, libcacard
@@ -39,7 +39,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "5.1.0";
+  version = "5.2.0";
   pname = "qemu"
     + lib.optionalString xenSupport "-xen"
     + lib.optionalString hostCpuOnly "-host-cpu-only"
@@ -47,10 +47,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url= "https://download.qemu.org/qemu-${version}.tar.xz";
-    sha256 = "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9";
+    sha256 = "1g0pvx4qbirpcn9mni704y03n3lvkmw2c0rbcwvydyr8ns4xh66b";
   };
 
-  nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison ]
+  nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja autoPatchelfHook ]
     ++ optionals gtkSupport [ wrapGAppsHook ];
   buildInputs =
     [ zlib glib perl pixman
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     ++ optionals seccompSupport [ libseccomp ]
     ++ optionals numaSupport [ numactl ]
     ++ optionals pulseSupport [ libpulseaudio ]
-    ++ optionals sdlSupport [ SDL2 ]
+    ++ optionals sdlSupport [ SDL2 SDL2_image ]
     ++ optionals gtkSupport [ gtk3 gettext vte ]
     ++ optionals vncSupport [ libjpeg libpng ]
     ++ optionals smartcardSupport [ libcacard ]
@@ -77,20 +77,13 @@ stdenv.mkDerivation rec {
     ++ optionals smbdSupport [ samba ];
 
   enableParallelBuilding = true;
+  dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
 
   outputs = [ "out" "ga" ];
 
   patches = [
-    ./no-etc-install.patch
     ./fix-qemu-ga.patch
     ./9p-ignore-noatime.patch
-    ./CVE-2020-27617.patch
-    (fetchpatch {
-      # e1000e: infinite loop scenario in case of null packet descriptor, remove for QEMU >= 5.2.0-rc3
-      name = "CVE-2020-28916.patch";
-      url = "https://git.qemu.org/?p=qemu.git;a=patch;h=c2cb511634012344e3d0fe49a037a33b12d8a98a";
-      sha256 = "1kvm6wl4vry0npiisxsn76h8nf1iv5fmqsyjvb46203f1yyg5pis";
-    })
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
     ++ optionals stdenv.hostPlatform.isMusl [
     (fetchpatch {
@@ -108,27 +101,19 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  # Remove CVE-2020-{29129,29130} for QEMU >5.1.0
-  postPatch = ''
-    (cd slirp && patch -p1 < ${fetchpatch {
-      name = "CVE-2020-29129_CVE-2020-29130.patch";
-      url = "https://gitlab.freedesktop.org/slirp/libslirp/-/commit/2e1dcbc0c2af64fcb17009eaf2ceedd81be2b27f.patch";
-      sha256 = "01vbjqgnc0kp881l5p6b31cyyirhwhavm6x36hlgkymswvl3wh9w";
-    }})
-  '';
-
   hardeningDisable = [ "stackprotector" ];
 
   preConfigure = ''
     unset CPP # intereferes with dependency calculation
+    # this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang
+    chmod +x ./scripts/shaderinclude.pl
+    patchShebangs .
   '' + optionalString stdenv.hostPlatform.isMusl ''
     NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H"
   '';
 
   configureFlags =
     [ "--audio-drv-list=${audio}"
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
       "--enable-docs"
       "--enable-tools"
       "--enable-guest-agent"
@@ -169,6 +154,7 @@ stdenv.mkDerivation rec {
       wrapGApp $f
     done
   '';
+  preBuild = "cd build";
 
   # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
   postInstall = ''
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
deleted file mode 100644
index 5bab930d06a..00000000000
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -867,7 +867,7 @@ install-includedir:
- 	$(INSTALL_DIR) "$(DESTDIR)$(includedir)"
- 
- install: all $(if $(BUILD_DOCS),install-doc) \
--	install-datadir install-localstatedir install-includedir \
-+	install-datadir install-includedir \
- 	$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
- 	recurse-install
- ifneq ($(TOOLS),)

From 135a14fa45de3de39dc97336ab7f15fc442451dc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 19 Jan 2021 11:11:02 -0800
Subject: [PATCH 202/956] Revert "python3Packages.virtualenv: enable tests"

This reverts commit c030d1b85bbcc2772ea432b713d699710c8b537e.
---
 .../python-modules/virtualenv/default.nix     | 47 ++++---------------
 1 file changed, 8 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 6869d16d5a4..215cc853101 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -1,26 +1,18 @@
 { buildPythonPackage
+, fetchPypi
+, lib
+, stdenv
+, pythonOlder
+, isPy27
 , appdirs
 , contextlib2
-, cython
 , distlib
-, fetchPypi
 , filelock
-, fish
-, flaky
 , importlib-metadata
 , importlib-resources
-, isPy27
-, lib
 , pathlib2
-, pytest-freezegun
-, pytest-mock
-, pytest-timeout
-, pytestCheckHook
-, pythonOlder
 , setuptools_scm
 , six
-, stdenv
-, xonsh
 }:
 
 buildPythonPackage rec {
@@ -55,33 +47,10 @@ buildPythonPackage rec {
     ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch
   ];
 
-  checkInputs = [
-    cython
-    fish
-    flaky
-    pytest-freezegun
-    pytest-mock
-    pytest-timeout
-    pytestCheckHook
-  ] ++ lib.optionals (pythonOlder "3.9") [
-    xonsh
-  ];
-
-  preCheck = "export HOME=$(mktemp -d)";
-
-  # Ignore tests which requires network access
-  pytestFlagsArray = [
-    "--ignore tests/unit/create/test_creator.py"
-    "--ignore tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
-  ];
-
-  disabledTests = [ "test_can_build_c_extensions" ];
-  pythonImportsCheck = [ "virtualenv" ];
-
-  meta = with lib; {
+  meta = {
     description = "A tool to create isolated Python environments";
     homepage = "http://www.virtualenv.org";
-    license = licenses.mit;
-    maintainers = with maintainers; [ goibhniu ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ goibhniu ];
   };
 }

From c98d6ce51f1ec9bcb2ce49d8210f3ce51dd7b29a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 19 Jan 2021 11:11:11 -0800
Subject: [PATCH 203/956] Revert "python3Packages.virtualenv: 20.2.1 -> 20.3.1"

This reverts commit 86235815b3e0b1be6964fe7487ee169ebd917fd5.
---
 pkgs/development/python-modules/virtualenv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 215cc853101..233101728f8 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.3.1";
+  version = "20.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-DBEaIjaxkUIrN/6MKLjIKM7TmqtL9WJ/pcMxrv+1cNk=";
+    sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5";
   };
 
   nativeBuildInputs = [

From 3144b2ee1873775ab0903e4e6d8881c0b31ca344 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 19 Jan 2021 20:33:26 +0100
Subject: [PATCH 204/956] zsh-powerlevel10k: 1.14.4 -> 1.14.6

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

diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 0bc46849df2..c18a863c636 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.14.4";
+  version = "1.14.6";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
     rev = "v${version}";
-    sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk";
+    sha256 = "1z6xipd7bgq7fc03x9j2dmg3yv59xyjf4ic5f1l6l6pw7w3q4sq7";
   };
 
   patches = [

From 5b6d3c4b13e50540d044a7edd2e15051f09126d0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 19 Jan 2021 20:52:27 +0100
Subject: [PATCH 205/956] chromium: 87.0.4280.141 -> 88.0.4324.96

https://chromereleases.googleblog.com/2021/01/stable-channel-update-for-desktop_19.html

This update includes 36 security fixes.

CVEs:
CVE-2021-21117 CVE-2021-21118 CVE-2021-21119 CVE-2021-21120
CVE-2021-21121 CVE-2021-21122 CVE-2021-21123 CVE-2021-21124
CVE-2021-21125 CVE-2020-16044 CVE-2021-21126 CVE-2021-21127
CVE-2021-21128 CVE-2021-21129 CVE-2021-21130 CVE-2021-21131
CVE-2021-21132 CVE-2021-21133 CVE-2021-21134 CVE-2021-21135
CVE-2021-21136 CVE-2021-21137 CVE-2021-21138 CVE-2021-21139
CVE-2021-21140 CVE-2021-21141
---
 .../browsers/chromium/upstream-info.json       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 69ab7e71067..75653d312b4 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,20 +1,20 @@
 {
   "stable": {
-    "version": "87.0.4280.141",
-    "sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l",
-    "sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp",
+    "version": "88.0.4324.96",
+    "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9",
+    "sha256bin64": "09210781s9y49l6qkbd1v8w52741rmhxz6cc6qsldnqpm5mwlgsc",
     "deps": {
       "gn": {
-        "version": "2020-09-09",
+        "version": "2020-11-05",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
-        "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
+        "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
+        "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
       }
     },
     "chromedriver": {
-      "version": "87.0.4280.88",
-      "sha256_linux": "1insh1imi25sj4hdkbll5rzwnag8wvfxv4ckshpq8akl8r13p6lj",
-      "sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78"
+      "version": "88.0.4324.27",
+      "sha256_linux": "1vx1llg0x6903ggqa345iswd63y9c24184zv784q01zqxqwn0g8p",
+      "sha256_darwin": "0x1s6crfwkcn86w6p8g4vmx5raqlr41pjr4h2dbwppgrc0nx1p14"
     }
   },
   "beta": {

From 90009b078b9eda268512ee7ab946572966841edf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 20:58:38 +0100
Subject: [PATCH 206/956] metasploit: 6.0.12 -> 6.0.25

---
 pkgs/tools/security/metasploit/Gemfile      |   2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 128 ++++-----
 pkgs/tools/security/metasploit/default.nix  |   4 +-
 pkgs/tools/security/metasploit/gemset.nix   | 272 ++++++++++++--------
 4 files changed, 233 insertions(+), 173 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 4df0d2235a0..fcae2cf5d44 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.12"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.25"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 8ef6d3b3148..f8eb110712f 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58
-  ref: refs/tags/6.0.12
+  revision: 7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c
+  ref: refs/tags/6.0.25
   specs:
-    metasploit-framework (6.0.12)
+    metasploit-framework (6.0.25)
       actionpack (~> 5.2.2)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -31,7 +31,7 @@ GIT
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 2.0.22)
+      metasploit-payloads (= 2.0.26)
       metasploit_data_models
       metasploit_payloads-mettle (= 1.0.2)
       mqtt
@@ -50,6 +50,7 @@ GIT
       pcaprub
       pdf-reader
       pg
+      puma
       railties
       rb-readline
       recog
@@ -86,6 +87,7 @@ GIT
       windows_error
       xdr
       xmlrpc
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/
@@ -119,41 +121,41 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
     arel (9.0.0)
-    arel-helpers (2.11.0)
+    arel-helpers (2.12.0)
       activerecord (>= 3.1.0, < 7)
     aws-eventstream (1.1.0)
-    aws-partitions (1.385.0)
-    aws-sdk-core (3.109.1)
+    aws-partitions (1.415.0)
+    aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.202.0)
+    aws-sdk-ec2 (1.220.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iam (1.46.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.39.0)
+    aws-sdk-kms (1.40.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
+    aws-sdk-s3 (1.87.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.16)
-    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.1.0)
     bindata (2.4.8)
     bit-struct (0.16)
-    bson (4.11.0)
+    bson (4.11.1)
     builder (3.2.4)
     concurrent-ruby (1.0.5)
     cookiejar (0.3.3)
     crass (1.0.6)
     daemons (1.3.1)
-    dnsruby (1.61.4)
+    dnsruby (1.61.5)
       simpleidn (~> 0.1)
     ed25519 (1.2.4)
     em-http-request (1.1.7)
@@ -164,13 +166,15 @@ GEM
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
-    erubi (1.9.0)
+    erubi (1.10.0)
     eventmachine (1.2.7)
-    faker (2.14.0)
+    faker (2.15.1)
       i18n (>= 1.6, < 2)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
+    faraday-net_http (1.0.0)
     faye-websocket (0.11.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
@@ -179,24 +183,24 @@ GEM
     hrr_rb_ssh (0.3.0.pre2)
       ed25519 (~> 1.2)
     http_parser.rb (0.6.0)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     io-console (0.5.6)
-    irb (1.2.7)
+    irb (1.3.0)
       reline (>= 0.1.5)
     jmespath (1.4.0)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.3.1)
-    loofah (2.7.0)
+    json (2.5.1)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     metasm (1.0.4)
-    metasploit-concern (3.0.0)
+    metasploit-concern (3.0.1)
       activemodel (~> 5.2.2)
       activesupport (~> 5.2.2)
       railties (~> 5.2.2)
-    metasploit-credential (4.0.2)
+    metasploit-credential (4.0.3)
       metasploit-concern
       metasploit-model
       metasploit_data_models (>= 3.0.0)
@@ -206,12 +210,12 @@ GEM
       rex-socket
       rubyntlm
       rubyzip
-    metasploit-model (3.1.2)
+    metasploit-model (3.1.3)
       activemodel (~> 5.2.2)
       activesupport (~> 5.2.2)
       railties (~> 5.2.2)
-    metasploit-payloads (2.0.22)
-    metasploit_data_models (4.1.0)
+    metasploit-payloads (2.0.26)
+    metasploit_data_models (4.1.1)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
       arel-helpers
@@ -222,21 +226,23 @@ GEM
       recog (~> 2.0)
     metasploit_payloads-mettle (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
     mqtt (0.5.0)
     msgpack (1.3.3)
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nessus_rest (0.1.6)
-    net-ldap (0.16.3)
+    net-ldap (0.17.0)
     net-ssh (6.1.0)
     network_interface (0.0.2)
     nexpose (7.2.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    octokit (4.19.0)
+    nio4r (2.5.4)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.2)
@@ -254,6 +260,9 @@ GEM
       ttfunk
     pg (1.2.3)
     public_suffix (4.0.6)
+    puma (5.1.1)
+      nio4r (~> 2.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
@@ -270,65 +279,65 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rb-readline (0.5.5)
-    recog (2.3.15)
+    recog (2.3.18)
       nokogiri
-    redcarpet (3.5.0)
-    reline (0.1.6)
+    redcarpet (3.5.1)
+    reline (0.2.0)
       io-console (~> 0.5)
-    rex-arch (0.1.13)
+    rex-arch (0.1.14)
       rex-text
-    rex-bin_tools (0.1.6)
+    rex-bin_tools (0.1.7)
       metasm
       rex-arch
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.13)
-    rex-encoder (0.1.4)
+    rex-core (0.1.14)
+    rex-encoder (0.1.5)
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.24)
+    rex-exploitation (0.1.26)
       jsobfu
       metasm
       rex-arch
       rex-encoder
       rex-text
-    rex-java (0.1.5)
-    rex-mime (0.1.5)
+    rex-java (0.1.6)
+    rex-mime (0.1.6)
       rex-text
-    rex-nop (0.1.1)
+    rex-nop (0.1.2)
       rex-arch
-    rex-ole (0.1.6)
+    rex-ole (0.1.7)
       rex-text
-    rex-powershell (0.1.87)
+    rex-powershell (0.1.88)
       rex-random_identifier
       rex-text
       ruby-rc4
-    rex-random_identifier (0.1.4)
+    rex-random_identifier (0.1.5)
       rex-text
-    rex-registry (0.1.3)
-    rex-rop_builder (0.1.3)
+    rex-registry (0.1.4)
+    rex-rop_builder (0.1.4)
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.24)
+    rex-socket (0.1.25)
       rex-core
     rex-sslscan (0.1.5)
       rex-core
       rex-socket
       rex-text
-    rex-struct2 (0.1.2)
-    rex-text (0.2.28)
-    rex-zip (0.1.3)
+    rex-struct2 (0.1.3)
+    rex-text (0.2.29)
+    rex-zip (0.1.4)
       rex-text
     rkelly-remix (0.0.7)
-    ruby-macho (2.3.0)
+    ruby-macho (2.5.0)
     ruby-rc4 (0.1.5)
     ruby2_keywords (0.0.2)
-    ruby_smb (2.0.6)
+    ruby_smb (2.0.7)
       bindata
       openssl-ccm
       openssl-cmac
@@ -348,17 +357,17 @@ GEM
       tilt (~> 2.0)
     sqlite3 (1.4.2)
     sshkey (2.0.0)
-    thin (1.7.2)
+    thin (1.8.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    ttfunk (1.6.2.1)
-    tzinfo (1.2.7)
+    ttfunk (1.7.0)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2020.4)
+    tzinfo-data (1.2020.6)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -372,7 +381,8 @@ GEM
     xdr (3.0.2)
       activemodel (>= 4.2, < 7.0)
       activesupport (>= 4.2, < 7.0)
-    xmlrpc (0.3.0)
+    xmlrpc (0.3.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 1260584a3a7..0e600e36414 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.0.12";
+  version = "6.0.25";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
+    sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 4879eb92284..c360e42ad1e 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -84,10 +84,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp";
+      sha256 = "12wgkhajfsm3fgk43zf7xyxrx7q2kc4ggq459p1az6p0b9jscarx";
       type = "gem";
     };
-    version = "2.11.0";
+    version = "2.12.0";
   };
   Ascii85 = {
     groups = ["default"];
@@ -114,30 +114,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb";
+      sha256 = "1348hdy6wf1av75nvlwp4b0pp4vshc9vrzic5vzrwnx9fg6cib08";
       type = "gem";
     };
-    version = "1.385.0";
+    version = "1.415.0";
   };
   aws-sdk-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx";
+      sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4";
       type = "gem";
     };
-    version = "3.109.1";
+    version = "3.110.0";
   };
   aws-sdk-ec2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08";
+      sha256 = "1x3hw3ld27gxj0mmbaj4dw6aw90kr06mkjfx5wxxb807krp5giza";
       type = "gem";
     };
-    version = "1.202.0";
+    version = "1.220.0";
   };
   aws-sdk-iam = {
     groups = ["default"];
@@ -154,20 +154,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a";
+      sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4";
       type = "gem";
     };
-    version = "1.39.0";
+    version = "1.40.0";
   };
   aws-sdk-s3 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv";
+      sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7";
       type = "gem";
     };
-    version = "1.83.1";
+    version = "1.87.0";
   };
   aws-sigv4 = {
     groups = ["default"];
@@ -194,10 +194,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35";
+      sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   bindata = {
     groups = ["default"];
@@ -224,10 +224,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm";
+      sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp";
       type = "gem";
     };
-    version = "4.11.0";
+    version = "4.11.1";
   };
   builder = {
     groups = ["default"];
@@ -284,10 +284,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x";
+      sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx";
       type = "gem";
     };
-    version = "1.61.4";
+    version = "1.61.5";
   };
   ed25519 = {
     groups = ["default"];
@@ -324,10 +324,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
+      sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.0";
   };
   eventmachine = {
     groups = ["default"];
@@ -344,20 +344,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6";
+      sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk";
       type = "gem";
     };
-    version = "2.14.0";
+    version = "2.15.1";
   };
   faraday = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35";
+      sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.3.0";
+  };
+  faraday-net_http = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d";
+      type = "gem";
+    };
+    version = "1.0.0";
   };
   faye-websocket = {
     groups = ["default"];
@@ -414,10 +424,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+      sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv";
       type = "gem";
     };
-    version = "1.8.5";
+    version = "1.8.7";
   };
   io-console = {
     groups = ["default"];
@@ -434,10 +444,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g";
+      sha256 = "0a7gkibv9485dbh64k3r5j20bf553dg0kmxy3hhgl2jsgqyvrl1y";
       type = "gem";
     };
-    version = "1.2.7";
+    version = "1.3.0";
   };
   jmespath = {
     groups = ["default"];
@@ -464,20 +474,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
+      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
       type = "gem";
     };
-    version = "2.3.1";
+    version = "2.5.1";
   };
   loofah = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq";
+      sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
       type = "gem";
     };
-    version = "2.7.0";
+    version = "2.8.0";
   };
   metasm = {
     groups = ["default"];
@@ -494,62 +504,62 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2";
+      sha256 = "19cz0g463wl35gpdy1630n88a9m7fhhlcylspvvwc0m01sipc33g";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.1";
   };
   metasploit-credential = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx";
+      sha256 = "1f6cjvk68yypciycp8vdvhc5hrwmc8qi4y06s1cd77zj4m2skkmn";
       type = "gem";
     };
-    version = "4.0.2";
+    version = "4.0.3";
   };
   metasploit-framework = {
     groups = ["default"];
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58";
-      sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
+      rev = "7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c";
+      sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.0.12";
+    version = "6.0.25";
   };
   metasploit-model = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig";
+      sha256 = "0gmh23c3hc4my244m5lpd4kiysrsprag4rn6kvnnphxiflxvi4f7";
       type = "gem";
     };
-    version = "3.1.2";
+    version = "3.1.3";
   };
   metasploit-payloads = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb";
+      sha256 = "1gpv327750b7g243w0dmynji1gabwk81kb424y5hlbq9vqpgamnb";
       type = "gem";
     };
-    version = "2.0.22";
+    version = "2.0.26";
   };
   metasploit_data_models = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl";
+      sha256 = "1czqg49b7n9n2iqp6r4f1cxh8kd39gbjvydq09hzmzdmkwxh3x1f";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "4.1.1";
   };
   metasploit_payloads-mettle = {
     groups = ["default"];
@@ -576,20 +586,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+      sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.0";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
+      sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j";
       type = "gem";
     };
-    version = "5.14.2";
+    version = "5.14.3";
   };
   mqtt = {
     groups = ["default"];
@@ -646,10 +656,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
+      sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n";
       type = "gem";
     };
-    version = "0.16.3";
+    version = "0.17.0";
   };
   net-ssh = {
     groups = ["default"];
@@ -681,25 +691,35 @@
     };
     version = "7.2.1";
   };
+  nio4r = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk";
+      type = "gem";
+    };
+    version = "2.5.4";
+  };
   nokogiri = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
+      sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
       type = "gem";
     };
-    version = "1.10.10";
+    version = "1.11.1";
   };
   octokit = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24";
+      sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
       type = "gem";
     };
-    version = "4.19.0";
+    version = "4.20.0";
   };
   openssl-ccm = {
     groups = ["default"];
@@ -791,6 +811,26 @@
     };
     version = "4.0.6";
   };
+  puma = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b";
+      type = "gem";
+    };
+    version = "5.1.1";
+  };
+  racc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
   rack = {
     groups = ["default"];
     platforms = [];
@@ -856,10 +896,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
+      sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
       type = "gem";
     };
-    version = "13.0.1";
+    version = "13.0.3";
   };
   rb-readline = {
     groups = ["default"];
@@ -876,170 +916,170 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7";
+      sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69";
       type = "gem";
     };
-    version = "2.3.15";
+    version = "2.3.18";
   };
   redcarpet = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
+      sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
       type = "gem";
     };
-    version = "3.5.0";
+    version = "3.5.1";
   };
   reline = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk";
+      sha256 = "109gpk4c9712cc3ilvidgks9i42y8gwnjpw6j4w4hci09pasz7i1";
       type = "gem";
     };
-    version = "0.1.6";
+    version = "0.2.0";
   };
   rex-arch = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cvdy2ysiphdig258lkicbxqq2y47bkl69kgj4kkj8w338rb5kwa";
+      sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp";
       type = "gem";
     };
-    version = "0.1.13";
+    version = "0.1.14";
   };
   rex-bin_tools = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19q4cj7cis29k3zx9j2gp4h3ib0zig2fa4rs56c1gjr32f192zzk";
+      sha256 = "16w219ashxrgrgb5via9k45h7whrib77rmwy0f7akqf409pzjdp7";
       type = "gem";
     };
-    version = "0.1.6";
+    version = "0.1.7";
   };
   rex-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b9pf7f8m2zjck65dpp8h8v4n0a05kfas6cn9adv0w8d9z58aqvv";
+      sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw";
       type = "gem";
     };
-    version = "0.1.13";
+    version = "0.1.14";
   };
   rex-encoder = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z";
+      sha256 = "0lnrlii8d3r35927wp42bpdzh37dx3jqgdxk6lk5d6xvz6h14kp7";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "0.1.5";
   };
   rex-exploitation = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0inrf2vahmpxhjf84i8ak2b7gcirsrjrmb1rnvvqqr9kl0xw5xm3";
+      sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc";
       type = "gem";
     };
-    version = "0.1.24";
+    version = "0.1.26";
   };
   rex-java = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i";
+      sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys";
       type = "gem";
     };
-    version = "0.1.5";
+    version = "0.1.6";
   };
   rex-mime = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a";
+      sha256 = "0wzw1qcdgbn3iyskppy5038mcdrzplyai45pilm5qjj4fwvjdl6m";
       type = "gem";
     };
-    version = "0.1.5";
+    version = "0.1.6";
   };
   rex-nop = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny";
+      sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.1.2";
   };
   rex-ole = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww";
+      sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp";
       type = "gem";
     };
-    version = "0.1.6";
+    version = "0.1.7";
   };
   rex-powershell = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11wi8dpb2s8bvkqhbf80g16nyj2hscs3vz31ffzl1g0g6imcs0dl";
+      sha256 = "02bzkraz4722zkjkm5cn9kvhx2mbkrhd5g123bkqgfkd19kbfjif";
       type = "gem";
     };
-    version = "0.1.87";
+    version = "0.1.88";
   };
   rex-random_identifier = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fg94sczff5c2rlvqqgw2dndlqyzjil5rjk3p9f46ss2hc8zxlbk";
+      sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "0.1.5";
   };
   rex-registry = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q";
+      sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   rex-rop_builder = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy";
+      sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   rex-socket = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y";
+      sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg";
       type = "gem";
     };
-    version = "0.1.24";
+    version = "0.1.25";
   };
   rex-sslscan = {
     groups = ["default"];
@@ -1056,30 +1096,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452";
+      sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "0.1.3";
   };
   rex-text = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44";
+      sha256 = "05s0izxlb4rrhr42d6dz6idxdj4hrb7bdkk22qfwnaqdppb4w536";
       type = "gem";
     };
-    version = "0.2.28";
+    version = "0.2.29";
   };
   rex-zip = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7";
+      sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   rkelly-remix = {
     groups = ["default"];
@@ -1096,10 +1136,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8";
+      sha256 = "05nfdv5isk3g13qhzm6axg70bghg1z5nbsl04dwqqhaifjys0dhf";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.5.0";
   };
   ruby-rc4 = {
     groups = ["default"];
@@ -1126,10 +1166,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66";
+      sha256 = "0px84i3d9kqb40ff7nk3k7hb3w3kk80w5zsgi61svgddp1dbzh1n";
       type = "gem";
     };
-    version = "2.0.6";
+    version = "2.0.7";
   };
   rubyntlm = {
     groups = ["default"];
@@ -1206,10 +1246,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
+      sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
       type = "gem";
     };
-    version = "1.7.2";
+    version = "1.8.0";
   };
   thor = {
     groups = ["default"];
@@ -1246,30 +1286,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn";
+      sha256 = "15iaxz9iak5643bq2bc0jkbjv8w2zn649lxgvh5wg48q9d4blw13";
       type = "gem";
     };
-    version = "1.6.2.1";
+    version = "1.7.0";
   };
   tzinfo = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+      sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
       type = "gem";
     };
-    version = "1.2.7";
+    version = "1.2.9";
   };
   tzinfo-data = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a";
+      sha256 = "131dgg2sz3j15vp71xaijlb72nlii9fn8v5dc4vr6q7hrdq4kjf4";
       type = "gem";
     };
-    version = "1.2020.4";
+    version = "1.2020.6";
   };
   unf = {
     groups = ["default"];
@@ -1346,9 +1386,19 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683";
+      sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.3.1";
+  };
+  zeitwerk = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
+      type = "gem";
+    };
+    version = "2.4.2";
   };
 }
\ No newline at end of file

From a491d9ee016aa2d5c9ea898a6ae350e829b85e61 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Tue, 19 Jan 2021 21:12:29 +0100
Subject: [PATCH 207/956] metals: 0.9.8 -> 0.9.10

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

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 0937ccb5987..729ab88c680 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.9.8";
+  version = "0.9.10";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk";
+    outputHash     = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 033208fd46e03178655f3c4a59add1d9dbf57731 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 19 Jan 2021 20:10:03 +0100
Subject: [PATCH 208/956] cifs-utils: 6.9 -> 6.12

This notably fixes CVE-2020-14342.
---
 pkgs/os-specific/linux/cifs-utils/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index 026a20ddf9a..dcffe770dee 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -3,27 +3,25 @@
 
 stdenv.mkDerivation rec {
   pname = "cifs-utils";
-  version = "6.9";
+  version = "6.12";
 
   src = fetchurl {
     url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
-    sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q";
+    sha256 = "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj";
   };
 
   nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
 
   buildInputs = [ kerberos keyutils pam talloc ];
 
-  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # AC_FUNC_MALLOC is broken on cross builds.
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  makeFlags = [ "root_sbindir=$(out)/sbin" ];
-
   meta = with lib; {
-    homepage = "http://www.samba.org/linux-cifs/cifs-utils/";
+    homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils";
     description = "Tools for managing Linux CIFS client filesystems";
     platforms = platforms.linux;
     license = licenses.lgpl3;

From fb7a68de66808d4f028717492abe46710f0f8d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 19 Jan 2021 21:40:13 +0100
Subject: [PATCH 209/956] gperftools: use lib instead of stdenv.lib

See c06b2b3.
---
 pkgs/development/libraries/gperftools/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 140cd10473a..ac500525411 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }:
+{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }:
 
 stdenv.mkDerivation rec {
   name = "gperftools-2.8";
@@ -20,20 +20,20 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
-  buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
+  buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
 
   # Disable general dynamic TLS on AArch to support dlopen()'ing the library:
   # https://bugzilla.redhat.com/show_bug.cgi?id=1483558
-  configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
+  configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
     "--disable-general-dynamic-tls";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.am --replace stdc++ c++
     substituteInPlace Makefile.in --replace stdc++ c++
     substituteInPlace libtool --replace stdc++ c++
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
     "-D_XOPEN_SOURCE";
 
   # some packages want to link to the static tcmalloc_minimal
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gperftools/gperftools";
     description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
     platforms = with platforms; linux ++ darwin;

From 84634ff0c3b817c224ef99eaddf703c4a6e9dec0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 21:56:03 +0100
Subject: [PATCH 210/956] gitleaks: init at 7.2.0

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

diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
new file mode 100644
index 00000000000..98277461275
--- /dev/null
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -0,0 +1,29 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "gitleaks";
+  version = "7.2.0";
+
+  src = fetchFromGitHub {
+    owner = "zricethezav";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y";
+  };
+
+  vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9";
+
+  meta = with lib; {
+    description = "Scan git repos (or files) for secrets";
+    longDescription = ''
+      Gitleaks is a SAST tool for detecting hardcoded secrets like passwords,
+      API keys, and tokens in git repos.
+    '';
+    homepage = "https://github.com/zricethezav/gitleaks";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 393bb16da56..c38e68b2a67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4532,6 +4532,8 @@ in
 
   gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
 
+  gitleaks = callPackage ../tools/security/gitleaks { };
+
   gitaly = callPackage ../applications/version-management/gitlab/gitaly {
     ruby = ruby_2_7;
   };

From c1d1b478ff16198c0363680b736931f4ef4a77e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 21:57:12 +0100
Subject: [PATCH 211/956] git-hound: init at 1.3

---
 pkgs/tools/security/git-hound/default.nix | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/security/git-hound/default.nix

diff --git a/pkgs/tools/security/git-hound/default.nix b/pkgs/tools/security/git-hound/default.nix
new file mode 100644
index 00000000000..56fa2ce4763
--- /dev/null
+++ b/pkgs/tools/security/git-hound/default.nix
@@ -0,0 +1,30 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "git-hound";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "tillson";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1l2bif7qpc1yl93ih01g9jci7ba47rsnpq9js88rz216q93dzmsf";
+  };
+
+  vendorSha256 = "055hpfjbqng513c9rscb8jhnlxj7p82sr8cbsvwnzk569n71qwma";
+
+  meta = with lib; {
+    description = "Reconnaissance tool for GitHub code search";
+    longDescription = ''
+      GitHound pinpoints exposed API keys and other sensitive information
+      across all of GitHub using pattern matching, commit history searching,
+      and a unique result scoring system.
+    '';
+    homepage = "https://github.com/tillson/git-hound";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 393bb16da56..29bb33ed13b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4420,6 +4420,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  git-hound = callPackage ../tools/security/git-hound { };
+
   git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
 
   git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { };

From df75b21e7316ded11e695850f11e795cada6d553 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 Jan 2021 22:23:34 +0100
Subject: [PATCH 212/956] pwdsafety: init at 0.1.4

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

diff --git a/pkgs/tools/security/pwdsafety/default.nix b/pkgs/tools/security/pwdsafety/default.nix
new file mode 100644
index 00000000000..2a6ed328e49
--- /dev/null
+++ b/pkgs/tools/security/pwdsafety/default.nix
@@ -0,0 +1,25 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "pwdsafety";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "edoardottt";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1qnkabgc2924qg9x1ij51jq7lnxzcj1ygdp3x4mzi9gl532i191w";
+  };
+
+  vendorSha256 = "0avm4zwwqv476yrraaf5xkc1lac0mwnmzav5wckifws6r4x3xrsb";
+
+  meta = with lib; {
+    description = "Command line tool checking password safety";
+    homepage = "https://github.com/edoardottt/pwdsafety";
+    license = with licenses; [ gpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 393bb16da56..20bff862b54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24169,6 +24169,8 @@ in
 
   puremapping = callPackage ../applications/audio/pd-plugins/puremapping { };
 
+  pwdsafety = callPackage ../tools/security/pwdsafety { };
+
   pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { };
 
   qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };

From 0587291836fe948a3cc26486a84a040ca92c870b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 07:35:35 +1000
Subject: [PATCH 213/956] .editorconfig: add asc

---
 .editorconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 6625cbf6981..980bca1ee04 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -47,9 +47,10 @@ indent_style = space
 insert_final_newline = unset
 trim_trailing_whitespace = unset
 
-[*.{key,ovpn}]
+[*.{asc,key,ovpn}]
 insert_final_newline = unset
 end_of_line = unset
+trim_trailing_whitespace = unset
 
 [*.lock]
 indent_size = unset

From bd5240489d4f89de404ba872b6bd8edd548f5448 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 21:48:02 +0000
Subject: [PATCH 214/956] libcint: 4.0.6 -> 4.0.7

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

diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix
index 8415b964bb9..bd8e8bd4aaf 100644
--- a/pkgs/development/libraries/libcint/default.nix
+++ b/pkgs/development/libraries/libcint/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcint";
-  version = "4.0.6";
+  version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "sunqm";
     repo = "libcint";
     rev = "v${version}";
-    sha256 = "1bgzsyz1i0hvla5ax0lawp1kw25fkhzh9ddhq92mplizrj9y05c1";
+    sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s=";
   };
 
   nativeBuildInputs = [ cmake ];

From cb12dc0166fe7cfdb3737b14617e04a7f1401364 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 19 Jan 2021 23:02:44 +0100
Subject: [PATCH 215/956] gperftools: 2.8 -> 2.8.1

---
 .../libraries/gperftools/default.nix          | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index ac500525411..bdb4e67f85f 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -1,11 +1,20 @@
-{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, libunwind
+}:
 
 stdenv.mkDerivation rec {
-  name = "gperftools-2.8";
+  pname = "gperftools";
+  version = "2.8.1";
 
-  src = fetchurl {
-    url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0gjiplvday50x695pwjrysnvm5wfvg2b0gmqf6b4bdi8sv6yl394";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "${pname}-${version}";
+    sha256 = "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1";
   };
 
   patches = [
@@ -29,8 +38,6 @@ stdenv.mkDerivation rec {
 
   prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.am --replace stdc++ c++
-    substituteInPlace Makefile.in --replace stdc++ c++
-    substituteInPlace libtool --replace stdc++ c++
   '';
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin

From f1baf7323ab71263b46a190a58feca2c47a67eb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 22:06:02 +0000
Subject: [PATCH 216/956] kmon: 1.5.1 -> 1.5.3

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

diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix
index 502579bb931..cb48a48ff49 100644
--- a/pkgs/tools/system/kmon/default.nix
+++ b/pkgs/tools/system/kmon/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kmon";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0j6w4rg2gybcy1cv812qixravy0z0xpp33snrng11q802zq3mkmq";
+    sha256 = "sha256-2cP3kZnjlMmN3nWRPh1M+hk+dyssGNpJjlluDsm702g=";
   };
 
-  cargoSha256 = "0x5s3yi5bv3h1k54lrgcvkpdkmfphvwhnrmk5lmk6xd9pxfh218p";
+  cargoSha256 = "sha256-JFDtmi10iCK66/2ovg8tGAgGDW8Y4b5IYkSbDqu0PmQ=";
 
   nativeBuildInputs = [ python3 ];
 

From 8a89b8789a754bddde21e0e135988d9afdf0fa51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Tue, 19 Jan 2021 23:12:23 +0100
Subject: [PATCH 217/956] vimPlugins.telescope-fzy-native-nvim: init at
 2021-01-02

---
 pkgs/misc/vim-plugins/generated.nix    | 13 +++++++++++++
 pkgs/misc/vim-plugins/overrides.nix    | 25 +++++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 39 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8ebf6cf6a5d..5e0121440b1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3912,6 +3912,19 @@ let
     meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/";
   };
 
+  telescope-fzy-native-nvim = buildVimPluginFrom2Nix {
+     pname = "telescope-fzy-native-nvim";
+     version = "2021-01-02";
+     src = fetchFromGitHub {
+       owner = "nvim-telescope";
+       repo = "telescope-fzy-native.nvim";
+       rev = "654dffd924b29fb9a9252dcbd63528b1498ac9fb";
+       sha256 = "01x9z3n03qharjw778cxb16gw1dsxzmsxph4xsbfy1avf21c6x9g";
+       fetchSubmodules = true;
+     };
+     meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/";
+   };
+
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
     version = "2021-01-18";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 0debd6ba6fc..e4130554ad4 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -671,6 +671,31 @@ self: super: {
       ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s)
     '';
   });
+
+  telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: {
+    preFixup =
+      let
+        fzy-lua-native-path = "deps/fzy-lua-native";
+        fzy-lua-native =
+          stdenv.mkDerivation {
+            name = "fzy-lua-native";
+            src = "${old.src}/${fzy-lua-native-path}";
+            # remove pre-compiled binaries
+            preBuild = "rm -rf static/*";
+            installPhase = ''
+              install -Dm 444 -t $out/static static/*
+              install -Dm 444 -t $out/lua lua/*
+            '';
+          };
+      in
+      ''
+        rm -rf $target/${fzy-lua-native-path}/*
+        ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static
+        ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua
+      '';
+    meta.platforms = stdenv.lib.platforms.all;
+  });
+
 } // (
   let
     nodePackageNames = [
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 82695aaa30d..88e3c1e2297 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -407,6 +407,7 @@ nvim-lua/lsp_extensions.nvim
 nvim-lua/plenary.nvim
 nvim-lua/popup.nvim
 nvim-telescope/telescope-fzf-writer.nvim
+nvim-telescope/telescope-fzy-native.nvim
 nvim-telescope/telescope.nvim
 nvim-treesitter/completion-treesitter
 nvim-treesitter/nvim-treesitter

From 058356f4ad140243fe817e39b521f5c8597d18ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 22:46:29 +0000
Subject: [PATCH 218/956] lighttpd: 1.4.56 -> 1.4.58

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

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index d4a2c91d60b..afc7c5c7453 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null;
 assert enableExtendedAttrs -> attr != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.56";
+  name = "lighttpd-1.4.58";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "0xyzahrkmldwskwgjgj4dc3rmfmgqiwwr9y7jfhqpbp8g76q9kp4";
+    sha256 = "sha256-Jn/v/aE6GQ69znsVFy2L4W2pgAhFfzD93s1ygy0SbQ4=";
   };
 
   postPatch = ''

From 0e674064c21162aecadde918771815ff29d27116 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 20 Jan 2021 00:08:24 +0100
Subject: [PATCH 219/956] ngadmin: unstable-2017-11-17 -> unstable-2020-10-05

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

diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix
index 718a0970c86..2abc2eb0bc5 100644
--- a/pkgs/applications/networking/ngadmin/default.nix
+++ b/pkgs/applications/networking/ngadmin/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, lib, fetchgit, autoreconfHook, readline }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, readline }:
 
 stdenv.mkDerivation {
   pname = "ngadmin";
-  version = "unstable-2017-11-17";
+  version = "unstable-2020-10-05";
 
-  src = fetchgit {
-    url = "https://git.netgeek.ovh/c/ngadmin.git";
-    rev = "95240c567b5c40129d733cbd76911ba7574e4998";
-    sha256 = "052ss82fs8cxk3dqdwlh3r8q9gsm36in2lxdgwj9sljdgwg75c34";
+  src = fetchFromGitHub {
+    owner = "Alkorin";
+    repo = "ngadmin";
+    rev = "5bf8650ce6d465b8cb1e570548819f0cefe9a87d";
+    sha256 = "15vixhwqcpbjdxlaznans9w63kwl29mdkds6spvbv2i7l33qnhq4";
   };
 
   nativeBuildInputs = [ autoreconfHook readline ];

From 4b5b5a8cb9ced82690b41328872b4c84240f41f4 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 20 Jan 2021 00:09:36 +0100
Subject: [PATCH 220/956] ngadmin: add withReadline, enableEmu, enableSpy flags

---
 pkgs/applications/networking/ngadmin/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix
index 2abc2eb0bc5..8392e058345 100644
--- a/pkgs/applications/networking/ngadmin/default.nix
+++ b/pkgs/applications/networking/ngadmin/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, readline }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, readline
+, withReadline ? true
+, enableEmu ? true
+, enableSpy ? true
+}:
 
 stdenv.mkDerivation {
   pname = "ngadmin";
@@ -11,8 +15,14 @@ stdenv.mkDerivation {
     sha256 = "15vixhwqcpbjdxlaznans9w63kwl29mdkds6spvbv2i7l33qnhq4";
   };
 
-  nativeBuildInputs = [ autoreconfHook readline ];
+  nativeBuildInputs =
+    [ autoreconfHook ]
+    ++ lib.optional withReadline readline;
   enableParallelBuild = true;
+  configureFlags = with lib;
+    optional (!withReadline) "--without-readline"
+    ++ optional enableEmu "--enable-emu"
+    ++ optional enableSpy "--enable-spy";
 
   meta = with lib; {
     description = "Netgear switch (NSDP) administration tool";

From 31f5dd3f3655fbedac19f64f77844aa5ed79501c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 07:20:11 +1000
Subject: [PATCH 221/956] treewide: editorconfig fixes

- remove trailing whitespace
- use spaces for indentation
---
 pkgs/applications/editors/texmaker/default.nix   |  8 ++++----
 pkgs/applications/graphics/animbar/default.nix   | 16 ++++++++--------
 pkgs/applications/office/csv2odf/default.nix     |  2 +-
 .../science/astronomy/xearth/default.nix         |  2 +-
 .../science/biology/minimap2/default.nix         |  2 +-
 .../science/biology/prodigal/default.nix         |  2 +-
 .../science/logic/cryptominisat/default.nix      |  2 +-
 .../machine-learning/sc2-headless/maps.nix       |  2 +-
 .../robotics/betaflight-configurator/default.nix |  6 +++---
 .../robotics/sumorobot-manager/default.nix       |  2 +-
 pkgs/applications/search/grepm/default.nix       |  2 +-
 pkgs/applications/video/kazam/default.nix        |  2 +-
 .../virtualization/xen/xsa-patches.nix           |  2 +-
 .../window-managers/jwm/jwm-settings-manager.nix |  2 +-
 .../window-managers/lemonbar/default.nix         | 10 +++++-----
 .../applications/window-managers/vwm/default.nix |  6 +++---
 pkgs/build-support/fetchbzr/default.nix          |  2 +-
 pkgs/build-support/fetchmtn/default.nix          |  2 +-
 pkgs/data/documentation/rnrs/common.nix          |  2 +-
 pkgs/data/fonts/mno16/default.nix                |  2 +-
 pkgs/desktops/gnustep/projectcenter/default.nix  |  2 +-
 pkgs/development/compilers/ghc/8.10.1.nix        |  2 +-
 pkgs/development/compilers/ghc/8.8.2.nix         |  2 +-
 pkgs/development/compilers/ghc/8.8.3.nix         |  2 +-
 pkgs/development/compilers/ghc/8.8.4.nix         |  2 +-
 pkgs/development/compilers/ghc/head.nix          |  2 +-
 pkgs/development/compilers/manticore/default.nix | 14 +++++++-------
 pkgs/development/compilers/ocaml/3.11.2.nix      |  2 +-
 pkgs/development/idris-modules/tparsec.nix       |  2 +-
 pkgs/development/libraries/SDL_Pango/default.nix |  2 +-
 pkgs/development/libraries/biblesync/default.nix |  2 +-
 pkgs/development/libraries/boost/1.71.nix        |  2 +-
 pkgs/development/libraries/capstone/default.nix  |  2 +-
 pkgs/development/libraries/classads/default.nix  |  2 +-
 pkgs/development/libraries/cminpack/default.nix  |  2 +-
 .../libraries/concurrencykit/default.nix         |  2 +-
 .../development/libraries/dotnetfx35/default.nix |  8 ++++----
 .../development/libraries/dotnetfx40/default.nix |  8 ++++----
 .../development/libraries/elf-header/default.nix |  6 +++---
 .../development/libraries/fastpbkdf2/default.nix |  4 ++--
 pkgs/development/libraries/frame/default.nix     |  2 +-
 pkgs/development/libraries/glfw/2.x.nix          |  6 +++---
 pkgs/development/libraries/hyperscan/default.nix |  2 +-
 pkgs/development/libraries/jabcode/default.nix   |  2 +-
 .../libraries/java/geoipjava/default.nix         |  2 +-
 .../libraries/jemalloc/jemalloc450.nix           |  2 +-
 pkgs/development/libraries/levmar/default.nix    |  4 ++--
 pkgs/development/libraries/lib3ds/default.nix    |  4 ++--
 .../development/libraries/libavc1394/default.nix |  2 +-
 .../development/libraries/libcangjie/default.nix |  2 +-
 pkgs/development/libraries/libcutl/default.nix   |  2 +-
 pkgs/development/libraries/libdiscid/default.nix |  2 +-
 pkgs/development/libraries/libdvdread/4.9.9.nix  |  2 +-
 pkgs/development/libraries/libmcrypt/default.nix |  2 +-
 pkgs/development/libraries/libofx/default.nix    |  2 +-
 pkgs/development/libraries/liboop/default.nix    |  2 +-
 pkgs/development/libraries/libredwg/default.nix  |  2 +-
 pkgs/development/libraries/libwpd/default.nix    |  4 ++--
 .../libraries/libx86/src-for-default.nix         |  4 ++--
 pkgs/development/libraries/martyr/default.nix    | 10 +++++-----
 .../libraries/opencore-amr/default.nix           |  6 +++---
 pkgs/development/libraries/qxt/default.nix       |  2 +-
 .../science/biology/bpp-seq/default.nix          |  2 +-
 pkgs/development/libraries/szip/default.nix      |  2 +-
 pkgs/development/libraries/theft/default.nix     |  4 ++--
 pkgs/development/libraries/tix/default.nix       |  4 ++--
 pkgs/development/libraries/tnt/default.nix       |  2 +-
 pkgs/development/libraries/udunits/default.nix   |  2 +-
 .../ocaml-modules/faillib/default.nix            |  2 +-
 .../development/ocaml-modules/lablgl/default.nix |  2 +-
 .../ocaml-modules/ocamlsdl/default.nix           |  4 ++--
 .../ocaml-modules/optcomp/default.nix            |  2 +-
 pkgs/development/ocaml-modules/piqi/default.nix  |  2 +-
 .../ocaml-modules/rresult/default.nix            |  2 +-
 .../ocaml-modules/xml-light/default.nix          |  2 +-
 pkgs/development/pure-modules/gsl/default.nix    |  2 +-
 .../development/python-modules/cbor2/default.nix |  2 +-
 .../python-modules/deprecated/default.nix        |  2 +-
 pkgs/development/python-modules/pint/default.nix |  2 +-
 .../python-modules/wrf-python/default.nix        |  2 +-
 pkgs/development/tools/analysis/emma/default.nix |  2 +-
 .../tools/documentation/mkdocs/default.nix       |  2 +-
 pkgs/development/tools/fmbt/default.nix          |  2 +-
 pkgs/development/tools/ineffassign/default.nix   |  2 +-
 pkgs/development/tools/makerpm/default.nix       |  4 ++--
 .../development/tools/misc/doclifter/default.nix |  6 +++---
 .../tools/ocaml/omake/0.9.8.6-rc1.nix            |  2 +-
 pkgs/development/tools/unity3d/default.nix       |  2 +-
 pkgs/development/tools/yuicompressor/default.nix |  4 ++--
 pkgs/development/web/kcgi/default.nix            |  2 +-
 pkgs/development/web/remarkjs/default.nix        |  2 +-
 .../dwarf-fortress/dwarf-therapist/wrapper.nix   |  4 ++--
 .../dwarf-fortress/legends-browser/default.nix   |  2 +-
 pkgs/games/dwarf-fortress/wrapper/default.nix    |  2 +-
 pkgs/games/frogatto/data.nix                     |  4 ++--
 pkgs/games/globulation/default.nix               |  6 +++---
 pkgs/games/rimshot/default.nix                   |  2 +-
 pkgs/games/snake4/default.nix                    |  2 +-
 pkgs/misc/drivers/epson-201106w/default.nix      |  2 +-
 pkgs/misc/drivers/epson-escpr/default.nix        |  2 +-
 pkgs/misc/drivers/epson-escpr2/default.nix       |  2 +-
 pkgs/os-specific/linux/can-isotp/default.nix     |  6 +++---
 .../linux/firmware/bt-fw-converter/default.nix   |  2 +-
 pkgs/os-specific/linux/input-utils/default.nix   |  2 +-
 pkgs/os-specific/linux/mxu11x0/default.nix       |  2 +-
 pkgs/os-specific/linux/powerstat/default.nix     |  8 ++++----
 pkgs/os-specific/linux/rewritefs/default.nix     |  4 ++--
 pkgs/servers/gopher/gofish/default.nix           |  2 +-
 pkgs/servers/sickbeard/sickrage.nix              |  2 +-
 pkgs/servers/wsdd/default.nix                    |  8 ++++----
 pkgs/servers/xmpp/pyMAILt/default.nix            | 10 +++++-----
 pkgs/shells/pash/default.nix                     |  2 +-
 pkgs/tools/X11/alttab/default.nix                |  2 +-
 pkgs/tools/X11/xsettingsd/default.nix            |  2 +-
 pkgs/tools/archivers/rpmextract/default.nix      |  2 +-
 pkgs/tools/backup/hpe-ltfs/default.nix           |  2 +-
 pkgs/tools/backup/ori/default.nix                |  2 +-
 pkgs/tools/bluetooth/openobex/default.nix        |  4 ++--
 pkgs/tools/filesystems/bcache-tools/default.nix  |  2 +-
 pkgs/tools/filesystems/ext4magic/default.nix     |  2 +-
 pkgs/tools/filesystems/genext2fs/default.nix     |  2 +-
 pkgs/tools/graphics/cfdg/src-for-default.nix     |  4 ++--
 pkgs/tools/graphics/scanbd/default.nix           |  6 +++---
 pkgs/tools/inputmethods/fcitx/default.nix        |  4 ++--
 pkgs/tools/misc/dumptorrent/default.nix          |  2 +-
 pkgs/tools/misc/dvtm/default.nix                 |  2 +-
 pkgs/tools/misc/pg_top/default.nix               |  4 ++--
 pkgs/tools/misc/pubs/default.nix                 |  4 ++--
 pkgs/tools/misc/rargs/default.nix                |  2 +-
 pkgs/tools/misc/teamocil/default.nix             |  2 +-
 pkgs/tools/misc/tty-clock/default.nix            |  2 +-
 pkgs/tools/networking/openconnect_pa/default.nix |  6 +++---
 pkgs/tools/networking/sshoogr/default.nix        |  6 +++---
 pkgs/tools/networking/wolfebin/default.nix       |  2 +-
 .../package-management/python2nix/default.nix    |  2 +-
 pkgs/tools/security/hashcash/default.nix         |  6 +++---
 pkgs/tools/security/libacr38u/default.nix        |  2 +-
 pkgs/tools/system/stress/default.nix             |  2 +-
 pkgs/tools/text/cconv/default.nix                |  4 ++--
 pkgs/tools/text/enca/default.nix                 |  2 +-
 pkgs/tools/video/untrunc-anthwlock/default.nix   |  2 +-
 141 files changed, 224 insertions(+), 224 deletions(-)

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 28b04723eae..75f22da2516 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -24,10 +24,10 @@ mkDerivation rec {
   meta = with lib; {
     description = "TeX and LaTeX editor";
     longDescription=''
-	This editor is a full fledged IDE for TeX and
-	LaTeX editing with completion, structure viewer, preview,
-	spell checking and support of any compilation chain.
-	'';
+      This editor is a full fledged IDE for TeX and
+      LaTeX editing with completion, structure viewer, preview,
+      spell checking and support of any compilation chain.
+    '';
     homepage = "http://www.xm1math.net/texmaker/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix
index 771145d54b6..dda734363eb 100644
--- a/pkgs/applications/graphics/animbar/default.nix
+++ b/pkgs/applications/graphics/animbar/default.nix
@@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Create your own animation on paper and transparancy";
     longDescription = ''
-	Animbar lets you easily create your own animation on paper and
-	transparancy. From a set of input images two output images are
-	computed, that are printed one on paper and one on
-	transparency. By moving the transparency over the paper you
-	create a fascinating animation effect. This kind of animation
-	technique is hundreds of years old and known under several
-	names: picket fence animation, barrier grid animation, Moiré
-	animation, to name a few.
+      Animbar lets you easily create your own animation on paper and
+      transparancy. From a set of input images two output images are
+      computed, that are printed one on paper and one on
+      transparency. By moving the transparency over the paper you
+      create a fascinating animation effect. This kind of animation
+      technique is hundreds of years old and known under several
+      names: picket fence animation, barrier grid animation, Moiré
+      animation, to name a few.
     '';
     homepage = "http://animbar.mnim.org";
     maintainers = with maintainers; [ leenaars ];
diff --git a/pkgs/applications/office/csv2odf/default.nix b/pkgs/applications/office/csv2odf/default.nix
index 7bab06ed4ab..436e8d97bdb 100644
--- a/pkgs/applications/office/csv2odf/default.nix
+++ b/pkgs/applications/office/csv2odf/default.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
       creating reports from databases and other data sources that produce csv files.
       csv2odf can be combined with cron and shell scripts to automatically generate
       business reports.
-      
+
       The output format (fonts, number formatting, etc.) is controlled by a
       template file that you can design in your office application of choice.
     '';
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
index 57054cc491a..bd92ae01ebb 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     longDescription =
       '' Xearth  sets  the X root window to an image of the Earth, as seen from your favorite vantage point in space,
          correctly shaded for the current position of the Sun.
-	 By default, xearth updates the displayed image every  five  minutes.
+         By default, xearth updates the displayed image every  five  minutes.
       '';
     maintainers = [ maintainers.mafo ];
     license = "xearth";
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
index ae327e2c43f..d21ef8b3d7a 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/man/man1
     cp minimap2.1 $out/share/man/man1
   '';
-  
+
   meta = with lib; {
     description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences";
     homepage = "https://lh3.github.io/minimap2";
diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix
index 70069fe541d..22883cc522f 100644
--- a/pkgs/applications/science/biology/prodigal/default.nix
+++ b/pkgs/applications/science/biology/prodigal/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     "CC=cc"
     "INSTALLDIR=$(out)/bin"
   ];
-  
+
   meta = with lib; {
     description = "Fast, reliable protein-coding gene prediction for prokaryotic genomes";
     homepage = "https://github.com/hyattpd/Prodigal";
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index 042a4b23566..33de2d27dc9 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50";
   };
 
-  patches = [ 
+  patches = [
     (fetchpatch {
       # https://github.com/msoos/cryptominisat/pull/621
       url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch";
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
index 6eec10e958c..47e14108e37 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
@@ -9,7 +9,7 @@ in
     sha256 = "19f873ilcdsf50g2v0s2zzmxil1bqncsk8nq99bzy87h0i7khkla";
     stripRoot = false;
   };
-  
+
   melee = fetchzip' {
     url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip";
     sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i";
diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
index 0b39c60b283..9a304272fe9 100644
--- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix
+++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
-  
+
   buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
-  
+
   installPhase = ''
     mkdir -p $out/bin \
              $out/opt/${pname}
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "The Betaflight flight control system configuration tool";
     longDescription = ''
       A crossplatform configuration tool for the Betaflight flight control system.
-      Various types of aircraft are supported by the tool and by Betaflight, e.g. 
+      Various types of aircraft are supported by the tool and by Betaflight, e.g.
       quadcopters, hexacopters, octocopters and fixed-wing aircraft.
     '';
     homepage    = "https://github.com/betaflight/betaflight/wiki";
diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
index bd056a2ec21..0b4b807a481 100644
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }:
- 
+
 stdenv.mkDerivation rec {
   pname = "sumorobot-manager";
   version = "0.9.0";
diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix
index 7fef36d910e..1225f036a49 100644
--- a/pkgs/applications/search/grepm/default.nix
+++ b/pkgs/applications/search/grepm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
       -e "s:^\( *\)mutt:\1${mutt}/bin/mutt:" \
       $out/bin/grepm
   '';
-  
+
   meta = with lib; {
     description = "Wrapper for grepmail utilizing mutt";
     homepage = "http://www.barsnick.net/sw/grepm.html";
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index d47b5fddf88..e6e971ad438 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ];
- 
+
   # workaround https://github.com/NixOS/nixpkgs/issues/56943
   strictDeps = false;
 
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index 26cdbc1f65f..b1d1d7783c2 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -454,7 +454,7 @@ in {
     })
   ];
 
-	# 4.5
+  # 4.5
   XSA_248_45 = [
     (xsaPatch {
       name = "248-4.5";
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index 2f45ba36112..d3b685e7dcd 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   pname = "jwm-settings-manager";
   version = "2018-10-19";
-  
+
   src = fetchFromGitHub {
     owner = "Israel-D";
     repo = "jwm-settings-manager";
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
index 2a4004e5543..88d4b8360a5 100644
--- a/pkgs/applications/window-managers/lemonbar/default.nix
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation {
   name = "lemonbar-1.4";
-  
+
   src = fetchurl {
     url    = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz";
     sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv";
   };
-  
+
   buildInputs = [ libxcb perl ];
-  
+
   prePatch = ''sed -i "s@/usr@$out@" Makefile'';
-  
+
   meta = with lib; {
     description = "A lightweight xcb based bar";
     homepage = "https://github.com/LemonBoy/bar";
     maintainers = [ maintainers.meisternu ];
-    license = "Custom";   
+    license = "Custom";
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
index 143ee83d2d1..9eea18f79d6 100644
--- a/pkgs/applications/window-managers/vwm/default.nix
+++ b/pkgs/applications/window-managers/vwm/default.nix
@@ -3,7 +3,7 @@ libvterm}:
 
 stdenv.mkDerivation rec {
   name = "vwm-2.1.3";
- 
+
   src = fetchurl {
     url = "mirror://sourceforge/vwm/${name}.tar.gz";
     sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf";
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
   preInstall = ''
     mkdir -p $out/bin $out/include
   '';
- 
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ];
- 
+
   meta = with lib; {
     homepage = "http://vwm.sourceforge.net/";
     description = "Dynamic window manager for the console";
diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix
index 2cf169de7a5..b7db9e9274d 100644
--- a/pkgs/build-support/fetchbzr/default.nix
+++ b/pkgs/build-support/fetchbzr/default.nix
@@ -10,6 +10,6 @@ stdenvNoCC.mkDerivation {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = sha256;
-  
+
   inherit url rev;
 }
diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix
index 7ce67453d69..b5da0f80a31 100644
--- a/pkgs/build-support/fetchmtn/default.nix
+++ b/pkgs/build-support/fetchmtn/default.nix
@@ -4,7 +4,7 @@
 # each is an url for sync
 
 # selector is mtn selector, like h:org.example.branch
-# 
+#
 {name ? "mtn-checkout", dbs ? [], sha256
 , selector ? "h:" + branch, branch}:
 
diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix
index 3443846c83c..7ba5fe07450 100644
--- a/pkgs/data/documentation/rnrs/common.nix
+++ b/pkgs/data/documentation/rnrs/common.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ texinfo ];
 
-  # Tell the builder about the name of the report.  
+  # Tell the builder about the name of the report.
   reportName = name;
 
   builder = ./builder.sh;
diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix
index 1b311d2c25a..eeb53904fe1 100644
--- a/pkgs/data/fonts/mno16/default.nix
+++ b/pkgs/data/fonts/mno16/default.nix
@@ -15,7 +15,7 @@ in fetchzip rec {
 
   meta = with lib; {
     description = "minimalist monospaced font";
-    homepage = "https://sev.dev/fonts/mno16"; 
+    homepage = "https://sev.dev/fonts/mno16";
     license = licenses.cc0;
   };
 }
diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/desktops/gnustep/projectcenter/default.nix
index abfdac1e7af..afe47c6cef7 100644
--- a/pkgs/desktops/gnustep/projectcenter/default.nix
+++ b/pkgs/desktops/gnustep/projectcenter/default.nix
@@ -16,7 +16,7 @@ gsmakeDerivation {
   # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS)
   # 2. Framework/PCProjectBuilder.m, locate gmake (similar)
   propagatedBuildInputs = [ base back gui gnumake gdb gorm ];
-  
+
   meta = {
     description = "GNUstep's integrated development environment";
   };
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
index 42eb994b8fe..ce963e1c275 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix
index fbb75637df6..8663f16f023 100644
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/pkgs/development/compilers/ghc/8.8.2.nix
@@ -189,7 +189,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix
index 538655a0d05..deb19bb87b5 100644
--- a/pkgs/development/compilers/ghc/8.8.3.nix
+++ b/pkgs/development/compilers/ghc/8.8.3.nix
@@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix
index e69766bccda..c1b39a70e38 100644
--- a/pkgs/development/compilers/ghc/8.8.4.nix
+++ b/pkgs/development/compilers/ghc/8.8.4.nix
@@ -198,7 +198,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 6f9f577743f..c203f5cf19c 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -203,7 +203,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf autoreconfHook automake m4 python3 sphinx
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 8d2ad8e6bbc..1919f999805 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -5,7 +5,7 @@ let
 in stdenv.mkDerivation {
   pname = "manticore";
   version = "2019.12.03";
- 
+
   src = fetchFromGitHub {
     owner = "ManticoreProject";
     repo = "manticore";
@@ -14,9 +14,9 @@ in stdenv.mkDerivation {
   };
 
   enableParallelBuilding = false;
- 
+
   nativeBuildInputs = [ autoreconfHook ];
-  
+
   buildInputs = [ coreutils smlnj ];
 
   autoreconfFlags = "-Iconfig -vfi";
@@ -28,8 +28,8 @@ in stdenv.mkDerivation {
     mv source repo_checkout
     cd repo_checkout
     chmod u+w . -R
-  ''; 
-  
+  '';
+
   postPatch = ''
     patchShebangs .
     substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout'
@@ -40,14 +40,14 @@ in stdenv.mkDerivation {
   meta = {
     description = "A parallel, pure variant of Standard ML";
 
-    longDescription = '' 
+    longDescription = ''
       Manticore is a high-level parallel programming language aimed at
       general-purpose applications running on multi-core
       processors. Manticore supports parallelism at multiple levels:
       explicit concurrency and coarse-grain parallelism via CML-style
       constructs and fine-grain parallelism via various light-weight
       notations, such as parallel tuple expressions and NESL/Nepal-style
-      parallel array comprehensions.  
+      parallel array comprehensions.
     '';
 
     homepage = "http://manticore.cs.uchicago.edu/";
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index 946013562c2..8c9a6ef07fa 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     [ (fetchurl {
         name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
         url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
-	sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
+        sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
       })
     ];
 
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index 84f88e1598b..ce040bebe35 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -8,7 +8,7 @@ build-idris-package  {
   version = "2020-02-11";
 
   ipkgName = "TParsec";
-  
+
   idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix
index 56ffbfe34d2..f5191a116c9 100644
--- a/pkgs/development/libraries/SDL_Pango/default.nix
+++ b/pkgs/development/libraries/SDL_Pango/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz";
   };
 
-  patches = [ 
+  patches = [
     (fetchpatch {
       url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch";
       sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld";
diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
index 39591a3a05f..5286359b946 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       navigation, and handling of incoming packets.
     '';
     license = licenses.publicDomain;
-    maintainers = [ maintainers.AndersonTorres ]; 
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix
index f66bd4cd6fb..7b128e25bb6 100644
--- a/pkgs/development/libraries/boost/1.71.nix
+++ b/pkgs/development/libraries/boost/1.71.nix
@@ -5,7 +5,7 @@ callPackage ./generic.nix (args // rec {
 
   src = fetchurl {
     #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2";
-    urls = [ 
+    urls = [
       "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"
       "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"
     ];
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index b9cf52d62ed..1e518227035 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")
     + "PREFIX=$out ./make.sh install";
-  
+
   nativeBuildInputs = [
     pkg-config
   ];
diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
index f2377a59e7b..68706c7b8d1 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/pkgs/development/libraries/classads/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   configureFlags = [
     "--enable-namespace" "--enable-flexible-member"
   ];
-  
+
   meta = {
     homepage = "http://www.cs.wisc.edu/condor/classad/";
     description = "The Classified Advertisements library provides a generic means for matching resources";
diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix
index 3b2d748a836..34678d9b37d 100644
--- a/pkgs/development/libraries/cminpack/default.nix
+++ b/pkgs/development/libraries/cminpack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "cminpack-1.3.6";
-  
+
   src = fetchurl {
     url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz";
     sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw";
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
index a54bc754782..d5d9aa75e89 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     url    = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
     sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp";
   };
-  
+
   #Deleting this line causes "Unknown option --disable-static"
   configurePhase = "./configure --prefix=$out";
 
diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix
index e1c59846aec..68569b516a9 100644
--- a/pkgs/development/libraries/dotnetfx35/default.nix
+++ b/pkgs/development/libraries/dotnetfx35/default.nix
@@ -12,12 +12,12 @@ in
       ln -s $src/MSBuild.exe $out/bin
     '';
   };
-  
+
   assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
-  
+
   wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
-  
+
   referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
-  
+
   referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
 }
diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix
index 701464071d0..1ffc10cfc60 100644
--- a/pkgs/development/libraries/dotnetfx40/default.nix
+++ b/pkgs/development/libraries/dotnetfx40/default.nix
@@ -12,12 +12,12 @@ in
       ln -s $src/MSBuild.exe $out/bin
     '';
   };
-  
+
   assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
-  
+
   wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
-  
+
   referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
-  
+
   referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
 }
diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix
index c1764e83c30..72166bb38ce 100644
--- a/pkgs/development/libraries/elf-header/default.nix
+++ b/pkgs/development/libraries/elf-header/default.nix
@@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation {
     outputsToInstall = [ "out" ];
     description = "The datastructures of ELF according to the target platform's libc";
     longDescription = ''
-	  The Executable and Linkable Format (ELF, formerly named Extensible Linking
-	  Format), is usually defined in a header like this.
-	'';
+      The Executable and Linkable Format (ELF, formerly named Extensible Linking
+      Format), is usually defined in a header like this.
+    '';
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.ericson2314 ];
   };
diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix
index 59056a9b9a3..eb5cb251620 100644
--- a/pkgs/development/libraries/fastpbkdf2/default.nix
+++ b/pkgs/development/libraries/fastpbkdf2/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation {
   name = "fastpbkdf2-1.0.0";
-  
+
   src = fetchFromGitHub {
     owner = "ctz";
     repo = "fastpbkdf2";
     rev = "v1.0.0";
     sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2";
   };
-  
+
   buildInputs = [ openssl ];
 
   preBuild = ''
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index 30a97b01528..76549e728eb 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a";
   };
 
-  buildInputs = [ 
+  buildInputs = [
     stdenv pkg-config
   ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
 
diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix
index e749ca733da..ca65315e1cb 100644
--- a/pkgs/development/libraries/glfw/2.x.nix
+++ b/pkgs/development/libraries/glfw/2.x.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
     make x11-dist-install PREFIX=$out
     mv $out/lib/libglfw.so $out/lib/libglfw.so.2
     ln -s libglfw.so.2 $out/lib/libglfw.so
-  ''; 
-  
-  meta = with stdenv.lib; { 
+  '';
+
+  meta = with stdenv.lib; {
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = "http://glfw.sourceforge.net/";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix
index 18e028b70ca..3ab52165b78 100644
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/pkgs/development/libraries/hyperscan/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
       Hyperscan uses hybrid automata techniques to allow simultaneous
       matching of large numbers (up to tens of thousands) of regular
-      expressions and for the matching of regular expressions across 
+      expressions and for the matching of regular expressions across
       streams of data.
 
       Hyperscan is typically used in a DPI library stack.
diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix
index c875e4a3943..36c4c8c61c5 100644
--- a/pkgs/development/libraries/jabcode/default.nix
+++ b/pkgs/development/libraries/jabcode/default.nix
@@ -3,7 +3,7 @@
 , lib
 , subproject ? "library" # one of "library", "reader" or  "writer"
 , zlib, libpng, libtiff
-, jabcode 
+, jabcode
 }:
 let
   subdir = lib.getAttr subproject {
diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix
index 6d4dfbfe61c..fd4bfb29706 100644
--- a/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/pkgs/development/libraries/java/geoipjava/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
   };
   buildInputs = [ jdk unzip ];
-  buildPhase = 
+  buildPhase =
     ''
       cd source
       javac $(find . -name \*.java)
diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix
index d328ab8016a..85b4fb100f7 100644
--- a/pkgs/development/libraries/jemalloc/jemalloc450.nix
+++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
   version = "4.5.0";
   sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
-} 
+}
diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix
index e8ef17081c9..7cf6329a77e 100644
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/pkgs/development/libraries/levmar/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl }:
-        
+
 stdenv.mkDerivation rec {
   name = "levmar-2.6";
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     cp liblevmar.a $out/lib
   '';
 
-  meta = { 
+  meta = {
     description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
     homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix
index 406b61e4393..39e3e2e660f 100644
--- a/pkgs/development/libraries/lib3ds/default.nix
+++ b/pkgs/development/libraries/lib3ds/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip }:
-        
+
 stdenv.mkDerivation rec {
   name = "lib3ds-1.3.0";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
-  meta = { 
+  meta = {
     description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
     homepage = "http://lib3ds.sourceforge.net/";
     license = "LGPL";
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 61bc655931f..8f4a678cb37 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libraw1394 ];
 
-  meta = { 
+  meta = {
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
     homepage = "https://sourceforge.net/projects/libavc1394/";
     license = stdenv.lib.licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index ca50126971b..506c3a3d3d6 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ automake autoconf libtool m4 sqlite ];
 
   configureScript = "./autogen.sh";
-  
+
   preConfigure = ''
     find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
   '';
diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
index b13805aa37a..d463e4af289 100644
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     description = "C++ utility library from Code Synthesis";
     longDescription = ''
         libcutl is a C++ utility library.
-        It contains a collection of generic and independent components such as 
+        It contains a collection of generic and independent components such as
         meta-programming tests, smart pointers, containers, compiler building blocks, etc.
     '';
     homepage = "https://codesynthesis.com/projects/libcutl/";
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index 1ecb1f3d572..bdfb5d8b304 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
-  
+
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";
     sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix
index 33b04b0f7c0..7f35c651b92 100644
--- a/pkgs/development/libraries/libdvdread/4.9.9.nix
+++ b/pkgs/development/libraries/libdvdread/4.9.9.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "libdvdread-4.9.9";
-  
+
   src = fetchurl {
     url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz";
     sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix
index a29fca45a99..59498170a1d 100644
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/pkgs/development/libraries/libmcrypt/default.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "libmcrypt-2.5.8";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz";
     sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";
diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index 3f6b3bcd5d7..f11489eaf9f 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ];
   buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
-  meta = { 
+  meta = {
     description = "Opensource implementation of the Open Financial eXchange specification";
     homepage = "http://libofx.sourceforge.net/";
     license = "LGPL";
diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix
index 6438fd5eb32..75fa4a80a31 100644
--- a/pkgs/development/libraries/liboop/default.nix
+++ b/pkgs/development/libraries/liboop/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "liboop-1.0";
-  
+
   src = fetchurl {
     url = "http://download.ofb.net/liboop/liboop.tar.gz";
     sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c";
diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix
index 71667460e23..358a8490e69 100644
--- a/pkgs/development/libraries/libredwg/default.nix
+++ b/pkgs/development/libraries/libredwg/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] 
+  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]
     ++ lib.optional enablePython swig;
 
   buildInputs = [ pcre2 ]
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index ee1f13b2a3e..7ddc7965c05 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "libwpd-0.10.0";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/libwpd/${name}.tar.xz";
     sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx";
   };
-  
+
   buildInputs = [ glib libgsf libxml2 zlib librevenge ];
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/development/libraries/libx86/src-for-default.nix
index 30be467f9fd..a681d9e5890 100644
--- a/pkgs/development/libraries/libx86/src-for-default.nix
+++ b/pkgs/development/libraries/libx86/src-for-default.nix
@@ -4,6 +4,6 @@ rec {
    hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav";
    url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz";
    advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz";
-  
-  
+
+
 }
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 51fd6962e70..46f95148d82 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, ant, jdk}:
 
 stdenv.mkDerivation rec {
-	pname = "martyr";
+  pname = "martyr";
   version = "0.3.9";
-	src = fetchurl {
-		url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
-		sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
-	};
+  src = fetchurl {
+    url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
+    sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
+  };
 
   buildInputs = [ ant jdk ];
 
diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix
index 4848ef864bf..f011def0eb9 100644
--- a/pkgs/development/libraries/opencore-amr/default.nix
+++ b/pkgs/development/libraries/opencore-amr/default.nix
@@ -2,7 +2,7 @@
 
 let
     version = "0.1.5";
-in 
+in
 stdenv.mkDerivation {
   pname = "opencore-amr";
   inherit version;
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
     url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz";
     sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
   };
-  
+
   meta = {
     homepage = "https://opencore-amr.sourceforge.io/";
-    description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. 
+    description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.
     Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)";
     license = stdenv.lib.licenses.asl20;
     maintainers = [ stdenv.lib.maintainers.kiloreux ];
diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix
index 3104aefb9ed..503e1b14c1f 100644
--- a/pkgs/development/libraries/qxt/default.nix
+++ b/pkgs/development/libraries/qxt/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   pname = "qxt";
   version = "0.6.2";
-  
+
   src = fetchzip {
     url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz";
     sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz";
diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/development/libraries/science/biology/bpp-seq/default.nix
index 79fd0fe6771..ef3f3d5756e 100644
--- a/pkgs/development/libraries/science/biology/bpp-seq/default.nix
+++ b/pkgs/development/libraries/science/biology/bpp-seq/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = bpp-core.meta // { 
+  meta = bpp-core.meta // {
     changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog";
   };
 }
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 2419cf55442..4f11f42de52 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl }:
-    
+
 stdenv.mkDerivation rec {
   pname = "szip";
   version = "2.1.1";
diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 646cc60406a..85dc2c75afb 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   checkTarget = "test";
-  
+
   installFlags = [ "PREFIX=$(out)" ];
 
   # fix the libtheft.pc file to use the right installation
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/lib/pkgconfig/libtheft.pc \
       --replace "/usr/local" "$out"
   '';
-  
+
   meta = with stdenv.lib; {
     description = "A C library for property-based testing";
     homepage    = "https://github.com/silentbicycle/theft/";
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
index f0b460b6f3d..52fffb42aa2 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/pkgs/development/libraries/tix/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
      url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
      sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
   };
-  patches = [ 
+  patches = [
   (fetchpatch {
     name = "tix-8.4.3-tcl8.5.patch";
     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   buildInputs = [ tcl tk ];
   # the configure script expects to find the location of the sources of
   # tcl and tk in {tcl,tk}Config.sh
-  # In fact, it only needs some private headers. We copy them in 
+  # In fact, it only needs some private headers. We copy them in
   # the private_headers folders and trick the configure script into believing
   # the sources are here.
   preConfigure = ''
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 7e8aa2983cf..93b760bc88f 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   pname = "tnt";
   version = "3.0.12";
-  
+
   src = fetchurl {
     url = "https://math.nist.gov/tnt/tnt_3_0_12.zip";
     sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7";
diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index 65e88f8fd8c..6b75b7e683f 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
   pname = "udunits";
   version = "2.2.27.6";
-  
+
   src = fetchFromGitHub {
     owner = "Unidata";
     repo = "UDUNITS-2";
diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix
index d045bd5a37a..63040fadda5 100644
--- a/pkgs/development/ocaml-modules/faillib/default.nix
+++ b/pkgs/development/ocaml-modules/faillib/default.nix
@@ -11,7 +11,7 @@ buildOcaml rec {
 
   src = fetchurl {
     url = "https://github.com/janestreet/faillib/archive/${version}.tar.gz";
-    sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; 
+    sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v";
   };
 
   propagatedBuildInputs = [ camlp4 herelib ];
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index a7b145c2d4e..3d57c4e40ed 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   version = "1.05";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz";
     sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
   };
diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
index bbfa2e4f6b5..7c782b5268f 100644
--- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: 
+{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
 
 let
   pname = "ocamlsdl";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   version = "0.9.1";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
     sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
   };
diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix
index 343fb28b6ad..b78d070962e 100644
--- a/pkgs/development/ocaml-modules/optcomp/default.nix
+++ b/pkgs/development/ocaml-modules/optcomp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
       sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y";
     })
   ;
-  
+
   createFindlibDestdir = true;
 
   buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index bbd7746d366..d7bc4b55b45 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   version = "0.6.15";
   pname = "piqi";
   name = "ocaml${ocaml.version}-${pname}-${version}";
- 
+
   src = fetchFromGitHub {
     owner = "alavrik";
     repo = pname;
diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix
index 2573c95c628..ac38657f776 100644
--- a/pkgs/development/ocaml-modules/rresult/default.nix
+++ b/pkgs/development/ocaml-modules/rresult/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ result ];
-  
+
 	inherit (topkg) buildPhase installPhase;
 
 	meta = {
diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix
index 0ca48ebee28..a6db0dc7870 100644
--- a/pkgs/development/ocaml-modules/xml-light/default.nix
+++ b/pkgs/development/ocaml-modules/xml-light/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     make all
     make opt
   '';
-  
+
   installPhase = ''
     make install_ocamlfind
     mkdir -p $out/share
diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix
index a0407577037..3d11f29fed3 100644
--- a/pkgs/development/pure-modules/gsl/default.nix
+++ b/pkgs/development/pure-modules/gsl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   baseName = "gsl";
   version = "0.12";
   name = "pure-${baseName}-${version}";
-  
+
   src = fetchurl {
     url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
     sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75";
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index 8dcedac4212..f793ecfae37 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools_scm ];
 
-  checkInputs = [ 
+  checkInputs = [
     pytest-cov
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix
index bca1de711f2..a64ed0b9d99 100644
--- a/pkgs/development/python-modules/deprecated/default.nix
+++ b/pkgs/development/python-modules/deprecated/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchPypi, buildPythonPackage,
-	wrapt, pytest, tox }:
+  wrapt, pytest, tox }:
 
 buildPythonPackage rec {
   pname = "Deprecated";
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index bb2a20cf62f..c0aa86a3763 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.6";
 
   nativeBuildInputs = [ setuptools_scm ];
-  
+
   propagatedBuildInputs = [ packaging ]
     ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix
index c4bc74a58d2..29279cc1a44 100644
--- a/pkgs/development/python-modules/wrf-python/default.nix
+++ b/pkgs/development/python-modules/wrf-python/default.nix
@@ -39,5 +39,5 @@ buildPythonPackage rec {
     homepage = "http://wrf-python.rtfd.org";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mhaselsteiner ];
-	};
+  };
 }
diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix
index 3cc16c07ec5..56d3554bf75 100644
--- a/pkgs/development/tools/analysis/emma/default.nix
+++ b/pkgs/development/tools/analysis/emma/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "emma-2.0.5312";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/emma/emma-2.0.5312.zip";
     sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj";
diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index 8d4480945bd..f3b66394207 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -41,7 +41,7 @@ buildPythonApplication rec {
       MkDocs is a fast, simple and downright gorgeous static site generator that's
       geared towards building project documentation. Documentation source files
       are written in Markdown, and configured with a single YAML configuration file.
-      
+
       MkDocs can also be used to generate general-purpose Websites.
     '';
     homepage = "http://mkdocs.org/";
diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix
index a78b649aaea..46a13238961 100644
--- a/pkgs/development/tools/fmbt/default.nix
+++ b/pkgs/development/tools/fmbt/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     python.pkgs.wrapPython ];
 
   buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
-    gnuplot graphviz tesseract gts 
+    gnuplot graphviz tesseract gts
     ];
 
   propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix
index 85c643537af..0d0f6824ce7 100644
--- a/pkgs/development/tools/ineffassign/default.nix
+++ b/pkgs/development/tools/ineffassign/default.nix
@@ -6,7 +6,7 @@
 buildGoPackage rec {
   pname = "ineffassign-unstable";
   version = "2018-09-09";
-	rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
+  rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
 
   goPackagePath = "github.com/gordonklaus/ineffassign";
   excludedPackages = ''testdata'';
diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix
index a05615a22d9..1577392c8bc 100644
--- a/pkgs/development/tools/makerpm/default.nix
+++ b/pkgs/development/tools/makerpm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: 
+{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }:
 
-stdenv.mkDerivation rec { 
+stdenv.mkDerivation rec {
   version = "1.0";
   pname = "makerpm";
 
diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix
index 3c6fa76616f..a1528cfca3e 100644
--- a/pkgs/development/tools/misc/doclifter/default.nix
+++ b/pkgs/development/tools/misc/doclifter/default.nix
@@ -7,16 +7,16 @@ stdenv.mkDerivation {
     sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2";
   };
   buildInputs = [ python ];
-  
+
   makeFlags = [ "PREFIX=$(out)" ];
-  
+
   preInstall = ''
     mkdir -p $out/bin
     mkdir -p $out/share/man/man1
     cp manlifter $out/bin
     cp manlifter.1 $out/share/man/man1
   '';
-  
+
   meta = {
     description = "Lift documents in nroff markups to XML-DocBook";
     homepage = "http://www.catb.org/esr/doclifter";
diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
index 6a3c0c20d85..b840cb7736b 100644
--- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 #
 #  configureFlags = if transitional then "--transitional" else "--strict";
 #
-#  buildFlags = [ "world.opt" ];		
+#  buildFlags = [ "world.opt" ];
 
   meta = {
     description = "Omake build system";
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 9441a3217b7..5c41a1dac93 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
   version = "${ver}x${build}";
 
   src = fetchurl {
-  	url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
+    url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
     sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv";
   };
 
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
index 549cc5046c4..05c1b62477b 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   pname = "yuicompressor";
   version = "2.4.8";
-  
+
   src = fetchurl {
     url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \
      "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
   '';
-  
+
   meta = with lib; {
     description = "A JavaScript and CSS minifier";
     homepage = "http://yui.github.io/yuicompressor/";
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
index 6c68f0d18e2..cd4b70624f5 100644
--- a/pkgs/development/web/kcgi/default.nix
+++ b/pkgs/development/web/kcgi/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''substituteInPlace configure \
     --replace /usr/local /
   '';
-  
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
 
diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix
index d9cc433fd84..ff4cd324b5d 100644
--- a/pkgs/development/web/remarkjs/default.nix
+++ b/pkgs/development/web/remarkjs/default.nix
@@ -10,7 +10,7 @@ let
     rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c";
     sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0";
   };
-  
+
   nodePackages = import ./nodepkgs.nix {
     inherit pkgs;
     inherit (stdenv.hostPlatform) system;
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 6871a611784..bd75a66b487 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -6,10 +6,10 @@ let
   inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini";
 
 in
-  
+
 stdenv.mkDerivation {
   name = "dwarf-therapist-${dwarf-therapist.version}";
-  
+
   wrapper = ./dwarf-therapist.in;
 
   paths = [ dwarf-therapist ];
diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix
index 6da6d97ff24..1efae4d2802 100644
--- a/pkgs/games/dwarf-fortress/legends-browser/default.nix
+++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix
@@ -8,7 +8,7 @@ let
     url = "https://github.com/robertjanetzko/LegendsBrowser/releases/download/${version}/legendsbrowser-${version}.jar";
     sha256 = "05b4ksbl4481rh3ykfirbp6wvxhppcd5mvclhn9995gsrcaj8gx9";
   };
-  
+
   script = writeShellScriptBin "legends-browser" ''
     set -eu
     BASE="$HOME/.local/share/df_linux/legends-browser/"
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 79b63e3ce9e..73288ab659f 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -60,7 +60,7 @@ let
   '' + lib.optionalString enableTWBT ''
     substituteInPlace $out/data/init/init.txt \
       --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
-  '' + 
+  '' +
  lib.optionalString enableTextMode ''
     substituteInPlace $out/data/init/init.txt \
       --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TEXT]'
diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix
index a077d01f3b6..e911709dffc 100644
--- a/pkgs/games/frogatto/data.nix
+++ b/pkgs/games/frogatto/data.nix
@@ -1,9 +1,9 @@
 { lib, stdenv, fetchFromGitHub }:
-  
+
 stdenv.mkDerivation {
   pname = "frogatto-data";
   version = "unstable-2018-12-18";
-  
+
   src = fetchFromGitHub {
     owner = "frogatto";
     repo = "frogatto";
diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index f25b1084b85..9150541afd0 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./header-order.patch ./public-buildproject.patch
     (fetchpatch {
-	  url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
-	  sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
-	})
+      url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
+      sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix
index 381d00bf992..e7f2f2e781a 100644
--- a/pkgs/games/rimshot/default.nix
+++ b/pkgs/games/rimshot/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   unpackPhase = ''
     unzip -j $src
-  '';  
+  '';
 
   installPhase =
   ''
diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix
index e5419cef249..c0cad5f05d3 100644
--- a/pkgs/games/snake4/default.nix
+++ b/pkgs/games/snake4/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
       --replace "-o \$(OWNER) -g \$(GROUP)" "" \
       --replace "4755" "755"
   '';
-  
+
   installFlags = [ "INSTLIBDIR=$(out)/lib"
                    "INSTBINDIR=$(out)/bin"
                    "INSTMANDIR=$(out)/man" ];
diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix
index 690a4e4841e..a5a32644c3a 100644
--- a/pkgs/misc/drivers/epson-201106w/default.nix
+++ b/pkgs/misc/drivers/epson-201106w/default.nix
@@ -13,7 +13,7 @@ in
       # NOTE: Don't forget to update the webarchive link too!
       urls = [
         "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"
-        "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"     
+        "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"
       ];
 
       sha256 = "1yig1xrh1ikblbp7sx706n5nnc237wy4mbch23ymy6akbgqg4aig";
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 8d8951db249..bdb2839ab0b 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     # To find new versions, visit
     # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
     # some printer like for instance "WF-7110" to get to the most recent
-    # version.  
+    # version.
     # NOTE: Don't forget to update the webarchive link too!
     urls = [
       "https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz"
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 934f00d7492..f0289c22272 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     # To find new versions, visit
     # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
     # some printer like for instance "WF-7210" to get to the most recent
-    # version.  
+    # version.
     # NOTE: Don't forget to update the webarchive link too!
     urls = [
       "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix
index 89857a35d92..9c30aae86fe 100644
--- a/pkgs/os-specific/linux/can-isotp/default.nix
+++ b/pkgs/os-specific/linux/can-isotp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   version = "20200910";
 
   hardeningDisable = [ "pic" ];
-  
+
   src = fetchFromGitHub {
     owner = "hartkopp";
     repo = "can-isotp";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  
+
   meta = with lib; {
     description = "Kernel module for ISO-TP (ISO 15765-2)";
     homepage = "https://github.com/hartkopp/can-isotp";
@@ -33,4 +33,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = [ maintainers.evck ];
   };
-}  
+}
diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
index f9218b688a9..a28189a9e47 100644
--- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
+++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
@@ -32,4 +32,4 @@ stdenv.mkDerivation  rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ zraexy ];
   };
-} 
+}
diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix
index 3be25867c33..36a203a47c7 100644
--- a/pkgs/os-specific/linux/input-utils/default.nix
+++ b/pkgs/os-specific/linux/input-utils/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   pname = "input-utils";
   version = "1.3";
-  
+
   src = fetchurl {
     url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz";
     sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli";
diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix
index 730b03e93fe..ac9f27e2e6b 100644
--- a/pkgs/os-specific/linux/mxu11x0/default.nix
+++ b/pkgs/os-specific/linux/mxu11x0/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/mxconf
     sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/Makefile
   '';
-  
+
   installPhase = ''
     install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/usb/serial/mxu11x0.ko"
     install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/misc/mxu11x0.ko"
diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 6020139ad4b..12a92c36c69 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -3,19 +3,19 @@
 stdenv.mkDerivation rec {
   pname = "powerstat";
   version = "0.02.24";
-  
+
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j";
   };
-  
+
   installFlags = [ "DESTDIR=${placeholder "out"}" ];
-  
+
   postInstall = ''
     mv $out/usr/* $out
     rm -r $out/usr
   '';
-  
+
   meta = with lib; {
     description = "Laptop power measuring tool";
     homepage = "https://kernel.ubuntu.com/~cking/powerstat/";
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index 08356724c72..161db99114b 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }: 
+{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }:
 
 stdenv.mkDerivation {
   pname = "rewritefs";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     rev    = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81";
     sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla";
   };
- 
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse pcre ];
 
diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix
index 6468f6a9fcc..db3bcb47ecc 100644
--- a/pkgs/servers/gopher/gofish/default.nix
+++ b/pkgs/servers/gopher/gofish/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz";
     sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s";
   };
-  	
+
   meta = with lib; {
     description = "A lightweight Gopher server";
     homepage = "http://gofish.sourceforge.net/";
diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix
index 6b7d3e7b1ca..7bd971e86e7 100644
--- a/pkgs/servers/sickbeard/sickrage.nix
+++ b/pkgs/servers/sickbeard/sickrage.nix
@@ -7,7 +7,7 @@ python2.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "SickRage";
     repo = "SickRage";
-    rev = version; 
+    rev = version;
     sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9";
   };
 
diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix
index 8fdd9a93a23..f1a385c6809 100644
--- a/pkgs/servers/wsdd/default.nix
+++ b/pkgs/servers/wsdd/default.nix
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ python3 ];
 
   patches = [
-    (fetchpatch {	
+    (fetchpatch {
       # https://github.com/christgau/wsdd/issues/72
-      name = "fix_send_messages_using_correct_socket.patch";	
-      url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch";	
-      sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg";	
+      name = "fix_send_messages_using_correct_socket.patch";
+      url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch";
+      sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg";
     })
   ];
 
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index 68349214359..03ded7a5d5c 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
   version = "20090101";
 
   src = fetchcvs {
-		cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy";
-		module = "xmpppy/mail-transport";
-		date = "2009-01-01";
-		sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
-	};
+    cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy";
+    module = "xmpppy/mail-transport";
+    date = "2009-01-01";
+    sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
+  };
 
   pythonPath = [ xmpppy ];
   buildInputs = [ pythonPackages.wrapPython ];
diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix
index 06ca2420798..8b2ac362959 100644
--- a/pkgs/shells/pash/default.nix
+++ b/pkgs/shells/pash/default.nix
@@ -3,7 +3,7 @@
 buildDotnetPackage {
   baseName = "pash";
   version = "git-2016-07-06";
-  
+
   src = fetchFromGitHub {
     owner = "Pash-Project";
     repo = "Pash";
diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix
index 4bddee68f82..1a4f1daad51 100644
--- a/pkgs/tools/X11/alttab/default.nix
+++ b/pkgs/tools/X11/alttab/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "026xd1bkg10fj2q1n6xx797xk1grpby25qj1pnw2lp4f3vc19qn6";
   };
 
-  nativeBuildInputs = [ 
+  nativeBuildInputs = [
     autoconf
     automake
     pkg-config
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
index 0bb1e5172ff..7572e19fbf9 100644
--- a/pkgs/tools/X11/xsettingsd/default.nix
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
   '';
-  
+
   installPhase = ''
     install -D -t "$out"/bin xsettingsd dump_xsettings
     install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix
index d4bbbe77a2d..db768a5d14a 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/pkgs/tools/archivers/rpmextract/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     install -Dm755 $script $out/bin/rpmextract
   '';
-    
+
   script = substituteAll {
     src = ./rpmextract.sh;
     isExecutable = true;
diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix
index e7ee67802c2..ec8e6392e9c 100644
--- a/pkgs/tools/backup/hpe-ltfs/default.nix
+++ b/pkgs/tools/backup/hpe-ltfs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ 
+  buildInputs = [
     fuse icu libxml2 libuuid
   ];
 
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index 26a0ba29189..5e6e6a95ae7 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca";
   };
 
-  buildInputs = [ 
+  buildInputs = [
     boost pkg-config scons util-linux fuse libevent openssl zlib
   ];
 
diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix
index 03828c51c01..1079623cf2a 100644
--- a/pkgs/tools/bluetooth/openobex/default.nix
+++ b/pkgs/tools/bluetooth/openobex/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }:
-   
+
 stdenv.mkDerivation rec {
   name = "openobex-1.7.2";
-   
+
   src = fetchurl {
     url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
     sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m";
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index ea424865919..ba6cb79fbd5 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       Bcache is a Linux kernel block layer cache. It allows one or more fast
       disk drives such as flash-based solid state drives (SSDs) to act as a
       cache for one or more slower hard disk drives.
-      
+
       This package contains the required user-space tools.
 
       User documentation is in Documentation/bcache.txt in the Linux kernel
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix
index a5f15c5fb2e..9917bf8d965 100644
--- a/pkgs/tools/filesystems/ext4magic/default.nix
+++ b/pkgs/tools/filesystems/ext4magic/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
       If the information in the journal are sufficient, ext4magic can
       recover the most file types, with original filename, owner and group,
-      file mode bits and also the old atime/mtime stamps. 
+      file mode bits and also the old atime/mtime stamps.
 
       It's much more effective and works much better than extundelete.
     '';
diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix
index b4980e83bee..ccc048f7572 100644
--- a/pkgs/tools/filesystems/genext2fs/default.nix
+++ b/pkgs/tools/filesystems/genext2fs/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "genext2fs-1.4.1";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz";
     sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0";
diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix
index 6d98ea240de..7ff076a5b0a 100644
--- a/pkgs/tools/graphics/cfdg/src-for-default.nix
+++ b/pkgs/tools/graphics/cfdg/src-for-default.nix
@@ -4,6 +4,6 @@
    hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p";
    url="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz";
    advertisedUrl="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz";
-  
-  
+
+
 }
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
index 2aec9be214e..2f2d0523469 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -35,18 +35,18 @@ stdenv.mkDerivation rec {
       scanbd polls a scanner's buttons, looking for button presses, function
       knob changes, or other scanner events such as paper inserts and removals,
       while at the same time allowing scan-applications to access the scanner.
-      
+
       Various actions can be submitted (scan, copy, email, ...) via action
       scripts. The function knob values are passed to the action scripts as
       well. Scan actions are also signaled via dbus. This can be useful for
       foreign applications. Scans can also be triggered via dbus from foreign
       applications.
-      
+
       On platforms which support signaling of dynamic device insertion/removal
       (libudev, dbus, hal), scanbd supports this as well.
 
       scanbd can use all sane-backends or some special backends from the (old)
-      scanbuttond project. 
+      scanbuttond project.
     '';
     homepage = "http://scanbd.sourceforge.net/";
     downloadPage = "https://sourceforge.net/projects/scanbd/";
diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix
index 69e4425d8c3..fc28a08b4b7 100644
--- a/pkgs/tools/inputmethods/fcitx/default.nix
+++ b/pkgs/tools/inputmethods/fcitx/default.nix
@@ -1,11 +1,11 @@
 { callPackage, plugins ? [] }:
 
-let 
+let
   unwrapped = callPackage ./unwrapped.nix { };
   wrapped   = callPackage ./wrapper.nix {
     plugins = plugins;
     fcitx   = unwrapped;
   };
-in if plugins == [] 
+in if plugins == []
    then unwrapped
    else wrapped
diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix
index 73dac5280bf..12232c414fd 100644
--- a/pkgs/tools/misc/dumptorrent/default.nix
+++ b/pkgs/tools/misc/dumptorrent/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
     pname = "dumptorrent";
     version = "1.2";
-    
+
     src = fetchurl {
       url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz";
       sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm";
diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix
index bedfebd9681..695187b3e84 100644
--- a/pkgs/tools/misc/dvtm/default.nix
+++ b/pkgs/tools/misc/dvtm/default.nix
@@ -16,4 +16,4 @@ callPackage ./dvtm.nix rec {
     })
   ];
 }
-    
+
diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix
index a5d1baf1fd1..f5d42431e4f 100644
--- a/pkgs/tools/misc/pg_top/default.nix
+++ b/pkgs/tools/misc/pg_top/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A 'top' like tool for PostgreSQL";
-    longDescription = '' 
-      pg_top allows you to: 
+    longDescription = ''
+      pg_top allows you to:
        * View currently running SQL statement of a process.
        * View query plan of a currently running SQL statement.
        * View locks held by a process.
diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix
index 24367189ff0..82e7659d152 100644
--- a/pkgs/tools/misc/pubs/default.nix
+++ b/pkgs/tools/misc/pubs/default.nix
@@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec {
   };
 
   propagatedBuildInputs = with python3Packages; [
-    argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six 
+    argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six
     beautifulsoup4
   ];
 
   checkInputs = with python3Packages; [ pyfakefs mock ddt ];
 
   # Disabling git tests because they expect git to be preconfigured
-  # with the user's details. See 
+  # with the user's details. See
   # https://github.com/NixOS/nixpkgs/issues/94663
   preCheck = ''
     rm tests/test_git.py
diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix
index c8eea974750..834a62803f6 100644
--- a/pkgs/tools/misc/rargs/default.nix
+++ b/pkgs/tools/misc/rargs/default.nix
@@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
     description = "xargs + awk with pattern matching support";
     homepage    = "https://github.com/lolabout/rargs";
     license     = with licenses; [ mit ];
-    maintainers = with maintainers; [ pblkt ]; 
+    maintainers = with maintainers; [ pblkt ];
   };
 }
diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix
index b1f6c7cdcab..5218453d15e 100644
--- a/pkgs/tools/misc/teamocil/default.nix
+++ b/pkgs/tools/misc/teamocil/default.nix
@@ -13,7 +13,7 @@ bundlerEnv {
     license         = licenses.mit;
     platforms       = platforms.all;
     maintainers     = with maintainers; [
-      zachcoyle 
+      zachcoyle
       nicknovitski
     ];
   };
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix
index 4d78e7f3f93..b6cca5fe5c3 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/pkgs/tools/misc/tty-clock/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp";
   };
-  
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ncurses ];
 
diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix
index 3ca47897618..0f7a37e8831 100644
--- a/pkgs/tools/networking/openconnect_pa/default.nix
+++ b/pkgs/tools/networking/openconnect_pa/default.nix
@@ -5,14 +5,14 @@ assert (openssl != null) == (gnutls == null);
 stdenv.mkDerivation {
   version = "unstable-2018-10-08";
   pname = "openconnect_pa";
-  
+
   outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "dlenski";
     repo = "openconnect";
     rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b";
-    sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; 
+    sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax";
   };
 
   preConfigure = ''
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ];
-  
+
   meta = with lib; {
     description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN";
     homepage = "https://github.com/dlenski/openconnect/";
diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/tools/networking/sshoogr/default.nix
index 9539c15f5ed..f3c9c1a31fb 100644
--- a/pkgs/tools/networking/sshoogr/default.nix
+++ b/pkgs/tools/networking/sshoogr/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
     '';
     longDescription = ''
       The sshoogr (pronounced [ʃʊgə]) is a Groovy-based DSL library for working
-      with remote servers through SSH. The DSL allows: connecting, executing 
-      remote commands, copying files and directories, creating tunnels in a 
+      with remote servers through SSH. The DSL allows: connecting, executing
+      remote commands, copying files and directories, creating tunnels in a
       simple and concise way.
     '';
     homepage = "https://github.com/aestasit/sshoogr";
@@ -33,4 +33,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ moaxcp ];
   };
-} 
+}
diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix
index 23458f2a396..2a07ada114d 100644
--- a/pkgs/tools/networking/wolfebin/default.nix
+++ b/pkgs/tools/networking/wolfebin/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "5.4";
   pname = "wolfebin";
-  
+
   src = fetchFromGitHub {
     owner = "thejoshwolfe";
     repo = "wolfebin";
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
index ceb919ecb82..3cce599c052 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication {
   name = "python2nix-20140927";
- 
+
   src = fetchFromGitHub {
     owner = "proger";
     repo = "python2nix";
diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/tools/security/hashcash/default.nix
index b13425b7205..f86684178fc 100644
--- a/pkgs/tools/security/hashcash/default.nix
+++ b/pkgs/tools/security/hashcash/default.nix
@@ -3,14 +3,14 @@
 stdenv.mkDerivation rec {
   pname = "hashcash";
   version = "1.22";
-  
+
   buildInputs = [ openssl ];
 
   src = fetchurl {
     url = "http://www.hashcash.org/source/hashcash-${version}.tgz";
     sha256 = "15kqaimwb2y8wvzpn73021bvay9mz1gqqfc40gk4hj6f84nz34h1";
   };
-  
+
   makeFlags = [
     "generic-openssl"
     "LIBCRYPTO=-lcrypto"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "MAN_INSTALL_PATH=${placeholder "out"}/share/man/man1"
     "DOC_INSTALL_PATH=${placeholder "out"}/share/doc/hashcash-$(version)"
   ];
-  
+
   meta = with lib; {
     description = "Proof-of-work algorithm used as spam and denial-of-service counter measure";
     homepage = "http://hashcash.org";
diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix
index a2fe22dd2bd..314abba853d 100644
--- a/pkgs/tools/security/libacr38u/default.nix
+++ b/pkgs/tools/security/libacr38u/default.nix
@@ -38,4 +38,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ berce ];
     platforms = with platforms; unix;
   };
-} 
+}
diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix
index 2b9923eb571..33fbd15c5e6 100644
--- a/pkgs/tools/system/stress/default.nix
+++ b/pkgs/tools/system/stress/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "stress-1.0.4";
- 
+
   src = fetchurl {
     url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz";
     sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5";
diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix
index de16854927b..9c5796c0b1d 100644
--- a/pkgs/tools/text/cconv/default.nix
+++ b/pkgs/tools/text/cconv/default.nix
@@ -3,14 +3,14 @@ let version = "0.6.3"; in
   stdenv.mkDerivation {
   pname = "cconv";
   inherit version;
-  
+
   src = fetchurl {
     url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";
     sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  
+
   meta = with lib; {
     description = "A iconv based simplified-traditional chinese conversion tool";
     homepage = "https://github.com/xiaoyjy/cconv";
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix
index 6c23acb86b4..7015bd4453c 100644
--- a/pkgs/tools/text/enca/default.nix
+++ b/pkgs/tools/text/enca/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     '';
 
     license = licenses.gpl2;
-   
+
   };
 }
diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix
index 632f8c41463..4b950fd0f22 100644
--- a/pkgs/tools/video/untrunc-anthwlock/default.nix
+++ b/pkgs/tools/video/untrunc-anthwlock/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp";
   };
 
-  
+
   buildInputs = [ ffmpeg libui ];
 
   postBuild = ''

From 9d6ae4c5bce11384a8dfaf8902bf4f5e9d009be7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 23:23:00 +0000
Subject: [PATCH 222/956] libhandy: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 1e4fd3348f1..794502ed9b8 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -23,14 +23,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libhandy";
-  version = "1.0.2";
+  version = "1.0.3";
 
   outputs = [ "out" "dev" "devdoc" "glade" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0b8wvjabv5mg8jbng8rsd5g84lk571nm0qpna20pwp0njh2qvmrs";
+    sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o=";
   };
 
   nativeBuildInputs = [

From dc912f45d764c20370a186e6a008bf844620b734 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jan 2021 23:58:43 +0000
Subject: [PATCH 223/956] link-grammar: 5.8.0 -> 5.8.1

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

diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
index d3ecc519a5f..e243206a114 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "5.8.0";
+  version = "5.8.1";
   pname = "link-grammar";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
   src = fetchurl {
     url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd";
+    sha256 = "sha256-EcT/VR+lFpJX2sxXUIDGOwdceQ7awpmEqUZBoJk7UFs=";
   };
 
   nativeBuildInputs = [ pkg-config python3 ];

From 9fca265abda341cb0bf0340c235fb2993727d624 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:59:51 +1000
Subject: [PATCH 224/956] klog: pkgconfig -> pkg-config

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

diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix
index 8a062c591b5..cb8ac9fe5dd 100644
--- a/pkgs/applications/radio/klog/default.nix
+++ b/pkgs/applications/radio/klog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hamlib, pkgconfig, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
+{ stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "klog";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
   };
 
-  nativeBuildInputs = [ pkgconfig wrapQtAppsHook qmake qttools ];
+  nativeBuildInputs = [ pkg-config wrapQtAppsHook qmake qttools ];
   buildInputs = [ hamlib qtbase qtserialport qtcharts ];
 
   qmakeFlags = [ "KLog.pro" ];

From dcc35abe5564d5fc1a0f6a2481381a8e8c1b3e91 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:25:11 +1000
Subject: [PATCH 225/956] sidequest: use spaces for indentation

---
 pkgs/applications/misc/sidequest/default.nix | 108 +++++++++----------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix
index ef4d472e74c..6dad2eaf812 100644
--- a/pkgs/applications/misc/sidequest/default.nix
+++ b/pkgs/applications/misc/sidequest/default.nix
@@ -1,69 +1,69 @@
 { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
-	let
-		pname = "sidequest";
-		version = "0.10.11";
+  let
+    pname = "sidequest";
+    version = "0.10.11";
 
-		desktopItem = makeDesktopItem rec {
-			name = "SideQuest";
-			exec = "SideQuest";
-			desktopName = name;
-			genericName = "VR App Store";
-			categories = "Settings;PackageManager;";
-		};
+    desktopItem = makeDesktopItem rec {
+      name = "SideQuest";
+      exec = "SideQuest";
+      desktopName = name;
+      genericName = "VR App Store";
+      categories = "Settings;PackageManager;";
+    };
 
-		sidequest = stdenv.mkDerivation {
-			inherit pname version;
+    sidequest = stdenv.mkDerivation {
+      inherit pname version;
 
-			src = fetchurl {
-				url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
-				sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
-			};
+      src = fetchurl {
+        url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
+        sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
+      };
 
-			buildInputs = [ makeWrapper ];
+      buildInputs = [ makeWrapper ];
 
-			buildCommand = ''
-				mkdir -p "$out/lib/SideQuest" "$out/bin"
-				tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
+      buildCommand = ''
+        mkdir -p "$out/lib/SideQuest" "$out/bin"
+        tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
 
-				ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
+        ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
 
-				fixupPhase
+        fixupPhase
 
-				# mkdir -p "$out/share/applications"
-				# ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
+        # mkdir -p "$out/share/applications"
+        # ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
 
-				patchelf \
-					--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-					--set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
-					"$out/lib/SideQuest/sidequest"
-			'';
-		};
-	in buildFHSUserEnv {
-		name = "SideQuest";
+        patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
+          "$out/lib/SideQuest/sidequest"
+      '';
+    };
+  in buildFHSUserEnv {
+    name = "SideQuest";
 
-		passthru = {
-			inherit pname version;
+    passthru = {
+      inherit pname version;
 
-			meta = with lib; {
-				description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
-				homepage = "https://github.com/the-expanse/SideQuest";
-				downloadPage = "https://github.com/the-expanse/SideQuest/releases";
-				license = licenses.mit;
-				maintainers = with maintainers; [ joepie91 rvolosatovs ];
-				platforms = [ "x86_64-linux" ];
-			};
-		};
+      meta = with lib; {
+        description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
+        homepage = "https://github.com/the-expanse/SideQuest";
+        downloadPage = "https://github.com/the-expanse/SideQuest/releases";
+        license = licenses.mit;
+        maintainers = with maintainers; [ joepie91 rvolosatovs ];
+        platforms = [ "x86_64-linux" ];
+      };
+    };
 
-		targetPkgs = pkgs: [
-			sidequest
-			# Needed in the environment on runtime, to make QuestSaberPatch work
-			icu openssl zlib
-		];
+    targetPkgs = pkgs: [
+      sidequest
+      # Needed in the environment on runtime, to make QuestSaberPatch work
+      icu openssl zlib
+    ];
 
-		extraInstallCommands = ''
-			mkdir -p "$out/share/applications"
-			ln -s ${desktopItem}/share/applications/* "$out/share/applications"
-		'';
+    extraInstallCommands = ''
+      mkdir -p "$out/share/applications"
+      ln -s ${desktopItem}/share/applications/* "$out/share/applications"
+    '';
 
-		runScript = "sidequest";
-	}
+    runScript = "sidequest";
+  }

From 759a2cd563283f4f262bb54f480bae0e34e5d1d4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:25:11 +1000
Subject: [PATCH 226/956] ecopcr: use spaces for indentation

---
 pkgs/applications/science/biology/ecopcr/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix
index b3029f586ad..01937037860 100644
--- a/pkgs/applications/science/biology/ecopcr/default.nix
+++ b/pkgs/applications/science/biology/ecopcr/default.nix
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ gcc python27 zlib ];
 
   installPhase = ''
-	mkdir -p $out/bin
-	cp -v ecoPCR $out/bin
-	cp -v ecogrep $out/bin
-	cp -v ecofind $out/bin
-	cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat
-	chmod a+x $out/bin/ecoPCRFormat
+    mkdir -p $out/bin
+    cp -v ecoPCR $out/bin
+    cp -v ecogrep $out/bin
+    cp -v ecofind $out/bin
+    cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat
+    chmod a+x $out/bin/ecoPCRFormat
   '';
 
   meta = with lib; {

From 6d986d2e8d7eff1cdb67e73ea70a27dcc4c24a1e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:25:11 +1000
Subject: [PATCH 227/956] SDL_gfx: use spaces for indentation

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

diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 3696e485ad7..606820120dc 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -17,23 +17,23 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "SDL graphics drawing primitives and support functions";
 
-    longDescription =
-      '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code
-	 which provided basic drawing routines such as lines, circles or
-	 polygons and SDL_rotozoom which implemented a interpolating
-	 rotozoomer for SDL surfaces.
+    longDescription = ''
+      The SDL_gfx library evolved out of the SDL_gfxPrimitives code
+      which provided basic drawing routines such as lines, circles or
+      polygons and SDL_rotozoom which implemented a interpolating
+      rotozoomer for SDL surfaces.
 
-	 The current components of the SDL_gfx library are:
+      The current components of the SDL_gfx library are:
 
-	    * Graphic Primitives (SDL_gfxPrimitves.h)
-	    * Rotozoomer (SDL_rotozoom.h)
-	    * Framerate control (SDL_framerate.h)
-	    * MMX image filters (SDL_imageFilter.h)
-	    * Custom Blit functions (SDL_gfxBlitFunc.h)
+        * Graphic Primitives (SDL_gfxPrimitves.h)
+        * Rotozoomer (SDL_rotozoom.h)
+        * Framerate control (SDL_framerate.h)
+        * MMX image filters (SDL_imageFilter.h)
+        * Custom Blit functions (SDL_gfxBlitFunc.h)
 
-	 The library is backwards compatible to the above mentioned
-         code. Its is written in plain C and can be used in C++ code.
-       '';
+      The library is backwards compatible to the above mentioned
+      code. Its is written in plain C and can be used in C++ code.
+    '';
 
     homepage = "https://sourceforge.net/projects/sdlgfx/";
     license = licenses.zlib;

From 69f968e735f6b1bd860a970ca4d46a4810b8a051 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:25:12 +1000
Subject: [PATCH 228/956] aften: use spaces for indentation

---
 pkgs/development/libraries/aften/default.nix | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix
index a1d4c225909..d50cbe26e56 100644
--- a/pkgs/development/libraries/aften/default.nix
+++ b/pkgs/development/libraries/aften/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-	pname = "aften";
-	version = "0.0.8";
-	src = fetchurl {
-		url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
-		sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
-	};
+  pname = "aften";
+  version = "0.0.8";
+  src = fetchurl {
+    url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
+    sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
+  };
 
-	nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-	cmakeFlags = [ "-DSHARED=ON" ];
+  cmakeFlags = [ "-DSHARED=ON" ];
 
-	meta = {
-		description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
-		homepage = "http://aften.sourceforge.net/";
-		license = stdenv.lib.licenses.lgpl2;
-		platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
-	};
+  meta = {
+    description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
+    homepage = "http://aften.sourceforge.net/";
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+  };
 }

From e75795a5484876f148e8d343acbd9d873533eba7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:25:12 +1000
Subject: [PATCH 229/956] iceshelf: use spaces for indentation

---
 pkgs/tools/backup/iceshelf/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/tools/backup/iceshelf/default.nix
index 546339ca002..eb5e883bdac 100644
--- a/pkgs/tools/backup/iceshelf/default.nix
+++ b/pkgs/tools/backup/iceshelf/default.nix
@@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec {
 
   format = "other";
 
-	src = fetchFromGitHub {
-		owner = "mrworf";
-		repo = pname;
-		rev = "26768dde3fc54fa412e523eb8f8552e866b4853b";
-		sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm";
+  src = fetchFromGitHub {
+    owner = "mrworf";
+    repo = pname;
+    rev = "26768dde3fc54fa412e523eb8f8552e866b4853b";
+    sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm";
   };
 
   propagatedBuildInputs = [
@@ -19,12 +19,12 @@ python3.pkgs.buildPythonApplication rec {
     python3.pkgs.python-gnupg
   ];
 
-	installPhase = ''
-		mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages}
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages}
     cp -v iceshelf iceshelf-restore $out/bin
     cp -v iceshelf.sample.conf $out/share/doc/${pname}/
     cp -rv modules $out/${python3.sitePackages}
-	'';
+  '';
 
   meta = with lib; {
     description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage";

From d81fcaedae2a818bb1c2d22a03c94c455408e397 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:44:27 +1000
Subject: [PATCH 230/956] epson_201207w: use spaces for indentation

---
 pkgs/misc/drivers/epson_201207w/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix
index 6de25dbe678..d5c57b35c32 100644
--- a/pkgs/misc/drivers/epson_201207w/default.nix
+++ b/pkgs/misc/drivers/epson_201207w/default.nix
@@ -63,11 +63,11 @@ in
            Epson L550 Series
            Epson L555 Series
 
-	To use the driver adjust your configuration.nix file:
-	  services.printing = {
-	    enable = true;
-	    drivers = [ pkgs.epson_201207w ];
-	  };
+        To use the driver adjust your configuration.nix file:
+          services.printing = {
+            enable = true;
+            drivers = [ pkgs.epson_201207w ];
+          };
       '';
       license = with licenses; [ lgpl21 epson ];
       maintainers = [ maintainers.romildo ];

From 5ab7a7ab45d42c079555b778d40079e8f64b18a1 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:45:29 +1000
Subject: [PATCH 231/956] uget-integrator: use spaces for indentation

---
 pkgs/tools/networking/uget-integrator/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix
index f89b168b84c..2d069ea07f0 100644
--- a/pkgs/tools/networking/uget-integrator/default.nix
+++ b/pkgs/tools/networking/uget-integrator/default.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
       substituteInPlace $f --replace "/usr" "$out"
     done
 
-	  install -D -t $out/bin                                   bin/uget-integrator
-	  install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
-	  install -D -t $out/etc/chromium/native-messaging-hosts   conf/com.ugetdm.chrome.json
-	  install -D -t $out/etc/opera/native-messaging-hosts      conf/com.ugetdm.chrome.json
-	  install -D -t $out/lib/mozilla/native-messaging-hosts    conf/com.ugetdm.firefox.json
+    install -D -t $out/bin                                   bin/uget-integrator
+    install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
+    install -D -t $out/etc/chromium/native-messaging-hosts   conf/com.ugetdm.chrome.json
+    install -D -t $out/etc/opera/native-messaging-hosts      conf/com.ugetdm.chrome.json
+    install -D -t $out/lib/mozilla/native-messaging-hosts    conf/com.ugetdm.firefox.json
 
     wrapPythonPrograms
   '';

From 35b89f31e380d428dcb83563812d69cdcf11178c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:46:09 +1000
Subject: [PATCH 232/956] irrlicht: use spaces for indentation

---
 pkgs/development/libraries/irrlicht/mac.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix
index 5f8335efab2..6a33b0feadb 100644
--- a/pkgs/development/libraries/irrlicht/mac.nix
+++ b/pkgs/development/libraries/irrlicht/mac.nix
@@ -9,16 +9,16 @@ stdenv.mkDerivation rec {
   version = common.version;
 
   src = fetchFromGitHub {
-		owner = "quiark";
-		repo = "IrrlichtCMake";
-		rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
-		sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
+    owner = "quiark";
+    repo = "IrrlichtCMake";
+    rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
+    sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
   };
 
   postUnpack = ''
     cp -r ${common.src}/* $sourceRoot/
     chmod -R 777 $sourceRoot
-	'';
+  '';
 
   patches = [ ./mac_device.patch ];
   dontFixCmake = true;

From dca8f0d01ab6f73ab44e72979e8788cf7294c3d4 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 20 Jan 2021 02:03:26 +0100
Subject: [PATCH 233/956] perlPackages.HTTPAcceptLanguage: init at 0.02

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a9c0c79ba8b..d08500b08c7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9641,6 +9641,21 @@ let
     buildInputs = [ TestNoWarnings ];
   };
 
+  HTTPAcceptLanguage = buildPerlModule {
+    pname = "HTTP-AcceptLanguage";
+    version = "0.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/Y/YA/YAPPO/HTTP-AcceptLanguage-0.02.tar.gz";
+      sha256 = "1bs29r72ibp0kmr3l1ypzszflpcw7z4yxxcgaijspsy99rb5yq1f";
+    };
+    buildInputs = [ ModuleBuildTiny ];
+    meta = {
+      homepage = "https://github.com/yappo/p5-HTTP-AcceptLanguage";
+      description = "Accept-Language header parser and find available language";
+      license = with lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   HTTPBody = buildPerlPackage {
     pname = "HTTP-Body";
     version = "1.22";

From 3f3210105d23eecc482e06ac2947179057bd34a1 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 20 Jan 2021 02:17:48 +0100
Subject: [PATCH 234/956] perlPackages.LinkEmbedder: 1.15 -> 1.16

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d08500b08c7..d6adec6feb0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11152,10 +11152,10 @@ let
 
   LinkEmbedder = buildPerlPackage {
     pname = "LinkEmbedder";
-    version = "1.15";
+    version = "1.16";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.15.tar.gz";
-      sha256 = "0ij2jvsiqnqz3qlzw8k3q37ys05wfh1ks2n692hs3bpg7ds3n8bc";
+      url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.16.tar.gz";
+      sha256 = "0pm5h5rlfparfvsi3ygj53mwjg8lwhql5mj0macfvsvfnfvnnp6j";
     };
     buildInputs = [ TestDeep ];
     propagatedBuildInputs = [ Mojolicious ];

From 781e2e4115a1b0f2ea0d5cee93071e00af54453c Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 20 Jan 2021 02:18:09 +0100
Subject: [PATCH 235/956] perlPackages.Mojolicious: 8.67 -> 8.71

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d6adec6feb0..8234592c803 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13403,10 +13403,10 @@ let
 
   Mojolicious = buildPerlPackage {
     pname = "Mojolicious";
-    version = "8.67";
+    version = "8.71";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.67.tar.gz";
-      sha256 = "0b1ajsfvpzcmy7qp1rjr2n1z263yk5bkzmal0kx72ajg1l1dd85v";
+      url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.71.tar.gz";
+      sha256 = "03bfxzq11v6k47axdwqhp2d3p1z17nwyxj0yww5z3x293p6zsnqm";
     };
     meta = {
       homepage = "https://mojolicious.org";

From 65a33002bb7b6a7a2dbdf19577e85cbdd0025dbd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 01:23:40 +0000
Subject: [PATCH 236/956] libfilezilla: 0.25.0 -> 0.26.0

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index c9be4c6ba7f..713f273ca95 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libfilezilla";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv";
+    sha256 = "sha256-F+0iZZPo5GbOPD+M5YOzbHnxYxierVTWMWE8w9pcgL0=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

From 1f1c480f6cb9f6225981e7f5a932600cfc364100 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 01:28:45 +0000
Subject: [PATCH 237/956] libmaxminddb: 1.4.3 -> 1.5.0

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

diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix
index 94a4b9ec57c..2b4d75bba75 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/pkgs/development/libraries/libmaxminddb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmaxminddb";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchurl {
     url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0fd4a4sxiiwzbd5h74wl1ijnb7xybjyybb7q41vdq3w8nk3zdzd5";
+    sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo=";
   };
 
   meta = with stdenv.lib; {

From 6439e6e925be1ddca8b77b92bc47cc8890db39ec Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 20 Jan 2021 02:21:33 +0100
Subject: [PATCH 238/956] perlPackages.MojoliciousPluginWebpack: 0.13 -> 0.14

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8234592c803..4e40b3f8fe0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13513,10 +13513,10 @@ let
 
   MojoliciousPluginWebpack = buildPerlPackage {
     pname = "Mojolicious-Plugin-Webpack";
-    version = "0.13";
+    version = "0.14";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.13.tar.gz";
-      sha256 = "7848c0698e1b52909c71add638f7523f5affdfb8133b4ddb6f23a3bca485e761";
+      url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.14.tar.gz";
+      sha256 = "0b1a9rm5rlpqj6skgic4qzy4b1p35r2dhkh3rwaaypf9ha70i9gc";
     };
     propagatedBuildInputs = [ Mojolicious ];
     meta = {

From f36a31da672c51ad0bf027c7a6898478cc5a3efc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 01:40:29 +0000
Subject: [PATCH 239/956] libewf: 20201129 -> 20201210

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

diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index 759c0e40adc..c0071020e2c 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, zlib, openssl, libuuid, pkg-config }:
 
 stdenv.mkDerivation rec {
-  version = "20201129";
+  version = "20201210";
   pname = "libewf";
 
   src = fetchurl {
     url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
-    sha256 = "168k1az9hm0lajh57zlbknsq5m8civ1rzp81zz4sd7v64xilzxdk";
+    sha256 = "sha256-dI1We2bsBRDcyqd6HLC7eBE99dpzSkhHtNgt0ZE4aDc=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From c7c869aaecda6d2ab1c56357035aa2108be8408e Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 20 Jan 2021 02:23:13 +0100
Subject: [PATCH 240/956] convos: 5.00 -> 5.11

---
 .../networking/irc/convos/default.nix         | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix
index 5312bf9c147..9a42d0aa99b 100644
--- a/pkgs/applications/networking/irc/convos/default.nix
+++ b/pkgs/applications/networking/irc/convos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang
+{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang, openssl
 , nixosTests
 }:
 
@@ -6,26 +6,28 @@ with lib;
 
 perlPackages.buildPerlPackage rec {
   pname = "convos";
-  version = "5.00";
+  version = "5.11";
 
   src = fetchFromGitHub {
     owner = "Nordaaker";
     repo = pname;
     rev = version;
-    sha256 = "0mdbh9q1vclwgnjwvb3z637s7v804h65zxazbhmd7qi3zislnhg1";
+    sha256 = "08k8dqdgz2b3p8g1zfg9i74r5nm1w0sqdm759d1f3jcyp737r47x";
   };
 
   nativeBuildInputs = [ makeWrapper ]
     ++ optional stdenv.isDarwin [ shortenPerlShebang ];
 
   buildInputs = with perlPackages; [
-    CryptEksblowfish FileHomeDir FileReadBackwards
+    CryptEksblowfish FileHomeDir FileReadBackwards HTTPAcceptLanguage
     IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall
     Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginWebpack
     ParseIRC TextMarkdown TimePiece UnicodeUTF8
     CpanelJSONXS EV
   ];
 
+  propagatedBuildInputs = [ openssl ];
+
   checkInputs = with perlPackages; [ TestDeep TestMore ];
 
   postPatch = ''
@@ -43,6 +45,15 @@ perlPackages.buildPerlPackage rec {
     substituteInPlace t/web-register-open-to-public.t \
       --replace '!127.0.0.1!' '!localhost!'
 
+    # A webirc test fails to resolve "localhost" likely due to sandboxing, we
+    # remove this test.
+    #
+    rm t/irc-webirc.t
+
+    # A web-user test fails on Darwin, we remove it.
+    #
+    rm t/web-user.t
+
     # Module::Install is a runtime dependency not covered by the tests, so we add
     # a test for it.
     #

From 9a0885a1669da456597a7a64c154c46e80401f9a Mon Sep 17 00:00:00 2001
From: "P. R. d. O" <d.ol.rod@protonmail.com>
Date: Tue, 19 Jan 2021 19:54:59 -0600
Subject: [PATCH 241/956] signumone-ks: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix
index 144f725e2ef..aeea3ff5daa 100644
--- a/pkgs/applications/misc/signumone-ks/default.nix
+++ b/pkgs/applications/misc/signumone-ks/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "signumone-ks";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchurl {
     url = "https://cdn-dist.signum.one/${version}/${pname}-${version}.deb";
-    sha256 = "4efd80e61619ccf26df1292194fcec68eb14d77dfcf0a1a673da4cf5bf41f4b7";
+    sha256 = "00wlya3kb6qac2crflm86km9r48r29bvngjq1wgzj9w2xv0q32b9";
   };
 
   # Necessary to avoid using multiple ffmpeg and gtk libs

From 97881882738abcc15f587806a4bed2be52803fc6 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Tue, 19 Jan 2021 21:09:31 -0500
Subject: [PATCH 242/956] pkgs/os-specific/windows: fix evaluation after
 stdenv.lib -> lib

Fixes the evaluation of packages in pkgs/os-specific/windows that
weren't updated to include a new lib parameter after the refactor from
stdenv.lib -> lib (#109490).

I originally only intended this change to fix
`pkgsCross.mingw32.buildPackages.gcc` & `pkgsCross.mingwW64.buildPackages.gcc`
to support building wine with `mingwSupport`, but I noticed this was
an issue for all updated windows packages. Most of these other
packages fail to build for other reasons.
---
 pkgs/os-specific/windows/cygwin-setup/default.nix | 2 +-
 pkgs/os-specific/windows/jom/default.nix          | 2 +-
 pkgs/os-specific/windows/libgnurx/default.nix     | 2 +-
 pkgs/os-specific/windows/mingw-w64/default.nix    | 2 +-
 pkgs/os-specific/windows/wxMSW-2.8/default.nix    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix
index 2941561954d..c51cafa9ace 100644
--- a/pkgs/os-specific/windows/cygwin-setup/default.nix
+++ b/pkgs/os-specific/windows/cygwin-setup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config
+{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config
 , zlib, bzip2, lzma, libgcrypt
 }:
 
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix
index 0d3ab81135c..a2fbdde95aa 100644
--- a/pkgs/os-specific/windows/jom/default.nix
+++ b/pkgs/os-specific/windows/jom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qt48, qmake4Hook, flex }:
+{ lib, stdenv, fetchgit, qt48, qmake4Hook, flex }:
 
 # At the time of committing this, the expression fails for me to cross-build in
 # both mingw32 and mingw64.
diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix
index eb4ae8dad00..85a3c463a28 100644
--- a/pkgs/os-specific/windows/libgnurx/default.nix
+++ b/pkgs/os-specific/windows/libgnurx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   version = "2.5.1";
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index 838c39fc3c1..0a342997530 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, windows, fetchurl }:
+{ lib, stdenv, windows, fetchurl }:
 
 let
   version = "6.0.0";
diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index f57df3192cc..c4fb7993343 100644
--- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
+{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
 
 stdenv.mkDerivation {
   name = "wxMSW-2.8.11";

From 70e780d1b7ec7fa3e8c73acc7656008392ef6144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 19 Jan 2021 23:40:52 -0300
Subject: [PATCH 243/956] codeblocks: 17.12 -> 20.03

---
 pkgs/applications/editors/codeblocks/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 5784e7d50a4..8a5f4cf4b3a 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -1,21 +1,21 @@
-{ lib, stdenv, fetchurl, autoreconfHook, libtool, pkg-config, file, zip, wxGTK, gtk2
-, contribPlugins ? false, hunspell, gamin, boost
+{ lib, stdenv, fetchurl, pkg-config, file, zip, wxGTK30-gtk3, gtk3
+, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook
 }:
 
 with lib;
 
 stdenv.mkDerivation rec {
   name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}";
-  version = "17.12";
+  version = "20.03";
   pname = "codeblocks";
 
   src = fetchurl {
-    url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz";
-    sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k";
+    url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks-${version}.tar.xz";
+    sha256 = "1idaksw1vacmm83krxh5zlb12kad3dkz9ixh70glw1gaibib7vhm";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config libtool file zip ];
-  buildInputs = [ wxGTK gtk2 ]
+  nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ];
+  buildInputs = [ wxGTK30-gtk3 gtk3 ]
     ++ optionals contribPlugins [ hunspell gamin boost ];
   enableParallelBuilding = true;
   patches = [ ./writable-projects.patch ];

From 03cce6a8a064084d84d527550e1a657746a3dd88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 02:54:39 +0000
Subject: [PATCH 244/956] libmodule: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix
index 94632ed57b0..2848298016d 100644
--- a/pkgs/development/libraries/libmodule/default.nix
+++ b/pkgs/development/libraries/libmodule/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmodule";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "libmodule";
     rev = version;
-    sha256 = "1cf81sl33xmfn5g150iqcdrjn0lpjlgp53mganwi6x7jda2qk7r6";
+    sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg=";
   };
 
   nativeBuildInputs = [

From 83fd591dec09681e74fff454292883eb99e0a765 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 13:40:05 +1000
Subject: [PATCH 245/956] .editorconfig: cleanup, update gemset, drop node

- node* has been fixed upstream.
---
 .editorconfig | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 980bca1ee04..bc45523451b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -63,10 +63,7 @@ insert_final_newline = unset
 [eggs.nix]
 trim_trailing_whitespace = unset
 
-[gemset.nix]
-insert_final_newline = unset
-
-[node-{composition,packages,packages-generated}.nix]
+[gemset*.nix]
 insert_final_newline = unset
 
 [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
@@ -93,12 +90,6 @@ insert_final_newline = unset
 indent_style = unset
 trim_trailing_whitespace = unset
 
-[pkgs/development/mobile/androidenv/generated/{addons,packages}.nix]
-trim_trailing_whitespace = unset
-
-[pkgs/development/node-packages/composition.nix]
-insert_final_newline = unset
-
 [pkgs/development/{perl-modules,ocaml-modules,tools/ocaml}/**]
 indent_style = unset
 

From c0e781d9adc4cd7f637e1e1be29eb4dd80e6b7bd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:20:00 +0000
Subject: [PATCH 246/956] python3Packages.tubeup: 0.0.20 -> 0.0.21

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

diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index 29764259910..7a4b4454b3b 100644
--- a/pkgs/development/python-modules/tubeup/default.nix
+++ b/pkgs/development/python-modules/tubeup/default.nix
@@ -2,27 +2,27 @@
 , buildPythonPackage
 , internetarchive
 , fetchPypi
-, youtube-dlc
+, youtube-dl
 , docopt
 , isPy27
 }:
 
 buildPythonPackage rec {
   pname = "tubeup";
-  version = "0.0.20";
+  version = "0.0.21";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
+    sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6";
   };
 
   postPatch = ''
     substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
   '';
 
-  propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
+  propagatedBuildInputs = [ internetarchive docopt youtube-dl ];
 
   pythonImportsCheck = [ "tubeup" ];
 

From 6d25d3e09d3fc1ceadf250ac75499eb7f7c3f7d9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:20:00 +0000
Subject: [PATCH 247/956] python3Packages.youtube-dlc: drop

tubeup uses youtube-dl, and upstream seems to be unmaintained.
---
 .../python-modules/youtube-dlc/default.nix    | 23 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/development/python-modules/youtube-dlc/default.nix

diff --git a/pkgs/development/python-modules/youtube-dlc/default.nix b/pkgs/development/python-modules/youtube-dlc/default.nix
deleted file mode 100644
index 9599828e65e..00000000000
--- a/pkgs/development/python-modules/youtube-dlc/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
-  pname = "youtube_dlc";
-  version = "2020.11.11.post3";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM=";
-  };
-
-  # They are broken
-  doCheck = false;
-
-  pythonImportsCheck = [ "youtube_dlc" ];
-
-  meta = with lib; {
-    homepage = "Media downloader supporting various sites such as youtube";
-    description = "https://github.com/blackjack4494/yt-dlc";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ freezeboy ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5de1f1958dc..1e7ce27a8cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8337,8 +8337,6 @@ in {
     phantomjsSupport = false;
   };
 
-  youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
-
   yowsup = callPackage ../development/python-modules/yowsup { };
 
   yq = callPackage ../development/python-modules/yq { };

From 56240c9d4fa898605ffa025a99f1b2056d1da5a1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:20:00 +0000
Subject: [PATCH 248/956] go-tools: 2020.2 -> 2020.2.1

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

diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
index 3d3c9db9a1e..57e836d8f4e 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "go-tools";
-  version = "2020.2";
+  version = "2020.2.1";
 
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "go-tools";
     rev = version;
-    sha256 = "1qqpr481rx6n75xp1racsjjyn2fa8f28pcb0r9kd56qq890h3qgj";
+    sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh";
   };
 
-  vendorSha256 = "1axci0l7pymy66j6lilm49ksrwp7dvnj5krai2kvy96n3arcnsvq";
+  vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak";
 
   doCheck = false;
 

From be8bcd9cdb12fdf6b34da3b2835be3f8967604c9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:20:00 +0000
Subject: [PATCH 249/956] vale: 2.6.8 -> 2.8.1

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

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 2b6307ed009..bc7c43ca6ec 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "vale";
-  version = "2.6.8";
+  version = "2.8.1";
 
-  subPackages = [ "." ];
+  subPackages = [ "cmd/vale" ];
   outputs = [ "out" "data" ];
 
   src = fetchFromGitHub {
     owner  = "errata-ai";
     repo   = "vale";
     rev    = "v${version}";
-    sha256 = "sha256-evvnIM8sd/eHpI2FYOlgjvGn8awTVc1f5QDIYAvhqmk=";
+    sha256 = "0xvsg5j0nv6p6wskxg4gz79di6p495c78xbwl3xmh0wyk7g78lkx";
   };
 
   vendorSha256 = null;

From cb436209c94c9b8eadda0d5e366ae9819216e8eb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:20:00 +0000
Subject: [PATCH 250/956] recursive: 1.069 -> 1.071

https://github.com/arrowtype/recursive/releases/tag/v1.070
https://github.com/arrowtype/recursive/releases/tag/v1.071
---
 pkgs/data/fonts/recursive/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix
index ff5070b1bd7..d6929153bf4 100644
--- a/pkgs/data/fonts/recursive/default.nix
+++ b/pkgs/data/fonts/recursive/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchzip }:
 
 let
-  version = "1.069";
+  version = "1.071";
 in
 fetchzip {
   name = "recursive-${version}";
 
-  url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip";
+  url = "https://github.com/arrowtype/recursive/releases/download/v${version}/ArrowType-Recursive-${version}.zip";
 
   postFetch = ''
     mkdir -p $out/share/fonts/
@@ -14,7 +14,7 @@ fetchzip {
     unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
   '';
 
-  sha256 = "07l35vkarj8f748vbnca98zrl0yl456ddqf1wpmshs24r97cx96h";
+  sha256 = "0db410vcvgawb89f11l2v7w3b7l70wzlwwv8df3vnangl3mdv13z";
 
   meta = with lib; {
     homepage = "https://recursive.design/";

From f859fa8797283fae5bc51d8477ea9ca8a41a01f7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:20:00 +0000
Subject: [PATCH 251/956] libvmaf: 2.1.0 -> 2.1.1

https://github.com/Netflix/vmaf/releases/tag/v2.1.1
---
 pkgs/development/libraries/libvmaf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix
index 293cb21bb5d..6a8cc859474 100644
--- a/pkgs/development/libraries/libvmaf/default.nix
+++ b/pkgs/development/libraries/libvmaf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libvmaf";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "netflix";
     repo = "vmaf";
     rev = "v${version}";
-    sha256 = "0gh4zwz975x9kvqdmzs45f96rk99apay57jc68rc8c2xm7gfis58";
+    sha256 = "0dynk1pmsyf23vfxljaazqkr27vfrvhj3dyjzm06zxpzsn59aif3";
   };
 
   sourceRoot = "source/libvmaf";

From d8c1c0dc501855658ef3f4bf6a896c82730fe806 Mon Sep 17 00:00:00 2001
From: Steven Pease <peasteven@gmail.com>
Date: Tue, 19 Jan 2021 20:41:39 -0800
Subject: [PATCH 252/956] Update to XCode 12.3

---
 lib/systems/examples.nix                  | 16 ++++++++--------
 pkgs/os-specific/darwin/xcode/default.nix | 12 ++++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 5a31b8d91e4..9f090655747 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -179,8 +179,8 @@ rec {
   iphone64 = {
     config = "aarch64-apple-ios";
     # config = "aarch64-apple-darwin14";
-    sdkVer = "14.0";
-    xcodeVer = "12.0.1";
+    sdkVer = "14.3";
+    xcodeVer = "12.3";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
     platform = {};
@@ -189,8 +189,8 @@ rec {
   iphone32 = {
     config = "armv7a-apple-ios";
     # config = "arm-apple-darwin10";
-    sdkVer = "14.0";
-    xcodeVer = "12.0.1";
+    sdkVer = "14.3";
+    xcodeVer = "12.3";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
     platform = {};
@@ -199,8 +199,8 @@ rec {
   iphone64-simulator = {
     config = "x86_64-apple-ios";
     # config = "x86_64-apple-darwin14";
-    sdkVer = "14.0";
-    xcodeVer = "12.0.1";
+    sdkVer = "14.3";
+    xcodeVer = "12.3";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
     platform = {};
@@ -209,8 +209,8 @@ rec {
   iphone32-simulator = {
     config = "i686-apple-ios";
     # config = "i386-apple-darwin11";
-    sdkVer = "14.0";
-    xcodeVer = "12.0.1";
+    sdkVer = "14.3";
+    xcodeVer = "12.3";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
     platform = {};
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 7bb004958d5..a96d7256968 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, requireFile, lib }:
+{ requireFile, targetPlatform, lib }:
 
 let requireXcode = version: sha256:
   let
     xip = "Xcode_" + version +  ".xip";
     # TODO(alexfmpe): Find out how to validate the .xip signature in Linux
-    unxip = if stdenv.isDarwin
+    unxip = if targetPlatform.isDarwin
             then ''
               open -W ${xip}
               rm -rf ${xip}
@@ -31,7 +31,7 @@ let requireXcode = version: sha256:
         rm -rf Xcode.app
       '';
     };
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://developer.apple.com/downloads/";
       description = "Apple's XCode SDK";
       license = licenses.unfree;
@@ -63,5 +63,9 @@ in lib.makeExtensible (self: {
   xcode_11_7 = requireXcode "11.7" "0422rdc4j5qwyk59anbybxyfv0p26x0xryszm0wd8i44g66smlmj";
   xcode_12 = requireXcode "12" "1w3xm268pyn5m04wv22invd5kr2k4jqllgrzapv6n1sxxynxrh8z";
   xcode_12_0_1 = requireXcode "12.0.1" "1p6vd5ai0hh3cq6aflh4h21ar0shxnz8wlkaxwq7liwsdmkwzbl0";
-  xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.0.1")}";
+  xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp";
+  xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v";
+  xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189";
+  xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (targetPlatform ? xcodeVer) then targetPlatform.xcodeVer else "12.3")}";
 })
+

From a884b2182243cb2ec998e638c98ddfac58c2f812 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 14:47:02 +1000
Subject: [PATCH 253/956] nerdfonts: use spaces for indentation

---
 pkgs/data/fonts/nerdfonts/shas.nix  | 100 ++++++++++++++--------------
 pkgs/data/fonts/nerdfonts/update.sh |   2 +-
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix
index e360dd042b1..4194e57532d 100644
--- a/pkgs/data/fonts/nerdfonts/shas.nix
+++ b/pkgs/data/fonts/nerdfonts/shas.nix
@@ -1,52 +1,52 @@
 {
-	"3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk";
-	"Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha";
-	"AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm";
-	"Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8";
-	"AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz";
-	"BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v";
-	"BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk";
-	"CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj";
-	"CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa";
-	"Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1";
-	"DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4";
-	"DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z";
-	"DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z";
-	"FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6";
-	"FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1";
-	"FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl";
-	"Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm";
-	"Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21";
-	"Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh";
-	"Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk";
-	"HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb";
-	"Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm";
-	"iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z";
-	"IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg";
-	"Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1";
-	"InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m";
-	"InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd";
-	"Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb";
-	"JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844";
-	"Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i";
-	"LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h";
-	"Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh";
-	"Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj";
-	"Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd";
-	"Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w";
-	"MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq";
-	"Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z";
-	"OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by";
-	"Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm";
-	"ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7";
-	"ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g";
-	"RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x";
-	"ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr";
-	"SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7";
-	"SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk";
-	"Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj";
-	"Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd";
-	"Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih";
-	"UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h";
-	"VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q";
+  "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk";
+  "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha";
+  "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm";
+  "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8";
+  "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz";
+  "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v";
+  "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk";
+  "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj";
+  "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa";
+  "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1";
+  "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4";
+  "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z";
+  "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z";
+  "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6";
+  "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1";
+  "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl";
+  "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm";
+  "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21";
+  "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh";
+  "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk";
+  "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb";
+  "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm";
+  "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z";
+  "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg";
+  "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1";
+  "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m";
+  "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd";
+  "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb";
+  "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844";
+  "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i";
+  "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h";
+  "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh";
+  "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj";
+  "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd";
+  "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w";
+  "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq";
+  "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z";
+  "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by";
+  "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm";
+  "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7";
+  "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g";
+  "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x";
+  "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr";
+  "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7";
+  "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk";
+  "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj";
+  "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd";
+  "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih";
+  "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h";
+  "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q";
 }
diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/data/fonts/nerdfonts/update.sh
index ccfab174dd8..b4c4aaa7cf2 100755
--- a/pkgs/data/fonts/nerdfonts/update.sh
+++ b/pkgs/data/fonts/nerdfonts/update.sh
@@ -15,7 +15,7 @@ while
   read -r name
   read -r url
 do
-    printf '\t"%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix"
+    printf '  "%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix"
 done < <(jq -r '.assets[] | .name, .browser_download_url' <<<"$latest_release")
 
 printf '}\n' >> "$dirname/shas.nix"

From dacc16aedd6b190ac888d4cd39fa6cabcc2e4af7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 05:15:04 +0000
Subject: [PATCH 254/956] lxcfs: 4.0.6 -> 4.0.7

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

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 3503812966e..ab148af72f2 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -5,13 +5,13 @@
 with lib;
 stdenv.mkDerivation rec {
   pname = "lxcfs";
-  version = "4.0.6";
+  version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = "lxcfs-${version}";
-    sha256 = "1fp2q4y3ql4xd2lp4bpcl8s6xryr5xbb56da9d20w2cdr2d0lwyv";
+    sha256 = "sha256-gC1Q+kG/oKfYvuHVKstpRWfL/thsemULrimPrV/eeaI=";
   };
 
   nativeBuildInputs = [ pkg-config help2man autoreconfHook ];

From 6a1ed983baf28aaffbbf287bd00baeb85ea911e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 05:19:53 +0000
Subject: [PATCH 255/956] monolith: 2.3.1 -> 2.4.0

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

diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix
index 0f9a171e979..708cd85bb29 100644
--- a/pkgs/tools/backup/monolith/default.nix
+++ b/pkgs/tools/backup/monolith/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "monolith";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "Y2Z";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16k5mp64a5l063rdj65hbpx414xv0bqdvhvz49k8018f2a2jj5xl";
+    sha256 = "sha256-kCyfVeGTXBzdwmTTDJM1eaR6ANoIXAydj1ePmrZehqE=";
   };
 
-  cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3";
+  cargoSha256 = "sha256-juxaL/zjfqzFMqZe9tpevdjjVU7fPK8zalksAARWHC8=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
   buildInputs = lib.optionals stdenv.isLinux [ openssl ]

From b081f71d1c2fb327fbd9b0657536675e118f5004 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 05:23:22 +0000
Subject: [PATCH 256/956] mergerfs: 2.32.0 -> 2.32.2

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

diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 0c9a6af9a6e..368f62f2196 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mergerfs";
-  version = "2.32.0";
+  version = "2.32.2";
 
   src = fetchFromGitHub {
     owner = "trapexit";
     repo = pname;
     rev = version;
-    sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad";
+    sha256 = "sha256-ybDVBcPkjsW2OxNxUmn5hG/qLEjxF9vqR8pZdb9tIBs=";
   };
 
   nativeBuildInputs = [

From 26dba9209f3753c74eeeaa5a3b0449ccd7d90dd5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 05:27:37 +0000
Subject: [PATCH 257/956] marvin: 20.20.0 -> 20.21.0

---
 pkgs/applications/science/chemistry/marvin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index 666731106ac..d90c55466f8 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "marvin";
-  version = "20.20.0";
+  version = "20.21.0";
 
   src = fetchurl {
     name = "marvin-${version}.deb";
     url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
-    sha256 = "1a8b0drb0c95c8arm3aa0z0sbdm9ilj4h1g90i0qyn4g2wk2xsal";
+    sha256 = "sha256-OMT6t8bNeFRWFlpyg0iKt2SMNfAmIUvVKiW+cfjfBuI=";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];

From 1d6ebd3f203ce870143b4bad80aea5a76400b53a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 05:45:18 +0000
Subject: [PATCH 258/956] lynis: 3.0.1 -> 3.0.3

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

diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 42a6bfd3414..27dc6504e8b 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "3.0.1";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = pname;
     rev = version;
-    sha256 = "0lsb455rimr1cjxqcgy819xjxf1faas8wlx2x0pxhn5yha9w9sfs";
+    sha256 = "sha256-+RkzsBcQhHrfY8gEiJK3ptDeulJzA3IuVXiYEpyAsmk=";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From e4bbdba929fea9bf772950a087993bdefcd4d9f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 05:52:16 +0000
Subject: [PATCH 259/956] monit: 5.27.1 -> 5.27.2

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

diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 29536a59546..3460020618f 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.27.1";
+  name = "monit-5.27.2";
 
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "0lgdhif6x11fcpli0qn138rpdvrfnwmkzsy4lc9pas45c78hhx7m";
+    sha256 = "sha256-2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw=";
   };
 
   nativeBuildInputs = [ bison flex ];

From 2b40e55a1d10069a2cbf1874d00a753bd611080a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 06:48:54 +0000
Subject: [PATCH 260/956] mdbook: 0.4.5 -> 0.4.6

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

diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index c6a6a053680..98fb6e69be5 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "mdBook";
     rev = "v${version}";
-    sha256 = "11v2x0q8pn7hbmznqy872ksr7szyiki9cfhapymjhkf5nwfvcdbb";
+    sha256 = "sha256-cS2fME3X8bFmEz6czoL+2ZFbflJP58+lIeC5SVleCNg=";
   };
 
-  cargoSha256 = "1psgqj04hzv7p18h4phsahxg4rj9yz38b8mh111k6l8m4r83kd75";
+  cargoSha256 = "sha256-iuJyprLp6HofcdH0NgNK2Vl+1FtdAvZPcltPUb5B2XU=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 

From d3665032ca6e8e7d251d0b7b5bac54f9ef88091c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 06:55:18 +0000
Subject: [PATCH 261/956] moodle: 3.10 -> 3.10.1

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

diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index 6b22c29c128..af565e6292d 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, writeText, plugins ? [ ] }:
 
 let
-  version = "3.10";
+  version = "3.10.1";
   stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version));
 
 in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
       "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
-    sha256 = "4aYKZmXym1Tq/462PIgJb4sHGUclEkU0Ok1iQJ6u0aw=";
+    sha256 = "sha256-VHlz8twsp7mSwZPatJkciHaDOP0r0EudeG5i3gjPUT8=";
   };
 
   phpConfig = writeText "config.php" ''

From d1e12eb127941498bc87919daa7c04b8fb50cf11 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Jan 2021 08:21:10 +0100
Subject: [PATCH 262/956] metasploit: 6.0.25 -> 6.0.26

---
 pkgs/tools/security/metasploit/Gemfile      |  2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 38 ++++++-------
 pkgs/tools/security/metasploit/default.nix  |  4 +-
 pkgs/tools/security/metasploit/gemset.nix   | 62 ++++++++++-----------
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index fcae2cf5d44..83db469db6e 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.25"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.26"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index f8eb110712f..8660d72e5d9 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c
-  ref: refs/tags/6.0.25
+  revision: 0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48
+  ref: refs/tags/6.0.26
   specs:
-    metasploit-framework (6.0.25)
+    metasploit-framework (6.0.26)
       actionpack (~> 5.2.2)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -31,9 +31,9 @@ GIT
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 2.0.26)
+      metasploit-payloads (= 2.0.27)
       metasploit_data_models
-      metasploit_payloads-mettle (= 1.0.2)
+      metasploit_payloads-mettle (= 1.0.5)
       mqtt
       msgpack
       nessus_rest
@@ -124,8 +124,8 @@ GEM
     arel-helpers (2.12.0)
       activerecord (>= 3.1.0, < 7)
     aws-eventstream (1.1.0)
-    aws-partitions (1.415.0)
-    aws-sdk-core (3.110.0)
+    aws-partitions (1.417.0)
+    aws-sdk-core (3.111.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -136,7 +136,7 @@ GEM
     aws-sdk-iam (1.46.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.40.0)
+    aws-sdk-kms (1.41.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.87.0)
@@ -174,7 +174,7 @@ GEM
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
-    faraday-net_http (1.0.0)
+    faraday-net_http (1.0.1)
     faye-websocket (0.11.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
@@ -185,14 +185,14 @@ GEM
     http_parser.rb (0.6.0)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.5.6)
-    irb (1.3.0)
+    io-console (0.5.7)
+    irb (1.3.2)
       reline (>= 0.1.5)
     jmespath (1.4.0)
     jsobfu (0.4.2)
       rkelly-remix
     json (2.5.1)
-    loofah (2.8.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     metasm (1.0.4)
@@ -214,7 +214,7 @@ GEM
       activemodel (~> 5.2.2)
       activesupport (~> 5.2.2)
       railties (~> 5.2.2)
-    metasploit-payloads (2.0.26)
+    metasploit-payloads (2.0.27)
     metasploit_data_models (4.1.1)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -224,7 +224,7 @@ GEM
       pg
       railties (~> 5.2.2)
       recog (~> 2.0)
-    metasploit_payloads-mettle (1.0.2)
+    metasploit_payloads-mettle (1.0.5)
     method_source (1.0.0)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
@@ -284,7 +284,7 @@ GEM
     recog (2.3.18)
       nokogiri
     redcarpet (3.5.1)
-    reline (0.2.0)
+    reline (0.2.2)
       io-console (~> 0.5)
     rex-arch (0.1.14)
       rex-text
@@ -312,7 +312,7 @@ GEM
       rex-arch
     rex-ole (0.1.7)
       rex-text
-    rex-powershell (0.1.88)
+    rex-powershell (0.1.89)
       rex-random_identifier
       rex-text
       ruby-rc4
@@ -330,13 +330,13 @@ GEM
       rex-socket
       rex-text
     rex-struct2 (0.1.3)
-    rex-text (0.2.29)
+    rex-text (0.2.31)
     rex-zip (0.1.4)
       rex-text
     rkelly-remix (0.0.7)
     ruby-macho (2.5.0)
     ruby-rc4 (0.1.5)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     ruby_smb (2.0.7)
       bindata
       openssl-ccm
@@ -348,7 +348,7 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    simpleidn (0.1.1)
+    simpleidn (0.2.1)
       unf (~> 0.1.4)
     sinatra (2.1.0)
       mustermann (~> 1.0)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 0e600e36414..0d9475ddfa0 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.0.25";
+  version = "6.0.26";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
+    sha256 = "sha256-ayW0MsV3TQnta+bP9kNL6m3hFPrn6lbsiAbXw7WOmBA=";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index c360e42ad1e..18ad75c0d5e 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -114,20 +114,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1348hdy6wf1av75nvlwp4b0pp4vshc9vrzic5vzrwnx9fg6cib08";
+      sha256 = "1difs2ynpizrq0jdww075camiagkkxncyfb1qi4s19hfsn8xp3j0";
       type = "gem";
     };
-    version = "1.415.0";
+    version = "1.417.0";
   };
   aws-sdk-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4";
+      sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4";
       type = "gem";
     };
-    version = "3.110.0";
+    version = "3.111.2";
   };
   aws-sdk-ec2 = {
     groups = ["default"];
@@ -154,10 +154,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4";
+      sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm";
       type = "gem";
     };
-    version = "1.40.0";
+    version = "1.41.0";
   };
   aws-sdk-s3 = {
     groups = ["default"];
@@ -364,10 +364,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d";
+      sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   faye-websocket = {
     groups = ["default"];
@@ -434,20 +434,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vbn4nvnr1pcmjsn0gghc3bz2md89njxq4801zi5dv5niypdxlsp";
+      sha256 = "1gp1xx2g1x81wsh929x7rzsm0c8qgkhr2mkjn79fbdwyfnk4s04l";
       type = "gem";
     };
-    version = "0.5.6";
+    version = "0.5.7";
   };
   irb = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0a7gkibv9485dbh64k3r5j20bf553dg0kmxy3hhgl2jsgqyvrl1y";
+      sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.3.2";
   };
   jmespath = {
     groups = ["default"];
@@ -484,10 +484,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
+      sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
       type = "gem";
     };
-    version = "2.8.0";
+    version = "2.9.0";
   };
   metasm = {
     groups = ["default"];
@@ -524,12 +524,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c";
-      sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
+      rev = "0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48";
+      sha256 = "044qissw7mq6i3n5dsp7z8af2vga9d1zdkz6dgnhjkbpqlrb89bb";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.0.25";
+    version = "6.0.26";
   };
   metasploit-model = {
     groups = ["default"];
@@ -546,10 +546,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gpv327750b7g243w0dmynji1gabwk81kb424y5hlbq9vqpgamnb";
+      sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2";
       type = "gem";
     };
-    version = "2.0.26";
+    version = "2.0.27";
   };
   metasploit_data_models = {
     groups = ["default"];
@@ -566,10 +566,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "147s4jd2hckls76binsskb6rvnh1crd2agmf1lk7fsj1n55dhkvk";
+      sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.5";
   };
   method_source = {
     groups = ["default"];
@@ -936,10 +936,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "109gpk4c9712cc3ilvidgks9i42y8gwnjpw6j4w4hci09pasz7i1";
+      sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "0.2.2";
   };
   rex-arch = {
     groups = ["default"];
@@ -1036,10 +1036,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02bzkraz4722zkjkm5cn9kvhx2mbkrhd5g123bkqgfkd19kbfjif";
+      sha256 = "1wza4g3kkscc17kaw44hnq8qs2nmvppb9awaf27lp4v1c1kdxixs";
       type = "gem";
     };
-    version = "0.1.88";
+    version = "0.1.89";
   };
   rex-random_identifier = {
     groups = ["default"];
@@ -1106,10 +1106,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05s0izxlb4rrhr42d6dz6idxdj4hrb7bdkk22qfwnaqdppb4w536";
+      sha256 = "078bdybz7cw3zd0mr59qgr1x6pifnn352636s74i1ncqzrzni46b";
       type = "gem";
     };
-    version = "0.2.29";
+    version = "0.2.31";
   };
   rex-zip = {
     groups = ["default"];
@@ -1156,10 +1156,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
+      sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
       type = "gem";
     };
-    version = "0.0.2";
+    version = "0.0.4";
   };
   ruby_smb = {
     groups = ["default"];
@@ -1206,10 +1206,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0b9v0xs4ksd68zckamv6rbrrqllpa9am0p29bycq9fxvlkqd7w2w";
+      sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.2.1";
   };
   sinatra = {
     groups = ["default"];

From 8f74a08fa01bcce890908833949ffffde32acbba Mon Sep 17 00:00:00 2001
From: Steven Pease <peasteven@gmail.com>
Date: Tue, 19 Jan 2021 23:44:50 -0800
Subject: [PATCH 263/956] Minimalist iOS fixes

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c065ec325f..98cbea8f7f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11624,6 +11624,7 @@ in
   bingrep = callPackage ../development/tools/analysis/bingrep { };
 
   binutils-unwrapped = callPackage ../development/tools/misc/binutils {
+    autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;
     # FHS sys dirs presumably only have stuff for the build platform
     noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
   };
@@ -11869,6 +11870,7 @@ in
     # Can only do this is in the native case, otherwise we might get infinite
     # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`.
       then targetPackages.stdenv.cc.cc
+    else if targetPlatform.isiOS then null
     else gcc.cc;
 
   libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };

From 02a0928803370a0cc786269b592275ed50b669d3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Jan 2021 08:58:03 +0100
Subject: [PATCH 264/956] python3Packages.sortedcollections: 1.2.3 -> 2.1.0

---
 .../python-modules/sortedcollections/default.nix     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix
index 7bdeeffc086..9f9f99a1856 100644
--- a/pkgs/development/python-modules/sortedcollections/default.nix
+++ b/pkgs/development/python-modules/sortedcollections/default.nix
@@ -1,24 +1,28 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
+, pytest-cov
 , pytestCheckHook
 , sortedcontainers
 }:
 
 buildPythonPackage rec {
   pname = "sortedcollections";
-  version = "1.2.3";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "python-sortedcollections";
     rev = "v${version}";
-    sha256 = "06ifkbhkj5fpsafibw0fs7b778g7q0gd03crvbjk04k0f3wjxc5z";
+    sha256 = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg=";
   };
 
   propagatedBuildInputs = [ sortedcontainers ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytest-cov
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "sortedcollections" ];
 

From bd9f2cc0b5ec9a3f3e24c53c3fd86a07dcc0a18f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 08:01:42 +0000
Subject: [PATCH 265/956] mpfi: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index 88617e9a740..f8f8d2391af 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, mpfr}:
 stdenv.mkDerivation rec {
   pname = "mpfi";
-  version = "1.5.3";
+  version = "1.5.4";
   file_nr = "37331";
   src = fetchurl {
     # NOTE: the file_nr is whats important here. The actual package name (including the version)
     # is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/
     # and click on Download in the section "Latest File Releases".
     url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tar.bz2";
-    sha256 = "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3";
+    sha256 = "sha256-I4PUV7IIxs088uZracTOR0d7Kg2zH77AzUseuqJHGS8=";
   };
   buildInputs = [mpfr];
   meta = {

From 912c39a7ad2e933e0122f0677cfd6788175748f9 Mon Sep 17 00:00:00 2001
From: SCOTT-HAMILTON <sgn.hamilton+github@protonmail.com>
Date: Tue, 19 Jan 2021 20:26:39 +0100
Subject: [PATCH 266/956] haste-client: replace bundlerEnv with cleaner
 bundlerApp

---
 pkgs/tools/misc/haste-client/Gemfile      |   2 +-
 pkgs/tools/misc/haste-client/Gemfile.lock |  29 +--
 pkgs/tools/misc/haste-client/default.nix  |  22 +--
 pkgs/tools/misc/haste-client/gemset.nix   | 224 +---------------------
 4 files changed, 17 insertions(+), 260 deletions(-)

diff --git a/pkgs/tools/misc/haste-client/Gemfile b/pkgs/tools/misc/haste-client/Gemfile
index 851fabc21dd..06dd69c0179 100644
--- a/pkgs/tools/misc/haste-client/Gemfile
+++ b/pkgs/tools/misc/haste-client/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
+gem 'haste'
diff --git a/pkgs/tools/misc/haste-client/Gemfile.lock b/pkgs/tools/misc/haste-client/Gemfile.lock
index 43040794660..3f395ed9ef8 100644
--- a/pkgs/tools/misc/haste-client/Gemfile.lock
+++ b/pkgs/tools/misc/haste-client/Gemfile.lock
@@ -1,38 +1,19 @@
-PATH
-  remote: .
-  specs:
-    haste (0.2.3)
-      faraday (~> 0.9)
-      json
-
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.4.4)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    json (2.3.1)
+    haste (0.2.3)
+      faraday (~> 0.9)
+      json
+    json (2.5.1)
     multipart-post (2.1.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  haste!
-  rspec
+  haste
 
 BUNDLED WITH
    2.1.4
diff --git a/pkgs/tools/misc/haste-client/default.nix b/pkgs/tools/misc/haste-client/default.nix
index 477ba5820aa..0005e94fe05 100644
--- a/pkgs/tools/misc/haste-client/default.nix
+++ b/pkgs/tools/misc/haste-client/default.nix
@@ -1,25 +1,13 @@
 { lib
-, bundlerEnv
+, bundlerApp
 , buildRubyGem
 , ruby
 }:
 
-let 
-  version = "0.2.3";
-  deps = bundlerEnv rec {
-    name = "haste-client-${version}";
-    inherit ruby;
-    gemdir = ./.;
-  };
-in
-buildRubyGem rec {
-  name = "haste-client-${version}";
-  inherit version;
-  gemName = "haste";
-
-  source.sha256 = "0jaq0kvlxwvd0jq9pl707saqnaaal3dis13mqwfjbj121gr4hq4q";
-
-  propagatedBuildInputs = [ deps ];
+bundlerApp rec {
+  pname = "haste";
+  gemdir = ./.;
+  exes = [ "haste" ];
 
   meta = with lib; {
     description = "Command line interface to the AnyStyle Parser and Finder";
diff --git a/pkgs/tools/misc/haste-client/gemset.nix b/pkgs/tools/misc/haste-client/gemset.nix
index 336df25081b..49959531ae9 100644
--- a/pkgs/tools/misc/haste-client/gemset.nix
+++ b/pkgs/tools/misc/haste-client/gemset.nix
@@ -1,14 +1,4 @@
 {
-  diff-lcs = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
-      type = "gem";
-    };
-    version = "1.4.4";
-  };
   faraday = {
     dependencies = ["multipart-post"];
     groups = ["default"];
@@ -172,159 +162,11 @@
   haste = {
     dependencies = ["faraday" "json"];
     groups = ["default"];
-    platforms = [{
-      engine = "maglev";
-    } {
-      engine = "maglev";
-    } {
-      engine = "maglev";
-      version = "1.8";
-    } {
-      engine = "maglev";
-      version = "1.8";
-    } {
-      engine = "maglev";
-      version = "1.9";
-    } {
-      engine = "maglev";
-      version = "1.9";
-    } {
-      engine = "maglev";
-      version = "2.0";
-    } {
-      engine = "maglev";
-      version = "2.0";
-    } {
-      engine = "maglev";
-      version = "2.1";
-    } {
-      engine = "maglev";
-      version = "2.1";
-    } {
-      engine = "maglev";
-      version = "2.2";
-    } {
-      engine = "maglev";
-      version = "2.2";
-    } {
-      engine = "maglev";
-      version = "2.3";
-    } {
-      engine = "maglev";
-      version = "2.3";
-    } {
-      engine = "maglev";
-      version = "2.4";
-    } {
-      engine = "maglev";
-      version = "2.4";
-    } {
-      engine = "maglev";
-      version = "2.5";
-    } {
-      engine = "maglev";
-      version = "2.5";
-    } {
-      engine = "maglev";
-      version = "2.6";
-    } {
-      engine = "maglev";
-      version = "2.6";
-    } {
-      engine = "rbx";
-    } {
-      engine = "rbx";
-    } {
-      engine = "rbx";
-      version = "1.8";
-    } {
-      engine = "rbx";
-      version = "1.9";
-    } {
-      engine = "rbx";
-      version = "2.0";
-    } {
-      engine = "rbx";
-      version = "2.1";
-    } {
-      engine = "rbx";
-      version = "2.2";
-    } {
-      engine = "rbx";
-      version = "2.3";
-    } {
-      engine = "rbx";
-      version = "2.4";
-    } {
-      engine = "rbx";
-      version = "2.5";
-    } {
-      engine = "rbx";
-      version = "2.6";
-    } {
-      engine = "ruby";
-    } {
-      engine = "ruby";
-    } {
-      engine = "ruby";
-    } {
-      engine = "ruby";
-      version = "1.8";
-    } {
-      engine = "ruby";
-      version = "1.8";
-    } {
-      engine = "ruby";
-      version = "1.9";
-    } {
-      engine = "ruby";
-      version = "1.9";
-    } {
-      engine = "ruby";
-      version = "2.0";
-    } {
-      engine = "ruby";
-      version = "2.0";
-    } {
-      engine = "ruby";
-      version = "2.1";
-    } {
-      engine = "ruby";
-      version = "2.1";
-    } {
-      engine = "ruby";
-      version = "2.2";
-    } {
-      engine = "ruby";
-      version = "2.2";
-    } {
-      engine = "ruby";
-      version = "2.3";
-    } {
-      engine = "ruby";
-      version = "2.3";
-    } {
-      engine = "ruby";
-      version = "2.4";
-    } {
-      engine = "ruby";
-      version = "2.4";
-    } {
-      engine = "ruby";
-      version = "2.5";
-    } {
-      engine = "ruby";
-      version = "2.5";
-    } {
-      engine = "ruby";
-      version = "2.6";
-    } {
-      engine = "ruby";
-      version = "2.6";
-    }];
+    platforms = [];
     source = {
-      path = ./.;
-      type = "path";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jaq0kvlxwvd0jq9pl707saqnaaal3dis13mqwfjbj121gr4hq4q";
+      type = "gem";
     };
     version = "0.2.3";
   };
@@ -482,10 +324,10 @@
     }];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
+      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
       type = "gem";
     };
-    version = "2.3.1";
+    version = "2.5.1";
   };
   multipart-post = {
     groups = ["default"];
@@ -646,58 +488,4 @@
     };
     version = "2.1.1";
   };
-  rspec = {
-    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
-    groups = ["development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h";
-      type = "gem";
-    };
-    version = "3.9.0";
-  };
-  rspec-core = {
-    dependencies = ["rspec-support"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y";
-      type = "gem";
-    };
-    version = "3.9.2";
-  };
-  rspec-expectations = {
-    dependencies = ["diff-lcs" "rspec-support"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb";
-      type = "gem";
-    };
-    version = "3.9.2";
-  };
-  rspec-mocks = {
-    dependencies = ["diff-lcs" "rspec-support"];
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr";
-      type = "gem";
-    };
-    version = "3.9.1";
-  };
-  rspec-support = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir";
-      type = "gem";
-    };
-    version = "3.9.3";
-  };
 }
\ No newline at end of file

From 2f68b135154a9e21273ebfa5deea4e24f21c81ea Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 03:04:06 +0100
Subject: [PATCH 267/956] jamomacore: remove unmaintained and broken lib

---
 .../libraries/audio/jamomacore/default.nix    | 25 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/audio/jamomacore/default.nix

diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix
deleted file mode 100644
index c08b25fea37..00000000000
--- a/pkgs/development/libraries/audio/jamomacore/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, pkg-config, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }:
-
-stdenv.mkDerivation rec {
-  version = "1.0-beta.1";
-  pname = "JamomaCore";
-
-  src = fetchFromGitHub {
-    owner = "jamoma";
-    repo = "JamomaCore";
-    rev = "v${version}";
-    sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ alsaLib portaudio portmidi libsndfile libxml2 ];
-
-  meta = {
-    description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media";
-    homepage = "http://www.jamoma.org";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
-    broken = true; # 2018-04-10
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cc1ef049c97..9f5d9678788 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -258,6 +258,7 @@ mapAliases ({
   inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
   infiniband-diags = rdma-core; # added 2019-08-09
   inotifyTools = inotify-tools;
+  jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
   jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities";
   jbuilder = dune; # added 2018-09-09
   jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c065ec325f..83ecc8229f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12194,8 +12194,6 @@ in
 
   jam = callPackage ../development/tools/build-managers/jam { };
 
-  jamomacore = callPackage ../development/libraries/audio/jamomacore { };
-
   jbake = callPackage ../development/tools/jbake { };
 
   jbang = callPackage ../development/tools/jbang { };

From f6db6a5a94342769a6253bcf4eb7b91335d29005 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 03:06:06 +0100
Subject: [PATCH 268/956] i-score: remove unmaintained and broken app

---
 pkgs/applications/audio/i-score/default.nix | 85 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 pkgs/top-level/all-packages.nix             |  2 -
 3 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 pkgs/applications/audio/i-score/default.nix

diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
deleted file mode 100644
index 2592c38e142..00000000000
--- a/pkgs/applications/audio/i-score/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  alsaLib,
-  boost,
-  cln,
-  cmake,
-  fetchFromGitHub,
-  gcc,
-  ginac,
-  jamomacore,
-  kdnssd,
-  libsndfile,
-  ninja,
-  portaudio,
-  portmidi,
-  qtbase,
-  qtdeclarative,
-  qtimageformats,
-  qtmultimedia,
-  qtquickcontrols2,
-  qtserialport,
-  qtsvg,
-  qttools,
-  qtwebsockets,
-  rtaudio,
-  lib, stdenv
-}:
-
-stdenv.mkDerivation rec {
-  version = "1.0.0-b31";
-  pname = "i-score";
-
-  src = fetchFromGitHub {
-    owner = "OSSIA";
-    repo = "i-score";
-    rev = "v${version}";
-    sha256 = "0g7s6n11w3wflrv5i2047dxx56lryms7xj0mznnlk5bii7g8dxzb";
-    fetchSubmodules = true;
-  };
-
-  buildInputs = [
-    alsaLib
-    boost
-    cln
-    cmake
-    ginac
-    gcc
-    jamomacore
-    kdnssd
-    libsndfile
-    ninja
-    portaudio
-    portmidi
-    qtbase
-    qtdeclarative
-    qtimageformats
-    qtmultimedia
-    qtquickcontrols2
-    qtserialport
-    qtsvg
-    qttools
-    qtwebsockets
-    rtaudio
-  ];
-
-  cmakeFlags = [
-    "-GNinja"
-    "-DISCORE_CONFIGURATION=static-release"
-    "-DISCORE_ENABLE_LTO=OFF"
-    "-DISCORE_BUILD_FOR_PACKAGE_MANAGER=True"
-  ];
-
-  preConfigure = ''
-    export CMAKE_PREFIX_PATH="''${CMAKE_PREFIX_PATH-}:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
-  '';
-
-  postInstall = ''rm $out/bin/i-score.sh'';
-
-  meta = {
-    description = "An interactive sequencer for the intermedia arts";
-    homepage = "http://i-score.org/";
-    license = lib.licenses.cecill20;
-    maintainers = [ lib.maintainers.magnetophon ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9f5d9678788..7d3332c3a7c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -258,6 +258,7 @@ mapAliases ({
   inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
   infiniband-diags = rdma-core; # added 2019-08-09
   inotifyTools = inotify-tools;
+  i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
   jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
   jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities";
   jbuilder = dune; # added 2018-09-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83ecc8229f5..e711c940a2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5094,8 +5094,6 @@ in
 
   i2pd = callPackage ../tools/networking/i2pd { };
 
-  i-score = libsForQt514.callPackage ../applications/audio/i-score { };
-
   iasl = callPackage ../development/compilers/iasl { };
 
   iannix = libsForQt5.callPackage ../applications/audio/iannix { };

From db28fc965bb946fcb96972789c4376e2cb9cfbad Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 20 Jan 2021 10:24:43 +0100
Subject: [PATCH 269/956] link-grammar: Improve

- Add meta.changelog
- Correct license
- Run tests
- Add quick smoke test to passthru.tests
---
 pkgs/tools/text/link-grammar/default.nix | 29 ++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
index e243206a114..b5cfdcbfc0c 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -1,6 +1,8 @@
-{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib }:
+{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib, runCommand, dieHook }:
 
-stdenv.mkDerivation rec {
+let
+
+link-grammar = stdenv.mkDerivation rec {
   version = "5.8.1";
   pname = "link-grammar";
 
@@ -18,11 +20,30 @@ stdenv.mkDerivation rec {
     "--disable-java-bindings"
   ];
 
+  doCheck = true;
+
+  passthru.tests = {
+    quick = runCommand "link-grammar-quick-test" {
+      buildInputs = [
+        link-grammar
+        dieHook
+      ];
+    } ''
+      echo "Furiously sleep ideas green colorless." | link-parser en | grep "No complete linkages found." || die "Grammaticaly invalid sentence was parsed."
+      echo "Colorless green ideas sleep furiously." | link-parser en | grep "Found .* linkages." || die "Grammaticaly valid sentence was not parsed."
+      touch $out
+    '';
+  };
+
   meta = with lib; {
     description = "A Grammar Checking library";
     homepage = "https://www.abisource.com/projects/link-grammar/";
-    license = licenses.lgpl21;
+    changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog";
+    license = licenses.lgpl21Only;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;
   };
-}
+};
+
+in
+  link-grammar

From 734ffbe48346aa449e7493a21906b2a76d7a4d1a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 05:02:08 +0000
Subject: [PATCH 270/956] alephone-marathon: 20190331 -> 20200904

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

diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix
index 1d0787067af..4518215a337 100644
--- a/pkgs/games/alephone/marathon/default.nix
+++ b/pkgs/games/alephone/marathon/default.nix
@@ -3,13 +3,13 @@
 alephone.makeWrapper rec {
   pname = "marathon";
   desktopName = "Marathon";
-  version = "20190331";
+  version = "20200904";
   icon = alephone.icons + "/marathon.png";
 
   zip = fetchurl {
     url =
       "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
-    sha256 = "1d18a7hn8s50rqcs9i72ak5fq5a76hwk7nylfinrxjb134c9vlpz";
+    sha256 = "sha256-x5M8RkxH+Rn8hUJIIq/AFC5Ibn0zF95BqZIDEwM6wVg=";
   };
 
   meta = {

From 9f5d0aad8dd0cd0a78213b4441a6485fb268a992 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 09:47:40 +0000
Subject: [PATCH 271/956] new-session-manager: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix
index 8d359b29201..0badb85f02c 100644
--- a/pkgs/applications/audio/new-session-manager/default.nix
+++ b/pkgs/applications/audio/new-session-manager/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "new-session-manager";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "linuxaudio";
     repo = "new-session-manager";
     rev = "v${version}";
-    sha256 = "PqOv4tx3NLxL2+GWIUVgL72EQYMyDPIMrAkyby3TZ+0=";
+    sha256 = "sha256-YP5AHoFP8P1o0Y2jAipRcNPxPRuM7COs5tBMm6Eojoc=";
   };
 
   nativeBuildInputs = [ meson pkg-config ninja ];

From 1572940688927226c53182aa8595f2e2bc196ecf Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Wed, 20 Jan 2021 10:54:24 +0100
Subject: [PATCH 272/956] networking, chrony, ntpd, timesyncd: add timeServers
 option type

---
 nixos/modules/config/networking.nix              | 1 +
 nixos/modules/services/networking/ntp/chrony.nix | 1 +
 nixos/modules/services/networking/ntp/ntpd.nix   | 1 +
 nixos/modules/system/boot/timesyncd.nix          | 1 +
 4 files changed, 4 insertions(+)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index c09588834cf..ef747774b25 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -58,6 +58,7 @@ in
         "2.nixos.pool.ntp.org"
         "3.nixos.pool.ntp.org"
       ];
+      type = types.listOf types.str;
       description = ''
         The set of NTP servers from which to synchronise.
       '';
diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index e6fa48daf46..115340924a2 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -41,6 +41,7 @@ in
 
       servers = mkOption {
         default = config.networking.timeServers;
+        type = types.listOf types.str;
         description = ''
           The set of NTP servers from which to synchronise.
         '';
diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix
index 51398851adc..861b0db01a4 100644
--- a/nixos/modules/services/networking/ntp/ntpd.nix
+++ b/nixos/modules/services/networking/ntp/ntpd.nix
@@ -79,6 +79,7 @@ in
 
       servers = mkOption {
         default = config.networking.timeServers;
+        type = types.listOf types.str;
         description = ''
           The set of NTP servers from which to synchronise.
         '';
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index 35fb5578b07..692315dbe99 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -16,6 +16,7 @@ with lib;
       };
       servers = mkOption {
         default = config.networking.timeServers;
+        type = types.listOf types.str;
         description = ''
           The set of NTP servers from which to synchronise.
         '';

From cb2510eaa6124dcc9c88d0b03805a27b124e8b7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Jan 2021 10:58:12 +0100
Subject: [PATCH 273/956] mopidy-tunein: 1.0.2 -> 1.1.0

https://github.com/kingosticks/mopidy-tunein/releases/tag/v1.1.0
---
 pkgs/applications/audio/mopidy/tunein.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix
index 776b4a0afb5..d8a6d6eacca 100644
--- a/pkgs/applications/audio/mopidy/tunein.nix
+++ b/pkgs/applications/audio/mopidy/tunein.nix
@@ -2,12 +2,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mopidy-tunein";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = python3Packages.fetchPypi {
     inherit version;
     pname = "Mopidy-TuneIn";
-    sha256 = "1mvfhka8wi835yk9869yn3b6mdkfwqkylp14vpjkbm42d0kj4lkc";
+    sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li";
   };
 
   propagatedBuildInputs = [

From 3f509b12d0e5a75ebf81dbd263ad128d670b4375 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 20 Jan 2021 19:06:01 +0900
Subject: [PATCH 274/956] nixfmt

---
 pkgs/top-level/beam-packages.nix | 38 +++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 52268276a03..d8d78934a06 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -1,7 +1,7 @@
 { callPackage, wxGTK30, openssl_1_0_2, buildPackages }:
 
 rec {
-  lib = callPackage ../development/beam-modules/lib.nix {};
+  lib = callPackage ../development/beam-modules/lib.nix { };
 
   # Each
   interpreters = rec {
@@ -25,7 +25,8 @@ rec {
     erlangR23_odbc = erlangR23.override { odbcSupport = true; };
     erlangR23_javac = erlangR23.override { javacSupport = true; };
     erlangR23_odbc_javac = erlangR23.override {
-      javacSupport = true; odbcSupport = true;
+      javacSupport = true;
+      odbcSupport = true;
     };
     erlangR23_nox = erlangR23.override { wxSupport = false; };
 
@@ -39,7 +40,8 @@ rec {
     erlangR22_odbc = erlangR22.override { odbcSupport = true; };
     erlangR22_javac = erlangR22.override { javacSupport = true; };
     erlangR22_odbc_javac = erlangR22.override {
-      javacSupport = true; odbcSupport = true;
+      javacSupport = true;
+      odbcSupport = true;
     };
     erlangR22_nox = erlangR22.override { wxSupport = false; };
 
@@ -51,7 +53,8 @@ rec {
     erlangR21_odbc = erlangR21.override { odbcSupport = true; };
     erlangR21_javac = erlangR21.override { javacSupport = true; };
     erlangR21_odbc_javac = erlangR21.override {
-      javacSupport = true; odbcSupport = true;
+      javacSupport = true;
+      odbcSupport = true;
     };
     erlangR21_nox = erlangR21.override { wxSupport = false; };
 
@@ -63,7 +66,8 @@ rec {
     erlangR20_odbc = erlangR20.override { odbcSupport = true; };
     erlangR20_javac = erlangR20.override { javacSupport = true; };
     erlangR20_odbc_javac = erlangR20.override {
-      javacSupport = true; odbcSupport = true;
+      javacSupport = true;
+      odbcSupport = true;
     };
     erlangR20_nox = erlangR20.override { wxSupport = false; };
 
@@ -76,7 +80,8 @@ rec {
     erlangR19_odbc = erlangR19.override { odbcSupport = true; };
     erlangR19_javac = erlangR19.override { javacSupport = true; };
     erlangR19_odbc_javac = erlangR19.override {
-      javacSupport = true; odbcSupport = true;
+      javacSupport = true;
+      odbcSupport = true;
     };
     erlangR19_nox = erlangR19.override { wxSupport = false; };
 
@@ -89,28 +94,31 @@ rec {
     erlangR18_odbc = erlangR18.override { odbcSupport = true; };
     erlangR18_javac = erlangR18.override { javacSupport = true; };
     erlangR18_odbc_javac = erlangR18.override {
-      javacSupport = true; odbcSupport = true;
+      javacSupport = true;
+      odbcSupport = true;
     };
     erlangR18_nox = erlangR18.override { wxSupport = false; };
 
     # Basho fork, using custom builder.
-    erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
-      autoconf = buildPackages.autoconf269;
-    };
-    erlang_basho_R16B02_odbc = erlang_basho_R16B02.override {
-      odbcSupport = true;
-    };
+    erlang_basho_R16B02 =
+      lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
+        autoconf = buildPackages.autoconf269;
+      };
+    erlang_basho_R16B02_odbc =
+      erlang_basho_R16B02.override { odbcSupport = true; };
 
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR23.elixir`.
-    inherit (packages.erlang) elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
+    inherit (packages.erlang)
+      elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
 
     inherit (packages.erlang) lfe lfe_1_2 lfe_1_3;
   };
 
   # Helper function to generate package set with a specific Erlang version.
-  packagesWith = erlang: callPackage ../development/beam-modules { inherit erlang; };
+  packagesWith = erlang:
+    callPackage ../development/beam-modules { inherit erlang; };
 
   # Each field in this tuple represents all Beam packages in nixpkgs built with
   # appropriate Erlang/OTP version.

From 64ccbaa6bf4523413dfa3a8a085f35a98872c4ea Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 20 Jan 2021 19:06:32 +0900
Subject: [PATCH 275/956] erlang: R22 -> R23

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

diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index d8d78934a06..fb331b85eb9 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -6,12 +6,12 @@ rec {
   # Each
   interpreters = rec {
 
-    # R22 is the default version.
-    erlang = erlangR22; # The main switch to change default Erlang version.
-    erlang_odbc = erlangR22_odbc;
-    erlang_javac = erlangR22_javac;
-    erlang_odbc_javac = erlangR22_odbc_javac;
-    erlang_nox = erlangR22_nox;
+    # R23 is the default version.
+    erlang = erlangR23; # The main switch to change default Erlang version.
+    erlang_odbc = erlangR23_odbc;
+    erlang_javac = erlangR23_javac;
+    erlang_odbc_javac = erlangR23_odbc_javac;
+    erlang_nox = erlangR23_nox;
 
     # Standard Erlang versions, using the generic builder.
 

From 7bad7bce6354af5217784d7043c1abd47180624a Mon Sep 17 00:00:00 2001
From: Arijit Basu <sayanarijit@gmail.com>
Date: Wed, 20 Jan 2021 15:20:09 +0530
Subject: [PATCH 276/956] openapi-generator-cli: 4.3.1 -> 5.0.0

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

diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix
index a5271bf410f..787067881a2 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "4.3.1";
+  version = "5.0.0";
   pname = "openapi-generator-cli";
 
   jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
-    sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l";
+    sha256 = "13kgc84kyrypr0xy4xifrzqcy4qlvcxc7f0jy3n1xkjl3vhav7w3";
   };
 
   phases = [ "installPhase" ];

From 08dff21ec71839177ef16d57f1d32a86a52edb5f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 01:47:18 +0000
Subject: [PATCH 277/956] libjcat: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix
index 1eca110f8cb..a6ad6d4bb64 100644
--- a/pkgs/development/libraries/libjcat/default.nix
+++ b/pkgs/development/libraries/libjcat/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libjcat";
-  version = "0.1.4";
+  version = "0.1.5";
 
   outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "libjcat";
     rev = version;
-    sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh";
+    sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc=";
   };
 
   patches = [

From 61b83e68dc040cc1bcfe3234c6d867d72361b13a Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Wed, 2 Dec 2020 16:36:44 +0100
Subject: [PATCH 278/956] shattered-pixel-dungeon: almost fix darwin build

Gradle has some problems with termcap:

> FAILURE: Build failed with an exception.
>
> * What went wrong:
> Could not open terminal for stdout: could not get termcap entry

see https://github.com/gradle/gradle/issues/4426

Unfortunately before the merge darwin broke again, so while this is now
in a better state it is still broken:
https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005
---
 pkgs/games/shattered-pixel-dungeon/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index 50aca1671f9..c49daa3b69a 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -34,6 +34,8 @@ let
     nativeBuildInputs = [ gradle_5 perl ];
     buildPhase = ''
       export GRADLE_USER_HOME=$(mktemp -d)
+      # https://github.com/gradle/gradle/issues/4426
+      ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"}
       gradle --no-daemon desktop:release
     '';
     # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
@@ -54,6 +56,8 @@ in stdenv.mkDerivation rec {
 
   buildPhase = ''
     export GRADLE_USER_HOME=$(mktemp -d)
+    # https://github.com/gradle/gradle/issues/4426
+    ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"}
     # point to offline repo
     sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle
     gradle --offline --no-daemon desktop:release
@@ -78,6 +82,8 @@ in stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ fgaz ];
     platforms = platforms.all;
+    # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005
+    broken = stdenv.isDarwin;
   };
 }
 

From 5ec6b94e4cbf4349a8d5409d2731dde8afbc0f60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 10:28:45 +0000
Subject: [PATCH 279/956] nbd: 3.20 -> 3.21

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

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index c136328d031..6478a15aa1a 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, which }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-3.20";
+  name = "nbd-3.21";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.xz";
-    sha256 = "1kfnyx52nna2mnw264njk1dl2zc8m78sz031yp65mbmpi99v7qg0";
+    sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk=";
   };
 
   buildInputs = [ glib ]

From a9d8c8a4bddc2bd1dacd14f1797176998d27c0df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 10:50:03 +0000
Subject: [PATCH 280/956] mympd: 6.8.3 -> 6.10.0

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

diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix
index 4e069e001da..876677c3bea 100644
--- a/pkgs/applications/audio/mympd/default.nix
+++ b/pkgs/applications/audio/mympd/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mympd";
-  version = "6.8.3";
+  version = "6.10.0";
 
   src = fetchFromGitHub {
     owner = "jcorporation";
     repo = "myMPD";
     rev = "v${version}";
-    sha256 = "1a3jrqslxk2a9h5gj6kch108lg9z0i5zwr0j9yd5viyfhr3ka4cq";
+    sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ=";
   };
 
   nativeBuildInputs = [

From 92c884dfd7140a6c3e6c717cf8990f7a78524331 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 20 Jan 2021 13:50:41 +0300
Subject: [PATCH 281/956] =?UTF-8?q?gpxsee:=208.0=20=E2=86=92=208.2=20(#110?=
 =?UTF-8?q?117)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index adafe8801f3..ed1b31559f5 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "8.0";
+  version = "8.2";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a";
+    sha256 = "05wn4kmvsswwd2q2pffxbplb38capwv7iddsghix3r5zds13142z";
   };
 
   patches = (substituteAll {

From ea051b0417d2257c3b67450e8b85f936cfe753b1 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Mon, 18 Jan 2021 10:50:35 +0100
Subject: [PATCH 282/956] zen-kernels: 5.10.6 -> 5.10.9

---
 pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index 057a957e620..9666300d142 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
 
 let
-  version = "5.10.6";
+  version = "5.10.9";
   suffix = "lqx1";
 in
 
@@ -14,7 +14,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     rev = "v${version}-${suffix}";
-    sha256 = "0vvb00311yhf08ib3yvkjwk2j45f8r268ywg5299yjgbyl6g95kg";
+    sha256 = "1j0rz4j1br7kzg9zb5l2xz60ccr4iwjndxq3f4gml8s3fb4cpp6f";
   };
 
   extraMeta = {
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 6409e90ea32..0567a127dae 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildLinux, ... } @ args:
 
 let
-  version = "5.10.6";
+  version = "5.10.9";
   suffix = "zen1";
 in
 
@@ -14,7 +14,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     rev = "v${version}-${suffix}";
-    sha256 = "0asn4ysnzv845g35ca9sdi89sc7clcc88xmx64pcxmh033civ5fw";
+    sha256 = "0p7w2ib8aac0cx16fksr8870kmijw86hbzdkjsq1ww07ifnb4qir";
   };
 
   extraMeta = {

From 1c89c00ffcfc2724d76cbb09ad8868a4645818a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 11:10:05 +0000
Subject: [PATCH 283/956] nwg-launchers: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix
index 99033f14a6d..c4c54ba7c53 100644
--- a/pkgs/applications/misc/nwg-launchers/default.nix
+++ b/pkgs/applications/misc/nwg-launchers/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nwg-launchers";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0flp7mwj1pgcwx3k9pzc8pmqlkhbddj0maimdnvlazk87kzxpfd0";
+    sha256 = "sha256-vuvYL9N9xdg27uhiTe2OqxZ3/n/9EjlqPxtNMXpqpE8=";
   };
 
   nativeBuildInputs = [

From f6818d97d7931fc5a3deb15ad9bf610d0e5f2536 Mon Sep 17 00:00:00 2001
From: Arijit Basu <sayanarijit@gmail.com>
Date: Wed, 20 Jan 2021 15:37:25 +0530
Subject: [PATCH 284/956] openapi-generator-cli-unstable: 5.0.0-2020-02-04 ->
 6.0.0-2021-01-18

---
 pkgs/tools/networking/openapi-generator-cli/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix
index a0af97b2ea9..1384f35a3f2 100644
--- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "5.0.0-2020-02-04";
+  version = "6.0.0-2021-01-18";  # Also update the fetchurl link
   pname = "openapi-generator-cli";
 
   jarfilename = "${pname}-${version}.jar";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/openapi-generator-cli-5.0.0-20200204.091421-37.jar";
-    sha256 = "0swv976fcr2z8g53avr0r706c31xacb2dlnl8b4c8mzmi49byy7k";
+    url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20210118.082537-4.jar";
+    sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x";
   };
 
   phases = [ "installPhase" ];

From 8f4cadc468117a3c311f82d7c4f31c21943c9b5a Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Wed, 20 Jan 2021 06:19:38 -0500
Subject: [PATCH 285/956] containerpilot: init at 3.9.0pre

---
 .../cluster/containerpilot/default.nix        |  13 ++
 .../cluster/containerpilot/deps.nix           | 173 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 188 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/containerpilot/default.nix
 create mode 100644 pkgs/applications/networking/cluster/containerpilot/deps.nix

diff --git a/pkgs/applications/networking/cluster/containerpilot/default.nix b/pkgs/applications/networking/cluster/containerpilot/default.nix
new file mode 100644
index 00000000000..4a7ba1002e8
--- /dev/null
+++ b/pkgs/applications/networking/cluster/containerpilot/default.nix
@@ -0,0 +1,13 @@
+{ buildGoPackage, fetchFromGitHub }:
+buildGoPackage rec {
+  version = "3.9.0pre";
+  pname = "containerpilot";
+  src = fetchFromGitHub {
+    owner = "joyent";
+    repo = pname;
+    rev = "d999b632b0c96d9e27f092dc9f81a9d82dfe0106";
+    sha256 = "0wsc8canr1c9wzr1lv40yixj9l10c66i6d14yrljsyagl2z02v4n";
+  };
+  goPackagePath = "github.com/joyent/${pname}";
+  goDeps = ./deps.nix;
+}
diff --git a/pkgs/applications/networking/cluster/containerpilot/deps.nix b/pkgs/applications/networking/cluster/containerpilot/deps.nix
new file mode 100644
index 00000000000..9df154389cb
--- /dev/null
+++ b/pkgs/applications/networking/cluster/containerpilot/deps.nix
@@ -0,0 +1,173 @@
+# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix)
+[
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9a";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/client9/reopen";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/reopen";
+      rev = "1a6ccbeaae3f";
+      sha256 = "0iarv0sn9hb26sr75bwilz3m86kcfad4m5klmzixbd4yw1ipnffa";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/flynn/json5";
+    fetch = {
+      type = "git";
+      url = "https://github.com/flynn/json5";
+      rev = "7620272ed633";
+      sha256 = "1l3rqfis8b72mqwm88lx78d0mbdihyamj8cgg2pa5vfbq49cpydf";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "6a1fa9404c0a";
+      sha256 = "0dsd6vlfdyarn3v822x9p2s94gfi5lhvqc2vm3bqmqjgcik3c51z";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/consul";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/consul";
+      rev = "v1.0.1-rc1";
+      sha256 = "10xqi86n2h39q3qlkxfhnrqwm1bgijs5n2kryaq9yalv5p3qxczg";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-cleanhttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-cleanhttp";
+      rev = "3573b8b52aa7";
+      sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-rootcerts";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-rootcerts";
+      rev = "6bb64b370b90";
+      sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/serf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/serf";
+      rev = "91fd53b1d3e6";
+      sha256 = "0p9mhv6w85cxxl95kvl3rk04yif6v5bhf5kxw8i1cphv5kddv7j9";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "v1.0.1";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "b8bc1bf76747";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "d2dd02622084";
+      sha256 = "1idj9h0g9z3s21y2hivaf1dknxhpd7yy0kn6wk3311hlr7s543j5";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "v0.8.0";
+      sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "6f3806018612";
+      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "0866df4b85a1";
+      sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "e645f4e5aaa8";
+      sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.0.0";
+      sha256 = "0kyvaa4m8w5wijjvrh0amd9bl3sci1vj4y9v9a97sx3rf7xww52l";
+      moduleDir = "";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "94b76065f2d2";
+      sha256 = "0lxd3gmkvza3mah5m8nncdsgd1y6r25vaz4wzdmrs3i1ikzknn93";
+      moduleDir = "";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0117c4ac229..ac9eff2ea2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -208,6 +208,8 @@ in
 
   comedilib = callPackage ../development/libraries/comedilib {  };
 
+  containerpilot = callPackage ../applications/networking/cluster/containerpilot { };
+
   cp437 = callPackage ../tools/misc/cp437 { };
 
   cpu-x = callPackage ../applications/misc/cpu-x { };

From 4ac13b8bb2bdb074472bbc9e894abd4153cfeb28 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Wed, 20 Jan 2021 13:49:10 +0200
Subject: [PATCH 286/956] emplace: 0.4.1 -> 0.4.2

---
 pkgs/tools/package-management/emplace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index c531a21196d..eb6b2b88354 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "emplace";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "tversteeg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-iPfE2z98j93zqK2uZ8R+Fy2qNOCH9oCxHgeedvs/onY=";
+    sha256 = "sha256-74jv5GvBSErU5qjd4QmAK4JZhqFoqBf3cNxOGLIqt9U=";
   };
 
-  cargoSha256 = "sha256-62DHIIwloB+pPAZnOEfLJzAWrRJSxPp4IghBh6lRuc8=";
+  cargoSha256 = "sha256-SPHXkvtUL6hdYOE1fUIQLEqWzn68RVBiu6zJQJ/3BxQ=";
 
   meta = with lib; {
     description = "Mirror installed software on multiple machines";

From 82fc1ec36e9c43b0d2ba1a3e7df938fc78c046ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 20 Jan 2021 11:29:41 +0100
Subject: [PATCH 287/956] python3Packages.git-annex-adapter: fix tests

fixes https://github.com/NixOS/nixpkgs/issues/108588
---
 .../python-modules/git-annex-adapter/default.nix           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index 1c76e5622b8..5922377ab3a 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
+{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll
 , python, util-linux, pygit2, gitMinimal, git-annex, cacert
 }:
 
@@ -17,6 +17,11 @@ buildPythonPackage rec {
   };
 
   patches = [
+    # fix tests with recent versions of git-annex
+    (fetchpatch {
+      url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch";
+      sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi";
+    })
     (substituteAll {
       src = ./git-annex-path.patch;
       gitAnnex = "${git-annex}/bin/git-annex";

From 8db234db14cce318233b3d808672a6254a984031 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 12:05:09 +0000
Subject: [PATCH 288/956] musescore: 3.5.2 -> 3.6

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

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index e150888ac6d..ff39e62e729 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -7,13 +7,13 @@
 
 mkDerivation rec {
   pname = "musescore";
-  version = "3.5.2";
+  version = "3.6";
 
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
     rev = "v${version}";
-    sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s=";
+    sha256 = "sha256-0M+idYnrgXyH6WLp+2jIYRnFzTB93v+dG1XHmSNyPjE=";
   };
 
   patches = [

From 96d31cbfe1b1d4b0be8abe34515c521360a33361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 20 Jan 2021 12:57:58 +0100
Subject: [PATCH 289/956] python3Packages.ldaptor: run tests

Also disable on non-supported python versions
---
 pkgs/development/python-modules/ldaptor/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix
index 2a4550d6b42..e3694bffe37 100644
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/pkgs/development/python-modules/ldaptor/default.nix
@@ -3,12 +3,13 @@
 , fetchPypi
 , twisted
 , passlib
-, pycrypto
 , pyopenssl
 , pyparsing
 , service-identity
 , zope_interface
 , isPy3k
+, pythonAtLeast
+, python
 }:
 
 buildPythonPackage rec {
@@ -21,13 +22,15 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface
+    twisted passlib pyopenssl pyparsing service-identity zope_interface
   ];
 
-  disabled = isPy3k;
+  # https://github.com/twisted/ldaptor/pull/210
+  disabled = !isPy3k || pythonAtLeast "3.9";
 
-  # TypeError: None is neither bytes nor unicode
-  doCheck = false;
+  checkPhase = ''
+    ${python.interpreter} -m twisted.trial ldaptor
+  '';
 
   meta = {
     description = "A Pure-Python Twisted library for LDAP";

From 287af3bd5002edf2d7893417457da90019072f33 Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@zubkoland.org>
Date: Wed, 20 Jan 2021 07:12:27 -0500
Subject: [PATCH 290/956] snowmachine: init at 1.0.1 (#105895)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/applications/snowmachine/default.nix | 24 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/snowmachine/default.nix

diff --git a/pkgs/applications/snowmachine/default.nix b/pkgs/applications/snowmachine/default.nix
new file mode 100644
index 00000000000..2e05fe0c643
--- /dev/null
+++ b/pkgs/applications/snowmachine/default.nix
@@ -0,0 +1,24 @@
+{ buildPythonPackage, lib, click, colorama, fetchPypi, setuptools-git }:
+
+buildPythonPackage rec {
+  pname = "snowmachine";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1v385hhxy2a8vx5p0fhn0di8l4qfpb0a86j6nwsg0aw6ngb09qf1";
+  };
+
+  buildInputs = [ setuptools-git ];
+  propagatedBuildInputs = [ click colorama ];
+
+  doCheck = false;
+  pythonImportsCheck = [ "snowmachine" ];
+
+  meta = with lib; {
+    description = "A python script that will make your terminal snow";
+    homepage = "http://github.com/sontek/snowmachine";
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ djanatyn ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0117c4ac229..eb65cd57cb8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29445,6 +29445,8 @@ in
 
   snowsql = callPackage ../applications/misc/snowsql {};
 
+  snowmachine = python3Packages.callPackage ../applications/snowmachine {};
+
   sidequest = callPackage ../applications/misc/sidequest {};
 
   maphosts = callPackage ../tools/networking/maphosts {};

From 4544eb5e692f20397e66d8609f00e44f85320e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 20 Jan 2021 13:20:56 +0100
Subject: [PATCH 291/956] pythonPackages.privacyidea-ldap-proxy: does not
 support Python 3

---
 pkgs/development/python-modules/privacyidea/ldap-proxy.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix
index ec87186a4fd..25a81510c7d 100644
--- a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix
+++ b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix
@@ -1,9 +1,12 @@
-{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }:
+{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }:
 
 buildPythonPackage rec {
   pname = "privacyidea-ldap-proxy";
   version = "0.6.1";
 
+  # https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50
+  disabled = isPy3k;
+
   src = fetchFromGitHub {
     owner = "privacyidea";
     repo = pname;

From ada0a637bfbab4466b2ae72531fd3f4c6201e338 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 12:40:16 +0000
Subject: [PATCH 292/956] nexus: 3.29.0-02 -> 3.29.2-02

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

diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index ad83b0f30c7..62b9df74127 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nexus";
-  version = "3.29.0-02";
+  version = "3.29.2-02";
 
   src = fetchurl {
     url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
-    sha256 = "0yxk3yy9vllxc9v4dn3fs8hh389lrw2g8gg24rx1w8bg05rrrr8z";
+    sha256 = "sha256-vHy7V32xlYaPJdc8oi3j98weOdc4R5S64Dwo9YI8o6c=";
   };
 
   preferLocalBuild = true;

From ba3f7b85e343ade9f413b2025fd52efe44ecedcc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 12:54:24 +0000
Subject: [PATCH 293/956] nco: 4.9.6 -> 4.9.7

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

diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index 5f6c85411b1..bb8dee2be61 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
 
 stdenv.mkDerivation rec {
-  version = "4.9.6";
+  version = "4.9.7";
   pname = "nco";
 
   nativeBuildInputs = [ flex which ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/nco/nco/archive/${version}.tar.gz";
-    sha256 = "0f8vf66700dcr48jqd371bbldc61xkrilby13xp8j5l9q4xal808";
+    sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4=";
   };
 
   prePatch = ''

From 209d2c5314293fe779f5aa0b31ed91931c4e9496 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 19 Jan 2021 22:38:57 -0300
Subject: [PATCH 294/956] nnn: add withIcon/withNerdIcon options

This allows nnn to be build with either Terminal icons or Nerd Fonts
icons support.
---
 pkgs/applications/misc/nnn/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 4c36b3d930f..4a72eecf9b3 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -1,6 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, conf ? null }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline
+, conf ? null, withIcons ? false, withNerdIcons ? false }:
 
-with lib;
+# Mutually exclusive options
+assert withIcons -> withNerdIcons == false;
+assert withNerdIcons -> withIcons == false;
 
 stdenv.mkDerivation rec {
   pname = "nnn";
@@ -13,13 +16,17 @@ stdenv.mkDerivation rec {
     sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy";
   };
 
-  configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf);
-  preBuild = optionalString (conf != null) "cp ${configFile} src/nnn.h";
+  configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
+  preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ readline ncurses ];
 
-  makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
+  makeFlags = [
+    "DESTDIR=${placeholder "out"}"
+    "PREFIX="
+  ] ++ lib.optional withIcons [ "O_ICONS=1" ]
+    ++ lib.optional withNerdIcons [ "O_NERD=1" ];
 
   # shell completions
   postInstall = ''
@@ -28,7 +35,7 @@ stdenv.mkDerivation rec {
     install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Small ncurses-based file browser forked from noice";
     homepage = "https://github.com/jarun/nnn";
     license = licenses.bsd2;

From b30b9a047896480f87520d699c5edd9dcaa9b928 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 13:12:37 +0000
Subject: [PATCH 295/956] operator-sdk: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix
index f97611c7785..c09331de598 100644
--- a/pkgs/development/tools/operator-sdk/default.nix
+++ b/pkgs/development/tools/operator-sdk/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "operator-sdk";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8";
+    sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4=";
   };
 
-  vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv";
+  vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk=";
 
   doCheck = false;
 

From 5d5082a20cc6e667a107f5b5e9038cc7bf0f8931 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 20 Jan 2021 12:46:40 +0200
Subject: [PATCH 296/956] mailspring: 1.7.8 -> 1.8.0

---
 .../networking/mailreaders/mailspring/default.nix            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix
index f0ab5f148f1..f0f3bdb3ff4 100644
--- a/pkgs/applications/networking/mailreaders/mailspring/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mailspring";
-  version = "1.7.8";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
-    sha256 = "207fbf813b6da018a5b848e5dc1194b5996daab39adbd873b2cecb0565c105ce";
+    sha256 = "BtzYcHN87qH7s3GiBrsDfmuy9v2xdhCeSShu8+T9T3E=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +60,6 @@ stdenv.mkDerivation rec {
     cp -ar ./usr/share $out
 
     substituteInPlace $out/share/mailspring/resources/app.asar.unpacked/mailsync \
-      --replace realpath ${coreutils}/bin/realpath \
       --replace dirname ${coreutils}/bin/dirname
 
     ln -s $out/share/mailspring/mailspring $out/bin/mailspring

From 54a44777a957848289e0467b1f87e2df4081a053 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Wed, 20 Jan 2021 10:30:35 -0300
Subject: [PATCH 297/956] mednaffe: small fixup

A fixup to the ubiquitous problem of "GTK variables not found". Now the app
doesn't segfault when opening a window.
---
 pkgs/misc/emulators/mednaffe/default.nix | 29 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix
index e8cda5170cc..dbbbe4da557 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/pkgs/misc/emulators/mednaffe/default.nix
@@ -1,7 +1,13 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkg-config, wrapGAppsHook
-, gtk2 ? null, gtk3 ? null, mednafen }:
-
-with lib;
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, mednafen
+, gtk2 ? null
+, gtk3 ? null
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "mednaffe";
@@ -14,13 +20,20 @@ stdenv.mkDerivation rec {
     sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7";
   };
 
-  nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config wrapGAppsHook ];
+  nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
   buildInputs = [ gtk2 gtk3 mednafen ];
 
-  configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];
-  postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin";
+  configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ];
 
-  meta = {
+  dontWrapGApps = true;
+
+  postInstall = ''
+    wrapProgram $out/bin/mednaffe \
+      --prefix PATH ':' "${mednafen}/bin" \
+      "''${gappsWrapperArgs[@]}"
+   '';
+
+  meta = with lib; {
     description = "GTK-based frontend for mednafen emulator";
     homepage = "https://github.com/AmatCoder/mednaffe";
     license = licenses.gpl3Plus;

From f4213717f5952342b2981515ac700f1212c321cb Mon Sep 17 00:00:00 2001
From: Jacek Generowicz <jacg@my-post-office.net>
Date: Wed, 20 Jan 2021 15:11:15 +0100
Subject: [PATCH 298/956] pythonPackages.pytest-instafail: init at 0.4.2
 (#110138)

Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
---
 .../pytest-instafail/default.nix              | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-instafail/default.nix

diff --git a/pkgs/development/python-modules/pytest-instafail/default.nix b/pkgs/development/python-modules/pytest-instafail/default.nix
new file mode 100644
index 00000000000..f9942dd5bcd
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-instafail/default.nix
@@ -0,0 +1,24 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-instafail";
+  version = "0.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10lpr6mjcinabqynj6v85bvb1xmapnhqmg50nys1r6hg7zgky9qr";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "pytest_instafail" ];
+  meta = {
+    description = "pytest plugin that shows failures and errors instantly instead of waiting until the end of test session";
+    homepage = "https://github.com/pytest-dev/pytest-instafail";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.jacg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73251207867..8f2d5c92bf2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6033,6 +6033,8 @@ in {
 
   pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
 
+  pytest-instafail = callPackage ../development/python-modules/pytest-instafail { };
+
   pytest-isort = callPackage ../development/python-modules/pytest-isort { };
 
   pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { };

From 16348982c98384a2da15e4209439e3f3d39f7521 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 14:14:42 +0000
Subject: [PATCH 299/956] opentx: 2.3.10 -> 2.3.11

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

diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 53dbde29a0e..bb8f8d4013f 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   pname = "opentx";
-  version = "2.3.10";
+  version = "2.3.11";
 
   src = fetchFromGitHub {
     owner = "opentx";
     repo = "opentx";
     rev = "release/${version}";
-    sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq";
+    sha256 = "sha256-0B41TkTs4sNGYzpMGbsgCLT2ThkP6foeuwLUIzKKGkU=";
   };
 
   nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];

From 0915191925e18bef56a9a75253c3bb6f5c06d179 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 17 Jan 2021 09:45:00 +0100
Subject: [PATCH 300/956] gomuks: patch out hardcoded path

---
 .../instant-messengers/gomuks/default.nix     | 23 +++++++++++++++++--
 .../gomuks/hardcoded_path.patch               | 13 +++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch

diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 3d1fc19113c..08e67c59efc 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -1,4 +1,15 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, olm, makeDesktopItem }:
+{ lib
+, stdenv
+, substituteAll
+, buildGoModule
+, fetchFromGitHub
+, makeDesktopItem
+, makeWrapper
+, libnotify
+, olm
+, pulseaudio
+, sound-theme-freedesktop
+}:
 
 buildGoModule rec {
   pname = "gomuks";
@@ -15,7 +26,13 @@ buildGoModule rec {
 
   doCheck = false;
 
-  buildInputs = [ olm ];
+  buildInputs = [ makeWrapper olm ];
+
+  # Upstream issue: https://github.com/tulir/gomuks/issues/260
+  patches = lib.optional stdenv.isLinux (substituteAll {
+    src = ./hardcoded_path.patch;
+    soundTheme = sound-theme-freedesktop;
+  });
 
   postInstall = ''
     cp -r ${
@@ -30,6 +47,8 @@ buildGoModule rec {
       }
     }/* $out/
     substituteAllInPlace $out/share/applications/*
+    wrapProgram $out/bin/gomuks \
+      --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}"
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch
new file mode 100644
index 00000000000..0e0d4e28b0a
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go
+index f93a95f..da6a61d 100644
+--- a/lib/notification/notify_linux.go
++++ b/lib/notification/notify_linux.go
+@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error {
+ 		if critical {
+ 			soundName = "complete"
+ 		}
+-		exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
++		exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
+ 	}
+ 	return exec.Command("notify-send", args...).Run()
+ }

From 8cc494b1bbd00e1516c016549726a7c3d252add2 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 17 Jan 2021 14:02:06 +0100
Subject: [PATCH 301/956] gomuks: replace tilpner with myself as maintainer

---
 .../networking/instant-messengers/gomuks/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 08e67c59efc..a2d12124dbf 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -55,7 +55,7 @@ buildGoModule rec {
     homepage = "https://maunium.net/go/gomuks/";
     description = "A terminal based Matrix client written in Go";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ tilpner emily ];
+    maintainers = with maintainers; [ charvp emily ];
     platforms = platforms.unix;
   };
 }

From 7d0d15be5a51e2cf3e9f6348f19947519cebbd98 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 14:19:35 +0000
Subject: [PATCH 302/956] onefetch: 2.7.3 -> 2.9.1

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

diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index 7a010eb5e68..12cd9990779 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "onefetch";
-  version = "2.7.3";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0c56na9s3g7rdb4cc6ccsnfby2ihf5zrfs3lg9qxiqsfr7mcn4w9";
+    sha256 = "sha256-owa+HmzMXpLR7H1FssW4gQiVAQGJRXhcitgJj6pxJRc=";
   };
 
-  cargoSha256 = "05rrww53g3k2c8mpxvyc067qsgs7w9sxnzdlvmca1idbqa0k9060";
+  cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4=";
 
   buildInputs = with stdenv;
     lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];

From 2dbd08dcbd5fa78d6716aa1fbdfb04be175e4162 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 20 Jan 2021 15:23:55 +0100
Subject: [PATCH 303/956] release-combined.tested: Temporarily remove the
 Chromium test

Chromium seems to run fine but the VM test fails and prints errors like:
machine # There are no windows in the stack
machine # Invalid window '%1'
machine # Usage: windowfocus [window=%1]
machine # --sync    - only exit once the window has focus

This could be due to changes in Chromium's X11 code (or maybe some
changes for Ozone/X11). I'll investigate this but let's temporarily
remove the Chromium test from the tested jobset until I find a proper
solution/fix.
---
 nixos/release-combined.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ea82adf09ad..5c436592f64 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -60,7 +60,8 @@ in rec {
         (onFullSupported "nixos.tests.boot-stage1")
         (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiCdrom")
         (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiUsb")
-        (onSystems ["x86_64-linux"] "nixos.tests.chromium")
+        # TODO (@primeos): Fix the test failure since https://github.com/NixOS/nixpkgs/pull/110010:
+        #(onSystems ["x86_64-linux"] "nixos.tests.chromium")
         (onFullSupported "nixos.tests.containers-imperative")
         (onFullSupported "nixos.tests.containers-ip")
         (onSystems ["x86_64-linux"] "nixos.tests.docker")

From 4f31c7c748f7f856b0edc2e1015f7e8ffd33a351 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 20 Jan 2021 14:40:27 +0000
Subject: [PATCH 304/956] kube3d: 3.4.0 -> 4.0.0

---
 .../networking/cluster/kube3d/default.nix           | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index f38e3135ecb..cc90cf2d63c 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -1,11 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }:
 
-let
-  k3sVersion = "1.20.0-k3s2";
-in
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.4.0";
+  version = "4.0.0";
 
   excludedPackages = "tools";
 
@@ -13,7 +10,7 @@ buildGoModule rec {
     owner = "rancher";
     repo = "k3d";
     rev = "v${version}";
-    sha256 = "1fisbzv786n841pagy7zbanll7k1g5ib805j9azs2s30cfhvi08b";
+    sha256 = "sha256-sHtPW9EaTycHh9d/vp28BvzhmbLUQYsu6yMfJlJYH+k=";
   };
 
   vendorSha256 = null;
@@ -24,8 +21,8 @@ buildGoModule rec {
     "-ldflags="
     "-w"
     "-s"
-    "-X github.com/rancher/k3d/v3/version.Version=v${version}"
-    "-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}"
+    "-X github.com/rancher/k3d/v4/version.Version=v${version}"
+    "-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}"
   ];
 
   doCheck = false;

From 71d6d4b0039926c704382c7065255683b3e50319 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 14:55:33 +0000
Subject: [PATCH 305/956] pdfcpu: 0.3.7 -> 0.3.8

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

diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index 3a06c8e31f7..bcc09498121 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.3.7";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = pname;
     rev = "v${version}";
-    sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii";
+    sha256 = "sha256-Rx/LUp5s2DhEKuLUklYXjtTXjqBju+5YzK1hNfBCnIE=";
   };
 
-  vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7";
+  vendorSha256 = "sha256-/SsDDFveovJfuEdnOkxHAWccS8PJW5k9IHSxSJAgHMQ=";
 
   # No tests
   doCheck = false;

From 634d51c14a64c8cdb802d27fd5a46126bd336beb Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Wed, 20 Jan 2021 17:12:02 +0200
Subject: [PATCH 306/956] avocode: 4.10.4 -> 4.11.0

---
 pkgs/applications/graphics/avocode/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 7627d79554a..d185c30ff43 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -1,15 +1,15 @@
 { lib, stdenv, makeDesktopItem, fetchurl, unzip
 , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
-, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core
+, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa
 }:
 
 stdenv.mkDerivation rec {
   pname = "avocode";
-  version = "4.10.4";
+  version = "4.11.0";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "06xf5y2mljk3pd74ap9n90bhhidbzpg5c6wws361ygd4f3x86c46";
+    sha256 = "sha256-50aGechzlVVRQz6WOASHRjT46BKbwyhbt7/0oq2PsOg=";
   };
 
   libPath = lib.makeLibraryPath (with xorg; [
@@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
     libXtst
     libXScrnSaver
     libuuid
+    libdrm
+    mesa
   ]);
 
   desktopItem = makeDesktopItem {

From 8a7a8442c172bf419853b3d40e245fbc9bf69759 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 20 Jan 2021 16:42:40 +0100
Subject: [PATCH 307/956] nixos/tests/chromium: Fix a race condition

Only execute Ctrl+w to close the currently active window if the
new/secondary window (title: "New Tab") could be selected. This fixes a
test failure since the update to Chromium M88 (cc PR #110010).
Without this additional check the main window (title: "startup done")
could still be selected (and thus will be closed) and the script would
close both windows (i.e. terminate Chromium completely).
---
 nixos/tests/chromium.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 795b93f6f54..d4085bebac0 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -80,7 +80,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
 
     def close_win():
         def try_close(_):
-            machine.execute(
+            status, _ = machine.execute(
                 ru(
                     "${xdo "close-window" ''
                       search --onlyvisible --name "new tab"
@@ -89,13 +89,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
                     ''}"
                 )
             )
-            machine.execute(
-                ru(
-                    "${xdo "close-window" ''
-                      key Ctrl+w
-                    ''}"
+            if status == 0:
+                machine.execute(
+                    ru(
+                        "${xdo "close-window" ''
+                          key Ctrl+w
+                        ''}"
+                    )
                 )
-            )
             for _ in range(1, 20):
                 status, out = machine.execute(
                     ru(

From 26e315fd42db568342c4272bd48afa1fb3dee0c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 16:20:53 +0000
Subject: [PATCH 308/956] buildpack: 0.15.1 -> 0.16.0

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

diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index dbb45df40c2..68d0a53387a 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = pname;
     rev = "v${version}";
-    sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c";
+    sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM=";
   };
 
-  vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7";
+  vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 2467f5e4d2f3520890b7faa04a9d0d66f89a2874 Mon Sep 17 00:00:00 2001
From: Monson Shao <holymonson@gmail.com>
Date: Wed, 20 Jan 2021 18:37:56 +0800
Subject: [PATCH 309/956] darwin.apple-sdk: drop appleSdkVersion

In fact no one is using appleSdkVersion, and stdenv is decoupled with sdk.
---
 pkgs/os-specific/darwin/apple-sdk/default.nix | 7 +------
 pkgs/stdenv/darwin/default.nix                | 6 ++----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 0ba7a1d209e..8a814e9558d 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -1,15 +1,10 @@
 { stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }:
 
-let version = "10.12"; in
-
-# Ensure appleSdkVersion is up to date.
-assert stdenv.isDarwin -> stdenv.appleSdkVersion == version;
-
 let
   # sadly needs to be exported because security_tool needs it
   sdk = stdenv.mkDerivation rec {
     pname = "MacOS_SDK";
-    inherit version;
+    version = "10.12";
 
     # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by:
     #  1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index ecec2903b5f..30c38168fd1 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,7 +1,5 @@
 { lib
 , localSystem, crossSystem, config, overlays, crossOverlays ? []
-# The version of darwin.apple_sdk used for sources provided by apple.
-, appleSdkVersion ? "10.12"
 # Minimum required macOS version, used both for compatibility as well as reproducability.
 , macosVersionMin ? "10.12"
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
@@ -150,7 +148,7 @@ in rec {
         __extraImpureHostDeps = commonImpureHostDeps;
 
         extraAttrs = {
-          inherit macosVersionMin appleSdkVersion platform;
+          inherit macosVersionMin platform;
         };
         overrides  = self: super: (overrides self super) // {
           inherit ccNoLibcxx;
@@ -524,7 +522,7 @@ in rec {
     extraAttrs = {
       libc = pkgs.darwin.Libsystem;
       shellPackage = pkgs.bash;
-      inherit macosVersionMin appleSdkVersion platform bootstrapTools;
+      inherit macosVersionMin platform bootstrapTools;
     };
 
     allowedRequisites = (with pkgs; [

From a0259207da8a9120fd14feecb52cdc984bb93ff2 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Fri, 8 Jan 2021 11:39:40 +0100
Subject: [PATCH 310/956] 0ad: fix build by using gcc9Stdenv

---
 pkgs/games/0ad/default.nix      | 10 +++++-----
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index d53942766bb..860db7c6d5a 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,14 +1,14 @@
-{ wxGTK, newScope }:
-
+{ wxGTK, stdenv, newScope }:
 let
   callPackage = newScope self;
 
   self = {
-    zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };
+    zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; };
 
-    zeroad-data = callPackage ./data.nix { };
+    zeroad-data = callPackage ./data.nix { inherit stdenv; };
 
     zeroad = callPackage ./wrapper.nix { };
   };
 
-in self
+in
+self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb7da0bfd07..83f7dc31397 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27093,6 +27093,7 @@ in
 
   zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
     wxGTK = wxGTK30;
+    stdenv = gcc9Stdenv;
   });
 
   zeroad = zeroadPackages.zeroad;

From 1d260dad5ad0b473115f6b33014222d542e90c58 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Wed, 20 Jan 2021 17:38:13 +0100
Subject: [PATCH 311/956] rauc: init at 1.5

The Robust Auto Update Controller is an update program for embedded
systems. Primarily useful in NixOS for working with bundles.
---
 pkgs/tools/misc/rauc/default.nix | 50 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/misc/rauc/default.nix

diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix
new file mode 100644
index 00000000000..c5f84601a6d
--- /dev/null
+++ b/pkgs/tools/misc/rauc/default.nix
@@ -0,0 +1,50 @@
+{ autoreconfHook
+, curl
+, dbus
+, fetchFromGitHub
+, glib
+, json-glib
+, lib
+, nix-update-script
+, openssl
+, pkg-config
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rauc";
+  version = "1.5";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "10v9nllfw5y53797p00hk6645zkaa6cacsim1rh6y2jngnqfkmw0";
+  };
+
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = pname;
+    };
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
+
+  buildInputs = [ curl dbus glib json-glib openssl ];
+
+  configureFlags = [
+    "--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces"
+    "--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/systemd.d"
+    "--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"
+  ];
+
+  meta = with lib; {
+    description = "Safe and secure software updates for embedded Linux";
+    homepage = "https://rauc.io";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ emantor ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5f88bdb8e7..e2cd3cde339 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28888,6 +28888,8 @@ in
 
   rargs = callPackage ../tools/misc/rargs { };
 
+  rauc = callPackage ../tools/misc/rauc { };
+
   redprl = callPackage ../applications/science/logic/redprl { };
 
   renderizer = pkgs.callPackage ../development/tools/renderizer {};

From 6a1bee335e99de581f79fbc0c1ecd3ca306c9fba Mon Sep 17 00:00:00 2001
From: Matej Urbas <25388474+mupdt@users.noreply.github.com>
Date: Wed, 20 Jan 2021 16:42:36 +0000
Subject: [PATCH 312/956] terraform-providers.shell: provider source address
 (#110160)

---
 .../networking/cluster/terraform-providers/shell/default.nix    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
index 4833a967788..2bf76758752 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
@@ -20,6 +20,8 @@ buildGoModule rec {
   # if the versions are not provided via file paths.
   postInstall = "mv $out/bin/${pname}{,_v${version}}";
 
+  passthru.provider-source-address = "registry.terraform.io/scottwinkler/shell";
+
   meta = with lib; {
     inherit (src.meta) homepage;
     description = "Terraform provider for executing shell commands and saving output to state file";

From 2ce4aa86d976719749baa63e402af77b718bbb8d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Wed, 20 Jan 2021 17:42:39 +0100
Subject: [PATCH 313/956] 0ad: Do an extra s/pkgconfig/pkg-config to fix build

9bb3fcc missed one important rename of pkgconfig, breaking the build.
---
 pkgs/games/0ad/game.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index ae0b2180a80..1ba975aa885 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     # Workaround invalid pkg-config name for mozjs
     mkdir pkg-config
     ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc
-    PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH"
+    PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"
 
     # Update Makefiles
     pushd build/workspaces

From f139efa410e0b6739ac209083d2928ca0a5b09ba Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Wed, 20 Jan 2021 12:10:20 -0500
Subject: [PATCH 314/956] containerpilot: add meta information

---
 .../networking/cluster/containerpilot/default.nix         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/networking/cluster/containerpilot/default.nix b/pkgs/applications/networking/cluster/containerpilot/default.nix
index 4a7ba1002e8..1955f8e93d6 100644
--- a/pkgs/applications/networking/cluster/containerpilot/default.nix
+++ b/pkgs/applications/networking/cluster/containerpilot/default.nix
@@ -10,4 +10,12 @@ buildGoPackage rec {
   };
   goPackagePath = "github.com/joyent/${pname}";
   goDeps = ./deps.nix;
+
+  meta = with lib; {
+    homepage = "https://www.joyent.com/containerpilot";
+    description = "An application centric micro-orchestrator.";
+    platforms = platforms.unix;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ cpcloud ];
+  };
 }

From c1e08257d8f9f6ed48a8b34501898221963ff1c3 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Wed, 20 Jan 2021 12:10:29 -0500
Subject: [PATCH 315/956] containerpilot: add spaces as usual

---
 .../applications/networking/cluster/containerpilot/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/cluster/containerpilot/default.nix b/pkgs/applications/networking/cluster/containerpilot/default.nix
index 1955f8e93d6..a294a29ed8d 100644
--- a/pkgs/applications/networking/cluster/containerpilot/default.nix
+++ b/pkgs/applications/networking/cluster/containerpilot/default.nix
@@ -1,13 +1,16 @@
 { buildGoPackage, fetchFromGitHub }:
+
 buildGoPackage rec {
   version = "3.9.0pre";
   pname = "containerpilot";
+
   src = fetchFromGitHub {
     owner = "joyent";
     repo = pname;
     rev = "d999b632b0c96d9e27f092dc9f81a9d82dfe0106";
     sha256 = "0wsc8canr1c9wzr1lv40yixj9l10c66i6d14yrljsyagl2z02v4n";
   };
+
   goPackagePath = "github.com/joyent/${pname}";
   goDeps = ./deps.nix;
 

From a15f1cd7d100a42e964f0b43ee685466b8e88079 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 20 Jan 2021 18:13:49 +0100
Subject: [PATCH 316/956] maintainers: add lesuisse

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b2f3ec742a3..99280c800c2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5128,6 +5128,12 @@
     githubId = 42153076;
     name = "Alexey Nikashkin";
   };
+  lesuisse = {
+    email = "thomas@gerbet.me";
+    github = "LeSuisse";
+    githubId = 737767;
+    name = "Thomas Gerbet";
+  };
   lethalman = {
     email = "lucabru@src.gnome.org";
     github = "lethalman";

From 6974aa77120839c308483e62f3e226bc213d27a4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 19 Jan 2021 22:37:41 +0100
Subject: [PATCH 317/956] fig2dev: 3.2.7b -> 3.2.8

Fixes the fig2ps2tex and pic2tpic scripts.
Fixes CVE-2019-19746.
---
 .../applications/graphics/fig2dev/default.nix | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix
index c22bbbb4827..667f5afe579 100644
--- a/pkgs/applications/graphics/fig2dev/default.nix
+++ b/pkgs/applications/graphics/fig2dev/default.nix
@@ -1,26 +1,32 @@
-{ lib, stdenv, fetchurl, ghostscript, libpng } :
+{ lib, stdenv, fetchurl, ghostscript, libpng, makeWrapper
+, coreutils, bc, gnugrep, gawk, gnused } :
 
-let
-  version = "3.2.7b";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "fig2dev";
-  inherit version;
+  version = "3.2.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
-    sha256 = "1ck8gnqgg13xkxq4hrdy706i4xdgrlckx6bi6wxm1g514121pp27";
+    sha256 = "0zg29yqknfafyzmmln4k7kydfb2dapk3r8ffvlqhj3cm8fp5h4lk";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libpng ];
 
   GSEXE="${ghostscript}/bin/gs";
 
+  postInstall = ''
+    wrapProgram $out/bin/fig2ps2tex \
+        --set PATH ${lib.makeBinPath [ coreutils bc gnugrep gawk ]}
+    wrapProgram $out/bin/pic2tpic \
+        --set PATH ${lib.makeBinPath [ gnused ]}
+  '';
+
   meta = with lib; {
     description = "Tool to convert Xfig files to other formats";
     homepage = "http://mcj.sourceforge.net/";
     license = licenses.xfig;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ lesuisse ];
   };
 }
-

From de946cddcbe09b10bdbbdced9b054bd8a89d76d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 17:33:44 +0000
Subject: [PATCH 318/956] papirus-icon-theme: 20200901 -> 20210101

---
 pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index b7901346182..ed5f8e7c4c2 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "papirus-icon-theme";
-  version = "20200901";
+  version = "20210101";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
     rev = version;
-    sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c";
+    sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE=";
   };
 
   nativeBuildInputs = [

From 9e0bb258f5f71132bfcd3af2f5b7e1fd8bd7db00 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Wed, 20 Jan 2021 18:34:58 +0100
Subject: [PATCH 319/956] shattered-pixel-dungeon: 0.9.0b -> 0.9.1d

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

diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index 4435a77ae52..e9186fbf5b7 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -10,13 +10,13 @@
 
 let
   pname = "shattered-pixel-dungeon";
-  version = "0.9.0b";
+  version = "0.9.1d";
 
   src = fetchFromGitHub {
     owner = "00-Evan";
     repo = "shattered-pixel-dungeon";
     rev = "v${version}";
-    sha256 = "1cjrs1k2wkhaby8qprx2m9nhlcmnbrjlalsaj9vwgq1s7szzl2w4";
+    sha256 = "0f9vi1iffh477zi03hi07rmfbkb8i4chwvv43vs70mgjh4qx7247";
   };
 
   postPatch = ''

From 3d29f6625c59b1c82faeb80c1766de94a24de564 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:48:33 -0500
Subject: [PATCH 320/956] python3Packages.botocore: 1.19.56 -> 1.19.57

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 831a546014b..a17e6c728cf 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.19.56"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.19.57"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-AUluTCwGqreWifLDRaDizOtf4dp4WKfn3xibz5dwMiM=";
+    sha256 = "sha256-x1bWX/qYnFwOkheBdeQav3sYrRmy/i6C4ZLwheJk4Do=";
   };
 
   propagatedBuildInputs = [

From 56ca9b25847270d3aef07a1b1aace3225f5effdb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:48:39 -0500
Subject: [PATCH 321/956] python3Packages.boto3: 1.16.56 -> 1.16.57

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

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 771753fdbb9..92972470f1c 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.16.56"; # N.B: if you change this, change botocore too
+  version = "1.16.57"; # N.B: if you change this, change botocore too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-RxUe1XHDFkWPSTHNJCKZW6DJ9oGMXffXX0n8hFII5C4=";
+    sha256 = "sha256-SkmcwvU91VeojG22pVJ0iiq9g//tpwzrcdyNs5oCcxQ=";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

From 7a9a49110b7a0d63051b94efb4aecf55bc1f383d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:49:17 -0500
Subject: [PATCH 322/956] awscli: 1.18.216 -> 1.18.217

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

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 4fda82839a8..0cf02b2540e 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "awscli";
-  version = "1.18.216"; # N.B: if you change this, change botocore to a matching version too
+  version = "1.18.217"; # N.B: if you change this, change botocore to a matching version too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6kJ+PmFVHf8rGvp7X7t7e1+RVoRL/OEQHP9gqSHughY=";
+    sha256 = "sha256-bRrEFDRccklM3f6K/HAptKYrPnnCPM3Jo4vNsDt3Fuo=";
   };
 
   postPatch = ''

From c6a31be15560038e49c43876e6d0d3e13bc87406 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 14:51:58 +0000
Subject: [PATCH 323/956] =?UTF-8?q?oh-my-zsh:=202021-01-16=20=E2=86=92=202?=
 =?UTF-8?q?021-01-20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 683c58d8406..d481ae99b89 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2021-01-16";
+  version = "2021-01-20";
   pname = "oh-my-zsh";
-  rev = "efcbd9f3480a28ec69c607c46adcbfd8d230ac9f";
+  rev = "cd4918c2cdb6613cf77ea8f6f29e1930bd7f4bf5";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "1zngxqkhm49m2qczvyp5mws7d4bwxbb3fq20xqbbdpgk35smwnxc";
+    sha256 = "1b8zipghawa2rl3l6vylmhbwcwz9yq52xmbfpkz0bxhifisq74kn";
   };
 
   installPhase = ''

From 1118a48175685fbf434d7fe79bd0236be638ede4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:58:22 -0500
Subject: [PATCH 324/956] linux: 4.19.168 -> 4.19.169

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 8ed7ed65b15..bf072e47864 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.19.168";
+  version = "4.19.169";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1whkqklqj8rz9lv88aldvwkwnb9xvg0njdbcrk56r7z6f9zkhnmm";
+    sha256 = "156y4ly7qyy5z7sbp2vccrs7za72k3zi2hfjpskqqd6civdlvln7";
   };
 } // (args.argsOverride or {}))

From 463f322988c66077e6d267bb7d3fa29de41cc48c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:58:30 -0500
Subject: [PATCH 325/956] linux: 5.10.8 -> 5.10.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 5c4afea3a8e..ca6f1eeaf49 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.10.8";
+  version = "5.10.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w";
+    sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz";
   };
 } // (args.argsOverride or {}))

From 3141316d4d5f63f1e9a7c3dc4e5e990dffb90b85 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:58:38 -0500
Subject: [PATCH 326/956] linux: 5.4.90 -> 5.4.91

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index e17a56a9357..28a481b2f8a 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.4.90";
+  version = "5.4.91";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "06pscvxjkpz35y6kbmyzdvn9mm4p7pfg0d49chi1q61z0sy3crv4";
+    sha256 = "05swzh4gb0mk6wzza0k6b0283cygkvj8a2d2b2gab6sb0fxn208f";
   };
 } // (args.argsOverride or {}))

From c74614795b565052c260617fd9d7d80ea1cae1de Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:58:48 -0500
Subject: [PATCH 327/956] linux-rt_5_10: 5.10.4-rt22 -> 5.10.8-rt24

---
 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index ed19559f95f..d733f0bdfa4 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.10.4-rt22"; # updated by ./update-rt.sh
+  version = "5.10.8-rt24"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh";
+    sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "1wnp7w3k1z10ipg8vzgyh22lpfya1p3ckabjadk9hadpa1ialma0";
+      sha256 = "06fqwx9flcxzbjr9gb0d7v4hidypzz69r6p2mfzhqh7ii0p89f30";
     };
   }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
 

From 66c91514435a09fd6d22f85f591431021450d1a2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:59:13 -0500
Subject: [PATCH 328/956] linux/hardened/patches/4.19: 4.19.168.a -> 4.19.169.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 629d2c9a086..562a5066d86 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -7,9 +7,9 @@
     },
     "4.19": {
         "extra": ".a",
-        "name": "linux-hardened-4.19.168.a.patch",
-        "sha256": "09s9l5qf44ly41fjs745gh00vf0lkkzymcks44zyzmsznjsxm2xx",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.168.a/linux-hardened-4.19.168.a.patch"
+        "name": "linux-hardened-4.19.169.a.patch",
+        "sha256": "0l3n1yjsa777pdxh4ib7phpfrw7c8vr1xwzgs8khnffllj9f16iq",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.169.a/linux-hardened-4.19.169.a.patch"
     },
     "5.10": {
         "extra": ".a",

From 3df0e82d66d303a14ae4987316dd73369d3b98ac Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:59:15 -0500
Subject: [PATCH 329/956] linux/hardened/patches/5.10: 5.10.8.a -> 5.10.9.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 562a5066d86..7eac78d43a5 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -13,9 +13,9 @@
     },
     "5.10": {
         "extra": ".a",
-        "name": "linux-hardened-5.10.8.a.patch",
-        "sha256": "1nqn50c6g7j7ljdq7y50y6kgmilc5mb266lg6z6kz0cqpn2qaxxx",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.8.a/linux-hardened-5.10.8.a.patch"
+        "name": "linux-hardened-5.10.9.a.patch",
+        "sha256": "0mkwyknafdbc2hqv4j7jjc6wsrrx6a76d69hxh7x90gi0s3f5rfw",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.9.a/linux-hardened-5.10.9.a.patch"
     },
     "5.4": {
         "extra": ".a",

From 50a5d4c77307e7da226294f924098d98d5c38990 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 20 Jan 2021 09:59:17 -0500
Subject: [PATCH 330/956] linux/hardened/patches/5.4: 5.4.90.a -> 5.4.91.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 7eac78d43a5..c75117769d1 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -19,9 +19,9 @@
     },
     "5.4": {
         "extra": ".a",
-        "name": "linux-hardened-5.4.90.a.patch",
-        "sha256": "1x0fkcgsw7q99xa2f97i2cyybwj4kjf6vypbm2bwgl76ghpchydq",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.90.a/linux-hardened-5.4.90.a.patch"
+        "name": "linux-hardened-5.4.91.a.patch",
+        "sha256": "0kqn9g6wh4rp9riwkjmzapmnwk0fd5z18z26j2rqfgq7x4r8d7rm",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.91.a/linux-hardened-5.4.91.a.patch"
     },
     "5.9": {
         "extra": "",

From 5858d8465821eae15c72c148b5734a3af8687b56 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 20 Jan 2021 09:38:09 +0100
Subject: [PATCH 331/956] cifs-utils: missing python3 dependency for smbinfo

Since cifs-utils 6.12, smbinfo needs Python to be usable.

Issue introduced in 033208fd46e03178655f3c4a59add1d9dbf57731.
---
 nixos/tests/cifs-utils.nix                    | 12 ++++++++++++
 pkgs/os-specific/linux/cifs-utils/default.nix |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 nixos/tests/cifs-utils.nix

diff --git a/nixos/tests/cifs-utils.nix b/nixos/tests/cifs-utils.nix
new file mode 100644
index 00000000000..98587b10d94
--- /dev/null
+++ b/nixos/tests/cifs-utils.nix
@@ -0,0 +1,12 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+  name = "cifs-utils";
+
+  machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.cifs-utils ]; };
+
+  testScript = ''
+    machine.succeed("smbinfo -h")
+    machine.succeed("smb2-quota -h")
+    assert "${pkgs.cifs-utils.version}" in machine.succeed("cifs.upcall -v")
+    assert "${pkgs.cifs-utils.version}" in machine.succeed("mount.cifs -V")
+  '';
+})
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index dcffe770dee..c4ed4d4fc0f 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
-, kerberos, keyutils, pam, talloc }:
+, kerberos, keyutils, pam, talloc, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "cifs-utils";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
 
-  buildInputs = [ kerberos keyutils pam talloc ];
+  buildInputs = [ kerberos keyutils pam talloc python3 ];
 
   configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # AC_FUNC_MALLOC is broken on cross builds.

From 7742f1c67b5f099d1f099d3f6bb0a05c4bad913c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 20 Jan 2021 19:02:30 +0100
Subject: [PATCH 332/956] kak-prelude: add missing `lib` argument

---
 pkgs/applications/editors/kakoune/plugins/kak-prelude.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
index 5a7b1fa679a..e6f06f4b8e6 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation {
   name = "kak-prelude";
   version = "2020-06-09";

From a128336cf6d0e1fac07d81d60f91a003abbd0494 Mon Sep 17 00:00:00 2001
From: Steven Pease <peasteven@gmail.com>
Date: Wed, 20 Jan 2021 10:08:03 -0800
Subject: [PATCH 333/956] Use buildPlatform instead of targetPlatform for unxip
 instructions

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

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index a96d7256968..2ce607896b5 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -1,10 +1,10 @@
-{ requireFile, targetPlatform, lib }:
+{ buildPlatform, requireFile, targetPlatform, lib }:
 
 let requireXcode = version: sha256:
   let
     xip = "Xcode_" + version +  ".xip";
     # TODO(alexfmpe): Find out how to validate the .xip signature in Linux
-    unxip = if targetPlatform.isDarwin
+    unxip = if buildPlatform.isDarwin
             then ''
               open -W ${xip}
               rm -rf ${xip}

From b766673c6facbc4f8a26b0af41b1906f8d53370d Mon Sep 17 00:00:00 2001
From: Steven Pease <peasteven@gmail.com>
Date: Wed, 20 Jan 2021 10:14:46 -0800
Subject: [PATCH 334/956] Move disabling of gccForLibs for iOS to build-support
 cc-wrapper

---
 pkgs/build-support/cc-wrapper/default.nix | 1 +
 pkgs/top-level/all-packages.nix           | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 0855c27eff4..d1d5f8e6c86 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -65,6 +65,7 @@ let
     && libcxx == null
     && !(stdenv.targetPlatform.useLLVM or false)
     && !(stdenv.targetPlatform.useAndroidPrebuilt or false)
+    && !(stdenv.targetPlatform.isiOS or false)
     && gccForLibs != null;
 
   # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98cbea8f7f6..644e5b46d22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11870,7 +11870,6 @@ in
     # Can only do this is in the native case, otherwise we might get infinite
     # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`.
       then targetPackages.stdenv.cc.cc
-    else if targetPlatform.isiOS then null
     else gcc.cc;
 
   libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };

From ff8866e2435f34bb1a6589a299a5d7abc24af931 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 18 Jan 2021 15:16:27 +0100
Subject: [PATCH 335/956] nixos/tests/chromium: Add ungoogled-chromium and
 Google Chrome

By default only `chromium` will be tested but other "channels" can be
selected using e.g.:
nix-build nixos/tests/chromium.nix -A ungoogled

This also adds me as secondary maintainer (I'd like to get notified on
PRs/issues and can review them).
---
 nixos/tests/chromium.nix | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index d4085bebac0..4d6b726d9e4 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -1,10 +1,14 @@
 { system ? builtins.currentSystem
 , config ? {}
 , pkgs ? import ../.. { inherit system config; }
-, channelMap ? {
-    stable = pkgs.chromium;
-    beta   = pkgs.chromiumBeta;
-    dev    = pkgs.chromiumDev;
+, channelMap ? { # Maps "channels" to packages
+    stable        = pkgs.chromium;
+    beta          = pkgs.chromiumBeta;
+    dev           = pkgs.chromiumDev;
+    ungoogled     = pkgs.ungoogled-chromium;
+    chrome-stable = pkgs.google-chrome;
+    chrome-beta   = pkgs.google-chrome-beta;
+    chrome-dev    = pkgs.google-chrome-dev;
   }
 }:
 
@@ -14,7 +18,7 @@ with pkgs.lib;
 mapAttrs (channel: chromiumPkg: makeTest rec {
   name = "chromium-${channel}";
   meta = {
-    maintainers = with maintainers; [ aszlig ];
+    maintainers = with maintainers; [ aszlig primeos ];
     # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621
     inherit (chromiumPkg.meta) timeout;
   };
@@ -58,6 +62,19 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
         return "su - ${user} -c " + shlex.quote(cmd)
 
 
+    def get_browser_binary():
+        """Returns the name of the browser binary."""
+        pname = "${getName chromiumPkg.name}"
+        if pname.find("chromium") != -1:
+            return "chromium"  # Same name for all channels and ungoogled-chromium
+        if pname == "google-chrome":
+            return "google-chrome-stable"
+        if pname == "google-chrome-dev":
+            return "google-chrome-unstable"
+        # For google-chrome-beta and as fallback:
+        return pname
+
+
     def create_new_win():
         with machine.nested("Creating a new Chromium window"):
             machine.execute(
@@ -153,7 +170,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
     machine.wait_for_x()
 
     url = "file://${startupHTML}"
-    machine.succeed(ru(f'ulimit -c unlimited; chromium "{url}" & disown'))
+    machine.succeed(ru(f'ulimit -c unlimited; "{get_browser_binary()}" "{url}" & disown'))
+
+    if get_browser_binary().startswith("google-chrome"):
+        # Need to click away the first window:
+        machine.wait_for_text("Make Google Chrome the default browser")
+        machine.screenshot("google_chrome_default_browser_prompt")
+        machine.send_key("ret")
+
     machine.wait_for_text("startup done")
     machine.wait_until_succeeds(
         ru(

From 70206c3be4265ec7b1651c4e61b6145560a0464d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 18 Jan 2021 15:24:15 +0100
Subject: [PATCH 336/956] chromium/doc: Explain how to run the VM tests

---
 .../networking/browsers/chromium/README.md        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md
index 5b7c9fe5504..9d23e3143c6 100644
--- a/pkgs/applications/networking/browsers/chromium/README.md
+++ b/pkgs/applications/networking/browsers/chromium/README.md
@@ -36,6 +36,21 @@ update `upstream-info.json`. After updates it is important to test at least
 `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
 reuses `upstream-info.json`).
 
+To run all automated NixOS VM tests for Chromium, ungoogled-chromium,
+and Google Chrome (not recommended, currently 6x tests!):
+```
+nix-build nixos/tests/chromium.nix
+```
+
+A single test can be selected, e.g. to test `ungoogled-chromium` (see
+`channelMap` in `nixos/tests/chromium.nix` for all available options):
+```
+nix-build nixos/tests/chromium.nix -A ungoogled
+```
+(Note: Testing Google Chrome requires `export NIXPKGS_ALLOW_UNFREE=1`.)
+
+For custom builds it's possible to "override" `channelMap`.
+
 ## Backports
 
 All updates are considered security critical and should be ported to the stable

From f45f22d51901eb85a6bd4628681bcbf2732655af Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Wed, 20 Jan 2021 19:51:32 +0100
Subject: [PATCH 337/956] nixos/evolution: enable gnome-keyring

---
 nixos/modules/services/desktops/gnome3/evolution-data-server.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index 12f13f72979..749f12b86bc 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -53,6 +53,7 @@ with lib;
           enable = true;
           plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins;
         };
+        services.gnome3.gnome-keyring.enable = true;
       })
     ];
 }

From 52a7a2df1545834cccacca114c0ac7ad4e8da244 Mon Sep 17 00:00:00 2001
From: Milan Svoboda <milan.svoboda@centrum.cz>
Date: Mon, 18 Jan 2021 22:21:05 +0100
Subject: [PATCH 338/956] unciv: init at 3.12.8

---
 pkgs/games/unciv/default.nix    | 59 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/unciv/default.nix

diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
new file mode 100644
index 00000000000..917cf328e7e
--- /dev/null
+++ b/pkgs/games/unciv/default.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, lib
+, fetchurl
+, copyDesktopItems
+, makeDesktopItem
+, makeWrapper
+, jre
+, libpulseaudio
+, libXxf86vm
+}:
+let
+  desktopItem = makeDesktopItem {
+    name = "unciv";
+    exec = "unciv";
+    comment = "An open-source Android/Desktop remake of Civ V";
+    desktopName = "Unciv";
+    categories = "Game;";
+  };
+
+  envLibPath = lib.makeLibraryPath [
+    libpulseaudio
+    libXxf86vm
+  ];
+
+in
+stdenv.mkDerivation rec {
+  pname = "unciv";
+  version = "3.12.8";
+
+  src = fetchurl {
+    url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
+    sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ copyDesktopItems makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    makeWrapper ${jre}/bin/java $out/bin/unciv \
+      --prefix LD_LIBRARY_PATH : ${envLibPath} \
+      --prefix PATH : ${lib.makeBinPath [ jre ]} \
+      --add-flags "-jar ${src}"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [ desktopItem ];
+
+  meta = with lib; {
+    description = "An open-source Android/Desktop remake of Civ V";
+    homepage = "https://github.com/yairm210/Unciv";
+    maintainers = with maintainers; [ tex ];
+    license = licenses.mpl20;
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 355df6b465f..70cd8e13633 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27077,6 +27077,8 @@ in
     ffmpeg = ffmpeg_2;
   };
 
+  unciv = callPackage ../games/unciv { };
+
   unnethack = callPackage ../games/unnethack { };
 
   uqm = callPackage ../games/uqm { };

From bc4521411e0f56dd724b31118135c182be56a438 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 20 Jan 2021 20:12:13 +0100
Subject: [PATCH 339/956] signal-desktop: 1.39.5 -> 1.39.6

---
 .../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 88cd3dc54c5..19e48bf88d6 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -25,7 +25,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.39.5"; # Please backport all updates to the stable channel.
+  version = "1.39.6"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1x29ri4jxd1q2wbv5gf26x986x9sms4rxnhj7d5rhm6pz2ihzb2a";
+    sha256 = "04fd81vc0dxk0b47crm5zacf4x79pdn483xicygnc1z6v7mnrmgk";
   };
 
   nativeBuildInputs = [

From 92815bb5b718255712c1dabe387f01c1e60fcbd4 Mon Sep 17 00:00:00 2001
From: llathasa-veleth <llathasa@outlook.com>
Date: Wed, 20 Jan 2021 22:26:15 +0300
Subject: [PATCH 340/956] disfetch: 1.13 -> 1.14

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

diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix
index 30d4d79488e..afce1429e69 100644
--- a/pkgs/tools/misc/disfetch/default.nix
+++ b/pkgs/tools/misc/disfetch/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "disfetch";
-  version = "1.13";
+  version = "1.14";
 
   src = fetchFromGitHub {
     owner = "llathasa-veleth";
     repo = "disfetch";
     rev = version;
-    sha256 = "14vccp1z0g2hr9alx2ydz29hfa4xfv9irdjsvqm94fbyi5fa87k0";
+    sha256 = "0p5pj8d761gz95ar35s8q6lrybrg9jik33kwnsxvb14n990kya0p";
   };
 
   dontBuild = true;

From cba38a2f4269e933ddccebca490d5f42f78e00ae Mon Sep 17 00:00:00 2001
From: Peter Woodman <peter@shortbus.org>
Date: Wed, 20 Jan 2021 14:27:30 -0500
Subject: [PATCH 341/956] sysklogd: add explainer for musl patch

---
 pkgs/os-specific/linux/sysklogd/default.nix                     | 2 +-
 .../{fix-includes.patch => fix-includes-for-musl.patch}         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename pkgs/os-specific/linux/sysklogd/{fix-includes.patch => fix-includes-for-musl.patch} (96%)

diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix
index 2ee7daca0eb..af180b5e524 100644
--- a/pkgs/os-specific/linux/sysklogd/default.nix
+++ b/pkgs/os-specific/linux/sysklogd/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji";
   };
 
-  patches = [ ./systemd.patch ./union-wait.patch ./fix-includes.patch ];
+  patches = [ ./systemd.patch ./union-wait.patch ./fix-includes-for-musl.patch ];
 
   NIX_CFLAGS_COMPILE = "-DSYSV";
 
diff --git a/pkgs/os-specific/linux/sysklogd/fix-includes.patch b/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch
similarity index 96%
rename from pkgs/os-specific/linux/sysklogd/fix-includes.patch
rename to pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch
index e7dbe431275..87e56a10db8 100644
--- a/pkgs/os-specific/linux/sysklogd/fix-includes.patch
+++ b/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch
@@ -1,3 +1,5 @@
+# this patch both fixes some include paths as well as removes glibc
+# gates around defines that musl-libc also depends on.
 diff -u sysklogd-1.5.1.orig/klogd.c sysklogd-1.5.1/klogd.c
 --- sysklogd-1.5.1.orig/klogd.c	2014-10-04 15:47:18.000000000 -0400
 +++ sysklogd-1.5.1/klogd.c	2021-01-18 23:09:23.000000000 -0500

From 754bba41d181ad0933c25e6e956c1b9bfda4b73b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 19:32:25 +0000
Subject: [PATCH 342/956] oxipng: 4.0.2 -> 4.0.3

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

diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix
index 98ece65eb16..6f91ee26007 100644
--- a/pkgs/tools/graphics/oxipng/default.nix
+++ b/pkgs/tools/graphics/oxipng/default.nix
@@ -1,15 +1,15 @@
 { lib, stdenv, fetchCrate, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  version = "4.0.2";
+  version = "4.0.3";
   pname = "oxipng";
 
   src = fetchCrate {
     inherit version pname;
-    sha256 = "0m36af9w1l6pc71fjbgyzcsszizwayvcv5d750zz2bnj23c77m69";
+    sha256 = "sha256-lvVgoAZMIqmbS6yMul9Hf9PtneEVy+jDs3kU1jSBL2w=";
   };
 
-  cargoSha256 = "16fby8ncdq0dyg9r0glrqwi04sja34br306c5sj22cq1dm3bb64q";
+  cargoSha256 = "sha256-v0A8/b/OPAtnaNlMX7QNXTGGH6kg67WBo/2ChOPDZdQ=";
 
   doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
 

From b54b344c616e3eff887f9f00eee39bfab31f2ee6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Jan 2021 20:40:33 +0100
Subject: [PATCH 343/956] sigurlx: init at 2.1.0

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

diff --git a/pkgs/tools/security/sigurlx/default.nix b/pkgs/tools/security/sigurlx/default.nix
new file mode 100644
index 00000000000..b6908c27422
--- /dev/null
+++ b/pkgs/tools/security/sigurlx/default.nix
@@ -0,0 +1,25 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "sigurlx";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "drsigned";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1q5vy05387qx7h4xcccvn2z2ks1kiff3mfbd2w3w0l0a4qgz74xs";
+  };
+
+  vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238";
+
+  meta = with lib; {
+    description = "Tool to map the attack surface of web applications";
+    homepage = "https://github.com/drsigned/sigurlx";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 393bb16da56..f073ea9a24f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18211,6 +18211,8 @@ in
 
   sickrage = callPackage ../servers/sickbeard/sickrage.nix { };
 
+  sigurlx = callPackage ../tools/security/sigurlx { };
+
   sipwitch = callPackage ../servers/sip/sipwitch { };
 
   slimserver = callPackage ../servers/slimserver { };

From 0125a4c171ce9037522789a743e085f136615869 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 20 Jan 2021 14:45:54 -0500
Subject: [PATCH 344/956] sql_exporter: 0.3.0 -> 0.4.0

---
 pkgs/servers/monitoring/prometheus/sql-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
index d6c69a6089b..2784dae63af 100644
--- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "sql_exporter";
-  version = "0.3.0";
+  version = "0.4.0";
 
   vendorSha256 = null;
 
   src = fetchFromGitHub {
     owner = "justwatchcom";
-    repo = "sql_exporter";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc";
+    sha256 = "0dxzcd3b430xby741fdc85k4d2380jrh34xxskmdzxbf2kqdc5k8";
   };
 
   meta = with lib; {

From 4978a1c7d6ec1e941e3739458faa9bdf2f75b384 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 19:59:49 +0000
Subject: [PATCH 345/956] php73Packages.psalm: 4.3.1 -> 4.4.1

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

diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
index 473b035d23a..1de01d1d09d 100644
--- a/pkgs/development/php-packages/psalm/default.nix
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "psalm";
-  version = "4.3.1";
+  version = "4.4.1";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
-    sha256 = "1hv9r5m1mdywm7qi9rs9054jp77cpip3jyw048iq3l7s0vpslkc5";
+    sha256 = "sha256-4hqgAPflzNmeQQaxQATpWYBB5Pz7jKu8Vlw3BiMyhtw=";
   };
 
   phases = [ "installPhase" ];

From 4c31da767fdff1c0ab237f7c8d12ef8edbbef92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Jan 2021 18:47:39 +0100
Subject: [PATCH 346/956] perlPackages.Safe-Hole: Mark broken on darwin

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a9c0c79ba8b..8a5b9bd6ae5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -19038,6 +19038,7 @@ let
       description = "lib/Safe/Hole.pm";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
       homepage = "https://github.com/toddr/Safe-Hole";
+      broken = stdenv.isDarwin;
     };
   };
 

From 601917ea95b4413f7c2e7f9f8f2114850d982de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Jan 2021 20:26:37 +0100
Subject: [PATCH 347/956] pythonPackages.azure-synapse-artifacts: Fix meta

---
 .../python-modules/azure-synapse-artifacts/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index f33df1fdbe8..5a414388c4c 100644
--- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "azure.synapse.artifacts" ];
 
   meta = with lib; {
-    description = "CHANGE";
-    homepage = "https://github.com/CHANGE/azure-synapse-artifacts/";
+    description = "Microsoft Azure Synapse Artifacts Client Library for Python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
     maintainers = with maintainers; [ jonringer ];
   };

From 72e80a623eace7daf48f95f7460a95fffea6e24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Jan 2021 23:13:36 +0100
Subject: [PATCH 348/956] pythonPackages.mxnet: Remove old substituteInPlace

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

diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index 65eb2d44ffc..d32905e7e61 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -20,9 +20,7 @@ buildPythonPackage {
 
   postPatch = ''
     substituteInPlace python/setup.py \
-      --replace "graphviz<0.9.0," "graphviz" \
-      --replace "numpy<=1.15.2," "numpy" \
-      --replace "requests<2.19.0," "requests"
+      --replace "graphviz<0.9.0," "graphviz"
   '';
 
   preConfigure = ''

From 69d3c5d89b8e44c7977e3102bf11162b0c0c35b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Jan 2021 23:41:39 +0100
Subject: [PATCH 349/956] pythonPackages.spyder: Remove old substituteInPlace

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

diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index de1b8123dd9..26013e71158 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -44,8 +44,7 @@ buildPythonPackage rec {
     sed -i /pyqtwebengine/d setup.py
     substituteInPlace setup.py \
       --replace "pyqt5<5.13" "pyqt5" \
-      --replace "parso==0.7.0" "parso" \
-      --replace "jedi==0.17.1" "jedi"
+      --replace "parso==0.7.0" "parso"
   '';
 
   postInstall = ''

From 6ed5025067ef681d95192aaeffb6cf99ec640e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 20 Jan 2021 11:24:45 +0100
Subject: [PATCH 350/956] pythonPackages.bellows: Execute tests again

---
 .../python-modules/bellows/default.nix        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index 614a1ad98a9..6ee8b6499b5 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -1,26 +1,27 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
 , click, click-log, pure-pcapy3
-, pyserial, pyserial-asyncio, voluptuous, zigpy
-, asynctest, pytest, pytest-asyncio }:
+, pyserial-asyncio, voluptuous, zigpy
+, asynctest, pytestCheckHook, pytest-asyncio }:
 
-let
+buildPythonPackage rec {
   pname = "bellows";
   version = "0.21.0";
 
-in buildPythonPackage rec {
-  inherit pname version;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f";
+  src = fetchFromGitHub {
+    owner = "zigpy";
+    repo = "bellows";
+    rev = version;
+    sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a";
   };
 
   propagatedBuildInputs = [
-    click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy
+    click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy
   ];
 
   checkInputs = [
-    asynctest pytest pytest-asyncio
+    asynctest
+    pytestCheckHook
+    pytest-asyncio
   ];
 
   prePatch = ''

From 9c6ca673a76e2c97ed7425cd9807c13bd1bc4945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 20 Jan 2021 11:54:00 +0100
Subject: [PATCH 351/956] python37Packages.google-music: Remove stale postPatch

---
 pkgs/development/python-modules/google-music/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix
index e5b42c5310f..90978ad2cba 100644
--- a/pkgs/development/python-modules/google-music/default.nix
+++ b/pkgs/development/python-modules/google-music/default.nix
@@ -19,11 +19,6 @@ buildPythonPackage rec {
     sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "audio-metadata>=0.8,<0.9" "audio-metadata"
-  '';
-
   propagatedBuildInputs = [
     appdirs
     audio-metadata

From f1478a78ff3c1c2ce6abb6cf603206cb8d4e08c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 20 Jan 2021 11:54:42 +0100
Subject: [PATCH 352/956] python38Packages.bidict: Remove stale patch, use
 pytestCheckHook

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

diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
index 34b9f4cf5ff..dcb684a55e0 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -3,7 +3,7 @@
 , sphinx
 , hypothesis
 , py
-, pytest
+, pytestCheckHook
 , pytest-benchmark
 , sortedcollections
 , sortedcontainers
@@ -23,23 +23,14 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ sphinx ];
 
-  # this can be removed >0.19.0
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "setuptools_scm < 4" "setuptools_scm"
-  '';
-
   checkInputs = [
     hypothesis
     py
-    pytest
+    pytestCheckHook
     pytest-benchmark
     sortedcollections
     sortedcontainers
   ];
-  checkPhase = ''
-    pytest tests
-  '';
 
   meta = with lib; {
     homepage = "https://github.com/jab/bidict";

From 56ef9942f160df217249d1a5951d7b80c93d50ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 20 Jan 2021 20:30:40 +0100
Subject: [PATCH 353/956] knot-dns: 3.0.3 -> 3.0.4

https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.4
---
 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 07e8e7d5210..2a9e00b266b 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "fbc51897ef0ed0639ebad59b988a91382b9544288a2db8254f0b1de433140e38";
+    sha256 = "451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 88fd1ecdc6eaff947162bd9523a083d96efe7120 Mon Sep 17 00:00:00 2001
From: Diego Rodriguez <diego@noteable.io>
Date: Wed, 20 Jan 2021 13:37:07 -0700
Subject: [PATCH 354/956] terraform_0_14: 0.14.4 -> 0.14.5

---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a190994e746..9e01674eab2 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -157,9 +157,9 @@ in rec {
   });
 
   terraform_0_14 = pluggable (generic {
-    version = "0.14.4";
-    sha256 = "0kjbx1gshp1lvhnjfigfzza0sbl3m6d9qb3in7q5vc6kdkiplb66";
-    vendorSha256 = "10vb6gsw7mha99lvx3lbgd80vf0imcqyc0va0y64f6wzaw557n7v";
+    version = "0.14.5";
+    sha256 = "0drf049zghpm3ajrn006w621s7bw5r1s8gl77nd1cj2zcw2nzn1r";
+    vendorSha256 = "0z9mkilazrkpbccnkws4hcc49djdwzn0cdbgqkm9bnp9fyg3rfvs";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From 427bbe059ac8a8ab787532e3e1bcd8f427fe8d68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 20:42:01 +0000
Subject: [PATCH 355/956] picard-tools: 2.23.9 -> 2.24.0

---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index d18ca2e2a4f..054fb66dccb 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "picard-tools";
-  version = "2.23.9";
+  version = "2.24.0";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "1ygdl590sbcsxpk0qwr0bx163nx51h0545n1xxkbc3pk2r6n51lk";
+    sha256 = "sha256-cOkQObzMb222DxjEFxMhiozfRfWR8CwQEsBiFSsnzXs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d8c6dbf7b66ca54ec99ddf080d2cd7387d46051c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 20:55:45 +0000
Subject: [PATCH 356/956] plantuml: 1.2020.26 -> 1.2021.0

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

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 0bc6e73fe4f..0355c65ac6c 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2020.26";
+  version = "1.2021.0";
   pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "1k8gad75qvqljg61db76z7blnniwk9l56xy0fkrqhh48p1gxakah";
+    sha256 = "sha256-QERrsTB8GO+B8DZkl1Ruru9Bw+uL9ojQbJ321sbqIws=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a26cb6b37d87c6eecff0db66040c84309d9a0c9f Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Wed, 20 Jan 2021 21:56:10 +0100
Subject: [PATCH 357/956] nheko: build qml

fixes cache issues on update:
https://github.com/Nheko-Reborn/nheko/issues/389
---
 .../networking/instant-messengers/nheko/default.nix           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index a26d3c41b22..9ed8319b761 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -57,6 +57,10 @@ mkDerivation rec {
     qtgraphicaleffects
   ] ++ lib.optional stdenv.isDarwin qtmacextras;
 
+  cmakeFlags = [
+    "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
+  ];
+
   meta = with lib; {
     description = "Desktop client for the Matrix protocol";
     homepage = "https://github.com/Nheko-Reborn/nheko";

From 3bcd19086c8dd2bbdf997af1fdd6cf6cc676d18e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:40:08 +1000
Subject: [PATCH 358/956] go_1_14: 1.14.13 -> 1.14.14

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

diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix
index 6dc347d9012..4c5a276ec84 100644
--- a/pkgs/development/compilers/go/1.14.nix
+++ b/pkgs/development/compilers/go/1.14.nix
@@ -36,11 +36,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.14.13";
+  version = "1.14.14";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "0xxins5crcgghgvnzplmp0qyv2gbmh36v1fpl15d03jwdd6287ds";
+    sha256 = "0vx7r0bb1a500znnnh7v3wgw22ly3p2x06vzyi9hiblgylrby132";
   };
 
   # perl is used for testing go vet

From 5313326b7ff260e86416f86cd12b66b6ba5d4012 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:40:08 +1000
Subject: [PATCH 359/956] go_1_15: 1.15.6 -> 1.15.7

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

diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index d5415b208a8..65e75ba6907 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -36,11 +36,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.15.6";
+  version = "1.15.7";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "05sqcx4fm1nxfm46j6xriq0fnnah4bm8bqw027xrzcg2qmrvl2w9";
+    sha256 = "1g1a39y1cnvw3y0bjwjms55cz0s9icm8myrgxi295jwfznmb6cc6";
   };
 
   # perl is used for testing go vet

From b46b3d928d781a394d0069b8443ca42c9b75e06a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 19 Jan 2021 09:16:13 +1000
Subject: [PATCH 360/956] nixos/podman: readd rootless runc test

use `loginctl enable-linger` to create systemd session
---
 nixos/tests/podman.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix
index bccd2de7c9b..4985ff60365 100644
--- a/nixos/tests/podman.nix
+++ b/nixos/tests/podman.nix
@@ -61,6 +61,20 @@ import ./make-test-python.nix (
           podman.succeed("podman stop sleeping")
           podman.succeed("podman rm sleeping")
 
+      # create systemd session for rootless
+      podman.succeed("loginctl enable-linger alice")
+
+      with subtest("Run container rootless with runc"):
+          podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
+          podman.succeed(
+              su_cmd(
+                  "podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+              )
+          )
+          podman.succeed(su_cmd("podman ps | grep sleeping"))
+          podman.succeed(su_cmd("podman stop sleeping"))
+          podman.succeed(su_cmd("podman rm sleeping"))
+
       with subtest("Run container rootless with crun"):
           podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
           podman.succeed(
@@ -71,7 +85,6 @@ import ./make-test-python.nix (
           podman.succeed(su_cmd("podman ps | grep sleeping"))
           podman.succeed(su_cmd("podman stop sleeping"))
           podman.succeed(su_cmd("podman rm sleeping"))
-      # As of 2020-11-20, the runc backend doesn't work with cgroupsv2 yet, so we don't run that test.
 
       with subtest("Run container rootless with the default backend"):
           podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))

From 083d8f8bd68dc1bb253c743300d3c3546f5ce942 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 19 Jan 2021 10:48:00 +0000
Subject: [PATCH 361/956] nerdctl: 0.4.0 -> 0.5.0

---
 pkgs/applications/networking/cluster/nerdctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix
index ed00fb231a6..28f7b540722 100644
--- a/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -14,16 +14,16 @@ let
 in
 buildGoModule rec {
   pname = "nerdctl";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "AkihiroSuda";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0vjcbvd5yrasw97hd5mrn6cdjvfv2r03z7g1wczlszlcs8gr6nxw";
+    sha256 = "sha256-lSvYiTh67gK9kJls7VsayV8T3H6RzFEEKe49BOWnUBw=";
   };
 
-  vendorSha256 = "181lp9l4i0qpiqm8wbxa4ldi1j5bm3ygmanz1xh3mkjanl0pwqjr";
+  vendorSha256 = "sha256-qywiaNoO3pI7sfyPbwWR8BLd86RvJ2xSWwCJUsm3RkM=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From d1468d9531f10e9390d485271c83aa990fb6812b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 21:09:08 +0000
Subject: [PATCH 362/956] phoronix-test-suite: 10.0.1 -> 10.2.0

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

diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index b3e78b350c4..da69d5a8b93 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "phoronix-test-suite";
-  version = "10.0.1";
+  version = "10.2.0";
 
   src = fetchurl {
     url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
-    sha256 = "09wrrcxfvh7pwv0jqpyzjsr0rd7askfr0s2xr1wv9v40znxmsmzz";
+    sha256 = "sha256-eoKHgbSyOEkwzki5wWuZlOAmZljxOMXcztA/g8TtutQ=";
   };
 
   buildInputs = [ php ];

From 3c02d069321a3a286f1462b6402b1c0f875981ea Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Wed, 20 Jan 2021 16:28:22 -0500
Subject: [PATCH 363/956] containerpilot: add lib

---
 pkgs/applications/networking/cluster/containerpilot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/containerpilot/default.nix b/pkgs/applications/networking/cluster/containerpilot/default.nix
index a294a29ed8d..dc6e5f3402f 100644
--- a/pkgs/applications/networking/cluster/containerpilot/default.nix
+++ b/pkgs/applications/networking/cluster/containerpilot/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   version = "3.9.0pre";

From 7ab66f91a75d8b7508f57c5719c9c6bc772be59c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 20 Jan 2021 22:29:43 +0100
Subject: [PATCH 364/956] xfig: 3.2.7b1 -> 3.2.8

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

diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 3f35880b3f2..53a9632e192 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -1,17 +1,14 @@
 { lib, stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm
-, libXmu, libXi, libXp, Xaw3d, fig2dev
+, libXmu, libXi, libXp, Xaw3d, libXaw, fig2dev
 }:
 
-let
-  version = "3.2.7a";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "xfig";
-  inherit version;
+  version = "3.2.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
-    sha256 = "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa";
+    sha256 = "1czamqp0xn0j6qjnasa3fjnrzi072v6qknylr6jrs4gwsfw4ybyw";
   };
 
   postPatch = ''
@@ -30,7 +27,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d ];
+  buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d libXaw ];
 
   meta = with lib; {
     description = "An interactive drawing tool for X11";
@@ -38,6 +35,6 @@ in stdenv.mkDerivation {
       Note that you need to have the <literal>netpbm</literal> tools
       in your path to export bitmaps.
     '';
-    inherit (fig2dev.meta) license homepage platforms;
+    inherit (fig2dev.meta) license homepage platforms maintainers;
   };
 }

From 245bde3f8d6e6b691a4ada1e5c6ea3a1b2aebaa3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 14:26:06 +0000
Subject: [PATCH 365/956] pappl: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix
index 5cad364d240..4c7b60c125c 100644
--- a/pkgs/applications/printing/pappl/default.nix
+++ b/pkgs/applications/printing/pappl/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pappl";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1cg06v8hxska0hnybnmfda1v4h3ifjir24nx2iqx80kb6jq0hayb";
+    sha256 = "sha256-4evyOrPd8zb5y00L8h2t++ayW1S8WQ5P+6MXe6eju68=";
   };
 
   outputs = [ "out" "dev" ];

From dcbbbcdb057a5c0d3c094cd436603b3437866001 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 20 Jan 2021 15:30:57 -0600
Subject: [PATCH 366/956] duti: pass ApplicationServices directly

---
 pkgs/os-specific/darwin/duti/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index c56dd20243b..9daed151ce4 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchFromGitHub, autoreconfHook, darwin}:
+{stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}:
 
 stdenv.mkDerivation rec {
   pname = "duti";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [autoreconfHook];
-  buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices];
+  buildInputs = [ApplicationServices];
   configureFlags = [
     "--with-macosx-sdk=/homeless-shelter"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27c565bce0c..a974d61dc88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28908,7 +28908,9 @@ in
 
   phonetisaurus = callPackage ../development/libraries/phonetisaurus {};
 
-  duti = callPackage ../os-specific/darwin/duti {};
+  duti = callPackage ../os-specific/darwin/duti {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+  };
 
   dnstracer = callPackage ../tools/networking/dnstracer {
     inherit (darwin) libresolv;

From a610e556b140cf098e0db37e9218e477e8511c99 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 21:47:50 +0000
Subject: [PATCH 367/956] php73Packages.phpstan: 0.12.59 -> 0.12.68

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

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index 6bd3fb00c4e..c363150babc 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "phpstan";
-  version = "0.12.59";
+  version = "0.12.68";
 in
 mkDerivation {
   inherit pname version;
 
   src = pkgs.fetchurl {
     url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-    sha256 = "0lp25d9b7w8lk4ffrd17mjw93i234qnfpwz42k8lww1lrk5abnfa";
+    sha256 = "sha256-qplQi12ecZjtaM8XawiO+qSwEdTXByrxWZLf3N7gfNc=";
   };
 
   phases = [ "installPhase" ];

From 620868fbdb267c8331b284dd856060c79648bcf8 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 21 Jan 2021 07:34:34 +1000
Subject: [PATCH 368/956] gdu: 3.0.0 -> 4.2.0

https://github.com/dundee/gdu/releases/tag/v4.0.0
https://github.com/dundee/gdu/releases/tag/v4.1.0
https://github.com/dundee/gdu/releases/tag/v4.2.0
---
 pkgs/tools/system/gdu/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix
index 72ee7d5ebc6..53e69cd8cd6 100644
--- a/pkgs/tools/system/gdu/default.nix
+++ b/pkgs/tools/system/gdu/default.nix
@@ -2,23 +2,30 @@
 , stdenv
 , buildGoModule
 , fetchFromGitHub
+, installShellFiles
 }:
 
 buildGoModule rec {
   pname = "gdu";
-  version = "3.0.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "dundee";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0sfb8bxvdd8r05d0bgfcaw6dpbky7f4fgf0dbly7k7sgl29hkafy";
+    sha256 = "0ppsz7ys08lmg5s7lszqc2zcp2vjm54aai3yr3sb4jf3knbmyg5g";
   };
 
-  vendorSha256 = "0w3k23kly8g9mf8a300xz6bv7g1m2nlp5f112k4viyi9zy6vqbv0";
+  vendorSha256 = "058h71gmgi3n4b697myi5890arzw8fkzmxlm1aiwzyfh3k9iv0wh";
 
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage gdu.1
+  '';
+
   # tests fail if the version is set
   doCheck = false;
 

From 5388f5bb7a0b56bd496a8d27a4c12599e45c9ed0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 22:03:38 +0000
Subject: [PATCH 369/956] portfolio: 0.50.0 -> 0.50.2

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

diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index 1f44ce2ab51..ad52e75ac35 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "PortfolioPerformance";
-  version = "0.50.0";
+  version = "0.50.2";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1jq4if5hx3fwag1dz38sj87av2na1kv4c36hai1gyz9w5qhjv7j8";
+    sha256 = "sha256-n5tLYrqqM0KUQrlJWZtKGClKONAz3EXBAlEqIrdPBpI=";
   };
 
   nativeBuildInputs = [

From 16a6638bdea42f65a25437faa6720d533036099a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 22:14:16 +0000
Subject: [PATCH 370/956] php73Extensions.rdkafka: 4.1.1 -> 5.0.0

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

diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix
index 64a2b8028c0..e5bdc2a2298 100644
--- a/pkgs/development/php-packages/rdkafka/default.nix
+++ b/pkgs/development/php-packages/rdkafka/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "rdkafka";
 
-  version = "4.1.1";
-  sha256 = "0s6cqd71z5jpqb98myk4askmbqphzzslf0d4vqlg2rig9q6fyv7x";
+  version = "5.0.0";
+  sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs=";
 
   buildInputs = [ pkgs.rdkafka pcre' ];
 

From 8f027e6b6578dfd7e7228682acf4fa32b5104c5e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 22 Aug 2020 23:27:41 -0500
Subject: [PATCH 371/956] libwpe: init at 1.7.1

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

diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix
new file mode 100644
index 00000000000..102d658000c
--- /dev/null
+++ b/pkgs/development/libraries/libwpe/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, lib
+, fetchurl
+, meson
+, pkg-config
+, libxkbcommon
+, libGL
+, ninja
+, libX11 }:
+
+stdenv.mkDerivation rec {
+  pname = "libwpe";
+  version = "1.7.1";
+
+  src = fetchurl {
+    url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
+    sha256 = "0h6kh8wy2b370y705pl2vp6vp18dkdsgdxh0243ji2v51kxbg157";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    libxkbcommon
+    libGL
+    libX11
+  ];
+
+  meta = with lib; {
+    description = "General-purpose library for WPE WebKit";
+    license = licenses.bsd2;
+    homepage = "https://wpewebkit.org";
+    maintainers = with maintainers; [ matthewbauer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3667a63a03e..a59a1b8bd50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14606,6 +14606,8 @@ in
 
   libixp_hg = callPackage ../development/libraries/libixp-hg { };
 
+  libwpe = callPackage ../development/libraries/libwpe { };
+
   libyaml = callPackage ../development/libraries/libyaml { };
 
   libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };

From fc1ddd2cabd1922431e2f9d9a5257c907f0b18c1 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 20 Jan 2021 17:18:04 -0500
Subject: [PATCH 372/956] notmuch: 0.31 -> 0.31.3

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

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index c39654d1c29..ddffe074706 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.31";
+  version = "0.31.3";
   pname = "notmuch";
 
   passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.notmuchmail.org/git/notmuch";
-    sha256 = "0f9d9k9avb46yh2r8fvijvw7bryqwckvyzc68f9phax2g4c99x4x";
+    sha256 = "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v";
     rev = version;
   };
 

From 44f39b8420bf8dd07ca37de12fbb14984294b5c0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 20 Jan 2021 23:22:31 +0100
Subject: [PATCH 373/956] gitjacker: init at 0.0.2

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

diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/tools/security/gitjacker/default.nix
new file mode 100644
index 00000000000..0b8c087eccd
--- /dev/null
+++ b/pkgs/tools/security/gitjacker/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, git
+, stdenv
+}:
+
+buildGoModule rec {
+  pname = "gitjacker";
+  version = "0.0.2";
+
+  src = fetchFromGitHub {
+    owner = "liamg";
+    repo = "gitjacker";
+    rev = "v${version}";
+    sha256 = "0fg95i2y8sj7dsvqj8mx0k5pps7d0h1i4a3lk85l8jjab4kxx8h9";
+  };
+
+  vendorSha256 = null;
+
+  propagatedBuildInputs = [ git ];
+
+  checkInputs = [ git ];
+
+  doCheck = !stdenv.isDarwin;
+
+  preCheck = ''
+    export PATH=$TMPDIR/usr/bin:$PATH
+  '';
+
+  meta = with lib; {
+    description = "Leak git repositories from misconfigured websites";
+    longDescription = ''
+      Gitjacker downloads git repositories and extracts their contents
+      from sites where the .git directory has been mistakenly uploaded.
+      It will still manage to recover a significant portion of a repository
+      even where directory listings are disabled.
+    '';
+    homepage = "https://github.com/liamg/gitjacker";
+    license = with licenses; [ unlicense ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2df5a25414c..a4f6d4dd78d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2232,6 +2232,8 @@ in
 
   gist = callPackage ../tools/text/gist { };
 
+  gitjacker = callPackage ../tools/security/gitjacker { };
+
   gixy = callPackage ../tools/admin/gixy { };
 
   glpaper = callPackage ../development/tools/glpaper { };

From b2eb8992c78f744c3c6408f96287290ec04c2870 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 22 Aug 2020 23:42:57 -0500
Subject: [PATCH 374/956] libwpe-fdo: init at 1.7.1

---
 pkgs/development/libraries/libwpe/fdo.nix | 52 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/libwpe/fdo.nix

diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix
new file mode 100644
index 00000000000..6f9356a6ad8
--- /dev/null
+++ b/pkgs/development/libraries/libwpe/fdo.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, lib
+, fetchurl
+, meson
+, pkg-config
+, ninja
+, wayland
+, epoxy
+, glib
+, libwpe
+, libxkbcommon
+, libGL
+, libX11 }:
+
+stdenv.mkDerivation rec {
+  pname = "wpebackend-fdo";
+  version = "1.7.1";
+
+  src = fetchurl {
+    url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
+    sha256 = "1xf6akagvpyh0nyxkfijrx5avp6ravnivy28dhk64dsfx9rhm64v";
+  };
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+    wayland
+  ];
+
+  buildInputs = [
+    wayland
+    epoxy
+    glib
+    libwpe
+    libxkbcommon
+    libGL
+    libX11
+  ];
+
+  meta = with lib; {
+    description = "Freedesktop.org backend for WPE WebKit";
+    license = licenses.bsd2;
+    homepage = "https://wpewebkit.org";
+    maintainers = with maintainers; [ matthewbauer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a59a1b8bd50..cdca6c88c5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14608,6 +14608,8 @@ in
 
   libwpe = callPackage ../development/libraries/libwpe { };
 
+  libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };
+
   libyaml = callPackage ../development/libraries/libyaml { };
 
   libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };

From 132f7e6cfed4eaefe2aac9c867e5549b8e37591c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 22 Aug 2020 23:43:17 -0500
Subject: [PATCH 375/956] webkitgtk: enable WPE_RENDERER

---
 pkgs/development/libraries/webkitgtk/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 814a1f22592..7f98ed8069f 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -51,6 +51,8 @@
 , xdg-dbus-proxy
 , substituteAll
 , glib
+, libwpe
+, libwpe-fdo
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
@@ -119,6 +121,8 @@ stdenv.mkDerivation rec {
     libsecret
     libtasn1
     libwebp
+    libwpe
+    libwpe-fdo
     libxkbcommon
     libxml2
     libxslt
@@ -153,7 +157,6 @@ stdenv.mkDerivation rec {
     "-DENABLE_INTROSPECTION=ON"
     "-DPORT=GTK"
     "-DUSE_LIBHYPHEN=OFF"
-    "-DUSE_WPE_RENDERER=OFF"
   ] ++ optionals stdenv.isDarwin [
     "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
     "-DENABLE_GTKDOC=OFF"

From 914de3a3ca9dbf47c0ae667b085cac558ae9314d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 23 Aug 2020 23:53:31 -0500
Subject: [PATCH 376/956] cog: init at 0.6.0

---
 pkgs/development/web/cog/default.nix | 70 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/development/web/cog/default.nix

diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix
new file mode 100644
index 00000000000..f1ddaea80d7
--- /dev/null
+++ b/pkgs/development/web/cog/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, lib
+, fetchpatch
+, fetchFromGitHub
+, cmake
+, pkg-config
+, wayland
+, wayland-protocols
+, libwpe
+, libwpe-fdo
+, glib
+, glib-networking
+, webkitgtk
+, makeWrapper
+, wrapGAppsHook
+, gnome3
+, gdk-pixbuf
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cog";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "igalia";
+    repo = "cog";
+    rev = "v${version}";
+    sha256 = "0a0zpdki1whm5gb6ycbazvwmm1fz094mkfwjfy4a7zz0pk54h1jw";
+  };
+
+  buildInputs = [
+    wayland-protocols
+    wayland
+    libwpe
+    libwpe-fdo
+    webkitgtk
+    glib-networking
+    gdk-pixbuf
+    gnome3.adwaita-icon-theme
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wayland
+    makeWrapper
+    wrapGAppsHook
+  ];
+
+  depsBuildsBuild = [
+    pkg-config
+  ];
+
+  cmakeFlags = [
+    "-DCOG_USE_WEBKITGTK=ON"
+  ];
+
+  # not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59
+  preFixup = ''
+    wrapProgram $out/bin/cog \
+      --prefix LD_LIBRARY_PATH : ${libwpe-fdo}/lib
+  '';
+
+  meta = with lib; {
+    description = "A small single “window” launcher for the WebKit WPE port";
+    license = licenses.mit;
+    maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdca6c88c5d..8812d389fb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12395,6 +12395,8 @@ in
 
   cointop = callPackage ../applications/misc/cointop { };
 
+  cog = callPackage ../development/web/cog { };
+
   ctl = callPackage ../development/libraries/ctl { };
 
   ctpp2 = callPackage ../development/libraries/ctpp2 { };

From 8adc564f284b1a01b5e219974721b1d541a4d999 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 21 Jan 2021 08:11:45 +1000
Subject: [PATCH 377/956] treewide: editorconfig fixes

- add final newline
- use spaces for indentation
---
 pkgs/applications/terminal-emulators/mrxvt/default.nix        | 4 ++--
 .../version-management/commitizen/node-packages.nix           | 2 +-
 pkgs/development/compilers/elm/packages/node-composition.nix  | 2 +-
 pkgs/development/compilers/elm/packages/node-packages.nix     | 2 +-
 pkgs/development/misc/google-clasp/google-clasp.nix           | 2 +-
 pkgs/development/misc/google-clasp/node-packages.nix          | 2 +-
 pkgs/development/node-packages/node-packages.nix              | 2 +-
 pkgs/development/web/newman/node-composition.nix              | 2 +-
 pkgs/development/web/newman/node-packages.nix                 | 2 +-
 pkgs/development/web/remarkjs/nodepkgs.nix                    | 2 +-
 pkgs/misc/base16-builder/node-packages-generated.nix          | 2 +-
 pkgs/misc/base16-builder/node-packages.nix                    | 2 +-
 pkgs/misc/base16-builder/supplement.nix                       | 2 +-
 .../matrix-appservice-slack/node-composition.nix              | 2 +-
 pkgs/servers/web-apps/cryptpad/node-packages-generated.nix    | 2 +-
 pkgs/servers/web-apps/cryptpad/node-packages.nix              | 2 +-
 pkgs/servers/web-apps/whitebophir/node-packages-generated.nix | 2 +-
 pkgs/servers/zigbee2mqtt/node-packages.nix                    | 2 +-
 pkgs/servers/zigbee2mqtt/node.nix                             | 2 +-
 pkgs/tools/compression/zdelta/default.nix                     | 2 +-
 pkgs/tools/graphics/ldgallery/viewer/node-composition.nix     | 2 +-
 pkgs/tools/graphics/ldgallery/viewer/node-packages.nix        | 2 +-
 pkgs/tools/graphics/pdfredacttools/default.nix                | 4 ++--
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix
index d46ff802239..b0b9ee61118 100644
--- a/pkgs/applications/terminal-emulators/mrxvt/default.nix
+++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Lightweight multitabbed feature-rich X11 terminal emulator";
     longDescription = "
-    	Multitabbed lightweight terminal emulator based on rxvt.
-	Supports transparency, backgroundimages, freetype fonts, ...
+      Multitabbed lightweight terminal emulator based on rxvt.
+      Supports transparency, backgroundimages, freetype fonts, ...
     ";
     homepage = "https://sourceforge.net/projects/materm";
     license = licenses.gpl2;
diff --git a/pkgs/applications/version-management/commitizen/node-packages.nix b/pkgs/applications/version-management/commitizen/node-packages.nix
index df50c8e473e..396dedf56fd 100644
--- a/pkgs/applications/version-management/commitizen/node-packages.nix
+++ b/pkgs/applications/version-management/commitizen/node-packages.nix
@@ -9068,4 +9068,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index c970861a86f..c43e7cc7f25 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index c81d2acdf7f..015958d1239 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -15513,4 +15513,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix
index be260edb643..b565c6d2f5d 100644
--- a/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/misc/google-clasp/node-packages.nix b/pkgs/development/misc/google-clasp/node-packages.nix
index c73c122e572..a58f58e05c6 100644
--- a/pkgs/development/misc/google-clasp/node-packages.nix
+++ b/pkgs/development/misc/google-clasp/node-packages.nix
@@ -2102,4 +2102,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 38fc84d5523..94c0b38fc76 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -110969,4 +110969,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix
index 17879f381d5..027a981ea57 100644
--- a/pkgs/development/web/newman/node-composition.nix
+++ b/pkgs/development/web/newman/node-composition.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/web/newman/node-packages.nix b/pkgs/development/web/newman/node-packages.nix
index a7c29ca49c7..680be3d499c 100644
--- a/pkgs/development/web/newman/node-packages.nix
+++ b/pkgs/development/web/newman/node-packages.nix
@@ -5727,4 +5727,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index be260edb643..b565c6d2f5d 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix
index 426b6229e1c..7ccb5cab835 100644
--- a/pkgs/misc/base16-builder/node-packages-generated.nix
+++ b/pkgs/misc/base16-builder/node-packages-generated.nix
@@ -1634,4 +1634,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index bb6ff246daa..396f2b2657d 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -18,4 +18,4 @@ in
 import ./node-packages-generated.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv globalBuildInputs;
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/base16-builder/supplement.nix b/pkgs/misc/base16-builder/supplement.nix
index 8183eb1a1e8..3d4c43d5e70 100644
--- a/pkgs/misc/base16-builder/supplement.nix
+++ b/pkgs/misc/base16-builder/supplement.nix
@@ -690,4 +690,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 0f86a16aef5..693eeaeaec6 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index 349ad59c60a..c8186e1d02c 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -741,4 +741,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 208bb3c72c7..d0273cfe1f9 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-generated.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
index 78d4b9ccd77..af58cbf3f9b 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
@@ -1492,4 +1492,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix
index 374b97bb509..a9da40e3fe4 100644
--- a/pkgs/servers/zigbee2mqtt/node-packages.nix
+++ b/pkgs/servers/zigbee2mqtt/node-packages.nix
@@ -10090,4 +10090,4 @@ in
   tarball = nodeEnv.buildNodeSourceDist args;
   package = nodeEnv.buildNodePackage args;
   shell = nodeEnv.buildNodeShell args;
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/zigbee2mqtt/node.nix b/pkgs/servers/zigbee2mqtt/node.nix
index 6080388b05e..2d0fadffa97 100644
--- a/pkgs/servers/zigbee2mqtt/node.nix
+++ b/pkgs/servers/zigbee2mqtt/node.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix
index b3932ec3da8..46760c91306 100644
--- a/pkgs/tools/compression/zdelta/default.nix
+++ b/pkgs/tools/compression/zdelta/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-	  homepage = "http://cis.poly.edu/zdelta";
+    homepage = "http://cis.poly.edu/zdelta";
     platforms = platforms.linux;
     license = licenses.zlib;
   };
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
index f6c53f6c58d..55566aafc58 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
index 14691f64065..9946ce0e63c 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
@@ -13266,4 +13266,4 @@ in
   tarball = nodeEnv.buildNodeSourceDist args;
   package = nodeEnv.buildNodePackage args;
   shell = nodeEnv.buildNodeShell args;
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix
index 31a327331d7..71d927913c3 100644
--- a/pkgs/tools/graphics/pdfredacttools/default.nix
+++ b/pkgs/tools/graphics/pdfredacttools/default.nix
@@ -22,8 +22,8 @@ python2Packages.buildPythonApplication rec {
   meta = with lib; {
     description = "Redact and strip metadata from documents before publishing";
     longDescription = ''
-	PDF Redact Tools helps with securely redacting and stripping metadata
-	from documents before publishing. Note that this is not a security tool.
+        PDF Redact Tools helps with securely redacting and stripping metadata
+        from documents before publishing. Note that this is not a security tool.
         It uses ImageMagick to parse PDFs.  While ImageMagick is a versatile tool, it has
         a history of several security bugs. A malicious PDF could exploit a bug in
         ImageMagick to take over your computer. If you're working with potentially

From fb76434e986739b3f99cb41a12ba7b61656857bd Mon Sep 17 00:00:00 2001
From: ash lea <example@thisismyactual.email>
Date: Wed, 20 Jan 2021 15:37:22 -0800
Subject: [PATCH 378/956] dolphinEmuMaster: 5.0-12716 -> 5.0-13178

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

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 7e988747308..4a1fca0e7c5 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -21,13 +21,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "dolphin-emu";
-  version = "5.0-12716";
+  version = "5.0-13178";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "31524288e3b2450eaefff8202c6d26c4ba3f7333";
-    sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg";
+    rev = "a34823df61df65168aa40ef5e82e44defd4a0138";
+    sha256 = "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1";
   };
 
   nativeBuildInputs = [ cmake pkg-config ]

From 7616206b7747f12db15d32a7ab16b0ceaa3d7331 Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Thu, 21 Jan 2021 01:07:16 +0100
Subject: [PATCH 379/956] doc: add function argument order convention (#110060)

* doc: add function argument order convention

Ordering by usage is the de facto ordering given to arguments. It's
logical, and makes finding argument usage easier. Putting lib first is
common in NixOS modules, so it's reasonable to mirror this in nixpkgs
proper. Additionally, it's not a package as such, has zero dependencies,
and can be found used anywhere in a derivation.

* doc: clean up usage of lib
---
 doc/contributing/coding-conventions.xml   |  6 ++++++
 doc/languages-frameworks/coq.section.md   |  4 ++--
 doc/languages-frameworks/idris.section.md | 10 +++++-----
 doc/languages-frameworks/maven.section.md |  8 ++++----
 doc/languages-frameworks/ocaml.section.md |  6 +++---
 doc/languages-frameworks/perl.section.md  |  2 +-
 doc/languages-frameworks/qt.section.md    |  2 +-
 doc/languages-frameworks/r.section.md     |  8 +++-----
 doc/languages-frameworks/ruby.section.md  |  2 +-
 doc/languages-frameworks/rust.section.md  |  8 ++++----
 10 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml
index cb6d60c2c13..9005a9ebafd 100644
--- a/doc/contributing/coding-conventions.xml
+++ b/doc/contributing/coding-conventions.xml
@@ -178,6 +178,12 @@ args.stdenv.mkDerivation (args // {
 </programlisting>
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Arguments should be listed in the order they are used, with the
+     exception of <varname>lib</varname>, which always goes first.
+    </para>
+   </listitem>
    <listitem>
     <para>
      Prefer using the top-level <varname>lib</varname> over its alias
diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md
index 5e16a4c546a..8f564c6e46b 100644
--- a/doc/languages-frameworks/coq.section.md
+++ b/doc/languages-frameworks/coq.section.md
@@ -42,8 +42,8 @@ It also takes other standard `mkDerivation` attributes, they are added as such,
 Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`.
 
 ```nix
-{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough,
-  lib, version ? null }:
+{ lib, mkCoqDerivation, version ? null
+, coq, mathcomp, mathcomp-finmap, mathcomp-bigenough }:
 with lib; mkCoqDerivation {
   /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */
   namePrefix = [ "coq" "mathcomp" ];
diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md
index 2d06c4a19de..41e4f7ec312 100644
--- a/doc/languages-frameworks/idris.section.md
+++ b/doc/languages-frameworks/idris.section.md
@@ -69,11 +69,11 @@ prelude
 As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`:
 
 ```nix
-{ build-idris-package
+{ lib
+, build-idris-package
 , fetchFromGitHub
 , contrib
 , lightyear
-, lib
 }:
 build-idris-package  {
   name = "yaml";
@@ -94,11 +94,11 @@ build-idris-package  {
     sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7";
   };
 
-  meta = {
+  meta = with lib; {
     description = "Idris YAML lib";
     homepage = "https://github.com/Heather/Idris.Yaml";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.brainrape ];
+    license = licenses.mit;
+    maintainers = [ maintainers.brainrape ];
   };
 }
 ```
diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md
index 7a863c500bc..d66931e808d 100644
--- a/doc/languages-frameworks/maven.section.md
+++ b/doc/languages-frameworks/maven.section.md
@@ -116,7 +116,7 @@ The first step will be to build the Maven project as a fixed-output derivation i
 > Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory.
 
 ```nix
-{ stdenv, lib, maven }:
+{ lib, stdenv, maven }:
 stdenv.mkDerivation {
   name = "maven-repository";
   buildInputs = [ maven ];
@@ -168,7 +168,7 @@ If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a str
 Regardless of which strategy is chosen above, the step to build the derivation is the same.
 
 ```nix
-{ stdenv, lib, maven, callPackage }:
+{ stdenv, maven, callPackage }:
 # pick a repository derivation, here we will use buildMaven
 let repository = callPackage ./build-maven-repository.nix { };
 in stdenv.mkDerivation rec {
@@ -222,7 +222,7 @@ We will read the Maven repository and flatten it to a single list. This list wil
 We make sure to provide this classpath to the `makeWrapper`.
 
 ```nix
-{ stdenv, lib, maven, callPackage, makeWrapper, jre }:
+{ stdenv, maven, callPackage, makeWrapper, jre }:
 let
   repository = callPackage ./build-maven-repository.nix { };
 in stdenv.mkDerivation rec {
@@ -298,7 +298,7 @@ Main-Class: Main
 We will modify the derivation above to add a symlink to our repository so that it's accessible to our JAR during the `installPhase`.
 
 ```nix
-{ stdenv, lib, maven, callPackage, makeWrapper, jre }:
+{ stdenv, maven, callPackage, makeWrapper, jre }:
 # pick a repository derivation, here we will use buildMaven
 let repository = callPackage ./build-maven-repository.nix { };
 in stdenv.mkDerivation rec {
diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md
index fa85a27e84f..9b92a80f471 100644
--- a/doc/languages-frameworks/ocaml.section.md
+++ b/doc/languages-frameworks/ocaml.section.md
@@ -32,11 +32,11 @@ buildDunePackage rec {
   propagatedBuildInputs = [ bigstringaf result ];
   doCheck = true;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/inhabitedtype/angstrom";
     description = "OCaml parser combinators built for speed and memory efficiency";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ sternenseemann ];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ sternenseemann ];
   };
 }
 ```
diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md
index 309d8ebcc2b..dcb7dcb77b6 100644
--- a/doc/languages-frameworks/perl.section.md
+++ b/doc/languages-frameworks/perl.section.md
@@ -110,7 +110,7 @@ ClassC3Componentised = buildPerlPackage rec {
 On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase:
 
 ```nix
-{ stdenv, lib, buildPerlPackage, fetchurl, shortenPerlShebang }:
+{ lib, stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }:
 
 ImageExifTool = buildPerlPackage {
   pname = "Image-ExifTool";
diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md
index 6cfdc663550..5dd415852c1 100644
--- a/doc/languages-frameworks/qt.section.md
+++ b/doc/languages-frameworks/qt.section.md
@@ -8,7 +8,7 @@ There are primarily two problems which the Qt infrastructure is designed to addr
 
 ```{=docbook}
 <programlisting>
-{ mkDerivation, lib, qtbase }: <co xml:id='qt-default-nix-co-1' />
+{ mkDerivation, qtbase }: <co xml:id='qt-default-nix-co-1' />
 
 mkDerivation { <co xml:id='qt-default-nix-co-2' />
   pname = "myapp";
diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md
index 32a39ade279..c420d112c91 100644
--- a/doc/languages-frameworks/r.section.md
+++ b/doc/languages-frameworks/r.section.md
@@ -32,14 +32,12 @@ However, if you'd like to add a file to your project source to make the
 environment available for other contributors, you can create a `default.nix`
 file like so:
 ```nix
-let
-  pkgs = import <nixpkgs> {};
-  stdenv = pkgs.stdenv;
-in with pkgs; {
+with import <nixpkgs> {};
+{
   myProject = stdenv.mkDerivation {
     name = "myProject";
     version = "1";
-    src = if pkgs.lib.inNixShell then null else nix;
+    src = if lib.inNixShell then null else nix;
 
     buildInputs = with rPackages; [
       R
diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index e292b3110ff..aeec154586c 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -232,7 +232,7 @@ If you want to package a specific version, you can use the standard Gemfile synt
 Now you can also also make a `default.nix` that looks like this:
 
 ```nix
-{ lib, bundlerApp }:
+{ bundlerApp }:
 
 bundlerApp {
   pname = "mdl";
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 550f2b576bd..8f6db28ab4d 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -19,6 +19,8 @@ or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
 Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
 
 ```
+{ lib, rustPlatform }:
+
 rustPlatform.buildRustPackage rec {
   pname = "ripgrep";
   version = "12.1.1";
@@ -226,8 +228,6 @@ source code in a reproducible way. If it is missing or out-of-date one can use
 the `cargoPatches` attribute to update or add it.
 
 ```
-{ lib, rustPlatform, fetchFromGitHub }:
-
 rustPlatform.buildRustPackage rec {
   (...)
   cargoPatches = [
@@ -263,7 +263,7 @@ Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
 
 ```
 # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone
-{ lib, stdenv, buildRustCrate, fetchgit }:
+{ stdenv, buildRustCrate, fetchgit }:
 let kernel = stdenv.buildPlatform.parsed.kernel.name;
     # ... (content skipped)
 in
@@ -292,7 +292,7 @@ following nix file:
 
 ```
 # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone
-{ lib, stdenv, buildRustCrate, fetchgit }:
+{ stdenv, buildRustCrate, fetchgit }:
 let kernel = stdenv.buildPlatform.parsed.kernel.name;
     # ... (content skipped)
 in

From 569987c1be8d42302a4238b3dc39d16ac70bdfb6 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 21 Jan 2021 10:21:59 +1000
Subject: [PATCH 380/956] .editorconfig: drop ocaml/perl

---
 .editorconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index bc45523451b..e21731d10cf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -90,9 +90,6 @@ insert_final_newline = unset
 indent_style = unset
 trim_trailing_whitespace = unset
 
-[pkgs/development/{perl-modules,ocaml-modules,tools/ocaml}/**]
-indent_style = unset
-
 [pkgs/servers/dict/wordnet_structures.py]
 trim_trailing_whitespace = unset
 

From 8488ebab05929b1d65c12a9294661478f01a1a55 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 21 Jan 2021 10:24:35 +1000
Subject: [PATCH 381/956] ocamlPackages.*: use spaces for indentation

---
 .../development/ocaml-modules/bos/default.nix | 34 +++++------
 .../ocaml-modules/camomile/default.nix        | 30 +++++-----
 .../ocaml-modules/cohttp/async.nix            | 24 ++++----
 .../ocaml-modules/cohttp/default.nix          | 32 +++++-----
 .../ocaml-modules/cohttp/lwt-unix.nix         | 10 ++--
 pkgs/development/ocaml-modules/cohttp/lwt.nix |  8 +--
 .../ocaml-modules/conduit/async.nix           | 16 ++---
 .../ocaml-modules/conduit/lwt-unix.nix        | 18 +++---
 .../development/ocaml-modules/conduit/lwt.nix | 14 ++---
 .../development/ocaml-modules/cstruct/lwt.nix |  6 +-
 .../development/ocaml-modules/cstruct/ppx.nix |  8 +--
 .../ocaml-modules/cstruct/sexp.nix            | 11 ++--
 .../ocaml-modules/cstruct/unix.nix            |  8 +--
 .../development/ocaml-modules/csv/default.nix | 24 ++++----
 .../ocaml-modules/decompress/default.nix      | 34 +++++------
 .../ocaml-modules/dolmen/default.nix          | 38 ++++++------
 .../ocaml-modules/expat/default.nix           | 44 +++++++-------
 .../ocaml-modules/git-http/default.nix        | 16 ++---
 .../ocaml-modules/git-unix/default.nix        | 20 +++----
 .../development/ocaml-modules/git/default.nix | 40 ++++++-------
 .../ocaml-modules/hmap/default.nix            | 10 ++--
 .../ocaml-modules/inifiles/default.nix        | 36 ++++++------
 .../ocaml-modules/inotify/default.nix         | 58 +++++++++----------
 .../ocaml-modules/integers/default.nix        | 24 ++++----
 .../ocaml-modules/lwt_react/default.nix       | 26 ++++-----
 .../development/ocaml-modules/num/default.nix | 42 +++++++-------
 .../ocaml-modules/ocp-ocamlres/default.nix    | 38 ++++++------
 .../ocplib-json-typed/default.nix             | 32 +++++-----
 .../ocaml-modules/octavius/default.nix        | 28 ++++-----
 .../ocaml-modules/opium/default.nix           |  8 +--
 .../ocaml-modules/ppx_derivers/default.nix    | 28 ++++-----
 .../ocaml-modules/ppxfind/default.nix         | 30 +++++-----
 .../ocaml-modules/rresult/default.nix         | 30 +++++-----
 .../ocaml-modules/webbrowser/default.nix      | 34 +++++------
 34 files changed, 429 insertions(+), 430 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix
index 84cee3d97ce..62438526d70 100644
--- a/pkgs/development/ocaml-modules/bos/default.nix
+++ b/pkgs/development/ocaml-modules/bos/default.nix
@@ -3,24 +3,24 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-bos-${version}";
-	version = "0.2.0";
-	src = fetchurl {
-		url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
-		sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
-	};
+  name = "ocaml${ocaml.version}-bos-${version}";
+  version = "0.2.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
+    sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
+  };
 
-	nativeBuildInputs = [ ocaml findlib ocamlbuild ];
-	buildInputs = [ findlib topkg ];
-	propagatedBuildInputs = [ astring fmt fpath logs rresult ];
+  nativeBuildInputs = [ ocaml findlib ocamlbuild ];
+  buildInputs = [ findlib topkg ];
+  propagatedBuildInputs = [ astring fmt fpath logs rresult ];
 
-	inherit (topkg) buildPhase installPhase;
+  inherit (topkg) buildPhase installPhase;
 
-	meta = {
-		description = "Basic OS interaction for OCaml";
-		homepage = "https://erratique.ch/software/bos";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "Basic OS interaction for OCaml";
+    homepage = "https://erratique.ch/software/bos";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index 2b246d0f3ea..6bae728cafa 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -2,23 +2,23 @@
 
 buildDunePackage rec {
   pname = "camomile";
-	version = "1.0.2";
+  version = "1.0.2";
 
-	src = fetchFromGitHub {
-		owner = "yoriyuki";
-		repo = pname;
-		rev = version;
-		sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
-	};
+  src = fetchFromGitHub {
+    owner = "yoriyuki";
+    repo = pname;
+    rev = version;
+    sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
+  };
 
-	buildInputs = [ cppo ];
+  buildInputs = [ cppo ];
 
-	configurePhase = "ocaml configure.ml --share $out/share/camomile";
+  configurePhase = "ocaml configure.ml --share $out/share/camomile";
 
-	meta = {
-		inherit (src.meta) homepage;
-		maintainers = [ lib.maintainers.vbgl ];
-		license = lib.licenses.lgpl21;
-		description = "A Unicode library for OCaml";
-	};
+  meta = {
+    inherit (src.meta) homepage;
+    maintainers = [ lib.maintainers.vbgl ];
+    license = lib.licenses.lgpl21;
+    description = "A Unicode library for OCaml";
+  };
 }
diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix
index 974c3aa2f9c..21e22533f1b 100644
--- a/pkgs/development/ocaml-modules/cohttp/async.nix
+++ b/pkgs/development/ocaml-modules/cohttp/async.nix
@@ -2,21 +2,21 @@
 , logs, magic-mime }:
 
 if !lib.versionAtLeast cohttp.version "0.99" then
-	cohttp
+  cohttp
 else if !lib.versionAtLeast async.version "0.13" then
-	throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
+  throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
 else
 
-	buildDunePackage {
-		pname = "cohttp-async";
-		useDune2 = true;
-		inherit (cohttp) version src;
+  buildDunePackage {
+    pname = "cohttp-async";
+    useDune2 = true;
+    inherit (cohttp) version src;
 
-		buildInputs = [ ppx_sexp_conv ];
+    buildInputs = [ ppx_sexp_conv ];
 
-		propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
+    propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
 
-		meta = cohttp.meta // {
-			description = "CoHTTP implementation for the Async concurrency library";
-		};
-	}
+    meta = cohttp.meta // {
+      description = "CoHTTP implementation for the Async concurrency library";
+    };
+  }
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 3fed7c55d45..e664d17f215 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -4,26 +4,26 @@
 }:
 
 buildDunePackage rec {
-	pname = "cohttp";
-	version = "2.5.4";
+  pname = "cohttp";
+  version = "2.5.4";
 
-	useDune2 = true;
+  useDune2 = true;
 
-	minimumOCamlVersion = "4.04.1";
+  minimumOCamlVersion = "4.04.1";
 
-	src = fetchurl {
-		url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
-		sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
-	};
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
+    sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
+  };
 
-	buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
+  buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
+  propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
 
-	meta = {
-		description = "HTTP(S) library for Lwt, Async and Mirage";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/mirage/ocaml-cohttp";
-	};
+  meta = {
+    description = "HTTP(S) library for Lwt, Async and Mirage";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/mirage/ocaml-cohttp";
+  };
 }
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
index 455a76ce94d..845df2a3f54 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -8,12 +8,12 @@ then cohttp-lwt
 else
 
 buildDunePackage {
-	pname = "cohttp-lwt-unix";
-	inherit (cohttp-lwt) version src meta;
+  pname = "cohttp-lwt-unix";
+  inherit (cohttp-lwt) version src meta;
 
-	useDune2 = true;
+  useDune2 = true;
 
-	buildInputs = [ cmdliner ppx_sexp_conv ];
+  buildInputs = [ cmdliner ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
+  propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
 }
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 04f81e8e8df..36831d94613 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -7,10 +7,10 @@ then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_con
 else
 
 buildDunePackage {
-	pname = "cohttp-lwt";
-	inherit (cohttp) version src useDune2 meta;
+  pname = "cohttp-lwt";
+  inherit (cohttp) version src useDune2 meta;
 
-	buildInputs = [ uri ppx_sexp_conv ];
+  buildInputs = [ uri ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
+  propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
 }
diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix
index e289b5d711d..c15ad0520fb 100644
--- a/pkgs/development/ocaml-modules/conduit/async.nix
+++ b/pkgs/development/ocaml-modules/conduit/async.nix
@@ -5,15 +5,15 @@ then conduit
 else
 
 buildDunePackage {
-	pname = "conduit-async";
-	useDune2 = true;
-	inherit (conduit) version src;
+  pname = "conduit-async";
+  useDune2 = true;
+  inherit (conduit) version src;
 
-	buildInputs = [ ppx_sexp_conv ];
+  buildInputs = [ ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ async async_ssl conduit ];
+  propagatedBuildInputs = [ async async_ssl conduit ];
 
-	meta = conduit.meta // {
-		description = "A network connection establishment library for Async";
-	};
+  meta = conduit.meta // {
+    description = "A network connection establishment library for Async";
+  };
 }
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index 9f871a8ea9c..ab6449b50a1 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -4,17 +4,17 @@
 }:
 
 buildDunePackage {
-	pname = "conduit-lwt-unix";
-	inherit (conduit-lwt) version src minimumOCamlVersion;
+  pname = "conduit-lwt-unix";
+  inherit (conduit-lwt) version src minimumOCamlVersion;
 
-	useDune2 = true;
+  useDune2 = true;
 
-	buildInputs = [ ppx_sexp_conv ];
+  buildInputs = [ ppx_sexp_conv ];
 
-	propagatedBuildInputs =
-		[ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
+  propagatedBuildInputs =
+    [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
 
-	meta = conduit-lwt.meta // {
-		description = "A network connection establishment library for Lwt_unix";
-	};
+  meta = conduit-lwt.meta // {
+    description = "A network connection establishment library for Lwt_unix";
+  };
 }
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
index 512aa60bb66..2f18027a67b 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -1,14 +1,14 @@
 { buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
 
 buildDunePackage {
-	pname = "conduit-lwt";
-	inherit (conduit) version src useDune2 minimumOCamlVersion;
+  pname = "conduit-lwt";
+  inherit (conduit) version src useDune2 minimumOCamlVersion;
 
-	buildInputs = [ ppx_sexp_conv ];
+  buildInputs = [ ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
+  propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
 
-	meta = conduit.meta // {
-		description = "A network connection establishment library for Lwt";
-	};
+  meta = conduit.meta // {
+    description = "A network connection establishment library for Lwt";
+  };
 }
diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix
index f340bfcda25..113df1e89b5 100644
--- a/pkgs/development/ocaml-modules/cstruct/lwt.nix
+++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix
@@ -5,10 +5,10 @@ then cstruct
 else
 
 buildDunePackage {
-	pname = "cstruct-lwt";
-	inherit (cstruct) version src useDune2 meta;
+  pname = "cstruct-lwt";
+  inherit (cstruct) version src useDune2 meta;
 
   minimumOCamlVersion = "4.02";
 
-	propagatedBuildInputs = [ cstruct lwt ];
+  propagatedBuildInputs = [ cstruct lwt ];
 }
diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix
index feb8feac6b6..44343812090 100644
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix
@@ -5,10 +5,10 @@ then cstruct
 else
 
 buildDunePackage {
-	pname = "ppx_cstruct";
-	inherit (cstruct) version src useDune2 meta;
+  pname = "ppx_cstruct";
+  inherit (cstruct) version src useDune2 meta;
 
-	minimumOCamlVersion = "4.03";
+  minimumOCamlVersion = "4.03";
 
-	propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ];
+  propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ];
 }
diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix
index 04bb10d6f75..742cb6522eb 100644
--- a/pkgs/development/ocaml-modules/cstruct/sexp.nix
+++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix
@@ -5,12 +5,11 @@ then cstruct
 else
 
 buildDunePackage rec {
-	pname = "cstruct-sexp";
-	inherit (cstruct) version src useDune2 meta;
+  pname = "cstruct-sexp";
+  inherit (cstruct) version src useDune2 meta;
 
-	doCheck = lib.versionAtLeast ocaml.version "4.03";
-	checkInputs = lib.optional doCheck alcotest;
+  doCheck = lib.versionAtLeast ocaml.version "4.03";
+  checkInputs = lib.optional doCheck alcotest;
 
-	propagatedBuildInputs = [ cstruct sexplib ];
+  propagatedBuildInputs = [ cstruct sexplib ];
 }
-
diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix
index b7e0df0185c..1ea27bb04de 100644
--- a/pkgs/development/ocaml-modules/cstruct/unix.nix
+++ b/pkgs/development/ocaml-modules/cstruct/unix.nix
@@ -5,10 +5,10 @@ then cstruct
 else
 
 buildDunePackage {
-	pname = "cstruct-unix";
-	inherit (cstruct) version src useDune2 meta;
+  pname = "cstruct-unix";
+  inherit (cstruct) version src useDune2 meta;
 
-	minimumOCamlVersion = "4.06";
+  minimumOCamlVersion = "4.06";
 
-	propagatedBuildInputs = [ cstruct ];
+  propagatedBuildInputs = [ cstruct ];
 }
diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index 8cf2918989e..59562453175 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -2,19 +2,19 @@
 
 buildDunePackage rec {
   pname = "csv";
-	version = "2.4";
+  version = "2.4";
 
-	useDune2 = true;
+  useDune2 = true;
 
-	src = fetchurl {
-		url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
-		sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
-	};
+  src = fetchurl {
+    url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
+    sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
+  };
 
-	meta = {
-		description = "A pure OCaml library to read and write CSV files";
-		license = lib.licenses.lgpl21;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/Chris00/ocaml-csv";
-	};
+  meta = {
+    description = "A pure OCaml library to read and write CSV files";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/Chris00/ocaml-csv";
+  };
 }
diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix
index a3bf3456ed0..067fac33d45 100644
--- a/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/pkgs/development/ocaml-modules/decompress/default.nix
@@ -4,25 +4,25 @@
 }:
 
 buildDunePackage rec {
-	version = "0.9.0";
-	pname = "decompress";
+  version = "0.9.0";
+  pname = "decompress";
 
-	useDune2 = true;
+  useDune2 = true;
 
-	src = fetchurl {
-		url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
-		sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
-	};
+  src = fetchurl {
+    url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
+    sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
+  };
 
-	buildInputs = [ cmdliner ];
-	propagatedBuildInputs = [ checkseum ];
-	checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
-	doCheck = true;
+  buildInputs = [ cmdliner ];
+  propagatedBuildInputs = [ checkseum ];
+  checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
+  doCheck = true;
 
-	meta = {
-		description = "Pure OCaml implementation of Zlib";
-		license = lib.licenses.mit;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/mirage/decompress";
-	};
+  meta = {
+    description = "Pure OCaml implementation of Zlib";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/mirage/decompress";
+  };
 }
diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix
index d4a47abcafa..a1a73bfe218 100644
--- a/pkgs/development/ocaml-modules/dolmen/default.nix
+++ b/pkgs/development/ocaml-modules/dolmen/default.nix
@@ -1,27 +1,27 @@
 { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-dolmen-${version}";
-	version = "0.2";
-	src = fetchFromGitHub {
-		owner = "Gbury";
-		repo = "dolmen";
-		rev = "v${version}";
-		sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf";
-	};
+  name = "ocaml${ocaml.version}-dolmen-${version}";
+  version = "0.2";
+  src = fetchFromGitHub {
+    owner = "Gbury";
+    repo = "dolmen";
+    rev = "v${version}";
+    sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf";
+  };
 
-	buildInputs = [ ocaml findlib ocamlbuild ];
-	propagatedBuildInputs = [ menhir ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
+  propagatedBuildInputs = [ menhir ];
 
-	makeFlags = [ "-C" "src" ];
+  makeFlags = [ "-C" "src" ];
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "An OCaml library providing clean and flexible parsers for input languages";
-		license = lib.licenses.bsd2;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "An OCaml library providing clean and flexible parsers for input languages";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix
index 9675fa88151..1812473e78b 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/pkgs/development/ocaml-modules/expat/default.nix
@@ -1,32 +1,32 @@
 { stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-expat-${version}";
-	version = "1.1.0";
+  name = "ocaml${ocaml.version}-expat-${version}";
+  version = "1.1.0";
 
-	src = fetchFromGitHub {
-		owner = "whitequark";
-		repo = "ocaml-expat";
-		rev = "v${version}";
-		sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q";
-	};
+  src = fetchFromGitHub {
+    owner = "whitequark";
+    repo = "ocaml-expat";
+    rev = "v${version}";
+    sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q";
+  };
 
-	prePatch = ''
-		substituteInPlace Makefile --replace "gcc" "\$(CC)"
-	'';
+  prePatch = ''
+    substituteInPlace Makefile --replace "gcc" "\$(CC)"
+  '';
 
-	buildInputs = [ ocaml findlib expat ounit ];
+  buildInputs = [ ocaml findlib expat ounit ];
 
-	doCheck = !lib.versionAtLeast ocaml.version "4.06";
-	checkTarget = "testall";
+  doCheck = !lib.versionAtLeast ocaml.version "4.06";
+  checkTarget = "testall";
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "OCaml wrapper for the Expat XML parsing library";
-		license = lib.licenses.mit;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "OCaml wrapper for the Expat XML parsing library";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix
index 3b127c65006..54bd5c2da23 100644
--- a/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/pkgs/development/ocaml-modules/git-http/default.nix
@@ -1,15 +1,15 @@
 { buildDunePackage, git, cohttp, cohttp-lwt }:
 
 buildDunePackage {
-	pname = "git-http";
-	inherit (git) version src minimumOCamlVersion;
+  pname = "git-http";
+  inherit (git) version src minimumOCamlVersion;
 
-	useDune2 = true;
+  useDune2 = true;
 
-	propagatedBuildInputs = [ git cohttp cohttp-lwt ];
+  propagatedBuildInputs = [ git cohttp cohttp-lwt ];
 
-	meta = {
-		description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
-		inherit (git.meta) homepage license maintainers;
-	};
+  meta = {
+    description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
+    inherit (git.meta) homepage license maintainers;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix
index 0633b8af8f0..6ee6ef21c15 100644
--- a/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/pkgs/development/ocaml-modules/git-unix/default.nix
@@ -4,17 +4,17 @@
 }:
 
 buildDunePackage {
-	pname = "git-unix";
-	inherit (git-http) version src minimumOCamlVersion;
+  pname = "git-unix";
+  inherit (git-http) version src minimumOCamlVersion;
 
-	useDune2 = true;
+  useDune2 = true;
 
-	propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ];
-	checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ];
-	doCheck = !stdenv.isAarch64;
+  propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ];
+  checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ];
+  doCheck = !stdenv.isAarch64;
 
-	meta = {
-		description = "Unix backend for the Git protocol(s)";
-		inherit (git-http.meta) homepage license maintainers;
-	};
+  meta = {
+    description = "Unix backend for the Git protocol(s)";
+    inherit (git-http.meta) homepage license maintainers;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index ba2372090d8..f5cb452f1a9 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -6,28 +6,28 @@
 }:
 
 buildDunePackage rec {
-	pname = "git";
-	version = "2.1.3";
+  pname = "git";
+  version = "2.1.3";
 
-	minimumOCamlVersion = "4.07";
-	useDune2 = true;
+  minimumOCamlVersion = "4.07";
+  useDune2 = true;
 
-	src = fetchurl {
-		url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
-		sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax";
-	};
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
+    sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax";
+  };
 
-	propagatedBuildInputs = [
-		angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
-		hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims
-	];
-	checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
-	doCheck = !stdenv.isAarch64;
+  propagatedBuildInputs = [
+    angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
+    hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims
+  ];
+  checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
+  doCheck = !stdenv.isAarch64;
 
-	meta = {
-		description = "Git format and protocol in pure OCaml";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/mirage/ocaml-git";
-	};
+  meta = {
+    description = "Git format and protocol in pure OCaml";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/mirage/ocaml-git";
+  };
 }
diff --git a/pkgs/development/ocaml-modules/hmap/default.nix b/pkgs/development/ocaml-modules/hmap/default.nix
index 563d39909c8..67622a8ef6a 100644
--- a/pkgs/development/ocaml-modules/hmap/default.nix
+++ b/pkgs/development/ocaml-modules/hmap/default.nix
@@ -13,7 +13,7 @@ in
 assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
 
 stdenv.mkDerivation rec {
-	pname = "hmap";
+  pname = "hmap";
   version = "0.8.1";
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a";
   };
 
-	buildInputs = [ ocaml ocamlbuild findlib topkg ];
+  buildInputs = [ ocaml ocamlbuild findlib topkg ];
 
   inherit (topkg) installPhase;
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
   checkPhase = "${topkg.run} test";
 
   meta = {
-		description = "Heterogeneous value maps for OCaml";
+    description = "Heterogeneous value maps for OCaml";
     homepage = "https://erratique.ch/software/hmap";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.pmahoney ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.pmahoney ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix
index c141c73506d..ad9bd3e2dc7 100644
--- a/pkgs/development/ocaml-modules/inifiles/default.nix
+++ b/pkgs/development/ocaml-modules/inifiles/default.nix
@@ -1,28 +1,28 @@
 { stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }:
 
 stdenv.mkDerivation {
-	name = "ocaml${ocaml.version}-inifiles-1.2";
+  name = "ocaml${ocaml.version}-inifiles-1.2";
 
-	src = fetchurl {
-		url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
-		sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
-	};
+  src = fetchurl {
+    url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
+    sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
+  };
 
-	patches = [ (fetchpatch {
-		url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff";
-		sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn";
-	})];
+  patches = [ (fetchpatch {
+    url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff";
+    sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn";
+  })];
 
-	buildInputs = [ ocaml findlib ];
-	propagatedBuildInputs = [ ocaml_pcre ];
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ ocaml_pcre ];
 
-	buildFlags = [ "all" "opt" ];
+  buildFlags = [ "all" "opt" ];
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "A small OCaml library to read and write .ini files";
-		license = lib.licenses.lgpl21Plus;
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "A small OCaml library to read and write .ini files";
+    license = lib.licenses.lgpl21Plus;
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix
index d43d5d9cf8e..8910b720a84 100644
--- a/pkgs/development/ocaml-modules/inotify/default.nix
+++ b/pkgs/development/ocaml-modules/inotify/default.nix
@@ -4,41 +4,41 @@
 }:
 
 stdenv.mkDerivation rec {
-	version = "2.3";
-	name = "ocaml${ocaml.version}-inotify-${version}";
+  version = "2.3";
+  name = "ocaml${ocaml.version}-inotify-${version}";
 
-	src = fetchFromGitHub {
-		owner = "whitequark";
-		repo = "ocaml-inotify";
-		rev = "v${version}";
-		sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y";
-	};
+  src = fetchFromGitHub {
+    owner = "whitequark";
+    repo = "ocaml-inotify";
+    rev = "v${version}";
+    sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y";
+  };
 
-	patches = [ (fetchpatch {
-		url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch";
-		sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k";
-	}) ];
+  patches = [ (fetchpatch {
+    url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch";
+    sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k";
+  }) ];
 
-	buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ];
-	checkInputs = [ ounit fileutils ];
+  buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ];
+  checkInputs = [ ounit fileutils ];
 
-	configureFlags = [ "--enable-lwt"
-	  (lib.optionalString doCheck "--enable-tests") ];
+  configureFlags = [ "--enable-lwt"
+    (lib.optionalString doCheck "--enable-tests") ];
 
-	postConfigure = lib.optionalString doCheck ''
-	  echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
-	'';
+  postConfigure = lib.optionalString doCheck ''
+    echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
+  '';
 
-	doCheck = true;
-	checkTarget = "test";
+  doCheck = true;
+  checkTarget = "test";
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "Bindings for Linux’s filesystem monitoring interface, inotify";
-		license = lib.licenses.lgpl21;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-		platforms = lib.platforms.linux;
-	};
+  meta = {
+    description = "Bindings for Linux’s filesystem monitoring interface, inotify";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    platforms = lib.platforms.linux;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix
index ca14c3ca873..ad6f1f9f813 100644
--- a/pkgs/development/ocaml-modules/integers/default.nix
+++ b/pkgs/development/ocaml-modules/integers/default.nix
@@ -1,18 +1,18 @@
 { lib, fetchzip, buildDunePackage }:
 
 buildDunePackage rec {
-	pname = "integers";
-	version = "0.4.0";
+  pname = "integers";
+  version = "0.4.0";
 
-	src = fetchzip {
-		url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
-		sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
-	};
+  src = fetchzip {
+    url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
+    sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
+  };
 
-	meta = {
-		description = "Various signed and unsigned integer types for OCaml";
-		license = lib.licenses.mit;
-		homepage = "https://github.com/ocamllabs/ocaml-integers";
-		maintainers = [ lib.maintainers.vbgl ];
-	};
+  meta = {
+    description = "Various signed and unsigned integer types for OCaml";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/ocamllabs/ocaml-integers";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
 }
diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix
index 4d82db043e8..5513935133e 100644
--- a/pkgs/development/ocaml-modules/lwt_react/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_react/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }:
 
 stdenv.mkDerivation rec {
-	version = "1.0.1";
-	name = "ocaml${ocaml.version}-lwt_react-${version}";
-	src = fetchzip {
-		url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
-		sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
-	};
+  version = "1.0.1";
+  name = "ocaml${ocaml.version}-lwt_react-${version}";
+  src = fetchzip {
+    url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
+    sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
+  };
 
-	buildInputs = [ ocaml findlib ocamlbuild ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
 
-	propagatedBuildInputs = [ lwt react ];
+  propagatedBuildInputs = [ lwt react ];
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
-	meta = {
-		description = "Helpers for using React with Lwt";
-		inherit (lwt.meta) homepage license maintainers;
+  meta = {
+    description = "Helpers for using React with Lwt";
+    inherit (lwt.meta) homepage license maintainers;
     inherit (ocaml.meta) platforms;
-	};
+  };
 }
diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix
index b553677fad4..e2c7b439c69 100644
--- a/pkgs/development/ocaml-modules/num/default.nix
+++ b/pkgs/development/ocaml-modules/num/default.nix
@@ -1,31 +1,31 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }:
 
 stdenv.mkDerivation rec {
-	version = "1.1";
-	name = "ocaml${ocaml.version}-num-${version}";
-	src = fetchFromGitHub {
-		owner = "ocaml";
-		repo = "num";
-		rev = "v${version}";
-		sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
-	};
+  version = "1.1";
+  name = "ocaml${ocaml.version}-num-${version}";
+  src = fetchFromGitHub {
+    owner = "ocaml";
+    repo = "num";
+    rev = "v${version}";
+    sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
+  };
 
-	patches = [ (fetchpatch {
-			url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
-			sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
-		})
-	] ++ lib.optional withStatic ./enable-static.patch;
+  patches = [ (fetchpatch {
+      url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
+      sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
+    })
+  ] ++ lib.optional withStatic ./enable-static.patch;
 
-	nativeBuildInputs = [ ocaml findlib ];
+  nativeBuildInputs = [ ocaml findlib ];
   buildInputs = [ ocaml findlib ];
 
-	createFindlibDestdir = true;
+  createFindlibDestdir = true;
 
 
-	meta = {
-		description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
-		license = lib.licenses.lgpl21;
-		inherit (ocaml.meta) platforms;
-		inherit (src.meta) homepage;
-	};
+  meta = {
+    description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
+    license = lib.licenses.lgpl21;
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
index ae06978dacd..be217812834 100644
--- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
+++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
@@ -5,26 +5,26 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
-	version = "0.4";
-	src = fetchFromGitHub {
-		owner = "OCamlPro";
-		repo = "ocp-ocamlres";
-		rev = "v${version}";
-		sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
-	};
+  name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
+  version = "0.4";
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocp-ocamlres";
+    rev = "v${version}";
+    sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
+  };
 
-	buildInputs = [ ocaml findlib astring pprint ];
-	createFindlibDestdir = true;
+  buildInputs = [ ocaml findlib astring pprint ];
+  createFindlibDestdir = true;
 
-	installFlags = [ "BINDIR=$(out)/bin" ];
-	preInstall = "mkdir -p $out/bin";
+  installFlags = [ "BINDIR=$(out)/bin" ];
+  preInstall = "mkdir -p $out/bin";
 
-	meta = {
-		description = "A simple tool and library to embed files and directories inside OCaml executables";
-		license = lib.licenses.lgpl3Plus;
-		homepage = "https://www.typerex.org/ocp-ocamlres.html";
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "A simple tool and library to embed files and directories inside OCaml executables";
+    license = lib.licenses.lgpl3Plus;
+    homepage = "https://www.typerex.org/ocp-ocamlres.html";
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
index 6a3de6292d8..75554d25bf2 100644
--- a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
@@ -1,22 +1,22 @@
 { lib, buildDunePackage, fetchFromGitHub, uri }:
 
 buildDunePackage rec {
-	pname = "ocplib-json-typed";
-	version = "0.7.1";
-	useDune2 = true;
-	src = fetchFromGitHub {
-		owner = "OCamlPro";
-		repo = "ocplib-json-typed";
-		rev = "v${version}";
-		sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
-	};
+  pname = "ocplib-json-typed";
+  version = "0.7.1";
+  useDune2 = true;
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocplib-json-typed";
+    rev = "v${version}";
+    sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
+  };
 
-	propagatedBuildInputs = [ uri ];
+  propagatedBuildInputs = [ uri ];
 
-	meta = {
-		description = "A collection of type-aware JSON utilities for OCaml";
-		license = lib.licenses.lgpl21;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-	};
+  meta = {
+    description = "A collection of type-aware JSON utilities for OCaml";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix
index 01161214a4f..c71c8f35f4b 100644
--- a/pkgs/development/ocaml-modules/octavius/default.nix
+++ b/pkgs/development/ocaml-modules/octavius/default.nix
@@ -4,21 +4,21 @@ if !lib.versionAtLeast ocaml.version "4.03"
 then throw "octavius is not available for OCaml ${ocaml.version}" else
 
 stdenv.mkDerivation {
-	name = "ocaml${ocaml.version}-octavius-0.2.0";
-	src = fetchurl {
-		url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
-		sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
-	};
+  name = "ocaml${ocaml.version}-octavius-0.2.0";
+  src = fetchurl {
+    url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
+    sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
+  };
 
-	buildInputs = [ ocaml findlib ocamlbuild topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
-	inherit (topkg) buildPhase installPhase;
+  inherit (topkg) buildPhase installPhase;
 
-	meta = {
-		description = "Ocamldoc comment syntax parser";
-		homepage = "https://github.com/ocaml-doc/octavius";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "Ocamldoc comment syntax parser";
+    homepage = "https://github.com/ocaml-doc/octavius";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix
index 2681cc609d0..5db3d1b4a24 100644
--- a/pkgs/development/ocaml-modules/opium/default.nix
+++ b/pkgs/development/ocaml-modules/opium/default.nix
@@ -14,19 +14,19 @@
 }:
 
 buildDunePackage {
-	pname = "opium";
-	inherit (opium_kernel) version src meta minimumOCamlVersion;
+  pname = "opium";
+  inherit (opium_kernel) version src meta minimumOCamlVersion;
 
   useDune2 = true;
 
   doCheck = true;
 
-	buildInputs = [
+  buildInputs = [
     ppx_sexp_conv ppx_fields_conv
     alcotest
   ];
 
-	propagatedBuildInputs = [
+  propagatedBuildInputs = [
     opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext
   ];
 }
diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
index a10a6172605..3d4675ed90b 100644
--- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
@@ -1,22 +1,22 @@
 { lib, fetchFromGitHub, buildDunePackage }:
 
 buildDunePackage rec {
-	pname = "ppx_derivers";
-	version = "1.2.1";
+  pname = "ppx_derivers";
+  version = "1.2.1";
 
   minimumOCamlVersion = "4.02";
 
-	src = fetchFromGitHub {
-		owner = "diml";
-		repo = pname;
-		rev = version;
-		sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
-	};
+  src = fetchFromGitHub {
+    owner = "diml";
+    repo = pname;
+    rev = version;
+    sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
+  };
 
-	meta = {
-		description = "Shared [@@deriving] plugin registry";
-		license = lib.licenses.bsd3;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-	};
+  meta = {
+    description = "Shared [@@deriving] plugin registry";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/pkgs/development/ocaml-modules/ppxfind/default.nix
index 1008dfe62a9..4e135c1b115 100644
--- a/pkgs/development/ocaml-modules/ppxfind/default.nix
+++ b/pkgs/development/ocaml-modules/ppxfind/default.nix
@@ -1,27 +1,27 @@
 { stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }:
 
 buildDunePackage (rec {
-	pname = "ppxfind";
-	version = "1.4";
-	src = fetchurl {
-		url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
-		sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq";
-	};
+  pname = "ppxfind";
+  version = "1.4";
+  src = fetchurl {
+    url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
+    sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq";
+  };
 
-	minimumOCamlVersion = "4.03";
-	useDune2 = true;
+  minimumOCamlVersion = "4.03";
+  useDune2 = true;
 
-	buildInputs = [ ocaml-migrate-parsetree ];
+  buildInputs = [ ocaml-migrate-parsetree ];
 
   # Don't run the native `strip' when cross-compiling.
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
-	meta = {
-		homepage = "https://github.com/diml/ppxfind";
-		description = "ocamlfind ppx tool";
-		license = lib.licenses.bsd3;
-		maintainers = [ lib.maintainers.vbgl ];
-	};
+  meta = {
+    homepage = "https://github.com/diml/ppxfind";
+    description = "ocamlfind ppx tool";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
 } // (
 if lib.versions.majorMinor ocaml.version == "4.04" then {
   dontStrip = true;
diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix
index ac38657f776..04631cc3b4b 100644
--- a/pkgs/development/ocaml-modules/rresult/default.nix
+++ b/pkgs/development/ocaml-modules/rresult/default.nix
@@ -1,24 +1,24 @@
 { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-rresult-${version}";
-	version = "0.6.0";
-	src = fetchurl {
-		url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
-		sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86";
-	};
+  name = "ocaml${ocaml.version}-rresult-${version}";
+  version = "0.6.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
+    sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86";
+  };
 
-	buildInputs = [ ocaml findlib ocamlbuild topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ result ];
 
-	inherit (topkg) buildPhase installPhase;
+  inherit (topkg) buildPhase installPhase;
 
-	meta = {
-		license = lib.licenses.isc;
-		homepage = "https://erratique.ch/software/rresult";
-		description = "Result value combinators for OCaml";
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    license = lib.licenses.isc;
+    homepage = "https://erratique.ch/software/rresult";
+    description = "Result value combinators for OCaml";
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }
diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix
index 896b6e49ac0..ebc5472ce53 100644
--- a/pkgs/development/ocaml-modules/webbrowser/default.nix
+++ b/pkgs/development/ocaml-modules/webbrowser/default.nix
@@ -3,24 +3,24 @@
 }:
 
 stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-webbrowser-${version}";
-	version = "0.6.1";
-	src = fetchurl {
-		url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
-		sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
-	};
+  name = "ocaml${ocaml.version}-webbrowser-${version}";
+  version = "0.6.1";
+  src = fetchurl {
+    url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
+    sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
+  };
 
-	nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
-	buildInputs = [];
-	propagatedBuildInputs = [ astring bos cmdliner rresult ];
+  nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
+  buildInputs = [];
+  propagatedBuildInputs = [ astring bos cmdliner rresult ];
 
-	inherit (topkg) buildPhase installPhase;
+  inherit (topkg) buildPhase installPhase;
 
-	meta = {
-		description = "Open and reload URIs in browsers from OCaml";
-		homepage = "https://erratique.ch/software/webbrowser";
-		license = lib.licenses.isc;
-		maintainers = [ lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
+  meta = {
+    description = "Open and reload URIs in browsers from OCaml";
+    homepage = "https://erratique.ch/software/webbrowser";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
 }

From f8c86948bede080c20326b4f7574318744256ca9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 00:46:19 +0000
Subject: [PATCH 382/956] php73Extensions.maxminddb: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index 9244bcbc109..2533a6ef06d 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -1,7 +1,7 @@
 { buildPecl, lib, pkgs }:
 let
   pname = "maxminddb";
-  version = "1.8.0";
+  version = "1.9.0";
 in
 buildPecl {
   inherit pname version;
@@ -10,7 +10,7 @@ buildPecl {
     owner = "maxmind";
     repo = "MaxMind-DB-Reader-php";
     rev = "v${version}";
-    sha256 = "0cpd8d1xnkxsrf28z25xzgkkf3wc13ia99v8f7hbl7csvnggs7nn";
+    sha256 = "sha256-sNG2FhnxzbHA4Lmzj97al1WFwSU70Mr1R2i5ygF1L6Y=";
   };
 
   buildInputs = [ pkgs.libmaxminddb ];

From d56049ea971628788c7d6834f821ad703443980b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 00:51:29 +0000
Subject: [PATCH 383/956] postgresql11Packages.pgrouting: 3.1.1 -> 3.1.2

---
 pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index c51ef153444..6604b52cfd3 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pgrouting";
-  version = "3.1.1";
+  version = "3.1.2";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ postgresql boost ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner  = "pgRouting";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1wj583c4iipsss75czww176aqa8sncsvcx1i0d6cb41v03iq5acf";
+    sha256 = "sha256-9M8Hug+znihViHC/57aPyc7Zgbeb1H8a/iVCfAG/Am8=";
   };
 
   installPhase = ''

From f2b818cfe038702ff8fe6e2d8d9354ac6475e243 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 00:55:02 +0000
Subject: [PATCH 384/956] php73Extensions.yaml: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix
index edb1b97df24..40e5a859f9e 100644
--- a/pkgs/development/php-packages/yaml/default.nix
+++ b/pkgs/development/php-packages/yaml/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "yaml";
 
-  version = "2.2.0";
-  sha256 = "1d65cf5vnr7brhxmy1pi2axjiyvdhmpcnq0qlx5spwlgkv6hnyml";
+  version = "2.2.1";
+  sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk=";
 
   configureFlags = [ "--with-yaml=${pkgs.libyaml}" ];
 

From a06d514da99d98472e73f033ca2f73cb0eb1d054 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 00:59:29 +0000
Subject: [PATCH 385/956] php73Extensions.igbinary: 3.1.6 -> 3.2.1

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

diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix
index 442311a5281..7a321cc90b4 100644
--- a/pkgs/development/php-packages/igbinary/default.nix
+++ b/pkgs/development/php-packages/igbinary/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "igbinary";
 
-  version = "3.1.6";
-  sha256 = "1spx6581ly2r8pn9b632bi8429sy762v04ramrlnf7469pf8ggxr";
+  version = "3.2.1";
+  sha256 = "sha256-YBYgz/07PlWWIAmcBWm4xCR/Ap7BitwCBr8m+ONXU9s=";
 
   configureFlags = [ "--enable-igbinary" ];
   makeFlags = [ "phpincludedir=$(dev)/include" ];

From 21afdc1355e31a99d386a7f64965e1145bf73c0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 01:12:41 +0000
Subject: [PATCH 386/956] postgresql11Packages.pgroonga: 2.2.7 -> 2.2.8

---
 pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index be284387174..b3d0bd5e2e8 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pgroonga";
-  version = "2.2.7";
+  version = "2.2.8";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j";
+    sha256 = "sha256-YDDO3t6ARbQv72QotjA7DNxOlRo2O5CYzrH+/eEzj3w=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 14eb4dd93f8d53180901947543de6d730cc8f01b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 01:22:41 +0000
Subject: [PATCH 387/956] php73Packages.php-cs-fixer: 2.17.0 -> 2.18.0

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

diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index 76465a77fd4..1ed33e7bb5e 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "php-cs-fixer";
-  version = "2.17.0";
+  version = "2.18.0";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-    sha256 = "163wz5y5ik7g1p7n0v3ckyawqjhg8d18cwx8a5c6fr1fkwb4mb12";
+    sha256 = "sha256-euvk/Rs6fZIJVWprzKiTVNPlGOsCN6t58DzvwYh3wDA=";
   };
 
   phases = [ "installPhase" ];

From 628b9538a43599b25f68b63f0fffb79d77af0ba9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 02:06:01 +0000
Subject: [PATCH 388/956] postgresql11Packages.pg_partman: 4.4.0 -> 4.4.1

---
 pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index d0bc8435c3e..fb690e96328 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_partman";
-  version = "4.4.0";
+  version = "4.4.1";
 
   buildInputs = [ postgresql ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "pgpartman";
     repo   = pname;
     rev    = "refs/tags/v${version}";
-    sha256 = "0wr2nivp0b8vk355rnv4bygiashq98q9zhfgdbxzhm7bgxd01rk2";
+    sha256 = "sha256-jFG2Zna97FHZin2V3Cwy5JcdeFh09Yy/eoyHtcCorPA=";
   };
 
   installPhase = ''

From 4a8c551c8938f02418dae001e5910c90f1d1495b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 11:06:08 +0000
Subject: [PATCH 389/956] neochat: 1.0 -> 1.0.1

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

diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix
index 03e74de7780..bcd6fdc9f3e 100644
--- a/pkgs/applications/networking/instant-messengers/neochat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix
@@ -26,14 +26,14 @@
 
 mkDerivation rec {
   pname = "neochat";
-  version = "1.0";
+  version = "1.0.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9";
+    sha256 = "sha256-xGqGFJHyoZXHLv/n3UGr/KVbgs5Gc9kKKWIuKMr9DtQ=";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];

From fa2e1dd70a3cad3f018c5c29ca9bee429cdea9f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 02:13:04 +0000
Subject: [PATCH 390/956] python37Packages.colorcet: 2.0.2 -> 2.0.6

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

diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index 05304175b71..303d244fff3 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "colorcet";
-  version = "2.0.2";
+  version = "2.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vkx00im4s6zhr2m1j9r0a5vmhkl488b4xpzxb1pidbl19wi6j2i";
+    sha256 = "efa44b6f4078261e62d0039c76aba17ac8d3ebaf0bc2291a111aee3905313433";
   };
 
   propagatedBuildInputs = [

From 932941b79c3dbbef2de9440e1631dfec43956261 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 21 Jan 2021 10:55:55 +1000
Subject: [PATCH 391/956] treewide: editorconfig fixes

- remove trailing whitespace
- use spaces for indentation
---
 .../science/biology/blast/default.nix         |  8 +++---
 .../science/biology/ncbi-tools/default.nix    |  4 +--
 .../science/chemistry/molden/default.nix      |  3 +-
 .../science/electronics/geda/default.nix      |  2 +-
 .../schemas/xml-dtd/xhtml1/default.nix        |  2 +-
 .../compilers/apache-flex-sdk/default.nix     |  4 +--
 pkgs/development/compilers/bigloo/default.nix |  8 +++---
 pkgs/development/compilers/opendylan/bin.nix  |  4 +--
 .../interpreters/angelscript/2.22.nix         |  2 +-
 pkgs/development/libraries/amrnb/default.nix  |  2 +-
 pkgs/development/libraries/snack/default.nix  |  4 +--
 .../libraries/waylandpp/default.nix           |  4 +--
 .../mobile/androidenv/emulator.nix            |  2 +-
 .../development/mobile/xcodeenv/build-app.nix |  4 +--
 .../ocaml-modules/mlgmp/default.nix           |  2 +-
 .../ocaml-modules/mysql/default.nix           |  4 +--
 .../python-modules/pyregion/default.nix       |  4 +--
 .../tools/database/squirrel-sql/default.nix   |  4 +--
 pkgs/development/tools/dtools/default.nix     |  2 +-
 .../tools/gtk-mac-bundler/default.nix         |  2 +-
 pkgs/development/tools/micronaut/default.nix  |  8 +++---
 pkgs/development/tools/misc/gede/default.nix  |  2 +-
 .../tools/ocaml/obelisk/default.nix           | 28 +++++++++----------
 pkgs/development/tools/qtcreator/default.nix  | 12 ++++----
 pkgs/development/tools/vagrant/default.nix    |  2 +-
 pkgs/games/mrrescue/default.nix               |  4 +--
 pkgs/games/sienna/default.nix                 |  2 +-
 pkgs/games/vapor/default.nix                  |  4 +--
 pkgs/misc/emulators/wine/util.nix             |  2 +-
 pkgs/misc/source-and-tags/default.nix         |  6 ++--
 .../networking/guardian-agent/default.nix     |  6 ++--
 pkgs/tools/system/cm-rgb/default.nix          |  2 +-
 32 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix
index a72f16938d4..6fd061f1402 100644
--- a/pkgs/applications/science/biology/blast/default.nix
+++ b/pkgs/applications/science/biology/blast/default.nix
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
   };
 
   sourceRoot = "ncbi-blast-${version}+-src/c++";
-  
-  configureFlags = [ 
+
+  configureFlags = [
     # With flat Makefile we can use all_projects in order not to build extra.
     # These extra cause clang to hang on Darwin.
     "--with-flat-makefile"
-    "--without-makefile-auto-update" 
+    "--without-makefile-auto-update"
     "--with-dll"  # build dynamic libraries (static are default)
     ];
-  
+
   makeFlags = [ "all_projects=app/" ];
 
   preConfigure = ''
diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix
index cc8ebf7f37d..c5220ebc83b 100644
--- a/pkgs/applications/science/biology/ncbi-tools/default.nix
+++ b/pkgs/applications/science/biology/ncbi-tools/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr";
   };
 
-  configureFlags = [ 
+  configureFlags = [
     "--without-debug"
     "--with-bin-release"
     "--with-dll"
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = ''NCBI Bioinformatics toolbox (incl. BLAST)'';
     longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support'';
-    homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/"; 
+    homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/";
     license = "GPL";
     priority = 5;   # zlib.so gives a conflict with zlib
     broken = true;
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index ac3dd513f34..32e8f6ee56e 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
                                   --replace '-I/usr/X11R6/include' "" \
                                   --replace '/usr/local/' $out/ \
                                   --replace 'sudo' "" \
-				                          --replace '-C surf depend' '-C surf'
+                                  --replace '-C surf depend' '-C surf'
      sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
   '';
 
@@ -41,4 +41,3 @@ stdenv.mkDerivation rec {
      maintainers = with maintainers; [ markuskowa ];
   };
 }
-
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix
index 053211f52ad..cf98e6963e1 100644
--- a/pkgs/applications/science/electronics/geda/default.nix
+++ b/pkgs/applications/science/electronics/geda/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   configureFlags = [
-    "--disable-update-xdg-database" 
+    "--disable-update-xdg-database"
   ];
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ guile gtk2 flex gawk perl ];
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
index a000c424906..c698098e6c1 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
       xmlcatalog --noout --create $cat
       grep PUBLIC DTD/*.soc | while read x; do
           eval a=($x)
-          xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat 
+          xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat
       done
     ''; # */
 
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix
index ed6b2b2ff24..337d5a4e26d 100644
--- a/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -38,13 +38,13 @@ in stdenv.mkDerivation rec {
     for i in $out/bin/!(aasdoc|acompc|amxmlc); do
       wrapProgram $i \
         --set FLEX_HOME $t \
-        --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ 
+        --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/
     done
 
     mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/
     cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc
   '';
-  
+
   fixupPhase = ":";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index a3bac2b1722..ced7dd07a22 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
     # Fix absolute paths.
     sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g'			\
         -e 's=/tmp=$TMPDIR=g' -i autoconf/*		\
-	[Mm]akefile*   */[Mm]akefile*   */*/[Mm]akefile*	\
-	*/*/*/[Mm]akefile*   */*/*/*/[Mm]akefile*		\
-	comptime/Cc/cc.scm gc/install-*
+        [Mm]akefile*   */[Mm]akefile*   */*/[Mm]akefile*	\
+        */*/*/[Mm]akefile*   */*/*/*/[Mm]akefile*		\
+        comptime/Cc/cc.scm gc/install-*
 
     # Make sure we don't change string lengths in the generated
     # C files.
     sed -e 's=/bin/rm=     rm=g' -e 's=/bin/mv=     mv=g'	\
-	-i comptime/Cc/cc.c
+        -i comptime/Cc/cc.c
   '';
 
   checkTarget = "test";
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index dbe7e44b1d7..7636b251e62 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
     tar --strip-components=1 -xjf "$src" -C "$out"
 
     interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
-    for a in "$out"/bin/*; do 
+    for a in "$out"/bin/*; do
       patchelf --set-interpreter "$interpreter" "$a"
       patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
-    for a in "$out"/lib/*.so; do 
+    for a in "$out"/lib/*.so; do
       patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
     sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam
diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix
index 0449572da02..15e7f4dd5c1 100644
--- a/pkgs/development/interpreters/angelscript/2.22.nix
+++ b/pkgs/development/interpreters/angelscript/2.22.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd angelscript/projects/gnuc
     sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
-    export SHARED=1 
+    export SHARED=1
     export VERSION="${s.version}"
     mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
   '';
diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix
index aaee86c62ef..4e8aab263eb 100644
--- a/pkgs/development/libraries/amrnb/default.nix
+++ b/pkgs/development/libraries/amrnb/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
 
   postConfigure = ''
-    cp $srcAmr 26104-b00.zip 
+    cp $srcAmr 26104-b00.zip
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 2297fd07eb1..e9af9f6d537 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -23,10 +23,10 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out
-    make install DESTDIR="$out" 
+    make install DESTDIR="$out"
   '';
 
-  meta = { 
+  meta = {
     description = "The Snack Sound Toolkit (Tcl)";
     homepage = "http://www.speech.kth.se/snack/";
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix
index 923329ab3fd..d528d51ed79 100644
--- a/pkgs/development/libraries/waylandpp/default.nix
+++ b/pkgs/development/libraries/waylandpp/default.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
     sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq";
   };
 
-  cmakeFlags = [ 
-    "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" 
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}"
   ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
   ];
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index 5840598d1c3..e08078ea672 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -38,7 +38,7 @@ deployAndroidPackage {
 
     # Wrap emulator so that it can load required libraries at runtime
     wrapProgram $out/libexec/android-sdk/emulator/emulator \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ 
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
         pkgs.dbus
         pkgs.systemd
       ]} \
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index fa108c8e470..adf64f9561c 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation ({
     # Be sure that the Xcode wrapper has priority over everything else.
     # When using buildInputs this does not seem to be the case.
     export PATH=${xcodewrapper}/bin:$PATH
-    
+
     ${stdenv.lib.optionalString release ''
       export HOME=/Users/$(whoami)
       keychainName="$(basename $out)"
@@ -69,7 +69,7 @@ stdenv.mkDerivation ({
       security unlock-keychain -p "" $keychainName
 
       # Import the certificate into the keychain
-      security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A 
+      security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A
 
       # Grant the codesign utility permissions to read from the keychain
       security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix
index d2aeb1a37b8..ffd78150689 100644
--- a/pkgs/development/ocaml-modules/mlgmp/default.nix
+++ b/pkgs/development/ocaml-modules/mlgmp/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "3ce1a53fa452ff5a9ba618864d3bc46ef32190b57202d1e996ca7df837ad4f24";
   };
 
-  makeFlags = [ 
+  makeFlags = [
     "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp"
   ];
 
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 29720ce1148..6ccdfa9cf81 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2";
   };
 
-  configureFlags = [ 
-     "--prefix=$out" 
+  configureFlags = [
+     "--prefix=$out"
      "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql"
   ];
 
diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix
index b1868e7edde..86a5ef6bfe0 100644
--- a/pkgs/development/python-modules/pyregion/default.nix
+++ b/pkgs/development/python-modules/pyregion/default.nix
@@ -33,8 +33,8 @@ buildPythonPackage rec {
       name = "conftest-astropy-3-fix.patch";
       url = "https://github.com/astropy/pyregion/pull/136.patch";
       sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m";
-	  })
-	];
+    })
+  ];
 
   nativeBuildInputs = [ astropy-helpers ];
 
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index 924a82bfd85..c773db7509f 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/share/squirrel-sql
     cp -r . $out/share/squirrel-sql
 
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
     ln -s $out/share/squirrel-sql/icons/acorn.png \
       $out/share/icons/hicolor/32x32/apps/squirrel-sql.png
     ln -s ${desktopItem}/share/applications $out/share
-    
+
     runHook postInstall
   '';
 
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index 5efa579ec5a..fabd2b2f775 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
       $makeCmd INSTALL_DIR=$out install
-	'';
+  '';
 
   meta = with stdenv.lib; {
     description = "Ancillary tools for the D programming language compiler";
diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix
index df21f414ecb..c4ac76f4612 100644
--- a/pkgs/development/tools/gtk-mac-bundler/default.nix
+++ b/pkgs/development/tools/gtk-mac-bundler/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-  	mkdir -p $out/bin
+    mkdir -p $out/bin
     substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
       --subst-var-by PATH $out/share
     chmod a+x $out/bin/gtk-mac-bundler
diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix
index ddf9d84f3bf..1139215fbf8 100644
--- a/pkgs/development/tools/micronaut/default.nix
+++ b/pkgs/development/tools/micronaut/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     rm bin/mn.bat
     cp -r . $out
     wrapProgram $out/bin/mn \
-      --prefix JAVA_HOME : ${jdk} 
+      --prefix JAVA_HOME : ${jdk}
     installShellCompletion --bash --name mn.bash bin/mn_completion
     runHook postInstall
   '';
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Micronaut is a modern, JVM-based, full stack microservices framework
       designed for building modular, easily testable microservice applications.
-      Reflection-based IoC frameworks load and cache reflection data for 
-      every single field, method, and constructor in your code, whereas with 
-      Micronaut, your application startup time and memory consumption are 
+      Reflection-based IoC frameworks load and cache reflection data for
+      every single field, method, and constructor in your code, whereas with
+      Micronaut, your application startup time and memory consumption are
       not bound to the size of your codebase.
     '';
     homepage = "https://micronaut.io/";
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index b27c3a515bb..39954b458b4 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   installPhase = ''
     python build.py install --verbose --prefix="$out"
     wrapProgram $out/bin/gede \
-      --prefix PATH : ${lib.makeBinPath [ ctags gdb ]} 
+      --prefix PATH : ${lib.makeBinPath [ ctags gdb ]}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 483e9c45df0..d5e9d33d5db 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -1,20 +1,20 @@
 { lib, fetchurl, ocamlPackages }:
 
 ocamlPackages.buildDunePackage rec {
-	pname = "obelisk";
-	version = "0.5.2";
-	useDune2 = true;
-	src = fetchurl {
-		url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
-		sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
-	};
+  pname = "obelisk";
+  version = "0.5.2";
+  useDune2 = true;
+  src = fetchurl {
+    url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
+    sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
+  };
 
-	buildInputs = with ocamlPackages; [ menhir re ];
+  buildInputs = with ocamlPackages; [ menhir re ];
 
-	meta = {
-		description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
-		license = lib.licenses.mit;
-		maintainers = [ lib.maintainers.vbgl ];
-		homepage = "https://github.com/Lelio-Brun/Obelisk";
-	};
+  meta = {
+    description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/Lelio-Brun/Obelisk";
+  };
 }
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index a750a21c1b4..40e3e42d84c 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, lib, fetchurl, fetchgit, fetchpatch
 , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
-, withDocumentation ? false, withClangPlugins ? true 
+, withDocumentation ? false, withClangPlugins ? true
 }:
 
 with lib;
@@ -28,9 +28,9 @@ mkDerivation rec {
     sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg";
   };
 
-  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ 
-    optionals withClangPlugins [ llvmPackages_8.libclang 
-                                 clang_qt_vendor 
+  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
+    optionals withClangPlugins [ llvmPackages_8.libclang
+                                 clang_qt_vendor
                                  llvmPackages_8.llvm ];
 
   nativeBuildInputs = [ qmake ];
@@ -38,7 +38,7 @@ mkDerivation rec {
   # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to
   # find clang libc++ library include paths. By default it's not covering paths
   # like libc++-version, which is default name for libc++ folder in nixos.
-  # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not 
+  # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not
   # remove system clang include paths.
   patches = [ ./0001-Fix-clang-libcpp-regexp.patch
               ./0002-Dont-remove-clang-header-paths.patch ];
@@ -53,7 +53,7 @@ mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace src/plugins/plugins.pro \
-      --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' 
+      --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
     '' + optionalString withClangPlugins ''
     # Fix paths for llvm/clang includes directories.
     substituteInPlace src/shared/clang/clang_defines.pri \
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index b3f1bf1a5b8..701b973ad4f 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -34,7 +34,7 @@ let
       for gem in "$out"/lib/ruby/gems/*/gems/*; do
         cp -a "$gem/" "$gem.new"
         rm "$gem"
-        # needed on macOS, otherwise the mv yields permission denied 
+        # needed on macOS, otherwise the mv yields permission denied
         chmod +w "$gem.new"
         mv "$gem.new" "$gem"
       done
diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix
index d3caa986b85..c5b2b7d20eb 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/pkgs/games/mrrescue/default.nix
@@ -13,13 +13,13 @@ let
     name = "mrrescue";
     exec = pname;
     icon = icon;
-    comment = "Arcade-style fire fighting game"; 
+    comment = "Arcade-style fire fighting game";
     desktopName = "Mr. Rescue";
     genericName = "mrrescue";
     categories = "Game;";
   };
 
-in 
+in
 
 stdenv.mkDerivation {
   name = "${pname}-${version}";
diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
index 0a38723368e..1a1e82b7d64 100644
--- a/pkgs/games/sienna/default.nix
+++ b/pkgs/games/sienna/default.nix
@@ -13,7 +13,7 @@ let
     name = "sienna";
     exec = pname;
     icon = icon;
-    comment = "Fast-paced one button platformer"; 
+    comment = "Fast-paced one button platformer";
     desktopName = "Sienna";
     genericName = "sienna";
     categories = "Game;";
diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix
index e79c49779af..71028065263 100644
--- a/pkgs/games/vapor/default.nix
+++ b/pkgs/games/vapor/default.nix
@@ -14,13 +14,13 @@ let
     name = "Vapor";
     exec = pname;
     icon = icon;
-    comment = "LÖVE Distribution Client"; 
+    comment = "LÖVE Distribution Client";
     desktopName = "Vapor";
     genericName = "vapor";
     categories = "Game;";
   };
 
-in 
+in
 
 stdenv.mkDerivation {
   name = "${pname}-${version}";
diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/misc/emulators/wine/util.nix
index b90a68e72df..cd5bd03130b 100644
--- a/pkgs/misc/emulators/wine/util.nix
+++ b/pkgs/misc/emulators/wine/util.nix
@@ -3,7 +3,7 @@ rec {
   toPackages = pkgNames: pkgs:
     map (pn: lib.getAttr pn pkgs) pkgNames;
   toBuildInputs = pkgArches: archPkgs:
-    lib.concatLists (map archPkgs pkgArches);  
+    lib.concatLists (map archPkgs pkgArches);
   mkBuildInputs = pkgArches: pkgNames:
     toBuildInputs pkgArches (toPackages pkgNames);
 }
diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix
index 7c082cbbbb0..c82b96b82f9 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, glibcLocales, unzip, hasktags, ctags } : {
   # optional srcDir
-  annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags 
+  annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags
                                       || x ? meta && x.meta ? sourceWithTags );
   # hack because passthru doesn't work the way I'd expect. Don't have time to spend on this right now
   # that's why I'm abusing meta for the same purpose in ghcsAndLibs
@@ -10,7 +10,7 @@
 
   # createTagFiles =  [ { name  = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ]
   # tag command must create file named $TAG_FILE
-  sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :  
+  sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :
     stdenv.mkDerivation {
     phases = "unpackPhase buildPhase";
     inherit src srcDir tagSuffix;
@@ -72,7 +72,7 @@
 
 
   addCTaggingInfo = deriv :
-    deriv // { 
+    deriv // {
       passthru = {
         sourceWithTags = {
          inherit (deriv) src;
diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix
index a736aa4df18..57080d223fa 100644
--- a/pkgs/tools/networking/guardian-agent/default.nix
+++ b/pkgs/tools/networking/guardian-agent/default.nix
@@ -30,9 +30,9 @@ buildGoPackage rec {
   '';
 
   postFixup = ''
-		wrapProgram $out/bin/sga-guard \
-			--prefix PATH : "$out/bin" \
-			--prefix PATH : "${autossh}/bin"
+    wrapProgram $out/bin/sga-guard \
+      --prefix PATH : "$out/bin" \
+      --prefix PATH : "${autossh}/bin"
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix
index a50fa60197a..9c75fe78c99 100644
--- a/pkgs/tools/system/cm-rgb/default.nix
+++ b/pkgs/tools/system/cm-rgb/default.nix
@@ -38,7 +38,7 @@ buildPythonApplication rec {
 
   postInstall = ''
     # Remove this line when/if this PR gets merged:
-    # https://github.com/gfduszynski/cm-rgb/pull/43 
+    # https://github.com/gfduszynski/cm-rgb/pull/43
     install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui
 
     mkdir -p $out/etc/udev/rules.d

From 2f54cd04c2ac3c85a9b17c74c77eec3c0f6b7978 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 01:13:56 +0000
Subject: [PATCH 392/956] libquotient: 0.6.3 -> 0.6.4

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

diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index 84d7c51fd59..10b2451e7c8 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "libquotient";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "libQuotient";
     rev = version;
-    sha256 = "sha256-RYEcFClRdAippG0kspNi9QZIzZAuU4++9LOQTZcqpVc=";
+    sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ=";
   };
 
   buildInputs = [ qtbase qtmultimedia ];

From 9f07e60af20c34151fe53d4ec2cacc40c4783472 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 20 Jan 2021 22:41:24 -0500
Subject: [PATCH 393/956] rclone: 1.53.3 -> 1.53.4 (#110271)

https://forum.rclone.org/t/rclone-1-53-4-release/21792
---
 pkgs/applications/networking/sync/rclone/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 7057e5cc2c5..ef130d00329 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.53.3";
+  version = "1.53.4";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "10nimrq8nmpmfk2d4fx0yp916wk5q027m283izpshrbwvx7l6xx0";
+    sha256 = "1w6dsf8hw0wap4090ixl01p64yn53xidfdbpy6rc3xaifypj185d";
   };
 
   vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88";
@@ -39,6 +39,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Command line program to sync files and directories to and from major cloud storage";
     homepage = "https://rclone.org";
+    changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
     license = licenses.mit;
     maintainers = with maintainers; [ danielfullmer marsam ];
   };

From ad14668f2a98bb12f95a9560f4448a213babf00c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:20:00 +0000
Subject: [PATCH 394/956] buildNodePackage: by default use Node.js' platforms

---
 pkgs/development/node-packages/node-env.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 04e3ee097fa..f65cb65cf8d 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -388,10 +388,11 @@ let
     , dontStrip ? true
     , unpackPhase ? "true"
     , buildPhase ? "true"
+    , meta ? {}
     , ... }@args:
 
     let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
     in
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
@@ -443,6 +444,11 @@ let
         # Run post install hook, if provided
         runHook postInstall
       '';
+
+      meta = {
+        # default to Node.js' platforms
+        platforms = nodejs.meta.platforms;
+      } // meta;
     } // extraArgs);
 
   # Builds a development shell

From 7908a0762b590c2e128dd4082710518810d0646d Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 20 Jan 2021 23:23:23 -0500
Subject: [PATCH 395/956] waybar: 0.9.4 -> 0.9.5

---
 pkgs/applications/misc/waybar/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index c1616c739c9..8dd18de5d89 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -3,6 +3,7 @@
 , howard-hinnant-date, cmake
 , traySupport  ? true,  libdbusmenu-gtk3
 , pulseSupport ? true,  libpulseaudio
+, sndioSupport ? true,  sndio
 , nlSupport    ? true,  libnl
 , udevSupport  ? true,  udev
 , swaySupport  ? true,  sway
@@ -11,13 +12,13 @@
 }:
   stdenv.mkDerivation rec {
     pname = "waybar";
-    version = "0.9.4";
+    version = "0.9.5";
 
     src = fetchFromGitHub {
       owner = "Alexays";
       repo = "Waybar";
       rev = version;
-      sha256 = "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy";
+      sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q";
     };
 
     nativeBuildInputs = [
@@ -35,6 +36,7 @@
       [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
       ++ optional  traySupport  libdbusmenu-gtk3
       ++ optional  pulseSupport libpulseaudio
+      ++ optional  sndioSupport sndio
       ++ optional  nlSupport    libnl
       ++ optional  udevSupport  udev
       ++ optional  swaySupport  sway
@@ -45,6 +47,7 @@
       {
         dbusmenu-gtk = traySupport;
         pulseaudio = pulseSupport;
+        sndio = sndioSupport;
         libnl = nlSupport;
         libudev = udevSupport;
         mpd = mpdSupport;

From 17783d11769a2d93fd16ec0cc558575ebd4aa393 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 20 Jan 2021 23:50:25 -0500
Subject: [PATCH 396/956] ell: 0.35 -> 0.36

---
 ...t-dbus-pick-up-dbus-daemon-from-PATH.patch | 84 -------------------
 pkgs/os-specific/linux/ell/default.nix        |  9 +-
 2 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch

diff --git a/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch b/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
deleted file mode 100644
index c2d844edecd..00000000000
--- a/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001
-From: Florian Klink <flokli@flokli.de>
-Date: Sun, 27 Dec 2020 13:03:12 +0100
-Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH
-
-This allows running the unit tests in environments where `dbus-daemon`
-isn't in /usr/bin, but in $PATH.
-
-Signed-off-by: Florian Klink <flokli@flokli.de>
----
- unit/test-dbus-message-fds.c | 4 ++--
- unit/test-dbus-properties.c  | 4 ++--
- unit/test-dbus.c             | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c
-index 6f68bae..4b5662e 100644
---- a/unit/test-dbus-message-fds.c
-+++ b/unit/test-dbus-message-fds.c
-@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void)
- 	char *prg_envp[1];
- 	pid_t pid;
- 
--	prg_argv[0] = "/usr/bin/dbus-daemon";
-+	prg_argv[0] = "dbus-daemon";
- 	prg_argv[1] = "--nopidfile";
- 	prg_argv[2] = "--nofork";
- 	prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
-@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void)
- 	}
- 
- 	if (pid == 0) {
--		execve(prg_argv[0], prg_argv, prg_envp);
-+		execvpe(prg_argv[0], prg_argv, prg_envp);
- 		exit(EXIT_SUCCESS);
- 	}
- 
-diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c
-index b435062..049f0f4 100644
---- a/unit/test-dbus-properties.c
-+++ b/unit/test-dbus-properties.c
-@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void)
- 	char *prg_envp[1];
- 	pid_t pid;
- 
--	prg_argv[0] = "/usr/bin/dbus-daemon";
-+	prg_argv[0] = "dbus-daemon";
- 	prg_argv[1] = "--nopidfile";
- 	prg_argv[2] = "--nofork";
- 	prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
-@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void)
- 	}
- 
- 	if (pid == 0) {
--		execve(prg_argv[0], prg_argv, prg_envp);
-+		execvpe(prg_argv[0], prg_argv, prg_envp);
- 		exit(EXIT_SUCCESS);
- 	}
- 
-diff --git a/unit/test-dbus.c b/unit/test-dbus.c
-index 67f0a7b..582847e 100644
---- a/unit/test-dbus.c
-+++ b/unit/test-dbus.c
-@@ -45,7 +45,7 @@ static void start_dbus_daemon(void)
- 	char *prg_envp[1];
- 	pid_t pid;
- 
--	prg_argv[0] = "/usr/bin/dbus-daemon";
-+	prg_argv[0] = "dbus-daemon";
- 	prg_argv[1] = "--nopidfile";
- 	prg_argv[2] = "--nofork";
- 	prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
-@@ -62,7 +62,7 @@ static void start_dbus_daemon(void)
- 	}
- 
- 	if (pid == 0) {
--		execve(prg_argv[0], prg_argv, prg_envp);
-+		execvpe(prg_argv[0], prg_argv, prg_envp);
- 		exit(EXIT_SUCCESS);
- 	}
- 
--- 
-2.29.2
-
diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index 8c15ce825c0..ced77f3fcc9 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,21 +7,16 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.35";
+  version = "0.36";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
     rev = version;
-    sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk";
+    sha256 = "0w7v2hihwwmnqd56bsmbjsiw8yyadr7zbdssjamqxx0pyl3dnrda";
   };
 
-  patches = [
-    # Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/
-    ./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
-  ];
-
   nativeBuildInputs = [
     pkg-config
     autoreconfHook

From a98faf18fdf902cd898f7f7725232f9b04c601be Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 20 Jan 2021 23:50:51 -0500
Subject: [PATCH 397/956] iwd: 1.10 -> 1.11

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

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index f1aa85cdd3f..11886e8e9c6 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     rev = version;
-    sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2";
+    sha256 = "0wnyg0f1swi7gvvgf5kzbiz44g2wscf5d5bp320iwyfwnlbqb1bn";
   };
 
   outputs = [ "out" "man" ]

From 8ceb3532025356ebb39422b7caa6b9ebd4677934 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 07:16:18 +0000
Subject: [PATCH 398/956] python37Packages.mergedeep: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix
index 13aadbc9952..bcbca347548 100644
--- a/pkgs/development/python-modules/mergedeep/default.nix
+++ b/pkgs/development/python-modules/mergedeep/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "mergedeep";
-  version = "1.3.0";
+  version = "1.3.1";
   disabled = isPy27;
 
   # PyPI tarball doesn't include tests directory
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "clarketm";
     repo = "mergedeep";
     rev = "v${version}";
-    sha256 = "1a0y26a04limiggjwqyyqpryxiylbqya74nq1bij75zhz42sa02b";
+    sha256 = "1ryccb64hg438y1wsjlfp4ciq05q4c6khwhllwdnndm8cbkbrgph";
   };
 
   checkInputs = [ pytest ];

From 3b0495ad34c18b42cfa71f5cb617b726a2ad4ce8 Mon Sep 17 00:00:00 2001
From: mingmingrr <mingmingrr@gmail.com>
Date: Thu, 21 Jan 2021 02:17:49 -0500
Subject: [PATCH 399/956] pythonPackages.hydrus: 420 -> 426

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

diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 69fdb9e2e11..95b96bcff1b 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -10,14 +10,14 @@
 
 pythonPackages.buildPythonPackage {
   pname = "hydrus";
-  version = "420";
+  version = "426";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
-    rev = "067c4862a0ed8dd9264b464c69975b520139809f";
-    sha256 = "12x0rv2yxsczdaxvpb5ggf4jwzjd1vd7ml0r61s4342zwvjrhji9";
+    rev = "1acdc258e5bb2ae22f5eafaf3dac8d9265dba5e2";
+    sha256 = "1snihd433hx36s6d5hsnq4qg0xs6ag4822lwm5fqak64n22ad2qb";
   };
 
   nativeBuildInputs = [

From c5ddb07e28eeadaf9469d114d0e04265ae9b9b37 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Wed, 20 Jan 2021 23:25:33 -0800
Subject: [PATCH 400/956] =?UTF-8?q?ocamlPackages.ppx=5Ftools:=206.2=20?=
 =?UTF-8?q?=E2=86=92=206.3=20(add=204.12=20support)=20(#110009)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ppx_tools/default.nix       | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 94d7eb714dd..3e06af881c5 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -1,9 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }:
+{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:
 
 let param =
-  let v6_2 = {
-    version = "6.2";
-    sha256 = "0qf4fwnn4hhk52kjw9frv21v23azqnn4mjvwf1hs0nxf7q4kacb5";
+  let v6_3 = {
+    version = "6.3";
+    sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6";
+    useDune2 = lib.versionAtLeast ocaml.version "4.12";
+    buildInputs = [cppo];
   }; in
 {
   "4.02" = {
@@ -25,10 +27,11 @@ let param =
   "4.07" = {
     version = "5.1+4.06.0";
     sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
-  "4.08" = v6_2;
-  "4.09" = v6_2;
-  "4.10" = v6_2;
-  "4.11" = v6_2;
+  "4.08" = v6_3;
+  "4.09" = v6_3;
+  "4.10" = v6_3;
+  "4.11" = v6_3;
+  "4.12" = v6_3;
 }.${ocaml.meta.branch};
 in
 
@@ -50,7 +53,7 @@ if lib.versionAtLeast param.version "6.0"
 then
   buildDunePackage {
     inherit pname src meta;
-    inherit (param) version;
+    inherit (param) version useDune2 buildInputs;
   }
 else
   stdenv.mkDerivation {

From a17adff3e96cf6af3a0a4ec189c42f3c5ede6d42 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 07:50:25 +0000
Subject: [PATCH 401/956] docker-compose: 1.27.4 -> 1.28.0

---
 pkgs/applications/virtualization/docker-compose/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index 464771b2c14..3dabcf57daf 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -8,12 +8,12 @@
 }:
 
 buildPythonApplication rec {
-  version = "1.27.4";
+  version = "1.28.0";
   pname = "docker-compose";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5a5690f24c27d4b43dcbe6b3fae91ba680713208e99ee863352b3bae37bcaa83";
+    sha256 = "947888fe9377b48c260d59b6511ba205655c6beb45a4b70fbce28f753aacf75a";
   };
 
   # lots of networking and other fails

From c3f5fb04db9412bcc673608ca8814e8ca564e490 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 04:34:49 +0000
Subject: [PATCH 402/956] python37Packages.elementpath: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 27040526312..bbab0bfe6e4 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
 
 buildPythonPackage rec {
-  version = "2.1.0";
+  version = "2.1.1";
   pname = "elementpath";
   disabled = isPy27; # uses incompatible class syntax
 
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "v${version}";
-    sha256 = "17a0gcwmv87kikirgkgr305f5c7wz34hf7djssx4xbk9lfq9m2lg";
+    sha256 = "1h910v8f0648nqnk40bxgdim3623m07yg4xdfwcips2h55d19rk2";
   };
 
   # avoid circular dependency with xmlschema which directly depends on this

From ebc9b86f80001d537d1fcf21c30131501716ce77 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 05:19:48 +0000
Subject: [PATCH 403/956] python37Packages.django_treebeard: 4.3.1 -> 4.4

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

diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix
index fd8789d1fb8..e734a5f7ae8 100644
--- a/pkgs/development/python-modules/django_treebeard/default.nix
+++ b/pkgs/development/python-modules/django_treebeard/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "django-treebeard";
-  version = "4.3.1";
+  version = "4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "83aebc34a9f06de7daaec330d858d1c47887e81be3da77e3541fe7368196dd8a";
+    sha256 = "f50e4eea146f7af6702decf7ef198ac1eee1fb9bb4af2c5dba276c3c48f76623";
   };
 
   buildInputs = [ pytest ];

From b389b777e1a3980e573aeeb46135a91cb954705b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 04:20:20 +0000
Subject: [PATCH 404/956] python37Packages.cliff: 3.5.0 -> 3.6.0

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

diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix
index 1c551bfb0d9..33a129d287e 100644
--- a/pkgs/development/python-modules/cliff/default.nix
+++ b/pkgs/development/python-modules/cliff/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "cliff";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5bfb684b5fcdff0afaaccd1298a376c0e62e644c46b7e9abc034595b41fe1759";
+    sha256 = "a3f4fa67eeafbcfa7cf9fe4b1755d410876528e1d0d115740db00b50a1250272";
   };
 
   propagatedBuildInputs = [

From 30ab92ea31f6b7e9095b1e7e4b56a5000823efdf Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 21 Jan 2021 08:16:03 +1000
Subject: [PATCH 405/956] conmon: 2.0.24 -> 2.0.25

https://github.com/containers/conmon/releases/tag/v2.0.25
---
 pkgs/applications/virtualization/conmon/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 6afcfcff8c1..cef69cb0c6c 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , pkg-config
 , glib
@@ -9,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "conmon";
-  version = "2.0.24";
+  version = "2.0.25";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1z6z1bz2rgj15xbqx10kvwn8s64nx5hmn1x52k4z4r20p4f95hkg";
+    sha256 = "sha256-u22irZ9AC1W2AVJ1OD1gLzTH4NOgRkZekZ78rNKXnps=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From cd424d34536376fd1cf39a5d7424ce362b34f7e7 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 03:54:47 -0500
Subject: [PATCH 406/956] shotwell: 0.31.2 -> 0.31.3

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 103a6ec3b6b..bd9ad301d34 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -32,6 +32,7 @@
 , itstool
 , libgdata
 , libchamplain
+, libsecret
 , gsettings-desktop-schemas
 , python3
 }:
@@ -40,11 +41,11 @@
 
 stdenv.mkDerivation rec {
   pname = "shotwell";
-  version = "0.31.2";
+  version = "0.31.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l";
+    sha256 = "1wkahbnnfxmi1jc5zmm3h761nrnkdks8lk0rj38bfkwg90h6zqwd";
   };
 
   nativeBuildInputs = [
@@ -86,6 +87,7 @@ stdenv.mkDerivation rec {
     gnome3.adwaita-icon-theme
     libgdata
     libchamplain
+    libsecret
   ];
 
   postPatch = ''

From f4bb171ca795ae4af30452c0cef8ff73d5219b66 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 04:03:48 -0500
Subject: [PATCH 407/956] scrcpy: 1.16 -> 1.17

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

diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index 619997c01dd..50383fd005d 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -10,10 +10,10 @@
 }:
 
 let
-  version = "1.16";
+  version = "1.17";
   prebuilt_server = fetchurl {
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-    sha256 = "sha256-lKeeBbRJjQRgq3vZ0Sy/BRVuOke/DF0UIM7h1Ek7ODI=";
+    sha256 = "sha256-EbWtLRvJuXMPtyVKeO/XGo/0axk4/0aOR6IbZTobZyU=";
   };
 in
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-koQY59VrfE28h2qt0TiPGypBLQTvvT0hoOrVIEznIP4=";
+    sha256 = "sha256-xCzrbWhMve0bJerFNHiUdSzp5O1pSaKRkcJSs/0nHpk=";
   };
 
   # postPatch:

From f315259280b7e6df1a9c601f3158ab782a3bd064 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Thu, 21 Jan 2021 10:24:13 +0100
Subject: [PATCH 408/956] perl: remove obsolete parallel building patch

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 6b7d1d4d99c..c39af361eaf 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -39,12 +39,6 @@ let
         (if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch
          else ./no-sys-dirs-5.31.patch)
       ]
-      ++ optional (versionOlder version "5.29.6")
-        # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360
-        (fetchurl {
-          url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch";
-          sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0";
-        })
       ++ optional stdenv.isSunOS ./ld-shared.patch
       ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
       ++ optional crossCompiling ./MakeMaker-cross.patch;

From aa5405764ba91ebd6aa902ab32be5f29ffd0a502 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 04:28:45 -0500
Subject: [PATCH 409/956] feh: 3.6.1 -> 3.6.2

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index e1a488a4c27..739b6ae5d1b 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -7,11 +7,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "feh";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
-    sha256 = "1a0ygdpyvpcsr0hdi9ai7ycbkgvacq8dpd8cacbppsds5k2xw7lv";
+    sha256 = "0d66qz9h37pk8h10bc918hbv3j364vyni934rlw2j951s5wznj8n";
   };
 
   outputs = [ "out" "man" "doc" ];

From 88e9df7b8d51b88d28093821a1d8d148cb309dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 21 Jan 2021 10:32:37 +0100
Subject: [PATCH 410/956] libiscsi: work around i686-linux build problems

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

diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix
index 2f7e3c410dd..246696c94eb 100644
--- a/pkgs/development/libraries/libiscsi/default.nix
+++ b/pkgs/development/libraries/libiscsi/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  # This problem is gone on libiscsi master.
+  NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null;
+
   meta = with stdenv.lib; {
     description = "iscsi client library and utilities";
     homepage = "https://github.com/sahlberg/libiscsi";

From 7d3c52356fd063ae1efb91ff6282054410ed88c3 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 04:56:01 -0500
Subject: [PATCH 411/956] broot: 1.1.10 -> 1.2.0

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

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index bdb1fe37586..a3299b42744 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.1.10";
+  version = "1.2.0";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "04nidx43w4nnccgbrw30wg9ai8p7hbklxpn1gc6gr2325yhqvwhl";
+    sha256 = "1mqaynrqaas82f5957lx31x80v74zwmwmjxxlbywajb61vh00d38";
   };
 
-  cargoHash = "sha256-4F9HIQ1BQx4EikyH0DwlDAkYIeUJJbMsj7ZX23QD+K8=";
+  cargoHash = "sha256-ffFS1myFjoQ6768D4zUytN6F9paWeJJFPFugCrfh4iU=";
 
   nativeBuildInputs = [
     makeWrapper

From 4c7ffbccf063b8d872372807bc7e0369f3ece0d3 Mon Sep 17 00:00:00 2001
From: Max Wittig <max.wittig@siemens.com>
Date: Thu, 21 Jan 2021 11:07:03 +0100
Subject: [PATCH 412/956] gitlab-runner: 13.7.0 -> 13.8.0 (#110280)

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

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 3d127591bd0..20cb953edea 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "13.7.0";
+  version = "13.8.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "0hbzvw6bdy31yqnri7379gpm8n5nv6ayr1idg02c9zqgcsgm34jf";
+    sha256 = "15pf6mxma8gkzyxkzm1rjwa514p7gzabn3c474lcvsjpmp76wv68";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "036drxlkmm35mdl0f5k79hnmwvf8gadgsxx71jprn1fjjzk3cxmz";
+    sha256 = "1c4lpy7nc62rqk8bfwiy5pcgvcwx70qkz3lv9w512fr3n5hjd4c0";
   };
 in
 buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0v2wcalvs7gsbi33jm35k01cqv2iqz3k3yfjjw08dssg358d0vfp";
+    sha256 = "0v0iqpllzaabkahlc5pidzzw0bjlli984pdna3f3bbg67lm5a421";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 59db3cdf1ea41a198a8ec5ca78cc11653da187b3 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 21 Jan 2021 11:10:41 +0100
Subject: [PATCH 413/956] clightning: 0.9.2 -> 0.9.3

---
 pkgs/applications/blockchains/clightning.nix | 54 ++++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index ef351d0843f..fa4d8b8d4da 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -1,28 +1,34 @@
-{ lib, stdenv, python3, pkg-config, which, libtool, autoconf, automake,
-  autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }:
-
-with lib;
+{ lib
+, stdenv
+, fetchurl
+, autoconf
+, automake
+, autogen
+, gettext
+, libtool
+, pkg-config
+, unzip
+, which
+, gmp
+, python3
+, sqlite
+, zlib
+}:
+let
+  py3 = python3.withPackages (p: [ p.Mako ]);
+in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    sha256 = "022fw6rbn0chg0432h9q05w8qnys0hd9hf1qm2qlnnmamxw4dyfy";
+    sha256 = "b4563921ed8bccd59d32b031f81825dc57fbe90882f0ecd5da89e48b59ff18b2";
   };
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ];
 
-  nativeBuildInputs = [ autoconf autogen automake libtool pkg-config which unzip gettext ];
-  buildInputs =
-    let py3 = python3.withPackages (p: [ p.Mako ]);
-    in [ sqlite gmp zlib py3 ];
-
-  makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
-
-  configurePhase = ''
-    ./configure --prefix=$out --disable-developer --disable-valgrind
-  '';
+  buildInputs = [ gmp sqlite zlib ];
 
   postPatch = ''
     patchShebangs \
@@ -32,18 +38,24 @@ stdenv.mkDerivation rec {
       devtools/sql-rewrite.py
   '';
 
-  doCheck = false;
+  configurePhase = ''
+    ./configure --prefix=$out --disable-developer --disable-valgrind
+  '';
 
-  meta = {
+  makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
     description = "A Bitcoin Lightning Network implementation in C";
-    longDescription= ''
+    longDescription = ''
       c-lightning is a standard compliant implementation of the Lightning
       Network protocol. The Lightning Network is a scalability solution for
       Bitcoin, enabling secure and instant transfer of funds between any two
       parties for any amount.
     '';
     homepage = "https://github.com/ElementsProject/lightning";
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ jb55 prusnak ];
     license = licenses.mit;
     platforms = platforms.linux;
   };

From 9212e03c1334f2d5edfed7851e8cbc291ff10b26 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 12 Jan 2021 20:47:36 +0100
Subject: [PATCH 414/956] acgtk: use dune install

---
 pkgs/applications/science/logic/acgtk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index 48563248773..13364beed5c 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation {
 
   buildPhase = "dune build";
 
-  inherit (dune) installPhase;
+  installPhase = ''
+    dune install --prefix $out --libdir $OCAMLFIND_DESTDIR
+  '';
 
   meta = with lib; {
     homepage = "https://acg.loria.fr/";

From 46cd648a970365a424bc0936102aba432a3e4915 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 12 Jan 2021 20:48:25 +0100
Subject: [PATCH 415/956] ocamlPackages.lua-ml: install using opaline instead
 of inheriting from dune

---
 pkgs/development/ocaml-modules/lua-ml/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix
index ae16b285654..8a4f58ccbbd 100644
--- a/pkgs/development/ocaml-modules/lua-ml/default.nix
+++ b/pkgs/development/ocaml-modules/lua-ml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline }:
 
 if !lib.versionAtLeast ocaml.version "4.07"
 then throw "lua-ml is not available for OCaml ${ocaml.version}"
@@ -16,11 +16,14 @@ stdenv.mkDerivation rec {
     sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044";
   };
 
+  nativeBuildInputs = [ opaline ];
   buildInputs = [ ocaml findlib ocamlbuild ];
 
   buildFlags = [ "lib" ];
 
-  inherit (dune) installPhase;
+  installPhase = ''
+    opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
+  '';
 
   meta = {
     description = "An embeddable Lua 2.5 interpreter implemented in OCaml";

From 972571d8b178baef64c6b68e20dd97dd0fc5a5c7 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 12 Jan 2021 20:48:57 +0100
Subject: [PATCH 416/956] ocamlPackages.rope: use dune install

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

diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix
index 84e042bf7d2..481342e98c7 100644
--- a/pkgs/development/ocaml-modules/rope/default.nix
+++ b/pkgs/development/ocaml-modules/rope/default.nix
@@ -9,7 +9,9 @@ let param =
     buildInputs = [ dune ];
     extra = {
       buildPhase = "dune build -p rope";
-      inherit (dune) installPhase;
+      installPhase = ''
+        dune install --prefix $out --libdir $OCAMLFIND_DESTDIR rope
+      '';
     };
   } else {
     version = "0.5";

From 223474d8acd83d833997414318503eb941b11e57 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 12 Jan 2021 20:37:25 +0100
Subject: [PATCH 417/956] ocamlPackages.yojson: use dune install in
 installPhase

---
 pkgs/development/ocaml-modules/yojson/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix
index 61d931a66cc..c9bf285b7bd 100644
--- a/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/pkgs/development/ocaml-modules/yojson/default.nix
@@ -7,7 +7,11 @@ let
     url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
     sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd";
     nativeBuildInputs = [ dune ];
-    extra = { inherit (dune) installPhase; };
+    extra = {
+      installPhase = ''
+        dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
+      '';
+    };
   } else rec {
     version = "1.2.3";
     url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz";

From f3704de6497e269f2de2e99b3b9eaadbd6630c22 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 8 Jan 2021 17:25:54 +0100
Subject: [PATCH 418/956] dune: let dune install itself

---
 pkgs/development/tools/ocaml/dune/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
index ef0f5c4fabd..031cbcca21d 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, opaline }:
+{ stdenv, fetchurl, ocaml, findlib }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "dune is not available for OCaml ${ocaml.version}"
@@ -15,15 +15,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ ocaml findlib ];
 
   buildFlags = [ "release" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "LIBDIR=$(OCAMLFIND_DESTDIR)"
+  ];
 
   dontAddPrefix = true;
 
-  installPhase = ''
-    runHook preInstall
-    ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
-    runHook postInstall
-  '';
-
   meta = {
     homepage = "https://dune.build/";
     description = "A composable build system";

From 095ef20a24f49a3198fb4d54debff3f389e4b1be Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 12 Jan 2021 20:05:53 +0100
Subject: [PATCH 419/956] =?UTF-8?q?dune:=20stdenv.lib=20=E2=86=92=20lib?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reference #108938.
---
 pkgs/development/tools/ocaml/dune/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
index 031cbcca21d..bbdbc45270d 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib }:
+{ stdenv, lib, fetchurl, ocaml, findlib }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !lib.versionAtLeast ocaml.version "4.02"
 then throw "dune is not available for OCaml ${ocaml.version}"
 else
 
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
 
   dontAddPrefix = true;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://dune.build/";
     description = "A composable build system";
-    maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ maintainers.vbgl maintainers.marsam ];
+    license = licenses.mit;
     inherit (ocaml.meta) platforms;
   };
 }

From 92eb18f45d97f4d02a4dd399759635c11603ee43 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 21 Jan 2021 10:32:18 +0000
Subject: [PATCH 420/956] aws-sdk-cpp: fix cross compilation, configure for
 curl with http2

---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index ffe15652a3d..215fbeb7071 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
   ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     "-DENABLE_TESTING=OFF"
-    "-DCURL_HAS_H2=0"
+    "-DCURL_HAS_H2=1"
+    "-DCURL_HAS_TLS_PROXY=1"
   ] ++ lib.optional (apis != ["*"])
     "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
 

From af0415418e1fc50b13ce6875371ba68220e8caf3 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 05:49:15 -0500
Subject: [PATCH 421/956] signify: 25 -> 30

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

diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix
index c83a6f157c8..fb3df51167b 100644
--- a/pkgs/tools/security/signify/default.nix
+++ b/pkgs/tools/security/signify/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signify";
-  version = "25";
+  version = "30";
 
   src = fetchFromGitHub {
     owner = "aperezdc";
     repo = "signify";
     rev = "v${version}";
-    sha256 = "0zg0rffxwj2a71s1bllhrn491xsmirg9sshpq8f3vl25lv4c2cnq";
+    sha256 = "02xh6x6rszkvk3rf6zai7n3ivchmw0d8mwllpinjxc7k6sd415c3";
   };
 
   doCheck = true;

From a8dc17d3f22fbcddcfc81c42ef8a2c636a823fad Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 21 Jan 2021 11:52:09 +0100
Subject: [PATCH 422/956] python3Packages.bash_kernel: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix
index 9ac72a21fa7..ba4672a1774 100644
--- a/pkgs/development/python-modules/bash_kernel/default.nix
+++ b/pkgs/development/python-modules/bash_kernel/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "bash_kernel";
-  version = "0.7.1";
+  version = "0.7.2";
   format = "flit";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1s2kc7m52kq28b4j1q3456g5ani6nmq4n0rpbqi3yvh7ks0rby19";
+    sha256 = "0w0nbr3iqqsgpk83rgd0f5b02462bkyj2n0h6i9dwyc1vpnq9350";
   };
 
   patches = [

From f5de4608de5f7aaa5eb57ce22fa5383203234632 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 21 Jan 2021 11:52:41 +0100
Subject: [PATCH 423/956] chromiumDev: 89.0.4385.0 -> 89.0.4389.9

---
 .../networking/browsers/chromium/upstream-info.json  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 75653d312b4..b095353c632 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,15 +31,15 @@
     }
   },
   "dev": {
-    "version": "89.0.4385.0",
-    "sha256": "0cwfwkaidxi86n80kcn3lxrwz90zp6ra9dib1nd4xnhpgl7vjjjf",
-    "sha256bin64": "1hvrdvmlqc95qb9gn7iihal4h1kzf6jqrhk9xvv45chsvwl79pmd",
+    "version": "89.0.4389.9",
+    "sha256": "12jiy5p1cbrs0gc3kd86walcnh038lzs5gnb9vif45f7kxn3c9pm",
+    "sha256bin64": "1wmidvf5gfm1xkpaj07gsvyk1r8b6jbcv46w5vclydlc1r6wh81s",
     "deps": {
       "gn": {
-        "version": "2020-12-22",
+        "version": "2021-01-07",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "0d67e272bdb8145f87d238bc0b2cb8bf80ccec90",
-        "sha256": "07mrfl9hbjldbgidwwhr482a0s0ppqzwa5j7v5nbqxj18j55iril"
+        "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
+        "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
       }
     }
   },

From 451ffe6ad07f473a8c96b752b92c822cf48a41a3 Mon Sep 17 00:00:00 2001
From: Hector Escobedo <hector.escobedo@obsidian.systems>
Date: Thu, 21 Jan 2021 02:54:38 -0800
Subject: [PATCH 424/956] prometheus-cpp: add pkgconfig data

---
 pkgs/development/libraries/prometheus-cpp/default.nix  |  5 +++++
 .../libraries/prometheus-cpp/prometheus-cpp.pc.in      | 10 ++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in

diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix
index 5377d2b96d0..3714e2c89e6 100644
--- a/pkgs/development/libraries/prometheus-cpp/default.nix
+++ b/pkgs/development/libraries/prometheus-cpp/default.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-ldl";
 
+  postInstall = ''
+    mkdir -p $out/lib/pkgconfig
+    substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc
+  '';
+
   meta = {
     description = "Prometheus Client Library for Modern C++";
     homepage = "https://github.com/jupp0r/prometheus-cpp";
diff --git a/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in
new file mode 100644
index 00000000000..c373f4153b5
--- /dev/null
+++ b/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in
@@ -0,0 +1,10 @@
+prefix=@out@
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: prometheus-cpp
+Description: Prometheus Client Library for Modern C++
+URL: https://github.com/jupp0r/prometheus-cpp
+Version: @version@
+Cflags: -isystem${includedir}
+Libs: -Wl,-rpath,${libdir} -L${libdir} -lprometheus-cpp-core -lprometheus-cpp-pull -lprometheus-cpp-push

From 6e5c0fc72be3f121717234edecbf3c5fe11b36c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 11:02:38 +0000
Subject: [PATCH 425/956] python37Packages.google-crc32c: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix
index 104e4ec487f..b36635654a9 100644
--- a/pkgs/development/python-modules/google-crc32c/default.nix
+++ b/pkgs/development/python-modules/google-crc32c/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "google-crc32c";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-crc32c";
     rev = "v${version}";
-    sha256 = "103lqs42b01p6nydjz4id72x7hsrpjyv7g06vrphm8c5g1wa3zp1";
+    sha256 = "058g69yp7x41mv0d84yp31jv64fpm4r25b86rvvqgc6n74w6jj7k";
   };
 
   buildInputs = [ crc32c ];

From 20cc2647780ff87b213bc1d85988827b33ea7a42 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 21 Jan 2021 11:06:56 +0000
Subject: [PATCH 426/956] open-policy-agent: 0.25.2 -> 0.26.0

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

diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix
index 98e966cbf53..96cae21a5b7 100644
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ b/pkgs/development/tools/open-policy-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "open-policy-agent";
-  version = "0.25.2";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     rev = "v${version}";
-    sha256 = "0y4jd1dpq7cy9nfacpf5jbh705gmky44j78q32kq5v566lzrsvvp";
+    sha256 = "sha256-bkWfRmcUPNYeUucrbh9xAqmLg7RxEEQGa2DQdN2S6Po=";
   };
 
   vendorSha256 = null;

From 19dcf599feb32e6945e9dcef85805dd0f1433ebd Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 06:11:51 -0500
Subject: [PATCH 427/956] compsize: 1.3 -> 1.4

---
 pkgs/os-specific/linux/compsize/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix
index e1979997d11..b1c6f5a8f95 100644
--- a/pkgs/os-specific/linux/compsize/default.nix
+++ b/pkgs/os-specific/linux/compsize/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "compsize";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "kilobyte";
-    repo = "compsize";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1c69whla844nwis30jxbj00zkpiw3ccndhkmzjii8av5358mjn43";
+    sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126";
   };
 
   buildInputs = [ btrfs-progs ];

From fc8a3104064074e0302376dc8a9d5143baa5cb3b Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Thu, 21 Jan 2021 10:21:06 +0100
Subject: [PATCH 428/956] perldevel: 5.33.5 -> 5.33.6, perl-cross: b444794 ->
 4c55233

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 6b7d1d4d99c..9268667c793 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -174,11 +174,11 @@ let
       priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
     };
   } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
-    crossVersion = "b4447944a0aeff9590dc023d64f8ddf3de7669fb"; # Dec 22, 2020
+    crossVersion = "4c55233ae95a6aef4d93291fe8ad12709b11e575"; # Jan 21, 2021
 
     perl-cross-src = fetchurl {
       url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
-      sha256 = "1cignplkb29kcvkfwshakyij71w8srlfqbnb9pla98vya6r82rnb";
+      sha256 = "04bxn43ir7b4c2bb1z1l71l93hrysjv00h879nm70m99q6vxq2hc";
     };
 
     depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -214,7 +214,7 @@ in {
   perldevel = common {
     perl = pkgs.perldevel;
     buildPerl = buildPackages.perldevel;
-    version = "5.33.5";
-    sha256 = "04iprc8qz6vpbgzqgwja5rc3csvmgq1rnnnl382l39hy69fsdqpr";
+    version = "5.33.6";
+    sha256 = "1fx6b2q7wzd0xwy7qkmkvd5bdm09d3zfnynrb6afl9ghd8ww56fv";
   };
 }

From cd9c691abe6a856f187b05c1019de94a74a31bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Thu, 21 Jan 2021 12:29:30 +0100
Subject: [PATCH 429/956] pythonPackages.nidaqmx: fix spelling of
 pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix
index 937e6c1c91b..9d916cc9324 100644
--- a/pkgs/development/python-modules/nidaqmx/default.nix
+++ b/pkgs/development/python-modules/nidaqmx/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   # Fixture "x_series_device" called directly. Fixtures are not meant to be called directly
   doCheck = false;
 
-  pythonCheckImports = [
+  pythonImportsCheck = [
     "nidaqmx.task"
   ];
 

From 7a737bfd298c85d2ae88ed43283d68045debb32f Mon Sep 17 00:00:00 2001
From: Roxie Gibson <me@roxxers.xyz>
Date: Thu, 21 Jan 2021 12:51:30 +0000
Subject: [PATCH 430/956] tomb: 2.8.1 -> 2.9

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

diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index 438934f07d5..af04476aa1d 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tomb";
-  version = "2.8.1";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner  = "dyne";
     repo   = "Tomb";
     rev    = "v${version}";
-    sha256 = "03zj9az5626kjg96rkqr5sjydqwlrzhz0gq35r62sajv6mn2qm6s";
+    sha256 = "0d6vmfcf4kd0p2bcljmdnyc2fmbwvar81cc472zx86r7yc3ih102";
   };
 
   buildInputs = [ sudo zsh pinentry ];

From 3fd51777ab58eb97e15b68ca3d08ac697ab289bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 12:54:56 +0000
Subject: [PATCH 431/956] brave: 1.18.78 -> 1.19.86

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index a286915e878..e4d3f5484e2 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -88,11 +88,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.18.78";
+  version = "1.19.86";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "3M5W3BWGHtP+kfZZsH1nVzyGAsub4gjXyBwO8kR/Qvs=";
+    sha256 = "fnkxfhuYTDKPrXSNlG0SlgDls4jnV146wrhxg1crR9c=";
   };
 
   dontConfigure = true;

From 4e57aa0ecc6a89e95127d0057dfd3edafc9eb653 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Fri, 13 Sep 2019 18:11:03 +0200
Subject: [PATCH 432/956] afterburn: init at 4.6.0

---
 pkgs/tools/admin/afterburn/default.nix | 37 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/admin/afterburn/default.nix

diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix
new file mode 100644
index 00000000000..0d3cd957324
--- /dev/null
+++ b/pkgs/tools/admin/afterburn/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, openssl, pkg-config, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "afterburn";
+  version = "4.6.0";
+
+  src = fetchFromGitHub {
+    owner = "coreos";
+    repo = "afterburn";
+    rev = "v${version}";
+    sha256 = "1afy9spm8g8bq2pw44dkrkfz4aimhdz4h5lg9iafby832v5dxbqj";
+  };
+
+  cargoSha256 = "035k55l0hs39a87iq8yxx4i87829kzvvmlgph0adjfmsppz5b8k1";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+
+  patchPhase = ''
+    substituteInPlace ./systemd/afterburn-checkin.service --replace /usr/bin $out/bin
+    substituteInPlace ./systemd/afterburn-firstboot-checkin.service --replace /usr/bin $out/bin
+    substituteInPlace ./systemd/afterburn-sshkeys@.service.in --replace /usr/bin $out/bin
+    substituteInPlace ./systemd/afterburn.service --replace /usr/bin $out/bin
+  '';
+
+  postInstall = ''
+    DEFAULT_INSTANCE=root PREFIX= DESTDIR=$out make install-units
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/coreos/ignition";
+    description = "This is a small utility, typically used in conjunction with Ignition, which reads metadata from a given cloud-provider and applies it to the system.";
+    license = licenses.asl20;
+    maintainers = [ maintainers.arianvp ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13c7aede4b2..a275e685213 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21014,6 +21014,8 @@ in
 
   docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { };
 
+  afterburn = callPackage ../tools/admin/afterburn {};
+
   amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
 
   docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { };

From af1df42fecb5fc1c42aa100cc9fa243d0024a532 Mon Sep 17 00:00:00 2001
From: Kevin Griffin <me@kevin.jp>
Date: Thu, 21 Jan 2021 22:19:48 +0900
Subject: [PATCH 433/956] babelfish: 1.0.0 -> 1.0.1

---
 pkgs/shells/fish/babelfish.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix
index 5974eef8d71..c23e0b1ca92 100644
--- a/pkgs/shells/fish/babelfish.nix
+++ b/pkgs/shells/fish/babelfish.nix
@@ -1,16 +1,16 @@
 { lib, stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "babelfish";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "bouk";
     repo = "babelfish";
     rev = "v${version}";
-    sha256 = "A5FUnER25FDkL/K7RCqudZI6Xd5wg9B8aLbYUw6+7BA=";
+    sha256 = "1sr6y79igyfc9ia33nyrjjm4my1jrpcw27iks37kygh93npsb3r1";
   };
 
-  vendorSha256 = "T70gnmmR4yBwY2ZCiIR35LIbFYSnTRvwTGLwyDgoXnY=";
+  vendorSha256 = "0xjy50wciw329kq1nkd7hhaipcp4fy28hhk6cdq21qwid6g21gag";
 
   meta = with lib; {
     description = "Translate bash scripts to fish";

From 303ccb97602551dccdaad2ba9838a9c050e15b3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 13:31:34 +0000
Subject: [PATCH 434/956] clojure-lsp: 2021.01.16-03.28.20 ->
 2021.01.20-01.39.32

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

diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 9abb6407d40..16f5c4063be 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clojure-lsp";
-  version = "2021.01.16-03.28.20";
+  version = "2021.01.20-01.39.32";
 
   src = fetchurl {
     url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar";
-    sha256 = "sha256-dURdgx+uY2zcXwhyhxPYxvUXGMsd25E+4eulYq/jOYo=";
+    sha256 = "sha256-DqvAIM5YHtcUNZHoH+fcZym6EaPX5a/vgphTFfTO6bU=";
   };
 
   dontUnpack = true;

From aa58df5312b58695ab43f40f450cc6de8bca06cc Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Mon, 11 Jan 2021 17:22:40 +0100
Subject: [PATCH 435/956] zfs: use meta.broken instead of throw when
 incompatible with kernel

`throw` aborts eval when the package is touched in inappropriate places. See
https://github.com/NixOS/nixpkgs/issues/109001 for an adverse instance of that.

ZFS now behaves like a regular broken package when it's, you know, broken.

It also still prints the helpful incompatibility notice when fully evaluated.
---
 pkgs/os-specific/linux/zfs/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 61313f08f31..86deebb5014 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -27,14 +27,8 @@ let
     , rev ? "zfs-${version}"
     , isUnstable ? false
     , incompatibleKernelVersion ? null }:
-    if buildKernel &&
-      (incompatibleKernelVersion != null) &&
-        versionAtLeast kernel.version incompatibleKernelVersion then
-       throw ''
-         Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
-         ${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
-       ''
-    else stdenv.mkDerivation {
+
+    stdenv.mkDerivation {
       name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
       src = fetchFromGitHub {
@@ -174,6 +168,13 @@ let
         license = licenses.cddl;
         platforms = platforms.linux;
         maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
+        broken = if
+          buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion
+          then builtins.trace ''
+            Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
+            ${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
+          '' true
+          else false;
       };
     };
 in {

From 22cccad90187c68684c784721215fe89d0f45b22 Mon Sep 17 00:00:00 2001
From: ilian <ilian@tuta.io>
Date: Thu, 21 Jan 2021 14:59:05 +0100
Subject: [PATCH 436/956] reaper: 6.19 -> 6.20

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

diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index a58fd289e24..67dbb4f7a57 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "reaper";
-  version = "6.19";
+  version = "6.20";
 
   src = fetchurl {
     url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
-    sha256 = "1cdy5ilpfidz7xyqn2i41szr24ilcmpl35aw1vbashf0b6dg48la";
+    sha256 = "194xglhk74ks534r3d00v84s26s4yybxkhb4h8k5rqp76g0jv635";
   };
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

From 6410340ea92be069fd1ae65b1e79494416946dd8 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 6 Dec 2020 17:48:18 +0100
Subject: [PATCH 437/956] ocamlPackages.opam-file-format: 2.0.0 -> 2.1.2

---
 .../ocaml-modules/opam-file-format/default.nix   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix
index ee9961d1533..04079fcb476 100644
--- a/pkgs/development/ocaml-modules/opam-file-format/default.nix
+++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix
@@ -1,21 +1,29 @@
-{ stdenv, lib, fetchFromGitHub, ocaml, findlib }:
+{ stdenv, lib, fetchpatch, fetchFromGitHub, ocaml, findlib }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0";
+  version = "2.1.2";
   name = "ocaml${ocaml.version}-opam-file-format-${version}";
 
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "opam-file-format";
     rev = version;
-    sha256 = "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv";
+    sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2";
   };
 
   buildInputs = [ ocaml findlib ];
 
   installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
 
-  patches = [ ./optional-static.patch ];
+  patches = [
+    ./optional-static.patch
+    # fix no implementation error for OpamParserTypes
+    # can be removed at next release presumably
+    (fetchpatch {
+      url = "https://github.com/ocaml/opam-file-format/pull/41/commits/2a9a92ec334e0bf2adf8d2b4c1b83f1f9f68df8f.patch";
+      sha256 = "090nl7yciyyidmbjfryw3wyx7srh6flnrr4zgyhv4kvjsvq944y2";
+    })
+  ];
 
   meta = {
     description = "Parser and printer for the opam file syntax";

From 4df406a276c76443f05b7fc98fd1f014932335fc Mon Sep 17 00:00:00 2001
From: ilian <ilian@tuta.io>
Date: Thu, 21 Jan 2021 15:10:35 +0100
Subject: [PATCH 438/956] reaper: add ilian as maintainer

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

diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 67dbb4f7a57..8f3a17bf1b6 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -55,6 +55,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.reaper.fm/";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ jfrankenau ];
+    maintainers = with maintainers; [ jfrankenau ilian ];
   };
 }

From 35aac2046369cf2912337cc0a5369f8148834c91 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 15:01:56 +0000
Subject: [PATCH 439/956] exoscale-cli: 1.22.2 -> 1.23.0

---
 pkgs/tools/admin/exoscale-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index 449630400ce..3fe3856d9c5 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "exoscale-cli";
-  version = "1.22.2";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner  = "exoscale";
     repo   = "cli";
     rev    = "v${version}";
-    sha256 = "sha256-HzKRZJcWgNPOQYx6JXmx8vomtOuWaaBfMzwxOqXjHI4=";
+    sha256 = "sha256-LVWUfaACdDp9xsuXHysPO/8QMdaDqS+yhP2U9cc4jh4=";
   };
 
   goPackagePath = "github.com/exoscale/cli";

From 00ec365a8de09d2c6538dc3a8eab1b17c58d88de Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 10:05:32 -0500
Subject: [PATCH 440/956] mtail: 3.0.0-rc41 -> 3.0.0-rc43

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

diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix
index dde027838f9..b8a1c7bc50d 100644
--- a/pkgs/servers/monitoring/mtail/default.nix
+++ b/pkgs/servers/monitoring/mtail/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "mtail";
-  version = "3.0.0-rc41";
+  version = "3.0.0-rc43";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "mtail";
     rev = "v${version}";
-    sha256 = "0651p4ypy1m5m15rfmlbjywq2968hjh6lc2cbgq7grkdsad6lrgx";
+    sha256 = "1lw7gz6fh3z7j4hin4q6y3wxxl4sgd4li1c0z60hmvfs671n6dg9";
   };
 
   vendorSha256 = "0zymch6xfnyzjzizrjljmscqf8m99580zxjwc2rb9hn0324shcwq";

From d35953fc3c3e68a308870d8a20d8973438dccc5c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 15:15:25 +0000
Subject: [PATCH 441/956] fend: 0.1.11 -> 0.1.13

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

diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix
index 8813ec5a14e..0ca5f42f74d 100644
--- a/pkgs/tools/misc/fend/default.nix
+++ b/pkgs/tools/misc/fend/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fend";
-  version = "0.1.11";
+  version = "0.1.13";
 
   src = fetchFromGitHub {
     owner = "printfn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0g9zr2afi103cwv6ikpmmyh5v055dh47l3wj9a1kbxgms0953iwh";
+    sha256 = "sha256-dz6vGRsWc7ubc/drj2Qw/of8AciPgVzc4++Eozg0Luo=";
   };
 
-  cargoSha256 = "0hydlaibanw2vjyxymfbzgwwk2qjv7jsz15gn66ga5vknsqihcrx";
+  cargoSha256 = "sha256-/HBTmLZLhv89mvIVLocw9XbfOgxh9KsjA6KT60IuJeA=";
 
   meta = with lib; {
     description = "Arbitrary-precision unit-aware calculator";

From 9b531f99e80072fcba123112d20da0b549d0239d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 15:30:52 +0000
Subject: [PATCH 442/956] flow: 0.142.0 -> 0.143.0

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 0eb89503435..948df14957a 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.142.0";
+  version = "0.143.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "sha256-peK9+3RsY+4LuN+N/w+HIFX18yDZfqEuioBezNq7yXw=";
+    sha256 = "sha256-j4vsuPs/xr/oy4ZWGBBCy+2mPMQtxE01gqpjsYITCa0=";
   };
 
   installPhase = ''

From 33fc9b1c6dec3287425ad88e60e6534e33d1f9b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmermann@inria.fr>
Date: Thu, 21 Jan 2021 13:32:38 +0100
Subject: [PATCH 443/956] coqPackages.math-classes: 8.11.0 -> 8.12.0

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

diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix
index c6b0dab0e0a..c5bd1098c0b 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/pkgs/development/coq-modules/math-classes/default.nix
@@ -4,8 +4,8 @@ with lib; mkCoqDerivation {
 
   pname = "math-classes";
   inherit version;
-  defaultVersion = if versions.range "8.6" "8.11" coq.coq-version then "8.11.0" else null;
-  release."8.11.0".sha256 = "1hjgncvm1m46lw6264w4dqsy8dbh74vhmzq52x0fba2yqlvy94sf";
+  defaultVersion = if versions.range "8.6" "8.12" coq.coq-version then "8.12.0" else null;
+  release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425";
 
   extraBuildInputs = [ bignums ];
 

From 53465a02c0f671d47b2267ac789e1a301991e349 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 21 Jan 2021 16:58:38 +0100
Subject: [PATCH 444/956] mtxclient: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index dff15bdc606..72f8477c872 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mtxclient";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "mtxclient";
     rev = "v${version}";
-    sha256 = "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x";
+    sha256 = "1x820rcfz5r203dc8a0rzavcjjx10fsv1dicqg65m6kxx1w95j5r";
   };
 
   cmakeFlags = [

From 35676cba193e82e09d611ac890592f0fa7791abd Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 21 Jan 2021 16:59:05 +0100
Subject: [PATCH 445/956] nheko: 0.7.2 -> 0.8.0

---
 .../networking/instant-messengers/nheko/default.nix       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index b640d7c5f9a..9febaeee93f 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -6,9 +6,11 @@
 , cmark
 , lmdb
 , lmdbxx
+, libsecret
 , tweeny
 , mkDerivation
 , qtbase
+, qtkeychain
 , qtmacextras
 , qtmultimedia
 , qttools
@@ -25,13 +27,13 @@
 
 mkDerivation rec {
   pname = "nheko";
-  version = "0.7.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s";
+    sha256 = "00d6wx3lcgbks74jkdyifqxf8nlravqh88fyljd0sy7kzbah9msf";
   };
 
   nativeBuildInputs = [
@@ -46,6 +48,7 @@ mkDerivation rec {
     mtxclient
     olm
     boost17x
+    libsecret
     lmdb
     spdlog
     fmt
@@ -55,6 +58,7 @@ mkDerivation rec {
     qttools
     qtquickcontrols2
     qtgraphicaleffects
+    qtkeychain
   ] ++ lib.optional stdenv.isDarwin qtmacextras;
 
   cmakeFlags = [

From 9334bd4a306d424d00524241ecf58c177ea5df8d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:59:04 +0000
Subject: [PATCH 446/956] python37Packages.google-cloud-secret-manager: 2.1.0
 -> 2.2.0

---
 .../python-modules/google-cloud-secret-manager/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index bb18b72caad..a143a418c22 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-secret-manager";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c2w8ny3n84faq1mq86f16lzqgqbk1977q2f5qxn5a5ccj8v821g";
+    sha256 = "97a46d2318f00c1c6ae1a4ab587e338677c5cc1651d7c6304982d74fa364dd9d";
   };
 
   propagatedBuildInputs = [

From dea5338c45b987417c6fb67058bb55ca3ceee6eb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:35:29 +0000
Subject: [PATCH 447/956] python37Packages.databricks-connect: 7.3.6 -> 7.3.7

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

diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix
index 14c1dd30d13..299fa824034 100644
--- a/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/pkgs/development/python-modules/databricks-connect/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "databricks-connect";
-  version = "7.3.6";
+  version = "7.3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e3f72ba94c8da6b5aae44ca6133a46206e378609ec0aefadfbdc9a3722afd8d1";
+    sha256 = "35ead50a0550e65a7d6fd78e2c8e54095b53514fba85180768a2dbcdd3f2cf0b";
   };
 
   sourceRoot = ".";

From 5cca230726f7d334aed23252a1f9517e0190a7e8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jan 2021 17:39:35 +0100
Subject: [PATCH 448/956] python3Packages.vsure: init at 1.6.1

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

diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix
new file mode 100644
index 00000000000..578578a21b1
--- /dev/null
+++ b/pkgs/development/python-modules/vsure/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "vsure";
+  version = "1.6.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lsr0wl1dwbzpn68ww348yk6v42bw89nrghz5gjsimrr428zw6qn";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "verisure" ];
+
+  meta = with lib; {
+    description = "Python library for working with verisure devices";
+    homepage = "https://github.com/persandstrom/python-verisure";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f2d5c92bf2..4ce4668c71d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8042,6 +8042,8 @@ in {
 
   vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { };
 
+  vsure = callPackage ../development/python-modules/vsure { };
+
   vtk = self.vtk_7;
   vtk_7 = toPythonModule (pkgs.vtk_7.override {
     pythonInterpreter = python;

From 96966bb66bffdb0656628871d65848fc009b16de Mon Sep 17 00:00:00 2001
From: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
Date: Thu, 21 Jan 2021 16:30:06 +0100
Subject: [PATCH 449/956] fluxcd: 0.6.1 -> 0.6.3

---
 pkgs/applications/networking/cluster/fluxcd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index 4271187cc60..1dadc0b7f08 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fluxcd";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "fluxcd";
     repo = "flux2";
     rev = "v${version}";
-    sha256 = "sha256-A5sEv8d6T0tvhD5UzZ2h2cymtXSO2h68pnD8MGg+Dfo=";
+    sha256 = "08mdcnzvjfiw81vribayl58vsjb4sipsnn4x7zv4yk0vvw72i9k8";
   };
 
-  vendorSha256 = "sha256-eh5oUOLgZLIODL58WI1trXerHDWrIiclkrv/w0lvzL4=";
+  vendorSha256 = "1aijdx4mln78srz6b8nghkwsliia86x9xrfzs3sz7v4h36vhdjpa";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 146e6faf7928561208baf7b319bb04dcdb6a5dfc Mon Sep 17 00:00:00 2001
From: Florian Beeres <yuuki@protonmail.com>
Date: Thu, 21 Jan 2021 17:39:58 +0100
Subject: [PATCH 450/956] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix    | 190 ++++++++++++-------------
 pkgs/misc/vim-plugins/vim-plugin-names |   2 +-
 2 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 5e0121440b1..11e202df11d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2021-01-16";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "9387ccfbc57f34f9fdc6af85cd0dbddf5ee8c5ae";
-      sha256 = "1p8fxlnwfiaigfrcw8sk832p4msqcl4n45k5qshy625cz9jkysn0";
+      rev = "7e3d2930d8defbcb233b0bc21822cb8e8377bec2";
+      sha256 = "10ddyvbcy1m00sbcxnba3ijwxjcymqzxlk3hs2gb7z5ng85cryyb";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -401,12 +401,12 @@ let
 
   ci_dark = buildVimPluginFrom2Nix {
     pname = "ci_dark";
-    version = "2020-12-25";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "chuling";
       repo = "ci_dark";
-      rev = "9e683226bb2b73f234cd8feb7367514553d23d32";
-      sha256 = "1jdpnljgf7bnqsfiqy7qfjhwcx4727gc9h0mrcn0xcfl19ppa6xs";
+      rev = "ba5e404ded9f5bcfae68a6ad440ba3909eb7baff";
+      sha256 = "1377apvlwq3i755ply54yi7wz96fflwc4w4aash3hjbjmv0r6ff4";
     };
     meta.homepage = "https://github.com/chuling/ci_dark/";
   };
@@ -882,12 +882,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2021-01-16";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "b7c43e846b404d6068e4905cc1fc22c73e6d333a";
-      sha256 = "00nyw1fnjjkr7zqns05sp00qvbsyyc8a6avr9s0j76hhamrfwkhg";
+      rev = "18f8a297d1f8ddb3f9fea8941888d57194b7e1e9";
+      sha256 = "0a6vlmzpi7i7wpsc49jrh6bk3m7nq562k6k1lb33vfc41dvyz3am";
     };
     meta.homepage = "https://github.com/Shougo/denite.nvim/";
   };
@@ -1342,12 +1342,12 @@ let
 
   fern-vim = buildVimPluginFrom2Nix {
     pname = "fern-vim";
-    version = "2021-01-17";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "fern.vim";
-      rev = "f057425350c3a01372f071de0b6f1ac597b962d6";
-      sha256 = "10wrk0a9ich10bgky912i22ix3xanxk81clda63fg4nw7c4sqqfs";
+      rev = "4ec2a38578726daed584a161450b1ead05b0c9db";
+      sha256 = "1k0cc39fb57hz9yv9w2bgbhciia91ls9931xqvr4jmvlx9z99b25";
     };
     meta.homepage = "https://github.com/lambdalisue/fern.vim/";
   };
@@ -1451,24 +1451,24 @@ let
 
   fzf-lsp-nvim = buildVimPluginFrom2Nix {
     pname = "fzf-lsp-nvim";
-    version = "2020-12-24";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "gfanto";
       repo = "fzf-lsp.nvim";
-      rev = "de69b03c9feaa4b574e4a3e053a9a33467848227";
-      sha256 = "09kpcmnvzgsdbwd5nsnkm93khqhncb8bjl67519wjgx39g73pq50";
+      rev = "5b12d8de47608570b404270c00742e3977ed3103";
+      sha256 = "0y23i1gj4y517qs4ff43fi3ivkz4gmidrvcf6n314nwjgzikff6w";
     };
     meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2021-01-17";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "1fcdee55cc5975d67248b2f8ea5fbac9aa628b7c";
-      sha256 = "0pnpjm17dn28gidjc43dkh5rn5s5rni5l8zjhy72hnix8ws3m1k0";
+      rev = "36de5db9f0af1fb2e788f890d7f28f1f8239bd4b";
+      sha256 = "02wpqvmsdl64f3xni46is8mydy4h9i41b432qa5z0bfc652ax43d";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
   };
@@ -1559,14 +1559,14 @@ let
 
   gitsigns-nvim = buildVimPluginFrom2Nix {
     pname = "gitsigns-nvim";
-    version = "2021-19-01";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "4440a0f716b76132f365f5ef5c7f7cdad4b7c98c";
-      sha256 = "19hyqga7xj3dc7p629gih80c72a04z1my8qav37myz0jq3bllg2v";
+      rev = "59f7091554378794229bccca1faef6cfcc662024";
+      sha256 = "05s2ln800gxw0xk53gf8zsv01hxdznhrqrkprp4iki4k28lay5kd";
     };
-    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";
+    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
   };
 
   gitv = buildVimPluginFrom2Nix {
@@ -2136,12 +2136,12 @@ let
 
   lightline-ale = buildVimPluginFrom2Nix {
     pname = "lightline-ale";
-    version = "2021-01-16";
+    version = "2021-01-19";
     src = fetchFromGitHub {
       owner = "maximbaz";
       repo = "lightline-ale";
-      rev = "fa5e6bf8bca114c508b1247a94ef95c89c390a57";
-      sha256 = "00a8lpj57mbjqky4anjk5jjm2kz9y2iim2dvv1slvm6wyvd4hkwq";
+      rev = "932ea5b9287b8ddfd7b7f0218bb28de52d013140";
+      sha256 = "1b3xbhd32jk43z8baj1djls294whbq2qls01l90k4ihsq97jplb9";
     };
     meta.homepage = "https://github.com/maximbaz/lightline-ale/";
   };
@@ -2208,12 +2208,12 @@ let
 
   lualine-nvim = buildVimPluginFrom2Nix {
     pname = "lualine-nvim";
-    version = "2021-01-15";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "hoob3rt";
       repo = "lualine.nvim";
-      rev = "10a6087a74b235a7e3a77310a21a563afad3a148";
-      sha256 = "06p776nkm2r1i6hslbcaqqg4adqlmv3car6gi8yd4yv8vwlffraw";
+      rev = "09835e2a1a5404b4ee4b80fb8e3fa84ccbddfec4";
+      sha256 = "0n4b8iyk9pk4ji0sw8lf973z2wg2lfb59yh0ry3hkl9g66vg5nkl";
     };
     meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
   };
@@ -2342,12 +2342,12 @@ let
     pname = "ncm2-dictionary";
     version = "2018-11-15";
     src = fetchFromGitHub {
-      owner = "yuki-ycino";
+      owner = "yuki-yano";
       repo = "ncm2-dictionary";
       rev = "c93b52ab0cd1a9ebe5711414c3134f4bba9be6af";
       sha256 = "096l8prqm7zb2s27j2cpnydggszicaji7xjlmhrav7dzc51avafy";
     };
-    meta.homepage = "https://github.com/yuki-ycino/ncm2-dictionary/";
+    meta.homepage = "https://github.com/yuki-yano/ncm2-dictionary/";
   };
 
   ncm2-github = buildVimPluginFrom2Nix {
@@ -2568,12 +2568,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2021-01-16";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "306b74eab85bc84bb790118bfb6a4b01e352f4f0";
-      sha256 = "0nkhj5yamws84w0gwnydgysqbscigfm2yjb9p8yvbfx23y6idijk";
+      rev = "c1d63f047c2fc1dba638a80c24d9b9b44ceb9f50";
+      sha256 = "1q92lxdy8mgiv3ffp2gxsf0acp98hk3yh3lkvsaj6crdwbrq1ss9";
     };
     meta.homepage = "https://github.com/sbdchd/neoformat/";
   };
@@ -2616,12 +2616,12 @@ let
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     pname = "neosnippet-snippets";
-    version = "2021-01-15";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
-      rev = "ba35daa1d248b47b3a5202e5d32e3af5affdcd4b";
-      sha256 = "14aq1m9qbmkyzp36qlpgqm8rdpc0338z68hxshwk55i01wdysqfd";
+      rev = "b10b14873fc0fd46a7daab251e83eaad6c17e1e3";
+      sha256 = "1y5bp92dvz356nzl14bcqhdvfwc59ckc45nw0m4lh43q2h0lvdg1";
     };
     meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
   };
@@ -2712,12 +2712,12 @@ let
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2021-01-19";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "nerdtree";
-      rev = "7099f638edd3eda5cd5687b4e13d342bb7f9949d";
-      sha256 = "1109acmcxwr6kfrw6ganpqwwarsf5l9vd3vxmmafz3c86ha6kkvw";
+      rev = "b134f6518b902c7e0482ae770b804fd47c2d2426";
+      sha256 = "11gq7dcj8v6y1wlnyc6wfsh54qzd5am8lmjjk69jbbjsjzpb59xb";
     };
     meta.homepage = "https://github.com/preservim/nerdtree/";
   };
@@ -2832,12 +2832,12 @@ let
 
   nvim-dap = buildVimPluginFrom2Nix {
     pname = "nvim-dap";
-    version = "2021-01-17";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "570b84cdd58ff8ae00974d827ab259b226809ab2";
-      sha256 = "040y3a1bzpf69ra6a9f0jzdfw9yf694x9zxmby8ba7xil3q69pzr";
+      rev = "0e4ddd517bce79dbc351b89710becf4c711afd84";
+      sha256 = "0dr2cdfwd8dirwqqwwp4iay24p9ssrynq2801mrk5wd7rnv20x7b";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
@@ -2856,12 +2856,12 @@ let
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2021-01-08";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "81930348bbb1398635cc0ecbbc88e3defd8aaa0f";
-      sha256 = "106g7pxa9rwwq45hmsb55b3dy0px2lr5lb25yy8n6jx6a70z9hf7";
+      rev = "50b578efc1514f6ba45e23cdc89d656a51929208";
+      sha256 = "0qcnchf1mnq0bwgkg7las62i4l4hwyisycymcrs0ki9skqdw5swh";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
   };
@@ -2892,7 +2892,7 @@ let
 
   nvim-jdtls = buildVimPluginFrom2Nix {
     pname = "nvim-jdtls";
-    version = "2021-01-19";
+    version = "2021-01-17";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
@@ -2904,12 +2904,12 @@ let
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2021-01-18";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "1f88798c0efe9331e83243ce05605fbac0433e9d";
-      sha256 = "042bgy356v7yy4zm76mngp55n53rnqrlclpm4lafjvl788fny7k4";
+      rev = "86b316140a5fdc902e89ff585ce429357ce4d5df";
+      sha256 = "1d0qb4kpdk677m53wl4lpbkmz283b27x34d78bsq7q078l642sg4";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -2952,24 +2952,24 @@ let
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree-lua";
-    version = "2021-01-17";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-tree.lua";
-      rev = "bf59dd4a86f13eeb32ac04d7d1fadadd48662647";
-      sha256 = "19kjxdspiylp5ww2h1xnhzd57fhlpzdbkyglg79a86xlsf1r1c7x";
+      rev = "91bd2b53ba605dd66712178454c3ae9800885c0e";
+      sha256 = "16wwfhly3ii855kq7kdrcyvvcdf1zfrsj24yb5r15dzjp104ahrx";
     };
     meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2021-01-15";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "1c3fb201c65b42a3752b299d31b1fcf40e3c38e4";
-      sha256 = "1q3i1jfmrc7spayyhz85w9gfv69shlz59cbf9zrp1fvnlhys4ds9";
+      rev = "99ecb46592f8e9a3a8b56ff2c4fd18f1eff4a5af";
+      sha256 = "131k1p0qjwvm5d3s1670r9a4s053c7x2yi7n69jlljc6x57b3q9n";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3012,12 +3012,12 @@ let
 
   nvim-ts-rainbow = buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow";
-    version = "2021-01-16";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "p00f";
       repo = "nvim-ts-rainbow";
-      rev = "6fc6c5691bfc5f1d742c3674400ff7074bf4d6f4";
-      sha256 = "02g977djjmpjag72h38i98kiwqw5qbcqa1kp8g0iayyy8agvkr81";
+      rev = "18c879acbcf9349b131c6d78eba41c489796ec74";
+      sha256 = "1nqw98yhqbm4afr60x6njdfgm0gk2sqv91dcvrvw2jjwa1dzzcc5";
     };
     meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
   };
@@ -3196,20 +3196,20 @@ let
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "playground";
-      rev = "4a11cf237a6e505feb747f6097d48bf0195888b3";
-      sha256 = "0d9xm63spsaa580n2nyqiiq2p81ilmm0dwzqg6jhw9c020r5rzg1";
+      rev = "bcd83b5ce698e9ffdd27e64be16f04f0544ca047";
+      sha256 = "0kmyx172v94m3193i3pmim79d6pk9zffbm50lvzpy7n0bi16608i";
     };
     meta.homepage = "https://github.com/nvim-treesitter/playground/";
   };
 
   plenary-nvim = buildVimPluginFrom2Nix {
     pname = "plenary-nvim";
-    version = "2021-01-18";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "fecbbd23e425db8cc60b85d8298f02935d69940d";
-      sha256 = "0q5hsg2rlzhldr221krvxppspdl04rj5qbiq3nk1a25nf5r24d0z";
+      rev = "d63b5b8d3fe2de5db6748ef8f0d3b397c6910d2d";
+      sha256 = "0nfq9ahg89l5af9yxakr8ywpvpig77pa3wi37kkg67g8yq31zxg0";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -3854,12 +3854,12 @@ let
 
   tagbar = buildVimPluginFrom2Nix {
     pname = "tagbar";
-    version = "2021-01-15";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "59eef1364d8ebb16ceb8dba4274f3926f3c3b7f0";
-      sha256 = "004ss6v677qlizmav2cbmcswc39880c0hazcdrkrzxfdfzrb8byp";
+      rev = "16f3f9b77b0440a14f1400bf3340bc41b781a1d5";
+      sha256 = "08ixhd2axs5p3a3c7f9pawscn811rrc84cpqqip5k78f7ws77yw8";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
   };
@@ -3913,26 +3913,26 @@ let
   };
 
   telescope-fzy-native-nvim = buildVimPluginFrom2Nix {
-     pname = "telescope-fzy-native-nvim";
-     version = "2021-01-02";
-     src = fetchFromGitHub {
-       owner = "nvim-telescope";
-       repo = "telescope-fzy-native.nvim";
-       rev = "654dffd924b29fb9a9252dcbd63528b1498ac9fb";
-       sha256 = "01x9z3n03qharjw778cxb16gw1dsxzmsxph4xsbfy1avf21c6x9g";
-       fetchSubmodules = true;
-     };
-     meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/";
-   };
+    pname = "telescope-fzy-native-nvim";
+    version = "2020-12-31";
+    src = fetchFromGitHub {
+      owner = "nvim-telescope";
+      repo = "telescope-fzy-native.nvim";
+      rev = "654dffd924b29fb9a9252dcbd63528b1498ac9fb";
+      sha256 = "01x9z3n03qharjw778cxb16gw1dsxzmsxph4xsbfy1avf21c6x9g";
+      fetchSubmodules = true;
+    };
+    meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/";
+  };
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2021-01-18";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "7d4d3462e990e2af489eb285aa7041d0b787c560";
-      sha256 = "013m8k7s5d2ix83q1d7x6nqi7s9vn5g221wnbngd41ywbdn61a9a";
+      rev = "a81f316712b26a04ec35eda9c46a641ece635881";
+      sha256 = "0cvh5c86cv5jir0ibf1gn5kwkrmrshapi8al8lqavgsh7ryib4nw";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -5296,12 +5296,12 @@ let
 
   vim-floaterm = buildVimPluginFrom2Nix {
     pname = "vim-floaterm";
-    version = "2021-01-15";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "355f1788b4a0878be6f99f4d41bf09d79fa4e80a";
-      sha256 = "0j89h2vyggpgx2vhfd0a3x6nk5yaf898g9ipw5ags66sp13c4fqc";
+      rev = "4cdbad8981ac4e7f8c57de5100561b87adcb7ae3";
+      sha256 = "00nrk5ldrn52fvslg3lrbfi63wngf34hlhfrcd5jsgllp918wpcz";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
   };
@@ -5464,12 +5464,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2021-01-17";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "3a8e3f6ded412b25fb3c13eecf76d5809fa175e8";
-      sha256 = "0vj6wcvx87kkykmlxjdwnbnfiq8bbqjnki8x3qaiv4gx028m778d";
+      rev = "cf7ff75a3f5f6600474dc1912819fd0ce12e97ee";
+      sha256 = "01i2cffnivj9p8fz5l49z4g0cja5hk8klim7wbn38zm7xmq0cn8f";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -6487,12 +6487,12 @@ let
 
   vim-orgmode = buildVimPluginFrom2Nix {
     pname = "vim-orgmode";
-    version = "2020-10-15";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-orgmode";
-      rev = "b7bce17005cf114b0961d0b5576bf584a2574774";
-      sha256 = "1kpg858qazv465k2w8343hkiz9lzclkcx91vcysip77diandn523";
+      rev = "3aeea0648f485f002cfcaf1b3e6a25ef43a12a66";
+      sha256 = "0jx5vw72p8s5np31g0macwx3iqghfgzvx30akyk5fspfayjivaxl";
     };
     meta.homepage = "https://github.com/jceb/vim-orgmode/";
   };
@@ -7207,12 +7207,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2021-01-17";
+    version = "2021-01-20";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "673390c68328d8d067439127f15923a8ebc9efd8";
-      sha256 = "1mvsm0q6nzsp31ndh5yrr3bbgysn4fmcfzlg0rjbh18y159fcfqv";
+      rev = "d6f2d5728002456fac0075c2442695d25167f8d9";
+      sha256 = "007jb9xmq5cz1lc79s8x1idknjfbzmikss0wmrfjqq5dbkibvv9s";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -8157,12 +8157,12 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2021-01-10";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "ac6057f57e0d96ee744635e35cacf2f2d3037d95";
-      sha256 = "037vmmnhir217ais2bnl6lskbpdh2wfmjq6qmjvrdp2ylwscm81d";
+      rev = "6104b30b32732e367266f06ecf6e817df32ac1b9";
+      sha256 = "0r8asbc387mmdiignr862gz4xd590c6rhp3ff78v7z7rn94dnamd";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 88e3c1e2297..6329c73b9bb 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -680,6 +680,6 @@ Xuyuanp/nerdtree-git-plugin
 ycm-core/YouCompleteMe
 Yggdroot/indentLine
 Yilin-Yang/vim-markbar
-yuki-ycino/ncm2-dictionary
+yuki-yano/ncm2-dictionary
 zah/nim.vim
 ziglang/zig.vim

From c88e459655980b939b4ee97b9cbb859aa803af63 Mon Sep 17 00:00:00 2001
From: Florian Beeres <yuuki@protonmail.com>
Date: Thu, 21 Jan 2021 17:40:19 +0100
Subject: [PATCH 451/956] vimPlugins.chadtree: init at 2021-01-21

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 11e202df11d..bf5f2fc043d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -375,6 +375,18 @@ let
     meta.homepage = "https://github.com/tyru/caw.vim/";
   };
 
+  chadtree = buildVimPluginFrom2Nix {
+    pname = "chadtree";
+    version = "2021-01-21";
+    src = fetchFromGitHub {
+      owner = "ms-jpq";
+      repo = "chadtree";
+      rev = "a351625c4029fb15b14eebe46016c9a6b1bc7d26";
+      sha256 = "0jmnsr1k9v7zpxkbd6h9i4cizbkm99vyr4366wdjiikbn29jx6pr";
+    };
+    meta.homepage = "https://github.com/ms-jpq/chadtree/";
+  };
+
   changeColorScheme-vim = buildVimPluginFrom2Nix {
     pname = "changeColorScheme-vim";
     version = "2010-10-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 6329c73b9bb..c8a7514444e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -353,6 +353,7 @@ mopp/sky-color-clock.vim
 morhetz/gruvbox
 motus/pig.vim
 mpickering/hlint-refactor-vim
+ms-jpq/chadtree@chad
 mtikekar/vim-bsv
 nanotech/jellybeans.vim
 natebosch/vim-lsc

From 2ab5b854ad4ea5f0e9cd1b68b986a8fb852a2bd6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jan 2021 17:40:28 +0100
Subject: [PATCH 452/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 97cd133ade9..4f024ef7bc2 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -895,7 +895,7 @@
     "velux" = ps: with ps; [ pyvlx ];
     "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch
     "vera" = ps: with ps; [ pyvera ];
-    "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure
+    "verisure" = ps: with ps; [ jsonpath vsure ];
     "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense
     "version" = ps: with ps; [ pyhaversion ];
     "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync

From 73f0e809a1b509caf9e4efd9754c248741b8afb1 Mon Sep 17 00:00:00 2001
From: Florian Beeres <yuuki@protonmail.com>
Date: Thu, 21 Jan 2021 17:41:40 +0100
Subject: [PATCH 453/956] vimPlugins: change branch for gitsigns.nvim

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

diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c8a7514444e..f26db1ce410 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -275,7 +275,7 @@ leanprover/lean.vim
 ledger/vim-ledger
 lepture/vim-jinja
 lervag/vimtex
-lewis6991/gitsigns.nvim
+lewis6991/gitsigns.nvim@main
 lfilho/cosco.vim
 lifepillar/vim-mucomplete
 lighttiger2505/deoplete-vim-lsp

From c87fc050c101ed8b797316b0a872940bf341a30b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 21 Jan 2021 17:40:23 +0100
Subject: [PATCH 454/956] slurm: 20.11.2.1 -> 20.11.3.1

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

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 5e2bf5a9755..9c3b27f3d25 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "slurm";
-  version = "20.11.2.1";
+  version = "20.11.3.1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     repo = "slurm";
     # The release tags use - instead of .
     rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
-    sha256 = "02vz386ix28yr2lrn9z0hycqmw1d0npvwvx51fhp2mav66rrx79p";
+    sha256 = "1601h7gid7fyvgmvrmz0h0xkxd7whp06rmj03822bv1szqr20xyy";
   };
 
   outputs = [ "out" "dev" ];

From dcae37989f91edc9a5d6cd5c6131f94645ae18dd Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 21 Jan 2021 17:45:15 +0100
Subject: [PATCH 455/956] tests/slurm: update mysql config to use settings

---
 nixos/tests/slurm.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 97e031a6279..3702d243b48 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -109,12 +109,12 @@ in {
             ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; };
             name = "slurm";
           }];
-          extraOptions = ''
+          settings.mysqld = {
             # recommendations from: https://slurm.schedmd.com/accounting.html#mysql-configuration
-            innodb_buffer_pool_size=1024M
-            innodb_log_file_size=64M
-            innodb_lock_wait_timeout=900
-          '';
+            innodb_buffer_pool_size="1024M";
+            innodb_log_file_size="64M";
+            innodb_lock_wait_timeout=900;
+          };
         };
       };
 

From 4afb4968cd3c5ebf46eb776e55781128936f0adb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jan 2021 18:12:27 +0100
Subject: [PATCH 456/956] python3Packages.python-wink: init at 1.10.5

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

diff --git a/pkgs/development/python-modules/python-wink/default.nix b/pkgs/development/python-modules/python-wink/default.nix
new file mode 100644
index 00000000000..fa0dc670133
--- /dev/null
+++ b/pkgs/development/python-modules/python-wink/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "python-wink";
+  version = "1.10.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1r6qabnqxyy3llnj10z60d4w9pg2zabysl3l7znpy1adss4ywxl0";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pywink" ];
+
+  meta = with lib; {
+    description = "Python implementation of the Wink API";
+    homepage = "https://github.com/python-wink/python-wink";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f2d5c92bf2..4fe612000f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6349,6 +6349,8 @@ in {
 
   python-wifi = callPackage ../development/python-modules/python-wifi { };
 
+  python-wink = callPackage ../development/python-modules/python-wink { };
+
   python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { };
 
   pyeverlights = callPackage ../development/python-modules/pyeverlights { };

From 6b19408a70fb22a26c0385cd9c6c43f246402bda Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jan 2021 18:13:18 +0100
Subject: [PATCH 457/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 97cd133ade9..8894a347132 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -927,7 +927,7 @@
     "whois" = ps: with ps; [ python-whois ];
     "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi
     "wilight" = ps: with ps; [ pywilight ];
-    "wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler ]; # missing inputs: python-wink
+    "wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler python-wink ];
     "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy
     "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api
     "wled" = ps: with ps; [ wled ];

From d44c6219b853ea14a2fc3c6a5d7cfc3072535a2f Mon Sep 17 00:00:00 2001
From: mohe2015 <Moritz.Hedtke@t-online.de>
Date: Tue, 15 Sep 2020 18:39:51 +0200
Subject: [PATCH 458/956] grub2: Properly disable zfs by default

---
 pkgs/tools/misc/grub/2.0x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index a94275d7e35..bc933312afc 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -3,7 +3,7 @@
 , fuse # only needed for grub-mount
 , zfs ? null
 , efiSupport ? false
-, zfsSupport ? true
+, zfsSupport ? false
 , xenSupport ? false
 }:
 

From ff40196b4c1997e81d9cc06d0a982bf47d69e42d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 17:45:57 +0000
Subject: [PATCH 459/956] _1password-gui: 0.9.8 -> 0.9.9-3

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

diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index 68e7737f5a7..ead8aae7d1c 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.9.8";
+  version = "0.9.9-3";
 
   src = fetchurl {
     url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
-    hash = "sha256-XAeWcGy1moFp1v0djYwYwKlzdX0UA8cqwtTNWBKLazc=";
+    hash = "sha256-REuES0yTjTsBHapmj1YLCTIq2cIVtr7Z8ZiEgMCrwrs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 97b17404fac4bc551191f9145e106b53d70377d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:48:25 -0800
Subject: [PATCH 460/956] go-swagger: 0.25.0 -> 0.26.0 (#110361)

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

diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix
index 7f0a1a50b6d..1515dae3391 100644
--- a/pkgs/development/tools/go-swagger/default.nix
+++ b/pkgs/development/tools/go-swagger/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "go-swagger";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "go-swagger";
     repo = pname;
     rev = "v${version}";
-    sha256 = "05zyja58ff0k4fsfmb1j8q5p7lysi78m7jklrzz2xv8ianifkfbg";
+    sha256 = "sha256-mBBjZRjaD1m6sIKR1/MRAKW25bGVNihxBwQMbw/lby4=";
   };
 
-  vendorSha256 = "0vvr167spwk7whqzdp5vd8sm0qwc5g3namm4iqw3vff2pifjgs40";
+  vendorSha256 = "sha256-Am0ypcViUcAcf96qv5qE7K3FvQuQs1XlpIqZf2upWyc=";
 
   doCheck = false;
 

From cec985b23bb750ebf1e1c2514f8392724415fbef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:49:02 -0800
Subject: [PATCH 461/956] argo: 2.12.4 -> 2.12.5 (#110325)

---
 pkgs/applications/networking/cluster/argo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index e4b9e8c2f1b..69c08fed2df 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,16 +19,16 @@ let
 in
 buildGoModule rec {
   pname = "argo";
-  version = "2.12.4";
+  version = "2.12.5";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo";
     rev = "v${version}";
-    sha256 = "04r3y71l9849wlhpzzcg2wcqnqdp5nnnhy4s205rp9xswa3mw0k3";
+    sha256 = "sha256-uHec8/eGu2W3ZqXfnC/u+AOGY0nZL/GD/pZmz8aKgg0=";
   };
 
-  vendorSha256 = "0m24wi91638zyrp7mpri4862dbx1p0glscjd0hdy0xb56vcr3i09";
+  vendorSha256 = "sha256-CcSR2TZldeAbBE0yTR+4oa8mDCIx33pu9h8NE1LkRFQ=";
 
   doCheck = false;
 

From afc9f15172729fd03f1cdf4ab79918ccd14c81bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:49:57 -0800
Subject: [PATCH 462/956] circleci-cli: 0.1.11756 -> 0.1.11924 (#110333)

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

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 726b3ddfcf7..441aae58269 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.11756";
+  version = "0.1.11924";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qFlT40jIfJ/J80LTa+OsSkWCSguqDAS1cXjuYUT0AbU=";
+    sha256 = "sha256-KY1kqqRRpwNt0ovllfFcWSsJAH2J1NrlQAueqQrw354=";
   };
 
   vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs=";

From 25a660b9bce1da4051f0c977718b827ed0fe9fb7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:50:29 -0800
Subject: [PATCH 463/956] cloudflared: 2021.1.4 -> 2021.1.5 (#110337)

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

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 2f0b53f248d..c82b297f9d6 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2021.1.4";
+  version = "2021.1.5";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    sha256 = "sha256-k10Cex2dEFF2l3qq/pK1UcfMBE4jScLD/oieQ/di0gY=";
+    sha256 = "sha256-nknRQdlYVfqCi9SMVTak615Yn/9N99+zHITDKL5nZ00=";
   };
 
   vendorSha256 = null;

From 9897deafcce2213edcb816ba5657237e144b988b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:51:06 -0800
Subject: [PATCH 464/956] consul: 1.9.1 -> 1.9.2 (#110341)

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

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index f319c5f3db1..4c0ce8d511e 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.9.1";
+  version = "1.9.2";
   rev = "v${version}";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     inherit rev;
-    sha256 = "06nw27crcrmz9p0hdc6g8ycq8p0kpbgf1g3i879f6h4jp4ca6zi3";
+    sha256 = "sha256-e4pE30MvJ/9wrYA1oolBF+5C1IHTm+4xhDb88Il9E7o=";
   };
 
   passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec {
   # has a split module structure in one repo
   subPackages = ["." "connect/certgen"];
 
-  vendorSha256 = "01fwbgdr4kxq4li83xxadl33ry1lkb3zhmcf2yrimfk042zabpck";
+  vendorSha256 = "sha256-bTwm6F1Y0LFTfUJ5zIsmGcNztwC2aTJIDd+bDPqnzcA=";
 
   doCheck = false;
 

From a3b46950428efd3fa989f08aaf1aa7d35842bbe5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:51:38 -0800
Subject: [PATCH 465/956] coredns: 1.8.0 -> 1.8.1 (#110343)

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

diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 6973e46412b..adb1a7f329b 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "coredns";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "coredns";
     repo = "coredns";
     rev = "v${version}";
-    sha256 = "04hkz70s5i7ndwyg39za3k83amvmi90rkjm8qp3w3a8fbmq4q4y6";
+    sha256 = "sha256-F4YiLjWrAjCNorR5dHQ2nzEBVWvJVuDDmAbUXruaPYQ=";
   };
 
-  vendorSha256 = "1zwrf2pshb9r3yvp7mqali47163nqhvs9ghflczfpigqswd1m0p0";
+  vendorSha256 = "sha256-QvT1vnvF+gvABh2SzR6vUsj3KCD8ABqZwXQUm3NldM0=";
 
   doCheck = false;
 

From f202f964259f9fd357be7457d1638a6c7a5e08ef Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 21 Jan 2021 18:48:51 +0100
Subject: [PATCH 466/956] libxkbcommon: Add myself as maintainer

From the Git log it seems that this package currently lacks an active
maintainer. I'll try to help out for now.
---
 pkgs/development/libraries/libxkbcommon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 87f85637775..467d42ce997 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://xkbcommon.org";
     changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS";
     license = licenses.mit;
-    maintainers = with maintainers; [ ttuegel ];
+    maintainers = with maintainers; [ primeos ttuegel ];
     platforms = with platforms; unix;
   };
 }

From 938ad4b145662ee15ecb9fe6d35559bb3f4c22be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:52:27 -0800
Subject: [PATCH 467/956] bettercap: 2.28 -> 2.29 (#110327)

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

diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix
index 0037b8cdff7..f2df464a907 100644
--- a/pkgs/tools/security/bettercap/default.nix
+++ b/pkgs/tools/security/bettercap/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "bettercap";
-  version = "2.28";
+  version = "2.29";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0aihinn3i3jj350l2rqph7nv3wy4nh4f8syidf77zybjcp9nmcys";
+    sha256 = "sha256-hXYsFRYSyYKYJM4gS0Dyiia9aPA07GWSsp9doA0vYGI=";
   };
 
-  vendorSha256 = "0yfs1f18d8frbkrshsajzzbj4wh2azd89g2h35wm6wqknvlipwr0";
+  vendorSha256 = "sha256-yIvwYUK+4cnHFwvJS2seDa9vJ/2cQ10Q46hR8U0aSRE=";
 
   doCheck = false;
 

From 6c0a48f3bce910cdf7aa54c8d0c2c91a9e6df94f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:53:10 -0800
Subject: [PATCH 468/956] frp: 0.34.3 -> 0.35.0 (#110358)

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

diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index 7ba943e338d..cc312b9240d 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "frp";
-  version = "0.34.3";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1c5337yv7m4ad1mr73a38lbxg6b7sk8pxqkzws01jxrry2jahb35";
+    sha256 = "sha256-T/j+avHRQUz1xPq+I4912ZPj3PqXZN4xo3lzChG+fZ8=";
   };
 
-  vendorSha256 = "0srkvd1kvjabf3r391n6spv5n77r7dw4y982ynqsv5grp5f4zmm1";
+  vendorSha256 = "sha256-odZPXLn5la2x9QIlT3g7+Rxb9tXGhjTycEvJPUPbM2s=";
 
   doCheck = false;
 

From d888b4d2352293b29961a7462429fe24b260c5c5 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 12:53:46 -0500
Subject: [PATCH 469/956] httplz: dropping maintainership

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

diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index cea92661f32..eacb598674d 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
     description = "A basic http server for hosting a folder fast and simply";
     homepage = "https://github.com/thecoshman/http";
     license = licenses.mit;
-    maintainers = with maintainers; [ bbigras ];
+    maintainers = with maintainers; [ ];
   };
 }

From 03a0224f4a559a7b8d7c44177d541375b659c10b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:55:25 -0800
Subject: [PATCH 470/956] pbgopy: 0.2.0 -> 0.3.0 (#110192)

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

diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/tools/text/pbgopy/default.nix
index cb8b981b265..5e1473f8a3c 100644
--- a/pkgs/tools/text/pbgopy/default.nix
+++ b/pkgs/tools/text/pbgopy/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pbgopy";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "nakabonne";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0impgx9w9lk93b7p1vhjnbslr04655fn6csx7hj04kffzhyb3p1q";
+    sha256 = "sha256-P/MFDFMsqSTVErTM9izJJSMIbiOcbQ9Ya10/w6NRcYw=";
   };
 
-  vendorSha256 = "09hn92bi2rmixpsgckbi8f70widls40fwqqm7y7rqglyjqi7rdmw";
+  vendorSha256 = "sha256-S2X74My6wyDZOsEYTDilCFaYgV2vQzU0jOAY9cEkJ6A=";
 
   meta = with lib; {
     description = "Copy and paste between devices";

From ab482ea4463414a1695da13d812363db512a4fe9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:56:05 -0800
Subject: [PATCH 471/956] nextdns: 1.9.4 -> 1.9.6 (#110127)

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

diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix
index dfe816fbf93..366ed9408ef 100644
--- a/pkgs/applications/networking/nextdns/default.nix
+++ b/pkgs/applications/networking/nextdns/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "nextdns";
-  version = "1.9.4";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${version}";
-    sha256 = "0bd3nvisdg64wcy5syb1iyrv3vy4c6j8gy68dbf141hn1qiah1bg";
+    sha256 = "sha256-TIXckwesu6BTPr3GBRTgegLplwTKHtmjv3yl1c0nvbY=";
   };
 
-  vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj";
+  vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc=";
 
   doCheck = false;
 

From 998aa2ab869de4d7828c700df203ac26b8f513e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:56:46 -0800
Subject: [PATCH 472/956] mackerel-agent: 0.70.3 -> 0.71.0 (#110092)

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

diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix
index 6b8f01bad70..23d5ce11c1f 100644
--- a/pkgs/servers/monitoring/mackerel-agent/default.nix
+++ b/pkgs/servers/monitoring/mackerel-agent/default.nix
@@ -2,20 +2,20 @@
 
 buildGoModule rec {
   pname = "mackerel-agent";
-  version = "0.70.3";
+  version = "0.71.0";
 
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1i02qmjinnwyi4aqczflj7skfsixn25id7fm760vr2dl2gmlfydg";
+    sha256 = "sha256-qU2rU5uUBRFFXyDF+qrOpOOKewlN5SQQHoZW2twtNw4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
   buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ];
 
-  vendorSha256 = "0kjky2mhs6dapnr4xpjpnbibp6y8r320igddplynsfsp8vwrfp7m";
+  vendorSha256 = "sha256-EwQ5KaiVQbYISETcOMC173O99GeyyH1X5Q8YsWXsv3o=";
 
   subPackages = [ "." ];
 

From 76a80a26168475e7c83d942f659880d921c57670 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:58:34 -0800
Subject: [PATCH 473/956] mage: 1.10.0 -> 1.11.0 (#110090)

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

diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix
index 6c9d8bfc838..d8ccd3ad2fe 100644
--- a/pkgs/development/tools/build-managers/mage/default.nix
+++ b/pkgs/development/tools/build-managers/mage/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mage";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "magefile";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0c77xgz2bz4j9sh9v7f49iqyamc4lvvldcmn6v50hk98s9193gbf";
+    sha256 = "sha256-ghOk44VcQUAAYm9NCLsgYdky1KEpwOeChBNrgUKjnC8=";
   };
 
-  vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+  vendorSha256 = null;
 
   doCheck = false;
 

From 799a9cc7c51347fffff316f384c3a3491d125786 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:59:12 -0800
Subject: [PATCH 474/956] matterbridge: 1.19.0 -> 1.21.0 (#110087)

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

diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 7cc1c89de6d..df22aab1f95 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "matterbridge";
-  version = "1.19.0";
+  version = "1.21.0";
 
   vendorSha256 = null;
 
@@ -10,7 +10,7 @@ buildGoModule rec {
 
   src = fetchurl {
     url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
-    sha256 = "1s9y7m5xzmzcp8bphc1najrmci8rf8yvz8kwm2ggmchykw2q3jjg";
+    sha256 = "sha256-ehn6KdPpDpfdyWCVfLuZLq2dDmZXc6InlnovqNsdG6Y=";
   };
 
   meta = with lib; {

From f240afc50fcf1648eca3890910f7686201981be3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:03:49 -0800
Subject: [PATCH 475/956] hydroxide: 0.2.15 -> 0.2.17 (#109978)

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

diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix
index a54a47b9c8f..52d4ae07ce5 100644
--- a/pkgs/applications/networking/hydroxide/default.nix
+++ b/pkgs/applications/networking/hydroxide/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "hydroxide";
-  version = "0.2.15";
+  version = "0.2.17";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0r91cq39n89hfy8sbdy5vjzqfrsfd7cdhd41gwszpayq65qhbsyp";
+    sha256 = "sha256-gNMLVh5ntVCxiIKLshRvYXi5dYLZ8qiZFwZxbNPVFTk=";
   };
 
-  vendorSha256 = "1r5qg5cx48yw1l5nil28y4a82fc7g52jmy9pckaxygppmmn539pc";
+  vendorSha256 = "sha256-f/1Vxuc87eQie/j1b14q/1lAAzRk+ZDkBaTmHtCy7go=";
 
   doCheck = false;
 

From 91606e095ecc926e28091e676457afab4e248a08 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:04:23 -0800
Subject: [PATCH 476/956] cadvisor: 0.37.0 -> 0.38.7 (#109921)

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

diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 04767d0f71c..63000664921 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "cadvisor";
-  version = "0.37.0";
+  version = "0.38.7";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    sha256 = "15njzwvsl7jc2hgxlpsksmn7md3bqpavzaskfdlmzxnxp3biw3cj";
+    sha256 = "sha256-2gwN3/sYPcDy1EUxt9mYviciN9/ZVdChIsuMt3Ueq68=";
   };
 
   modRoot = "./cmd";
 
-  vendorSha256 = "1vbydwj3xrz2gimwfasiqiwzsdiplaq7imildzr4wspkk64dprf4";
+  vendorSha256 = "sha256-FMO+wNmjFFD9+/9mhNcyZftk8ryhwFXDZeEy/h5EMWc=";
 
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ];
 

From ae0ea7ed20b1cf7a9449e01a64ddbf1e6e56f062 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jan 2021 19:04:43 +0100
Subject: [PATCH 477/956] python3Packages.binho-host-adapter: init at 0.1.6

---
 .../binho-host-adapter/default.nix            | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/binho-host-adapter/default.nix

diff --git a/pkgs/development/python-modules/binho-host-adapter/default.nix b/pkgs/development/python-modules/binho-host-adapter/default.nix
new file mode 100644
index 00000000000..2249a28a554
--- /dev/null
+++ b/pkgs/development/python-modules/binho-host-adapter/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pyserial
+}:
+
+buildPythonPackage rec {
+  pname = "binho-host-adapter";
+  version = "0.1.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0mp8xa1qwaww2k5g2nqg7mcivzsbfw2ny1l9yjsi73109slafv8y";
+  };
+
+  propagatedBuildInputs = [ pyserial ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "binhoHostAdapter" ];
+
+  meta = with lib; {
+    description = "Python library for Binho Multi-Protocol USB Host Adapters";
+    homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8105cfbe0da..e69d1080ac3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -913,6 +913,8 @@ in {
 
   binaryornot = callPackage ../development/python-modules/binaryornot { };
 
+  binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
+
   binwalk = callPackage ../development/python-modules/binwalk {
     pyqtgraph = null;
     matplotlib = null;

From 467017292771957974a96f0626e96da744578bfd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:04:57 -0800
Subject: [PATCH 478/956] gore: 0.5.0 -> 0.5.2 (#109844)

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

diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix
index 0e0264f1522..30d7cd1ef33 100644
--- a/pkgs/development/tools/gore/default.nix
+++ b/pkgs/development/tools/gore/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gore";
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "motemen";
     repo = pname;
     rev = "v${version}";
-    sha256 = "61Hn3Vs4BZtAX8WNJlUeodvEWvwLo+lXKsc8JxRwOE4=";
+    sha256 = "sha256-oiaZvoCxA69slNb3LArLJfaqzfQ1YImxLuQHzW5tibo=";
   };
 
-  vendorSha256 = "3bq6sRKS5dq7WCPpKGm2q5gFajthR3zhrTFGve9zXhY=";
+  vendorSha256 = "sha256-vJG7sc+ngagtrYvTwO3OrCSFUgAA7zhaXHkU97nIhcY=";
 
   doCheck = false;
 

From 34926a73f8ba2b92d632f612ffded404f7734e80 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:05:40 -0800
Subject: [PATCH 479/956] golangci-lint: 1.35.0 -> 1.35.2 (#109843)

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

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index e91f8cfeb76..2679d56ec64 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.35.0";
+  version = "1.35.2";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "03pg8qfysjdbpxzdcs4y5cn0gshr5k53p7rjqak7q8vdykva60s1";
+    sha256 = "sha256-UntDMiznrHZsaBFTcnNhnh59j+yY1zdpWrFNlalxTDA=";
   };
 
-  vendorSha256 = "18dgx087jixwcfcab546qhy5qq1n1ahrsr7i7d7d3v9vklslics8";
+  vendorSha256 = "sha256-6YacyQqTq9WQk8PgvoIxflh6HRmv5xgxtWq6HrprJis=";
 
   doCheck = false;
 

From 8540ac06e95025ae7197603c28d37c03d55be774 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:07:01 -0800
Subject: [PATCH 480/956] ghorg: 1.4.0 -> 1.5.0 (#109824)

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

diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
index f7ce118bbc7..b038e98e2db 100644
--- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "ghorg";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "gabrie30";
     repo = "ghorg";
     rev = version;
-    sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w";
+    sha256 = "sha256-OoNHKDxYKTmfm1rrQxG7PnH7DINa2M/NKc/5iKaUybg=";
   };
 
   doCheck = false;

From d0f642806f0b23d1c96af99c65562104fc4ab7a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:07:41 -0800
Subject: [PATCH 481/956] bazel-kazel: 0.1.3 -> 0.2.0 (#109731)

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

diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix
index c8127256a61..ba9412c286c 100644
--- a/pkgs/development/tools/bazel-kazel/default.nix
+++ b/pkgs/development/tools/bazel-kazel/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "bazel-kazel";
-  version = "0.1.3";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "repo-infra";
     rev = "v${version}";
-    sha256 = "1mmla4j30ka368gsf4v8h23f32rsc4fpyrqswafw98x07xngmmqr";
+    sha256 = "sha256-YWTWw5vDkDvIHOTqZM2xH8VPaVRuB2oyynvwWNmvPXs=";
   };
 
-  vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf";
+  vendorSha256 = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I=";
 
   doCheck = false;
 

From f590e4246ecd42f38adb4682abd85b9ccb4d4699 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:08:11 -0800
Subject: [PATCH 482/956] azure-storage-azcopy: 10.7.0 -> 10.8.0 (#109730)

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

diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 1c5bb899b69..bae6dd73829 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.7.0";
+  version = "10.8.0";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     rev = "v${version}";
-    sha256 = "0l2109r9a8fhd66zgsi56zdmy390fpnvy08rbxf6rfc0a55n96ka";
+    sha256 = "sha256-zA0/5lpVefZD0m7g7SfqSRAFkQm2b+g/F3doCl9oAn8=";
   };
 
   subPackages = [ "." ];
 
-  vendorSha256 = "032yzl8mmgmmxbpsymndp4ddgi572jh5drwql0bjjabp3yqwj1g1";
+  vendorSha256 = "sha256-t7PluxN6naDB35eC59Xus1hgZflgViWF2yFog9mkaOA=";
 
   doCheck = false;
 

From 635154a7ac9fd8b91bd63c40a967458b03cec18d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:08:38 -0800
Subject: [PATCH 483/956] assh: 2.10.0 -> 2.11.0 (#109724)

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

diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index e8b93adcd64..13018d183ca 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "assh";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     repo = "advanced-ssh-config";
     owner = "moul";
     rev = "v${version}";
-    sha256 = "0qsb5p52v961akshgs1yla2d7lhcbwixv2skqaappdmhj18a23q2";
+    sha256 = "sha256-/StB5yee9sbkebuJt6JDI+bp52NG0bBhprzmdepL+ek=";
   };
 
-  vendorSha256 = "03ycjhal4g7bs9fhzrq01ijj48czvs272qcqkd9farsha5gf0q0b";
+  vendorSha256 = "sha256-6OAsO7zWAgPfQWD9k+nYH7hnDDUlKIjTB61ivvoubn0=";
 
   doCheck = false;
 

From 728097646c0911bfc7b4986745f1f915f7d4e34e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:09:15 -0800
Subject: [PATCH 484/956] argocd: 1.8.1 -> 1.8.2 (#109720)

---
 pkgs/applications/networking/cluster/argocd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 9aa0b6614b2..94c3025c22f 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "1.8.1";
+  version = "1.8.2";
   commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    sha256 = "1lz395nfvjzri3fnk0d9hiwlf7w01afbx4cpn2crdd3rlab105s4";
+    sha256 = "sha256-qppJYpTuCA1+5dY8kbtUy2Rd+fG7u+BMxsY7IqFUOf8=";
   };
 
-  vendorSha256 = "1rd2wnsh95r1r5zb6xfav8gf7kkp68vzp295cv1iy3b71ak52ag1";
+  vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4=";
 
   doCheck = false;
 

From 360f24168f6159a24b030d4d60f030bec53c79b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 18:10:56 +0000
Subject: [PATCH 485/956] bingrep: 0.8.2 -> 0.8.5

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

diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix
index 236669dc54f..d1b0c3a6656 100644
--- a/pkgs/development/tools/analysis/bingrep/default.nix
+++ b/pkgs/development/tools/analysis/bingrep/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bingrep";
-  version = "0.8.2";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "m4b";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1qv41g7mblnq07145m03s2fhbrjfsc0924zb9z4cp159ygkggxcy";
+    sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w=";
   };
 
-  cargoSha256 = "1z53408mcmy698xb2sxj1s1p9xc9srlkj0v8wswhdp7nq27vwkdj";
+  cargoSha256 = "sha256-3eGYU5O7HSpawIL/8OVmROCzXfdnoMAnIujjrIp00xg=";
 
   meta = with stdenv.lib; {
     description = "Greps through binaries from various OSs and architectures, and colors them";

From 8174a4cd1f37b5b6f4fea84e1a3daa9b09b5eab6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 10:33:50 -0800
Subject: [PATCH 486/956] mellowplayer: 3.6.7 -> 3.6.8 (#110071)

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

diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix
index cddf1afd654..5bdcb81fb63 100644
--- a/pkgs/applications/audio/mellowplayer/default.nix
+++ b/pkgs/applications/audio/mellowplayer/default.nix
@@ -14,13 +14,13 @@
 
 mkDerivation rec {
   pname = "MellowPlayer";
-  version = "3.6.7";
+  version = "3.6.8";
 
   src = fetchFromGitLab {
     owner = "ColinDuquesnoy";
     repo = "MellowPlayer";
     rev = version;
-    sha256 = "1p0z8hkbxaxrqjmknjwxb0mpf3xdssik3m5cwrsv1881k1x2x5qs";
+    sha256 = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 4f3e9c9ca852cc84946ad19a810511523c4cb916 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 18:34:21 +0000
Subject: [PATCH 487/956] cargo-cache: 0.5.1 -> 0.6.0

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

diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix
index ade568df674..882f0408cec 100644
--- a/pkgs/development/tools/rust/cargo-cache/default.nix
+++ b/pkgs/development/tools/rust/cargo-cache/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-cache";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "matthiaskrgr";
     repo = pname;
     rev = version;
-    sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi";
+    sha256 = "sha256-SqhGwm2VZW6ZUYyxN940fi/YLJGAZikjJCIq0GbljtY=";
   };
 
-  cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw";
+  cargoSha256 = "sha256-sZxkEQBZ2PJXSvwcA+IL7uW/gcnzuzRcDklNW5vpzWg=";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
 

From 67c61e708afe754e6e66341868249be3097cbb55 Mon Sep 17 00:00:00 2001
From: Ana Hobden <operator@hoverbear.org>
Date: Thu, 21 Jan 2021 10:51:56 -0800
Subject: [PATCH 488/956] maintainers: add hoverbear

Signed-off-by: Ana Hobden <operator@hoverbear.org>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 99280c800c2..de66528e1ba 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3699,6 +3699,12 @@
     githubId = 362833;
     name = "Hongchang Wu";
   };
+  hoverbear = {
+    email = "operator+nix@hoverbear.org";
+    github = "hoverbear";
+    githubId = 130903;
+    name = "Ana Hobden";
+  };
   hrdinka = {
     email = "c.nix@hrdinka.at";
     github = "hrdinka";

From 23b0a88572577777d6fa4f9e5810da3c6a6e9c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Thu, 21 Jan 2021 20:16:58 +0100
Subject: [PATCH 489/956] rust-bindgen: Resolve "/usr/bin/env bash" to fix
 usage in Nix build

---
 pkgs/development/tools/rust/bindgen/default.nix | 10 +++++++---
 pkgs/development/tools/rust/bindgen/wrapper.sh  |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 0330edb4804..eef8a5e41fd 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,5 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin,
-  runtimeShell }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
+, runtimeShell
+, bash
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen";
@@ -16,7 +18,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w";
 
-  libclang = llvmPackages.libclang.lib; #for substituteAll
+  #for substituteAll
+  libclang = llvmPackages.libclang.lib;
+  inherit bash;
 
   buildInputs = [ libclang ];
 
diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/pkgs/development/tools/rust/bindgen/wrapper.sh
index 95cd0901cec..0b3e3cd4c1e 100755
--- a/pkgs/development/tools/rust/bindgen/wrapper.sh
+++ b/pkgs/development/tools/rust/bindgen/wrapper.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!@bash@/bin/bash
 sep='--'   # whether to add -- before new options
 cxx=0      # whether cxx was explicitly requested
 lastWasx=0 # whether the last argument passed was -x

From 0dc4c1764733cbfb8982d9c8e2c2319791e6e410 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 19:18:00 +0000
Subject: [PATCH 490/956] twitterBootstrap: 4.5.3 -> 4.6.0

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

diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix
index 14fd9a219ec..b06c5986202 100644
--- a/pkgs/development/web/twitter-bootstrap/default.nix
+++ b/pkgs/development/web/twitter-bootstrap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bootstrap";
-  version = "4.5.3";
+  version = "4.6.0";
 
   src = fetchurl {
     url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
-    sha256 = "0w87b0vbwsdb4ag359y5pppxjvqnxk1949mszzn8ay2i5h47mjq6";
+    sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM=";
   };
 
   buildInputs = [ unzip ];

From c3bbfb77ad81ad86c43f9e957de5c3e528ee593d Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 17 Jan 2021 18:28:51 +0100
Subject: [PATCH 491/956] pkgs/development/mobile: stdenv.lib -> lib

---
 pkgs/development/mobile/abootimg/default.nix  |  4 ++--
 pkgs/development/mobile/adb-sync/default.nix  |  2 +-
 pkgs/development/mobile/flashtool/default.nix | 10 +++++-----
 .../development/mobile/genymotion/default.nix | 10 +++++-----
 .../mobile/titaniumenv/build-app.nix          | 14 ++++++-------
 .../mobile/titaniumenv/default.nix            |  4 ++--
 .../mobile/titaniumenv/titaniumsdk-8.2.nix    |  4 ++--
 .../mobile/titaniumenv/titaniumsdk-8.3.nix    |  4 ++--
 .../development/mobile/xcodeenv/build-app.nix | 20 +++++++++----------
 pkgs/development/mobile/xcodeenv/default.nix  |  6 +++---
 .../mobile/xcodeenv/simulate-app.nix          |  6 +++---
 11 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix
index d2e43d10608..bec022f08c7 100644
--- a/pkgs/development/mobile/abootimg/default.nix
+++ b/pkgs/development/mobile/abootimg/default.nix
@@ -28,10 +28,10 @@ stdenv.mkDerivation {
     install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1;
 
     install -D -m 755 abootimg-pack-initrd $out/bin
-    wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]}
+    wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${lib.makeBinPath [ coreutils cpio findutils gzip ]}
 
     install -D -m 755 abootimg-unpack-initrd $out/bin
-    wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]}
+    wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${lib.makeBinPath [ cpio gzip ]}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix
index fc37eefc212..c88ac5dbca5 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/development/mobile/adb-sync/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   installPhase = let
-    dependencies = stdenv.lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ];
+    dependencies = lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ];
   in ''
     runHook preInstall
 
diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index 84c42c895ce..e00ff3acce0 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }:
+{ stdenv, lib, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }:
 
 # TODO:
 #
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     sed -i \
       -e 's|$(uname -m)|i686|' \
       -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
-      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
+      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
       FlashTool FlashToolConsole
   '';
 
@@ -51,12 +51,12 @@ stdenv.mkDerivation rec {
     mv * $out/
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "http://www.flashtool.net/";
     description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
-    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributableFirmware;
     platforms = [ "i686-linux" ];
-    hydraPlatforms = stdenv.lib.platforms.none;
+    hydraPlatforms = platforms.none;
     broken = true;
   };
 }
diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix
index 72a376d39a8..b4431506515 100644
--- a/pkgs/development/mobile/genymotion/default.nix
+++ b/pkgs/development/mobile/genymotion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
+{ stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
 , xdg_utils
 # For glewinfo
 , libXmu, libXi, libXext }:
@@ -7,7 +7,7 @@ let
   packages = [
     stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL
   ];
-  libPath = stdenv.lib.makeLibraryPath packages;
+  libPath = lib.makeLibraryPath packages;
 in
 stdenv.mkDerivation rec {
   pname = "genymotion";
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     rm $out/libexec/genymotion/libxkbcommon*
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Fast and easy Android emulation";
     longDescription = ''
       Genymotion is a relatively fast Android emulator which comes with
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
       suitable for application testing.
      '';
     homepage = "https://www.genymotion.com/";
-    license = stdenv.lib.licenses.unfree;
+    license = licenses.unfree;
     platforms = ["x86_64-linux"];
-    maintainers = [ stdenv.lib.maintainers.puffnfresh ];
+    maintainers = [ maintainers.puffnfresh ];
   };
 }
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index a7e158bd3bb..82a264e702d 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,4 +1,4 @@
-{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
+{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
 { name, src, preBuild ? "", target, tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
 , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false
@@ -34,14 +34,14 @@ let
   extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
 in
 stdenv.mkDerivation ({
-  name = stdenv.lib.replaceChars [" "] [""] name;
+  name = lib.replaceChars [" "] [""] name;
 
   buildInputs = [ nodejs titanium alloy python which file jdk ];
 
   buildPhase = ''
     ${preBuild}
 
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error.
       alloy=$(dirname $(type -p alloy))/..
       cp -rv $alloy/* alloy
@@ -51,7 +51,7 @@ stdenv.mkDerivation ({
 
     export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"}
 
-    ${stdenv.lib.optionalString (tiVersion != null) ''
+    ${lib.optionalString (tiVersion != null) ''
       # Replace titanium version by the provided one
       sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
     ''}
@@ -76,7 +76,7 @@ stdenv.mkDerivation ({
       export GRADLE_USER_HOME=$TMPDIR/gradle
 
       ${if release then ''
-        ${stdenv.lib.optionalString stdenv.isDarwin ''
+        ${lib.optionalString stdenv.isDarwin ''
           # Signing the app does not work with OpenJDK on macOS, use host SDK instead
           export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
         ''}
@@ -171,7 +171,7 @@ stdenv.mkDerivation ({
         mkdir -p $out/nix-support
         echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
 
-        ${stdenv.lib.optionalString enableWirelessDistribution ''
+        ${lib.optionalString enableWirelessDistribution ''
           appname="$(basename $out/*.ipa .ipa)"
           bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
           version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
@@ -184,5 +184,5 @@ stdenv.mkDerivation ({
     else throw "Target: ${target} is not supported!"}
   '';
 
-  failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
+  failureHook = lib.optionalString (release && target == "iphone") deleteKeychain;
 } // extraArgs)
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 44ec91d7e59..151502a5d16 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -8,11 +8,11 @@ rec {
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
-      inherit (pkgs) stdenv fetchurl unzip makeWrapper;
+      inherit (pkgs) stdenv lib fetchurl unzip makeWrapper;
     };
 
   buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv python which file jdk nodejs;
+    inherit (pkgs) stdenv lib python which file jdk nodejs;
     inherit (pkgs.nodePackages) alloy titanium;
     inherit (androidenv) composeAndroidPackages;
     inherit (xcodeenv) composeXcodeWrapper;
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index 2af53a63b58..0742247893c 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, makeWrapper}:
+{stdenv, lib, fetchurl, unzip, makeWrapper}:
 
 let
   # Gradle is a build system that bootstraps itself. This is what it actually
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
     sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
 
-    ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
       # Patch the strip frameworks script in the iPhone build template to not let
       # it skip the strip phase. This is caused by an assumption on the file
       # permissions in which Nix deviates from the standard.
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
index b995a566f52..965a385ac56 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, makeWrapper}:
+{stdenv, lib, fetchurl, unzip, makeWrapper}:
 
 let
   # Gradle is a build system that bootstraps itself. This is what it actually
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
     sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
 
-    ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
       # Patch the strip frameworks script in the iPhone build template to not let
       # it skip the strip phase. This is caused by an assumption on the file
       # permissions in which Nix deviates from the standard.
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index adf64f9561c..ae8416c8d76 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -1,4 +1,4 @@
-{stdenv, composeXcodeWrapper}:
+{stdenv, lib, composeXcodeWrapper}:
 { name
 , src
 , sdkVersion ? "13.1"
@@ -53,13 +53,13 @@ let
   extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs);
 in
 stdenv.mkDerivation ({
-  name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
+  name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
   buildPhase = ''
     # Be sure that the Xcode wrapper has priority over everything else.
     # When using buildInputs this does not seem to be the case.
     export PATH=${xcodewrapper}/bin:$PATH
 
-    ${stdenv.lib.optionalString release ''
+    ${lib.optionalString release ''
       export HOME=/Users/$(whoami)
       keychainName="$(basename $out)"
 
@@ -91,10 +91,10 @@ stdenv.mkDerivation ({
     # Do the building
     export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works
 
-    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags}
+    xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags}
 
-    ${stdenv.lib.optionalString release ''
-      ${stdenv.lib.optionalString generateIPA ''
+    ${lib.optionalString release ''
+      ${lib.optionalString generateIPA ''
         # Create export plist file
         cat > "${name}.plist" <<EOF
         <?xml version="1.0" encoding="UTF-8"?>
@@ -112,7 +112,7 @@ stdenv.mkDerivation ({
             <string>manual</string>
             <key>method</key>
             <string>${signMethod}</string>
-            ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") ''
+            ${lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") ''
               <key>compileBitcode</key>
               <false/>
             ''}
@@ -127,14 +127,14 @@ stdenv.mkDerivation ({
         mkdir -p $out/nix-support
         echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
 
-        ${stdenv.lib.optionalString enableWirelessDistribution ''
+        ${lib.optionalString enableWirelessDistribution ''
           # Add another hacky build product that enables wireless adhoc installations
           appname="$(basename "$(echo $out/*.ipa)" .ipa)"
           sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&amp;version=${appVersion}\&amp;title=$appname|" ${./install.html.template} > $out/''${appname}.html
           echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products
         ''}
       ''}
-      ${stdenv.lib.optionalString generateXCArchive ''
+      ${lib.optionalString generateXCArchive ''
         mkdir -p $out
         mv "${name}.xcarchive" $out
       ''}
@@ -144,7 +144,7 @@ stdenv.mkDerivation ({
     ''}
   '';
 
-  failureHook = stdenv.lib.optionalString release deleteKeychain;
+  failureHook = lib.optionalString release deleteKeychain;
 
   installPhase = "true";
 } // extraArgs)
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index 47686e6d69e..90642ca7d9a 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,4 +1,4 @@
-{stdenv}:
+{ stdenv, lib }:
 
 rec {
   composeXcodeWrapper = import ./compose-xcodewrapper.nix {
@@ -6,10 +6,10 @@ rec {
   };
 
   buildApp = import ./build-app.nix {
-    inherit stdenv composeXcodeWrapper;
+    inherit stdenv lib composeXcodeWrapper;
   };
 
   simulateApp = import ./simulate-app.nix {
-    inherit stdenv composeXcodeWrapper;
+    inherit stdenv lib composeXcodeWrapper;
   };
 }
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 1a55f8366a3..ea0502eb981 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -1,4 +1,4 @@
-{stdenv, composeXcodeWrapper}:
+{stdenv, lib, composeXcodeWrapper}:
 {name, app ? null, bundleId ? null, ...}@args:
 
 assert app != null -> bundleId != null;
@@ -9,7 +9,7 @@ let
   xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
 in
 stdenv.mkDerivation {
-  name = stdenv.lib.replaceChars [" "] [""] name;
+  name = lib.replaceChars [" "] [""] name;
   buildCommand = ''
     mkdir -p $out/bin
     cat > $out/bin/run-test-simulator << "EOF"
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     # Open the simulator instance
     open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid
 
-    ${stdenv.lib.optionalString (app != null) ''
+    ${lib.optionalString (app != null) ''
       # Copy the app and restore the write permissions
       appTmpDir=$(mktemp -d -t appTmpDir)
       cp -r "$(echo ${app}/*.app)" "$appTmpDir"

From 5dd1286cfa7ec5b57e32aa207fcb9b4d032bcfa7 Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Thu, 26 Nov 2020 10:07:19 +0100
Subject: [PATCH 492/956] stenc: 1.0.7 -> 1.0.8

---
 pkgs/tools/backup/stenc/default.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix
index e2f0cc7fe1f..b2a53f8ad07 100644
--- a/pkgs/tools/backup/stenc/default.nix
+++ b/pkgs/tools/backup/stenc/default.nix
@@ -1,14 +1,27 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, genericUpdater
+, common-updater-scripts
+, autoreconfHook
+}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.7";
   pname = "stenc";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "scsitape";
     repo = "stenc";
     rev = version;
-    sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k";
+    sha256 = "0dsmvr1xpwkcd9yawv4c4vna67yag7jb8jcgn2amywz7nkpzmyxd";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  passthru.updateScript = genericUpdater {
+    inherit pname version;
+    versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
   };
 
   meta = {

From c06d37b803595bb7c758879a8c196571d3c9955c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 Jan 2021 05:43:20 +1000
Subject: [PATCH 493/956] gh: 1.4.0 -> 1.5.0

https://github.com/cli/cli/releases/tag/v1.5.0
---
 .../version-management/git-and-tools/gh/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 7ba8a652d80..38413f990a0 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "08gxx9dwk24r1c5jkc9mqzcicxqmrdw0bi94nr517hk5cqsav2sl";
+    sha256 = "1f23b8bn867b4zihz8m91xmkclcw1jnqkwi06klhm5576akahigq";
   };
 
-  vendorSha256 = "1ih7z883pffb6hnx51h8823d95b52d6dy1gk6ln7j25fqhcfvsy8";
+  vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 80b13365e9a5482f4a2a1c5b150f328af54bbe15 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 21 Jan 2021 00:09:03 +0100
Subject: [PATCH 494/956] ocamlPackages.mirage-crypto*: 0.8.8 -> 0.8.10

ocamlPackages.x509: fix tests for mirage-crypto >= 0.8.9
---
 .../ocaml-modules/mirage-crypto/default.nix            |  4 ++--
 pkgs/development/ocaml-modules/x509/default.nix        | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index c2ede31dd3f..ab48e01950e 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -4,11 +4,11 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.08";
 
   pname = "mirage-crypto";
-  version = "0.8.8";
+  version = "0.8.10";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
-    sha256 = "19czylfyakckfzzcbqgv9ygl243wix7ak8zkbdcb9hcl2k2shswb";
+    sha256 = "8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc";
   };
 
   useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index 289a3891c78..23efd4bb9fc 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/pkgs/development/ocaml-modules/x509/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildDunePackage
+{ lib, fetchurl, buildDunePackage, fetchpatch
 , alcotest, cstruct-unix
 , asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk
 , logs, base64
@@ -15,6 +15,14 @@ buildDunePackage rec {
     sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22";
   };
 
+  patches = [
+    # fix tests for mirage-crypto >= 0.8.9, can be removed at next release
+    (fetchpatch {
+      url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch";
+      sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr";
+    })
+  ];
+
   useDune2 = true;
 
   buildInputs = [ alcotest cstruct-unix ];

From 6e2bc82e72ec7f358ce9137a1ec141d25c32ddab Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Mon, 21 Dec 2020 15:53:30 -0800
Subject: [PATCH 495/956] maintainers: add ivan-babrou

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 99280c800c2..11162af66d8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3887,6 +3887,12 @@
     githubId = 4458;
     name = "Ivan Kozik";
   };
+  ivan-babrou = {
+    email = "nixpkgs@ivan.computer";
+    name = "Ivan Babrou";
+    github = "bobrik";
+    githubId = 89186;
+  };
   ivan-timokhin = {
     email = "nixpkgs@ivan.timokhin.name";
     name = "Ivan Timokhin";

From e431ff7e2efc2fea43f43b0fbe53b9cbe2cd6a86 Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Sun, 20 Dec 2020 17:08:59 -0800
Subject: [PATCH 496/956] docker-buildx: init at 0.5.1

Installing docker-buildx enables buildx subcommand on the client:

* https://github.com/docker/buildx
---
 .../virtualization/docker/buildx.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/virtualization/docker/buildx.nix

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
new file mode 100644
index 00000000000..9eb03508572
--- /dev/null
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "docker-buildx";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "docker";
+    repo = "buildx";
+    rev = "v${version}";
+    sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk";
+  };
+
+  vendorSha256 = null;
+
+  installPhase = ''
+    install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx
+  '';
+
+  meta = with lib; {
+    description = "Docker CLI plugin for extended build capabilities with BuildKit";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ivan-babrou ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d13ca561c2..8590a2de35b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21443,6 +21443,8 @@ in
 
   afterburn = callPackage ../tools/admin/afterburn {};
 
+  docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
+
   amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
 
   docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { };

From deb0d298a255184712e4af368c78300d1be9dc70 Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Tue, 22 Dec 2020 14:53:53 -0800
Subject: [PATCH 497/956] docker: add buildx support to docker client

---
 pkgs/applications/virtualization/docker/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 8e75bf46f49..28075360f69 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,10 +1,11 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage
 , makeWrapper, installShellFiles, pkg-config
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
-, sqlite, iproute, lvm2, systemd
+, sqlite, iproute, lvm2, systemd, docker-buildx
 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
 , procps, libseccomp
 , nixosTests
+, buildxSupport ? false
 }:
 
 with lib;
@@ -15,7 +16,7 @@ rec {
       , mobyRev, mobySha256
       , runcRev, runcSha256
       , containerdRev, containerdSha256
-      , tiniRev, tiniSha256
+      , tiniRev, tiniSha256, buildxSupport
     } :
   let
     docker-runc = runc.overrideAttrs (oldAttrs: {
@@ -142,7 +143,7 @@ rec {
       makeWrapper
     ] ++ optionals (stdenv.isLinux) [
       sqlite lvm2 btrfs-progs systemd libseccomp
-    ];
+    ] ++ optionals (buildxSupport) [ docker-buildx ];
 
     # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables
     buildPhase = ''
@@ -167,6 +168,9 @@ rec {
       substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
       substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man"
       substituteInPlace ./man/md2man-all.sh            --replace md2man go-md2man
+    '' + optionalString buildxSupport ''
+      substituteInPlace ./components/cli/cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
+          ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
     '';
 
     outputs = ["out" "man"];
@@ -224,5 +228,6 @@ rec {
     containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";
     tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0
     tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
+    inherit buildxSupport;
   };
 }

From 7f2fcc45f734c1e73cef2d7063562b9e411c2614 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Thu, 21 Jan 2021 21:57:48 +0100
Subject: [PATCH 498/956] lib/modules: Set submodule type for renamed option
 sets

For renames like

  mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ]

where the target is an option set (like services.picom) instead of a single
option (like services.picom.enable), previously the renamed option type
was unset, leading to it being `types.unspecified`.

This changes it to be `types.submodule {}` instead, which makes more
sense.
---
 lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 3f2bfd478b0..33a0d84a6d7 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -895,7 +895,7 @@ rec {
       fromOpt = getAttrFromPath from options;
       toOf = attrByPath to
         (abort "Renaming error: option `${showOption to}' does not exist.");
-      toType = let opt = attrByPath to {} options; in opt.type or null;
+      toType = let opt = attrByPath to {} options; in opt.type or (types.submodule {});
     in
     {
       options = setAttrByPath from (mkOption {

From 36e3285c7becd3875cde4b349981272adad8bb4f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 20:58:41 +0000
Subject: [PATCH 499/956] disorderfs: 0.5.6 -> 0.5.11

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

diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index 497a6ad0e0a..27dc55fb926 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "disorderfs";
-  version = "0.5.6";
+  version = "0.5.11";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2";
-    sha256 = "0xlsl6cw1p0d92crknrcf4iabgig0185dzp80qxh9iyjy42d27gk";
+    sha256 = "sha256-KqAMKVUykCgVdNyjacZjpVXqVdeob76v0iOuSd4TNIY=";
   };
 
   nativeBuildInputs = [ pkg-config asciidoc ];

From 29954335b7d9933c7846f01ff5b6d07c9fc39263 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Thu, 21 Jan 2021 11:09:20 -0800
Subject: [PATCH 500/956] ocamlPackages_4_12.ocaml: alpha3 -> beta1

---
 pkgs/development/compilers/ocaml/4.12.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix
index 16649f09869..c422d2a15a3 100644
--- a/pkgs/development/compilers/ocaml/4.12.nix
+++ b/pkgs/development/compilers/ocaml/4.12.nix
@@ -1,9 +1,9 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "12";
-  patch_version = "0-alpha3";
+  patch_version = "0-beta1";
   src = fetchTarball {
-    url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz";
-    sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw";
+    url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~beta1.tar.xz";
+    sha256 = "1rny74mi0knl8byqg2naw1mgvn22c2zihlwvzbkd56j97flqsxsm";
   };
 }

From 91a799fa82ef817d88f913084622c3f1235c96ae Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 Jan 2021 07:08:33 +1000
Subject: [PATCH 501/956] .editorconfig: drop gemset

---
 .editorconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e21731d10cf..05f202c118a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -63,9 +63,6 @@ insert_final_newline = unset
 [eggs.nix]
 trim_trailing_whitespace = unset
 
-[gemset*.nix]
-insert_final_newline = unset
-
 [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
 trim_trailing_whitespace = unset
 

From 0ebfeaeca15e58909aa91237489beadb277b2349 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 Jan 2021 07:08:33 +1000
Subject: [PATCH 502/956] bundix: add final newline patch

---
 pkgs/development/ruby-modules/bundix/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 34114ad9a4f..f3ac42b9406 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -1,5 +1,5 @@
 { buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix,
-  nix-prefetch-git }:
+  nix-prefetch-git, fetchpatch }:
 
 buildRubyGem rec {
   inherit (bundler) ruby;
@@ -15,6 +15,15 @@ buildRubyGem rec {
     sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8";
   };
 
+  patches = [
+    # write trailing newline to gemset.nix
+    # https://github.com/nix-community/bundix/pull/78
+    (fetchpatch {
+      url = "https://github.com/nix-community/bundix/commit/02ca7a6c656a1e5e5465ad78b31040d82ae1a7e6.patch";
+      sha256 = "18r30icv7r79dlmxz1d1qlk5b6c7r257x23sqav55yhfail9hqrb";
+    })
+  ];
+
   buildInputs = [ ruby bundler ];
   nativeBuildInputs = [ makeWrapper ];
 

From 59b83c43e053ca31f25187792bc1cf59a8968324 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 Jan 2021 07:12:40 +1000
Subject: [PATCH 503/956] treewide: add final newline

---
 pkgs/applications/audio/tree-from-tags/gemset.nix               | 2 +-
 pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix      | 2 +-
 pkgs/applications/graphics/image_optim/gemset.nix               | 2 +-
 pkgs/applications/misc/doing/gemset.nix                         | 2 +-
 .../networking/wayback_machine_downloader/gemset.nix            | 2 +-
 .../git-and-tools/bitbucket-server-cli/gemset.nix               | 2 +-
 .../version-management/git-and-tools/git-fame/gemset.nix        | 2 +-
 pkgs/applications/version-management/gitlab-triage/gemset.nix   | 2 +-
 pkgs/applications/version-management/gitlab/gitaly/gemset.nix   | 2 +-
 pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix  | 2 +-
 pkgs/applications/version-management/redmine/gemset.nix         | 2 +-
 pkgs/development/compilers/matter-compiler/gemset.nix           | 2 +-
 pkgs/development/mobile/cocoapods/gemset-beta.nix               | 2 +-
 pkgs/development/mobile/cocoapods/gemset.nix                    | 2 +-
 pkgs/development/ruby-modules/solargraph/gemset.nix             | 2 +-
 pkgs/development/tools/build-managers/drake/gemset.nix          | 2 +-
 pkgs/development/tools/build-managers/rake/gemset.nix           | 2 +-
 pkgs/development/tools/cadre/gemset.nix                         | 2 +-
 pkgs/development/tools/cbor-diag/gemset.nix                     | 2 +-
 pkgs/development/tools/cddl/gemset.nix                          | 2 +-
 pkgs/development/tools/chefdk/gemset.nix                        | 2 +-
 pkgs/development/tools/compass/gemset.nix                       | 2 +-
 pkgs/development/tools/corundum/gemset.nix                      | 2 +-
 pkgs/development/tools/cucumber/gemset.nix                      | 2 +-
 pkgs/development/tools/ejson/gemset.nix                         | 2 +-
 pkgs/development/tools/github-changelog-generator/gemset.nix    | 2 +-
 pkgs/development/tools/jazzy/gemset.nix                         | 2 +-
 pkgs/development/tools/misc/mdl/gemset.nix                      | 2 +-
 pkgs/development/tools/misc/one_gadget/gemset.nix               | 2 +-
 pkgs/development/tools/misc/travis/gemset.nix                   | 2 +-
 pkgs/development/tools/misc/watson-ruby/gemset.nix              | 2 +-
 pkgs/development/tools/overcommit/gemset.nix                    | 2 +-
 pkgs/development/tools/pry/gemset.nix                           | 2 +-
 pkgs/development/tools/puppet/puppet-lint/gemset.nix            | 2 +-
 pkgs/development/tools/redis-dump/gemset.nix                    | 2 +-
 pkgs/development/tools/ronn/gemset.nix                          | 2 +-
 pkgs/development/tools/rubocop/gemset.nix                       | 2 +-
 pkgs/development/tools/rufo/gemset.nix                          | 2 +-
 pkgs/development/tools/sass/gemset.nix                          | 2 +-
 pkgs/development/tools/scss-lint/gemset.nix                     | 2 +-
 pkgs/development/tools/sqlint/gemset.nix                        | 2 +-
 pkgs/development/tools/vagrant/gemset.nix                       | 2 +-
 pkgs/development/tools/vagrant/gemset_libvirt.nix               | 2 +-
 pkgs/development/tools/xcpretty/gemset.nix                      | 2 +-
 pkgs/development/web/mailcatcher/gemset.nix                     | 2 +-
 pkgs/servers/http/showoff/gemset.nix                            | 2 +-
 pkgs/servers/monitoring/riemann-dash/gemset.nix                 | 2 +-
 pkgs/servers/monitoring/sensu/gemset.nix                        | 2 +-
 pkgs/servers/web-apps/frab/gemset.nix                           | 2 +-
 pkgs/tools/admin/fastlane/gemset.nix                            | 2 +-
 pkgs/tools/admin/oxidized/gemset.nix                            | 2 +-
 pkgs/tools/audio/mpdcron/gemset.nix                             | 2 +-
 pkgs/tools/backup/lvmsync/gemset.nix                            | 2 +-
 pkgs/tools/inputmethods/fusuma/gemset.nix                       | 2 +-
 pkgs/tools/misc/3llo/gemset.nix                                 | 2 +-
 pkgs/tools/misc/docker-sync/gemset.nix                          | 2 +-
 pkgs/tools/misc/fluentd/gemset.nix                              | 2 +-
 pkgs/tools/misc/haste-client/gemset.nix                         | 2 +-
 pkgs/tools/misc/homesick/gemset.nix                             | 2 +-
 pkgs/tools/misc/html-proofer/gemset.nix                         | 2 +-
 pkgs/tools/misc/lolcat/gemset.nix                               | 2 +-
 pkgs/tools/misc/pws/gemset.nix                                  | 2 +-
 pkgs/tools/misc/riemann-tools/gemset.nix                        | 2 +-
 pkgs/tools/misc/t/gemset.nix                                    | 2 +-
 pkgs/tools/misc/td/gemset.nix                                   | 2 +-
 pkgs/tools/misc/teamocil/gemset.nix                             | 2 +-
 pkgs/tools/networking/hue-cli/gemset.nix                        | 2 +-
 pkgs/tools/networking/maphosts/gemset.nix                       | 2 +-
 pkgs/tools/package-management/elm-github-install/gemset.nix     | 2 +-
 pkgs/tools/package-management/fpm/gemset.nix                    | 2 +-
 pkgs/tools/package-management/licensee/gemset.nix               | 2 +-
 pkgs/tools/security/bundler-audit/gemset.nix                    | 2 +-
 pkgs/tools/security/metasploit/gemset.nix                       | 2 +-
 pkgs/tools/system/colorls/gemset.nix                            | 2 +-
 pkgs/tools/system/foreman/gemset.nix                            | 2 +-
 pkgs/tools/system/hiera-eyaml/gemset.nix                        | 2 +-
 pkgs/tools/system/procodile/gemset.nix                          | 2 +-
 pkgs/tools/system/r10k/gemset.nix                               | 2 +-
 pkgs/tools/text/bcat/gemset.nix                                 | 2 +-
 pkgs/tools/text/kramdown-rfc2629/gemset.nix                     | 2 +-
 pkgs/tools/text/papertrail/gemset.nix                           | 2 +-
 pkgs/tools/text/reckon/gemset.nix                               | 2 +-
 pkgs/tools/text/ruby-zoom/gemset.nix                            | 2 +-
 pkgs/tools/typesetting/asciidoctor/gemset.nix                   | 2 +-
 pkgs/tools/typesetting/docbookrx/gemset.nix                     | 2 +-
 pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix             | 2 +-
 pkgs/tools/virtualization/vpsfree-client/gemset.nix             | 2 +-
 87 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/pkgs/applications/audio/tree-from-tags/gemset.nix b/pkgs/applications/audio/tree-from-tags/gemset.nix
index 20e10e9d93b..f482d174ebc 100644
--- a/pkgs/applications/audio/tree-from-tags/gemset.nix
+++ b/pkgs/applications/audio/tree-from-tags/gemset.nix
@@ -7,4 +7,4 @@
     };
     version = "0.7.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix b/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix
index 1ba77a058ea..59630f0a53d 100644
--- a/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix
+++ b/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix
@@ -426,4 +426,4 @@
     };
     version = "8.2.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/graphics/image_optim/gemset.nix b/pkgs/applications/graphics/image_optim/gemset.nix
index 6c9ec2de745..08e7f5c78ef 100644
--- a/pkgs/applications/graphics/image_optim/gemset.nix
+++ b/pkgs/applications/graphics/image_optim/gemset.nix
@@ -48,4 +48,4 @@
     };
     version = "3.5.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/doing/gemset.nix b/pkgs/applications/misc/doing/gemset.nix
index b30a124bb58..1e39123a83b 100644
--- a/pkgs/applications/misc/doing/gemset.nix
+++ b/pkgs/applications/misc/doing/gemset.nix
@@ -57,4 +57,4 @@
     };
     version = "2.0.8";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
index 615570f1f09..1ef3cd36536 100644
--- a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
+++ b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
@@ -9,4 +9,4 @@
     };
     version = "2.2.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
index a7c1406665e..844291b0905 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
@@ -63,4 +63,4 @@
     };
     version = "2.0.5";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
index 49b4af4ef6d..07dd36ac68a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
@@ -57,4 +57,4 @@
     };
     version = "2.1.2";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/applications/version-management/gitlab-triage/gemset.nix
index 1ce8450bba1..52748770661 100644
--- a/pkgs/applications/version-management/gitlab-triage/gemset.nix
+++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix
@@ -115,4 +115,4 @@
     };
     version = "1.2.7";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index fe05c1d0178..b4a6b0e78eb 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -855,4 +855,4 @@
     };
     version = "2.4.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index ebb3fe5b740..a4758f7418e 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -5558,4 +5558,4 @@
     };
     version = "2.4.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index 9a4deb7e155..a8fd6eba6f0 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -875,4 +875,4 @@
     };
     version = "0.9.24";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/compilers/matter-compiler/gemset.nix b/pkgs/development/compilers/matter-compiler/gemset.nix
index 014fc226607..2ef9e911b82 100644
--- a/pkgs/development/compilers/matter-compiler/gemset.nix
+++ b/pkgs/development/compilers/matter-compiler/gemset.nix
@@ -9,4 +9,4 @@
     };
     version = "0.5.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix
index 9067f2cec43..195f0901a19 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -371,4 +371,4 @@
     };
     version = "1.19.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index 3641186186e..732d2a2cdd8 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -349,4 +349,4 @@
     };
     version = "1.19.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 804fa917fd2..cd9575f1283 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -247,4 +247,4 @@
     };
     version = "0.9.26";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/build-managers/drake/gemset.nix b/pkgs/development/tools/build-managers/drake/gemset.nix
index 061ed5d973a..09b3bc7ec06 100644
--- a/pkgs/development/tools/build-managers/drake/gemset.nix
+++ b/pkgs/development/tools/build-managers/drake/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "0.9.2.0.3.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/pkgs/development/tools/build-managers/rake/gemset.nix
index 05a59cff850..534c5efcfb1 100644
--- a/pkgs/development/tools/build-managers/rake/gemset.nix
+++ b/pkgs/development/tools/build-managers/rake/gemset.nix
@@ -9,4 +9,4 @@
     };
     version = "12.3.2";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/cadre/gemset.nix b/pkgs/development/tools/cadre/gemset.nix
index 33fd428debf..e98f5c5f3e6 100644
--- a/pkgs/development/tools/cadre/gemset.nix
+++ b/pkgs/development/tools/cadre/gemset.nix
@@ -32,4 +32,4 @@
     };
     version = "1.2.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/pkgs/development/tools/cbor-diag/gemset.nix
index 49de5b06f54..c3fa8f42069 100644
--- a/pkgs/development/tools/cbor-diag/gemset.nix
+++ b/pkgs/development/tools/cbor-diag/gemset.nix
@@ -51,4 +51,4 @@
     };
     version = "1.6.10";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/development/tools/cddl/gemset.nix
index a66833e27d9..c1f1c64495e 100644
--- a/pkgs/development/tools/cddl/gemset.nix
+++ b/pkgs/development/tools/cddl/gemset.nix
@@ -92,4 +92,4 @@
     };
     version = "1.6.10";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix
index 326dfae7931..1f9522ba4c5 100644
--- a/pkgs/development/tools/chefdk/gemset.nix
+++ b/pkgs/development/tools/chefdk/gemset.nix
@@ -2453,4 +2453,4 @@
     };
     version = "1.0.5";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/compass/gemset.nix b/pkgs/development/tools/compass/gemset.nix
index 1beb3d3fec0..3e93f6e417a 100644
--- a/pkgs/development/tools/compass/gemset.nix
+++ b/pkgs/development/tools/compass/gemset.nix
@@ -93,4 +93,4 @@
     };
     version = "3.4.25";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/corundum/gemset.nix b/pkgs/development/tools/corundum/gemset.nix
index e395e098e6d..a6ec2f2b9b9 100644
--- a/pkgs/development/tools/corundum/gemset.nix
+++ b/pkgs/development/tools/corundum/gemset.nix
@@ -151,4 +151,4 @@
     };
     version = "1.2.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/development/tools/cucumber/gemset.nix
index 99d519a83b6..d96d9071806 100644
--- a/pkgs/development/tools/cucumber/gemset.nix
+++ b/pkgs/development/tools/cucumber/gemset.nix
@@ -111,4 +111,4 @@
     };
     version = "0.1.2";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/ejson/gemset.nix b/pkgs/development/tools/ejson/gemset.nix
index 70c61be984c..93fa1131f2a 100644
--- a/pkgs/development/tools/ejson/gemset.nix
+++ b/pkgs/development/tools/ejson/gemset.nix
@@ -185,4 +185,4 @@
     };
     version = "0.0.23";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/github-changelog-generator/gemset.nix b/pkgs/development/tools/github-changelog-generator/gemset.nix
index 3382557aaa5..173ee55b6e7 100644
--- a/pkgs/development/tools/github-changelog-generator/gemset.nix
+++ b/pkgs/development/tools/github-changelog-generator/gemset.nix
@@ -152,4 +152,4 @@
     };
     version = "1.2.5";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix
index aa4492560b8..6e2b873d4fd 100644
--- a/pkgs/development/tools/jazzy/gemset.nix
+++ b/pkgs/development/tools/jazzy/gemset.nix
@@ -431,4 +431,4 @@
     };
     version = "1.17.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix
index f2d332a95bb..eaaa7bed5a5 100644
--- a/pkgs/development/tools/misc/mdl/gemset.nix
+++ b/pkgs/development/tools/misc/mdl/gemset.nix
@@ -94,4 +94,4 @@
     };
     version = "2.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/misc/one_gadget/gemset.nix b/pkgs/development/tools/misc/one_gadget/gemset.nix
index 26507a26e91..89425f805b4 100644
--- a/pkgs/development/tools/misc/one_gadget/gemset.nix
+++ b/pkgs/development/tools/misc/one_gadget/gemset.nix
@@ -31,4 +31,4 @@
     };
     version = "1.7.2";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix
index e10475a916b..02b39bfca94 100644
--- a/pkgs/development/tools/misc/travis/gemset.nix
+++ b/pkgs/development/tools/misc/travis/gemset.nix
@@ -266,4 +266,4 @@
     };
     version = "1.2.8";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/misc/watson-ruby/gemset.nix b/pkgs/development/tools/misc/watson-ruby/gemset.nix
index a3bb144899c..2f865820f5a 100644
--- a/pkgs/development/tools/misc/watson-ruby/gemset.nix
+++ b/pkgs/development/tools/misc/watson-ruby/gemset.nix
@@ -15,4 +15,4 @@
     };
     version = "1.6.3";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/development/tools/overcommit/gemset.nix
index b7d58c0ea70..95244c1afe6 100644
--- a/pkgs/development/tools/overcommit/gemset.nix
+++ b/pkgs/development/tools/overcommit/gemset.nix
@@ -30,4 +30,4 @@
     };
     version = "0.51.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/pry/gemset.nix b/pkgs/development/tools/pry/gemset.nix
index 05e5e1dcfb8..c3f42889e1f 100644
--- a/pkgs/development/tools/pry/gemset.nix
+++ b/pkgs/development/tools/pry/gemset.nix
@@ -30,4 +30,4 @@
     };
     version = "0.13.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/development/tools/puppet/puppet-lint/gemset.nix
index 86d18b0c554..d42626f1cd5 100644
--- a/pkgs/development/tools/puppet/puppet-lint/gemset.nix
+++ b/pkgs/development/tools/puppet/puppet-lint/gemset.nix
@@ -7,4 +7,4 @@
     };
     version = "2.3.6";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/redis-dump/gemset.nix b/pkgs/development/tools/redis-dump/gemset.nix
index 2bfaa1fb952..74e6d4e1b32 100644
--- a/pkgs/development/tools/redis-dump/gemset.nix
+++ b/pkgs/development/tools/redis-dump/gemset.nix
@@ -50,4 +50,4 @@
     };
     version = "1.4.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/development/tools/ronn/gemset.nix
index ce804e1f9f5..534741a6993 100644
--- a/pkgs/development/tools/ronn/gemset.nix
+++ b/pkgs/development/tools/ronn/gemset.nix
@@ -31,4 +31,4 @@
     };
     version = "0.7.3";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index e22424c1ae6..4fc468a177d 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -102,4 +102,4 @@
     };
     version = "2.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/rufo/gemset.nix b/pkgs/development/tools/rufo/gemset.nix
index cd5c2c462a9..1c63c3f3b79 100644
--- a/pkgs/development/tools/rufo/gemset.nix
+++ b/pkgs/development/tools/rufo/gemset.nix
@@ -9,4 +9,4 @@
     };
     version = "0.12.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/development/tools/sass/gemset.nix
index f4fdc899abf..c0c5937b15a 100644
--- a/pkgs/development/tools/sass/gemset.nix
+++ b/pkgs/development/tools/sass/gemset.nix
@@ -52,4 +52,4 @@
     };
     version = "4.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/scss-lint/gemset.nix b/pkgs/development/tools/scss-lint/gemset.nix
index 46747f04939..027522e58f8 100644
--- a/pkgs/development/tools/scss-lint/gemset.nix
+++ b/pkgs/development/tools/scss-lint/gemset.nix
@@ -59,4 +59,4 @@
     };
     version = "0.57.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix
index a86277363fb..aeffdccffa1 100644
--- a/pkgs/development/tools/sqlint/gemset.nix
+++ b/pkgs/development/tools/sqlint/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "0.1.10";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index 169c3533efc..e617e1a5872 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -363,4 +363,4 @@
     };
     version = "1.3.5";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix
index df6b6c40496..f50f4438f50 100644
--- a/pkgs/development/tools/vagrant/gemset_libvirt.nix
+++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix
@@ -156,4 +156,4 @@
     };
     version = "0.2.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/xcpretty/gemset.nix b/pkgs/development/tools/xcpretty/gemset.nix
index 30c68a93c13..ef5591c30cf 100644
--- a/pkgs/development/tools/xcpretty/gemset.nix
+++ b/pkgs/development/tools/xcpretty/gemset.nix
@@ -16,4 +16,4 @@
     };
     version = "0.3.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/development/web/mailcatcher/gemset.nix
index 7603e8ff2ef..96d07e2dfce 100644
--- a/pkgs/development/web/mailcatcher/gemset.nix
+++ b/pkgs/development/web/mailcatcher/gemset.nix
@@ -125,4 +125,4 @@
     };
     version = "2.0.9";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/http/showoff/gemset.nix b/pkgs/servers/http/showoff/gemset.nix
index 334f09e8a0d..d493a0a7975 100644
--- a/pkgs/servers/http/showoff/gemset.nix
+++ b/pkgs/servers/http/showoff/gemset.nix
@@ -228,4 +228,4 @@
     };
     version = "2.0.9";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix
index f2446be79f6..742dbde6b17 100644
--- a/pkgs/servers/monitoring/riemann-dash/gemset.nix
+++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix
@@ -135,4 +135,4 @@
     };
     version = "1.3.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix
index 32134255711..6fcee927b70 100644
--- a/pkgs/servers/monitoring/sensu/gemset.nix
+++ b/pkgs/servers/monitoring/sensu/gemset.nix
@@ -630,4 +630,4 @@
     };
     version = "0.0.7.6";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/web-apps/frab/gemset.nix b/pkgs/servers/web-apps/frab/gemset.nix
index c3259a2709c..cf39de25ea6 100644
--- a/pkgs/servers/web-apps/frab/gemset.nix
+++ b/pkgs/servers/web-apps/frab/gemset.nix
@@ -995,4 +995,4 @@
     };
     version = "0.9.5";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix
index a3c32f7c5de..e747537b241 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/pkgs/tools/admin/fastlane/gemset.nix
@@ -756,4 +756,4 @@
     };
     version = "1.0.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix
index ff77102af12..f6a3aaa6780 100644
--- a/pkgs/tools/admin/oxidized/gemset.nix
+++ b/pkgs/tools/admin/oxidized/gemset.nix
@@ -301,4 +301,4 @@
     };
     version = "2.0.9";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/audio/mpdcron/gemset.nix b/pkgs/tools/audio/mpdcron/gemset.nix
index 025eb96b065..836878c9d88 100644
--- a/pkgs/tools/audio/mpdcron/gemset.nix
+++ b/pkgs/tools/audio/mpdcron/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "1.10.3";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/tools/backup/lvmsync/gemset.nix
index 7f80e928660..f17aa513a1f 100644
--- a/pkgs/tools/backup/lvmsync/gemset.nix
+++ b/pkgs/tools/backup/lvmsync/gemset.nix
@@ -33,4 +33,4 @@
     };
     version = "1.6.9";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/inputmethods/fusuma/gemset.nix b/pkgs/tools/inputmethods/fusuma/gemset.nix
index 2dd9af421ba..87e0ae14da8 100644
--- a/pkgs/tools/inputmethods/fusuma/gemset.nix
+++ b/pkgs/tools/inputmethods/fusuma/gemset.nix
@@ -9,4 +9,4 @@
     };
     version = "1.3.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix
index 5c50ea9b212..c6e60d4b668 100644
--- a/pkgs/tools/misc/3llo/gemset.nix
+++ b/pkgs/tools/misc/3llo/gemset.nix
@@ -82,4 +82,4 @@
     };
     version = "1.6.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/docker-sync/gemset.nix b/pkgs/tools/misc/docker-sync/gemset.nix
index 739d11c7b5a..aef4d9928ab 100644
--- a/pkgs/tools/misc/docker-sync/gemset.nix
+++ b/pkgs/tools/misc/docker-sync/gemset.nix
@@ -73,4 +73,4 @@
     };
     version = "0.20.3";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix
index a4b488597c7..67b72d634bc 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/pkgs/tools/misc/fluentd/gemset.nix
@@ -540,4 +540,4 @@
     };
     version = "1.4.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/haste-client/gemset.nix b/pkgs/tools/misc/haste-client/gemset.nix
index 49959531ae9..e6cbbff11aa 100644
--- a/pkgs/tools/misc/haste-client/gemset.nix
+++ b/pkgs/tools/misc/haste-client/gemset.nix
@@ -488,4 +488,4 @@
     };
     version = "2.1.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/homesick/gemset.nix b/pkgs/tools/misc/homesick/gemset.nix
index f5144827680..4a01696c2c7 100644
--- a/pkgs/tools/misc/homesick/gemset.nix
+++ b/pkgs/tools/misc/homesick/gemset.nix
@@ -16,4 +16,4 @@
     };
     version = "0.20.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index d6801512ca4..92ce4b8bf82 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -135,4 +135,4 @@
     };
     version = "2.2.2";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix
index 421e1874db7..9d71d400a69 100644
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@@ -40,4 +40,4 @@
     };
     version = "2.2.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/pws/gemset.nix b/pkgs/tools/misc/pws/gemset.nix
index 2aa26f9a020..e0b263e86a5 100644
--- a/pkgs/tools/misc/pws/gemset.nix
+++ b/pkgs/tools/misc/pws/gemset.nix
@@ -31,4 +31,4 @@
     };
     version = "1.0.6";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/tools/misc/riemann-tools/gemset.nix
index e775de987d6..57acb5ac901 100644
--- a/pkgs/tools/misc/riemann-tools/gemset.nix
+++ b/pkgs/tools/misc/riemann-tools/gemset.nix
@@ -71,4 +71,4 @@
     };
     version = "2.9.9";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/tools/misc/t/gemset.nix
index f3627e8d6e9..a61eb81b1da 100644
--- a/pkgs/tools/misc/t/gemset.nix
+++ b/pkgs/tools/misc/t/gemset.nix
@@ -259,4 +259,4 @@
     };
     version = "0.0.7.6";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/td/gemset.nix b/pkgs/tools/misc/td/gemset.nix
index e4680640ae2..53d9df0502d 100644
--- a/pkgs/tools/misc/td/gemset.nix
+++ b/pkgs/tools/misc/td/gemset.nix
@@ -100,4 +100,4 @@
     };
     version = "0.3";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/tools/misc/teamocil/gemset.nix
index f363d62b6d6..2c522b096c8 100644
--- a/pkgs/tools/misc/teamocil/gemset.nix
+++ b/pkgs/tools/misc/teamocil/gemset.nix
@@ -7,4 +7,4 @@
     };
     version = "1.4.2";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/tools/networking/hue-cli/gemset.nix
index 69d12f25a80..08fd67c3885 100644
--- a/pkgs/tools/networking/hue-cli/gemset.nix
+++ b/pkgs/tools/networking/hue-cli/gemset.nix
@@ -31,4 +31,4 @@
     };
     version = "2.2.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/networking/maphosts/gemset.nix b/pkgs/tools/networking/maphosts/gemset.nix
index 3469d76ea65..b50653bc96d 100644
--- a/pkgs/tools/networking/maphosts/gemset.nix
+++ b/pkgs/tools/networking/maphosts/gemset.nix
@@ -31,4 +31,4 @@
     };
     version = "1.1.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/package-management/elm-github-install/gemset.nix b/pkgs/tools/package-management/elm-github-install/gemset.nix
index d310b41d7aa..de7f8e20b64 100644
--- a/pkgs/tools/package-management/elm-github-install/gemset.nix
+++ b/pkgs/tools/package-management/elm-github-install/gemset.nix
@@ -111,4 +111,4 @@
     };
     version = "2.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix
index 13d1669e540..654a640c6ec 100644
--- a/pkgs/tools/package-management/fpm/gemset.nix
+++ b/pkgs/tools/package-management/fpm/gemset.nix
@@ -154,4 +154,4 @@
     };
     version = "0.0.23";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix
index 2ec00c621ca..281f9376e17 100644
--- a/pkgs/tools/package-management/licensee/gemset.nix
+++ b/pkgs/tools/package-management/licensee/gemset.nix
@@ -136,4 +136,4 @@
     };
     version = "1.0.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/pkgs/tools/security/bundler-audit/gemset.nix
index 2121a3c08e5..c543920549f 100644
--- a/pkgs/tools/security/bundler-audit/gemset.nix
+++ b/pkgs/tools/security/bundler-audit/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "1.0.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 18ad75c0d5e..a4ea5ec8c4f 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -1401,4 +1401,4 @@
     };
     version = "2.4.2";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/tools/system/colorls/gemset.nix
index 850aae35684..b978a4762ac 100644
--- a/pkgs/tools/system/colorls/gemset.nix
+++ b/pkgs/tools/system/colorls/gemset.nix
@@ -60,4 +60,4 @@
     };
     version = "1.7.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/system/foreman/gemset.nix b/pkgs/tools/system/foreman/gemset.nix
index b35bd15c974..f747a2b0634 100644
--- a/pkgs/tools/system/foreman/gemset.nix
+++ b/pkgs/tools/system/foreman/gemset.nix
@@ -15,4 +15,4 @@
       sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/system/hiera-eyaml/gemset.nix b/pkgs/tools/system/hiera-eyaml/gemset.nix
index d5aa722e5fc..cf7d8d6905d 100644
--- a/pkgs/tools/system/hiera-eyaml/gemset.nix
+++ b/pkgs/tools/system/hiera-eyaml/gemset.nix
@@ -28,4 +28,4 @@
     };
     version = "3.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/system/procodile/gemset.nix b/pkgs/tools/system/procodile/gemset.nix
index 36ec2a9cf18..f5b73b617bb 100644
--- a/pkgs/tools/system/procodile/gemset.nix
+++ b/pkgs/tools/system/procodile/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "1.0.23";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/tools/system/r10k/gemset.nix
index d0e955d4cea..9b46cce00da 100644
--- a/pkgs/tools/system/r10k/gemset.nix
+++ b/pkgs/tools/system/r10k/gemset.nix
@@ -165,4 +165,4 @@
     };
     version = "1.3.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/text/bcat/gemset.nix b/pkgs/tools/text/bcat/gemset.nix
index 75de0e5cf38..9471ffae8dd 100644
--- a/pkgs/tools/text/bcat/gemset.nix
+++ b/pkgs/tools/text/bcat/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "1.6.11";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/text/kramdown-rfc2629/gemset.nix b/pkgs/tools/text/kramdown-rfc2629/gemset.nix
index 65d1c234de2..bf0cf130c42 100644
--- a/pkgs/tools/text/kramdown-rfc2629/gemset.nix
+++ b/pkgs/tools/text/kramdown-rfc2629/gemset.nix
@@ -30,4 +30,4 @@
     };
     version = "1.2.13";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/tools/text/papertrail/gemset.nix
index 91bfe319896..dcdfcdf7ea5 100644
--- a/pkgs/tools/text/papertrail/gemset.nix
+++ b/pkgs/tools/text/papertrail/gemset.nix
@@ -23,4 +23,4 @@
     };
     version = "0.10.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/tools/text/reckon/gemset.nix
index d0a874cc68f..50802ccd805 100644
--- a/pkgs/tools/text/reckon/gemset.nix
+++ b/pkgs/tools/text/reckon/gemset.nix
@@ -38,4 +38,4 @@
     };
     version = "0.6.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/text/ruby-zoom/gemset.nix b/pkgs/tools/text/ruby-zoom/gemset.nix
index f4c637aadf8..19584787d90 100644
--- a/pkgs/tools/text/ruby-zoom/gemset.nix
+++ b/pkgs/tools/text/ruby-zoom/gemset.nix
@@ -61,4 +61,4 @@
     };
     version = "1.0.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
index db47fbf2285..db0f67d3a58 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -420,4 +420,4 @@
     };
     version = "1.5.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/typesetting/docbookrx/gemset.nix b/pkgs/tools/typesetting/docbookrx/gemset.nix
index 33a58845b22..bd756b996bb 100644
--- a/pkgs/tools/typesetting/docbookrx/gemset.nix
+++ b/pkgs/tools/typesetting/docbookrx/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "1.8.5";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix
index 8a0ffda9e78..0ade973304d 100644
--- a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix
@@ -20,4 +20,4 @@
     };
     version = "1.0.1";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/tools/virtualization/vpsfree-client/gemset.nix
index 366c5836bd3..a1b4376f948 100644
--- a/pkgs/tools/virtualization/vpsfree-client/gemset.nix
+++ b/pkgs/tools/virtualization/vpsfree-client/gemset.nix
@@ -313,4 +313,4 @@
     };
     version = "2.3.0";
   };
-}
\ No newline at end of file
+}

From 19cca51092bd924a981ed77ba8d90ce3cafe6e63 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 Jan 2021 07:38:22 +1000
Subject: [PATCH 504/956] .editorconfig: drop deps.nix

---
 .editorconfig | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e21731d10cf..5a0455ace18 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -55,11 +55,6 @@ trim_trailing_whitespace = unset
 [*.lock]
 indent_size = unset
 
-[deps.nix]
-insert_final_newline = unset
-[pkgs/tools/networking/dd-agent/*-deps.nix]
-insert_final_newline = unset
-
 [eggs.nix]
 trim_trailing_whitespace = unset
 

From 2ab13ca162762e8728c3f9bdac92cd9c933ed41f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 Jan 2021 07:38:38 +1000
Subject: [PATCH 505/956] treewide: add final newline

---
 pkgs/applications/networking/browsers/browsh/deps.nix         | 2 +-
 pkgs/development/tools/fac/deps.nix                           | 2 +-
 pkgs/development/tools/gopkgs/deps.nix                        | 2 +-
 pkgs/development/tools/kube-prompt/deps.nix                   | 2 +-
 pkgs/development/tools/tychus/deps.nix                        | 2 +-
 pkgs/servers/cayley/deps.nix                                  | 2 +-
 pkgs/tools/backup/duplicacy/deps.nix                          | 2 +-
 pkgs/tools/networking/dd-agent/datadog-agent-deps.nix         | 2 +-
 pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix | 2 +-
 pkgs/tools/networking/kail/deps.nix                           | 2 +-
 pkgs/tools/package-management/morph/deps.nix                  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/pkgs/applications/networking/browsers/browsh/deps.nix
index 9a6a898beb5..12154af752d 100644
--- a/pkgs/applications/networking/browsers/browsh/deps.nix
+++ b/pkgs/applications/networking/browsers/browsh/deps.nix
@@ -261,4 +261,4 @@
       sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix
index 65335497e5f..8545bae7e22 100644
--- a/pkgs/development/tools/fac/deps.nix
+++ b/pkgs/development/tools/fac/deps.nix
@@ -63,4 +63,4 @@
       sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/development/tools/gopkgs/deps.nix b/pkgs/development/tools/gopkgs/deps.nix
index 715c7bbbc82..e813a5b2256 100644
--- a/pkgs/development/tools/gopkgs/deps.nix
+++ b/pkgs/development/tools/gopkgs/deps.nix
@@ -18,4 +18,4 @@
       sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/pkgs/development/tools/kube-prompt/deps.nix
index e2391789a41..b8d9e200a8c 100644
--- a/pkgs/development/tools/kube-prompt/deps.nix
+++ b/pkgs/development/tools/kube-prompt/deps.nix
@@ -306,4 +306,4 @@
       sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/development/tools/tychus/deps.nix b/pkgs/development/tools/tychus/deps.nix
index 194aa96ae3c..e8897efffc9 100644
--- a/pkgs/development/tools/tychus/deps.nix
+++ b/pkgs/development/tools/tychus/deps.nix
@@ -27,4 +27,4 @@
       sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix
index eb3dce827bd..d4ec2670365 100644
--- a/pkgs/servers/cayley/deps.nix
+++ b/pkgs/servers/cayley/deps.nix
@@ -468,4 +468,4 @@
       sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/backup/duplicacy/deps.nix b/pkgs/tools/backup/duplicacy/deps.nix
index e7bf7e91f89..83d69d398cb 100644
--- a/pkgs/tools/backup/duplicacy/deps.nix
+++ b/pkgs/tools/backup/duplicacy/deps.nix
@@ -405,4 +405,4 @@
       sha256 = "17zfx4xgqjamk7rc1sivm5gppkh3j4qp3i294w9rqbv0rqi0c9pq";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix
index 1121ec0405c..fb6f66b5a4e 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix
@@ -1350,4 +1350,4 @@
       sha256 = "1wpqijsvf8s4iqjrrzgbxi3gay6vaglscyq14vxma4iacg8fx1jk";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
index 2a81702feee..4533b31dd23 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
@@ -666,4 +666,4 @@
       sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/networking/kail/deps.nix b/pkgs/tools/networking/kail/deps.nix
index ee5d2fb8271..b6d9c3e9cf3 100644
--- a/pkgs/tools/networking/kail/deps.nix
+++ b/pkgs/tools/networking/kail/deps.nix
@@ -405,4 +405,4 @@
       sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9";
     };
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/package-management/morph/deps.nix b/pkgs/tools/package-management/morph/deps.nix
index 4da6f0278b7..fdae5ef39ee 100644
--- a/pkgs/tools/package-management/morph/deps.nix
+++ b/pkgs/tools/package-management/morph/deps.nix
@@ -63,4 +63,4 @@
       sha256 = "06xrp05njwam4sn031fkmd4gym5wfsw5q0v24nqhs4883lsx9dwq";
     };
   }
-]
\ No newline at end of file
+]

From 722c5a831603b8a8741f57688c1217c5c8fea127 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 22 Jan 2021 08:06:10 +1000
Subject: [PATCH 506/956] crun: 0.16 -> 0.17

https://github.com/containers/crun/releases/tag/0.17
---
 pkgs/applications/virtualization/crun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 3f4bbedbc1b..143d2fdcea3 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "0.16";
+  version = "0.17";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    sha256 = "03547axiwv161sbymh2vxqx591xr4nq6b9y8y45m15xvfv0f7vl8";
+    sha256 = "sha256-OdB7UXLG99ErbfSCvq87LxBy5EYkUvTfyQNG70RFbl4=";
     fetchSubmodules = true;
   };
 

From 62acc9aa8f142c297d496688a8305dad8b331483 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 21 Jan 2021 23:03:48 +0100
Subject: [PATCH 507/956] liquibase: cleaning up

---
 .../tools/database/liquibase/default.nix          | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 6eb24a812aa..2aa774940ec 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -1,11 +1,8 @@
-{ stdenv, fetchurl, jre, makeWrapper
-, mysqlSupport ? true, mysql_jdbc ? null }:
+{ lib, stdenv, fetchurl, jre, makeWrapper
+, mysqlSupport ? true, mysql_jdbc }:
 
-assert mysqlSupport -> mysql_jdbc != null;
-
-with stdenv.lib;
 let
-  extraJars = optional mysqlSupport mysql_jdbc;
+  extraJars = lib.optional mysqlSupport mysql_jdbc;
 in
 
 stdenv.mkDerivation rec {
@@ -47,15 +44,15 @@ stdenv.mkDerivation rec {
       # taken from the executable script in the source
       CP="$out/liquibase.jar"
       ${addJars "$out/lib"}
-      ${concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}
+      ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}
 
-      ${getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \
+      ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \
         liquibase.integration.commandline.Main \''${1+"\$@"}
       EOF
       chmod +x $out/bin/liquibase
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Version Control for your database";
     homepage = "https://www.liquibase.org/";
     changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt";

From 0e4faa73d27666a24db387e684c45f2511ae86d2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 4 Dec 2020 19:02:41 +0100
Subject: [PATCH 508/956] liquibase: support PostgreSQL JDBC driver

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

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 2aa774940ec..16e5fce1ebc 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -1,8 +1,11 @@
 { lib, stdenv, fetchurl, jre, makeWrapper
-, mysqlSupport ? true, mysql_jdbc }:
+, mysqlSupport ? true, mysql_jdbc
+, postgresqlSupport ? true, postgresql_jdbc }:
 
 let
-  extraJars = lib.optional mysqlSupport mysql_jdbc;
+  extraJars =
+    lib.optional mysqlSupport mysql_jdbc
+    ++ lib.optional postgresqlSupport postgresql_jdbc;
 in
 
 stdenv.mkDerivation rec {

From 1c5456573c896ff1a1e8373df364836bc6ff9046 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jan 2021 23:38:58 +0100
Subject: [PATCH 509/956] python3Packages.awesomeversion: 20.12.5 -> 21.1.3

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

diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix
index a49e55abe10..2c00baf39a8 100644
--- a/pkgs/development/python-modules/awesomeversion/default.nix
+++ b/pkgs/development/python-modules/awesomeversion/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "awesomeversion";
-  version = "20.12.5";
+  version = "21.1.3";
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = pname;
     rev = version;
-    sha256 = "1jwlfqnrqlxjp30fj9bcqh7vgicmpdbn5kjdcmll4srnl87lalfg";
+    sha256 = "sha256-D31wmBrYFCArHddAINWjfTPow4K2TD+wGfmRUuIaBdA=";
   };
 
   postPatch = ''

From c6cf9bcf0b9ab414ea1fef2da407ac322959e49c Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 21 Jan 2021 19:52:57 -0300
Subject: [PATCH 510/956] nixos/libinput: add missing renamed module

Related PR #108909.
---
 nixos/modules/services/x11/hardware/libinput.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 631fb824768..9b0757153cc 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -226,6 +226,7 @@ in {
       "horizontalScrolling"
       "sendEventsMode"
       "tapping"
+      "tappingDragLock"
       "disableWhileTyping"
       "additionalOptions"
     ]);

From a18ef3f67d5346ca115ec6dce71ba1a56d65da1e Mon Sep 17 00:00:00 2001
From: "\"Jonathan Ringer\"" <"jonringer117@gmail.com">
Date: Thu, 21 Jan 2021 11:31:27 -0800
Subject: [PATCH 511/956] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 38 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index bf5f2fc043d..12ea2c935dd 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -381,8 +381,8 @@ let
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "a351625c4029fb15b14eebe46016c9a6b1bc7d26";
-      sha256 = "0jmnsr1k9v7zpxkbd6h9i4cizbkm99vyr4366wdjiikbn29jx6pr";
+      rev = "4b1d61cc00baf7b5f77efb75d1973d453248153f";
+      sha256 = "1w166j4syxwv1qhm0s813rixgc83j6ba5m4db1n2a8bnqwgcc9i6";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -702,12 +702,12 @@ let
 
   Coqtail = buildVimPluginFrom2Nix {
     pname = "Coqtail";
-    version = "2021-01-18";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "c58071ff5ad86baad107f43737c64a18b574cd3a";
-      sha256 = "1pbkvxcwzvyy47bfv1r1ldzcf0qqkbbx2bq4jl93di5bg7kl57qb";
+      rev = "ff42b26f69634ed9fb3001887d80c65a759458e5";
+      sha256 = "0b4pra6f83933kl1ys8k4q9y9mx6a7qc7z757s82b0jk92cs790b";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
   };
@@ -1318,12 +1318,12 @@ let
 
   far-vim = buildVimPluginFrom2Nix {
     pname = "far-vim";
-    version = "2020-12-12";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "brooth";
       repo = "far.vim";
-      rev = "f92a9ef537c195815ddc12ce919dae607f3d887b";
-      sha256 = "1i6mzbfylq3212saipq79s5yb00y9083wsi7dax37bcfb8ryl841";
+      rev = "b3e7b62ef6820ccdcbdc6070f3573b658aafba43";
+      sha256 = "0lf2vlsyk4ymhyscnpla417hvh6qdi8cablammnc5vsk1hmqvc3i";
     };
     meta.homepage = "https://github.com/brooth/far.vim/";
   };
@@ -2220,12 +2220,12 @@ let
 
   lualine-nvim = buildVimPluginFrom2Nix {
     pname = "lualine-nvim";
-    version = "2021-01-20";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "hoob3rt";
       repo = "lualine.nvim";
-      rev = "09835e2a1a5404b4ee4b80fb8e3fa84ccbddfec4";
-      sha256 = "0n4b8iyk9pk4ji0sw8lf973z2wg2lfb59yh0ry3hkl9g66vg5nkl";
+      rev = "a2a9193296414aea13efa3a02fafb115f0226276";
+      sha256 = "1n3c7zmpqv3xr750b7nbk1q08abhx2frhvbqhpd28vi2lf075bxa";
     };
     meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
   };
@@ -2980,8 +2980,8 @@ let
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "99ecb46592f8e9a3a8b56ff2c4fd18f1eff4a5af";
-      sha256 = "131k1p0qjwvm5d3s1670r9a4s053c7x2yi7n69jlljc6x57b3q9n";
+      rev = "f84c93c484ec3f5fb2a7ca461bf5b93994662fda";
+      sha256 = "0wh2rv1awlvm1d4fgvcgl0cg9sw20x5axmnq2ch0q18qca37v5i5";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3204,12 +3204,12 @@ let
 
   playground = buildVimPluginFrom2Nix {
     pname = "playground";
-    version = "2021-01-19";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "playground";
-      rev = "bcd83b5ce698e9ffdd27e64be16f04f0544ca047";
-      sha256 = "0kmyx172v94m3193i3pmim79d6pk9zffbm50lvzpy7n0bi16608i";
+      rev = "7e373e5706a2df71fd3a96b50d1f7b0c3e7a0b36";
+      sha256 = "1vrfjv22whdmwna4xlvpsajx69fs8dkfwk0ji1jnvbyxmhki8mik";
     };
     meta.homepage = "https://github.com/nvim-treesitter/playground/";
   };
@@ -7207,12 +7207,12 @@ let
 
   vim-snipmate = buildVimPluginFrom2Nix {
     pname = "vim-snipmate";
-    version = "2021-01-13";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "garbas";
       repo = "vim-snipmate";
-      rev = "a5b5dd46e9c2b796599ff4530e1c8d29fdd77945";
-      sha256 = "05k6irv1p8kglznz9pfdzlb3qplf6y1k4x9qr3zcidv79hldg0b5";
+      rev = "d4554cd646c3c015d85bd44487a0e019f88c959a";
+      sha256 = "1jmyrlbwrljc6jnn44yqz5s090srykn3dp7w08iaq10vpxav987g";
     };
     meta.homepage = "https://github.com/garbas/vim-snipmate/";
   };

From 2868a2be82dfcd18a8507af9bca22fefcfd77fe7 Mon Sep 17 00:00:00 2001
From: "\"Jonathan Ringer\"" <"jonringer117@gmail.com">
Date: Thu, 21 Jan 2021 13:47:11 -0800
Subject: [PATCH 512/956] vimPlugins.vim-hcl: init at 2020-09-07

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 12ea2c935dd..e6ccbe2ef06 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5582,6 +5582,18 @@ let
     meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/";
   };
 
+  vim-hcl = buildVimPluginFrom2Nix {
+    pname = "vim-hcl";
+    version = "2020-09-07";
+    src = fetchFromGitHub {
+      owner = "jvirtanen";
+      repo = "vim-hcl";
+      rev = "94fbd199c8a947ede62f98509f91d637d7967454";
+      sha256 = "0n2dmgfajji8nxxirb9q9jmqnzc1mjqnic5igs84pxmbc6r57zqq";
+    };
+    meta.homepage = "https://github.com/jvirtanen/vim-hcl/";
+  };
+
   vim-hdevtools = buildVimPluginFrom2Nix {
     pname = "vim-hdevtools";
     version = "2018-11-19";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f26db1ce410..438027ba5ef 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -236,6 +236,7 @@ justincampbell/vim-eighties
 justinj/vim-pico8-syntax
 justinmk/vim-dirvish
 justinmk/vim-sneak
+jvirtanen/vim-hcl
 jvoorhis/coq.vim
 KabbAmine/vCoolor.vim
 KabbAmine/zeavim.vim

From 62015c03b629fc8d20806267eb048665a8e4fe25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Otterh=C3=A4ll?= <dev@a12l.xyz>
Date: Fri, 22 Jan 2021 00:25:49 +0100
Subject: [PATCH 513/956] pijul: 1.0.0-alpha.35 -> 1.0.0-alpha.37

---
 pkgs/applications/version-management/pijul/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 2e33e4986d6..993db7c2ebd 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pijul";
-  version = "1.0.0-alpha.35";
+  version = "1.0.0-alpha.37";
 
   src = fetchCrate {
     inherit version pname;
-    sha256 = "02x4v63shlbnyppwm10qv8smbfz6a8kpwr3rcvzwpa0blqx2sq4n";
+    sha256 = "02hdnfpy0hlgwhahrd5ddjmq8r05pyny0r91q3avirli1i7rkvs6";
   };
 
-  cargoSha256 = "1hmj9470x1ynj5phxsyi0gakzmxbmgb5y51xarrks34f9z7a655v";
+  cargoSha256 = "16v9nqrfdmrmll72yj6a6wl4rv28n838myjyw2n68kjmijakvnk4";
 
   cargoBuildFlags = lib.optional gitImportSupport "--features=git";
 

From de3377bff06ee5a41ba0d27a02b0f1a2b6470269 Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Thu, 21 Jan 2021 23:12:29 +0100
Subject: [PATCH 514/956] usbguard: install shell completion

---
 pkgs/os-specific/linux/usbguard/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
index cff6df4ac1f..55832dc7ade 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -2,6 +2,7 @@
 , lib
 , fetchFromGitHub
 , autoreconfHook
+, installShellFiles
 , asciidoc
 , pkg-config
 , libxslt
@@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
+    installShellFiles
     asciidoc
     pkg-config
     libxslt # xsltproc
@@ -66,6 +68,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    installShellCompletion --bash --name usbguard.bash scripts/bash_completion/usbguard
+    installShellCompletion --zsh --name _usbguard scripts/usbguard-zsh-completion
+  '';
+
   meta = with lib; {
     description = "The USBGuard software framework helps to protect your computer against BadUSB";
     longDescription = ''

From 2c3a8d9ec568806aaf3c72a28abef2735d3d1e98 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 23:38:47 +0000
Subject: [PATCH 515/956] exodus: 21.1.7 -> 21.1.18

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

diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index 37ad808de8a..72af1af9536 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
 
 stdenv.mkDerivation rec {
   pname = "exodus";
-  version = "21.1.7";
+  version = "21.1.18";
 
   src = fetchurl {
     url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
-    sha256 = "sha256-im0z3g225EhboJFoHBweHefn2QAKvYGSAP7e4Mz6Jm8=";
+    sha256 = "sha256-cc0m1gOwIY4M0ljSSdj8WaQfU/ikGI1Zlf8gGDdht4Q=";
   };
 
   sourceRoot = ".";

From bc87d55b5ac3f5ed4565b1f180de5a20d78e3145 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 00:07:13 +0000
Subject: [PATCH 516/956] fetchmail: 6.4.14 -> 6.4.15

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

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index cae6232a727..01493e13181 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, openssl }:
 
 let
-  version = "6.4.14";
+  version = "6.4.15";
 in
 stdenv.mkDerivation {
   pname = "fetchmail";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-    sha256 = "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2";
+    sha256 = "sha256-c1shdHSTfhPPzeotQqNGv2hIfg1h7+vk0Nnt3LOia5Y=";
   };
 
   buildInputs = [ openssl ];

From c959f84906f927b17949c012a65655b3632b0f93 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 00:33:28 +0000
Subject: [PATCH 517/956] s3fs: 1.87 -> 1.88

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

diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index e0b42711d22..4ff36e3b1d8 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "s3fs-fuse";
-  version = "1.87";
+  version = "1.88";
 
   src = fetchFromGitHub {
     owner  = "s3fs-fuse";
     repo   = "s3fs-fuse";
     rev    = "v${version}";
-    sha256 = "09ib3sh6vg3z7cpccj3ysgpdyf84a98lf6nz15a61r4l27h111f2";
+    sha256 = "sha256-LxqTKu9F8FqHnjp1a9E/+WbH1Ol6if/OpY7LGsVE9Bw=";
   };
 
   buildInputs = [ curl openssl libxml2 ]

From 754d6347b62368e3ed28a814a57d0d4845cb3cbd Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 21 Jan 2021 21:17:58 -0500
Subject: [PATCH 518/956] tab-rs: 0.5.5 -> 0.5.6

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

diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix
index 24447dc74c3..b6c9b35ac87 100644
--- a/pkgs/tools/misc/tab-rs/default.nix
+++ b/pkgs/tools/misc/tab-rs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tab-rs";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "austinjones";
     repo = pname;
     rev = "v${version}";
-    sha256 = "06nip7g5y7jslqj8anvn2z7w1c8yr0gl32bpnzv26xschan4gc2h";
+    sha256 = "1gyl2dxyhh4d2lpxg9s5cx734sfs1kys5z5hjqfgbiny28hp9sw6";
   };
 
-  cargoSha256 = "1clpl9fi07lms0din8f9m4y6br5jg8k5xsklsqmvgdwf83wyn321";
+  cargoSha256 = "1apjzn164kakb2snrq1wfl7grm72hkddi3am6d01h5kkngkp68qm";
 
   buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
 

From 66e44425c6dfecbea68a5d6dc221ccd56561d4f1 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 22 Jan 2021 00:00:13 +0700
Subject: [PATCH 519/956] pkgs/development/libraries: stdenv.lib -> lib

---
 .../libraries/AntTweakBar/default.nix         |  8 ++---
 pkgs/development/libraries/CGAL/4.nix         |  4 +--
 pkgs/development/libraries/CGAL/default.nix   |  4 +--
 pkgs/development/libraries/CoinMP/default.nix |  4 +--
 .../libraries/LAStools/default.nix            |  4 +--
 pkgs/development/libraries/LASzip/LASzip2.nix |  4 +--
 pkgs/development/libraries/LASzip/default.nix |  8 ++---
 .../development/libraries/NSPlist/default.nix |  4 +--
 .../libraries/PlistCpp/default.nix            |  4 +--
 pkgs/development/libraries/SDL/default.nix    |  8 ++---
 pkgs/development/libraries/SDL2/default.nix   |  8 ++---
 .../libraries/SDL2_gfx/default.nix            |  8 ++---
 .../libraries/SDL2_image/default.nix          |  8 ++---
 .../libraries/SDL2_mixer/default.nix          |  8 ++---
 .../libraries/SDL2_net/default.nix            |  8 ++---
 .../libraries/SDL2_ttf/default.nix            |  8 ++---
 .../libraries/SDL_Pango/default.nix           |  4 +--
 .../development/libraries/SDL_gfx/default.nix |  6 ++--
 .../development/libraries/SDL_gpu/default.nix |  4 +--
 .../libraries/SDL_image/default.nix           |  6 ++--
 .../libraries/SDL_mixer/default.nix           |  2 +-
 .../development/libraries/SDL_net/default.nix |  6 ++--
 .../libraries/SDL_sixel/default.nix           |  4 +--
 .../libraries/SDL_stretch/default.nix         |  4 +--
 .../development/libraries/SDL_ttf/default.nix |  6 ++--
 pkgs/development/libraries/Xaw3d/default.nix  |  6 ++--
 pkgs/development/libraries/a52dec/default.nix |  6 ++--
 pkgs/development/libraries/aalib/default.nix  |  8 ++---
 .../libraries/abseil-cpp/default.nix          |  4 +--
 .../libraries/accountsservice/default.nix     |  4 +--
 pkgs/development/libraries/ace/default.nix    |  4 +--
 pkgs/development/libraries/acl/default.nix    |  4 +--
 pkgs/development/libraries/afflib/default.nix | 10 +++---
 pkgs/development/libraries/aften/default.nix  |  4 +--
 .../libraries/agda/agda-prelude/default.nix   |  8 ++---
 .../functional-linear-algebra/default.nix     |  2 +-
 .../libraries/agda/iowa-stdlib/default.nix    |  8 ++---
 .../agda/standard-library/default.nix         |  8 ++---
 pkgs/development/libraries/agg/default.nix    |  6 ++--
 .../development/libraries/alembic/default.nix |  4 +--
 pkgs/development/libraries/allegro/5.nix      |  4 +--
 .../development/libraries/allegro/default.nix |  4 +--
 pkgs/development/libraries/alure/default.nix  |  4 +--
 pkgs/development/libraries/alure2/default.nix |  4 +--
 pkgs/development/libraries/amdvlk/default.nix |  4 +--
 pkgs/development/libraries/aml/default.nix    |  4 +--
 pkgs/development/libraries/amrnb/default.nix  |  4 +--
 pkgs/development/libraries/amrwb/default.nix  |  4 +--
 pkgs/development/libraries/amtk/default.nix   |  6 ++--
 .../libraries/apache-activemq/default.nix     |  6 ++--
 .../libraries/appstream-glib/default.nix      |  6 ++--
 .../libraries/appstream/default.nix           |  4 +--
 .../libraries/apr-util/default.nix            |  6 ++--
 pkgs/development/libraries/apr/default.nix    | 12 +++----
 .../libraries/aqbanking/default.nix           |  4 +--
 .../libraries/aqbanking/gwenhywfar.nix        |  8 ++---
 .../libraries/aqbanking/libchipcard.nix       |  4 +--
 pkgs/development/libraries/aravis/default.nix | 36 +++++++++----------
 pkgs/development/libraries/arb/default.nix    |  8 ++---
 .../libraries/argp-standalone/default.nix     | 12 +++----
 .../libraries/argtable/default.nix            |  4 +--
 .../libraries/arguments/default.nix           |  4 +--
 .../development/libraries/aribb25/default.nix |  2 +-
 .../libraries/armadillo/default.nix           |  4 +--
 .../libraries/arrayfire/default.nix           | 14 ++++----
 pkgs/development/libraries/asio/generic.nix   |  6 ++--
 pkgs/development/libraries/aspell/default.nix |  8 ++---
 .../libraries/aspell/dictionaries.nix         |  2 +-
 pkgs/development/libraries/assimp/default.nix |  4 +--
 .../libraries/at-spi2-atk/default.nix         |  6 ++--
 .../libraries/at-spi2-core/default.nix        |  8 ++---
 pkgs/development/libraries/atk/default.nix    | 12 +++----
 pkgs/development/libraries/atkmm/default.nix  |  8 ++---
 pkgs/development/libraries/attr/default.nix   |  4 +--
 pkgs/development/libraries/aubio/default.nix  |  4 +--
 .../libraries/audiality2/default.nix          |  4 +--
 .../libraries/audio/libbass/default.nix       |  6 ++--
 .../libraries/audio/libbs2b/default.nix       |  6 ++--
 .../libraries/audio/libgme/default.nix        |  6 ++--
 .../libraries/audio/libinstpatch/default.nix  |  4 +--
 .../libraries/audio/libmysofa/default.nix     |  4 +--
 .../libraries/audio/libsmf/default.nix        |  4 +--
 .../libraries/audio/lilv/default.nix          |  4 +--
 .../libraries/audio/lv2/default.nix           |  6 ++--
 .../libraries/audio/lvtk/default.nix          |  4 +--
 .../libraries/audio/mbelib/default.nix        |  4 +--
 .../libraries/audio/ntk/default.nix           |  8 ++---
 .../libraries/audio/qm-dsp/default.nix        |  4 +--
 .../libraries/audio/raul/default.nix          |  4 +--
 .../libraries/audio/rtaudio/default.nix       |  4 +--
 .../libraries/audio/rtmidi/default.nix        |  8 ++---
 .../libraries/audio/sratom/default.nix        |  4 +--
 .../libraries/audio/suil/default.nix          |  2 +-
 .../audio/vamp-plugin-sdk/default.nix         |  4 +--
 .../audio/zita-alsa-pcmi/default.nix          |  8 ++---
 .../audio/zita-convolver/default.nix          | 10 +++---
 .../audio/zita-resampler/default.nix          |  8 ++---
 .../libraries/audiofile/default.nix           |  6 ++--
 pkgs/development/libraries/avahi/default.nix  | 26 +++++++-------
 .../libraries/avro-c++/default.nix            |  8 ++---
 pkgs/development/libraries/avro-c/default.nix |  4 +--
 .../libraries/ayatana-ido/default.nix         |  4 +--
 pkgs/development/libraries/babl/default.nix   |  6 ++--
 pkgs/development/libraries/bamf/default.nix   |  4 +--
 pkgs/development/libraries/bcg729/default.nix |  4 +--
 .../libraries/bctoolbox/default.nix           |  4 +--
 .../libraries/beecrypt/default.nix            |  6 ++--
 .../development/libraries/beignet/default.nix |  4 +--
 .../development/libraries/belcard/default.nix |  4 +--
 .../libraries/belle-sip/default.nix           |  4 +--
 pkgs/development/libraries/belr/default.nix   |  4 +--
 .../libraries/biblesync/default.nix           |  6 ++--
 pkgs/development/libraries/bobcat/default.nix |  4 +--
 pkgs/development/libraries/boehm-gc/7.6.6.nix |  4 +--
 .../libraries/boehm-gc/default.nix            |  4 +--
 .../libraries/boolstuff/default.nix           |  6 ++--
 .../libraries/boost-process/default.nix       |  4 +--
 pkgs/development/libraries/boost/1.67.nix     |  4 +--
 pkgs/development/libraries/boost/generic.nix  |  8 ++---
 pkgs/development/libraries/bootil/default.nix |  8 ++---
 .../libraries/boringssl/default.nix           |  4 +--
 pkgs/development/libraries/botan/generic.nix  |  6 ++--
 pkgs/development/libraries/box2d/default.nix  |  4 +--
 .../development/libraries/boxfort/default.nix |  4 +--
 .../development/libraries/brigand/default.nix |  4 +--
 pkgs/development/libraries/buddy/default.nix  |  6 ++--
 pkgs/development/libraries/bullet/default.nix | 14 ++++----
 .../libraries/bullet/roboschool-fork.nix      | 12 +++----
 .../libraries/bulletml/default.nix            |  4 +--
 .../development/libraries/bwidget/default.nix |  6 ++--
 pkgs/development/libraries/bzrtp/default.nix  |  4 +--
 pkgs/development/libraries/c-ares/default.nix |  6 ++--
 .../development/libraries/c-blosc/default.nix |  4 +--
 pkgs/development/libraries/caf/default.nix    |  4 +--
 pkgs/development/libraries/cairo/default.nix  | 14 ++++----
 .../development/libraries/cairomm/default.nix |  8 ++---
 .../libraries/capnproto/default.nix           |  4 +--
 .../libraries/capstone/default.nix            | 12 +++----
 pkgs/development/libraries/catch/default.nix  |  4 +--
 pkgs/development/libraries/catch2/default.nix |  4 +--
 pkgs/development/libraries/ccrtp/default.nix  |  8 ++---
 pkgs/development/libraries/cctz/default.nix   |  8 ++---
 pkgs/development/libraries/cddlib/default.nix |  4 +--
 pkgs/development/libraries/cdk/default.nix    |  4 +--
 pkgs/development/libraries/cdo/default.nix    | 10 +++---
 pkgs/development/libraries/cegui/default.nix  |  4 +--
 pkgs/development/libraries/celt/generic.nix   |  6 ++--
 pkgs/development/libraries/cereal/default.nix |  4 +--
 .../libraries/ceres-solver/default.nix        |  6 ++--
 .../development/libraries/cfitsio/default.nix |  6 ++--
 pkgs/development/libraries/cgui/default.nix   |  4 +--
 pkgs/development/libraries/check/default.nix  |  6 ++--
 .../libraries/chipmunk/default.nix            |  4 +--
 pkgs/development/libraries/chmlib/default.nix |  4 +--
 .../libraries/chromaprint/default.nix         |  2 +-
 pkgs/development/libraries/cimg/default.nix   |  4 +--
 .../libraries/civetweb/default.nix            |  4 +--
 pkgs/development/libraries/cl/default.nix     |  4 +--
 .../libraries/classads/default.nix            |  6 ++--
 .../libraries/clearsilver/default.nix         |  4 +--
 pkgs/development/libraries/clfft/default.nix  |  4 +--
 pkgs/development/libraries/clipp/default.nix  |  4 +--
 .../development/libraries/clipper/default.nix |  4 +--
 pkgs/development/libraries/cln/default.nix    |  4 +--
 .../libraries/cloog-ppl/default.nix           |  6 ++--
 pkgs/development/libraries/cloog/0.18.0.nix   |  6 ++--
 pkgs/development/libraries/cloog/default.nix  |  6 ++--
 .../libraries/clucene-core/2.x.nix            | 10 +++---
 .../libraries/clucene-core/default.nix        |  4 +--
 .../libraries/clutter-gst/default.nix         | 10 +++---
 .../libraries/clutter-gtk/default.nix         | 10 +++---
 .../development/libraries/clutter/default.nix | 10 +++---
 .../development/libraries/cm256cc/default.nix |  4 +--
 .../libraries/cmark-gfm/default.nix           |  4 +--
 pkgs/development/libraries/cmark/default.nix  |  4 +--
 .../libraries/cminpack/default.nix            |  6 ++--
 pkgs/development/libraries/cmocka/default.nix |  4 +--
 pkgs/development/libraries/cmrt/default.nix   |  4 +--
 pkgs/development/libraries/codec2/default.nix |  4 +--
 pkgs/development/libraries/cogl/default.nix   | 16 ++++-----
 pkgs/development/libraries/coin3d/default.nix |  4 +--
 .../libraries/comedilib/default.nix           |  6 ++--
 .../libraries/concurrencykit/default.nix      |  4 +--
 .../libraries/cpp-hocon/default.nix           |  4 +--
 .../libraries/cpp-ipfs-api/default.nix        |  4 +--
 .../libraries/cpp-netlib/default.nix          |  4 +--
 .../libraries/cpp-utilities/default.nix       |  4 +--
 pkgs/development/libraries/cppcms/default.nix |  4 +--
 pkgs/development/libraries/cppdb/default.nix  |  4 +--
 .../development/libraries/cpptest/default.nix |  6 ++--
 .../development/libraries/cppunit/default.nix |  4 +--
 .../libraries/cpputest/default.nix            |  8 ++---
 pkgs/development/libraries/cppzmq/default.nix |  4 +--
 .../libraries/cracklib/default.nix            |  2 +-
 pkgs/development/libraries/crc32c/default.nix |  4 +--
 pkgs/development/libraries/crcpp/default.nix  |  4 +--
 pkgs/development/libraries/cre2/default.nix   |  4 +--
 .../libraries/criterion/default.nix           |  4 +--
 .../libraries/crypto++/default.nix            |  4 +--
 pkgs/development/libraries/csfml/default.nix  |  4 +--
 pkgs/development/libraries/ctl/default.nix    |  4 +--
 pkgs/development/libraries/ctpl/default.nix   |  4 +--
 pkgs/development/libraries/ctpp2/default.nix  |  4 +--
 .../libraries/ctypes_sh/default.nix           |  4 +--
 pkgs/development/libraries/cudd/default.nix   |  4 +--
 .../development/libraries/curlcpp/default.nix |  4 +--
 pkgs/development/libraries/curlpp/default.nix |  4 +--
 pkgs/development/libraries/cutee/default.nix  |  4 +--
 pkgs/development/libraries/cwiid/default.nix  |  4 +--
 .../libraries/cxx-prettyprint/default.nix     |  6 ++--
 .../development/libraries/cxxtest/default.nix |  4 +--
 .../libraries/cxxtools/default.nix            |  8 ++---
 .../libraries/cyrus-sasl/default.nix          |  2 +-
 pkgs/development/libraries/czmq/default.nix   |  4 +--
 pkgs/development/libraries/dav1d/default.nix  | 12 +++----
 pkgs/development/libraries/db/db-4.8.nix      |  2 +-
 pkgs/development/libraries/db/db-5.3.nix      |  2 +-
 pkgs/development/libraries/db/db-6.0.nix      |  4 +--
 pkgs/development/libraries/db/db-6.2.nix      |  4 +--
 pkgs/development/libraries/db/generic.nix     | 10 +++---
 .../libraries/dbus-cplusplus/default.nix      |  4 +--
 .../libraries/dbus-glib/default.nix           |  8 ++---
 .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix   |  4 +--
 .../libraries/dbus-sharp-glib/default.nix     |  4 +--
 .../libraries/dbus-sharp/dbus-sharp-1.0.nix   |  4 +--
 .../libraries/dbus-sharp/default.nix          |  4 +--
 pkgs/development/libraries/dbus/default.nix   |  2 +-
 pkgs/development/libraries/dbxml/default.nix  |  4 +--
 pkgs/development/libraries/dclib/default.nix  |  4 +--
 pkgs/development/libraries/dclxvi/default.nix |  6 ++--
 pkgs/development/libraries/dconf/default.nix  | 16 ++++-----
 pkgs/development/libraries/dee/default.nix    |  4 +--
 .../libraries/discord-rpc/default.nix         |  8 ++---
 .../dleyna-connector-dbus/default.nix         |  4 +--
 .../libraries/dleyna-core/default.nix         |  4 +--
 .../libraries/dleyna-renderer/default.nix     |  4 +--
 .../libraries/dleyna-server/default.nix       |  4 +--
 pkgs/development/libraries/dlib/default.nix   |  2 +-
 .../libraries/docopt_cpp/default.nix          |  4 +--
 .../development/libraries/doctest/default.nix |  4 +--
 .../development/libraries/dotconf/default.nix |  4 +--
 .../libraries/double-conversion/default.nix   |  2 +-
 pkgs/development/libraries/dqlite/default.nix |  4 +--
 pkgs/development/libraries/draco/default.nix  |  4 +--
 .../libraries/drumstick/default.nix           |  4 +--
 pkgs/development/libraries/dssi/default.nix   |  4 +--
 pkgs/development/libraries/duckdb/default.nix |  4 +--
 pkgs/development/libraries/dxflib/default.nix |  6 ++--
 .../development/libraries/dyncall/default.nix |  4 +--
 .../libraries/easyloggingpp/default.nix       | 10 +++---
 .../development/libraries/eccodes/default.nix |  6 ++--
 pkgs/development/libraries/eclib/default.nix  |  6 ++--
 .../libraries/editline/default.nix            |  4 +--
 pkgs/development/libraries/eigen/2.0.nix      |  8 ++---
 pkgs/development/libraries/eigen/default.nix  |  6 ++--
 pkgs/development/libraries/embree/2.x.nix     |  4 +--
 pkgs/development/libraries/embree/default.nix |  2 +-
 pkgs/development/libraries/enchant/1.x.nix    |  4 +--
 pkgs/development/libraries/enchant/2.x.nix    |  4 +--
 pkgs/development/libraries/enet/default.nix   |  8 ++---
 pkgs/development/libraries/entt/default.nix   |  4 +--
 pkgs/development/libraries/epoxy/default.nix  |  4 +--
 pkgs/development/libraries/ethash/default.nix |  4 +--
 .../libraries/eventlog/default.nix            |  6 ++--
 pkgs/development/libraries/exempi/default.nix |  6 ++--
 pkgs/development/libraries/exiv2/default.nix  |  8 ++---
 pkgs/development/libraries/exosip/default.nix |  4 +--
 pkgs/development/libraries/expat/default.nix  |  4 +--
 pkgs/development/libraries/faac/default.nix   |  4 +--
 pkgs/development/libraries/faad2/default.nix  |  4 +--
 .../libraries/farbfeld/default.nix            |  4 +--
 .../libraries/farstream/default.nix           |  4 +--
 .../libraries/fast-cpp-csv-parser/default.nix |  4 +--
 .../libraries/fastjson/default.nix            |  4 +--
 .../libraries/fastpbkdf2/default.nix          |  4 +--
 pkgs/development/libraries/faudio/default.nix |  4 +--
 pkgs/development/libraries/fcgi/default.nix   |  4 +--
 pkgs/development/libraries/fcppt/default.nix  |  4 +--
 .../development/libraries/fdk-aac/default.nix |  4 +--
 .../libraries/fflas-ffpack/default.nix        |  8 ++---
 .../libraries/ffmpeg-full/default.nix         | 10 +++---
 .../libraries/ffmpeg-sixel/default.nix        |  4 +--
 pkgs/development/libraries/ffmpeg/generic.nix |  6 ++--
 .../libraries/ffmpegthumbnailer/default.nix   |  4 +--
 pkgs/development/libraries/ffms/default.nix   |  4 +--
 pkgs/development/libraries/fftw/default.nix   |  2 +-
 .../libraries/filter-audio/default.nix        |  4 +--
 pkgs/development/libraries/flann/default.nix  |  8 ++---
 .../libraries/flatbuffers/default.nix         |  6 ++--
 pkgs/development/libraries/flatcc/default.nix |  4 +--
 .../development/libraries/flatpak/default.nix |  6 ++--
 pkgs/development/libraries/flint/default.nix  | 12 +++----
 pkgs/development/libraries/flite/default.nix  |  8 ++---
 pkgs/development/libraries/fltk/1.4.nix       |  8 ++---
 pkgs/development/libraries/fltk/default.nix   |  8 ++---
 pkgs/development/libraries/fmt/default.nix    |  4 +--
 pkgs/development/libraries/folks/default.nix  | 10 +++---
 pkgs/development/libraries/folly/default.nix  |  6 ++--
 .../libraries/fontconfig/default.nix          |  6 ++--
 pkgs/development/libraries/forge/default.nix  |  4 +--
 pkgs/development/libraries/fox/default.nix    |  6 ++--
 pkgs/development/libraries/fox/fox-1.6.nix    |  8 ++---
 pkgs/development/libraries/fplll/20160331.nix |  8 ++---
 pkgs/development/libraries/fplll/default.nix  |  4 +--
 pkgs/development/libraries/frame/default.nix  | 10 +++---
 .../libraries/freealut/default.nix            |  8 ++---
 .../libraries/freeglut/default.nix            |  6 ++--
 .../development/libraries/freetds/default.nix |  6 ++--
 .../libraries/freetype/default.nix            |  6 ++--
 pkgs/development/libraries/frei0r/default.nix |  6 ++--
 .../development/libraries/fribidi/default.nix |  6 ++--
 .../development/libraries/fstrcmp/default.nix |  4 +--
 pkgs/development/libraries/fstrm/default.nix  |  4 +--
 pkgs/development/libraries/ftgl/default.nix   |  8 ++---
 .../libraries/funambol/default.nix            |  4 +--
 .../development/libraries/galario/default.nix | 14 ++++----
 .../gamenetworkingsockets/default.nix         |  4 +--
 pkgs/development/libraries/gamin/default.nix  | 12 +++----
 pkgs/development/libraries/ganv/default.nix   |  4 +--
 .../libraries/garmintools/default.nix         |  6 ++--
 .../libraries/gbenchmark/default.nix          |  4 +--
 pkgs/development/libraries/gcab/default.nix   |  6 ++--
 .../development/libraries/gcc/libstdc++/5.nix |  4 +--
 pkgs/development/libraries/gcr/default.nix    |  6 ++--
 pkgs/development/libraries/gd/default.nix     |  6 ++--
 pkgs/development/libraries/gdal/2.4.0.nix     | 14 ++++----
 pkgs/development/libraries/gdal/default.nix   | 14 ++++----
 pkgs/development/libraries/gdal/gdal-1_11.nix |  8 ++---
 .../libraries/gdata-sharp/default.nix         |  4 +--
 pkgs/development/libraries/gdcm/default.nix   | 10 +++---
 .../libraries/gdk-pixbuf/default.nix          | 12 +++----
 .../development/libraries/gdk-pixbuf/xlib.nix |  4 +--
 pkgs/development/libraries/gdl/default.nix    |  6 ++--
 pkgs/development/libraries/gdome2/default.nix |  4 +--
 pkgs/development/libraries/gecode/3.nix       |  4 +--
 pkgs/development/libraries/gecode/default.nix |  6 ++--
 pkgs/development/libraries/gegl/4.0.nix       |  8 ++---
 pkgs/development/libraries/gegl/default.nix   |  6 ++--
 pkgs/development/libraries/geis/default.nix   |  4 +--
 pkgs/development/libraries/genann/default.nix |  4 +--
 .../development/libraries/geoclue/default.nix |  6 ++--
 .../libraries/geocode-glib/default.nix        |  6 ++--
 pkgs/development/libraries/geoip/default.nix  |  8 ++---
 pkgs/development/libraries/geos/default.nix   |  6 ++--
 .../development/libraries/getdata/default.nix |  4 +--
 pkgs/development/libraries/getdns/default.nix |  4 +--
 .../development/libraries/gettext/default.nix |  6 ++--
 pkgs/development/libraries/gexiv2/default.nix |  6 ++--
 .../libraries/gfbgraph/default.nix            |  6 ++--
 pkgs/development/libraries/gflags/default.nix |  4 +--
 .../libraries/ggz_base_libs/default.nix       |  4 +--
 pkgs/development/libraries/giblib/default.nix |  6 ++--
 pkgs/development/libraries/giflib/4.1.nix     |  4 +--
 pkgs/development/libraries/giflib/default.nix | 12 +++----
 .../development/libraries/giflib/libungif.nix |  4 +--
 .../libraries/gio-sharp/default.nix           |  4 +--
 pkgs/development/libraries/git2/default.nix   | 10 +++---
 pkgs/development/libraries/givaro/3.7.nix     |  8 ++---
 pkgs/development/libraries/givaro/3.nix       |  8 ++---
 pkgs/development/libraries/givaro/default.nix | 10 +++---
 pkgs/development/libraries/gjs/default.nix    |  8 ++---
 pkgs/development/libraries/gl2ps/default.nix  |  4 +--
 .../libraries/glbinding/default.nix           |  4 +--
 pkgs/development/libraries/gle/default.nix    |  8 ++---
 pkgs/development/libraries/glew/1.10.nix      |  6 ++--
 pkgs/development/libraries/glew/default.nix   |  6 ++--
 pkgs/development/libraries/glfw/2.x.nix       |  6 ++--
 pkgs/development/libraries/glfw/3.x.nix       |  2 +-
 .../libraries/glib-networking/default.nix     |  6 ++--
 .../libraries/glib-testing/default.nix        |  4 +--
 pkgs/development/libraries/glib/default.nix   |  8 ++---
 pkgs/development/libraries/glibc/default.nix  | 20 +++++------
 pkgs/development/libraries/glibc/locales.nix  |  6 ++--
 pkgs/development/libraries/glibmm/default.nix |  8 ++---
 pkgs/development/libraries/glm/default.nix    |  8 ++---
 .../libraries/globalarrays/default.nix        |  4 +--
 .../libraries/globalplatform/default.nix      |  4 +--
 .../globalplatform/gppcscconnectionplugin.nix |  4 +--
 pkgs/development/libraries/glog/default.nix   |  2 +-
 pkgs/development/libraries/gloox/default.nix  |  4 +--
 pkgs/development/libraries/glpk/default.nix   |  8 ++---
 pkgs/development/libraries/glui/default.nix   |  4 +--
 pkgs/development/libraries/gmime/2.nix        |  4 +--
 pkgs/development/libraries/gmime/3.nix        |  4 +--
 pkgs/development/libraries/gmm/default.nix    |  4 +--
 pkgs/development/libraries/gmp/4.3.2.nix      | 10 +++---
 pkgs/development/libraries/gmp/5.1.x.nix      | 10 +++---
 pkgs/development/libraries/gmp/6.x.nix        | 10 +++---
 pkgs/development/libraries/gmtk/default.nix   |  4 +--
 pkgs/development/libraries/gnet/default.nix   |  4 +--
 .../libraries/gnome-menus/default.nix         |  6 ++--
 .../gnome-online-accounts/default.nix         |  4 +--
 .../libraries/gnome-sharp/default.nix         |  2 +-
 .../libraries/gnome-video-effects/default.nix |  6 ++--
 .../libraries/gnu-config/default.nix          |  4 +--
 .../development/libraries/gnu-efi/default.nix |  6 ++--
 .../gobject-introspection/default.nix         | 12 +++----
 .../development/libraries/goffice/default.nix |  8 ++---
 pkgs/development/libraries/gom/default.nix    |  6 ++--
 pkgs/development/libraries/goocanvas/2.x.nix  |  4 +--
 .../libraries/goocanvas/default.nix           |  8 ++---
 .../libraries/goocanvasmm/default.nix         |  6 ++--
 .../libraries/google-cloud-cpp/default.nix    |  4 +--
 pkgs/development/libraries/gpgme/default.nix  |  2 +-
 pkgs/development/libraries/grail/default.nix  | 10 +++---
 .../libraries/grantlee/default.nix            |  4 +--
 .../graphene-hardened-malloc/default.nix      |  4 +--
 .../libraries/graphene/default.nix            |  4 +--
 .../libraries/grib-api/default.nix            | 10 +++---
 .../libraries/grilo-plugins/default.nix       |  8 ++---
 pkgs/development/libraries/grilo/default.nix  |  6 ++--
 pkgs/development/libraries/grpc/default.nix   |  8 ++---
 pkgs/development/libraries/gsasl/default.nix  |  8 ++---
 .../gsettings-desktop-schemas/default.nix     |  6 ++--
 .../libraries/gsettings-qt/default.nix        |  4 +--
 .../libraries/gsignond/default.nix            |  4 +--
 .../libraries/gsignond/plugins/lastfm.nix     |  4 +--
 .../libraries/gsignond/plugins/mail.nix       |  4 +--
 .../libraries/gsignond/plugins/oauth.nix      |  4 +--
 .../libraries/gsignond/plugins/sasl.nix       |  4 +--
 pkgs/development/libraries/gsl/default.nix    |  8 ++---
 pkgs/development/libraries/gsl/gsl-1_16.nix   |  8 ++---
 pkgs/development/libraries/gsm/default.nix    |  6 ++--
 pkgs/development/libraries/gsmlib/default.nix |  4 +--
 pkgs/development/libraries/gsoap/default.nix  |  4 +--
 pkgs/development/libraries/gsound/default.nix |  6 ++--
 pkgs/development/libraries/gspell/default.nix |  6 ++--
 pkgs/development/libraries/gss/default.nix    |  8 ++---
 pkgs/development/libraries/gssdp/default.nix  |  6 ++--
 .../libraries/gstreamer/bad/default.nix       |  6 ++--
 .../libraries/gstreamer/devtools/default.nix  |  4 +--
 .../libraries/gstreamer/ges/default.nix       |  4 +--
 .../libraries/gstreamer/good/default.nix      |  6 ++--
 .../gstreamer/gstreamermm/default.nix         |  6 ++--
 .../gstreamer/rtsp-server/default.nix         |  4 +--
 .../libraries/gstreamer/vaapi/default.nix     |  4 +--
 .../libraries/gtdialog/default.nix            |  8 ++---
 pkgs/development/libraries/gtest/default.nix  |  4 +--
 pkgs/development/libraries/gthree/default.nix |  4 +--
 .../gtk-engine-bluecurve/default.nix          |  8 ++---
 .../libraries/gtk-engine-murrine/default.nix  |  8 ++---
 .../libraries/gtk-engines/default.nix         |  6 ++--
 .../libraries/gtk-layer-shell/default.nix     |  4 +--
 .../libraries/gtk-mac-integration/default.nix |  4 +--
 .../libraries/gtk-sharp-beans/default.nix     |  4 +--
 pkgs/development/libraries/gtk-sharp/2.0.nix  |  2 +-
 pkgs/development/libraries/gtk-sharp/3.0.nix  |  6 ++--
 pkgs/development/libraries/gtk/2.x.nix        |  4 +--
 pkgs/development/libraries/gtk/3.x.nix        |  6 ++--
 pkgs/development/libraries/gtkd/default.nix   |  4 +--
 .../libraries/gtkdatabox/default.nix          |  6 ++--
 .../libraries/gtkimageview/default.nix        |  6 ++--
 .../libraries/gtkmathview/default.nix         |  6 ++--
 pkgs/development/libraries/gtkmm/2.x.nix      |  8 ++---
 pkgs/development/libraries/gtkmm/3.x.nix      |  6 ++--
 .../libraries/gtksourceview/3.x.nix           |  6 ++--
 .../libraries/gtksourceview/4.x.nix           |  6 ++--
 .../libraries/gtksourceviewmm/4.x.nix         |  6 ++--
 .../libraries/gtksourceviewmm/default.nix     |  6 ++--
 pkgs/development/libraries/gtkspell/3.nix     |  4 +--
 .../libraries/gtkspell/default.nix            |  4 +--
 .../libraries/gtkspellmm/default.nix          |  4 +--
 pkgs/development/libraries/gts/default.nix    | 10 +++---
 pkgs/development/libraries/gumbo/default.nix  |  4 +--
 .../libraries/gupnp-av/default.nix            |  6 ++--
 .../libraries/gupnp-dlna/default.nix          |  6 ++--
 .../libraries/gupnp-igd/default.nix           |  6 ++--
 pkgs/development/libraries/gupnp/default.nix  |  6 ++--
 pkgs/development/libraries/gusb/default.nix   |  4 +--
 pkgs/development/libraries/gvfs/default.nix   | 12 +++----
 pkgs/development/libraries/half/default.nix   |  4 +--
 pkgs/development/libraries/hamlib/default.nix |  8 ++---
 .../libraries/harfbuzz/default.nix            | 10 +++---
 pkgs/development/libraries/hawknl/default.nix |  6 ++--
 .../libraries/hdf5-blosc/default.nix          |  4 +--
 pkgs/development/libraries/hidapi/default.nix |  8 ++---
 .../libraries/highfive/default.nix            |  6 ++--
 .../development/libraries/hiredis/default.nix |  4 +--
 pkgs/development/libraries/hivex/default.nix  |  6 ++--
 .../libraries/hotpatch/default.nix            |  4 +--
 .../libraries/howard-hinnant-date/default.nix |  4 +--
 pkgs/development/libraries/hpx/default.nix    |  8 ++---
 pkgs/development/libraries/hspell/default.nix |  4 +--
 .../development/libraries/htmlcxx/default.nix |  4 +--
 .../libraries/http-parser/default.nix         |  4 +--
 .../libraries/hunspell/default.nix            |  6 ++--
 .../libraries/hunspell/dictionaries.nix       | 34 +++++++++---------
 pkgs/development/libraries/hwloc/default.nix  |  6 ++--
 pkgs/development/libraries/hyena/default.nix  |  6 ++--
 .../libraries/hyperscan/default.nix           |  8 ++---
 pkgs/development/libraries/hyphen/default.nix |  4 +--
 pkgs/development/libraries/icu/base.nix       | 12 +++----
 pkgs/development/libraries/id3lib/default.nix |  4 +--
 pkgs/development/libraries/idnkit/default.nix |  4 +--
 pkgs/development/libraries/ijs/default.nix    |  4 +--
 .../development/libraries/iksemel/default.nix |  4 +--
 pkgs/development/libraries/ilbc/default.nix   |  4 +--
 pkgs/development/libraries/ilixi/default.nix  |  4 +--
 .../development/libraries/ilmbase/default.nix |  4 +--
 pkgs/development/libraries/iml/default.nix    |  8 ++---
 pkgs/development/libraries/imlib/default.nix  |  4 +--
 pkgs/development/libraries/imlib2/default.nix |  6 ++--
 pkgs/development/libraries/impy/default.nix   |  4 +--
 pkgs/development/libraries/inchi/default.nix  |  4 +--
 .../development/libraries/incrtcl/default.nix |  6 ++--
 .../libraries/indicator-application/gtk3.nix  |  4 +--
 .../development/libraries/indilib/default.nix |  4 +--
 pkgs/development/libraries/inih/default.nix   |  4 +--
 .../libraries/iniparser/default.nix           |  6 ++--
 .../libraries/intel-gmmlib/default.nix        |  4 +--
 .../libraries/intel-media-driver/default.nix  | 10 +++---
 .../libraries/intel-media-sdk/default.nix     |  4 +--
 .../libraries/ip2location-c/default.nix       |  4 +--
 .../libraries/irrlicht/default.nix            |  6 ++--
 pkgs/development/libraries/irrlicht/mac.nix   |  6 ++--
 pkgs/development/libraries/isl/0.11.1.nix     |  6 ++--
 pkgs/development/libraries/isl/0.14.1.nix     |  6 ++--
 pkgs/development/libraries/isl/0.17.1.nix     |  6 ++--
 pkgs/development/libraries/isl/0.20.0.nix     |  6 ++--
 .../libraries/iso-codes/default.nix           |  4 +--
 pkgs/development/libraries/itk/4.x.nix        | 10 +++---
 pkgs/development/libraries/itk/default.nix    |  8 ++---
 pkgs/development/libraries/itktcl/default.nix |  6 ++--
 pkgs/development/libraries/jama/default.nix   |  4 +--
 .../development/libraries/jansson/default.nix |  4 +--
 .../libraries/java/commons/bcel/default.nix   |  8 ++---
 .../libraries/java/commons/bsf/default.nix    |  6 ++--
 .../java/commons/compress/default.nix         |  8 ++---
 .../java/commons/fileupload/default.nix       |  8 ++---
 .../libraries/java/commons/io/default.nix     |  8 ++---
 .../libraries/java/commons/lang/default.nix   |  8 ++---
 .../java/commons/logging/default.nix          |  6 ++--
 .../libraries/java/commons/math/default.nix   |  8 ++---
 .../libraries/java/cup/default.nix            |  8 ++---
 .../libraries/java/dbus-java/default.nix      |  4 +--
 .../libraries/java/geoipjava/default.nix      |  8 ++---
 .../libraries/java/gwt-dragdrop/default.nix   |  4 +--
 .../libraries/java/gwt-widgets/default.nix    |  4 +--
 .../libraries/java/hsqldb/default.nix         |  6 ++--
 .../libraries/java/httpunit/default.nix       |  4 +--
 .../java/hydra-ant-logger/default.nix         |  4 +--
 .../libraries/java/jdom/default.nix           |  4 +--
 .../libraries/java/jflex/default.nix          |  6 ++--
 .../libraries/java/junit/default.nix          |  4 +--
 .../libraries/java/junixsocket/default.nix    |  8 ++---
 .../java/libmatthew-java/default.nix          |  4 +--
 .../libraries/java/lombok/default.nix         |  8 ++---
 .../libraries/java/lucene/default.nix         |  4 +--
 .../libraries/java/mockobjects/default.nix    |  4 +--
 .../libraries/java/rhino/default.nix          |  4 +--
 .../libraries/java/saxon/default.nix          |  8 ++---
 .../libraries/java/smack/default.nix          |  6 ++--
 .../libraries/java/swt/default.nix            |  2 +-
 .../libraries/jbig2dec/default.nix            |  6 ++--
 .../development/libraries/jbigkit/default.nix |  8 ++---
 pkgs/development/libraries/jcal/default.nix   |  4 +--
 .../development/libraries/jemalloc/common.nix |  6 ++--
 .../libraries/jitterentropy/default.nix       |  8 ++---
 pkgs/development/libraries/json-c/default.nix |  4 +--
 .../libraries/json-glib/default.nix           |  8 ++---
 .../development/libraries/jsoncpp/default.nix |  4 +--
 .../libraries/jsonrpc-glib/default.nix        |  6 ++--
 pkgs/development/libraries/judy/default.nix   |  8 ++---
 pkgs/development/libraries/jxrlib/default.nix |  6 ++--
 .../libraries/kerberos/heimdal.nix            |  4 +--
 pkgs/development/libraries/kerberos/krb5.nix  |  4 +--
 .../libraries/keybinder/default.nix           |  4 +--
 .../libraries/keybinder3/default.nix          |  4 +--
 .../libraries/keystone/default.nix            |  4 +--
 .../khronos-ocl-icd-loader/default.nix        |  6 ++--
 .../development/libraries/kissfft/default.nix |  4 +--
 pkgs/development/libraries/kmsxx/default.nix  |  6 ++--
 .../development/libraries/kpmcore/default.nix |  2 +-
 .../libraries/kyotocabinet/default.nix        |  6 ++--
 .../development/libraries/l-smash/default.nix |  4 +--
 pkgs/development/libraries/lame/default.nix   |  4 +--
 .../libraries/languagemachines/frog.nix       |  4 +--
 .../libraries/languagemachines/frogdata.nix   |  4 +--
 .../libraries/languagemachines/libfolia.nix   |  4 +--
 .../libraries/languagemachines/mbt.nix        |  4 +--
 .../libraries/languagemachines/ticcutils.nix  |  4 +--
 .../libraries/languagemachines/timbl.nix      |  4 +--
 .../languagemachines/timblserver.nix          |  4 +--
 .../libraries/languagemachines/ucto.nix       |  4 +--
 .../libraries/languagemachines/uctodata.nix   |  4 +--
 pkgs/development/libraries/lasem/default.nix  |  8 ++---
 pkgs/development/libraries/lasso/default.nix  |  4 +--
 pkgs/development/libraries/lcms/default.nix   |  6 ++--
 pkgs/development/libraries/lcms2/default.nix  |  4 +--
 pkgs/development/libraries/ldacbt/default.nix |  4 +--
 pkgs/development/libraries/ldb/default.nix    |  4 +--
 pkgs/development/libraries/ldns/default.nix   |  6 ++--
 .../libraries/leatherman/default.nix          |  4 +--
 .../development/libraries/lensfun/default.nix |  6 ++--
 .../libraries/leptonica/default.nix           |  6 ++--
 .../development/libraries/lesstif/default.nix |  4 +--
 .../development/libraries/leveldb/default.nix |  6 ++--
 pkgs/development/libraries/levmar/default.nix |  6 ++--
 pkgs/development/libraries/lib3ds/default.nix |  4 +--
 pkgs/development/libraries/lib3mf/default.nix |  4 +--
 .../libraries/libAfterImage/default.nix       |  4 +--
 pkgs/development/libraries/libHX/default.nix  |  4 +--
 pkgs/development/libraries/libLAS/default.nix | 12 +++----
 .../development/libraries/libaacs/default.nix |  4 +--
 pkgs/development/libraries/libaal/default.nix |  8 ++---
 .../libraries/libabigail/default.nix          |  4 +--
 pkgs/development/libraries/libabw/default.nix |  4 +--
 .../libraries/libaccounts-glib/default.nix    |  4 +--
 pkgs/development/libraries/libaec/default.nix |  4 +--
 .../development/libraries/libagar/default.nix |  4 +--
 .../libraries/libagar/libagar_test.nix        |  4 +--
 .../libraries/libamqpcpp/default.nix          |  4 +--
 .../libraries/libantlr3c/default.nix          |  6 ++--
 pkgs/development/libraries/libao/default.nix  |  2 +-
 pkgs/development/libraries/libaom/default.nix |  4 +--
 .../development/libraries/libaosd/default.nix |  4 +--
 .../libraries/libarchive/default.nix          | 18 +++++-----
 .../libraries/libargon2/default.nix           |  4 +--
 pkgs/development/libraries/libasr/default.nix |  4 +--
 pkgs/development/libraries/libass/default.nix |  4 +--
 .../libraries/libassuan/default.nix           |  4 +--
 pkgs/development/libraries/libast/default.nix |  4 +--
 .../libraries/libasyncns/default.nix          |  6 ++--
 .../libraries/libatomic_ops/default.nix       | 12 +++----
 .../libraries/libaudclient/default.nix        |  4 +--
 pkgs/development/libraries/libav/default.nix  |  8 ++---
 .../libraries/libavc1394/default.nix          |  6 ++--
 .../development/libraries/libavif/default.nix |  4 +--
 .../libayatana-appindicator/default.nix       |  2 +-
 .../libayatana-indicator/default.nix          |  2 +-
 pkgs/development/libraries/libb2/default.nix  |  6 ++--
 pkgs/development/libraries/libb64/default.nix |  6 ++--
 .../libraries/libbacktrace/default.nix        |  4 +--
 pkgs/development/libraries/libbap/default.nix |  4 +--
 .../libraries/libbdplus/default.nix           |  4 +--
 pkgs/development/libraries/libbfd/default.nix |  4 +--
 .../libraries/libblockdev/default.nix         |  6 ++--
 .../libraries/libblocksruntime/default.nix    |  4 +--
 .../libraries/libbluedevil/default.nix        |  6 ++--
 .../libraries/libbluray/default.nix           |  8 ++---
 pkgs/development/libraries/libbsd/default.nix |  4 +--
 .../development/libraries/libbson/default.nix |  4 +--
 .../development/libraries/libburn/default.nix |  4 +--
 .../libraries/libbytesize/default.nix         |  4 +--
 .../development/libraries/libcaca/default.nix | 10 +++---
 .../libraries/libcacard/default.nix           |  4 +--
 .../libraries/libcanberra/default.nix         |  6 ++--
 .../libraries/libcangjie/default.nix          |  8 ++---
 .../development/libraries/libcbor/default.nix |  4 +--
 .../libraries/libcdaudio/default.nix          |  6 ++--
 .../development/libraries/libcddb/default.nix |  8 ++---
 .../libraries/libcdio-paranoia/default.nix    | 10 +++---
 .../development/libraries/libcdio/default.nix |  6 ++--
 pkgs/development/libraries/libcdr/default.nix |  6 ++--
 pkgs/development/libraries/libcec/default.nix |  8 ++---
 .../development/libraries/libcec/platform.nix |  6 ++--
 pkgs/development/libraries/libcef/default.nix |  6 ++--
 .../libraries/libcello/default.nix            |  8 ++---
 .../libraries/libchamplain/default.nix        |  6 ++--
 .../libraries/libchardet/default.nix          |  4 +--
 .../libraries/libchewing/default.nix          |  4 +--
 .../development/libraries/libchop/default.nix |  4 +--
 pkgs/development/libraries/libck/default.nix  |  4 +--
 pkgs/development/libraries/libclc/default.nix |  4 +--
 pkgs/development/libraries/libcli/default.nix |  4 +--
 .../libraries/libcloudproviders/default.nix   |  4 +--
 .../libraries/libclthreads/default.nix        |  4 +--
 .../libraries/libclxclient/default.nix        |  4 +--
 .../development/libraries/libcmis/default.nix |  4 +--
 .../libraries/libco-canonical/default.nix     |  4 +--
 .../libraries/libcollectdclient/default.nix   |  6 ++--
 .../libraries/libcommuni/default.nix          |  4 +--
 .../libraries/libconfig/default.nix           |  4 +--
 .../libraries/libconfuse/default.nix          |  4 +--
 .../libraries/libcouchbase/default.nix        |  4 +--
 .../libraries/libcrafter/default.nix          |  8 ++---
 .../libraries/libcredis/default.nix           |  4 +--
 .../libraries/libcrossguid/default.nix        |  4 +--
 .../libraries/libcryptui/default.nix          |  6 ++--
 .../libraries/libcsptr/default.nix            |  4 +--
 pkgs/development/libraries/libctb/default.nix |  4 +--
 .../libraries/libctemplate/default.nix        |  4 +--
 pkgs/development/libraries/libcue/default.nix |  4 +--
 .../development/libraries/libcutl/default.nix |  4 +--
 .../libraries/libdaemon/default.nix           |  8 ++---
 pkgs/development/libraries/libdap/default.nix |  4 +--
 .../libraries/libdatrie/default.nix           |  6 ++--
 .../libraries/libdazzle/default.nix           |  6 ++--
 .../libraries/libdbi-drivers/default.nix      |  4 +--
 pkgs/development/libraries/libdbi/default.nix |  4 +--
 .../libraries/libdbusmenu-qt/default.nix      |  4 +--
 .../libraries/libdbusmenu-qt/qt-5.5.nix       |  4 +--
 .../libraries/libdc1394/default.nix           |  8 ++---
 .../libraries/libde265/default.nix            |  8 ++---
 .../libraries/libdevil/default.nix            |  8 ++---
 .../libraries/libdigidoc/default.nix          |  8 ++---
 .../libraries/libdigidocpp/default.nix        |  4 +--
 .../libraries/libdiscid/default.nix           |  8 ++---
 .../libraries/libdivecomputer/default.nix     |  4 +--
 .../libraries/libdivsufsort/default.nix       |  6 ++--
 .../development/libraries/libdmtx/default.nix |  6 ++--
 .../development/libraries/libdnet/default.nix |  8 ++---
 pkgs/development/libraries/libdv/default.nix  |  6 ++--
 .../libraries/libdvbpsi/default.nix           |  6 ++--
 .../libraries/libdvdcss/default.nix           |  6 ++--
 .../development/libraries/libdvdnav/4.2.1.nix |  8 ++---
 .../libraries/libdvdnav/default.nix           |  8 ++---
 .../libraries/libdvdread/4.9.9.nix            |  8 ++---
 .../libraries/libdvdread/default.nix          |  8 ++---
 .../libraries/libdwarf/default.nix            |  6 ++--
 pkgs/development/libraries/libdwg/default.nix |  8 ++---
 .../development/libraries/libdynd/default.nix |  4 +--
 .../libraries/libe-book/default.nix           |  8 ++---
 .../libraries/libe57format/default.nix        |  4 +--
 .../libraries/libeatmydata/default.nix        |  6 ++--
 pkgs/development/libraries/libeb/default.nix  |  4 +--
 .../development/libraries/libebml/default.nix |  4 +--
 .../libraries/libebur128/default.nix          |  4 +--
 .../libraries/libechonest/default.nix         |  6 ++--
 .../development/libraries/libedit/default.nix |  4 +--
 pkgs/development/libraries/libee/default.nix  |  6 ++--
 .../libraries/libelf-freebsd/default.nix      |  6 ++--
 pkgs/development/libraries/libelf/default.nix | 12 +++----
 .../libraries/libelfin/default.nix            |  4 +--
 pkgs/development/libraries/libepc/default.nix |  6 ++--
 .../development/libraries/liberfa/default.nix |  4 +--
 .../development/libraries/liberio/default.nix |  4 +--
 .../libraries/libesmtp/default.nix            |  4 +--
 .../development/libraries/libestr/default.nix |  4 +--
 pkgs/development/libraries/libev/default.nix  | 10 +++---
 .../libraries/libevdev/default.nix            |  4 +--
 .../libraries/libevdevplus/default.nix        |  4 +--
 .../libraries/libevent/default.nix            | 16 ++++-----
 pkgs/development/libraries/libewf/default.nix |  8 ++---
 .../libraries/libexecinfo/default.nix         | 12 +++----
 .../development/libraries/libexif/default.nix |  4 +--
 .../libraries/libextractor/default.nix        | 16 ++++-----
 .../libraries/libexttextcat/default.nix       |  4 +--
 pkgs/development/libraries/libf2c/default.nix |  6 ++--
 .../libraries/libfakekey/default.nix          |  4 +--
 .../libraries/libfaketime/default.nix         |  8 ++---
 pkgs/development/libraries/libff/default.nix  |  6 ++--
 .../libraries/libffcall/default.nix           |  4 +--
 pkgs/development/libraries/libffi/default.nix |  4 +--
 .../libraries/libfido2/default.nix            |  6 ++--
 .../libraries/libfilezilla/default.nix        |  6 ++--
 .../libraries/libfishsound/default.nix        |  4 +--
 .../libraries/libfixposix/default.nix         |  4 +--
 pkgs/development/libraries/libfm/default.nix  |  6 ++--
 .../libraries/libfprint/default.nix           |  4 +--
 pkgs/development/libraries/libfpx/default.nix |  6 ++--
 .../libraries/libfreefare/default.nix         |  6 ++--
 pkgs/development/libraries/libfsm/default.nix |  4 +--
 pkgs/development/libraries/libftdi/1.x.nix    | 10 +++---
 .../libraries/libfyaml/default.nix            |  4 +--
 .../development/libraries/libgadu/default.nix |  6 ++--
 .../libraries/libgaminggear/default.nix       |  6 ++--
 pkgs/development/libraries/libgcrypt/1.5.nix  |  6 ++--
 .../libraries/libgcrypt/default.nix           | 16 ++++-----
 pkgs/development/libraries/libgda/default.nix | 10 +++---
 .../libraries/libgdamm/default.nix            |  6 ++--
 .../libraries/libgdata/default.nix            |  6 ++--
 .../libraries/libgdiplus/default.nix          | 10 +++---
 pkgs/development/libraries/libgee/default.nix |  6 ++--
 .../libraries/libgeotiff/default.nix          |  8 ++---
 .../libraries/libgepub/default.nix            |  6 ++--
 pkgs/development/libraries/libgig/default.nix |  4 +--
 .../libraries/libgit2-glib/default.nix        |  6 ++--
 .../development/libraries/libgksu/default.nix |  8 ++---
 .../libraries/libglvnd/default.nix            |  4 +--
 .../libraries/libgnome-keyring/default.nix    |  6 ++--
 .../libraries/libgnomekbd/default.nix         |  6 ++--
 .../libraries/libgnurl/default.nix            |  4 +--
 .../libraries/libgpg-error/default.nix        |  2 +-
 .../libraries/libgphoto2/default.nix          |  8 ++---
 .../development/libraries/libgpod/default.nix |  2 +-
 .../libraries/libgringotts/default.nix        |  4 +--
 .../libraries/libgroove/default.nix           |  4 +--
 .../development/libraries/libgrss/default.nix |  6 ++--
 pkgs/development/libraries/libgsf/default.nix |  8 ++---
 .../libraries/libgssglue/default.nix          |  4 +--
 .../development/libraries/libgtop/default.nix |  6 ++--
 .../libraries/libgudev/default.nix            |  6 ++--
 .../libraries/libguestfs/default.nix          | 12 +++----
 .../libraries/libgumath/default.nix           |  4 +--
 .../libraries/libgweather/default.nix         |  6 ++--
 .../development/libraries/libgxps/default.nix |  6 ++--
 pkgs/development/libraries/libhandy/0.x.nix   |  4 +--
 .../libraries/libhandy/default.nix            |  6 ++--
 .../libraries/libhangul/default.nix           |  4 +--
 .../development/libraries/libharu/default.nix |  8 ++---
 .../libraries/libhdhomerun/default.nix        |  6 ++--
 .../development/libraries/libheif/default.nix |  8 ++---
 .../libraries/libhttpseverywhere/default.nix  |  6 ++--
 .../libraries/libiberty/default.nix           |  8 ++---
 .../libraries/libibmad/default.nix            |  4 +--
 .../libraries/libibumad/default.nix           |  4 +--
 .../development/libraries/libical/default.nix |  2 +-
 .../development/libraries/libicns/default.nix |  4 +--
 .../libraries/libid3tag/default.nix           |  4 +--
 pkgs/development/libraries/libidn/default.nix |  8 ++---
 .../development/libraries/libidn2/default.nix | 10 +++---
 .../libraries/libiec61883/default.nix         |  4 +--
 .../libraries/libieee1284/default.nix         |  4 +--
 pkgs/development/libraries/libiio/default.nix |  2 +-
 .../libraries/libimagequant/default.nix       |  4 +--
 pkgs/development/libraries/libime/default.nix |  4 +--
 .../libraries/libimobiledevice/default.nix    |  4 +--
 .../libraries/libinfinity/default.nix         | 14 ++++----
 .../libraries/libinjection/default.nix        |  4 +--
 .../libraries/libinklevel/default.nix         |  4 +--
 .../libraries/libinotify-kqueue/default.nix   |  4 +--
 .../libraries/libinput/default.nix            |  6 ++--
 .../libraries/libiodbc/default.nix            |  8 ++---
 .../libraries/libipfix/default.nix            |  4 +--
 pkgs/development/libraries/libipt/default.nix |  4 +--
 .../libraries/libiptcdata/default.nix         |  6 ++--
 .../libraries/libircclient/default.nix        |  4 +--
 .../libraries/libirecovery/default.nix        |  4 +--
 .../libraries/libiscsi/default.nix            |  4 +--
 .../development/libraries/libisds/default.nix |  4 +--
 .../libraries/libisoburn/default.nix          |  4 +--
 .../libraries/libisofs/default.nix            |  4 +--
 pkgs/development/libraries/libite/default.nix |  4 +--
 .../libraries/libivykis/default.nix           |  4 +--
 .../libraries/libixp-hg/default.nix           |  8 ++---
 .../development/libraries/libjcat/default.nix |  4 +--
 .../libraries/libjpeg-turbo/default.nix       |  6 ++--
 .../development/libraries/libjpeg/default.nix |  8 ++---
 .../libraries/libjreen/default.nix            |  6 ++--
 .../libraries/libjson-rpc-cpp/default.nix     |  6 ++--
 .../development/libraries/libjson/default.nix |  4 +--
 .../development/libraries/libkate/default.nix |  4 +--
 .../libraries/libkeyfinder/default.nix        |  4 +--
 pkgs/development/libraries/libkml/default.nix |  6 ++--
 .../development/libraries/libksba/default.nix |  4 +--
 pkgs/development/libraries/libksi/default.nix |  4 +--
 .../libraries/libktorrent/default.nix         |  4 +--
 .../libraries/liblangtag/default.nix          |  8 ++---
 .../libraries/liblastfm/default.nix           |  6 ++--
 .../libraries/liblastfmSF/default.nix         |  4 +--
 .../libraries/liblaxjson/default.nix          |  4 +--
 pkgs/development/libraries/liblcf/default.nix |  4 +--
 .../libraries/liblinear/default.nix           |  6 ++--
 .../libraries/liblinphone/default.nix         |  4 +--
 pkgs/development/libraries/liblo/default.nix  |  8 ++---
 .../libraries/liblockfile/default.nix         |  8 ++---
 .../libraries/liblogging/default.nix          |  4 +--
 .../libraries/liblognorm/default.nix          |  4 +--
 .../libraries/liblouis/default.nix            |  4 +--
 .../libraries/liblqr-1/default.nix            |  4 +--
 .../development/libraries/liblscp/default.nix |  4 +--
 pkgs/development/libraries/libltc/default.nix |  4 +--
 pkgs/development/libraries/liblxi/default.nix |  4 +--
 pkgs/development/libraries/libmad/default.nix |  6 ++--
 .../libraries/libmanette/default.nix          |  6 ++--
 .../libraries/libmatchbox/default.nix         |  6 ++--
 .../libraries/libmatheval/default.nix         |  8 ++---
 .../libraries/libmatroska/default.nix         |  4 +--
 .../libraries/libmaxminddb/default.nix        |  4 +--
 .../development/libraries/libmbim/default.nix |  4 +--
 .../libraries/libmcrypt/default.nix           |  4 +--
 pkgs/development/libraries/libmd/default.nix  |  4 +--
 .../libraries/libmediaart/default.nix         |  6 ++--
 .../libraries/libmediainfo/default.nix        |  4 +--
 .../libraries/libmemcached/default.nix        | 10 +++---
 .../libraries/libmesode/default.nix           |  4 +--
 .../libraries/libmhash/default.nix            |  4 +--
 .../libraries/libmicrodns/default.nix         |  4 +--
 .../libraries/libmicrohttpd/generic.nix       |  4 +--
 .../libraries/libmikmod/default.nix           |  6 ++--
 .../libraries/libmilter/default.nix           |  4 +--
 .../development/libraries/libminc/default.nix |  4 +--
 pkgs/development/libraries/libmkv/default.nix |  8 ++---
 pkgs/development/libraries/libmms/default.nix |  4 +--
 pkgs/development/libraries/libmng/default.nix |  4 +--
 pkgs/development/libraries/libmnl/default.nix |  6 ++--
 .../libraries/libmodbus/default.nix           |  4 +--
 .../libraries/libmodplug/default.nix          |  4 +--
 .../libraries/libmodule/default.nix           |  4 +--
 .../libraries/libmodulemd/default.nix         |  4 +--
 .../libraries/libmongo-client/default.nix     |  4 +--
 .../libraries/libmowgli/default.nix           |  4 +--
 .../libraries/libmp3splt/default.nix          |  4 +--
 .../libraries/libmpack/default.nix            |  4 +--
 pkgs/development/libraries/libmpc/default.nix |  6 ++--
 .../libraries/libmpcdec/default.nix           |  6 ++--
 .../libraries/libmpeg2/default.nix            | 10 +++---
 .../development/libraries/libmrss/default.nix |  8 ++---
 .../libraries/libmspack/default.nix           |  6 ++--
 pkgs/development/libraries/libmtp/default.nix |  4 +--
 .../libraries/libmusicbrainz/5.x.nix          |  4 +--
 .../libraries/libmusicbrainz/default.nix      |  4 +--
 .../development/libraries/libmwaw/default.nix |  8 ++---
 pkgs/development/libraries/libmx/default.nix  |  4 +--
 .../libraries/libmypaint/default.nix          |  4 +--
 .../libmysqlconnectorcpp/default.nix          |  6 ++--
 .../development/libraries/libnabo/default.nix |  4 +--
 .../libraries/libnatpmp/default.nix           |  4 +--
 .../libraries/libnats-c/default.nix           |  4 +--
 .../libraries/libnatspec/default.nix          |  6 ++--
 .../libraries/libndctl/default.nix            |  4 +--
 pkgs/development/libraries/libndp/default.nix |  4 +--
 .../libraries/libndtypes/default.nix          |  4 +--
 .../libraries/libnest2d/default.nix           |  4 +--
 pkgs/development/libraries/libnet/default.nix |  4 +--
 .../libraries/libnetfilter_acct/default.nix   |  4 +--
 .../libnetfilter_conntrack/default.nix        |  4 +--
 .../libnetfilter_cthelper/default.nix         |  6 ++--
 .../libnetfilter_cttimeout/default.nix        |  6 ++--
 .../libraries/libnetfilter_log/default.nix    |  4 +--
 .../libraries/libnetfilter_queue/default.nix  |  4 +--
 pkgs/development/libraries/libnfc/default.nix |  4 +--
 .../libraries/libnfnetlink/default.nix        |  6 ++--
 pkgs/development/libraries/libnfs/default.nix |  6 ++--
 .../libraries/libnftnl/default.nix            |  4 +--
 .../libraries/libngspice/default.nix          |  4 +--
 .../development/libraries/libnice/default.nix |  4 +--
 pkgs/development/libraries/libnih/default.nix |  6 ++--
 .../libraries/libnixxml/default.nix           |  4 +--
 .../libraries/libnotify/default.nix           |  6 ++--
 .../development/libraries/libnova/default.nix |  4 +--
 pkgs/development/libraries/libnsl/default.nix |  4 +--
 .../development/libraries/libnxml/default.nix |  8 ++---
 .../libraries/liboauth/default.nix            |  4 +--
 .../libraries/libodfgen/default.nix           |  8 ++---
 pkgs/development/libraries/libofa/default.nix |  4 +--
 pkgs/development/libraries/libofx/default.nix |  6 ++--
 pkgs/development/libraries/libogg/default.nix |  6 ++--
 .../development/libraries/liboggz/default.nix |  4 +--
 pkgs/development/libraries/liboil/default.nix |  8 ++---
 .../libraries/libomxil-bellagio/default.nix   |  6 ++--
 pkgs/development/libraries/liboop/default.nix |  4 +--
 .../libraries/libopcodes/default.nix          |  4 +--
 .../libraries/libopenaptx/default.nix         |  4 +--
 .../libraries/liboping/default.nix            |  4 +--
 .../development/libraries/libopus/default.nix | 10 +++---
 .../libraries/libopusenc/default.nix          |  4 +--
 .../libraries/libosinfo/default.nix           |  4 +--
 .../libraries/libosmium/default.nix           |  4 +--
 .../libraries/libosmpbf/default.nix           |  6 ++--
 .../libraries/libossp-uuid/default.nix        |  6 ++--
 pkgs/development/libraries/libotr/default.nix |  4 +--
 pkgs/development/libraries/libow/default.nix  |  4 +--
 .../libraries/libowfat/default.nix            |  4 +--
 pkgs/development/libraries/libp11/default.nix |  4 +--
 .../libraries/libpam-wrapper/default.nix      |  6 ++--
 .../libraries/libpaper/default.nix            |  6 ++--
 .../development/libraries/libpar2/default.nix |  8 ++---
 .../development/libraries/libpcap/default.nix |  4 +--
 .../development/libraries/libpeas/default.nix |  6 ++--
 pkgs/development/libraries/libpfm/default.nix |  6 ++--
 pkgs/development/libraries/libpgf/default.nix |  8 ++---
 .../libraries/libphonenumber/default.nix      |  4 +--
 .../libraries/libpinyin/default.nix           |  4 +--
 .../libraries/libpipeline/default.nix         |  6 ++--
 .../libraries/libplacebo/default.nix          |  4 +--
 .../libraries/libplist/default.nix            | 12 +++----
 pkgs/development/libraries/libpng/12.nix      |  4 +--
 pkgs/development/libraries/libpng/default.nix |  6 ++--
 .../libraries/libpointmatcher/default.nix     |  4 +--
 .../libraries/libportal/default.nix           |  4 +--
 .../libraries/libproxy/default.nix            |  8 ++---
 .../libraries/libpseudo/default.nix           |  4 +--
 pkgs/development/libraries/libpsl/default.nix |  8 ++---
 pkgs/development/libraries/libpst/default.nix |  4 +--
 .../libraries/libqalculate/default.nix        |  6 ++--
 pkgs/development/libraries/libqb/default.nix  |  4 +--
 .../libraries/libqglviewer/default.nix        |  6 ++--
 pkgs/development/libraries/libqmi/default.nix |  4 +--
 pkgs/development/libraries/libr3/default.nix  |  4 +--
 .../libraries/libraspberrypi/default.nix      |  4 +--
 pkgs/development/libraries/libraw/default.nix |  4 +--
 .../libraries/libraw1394/default.nix          |  4 +--
 pkgs/development/libraries/librdf/raptor.nix  |  8 ++---
 pkgs/development/libraries/librdf/raptor2.nix |  8 ++---
 pkgs/development/libraries/librdf/rasqal.nix  |  8 ++---
 pkgs/development/libraries/librdf/redland.nix | 14 ++++----
 pkgs/development/libraries/libre/default.nix  | 12 +++----
 .../libraries/librealsense/default.nix        |  2 +-
 .../development/libraries/librelp/default.nix |  4 +--
 pkgs/development/libraries/librem/default.nix | 12 +++----
 pkgs/development/libraries/librep/default.nix |  4 +--
 .../libraries/libresample/default.nix         |  8 ++---
 .../development/libraries/librest/default.nix |  6 ++--
 .../libraries/librevenge/default.nix          |  8 ++---
 .../libraries/librevisa/default.nix           |  4 +--
 .../development/libraries/librime/default.nix |  4 +--
 .../libraries/libroxml/default.nix            |  4 +--
 .../development/libraries/librseq/default.nix |  4 +--
 .../development/libraries/librsvg/default.nix |  8 ++---
 pkgs/development/libraries/librsync/0.9.nix   | 10 +++---
 .../libraries/librsync/default.nix            |  4 +--
 .../libraries/librtprocess/default.nix        |  4 +--
 pkgs/development/libraries/libs3/default.nix  |  4 +--
 .../libraries/libsamplerate/default.nix       |  6 ++--
 .../development/libraries/libsass/default.nix |  4 +--
 .../libraries/libschrift/default.nix          |  4 +--
 .../libraries/libscrypt/default.nix           |  8 ++---
 .../libraries/libsearpc/default.nix           |  4 +--
 .../libraries/libseccomp/default.nix          |  4 +--
 .../libraries/libsecret/default.nix           |  6 ++--
 .../libraries/libserialport/default.nix       |  8 ++---
 .../libraries/libshout/default.nix            |  8 ++---
 .../libraries/libsieve/default.nix            |  4 +--
 pkgs/development/libraries/libsigcxx/1.2.nix  |  4 +--
 .../libraries/libsigcxx/default.nix           |  6 ++--
 .../libsignal-protocol-c/default.nix          |  4 +--
 .../libraries/libsignon-glib/default.nix      |  4 +--
 .../libraries/libsigsegv/default.nix          |  6 ++--
 .../libraries/libsixel/default.nix            |  4 +--
 pkgs/development/libraries/libskk/default.nix |  8 ++---
 .../libraries/libslirp/default.nix            |  4 +--
 .../libraries/libsmartcols/default.nix        |  8 ++---
 pkgs/development/libraries/libsmi/default.nix |  6 ++--
 .../libraries/libsnark/default.nix            |  6 ++--
 .../libraries/libsndfile/default.nix          |  8 ++---
 .../libraries/libsodium/default.nix           |  4 +--
 .../development/libraries/libsolv/default.nix |  4 +--
 .../libraries/libsoundio/default.nix          | 10 +++---
 .../development/libraries/libsoup/default.nix |  4 +--
 .../libraries/libspatialindex/default.nix     |  6 ++--
 .../libraries/libspectre/default.nix          |  6 ++--
 .../development/libraries/libspf2/default.nix |  4 +--
 .../libraries/libspiro/default.nix            |  4 +--
 .../libraries/libspotify/default.nix          | 14 ++++----
 .../development/libraries/libsrs2/default.nix |  2 +-
 pkgs/development/libraries/libssh/default.nix |  4 +--
 .../development/libraries/libssh2/default.nix |  6 ++--
 .../libraries/libstatgrab/default.nix         |  6 ++--
 .../libraries/libstroke/default.nix           |  6 ++--
 .../libraries/libstrophe/default.nix          |  4 +--
 .../libraries/libsurvive/default.nix          |  4 +--
 pkgs/development/libraries/libsvm/default.nix |  6 ++--
 .../libraries/libsystemtap/default.nix        |  6 ++--
 pkgs/development/libraries/libtap/default.nix |  6 ++--
 pkgs/development/libraries/libtar/default.nix |  4 +--
 .../libraries/libtasn1/default.nix            |  4 +--
 .../development/libraries/libtcod/default.nix |  8 ++---
 .../libraries/libtelnet/default.nix           |  8 ++---
 .../libraries/libtermkey/default.nix          |  2 +-
 .../development/libraries/libthai/default.nix |  4 +--
 .../libraries/libtheora/default.nix           |  6 ++--
 .../libraries/libthreadar/default.nix         |  4 +--
 .../development/libraries/libtiff/default.nix |  4 +--
 .../development/libraries/libtins/default.nix |  8 ++---
 .../libraries/libtomcrypt/default.nix         |  4 +--
 .../libraries/libtommath/default.nix          |  4 +--
 .../libraries/libtorrent-rasterbar/1.1.nix    |  2 +-
 .../libraries/libtorrent-rasterbar/1.2.nix    |  6 ++--
 .../libtorrent-rasterbar/default.nix          |  6 ++--
 .../libraries/libtoxcore/default.nix          |  6 ++--
 .../libraries/libtoxcore/new-api.nix          |  8 ++---
 pkgs/development/libraries/libtsm/default.nix |  4 +--
 .../libraries/libu2f-host/default.nix         |  4 +--
 .../libraries/libu2f-server/default.nix       |  4 +--
 .../libraries/libuchardet/default.nix         |  4 +--
 pkgs/development/libraries/libucl/default.nix |  8 ++---
 .../development/libraries/libuecc/default.nix |  4 +--
 pkgs/development/libraries/libui/default.nix  | 16 ++++-----
 .../libraries/libuinputplus/default.nix       |  4 +--
 .../libraries/libunarr/default.nix            |  4 +--
 .../libraries/libunibreak/default.nix         |  6 ++--
 .../libraries/libuninameslist/default.nix     |  4 +--
 pkgs/development/libraries/libunique/3.x.nix  |  6 ++--
 .../libraries/libunique/default.nix           |  8 ++---
 .../libraries/libunistring/default.nix        |  8 ++---
 .../libraries/libunity/default.nix            |  4 +--
 .../libraries/libunwind/default.nix           |  2 +-
 .../development/libraries/liburcu/default.nix |  4 +--
 .../libraries/liburing/default.nix            |  4 +--
 .../libraries/libusb-compat/0.1.nix           |  4 +--
 .../development/libraries/libusb1/default.nix | 14 ++++----
 .../libraries/libusbmuxd/default.nix          |  4 +--
 pkgs/development/libraries/libuv/default.nix  |  6 ++--
 pkgs/development/libraries/libuvc/default.nix |  4 +--
 pkgs/development/libraries/libva/1.0.0.nix    |  2 +-
 pkgs/development/libraries/libva/default.nix  |  2 +-
 pkgs/development/libraries/libva/utils.nix    |  4 +--
 .../libraries/libvdpau-va-gl/default.nix      |  4 +--
 .../libraries/libvdpau/default.nix            |  8 ++---
 .../libraries/libversion/default.nix          |  2 +-
 .../libraries/libviper/default.nix            |  4 +--
 .../libraries/libvirt-glib/default.nix        |  4 +--
 pkgs/development/libraries/libvirt/5.9.0.nix  |  6 ++--
 .../development/libraries/libvirt/default.nix |  8 ++---
 .../libraries/libvisio/default.nix            |  4 +--
 .../libraries/libvisual/default.nix           |  8 ++---
 .../development/libraries/libvmaf/default.nix |  4 +--
 pkgs/development/libraries/libvmi/default.nix |  6 ++--
 .../libraries/libvncserver/default.nix        | 10 +++---
 .../libraries/libvorbis/default.nix           |  4 +--
 pkgs/development/libraries/libvpx/1_8.nix     |  6 ++--
 pkgs/development/libraries/libvpx/default.nix |  6 ++--
 .../libraries/libvterm-neovim/default.nix     |  6 ++--
 .../libraries/libvterm/default.nix            |  4 +--
 .../libraries/libwacom/default.nix            |  4 +--
 .../development/libraries/libwebp/default.nix |  4 +--
 .../libraries/libwebsockets/default.nix       |  6 ++--
 .../libraries/libwhereami/default.nix         |  4 +--
 pkgs/development/libraries/libwmf/default.nix |  4 +--
 pkgs/development/libraries/libwnck/3.x.nix    |  8 ++---
 .../development/libraries/libwnck/default.nix |  8 ++---
 pkgs/development/libraries/libwpd/0.8.nix     |  4 +--
 pkgs/development/libraries/libwpd/default.nix |  4 +--
 pkgs/development/libraries/libwpg/default.nix |  4 +--
 pkgs/development/libraries/libwps/default.nix |  4 +--
 pkgs/development/libraries/libx86/default.nix |  6 ++--
 .../libraries/libx86emu/default.nix           |  4 +--
 pkgs/development/libraries/libxc/default.nix  |  4 +--
 .../libraries/libxcomp/default.nix            |  4 +--
 .../libraries/libxdg-basedir/default.nix      |  4 +--
 .../libraries/libxkbcommon/default.nix        |  4 +--
 .../libraries/libxkbcommon/libxkbcommon_7.nix |  6 ++--
 .../libraries/libxklavier/default.nix         |  4 +--
 pkgs/development/libraries/libxl/default.nix  |  4 +--
 pkgs/development/libraries/libxls/default.nix |  4 +--
 pkgs/development/libraries/libxmi/default.nix |  6 ++--
 .../development/libraries/libxmlb/default.nix |  4 +--
 .../libraries/libxmlxx/default.nix            |  6 ++--
 pkgs/development/libraries/libxmlxx/v3.nix    |  6 ++--
 pkgs/development/libraries/libxmp/default.nix |  4 +--
 .../development/libraries/libxslt/default.nix | 18 +++++-----
 .../development/libraries/libxsmm/default.nix |  6 ++--
 .../libraries/libyaml-cpp/default.nix         |  4 +--
 .../development/libraries/libyaml/default.nix |  4 +--
 .../libraries/libykclient/default.nix         |  4 +--
 .../libraries/libykneomgr/default.nix         |  4 +--
 .../libraries/libyubikey/default.nix          |  4 +--
 .../libraries/libzapojit/default.nix          |  6 ++--
 pkgs/development/libraries/libzdb/default.nix |  6 ++--
 pkgs/development/libraries/libzen/default.nix |  4 +--
 pkgs/development/libraries/libzip/default.nix |  4 +--
 pkgs/development/libraries/libzmf/default.nix |  8 ++---
 pkgs/development/libraries/libzra/default.nix |  4 +--
 pkgs/development/libraries/lief/default.nix   |  4 +--
 .../libraries/lightning/default.nix           |  6 ++--
 pkgs/development/libraries/lime/default.nix   |  4 +--
 pkgs/development/libraries/linbox/default.nix |  8 ++---
 .../libraries/linenoise-ng/default.nix        |  8 ++---
 .../libraries/linenoise/default.nix           |  8 ++---
 .../libraries/liquid-dsp/default.nix          |  6 ++--
 .../libraries/liquidfun/default.nix           |  8 ++---
 pkgs/development/libraries/lirc/default.nix   |  4 +--
 .../development/libraries/live555/default.nix |  2 +-
 pkgs/development/libraries/lmdb/default.nix   |  6 ++--
 pkgs/development/libraries/lmdbxx/default.nix |  6 ++--
 .../libraries/log4cplus/default.nix           |  6 ++--
 .../development/libraries/log4cpp/default.nix |  4 +--
 .../development/libraries/log4cxx/default.nix |  8 ++---
 .../libraries/log4shib/default.nix            |  4 +--
 pkgs/development/libraries/loki/default.nix   |  4 +--
 .../libraries/loudmouth/default.nix           |  4 +--
 pkgs/development/libraries/lrdf/default.nix   | 10 +++---
 .../development/libraries/luabind/default.nix |  6 ++--
 .../libraries/lucene++/default.nix            |  6 ++--
 pkgs/development/libraries/lyra/default.nix   |  4 +--
 pkgs/development/libraries/lzo/default.nix    |  4 +--
 pkgs/development/libraries/mac/default.nix    |  4 +--
 .../libraries/malcontent/default.nix          |  4 +--
 pkgs/development/libraries/malcontent/ui.nix  |  4 +--
 pkgs/development/libraries/mapnik/default.nix |  4 +--
 pkgs/development/libraries/marisa/default.nix |  4 +--
 pkgs/development/libraries/marl/default.nix   |  4 +--
 pkgs/development/libraries/martyr/default.nix |  4 +--
 pkgs/development/libraries/matio/default.nix  |  4 +--
 .../development/libraries/mbedtls/default.nix |  6 ++--
 pkgs/development/libraries/mdds/default.nix   |  6 ++--
 .../development/libraries/medfile/default.nix |  4 +--
 .../libraries/mediastreamer/default.nix       |  4 +--
 .../libraries/mediastreamer/msopenh264.nix    |  4 +--
 .../libraries/menu-cache/default.nix          |  4 +--
 .../libraries/mesa-glu/default.nix            |  8 ++---
 pkgs/development/libraries/mesa/default.nix   |  4 +--
 pkgs/development/libraries/metal/default.nix  |  4 +--
 .../libraries/microsoft_gsl/default.nix       |  4 +--
 .../libraries/mimalloc/default.nix            |  8 ++---
 .../development/libraries/mimetic/default.nix |  6 ++--
 .../libraries/miniball/default.nix            |  8 ++---
 .../development/libraries/minixml/default.nix |  4 +--
 .../development/libraries/minizip/default.nix |  4 +--
 .../libraries/minizip2/default.nix            |  4 +--
 pkgs/development/libraries/mlt/default.nix    |  4 +--
 pkgs/development/libraries/mlt/qt-5.nix       |  6 ++--
 .../libraries/mm-common/default.nix           |  6 ++--
 pkgs/development/libraries/mongoc/default.nix |  4 +--
 .../libraries/mono-addins/default.nix         |  4 +--
 pkgs/development/libraries/motif/default.nix  |  6 ++--
 pkgs/development/libraries/movit/default.nix  |  4 +--
 pkgs/development/libraries/mp4v2/default.nix  |  2 +-
 pkgs/development/libraries/mpfi/default.nix   |  8 ++---
 pkgs/development/libraries/mpfr/default.nix   | 10 +++---
 pkgs/development/libraries/mpich/default.nix  |  6 ++--
 pkgs/development/libraries/mpir/default.nix   |  8 ++---
 pkgs/development/libraries/mps/default.nix    |  8 ++---
 .../development/libraries/msgpack/generic.nix |  6 ++--
 .../development/libraries/msgpuck/default.nix |  4 +--
 pkgs/development/libraries/msilbc/default.nix |  4 +--
 pkgs/development/libraries/mtdev/default.nix  |  4 +--
 .../libraries/mtxclient/default.nix           |  4 +--
 .../libraries/multipart-parser-c/default.nix  |  4 +--
 .../libraries/muparser/default.nix            | 10 +++---
 .../libraries/muparserx/default.nix           |  4 +--
 pkgs/development/libraries/mutest/default.nix |  4 +--
 pkgs/development/libraries/mygui/default.nix  |  4 +--
 .../libraries/mypaint-brushes/1.0.nix         |  4 +--
 .../libraries/mypaint-brushes/default.nix     |  4 +--
 .../libraries/mysocketw/default.nix           |  8 ++---
 pkgs/development/libraries/mythes/default.nix |  4 +--
 .../libraries/nanoflann/default.nix           |  6 ++--
 .../development/libraries/nanomsg/default.nix |  4 +--
 pkgs/development/libraries/nco/default.nix    |  8 ++---
 pkgs/development/libraries/ndi/default.nix    |  4 +--
 .../development/libraries/ndn-cxx/default.nix |  4 +--
 pkgs/development/libraries/ndpi/default.nix   |  4 +--
 .../development/libraries/neardal/default.nix |  4 +--
 .../development/libraries/neatvnc/default.nix |  4 +--
 pkgs/development/libraries/neon/0.29.nix      | 16 ++++-----
 pkgs/development/libraries/neon/default.nix   | 16 ++++-----
 .../libraries/netcdf-cxx4/default.nix         |  6 ++--
 .../libraries/netcdf-fortran/default.nix      |  4 +--
 pkgs/development/libraries/netcdf/default.nix |  6 ++--
 pkgs/development/libraries/nettle/generic.nix |  8 ++---
 .../libraries/networking-ts-cxx/default.nix   |  4 +--
 pkgs/development/libraries/newt/default.nix   |  4 +--
 .../development/libraries/nghttp2/default.nix |  8 ++---
 pkgs/development/libraries/ngt/default.nix    |  4 +--
 .../libraries/nix-plugins/default.nix         |  6 ++--
 .../libraries/nlohmann_json/default.nix       |  4 +--
 pkgs/development/libraries/nlopt/default.nix  |  8 ++---
 .../libraries/notify-sharp/default.nix        |  4 +--
 .../libraries/npapi-sdk/default.nix           |  4 +--
 pkgs/development/libraries/npth/default.nix   |  4 +--
 pkgs/development/libraries/nspr/default.nix   | 10 +++---
 pkgs/development/libraries/nss/3.44.nix       | 16 ++++-----
 pkgs/development/libraries/nss/3.53.nix       | 16 ++++-----
 pkgs/development/libraries/nss/default.nix    | 16 ++++-----
 .../libraries/nss_wrapper/default.nix         |  4 +--
 pkgs/development/libraries/ntbtls/default.nix |  6 ++--
 pkgs/development/libraries/ntdb/default.nix   |  4 +--
 pkgs/development/libraries/ntirpc/default.nix |  4 +--
 pkgs/development/libraries/ntrack/default.nix |  4 +--
 pkgs/development/libraries/nuraft/default.nix |  4 +--
 .../development/libraries/nuspell/default.nix |  4 +--
 .../libraries/nv-codec-headers/default.nix    |  8 ++---
 .../nvidia-optical-flow-sdk/default.nix       |  4 +--
 .../nvidia-texture-tools/default.nix          |  4 +--
 .../libraries/nvidia-video-sdk/default.nix    |  4 +--
 pkgs/development/libraries/oatpp/default.nix  |  4 +--
 .../development/libraries/ocl-icd/default.nix |  4 +--
 pkgs/development/libraries/ode/default.nix    |  4 +--
 pkgs/development/libraries/odpic/default.nix  | 14 ++++----
 pkgs/development/libraries/ogdf/default.nix   |  4 +--
 pkgs/development/libraries/ogre/1.10.x.nix    |  6 ++--
 pkgs/development/libraries/ogre/1.9.x.nix     |  6 ++--
 pkgs/development/libraries/ogre/default.nix   |  6 ++--
 .../libraries/ogrepaged/default.nix           |  6 ++--
 pkgs/development/libraries/ois/default.nix    |  2 +-
 pkgs/development/libraries/olm/default.nix    |  6 ++--
 .../libraries/oniguruma/default.nix           |  4 +--
 pkgs/development/libraries/opae/default.nix   |  4 +--
 .../libraries/openal-soft/default.nix         |  4 +--
 pkgs/development/libraries/openbabel/2.nix    |  2 +-
 .../libraries/openbabel/default.nix           |  2 +-
 pkgs/development/libraries/openbr/default.nix |  8 ++---
 .../libraries/opencascade-occt/default.nix    |  6 ++--
 .../libraries/opencascade/default.nix         |  4 +--
 .../libraries/opencl-clang/default.nix        | 15 ++++----
 .../libraries/opencl-clhpp/default.nix        |  4 +--
 .../libraries/opencl-headers/default.nix      |  4 +--
 .../libraries/opencollada/default.nix         |  6 ++--
 .../libraries/opencolorio/default.nix         |  2 +-
 .../libraries/opencore-amr/default.nix        |  6 ++--
 .../development/libraries/opencsg/default.nix | 14 ++++----
 pkgs/development/libraries/openct/default.nix |  4 +--
 pkgs/development/libraries/opencv/3.x.nix     |  2 +-
 pkgs/development/libraries/opencv/4.x.nix     |  2 +-
 pkgs/development/libraries/opencv/default.nix |  2 +-
 .../development/libraries/opendbx/default.nix |  6 ++--
 .../development/libraries/opendht/default.nix |  4 +--
 .../libraries/opendkim/default.nix            |  4 +--
 .../libraries/opendmarc/default.nix           |  4 +--
 .../development/libraries/openexr/default.nix |  2 +-
 .../libraries/openexrid-unstable/default.nix  |  4 +--
 .../development/libraries/openfst/default.nix |  4 +--
 pkgs/development/libraries/openfx/default.nix |  4 +--
 .../libraries/opengrm-ngram/default.nix       |  4 +--
 .../libraries/openh264/default.nix            |  4 +--
 .../development/libraries/openhmd/default.nix |  8 ++---
 .../libraries/openimagedenoise/default.nix    |  4 +--
 .../libraries/openjpeg/generic.nix            |  6 ++--
 .../libraries/openldap/default.nix            | 12 +++----
 .../development/libraries/openmpi/default.nix |  6 ++--
 pkgs/development/libraries/openpa/default.nix |  8 ++---
 .../libraries/opensaml-cpp/default.nix        |  4 +--
 .../libraries/openscenegraph/default.nix      |  2 +-
 .../development/libraries/openslp/default.nix |  4 +--
 pkgs/development/libraries/openssl/chacha.nix | 10 +++---
 .../development/libraries/openssl/default.nix | 24 ++++++-------
 .../libraries/opentracing-cpp/default.nix     |  6 ++--
 .../development/libraries/openvdb/default.nix |  4 +--
 .../libraries/openwsman/default.nix           |  4 +--
 .../libraries/openxr-loader/default.nix       |  4 +--
 .../libraries/openzwave/default.nix           |  4 +--
 .../oracle-instantclient/default.nix          |  6 ++--
 .../development/libraries/orcania/default.nix |  4 +--
 pkgs/development/libraries/ortp/default.nix   |  4 +--
 pkgs/development/libraries/osip/default.nix   |  8 ++---
 .../libraries/osm-gps-map/default.nix         |  4 +--
 .../development/libraries/p11-kit/default.nix |  4 +--
 pkgs/development/libraries/packr/default.nix  |  2 +-
 pkgs/development/libraries/pagmo2/default.nix |  4 +--
 pkgs/development/libraries/pango/default.nix  | 10 +++---
 .../libraries/pangolin/default.nix            |  6 ++--
 .../development/libraries/pangomm/default.nix |  8 ++---
 .../libraries/pangoxsl/default.nix            |  4 +--
 pkgs/development/libraries/partio/default.nix |  4 +--
 .../libraries/pc-ble-driver/default.nix       |  8 ++---
 .../libraries/pcaudiolib/default.nix          |  2 +-
 pkgs/development/libraries/pcg-c/default.nix  |  6 ++--
 pkgs/development/libraries/pcl/default.nix    | 14 ++++----
 pkgs/development/libraries/pcre/default.nix   |  6 ++--
 pkgs/development/libraries/pcre2/default.nix  |  6 ++--
 pkgs/development/libraries/pdal/default.nix   |  4 +--
 .../development/libraries/pdf2xml/default.nix |  4 +--
 pkgs/development/libraries/phash/default.nix  |  4 +--
 .../libraries/phonetisaurus/default.nix       |  4 +--
 .../libraries/phonon/backends/gstreamer.nix   |  2 +-
 .../libraries/phonon/backends/vlc.nix         |  2 +-
 pkgs/development/libraries/phonon/default.nix |  6 ++--
 pkgs/development/libraries/physfs/default.nix |  6 ++--
 .../libraries/physics/apfel/default.nix       |  4 +--
 .../libraries/physics/apfelgrid/default.nix   |  4 +--
 .../libraries/physics/applgrid/default.nix    |  4 +--
 .../libraries/physics/cernlib/default.nix     |  6 ++--
 .../physics/fastjet-contrib/default.nix       |  4 +--
 .../libraries/physics/fastjet/default.nix     |  8 ++---
 .../libraries/physics/fastnlo/default.nix     |  8 ++---
 .../libraries/physics/geant4/datasets.nix     |  2 +-
 .../libraries/physics/geant4/default.nix      | 18 +++++-----
 .../libraries/physics/hepmc2/default.nix      |  4 +--
 .../libraries/physics/hepmc3/default.nix      | 12 +++----
 .../libraries/physics/herwig/default.nix      |  4 +--
 .../libraries/physics/hoppet/default.nix      |  4 +--
 .../libraries/physics/lhapdf/default.nix      | 12 +++----
 .../libraries/physics/lhapdf/pdf_sets.nix     |  4 +--
 .../libraries/physics/mela/default.nix        |  4 +--
 .../libraries/physics/nlojet/default.nix      |  8 ++---
 .../libraries/physics/pythia/default.nix      | 10 +++---
 .../libraries/physics/qcdnum/default.nix      |  8 ++---
 .../libraries/physics/rivet/default.nix       |  6 ++--
 .../libraries/physics/thepeg/default.nix      |  4 +--
 .../libraries/physics/yoda/default.nix        | 10 +++---
 pkgs/development/libraries/pipewire/0.2.nix   |  4 +--
 .../libraries/pipewire/default.nix            |  2 +-
 pkgs/development/libraries/pixman/default.nix |  6 ++--
 .../libraries/pkcs11helper/default.nix        |  4 +--
 pkgs/development/libraries/pkger/default.nix  |  2 +-
 pkgs/development/libraries/plib/default.nix   |  6 ++--
 pkgs/development/libraries/plplot/default.nix |  4 +--
 pkgs/development/libraries/pmdk/default.nix   |  4 +--
 pkgs/development/libraries/pmix/default.nix   |  4 +--
 pkgs/development/libraries/png++/default.nix  | 10 +++---
 .../libraries/pocketsphinx/default.nix        |  6 ++--
 pkgs/development/libraries/poco/default.nix   |  4 +--
 pkgs/development/libraries/podofo/default.nix |  4 +--
 .../libraries/polkit-qt-1/qt-4.nix            |  6 ++--
 .../libraries/polkit-qt-1/qt-5.nix            |  8 ++---
 pkgs/development/libraries/polkit/default.nix | 16 ++++-----
 .../libraries/poly2tri-c/default.nix          |  6 ++--
 pkgs/development/libraries/poppler/0.61.nix   |  2 +-
 .../development/libraries/poppler/default.nix |  2 +-
 pkgs/development/libraries/popt/default.nix   |  6 ++--
 .../libraries/portaudio/default.nix           | 16 ++++-----
 .../libraries/portmidi/default.nix            |  8 ++---
 pkgs/development/libraries/ppl/default.nix    |  8 ++---
 pkgs/development/libraries/prison/default.nix |  4 +--
 .../libraries/proj-datumgrid/default.nix      |  4 +--
 pkgs/development/libraries/proj/5.2.nix       |  4 +--
 pkgs/development/libraries/proj/default.nix   |  4 +--
 .../libraries/prometheus-client-c/default.nix |  8 ++---
 .../libraries/prometheus-cpp/default.nix      |  4 +--
 .../libraries/properties-cpp/default.nix      |  4 +--
 .../libraries/protobuf/generic-v3.nix         |  8 ++---
 .../libraries/protobuf/generic.nix            |  6 ++--
 .../libraries/protobufc/generic.nix           |  4 +--
 .../libraries/prototypejs/default.nix         |  4 +--
 .../libraries/protozero/default.nix           |  4 +--
 pkgs/development/libraries/pslib/default.nix  |  4 +--
 pkgs/development/libraries/psol/generic.nix   |  6 ++--
 .../libraries/psqlodbc/default.nix            |  4 +--
 .../libraries/pstreams/default.nix            |  6 ++--
 pkgs/development/libraries/ptex/default.nix   |  4 +--
 pkgs/development/libraries/pth/default.nix    |  8 ++---
 pkgs/development/libraries/pupnp/default.nix  |  4 +--
 pkgs/development/libraries/pxlib/default.nix  |  4 +--
 .../libraries/pyotherside/default.nix         |  4 +--
 .../libraries/python-qt/default.nix           |  4 +--
 .../development/libraries/qca-qt5/default.nix |  6 ++--
 pkgs/development/libraries/qca2/default.nix   |  6 ++--
 pkgs/development/libraries/qhull/default.nix  |  4 +--
 .../libraries/qimageblitz/default.nix         |  6 ++--
 pkgs/development/libraries/qjson/default.nix  |  4 +--
 .../libraries/qmlbox2d/default.nix            |  4 +--
 .../libraries/qmltermwidget/default.nix       | 10 +++---
 pkgs/development/libraries/qoauth/default.nix |  4 +--
 pkgs/development/libraries/qpdf/default.nix   |  4 +--
 .../libraries/qrcodegen/default.nix           |  4 +--
 .../libraries/qrencode/default.nix            |  6 ++--
 .../libraries/qrupdate/default.nix            |  8 ++---
 .../libraries/qscintilla/default.nix          |  2 +-
 pkgs/development/libraries/qt-3/default.nix   | 24 ++++++-------
 .../libraries/qt-4.x/4.8/default.nix          |  2 +-
 .../libraries/qt-mobility/default.nix         |  4 +--
 .../libraries/qtkeychain/default.nix          | 12 +++----
 .../libraries/qtpbfimageplugin/default.nix    |  6 ++--
 .../libraries/qtscriptgenerator/default.nix   |  4 +--
 .../qtstyleplugin-kvantum-qt4/default.nix     |  4 +--
 .../qtstyleplugin-kvantum/default.nix         |  4 +--
 .../libraries/qtstyleplugins/default.nix      |  4 +--
 .../libraries/qtutilities/default.nix         |  4 +--
 .../libraries/qtwebkit-plugins/default.nix    |  6 ++--
 pkgs/development/libraries/quazip/default.nix |  6 ++--
 .../libraries/quesoglc/default.nix            |  4 +--
 .../libraries/quickder/default.nix            |  4 +--
 .../libraries/quickfix/default.nix            |  4 +--
 pkgs/development/libraries/qwt/6.nix          |  6 ++--
 pkgs/development/libraries/qwt/6_qt4.nix      | 10 +++---
 pkgs/development/libraries/qwt/default.nix    |  6 ++--
 pkgs/development/libraries/qxt/default.nix    |  8 ++---
 .../libraries/rabbitmq-c/default.nix          |  4 +--
 .../rabbitmq-java-client/default.nix          |  4 +--
 .../libraries/raft-canonical/default.nix      |  4 +--
 .../development/libraries/randomx/default.nix |  4 +--
 pkgs/development/libraries/rang/default.nix   |  4 +--
 .../libraries/range-v3/default.nix            |  6 ++--
 .../libraries/rapidcheck/default.nix          |  4 +--
 .../libraries/rapidxml/default.nix            |  4 +--
 pkgs/development/libraries/rarian/default.nix |  6 ++--
 .../development/libraries/rdkafka/default.nix |  4 +--
 pkgs/development/libraries/re2/default.nix    |  6 ++--
 pkgs/development/libraries/readline/5.x.nix   |  6 ++--
 pkgs/development/libraries/readline/6.2.nix   |  6 ++--
 pkgs/development/libraries/readline/6.3.nix   |  8 ++---
 pkgs/development/libraries/readline/7.0.nix   |  4 +--
 pkgs/development/libraries/readline/8.0.nix   |  4 +--
 .../development/libraries/readosm/default.nix |  6 ++--
 .../development/libraries/redkite/default.nix |  4 +--
 .../development/libraries/rep-gtk/default.nix |  4 +--
 .../libraries/resolv_wrapper/default.nix      |  4 +--
 pkgs/development/libraries/rlog/default.nix   |  6 ++--
 .../development/libraries/rlottie/default.nix |  4 +--
 .../libraries/rnnoise-plugin/default.nix      |  4 +--
 .../libraries/robin-map/default.nix           |  4 +--
 pkgs/development/libraries/rocclr/default.nix |  4 +--
 .../development/libraries/rocksdb/default.nix | 16 ++++-----
 .../libraries/rocm-comgr/default.nix          |  4 +--
 .../libraries/rocm-device-libs/default.nix    |  4 +--
 .../libraries/rocm-opencl-icd/default.nix     |  4 +--
 .../libraries/rocm-opencl-runtime/default.nix |  4 +--
 .../libraries/rocm-runtime/default.nix        |  4 +--
 .../libraries/rocm-thunk/default.nix          |  4 +--
 pkgs/development/libraries/rote/default.nix   |  4 +--
 pkgs/development/libraries/rttr/default.nix   |  4 +--
 .../libraries/rubberband/default.nix          |  4 +--
 .../libraries/safefile/default.nix            |  8 ++---
 pkgs/development/libraries/sbc/default.nix    |  4 +--
 .../libraries/sblim-sfcc/default.nix          |  4 +--
 .../libraries/schroedinger/default.nix        |  4 +--
 .../science/benchmark/papi/default.nix        |  4 +--
 .../science/biology/EBTKS/default.nix         |  4 +--
 .../science/biology/bicgl/default.nix         |  4 +--
 .../science/biology/bicpl/default.nix         |  4 +--
 .../science/biology/bpp-core/default.nix      |  4 +--
 .../science/biology/elastix/default.nix       |  6 ++--
 .../science/biology/gifticlib/default.nix     |  4 +--
 .../science/biology/htslib/default.nix        |  4 +--
 .../science/biology/mirtk/default.nix         |  4 +--
 .../science/biology/nifticlib/default.nix     |  4 +--
 .../science/biology/oobicpl/default.nix       |  4 +--
 .../science/math/QuadProgpp/default.nix       |  4 +--
 .../science/math/amd-blis/default.nix         |  6 ++--
 .../science/math/amd-libflame/default.nix     |  2 +-
 .../libraries/science/math/arpack/default.nix | 10 +++---
 .../libraries/science/math/blas/default.nix   | 10 +++---
 .../libraries/science/math/blis/default.nix   |  6 ++--
 .../libraries/science/math/brial/default.nix  |  4 +--
 .../libraries/science/math/caffe2/default.nix |  6 ++--
 .../science/math/cholmod-extra/default.nix    |  4 +--
 .../libraries/science/math/clblas/default.nix | 10 +++---
 .../science/math/cliquer/default.nix          |  4 +--
 .../science/math/clmagma/default.nix          |  6 ++--
 .../libraries/science/math/cudnn/generic.nix  |  2 +-
 .../libraries/science/math/ecos/default.nix   |  4 +--
 .../libraries/science/math/fenics/default.nix | 24 ++++++-------
 .../science/math/flintqs/default.nix          |  4 +--
 .../libraries/science/math/ipopt/default.nix  |  4 +--
 .../libraries/science/math/itpp/default.nix   |  4 +--
 .../libraries/science/math/lcalc/default.nix  |  8 ++---
 .../science/math/libbraiding/default.nix      |  4 +--
 .../science/math/libhomfly/default.nix        |  4 +--
 .../science/math/liblapack/default.nix        |  6 ++--
 .../science/math/liblbfgs/default.nix         |  6 ++--
 .../libraries/science/math/libtorch/bin.nix   | 12 +++----
 .../libraries/science/math/lrs/default.nix    |  8 ++---
 .../libraries/science/math/m4ri/default.nix   |  4 +--
 .../libraries/science/math/m4rie/default.nix  |  4 +--
 .../libraries/science/math/magma/default.nix  |  6 ++--
 .../libraries/science/math/metis/default.nix  |  6 ++--
 .../science/math/mongoose/default.nix         |  4 +--
 .../libraries/science/math/nccl/default.nix   |  4 +--
 .../science/math/openblas/default.nix         | 10 +++---
 .../science/math/openlibm/default.nix         |  8 ++---
 .../science/math/openspecfun/default.nix      |  8 ++---
 .../science/math/or-tools/default.nix         |  4 +--
 .../libraries/science/math/osi/default.nix    |  2 +-
 .../libraries/science/math/osqp/default.nix   |  4 +--
 .../science/math/parmetis/default.nix         |  4 +--
 .../libraries/science/math/petsc/default.nix  |  6 ++--
 .../science/math/planarity/default.nix        |  4 +--
 .../science/math/primesieve/default.nix       |  4 +--
 .../science/math/rankwidth/default.nix        |  4 +--
 .../libraries/science/math/rubiks/default.nix |  4 +--
 .../science/math/scalapack/default.nix        |  4 +--
 .../libraries/science/math/scs/default.nix    |  6 ++--
 .../science/math/spooles/default.nix          |  6 ++--
 .../math/suitesparse-graphblas/default.nix    |  4 +--
 .../science/math/suitesparse/4.2.nix          |  4 +--
 .../science/math/suitesparse/4.4.nix          | 12 +++----
 .../science/math/suitesparse/default.nix      | 14 ++++----
 .../science/math/superlu/default.nix          |  4 +--
 .../libraries/science/math/sympow/default.nix |  4 +--
 .../libraries/science/math/tensorflow/bin.nix |  4 +--
 .../science/networking/ns-3/default.nix       | 10 +++---
 .../science/robotics/ispike/default.nix       |  8 ++---
 .../development/libraries/scmccid/default.nix |  8 ++---
 .../libraries/scriptaculous/default.nix       |  4 +--
 .../libraries/seasocks/default.nix            |  4 +--
 .../libraries/sentencepiece/default.nix       |  2 +-
 pkgs/development/libraries/serd/default.nix   |  4 +--
 pkgs/development/libraries/serf/default.nix   |  8 ++---
 .../libraries/serialdv/default.nix            |  4 +--
 pkgs/development/libraries/sfml/default.nix   | 10 +++---
 pkgs/development/libraries/sfsexp/default.nix |  4 +--
 .../libraries/shapelib/default.nix            |  4 +--
 pkgs/development/libraries/shhmsg/default.nix |  4 +--
 pkgs/development/libraries/shhopt/default.nix |  4 +--
 .../libraries/shibboleth-sp/default.nix       |  4 +--
 .../libraries/silgraphite/default.nix         |  4 +--
 .../libraries/silgraphite/graphite2.nix       |  6 ++--
 .../libraries/simdjson/default.nix            |  4 +--
 .../development/libraries/simgear/default.nix |  4 +--
 .../libraries/simpleitk/default.nix           |  4 +--
 pkgs/development/libraries/slang/default.nix  |  6 ++--
 pkgs/development/libraries/slib/default.nix   |  6 ++--
 .../libraries/smarty3-i18n/default.nix        |  4 +--
 .../development/libraries/smarty3/default.nix |  4 +--
 pkgs/development/libraries/smesh/default.nix  |  6 ++--
 pkgs/development/libraries/smpeg/default.nix  |  6 ++--
 pkgs/development/libraries/smpeg2/default.nix |  6 ++--
 pkgs/development/libraries/snack/default.nix  |  4 +--
 pkgs/development/libraries/snappy/default.nix |  4 +--
 pkgs/development/libraries/soci/default.nix   |  4 +--
 .../libraries/socket_wrapper/default.nix      |  4 +--
 .../libraries/sofia-sip/default.nix           |  4 +--
 pkgs/development/libraries/sonic/default.nix  |  6 ++--
 .../development/libraries/soprano/default.nix |  4 +--
 pkgs/development/libraries/soqt/default.nix   |  4 +--
 pkgs/development/libraries/sord/default.nix   |  4 +--
 pkgs/development/libraries/soxt/default.nix   |  4 +--
 pkgs/development/libraries/spandsp/3.nix      |  8 ++---
 .../development/libraries/spandsp/default.nix |  8 ++---
 .../libraries/sparsehash/default.nix          |  4 +--
 .../libraries/spatialite-tools/default.nix    |  6 ++--
 pkgs/development/libraries/spdk/default.nix   |  4 +--
 pkgs/development/libraries/spdlog/default.nix |  4 +--
 .../libraries/speech-tools/default.nix        |  4 +--
 .../development/libraries/speechd/default.nix |  6 ++--
 pkgs/development/libraries/speex/default.nix  |  4 +--
 .../libraries/speexdsp/default.nix            |  6 ++--
 .../libraries/sphinxbase/default.nix          | 10 +++---
 .../libraries/spice-gtk/default.nix           |  6 ++--
 .../libraries/spice-protocol/default.nix      |  4 +--
 pkgs/development/libraries/spice/default.nix  |  4 +--
 .../libraries/spirv-headers/default.nix       |  4 +--
 .../libraries/sqlcipher/default.nix           |  2 +-
 pkgs/development/libraries/sqlite/default.nix |  6 ++--
 pkgs/development/libraries/sqlite/sqlar.nix   |  4 +--
 pkgs/development/libraries/sqlite/tools.nix   |  8 ++---
 pkgs/development/libraries/srt/default.nix    |  4 +--
 pkgs/development/libraries/srtp/default.nix   |  4 +--
 .../startup-notification/default.nix          |  4 +--
 pkgs/development/libraries/stb/default.nix    |  4 +--
 .../libraries/stellarsolver/default.nix       |  4 +--
 pkgs/development/libraries/stfl/default.nix   | 10 +++---
 .../development/libraries/stlport/default.nix |  4 +--
 pkgs/development/libraries/stxxl/default.nix  |  4 +--
 .../development/libraries/subunit/default.nix |  4 +--
 .../libraries/sundials/default.nix            | 12 +++----
 .../development/libraries/svrcore/default.nix |  4 +--
 .../development/libraries/swiften/default.nix |  4 +--
 .../libraries/swiftshader/default.nix         |  4 +--
 pkgs/development/libraries/sword/default.nix  |  4 +--
 .../libraries/sycl-info/default.nix           |  6 ++--
 .../libraries/symengine/default.nix           |  4 +--
 pkgs/development/libraries/szip/default.nix   |  4 +--
 pkgs/development/libraries/t1lib/default.nix  |  6 ++--
 .../development/libraries/tachyon/default.nix | 20 +++++------
 .../libraries/taglib-extras/default.nix       |  4 +--
 .../libraries/taglib-sharp/default.nix        |  4 +--
 pkgs/development/libraries/taglib/default.nix |  4 +--
 pkgs/development/libraries/talloc/default.nix |  8 ++---
 pkgs/development/libraries/tbb/default.nix    |  6 ++--
 pkgs/development/libraries/tclap/default.nix  |  4 +--
 pkgs/development/libraries/tcllib/default.nix |  6 ++--
 pkgs/development/libraries/tcltls/default.nix |  6 ++--
 pkgs/development/libraries/tclx/default.nix   |  6 ++--
 pkgs/development/libraries/tdb/default.nix    |  4 +--
 pkgs/development/libraries/tdlib/default.nix  |  4 +--
 pkgs/development/libraries/tecla/default.nix  |  6 ++--
 .../libraries/telepathy/farstream/default.nix |  4 +--
 .../libraries/telepathy/glib/default.nix      |  4 +--
 .../libraries/telepathy/qt/default.nix        |  6 ++--
 .../libraries/template-glib/default.nix       |  6 ++--
 pkgs/development/libraries/tepl/default.nix   |  6 ++--
 .../development/libraries/termbox/default.nix |  4 +--
 pkgs/development/libraries/tevent/default.nix |  4 +--
 pkgs/development/libraries/theft/default.nix  |  4 +--
 pkgs/development/libraries/thrift/0.10.nix    |  4 +--
 pkgs/development/libraries/thrift/default.nix | 10 +++---
 pkgs/development/libraries/ti-rpc/default.nix |  4 +--
 pkgs/development/libraries/ticpp/default.nix  |  4 +--
 pkgs/development/libraries/tidyp/default.nix  |  4 +--
 .../libraries/timezonemap/default.nix         |  4 +--
 .../libraries/tinycbor/default.nix            |  4 +--
 .../libraries/tinyobjloader/default.nix       |  4 +--
 .../libraries/tinyxml-2/default.nix           |  6 ++--
 pkgs/development/libraries/tinyxml/2.6.2.nix  | 10 +++---
 pkgs/development/libraries/tix/default.nix    |  6 ++--
 pkgs/development/libraries/tk/8.6.nix         |  4 +--
 pkgs/development/libraries/tk/generic.nix     |  8 ++---
 .../libraries/tl-expected/default.nix         |  4 +--
 pkgs/development/libraries/tnt/default.nix    |  6 ++--
 pkgs/development/libraries/tntdb/default.nix  |  4 +--
 pkgs/development/libraries/tntnet/default.nix |  4 +--
 .../libraries/tokyo-cabinet/default.nix       |  6 ++--
 .../libraries/tokyo-tyrant/default.nix        |  6 ++--
 .../libraries/totem-pl-parser/default.nix     |  6 ++--
 .../libraries/tracker-miners/default.nix      |  6 ++--
 .../development/libraries/tracker/default.nix |  6 ++--
 pkgs/development/libraries/tre/default.nix    |  6 ++--
 pkgs/development/libraries/tremor/default.nix |  6 ++--
 .../libraries/trompeloeil/default.nix         |  4 +--
 pkgs/development/libraries/tsocks/default.nix |  6 ++--
 pkgs/development/libraries/tweeny/default.nix |  4 +--
 .../development/libraries/twolame/default.nix |  4 +--
 pkgs/development/libraries/ubus/default.nix   |  4 +--
 pkgs/development/libraries/uci/default.nix    |  4 +--
 pkgs/development/libraries/ucl/default.nix    |  8 ++---
 .../development/libraries/ucommon/default.nix |  8 ++---
 pkgs/development/libraries/ucx/default.nix    |  4 +--
 pkgs/development/libraries/udns/default.nix   |  4 +--
 .../development/libraries/udunits/default.nix |  4 +--
 .../libraries/uid_wrapper/default.nix         |  4 +--
 .../libraries/umockdev/default.nix            |  4 +--
 .../libraries/unibilium/default.nix           |  2 +-
 pkgs/development/libraries/unicap/default.nix |  4 +--
 .../development/libraries/unicorn/default.nix |  4 +--
 .../libraries/unittest-cpp/default.nix        |  6 ++--
 .../libraries/unixODBC/default.nix            |  4 +--
 .../libraries/unixODBCDrivers/default.nix     | 10 +++---
 .../development/libraries/unqlite/default.nix |  4 +--
 pkgs/development/libraries/uri/default.nix    |  6 ++--
 .../libraries/uriparser/default.nix           |  2 +-
 .../libraries/usbredir/default.nix            |  4 +--
 pkgs/development/libraries/ustr/default.nix   |  4 +--
 .../development/libraries/utf8cpp/default.nix |  4 +--
 .../libraries/utf8proc/default.nix            |  4 +--
 pkgs/development/libraries/uthash/default.nix |  4 +--
 pkgs/development/libraries/v8/5_x.nix         |  6 ++--
 pkgs/development/libraries/v8/default.nix     |  8 ++---
 .../libraries/vaapi-intel-hybrid/default.nix  |  4 +--
 .../libraries/vaapi-intel/default.nix         | 10 +++---
 .../libraries/vaapi-vdpau/default.nix         |  4 +--
 .../libraries/vapoursynth-mvtools/default.nix |  4 +--
 .../libraries/vapoursynth/default.nix         |  6 ++--
 .../libraries/vapoursynth/editor.nix          |  6 ++--
 pkgs/development/libraries/vc/0.7.nix         |  4 +--
 pkgs/development/libraries/vc/default.nix     |  4 +--
 pkgs/development/libraries/vcg/default.nix    |  4 +--
 .../libraries/vid-stab/default.nix            |  6 ++--
 pkgs/development/libraries/vigra/default.nix  |  8 ++---
 .../libraries/virglrenderer/default.nix       |  4 +--
 pkgs/development/libraries/vmime/default.nix  |  8 ++---
 pkgs/development/libraries/vmmlib/default.nix |  6 ++--
 .../libraries/vo-amrwbenc/default.nix         |  8 ++---
 .../libraries/volume-key/default.nix          |  4 +--
 pkgs/development/libraries/vrb/default.nix    |  4 +--
 pkgs/development/libraries/vrpn/default.nix   |  4 +--
 .../development/libraries/vsqlite/default.nix |  6 ++--
 pkgs/development/libraries/vte/2.90.nix       |  4 +--
 pkgs/development/libraries/vte/default.nix    |  4 +--
 .../libraries/vulkan-headers/default.nix      |  4 +--
 .../libraries/vulkan-loader/default.nix       |  4 +--
 pkgs/development/libraries/vxl/default.nix    |  8 ++---
 pkgs/development/libraries/waffle/default.nix | 10 +++---
 .../libraries/wasilibc/default.nix            |  2 +-
 .../development/libraries/wavpack/default.nix |  6 ++--
 .../libraries/waylandpp/default.nix           |  8 ++---
 pkgs/development/libraries/wcslib/default.nix |  6 ++--
 .../libraries/webkitgtk/default.nix           |  8 ++---
 .../webrtc-audio-processing/default.nix       |  8 ++---
 .../libraries/websocket++/default.nix         |  4 +--
 .../libraries/wildmidi/default.nix            |  4 +--
 .../libraries/wiredtiger/default.nix          |  6 ++--
 .../development/libraries/wlroots/default.nix |  4 +--
 .../development/libraries/wolfssl/default.nix |  6 ++--
 pkgs/development/libraries/wt/default.nix     | 10 +++---
 pkgs/development/libraries/wtk/default.nix    |  4 +--
 pkgs/development/libraries/wxSVG/default.nix  |  4 +--
 .../libraries/wxsqlite3/default.nix           |  6 ++--
 .../libraries/wxsqliteplus/default.nix        |  4 +--
 .../libraries/wxwidgets/2.8/default.nix       |  8 ++---
 .../libraries/wxwidgets/2.9/default.nix       |  8 ++---
 .../libraries/wxwidgets/3.0/default.nix       |  6 ++--
 .../libraries/wxwidgets/3.0/mac.nix           |  4 +--
 .../libraries/wxwidgets/3.1/default.nix       |  6 ++--
 pkgs/development/libraries/x264/default.nix   |  6 ++--
 pkgs/development/libraries/x265/default.nix   | 12 +++----
 pkgs/development/libraries/xalanc/default.nix |  8 ++---
 pkgs/development/libraries/xapian/default.nix |  8 ++---
 .../libraries/xapian/tools/omega/default.nix  |  4 +--
 pkgs/development/libraries/xavs/default.nix   |  6 ++--
 pkgs/development/libraries/xbase/default.nix  |  4 +--
 .../libraries/xcb-imdkit/default.nix          |  4 +--
 .../libraries/xcb-util-cursor/HEAD.nix        |  4 +--
 .../libraries/xdg-dbus-proxy/default.nix      |  4 +--
 .../xdg-desktop-portal-gtk/default.nix        |  4 +--
 .../xdg-desktop-portal-wlr/default.nix        |  4 +--
 .../libraries/xdg-desktop-portal/default.nix  |  4 +--
 pkgs/development/libraries/xed/default.nix    |  4 +--
 .../development/libraries/xercesc/default.nix |  6 ++--
 .../development/libraries/xgboost/default.nix |  2 +-
 .../libraries/xine-lib/default.nix            |  4 +--
 .../libraries/xlibs-wrapper/default.nix       |  4 +--
 pkgs/development/libraries/xlslib/default.nix |  4 +--
 .../libraries/xml-security-c/default.nix      |  8 ++---
 .../libraries/xml-tooling-c/default.nix       |  4 +--
 .../libraries/xmlrpc-c/default.nix            |  4 +--
 pkgs/development/libraries/xmlsec/default.nix |  6 ++--
 pkgs/development/libraries/xsd/default.nix    |  8 ++---
 .../libraries/xvidcore/default.nix            |  4 +--
 pkgs/development/libraries/xxHash/default.nix |  6 ++--
 pkgs/development/libraries/xylib/default.nix  |  4 +--
 pkgs/development/libraries/yajl/default.nix   |  8 ++---
 .../development/libraries/yojimbo/default.nix |  4 +--
 .../libraries/yubico-pam/default.nix          |  4 +--
 pkgs/development/libraries/zchunk/default.nix |  6 ++--
 .../libraries/zeitgeist/default.nix           |  8 ++---
 pkgs/development/libraries/zeroc-ice/3.6.nix  |  2 +-
 .../libraries/zeroc-ice/default.nix           |  2 +-
 pkgs/development/libraries/zeromq/4.x.nix     |  6 ++--
 pkgs/development/libraries/zimg/default.nix   |  4 +--
 pkgs/development/libraries/zimlib/default.nix |  4 +--
 pkgs/development/libraries/zlib/default.nix   | 32 ++++++++---------
 pkgs/development/libraries/zlog/default.nix   |  4 +--
 pkgs/development/libraries/zmqpp/default.nix  |  4 +--
 .../libraries/zookeeper_mt/default.nix        |  6 ++--
 .../libraries/zxcvbn-c/default.nix            |  4 +--
 .../development/libraries/zziplib/default.nix |  4 +--
 1770 files changed, 4913 insertions(+), 4912 deletions(-)

diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix
index ab9440c3034..c26672c1dab 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/pkgs/development/libraries/AntTweakBar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, xorg, libGLU, libGL }:
+{ lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }:
 
 stdenv.mkDerivation {
   name = "AntTweakBar-1.16";
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
       to interactively tweak parameters on-screen
     '';
     homepage = "http://anttweakbar.sourceforge.net/";
-    license = stdenv.lib.licenses.zlib;
-    maintainers = [ stdenv.lib.maintainers.razvan ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.zlib;
+    maintainers = [ lib.maintainers.razvan ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix
index ad900744f54..7028572174f 100644
--- a/pkgs/development/libraries/CGAL/4.nix
+++ b/pkgs/development/libraries/CGAL/4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
   version = "4.14.2";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Computational Geometry Algorithms Library";
     homepage = "http://cgal.org";
     license = with licenses; [ gpl3Plus lgpl3Plus];
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index ca350348986..7ff9ac43343 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , boost
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Computational Geometry Algorithms Library";
     homepage = "http://cgal.org";
     license = with licenses; [ gpl3Plus lgpl3Plus];
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix
index 7adb6e6437e..d34b465f135 100644
--- a/pkgs/development/libraries/CoinMP/default.nix
+++ b/pkgs/development/libraries/CoinMP/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "CoinMP";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://projects.coin-or.org/CoinMP/";
     description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix
index c231361acb5..61a39aa8e76 100644
--- a/pkgs/development/libraries/LAStools/default.nix
+++ b/pkgs/development/libraries/LAStools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "LAStools";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software for rapid LiDAR processing";
     homepage = http://lastools.org/;
     license = licenses.unfree;
diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/development/libraries/LASzip/LASzip2.nix
index 2eb30963128..b080153826a 100644
--- a/pkgs/development/libraries/LASzip/LASzip2.nix
+++ b/pkgs/development/libraries/LASzip/LASzip2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   version = "2.2.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
     homepage = "https://laszip.org";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix
index 0300aa37f0f..f170ea44c0e 100644
--- a/pkgs/development/libraries/LASzip/default.nix
+++ b/pkgs/development/libraries/LASzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   version = "3.4.3";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
     homepage = "https://laszip.org";
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = [ stdenv.lib.maintainers.michelk ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl2;
+    maintainers = [ lib.maintainers.michelk ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix
index 9cf5e919548..1b8ae939eca 100644
--- a/pkgs/development/libraries/NSPlist/default.nix
+++ b/pkgs/development/libraries/NSPlist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
   name = "NSPlist-713decf";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ matthewbauer ];
     description = "Parses .plist files";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix
index 3501fa8b435..f7c47805748 100644
--- a/pkgs/development/libraries/PlistCpp/default.nix
+++ b/pkgs/development/libraries/PlistCpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
 
 stdenv.mkDerivation {
   name = "PlistCpp-11615d";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost NSPlist pugixml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ matthewbauer ];
     description = "CPP bindings for Plist";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index e13c94bcb6e..252d38d1192 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , openglSupport ? libGLSupported, libGL, libGLU
 , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
 , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
@@ -11,7 +11,7 @@
 # NOTE: When editing this expression see if the same change applies to
 # SDL2 expression too
 
-with stdenv.lib;
+with lib;
 
 let
   extraPropagatedBuildInputs = [ ]
@@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform multimedia library";
     homepage    = "http://www.libsdl.org/";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 1fa021feb85..ddde76cac64 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, config, fetchurl, pkg-config
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+{ lib, stdenv, config, fetchurl, pkg-config
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , openglSupport ? libGLSupported, libGL
 , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
 , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
@@ -21,7 +21,7 @@
 # NOTE: When editing this expression see if the same change applies to
 # SDL expression too
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "SDL2";
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit openglSupport; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform multimedia library";
     homepage = "http://www.libsdl.org/";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index 1ed56c6750f..2da2189b1a8 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, SDL2 }:
+{ lib, stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_gfx";
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ SDL2 ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+    ++ lib.optional stdenv.isDarwin darwin.libobjc;
 
   configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")]
-     ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+     ++ lib.optional stdenv.isDarwin "--disable-sdltest";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL graphics drawing primitives and support functions";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index 00de774ba6e..96f85ddb0ea 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }:
+{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_image";
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ]
-    ++ stdenv.lib.optional stdenv.isDarwin Foundation;
+    ++ lib.optional stdenv.isDarwin Foundation;
 
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL image library";
     homepage = "http://www.libsdl.org/projects/SDL_image/";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index af0da7dc627..7e1d097ba5c 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , AudioToolbox
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isDarwin [
     AudioToolbox
     AudioUnit
     CoreServices
@@ -51,12 +51,12 @@ stdenv.mkDerivation rec {
     "--disable-music-mp3-mpg123-shared"
     "--disable-music-opus-shared"
     "--disable-music-midi-fluidsynth-shared"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "--disable-sdltest"
     "--disable-smpegtest"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL multi-channel audio mixer library";
     platforms = platforms.unix;
     homepage = "https://www.libsdl.org/projects/SDL_mixer/";
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index 0bec12cdb24..fe6cb9445a3 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, SDL2 }:
+{ lib, stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_net";
@@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
   };
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+  buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
   propagatedBuildInputs = [ SDL2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL multiplatform networking library";
     homepage = "https://www.libsdl.org/projects/SDL_net";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix
index 571c953a81b..e23b3fb9215 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
+{ lib, stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_ttf";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59";
   };
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
   buildInputs = [ SDL2 freetype libGL ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+    ++ lib.optional stdenv.isDarwin darwin.libobjc;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL TrueType library";
     platforms = platforms.unix;
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix
index f5191a116c9..83afeaf2d67 100644
--- a/pkgs/development/libraries/SDL_Pango/default.nix
+++ b/pkgs/development/libraries/SDL_Pango/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }:
+{ lib, stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_Pango";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ SDL pango ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Connects the Pango rendering engine to SDL";
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 606820120dc..f5a3d863553 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL }:
+{ lib, stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_gfx";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ SDL ] ;
 
   configureFlags = [ "--disable-mmx" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+    ++ lib.optional stdenv.isDarwin "--disable-sdltest";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL graphics drawing primitives and support functions";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix
index f15009c2f5d..dc52e6afeea 100644
--- a/pkgs/development/libraries/SDL_gpu/default.nix
+++ b/pkgs/development/libraries/SDL_gpu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }:
+{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU }:
 
 stdenv.mkDerivation {
   pname = "SDL_gpu-unstable";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for high-performance, modern 2D graphics with SDL written in C";
     homepage = "https://github.com/grimfang4/sdl-gpu";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 968fc3d38af..2e5841b3f48 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
+{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_image";
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
     "--disable-jpg-shared"
     "--disable-png-shared"
     "--disable-tif-shared"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  ] ++ lib.optional stdenv.isDarwin "--disable-sdltest";
 
   buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL image library";
     homepage    = "http://www.libsdl.org/projects/SDL_image/";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index e52273052b5..7f5e38f39b8 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"
     ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL multi-channel audio mixer library";
     homepage    = "http://www.libsdl.org/projects/SDL_mixer/";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index a24020da015..f55332a0ee0 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL }:
+{ lib, stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_net";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
   };
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
   propagatedBuildInputs = [ SDL ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL networking library";
     platforms = platforms.unix;
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix
index a1e4dda6878..1bc4c8ba35c 100644
--- a/pkgs/development/libraries/SDL_sixel/default.nix
+++ b/pkgs/development/libraries/SDL_sixel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, libsixel }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel }:
 
 stdenv.mkDerivation {
   pname = "SDL_sixel";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsixel ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform multimedia library, that supports sixel graphics on consoles";
     homepage    = "https://github.com/saitoha/SDL1.2-SIXEL";
     maintainers = with maintainers; [ vrthra ];
diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix
index 1f068c9e976..e6318b84859 100644
--- a/pkgs/development/libraries/SDL_stretch/default.nix
+++ b/pkgs/development/libraries/SDL_stretch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL }:
+{ lib, stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_stretch";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
      description = "Stretch Functions For SDL";
      homepage = "http://sdl-stretch.sourceforge.net/";
      license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index cd6355c9ce2..5d353e3a6c0 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, SDL, freetype }:
+{ lib, stdenv, fetchurl, fetchpatch, SDL, freetype }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_ttf";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL freetype ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SDL TrueType library";
     license = licenses.zlib;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index 10d954397ff..88501ca1ee6 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , imake, gccmakedep, bison, flex, pkg-config
 , xlibsWrapper, libXmu, libXpm, libXp }:
 
@@ -13,9 +13,9 @@ stdenv.mkDerivation {
   buildInputs = [ libXpm libXp ];
   propagatedBuildInputs = [ xlibsWrapper libXmu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "3D widget set based on the Athena Widget set";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 7cbb3699401..faa819ec561 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "a52dec";
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
 
   # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686
   # which can also be fixed with
-  # hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
+  # hardeningDisable = lib.optional stdenv.isi686 "pic";
   # but it's better to disable tests than loose ASLR on i686
   doCheck = !stdenv.isi686;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ATSC A/52 stream decoder";
     homepage = "https://liba52.sourceforge.net/";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index 94453264419..b007e71ce44 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, automake}:
+{lib, stdenv, fetchurl, ncurses, automake}:
 
 stdenv.mkDerivation {
   name = "aalib-1.4rc5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   outputs = [ "bin" "dev" "out" "man" "info" ];
   setOutputFlags = false; # Doesn't support all the flags
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
 
   # The fuloong2f is not supported by aalib still
   preConfigure = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "ASCII art graphics library";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.lgpl2;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix
index 45e73410d28..95d1b873edd 100644
--- a/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/pkgs/development/libraries/abseil-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "abseil-cpp";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open-source collection of C++ code designed to augment the C++ standard library";
     homepage = "https://abseil.io/";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 362605d1050..f87a0bbe68b 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , substituteAll
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus interface for user account query and manipulation";
     homepage = "https://www.freedesktop.org/wiki/Software/AccountsService";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 0fe777b7b2b..85df0b43353 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libtool, perl }:
+{ lib, stdenv, fetchurl, pkg-config, libtool, perl }:
 
 stdenv.mkDerivation rec {
   pname = "ace";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     > include/makeinclude/platform_macros.GNU
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ADAPTIVE Communication Environment";
     homepage = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html";
     license = licenses.doc;
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index 6e863e4eeba..2161ad9e59c 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, attr }:
+{ lib, stdenv, fetchurl, gettext, attr }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://savannah.nongnu.org/projects/acl";
     description = "Library and tools for manipulating access control lists";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index 030ff73f97f..b89683ac053 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl
+{ lib, stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl
 , autoreconfHook, python3
 }:
 
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ zlib curl expat openssl python3 ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ fuse ];
+    ++ lib.optionals stdenv.isLinux [ fuse ];
 
   meta = {
     homepage = "http://afflib.sourceforge.net/";
     description = "Advanced forensic format library";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.bsdOriginal;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsdOriginal;
+    maintainers = [ lib.maintainers.raskin ];
     inherit version;
     downloadPage = "https://github.com/sshock/AFFLIBv3/tags";
   };
diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix
index d50cbe26e56..1ae5ffb17ad 100644
--- a/pkgs/development/libraries/aften/default.nix
+++ b/pkgs/development/libraries/aften/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "aften";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
     homepage = "http://aften.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
index f13cc698236..79bb783cc9f 100644
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub }:
 
 mkDerivation rec {
   version = "compat-2.6.1";
@@ -18,11 +18,11 @@ mkDerivation rec {
     cd ..
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/UlfNorell/agda-prelude";
     description = "Programming library for Agda";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
     maintainers = with maintainers; [ mudri alexarice turion ];
   };
 }
diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
index dbcdaac532e..7ec892bfe02 100644
--- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
     sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ryanorendorff/functional-linear-algebra";
     description = ''
       Formalizing linear algebra in Agda by representing matrices as functions
diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
index 55cd6a742e5..2ebb3f66ed0 100644
--- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub }:
 
 mkDerivation (rec {
   version = "1.5.0";
@@ -22,10 +22,10 @@ mkDerivation (rec {
   meta = {
     homepage = "https://github.com/cedille/ial";
     description = "Agda standard library developed at Iowa";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
     # broken since Agda 2.6.1
     broken = true;
-    maintainers = with stdenv.lib.maintainers; [ alexarice turion ];
+    maintainers = with lib.maintainers; [ alexarice turion ];
   };
 })
diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix
index e43e1bad3b6..1d8dc03bbde 100644
--- a/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/pkgs/development/libraries/agda/standard-library/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }:
 
 mkDerivation rec {
   pname = "standard-library";
@@ -16,11 +16,11 @@ mkDerivation rec {
     runhaskell GenerateEverything.hs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
     description = "A standard library for use with the Agda compiler";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
     maintainers = with maintainers; [ jwiegley mudri alexarice turion ];
   };
 }
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index 2b083a47a20..89585d908da 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config
 , freetype, SDL, libX11 }:
 
 stdenv.mkDerivation rec {
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
       of course, AGG can do much more than that.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     homepage = "http://www.antigrain.com/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index db22f463df0..cdcf4b7b8a4 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }:
 
 stdenv.mkDerivation rec
 {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec
     mv $out/include $dev/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open framework for storing and sharing scene data";
     homepage = "http://alembic.io/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 20175486b16..ca1446dd935 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
+{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
 , libXxf86dga, libXxf86misc
 , libXxf86vm, openal, libGLU, libGL, libjpeg, flac
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A game programming library";
     homepage = "https://liballeg.org/";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 99d75225036..9fefbe01ace 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11
+{ lib, stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
 , libXxf86dga, libXxf86misc
 , libXxf86vm, openal, libGLU, libGL }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A game programming library";
     homepage = "https://liballeg.org/";
     license = licenses.free; # giftware
diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix
index 1f4dafeb362..9ff83dcec40 100644
--- a/pkgs/development/libraries/alure/default.nix
+++ b/pkgs/development/libraries/alure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openal }:
+{ lib, stdenv, fetchurl, cmake, openal }:
 
 stdenv.mkDerivation rec {
   pname = "alure";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openal ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A utility library to help manage common tasks with OpenAL applications";
     homepage = "https://kcat.strangesoft.net/alure.html";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix
index 6da95a77264..fa42c4fd53a 100644
--- a/pkgs/development/libraries/alure2/default.nix
+++ b/pkgs/development/libraries/alure2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }:
+{ lib, stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }:
 
 stdenv.mkDerivation rec {
   pname = "alure2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openal libvorbis opusfile libsndfile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming";
     homepage = "https://github.com/kcat/alure";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index b4731b608dc..fb48ef73905 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
   cmakeDir = "../drivers/xgl";
 
   # LTO is disabled in gcc for i686 as of #66528
-  cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"];
+  cmakeFlags = lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"];
 
   installPhase = ''
     install -Dm755 -t $out/lib icd/amdvlk${suffix}.so
@@ -83,7 +83,7 @@ in stdenv.mkDerivation rec {
   # Keep the rpath, otherwise vulkaninfo and vkcube segfault
   dontPatchELF = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AMD Open Source Driver For Vulkan";
     homepage = "https://github.com/GPUOpen-Drivers/AMDVLK";
     changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}";
diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix
index 8b4eccb9fff..899dafde76f 100644
--- a/pkgs/development/libraries/aml/default.nix
+++ b/pkgs/development/libraries/aml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, pkg-config, ninja }:
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "aml";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson pkg-config ninja ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Another main loop";
     inherit (src.meta) homepage;
     license = licenses.isc;
diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix
index 4e8aab263eb..b226c9e36d2 100644
--- a/pkgs/development/libraries/amrnb/default.nix
+++ b/pkgs/development/libraries/amrnb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
   name = "amrnb-11.0.0.0";
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     # The wrapper code is free, but not the libraries from 3gpp.
     # It's a source code reference implementation with patents and licenses on
     # some countries, not redistributable.
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix
index e6581d54911..776065b28bc 100644
--- a/pkgs/development/libraries/amrwb/default.nix
+++ b/pkgs/development/libraries/amrwb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "amrwb";
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     # The wrapper code is free, but not the libraries from 3gpp.
     # It's a source code reference implementation with patents and licenses on
     # some countries, not redistributable.
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
index 300069e60ae..f144f847bcf 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , gtk3
 , pkg-config
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "5.2.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2";
   };
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gnome3.updateScript { packageName = pname; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Amtk";
     description = "Actions, Menus and Toolbars Kit for GTK applications";
     maintainers = [ maintainers.manveru ];
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index 8490541546b..976387d49eb 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "apache-activemq";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://activemq.apache.org/";
     description = "Messaging and Integration Patterns server written in Java";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 
 }
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index a5b4c0cad48..1cd9fb2c8b7 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , substituteAll
 , docbook_xml_dtd_42
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
-    rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name;
+    rev = lib.replaceStrings [ "." "-" ] [ "_" "_" ] name;
     sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx";
   };
 
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     moveToOutput "share/installed-tests" "$installedTests"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Objects and helper methods to read and write AppStream metadata";
     homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 3764d1e7f86..1e3c2bcd2eb 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext
 , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
 , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
 , pcre, itstool, gperf, vala, lmdb, libsoup
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     "-Dvapi=true"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software metadata handling library";
     homepage    = "https://www.freedesktop.org/wiki/Distributions/AppStream/";
     longDescription = ''
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index ba12e2d0385..51e9271b7d7 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, apr, expat, gnused
+{ lib, stdenv, fetchurl, makeWrapper, apr, expat, gnused
 , sslSupport ? true, openssl
 , bdbSupport ? true, db
 , ldapSupport ? !stdenv.isCygwin, openldap
@@ -10,7 +10,7 @@ assert sslSupport -> openssl != null;
 assert bdbSupport -> db != null;
 assert ldapSupport -> openldap != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   name = "apr-util-1.6.1";
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     inherit sslSupport bdbSupport ldapSupport;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://apr.apache.org/";
     description = "A companion library to APR, the Apache Portable Runtime";
     maintainers = [ maintainers.eelco ];
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index ce33c0534fa..c7a1073d137 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "apr-1.7.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
 
   # This test needs the net
   postPatch = ''
@@ -23,22 +23,22 @@ stdenv.mkDerivation rec {
       configureFlagsArray+=("--with-installbuilddir=$dev/share/build")
     '';
 
-  configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_file__dev_zero=yes"
     "ac_cv_func_setpgrp_void=0"
     "apr_cv_process_shared_works=1"
     "apr_cv_tcp_nodelay_with_cork=1"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
+  ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
     # Including the Windows headers breaks unistd.h.
     # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
     "ac_cv_header_windows_h=no"
   ];
 
-  CPPFLAGS=stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
+  CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://apr.apache.org/";
     description = "The Apache Portable Runtime library";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index ab5ff960e98..1e11661b009 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt
+{ lib, stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt
 , pkg-config, gettext, xmlsec, zlib
 }:
 
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config gettext ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interface to banking tasks, file formats and country information";
     homepage = "https://www.aquamaniac.de/";
     hydraPlatforms = [];
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 660f3bf377e..d240e7e3a9d 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext
+{ lib, stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext
 , which
 
 # GUI support
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
     isRelative = path: builtins.substring 0 1 path != "/";
     mkSearchPath = path: ''
       p; g; s,\<PLUGINDIR\>,"${path}",g;
-    '' + stdenv.lib.optionalString (isRelative path) ''
+    '' + lib.optionalString (isRelative path) ''
       s/AddPath(\(.*\));/AddRelPath(\1, GWEN_PathManager_RelModeHome);/g
     '';
 
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     sed -i -e '/GWEN_PathManager_DefinePath.*GWEN_PM_PLUGINDIR/,/^#endif/ {
       /^#if/,/^#endif/ {
         H; /^#endif/ {
-          ${stdenv.lib.concatMapStrings mkSearchPath pluginSearchPaths}
+          ${lib.concatMapStrings mkSearchPath pluginSearchPaths}
         }
       }
     }' src/gwenhywfar.c
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OS abstraction functions used by aqbanking and related tools";
     homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index c4cf069b04c..f483f232e37 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }:
+{ lib, stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }:
 
 let
   inherit ((import ./sources.nix).libchipcard) sha256 releaseId version;
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gwen-dir=${gwenhywfar}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for access to chipcards";
     homepage = "https://www.aquamaniac.de/rdm/projects/libchipcard";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
index 89c8d91f26a..62a5c54e676 100644
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool
 , audit, glib, libusb1, libxml2
 , wrapGAppsHook
 , gstreamer ? null
@@ -19,11 +19,11 @@
 
 let
   gstreamerAtLeastVersion1 =
-    stdenv.lib.all
-      (pkg: pkg != null && stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0")
+    lib.all
+      (pkg: pkg != null && lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0")
       [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
 in
-  assert enableGstPlugin -> stdenv.lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
+  assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
   assert enableViewer -> enableGstPlugin;
   assert enableViewer -> libnotify != null;
   assert enableViewer -> gnome3 != null;
@@ -49,26 +49,26 @@ in
       pkg-config
       intltool
       gtk-doc
-    ] ++ stdenv.lib.optional enableViewer wrapGAppsHook;
+    ] ++ lib.optional enableViewer wrapGAppsHook;
 
     buildInputs =
       [ glib libxml2 ]
-      ++ stdenv.lib.optional enableUsb libusb1
-      ++ stdenv.lib.optional enablePacketSocket audit
-      ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
-      ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
+      ++ lib.optional enableUsb libusb1
+      ++ lib.optional enablePacketSocket audit
+      ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
+      ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
 
     preAutoreconf = ''./autogen.sh'';
 
     configureFlags =
-      stdenv.lib.optional enableUsb "--enable-usb"
-        ++ stdenv.lib.optional enablePacketSocket "--enable-packet-socket"
-        ++ stdenv.lib.optional enableViewer "--enable-viewer"
-        ++ stdenv.lib.optional enableGstPlugin
+      lib.optional enableUsb "--enable-usb"
+        ++ lib.optional enablePacketSocket "--enable-packet-socket"
+        ++ lib.optional enableViewer "--enable-viewer"
+        ++ lib.optional enableGstPlugin
         (if gstreamerAtLeastVersion1 then "--enable-gst-plugin" else "--enable-gst-0.10-plugin")
-        ++ stdenv.lib.optional enableCppTest "--enable-cpp-test"
-        ++ stdenv.lib.optional enableFastHeartbeat "--enable-fast-heartbeat"
-        ++ stdenv.lib.optional enableAsan "--enable-asan";
+        ++ lib.optional enableCppTest "--enable-cpp-test"
+        ++ lib.optional enableFastHeartbeat "--enable-fast-heartbeat"
+        ++ lib.optional enableAsan "--enable-asan";
 
     postPatch = ''
         ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
@@ -82,9 +82,9 @@ in
         Implements the gigabit ethernet and USB3 protocols used by industrial cameras.
       '';
       homepage = "https://aravisproject.github.io/docs/aravis-0.5";
-      license = stdenv.lib.licenses.lgpl2;
+      license = lib.licenses.lgpl2;
       maintainers = [];
-      platforms = stdenv.lib.platforms.unix;
+      platforms = lib.platforms.unix;
     };
   }
 
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index b17ef73a5cf..1c356b59d8a 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
+{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
 stdenv.mkDerivation rec {
   pname = "arb";
   version = "2.17.0";
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
     "--with-flint=${flint}"
   ];
   doCheck = true;
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for arbitrary-precision interval arithmetic";
     homepage = "https://arblib.org/";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     maintainers = teams.sage.members;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix
index f961c577aa7..33b253718a7 100644
--- a/pkgs/development/libraries/argp-standalone/default.nix
+++ b/pkgs/development/libraries/argp-standalone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 let
   patch-argp-fmtstream = fetchpatch {
@@ -28,12 +28,12 @@ stdenv.mkDerivation {
   };
 
   patches =
-       stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ]
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ];
+       lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ];
 
-  patchFlags = stdenv.lib.optional stdenv.hostPlatform.isDarwin "-p0";
+  patchFlags = lib.optional stdenv.hostPlatform.isDarwin "-p0";
 
-  preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'";
+  preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'";
 
   postInstall = ''
     mkdir -p $out/lib $out/include
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.lysator.liu.se/~nisse/misc/";
     description = "Standalone version of arguments parsing functions from GLIBC";
     platforms = with platforms; darwin ++ linux;
diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix
index bf953d87fe2..a16885ab254 100644
--- a/pkgs/development/libraries/argtable/default.nix
+++ b/pkgs/development/libraries/argtable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     patchShebangs tools/build
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://argtable.org";
     description = "A single-file, ANSI C command-line parsing library";
     longDescription = ''
diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix
index cb0c65e97e3..85dafde83c2 100644
--- a/pkgs/development/libraries/arguments/default.nix
+++ b/pkgs/development/libraries/arguments/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "arguments";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/${owner}/${pname}";
     description = "Library for argument handling for MINC programs";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix
index 949fd401f5d..3e171d75797 100644
--- a/pkgs/development/libraries/aribb25/default.nix
+++ b/pkgs/development/libraries/aribb25/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   buildFlags =
     lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.videolan.org/videolan/aribb25";
     description = "Sample implementation of the ARIB STD-B25 standard";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 12f6316537b..6696e5720e3 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }:
+{ lib, stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./use-unix-config-on-OS-X.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ linear algebra library";
     homepage = "http://arma.sourceforge.net";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix
index c9a09ac115c..c636d672332 100644
--- a/pkgs/development/libraries/arrayfire/default.nix
+++ b/pkgs/development/libraries/arrayfire/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
+{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
 , opencl-clhpp, ocl-icd, fftw, fftwFloat
 , blas, lapack, boost, mesa, libGLU, libGL
 , freeimage, python, clfft, clblas
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "-DAF_BUILD_OPENCL=OFF"
     "-DAF_BUILD_EXAMPLES=OFF"
     "-DBUILD_TESTING=OFF"
-  ] ++ stdenv.lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs";
+  ] ++ lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs";
 
   patches = [ ./no-download.patch ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp
   '';
 
-  preBuild = stdenv.lib.optionalString cudaSupport ''
+  preBuild = lib.optionalString cudaSupport ''
     export CUDA_PATH="${cudatoolkit}"
   '';
 
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
     libGLU libGL
     mesa freeimage
     boost.out boost.dev
-  ] ++ (stdenv.lib.optional stdenv.isLinux ocl-icd)
-    ++ (stdenv.lib.optional cudaSupport cudatoolkit)
-    ++ (stdenv.lib.optional buildDocs doxygen);
+  ] ++ (lib.optional stdenv.isLinux ocl-icd)
+    ++ (lib.optional cudaSupport cudatoolkit)
+    ++ (lib.optional buildDocs doxygen);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A general-purpose library for parallel and massively-parallel computations";
     longDescription = ''
       A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.";
diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
index d83a48e61b8..8bcc12ae2b3 100644
--- a/pkgs/development/libraries/asio/generic.nix
+++ b/pkgs/development/libraries/asio/generic.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, boost, openssl
+{lib, stdenv, fetchurl, boost, openssl
 , version, sha256, ...
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   pname = "asio";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     homepage = "http://asio.sourceforge.net/";
     description = "Cross-platform C++ library for network and low-level I/O programming";
     license = licenses.boost;
-    broken = stdenv.isDarwin && stdenv.lib.versionOlder version "1.16.1";
+    broken = stdenv.isDarwin && lib.versionOlder version "1.16.1";
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 68faef7e786..01acced98f6 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, fetchzip, perl
+{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl
 , searchNixProfiles ? true
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr";
   };
 
-  patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
+  patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
 
   postPatch = ''
     patch interfaces/cc/aspell.h < ${./clang.patch}
@@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Spell checker for many languages";
     homepage = "http://aspell.net/";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     maintainers = [ ];
-    platforms = with stdenv.lib.platforms; all;
+    platforms = with lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index d40f4b5aae4..3923416c4a3 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -49,7 +49,7 @@ let
 
       meta = {
         description = "Aspell dictionary for ${fullName}";
-        platforms = stdenv.lib.platforms.all;
+        platforms = lib.platforms.all;
       } // (args.meta or {});
     } // removeAttrs args [ "meta" ]);
 
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 9c5b75999f1..a2cd3a2a457 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "assimp";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to import various 3D model formats";
     homepage = "http://assimp.sourceforge.net/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index c638c4b2a40..1e5a1d3fd64 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 
 , meson
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   version = "2.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8=";
   };
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
     homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 2d3e96639c7..7e1181cf3bd 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 
 , meson
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   version = "2.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU=";
   };
 
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Cannot use wrapGAppsHook'due to a dependency cycle
     wrapProgram $out/libexec/at-spi-bus-launcher \
-      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
     homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index e962eac0092..4cb2d6b2aec 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
+{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
 , fixDarwinDylibNames, gobject-introspection, gnome3
 }:
 
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv";
   };
 
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [
     # Required by atk.pc
@@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
 
     homepage = "http://library.gnome.org/devel/atk/";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 
 }
diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix
index 1e6f047b6aa..e9c63eb650f 100644
--- a/pkgs/development/libraries/atkmm/default.nix
+++ b/pkgs/development/libraries/atkmm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }:
+{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "atkmm";
   version = "2.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c";
   };
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ wrappers for ATK accessibility toolkit";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     homepage = "https://gtkmm.org";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index d69d475f737..b7c9287b68b 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext }:
+{ lib, stdenv, fetchurl, gettext }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://savannah.nongnu.org/projects/attr/";
     description = "Library and tools for manipulating extended attributes";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 0760a1438c0..7aa4859ef0e 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
+{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
 , libsndfile, pkg-config, python, wafHook
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config python wafHook ];
   buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for audio labelling";
     homepage = "https://aubio.org/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix
index a311c5f5479..e0ab0accdfd 100644
--- a/pkgs/development/libraries/audiality2/default.nix
+++ b/pkgs/development/libraries/audiality2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     jack2
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A realtime scripted modular audio engine for video games and musical applications";
     homepage = "http://audiality.org";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 593854bb280..2e10dbd8815 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, unzip, fetchurl }:
+{ lib, stdenv, unzip, fetchurl }:
 
 # Upstream changes files in-place, to update:
 # 1. Check latest version at http://www.un4seen.com/
@@ -55,7 +55,7 @@ let
         install -m644 -t $out/include/ ${bass.h}
       '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Shareware audio library";
       homepage = "https://www.un4seen.com/";
       license = licenses.unfreeRedistributable;
@@ -63,4 +63,4 @@ let
     };
   };
 
-in stdenv.lib.mapAttrs dropBass allBass
+in lib.mapAttrs dropBass allBass
diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix
index 24f4c77e350..11135b14fd4 100644
--- a/pkgs/development/libraries/audio/libbs2b/default.nix
+++ b/pkgs/development/libraries/audio/libbs2b/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libsndfile }:
+{ lib, stdenv, fetchurl, pkg-config, libsndfile }:
 
 stdenv.mkDerivation rec {
   pname = "libbs2b";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://bs2b.sourceforge.net/";
     description = "Bauer stereophonic-to-binaural DSP library";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix
index d70b6cfbde8..927bd00656e 100644
--- a/pkgs/development/libraries/audio/libgme/default.nix
+++ b/pkgs/development/libraries/audio/libgme/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
+{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
 let
   version = "0.6.3";
 in stdenv.mkDerivation {
   pname = "libgme";
   inherit version;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of video game music chip emulators";
     homepage = "https://bitbucket.org/mpyne/game-music-emu/overview";
     license = licenses.lgpl21;
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
   # it doesn't.
   disallowedReferences = [ stdenv.cc.cc ];
 
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)"
   '';
 }
diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix
index 3968794d2dc..29781446c8f 100644
--- a/pkgs/development/libraries/audio/libinstpatch/default.nix
+++ b/pkgs/development/libraries/audio/libinstpatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }:
 
 stdenv.mkDerivation rec {
   pname = "libinstpatch";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "-DLIB_SUFFIX=" # Install in $out/lib.
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.swamiproject.org/";
     description = "MIDI instrument patch files support library";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index c2b2725c19c..9c636e0205d 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libmysofa";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCODE_COVERAGE=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reader for AES SOFA files to get better HRTFs";
     homepage = "https://github.com/hoene/libmysofa";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix
index a3d76e55e36..0c173a6a99e 100644
--- a/pkgs/development/libraries/audio/libsmf/default.nix
+++ b/pkgs/development/libraries/audio/libsmf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, glib, pkg-config }:
+{ lib, stdenv, fetchurl, autoreconfHook, glib, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for reading and writing Standard MIDI Files";
     homepage = "https://github.com/stump/libsmf";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 1e126654bba..79f09f48464 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }:
+{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "lilv";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ serd sord sratom ];
   propagatedBuildInputs = [ lv2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/lilv";
     description = "A C library to make the use of LV2 plugins";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index 3005a4398f9..45caf0b36c5 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }:
+{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "lv2";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config wafHook ];
   buildInputs = [ gtk2 libsndfile python3 ];
 
-  wafConfigureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
+  wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lv2plug.in";
     description = "A plugin standard for audio systems";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index e497816bf1c..cecae743da0 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }:
+{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "lvtk";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--boost-libs=${boost.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set C++ wrappers around the LV2 C API";
     homepage = "https://lvtk.org/";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix
index 993bbcd09c1..f13f6d7063c 100644
--- a/pkgs/development/libraries/audio/mbelib/default.nix
+++ b/pkgs/development/libraries/audio/mbelib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "mbelib";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "P25 Phase 1 and ProVoice vocoder";
     homepage = https://github.com/szechyjs/mbelib;
     license = licenses.isc;
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index e2f20d46a3d..ecb0215a228 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }:
+{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "ntk";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     description = "Fork of FLTK 1.3.0 with additional functionality";
     version = version;
     homepage = "http://non.tuxfamily.org/";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ magnetophon nico202 ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix
index a93b031a4d1..3d8e15f97cd 100644
--- a/pkgs/development/libraries/audio/qm-dsp/default.nix
+++ b/pkgs/development/libraries/audio/qm-dsp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , kissfft
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ library of functions for DSP and Music Informatics purposes";
     homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 1516b6df879..a0089e31044 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }:
+{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "raul";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config wafHook ];
   buildInputs = [ boost gtk2 python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ utility library primarily aimed at audio/musical applications";
     homepage = "http://drobilla.net/software/raul";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 53efa598079..820ea1e49b9 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2,  alsaLib, pulseaudio, rtmidi }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2,  alsaLib, pulseaudio, rtmidi }:
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ./configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of C++ classes that provide a cross platform API for realtime audio input/output";
     homepage =  "http://www.music.mcgill.ca/~gary/rtaudio/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index 33a400c2f3d..f6208bab6c6 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "4.0.0";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output";
     homepage =  "http://www.music.mcgill.ca/~gary/rtmidi/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index 392c05c02a7..464e79f6c2d 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }:
+{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "sratom";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config wafHook python3 ];
   buildInputs = [ lv2 serd sord ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/sratom";
     description = "A library for serialising LV2 atoms to/from RDF";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 43e5bc8f9cc..0f4dd0f62c4 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ++ (lib.optionals withQt4 [ qt4 ])
     ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/suil";
     description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
index 9c0a138b309..4d033d99d29 100644
--- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
+++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
@@ -1,7 +1,7 @@
 # set VAMP_PATH ?
 # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
 
-{ stdenv, fetchFromGitHub, pkg-config, libsndfile }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, libsndfile }:
 
 stdenv.mkDerivation rec {
   pname = "vamp-plugin-sdk";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
     homepage = "https://vamp-plugins.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index c819f355e0b..45f5fcfe3a4 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl , alsaLib, }:
+{ lib, stdenv, fetchurl , alsaLib, }:
 
 stdenv.mkDerivation rec {
   pname = "zita-alsa-pcmi";
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
     description = "The successor of clalsadrv, provides easy access to ALSA PCM devices";
     version = version;
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
index 2b7d89b30a1..3b77bf549ca 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fftwFloat }:
+{ lib, stdenv, fetchurl, fftwFloat }:
 
 stdenv.mkDerivation rec {
   pname = "zita-convolver";
@@ -22,15 +22,15 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     # create lib link for building apps
-    ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${stdenv.lib.versions.major version}
+    ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${lib.versions.major version}
   '';
 
   meta = {
     description = "Convolution library by Fons Adriaensen";
     version = version;
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index 2881e566218..88e81d733b3 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "zita-resampler";
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     description = "Resample library by Fons Adriaensen";
     version = version;
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 86531a6ad25..88b1840955d 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   name = "audiofile-0.3.6";
 
   buildInputs =
-    stdenv.lib.optionals stdenv.isLinux [
+    lib.optionals stdenv.isLinux [
       alsaLib
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    ] ++ lib.optionals stdenv.isDarwin [
       CoreServices AudioUnit
     ];
 
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing audio files in various formats";
     homepage    = "http://www.68k.org/~michael/audiofile/";
     license     = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index ca832816eab..dd54ba79db7 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, pkg-config, libdaemon, dbus, perlPackages
+{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages
 , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent
 , gtk3Support ? false, gtk3 ? null
 , qt4 ? null
@@ -17,7 +17,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
+  name = "avahi${lib.optionalString withLibdnssdCompat "-compat"}-${version}";
   version = "0.8";
 
   src = fetchurl {
@@ -36,32 +36,32 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libdaemon dbus glib expat libiconv libevent ]
     ++ (with perlPackages; [ perl XMLParser ])
-    ++ (stdenv.lib.optional gtk3Support gtk3)
-    ++ (stdenv.lib.optional qt4Support qt4)
-    ++ (stdenv.lib.optional qt5Support qt5);
+    ++ (lib.optional gtk3Support gtk3)
+    ++ (lib.optional qt4Support qt4)
+    ++ (lib.optional qt5Support qt5);
 
   propagatedBuildInputs =
-    stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
+    lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
 
   nativeBuildInputs = [ pkg-config pkg-config-helper gettext intltool glib ];
 
   configureFlags =
     [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
       "--disable-gtk" "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
-      (stdenv.lib.enableFeature gtk3Support "gtk3")
+      (lib.enableFeature gtk3Support "gtk3")
       "--${if qt4Support then "enable" else "disable"}-qt4"
       "--${if qt5Support then "enable" else "disable"}-qt5"
-      (stdenv.lib.enableFeature withPython "python")
+      (lib.enableFeature withPython "python")
       "--localstatedir=/var" "--with-distro=none"
       # A systemd unit is provided by the avahi-daemon NixOS module
       "--with-systemdsystemunitdir=no" ]
-    ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
+    ++ lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
     # autoipd won't build on darwin
-    ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd";
+    ++ lib.optional stdenv.isDarwin "--disable-autoipd";
 
   NIX_CFLAGS_COMPILE = "-DAVAHI_SERVICE_DIR=\"/etc/avahi/services\"";
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+  preBuild = lib.optionalString stdenv.isDarwin ''
     sed -i '20 i\
     #define __APPLE_USE_RFC_2292' \
     avahi-core/socket.c
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     # Maintain compat for mdnsresponder and howl
-    stdenv.lib.optionalString withLibdnssdCompat ''
+    lib.optionalString withLibdnssdCompat ''
       ln -s avahi-compat-libdns_sd/dns_sd.h "$out/include/dns_sd.h"
     '';
   /*  # these don't exist (anymore?)
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc
   */
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "mDNS/DNS-SD implementation";
     homepage    = "http://avahi.org";
     license     = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix
index 9ac609f1679..15e2516c1b6 100644
--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/pkgs/development/libraries/avro-c++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost, python2}:
+{ lib, stdenv, fetchurl, cmake, boost, python2}:
 
 let version = "1.8.2"; in
 
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A C++ library which implements parts of the Avro Specification";
     homepage = "https://avro.apache.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ rasendubi ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ rasendubi ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index b0dfd52ab16..a5acd7c7898 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
+{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
 
 let
   version = "1.9.1";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [ jansson zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library which implements parts of the Avro Specification";
     homepage = "https://avro.apache.org/";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix
index 127fe1c9750..60417426f76 100644
--- a/pkgs/development/libraries/ayatana-ido/default.nix
+++ b/pkgs/development/libraries/ayatana-ido/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , pkg-config, autoreconfHook
 , gtk3, gobject-introspection, gtk-doc, vala
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ayatana Display Indicator Objects";
     homepage = "https://github.com/AyatanaIndicators/ayatana-ido";
     changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog";
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index ef24f0dadb7..6e3a5abaaa6 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo=";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     lcms2
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Image pixel format conversion library";
     homepage = "https://gegl.org/babl/";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index e7d8daf4d28..95d54993e06 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , pantheon
 , autoconf
 , automake
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   # glib-2.62 deprecations
   NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Application matching framework";
     longDescription = ''
       Removes the headache of applications matching
diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix
index f178c192de5..125512c3fed 100644
--- a/pkgs/development/libraries/bcg729/default.nix
+++ b/pkgs/development/libraries/bcg729/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , cmake
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec";
     homepage = "https://linphone.org/technical-corner/bcg729";
     changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS";
diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix
index 655d3a5808a..dd72b7eb41d 100644
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@@ -2,7 +2,7 @@
 , cmake
 , fetchFromGitLab
 , mbedtls
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Utilities library for Linphone";
     homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix
index 2433edbfe8f..6b86fca868f 100644
--- a/pkgs/development/libraries/beecrypt/default.nix
+++ b/pkgs/development/libraries/beecrypt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, m4}:
+{lib, stdenv, fetchurl, m4}:
 
 stdenv.mkDerivation {
   name = "beecrypt-4.2.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--disable-optimized" "--enable-static" ];
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl2;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 29618623bbf..8e8e455e59a 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://cgit.freedesktop.org/beignet/";
     description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
     longDescription = ''
diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix
index df4e5329018..03f6e96e187 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@@ -2,7 +2,7 @@
 , belr
 , cmake
 , fetchFromGitLab
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   # Do not build static libraries
   cmakeFlags = [ "-DENABLE_STATIC=NO" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library to manipulate VCard standard format";
     homepage = "https://gitlab.linphone.org/BC/public/belcard";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 8a028b5e0a0..e08fc1ae3ee 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitLab
 , libantlr3c
 , mbedtls
-, stdenv
+, lib, stdenv
 , zlib
 }:
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://linphone.org/technical-corner/belle-sip";
     description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix
index ab3df9bae7e..b38757525ab 100644
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@@ -1,7 +1,7 @@
 { bctoolbox
 , cmake
 , fetchFromGitLab
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   # Do not build static libraries
   cmakeFlags = [ "-DENABLE_STATIC=NO" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Belledonne Communications' language recognition library";
     homepage = "https://gitlab.linphone.org/BC/public/belr";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
index 5286359b946..74a938cf2a5 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }:
 
 stdenv.mkDerivation rec {
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ libuuid ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.crosswire.org/BibleSync";
     description = "A multicast protocol to Bible software shared conavigation";
     longDescription = ''
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.publicDomain;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 5473801f85d..06c7ac81dcd 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, icmake
+{ lib, stdenv, fetchFromGitLab, icmake
 , libmilter, libX11, openssl, readline
 , util-linux, yodl }:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     ./build install x
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Brokken's Own Base Classes And Templates";
     homepage = "https://fbb-git.gitlab.io/bobcat/";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix
index cb2b24f580b..13f490af3e2 100644
--- a/pkgs/development/libraries/boehm-gc/7.6.6.nix
+++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "doc" ];
   separateDebugInfo = stdenv.isLinux;
 
-  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
+  preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
     export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
   '';
 
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     license = "https://hboehm.info/gc/license.txt";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 1af63a2e426..85ae01036ed 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "doc" ];
   separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
 
-  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
+  preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
     export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
   '';
 
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
     license = "https://hboehm.info/gc/license.txt";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index a056ece56e9..b3d754fb542 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config }:
+{ lib, stdenv, fetchurl, pkg-config }:
 
 let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     description = "Library for operations on boolean expression binary trees";
     homepage = "${baseurl}/boolstuff.html";
     license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix
index 92e02c6ca08..97e87980952 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/pkgs/development/libraries/boost-process/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "boost-process-0.5";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     cp -r boost $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.highscore.de/boost/process0.5/";
     description = "Library to manage system processes";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix
index 31f545ab12b..29993ed02b8 100644
--- a/pkgs/development/libraries/boost/1.67.nix
+++ b/pkgs/development/libraries/boost/1.67.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ lib, stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.67.0";
@@ -9,7 +9,7 @@ callPackage ./generic.nix (args // {
       sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
       stripLen = 1;
     })
-  ] ++ stdenv.lib.optionals stdenv.cc.isClang [
+  ] ++ lib.optionals stdenv.cc.isClang [
     # Fixes https://github.com/boostorg/atomic/issues/15
     (fetchpatch {
       url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch";
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index ec3a28e2b1a..5a2b437d41d 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
+{ lib, stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
 , fetchpatch
 , which
 , buildPackages
@@ -30,9 +30,9 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform;
 assert enableNumpy -> enablePython;
 
 # Boost <1.69 can't be build with clang >8, because pth was removed
-assert with stdenv.lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69"));
+assert with lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69"));
 
-with stdenv.lib;
+with lib;
 let
 
   variant = concatStringsSep ","
@@ -150,7 +150,7 @@ stdenv.mkDerivation {
     EOF
   '';
 
-  NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin
+  NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin
                       "-headerpad_max_install_names";
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
index a1924f59a8d..f2136296204 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, premake4 }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }:
 
 stdenv.mkDerivation {
   name = "bootil-unstable-2015-12-17";
@@ -7,9 +7,9 @@ stdenv.mkDerivation {
     description = "Garry Newman's personal utility library";
     homepage = "https://github.com/garrynewman/bootil";
     # License unsure - see https://github.com/garrynewman/bootil/issues/21
-    license = stdenv.lib.licenses.free;
-    maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.free;
+    maintainers = [ lib.maintainers.abigailbuccaneer ];
+    platforms = lib.platforms.all;
     # Build uses `-msse` and `-mfpmath=sse`
     badPlatforms = [ "aarch64-linux" ];
   };
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index eb13321523d..7019d39b16c 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, perl, go }:
+{ lib, stdenv, fetchgit, cmake, perl, go }:
 
 # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
 stdenv.mkDerivation {
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "bin" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free TLS/SSL implementation";
     homepage    = "https://boringssl.googlesource.com";
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 173f074ead7..0369f603b8e 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
+{ lib, stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
 # Passed by version specific builders
 , baseVersion, revision, sha256
 , sourceExtension ? "tar.xz"
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   inherit postPatch;
 
   buildInputs = [ python bzip2 zlib gmp openssl boost ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
   configurePhase = ''
     python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     ln -s botan-*.pc botan.pc || true
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Cryptographic algorithms library";
     maintainers = with maintainers; [ raskin ];
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index e93d4b549a2..47a1c0917f0 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
+{ lib, stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
 , libXi, pkg-config }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       --replace 'b2_maxPolygonVertices	8' 'b2_maxPolygonVertices	15'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "2D physics engine";
     homepage = "https://box2d.org/";
     maintainers = [ maintainers.raskin ];
diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix
index 9a4e2c23356..740e4321698 100644
--- a/pkgs/development/libraries/boxfort/default.nix
+++ b/pkgs/development/libraries/boxfort/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, python37Packages }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }:
 
 stdenv.mkDerivation rec {
   version = "unstable-2019-10-09";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convenient & cross-platform sandboxing C library";
     homepage = "https://github.com/Snaipe/BoxFort";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix
index cc5564d4bb7..eb46ccc8cd7 100644
--- a/pkgs/development/libraries/brigand/default.nix
+++ b/pkgs/development/libraries/brigand/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
   pname = "brigand";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Instant compile time C++ 11 metaprogramming library";
     longDescription = ''
       Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index d025b8c28ed..a333a69ffa1 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison }:
+{ lib, stdenv, fetchurl, bison }:
 
 stdenv.mkDerivation rec {
   name = "buddy-2.4";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "Binary decision diagram package";
     license = "as-is";
 
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    platforms = lib.platforms.unix; # Once had cygwin problems
+    maintainers = [ lib.maintainers.peti ];
   };
 }
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 07222f469d1..50bf56bfbd2 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
+{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
 , Cocoa,  OpenGL
 }:
 
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
+  buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
+    ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
 
   patches = [ ./gwen-narrowing.patch ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
     sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
   '';
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_CPU_DEMOS=OFF"
     "-DINSTALL_EXTRA_LIBS=ON"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-DOPENGL_FOUND=true"
     "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework"
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework"
@@ -38,10 +38,10 @@ stdenv.mkDerivation rec {
     "-DBUILD_UNIT_TESTS=OFF"
   ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
     "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A professional free 3D Game Multiphysics Library";
     longDescription = ''
       Bullet 3D Game Multiphysics Library provides state of the art collision
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix
index 1387048070f..a3966eaa4a3 100644
--- a/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
+{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
 , Cocoa,  OpenGL
 }:
 
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
+  buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
+    ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
 
   patches = [ ./gwen-narrowing.patch ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
     sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
   '';
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_CPU_DEMOS=OFF"
     "-DINSTALL_EXTRA_LIBS=ON"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-DOPENGL_FOUND=true"
     "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework"
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework"
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     "-DBUILD_UNIT_TESTS=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A professional free 3D Game Multiphysics Library";
     longDescription = ''
       Bullet 3D Game Multiphysics Library provides state of the art collision
diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix
index f64090bd53a..3da05302ac9 100644
--- a/pkgs/development/libraries/bulletml/default.nix
+++ b/pkgs/development/libraries/bulletml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, bison, perl }:
+{ lib, stdenv, fetchpatch, fetchurl, bison, perl }:
 
 let
   version = "0.0.6";
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
     install -m 644 README.en "$out"/share/licenses/libbulletml
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library to handle BulletML easily";
     longDescription = ''
       BulletML is the Bullet Markup Language. BulletML can describe the barrage
diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index ff9e6aa038f..f3f09497a66 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl }:
+{ lib, stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "bwidget";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://sourceforge.net/projects/tcllib";
     description = "High-level widget set for Tcl/Tk";
-    license = stdenv.lib.licenses.tcltk;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.tcltk;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix
index 3eb99549246..0adcb327cc4 100644
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@@ -2,7 +2,7 @@
 , cmake
 , fetchFromGitLab
 , sqlite
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An opensource implementation of ZRTP keys exchange protocol";
     homepage = "https://gitlab.linphone.org/BC/public/bzrtp";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index ac0dc43c67a..20bcf80d9e5 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeTextDir }:
+{ lib, stdenv, fetchurl, writeTextDir }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for asynchronous DNS requests";
     homepage = "https://c-ares.haxx.se";
     license = licenses.mit;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
       set_target_properties(c-ares::cares PROPERTIES
         INTERFACE_INCLUDE_DIRECTORIES "${self}/include"
-        ${stdenv.lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''}
+        ${lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''}
       )
       set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
       set_target_properties(c-ares::cares PROPERTIES
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 7dfcce8e9d8..a7420e300ed 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "c-blosc";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A blocking, shuffling and loss-less compression library";
     homepage = "https://www.blosc.org";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 74ca27f2e3c..fdc06df948d 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "actor-framework";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open source implementation of the actor model in C++";
     homepage = "http://actor-framework.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 2eedfbb7b0e..26e37738d55 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -1,9 +1,9 @@
-{ config, stdenv, fetchurl, fetchpatch, pkg-config, libiconv
+{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv
 , libintl, expat, zlib, libpng, pixman, fontconfig, freetype
 , x11Support? !stdenv.isDarwin, libXext, libXrender
 , gobjectSupport ? true, glib
 , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux)
 , libGL ? null # libGLU libGL is no longer a big dependency
 , pdfSupport ? true
@@ -14,13 +14,13 @@ assert glSupport -> x11Support && libGL != null;
 
 let
   version = "1.16.0";
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "cairo";
   inherit version;
 
   src = fetchurl {
-    url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
+    url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
     sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
   };
 
@@ -78,7 +78,7 @@ in stdenv.mkDerivation rec {
 
   preConfigure =
   # On FreeBSD, `-ldl' doesn't exist.
-    stdenv.lib.optionalString stdenv.isFreeBSD
+    lib.optionalString stdenv.isFreeBSD
        '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
           do
             cat "$i" | sed -es/-ldl//g > t
@@ -98,9 +98,9 @@ in stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude;
+  postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index cbf9eedc8d5..87b391d2ad0 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }:
+{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }:
 stdenv.mkDerivation rec {
   pname = "cairomm";
   version = "1.12.2";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz";
     # gnome doesn't have the latest version ATM; beware: same name but different hash
-    #url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25";
   };
 
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ cairo libsigcxx ];
   buildInputs = [ fontconfig freetype ]
-  ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     ApplicationServices
   ]);
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index ad2517f2589..da6aae64db5 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "capnproto";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://kentonv.github.io/capnproto";
     description = "Cap'n Proto cerealization protocol";
     longDescription = ''
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 1e518227035..623021f1dda 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config }:
+{ lib, stdenv, fetchurl, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "capstone";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   # replace faulty macos detection
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile
   '';
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     make check
   '';
 
-  installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")
+  installPhase = (lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")
     + "PREFIX=$out ./make.sh install";
 
   nativeBuildInputs = [
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Advanced disassembly library";
     homepage    = "http://www.capstone-engine.org";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ];
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ thoughtpolice ris ];
   };
 }
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 36d4960cdcc..2aa5c788dc3 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "catch";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
     homepage = "http://catch-lib.net";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 68c16691183..34d61a519ab 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "catch2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-H.." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
     homepage = "http://catch-lib.net";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 7813e53a41e..39792d4fd6a 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }:
+{ lib, stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }:
 
 stdenv.mkDerivation rec {
   name = "ccrtp-2.1.2";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An implementation of the IETF real-time transport protocol (RTP)";
     homepage = "https://www.gnu.org/software/ccrtp/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
index 848927776f9..aff977edd91 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, darwin }:
+{ lib, stdenv, fetchFromGitHub, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "cctz";
@@ -13,17 +13,17 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation;
+  buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation;
 
   installTargets = [ "install_hdrs" "install_shared_lib" ];
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so
   '';
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/cctz";
     description = "C++ library for translating between absolute and civil times";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index 4b745a2a348..9ff54f8ebf9 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , gmp
 , autoreconfHook
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   # No actual checks yet (2018-05-05), but maybe one day.
   # Requested here: https://github.com/cddlib/cddlib/issues/25
   doCheck = true;
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index a95e22645cb..1a4f617cf46 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "cdk";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Curses development kit";
     license = licenses.bsdOriginal ;
     maintainers = [ maintainers.raskin ];
diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix
index 10e145b34ea..a038b5885c2 100644
--- a/pkgs/development/libraries/cdo/default.nix
+++ b/pkgs/development/libraries/cdo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, curl, hdf5, netcdf
+{ lib, stdenv, fetchurl, curl, hdf5, netcdf
 , # build, install and link to a CDI library [default=no]
   enable_cdi_lib ? false
 , # build a completely statically linked CDO binary
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
  # Configure phase
  configureFlags = [
    "--with-netcdf=${netcdf}" "--with-hdf5=${hdf5}"]
-   ++ stdenv.lib.optional (enable_cdi_lib) "--enable-cdi-lib"
-   ++ stdenv.lib.optional (enable_all_static) "--enable-all-static"
-   ++ stdenv.lib.optional (enable_cxx) "--enable-cxx";
+   ++ lib.optional (enable_cdi_lib) "--enable-cdi-lib"
+   ++ lib.optional (enable_all_static) "--enable-all-static"
+   ++ lib.optional (enable_cxx) "--enable-cxx";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
     longDescription = ''
       Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG.
diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix
index 7397bdceb76..ba3366198c2 100644
--- a/pkgs/development/libraries/cegui/default.nix
+++ b/pkgs/development/libraries/cegui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
+{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
 
 stdenv.mkDerivation rec {
   pname = "cegui";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ ogre freetype boost expat ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cegui.org.uk/";
     description = "C++ Library for creating GUIs";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index 6277c5cd931..d4fe5e83658 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, src
+{ lib, stdenv, version, src
 , liboggSupport ? true, libogg ? null # if disabled only the library will be built
 , prePatch ? ""
 , ...
@@ -15,11 +15,11 @@ stdenv.mkDerivation {
   inherit prePatch;
 
   buildInputs = []
-    ++ stdenv.lib.optional liboggSupport libogg;
+    ++ lib.optional liboggSupport libogg;
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ultra-low delay audio codec";
     homepage    = "http://www.celt-codec.org/";
     license     = licenses.bsd2;
diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/default.nix
index e17b42ea5c1..d2321175f8b 100644
--- a/pkgs/development/libraries/cereal/default.nix
+++ b/pkgs/development/libraries/cereal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "cereal";
   version = "1.3.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A header-only C++11 serialization library";
     homepage    = "https://uscilab.github.io/cereal/";
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 18f029c4585..14d0e38f3d9 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , eigen
 , fetchurl
 , cmake
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ eigen glog ]
-    ++ stdenv.lib.optional runTests gflags;
+    ++ lib.optional runTests gflags;
 
   # The Basel BUILD file conflicts with the cmake build directory on
   # case-insensitive filesystems, eg. darwin.
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library for modeling and solving large, complicated optimization problems";
     license = licenses.bsd3;
     homepage = "http://ceres-solver.org";
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index 1b7dc58c0d6..28bb0761777 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv
+{ fetchurl, lib, stdenv
 
 # Optional dependencies
 , bzip2 ? null }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./darwin-rpath-universal.patch ];
 
-  configureFlags = stdenv.lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}";
+  configureFlags = lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}";
 
   hardeningDisable = [ "format" ];
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
    '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://heasarc.gsfc.nasa.gov/fitsio/";
     description = "Library for reading and writing FITS data files";
     longDescription =
diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
index d6c550a8da8..1bc85d1fcd8 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo, allegro, perl, libX11 }:
+{ lib, stdenv, fetchurl, texinfo, allegro, perl, libX11 }:
 
 stdenv.mkDerivation rec {
   pname = "cgui";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "SYSTEM_DIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multiplatform basic GUI library";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index be000e457c4..37bde1caf43 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv
+{ fetchurl, lib, stdenv
 , CoreServices
 }:
 
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   # Test can randomly fail: https://hydra.nixos.org/build/7243912
   doCheck = false;
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices;
+  buildInputs = lib.optional stdenv.isDarwin CoreServices;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Unit testing framework for C";
 
     longDescription =
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index 7618476d62a..8290e60a485 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto
+{ lib, stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto
 , libXi, libXmu, fetchpatch, libXrandr
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cp demo/chipmunk_demos $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast and lightweight 2D game physics library";
     homepage = "http://chipmunk2d.net/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index 9b95fd26444..8971acc7edd 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "chmlib-0.40a";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.jedrea.com/chmlib";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
     description = "A library for dealing with Microsoft ITSS/CHM format files";
     platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
   };
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 12f844aa595..599ef02eec0 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://acoustid.org/chromaprint";
     description = "AcoustID audio fingerprinting library";
     maintainers = with maintainers; [ ehmry ];
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 61d3996a4f5..eb55178db0d 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "cimg";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "doc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small, open source, C++ toolkit for image processing";
     longDescription = ''
       CImg stands for Cool Image. It is easy to use, efficient and is intended
diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix
index 4092a9c9c5b..8a3474a491f 100644
--- a/pkgs/development/libraries/civetweb/default.nix
+++ b/pkgs/development/libraries/civetweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Embedded C/C++ web server";
     homepage = "https://github.com/civetweb/civetweb";
-    license = [ stdenv.lib.licenses.mit ];
+    license = [ lib.licenses.mit ];
   };
 }
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index aad14bead66..a4b526ea25d 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
+{lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cp -ruv c_src doc ebin include priv src $DIR
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tonyrog/cl";
     description = "OpenCL binding for Erlang";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
index 68706c7b8d1..ba8961c8f6c 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/pkgs/development/libraries/classads/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pcre }:
+{ lib, stdenv, fetchurl, pcre }:
 
 let version = "1.0.10"; in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.cs.wisc.edu/condor/classad/";
     description = "The Classified Advertisements library provides a generic means for matching resources";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix
index 8b79619dff4..74d167144a9 100644
--- a/pkgs/development/libraries/clearsilver/default.nix
+++ b/pkgs/development/libraries/clearsilver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python }:
+{ lib, stdenv, fetchurl, fetchpatch, python }:
 
 stdenv.mkDerivation rec {
   name = "clearsilver-0.10.5";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast, powerful, and language-neutral HTML template system";
     homepage = "http://www.clearsilver.net/";
     license = licenses.free;
diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix
index 5eb5b842ecf..91267208d2e 100644
--- a/pkgs/development/libraries/clfft/default.nix
+++ b/pkgs/development/libraries/clfft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
+{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
 
 let
   version = "2.12.2";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library containing FFT functions written in OpenCL";
     longDescription = ''
       clFFT is a software library containing FFT functions written in OpenCL.
diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/development/libraries/clipp/default.nix
index f7c8f90e868..12b393e597d 100644
--- a/pkgs/development/libraries/clipp/default.nix
+++ b/pkgs/development/libraries/clipp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "clipp";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --subst-var version
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy to use, powerful and expressive command line argument handling for C++11/14/17";
     homepage = "https://github.com/muellan/clipp";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix
index ebb41fde423..9eb34f6b686 100644
--- a/pkgs/development/libraries/clipper/default.nix
+++ b/pkgs/development/libraries/clipper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ninja, unzip }:
+{ lib, stdenv, fetchurl, cmake, ninja, unzip }:
 
 stdenv.mkDerivation rec {
   version = "6.4.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja unzip ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A polygon and line clipping and offsetting library (C++, C#, Delphi)";
     longDescription = ''
       The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or,
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 669ce90287b..23bbd84a209 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   pname = "cln";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C/C++ library for numbers, a part of GiNaC";
     homepage = "https://www.ginac.de/CLN/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index f7a0bd058e7..b2bd2adde43 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ppl, autoreconfHook }:
+{ fetchurl, lib, stdenv, ppl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "cloog-ppl-0.15.11";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     # CLooG-PPL is actually a port of GLooG from PolyLib to PPL.
     homepage = "http://www.cloog.org/";
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     maintainers = [ ];
 
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
+    platforms = lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix
index b0f69d42e8c..c952c1a563b 100644
--- a/pkgs/development/libraries/cloog/0.18.0.nix
+++ b/pkgs/development/libraries/cloog/0.18.0.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gmp, isl }:
+{ fetchurl, lib, stdenv, gmp, isl }:
 
 stdenv.mkDerivation rec {
   name = "cloog-0.18.0";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     homepage = "http://www.cloog.org/";
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     /* Leads to an ICE on Cygwin:
 
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
+    platforms = lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index be506cdee17..54df2df9d4d 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gmp, isl }:
+{ fetchurl, lib, stdenv, gmp, isl }:
 
 stdenv.mkDerivation rec {
   name = "cloog-0.18.4";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
     homepage = "http://www.cloog.org/";
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     /* Leads to an ICE on Cygwin:
 
@@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
+    platforms = lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix
index 3776f1eac21..9c1f3c21cd2 100644
--- a/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/pkgs/development/libraries/clucene-core/2.x.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, boost, zlib}:
+{lib, stdenv, fetchurl, cmake, boost, zlib}:
 
 stdenv.mkDerivation rec {
   name = "clucene-core-2.3.3.4";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_CONTRIBS=ON"
     "-DBUILD_CONTRIBS_LIB=ON"
     "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0"
     "-D_CL_HAVE_NAMESPACES_EXITCODE=0"
     "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0"
@@ -30,15 +30,15 @@ stdenv.mkDerivation rec {
     [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
       ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
       ./Install-contribs-lib.patch
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
+    ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
 
   # fails with "Unable to find executable:
   # /build/clucene-core-2.3.3.4/build/bin/cl_test"
   doCheck = false;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core library for full-featured text search engine";
     longDescription = ''
       CLucene is a high-performance, scalable, cross platform, full-featured,
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index d71d01de9e2..20b0a3b547c 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "clucene-core-0.9.21b";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./gcc6.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core library for full-featured text search engine";
     longDescription = ''
       CLucene is a high-performance, scalable, cross platform, full-featured,
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 82338818918..264c382338c 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
+{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
   pname = "clutter-gst";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy";
   };
 
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
 
     homepage = "http://www.clutter-project.org/";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    maintainers = with lib.maintainers; [ lethalman ];
+    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 15bf0d689f5..902a2af62bd 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, meson, ninja
+{ fetchurl, lib, stdenv, pkg-config, meson, ninja
 , gobject-introspection, clutter, gtk3, gnome3 }:
 
 let
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
   };
 
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Clutter-GTK";
     homepage = "http://www.clutter-project.org/";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    license = lib.licenses.lgpl2Plus;
+    maintainers = with lib.maintainers; [ lethalman ];
+    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 8644f83a689..002db004dc1 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes
+{ lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
 , gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon
 }:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b";
   };
 
@@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
          specific needs.
       '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     homepage = "http://www.clutter-project.org/";
 
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = with lib.maintainers; [ lethalman ];
+    platforms = lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix
index eaddcb86f54..b40aea70b41 100644
--- a/pkgs/development/libraries/cm256cc/default.nix
+++ b/pkgs/development/libraries/cm256cc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost } :
+{ lib, stdenv, fetchFromGitHub, cmake, boost } :
 
 stdenv.mkDerivation rec {
   pname = "cm256cc";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++";
     homepage = "https://github.com/f4exb/cm256cc";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix
index 52a02772268..8a9534365f4 100644
--- a/pkgs/development/libraries/cmark-gfm/default.nix
+++ b/pkgs/development/libraries/cmark-gfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "cmark-gfm";
   version = "0.29.0.gfm.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   # tests load the library dynamically which for unknown reason failed
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C";
     homepage = "https://github.com/github/cmark-gfm";
     maintainers = with maintainers; [ cyplo ];
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index b132e958f67..6061fd8f912 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   version = "0.29.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$(readlink -f ./src)
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CommonMark parsing and rendering library and program in C";
     homepage = "https://github.com/jgm/cmark";
     maintainers = [ maintainers.michelk ];
diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix
index 34678d9b37d..39d4849f380 100644
--- a/pkgs/development/libraries/cminpack/default.nix
+++ b/pkgs/development/libraries/cminpack/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "cminpack-1.3.6";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     description = "Software for solving nonlinear equations and nonlinear least squares problems";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 
 }
diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix
index 18c1843623f..9bfbc410c00 100644
--- a/pkgs/development/libraries/cmocka/default.nix
+++ b/pkgs/development/libraries/cmocka/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, cmake }:
+{ fetchurl, lib, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "cmocka";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight library to simplify and generalize unit tests for C";
 
     longDescription =
diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix
index a391f604875..43d73ba200c 100644
--- a/pkgs/development/libraries/cmrt/default.nix
+++ b/pkgs/development/libraries/cmrt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }:
 
 stdenv.mkDerivation rec {
   pname = "cmrt";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libdrm libva ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://01.org/linuxmedia";
     description = "Intel C for Media Runtime";
     longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family";
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index 4a648b1f32a..09ec21cc63e 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "codec2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Speech codec designed for communications quality speech at low data rates";
     homepage = "http://www.rowetel.com/blog/?page_id=452";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 10f732dc629..8fd15207287 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl
 , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
 , mesa, automake, autoconf
 , gstreamerSupport ? true, gst_all_1 }:
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   version = "1.22.8";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8";
   };
 
@@ -40,20 +40,20 @@ in stdenv.mkDerivation rec {
     "--enable-kms-egl-platform"
     "--enable-wayland-egl-platform"
     "--enable-wayland-egl-server"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
-  ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
+  ] ++ lib.optional gstreamerSupport "--enable-cogl-gst"
+  ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
 
   propagatedBuildInputs = with xorg; [
       glib gdk-pixbuf gobject-introspection wayland mesa
       libGL libXrandr libXfixes libXcomposite libXdamage
     ]
-    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
+    ++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer
                                                gst_all_1.gst-plugins-base ];
 
-  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
+  buildInputs = lib.optionals pangoSupport [ pango cairo ];
 
   COGL_PANGO_DEP_CFLAGS
-    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
+    = lib.optionalString (stdenv.isDarwin && pangoSupport)
       "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
 
   #doCheck = true; # all tests fail (no idea why)
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small open source library for using 3D graphics hardware for rendering";
     maintainers = with maintainers; [ lovek323 ];
 
diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix
index c76aaa4c8e5..3fe78e6d02e 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/pkgs/development/libraries/coin3d/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, boost, cmake, libX11, libGL, libGLU }:
+{ fetchFromGitHub, lib, stdenv, boost, cmake, libX11, libGL, libGLU }:
 
 stdenv.mkDerivation rec {
   pname = "coin";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost libX11 libGL libGLU ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/coin3d/coin";
     license = licenses.bsd3;
     description = "High-level, retained-mode toolkit for effective 3D graphics development";
diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix
index 98811b97c87..e42f02407d4 100644
--- a/pkgs/development/libraries/comedilib/default.nix
+++ b/pkgs/development/libraries/comedilib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , flex
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Linux-Comedi";
     repo = "comedilib";
-    rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
+    rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
     sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw";
   };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" "doc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Linux Control and Measurement Device Interface Library";
     homepage = "https://github.com/Linux-Comedi/comedilib";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
index d5d9aa75e89..968c395d701 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "concurrencykit";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library of safe, high-performance concurrent data structures";
     homepage    = "http://concurrencykit.org";
     license     = licenses.bsd2;
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index e084343a94c..dfe7f777670 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
 
 stdenv.mkDerivation rec {
   pname = "cpp-hocon";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost curl leatherman ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "A C++ port of the Typesafe Config library";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix
index 623ab59d3ee..839ddb9b76f 100644
--- a/pkgs/development/libraries/cpp-ipfs-api/default.nix
+++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
+{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
 
 stdenv.mkDerivation {
   pname = "cpp-ipfs-api";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ curl ];
   propagatedBuildInputs = [ nlohmann_json ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "IPFS C++ API client library";
     homepage = "https://github.com/vasild/cpp-ipfs-api";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index e7079ac0386..6085a3c849c 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "cpp-netlib";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   # Most tests make network GET requests to various websites
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of open-source libraries for high level network programming";
     homepage    = "https://cpp-netlib.org";
     license     = licenses.boost;
diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index 9ab3a261da5..38879342f7a 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ];
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Martchus/cpp-utilities";
     description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index 7673d257a3e..aceb2d61e38 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
+{ lib, stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "cppcms";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "--no-warn-unused-cli"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cppcms.com";
     description = "High Performance C++ Web Framework";
     platforms = platforms.linux ;
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index 6ad27152b38..98c9c7ecac1 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
+{ lib, stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
 
 stdenv.mkDerivation rec {
   pname = "cppdb";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "--no-warn-unused-cli" ];
   NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cppcms.com/sql/cppdb/";
     description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers";
     platforms = platforms.linux ;
diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix
index 5ed06b99f33..654ad955ae6 100644
--- a/pkgs/development/libraries/cpptest/default.nix
+++ b/pkgs/development/libraries/cpptest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "cpptest-2.0.0";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cpptest.sourceforge.net/";
     description = "Simple C++ unit testing framework";
     maintainers = with maintainers; [ bosu ];
-    license = stdenv.lib.licenses.lgpl3;
+    license = lib.licenses.lgpl3;
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index bf65be71575..3cafa1c75d7 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "cppunit";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://freedesktop.org/wiki/Software/cppunit/";
     description = "C++ unit testing framework";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix
index d219a8e0bec..8e3fadc7f0d 100644
--- a/pkgs/development/libraries/cpputest/default.nix
+++ b/pkgs/development/libraries/cpputest/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   version = "4.0";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://cpputest.github.io/";
     description = "Unit testing and mocking framework for C/C++";
-    platforms = stdenv.lib.platforms.linux ;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.juliendehos ];
+    platforms = lib.platforms.linux ;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.juliendehos ];
   };
 }
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index fdd98cb00bf..9237c3bd307 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zeromq }:
+{ lib, stdenv, fetchFromGitHub, cmake, zeromq }:
 
 stdenv.mkDerivation rec {
   pname = "cppzmq";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "-DCPPZMQ_BUILD_TESTS=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zeromq/cppzmq";
     license = licenses.bsd2;
     description = "C++ binding for 0MQ";
diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index c10a69d72f9..13029f7739c 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib;
   buildInputs = [ zlib gettext ];
 
-  postPatch = stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+  postPatch = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
     chmod +x util/cracklib-format
     patchShebangs util
 
diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix
index c10d218ea42..bc46e80db9b 100644
--- a/pkgs/development/libraries/crc32c/default.nix
+++ b/pkgs/development/libraries/crc32c/default.nix
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ gflags ];
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc";
   cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1"  ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/crc32c";
     description = "CRC32C implementation with support for CPU-specific acceleration instructions";
     license = with licenses; [ bsd3 ];
diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix
index c26578804ba..9410b071500 100644
--- a/pkgs/development/libraries/crcpp/default.nix
+++ b/pkgs/development/libraries/crcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     cp inc/CRC.h $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/d-bahr/CRCpp";
     description = "Easy to use and fast C++ CRC library";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix
index df1837de305..d85843a54f7 100644
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook,
   libtool, pkg-config, re2, texinfo }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     "--enable-maintainer-mode"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://marcomaggi.github.io/docs/cre2.html";
     description = "C Wrapper for RE2";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix
index bd42a9c866e..ba436fec0a2 100644
--- a/pkgs/development/libraries/criterion/default.nix
+++ b/pkgs/development/libraries/criterion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext
+{ lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext
 , dyncall , nanomsg, python37Packages }:
 
 stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform C and C++ unit testing framework for the 21th century";
     homepage = "https://github.com/Snaipe/Criterion";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index 3fe27748155..041e7d49d50 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, nasm, which }:
+{ lib, stdenv, fetchFromGitHub, nasm, which }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "crypto++";
   version = "8.2.0";
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 61d1d53da63..78d8bce40a3 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/pkgs/development/libraries/csfml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, sfml }:
+{ lib, stdenv, fetchFromGitHub, cmake, sfml }:
 
 let
   version = "2.5";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildInputs = [ sfml ];
   cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.sfml-dev.org/";
     description = "Simple and fast multimedia library";
     longDescription = ''
diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix
index 7ca90281abb..be643e3a52c 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/pkgs/development/libraries/ctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }:
 
 stdenv.mkDerivation rec {
   pname = "ctl";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libtiff ilmbase openexr ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Color Transformation Language";
     homepage = "https://github.com/ampas/CTL";
     license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible
diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix
index 7c78faaee0b..69380c2eeeb 100644
--- a/pkgs/development/libraries/ctpl/default.nix
+++ b/pkgs/development/libraries/ctpl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   pname = "ctpl";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://ctpl.tuxfamily.org/";
     description = "Template engine library written in C";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index 2e3f6a86d49..626606d0526 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "ctpp2";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high performance templating engine";
     homepage = "http://ctpp.havoc.ru";
     maintainers = [ maintainers.robbinch ];
diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix
index 6ec2a694970..644c68e85d8 100644
--- a/pkgs/development/libraries/ctypes_sh/default.nix
+++ b/pkgs/development/libraries/ctypes_sh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook, pkg-config
 , zlib, libffi, elfutils, libdwarf
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ zlib libffi elfutils libdwarf ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A foreign function interface for bash";
     homepage = "https://github.com/taviso/ctypes.sh";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/development/libraries/cudd/default.nix
index 6749d2e94c0..4e8cf59fbff 100644
--- a/pkgs/development/libraries/cudd/default.nix
+++ b/pkgs/development/libraries/cudd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "cudd";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://davidkebo.com/cudd";
     description = "Binary Decision Diagram (BDD) library";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix
index 6efc28b4c05..9d4ae41f384 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, curl }:
+{ lib, stdenv, fetchFromGitHub, cmake, curl }:
 
 stdenv.mkDerivation rec {
   pname = "curlcpp";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ curl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://josephp91.github.io/curlcpp/";
     description = "Object oriented C++ wrapper for CURL";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix
index 46f1eb33f75..0aee75751d9 100644
--- a/pkgs/development/libraries/curlpp/default.nix
+++ b/pkgs/development/libraries/curlpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, curl }:
+{ lib, stdenv, fetchFromGitHub, cmake, curl }:
 
 stdenv.mkDerivation rec {
   pname = "curlpp";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ curl ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.curlpp.org/";
     description = "C++ wrapper around libcURL";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix
index 661dc7c816c..748d495063d 100644
--- a/pkgs/development/libraries/cutee/default.nix
+++ b/pkgs/development/libraries/cutee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "cutee";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cp cutee $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ Unit Testing Easy Environment";
     homepage    = "http://www.codesink.org/cutee_unit_testing.html";
     license     = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix
index a19b1a2d9d0..31a5420e375 100644
--- a/pkgs/development/libraries/cwiid/default.nix
+++ b/pkgs/development/libraries/cwiid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "cwiid-${version}-git";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Linux Nintendo Wiimote interface";
     homepage    = "http://cwiid.org";
     license     = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix
index 34dc30abe61..f632fca714c 100644
--- a/pkgs/development/libraries/cxx-prettyprint/default.nix
+++ b/pkgs/development/libraries/cxx-prettyprint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "cxx-prettyprint-unstable";
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
     cp prettyprint.hpp "$out/include"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description    = "Header only C++ library for pretty printing standard containers";
     homepage       = "https://github.com/louisdx/cxx-prettyprint";
-    license        = stdenv.lib.licenses.boost;
+    license        = lib.licenses.boost;
     platforms      = platforms.all;
 
     # This is a header-only library, no point in hydra building it:
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index e1898044efa..1a828cc451d 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub }:
+{ lib, stdenv, buildPythonApplication, fetchFromGitHub }:
 
 buildPythonApplication rec {
   pname = "cxxtest";
@@ -26,7 +26,7 @@ buildPythonApplication rec {
 
   dontWrapPythonPrograms = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://cxxtest.com";
     description = "Unit testing framework for C++";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix
index ca3c4871732..0d8d2498ae7 100644
--- a/pkgs/development/libraries/cxxtools/default.nix
+++ b/pkgs/development/libraries/cxxtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "2.2.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.tntnet.org/cxxtools.html";
     description = "Comprehensive C++ class library for Unix and Linux";
-    platforms = stdenv.lib.platforms.linux ;
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.juliendehos ];
+    platforms = lib.platforms.linux ;
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.juliendehos ];
   };
 }
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 96778e8960b..b1a6401284a 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -2,7 +2,7 @@
 , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
 , buildPackages, pruneLibtoolFiles, fetchpatch }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "cyrus-sasl";
   version = "2.1.27";
diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix
index 228fec2f818..bb8ecafbb34 100644
--- a/pkgs/development/libraries/czmq/default.nix
+++ b/pkgs/development/libraries/czmq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zeromq }:
+{ lib, stdenv, fetchurl, zeromq }:
 
 stdenv.mkDerivation rec {
   version = "4.2.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   # Needs to be propagated for the .pc file to work
   propagatedBuildInputs = [ zeromq ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://czmq.zeromq.org/";
     description = "High-level C Binding for ZeroMQ";
     license = licenses.mpl20;
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index b78df35190b..2b9357e3ef0 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab
+{ lib, stdenv, fetchFromGitLab
 , meson, ninja, nasm, pkg-config
 , withTools ? false # "dav1d" binary
 , withExamples ? false, SDL2 # "dav1dplay" binary
@@ -21,15 +21,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja nasm pkg-config ];
   # TODO: doxygen (currently only HTML and not build by default).
-  buildInputs = stdenv.lib.optional withExamples SDL2
-    ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
+  buildInputs = lib.optional withExamples SDL2
+    ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
 
   mesonFlags= [
-    "-Denable_tools=${stdenv.lib.boolToString withTools}"
-    "-Denable_examples=${stdenv.lib.boolToString withExamples}"
+    "-Denable_tools=${lib.boolToString withTools}"
+    "-Denable_examples=${lib.boolToString withExamples}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform AV1 decoder focused on speed and correctness";
     longDescription = ''
       The goal of this project is to provide a decoder for most platforms, and
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index dc668a233b0..5cf9200a9ab 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ lib, stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // {
   version = "4.8.30";
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index 1223cb897e8..0bb5c4cd6a4 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ lib, stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // {
   version = "5.3.28";
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
index 642054b5a01..49935dd2399 100644
--- a/pkgs/development/libraries/db/db-6.0.nix
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ... } @ args:
+{ lib, stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // {
   version = "6.0.20";
   sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
-  license = stdenv.lib.licenses.agpl3;
+  license = lib.licenses.agpl3;
   extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ];
 })
diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix
index dee07a9637e..b2c0fd7ac8f 100644
--- a/pkgs/development/libraries/db/db-6.2.nix
+++ b/pkgs/development/libraries/db/db-6.2.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ... } @ args:
+{ lib, stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // {
   version = "6.2.23";
   sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7";
-  license = stdenv.lib.licenses.agpl3;
+  license = lib.licenses.agpl3;
   extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ];
 })
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index f439113efb3..a564db369fb 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , cxxSupport ? true
 , compat185 ? true
 , dbmSupport ? false
@@ -6,7 +6,7 @@
 # Options from inherited versions
 , version, sha256
 , extraPatches ? [ ]
-, license ? stdenv.lib.licenses.sleepycat
+, license ? lib.licenses.sleepycat
 , drvArgs ? {}
 }:
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation (rec {
       (if cxxSupport then "--enable-cxx" else "--disable-cxx")
       (if compat185 then "--enable-compat185" else "--disable-compat185")
     ]
-    ++ stdenv.lib.optional dbmSupport "--enable-dbm"
-    ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+    ++ lib.optional dbmSupport "--enable-dbm"
+    ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   preConfigure = ''
     cd build_unix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (rec {
     make examples_c examples_cxx
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
     description = "Berkeley DB";
     license = license;
diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
index 68b4efb377b..731c038527c 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus, glib, pkg-config, expat }:
+{ lib, stdenv, fetchurl, dbus, glib, pkg-config, expat }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-cplusplus";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-ecore" "--disable-tests" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://dbus-cplusplus.sourceforge.net";
     description = "C++ API for D-BUS";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 8fb06fe9c44..f56a1eaac24 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPackages
+{ lib, stdenv, fetchurl, buildPackages
 , pkg-config, expat, gettext, libiconv, dbus, glib
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ dbus glib ];
 
   configureFlags = [ "--exec-prefix=${placeholder "dev"}" ] ++
-    stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
+    lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
       "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool";
 
   doCheck = false;
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://dbus.freedesktop.org";
-    license = with stdenv.lib.licenses; [ afl21 gpl2 ];
+    license = with lib.licenses; [ afl21 gpl2 ];
     description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism";
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 77cbd6e28ca..f47c91ca3ea 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-sharp-glib";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET: GLib integration module";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
index 33f0c6b382e..65cd8904366 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-sharp-glib";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET: GLib integration module";
     platforms = platforms.linux;
     license = licenses.mit;
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 291bb56efde..eb1b20e29eb 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, pkg-config, mono, autoreconfHook }:
+{lib, stdenv, fetchFromGitHub, pkg-config, mono, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-sharp";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 86a4fce00aa..c64d7bbef99 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }:
+{lib, stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "dbus-sharp";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 4496e59a407..14b6f1fb4cd 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
     daemon = dbus.out;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple interprocess messaging system";
     homepage = "http://www.freedesktop.org/wiki/Software/dbus/";
     license = licenses.gpl2Plus; # most is also under AFL-2.1
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix
index a0005f1bf72..b4e74d03619 100644
--- a/pkgs/development/libraries/dbxml/default.nix
+++ b/pkgs/development/libraries/dbxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, db62, xercesc, xqilla }:
+{ lib, stdenv, fetchurl, db62, xercesc, xqilla }:
 
 stdenv.mkDerivation rec {
   pname = "dbxml";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     cd dbxml
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.oracle.com/database/berkeley-db/xml.html";
     description = "Embeddable XML database based on Berkeley DB";
     license = licenses.agpl3;
diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix
index a9929ea2add..b393b74f2b2 100644
--- a/pkgs/development/libraries/dclib/default.nix
+++ b/pkgs/development/libraries/dclib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libxml2, openssl, bzip2}:
+{lib, stdenv, fetchurl, libxml2, openssl, bzip2}:
 
 stdenv.mkDerivation {
   name = "dclib-0.3.7";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   buildInputs = [libxml2 openssl bzip2];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Peer-to-Peer file sharing client";
     homepage = "http://dcgui.berlios.de";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix
index 802befff14c..8d7dc5a0178 100644
--- a/pkgs/development/libraries/dclxvi/default.nix
+++ b/pkgs/development/libraries/dclxvi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   name = "dclxvi-2013-01-27";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   patchPhase = ''
     substituteInPlace Makefile \
       --replace "gcc" "cc"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile \
       --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so"
   '';
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     find . -name \*.so -exec cp {} $out/lib \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/agl/dclxvi";
     description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library";
     platforms = platforms.x86_64;
diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix
index 4b574a17f78..6834a605f1a 100644
--- a/pkgs/development/libraries/dconf/default.nix
+++ b/pkgs/development/libraries/dconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
   version = "0.38.0";
 
   outputs = [ "out" "lib" "dev" ]
-    ++ stdenv.lib.optional (!isCross) "devdoc";
+    ++ lib.optional (!isCross) "devdoc";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5";
   };
 
@@ -38,19 +38,19 @@ stdenv.mkDerivation rec {
     glib
     docbook-xsl-nons
     docbook_xml_dtd_42
-  ] ++ stdenv.lib.optional (!isCross) gtk-doc;
+  ] ++ lib.optional (!isCross) gtk-doc;
 
   buildInputs = [
     glib
     bash-completion
     dbus
-  ] ++ stdenv.lib.optional (!isCross) vala;
+  ] ++ lib.optional (!isCross) vala;
   # Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling.
 
   mesonFlags = [
     "--sysconfdir=/etc"
-    "-Dgtk_doc=${stdenv.lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile.
-  ] ++ stdenv.lib.optional isCross "-Dvapi=false";
+    "-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile.
+  ] ++ lib.optional isCross "-Dvapi=false";
 
   doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin;
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/dconf";
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index fdbe8783d02..3d46028ec43 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 , fetchpatch
 , pkg-config
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus";
     homepage = "https://launchpad.net/dee";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix
index 3a8290a6597..213096f5abf 100644
--- a/pkgs/development/libraries/discord-rpc/default.nix
+++ b/pkgs/development/libraries/discord-rpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , rapidjson
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     rapidjson
-  ] ++ stdenv.lib.optional stdenv.isDarwin AppKit;
+  ] ++ lib.optional stdenv.isDarwin AppKit;
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=true"
-    "-DBUILD_EXAMPLES=${stdenv.lib.boolToString buildExamples}"
+    "-DBUILD_EXAMPLES=${lib.boolToString buildExamples}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official library to interface with the Discord client";
     homepage = "https://github.com/discordapp/discord-rpc";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index 6570b48e163..a24e0b8d014 100644
--- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }:
+{ lib, stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }:
 
 stdenv.mkDerivation rec {
   pname = "dleyna-connector-dbus";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ dbus dleyna-core glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A D-Bus API for the dLeyna services";
     homepage = "https://01.org/dleyna";
     maintainers = [ maintainers.jtojnar ];
diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix
index 56d40361334..4a4eecfdc0f 100644
--- a/pkgs/development/libraries/dleyna-core/default.nix
+++ b/pkgs/development/libraries/dleyna-core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     gupnp
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library of utility functions that are used by the higher level dLeyna";
     homepage = "https://01.org/dleyna";
     maintainers = [ maintainers.jtojnar ];
diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix
index 8bff782bacc..768af6a671a 100644
--- a/pkgs/development/libraries/dleyna-renderer/default.nix
+++ b/pkgs/development/libraries/dleyna-renderer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , pkg-config
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to discover and manipulate Digital Media Renderers";
     homepage = "https://01.org/dleyna";
     maintainers = [ maintainers.jtojnar ];
diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix
index 4e6d263ed18..a0a414abf74 100644
--- a/pkgs/development/libraries/dleyna-server/default.nix
+++ b/pkgs/development/libraries/dleyna-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to discover, browse and manipulate Digital Media Servers";
     homepage = "https://01.org/dleyna";
     maintainers = [ maintainers.jtojnar ];
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index 0f0b9720a1a..fa7d70d5213 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A general purpose cross-platform C++ machine learning library";
     homepage = "http://www.dlib.net";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix
index 36b791ccc98..f9456b8acac 100644
--- a/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/pkgs/development/libraries/docopt_cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, python }:
 
 stdenv.mkDerivation rec {
   version = "0.6.3";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++11 port of docopt";
     homepage = "https://github.com/docopt/docopt.cpp";
     license = with licenses; [ mit boost ];
diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix
index 55f97a425eb..702015e5d38 100644
--- a/pkgs/development/libraries/doctest/default.nix
+++ b/pkgs/development/libraries/doctest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, installShellFiles, cmake }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "doctest";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/onqtam/doctest";
     description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix
index f6320a64374..39d71eee432 100644
--- a/pkgs/development/libraries/dotconf/default.nix
+++ b/pkgs/development/libraries/dotconf/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, autoreconfHook }:
+{ fetchFromGitHub, lib, stdenv, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dotconf-" + version;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A configuration parser library";
     maintainers = with maintainers; [ pSub ];
     homepage = "https://github.com/williamh/dotconf";
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index fd7a4e3f5f6..2bdcc3c8a99 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     rm BUILD
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Binary-decimal and decimal-binary routines for IEEE doubles";
     homepage = "https://github.com/google/double-conversion";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 5c9454d3228..8f67259989b 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical
 , libuv, raft-canonical, sqlite-replication }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Expose a SQLite database over the network and replicate it across a
       cluster of peers
diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix
index 8479f3c2f8e..41ffdd16f5a 100644
--- a/pkgs/development/libraries/draco/default.nix
+++ b/pkgs/development/libraries/draco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_UNITY_PLUGIN=1"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for compressing and decompressing 3D geometric meshes and point clouds";
     homepage = "https://google.github.io/draco/";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index 25ecbf03dc1..21572e52e23 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook
 , alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     alsaLib fluidsynth libpulseaudio qtbase qtsvg
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ solson ];
     description = "MIDI libraries for Qt5/C++";
     homepage = "http://drumstick.sourceforge.net/";
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index cfb0f31af04..9ce487b1b03 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
+{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
 , libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
       libsamplerate libtool autoconf automake xorgproto libICE pkg-config
     ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A plugin SDK for virtual instruments";
     maintainers = with maintainers;
     [
diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index 1aedee5c3b6..60ccf5aeeb2 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cwida/duckdb";
     description = "Embeddable SQL OLAP Database Management System";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix
index 1eb23c1145b..b2cd97398c6 100644
--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/pkgs/development/libraries/dxflib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , qmake
 }:
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with lib.maintainers; [raskin];
+    platforms = lib.platforms.linux;
     description = "DXF file format library";
   };
 }
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index e792fe1e051..0e3fa3ac7dc 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "dyncall";
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     install -D -t $out/share/man/man3 ./*/*.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Highly dynamic multi-platform foreign function call interface library";
     homepage = "https://www.dyncall.org";
     license = licenses.isc;
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 0c320527784..ad582d93305 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -1,7 +1,7 @@
 # To use this package with a CMake and pkg-config build:
 # pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp)
 # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc)
-{ stdenv, fetchFromGitHub, cmake, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
 stdenv.mkDerivation rec {
   pname = "easyloggingpp";
   version = "9.97.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [gtest];
   cmakeFlags = [ "-Dtest=ON" ];
   NIX_CFLAGS_COMPILE = "-std=c++11" +
-    stdenv.lib.optionalString stdenv.isLinux " -pthread";
+    lib.optionalString stdenv.isLinux " -pthread";
   postInstall = ''
     mkdir -p $out/include
     cp ../src/easylogging++.cc $out/include
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ logging library";
     homepage = "https://muflihun.github.io/easyloggingpp/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [acowley];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [acowley];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 867f0e59393..1050490a220 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -1,9 +1,9 @@
-{ fetchurl, stdenv
+{ fetchurl, lib, stdenv
 , cmake, netcdf, openjpeg, libpng, gfortran
 , enablePython ? false, pythonPackages
 , enablePosixThreads ? false
 , enableOpenMPThreads ? false}:
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "eccodes";
   version = "2.12.5";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Only do tests that don't require downloading 120MB of testdata
-  checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) ''
+  checkPhase = lib.optionalString (stdenv.isDarwin) ''
     substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
   '' + ''
     ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index 278099b8ca7..4709441a101 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , pari
@@ -29,14 +29,14 @@ stdenv.mkDerivation rec {
     pari
     ntl
     gmp
-  ] ++ stdenv.lib.optionals withFlint [
+  ] ++ lib.optionals withFlint [
     flint
   ];
   nativeBuildInputs = [
     autoreconfHook
   ];
   doCheck = true;
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Elliptic curve tools";
     homepage = "https://github.com/JohnCremona/eclib";
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index 549ef7c56bd..82f65082b94 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "editline";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" "doc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://troglobit.com/editline.html";
     description = "A readline() replacement for UNIX without termcap (ncurses)";
     license = licenses.bsdOriginal;
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix
index d1527571943..a2b1ba47e2d 100644
--- a/pkgs/development/libraries/eigen/2.0.nix
+++ b/pkgs/development/libraries/eigen/2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, cmake }:
+{ lib, stdenv, fetchFromGitLab, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "eigen";
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
     homepage = "https://eigen.tuxfamily.org";
-    maintainers = with stdenv.lib.maintainers; [ sander raskin ];
+    maintainers = with lib.maintainers; [ sander raskin ];
     branch = "2";
-    platforms = with stdenv.lib.platforms; unix;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 3c6a5cc1ca6..079269521c7 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, cmake }:
+{ lib, stdenv, fetchFromGitLab, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "eigen";
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
     homepage = "https://eigen.tuxfamily.org";
     platforms = platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ sander raskin ];
+    maintainers = with lib.maintainers; [ sander raskin ];
     inherit version;
   };
 }
diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix
index 083dbbc7450..12d4e2a87cc 100644
--- a/pkgs/development/libraries/embree/2.x.nix
+++ b/pkgs/development/libraries/embree/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw,
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw,
 openimageio, libjpeg, libpng, libpthreadstubs, libX11
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High performance ray tracing kernels from Intel";
     homepage = "https://embree.github.io/";
     maintainers = with maintainers; [ hodapp ];
diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix
index fad14a898a7..5dee84d1007 100644
--- a/pkgs/development/libraries/embree/default.nix
+++ b/pkgs/development/libraries/embree/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]
                 ++ lib.optionals stdenv.isDarwin [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High performance ray tracing kernels from Intel";
     homepage = "https://embree.github.io/";
     maintainers = with maintainers; [ hodapp gebner ];
diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix
index 671ebb279fa..172d6747aa1 100644
--- a/pkgs/development/libraries/enchant/1.x.nix
+++ b/pkgs/development/libraries/enchant/1.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }:
+{ lib, stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }:
 
 stdenv.mkDerivation rec {
   version = "1.6.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ aspell glib hunspell hspell ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic spell checking library";
     homepage = "https://abiword.github.io/enchant";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 02215a30418..184d5dcc051 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , aspell
 , pkg-config
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     "--enable-relocatable" # needed for tests
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic spell checking library";
     homepage = "https://abiword.github.io/enchant/";
     license = licenses.lgpl21Plus; # with extra provision for non-free checkers
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 61b8c1be4f2..ef252ad19f6 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "enet-1.3.17";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://enet.bespin.org/";
     description = "Simple and robust network communication layer on top of UDP";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix
index 35e12eb00c7..955dd2eeb36 100644
--- a/pkgs/development/libraries/entt/default.nix
+++ b/pkgs/development/libraries/entt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "entt";
   version = "3.5.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/skypjack/entt";
     description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++";
     maintainers = with maintainers; [ twey ];
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index 7cc7a24f2c8..7ae0e73953f 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3
 , libGL, libX11
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "epoxy";
diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix
index 43c9f5a9380..0a10fa3c48c 100644
--- a/pkgs/development/libraries/ethash/default.nix
+++ b/pkgs/development/libraries/ethash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "ethash";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto";
     homepage = "https://github.com/ethereum/ethash";
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index d80fdb2213d..ca460aa71f6 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "eventlog-0.2.12";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
       combination of description and tag/value pairs.
     '';
     homepage = "https://www.balabit.com/support/community/products/";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 5638db71245..356959b429f 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:
+{ lib, stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "exempi";
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ expat zlib boost ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
 
   doCheck = stdenv.isLinux;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of XMP (Adobe's Extensible Metadata Platform)";
     homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index a845e8998e7..9d29afd6927 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , zlib
@@ -85,13 +85,13 @@ stdenv.mkDerivation rec {
     patchShebangs ../test/
     mkdir ../test/tmp
 
-    ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) ''
+    ${lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) ''
       # Fix tests on arm
       # https://github.com/Exiv2/exiv2/issues/933
       rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
     ''}
 
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
       # Removing tests depending on charset conversion
       substituteInPlace ../test/Makefile --replace "conversions.sh" ""
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.exiv2.org/";
     description = "A library and command-line utility to manage image metadata";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index 9f9adb455b9..400d7696e3c 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }:
+{ lib, stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }:
 
 stdenv.mkDerivation rec {
  pname = "libexosip2";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2Plus;
     description = "Library that hides the complexity of using the SIP protocol";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 29d2c2b3acb..ba9fb2b177d 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ]; # TODO: fix referrers
   outputBin = "dev";
 
-  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+  configureFlags = lib.optional stdenv.isFreeBSD "--with-pic";
 
   outputMan = "dev"; # tiny page for a dev tool
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     patchShebangs ./test-driver-wrapper.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.libexpat.org/";
     description = "A stream-oriented XML parser library written in C";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index b2c4d3741e1..dbc56572d53 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, autoreconfHook
+{ lib, stdenv, fetchurl, autoreconfHook
 , mp4v2Support ? true, mp4v2 ? null
 , drmSupport ? false # Digital Radio Mondiale
 }:
 
 assert mp4v2Support -> (mp4v2 != null);
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "faac";
   version = "1.30";
diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index 90b1a182e55..0afef1c9fd8 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchFromGitHub, autoreconfHook
+{lib, stdenv, fetchFromGitHub, autoreconfHook
 , drmSupport ? false # Digital Radio Mondiale
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "faad2";
   version = "2.10.0";
diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix
index a528ad6f7f6..9473d09ffc5 100644
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/pkgs/development/libraries/farbfeld/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
+{ lib, stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
 
 stdenv.mkDerivation rec {
   pname = "farbfeld";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Suckless image format with conversion tools";
     license = licenses.isc;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index c49c12c03bd..b046b7aef73 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , libnice
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     gst-libav
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.freedesktop.org/wiki/Software/Farstream";
     description = "Audio/Video Communications Framework formely known as farsight";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix
index 80306bf506b..5a81e3f7274 100644
--- a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix
+++ b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "fast-cpp-csv-parser";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     substituteAll ${./fast-cpp-csv-parser.pc.in} $out/lib/pkgconfig/fast-cpp-csv-parser.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files";
     homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
index f1bd647b06d..c56e05e0753 100644
--- a/pkgs/development/libraries/fastjson/default.nix
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
+{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   version = "0.99.8";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sh autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast json library for C";
     homepage = "https://github.com/rsyslog/libfastjson";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix
index eb5cb251620..ac90001fc39 100644
--- a/pkgs/development/libraries/fastpbkdf2/default.nix
+++ b/pkgs/development/libraries/fastpbkdf2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl }:
+{ lib, stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation {
   name = "fastpbkdf2-1.0.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     cp fastpbkdf2.h $out/include/fastpbkdf2
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C";
     homepage = "https://github.com/ctz/fastpbkdf2";
     license = licenses.cc0;
diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix
index 4a565e3fccc..c030f53df26 100644
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/pkgs/development/libraries/faudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, SDL2}:
+{ lib, stdenv, fetchFromGitHub, cmake, SDL2}:
 
 #TODO: tests
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library";
     homepage = "https://github.com/FNA-XNA/FAudio";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index bde1682e3fc..1ec666a920c 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "fcgi";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "ln -s . $out/include/fastcgi";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A language independent, scalable, open extension to CG";
     homepage = "http://www.fastcgi.com/";
     license = "FastCGI see LICENSE.TERMS";
diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix
index d76772500fb..380fdcce29f 100644
--- a/pkgs/development/libraries/fcppt/default.nix
+++ b/pkgs/development/libraries/fcppt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, catch2, metal }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2, metal }:
 stdenv.mkDerivation rec {
   pname = "fcppt";
   version = "3.5.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Freundlich's C++ toolkit";
     longDescription = ''
       Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 53967381570..dc64a6edce0 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , exampleSupport ? false # Example encoding program
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "fdk-aac";
   version = "2.0.1";
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index d62d3dd7cc6..fd7d89a8831 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack
 , gmpxx
 }:
 
@@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ] ++ stdenv.lib.optionals doCheck checkInputs;
+  ] ++ lib.optionals doCheck checkInputs;
 
   buildInputs = [ givaro blas lapack ];
 
   configureFlags = [
     "--with-blas-libs=-lcblas"
     "--with-lapack-libs=-llapacke"
-  ] ++ stdenv.lib.optionals stdenv.isx86_64 [
+  ] ++ lib.optionals stdenv.isx86_64 [
     # disable SIMD instructions (which are enabled *when available* by default)
     # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284)
     "--${if stdenv.hostPlatform.sse3Support   then "enable" else "disable"}-sse3"
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   ];
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Finite Field Linear Algebra Subroutines";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 27f2c65e867..916ea2772e1 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm
+{ lib, stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm
 /*
  *  Licensing options (yes some are listed twice, filters and such are not listed)
  */
@@ -184,7 +184,7 @@
 
 let
   inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64;
-  inherit (stdenv.lib) optional optionals optionalString enableFeature;
+  inherit (lib) optional optionals optionalString enableFeature;
 in
 
 /*
@@ -260,9 +260,9 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     patchShebangs .
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c
-  '' + stdenv.lib.optionalString (frei0r != null) ''
+  '' + lib.optionalString (frei0r != null) ''
     substituteInPlace libavfilter/vf_frei0r.c \
       --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
     substituteInPlace doc/filters.texi \
@@ -467,7 +467,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     homepage = "https://www.ffmpeg.org/";
     longDescription = ''
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
index d01f22c0b3a..daa03d0293a 100644
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, libsixel, yasm
+{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel, yasm
 }:
 
 stdenv.mkDerivation {
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics";
     homepage = "http://www.ffmpeg.org/";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index bc4de6a5b4a..0dfa639c338 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
+{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
 , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
 , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
 , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
@@ -44,7 +44,7 @@
 
 let
   inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32;
-  inherit (stdenv.lib) optional optionals optionalString enableFeature filter;
+  inherit (lib) optional optionals optionalString enableFeature filter;
 
   cmpVer = builtins.compareVersions;
   reqMin = requiredVersion: (cmpVer requiredVersion branch != 1);
@@ -211,7 +211,7 @@ stdenv.mkDerivation rec {
     inherit vaapiSupport vdpauSupport;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     homepage = "http://www.ffmpeg.org/";
     longDescription = ''
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index 6c8e689840e..2e68dbb1d12 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg
+{ fetchFromGitHub, lib, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ffmpeg_3 libpng libjpeg ];
   cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];
 
-  meta = with stdenv.lib;  {
+  meta = with lib;  {
     homepage = "https://github.com/dirkvdb/ffmpegthumbnailer";
     description = "A lightweight video thumbnailer";
     longDescription = "FFmpegthumbnailer is a lightweight video
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 3dfe697981c..7fa96cff7f8 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "ffms";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/libffms2.so $out/lib/vapoursynth/libffms2.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/FFMS/ffms2/";
     description = "Libav/ffmpeg based source library for easy frame accurate access";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index ba7e86747a7..f0632e1460a 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   checkInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fastest Fourier Transform in the West library";
     homepage = "http://www.fftw.org/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
index 3438bfee07b..a412f707047 100644
--- a/pkgs/development/libraries/filter-audio/default.nix
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "filter-audio";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight audio filtering library made from webrtc code";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix
index a61d11c2578..91339380424 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/pkgs/development/libraries/flann/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
 
 stdenv.mkDerivation {
   name = "flann-1.9.1";
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://people.cs.ubc.ca/~mariusm/flann/";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     description = "Fast approximate nearest neighbor searches in high dimensional spaces";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index 0b96a91e45f..374203556a6 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "flatbuffers";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin ''
+  preConfigure = lib.optional stdenv.buildPlatform.isDarwin ''
     rm BUILD
   '';
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Memory Efficient Serialization Library";
     longDescription = ''
       FlatBuffers is an efficient cross platform serialization library for
diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix
index 6239dba2836..6b40814119c 100644
--- a/pkgs/development/libraries/flatcc/default.nix
+++ b/pkgs/development/libraries/flatcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "FlatBuffers Compiler and Library in C for C ";
     homepage = "https://github.com/dvidelabs/flatcc";
-    license = [ stdenv.lib.licenses.asl20 ];
+    license = [ lib.licenses.asl20 ];
   };
 }
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 6f8634c01ef..1480f42750d 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , autoconf
@@ -196,7 +196,7 @@ stdenv.mkDerivation rec {
   in ''
     patchShebangs buildutil
     patchShebangs tests
-    PATH=${stdenv.lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler
+    PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler
   '';
 
   preConfigure = ''
@@ -215,7 +215,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Linux application sandboxing and distribution framework";
     homepage = "https://flatpak.org/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index 96c53698401..7bfa701db73 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , gmp
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     mpir
     mpfr
     ntl
-  ] ++ stdenv.lib.optionals withBlas [
+  ] ++ lib.optionals withBlas [
     openblas
   ];
   propagatedBuildInputs = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     "--with-mpir=${mpir}"
     "--with-mpfr=${mpfr}"
     "--with-ntl=${ntl}"
-  ] ++ stdenv.lib.optionals withBlas [
+  ] ++ lib.optionals withBlas [
     "--with-blas=${openblas}"
   ];
 
@@ -53,9 +53,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "Fast Library for Number Theory";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
     homepage = "http://www.flintlib.org/";
     downloadPage = "http://www.flintlib.org/downloads.html";
     updateWalker = true;
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index 1db8a9fbe2f..24927fe853b 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, alsaLib }:
+{ lib, stdenv, fetchFromGitHub, alsaLib }:
 
 stdenv.mkDerivation rec {
   pname = "flite";
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ];
+  buildInputs = lib.optionals stdenv.isLinux [ alsaLib ];
 
   configureFlags = [
     "--enable-shared"
-  ] ++ stdenv.lib.optionals stdenv.isLinux [ "--with-audio=alsa" ];
+  ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small, fast run-time speech synthesis engine";
     homepage = "http://www.festvox.org/flite/";
     license = licenses.bsdOriginal;
diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix
index 4c482176fcb..2db0aea3ecf 100644
--- a/pkgs/development/libraries/fltk/1.4.nix
+++ b/pkgs/development/libraries/fltk/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
+{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
 , freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng
 , libtiff, freetype, Cocoa, AGL, GLUT
 }:
@@ -16,11 +16,11 @@ stdenv.mkDerivation {
     sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
-    ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
+    ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
 
   propagatedBuildInputs = [ xorgproto ]
     ++ (if stdenv.isDarwin
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ cross-platform lightweight GUI library";
     homepage = "https://www.fltk.org";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index ca8198fb271..5cbd993fc64 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
+{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
 , freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng
 , libtiff, freetype, Cocoa, AGL, GLUT
 }:
@@ -16,11 +16,11 @@ stdenv.mkDerivation {
     sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
-    ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
+    ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
 
   propagatedBuildInputs = [ xorgproto ]
     ++ (if stdenv.isDarwin
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ cross-platform lightweight GUI library";
     homepage = "https://www.fltk.org";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 2f490891433..0d2983b1f84 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -28,7 +28,7 @@ let
 
       doCheck = true;
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Small, safe and fast formatting library";
         longDescription = ''
           fmt (formerly cppformat) is an open-source formatting library. It can be
diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index 7b2ca83fe5b..955b7e0d16f 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -1,5 +1,5 @@
 { fetchurl
-, stdenv
+, lib, stdenv
 , pkg-config
 , meson
 , ninja
@@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn";
   };
 
   mesonFlags = [
     "-Ddocs=true"
-    "-Dtelepathy_backend=${stdenv.lib.boolToString telepathySupport}"
+    "-Dtelepathy_backend=${lib.boolToString telepathySupport}"
   ];
 
   nativeBuildInputs = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     nspr
     nss
     readline
-  ] ++ stdenv.lib.optional telepathySupport telepathy-glib;
+  ] ++ lib.optional telepathySupport telepathy-glib;
 
   propagatedBuildInputs = [
     glib
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that aggregates people from multiple sources to create metacontacts";
     homepage = "https://wiki.gnome.org/Projects/Folks";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 26680b2d23c..0ad4f2a50c1 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , boost
@@ -52,7 +52,7 @@ stdenv.mkDerivation (rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open-source C++ library developed and used at Facebook";
     homepage = "https://github.com/facebook/folly";
     license = licenses.asl20;
@@ -60,6 +60,6 @@ stdenv.mkDerivation (rec {
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ abbradar pierreis ];
   };
-} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+} // lib.optionalAttrs stdenv.isDarwin {
   LDFLAGS = "-ljemalloc";
 })
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index e08149903a2..daedaefcf9c 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchpatch
 , substituteAll
 , fetchurl
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
     # just <1MB; this is what you get when loading config fails for some reason
     "--with-default-fonts=${dejavu_fonts.minimal}"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
   ];
 
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
     rm -r $bin/share/man/man3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for font customization and configuration";
     homepage = "http://fontconfig.org/";
     license = licenses.bsd2; # custom but very bsd-like
diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix
index aec790dd843..ba85cea73d6 100644
--- a/pkgs/development/libraries/forge/default.nix
+++ b/pkgs/development/libraries/forge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , arrayfire, expat, fontconfig, freeimage, freetype, boost
 , mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit
 }:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     arrayfire
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend";
     longDescription = ''
       An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 5dacf53b259..408518ba79c 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
+{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
 , CoreServices ? null }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   patches = [ ./clang.patch ];
 
   buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]
-    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+    ++ lib.optional stdenv.isDarwin CoreServices;
 
   doCheck = true;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ based class library for building Graphical User Interfaces";
     longDescription = ''
       FOX stands for Free Objects for X.
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 208780a450e..50f9e688cb9 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
+{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
 , libXrandr, libGLU, libGL, libXft, libXfixes, xinput
 , CoreServices }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
     libXft libGLU libGL libXfixes xinput
-  ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+  ] ++ lib.optional stdenv.isDarwin CoreServices;
 
   doCheck = true;
 
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
         Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
       '';
     homepage = "http://fox-toolkit.org";
-    license = stdenv.lib.licenses.lgpl3;
+    license = lib.licenses.lgpl3;
     maintainers = [];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    platforms = lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix
index 05a6a30a6ec..374aec5904d 100644
--- a/pkgs/development/libraries/fplll/20160331.nix
+++ b/pkgs/development/libraries/fplll/20160331.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
+{lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
 , gmp, mpfr
 }:
 stdenv.mkDerivation rec {
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "Lattice algorithms using floating-point arithmetic";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index e15479bafcf..3a82b566a50 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , gettext
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     mpfr
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lattice algorithms using floating-point arithmetic";
     changelog = [
       # Some release notes are added to the github tags, though they are not
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index 76549e728eb..e96aa9394da 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true
-,  stdenv, fetchurl, pkg-config, xorg }:
+,  lib, stdenv, fetchurl, pkg-config, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "frame";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     stdenv pkg-config
-  ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
+  ] ++ lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
 
-  configureFlags = stdenv.lib.optional enableX11 "--with-x11";
+  configureFlags = lib.optional enableX11 "--with-x11";
 
   meta = {
     homepage = "https://launchpad.net/frame";
     description = "Handles the buildup and synchronization of a set of simultaneous touches";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix
index 2c9a893284b..3bb6eaddfa3 100644
--- a/pkgs/development/libraries/freealut/default.nix
+++ b/pkgs/development/libraries/freealut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, openal }:
+{ lib, stdenv, darwin, fetchurl, openal }:
 
 stdenv.mkDerivation rec {
   name = "freealut-1.1.0";
@@ -9,14 +9,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openal
-  ] ++ stdenv.lib.optional stdenv.isDarwin
+  ] ++ lib.optional stdenv.isDarwin
     darwin.apple_sdk.frameworks.OpenAL
   ;
 
   meta = {
     homepage = "http://openal.org/";
     description = "Free implementation of OpenAL's ALUT standard";
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index bb61231d445..83e3eebdcc3 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
+{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
 
 let version = "3.2.1";
 in stdenv.mkDerivation {
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ];
 
-  cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
+  cmakeFlags = lib.optionals stdenv.isDarwin [
                  "-DOPENGL_INCLUDE_DIR=${libGL}/include"
                  "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib"
                  "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib"
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
                  "-DFREEGLUT_BUILD_STATIC:BOOL=OFF"
                ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Create and manage windows containing OpenGL contexts";
     longDescription = ''
       FreeGLUT is an open source alternative to the OpenGL Utility Toolkit
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index df26ac9978d..8e6904a94b2 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config
 , openssl
 , odbcSupport ? true, unixODBC ? null }:
 
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     openssl
-  ] ++ stdenv.lib.optional odbcSupport unixODBC;
+  ] ++ lib.optional odbcSupport unixODBC;
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
     homepage    = "https://www.freetds.org";
     license     = licenses.lgpl2;
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 4e4db4b844e..7b5fff29a28 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , buildPackages
 , pkg-config, which, makeWrapper
 , zlib, bzip2, libpng, gnumake, glib
@@ -10,13 +10,13 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionalString;
+  inherit (lib) optional optionalString;
 
 in stdenv.mkDerivation rec {
   pname = "freetype";
   version = "2.10.4";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A font rendering engine";
     longDescription = ''
       FreeType is a portable and efficient library for rendering fonts. It
diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix
index 8a059041998..c4f99346296 100644
--- a/pkgs/development/libraries/frei0r/default.nix
+++ b/pkgs/development/libraries/frei0r/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }:
+{ lib, stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "frei0r-plugins";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf pkg-config ];
   buildInputs = [ cairo opencv ];
 
-  postInstall = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     for f in $out/lib/frei0r-1/*.so* ; do
       ln -s $f "''${f%.*}.dylib"
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://frei0r.dyne.org";
     description = "Minimalist, cross-platform, shared video plugins";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 0055811e185..27f3b825d10 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPackages
 , fetchurl
 , meson
@@ -25,14 +25,14 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ meson ninja pkg-config ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   doCheck = true;
   checkInputs = [ python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fribidi/fribidi";
     description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix
index 46b579d4abd..c91e8517b07 100644
--- a/pkgs/development/libraries/fstrcmp/default.nix
+++ b/pkgs/development/libraries/fstrcmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }:
+{ lib, stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "fstrcmp";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Make fuzzy comparisons of strings and byte arrays";
     longDescription = ''
       The fstrcmp project provides a library that is used to make fuzzy
diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix
index cd36af184b4..46a7118cefe 100644
--- a/pkgs/development/libraries/fstrm/default.nix
+++ b/pkgs/development/libraries/fstrm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "fstrm";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Frame Streams implementation in C";
     homepage = "https://github.com/farsightsec/fstrm";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index a0ce9db815b..c3fd6ffb940 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
+{ lib, stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
 
 let
   name = "ftgl-2.1.3-rc5";
@@ -18,14 +18,14 @@ stdenv.mkDerivation {
       [ libGL libGLU ])
     ;
 
-  configureFlags = [ "--with-ft-prefix=${stdenv.lib.getDev freetype}" ];
+  configureFlags = [ "--with-ft-prefix=${lib.getDev freetype}" ];
 
   enableParallelBuilding = true;
 
   meta = {
     homepage = "https://sourceforge.net/apps/mediawiki/ftgl/";
     description = "Font rendering library for OpenGL applications";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     longDescription = ''
       FTGL is a free cross-platform Open Source C++ library that uses
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
       and extruded polygon rendering modes.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
     maintainers = [];
   };
 }
diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix
index 064dbb39a2f..377aa45cf5e 100644
--- a/pkgs/development/libraries/funambol/default.nix
+++ b/pkgs/development/libraries/funambol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
+{ lib, stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
 
 stdenv.mkDerivation {
   name = "funambol-client-cpp-9.0.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook unzip ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SyncML client sdk by Funambol project";
     homepage = "http://www.funambol.com";
     license = licenses.agpl3;
diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix
index 84594b8dbeb..888f26f2da7 100644
--- a/pkgs/development/libraries/galario/default.nix
+++ b/pkgs/development/libraries/galario/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchzip
 , fetchFromGitHub
 , cmake
@@ -30,17 +30,17 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ fftw fftwFloat ]
-  ++ stdenv.lib.optional enablePython pythonPackages.python
-  ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp
+  ++ lib.optional enablePython pythonPackages.python
+  ++ lib.optional stdenv.isDarwin llvmPackages.openmp
   ;
 
-  propagatedBuildInputs = stdenv.lib.optional enablePython [
+  propagatedBuildInputs = lib.optional enablePython [
     pythonPackages.numpy
     pythonPackages.cython
     pythonPackages.pytest
   ];
 
-  checkInputs = stdenv.lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ];
+  checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ];
 
   preConfigure = ''
     mkdir -p build/external/src
@@ -55,12 +55,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enablePython) ''
+  postInstall = lib.optionalString (stdenv.isDarwin && enablePython) ''
     install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so
     install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GPU Accelerated Library for Analysing Radio Interferometer Observations";
     longDescription = ''
       Galario is a library that exploits the computing power of modern
diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix
index 5f2fdb8f749..0546bfb8e08 100644
--- a/pkgs/development/libraries/gamenetworkingsockets/default.nix
+++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "GameNetworkingSockets";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ protobuf openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     # build failure is resolved on master, remove at next release
     broken = stdenv.isDarwin;
     description = "GameNetworkingSockets is a basic transport layer for games";
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index eb11bc6d72b..56de42d9dc5 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }:
 
 let
   cross = stdenv.hostPlatform != stdenv.buildPlatform;
@@ -24,15 +24,15 @@ in stdenv.mkDerivation (rec {
 
   patches = [ ./deadlock.patch ]
     ++ map fetchurl (import ./debian-patches.nix)
-    ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+    ++ lib.optional stdenv.cc.isClang ./returnval.patch
+    ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
       name = "fix-pthread-mutex.patch";
       url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
       sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
-    }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ;
+    }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ;
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://people.gnome.org/~veillard/gamin/";
     description = "A file and directory monitoring system";
     maintainers = with maintainers; [ lovek323 ];
@@ -41,7 +41,7 @@ in stdenv.mkDerivation (rec {
   };
 }
 
-// stdenv.lib.optionalAttrs stdenv.isDarwin {
+// lib.optionalAttrs stdenv.isDarwin {
   preBuild =  ''
     sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile
   '';
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index 13056846017..bf6c030589b 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }:
+{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "ganv";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config wafHook ];
   buildInputs = [ graphviz gtk2 gtkmm2 python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interactive Gtk canvas widget for graph-based interfaces";
     homepage = "http://drobilla.net";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix
index 97449d944ec..424e3751f40 100644
--- a/pkgs/development/libraries/garmintools/default.nix
+++ b/pkgs/development/libraries/garmintools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb-compat-0_1 }:
+{ lib, stdenv, fetchurl, libusb-compat-0_1 }:
 stdenv.mkDerivation {
   name = "garmintools-0.10";
   src = fetchurl {
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface";
     homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index ab6a379116d..c1f485e18d9 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "gbenchmark";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A microbenchmark support library";
     homepage = "https://github.com/google/benchmark";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index 9d9e6cd1c15..8f62483d3b7 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , gettext
 , gobject-introspection
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7";
   };
 
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject library to create cabinet files";
     homepage = "https://gitlab.gnome.org/GNOME/gcab";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
index 486a24defd1..b123f799cca 100644
--- a/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ b/pkgs/development/libraries/gcc/libstdc++/5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, flex, bison, file }:
+{ lib, stdenv, fetchurl, fetchpatch, flex, bison, file }:
 
 stdenv.mkDerivation rec {
   pname = "libstdc++5";
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/lib/!(libstdc++*)
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gcc.gnu.org/";
     license = licenses.lgpl3Plus;
     description = "GNU Compiler Collection, version ${version} -- C++ standard library";
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index a2eea019400..8add81e2796 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , meson
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56";
   };
 
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     maintainers = teams.gnome.members;
     description = "GNOME crypto services (daemon and tools)";
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix
index 3b4533890a7..36a93095603 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/pkgs/development/libraries/gd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , autoconf
 , automake
 , pkg-config
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   # -pthread gets passed to clang, causing warnings
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no";
+  configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no";
 
   nativeBuildInputs = [ autoconf automake pkg-config ];
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails 2 tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libgd.github.io/";
     description = "A dynamic image creation library";
     license = licenses.free; # some custom license
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index d3505679e4d..9cb9c448c1d 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
+{ lib, stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
 , postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2
 , netcdfSupport ? true, netcdf, hdf5, curl
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gdal";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
     libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
   ++ (with pythonPackages; [ python numpy wrapPython ])
-  ++ stdenv.lib.optional stdenv.isDarwin libiconv
-  ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
+  ++ lib.optional stdenv.isDarwin libiconv
+  ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
 
   configureFlags = [
     "--with-expat=${expat.dev}"
@@ -97,8 +97,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = "https://www.gdal.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 1295a100232..8c02919126b 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
+{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
 , libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
 , sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
 , autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gdal";
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
     libxml2
     postgresql
   ] ++ (with pythonPackages; [ python numpy wrapPython ])
-    ++ stdenv.lib.optional stdenv.isDarwin libiconv
-    ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
+    ++ lib.optional stdenv.isDarwin libiconv
+    ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
 
   configureFlags = [
     "--with-expat=${expat.dev}"
@@ -87,8 +87,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = "https://www.gdal.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
index 3695407b8f2..92d17452c94 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
+{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
 , postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl
 , libpng }:
 
@@ -59,8 +59,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = "https://www.gdal.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix
index 22034733f5e..21cb79ba815 100644
--- a/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/pkgs/development/libraries/gdata-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, pkg-config, mono, dotnetPackages }:
+{ lib, stdenv, fetchsvn, pkg-config, mono, dotnetPackages }:
 
 let
   newtonsoft-json = dotnetPackages.NewtonsoftJson;
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.google.com/archive/p/google-gdata/";
 
     description = "The Google Data APIs";
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index b04828c92dd..75ce95e0e46 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, vtk_7, darwin
+{ lib, stdenv, fetchurl, cmake, vtk_7, darwin
 , enablePython ? false, python ? null,  swig ? null}:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     "-DGDCM_BUILD_SHARED_LIBS=ON"
     "-DGDCM_USE_VTK=ON"
   ]
-  ++ stdenv.lib.optional enablePython [
+  ++ lib.optional enablePython [
     "-DGDCM_WRAP_PYTHON:BOOL=ON"
     "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}"
   ];
@@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ vtk_7 ]
-    ++ stdenv.lib.optional stdenv.isDarwin [
+    ++ lib.optional stdenv.isDarwin [
       darwin.apple_sdk.frameworks.ApplicationServices
       darwin.apple_sdk.frameworks.Cocoa
-    ] ++ stdenv.lib.optional enablePython [ swig python ];
+    ] ++ lib.optional enablePython [ swig python ];
   propagatedBuildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The grassroots cross-platform DICOM implementation";
     longDescription = ''
       Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly.
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index ad92bf13c4c..2d8e60d06a7 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3";
   };
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     makeWrapper
     glib
-  ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [
     glib
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   postInstall =
     # meson erroneously installs loaders with .dylib extension on Darwin.
     # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       for f in $out/${passthru.moduleDir}/*.dylib; do
           install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
           mv $f ''${f%.dylib}.so
@@ -88,13 +88,13 @@ stdenv.mkDerivation rec {
     + ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
-    '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+    '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
       # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
       $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The fixDarwinDylibNames hook doesn't patch binaries.
-  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  preFixup = lib.optionalString stdenv.isDarwin ''
     for f in $out/bin/* $dev/bin/*; do
         install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
     done
@@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
     moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for image loading and manipulation";
     homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf";
     maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix
index edc5ce52563..bc4c14beb45 100644
--- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , meson
 , ninja
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     "-Dgtk_doc=true"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Deprecated API for integrating GdkPixbuf with Xlib data types";
     homepage = "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix
index 7b3d1d4e831..f924571deae 100644
--- a/pkgs/development/libraries/gdl/default.nix
+++ b/pkgs/development/libraries/gdl/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }:
+{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }:
 
 stdenv.mkDerivation rec {
   pname = "gdl";
   version = "3.34.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gdl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Gnome docking library";
     homepage = "https://developer.gnome.org/gdl/";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix
index ec0621c5a3d..a7dd1f98013 100644
--- a/pkgs/development/libraries/gdome2/default.nix
+++ b/pkgs/development/libraries/gdome2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}:
+{lib, stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}:
 
 let
   pname = "gdome2";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [glib libxml2];
   patches = [ ./xml-document.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://gdome2.cs.unibo.it/";
     description = "DOM C library developed for the Gnome project";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix
index 545bdd12982..5c660a99ef8 100644
--- a/pkgs/development/libraries/gecode/3.nix
+++ b/pkgs/development/libraries/gecode/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, perl }:
+{ lib, stdenv, fetchurl, bash, perl }:
 
 stdenv.mkDerivation rec {
   pname = "gecode";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "patchShebangs configure";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://www.gecode.org";
     description = "Toolkit for developing constraint-based systems";
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index 9d37199bff4..46b13e6e37f 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
+{ lib, stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "gecode";
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ perl gmp mpfr ]
-    ++ stdenv.lib.optional enableGist qtbase;
+    ++ lib.optional enableGist qtbase;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = "https://www.gecode.org";
     description = "Toolkit for developing constraint-based systems";
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index 4852db0dac3..af3c9d84ac7 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , pkg-config
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
   };
 
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     luajit
     openexr
     suitesparse
-  ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL;
+  ] ++ lib.optional stdenv.isDarwin OpenCL;
 
   # for gegl-4.0.pc
   propagatedBuildInputs = [
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
   # tests fail to connect to the com.apple.fonts daemon in sandboxed mode
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graph-based image processing framework";
     homepage = "https://www.gegl.org";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 93adb49d8b7..bd67f3e6b7c 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , babl
@@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-docs" ];
 
   buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
-    ++ stdenv.lib.optional stdenv.isDarwin OpenGL;
+    ++ lib.optional stdenv.isDarwin OpenGL;
 
   nativeBuildInputs = [ pkg-config ];
 
   doCheck = false; # fails 3 out of 19 tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graph-based image processing framework";
     homepage = "https://www.gegl.org";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index b7623d15dd4..1c1d4cfe507 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , pkg-config
 , python3Packages
 , wrapGAppsHook
@@ -18,7 +18,7 @@
 , xorgserver
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "geis";
diff --git a/pkgs/development/libraries/genann/default.nix b/pkgs/development/libraries/genann/default.nix
index 6529d4f363d..f1d7373183a 100644
--- a/pkgs/development/libraries/genann/default.nix
+++ b/pkgs/development/libraries/genann/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "genann";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     cp ./genann.{h,c} $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/codeplea/genann";
     description = "Simple neural network library in ANSI C";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 8e54c6c43b0..711f1a444b3 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
+{ lib, stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
 , modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
 , withDemoAgent ? false
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "geoclue";
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     patchShebangs demo/install-file.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Geolocation framework and some data providers";
     homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
     maintainers = with maintainers; [ raskin ];
diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix
index a13cbdfc159..f401c25aa39 100644
--- a/pkgs/development/libraries/geocode-glib/default.nix
+++ b/pkgs/development/libraries/geocode-glib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }:
+{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }:
 
 stdenv.mkDerivation rec {
   pname = "geocode-glib";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1";
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A convenience library for the geocoding and reverse geocoding using Nominatim service";
     license = licenses.lgpl2Plus;
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index d55983952b8..8747433047c 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
 , drvName ? "geoip"
 
 # in geoipDatabase, you can insert a package defining
@@ -7,7 +7,7 @@
 }:
 
 let
-  dataDir = if stdenv.lib.isDerivation geoipDatabase
+  dataDir = if lib.isDerivation geoipDatabase
     then "${toString geoipDatabase}/share/GeoIP"
     else geoipDatabase;
 in
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   # Cross compilation shenanigans
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An API for GeoIP/Geolocation databases";
     maintainers = with maintainers; [ thoughtpolice raskin ];
     license     = licenses.lgpl21;
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index 60fc4067c0c..63806b31e25 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ lib, stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
   name = "geos-3.8.1";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
 
   # https://trac.osgeo.org/geos/ticket/993
-  configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-inline";
+  configureFlags = lib.optional stdenv.isAarch32 "--disable-inline";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ port of the Java Topology Suite (JTS)";
     homepage = "https://trac.osgeo.org/geos";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index 28bbe61d53d..de76924844f 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool }:
+{ lib, stdenv, fetchurl, libtool }:
 stdenv.mkDerivation rec {
   pname = "getdata";
   version = "0.10.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libtool ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reference implementation of the Dirfile Standards";
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix
index c0268c161ae..edf0ac27ea9 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }:
+{ lib, stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "getdns";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unbound libidn2 openssl doxygen ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modern asynchronous DNS API";
     longDescription = ''
       getdns is an implementation of a modern asynchronous DNS API; the
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 0dcc42dc526..3f8215d19fc 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
      "--disable-csharp" "--with-xz"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # On cross building, gettext supposes that the wchar.h from libc
     # does not fulfill gettext needs, so it tries to work with its
     # own wchar.h file, which does not cope well with the system's
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     xz.bin
   ];
   # HACK, see #10874 (and 14664)
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
+  buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
 
   setupHooks = [
     ../../../build-support/setup-hooks/role.bash
@@ -89,6 +89,6 @@ stdenv.mkDerivation rec {
   };
 }
 
-// stdenv.lib.optionalAttrs stdenv.isDarwin {
+// lib.optionalAttrs stdenv.isDarwin {
   makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ];
 }
diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix
index b9d287ba2eb..220b68fa18b 100644
--- a/pkgs/development/libraries/gexiv2/default.nix
+++ b/pkgs/development/libraries/gexiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
 
 stdenv.mkDerivation rec {
   pname = "gexiv2";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla";
   };
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/gexiv2";
     description = "GObject wrapper around the Exiv2 photo metadata library";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix
index 93286e85d12..e3550b82a96 100644
--- a/pkgs/development/libraries/gfbgraph/default.nix
+++ b/pkgs/development/libraries/gfbgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts
+{ lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts
 , gnome3, libsoup, json-glib, gobject-introspection
 , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }:
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0yck7dwvjk16a52nafjpi0a39rxwmg0w833brj45acz76lgkjrb0";
   };
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GFBGraph";
     description = "GLib/GObject wrapper for the Facebook Graph API";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix
index 51c13f97433..a690d8f2e15 100644
--- a/pkgs/development/libraries/gflags/default.nix
+++ b/pkgs/development/libraries/gflags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ library that implements commandline flags processing";
     longDescription = ''
       The gflags package contains a C++ library that implements commandline flags processing.
diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix
index 6003c5ea33e..025423ecd8a 100644
--- a/pkgs/development/libraries/ggz_base_libs/default.nix
+++ b/pkgs/development/libraries/ggz_base_libs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, openssl, expat, libgcrypt }:
+{ lib, stdenv, fetchurl, intltool, openssl, expat, libgcrypt }:
 
 stdenv.mkDerivation rec {
   version = "0.99.5";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     "--with-tls"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GGZ Gaming zone libraries";
     maintainers = with maintainers;
     [
diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix
index 2cb7a9dfe54..e66f7bfe2a8 100644
--- a/pkgs/development/libraries/giblib/default.nix
+++ b/pkgs/development/libraries/giblib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, imlib2 }:
+{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }:
 
 stdenv.mkDerivation rec {
   name = "giblib-1.2.4";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://linuxbrit.co.uk/giblib/";
     description = "wrapper library for imlib2, and other stuff";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix
index 954e508152c..c0afe067c49 100644
--- a/pkgs/development/libraries/giflib/4.1.nix
+++ b/pkgs/development/libraries/giflib/4.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "giflib-4.1.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for reading and writing gif images";
     branch = "4.1";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
index e2ff96d366a..9eaf7b933d4 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }:
+{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   name = "giflib-5.2.1";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
   };
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isDarwin
+  patches = lib.optional stdenv.hostPlatform.isDarwin
     (fetchpatch {
       # https://sourceforge.net/p/giflib/bugs/133/
       name = "darwin-soname.patch";
@@ -21,15 +21,15 @@ stdenv.mkDerivation rec {
       --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
   '';
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
+  nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
 
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
 
   meta = {
     description = "A library for reading and writing gif images";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     branch = "5.2";
   };
 }
diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix
index 30cfa0db86a..d8c32d14fca 100644
--- a/pkgs/development/libraries/giflib/libungif.nix
+++ b/pkgs/development/libraries/giflib/libungif.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libungif-4.1.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library and utilities for processing GIFs";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix
index f315679c9b7..91fbb86bd66 100644
--- a/pkgs/development/libraries/gio-sharp/default.nix
+++ b/pkgs/development/libraries/gio-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
   pname = "gio-sharp";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ./autogen-2.22.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GIO API bindings";
     homepage = "https://github.com/mono/gio-sharp";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index edbb3d82241..a118a611785 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, python3
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3
 , zlib, libssh2, openssl, pcre, http-parser
 , libiconv, Security
 }:
@@ -23,16 +23,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake python3 pkg-config ];
 
   buildInputs = [ zlib libssh2 openssl pcre http-parser ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+    ++ lib.optional stdenv.isDarwin Security;
 
-  propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
 
   doCheck = false; # hangs. or very expensive?
 
   meta = {
     description = "The Git linkable library";
     homepage = "https://libgit2.github.com/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; all;
+    license = lib.licenses.gpl2;
+    platforms = with lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix
index 1de84afe621..dfd6b6b476b 100644
--- a/pkgs/development/libraries/givaro/3.7.nix
+++ b/pkgs/development/libraries/givaro/3.7.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+{lib, stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
 stdenv.mkDerivation rec {
   pname = "givaro";
   version = "3.7.2";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A C++ library for arithmetic and algebraic computations";
-    license = stdenv.lib.licenses.cecill-b;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.cecill-b;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix
index fc9bb18988f..9d216b9d8e5 100644
--- a/pkgs/development/libraries/givaro/3.nix
+++ b/pkgs/development/libraries/givaro/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+{lib, stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
 stdenv.mkDerivation rec {
   pname = "givaro";
   version = "3.8.0";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A C++ library for arithmetic and algebraic computations";
-    license = stdenv.lib.licenses.cecill-b;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.cecill-b;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 4da5a0cb75c..f6d6ddab4d0 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
+{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
 stdenv.mkDerivation rec {
   pname = "givaro";
   version = "4.1.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-optimization"
-  ] ++ stdenv.lib.optionals stdenv.isx86_64 [
+  ] ++ lib.optionals stdenv.isx86_64 [
     # disable SIMD instructions (which are enabled *when available* by default)
     "--${if stdenv.hostPlatform.sse3Support   then "enable" else "disable"}-sse3"
     "--${if stdenv.hostPlatform.ssse3Support  then "enable" else "disable"}-ssse3"
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A C++ library for arithmetic and algebraic computations";
-    license = stdenv.lib.licenses.cecill-b;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.cecill-b;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 5bcea279819..a6b37c5efcc 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -1,6 +1,6 @@
 { fetchurl
 , fetchpatch
-, stdenv
+, lib, stdenv
 , meson
 , ninja
 , pkg-config
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   version = "1.66.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld";
   };
 
@@ -105,7 +105,7 @@ in stdenv.mkDerivation rec {
   postFixup = ''
     wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \
       --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \
-      --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
+      --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}"
   '';
 
   checkPhase = ''
@@ -127,7 +127,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JavaScript bindings for GNOME";
     homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix
index 172531f9dc7..0203e2fde93 100644
--- a/pkgs/development/libraries/gl2ps/default.nix
+++ b/pkgs/development/libraries/gl2ps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , zlib
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     freeglut
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://geuz.org/gl2ps";
     description = "An OpenGL to PostScript printing library";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix
index 9b67b9695cc..1b36baa24e4 100644
--- a/pkgs/development/libraries/glbinding/default.nix
+++ b/pkgs/development/libraries/glbinding/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
+{ lib, stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "glbinding";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libGLU xlibsWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cginternals/glbinding/";
     description = "A C++ binding for the OpenGL API, generated using the gl.xml specification";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix
index d0667b0f270..b7a4f7f2fef 100644
--- a/pkgs/development/libraries/gle/default.nix
+++ b/pkgs/development/libraries/gle/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
+{lib, stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
 stdenv.mkDerivation {
   name = "gle-3.1.0";
   buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext];
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
   };
   meta = {
     description = "Tubing and extrusion library";
-    license = stdenv.lib.licenses.gpl2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix
index 139b93c039e..29376cb2567 100644
--- a/pkgs/development/libraries/glew/1.10.nix
+++ b/pkgs/development/libraries/glew/1.10.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
+{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
 , AGL, OpenGL
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   name = "glew-1.10.0";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenGL extension loading library for C(++)";
     homepage = "http://glew.sourceforge.net/";
     license = licenses.free; # different files under different licenses
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 3b067e6d0f3..660276530aa 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
+{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
 , OpenGL
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   name = "glew-2.2.0";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenGL extension loading library for C(++)";
     homepage = "http://glew.sourceforge.net/";
     license = licenses.free; # different files under different licenses
diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix
index ca65315e1cb..d05fa6e5f77 100644
--- a/pkgs/development/libraries/glfw/2.x.nix
+++ b/pkgs/development/libraries/glfw/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libGLU, libGL, libX11, libXext }:
+{ lib, stdenv, fetchurl, libGLU, libGL, libX11, libXext }:
 
 stdenv.mkDerivation rec {
   name = "glfw-2.7.9";
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
     ln -s libglfw.so.2 $out/lib/libglfw.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = "http://glfw.sourceforge.net/";
     license = licenses.zlib;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    maintainers = [ lib.maintainers.marcweber ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 62c1c596d2c..8698b71567e 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     substituteInPlace src/glx_context.c --replace "libGL.so.1" "${lib.getLib libGL}/lib/libGL.so.1"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = "https://www.glfw.org/";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 31e066e8a25..58589734166 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , substituteAll
 , meson
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5";
   };
 
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Network-related giomodules for glib";
     homepage = "https://gitlab.gnome.org/GNOME/glib-networking";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix
index b04cbfe36d0..bdbced24a10 100644
--- a/pkgs/development/libraries/glib-testing/default.nix
+++ b/pkgs/development/libraries/glib-testing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , meson
 , ninja
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib";
     homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index da1eb076536..a67ea503776 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3
+{ config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3
 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
 , util-linuxMinimal ? null
@@ -11,7 +11,7 @@
 , darwin, fetchpatch
 }:
 
-with stdenv.lib;
+with lib;
 
 assert stdenv.isLinux -> util-linuxMinimal != null;
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   version = "2.66.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ=";
   };
 
@@ -182,7 +182,7 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "glib"; };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library of programming buildings blocks";
     homepage    = "https://www.gtk.org/";
     license     = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 150681ebda1..9043c8fd0d4 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage
+{ lib, stdenv, callPackage
 , withLinuxHeaders ? true
 , profilingLibraries ? false
 , withGd ? false
@@ -14,7 +14,7 @@ let
 in
 
 callPackage ./common.nix { inherit stdenv; } {
-    name = "glibc" + stdenv.lib.optionalString withGd "-gd";
+    name = "glibc" + lib.optionalString withGd "-gd";
 
     inherit withLinuxHeaders profilingLibraries withGd;
 
@@ -46,15 +46,15 @@ callPackage ./common.nix { inherit stdenv; } {
     hardeningDisable = [ "stackprotector" "fortify" ]
     # XXX: Not actually musl-speciic but since only musl enables pie by default,
     #      limit rebuilds by only disabling pie w/musl
-      ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";
+      ++ lib.optional stdenv.hostPlatform.isMusl "pie";
 
-    NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " "
+    NIX_CFLAGS_COMPILE = lib.concatStringsSep " "
       (builtins.concatLists [
-        (stdenv.lib.optionals withGd gdCflags)
+        (lib.optionals withGd gdCflags)
         # Fix -Werror build failure when building glibc with musl with GCC >= 8, see:
         # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
-        (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
-        (stdenv.lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [
+        (lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
+        (lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [
           # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'"
           # New warning as of GCC 9
           # Same for musl: https://github.com/NixOS/nixpkgs/issues/78805
@@ -81,14 +81,14 @@ callPackage ./common.nix { inherit stdenv; } {
     postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then ''
       echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED
       make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales
-    '' else stdenv.lib.optionalString stdenv.buildPlatform.isLinux ''
+    '' else lib.optionalString stdenv.buildPlatform.isLinux ''
       # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html
       # Instead of using their patch to build a build-native localedef,
       # we simply use the one from buildPackages
       pushd ../glibc-2*/localedata
       export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata
       mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale
-      ${stdenv.lib.getBin buildPackages.glibc}/bin/localedef \
+      ${lib.getBin buildPackages.glibc}/bin/localedef \
         --alias-file=../intl/locale.alias \
         -i locales/C \
         -f charmaps/UTF-8 \
@@ -122,7 +122,7 @@ callPackage ./common.nix { inherit stdenv; } {
     ''
       # For some reason these aren't stripped otherwise and retain reference
       # to bootstrap-tools; on cross-arm this stripping would break objects.
-    + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+    + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
 
       for i in "$out"/lib/*.a; do
           [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i"
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index 0dc19197415..238cebf6209 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -6,7 +6,7 @@
    https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED
 */
 
-{ stdenv, buildPackages, callPackage, writeText
+{ lib, stdenv, buildPackages, callPackage, writeText
 , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ]
 }:
 
@@ -31,9 +31,9 @@ callPackage ./common.nix { inherit stdenv; } {
       # Hack to allow building of the locales (needed since glibc-2.12)
       sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile
     ''
-      + stdenv.lib.optionalString (!allLocales) ''
+      + lib.optionalString (!allLocales) ''
       # Check that all locales to be built are supported
-      echo -n '${stdenv.lib.concatMapStrings (s: s + " \\\n") locales}' \
+      echo -n '${lib.concatMapStrings (s: s + " \\\n") locales}' \
         | sort > locales-to-build.txt
       cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \
         | sort > locales-supported.txt
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index c737ee9ec45..19567a98721 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }:
+{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "glibmm";
   version = "2.64.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     glib # for glib-compile-schemas
   ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     Cocoa
   ]);
   propagatedBuildInputs = [ glib libsigcxx ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ interface to the GLib library";
 
     homepage = "https://gtkmm.org/";
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index cb0ae47acde..f5652a61c1d 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, cmake }:
+{ lib, stdenv, fetchurl, fetchzip, cmake }:
 
 stdenv.mkDerivation rec {
   version = "0.9.8.5";
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
     cp ${gcc7PlatformPatch} glm/simd/platform.h
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0";
 
   postInstall = ''
     mkdir -p $doc/share/doc/glm
     cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenGL Mathematics library for C++";
     longDescription = ''
       OpenGL Mathematics (GLM) is a header only C++ mathematics library for
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     homepage = "http://glm.g-truc.net/";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
 
diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix
index 5f700f73515..049e262bb17 100644
--- a/pkgs/development/libraries/globalarrays/default.nix
+++ b/pkgs/development/libraries/globalarrays/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook
 , blas, gfortran, openssh, openmpi
 } :
 
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Global Arrays Programming Models";
     homepage = "http://hpc.pnl.gov/globalarrays/";
     maintainers = [ maintainers.markuskowa ];
diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix
index 6f53cda536a..a8dfa430f59 100644
--- a/pkgs/development/libraries/globalplatform/default.nix
+++ b/pkgs/development/libraries/globalplatform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }:
+{ lib, stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }:
 
 stdenv.mkDerivation rec {
   pname = "globalplatform";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib openssl_1_0_2 pcsclite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
     description = "Library for interacting with smart card devices";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
index 33a6954d695..a3ea4305bea 100644
--- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }:
+{ lib, stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }:
 
 stdenv.mkDerivation rec {
   pname = "gppcscconnectionplugin";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ globalplatform openssl_1_0_2 pcsclite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
     description = "GlobalPlatform pcsc connection plugin";
     license = [ licenses.lgpl3 licenses.gpl3 ];
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index aa846e41d55..4bb20ebfd93 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm"
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/glog";
     license = licenses.bsd3;
     description = "Library for application-level logging";
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index ef731b3c35a..b01d858cfb9 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , zlibSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , idnSupport ? true, libidn ? null
@@ -8,7 +8,7 @@ assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 assert idnSupport -> libidn != null;
 
-with stdenv.lib;
+with lib;
 
 let
   version = "1.0.24";
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index d771f7df789..a46c84844e8 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , libmysqlclient
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ libmysqlclient
-    ] ++ stdenv.lib.optionals withGmp [
+    ] ++ lib.optionals withGmp [
       gmp
     ];
 
-  configureFlags = stdenv.lib.optionals withGmp [
+  configureFlags = lib.optionals withGmp [
     "--with-gmp"
   ];
 
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GNU Linear Programming Kit";
 
     longDescription =
diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix
index d84a9227c3b..5eead23b825 100644
--- a/pkgs/development/libraries/glui/default.nix
+++ b/pkgs/development/libraries/glui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , freeglut
 , libGL
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     cp LICENSE.txt "$out/share/glui/doc"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''A user interface library using OpenGL'';
     license = licenses.zlib ;
     maintainers = [ maintainers.raskin ];
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index 05bb4018229..0e10d12ed1f 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
+{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   version = "2.6.23";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jstedfast/gmime/";
     description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 01ddde2ca89..a8e39047256 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection
+{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection
 , vala }:
 
 stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jstedfast/gmime/";
     description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 278059465ec..3c145b3c1e3 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "gmm";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic C++ template library for sparse, dense and skyline matrices";
     homepage = "http://getfem.org/gmm.html";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix
index 29310aa9f00..ce870581f5e 100644
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/pkgs/development/libraries/gmp/4.3.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, cxx ? true }:
+{ lib, stdenv, fetchurl, m4, cxx ? true }:
 
 let self = stdenv.mkDerivation rec {
   name = "gmp-4.3.2";
@@ -28,8 +28,8 @@ let self = stdenv.mkDerivation rec {
     else ''echo "Darwin host is `./config.guess`."'';
 
   configureFlags = [
-    (stdenv.lib.enableFeature cxx "cxx")
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    (lib.enableFeature cxx "cxx")
+  ] ++ lib.optionals stdenv.isDarwin [
     "ac_cv_build=x86_64-apple-darwin13.4.0"
     "ac_cv_host=x86_64-apple-darwin13.4.0"
   ];
@@ -65,10 +65,10 @@ let self = stdenv.mkDerivation rec {
       '';
 
     homepage = "https://gmplib.org/";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     badPlatforms = [ "x86_64-darwin" ];
   };
 };
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index a514934e964..73061a3d2ef 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, m4
+{ lib, stdenv, fetchurl, m4
 , cxx ? true
 , withStatic ? stdenv.hostPlatform.isStatic
 }:
 
-let inherit (stdenv.lib) optional; in
+let inherit (lib) optional; in
 
 let self = stdenv.mkDerivation rec {
   name = "gmp-5.1.3";
@@ -25,13 +25,13 @@ let self = stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-pic"
-    (stdenv.lib.enableFeature cxx "cxx")
+    (lib.enableFeature cxx "cxx")
     # Build a "fat binary", with routines for several sub-architectures
     # (x86), except on Solaris where some tests crash with "Memory fault".
     # See <https://hydra.nixos.org/build/2760931>, for instance.
     #
     # no darwin because gmp uses ASM that clang doesn't like
-    (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
+    (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
     # The config.guess in GMP tries to runtime-detect various
     # ARM optimization flags via /proc/cpuinfo (and is also
     # broken on multicore CPUs). Avoid this impurity.
@@ -46,7 +46,7 @@ let self = stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gmplib.org/";
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 522976d3ab2..bf03bf08779 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4
+{ lib, stdenv, fetchurl, m4
 , cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm
 , buildPackages
 , withStatic ? stdenv.hostPlatform.isStatic
@@ -9,7 +9,7 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-let inherit (stdenv.lib) optional; in
+let inherit (lib) optional; in
 
 let self = stdenv.mkDerivation rec {
   name = "gmp-6.2.1";
@@ -30,13 +30,13 @@ let self = stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-pic"
-    (stdenv.lib.enableFeature cxx "cxx")
+    (lib.enableFeature cxx "cxx")
     # Build a "fat binary", with routines for several sub-architectures
     # (x86), except on Solaris where some tests crash with "Memory fault".
     # See <https://hydra.nixos.org/build/2760931>, for instance.
     #
     # no darwin because gmp uses ASM that clang doesn't like
-    (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
+    (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
     # The config.guess in GMP tries to runtime-detect various
     # ARM optimization flags via /proc/cpuinfo (and is also
     # broken on multicore CPUs). Avoid this impurity.
@@ -54,7 +54,7 @@ let self = stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gmplib.org/";
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix
index 81e33c39a7d..6f2906a8234 100644
--- a/pkgs/development/libraries/gmtk/default.nix
+++ b/pkgs/development/libraries/gmtk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3
+{lib, stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3
 , libpulseaudio, mplayer, gnome_mplayer }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common functions for gnome-mplayer and gecko-mediaplayer";
     homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix
index 91522e3f126..8f35407f9dd 100644
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/pkgs/development/libraries/gnet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }:
+{lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }:
 
 stdenv.mkDerivation {
   name = "gnet-2.0.8";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A network library, written in C, object-oriented, and built upon GLib";
     homepage = "https://developer.gnome.org/gnet/";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix
index 3d4d8be3f1a..c8e77148c6d 100644
--- a/pkgs/development/libraries/gnome-menus/default.nix
+++ b/pkgs/development/libraries/gnome-menus/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-menus";
   version = "3.36.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r";
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.gnome.org/GNOME/gnome-menus";
     description = "Library that implements freedesktops's Desktop Menu Specification in GNOME";
     license = with licenses; [ gpl2 lgpl2 ];
diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index 342cfcbc4da..c5846b523cd 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , pkg-config
 , vala
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts";
     description = "Single sign-on framework for GNOME";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix
index efd95d0f973..4aa510f3606 100644
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/pkgs/development/libraries/gnome-sharp/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.mono-project.com/docs/gui/gtksharp/";
     description = "A .NET language binding for assorted GNOME libraries";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix
index 41a0cb297c4..a2206c19b1b 100644
--- a/pkgs/development/libraries/gnome-video-effects/default.nix
+++ b/pkgs/development/libraries/gnome-video-effects/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , meson
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "0.5.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd";
   };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of GStreamer effects to be used in different GNOME Modules";
     homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix
index 5acab2a70e0..74b94e68f56 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/pkgs/development/libraries/gnu-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
     cp ${configSub} $out/config.sub
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Attempt to guess a canonical system name";
     homepage = "https://savannah.gnu.org/projects/config";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 402c3585d53..ef8ef7648eb 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPackages, fetchurl, fetchpatch, pciutils }:
+{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pciutils }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gnu-efi";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNU EFI development toolchain";
     homepage = "https://sourceforge.net/projects/gnu-efi/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 97b3ea9a8f1..ae65f5aed28 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , glib
 , flex
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x";
   };
 
@@ -46,12 +46,12 @@ stdenv.mkDerivation rec {
       src = ./absolute_shlib_path.patch;
       inherit nixStoreDir;
     })
-  ] ++ stdenv.lib.optionals x11Support [
+  ] ++ lib.optionals x11Support [
     # Hardcode the cairo shared library path in the Cairo gir shipped with this package.
     # https://github.com/NixOS/nixpkgs/issues/34080
     (substituteAll {
       src = ./absolute_gir_path.patch;
-      cairoLib = "${stdenv.lib.getLib cairo}/lib";
+      cairoLib = "${lib.getLib cairo}/lib";
     })
   ];
 
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  checkInputs = stdenv.lib.optionals stdenv.isDarwin [
+  checkInputs = lib.optionals stdenv.isDarwin [
     cctools # for otool
   ];
 
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage = "https://gi.readthedocs.io/";
     maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 ]);
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index d9cffbc228e..d544dd7625d 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, intltool, glib, gtk3, lasem
+{ fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
   };
 
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
       documents, undo/redo.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix
index 2be144fc4c6..4b5effefa57 100644
--- a/pkgs/development/libraries/gom/default.nix
+++ b/pkgs/development/libraries/gom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "py" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38";
   };
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GObject to SQLite object mapper";
     homepage = "https://wiki.gnome.org/Projects/Gom";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index ae583f5ac8b..c4df9f1f0fd 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
 
 let
   version = "2.0.4";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Canvas widget for GTK based on the the Cairo 2D library";
     homepage = "https://wiki.gnome.org/Projects/GooCanvas";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix
index 825e0cbe194..c9fd5b26342 100644
--- a/pkgs/development/libraries/goocanvas/default.nix
+++ b/pkgs/development/libraries/goocanvas/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }:
+{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "goocanvas";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw";
   };
 
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Canvas widget for GTK based on the the Cairo 2D library";
     homepage = "https://wiki.gnome.org/Projects/GooCanvas";
     license = licenses.lgpl2;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix
index e68094f9d52..632e434631c 100644
--- a/pkgs/development/libraries/goocanvasmm/default.nix
+++ b/pkgs/development/libraries/goocanvasmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "goocanvasmm";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0";
   };
   nativeBuildInputs = [ pkg-config ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ bindings for GooCanvas";
     homepage = "https://wiki.gnome.org/Projects/GooCanvas";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix
index a3a549a6324..fdf42543281 100644
--- a/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/pkgs/development/libraries/google-cloud-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
+{ lib, stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
 let
   googleapis = fetchFromGitHub {
     owner = "googleapis";
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS:BOOL=ON"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = with licenses; [ asl20 ];
     homepage = "https://github.com/googleapis/google-cloud-cpp";
     description = "C++ Idiomatic Clients for Google Cloud Platform services";
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 4b96b493cf5..5b24955af43 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gnupg.org/software/gpgme/index.html";
     changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-${version}";
     description = "Library for making GnuPG easier to use";
diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix
index bd1c8434949..b11ec3a9f5c 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/pkgs/development/libraries/grail/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true,
-  stdenv, fetchurl, pkg-config, xorg, python3, frame }:
+  lib, stdenv, fetchurl, pkg-config, xorg, python3, frame }:
 
 stdenv.mkDerivation rec {
   pname = "grail";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ python3 frame ]
-  ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
+  ++ lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
 
-  configureFlags = stdenv.lib.optional enableX11 "--with-x11";
+  configureFlags = lib.optional enableX11 "--with-x11";
 
   meta = {
     homepage = "https://launchpad.net/canonical-multitouch/grail";
     description = "Gesture Recognition And Instantiation Library";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 627a345efad..869430538e8 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, cmake }:
+{ lib, stdenv, fetchurl, qt4, cmake }:
 
 stdenv.mkDerivation rec {
   name = "grantlee-0.5.1";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       and the design of Django is reused in Grantlee.'';
 
     homepage = "http://gitorious.org/grantlee";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
index c60b0914492..726666ec06f 100644
--- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix
+++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "graphene-hardened-malloc";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/GrapheneOS/hardened_malloc";
     description = "Hardened allocator designed for modern systems";
     longDescription = ''
diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix
index f72b354f161..57cad449765 100644
--- a/pkgs/development/libraries/graphene/default.nix
+++ b/pkgs/development/libraries/graphene/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A thin layer of graphic data types";
     homepage = "https://ebassi.github.com/graphene";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 0a057ba4aa1..182f05a8ca8 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv,
+{ fetchurl, fetchpatch, lib, stdenv,
   cmake, netcdf, gfortran, libpng, openjpeg,
   enablePython ? false, pythonPackages }:
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ netcdf
                   libpng
                   openjpeg
-                ] ++ stdenv.lib.optionals enablePython [
+                ] ++ lib.optionals enablePython [
                   pythonPackages.python
                 ];
 
-  propagatedBuildInputs = stdenv.lib.optionals enablePython [
+  propagatedBuildInputs = lib.optionals enablePython [
                   pythonPackages.numpy
                 ];
 
@@ -46,14 +46,14 @@ stdenv.mkDerivation rec {
   # Only do tests that don't require downloading 120MB of testdata
   # We fix the darwin checkPhase, which searches for libgrib_api.dylib
   # in /nix/store by setting DYLD_LIBRARY_PATH
-  checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) ''
+  checkPhase = lib.optionalString (stdenv.isDarwin) ''
     substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
   '' + ''
     ctest -R "t_definitions|t_calendar|t_unit_tests" -VV
   '';
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
     license = licenses.asl20;
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 07bad7745d6..b80e6256e46 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , substituteAll
 , meson
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   version = "0.3.12";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6";
   };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     # * chromaprint (gst-plugins-bad)
     (substituteAll {
       src = ./chromaprint-gst-plugins.patch;
-      load_plugins = stdenv.lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [
+      load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [
         gstreamer
         gst-plugins-base
         gst-plugins-bad
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Grilo";
     description = "A collection of plugins for the Grilo framework";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix
index 7a3667af880..fbab49273e8 100644
--- a/pkgs/development/libraries/grilo/default.nix
+++ b/pkgs/development/libraries/grilo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
 , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }:
 
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i";
   };
 
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Grilo";
     description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index e24967eb30f..92cf619ab5b 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf
 , gflags, abseil-cpp, libnsl
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ];
+    ++ lib.optionals stdenv.isLinux [ libnsl ];
 
   cmakeFlags =
     [ "-DgRPC_ZLIB_PROVIDER=package"
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";
 
   enableParallelBuilds = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
     license = licenses.asl20;
     maintainers = [ maintainers.lnl7 maintainers.marsam ];
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 4e22c38e9c8..48ee0ddd4a5 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libidn, kerberos }:
+{ fetchurl, lib, stdenv, libidn, kerberos }:
 
 stdenv.mkDerivation rec {
   name = "gsasl-1.8.0";
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
        '';
 
     homepage = "https://www.gnu.org/software/gsasl/";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ shlevy ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with lib.maintainers; [ shlevy ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index 3c6b2688b77..318d07dfacc 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , glib
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p";
   };
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of GSettings schemas for settings shared by various components of a desktop";
     license = licenses.lgpl21Plus;
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
index 9bb6bd17f40..21b63875db6 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config
+{ lib, stdenv, fetchFromGitLab, pkg-config
 , qmake, qtbase, qtdeclarative, wrapQtAppsHook
 , glib, gobject-introspection
 , genericUpdater, common-updater-scripts
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to access GSettings from Qt";
     homepage = "https://gitlab.com/ubports/core/gsettings-qt";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
index dda751acfb1..92123dbc3ea 100644
--- a/pkgs/development/libraries/gsignond/default.nix
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking
 , sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl
 , docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper
 , symlinkJoin, gsignondPlugins, plugins }:
@@ -50,7 +50,7 @@ unwrapped = stdenv.mkDerivation rec {
     ./plugin-load-env.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus service which performs user authentication on behalf of its clients";
     homepage = "https://gitlab.com/accounts-sso/gsignond";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index 72d1a8e90ff..a05069f205f 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
 
 stdenv.mkDerivation {
   pname = "gsignond-plugin-lastfm";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
index 240d47f6dd2..8bce32f976a 100644
--- a/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }:
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "gsignond-plugin-mail";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
index b1d673eea95..3bf3ab19464 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check
 , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
 , docbook_xsl, glibcLocales, gobject-introspection }:
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
 
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
index 8fc63383831..b73559f8a53 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check
 , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
 
 stdenv.mkDerivation {
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 4a9208cff32..04c8bcbbbec 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "gsl-2.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";
 
   # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
   doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The GNU Scientific Library, a large numerical library";
     homepage = "https://www.gnu.org/software/gsl/";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     longDescription = ''
       The GNU Scientific Library (GSL) is a numerical library for C
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
       fitting.  There are over 1000 functions in total with an
       extensive test suite.
     '';
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix
index 9a31563c6cc..d2665187575 100644
--- a/pkgs/development/libraries/gsl/gsl-1_16.nix
+++ b/pkgs/development/libraries/gsl/gsl-1_16.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv }:
+{ fetchurl, fetchpatch, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "gsl-1.16";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";
 
   patches = [
     (fetchpatch {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The GNU Scientific Library, a large numerical library";
     homepage = "https://www.gnu.org/software/gsl/";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     longDescription = ''
       The GNU Scientific Library (GSL) is a numerical library for C
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       fitting.  There are over 1000 functions in total with an
       extensive test suite.
     '';
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
     # Failing "eigen" tests on aarch64.
     badPlatforms = [ "aarch64-linux" ];
   };
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 7214aa6f6b9..13088dda0c9 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , # Compile statically (support for packages that look for the static object)
   staticSupport ? stdenv.hostPlatform.isStatic
 }:
 
 let
   inherit (stdenv) isDarwin;
-  inherit (stdenv.lib) optional optionalString;
+  inherit (lib) optional optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   parallelBuild = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lossy speech compression codec";
     homepage    = "http://www.quut.com/gsm/";
     license     = licenses.bsd2;
diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/development/libraries/gsmlib/default.nix
index 88bec83e624..ec6646d98f5 100644
--- a/pkgs/development/libraries/gsmlib/default.nix
+++ b/pkgs/development/libraries/gsmlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 stdenv.mkDerivation rec {
   pname = "gsmlib";
   version = "unstable-2017-10-06";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "16v8aj914ac1ipf14a867ljib3gy7fhzd9ypxnsg9l0zi8mm3ml5";
   };
   nativeBuildInputs = [ autoreconfHook ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to access GSM mobile phones through GSM modems";
     homepage = "https://github.com/x-logLT/gsmlib";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index 2614c50cca7..08b8146ac0a 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }:
+{ lib, stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }:
 
 let
   majorVersion = "2.8";
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
       --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C/C++ toolkit for SOAP web services and XML-based applications";
     homepage = "http://www.cs.fsu.edu/~engelen/soap.html";
     # gsoap is dual/triple licensed (see homepage for details):
diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix
index 9fc099fd3dd..2a3e846d38d 100644
--- a/pkgs/development/libraries/gsound/default.nix
+++ b/pkgs/development/libraries/gsound/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gsound";
   version = "1.0.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GSound";
     description = "Small library for playing system sounds";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index a240db6c04d..890fcb98118 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , libxml2
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw";
   };
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A spell-checking library for GTK applications";
     homepage = "https://wiki.gnome.org/Projects/gspell";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 363e7ba7d10..ec4e54c339b 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , withShishi ? !stdenv.isDarwin, shishi ? null
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
   };
 
-  buildInputs = stdenv.lib.optional withShishi shishi;
+  buildInputs = lib.optional withShishi shishi;
 
   configureFlags = [
     "--${if withShishi != null then "enable" else "disable"}-kereberos5"
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Fixup .la files
-  postInstall = stdenv.lib.optionalString withShishi ''
+  postInstall = lib.optionalString withShishi ''
     sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/gss/";
     description = "Generic Security Service";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 0ab377c2e29..440caba2547 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "bin" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1s57i8a8wnnxnsfl27cq4503dkdlzbrhry5zpg23sfqfffvdqqx2";
   };
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";
     homepage = "http://www.gupnp.org/";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 58b33f6c2f9..313a063cae8 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , meson
@@ -86,7 +86,7 @@
 assert faacSupport -> faac != null;
 
 let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "gst-plugins-bad";
   version = "1.18.2";
@@ -293,7 +293,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = false; # fails 20 out of 58 tests, expensive
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GStreamer Bad Plugins";
     homepage = "https://gstreamer.freedesktop.org";
     longDescription = ''
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index 1665c7f8a13..dc53a76bbca 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Integration testing infrastructure for the GStreamer framework";
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 4ccb2e2c286..ebd5f83dd15 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
       scripts/extract-release-date-from-doap-file.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for creation of audio/video non-linear editors";
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 4bbdfdad69d..a032f5f5b5a 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , nasm
@@ -47,7 +47,7 @@ assert gtkSupport -> gtk3 != null;
 assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64);
 
 let
-  inherit (stdenv.lib) optionals;
+  inherit (lib) optionals;
 in
 stdenv.mkDerivation rec {
   pname = "gst-plugins-good";
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
   # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GStreamer Good Plugins";
     homepage = "https://gstreamer.freedesktop.org";
     longDescription = ''
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index 51d0fcc8efd..2c683a84da4 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }:
 stdenv.mkDerivation rec {
   pname = "gstreamermm";
   version = "1.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ interface for GStreamer";
     homepage = "https://gstreamer.freedesktop.org/bindings/cplusplus.html";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 16de3a6e65f..bcecd11ce2d 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       scripts/extract-release-date-from-doap-file.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GStreamer RTSP server";
     homepage = "https://gstreamer.freedesktop.org";
     longDescription = ''
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index e758568b2bb..a90d21c28e8 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       scripts/extract-release-date-from-doap-file.py
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of VAAPI GStreamer Plug-ins";
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix
index 7b25d6dd725..1dbcd37cf4b 100644
--- a/pkgs/development/libraries/gtdialog/default.nix
+++ b/pkgs/development/libraries/gtdialog/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}:
+{lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}:
 let
   s = # Generated upstream information
   rec {
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''Cross-platform helper for creating interactive dialogs'';
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "http://foicica.com/gtdialog";
     downloadPage = "http://foicica.com/gtdialog/download";
   };
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 4e8ce95737d..d15ce77213c 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }:
+{ lib, stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "gtest";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google's framework for writing C++ tests";
     homepage = "https://github.com/google/googletest";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix
index 2da9847f3cb..990e151efe4 100644
--- a/pkgs/development/libraries/gthree/default.nix
+++ b/pkgs/development/libraries/gthree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , ninja
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     "-Dexamples=false"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject/GTK port of three.js";
     homepage = "https://github.com/alexlarsson/gthree";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
index e595f6bf02d..84920060c5e 100644
--- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
+++ b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, intltool, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
 
 stdenv.mkDerivation {
   name = "gtk-engine-bluecurve-1.0";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Original Bluecurve engine from Red Hat's artwork package";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.gnidorah ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.gnidorah ];
   };
 }
diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix
index f5ae9c0552d..8d40499fb62 100644
--- a/pkgs/development/libraries/gtk-engine-murrine/default.nix
+++ b/pkgs/development/libraries/gtk-engine-murrine/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, intltool, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-engine-murrine";
   version = "0.98.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
   };
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A very flexible theme engine";
     homepage = "https://gitlab.gnome.org/Archive/murrine";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix
index 077bb53443a..115547a72f7 100644
--- a/pkgs/development/libraries/gtk-engines/default.nix
+++ b/pkgs/development/libraries/gtk-engines/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, intltool, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
 
 stdenv.mkDerivation {
   name = "gtk-engines-2.20.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Theme engines for GTK 2";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix
index 1aef590bb92..56693d24c7a 100644
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , meson
 , ninja
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     "-Ddocs=true"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ eonpatapon ];
diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix
index d6df10db176..f244a97edf2 100644
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }:
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-mac-integration";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     gtkdocize
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides integration for GTK applications into the Mac desktop";
     license = licenses.lgpl21;
     homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Integration";
diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix
index 9daf3bb91e5..69ef71f1506 100644
--- a/pkgs/development/libraries/gtk-sharp-beans/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-sharp-beans";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Binds some API from GTK that isn't in GTK# 2.12.x";
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 5afcb2d285a..1e7c8653065 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     gtk = gtk2;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graphical User Interface Toolkit for mono and .Net";
     homepage = "https://www.mono-project.com/docs/gui/gtksharp";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix
index 576ad670bdb..491656a0c68 100644
--- a/pkgs/development/libraries/gtk-sharp/3.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/3.0.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , pkg-config
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34";
   };
 
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index bd1b15b59e2..43b7ff5f127 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
+{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
 , gdk-pixbuf, xlibsWrapper, gobject-introspection
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
@@ -10,7 +10,7 @@
 assert xineramaSupport -> xorg.libXinerama != null;
 assert cupsSupport -> cups != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gtk+";
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index d802ee7e44f..21a87de4a16 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , pkg-config
@@ -48,7 +48,7 @@
 
 assert cupsSupport -> cups != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "gtk+3";
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
     sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc";
   };
 
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index 89c674f09d5..ccaceabd4e9 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
+{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
 , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
 
 let
@@ -129,7 +129,7 @@ in stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D binding and OO wrapper for GTK";
     homepage = "https://gtkd.org";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix
index 8246d80a10f..d7cca43841e 100644
--- a/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/pkgs/development/libraries/gtkdatabox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "gtkdatabox-0.9.3.1";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GTK widget for displaying large amounts of numerical data";
 
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix
index 65b6fd1b43d..438f7feab6c 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/pkgs/development/libraries/gtkimageview/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, gtk2 }:
+{ fetchurl, lib, stdenv, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "gtkimageview-1.6.4";
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
          interpolation; GIF animation support.
        '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix
index d5a10171bdf..b5399553f96 100644
--- a/pkgs/development/libraries/gtkmathview/default.nix
+++ b/pkgs/development/libraries/gtkmathview/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }:
+{lib, stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }:
 
 let
   pname = "gtkmathview";
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://helm.cs.unibo.it/mml-widget/";
     description = "C++ rendering engine for MathML documents";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.roconnor ];
     broken = true;
   };
 }
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 0e04cb710dc..521f4ca15f3 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }:
 
 stdenv.mkDerivation rec {
   name = "gtkmm-${minVer}.5";
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
 
     homepage = "https://gtkmm.org/";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ raskin vcunat ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [ raskin vcunat ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 523cb5c59d8..4a31acd2ff6 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gtkmm";
   version = "3.24.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd";
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ interface to the GTK graphical user interface library";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 870637202c4..84a20154b13 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala
+{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala
 , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.24.11";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9";
   };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       make check
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
     platforms = with platforms; linux ++ darwin;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 0254c096c14..2d469c191e0 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
+{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
 , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
 , meson, ninja }:
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "4.8.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880";
   };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
     platforms = with platforms; linux ++ darwin;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix
index d05e1ebf83e..5e80f91abc1 100644
--- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix
+++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gtksourceviewmm";
   version = "3.91.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "088p2ch1b4fvzl9416nw3waj0pqgp31cd5zj4lx5hzzrq2afgapy";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     homepage = "https://developer.gnome.org/gtksourceviewmm/";
     description = "C++ wrapper for gtksourceview";
diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix
index 675ced4ee49..7ee6b656ead 100644
--- a/pkgs/development/libraries/gtksourceviewmm/default.nix
+++ b/pkgs/development/libraries/gtksourceviewmm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gtksourceviewmm";
   version = "3.21.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceviewmm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glibmm gtkmm3 gtksourceview3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     homepage = "https://developer.gnome.org/gtksourceviewmm/";
     description = "C++ wrapper for gtksourceview";
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 721db5983d7..d3a1a178856 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}:
+{lib, stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}:
 
 stdenv.mkDerivation rec {
   pname = "gtkspell";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "--enable-vala"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://gtkspell.sourceforge.net/";
     description = "Word-processor-style highlighting GtkTextView widget";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix
index a1305a435b2..78d9956d30a 100644
--- a/pkgs/development/libraries/gtkspell/default.nix
+++ b/pkgs/development/libraries/gtkspell/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}:
+{lib, stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}:
 
 stdenv.mkDerivation {
   name = "gtkspell-2.0.16";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [aspell gtk2 enchant intltool];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Word-processor-style highlighting and replacement of misspelled words";
     homepage = "http://gtkspell.sourceforge.net";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
index 47edb03985d..31380b5ab79 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , pkg-config
 , gtk3, glib, glibmm, gtkmm3, gtkspell3
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     gtk3 glib glibmm gtkmm3
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ binding for the gtkspell library";
     homepage = "http://gtkspell.sourceforge.net/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix
index 3738baa21ae..3204811ec6b 100644
--- a/pkgs/development/libraries/gts/default.nix
+++ b/pkgs/development/libraries/gts/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }:
+{ fetchurl, lib, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }:
 
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails with "permission denied"
 
-  preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     pushd src
     make CC=${buildPackages.stdenv.cc}/bin/cc predicates_init
     mv predicates_init predicates_init_build
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://gts.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     description = "GNU Triangulated Surface Library";
 
     longDescription = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       3D surfaces meshed with interconnected triangles.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = [ lib.maintainers.viric ];
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix
index e8035d8b1cf..91053828b58 100644
--- a/pkgs/development/libraries/gumbo/default.nix
+++ b/pkgs/development/libraries/gumbo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "gumbo";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C99 HTML parsing algorithm";
     homepage = "https://github.com/google/gumbo-parser";
     maintainers = [ maintainers.nico202 ];
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index d288f09b36a..9bf39d94aed 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , gobject-introspection
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8";
   };
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://gupnp.org/";
     description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix
index 6b5f80a0e51..e11d86f82e1 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , gobject-introspection
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj";
   };
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/GUPnP/";
     description = "Library to ease DLNA-related bits for applications using GUPnP";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index d5aa7a99196..2dad33949f3 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , autoreconfHook
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb";
   };
 
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to handle UPnP IGD port mapping";
     homepage = "http://www.gupnp.org/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 7f606c10b6b..fe3463eeff2 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , meson
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x";
   };
 
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.gupnp.org/";
     description = "An implementation of the UPnP specification";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 1d0c5e1b027..c3ae6faecfd 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection
 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3
 , glib, systemd, libusb1, vala, hwdata
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # tests try to access USB
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GLib libusb wrapper";
     homepage = "https://github.com/hughsie/libgusb";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 1b840eba73a..c30d678e02d 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   version = "1.46.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2";
   };
 
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     openssh
     gsettings-desktop-schemas
     # TODO: a ligther version of libsoup to have FTP/HTTP support?
-  ] ++ stdenv.lib.optionals gnomeSupport [
+  ] ++ lib.optionals gnomeSupport [
     gnome3.libsoup
     gcr
     glib-networking # TLS support
@@ -102,13 +102,13 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
     "-Dtmpfilesdir=no"
-  ] ++ stdenv.lib.optionals (!gnomeSupport) [
+  ] ++ lib.optionals (!gnomeSupport) [
     "-Dgcr=false"
     "-Dgoa=false"
     "-Dkeyring=false"
     "-Dhttp=false"
     "-Dgoogle=false"
-  ] ++ stdenv.lib.optionals (samba == null) [
+  ] ++ lib.optionals (samba == null) [
     # Xfce don't want samba
     "-Dsmb=false"
   ];
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix
index b0f4c3a0e9e..5232dfa5123 100644
--- a/pkgs/development/libraries/half/default.nix
+++ b/pkgs/development/libraries/half/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
   version = "2.1.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library for half precision floating point arithmetics";
     platforms = platforms.all;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index 2c415b39df3..98b49461005 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config,
+{lib, stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config,
  boost, libtool, perlPackages }:
 
 stdenv.mkDerivation rec {
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     which lets one control a radio transceiver or receiver, either from
     command line interface or in a text-oriented interactive interface.
     '';
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
     homepage = "http://hamlib.sourceforge.net";
-    maintainers = with stdenv.lib.maintainers; [ relrod ];
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ relrod ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index c0e1be30253..b3615893b53 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl
 , meson, ninja
 , gobject-introspection
 , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one.
@@ -12,7 +12,7 @@
 
 let
   version = "2.7.2";
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
   mesonFeatureFlag = opt: b:
     "-D${opt}=${if b then "enabled" else "disabled"}";
 in
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   postPatch = ''
     patchShebangs src/*.py
     patchShebangs test
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # ApplicationServices.framework headers have cast-align warnings.
     substituteInPlace src/hb.hh \
       --replace '#pragma GCC diagnostic error   "-Wcast-align"' ""
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [ glib freetype cairo ] # recommended by upstream
-    ++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ];
+    ++ lib.optionals withCoreText [ ApplicationServices CoreText ];
 
   propagatedBuildInputs = []
     ++ optional withGraphite2 graphite2
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
     ''}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenType text shaping engine";
     homepage = "https://harfbuzz.github.io/";
     maintainers = [ maintainers.eelco ];
diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix
index e9d5d5d9731..0525fcd0eba 100644
--- a/pkgs/development/libraries/hawknl/default.nix
+++ b/pkgs/development/libraries/hawknl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
   name = "hawknl-1.68";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://hawksoft.com/hawknl/";
     description = "Free, open source, game oriented network API";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/development/libraries/hdf5-blosc/default.nix
index ebce203125c..0879bb9ee9d 100644
--- a/pkgs/development/libraries/hdf5-blosc/default.nix
+++ b/pkgs/development/libraries/hdf5-blosc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, c-blosc, cmake, hdf5, fetchFromGitHub }:
+{ lib, stdenv, c-blosc, cmake, hdf5, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "hdf5-blosc";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Filter for HDF5 that uses the Blosc compressor";
     homepage = "https://github.com/Blosc/hdf5-blosc";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 2251bb7a91a..6a3665809b4 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1
 , darwin }:
 
 stdenv.mkDerivation rec {
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ];
+    ++ lib.optionals stdenv.isLinux [ libusb1 udev ];
 
   enableParallelBuilding = true;
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]);
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for communicating with USB and Bluetooth HID devices";
     homepage = "https://github.com/libusb/hidapi";
     maintainers = with maintainers; [ prusnak ];
diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix
index c514a44f851..a9db80468ee 100644
--- a/pkgs/development/libraries/highfive/default.nix
+++ b/pkgs/development/libraries/highfive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , boost
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
     "-DHIGHFIVE_UNIT_TESTS=OFF"
     "-DHIGHFIVE_USE_INSTALL_DEPS=ON"
   ]
-  ++ (stdenv.lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
+  ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Header-only C++ HDF5 interface";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 2f7fe184845..d4998b51592 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "hiredis";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   PREFIX = "\${out}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/redis/hiredis";
     description = "Minimalistic C client for Redis >= 1.2";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 1afbe8a2f75..fb77e08ca6b 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
 , perlPackages, libxml2, libiconv }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     autoreconfHook makeWrapper libxml2
   ]
   ++ (with perlPackages; [ perl IOStringy ])
-  ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+  ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   postInstall = ''
     wrapProgram $out/bin/hivexregedit \
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
         --prefix "PATH" : "$out/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Windows registry hive extraction library";
     license = licenses.lgpl2;
     homepage = "https://github.com/libguestfs/hivex";
diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix
index f8211b89d77..9857f9f281c 100644
--- a/pkgs/development/libraries/hotpatch/default.nix
+++ b/pkgs/development/libraries/hotpatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "hotpatch-0.2";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     LD_LIBRARY_PATH=$(pwd)/src make test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hot patching executables on Linux using .so file injection";
     homepage = src.meta.homepage;
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix
index df6e4329388..2611203a389 100644
--- a/pkgs/development/libraries/howard-hinnant-date/default.nix
+++ b/pkgs/development/libraries/howard-hinnant-date/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "howard-hinnant-date-unstable";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     description = "A date and time library based on the C++11/14/17 <chrono> header";
     homepage = "https://github.com/HowardHinnant/date";
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index f83d0aff32e..329fa99fa1c 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }:
+{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }:
 
 stdenv.mkDerivation rec {
   pname = "hpx";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ standard library for concurrency and parallelism";
     homepage = "https://github.com/STEllAR-GROUP/hpx";
-    license = stdenv.lib.licenses.boost;
-    platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ bobakker ];
+    license = lib.licenses.boost;
+    platforms = [ "x86_64-linux" ]; # lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bobakker ];
   };
 }
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index 8501bf88b6d..137ccfeaf84 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, zlib }:
+{ lib, stdenv, fetchurl, perl, zlib }:
 
 stdenv.mkDerivation rec {
   name = "${passthru.pname}-${passthru.version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''patchShebangs .'';
   buildInputs = [ perl zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hebrew spell checker";
     homepage = "http://hspell.ivrix.org.il/";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
index ed3171da90f..286834112f2 100644
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "htmlcxx";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./ptrdiff.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://htmlcxx.sourceforge.net/";
     description = "A simple non-validating css1 and html parser for C++";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 203fcaa19ec..9d1d23ede8b 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 let
   version = "2.9.4";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An HTTP message parser written in C";
     homepage = "https://github.com/nodejs/http-parser";
     maintainers = with maintainers; [ matthewbauer ];
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 20acc49bb83..fe4fc1e6d33 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }:
+{ lib, stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.7.0";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://hunspell.sourceforge.net";
     description = "Spell checker";
     longDescription = ''
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.all;
     license = with licenses; [ gpl2 lgpl21 mpl11 ];
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 2cdc30109d9..00d0933bdd7 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -1,6 +1,6 @@
 /* hunspell dictionaries */
 
-{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }:
+{ lib, stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }:
 
 
 let
@@ -37,7 +37,7 @@ let
         rev = "v${version}";
         sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8";
       };
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Hunspell dictionary for ${shortDescription} from rla";
         homepage = "https://github.com/sbosio/rla-es";
         license = with licenses; [ gpl3 lgpl3 mpl11 ];
@@ -76,7 +76,7 @@ let
         url = "https://extensions.libreoffice.org/extensions/swedish-spelling-dictionary-den-stora-svenska-ordlistan/${version}/@@download/file/${_name}.oxt";
         sha256 = "b982881cc75f5c4af1199535bd4735ee476bdc48edf63e3f05fb4f715654a7bc";
       };
-      meta = with stdenv.lib; {
+      meta = with lib; {
         longDescription = ''
         Svensk ordlista baserad på DSSO (den stora svenska ordlistan) och Göran
         Anderssons (goran@init.se) arbete med denna. Ordlistan hämtas från
@@ -118,7 +118,7 @@ let
          url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip";
          sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0";
       };
-      meta = with stdenv.lib; {
+      meta = with lib; {
         inherit longDescription;
         description = "Hunspell dictionary for ${shortDescription} from Dicollecte";
         homepage = "https://www.dicollecte.org/home.php?prj=fr";
@@ -132,7 +132,7 @@ let
       unpackCmd = ''
         unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
       '';
-      postInstall = stdenv.lib.optionalString isDefault ''
+      postInstall = lib.optionalString isDefault ''
         for ext in aff dic; do
           ln -sv $out/share/hunspell/${dictFileName}.$ext $out/share/hunspell/fr_FR.$ext
           ln -sv $out/share/myspell/dicts/${dictFileName}.$ext $out/share/myspell/dicts/fr_FR.$ext
@@ -148,7 +148,7 @@ let
       name = "hunspell-dict-${shortName}-wordlist-${version}";
       srcReadmeFile = "README_" + srcFileName + ".txt";
       readmeFile = "README_" + dictFileName + ".txt";
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Hunspell dictionary for ${shortDescription} from Wordlist";
         homepage = "http://wordlist.aspell.net/";
         license = licenses.bsd3;
@@ -175,7 +175,7 @@ let
       version = "2.4";
       name = "hunspell-dict-${shortName}-linguistico-${version}";
       readmeFile = dictFileName + "_README.txt";
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Hunspell dictionary for ${shortDescription}";
         homepage = "https://sourceforge.net/projects/linguistico/";
         license = licenses.gpl3;
@@ -217,7 +217,7 @@ let
         ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/"
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "http://xuxen.eus/";
         description = shortDescription;
         longDescription = longDescription;
@@ -254,7 +254,7 @@ let
         ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/"
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "https://www.j3e.de/ispell/igerman98/index_en.html";
         description = shortDescription;
         license = with licenses; [ gpl2 gpl3 ];
@@ -283,7 +283,7 @@ let
       buildPhase = ''
         cp -a ${sourceRoot}/* .
       '';
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "https://wiki.documentfoundation.org/Development/Dictionaries";
         description = "Hunspell dictionary for ${shortDescription} from LibreOffice";
         license = license;
@@ -651,7 +651,7 @@ in rec {
     shortName = "hu-hu";
     dictFileName = "hu_HU";
     shortDescription = "Hungarian (Hungary)";
-    license = with stdenv.lib.licenses; [ mpl20 lgpl3 ];
+    license = with lib.licenses; [ mpl20 lgpl3 ];
   };
 
   /* SWEDISH */
@@ -714,7 +714,7 @@ in rec {
       unzip $src ${dictFileName}/{${dictFileName}.dic,${dictFileName}.aff,${readmeFile}}
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Hunspell dictionary for Ukrainian (Ukraine) from LibreOffice";
       homepage = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/";
       license = licenses.mpl20;
@@ -730,7 +730,7 @@ in rec {
     shortName = "ru-ru";
     dictFileName = "ru_RU";
     shortDescription = "Russian (Russian)";
-    license = with stdenv.lib.licenses; [ mpl20 lgpl3 ];
+    license = with lib.licenses; [ mpl20 lgpl3 ];
   };
 
   /* CZECH */
@@ -741,7 +741,7 @@ in rec {
     dictFileName = "cs_CZ";
     shortDescription = "Czech (Czechia)";
     readmeFile = "README_cs.txt";
-    license = with stdenv.lib.licenses; [ gpl2 ];
+    license = with lib.licenses; [ gpl2 ];
   };
 
   /* SLOVAK */
@@ -752,7 +752,7 @@ in rec {
     dictFileName = "sk_SK";
     shortDescription = "Slovak (Slovakia)";
     readmeFile = "README_sk.txt";
-    license = with stdenv.lib.licenses; [ gpl2 lgpl21 mpl11 ];
+    license = with lib.licenses; [ gpl2 lgpl21 mpl11 ];
   };
 
   /* DANISH */
@@ -776,10 +776,10 @@ in rec {
       unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} -d ${dictFileName}
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Hunspell dictionary for Danish (Denmark) from Stavekontrolden";
       homepage = "https://github.com/jeppebundsgaard/stavekontrolden";
-      license = with stdenv.lib.licenses; [ gpl2Only lgpl21Only mpl11 ];
+      license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ];
       maintainers = with maintainers; [ louisdk1 ];
     };
   };
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 3c8ffee1bde..6a939835cf5 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl
+{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl
 , x11Support ? false, libX11 ? null, cairo ? null
 }:
 
 assert x11Support -> libX11 != null && cairo != null;
 
-with stdenv.lib;
+with lib;
 
 let
   version = "2.4.0";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
 
   # Filter out `null' inputs.  This allows users to `.override' the
   # derivation and set optional dependencies to `null'.
-  buildInputs = stdenv.lib.filter (x: x != null)
+  buildInputs = lib.filter (x: x != null)
    ([ expat ncurses ]
      ++  (optionals x11Support [ cairo libX11 ])
      ++  (optionals stdenv.isLinux [ numactl ]));
diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix
index 073e9d16686..177f6fe7909 100644
--- a/pkgs/development/libraries/hyena/default.nix
+++ b/pkgs/development/libraries/hyena/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }:
+{ lib, stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }:
 
 stdenv.mkDerivation rec {
   pname = "hyena";
   version = "0.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   inherit monoDLLFixer;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Attic/Hyena";
     description = "A C# library which contains a hodge-podge of random stuff";
     longDescription = ''
diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix
index 3ab52165b78..f160afb99b7 100644
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/pkgs/development/libraries/hyperscan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ragel, python3
+{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3
 , coreutils, gnused, util-linux
 , boost
 , withStatic ? false # build only shared libs by default, build static+shared if true
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     "-DFAT_RUNTIME=ON"
     "-DBUILD_AVX512=ON"
   ]
-  ++ stdenv.lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
-  ++ stdenv.lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
+  ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
+  ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
 
   postPatch = ''
     sed -i '/examples/d' CMakeLists.txt
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance multiple regex matching library";
     longDescription = ''
       Hyperscan is a high-performance multiple regex matching library.
diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/development/libraries/hyphen/default.nix
index 9251b2853f1..ed3980f7a90 100644
--- a/pkgs/development/libraries/hyphen/default.nix
+++ b/pkgs/development/libraries/hyphen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, ... }:
+{ lib, stdenv, fetchurl, perl, ... }:
 
 let
   version = "2.8.8";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     sha256 = "01ap9pr6zzzbp4ky0vy7i1983fwyqy27pl0ld55s30fdxka3ciih";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A text hyphenation library";
     homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index d8e9bd16ab8..47eea8ba1af 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -30,18 +30,18 @@ let
 
       # $(includedir) is different from $(prefix)/include due to multiple outputs
       sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in
-    '' + stdenv.lib.optionalString stdenv.isAarch32 ''
+    '' + lib.optionalString stdenv.isAarch32 ''
       # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
       sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
     '';
 
     configureFlags = [ "--disable-debug" ]
-      ++ stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath"
-      ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}";
+      ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath"
+      ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}";
 
     enableParallelBuilding = true;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Unicode and globalization support library";
       homepage = "http://site.icu-project.org/";
       maintainers = with maintainers; [ raskin ];
@@ -57,10 +57,10 @@ let
 
     # FIXME: This fixes dylib references in the dylibs themselves, but
     # not in the programs in $out/bin.
-    nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     # remove dependency on bootstrap-tools in early stdenv build
-    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    postInstall = lib.optionalString stdenv.isDarwin ''
       sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
     '' + (let
       replacements = [
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index 6889a9f573a..31fc4fd6ba3 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib}:
+{lib, stdenv, fetchurl, zlib}:
 
 stdenv.mkDerivation {
   name = "id3lib-3.8.3";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   doCheck = false; # fails to compile
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags";
     homepage = "http://id3lib.sourceforge.net";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix
index da7b9f1f271..472a23a2b74 100644
--- a/pkgs/development/libraries/idnkit/default.nix
+++ b/pkgs/development/libraries/idnkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiconv }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "idnkit";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libiconv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nic.ad.jp/ja/idn/idnkit";
     description = "Provides functionalities about i18n domain name processing";
     license = "idnkit-2 license";
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index 46ed422b540..b300731ce44 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, ghostscript }:
+{ lib, stdenv, autoreconfHook, ghostscript }:
 
 stdenv.mkDerivation {
   name = "ijs-${ghostscript.version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--enable-shared" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.openprinting.org/download/ijs/";
     description = "Raster printer driver architecture";
 
diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
index d9c01ab5fcf..6ba64dcaa58 100644
--- a/pkgs/development/libraries/iksemel/default.nix
+++ b/pkgs/development/libraries/iksemel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }:
+{ lib, stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }:
 
 stdenv.mkDerivation rec {
   pname = "iksemel";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config autoreconfHook libtool texinfo ];
   buildInputs = [ gnutls ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XML parser for jabber";
 
     homepage = "https://github.com/timothytylee/iksemel-1.4";
diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix
index 37885c767bd..39d7b7b61b0 100644
--- a/pkgs/development/libraries/ilbc/default.nix
+++ b/pkgs/development/libraries/ilbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gawk, cmake }:
+{ lib, stdenv, fetchurl, gawk, cmake }:
 
 stdenv.mkDerivation rec {
   name = "ilbc-rfc3951";
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix
index 26e63747523..b6f1c0ac78a 100644
--- a/pkgs/development/libraries/ilixi/default.nix
+++ b/pkgs/development/libraries/ilixi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }:
+{ lib, stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }:
 
 # TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen,
 # Reflex, Wnn, NLS
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "--with-examples"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight C++ GUI toolkit for embedded Linux systems";
     homepage = "https://github.com/ilixi/ilixi";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 68bd677cf77..219d961f9f9 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ilmbase";
-  version = stdenv.lib.getVersion openexr;
+  version = lib.getVersion openexr;
 
   # the project no longer provides separate tarballs. We may even want to merge
   # the ilmbase package into openexr in the future.
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cd IlmBase
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics";
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index cf1d9018fd5..c666a15b63b 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, autoreconfHook, fetchurl, gmp, blas}:
+{lib, stdenv, autoreconfHook, fetchurl, gmp, blas}:
 stdenv.mkDerivation rec {
   pname = "iml";
   version = "1.0.5";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers'';
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
     homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html";
     updateWalker = true;
   };
diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index b94af22c0a7..53612f8205f 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}:
+{lib, stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}:
 
 stdenv.mkDerivation {
   name = "imlib-1.9.15";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   buildInputs = [libjpeg libXext libX11 xorgproto libtiff libungif libpng];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An image loading and rendering library for X11";
     platforms = platforms.unix;
     license = with licenses; [ gpl2 lgpl2 ];
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index aabfff908c1..666fcab989b 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 # Image file formats
 , libjpeg, libtiff, giflib, libpng, libwebp
 # imlib2 can load images from ID3 tags.
@@ -8,7 +8,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional;
+  inherit (lib) optional;
 in
 stdenv.mkDerivation rec {
   pname = "imlib2";
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     moveToOutput bin/imlib2-config "$dev"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Image manipulation library";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix
index c865b25c000..1f5d9070dd3 100644
--- a/pkgs/development/libraries/impy/default.nix
+++ b/pkgs/development/libraries/impy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     SDL2
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple library for loading/saving images and animations, written in C";
     homepage = "https://github.com/bcampbell/impy";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/development/libraries/inchi/default.nix
index 86901100759..6acdf340c91 100644
--- a/pkgs/development/libraries/inchi/default.nix
+++ b/pkgs/development/libraries/inchi/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchurl, stdenv, unzip }:
+{ pkgs, fetchurl, lib, stdenv, unzip }:
 stdenv.mkDerivation {
   pname = "inchi";
   version = "1.05";
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       install -m 644 INCHI-1-DOC/*.pdf $doc/share
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.inchi-trust.org/";
     description = "IUPAC International Chemical Identifier library";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index c08d5924b0c..67ae5623db1 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, tcl }:
+{ lib, stdenv, fetchurl, writeText, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "incrtcl";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     rmdir $out/bin
     mv $out/lib/itcl${version}/* $out/lib
     ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \
-      $out/lib/libitcl${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
+      $out/lib/libitcl${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
     rmdir $out/lib/itcl${version}
   '';
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://incrtcl.sourceforge.net/";
     description = "Object Oriented Enhancements for Tcl/Tk";
     license     = licenses.tcltk;
diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix
index 5588a157c46..8947e33e900 100644
--- a/pkgs/development/libraries/indicator-application/gtk3.nix
+++ b/pkgs/development/libraries/indicator-application/gtk3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchbzr
+{ lib, stdenv, fetchbzr
 , pkg-config, systemd, autoreconfHook
 , glib, dbus-glib, json-glib
 , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }:
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/upstart
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Indicator to take menus from applications and place them in the panel";
     homepage = "https://launchpad.net/indicator-application";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 1663542521c..035356ac861 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , cfitsio
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     fftw
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.indilib.org/";
     description = "Implementation of the INDI protocol for POSIX operating systems";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/development/libraries/inih/default.nix
index 62de607f7d4..11e49f7ddc4 100644
--- a/pkgs/development/libraries/inih/default.nix
+++ b/pkgs/development/libraries/inih/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "inih";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "-Dwith_INIReader=true"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple .INI file parser in C, good for embedded systems";
     homepage = "https://github.com/benhoyt/inih";
     changelog = "https://github.com/benhoyt/inih/releases/tag/${version}";
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 51c6728e8b0..8c7fdfd04d6 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "iniparser";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = ./no-usr.patch;
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile \
         --replace -Wl,-soname= -Wl,-install_name,
   '';
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     ln -s libiniparser.so.1 $out/lib/libiniparser.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Free standalone ini file parsing library";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 30d572853cf..f050a9c7b3b 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/intel/gmmlib";
     license = licenses.mit;
     description = "Intel Graphics Memory Management Library";
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index 6f2f543af06..75175bde4b3 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, pkg-config
 , libva, libpciaccess, intel-gmmlib
 , enableX11 ? true, libX11
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ libva libpciaccess intel-gmmlib ]
-    ++ stdenv.lib.optional enableX11 libX11;
+    ++ lib.optional enableX11 libX11;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
     longDescription = ''
       The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API)
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ primeos jfrankenau ];
   };
 
-  postFixup = stdenv.lib.optionalString enableX11 ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${stdenv.lib.makeLibraryPath [ libX11  ]}" \
+  postFixup = lib.optionalString enableX11 ''
+    patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libX11  ]}" \
       $out/lib/dri/iHD_drv_video.so
   '';
 }
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index 1fe45a49258..dd605aaae5c 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11
 , libXau, libXdmcp, libpthreadstubs }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intel Media SDK";
     license = licenses.mit;
     maintainers = with maintainers; [ midchildan ];
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index 8387aa67161..23801d3436d 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "ip2location-c";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # databases are available, downloading them for just 1 test seems excessive):
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to look up locations of host names and IP addresses";
     longDescription = ''
       A C library to find the country, region, city,coordinates,
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 84e7fae6045..5214fa9e149 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
+{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
 
 let
   common = import ./common.nix { inherit fetchzip; };
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://irrlicht.sourceforge.net/";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
     description = "Open source high performance realtime 3D engine written in C++";
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix
index 6a33b0feadb..b41486ce9dd 100644
--- a/pkgs/development/libraries/irrlicht/mac.nix
+++ b/pkgs/development/libraries/irrlicht/mac.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
+{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
 
 let
   common = import ./common.nix { inherit fetchzip; };
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://irrlicht.sourceforge.net/";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
     description = "Open source high performance realtime 3D engine written in C++";
-    platforms = stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
index 1cac0d369fe..5beffd1f0d2 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation {
   name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://www.kotnet.org/~skimo/isl/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix
index a97e05b0431..8936d6c5f3b 100644
--- a/pkgs/development/libraries/isl/0.14.1.nix
+++ b/pkgs/development/libraries/isl/0.14.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   name = "isl-0.14.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://www.kotnet.org/~skimo/isl/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix
index 018f7085088..a823b69fa27 100644
--- a/pkgs/development/libraries/isl/0.17.1.nix
+++ b/pkgs/development/libraries/isl/0.17.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   name = "isl-0.17.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://www.kotnet.org/~skimo/isl/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/isl/0.20.0.nix b/pkgs/development/libraries/isl/0.20.0.nix
index 3775bdc71e0..c35588555a7 100644
--- a/pkgs/development/libraries/isl/0.20.0.nix
+++ b/pkgs/development/libraries/isl/0.20.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   name = "isl-0.20";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://isl.gforge.inria.fr/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 8ba9ea31b80..6d770430ce5 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}:
+{lib, stdenv, fetchurl, gettext, python3}:
 
 stdenv.mkDerivation rec {
   pname = "iso-codes";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gettext python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://salsa.debian.org/iso-codes-team/iso-codes";
     description = "Various ISO codes packaged as XML files";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix
index 7a7176c88c1..54a3c33cd01 100644
--- a/pkgs/development/libraries/itk/4.x.nix
+++ b/pkgs/development/libraries/itk/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }:
+{ lib, stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }:
 
 stdenv.mkDerivation rec {
   pname = "itk";
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake xz ];
-  buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   meta = {
     description = "Insight Segmentation and Registration Toolkit";
     homepage = "https://www.itk.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index 59a883e1f96..ac899ce26f1 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper
+{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper
 , pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake xz makeWrapper ];
-  buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   postInstall = ''
     wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Insight Segmentation and Registration Toolkit";
     homepage = "https://www.itk.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [viric];
   };
 }
diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix
index 3c70369eb91..570190a43c1 100644
--- a/pkgs/development/libraries/itktcl/default.nix
+++ b/pkgs/development/libraries/itktcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, tk, incrtcl }:
+{ lib, stdenv, fetchurl, tcl, tk, incrtcl }:
 
 stdenv.mkDerivation rec {
   pname = "itk-tcl";
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
     rmdir $out/bin
     mv $out/lib/itk${version}/* $out/lib
     ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \
-      $out/lib/libitk${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
+      $out/lib/libitk${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
     rmdir $out/lib/itk${version}
   '';
 
   outputs = [ "out" "dev" "man" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://incrtcl.sourceforge.net/";
     description = "Mega-widget toolkit for incr Tk";
     license     = licenses.tcltk;
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 5c7473be647..02dd4a5635b 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, tnt}:
+{lib, stdenv, fetchurl, unzip, tnt}:
 
 stdenv.mkDerivation rec {
   pname = "jama";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       cp *.h $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://math.nist.gov/tnt/";
     description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index 7ecf7579a30..85451511d7e 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "jansson-2.13.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.digip.org/jansson/";
     description = "C library for encoding, decoding and manipulating JSON data";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix
index 4a2b030a3db..9d34aaf6c8e 100644
--- a/pkgs/development/libraries/java/commons/bcel/default.nix
+++ b/pkgs/development/libraries/java/commons/bcel/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   version = "5.2";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-bcel/";
     description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix
index 46bd3c0fd15..629ab7ec131 100644
--- a/pkgs/development/libraries/java/commons/bsf/default.nix
+++ b/pkgs/development/libraries/java/commons/bsf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "commons-bsf-1.2";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Interface to scripting languages, including JSR-223";
     homepage = "http://commons.apache.org/proper/commons-bsf/";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
 
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index 5307c635834..79f63026e38 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "1.20";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-compress";
     description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix
index cd439b50397..868f2da4e53 100644
--- a/pkgs/development/libraries/java/commons/fileupload/default.nix
+++ b/pkgs/development/libraries/java/commons/fileupload/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   version = "1.3.1";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-fileupload";
     description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
index 10587a72ecd..0c5ac8f4dde 100644
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "2.8.0";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-io";
     description = "A library of utilities to assist with developing IO functionality";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix
index bd0f7c273e7..5009fe6cac7 100644
--- a/pkgs/development/libraries/java/commons/lang/default.nix
+++ b/pkgs/development/libraries/java/commons/lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "3.11";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-lang";
     description = "Provides additional methods to manipulate standard Java library classes";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix
index 7c2192e4952..d63a214e2ad 100644
--- a/pkgs/development/libraries/java/commons/logging/default.nix
+++ b/pkgs/development/libraries/java/commons/logging/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "commons-logging-1.2";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Wrapper around a variety of logging API implementations";
     homepage = "http://commons.apache.org/proper/commons-logging";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
 
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix
index 7c4fc5c632e..960f12fb8bf 100644
--- a/pkgs/development/libraries/java/commons/math/default.nix
+++ b/pkgs/development/libraries/java/commons/math/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "3.6.1";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://commons.apache.org/proper/commons-math/";
     description = "A library of lightweight, self-contained mathematics and statistics components";
-    maintainers = with stdenv.lib.maintainers; [ copumpkin ];
-    license     = stdenv.lib.licenses.asl20;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ copumpkin ];
+    license     = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix
index acf8cc9b83d..f7732ff637a 100644
--- a/pkgs/development/libraries/java/cup/default.nix
+++ b/pkgs/development/libraries/java/cup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, ant } :
+{ lib, stdenv, fetchurl, jdk, ant } :
 
 stdenv.mkDerivation rec {
   pname = "java-cup";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www2.cs.tum.edu/projects/cup/";
     description = "LALR parser generator for Java";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }
diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix
index 0133138b478..505d60e2c8d 100644
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/pkgs/development/libraries/java/dbus-java/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext, jdk8, libmatthew_java}:
+{lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java}:
 
 let jdk = jdk8; in
 stdenv.mkDerivation {
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
            -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.sander ];
     license = licenses.afl21;
diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix
index fd4bfb29706..4d9902cbbe9 100644
--- a/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/pkgs/development/libraries/java/geoipjava/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jdk, unzip}:
+{lib, stdenv, fetchurl, jdk, unzip}:
 
 stdenv.mkDerivation {
   name = "GeoIPJava-1.2.5";
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
     '';
   meta = {
     description = "GeoIP Java API";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.sander ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
index 37d7cac0da2..34a0e8c530a 100644
--- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix
+++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "gwt-dnd-2.6.5";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.unix;
     license = licenses.asl20;
   };
diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix
index a968ebc5fd8..692326a2189 100644
--- a/pkgs/development/libraries/java/gwt-widgets/default.nix
+++ b/pkgs/development/libraries/java/gwt-widgets/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "gwt-widgets-0.2.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.unix;
     license = with licenses; [ afl21 lgpl2 ];
   };
diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix
index 88f32866b0d..433cf75ad5a 100644
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, unzip, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   pname = "hsqldb";
   version = "2.5.1";
-  underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version);
+  underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version);
 
   src = fetchurl {
     url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://hsqldb.org";
     description = "A relational, embedable database management system written in Java and a set of related tools";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
index 34af97605d2..ad276fcdd63 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/pkgs/development/libraries/java/httpunit/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip} :
+{lib, stdenv, fetchurl, unzip} :
 
 stdenv.mkDerivation {
   name = "httpunit-1.7";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   inherit unzip;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://httpunit.sourceforge.net";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index 54e85ec5589..19bc3524c59 100644
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, stdenv, ant, jdk }:
+{ fetchgit, lib, stdenv, ant, jdk }:
 
 stdenv.mkDerivation {
   pname = "hydra-ant-logger";
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix
index 60558f72cfc..4bb90dd9887 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/pkgs/development/libraries/java/jdom/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl} :
+{lib, stdenv, fetchurl} :
 
 stdenv.mkDerivation {
   name = "jdom-1.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code";
     homepage = "http://www.jdom.org";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index d0258d5896b..cf5b42a0ac2 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jre} :
+{lib, stdenv, fetchurl, jre} :
 
 stdenv.mkDerivation rec {
   name = "jflex-1.8.2";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.jflex.de/";
     description = "Lexical analyzer generator for Java, written in Java";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index c114ddeac27..1695d11cb25 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, antBuild, fetchgit, perl }:
+{ lib, stdenv, antBuild, fetchgit, perl }:
 
 let
   version = "4.11";
@@ -22,7 +22,7 @@ in antBuild {
   meta = {
     homepage = "http://www.junit.org/";
     description = "A framework for repeatable tests in Java";
-    license = stdenv.lib.licenses.epl10;
+    license = lib.licenses.epl10;
     broken = true;
   };
 }
diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix
index cb88df276a5..b9b00223186 100644
--- a/pkgs/development/libraries/java/junixsocket/default.nix
+++ b/pkgs/development/libraries/java/junixsocket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ant, jdk, junit }:
+{ lib, stdenv, fetchurl, ant, jdk, junit }:
 
 stdenv.mkDerivation rec {
   name = "junixsocket-1.3";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
     (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
     ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "-DisMac=true";
+    ++ lib.optional stdenv.isDarwin "-DisMac=true";
 
   installPhase =
     ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Java/JNI library for using Unix Domain Sockets from Java";
     homepage = "https://github.com/kohlschutter/junixsocket";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix
index 8b8123dff2b..b0173cbdb84 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jdk}:
+{lib, stdenv, fetchurl, jdk}:
 
 stdenv.mkDerivation {
   name = "libmatthew-java-0.8";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   PREFIX=''''${out}'';
   buildInputs = [ jdk ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.sander ];
     license = licenses.mit;
diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix
index 6d09bead53e..ddf95ead249 100644
--- a/pkgs/development/libraries/java/lombok/default.nix
+++ b/pkgs/development/libraries/java/lombok/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jdk }:
+{ lib, stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
   name = "lombok-1.18.16";
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A library that can write a lot of boilerplate for your Java project";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.mit;
+    platforms = lib.platforms.all;
+    license = lib.licenses.mit;
     homepage = "https://projectlombok.org/";
-    maintainers = [ stdenv.lib.maintainers.CrystalGamma ];
+    maintainers = [ lib.maintainers.CrystalGamma ];
   };
 }
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index c0eabe51657..417c7b96900 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl} :
+{lib, stdenv, fetchurl} :
 
 stdenv.mkDerivation rec {
   pname = "lucene";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Java full-text search engine";
     platforms = platforms.unix;
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix
index 817c861436f..e20d7e707e7 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/pkgs/development/libraries/java/mockobjects/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl} :
+{lib, stdenv, fetchurl} :
 
 stdenv.mkDerivation {
   name = "mockobjects-0.09";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generic unit testing framework and methodology for testing any kind of code";
     platforms = platforms.unix;
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index d3d10f61b70..d34787d8b1f 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unzip, ant, javac, jvm }:
+{ fetchurl, lib, stdenv, unzip, ant, javac, jvm }:
 
 let
   version = "1.7R2";
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
       cp -v *.jar "$out/share/java"
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of JavaScript written in Java";
 
     longDescription =
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index ef403be60df..e6f2fcadbe7 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, unzip, jre }:
+{ lib, stdenv, fetchurl, unzip, jre }:
 
 let
   common = { pname, version, src, description
-           , prog ? null, jar ? null, license ? stdenv.lib.licenses.mpl20 }:
+           , prog ? null, jar ? null, license ? lib.licenses.mpl20 }:
     stdenv.mkDerivation {
       name = "${pname}-${version}";
       inherit pname version src;
@@ -26,7 +26,7 @@ let
         chmod a+x $out/bin/${prog'}
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         inherit description license;
         homepage = "http://saxon.sourceforge.net/";
         maintainers = with maintainers; [ rvl ];
@@ -44,7 +44,7 @@ in {
     };
     description = "XSLT 1.0 processor";
     # http://saxon.sourceforge.net/saxon6.5.3/conditions.html
-    license = stdenv.lib.licenses.mpl10;
+    license = lib.licenses.mpl10;
   };
 
   saxonb_8_8 = common {
diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix
index c1d41e7743d..f831bfc8b93 100644
--- a/pkgs/development/libraries/java/smack/default.nix
+++ b/pkgs/development/libraries/java/smack/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "smack-4.1.9";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A XMPP (Jabber) client library for instant messaging and presence";
     homepage = "http://www.igniterealtime.org/projects/smack/";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index 4cbdca9932f..bf35490f9a8 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
     cd out && jar -c * > $out/jars/swt.jar
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.eclipse.org/swt/";
     description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented";
     license = licenses.epl10;
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 4004c9f387e..6f9d88d6366 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, autoreconfHook }:
+{ lib, stdenv, fetchurl, python3, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "jbig2dec";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.jbig2dec.com/";
     description = "Decoder implementation of the JBIG2 image compression format";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix
index c21d51bc5a7..ab55e76f29a 100644
--- a/pkgs/development/libraries/jbigkit/default.nix
+++ b/pkgs/development/libraries/jbigkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "jbigkit-2.1";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
-    "AR=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
-    "RANLIB=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
+    "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
+    "RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
   ];
 
   postPatch = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/";
     description = "A software implementation of the JBIG1 data compression standard";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix
index a40de74037a..2b57bd4064b 100644
--- a/pkgs/development/libraries/jcal/default.nix
+++ b/pkgs/development/libraries/jcal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
 , readline
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   preAutoreconf = "cd sources/";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system";
     homepage =  "http://nongnu.org/jcal/";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index fc4f0f2fe6e..d5fe07b00f2 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -1,5 +1,5 @@
 { version, sha256 }:
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
 # then stops downstream builds (mariadb in particular) from detecting it. This
 # option should remove the prefix and give us a working jemalloc.
@@ -9,7 +9,7 @@
 , disableInitExecTls ? false
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "jemalloc";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://jemalloc.net";
     description = "General purpose malloc(3) implementation";
     longDescription = ''
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
index 4cafa7434b1..11f6141872d 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "jitterentropy";
   version = "2.2.0";
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides a noise source using the CPU execution timing jitter";
     homepage = "https://github.com/smuellerDD/jitterentropy-library";
-    license = with stdenv.lib.licenses; [ gpl2 bsd3 ];
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
+    license = with lib.licenses; [ gpl2 bsd3 ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ johnazoidberg ];
   };
 }
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index d72d5021434..5a77ea789af 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "json-c";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JSON implementation in C";
     homepage    = "https://github.com/json-c/json-c/wiki";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 07e6d679aa7..a820d947b7f 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext
+{ lib, stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext
 , gobject-introspection, fixDarwinDylibNames, gnome3
 }:
 
@@ -9,13 +9,13 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j";
   };
 
   propagatedBuildInputs = [ glib ];
   nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   outputs = [ "out" "dev" ];
 
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";
     homepage = "https://wiki.gnome.org/Projects/JsonGlib";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 73aaaec4e4c..71b0d7b9a92 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "jsoncpp";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     homepage = "https://github.com/open-source-parsers/jsoncpp";
     description = "A C++ library for interacting with JSON";
diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index da84578d780..1ec9c3da41e 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
+{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 stdenv.mkDerivation rec {
   pname = "jsonrpc-glib";
   version = "3.38.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib json-glib ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI=";
   };
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to communicate using the JSON-RPC 2.0 specification";
     homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix
index ad422db3d48..037225b86e5 100644
--- a/pkgs/development/libraries/judy/default.nix
+++ b/pkgs/development/libraries/judy/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "judy-1.0.5";
@@ -10,14 +10,14 @@ stdenv.mkDerivation {
 
   # gcc 4.8 optimisations break judy.
   # https://sourceforge.net/p/judy/mailman/message/31995144/
-  preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU ''
+  preConfigure = lib.optionalString stdenv.cc.isGNU ''
     configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
   '';
 
   meta = {
     homepage = "http://judy.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     description = "State-of-the-art C library that implements a sparse dynamic array";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix
index f0f5b9d7793..78cc48d8209 100644
--- a/pkgs/development/libraries/jxrlib/default.nix
+++ b/pkgs/development/libraries/jxrlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python }:
+{ lib, stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
   pname = "jxrlib";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
   };
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile \
       --replace '-shared' '-dynamiclib -undefined dynamic_lookup' \
       --replace '.so' '.dylib'
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implementation of the JPEG XR image codec standard";
     homepage = "https://jxrlib.codeplex.com";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index e56dfd45834..804749bbdb5 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex
 , texinfo, perlPackages
 , openldap, libcap_ng, sqlite, openssl, db, libedit, pam
 , CoreFoundation, Security, SystemConfiguration
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "heimdal";
   version = "7.7.0";
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 022b6db1a24..5ef9e496b94 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds
+{ lib, stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds
 , openssl, openldap, libedit, keyutils
 
 # Extra Arguments
@@ -16,7 +16,7 @@
 let
   libOnly = type == "lib";
 in
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
   majorVersion = "1.18"; # remove patches below with next upgrade
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 6b42cff7903..663abb15280 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3
 , gtk-doc, gtk2, python2Packages, lua, gobject-introspection
 }:
 
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
     ./autogen.sh --prefix="$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for registering global key bindings";
     longDescription = ''
       keybinder is a library for registering global keyboard shortcuts.
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index dde4e80f070..e291ec56bb2 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3
 , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh --prefix="$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for registering global key bindings";
     homepage = "https://github.com/kupferlauncher/keybinder/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix
index 869d7ae1b02..70864bcf24a 100644
--- a/pkgs/development/libraries/keystone/default.nix
+++ b/pkgs/development/libraries/keystone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , pkg-config
 , cmake
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight multi-platform, multi-architecture assembler framework";
     homepage = "https://www.keystone-engine.org";
     license = licenses.gpl2Only;
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
index a42f1c0a513..f4688f34982 100644
--- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
+++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }:
+{ lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }:
 
 stdenv.mkDerivation rec {
   name = "khronos-ocl-icd-loader-${version}";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
   };
 
-  patches = stdenv.lib.lists.optional withTracing ./tracing.patch;
+  patches = lib.lists.optional withTracing ./tracing.patch;
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ opencl-headers ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Offical Khronos OpenCL ICD Loader";
     homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix
index 370f628ff7a..5395ac4ab9c 100644
--- a/pkgs/development/libraries/kissfft/default.nix
+++ b/pkgs/development/libraries/kissfft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 }:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     "DATATYPE=double"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A mixed-radix Fast Fourier Transform based up on the KISS principle";
     homepage = "https://github.com/mborgerding/kissfft";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 02d216ca59c..65dce915f14 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, libdrm
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm
 , withPython ? false, python }:
 
 stdenv.mkDerivation {
@@ -13,12 +13,12 @@ stdenv.mkDerivation {
     sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh";
   };
 
-  cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF";
+  cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF";
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libdrm python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
     homepage = "https://github.com/tomba/kmsxx";
     license = licenses.mpl20;
diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index d2677f69f9f..837333407b2 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ extra-cmake-modules ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with lib.maintainers; [ peterhoeg ];
     # The build requires at least Qt 5.14:
     broken = lib.versionOlder qtbase.version "5.14";
diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix
index 9c360ce0531..4e8aa57d956 100644
--- a/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/pkgs/development/libraries/kyotocabinet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib }:
+{ lib, stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
   name = "kyotocabinet-1.2.76";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1";
   };
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace kccommon.h \
       --replace tr1/unordered_map unordered_map \
       --replace tr1/unordered_set unordered_set \
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://fallabs.com/kyotocabinet";
     description = "A library of routines for managing a database";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix
index 34dab6bb3ff..b1b5fd01206 100644
--- a/pkgs/development/libraries/l-smash/default.nix
+++ b/pkgs/development/libraries/l-smash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which }:
+{ lib, stdenv, fetchFromGitHub, which }:
 
 stdenv.mkDerivation rec {
   pname = "l-smash";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://l-smash.github.io/l-smash/";
     description = "MP4 container utilities";
     license = licenses.isc;
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index da3784100ab..8ed0962bece 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , nasmSupport ? true, nasm ? null # Assembly optimizations
 , cpmlSupport ? true # Compaq's fast math library
 #, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging
@@ -20,7 +20,7 @@ let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "lame";
   version = "3.100";
diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
index 913353a32fe..a44535fbf90 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
 , libxml2, icu
 , languageMachines
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     make check
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
     homepage    = "https://languagemachines.github.io/frog";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix
index 3560ae8e460..7e890a8d09c 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, libtool, pkg-config, autoconf-archive
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     sh bootstrap.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
     homepage    = "https://languagemachines.github.io/frog";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix
index 297967351d9..fc5e622bcf4 100644
--- a/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/pkgs/development/libraries/languagemachines/libfolia.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, libtool, pkg-config, autoconf-archive
 , libxml2, icu, bzip2, libtar
 , languageMachines }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
   CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format.";
     homepage    = "https://proycon.github.io/folia/";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix
index 7fee1ea3a3f..efa9ada7d56 100644
--- a/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/pkgs/development/libraries/languagemachines/mbt.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
 , libxml2
 , languageMachines
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     sh bootstrap.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Memory Based Tagger";
     homepage    = "https://languagemachines.github.io/mbt/";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix
index c3999d1c558..c09f00b1160 100644
--- a/pkgs/development/libraries/languagemachines/ticcutils.nix
+++ b/pkgs/development/libraries/languagemachines/ticcutils.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, libtool, pkg-config, autoconf-archive
 , libxml2, zlib, bzip2, libtar }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
                 ];
   preConfigure = "sh bootstrap.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This module contains useful functions for general use in the TiCC software stack and beyond.";
     homepage    = "https://github.com/LanguageMachines/ticcutils";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix
index 2e758257cbb..de22c41ec49 100644
--- a/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/pkgs/development/libraries/languagemachines/timbl.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, libtool, pkg-config, autoconf-archive
 , libxml2, bzip2, libtar
 , languageMachines
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
                 ];
   preConfigure = "sh bootstrap.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "TiMBL implements several memory-based learning algorithms";
     homepage    = "https://github.com/LanguageMachines/timbl/";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix
index 56245f922d3..27812e8b3f0 100644
--- a/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/pkgs/development/libraries/languagemachines/timblserver.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive
 , libxml2
 , languageMachines
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
                 ];
   preConfigure = "sh bootstrap.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "This server for TiMBL implements several memory-based learning algorithms";
     homepage    = "https://github.com/LanguageMachines/timblserver/";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix
index e089942cd74..d8c8d99552c 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/pkgs/development/libraries/languagemachines/ucto.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, libtool, pkg-config, autoconf-archive
 , libxml2, icu, bzip2, libtar
 , languageMachines
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     done;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A rule-based tokenizer for natural language";
     homepage    = "https://languagemachines.github.io/ucto/";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix
index 9d36a95b498..cad63622724 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , automake, autoconf, libtool, pkg-config, autoconf-archive
  }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ automake autoconf libtool autoconf-archive ];
   preConfigure = "sh bootstrap.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A rule-based tokenizer for natural language";
     homepage    = "https://languagemachines.github.io/ucto/";
     license     = licenses.gpl3;
diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix
index 25d858cb64a..22f0436edca 100644
--- a/pkgs/development/libraries/lasem/default.nix
+++ b/pkgs/development/libraries/lasem/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf
+{ fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf
 , libxml2, cairo, pango, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v";
   };
 
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
     description = "SVG and MathML rendering library";
 
     homepage = "https://wiki.gnome.org/Projects/Lasem";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index f2224a872dd..24efa689c58 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }:
+{ lib, stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }:
 
 stdenv.mkDerivation rec {
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
                 --prefix=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lasso.entrouvert.org/";
     description = "Liberty Alliance Single Sign-On library";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix
index 8fe2484faca..9a957a11924 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "lcms";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Color management engine";
     homepage = "http://www.littlecms.com/";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix
index 6e81dfc0718..129b5785198 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/pkgs/development/libraries/lcms2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtiff, libjpeg, zlib }:
+{ lib, stdenv, fetchurl, libtiff, libjpeg, zlib }:
 
 stdenv.mkDerivation rec {
   name = "lcms2-2.11";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # See https://trac.macports.org/ticket/60656
   LDFLAGS = if stdenv.hostPlatform.isDarwin then "-Wl,-w" else null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Color management engine";
     homepage = "http://www.littlecms.com/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix
index 36a0c8e1316..36092507b8a 100644
--- a/pkgs/development/libraries/ldacbt/default.nix
+++ b/pkgs/development/libraries/ldacbt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AOSP libldac dispatcher";
     homepage    = "https://github.com/EHfive/ldacBT";
     license     = licenses.asl20;
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 9810234eefa..ba035eed05b 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python3
 , pkg-config
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   stripDebugList = [ "bin" "lib" "modules" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A LDAP-like embedded database";
     homepage = "https://ldb.samba.org/";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index f64d263901b..5873e707e7c 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, perl, which, dns-root-data }:
+{ lib, stdenv, fetchurl, openssl, perl, which, dns-root-data }:
 
 stdenv.mkDerivation rec {
   pname = "ldns";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--with-drill"
     "--disable-gost"
     "--with-examples"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     moveToOutput "bin/ldns-config" "$dev"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library with the aim of simplifying DNS programming in C";
     license = licenses.bsd3;
     homepage = "http://www.nlnetlabs.nl/projects/ldns/";
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 7f1c292c5f1..8a9c80a6175 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, cmake, curl, ruby }:
+{ lib, stdenv, fetchFromGitHub, boost, cmake, curl, ruby }:
 
 stdenv.mkDerivation rec {
   pname = "leatherman";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost curl ruby ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/puppetlabs/leatherman/";
     description = "A collection of C++ and CMake utility libraries";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index e9e8d3447b9..23675c9f9f8 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }:
 
 let
   version = "0.3.95";
@@ -35,10 +35,10 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ flokli ];
-    license = stdenv.lib.licenses.lgpl3;
+    license = lib.licenses.lgpl3;
     description = "An opensource database of photographic lenses and their characteristics";
     homepage = "https://lensfun.github.io";
   };
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index de874cea3f1..11f1c7fd9c6 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot
 , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Image processing and analysis library";
     homepage = "http://www.leptonica.org/";
-    license = stdenv.lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 6e68a9128d0..d0ba4718655 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
+{lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
 
 stdenv.mkDerivation rec {
   name = "lesstif-0.95.2";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     ./c-xpmpipethrough.patch
     ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open source clone of the Motif widget set";
     homepage = "http://lesstif.sourceforge.net";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 14d426701ba..0a1dabef328 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }:
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }:
 
 stdenv.mkDerivation rec {
   pname = "leveldb";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ snappy ];
 
   nativeBuildInputs = []
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildPhase = ''
     make all
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     cp out-static/leveldbutil $out/bin
   ";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/leveldb";
     description = "Fast and lightweight key/value database library by Google";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix
index 7cf6329a77e..c5d6877a844 100644
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/pkgs/development/libraries/levmar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "levmar-2.6";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
     homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix
index 39e3e2e660f..db0bd26f4d2 100644
--- a/pkgs/development/libraries/lib3ds/default.nix
+++ b/pkgs/development/libraries/lib3ds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "lib3ds-1.3.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
     homepage = "http://lib3ds.sourceforge.net/";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
 
diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix
index 10732a14e48..fec910bd595 100644
--- a/pkgs/development/libraries/lib3mf/default.nix
+++ b/pkgs/development/libraries/lib3mf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "lib3mf";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reference implementation of the 3D Manufacturing Format file standard";
     homepage = "https://3mf.io/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix
index 8936603d18b..1c88459ba9b 100644
--- a/pkgs/development/libraries/libAfterImage/default.nix
+++ b/pkgs/development/libraries/libAfterImage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib }:
+{ lib, stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation {
   pname = "libAfterImage";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.afterstep.org/afterimage/";
     description = "A generic image manipulation library";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
index 59afede9cae..c059b9d412a 100644
--- a/pkgs/development/libraries/libHX/default.nix
+++ b/pkgs/development/libraries/libHX/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "libHX-3.22";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sh autogen.sh
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libhx.sourceforge.net/";
     longDescription = ''
       libHX is a C library (with some C++ bindings available) that provides data structures
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
index 714708a6e0d..7d762fc8077 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
+{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   name = "libLAS-1.8.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
   };
 
-  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ];
 
   cmakeFlags = [
@@ -20,15 +20,15 @@ stdenv.mkDerivation rec {
     "-DCMAKE_EXE_LINKER_FLAGS=-pthread"
   ];
 
-  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib
   '';
 
   meta = {
     description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
     homepage = "https://liblas.org";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.michelk ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.michelk ];
   };
 }
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index d6c90ee172b..c3934db5b3f 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
+{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
 
 # library that allows libbluray to play AACS protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ yacc flex ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.videolan.org/developers/libaacs.html";
     description = "Library to access AACS protected Blu-Ray disks";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix
index fdfd855470d..e3c960681c5 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/pkgs/development/libraries/libaal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "1.0.6";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.namesys.com/";
     description = "Support library for Reiser4";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ ];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix
index c2d81e31f3e..7543c6ddff7 100644
--- a/pkgs/development/libraries/libabigail/default.nix
+++ b/pkgs/development/libraries/libabigail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoreconfHook
 , elfutils
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     patchShebangs tests/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ABI Generic Analysis and Instrumentation Library";
     homepage = "https://sourceware.org/libabigail/";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix
index 4e33f30e8c1..f1c4f49adc6 100644
--- a/pkgs/development/libraries/libabw/default.nix
+++ b/pkgs/development/libraries/libabw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }:
+{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libabw";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ boost doxygen gperf librevenge libxml2 perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw";
     description = "Library parsing abiword documents";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 3467b6c84c8..8dfc222f36a 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales
+{ lib, stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales
 , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
 
 stdenv.mkDerivation rec {
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for managing accounts which can be used from GLib applications";
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix
index bf6fd029de1..4c539860be7 100644
--- a/pkgs/development/libraries/libaec/default.nix
+++ b/pkgs/development/libraries/libaec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab
+{ lib, stdenv, fetchFromGitLab
 , cmake
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.dkrz.de/k202009/libaec";
     description = "Adaptive Entropy Coding library";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index 708aaff9bda..7aeccdf583e 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc
+{ lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc
 , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL
 , libsndfile, portaudio, libmysqlclient, fontconfig
 }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform GUI toolkit";
     homepage = "http://libagar.org/index.html";
     license = with licenses; bsd3;
diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix
index 4de113718d4..2b31da7aa53 100644
--- a/pkgs/development/libraries/libagar/libagar_test.nix
+++ b/pkgs/development/libraries/libagar/libagar_test.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
+{ lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
 
 let srcs = import ./srcs.nix { inherit fetchurl; }; in
 stdenv.mkDerivation {
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tests for libagar";
     homepage = "http://libagar.org/index.html";
     license = with licenses; bsd3;
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index eca7170bfff..2985d4ad212 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl }:
+{ lib, stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "libamqpcpp";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for communicating with a RabbitMQ server";
     homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix
index 4c3d1d2a213..d51eac7bdb6 100644
--- a/pkgs/development/libraries/libantlr3c/default.nix
+++ b/pkgs/development/libraries/libantlr3c/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libantlr3c-3.4";
@@ -7,9 +7,9 @@ stdenv.mkDerivation {
     sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa";
   };
 
-  configureFlags = stdenv.lib.optional stdenv.is64bit "--enable-64bit";
+  configureFlags = lib.optional stdenv.is64bit "--enable-64bit";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C runtime libraries of ANTLR v3";
     homepage = "https://www.antlr3.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index e702e292a0f..99d38f0cfc4 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     longDescription = ''
       Libao is Xiph.org's cross-platform audio library that allows
       programs to output audio using a simple API on a wide variety of
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index 2ebabe3273f..9706cda03f8 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }:
+{ lib, stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "libaom";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "bin" "dev" "static" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Alliance for Open Media AV1 codec library";
     longDescription = ''
       Libaom is the reference implementation of the AV1 codec from the Alliance
diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix
index 38c501a8287..a6b9d531abf 100644
--- a/pkgs/development/libraries/libaosd/default.nix
+++ b/pkgs/development/libraries/libaosd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, cairo, pango,
+{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, pango,
   libX11, libXcomposite, autoconf, automake }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     longDescription = ''
       libaosd is an advanced on screen display library.
 
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 6bc2ddb7d13..a8fb7e38265 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,5 +1,5 @@
 {
-  fetchFromGitHub, stdenv, pkg-config, autoreconfHook,
+  fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook,
   acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd,
 
   # Optional but increases closure only negligibly. Also, while libxml2
@@ -25,15 +25,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs =
-    stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils
+    lib.optional stdenv.hostPlatform.isUnix sharutils
     ++ [ zlib bzip2 openssl xz lzo zstd ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
-    ++ stdenv.lib.optional xarSupport libxml2;
+    ++ lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
+    ++ lib.optional xarSupport libxml2;
 
   # Without this, pkg-config-based dependencies are unhappy
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ];
+  propagatedBuildInputs = lib.optionals stdenv.isLinux [ attr acl ];
 
-  configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2";
+  configureFlags = lib.optional (!xarSupport) "--without-xml2";
 
   preBuild = if stdenv.isCygwin then ''
     echo "#include <windows.h>" >> config.h
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://libarchive.org";
     changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = with stdenv.lib.platforms; all;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = lib.licenses.bsd3;
+    platforms = with lib.platforms; all;
+    maintainers = with lib.maintainers; [ jcumming ];
   };
 }
diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix
index f559c10456b..2003c8957ff 100644
--- a/pkgs/development/libraries/libargon2/default.nix
+++ b/pkgs/development/libraries/libargon2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   pname = "libargon2";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "PKGCONFIG_REL=lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015";
     longDescription = ''
       A password-hashing function created by by Alex Biryukov, Daniel Dinu, and
diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix
index 561e7e1017d..8d5b6d128dd 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libevent, openssl }:
+{ lib, stdenv, fetchurl, libevent, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "libasr";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libevent openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/OpenSMTPD/libasr";
     description = "Free, simple and portable asynchronous resolver library";
     license = licenses.isc;
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 031d36b58a8..6a180cb62c1 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, yasm
+{ lib, stdenv, fetchurl, pkg-config, yasm
 , freetype, fribidi, harfbuzz
 , encaSupport ? true, enca ? null # enca support
 , fontconfigSupport ? true, fontconfig ? null # fontconfig support
@@ -14,7 +14,7 @@ let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libass";
   version = "0.15.0";
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index aa798668f8e..a531cdff5b9 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, npth, libgpgerror, buildPackages }:
+{ fetchurl, lib, stdenv, gettext, npth, libgpgerror, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "libassuan";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "IPC library used by GnuPG and related software";
     longDescription = ''
       Libassuan is a small library implementing the so-called Assuan
diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix
index 8dae2f92b4d..b48971bc431 100644
--- a/pkgs/development/libraries/libast/default.nix
+++ b/pkgs/development/libraries/libast/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , pkg-config }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library of Assorted Spiffy Things";
     homepage = "https://www.eterm.org";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix
index 9a91551c3a4..0dc26b68611 100644
--- a/pkgs/development/libraries/libasyncns/default.nix
+++ b/pkgs/development/libraries/libasyncns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libasyncns-0.8";
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg";
   };
 
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://0pointer.de/lennart/projects/libasyncns/";
     description = "A C library for Linux/Unix for executing name service queries asynchronously";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index b576896876e..995d3809e4e 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 }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "libatomic_ops";
@@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
+  nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
 
-  preConfigure = stdenv.lib.optionalString stdenv.isCygwin ''
+  preConfigure = lib.optionalString stdenv.isCygwin ''
     sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
     ./autogen.sh
   '';
 
   meta = {
     description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = with stdenv.lib.platforms; unix ++ windows;
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = with lib.platforms; unix ++ windows;
   };
 }
diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix
index a1ee01100b4..f90815f4ee9 100644
--- a/pkgs/development/libraries/libaudclient/default.nix
+++ b/pkgs/development/libraries/libaudclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, dbus-glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib, dbus-glib }:
 
 stdenv.mkDerivation rec {
   name = "libaudclient-3.5-rc2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib dbus-glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Legacy D-Bus client library for Audacious";
     homepage = "https://audacious-media-player.org/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index a712678b793..51aa634e408 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash
+{ lib, stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash
 , mp3Support    ? true,   lame      ? null
 , speexSupport  ? true,   speex     ? null
 , theoraSupport ? true,   libtheora ? null
@@ -17,7 +17,7 @@
 
 assert faacSupport -> enableUnfree;
 
-let inherit (stdenv.lib) optional hasPrefix enableFeature; in
+let inherit (lib) optional hasPrefix enableFeature; in
 
 /* ToDo:
     - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools
@@ -52,7 +52,7 @@ let
     '';
 
     configurePlatforms = [];
-    configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; [
+    configureFlags = assert lib.all (x: x!=null) buildInputs; [
       "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
       "--target_os=${stdenv.hostPlatform.parsed.kernel.name}"
       #"--enable-postproc" # it's now a separate package in upstream
@@ -120,7 +120,7 @@ let
 
     passthru = { inherit vdpauSupport; };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://libav.org/";
       description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
       license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 8f4a678cb37..d9c10415b67 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libraw1394 }:
+{ lib, stdenv, fetchurl, pkg-config, libraw1394 }:
 
 stdenv.mkDerivation rec {
   name = "libavc1394-0.5.4";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
     homepage = "https://sourceforge.net/projects/libavc1394/";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index 25422c8b7d9..8c33e6f1b6d 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , libaom
 , cmake
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     dav1d
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description  = "C implementation of the AV1 Image File Format";
     longDescription = ''
       Libavif aims to be a friendly, portable C implementation of the
diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix
index 248c33f7e0e..ef9823130f4 100644
--- a/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/pkgs/development/libraries/libayatana-appindicator/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gtk=${gtkVersion}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ayatana Application Indicators Shared Library";
     homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator";
     changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog";
diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix
index dd9bc616944..c3c271c1719 100644
--- a/pkgs/development/libraries/libayatana-indicator/default.nix
+++ b/pkgs/development/libraries/libayatana-indicator/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gtk=${gtkVersion}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ayatana Indicators Shared Library";
     homepage = "https://github.com/AyatanaIndicators/libayatana-indicator";
     changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog";
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index dad5d40ea53..b142a0a4156 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libb2";
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  configureFlags = stdenv.lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes";
+  configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes";
 
   nativeBuildInputs = [ autoconf automake libtool pkg-config ];
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The BLAKE2 family of cryptographic hash functions";
     homepage = "https://blake2.net/";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix
index 3c9a9768427..f524e9321f9 100644
--- a/pkgs/development/libraries/libb64/default.nix
+++ b/pkgs/development/libraries/libb64/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "libb64";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "ANSI C routines for fast base64 encoding/decoding";
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.publicDomain;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix
index ea7f4eb9fa8..93927807af8 100644
--- a/pkgs/development/libraries/libbacktrace/default.nix
+++ b/pkgs/development/libraries/libbacktrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub
+{ lib, stdenv, callPackage, fetchFromGitHub
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     "--enable-static=${yesno enableStatic}"
     "--enable-shared=${yesno enableShared}"
   ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces";
     homepage = https://github.com/ianlancetaylor/libbacktrace;
     maintainers = with maintainers; [ twey ];
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 411c3ae740f..7c458bae19c 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook,
+{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook,
   which }:
 
 stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     mkdir -p $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/binaryanalysisplatform/bap-bindings";
     description = "A C library for interacting with BAP";
     maintainers = [ maintainers.maurer ];
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index c9b7bfa3c0e..ca7b305122e 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }:
+{ lib, 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.
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.videolan.org/developers/libbdplus.html";
     description = "Library to access BD+ protected Blu-Ray disks";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 75db780b7bb..499f04349b5 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped
 , libiberty, zlib
 }:
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for manipulating containers of machine code";
     longDescription = ''
       BFD is a library which provides a single interface to read and write
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index 1ea610883b5..11a65006422 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc
+{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc
 , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
 , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
 , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
@@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/lvm-cache-stats --prefix PATH : \
-      ${stdenv.lib.makeBinPath [ thin-provisioning-tools ]}
+      ${lib.makeBinPath [ thin-provisioning-tools ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for manipulating block devices";
     homepage = "http://storaged.org/libblockdev/";
     license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils
diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix
index aff56994f49..6ba832fb3cd 100644
--- a/pkgs/development/libraries/libblocksruntime/default.nix
+++ b/pkgs/development/libraries/libblocksruntime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, clang }:
+{ lib, stdenv, fetchFromGitHub, clang }:
 
 stdenv.mkDerivation {
   name = "blocksruntime-20140624";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   installPhase = ''prefix="/" DESTDIR=$out ./installlib'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Installs the BlocksRuntime library from the compiler-rt";
     homepage = "https://github.com/mackyle/blocksruntime";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix
index bf72720019c..7cb4c9e2b32 100644
--- a/pkgs/development/libraries/libbluedevil/default.nix
+++ b/pkgs/development/libraries/libbluedevil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4 }:
+{ lib, stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
   pname = "libbluedevil";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ qt4 ];
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 948b48b192d..3f90bb878ad 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration
+{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration
 , withJava ? false, jdk ? null, ant ? null
 , withAACS ? false, libaacs ? null
 , withBDplus ? false, libbdplus ? null
@@ -6,7 +6,7 @@
 , withFonts ? true, freetype ? null
 }:
 
-with stdenv.lib;
+with lib;
 
 assert withJava -> jdk != null && ant != null;
 assert withAACS -> libaacs != null;
@@ -50,13 +50,13 @@ stdenv.mkDerivation rec {
     ${optionalString withJava ''export JDK_HOME="${jdk.home}"''}
   '';
 
-  configureFlags =  with stdenv.lib;
+  configureFlags =  with lib;
                     optional (! withJava) "--disable-bdjava-jar"
                  ++ optional (! withMetadata) "--without-libxml2"
                  ++ optional (! withFonts) "--without-freetype"
                  ;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.videolan.org/developers/libbluray.html";
     description = "Library to access Blu-Ray disks for video playback";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 7aea38bdb58..778b61d8315 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libbsd";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./darwin.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common functions found on BSD systems";
     homepage = "https://libbsd.freedesktop.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index 1d2043b20cd..e03d7c19484 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, perl, stdenv, cmake }:
+{ fetchFromGitHub, perl, lib, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libbson";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C Library for parsing, editing, and creating BSON documents";
     homepage = "https://github.com/mongodb/libbson";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
index 42c680835f1..02e73b0c04c 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libburn";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libburnia-project.org/";
     description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix
index f972feacda3..a84f010b9e6 100644
--- a/pkgs/development/libraries/libbytesize/default.nix
+++ b/pkgs/development/libraries/libbytesize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
 , gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl
 , python3, pcre2, gmp, mpfr
 }:
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ pcre2 gmp mpfr ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tiny library providing a C “class” for working with arbitrary big sizes in bytes";
     homepage = src.meta.homepage;
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index 642b0a27aa6..ca879a60c7a 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2
+{ lib, stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2
 , x11Support ? !stdenv.isDarwin, libX11, libXext
 }:
 
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
     (if x11Support then "--enable-x11" else "--disable-x11")
     ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
+  NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
 
   enableParallelBuilding = true;
 
   propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ]
-    ++ stdenv.lib.optionals x11Support [ libX11 libXext ];
+    ++ lib.optionals x11Support [ libX11 libXext ];
 
   postInstall = ''
     mkdir -p $dev/bin
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://libcaca.zoy.org/";
     description = "A graphics library that outputs text instead of pixels";
-    license = stdenv.lib.licenses.wtfpl;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.wtfpl;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix
index 8ba9e34c9d3..c484a49b1a2 100644
--- a/pkgs/development/libraries/libcacard/default.nix
+++ b/pkgs/development/libraries/libcacard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, nss }:
+{ lib, stdenv, fetchurl, pkg-config, glib, nss }:
 
 stdenv.mkDerivation rec {
   pname = "libcacard";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib nss ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Smart card emulation library";
     homepage = "https://gitlab.freedesktop.org/spice/libcacard";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index fb806aa2496..a2dfe1322f8 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch = (stdenv.lib.optional stdenv.isDarwin) ''
+  postPatch = (lib.optional stdenv.isDarwin) ''
     patch -p0 < ${fetchpatch {
       url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff";
       sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31";
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
 
     homepage = "http://0pointer.de/lennart/projects/libcanberra/";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index 506c3a3d3d6..c6bbbcdb61a 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:
+{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "libcangjie";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
       libcangjie is a library implementing the Cangjie input method.
     '';
     homepage = "http://cangjians.github.io/projects/libcangjie/";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
-    maintainers = [ stdenv.lib.maintainers.linquize ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.linquize ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
index ae5154eac03..349b715d852 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, cmocka }:
+{ lib, stdenv, fetchFromGitHub, cmake, cmocka }:
 
 stdenv.mkDerivation rec {
   pname = "libcbor";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CBOR protocol implementation for C and others";
     homepage = "https://github.com/PJK/libcbor";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix
index abc5f84a0e3..e5f6324e261 100644
--- a/pkgs/development/libraries/libcdaudio/default.nix
+++ b/pkgs/development/libraries/libcdaudio/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libcdaudio-0.99.12p2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A portable library for controlling audio CDs";
     homepage = "http://libcdaudio.sourceforge.net";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl2;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix
index 2b837ff1ce1..c1b28e22e10 100644
--- a/pkgs/development/libraries/libcddb/default.nix
+++ b/pkgs/development/libraries/libcddb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiconv }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libcddb-1.3.2";
@@ -8,16 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim";
   };
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
 
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
   doCheck = false; # fails 3 of 5 tests with locale errors
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library to access data on a CDDB server (freedb.org)";
     homepage = "http://libcddb.sourceforge.net/";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix
index 92820772619..905d39dbd8e 100644
--- a/pkgs/development/libraries/libcdio-paranoia/default.nix
+++ b/pkgs/development/libraries/libcdio-paranoia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config,
   libiconv, IOKit, DiskArbitration}:
 
 stdenv.mkDerivation {
@@ -13,15 +13,15 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libcdio ] ++
-    stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
+    lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
 
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration;
+  propagatedBuildInputs = lib.optional stdenv.isDarwin DiskArbitration;
 
-  configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+  configureFlags = lib.optionals stdenv.isDarwin [
     "--disable-ld-version-script"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CD paranoia on top of libcdio";
     longDescription = ''
       This is a port of xiph.org's cdda paranoia to use libcdio for CDROM
diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index e7705362894..cfe796b14d0 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
+{ lib, stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
 
 stdenv.mkDerivation rec {
   name = "libcdio-2.1.0";
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config help2man ];
   buildInputs = [ libcddb ncurses ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for OS-independent CD-ROM and CD image access";
     longDescription = ''
       GNU libcdio is a library for OS-independent CD-ROM and
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 20f45bc1bce..087c928b79c 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
+{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
 
 stdenv.mkDerivation rec {
   name = "libcdr-0.1.6";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A library providing ability to interpret and import Corel Draw drawings into various applications";
     homepage = "http://www.freedesktop.org/wiki/Software/libcdr";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.mpl20;
+    platforms = lib.platforms.all;
+    license = lib.licenses.mpl20;
   };
 }
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index e8c649c9660..341754376aa 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
 
 let version = "4.0.7"; in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ udev libcec_platform ] ++
-    stdenv.lib.optional (libraspberrypi != null) libraspberrypi;
+    lib.optional (libraspberrypi != null) libraspberrypi;
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];
 
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
     substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling";
     homepage = "http://libcec.pulse-eight.com";
     repositories.git = "https://github.com/Pulse-Eight/libcec.git";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.titanous ];
   };
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 2132cf7a065..15972272a18 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 let version = "2.1.0.1"; in
 
@@ -13,11 +13,11 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Platform library for libcec and Kodi addons";
     homepage = "https://github.com/Pulse-Eight/platform";
     repositories.git = "https://github.com/Pulse-Eight/platform.git";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.titanous ];
   };
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 93aaebc110e..ec1a5ee3828 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
+{ lib, stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
 , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
 , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
 , libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core
@@ -6,7 +6,7 @@
 
 let
   libPath =
-    stdenv.lib.makeLibraryPath [
+    lib.makeLibraryPath [
       alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
       libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
       libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     cp -r ../include $out/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple framework for embedding Chromium-based browsers in other applications";
     homepage = "http://opensource.spotify.com/cefbuilds/index.html";
     maintainers = with maintainers; [ puffnfresh ];
diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix
index 908c9cb15dd..100077bcc70 100644
--- a/pkgs/development/libraries/libcello/default.nix
+++ b/pkgs/development/libraries/libcello/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libcello";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://libcello.org/";
     description = "Higher level programming in C";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.MostAwesomeDude ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.MostAwesomeDude ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index adf85428eea..22a062acd6e 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3
+{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3
 , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.12.20";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2";
   };
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/libchamplain";
     license = licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
index 168217678c0..260c332f7ef 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libchardet";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's Universal Charset Detector C/C++ API";
     homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html";
     license = licenses.mpl11;
diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix
index cd2df385f48..1436d4bd59d 100644
--- a/pkgs/development/libraries/libchewing/default.nix
+++ b/pkgs/development/libraries/libchewing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sqlite }:
+{ lib, stdenv, fetchurl, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "libchewing";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intelligent Chinese phonetic input method";
     homepage = "http://chewing.im/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index 6e8ed7a04a2..f02ac04621f 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib, bzip2, libgcrypt
+{ fetchurl, lib, stdenv, zlib, bzip2, libgcrypt
 , gdbm, gperf, tdb, gnutls, db, libuuid
 , lzo, pkg-config, guile, rpcsvc-proto, libtirpc
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools & library for data backup and distributed storage";
 
     longDescription =
diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/development/libraries/libck/default.nix
index c4f38e96f3d..accb6556011 100644
--- a/pkgs/development/libraries/libck/default.nix
+++ b/pkgs/development/libraries/libck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "ck";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance concurrency research library";
     longDescription = ''
       Concurrency primitives, safe memory reclamation mechanisms and non-blocking data structures for the research, design and implementation of high performance concurrent systems.
diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index 0672e7942cb..a6334bf9998 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, llvmPackages }:
+{ lib, stdenv, fetchFromGitHub, python, llvmPackages }:
 
 let
   llvm = llvmPackages.llvm;
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libclc.llvm.org/";
     description = "Implementation of the library requirements of the OpenCL C programming language";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index 6cabe1343c4..ceb0338e5cc 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl }:
+{ lib, stdenv, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libcli";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Emulate a Cisco-style telnet command-line interface";
     homepage = "http://sites.dparrish.com/libcli";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix
index 37f77bb0d76..08601db0834 100644
--- a/pkgs/development/libraries/libcloudproviders/default.nix
+++ b/pkgs/development/libraries/libcloudproviders/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }:
 
 # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DBus API that allows cloud storage sync clients to expose their services";
     homepage = "https://gitlab.gnome.org/World/libcloudproviders";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index 53cff9a19d3..e4548420a05 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libclthreads";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Zita thread library";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index c02a913613d..0d39a5e55b2 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }:
+{ lib, stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libclxclient";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Zita X11 library";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix
index 1a97e544bb2..2898c9a1c83 100644
--- a/pkgs/development/libraries/libcmis/default.nix
+++ b/pkgs/development/libraries/libcmis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }:
+{ lib, stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }:
 
 stdenv.mkDerivation rec {
   pname = "libcmis";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ client library for the CMIS interface";
     homepage = "https://sourceforge.net/projects/libcmis/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/pkgs/development/libraries/libco-canonical/default.nix
index 689fbbb65bf..a01bbf7419c 100644
--- a/pkgs/development/libraries/libco-canonical/default.nix
+++ b/pkgs/development/libraries/libco-canonical/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, pkg-config }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libco-canonical";
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index f945434842e..df8db3ac9f8 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, collectd }:
-with stdenv.lib;
+{ lib, stdenv, collectd }:
+with lib;
 
 collectd.overrideAttrs (oldAttrs: {
   name = "libcollectdclient-${collectd.version}";
@@ -12,7 +12,7 @@ collectd.overrideAttrs (oldAttrs: {
 
   postInstall = "rm -rf $out/{bin,etc,sbin,share}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C Library for collectd, a daemon which collects system performance statistics periodically";
     homepage = "http://collectd.org";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 3f91c8e579f..47360e11bc5 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , qtbase, qtdeclarative, qmake, which
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = "rm -rf lib";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform IRC framework written with Qt";
     homepage = "https://communi.github.io";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
index 7d7f95d757c..ae5f1176463 100644
--- a/pkgs/development/libraries/libconfig/default.nix
+++ b/pkgs/development/libraries/libconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libconfig";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.hyperrealm.com/libconfig";
     description = "A simple library for processing structured configuration files";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix
index b7afe5ed03a..7545fe9617c 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/pkgs/development/libraries/libconfuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, flex }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex }:
 
 stdenv.mkDerivation rec {
   pname = "libconfuse";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = true;
   installCheckTarget = "check";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Small configuration file parser library for C";
     longDescription = ''
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index aab90f8e37f..9f75eafdf24 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}:
 
 stdenv.mkDerivation rec {
   pname = "libcouchbase";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C client library for Couchbase";
     homepage = "https://github.com/couchbase/libcouchbase";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
index 20bcc9183ec..e7a6e6c9837 100644
--- a/pkgs/development/libraries/libcrafter/default.nix
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
+{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
 
 stdenv.mkDerivation rec {
   pname = "libcrafter";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/pellegre/libcrafter";
     description = "High level C++ network packet sniffing and crafting library";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.lethalman ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.lethalman ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix
index 1368cd30adb..902f5a6ee26 100644
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/pkgs/development/libraries/libcredis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libcredis-0.2.3";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     cp -v *.h "$out/include/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C client library for Redis (key-value database)";
     homepage = "https://code.google.com/archive/p/credis/";
     license = licenses.bsd3; # from homepage
diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix
index 8e2be72987c..c81dbb86f6a 100644
--- a/pkgs/development/libraries/libcrossguid/default.nix
+++ b/pkgs/development/libraries/libcrossguid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libuuid }:
+{ lib, stdenv, fetchFromGitHub, libuuid }:
 
 stdenv.mkDerivation rec {
   name = "lib" + pname + "-" + version;
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     install -D -m644 guid.h "$out/include/guid.h"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight cross platform C++ GUID/UUID library";
     license = licenses.mit;
     maintainers = with maintainers; [ edwtjo ];
diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix
index 6a9b87d00d9..5fdd60abe11 100644
--- a/pkgs/development/libraries/libcryptui/default.nix
+++ b/pkgs/development/libraries/libcryptui/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }:
 
 stdenv.mkDerivation rec {
   pname = "libcryptui";
   version = "3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interface components for OpenPGP";
     homepage = "https://gitlab.gnome.org/GNOME/libcryptui";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix
index fcb5aa2bbfe..e30165054aa 100644
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/pkgs/development/libraries/libcsptr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libcsptr";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Smart pointer constructs for the (GNU) C programming language";
     homepage = "https://github.com/Snaipe/libcsptr";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libctb/default.nix b/pkgs/development/libraries/libctb/default.nix
index 161c7c98c63..d52adac556d 100644
--- a/pkgs/development/libraries/libctb/default.nix
+++ b/pkgs/development/libraries/libctb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   pname = "libctb";
   version = "0.16";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "prefix=$(out)"
   ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Communications toolbox";
     homepage = "https://iftools.com";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index b571e816fc4..2aa36bfe991 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }:
+{ lib, stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "ctemplate";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
       embed application logic in this template language.
     '';
     homepage = "https://github.com/OlafvdSpek/ctemplate";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index 73a110c07f6..227dfd77f46 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, bison, flex }:
+{ lib, stdenv, fetchFromGitHub, cmake, bison, flex }:
 
 stdenv.mkDerivation rec {
   pname = "libcue";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails all the tests (ctest)
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CUE Sheet Parser Library";
     longDescription = ''
       libcue is intended to parse a so called cue sheet from a char string or
diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
index d463e4af289..7a5c3984929 100644
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, xercesc }:
+{ lib, stdenv, fetchurl, xercesc }:
 
 stdenv.mkDerivation rec {
   pname = "libcutl";
   version = "1.10.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ utility library from Code Synthesis";
     longDescription = ''
         libcutl is a C++ utility library.
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index d906e119dca..eeb034ed067 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "libdaemon-0.14";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   patches = [ ./fix-includes.patch ];
 
   configureFlags = [ "--disable-lynx" ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
     [ # Can't run this test while cross-compiling
       "ac_cv_func_setpgrp_void=yes"
     ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight C library that eases the writing of UNIX daemons";
     homepage = "http://0pointer.de/lennart/projects/libdaemon/";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index a643c25f0bf..8eacd9706a8 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
+{ lib, stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
 
 stdenv.mkDerivation rec {
   version = "3.20.6";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ SDK which contains an implementation of DAP";
     homepage = "https://www.opendap.org/software/libdap";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix
index 168773662f6..f4e2df36d91 100644
--- a/pkgs/development/libraries/libdatrie/default.nix
+++ b/pkgs/development/libraries/libdatrie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , autoreconfHook, autoconf-archive
 , installShellFiles, libiconv }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     installShellFiles
   ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
 
   preAutoreconf = let
     reports = "https://github.com/tlwg/libdatrie/issues";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     installManPage man/trietool.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://linux.thai.net/~thep/datrie/datrie.html";
     description = "This is an implementation of double-array structure for representing trie";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index a4cc7d96593..d6ecb6e9747 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2
+{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1";
   };
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to delight your users with fancy features";
     longDescription = ''
       The libdazzle library is a companion library to GObject and GTK. It
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 871c9f97167..6a86d4941bf 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, libdbi
+{ lib, stdenv, fetchurl, libdbi
 , libmysqlclient ? null
 , sqlite ? null
 , postgresql ? null
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   name = "libdbi-drivers-0.9.0";
 
diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix
index 64c511503d0..48812f091be 100644
--- a/pkgs/development/libraries/libdbi/default.nix
+++ b/pkgs/development/libraries/libdbi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libdbi-0.9.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libdbi.sourceforge.net/";
     description = "DB independent interface to DB";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 6b4be0db414..e44f3e37d20 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, cmake }:
+{ lib, stdenv, fetchurl, qt4, cmake }:
 
 let
   baseName = "libdbusmenu-qt";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DWITH_DOC=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
     inherit homepage;
     inherit (qt4.meta) platforms;
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index d7eab296809..5ce811e9fea 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, qtbase }:
+{ lib, stdenv, fetchgit, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "libdbusmenu-qt";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DWITH_DOC=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/libdbusmenu-qt";
     description = "Provides a Qt implementation of the DBusMenu spec";
     maintainers = [ maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index 8a688ef37c6..a666eb3a650 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libraw1394
+{ lib, stdenv, fetchurl, libraw1394
 , libusb1, CoreServices }:
 
 stdenv.mkDerivation rec {
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libusb1 ]
-    ++ stdenv.lib.optional stdenv.isLinux libraw1394
-    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+    ++ lib.optional stdenv.isLinux libraw1394
+    ++ lib.optional stdenv.isDarwin CoreServices;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/projects/libdc1394/";
     description = "Capture and control API for IIDC compliant cameras";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix
index a398a6fab72..bbbcdc3f054 100644
--- a/pkgs/development/libraries/libde265/default.nix
+++ b/pkgs/development/libraries/libde265/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.0.8";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/strukturag/libde265";
     description = "Open h.265 video codec implementation";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ gebner ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ gebner ];
   };
 
 }
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index b674087c759..fa48c773dfc 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL
+{ lib, stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL
 , libX11, pkg-config, OpenGL
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ];
+    ++ lib.optionals stdenv.isDarwin [ OpenGL ];
   nativeBuildInputs = [ pkg-config ];
 
   configureFlags = [ "--enable-ILU" "--enable-ILUT" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -i 's, -std=gnu99,,g' configure
     sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in
   '';
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://openil.sourceforge.net/";
     description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix
index 5936853dcbc..7ee268e4e7d 100644
--- a/pkgs/development/libraries/libdigidoc/default.nix
+++ b/pkgs/development/libraries/libdigidoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }:
+{ lib, stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }:
 
 stdenv.mkDerivation rec {
 
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ openssl pcsclite opensc libxml2 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+    ++ lib.optionals stdenv.isDarwin [ Security ];
 
-  cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ];
+  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     homepage = "https://github.com/open-eid/libdigidoc";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index ad0f5f50bf2..f7170fa7f10 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
+{ lib, stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
 , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     xml-security-c xsd zlib xalanc
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     homepage = "http://www.id.ee/";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index bdfb5d8b304..3021aced93f 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config, darwin }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "libdiscid";
@@ -6,16 +6,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
 
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";
     sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit";
+  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for creating MusicBrainz DiscIDs from audio CDs";
     homepage = "http://musicbrainz.org/doc/libdiscid";
     maintainers = with maintainers; [ ehmry ];
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix
index 5f9417bd03c..0f65a5cee5c 100644
--- a/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/pkgs/development/libraries/libdivecomputer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libdivecomputer";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.libdivecomputer.org";
     description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
     maintainers = [ maintainers.mguentner ];
diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix
index 0d82db7cee4..0f332f8ac74 100644
--- a/pkgs/development/libraries/libdivsufsort/default.nix
+++ b/pkgs/development/libraries/libdivsufsort/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libdivsufsort-2.0.1";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://github.com/y-256/libdivsufsort";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     description = "Library to construct the suffix array and the BW transformed string";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix
index bd23b6831a0..994f010252f 100644
--- a/pkgs/development/libraries/libdmtx/default.nix
+++ b/pkgs/development/libraries/libdmtx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config }:
+{ lib, stdenv, fetchurl, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libdmtx-0.7.4";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An open source software for reading and writing Data Matrix barcodes";
     homepage = "http://libdmtx.org";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     maintainers = [ ];
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix
index 176e0a22aba..43d9d2077fe 100644
--- a/pkgs/development/libraries/libdnet/default.nix
+++ b/pkgs/development/libraries/libdnet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, libtool}:
+{lib, stdenv, fetchurl, automake, autoconf, libtool}:
 
 stdenv.mkDerivation {
   name = "libdnet-1.12";
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Provides a simplified, portable interface to several low-level networking routines";
     homepage = "https://github.com/dugsong/libdnet";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index ed1e2cd74a3..ff3c7f6f863 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, popt }:
+{ lib, stdenv, fetchurl, popt }:
 
 stdenv.mkDerivation rec {
   name = "libdv-1.0.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # This fixes an undefined symbol: _sched_setscheduler error on compile.
   # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section
-  LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup";
+  LDFLAGS = lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup";
 
   configureFlags = [
     "--disable-asm"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ popt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = "https://sourceforge.net/projects/libdv/";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index 327aacb6f37..5d539a7a488 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "libdvbpsi";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0";
     homepage = "http://www.videolan.org/developers/libdvbpsi.html";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.lgpl21;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21;
   };
 
 }
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index f097aad702a..278e3d60d90 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, IOKit}:
+{lib, stdenv, fetchurl, IOKit}:
 
 stdenv.mkDerivation rec {
   pname = "libdvdcss";
   version = "1.4.2";
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
+  buildInputs = lib.optional stdenv.isDarwin IOKit;
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2";
     sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.videolan.org/developers/libdvdcss.html";
     description = "A library for decrypting DVDs";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix
index f5264587a16..1f832de5bb3 100644
--- a/pkgs/development/libraries/libdvdnav/4.2.1.nix
+++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, libdvdread}:
+{lib, stdenv, fetchurl, pkg-config, libdvdread}:
 
 stdenv.mkDerivation {
   name = "libdvdnav-4.2.1";
@@ -20,9 +20,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://dvdnav.mplayerhq.hu/";
     description = "A library that implements DVD navigation features such as DVD menus";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = lib.platforms.linux;
   };
 
   passthru = { inherit libdvdread; };
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index 5f26b943537..3eb1032b2a7 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, libdvdread}:
+{lib, stdenv, fetchurl, pkg-config, libdvdread}:
 
 stdenv.mkDerivation rec {
   pname = "libdvdnav";
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://dvdnav.mplayerhq.hu/";
     description = "A library that implements DVD navigation features such as DVD menus";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = lib.platforms.unix;
   };
 
   passthru = { inherit libdvdread; };
diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix
index 7f35c651b92..7049e1dd993 100644
--- a/pkgs/development/libraries/libdvdread/4.9.9.nix
+++ b/pkgs/development/libraries/libdvdread/4.9.9.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libdvdcss}:
+{lib, stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation {
   name = "libdvdread-4.9.9";
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://dvdnav.mplayerhq.hu/";
     description = "A library for reading DVDs";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 997018a2970..32dfe4ee0fa 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libdvdcss}:
+{lib, stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation rec {
   pname = "libdvdread";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://dvdnav.mplayerhq.hu/";
     description = "A library for reading DVDs";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index ba4ebaec111..0d512b04201 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libelf, zlib }:
+{ lib, stdenv, fetchurl, libelf, zlib }:
 
 let
   version = "20181024";
@@ -11,8 +11,8 @@ let
   };
   meta = {
     homepage = "https://www.prevanders.net/dwarf.html";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
   };
 
 in rec {
diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix
index 9b1aa3132e9..5a0347e5954 100644
--- a/pkgs/development/libraries/libdwg/default.nix
+++ b/pkgs/development/libraries/libdwg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, indent}:
+{lib, stdenv, fetchurl, indent}:
 
 stdenv.mkDerivation {
   name = "libdwg-0.6";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Library reading dwg files";
     homepage = "http://libdwg.sourceforge.net/en/";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix
index 2450ac6a9ea..4f1fd3904d9 100644
--- a/pkgs/development/libraries/libdynd/default.nix
+++ b/pkgs/development/libraries/libdynd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 let version = "0.7.2"; in
 stdenv.mkDerivation {
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" ];
   outputDoc = "dev";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ dynamic ndarray library, with Python exposure";
     homepage = "http://libdynd.org";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix
index 96b341dceae..5575d8b2c5e 100644
--- a/pkgs/development/libraries/libe-book/default.nix
+++ b/pkgs/development/libraries/libe-book/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu
+{ lib, stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu
 , cppunit, zlib, liblangtag
 }:
 
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''Library for import of reflowable e-book formats'';
-    license = stdenv.lib.licenses.lgpl21Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix
index 137c73990f6..49b75906bdb 100644
--- a/pkgs/development/libraries/libe57format/default.nix
+++ b/pkgs/development/libraries/libe57format/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   cmake,
   fetchFromGitHub,
   boost,
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading & writing the E57 file format (fork of E57RefImpl)";
     homepage = "https://github.com/asmaloney/libE57Format";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index da7a186bea6..70fab2da568 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, strace, which }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, strace, which }:
 
 stdenv.mkDerivation rec {
   pname = "libeatmydata";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-  ] ++ stdenv.lib.optionals doCheck [ strace which ];
+  ] ++ lib.optionals doCheck [ strace which ];
 
   # while we can *build* in parallel, the tests also run in parallel which does
   # not work with v105. Later versions (unreleased) have a fix for that. The
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small LD_PRELOAD library to disable fsync and friends";
     homepage = "https://www.flamingspork.com/projects/libeatmydata/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix
index 2fdb1d071b6..fe0011f9c99 100644
--- a/pkgs/development/libraries/libeb/default.nix
+++ b/pkgs/development/libraries/libeb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, zlib }:
+{ lib, stdenv, fetchurl, perl, zlib }:
 stdenv.mkDerivation rec {
   pname = "libeb";
   version = "4.4.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl ];
   buildInputs = [ zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for accessing Japanese CD-ROM books";
     longDescription = ''
       The EB library is a library for accessing CD-ROM books, which are a
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 4d8d2c10b67..5a8f1f00316 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libebml";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=YES"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extensible Binary Meta Language library";
     homepage = "https://dl.matroska.org/downloads/libebml/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix
index e349af41bcb..ba4f84f8c80 100644
--- a/pkgs/development/libraries/libebur128/default.nix
+++ b/pkgs/development/libraries/libebur128/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ speexdsp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implementation of the EBU R128 loudness standard";
     homepage = "https://github.com/jiixyj/libebur128";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix
index 957daf7dc41..29a0a63a03e 100644
--- a/pkgs/development/libraries/libechonest/default.nix
+++ b/pkgs/development/libraries/libechonest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:
 
 stdenv.mkDerivation rec {
   pname = "libechonest";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A C++/Qt wrapper around the Echo Nest API";
     homepage = "https://projects.kde.org/projects/playground/libs/libechonest";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 09bd41dbed0..92f3eeb7995 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "libedit";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.thrysoee.dk/editline/";
     description = "A port of the NetBSD Editline library (libedit)";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix
index e8ffa37379e..7172df01e22 100644
--- a/pkgs/development/libraries/libee/default.nix
+++ b/pkgs/development/libraries/libee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libestr }:
+{ lib, stdenv, fetchurl, pkg-config, libestr }:
 stdenv.mkDerivation {
   name = "libee-0.4.1";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.libee.org/";
     description = "An Event Expression Library inspired by CEE";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
   };
 }
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
index 63507051207..c3a4986c832 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk";
-    rev = (stdenv.lib.strings.toInt version);
+    rev = (lib.strings.toInt version);
     name = "elftoolchain-${version}";
   };
 
@@ -29,9 +29,9 @@ stdenv.mkDerivation (rec {
 
     homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/";
 
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
 
-    platforms = stdenv.lib.platforms.freebsd;
+    platforms = lib.platforms.freebsd;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index 2b56f973b5d..2b8cd51ba5f 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl, autoreconfHook, gettext
 }:
 
@@ -27,26 +27,26 @@ stdenv.mkDerivation rec {
   configureFlags = []
        # Configure check for dynamic lib support is broken, see
        # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes"
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes"
        # Libelf's custom NLS macros fail to determine the catalog file extension
        # on Darwin, so disable NLS for now.
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--disable-nls";
+    ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls";
 
   nativeBuildInputs = [ gettext ]
        # Need to regenerate configure script with newer version in order to pass
        # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`
        # which doesn't work with the bootstrapTools bash, so can only do this
        # for cross builds when `stdenv.shell` is a newer bash.
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook;
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook;
 
   meta = {
     description = "ELF object file access library";
 
     homepage = "https://github.com/Distrotech/libelf";
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix
index 8a8de854fc9..950639850db 100644
--- a/pkgs/development/libraries/libelfin/default.nix
+++ b/pkgs/development/libraries/libelfin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, python3, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "libelfin";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/aclements/libelfin/";
     license = licenses.mit;
     description = "C++11 ELF/DWARF parser";
diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix
index 54520116129..ee8dfb6e94f 100644
--- a/pkgs/development/libraries/libepc/default.nix
+++ b/pkgs/development/libraries/libepc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }:
 
 let
   avahiWithGtk = avahi.override { gtk3Support = true; };
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91";
   };
 
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy Publish and Consume Library";
     homepage = "https://wiki.gnome.org/Projects/libepc";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/development/libraries/liberfa/default.nix
index a1ca15536da..8ffd86cd316 100644
--- a/pkgs/development/libraries/liberfa/default.nix
+++ b/pkgs/development/libraries/liberfa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "erfa";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-shared" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Essential Routines for Fundamental Astronomy";
     homepage = "https://github.com/liberfa/erfa";
     maintainers = with maintainers; [ mir06 ];
diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix
index b4023d5f36a..7a40c1a83da 100644
--- a/pkgs/development/libraries/liberio/default.nix
+++ b/pkgs/development/libraries/liberio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , systemd
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ettus Research DMA I/O Library";
     homepage = "https://github.com/EttusResearch/liberio";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
index e5a7f5609a3..542cff712c8 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "libESMTP";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://brianstafford.info/libesmtp/index.html";
     description = "A Library for Posting Electronic Mail";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix
index add7ea00a98..8699e83d0fd 100644
--- a/pkgs/development/libraries/libestr/default.nix
+++ b/pkgs/development/libraries/libestr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libestr-0.1.11";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libestr.adiscon.com/";
     description = "Some essentials for string handling";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 9f950ebb09c..750cb3974cf 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , # Note: -static hasn’t work on darwin
   static ? with stdenv.hostPlatform; isStatic && !isDarwin
 }:
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh";
   };
 
-  configureFlags = stdenv.lib.optional (static) "LDFLAGS=-static";
+  configureFlags = lib.optional (static) "LDFLAGS=-static";
 
   meta = {
     description = "A high-performance event loop/event model with lots of features";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.bsd2; # or GPL2+
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd2; # or GPL2+
   };
 }
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index ba846ed07db..daae6984ab2 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python3 }:
+{ lib, stdenv, fetchurl, fetchpatch, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "libevdev";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wrapper library for evdev devices";
     homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/development/libraries/libevdevplus/default.nix
index d094bc35142..66c5f1b0696 100644
--- a/pkgs/development/libraries/libevdevplus/default.nix
+++ b/pkgs/development/libraries/libevdevplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libevdevplus";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Easy-to-use event device library in C++";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index cbde3206717..b33e94114f6 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, findutils, fixDarwinDylibNames
+{ lib, stdenv, fetchurl, findutils, fixDarwinDylibNames
 , sslSupport? true, openssl
 }:
 
@@ -16,25 +16,25 @@ stdenv.mkDerivation rec {
   # libevent_openssl is moved into its own output, so that openssl isn't present
   # in the default closure.
   outputs = [ "out" "dev" ]
-    ++ stdenv.lib.optional sslSupport "openssl"
+    ++ lib.optional sslSupport "openssl"
     ;
   outputBin = "dev";
   propagatedBuildOutputs = [ "out" ]
-    ++ stdenv.lib.optional sslSupport "openssl"
+    ++ lib.optional sslSupport "openssl"
     ;
 
   nativeBuildInputs = []
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
     ;
 
   buildInputs = []
-    ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optional stdenv.isCygwin findutils
+    ++ lib.optional sslSupport openssl
+    ++ lib.optional stdenv.isCygwin findutils
     ;
 
   doCheck = false; # needs the net
 
-  postInstall = stdenv.lib.optionalString sslSupport ''
+  postInstall = lib.optionalString sslSupport ''
     moveToOutput "lib/libevent_openssl*" "$openssl"
     substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \
       --replace "$out" "$openssl"
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Event notification library";
     longDescription = ''
       The libevent API provides a mechanism to execute a callback function
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index 759c0e40adc..b2246905456 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib, openssl, libuuid, pkg-config }:
+{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "20201129";
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library for support of the Expert Witness Compression Format";
     homepage = "https://sourceforge.net/projects/libewf/";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.raskin ] ;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl3;
+    maintainers = [ lib.maintainers.raskin ] ;
+    platforms = lib.platforms.unix;
     inherit version;
   };
 }
diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix
index feee754590b..f3f89209707 100644
--- a/pkgs/development/libraries/libexecinfo/default.nix
+++ b/pkgs/development/libraries/libexecinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , enableStatic ? true
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@@ -33,21 +33,21 @@ stdenv.mkDerivation rec {
   makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ];
 
   buildFlags =
-      stdenv.lib.optional enableStatic "static"
-   ++ stdenv.lib.optional enableShared "dynamic";
+      lib.optional enableStatic "static"
+   ++ lib.optional enableShared "dynamic";
 
   patchFlags = [ "-p0" ];
 
   installPhase = ''
     install -Dm644 execinfo.h stacktraverse.h -t $out/include
-  '' + stdenv.lib.optionalString enableShared ''
+  '' + lib.optionalString enableShared ''
     install -Dm755 libexecinfo.so.1 -t $out/lib
     ln -s $out/lib/libexecinfo.so{.1,}
-  '' + stdenv.lib.optionalString enableStatic ''
+  '' + lib.optionalString enableStatic ''
     install -Dm755 libexecinfo.a -t $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility";
     license = licenses.bsd2;
     homepage = "https://www.freshports.org/devel/libexecinfo";
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index a0f831e927e..20e69c4ad66 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "libexif";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook gettext ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libexif.github.io/";
     description = "A library to read and manipulate EXIF data in digital photographs";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 68c4fe807b3..59916bfb33f 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, substituteAll
+{ fetchurl, lib, stdenv, substituteAll
 , libtool, gettext, zlib, bzip2, flac, libvorbis
 , exiv2, libgsf, rpm, pkg-config, fetchpatch
 , gstreamerSupport ? true, gst_all_1 ? null
@@ -41,12 +41,12 @@ stdenv.mkDerivation rec {
       sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw";
       excludes = [ "ChangeLog" ];
     })
-  ] ++ stdenv.lib.optionals gstreamerSupport [
+  ] ++ lib.optionals gstreamerSupport [
 
     # Libraries cannot be wrapped so we need to hardcode the plug-in paths.
     (substituteAll {
       src = ./gst-hardcode-plugins.patch;
-      load_gst_plugins = stdenv.lib.concatMapStrings
+      load_gst_plugins = lib.concatMapStrings
         (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'')
         (gstPlugins gst_all_1);
     })
@@ -62,10 +62,10 @@ stdenv.mkDerivation rec {
    [ libtool gettext zlib bzip2 flac libvorbis exiv2
      libgsf rpm
      pkg-config
-   ] ++ stdenv.lib.optionals gstreamerSupport
+   ] ++ lib.optionals gstreamerSupport
           ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
-     ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ]
-     ++ stdenv.lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ];
+     ++ lib.optionals gtkSupport [ glib gtk3 ]
+     ++ lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ];
 
   configureFlags = [
     "--disable-ltdl-install"
@@ -105,9 +105,9 @@ stdenv.mkDerivation rec {
          additional MIME types are detected.
       '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index 3adb606dd2d..8e5cc8685da 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libexttextcat-3.4.5";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An N-Gram-Based Text Categorization library primarily intended for language guessing";
     homepage = "https://wiki.documentfoundation.org/Libexttextcat";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix
index 66b193d4ea8..85ff493ca04 100644
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/pkgs/development/libraries/libf2c/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
   name = "libf2c-20160102";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "F2c converts Fortran 77 source code to C";
     homepage = "http://www.netlib.org/f2c/";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix
index 4e7cc1df069..3e568759c1b 100644
--- a/pkgs/development/libraries/libfakekey/default.nix
+++ b/pkgs/development/libraries/libfakekey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }:
+{ lib, stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }:
 
 stdenv.mkDerivation rec {
   pname = "libfakekey";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 libXi libXtst xorgproto ];
   NIX_LDFLAGS = "-lX11";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "X virtual keyboard library";
     homepage = "https://www.yoctoproject.org/tools-resources/projects/matchbox";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index 6c751e07b83..170bb116a8a 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libfaketime";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-date-in-gzip-man-page.patch
-  ] ++ (stdenv.lib.optionals stdenv.cc.isClang [
+  ] ++ (lib.optionals stdenv.cc.isClang [
     # https://github.com/wolfcw/libfaketime/issues/277
     ./0001-Remove-unsupported-clang-flags.patch
   ]);
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
   PREFIX = placeholder "out";
   LIBDIRNAME = "/lib";
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation";
 
   checkInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Report faked system time to programs without having to change the system-wide time";
     homepage = "https://github.com/wolfcw/libfaketime/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/development/libraries/libff/default.nix
index 874f45cae70..72d2406aa82 100644
--- a/pkgs/development/libraries/libff/default.nix
+++ b/pkgs/development/libraries/libff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libff";
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
 
   # CMake is hardcoded to always build static library which causes linker
   # failure for Haskell applications depending on haskellPackages.hevm on macOS.
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED"
   '';
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ boost gmp openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library for Finite Fields and Elliptic Curves";
     changelog = "https://github.com/scipr-lab/libff/blob/develop/CHANGELOG.md";
     homepage = "https://github.com/scipr-lab/libff";
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 7fdc04d116e..8967ec49a09 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libffcall";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Foreign function call library";
     homepage = "https://www.gnu.org/software/libffcall/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index d7dad6d956d..29b76e34d65 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , autoreconfHook
 
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A foreign function call interface library";
     longDescription = ''
       The libffi library provides a portable, high level programming
diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index 75b483de6ac..f44ae4d01f2 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , cmake
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ hidapi libcbor openssl ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ udev ];
+    ++ lib.optionals stdenv.isLinux [ udev ];
 
   cmakeFlags = [
     "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
     Provides library functionality for FIDO 2.0, including communication with a device over USB.
     '';
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index c9be4c6ba7f..fd7bce1c30f 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoreconfHook
 , gettext
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ gettext gnutls nettle ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lib.filezilla-project.org/";
     description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix
index 6b931105415..72dc2986711 100644
--- a/pkgs/development/libraries/libfishsound/default.nix
+++ b/pkgs/development/libraries/libfishsound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libvorbis, speex, flac, pkg-config }:
+{ lib, stdenv, fetchurl, libvorbis, speex, flac, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libfishsound-1.0.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://xiph.org/fishsound/";
     description = "A simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)";
     longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files.
diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix
index 2c0ba2dcc3c..d8659b9e15f 100644
--- a/pkgs/development/libraries/libfixposix/default.nix
+++ b/pkgs/development/libraries/libfixposix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libfixposix";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sionescu/libfixposix";
     description = "Thin wrapper over POSIX syscalls and some replacement functionality";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 163a633df5c..dc835924125 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala
+{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala
 , extraOnly ? false
 , withGtk3 ? false, gtk2, gtk3 }:
 let
     gtk = if withGtk3 then gtk3 else gtk2;
-    inherit (stdenv.lib) optional;
+    inherit (lib) optional;
 in
 stdenv.mkDerivation rec {
   name = if extraOnly
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://blog.lxde.org/category/pcmanfm/";
     license = licenses.lgpl21Plus;
     description = "A glib-based library for file management";
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 2464679ac8a..f3f7313accb 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , pkg-config
 , meson
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://fprint.freedesktop.org/";
     description = "A library designed to make it easy to add support for consumer fingerprint readers";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix
index 52c64ed8629..2576d426af5 100644
--- a/pkgs/development/libraries/libfpx/default.nix
+++ b/pkgs/development/libraries/libfpx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "libfpx-1.3.1-7";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   # Darwin gets misdetected as Windows without this
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__unix";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix";
 
   patches = [
     (fetchpatch {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
   '' else null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.imagemagick.org";
     description = "A library for manipulating FlashPIX images";
     license = "Flashpix";
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
index d9c0e10dad6..9fd8c1e6b61 100644
--- a/pkgs/development/libraries/libfreefare/default.nix
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libnfc, openssl
+{ lib, stdenv, fetchurl, pkg-config, libnfc, openssl
 , libobjc ? null }:
 
 stdenv.mkDerivation {
@@ -11,9 +11,9 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc;
+  buildInputs = [ libnfc openssl ] ++ lib.optional stdenv.isDarwin libobjc;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations";
     license = licenses.lgpl3;
     homepage = "https://github.com/nfc-tools/libfreefare";
diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix
index 5edfd622347..5e3c40da82c 100644
--- a/pkgs/development/libraries/libfsm/default.nix
+++ b/pkgs/development/libraries/libfsm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , bmake
 }:
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DFA regular expression library & friends";
     homepage    = "https://github.com/katef/libfsm";
     license     = licenses.bsd2;
diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index 6c128e2947f..ae599a97529 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse
+{ lib, stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse
 , cppSupport ? true, boost ? null
 , pythonSupport ? true, python3 ? null, swig ? null
 , docSupport ? true, doxygen ? null
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = with stdenv.lib; [ libconfuse ]
+  buildInputs = with lib; [ libconfuse ]
     ++ optionals cppSupport [ boost ]
     ++ optionals pythonSupport [ python3 swig ]
     ++ optionals docSupport [ doxygen ];
 
-  preBuild = stdenv.lib.optionalString docSupport ''
+  preBuild = lib.optionalString docSupport ''
     make doc_i
   '';
 
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/etc/udev/rules.d/"
     cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/"
     cp -r doc/man "$out/share/"
-  '' + stdenv.lib.optionalString docSupport ''
+  '' + lib.optionalString docSupport ''
     mkdir -p "$out/share/libftdi/doc/"
     cp -r doc/html "$out/share/libftdi/doc/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to talk to FTDI chips using libusb";
     homepage = "https://www.intra2net.com/en/developer/libftdi/";
     license = with licenses; [ lgpl2 gpl2 ];
diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix
index 5ce8cd6c6a1..69b7bdc7d1e 100644
--- a/pkgs/development/libraries/libfyaml/default.nix
+++ b/pkgs/development/libraries/libfyaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnum4 }:
+{ lib, stdenv, fetchurl, gnum4 }:
 
 stdenv.mkDerivation rec {
   pname = "libfyaml";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gnum4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/pantoniou/libfyaml";
     description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix
index 4e9ce765b96..10705a2c164 100644
--- a/pkgs/development/libraries/libgadu/default.nix
+++ b/pkgs/development/libraries/libgadu/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib}:
+{lib, stdenv, fetchurl, zlib}:
 
 stdenv.mkDerivation {
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)";
     homepage = "http://toxygen.net/libgadu/";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl21;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl21;
   };
 
 }
diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix
index 2d79a1b64dc..f059d6c73a2 100644
--- a/pkgs/development/libraries/libgaminggear/default.nix
+++ b/pkgs/development/libraries/libgaminggear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config, gettext
+{ lib, stdenv, fetchurl, cmake, pkg-config, gettext
 , gtk2, libcanberra, libnotify, pcre, sqlite, xorg
 , harfbuzz
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides functionality for gaming input devices";
     homepage = "https://sourceforge.net/projects/libgaminggear/";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix
index 9de5cf2d2d1..f90ea502c40 100644
--- a/pkgs/development/libraries/libgcrypt/1.5.nix
+++ b/pkgs/development/libraries/libgcrypt/1.5.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     (fetchpatch {
       name = "fix-x86_64-apple-darwin.patch";
       sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi";
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postInstall = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
-  '' + stdenv.lib.optionalString enableCapabilities ''
+  '' + lib.optionalString enableCapabilities ''
     sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/libgcrypt/";
     description = "General-pupose cryptographic library";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index cd529cb06ee..6c6d73740f2 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
+{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
 , buildPackages
 }:
 
@@ -19,16 +19,16 @@ stdenv.mkDerivation rec {
   # The CPU Jitter random number generator must not be compiled with
   # optimizations and the optimize -O0 pragma only works for gcc.
   # The build enables -O2 by default for everything else.
-  hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
+  hardeningDisable = lib.optional stdenv.cc.isClang "fortify";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = [ libgpgerror ]
-    ++ stdenv.lib.optional stdenv.isDarwin gettext
-    ++ stdenv.lib.optional enableCapabilities libcap;
+    ++ lib.optional stdenv.isDarwin gettext
+    ++ lib.optional enableCapabilities libcap;
 
   configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
-   ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
+   ++ lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
 
   # Necessary to generate correct assembly when compiling for aarch32 on
   # aarch64
@@ -43,20 +43,20 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postFixup = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
-  '' + stdenv.lib.optionalString enableCapabilities ''
+  '' + lib.optionalString enableCapabilities ''
     sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   # TODO: figure out why this is even necessary and why the missing dylib only crashes
   # random instead of every test
-  preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
+  preCheck = lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/lib
     cp src/.libs/libgcrypt.20.dylib $out/lib
   '';
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/libgcrypt/";
     description = "General-purpose cryptographic library";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index 3f8e6f01b34..73e71de4aac 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
+{ lib, stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
 , overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools
 , mysqlSupport ? false, libmysqlclient ? null
 , postgresSupport ? false, postgresql ? null
@@ -12,7 +12,7 @@ assert postgresSupport -> postgresql != null;
   version = "5.2.10";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g";
   };
 
@@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null;
     })
   ];
 
-  configureFlags = with stdenv.lib; [
+  configureFlags = with lib; [
     "--with-mysql=${if mysqlSupport then "yes" else "no"}"
     "--with-postgres=${if postgresSupport then "yes" else "no"}"
 
@@ -41,7 +41,7 @@ assert postgresSupport -> postgresql != null;
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ];
-  buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
+  buildInputs = with lib; [ gtk3 openssl libgee ]
     ++ optional (mysqlSupport) libmysqlclient
     ++ optional (postgresSupport) postgresql;
 
@@ -51,7 +51,7 @@ assert postgresSupport -> postgresql != null;
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Database access library";
     homepage = "https://www.gnome-db.org/";
     license = [ licenses.lgpl2 licenses.gpl2 ];
diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix
index ea0484f710e..44a0e8bc212 100644
--- a/pkgs/development/libraries/libgdamm/default.nix
+++ b/pkgs/development/libraries/libgdamm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3
+{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3
 , mysqlSupport ? false
 , postgresSupport ? false }:
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9";
   };
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ bindings for libgda";
     homepage = "https://www.gnome-db.org/";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index 9c8ea6bb1c0..86e3f4274fc 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , meson
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga";
   };
 
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GData API library";
     homepage = "https://wiki.gnome.org/Projects/libgdata";
     maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members;
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 4a518818e8b..705205df396 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig
 , libtiff, giflib, libjpeg, libpng
 , libXrender, libexif, autoreconfHook, fetchpatch }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}";
+  configureFlags = lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}";
 
   enableParallelBuilding = true;
 
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
     [ glib cairo fontconfig libtiff giflib
       libjpeg libpng libXrender libexif
     ]
-    ++ stdenv.lib.optional stdenv.isDarwin Carbon;
+    ++ lib.optional stdenv.isDarwin Carbon;
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
   '';
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     make check -w
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
     homepage = "https://www.mono-project.com/docs/gui/libgdiplus/";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix
index a531a433a88..407b99b5a57 100644
--- a/pkgs/development/libraries/libgee/default.nix
+++ b/pkgs/development/libraries/libgee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libgee";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
     homepage = "https://wiki.gnome.org/Projects/Libgee";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 1b973fd5eee..eb35d5316c0 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.5.1";
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
     homepage = "https://github.com/OSGeo/libgeotiff";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix
index abd73ea5b75..e058c7ed5af 100644
--- a/pkgs/development/libraries/libgepub/default.nix
+++ b/pkgs/development/libraries/libgepub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3
 , webkitgtk, libsoup, libxml2, libarchive }:
 
 stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.6.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject based library for handling and rendering epub documents";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
index baa9917cad2..f78a51db5de 100644
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }:
+{ lib, stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }:
 
 stdenv.mkDerivation rec {
   pname = "libgig";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.linuxsampler.org";
     description = "Gigasampler file access library";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix
index b07b5b91249..fe36a9d663f 100644
--- a/pkgs/development/libraries/libgit2-glib/default.nix
+++ b/pkgs/development/libraries/libgit2-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2
+{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2
 , gtk-doc, gobject-introspection, libgit2, glib, python3 }:
 
 stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.99.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     python3.pkgs.pygobject3 # this should really be a propagated input of python output
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A glib wrapper library around the libgit2 git access library";
     homepage = "https://wiki.gnome.org/Projects/Libgit2-glib";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 8c9905a4287..cf8f5ab4878 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3,
+{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3,
   libstartup_notification, libgtop, perlPackages,
   autoreconfHook, intltool, docbook_xsl, xauth
 }:
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
       programs in an X session.
     '';
     homepage = "https://www.nongnu.org/gksu/";
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl2;
+    maintainers = [ lib.maintainers.romildo ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index 92783d3ae0c..88ba7dacc22 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional stdenv.cc.isClang "-Wno-error");
 
   # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
-  configureFlags  = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls";
+  configureFlags  = lib.optional stdenv.hostPlatform.isMusl "--disable-tls";
 
   outputs = [ "out" "dev" ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit (addOpenGLRunpath) driverLink; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GL Vendor-Neutral Dispatch library";
     homepage = "https://github.com/NVIDIA/libglvnd";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index fbb2499f24a..3f5a5961ba0 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }:
+{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }:
 
 stdenv.mkDerivation rec {
   pname = "libgnome-keyring";
   version = "2.32.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n";
   };
 
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     inherit (glib.meta) platforms maintainers;
     homepage = "https://wiki.gnome.org/Projects/GnomeKeyring";
-    license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
+    license = with lib.licenses; [ gpl2 lgpl2 ];
   };
 }
diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix
index 17adb362cdb..62228b8837a 100644
--- a/pkgs/development/libraries/libgnomekbd/default.nix
+++ b/pkgs/development/libraries/libgnomekbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libgnomekbd";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp";
   };
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Keyboard management library";
     maintainers = teams.gnome.members;
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index e7e16d769e7..a7d91d0c81a 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls,
+{ lib, stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls,
   libidn2, libunistring, nghttp2 }:
 
 stdenv.mkDerivation rec {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     "--without-librtmp"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fork of libcurl used by GNUnet";
     homepage    = "https://gnunet.org/en/gnurl.html";
     maintainers = with maintainers; [ vrthra ];
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 972ca4c04a5..39d0b185660 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation (rec {
 
   doCheck = true; # not cross
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
     description = "A small library that defines common error values for all GnuPG components";
 
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index db9e03a045a..4dec3151a7c 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext
 , libusb1
 , libtool
 , libexif
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
       from digital cameras.
     '';
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = with stdenv.lib.platforms; unix;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = with lib.platforms; unix;
+    maintainers = with lib.maintainers; [ jcumming ];
   };
 }
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index d23a5238295..c7c9de67592 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gtkpod.sourceforge.net/";
     description = "Library used by gtkpod to access the contents of an ipod";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix
index 102361e5fb2..16595a12eb5 100644
--- a/pkgs/development/libraries/libgringotts/default.nix
+++ b/pkgs/development/libraries/libgringotts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }:
+{ lib, stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }:
 
 stdenv.mkDerivation rec {
   pname = "libgringotts";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib bzip2 libmcrypt libmhash ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small library to encapsulate data in an encrypted structure";
     homepage = "http://libgringotts.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix
index 52cdf5e9027..963bf722b2a 100644
--- a/pkgs/development/libraries/libgroove/default.nix
+++ b/pkgs/development/libraries/libgroove/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }:
+{ lib, stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }:
 
 stdenv.mkDerivation rec {
   version = "4.3.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libav SDL2 chromaprint libebur128 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Streaming audio processing library";
     homepage = "https://github.com/andrewrk/libgroove";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix
index 132fc6a8712..b8c7c7bc497 100644
--- a/pkgs/development/libraries/libgrss/default.nix
+++ b/pkgs/development/libraries/libgrss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
 
 let
   version = "0.7.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
   };
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Glib abstaction to handle feeds in RSS, Atom and other formats";
     homepage = "https://wiki.gnome.org/Projects/Libgrss";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index bdc024094c0..77fa161b773 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2
+{ fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2
 , perl, gdk-pixbuf, libiconv, libintl, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "1.14.47";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i";
   };
 
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNOME's Structured File Library";
     homepage    = "https://www.gnome.org/projects/libgsf";
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
-    platforms   = stdenv.lib.platforms.unix;
+    platforms   = lib.platforms.unix;
 
     longDescription = ''
       Libgsf aims to provide an efficient extensible I/O abstraction for
diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix
index d13c0940205..678af459a30 100644
--- a/pkgs/development/libraries/libgssglue/default.nix
+++ b/pkgs/development/libraries/libgssglue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kerberos }:
+{ lib, stdenv, fetchurl, kerberos }:
 
 stdenv.mkDerivation rec {
   name = "libgssglue-0.4";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.citi.umich.edu/projects/nfsv4/linux/";
     description = "Exports a gssapi interface which calls other random gssapi libraries";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index 165b8018443..af4fe04a0b4 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , glib
 , pkg-config
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   version = "2.40.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq";
   };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that reads information about processes and the running system";
     license = licenses.gpl2Plus;
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index d1ddf3812c0..feeae05bf52 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , udev
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that provides GObject bindings for libudev";
     homepage = "https://wiki.gnome.org/Projects/libgudev";
     maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index ccc2778c0c0..0f56f8c97f3 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
 , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
 , gmp, readline, file, numactl, libapparmor, jansson
@@ -7,7 +7,7 @@
 , appliance ? null
 , javaSupport ? false, jdk ? null }:
 
-assert appliance == null || stdenv.lib.isDerivation appliance;
+assert appliance == null || lib.isDerivation appliance;
 assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     libtirpc
   ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])
     ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ])
-    ++ stdenv.lib.optional javaSupport jdk;
+    ++ lib.optional javaSupport jdk;
 
   prePatch = ''
     # build-time scripts
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
   configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ]
-    ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ];
+    ++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ];
   patches = [ ./libguestfs-syms.patch ];
   NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
   installFlags = [ "REALLY_INSTALL=yes" ];
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  postFixup = stdenv.lib.optionalString (appliance != null) ''
+  postFixup = lib.optionalString (appliance != null) ''
     mkdir -p $out/{lib,lib64}
     ln -s ${appliance} $out/lib64/guestfs
     ln -s ${appliance} $out/lib/guestfs
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     runHook postInstallCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for accessing and modifying virtual machine disk images";
     license = with licenses; [ gpl2 lgpl21 ];
     homepage = "https://libguestfs.org/";
diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix
index 55e89d87664..f82401f524f 100644
--- a/pkgs/development/libraries/libgumath/default.nix
+++ b/pkgs/development/libraries/libgumath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , libndtypes
 , libxnd
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library supporting function dispatch on general data containers. C base and Python wrapper";
     homepage = "https://xnd.io/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix
index 80f897a1a53..9351d3f707f 100644
--- a/pkgs/development/libraries/libgweather/default.nix
+++ b/pkgs/development/libraries/libgweather/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy";
   };
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to access weather information from online services for numerous locations";
     homepage = "https://wiki.gnome.org/Projects/LibGWeather";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix
index c5289829851..f7392ffb7dd 100644
--- a/pkgs/development/libraries/libgxps/default.nix
+++ b/pkgs/development/libraries/libgxps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo
 , libarchive, freetype, libjpeg, libtiff, gnome3, lcms2
 }:
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.3.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs";
   };
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GObject based library for handling and rendering XPS documents";
     homepage = "https://wiki.gnome.org/Projects/libgxps";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
index 5a7ab456acc..ff2093255cf 100644
--- a/pkgs/development/libraries/libhandy/0.x.nix
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
+{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
 , gtk3, gnome3
 , dbus, xvfb_run, libxml2
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       meson test --print-errorlogs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library full of GTK widgets for mobile phones";
     homepage = "https://source.puri.sm/Librem5/libhandy";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 794502ed9b8..5ab6dde09d7 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o=";
   };
 
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
       meson test --print-errorlogs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}";
     description = "Building blocks for modern adaptive GNOME apps";
     homepage = "https://gitlab.gnome.org/GNOME/libhandy";
diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix
index eb62337c502..eea513a137c 100644
--- a/pkgs/development/libraries/libhangul/default.nix
+++ b/pkgs/development/libraries/libhangul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libhangul-0.1.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core algorithm library for Korean input routines";
     homepage = "https://github.com/choehwanjin/libhangul";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index 634a991f49b..53c14027ff3 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, cmake, zlib, libpng }:
+{ lib, stdenv, fetchzip, cmake, zlib, libpng }:
 
 stdenv.mkDerivation {
   name = "libharu-2.3.0";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Cross platform, open source library for generating PDF files";
     homepage = "http://libharu.org/";
-    license = stdenv.lib.licenses.zlib;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.zlib;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix
index 577457afdbf..ab0ad6fab23 100644
--- a/pkgs/development/libraries/libhdhomerun/default.nix
+++ b/pkgs/development/libraries/libhdhomerun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 # libhdhomerun requires UDP port 65001 to be open in order to detect and communicate with tuners.
 # If your firewall is enabled, make sure to have something like:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb";
   };
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile --replace "gcc" "cc"
     substituteInPlace Makefile --replace "-arch i386" ""
   '';
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cp *.h $out/include/hdhomerun
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners";
     homepage = "https://www.silicondust.com/support/linux";
     license = licenses.lgpl21Only;
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index ca8c189a9c8..b0872b9da1e 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng,
   libjpeg, libaom }:
 
 stdenv.mkDerivation rec {
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.libheif.org/";
     description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ gebner ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ gebner ];
   };
 
 }
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index f4edb39af5d..f54929c5378 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
+{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
 , gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
 
 let
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
   };
 
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to use HTTPSEverywhere in desktop applications";
     homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index c7babb3038d..2040ef3bee0 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages
+{ lib, stdenv, buildPackages
 , staticBuild ? stdenv.hostPlatform.isStatic
 }:
 
@@ -15,13 +15,13 @@ stdenv.mkDerivation {
   postUnpack = "sourceRoot=\${sourceRoot}/libiberty";
 
   configureFlags = [ "--enable-install-libiberty" ]
-    ++ stdenv.lib.optional (!staticBuild) "--enable-shared";
+    ++ lib.optional (!staticBuild) "--enable-shared";
 
-  postInstall = stdenv.lib.optionalString (!staticBuild) ''
+  postInstall = lib.optionalString (!staticBuild) ''
     cp pic/libiberty.a $out/lib*/libiberty.a
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gcc.gnu.org/";
     license = licenses.lgpl2;
     description = "Collection of subroutines used by various GNU programs";
diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix
index 8c46efa9710..b6df338f122 100644
--- a/pkgs/development/libraries/libibmad/default.nix
+++ b/pkgs/development/libraries/libibmad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libibumad }:
+{ lib, stdenv, fetchurl, libibumad }:
 
 stdenv.mkDerivation rec {
   name = "libibmad-1.3.13";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libibumad ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.openfabrics.org/";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix
index 4c37f8564b0..6de97ad77cd 100644
--- a/pkgs/development/libraries/libibumad/default.nix
+++ b/pkgs/development/libraries/libibumad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libibumad-1.3.10.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.openfabrics.org/";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 7802f975202..7f5e739a99c 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     runHook postInstallCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/libical/libical";
     description = "An Open Source implementation of the iCalendar protocols";
     license = licenses.mpl20;
diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
index 10d68ee3a4e..1df2a8abb82 100644
--- a/pkgs/development/libraries/libicns/default.nix
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }:
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }:
 
 stdenv.mkDerivation rec {
   pname = "libicns";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpng openjpeg ];
   NIX_CFLAGS_COMPILE = [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for manipulation of the Mac OS icns resource format";
     homepage = "https://icns.sourceforge.io";
     license = with licenses; [ gpl2 lgpl2 lgpl21 ];
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index 9847312a34a..8cedd1bcb41 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, gperf}:
+{lib, stdenv, fetchurl, zlib, gperf}:
 
 stdenv.mkDerivation rec {
   pname = "libid3tag";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       --subst-var-by version "${version}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ID3 tag manipulation library";
     homepage = "http://mad.sourceforge.net/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index e936f3fd92a..afe5e550b33 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libiconv }:
+{ fetchurl, lib, stdenv, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libidn-1.36";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
 
   doCheck = false; # fails
 
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
     '';
 
     repositories.git = "git://git.savannah.gnu.org/libidn.git";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index c5af2d16bb2..30a33426639 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -1,11 +1,11 @@
-{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }:
+{ fetchurl, lib, stdenv, libiconv, libunistring, help2man, buildPackages }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libidn2";
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
     '';
 
     repositories.git = "https://gitlab.com/jas/libidn2";
-    license = with stdenv.lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ];
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ fpletz ];
+    license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index 2f2d2d190e8..911210202fe 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libraw1394 }:
+{ lib, stdenv, fetchurl, pkg-config, libraw1394 }:
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libraw1394 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.linux1394.org";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix
index b5708a83a7d..7c20d1b4947 100644
--- a/pkgs/development/libraries/libieee1284/default.nix
+++ b/pkgs/development/libraries/libieee1284/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   pname = "libieee1284";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     ./bootstrap
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parallel port communication library";
     homepage = "http://cyberelk.net/tim/software/libieee1284/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index 3c3ccf27884..043e27fb4b2 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     moveToOutput ${python.sitePackages} "$python"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "API for interfacing with the Linux Industrial I/O Subsystem";
     homepage = "https://github.com/analogdevicesinc/libiio";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
index 2bca09be45f..83a5a462ee0 100644
--- a/pkgs/development/libraries/libimagequant/default.nix
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libimagequant";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     patchShebangs ./configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pngquant.org/lib/";
     description = "Image quantization library";
     longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.";
diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix
index 476d2419ef3..b82a8b3fd35 100644
--- a/pkgs/development/libraries/libime/default.nix
+++ b/pkgs/development/libraries/libime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchFromGitHub
 , cmake
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     fcitx5
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to support generic input method implementation";
     homepage = "https://github.com/fcitx/libime";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index f5038e45d3a..b805be1257b 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls
+{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls
 , libgcrypt, libtasn1, glib, libplist, libusbmuxd }:
 
 stdenv.mkDerivation rec {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     "--without-cython"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/libimobiledevice/libimobiledevice";
     description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux";
     longDescription = ''
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index b980e0a279f..e68d27cacff 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -1,6 +1,6 @@
 { gtkWidgets ? false # build GTK widgets for libinfinity
 , avahiSupport ? false # build support for Avahi in libinfinity
-, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl
+, lib, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl
 , gobject-introspection
 , gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss
 , libintl }:
@@ -23,8 +23,8 @@ let
 
     nativeBuildInputs = [ pkg-config gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
     buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ]
-      ++ stdenv.lib.optional gtkWidgets gtk3
-      ++ stdenv.lib.optional avahiSupport avahi;
+      ++ lib.optional gtkWidgets gtk3
+      ++ lib.optional avahiSupport avahi;
 
     propagatedBuildInputs = [ gnutls ];
 
@@ -39,15 +39,15 @@ let
     ];
 
     passthru = {
-      infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}";
+      infinoted = "${self.bin}/bin/infinoted-${lib.versions.majorMinor version}";
     };
 
     meta = {
       homepage = "https://gobby.github.io/";
       description = "An implementation of the Infinote protocol written in GObject-based C";
-      license = stdenv.lib.licenses.lgpl2Plus;
-      maintainers = [ stdenv.lib.maintainers.phreedom ];
-      platforms = with stdenv.lib.platforms; linux ++ darwin;
+      license = lib.licenses.lgpl2Plus;
+      maintainers = [ lib.maintainers.phreedom ];
+      platforms = with lib.platforms; linux ++ darwin;
     };
   };
 in self
diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/development/libraries/libinjection/default.nix
index b3bdbb41588..f678136637a 100644
--- a/pkgs/development/libraries/libinjection/default.nix
+++ b/pkgs/development/libraries/libinjection/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , python
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   # no binaries, so out = library, dev = headers
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SQL / SQLI tokenizer parser analyzer";
     homepage    = "https://github.com/client9/libinjection";
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix
index 90f6936d458..c5dc7987ca6 100644
--- a/pkgs/development/libraries/libinklevel/default.nix
+++ b/pkgs/development/libraries/libinklevel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libusb1 }:
+{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
 
 stdenv.mkDerivation rec {
   pname = "libinklevel";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for checking the ink level of your printer";
     longDescription = ''
       Libinklevel is a library for checking the ink level of your printer on a
diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix
index 074d2954ef1..ff74060d3d4 100644
--- a/pkgs/development/libraries/libinotify-kqueue/default.nix
+++ b/pkgs/development/libraries/libinotify-kqueue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, autoreconfHook }:
+{ lib, stdenv, fetchzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libinotify-kqueue";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkFlags = [ "test" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Inotify shim for macOS and BSD";
     homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index cf0af9127f7..8f1511de330 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config, meson, ninja
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja
 , libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
@@ -10,7 +10,7 @@ assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
 assert testsSupport -> check != null && valgrind != null && python3 != null;
 
 let
-  mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}";
+  mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}";
 
   sphinx-build = if documentationSupport then
     python3.pkgs.sphinx.overrideAttrs (super: {
@@ -24,7 +24,7 @@ let
   else null;
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
   version = "1.16.4";
diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix
index f2b7eaa8f54..29d4c3432eb 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/pkgs/development/libraries/libiodbc/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, pkg-config, gtk2, Carbon
+{ config, lib, stdenv, fetchurl, pkg-config, gtk2, Carbon
 , useGTK ? config.libiodbc.gtk or false }:
 
 stdenv.mkDerivation rec {
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]
-                ++ stdenv.lib.optional stdenv.isDarwin Carbon;
+  buildInputs = lib.optionals useGTK [ gtk2 ]
+                ++ lib.optional stdenv.isDarwin Carbon;
 
   preBuild =
     ''
       export NIX_LDFLAGS_BEFORE="-rpath $out/lib"
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "iODBC driver manager";
     homepage = "http://www.iodbc.org";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix
index 69918b5d36c..173bfafc8cc 100644
--- a/pkgs/development/libraries/libipfix/default.nix
+++ b/pkgs/development/libraries/libipfix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "libipfix";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz";
     sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libipfix.sourceforge.net/";
     description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix
index e585a2b090f..272c61c47a5 100644
--- a/pkgs/development/libraries/libipt/default.nix
+++ b/pkgs/development/libraries/libipt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libipt";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intel Processor Trace decoder library";
     homepage = "https://github.com/intel/libipt";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix
index 01b23d9e2d2..140faab43b1 100644
--- a/pkgs/development/libraries/libiptcdata/default.nix
+++ b/pkgs/development/libraries/libiptcdata/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "libiptcdata-1.0.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library for reading and writing the IPTC metadata in images and other files";
     homepage = "http://libiptcdata.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix
index 4bef2de28c0..56a9f1b961c 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/pkgs/development/libraries/libircclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "1.10";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --replace "cp "              "install "
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small but extremely powerful library which implements the client IRC protocol";
     homepage    = "http://www.ulduzsoft.com/libircclient/";
     license     = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix
index 26a39516d25..6a2f926d79e 100644
--- a/pkgs/development/libraries/libirecovery/default.nix
+++ b/pkgs/development/libraries/libirecovery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config
+{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config
 , libusb1
 , readline
 }:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""''
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/libimobiledevice/libirecovery";
     description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux";
     longDescription = ''
diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix
index 246696c94eb..adc721bc6d0 100644
--- a/pkgs/development/libraries/libiscsi/default.nix
+++ b/pkgs/development/libraries/libiscsi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libiscsi";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # This problem is gone on libiscsi master.
   NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "iscsi client library and utilities";
     homepage = "https://github.com/sahlberg/libiscsi";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/development/libraries/libisds/default.nix
index 28a8d7d874b..268acb2f948 100644
--- a/pkgs/development/libraries/libisds/default.nix
+++ b/pkgs/development/libraries/libisds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , expat
 , gpgme
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";
     homepage = "http://xpisar.wz.cz/libisds/";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix
index 0b4984fc82a..1e2ae41f3f2 100644
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/pkgs/development/libraries/libisoburn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }:
+{ lib, stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }:
 
 stdenv.mkDerivation rec {
   pname = "libisoburn";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ attr zlib libburn libisofs ];
   propagatedBuildInputs = [ acl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libburnia-project.org/";
     description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD ";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix
index 0c01389f0b8..a291410941c 100644
--- a/pkgs/development/libraries/libisofs/default.nix
+++ b/pkgs/development/libraries/libisofs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, acl, attr, zlib }:
+{ lib, stdenv, fetchurl, acl, attr, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libisofs";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ attr zlib ];
   propagatedBuildInputs = [ acl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libburnia-project.org/";
     description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 4d9df889851..c57876e9c4f 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }:
 
 stdenv.mkDerivation rec {
   pname = "libite";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libconfuse ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Lightweight library of frog DNA";
     longDescription = ''
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index 2dc009b9b1c..9a1c728bd55 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }:
 
 stdenv.mkDerivation rec {
   pname = "libivykis";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ file protobufc ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libivykis.sourceforge.net/";
     description = ''
       A thin wrapper over various OS'es implementation of I/O readiness
diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix
index e971136b088..489f526248a 100644
--- a/pkgs/development/libraries/libixp-hg/default.nix
+++ b/pkgs/development/libraries/libixp-hg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, txt2tags }:
+{ lib, stdenv, fetchurl, unzip, txt2tags }:
 
 stdenv.mkDerivation rec {
   rev = "148";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp
     description = "Portable, simple C-language 9P client and server libary";
-    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kovirobi ];
+    license = lib.licenses.mit;
     inherit version;
-    platforms = with stdenv.lib.platforms; unix;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix
index a6ad6d4bb64..974f1f6674f 100644
--- a/pkgs/development/libraries/libjcat/default.nix
+++ b/pkgs/development/libraries/libjcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , docbook_xml_dtd_43
 , docbook-xsl-nons
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing Jcat files";
     homepage = "https://github.com/hughsie/libjcat";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index c4e81d034fc..5fe1c2ee9ec 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, nasm
+{ lib, stdenv, fetchFromGitHub, cmake, nasm
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   patches =
-    stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
+    lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
       ./mingw-boolean.patch;
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   doInstallCheck = true;
   installCheckTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libjpeg-turbo.org/";
     description = "A faster (using SIMD) libjpeg implementation";
     license = licenses.ijg; # and some parts under other BSD-style licenses
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 05fbb7de701..f462d9824a4 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, static ? false }:
+{ lib, stdenv, fetchurl, static ? false }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "libjpeg-9d";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.ijg.org/";
     description = "A library that implements the JPEG image file format";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix
index 2c14d270f26..5a70e4b01dd 100644
--- a/pkgs/development/libraries/libjreen/default.nix
+++ b/pkgs/development/libraries/libjreen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }:
+{ lib, stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }:
 
 stdenv.mkDerivation rec {
   pname = "libjreen";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ Jabber library using Qt framework";
     homepage = "https://qutim.org/jreen/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index aa23b3f8eaf..e2dd30fc616 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , pkg-config
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   preInstall = ''
     function fixRunPath {
       p=$(patchelf --print-rpath $1)
-      q="$p:${stdenv.lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib"
+      q="$p:${lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib"
       patchelf --set-rpath $q $1
     }
 
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ framework for json-rpc (json remote procedure call)";
     homepage = "https://github.com/cinemast/libjson-rpc-cpp";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index 1d6fb1e7289..42d723b3b1b 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 let
   version = "7.6.1";
 in stdenv.mkDerivation {
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
   makeFlags = [ "prefix=$(out)" ];
   preInstall = "mkdir -p $out/lib";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libjson.sourceforge.net/";
     description = "A JSON reader and writer";
     longDescription = ''
diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix
index a999f813fbb..2135cc37d91 100644
--- a/pkgs/development/libraries/libkate/default.nix
+++ b/pkgs/development/libraries/libkate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libogg, libpng }:
+{ lib, stdenv, fetchurl, libogg, libpng }:
 
 stdenv.mkDerivation rec {
   name = "libkate-0.4.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libogg libpng ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for encoding and decoding Kate streams";
     longDescription = ''
       This is libkate, the reference implementation of a codec for the Kate
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index b6aa19c442a..d2aecccdedf 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
+{ lib, stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   pname = "libkeyfinder";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cp -a lib*.so* $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Musical key detection for digital audio (C++ library)";
     homepage = "http://www.ibrahimshaath.co.uk/keyfinder/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/libkml/default.nix b/pkgs/development/libraries/libkml/default.nix
index 690d9b9801c..0e2ab21ee79 100644
--- a/pkgs/development/libraries/libkml/default.nix
+++ b/pkgs/development/libraries/libkml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , boost
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBUILD_TESTING=ON"
   # Darwin tests require rpath for libs in build dir
-  ] ++ stdenv.lib.optional stdenv.isDarwin [
+  ] ++ lib.optional stdenv.isDarwin [
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
   ];
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reference implementation of OGC KML 2.2";
     homepage = "https://github.com/libkml/libkml";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 7e14c1b533b..e623aa0d111 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,4 +1,4 @@
-{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }:
+{ buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }:
 
 stdenv.mkDerivation rec {
   name = "libksba-1.5.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     rmdir --ignore-fail-on-non-empty $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnupg.org";
     description = "CMS and X.509 access library";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix
index 2701cc51359..01512181171 100644
--- a/pkgs/development/libraries/libksi/default.nix
+++ b/pkgs/development/libraries/libksi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }:
 
 stdenv.mkDerivation rec {
   pname = "libksi";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "--with-cafile=/etc/ssl/certs/ca-certificates.crt"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/GuardTime/libksi";
     description = "Keyless Signature Infrastructure API library";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index 9aea99f6a40..610efa7ed4f 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules
+{ lib, stdenv, fetchurl, cmake, extra-cmake-modules
 , karchive, kcrash, ki18n, kio, solid
 , boost, gmp, qca-qt5, libgcrypt
 }:
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     inherit mainVersion;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A BitTorrent library used by KTorrent";
     homepage    = "https://www.kde.org/applications/internet/ktorrent/";
     maintainers = with maintainers; [ eelco ];
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 30342ea24c8..0198888f2b5 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext
+{ lib, stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext
 , pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip
 }:
 
@@ -42,9 +42,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "An interface library to access tags for identifying languages";
-    license = stdenv.lib.licenses.mpl20;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mpl20;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     # There are links to a homepage that are broken by a BitBucket change
     homepage = "https://bitbucket.org/tagoh/liblangtag/overview";
   };
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 2bf33bab416..10cdb301479 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake
 , fftwSinglePrec, libsamplerate, qtbase
 , darwin }:
 
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config which cmake ];
   buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lastfm/liblastfm";
     repositories.git = "git://github.com/lastfm/liblastfm.git";
     description = "Official LastFM library";
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix
index 4bf8fb7bf65..fe3038c3249 100644
--- a/pkgs/development/libraries/liblastfmSF/default.nix
+++ b/pkgs/development/libraries/liblastfmSF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, curl, openssl }:
+{ lib, stdenv, fetchurl, pkg-config, curl, openssl }:
 
 stdenv.mkDerivation {
   name = "liblastfm-SF-0.5";
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://liblastfm.sourceforge.net";
     description = "Unofficial C lastfm library";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix
index ef50c106eae..9464714d5cc 100644
--- a/pkgs/development/libraries/liblaxjson/default.nix
+++ b/pkgs/development/libraries/liblaxjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   version = "1.0.5";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for parsing JSON config files";
     homepage = "https://github.com/andrewrk/liblaxjson";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix
index 3783bd408f1..2c7f0989282 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }:
 
 stdenv.mkDerivation rec {
   pname = "liblcf";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   propagatedBuildInputs = [ expat icu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects";
     homepage = "https://github.com/EasyRPG/liblcf";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index 67eb8748f16..3989cc59e4d 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fixDarwinDylibNames }:
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames }:
 
 let
   soVersion = "4";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" ];
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
+  nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
 
   buildFlags = [ "lib" "predict" "train" ];
 
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     install -Dm444 -t $dev/include linear.h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for large linear classification";
     homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix
index 5c06dea390f..f56e6a9a5c7 100644
--- a/pkgs/development/libraries/liblinphone/default.nix
+++ b/pkgs/development/libraries/liblinphone/default.nix
@@ -40,7 +40,7 @@
 , soci
 , speex
 , sqlite
-, stdenv
+, lib, stdenv
 , udev
 , xercesc
 , xsd
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
     ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.linphone.org/technical-corner/liblinphone";
     description = "Library for SIP calls and instant messaging";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index a25666dfcf2..5f5b23cdc3a 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "liblo-0.31";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
     homepage = "https://sourceforge.net/projects/liblo";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.gpl2;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix
index 6ed995572ef..a2587702bb3 100644
--- a/pkgs/development/libraries/liblockfile/default.nix
+++ b/pkgs/development/libraries/liblockfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   _name   = "liblockfile";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Shared library with NFS-safe locking functions";
     homepage = "http://packages.debian.org/unstable/libs/liblockfile1";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.bluescreen303 ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix
index 5602231e34d..4a28bf67741 100644
--- a/pkgs/development/libraries/liblogging/default.nix
+++ b/pkgs/development/libraries/liblogging/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config
+{ lib, stdenv, fetchurl, pkg-config
 , systemd ? null
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "--enable-man-pages"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.liblogging.org/";
     description = "Lightweight signal-safe logging library";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix
index d3a6b599742..293f72d67b2 100644
--- a/pkgs/development/libraries/liblognorm/default.nix
+++ b/pkgs/development/libraries/liblognorm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }:
+{ lib, stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }:
 
 stdenv.mkDerivation rec {
   name = "liblognorm-2.0.6";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-regexp" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.liblognorm.com/";
     description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 3e83e34ee81..1dec830566f 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub
-, stdenv
+, lib, stdenv
 , autoreconfHook
 , pkg-config
 , gettext
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open-source braille translator and back-translator";
     homepage = "http://liblouis.org/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix
index 936469c01c6..b871dbdb19d 100644
--- a/pkgs/development/libraries/liblqr-1/default.nix
+++ b/pkgs/development/libraries/liblqr-1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   name = "liblqr-1-0.4.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://liblqr.wikidot.com";
     description = "Seam-carving C/C++ library called Liquid Rescaling";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix
index 4ee37dc0b9f..dcb862f2cd4 100644
--- a/pkgs/development/libraries/liblscp/default.nix
+++ b/pkgs/development/libraries/liblscp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "liblscp";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.linuxsampler.org";
     description = "LinuxSampler Control Protocol (LSCP) wrapper library";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix
index 4513396d7ea..2391d281d46 100644
--- a/pkgs/development/libraries/libltc/default.nix
+++ b/pkgs/development/libraries/libltc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "libltc-1.3.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://x42.github.io/libltc/";
     description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix
index ebb8cbe0376..1ca4043a024 100644
--- a/pkgs/development/libraries/liblxi/default.nix
+++ b/pkgs/development/libraries/liblxi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , pkg-config, autoreconfHook
 , libtirpc, rpcsvc-proto, avahi, libxml2
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libtirpc avahi libxml2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for communicating with LXI compatible instruments";
     longDescription = ''
       liblxi is an open source software library which offers a simple
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 84800f309fb..dd792348686 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoconf }:
+{ lib, stdenv, fetchurl, fetchpatch, autoconf }:
 
 stdenv.mkDerivation rec {
   pname = "libmad";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
   # It is included here in order to fix a build failure in Clang
   # But it may be useful to fix other, currently unknown problems as well
-  ++ stdenv.lib.optionals stdenv.cc.isClang [
+  ++ lib.optionals stdenv.cc.isClang [
     (fetchpatch {
       url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff";
       sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6";
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "autoconf";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://sourceforge.net/projects/mad/";
     description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
     license     = licenses.gpl2;
diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix
index 96593fb50bf..76dd4eb20c1 100644
--- a/pkgs/development/libraries/libmanette/default.nix
+++ b/pkgs/development/libraries/libmanette/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ninja
 , meson
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1b3bcdkk5xd5asq797cch9id8692grsjxrc1ss87vv11m1ck4rb3";
   };
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple GObject game controller library";
     homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
index 49769359ed3..50b66eccfb3 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
+{ lib, stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
 
 stdenv.mkDerivation rec {
   pname = "libmatchbox";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library of the matchbox X window manager";
     homepage = "http://matchbox-project.org/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix
index b794c1f7217..b0fe1c35ef3 100644
--- a/pkgs/development/libraries/libmatheval/default.nix
+++ b/pkgs/development/libraries/libmatheval/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }:
+{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "1.1.11";
@@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
       symbolic derivatives and output expressions to strings.
     '';
     homepage = "https://www.gnu.org/software/libmatheval/";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.bzizou ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.bzizou ];
+    platforms = lib.platforms.linux;
   };
 }
 
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index ab8107b39c4..1d3cf4032dd 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , libebml }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=YES"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to parse Matroska files";
     homepage = "https://matroska.org/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix
index 2b4d75bba75..078865198a4 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/pkgs/development/libraries/libmaxminddb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libmaxminddb";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for working with MaxMind geolocation DB files";
     homepage = "https://github.com/maxmind/libmaxminddb";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index fdf724c09fd..850c7aa1df0 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , gobject-introspection
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.freedesktop.org/wiki/Software/libmbim/";
     description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix
index 59498170a1d..44c55cb4682 100644
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/pkgs/development/libraries/libmcrypt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, darwin, disablePosixThreads ? false }:
+{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "libmcrypt-2.5.8";
diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
index e3dd0b206f1..7093376aa7e 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libmd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.hadrons.org/software/${pname}/";
     changelog = "https://archive.hadrons.org/software/libmd/libmd-${version}.announce";
     # Git: https://git.hadrons.org/cgit/libmd.git
diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix
index 1007123619f..28c8ae6db94 100644
--- a/pkgs/development/libraries/libmediaart/default.nix
+++ b/pkgs/development/libraries/libmediaart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "libmediaart";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d";
   };
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library tasked with managing, extracting and handling media art caches";
     maintainers = teams.gnome.members;
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 0974371c41e..d78ccbc50ab 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
 
 stdenv.mkDerivation rec {
   version = "20.09";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shared library for mediainfo";
     homepage = "https://mediaarea.net/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 8cbb76377fb..0ee0701d929 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }:
+{ lib, stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }:
 
 stdenv.mkDerivation {
   name = "libmemcached-1.0.18";
@@ -13,19 +13,19 @@ stdenv.mkDerivation {
   # https://bugs.launchpad.net/libmemcached/+bug/1281907
   # Fix building on macOS (patch from Homebrew)
   # https://bugs.launchpad.net/libmemcached/+bug/1245562
-  patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
-    ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+  patches = lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
+    ++ lib.optional stdenv.isDarwin (fetchpatch {
       url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb";
       sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8";
     })
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch;
+    ++ lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch;
 
   buildInputs = [ libevent ];
   propagatedBuildInputs = [ cyrus_sasl ];
 
   NIX_CFLAGS_COMPILE = "-fpermissive";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libmemcached.org";
     description = "Open source C/C++ client library and tools for the memcached server";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index 54ff0dccb90..128975246a8 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , libtool
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client";
     longDescription = ''
       Reasons for forking:
diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix
index 2a61c571066..f569ce7fac7 100644
--- a/pkgs/development/libraries/libmhash/default.nix
+++ b/pkgs/development/libraries/libmhash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "mhash";
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://mhash.sourceforge.net";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix
index 5bed556a273..c9dd899a2b0 100644
--- a/pkgs/development/libraries/libmicrodns/default.nix
+++ b/pkgs/development/libraries/libmicrodns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , meson
 , ninja
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimal mDNS resolver library, used by VLC";
     homepage = "https://github.com/videolabs/libmicrodns";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix
index 99407d22b75..336b66ac832 100644
--- a/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/pkgs/development/libraries/libmicrohttpd/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }:
+{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }:
 
 stdenv.mkDerivation rec {
   pname = "libmicrohttpd";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # Disabled because the tests can time-out.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Embeddable HTTP server library";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index 59967bcba5a..a734a4b8009 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }:
+{ lib, stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }:
 
 let
-  inherit (stdenv.lib) optional optionalString;
+  inherit (lib) optional optionalString;
 
 in stdenv.mkDerivation rec {
   name = "libmikmod-3.3.11.1";
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for playing tracker music module files";
     homepage    = "https://mikmod.shlomifish.org/";
     license     = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index f937d818a55..9287b0a0dea 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4 }:
+{ lib, stdenv, fetchurl, m4 }:
 
 stdenv.mkDerivation rec {
   pname = "libmilter";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ m4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sendmail Milter mail filtering API library";
     platforms = platforms.unix;
     maintainers = with maintainers; [ fpletz ];
diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix
index ce39285e0d2..2440082cce9 100644
--- a/pkgs/development/libraries/libminc/default.nix
+++ b/pkgs/development/libraries/libminc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }:
+{ lib, stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }:
 
 stdenv.mkDerivation rec {
   pname   = "libminc";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     # ezminc_rw_test: can't find libminc_io.so.5.2.0
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BIC-MNI/libminc";
     description = "Medical imaging library based on HDF5";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix
index 9a754eda592..584d76e1cf2 100644
--- a/pkgs/development/libraries/libmkv/default.nix
+++ b/pkgs/development/libraries/libmkv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
+{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   pname = "libmkv";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
       It is written in plain C, and intended to be very portable.
     '';
     homepage = "https://github.com/saintdev/libmkv";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.wmertens ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix
index a56b18fe199..83add1d42a5 100644
--- a/pkgs/development/libraries/libmms/default.nix
+++ b/pkgs/development/libraries/libmms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkg-config }:
+{ lib, stdenv, fetchurl, glib, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libmms-0.6.4";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for downloading (streaming) media files using the mmst and mmsh protocols";
     homepage = "http://libmms.sourceforge.net";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index e13bda56793..f1704a527b4 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }:
+{ lib, stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }:
 
 stdenv.mkDerivation rec {
   name = "libmng-2.0.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
     homepage = "http://www.libmng.com";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix
index 3db6ab0da08..4e99258a3e8 100644
--- a/pkgs/development/libraries/libmnl/default.nix
+++ b/pkgs/development/libraries/libmnl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libmnl-1.0.4";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       re-inventing the wheel.
     '';
     homepage = "https://netfilter.org/projects/libmnl/index.html";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix
index 14f80e9b2e5..b311c4f0418 100644
--- a/pkgs/development/libraries/libmodbus/default.nix
+++ b/pkgs/development/libraries/libmodbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libmodbus-3.1.6";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to send/receive data according to the Modbus protocol";
     homepage = "https://libmodbus.org/";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index 2d38a5021e5..790674f1649 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file }:
+{ lib, stdenv, fetchurl, file }:
 
 let
   version = "0.8.9.0";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
         --replace /usr/bin/file ${file}/bin/file
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MOD playing library";
     homepage    = "http://modplug-xmms.sourceforge.net/";
     license     = licenses.publicDomain;
diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix
index 2848298016d..d77d2bcbdcd 100644
--- a/pkgs/development/libraries/libmodule/default.nix
+++ b/pkgs/development/libraries/libmodule/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C simple and elegant implementation of an actor library";
     homepage = "https://github.com/FedeDP/libmodule";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix
index a0d32f5178a..8a8d9adf53d 100644
--- a/pkgs/development/libraries/libmodulemd/default.nix
+++ b/pkgs/development/libraries/libmodulemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , substituteAll
 , fetchFromGitHub
 , fetchpatch
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C Library for manipulating module metadata files";
     homepage = "https://github.com/fedora-modularity/libmodulemd";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix
index f07dbd84a95..f81f6313338 100644
--- a/pkgs/development/libraries/libmongo-client/default.nix
+++ b/pkgs/development/libraries/libmongo-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   name = "libmongo-client-0.1.8";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://algernon.github.io/libmongo-client/";
     description = "An alternative C driver for MongoDB";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix
index ae3a9efef24..e227c09b2b6 100644
--- a/pkgs/development/libraries/libmowgli/default.nix
+++ b/pkgs/development/libraries/libmowgli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libmowgli";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A development framework for C providing high performance and highly flexible algorithms";
     homepage = "https://github.com/atheme/libmowgli-2";
     license = licenses.isc;
diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix
index 237e3f94cfc..58da7560e13 100644
--- a/pkgs/development/libraries/libmp3splt/default.nix
+++ b/pkgs/development/libraries/libmp3splt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool, libmad, libid3tag }:
+{ lib, stdenv, fetchurl, libtool, libmad, libid3tag }:
 
 stdenv.mkDerivation rec {
   name = "libmp3splt-0.9.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-pcre" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://sourceforge.net/projects/mp3splt/";
     description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
     maintainers = with maintainers; [ bosu ];
diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix
index 736474d29a5..b62da40499c 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/pkgs/development/libraries/libmpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtool }:
+{ lib, stdenv, fetchFromGitHub, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "libmpack";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple implementation of msgpack in C";
     homepage = "https://github.com/tarruda/libmpack/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index 79fa1743781..66e38fbfbc0 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , gmp, mpfr
 }:
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation {
       '';
 
     homepage = "http://mpc.multiprecision.org/";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix
index 3ee37e6ae9c..b42d9a3d1e4 100644
--- a/pkgs/development/libraries/libmpcdec/default.nix
+++ b/pkgs/development/libraries/libmpcdec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libmpcdec-1.2.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Musepack SV7 decoder library";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index d6fb28c0e88..bf5f25ca43f 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "0.5.1";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
   };
 
   # Otherwise clang fails with 'duplicate symbol ___sputc'
-  buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89";
+  buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89";
 
   meta = {
     homepage = "http://libmpeg2.sourceforge.net/";
     description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix
index fbd7cbe7ad6..df3460970d1 100644
--- a/pkgs/development/libraries/libmrss/default.nix
+++ b/pkgs/development/libraries/libmrss/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, curl, libnxml, pkg-config}:
+{lib, stdenv, fetchurl, curl, libnxml, pkg-config}:
 
 stdenv.mkDerivation {
   name = "libmrss-0.19.2";
@@ -14,9 +14,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.autistici.org/bakunin/libmrss/doc";
     description = "C library for parsing, writing and creating RSS/ATOM files or streams";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.viric ];
   };
 }
diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index 70fdd7e913e..4ad60bcfb18 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "libmspack-0.7.1alpha";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A de/compression library for various Microsoft formats";
     homepage = "https://www.cabextract.org.uk/libmspack";
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index bbc3e949053..a49026c35dc 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config
 , libusb1
 , libiconv
 }:
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # tried to install files to /lib/udev, hopefully OK
   configureFlags = [ "--with-udev=$$bin/lib/udev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libmtp.sourceforge.net";
     description = "An implementation of Microsoft's Media Transfer Protocol";
     longDescription = ''
diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 7c8cdd1df1a..3e7a2f1a0ba 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "5.1.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeBuildDir=true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://musicbrainz.org/doc/libmusicbrainz";
     description = "MusicBrainz Client Library (5.x version)";
     longDescription = ''
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
index d5568cdb3d6..ab67d544a1d 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, neon, libdiscid }:
+{ lib, stdenv, fetchurl, cmake, neon, libdiscid }:
 
 stdenv.mkDerivation rec {
   name = "libmusicbrainz-3.0.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://musicbrainz.org/doc/libmusicbrainz";
     description = "MusicBrainz Client Library (3.x version)";
     longDescription = ''
diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index 1889fc1508f..0c56964bfed 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
+{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
 let
   s = # Generated upstream information
   rec {
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''Import library for some old mac text documents'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mpl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix
index ace5503b657..f4256de6981 100644
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/pkgs/development/libraries/libmx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , libtool, pkg-config, automake, autoconf, intltool
 , glib, gobject-introspection, gtk2, gtk-doc
 , clutter, clutter-gtk
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.clutter-project.org/";
     description = "A Clutter-based toolkit";
     longDescription =
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index d3e0ff53528..655480f75a2 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , autoconf
 , automake
 , fetchFromGitHub
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mypaint.org/";
     description = "Library for making brushstrokes which is used by MyPaint and other projects";
     license = licenses.isc;
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 6c4874112b7..4c00d642588 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , boost
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://dev.mysql.com/downloads/connector/cpp/";
     description = "C++ library for connecting to mysql servers";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix
index 91843163176..af5e78c25d6 100644
--- a/pkgs/development/libraries/libnabo/default.nix
+++ b/pkgs/development/libraries/libnabo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, cmake, eigen, boost}:
+{lib, stdenv, fetchFromGitHub, cmake, eigen, boost}:
 
 stdenv.mkDerivation rec {
   version = "1.0.7";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "A fast K Nearest Neighbor library for low-dimensional spaces";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix
index a2aae126359..dd902c0021d 100644
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libnatpmp";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "INSTALLPREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://miniupnp.free.fr/libnatpmp.html";
     description = "NAT-PMP client";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix
index 12f1038f8e1..3d1e2b7ac4a 100644
--- a/pkgs/development/libraries/libnats-c/default.nix
+++ b/pkgs/development/libraries/libnats-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, protobuf, protobufc
 , libsodium, openssl
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   separateDebugInfo = true;
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C API for the NATS messaging system";
     homepage    = "https://github.com/nats-io/nats.c";
     license     = licenses.asl20;
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index 8ac2859faed..17e43ec29d9 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, popt, libiconv }:
+{ lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }:
 
 stdenv.mkDerivation (rec {
   name = "libnatspec-0.3.0";
@@ -12,12 +12,12 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [ popt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://natspec.sourceforge.net/";
     description = "A library intended to smooth national specificities in using of programs";
     platforms = platforms.unix;
     license = licenses.lgpl21;
   };
-} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
+} // lib.optionalAttrs (!stdenv.isLinux) {
   propagatedBuildInputs = [ libiconv ];
 })
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index aac9f8e8acf..b7e082f2b9b 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
 , asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
 , json_c, kmod, which, util-linux, udev, keyutils
 }:
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     echo "m4_define([GIT_VERSION], [${version}])" > version.m4;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for managing the Linux Non-Volatile Memory Device sub-system";
     homepage    = "https://github.com/pmem/ndctl";
     license     = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix
index 2592b7184f8..fc68149c14c 100644
--- a/pkgs/development/libraries/libndp/default.nix
+++ b/pkgs/development/libraries/libndp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libndp-1.7";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dlinhl39va00v55qygjc9ap77yqf7xvn4rwmvdr49xhzzxhlj1c";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libndp.org/";
     description = "Library for Neighbor Discovery Protocol";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index d27c1ba376d..1f0709af6cf 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Dynamic types for data description and in-memory computations";
     homepage = "https://xnd.io/";
     license = licenses.bsdOriginal;
diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix
index ee61ef8a723..567598500d6 100644
--- a/pkgs/development/libraries/libnest2d/default.nix
+++ b/pkgs/development/libraries/libnest2d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
+{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
 
 stdenv.mkDerivation rec {
   version = "2020-10-09-unstable";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   CLIPPER_PATH = "${clipper.out}";
   cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "2D irregular bin packaging and nesting library written in modern C++";
     homepage = "https://github.com/Ultimaker/libnest2d";
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix
index 7987fccc06f..cb3375708df 100644
--- a/pkgs/development/libraries/libnet/default.nix
+++ b/pkgs/development/libraries/libnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libnet";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-includes.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sam-github/libnet";
     description = "Portable framework for low-level network packet construction";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix
index 98d89d67ef6..72766471d2f 100644
--- a/pkgs/development/libraries/libnetfilter_acct/default.nix
+++ b/pkgs/development/libraries/libnetfilter_acct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
   version = "1.0.3";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.netfilter.org/projects/libnetfilter_acct/";
     description = "Userspace library providing interface to extended accounting infrastructure";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index a97e77c5334..a2097bb17e2 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_conntrack";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libnfnetlink ];
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
     longDescription = ''
       libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index b700c0e9d9a..b8b05e57dad 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_cthelper";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       is used by conntrack-tools.
     '';
     homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index 23de6481592..a8d0c2680df 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_cttimeout";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       be attached to traffic flows. This library is used by conntrack-tools.
     '';
     homepage = "https://netfilter.org/projects/libnetfilter_cttimeout/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix
index 9bec269e6ac..4ac20cf29cb 100644
--- a/pkgs/development/libraries/libnetfilter_log/default.nix
+++ b/pkgs/development/libraries/libnetfilter_log/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_log";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libnfnetlink ];
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace library providing interface to packets that have been logged by the kernel packet filter";
     longDescription = ''
       libnetfilter_log is a userspace library providing interface to packets
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index 6889f7702e6..7dafcd42223 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }:
 
 stdenv.mkDerivation rec {
   version = "1.0.5";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl libnfnetlink ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.netfilter.org/projects/libnetfilter_queue/";
     description = "Userspace API to packets queued by the kernel packet filter";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
index ed7412d6611..b4daab97388 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb-compat-0_1, readline }:
+{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }:
 
 stdenv.mkDerivation {
   pname = "libnfc";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ libusb-compat-0_1 readline ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source library libnfc for Near Field Communication";
     license = licenses.gpl3;
     homepage = "https://github.com/nfc-tools/libnfc";
diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix
index ecce38ac23e..4c7b4a5cc2d 100644
--- a/pkgs/development/libraries/libnfnetlink/default.nix
+++ b/pkgs/development/libraries/libnfnetlink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libnfnetlink-1.0.1";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
       It is only used by other netfilter.org projects, like the aforementioned ones.
     '';
     homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix
index 03a4dbe02d5..4e12553b00b 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/pkgs/development/libraries/libnfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libnfs";
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "NFS client library";
     homepage    = "https://github.com/sahlberg/libnfs";
     license     = with licenses; [ lgpl2 bsd2 gpl3 ];
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index a546eeebdc5..025ddf8e7b1 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
   version = "1.1.8";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem";
     homepage = "http://netfilter.org/projects/libnftnl";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index 84bd9b33e79..72fbcd1ab08 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, bison, flex, fftw}:
+{lib, stdenv, fetchurl, bison, flex, fftw}:
 
 # Note that this does not provide the ngspice command-line utility. For that see
 # the ngspice derivation.
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = "http://ngspice.sourceforge.net";
     license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index b4e1682ab7e..7c5043165f9 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , meson
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GLib ICE implementation";
     longDescription = ''
       Libnice is an implementation of the IETF's Interactice Connectivity
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index 497e3aa6679..fbe01bf4062 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, dbus, expat }:
+{ lib, stdenv, fetchurl, pkg-config, dbus, expat }:
 
 let version = "1.0.3"; in
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A small library for C application development";
     homepage = "https://launchpad.net/libnih";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix
index f1661f222cc..abbffcf0f94 100644
--- a/pkgs/development/libraries/libnixxml/default.nix
+++ b/pkgs/development/libraries/libnixxml/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
+{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
 
 stdenv.mkDerivation {
   name = "libnixxml";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     ./bootstrap
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XML-based Nix-friendly data integration library";
     homepage = https://github.com/svanderburg/libnixxml;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index 2675098a826..29b37164228 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "man" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36";
   };
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developer.gnome.org/notification-spec/";
     description = "A library that sends desktop notifications to a notification daemon";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix
index 8cdbdbd747a..f6a8d01ab84 100644
--- a/pkgs/development/libraries/libnova/default.nix
+++ b/pkgs/development/libraries/libnova/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook }:
+{ lib, stdenv, fetchgit, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libnova";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Celestial Mechanics, Astrometry and Astrodynamics Library";
     homepage = "http://libnova.sf.net";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix
index ab7527c7c76..ac4c6bf9ad3 100644
--- a/pkgs/development/libraries/libnsl/default.nix
+++ b/pkgs/development/libraries/libnsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libnsl";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libtirpc ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client interface library for NIS(YP) and NIS+";
     homepage = "https://github.com/thkukuk/libnsl";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix
index dc5e8dfc55e..84617001143 100644
--- a/pkgs/development/libraries/libnxml/default.nix
+++ b/pkgs/development/libraries/libnxml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, curl}:
+{lib, stdenv, fetchurl, curl}:
 
 stdenv.mkDerivation {
   name = "libnxml-0.18.3";
@@ -13,9 +13,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.autistici.org/bakunin/libnxml/";
     description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.viric ];
   };
 }
diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index 8980a145dc9..caab0a83fcf 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, nss, nspr, pkg-config }:
+{ fetchurl, lib, stdenv, nss, nspr, pkg-config }:
 
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       --replace "-lnss3" "-L${nss.out}/lib -lnss3"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     description = "C library implementing the OAuth secure authentication protocol";
     homepage = "http://liboauth.sourceforge.net/";
diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix
index 9af9a3864d2..e93bafe2b56 100644
--- a/pkgs/development/libraries/libodfgen/default.nix
+++ b/pkgs/development/libraries/libodfgen/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
+{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
 let
   s = # Generated upstream information
   rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''A base library for generating ODF documents'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mpl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index c2402338034..c78aa3f617e 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, expat, curl, fftw }:
+{ lib, stdenv, fetchurl, expat, curl, fftw }:
 
 let
   version = "0.9.3";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ expat curl fftw ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://code.google.com/archive/p/musicip-libofa/";
     description = "Library Open Fingerprint Architecture";
     longDescription = ''
diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index f11489eaf9f..10197bd8db0 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl
+{ lib, stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl
 , autoconf, automake, libtool, gengetopt, libiconv }:
 
 stdenv.mkDerivation rec {
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
   preConfigure = "./autogen.sh";
   configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];
   nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ];
-  buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.isDarwin libiconv;
 
   meta = {
     description = "Opensource implementation of the Open Financial eXchange specification";
     homepage = "http://libofx.sourceforge.net/";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 50950a15a87..83555ccab8c 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "libogg-1.3.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     # Fix unsigned typedefs on darwin. Remove with the next release https://github.com/xiph/ogg/pull/64
     (fetchpatch {
       url = "https://github.com/xiph/ogg/commit/c8fca6b4a02d695b1ceea39b330d4406001c03ed.patch";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Media container library to manipulate Ogg files";
     longDescription = ''
       Library to work with Ogg multimedia container format.
diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix
index 687e1d9c43d..15856c0262c 100644
--- a/pkgs/development/libraries/liboggz/default.nix
+++ b/pkgs/development/libraries/liboggz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libogg, pkg-config }:
+{ lib, stdenv, fetchurl, libogg, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "liboggz-1.1.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://xiph.org/oggz/";
     description = "A C library and tools for manipulating with Ogg files and streams";
     longDescription = ''
diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix
index c1c41ce559f..8d929975815 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config }:
+{lib, stdenv, fetchurl, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "liboil-0.3.17";
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
 
   # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix"
   # errors
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
+  configureFlags = lib.optional stdenv.isDarwin "--build=x86_64";
 
   # fixes a cast in inline asm: easier than patching
-  buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions";
+  buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library of simple functions that are optimized for various CPUs";
     homepage    = "https://liboil.freedesktop.org";
     license     = licenses.bsd2;
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index 854c2732c12..5e3b0c6798a 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libomxil-bellagio";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags =
-    stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ];
+    lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ];
 
   patches = [ ./fedora-fixes.patch ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # developed anymore. Alternatively, gcc7Stdenv could be used.
   NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/projects/omxil/";
     description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix
index 75fa4a80a31..5d849ebe1ca 100644
--- a/pkgs/development/libraries/liboop/default.nix
+++ b/pkgs/development/libraries/liboop/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "liboop-1.0";
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
     description = "Event loop library";
     homepage = "http://liboop.ofb.net/";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index 8db034683dc..e448d225b99 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages
+{ lib, stdenv, buildPackages
 , autoreconfHook, bison, binutils-unwrapped
 , libiberty, libbfd
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library from binutils for manipulating machine code";
     homepage = "https://www.gnu.org/software/binutils/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix
index 5b02d70f683..9cc57d1a465 100644
--- a/pkgs/development/libraries/libopenaptx/default.nix
+++ b/pkgs/development/libraries/libopenaptx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libopenaptx";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Audio Processing Technology codec (aptX)";
     license = licenses.lgpl21Plus;
     homepage = "https://github.com/pali/libopenaptx";
diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix
index 956538b7624..c309c70e3d3 100644
--- a/pkgs/development/libraries/liboping/default.nix
+++ b/pkgs/development/libraries/liboping/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses perl ];
 
-  configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no";
+  configureFlags = lib.optional (perl == null) "--with-perl-bindings=no";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library to generate ICMP echo requests (a.k.a. ping packets)";
     longDescription = ''
       liboping is a C library to generate ICMP echo requests, better known as
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index e8d3682b8b3..51179ecb9a0 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , fixedPoint ? false, withCustomModes ? true }:
 
 let
@@ -15,14 +15,14 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point"
-                ++ stdenv.lib.optional withCustomModes "--enable-custom-modes";
+  configureFlags = lib.optional fixedPoint "--enable-fixed-point"
+                ++ lib.optional withCustomModes "--enable-custom-modes";
 
   doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open, royalty-free, highly versatile audio codec";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     homepage = "https://www.opus-codec.org/";
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
index 9aaf52abdf1..c2d77185e69 100644
--- a/pkgs/development/libraries/libopusenc/default.nix
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libopus }:
+{ lib, stdenv, fetchurl, pkg-config, libopus }:
 
 let
   version = "0.2.1";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libopus ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for encoding .opus audio files and live streams";
     license = licenses.bsd3;
     homepage = "https://www.opus-codec.org/";
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 4d4ab13e8c5..a6b17016719 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , pkg-config
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support";
     homepage = "https://libosinfo.org/";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index 10e6d61d156..c5b801f5d47 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }:
+{ lib, stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }:
 
 stdenv.mkDerivation rec {
   pname = "libosmium";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast and flexible C++ library for working with OpenStreetMap data";
     homepage = "https://osmcode.org/libosmium/";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix
index d1f6ea5c2ea..1cbfe44ef4e 100644
--- a/pkgs/development/libraries/libosmpbf/default.nix
+++ b/pkgs/development/libraries/libosmpbf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, protobuf}:
+{lib, stdenv, fetchurl, protobuf}:
 
 stdenv.mkDerivation {
   name = "libosmpbf-1.3.3";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/scrosby/OSM-binary";
     description = "C library to read and write OpenStreetMap PBF files";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 15b6da0ac5b..824dac3a2f5 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 let version = "1.6.2"; in
 
@@ -13,11 +13,11 @@ stdenv.mkDerivation {
 
   configureFlags = [
     "ac_cv_va_copy=yes"
-  ] ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+  ] ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   patches = [ ./shtool.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.ossp.org/pkg/lib/uuid/";
     description = "OSSP uuid ISO-C and C++ shared library";
     longDescription =
diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index 10619f9682b..7c2a2b9a6b9 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, autoreconfHook }:
+{ lib, stdenv, fetchurl, libgcrypt, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libotr-4.1.1";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libgcrypt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.cypherpunks.ca/otr/";
     repositories.git = "git://git.code.sf.net/p/otr/libotr";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix
index 80a84974b7a..e4a8d95f4b0 100644
--- a/pkgs/development/libraries/libow/default.nix
+++ b/pkgs/development/libraries/libow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }:
 
 stdenv.mkDerivation rec {
   version = "3.2p4";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoconf automake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "1-Wire File System full library";
     homepage = "https://owfs.org/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 06871158609..14270a36ec5 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libowfat-0.32";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "prefix=$(out)" ];
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GPL reimplementation of libdjb";
     homepage = "https://www.fefe.de/libowfat/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 26a95090ef6..eb577a7f5a1 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config
 , openssl }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
     homepage = "https://github.com/OpenSC/libp11";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/development/libraries/libpam-wrapper/default.nix
index f8359cded93..7d026eb5a09 100644
--- a/pkgs/development/libraries/libpam-wrapper/default.nix
+++ b/pkgs/development/libraries/libpam-wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 , cmake
 , linux-pam
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
     sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p";
   };
 
-  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional enablePython [ python ];
+  nativeBuildInputs = [ cmake ] ++ lib.optional enablePython [ python ];
 
   # We must use linux-pam, using openpam will result in broken fprintd.
   buildInputs = [ linux-pam ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wrapper for testing PAM modules";
     homepage = "https://cwrap.org/pam_wrapper.html";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix
index d7863e29d58..b9372ba1d40 100644
--- a/pkgs/development/libraries/libpaper/default.nix
+++ b/pkgs/development/libraries/libpaper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.1.28";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library for handling paper characteristics";
     homepage = "http://packages.debian.org/unstable/source/libpaper";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix
index f8e9d6e4a0b..625e780d192 100644
--- a/pkgs/development/libraries/libpar2/default.nix
+++ b/pkgs/development/libraries/libpar2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libsigcxx }:
+{ lib, stdenv, fetchurl, pkg-config, libsigcxx }:
 
 let version = "0.4"; in
 
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./libpar2-0.4-external-verification.patch ];
 
-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
 
   meta = {
     homepage = "http://parchive.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     description = "A library for using Parchives (parity archive volume sets)";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 2999b3d3172..0b30bf6c2b0 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }:
+{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libpcap";
diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 51717e84259..a8ef9e2f9bb 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3
 , glib, gtk3, gobject-introspection, python3, ncurses
 }:
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2";
   };
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GObject-based plugins engine";
     homepage = "https://wiki.gnome.org/Projects/Libpeas";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index 63b826258ae..20c4c0a1c6e 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Helper library to program the performance monitoring events";
     longDescription = ''
       This package provides a library, called libpfm4 which is used to
@@ -32,7 +32,7 @@ stdenv.mkDerivation (rec {
     maintainers = [ maintainers.pierron ];
     platforms = platforms.linux;
   };
-} // stdenv.lib.optionalAttrs ( ! enableShared )
+} // lib.optionalAttrs ( ! enableShared )
 {
   CONFIG_PFMLIB_SHARED = "n";
 }
diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix
index 7710c208199..280059fbab3 100644
--- a/pkgs/development/libraries/libpgf/default.nix
+++ b/pkgs/development/libraries/libpgf/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix }:
 
-with stdenv.lib;
+with lib;
 
 let
   version = "6.14.12";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.libpgf.org/";
     description = "Progressive Graphics Format";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix
index 0ec92b369d0..2ff59e055f9 100644
--- a/pkgs/development/libraries/libphonenumber/default.nix
+++ b/pkgs/development/libraries/libphonenumber/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }:
+{ lib, stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }:
 
 stdenv.mkDerivation rec {
   pname = "phonenumber";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   checkPhase = "./libphonenumber_test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google's i18n library for parsing and using phone numbers";
     license = licenses.asl20;
     maintainers = with maintainers; [ illegalprime ];
diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix
index a3274fc9053..2d802cf28d7 100644
--- a/pkgs/development/libraries/libpinyin/default.nix
+++ b/pkgs/development/libraries/libpinyin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchFromGitHub
 , autoreconfHook
 , glib
 , db
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook glib db pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for intelligent sentence-based Chinese pinyin input method";
     homepage    = "https://sourceforge.net/projects/libpinyin";
     license     = licenses.gpl2;
diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
index be3ab953c0a..b5310c3cb8c 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libpipeline-1.5.3";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libpipeline.nongnu.org";
     description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix
index 956b34fd93d..94301b34fbc 100644
--- a/pkgs/development/libraries/libplacebo/default.nix
+++ b/pkgs/development/libraries/libplacebo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , fetchpatch
 , meson
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reusable library for GPU-accelerated video/image rendering primitives";
     longDescription = ''
       Reusable library for GPU-accelerated image/view processing primitives and
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 447440b9c76..c8e9ddb82c5 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }:
+{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }:
 
 stdenv.mkDerivation rec {
   pname = "libplist";
@@ -11,27 +11,27 @@ stdenv.mkDerivation rec {
     sha256 = "1vxhpjxniybqsg5wcygmdmr5dv7p2zb34dqnd3bi813rnnzsdjm6";
   };
 
-  outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py";
+  outputs = ["bin" "dev" "out" ] ++ lib.optional enablePython "py";
 
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
-  ] ++ stdenv.lib.optionals enablePython [
+  ] ++ lib.optionals enablePython [
     python
     python.pkgs.cython
   ];
 
-  configureFlags = stdenv.lib.optionals (!enablePython) [
+  configureFlags = lib.optionals (!enablePython) [
     "--without-cython"
   ];
 
   propagatedBuildInputs = [ glib ];
 
-  postFixup = stdenv.lib.optionalString enablePython ''
+  postFixup = lib.optionalString enablePython ''
     moveToOutput "lib/${python.libPrefix}" "$py"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to handle Apple Property List format in binary or XML";
     homepage = "https://github.com/libimobiledevice/libplist";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 7199695ae74..bf3d5168d6c 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib }:
+{ lib, stdenv, fetchurl, zlib }:
 
 assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null;
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''mv "$out/bin" "$dev/bin"'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official reference implementation for the PNG file format";
     homepage = "http://www.libpng.org/pub/png/libpng.html";
     license = licenses.libpng;
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 489007bc417..aeb3fcba06f 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, apngSupport ? true }:
+{ lib, stdenv, fetchurl, zlib, apngSupport ? true }:
 
 assert zlib != null;
 
@@ -8,7 +8,7 @@ let
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
     sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2";
   };
-  whenPatched = stdenv.lib.optionalString apngSupport;
+  whenPatched = lib.optionalString apngSupport;
 
 in stdenv.mkDerivation rec {
   name = "libpng" + whenPatched "-apng" + "-${version}";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
 
   passthru = { inherit zlib; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
     homepage = "http://www.libpng.org/pub/png/libpng.html";
     license = licenses.libpng2;
diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix
index 3a90f28e757..31fb5cb05ba 100644
--- a/pkgs/development/libraries/libpointmatcher/default.nix
+++ b/pkgs/development/libraries/libpointmatcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }:
+{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }:
 
 stdenv.mkDerivation rec {
   pname = "libpointmatcher";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ./utest/utest --path ../examples/data/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix
index 6f706634391..5eacdaa8f3c 100644
--- a/pkgs/development/libraries/libportal/default.nix
+++ b/pkgs/development/libraries/libportal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , meson
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flatpak portal library";
     homepage = "https://github.com/flatpak/libportal";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 4876de5551d..afd1a6365b4 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , pkg-config
 , cmake
@@ -82,21 +82,21 @@ stdenv.mkDerivation rec {
       sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8";
     })
 
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     (fetchpatch {
       url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
       sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
     })
   ];
 
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     # config_gnome3 uses the helper to find GNOME proxy settings
     wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
   '';
 
   doCheck = false; # fails 1 out of 10 tests
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.lgpl21;
     homepage = "http://libproxy.github.io/libproxy/";
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix
index d5418ec09d8..f0638150573 100644
--- a/pkgs/development/libraries/libpseudo/default.nix
+++ b/pkgs/development/libraries/libpseudo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, glib, ncurses}:
+{lib, stdenv, fetchurl, pkg-config, glib, ncurses}:
 stdenv.mkDerivation rec {
   name = "libpseudo-1.2.0";
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ncurses ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libpseudo.sourceforge.net/";
     description = "Simple, thread-safe messaging between threads";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index ed6d63aa524..e68219f6348 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoreconfHook
 , docbook_xsl
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
     libxslt
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     valgrind
   ];
 
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
     "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
     "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt"
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     "--enable-valgrind-tests"
   ];
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for the Publix Suffix List";
     longDescription = ''
       libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"
diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix
index 829bea9351e..40f6b3b1aee 100644
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/pkgs/development/libraries/libpst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, boost, libgsf,
+{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf,
   pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.five-ten-sg.com/libpst/";
     description = "A library to read PST (MS Outlook Personal Folders) files";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index ca1bfecfadb..80e6e6fe668 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen,
+{ lib, stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen,
   autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     substituteInPlace libqalculate/Calculator-plot.cc \
       --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
       --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     substituteInPlace src/qalc.cc \
       --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'
   '';
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An advanced calculator library";
     homepage = "http://qalculate.github.io";
     maintainers = with maintainers; [ gebner ];
diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix
index 7f3ca25ec40..3f0a9a28d19 100644
--- a/pkgs/development/libraries/libqb/default.nix
+++ b/pkgs/development/libraries/libqb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config }:
+{ lib, stdenv, fetchurl, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libqb-0.17.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/clusterlabs/libqb";
     description = "A library providing high performance logging, tracing, ipc, and poll";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index 0d1da964adb..4fc50f20730 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }:
+{ lib, stdenv, fetchurl, qmake, qtbase, libGLU, AGL }:
 
 stdenv.mkDerivation rec {
   pname = "libqglviewer";
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase libGLU ]
-    ++ stdenv.lib.optional stdenv.isDarwin AGL;
+    ++ lib.optional stdenv.isDarwin AGL;
 
   postPatch = ''
     cd QGLViewer
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers";
     homepage = "http://libqglviewer.com";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index de38e5d3b6e..e616fae9250 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
+{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
 
 stdenv.mkDerivation rec {
   pname = "libqmi";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.freedesktop.org/wiki/Software/libqmi/";
     description = "Modem protocol helper library";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix
index d838c07de87..34ac547f492 100644
--- a/pkgs/development/libraries/libr3/default.nix
+++ b/pkgs/development/libraries/libr3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , pcre
 , pkg-config
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A high-performance path dispatching library";
     homepage = "https://github.com/c9s/r3";
-    license = [ stdenv.lib.licenses.mit ];
+    license = [ lib.licenses.mit ];
   };
 
 }
diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix
index 664b8d1a7e0..217a83bcebc 100644
--- a/pkgs/development/libraries/libraspberrypi/default.nix
+++ b/pkgs/development/libraries/libraspberrypi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "-DVMCS_INSTALL_PREFIX=${placeholder "out"}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userland tools & libraries for interfacing with Raspberry Pi hardware";
     homepage = "https://github.com/raspberrypi/userland";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 123bd87ae30..3ff7e725f3d 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libraw";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
     homepage = "https://www.libraw.org/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index a99e4d22077..7bf99e739f3 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libraw1394-2.1.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
     homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix
index ef194bb0b1e..8d1b1f2a0ea 100644
--- a/pkgs/development/libraries/librdf/raptor.nix
+++ b/pkgs/development/libraries/librdf/raptor.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, curl }:
+{ lib, stdenv, fetchurl, libxml2, curl }:
 
 stdenv.mkDerivation rec {
   name = "raptor-1.4.21";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
-    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ lgpl21 asl20 ];
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index 4645b5ea0d8..bb8aeefa102 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, libxslt }:
+{ lib, stdenv, fetchurl, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
   pname = "raptor2";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
-    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
-    maintainers = with stdenv.lib.maintainers; [ marcweber ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ lgpl21 asl20 ];
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index ff8679b86ab..88acc372f7f 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }:
+{ lib, stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }:
 
 stdenv.mkDerivation rec {
   name = "rasqal-0.9.33";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
-    license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
-    maintainers = with stdenv.lib.maintainers; [ marcweber ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ lgpl21 asl20 ];
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index f9863b922c7..731d1cf1868 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, openssl, libxslt, perl
+{ lib, stdenv, fetchurl, pkg-config, openssl, libxslt, perl
 , curl, pcre, libxml2, librdf_rasqal, gmp
 , libmysqlclient, withMysql ? false
 , postgresql, withPostgresql ? false
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl pkg-config ];
 
   buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
-    ++ stdenv.lib.optional withMysql libmysqlclient
-    ++ stdenv.lib.optional withSqlite sqlite
-    ++ stdenv.lib.optional withPostgresql postgresql
-    ++ stdenv.lib.optional withBdb db;
+    ++ lib.optional withMysql libmysqlclient
+    ++ lib.optional withSqlite sqlite
+    ++ lib.optional withPostgresql postgresql
+    ++ lib.optional withBdb db;
 
   propagatedBuildInputs = [ librdf_rasqal ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--with-threads" ]
-    ++ stdenv.lib.optionals withBdb [
+    ++ lib.optionals withBdb [
       "--with-bdb-include=${db.dev}/include"
       "--with-bdb-lib=${db.out}/lib"
     ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails 1 out of 17 tests with a segmentation fault
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C libraries that provide support for the Resource Description Framework (RDF)";
     homepage = "http://librdf.org/";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 6e1d0a8ce3c..d2f6e31596f 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, openssl}:
+{lib, stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
   version = "0.6.1";
   pname = "libre";
@@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ zlib openssl ];
   makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
-  ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
-  ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
+  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
   ;
   meta = {
     description = "A library for real-time communications with async IO support and a complete SIP stack";
     homepage = "http://www.creytiv.com/re.html";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.bsd3;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [raskin];
+    license = lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 9a2ea6d033e..82761dc3d00 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)";
     homepage = "https://github.com/IntelRealSense/librealsense";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 0a56e4199e4..edf927e8664 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook
 , gnutls
 , openssl
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ gnutls zlib openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A reliable logging library";
     homepage = "https://www.librelp.com/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 012ac2a46a7..4e8d6fca616 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, openssl, libre}:
+{lib, stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
   version = "0.6.0";
   pname = "librem";
@@ -12,15 +12,15 @@ stdenv.mkDerivation rec {
     "LIBRE_INC=${libre}/include/re"
     ''PREFIX=$(out)''
   ]
-  ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}"
-  ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
+  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
   ;
   meta = {
     description = " A library for real-time audio and video processing";
     homepage = "http://www.creytiv.com/rem.html";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.bsd3;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [raskin];
+    license = lib.licenses.bsd3;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
     downloadURLRegexp = "/rem-.*[.]tar[.].*";
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index 747f9495015..74c45f00adc 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , pkg-config, autoreconfHook
 , readline, texinfo
 , gdbm, gmp, libffi }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "librep";
diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix
index 80dd4e05b21..0756874b3e7 100644
--- a/pkgs/development/libraries/libresample/default.nix
+++ b/pkgs/development/libraries/libresample/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake}:
+{lib, stdenv, fetchurl, cmake}:
 
 let
   patch = fetchurl {
@@ -20,9 +20,9 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A real-time library for sampling rate conversion library";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     homepage = "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html";
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ lib.maintainers.sander ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix
index bff441589c2..7b1ff8235aa 100644
--- a/pkgs/development/libraries/librest/default.nix
+++ b/pkgs/development/libraries/librest/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "rest";
   version = "0.8.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Helper library for RESTful services";
     homepage = "https://wiki.gnome.org/Projects/Librest";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix
index d36157a883c..32628695966 100644
--- a/pkgs/development/libraries/librevenge/default.nix
+++ b/pkgs/development/libraries/librevenge/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost, pkg-config, cppunit, zlib}:
+{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib}:
 let
   s = # Generated upstream information
   rec {
@@ -35,8 +35,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''A base library for writing document import filters'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mpl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix
index f1df19dc2e5..892bbbbbfc0 100644
--- a/pkgs/development/libraries/librevisa/default.nix
+++ b/pkgs/development/libraries/librevisa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libusb1 }:
+{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
 
 # TODO: add VXI development files, for VXI-11 (TCPIP) support
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libusb1 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implementation of the VISA standard (for instrument control)";
     longDescription = ''
       LibreVISA aims to be a compliant implementation of the VISA standard in a
diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix
index 4de2f1f8d3f..b6db462f3c3 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
+{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
   libyamlcpp, gmock }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://rime.im/";
     description = "Rime Input Method Engine, the core library";
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix
index b72ffb5b7ec..de1877f2ab4 100644
--- a/pkgs/development/libraries/libroxml/default.nix
+++ b/pkgs/development/libraries/libroxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libroxml-2.3.0";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz";
     sha256  = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.libroxml.net/";
     description = "This library is minimum, easy-to-use, C implementation for xml file parsing";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/development/libraries/librseq/default.nix
index 4fd8bb7e33a..12b9b4109c7 100644
--- a/pkgs/development/libraries/librseq/default.nix
+++ b/pkgs/development/libraries/librseq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook, linuxHeaders
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace library for the Linux Restartable Sequence API";
     homepage    = "https://github.com/compudj/librseq";
     license     = licenses.lgpl21;
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 7e2956d31cb..efdbf593463 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv";
   };
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     "--enable-vala"
     "--enable-installed-tests"
     "--enable-always-build-tests"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+  ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
   makeFlags = [
     "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG"
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   NIX_CFLAGS_COMPILE
-    = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo";
+    = lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo";
 
   # It wants to add loaders and update the loaders.cache in gdk-pixbuf
   # Patching the Makefiles to it creates rsvg specific loaders and the
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small library to render SVG images to Cairo surfaces";
     homepage = "https://wiki.gnome.org/Projects/LibRsvg";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix
index 35ccdcdf078..74dca4e3085 100644
--- a/pkgs/development/libraries/librsync/0.9.nix
+++ b/pkgs/development/libraries/librsync/0.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "librsync-0.9.7";
@@ -11,16 +11,16 @@ stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
 
   configureFlags = [
-    (stdenv.lib.enableFeature stdenv.isCygwin    "static")
-    (stdenv.lib.enableFeature (!stdenv.isCygwin) "shared")
+    (lib.enableFeature stdenv.isCygwin    "static")
+    (lib.enableFeature (!stdenv.isCygwin) "shared")
   ];
 
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
   meta = {
     homepage = "http://librsync.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     description = "Implementation of the rsync remote-delta algorithm";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index 9499be80f03..9211d9d233f 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:
+{ lib, stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:
 
 stdenv.mkDerivation rec {
   pname = "librsync";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://librsync.sourceforge.net/";
     license = licenses.lgpl2Plus;
     description = "Implementation of the rsync remote-delta algorithm";
diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix
index adabbe11cb3..3e44bfd3d7d 100644
--- a/pkgs/development/libraries/librtprocess/default.nix
+++ b/pkgs/development/libraries/librtprocess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "librtprocess";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/CarVac/librtprocess";
     description = "Highly optimized library for processing RAW images";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
index 3012263cb41..5a2b8636774 100644
--- a/pkgs/development/libraries/libs3/default.nix
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, curl, libxml2 }:
+{ lib, stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
   name = "libs3-2018-12-03";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   makeFlags = [ "DESTDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bji/libs3";
     description = "A library for interfacing with amazon s3";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 645c742aca0..5cf872c3fc3 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }:
+{ lib, stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }:
 
 let
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (lib) optionals optionalString;
 
 in stdenv.mkDerivation rec {
   name = "libsamplerate-0.1.9";
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Sample Rate Converter for audio";
     homepage    = "http://www.mega-nerd.com/SRC/index.html";
     license     = licenses.bsd2;
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index cebfdfe3838..f4caa22b322 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libsass";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C/C++ implementation of a Sass compiler";
     homepage = "https://github.com/sass/libsass";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix
index a06f6c50d66..3781d934612 100644
--- a/pkgs/development/libraries/libschrift/default.nix
+++ b/pkgs/development/libraries/libschrift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libschrift";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "libschrift.a" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tomolt/libschrift";
     description = "A lightweight TrueType font rendering library";
     license = licenses.isc;
diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix
index 7eaa8f85578..1bd22b2f790 100644
--- a/pkgs/development/libraries/libscrypt/default.nix
+++ b/pkgs/development/libraries/libscrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libscrypt";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng";
   };
 
-  buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";
+  buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";
 
   installFlags = [ "PREFIX=$(out)" ];
-  installTargets = stdenv.lib.optional stdenv.isDarwin "install-osx";
+  installTargets = lib.optional stdenv.isDarwin "install-osx";
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shared library that implements scrypt() functionality";
     homepage = "https://lolware.net/2014/04/29/libscrypt.html";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 472f7fdc51c..1ac5cef7c5f 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}:
+{lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}:
 
 stdenv.mkDerivation rec {
   version = "3.2.0";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/haiwen/libsearpc";
     description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index a0414f5ba55..7ea7add23f3 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, getopt, util-linux, gperf }:
+{ lib, stdenv, fetchurl, getopt, util-linux, gperf }:
 
 stdenv.mkDerivation rec {
   pname = "libseccomp";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High level library for the Linux Kernel seccomp filter";
     homepage = "https://github.com/seccomp/libseccomp";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index abc4b5949a8..6c28b7d16c1 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
+{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala
 , gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.20.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij";
   };
 
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A library for storing and retrieving passwords and other secrets";
     homepage = "https://wiki.gnome.org/Projects/Libsecret";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     inherit (glib.meta) platforms maintainers;
   };
 }
diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix
index f016e13fd89..0a2adc4126f 100644
--- a/pkgs/development/libraries/libserialport/default.nix
+++ b/pkgs/development/libraries/libserialport/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, udev, darwin }:
+{ lib, stdenv, fetchurl, pkg-config, udev, darwin }:
 
 stdenv.mkDerivation rec {
   name = "libserialport-0.1.1";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = stdenv.lib.optional stdenv.isLinux udev
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit;
+  buildInputs = lib.optional stdenv.isLinux udev
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform shared library for serial port access";
     homepage = "https://sigrok.org/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix
index 7bd65bbdfb2..c810034f847 100644
--- a/pkgs/development/libraries/libshout/default.nix
+++ b/pkgs/development/libraries/libshout/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config
+{ lib, stdenv, fetchurl, pkg-config
 , libvorbis, libtheora, speex }:
 
 # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://www.icecast.org";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ jcumming ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix
index e1c6f3efe52..8253d1df74f 100644
--- a/pkgs/development/libraries/libsieve/default.nix
+++ b/pkgs/development/libraries/libsieve/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   version = "2.3.1";
   pname = "libsieve";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interpreter for RFC 3028 Sieve and various extensions";
     homepage = "http://sodabrew.com/libsieve/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 09552f86fa7..a417e0bcc1d 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, m4}:
+{lib, stdenv, fetchurl, pkg-config, m4}:
 
 stdenv.mkDerivation rec {
   name = "libsigc++-1.2.7";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ m4];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libsigcplusplus.github.io/libsigcplusplus/";
     description = "A typesafe callback system for standard C++";
     branch = "1.2";
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index 4cc741a71c1..eac383fae0d 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gnum4, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libsigc++";
   version = "2.10.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libsigcplusplus.github.io/libsigcplusplus/";
     description = "A typesafe callback system for standard C++";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix
index 6278f6234f0..203d3613af8 100644
--- a/pkgs/development/libraries/libsignal-protocol-c/default.nix
+++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "libsignal-protocol-c";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Signal Protocol C Library";
     homepage = "https://github.com/signalapp/libsignal-protocol-c";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
index 4ac48c4985f..ae7a6775de5 100644
--- a/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, nix-update-script, pkg-config, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }:
+{ lib, stdenv, fetchgit, nix-update-script, pkg-config, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "libsignon-glib";
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for managing single signon credentials which can be used from GLib applications";
     homepage = "https://gitlab.com/accounts-sso/libsignon-glib";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 30921ade4cf..20cb80b1ff8 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , enableSigbusFix ? false # required by kernels < 3.18.6
 }:
 
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
       more.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
index 9e151931e65..e82ecde5ddd 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub}:
+{lib, stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
   version = "1.8.6";
   pname = "libsixel";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The SIXEL library for console graphics, and converter programs";
     homepage = "http://saitoha.github.com/libsixel";
     maintainers = with maintainers; [ vrthra ];
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix
index a950064cf6a..c4b36704cb9 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/pkgs/development/libraries/libskk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub,
+{ lib, stdenv, fetchFromGitHub,
   libtool, gettext, pkg-config,
   vala, gnome-common, gobject-introspection,
   libgee, json-glib, skk-dicts, libxkbcommon }:
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
       user dictionary, skkserv, and CDB format dictionary.
     '';
     homepage = "https://github.com/ueno/libskk";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ yuriaisaka ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix
index af6d26bc22b..8bd74d29243 100644
--- a/pkgs/development/libraries/libslirp/default.nix
+++ b/pkgs/development/libraries/libslirp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , meson
 , ninja
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     echo ${version} > .tarball-version
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "General purpose TCP-IP emulator";
     homepage = "https://gitlab.freedesktop.org/slirp/libslirp";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix
index ceda7b5d936..f824e54cdbf 100644
--- a/pkgs/development/libraries/libsmartcols/default.nix
+++ b/pkgs/development/libraries/libsmartcols/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }:
 
 stdenv.mkDerivation rec {
   name = "libsmartcols";
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "smart column output alignment library";
     homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ rb2k ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ rb2k ];
   };
 }
 
diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix
index 881af18d559..ab9d7d85c86 100644
--- a/pkgs/development/libraries/libsmi/default.nix
+++ b/pkgs/development/libraries/libsmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv , fetchurl }:
+{ lib, stdenv , fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libsmi";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Library to Access SMI MIB Information";
     homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html";
     license = licenses.free;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix
index 6de498f6d29..fc3e15f688d 100644
--- a/pkgs/development/libraries/libsnark/default.nix
+++ b/pkgs/development/libraries/libsnark/default.nix
@@ -5,7 +5,7 @@ let
   inherit (stdenv) lib;
 in stdenv.mkDerivation rec {
   name = "libsnark-pre${version}";
-  version = stdenv.lib.substring 0 8 rev;
+  version = lib.substring 0 8 rev;
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps;
@@ -20,10 +20,10 @@ in stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library for zkSNARKs";
     homepage = "https://github.com/scipr-lab/libsnark";
     license = licenses.mit;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index d154a7194bb..61e6d9cd765 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3
 , Carbon, AudioToolbox
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ];
   buildInputs = [ flac libogg libopus libvorbis ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
+    ++ lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
 
   enableParallelBuilding = true;
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   # need headers from the Carbon.framework in /System/Library/Frameworks to
   # compile this on darwin -- not sure how to handle
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin
+  preConfigure = lib.optionalString stdenv.isDarwin
     ''
       NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
     '';
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   # Needed on Darwin.
   NIX_CFLAGS_LINK = "-logg -lvorbis";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for reading and writing files containing sampled sound";
     homepage    = "https://libsndfile.github.io/libsndfile/";
     license     = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index c6381e2a141..db2cd044592 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libsodium-1.0.18";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modern and easy-to-use crypto library";
     homepage = "http://doc.libsodium.org/";
     license = licenses.isc;
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index d75d9cc0780..bfacecde256 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
 
 stdenv.mkDerivation rec {
   version  = "0.7.16";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ninja ];
   buildInputs = [ zlib expat rpm db ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free package dependency solver";
     homepage    = "https://github.com/openSUSE/libsolv";
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index a4a81af532a..ac9f3b25654 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }:
+{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }:
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ libjack2 libpulseaudio ]
-    ++ stdenv.lib.optional stdenv.isLinux alsaLib
-    ++ stdenv.lib.optional stdenv.isDarwin AudioUnit;
+    ++ lib.optional stdenv.isLinux alsaLib
+    ++ lib.optional stdenv.isDarwin AudioUnit;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross platform audio input and output";
     homepage = "http://libsound.io/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index d052cbdc877..47fcdd41f8a 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2.72.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p";
   };
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "HTTP client/server library for GNOME";
     homepage = "https://wiki.gnome.org/Projects/libsoup";
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     inherit (glib.meta) maintainers platforms;
   };
 }
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix
index 4b5f7f4b3f1..4c778fbd690 100644
--- a/pkgs/development/libraries/libspatialindex/default.nix
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let version = "1.8.5"; in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Extensible spatial index library in C++";
     homepage = "http://libspatialindex.github.io/";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix
index ec2a6242d9e..465aa941f39 100644
--- a/pkgs/development/libraries/libspectre/default.nix
+++ b/pkgs/development/libraries/libspectre/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, ghostscript, cairo }:
+{ fetchurl, lib, stdenv, pkg-config, ghostscript, cairo }:
 
 stdenv.mkDerivation rec {
   name = "libspectre-0.2.7";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       handling and rendering Postscript documents.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix
index 42b39179b20..6a9cb8b647c 100644
--- a/pkgs/development/libraries/libspf2/default.nix
+++ b/pkgs/development/libraries/libspf2/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libspf2";
diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix
index d466b4e85a9..03bfe14d3be 100644
--- a/pkgs/development/libraries/libspiro/default.nix
+++ b/pkgs/development/libraries/libspiro/default.nix
@@ -1,4 +1,4 @@
-{stdenv, pkg-config, autoreconfHook, fetchFromGitHub }:
+{lib, stdenv, pkg-config, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libspiro";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library that simplifies the drawing of beautiful curves";
     homepage = "https://github.com/fontforge/libspiro";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index feb1f8e1736..b39944d13dc 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }:
+{ lib, stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }:
 
 let
   version = "12.1.51";
@@ -47,14 +47,14 @@ else stdenv.mkDerivation {
 
 
   # darwin-specific
-  buildInputs = stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
+  buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
 
   # linux-specific
-  installFlags = stdenv.lib.optional isLinux
+  installFlags = lib.optional isLinux
     "prefix=$(out)";
-  patchPhase = stdenv.lib.optionalString isLinux
+  patchPhase = lib.optionalString isLinux
     "${gnused}/bin/sed -i 's/ldconfig//' Makefile";
-  postInstall = stdenv.lib.optionalString isLinux
+  postInstall = lib.optionalString isLinux
     "mv -v share $out";
 
   passthru = {
@@ -67,7 +67,7 @@ else stdenv.mkDerivation {
         src = libspotify.src;
   nativeBuildInputs = [ pkg-config ];
         buildInputs = [ libspotify readline ]
-          ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+          ++ lib.optional (!stdenv.isDarwin) alsaLib;
         postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples";
         patchPhase = "cp ${apiKey} appkey.c";
         installPhase = ''
@@ -82,7 +82,7 @@ else stdenv.mkDerivation {
     inherit apiKey;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Spotify API library";
     homepage    = "https://developer.spotify.com/technologies/libspotify";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix
index 0d186204f92..3da48f77254 100644
--- a/pkgs/development/libraries/libsrs2/default.nix
+++ b/pkgs/development/libraries/libsrs2/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
     description = "The next generation SRS library from the original designer of SRS";
     license = with lib.licenses; [ gpl2 bsd3 ];
     homepage = "https://www.libsrs2.org/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 95d4dc02029..c613cfab777 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }:
+{ lib, stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
   pname = "libssh";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SSH client library";
     homepage = "https://libssh.org";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 8ce9c814df0..ed09e8ba562 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, zlib, windows }:
+{ lib, stdenv, fetchurl, openssl, zlib, windows }:
 
 stdenv.mkDerivation rec {
   pname = "libssh2";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   buildInputs = [ openssl zlib ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
+    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
 
   patches = [
     # Not able to use fetchpatch here: infinite recursion
     ./CVE-2019-17498.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = "https://www.libssh2.org";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix
index 70a632dd4a7..6d874fe2367 100644
--- a/pkgs/development/libraries/libstatgrab/default.nix
+++ b/pkgs/development/libraries/libstatgrab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav";
   };
 
-  buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit;
+  buildInputs = [] ++ lib.optional stdenv.isDarwin IOKit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.i-scream.org/libstatgrab/";
     description = "A library that provides cross platforms access to statistics about the running system";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix
index e97b96d71d0..76f5b6b4b8c 100644
--- a/pkgs/development/libraries/libstroke/default.nix
+++ b/pkgs/development/libraries/libstroke/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
+{lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
 
 stdenv.mkDerivation {
   name = "libstroke-0.5.1";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A library for simple gesture recognition";
     homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
 
     longDescription =
       '' libstroke, last updated in 2001, still successfully provides a basic
@@ -29,6 +29,6 @@ stdenv.mkDerivation {
         easy to work with, and notably used by FVWM.
       '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix
index 72cc24fcfdb..ccc6fedd916 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , libtool
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple, lightweight C library for writing XMPP clients";
     longDescription = ''
       libstrophe is a lightweight XMPP client library written in C. It has
diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix
index 11a5cdcf4e9..08be9c1a35d 100644
--- a/pkgs/development/libraries/libsurvive/default.nix
+++ b/pkgs/development/libraries/libsurvive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Source Lighthouse Tracking System";
     homepage = "https://github.com/cntools/libsurvive";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index 5dc4deb30be..6f4741ed4d0 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "libsvm";
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
     ln -s $out/include/svm.h $out/include/libsvm/svm.h
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -id libsvm.2.dylib $out/lib/libsvm.2.dylib;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for support vector machines";
     homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix
index b46a848a041..1ce7ef58c88 100644
--- a/pkgs/development/libraries/libsystemtap/default.nix
+++ b/pkgs/development/libraries/libsystemtap/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchgit, gettext, python, elfutils}:
+{lib, stdenv, fetchgit, gettext, python, elfutils}:
 
 stdenv.mkDerivation {
   pname = "libsystemtap";
@@ -20,11 +20,11 @@ stdenv.mkDerivation {
     cp -r includes/* $out/include/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Statically defined probes development files";
     homepage = "https://sourceware.org/systemtap/";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.farlion ];
+    maintainers = [ lib.maintainers.farlion ];
   };
 }
diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
index d6eb2647fbd..ce7cb6bfd1e 100644
--- a/pkgs/development/libraries/libtap/default.nix
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkg-config, cmake, perl }:
+{ lib, stdenv, fetchurl, pkg-config, cmake, perl }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "libtap";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ cmake perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to implement a test protocol";
     longDescription = ''
       libtap is a library to implement the Test Anything Protocol for
diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index a31fde0d31d..3e5b4cd23e9 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.2.20";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for manipulating POSIX tar files";
     homepage = "https://repo.or.cz/libtar";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 90dde37a416..2239d7311f5 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, texinfo }:
+{ lib, stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "libtasn1-4.16.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   else
     null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/libtasn1/";
     description = "An ASN.1 library";
     longDescription = ''
diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix
index 420a4c6ad20..3e77d0876be 100644
--- a/pkgs/development/libraries/libtcod/default.nix
+++ b/pkgs/development/libraries/libtcod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }:
+{ lib, stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }:
 
 stdenv.mkDerivation {
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   meta = {
     description = "API for roguelike games";
     homepage = "http://roguecentral.org/doryen/libtcod/";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.skeidel ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.skeidel ];
   };
 }
diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix
index 7ce5b2f3214..eebaee394ee 100644
--- a/pkgs/development/libraries/libtelnet/default.nix
+++ b/pkgs/development/libraries/libtelnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }:
 
 stdenv.mkDerivation {
   pname = "libtelnet";
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Simple RFC-complient TELNET implementation as a C library";
     homepage = "https://github.com/seanmiddleditch/libtelnet";
-    license = stdenv.lib.licenses.publicDomain;
-    maintainers = [ stdenv.lib.maintainers.tomberek ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.publicDomain;
+    maintainers = [ lib.maintainers.tomberek ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 4be42ff745e..9779ad6b9e5 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
+    ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   nativeBuildInputs = [ libtool pkg-config ];
   buildInputs = [ ncurses unibilium ];
diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix
index 6179ad0f6bd..ad00906bb8c 100644
--- a/pkgs/development/libraries/libthai/default.nix
+++ b/pkgs/development/libraries/libthai/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }:
+{ lib, stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }:
 
 stdenv.mkDerivation rec {
   pname = "libthai";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     installManPage man/man3/*.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://linux.thai.net/projects/libthai/";
     description = "Set of Thai language support routines";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index 94af9d76e78..1638150c263 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libogg, libvorbis, pkg-config}:
+{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config}:
 
 stdenv.mkDerivation rec {
   name = "libtheora-1.1.1";
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
 
   # GCC's -fforce-addr flag is not supported by clang
   # It's just an optimization, so it's safe to simply remove it
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace "-fforce-addr" ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.theora.org/";
     description = "Library for Theora, a free and open video compression format";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix
index 587ef2e208a..c67be246928 100644
--- a/pkgs/development/libraries/libthreadar/default.nix
+++ b/pkgs/development/libraries/libthreadar/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "1.3.1";
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 9bb572a912c..3d3b3529483 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 
 , pkg-config
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # not cross;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library and utilities for working with the TIFF image file format";
     homepage = "http://download.osgeo.org/libtiff";
     license = licenses.libtiff;
diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix
index d70921e3354..7279dc9ddfa 100644
--- a/pkgs/development/libraries/libtins/default.nix
+++ b/pkgs/development/libraries/libtins/default.nix
@@ -1,4 +1,4 @@
-{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }:
+{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   pname = "libtins";
@@ -36,12 +36,12 @@ stdenv.mkDerivation rec {
   '';
   checkTarget = "tests test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-level, multiplatform C++ network packet sniffing and crafting library";
     homepage = "https://libtins.github.io/";
     changelog = "https://raw.githubusercontent.com/mfontanini/${pname}/v${version}/CHANGES.md";
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = with maintainers; [ fdns ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index 4587701011d..7ed8fca3bab 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libtool }:
+{ lib, stdenv, fetchurl, fetchpatch, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "libtomcrypt";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.libtom.net/LibTomCrypt/";
     description = "A fairly comprehensive, modular and portable cryptographic toolkit";
     license = with licenses; [ publicDomain wtfpl ];
diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix
index 9a0a2def4b7..058ae524231 100644
--- a/pkgs/development/libraries/libtommath/default.nix
+++ b/pkgs/development/libraries/libtommath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool }:
+{ lib, stdenv, fetchurl, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "libtommath";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.libtom.net/LibTomMath/";
     description = "A library for integer-based number-theoretic applications";
     license = with licenses; [ publicDomain wtfpl ];
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
index 649d73b49b8..a898dd8e24e 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
     "--with-boost-libdir=${boostPython.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libtorrent.org/";
     description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
index 9a165780b7e..fc97b629a52 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, automake, autoconf
+{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf
 , zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration
 }:
 
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ automake autoconf libtool pkg-config ];
 
   buildInputs = [ boostPython openssl zlib python libiconv ncurses ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
+    ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
 
   preConfigure = "./autotool.sh";
 
@@ -43,7 +43,7 @@ in stdenv.mkDerivation {
     "--with-boost-libdir=${boostPython.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libtorrent.org/";
     description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index e9c59ed97e8..ad3a47f99ce 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , zlib, boost, openssl, python, ncurses, SystemConfiguration
 }:
 
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ boostPython openssl zlib python ncurses ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
+    ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
 
   postInstall = ''
     moveToOutput "include" "$dev"
@@ -36,7 +36,7 @@ in stdenv.mkDerivation {
     "-Dpython-bindings=on"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libtorrent.org/";
     description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 727516cad93..4badf32fe8c 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
+{ lib, stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
 , libvpx, check, libconfig, pkg-config }:
 
 let
@@ -22,7 +22,7 @@ let
 
     buildInputs = [
       libsodium msgpack ncurses libconfig
-    ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
+    ] ++ lib.optionals (!stdenv.isAarch32) [
       libopus libvpx
     ];
 
@@ -37,7 +37,7 @@ let
         -e "s|^includedir=.*|includedir=$out/include|"
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "P2P FOSS instant messaging application aimed to replace Skype";
       homepage = "https://tox.chat";
       license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix
index d28fcf4a60d..77119e2830f 100644
--- a/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
 , libvpx, check, libconfig, pkg-config }:
 
 stdenv.mkDerivation {
@@ -33,11 +33,11 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [
     autoreconfHook libsodium ncurses check libconfig
-  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
+  ] ++ lib.optionals (!stdenv.isAarch32) [
     libopus
   ];
 
-  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ];
+  propagatedBuildInputs = lib.optionals (!stdenv.isAarch32) [ libvpx ];
 
   # Some tests fail randomly due to timeout. This kind of problem is well known
   # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
   # NOTE: run the tests locally on your machine before upgrading this package!
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ];
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index 73114d5bc96..d959306c971 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }:
+{ lib, stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libtsm";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Terminal-emulator State Machine";
     homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index fd8eada261c..3be758c906f 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
   pname = "libu2f-host";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developers.yubico.com/libu2f-host";
     description = "A C library and command-line tool that implements the host-side of the U2F protocol";
     license = with licenses; [ gpl3Plus lgpl21Plus ];
diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix
index b1187177f30..7f596978cf0 100644
--- a/pkgs/development/libraries/libu2f-server/default.nix
+++ b/pkgs/development/libraries/libu2f-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }:
 
 stdenv.mkDerivation rec {
   name = "libu2f-server-1.1.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ json_c openssl check file help2man which gengetopt ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developers.yubico.com/libu2f-server/";
     description = "A C library that implements the server-side of the U2F protocol";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix
index 43fa300f107..443791f2451 100644
--- a/pkgs/development/libraries/libuchardet/default.nix
+++ b/pkgs/development/libraries/libuchardet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "uchardet";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's Universal Charset Detector C/C++ API";
     homepage = "https://www.freedesktop.org/wiki/Software/uchardet/";
     license = licenses.mpl11;
diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix
index b9b33453a4c..e65d0d475ff 100644
--- a/pkgs/development/libraries/libucl/default.nix
+++ b/pkgs/development/libraries/libucl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , pkg-config
 , autoreconfHook
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
 
-  buildInputs = with stdenv.lib;
+  buildInputs = with lib;
     concatLists (
       mapAttrsToList (feat: enabled:
         optionals enabled (featureDeps."${feat}" or [])
@@ -45,10 +45,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = with stdenv.lib;
+  configureFlags = with lib;
     mapAttrsToList (feat: enabled: strings.enableFeature enabled feat) features;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Universal configuration library parser";
     homepage = "https://github.com/vstakhov/libucl";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix
index e5d21e2d8f7..1cc3ac8ebea 100644
--- a/pkgs/development/libraries/libuecc/default.nix
+++ b/pkgs/development/libraries/libuecc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake }:
+{ lib, stdenv, fetchgit, cmake }:
 
 stdenv.mkDerivation rec {
   version = "7";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Very small Elliptic Curve Cryptography library";
     homepage = "https://git.universe-factory.net/libuecc";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index 74bc597c569..7002f75cc45 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }:
 
 let
   shortName = "libui";
@@ -16,20 +16,20 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  propagatedBuildInputs = lib.optional stdenv.isLinux gtk3
+    ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
   '';
 
   installPhase = ''
     mkdir -p $out/{include,lib}
     mkdir -p $out/lib/pkgconfig
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     mv ./out/${shortName}.so.0 $out/lib/
     ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     mv ./out/${shortName}.A.dylib $out/lib/
     ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib
   '' + ''
@@ -41,11 +41,11 @@ stdenv.mkDerivation {
       --subst-var-by out $out \
       --subst-var-by version "${version}"
   '';
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/andlabs/libui";
     description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports";
     license     = licenses.mit;
diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/development/libraries/libuinputplus/default.nix
index 9f6f18555f7..9085b861078 100644
--- a/pkgs/development/libraries/libuinputplus/default.nix
+++ b/pkgs/development/libraries/libuinputplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libuinputplus";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Easy-to-use uinput library in C++";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix
index 6515a51f137..523ce82ce22 100644
--- a/pkgs/development/libraries/libunarr/default.nix
+++ b/pkgs/development/libraries/libunarr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libunarr";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/selmf/unarr";
     description = "A lightweight decompression library with support for rar, tar and zip archives";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix
index d30c84b52a2..9e6cec471d4 100644
--- a/pkgs/development/libraries/libunibreak/default.nix
+++ b/pkgs/development/libraries/libunibreak/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "libunibreak";
   version = "4.3";
 
   src = let
-      rev_version = stdenv.lib.replaceStrings ["."] ["_"] version;
+      rev_version = lib.replaceStrings ["."] ["_"] version;
   in fetchFromGitHub {
     owner = "adah1972";
     repo = pname;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/adah1972/libunibreak";
     description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix
index afae04cb6b2..2e75c783681 100644
--- a/pkgs/development/libraries/libuninameslist/default.nix
+++ b/pkgs/development/libraries/libuninameslist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fontforge/libuninameslist/";
     description = "A Library of Unicode names and annotation data";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix
index 14c84199c50..72027b85ed4 100644
--- a/pkgs/development/libraries/libunique/3.x.nix
+++ b/pkgs/development/libraries/libunique/3.x.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkg-config
+{ lib, stdenv, fetchurl, pkg-config
 , dbus, dbus-glib, gtk3, gobject-introspection
 , gtk-doc, docbook_xml_dtd_45, docbook_xsl
 , libxslt, libxml2 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   majorVer = "3.0";
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "A library for writing single instance applications";
     license = licenses.lgpl21;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix
index 45f5e6f786d..27db05ee98a 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/pkgs/development/libraries/libunique/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }:
 
 stdenv.mkDerivation rec {
   pname = "libunique";
   version = "1.1.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://wiki.gnome.org/Attic/LibUnique";
     description = "A library for writing single instance applications";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.lgpl21;
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 5f300ef5199..f7a77832c18 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libiconv }:
+{ fetchurl, lib, stdenv, libiconv }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "info" "doc" ];
 
-  propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
 
   configureFlags = [
     "--with-libiconv-prefix=${libiconv}"
@@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
       strings as internal in-memory representation.
     '';
 
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index 287c185385f..f6fb9a13e4c 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 , pkg-config
 , glib
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for instrumenting and integrating with all aspects of the Unity shell";
     homepage = "https://launchpad.net/libunity";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 7e481034f43..b2b5db2309c 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nongnu.org/libunwind";
     description = "A portable and efficient API to determine the call-chain of a program";
     maintainers = with maintainers; [ orivej ];
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index 6046bcf8eab..d108bf4e6df 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   version = "0.12.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   preCheck = "patchShebangs tests/unit";
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace RCU (read-copy-update) library";
     homepage = "https://lttng.org/urcu";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index 938846ace54..6a94f37181d 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit
+{ lib, stdenv, fetchgit
 , fetchpatch
 }:
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   ''
   ;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Userspace library for the Linux io_uring API";
     homepage    = "https://git.kernel.dk/cgit/liburing/";
     license     = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix
index 41fe7cc6f1e..b23123f56ea 100644
--- a/pkgs/development/libraries/libusb-compat/0.1.nix
+++ b/pkgs/development/libraries/libusb-compat/0.1.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5";
   };
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
 
   # without this, libusb-compat is unable to find libusb1
   postFixup = ''
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libusb.info/";
     repositories.git = "https://github.com/libusb/libusb-compat-0.1";
     description = "cross-platform user-mode USB device library";
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index fef3d168c96..33cd34ea5a0 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , pkg-config
@@ -26,18 +26,18 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   propagatedBuildInputs =
-    stdenv.lib.optional enableUdev udev ++
-    stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+    lib.optional enableUdev udev ++
+    lib.optionals stdenv.isDarwin [ libobjc IOKit ];
 
   dontDisableStatic = withStatic;
 
-  configureFlags = stdenv.lib.optional (!enableUdev) "--disable-udev";
+  configureFlags = lib.optional (!enableUdev) "--disable-udev";
 
-  preFixup = stdenv.lib.optionalString enableUdev ''
-    sed 's,-ludev,-L${stdenv.lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
+  preFixup = lib.optionalString enableUdev ''
+    sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://libusb.info/";
     repositories.git = "https://github.com/libusb/libusb";
     description = "cross-platform user-mode USB device library";
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index cb8e1761d82..66198a6ec33 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }:
 
 stdenv.mkDerivation rec {
   pname = "libusbmuxd";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libplist ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client library to multiplex connections from and to iOS devices";
     homepage    = "https://github.com/libimobiledevice/libusbmuxd";
     license     = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 187b8574eef..a4447ed3378 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       "threadpool_multiple_event_loops" # times out on slow machines
       "get_passwd" # passed on NixOS but failed on other Linuxes
       "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    ] ++ lib.optionals stdenv.isDarwin [
         # Sometimes: timeout (no output), failed uv_listen. Someone
         # should report these failures to libuv team. There tests should
         # be much more robust.
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
         "fs_event_watch_dir_recursive" "fs_event_watch_file"
         "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path"
         "process_priority" "udp_create_early_bad_bind"
-    ] ++ stdenv.lib.optionals stdenv.isAarch32 [
+    ] ++ lib.optionals stdenv.isAarch32 [
       # I observe this test failing with some regularity on ARMv7:
       # https://github.com/libuv/libuv/issues/1871
       "shutdown_close_pipe"
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     '';
 
   nativeBuildInputs = [ automake autoconf libtool pkg-config ];
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
+  buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
 
   preConfigure = ''
     LIBTOOLIZE=libtoolize ./autogen.sh
diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/development/libraries/libuvc/default.nix
index e2956a99432..e7ff4bb7f28 100644
--- a/pkgs/development/libraries/libuvc/default.nix
+++ b/pkgs/development/libraries/libuvc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libusb1 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ken.tossell.net/libuvc/";
     description = "Cross-platform library for USB video devices";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
index dbd23c5abc9..ade56ac16ee 100644
--- a/pkgs/development/libraries/libva/1.0.0.nix
+++ b/pkgs/development/libraries/libva/1.0.0.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.freedesktop.org/wiki/Software/vaapi";
     license = licenses.mit;
     description = "VAAPI library: Video Acceleration API";
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index f37780f5d6d..d78332bf5aa 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation for VA-API (Video Acceleration API)";
     longDescription = ''
       VA-API is an open-source library and API specification, which provides
diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix
index f860c328fe7..bcd24d51953 100644
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkg-config
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config
 , libdrm, libva, libX11, libXext, libXfixes, wayland
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of utilities and examples for VA-API";
     longDescription = ''
       libva-utils is a collection of utilities and examples to exercise VA-API
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 5224da5d9e7..85ebef12fe1 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp
 , libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails. needs DRI access
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/i-rinat/libvdpau-va-gl";
     description = "VDPAU driver with OpenGL/VAAPI backend";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 42066bd2bf0..75dcd337c38 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }:
+{ lib, stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "libvdpau";
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  mesonFlags = stdenv.lib.optional stdenv.isLinux
+  mesonFlags = lib.optional stdenv.isLinux
     [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ];
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11";
+  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://people.freedesktop.org/~aplattner/vdpau/";
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
     license = licenses.mit; # expat version
diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix
index a26aa9b5694..98ad4ef7fee 100644
--- a/pkgs/development/libraries/libversion/default.nix
+++ b/pkgs/development/libraries/libversion/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Advanced version string comparison library";
     homepage = "https://github.com/repology/libversion";
     license = with licenses; [ mit ];
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
index 7ebabaf7257..e3b3674acc9 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, glib, ncurses, gpm}:
+{lib, stdenv, fetchurl, pkg-config, glib, ncurses, gpm}:
 stdenv.mkDerivation rec {
   name = "libviper-1.4.6";
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ncurses gpm];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libviper.sourceforge.net/";
     description = "Simple window creation and management facilities for the console";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index e7dbd2456cb..a61094d17fe 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala
+{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala
 , libcap_ng, libvirt, libxml2
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   strictDeps = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for working with virtual machines";
     longDescription = ''
       libvirt-glib wraps libvirt to provide a high-level object-oriented API better
diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix
index 024a667a4da..76466a1a9f5 100644
--- a/pkgs/development/libraries/libvirt/5.9.0.nix
+++ b/pkgs/development/libraries/libvirt/5.9.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit
+{ lib, stdenv, fetchurl, fetchgit
 , pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr
 , iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
@@ -10,7 +10,7 @@
 , enableCeph ? false, ceph
 }:
 
-with stdenv.lib;
+with lib;
 
 # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
 let
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
 
   preConfigure = ''
     ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
-    PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
+    PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
     substituteInPlace src/lxc/lxc_conf.c \
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index f8a8bec15d5..60113d492a7 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit
+{ lib, stdenv, fetchurl, fetchgit
 , makeWrapper, autoreconfHook, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
 , iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext
@@ -11,7 +11,7 @@
 , enableCeph ? false, ceph
 }:
 
-with stdenv.lib;
+with lib;
 
 # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
 let
@@ -72,14 +72,14 @@ in stdenv.mkDerivation rec {
       sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|"
     '';
   in ''
-    PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables-nftables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
+    PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables-nftables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
     substituteInPlace src/lxc/lxc_conf.c \
       --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
     patchShebangs . # fixes /usr/bin/python references
   ''
-  + (stdenv.lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides));
+  + (lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides));
 
   mesonAutoFeatures = "auto";
 
diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix
index 4d17f3a8c0e..42051fe66a6 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/pkgs/development/libraries/libvisio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf
+{ lib, stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf
 , librevenge, libxml2, icu, perl, cppunit, doxygen
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library providing ability to interpret and import visio diagrams into various applications";
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio";
     license = licenses.mpl20;
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
index 9559a604f0a..7a996d3b807 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   name = "libvisual-0.4.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An abstraction library for audio visualisations";
     homepage = "https://sourceforge.net/projects/libvisual/";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix
index 6a8cc859474..c4b945bed44 100644
--- a/pkgs/development/libraries/libvmaf/default.nix
+++ b/pkgs/development/libraries/libvmaf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, nasm }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, nasm }:
 
 stdenv.mkDerivation rec {
   pname = "libvmaf";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Netflix/vmaf";
     description = "Perceptual video quality assessment based on multi-method fusion (VMAF)";
     changelog = "https://github.com/Netflix/vmaf/blob/v${version}/CHANGELOG.md";
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 0f4bb4950f9..9d9e47407b6 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv,
+{ lib, stdenv,
   fetchFromGitHub,
   autoreconfHook,
   bison,
@@ -10,7 +10,7 @@
   libvirt,
   xenSupport ? true }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "libvmi";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libvmi.com/";
     description = "A C library for virtual machine introspection";
     longDescription = ''
diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index c4e82b1c326..7c8d4a76fc9 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchpatch, cmake
+{ lib, stdenv, fetchzip, fetchpatch, cmake
 , libjpeg, openssl, zlib, libgcrypt, libpng
 , systemd
 }:
@@ -21,14 +21,14 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libjpeg openssl libgcrypt libpng
-  ] ++ stdenv.lib.optional stdenv.isLinux systemd;
+  ] ++ lib.optional stdenv.isLinux systemd;
   propagatedBuildInputs = [ zlib ];
   meta = {
     inherit (s) version;
     description = "VNC server library";
     homepage = "https://libvnc.github.io/";
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 7ad8174cd48..9fd3fc59ab3 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libogg, pkg-config }:
+{ lib, stdenv, fetchurl, libogg, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libvorbis-1.3.7";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Vorbis audio compression reference implementation";
     homepage = "https://xiph.org/vorbis/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix
index c82b7a674ac..e78a96784d9 100644
--- a/pkgs/development/libraries/libvpx/1_8.nix
+++ b/pkgs/development/libraries/libvpx/1_8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, yasm
+{ lib, stdenv, fetchFromGitHub, perl, yasm
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
 , vp9DecoderSupport ? true # VP9 decoder
@@ -40,7 +40,7 @@
 
 let
   inherit (stdenv) is64bit isMips isDarwin isCygwin;
-  inherit (stdenv.lib) enableFeature optional optionals;
+  inherit (lib) enableFeature optional optionals;
 in
 
 assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''moveToOutput bin "$bin" '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = "https://www.webmproject.org/";
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 83e60466c14..5aa8cf70491 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, yasm
+{ lib, stdenv, fetchFromGitHub, perl, yasm
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
 , vp9DecoderSupport ? true # VP9 decoder
@@ -40,7 +40,7 @@
 
 let
   inherit (stdenv) is64bit isMips isDarwin isCygwin;
-  inherit (stdenv.lib) enableFeature optional optionals;
+  inherit (lib) enableFeature optional optionals;
 in
 
 assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
@@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''moveToOutput bin "$bin" '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = "https://www.webmproject.org/";
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
index ca50345f5b2..e4a05360183 100644
--- a/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , perl
 , libtool
@@ -20,11 +20,11 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ libtool ];
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
+    ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "VT220/xterm/ECMA-48 terminal emulator library";
     homepage = "http://www.leonerd.org.uk/code/libvterm/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
index 6c37dc23ad7..90914d4186e 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, ncurses }:
+{ lib, stdenv, fetchurl, pkg-config, glib, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "libvterm-0.99.7";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib ncurses ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libvterm.sourceforge.net/";
     description = "Terminal emulator library to mimic both vt100 and rxvt";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index fe9aaaed125..14b996145af 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }:
 
 stdenv.mkDerivation rec {
   pname = "libwacom";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib udev libgudev ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.linux;
     homepage = "https://linuxwacom.github.io/";
     description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 6d24ba7f2ed..4908dc4a9ce 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtool
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool
 , threadingSupport ? true # multi-threading
 , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp)
 , pngSupport ? true, libpng ? null # PNG image format
@@ -24,7 +24,7 @@ let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libwebp";
   version = "1.1.0";
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index c56781931f3..8f749d9fe6a 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:
+{ fetchFromGitHub, lib, stdenv, cmake, openssl, zlib, libuv }:
 
 let
   generic = { version, sha256 }: stdenv.mkDerivation rec {
@@ -22,9 +22,9 @@ let
       "-DLWS_WITH_SOCKS5=ON"
     ];
 
-    NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Light, portable C library for websockets";
       longDescription = ''
         Libwebsockets is a lightweight pure C library built to
diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix
index 7dac3315285..d0dd593a03d 100644
--- a/pkgs/development/libraries/libwhereami/default.nix
+++ b/pkgs/development/libraries/libwhereami/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
 
 stdenv.mkDerivation rec {
   pname = "libwhereami";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost curl leatherman ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Library to report hypervisor information from inside a VM";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index c7232ef6ba0..e955fee5720 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config
+{ lib, stdenv, fetchFromGitHub, pkg-config
 , freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ];
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WMF library from wvWare";
     homepage = "http://wvware.sourceforge.net/libwmf.html";
     downloadPage = "https://github.com/caolanm/libwmf/releases";
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index 8b0e1868501..3792b826f59 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , meson
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w";
   };
 
@@ -62,11 +62,11 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-      attrPath = "${pname}${stdenv.lib.versions.major version}";
+      attrPath = "${pname}${lib.versions.major version}";
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index f4305cde7d7..c0019ee268a 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "libwnck";
   version = "2.31.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A library for creating task lists and pagers";
     homepage = "https://gitlab.gnome.org/GNOME/libwnck";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ johnazoidberg ];
   };
 }
diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix
index f924afd4e1a..df21f264096 100644
--- a/pkgs/development/libraries/libwpd/0.8.nix
+++ b/pkgs/development/libraries/libwpd/0.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "libwpd-0.8.14";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config bzip2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for importing WordPerfect documents";
     homepage = "http://libwpd.sourceforge.net";
     license = with licenses; [ lgpl21 mpl20 ];
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 7ddc7965c05..8afe549cb68 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }:
+{ lib, stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }:
 
 stdenv.mkDerivation rec {
   name = "libwpd-0.10.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for importing and exporting WordPerfect documents";
     homepage = "http://libwpd.sourceforge.net/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index bbdb10f3f0f..cf85d57a7f2 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }:
+{ lib, stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }:
 
 stdenv.mkDerivation rec {
   name = "libwpg-0.3.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libwpd zlib librevenge ];
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libwpg.sourceforge.net";
     description = "C++ library to parse WPG";
     license = with licenses; [ lgpl21 mpl20 ];
diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
index 252b13dd6da..7dd7153bae9 100644
--- a/pkgs/development/libraries/libwps/default.nix
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, pkg-config, librevenge, zlib }:
+{ lib, stdenv, fetchurl, boost, pkg-config, librevenge, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libwps";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libwps.sourceforge.net/";
     description = "Microsoft Works document format import filter library";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index 271823ace28..1abefa8f437 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libx86";
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
   #  http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
   makeFlags = [
     "DESTDIR=$(out)"
-  ] ++ stdenv.lib.optional (!stdenv.isi686) "BACKEND=x86emu";
+  ] ++ lib.optional (!stdenv.isi686) "BACKEND=x86emu";
 
   preBuild = ''
     sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
     sed -e s@/usr@@ -i Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Real-mode x86 code emulator";
     maintainers = with maintainers; [ raskin ];
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index 1b10ac5fdaa..8f9669561d6 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libx86emu";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "x86 emulation library";
     license = licenses.bsd2;
     homepage = "https://github.com/wfeldt/libx86emu";
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix
index 3f687ad26c8..d26518c7de9 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/pkgs/development/libraries/libxc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl }:
+{ lib, stdenv, fetchurl, gfortran, perl }:
 
 let
   version = "4.3.4";
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
   doCheck = true;
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library of exchange-correlation functionals for density-functional theory";
     homepage = "https://octopus-code.org/wiki/Libxc";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index 4ab63e0e9c4..b66fe5c5a21 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libxcomp";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "NX compression library";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix
index fdf62e38269..58a58f2726b 100644
--- a/pkgs/development/libraries/libxdg-basedir/default.nix
+++ b/pkgs/development/libraries/libxdg-basedir/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch}:
+{lib, stdenv, fetchurl, fetchpatch}:
 
 stdenv.mkDerivation rec {
   name = "libxdg-basedir-1.2.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/devnev/libxdg-basedir";
     description = "Implementation of the XDG Base Directory specification";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 467d42ce997..c0785b34e89 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen
 , xkeyboard_config, libxcb, libxml2
 , python3
 , libX11
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     patchShebangs ../test/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to handle keyboard descriptions";
     longDescription = ''
       libxkbcommon is a keyboard keymap compiler and support library which
diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
index 75043b02e57..cf5f6e320c0 100644
--- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
+++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }:
+{ lib, stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "libxkbcommon-0.7.2";
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     "--with-x-locale-root=${libX11.out}/share/X11/locale"
   ];
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+  preBuild = lib.optionalString stdenv.isDarwin ''
     sed -i 's/,--version-script=.*$//' Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to handle keyboard descriptions";
     homepage = "https://xkbcommon.org";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 88c3ae60cf3..60b52152f67 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
 , glib, isocodes, gobject-introspection }:
 
 let
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     "--enable-gtk-doc"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library providing high-level API for X Keyboard Extension known as XKB";
     homepage = "http://freedesktop.org/wiki/Software/LibXklavier";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix
index 6f11d4c461f..600e94d0a75 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libxl";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp -rva lib64 $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for parsing Excel files";
     homepage    = "https://www.libxl.com/";
     license     = licenses.unfree;
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index 00300899589..3e8034f8baa 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "libxls";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extract Cell Data From Excel xls files";
     homepage = "https://sourceforge.net/projects/libxls/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
index 89b96467155..cc1ae013a0e 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool }:
+{ lib, stdenv, fetchurl, libtool }:
 
 stdenv.mkDerivation {
   name = "libxmi-1.2";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Library for rasterizing 2-D vector graphics";
     homepage = "https://www.gnu.org/software/libxmi/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index 182f2d79620..b958f018b60 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , docbook_xml_dtd_43
 , docbook_xsl
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library to help create and query binary XML blobs";
     homepage = "https://github.com/hughsie/libxmlb";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 88f3bec6b95..19282ddc822 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libxml++";
   version = "2.40.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libxmlplusplus.sourceforge.net/";
     description = "C++ wrapper for the libxml2 XML parser library";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index c01d62989ef..41c842220c7 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }:
+{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }:
 
 stdenv.mkDerivation rec {
   pname = "libxml++";
   version = "3.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml++/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/libxml++/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       --replace 'docdir=''${datarootdir}' "docdir=$doc/share"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://libxmlplusplus.sourceforge.net/";
     description = "C++ wrapper for the libxml2 XML parser library, version 3";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index ca4d7edbf32..0b953f95d7e 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libxmp-4.4.1";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extended module player library";
     homepage    = "http://xmp.sourceforge.net/";
     longDescription = ''
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index cf91d7656bf..eff9f2b2b79 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt
+{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt
 , cryptoSupport ? false
 , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
 }:
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq";
   };
 
-  outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
+  outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py";
 
   buildInputs = [ libxml2.dev ]
-    ++ stdenv.lib.optional stdenv.isDarwin gettext
-    ++ stdenv.lib.optionals pythonSupport [ libxml2.py python ]
-    ++ stdenv.lib.optionals cryptoSupport [ libgcrypt ];
+    ++ lib.optional stdenv.isDarwin gettext
+    ++ lib.optionals pythonSupport [ libxml2.py python ]
+    ++ lib.optionals cryptoSupport [ libgcrypt ];
 
   propagatedBuildInputs = [ findXMLCatalogs ];
 
@@ -26,14 +26,14 @@ stdenv.mkDerivation rec {
     "--without-debug"
     "--without-mem-debug"
     "--without-debugger"
-  ] ++ stdenv.lib.optional pythonSupport "--with-python=${python}"
-    ++ stdenv.lib.optional (!cryptoSupport) "--without-crypto";
+  ] ++ lib.optional pythonSupport "--with-python=${python}"
+    ++ lib.optional (!cryptoSupport) "--without-crypto";
 
   postFixup = ''
     moveToOutput bin/xslt-config "$dev"
     moveToOutput lib/xsltConf.sh "$dev"
     moveToOutput share/man/man1 "$bin"
-  '' + stdenv.lib.optionalString pythonSupport ''
+  '' + lib.optionalString pythonSupport ''
     mkdir -p $py/nix-support
     echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
     moveToOutput ${python.libPrefix} "$py"
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     inherit pythonSupport;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://xmlsoft.org/XSLT/";
     description = "A C library and tools to do XSL transformations";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix
index 5e4a56a6d4d..a2b4800ec4c 100644
--- a/pkgs/development/libraries/libxsmm/default.nix
+++ b/pkgs/development/libraries/libxsmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused
+{ lib, stdenv, fetchFromGitHub, coreutils, gfortran, gnused
 , python3, util-linux, which
 
 , enableStatic ? stdenv.hostPlatform.isStatic
@@ -42,11 +42,11 @@ in stdenv.mkDerivation {
     patchShebangs .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives";
     license = licenses.bsd3;
     homepage = "https://github.com/hfp/libxsmm";
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ chessai ];
+    maintainers = with lib.maintainers; [ chessai ];
   };
 }
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index cf880ef1e16..13141923202 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libyaml-cpp";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "A YAML parser and emitter for C++";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 37b8ebcc3ef..03e7e4715f8 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pyyaml.org/";
     description = "A YAML 1.1 parser and emitter written in C";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix
index 33ece6aed42..6aacfc5ea2f 100644
--- a/pkgs/development/libraries/libykclient/default.nix
+++ b/pkgs/development/libraries/libykclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }:
 
 stdenv.mkDerivation {
   pname = "libykclient";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ autoreconfHook pkg-config help2man ];
   buildInputs = [ curl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Yubikey C client library";
     homepage = "https://developers.yubico.com/yubico-c-client";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix
index 614b66fdea3..a7d35950f03 100644
--- a/pkgs/development/libraries/libykneomgr/default.nix
+++ b/pkgs/development/libraries/libykneomgr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }:
+{ lib, stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }:
 
 stdenv.mkDerivation rec {
   name = "libykneomgr-0.1.8";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     "--with-backend=pcsc"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developers.yubico.com/libykneomgr";
     description = "A C library to interact with the CCID-part of the Yubikey NEO";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix
index 75170d7ff8a..b3aa2b57bdf 100644
--- a/pkgs/development/libraries/libyubikey/default.nix
+++ b/pkgs/development/libraries/libyubikey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libyubikey-1.13";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://opensource.yubico.com/yubico-c/";
     description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix
index 1177196ed18..d16f34039f1 100644
--- a/pkgs/development/libraries/libzapojit/default.nix
+++ b/pkgs/development/libraries/libzapojit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }:
+{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "libzapojit";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject wrapper for the SkyDrive and Hotmail REST APIs";
     homepage = "https://wiki.gnome.org/Projects/Zapojit";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index 95f8e78cfb2..986f27e27c8 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, sqlite}:
+{lib, stdenv, fetchurl, sqlite}:
 
 stdenv.mkDerivation rec
 {
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec
   {
     homepage = "http://www.tildeslash.com/libzdb/";
     description = "A small, easy to use Open Source Database Connection Pool Library";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index 80a570dd697..2d19ca4b22b 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "0.4.38";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shared library for libmediainfo and mediainfo";
     homepage = "https://mediaarea.net/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 27c046814f3..c65a9b6f583 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, perl, zlib }:
+{ lib, stdenv, fetchurl, cmake, perl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libzip";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     patchShebangs regress
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nih.at/libzip";
     description = "A C library for reading, creating and modifying zip archives";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix
index a2013604deb..ee19734a0c0 100644
--- a/pkgs/development/libraries/libzmf/default.nix
+++ b/pkgs/development/libraries/libzmf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}:
+{lib, stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}:
 
 stdenv.mkDerivation rec {
   pname = "libzmf";
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = ''A library that parses the file format of Zoner Callisto/Draw documents'';
-    license = stdenv.lib.licenses.mpl20;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mpl20;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf";
     downloadPage = "http://dev-www.libreoffice.org/src/libzmf/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix
index 6accf24ac28..3ebfc21095d 100644
--- a/pkgs/development/libraries/libzra/default.nix
+++ b/pkgs/development/libraries/libzra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/zraorg/ZRA";
     description = "Library for ZStandard random access";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix
index 0854987436e..3b57d0c2f7a 100644
--- a/pkgs/development/libraries/lief/default.nix
+++ b/pkgs/development/libraries/lief/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
 
 fetchzip {
   url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz";
   sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to Instrument Executable Formats";
     homepage = "https://lief.quarkslab.com/";
     license = [ licenses.asl20 ];
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 65d0a18cedd..5fdc06bce01 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, libopcodes }:
+{ lib, stdenv, fetchurl, libopcodes }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "lightning";
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     '';
     maintainers = [ maintainers.AndersonTorres ];
     license = licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix
index aa34ff2e927..3a16b5202c4 100644
--- a/pkgs/development/libraries/lime/default.nix
+++ b/pkgs/development/libraries/lime/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitLab
 , soci
 , sqlite
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   # Do not build static libraries
   cmakeFlags = [ "-DENABLE_STATIC=NO" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "End-to-end encryption library for instant messaging";
     homepage = "http://www.linphone.org/technical-corner/lime";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 4683f374470..8a21bd3bcde 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , givaro
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-blas-libs=-lblas"
     "--disable-optimization"
-  ] ++ stdenv.lib.optionals stdenv.isx86_64 [
+  ] ++ lib.optionals stdenv.isx86_64 [
     # disable SIMD instructions (which are enabled *when available* by default)
     "--${if stdenv.hostPlatform.sse3Support   then "enable" else "disable"}-sse3"
     "--${if stdenv.hostPlatform.ssse3Support  then "enable" else "disable"}-ssse3"
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     "--${if stdenv.hostPlatform.avx2Support   then "enable" else "disable"}-avx2"
     "--${if stdenv.hostPlatform.fmaSupport    then "enable" else "disable"}-fma"
     "--${if stdenv.hostPlatform.fma4Support   then "enable" else "disable"}-fma4"
-  ] ++ stdenv.lib.optionals withSage [
+  ] ++ lib.optionals withSage [
     "--enable-sage"
   ];
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "C++ library for exact, high-performance linear algebra";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
index 0a2dacb48db..d19d6748147 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "linenoise-ng";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/arangodb/linenoise-ng";
     description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters";
-    maintainers = with stdenv.lib.maintainers; [ cstrahan ];
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ cstrahan ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix
index 3de9f08bf97..d465b48a8f4 100644
--- a/pkgs/development/libraries/linenoise/default.nix
+++ b/pkgs/development/libraries/linenoise/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "linenoise";
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/antirez/linenoise";
     description = "A minimal, zero-config, BSD licensed, readline replacement";
-    maintainers = with stdenv.lib.maintainers; [ mpsyco ];
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ mpsyco ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
index b882e233c07..746771f44fe 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, autoreconfHook }:
+{lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation {
   pname = "liquid-dsp";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://liquidsdr.org/";
     description = "Digital signal processing library for software-defined radios";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 
 }
diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
index 21d3bc47663..29531a29996 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }:
+{ lib, stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }:
 
 let
   sourceInfo = rec {
@@ -36,13 +36,13 @@ stdenv.mkDerivation {
 
   meta = {
     description = "2D physics engine based on Box2D";
-    maintainers = with stdenv.lib.maintainers;
+    maintainers = with lib.maintainers;
     [
       qknight
     ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
     hydraPlatforms = [];
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
     homepage = "https://google.github.io/liquidfun/";
   };
 }
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 9184c7330ed..6b7f0c102ee 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3,
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3,
   alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
 
 stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     "localstatedir=$TMPDIR"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Allows to receive and send infrared signals";
     homepage = "https://www.lirc.org/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 84907a42860..85302bc7c96 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sed \
       -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
       -i config.linux
-  '' + stdenv.lib.optionalString (stdenv ? glibc) ''
+  '' + lib.optionalString (stdenv ? glibc) ''
     substituteInPlace liveMedia/include/Locale.hh \
       --replace '<xlocale.h>' '<locale.h>'
   '';
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 64f6fccefa7..a59b460734d 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   pname = "lmdb";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cc.targetPrefix}cc"
     "AR=${stdenv.cc.targetPrefix}ar"
   ]
-    ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so";
+    ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so";
 
   doCheck = true;
   checkPhase = "make test";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightning memory-mapped database";
     longDescription = ''
       LMDB is an ultra-fast, ultra-compact key-value embedded data store
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
index 95d8f45eec4..9b1d320678a 100644
--- a/pkgs/development/libraries/lmdbxx/default.nix
+++ b/pkgs/development/libraries/lmdbxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , lmdb }:
 
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/drycpp/lmdbxx#readme";
     description = "C++11 wrapper for the LMDB embedded B+ tree database library";
-    license = stdenv.lib.licenses.unlicense;
-    maintainers = with stdenv.lib.maintainers; [ fgaz ];
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ fgaz ];
   };
 }
 
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
index 097ff0c48c9..1e16ee96ae7 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   name = "log4cplus-2.0.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://log4cplus.sourceforge.net/";
     description = "A port the log4j library from Java to C++";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix
index d2918c87f33..d4b703a2bda 100644
--- a/pkgs/development/libraries/log4cpp/default.nix
+++ b/pkgs/development/libraries/log4cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "log4cpp-1.1.3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://log4cpp.sourceforge.net/";
     description = "A logging framework for C++ patterned after Apache log4j";
     license     = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index cec0ec9ab28..aaf7ea5ee9c 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtool, libxml2, cppunit, boost
+{ lib, stdenv, fetchurl, libtool, libxml2, cppunit, boost
 , apr, aprutil, db, expat
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     }' src/examples/cpp/console.cpp \
        src/main/cpp/inputstreamreader.cpp \
        src/main/cpp/socketoutputstream.cpp
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h
     sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp
   '';
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://logging.apache.org/log4cxx/index.html";
     description = "A logging framework for C++ patterned after Apache log4j";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index 17046d17b78..0602b4c3b52 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook }:
+{ lib, stdenv, fetchgit, autoreconfHook }:
 
 stdenv.mkDerivation {
   pname = "log4shib";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A forked version of log4cpp that has been created for the Shibboleth project";
     maintainers = [ maintainers.jammerful ];
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix
index 9c7e36113d8..49b850eae65 100644
--- a/pkgs/development/libraries/loki/default.nix
+++ b/pkgs/development/libraries/loki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "loki";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms";
     homepage = "http://loki-lib.sourceforge.net";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index de2f1b7c5c3..0245417bbf9 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }:
+{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }:
 
 stdenv.mkDerivation rec {
   version = "1.5.3";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight C library for the Jabber protocol";
     platforms = platforms.linux;
     downloadPage = "http://mcabber.com/files/loudmouth/";
diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix
index b37749385ba..51b2635b89e 100644
--- a/pkgs/development/libraries/lrdf/default.nix
+++ b/pkgs/development/libraries/lrdf/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
+{ config, lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
 , librdf_raptor2, ladspaH, openssl, zlib
 , doCheck ? config.doCheckByDefault or false, ladspaPlugins
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4";
   };
 
-  postPatch = stdenv.lib.optionalString doCheck ''
+  postPatch = lib.optionalString doCheck ''
     sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c
   '';
 
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight RDF library with special support for LADSPA plugins";
     homepage = "https://sourceforge.net/projects/lrdf/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix
index eded6b6527f..d7aed656fdb 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/pkgs/development/libraries/luabind/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, boost-build, lua, boost}:
+{lib, stdenv, fetchurl, boost-build, lua, boost}:
 
 stdenv.mkDerivation {
   name = "luabind-0.9.1";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/luabind/luabind";
     description = "A library that helps you create bindings between C++ and Lua";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index 0dcd53a0772..2761329ea23 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost, gtest }:
+{ lib, stdenv, fetchurl, cmake, boost, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "lucene++";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ port of the popular Java Lucene search engine";
     homepage = "https://github.com/luceneplusplus/LucenePlusPlus";
-    license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ asl20 lgpl3Plus ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix
index 8d5d083d82b..9f5fd1d3a34 100644
--- a/pkgs/development/libraries/lyra/default.nix
+++ b/pkgs/development/libraries/lyra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, installShellFiles, meson, ninja }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "lyra";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     cp -R $src/include/* $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bfgroup/Lyra";
     description = "A simple to use, composable, command line parser for C++ 11 and beyond";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 446f9146414..8ea933f0e3a 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "lzo-2.10";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # not cross;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Real-time data (de)compression library";
     longDescription = ''
       LZO is a portable lossless data compression library written in ANSI C.
diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix
index a896b9261d5..7445d283c6f 100644
--- a/pkgs/development/libraries/mac/default.nix
+++ b/pkgs/development/libraries/mac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, yasm }:
+{ lib, stdenv, fetchurl, fetchpatch, yasm }:
 
 stdenv.mkDerivation rec {
   pname = "mac";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ yasm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "APE codec and decompressor";
     homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php";
     license = licenses.unfreeRedistributable;
diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix
index 49ffade8546..641f3b87c3f 100644
--- a/pkgs/development/libraries/malcontent/default.nix
+++ b/pkgs/development/libraries/malcontent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , fetchpatch
 , meson
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     # We need to install Polkit & AccountsService data files in `out`
     # but `buildEnv` only uses `bin` when both `bin` and `out` are present.
     outputsToInstall = [ "bin" "out" "man" ];
diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix
index 54382cfc0d5..e306267154a 100644
--- a/pkgs/development/libraries/malcontent/ui.nix
+++ b/pkgs/development/libraries/malcontent/ui.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , meson
 , ninja
 , pkg-config
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     "-Dui=enabled"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "UI components for parental controls library";
     homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index cf0539fe266..40ef1fde563 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip
+{ lib, stdenv, fetchzip
 , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
 , libwebp, libxml2, proj, python, sqlite, zlib
 
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     "XML2_LIBS=${libxml2.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open source toolkit for developing mapping applications";
     homepage = "https://mapnik.org";
     maintainers = with maintainers; [ hrdinka ];
diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix
index 99d82970fe0..4a3f8be0417 100644
--- a/pkgs/development/libraries/marisa/default.nix
+++ b/pkgs/development/libraries/marisa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "marisa";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/s-yata/marisa-trie";
     description = "Static and space-efficient trie data structure library";
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/development/libraries/marl/default.nix
index 2bf23962d53..4545264aad9 100644
--- a/pkgs/development/libraries/marl/default.nix
+++ b/pkgs/development/libraries/marl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ lib, stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "marl";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # Turn on the flag to install after building the library.
   cmakeFlags = ["-DMARL_INSTALL=ON"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/marl";
     description = "A hybrid thread / fiber task scheduler written in C++ 11";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 46f95148d82..609033e22ea 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ant, jdk}:
+{lib, stdenv, fetchurl, ant, jdk}:
 
 stdenv.mkDerivation rec {
   pname = "martyr";
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
     homepage = "http://martyr.sourceforge.net/";
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
   };
 }
diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index bc629dc2506..b6330f69e30 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name = "matio-1.5.19";
   src = fetchurl {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for reading and writing Matlab MAT files";
     license = licenses.bsd2;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index f24232ac7ae..e3e0d2ecd78 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 
 , cmake
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja perl python ];
 
-  postConfigure = stdenv.lib.optionals enableThreading ''
+  postConfigure = lib.optionals enableThreading ''
     perl scripts/config.pl set MBEDTLS_THREADING_C    # Threading abstraction layer
     perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD    # POSIX thread wrapper layer for the threading layer.
   '';
 
   cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://tls.mbed.org/";
     description = "Portable cryptographic and TLS library, formerly known as PolarSSL";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index b69e99de414..0fc74963299 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, llvmPackages }:
+{ lib, stdenv, fetchurl, boost, llvmPackages }:
 
 stdenv.mkDerivation rec {
   pname = "mdds";
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
     cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
   '';
 
-  buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+  buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   checkInputs = [ boost ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     homepage = "https://gitlab.com/mdds/mdds";
     description = "A collection of multi-dimensional data structure and indexing algorithm";
diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix
index 4821b9865b2..a89cb43d261 100644
--- a/pkgs/development/libraries/medfile/default.nix
+++ b/pkgs/development/libraries/medfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, hdf5 }:
+{ lib, stdenv, fetchurl, cmake, hdf5 }:
 
 stdenv.mkDerivation rec {
   pname = "medfile";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -r $out/bin/testc";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to read and write MED files";
     homepage = "http://salome-platform.org/";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index a4d4f408f90..3cda9ff3006 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -28,7 +28,7 @@
 , SDL
 , speex
 , srtp
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   ];
   NIX_LDFLAGS = "-lXext";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
     homepage = "http://www.linphone.org/technical-corner/mediastreamer2";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index 527c395963f..08842889f86 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -5,7 +5,7 @@
 , mediastreamer
 , openh264
 , pkg-config
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "H.264 encoder/decoder plugin for mediastreamer2";
     homepage = "https://www.linphone.org/technical-corner/mediastreamer2";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index 36e3c8c6700..b2f06b9e627 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkg-config, libfm-extra }:
+{ lib, stdenv, fetchurl, glib, pkg-config, libfm-extra }:
 
 let name = "menu-cache-1.1.0";
 in
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ glib libfm-extra ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to read freedesktop.org menu files";
     homepage = "https://blog.lxde.org/tag/menu-cache/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix
index 1f42828907a..85950daea68 100644
--- a/pkgs/development/libraries/mesa-glu/default.nix
+++ b/pkgs/development/libraries/mesa-glu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libGL, ApplicationServices }:
+{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices }:
 
 stdenv.mkDerivation rec {
   pname = "glu";
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libGL ]
-    ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+    ++ lib.optional stdenv.isDarwin ApplicationServices;
 
   outputs = [ "out" "dev" ];
 
   meta = {
     description = "OpenGL utility library";
     homepage = "https://cgit.freedesktop.org/mesa/glu/";
-    license = stdenv.lib.licenses.sgi-b-20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.sgi-b-20;
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isAndroid;
   };
 }
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 217aff58966..44dddac7d32 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -26,7 +26,7 @@
   - libOSMesa is in $osmesa (~4 MB)
 */
 
-with stdenv.lib;
+with lib;
 
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
@@ -207,7 +207,7 @@ stdenv.mkDerivation {
     done
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-fno-common";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-common";
 
   passthru = {
     inherit libdrm;
diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix
index 090fd46640e..18b1f116b87 100644
--- a/pkgs/development/libraries/metal/default.nix
+++ b/pkgs/development/libraries/metal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "metal";
   version = "2.1.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Single-header C++11 library designed to make you love template metaprogramming";
     homepage = "https://github.com/brunocodutra/metal";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix
index a0356497818..af1c1c91a94 100644
--- a/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/pkgs/development/libraries/microsoft_gsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, catch, cmake
+{ lib, stdenv, fetchFromGitHub, catch, cmake
 }:
 
 let
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     mv ../include/ $out/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ Core Guideline support library";
     longDescription = ''
      The Guideline Support Library (GSL) contains functions and types that are suggested for
diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix
index fcc44062b51..2ac2087054f 100644
--- a/pkgs/development/libraries/mimalloc/default.nix
+++ b/pkgs/development/libraries/mimalloc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja
+{ lib, stdenv, fetchFromGitHub, cmake, ninja
 , secureBuild ? false
 }:
 
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ninja ];
-  cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
+  cmakeFlags = lib.optional secureBuild [ "-DMI_SECURE=ON" ];
 
   postInstall = let
-    rel = stdenv.lib.versions.majorMinor version;
+    rel = lib.versions.majorMinor version;
   in ''
     # first, install headers, that's easy
     mkdir -p $dev
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compact, fast, general-purpose memory allocator";
     homepage    = "https://github.com/microsoft/mimalloc";
     license     = licenses.bsd2;
diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix
index 0147a297305..1638caa0d1f 100644
--- a/pkgs/development/libraries/mimetic/default.nix
+++ b/pkgs/development/libraries/mimetic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cutee }:
+{ lib, stdenv, fetchurl, cutee }:
 
 stdenv.mkDerivation rec {
   pname = "mimetic";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cutee ];
 
-  patches = stdenv.lib.optional stdenv.isAarch64 ./narrowing.patch;
+  patches = lib.optional stdenv.isAarch64 ./narrowing.patch;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MIME handling library";
     homepage    = "http://www.codesink.org/mimetic_mime_library.html";
     license     = licenses.mit;
diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix
index d1804b9bf95..e48857861d6 100644
--- a/pkgs/development/libraries/miniball/default.nix
+++ b/pkgs/development/libraries/miniball/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "miniball";
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Smallest Enclosing Balls of Points";
     homepage = "https://www.inf.ethz.ch/personal/gaertner/miniball.html";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.erikryb ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.erikryb ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 8938ab90fbc..93c03b31a8a 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "mxml";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small XML library";
     homepage = "https://www.msweet.org/mxml/";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix
index 5ee1f38ca8b..bb62a9b3b2b 100644
--- a/pkgs/development/libraries/minizip/default.nix
+++ b/pkgs/development/libraries/minizip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, zlib, autoreconfHook }:
+{ lib, stdenv, zlib, autoreconfHook }:
 
 stdenv.mkDerivation {
   name = "minizip-${zlib.version}";
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
     inherit (zlib.meta) license homepage;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/minizip2/default.nix b/pkgs/development/libraries/minizip2/default.nix
index 6c6d8b3ef86..16bb2b8d44e 100644
--- a/pkgs/development/libraries/minizip2/default.nix
+++ b/pkgs/development/libraries/minizip2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "minizip";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib bzip2 xz zstd openssl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
     homepage = "https://github.com/nmoinvaz/minizip";
     license = licenses.zlib;
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 7423c0e5c77..633a7325b09 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif
 , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
 , gtk2, genericUpdater, common-updater-scripts, libebur128
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     rev-prefix = "v";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source multimedia framework, designed for television broadcasting";
     homepage = "https://www.mltframework.org";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index 599209fa57d..7004a5e11c0 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , SDL
 , ffmpeg
@@ -23,7 +23,7 @@
 , mkDerivation
 , which
 }:
-let inherit (stdenv.lib) getDev; in
+let inherit (lib) getDev; in
 mkDerivation rec {
   pname = "mlt";
   version = "6.22.1";
@@ -102,7 +102,7 @@ mkDerivation rec {
     rev-prefix = "v";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source multimedia framework, designed for television broadcasting";
     homepage = "https://www.mltframework.org/";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix
index 3981e05ef06..a43d99503a3 100644
--- a/pkgs/development/libraries/mm-common/default.nix
+++ b/pkgs/development/libraries/mm-common/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , gnome3
 , meson
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.0.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2";
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common build files of GLib/GTK C++ bindings";
     longDescription = ''
       The mm-common module provides the build infrastructure and utilities
diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 523de7cc6bf..e9779cf0a05 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, perl, pkg-config, libbson
+{ lib, stdenv, fetchzip, perl, pkg-config, libbson
 , openssl, which, zlib, snappy
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official C client library for MongoDB";
     homepage = "https://github.com/mongodb/mongo-c-driver";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index 672d29e20f4..158b39a8186 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
   pname = "mono-addins";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.mono-project.com/archived/monoaddins/";
     description = "A generic framework for creating extensible applications";
     longDescription = ''
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix
index 144f11355e1..0499aaec532 100644
--- a/pkgs/development/libraries/motif/default.nix
+++ b/pkgs/development/libraries/motif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libtool
+{ lib, stdenv, fetchurl, pkg-config, libtool
 , xlibsWrapper, xbitmaps, libXrender, libXmu, libXt
 , expat, libjpeg, libpng, libiconv
 , flex
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     rm lib/Xm/Xm.h
-  '' + stdenv.lib.optionalString (!demoSupport) ''
+  '' + lib.optionalString (!demoSupport) ''
     sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in}
   '';
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
               ./Add-X.Org-to-bindings-file.patch
             ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://motif.ics.com";
     description = "Unix standard widget-toolkit and window-manager";
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 3201de460ff..9c03a9f6c49 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }:
+{ lib, stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "movit";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance, high-quality video filters for the GPU";
     homepage = "https://movit.sesse.net";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index 3b8efadcfd1..7a6bbb55202 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713";
       sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w";
     })
-  ] ++ stdenv.lib.optionals stdenv.cc.isClang [
+  ] ++ lib.optionals stdenv.cc.isClang [
     # unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678
     ./fix-build-clang.patch
   ];
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index 88617e9a740..5a43fb107ad 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, mpfr}:
+{lib, stdenv, fetchurl, mpfr}:
 stdenv.mkDerivation rec {
   pname = "mpfi";
   version = "1.5.3";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
     inherit version;
     description = ''A multiple precision interval arithmetic library based on MPFR'';
     homepage = "https://gforge.inria.fr/projects/mpfi/";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 4a744b7483e..fc7eeeab942 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gmp ];
 
   configureFlags =
-    stdenv.lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++
-    stdenv.lib.optional stdenv.hostPlatform.is64bit "--with-pic";
+    lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++
+    lib.optional stdenv.hostPlatform.is64bit "--with-pic";
 
   doCheck = true; # not cross;
 
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
       floating-point arithmetic (53-bit mantissa).
     '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 0c1ea8be1c8..f7cdf7f97c0 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gfortran
+{ lib, stdenv, fetchurl, perl, gfortran
 ,  openssh, hwloc
 } :
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation  rec {
     sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
     sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
   ''
-  + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  + lib.optionalString (!stdenv.isDarwin) ''
     # /tmp/nix-build... ends up in the RPATH, fix it manually
     for entry in $out/bin/mpichversion $out/bin/mpivars; do
       echo "fix rpath: $entry"
@@ -36,7 +36,7 @@ stdenv.mkDerivation  rec {
     done
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implementation of the Message Passing Interface (MPI) standard";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index 8da59530ea5..7f1374df280 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, which, yasm }:
+{ lib, stdenv, fetchurl, m4, which, yasm }:
 
 stdenv.mkDerivation rec {
   pname = "mpir";
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = ''A highly optimised library for bignum arithmetic forked from GMP'';
-    license = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
     downloadPage = "http://mpir.org/downloads.html";
     homepage = "http://mpir.org/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix
index 8c1f3aea466..81b102d9bc3 100644
--- a/pkgs/development/libraries/mps/default.nix
+++ b/pkgs/development/libraries/mps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, sqlite }:
+{ lib, stdenv, fetchurl, autoreconfHook, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "mps";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A flexible memory management and garbage collection library";
     homepage    = "https://www.ravenbrook.com/project/mps";
-    license     = stdenv.lib.licenses.sleepycat;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.sleepycat;
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
index d7d79de8b2b..a784bc02636 100644
--- a/pkgs/development/libraries/msgpack/generic.nix
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake
+{ lib, stdenv, cmake
 , version, src, patches ? [ ]
 , ...
 }:
@@ -11,9 +11,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF";
+  cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MessagePack implementation for C and C++";
     homepage    = "https://msgpack.org";
     license     = licenses.asl20;
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix
index 0411a8bf623..e65b7453dc3 100644
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/pkgs/development/libraries/msgpuck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "msgpuck";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
      description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file'';
      homepage = "https://github.com/rtsisyk/msgpuck";
      license = licenses.bsd2;
diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix
index c388a291cc5..cdcc0548abb 100644
--- a/pkgs/development/libraries/msilbc/default.nix
+++ b/pkgs/development/libraries/msilbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ilbc, mediastreamer, pkg-config }:
+{ lib, stdenv, fetchurl, ilbc, mediastreamer, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "msilbc-2.1.2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mediastreamer plugin for the iLBC audio codec";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix
index 5c04c6a6942..7873608e589 100644
--- a/pkgs/development/libraries/mtdev/default.nix
+++ b/pkgs/development/libraries/mtdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mtdev-1.1.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://bitmath.org/code/mtdev/";
     description = "Multitouch Protocol Translation Library";
     longDescription = ''
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index 72f8477c872..38c95a5a19f 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     olm
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client API library for Matrix, built on top of Boost.Asio";
     homepage = "https://github.com/Nheko-Reborn/mtxclient";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix
index b2bdf5d0447..45b0abdee71 100644
--- a/pkgs/development/libraries/multipart-parser-c/default.nix
+++ b/pkgs/development/libraries/multipart-parser-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Http multipart parser implemented in C ";
     homepage = "https://github.com/iafonov/multipart-parser-c";
-    license = [ stdenv.lib.licenses.mit ];
+    license = [ lib.licenses.mit ];
   };
 
 }
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index 8aac20e19d0..b1951bdb226 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, unzip, setfile}:
+{lib, stdenv, fetchurl, unzip, setfile}:
 
 stdenv.mkDerivation rec {
   pname = "muparser";
   version = "2.2.3";
-  url-version = stdenv.lib.replaceChars ["."] ["_"] version;
+  url-version = lib.replaceChars ["."] ["_"] version;
 
   src = fetchurl {
     url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     unzip
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [setfile];
+  ] ++ lib.optionals stdenv.isDarwin [setfile];
 
   meta = {
     homepage = "http://muparser.sourceforge.net";
     description = "An extensible high performance math expression parser library written in C++";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix
index d7de5ff00f3..ef6b254b8a3 100644
--- a/pkgs/development/libraries/muparserx/default.nix
+++ b/pkgs/development/libraries/muparserx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more";
     homepage = "https://beltoforion.de/en/muparserx/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix
index ae40ab9f895..9470b812586 100644
--- a/pkgs/development/libraries/mutest/default.nix
+++ b/pkgs/development/libraries/mutest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , meson
 , ninja
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ebassi.github.io/mutest/mutest.md.html";
     description = "A BDD testing framework for C, inspired by Mocha";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix
index 4b86868d2aa..4260e30561b 100644
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/pkgs/development/libraries/mygui/default.nix
@@ -1,4 +1,4 @@
-{  stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
+{  lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
    boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
 
 let
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   # Tools are disabled due to compilation failures.
   cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mygui.info/";
     description = "Library for creating GUIs for games and 3D applications";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
index 07a57c66480..73acfd9287f 100644
--- a/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , autoconf
 , automake
 , fetchFromGitHub
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mypaint.org/";
     description = "Brushes used by MyPaint and other software using libmypaint";
     license = licenses.cc0;
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
index 08ac20e447c..acdee52b85e 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , autoconf
 , automake
 , fetchFromGitHub
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mypaint.org/";
     description = "Brushes used by MyPaint and other software using libmypaint";
     license = licenses.cc0;
diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix
index 1e2e3982d55..3b5da68a59d 100644
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ b/pkgs/development/libraries/mysocketw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ lib, stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation {
   name = "mysocketw-031026";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ openssl ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/Makefile \
         --replace -Wl,-soname, -Wl,-install_name,$out/lib/
   '';
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index b4983455675..b678baf9881 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }:
+{ lib, stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }:
 
 stdenv.mkDerivation rec {
   name = "mythes-1.2.4";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://hunspell.sourceforge.net/";
     description = "Thesaurus library from Hunspell project";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     inherit (hunspell.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index 649ce91cbd8..0dbbd461dc2 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, cmake}:
+{lib, stdenv, fetchFromGitHub, cmake}:
 
 stdenv.mkDerivation rec {
   version = "1.3.2";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://github.com/jlblancoc/nanoflann";
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
     description = "Header only C++ library for approximate nearest neighbor search";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 5772581d5ec..49a93abd7fb 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ lib, stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "1.1.5";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description= "Socket library that provides several common communication patterns";
     homepage = "https://nanomsg.org/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index bb8dee2be61..e8053ce2702 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
+{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
 
 stdenv.mkDerivation rec {
   version = "4.9.7";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
     description = "NetCDF Operator toolkit";
     longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
     homepage = "http://nco.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.bzizou ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.bzizou ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix
index c0e1816c0e1..75d2a2db021 100644
--- a/pkgs/development/libraries/ndi/default.nix
+++ b/pkgs/development/libraries/ndi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, avahi }:
+{ lib, stdenv, requireFile, avahi }:
 
 stdenv.mkDerivation rec {
   pname = "ndi";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   # Stripping breaks ndi-record.
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ndi.tv/sdk/";
     description = "NDI Software Developer Kit";
     platforms = ["x86_64-linux"];
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index 893f82a6d52..f2510d6f6bb 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , doxygen
 , pkg-config
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     "--boost-libs=${boost.out}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://named-data.net/";
     description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
     longDescription = ''
diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
index 43da97c2edd..c3df23052e2 100644
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap
+{ lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap
 , pkg-config }:
 
 let version = "3.4"; in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for deep-packet inspection";
     longDescription = ''
       nDPI is a library for deep-packet inspection based on OpenDPI.
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
index a6b6e88cec3..5e02a9fd522 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "neardal-0.7-post-git-20150930";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C APIs to exchange datas with the NFC daemon 'Neard'";
     license = licenses.lgpl2;
     homepage = "https://01.org/linux-nfc";
diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix
index db7940536f1..980424b7fd4 100644
--- a/pkgs/development/libraries/neatvnc/default.nix
+++ b/pkgs/development/libraries/neatvnc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, pkg-config, ninja
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja
 , pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson pkg-config ninja ];
   buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A VNC server library";
     longDescription = ''
       This is a liberally licensed VNC server library that's intended to be
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index 89b48221ca8..e0437fb7cea 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, pkg-config, perl
+{ lib, stdenv, fetchurl, libxml2, pkg-config, perl
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , static ? false
@@ -10,7 +10,7 @@ assert sslSupport -> openssl != null;
 assert static || shared;
 
 let
-   inherit (stdenv.lib) optionals;
+   inherit (lib) optionals;
 in
 
 stdenv.mkDerivation rec {
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [libxml2 openssl]
-    ++ stdenv.lib.optional compressionSupport zlib;
+    ++ lib.optional compressionSupport zlib;
 
   configureFlags = [
-    (stdenv.lib.enableFeature shared "shared")
-    (stdenv.lib.enableFeature static "static")
-    (stdenv.lib.withFeature compressionSupport "zlib")
-    (stdenv.lib.withFeature sslSupport "ssl")
+    (lib.enableFeature shared "shared")
+    (lib.enableFeature static "static")
+    (lib.withFeature compressionSupport "zlib")
+    (lib.withFeature sslSupport "ssl")
   ];
 
   passthru = {inherit compressionSupport sslSupport;};
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails, needs the net
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An HTTP and WebDAV client library";
     homepage = "http://www.webdav.org/neon/";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 935a17d3d78..c0c62deb0ac 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, pkg-config, perl
+{ lib, stdenv, fetchurl, libxml2, pkg-config, perl
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , static ? stdenv.hostPlatform.isStatic
@@ -10,7 +10,7 @@ assert sslSupport -> openssl != null;
 assert static || shared;
 
 let
-   inherit (stdenv.lib) optionals;
+   inherit (lib) optionals;
 in
 
 stdenv.mkDerivation rec {
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [libxml2 openssl]
-    ++ stdenv.lib.optional compressionSupport zlib;
+    ++ lib.optional compressionSupport zlib;
 
   configureFlags = [
-    (stdenv.lib.enableFeature shared "shared")
-    (stdenv.lib.enableFeature static "static")
-    (stdenv.lib.withFeature compressionSupport "zlib")
-    (stdenv.lib.withFeature sslSupport "ssl")
+    (lib.enableFeature shared "shared")
+    (lib.enableFeature static "static")
+    (lib.withFeature compressionSupport "zlib")
+    (lib.withFeature sslSupport "ssl")
   ];
 
   passthru = {inherit compressionSupport sslSupport;};
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails, needs the net
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An HTTP and WebDAV client library";
     homepage = "http://www.webdav.org/neon/";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index 526e02e8907..b594a672140 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, netcdf, hdf5, curl }:
+{ lib, stdenv, fetchurl, netcdf, hdf5, curl }:
 stdenv.mkDerivation rec {
   pname = "netcdf-cxx4";
   version = "4.3.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ API to manipulate netcdf files";
     homepage = "https://www.unidata.ucar.edu/software/netcdf/";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index ab10c686163..0cdeda23879 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
+{ lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
 stdenv.mkDerivation rec {
   pname = "netcdf-fortran";
   version = "4.4.5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ netcdf hdf5 curl gfortran ];
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fortran API to manipulate netcdf files";
     homepage = "https://www.unidata.ucar.edu/software/netcdf/";
     license = licenses.free;
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index fecc4100f5e..c345f66e872 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , hdf5
 , m4
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
       "--enable-shared"
       "--disable-dap-remote-tests"
   ]
-  ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
+  ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
 
   disallowedReferences = [ stdenv.cc ];
 
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
       description = "Libraries for the Unidata network Common Data Format";
-      platforms = stdenv.lib.platforms.unix;
+      platforms = lib.platforms.unix;
       homepage = "https://www.unidata.ucar.edu/software/netcdf/";
       license = {
         url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html";
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 4c3c6d04ca8..735fe373533 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, gmp, gnum4
+{ lib, stdenv, buildPackages, gmp, gnum4
 
 # Version specific args
 , version, src
@@ -22,10 +22,10 @@ stdenv.mkDerivation ({
 
   enableParallelBuilding = true;
 
-  patches = stdenv.lib.optional (stdenv.hostPlatform.system == "i686-cygwin")
+  patches = lib.optional (stdenv.hostPlatform.system == "i686-cygwin")
               ./cygwin.patch;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cryptographic library";
 
     longDescription = ''
@@ -61,7 +61,7 @@ stdenv.mkDerivation ({
 
 //
 
-stdenv.lib.optionalAttrs stdenv.isSunOS {
+lib.optionalAttrs stdenv.isSunOS {
   # Make sure the right <gmp.h> is found, and not the incompatible
   # /usr/include/mp.h from OpenSolaris.  See
   # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
diff --git a/pkgs/development/libraries/networking-ts-cxx/default.nix b/pkgs/development/libraries/networking-ts-cxx/default.nix
index 72981175c0b..7dc6d4b11fe 100644
--- a/pkgs/development/libraries/networking-ts-cxx/default.nix
+++ b/pkgs/development/libraries/networking-ts-cxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "networking-ts-cxx";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     substituteAll ${./networking_ts.pc.in} $out/lib/pkgconfig/networking_ts.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Experimental implementation of the C++ Networking Technical Specification";
     homepage = "https://github.com/chriskohlhoff/networking-ts-impl";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index 41d9671b204..dc6b604bd8e 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
     unset CPP
   '';
 
-  makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+  makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://fedorahosted.org/newt/";
     description = "Library for color text mode, widget based user interfaces";
 
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 0ec941ff182..6464679b948 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config
+{ lib, stdenv, fetchurl, pkg-config
 
 # Optional Dependencies
 , openssl ? null, zlib ? null
@@ -23,7 +23,7 @@ assert enableGetAssets -> libxml2 != null;
 assert enableJemalloc -> jemalloc != null;
 assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null;
 
-let inherit (stdenv.lib) optional optionals optionalString; in
+let inherit (lib) optional optionals optionalString; in
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-spdylay=no"
     "--disable-examples"
-    (stdenv.lib.enableFeature enableApp "app")
+    (lib.enableFeature enableApp "app")
   ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"
     ++ (if enablePython then [
     "--with-cython=${cython}/bin/cython"
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   #doCheck = true;  # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://nghttp2.org/";
     description = "A C implementation of HTTP/2";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix
index 7d766eb5d87..385f2d84f8a 100644
--- a/pkgs/development/libraries/ngt/default.nix
+++ b/pkgs/development/libraries/ngt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , llvmPackages
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   NIX_ENFORCE_NO_NATIVE = ! enableAVX;
   __AVX2__ = if enableAVX then 1 else 0;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/yahoojapan/NGT";
     description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data";
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 94c4bd84d9a..915e733473e 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }:
+{ lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }:
 let version = "6.0.0"; in
 stdenv.mkDerivation {
   pname = "nix-plugins";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Collection of miscellaneous plugins for the nix expression language";
     homepage = "https://github.com/shlevy/nix-plugins";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 34c0f6294af..74213534532 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/lib64";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Header only C++ library for the JSON file format";
     homepage = "https://github.com/nlohmann/json";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 64eb6d79abd..36fcf908118 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, octave ? null }:
+{ lib, stdenv, fetchFromGitHub, cmake, octave ? null }:
 
 stdenv.mkDerivation rec {
   pname = "nlopt";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "--without-guile"
     "--without-python"
     "--without-matlab"
-  ] ++ stdenv.lib.optionals (octave != null) [
+  ] ++ lib.optionals (octave != null) [
     "--with-octave"
     "M_INSTALL_DIR=$(out)/${octave.sitePath}/m"
     "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct"
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://nlopt.readthedocs.io/en/latest/";
     description = "Free open-source library for nonlinear optimization";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    hydraPlatforms = lib.platforms.linux;
   };
 
 }
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index a1a7a9ad6cb..1cd69074911 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/pkgs/development/libraries/notify-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, pkg-config, autoreconfHook
+{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook
 , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix
index c3ef724501e..6611f99bdfc 100644
--- a/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/pkgs/development/libraries/npapi-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "npapi-sdk";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A bundle of NPAPI headers by Mozilla";
 
     homepage = "https://bitbucket.org/mgorny/npapi-sdk"; # see also https://github.com/mozilla/npapi-sdk
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index 51512a16057..a5ac9ce9912 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "npth-1.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The New GNU Portable Threads Library";
     longDescription = ''
       This is a library to provide the GNU Pth API and thus a non-preemptive
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index e8893bc2040..17b8b9226d5 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , CoreServices ? null
 , buildPackages }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     cd nspr
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '@executable_path/' "$out/lib/"
     substituteInPlace configure.in --replace '@executable_path/' "$out/lib/"
   '';
@@ -32,18 +32,18 @@ stdenv.mkDerivation {
   configureFlags = [
     "--enable-optimize"
     "--disable-debug"
-  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
+  ] ++ lib.optional stdenv.is64bit "--enable-64bit";
 
   postInstall = ''
     find $out -name "*.a" -delete
     moveToOutput share "$dev" # just aclocal
   '';
 
-  buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+  buildInputs = [] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.mozilla.org/projects/nspr/";
     description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/nss/3.44.nix b/pkgs/development/libraries/nss/3.44.nix
index 1c89dd79331..b08b8b3ed2a 100644
--- a/pkgs/development/libraries/nss/3.44.nix
+++ b/pkgs/development/libraries/nss/3.44.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
+{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
 
 let
   nssPEM = fetchurl {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ zlib sqlite ];
 
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
 
   patchFlags = [ "-p0" ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
   '';
 
@@ -61,16 +61,16 @@ in stdenv.mkDerivation rec {
     "USE_SYSTEM_ZLIB=1"
     "NSS_USE_SYSTEM_SQLITE=1"
     "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with
     # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64
     "OS_TEST=${cpu}"
     "CPU_ARCH=${cpu}"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "CROSS_COMPILE=1"
     "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling
-  ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"
-    ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++";
+  ] ++ lib.optional stdenv.is64bit "USE_64=1"
+    ++ lib.optional stdenv.isDarwin "CCC=clang++";
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
@@ -135,7 +135,7 @@ in stdenv.mkDerivation rec {
     rm -f "$out"/lib/*.a
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developer.mozilla.org/en-US/docs/NSS";
     description = "A set of libraries for development of security-enabled client and server applications";
     license = licenses.mpl20;
diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix
index dcd9ade629b..9f281743f6c 100644
--- a/pkgs/development/libraries/nss/3.53.nix
+++ b/pkgs/development/libraries/nss/3.53.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
+{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
 , # allow FIPS mode. Note that this makes the output non-reproducible.
   # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
   enableFIPS ? false
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
 
   buildInputs = [ zlib sqlite ];
 
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   patchFlags = [ "-p0" ];
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
      substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
      substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
    '';
@@ -90,9 +90,9 @@ in stdenv.mkDerivation rec {
       -Dhost_arch=${host} \
       -Duse_system_zlib=1 \
       --enable-libpkix \
-      ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \
-      ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
-      ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
+      ${lib.optionalString enableFIPS "--enable-fips"} \
+      ${lib.optionalString stdenv.isDarwin "--clang"} \
+      ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
 
     runHook postBuild
   '';
@@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
     isCross = stdenv.hostPlatform != stdenv.buildPlatform;
     nss = if isCross then buildPackages.nss.tools else "$out";
   in
-  (stdenv.lib.optionalString enableFIPS (''
+  (lib.optionalString enableFIPS (''
     for libname in freebl3 nssdbm3 softokn3
     do '' +
     (if stdenv.isDarwin
@@ -160,7 +160,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developer.mozilla.org/en-US/docs/NSS";
     description = "A set of libraries for development of security-enabled client and server applications";
     license = licenses.mpl20;
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 17dc93c9f1e..8c98d7ae9bb 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
+{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
 , # allow FIPS mode. Note that this makes the output non-reproducible.
   # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
   enableFIPS ? false
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
 
   buildInputs = [ zlib sqlite ];
 
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
 
   patchFlags = [ "-p0" ];
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
      substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
      substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
    '';
@@ -96,9 +96,9 @@ in stdenv.mkDerivation rec {
       -Dhost_arch=${host} \
       -Duse_system_zlib=1 \
       --enable-libpkix \
-      ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \
-      ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
-      ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
+      ${lib.optionalString enableFIPS "--enable-fips"} \
+      ${lib.optionalString stdenv.isDarwin "--clang"} \
+      ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
 
     runHook postBuild
   '';
@@ -143,7 +143,7 @@ in stdenv.mkDerivation rec {
     isCross = stdenv.hostPlatform != stdenv.buildPlatform;
     nss = if isCross then buildPackages.nss.tools else "$out";
   in
-  (stdenv.lib.optionalString enableFIPS (''
+  (lib.optionalString enableFIPS (''
     for libname in freebl3 nssdbm3 softokn3
     do '' +
     (if stdenv.isDarwin
@@ -166,7 +166,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://developer.mozilla.org/en-US/docs/NSS";
     description = "A set of libraries for development of security-enabled client and server applications";
     license = licenses.mpl20;
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index 2b9321c7a90..3cdeb93dc9b 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config }:
+{ lib, stdenv, fetchurl, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "nss_wrapper-1.1.11";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper for the user, group and hosts NSS API";
     homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix
index 5ea43097b8c..98ea6fa943f 100644
--- a/pkgs/development/libraries/ntbtls/default.nix
+++ b/pkgs/development/libraries/ntbtls/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }:
+{ lib, stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "ntbtls";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" ];
 
   buildInputs = [ libgcrypt libgpgerror libksba zlib ]
-    ++ stdenv.lib.optional stdenv.isDarwin gettext;
+    ++ lib.optional stdenv.isDarwin gettext;
 
   postInstall = ''
     moveToOutput "bin/ntbtls-config" $dev
diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix
index d0a9a2e5b49..021436516c2 100644
--- a/pkgs/development/libraries/ntdb/default.nix
+++ b/pkgs/development/libraries/ntdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python2
 , python3
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     "--builtin-libraries=replace,ccan"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The not-so trivial database";
     homepage = "https://tdb.samba.org/";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix
index 48ef98dab49..e98cfac7858 100644
--- a/pkgs/development/libraries/ntirpc/default.nix
+++ b/pkgs/development/libraries/ntirpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , krb5, liburcu , libtirpc, libnsl
 } :
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cp ${libtirpc}/etc/netconfig $out/etc/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Transport-independent RPC (TI-RPC)";
     homepage = "https://github.com/nfs-ganesha/ntirpc";
     maintainers = [ maintainers.markuskowa ];
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 47fd43d7e35..cb9f9ff575f 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, pkg-config, libnl, python }:
+{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }:
 
 let
   version = "016";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Network Connectivity Tracking library for Desktop Applications";
     homepage = "https://launchpad.net/ntrack";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix
index 1554e167815..58e5e401359 100644
--- a/pkgs/development/libraries/nuraft/default.nix
+++ b/pkgs/development/libraries/nuraft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "nuraft";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost172 asio openssl zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/eBay/NuRaft";
     description = "C++ implementation of Raft core logic as a replication library";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index cafcf96e46b..c16305018d7 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }:
 
 stdenv.mkDerivation rec {
   pname = "nuspell";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/doc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free and open source C++ spell checking library";
     homepage = "https://nuspell.github.io/";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix
index 8d3c2179bff..9b8323e6c97 100644
--- a/pkgs/development/libraries/nv-codec-headers/default.nix
+++ b/pkgs/development/libraries/nv-codec-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   pname = "nv-codec-headers";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "FFmpeg version of headers for NVENC";
     homepage = "https://ffmpeg.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.MP2E ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.MP2E ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
index 667f3d94e05..f9c2547d424 100644
--- a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
+++ b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "nvidia-optical-flow-sdk";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -R * $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Nvidia optical flow headers for computing the relative motion of pixels between images";
     homepage = "https://developer.nvidia.com/opticalflow-sdk";
     license = licenses.bsd3; # applies to the header files only
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 577f56e8c27..67624596720 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "nvidia-texture-tools";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     moveToOutput lib "$lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of cuda-enabled texture tools and compressors";
     homepage = "https://github.com/castano/nvidia-texture-tools";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix
index d08f7185588..3a63bad03dc 100644
--- a/pkgs/development/libraries/nvidia-video-sdk/default.nix
+++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "nvidia-video-sdk-6.0.1";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -R Samples/common/inc/* $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The NVIDIA Video Codec SDK";
     homepage = "https://developer.nvidia.com/nvidia-video-codec-sdk";
     license = licenses.unfree;
diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/development/libraries/oatpp/default.nix
index 38c02170761..084f3c4a935 100644
--- a/pkgs/development/libraries/oatpp/default.nix
+++ b/pkgs/development/libraries/oatpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://oatpp.io/";
     description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix
index 30a8790b99a..b84aa6a146d 100644
--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/pkgs/development/libraries/ocl-icd/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }:
+{lib, stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
   pname = "ocl-icd";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCL ICD Loader for ${opencl-headers.name}";
     homepage    = "https://forge.imag.fr/projects/ocl-icd/";
     license     = licenses.bsd2;
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index d6047d1b192..d9c82f79bb3 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "ode";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Dynamics Engine";
     homepage = "https://sourceforge.net/projects/opende";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 22d48c8c609..b79de9278d4 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 let
   version = "4.1.0";
-  libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ];
+  libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
 
 in stdenv.mkDerivation {
   inherit version;
@@ -16,24 +16,24 @@ in stdenv.mkDerivation {
     sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x";
   };
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ oracle-instantclient ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libaio ];
+    ++ lib.optionals stdenv.isLinux [ libaio ];
 
   dontPatchELF = true;
   makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"];
 
   postFixup = ''
-    ${stdenv.lib.optionalString (stdenv.isLinux) ''
+    ${lib.optionalString (stdenv.isLinux) ''
       patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
     ''}
-    ${stdenv.lib.optionalString (stdenv.isDarwin) ''
+    ${lib.optionalString (stdenv.isDarwin) ''
       install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
     ''}
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Oracle ODPI-C library";
     homepage = "https://oracle.github.io/odpi/";
     maintainers = with maintainers; [ mkazulak flokli ];
diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/development/libraries/ogdf/default.nix
index bbef1d8b93d..bee64afd290 100644
--- a/pkgs/development/libraries/ogdf/default.nix
+++ b/pkgs/development/libraries/ogdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen }:
+{ lib, stdenv, fetchFromGitHub, cmake, doxygen }:
 
 stdenv.mkDerivation rec {
   pname = "ogdf";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   #> 766 |      sprintf(messageOut_,format_+2);
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework";
     homepage = "http://www.ogdf.net";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix
index 6bf239d061e..849db216b92 100644
--- a/pkgs/development/libraries/ogre/1.10.x.nix
+++ b/pkgs/development/libraries/ogre/1.10.x.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A 3D engine";
     homepage = "https://www.ogre3d.org/";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix
index 8e0156d8452..30d1dd18554 100644
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/pkgs/development/libraries/ogre/1.9.x.nix
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A 3D engine";
     homepage = "https://www.ogre3d.org/";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 8eb6db729ed..ae65da3f418 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A 3D engine";
     homepage = "https://www.ogre3d.org/";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix
index 7e87ac43408..0aefedb5257 100644
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ b/pkgs/development/libraries/ogrepaged/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
+{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
 
 stdenv.mkDerivation rec {
   pname = "ogre-paged";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Paged Geometry for Ogre3D";
     homepage = "https://github.com/RigsOfRods/ogre-paged";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index ee85e64966f..2edbc35aa89 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Object-oriented C++ input system";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 9efe524b12d..4fbc34bcce6 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "olm";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Implements double cryptographic ratchet and Megolm ratchet";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://gitlab.matrix.org/matrix-org/olm";
-    platforms = with stdenv.lib.platforms; darwin ++ linux;
+    platforms = with lib.platforms; darwin ++ linux;
   };
 }
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 44420c85cf5..016207c1306 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "onig";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kkos/oniguruma";
     description = "Regular expressions library";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix
index e9d501f7928..cba7e7b285d 100644
--- a/pkgs/development/libraries/opae/default.nix
+++ b/pkgs/development/libraries/opae/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , libuuid, json_c
 , doxygen, perl, python2, python2Packages
 }:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_ASE=1" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Programmable Acceleration Engine SDK";
     homepage    = "https://01.org/opae";
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index efc5a18f2b0..43c781cf52c 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , alsaSupport ? !stdenv.isDarwin, alsaLib ? null
 , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
 , CoreServices, AudioUnit, AudioToolbox
 }:
 
-with stdenv.lib;
+with lib;
 
 assert alsaSupport -> alsaLib != null;
 assert pulseSupport -> libpulseaudio != null;
diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix
index 41631da1241..11265c643f9 100644
--- a/pkgs/development/libraries/openbabel/2.nix
+++ b/pkgs/development/libraries/openbabel/2.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.4.1";
 
   src = fetchurl {
-    url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
+    url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
     sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
   };
 
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 301025dfd20..63784d94d8f 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.1.1";
 
   src = fetchurl {
-    url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
+    url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
     sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02";
   };
 
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 3e2d0f6b6e8..8e56e250ac4 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }:
+{ lib, stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }:
 
 stdenv.mkDerivation {
 
@@ -19,9 +19,9 @@ stdenv.mkDerivation {
   meta = {
     description = "Open Source Biometric Recognition";
     homepage = "http://openbiometrics.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [flosse];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [flosse];
+    platforms = with lib.platforms; linux;
     broken = true;
   };
 }
diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix
index ac2b8ba6d1e..59c1f0ef7db 100644
--- a/pkgs/development/libraries/opencascade-occt/default.nix
+++ b/pkgs/development/libraries/opencascade-occt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk,
+{ lib, stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk,
   libGL, libGLU, libXext, libXmu, libXi, darwin }:
 
 stdenv.mkDerivation rec {
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja ];
   buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
     homepage = "https://www.opencascade.org/";
     license = licenses.lgpl21;  # essentially...
diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index ad17e7dcac7..5c262a3680c 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
+{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
   pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb,
   OpenCL, Cocoa
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "opencascade-oce";
   version = "0.18.3";
diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix
index 8b7df317b2b..8bbde9796d9 100644
--- a/pkgs/development/libraries/opencl-clang/default.nix
+++ b/pkgs/development/libraries/opencl-clang/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -15,10 +16,10 @@ let
     inherit spirv-llvm-translator;
   };
 
-  inherit (stdenv.lib) getVersion;
+  inherit (lib) getVersion;
 
   addPatches = component: pkg:
-    with builtins; with stdenv.lib;
+    with builtins; with lib;
     let path = "${passthru.patchesOut}/${component}";
     in pkg.overrideAttrs (super: {
       postPatch = (if super ? postPatch then super.postPatch + "\n" else "") + ''
@@ -39,7 +40,7 @@ let
 
     patchesOut = stdenv.mkDerivation rec {
       pname = "opencl-clang-patches";
-      inherit (lib) version src patches;
+      inherit (library) version src patches;
       installPhase = ''
         [ -d patches ] && cp -r patches/ $out || mkdir $out
         mkdir -p $out/clang $out/spirv
@@ -50,7 +51,7 @@ let
 
   };
 
-  lib = let
+  library = let
     inherit (llvmPkgs) llvm;
     inherit (if buildWithPatches then passthru else llvmPkgs) clang-unwrapped spirv-llvm-translator;
   in
@@ -85,7 +86,7 @@ let
         "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator}"
       ];
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage    = "https://github.com/intel/opencl-clang/";
         description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules";
         license     = licenses.ncsa;
@@ -94,4 +95,4 @@ let
       };
     };
 in
-  lib
+  library
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix
index 1486ea93175..ec40bc393d5 100644
--- a/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
+{ lib, stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
 
 stdenv.mkDerivation rec {
   pname = "opencl-clhpp";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTS=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCL Host API C++ bindings";
     homepage = "http://github.khronos.org/OpenCL-CLHPP/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index aaf6390d00a..1ef27bf5831 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     cp CL/* $out/include/CL
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Khronos OpenCL headers version ${version}";
     homepage = "https://www.khronos.org/registry/cl/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index a9c26d00e3a..d0582217433 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A library for handling the COLLADA file format";
     homepage = "https://github.com/KhronosGroup/OpenCOLLADA/";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 6745d6bf0ce..8908f486615 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     mkdir -p $bin/bin; mv $out/bin $bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://opencolorio.org";
     description = "A color management framework for visual effects and animation";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix
index f011def0eb9..d1348d96e3b 100644
--- a/pkgs/development/libraries/opencore-amr/default.nix
+++ b/pkgs/development/libraries/opencore-amr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
     version = "0.1.5";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     homepage = "https://opencore-amr.sourceforge.io/";
     description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.
     Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.kiloreux ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.kiloreux ];
   };
 }
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 00d489508ad..53adbdf414f 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11
+{lib, stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11
 , qmake, GLUT, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ qmake ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ glew ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ]
-    ++ stdenv.lib.optional stdenv.isDarwin GLUT;
+    ++ lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ]
+    ++ lib.optional stdenv.isDarwin GLUT;
 
   doCheck = false;
 
@@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     install -D license.txt "$out/share/doc/opencsg/license.txt"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/Applications
     mv $out/bin/*.app $out/Applications
     rmdir $out/bin || true
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample
     install_name_tool -change \
       $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       $app
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Constructive Solid Geometry library";
     homepage = "http://www.opencsg.org/";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix
index c0a021a9d3b..92dec5ee233 100644
--- a/pkgs/development/libraries/openct/default.nix
+++ b/pkgs/development/libraries/openct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1
 , doxygen, libxslt
 }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/etc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/OpenSC/openct/";
     license = licenses.lgpl21;
     description = "Drivers for several smart card readers";
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 8a846808080..11872cd47cc 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -269,7 +269,7 @@ stdenv.mkDerivation {
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = "https://opencv.org/";
     license = with licenses; if enableUnfree then unfree else bsd3;
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 3d845b7368b..c9ac76b6554 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -278,7 +278,7 @@ stdenv.mkDerivation {
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = "https://opencv.org/";
     license = with licenses; if enableUnfree then unfree else bsd3;
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 0d4d2c6e001..2575f6bb45d 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = "https://opencv.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index 954e6cc6b66..a9eb209edda 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
+{ lib, stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
 
-let inherit (stdenv.lib) getDev; in
+let inherit (lib) getDev; in
 
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline libmysqlclient postgresql sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extremely lightweight but extensible database access library written in C";
     license = licenses.lgpl21;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index e160bfb7d36..7f4f186c923 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, pkg-config
 , asio, nettle, gnutls, msgpack, readline, libargon2
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" "man" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++11 Kademlia distributed hash table implementation";
     homepage    = "https://github.com/savoirfairelinux/opendht";
     license     = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index b40b3bc4def..90c7fb85d42 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter
+{ lib, stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter
 , autoreconfHook, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       --prefix PATH : ${openssl.bin}/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service";
     homepage = "http://www.opendkim.org/";
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/development/libraries/opendmarc/default.nix
index 9b45cc244f2..0dedfa3a85e 100644
--- a/pkgs/development/libraries/opendmarc/default.nix
+++ b/pkgs/development/libraries/opendmarc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "opendmarc";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free open source software implementation of the DMARC specification";
     homepage = "http://www.trusteddomain.org/opendmarc/";
     license = with licenses; [ bsd3 sendmail ];
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index b33b284f45c..4e04de30d65 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   propagatedBuildInputs = [ ilmbase zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high dynamic-range (HDR) image file format";
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix
index 92cd343cf6a..ce35aa1c655 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
+{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
 
 stdenv.mkDerivation {
   pname = "openexrid-unstable";
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
       mv $out/lib $lib/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing";
     homepage = "https://github.com/MercenariesEngineering/openexrid";
     maintainers = [ maintainers.guibou ];
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index f652c5ee7b7..51e661eabb3 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "openfst";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for working with finite-state transducers";
     longDescription = ''
       Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs).
diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix
index 4a7927bfcb2..0d8afe53df8 100644
--- a/pkgs/development/libraries/openfx/default.nix
+++ b/pkgs/development/libraries/openfx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip }:
+{ lib, stdenv, fetchFromGitHub, unzip }:
 
 stdenv.mkDerivation {
   pname = "openfx";
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
      cp -r include/* $dev/include/OpenFX/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Image processing plug-in standard";
     homepage = "http://openeffects.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix
index ab546c6d0d4..9b105808b8b 100644
--- a/pkgs/development/libraries/opengrm-ngram/default.nix
+++ b/pkgs/development/libraries/opengrm-ngram/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, fetchurl, openfst }:
+{ lib, stdenv, autoreconfHook, fetchurl, openfst }:
 
 stdenv.mkDerivation rec {
   pname = "opengrm-ngram";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers";
     homepage = "http://www.openfst.org/twiki/bin/view/GRM/NGramLibrary";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index ee430f800dd..6e856b04ac4 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, nasm }:
+{ lib, stdenv, fetchFromGitHub, nasm }:
 
 stdenv.mkDerivation rec {
   pname = "openh264";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A codec library which supports H.264 encoding and decoding";
     homepage = "https://www.openh264.org";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/development/libraries/openhmd/default.nix
index ab1b9b7b1dd..a692dcb5e4e 100644
--- a/pkgs/development/libraries/openhmd/default.nix
+++ b/pkgs/development/libraries/openhmd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     hidapi
-  ] ++ stdenv.lib.optionals withExamples [
+  ] ++ lib.optionals withExamples [
     SDL2
     glew
     libGL
@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
     "-DOpenGL_GL_PREFERENCE=GLVND"
   ];
 
-  postInstall = stdenv.lib.optionalString withExamples ''
+  postInstall = lib.optionalString withExamples ''
     mkdir -p $out/bin
     install -D examples/simple/simple $out/bin/openhmd-example-simple
     install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.openhmd.net"; # https does not work
     description = "Library API and drivers immersive technology";
     longDescription = ''
diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix
index 2ac74c6c240..03f9118ef7c 100644
--- a/pkgs/development/libraries/openimagedenoise/default.nix
+++ b/pkgs/development/libraries/openimagedenoise/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, cmake, tbb, python, ispc }:
+{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }:
 
 stdenv.mkDerivation rec {
   pname = "openimagedenoise";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake python ispc ];
   buildInputs = [ tbb ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://openimagedenoise.github.io";
     description = "High-Performance Denoising Library for Ray Tracing";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 5ed35844eb0..8c1f18b987d 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , libpng, libtiff, lcms2, jpylyzer
 , mj2Support ? true # MJ2 executables
 , jpwlLibSupport ? true # JPWL library & executables
@@ -19,7 +19,7 @@ assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
 assert (openjpegJarSupport || jpipLibSupport) -> jdk != null;
 
 let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
   mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
 in
 
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
     incDir = "openjpeg-${branch}";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open-source JPEG 2000 codec written in C language";
     homepage = "https://www.openjpeg.org/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index fdf3298a6fa..4d4ec1763f0 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
+{ lib, stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "openldap";
@@ -34,12 +34,12 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--enable-crypt"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "--with-yielding_select=yes"
     "ac_cv_func_memcmp_working=yes"
-  ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
-    ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
-    ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+  ] ++ lib.optional (openssl == null) "--without-tls"
+    ++ lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
+    ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   postBuild = ''
     make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     chmod +x "$out"/lib/*.{so,dylib}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.openldap.org/";
     description = "An open source implementation of the Lightweight Directory Access Protocol";
     license = licenses.openldap;
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 95c2a9c3fcf..802685970ac 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
+{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
 , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
 , libpsm2, libfabric, pmix, ucx
 
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
   pname = "openmpi";
   inherit version;
 
-  src = with stdenv.lib.versions; fetchurl {
+  src = with lib.versions; fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
     sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5";
   };
@@ -97,7 +97,7 @@ in stdenv.mkDerivation rec {
     inherit cudaSupport cudatoolkit;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.open-mpi.org/";
     description = "Open source MPI-3 implementation";
     longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix
index 46729f660b1..3a6416122bf 100644
--- a/pkgs/development/libraries/openpa/default.nix
+++ b/pkgs/development/libraries/openpa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file }:
+{ lib, stdenv, fetchurl, file }:
 
 stdenv.mkDerivation rec {
   pname = "openpa";
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Atomic primitives for high performance, concurrent software";
     homepage = "https://trac.mpich.org/projects/openpa";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ leenaars ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ leenaars ];
+    platforms = with lib.platforms; linux;
     longDescription = ''
       OPA (or sometimes OpenPA or Open Portable Atomics) is an
       open source library intended to provide a consistent C API for performing
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix
index 779e17e4c81..4f83f22856e 100644
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkg-config
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
 , boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://shibboleth.net/products/opensaml-cpp.html";
     description = "A low-level library written in C++ that provides support for producing and consuming SAML messages";
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 78c37e94b93..8eeff3de943 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A 3D graphics toolkit";
     homepage = "http://www.openscenegraph.org/";
     maintainers = with maintainers; [ aanderse raskin ];
diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix
index 68cb40abf72..ddc0e893596 100644
--- a/pkgs/development/libraries/openslp/default.nix
+++ b/pkgs/development/libraries/openslp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation {
   name = "openslp-2.0.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     ./CVE-2016-4912.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.openslp.org/";
     description = "An open-source implementation of the IETF Service Location Protocol";
     maintainers = with maintainers; [ ttuegel ];
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index b37142082d8..bae3e53f441 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, perl, zlib
+{ lib, stdenv, fetchFromGitHub, perl, zlib
 , withCryptodev ? false, cryptodev
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation {
   pname = "openssl-chacha";
   version = "2016-08-22";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   setOutputFlags = false;
 
   nativeBuildInputs = [ perl zlib ];
-  buildInputs = stdenv.lib.optional withCryptodev cryptodev;
+  buildInputs = lib.optional withCryptodev cryptodev;
 
   configureScript = "./config";
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     "enable-gost"
     "--libdir=lib"
     "--openssldir=etc/ssl"
-  ] ++ stdenv.lib.optionals withCryptodev [
+  ] ++ lib.optionals withCryptodev [
     "-DHAVE_CRYPTODEV"
     "-DUSE_CRYPTODEV_DIGESTS"
   ];
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
     homepage = "https://www.openssl.org/";
     description = "A cryptographic library that implements the SSL and TLS protocols";
     platforms = [ "x86_64-linux" ];
-    maintainers = [ stdenv.lib.maintainers.cstrahan ];
+    maintainers = [ lib.maintainers.cstrahan ];
     license = licenses.openssl;
     priority = 10; # resolves collision with ‘man-pages’
   };
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2570c7cdb25..ce4374be331 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPackages, perl, coreutils
+{ lib, stdenv, fetchurl, buildPackages, perl, coreutils
 , withCryptodev ? false, cryptodev
 , enableSSL2 ? false
 , enableSSL3 ? false
@@ -10,7 +10,7 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-with stdenv.lib;
+with lib;
 
 let
   common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }:
@@ -46,7 +46,7 @@ let
     separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
 
     nativeBuildInputs = [ perl ];
-    buildInputs = stdenv.lib.optional withCryptodev cryptodev;
+    buildInputs = lib.optional withCryptodev cryptodev;
 
     # TODO(@Ericson2314): Improve with mass rebuild
     configurePlatforms = [];
@@ -78,16 +78,16 @@ let
       "shared" # "shared" builds both shared and static libraries
       "--libdir=lib"
       "--openssldir=etc/ssl"
-    ] ++ stdenv.lib.optionals withCryptodev [
+    ] ++ lib.optionals withCryptodev [
       "-DHAVE_CRYPTODEV"
       "-DUSE_CRYPTODEV_DIGESTS"
-    ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
-      ++ stdenv.lib.optional enableSSL3 "enable-ssl3"
-      ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
+    ] ++ lib.optional enableSSL2 "enable-ssl2"
+      ++ lib.optional enableSSL3 "enable-ssl3"
+      ++ lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
       # OpenSSL needs a specific `no-shared` configure flag.
       # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
       # for a comprehensive list of configuration options.
-      ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && static) "no-shared";
+      ++ lib.optional (versionAtLeast version "1.1.0" && static) "no-shared";
 
     makeFlags = [
       "MANDIR=$(man)/share/man"
@@ -101,7 +101,7 @@ let
     enableParallelBuilding = true;
 
     postInstall =
-    stdenv.lib.optionalString (!static) ''
+    lib.optionalString (!static) ''
       # If we're building dynamic libraries, then don't install static
       # libraries.
       if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
@@ -111,7 +111,7 @@ let
     '' +
     ''
       mkdir -p $bin
-    '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
+    '' + lib.optionalString (!stdenv.hostPlatform.isWindows)
     ''
       substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl}
     '' +
@@ -127,7 +127,7 @@ let
       rmdir $out/etc/ssl/{certs,private}
     '';
 
-    postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) ''
+    postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
       # Check to make sure the main output doesn't depend on perl
       if grep -r '${buildPackages.perl}' $out; then
         echo "Found an erroneous dependency on perl ^^^" >&2
@@ -135,7 +135,7 @@ let
       fi
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://www.openssl.org/";
       description = "A cryptographic library that implements the SSL and TLS protocols";
       license = licenses.openssl;
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
index 76342abaa2d..9c99ee6027d 100644
--- a/pkgs/development/libraries/opentracing-cpp/default.nix
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "opentracing-cpp";
   version = "1.5.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ implementation of the OpenTracing API";
     homepage = "https://opentracing.io";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ rob ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ rob ];
   };
 
 }
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index 38e50fb367e..5f3a03a3f5b 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
+{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
 
 stdenv.mkDerivation rec
 {
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec
   NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/";
   NIX_LDFLAGS="-lboost_iostreams";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open framework for voxel";
     homepage = "https://www.openvdb.org";
     maintainers = [ maintainers.guibou ];
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
index e139a1f509c..05f1ef65a30 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , curl, libxml2, pam, sblim-sfcc }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-more-warnings" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description  = "Openwsman server implementation and client API with bindings";
     downloadPage = "https://github.com/Openwsman/openwsman/releases";
     homepage     = "https://openwsman.github.io";
diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix
index 415846dd2fa..2f901f0e412 100644
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/pkgs/development/libraries/openxr-loader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }:
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     mv "$out/lib/libXrApiLayer"* "$layers/lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Khronos OpenXR loader";
     homepage    = "https://www.khronos.org/openxr";
     platforms   = platforms.linux;
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index 641776cc944..0a617561a89 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which
 , systemd }:
 
@@ -51,7 +51,7 @@ in stdenv.mkDerivation {
       --replace pcfile=${pkg-config} pcfile=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller";
     homepage = "http://www.openzwave.net/";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index aba9c75ad46..c6efc901e8a 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoPatchelfHook
 , fixDarwinDylibNames
@@ -12,7 +12,7 @@
 assert odbcSupport -> unixODBC != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
@@ -114,7 +114,7 @@ in stdenv.mkDerivation {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Oracle instant client libraries and sqlplus CLI";
     longDescription = ''
       Oracle instant client provides access to Oracle databases (OCI,
diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix
index 4a01de54a6d..5c9c2c8da7f 100644
--- a/pkgs/development/libraries/orcania/default.nix
+++ b/pkgs/development/libraries/orcania/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, check, subunit }:
+{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }:
 stdenv.mkDerivation rec {
   pname = "orcania";
   version = "2.1.1";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Potluck with different functions for different purposes that can be shared among C programs";
     homepage = "https://github.com/babelouest/orcania";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index ecd15498432..196cac4bcaf 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,7 +1,7 @@
 { bctoolbox
 , cmake
 , fetchFromGitLab
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bctoolbox ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Real-Time Transport Protocol (RFC3550) stack";
     homepage = "https://linphone.org/technical-corner/ortp";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 8b2dce1d950..322ed30a847 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   version = "5.2.0";
   src = fetchurl {
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   pname = "libosip2";
 
   meta = {
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     homepage = "https://www.gnu.org/software/osip/";
     description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
     inherit version;
   };
 }
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix
index f1aa1968493..17a3af68a80 100644
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@@ -1,4 +1,4 @@
-{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, stdenv }:
+{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   pname = "osm-gps-map";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     gnome3.gnome-common gtk3 gnome3.libsoup
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GTK widget for displaying OpenStreetMap tiles";
     homepage = "https://nzjrs.github.io/osm-gps-map";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index a93bc6763c0..0e09d563ea1 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which
 , gettext, libffi, libiconv, libtasn1
 }:
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     "exampledir=${placeholder "out"}/etc/pkcs11"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for loading and sharing PKCS#11 modules";
     longDescription = ''
       Provides a way to load and enumerate PKCS#11 modules.
diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix
index 017cb25a9d1..7bf0cb2c5fb 100644
--- a/pkgs/development/libraries/packr/default.nix
+++ b/pkgs/development/libraries/packr/default.nix
@@ -22,7 +22,7 @@ let p2 = buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The simple and easy way to embed static files into Go binaries";
     homepage = "https://github.com/gobuffalo/packr";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
index 4723292199d..abef3d6cd1d 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub
-, stdenv
+, lib, stdenv
 , cmake
 , eigen
 , nlopt
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   # tests pass but take 30+ minutes
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://esa.github.io/pagmo2/";
     description = "Scientific library for massively parallel optimization";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index ff1fcb945ca..68511003215 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz
 , libintl, libthai, gobject-introspection, darwin, fribidi, gnome3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
 , meson, ninja, glib
 , x11Support? !stdenv.isDarwin, libXft
 }:
 
-with stdenv.lib;
+with lib;
 
 let
   pname = "pango";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk";
   };
 
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-Dxft=disabled"  # only works with x11
   ];
 
@@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index 4cb90e297cf..0e5d705a1ce 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation {
       graphical data.
     '';
     homepage = "https://github.com/stevenlovegrove/Pangolin";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.expipiplus1 ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.expipiplus1 ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index 1443e74d608..0ff0d9a7d4e 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3
+{ lib, stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3
 , ApplicationServices }:
 
 stdenv.mkDerivation rec {
@@ -6,13 +6,13 @@ stdenv.mkDerivation rec {
   version= "2.42.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin [
+  nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin [
     ApplicationServices
   ];
   propagatedBuildInputs = [ pango glibmm cairomm ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ interface to the Pango text rendering library";
     homepage    = "https://www.pango.org/";
     license     = with licenses; [ lgpl2 lgpl21 ];
diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix
index ff23a7f30f2..7d314a930f2 100644
--- a/pkgs/development/libraries/pangoxsl/default.nix
+++ b/pkgs/development/libraries/pangoxsl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, glib, pango}:
+{lib, stdenv, fetchurl, pkg-config, glib, pango}:
 
 stdenv.mkDerivation {
   name = "pangoxsl-1.6.0.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     pango
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango";
     homepage = "https://sourceforge.net/projects/pangopdf";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index 2f7574d3637..0247d12715f 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }:
 
 stdenv.mkDerivation {
   pname = "partio";
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     mv $dev/include/*.h $dev/include/partio
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC";
     homepage = "https://www.disneyanimation.com/technology/partio.html";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix
index 7d7dbd53383..1777b0856f8 100644
--- a/pkgs/development/libraries/pc-ble-driver/default.nix
+++ b/pkgs/development/libraries/pc-ble-driver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }:
+{ lib, stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }:
 
 stdenv.mkDerivation rec {
   pname = "pc-ble-driver";
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [
 
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     IOKit
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ lib.optionals stdenv.isLinux [
     udev
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Desktop library for Bluetooth low energy development";
     homepage = "https://github.com/NordicSemiconductor/pc-ble-driver";
     license = licenses.unfreeRedistributable;
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index 8301d1a6f1a..ebdacdfc9bd 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides a C API to different audio devices";
     homepage = "https://github.com/espeak-ng/pcaudiolib";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
index 593794c9c4d..9722210b9d1 100644
--- a/pkgs/development/libraries/pcg-c/default.nix
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "0.94";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A family of better random number generators";
     homepage = "https://www.pcg-random.org/";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
     longDescription = ''
       PCG is a family of simple fast space-efficient statistically good
       algorithms for random number generation. Unlike many general-purpose RNGs,
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 0c57e8b4b68..436e0f85e16 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , qhull, flann, boost, vtk, eigen, pkg-config, qtbase
 , libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL
 }:
@@ -16,18 +16,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ qhull flann boost eigen libusb1 libpcap
                   libpng vtk qtbase libXt ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ];
+    ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ];
 
-  cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
+  cmakeFlags = lib.optionals stdenv.isDarwin [
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
   ];
 
   meta = {
     homepage = "https://pointclouds.org/";
-    broken = stdenv.lib.versionAtLeast qtbase.version "5.15";
+    broken = lib.versionAtLeast qtbase.version "5.15";
     description = "Open project for 2D/3D image and point cloud processing";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 8f19034c924..8d9b9ec0259 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , pcre, windows ? null
 , variant ? null
 }:
 
-with stdenv.lib;
+with lib;
 
 assert elem variant [ null "cpp" "pcre16" "pcre32" ];
 
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
   meta = {
     homepage = "http://www.pcre.org/";
     description = "A library for Perl Compatible Regular Expressions";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
 
     longDescription = ''
       The PCRE library is a set of functions that implement regular
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 8f06630882c..6bf6cff98bb 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "pcre2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-pcre2-16"
     "--enable-pcre2-32"
-  ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit";
+  ] ++ lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit";
 
   outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     moveToOutput bin/pcre2-config "$dev"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Perl Compatible Regular Expressions";
     homepage = "http://www.pcre.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix
index 4405d3812b7..42e05d5d7ff 100644
--- a/pkgs/development/libraries/pdal/default.nix
+++ b/pkgs/development/libraries/pdal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_PLUGIN_RIVLIB=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data";
     homepage = "https://pdal.io";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix
index 855df954eb1..2dfd3546685 100644
--- a/pkgs/development/libraries/pdf2xml/default.nix
+++ b/pkgs/development/libraries/pdf2xml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libxpdf, libxml2}:
+{lib, stdenv, fetchurl, libxpdf, libxml2}:
 
 stdenv.mkDerivation {
   name = "pdf2xml";
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     cp exe/* $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PDF to XML converter";
     platforms = platforms.unix;
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix
index dbc7e0c3a59..250089c30b1 100644
--- a/pkgs/development/libraries/phash/default.nix
+++ b/pkgs/development/libraries/phash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }:
 
 stdenv.mkDerivation rec {
   pname = "pHash";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Compute the perceptual hash of an image";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix
index 126a91fe290..abacfdc1cce 100644
--- a/pkgs/development/libraries/phonetisaurus/default.nix
+++ b/pkgs/development/libraries/phonetisaurus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , openfst
 , pkg-config
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python3 openfst ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Framework for Grapheme-to-phoneme models for speech recognition using the OpenFst framework";
     inherit (src.meta) homepage;
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index c066e15a8f9..249ce4e3629 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "phonon-backend-gstreamer";
   version = "4.10.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://phonon.kde.org/";
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 3dc5071ba15..07e6ccf1f34 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "phonon-backend-vlc";
   version = "0.11.1";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://phonon.kde.org/";
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 926b8593c59..88a6af658dd 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://community.kde.org/Phonon";
     description = "Multimedia API for Qt";
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
   };
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index 93c0702e3ef..3eb4077d985 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, doxygen, darwin
+{ lib, stdenv, fetchurl, cmake, doxygen, darwin
 , zlib }:
 
 let
@@ -15,7 +15,7 @@ let
     nativeBuildInputs = [ cmake doxygen ];
 
     buildInputs = [ zlib ]
-      ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ];
+      ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ];
 
     patchPhase = ''
       sed s,-Werror,, -i CMakeLists.txt
@@ -27,7 +27,7 @@ let
       ./test_physfs --version
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://icculus.org/physfs/";
       description = "Library to provide abstract access to various archives";
       license = licenses.free;
diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix
index 7b201cf9b16..e3fd0a26a7f 100644
--- a/pkgs/development/libraries/physics/apfel/default.nix
+++ b/pkgs/development/libraries/physics/apfel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }:
+{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "apfel";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A PDF Evolution Library";
     license     = licenses.gpl3;
     homepage    = "https://apfel.mi.infn.it/";
diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix
index 5c63ce7c4b9..33ca0326727 100644
--- a/pkgs/development/libraries/physics/apfelgrid/default.nix
+++ b/pkgs/development/libraries/physics/apfelgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }:
 
 stdenv.mkDerivation rec {
   pname = "apfelgrid";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ultra-fast theory predictions for collider observables";
     license     = licenses.mit;
     homepage    = "http://nhartland.github.io/APFELgrid/";
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix
index 6b1bc71c660..65aa7b8b470 100644
--- a/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/pkgs/development/libraries/physics/applgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
+{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "applgrid";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics";
     license     = licenses.gpl3;
     homepage    = "http://applgrid.hepforge.org";
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index 3c2cd4c6914..84657d72679 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }:
+{ lib, stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }:
 
 stdenv.mkDerivation rec {
   version = "2006";
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     description = "Legacy collection of libraries and modules for data analysis in high energy physics";
     broken = stdenv.isDarwin;
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
-    license = stdenv.lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ veprbl ];
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
index 68e07e7b42d..a09f031e765 100644
--- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix
+++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastjet }:
+{ lib, stdenv, fetchurl, fastjet }:
 
 stdenv.mkDerivation rec {
   pname = "fastjet-contrib";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     make fragile-shared-install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Third party extensions for FastJet";
     homepage = "http://fastjet.fr/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index b854fa88cd6..35ce8dedca7 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2 }:
+{ lib, stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
   pname = "fastjet";
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A software package for jet finding in pp and e+e− collisions";
-    license     = stdenv.lib.licenses.gpl2Plus;
+    license     = lib.licenses.gpl2Plus;
     homepage    = "http://fastjet.fr/";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index 22251e10a4f..916303f00ce 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
+{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "fastnlo_toolkit";
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
-    license      = stdenv.lib.licenses.gpl3;
+    license      = lib.licenses.gpl3;
     homepage     = "http://fastnlo.hepforge.org";
-    platforms    = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms    = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
index 42014949c0b..e51a5937ddb 100644
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -24,7 +24,7 @@ let
       inherit envvar;
       setupHook = ./datasets-hook.sh;
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Data files for the Geant4 toolkit";
         homepage = "https://geant4.web.cern.ch/support/download";
         license = licenses.g4sl;
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 0b48b291555..27d67d9af0c 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -9,7 +9,7 @@
 , enableRaytracerX11   ? false
 
 # Standard build environment with cmake.
-, stdenv, fetchurl, fetchpatch, cmake
+, lib, stdenv, fetchurl, fetchpatch, cmake
 
 # Optional system packages, otherwise internal GEANT4 packages are used.
 , clhep ? null # not packaged currently
@@ -80,9 +80,9 @@ stdenv.mkDerivation rec {
     "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
     "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
     "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
-  ] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [
+  ] ++ lib.optionals (enableMultiThreading && enablePython) [
     "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
-  ] ++ stdenv.lib.optionals enableInventor [
+  ] ++ lib.optionals enableInventor [
     "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
     "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
   ];
@@ -90,13 +90,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs =  [ cmake ];
 
   buildInputs = [ libGLU xlibsWrapper libXmu ]
-    ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ]
-    ++ stdenv.lib.optionals enablePython [ boost_python python3 ];
+    ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
+    ++ lib.optionals enablePython [ boost_python python3 ];
 
   propagatedBuildInputs = [ clhep expat zlib libGL ]
-    ++ stdenv.lib.optionals enableGDML [ xercesc ]
-    ++ stdenv.lib.optionals enableXM [ motif ]
-    ++ stdenv.lib.optionals enableQT [ qtbase ];
+    ++ lib.optionals enableGDML [ xercesc ]
+    ++ lib.optionals enableXM [ motif ]
+    ++ lib.optionals enableQT [ qtbase ];
 
   postFixup = ''
     # Don't try to export invalid environment variables.
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
     source $out/nix-support/setup-hook
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A toolkit for the simulation of the passage of particles through matter";
     longDescription = ''
       Geant4 is a toolkit for the simulation of the passage of particles through matter.
diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix
index b27d947ea5c..e2ab42c418a 100644
--- a/pkgs/development/libraries/physics/hepmc2/default.nix
+++ b/pkgs/development/libraries/physics/hepmc2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "hepmc";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "-Dlength:STRING=MM"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators";
     license     = licenses.lgpl21;
     homepage    = "http://hepmc.web.cern.ch/hepmc/";
diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index 10b789f514f..0b1b1f8fa57 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, cmake, coreutils, python, root }:
+{ lib, stdenv, fetchurl, cmake, coreutils, python, root }:
 
 let
-  pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
+  pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
   withPython = python != null;
   # ensure that root is built with the same python interpreter, as it links against numpy
   root_py = if withPython then root.override { inherit python; } else root;
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ root_py ]
-    ++ stdenv.lib.optional withPython python;
+    ++ lib.optional withPython python;
 
   cmakeFlags = [
     "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}"
-  ] ++ stdenv.lib.optionals withPython [
+  ] ++ lib.optionals withPython [
     "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}"
     "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}"
   ];
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = withPython;
   # prevent nix from trying to dereference a null python
-  installCheckPhase = stdenv.lib.optionalString withPython ''
+  installCheckPhase = lib.optionalString withPython ''
     PYTHONPATH=${placeholder "out"}/${python.sitePackages} python -c 'import pyHepMC3'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation";
     license = licenses.gpl3;
     homepage = "http://hepmc.web.cern.ch/hepmc/";
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index c1a803fd314..d3f6bcb7474 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
+{ lib, stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "herwig";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-purpose particle physics event generator";
     homepage = "https://herwig.hepforge.org/";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix
index 6ac3b950be3..7ad5b9861a1 100644
--- a/pkgs/development/libraries/physics/hoppet/default.nix
+++ b/pkgs/development/libraries/physics/hoppet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl }:
+{ lib, stdenv, fetchurl, gfortran, perl }:
 
 stdenv.mkDerivation rec {
   pname = "hoppet";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Higher Order Perturbative Parton Evolution Toolkit";
     license     = licenses.gpl2;
     homepage    = "https://hoppet.hepforge.org";
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 7d412f86596..19e9f9d9ec8 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2, makeWrapper }:
+{ lib, stdenv, fetchurl, python2, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "lhapdf";
@@ -15,18 +15,18 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru = {
-    pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; };
+    pdf_sets = import ./pdf_sets.nix { inherit lib stdenv fetchurl; };
   };
 
   postInstall = ''
     wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
-    license     = stdenv.lib.licenses.gpl2;
+    license     = licenses.gpl2;
     homepage    = "http://lhapdf.hepforge.org";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index 2309e6671f8..7fb3e640c7d 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   mkPdfSet = name: sha256:
@@ -20,7 +20,7 @@ let
       setupHook = ./pdfset-hook.sh;
     };
 in
-  stdenv.lib.mapAttrs mkPdfSet {
+  lib.mapAttrs mkPdfSet {
     "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0";
     "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i";
     "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll";
diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix
index 1e31577026c..90cf5ac8b2d 100644
--- a/pkgs/development/libraries/physics/mela/default.nix
+++ b/pkgs/development/libraries/physics/mela/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gfortran }:
+{ lib, stdenv, fetchFromGitHub, gfortran }:
 
 stdenv.mkDerivation rec {
   pname = "mela";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "a Mellin Evolution LibrAry";
     license     = licenses.gpl3;
     homepage    = "https://github.com/vbertone/MELA";
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 20df49d9ae7..f84c1bda32d 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "nlojet++";
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage    = "http://www.desy.de/~znagy/Site/NLOJet++.html";
-    license     = stdenv.lib.licenses.gpl2;
+    license     = lib.licenses.gpl2;
     description = "Implementation of calculation of the hadron jet cross sections";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index 53b2889a25c..1bec3300f80 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
+{ lib, stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "pythia";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-shared"
     "--with-lhapdf6=${lhapdf}"
-  ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [
+  ] ++ (if lib.versions.major hepmc.version == "3" then [
     "--with-hepmc3=${hepmc}"
   ] else [
     "--with-hepmc2=${hepmc}"
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A program for the generation of high-energy physics events";
-    license     = stdenv.lib.licenses.gpl2;
+    license     = lib.licenses.gpl2;
     homepage    = "http://home.thep.lu.se/~torbjorn/Pythia.html";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix
index 1c17b318c9d..834e3fcbba8 100644
--- a/pkgs/development/libraries/physics/qcdnum/default.nix
+++ b/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, zlib }:
+{ lib, stdenv, fetchurl, gfortran, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "QCDNUM";
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A very fast QCD evolution program written in FORTRAN77";
-    license     = stdenv.lib.licenses.gpl3;
+    license     = lib.licenses.gpl3;
     homepage    = "https://www.nikhef.nl/~h24/qcdnum/index.html";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index f95328964bf..ce905bff17c 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
+{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "rivet";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-fastjet=${fastjet}"
     "--with-yoda=${yoda}"
-  ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [
+  ] ++ (if lib.versions.major hepmc.version == "3" then [
     "--with-hepmc3=${hepmc}"
   ] else [
     "--with-hepmc=${hepmc}"
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions";
     license     = licenses.gpl3;
     homepage    = "https://rivet.hepforge.org";
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 876aeec0fab..d5a272955f4 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
+{ lib, stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "thepeg";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Toolkit for High Energy Physics Event Generation";
     homepage = "https://herwig.hepforge.org/";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 39bffb65237..bf53cfcb62c 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
+{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
 
 stdenv.mkDerivation rec {
   pname = "yoda";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
   buildInputs = [ python ]
     ++ (with python.pkgs; [ numpy matplotlib ])
-    ++ stdenv.lib.optional withRootSupport root;
+    ++ lib.optional withRootSupport root;
   propagatedBuildInputs = [ zlib ];
 
   enableParallelBuilding = true;
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Provides small set of data analysis (specifically histogramming) classes";
-    license     = stdenv.lib.licenses.gpl3;
+    license     = lib.licenses.gpl3;
     homepage    = "https://yoda.hepforge.org";
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
     # https://gitlab.com/hepcedar/yoda/-/issues/24
     broken      = withRootSupport;
   };
diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix
index 70ab98439cc..1e686b98004 100644
--- a/pkgs/development/libraries/pipewire/0.2.nix
+++ b/pkgs/development/libraries/pipewire/0.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind
 , glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg
 , sbc, SDL2, makeFontsConf
 }:
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Server and user space API to deal with multimedia pipelines";
     homepage = "https://pipewire.org/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index b8be63f8e53..fdd45b4bb0d 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Server and user space API to deal with multimedia pipelines";
     homepage = "https://pipewire.org/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index ef9ae533ca1..a8cea463806 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }:
+{ lib, stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
   pname = "pixman";
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpng ];
 
-  configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt";
+  configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt";
 
   doCheck = true;
 
   postInstall = glib.flattenInclude;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pixman.org";
     description = "A low-level library for pixel manipulation";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index debb0309e91..4148ca4fc47 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "pkcs11-helper";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/OpenSC/pkcs11-helper";
     license = with licenses; [ bsd3 gpl2 ];
     description = "Library that simplifies the interaction with PKCS#11 providers";
diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix
index 8c8fd4f8fd6..4d7c682f022 100644
--- a/pkgs/development/libraries/pkger/default.nix
+++ b/pkgs/development/libraries/pkger/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Embed static files in Go binaries (replacement for gobuffalo/packr) ";
     homepage = "https://github.com/markbates/pkger";
     changelog = "https://github.com/markbates/pkger/releases/tag/v${version}";
diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix
index 2736de0630f..7a1c3971579 100644
--- a/pkgs/development/libraries/plib/default.nix
+++ b/pkgs/development/libraries/plib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, libGLU, libGL, freeglut, SDL
+{ fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, freeglut, SDL
 , libXi, libSM, libXmu, libXext, libX11 }:
 
 stdenv.mkDerivation rec {
@@ -42,9 +42,9 @@ stdenv.mkDerivation rec {
       GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can.
     '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     homepage = "http://plib.sourceforge.net/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix
index e99ddc3dd08..05f12d0148b 100644
--- a/pkgs/development/libraries/plplot/default.nix
+++ b/pkgs/development/libraries/plplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname   = "plplot";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform scientific graphics plotting library";
     homepage    = "https://plplot.org";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix
index 3bd5aa46be5..01392f232d9 100644
--- a/pkgs/development/libraries/pmdk/default.nix
+++ b/pkgs/development/libraries/pmdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , autoconf, libndctl, pkg-config
 }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     mv $out/lib     $lib/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Persistent Memory Development Kit";
     homepage    = "https://github.com/pmem/pmdk";
     license     = licenses.lgpl21;
diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index f68833bdac4..bb8debbce91 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, autoconf, automake
+{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake
 , libtool, flex, libevent, hwloc, munge, zlib, pandoc
 } :
 
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Process Management Interface for HPC environments";
     homepage = "https://openpmix.github.io/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix
index 7ae7406c989..dfd74e495e7 100644
--- a/pkgs/development/libraries/png++/default.nix
+++ b/pkgs/development/libraries/png++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libpng
+{ lib, stdenv, fetchurl, libpng
 , docSupport ? true, doxygen ? null
 }:
 assert docSupport -> doxygen != null;
@@ -21,21 +21,21 @@ stdenv.mkDerivation rec {
 
   postCheck = "cat test/test.log";
 
-  buildInputs = stdenv.lib.optional docSupport doxygen;
+  buildInputs = lib.optional docSupport doxygen;
 
   propagatedBuildInputs = [ libpng ];
 
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE"
   '' + ''
     sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile
   '';
 
-  makeFlags = stdenv.lib.optional docSupport "docs";
+  makeFlags = lib.optional docSupport "docs";
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nongnu.org/pngpp/";
     description = "C++ wrapper for libpng library";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix
index 71b36cedb81..18d5d0bcfa2 100644
--- a/pkgs/development/libraries/pocketsphinx/default.nix
+++ b/pkgs/development/libraries/pocketsphinx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , sphinxbase
 , pkg-config
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Voice recognition library written in C";
     homepage = "http://cmusphinx.sourceforge.net";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.free;
+    platforms = lib.platforms.linux;
   };
 }
 
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index 1f2d43fce3c..8f963bb366a 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
 
 stdenv.mkDerivation rec {
   pname = "poco";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "-DPOCO_UNBUNDLED=ON"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pocoproject.org/";
     description = "Cross-platform C++ libraries with a network/internet focus";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index ba743bb6053..e50a2111b43 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
+{ lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
 , openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch
 }:
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     moveToOutput lib "$lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://podofo.sourceforge.net";
     description = "A library to work with the PDF file format";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
index a758146d406..0da6e15eb27 100644
--- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "polkit-qt-1-qt4-0.112.0";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
       done
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Qt wrapper around PolKit";
     maintainers = [ maintainers.ttuegel ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix
index 76efca9717b..be425b39401 100644
--- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix
+++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "polkit-qt-1-qt5-0.112.0";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A Qt wrapper around PolKit";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 6382097d398..7e8e95ef1ea 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch
+{ lib, stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch
 , intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus
 , docbook_xml_dtd_412, gtk-doc, coreutils
 , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch";
       sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp";
     })
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     # Make netgroup support optional (musl does not have it)
     # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10
     # We use the version of the patch that Alpine uses successfully.
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     sed -i -e "s/-Wl,--as-needed//" configure.ac
   '';
 
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ expat pam spidermonkey_78 ]
     # On Linux, fall back to elogind when systemd support is off.
-    ++ stdenv.lib.optional stdenv.isLinux (if useSystemd then systemd else elogind)
-    ++ stdenv.lib.optional withIntrospection gobject-introspection;
+    ++ lib.optional stdenv.isLinux (if useSystemd then systemd else elogind)
+    ++ lib.optional withIntrospection gobject-introspection;
 
   propagatedBuildInputs = [
     glib # in .pc Requires
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
       --replace   /bin/true ${coreutils}/bin/true \
       --replace   /bin/false ${coreutils}/bin/false
 
-  '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ ''
+  '' + lib.optionalString useSystemd /* bogus chroot detection */ ''
     sed '/libsystemd autoconfigured/s/.*/:/' -i configure
   '';
 
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
     "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
     (if withIntrospection then "--enable-introspection" else "--disable-introspection")
-  ] ++ stdenv.lib.optional (!doCheck) "--disable-test";
+  ] ++ lib.optional (!doCheck) "--disable-test";
 
   makeFlags = [
     "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0"
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.freedesktop.org/wiki/Software/polkit";
     description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix
index 60d75d340e6..1f0ee81da95 100644
--- a/pkgs/development/libraries/poly2tri-c/default.nix
+++ b/pkgs/development/libraries/poly2tri-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , pkg-config
@@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
     "-Wno-error"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations";
     homepage = "https://code.google.com/archive/p/poly2tri-c/";
     license = licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ jtojnar ];
+    maintainers = with lib.maintainers; [ jtojnar ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
index bc141075973..a49bfad7ab3 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ninja pkg-config ];
 
   # Not sure when and how to pass it.  It seems an upstream bug anyway.
-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
 
   cmakeFlags = [
     (mkFlag true "XPDF_HEADERS")
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 80d5ba19d2b..3f2b8453d7f 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ninja pkg-config ];
 
   # Workaround #54606
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
   '';
 
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index b04a2242ab7..393ef2c2c33 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "popt";
@@ -9,14 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
   };
 
-  patches = stdenv.lib.optionals stdenv.isCygwin [
+  patches = lib.optionals stdenv.isCygwin [
     ./1.16-cygwin.patch
     ./1.16-vpath.patch
   ];
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line option parsing library";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index da4c3933aaa..c7de116e879 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, pkg-config, libjack2
+{ lib, stdenv, fetchurl, alsaLib, pkg-config, libjack2
 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
 
 stdenv.mkDerivation {
@@ -11,15 +11,15 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libjack2 ]
-    ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+    ++ lib.optional (!stdenv.isDarwin) alsaLib;
 
   configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays";
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = lib.optionalString stdenv.isDarwin ''
     sed -i '50 i\
       #include <CoreAudio/AudioHardware.h>\
       #include <CoreAudio/AudioHardwareBase.h>\
@@ -30,14 +30,14 @@ stdenv.mkDerivation {
   # not sure why, but all the headers seem to be installed by the make install
   installPhase = ''
     make install
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     # fixup .pc file to find alsa library
     sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     cp include/pa_mac_core.h $out/include/pa_mac_core.h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Portable cross-platform Audio API";
     homepage    = "http://www.portaudio.com/";
     # Not exactly a bsd license, but alike
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index d96e15edd81..e9a868240bb 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:
+{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:
 
 stdenv.mkDerivation rec {
   pname = "portmidi";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   # XXX: This is to deactivate Java support.
-  patches = stdenv.lib.singleton (fetchurl {
+  patches = lib.singleton (fetchurl {
     url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/"
         + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch";
     sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h";
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://portmedia.sourceforge.net/portmidi/";
     description = "Platform independent library for MIDI I/O";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index f1c93e0fa7c..a94cf9e38d0 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, gmpxx, perl, gnum4 }:
+{ fetchurl, fetchpatch, lib, stdenv, gmpxx, perl, gnum4 }:
 
 let version = "1.2"; in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ gmpxx ];
 
   configureFlags = [ "--disable-watchdog" ] ++
-    stdenv.lib.optionals stdenv.isDarwin [
+    lib.optionals stdenv.isDarwin [
       "CPPFLAGS=-fexceptions"
       "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
     ];
@@ -53,9 +53,9 @@ stdenv.mkDerivation {
 
     homepage = "http://bugseng.com/products/ppl/";
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix
index d40b4442e38..4275622c24f 100644
--- a/pkgs/development/libraries/prison/default.nix
+++ b/pkgs/development/libraries/prison/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }:
+{ lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }:
 
 let v = "1.0"; in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt4 library for QR-codes";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix
index c7a25f62171..93e415f6269 100644
--- a/pkgs/development/libraries/proj-datumgrid/default.nix
+++ b/pkgs/development/libraries/proj-datumgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "proj-datumgrid";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     cp nad2bin $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Repository for proj datum grids";
     homepage = "https://proj4.org";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/proj/5.2.nix b/pkgs/development/libraries/proj/5.2.nix
index 7a97491d8ea..ee76c668716 100644
--- a/pkgs/development/libraries/proj/5.2.nix
+++ b/pkgs/development/libraries/proj/5.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "proj-5.2.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   doCheck = stdenv.is64bit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cartographic Projections Library";
     homepage = "https://proj4.org";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 8618d62e834..22d6206fd85 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "proj";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = stdenv.is64bit;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cartographic Projections Library";
     homepage = "https://proj4.org";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix
index 57f4ef5956f..9b18b25c726 100644
--- a/pkgs/development/libraries/prometheus-client-c/default.nix
+++ b/pkgs/development/libraries/prometheus-client-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -50,9 +50,9 @@ let
       meta = {
         homepage = "https://github.com/digitalocean/prometheus-client-c/";
         inherit description;
-        platforms = stdenv.lib.platforms.unix;
-        license = stdenv.lib.licenses.asl20;
-        maintainers = [ stdenv.lib.maintainers.cfsmp3 ];
+        platforms = lib.platforms.unix;
+        license = lib.licenses.asl20;
+        maintainers = [ lib.maintainers.cfsmp3 ];
       };
     };
 in
diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix
index 3714e2c89e6..173ee6d2e09 100644
--- a/pkgs/development/libraries/prometheus-cpp/default.nix
+++ b/pkgs/development/libraries/prometheus-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , gbenchmark
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Prometheus Client Library for Modern C++";
     homepage = "https://github.com/jupp0r/prometheus-cpp";
-    license = [ stdenv.lib.licenses.mit ];
+    license = [ lib.licenses.mit ];
   };
 
 }
diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix
index 54fea18fd17..431e6348b3f 100644
--- a/pkgs/development/libraries/properties-cpp/default.nix
+++ b/pkgs/development/libraries/properties-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , pkg-config
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtest doxygen graphviz lcov ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/properties-cpp";
     description = "A very simple convenience library for handling properties and signals in C++11";
     license = licenses.lgpl3Only;
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 4166aac7246..f31a7868d5e 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook, zlib, gmock, buildPackages
 , version, sha256
@@ -25,7 +25,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
     chmod -R a+w gmock
     chmod -R a+w googletest
     ln -s ../googletest gmock/gtest
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/google/protobuf/testing/googletest.cc \
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
   '';
@@ -48,8 +48,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
         yet extensible format. Google uses Protocol Buffers for almost all of
         its internal RPC protocols and file formats.
       '';
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
     homepage = "https://developers.google.com/protocol-buffers/";
   };
 
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 32d6f70d1eb..7d64df43626 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, src
+{ lib, stdenv, version, src
 , autoreconfHook, zlib, gtest
 , ...
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     rm -rf gtest
     cp -r ${gtest.src}/googletest gtest
     chmod -R a+w gtest
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/google/protobuf/testing/googletest.cc \
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
   '';
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
       '';
     license = "mBSD";
     homepage = "https://developers.google.com/protocol-buffers/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
   passthru.version = version;
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix
index c9c246f1910..b64d75076ba 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/pkgs/development/libraries/protobufc/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, src, version
+{ lib, stdenv, src, version
 , autoreconfHook, pkg-config, protobuf, zlib
 , ...
 }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ protobuf zlib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/protobuf-c/protobuf-c/";
     description = "C bindings for Google's Protocol Buffers";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix
index 3753dfacac3..81e72036694 100644
--- a/pkgs/development/libraries/prototypejs/default.nix
+++ b/pkgs/development/libraries/prototypejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... }:
+{ lib, stdenv, fetchurl, ... }:
 let
   version = "1.7.3.0";
 in fetchurl {
@@ -6,7 +6,7 @@ in fetchurl {
   url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js";
   sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A foundation for ambitious web user interfaces";
     longDescription = ''
       Prototype takes the complexity out of client-side web
diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix
index 1c8e7e99313..6bff5998b56 100644
--- a/pkgs/development/libraries/protozero/default.nix
+++ b/pkgs/development/libraries/protozero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "protozero";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimalistic protocol buffer decoder and encoder in C++";
     homepage = "https://github.com/mapbox/protozero";
     license = with licenses; [ bsd2 asl20 ];
diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix
index 35c4f7c3b2d..ec2362009ff 100644
--- a/pkgs/development/libraries/pslib/default.nix
+++ b/pkgs/development/libraries/pslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff
+{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     cp -r ../doc/. $doc/share/doc/${pname}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C-library for generating multi page PostScript documents";
     homepage = "http://pslib.sourceforge.net/";
     changelog =
diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix
index c61926fe13f..57784c3a502 100644
--- a/pkgs/development/libraries/psol/generic.nix
+++ b/pkgs/development/libraries/psol/generic.nix
@@ -1,4 +1,4 @@
-{ fetchzip, stdenv }:
+{ fetchzip, lib, stdenv }:
 { version, sha256 }:
 { inherit version; } // fetchzip {
   inherit sha256;
@@ -8,9 +8,9 @@
   meta = {
     description = "PageSpeed Optimization Libraries";
     homepage    = "https://developers.google.com/speed/pagespeed/psol";
-    license     = stdenv.lib.licenses.asl20;
+    license     = lib.licenses.asl20;
     # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux.
     # TODO: Build PSOL from source to support more platforms.
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix
index 43da67d3d9b..82ee5c3ae44 100644
--- a/pkgs/development/libraries/psqlodbc/default.nix
+++ b/pkgs/development/libraries/psqlodbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiodbc, postgresql, openssl }:
+{ lib, stdenv, fetchurl, libiodbc, postgresql, openssl }:
 
 stdenv.mkDerivation rec {
   name = "psqlodbc-09.01.0200";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-iodbc=${libiodbc}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://odbc.postgresql.org/";
     description = "ODBC driver for PostgreSQL";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/development/libraries/pstreams/default.nix
index e3cb9dd67a3..bb9b6bc9c84 100644
--- a/pkgs/development/libraries/pstreams/default.nix
+++ b/pkgs/development/libraries/pstreams/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 }:
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/pstreams/code";
-    rev = let dot2Underscore = stdenv.lib.strings.stringAsChars (c: if c == "." then "_" else c);
+    rev = let dot2Underscore = lib.strings.stringAsChars (c: if c == "." then "_" else c);
           in "RELEASE_${dot2Underscore version}";
     sha256 = "0r8aj0nh5mkf8cvnzl8bdy4nm7i74vs83axxfimcd74kjfn0irys";
   };
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     # `make install` fails on case-insensitive file systems (e.g. APFS by
     # default) because this target exists
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "POSIX Process Control in C++";
     longDescription = ''
       PStreams allows you to run another program from your C++ application and
diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix
index 09b3ce23e08..3f62d672ea9 100644
--- a/pkgs/development/libraries/ptex/default.nix
+++ b/pkgs/development/libraries/ptex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }:
 
 stdenv.mkDerivation rec
 {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec
     echo v${version} >version
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Per-Face Texture Mapping for Production Rendering";
     homepage = "http://ptex.us/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index c64d0b37686..240c903a8a7 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "pth-2.0.7";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
   };
 
-  preConfigure = stdenv.lib.optionalString stdenv.isAarch32 ''
+  preConfigure = lib.optionalString stdenv.isAarch32 ''
     configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
-  '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
+  '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
     configureFlagsArray+=("ac_cv_check_sjlj=ssjlj")
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GNU Portable Threads library";
     homepage = "https://www.gnu.org/software/pth";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 4930b222d03..15000564637 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config }:
+{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libupnp";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = "BSD-style";
 
     homepage = "http://pupnp.sourceforge.net/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix
index 2624c718d27..3acaf8bac15 100644
--- a/pkgs/development/libraries/pxlib/default.nix
+++ b/pkgs/development/libraries/pxlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool }:
+{ lib, stdenv, fetchurl, intltool }:
 
 stdenv.mkDerivation rec {
   pname = "pxlib";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to read and write Paradox files";
     homepage = "http://pxlib.sourceforge.net/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix
index 047142c8a5d..58d38651a76 100644
--- a/pkgs/development/libraries/pyotherside/default.nix
+++ b/pkgs/development/libraries/pyotherside/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , python3, qmake, qtbase, qtquickcontrols, qtsvg, ncurses }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   patches = [ ./qml-path.patch ];
   installTargets = [ "sub-src-install_subtargets" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Asynchronous Python 3 Bindings for Qt 5";
     homepage = "https://thp.io/2011/pyotherside/";
     license = licenses.isc;
diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix
index 6f2550ca9ac..bd778f1a945 100644
--- a/pkgs/development/libraries/python-qt/default.nix
+++ b/pkgs/development/libraries/python-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, qmake,
+{ lib, stdenv, fetchurl, python, qmake,
   qtwebengine, qtxmlpatterns,
   qttools, unzip }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     cp -r ./extensions $out/include/PythonQt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications";
     homepage = "http://pythonqt.sourceforge.net/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index c735b15336a..2b16f0f09b0 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }:
+{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "qca-qt5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   # Without this patch cmake fails with a "No known features for CXX compiler"
   # error on darwin
-  patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ;
+  patches = lib.optional stdenv.isDarwin ./move-project.patch ;
 
   # tells CMake to use this CA bundle file if it is accessible
   preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
   cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt 5 Cryptographic Architecture";
     homepage = "http://delta.affinix.com/qca";
     maintainers = with maintainers; [ ttuegel ];
diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index b637b491387..42dcf1a87d3 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }:
+{ lib, stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }:
 
 stdenv.mkDerivation rec {
   pname = "qca";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ openssl qt ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   # tells CMake to use this CA bundle file if it is accessible
   preConfigure = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt Cryptographic Architecture";
     license = "LGPL";
     homepage = "http://delta.affinix.com/qca";
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix
index 689a4877541..78e11135311 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/pkgs/development/libraries/qhull/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
   name = "qhull-2016.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.qhull.org/";
     description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more";
     license = licenses.qhull;
diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix
index 899f1d1f00b..709a3fb1533 100644
--- a/pkgs/development/libraries/qimageblitz/default.nix
+++ b/pkgs/development/libraries/qimageblitz/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, qt4}:
+{lib, stdenv, fetchurl, cmake, qt4}:
 
 let
   pn = "qimageblitz";
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Graphical effect and filter library for KDE4";
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
     homepage = "http://${pn}.sourceforge.net";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index ee1c36c3244..a6ee272a38b 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt4 }:
+{ lib, stdenv, fetchFromGitHub, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
   version = "0.9.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ qt4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight data-interchange format";
     homepage = "http://qjson.sourceforge.net/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix
index 03247f9d695..88c94543045 100644
--- a/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/pkgs/development/libraries/qmlbox2d/default.nix
@@ -1,4 +1,4 @@
-{stdenv, qtdeclarative, fetchFromGitHub, qmake }:
+{lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }:
 stdenv.mkDerivation {
   name = "qml-box2d-2018-04-06";
   src = fetchFromGitHub {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A QML plugin for Box2D engine";
     homepage = "https://github.com/qml-box2d/qml-box2d";
     maintainers = [ maintainers.guibou ];
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 53e83182c2b..75f95a53800 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }:
 
 stdenv.mkDerivation {
   version = "2018-11-24";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ qtbase qtquick1 qtmultimedia ]
-                ++ stdenv.lib.optional stdenv.isDarwin utmp;
+                ++ lib.optional stdenv.isDarwin utmp;
   nativeBuildInputs = [ qmake ];
 
   patches = [
@@ -35,8 +35,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A QML port of qtermwidget";
     homepage = "https://github.com/Swordfish90/qmltermwidget";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ skeidel ];
+    license = lib.licenses.gpl2;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ skeidel ];
   };
 }
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 41e4b80d9c3..8afa19c229f 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qmake, qca-qt5 }:
+{ lib, stdenv, fetchurl, qtbase, qmake, qca-qt5 }:
 
 stdenv.mkDerivation {
   name = "qoauth-2.0.0";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto";
   NIX_LDFLAGS = "-lqca-qt5";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt library for OAuth authentication";
     inherit (qtbase.meta) platforms;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index a427bd5d051..aba9e77691a 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libjpeg, zlib, perl }:
+{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }:
 
 stdenv.mkDerivation rec {
   pname = "qpdf";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://qpdf.sourceforge.net/";
     description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
     license = licenses.asl20; # as of 7.0.0, people may stay at artistic2
diff --git a/pkgs/development/libraries/qrcodegen/default.nix b/pkgs/development/libraries/qrcodegen/default.nix
index b5faaf90ef7..80ce9e1d0f8 100644
--- a/pkgs/development/libraries/qrcodegen/default.nix
+++ b/pkgs/development/libraries/qrcodegen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "qrcodegen";
   version = "1.6.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     cp qrcodegen.h $out/include/qrcodegen/
   '';
 
-  meta = with stdenv.lib;
+  meta = with lib;
     {
       description = "qrcode generator library in multiple languages";
 
diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix
index 3b4764151e3..c005b835a93 100644
--- a/pkgs/development/libraries/qrencode/default.nix
+++ b/pkgs/development/libraries/qrencode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }:
+{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "qrencode";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+  buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   configureFlags = [
     "--with-tests"
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://fukuchi.org/works/qrencode/";
     description = "C library for encoding data in a QR Code symbol";
 
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index b941021cb68..3e4109b1bf0 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , gfortran
 , blas
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       "LAPACK=-L${lapack}/lib -llapack"
       "BLAS=-L${blas}/lib -lblas"
       "PREFIX=${placeholder "out"}"
-      ${stdenv.lib.optionalString blas.isILP64
+      ${lib.optionalString blas.isILP64
       # If another application intends to use qrupdate compiled with blas with
       # 64 bit support, it should add this to it's FFLAGS as well. See (e.g):
       # https://savannah.gnu.org/bugs/?50339
@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
 
   buildFlags = [ "lib" "solib" ];
 
-  installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ];
+  installTargets = lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ];
 
   buildInputs = [ gfortran ];
 
   nativeBuildInputs = [ which ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for fast updating of qr and cholesky decompositions";
     homepage = "https://sourceforge.net/projects/qrupdate/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 19aebd715d6..26a3c2e36d3 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
       --replace '$$[QT_INSTALL_DATA]'         $out/share${lib.optionalString (! withQt5) "/qt"}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Qt port of the Scintilla text editing library";
     longDescription = ''
       QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index f5837717622..0bc7d938be6 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , xftSupport ? true, libXft ? null
 , xrenderSupport ? true, libXrender ? null
 , xrandrSupport ? true, libXrandr ? null
@@ -6,8 +6,8 @@
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
 , mysqlSupport ? false, libmysqlclient ? null
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, openglSupport ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , libGL ? null, libGLU ? null, libXmu ? null
 , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
 
   configureFlags = let
-    mk = cond: name: "-${stdenv.lib.optionalString (!cond) "no-"}${name}";
+    mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}";
   in [
     "-v"
     "-system-zlib" "-system-libpng" "-system-libjpeg"
@@ -49,21 +49,21 @@ stdenv.mkDerivation {
     (mk xineramaSupport "xinerama")
     (mk xrandrSupport "xrandr")
     (mk xftSupport "xft")
-  ] ++ stdenv.lib.optionals openglSupport [
+  ] ++ lib.optionals openglSupport [
     "-dlopen-opengl"
     "-L${libGL}/lib" "-I${libGLU}/include"
     "-L${libXmu.out}/lib" "-I${libXmu.dev}/include"
-  ] ++ stdenv.lib.optionals xrenderSupport [
+  ] ++ lib.optionals xrenderSupport [
     "-L${libXrender.out}/lib" "-I${libXrender.dev}/include"
-  ] ++ stdenv.lib.optionals xrandrSupport [
+  ] ++ lib.optionals xrandrSupport [
     "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include"
-  ] ++ stdenv.lib.optionals xineramaSupport [
+  ] ++ lib.optionals xineramaSupport [
     "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include"
-  ] ++ stdenv.lib.optionals cursorSupport [
+  ] ++ lib.optionals cursorSupport [
     "-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
-  ] ++ stdenv.lib.optionals mysqlSupport [
+  ] ++ lib.optionals mysqlSupport [
     "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
-  ] ++ stdenv.lib.optionals xftSupport [
+  ] ++ lib.optionals xftSupport [
     "-L${libXft.out}/lib" "-I${libXft.dev}/include"
     "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
     "-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include"
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
 
   passthru = {inherit mysqlSupport;};
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = with licenses; [ gpl2 qpl ];
     platforms = platforms.linux;
   };
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 c92218f9fe5..9ddb2cc5bac 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -4,7 +4,7 @@
 , libmng, which, libGLU, openssl, dbus, cups, pkg-config
 , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
 , alsaLib
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , flashplayerFix ? false, gdk-pixbuf
 , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index ba44a217e3d..60c1d2754d7 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }:
+{ lib, stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }:
 # possible additional dependencies: pulseaudio udev networkmanager immerson qmf
 
 stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qt4 libX11 bluez perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt Mobility";
     homepage = "http://qt.nokia.com/products/qt-addons/mobility";
     maintainers = [ maintainers.qknight ];
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 60eb19ac0c7..6da4abb756e 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null
 , withQt5 ? false, qtbase ? null, qttools ? null
 , darwin ? null
 , libsecret
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
 
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret
+    ++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret
   ;
 
-  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ]
+  buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
     ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ])
-    ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
       CoreFoundation Security
     ])
   ;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Platform-independent Qt API for storing passwords securely";
     homepage = "https://github.com/frankosterfeld/qtkeychain";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix
index ecff7f7f821..3558201015c 100644
--- a/pkgs/development/libraries/qtpbfimageplugin/default.nix
+++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, protobuf }:
+{ lib, stdenv, fetchFromGitHub, qmake, qtbase, protobuf }:
 
 stdenv.mkDerivation rec {
   pname = "qtpbfimageplugin";
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
     # Fix plugin dir
     substituteInPlace pbfplugin.pro \
       --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # Fix darwin build
     substituteInPlace pbfplugin.pro \
       --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt image plugin for displaying Mapbox vector tiles";
     longDescription = ''
       QtPBFImagePlugin is a Qt image plugin that enables applications capable of
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index a6cffd73c3f..0164f8884a2 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4 }:
+{ lib, stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation {
   name = "qtscriptgenerator-0.1.0";
@@ -43,6 +43,6 @@ stdenv.mkDerivation {
     description = "QtScript bindings generator";
     homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/";
     inherit (qt4.meta) platforms;
-    license = stdenv.lib.licenses.lgpl21;
+    license = lib.licenses.lgpl21;
   };
 }
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
index a5c96dc351b..7290b3830d0 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }:
+{ lib, stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }:
 
 stdenv.mkDerivation rec {
   pname = "qtstyleplugin-kvantum-qt4";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     mv $TMP/kvantum/${qt4}/lib $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SVG-based Qt4 theme engine";
     homepage = "https://github.com/tsujan/Kvantum";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 71ca8e720a4..c2fa32b6d05 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
+{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
 , libX11, libXext, qttools, wrapQtAppsHook
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SVG-based Qt5 theme engine plus a config tool and extra themes";
     homepage = "https://github.com/tsujan/Kvantum";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index 7f340ce1eef..84d7f46a2b2 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
 
 mkDerivation {
   name = "qtstyleplugins-2017-03-11";
@@ -15,7 +15,7 @@ mkDerivation {
   nativeBuildInputs = [ pkg-config qmake ];
   buildInputs = [ gtk2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique";
     homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index 9c9352d3c29..c44e8f4fd87 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "qtutilities";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase cpp-utilities ];
   nativeBuildInputs = [ cmake qttools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Martchus/qtutilities";
     description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index d1b921deac0..652c49aa6ca 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
+{ lib, stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
 
 stdenv.mkDerivation {
   name = "qtwebkit-plugins-2017-01-25";
@@ -15,11 +15,11 @@ stdenv.mkDerivation {
   buildInputs = [ qtwebkit hunspell ];
 
   postPatch = ''
-    sed -i "s,-lhunspell,-lhunspell-${stdenv.lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri
+    sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri
     sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit";
     homepage = "https://github.com/QupZilla/qtwebkit-plugins";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index c399298b8f8..3f186314d01 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }:
+{ fetchFromGitHub, lib, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   pname = "quazip";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib qtbase ];
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Provides access to ZIP archives from Qt programs";
     license = licenses.lgpl21Plus;
     homepage = "https://stachenov.github.io/quazip/"; # Migrated from http://quazip.sourceforge.net/
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix
index 6aebb7a6511..1a4fcca9d9b 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/pkgs/development/libraries/quesoglc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }:
+{ lib, stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }:
 stdenv.mkDerivation rec {
   pname = "quesoglc";
   version = "0.7.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ libGLU libGL glew freetype fontconfig fribidi libX11 ];
   # FIXME: Configure fails to use system glew.
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free implementation of the OpenGL Character Renderer";
     longDescription = ''
       QuesoGLC is a free (as in free speech) implementation of the OpenGL
diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix
index e5346b42b9f..28933f96fa1 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/pkgs/development/libraries/quickder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2Packages, hexio
+{ lib, stdenv, fetchFromGitHub, python2Packages, hexio
 , cmake, bash, arpa2cm, git, asn2quickder }:
 
 stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     export PREFIX=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Quick (and Easy) DER, a Library for parsing ASN.1";
     homepage = "https://github.com/vanrein/quick-der";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/development/libraries/quickfix/default.nix
index 5e7300ee19c..6644b9885c2 100644
--- a/pkgs/development/libraries/quickfix/default.nix
+++ b/pkgs/development/libraries/quickfix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "quickfix";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace 'UnitTest++' ' '
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "QuickFIX C++ Fix Engine Library";
     homepage = "http://www.quickfixengine.org";
     license = licenses.free; # similar to BSD 4-clause
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix
index 1a29bb90fbb..edfd3b4e24a 100644
--- a/pkgs/development/libraries/qwt/6.nix
+++ b/pkgs/development/libraries/qwt/6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
+{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qwt-6.1.5";
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
 
   qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt widgets for technical applications";
     homepage = "http://qwt.sourceforge.net/";
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = stdenv.lib.licenses.qwt;
+    license = lib.licenses.qwt;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
     branch = "6";
diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix
index 4b7aa9cf7f9..61903af93fa 100644
--- a/pkgs/development/libraries/qwt/6_qt4.nix
+++ b/pkgs/development/libraries/qwt/6_qt4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, AGL }:
+{ lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }:
 
 stdenv.mkDerivation rec {
   name = "qwt-6.1.5";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     qt4
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AGL ];
+  ] ++ lib.optionals stdenv.isDarwin [ AGL ];
 
   nativeBuildInputs = [ qmake4Hook ];
 
@@ -22,18 +22,18 @@ stdenv.mkDerivation rec {
 
   # qwt.framework output includes a relative reference to itself, which breaks dependents
   preFixup =
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       echo "Attempting to repair qwt"
       install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt"
     '';
 
   qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt widgets for technical applications";
     homepage = "http://qwt.sourceforge.net/";
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = stdenv.lib.licenses.qwt;
+    license = lib.licenses.qwt;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.bjornfor ];
     branch = "6";
diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix
index c206ffdd5db..e158fe34885 100644
--- a/pkgs/development/libraries/qwt/default.nix
+++ b/pkgs/development/libraries/qwt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ lib, stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   name = "qwt-5.2.3";
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
     qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt widgets for technical applications";
     homepage = "http://qwt.sourceforge.net/";
     # LGPL 2.1 plus a few exceptions (more liberal)
-    license = stdenv.lib.licenses.qwt;
+    license = lib.licenses.qwt;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix
index 503e1b14c1f..9d035ce9d89 100644
--- a/pkgs/development/libraries/qxt/default.nix
+++ b/pkgs/development/libraries/qxt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, which, coreutils, fetchzip, qt4 }:
+{ lib, stdenv, which, coreutils, fetchzip, qt4 }:
 
 stdenv.mkDerivation rec {
   pname = "qxt";
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
       classes to add functionality not readily available in the Qt toolkit by Qt
       Development Frameworks, Nokia.
     '';
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ forkk ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ forkk ];
     broken = true;
   };
 }
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
index 7cb29357c49..94a9adcae87 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }:
+{ lib, stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }:
 
 stdenv.mkDerivation rec {
   pname = "rabbitmq-c";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openssl popt xmlto ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "RabbitMQ C AMQP client library";
     homepage = "https://github.com/alanxz/rabbitmq-c";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix
index e84770ec0f5..b649b1d9c11 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }:
+{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "rabbitmq-java-client-3.3.4";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
       --add-flags "-Djava.awt.headless=true -cp $out/share/java/\* com.rabbitmq.examples.PerfTest"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers";
     homepage = "https://www.rabbitmq.com/java-client.html";
     license = with licenses; [ mpl11 gpl2 ];
diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix
index 5d7e94ff0aa..69fa7f6eadc 100644
--- a/pkgs/development/libraries/raft-canonical/default.nix
+++ b/pkgs/development/libraries/raft-canonical/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }:
 
 stdenv.mkDerivation rec {
   pname = "raft-canonical";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Fully asynchronous C implementation of the Raft consensus protocol
     '';
diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix
index 6de7ecdfef3..8e99ca1be35 100644
--- a/pkgs/development/libraries/randomx/default.nix
+++ b/pkgs/development/libraries/randomx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "randomX";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Proof of work algorithm based on random code execution";
     homepage = "https://github.com/tevador/RandomX";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix
index b3d300baca2..79ab52fc835 100644
--- a/pkgs/development/libraries/rang/default.nix
+++ b/pkgs/development/libraries/rang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "rang";
   version = "v3.1.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s";
   };
   nativeBuildInputs = [ cmake ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "A Minimal, Header only Modern c++ library for terminal goodies";
     homepage = "https://agauniyal.github.io/rang/";
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index 47c56aaa1e8..1e9df5be234 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "range-v3";
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
 
   # Building the tests currently fails on AArch64 due to internal compiler
   # errors (with GCC 9.2):
-  cmakeFlags = stdenv.lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
+  cmakeFlags = lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
 
   doCheck = !stdenv.isAarch64;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Experimental range library for C++11/14/17";
     homepage = "https://github.com/ericniebler/range-v3";
     changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}";
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
index 571566909c4..4df98c3026e 100644
--- a/pkgs/development/libraries/rapidcheck/default.nix
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ lib, stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "rapidcheck";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     rm $out/extras/**/CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C++ framework for property based testing inspired by QuickCheck";
     inherit (src.meta) homepage;
     maintainers = with maintainers; [ jb55 ];
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix
index ca072f2ca4b..e5ae16087cb 100644
--- a/pkgs/development/libraries/rapidxml/default.nix
+++ b/pkgs/development/libraries/rapidxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "rapidxml";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cp * $out/include/${pname}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast XML DOM-style parser in C++";
     homepage = "http://rapidxml.sourceforge.net/";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix
index 291454f1410..522456cfa40 100644
--- a/pkgs/development/libraries/rarian/default.nix
+++ b/pkgs/development/libraries/rarian/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
+{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
 let
   pname = "rarian";
   version = "0.8.1";
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.gz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.gz";
     sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
   };
 
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Documentation metadata library based on the proposed Freedesktop.org spec";
     homepage = "https://rarian.freedesktop.org/";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 0da318808f3..2a4f9973bde 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }:
+{ lib, stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "rdkafka";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "librdkafka - Apache Kafka C/C++ client library";
     homepage = "https://github.com/edenhill/librdkafka";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index d36b24d6108..faa576faa0d 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "re2";
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/google/re2";
     description = "An efficient, principled regular expression library";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = with stdenv.lib.platforms; all;
+    license = lib.licenses.bsd3;
+    platforms = with lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix
index 5833ca714e4..b2eab66387f 100644
--- a/pkgs/development/libraries/readline/5.x.nix
+++ b/pkgs/development/libraries/readline/5.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
   name = "readline-5.2";
@@ -10,9 +10,9 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ncurses];
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
+  patches = lib.optional stdenv.isDarwin ./shobj-darwin.patch;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "5";
     platforms = platforms.unix;
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix
index 3f3ca01961d..98db664dd8f 100644
--- a/pkgs/development/libraries/readline/6.2.nix
+++ b/pkgs/development/libraries/readline/6.2.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses
+{ fetchurl, lib, stdenv, ncurses
 }:
 
 stdenv.mkDerivation (rec {
@@ -47,11 +47,11 @@ stdenv.mkDerivation (rec {
 
     homepage = "https://savannah.gnu.org/projects/readline/";
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
     branch = "6.2";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
 
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index 2b0cf978d43..2f63c4a3043 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchurl, lib, stdenv, ncurses }:
 
 stdenv.mkDerivation {
   name = "readline-6.3p08";
@@ -14,14 +14,14 @@ stdenv.mkDerivation {
 
   patchFlags = [ "-p0" ];
 
-  configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+  configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
     # This test requires running host code
     "bash_cv_wcwidth_broken=no";
 
   patches =
     [ ./link-against-ncurses.patch
       ./no-arch_only-6.3.patch
-    ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch
+    ] ++ lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch
     ++
     (let
        patch = nr: sha256:
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
      in
        import ./readline-6.3-patches.nix patch);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for interactive line editing";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 248ef55cce8..25ef4b97a86 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses
+{ fetchurl, lib, stdenv, ncurses
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     ]
     ++ upstreamPatches;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for interactive line editing";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix
index 6e1182647c2..9ea0277467e 100644
--- a/pkgs/development/libraries/readline/8.0.nix
+++ b/pkgs/development/libraries/readline/8.0.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses
+{ fetchurl, lib, stdenv, ncurses
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     ]
     ++ upstreamPatches;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for interactive line editing";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix
index 6aed49d65e3..760546fc471 100644
--- a/pkgs/development/libraries/readosm/default.nix
+++ b/pkgs/development/libraries/readosm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, expat, zlib, geos, libspatialite }:
+{ lib, stdenv, fetchurl, expat, zlib, geos, libspatialite }:
 
 stdenv.mkDerivation rec {
   name = "readosm-1.1.0a";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An open source library to extract valid data from within an Open Street Map input file";
     homepage = "https://www.gaia-gis.it/fossil/readosm";
-    license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix
index ce3ac37895e..bc82e95be71 100644
--- a/pkgs/development/libraries/redkite/default.nix
+++ b/pkgs/development/libraries/redkite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, cairo }:
+{ lib, stdenv, fetchFromGitHub, cmake, cairo }:
 
 stdenv.mkDerivation rec {
   pname = "redkite";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cairo ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gitlab.com/iurie-sw/redkite";
     description = "A small GUI toolkit";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix
index ab35139ce71..618c91421b6 100644
--- a/pkgs/development/libraries/rep-gtk/default.nix
+++ b/pkgs/development/libraries/rep-gtk/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "rep-gtk";
diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix
index 74f4d693569..5b73bc41475 100644
--- a/pkgs/development/libraries/resolv_wrapper/default.nix
+++ b/pkgs/development/libraries/resolv_wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config }:
+{ lib, stdenv, fetchurl, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "resolv_wrapper-1.1.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper for the user, group and hosts NSS API";
     homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix
index cbc564fe230..88a96209993 100644
--- a/pkgs/development/libraries/rlog/default.nix
+++ b/pkgs/development/libraries/rlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "rlog-1.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.arg0.net/rlog";
     description = "A C++ logging library used in encfs";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl3;
   };
 }
diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix
index 3713bcf1df7..a8cd88cae50 100644
--- a/pkgs/development/libraries/rlottie/default.nix
+++ b/pkgs/development/libraries/rlottie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "rlottie";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Samsung/rlottie";
     description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime";
     license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING
diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix
index c359c753388..e68f74e2896 100644
--- a/pkgs/development/libraries/rnnoise-plugin/default.nix
+++ b/pkgs/development/libraries/rnnoise-plugin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, SDL2, fetchFromGitHub, cmake }:
+{ lib, stdenv, SDL2, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "rnnoise-plugin";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A real-time noise suppression plugin for voice based on Xiph's RNNoise";
     homepage = "https://github.com/werman/noise-suppression-for-voice";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix
index 9c0774f925b..a0a068dc142 100644
--- a/pkgs/development/libraries/robin-map/default.nix
+++ b/pkgs/development/libraries/robin-map/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Tessil/robin-map";
     description = "C++ implementation of a fast hash map and hash set using robin hood hashing";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix
index 5e6ce5d6797..9337680f55c 100644
--- a/pkgs/development/libraries/rocclr/default.nix
+++ b/pkgs/development/libraries/rocclr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , rocm-cmake
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       --replace "/build/source/build" "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Radeon Open Compute common language runtime";
     homepage = "https://github.com/ROCm-Developer-Tools/ROCclr";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 12a731385ff..d6f685ff4de 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ];
 
-  buildInputs = stdenv.lib.optional enableJemalloc jemalloc;
+  buildInputs = lib.optional enableJemalloc jemalloc;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move";
 
   cmakeFlags = [
     "-DPORTABLE=1"
@@ -47,17 +47,17 @@ stdenv.mkDerivation rec {
     "-DWITH_GFLAGS=0"
     "-DUSE_RTTI=1"
     "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere
-    (stdenv.lib.optional
+    (lib.optional
         (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.isLinux)
         "-DFORCE_SSE42=1")
-    (stdenv.lib.optional enableLite "-DROCKSDB_LITE=1")
+    (lib.optional enableLite "-DROCKSDB_LITE=1")
     "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}"
-  ] ++ stdenv.lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
+  ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0";
 
   # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
-  hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format";
+  hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://rocksdb.org";
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix
index f8254991013..96f7108e3fe 100644
--- a/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/pkgs/development/libraries/rocm-comgr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }:
+{ lib, stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }:
 
 stdenv.mkDerivation rec {
   pname = "rocm-comgr";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
         -i CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "APIs for compiling and inspecting AMDGPU code objects";
     homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr";
     license = licenses.ncsa;
diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix
index 7c50e375228..965d92179b6 100644
--- a/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/pkgs/development/libraries/rocm-device-libs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , clang
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "-DCLANG=${clang}/bin/clang"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of AMD-specific device-side language runtime libraries";
     homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs";
     license = licenses.ncsa;
diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix
index 5f2188f6e7e..903c238f455 100644
--- a/pkgs/development/libraries/rocm-opencl-icd/default.nix
+++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rocm-opencl-runtime }:
+{ lib, stdenv, rocm-opencl-runtime }:
 
 stdenv.mkDerivation rec {
   pname = "rocm-opencl-icd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCL ICD definition for AMD GPUs using the ROCm stack";
     license = licenses.mit;
     maintainers = with maintainers; [ danieldk ];
diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index ecd9e0f7e82..ab0957474ad 100644
--- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , addOpenGLRunpath
 , cmake
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenCL runtime for AMD GPUs, part of the ROCm stack";
     homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime";
     license = with licenses; [ asl20 mit ];
diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix
index 15435e7914d..beb0c61e683 100644
--- a/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-runtime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , addOpenGLRunpath
 , clang-unwrapped
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/hsa
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Platform runtime for ROCm";
     homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime";
     license = with licenses; [ ncsa ];
diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix
index 535f686f23d..5863e1f0a57 100644
--- a/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/pkgs/development/libraries/rocm-thunk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     cp -r $src/include $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Radeon open compute thunk interface";
     homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface";
     license = with licenses; [ bsd2 mit ];
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
index 5ae66f676d6..e5fb0462683 100644
--- a/pkgs/development/libraries/rote/default.nix
+++ b/pkgs/development/libraries/rote/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "rote";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Our Own Terminal Emulation Library";
     longDescription = ''
       ROTE is a simple C library for VT102 terminal emulation. It allows the
diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix
index b4d9204c226..b0f4f2a567a 100644
--- a/pkgs/development/libraries/rttr/default.nix
+++ b/pkgs/development/libraries/rttr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja }:
+{ lib, stdenv, fetchFromGitHub, cmake, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "rttr";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_PACKAGE=OFF"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ Reflection Library";
     homepage = "https://www.rttr.org";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix
index ca608c52543..7fc8fe98db2 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/pkgs/development/libraries/rubberband/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw
+{ lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw
 , vamp-plugin-sdk, ladspaH }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High quality software library for audio time-stretching and pitch-shifting";
     homepage = "https://breakfastquay.com/rubberband/";
     # commercial license available as well, see homepage. You'll get some more optimized routines
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index e4a3e586614..db18621d8e4 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, path, runtimeShell }:
+{ lib, stdenv, fetchurl, path, runtimeShell }:
 stdenv.mkDerivation rec {
   pname = "safefile";
   version = "1.0.5";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "File open routines to safely open a file when in the presence of an attack";
-    license = stdenv.lib.licenses.asl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.asl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "https://research.cs.wisc.edu/mist/safefile/";
     updateWalker = true;
   };
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 381c58e3f7d..0ff6db17561 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libsndfile }:
+{ lib, stdenv, fetchurl, pkg-config, libsndfile }:
 
 stdenv.mkDerivation rec {
   name = "sbc-1.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libsndfile ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SubBand Codec Library";
     homepage = "http://www.bluez.org/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix
index 91baa8d03b8..c871f18e69b 100644
--- a/pkgs/development/libraries/sblim-sfcc/default.nix
+++ b/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, curl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, curl }:
 
 stdenv.mkDerivation rec {
   pname = "sblim-sfcc";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small Footprint CIM Client Library";
     homepage    = "https://sourceforge.net/projects/sblim/";
     license     = licenses.cpl10;
diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix
index 8d16ae10889..7706366dd6d 100644
--- a/pkgs/development/libraries/schroedinger/default.nix
+++ b/pkgs/development/libraries/schroedinger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation {
   name = "schroedinger-1.0.11";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of the Dirac video codec in ANSI C";
     homepage = "https://sourceforge.net/projects/schrodinger/";
     maintainers = [ maintainers.spwhitt ];
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix
index 00a6e50aa7f..c265f24c182 100644
--- a/pkgs/development/libraries/science/benchmark/papi/default.nix
+++ b/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://icl.utk.edu/papi/";
     description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors";
     license = licenses.bsdOriginal;
diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix
index c60fe31aaaf..b75ac06627f 100644
--- a/pkgs/development/libraries/science/biology/EBTKS/default.nix
+++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc }:
+{ lib, stdenv, fetchFromGitHub, cmake, libminc }:
 
 stdenv.mkDerivation rec {
   pname = "EBTKS";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BIC-MNI/${pname}";
     description = "Library for working with MINC files";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix
index 4cc7dcada52..bc2de6e882f 100644
--- a/pkgs/development/libraries/science/biology/bicgl/default.nix
+++ b/pkgs/development/libraries/science/biology/bicgl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }:
+{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }:
 
 stdenv.mkDerivation rec {
   pname = "bicgl";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "-DBICPL_DIR=${bicpl}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/${owner}/${pname}";
     description = "Brain Imaging Centre graphics library";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix
index 96199f0478e..0bdcbf5a828 100644
--- a/pkgs/development/libraries/science/biology/bicpl/default.nix
+++ b/pkgs/development/libraries/science/biology/bicpl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc, netpbm }:
+{ lib, stdenv, fetchFromGitHub, cmake, libminc, netpbm }:
 
 stdenv.mkDerivation rec {
   pname = "bicpl";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/${owner}/${pname}";
     description = "Brain Imaging Centre programming library";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/development/libraries/science/biology/bpp-core/default.nix
index cfbe19d724b..d1eb096e08e 100644
--- a/pkgs/development/libraries/science/biology/bpp-core/default.nix
+++ b/pkgs/development/libraries/science/biology/bpp-core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "bpp-core";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Main_Page";
     changelog = "https://github.com/BioPP/bpp-core/blob/master/ChangeLog";
     description = "C++ bioinformatics libraries and tools";
diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix
index e55a72fb9f8..55ee5ab4fb6 100644
--- a/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }:
 
 stdenv.mkDerivation rec {
   pname    = "elastix";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake python3 ];
-  buildInputs = [ itk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   doCheck = !stdenv.isDarwin;  # usual dynamic linker issues
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$(pwd)/bin
   ";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://elastix.isi.uu.nl/";
     description = "Image registration toolkit based on ITK";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/development/libraries/science/biology/gifticlib/default.nix
index dddf29fb019..306324129cb 100644
--- a/pkgs/development/libraries/science/biology/gifticlib/default.nix
+++ b/pkgs/development/libraries/science/biology/gifticlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "gifticlib";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nitrc.org/projects/gifti";
     description = "Medical imaging geometry format C API";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 9da6595e7a4..cb3a543ad2a 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
+{ lib, stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "htslib";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for reading/writing high-throughput sequencing data";
     license = licenses.mit;
     homepage = "http://www.htslib.org/";
diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix
index d010e84f712..0d23489696f 100644
--- a/pkgs/development/libraries/science/biology/mirtk/default.nix
+++ b/pkgs/development/libraries/science/biology/mirtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }:
+{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }:
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake gtest ];
   buildInputs = [ boost eigen python vtk zlib tbb ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BioMedIA/MIRTK";
     description = "Medical image registration library and tools";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix
index 572c31dd1e5..fee2ea8772b 100644
--- a/pkgs/development/libraries/science/biology/nifticlib/default.nix
+++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "nifticlib";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://nifti-imaging.github.io";
     description = "Medical imaging format C API";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/development/libraries/science/biology/oobicpl/default.nix
index e5ecda0390b..626e6475ba1 100644
--- a/pkgs/development/libraries/science/biology/oobicpl/default.nix
+++ b/pkgs/development/libraries/science/biology/oobicpl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }:
+{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }:
 
 stdenv.mkDerivation rec {
   pname = "oobicpl";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
                  "-DARGUMENTS_DIR=${arguments}/lib"
                  "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/${owner}/${pname}";
     description = "Brain Imaging Centre object-oriented programming library (and tools)";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index b5fa5c8825e..254ce08dc60 100644
--- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "QuadProgpp";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/liuq/QuadProgpp";
     license = licenses.mit;
     description = ''
diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix
index 9bddba0261f..42c84b3ed61 100644
--- a/pkgs/development/libraries/science/math/amd-blis/default.nix
+++ b/pkgs/development/libraries/science/math/amd-blis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , perl
 , python3
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-cblas"
     "--blas-int-size=${blasIntSize}"
-  ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ]
+  ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ]
     ++ [ withArchitecture ];
 
   postPatch = ''
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
     ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "BLAS-compatible library optimized for AMD CPUs";
     homepage = "https://developer.amd.com/amd-aocl/blas-library/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix
index 1e331bca695..ac35385f983 100644
--- a/pkgs/development/libraries/science/math/amd-libflame/default.nix
+++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/libflame.so.${version} $out/lib/liblapacke.so.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "LAPACK-compatible linear algebra library optimized for AMD CPUs";
     homepage = "https://developer.amd.com/amd-aocl/blas-library/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 0b927bb3eac..382f868a99a 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , gfortran, blas, lapack, eigen }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
-    "-DINTERFACE64=${stdenv.lib.optionalString blas.isILP64 "1"}"
+    "-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}"
   ];
 
   preCheck = if stdenv.isDarwin then ''
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
       A collection of Fortran77 subroutines to solve large scale eigenvalue
       problems.
     '';
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 8408763b4fe..332806c495c 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran }:
+{ lib, stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation rec {
   pname = "blas";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   installPhase =
     # FreeBSD's stdenv doesn't use Coreutils.
     let dashD = if stdenv.isFreeBSD then "" else "-D"; in
-    (stdenv.lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;")
+    (lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;")
     + ''
     install ${dashD} -m755 libblas.a "$out/lib/libblas.a"
     install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}"
@@ -55,7 +55,7 @@ Libs: -L$out/lib -lblas
 EOF
   '';
 
-  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  preFixup = lib.optionalString stdenv.isDarwin ''
     for fn in $(find $out/lib -name "*.so*"); do
       if [ -L "$fn" ]; then continue; fi
       install_name_tool -id "$fn" "$fn"
@@ -64,8 +64,8 @@ EOF
 
   meta = {
     description = "Basic Linear Algebra Subprograms";
-    license = stdenv.lib.licenses.publicDomain;
+    license = lib.licenses.publicDomain;
     homepage = "http://www.netlib.org/blas/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix
index 3943c4dbbca..eb91e0a3d22 100644
--- a/pkgs/development/libraries/science/math/blis/default.nix
+++ b/pkgs/development/libraries/science/math/blis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , perl
 , python3
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-cblas"
     "--blas-int-size=${blasIntSize}"
-  ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ]
+  ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ]
     ++ [ withArchitecture ];
 
   postPatch = ''
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
     ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "BLAS-compatible linear algebra library";
     homepage = "https://github.com/flame/blis";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 0d8e3415e20..870568c9ac9 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , pkg-config
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/BRiAl/BRiAl";
     description = "Legacy version of PolyBoRi maintained by sagemath developers";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index 6b37abf9c69..56c2b70eeac 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -136,8 +136,8 @@ stdenv.mkDerivation rec {
       algorithms. You can bring your creations to scale using the power of GPUs in the
       cloud or to the masses on mobile with Caffe2's cross-platform libraries.
     '';
-    platforms = with stdenv.lib.platforms; linux;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
+    platforms = with lib.platforms; linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ yuriaisaka ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
index c381f56277e..38d1b126ea4 100644
--- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix
+++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }:
+{ lib, stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }:
 stdenv.mkDerivation rec {
   pname = "cholmod-extra";
   version = "1.2.0";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jluttine/cholmod-extra";
     description = "A set of additional routines for SuiteSparse CHOLMOD Module";
     license = with licenses; [ gpl2Plus ];
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix
index a22cf914cf6..aca395001f9 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , gfortran
@@ -41,19 +41,19 @@ stdenv.mkDerivation rec {
     blas
     python
     boost
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     ocl-icd
     opencl-headers
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     Accelerate
     CoreGraphics
     CoreVideo
   ];
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [
     OpenCL
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/clMathLibraries/clBLAS";
     description = "A software library containing BLAS functions written in OpenCL";
     longDescription = ''
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix
index 7fe80c323f6..0d8bafffb44 100644
--- a/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://users.aalto.fi/~pat/cliquer.html";
     downloadPage = src.meta.homepage; # autocliquer
     description = "Routines for clique searching";
diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix
index 2e798a6b83e..60a3afb5077 100644
--- a/pkgs/development/libraries/science/math/clmagma/default.nix
+++ b/pkgs/development/libraries/science/math/clmagma/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }:
+{ lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }:
 
-with stdenv.lib;
+with lib;
 
 let 
   version = "1.3.0";
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
     cp ${incfile} make.inc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port";
     license = licenses.bsd3;
     homepage = "http://icl.cs.utk.edu/magma/index.html";
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index e727218c055..59c0b7f4498 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
     majorVersion = lib.versions.major version;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
     homepage = "https://developer.nvidia.com/cudnn";
     license = licenses.unfree;
diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix
index 2ba69a34a4a..b60bd1fe76c 100644
--- a/pkgs/development/libraries/science/math/ecos/default.nix
+++ b/pkgs/development/libraries/science/math/ecos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "ecos";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     cp -r include $out/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight conic solver for second-order cone programming";
     homepage = "https://www.embotech.com/ECOS";
     downloadPage = "https://github.com/embotech/ecos/releases";
diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix
index 3f88d4de026..e80607ab955 100644
--- a/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/pkgs/development/libraries/science/math/fenics/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , boost
@@ -50,8 +50,8 @@ let
     meta = {
       description = "Distributed just-in-time shared library building";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
 
@@ -80,8 +80,8 @@ let
     meta = {
       description = "Automatic generation of finite element basis functions";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
 
@@ -102,8 +102,8 @@ let
     meta = {
       description = "A domain-specific language for finite element variational forms";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
 
@@ -139,8 +139,8 @@ let
     meta = {
       description = "A compiler for finite element variational forms";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
   dolfin = stdenv.mkDerivation {
@@ -215,7 +215,7 @@ let
     meta = {
       description = "The FEniCS Problem Solving Environment in Python and C++";
       homepage = "https://fenicsproject.org/";
-      license = stdenv.lib.licenses.lgpl3;
+      license = lib.licenses.lgpl3;
     };
   };
   python-dolfin = pythonPackages.buildPythonPackage rec {
@@ -254,8 +254,8 @@ let
     meta = {
       description = "Python bindings for the DOLFIN FEM compiler";
       homepage = "https://fenicsproject.org/";
-      platforms = stdenv.lib.platforms.all;
-      license = stdenv.lib.licenses.lgpl3;
+      platforms = lib.platforms.all;
+      license = lib.licenses.lgpl3;
     };
   };
 in python-dolfin
diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix
index 32fb70978cf..c956eae4f71 100644
--- a/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/pkgs/development/libraries/science/math/flintqs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , gmp
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sagemath/FlintQS";
     description = "Highly optimized multi-polynomial quadratic sieve for integer factorization";
     license = with licenses; [ gpl2 ];
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 97374fb0d47..d1d7a9b9f34 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, blas, lapack, gfortran }:
+{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A software package for large-scale nonlinear optimization";
     homepage = "https://projects.coin-or.org/Ipopt";
     license = licenses.epl10;
diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix
index 90e0a84e1e2..81303a3653e 100644
--- a/pkgs/development/libraries/science/math/itpp/default.nix
+++ b/pkgs/development/libraries/science/math/itpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , gtest
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     ./gtests/itpp_gtests
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions";
     homepage = http://itpp.sourceforge.net/;
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 6f80e1fd23e..95034c3637a 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , pari
@@ -68,13 +68,13 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71";
       sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3";
     })
-  ] ++ stdenv.lib.optional stdenv.isDarwin
+  ] ++ lib.optional stdenv.isDarwin
   (fetchpatch {
     url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch";
     sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18";
   });
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/Makefile --replace g++ c++
   '';
 
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     "PARI_PREFIX=${pari}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html";
     description = "A program for calculating with L-functions";
     license = with licenses; [ gpl2 ];
diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix
index 36d4ad54c3d..cc5d3baf344 100644
--- a/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/pkgs/development/libraries/science/math/libbraiding/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # no tests included for now (2018-08-05), but can't hurt to activate
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/miguelmarco/libbraiding/";
     description = "C++ library for computations on braid groups";
     longDescription = ''
diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix
index 788f534cc77..b756109aa8f 100644
--- a/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/pkgs/development/libraries/science/math/libhomfly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boehmgc
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/miguelmarco/libhomfly/";
     description = "Library to compute the homfly polynomial of knots and links";
     license = licenses.unlicense;
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index c44e995bfbb..c742cc60b27 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   fetchFromGitHub,
   gfortran,
   cmake,
@@ -7,7 +7,7 @@
   shared ? true
 }:
 let
-  inherit (stdenv.lib) optional;
+  inherit (lib) optional;
   version = "3.9.0";
 in
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix
index 49108e5e330..20c5a2070a0 100644
--- a/pkgs/development/libraries/science/math/liblbfgs/default.nix
+++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 stdenv.mkDerivation {
   name = "liblbfgs-1.10";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)";
     homepage = "http://www.chokkan.org/software/liblbfgs/";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index fba8bcb9367..9631f3931ca 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs =
     if stdenv.isDarwin then [ fixDarwinDylibNames ]
     else [ addOpenGLRunpath patchelf ]
-      ++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ];
+      ++ lib.optionals cudaSupport [ addOpenGLRunpath ];
 
   buildInputs = [
     stdenv.cc.cc
@@ -57,9 +57,9 @@ in stdenv.mkDerivation {
 
   postFixup = let
     libPaths = [ stdenv.cc.cc.lib ]
-      ++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ];
-    rpath = stdenv.lib.makeLibraryPath libPaths;
-  in stdenv.lib.optionalString stdenv.isLinux ''
+      ++ lib.optionals cudaSupport [ nvidia_x11 ];
+    rpath = lib.makeLibraryPath libPaths;
+  in lib.optionalString stdenv.isLinux ''
     find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
       echo "setting rpath for $lib..."
       patchelf --set-rpath "${rpath}:$out/lib" "$lib"
@@ -67,7 +67,7 @@ in stdenv.mkDerivation {
         addOpenGLRunpath "$lib"
       ''}
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib
     install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib
     install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib
@@ -110,7 +110,7 @@ in stdenv.mkDerivation {
 
   passthru.tests.cmake = callPackage ./test { };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ API of the PyTorch machine learning framework";
     homepage = "https://pytorch.org/";
     license = licenses.unfree; # Includes CUDA and Intel MKL.
diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix
index b0cfbca5aa3..f7f981e223b 100644
--- a/pkgs/development/libraries/science/math/lrs/default.nix
+++ b/pkgs/development/libraries/science/math/lrs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gmp}:
+{lib, stdenv, fetchurl, gmp}:
 
 stdenv.mkDerivation rec {
   pname = "lrs";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems";
-    license = stdenv.lib.licenses.gpl2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html";
   };
 }
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index f50c15abbdf..26e26e4ffdb 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromBitbucket
 , autoreconfHook
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://malb.bitbucket.io/m4ri/";
     description = "Library to do fast arithmetic with dense matrices over F_2";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix
index 532285991a3..38a633e58c7 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromBitbucket
 , autoreconfHook
 , m4ri
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://malb.bitbucket.io/m4rie/";
     description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10";
     longDescription = ''
diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix
index b4ac119ce6c..b8e3999ffe8 100644
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/pkgs/development/libraries/science/math/magma/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }:
+{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }:
 
-with stdenv.lib;
+with lib;
 
 let version = "2.5.4";
 
@@ -43,7 +43,7 @@ in stdenv.mkDerivation {
         > $out/lib/pkgconfig/magma.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Matrix Algebra on GPU and Multicore Architectures";
     license = licenses.bsd3;
     homepage = "http://icl.cs.utk.edu/magma/index.html";
diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix
index d5861d9db33..b06b432372a 100644
--- a/pkgs/development/libraries/science/math/metis/default.nix
+++ b/pkgs/development/libraries/science/math/metis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, cmake }:
+{ lib, stdenv, fetchurl, unzip, cmake }:
 
 stdenv.mkDerivation {
   name = "metis-5.1.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Serial graph partitioning and fill-reducing matrix ordering";
     homepage = "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix
index 36c53b2994f..7dd52f3b663 100644
--- a/pkgs/development/libraries/science/math/mongoose/default.nix
+++ b/pkgs/development/libraries/science/math/mongoose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graph Coarsening and Partitioning Library";
     homepage = "https://github.com/ScottKolo/Mongoose";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix
index eb194c0e9e4..5036ad89079 100644
--- a/pkgs/development/libraries/science/math/nccl/default.nix
+++ b/pkgs/development/libraries/science/math/nccl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }:
+{ lib, stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
   name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs";
     homepage = "https://developer.nvidia.com/nccl";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 0d83c5c3650..bd7b739bd77 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, which
+{ lib, stdenv, fetchFromGitHub, perl, which
 # 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).
@@ -19,7 +19,7 @@
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
-with stdenv.lib;
+with lib;
 
 let blas64_ = blas64; in
 
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
     NO_BINARY_MODE = if stdenv.isx86_64
         then toString (stdenv.hostPlatform != stdenv.buildPlatform)
         else stdenv.hostPlatform != stdenv.buildPlatform;
-  } // (stdenv.lib.optionalAttrs singleThreaded {
+  } // (lib.optionalAttrs singleThreaded {
     # As described on https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded
     USE_THREAD = false;
     USE_LOCKING = true; # available with openblas >= 0.3.7
@@ -188,14 +188,14 @@ EOF
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+  '' + lib.optionalString stdenv.hostPlatform.isLinux ''
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3
     ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 17197823d6e..2c4198d9679 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "openlibm";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "High quality system independent, portable, open source libm implementation";
     homepage = "https://openlibm.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix
index 3689df60707..a341264d989 100644
--- a/pkgs/development/libraries/science/math/openspecfun/default.nix
+++ b/pkgs/development/libraries/science/math/openspecfun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran }:
+{ lib, stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation {
   name = "openspecfun-0.5.3";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A collection of special mathematical functions";
     homepage = "https://github.com/JuliaLang/openspecfun";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ttuegel ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 0dc77c10c5e..53c117233d2 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
+{ lib, stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
 , lsb-release, glog, protobuf, cbc, zlib
 , ensureNewerSourcesForZipFilesHook, python, swig }:
 
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "python" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/or-tools";
     license = licenses.asl20;
     description = ''
diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix
index aa340b6dafa..b61cd840606 100644
--- a/pkgs/development/libraries/science/math/osi/default.nix
+++ b/pkgs/development/libraries/science/math/osi/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit withGurobi withCplex; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An abstract base class to a generic linear programming (LP) solver";
     homepage = "https://github.com/coin-or/Osi";
     license = licenses.epl10;
diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix
index 9cd062d21f2..00f2726f60f 100644
--- a/pkgs/development/libraries/science/math/osqp/default.nix
+++ b/pkgs/development/libraries/science/math/osqp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A quadratic programming solver using operator splitting";
     homepage = "https://osqp.org";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
index 050e8f1b285..db70bf8dd7a 100644
--- a/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , mpi
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     make config metis_path=$PWD/metis gklib_path=$PWD/metis/GKlib prefix=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices";
     homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index a1e9d1e3051..f06a028fe64 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv , darwin , fetchurl , blas , gfortran , lapack , python }:
+{ lib, stdenv , darwin , fetchurl , blas , gfortran , lapack , python }:
 
 stdenv.mkDerivation rec {
   pname = "petsc";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   prePatch = ''
     substituteInPlace configure \
       --replace /bin/sh /usr/bin/python
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace config/install.py \
       --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
   '';
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       Library of linear algebra algorithms for solving partial differential
       equations
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix
index b1d6a072e13..a257b84ca54 100644
--- a/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/pkgs/development/libraries/science/math/planarity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite";
     description = "A library for implementing graph algorithms";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix
index 46709ff218a..d99026bc565 100644
--- a/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "primesieve";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast C/C++ prime number generator";
     homepage = "https://primesieve.org/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index 53f4313a206..38c9444d0d3 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   # check phase is empty for now (as of version 0.7)
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Calculates rank-width and rank-decompositions";
     license = with licenses; [ gpl2Plus ];
     maintainers = teams.sage.members;
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index 44f8150386e..b4b67088498 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , coreutils
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.sagemath.org/spkg/rubiks";
     description = "Several programs for working with Rubik's cubes";
     # The individual websites are no longer available
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index b4d339f6226..4ef10439cc5 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openssh
+{ lib, stdenv, fetchFromGitHub, cmake, openssh
 , gfortran, mpi, blas, lapack
 } :
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.netlib.org/scalapack/";
     description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index 3820f2b9527..96f543e430f 100644
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }:
+{ lib, stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --replace "gcc" "cc"
   '';
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ blas lapack gfortran.cc.lib ];
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Splitting Conic Solver";
     longDescription = ''
       Numerical optimization package for solving large-scale convex cone problems
diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/development/libraries/science/math/spooles/default.nix
index c55a1b8002e..6f4ddb3f787 100644
--- a/pkgs/development/libraries/science/math/spooles/default.nix
+++ b/pkgs/development/libraries/science/math/spooles/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl }:
+{ lib, stdenv, fetchurl, gfortran, perl }:
 
 stdenv.mkDerivation rec {
   pname = "spooles";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ./spooles.patch
   ];
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace makefile --replace '-Wl,-soname' '-Wl,-install_name'
   '';
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.netlib.org/linalg/spooles/";
     description = "Library for solving sparse real and complex linear systems of equations";
     license = licenses.publicDomain;
diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
index 1c910a4f75b..7696b18e7ca 100644
--- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , gnum4
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     gnum4
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graph algorithms in the language of linear algebra";
     homepage = "http://faculty.cse.tamu.edu/davis/GraphBLAS.html";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index b1c1202c578..b8ce3eca888 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, blas, lapack }:
+{ lib, stdenv, fetchurl, gfortran, blas, lapack }:
 
 let
   int_t = if blas.isILP64 then "int64_t" else "int32_t";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     "LAPACK=-llapack"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html";
     description = "A suite of sparse matrix algorithms";
     license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix
index 81a80c920b5..1ebac6ac445 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, blas, lapack
+{ lib, stdenv, fetchurl, gfortran, blas, lapack
 , enableCuda ? false, cudatoolkit
 }:
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation {
         -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
         -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
   ''
-  + stdenv.lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
         -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
   ''
-  + stdenv.lib.optionalString enableCuda ''
+  + lib.optionalString enableCuda ''
     sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
         -e 's|^[[:space:]]*\(CUDA_ROOT     =\)|CUDA_ROOT = ${cudatoolkit}|' \
         -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     "LAPACK=-llapack"
   ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER";
 
   postInstall = ''
     # Build and install shared library
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
         for i in "$out"/lib/lib*.a; do
           ar -x $i
         done
-        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
+        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"}
     )
     for i in umfpack cholmod amd camd colamd spqr; do
       ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT}
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ gfortran ];
   buildInputs = [ blas lapack ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html";
     description = "A suite of sparse matrix algorithms";
     license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 2e76050aa98..f0c82e7190f 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , gfortran
 , blas, lapack
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-  ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   # Use compatible indexing for lapack and blas used
   buildInputs = assert (blas.isILP64 == lapack.isILP64); [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     gfortran.cc.lib
     gmp
     mpfr
-  ] ++ stdenv.lib.optional enableCuda cudatoolkit;
+  ] ++ lib.optional enableCuda cudatoolkit;
 
   preConfigure = ''
     # Mongoose and GraphBLAS are packaged separately
@@ -45,13 +45,13 @@ stdenv.mkDerivation rec {
     "INSTALL_INCLUDE=${placeholder "dev"}/include"
     "JOBS=$(NIX_BUILD_CORES)"
     "MY_METIS_LIB=-lmetis"
-  ] ++ stdenv.lib.optionals blas.isILP64 [
+  ] ++ lib.optionals blas.isILP64 [
     "CFLAGS=-DBLAS64"
-  ] ++ stdenv.lib.optionals enableCuda [
+  ] ++ lib.optionals enableCuda [
     "CUDA_PATH=${cudatoolkit}"
     "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so"
     "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     # Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
     # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368
     "BLAS=-lblas"
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     "library"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html";
     description = "A suite of sparse matrix algorithms";
     license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix
index 892ccb4da11..26dd00d9606 100644
--- a/pkgs/development/libraries/science/math/superlu/default.nix
+++ b/pkgs/development/libraries/science/math/superlu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake,
+{ lib, stdenv, fetchurl, cmake,
   gfortran, blas, lapack}:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/";
     license = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt";
     description = "A library for the solution of large, sparse, nonsymmetric systems of linear equations";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index a83e2c83546..3c31ed8a361 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , makeWrapper
 , which
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compute special values of symmetric power elliptic curve L-functions";
     license = {
       shortName = "sympow";
diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix
index 3f3e1871f43..d42026c13cf 100644
--- a/pkgs/development/libraries/science/math/tensorflow/bin.nix
+++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix
@@ -1,10 +1,10 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , addOpenGLRunpath
 , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11
 }:
 
-with stdenv.lib;
+with lib;
 let
   broken = !stdenv.isLinux && !stdenv.isDarwin;
 
diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix
index 494c7f9f851..4a90f082dc0 100644
--- a/pkgs/development/libraries/science/networking/ns-3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns-3/default.nix
@@ -33,8 +33,8 @@
 
 let
   pythonEnv = python.withPackages(ps:
-    stdenv.lib.optional withManual ps.sphinx
-    ++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
+    lib.optional withManual ps.sphinx
+    ++ lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
   );
 in
 stdenv.mkDerivation rec {
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     patchShebangs doc/ns3_html_theme/get_version.sh
   '';
 
-  wafConfigureFlags = with stdenv.lib; [
+  wafConfigureFlags = with lib; [
       "--enable-modules=${concatStringsSep "," modules}"
       "--with-python=${pythonEnv.interpreter}"
   ]
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   # to prevent fatal error: 'backward_warning.h' file not found
   CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH";
 
-  postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
+  postBuild = with lib; let flags = concatStringsSep ";" (
       optional enableDoxygen "./waf doxygen"
       ++ optional withManual "./waf sphinx"
     );
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
   # strictoverflow prevents clang from discovering pyembed when bindings
   hardeningDisable = [ "fortify" "strictoverflow"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.nsnam.org";
     license = licenses.gpl3;
     description = "A discrete time event network simulator";
diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix
index 70488426b01..b3eed2e326e 100644
--- a/pkgs/development/libraries/science/robotics/ispike/default.nix
+++ b/pkgs/development/libraries/science/robotics/ispike/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost }:
+{ lib, stdenv, fetchurl, cmake, boost }:
 
 stdenv.mkDerivation rec {
   pname = "ispike";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Spiking neural interface between iCub and a spiking neural simulator";
     homepage = "https://sourceforge.net/projects/ispike/";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.nico202 ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.nico202 ];
   };
 }
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index 0d980d9d1a2..0fcb4884de5 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, patchelf, libusb-compat-0_1}:
+{lib, stdenv, fetchurl, patchelf, libusb-compat-0_1}:
 
 assert stdenv ? cc && stdenv.cc.libc != null;
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html";
     description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix
index f4e5ae37892..c2beda45ab3 100644
--- a/pkgs/development/libraries/scriptaculous/default.nix
+++ b/pkgs/development/libraries/scriptaculous/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec {
   pname = "scriptaculous";
   version = "1.9.0";
 
@@ -14,7 +14,7 @@
     cp src/*.js $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of JavaScript libraries to enhance the user interface of web sites";
     longDescription = ''
       script.aculo.us provides you with
diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix
index 241046b09fe..8c5b4e87d9b 100644
--- a/pkgs/development/libraries/seasocks/default.nix
+++ b/pkgs/development/libraries/seasocks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, python, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "seasocks";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mattgodbolt/seasocks";
     description = "Tiny embeddable C++ HTTP and WebSocket server";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix
index da1749e4785..8ab0f8ef69a 100644
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/pkgs/development/libraries/sentencepiece/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/google/sentencepiece";
     description = "Unsupervised text tokenizer for Neural Network-based text generation";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index bf8c596a795..641a5120e8d 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, python3, wafHook }:
+{ lib, stdenv, fetchurl, pkg-config, python3, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "serd";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config python3 wafHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/serd";
     description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index c83ecaca7c0..dbdc9ce2871 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos
+{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos
 , pkg-config, libiconv }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ];
   buildInputs = [ apr openssl aprutil zlib libiconv ]
-    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
+    ++ lib.optional (!stdenv.isCygwin) kerberos;
 
   patches = [ ./scons.patch ];
 
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
     sconsFlags+=" CC=$CC"
     sconsFlags+=" OPENSSL=${openssl}"
     sconsFlags+=" ZLIB=${zlib}"
-  '' + stdenv.lib.optionalString (!stdenv.isCygwin) ''
+  '' + lib.optionalString (!stdenv.isCygwin) ''
     sconsFlags+=" GSSAPI=${kerberos.dev}"
   '';
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "HTTP client library based on APR";
     license = licenses.asl20;
     maintainers = with maintainers; [ orivej raskin ];
diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix
index 47d4e68f658..d1d9c6299b3 100644
--- a/pkgs/development/libraries/serialdv/default.nix
+++ b/pkgs/development/libraries/serialdv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "serialdv";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link";
     homepage = "https://github.com/f4exb/serialdv";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 7b5e1dcdb2b..c9a326afa7f 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
+{ lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
 , glew, libXrandr, libXrender, udev, xcbutilimage
 , IOKit, Foundation, AppKit, OpenAL
 }:
@@ -18,16 +18,16 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ freetype libjpeg openal flac libvorbis glew ]
-    ++ stdenv.lib.optional stdenv.isLinux udev
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
+    ++ lib.optional stdenv.isLinux udev
+    ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
+    ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
 
   cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
                  "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
                  "-DSFML_BUILD_FRAMEWORKS=no"
                  "-DSFML_USE_SYSTEM_DEPS=yes" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.sfml-dev.org/";
     description = "Simple and fast multimedia library";
     longDescription = ''
diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix
index 40009a8b7c3..7c3fbb9f39e 100644
--- a/pkgs/development/libraries/sfsexp/default.nix
+++ b/pkgs/development/libraries/sfsexp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "sfsexp";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small, fast s-expression library";
     homepage = "http://sexpr.sourceforge.net/";
     maintainers = with maintainers; [ jb55 ];
diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix
index 8fd4987ac70..abb27a132c2 100644
--- a/pkgs/development/libraries/shapelib/default.nix
+++ b/pkgs/development/libraries/shapelib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "shapelib-1.5.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qfsgb8b3yiqwvr6h9m81g6k9fjhfys70c22p7kzkbick20a9h0z";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C Library for reading, writing and updating ESRI Shapefiles";
     homepage = "http://shapelib.maptools.org/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix
index 04b764afc94..0c736e4cb91 100644
--- a/pkgs/development/libraries/shhmsg/default.nix
+++ b/pkgs/development/libraries/shhmsg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "shhmsg-1.4.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "INSTBASEDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for displaying messages";
     homepage = "https://shh.thathost.com/pub-unix/";
     license = licenses.artistic1;
diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix
index 45ec31ca4df..da1b820fcd5 100644
--- a/pkgs/development/libraries/shhopt/default.nix
+++ b/pkgs/development/libraries/shhopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "shhopt-1.1.7";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "INSTBASEDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for parsing command line options";
     homepage = "https://shh.thathost.com/pub-unix/";
     license = licenses.artistic1;
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix
index d6065c925e8..f3b80c0b548 100644
--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }:
+{ lib, stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }:
 
 stdenv.mkDerivation rec {
   pname = "shibboleth-sp";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://shibboleth.net/products/service-provider.html";
     description = "Enables SSO and Federation web applications written with any programming language or framework";
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix
index 77090a19ba3..06cf7587616 100644
--- a/pkgs/development/libraries/silgraphite/default.nix
+++ b/pkgs/development/libraries/silgraphite/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An advanced font engine";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index 60c454bc145..166d0f2911d 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, freetype, cmake, python }:
+{ lib, stdenv, fetchurl, pkg-config, freetype, cmake, python }:
 
 stdenv.mkDerivation rec {
   version = "1.3.14";
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ freetype ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ];
+  patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ];
 
   checkInputs = [ python ];
   doCheck = false; # fails, probably missing something
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An advanced font engine";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix
index 63ad97cbe2b..3a7734b1d51 100644
--- a/pkgs/development/libraries/simdjson/default.nix
+++ b/pkgs/development/libraries/simdjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "simdjson";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     "-DSIMDJSON_JUST_LIBRARY=ON"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://simdjson.org/";
     description = "Parsing gigabytes of JSON per second";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index da25305fc42..2f1006404b7 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi
+{ lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi
 , libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut
 , openscenegraph, openal, expat, cmake, apr
 , curl
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
                   libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut
                   openscenegraph openal expat apr curl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simulation construction toolkit";
     homepage = "https://gitorious.org/fg/simgear";
     maintainers = with maintainers; [ raskin ];
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index e6b013aa137..2ae8b28b64f 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, swig, lua, itk }:
+{ lib, stdenv, fetchFromGitHub, cmake, swig, lua, itk }:
 
 stdenv.mkDerivation rec {
   pname = "simpleitk";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # 2.0.0: linker error building examples
   cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.simpleitk.org";
     description = "Simplified interface to ITK";
     maintainers = with maintainers; [ bcdarwin ];
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 010590b0fcd..a3db5ce0d3b 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , libiconv
 , libpng
 , ncurses
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     pcre
     readline
     zlib
-  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
+  ] ++ lib.optionals (stdenv.isDarwin) [ libiconv ];
 
   propagatedBuildInputs = [ ncurses ];
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small, embeddable multi-platform programming library";
     longDescription = ''
       S-Lang is an interpreted language that was designed from the start to be
diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 401564342b5..47f633f5096 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unzip, scheme, texinfo }:
+{ fetchurl, lib, stdenv, unzip, scheme, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "slib-3b5";
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
     '';
 
     # Public domain + permissive (non-copyleft) licensing of some files.
-    license = stdenv.lib.licenses.publicDomain;
+    license = lib.licenses.publicDomain;
 
     homepage = "http://people.csail.mit.edu/jaffer/SLIB";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix
index d93a59efe6e..7fb6b1adb5a 100644
--- a/pkgs/development/libraries/smarty3-i18n/default.nix
+++ b/pkgs/development/libraries/smarty3-i18n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
   pname = "smarty-i18n";
   version = "1.0";
 
@@ -14,7 +14,7 @@
     cp block.t.php $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "gettext for the smarty3 framework";
     license = licenses.lgpl21;
     homepage = "https://github.com/kikimosha/smarty3-i18n";
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix
index d5708cb6b1e..2070a3bab79 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/pkgs/development/libraries/smarty3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
   pname = "smarty3";
   version = "3.1.36";
 
@@ -14,7 +14,7 @@
     cp -r libs/* $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Smarty 3 template engine";
     longDescription = ''
       Smarty is a template engine for PHP, facilitating the
diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix
index 1b1f590109f..8494799333b 100644
--- a/pkgs/development/libraries/smesh/default.nix
+++ b/pkgs/development/libraries/smesh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade
 , Cocoa }:
 
 stdenv.mkDerivation rec {
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake ninja ];
-  buildInputs = [ opencascade ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extension to OCE providing advanced meshing features";
     homepage = "https://github.com/tpaviot/smesh";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index 335712ac35a..83b4b2193c0 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
+{ lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "smpeg-svn${version}";
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://icculus.org/smpeg/";
     description = "MPEG decoding library";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix
index 270e418174e..d57cc91f26e 100644
--- a/pkgs/development/libraries/smpeg2/default.nix
+++ b/pkgs/development/libraries/smpeg2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , autoconf
 , automake
 , darwin
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ];
 
   buildInputs = [ SDL2 ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+    ++ lib.optional stdenv.isDarwin darwin.libobjc;
 
   preConfigure = ''
     sh autogen.sh
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://icculus.org/smpeg/";
     description = "SDL2 MPEG Player Library";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index e9af9f6d537..4948e481ff5 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -1,6 +1,6 @@
 # alsaLib vorbis-tools python can be made optional
 
-{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
+{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
 
 stdenv.mkDerivation {
   name = "snack-2.2.10";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The Snack Sound Toolkit (Tcl)";
     homepage = "http://www.speech.kth.se/snack/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     broken = true;
   };
 }
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 0880df7ef2f..ece425e85c4 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , static ? stdenv.hostPlatform.isStatic
 }:
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://google.github.io/snappy/";
     license = licenses.bsd3;
     description = "Compression/decompression library for very high speeds";
diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix
index 1f9b77cc3c9..f561864a750 100644
--- a/pkgs/development/libraries/soci/default.nix
+++ b/pkgs/development/libraries/soci/default.nix
@@ -1,7 +1,7 @@
 { cmake
 , fetchFromGitHub
 , sqlite
-, stdenv
+, lib, stdenv
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Database access library for C++";
     homepage = "http://soci.sourceforge.net/";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index d00af92335d..e1ba9dbc1e6 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config }:
+{ lib, stdenv, fetchurl, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "socket_wrapper-1.2.5";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library passing all socket communications through unix sockets";
     homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 8e38b960480..1395f3e60cf 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "sofia-sip";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib openssl ];
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
     homepage = "https://github.com/freeswitch/sofia-sip";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix
index fc45e220a51..38dcee84a92 100644
--- a/pkgs/development/libraries/sonic/default.nix
+++ b/pkgs/development/libraries/sonic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, fftw, installShellFiles }:
 
 stdenv.mkDerivation {
   pname = "sonic-unstable";
@@ -19,11 +19,11 @@ stdenv.mkDerivation {
 
   postInstall = ''
     installManPage sonic.1
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple library to speed up or slow down speech";
     homepage = "https://github.com/waywardgeek/sonic";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 861e1d76c1d..c9debd36110 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
+{ lib, stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
 , pkg-config }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = "http://soprano.sourceforge.net/";
     description = "An object-oriented C++/Qt4 framework for RDF data";
     license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ sander ];
+    maintainers = with lib.maintainers; [ sander ];
     inherit (qt4.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index fba7dd80642..2be6c662145 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkg-config }:
+{ fetchFromGitHub, lib, stdenv, coin3d, qtbase, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "soqt";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/coin3d/soqt";
     license = licenses.bsd3;
     description = "Glue between Coin high-level 3D visualization library and Qt";
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 66803a066b5..befe6a34cd1 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, python3, serd, pcre, wafHook }:
+{ lib, stdenv, fetchurl, pkg-config, python3, serd, pcre, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "sord";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pcre ];
   propagatedBuildInputs = [ serd ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://drobilla.net/software/sord";
     description = "A lightweight C library for storing RDF data in memory";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix
index fe0d93344c0..5ea23aae879 100644
--- a/pkgs/development/libraries/soxt/default.nix
+++ b/pkgs/development/libraries/soxt/default.nix
@@ -1,4 +1,4 @@
-{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }:
+{ fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }:
 
 stdenv.mkDerivation {
   pname = "soxt";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";
     license = licenses.bsd3;
     description = "A GUI binding for using Open Inventor with Xt/Motif";
diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
index ac587f0492b..b3522afdf86 100644
--- a/pkgs/development/libraries/spandsp/3.nix
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
 stdenv.mkDerivation rec {
   version = "3.0.0";
   pname = "spandsp";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A portable and modular SIP User-Agent with audio and video support";
     homepage = "https://github.com/freeswitch/spandsp";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [ ajs124 ];
-    license = stdenv.lib.licenses.gpl2;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [ ajs124 ];
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 1f9834c08f4..85a3059f27b 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, audiofile, libtiff}:
+{lib, stdenv, fetchurl, audiofile, libtiff}:
 stdenv.mkDerivation rec {
   version = "0.0.6";
   pname = "spandsp";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A portable and modular SIP User-Agent with audio and video support";
     homepage = "http://www.creytiv.com/baresip.html";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.gpl2;
+    platforms = with lib.platforms; linux;
+    maintainers = with lib.maintainers; [raskin];
+    license = lib.licenses.gpl2;
     downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
     inherit version;
     updateWalker = true;
diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix
index 6007560a11f..41b765bcb07 100644
--- a/pkgs/development/libraries/sparsehash/default.nix
+++ b/pkgs/development/libraries/sparsehash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "sparsehash-2.0.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/sparsehash/sparsehash";
     description = "An extremely memory-efficient hash_map implementation";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix
index 2e6a7ff2199..ffded04510b 100644
--- a/pkgs/development/libraries/spatialite-tools/default.nix
+++ b/pkgs/development/libraries/spatialite-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }:
+{ lib, stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }:
 
 stdenv.mkDerivation rec {
   name = "spatialite-tools-4.1.1";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A complete sqlite3-compatible CLI front-end for libspatialite";
     homepage = "https://www.gaia-gis.it/fossil/spatialite-tools";
-    license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
index 1b5abe16f37..a0c875079c4 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchFromGitHub
 , fetchpatch
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of libraries for fast user-mode storage";
     homepage = "https://spdk.io/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index fbe7af1825e..1bd73990443 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fmt }:
+{ lib, stdenv, fetchFromGitHub, cmake, fmt }:
 
 let
   generic = { version, sha256 }:
@@ -34,7 +34,7 @@ let
       doCheck = true;
       preCheck = "export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH";
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description    = "Very fast, header only, C++ logging library";
         homepage       = "https://github.com/gabime/spdlog";
         license        = licenses.mit;
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index 771ad033ed9..c54b4a3721f 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, ncurses }:
+{ lib, stdenv, fetchurl, alsaLib, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "speech_tools-${version}.0";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Text-to-speech engine";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index a3c0f7b2ad8..6e8e6948af0 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , substituteAll
 , pkg-config
 , fetchurl
@@ -24,7 +24,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
   inherit (python3Packages) python pyxdg wrapPython;
 
   # speechd hard-codes espeak, even when built without support for it.
@@ -110,7 +110,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common interface to speech synthesis";
     homepage = "https://devel.freebsoft.org/speechd";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index cd48a591307..9633f435fb8 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }:
 
 stdenv.mkDerivation rec {
   name = "speex-1.2.0";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--with-fft=gpl-fftw3"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.speex.org/";
     description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
index 75d8b7fbc93..f87d79ca6e4 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }:
 
 stdenv.mkDerivation rec {
   name = "speexdsp-1.2.0";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-fft=gpl-fftw3"
-  ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon";
+  ] ++ lib.optional stdenv.isAarch64 "--disable-neon";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.speex.org/";
     description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index 40ef2772681..a7d59cd8bf6 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , bison
 , pkg-config
@@ -21,12 +21,12 @@ stdenv.mkDerivation (rec {
   meta = {
     description = "Support Library for Pocketsphinx";
     homepage = "http://cmusphinx.sourceforge.net";
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ];
   };
 
-} // (stdenv.lib.optionalAttrs multipleOutputs {
+} // (lib.optionalAttrs multipleOutputs {
   outputs = [ "out" "lib" "headers" ];
 
   postInstall = ''
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 03066e8990c..3d76e67f67a 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , acl
 , cyrus_sasl
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
     spice-protocol
     usbredir
     zlib
-  ] ++ stdenv.lib.optionals withPolkit [ polkit acl usbutils ] ;
+  ] ++ lib.optionals withPolkit [ polkit acl usbutils ] ;
 
   PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
 
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
     "-Dpulse=disabled" # is deprecated upstream
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GTK 3 SPICE widget";
     longDescription = ''
       spice-gtk is a GTK 3 SPICE widget. It features glib-based
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index cae975b9a58..07b670a2718 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "spice-protocol";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     ln -sv ../share/pkgconfig $out/lib/pkgconfig
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Protocol headers for the SPICE protocol";
     homepage = "https://www.spice-space.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 86aa56f6c30..584b1e15a8e 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     ln -s spice-server $out/include/spice
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Complete open source solution for interaction with virtualized desktop devices";
     longDescription = ''
       The Spice project aims to provide a complete open source solution for interaction
diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix
index 79b8e7c2dda..9d464f7300a 100644
--- a/pkgs/development/libraries/spirv-headers/default.nix
+++ b/pkgs/development/libraries/spirv-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "spirv-headers";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Machine-readable components of the Khronos SPIR-V Registry";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index f40c80391a2..cc5656dcc64 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     installManPage sqlcipher.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.zetetic.net/sqlcipher/";
     description = "SQLite extension that provides 256 bit AES encryption of database files";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index f0bbc93a6f1..fe10e0fc7ae 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
+{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
 
 assert interactive -> readline != null && ncurses != null;
 
-with stdenv.lib;
+with lib;
 
 let
-  archiveVersion = import ./archive-version.nix stdenv.lib;
+  archiveVersion = import ./archive-version.nix lib;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix
index abfb688e461..0828f2f4554 100644
--- a/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/pkgs/development/libraries/sqlite/sqlar.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fuse, zlib }:
+{ lib, stdenv, fetchurl, fuse, zlib }:
 
 stdenv.mkDerivation {
   pname = "sqlar";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     install -D -t $out/bin sqlar sqlarfs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sqlite.org/sqlar";
     description = "SQLite Archive utilities";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index 0eb913adb3b..3ec528719e9 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/pkgs/development/libraries/sqlite/tools.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
+{ lib, stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
 
 let
-  archiveVersion = import ./archive-version.nix stdenv.lib;
+  archiveVersion = import ./archive-version.nix lib;
   mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
     inherit pname;
     version = "3.34.0";
@@ -12,13 +12,13 @@ let
     };
 
     nativeBuildInputs = [ unzip ];
-    buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation;
+    buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation;
 
     makeFlags = [ makeTarget ];
 
     installPhase = "install -Dt $out/bin ${makeTarget}";
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       inherit description homepage;
       downloadPage = http://sqlite.org/download.html;
       license = licenses.publicDomain;
diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix
index 6947c674a91..c8d8fafbf35 100644
--- a/pkgs/development/libraries/srt/default.nix
+++ b/pkgs/development/libraries/srt/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, openssl
+{ lib, stdenv, fetchFromGitHub, cmake, openssl
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "srt";
   version = "1.4.2";
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index 7380838b78e..0dbfef2c639 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, pkg-config
+{ lib, stdenv, fetchFromGitHub, pkg-config
 , openssl ? null, libpcap ? null
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libsrtp";
   version = "2.3.0";
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
index ec9a18ef476..f334bb2f35a 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}:
+{lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}:
 
 let
   version = "0.12";
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.freedesktop.org/software/startup-notification";
     description = "Application startup notification and feedback library";
-    license = stdenv.lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix
index 8e57222ded0..a3020e14d3e 100644
--- a/pkgs/development/libraries/stb/default.nix
+++ b/pkgs/development/libraries/stb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "stb";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp *.h $out/include/stb/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Single-file public domain libraries for C/C++";
     homepage = "https://github.com/nothings/stb";
     license = licenses.publicDomain;
diff --git a/pkgs/development/libraries/stellarsolver/default.nix b/pkgs/development/libraries/stellarsolver/default.nix
index 69417299615..8badf60d942 100644
--- a/pkgs/development/libraries/stellarsolver/default.nix
+++ b/pkgs/development/libraries/stellarsolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, cmake,
+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake,
   qtbase, cfitsio, gsl, wcslib, withTester ? false }:
 
 mkDerivation rec {
@@ -20,7 +20,7 @@ mkDerivation rec {
     "-DBUILD_TESTER=${if withTester then "on" else "off"}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rlancaste/stellarsolver";
     description = "Astrometric plate solving library";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix
index b0da3dbfa27..20676c16b9c 100644
--- a/pkgs/development/libraries/stfl/default.nix
+++ b/pkgs/development/libraries/stfl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, libiconv }:
+{ lib, stdenv, fetchurl, ncurses, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "stfl-0.24";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     sed -i s/gcc/cc/g Makefile
     sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
-  '' + ( stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + ( lib.optionalString stdenv.isDarwin ''
     sed -i s/-soname/-install_name/ Makefile
   '' ) + ''
     make
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = "http://www.clifford.at/stfl/";
     description = "A library which implements a curses-based widget set for text terminals";
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    license     = stdenv.lib.licenses.lgpl3;
-    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [ lovek323 ];
+    license     = lib.licenses.lgpl3;
+    platforms   = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix
index 2d344ab293d..5af77d90053 100644
--- a/pkgs/development/libraries/stlport/default.nix
+++ b/pkgs/development/libraries/stlport/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "STLport-5.2.1";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An implementation of the C++ Standard Library";
     homepage = "https://sourceforge.net/projects/stlport/";
-    license = stdenv.lib.licenses.free; # seems BSD-like
+    license = lib.licenses.free; # seems BSD-like
     broken = true; # probably glibc-2.20 -related issue
   };
 }
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index fead2c8c1a5..eec4f722d41 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ lib, stdenv, fetchurl, cmake
 , parallel ? true
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     inherit parallel;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations";
     homepage = "https://github.com/stxxl/stxxl";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix
index d7dcdd50066..cb824decc6c 100644
--- a/pkgs/development/libraries/subunit/default.nix
+++ b/pkgs/development/libraries/subunit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }:
+{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }:
 
 # NOTE: for subunit python library see pkgs/top-level/python-packages.nix
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   postFixup = "wrapPythonPrograms";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A streaming protocol for test results";
     homepage = "https://launchpad.net/subunit";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index a17b300d6be..f8db8f3c379 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , cmake
 , fetchurl
 , fetchpatch
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python
   ]
-    ++ stdenv.lib.optionals (lapackSupport)
+    ++ lib.optionals (lapackSupport)
     # Check that the same index size is used for both libraries
     (assert (blas.isILP64 == lapack.isILP64); [
       gfortran
@@ -46,16 +46,16 @@ stdenv.mkDerivation rec {
   # KLU support is based on Suitesparse.
   # It is tested upstream according to the section 1.1.4 of
   # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf)
-  ++ stdenv.lib.optionals (kluSupport) [
+  ++ lib.optionals (kluSupport) [
     suitesparse
   ];
 
   cmakeFlags = [
     "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
-  ] ++ stdenv.lib.optionals (lapackSupport) [
+  ] ++ lib.optionals (lapackSupport) [
     "-DENABLE_LAPACK=ON"
     "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
-  ] ++ stdenv.lib.optionals (kluSupport) [
+  ] ++ lib.optionals (kluSupport) [
     "-DENABLE_KLU=ON"
     "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
     "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Suite of nonlinear differential/algebraic equation solvers";
     homepage    = "https://computation.llnl.gov/projects/sundials";
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix
index c7320f7722b..fbc17a5e7b2 100644
--- a/pkgs/development/libraries/svrcore/default.nix
+++ b/pkgs/development/libraries/svrcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, nss, nspr }:
+{ lib, stdenv, fetchurl, pkg-config, nss, nspr }:
 
 stdenv.mkDerivation rec {
   pname = "svrcore";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ nss nspr ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Secure PIN handling using NSS crypto";
     license = licenses.mpl11;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index 2fe20cc9e88..980d034682f 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, fetchurl, openssl, boost, sconsPackages }:
+{ lib, stdenv, python, fetchurl, openssl, boost, sconsPackages }:
 stdenv.mkDerivation rec {
   pname = "swiften";
   version = "4.0.2";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An XMPP library for C++, used by the Swift client";
     homepage    = "http://swift.im/swiften.html";
     license     = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix
index 3631b8b4fe7..2c508a3735f 100644
--- a/pkgs/development/libraries/swiftshader/default.nix
+++ b/pkgs/development/libraries/swiftshader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }:
+{ lib, stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "swiftshader";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "A high-performance CPU-based implementation of the Vulkan, OpenGL ES, and Direct3D 9 graphics APIs";
     homepage = "https://opensource.google/projects/swiftshader";
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 54c2b6fae0d..35c1e6e15e2 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, icu, clucene_core, curl }:
+{ lib, stdenv, fetchurl, pkg-config, icu, clucene_core, curl }:
 
 stdenv.mkDerivation rec {
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "-DU_USING_ICU_NAMESPACE=1"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A software framework that allows research manipulation of Biblical texts";
     homepage = "http://www.crosswire.org/sword/";
     longDescription = ''
diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix
index f294c887b0c..9d86017e084 100644
--- a/pkgs/development/libraries/sycl-info/default.nix
+++ b/pkgs/development/libraries/sycl-info/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , installShellFiles
 , cmake
@@ -40,13 +40,13 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTING=ON"
     "-DBUILD_DOCS=ON"
     "-DBUILD_SHARED_LIBS=ON"
-    "-DLYRA_INCLUDE_DIRS=${stdenv.lib.getDev lyra}/include"
+    "-DLYRA_INCLUDE_DIRS=${lib.getDev lyra}/include"
   ];
 
   # Required for ronn to compile the manpage.
   RUBYOPT = "-KU -E utf-8:utf-8";
 
-  meta = with stdenv.lib;
+  meta = with lib;
     {
       homepage = "https://github.com/codeplaysoftware/sycl-info";
       description = "Tool to show information about available SYCL implementations";
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index cc3abd80d6f..3a3f5c79763 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , gmp
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     ctest
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast symbolic manipulation library";
     homepage = "https://github.com/symengine/symengine";
     platforms = platforms.unix ++ platforms.windows;
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 4f11f42de52..f6d0c619c77 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "szip";
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Compression library that can be used with the hdf5 library";
     homepage = "https://www.hdfgroup.org/doc_resource/SZIP/";
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 7d42abc6ea1..495993a64ab 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libX11, libXaw }:
+{ lib, stdenv, fetchurl, fetchpatch, libX11, libXaw }:
 
 let
   getPatch = { name, sha256 }: fetchpatch {
@@ -28,9 +28,9 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXaw ];
   buildFlags = [ "without_doc" ];
 
-  postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
+  postInstall = lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A type 1 font rasterizer library for UNIX/X11";
     homepage = "http://www.t1lib.org/";
     license = with licenses; [ gpl2 lgpl2 ];
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 90aa62d946f..f536442295e 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , Carbon ? null
 , libjpeg ? null
@@ -18,19 +18,19 @@ stdenv.mkDerivation rec {
     url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
     sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
   };
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isDarwin [
     Carbon
-  ] ++ stdenv.lib.optionals withJpegSupport [
+  ] ++ lib.optionals withJpegSupport [
     libjpeg
-  ] ++ stdenv.lib.optionals withPngSupport [
+  ] ++ lib.optionals withPngSupport [
     libpng
   ];
   preBuild = ''
     cd unix
-  '' + stdenv.lib.optionalString withJpegSupport ''
+  '' + lib.optionalString withJpegSupport ''
     export USEJPEG=" -DUSEJPEG"
     export JPEGLIB=" -ljpeg"
-  '' + stdenv.lib.optionalString withPngSupport ''
+  '' + lib.optionalString withPngSupport ''
     export USEPNG=" -DUSEPNG"
     export PNGLIB=" -lpng -lz"
   '';
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     ./make-archs.patch
   ] ++
   # Ensure looks for nix-provided Carbon, not system frameworks
-  stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
+  lib.optional stdenv.isDarwin ./darwin.patch;
 
   installPhase = ''
     cd ../compile/${arch}
@@ -67,9 +67,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A Parallel / Multiprocessor Ray Tracing System";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin;
+    license = lib.licenses.bsd3;
+    maintainers = [lib.maintainers.raskin];
+    platforms = with lib.platforms; linux ++ cygwin ++ darwin;
     homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/";
   };
 }
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index b667e604740..44e107693c9 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, taglib}:
+{lib, stdenv, fetchurl, cmake, taglib}:
 
 stdenv.mkDerivation rec {
   name = "taglib-extras-1.0.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Additional taglib plugins";
     platforms = platforms.unix;
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix
index fe1bc5fcd59..78a4026455e 100644
--- a/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/pkgs/development/libraries/taglib-sharp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }:
 
 stdenv.mkDerivation rec {
   pname = "taglib-sharp";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-docs" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing metadata in media files";
     homepage = "https://github.com/mono/taglib-sharp";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index 28373605a6b..3fcfaa12339 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchpatch
+{ lib, stdenv, fetchurl, cmake, fetchpatch
 , zlib
 }:
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://taglib.org/";
     repositories.git = "git://github.com/taglib/taglib.git";
     description = "A library for reading and editing audio file metadata";
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index fa920d037a9..553c42da7c4 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python3
 , pkg-config
@@ -43,7 +43,7 @@ stdenv.mkDerivation (rec {
   ];
 
   # this must not be exported before the ConfigurePhase otherwise waf whines
-  preBuild = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''
     export NIX_CFLAGS_LINK="-no-pie -shared";
   '';
 
@@ -51,13 +51,13 @@ stdenv.mkDerivation (rec {
     ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hierarchical pool based memory allocator with destructors";
     homepage = "https://tdb.samba.org/";
     license = licenses.gpl3;
     platforms = platforms.all;
   };
-} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
+} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
   # python-config from build Python gives incorrect values when cross-compiling.
   # If python-config is not found, the build falls back to using the sysconfig
   # module, which works correctly when cross-compiling.
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 264b34125a8..2047b0d5bc2 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
+{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
 
-with stdenv.lib; stdenv.mkDerivation rec {
+with lib; stdenv.mkDerivation rec {
   pname = "tbb";
   version = "2019_U9";
 
@@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
   makeFlags = optional (compiler != null) "compiler=${compiler}"
     ++ optional (stdver != null) "stdver=${stdver}";
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix
index 22fd7b11681..451f17a2cd7 100644
--- a/pkgs/development/libraries/tclap/default.nix
+++ b/pkgs/development/libraries/tclap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tclap-1.2.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://tclap.sourceforge.net/";
     description = "Templatized C++ Command Line Parser Library";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 2cb65b9c698..4cab15ca5c2 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl }:
+{ lib, stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "tcllib";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://sourceforge.net/projects/tcllib/";
     description = "Tcl-only library of standard routines for Tcl";
-    license = stdenv.lib.licenses.tcltk;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.tcltk;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix
index c26394f6cd5..e88358bbce0 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/pkgs/development/libraries/tcltls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, openssl }:
+{ lib, stdenv, fetchurl, tcl, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "tcltls";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://tls.sourceforge.net/";
     description = "An OpenSSL / RSA-bsafe Tcl extension";
-    license = stdenv.lib.licenses.tcltk;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.tcltk;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix
index 5d4727a1831..85eae730575 100644
--- a/pkgs/development/libraries/tclx/default.nix
+++ b/pkgs/development/libraries/tclx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl }:
+{ lib, stdenv, fetchurl, tcl }:
 
 stdenv.mkDerivation rec {
   name = "tclx-${version}.${patch}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://tclx.sourceforge.net/";
     description = "Tcl extensions";
-    license = stdenv.lib.licenses.tcltk;
-    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
+    license = lib.licenses.tcltk;
+    maintainers = with lib.maintainers; [ kovirobi ];
   };
 }
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index b8e6552bc7b..658bdb2f9d5 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , wafHook
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     "--builtin-libraries=replace"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The trivial database";
     longDescription = ''
       TDB is a Trivial Database. In concept, it is very much like GDBM,
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 1a36a68a33b..895faa8847a 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
+{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   version = "1.7.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gperf openssl readline zlib ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform library for building Telegram clients";
     homepage = "https://core.telegram.org/tdlib/";
     license = [ licenses.boost ];
diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix
index a47f39be10a..6d8a334ce3f 100644
--- a/pkgs/development/libraries/tecla/default.nix
+++ b/pkgs/development/libraries/tecla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tecla-1.6.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     description = "Command-line editing library";
     license = "as-is";
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.peti ];
   };
 }
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index a30d8d01c49..2885f3cbb12 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }:
+{ lib, stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-0.6.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call";
     homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index ec9dfab120f..8bb7522b197 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
+{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
 , gobject-introspection, vala, glibcLocales }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   passthru.python = python2;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://telepathy.freedesktop.org";
     platforms = platforms.unix;
     license = with licenses; [ bsd2 bsd3 lgpl21Plus ];
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 888d98b957f..b606c56445e 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
+{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
 , telepathy-farstream, telepathy-glib, fetchpatch }:
 
 let
@@ -18,11 +18,11 @@ in stdenv.mkDerivation rec {
 
   # No point in building tests if they are not run
   # On 0.9.7, they do not even build with QT4
-  cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
+  cmakeFlags = lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
 
   doCheck = false; # giving up for now
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Telepathy Qt bindings";
     homepage = "https://telepathy.freedesktop.org/components/telepathy-qt/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix
index 0c4fd9da147..2c89e3f433a 100644
--- a/pkgs/development/libraries/template-glib/default.nix
+++ b/pkgs/development/libraries/template-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
 let
   version = "3.34.0";
   pname = "template-glib";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1";
   };
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for template expansion which supports calling into GObject Introspection from templates";
     homepage = "https://gitlab.gnome.org/GNOME/template-glib";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix
index 77cf9fd0247..d9d74081735 100644
--- a/pkgs/development/libraries/tepl/default.nix
+++ b/pkgs/development/libraries/tepl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , meson
 , ninja
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6";
   };
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gnome3.updateScript { packageName = pname; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Tepl";
     description = "Text editor product line";
     maintainers = teams.gnome.members ++ [ maintainers.manveru ];
diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix
index 22082f7198f..e809240bcd1 100644
--- a/pkgs/development/libraries/termbox/default.nix
+++ b/pkgs/development/libraries/termbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "termbox";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python3 wafHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for writing text-based user interfaces";
     license = licenses.mit;
     homepage = "https://github.com/nsf/termbox#readme";
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index 2d5fd0564ba..568751f48aa 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , python3
 , pkg-config
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     "--builtin-libraries=replace"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An event system based on the talloc memory management library";
     homepage = "https://tevent.samba.org/";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 85dc2c75afb..3d39075dd26 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "0.4.5";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       --replace "/usr/local" "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C library for property-based testing";
     homepage    = "https://github.com/silentbicycle/theft/";
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix
index 25da474099c..a735e146214 100644
--- a/pkgs/development/libraries/thrift/0.10.nix
+++ b/pkgs/development/libraries/thrift/0.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison
+{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison
 , flex, twisted
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-tests=no" ];
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for scalable cross-language services";
     homepage = "http://thrift.apache.org/";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index 5a9547a959f..669dff21147 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config
+{ lib, stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config
 , bison, flex, twisted
 , static ? stdenv.hostPlatform.isStatic
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config bison flex ];
   buildInputs = [ boost zlib libevent openssl ]
-    ++ stdenv.lib.optionals (!static) [ python twisted ];
+    ++ lib.optionals (!static) [ python twisted ];
 
   preConfigure = "export PY_PREFIX=$out";
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     # FIXME: Fails to link in static mode with undefined reference to
     # `boost::unit_test::unit_test_main(bool (*)(), int, char**)'
     "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}"
-  ] ++ stdenv.lib.optionals static [
+  ] ++ lib.optionals static [
     "-DWITH_STATIC_LIB:BOOL=ON"
     "-DOPENSSL_USE_STATIC_LIBS=ON"
   ];
@@ -44,13 +44,13 @@ stdenv.mkDerivation rec {
   checkPhase = ''
     runHook preCheck
 
-    ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket
+    ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket
 
     runHook postCheck
   '';
   enableParallelChecking = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for scalable cross-language services";
     homepage = "http://thrift.apache.org/";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 3d163ef6ded..044c09a5bc4 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
+{ fetchurl, lib, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
   pname = "libtirpc";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/projects/libtirpc/";
     description = "The transport-independent Sun RPC implementation (TI-RPC)";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix
index 37b093c8e2e..20de3d7f2b8 100644
--- a/pkgs/development/libraries/ticpp/default.nix
+++ b/pkgs/development/libraries/ticpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Interface to TinyXML";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/wxFormBuilder/ticpp";
   };
 
diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
index f75b8cb0151..5c0ad8463b4 100644
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/pkgs/development/libraries/tidyp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tidyp-1.04";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A program that can validate your HTML, as well as modify it to be more clean and standard";
     homepage = "http://tidyp.com/";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix
index 6f561eac04e..372b0e74b06 100644
--- a/pkgs/development/libraries/timezonemap/default.nix
+++ b/pkgs/development/libraries/timezonemap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , autoreconfHook
 , fetchbzr
 , pkg-config
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     sed "s|/usr/share/libtimezonemap|$out/share/libtimezonemap|g" -i ./src/tz.h
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://launchpad.net/timezonemap";
     description = "A GTK+3 Timezone Map Widget";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/tinycbor/default.nix b/pkgs/development/libraries/tinycbor/default.nix
index 62f2a807185..d03e20cb7e2 100644
--- a/pkgs/development/libraries/tinycbor/default.nix
+++ b/pkgs/development/libraries/tinycbor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "tinycbor";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Concise Binary Object Representation (CBOR) Library";
     homepage = "https://github.com/intel/tinycbor";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix
index 92eb5b3d8f4..c7939a6be25 100644
--- a/pkgs/development/libraries/tinyobjloader/default.nix
+++ b/pkgs/development/libraries/tinyobjloader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tinyobjloader/tinyobjloader";
     description = "Tiny but powerful single file wavefront obj loader";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix
index 310b5a447c7..1e2eea7ac89 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/pkgs/development/libraries/tinyxml-2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "tinyxml-2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple, small, efficient, C++ XML parser";
     homepage = "http://www.grinninglizard.com/tinyxml2/index.html";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.zlib;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.zlib;
   };
 }
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index 7b6b0f9390e..e8c5dd1dacd 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 let
   version = "2.6.2";
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
 
   NIX_CFLAGS_COMPILE =
-    stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
+    lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
 
   nativeBuildInputs = [ unzip ];
   buildPhase = ''
@@ -67,14 +67,14 @@ in stdenv.mkDerivation {
     cp -v tinyxml.pc $out/lib/pkgconfig/
 
     cp -v docs/* $out/share/doc/tinyxml/
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib
   '';
 
   meta = {
     description = "Simple, small, C++ XML parser that can be easily integrating into other programs";
     homepage = "http://www.grinninglizard.com/tinyxml/index.html";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
index 52fffb42aa2..e0f91330efc 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/pkgs/development/libraries/tix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, tk, fetchpatch } :
+{ lib, stdenv, fetchurl, tcl, tk, fetchpatch } :
 
 stdenv.mkDerivation {
   version = "8.4.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
     sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj";
     })
-  ] ++ stdenv.lib.optional (tcl.release == "8.6")
+  ] ++ lib.optional (tcl.release == "8.6")
   (fetchpatch {
     name = "tix-8.4.3-tcl8.6.patch";
     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     "--libdir=\${prefix}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A widget library for Tcl/Tk";
     homepage    = "http://tix.sourceforge.net/";
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
index c30f9a81947..fdffbeba2c9 100644
--- a/pkgs/development/libraries/tk/8.6.nix
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, tcl, stdenv, ... } @ args:
+{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args:
 
 callPackage ./generic.nix (args // {
 
@@ -7,6 +7,6 @@ callPackage ./generic.nix (args // {
     sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg";
   };
 
-  patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
+  patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
 
 })
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index 1d04ce5a1b9..57dc3dac2d0 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -21,15 +21,15 @@ stdenv.mkDerivation {
     cp ../{unix,generic}/*.h $out/include
     ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary}
   ''
-  + stdenv.lib.optionalString (stdenv.isDarwin) ''
+  + lib.optionalString (stdenv.isDarwin) ''
     cp ../macosx/*.h $out/include
   '';
 
   configureFlags = [
     "--enable-threads"
     "--with-tcl=${tcl}/lib"
-  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"
-    ++ stdenv.lib.optional enableAqua "--enable-aqua";
+  ] ++ lib.optional stdenv.is64bit "--enable-64bit"
+    ++ lib.optional enableAqua "--enable-aqua";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]);
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     libdir = "lib/${libPrefix}";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
     homepage = "https://www.tcl.tk/";
     license = licenses.tcltk;
diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix
index e91c42c884c..4915fd7e700 100644
--- a/pkgs/development/libraries/tl-expected/default.nix
+++ b/pkgs/development/libraries/tl-expected/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "tl-expected-unstable";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++11/14/17 std::expected with functional-style extensions";
     homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html";
     license = licenses.cc0;
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 93b760bc88f..932239a485f 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
   pname = "tnt";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://math.nist.gov/tnt/";
     description = "Template Numerical Toolkit: C++ headers for array and matrices";
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.publicDomain;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index ff14c8c3305..a21a71b89bf 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
+{ lib, stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "tntdb";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.tntnet.org/tntdb.html";
     description = "C++ library which makes accessing SQL databases easy and robust";
     platforms = platforms.linux ;
diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix
index 332750d7694..a80b923e235 100644
--- a/pkgs/development/libraries/tntnet/default.nix
+++ b/pkgs/development/libraries/tntnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
+{ lib, stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
 
 stdenv.mkDerivation rec {
   pname = "tntnet";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.tntnet.org/tntnet.html";
     description = "Web server which allows users to develop web applications using C++";
     platforms = platforms.linux ;
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix
index b8969588b3c..22d3266b93a 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib, bzip2 }:
+{ fetchurl, lib, stdenv, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "tokyocabinet-1.4.48";
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
          robustness, supports 64-bit architecture.
       '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix
index e970fb6786c..e5aeae6aae0 100644
--- a/pkgs/development/libraries/tokyo-tyrant/default.nix
+++ b/pkgs/development/libraries/tokyo-tyrant/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, tokyocabinet, pkg-config }:
+{ fetchurl, lib, stdenv, tokyocabinet, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "tokyotyrant-1.1.41";
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
 
     homepage = "https://fallabs.com/tokyotyrant/";
 
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
 
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;         # arbitrary choice
+    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;         # arbitrary choice
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix
index 27498fdaaf8..c93ec8dccf9 100644
--- a/pkgs/development/libraries/totem-pl-parser/default.nix
+++ b/pkgs/development/libraries/totem-pl-parser/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "totem-pl-parser";
   version = "3.26.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection ];
   buildInputs = [ libxml2 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Apps/Videos";
     description = "Simple GObject-based library to parse and save a host of playlist formats";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index dc6d30061d6..2ca5dd6bd93 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , substituteAll
 , asciidoc
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   version = "3.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6";
   };
 
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Tracker";
     description = "Desktop-neutral user information store, search tool and indexer";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index f883268cc28..38885048fcc 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , gettext
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr";
   };
 
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://wiki.gnome.org/Projects/Tracker";
     description = "Desktop-neutral user information store, search tool and indexer";
     maintainers = teams.gnome.members;
diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix
index 80806848846..e515dd1673f 100644
--- a/pkgs/development/libraries/tre/default.nix
+++ b/pkgs/development/libraries/tre/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch}:
+{lib, stdenv, fetchurl, fetchpatch}:
 
 stdenv.mkDerivation rec {
   name = "tre-0.8.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight and robust POSIX compliant regexp matching library";
     homepage = "https://laurikari.net/tre/";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix
index f7ac1a57f4a..16e1a78d396 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/pkgs/development/libraries/tremor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }:
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }:
 
 stdenv.mkDerivation {
   name = "tremor-unstable-2018-03-16";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://xiph.org/tremor/";
     description = "Fixed-point version of the Ogg Vorbis decoder";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix
index 929627f3e1b..800b3564011 100644
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "trompeloeil";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Header only C++14 mocking framework";
     homepage = "https://github.com/rollbear/trompeloeil";
     license = licenses.boost;
diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix
index f2018286a3e..728c6e71f7f 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "tsocks";
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
       -e "/SAVE/d" Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Transparent SOCKS v4 proxying library";
     homepage = "http://tsocks.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = with maintainers; [ edwtjo phreedom ];
     platforms = platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix
index f2de470288d..c1737f6f017 100644
--- a/pkgs/development/libraries/tweeny/default.nix
+++ b/pkgs/development/libraries/tweeny/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modern C++ tweening library";
     license = licenses.mit;
     homepage = "http://mobius3.github.io/tweeny";
diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix
index 6ccd853de0a..3537dd3029b 100644
--- a/pkgs/development/libraries/twolame/default.nix
+++ b/pkgs/development/libraries/twolame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook, pkg-config
 , libsndfile }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found"
 
-  meta = with stdenv.lib;{
+  meta = with lib;{
     description = "A MP2 encoder";
     longDescription = ''
       TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on
diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix
index 1f7124411ac..db947d373a2 100644
--- a/pkgs/development/libraries/ubus/default.nix
+++ b/pkgs/development/libraries/ubus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchgit, libubox, libjson }:
+{ lib, stdenv, cmake, fetchgit, libubox, libjson }:
 
 stdenv.mkDerivation {
   pname = "ubus";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ libubox libjson ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenWrt system message/RPC bus";
     homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix
index 951e62cae0d..0a5af8b907b 100644
--- a/pkgs/development/libraries/uci/default.nix
+++ b/pkgs/development/libraries/uci/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchgit, pkg-config, libubox }:
+{ lib, stdenv, cmake, fetchgit, pkg-config, libubox }:
 
 stdenv.mkDerivation {
   pname = "uci";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ libubox ];
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenWrt Unified Configuration Interface";
     homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix
index f25a6313752..43f7ddf63af 100644
--- a/pkgs/development/libraries/ucl/default.nix
+++ b/pkgs/development/libraries/ucl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "ucl-1.03";
@@ -8,12 +8,12 @@ stdenv.mkDerivation {
   };
 
   # needed to successfully compile with gcc 6
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=c90";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c90";
 
   meta = {
     homepage = "http://www.oberhumer.com/opensource/ucl/";
     description = "Portable lossless data compression library";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 5b1af300bab..7cfd9f1edf5 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config
+{ lib, stdenv, fetchurl, pkg-config
 , openssl ? null, zlib ? null, gnutls ? null
 }:
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ library to facilitate using C++ design patterns";
     homepage = "https://www.gnu.org/software/commoncpp/";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix
index a4120b7ba43..fae81276878 100644
--- a/pkgs/development/libraries/ucx/default.nix
+++ b/pkgs/development/libraries/ucx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, doxygen
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen
 , numactl, rdma-core, libbfd, libiberty, perl, zlib
 }:
 
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Unified Communication X library";
     homepage = "http://www.openucx.org";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix
index 41fb6e7abff..fc0b4a42b55 100644
--- a/pkgs/development/libraries/udns/default.nix
+++ b/pkgs/development/libraries/udns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 # this expression is mostly based on debian's packaging
 # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   # keep man3
   outputDevdoc = "out";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.corpit.ru/mjt/udns.html";
     description = "Async-capable DNS stub resolver library";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index 6b75b7e683f..deed5b64d2c 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook,
   texinfo, bison, flex, expat, file
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook texinfo bison flex file ];
   buildInputs = [ expat ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.unidata.ucar.edu/software/udunits/";
     description = "A C-based package for the programatic handling of units of physical quantities";
     license = licenses.bsdOriginal;
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index 62c105f3b90..ec7626a7e8b 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkg-config }:
+{ lib, stdenv, fetchurl, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "uid_wrapper-1.2.8";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper for the user, group and hosts NSS API";
     homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 5050650635f..d27adb2a061 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , docbook_xsl
 , fetchurl
 , glib
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     mv docs/reference $doc/share/doc/umockdev/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mock hardware devices for creating unit tests";
     license = licenses.lgpl2;
     maintainers = with maintainers; [ flokli ];
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index da5dc2fed7a..f5fd4f82bae 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
+    ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   nativeBuildInputs = [ pkg-config perl ];
   buildInputs = [ libtool ncurses ];
diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index 87ca28fee98..17e91f7e236 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }:
+{ lib, stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }:
 
 stdenv.mkDerivation rec {
   pname = "libunicap";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Universal video capture API";
     homepage = "http://www.unicap-imaging.org/";
     maintainers = [ maintainers.raskin ];
diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix
index ce3dfa24faa..7f768d9631b 100644
--- a/pkgs/development/libraries/unicorn/default.nix
+++ b/pkgs/development/libraries/unicorn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , pkg-config
 , cmake
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight multi-platform CPU emulator library";
     homepage = "http://www.unicorn-engine.org";
     license = licenses.gpl2Only;
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix
index 17b64d99971..d185d32c816 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/pkgs/development/libraries/unittest-cpp/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchFromGitHub, cmake}:
+{lib, stdenv, fetchFromGitHub, cmake}:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "unittest-cpp";
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "Lightweight unit testing framework for C++";
     license = licenses.mit;
     maintainers = [];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index a4fcac2a358..8b2558c0850 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "unixODBC";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ODBC driver manager for Unix";
     homepage = "http://www.unixodbc.org/";
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 04aa7e6c685..edbe51998c3 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -19,7 +19,7 @@
       driver = "lib/psqlodbcw.so";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Official PostgreSQL ODBC Driver";
       homepage =  "https://odbc.postgresql.org/";
       license = licenses.lgpl2;
@@ -60,7 +60,7 @@
       driver = if stdenv.isDarwin then "lib/libmaodbc.dylib" else "lib/libmaodbc.so";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "MariaDB ODBC database driver";
       homepage =  "https://downloads.mariadb.org/connector-odbc/";
       license = licenses.gpl2;
@@ -88,7 +88,7 @@
       driver = "lib/libmyodbc3-3.51.12.so";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "MariaDB ODBC database driver";
       homepage = "https://dev.mysql.com/downloads/connector/odbc/";
       license = licenses.gpl2;
@@ -123,7 +123,7 @@
       driver = "lib/libsqlite3odbc.so";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "ODBC driver for SQLite";
       homepage = "http://www.ch-werner.de/sqliteodbc";
       license = licenses.bsd2;
@@ -166,7 +166,7 @@
       driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "ODBC Driver 17 for SQL Server";
       homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017";
       license = licenses.unfree;
diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix
index 9d0ab386856..c0e405c8849 100644
--- a/pkgs/development/libraries/unqlite/default.nix
+++ b/pkgs/development/libraries/unqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://unqlite.org/";
     description = "Self-contained, serverless, zero-conf, transactional NoSQL DB library";
     longDescription = ''
diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix
index c96629072f9..48a80aacdf5 100644
--- a/pkgs/development/libraries/uri/default.nix
+++ b/pkgs/development/libraries/uri/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen }:
+{ lib, stdenv, fetchFromGitHub, cmake, doxygen }:
 
 stdenv.mkDerivation rec {
   name = "uri-${version}";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ URI library";
     homepage = "https://cpp-netlib.org";
-    license = stdenv.lib.licenses.boost;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.boost;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index a12f040bf49..ad171998480 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ gtest ];
   doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://uriparser.github.io/";
     description = "Strictly RFC 3986 compliant URI parsing library";
     longDescription = ''
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 159296facc4..0313b8c81ef 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libusb1 }:
+{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
 
 stdenv.mkDerivation rec {
   pname = "usbredir";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "USB traffic redirection protocol";
     homepage = "https://www.spice-space.org/usbredir.html";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index b6bb02d56e4..2b04d8c0c5b 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "ustr";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     find $out/lib -name \*debug\* -delete
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.and.org/ustr/";
     description = "Micro String API for C language";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix
index ef02ca2c313..e627b97849a 100644
--- a/pkgs/development/libraries/utf8cpp/default.nix
+++ b/pkgs/development/libraries/utf8cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "utf8cpp";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/nemtrif/utfcpp";
     description = "UTF-8 with C++ in a Portable Way";
     license = licenses.free;
diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index ea455e2c92c..b78999e96a7 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "utf8proc";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A clean C library for processing UTF-8 Unicode data";
     homepage = "https://juliastrings.github.io/utf8proc/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix
index d2c5b6ab11d..7ddae062f76 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 let
   version = "2.1.0";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     cp ./src/* "$out/include/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A hash table for C structures";
     homepage    = "http://troydhanson.github.io/uthash";
     license     = licenses.bsd2; # it's one-clause, actually, as it's source-only
diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix
index 050abe9e81b..441a5559b52 100644
--- a/pkgs/development/libraries/v8/5_x.nix
+++ b/pkgs/development/libraries/v8/5_x.nix
@@ -151,11 +151,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which ];
   buildInputs = [ readline python icu ]
-    ++ stdenv.lib.optional stdenv.isDarwin xcbuild
-    ++ stdenv.lib.optional stdenv.isLinux patchelf;
+    ++ lib.optional stdenv.isDarwin xcbuild
+    ++ lib.optional stdenv.isLinux patchelf;
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes"
-    + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture";
+    + lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture";
 
   buildFlags = [
     "LINK=c++"
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 40c551d826a..c79073f04e4 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     chmod u+w -R .
   '';
 
-  postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+  postPatch = lib.optionalString stdenv.isAarch64 ''
     substituteInPlace build/toolchain/linux/BUILD.gn \
       --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
   '';
@@ -95,14 +95,14 @@ stdenv.mkDerivation rec {
     # ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
     ''host_toolchain="//build/toolchain/linux/unbundle:default"''
     ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
-  ] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
+  ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
 
   # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit
   # to be exceeded
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
 
   nativeBuildInputs = [ gn ninja pkg-config python ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
+    ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
   buildInputs = [ glib icu ];
 
   ninjaFlags = [ ":d8" "v8_monolith" ];
diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
index c9dba3d00c9..00e9a2042b7 100644
--- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
+++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:
 
 stdenv.mkDerivation rec {
   pname = "intel-hybrid-driver";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://01.org/linuxmedia";
     description = "Intel driver for the VAAPI library with partial HW acceleration";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 81edb9caea0..f21a947a533 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3
 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext
 , enableHybridCodec ? false, vaapi-intel-hybrid
 }:
@@ -17,23 +17,23 @@ stdenv.mkDerivation rec {
   # Set the correct install path:
   LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri";
 
-  postInstall = stdenv.lib.optionalString enableHybridCodec ''
+  postInstall = lib.optionalString enableHybridCodec ''
     ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/
   '';
 
   configureFlags = [
     "--enable-x11"
     "--enable-wayland"
-  ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec";
+  ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec";
 
   nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ];
 
   buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]
-    ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid;
+    ++ lib.optional enableHybridCodec vaapi-intel-hybrid;
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://01.org/linuxmedia";
     license = licenses.mit;
     description = "VA-API user mode driver for Intel GEN Graphics family";
diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix
index 66f6b1c6fa5..fd38eba7397 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }:
+{ lib, stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "libva-vdpau-driver";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver";
     license = licenses.gpl2Plus;
     description = "VDPAU driver for the VAAPI library";
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index 024976e0b0f..76ce9a36c71 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook,
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook,
   vapoursynth, nasm, fftwFloat
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A set of filters for motion estimation and compensation";
     homepage = "https://github.com/dubhater/vapoursynth-mvtools";
     license  = licenses.gpl2;
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 58ed50f9bd9..93f8d3c5ae5 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper
 , zimg, libass, python3, libiconv
 , ApplicationServices
 , ocrSupport ?  false, tesseract ? null
@@ -8,7 +8,7 @@
 assert ocrSupport   -> tesseract != null;
 assert imwriSupport -> imagemagick7 != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
         --prefix PYTHONPATH : $out/${python3.sitePackages}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A video processing framework with the future in mind";
     homepage    = "http://www.vapoursynth.com/";
     license     = licenses.lgpl21;
diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix
index 196c700af17..76b50a10907 100644
--- a/pkgs/development/libraries/vapoursynth/editor.nix
+++ b/pkgs/development/libraries/vapoursynth/editor.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromBitbucket
+{ lib, stdenv, mkDerivation, fetchFromBitbucket
 , python3, vapoursynth
 , qmake, qtbase, qtwebsockets
 }:
@@ -10,7 +10,7 @@ mkDerivation rec {
   src = fetchFromBitbucket {
     owner = "mystery_keeper";
     repo = pname;
-    rev = stdenv.lib.toLower version;
+    rev = lib.toLower version;
     sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n";
   };
 
@@ -33,7 +33,7 @@ mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross-platform editor for VapourSynth scripts";
     homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index 119254107e9..dd5b03f2dc5 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "Vc";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for multiprecision complex arithmetic with exact rounding";
     homepage = "https://github.com/VcDevel/Vc";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index d3673e783cd..40347940ff0 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "Vc";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for multiprecision complex arithmetic with exact rounding";
     homepage = "https://github.com/VcDevel/Vc";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix
index a8a24750744..380f533fe6f 100644
--- a/pkgs/development/libraries/vcg/default.nix
+++ b/pkgs/development/libraries/vcg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, eigen }:
+{ lib, stdenv, fetchFromGitHub, eigen }:
 
 stdenv.mkDerivation rec {
   pname = "vcg";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     find $out -name \*.h -exec sed -i 's,<eigenlib/,<eigen3/,g' {} \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://vcg.isti.cnr.it/vcglib/install.html";
     description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix
index 2921719e755..d224c2f3be5 100644
--- a/pkgs/development/libraries/vid-stab/default.nix
+++ b/pkgs/development/libraries/vid-stab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, openmp }:
+{ lib, stdenv, fetchFromGitHub, cmake, openmp }:
 
 stdenv.mkDerivation rec {
   pname = "vid.stab";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ openmp ];
+  buildInputs = lib.optionals stdenv.cc.isClang [ openmp ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Video stabilization library";
     homepage = "http://public.hronopik.de/vid.stab/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 7bff0981e76..56402172d9f 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase
+{ lib, stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase
 , libjpeg, libpng, libtiff, openexr, python2Packages }:
 
 let
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   version = "1.11.1";
 
   src = fetchurl {
-    url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz";
+    url = "https://github.com/ukoethe/vigra/archive/Version-${lib.replaceChars ["."] ["-"] version}.tar.gz";
     sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj";
   };
 
@@ -28,13 +28,13 @@ in stdenv.mkDerivation rec {
   preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
 
   cmakeFlags = [ "-DWITH_OPENEXR=1" ]
-            ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
+            ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
                   [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
 
   # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory"
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Novel computer vision C++ library with customizable algorithms and data structures";
     homepage = "https://hci.iwr.uni-heidelberg.de/vigra";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index fd39d8b30bd..38688d90246 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3
+{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3
 , libGLU, epoxy, libX11, libdrm, mesa
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering";
     homepage = "https://virgil3d.github.io/";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix
index a28f63cd3c4..3f33df66339 100644
--- a/pkgs/development/libraries/vmime/default.nix
+++ b/pkgs/development/libraries/vmime/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub
+{lib, stdenv, fetchFromGitHub
 , gsasl, gnutls, pkg-config, cmake, zlib, libtasn1, libgcrypt, gtk3
 # this will not work on non-nixos systems
 , sendmailPath ? "/run/wrappers/bin/sendmail"
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.vmime.org/";
     description = "Free mail library for C++";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix
index a5eb2c83f94..4aa525feb19 100644
--- a/pkgs/development/libraries/vmmlib/default.nix
+++ b/pkgs/development/libraries/vmmlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, lapack
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, lapack
 , Accelerate, CoreGraphics, CoreVideo
 }:
 
@@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ boost lapack ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
+    ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
 
   doCheck = !stdenv.isDarwin;
 
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A vector and matrix math library implemented using C++ templates";
 
     longDescription = ''vmmlib is a vector and matrix math library implemented
diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix
index 9f35bf4ad84..dccbd1349d2 100644
--- a/pkgs/development/libraries/vo-amrwbenc/default.nix
+++ b/pkgs/development/libraries/vo-amrwbenc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 let
     version = "0.1.3";
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://sourceforge.net/projects/opencore-amr/";
     description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.Esteth ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.Esteth ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index 85736b79b1f..567a5e3e251 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3
 , ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme
 , autoconf, automake, libtool
 , buildPackages
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
 
   doCheck = false; # fails 1 out of 1 tests, needs `certutil`
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool";
     homepage = "https://pagure.io/volume_key/";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix
index a85e27d42b7..1ebc37cdf2f 100644
--- a/pkgs/development/libraries/vrb/default.nix
+++ b/pkgs/development/libraries/vrb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "vrb";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     cp -p vrb/man/man3/*.3 $out/share/man/man3/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A virtual ring buffer library written in C";
     license     = licenses.lgpl21;
     homepage    = "http://vrb.sourceforge.net/";
diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix
index 85d6fba459d..f9eed6b2f74 100644
--- a/pkgs/development/libraries/vrpn/default.nix
+++ b/pkgs/development/libraries/vrpn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }:
 
 stdenv.mkDerivation rec {
   name    = "${pname}-${date}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # FIXME: test failure
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Virtual Reality Peripheral Network";
     longDescription = ''
       The Virtual-Reality Peripheral Network (VRPN) is a set of classes
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix
index a4c9cb556b9..6981de6aa07 100644
--- a/pkgs/development/libraries/vsqlite/default.nix
+++ b/pkgs/development/libraries/vsqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, sqlite }:
+{ lib, stdenv, fetchurl, boost, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "vsqlite";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost sqlite ];
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.in \
         --replace '-Wl,--as-needed' "" \
         --replace '-Wl,-soname -Wl,libvsqlitepp.so.3' \
                   "-Wl,-install_name,$out/lib/libvsqlitepp.3.dylib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://vsqlite.virtuosic-bytes.com/";
     description = "C++ wrapper library for sqlite";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix
index 6b65014103e..4a9e4d8a66c 100644
--- a/pkgs/development/libraries/vte/2.90.nix
+++ b/pkgs/development/libraries/vte/2.90.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }:
+{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   versionMajor = "0.36";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnome.org/";
     description = "A library implementing a terminal emulator widget for GTK";
     longDescription = ''
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 2ccc07c67a2..9f2722a9ae8 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3";
   };
 
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     patchShebangs src/box_drawing_generate.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnome.org/";
     description = "A library implementing a terminal emulator widget for GTK";
     longDescription = ''
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 154ed9deb49..f065b83bcc8 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
   version = "1.2.162.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "057c49w1138l02v9gqsk1z8wdz0iilp96jblnldycwm9jc1a1ipq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Vulkan Header files and API registry";
     homepage    = "https://www.lunarg.com";
     platforms   = platforms.linux;
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index d84587b00d2..c833d770aea 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config
+{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config
 , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "LunarG Vulkan loader";
     homepage    = "https://www.lunarg.com";
     platforms   = platforms.linux;
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix
index b6543b2e6cf..6858cd93ab3 100644
--- a/pkgs/development/libraries/vxl/default.nix
+++ b/pkgs/development/libraries/vxl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
 stdenv.mkDerivation {
   name = "vxl-1.17.0-nix1";
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     # BUILD_BRL fails to find open()
     "-DBUILD_BRL=OFF"
     "-DBUILD_CONTRIB=OFF"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
+  ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
     "-DCMAKE_CXX_FLAGS=-fPIC"
     "-DCMAKE_C_FLAGS=-fPIC"
   ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     description = "C++ Libraries for Computer Vision Research and Implementation";
     homepage = "http://vxl.sourceforge.net/";
     license = "VXL License";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix
index 0f1e36b3579..dd783036f23 100644
--- a/pkgs/development/libraries/waffle/default.nix
+++ b/pkgs/development/libraries/waffle/default.nix
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libGL
-  ] ++ stdenv.lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [
+  ] ++ lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [
     libglvnd
-  ] ++ stdenv.lib.optionals x11Support [
+  ] ++ lib.optionals x11Support [
     libX11
     libxcb
-  ] ++ stdenv.lib.optionals waylandSupport [
+  ] ++ lib.optionals waylandSupport [
     wayland
-  ] ++ stdenv.lib.optionals useGbm [
+  ] ++ lib.optionals useGbm [
     mesa
     libudev
   ];
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/wflinfo \
-      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]}
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix
index bca025d622a..f8142f046b7 100644
--- a/pkgs/development/libraries/wasilibc/default.nix
+++ b/pkgs/development/libraries/wasilibc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WASI libc implementation for WebAssembly";
     homepage    = "https://wasi.dev";
     platforms   = platforms.wasi;
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 78794430860..41f3076dbe9 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiconv }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "wavpack";
@@ -6,14 +6,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
 
   src = fetchurl {
     url = "http://www.wavpack.com/${pname}-${version}.tar.bz2";
     sha256 = "00baiag7rlkzc6545dqdp4p5sr7xc3n97n7qdkgx58c544x0pw5n";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Hybrid audio compression format";
     homepage    = "http://www.wavpack.com/";
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix
index d528d51ed79..0aa77b771e4 100644
--- a/pkgs/development/libraries/waylandpp/default.nix
+++ b/pkgs/development/libraries/waylandpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -13,7 +13,7 @@
 
 assert docSupport -> doxygen != null;
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "waylandpp";
   version = "0.2.8";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
   ];
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Wayland C++ binding";
     homepage = "https://github.com/NilsBrause/waylandpp/";
     license = with licenses; [ bsd2 hpnd ];
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 2b3414df1a4..c12118a99de 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl,  stdenv, flex }:
+{ fetchurl,  lib, stdenv, flex }:
 
 stdenv.mkDerivation rec {
   version = "7.3.1";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     systems. This is the standard library for this purpose in
     astronomy.'';
 
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 0a58e997c22..1abfd3a9194 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , perl
 , python3
@@ -57,7 +57,7 @@
 
 assert enableGeoLocation -> geoclue2 != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     ./libglvnd-headers.patch
   ];
 
-  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     # Ignore gettext in cmake_prefix_path so that find_program doesn't
     # pick up the wrong gettext. TODO: Find a better solution for
     # this, maybe make cmake not look up executables in
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     python3
     ruby
     glib # for gdbus-codegen
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ lib.optionals stdenv.isLinux [
     wayland # for wayland-scanner
   ];
 
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix
index 91d93352da1..efd2ce3b1fc 100644
--- a/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, darwin }:
+{ lib, stdenv, fetchurl, darwin }:
 
 stdenv.mkDerivation rec {
   name = "webrtc-audio-processing-0.3.1";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]);
+  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]);
 
-  patchPhase = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  patchPhase = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
     description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix
index d04cadb483b..5c9271f2a85 100644
--- a/pkgs/development/libraries/websocket++/default.nix
+++ b/pkgs/development/libraries/websocket++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "websocket++";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.zaphoyd.com/websocketpp/";
     description = "C++/Boost Asio based websocket client/server library";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix
index ea63a73fc92..880823a8473 100644
--- a/pkgs/development/libraries/wildmidi/default.nix
+++ b/pkgs/development/libraries/wildmidi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, alsaLib, freepats }:
+{ lib, stdenv, fetchurl, cmake, alsaLib, freepats }:
 
 stdenv.mkDerivation rec {
   name = "wildmidi-0.4.3";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software MIDI player and library";
     longDescription = ''
       WildMIDI is a simple software midi player which has a core softsynth
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 9a7cee6623e..7b636e984de 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool
+{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool
 
 # Optional Dependencies
 , lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null
 , gperftools ? null, leveldb ? null
 }:
 
-with stdenv.lib;
+with lib;
 let
   mkFlag = trueStr: falseStr: cond: name: val: "--"
     + (if cond then trueStr else falseStr)
@@ -14,7 +14,7 @@ let
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
 
   optLz4 = shouldUsePkg lz4;
   optSnappy = shouldUsePkg snappy;
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 13132c8cc1c..a21179e2025 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
 , libGL, wayland-protocols, libinput, libxkbcommon, pixman
 , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
 , libpng, ffmpeg
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modular Wayland compositor library";
     longDescription = ''
       Pluggable, composable, unopinionated modules for building a Wayland
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 30fc90ec8c0..c0c0218a318 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "wolfssl";
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
      mkdir -p "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
     homepage    = "https://www.wolfssl.com/";
     platforms   = platforms.all;
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = with maintainers; [ mcmtroffaes ];
   };
 }
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index de98a11d68e..8887c4410f4 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu
+{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu
 , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
 , pcre, harfbuzz
 }:
@@ -28,16 +28,16 @@ let
         "-DWT_CPP_11_MODE=-std=c++11"
         "--no-warn-unused-cli"
       ]
-      ++ stdenv.lib.optionals (graphicsmagick != null) [
+      ++ lib.optionals (graphicsmagick != null) [
         "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
         "-DGM_PREFIX=${graphicsmagick}"
       ]
-      ++ stdenv.lib.optional (harfbuzz != null)
+      ++ lib.optional (harfbuzz != null)
         "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
-      ++ stdenv.lib.optional (libmysqlclient != null)
+      ++ lib.optional (libmysqlclient != null)
         "-DMYSQL_PREFIX=${libmysqlclient}";
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         homepage = "https://www.webtoolkit.eu/wt";
         description = "C++ library for developing web applications";
         platforms = platforms.linux;
diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix
index d66a628dac7..9ddc95a9ccc 100644
--- a/pkgs/development/libraries/wtk/default.nix
+++ b/pkgs/development/libraries/wtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, unzip, xorg }:
+{ lib, stdenv, requireFile, unzip, xorg }:
 
 assert stdenv.hostPlatform.system == "i686-linux";
 
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://java.sun.com/products/sjwtoolkit/download.html";
     description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC";
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index 0ababf305c8..5e7f7b71fbe 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , pkg-config, wxGTK
 , ffmpeg_3, libexif
 , cairo, pango }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cairo pango ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A SVG manipulation library built with wxWidgets";
     longDescription = ''
     wxSVG is C++ library to create, manipulate and render
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index db5e91b74d6..8acd4e99636 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , wxGTK
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   buildInputs = [ wxGTK sqlite ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://utelle.github.io/wxsqlite3/";
     description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix
index 18ecea4cbe1..7cf5484bef7 100644
--- a/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/pkgs/development/libraries/wxsqliteplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }:
+{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "wxsqliteplus";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     install -D wxsqliteplus $out/bin/wxsqliteplus
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/guanlisheng/wxsqliteplus";
     description = "A simple SQLite database browser built with wxWidgets";
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index 4e0481cc47d..93529ef430f 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
+{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
 , libX11, cairo
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
 assert withMesa -> libGLU != null && libGL != null;
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "2.8.12.1";
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index d1b0d56576b..358b45fbf0c 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
+{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
 , setfile
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
@@ -9,7 +9,7 @@
 
 assert withMesa -> libGLU != null && libGL != null;
 
-with stdenv.lib;
+with lib;
 
 let
   version = "2.9.4";
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index e77b0097d47..c97a9778d5d 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, fetchurl, pkg-config
+{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config
 , libXinerama, libSM, libXxf86vm
 , gtk2, gtk3
 , xorgproto, gst_all_1, setfile
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , withMesa ? libGLSupported
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
@@ -11,7 +11,7 @@
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
-with stdenv.lib;
+with lib;
 
 assert withMesa -> libGLU != null && libGL != null;
 assert withWebKit -> webkitgtk != null;
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index a6973f53de8..22e81840991 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
+{ lib, stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
 # darwin only attributes
 , derez, rez, setfile
 , AGL, Cocoa, Kernel, WebKit
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     platforms = platforms.darwin;
     license = licenses.wxWindows;
     maintainers = [ maintainers.lnl7 ];
diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index a75b5c1270b..cbacf4ec762 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchurl
 , pkg-config
@@ -12,7 +12,7 @@
 , xorgproto
 , gst_all_1
 , setfile
-, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
 , withMesa ? libGLSupported
 , libGLU ? null
 , libGL ? null
@@ -29,7 +29,7 @@
 , QTKit ? null
 }:
 
-with stdenv.lib;
+with lib;
 
 assert withMesa -> libGLU != null && libGL != null;
 assert withWebKit -> webkitgtk != null;
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 49797b5dd75..93d0b42a889 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -29,12 +29,12 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "--enable-shared" ]
-    ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"
-    ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";
+    ++ lib.optional (!stdenv.isi686) "--enable-pic"
+    ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";
 
   nativeBuildInputs = lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686) nasm;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for encoding H264/AVC video streams";
     homepage    = "http://www.videolan.org/developers/x264.html";
     license     = licenses.gpl2;
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 8c5cf32545c..495bbc4aaab 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, cmake, nasm, numactl
+{ lib, stdenv, fetchFromBitbucket, cmake, nasm, numactl
 , numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)  # Enabled by default on NUMA platforms
 , debugSupport ? false # Run-time sanity checks (debugging)
 , werrorSupport ? false # Warnings as errors
@@ -21,7 +21,7 @@ let
     (mkFlag custatsSupport "DETAILED_CU_STATS")
     (mkFlag unittestsSupport "ENABLE_TESTS")
     (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isPower [
+  ] ++ lib.optionals stdenv.hostPlatform.isPower [
     "-DENABLE_ALTIVEC=OFF"
   ];
 
@@ -56,7 +56,7 @@ let
       cd source
     '';
 
-    nativeBuildInputs = [cmake nasm] ++ stdenv.lib.optional numaSupport numactl;
+    nativeBuildInputs = [cmake nasm] ++ lib.optional numaSupport numactl;
   };
 
   libx265-10 = buildLib false;
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_SHARED=ON"
     "-DHIGH_BIT_DEPTH=OFF"
     "-DENABLE_HDR10_PLUS=OFF"
-  ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [
+  ] ++ lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [
     "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a"
     "-DLINKED_10BIT=ON"
     "-DLINKED_12BIT=ON"
@@ -92,9 +92,9 @@ stdenv.mkDerivation rec {
     rm $out/lib/*.a
   '';
 
-  nativeBuildInputs = [ cmake nasm ] ++ stdenv.lib.optional numaSupport numactl;
+  nativeBuildInputs = [ cmake nasm ] ++ lib.optional numaSupport numactl;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for encoding h.265/HEVC video streams";
     homepage    = "http://x265.org";
     license     = licenses.gpl2;
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index 30ab7f4496d..242788723fb 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xercesc, getopt }:
+{ lib, stdenv, fetchurl, xercesc, getopt }:
 
 let
   platform = if stdenv.isLinux then "linux" else
@@ -25,8 +25,8 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = "http://xalan.apache.org/";
     description = "A XSLT processor for transforming XML documents";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = [ lib.maintainers.jagajaga ];
   };
 }
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 195aea5c2f1..cfca33a62d2 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook
+{ lib, stdenv, fetchurl, autoreconfHook
 , libuuid, zlib }:
 
 let
@@ -20,16 +20,16 @@ let
     doCheck = true;
     AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
 
-    patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
+    patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
 
     # the configure script thinks that Darwin has ___exp10
     # but it’s not available on my systems (or hydra apparently)
-    postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    postConfigure = lib.optionalString stdenv.isDarwin ''
       substituteInPlace config.h \
         --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10"
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Search engine library";
       homepage = "https://xapian.org/";
       license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 6028982d987..79e5786f048 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }:
+{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }:
 
 stdenv.mkDerivation rec {
   pname = "xapian-omega";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ xapian perl pcre zlib libmagic ];
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Indexer and CGI search front-end built on Xapian library";
     homepage = "https://xapian.org/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix
index 18b10376315..11d73a9decb 100644
--- a/pkgs/development/libraries/xavs/default.nix
+++ b/pkgs/development/libraries/xavs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn }:
+{ lib, stdenv, fetchsvn }:
 
 stdenv.mkDerivation rec {
   pname = "xavs";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     patchShebangs tools/patcheck
     patchShebangs tools/regression-test.pl
     patchShebangs tools/xavs-format
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace config.guess --replace 'uname -p' 'uname -m'
     substituteInPlace configure \
       --replace '-O4' '-O3' \
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     "--disable-asm"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AVS encoder and decoder";
     homepage    = "http://xavs.sourceforge.net/";
     license     = licenses.lgpl2;
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index ae7ceb18c0a..db36c2a34c1 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "xbase-3.1.2";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://linux.techass.com/projects/xdb/";
     description = "C++ class library formerly known as XDB";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix
index 72ce94d98f1..8a13738a7e0 100644
--- a/pkgs/development/libraries/xcb-imdkit/default.nix
+++ b/pkgs/development/libraries/xcb-imdkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , extra-cmake-modules
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     xcbutilkeysyms
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "input method development support for xcb";
     homepage = "https://github.com/fcitx/xcb-imdkit";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index 2cdf8850e2d..f296f59d408 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkg-config
+{ lib, stdenv, fetchgit, autoconf, automake, libtool, pkg-config
 , xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "127zfmihd8nqlj8jjaja06xb84xdgl263w0av1xnprx05mkbkcyc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "XCB cursor library (libxcursor port)";
     homepage    = "https://cgit.freedesktop.org/xcb/util-cursor";
     license     = licenses.mit;
diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
index 0ad18ff70d4..21d6b6fa73e 100644
--- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix
+++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , pkg-config
 , libxslt
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DBus proxy for Flatpak and others";
     homepage = "https://github.com/flatpak/xdg-dbus-proxy";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index b7e58948553..be96001c46f 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , pkg-config
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc)
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Desktop integration portals for sandboxed apps";
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
index 16f9e7edb69..151c74f0b70 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , meson, ninja, pkg-config, wayland-protocols
 , pipewire, wayland, elogind, systemd, libdrm }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
   buildInputs = [ pipewire wayland elogind systemd libdrm ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/emersion/xdg-desktop-portal-wlr";
     description = "xdg-desktop-portal backend for wlroots";
     maintainers = with maintainers; [ minijackson ];
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 52f089126a9..cab35852831 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , nixosTests
 , substituteAll
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Desktop integration portals for sandboxed apps";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ jtojnar ];
diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/development/libraries/xed/default.nix
index 1d6dcdc67ad..395b399d8fe 100644
--- a/pkgs/development/libraries/xed/default.nix
+++ b/pkgs/development/libraries/xed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ lib, stdenv, fetchFromGitHub, python3Packages }:
 
 let
   # mbuild is a custom build system used only to build xed
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   dontInstall = true; # already installed during buildPhase
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Intel X86 Encoder Decoder (Intel XED)";
     homepage    = "https://intelxed.github.io/";
     license     = licenses.apsl20;
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index 8c7b1232014..dec42c0243e 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "xerces-c";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://xerces.apache.org/xerces-c/";
     description = "Validating XML parser written in a portable subset of C++";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index b9a2820a928..973e7dc028e 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     install -Dm755 ../xgboost $out/bin/xgboost
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
     homepage = "https://github.com/dmlc/xgboost";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index f5aa4f397ab..cbdc1a2dcf0 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib
 , libvorbis, libtheora, speex, zlib, perl, ffmpeg_3
 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
 , libmpcdec
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.xine-project.org/";
     description = "A high-performance, portable and reusable multimedia playback engine";
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix
index 049c54d792b..735cc278deb 100644
--- a/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/pkgs/development/libraries/xlibs-wrapper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, packages}:
+{lib, stdenv, packages}:
 
 stdenv.mkDerivation {
   name = "xlibs-wrapper";
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
   buildClientLibs = true;
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index ee3942c360b..77a11b53110 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, unzip }:
+{ lib, stdenv, fetchurl, autoreconfHook, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "xlslib";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C++/C library to construct Excel .xls files in code";
     homepage = "https://sourceforge.net/projects/xlslib/";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index eb09b0e0859..7548a45e5d4 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }:
+{ lib, stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "xml-security-c";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://santuario.apache.org/";
     description = "C++ Implementation of W3C security standards for XML";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.jagajaga ];
   };
 }
diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix
index 8671c124ab2..9cf3ddb9219 100644
--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkg-config
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config
 , boost, curl, openssl, log4shib, xercesc, xml-security-c
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2";
     platforms   = platforms.unix;
     license     = licenses.asl20;
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index 41cdbf0b4f1..7b6907a0162 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, curl, libxml2 }:
+{ lib, stdenv, fetchurl, curl, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "xmlrpc-c-1.51.06";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight RPC library based on XML and HTTP";
     homepage = "http://xmlrpc-c.sourceforge.net/";
     # <xmlrpc-c>/doc/COPYING also lists "Expat license",
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index f45979b847e..8bf98760950 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   patches = [
     ./lt_dladdsearchdir.patch
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ];
+  ] ++ lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ];
   postPatch = ''
     substituteAllInPlace src/dl.c
   '';
@@ -76,8 +76,8 @@ stdenv.mkDerivation {
     homepage = "http://www.aleksey.com/xmlsec";
     downloadPage = "https://www.aleksey.com/xmlsec/download.html";
     description = "XML Security Library in C based on libxml2";
-    license = stdenv.lib.licenses.mit;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    platforms = with lib.platforms; linux ++ darwin;
     updateWalker = true;
   };
 }
diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix
index 3388666f46b..2d614ee0e73 100644
--- a/pkgs/development/libraries/xsd/default.nix
+++ b/pkgs/development/libraries/xsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xercesc }:
+{ lib, stdenv, fetchurl, xercesc }:
 
 let
 in
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.codesynthesis.com/products/xsd";
     description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.jagajaga ];
   };
 }
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index ab68693ea5e..dbc3d837a45 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, yasm, autoconf, automake, libtool }:
+{ lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "xvidcore";
   version = "1.3.5";
diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix
index a5e6bfb11a6..fbeadc2b353 100644
--- a/pkgs/development/libraries/xxHash/default.nix
+++ b/pkgs/development/libraries/xxHash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "xxHash";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   # Upstream Makefile does not anticipate that user may not want to
   # build .so library.
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isStatic ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
     sed -i 's/lib: libxxhash.a libxxhash/lib: libxxhash.a/' Makefile
     sed -i '/LIBXXH) $(DESTDIR/ d' Makefile
   '';
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(dev)" "EXEC_PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extremely fast hash algorithm";
     longDescription = ''
       xxHash is an Extremely fast Hash algorithm, running at RAM speed limits.
diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix
index 2b4cb1d56da..f7d7eed7e70 100644
--- a/pkgs/development/libraries/xylib/default.nix
+++ b/pkgs/development/libraries/xylib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
+{ lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
 
 stdenv.mkDerivation rec {
   pname = "xylib";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost zlib bzip2 wxGTK30 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods";
     license = licenses.lgpl21;
     homepage = "http://xylib.sourceforge.net/";
diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index 62fe652724f..df47168c79b 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   name = "yajl-2.1.0";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       C, and a small validating JSON generator.
     '';
     homepage = "http://lloyd.github.com/yajl/";
-    license = stdenv.lib.licenses.isc;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ maggesi ];
+    license = lib.licenses.isc;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ maggesi ];
   };
 }
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix
index 9e6cc37e661..b72820c77a6 100644
--- a/pkgs/development/libraries/yojimbo/default.nix
+++ b/pkgs/development/libraries/yojimbo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
+{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
 
 stdenv.mkDerivation {
   pname = "yojimbo";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A network library for client/server games with dedicated servers";
     longDescription = ''
       yojimbo is a network library for client/server games with dedicated servers.
diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix
index bfe09b0e94c..1289b03618c 100644
--- a/pkgs/development/libraries/yubico-pam/default.nix
+++ b/pkgs/development/libraries/yubico-pam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , asciidoc, libxslt, docbook_xsl
 , pam, yubikey-personalization, libyubikey, libykclient }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ];
   buildInputs = [ pam yubikey-personalization libyubikey libykclient ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Yubico PAM module";
     homepage = "https://developers.yubico.com/yubico-pam";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix
index 67d4320b898..a0d1378aa70 100644
--- a/pkgs/development/libraries/zchunk/default.nix
+++ b/pkgs/development/libraries/zchunk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , pkg-config
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     zstd
     curl
-  ] ++ stdenv.lib.optional stdenv.isDarwin argp-standalone;
+  ] ++ lib.optional stdenv.isDarwin argp-standalone;
 
   # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS
   # https://github.com/zchunk/zchunk/pull/35
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   })
 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "File format designed for highly efficient deltas while maintaining good compression";
     homepage = "https://github.com/zchunk/zchunk";
     license = licenses.bsd2;
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 37ab1b1ec47..039ecc610f4 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , fetchpatch
 , pkg-config
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   pname = "zeitgeist";
   version = "1.0.2";
 
-  outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional pythonSupport "py";
+  outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -75,11 +75,11 @@ stdenv.mkDerivation rec {
     NOCONFIGURE=1 ./autogen.sh
   '';
 
-  postFixup = stdenv.lib.optionalString pythonSupport ''
+  postFixup = lib.optionalString pythonSupport ''
     moveToOutput lib/${python3.libPrefix} "$py"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A service which logs the users’s activities and events";
     homepage = "https://zeitgeist.freedesktop.org/";
     maintainers = with maintainers; [ lethalman worldofpeace ];
diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix
index 7f6c7323fff..896973e32eb 100644
--- a/pkgs/development/libraries/zeroc-ice/3.6.nix
+++ b/pkgs/development/libraries/zeroc-ice/3.6.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/slice
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.zeroc.com/ice.html";
     description = "The internet communications engine";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 2fb36c0aea5..ef16e381bcf 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
     mv $out/share/ice $dev/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.zeroc.com/ice.html";
     description = "The internet communications engine";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 7be5a74c3a4..a3c35d123b6 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium
+{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium
 , enableDrafts ? false }:
 
 stdenv.mkDerivation rec {
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails all the tests (ctest)
 
-  cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON";
+  cmakeFlags = lib.optional enableDrafts "-DENABLE_DRAFTS=ON";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "4";
     homepage = "http://www.zeromq.org";
     description = "The Intelligent Transport Layer";
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index afb13a03cbb..56ced97653e 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "zimg";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scaling, colorspace conversion and dithering library";
     homepage    = "https://github.com/sekrit-twc/zimg";
     license     = licenses.wtfpl;
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 7f5168080fa..6dc998cd0e2 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lzma }:
+{ lib, stdenv, fetchurl, lzma }:
 
 stdenv.mkDerivation rec {
   pname = "zimlib";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library for reading and writing ZIM files";
     homepage =  "https://www.openzim.org/wiki/Zimlib";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index b780fcda393..da8aac5229b 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , shared ? !stdenv.hostPlatform.isStatic
 , static ? true
@@ -33,9 +33,9 @@ stdenv.mkDerivation (rec {
     sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
   };
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch;
+  patches = lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch;
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace configure \
       --replace '/usr/bin/libtool' 'ar' \
       --replace 'AR="libtool"' 'AR="ar"' \
@@ -43,7 +43,7 @@ stdenv.mkDerivation (rec {
   '';
 
   outputs = [ "out" "dev" ]
-    ++ stdenv.lib.optional splitStaticOutput "static";
+    ++ lib.optional splitStaticOutput "static";
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
@@ -60,8 +60,8 @@ stdenv.mkDerivation (rec {
   # Of these, we choose `--shared`, only because that's
   # what we did in the past and we can avoid mass rebuilds this way.
   # As a result, we pass `--static` only when we want just static.
-  configureFlags = stdenv.lib.optional (static && !shared) "--static"
-                   ++ stdenv.lib.optional shared "--shared";
+  configureFlags = lib.optional (static && !shared) "--static"
+                   ++ lib.optional shared "--shared";
 
   # Note we don't need to set `dontDisableStatic`, because static-disabling
   # works by grepping for `enable-static` in the `./configure` script
@@ -71,33 +71,33 @@ stdenv.mkDerivation (rec {
   # here (in case zlib ever switches to autoconf in the future),
   # but we don't do it simply to avoid mass rebuilds.
 
-  postInstall = stdenv.lib.optionalString splitStaticOutput ''
+  postInstall = lib.optionalString splitStaticOutput ''
     moveToOutput lib/libz.a "$static"
   ''
     # jww (2015-01-06): Sometimes this library install as a .so, even on
     # Darwin; others time it installs as a .dylib.  I haven't yet figured out
     # what causes this difference.
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
     for file in $out/lib/*.so* $out/lib/*.dylib* ; do
       ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file
     done
   ''
     # Non-typical naming confuses libtool which then refuses to use zlib's DLL
     # in some cases, e.g. when compiling libpng.
-  + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
+  + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
     ln -s zlib1.dll $out/bin/libz.dll
   '';
 
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc";
+  NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc";
 
   # We don't strip on static cross-compilation because of reports that native
   # stripping corrupted the target library; see commit 12e960f5 for the report.
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static;
   configurePlatforms = [];
 
-  installFlags = stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
+  installFlags = lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "BINARY_PATH=$(out)/bin"
     "INCLUDE_PATH=$(dev)/include"
     "LIBRARY_PATH=$(out)/lib"
@@ -108,9 +108,9 @@ stdenv.mkDerivation (rec {
 
   makeFlags = [
     "PREFIX=${stdenv.cc.targetPrefix}"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
+  ] ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "-f" "win32/Makefile.gcc"
-  ] ++ stdenv.lib.optionals shared [
+  ] ++ lib.optionals shared [
     # Note that as of writing (zlib 1.2.11), this flag only has an effect
     # for Windows as it is specific to `win32/Makefile.gcc`.
     "SHARED_MODE=1"
@@ -120,16 +120,16 @@ stdenv.mkDerivation (rec {
     inherit version;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://zlib.net";
     description = "Lossless data-compression library";
     license = licenses.zlib;
     platforms = platforms.all;
   };
-} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
+} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
   preConfigure = ''
     export CHOST=${stdenv.hostPlatform.config}
   '';
-} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") {
+} // lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") {
   dontConfigure = true;
 })
diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix
index f0ca99b7667..b115cf7b675 100644
--- a/pkgs/development/libraries/zlog/default.nix
+++ b/pkgs/development/libraries/zlog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "1.2.15";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library";
     homepage = "https://hardysimpson.github.io/zlog/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix
index 0a7438fbc32..733573b3e23 100644
--- a/pkgs/development/libraries/zmqpp/default.nix
+++ b/pkgs/development/libraries/zmqpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }:
 
 stdenv.mkDerivation rec {
   pname = "zmqpp";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zeromq ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix
index ea786d770eb..978321f96e7 100644
--- a/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/pkgs/development/libraries/zookeeper_mt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , autoreconfHook
 , jre
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "zookeeper_mt";
-  version = stdenv.lib.getVersion zookeeper;
+  version = lib.getVersion zookeeper;
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     "--without-cppunit"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://zookeeper.apache.org";
     description = "Apache Zookeeper";
     license = licenses.asl20;
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix
index 7a524e72318..e74bb9ddc32 100644
--- a/pkgs/development/libraries/zxcvbn-c/default.nix
+++ b/pkgs/development/libraries/zxcvbn-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "zxcvbn-c";
   version = "2.4";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     install -D -t $out/lib libzxcvbn.so*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/tsyrogit/zxcvbn-c";
     description = "A C/C++ implementation of the zxcvbn password strength estimation";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 228dfdcf77a..8cfec83af54 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , perl
 , pkg-config
 , fetchFromGitHub
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
   checkTarget = "check";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library to extract data from files archived in a zip file";
 
     longDescription = ''

From 8929989614589ee3acd070a6409b2b9700c92d65 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 29 Nov 2020 00:01:14 +0000
Subject: [PATCH 520/956] lib: Clean up how linux and gcc config is specified

The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
---
 lib/systems/default.nix                       |  13 +-
 lib/systems/examples.nix                      |  48 +-
 lib/systems/platforms.nix                     | 620 +++++++++---------
 nixos/doc/manual/release-notes/rl-2103.xml    |  16 +
 nixos/modules/hardware/device-tree.nix        |   8 +-
 nixos/modules/installer/netboot/netboot.nix   |   2 +-
 nixos/modules/services/misc/nix-daemon.nix    |   8 +-
 nixos/modules/system/activation/top-level.nix |   2 +-
 .../generations-dir/generations-dir.nix       |   2 +-
 .../boot/loader/raspberrypi/raspberrypi.nix   |   2 +-
 nixos/release.nix                             |   4 +-
 .../audio/virtual-ans/default.nix             |   2 +-
 .../virtualization/crosvm/default.nix         |   2 +-
 .../virtualization/vpcs/default.nix           |   2 +-
 .../bintools-wrapper/default.nix              |   2 +-
 pkgs/build-support/cc-wrapper/default.nix     |  16 +-
 pkgs/build-support/kernel/make-initrd.nix     |   4 +-
 pkgs/build-support/vm/default.nix             |   2 +-
 .../compilers/gcc/common/platform-flags.nix   |   2 +-
 pkgs/development/compilers/julia/1.0.nix      |   2 +-
 pkgs/development/compilers/julia/1.3.nix      |   2 +-
 pkgs/development/compilers/julia/1.5.nix      |   2 +-
 pkgs/development/libraries/glibc/common.nix   |   2 +-
 .../libraries/qt-5/modules/qtwebengine.nix    |   2 +-
 .../tools/poetry2nix/poetry2nix/pep425.nix    |   6 +-
 .../tools/poetry2nix/poetry2nix/pep508.nix    |   2 +-
 pkgs/development/web/nodejs/nodejs.nix        |  11 +-
 pkgs/os-specific/linux/exfat/default.nix      |   2 +-
 .../linux/kernel-headers/default.nix          |   2 +-
 pkgs/os-specific/linux/kernel/generic.nix     |  18 +-
 .../linux/kernel/manual-config.nix            |  30 +-
 pkgs/os-specific/linux/klibc/default.nix      |   4 +-
 pkgs/os-specific/linux/rtl8723bs/default.nix  |   2 +-
 pkgs/os-specific/linux/rtl8812au/default.nix  |   2 +-
 pkgs/os-specific/linux/uclibc/default.nix     |   2 +-
 pkgs/stdenv/generic/make-derivation.nix       |   2 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 37 files changed, 429 insertions(+), 423 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 4edcbeb36f1..84d0b34805a 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -24,8 +24,6 @@ rec {
       # Either of these can be losslessly-extracted from `parsed` iff parsing succeeds.
       system = parse.doubleFromSystem final.parsed;
       config = parse.tripleFromSystem final.parsed;
-      # Just a guess, based on `system`
-      platform = platforms.select final;
       # Determine whether we are compatible with the provided CPU
       isCompatible = platform: parse.isCompatible final.parsed.cpu platform.parsed.cpu;
       # Derived meta-data
@@ -79,7 +77,16 @@ rec {
       };
       isStatic = final.isWasm || final.isRedox;
 
-      kernelArch =
+      # Just a guess, based on `system`
+      inherit
+        ({
+          linux-kernel = args.linux-kernel or {};
+          gcc = args.gcc or {};
+          rustc = args.rust or {};
+        } // platforms.select final)
+        linux-kernel gcc rustc;
+
+      linuxArch =
         if final.isAarch32 then "arm"
         else if final.isAarch64 then "arm64"
         else if final.isx86_32 then "x86"
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 16002450f2d..de12e0b83c1 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -7,7 +7,6 @@ let
 
   riscv = bits: {
     config = "riscv${bits}-unknown-linux-gnu";
-    platform = platforms.riscv-multiplatform;
   };
 in
 
@@ -17,84 +16,68 @@ rec {
   #
   powernv = {
     config = "powerpc64le-unknown-linux-gnu";
-    platform = platforms.powernv;
   };
   musl-power = {
     config = "powerpc64le-unknown-linux-musl";
-    platform = platforms.powernv;
   };
 
   sheevaplug = {
     config = "armv5tel-unknown-linux-gnueabi";
-    platform = platforms.sheevaplug;
-  };
+  } // platforms.sheevaplug;
 
   raspberryPi = {
     config = "armv6l-unknown-linux-gnueabihf";
-    platform = platforms.raspberrypi;
-  };
+  } // platforms.raspberrypi;
 
   remarkable1 = {
     config = "armv7l-unknown-linux-gnueabihf";
-    platform = platforms.zero-gravitas;
-  };
+  } // platforms.zero-gravitas;
 
   remarkable2 = {
     config = "armv7l-unknown-linux-gnueabihf";
-    platform = platforms.zero-sugar;
-  };
+  } // platforms.zero-sugar;
 
   armv7l-hf-multiplatform = {
     config = "armv7l-unknown-linux-gnueabihf";
-    platform = platforms.armv7l-hf-multiplatform;
   };
 
   aarch64-multiplatform = {
     config = "aarch64-unknown-linux-gnu";
-    platform = platforms.aarch64-multiplatform;
   };
 
   armv7a-android-prebuilt = {
     config = "armv7a-unknown-linux-androideabi";
     sdkVer = "29";
     ndkVer = "21";
-    platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
-  };
+  } // platforms.armv7a-android;
 
   aarch64-android-prebuilt = {
     config = "aarch64-unknown-linux-android";
     sdkVer = "29";
     ndkVer = "21";
-    platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
 
-  scaleway-c1 = armv7l-hf-multiplatform // rec {
-    platform = platforms.scaleway-c1;
-    inherit (platform.gcc) fpu;
-  };
+  scaleway-c1 = armv7l-hf-multiplatform // platforms.scaleway-c1;
 
   pogoplug4 = {
     config = "armv5tel-unknown-linux-gnueabi";
-    platform = platforms.pogoplug4;
-  };
+  } // platforms.pogoplug4;
 
   ben-nanonote = {
     config = "mipsel-unknown-linux-uclibc";
-    platform = platforms.ben_nanonote;
-  };
+  } // platforms.ben_nanonote;
 
   fuloongminipc = {
     config = "mipsel-unknown-linux-gnu";
-    platform = platforms.fuloong2f_n32;
-  };
+  } // platforms.fuloong2f_n32;
 
   muslpi = raspberryPi // {
     config = "armv6l-unknown-linux-musleabihf";
   };
 
-  aarch64-multiplatform-musl = aarch64-multiplatform // {
+  aarch64-multiplatform-musl = {
     config = "aarch64-unknown-linux-musl";
   };
 
@@ -110,13 +93,11 @@ rec {
   riscv64-embedded = {
     config = "riscv64-none-elf";
     libc = "newlib";
-    platform = platforms.riscv-multiplatform;
   };
 
   riscv32-embedded = {
     config = "riscv32-none-elf";
     libc = "newlib";
-    platform = platforms.riscv-multiplatform;
   };
 
   mmix = {
@@ -136,13 +117,11 @@ rec {
   vc4 = {
     config = "vc4-elf";
     libc = "newlib";
-    platform = {};
   };
 
   or1k = {
     config = "or1k-elf";
     libc = "newlib";
-    platform = {};
   };
 
   arm-embedded = {
@@ -204,7 +183,6 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
-    platform = {};
   };
 
   iphone32 = {
@@ -214,7 +192,6 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
-    platform = {};
   };
 
   iphone64-simulator = {
@@ -224,7 +201,6 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
-    platform = {};
   };
 
   iphone32-simulator = {
@@ -234,7 +210,6 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
-    platform = {};
   };
 
   #
@@ -245,7 +220,6 @@ rec {
   mingw32 = {
     config = "i686-w64-mingw32";
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
-    platform = {};
   };
 
   # 64 bit mingw-w64
@@ -253,7 +227,6 @@ rec {
     # That's the triplet they use in the mingw-w64 docs.
     config = "x86_64-w64-mingw32";
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
-    platform = {};
   };
 
   # BSDs
@@ -275,6 +248,5 @@ rec {
   # Ghcjs
   ghcjs = {
     config = "js-unknown-ghcjs";
-    platform = {};
   };
 }
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index e869de488c1..f399c1873f5 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -1,39 +1,36 @@
 { lib }:
 rec {
-  pcBase = {
-    name = "pc";
-    kernelBaseConfig = "defconfig";
-    # Build whatever possible as a module, if not stated in the extra config.
-    kernelAutoModules = true;
-    kernelTarget = "bzImage";
+  pc = {
+    linux-kernel = {
+      name = "pc";
+
+      baseConfig = "defconfig";
+      # Build whatever possible as a module, if not stated in the extra config.
+      autoModules = true;
+      target = "bzImage";
+    };
   };
 
-  pc64 = pcBase // { kernelArch = "x86_64"; };
-
-  pc32 = pcBase // { kernelArch = "i386"; };
-
-  pc32_simplekernel = pc32 // {
-    kernelAutoModules = false;
-  };
-
-  pc64_simplekernel = pc64 // {
-    kernelAutoModules = false;
+  pc_simplekernel = lib.recursiveUpdate pc {
+    linux-kernel.autoModules = false;
   };
 
   powernv = {
-    name = "PowerNV";
-    kernelArch = "powerpc";
-    kernelBaseConfig = "powernv_defconfig";
-    kernelTarget = "zImage";
-    kernelInstallTarget = "install";
-    kernelFile = "vmlinux";
-    kernelAutoModules = true;
-    # avoid driver/FS trouble arising from unusual page size
-    kernelExtraConfig = ''
-      PPC_64K_PAGES n
-      PPC_4K_PAGES y
-      IPV6 y
-    '';
+    linux-kernel = {
+      name = "PowerNV";
+
+      baseConfig = "powernv_defconfig";
+      target = "zImage";
+      installTarget = "install";
+      file = "vmlinux";
+      autoModules = true;
+      # avoid driver/FS trouble arising from unusual page size
+      extraConfig = ''
+        PPC_64K_PAGES n
+        PPC_4K_PAGES y
+        IPV6 y
+      '';
+    };
   };
 
   ##
@@ -41,17 +38,12 @@ rec {
   ##
 
   pogoplug4 = {
-    name = "pogoplug4";
+    linux-kernel = {
+      name = "pogoplug4";
 
-    gcc = {
-      arch = "armv5te";
-    };
-
-    kernelBaseConfig = "multi_v5_defconfig";
-    kernelArch = "arm";
-    kernelAutoModules = false;
-    kernelExtraConfig =
-      ''
+      baseConfig = "multi_v5_defconfig";
+      autoModules = false;
+      extraConfig = ''
         # Ubi for the mtd
         MTD_UBI y
         UBIFS_FS y
@@ -61,136 +53,144 @@ rec {
         UBIFS_FS_ZLIB y
         UBIFS_FS_DEBUG n
       '';
-    kernelMakeFlags = [ "LOADADDR=0x8000" ];
-    kernelTarget = "uImage";
-    # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
-    #kernelDTB = true;
+      makeFlags = [ "LOADADDR=0x8000" ];
+      target = "uImage";
+      # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
+      #DTB = true;
+    };
+    gcc = {
+      arch = "armv5te";
+    };
   };
 
   sheevaplug = {
-    name = "sheevaplug";
-    kernelBaseConfig = "multi_v5_defconfig";
-    kernelArch = "arm";
-    kernelAutoModules = false;
-    kernelExtraConfig = ''
-      BLK_DEV_RAM y
-      BLK_DEV_INITRD y
-      BLK_DEV_CRYPTOLOOP m
-      BLK_DEV_DM m
-      DM_CRYPT m
-      MD y
-      REISERFS_FS m
-      BTRFS_FS m
-      XFS_FS m
-      JFS_FS m
-      EXT4_FS m
-      USB_STORAGE_CYPRESS_ATACB m
+    linux-kernel = {
+      name = "sheevaplug";
 
-      # mv cesa requires this sw fallback, for mv-sha1
-      CRYPTO_SHA1 y
-      # Fast crypto
-      CRYPTO_TWOFISH y
-      CRYPTO_TWOFISH_COMMON y
-      CRYPTO_BLOWFISH y
-      CRYPTO_BLOWFISH_COMMON y
+      baseConfig = "multi_v5_defconfig";
+      autoModules = false;
+      extraConfig = ''
+        BLK_DEV_RAM y
+        BLK_DEV_INITRD y
+        BLK_DEV_CRYPTOLOOP m
+        BLK_DEV_DM m
+        DM_CRYPT m
+        MD y
+        REISERFS_FS m
+        BTRFS_FS m
+        XFS_FS m
+        JFS_FS m
+        EXT4_FS m
+        USB_STORAGE_CYPRESS_ATACB m
 
-      IP_PNP y
-      IP_PNP_DHCP y
-      NFS_FS y
-      ROOT_NFS y
-      TUN m
-      NFS_V4 y
-      NFS_V4_1 y
-      NFS_FSCACHE y
-      NFSD m
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-      NETFILTER y
-      IP_NF_IPTABLES y
-      IP_NF_FILTER y
-      IP_NF_MATCH_ADDRTYPE y
-      IP_NF_TARGET_LOG y
-      IP_NF_MANGLE y
-      IPV6 m
-      VLAN_8021Q m
+        # mv cesa requires this sw fallback, for mv-sha1
+        CRYPTO_SHA1 y
+        # Fast crypto
+        CRYPTO_TWOFISH y
+        CRYPTO_TWOFISH_COMMON y
+        CRYPTO_BLOWFISH y
+        CRYPTO_BLOWFISH_COMMON y
 
-      CIFS y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE y
-      CIFS_ACL y
+        IP_PNP y
+        IP_PNP_DHCP y
+        NFS_FS y
+        ROOT_NFS y
+        TUN m
+        NFS_V4 y
+        NFS_V4_1 y
+        NFS_FSCACHE y
+        NFSD m
+        NFSD_V2_ACL y
+        NFSD_V3 y
+        NFSD_V3_ACL y
+        NFSD_V4 y
+        NETFILTER y
+        IP_NF_IPTABLES y
+        IP_NF_FILTER y
+        IP_NF_MATCH_ADDRTYPE y
+        IP_NF_TARGET_LOG y
+        IP_NF_MANGLE y
+        IPV6 m
+        VLAN_8021Q m
 
-      WATCHDOG y
-      WATCHDOG_CORE y
-      ORION_WATCHDOG m
+        CIFS y
+        CIFS_XATTR y
+        CIFS_POSIX y
+        CIFS_FSCACHE y
+        CIFS_ACL y
 
-      ZRAM m
-      NETCONSOLE m
+        WATCHDOG y
+        WATCHDOG_CORE y
+        ORION_WATCHDOG m
 
-      # Disable OABI to have seccomp_filter (required for systemd)
-      # https://github.com/raspberrypi/firmware/issues/651
-      OABI_COMPAT n
+        ZRAM m
+        NETCONSOLE m
 
-      # Fail to build
-      DRM n
-      SCSI_ADVANSYS n
-      USB_ISP1362_HCD n
-      SND_SOC n
-      SND_ALI5451 n
-      FB_SAVAGE n
-      SCSI_NSP32 n
-      ATA_SFF n
-      SUNGEM n
-      IRDA n
-      ATM_HE n
-      SCSI_ACARD n
-      BLK_DEV_CMD640_ENHANCED n
+        # Disable OABI to have seccomp_filter (required for systemd)
+        # https://github.com/raspberrypi/firmware/issues/651
+        OABI_COMPAT n
 
-      FUSE_FS m
+        # Fail to build
+        DRM n
+        SCSI_ADVANSYS n
+        USB_ISP1362_HCD n
+        SND_SOC n
+        SND_ALI5451 n
+        FB_SAVAGE n
+        SCSI_NSP32 n
+        ATA_SFF n
+        SUNGEM n
+        IRDA n
+        ATM_HE n
+        SCSI_ACARD n
+        BLK_DEV_CMD640_ENHANCED n
 
-      # systemd uses cgroups
-      CGROUPS y
+        FUSE_FS m
 
-      # Latencytop
-      LATENCYTOP y
+        # systemd uses cgroups
+        CGROUPS y
 
-      # Ubi for the mtd
-      MTD_UBI y
-      UBIFS_FS y
-      UBIFS_FS_XATTR y
-      UBIFS_FS_ADVANCED_COMPR y
-      UBIFS_FS_LZO y
-      UBIFS_FS_ZLIB y
-      UBIFS_FS_DEBUG n
+        # Latencytop
+        LATENCYTOP y
 
-      # Kdb, for kernel troubles
-      KGDB y
-      KGDB_SERIAL_CONSOLE y
-      KGDB_KDB y
-    '';
-    kernelMakeFlags = [ "LOADADDR=0x0200000" ];
-    kernelTarget = "uImage";
-    kernelDTB = true; # Beyond 3.10
+        # Ubi for the mtd
+        MTD_UBI y
+        UBIFS_FS y
+        UBIFS_FS_XATTR y
+        UBIFS_FS_ADVANCED_COMPR y
+        UBIFS_FS_LZO y
+        UBIFS_FS_ZLIB y
+        UBIFS_FS_DEBUG n
+
+        # Kdb, for kernel troubles
+        KGDB y
+        KGDB_SERIAL_CONSOLE y
+        KGDB_KDB y
+      '';
+      makeFlags = [ "LOADADDR=0x0200000" ];
+      target = "uImage";
+      DTB = true; # Beyond 3.10
+    };
     gcc = {
       arch = "armv5te";
     };
   };
 
   raspberrypi = {
-    name = "raspberrypi";
-    kernelBaseConfig = "bcm2835_defconfig";
-    kernelDTB = true;
-    kernelArch = "arm";
-    kernelAutoModules = true;
-    kernelPreferBuiltin = true;
-    kernelExtraConfig = ''
-      # Disable OABI to have seccomp_filter (required for systemd)
-      # https://github.com/raspberrypi/firmware/issues/651
-      OABI_COMPAT n
-    '';
-    kernelTarget = "zImage";
+    linux-kernel = {
+      name = "raspberrypi";
+
+      baseConfig = "bcm2835_defconfig";
+      DTB = true;
+      autoModules = true;
+      preferBuiltin = true;
+      extraConfig = ''
+        # Disable OABI to have seccomp_filter (required for systemd)
+        # https://github.com/raspberrypi/firmware/issues/651
+        OABI_COMPAT n
+      '';
+      target = "zImage";
+    };
     gcc = {
       arch = "armv6";
       fpu = "vfp";
@@ -201,13 +201,15 @@ rec {
   raspberrypi2 = armv7l-hf-multiplatform;
 
   zero-gravitas = {
-    name = "zero-gravitas";
-    kernelBaseConfig = "zero-gravitas_defconfig";
-    kernelArch = "arm";
-    # kernelTarget verified by checking /boot on reMarkable 1 device
-    kernelTarget = "zImage";
-    kernelAutoModules = false;
-    kernelDTB = true;
+    linux-kernel = {
+      name = "zero-gravitas";
+
+      baseConfig = "zero-gravitas_defconfig";
+      # Target verified by checking /boot on reMarkable 1 device
+      target = "zImage";
+      autoModules = false;
+      DTB = true;
+    };
     gcc = {
       fpu = "neon";
       cpu = "cortex-a9";
@@ -215,13 +217,15 @@ rec {
   };
 
   zero-sugar = {
-    name = "zero-sugar";
-    kernelBaseConfig = "zero-sugar_defconfig";
-    kernelArch = "arm";
-    kernelDTB = true;
-    kernelAutoModules = false;
-    kernelPreferBuiltin = true;
-    kernelTarget = "zImage";
+    linux-kernel = {
+      name = "zero-sugar";
+
+      baseConfig = "zero-sugar_defconfig";
+      DTB = true;
+      autoModules = false;
+      preferBuiltin = true;
+      target = "zImage";
+    };
     gcc = {
       cpu = "cortex-a7";
       fpu = "neon-vfpv4";
@@ -229,7 +233,7 @@ rec {
     };
   };
 
-  scaleway-c1 = armv7l-hf-multiplatform // {
+  scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform {
     gcc = {
       cpu = "cortex-a9";
       fpu = "vfpv3";
@@ -237,12 +241,11 @@ rec {
   };
 
   utilite = {
-    name = "utilite";
-    kernelBaseConfig = "multi_v7_defconfig";
-    kernelArch = "arm";
-    kernelAutoModules = false;
-    kernelExtraConfig =
-      ''
+    linux-kernel = {
+      name = "utilite";
+      maseConfig = "multi_v7_defconfig";
+      autoModules = false;
+      extraConfig = ''
         # Ubi for the mtd
         MTD_UBI y
         UBIFS_FS y
@@ -252,35 +255,37 @@ rec {
         UBIFS_FS_ZLIB y
         UBIFS_FS_DEBUG n
       '';
-    kernelMakeFlags = [ "LOADADDR=0x10800000" ];
-    kernelTarget = "uImage";
-    kernelDTB = true;
+      makeFlags = [ "LOADADDR=0x10800000" ];
+      target = "uImage";
+      DTB = true;
+    };
     gcc = {
       cpu = "cortex-a9";
       fpu = "neon";
     };
   };
 
-  guruplug = sheevaplug // {
+  guruplug = lib.recursiveUpdate sheevaplug {
     # Define `CONFIG_MACH_GURUPLUG' (see
     # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>)
     # and other GuruPlug-specific things.  Requires the `guruplug-defconfig'
     # patch.
-
-    kernelBaseConfig = "guruplug_defconfig";
+    linux-kernel.baseConfig = "guruplug_defconfig";
   };
 
-  beaglebone = armv7l-hf-multiplatform // {
-    name = "beaglebone";
-    kernelBaseConfig = "bb.org_defconfig";
-    kernelAutoModules = false;
-    kernelExtraConfig = ""; # TBD kernel config
-    kernelTarget = "zImage";
+  beaglebone = lib.recursiveUpdate armv7l-hf-multiplatform {
+    linux-kernel = {
+      name = "beaglebone";
+      baseConfig = "bb.org_defconfig";
+      autoModules = false;
+      extraConfig = ""; # TBD kernel config
+      target = "zImage";
+    };
   };
 
   # https://developer.android.com/ndk/guides/abis#v7a
-  armv7a-android =  {
-    name = "armeabi-v7a";
+  armv7a-android = {
+    linux-kernel.name = "armeabi-v7a";
     gcc = {
       arch = "armv7-a";
       float-abi = "softfp";
@@ -289,29 +294,31 @@ rec {
   };
 
   armv7l-hf-multiplatform = {
-    name = "armv7l-hf-multiplatform";
-    kernelBaseConfig = "multi_v7_defconfig";
-    kernelArch = "arm";
-    kernelDTB = true;
-    kernelAutoModules = true;
-    kernelPreferBuiltin = true;
-    kernelTarget = "zImage";
-    kernelExtraConfig = ''
-      # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
-      SERIAL_8250_BCM2835AUX y
-      SERIAL_8250_EXTENDED y
-      SERIAL_8250_SHARE_IRQ y
+    linux-kernel = {
+      name = "armv7l-hf-multiplatform";
+      Major = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.
+      baseConfig = "multi_v7_defconfig";
+      DTB = true;
+      autoModules = true;
+      PreferBuiltin = true;
+      target = "zImage";
+      extraConfig = ''
+        # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
+        SERIAL_8250_BCM2835AUX y
+        SERIAL_8250_EXTENDED y
+        SERIAL_8250_SHARE_IRQ y
 
-      # Fix broken sunxi-sid nvmem driver.
-      TI_CPTS y
+        # Fix broken sunxi-sid nvmem driver.
+        TI_CPTS y
 
-      # Hangs ODROID-XU4
-      ARM_BIG_LITTLE_CPUIDLE n
+        # Hangs ODROID-XU4
+        ARM_BIG_LITTLE_CPUIDLE n
 
-      # Disable OABI to have seccomp_filter (required for systemd)
-      # https://github.com/raspberrypi/firmware/issues/651
-      OABI_COMPAT n
-    '';
+        # Disable OABI to have seccomp_filter (required for systemd)
+        # https://github.com/raspberrypi/firmware/issues/651
+        OABI_COMPAT n
+      '';
+    };
     gcc = {
       # Some table about fpu flags:
       # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png
@@ -336,34 +343,35 @@ rec {
   };
 
   aarch64-multiplatform = {
-    name = "aarch64-multiplatform";
-    kernelBaseConfig = "defconfig";
-    kernelArch = "arm64";
-    kernelDTB = true;
-    kernelAutoModules = true;
-    kernelPreferBuiltin = true;
-    kernelExtraConfig = ''
-      # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10.
-      ARCH_BCM2835 y
-      BCM2835_MBOX y
-      BCM2835_WDT y
-      RASPBERRYPI_FIRMWARE y
-      RASPBERRYPI_POWER y
-      SERIAL_8250_BCM2835AUX y
-      SERIAL_8250_EXTENDED y
-      SERIAL_8250_SHARE_IRQ y
+    linux-kernel = {
+      name = "aarch64-multiplatform";
+      baseConfig = "defconfig";
+      DTB = true;
+      autoModules = true;
+      preferBuiltin = true;
+      extraConfig = ''
+        # Raspberry Pi 3 stuff. Not needed for   s >= 4.10.
+        ARCH_BCM2835 y
+        BCM2835_MBOX y
+        BCM2835_WDT y
+        RASPBERRYPI_FIRMWARE y
+        RASPBERRYPI_POWER y
+        SERIAL_8250_BCM2835AUX y
+        SERIAL_8250_EXTENDED y
+        SERIAL_8250_SHARE_IRQ y
 
-      # Cavium ThunderX stuff.
-      PCI_HOST_THUNDER_ECAM y
+        # Cavium ThunderX stuff.
+        PCI_HOST_THUNDER_ECAM y
 
-      # Nvidia Tegra stuff.
-      PCI_TEGRA y
+        # Nvidia Tegra stuff.
+        PCI_TEGRA y
 
-      # The default (=y) forces us to have the XHCI firmware available in initrd,
-      # which our initrd builder can't currently do easily.
-      USB_XHCI_TEGRA m
-    '';
-    kernelTarget = "Image";
+        # The default (=y) forces us to have the XHCI firmware available in initrd,
+        # which our initrd builder can't currently do easily.
+        USB_XHCI_TEGRA m
+      '';
+      target = "Image";
+    };
     gcc = {
       arch = "armv8-a";
     };
@@ -374,8 +382,9 @@ rec {
   ##
 
   ben_nanonote = {
-    name = "ben_nanonote";
-    kernelArch = "mips";
+    linux-kernel = {
+      name = "ben_nanonote";
+    };
     gcc = {
       arch = "mips32";
       float = "soft";
@@ -383,75 +392,76 @@ rec {
   };
 
   fuloong2f_n32 = {
-    name = "fuloong2f_n32";
-    kernelBaseConfig = "lemote2f_defconfig";
-    kernelArch = "mips";
-    kernelAutoModules = false;
-    kernelExtraConfig = ''
-      MIGRATION n
-      COMPACTION n
+    linux-kernel = {
+      name = "fuloong2f_n32";
+      baseConfig = "lemote2f_defconfig";
+      autoModules = false;
+      extraConfig = ''
+        MIGRATION n
+        COMPACTION n
 
-      # nixos mounts some cgroup
-      CGROUPS y
+        # nixos mounts some cgroup
+        CGROUPS y
 
-      BLK_DEV_RAM y
-      BLK_DEV_INITRD y
-      BLK_DEV_CRYPTOLOOP m
-      BLK_DEV_DM m
-      DM_CRYPT m
-      MD y
-      REISERFS_FS m
-      EXT4_FS m
-      USB_STORAGE_CYPRESS_ATACB m
+        BLK_DEV_RAM y
+        BLK_DEV_INITRD y
+        BLK_DEV_CRYPTOLOOP m
+        BLK_DEV_DM m
+        DM_CRYPT m
+        MD y
+        REISERFS_FS m
+        EXT4_FS m
+        USB_STORAGE_CYPRESS_ATACB m
 
-      IP_PNP y
-      IP_PNP_DHCP y
-      IP_PNP_BOOTP y
-      NFS_FS y
-      ROOT_NFS y
-      TUN m
-      NFS_V4 y
-      NFS_V4_1 y
-      NFS_FSCACHE y
-      NFSD m
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
+        IP_PNP y
+        IP_PNP_DHCP y
+        IP_PNP_BOOTP y
+        NFS_FS y
+        ROOT_NFS y
+        TUN m
+        NFS_V4 y
+        NFS_V4_1 y
+        NFS_FSCACHE y
+        NFSD m
+        NFSD_V2_ACL y
+        NFSD_V3 y
+        NFSD_V3_ACL y
+        NFSD_V4 y
 
-      # Fail to build
-      DRM n
-      SCSI_ADVANSYS n
-      USB_ISP1362_HCD n
-      SND_SOC n
-      SND_ALI5451 n
-      FB_SAVAGE n
-      SCSI_NSP32 n
-      ATA_SFF n
-      SUNGEM n
-      IRDA n
-      ATM_HE n
-      SCSI_ACARD n
-      BLK_DEV_CMD640_ENHANCED n
+        # Fail to build
+        DRM n
+        SCSI_ADVANSYS n
+        USB_ISP1362_HCD n
+        SND_SOC n
+        SND_ALI5451 n
+        FB_SAVAGE n
+        SCSI_NSP32 n
+        ATA_SFF n
+        SUNGEM n
+        IRDA n
+        ATM_HE n
+        SCSI_ACARD n
+        BLK_DEV_CMD640_ENHANCED n
 
-      FUSE_FS m
+        FUSE_FS m
 
-      # Needed for udev >= 150
-      SYSFS_DEPRECATED_V2 n
+        # Needed for udev >= 150
+        SYSFS_DEPRECATED_V2 n
 
-      VGA_CONSOLE n
-      VT_HW_CONSOLE_BINDING y
-      SERIAL_8250_CONSOLE y
-      FRAMEBUFFER_CONSOLE y
-      EXT2_FS y
-      EXT3_FS y
-      REISERFS_FS y
-      MAGIC_SYSRQ y
+        VGA_CONSOLE n
+        VT_HW_CONSOLE_BINDING y
+        SERIAL_8250_CONSOLE y
+        FRAMEBUFFER_CONSOLE y
+        EXT2_FS y
+        EXT3_FS y
+        REISERFS_FS y
+        MAGIC_SYSRQ y
 
-      # The kernel doesn't boot at all, with FTRACE
-      FTRACE n
-    '';
-    kernelTarget = "vmlinux";
+        # The kernel doesn't boot at all, with FTRACE
+        FTRACE n
+      '';
+      target = "vmlinux";
+    };
     gcc = {
       arch = "loongson2f";
       float = "hard";
@@ -464,34 +474,36 @@ rec {
   ##
 
   riscv-multiplatform = {
-    name = "riscv-multiplatform";
-    kernelArch = "riscv";
-    kernelTarget = "vmlinux";
-    kernelAutoModules = true;
-    kernelBaseConfig = "defconfig";
-    kernelExtraConfig = ''
-      FTRACE n
-      SERIAL_OF_PLATFORM y
-    '';
+    linux-kernel = {
+      name = "riscv-multiplatform";
+      target = "vmlinux";
+      autoModules = true;
+      baseConfig = "defconfig";
+      extraConfig = ''
+        FTRACE n
+        SERIAL_OF_PLATFORM y
+      '';
+    };
   };
 
   select = platform:
     # x86
-    /**/ if platform.isx86_32 then pc32
-    else if platform.isx86_64 then pc64
+    /**/ if platform.isx86 then pc
 
     # ARM
     else if platform.isAarch32 then let
       version = platform.parsed.cpu.version or null;
-      in     if version == null then pcBase
+      in     if version == null then pc
         else if lib.versionOlder version "6" then sheevaplug
         else if lib.versionOlder version "7" then raspberrypi
         else armv7l-hf-multiplatform
     else if platform.isAarch64 then aarch64-multiplatform
 
+    else if platform.isRiscV then riscv-multiplatform
+
     else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then fuloong2f_n32
 
     else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
 
-    else pcBase;
+    else pc;
 }
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index e46d1ca403f..408c896defe 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -592,6 +592,22 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e
      <literal>/etc/netgroup</literal> defines network-wide groups and may affect to setups using NIS.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Platforms, like <varname>stdenv.hostPlatform</varname>, no longer have a <varname>platform</varname> attribute.
+     It has been (mostly) flattoned away:
+    </para>
+    <itemizedlist>
+     <listitem><para><varname>platform.gcc</varname> is now <varname>gcc</varname></para></listitem>
+     <listitem><para><literal>platform.kernel*</literal> is now <literal>linux-kernel.*</literal></para></listitem>
+    </itemizedlist>
+    <para>
+     Additionally, <varname>platform.kernelArch</varname> moved to the top level as <varname>linuxArch</varname> to match the other <literal>*Arch</literal> variables.
+    </para>
+    <para>
+     The <varname>platform</varname> grouping of these things never meant anything, and was just a historial/implementation artifact that was overdue removal.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix
index e0ab37bca63..4aa1d6369d1 100644
--- a/nixos/modules/hardware/device-tree.nix
+++ b/nixos/modules/hardware/device-tree.nix
@@ -68,11 +68,11 @@ let
       patchShebangs scripts/*
       substituteInPlace scripts/Makefile.lib \
         --replace 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget))' 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) -@'
-      make ${pkgs.stdenv.hostPlatform.platform.kernelBaseConfig} ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
-      make dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
+      make ${pkgs.stdenv.hostPlatform.linux-kernel.baseConfig} ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
+      make dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
     '';
     installPhase = ''
-      make dtbs_install INSTALL_DTBS_PATH=$out/dtbs  ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
+      make dtbs_install INSTALL_DTBS_PATH=$out/dtbs  ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
     '';
   };
 
@@ -115,7 +115,7 @@ in
   options = {
       hardware.deviceTree = {
         enable = mkOption {
-          default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false;
+          default = pkgs.stdenv.hostPlatform.linux-kernel.DTB or false;
           type = types.bool;
           description = ''
             Build device tree files. These are used to describe the
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 95eba86bcb6..fa074fdfcc6 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -88,7 +88,7 @@ with lib;
 
     system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
       #!ipxe
-      kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
+      kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
       initrd initrd
       boot
     '';
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 0eeff31d6c4..64bdbf159d5 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -587,10 +587,10 @@ in
 
     nix.systemFeatures = mkDefault (
       [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
-      optionals (pkgs.hostPlatform.platform ? gcc.arch) (
-        # a builder can run code for `platform.gcc.arch` and inferior architectures
-        [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++
-        map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch}
+      optionals (pkgs.hostPlatform ? gcc.arch) (
+        # a builder can run code for `gcc.arch` and inferior architectures
+        [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++
+        map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch}
       )
     );
 
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 03d7e749323..b0f77ca3fb8 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -190,7 +190,7 @@ in
 
     system.boot.loader.kernelFile = mkOption {
       internal = true;
-      default = pkgs.stdenv.hostPlatform.platform.kernelTarget;
+      default = pkgs.stdenv.hostPlatform.linux-kernel.target;
       type = types.str;
       description = ''
         Name of the kernel file to be passed to the bootloader.
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index 2d27611946e..fee567a510b 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -59,7 +59,7 @@ in
 
     system.build.installBootLoader = generationsDirBuilder;
     system.boot.loader.id = "generationsDir";
-    system.boot.loader.kernelFile = platform.kernelTarget;
+    system.boot.loader.kernelFile = linux-kernel.target;
 
   };
 }
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index ba936b26573..db22dd36cbe 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -103,6 +103,6 @@ in
 
     system.build.installBootLoader = builder;
     system.boot.loader.id = "raspberrypi";
-    system.boot.loader.kernelFile = platform.kernelTarget;
+    system.boot.loader.kernelFile = linux-kernel.target;
   };
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index 1f5c1581269..109747945f7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -79,7 +79,7 @@ let
     in
       tarball //
         { meta = {
-            description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.platform.name}";
+            description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.linux-kernel.name}";
             maintainers = map (x: lib.maintainers.${x}) maintainers;
           };
           inherit config;
@@ -105,7 +105,7 @@ let
         modules = makeModules module {};
       };
       build = configEvaled.config.system.build;
-      kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget;
+      kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.linux-kernel.target;
     in
       pkgs.symlinkJoin {
         name = "netboot";
diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix
index dd7e8b062da..1cb9c0f18bf 100644
--- a/pkgs/applications/audio/virtual-ans/default.nix
+++ b/pkgs/applications/audio/virtual-ans/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   startScript = if stdenv.isx86_32 then "START_LINUX_X86"
     else        if stdenv.isx86_64 then "START_LINUX_X86_64"
     #else        if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin
-    else abort "Unsupported platform: ${stdenv.platform.kernelArch}.";
+    else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}.";
 
   linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86"
     else            if stdenv.isx86_64 then "pixilang_linux_x86_64"
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 3ad540e5307..848b93a5381 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -75,7 +75,7 @@ in
 
     CROSVM_CARGO_TEST_KERNEL_BINARY =
       lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform)
-        "${linux}/${stdenv.hostPlatform.platform.kernelTarget}";
+        "${linux}/${stdenv.hostPlatform.linux-kernel.target}";
 
     passthru = {
       inherit adhdSrc;
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index 33d707a5007..8c41a1f4c27 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''(
     cd src
-    ./mk.sh ${stdenv.buildPlatform.platform.kernelArch}
+    ./mk.sh ${stdenv.buildPlatform.linuxArch}
   )'';
 
   installPhase = ''
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index bd3ebdf800e..e0d43739668 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation {
       else if targetPlatform.isRiscV then "lriscv"
       else throw "unknown emulation for platform: ${targetPlatform.config}";
     in if targetPlatform.useLLVM or false then ""
-       else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
+       else targetPlatform.bfdEmulation or (fmt + sep + arch);
 
   strictDeps = true;
   depsTargetTargetPropagated = extraPackages;
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d1d5f8e6c86..faa62cb5b12 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -403,31 +403,31 @@ stdenv.mkDerivation {
     # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
     # that case.
     + optionalString ((targetPlatform ? platform.gcc.arch) &&
-                      isGccArchSupported targetPlatform.platform.gcc.arch) ''
-      echo "-march=${targetPlatform.platform.gcc.arch}" >> $out/nix-support/cc-cflags-before
+                      isGccArchSupported targetPlatform.gcc.arch) ''
+      echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
     ''
 
     # -mcpu is not very useful. You should use mtune and march
     # instead. It’s provided here for backwards compatibility.
     + optionalString (targetPlatform ? platform.gcc.cpu) ''
-      echo "-mcpu=${targetPlatform.platform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
+      echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
     ''
 
     # -mfloat-abi only matters on arm32 but we set it here
     # unconditionally just in case. If the abi specifically sets hard
     # vs. soft floats we use it here.
     + optionalString (targetPlatform ? platform.gcc.float-abi) ''
-      echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
+      echo "-mfloat-abi=${targetPlatform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
     ''
     + optionalString (targetPlatform ? platform.gcc.fpu) ''
-      echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
+      echo "-mfpu=${targetPlatform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
     ''
     + optionalString (targetPlatform ? platform.gcc.mode) ''
-      echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before
+      echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before
     ''
     + optionalString (targetPlatform ? platform.gcc.tune &&
-                      isGccArchSupported targetPlatform.platform.gcc.tune) ''
-      echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before
+                      isGccArchSupported targetPlatform.gcc.tune) ''
+      echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before
     ''
 
     # TODO: categorize these and figure out a better place for them
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 901eb311a88..9af40d33242 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -56,13 +56,13 @@ in
 , prepend ? []
 
 # Whether to wrap the initramfs in a u-boot image.
-, makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage"
+, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target == "uImage"
 
 # If generating a u-boot image, the architecture to use. The default
 # guess may not align with u-boot's nomenclature correctly, so it can
 # be overridden.
 # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list.
-, uInitrdArch ? stdenvNoCC.hostPlatform.kernelArch
+, uInitrdArch ? stdenvNoCC.hostPlatform.linuxArch
 
 # The name of the compression, as recognised by u-boot.
 # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list.
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 5f3c7e1d621..215782368f6 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,6 +1,6 @@
 { pkgs
 , kernel ? pkgs.linux
-, img ? pkgs.stdenv.hostPlatform.platform.kernelTarget
+, img ? pkgs.stdenv.hostPlatform.linux-kernel.target
 , storeDir ? builtins.storeDir
 , rootModules ?
     [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index f3cdce41193..66af8c4a4cc 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,7 +1,7 @@
 { lib, targetPlatform }:
 
 let
-  p =  targetPlatform.platform.gcc or {}
+  p =  targetPlatform.gcc or {}
     // targetPlatform.parsed.abi;
 in lib.concatLists [
   (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 0325632ad0a..78f7c2ef1b9 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
     let
       arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
index 8096af0b320..2a270b7c72c 100644
--- a/pkgs/development/compilers/julia/1.3.nix
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix
index be3cfc39635..778a9c3a9d7 100644
--- a/pkgs/development/compilers/julia/1.5.nix
+++ b/pkgs/development/compilers/julia/1.5.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 6b17e463d76..6637a9bb2a3 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -158,7 +158,7 @@ stdenv.mkDerivation ({
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
     ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       (lib.flip lib.withFeature "fp"
-         (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
+         (stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
       "--with-__thread"
     ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [
       "--host=arm-linux-gnueabi"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index e6ab23073b1..1a3f1948f84 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -88,7 +88,7 @@ qtModule {
   NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
     # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
     "-Wno-class-memaccess"
-  ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
+  ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
     # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
     # TODO: investigate and fix properly
     "-march=westmere"
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index e333bd49718..edf556377b3 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -73,9 +73,9 @@ let
         if isLinux
         then
           (
-            x: x.platform == "manylinux1_${stdenv.platform.kernelArch}"
-              || x.platform == "manylinux2010_${stdenv.platform.kernelArch}"
-              || x.platform == "manylinux2014_${stdenv.platform.kernelArch}"
+            x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}"
+              || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}"
+              || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}"
               || x.platform == "any"
           )
         else (x: hasInfix "macosx" x.platform || x.platform == "any");
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index ba8145398f5..ea2f27b0e22 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -95,7 +95,7 @@ let
           else if stdenv.isDarwin then "darwin"
           else throw "Unsupported platform"
         );
-        platform_machine = stdenv.platform.kernelArch;
+        platform_machine = stdenv.hostPlatform.linuxArch;
         platform_python_implementation =
           let
             impl = python.passthru.implementation;
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 5308149c26b..ccea8ee4553 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -60,18 +60,17 @@ in
 
     configureFlags = let
       isCross = stdenv.hostPlatform != stdenv.buildPlatform;
-      host = stdenv.hostPlatform.platform;
-      isAarch32 = stdenv.hostPlatform.isAarch32;
+      inherit (stdenv.hostPlatform) gcc isArch32;
     in sharedConfigureFlags ++ [
       "--without-dtrace"
     ] ++ (optionals isCross [
       "--cross-compiling"
       "--without-intl"
       "--without-snapshot"
-    ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
-      "--with-arm-fpu=${host.gcc.fpu}"
-    ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
-      "--with-arm-float-abi=${host.gcc.float-abi}"
+    ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [
+      "--with-arm-fpu=${gcc.fpu}"
+    ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [
+      "--with-arm-float-abi=${gcc.float-abi}"
     ]) ++ (optionals (isCross && isAarch32) [
       "--dest-cpu=arm"
     ]) ++ extraConfigFlags;
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index 88792346d70..958bcdb9f16 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
   ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index cadf65a7220..d6ed7bccba3 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -7,7 +7,7 @@ let
     pname = "linux-headers";
     inherit version;
 
-    ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch;
+    ARCH = stdenvNoCC.hostPlatform.linuxArch;
 
     # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
     # We do this so we have a build->build, not build->host, C compiler.
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 31a90dc740f..ac9d6fbb2b5 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -42,7 +42,7 @@
   # symbolic name and `patch' is the actual patch.  The patch may
   # optionally be compressed with gzip or bzip2.
   kernelPatches ? []
-, ignoreConfigErrors ? stdenv.hostPlatform.platform.name != "pc" ||
+, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc" ||
                        stdenv.hostPlatform != stdenv.buildPlatform
 , extraMeta ? {}
 
@@ -51,10 +51,10 @@
 , isLibre    ? false
 , isHardened ? false
 
-# easy overrides to stdenv.hostPlatform.platform members
-, autoModules ? stdenv.hostPlatform.platform.kernelAutoModules
-, preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false
-, kernelArch ? stdenv.hostPlatform.platform.kernelArch
+# easy overrides to stdenv.hostPlatform.linux-kernel members
+, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules
+, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false
+, kernelArch ? stdenv.hostPlatform.linuxArch
 
 , ...
 }:
@@ -87,7 +87,7 @@ let
   intermediateNixConfig = configfile.moduleStructuredConfig.intermediateNixConfig
     # extra config in legacy string format
     + extraConfig
-    + lib.optionalString (stdenv.hostPlatform.platform ? kernelExtraConfig) stdenv.hostPlatform.platform.kernelExtraConfig;
+    + stdenv.hostPlatform.linux-kernel.extraConfig or "";
 
   structuredConfigFromPatches =
         map ({extraStructuredConfig ? {}, ...}: {settings=extraStructuredConfig;}) kernelPatches;
@@ -113,11 +113,11 @@ let
     nativeBuildInputs = [ perl gmp libmpc mpfr ]
       ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ];
 
-    platformName = stdenv.hostPlatform.platform.name;
+    platformName = stdenv.hostPlatform.linux-kernel.name;
     # e.g. "defconfig"
-    kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.platform.kernelBaseConfig;
+    kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
     # e.g. "bzImage"
-    kernelTarget = stdenv.hostPlatform.platform.kernelTarget;
+    kernelTarget = stdenv.hostPlatform.linux-kernel.target;
 
     prePatch = kernel.prePatch + ''
       # Patch kconfig to print "###" after every question so that
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 67016b71918..2fc63322f5b 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -64,10 +64,10 @@ let
 
   commonMakeFlags = [
     "O=$(buildRoot)"
-  ] ++ lib.optionals (stdenv.hostPlatform.platform ? kernelMakeFlags)
-    stdenv.hostPlatform.platform.kernelMakeFlags;
+  ] ++ lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags)
+    stdenv.hostPlatform.linux-kernel.makeFlags;
 
-  drvAttrs = config_: platform: kernelPatches: configfile:
+  drvAttrs = config_: kernelConf: kernelPatches: configfile:
     let
       config = let attrName = attr: "CONFIG_" + attr; in {
         isSet = attr: hasAttr (attrName attr) config;
@@ -171,7 +171,7 @@ let
 
       buildFlags = [
         "KBUILD_BUILD_VERSION=1-NixOS"
-        platform.kernelTarget
+        kernelConf.target
         "vmlinux"  # for "perf" and things like that
       ] ++ optional isModular "modules";
 
@@ -186,16 +186,16 @@ let
       '';
 
       # Some image types need special install targets (e.g. uImage is installed with make uinstall)
-      installTargets = [ (
-        if platform ? kernelInstallTarget then platform.kernelInstallTarget
-        else if platform.kernelTarget == "uImage" then "uinstall"
-        else if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall"
-        else "install"
-      ) ];
+      installTargets = [
+        (kernelConf.installTarget or (
+          /**/ if kernelConf.target == "uImage" then "uinstall"
+          else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall"
+          else "install"))
+      ];
 
       postInstall = (optionalString installsFirmware ''
         mkdir -p $out/lib/firmware
-      '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
+      '') + (if (kernelConf.DTB or false) then ''
         make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
       '' else "") + (if isModular then ''
         mkdir -p $dev
@@ -300,7 +300,7 @@ in
 assert (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") -> libelf != null;
 assert lib.versionAtLeast version "5.8" -> elfutils != null;
 
-stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
+stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // {
   pname = "linux";
   inherit version;
 
@@ -308,7 +308,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ]
-      ++ optional  (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
+      ++ optional  (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools
       ++ optional  (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf
       # Removed util-linuxMinimal since it should not be a dependency.
       ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
@@ -322,10 +322,10 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
   makeFlags = commonMakeFlags ++ [
     "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
     "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
-    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
   ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
-  karch = stdenv.hostPlatform.platform.kernelArch;
+  karch = stdenv.hostPlatform.linuxArch;
 })
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 65ab71bd562..dc96f3b6a62 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" "stackprotector" ];
 
   makeFlags = commonMakeFlags ++ [
-    "KLIBCARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "KLIBCARCH=${stdenv.hostPlatform.linuxArch}"
     "KLIBCKERNELSRC=${linuxHeaders}"
   ] # TODO(@Ericson2314): We now can get the ABI from
     # `stdenv.hostPlatform.parsed.abi`, is this still a good idea?
-    ++ lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y"
+    ++ lib.optional (stdenv.hostPlatform.linuxArch == "arm") "CONFIG_AEABI=y"
     ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
 
   # Install static binaries as well.
diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index 056fd40d252..a862b351716 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ nukeReferences ];
 
   makeFlags = [
-    "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
+    "ARCH=${stdenv.hostPlatform.linuxArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us.
   ];
 
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index aeed87d3c19..68a88fb6778 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))
     ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 7c95a98372d..7508e1faf15 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation {
     cat << EOF | parseconfig
     ${nixConfig}
     ${extraConfig}
-    ${stdenv.hostPlatform.platform.uclibc.extraConfig or ""}
+    ${stdenv.hostPlatform.uclibc.extraConfig or ""}
     EOF
     ( set +o pipefail; yes "" | make oldconfig )
   '';
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 0eb799e4525..e8ccd02c041 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -279,7 +279,7 @@ in rec {
         } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
           NIX_HARDENING_ENABLE = enabledHardeningOptions;
         } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? platform.gcc.arch) {
-          requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch}" ];
+          requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ];
         } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
           inherit __darwinAllowLocalNetworking;
           # TODO: remove lib.unique once nix has a list canonicalization primitive
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5985483c4ed..5db97df7b29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19284,7 +19284,7 @@ in
     buildPhase = ''
       set -x
       make \
-        ARCH=${stdenv.hostPlatform.kernelArch} \
+        ARCH=${stdenv.hostPlatform.linuxArch} \
         HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \
         ${makeTarget}
     '';

From bdf7a8aa8e8df20bb88e51e5454f5f01d0098f8a Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Fri, 22 Jan 2021 11:58:27 +0800
Subject: [PATCH 521/956] fcitx5-lua: remove unnecessary interpolation

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
index 5bf1cc76632..6184ea36549 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-lua";
-    rev = "${version}";
+    rev = version;
     sha256 = "sha256-lFlHn2q/kpq1EIKKhYVdJofXqtOHnpLz7PoWuNAhmhE=";
   };
 

From a6fe2229111dbcb526d07bd18f3c2d0bcd76d981 Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Fri, 22 Jan 2021 00:31:02 -0500
Subject: [PATCH 522/956] cagebreak: 1.4.4 -> 1.5.0

---
 pkgs/applications/window-managers/cagebreak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index f0da8fac69c..a4e5d7f7028 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cagebreak";
-  version = "1.4.4";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "project-repo";
     repo = "cagebreak";
     rev = version;
-    hash = "sha256-YmUn5H0xNC/4MBGydrEk7dy5v+s2ja4VoA1neWrQ3VY=";
+    hash = "sha256-P6zBVQEv+fKdverNIXhoEavu51uGKbSHx3Sh5FWsc2E=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];

From 93e31f2a78db66ecf3aa497c7fbed758655eea2e Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sat, 26 Dec 2020 18:52:48 +0100
Subject: [PATCH 523/956] ocamlPackages.wodan: init unstable-2020-11-20

---
 .../ocaml-modules/wodan/default.nix           | 40 +++++++++++++++++++
 .../development/ocaml-modules/wodan/irmin.nix | 20 ++++++++++
 pkgs/development/ocaml-modules/wodan/unix.nix | 27 +++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  6 +++
 4 files changed, 93 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/wodan/default.nix
 create mode 100644 pkgs/development/ocaml-modules/wodan/irmin.nix
 create mode 100644 pkgs/development/ocaml-modules/wodan/unix.nix

diff --git a/pkgs/development/ocaml-modules/wodan/default.nix b/pkgs/development/ocaml-modules/wodan/default.nix
new file mode 100644
index 00000000000..64ca29f2030
--- /dev/null
+++ b/pkgs/development/ocaml-modules/wodan/default.nix
@@ -0,0 +1,40 @@
+{ lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint
+, checkseum, diet, bitv, nocrypto, logs, lru, io-page, mirage-block }:
+
+buildDunePackage rec {
+  pname = "wodan";
+  version = "unstable-2020-11-20";
+
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "mirage";
+    repo = pname;
+    rev = "cc08fe25888051c207f1009bcd2d39f8c514484f";
+    sha256 = "0186vlhnl8wcz2hmpn327n9a0bibnypmjy3w4nxq3yyglh6vj1im";
+    fetchSubmodules = true;
+  };
+
+  minimumOCamlVersion = "4.08";
+
+  propagatedBuildInputs = [
+    lwt_ppx
+    ppx_cstruct
+    optint
+    checkseum
+    diet
+    bitv
+    nocrypto
+    logs
+    lru
+    io-page
+    mirage-block
+  ];
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "A flash-friendly, safe and flexible filesystem library";
+    license = licenses.isc;
+    maintainers = with maintainers; [ ehmry ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/wodan/irmin.nix b/pkgs/development/ocaml-modules/wodan/irmin.nix
new file mode 100644
index 00000000000..a42259af9e6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/wodan/irmin.nix
@@ -0,0 +1,20 @@
+{ lib, buildDunePackage, io-page-unix, irmin-chunk, irmin-git, irmin-unix
+, mirage-block-ramdisk, mirage-block-unix, wodan }:
+
+buildDunePackage rec {
+  pname = "wodan-irmin";
+  inherit (wodan) version src useDune2;
+
+  propagatedBuildInputs = [
+    io-page-unix
+    irmin-chunk
+    irmin-git
+    irmin-unix
+    mirage-block-ramdisk
+    mirage-block-unix
+    wodan
+  ];
+
+  meta = wodan.meta // { description = "Wodan as an Irmin store"; };
+
+}
diff --git a/pkgs/development/ocaml-modules/wodan/unix.nix b/pkgs/development/ocaml-modules/wodan/unix.nix
new file mode 100644
index 00000000000..64a18b6b83d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/wodan/unix.nix
@@ -0,0 +1,27 @@
+{ lib, buildDunePackage, base64, benchmark, csv, cmdliner, wodan, afl-persistent
+, io-page-unix, mirage-block-ramdisk, mirage-block-unix }:
+
+buildDunePackage rec {
+  outputs = [ "bin" "out" ];
+  pname = "wodan-unix";
+  inherit (wodan) version src useDune2;
+
+  propagatedBuildInputs = [
+    afl-persistent
+    base64
+    benchmark
+    cmdliner
+    csv
+    io-page-unix
+    mirage-block-ramdisk
+    mirage-block-unix
+    wodan
+  ];
+
+  postInstall = ''
+    moveToOutput bin "''${!outputBin}"
+  '';
+
+  meta = wodan.meta // { description = "Wodan clients with Unix integration"; };
+
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 97650eca2c6..78b5959f3c2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1075,6 +1075,12 @@ let
 
     webmachine = callPackage ../development/ocaml-modules/webmachine { };
 
+    wodan = callPackage ../development/ocaml-modules/wodan { };
+
+    wodan-irmin = callPackage ../development/ocaml-modules/wodan/irmin.nix { };
+
+    wodan-unix = callPackage ../development/ocaml-modules/wodan/unix.nix { };
+
     wtf8 = callPackage ../development/ocaml-modules/wtf8 { };
 
     x509 = callPackage ../development/ocaml-modules/x509 { };

From f82325b55a1a311e2dff251ec4d7402245ef42f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 01:54:39 +0000
Subject: [PATCH 524/956] python37Packages.aiolifx: 0.6.8 -> 0.6.9

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

diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix
index 7b33b1c508f..748ed242ae9 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "aiolifx";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9f9055bc2a9a72c5eab17e0ce5522edecd6de07e21cf347bf0cffabdabe5570e";
+    sha256 = "0c28e9c058ee504a07eec11cb333bc6496d233da100dcab9c33549e9eb4985c0";
   };
 
   # tests are not implemented

From 1e3e562cdca325d2c61f48181883d4590d4c94ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 01:41:09 +0000
Subject: [PATCH 525/956] python37Packages.ROPGadget: 6.4 -> 6.5

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

diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix
index a342b46e3d6..ebedb3c6969 100644
--- a/pkgs/development/python-modules/ROPGadget/default.nix
+++ b/pkgs/development/python-modules/ROPGadget/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "ROPGadget";
-  version = "6.4";
+  version = "6.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "51d7cbdf51ac8b3f3f00bc0d4ae44433ef58d3bf5495efb316ec918654f1e6c3";
+    sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c";
   };
 
   propagatedBuildInputs = [ capstone ];

From 0f864eb45b2e868d0b4bf00cce5e8513f683f930 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 15 Jan 2021 10:52:05 +0100
Subject: [PATCH 526/956] ocamlPackages.hxd: init at 0.2.0

---
 .../development/ocaml-modules/hxd/default.nix | 41 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/hxd/default.nix

diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix
new file mode 100644
index 00000000000..1d677ac1a2e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/hxd/default.nix
@@ -0,0 +1,41 @@
+{ lib, buildDunePackage, fetchurl
+, dune-configurator, cmdliner, angstrom
+, rresult, stdlib-shims, fmt, fpath
+}:
+
+buildDunePackage rec {
+  pname = "hxd";
+  version = "0.2.0";
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.06";
+
+  src = fetchurl {
+    url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
+    sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l";
+  };
+
+  nativeBuildInputs = [
+    dune-configurator
+  ];
+
+  buildInputs = [
+    cmdliner
+    angstrom
+    rresult
+    fmt
+    fpath
+  ];
+
+  propagatedBuildInputs = [
+    stdlib-shims
+  ];
+
+  meta = with lib; {
+    description = "Hexdump in OCaml";
+    homepage = "https://github.com/dinosaure/hxd";
+    license = licenses.mit;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 78b5959f3c2..17653a93d74 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -361,6 +361,8 @@ let
 
     hmap = callPackage ../development/ocaml-modules/hmap { };
 
+    hxd = callPackage ../development/ocaml-modules/hxd { };
+
     imagelib = callPackage ../development/ocaml-modules/imagelib { };
 
     imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { };

From 3a43bbbc7cec9254d18bb36946822a3001c2d960 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jan 2021 23:55:34 +0100
Subject: [PATCH 527/956] python3Packages.atenpdu: init at 0.3.1

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

diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix
new file mode 100644
index 00000000000..c8307608204
--- /dev/null
+++ b/pkgs/development/python-modules/atenpdu/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pysnmp
+}:
+
+buildPythonPackage rec {
+  pname = "atenpdu";
+  version = "0.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1np9p3d180c26p54nw33alb003lhx6fprr21h45dd8gqk3slm13c";
+  };
+
+  propagatedBuildInputs = [ pysnmp ];
+
+  # Project has no test
+  doCheck = false;
+  pythonImportsCheck = [ "atenpdu" ];
+
+  meta = with lib; {
+    description = "Python interface to control ATEN PE PDUs";
+    homepage = "https://github.com/mtdcr/pductl";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5744c8db921..1ae8fab8847 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -492,6 +492,8 @@ in {
 
   asysocks = callPackage ../development/python-modules/asysocks { };
 
+  atenpdu = callPackage ../development/python-modules/atenpdu { };
+
   atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
 
   atom = callPackage ../development/python-modules/atom { };

From 68f5b962237e9a99fe89de372146dac6f66d4c02 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jan 2021 23:56:20 +0100
Subject: [PATCH 528/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index b3d2247cb35..b1dcbeae5d4 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -53,7 +53,7 @@
     "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
     "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt
     "atag" = ps: with ps; [ ]; # missing inputs: pyatag
-    "aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu
+    "aten_pe" = ps: with ps; [ atenpdu ];
     "atome" = ps: with ps; [ ]; # missing inputs: pyatome
     "august" = ps: with ps; [ ]; # missing inputs: py-august
     "aurora" = ps: with ps; [ ]; # missing inputs: auroranoaa

From 40021798b821294fd2c21dc6539f5ecffecf7d54 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 00:04:21 +0100
Subject: [PATCH 529/956] python3Packages.hatasmota: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix
index 91693343457..d375effd160 100644
--- a/pkgs/development/python-modules/hatasmota/default.nix
+++ b/pkgs/development/python-modules/hatasmota/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "hatasmota";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "emontnemery";
     repo = pname;
     rev = version;
-    sha256 = "1xsqrpd0dprjfaa2yrdy1g9n4xyrw6ifnzkrh3sq5fx0yfmxbzqm";
+    sha256 = "sha256-kRTgHFRnhjLM2DhKNy9HDKIsRk+w0AKP+o0hy8w+3ys=";
   };
 
   propagatedBuildInputs = [

From be14c2084d041f2c30f8532fa0b750d1535dd0a1 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <juloo.dsi@gmail.com>
Date: Wed, 13 Jan 2021 16:09:33 +0100
Subject: [PATCH 530/956] ocamlPackages.ppxlib: Add version 0.18.0

The default version is still 0.15.0 to avoid breaking other packages.
---
 .../ocaml-modules/ppxlib/default.nix          | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index d5b09b1ddc2..03085a13cdf 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -1,21 +1,29 @@
 { lib, fetchFromGitHub, buildDunePackage, ocaml
 , version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0"
 , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
-, stdlib-shims
+, stdlib-shims, ocaml-migrate-parsetree-2-1
 }:
 
 let param = {
   "0.8.1" = {
     sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
     max_version = "4.10";
+    useDune2 = false;
+    useOMP2 = false;
   };
   "0.13.0" = {
     sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl";
+    useDune2 = false;
+    useOMP2 = false;
   };
   "0.15.0" = {
     sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
     min_version = "4.07";
-    useDune2 = true;
+    useOMP2 = false;
+  };
+  "0.18.0" = {
+    sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm";
+    min_version = "4.07";
   };
 }."${version}"; in
 
@@ -28,7 +36,7 @@ buildDunePackage rec {
   pname = "ppxlib";
   inherit version;
 
-  useDune2 = param.useDune2 or false;
+  useDune2 = param.useDune2 or true;
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
@@ -38,7 +46,12 @@ buildDunePackage rec {
   };
 
   propagatedBuildInputs = [
-    ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
+    ocaml-compiler-libs
+    (if param.useOMP2 or true
+     then ocaml-migrate-parsetree-2-1
+     else ocaml-migrate-parsetree)
+    ppx_derivers
+    stdio
     stdlib-shims
   ];
 

From bf010dac668c26989a6ffef967730076eb46ed12 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <juloo.dsi@gmail.com>
Date: Wed, 13 Jan 2021 16:10:59 +0100
Subject: [PATCH 531/956] ocamlformat: Add versions 0.15.1 and 0.16.0

---
 .../tools/ocaml/ocamlformat/default.nix       | 10 +++++++++-
 .../tools/ocaml/ocamlformat/generic.nix       | 20 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  3 ++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix
index 1de95187af2..57061cfe126 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix
@@ -40,5 +40,13 @@ rec {
     version = "0.15.0";
   };
 
-  ocamlformat = ocamlformat_0_15_0;
+  ocamlformat_0_15_1 = mkOCamlformat {
+    version = "0.15.1";
+  };
+
+  ocamlformat_0_16_0 = mkOCamlformat {
+    version = "0.16.0";
+  };
+
+  ocamlformat = ocamlformat_0_16_0;
 }
diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix
index 8fac26c2b3e..24527fcf41a 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix
+++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix
@@ -18,6 +18,8 @@ let src =
       "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz";
       "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl";
       "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
+      "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
+      "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
     }."${version}";
   }
 ; in
@@ -39,7 +41,23 @@ buildDunePackage rec {
   useDune2 = true;
 
   buildInputs =
-    if lib.versionAtLeast version "0.14"
+    if lib.versionAtLeast version "0.15.1"
+    then [
+      base
+      cmdliner
+      fpath
+      odoc
+      re
+      stdio
+      uuseg
+      uutf
+      fix
+      menhir
+      (ppxlib.override { version = "0.18.0"; })
+      dune-build-info # lib.versionAtLeast version "0.16.0"
+      ocaml-version # lib.versionAtLeast version "0.16.0"
+    ]
+    else if lib.versionAtLeast version "0.14"
     then [
       base
       cmdliner
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d13ca561c2..bfd6b6214c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10491,7 +10491,8 @@ in
   inherit (callPackage ../development/tools/ocaml/ocamlformat { })
     ocamlformat # latest version
     ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
-    ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0;
+    ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
+    ocamlformat_0_15_1 ocamlformat_0_16_0;
 
   orc = callPackage ../development/compilers/orc { };
 

From 47818a1ff393841a84193aed20de386b95e575db Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 15 Jan 2021 12:12:14 +0100
Subject: [PATCH 532/956] ocamlPackages.pecu: init at 0.5

---
 .../ocaml-modules/pecu/default.nix            | 26 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/pecu/default.nix

diff --git a/pkgs/development/ocaml-modules/pecu/default.nix b/pkgs/development/ocaml-modules/pecu/default.nix
new file mode 100644
index 00000000000..0059bbdec3c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pecu/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest }:
+
+buildDunePackage rec {
+  pname = "pecu";
+  version = "0.5";
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.03";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/pecu/releases/download/v0.5/pecu-v0.5.tbz";
+    sha256 = "713753cd6ba3f4609a26d94576484e83ffef7de5f2208a2993576a1b22f0e0e7";
+  };
+
+  # fmt availability
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
+  checkInputs = [ fmt alcotest ];
+
+  meta = with lib; {
+    description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)";
+    license = licenses.mit;
+    homepage = "https://github.com/mirage/pecu";
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 17653a93d74..1f06e4d9bb0 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -847,6 +847,8 @@ let
 
     pcap-format = callPackage ../development/ocaml-modules/pcap-format { };
 
+    pecu = callPackage ../development/ocaml-modules/pecu { };
+
     pgsolver = callPackage ../development/ocaml-modules/pgsolver { };
 
     phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };

From b424ecd84eaf1c68a2a3b78b27bd387a4b85578a Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 15 Jan 2021 12:12:36 +0100
Subject: [PATCH 533/956] ocamlPackages.emile: init at 1.1

---
 .../ocaml-modules/emile/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/emile/default.nix

diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix
new file mode 100644
index 00000000000..d296e3de967
--- /dev/null
+++ b/pkgs/development/ocaml-modules/emile/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildDunePackage, fetchurl, ocaml
+, angstrom, ipaddr, base64, pecu, uutf
+, alcotest, cmdliner
+}:
+
+buildDunePackage rec {
+  pname = "emile";
+  version = "1.1";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/dinosaure/emile/releases/download/v${version}/emile-v${version}.tbz";
+    sha256 = "0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p";
+  };
+
+  buildInputs = [ cmdliner ];
+
+  propagatedBuildInputs = [
+    angstrom
+    ipaddr
+    base64
+    pecu
+    uutf
+  ];
+
+  # technically emile is available for ocaml >= 4.03, but alcotest
+  # and angstrom (fmt) are only available for >= 4.05. Disabling
+  # tests for < 4.05 at least improves the error message
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
+  checkInputs = [ alcotest ];
+
+  meta = with lib; {
+    description = "Parser of email address according RFC822";
+    license = licenses.mit;
+    homepage = "https://github.com/dinosaure/emile";
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1f06e4d9bb0..e0812b7c29c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -285,6 +285,8 @@ let
 
     encore = callPackage ../development/ocaml-modules/encore { };
 
+    emile = callPackage ../development/ocaml-modules/emile { };
+
     enumerate = callPackage ../development/ocaml-modules/enumerate { };
 
     eqaf = callPackage ../development/ocaml-modules/eqaf { };

From 038ab72940d4eac766e3fb1cb1e06ee9322c8a89 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 09:33:10 +0100
Subject: [PATCH 534/956] python3Packages.cattrs: init at 1.1.2

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

diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
new file mode 100644
index 00000000000..a48e29b827b
--- /dev/null
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, hypothesis
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "cattrs";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "Tinche";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "083d5mi6x7qcl26wlvwwn7gsp5chxlxkh4rp3a41w8cfwwr3h6l8";
+  };
+
+  propagatedBuildInputs = [ attrs ];
+
+  checkInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "cattr" ];
+
+  meta = with lib; {
+    description = "Python custom class converters for attrs";
+    homepage = "https://github.com/Tinche/cattrs";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5744c8db921..3edbe5de92d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1161,6 +1161,8 @@ in {
 
   catboost = callPackage ../development/python-modules/catboost { };
 
+  cattrs = callPackage ../development/python-modules/cattrs { };
+
   cbeams = callPackage ../misc/cbeams { };
 
   cbor2 = callPackage ../development/python-modules/cbor2 { };

From e3b4a6c2d8291c37476be4c0f769096ad7fec610 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 22 Jan 2021 09:33:43 +0100
Subject: [PATCH 535/956] sfeed: init at 0.9.20 (#107173)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/tools/misc/sfeed/default.nix | 32 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/sfeed/default.nix

diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix
new file mode 100644
index 00000000000..6f205db432f
--- /dev/null
+++ b/pkgs/tools/misc/sfeed/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchgit }:
+
+stdenv.mkDerivation rec {
+  pname = "sfeed";
+  version = "0.9.20";
+
+  src = fetchgit {
+    url = "git://git.codemadness.org/sfeed";
+    rev = version;
+    sha256 = "17bs31wns71fx7s06rdzqkghkgv86r9d9i3814rznyzi9484c7aq";
+  };
+
+  installPhase = ''
+    mkdir $out
+    make install PREFIX=$out
+  '';
+
+  meta = with lib; {
+    homepage = "https://codemadness.org/sfeed-simple-feed-parser.html";
+    description = "A RSS and Atom parser (and some format programs)";
+    longDescription = ''
+      It converts RSS or Atom feeds from XML to a TAB-separated file. There are
+      formatting programs included to convert this TAB-separated format to
+      various other formats. There are also some programs and scripts included
+      to import and export OPML and to fetch, filter, merge and order feed
+      items.
+    '';
+    license = licenses.isc;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfd6b6214c2..4158844db8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7662,6 +7662,8 @@ in
 
   sewer = callPackage ../tools/admin/sewer { };
 
+  sfeed = callPackage ../tools/misc/sfeed { };
+
   sftpman = callPackage ../tools/filesystems/sftpman { };
 
   screenfetch = callPackage ../tools/misc/screenfetch { };

From 3609a43b5eb8dc3bf2b4dac8d8cfb296efc1dc9e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 22 Jan 2021 09:33:43 +0100
Subject: [PATCH 536/956] mutt: 2.0.4 -> 2.0.5

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 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 5120f9291c9..874fa0d42e5 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "mutt";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    sha256 = "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225";
+    sha256 = "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2";
   };
 
   patches = optional smimeSupport (fetchpatch {

From ee73665fa096ab3b5d88c1cd1c8ba8bd3366082a Mon Sep 17 00:00:00 2001
From: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
Date: Mon, 11 Jan 2021 11:51:00 +0100
Subject: [PATCH 537/956] appgate-sdp: 5.1.2 -> 5.3.2

---
 .../networking/appgate-sdp/default.nix        | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix
index 57b25841c99..56f2162bf08 100644
--- a/pkgs/applications/networking/appgate-sdp/default.nix
+++ b/pkgs/applications/networking/appgate-sdp/default.nix
@@ -20,6 +20,8 @@
 , iproute
 , krb5
 , lib
+, mesa
+, libdrm
 , libX11
 , libXScrnSaver
 , libXcomposite
@@ -65,6 +67,8 @@ let
     gtk3
     icu
     krb5
+    mesa
+    libdrm
     libX11
     libXScrnSaver
     libXcomposite
@@ -92,11 +96,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "appgate-sdp";
-  version = "5.1.2";
+  version = "5.3.2";
 
   src = fetchurl {
-    url = "https://bin.appgate-sdp.com/5.1/client/appgate-sdp_${version}_amd64.deb";
-    sha256 = "0v4vfibg1giml3vfz2w7qypqzymvfchi5qm6vfagah2vfbkw7xc2";
+    url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
+    sha256 = "123d4mx2nsh8q3ckm4g2chdcdwgg0cz9cvhiwjggxzvy7j6bqgy4";
   };
 
   dontConfigure = true;
@@ -123,26 +127,35 @@ stdenv.mkDerivation rec {
     cp -r $out/usr/share $out/share
 
     for file in $out/opt/appgate/linux/appgate-resolver.pre \
-                $out/opt/appgate/linux/appgate-dumb-resolver.pre \
-                $out/lib/systemd/system/appgatedriver.service \
-                $out/lib/systemd/system/appgate-dumb-resolver.service \
-                $out/lib/systemd/system/appgate-resolver.service
+                $out/opt/appgate/linux/appgate-dumb-resolver.pre
     do
       substituteInPlace $file \
         --replace "/bin/sh" "${bash}/bin/sh" \
-        --replace "/opt/" "$out/opt/" \
-        --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" \
-        --replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media" \
         --replace "cat" "${coreutils}/bin/cat" \
         --replace "chattr" "${e2fsprogs}/bin/chattr" \
         --replace "mv" "${coreutils}/bin/mv" \
         --replace "pkill" "${procps}/bin/pkill"
     done
 
+    for file in $out/lib/systemd/system/appgatedriver.service \
+                $out/lib/systemd/system/appgate-dumb-resolver.service \
+                $out/lib/systemd/system/appgate-resolver.service
+    do
+      substituteInPlace $file \
+        --replace "/bin/sh" "${bash}/bin/sh" \
+        --replace "/opt/" "$out/opt/" \
+        --replace "chattr" "${e2fsprogs}/bin/chattr" \
+        --replace "mv" "${coreutils}/bin/mv"
+    done
+
+    substituteInPlace $out/lib/systemd/system/appgatedriver.service \
+        --replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media"
+
+    substituteInPlace $out/lib/systemd/system/appgate-resolver.service \
+        --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
+
     substituteInPlace $out/opt/appgate/linux/nm.py --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
-    substituteInPlace $out/opt/appgate/linux/set_dns \
-      --replace "service appgate-resolver stop" "${systemd.out}/bin/systemctl stop appgate-resolver" \
-      --replace "/etc/appgate.conf" "$out/etc/appgate.conf"
+    substituteInPlace $out/opt/appgate/linux/set_dns --replace "/etc/appgate.conf" "$out/etc/appgate.conf"
 
   '';
 

From 7581c226160b0274278e055ed08bca8f01d4c517 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 09:41:59 +0100
Subject: [PATCH 538/956] python3Packages.bsblan: init at 0.4.1

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

diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix
new file mode 100644
index 00000000000..f670bebc8ed
--- /dev/null
+++ b/pkgs/development/python-modules/bsblan/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, aresponses
+, coverage
+, mypy
+, pytest-asyncio
+, pytest-cov
+, pytest-mock
+, aiohttp
+, attrs
+, cattrs
+, yarl
+}:
+
+buildPythonPackage rec {
+  pname = "bsblan";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "liudger";
+    repo = "python-bsblan";
+    rev = "v.${version}";
+    sha256 = "0vyg9vsrs34jahlav83qp2djv81p3ks31qz4qh46zdij2nx7l1fv";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    attrs
+    cattrs
+    yarl
+  ];
+
+  checkInputs = [
+    aresponses
+    coverage
+    mypy
+    pytest-asyncio
+    pytest-cov
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "bsblan" ];
+
+  meta = with lib; {
+    description = "Python client for BSB-Lan";
+    homepage = "https://github.com/liudger/python-bsblan";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3edbe5de92d..f8749a78ff1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1046,6 +1046,8 @@ in {
 
   bsdiff4 = callPackage ../development/python-modules/bsdiff4 { };
 
+  bsblan = callPackage ../development/python-modules/bsblan { };
+
   btchip = callPackage ../development/python-modules/btchip { };
 
   bt_proximity = callPackage ../development/python-modules/bt-proximity { };

From 819ce289febdd02e15010ec4475db01a0a9ee061 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 09:43:05 +0100
Subject: [PATCH 539/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index b3d2247cb35..cfbe0f489d3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -99,7 +99,7 @@
     "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
     "browser" = ps: with ps; [ ];
     "brunt" = ps: with ps; [ ]; # missing inputs: brunt
-    "bsblan" = ps: with ps; [ ]; # missing inputs: bsblan
+    "bsblan" = ps: with ps; [ bsblan ];
     "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist
     "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist
     "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar

From 5d5acadac5464e69301b7fbb8b91dccca60ec799 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 09:31:30 +0000
Subject: [PATCH 540/956] argocd: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 94c3025c22f..c3e9a774fa9 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "1.8.2";
+  version = "1.8.3";
   commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    sha256 = "sha256-qppJYpTuCA1+5dY8kbtUy2Rd+fG7u+BMxsY7IqFUOf8=";
+    sha256 = "sha256-do5DAxaQ1gBdvNN/YGKAkmkFcJ+j/ojBaWPwrXXQko0=";
   };
 
   vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4=";

From cc4c7328ee9e00b1a145b5ac23e288f7dba24b5d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 10:05:32 +0100
Subject: [PATCH 541/956] python3Packages.starkbank-ecdsa: init at 1.1.0

---
 .../starkbank-ecdsa/default.nix               | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/starkbank-ecdsa/default.nix

diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix
new file mode 100644
index 00000000000..70b66b9a468
--- /dev/null
+++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "starkbank-ecdsa";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "starkbank";
+    repo = "ecdsa-python";
+    rev = "v${version}";
+    sha256 = "03smk33zhmv1j1svgjnykak0jnw8yl0yv03i1gsasx71f33zmfwi";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [ "-v tests/*.py" ];
+  pythonImportsCheck = [ "ellipticcurve" ];
+
+  meta = with lib; {
+    description = "Python ECDSA library";
+    homepage = "https://github.com/starkbank/ecdsa-python";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5744c8db921..dd49d205a3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7365,6 +7365,8 @@ in {
     inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices;
   };
 
+  starkbank-ecdsa = callPackage ../development/python-modules/starkbank-ecdsa { };
+
   staticjinja = callPackage ../development/python-modules/staticjinja { };
 
   statistics = callPackage ../development/python-modules/statistics { };

From 8e8e759c7234ba25245ae833a71b3d1e9882bbfc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 10:15:47 +0100
Subject: [PATCH 542/956] python3Packages.python-http-client: init at 3.3.1

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

diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix
new file mode 100644
index 00000000000..f4b19ba379e
--- /dev/null
+++ b/pkgs/development/python-modules/python-http-client/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "python_http_client";
+  version = "3.3.1";
+
+  src = fetchFromGitHub {
+    owner = "sendgrid";
+    repo = "python-http-client";
+    rev = version;
+    sha256 = "0mbcg0vb9v41v7hbvycrxx5wyrf3ysvfgxkix8hn8c4x5l2lmidc";
+  };
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  # Failure was fixed by https://github.com/sendgrid/python-http-client/commit/6d62911ab0d0645b499e14bb17c302b48f3c10e4
+  disabledTests = [ "test__daterange" ];
+  pythonImportsCheck = [ "python_http_client" ];
+
+  meta = with lib; {
+    description = "Python HTTP library to call APIs";
+    homepage = "https://github.com/sendgrid/python-http-client";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd49d205a3c..6cb0bf0eec8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6197,6 +6197,8 @@ in {
 
   python-hpilo = callPackage ../development/python-modules/python-hpilo { };
 
+  python-http-client = callPackage ../development/python-modules/python-http-client { };
+
   python-igraph = callPackage ../development/python-modules/python-igraph {
     pkg-config = pkgs.pkg-config;
     igraph = pkgs.igraph;

From dc2f2bebce3f0f7e669ce0ea4c0703a9c793586a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 10:44:06 +0100
Subject: [PATCH 543/956] python3Packages.sendgrid: init at 6.5.0

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

diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix
new file mode 100644
index 00000000000..77cd3593863
--- /dev/null
+++ b/pkgs/development/python-modules/sendgrid/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flask
+, pytestCheckHook
+, python-http-client
+, pyyaml
+, starkbank-ecdsa
+, werkzeug
+}:
+
+buildPythonPackage rec {
+  pname = "sendgrid";
+  version = "6.5.0";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = "sendgrid-python";
+    rev = version;
+    sha256 = "14kqjdv49486ksc1s0m0hc4k5nf9vn1v1g489mpib01hiiqxjp1b";
+  };
+
+  propagatedBuildInputs = [
+    python-http-client
+    starkbank-ecdsa
+  ];
+
+  checkInputs = [
+    flask
+    pytestCheckHook
+    pyyaml
+    werkzeug
+  ];
+
+  # Exclude tests that require network access
+  pytestFlagsArray = [
+    "--ignore test/test_sendgrid.py"
+    "--ignore live_test.py"
+  ];
+
+  pythonImportsCheck = [ "sendgrid" ];
+
+  meta = with lib; {
+    description = "Python client for SendGrid";
+    homepage = "https://github.com/sendgrid/sendgrid-python";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6cb0bf0eec8..fe4b5be4c5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6981,6 +6981,8 @@ in {
 
   send2trash = callPackage ../development/python-modules/send2trash { };
 
+  sendgrid = callPackage ../development/python-modules/sendgrid { };
+
   sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkg-config; };
 
   sentinel = callPackage ../development/python-modules/sentinel { };

From 65301a3df7ff4561ab75f2dfb00061dcc6082b40 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 10:48:13 +0100
Subject: [PATCH 544/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index b3d2247cb35..7e3f5231b17 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -709,7 +709,7 @@
     "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate
     "search" = ps: with ps; [ aiohttp-cors ];
     "season" = ps: with ps; [ ephem ];
-    "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid
+    "sendgrid" = ps: with ps; [ sendgrid ];
     "sense" = ps: with ps; [ ]; # missing inputs: sense_energy
     "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
     "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo

From 194d6a65e109664bb5329c0a0b17bd78266fe661 Mon Sep 17 00:00:00 2001
From: Philipp <philipp+dev@xndr.de>
Date: Fri, 22 Jan 2021 10:53:17 +0100
Subject: [PATCH 545/956] mtxclient: Remove unneeded dependencies, add myself
 as maintainer.

---
 pkgs/development/libraries/mtxclient/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index 72f8477c872..6b47789b01d 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -5,8 +5,6 @@
 , pkg-config
 , boost17x
 , openssl
-, zlib
-, libsodium
 , olm
 , spdlog
 , nlohmann_json
@@ -42,8 +40,6 @@ stdenv.mkDerivation rec {
     spdlog
     boost17x
     openssl
-    zlib
-    libsodium
     olm
   ];
 
@@ -51,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "Client API library for Matrix, built on top of Boost.Asio";
     homepage = "https://github.com/Nheko-Reborn/mtxclient";
     license = licenses.mit;
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with maintainers; [ fpletz pstn ];
     platforms = platforms.all;
     # Should be fixable if a higher clang version is used, see:
     # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177

From 800b90ea3f9def46eb94dbecfafdb7030b270c00 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Fri, 22 Jan 2021 11:07:29 +0100
Subject: [PATCH 546/956] nixos/bitlbee: Add types to options (#110446)

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

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 9ebf382fce4..59ad9e54686 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -58,6 +58,7 @@ in
       };
 
       interface = mkOption {
+        type = types.str;
         default = "127.0.0.1";
         description = ''
           The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
@@ -68,6 +69,7 @@ in
 
       portNumber = mkOption {
         default = 6667;
+        type = types.int;
         description = ''
           Number of the port BitlBee will be listening to.
         '';
@@ -142,6 +144,7 @@ in
 
       extraSettings = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Will be inserted in the Settings section of the config file.
         '';
@@ -149,6 +152,7 @@ in
 
       extraDefaults = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Will be inserted in the Default section of the config file.
         '';

From fc0d3f8da876fb08ea6e357ae54fe932e6824db2 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Fri, 22 Jan 2021 11:10:26 +0100
Subject: [PATCH 547/956] nixos/crashdump: Add type to option (#110448)

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

diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index 3c47e79d051..11dec37b3fa 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
@@ -26,6 +26,7 @@ in
         };
         reservedMemory = mkOption {
           default = "128M";
+          type = types.str;
           description = ''
             The amount of memory reserved for the crashdump kernel.
             If you choose a too high value, dmesg will mention

From 332a53728cd5c4059de54fa8cd6f7746ae221372 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Fri, 22 Jan 2021 11:11:05 +0100
Subject: [PATCH 548/956] activemq: add type to configurationDir (#110450)

---
 nixos/modules/services/amqp/activemq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 160dbddcd48..178b2f6e144 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -33,6 +33,7 @@ in {
       };
       configurationDir = mkOption {
         default = "${activemq}/conf";
+        type = types.str;
         description = ''
           The base directory for ActiveMQ's configuration.
           By default, this directory is searched for a file named activemq.xml,

From c1efc3274093abbd3b89091ff1df8edda550abd9 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Fri, 22 Jan 2021 11:11:40 +0100
Subject: [PATCH 549/956] nixos/module/jboss: Add types to options (#110451)

---
 nixos/modules/services/web-servers/jboss/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index ca5b8635fc0..d243e0f3f1b 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
@@ -31,32 +31,38 @@ in
 
       tempDir = mkOption {
         default = "/tmp";
+        type = types.str;
         description = "Location where JBoss stores its temp files";
       };
 
       logDir = mkOption {
         default = "/var/log/jboss";
+        type = types.str;
         description = "Location of the logfile directory of JBoss";
       };
 
       serverDir = mkOption {
         description = "Location of the server instance files";
         default = "/var/jboss/server";
+        type = types.str;
       };
 
       deployDir = mkOption {
         description = "Location of the deployment files";
         default = "/nix/var/nix/profiles/default/server/default/deploy/";
+        type = types.str;
       };
 
       libUrl = mkOption {
         default = "file:///nix/var/nix/profiles/default/server/default/lib";
         description = "Location where the shared library JARs are stored";
+        type = types.str;
       };
 
       user = mkOption {
         default = "nobody";
         description = "User account under which jboss runs.";
+        type = types.str;
       };
 
       useJK = mkOption {

From 4d014aff6ccae039b84cc44cf6166d33bf159131 Mon Sep 17 00:00:00 2001
From: Andy Richardson <andy.john.richardson@gmail.com>
Date: Fri, 22 Jan 2021 10:39:00 +0000
Subject: [PATCH 550/956] vscode-extensions.eamodio.gitlens: Init at 11.1.3

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index b02b7f3d707..115c613edb6 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -165,6 +165,18 @@ let
         };
       };
 
+      eamodio.gitlens = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "gitlens";
+          publisher = "eamodio";
+          version = "11.1.3";
+          sha256 = "sha256-hqJg3jP4bbXU4qSJOjeKfjkPx61yPDMsQdSUVZObK/U=";
+        };
+        meta = {
+          license = lib.licenses.mit;
+        };
+      };
+
       esbenp.prettier-vscode = buildVscodeMarketplaceExtension {
         meta = with lib; {
           changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";

From 59863dc3d7d549e853d9cfe705fe0ea975284eaa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2021 11:47:01 +0100
Subject: [PATCH 551/956] geant4: fix eval

Regression from 66e44425c6dfecbea68a5d6dc221ccd56561d4f1
---
 pkgs/development/libraries/physics/geant4/datasets.nix | 2 +-
 pkgs/development/libraries/physics/geant4/default.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
index e51a5937ddb..5646f4e02ba 100644
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, geant_version }:
+{ lib, stdenv, fetchurl, geant_version }:
 
 let
   mkDataset = { name, version, sha256, envvar }:
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 27d67d9af0c..159c746fecd 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     data = import ./datasets.nix {
-          inherit stdenv fetchurl;
+          inherit lib stdenv fetchurl;
           geant_version = version;
       };
 

From 588643a13d1ce79c0f87ec791ee6b5f0f240f717 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 22 Jan 2021 11:50:46 +0100
Subject: [PATCH 552/956] lprof: Mark as broken

The Hydra build fails since 2020-07-28:
x86_64-linux:  https://hydra.nixos.org/build/135234622

The patch was broken by eb627de968f but since there is no maintainer it
seems best to simply mark it as broken and eventually remove it.
---
 pkgs/tools/graphics/lprof/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix
index 92737e333fe..a1c81f16f2b 100644
--- a/pkgs/tools/graphics/lprof/default.nix
+++ b/pkgs/tools/graphics/lprof/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation {
     homepage = "https://sourceforge.net/projects/lprof";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
+    broken = true; # Broken since 2020-07-28 (https://hydra.nixos.org/build/135234622)
   };
 }

From fdafac8b00c859cdaeaefcfe453aec68b62bd79b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 20 Jan 2021 23:24:04 +0100
Subject: [PATCH 553/956] libexosip: 4.1.0 -> 5.2.0

Fix CVE-2014-10375.

sipwitch is marked as broken as it does compile with libexosip > 5.0.0
and the upstream project appears to be stalled/abandoned.
---
 pkgs/development/libraries/exosip/default.nix | 15 ++++-----------
 pkgs/servers/sip/sipwitch/default.nix         |  1 +
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index 400d7696e3c..f40dea19bb9 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -1,24 +1,17 @@
-{ lib, stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }:
+{ lib, stdenv, fetchurl, libosip, openssl, pkg-config }:
 
 stdenv.mkDerivation rec {
  pname = "libexosip2";
- version = "4.1.0";
+ version = "5.2.0";
 
  src = fetchurl {
-    url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
-    sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw";
+    url = "mirror://savannah/exosip/${pname}-${version}.tar.gz";
+    sha256 = "09bj7cm6mk8yr68y5a09a625x10ql6an3zi4pj6y1jbkhpgqibp3";
   };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libosip openssl ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/libe/libexosip2/4.1.0-2.1/debian/patches/openssl110.patch";
-      sha256 = "01q2dax7pwh197mn18r22y38mrsky85mvs9vbkn9fpcilrdayal6";
-    })
-  ];
-
   meta = with lib; {
     license = licenses.gpl2Plus;
     description = "Library that hides the complexity of using the SIP protocol";
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 3e69602170f..f5b3288c60c 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ ];
     platforms = with lib.platforms; linux;
+    broken = true; # Require libexosip2 < 5.0.0 which is vulnerable to CVE-2014-10375.
   };
 }

From 5fda0d25e42583fd52bd3d9f430329eb03d12b07 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 11:03:15 +0000
Subject: [PATCH 554/956] do-agent: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix
index 6ebcf940146..2a6c675ce1a 100644
--- a/pkgs/servers/monitoring/do-agent/default.nix
+++ b/pkgs/servers/monitoring/do-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "do-agent";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "do-agent";
     rev = version;
-    sha256 = "141hmkswb65sq99ad6vg4dkrbhsmni88hlrfdxqdn89hvsz8f7b2";
+    sha256 = "sha256-0m2dL7oFF45yR4Vu+AW3ROf16w1iioI5McVauOQA/XQ=";
   };
 
   buildFlagsArray = ''

From 9ccac6cac8dbb2d2dd4ad5f7dac118b1def4ad66 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 11:07:04 +0000
Subject: [PATCH 555/956] doctl: 1.54.1 -> 1.55.0

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

diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 609df797b58..4d05bd3ed11 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.54.1";
+  version = "1.55.0";
 
   vendorSha256 = null;
 
@@ -32,7 +32,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "sha256-f8jD+kFW4Y7Sfi1p4TOtW3Lwsf6cqCEDjj+XL4A3eh0=";
+    sha256 = "sha256-vhg5X8H4VegSDORtj1rgNKlWQo1H1e/vvO01LJkVK+A=";
   };
 
   meta = with lib; {

From 0fe70e7fd4cf127299d63d43cf9cd996fbe6d778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 9 Jan 2021 23:24:44 +0100
Subject: [PATCH 556/956] vulkan-loader: fix pkg-config include directory

With the last update the pkg-config file was changed to cmake variables,
which made substituteInPlace ineffective.

Fixes #108766
---
 .../libraries/vulkan-loader/default.nix          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index c833d770aea..b3882a91942 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -15,19 +15,23 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ];
 
-  preConfigure = ''
-    substituteInPlace loader/vulkan.pc.in \
-      --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \
-      --replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@'
-  '';
-
   cmakeFlags = [
     "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
     "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
+    "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
   ];
 
   outputs = [ "out" "dev" ];
 
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || {
+      echo vulkan-headers include directory not found in pkg-config file
+      exit 1
+    }
+  '';
+
   meta = with lib; {
     description = "LunarG Vulkan loader";
     homepage    = "https://www.lunarg.com";

From f227aab6f350e3ff646569f8dfd9b29370647107 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 22 Jan 2021 12:31:24 +0100
Subject: [PATCH 557/956] grafana-agent: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix
index 71973333063..ea43e9aca4b 100644
--- a/pkgs/servers/monitoring/grafana-agent/default.nix
+++ b/pkgs/servers/monitoring/grafana-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "grafana-agent";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "grafana";
     repo = "agent";
-    sha256 = "1kliq6d3hg4bx9s5crdagirf2h3ljl0ikcyz0x0wb2ack6cgjsvm";
+    sha256 = "092ry9gq9fpkkgsdymfwzdxz982pp0ljf2gs6mp419ivvllzwhiv";
   };
 
   vendorSha256 = null;

From 62b5e51019475b703b651acb77fafcaf2cc32219 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 22 Jan 2021 12:36:43 +0100
Subject: [PATCH 558/956] gitRepo: 2.11.1 -> 2.12

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

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 9c168d71dba..ea9e195cd0d 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.11.1";
+  version = "2.12";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "sha256-6XsjxTYmjr/3smwwS7c+Mq1sqfgKAhWzHOY8TWlIKHU=";
+    sha256 = "sha256-k9G0lN7qKQhWiXibzhC9Ma9h+44LQJ966MIakWk5nJM=";
   };
 
   patches = [ ./import-ssl-module.patch ];

From 2d390cdbc318bbc7e3e81ebd2c373de67663d5fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 11:53:16 +0000
Subject: [PATCH 559/956] folly: 2021.01.18.00 -> 2021.01.18.01

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

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 0ad4f2a50c1..51666cb8828 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (rec {
   pname = "folly";
-  version = "2021.01.18.00";
+  version = "2021.01.18.01";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "sha256-jTLHaaD/Rkfo96IMV4XtvmPzo34P26e17IabFU/5o6Y=";
+    sha256 = "sha256-Q70zD+8maRQp+f1fqPyhJEpjVYt3eORD85fIk7Za9lw=";
   };
 
   nativeBuildInputs = [

From 534e9cc6ca9323fb4897ba0bdaf8253a84a38611 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 13:13:12 +0100
Subject: [PATCH 560/956] python3Packages.tmb: 0.1.0 -> 0.1.1 (#110469)

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

diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix
index 88bda79b8b3..713cf613928 100644
--- a/pkgs/development/python-modules/tmb/default.nix
+++ b/pkgs/development/python-modules/tmb/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "tmb";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "alemuro";
     repo = pname;
     rev = version;
-    sha256 = "0fmwm9dz2mik9zni50wrnw7k9ld4l4w3p92aws6jcrdfxfi7aq7p";
+    sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE=";
   };
 
   propagatedBuildInputs = [ requests ];

From 28f04afdcca7f2e23dbdb6a8471c268b4f0bb132 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 22 Jan 2021 13:17:13 +0100
Subject: [PATCH 561/956] grafana-agent: fix rpath

The library is in the `lib` output, not `dev` output.
---
 pkgs/servers/monitoring/grafana-agent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix
index 71973333063..e83532bb6f1 100644
--- a/pkgs/servers/monitoring/grafana-agent/default.nix
+++ b/pkgs/servers/monitoring/grafana-agent/default.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   # Add to RUNPATH so it can be found.
   postFixup = ''
     patchelf \
-      --set-rpath "${lib.makeLibraryPath [ (lib.getDev systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \
+      --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \
       $out/bin/agent
   '';
 

From e986624620f82039739cee5465ed9a76fced2fa3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2021 13:27:56 +0100
Subject: [PATCH 562/956] python3.pkgs.dask: 2.25.0 -> 2021.01.0

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

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 2fb39303583..72146342144 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "2.25.0";
+  version = "2021.01.0";
 
   disabled = pythonOlder "3.5";
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = pname;
     rev = version;
-    sha256 = "1irp6s577yyjvrvkg00hh1wnl8vrv7pbnbr09mk67z9y7s6xhiw3";
+    sha256 = "V2cEOzV/L1zjyQ76zlGyN9CIkq6W8y8Yab4NQi3/Ju4=";
   };
 
   checkInputs = [

From d4a7f3ba502440e55b03f0ded1d664273af2acc8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 12:38:39 +0000
Subject: [PATCH 563/956] googler: 4.3.1 -> 4.3.2

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

diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index f7a29c257f4..a7cd5ec64ab 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "googler";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04wa0mlbfjnzwham2dpd9lch7800js4vp3ikgjl4qnwilvr1lw74";
+    sha256 = "sha256-PgWg396AQ15CAnfTXGDpSg1UXx7mNCtknEjJd/KV4MU=";
   };
 
   buildInputs = [ python ];

From 580a5a9f4cf23b7a27f238a31c3a884249a25910 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 13:05:17 +0000
Subject: [PATCH 564/956] humioctl: 0.28.1 -> 0.28.2

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

diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix
index a5131d14ca9..0130017356c 100644
--- a/pkgs/applications/logging/humioctl/default.nix
+++ b/pkgs/applications/logging/humioctl/default.nix
@@ -1,9 +1,9 @@
 { buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }:
 
 let
-  humioCtlVersion = "0.28.1";
-  sha256 = "0vy07nzafqhc14i179sfrzb795yh4pcyjj3py9fwq0nwnmxndby4";
-  vendorSha256 = "0anvah2rpqvxgmdrdj73k3vbf8073nmsl3aykgvb1nraf3gz3bpk";
+  humioCtlVersion = "0.28.2";
+  sha256 = "sha256-mCYxgBiuKylL2Qx4RCnD4ZoMFUm2J6VIL/Erc0u3BMA=";
+  vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo=";
 in buildGoModule {
     name = "humioctl-${humioCtlVersion}";
     pname = "humioctl";

From 6edf1bed784fe9874e98663fd11e5294f95c43fa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2021 14:22:34 +0100
Subject: [PATCH 565/956] python3.pkgs.scikitlearn: 0.23.2 -> 0.24.1

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

diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 5414fe43cc1..e7307c92632 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "0.23.2";
+  version = "0.24.1";
   # UnboundLocalError: local variable 'message' referenced before assignment
   disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20766f515e6cd6f954554387dfae705d93c7b544ec0e6c6a5d8e006f6f7ef480";
+    sha256 = "oDNKGALmTWVgIsO/q1anP71r9LEpg0PzaIryFRgQu98=";
   };
 
   buildInputs = [

From aa9adb6a009f58a0582b2e45296dcbc9143b8fd6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 13:26:38 +0000
Subject: [PATCH 566/956] janet: 1.13.1 -> 1.14.1

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

diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index fe0d3073acb..cb15c64f92b 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "janet";
-  version = "1.13.1";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-JXRPW1PYhVe2Qu8SAmcLgtwf8u3sb43H7AFeW7EqPZo=";
+    sha256 = "sha256-cI0kcY8aYDkmitoju/C6Ule5gzflIe0nLVxZp4iHXnc=";
   };
 
   nativeBuildInputs = [ meson ninja ];

From 3e61deb190acdb61c6b047532e02e61f44dbf617 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 22 Jan 2021 10:27:48 -0300
Subject: [PATCH 567/956] rcm: 1.1.3 -> 1.3.4

---
 pkgs/tools/misc/rcm/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index dc166f3d0b4..6eea6fe7beb 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -1,12 +1,15 @@
-{ lib, stdenv, fetchurl }:
+{ lib
+, stdenv
+, fetchurl
+}:
 
 stdenv.mkDerivation rec {
   pname = "rcm";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchurl {
     url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz";
-    sha256 = "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck";
+    sha256 = "sha256-mxGuN0Sc9NI07G0TSEeb/tMlPauhH36ed0BZhltmwko=";
   };
 
   patches = [ ./fix-rcmlib-path.patch ];
@@ -18,10 +21,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Management Suite for Dotfiles";
     homepage = "https://github.com/thoughtbot/rcm";
+    description = "Management Suite for Dotfiles";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ malyn ];
+    maintainers = with maintainers; [ malyn AndersonTorres ];
     platforms = with platforms; unix;
   };
 }

From 74aa06982e2d29a14fbd7dbbd82b6f83cff59017 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 13:38:36 +0000
Subject: [PATCH 568/956] jump: 0.30.1 -> 0.40.0

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

diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix
index d91df3232c8..fa0c2f73922 100644
--- a/pkgs/tools/system/jump/default.nix
+++ b/pkgs/tools/system/jump/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "jump";
-  version = "0.30.1";
+  version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "gsamokovarov";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mph3bqfjnw3yf0a6ml3ccmkr1shviwvvq4d04ky4gppfy6z51jy";
+    sha256 = "sha256-8Lfta4qDXYVSHG3UI8iUA6vIjBe5OIX7n0LC4OW1qMU=";
   };
 
-  vendorSha256 = "1500vim2lmkkls758pwhlx3piqbw6ap0nnhdwz9pcxih4s4as2nk";
+  vendorSha256 = null;
 
   doCheck = false;
 

From 59e507806e2e7f642153f23f24a9d7785169529a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 13:44:58 +0000
Subject: [PATCH 569/956] k6: 0.29.0 -> 0.30.0

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

diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix
index 35972f9cce5..0f1e038f634 100644
--- a/pkgs/development/tools/k6/default.nix
+++ b/pkgs/development/tools/k6/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "k6";
-  version = "0.29.0";
+  version = "0.30.0";
 
   goPackagePath = "github.com/loadimpact/k6";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "loadimpact";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711";
+    sha256 = "sha256-eUvkW6IBmUp4/zYNlQKrNrxMszdzU8v6tCc2o4DN1As=";
   };
 
   subPackages = [ "./" ];

From acae9b0336b7fe1e0f7d82e377f353f7e36b5d92 Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Sat, 10 Oct 2020 13:10:41 +0200
Subject: [PATCH 570/956] shadered: init at 1.4.1

---
 pkgs/development/tools/shadered/default.nix | 45 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/tools/shadered/default.nix

diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/development/tools/shadered/default.nix
new file mode 100644
index 00000000000..01c16b13946
--- /dev/null
+++ b/pkgs/development/tools/shadered/default.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, sfml
+, glm
+, python3
+, glew
+, pkg-config
+, SDL2 }:
+
+stdenv.mkDerivation rec {
+  pname = "SHADERed";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "dfranx";
+    repo = pname;
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "ivOd4NJgx5KWSDnXSBQLMrdvBuOm8NRzcb2S4lvOrms=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    SDL2
+    glew
+    glm
+    python3
+    sfml
+  ];
+
+  NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
+
+  meta = with lib; {
+    description = "Lightweight, cross-platform & full-featured shader IDE";
+    homepage = "https://github.com/dfranx/SHADERed";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ Scriptkiddi ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b9a206e180..23acd2ed95c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6905,6 +6905,8 @@ in
 
   shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { };
 
+  shadered = callPackage ../development/tools/shadered { };
+
   go-shadowsocks2 = callPackage ../tools/networking/go-shadowsocks2 { };
 
   shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { };

From 0119128f9ee25011d3174b6f997c6b68319ddc88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 14:11:46 +0000
Subject: [PATCH 571/956] lean: 3.24.0 -> 3.25.0

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

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 53423549a72..1f3f7afa9d1 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lean";
-  version = "3.24.0";
+  version = "3.25.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover-community";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "npzBuZ37KrUYwC0TglryVTqui/3/t1ma1Zjpnty0d7c=";
+    sha256 = "sha256-/TlVoqgTGhRfC8d70kXc+VsEkURUksKNGRjYcww+F8g=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9a3c824736bab74d88e84d3177026a9c27690e09 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 14:18:51 +0000
Subject: [PATCH 572/956] libamqpcpp: 4.3.10 -> 4.3.11

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

diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index 2985d4ad212..67404f9e5cf 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libamqpcpp";
-  version = "4.3.10";
+  version = "4.3.11";
 
   src = fetchFromGitHub {
     owner = "CopernicaMarketingSoftware";
     repo = "AMQP-CPP";
     rev = "v${version}";
-    sha256 = "0yy6sq4rvv9c0f09vljnqx92zvr39bn1spl735hzn6253d7fm3a5";
+    sha256 = "sha256-ZEvzZ++0f7Kf3iVbf3vQbyE8yd/dasU+dSxDDUu8Xug=";
   };
 
   buildInputs = [ openssl ];

From c7deb49058baaeeba60065e62487476a7f35724c Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Fri, 22 Jan 2021 09:10:47 -0500
Subject: [PATCH 573/956] gh: enable tests

---
 .../version-management/git-and-tools/gh/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 38413f990a0..7c61c3329b2 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -1,4 +1,9 @@
-{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
+{ lib
+, fetchFromGitHub
+, buildGoModule
+, installShellFiles
+, git
+}:
 
 buildGoModule rec {
   pname = "gh";
@@ -30,8 +35,10 @@ buildGoModule rec {
     done
   '';
 
-  # fails with `unable to find git executable in PATH`
-  doCheck = false;
+  checkInputs = [ git ];
+  checkPhase = ''
+    make test
+  '';
 
   meta = with lib; {
     description = "GitHub CLI tool";

From b929be75dcd605b4233bb69372e1c8b1d7449f47 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 23 Jan 2021 00:10:11 +1000
Subject: [PATCH 574/956] fuse-overlayfs: 1.3.0 -> 1.4.0

https://github.com/containers/fuse-overlayfs/releases/tag/v1.4.0
---
 pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 25e2cc29bd7..5522b63922a 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fuse-overlayfs";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "00pzwxn5a7dwz9ngl98198lx1c3nlhalzajyqazw9ydjkxibfpay";
+    sha256 = "sha256-lus+1hkc4GxrTxtdfDJ0XqJp37dcjKp4/sI3CEh8cYA=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

From 90888626baa2f00a9ab7a47d2f67dd618b8bc112 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Fri, 22 Jan 2021 14:50:16 +0000
Subject: [PATCH 575/956] nix: add Security to build inputs.

For some reason, this is required to build nix on Big Sur, even though
it's not needed on earlier macOS versions.
---
 pkgs/tools/package-management/nix/default.nix | 2 ++
 pkgs/top-level/all-packages.nix               | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index cd0fed65079..495d0aae018 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -3,6 +3,7 @@
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
 , boehmgc
+, Security
 }:
 
 let
@@ -52,6 +53,7 @@ common =
         [ curl openssl sqlite xz bzip2 nlohmann_json
           brotli boost editline
         ]
+        ++ lib.optionals stdenv.isDarwin [ Security ]
         ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
         ++ lib.optionals is24 [ libarchive gmock ]
         ++ lib.optional withLibseccomp libseccomp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d13ca561c2..75e1d3ca245 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28565,6 +28565,7 @@ in
       storeDir = config.nix.storeDir or "/nix/store";
       stateDir = config.nix.stateDir or "/nix/var";
       boehmgc = boehmgc.override { enableLargeConfig = true; };
+      inherit (darwin.apple_sdk.frameworks) Security;
       })
     nix
     nixStable

From b9a2dcb8b595bbbd9975b8d4fbcb233b71cefe5d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 14:58:37 +0000
Subject: [PATCH 576/956] livepeer: 0.5.12 -> 0.5.13

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

diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 6d5506ded88..acfa1aa2c3f 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -4,16 +4,16 @@
 
 buildGoModule rec {
   pname = "livepeer";
-  version = "0.5.12";
+  version = "0.5.13";
 
   runVend = true;
-  vendorSha256 = "13cgwpf3v4vlvb0mgdxsdybpghx1cp3fzkdwmq8b193a8dcl8s63";
+  vendorSha256 = "sha256-wAjGgYDyBWqE8KCQ6TQ+LGDDZqF+5XY+NzU74RwPuRE=";
 
   src = fetchFromGitHub {
     owner = "livepeer";
     repo = "go-livepeer";
     rev = "v${version}";
-    sha256 = "15gx6pd6zn40x60p07dyaf1ydxvrg372lk3djp302mph8y0ijqfg";
+    sha256 = "sha256-b4O8Hc8A8TN5KFcQ7KYvFPVFgposDgPw06WowrXzpAs=";
   };
 
   # livepeer_cli has a vendoring problem

From f7e83c30c0b4fdbf99fe5dc067af7079701a11d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 15:03:29 +0000
Subject: [PATCH 577/956] mackerel-agent: 0.71.0 -> 0.71.1

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

diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix
index 23d5ce11c1f..a8cf124fc7e 100644
--- a/pkgs/servers/monitoring/mackerel-agent/default.nix
+++ b/pkgs/servers/monitoring/mackerel-agent/default.nix
@@ -2,20 +2,20 @@
 
 buildGoModule rec {
   pname = "mackerel-agent";
-  version = "0.71.0";
+  version = "0.71.1";
 
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qU2rU5uUBRFFXyDF+qrOpOOKewlN5SQQHoZW2twtNw4=";
+    sha256 = "sha256-xEUIfmQX7I+I2wi53vc1JZYDweY9OAAUd2TZJ125+iw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
   buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ];
 
-  vendorSha256 = "sha256-EwQ5KaiVQbYISETcOMC173O99GeyyH1X5Q8YsWXsv3o=";
+  vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs=";
 
   subPackages = [ "." ];
 

From eca1193ed963ef3df43ac7aa796c2229f33d31b6 Mon Sep 17 00:00:00 2001
From: Andy Richardson <andy.john.richardson@gmail.com>
Date: Fri, 22 Jan 2021 15:08:02 +0000
Subject: [PATCH 578/956] 
 vscode-extensions.jpoissonnier.vscode-styled-components: Init at 1.4.1
 (#110458)

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index e6242fbc02a..64dce8223c9 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -345,6 +345,18 @@ let
         };
       };
 
+      jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-styled-components";
+          publisher = "jpoissonnier";
+          version = "1.4.1";
+          sha256 = "sha256-ojbeuYBCS+DjF5R0aLuBImzoSOb8mXw1s0Uh0CzggzE=";
+        };
+        meta = {
+          license = lib.licenses.mit;
+        };
+      };
+
       justusadam.language-haskell = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "language-haskell";

From 67dadd723e6979ffed4dbd64d71c32c86e979e1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 15:14:38 +0000
Subject: [PATCH 579/956] matrix-corporal: 2.0.1 -> 2.1.0

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

diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/servers/matrix-corporal/default.nix
index d7822afffa5..e489e774be5 100644
--- a/pkgs/servers/matrix-corporal/default.nix
+++ b/pkgs/servers/matrix-corporal/default.nix
@@ -2,20 +2,20 @@
 
 buildGoModule rec {
   pname = "matrix-corporal";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "devture";
     repo = pname;
     rev = version;
-    sha256 = "1n8yjmy3j0spgwpxgc26adhpl52fm3d2xbmkf5n9dwzw29grv68r";
+    sha256 = "sha256-u1ppwy+t2ewAH0/+R6e0Ja5A3PQG/lUy2b6kgcMVj8E=";
   };
 
   buildFlagsArray = [
     "-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}"
   ];
 
-  vendorSha256 = "1gi6mff6h0fkgfq5yybd1qcy2qwrvc4kzi11x7arfl9nr0d24rb2";
+  vendorSha256 = "sha256-YmUiGsg2UZfV6SHEPwnbmWPhGQ5teV+we9MBaJyrJr4=";
 
   meta = with lib; {
     homepage = "https://github.com/devture/matrix-corporal";

From 0a38f6da4fbf85cb12ecdaad31fe3297887e1de2 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Fri, 22 Jan 2021 16:22:06 +0100
Subject: [PATCH 580/956] nixos/tomcat: add extraGroups type (#110486)

---
 nixos/modules/services/web-servers/tomcat.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 6d12925829f..13fe98402c6 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -74,6 +74,7 @@ in
 
       extraGroups = mkOption {
         default = [];
+        type = types.listOf types.str;
         example = [ "users" ];
         description = "Defines extra groups to which the tomcat user belongs.";
       };

From 0389d5b148940055af8be2fc01caea2b5b841cd6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 22 Jan 2021 00:02:29 -0800
Subject: [PATCH 581/956] python310: 3.10.0a3 -> 3.10.0a4

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

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index c1d78f6fa93..1133ad2009a 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -181,9 +181,9 @@ in {
       major = "3";
       minor = "10";
       patch = "0";
-      suffix = "a3";
+      suffix = "a4";
     };
-    sha256 = "sha256-sJjJdAdxOUfX7W7VioSGdxlgp2lyMOPZjg42MCd/JYY=";
+    sha256 = "sha256-McHBl7IZuOH96je/izkxur0Edirn+igVkQU/pbek73M=";
     inherit (darwin) configd;
     inherit passthruFun;
   };

From fc69c0c71acf39dc2c46c1b5f4469d5409fd8249 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 15:31:14 +0000
Subject: [PATCH 582/956] minio: 2020-10-18T21-54-12Z -> 2021-01-16T02-19-44Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index cd7e1d4141d..d54232fd7f2 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio";
-  version = "2020-10-18T21-54-12Z";
+  version = "2021-01-16T02-19-44Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "0yva6hwfczq0apg8cl0xvm5xzyazxnic4bh2xxm1nq4iqw2p2177";
+    sha256 = "sha256-eYOarXgx5+rXCw2gMzrH1vVSsIdN4WrHrAUnnCcLtN8=";
   };
 
-  vendorSha256 = "185njxpaynnq8yydmkdh1sf6x924p69w7brqwl42ny1gylwv2chp";
+  vendorSha256 = "sha256-6p/DBgHawsT5PjpzwjrKgZfWm5Z6v1ozMWzGpEiB2jM=";
 
   doCheck = false;
 

From 0eecc399dfd32dbcb52ad819b97d285f6d491829 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 15:35:07 +0000
Subject: [PATCH 583/956] minio-client: 2020-11-25T23-04-07Z ->
 2021-01-16T02-45-34Z

---
 pkgs/tools/networking/minio-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 51ea6e1a0b3..3145f85186b 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2020-11-25T23-04-07Z";
+  version = "2021-01-16T02-45-34Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "0r4za7jnwmh2wna5l4iv5pz6s5c62f7v4hmbv7misff9qbk4p4k7";
+    sha256 = "sha256-1JUCoeLFMDvzT5KdQw+ZdYWPgdWKIL3kJ/LCIsqc6xE=";
   };
 
-  vendorSha256 = "0zracgqwhqs3gabrqqm8fm3hyicaadcinsjp5qgprjwd9a3c1zfv";
+  vendorSha256 = "sha256-3wWUIFpNXom2MuUEDgAAEHlWRXhUzId+shZW/i5Rw4A=";
 
   doCheck = false;
 

From 766fb6a513933d8016e64891693855abaef13f7b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 14:37:36 +0100
Subject: [PATCH 584/956] python3Packages.aioshelly: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index 8f7e9ca9450..f53877e03a3 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = pname;
     rev = version;
-    sha256 = "0177psqfib70vcvf3cg8plbwrilh770cqg8b547icdh5lnqv70b1";
+    sha256 = "sha256-EjzWx3wcmTfB3OmN0OB37K6wYKVO3HzGEIf+uihas8k=";
   };
 
   propagatedBuildInputs = [
@@ -28,6 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library to control Shelly";
     homepage = "https://github.com/home-assistant-libs/aioshelly";
+    changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 1bafaad6e72c71a67a1084274816c3520837fd7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 07:02:41 +0000
Subject: [PATCH 585/956] python37Packages.fuse: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix
index da9ad934032..0b2fe3cb8f5 100644
--- a/pkgs/development/python-modules/fuse-python/default.nix
+++ b/pkgs/development/python-modules/fuse-python/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fuse-python";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cbaa21c8f0a440302d1ba9fd57a80cf9ff227e5a3820708a8ba8450db883cc05";
+    sha256 = "da42d4f596a2e91602bcdf46cc51747df31c074a3ceb78bccc253c483a8a75fb";
   };
 
   buildInputs = [ fuse ];

From cefafeefbb7f82ad65937877772bff62ae34bf31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 22 Jan 2021 11:35:26 +0100
Subject: [PATCH 586/956] pythonPackages.fuse: add pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix
index 0b2fe3cb8f5..a130fab0d7e 100644
--- a/pkgs/development/python-modules/fuse-python/default.nix
+++ b/pkgs/development/python-modules/fuse-python/default.nix
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   buildInputs = [ fuse ];
   nativeBuildInputs = [ pkg-config ];
 
-  # no tests in the Pypi archive
+  # no tests implemented
   doCheck = false;
 
+  pythonImportsCheck = [ "fuse" ];
+
   meta = with lib; {
     description = "Python bindings for FUSE";
     homepage = "https://github.com/libfuse/python-fuse";

From 6759a781c73c729c35d716ddad7beddd35f1240b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 12:58:32 +0100
Subject: [PATCH 587/956] python3Packages.pycognito: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index a30c1cd344b..1a22932680d 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "pycognito";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "pvizeli";
     repo = "pycognito";
     rev = version;
-    sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w=";
+    sha256 = "sha256-RJeHPCTuaLN+zB0N0FGt4qrTI6++1ks5iBn64Cx0Psc=";
   };
 
   postPatch = ''

From 32b2eb673047d4bd9e6cd8e669c40e8bcdb22cef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 13:01:56 +0100
Subject: [PATCH 588/956] python3Packages.pycognito: use pytestCheckHook

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

diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index 1a22932680d..58c913c08cc 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -6,6 +6,7 @@
 , envs
 , python-jose
 , requests
+, pytestCheckHook
 , mock
 , isPy27
 }:
@@ -16,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pvizeli";
-    repo = "pycognito";
+    repo = pname;
     rev = version;
     sha256 = "sha256-RJeHPCTuaLN+zB0N0FGt4qrTI6++1ks5iBn64Cx0Psc=";
   };
@@ -35,7 +36,13 @@ buildPythonPackage rec {
 
   disabled = isPy27;
 
-  checkInputs = [ mock ];
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "tests.py" ];
+  pythonImportsCheck = [ "pycognito" ];
 
   meta = with lib; {
     description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support";

From 82f32abe7d7b3a2beffe4d4ad9b2cc38b1f3bf33 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 13:04:11 +0100
Subject: [PATCH 589/956] python3Packages.hass-nabucasa: 0.39.0 -> 0.41.0

---
 .../python-modules/hass-nabucasa/default.nix         |  4 ++--
 .../development/python-modules/pycognito/default.nix | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 90ff3df89e1..326da651b01 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.39.0";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = pname;
     rev = version;
-    sha256 = "1bsvwxddpp4dsq3k2320qrx5x9lscqzffzz1zj6fbwgc4741f01w";
+    sha256 = "sha256-ewWw3PyJGRHP23J6WBBWs9YGl4vTb9/j/soZ6n5wbLM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index 58c913c08cc..511df9f07f5 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -1,14 +1,14 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
-, cryptography
 , boto3
+, buildPythonPackage
+, cryptography
 , envs
+, fetchFromGitHub
+, isPy27
+, mock
+, pytestCheckHook
 , python-jose
 , requests
-, pytestCheckHook
-, mock
-, isPy27
 }:
 
 buildPythonPackage rec {

From 01cb602043489f8d10874be888f500b02bb5c3d6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Jan 2021 13:24:40 +0100
Subject: [PATCH 590/956] python3Packages.hass-nabucasa: update test part

---
 .../python-modules/hass-nabucasa/default.nix  | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 326da651b01..102ab3a2540 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -1,6 +1,17 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, acme, aiohttp, snitun, attrs, pycognito, warrant
-, pytest-aiohttp, asynctest, atomicwrites, pytest }:
+{ lib
+, acme
+, aiohttp
+, asynctest
+, atomicwrites
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, pycognito
+, pytest-aiohttp
+, pytestCheckHook
+, snitun
+, warrant
+}:
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
@@ -15,19 +26,25 @@ buildPythonPackage rec {
 
   postPatch = ''
     sed -i 's/"acme.*"/"acme"/' setup.py
-    sed -i 's/"attrs.*"/"attrs"/' setup.py
-    sed -i 's/"cryptography.*"/"cryptography"/' setup.py
   '';
 
   propagatedBuildInputs = [
-    acme aiohttp atomicwrites snitun attrs warrant pycognito
+    acme
+    aiohttp
+    atomicwrites
+    attrs
+    pycognito
+    snitun
+    warrant
   ];
 
-  checkInputs = [ pytest pytest-aiohttp asynctest ];
+  checkInputs = [
+    asynctest
+    pytest-aiohttp
+    pytestCheckHook
+  ];
 
-  checkPhase = ''
-    pytest tests/
-  '';
+  pythonImportsCheck = [ "hass_nabucasa" ];
 
   meta = with lib; {
     homepage = "https://github.com/NabuCasa/hass-nabucasa";

From 416bdfbc38c97d1c9a07144558024015b3531e0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 06:41:52 +0000
Subject: [PATCH 591/956] python37Packages.mautrix: 0.8.6 -> 0.8.9

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

diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 0944d5fa4cf..2d890115a51 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.8.6";
+  version = "0.8.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e28d89cb8297ec36d78ef79507613c45ab3ab0bc709f1944ca5be349797f8f6b";
+    sha256 = "13669a0150370c96cabcff859fb4d17f4a539dc7c707ff0c99c00612e24f5447";
   };
 
   propagatedBuildInputs = [

From 67c7662d27afe6617f51a62678deeff21a8be73d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 01:33:49 +0000
Subject: [PATCH 592/956] postman: 7.36.0 -> 7.36.1

---
 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 5ff4f7efb91..f05218a4cd5 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "postman";
-  version = "7.36.0";
+  version = "7.36.1";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha256 = "1wdbwlli9lzxxcwbc94fybfq6ipzvsv0waqcr1mjqzlfjqaqgrsb";
+    sha256 = "sha256-6brThKTAQI3cu3SSqvEIT1nwlQ/jPTP+d/Q/m/Ez5nQ=";
     name = "${pname}.tar.gz";
   };
 

From 9a94b025197075b65e94225daaa6ab5bdd1ee7fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 08:35:27 +0000
Subject: [PATCH 593/956] python37Packages.alerta-server: 8.2.0 -> 8.3.3

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

diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix
index 968fdf2402c..dd2d82578ea 100644
--- a/pkgs/development/python-modules/alerta-server/default.nix
+++ b/pkgs/development/python-modules/alerta-server/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "alerta-server";
-  version = "8.2.0";
+  version = "8.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ee06d0f828b679402847989de9013a1271db282af377f5dce776347623dde345";
+    sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97";
   };
 
   propagatedBuildInputs = [

From a10f2c3f42fa07af2548909e49f69f53e30e6b9e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 08:28:48 +0000
Subject: [PATCH 594/956] python37Packages.amqp: 5.0.2 -> 5.0.3

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

diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index 75a4f8d6e12..b614ae453d2 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "amqp";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fcd5b3baeeb7fc19b3486ff6d10543099d40ae1f5c9196eae695d1cde1b2f784";
+    sha256 = "1733ebf713050504fd9d2ebc661f1fc95b3588f99ee87d2e39c84c27bfd815dc";
   };
 
   propagatedBuildInputs = [ vine ];

From 64e991542e934ca3eff917b5ad20af467ea3dc95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:03:11 +0000
Subject: [PATCH 595/956] python37Packages.azure-storage-blob: 12.7.0 -> 12.7.1

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

diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix
index 156109cfdbc..cd42be98f9f 100644
--- a/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-blob";
-  version = "12.7.0";
+  version = "12.7.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "8194a5007ec1bda903d58bc976c98131ffd4b2f9a3b718f558c730c28ac152c6";
+    sha256 = "c6249f211684929ea6c9d34b5151b06d039775344f0d48fcf479736ed4c11b9e";
   };
 
   propagatedBuildInputs = [

From 2fa6fdea12c04800c0894f71e913104148511e03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 08:02:35 +0000
Subject: [PATCH 596/956] python37Packages.APScheduler: 3.6.3 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index 21b8d509646..d1ac191489a 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.6.3";
+  version = "3.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3bb5229eed6fbbdafc13ce962712ae66e175aa214c69bed35a06bffcf0c5e244";
+    sha256 = "1cab7f2521e107d07127b042155b632b7a1cd5e02c34be5a28ff62f77c900c6a";
   };
 
   buildInputs = [

From 7981dff25540ca66a80f42fd3617b60669dda78d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:17:21 +0000
Subject: [PATCH 597/956] python37Packages.breathe: 4.26.0 -> 4.26.1

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

diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index e765ba316db..29de26ac495 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
 
 buildPythonPackage rec {
-  version = "4.26.0";
+  version = "4.26.1";
   pname = "breathe";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "72543e3ef896b402eec4067c8be2f384570a27421b803ea6980455d7a9859cb1";
+    sha256 = "f59ecadebbb76e3b4710e8c9d2f8f98d51e54701930a38ddf732930653dcf6b5";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

From d92570f52cba53d78fa63544bbef0c7deaa71d6c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:06:59 +0000
Subject: [PATCH 598/956] python37Packages.azure-storage-file-share: 12.4.0 ->
 12.4.1

---
 .../python-modules/azure-storage-file-share/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix
index e0d16891ccb..c6413f191fc 100644
--- a/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-file-share";
-  version = "12.4.0";
+  version = "12.4.1";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "fe420825ab87df7077ba2737d2889dddd702d595b88d6e0180f2e3b061602c55";
+    sha256 = "7503d05882970abc977529ff5a4b81e79f62fd51b238fe306f72e13f57a522ca";
   };
 
   propagatedBuildInputs = [

From f2c88014c8cc7b93be871248747e17528da2b3bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 21 Jan 2021 09:51:07 +0000
Subject: [PATCH 599/956] python37Packages.bitarray: 1.6.1 -> 1.6.3

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

diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index 08e81476ba6..2f98f3917b8 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "1.6.1";
+  version = "1.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599";
+    sha256 = "ae27ce4bef4f35b4cc2c0b0d9cf02ed49eee567c23d70cb5066ad215f9b62b3c";
   };
 
   meta = with lib; {

From 01528b62a81dc1032c452d2712b3234bc15e0daf Mon Sep 17 00:00:00 2001
From: Marc Seeger <mseeger@fb.com>
Date: Fri, 22 Jan 2021 07:47:24 -0800
Subject: [PATCH 600/956] libsmartcols: Add gtk-doc to fix build.

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

diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix
index f824e54cdbf..a3a19522f69 100644
--- a/pkgs/development/libraries/libsmartcols/default.nix
+++ b/pkgs/development/libraries/libsmartcols/default.nix
@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}:
 
 stdenv.mkDerivation rec {
   name = "libsmartcols";
   version = "v2.36.1";
 
-  nativeBuildInputs = [ autoreconfHook pkg-config python3 ];
+  nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ];
 
   src = fetchFromGitHub {
     owner = "karelzak";

From adf23ffca7912362f0976007ca0668b63dd60dad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 15:54:29 +0000
Subject: [PATCH 601/956] mlkit: 4.5.2 -> 4.5.6

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

diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix
index 45cb09d5a2a..8ce19c1be3d 100644
--- a/pkgs/development/compilers/mlkit/default.nix
+++ b/pkgs/development/compilers/mlkit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mlkit";
-  version = "4.5.2";
+  version = "4.5.6";
 
   src = fetchFromGitHub {
     owner = "melsman";
     repo = "mlkit";
     rev = "v${version}";
-    sha256 = "1yk7phxnwkm94qs1gbxsr6sr11a0sgpcyjymmqwf0fsl5njgyb98";
+    sha256 = "sha256-aa6dRcGTXGakJsHCvHXRKs5BHtIZi6V2r8348epzpVc=";
   };
 
   nativeBuildInputs = [ autoreconfHook mlton ];

From 962f751627b7211b4efe097a59b0b2bdb575d730 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 16:02:45 +0000
Subject: [PATCH 602/956] mod: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix
index 32fd2258daa..c1d17bba57b 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/pkgs/development/tools/mod/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mod";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "marwan-at-work";
     repo = "mod";
     rev = "v${version}";
-    sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl";
+    sha256 = "sha256-IPdZ2PSS4rYVoMxrunse8Z2NHXLjXAoBcDvB6D70ki0=";
   };
 
-  vendorSha256 = "032s62rjjq7bqiz5fg17yfkq4j4dsbl6vhvs1wf2sg8jvbqmvdwn";
+  vendorSha256 = "sha256-1+06/yXi07iWZhcCEGNnoL2DpeVRYMW/NdyEhZQePbk=";
 
   doCheck = false;
 

From 723e9102c95693b395783bbdb4c86286bf059cff Mon Sep 17 00:00:00 2001
From: Shaw Vrana <shaw@vranix.com>
Date: Thu, 21 Jan 2021 17:23:25 -0800
Subject: [PATCH 603/956] go-minimock: include version in build flags

minimock includes the version in the mocks it generates so not having it
set properly annoys co-workers.
---
 pkgs/development/tools/go-minimock/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix
index ed4374e7764..3131fc59b41 100644
--- a/pkgs/development/tools/go-minimock/default.nix
+++ b/pkgs/development/tools/go-minimock/default.nix
@@ -11,6 +11,10 @@ buildGoModule rec {
     sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h";
   };
 
+  buildFlagsArray = [
+    "-ldflags=-s -w -X main.version=${version}"
+  ];
+
   vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc";
 
   doCheck = true;

From b576d2a9e434712a58619e6dc9d8d605dbae10b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 16:32:45 +0000
Subject: [PATCH 604/956] navi: 2.13.1 -> 2.14.0

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

diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix
index 9428443d295..da8d387d166 100644
--- a/pkgs/applications/misc/navi/default.nix
+++ b/pkgs/applications/misc/navi/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "navi";
-  version = "2.13.1";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "denisidoro";
     repo = "navi";
     rev = "v${version}";
-    sha256 = "0nzjcahnx637m24xhzgrhvaic52b1bqx6lkklmy8xlbka7i2xid2";
+    sha256 = "sha256-4XR+HazX65jiMvZpLNMNOc8gVVAxMx3bNcVNT6UPJ3o=";
   };
 
-  cargoSha256 = "12xyh57b6lblplh87fw1cvfwzkx9bz9qbhii34n4yzfzp6sv530n";
+  cargoSha256 = "sha256-ZBs9/yoY3na21rQd5zJzFujZZSq2BDoENKYAWI1fnTg=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 52187ee4e5a912143c35331ceac0df0d2fb879aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 16:39:59 +0000
Subject: [PATCH 605/956] nfpm: 2.2.2 -> 2.2.3

---
 pkgs/tools/package-management/nfpm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index fff774d2aef..d22b4216ea9 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0qv7xw74hf4fzi7v40fpgjyf01dyz6665dmd2pacpd9n6klnr1h3";
+    sha256 = "sha256-F3SDcO5E0d5/aEJLdy0fJqB6brwf4C9Imtk1R5zOT5A=";
   };
 
-  vendorSha256 = "0mdh4qrafdxlqqh0kl7wil7w3g5p499qi3yiw8znjkd49g85ws3w";
+  vendorSha256 = "sha256-fGhe0EukTWk/4tGPiFMit7zBD4380AkgxrQ3pzImsFU=";
 
   doCheck = false;
 

From e58c59c3dc1acd12cb8bc864785753b576b64772 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 16:49:58 +0000
Subject: [PATCH 606/956] nix-direnv: 1.2 -> 1.2.1

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

diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix
index 95175f81c8e..efacd87d9a4 100644
--- a/pkgs/tools/misc/nix-direnv/default.nix
+++ b/pkgs/tools/misc/nix-direnv/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nix-direnv";
-  version = "1.2";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-direnv";
     rev = version;
-    sha256 = "sha256-/mlM1EeUlr1nTUJ5rB41idzk3Mfy/htjjPUARYDFpb0=";
+    sha256 = "sha256-D31ORVdS8P1OkPShsfjEFLVCcv8Bff9OyexUKKHdguQ=";
   };
 
   # Substitute instead of wrapping because the resulting file is

From 6973cc608ee57c46b1398676526ba93ec5aa4ccb Mon Sep 17 00:00:00 2001
From: tu-maurice <valentin.gehrke@zom.bi>
Date: Thu, 21 Jan 2021 20:04:20 +0100
Subject: [PATCH 607/956] vlc: 3.0.11.1 -> 3.0.12

---
 pkgs/applications/video/vlc/default.nix       | 13 +------
 .../fix-missing-includes-with-qt-5.15.patch   | 37 -------------------
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index cab42ae3f6f..c925eca302a 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -24,19 +24,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "${optionalString onlyLibVLC "lib"}vlc";
-  version = "3.0.11.1";
+  version = "3.0.12";
 
   src = fetchurl {
     url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";
-    sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq";
+    sha256 = "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g";
   };
 
-  patches = [
-    # Couldn't find an upstream version of this patch
-    # https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch?expand=1
-    ./fix-missing-includes-with-qt-5.15.patch
-  ];
-
   # VLC uses a *ton* of libraries for various pieces of functionality, many of
   # which are not included here for no other reason that nobody has mentioned
   # needing them
@@ -67,9 +61,6 @@ stdenv.mkDerivation rec {
   BUILDCC = "${stdenv.cc}/bin/gcc";
 
   postPatch = ''
-    substituteInPlace configure \
-      --replace /bin/echo echo
-
     substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \
       /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
   '';
diff --git a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch
deleted file mode 100644
index d980fd2f6da..00000000000
--- a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
-===================================================================
---- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp
-+++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
-@@ -25,6 +25,7 @@
- #include "qt.hpp"
- 
- #include <QWidget>
-+#include <QPainterPath>
- 
- class TimeTooltip : public QWidget
- {
-Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
-===================================================================
---- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp
-+++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
-@@ -27,6 +27,7 @@
- #include "input_manager.hpp"                      /* THEMIM */
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRect>
- #include <QStyleOptionViewItem>
- #include <QFontMetrics>
-Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
-===================================================================
---- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp
-+++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
-@@ -53,6 +53,7 @@
- #include <QListView>
- #include <QListWidget>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleOptionViewItem>
- #include <QKeyEvent>
- #include <QPushButton>
-

From 252ebe654ee778747c0cccb807197aa2a481d6e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 22 Jan 2021 17:16:14 +0000
Subject: [PATCH 608/956] polkadot: 0.8.26-1 -> 0.8.27

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

diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 866adeea278..84bb42fabf8 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "polkadot";
-  version = "0.8.26-1";
+  version = "0.8.27";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "polkadot";
     rev = "v${version}";
-    sha256 = "17ji1gjrx3gzw4msaz9kgvm132y14wgh8z183l3mfw1cj44a6kqk";
+    sha256 = "1zkqmsclhnv14s4mxz7h49kfx8wyi3lyi0dik6jn1fh6w8zr962c";
   };
 
-  cargoSha256 = "07zwlwx02xw1y20br2c4grwv7bprhynqy7gav4qh3vw117ijpiqk";
+  cargoSha256 = "1j0pr09y5pc43a4rz1zq3h9vmd874zz6z0wd279lpm6p2m0077cs";
 
   nativeBuildInputs = [ clang ];
 
@@ -24,9 +24,10 @@ rustPlatform.buildRustPackage rec {
   PROTOC = "${protobuf}/bin/protoc";
 
   # NOTE: We don't build the WASM runtimes since this would require a more
-  # complicated rust environment setup. The resulting binary is still useful for
-  # live networks since those just use the WASM blob from the network chainspec.
-  BUILD_DUMMY_WASM_BINARY = 1;
+  # complicated rust environment setup and this is only needed for developer
+  # environments. The resulting binary is useful for end-users of live networks
+  # since those just use the WASM blob from the network chainspec.
+  SKIP_WASM_BUILD = 1;
 
   # We can't run the test suite since we didn't compile the WASM runtimes.
   doCheck = false;

From 2dd61213d3b6f896d8c7e9beb657db3e44dc02c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 17:16:37 +0000
Subject: [PATCH 609/956] obsidian: 0.10.7 -> 0.10.8

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

diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index d2f0c42d7dc..0d10767e5b1 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -30,12 +30,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "obsidian";
-  version = "0.10.7";
+  version = "0.10.8";
 
   src = fetchurl {
     url =
       "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
-    sha256 = "clRasHVk9tZYJd0wP0q5TKnjhJwlx5g62XbkjBmCTJI=";
+    sha256 = "M+iIvnenfe+4JUKLvGDJXub8d5t2BLoPTo5MrF+5xy4=";
   };
 
   nativeBuildInputs = [ makeWrapper graphicsmagick ];

From 4aaa445477b9bf59db2f163c714f3654c2ace0ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 09:18:48 -0800
Subject: [PATCH 610/956] certbot: 1.10.1 -> 1.11.0 (#109746)

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

diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index d7e74f5eff8..cb842f1455f 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "certbot";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "035cdw2h3f511drc0q1j65j911m1pj6c5ghywavkhib0chim044c";
+    sha256 = "sha256-IGXiIOLP/Uq6HdXAschp1jFYq52ohRK4VLtkjF4Tb44=";
   };
 
   sourceRoot = "source/${pname}";

From 515d801aee4a660803dce3edb1d1f74c6f3a3b2e Mon Sep 17 00:00:00 2001
From: Kevin Griffin <me@kevin.jp>
Date: Mon, 11 Jan 2021 16:11:29 +0900
Subject: [PATCH 611/956] fish: add babelfish translation option

Configuration may be ran through fenv at shell start time
(as previously) or translated to fish at build time with
the babelfish package.
---
 nixos/modules/programs/fish.nix | 269 +++++++++++++++++++-------------
 1 file changed, 162 insertions(+), 107 deletions(-)

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 34a0dc6a2df..d3f7d3eb1af 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -13,6 +13,27 @@ let
       (filterAttrs (k: v: v != null) cfg.shellAliases)
   );
 
+  envShellInit = pkgs.writeText "shellInit" cfge.shellInit;
+
+  envLoginShellInit = pkgs.writeText "loginShellInit" cfge.loginShellInit;
+
+  envInteractiveShellInit = pkgs.writeText "interactiveShellInit" cfge.interactiveShellInit;
+
+  sourceEnv = file:
+  if cfg.useBabelfish then
+    "source /etc/fish/${file}.fish"
+  else
+    ''
+      set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish-foreign-env/functions $fish_function_path
+      fenv source /etc/fish/foreign-env/${file} > /dev/null
+      set -e fish_function_path[1]
+    '';
+
+  babelfishTranslate = path: name:
+    pkgs.runCommand "${name}.fish" {
+      nativeBuildInputs = [ pkgs.babelfish ];
+    } "${pkgs.babelfish}/bin/babelfish < ${path} > $out;";
+
 in
 
 {
@@ -29,6 +50,15 @@ in
         type = types.bool;
       };
 
+      useBabelfish = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled, the configured environment will be translated to native fish using <link xlink:href="https://github.com/bouk/babelfish">babelfish</link>.
+          Otherwise, <link xlink:href="https://github.com/oh-my-fish/plugin-foreign-env">foreign-env</link> will be used.
+        '';
+      };
+
       vendor.config.enable = mkOption {
         type = types.bool;
         default = true;
@@ -105,72 +135,152 @@ in
     # Required for man completions
     documentation.man.generateCaches = lib.mkDefault true;
 
-    environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit;
-    environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
-    environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit;
+    environment = mkMerge [
+      (mkIf cfg.useBabelfish
+      {
+        etc."fish/setEnvironment.fish".source = babelfishTranslate config.system.build.setEnvironment "setEnvironment";
+        etc."fish/shellInit.fish".source = babelfishTranslate envShellInit "shellInit";
+        etc."fish/loginShellInit.fish".source = babelfishTranslate envLoginShellInit "loginShellInit";
+        etc."fish/interactiveShellInit.fish".source = babelfishTranslate envInteractiveShellInit "interactiveShellInit";
+     })
 
-    environment.etc."fish/nixos-env-preinit.fish".text = ''
-      # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
-      # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
-      set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
+      (mkIf (!cfg.useBabelfish)
+      {
+        etc."fish/foreign-env/shellInit".source = envShellInit;
+        etc."fish/foreign-env/loginShellInit".source = envLoginShellInit;
+        etc."fish/foreign-env/interactiveShellInit".source = envInteractiveShellInit;
+      })
 
-      # source the NixOS environment config
-      if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
-          fenv source ${config.system.build.setEnvironment}
-      end
+      {
+        etc."fish/nixos-env-preinit.fish".text =
+        if cfg.useBabelfish
+        then ''
+          # source the NixOS environment config
+          if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
+            source /etc/fish/setEnvironment.fish
+          end
+        ''
+        else ''
+          # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
+          # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
+          set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
 
-      # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
-      set -e fish_function_path
-    '';
+          # source the NixOS environment config
+          if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
+            fenv source ${config.system.build.setEnvironment}
+          end
 
-    environment.etc."fish/config.fish".text = ''
-      # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
+          # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
+          set -e fish_function_path
+        '';
+      }
 
-      # if we haven't sourced the general config, do it
-      if not set -q __fish_nixos_general_config_sourced
-        set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
-        fenv source /etc/fish/foreign-env/shellInit > /dev/null
-        set -e fish_function_path[1]
+      {
+        etc."fish/config.fish".text = ''
+        # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
 
-        ${cfg.shellInit}
+        # if we haven't sourced the general config, do it
+        if not set -q __fish_nixos_general_config_sourced
+          ${sourceEnv "shellInit"}
 
-        # and leave a note so we don't source this config section again from
-        # this very shell (children will source the general config anew)
-        set -g __fish_nixos_general_config_sourced 1
-      end
+          ${cfg.shellInit}
 
-      # if we haven't sourced the login config, do it
-      status --is-login; and not set -q __fish_nixos_login_config_sourced
-      and begin
-        set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
-        fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
-        set -e fish_function_path[1]
+          # and leave a note so we don't source this config section again from
+          # this very shell (children will source the general config anew)
+          set -g __fish_nixos_general_config_sourced 1
+        end
 
-        ${cfg.loginShellInit}
+        # if we haven't sourced the login config, do it
+        status --is-login; and not set -q __fish_nixos_login_config_sourced
+        and begin
+          ${sourceEnv "loginShellInit"}
 
-        # and leave a note so we don't source this config section again from
-        # this very shell (children will source the general config anew)
-        set -g __fish_nixos_login_config_sourced 1
-      end
+          ${cfg.loginShellInit}
 
-      # if we haven't sourced the interactive config, do it
-      status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
-      and begin
-        ${fishAliases}
+          # and leave a note so we don't source this config section again from
+          # this very shell (children will source the general config anew)
+          set -g __fish_nixos_login_config_sourced 1
+        end
 
-        set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
-        fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
-        set -e fish_function_path[1]
+        # if we haven't sourced the interactive config, do it
+        status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
+        and begin
+          ${fishAliases}
 
-        ${cfg.promptInit}
-        ${cfg.interactiveShellInit}
+          ${sourceEnv "interactiveShellInit"}
 
-        # and leave a note so we don't source this config section again from
-        # this very shell (children will source the general config anew,
-        # allowing configuration changes in, e.g, aliases, to propagate)
-        set -g __fish_nixos_interactive_config_sourced 1
-      end
-    '';
+          ${cfg.promptInit}
+          ${cfg.interactiveShellInit}
+
+          # and leave a note so we don't source this config section again from
+          # this very shell (children will source the general config anew,
+          # allowing configuration changes in, e.g, aliases, to propagate)
+          set -g __fish_nixos_interactive_config_sourced 1
+        end
+      '';
+      }
+
+      {
+        etc."fish/generated_completions".source =
+        let
+          patchedGenerator = pkgs.stdenv.mkDerivation {
+            name = "fish_patched-completion-generator";
+            srcs = [
+              "${pkgs.fish}/share/fish/tools/create_manpage_completions.py"
+              "${pkgs.fish}/share/fish/tools/deroff.py"
+            ];
+            unpackCmd = "cp $curSrc $(basename $curSrc)";
+            sourceRoot = ".";
+            patches = [ ./fish_completion-generator.patch ]; # to prevent collisions of identical completion files
+            dontBuild = true;
+            installPhase = ''
+              mkdir -p $out
+              cp * $out/
+            '';
+            preferLocalBuild = true;
+            allowSubstitutes = false;
+          };
+          generateCompletions = package: pkgs.runCommand
+            "${package.name}_fish-completions"
+            (
+              {
+                inherit package;
+                preferLocalBuild = true;
+                allowSubstitutes = false;
+              }
+              // optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }
+            )
+            ''
+              mkdir -p $out
+              if [ -d $package/share/man ]; then
+                find $package/share/man -type f | xargs ${pkgs.python3.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null
+              fi
+            '';
+        in
+          pkgs.buildEnv {
+            name = "system_fish-completions";
+            ignoreCollisions = true;
+            paths = map generateCompletions config.environment.systemPackages;
+          };
+      }
+
+      # include programs that bring their own completions
+      {
+        pathsToLink = []
+        ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
+        ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
+        ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
+      }
+
+      { systemPackages = [ pkgs.fish ]; }
+
+      {
+        shells = [
+          "/run/current-system/sw/bin/fish"
+          "${pkgs.fish}/bin/fish"
+        ];
+      }
+    ];
 
     programs.fish.interactiveShellInit = ''
       # add completions generated by NixOS to $fish_complete_path
@@ -187,61 +297,6 @@ in
       end
     '';
 
-    environment.etc."fish/generated_completions".source =
-      let
-        patchedGenerator = pkgs.stdenv.mkDerivation {
-          name = "fish_patched-completion-generator";
-          srcs = [
-            "${pkgs.fish}/share/fish/tools/create_manpage_completions.py"
-            "${pkgs.fish}/share/fish/tools/deroff.py"
-          ];
-          unpackCmd = "cp $curSrc $(basename $curSrc)";
-          sourceRoot = ".";
-          patches = [ ./fish_completion-generator.patch ]; # to prevent collisions of identical completion files
-          dontBuild = true;
-          installPhase = ''
-            mkdir -p $out
-            cp * $out/
-          '';
-          preferLocalBuild = true;
-          allowSubstitutes = false;
-        };
-        generateCompletions = package: pkgs.runCommand
-          "${package.name}_fish-completions"
-          (
-            {
-              inherit package;
-              preferLocalBuild = true;
-              allowSubstitutes = false;
-            }
-            // optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }
-          )
-          ''
-            mkdir -p $out
-            if [ -d $package/share/man ]; then
-              find $package/share/man -type f | xargs ${pkgs.python3.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null
-            fi
-          '';
-      in
-        pkgs.buildEnv {
-          name = "system_fish-completions";
-          ignoreCollisions = true;
-          paths = map generateCompletions config.environment.systemPackages;
-        };
-
-    # include programs that bring their own completions
-    environment.pathsToLink = []
-      ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
-      ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
-      ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
-
-    environment.systemPackages = [ pkgs.fish ];
-
-    environment.shells = [
-      "/run/current-system/sw/bin/fish"
-      "${pkgs.fish}/bin/fish"
-    ];
-
   };
 
 }

From 3ef8953a370ef2d2f247c8acf3faf858079628f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 18:14:04 +0000
Subject: [PATCH 612/956] openbazaar-client: 2.4.9 -> 2.4.10

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

diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix
index 6029842ad39..e7a19fa7825 100644
--- a/pkgs/applications/networking/openbazaar/client.nix
+++ b/pkgs/applications/networking/openbazaar/client.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openbazaar-client";
-  version = "2.4.9";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb";
-    sha256 = "1l6l72kb5h5f32dl5wqv31sigl3fh2byixv0h0d3icmjf558c39p";
+    sha256 = "sha256-X0iTTLOJsZeyVZwNU3y39cFMHnxlnYXmqQERE26CLTY=";
   };
 
   dontBuild = true;

From 3b9267a0ad9258fd15837370b51cbaa5883a63bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 18:29:41 +0000
Subject: [PATCH 613/956] openethereum: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix
index 5bb5d295157..8ad7c8fdd6c 100644
--- a/pkgs/applications/blockchains/openethereum/default.nix
+++ b/pkgs/applications/blockchains/openethereum/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "openethereum";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "openethereum";
     repo = "openethereum";
     rev = "v${version}";
-    sha256 = "cs84Zz0nhagGDu5sDFTaFZF3SPEgJU8F4vGX7KLihOM=";
+    sha256 = "sha256-RUrJuJF0R0mc7XdLyk915fRWtMfzjp5QE6oeWxHfyEQ=";
   };
 
-  cargoSha256 = "6suNkHw1BbISb0MkYkUaD+mpUal+kn3y1SFVqzJFqJc=";
+  cargoSha256 = "sha256-b+winsCzU0sXGDX6nUtWq4JrIyTcJ3uva7RlV5VsXfk=";
 
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
   nativeBuildInputs = [

From 986cf21c45b798c97f2424e17b819af3ecf8083e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 22 Jan 2021 09:08:05 -0800
Subject: [PATCH 614/956] slack: 4.11.1 -> 4.12.2

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

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 4de1d32a64a..54c652aab6a 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -41,11 +41,11 @@ let
 
   pname = "slack";
 
-  x86_64-darwin-version = "4.11.1";
-  x86_64-darwin-sha256 = "0a5rq8zhgdckwxnyjv6nrgpnj682j1rd9yc4nwvsbvpzv15kmd35";
+  x86_64-darwin-version = "4.12.2";
+  x86_64-darwin-sha256 = "0qflv2glfy7d77zjgqi7qcjr53c9dni26gmqkg9vk2xijmmd3xy7";
 
-  x86_64-linux-version = "4.11.1";
-  x86_64-linux-sha256 = "1r43g3xnla5aq38l3mpba8jb1gx9m2b6pr84prsclz27nr0rfm6g";
+  x86_64-linux-version = "4.12.2";
+  x86_64-linux-sha256 = "sha256-G5uQI078N7AbhEJs6a/17Hoi5DSdwvYLM1T/ttrEw4s=";
 
   version = {
     x86_64-darwin = x86_64-darwin-version;

From c46beb062c882b1b254a3c70334020fc9a94a427 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 19:00:53 +0000
Subject: [PATCH 615/956] pg_tileserv: 1.0.4 -> 1.0.5

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

diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix
index bd8edcf4335..9f735664863 100644
--- a/pkgs/servers/pg_tileserv/default.nix
+++ b/pkgs/servers/pg_tileserv/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pg_tileserv";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "CrunchyData";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vdxnh1s8r8ydsjnj70s69nifhpyicb4jmgd5j7i49cr096jg526";
+    sha256 = "sha256-62cJ0j/UfPW/ujKr0iA7Be8wZYlZ68mpJX8v1tAVREc=";
   };
 
-  vendorSha256 = "1wbv1wh3phd9p2hfnffsjv6f8hf9fgkwg88k9w56rx1pgps63nd9";
+  vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E=";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ];
 

From da966646239f2d7baa534a278e30820df484d293 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 19:04:36 +0000
Subject: [PATCH 616/956] pgmetrics: 1.10.3 -> 1.10.5

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

diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index 377c0eed24b..70429ef811a 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pgmetrics";
-  version = "1.10.3";
+  version = "1.10.5";
 
   src = fetchFromGitHub {
     owner  = "rapidloop";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1acdak3m9782hr5bn26ck3dnnv1jxwz5yrkyv8kivavjww88m9h2";
+    sha256 = "sha256-rqaK94Rw0K1+r7+7jHI2bzBupCGTkokeC4heJ3Yu6pQ=";
   };
 
-  vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5";
+  vendorSha256 = "sha256-5f2hkOgAE4TrHNz7xx1RU9fozxjFZAl4HilhAqsbo5s=";
 
   doCheck = false;
 

From e1ea0a237a76805050158a4568b2cdf0701480f8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 19:10:27 +0000
Subject: [PATCH 617/956] picard-tools: 2.24.0 -> 2.24.1

---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 054fb66dccb..4a3816c4d4a 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "picard-tools";
-  version = "2.24.0";
+  version = "2.24.1";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "sha256-cOkQObzMb222DxjEFxMhiozfRfWR8CwQEsBiFSsnzXs=";
+    sha256 = "sha256-acCsYHyZ358hYqa2haOxR+g6FQGtK+hstYfLBvHLwR8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From dc62266a1c222bdc65270613430c62817d4af453 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Jan 2021 20:18:10 +0100
Subject: [PATCH 618/956] python3Packages.mpd2: 3.0.2 -> 3.0.3

Fixes early disconnects when using the async MPDClient.
---
 pkgs/development/python-modules/mpd2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix
index 046a338a993..df7db2e7dd8 100644
--- a/pkgs/development/python-modules/mpd2/default.nix
+++ b/pkgs/development/python-modules/mpd2/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "python-mpd2";
-  version = "3.0.2";
+  version = "3.0.3";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ibl2xyj4380ai60i2bfhm8qn1sjyjbwwjmgzfcqa12wlnhck7ki";
+    sha256 = "1ikvn2qv6cnbjscpbk6hhsqg34h832mxgg6hp1mf4d8d6nwdx4sn";
   };
 
   buildInputs = [ mock ];

From ecb42c13ba114e5f2e9617eea521208ea5ebc76d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Jan 2021 21:17:45 +0100
Subject: [PATCH 619/956] Stackage Nightly 2021-01-20

---
 .../configuration-hackage2nix.yaml            | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9f9e93b7411..678ae42060e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
   # haskell-language-server 0.5.0.0 doesn't accept newer versions
   - fourmolu ==0.2.*
   - refinery ==0.2.*
-  # Stackage Nightly 2021-01-14
+  # Stackage Nightly 2021-01-20
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -209,7 +209,7 @@ default-package-overrides:
   - amazonka-waf ==1.6.1
   - amazonka-workspaces ==1.6.1
   - amazonka-xray ==1.6.1
-  - amqp ==0.20.0
+  - amqp ==0.20.0.1
   - amqp-utils ==0.4.4.1
   - annotated-wl-pprint ==0.7.0
   - ansi-terminal ==0.10.3
@@ -223,7 +223,7 @@ default-package-overrides:
   - ap-normalize ==0.1.0.0
   - appar ==0.1.8
   - appendmap ==0.1.5
-  - apply-refact ==0.8.2.1
+  - apply-refact ==0.9.0.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.2
   - approximate-equality ==1.1.0.2
@@ -340,7 +340,7 @@ default-package-overrides:
   - blas-comfort-array ==0.0.0.2
   - blas-ffi ==0.1
   - blaze-bootstrap ==0.1.0.1
-  - blaze-builder ==0.4.1.0
+  - blaze-builder ==0.4.2.1
   - blaze-html ==0.9.1.2
   - blaze-markup ==0.8.2.7
   - blaze-svg ==0.3.6.1
@@ -519,7 +519,7 @@ default-package-overrides:
   - conduit-extra ==1.3.5
   - conduit-parse ==0.2.1.0
   - conduit-zstd ==0.0.2.0
-  - conferer ==1.0.0.0
+  - conferer ==1.0.0.1
   - conferer-aeson ==1.0.0.0
   - conferer-hspec ==1.0.0.0
   - conferer-warp ==1.0.0.0
@@ -635,6 +635,7 @@ default-package-overrides:
   - DBFunctor ==0.1.1.1
   - dbus ==1.2.17
   - dbus-hslogger ==0.1.0.1
+  - debian ==4.0.2
   - debian-build ==0.10.2.0
   - debug-trace-var ==0.2.0
   - dec ==0.0.3
@@ -706,6 +707,7 @@ default-package-overrides:
   - dyre ==0.8.12
   - eap ==0.9.0.2
   - earcut ==0.1.0.4
+  - Earley ==0.13.0.1
   - easy-file ==0.2.2
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
@@ -751,7 +753,7 @@ default-package-overrides:
   - epub-metadata ==4.5
   - eq ==4.2.1
   - equal-files ==0.0.5.3
-  - equational-reasoning ==0.6.0.3
+  - equational-reasoning ==0.6.0.4
   - equivalence ==0.3.5
   - erf ==2.0.0.0
   - error-or ==0.1.2.0
@@ -946,7 +948,7 @@ default-package-overrides:
   - ghc-typelits-extra ==0.4.2
   - ghc-typelits-knownnat ==0.7.4
   - ghc-typelits-natnormalise ==0.7.3
-  - ghc-typelits-presburger ==0.3.0.1
+  - ghc-typelits-presburger ==0.5.0.0
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.22
   - gi-cairo ==1.0.24
@@ -973,7 +975,7 @@ default-package-overrides:
   - github-rest ==1.0.3
   - github-types ==0.2.1
   - github-webhooks ==0.15.0
-  - gitlab-haskell ==0.2.4
+  - gitlab-haskell ==0.2.5
   - gitrev ==1.3.1
   - gi-xlib ==2.0.9
   - gl ==0.9
@@ -983,7 +985,7 @@ default-package-overrides:
   - gloss ==1.13.2.1
   - gloss-rendering ==1.13.1.1
   - GLURaw ==2.0.0.4
-  - GLUT ==2.7.0.15
+  - GLUT ==2.7.0.16
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.6.1
   - google-isbn ==1.0.3
@@ -1138,12 +1140,12 @@ default-package-overrides:
   - HsOpenSSL ==0.11.5.1
   - HsOpenSSL-x509-system ==0.1.0.4
   - hsp ==0.10.0
-  - hspec ==2.7.6
+  - hspec ==2.7.8
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.5.1
-  - hspec-core ==2.7.6
-  - hspec-discover ==2.7.6
+  - hspec-core ==2.7.8
+  - hspec-discover ==2.7.8
   - hspec-expectations ==0.8.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.5
@@ -1268,7 +1270,7 @@ default-package-overrides:
   - ini ==0.4.1
   - inj ==1.0
   - inline-c ==0.9.1.4
-  - inline-c-cpp ==0.4.0.2
+  - inline-c-cpp ==0.4.0.3
   - inline-r ==0.10.4
   - inliterate ==0.1.0
   - input-parsers ==0.1.0.1
@@ -1420,6 +1422,7 @@ default-package-overrides:
   - linux-namespaces ==0.1.3.0
   - liquid-fixpoint ==0.8.10.2
   - List ==0.6.2
+  - ListLike ==4.7.4
   - list-predicate ==0.1.0.1
   - listsafe ==0.1.0.1
   - list-singleton ==1.0.0.4
@@ -1440,7 +1443,7 @@ default-package-overrides:
   - logging ==3.0.5
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
-  - logict ==0.7.0.3
+  - logict ==0.7.1.0
   - logstash ==0.1.0.1
   - loop ==0.3.0
   - lrucache ==1.2.0.1
@@ -1750,6 +1753,7 @@ default-package-overrides:
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.1.0
   - pcre-utils ==0.1.8.1.1
+  - pdfinfo ==1.5.4
   - peano ==0.1.0.1
   - pem ==0.2.4
   - percent-format ==0.0.1
@@ -1848,6 +1852,7 @@ default-package-overrides:
   - primitive-unlifted ==0.1.3.0
   - print-console-colors ==0.1.0.0
   - probability ==0.2.7
+  - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.3
   - product-profunctors ==0.11.0.1
   - profiterole ==0.1
@@ -1939,7 +1944,7 @@ default-package-overrides:
   - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - reanimate ==1.1.3.1
+  - reanimate ==1.1.3.2
   - reanimate-svg ==0.13.0.0
   - rebase ==1.6.1
   - record-dot-preprocessor ==0.2.7
@@ -2026,7 +2031,7 @@ default-package-overrides:
   - safe-tensor ==0.2.1.0
   - salak ==0.3.6
   - salak-yaml ==0.3.5.3
-  - saltine ==0.1.1.0
+  - saltine ==0.1.1.1
   - salve ==1.0.10
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
@@ -2132,10 +2137,10 @@ default-package-overrides:
   - singleton-bool ==0.1.5
   - singleton-nats ==0.4.5
   - singletons ==2.7
-  - singletons-presburger ==0.3.0.1
+  - singletons-presburger ==0.5.0.0
   - siphash ==1.0.3
   - sitemap-gen ==0.1.0.0
-  - sized ==0.8.0.0
+  - sized ==1.0.0.0
   - skein ==1.0.9.4
   - skews ==0.1.0.3
   - skip-var ==0.1.1.0
@@ -2145,7 +2150,7 @@ default-package-overrides:
   - slack-progressbar ==0.1.0.1
   - slist ==0.1.1.0
   - slynx ==0.5.0.1
-  - smallcheck ==1.2.0
+  - smallcheck ==1.2.1
   - smash ==0.1.1.0
   - smash-aeson ==0.1.0.0
   - smash-lens ==0.1.0.1
@@ -2436,7 +2441,7 @@ default-package-overrides:
   - type-level-natural-number ==2.0
   - type-level-numbers ==0.1.1.1
   - type-map ==0.1.6.0
-  - type-natural ==0.9.0.0
+  - type-natural ==1.0.0.0
   - type-of-html ==1.6.1.2
   - type-of-html-static ==0.1.0.2
   - type-operators ==0.2.0.0
@@ -2458,7 +2463,6 @@ default-package-overrides:
   - unicode ==0.0.1.1
   - unicode-show ==0.1.0.4
   - unicode-transforms ==0.3.7.1
-  - unification-fd ==0.10.0.1
   - union-find ==0.2
   - unipatterns ==0.0.0.0
   - uniplate ==1.6.13
@@ -2537,13 +2541,13 @@ default-package-overrides:
   - vinyl ==0.13.0
   - void ==0.7.3
   - vty ==5.32
-  - wai ==3.2.2.1
+  - wai ==3.2.3
   - wai-app-static ==3.1.7.2
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.7
   - wai-enforce-https ==0.0.2.1
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.1.5
+  - wai-extra ==3.1.6
   - wai-feature-flags ==0.1.0.1
   - wai-handler-launch ==3.0.3.1
   - wai-logger ==2.3.6
@@ -2666,7 +2670,7 @@ default-package-overrides:
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
   - zio ==0.1.0.2
-  - zip ==1.6.0
+  - zip ==1.7.0
   - zip-archive ==0.4.1
   - zipper-extra ==0.1.3.2
   - zippers ==0.3

From fd215e57cbdbeaf0a5bee3be61ac7c8f62b6fbc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rasmus=20Pr=C3=A9centh?= <rasmus@precenth.eu>
Date: Thu, 21 Jan 2021 13:13:58 +0100
Subject: [PATCH 620/956] haskellPackages.glicko: unbreak

I'm the author of the package and fixed the dependencies upstream,
now builds correctly and can be unmarked as broken.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 678ae42060e..13ada9460ea 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5615,7 +5615,6 @@ broken-packages:
   - GLFW-OGL
   - GLFW-task
   - gli
-  - glicko
   - glider-nlp
   - GLMatrix
   - glob-posix

From 2cc5f7b1a5a5226b1d3068a405d95777148d8957 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jan 2021 18:09:25 +0100
Subject: [PATCH 621/956] hackage2nix: update list of broken builds to fix
 evaluation errors on Hydra

---
 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 13ada9460ea..d0396196673 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3918,6 +3918,7 @@ broken-packages:
   - cgi-utils
   - cgrep
   - chainweb-mining-client
+  - chakra
   - chalkboard
   - chalkboard-viewer
   - character-cases

From 8482fb4efd8f4b0be8fbb59a0292c8cd5073d07d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Jan 2021 21:18:24 +0100
Subject: [PATCH 622/956] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.6 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8c276aee32a6348165828e74e53b81a184e4e577.
---
 .../haskell-modules/hackage-packages.nix      | 845 ++++++++++++------
 1 file changed, 551 insertions(+), 294 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5093c73914..3dbe7ea16b3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1987,8 +1987,8 @@ self: {
     ({ mkDerivation, base, bytestring, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "BitSyntax";
-       version = "0.3.2.1";
-       sha256 = "0cc0nvmnybn68a1bvzqrvc5csaqvs3g50657slwjf2f686yi5q8r";
+       version = "0.3.2.2";
+       sha256 = "0615r1cb2sv9sj517vii3g2sf1k308q3r176i03jpjlb6vgfipkn";
        libraryHaskellDepends = [
          base bytestring QuickCheck template-haskell
        ];
@@ -6774,6 +6774,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GLUT_2_7_0_16" = callPackage
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.16";
+       sha256 = "0vdkfj4wjzigdpzgr5l001y9wkhwgl00mclr26gf93kps14fkymn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers OpenGL StateVar transformers
+       ];
+       description = "A binding for the OpenGL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw
@@ -18692,22 +18710,21 @@ self: {
      }) {};
 
   "Sit" = callPackage
-    ({ mkDerivation, alex, array, base, containers, data-lens-light
-     , happy, mtl
-     }:
+    ({ mkDerivation, array, base, containers, data-lens-light, mtl }:
      mkDerivation {
        pname = "Sit";
-       version = "0.2017.5.2";
-       sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff";
-       revision = "2";
-       editedCabalFile = "1chbiyvp02yn03pvqd4r4z3yprb7yiwmxmw2kl6gr5aml9923w41";
-       isLibrary = false;
+       version = "0.2021.1.18";
+       sha256 = "045xbxf0jyxr6510mcfhnfbj2p0kka5l45cydlxchhwg75z8snmi";
+       revision = "1";
+       editedCabalFile = "0vd1j410rp27g9cbzd3b1ymv02gfmi7pcnqzgpnppi9kc0nrr6kl";
+       isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          array base containers data-lens-light mtl
        ];
-       executableToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        description = "Prototypical type checker for Type Theory with Sized Natural Numbers";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29467,33 +29484,6 @@ self: {
      }) {};
 
   "amqp" = callPackage
-    ({ mkDerivation, base, binary, bytestring, clock, connection
-     , containers, data-binary-ieee754, hspec, hspec-expectations
-     , monad-control, network, network-uri, split, stm, text, vector
-     , xml
-     }:
-     mkDerivation {
-       pname = "amqp";
-       version = "0.20.0";
-       sha256 = "1vi8kccvvnym8v4cnsghkiicbjzvkbc7binr12priqmvwvis34rv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 monad-control network network-uri split stm
-         text vector
-       ];
-       executableHaskellDepends = [ base containers xml ];
-       testHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 hspec hspec-expectations network network-uri
-         split stm text vector
-       ];
-       description = "Client library for AMQP servers (currently only RabbitMQ)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "amqp_0_20_0_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -29518,7 +29508,6 @@ self: {
        ];
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -31747,27 +31736,28 @@ self: {
     ({ mkDerivation, base, containers, directory, extra, filemanip
      , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative
      , process, refact, silently, syb, tasty, tasty-expected-failure
-     , tasty-golden, transformers, unix-compat
+     , tasty-golden, transformers, uniplate, unix-compat
      }:
      mkDerivation {
        pname = "apply-refact";
-       version = "0.8.2.1";
-       sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp";
+       version = "0.9.0.0";
+       sha256 = "1w6andxlap50vi2cwdy7x5xp2q1qyd67g4vs860gddcv8nir69qc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers directory extra filemanip ghc ghc-exactprint
-         process refact syb transformers unix-compat
+         base containers directory extra filemanip ghc ghc-boot-th
+         ghc-exactprint process refact syb transformers uniplate unix-compat
        ];
        executableHaskellDepends = [
          base containers directory extra filemanip filepath ghc ghc-boot-th
          ghc-exactprint optparse-applicative process refact syb transformers
-         unix-compat
+         uniplate unix-compat
        ];
        testHaskellDepends = [
          base containers directory extra filemanip filepath ghc ghc-boot-th
          ghc-exactprint optparse-applicative process refact silently syb
-         tasty tasty-expected-failure tasty-golden transformers unix-compat
+         tasty tasty-expected-failure tasty-golden transformers uniplate
+         unix-compat
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
@@ -42208,18 +42198,18 @@ self: {
      }) {};
 
   "bitcoin-compact-filters" = callPackage
-    ({ mkDerivation, aeson, base, bitstream, bytestring, cereal
-     , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text
-     , transformers
+    ({ mkDerivation, aeson, base, base16-bytestring, bitstream
+     , bytestring, cereal, haskoin-core, memory, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers
      }:
      mkDerivation {
        pname = "bitcoin-compact-filters";
-       version = "0.1.0.0";
-       sha256 = "0ikirjf0n0np0l6mjfyfxvp367imbmb3g092m4mq457ja8yp7r8m";
+       version = "0.1.0.1";
+       sha256 = "1ifs7yi34x5nfhy0bs9w6arz7f6kwfxl0wgl6s0iwd1z94s5ysk1";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bitstream bytestring cereal haskoin-core memory text
-         transformers
+         base base16-bytestring bitstream bytestring cereal haskoin-core
+         memory text transformers
        ];
        testHaskellDepends = [
          aeson base bytestring cereal haskoin-core tasty tasty-hunit
@@ -42382,6 +42372,8 @@ self: {
        pname = "bitcoin-scripting";
        version = "0.1.0";
        sha256 = "1hd45rr4mq7dizdw7d1wkypr15azaaqc4fy6rkr9gim93jzc8707";
+       revision = "1";
+       editedCabalFile = "002i80rqigg3avydg9xhsa8ppyjw6a0r39hbimdghmv8db4wnpbl";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring cereal containers
          haskoin-core text transformers
@@ -42446,6 +42438,8 @@ self: {
        pname = "bitcoind-regtest";
        version = "0.2.0.0";
        sha256 = "06sk8kb3vjf7a2k7rhqpc7j1lbqd69xyhb25dc8bk7110m5l38cf";
+       revision = "1";
+       editedCabalFile = "15qqqvrx3ikbzvws2n5mywqlpsg8g437gsdj19cdfa6cc4bd8kqh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42476,6 +42470,8 @@ self: {
        pname = "bitcoind-rpc";
        version = "0.2.0.0";
        sha256 = "0y5y5bdbhc1kcdk2nwjv2x5nz9vg5j38mc3l9pjyizz1s5yzn9rc";
+       revision = "1";
+       editedCabalFile = "0zg4ym032v3bzr24ap9afl05difcxgd4wwipbvfbjybka1dwwr97";
        libraryHaskellDepends = [
          aeson base base16-bytestring bitcoin-compact-filters bytestring
          cereal haskoin-core http-client scientific servant servant-client
@@ -49801,28 +49797,29 @@ self: {
 
   "calamity" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, colour
-     , concurrent-extra, containers, data-default-class, data-flags
-     , deepseq, deque, df1, di-core, di-polysemy, exceptions, fmt, focus
-     , generic-lens, generic-override, generic-override-aeson, hashable
-     , http-date, http-types, lens, lens-aeson, megaparsec, mime-types
-     , mtl, polysemy, polysemy-plugin, reflection, safe-exceptions
+     , concurrent-extra, connection, containers, data-default-class
+     , data-flags, deepseq, deque, df1, di-core, di-polysemy, exceptions
+     , fmt, focus, generic-lens, generic-override
+     , generic-override-aeson, hashable, http-client, http-date
+     , http-types, lens, lens-aeson, megaparsec, mime-types, mtl
+     , polysemy, polysemy-plugin, reflection, req, safe-exceptions
      , scientific, stm, stm-chans, stm-containers, text, text-show, time
-     , typerep-map, unagi-chan, unboxing-vector, unordered-containers
-     , vector, websockets, wreq, wuss
+     , tls, typerep-map, unagi-chan, unboxing-vector
+     , unordered-containers, vector, websockets, x509-system
      }:
      mkDerivation {
        pname = "calamity";
-       version = "0.1.23.1";
-       sha256 = "162vjlzd2w98c5w8smjy6y7sywa7dfmv780g6ij4spzn1611l2z5";
+       version = "0.1.24.1";
+       sha256 = "14q0s17an5vk2gq9vcy0ghd30zg1dj3q5vdln86mnd4v34wkpfr2";
        libraryHaskellDepends = [
-         aeson async base bytestring colour concurrent-extra containers
-         data-default-class data-flags deepseq deque df1 di-core di-polysemy
-         exceptions fmt focus generic-lens generic-override
-         generic-override-aeson hashable http-date http-types lens
-         lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin
-         reflection safe-exceptions scientific stm stm-chans stm-containers
-         text text-show time typerep-map unagi-chan unboxing-vector
-         unordered-containers vector websockets wreq wuss
+         aeson async base bytestring colour concurrent-extra connection
+         containers data-default-class data-flags deepseq deque df1 di-core
+         di-polysemy exceptions fmt focus generic-lens generic-override
+         generic-override-aeson hashable http-client http-date http-types
+         lens lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin
+         reflection req safe-exceptions scientific stm stm-chans
+         stm-containers text text-show time tls typerep-map unagi-chan
+         unboxing-vector unordered-containers vector websockets x509-system
        ];
        description = "A library for writing discord bots in haskell";
        license = stdenv.lib.licenses.mit;
@@ -52670,6 +52667,55 @@ self: {
        broken = true;
      }) {};
 
+  "chakra" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cryptonite
+     , data-default, data-has, dotenv, envy, fast-logger, hspec
+     , http-types, iproute, jose, lens, mtl, network, network-uri
+     , options, optparse-simple, prometheus-client
+     , prometheus-metrics-ghc, rio, servant-auth, servant-auth-server
+     , servant-server, streaming-commons, string-conversions, text, time
+     , transformers, unordered-containers, wai, wai-cli, wai-extra
+     , wai-middleware-prometheus, warp
+     }:
+     mkDerivation {
+       pname = "chakra";
+       version = "0.1.0";
+       sha256 = "00ygnyvif8z8x9xasa3s9yahsawdmkjg43afczd5i0p3clfg6385";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger http-types iproute jose lens mtl
+         network network-uri options prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       executableHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger http-types iproute jose lens mtl
+         network network-uri options optparse-simple prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger hspec http-types iproute jose lens
+         mtl network network-uri options prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       description = "A REST Web Api server template for building (micro)services";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "chalk" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -53424,23 +53470,23 @@ self: {
      }) {};
 
   "cherry-core-alpha" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, binary, bytestring
-     , case-insensitive, cherry-core, containers, directory, ghc-prim
-     , hspec, hspec-discover, http-client, http-client-tls, http-types
-     , mtl, network, safe-exceptions, scientific, stm, text-utf8, time
-     , unix, utf8-string, vector, wai, wai-extra, wai-middleware-static
-     , warp
+    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
+     , bytestring, case-insensitive, cherry-core, containers, directory
+     , ghc-prim, hspec, hspec-discover, http-client, http-client-tls
+     , http-types, jose-jwt, mtl, network, postgresql-libpq
+     , safe-exceptions, scientific, stm, text, text-utf8, time, unix
+     , utf8-string, vector, wai, wai-extra, wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "cherry-core-alpha";
-       version = "0.3.0.0";
-       sha256 = "03plsrwzji653psjwsxmafsl24cyx6260x15cfpmb7fka5rdfs5i";
+       version = "0.4.0.0";
+       sha256 = "1rrmglzxvfq67ymgy7jifx8rgk33qq82vrcsbaqwcsjc95c3kfdx";
        libraryHaskellDepends = [
-         async base base64-bytestring binary bytestring case-insensitive
-         containers directory ghc-prim http-client http-client-tls
-         http-types mtl network safe-exceptions scientific stm text-utf8
-         time unix utf8-string vector wai wai-extra wai-middleware-static
-         warp
+         aeson async base base64-bytestring binary bytestring
+         case-insensitive containers directory ghc-prim http-client
+         http-client-tls http-types jose-jwt mtl network postgresql-libpq
+         safe-exceptions scientific stm text text-utf8 time unix utf8-string
+         vector wai wai-extra wai-middleware-static warp
        ];
        testHaskellDepends = [
          base cherry-core containers hspec text-utf8
@@ -54575,8 +54621,8 @@ self: {
      }:
      mkDerivation {
        pname = "citeproc";
-       version = "0.3.0.3";
-       sha256 = "0ck7hw1md1bwfl0qzkj0vg8ippmymcmvw84srr15rhaqgiqx9v4n";
+       version = "0.3.0.4";
+       sha256 = "13rx1919hnk26jpnqcdfqmd8hkvhg8504aq7abiyxy0diy28mvz7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61082,6 +61128,26 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "conferer_1_0_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , filepath, hspec, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "conferer";
+       version = "1.0.0.1";
+       sha256 = "0cfn6aj265qs1qk5z942g5l2cz2gsj35bapxynj4c90wjl89wz5r";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath text
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory filepath hspec
+         QuickCheck text
+       ];
+       description = "Configuration management library";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conferer-aeson" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
      , directory, hspec, text, unordered-containers, vector
@@ -72062,6 +72128,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "dep-t" = callPackage
+    ({ mkDerivation, base, mtl, rank2classes, tasty, tasty-hunit
+     , template-haskell, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "dep-t";
+       version = "0.1.0.2";
+       sha256 = "0vzf37gmhvpv43xybzn7lms0jgl12ch7mz04a05a1arn3ljh89c9";
+       libraryHaskellDepends = [ base mtl transformers unliftio-core ];
+       testHaskellDepends = [
+         base mtl rank2classes tasty tasty-hunit template-haskell
+         transformers unliftio-core
+       ];
+       description = "Reader-like monad transformer for dependency injection";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dependency" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, containers
      , criterion, deepseq, hspec, microlens
@@ -83858,6 +83941,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "equational-reasoning_0_6_0_4" = callPackage
+    ({ mkDerivation, base, containers, template-haskell, th-desugar
+     , void
+     }:
+     mkDerivation {
+       pname = "equational-reasoning";
+       version = "0.6.0.4";
+       sha256 = "1dv9di6p7pqmxys9c2d3rv36qhafgji0rxf52v0240zvfqhg8wn4";
+       libraryHaskellDepends = [
+         base containers template-haskell th-desugar void
+       ];
+       description = "Proof assistant for Haskell using DataKinds & PolyKinds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "equational-reasoning-induction" = callPackage
     ({ mkDerivation, base, singletons, template-haskell, th-extras }:
      mkDerivation {
@@ -100736,23 +100835,56 @@ self: {
      }) {};
 
   "ghc-typelits-presburger" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl
-     , pretty, reflection, syb, transformers
+    ({ mkDerivation, base, containers, equational-reasoning, ghc
+     , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty
+     , tasty-discover, tasty-expected-failure, tasty-hunit, text
+     , transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-presburger";
-       version = "0.3.0.1";
-       sha256 = "0h403zi5lqbpygpqw5469fafz1cgh5mcx96sp0iw4scnmh7z3cj9";
+       version = "0.4.0.0";
+       sha256 = "0sz8n323vcwgx3haq6235k1hs0yqg8qnksqk5wwz9a2gkb45gqn2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers ghc ghc-tcplugins-extra mtl pretty reflection syb
          transformers
        ];
+       testHaskellDepends = [
+         base equational-reasoning tasty tasty-discover
+         tasty-expected-failure tasty-hunit text
+       ];
+       testToolDepends = [ tasty-discover ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-typelits-presburger_0_5_0_0" = callPackage
+    ({ mkDerivation, base, containers, equational-reasoning, ghc
+     , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty
+     , tasty-discover, tasty-expected-failure, tasty-hunit, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-presburger";
+       version = "0.5.0.0";
+       sha256 = "12v42xav9mvhkkzbfbrjcm2b3hk6vr3j6ra8qn9ji1jfzvin88wl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers ghc ghc-tcplugins-extra mtl pretty reflection syb
+         transformers
+       ];
+       testHaskellDepends = [
+         base equational-reasoning tasty tasty-discover
+         tasty-expected-failure tasty-hunit text
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-usage" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-paths, unix }:
      mkDerivation {
@@ -103721,8 +103853,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitlab-haskell";
-       version = "0.2.4";
-       sha256 = "1p2sgxnr5xgh0wz3q5vf6xqy827nrplfbcpfwa6kgqxiqgsfsdv2";
+       version = "0.2.5";
+       sha256 = "13dlbl2hlvmplxjypg14llpbxf0a9x2f4lk0kkn46f63mn0fy83x";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring connection http-conduit http-types temporary
@@ -114455,8 +114587,8 @@ self: {
     ({ mkDerivation, base, containers, random }:
      mkDerivation {
        pname = "hanabi-dealer";
-       version = "0.10.2.0";
-       sha256 = "0axqpa1p7lzxym8nyppc3nhbfzis8y71ywi444v3w6syyvh06ygf";
+       version = "0.11.0.1";
+       sha256 = "1w4zxjs6253rxkfhhsvcvpfzzslaxyb3m2c6nbh22l6a1li9bcm9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers random ];
@@ -125741,10 +125873,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, integer-gmp, QuickCheck }:
      mkDerivation {
        pname = "hgmp";
-       version = "0.1.1";
-       sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
-       revision = "4";
-       editedCabalFile = "00rg7f223716dlqk0w92ixnyj7a9imj6yqcs5qx833jv7lk8lbyj";
+       version = "0.1.2";
+       sha256 = "1sqnywh4h1nklcpci60n427m1kahkza1vy1j60jmq3lnlrbgzfzk";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell interface to GMP";
@@ -128322,8 +128452,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "3.2.6";
-       sha256 = "1i1qqqi6qdfa3py48cns6c41xn6qr8rsfg7rn4i22qr86zp8ikp5";
+       version = "3.2.7";
+       sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -129461,34 +129591,31 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "hnix-store-core_0_4_0_0" = callPackage
+  "hnix-store-core_0_4_1_0" = callPackage
     ({ mkDerivation, algebraic-graphs, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, bytestring, cereal
      , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
-     , cryptohash-sha512, directory, filepath, hashable, io-streams
-     , lifted-base, monad-control, mtl, nix-derivation, process
-     , process-extras, saltine, tasty, tasty-discover, tasty-golden
-     , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time
-     , unix, unordered-containers, vector
+     , cryptohash-sha512, directory, filepath, hashable, lifted-base
+     , monad-control, mtl, nix-derivation, process, saltine, tasty
+     , tasty-golden, tasty-hspec, tasty-hunit, tasty-quickcheck
+     , temporary, text, time, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hnix-store-core";
-       version = "0.4.0.0";
-       sha256 = "05fwh5y82qy4qzi32xgk8dmndd8r074rvfl2nxyg3f3ydqpcmmr2";
+       version = "0.4.1.0";
+       sha256 = "05yblps7x9r4hwszinx2s4rcfr8q1d1y6r29mn6jzydjwvdyhgj0";
        libraryHaskellDepends = [
          algebraic-graphs attoparsec base base16-bytestring
-         base64-bytestring binary bytestring cereal containers
-         cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
-         directory filepath hashable lifted-base monad-control mtl
-         nix-derivation saltine text time unix unordered-containers vector
+         base64-bytestring bytestring cereal containers cryptohash-md5
+         cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 directory
+         filepath hashable lifted-base monad-control mtl nix-derivation
+         saltine text time unix unordered-containers vector
        ];
        testHaskellDepends = [
          attoparsec base base16-bytestring base64-bytestring binary
-         bytestring containers directory filepath io-streams process
-         process-extras tasty tasty-discover tasty-golden tasty-hspec
-         tasty-hunit tasty-quickcheck temporary text unix
+         bytestring containers directory filepath process tasty tasty-golden
+         tasty-hspec tasty-hunit tasty-quickcheck temporary text unix
        ];
-       testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129496,17 +129623,16 @@ self: {
 
   "hnix-store-remote" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , filepath, hnix-store-core, mtl, network, nix-derivation, text
-     , time, unix, unordered-containers, vector
+     , hnix-store-core, mtl, network, nix-derivation, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "hnix-store-remote";
-       version = "0.4.0.0";
-       sha256 = "0l9gb5b415im1bjrbx6k0ah92763hgm1ns6kxfl5mxwij52kzc32";
+       version = "0.4.1.0";
+       sha256 = "1w6x756hh7429ci2kdsl9psxbsq8k829x802dblv652d33wl0fkc";
        libraryHaskellDepends = [
-         attoparsec base binary bytestring containers filepath
-         hnix-store-core mtl network nix-derivation text time unix
-         unordered-containers vector
+         attoparsec base binary bytestring containers hnix-store-core mtl
+         network nix-derivation text time unordered-containers
        ];
        description = "Remote hnix store";
        license = stdenv.lib.licenses.asl20;
@@ -135557,6 +135683,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_7_8" = callPackage
+    ({ mkDerivation, base, hspec-core, hspec-discover
+     , hspec-expectations, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.7.8";
+       sha256 = "0v6bf6ir6h97mys797amr8idl1a6w1gpvj7ps3k0gkxwrnsyvynh";
+       libraryHaskellDepends = [
+         base hspec-core hspec-discover hspec-expectations QuickCheck
+       ];
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -135639,6 +135781,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_7_8" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, stm, temporary, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.7.8";
+       sha256 = "10c7avvjcrpy3nrf5xng4177nmxvz0gmc83h7qlnljcp3rkimbvd";
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm tf-random transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random
+         transformers
+       ];
+       testToolDepends = [ hspec-meta ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-dirstream" = callPackage
     ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
      , pipes, pipes-safe, system-filepath, text
@@ -135676,6 +135846,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_7_8" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.7.8";
+       sha256 = "0z2ysmy4qzv4jyb5yqmavhmbhqk2ch0cmaj18i9jvbg0y7fpsn67";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       testToolDepends = [ hspec-meta ];
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
@@ -138673,8 +138863,8 @@ self: {
        pname = "http-media";
        version = "0.8.0.0";
        sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir";
-       revision = "3";
-       editedCabalFile = "1ndz5x6njl35h73il5c6qpaqd4ynvg21n6k7sb8aq09gfbg544d8";
+       revision = "4";
+       editedCabalFile = "0qg6x92i3w2q7zarr08kmicychkwskfi04xaxkqkg0cw6jnpnhhh";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -139866,8 +140056,8 @@ self: {
      }:
      mkDerivation {
        pname = "hurl";
-       version = "2.0.0.0";
-       sha256 = "0rr4v8dbbkasg68zkv6z2p4ib12kazqjrad4s0z7h6l7hy6rqwbz";
+       version = "2.1.0.0";
+       sha256 = "0n467hgj8ybgqa69snsj6c199f0ipavxwjn2pb47q1vns6prlwd0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145496,6 +145686,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c-cpp_0_4_0_3" = callPackage
+    ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions
+     , template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "inline-c-cpp";
+       version = "0.4.0.3";
+       sha256 = "0bqrhyic3cw1pqg7knsmkqx5swpr4kvf9bmz0mhmqbl6brmv5il0";
+       libraryHaskellDepends = [
+         base containers inline-c safe-exceptions template-haskell
+       ];
+       testHaskellDepends = [
+         base containers hspec inline-c safe-exceptions template-haskell
+         vector
+       ];
+       description = "Lets you embed C++ code into Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-win32" = callPackage
     ({ mkDerivation, base, containers, inline-c, template-haskell
      , Win32
@@ -154316,8 +154526,8 @@ self: {
      }:
      mkDerivation {
        pname = "ktx-codec";
-       version = "0.0.1.1";
-       sha256 = "1qvkcmxilvlwsbp5pidkh3njwsj6k19ybz8jw5mcm90zdhx3gya0";
+       version = "0.0.1.2";
+       sha256 = "14vv1c7n8ms2y18ks08i5hr09av9y2gn677rki4swfdhgy3zamcp";
        libraryHaskellDepends = [
          base binary bytestring containers text vector
        ];
@@ -155671,8 +155881,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.10.2";
-       sha256 = "10lanbzbaywyc3a8lq2ndgmpqq2kgpm4vkjxw7gl4irzjn3206yg";
+       version = "1.7.10.3";
+       sha256 = "0snidchidgzxwizbzaxf1gn547ga6kdf8pi03p6p5g9ffb8mv372";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -164229,16 +164439,33 @@ self: {
        broken = true;
      }) {};
 
-  "logict" = callPackage
+  "logict_0_7_0_3" = callPackage
     ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "logict";
        version = "0.7.0.3";
        sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r";
+       revision = "1";
+       editedCabalFile = "13hxmzaxd5iv9hjad5kw9infq0lxsgypqqb2z1i1939604a90qp4";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base mtl tasty tasty-hunit ];
        description = "A backtracking logic-programming monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "logict" = callPackage
+    ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "logict";
+       version = "0.7.1.0";
+       sha256 = "1d22b7r8lnak5k8ars166cxbk1lv7gf8g0qs604irsx2s474ybi7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ async base mtl tasty tasty-hunit ];
+       description = "A backtracking logic-programming monad";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "logict-state" = callPackage
@@ -170169,8 +170396,8 @@ self: {
      }:
      mkDerivation {
        pname = "memcache";
-       version = "0.2.0.1";
-       sha256 = "0p6qyw15nx1l0b7h029hjkhgz7zvc19c4bfm2pkx53hm96gxjxqg";
+       version = "0.3.0.1";
+       sha256 = "0sbfzmdq0rqzrvrjk7yzkn0mfadbz3dxj1d9n8f3s9mz3s8bv328";
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-default-class hashable
          network resource-pool time vector
@@ -173010,25 +173237,26 @@ self: {
      }) {};
 
   "miv" = callPackage
-    ({ mkDerivation, aeson, async, base, concurrent-output, directory
-     , filepath, filepattern, ghc-prim, hashable, hspec, monad-parallel
-     , process, SafeSemaphore, text, time, unix-compat
-     , unordered-containers, xdg-basedir, yaml
+    ({ mkDerivation, async, base, bytestring, concurrent-output
+     , containers, directory, filepath, filepattern, ghc-prim, hspec
+     , HsYAML, monad-parallel, process, SafeSemaphore, text, time
+     , unix-compat, unordered-containers, xdg-basedir
      }:
      mkDerivation {
        pname = "miv";
-       version = "0.4.6";
-       sha256 = "1xf4frjvccjvkzgx9ha9q2i6ig5bx3z37igjb3s7a9zvqnvig06g";
+       version = "0.4.8";
+       sha256 = "1b3lplsnjf992rvidj48swccl8f8aqdik1sf481g7vwv2mz7d7m6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson async base concurrent-output directory filepath filepattern
-         ghc-prim hashable monad-parallel process SafeSemaphore text time
-         unix-compat unordered-containers xdg-basedir yaml
+         async base bytestring concurrent-output containers directory
+         filepath filepattern ghc-prim HsYAML monad-parallel process
+         SafeSemaphore text time unix-compat unordered-containers
+         xdg-basedir
        ];
        testHaskellDepends = [
-         aeson base directory ghc-prim hashable hspec monad-parallel process
-         text time unordered-containers yaml
+         base bytestring containers directory ghc-prim hspec HsYAML
+         monad-parallel process text time unordered-containers
        ];
        description = "Vim plugin manager written in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -191923,8 +192151,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.3.4";
-       sha256 = "0xmf75v6b5cj083fjxz3hl6cj9ix2v68h8ix5zrh94qik5is4rl7";
+       version = "0.3.5";
+       sha256 = "1cw6wm122zwbn61980vqr2prsc3qpnnaqgk0m3wvxs03dygarpja";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205278,6 +205506,18 @@ self: {
        broken = true;
      }) {};
 
+  "prime" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "prime";
+       version = "0.1.1";
+       sha256 = "18bfxyzazf5d8hfakrags3l3hbn75zws4ihl9bj59c52if5l6fbm";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "prime number tools";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "primes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -213063,8 +213303,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "9.3.2";
-       sha256 = "06mb7z1w56hvwl9gbkmbbib01760ix93x03bdl0ybpb6hhffq7r3";
+       version = "9.3.3";
+       sha256 = "0c2q48vbqkvhd0m3sahn7ja8bxpj9xkgw2hkg9chrhj0amyp5xzk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214163,44 +214403,6 @@ self: {
      }) {};
 
   "reanimate" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
-     , base64-bytestring, bytestring, cassava, cereal, colour
-     , containers, cryptohash-sha256, cubicbezier, directory, filelock
-     , filepath, fingertree, fsnotify, geojson, hashable, hgeometry
-     , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl
-     , neat-interpolation, network, open-browser, optparse-applicative
-     , parallel, process, QuickCheck, random, random-shuffle
-     , reanimate-svg, split, tasty, tasty-expected-failure, tasty-golden
-     , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time
-     , unix, unordered-containers, vector, vector-space, websockets, xml
-     }:
-     mkDerivation {
-       pname = "reanimate";
-       version = "1.1.3.1";
-       sha256 = "0x2pfbf712lixpj1mv1gvv26xi80shiq3798mkd0kqmvzkz57aqz";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal array attoparsec base base64-bytestring
-         bytestring cassava cereal colour containers cryptohash-sha256
-         cubicbezier directory filelock filepath fingertree fsnotify geojson
-         hashable hgeometry hgeometry-combinatorial JuicyPixels lens linear
-         matrix mtl neat-interpolation network open-browser
-         optparse-applicative parallel process random random-shuffle
-         reanimate-svg split temporary text time unix unordered-containers
-         vector vector-space websockets xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath linear process QuickCheck tasty
-         tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
-         tasty-rerun temporary text vector
-       ];
-       description = "Animation library based on SVGs";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "reanimate_1_1_3_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
      , base64-bytestring, bytestring, cassava, cereal, colour
      , containers, cryptohash-sha256, cubicbezier, directory, filelock
@@ -217005,8 +217207,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry-hedgehog";
-       version = "0.2.1.1";
-       sha256 = "1s94xb7ma6rq81z30wjaczy2w3v1myqwhkx257p4nh69dv4wzd8d";
+       version = "0.3.0.0";
+       sha256 = "0ardmwsaxlk9g062bf2xiigbjbnqbf7iz9s8xwjzj8nh8rrs252z";
        libraryHaskellDepends = [
          base containers hedgehog mmorph multimap protolude registry tasty
          tasty-discover tasty-hedgehog tasty-th template-haskell text
@@ -223459,25 +223661,6 @@ self: {
      }) {};
 
   "saltine" = callPackage
-    ({ mkDerivation, base, bytestring, hashable, libsodium, profunctors
-     , QuickCheck, semigroups, test-framework
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "saltine";
-       version = "0.1.1.0";
-       sha256 = "1apcyc39mraqg9394scwqrdc3aaxvry22pl648gyp73z9dfrk5wf";
-       libraryHaskellDepends = [ base bytestring hashable profunctors ];
-       libraryPkgconfigDepends = [ libsodium ];
-       testHaskellDepends = [
-         base bytestring QuickCheck semigroups test-framework
-         test-framework-quickcheck2
-       ];
-       description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) libsodium;};
-
-  "saltine_0_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, hashable, libsodium, profunctors
      , QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2
@@ -223494,7 +223677,6 @@ self: {
        ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
@@ -227097,28 +227279,27 @@ self: {
      }) {};
 
   "sensei" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat, bytestring
-     , directory, filepath, fsnotify, hspec, hspec-meta, hspec-wai
+    ({ mkDerivation, ansi-terminal, base, bytestring, directory
+     , filepath, fsnotify, hspec, hspec-discover, hspec-meta, hspec-wai
      , http-client, http-types, interpolate, mockery, network, process
      , silently, stm, text, time, unix, wai, warp
      }:
      mkDerivation {
        pname = "sensei";
-       version = "0.4.0";
-       sha256 = "18p3hrc0av30ri678rgzdarp5m3qpia0y1nc6rb8zzvs0cspmfvd";
+       version = "0.5.0";
+       sha256 = "011lck879q12npszqf2cjsxyjrcyfhrs77dh8kbififm53dfglf4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base base-compat bytestring directory filepath
-         fsnotify http-client http-types network process stm text time unix
-         wai warp
+         ansi-terminal base bytestring directory filepath fsnotify
+         http-client http-types network process stm text time unix wai warp
        ];
        testHaskellDepends = [
-         ansi-terminal base base-compat bytestring directory filepath
-         fsnotify hspec hspec-meta hspec-wai http-client http-types
-         interpolate mockery network process silently stm text time unix wai
-         warp
+         ansi-terminal base bytestring directory filepath fsnotify hspec
+         hspec-meta hspec-wai http-client http-types interpolate mockery
+         network process silently stm text time unix wai warp
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227643,8 +227824,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, unix }:
      mkDerivation {
        pname = "serialport";
-       version = "0.5.0";
-       sha256 = "1w547rrfsa1cbjcdpqrlzwnnyrzd4lmbj52mnh98zz9aiv7rbqxv";
+       version = "0.5.1";
+       sha256 = "1ys3rjw1a3cghd2slnn43hvc3pdgwfy3rs19j1kjfshasr7d375m";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Cross platform serial port library";
@@ -234561,8 +234742,8 @@ self: {
      }:
      mkDerivation {
        pname = "singletons-presburger";
-       version = "0.3.0.1";
-       sha256 = "1j7azll9cjg5gcvpw8aq1hia1njg4bm8llwms1v941gwi7gk481m";
+       version = "0.4.0.0";
+       sha256 = "0jdyynjapviks042jw3vfq27yk3wvjg7n7xmq3m3x0v195731jph";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -234572,6 +234753,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singletons-presburger_0_5_0_0" = callPackage
+    ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl
+     , reflection, singletons
+     }:
+     mkDerivation {
+       pname = "singletons-presburger";
+       version = "0.5.0.0";
+       sha256 = "0pc95rg9vbcgzw6bzsj41vbz3h85p4lhf1ry8ik6l8c2nz3ga6bb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ghc ghc-typelits-presburger mtl reflection singletons
+       ];
+       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singnal" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -234830,30 +235029,6 @@ self: {
      }) {};
 
   "sized" = callPackage
-    ({ mkDerivation, base, constraints, containers, deepseq
-     , equational-reasoning, ghc-typelits-knownnat
-     , ghc-typelits-presburger, hashable, hspec, inspection-testing
-     , lens, mono-traversable, singletons, subcategories
-     , template-haskell, th-lift, these, type-natural, vector
-     }:
-     mkDerivation {
-       pname = "sized";
-       version = "0.8.0.0";
-       sha256 = "1jwarhc0xi4h5860whi6s9n36qijlh6j6rnxx71dnlsrinfdsn2m";
-       libraryHaskellDepends = [
-         base constraints containers deepseq equational-reasoning
-         ghc-typelits-knownnat ghc-typelits-presburger hashable lens
-         mono-traversable singletons subcategories these type-natural vector
-       ];
-       testHaskellDepends = [
-         base containers hspec inspection-testing mono-traversable
-         singletons subcategories template-haskell th-lift vector
-       ];
-       description = "Sized sequence data-types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sized_0_9_0_0" = callPackage
     ({ mkDerivation, base, constraints, containers, deepseq
      , equational-reasoning, ghc-typelits-knownnat
      , ghc-typelits-presburger, hashable, hspec, inspection-testing
@@ -234865,6 +235040,8 @@ self: {
        pname = "sized";
        version = "0.9.0.0";
        sha256 = "0pj21mnh5prxxbis6735na68ggqzslyqj5djkhzdvr364ajmbnd1";
+       revision = "1";
+       editedCabalFile = "1ij5avi0k4p5ms5g9l8yyy3mp0d0z05lap8jwx99zgz3rri7s4sw";
        libraryHaskellDepends = [
          base constraints containers deepseq equational-reasoning
          ghc-typelits-knownnat ghc-typelits-presburger hashable lens
@@ -234877,6 +235054,32 @@ self: {
        ];
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "sized_1_0_0_0" = callPackage
+    ({ mkDerivation, base, constraints, containers, deepseq
+     , equational-reasoning, ghc-typelits-knownnat
+     , ghc-typelits-presburger, hashable, hspec, inspection-testing
+     , lens, mono-traversable, subcategories, template-haskell, th-lift
+     , these, type-natural, vector
+     }:
+     mkDerivation {
+       pname = "sized";
+       version = "1.0.0.0";
+       sha256 = "0f6ql0yk0qi2wkzifhhhfn5z3wzh10d57ak9wrb4dv8s6mx34yk7";
+       revision = "3";
+       editedCabalFile = "13v3dkfdnzg2y7pfkn2dnvczd9y40izlm30vcssn2a5b1v7vy3bz";
+       libraryHaskellDepends = [
+         base constraints containers deepseq equational-reasoning
+         ghc-typelits-knownnat ghc-typelits-presburger hashable lens
+         mono-traversable subcategories these type-natural vector
+       ];
+       testHaskellDepends = [
+         base containers hspec inspection-testing mono-traversable
+         subcategories template-haskell th-lift type-natural vector
+       ];
+       description = "Sized sequence data-types";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -235562,8 +235765,8 @@ self: {
      }:
      mkDerivation {
        pname = "slick";
-       version = "1.0.1.1";
-       sha256 = "1n1a7jpn37dzfmk9z51d6yhg2iaraqw55qnlap0d6zk1lnc3drib";
+       version = "1.1.0.0";
+       sha256 = "1a6zsp308ikqzdxy26phb04bk4hr8lmw1i73mwydg65yd42c8zjx";
        libraryHaskellDepends = [
          aeson base bytestring directory extra mustache pandoc shake text
          unordered-containers
@@ -235842,8 +236045,8 @@ self: {
     ({ mkDerivation, base, logict, mtl, pretty }:
      mkDerivation {
        pname = "smallcheck";
-       version = "1.2.0";
-       sha256 = "1y6rh1g7pi99jqq32xdv79yli9hmbfwjqg8ix1z2i2qkqqkr5iyn";
+       version = "1.2.1";
+       sha256 = "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4";
        libraryHaskellDepends = [ base logict mtl pretty ];
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
@@ -251333,6 +251536,8 @@ self: {
        pname = "tasty-smallcheck";
        version = "0.8.2";
        sha256 = "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym";
+       revision = "1";
+       editedCabalFile = "0033ha2w9rzc1rxpzh1dkfdrn256i5lvb41pqbdh2i6kli0v5vmh";
        libraryHaskellDepends = [
          base optparse-applicative smallcheck tagged tasty
        ];
@@ -251364,8 +251569,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-sugar";
-       version = "1.0.0.0";
-       sha256 = "0nh8s3ma9xjyfn90ylgbywrd536px2bmvsibmjhy0lcjzbd37jwx";
+       version = "1.0.1.0";
+       sha256 = "1q5m6x5w95dds1f00sr6nn7lgs0q2g7ivdxd8ghfm529pss2143n";
        libraryHaskellDepends = [
          base directory filemanip filepath logict optparse-applicative
          prettyprinter tagged tasty
@@ -256009,8 +256214,8 @@ self: {
      }:
      mkDerivation {
        pname = "thock";
-       version = "0.2.0.0";
-       sha256 = "1wj3zldfqpa8xvk62qv13frhxmrjhrjismcb9iyblkrwlcxzfyns";
+       version = "0.2.1.0";
+       sha256 = "0s5xxmbxpr6g2j7797j8ix51405q7455s74x5dijfpi13phx7v94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -263412,6 +263617,8 @@ self: {
        pname = "type-natural";
        version = "0.9.0.0";
        sha256 = "1jg8qqha60mxj7mrbi69jbcniayksyggi2s7fxy88ap4ay1hky3a";
+       revision = "1";
+       editedCabalFile = "0iybmf7c6lzrbdyslhlwzd7z6sq9sdanfv3lrw1hmp7lrmnmrfij";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger singletons singletons-presburger
@@ -263421,6 +263628,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-natural_1_0_0_0" = callPackage
+    ({ mkDerivation, base, constraints, equational-reasoning, ghc
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise
+     , ghc-typelits-presburger, integer-logarithms, QuickCheck
+     , quickcheck-instances, tasty, tasty-discover
+     , tasty-expected-failure, tasty-hunit, tasty-quickcheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "type-natural";
+       version = "1.0.0.0";
+       sha256 = "04j37xqgd2690y0vlx6f24y7fa07vljkrlaq8x8azmka8lsmbdl0";
+       libraryHaskellDepends = [
+         base constraints equational-reasoning ghc ghc-typelits-knownnat
+         ghc-typelits-natnormalise ghc-typelits-presburger
+         integer-logarithms template-haskell
+       ];
+       testHaskellDepends = [
+         base equational-reasoning integer-logarithms QuickCheck
+         quickcheck-instances tasty tasty-discover tasty-expected-failure
+         tasty-hunit tasty-quickcheck template-haskell
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Type-level natural and proofs of their properties";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-of-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
@@ -266183,8 +266418,6 @@ self: {
        testHaskellDepends = [ base containers QuickCheck ];
        description = "A class for finite and recursively enumerable types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universe-dependent-sum" = callPackage
@@ -266196,8 +266429,6 @@ self: {
        libraryHaskellDepends = [ base universe-some ];
        description = "Universe instances for types from dependent-sum";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universe-instances-base" = callPackage
@@ -266275,8 +266506,6 @@ self: {
        testHaskellDepends = [ base some template-haskell universe-base ];
        description = "Universe instances for Some from some";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universe-th" = callPackage
@@ -271711,6 +271940,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai_3_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hspec-discover
+     , http-types, network, text, vault
+     }:
+     mkDerivation {
+       pname = "wai";
+       version = "3.2.3";
+       sha256 = "1y19h9v0cq1fl17ywcyyvd6419fhgyw2s0yk0ki8z60021adcx2m";
+       libraryHaskellDepends = [
+         base bytestring http-types network text vault
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "Web Application Interface";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-accept-language" = callPackage
     ({ mkDerivation, base, bytestring, file-embed, http-types, text
      , wai, wai-app-static, wai-extra, warp, word8
@@ -271992,6 +272239,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_1_6" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , bytestring, call-stack, case-insensitive, containers, cookie
+     , data-default-class, directory, fast-logger, hspec, http-types
+     , http2, HUnit, iproute, network, resourcet, streaming-commons
+     , text, time, transformers, unix, vault, wai, wai-logger, word8
+     , zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.1.6";
+       sha256 = "03bbhmy8dc2ivhgbsrc39wk5kb9ci4p98pb2qcq2w92imy710cj6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring bytestring call-stack
+         case-insensitive containers cookie data-default-class directory
+         fast-logger http-types http2 HUnit iproute network resourcet
+         streaming-commons text time transformers unix vault wai wai-logger
+         word8
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive cookie fast-logger hspec
+         http-types http2 HUnit iproute resourcet text time transformers wai
+         zlib
+       ];
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-feature-flags" = callPackage
     ({ mkDerivation, aeson, base, bytestring, random, text
      , unordered-containers, wai, warp
@@ -276168,19 +276446,22 @@ self: {
 
   "witherable" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable
-     , indexed-traversable, indexed-traversable-instances, transformers
-     , transformers-compat, unordered-containers, vector
+     , indexed-traversable, indexed-traversable-instances, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "witherable";
-       version = "0.4";
-       sha256 = "086cqikx8x3yga3b25wgdmws46prx5i49rfb8c5cchp3ilksrxhi";
-       revision = "1";
-       editedCabalFile = "14if8lyjg8q1iml63y5bq8r0fjqpday31q3m49prl1hlarhl6yxs";
+       version = "0.4.1";
+       sha256 = "1jj2dq0ddaa2v3hksnrv1z1ll19fa4npsqlp7fs4nn5g6833y58b";
        libraryHaskellDepends = [
          base base-orphans containers hashable indexed-traversable
-         indexed-traversable-instances transformers transformers-compat
-         unordered-containers vector
+         indexed-traversable-instances transformers unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         base containers hashable QuickCheck quickcheck-instances tasty
+         tasty-quickcheck transformers unordered-containers vector
        ];
        description = "filterable traversable";
        license = stdenv.lib.licenses.bsd3;
@@ -278887,30 +279168,6 @@ self: {
        broken = true;
      }) {};
 
-  "xml-conduit_1_8_0_1" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , bytestring, conduit, conduit-extra, containers
-     , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
-     , text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.8.0.1";
-       sha256 = "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq";
-       libraryHaskellDepends = [
-         attoparsec base blaze-html blaze-markup bytestring conduit
-         conduit-extra containers data-default-class deepseq resourcet text
-         transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers doctest hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "xml-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, conduit, conduit-extra, containers

From 7ef37f88061e57e6771d650499714469c421cbd2 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 17 Jan 2021 22:58:09 +0100
Subject: [PATCH 623/956] haskellPackages.pandoc: Temporarily disable tests

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8025c521ce8..baac651d5b0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1375,6 +1375,11 @@ self: super: {
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
   pandoc-citeproc = doJailbreak super.pandoc-citeproc;
 
+  # 2021-01-17: Tests are broken because of a version mismatch.
+  # See here: https://github.com/jgm/pandoc/issues/7035
+  # This problem is fixed on master. Remove override when this assert fails.
+  pandoc = assert super.pandoc.version == "2.11.3.2"; dontCheck super.pandoc;
+
   # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
   domain-auth = dontCheck super.domain-auth;
 

From de00ad9932876f5d51c4f6e86f46a1b477c7af92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jan 2021 18:22:12 +0100
Subject: [PATCH 624/956] hnix-store-core: update overrides for the latest
 version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index baac651d5b0..2cf459bd260 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -223,7 +223,7 @@ self: super: {
     # https://github.com/haskell-nix/hnix-store/issues/104
     # Until unpin, which may hold off in time due to Stackage maintenence bottleneck
     # the 0_4_0_0 is used
-    hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7
+    hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
 
   });
 
@@ -232,7 +232,7 @@ self: super: {
   # Until unpin, which may hold off in time due to Stackage maintenence bottleneck
   # the 0_4_0_0 is used
   hnix-store-remote = (super.hnix-store-remote.override {
-    hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7
+    hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
   });
 
 

From 4a8f6f4230838a5c422070ec0226a3440d2790c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jan 2021 18:21:04 +0100
Subject: [PATCH 625/956] hnix-store-core: add missing test dependency by way
 of override

See https://github.com/haskell-nix/hnix-store/issues/127.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2cf459bd260..e2d17a8a69f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -235,6 +235,8 @@ self: super: {
     hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
   });
 
+  # https://github.com/haskell-nix/hnix-store/issues/127
+  hnix-store-core_0_4_1_0 = addTestToolDepend super.hnix-store-core_0_4_1_0 self.tasty-discover;
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;

From 71e660bb8d57e7586dce1df2c02e46b64a9c3b11 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 18 Jan 2021 19:14:14 +0100
Subject: [PATCH 626/956] haskellPackages.universe-dependent-sum: Remove broken
 flag

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d0396196673..c74a4c8c972 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -11013,13 +11013,10 @@ broken-packages:
   - unitym-yesod
   - universal-binary
   - universe
-  - universe-base
-  - universe-dependent-sum
   - universe-instances-base
   - universe-instances-extended
   - universe-instances-trans
   - universe-reverse-instances
-  - universe-some
   - universe-th
   - unix-fcntl
   - unix-handle

From c3792f6cddc71ba348e018406f125503d088c405 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jan 2021 19:26:01 +0100
Subject: [PATCH 627/956] Consistently use 'lib' instead of 'stdenv.lib' in the
 Haskell infrastructure.

Part of https://github.com/NixOS/nixpkgs/issues/108938.
---
 .../haskell-modules/hackage-packages.nix      | 48354 ++++++++--------
 .../haskell-modules/initial-packages.nix      |     2 +-
 .../haskell-modules/make-package-set.nix      |    10 +-
 3 files changed, 24185 insertions(+), 24181 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3dbe7ea16b3..8d8bfde3879 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1,6 +1,6 @@
 /* hackage-packages.nix is an auto-generated file -- DO NOT EDIT! */
 
-{ pkgs, stdenv, callPackage }:
+{ pkgs, lib, callPackage }:
 
 self: {
 
@@ -14,7 +14,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGL random ];
        description = "Examples of 3D graphics programming with OpenGL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "3dmodels" = callPackage
@@ -27,8 +27,8 @@ self: {
          attoparsec base bytestring linear packer
        ];
        description = "3D model parsers";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44,8 +44,8 @@ self: {
          base cairo containers gtk haskell98 mtl
        ];
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57,8 +57,8 @@ self: {
        sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh";
        libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76,7 +76,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "An alternating list of two types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-Angle" = callPackage
@@ -87,7 +87,7 @@ self: {
        sha256 = "0ra97a4im3w2cq3mf17j8skn6bajs7rw7d0mmvcwgb9jd04b0idm";
        libraryHaskellDepends = [ base ];
        description = "Angles in degrees and radians";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-Boolean" = callPackage
@@ -98,7 +98,7 @@ self: {
        sha256 = "0id19wgp2jg2pf1gdhfzkyknjj19jii3pz0lva29x3lcck38rw2b";
        libraryHaskellDepends = [ base ];
        description = "Handle Boolean values generatically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-BuildPlatform" = callPackage
@@ -109,8 +109,8 @@ self: {
        sha256 = "0vlhakc6mc4zzyvb54rgmskkj8hp43zy35giimk0g7i5068r2czh";
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122,7 +122,7 @@ self: {
        sha256 = "02v3b1pfhwnf3cl8kbxfkk0a7hdp0gqq5v4w9ka32zl1p007rz19";
        libraryHaskellDepends = [ base ];
        description = "Efficient RGB colour types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-EasyRaster-GTK" = callPackage
@@ -133,8 +133,8 @@ self: {
        sha256 = "082il76032biyan170p4qp13154nmkzil4v2wv7fmjn9z7v8w49b";
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148,8 +148,8 @@ self: {
        editedCabalFile = "02k1fg86iyzbb0bxfn8r6s7z8bkahr8y02wps1l5j958jpckd6c9";
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163,8 +163,8 @@ self: {
        editedCabalFile = "0faw83njfarccnad1hgy1cf3wmihfghk3qhw2s7zf6p84v6zc27y";
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176,7 +176,7 @@ self: {
        sha256 = "0y2wzwfnlx50rzkdigmjy3dg5f91pmkf4gmnzjhs3r916d296gkq";
        libraryHaskellDepends = [ base bytestring ];
        description = "Trivial package for writing PPM images";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-Random" = callPackage
@@ -187,7 +187,7 @@ self: {
        sha256 = "1c00pcz0c4l2sdaj61zcmw68ckmqb7xlfykv489xms7ak4xl8nc1";
        libraryHaskellDepends = [ base ];
        description = "A pure Haskell PRNG";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AC-Terminal" = callPackage
@@ -200,8 +200,8 @@ self: {
        editedCabalFile = "1i9bjryhccdp8gfm9xs5bbfsy32hpyv2zckd95m7g6bc4jvp8cjm";
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213,8 +213,8 @@ self: {
        sha256 = "044kiwc5g2irky0k3fg9l2qqnvcnh9vdx0yz8m1awnkab6mk0i3v";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Immutable arrays with plain integer indicies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228,8 +228,8 @@ self: {
        editedCabalFile = "05l4sk0lz9iml7282zh9pxqr538s6kjhhl6zrbdwlry21sn14pc0";
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241,8 +241,8 @@ self: {
        sha256 = "0wcan2s75c89s1mxhcvvjgbpn8xqrhmwnfbsrszkzydw3x46465y";
        libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258,8 +258,8 @@ self: {
          base list-extras mtl random random-shuffle void
        ];
        description = "Essential features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -287,8 +287,8 @@ self: {
          transformers tuple vector
        ];
        description = "Efficient, high-level dynamic programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -315,8 +315,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ForestStructures ];
        description = "Dynamic programming on tree and forest structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -341,8 +341,8 @@ self: {
          tasty-th
        ];
        description = "Dynamic programming for Set data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -362,8 +362,8 @@ self: {
        ];
        executableHaskellDepends = [ base containers directory ];
        description = "foundational type classes for approximating exact real numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -379,8 +379,8 @@ self: {
          AERN-Real AERN-RnToRm base binary containers html stm time
        ];
        description = "Compositional lazy dataflow networks for exact real number computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -397,8 +397,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "arbitrary precision real interval arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -422,8 +422,8 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "arbitrary precision real interval arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -440,8 +440,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "arbitrary precision real interval arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -458,8 +458,8 @@ self: {
          time
        ];
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -477,8 +477,8 @@ self: {
          glade glib gtk gtkglext mtl OpenGL stm time
        ];
        description = "GL plotting of polynomial function enclosures (PFEs)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -496,7 +496,7 @@ self: {
          base bytestring cereal monads-tf random transformers
        ];
        description = "Fast AES encryption/decryption for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AFSM" = callPackage
@@ -507,7 +507,7 @@ self: {
        sha256 = "0yy24nrl99b624x0d8k4w4505zx2b2n25frdq5ijn4j6fhjqwhz6";
        libraryHaskellDepends = [ base ];
        description = "Arrowized functional state machines";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "AGI" = callPackage
@@ -520,8 +520,8 @@ self: {
          base mtl network parsec random syb unix
        ];
        description = "A library for writing AGI scripts for Asterisk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -536,7 +536,7 @@ self: {
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
        description = "A binding for the OpenAL Utility Toolkit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) freealut;};
 
   "AMI" = callPackage
@@ -551,8 +551,8 @@ self: {
          base bytestring containers mtl network pureMD5 stm
        ];
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -565,7 +565,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Num instance for Applicatives provided via the ANum newtype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ASN1" = callPackage
@@ -580,7 +580,7 @@ self: {
          base containers HUnit mtl NewBinary old-time pretty QuickCheck
        ];
        description = "ASN.1 support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AVar" = callPackage
@@ -591,7 +591,7 @@ self: {
        sha256 = "0jggzjyms1w4p1ynv8m5yvya64kbxkjdis7wvy3lildmp0w0x0c7";
        libraryHaskellDepends = [ base ];
        description = "Mutable variables with Exception handling and concurrency support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "AWin32Console" = callPackage
@@ -602,8 +602,8 @@ self: {
        sha256 = "0il5bngj4919mmpm0rwmbx74ih3sfbqkaph6w12p49fs466sxkh1";
        libraryHaskellDepends = [ base regex-compat Win32 ];
        description = "A binding to a part of the ANSI escape code for the console";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "AbortT-monadstf" = callPackage
@@ -614,8 +614,8 @@ self: {
        sha256 = "1ijv4bs299ijqbkspbg1kry627ra6p6qlkd74q4y2pvamrm4dn6f";
        libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        description = "Monads-tf instances for the AbortT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -627,8 +627,8 @@ self: {
        sha256 = "1x2iw46nzfjj36pfdzv5n0q6f6l7kgz62gnxpsj2f5p7w10zlxai";
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
        description = "mtl instances for the AbortT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -646,8 +646,8 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "A monad and monadic transformer providing \"abort\" functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -671,8 +671,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "An easy-to-use video game framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -688,8 +688,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -704,8 +704,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -719,8 +719,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 mtl ];
        description = "Lisperati's adventure game in Lisp translated to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -750,8 +750,8 @@ self: {
          time uniplate wai wai-extra wl-pprint
        ];
        description = "Assessment services for the Advise-Me project";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -773,7 +773,7 @@ self: {
        ];
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Agata" = callPackage
@@ -788,8 +788,8 @@ self: {
          base containers mtl QuickCheck tagged template-haskell
        ];
        description = "Generator-generator for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -823,8 +823,8 @@ self: {
        executableToolDepends = [ emacs ];
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ abbradar ];
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
   "Agda-executable" = callPackage
@@ -838,7 +838,7 @@ self: {
        executableHaskellDepends = [ Agda base ];
        description = "Command-line program for type-checking and compiling Agda programs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "AhoCorasick" = callPackage
@@ -852,8 +852,8 @@ self: {
          array base hashable mtl unordered-containers
        ];
        description = "Aho-Corasick string matching algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -875,8 +875,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Find the minimal subset/submap satisfying some property";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -905,8 +905,8 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "Algorithmic music composition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -920,8 +920,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl pretty ];
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -938,8 +938,8 @@ self: {
          PrimitiveArray vector
        ];
        description = "Collection of alignment algorithms";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -967,8 +967,8 @@ self: {
          async base filepath LambdaHack optparse-applicative
        ];
        description = "Near-future Sci-Fi roguelike and tactical squad combat game";
-       license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -988,8 +988,8 @@ self: {
          process QuickCheck split transformers xml
        ];
        description = "Android view hierarchy importer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1001,8 +1001,8 @@ self: {
        sha256 = "01vpw9s93qq8c0zymp4qzv0ljn9jrnwi3x68qx9lcjr6spa0rkvm";
        libraryHaskellDepends = [ base random ];
        description = "Updated version of Yampa: a library for programming hybrid systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1015,8 +1015,8 @@ self: {
        libraryHaskellDepends = [ base mtl multirec parsec ];
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1030,7 +1030,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl parsec xhtml ];
        description = "Convert ANSI Terminal Sequences to nice HTML markup";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Aoide" = callPackage
@@ -1044,7 +1044,7 @@ self: {
          base bytestring mtl process template-haskell
        ];
        description = "A simple music library with the capability of generating .ly and .mid files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ApplePush" = callPackage
@@ -1062,8 +1062,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1075,8 +1075,8 @@ self: {
        sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr";
        doHaddock = false;
        description = "Call AppleScript from Haskell, and then call back into Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1088,8 +1088,8 @@ self: {
        sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy";
        libraryHaskellDepends = [ base vector ];
        description = "Function approximation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1101,8 +1101,8 @@ self: {
        sha256 = "1yb209v3lab3knggplmwih1ww6qalf8v86j8ggv1gkhm5jkwz1yq";
        libraryHaskellDepends = [ base ];
        description = "Unboxed references, dynamic arrays and more";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1114,8 +1114,8 @@ self: {
        sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb";
        libraryHaskellDepends = [ base process ];
        description = "A library to generate Netlist code from Arrow descriptions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1131,7 +1131,7 @@ self: {
          base containers mtl poly-rec requirements tagged template-haskell
        ];
        description = "Strongly typed Attribute Grammars implemented using type-level programming";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "AttoBencode" = callPackage
@@ -1151,8 +1151,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Fast Bencode encoding and parsing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1169,8 +1169,8 @@ self: {
          utf8-string
        ];
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1186,8 +1186,8 @@ self: {
          array base colour GLUT OpenGL random
        ];
        description = "Visualisation of Strange Attractors in 3-Dimensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1201,8 +1201,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1219,7 +1219,7 @@ self: {
        ];
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1231,8 +1231,8 @@ self: {
        sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx";
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1244,8 +1244,8 @@ self: {
        sha256 = "1ypq7m09ki5wbwkvmqdl7ch40cbdfhb91kq8n17im184r5liyxlc";
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1272,8 +1272,8 @@ self: {
          unordered-containers
        ];
        description = "Big Contact Map Tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1302,7 +1302,7 @@ self: {
        ];
        testToolDepends = [ alex happy hspec-discover ];
        description = "A compiler front-end generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "BNFC-meta" = callPackage
@@ -1320,7 +1320,7 @@ self: {
          template-haskell
        ];
        description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "Baggins" = callPackage
@@ -1333,8 +1333,8 @@ self: {
        editedCabalFile = "16206xd8lm8fkvpxbm19h403264xyjki07s9lam3pgq985xbqk35";
        libraryHaskellDepends = [ base cairo containers mtl ];
        description = "Tools for self-assembly";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1350,8 +1350,8 @@ self: {
          base bifunctors hmidi mtl stm time transformers
        ];
        description = "A Drum Machine DSL for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1381,7 +1381,7 @@ self: {
        ];
        description = "An ad-hoc P2P chat program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1395,8 +1395,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base mtl random ];
        description = "An interpreter for the Befunge-93 Programming Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1414,8 +1414,8 @@ self: {
          base bytestring cassava deepseq directory statistics time vector
        ];
        description = "Benchmark functions with history";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1428,7 +1428,7 @@ self: {
        libraryHaskellDepends = [ base bytestring extensible-exceptions ];
        librarySystemDepends = [ db ];
        description = "Berkeley DB binding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) db;};
 
   "BerkeleyDBXML" = callPackage
@@ -1442,8 +1442,8 @@ self: {
        libraryHaskellDepends = [ base BerkeleyDB bytestring ];
        librarySystemDepends = [ db dbxml xercesc xqilla ];
        description = "Berkeley DB XML binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) db; inherit (pkgs) dbxml; 
          inherit (pkgs) xercesc; inherit (pkgs) xqilla;};
@@ -1456,8 +1456,8 @@ self: {
        sha256 = "14wjpfr9d8fpgl1jkpm2123lprr3hf3a6smkaflzkgxqlgcrkmyr";
        libraryHaskellDepends = [ base besout ];
        description = "Factorization of polynomials over finite field";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1472,8 +1472,8 @@ self: {
          base containers mtl template-haskell th-extras
        ];
        description = "The Bidirectional Generic Update Language";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1487,7 +1487,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base bmp bytestring gloss ];
        description = "Image editor for pixel art";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "BinderAnn" = callPackage
@@ -1505,8 +1505,8 @@ self: {
          base containers ghc ghc-prim mtl split syb transformers
        ];
        description = "Source-to-source plugin for enhancing EDSLs with static annotations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1518,7 +1518,7 @@ self: {
        sha256 = "0am0487l7njngp2k6h3qfbhjs61d9ir9rp8iw1r5448b20n4fxas";
        libraryHaskellDepends = [ base ];
        description = "Common bin-packing heuristics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "BioHMM" = callPackage
@@ -1535,8 +1535,8 @@ self: {
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1558,8 +1558,8 @@ self: {
          vector-read-instances zlib
        ];
        description = "Base library for bioinformatics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1586,8 +1586,8 @@ self: {
          tasty-silver tasty-th text
        ];
        description = "BLAST-related tools";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1599,8 +1599,8 @@ self: {
        sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w";
        libraryHaskellDepends = [ base bytestring iteratee ];
        description = "Vienna / DotBracket / ExtSS parsers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1623,8 +1623,8 @@ self: {
          vector vector-th-unbox
        ];
        description = "European Nucleotide Archive data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1642,8 +1642,8 @@ self: {
          directory either-unwrap text vector word8
        ];
        description = "Ensembl related datastructures and functions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1659,8 +1659,8 @@ self: {
          base BiobaseXNA bytestring containers filemanip iteratee tuple
        ];
        description = "Importer for FR3D resources";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1685,8 +1685,8 @@ self: {
          text
        ];
        description = "streaming FASTA parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1704,8 +1704,8 @@ self: {
          http-conduit hxt mtl network Taxonomy text transformers
        ];
        description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1726,8 +1726,8 @@ self: {
          either-unwrap hxt text
        ];
        description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1766,8 +1766,8 @@ self: {
          base criterion lens text transformers
        ];
        description = "Infernal data structures and tools";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1779,8 +1779,8 @@ self: {
        sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r";
        libraryHaskellDepends = [ base bytestring containers iteratee ];
        description = "Multiple Alignment Format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1808,8 +1808,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Newick file format parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1829,8 +1829,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "RNA folding training data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1848,8 +1848,8 @@ self: {
          filepath lens primitive PrimitiveArray repa split vector
        ];
        description = "Import Turner RNA parameters";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1882,8 +1882,8 @@ self: {
          vector-binary-instances vector-th-unbox
        ];
        description = "Collection of types for bioinformatics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1899,8 +1899,8 @@ self: {
          base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector
        ];
        description = "Import Vienna energy parameters";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1942,8 +1942,8 @@ self: {
          text tuple vector vector-binary-instances vector-th-unbox
        ];
        description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1958,7 +1958,7 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1978,8 +1978,8 @@ self: {
          base bitstring bytestring mtl parallel primitive QuickCheck
          transformers vector
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -1993,8 +1993,8 @@ self: {
          base bytestring QuickCheck template-haskell
        ];
        description = "A module to aid in the (de)serialisation of binary data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2006,8 +2006,8 @@ self: {
        sha256 = "1pmmgg6n6pc0qvp5r4qxan32887132si0cayd0xh1g5v98fa9ari";
        libraryHaskellDepends = [ base HTTP json2 ];
        description = "A library to access bit.ly URL shortener.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2025,8 +2025,8 @@ self: {
          HTTP http-conduit hxt mtl network transformers zip-archive
        ];
        description = "Libary to interface with the NCBI blast REST interface";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2049,7 +2049,7 @@ self: {
        ];
        description = "Diagram editor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2074,8 +2074,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2097,8 +2097,8 @@ self: {
        ];
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2127,8 +2127,8 @@ self: {
          base containers criterion MissingH network-uri parsec
        ];
        description = "A markdown-like markup language designed for blog posts";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2140,7 +2140,7 @@ self: {
        sha256 = "0ryjgi70isgfv3nw3djzvb1saky40xqy536h6sr3mfpy2iqnim0c";
        libraryHaskellDepends = [ base mtl ];
        description = "Html document layout library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Blueprint" = callPackage
@@ -2151,8 +2151,8 @@ self: {
        sha256 = "16cfmy4ndc15p6jdmyy08nqgv143dvs9xf4qg4mxa6x5r326pi94";
        doHaddock = false;
        description = "Preview of a new build system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2174,7 +2174,7 @@ self: {
        testHaskellDepends = [ base process ];
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2186,7 +2186,7 @@ self: {
        sha256 = "1y7f8lqx86m06ccq1bjym2hywc7r17s2bvx16jswb2ibn09n08b7";
        libraryHaskellDepends = [ base ];
        description = "Generalized booleans and numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "BoundedChan" = callPackage
@@ -2197,7 +2197,7 @@ self: {
        sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k";
        libraryHaskellDepends = [ array base ];
        description = "Implementation of bounded channels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Bravo" = callPackage
@@ -2213,8 +2213,8 @@ self: {
          template-haskell
        ];
        description = "Static text template generation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2226,8 +2226,8 @@ self: {
        sha256 = "13wwi7x898p51crzzp5rdrjgmsxsgbx7dgzgbaxdikxyrh216lmz";
        libraryHaskellDepends = [ base bytestring network text ];
        description = "A socker wrapper that makes the IO of sockets much cleaner";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2252,8 +2252,8 @@ self: {
          http-conduit http-types string-qq temporary unix yaml
        ];
        description = "Hits a set of urls periodically to bust caches";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2272,7 +2272,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "C-Structs implementation for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "CBOR" = callPackage
@@ -2292,8 +2292,8 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Encode/Decode values to/from CBOR";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2306,7 +2306,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Delimited continuations and dynamically scoped variables";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "CC-delcont-alt" = callPackage
@@ -2323,8 +2323,8 @@ self: {
        testHaskellDepends = [ base doctest mtl ];
        doHaddock = false;
        description = "Three new monad transformers for multi-prompt delimited control";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2336,8 +2336,8 @@ self: {
        sha256 = "1s6bql9r78yfzgarm3i4f2glhc5w8qq91adhs15cnqj6h7768a5c";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2349,8 +2349,8 @@ self: {
        sha256 = "07v388bzs8x9k1p677310rbh8baj1fdq3bhbqyvxqzx93kv8g381";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2362,8 +2362,8 @@ self: {
        sha256 = "0fzjr73id8rlrcmf0j3y1qn4jnc8incqhhkp9wl35lig20kqy82m";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2375,8 +2375,8 @@ self: {
        sha256 = "0zavw824xcr1jhmlpz9hmabhhi459y0s7z434lxalzha01j1wfih";
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2394,8 +2394,8 @@ self: {
        executableHaskellDepends = [ array base containers haskell-src ];
        executableToolDepends = [ happy ];
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2410,7 +2410,7 @@ self: {
          base bytestring hxt-regex-xmlschema utf8-string
        ];
        description = "A W3C compliant (X)HTML generating library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "CLASE" = callPackage
@@ -2425,8 +2425,8 @@ self: {
          base containers filepath mtl parsec template-haskell
        ];
        description = "Cursor Library for A Structured Editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2439,8 +2439,8 @@ self: {
        libraryHaskellDepends = [ base directory split time ];
        testHaskellDepends = [ base doctest ];
        description = "CLI tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2459,8 +2459,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "Infernal covariance model comparison";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2477,8 +2477,8 @@ self: {
          time
        ];
        description = "cwmwl udp message queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2490,8 +2490,8 @@ self: {
        sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8";
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2506,8 +2506,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2523,8 +2523,8 @@ self: {
          array base containers mtl parsec readline
        ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2536,7 +2536,7 @@ self: {
        sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255";
        libraryHaskellDepends = [ base ];
        description = "Definition of a CSP core-language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "CSPM-FiringRules" = callPackage
@@ -2552,8 +2552,8 @@ self: {
          QuickCheck random tree-monad
        ];
        description = "Firing rules semantic of CSPM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2571,8 +2571,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "A CSP-M parser compatible with FDR-2.91";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2589,8 +2589,8 @@ self: {
          prettyclass syb
        ];
        description = "An interpreter for CSPM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2604,8 +2604,8 @@ self: {
          array base containers CSPM-Frontend pretty
        ];
        description = "some modules specific for the ProB tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2631,8 +2631,8 @@ self: {
          prettyclass syb transformers xml
        ];
        description = "cspm command line tool for analyzing CSPM specifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2649,7 +2649,7 @@ self: {
          base containers hashable mtl unordered-containers
        ];
        description = "Open records using closed type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "CV" = callPackage
@@ -2678,7 +2678,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "OpenCV based machine vision library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {opencv_calib3d = null; opencv_contrib = null; 
          opencv_core = null; opencv_features2d = null; opencv_flann = null; 
@@ -2711,8 +2711,8 @@ self: {
        ];
        doCheck = false;
        description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Cabal_2_4_1_0" = callPackage
@@ -2742,8 +2742,8 @@ self: {
        ];
        doCheck = false;
        description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Cabal_3_2_1_0" = callPackage
@@ -2773,8 +2773,8 @@ self: {
        ];
        doCheck = false;
        description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Cabal-ide-backend" = callPackage
@@ -2798,8 +2798,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 unix
        ];
        description = "A framework for packaging Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2817,8 +2817,8 @@ self: {
          base bytestring directory filepath HDBC HDBC-sqlite3 process unix
        ];
        description = "Search cabal packages by name";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2830,8 +2830,8 @@ self: {
        sha256 = "0nd5yvhbxmabs0890y9gjjiq37h8c3blpplv2m13k29zkijwad04";
        libraryHaskellDepends = [ base compdata directory free unix ];
        description = "Separate and contain effects of IO monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2854,8 +2854,8 @@ self: {
        sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3";
        libraryHaskellDepends = [ base containers fgl parsec ];
        description = "An implementation and DSL for the Carneades argumentation model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2872,8 +2872,8 @@ self: {
          base CarneadesDSL cmdargs containers Dung fgl
        ];
        description = "A translation from the Carneades argumentation model into Dung's AFs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2885,8 +2885,8 @@ self: {
        sha256 = "1g2da90bna28hla9akpqsg5d2ag4p59zwxr6vqdizjbcpy4d7xkl";
        libraryHaskellDepends = [ base lens linear template-haskell ];
        description = "Coordinate systems";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2898,8 +2898,8 @@ self: {
        sha256 = "1ih8ydc29axckgidc5xvsdac5558gprscw667msh8qh41j9sshng";
        libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        description = "Playing with reified categorical composition";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2926,8 +2926,8 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        description = "A CSV parsing and encoding library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2939,8 +2939,8 @@ self: {
        sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -2952,7 +2952,7 @@ self: {
        sha256 = "183pghm74vk1vdcn0mdn6g5q284sncpl1cc49lpczz1wbr15s89y";
        libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
        description = "Generalized stream processors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart" = callPackage
@@ -2970,7 +2970,7 @@ self: {
          operational time vector
        ];
        description = "A library for generating 2D Charts and Plots";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart-cairo" = callPackage
@@ -2988,7 +2988,7 @@ self: {
          old-locale operational time
        ];
        description = "Cairo backend for Charts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart-diagrams" = callPackage
@@ -3011,8 +3011,8 @@ self: {
          text time
        ];
        description = "Diagrams backend for Charts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3031,8 +3031,8 @@ self: {
          base Chart colour data-default-class fltkhs operational text vector
        ];
        description = "A backend for the Chart library for FLTKHS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3049,7 +3049,7 @@ self: {
          mtl old-locale time
        ];
        description = "Utility functions for using the chart library with GTK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart-gtk3" = callPackage
@@ -3065,7 +3065,7 @@ self: {
          mtl old-locale time
        ];
        description = "Utility functions for using the chart library with GTK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Chart-simple" = callPackage
@@ -3081,8 +3081,8 @@ self: {
          data-default-class gtk mtl old-locale time
        ];
        description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3109,8 +3109,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Tests of the Charts library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3129,7 +3129,7 @@ self: {
          array base containers mtl QuickCheck random syb
        ];
        description = "For testing partial and infinite values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "CheatSheet" = callPackage
@@ -3143,7 +3143,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers directory ];
        description = "A Haskell cheat sheet in PDF and literate formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Checked" = callPackage
@@ -3154,8 +3154,8 @@ self: {
        sha256 = "1mr323rhh3lr6a5ni60n2kxz2k57763a3rrf7c6i18hxs9d4w2s4";
        libraryHaskellDepends = [ base text ];
        description = "Inbuilt checking for ultra reliable computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3169,8 +3169,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring mtl network ];
        description = "A platform independent mechanism to render graphics using vnc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3187,7 +3187,7 @@ self: {
        ];
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3199,7 +3199,7 @@ self: {
        sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9";
        libraryHaskellDepends = [ aeson base text vector ];
        description = "Cirru Parser in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Clash-Royale-Hack-Cheats" = callPackage
@@ -3221,8 +3221,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3234,8 +3234,8 @@ self: {
        sha256 = "1277vn384hpxd7xnzg0gpr7ilnw5cqhsi11c24g9zsfqa36llwgk";
        libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        description = "Stating and checking laws for type class methods";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3247,8 +3247,8 @@ self: {
        sha256 = "1yvkrzd3l7ijh3fqvkbzqv5vp4nv5z26fbxy91sfwh3zqlscpim9";
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3260,8 +3260,8 @@ self: {
        sha256 = "0kr9i13ch2wbcnxchrnx562r8ar7kb84gmk3cqxc40x5w416205f";
        libraryHaskellDepends = [ base containers ];
        description = "A light, clean and powerful utility library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3273,7 +3273,7 @@ self: {
        sha256 = "1dr5ifmy5azib140bri9rzlq69jic430v9cv372jb42r78cci0iz";
        libraryHaskellDepends = [ base directory unix utf8-string X11 ];
        description = "System clipboard interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ClustalParser" = callPackage
@@ -3293,8 +3293,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover parsec text ];
        testToolDepends = [ hspec-discover ];
        description = "Libary for parsing Clustal tools output";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3312,8 +3312,8 @@ self: {
          filepath mtl old-time pretty pureMD5 safe utf8-string
        ];
        description = "A generic build tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3325,7 +3325,7 @@ self: {
        sha256 = "0jj2iaa632s60dckj8s46g4vrlqc8x9fndkq0kzk8rk4jzwlbwsn";
        libraryHaskellDepends = [ base ];
        description = "LZF compression bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Codec-Image-DevIL" = callPackage
@@ -3337,7 +3337,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libdevil;};
 
   "Color" = callPackage
@@ -3356,7 +3356,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base colour criterion deepseq random ];
        description = "Color spaces and conversions between them";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Combinatorrent" = callPackage
@@ -3381,8 +3381,8 @@ self: {
          test-framework-quickcheck2 time
        ];
        description = "A concurrent bittorrent client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3394,8 +3394,8 @@ self: {
        sha256 = "043dwvjkc1m2cz0rgiib7gv19ds1vn4cmf27lyw68nmc0lcm2v3d";
        libraryHaskellDepends = [ base directory process ];
        description = "A replacement for System.Exit and System.Process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3418,8 +3418,8 @@ self: {
          system-fileio system-filepath text
        ];
        description = "Watch some files; Rerun a command";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3437,8 +3437,8 @@ self: {
          IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers
        ];
        description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3450,8 +3450,8 @@ self: {
        sha256 = "0gizrl90jn5cmadxzpdvfg7h11pkb0l12k891xw9v36j5yf4saj0";
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3463,8 +3463,8 @@ self: {
        sha256 = "0mca09afj36zm3b7q3xn4gzkj4ggrlaz2g0zpssy4siam5rlc208";
        libraryHaskellDepends = [ base ];
        description = "A Cached variable for IO functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3476,8 +3476,8 @@ self: {
        sha256 = "0xnnkz67hh4mqx09wh17jpr9isgpcrc5xwp28afn3n8sz2y2mnxd";
        libraryHaskellDepends = [ async base ];
        description = "Mix concurrent and sequential computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3499,8 +3499,8 @@ self: {
          base binary Cabal containers glider-nlp HUnit text
        ];
        description = "Information retrieval library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3514,7 +3514,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl parsec ];
        description = "Configuration file reading & writing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ConfigFileTH" = callPackage
@@ -3528,7 +3528,7 @@ self: {
        ];
        description = "Template haskell for reading ConfigFiles";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3540,8 +3540,8 @@ self: {
        sha256 = "0fk7165abh4rw4jk6wy4f6y0qpakxlrs4mwrs3r2q7lz03jsyig2";
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3553,8 +3553,8 @@ self: {
        sha256 = "1if0hff6fn7zjj1vh16gxf2kldibh1dkscm8n33d1admvpjpw9sb";
        libraryHaskellDepends = [ base ];
        description = "Declare types as Configurable then specialize them all in one place";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3566,7 +3566,7 @@ self: {
        sha256 = "1ywhrj2wq24my4cji5fm5cwb3j4yjwzch9hxncr7k989smjdmjpz";
        libraryHaskellDepends = [ base Stream ];
        description = "Trivial re-export of Wouter Swierstra's Stream package, avoiding module name clash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Conscript" = callPackage
@@ -3579,8 +3579,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Restart a command on STDIN activity";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3592,8 +3592,8 @@ self: {
        sha256 = "0rhy5wq3v5hdryjn8pcsgqy4k772agj1rgq3021pjki7n3zm3dza";
        libraryHaskellDepends = [ base dlist ghc-prim vector ];
        description = "Repackages standard type classes with the ConstraintKinds extension";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3605,8 +3605,8 @@ self: {
        sha256 = "03ham35vh49h780h7dxb6zs85rkdlry0nwi8wp6p9iamw952xi6i";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad and monad transformer for consuming streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3618,8 +3618,8 @@ self: {
        sha256 = "1paj8wx2k86i5xb11scbyca4fb2fnxgln5d661mcwxvs0i91jj1b";
        libraryHaskellDepends = [ arrows base ];
        description = "Control.Arrow.Transformer.Cont";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3637,8 +3637,8 @@ self: {
          base containers criterion multiset QuickCheck statistics vector
        ];
        description = "Implementation of the context algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3650,8 +3650,8 @@ self: {
        sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Practical typed lazy contracts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3663,7 +3663,7 @@ self: {
        sha256 = "1jyj42xrja8ic3lajgrfmign9n2bdfkaplnlhzcifd5wf30qj6fa";
        libraryHaskellDepends = [ base BoundedChan stm ];
        description = "A parallel producer/consumer engine (thread pool)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Control-Monad-MultiPass" = callPackage
@@ -3683,8 +3683,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "A Library for Writing Multi-Pass Algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3702,8 +3702,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A variation on the ST monad with two type parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3715,8 +3715,8 @@ self: {
        sha256 = "1r70whihxczscp8j406sr4qqkf0abn125azald4cshqnp81rl2i4";
        libraryHaskellDepends = [ base ghc pretty pretty-show ];
        description = "A GHC plugin for printing GHC's internal Core data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3728,8 +3728,8 @@ self: {
        sha256 = "034g6c7dxdp13v1x16gvwgagpc7mw33hwd16cbb8yd3i91vf1w8z";
        libraryHaskellDepends = [ base parsec pretty ];
        description = "Manipulating Core Erlang source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3748,8 +3748,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to Mac OSX's CoreFoundation framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3761,8 +3761,8 @@ self: {
        sha256 = "1cad9j7ivd6mfcff44773v8z3z2ilparxfikbnv0gab6csc9p1nw";
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3783,8 +3783,8 @@ self: {
          utf8-string
        ];
        description = "CouchDB interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3801,8 +3801,8 @@ self: {
        ];
        doHaddock = false;
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3820,7 +3820,7 @@ self: {
        ];
        description = "Collects together existing Haskell cryptographic functions into a package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "CurryDB" = callPackage
@@ -3857,8 +3857,8 @@ self: {
          base bytestring mersenne-random-pure64 mtl
        ];
        description = "CurryDB: In-memory Key/Value Database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3877,7 +3877,7 @@ self: {
        ];
        description = "Real-Time Game Tournament Evaluator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3907,7 +3907,7 @@ self: {
          transformers-compat utf8-string xml-conduit xml-hamlet
        ];
        description = "RFC 4918 WebDAV support";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "DBFunctor" = callPackage
@@ -3934,8 +3934,8 @@ self: {
          text time transformers unordered-containers vector
        ];
        description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3949,8 +3949,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec ];
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3962,8 +3962,8 @@ self: {
        sha256 = "0l212yy40w8sjkv5m7rnd24fkihvnadv7szf10g9n5r34m4jb6lh";
        libraryHaskellDepends = [ base bytestring ];
        description = "D-Bus bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -3975,7 +3975,7 @@ self: {
        sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx";
        libraryHaskellDepends = [ base deepseq HUnit parallel random ];
        description = "Communication Free Learning-based constraint solver";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "DMuCheck" = callPackage
@@ -3988,8 +3988,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base MuCheck ];
        description = "Distributed Mutation Analysis framework for MuCheck";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4015,7 +4015,7 @@ self: {
          unordered-containers
        ];
        description = "Complete API bindings for DigitalOcean API V2";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "DOM" = callPackage
@@ -4026,8 +4026,8 @@ self: {
        sha256 = "13zj4jg78y5s05gfi3j83izxw6d2csbvznd7mq900zlv4xwddw2b";
        libraryHaskellDepends = [ base mtl WebBits ];
        description = "DOM Level 2 bindings for the WebBits package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4043,8 +4043,8 @@ self: {
          array base containers list-tries mtl QuickCheck safe semiring
        ];
        description = "Pragmatic framework for dynamic programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4069,7 +4069,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Darcs Patch Manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4107,7 +4107,7 @@ self: {
          transformers vector
        ];
        description = "utilities for DP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DRBG" = callPackage
@@ -4131,7 +4131,7 @@ self: {
          prettyclass QuickCheck tagged test-framework test-framework-hunit
        ];
        description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DSA" = callPackage
@@ -4154,8 +4154,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Implementation of DSA, based on the description of FIPS 186-4";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4184,8 +4184,8 @@ self: {
          mtl semigroups template-haskell text time vector
        ];
        description = "Database Supported Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4208,7 +4208,7 @@ self: {
        ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4220,8 +4220,8 @@ self: {
        sha256 = "0m3697zw0j2l9fxx8flr83n8x03pva1hn74rgilgxdrsrifhds5l";
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Data To Class transformation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4233,8 +4233,8 @@ self: {
        sha256 = "0pnywhva7s5xp9xlxk6h56n3fjflna6zhk5qdb8wax7i1qbp85vs";
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4265,8 +4265,8 @@ self: {
          utf8-string
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4279,7 +4279,7 @@ self: {
        libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4291,7 +4291,7 @@ self: {
        sha256 = "0lk0w64hyqkg99r9ccn5k1nh6rmd99z8d925px4cl09nin7hnm71";
        libraryHaskellDepends = [ base ];
        description = "Geometric angles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Data-Hash-Consistent" = callPackage
@@ -4306,7 +4306,7 @@ self: {
          base bytestring digest utf8-string vector vector-algorithms
        ];
        description = "Provide a simple consistent hashing mechanism";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Data-Rope" = callPackage
@@ -4318,7 +4318,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4335,7 +4335,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A package for adding index column to data files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "DataTreeView" = callPackage
@@ -4352,8 +4352,8 @@ self: {
          MissingH monad-control mtl syb transformers-base
        ];
        description = "A GTK widget for displaying arbitrary Data.Data.Data instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4367,8 +4367,8 @@ self: {
        libraryHaskellDepends = [ base generic-lens microlens ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type safe data migrations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4397,8 +4397,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest filemanip QuickCheck ];
        description = "Write clients for Meteor's DDP Protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4427,7 +4427,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Decimal numbers with variable precision";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DecisionTree" = callPackage
@@ -4439,7 +4439,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4451,8 +4451,8 @@ self: {
        sha256 = "1jbvb8yk291iimpqi8h302r8554k4j2p3k42znzppv1wqrbhvjyc";
        libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
        description = "Arrows for \"deep application\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4470,8 +4470,8 @@ self: {
        ];
        testHaskellDepends = [ base constraints mtl QuickCheck random ];
        description = "A DSL for creating neural network";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4492,7 +4492,7 @@ self: {
        ];
        description = "A simple RTS game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4515,8 +4515,8 @@ self: {
          mtl options parallel text wl-pprint
        ];
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4528,7 +4528,7 @@ self: {
        sha256 = "0ywipcmnr3ysmx8m61yrymyn10lnizjfkk2q2scdfkrkgh7ayj7v";
        libraryHaskellDepends = [ base containers xmonad xmonad-contrib ];
        description = "A library for specifying xmonad key bindings with functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Dflow" = callPackage
@@ -4545,8 +4545,8 @@ self: {
          base HUnit QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Processing Real-time event streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4564,8 +4564,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "O(ND) diff algorithm in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Diff" = callPackage
@@ -4582,7 +4582,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "O(ND) diff algorithm in haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DifferenceLogic" = callPackage
@@ -4595,8 +4595,8 @@ self: {
          base containers fgl FirstOrderTheory HUnit
        ];
        description = "A theory solver for conjunctions of literals in difference logic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4612,8 +4612,8 @@ self: {
          base deepseq fclabels mtl mwc-random parallel primitive vector
        ];
        description = "Global optimization using Differential Evolution";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4630,7 +4630,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A data-type representing digits 0-9";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DigitalOcean" = callPackage
@@ -4648,8 +4648,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec lens mtl text ];
        description = "A client library for the DigitalOcean API";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4661,8 +4661,8 @@ self: {
        sha256 = "0bbg9w5n3b296g884y8qvgzsndqhzwh0mkn3dlp9nx4a7i321c97";
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4675,8 +4675,8 @@ self: {
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ dsound ];
        description = "Partial binding to the Microsoft DirectSound API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {dsound = null;};
 
   "DisTract" = callPackage
@@ -4696,8 +4696,8 @@ self: {
          old-locale parsec pretty process template-haskell time xhtml
        ];
        description = "Distributed Bug Tracking System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4714,8 +4714,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Discussion support system";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4730,8 +4730,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
        description = "Hash modules (currently Murmur3)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4744,8 +4744,8 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom ];
        testHaskellDepends = [ base containers MonadRandom ];
        description = "A Haskell library for probability distributions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4762,7 +4762,7 @@ self: {
          base HUnit test-framework test-framework-hunit vector
        ];
        description = "Distance transform function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DistanceUnits" = callPackage
@@ -4773,7 +4773,7 @@ self: {
        sha256 = "0ls6rq4nqn3z9h9lagl8sff9q94zfm6gssa2jj1zfyfxl5869bas";
        libraryHaskellDepends = [ base ];
        description = "A comprehensive distance library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DnaProteinAlignment" = callPackage
@@ -4799,8 +4799,8 @@ self: {
          PrimitiveArray repa split vector
        ];
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4818,8 +4818,8 @@ self: {
          base containers ghc ghc-paths haddock HUnit process
        ];
        description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4831,7 +4831,7 @@ self: {
        sha256 = "1hjdznp29kwj9cca0jxr3dds9cnfbss6sgn52wym2380az3jcvnz";
        libraryHaskellDepends = [ base html ];
        description = "Documentation types library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "DrHylo" = callPackage
@@ -4849,8 +4849,8 @@ self: {
        ];
        executableHaskellDepends = [ array base containers pretty ];
        description = "A tool for deriving hylomorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4868,8 +4868,8 @@ self: {
          base filepath old-time process random
        ];
        description = "Program to derive type class instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4884,8 +4884,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base old-time process random ];
        description = "Program to derive type class instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4899,8 +4899,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base cmdargs containers parsec ];
        description = "An implementation of the Dung argumentation frameworks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4927,7 +4927,7 @@ self: {
        ];
        description = "Polymorphic protocol engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -4955,7 +4955,7 @@ self: {
        ];
        description = "Cryptographic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -4981,7 +4981,7 @@ self: {
        ];
        description = "Network filtering exploration tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5004,7 +5004,7 @@ self: {
        ];
        description = "Network filtering exploration tools that rely on pcap";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5022,8 +5022,8 @@ self: {
          array base criterion QuickCheck random vector
        ];
        description = "Dynamic time warping of sequences";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5037,8 +5037,8 @@ self: {
          base contravariant mtl time transformers
        ];
        description = "dysFunctional Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5050,8 +5050,8 @@ self: {
        sha256 = "1pg6gwyrlvp6z08ab1qp783z9gm0xhnh337shf443f1bwbcz9m7f";
        libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        description = "dysFunctional Reactive Programming on Cairo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5068,8 +5068,8 @@ self: {
          gtk
        ];
        description = "dysFunctional Reactive Programming on Craftwerk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5081,7 +5081,7 @@ self: {
        sha256 = "1bkkzj1d0j4nisdl9jfmadjx32w35ipdw3k12krhzzlf5aiwnrf1";
        libraryHaskellDepends = [ base containers ];
        description = "ExtremlyEasyConfig - Extremly Simple parser for config files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ENIG" = callPackage
@@ -5100,7 +5100,7 @@ self: {
          unicode-transforms
        ];
        description = "Auto Korean conjugator/adjustor/adopter/converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Earley" = callPackage
@@ -5121,7 +5121,7 @@ self: {
          base criterion deepseq ListLike parsec
        ];
        description = "Parsing all context-free grammars using Earley's algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -5139,7 +5139,7 @@ self: {
        ];
        executableToolDepends = [ happy ];
        description = "Peter's Syntax Diagram Drawing Tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "EdisonAPI" = callPackage
@@ -5150,7 +5150,7 @@ self: {
        sha256 = "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm";
        libraryHaskellDepends = [ base mtl ];
        description = "A library of efficient, purely-functional data structures (API)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "EdisonCore" = callPackage
@@ -5165,7 +5165,7 @@ self: {
          array base containers EdisonAPI mtl QuickCheck
        ];
        description = "A library of efficient, purely-functional data structures (Core Implementations)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "EditTimeReport" = callPackage
@@ -5184,7 +5184,7 @@ self: {
        ];
        description = "Query language and report generator for edit logs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5207,8 +5207,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5226,8 +5226,8 @@ self: {
          base monad-control transformers transformers-base
        ];
        description = "EitherT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5268,7 +5268,7 @@ self: {
          union-find unordered-containers
        ];
        description = "The Elm language module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Emping" = callPackage
@@ -5284,7 +5284,7 @@ self: {
        ];
        description = "derives heuristic rules from nominal data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5296,8 +5296,8 @@ self: {
        sha256 = "0gcm29iafh3gpiqg34gcvyx2pyvgarp4kxl928c6f7x27hzbibv2";
        libraryHaskellDepends = [ base containers ];
        description = "A type class for empty containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5328,8 +5328,8 @@ self: {
          Taxonomy text transformers
        ];
        description = "Libary to interface with the NCBI Entrez REST service";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5342,7 +5342,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base smallcheck tasty tasty-hunit ];
        description = "Non-crashing `Enum` operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "EnumContainers" = callPackage
@@ -5353,8 +5353,8 @@ self: {
        sha256 = "14ckpgaviny3c0d1jn3blkkpri0cm8ac264y7kak965knjccq0k8";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Simple Enum-class-based int containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5366,8 +5366,8 @@ self: {
        sha256 = "1v3jp1l95kybvdlpvp6bd0ryihxrvlnpkqz7fl1n4vazhkqk6zjz";
        libraryHaskellDepends = [ base containers ];
        description = "More general IntMap replacement";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5386,8 +5386,8 @@ self: {
          transformers
        ];
        description = "Render math formula in ASCII, and perform some simplifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5401,8 +5401,8 @@ self: {
          base containers HUnit mtl union-find-array
        ];
        description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5422,8 +5422,8 @@ self: {
          regions safer-file-handles storablevector transformers unix
        ];
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5435,8 +5435,8 @@ self: {
        sha256 = "15xijkc23sqakwa4qmf2hvcn07kd9ahx3z15a6lr18cs43pbjw93";
        libraryHaskellDepends = [ ansi-terminal base mtl ];
        description = "Methods for estimating the progress of functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5461,8 +5461,8 @@ self: {
        ];
        executablePkgconfigDepends = [ pcre ];
        description = "A new implementation of the LambdaMOO server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) pcre;};
 
@@ -5478,8 +5478,8 @@ self: {
          base containers ghc mtl operational random SafeSemaphore time unix
        ];
        description = "A general data-flow framework";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5498,8 +5498,8 @@ self: {
          array base containers deepseq Etage fgl mtl parallel random time
        ];
        description = "Data-flow based graph algorithms";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5514,8 +5514,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        description = "A 2-D shooting game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5538,7 +5538,7 @@ self: {
        executableSystemDepends = [ libpcap ];
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libpcap;};
 
@@ -5550,7 +5550,7 @@ self: {
        sha256 = "1a6bvi0y1pnzpx0x3arrardgkbs0m8ssfwcyxf6fim87wcb0jcgv";
        libraryHaskellDepends = [ base ];
        description = "Library for using euro currency, italian language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Euterpea" = callPackage
@@ -5566,7 +5566,7 @@ self: {
          heap PortMidi random stm
        ];
        description = "Library for computer music research and education";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "EventSocket" = callPackage
@@ -5581,8 +5581,8 @@ self: {
          base bytestring containers haskell98 mtl network
        ];
        description = "Interfaces with FreeSwitch Event Socket";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5602,8 +5602,8 @@ self: {
          random regex-compat time unix Unixutils zlib
        ];
        description = "A grab bag of modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5616,7 +5616,7 @@ self: {
        libraryHaskellDepends = [ base inline-c ];
        testHaskellDepends = [ base hspec inline-c ];
        description = "Haskell Foreign Accelerate Interface";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "FComp" = callPackage
@@ -5641,8 +5641,8 @@ self: {
          template-haskell time uu-parsinglib
        ];
        description = "Compose music";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5657,7 +5657,7 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5670,8 +5670,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fmodex64 ];
        description = "The Haskell FModEx raw API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {fmodex64 = null;};
 
@@ -5685,8 +5685,8 @@ self: {
        editedCabalFile = "0d6mjr7b37f5bgjijjgx4x4fgfmkbhksphzkaf0p5jyzxp45fasc";
        libraryHaskellDepends = [ base containers ];
        description = "Efficient simple pretty printing combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5698,7 +5698,7 @@ self: {
        sha256 = "0gsrfzk5g499r7xdhsaag53207bd015jwcrl2f9izmpa6gli5las";
        libraryHaskellDepends = [ base containers matrix vector ];
        description = "Basic concepts of finite state machines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "FTGL" = callPackage
@@ -5710,8 +5710,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
@@ -5727,8 +5727,8 @@ self: {
        ];
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ftgl;};
 
@@ -5747,8 +5747,8 @@ self: {
          strict
        ];
        description = "A command-line FTP client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5773,8 +5773,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5790,8 +5790,8 @@ self: {
          AC-Angle base containers digits QuickCheck template-haskell
        ];
        description = "A collection of facts about the real world";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5803,8 +5803,8 @@ self: {
        sha256 = "1qhjqswx4qyfan3rpvvl1hgmf369krqprlr6x20hp34r2qw9s135";
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5816,8 +5816,8 @@ self: {
        sha256 = "0yxaqyn6nxbyfkn5pmd7wh951dhdvkg1xgh5757f7hn00bx87wv1";
        libraryHaskellDepends = [ base STMonadTrans vector ];
        description = "A monad and monad transformer for pushing things onto a stack very fast";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5834,8 +5834,8 @@ self: {
          pipes-bytestring
        ];
        description = "Fasta and Fastq streaming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5849,7 +5849,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        testHaskellDepends = [ base QuickCheck template-haskell ];
        description = "Data structure for fast query and update of cumulative sums";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "FermatsLastMargin" = callPackage
@@ -5869,7 +5869,7 @@ self: {
        ];
        description = "Annotate ps and pdf documents";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5886,8 +5886,8 @@ self: {
          template-haskell
        ];
        description = "Ferry Core Components";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5901,8 +5901,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Evaluation using F-Algebras";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5919,8 +5919,8 @@ self: {
          vector-space
        ];
        description = "Functional 3D";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5936,8 +5936,8 @@ self: {
          base bytestring directory extensible-exceptions filepath mtl unix
        ];
        description = "Expressive file and directory manipulation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5953,8 +5953,8 @@ self: {
          base bytestring directory filepath mtl unix-compat
        ];
        description = "Expressive file and directory manipulation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5971,8 +5971,8 @@ self: {
          transformers
        ];
        description = "Functions on System.FilePath";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -5988,8 +5988,8 @@ self: {
          base binary bytestring directory filepath mtl old-time
        ];
        description = "File system data structure and monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6006,8 +6006,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "File content extraction/rearrangement";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6025,8 +6025,8 @@ self: {
          alg base foldable1 natural-induction peano universe-base
        ];
        description = "Finite totally-ordered sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6042,8 +6042,8 @@ self: {
          base bytestring http-conduit network old-locale time
        ];
        description = "Obtain quote data from finance.yahoo.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6060,8 +6060,8 @@ self: {
          time
        ];
        description = "Obtain Treasury yield curve data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6073,7 +6073,7 @@ self: {
        sha256 = "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717";
        libraryHaskellDepends = [ base directory filepath ];
        description = "Locate directory of original program";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "FiniteMap" = callPackage
@@ -6084,8 +6084,8 @@ self: {
        sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky";
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
-       license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsdOriginal;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6097,8 +6097,8 @@ self: {
        sha256 = "1941ickx8aj3qbkry4gz8ni6snh26gkdrgabpx9z588518q4x27i";
        libraryHaskellDepends = [ base containers Proper ];
        description = "Grammar and typeclass for first order theories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6110,7 +6110,7 @@ self: {
        sha256 = "0qfys17q3i56l20wzkpr8inq130j67kya022ynf0sgbc86avlrcn";
        libraryHaskellDepends = [ base deepseq template-haskell ];
        description = "Fixed point, large word, and large int numerical representations (types and common class instances)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Flippi" = callPackage
@@ -6128,8 +6128,8 @@ self: {
          base cgi containers directory haskell98 old-time parsec xhtml
        ];
        description = "Wiki";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6141,7 +6141,7 @@ self: {
        sha256 = "0c38062vnjmy3fc5nxwg7sgbfabikaakgdsl34ka229s6w7pm8x3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Read and write hexadecimal floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Focus" = callPackage
@@ -6152,7 +6152,7 @@ self: {
        sha256 = "1f1ch6mxgaam1i4ryd1av879y2f8wn3wmg47h23w2l0pvgmxgrj1";
        libraryHaskellDepends = [ base MissingH split ];
        description = "Tools for focusing in on locations within numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Folly" = callPackage
@@ -6166,7 +6166,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base containers HUnit parsec ];
        description = "A first order logic library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "FontyFruity" = callPackage
@@ -6182,7 +6182,7 @@ self: {
          vector xml
        ];
        description = "A true type file format loader";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ForSyDe" = callPackage
@@ -6203,8 +6203,8 @@ self: {
          template-haskell type-level
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6226,7 +6226,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Tree- and forest structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Forestry" = callPackage
@@ -6252,8 +6252,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Comparison of trees and forests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6265,8 +6265,8 @@ self: {
        sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj";
        libraryHaskellDepends = [ base monad-control mtl resourcet ];
        description = "Forkable monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6291,8 +6291,8 @@ self: {
          transformers trifecta unordered-containers vector
        ];
        description = "(Context-free) grammars in formal language theory";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6315,8 +6315,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6337,8 +6337,8 @@ self: {
          array base cmdtheline containers criterion random strict
        ];
        description = "Utilities to generate and solve puzzles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6369,7 +6369,7 @@ self: {
        ];
        executableSystemDepends = [ libX11 ];
        description = "Generates colorful wallpapers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs.xorg) libX11;};
 
   "Fractaler" = callPackage
@@ -6385,8 +6385,8 @@ self: {
        executableHaskellDepends = [
          base FTGL GLFW-b OpenGLRaw parallel random time
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6418,7 +6418,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion pipes transformers ];
        description = "Data frames For working with tabular data files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Frames-beam" = callPackage
@@ -6441,8 +6441,8 @@ self: {
          generics-sop hspec hspec-core QuickCheck text vinyl
        ];
        description = "A library for accessing Postgres tables as in-memory data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6460,8 +6460,8 @@ self: {
        ];
        testHaskellDepends = [ base Frames hspec pipes ];
        description = "Alternative CSV parser for the Frames package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6482,8 +6482,8 @@ self: {
          base foldl Frames random text vector vinyl
        ];
        description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6501,7 +6501,7 @@ self: {
        ];
        testHaskellDepends = [ base Frames streamly text vinyl ];
        description = "A streamly layer for Frames I/O";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Frank" = callPackage
@@ -6514,8 +6514,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl newtype she void ];
        description = "An experimental programming language with typed algebraic effects";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6530,8 +6530,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6549,7 +6549,7 @@ self: {
        libraryHaskellDepends = [ base base-compat GLUT OpenGL random ];
        executableHaskellDepends = [ base GLUT OpenGL random ];
        description = "A lightweight, cross-platform, OpenGL-based game engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Fungi" = callPackage
@@ -6568,8 +6568,8 @@ self: {
          mwc-random old-time process random transformers tuple
        ];
        description = "Funge-98 interpreter written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6581,7 +6581,7 @@ self: {
        sha256 = "1nsmpph27yv0anrhhfqbpdqs2rrdbhm0jxzs3kk6ab32zb3ivhp2";
        libraryHaskellDepends = [ base directory random transformers ];
        description = "Genetic algorithm library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GGg" = callPackage
@@ -6594,8 +6594,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bimap ];
        description = "GGg cipher";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6608,7 +6608,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process ];
        description = "A graphical viewer for Hood";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GLFW" = callPackage
@@ -6620,8 +6620,8 @@ self: {
        libraryHaskellDepends = [ base OpenGL ];
        librarySystemDepends = [ libGL libX11 libXext libXfixes ];
        description = "A Haskell binding for GLFW";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;};
@@ -6636,8 +6636,8 @@ self: {
        libraryHaskellDepends = [ base mtl OGL ];
        librarySystemDepends = [ libX11 libXrandr ];
        description = "A binding for GLFW (OGL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
@@ -6655,7 +6655,7 @@ self: {
          test-framework-hunit
        ];
        description = "Bindings to GLFW OpenGL library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GLFW-b-demo" = callPackage
@@ -6672,8 +6672,8 @@ self: {
          base GLFW-b mtl OpenGL pretty stm transformers
        ];
        description = "GLFW-b demo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6687,8 +6687,8 @@ self: {
          base GLFW monad-task OpenGL transformers
        ];
        description = "GLFW utility functions to use together with monad-task";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6701,7 +6701,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libGL libX11 ];
        description = "Open OpenGL context windows in X11 with libX11";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;};
 
   "GLM" = callPackage
@@ -6729,7 +6729,7 @@ self: {
          test-framework-th
        ];
        description = "Simple Gridlab-D GLM parser and utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "GLMatrix" = callPackage
@@ -6740,8 +6740,8 @@ self: {
        sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4";
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Utilities for working with OpenGL matrices";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6754,7 +6754,7 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw transformers ];
        librarySystemDepends = [ libGL libGLU ];
        description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
   "GLUT" = callPackage
@@ -6771,7 +6771,7 @@ self: {
          array base containers OpenGL StateVar transformers
        ];
        description = "A binding for the OpenGL Utility Toolkit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GLUT_2_7_0_16" = callPackage
@@ -6788,8 +6788,8 @@ self: {
          array base containers OpenGL StateVar transformers
        ];
        description = "A binding for the OpenGL Utility Toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "GLUtil" = callPackage
@@ -6809,7 +6809,7 @@ self: {
        ];
        libraryToolDepends = [ hpp ];
        description = "Miscellaneous OpenGL utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GPX" = callPackage
@@ -6825,8 +6825,8 @@ self: {
          xsd
        ];
        description = "Parse GPX files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6844,8 +6844,8 @@ self: {
          transformers
        ];
        description = "Typesafe functional GPU graphics programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6859,8 +6859,8 @@ self: {
          array base containers GPipe HaXml mtl Vec
        ];
        description = "Load GPipe meshes from Collada files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6879,7 +6879,7 @@ self: {
        ];
        description = "Examples for the GPipes package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6892,8 +6892,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        description = "GLFW OpenGL context creation for GPipe";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6905,8 +6905,8 @@ self: {
        sha256 = "1yf74k3yvpj42ynivlkacp5zwxwsx3yyfxb2436ljrv3339kjkb4";
        libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        description = "Load GPipe textures from filesystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6925,8 +6925,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "A library for GTA programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6948,8 +6948,8 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "Some kind of game library or set of utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6967,8 +6967,8 @@ self: {
          base containers directory filepath mtl parsec transformers
        ];
        description = "An Io interpreter in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -6980,7 +6980,7 @@ self: {
        sha256 = "0v91q0m90338qpxg4hnvb7n6vm1jap3y1rvn9kyzmnxh03rarpx2";
        libraryHaskellDepends = [ base ];
        description = "Non-adaptive Gaussian quadrature for numeric integraton";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GeBoP" = callPackage
@@ -6996,8 +6996,8 @@ self: {
          array base directory random wx wxcore
        ];
        description = "Several games";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7032,7 +7032,7 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7046,8 +7046,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7067,7 +7067,7 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7093,8 +7093,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        description = "Hox gene clustering";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7108,8 +7108,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "A general TicTacToe game implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7121,7 +7121,7 @@ self: {
        sha256 = "0g5frpzq8hr2wqbf91cxcyxqqsw06p1w9f1sm3k6v1hz13kpmspf";
        libraryHaskellDepends = [ base ghc-prim pretty ];
        description = "A generic, derivable, haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GenussFold" = callPackage
@@ -7148,8 +7148,8 @@ self: {
          test-framework-th
        ];
        description = "MCFGs for Genus-1 RNA Pseudoknots";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7162,7 +7162,7 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap syb ];
        description = "Pure bindings for the MaxMind IP database";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "GeocoderOpenCage" = callPackage
@@ -7175,7 +7175,7 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7187,7 +7187,7 @@ self: {
        sha256 = "1nb0q5hs9qqgygw35rbvanbjf9l6vjxrl6l4jp9dqwlnl1kdd88q";
        libraryHaskellDepends = [ base ];
        description = "Geodetic calculations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GeomPredicates" = callPackage
@@ -7198,7 +7198,7 @@ self: {
        sha256 = "19scirh2hy9y9kv16pcp44v31cs3868ig28r8blj39gdv4wqxwcy";
        libraryHaskellDepends = [ base ];
        description = "Geometric predicates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GeomPredicates-SSE" = callPackage
@@ -7209,8 +7209,8 @@ self: {
        sha256 = "18mdaf2j1svklka5ms9ihj07d9l92ivqjk0y8jv0l9ni44hrhxcq";
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7223,8 +7223,8 @@ self: {
        libraryHaskellDepends = [ base constraints singletons ];
        testHaskellDepends = [ base constraints singletons ];
        description = "get stuff out of stuff";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7237,7 +7237,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7263,8 +7263,8 @@ self: {
          haskell-gi-base process temporary text transformers
        ];
        description = "GIF creation utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7276,7 +7276,7 @@ self: {
        sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf";
        libraryHaskellDepends = [ base directory extra old-time process ];
        description = "to auto-do somethings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Gleam" = callPackage
@@ -7287,8 +7287,8 @@ self: {
        sha256 = "08nabgn7v0rw4aihbihbijqgajrvyc7z7nl67jmka39fh5zm6blm";
        libraryHaskellDepends = [ base mtl split threepenny-gui ];
        description = "HTML Canvas graphics, animations and simulations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7311,7 +7311,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Globbing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GlomeTrace" = callPackage
@@ -7323,7 +7323,7 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Ray Tracing Library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7354,7 +7354,7 @@ self: {
        ];
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7366,7 +7366,7 @@ self: {
        sha256 = "0wfabsdn4agmg459srnknkwqb7ri5knj9npzgzhilybwrrqq46v9";
        libraryHaskellDepends = [ base ];
        description = "Generate web-based charts using the Google Chart API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "GoogleCodeJam" = callPackage
@@ -7381,8 +7381,8 @@ self: {
          array base containers mtl parallel safe split transformers
        ];
        description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7398,8 +7398,8 @@ self: {
          AttoJson base bytestring containers dataenc download-curl
        ];
        description = "Haskell Interface to Google Directions API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7415,8 +7415,8 @@ self: {
          base binary Crypto haskell98 HTTP mtl network split
        ];
        description = "Interface to Google Safe Browsing API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7430,7 +7430,7 @@ self: {
          base dataenc download-curl utf8-string xml
        ];
        description = "Interface to Google Suggest API";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "GoogleTranslate" = callPackage
@@ -7444,8 +7444,8 @@ self: {
          AttoJson base bytestring dataenc download-curl
        ];
        description = "Interface to Google Translate API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7457,8 +7457,8 @@ self: {
        sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad and monadic transformer providing \"goto\" functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7470,8 +7470,8 @@ self: {
        sha256 = "167lr6ps5yy3243zfa4nl1jq369xcrrspcglz9xgnx2q1z305w8x";
        libraryHaskellDepends = [ base ];
        description = "Grafos Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7494,8 +7494,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Grammar products and higher-dimensional grammars";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7514,8 +7514,8 @@ self: {
        ];
        executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7530,8 +7530,8 @@ self: {
          array base containers Graph500 mtl stm time
        ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7549,8 +7549,8 @@ self: {
          array base containers Graph500 GraphHammer mtl
        ];
        description = "Test harness for TriangleCount analysis";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7562,7 +7562,7 @@ self: {
        sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq";
        libraryHaskellDepends = [ array base containers ];
        description = "Tarjan's algorithm for computing the strongly connected components of a graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Graphalyze" = callPackage
@@ -7579,7 +7579,7 @@ self: {
        ];
        description = "Graph-Theoretic Analysis library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Grempa" = callPackage
@@ -7594,8 +7594,8 @@ self: {
          array base containers mtl QuickCheck template-haskell th-lift
        ];
        description = "Embedded grammar DSL and LALR parser generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7613,8 +7613,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Parser and selection library for expression languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7637,7 +7637,7 @@ self: {
        ];
        description = "A declarative make-like interpreter";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "GrowlNotify" = callPackage
@@ -7657,8 +7657,8 @@ self: {
          base binary bytestring Crypto haskell98 network
        ];
        description = "Notification utility for Growl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7675,7 +7675,7 @@ self: {
        ];
        description = "Convenience functions to extend Gtk2hs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7691,8 +7691,8 @@ self: {
          base bitmap bitmap-opengl gtk gtkglext GtkTV OpenGL stb-image time
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7706,8 +7706,8 @@ self: {
          base gtk time TV TypeCompose vector-space
        ];
        description = "Gtk-based GUIs for Tangible Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7726,8 +7726,8 @@ self: {
          proplang
        ];
        description = "A graphical REPL and development environment for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7739,8 +7739,8 @@ self: {
        sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i";
        libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        description = "GUIs for Tangible Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7761,8 +7761,8 @@ self: {
          temporary vector
        ];
        description = "The Haskell/R mixed programming environment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7787,8 +7787,8 @@ self: {
          utility-ht vector
        ];
        description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7804,7 +7804,7 @@ self: {
        executableHaskellDepends = [ array base ];
        description = "A simple ARM emulator in haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HAppS-Data" = callPackage
@@ -7820,8 +7820,8 @@ self: {
          syb-with-class template-haskell
        ];
        description = "HAppS data manipulation libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7837,8 +7837,8 @@ self: {
          base containers HAppS-Data HAppS-State HAppS-Util hslogger mtl syb
          syb-with-class template-haskell
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7859,8 +7859,8 @@ self: {
          xhtml
        ];
        description = "Web related tools and services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7880,8 +7880,8 @@ self: {
          random stm syb template-haskell unix
        ];
        description = "Event-based distributed state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7898,8 +7898,8 @@ self: {
          template-haskell
        ];
        description = "Web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7911,7 +7911,7 @@ self: {
        sha256 = "1hwxh60b26chcd466vlpxc7hx3smdnfl40mfxpyh8j1597v2aqa3";
        doHaddock = false;
        description = "OBSOLETE. Please use happstack-helpers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HCL" = callPackage
@@ -7932,8 +7932,8 @@ self: {
          base containers HUnit mtl QuickCheck random
        ];
        description = "High-level library for building command line interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7947,8 +7947,8 @@ self: {
          base mtl QuickCheck random random-shuffle
        ];
        description = "A library for implementing a Deck of Cards";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -7967,7 +7967,7 @@ self: {
          array base bytestring fail QuickCheck random semigroups
        ];
        description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HDBC" = callPackage
@@ -7985,7 +7985,7 @@ self: {
          utf8-string
        ];
        description = "Haskell Database Connectivity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HDBC-mysql" = callPackage
@@ -8001,7 +8001,7 @@ self: {
        librarySystemDepends = [ mysqlclient openssl zlib ];
        description = "MySQL driver for HDBC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mysqlclient = null; inherit (pkgs) openssl; 
          inherit (pkgs) zlib;};
@@ -8021,7 +8021,7 @@ self: {
        ];
        librarySystemDepends = [ unixODBC ];
        description = "ODBC driver for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) unixODBC;};
 
   "HDBC-postgresql" = callPackage
@@ -8041,7 +8041,7 @@ self: {
        ];
        librarySystemDepends = [ postgresql ];
        description = "PostgreSQL driver for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
   "HDBC-postgresql-hstore" = callPackage
@@ -8052,8 +8052,8 @@ self: {
        sha256 = "0657a1qy51bihh9gvpwpqpm4gch68rw32plnjcfdbc37yjq5dj1d";
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8065,7 +8065,7 @@ self: {
        sha256 = "1qwnqb62zgmm4dy5qlcj04aczja6yn16c92jc63zkln9pcc7y1da";
        libraryHaskellDepends = [ base HDBC ];
        description = "Bracketed connection for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HDBC-sqlite3" = callPackage
@@ -8080,7 +8080,7 @@ self: {
        libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
        librarySystemDepends = [ sqlite ];
        description = "Sqlite v3 driver for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) sqlite;};
 
   "HDRUtils" = callPackage
@@ -8094,8 +8094,8 @@ self: {
        libraryHaskellDepends = [ array base colour containers mtl unix ];
        librarySystemDepends = [ pfstools ];
        description = "Utilities for reading, manipulating, and writing HDR images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) pfstools;};
 
@@ -8107,8 +8107,8 @@ self: {
        sha256 = "08lry7w4zb7j81q9d7rjpz0chcbr9laxi4h9dz327pfcgmy083sy";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mpfr;};
 
@@ -8125,8 +8125,8 @@ self: {
        ];
        librarySystemDepends = [ xlsxwriter zlib ];
        description = "Create Excel files with Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xlsxwriter = null; inherit (pkgs) zlib;};
 
@@ -8148,8 +8148,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "The library for generating a graphical interface on the web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8161,8 +8161,8 @@ self: {
        sha256 = "09h6wfalziw39c2sghj8qw82vyvnl01qlsam6ngkfkdirgj5sg5h";
        libraryHaskellDepends = [ base c-storable-deriving ];
        description = "A Queue with a random (weighted) pick function";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8180,8 +8180,8 @@ self: {
          sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
        '';
        description = "HFuse is a binding for the Linux FUSE library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fuse;};
 
   "HGE2D" = callPackage
@@ -8197,8 +8197,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "2D game engine written in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8210,7 +8210,7 @@ self: {
        sha256 = "087k8i0bha3mzpqa3z3c6npl5vmccg7xcwl28lbv0yzbvj1qkg38";
        libraryHaskellDepends = [ array base stm X11 ];
        description = "A simple graphics library based on X11 or Win32";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HGamer3D" = callPackage
@@ -8228,7 +8228,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-API" = callPackage
@@ -8245,7 +8245,7 @@ self: {
        ];
        description = "Library to enable 3D game development for Haskell - API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Audio" = callPackage
@@ -8261,7 +8261,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer - Audio Functionality";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Bullet-Binding" = callPackage
@@ -8273,7 +8273,7 @@ self: {
        libraryHaskellDepends = [ base HGamer3D-Data ];
        description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-CAudio-Binding" = callPackage
@@ -8287,7 +8287,7 @@ self: {
        librarySystemDepends = [ HGamer3DCAudio015 ];
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {HGamer3DCAudio015 = null;};
 
   "HGamer3D-CEGUI-Binding" = callPackage
@@ -8304,7 +8304,7 @@ self: {
        ];
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {CEGUIBase = null; CEGUIOgreRenderer = null; 
          hg3dcegui050 = null;};
 
@@ -8322,7 +8322,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer - Game Engine and Utilities";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Data" = callPackage
@@ -8338,7 +8338,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer - Data Definitions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Enet-Binding" = callPackage
@@ -8351,7 +8351,7 @@ self: {
        librarySystemDepends = [ enet hg3denet050 ];
        description = "Enet Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) enet; hg3denet050 = null;};
 
   "HGamer3D-GUI" = callPackage
@@ -8367,7 +8367,7 @@ self: {
        ];
        description = "GUI Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Graphics3D" = callPackage
@@ -8387,7 +8387,7 @@ self: {
        ];
        description = "Toolset for the Haskell Game Programmer - 3D Graphics Functionality";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-InputSystem" = callPackage
@@ -8404,7 +8404,7 @@ self: {
        ];
        description = "Joystick, Mouse and Keyboard Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Network" = callPackage
@@ -8420,7 +8420,7 @@ self: {
        ];
        description = "Networking Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-OIS-Binding" = callPackage
@@ -8437,7 +8437,7 @@ self: {
        librarySystemDepends = [ HGamer3DOIS015 ];
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {HGamer3DOIS015 = null;};
 
   "HGamer3D-Ogre-Binding" = callPackage
@@ -8456,7 +8456,7 @@ self: {
        ];
        description = "Ogre Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {OgreMain = null; OgrePaging = null; OgreProperty = null; 
          OgreRTShaderSystem = null; OgreTerrain = null; 
          hg3dogre050 = null;};
@@ -8475,7 +8475,7 @@ self: {
        librarySystemDepends = [ hg3dsdl2050 libX11 SDL2 ];
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; 
          inherit (pkgs.xorg) libX11;};
 
@@ -8493,7 +8493,7 @@ self: {
        ];
        description = "SFML Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; 
          sfml-system = null; sfml-window = null;};
 
@@ -8509,7 +8509,7 @@ self: {
        ];
        description = "Windowing and Event Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGamer3D-Wire" = callPackage
@@ -8527,7 +8527,7 @@ self: {
        ];
        description = "Wire Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HGraphStorage" = callPackage
@@ -8557,8 +8557,8 @@ self: {
          transformers zlib
        ];
        description = "Graph database stored on disk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8570,8 +8570,8 @@ self: {
        sha256 = "1215nz6l3bbkld2fqqsc494xw4qw4vqavznaqxgja2p60w9mwg0q";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Hardware Description Language embedded in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8583,8 +8583,8 @@ self: {
        sha256 = "0xvhzmsl1z6im36svjhcl4zlbnmpknlfn0m426cj5l06a3c5mfa8";
        libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8607,8 +8607,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) jdk;};
 
@@ -8622,8 +8622,8 @@ self: {
        editedCabalFile = "05m2kgz0laxv9jl1qfc1sxndan9503010y3aadvfcsxi9cyg3j1j";
        libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8643,8 +8643,8 @@ self: {
          parallel random template-haskell vector vector-heterogenous
        ];
        description = "Algebraic foundation for homomorphic learning";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8663,8 +8663,8 @@ self: {
          base ConstraintKinds containers heap HLearn-algebra
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8687,8 +8687,8 @@ self: {
          math-functions MonadRandom normaldistribution parsec primitive
          QuickCheck statistics vector vector-th-unbox
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8704,8 +8704,8 @@ self: {
          base ConstraintKinds containers deepseq HLearn-algebra list-extras
          MonadRandom QuickCheck vector
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8729,8 +8729,8 @@ self: {
          statistics template-haskell vector vector-th-unbox
        ];
        description = "Distributions for use with the HLearn library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8756,8 +8756,8 @@ self: {
          mtl process QuickCheck semigroups syb template-haskell
        ];
        description = "Heterogeneous lists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8771,7 +8771,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base regex-applicative ];
        description = "A preprocessor for HList labelable labels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HLogger" = callPackage
@@ -8785,8 +8785,8 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        executableHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent and easy-to-use logging library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8797,8 +8797,8 @@ self: {
        version = "0.2.1";
        sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6";
        description = "A hidden markov model library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8815,7 +8815,7 @@ self: {
          base data-default hashable mtl unordered-containers
        ];
        description = "Fast heterogeneous maps and unconstrained typeable-like functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HMarkov" = callPackage
@@ -8832,7 +8832,7 @@ self: {
          vector
        ];
        description = "Markov-generated sequences";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HNM" = callPackage
@@ -8854,8 +8854,8 @@ self: {
          base containers glib gtk haskell98 mtl process regex-posix unix
        ];
        description = "Happy Network Manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8874,7 +8874,7 @@ self: {
          base math-functions parallel parallel-io random
        ];
        description = "Haskell Numeric Library with pure functionality, R & MATLAB Syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HODE" = callPackage
@@ -8886,8 +8886,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ode;};
 
@@ -8904,8 +8904,8 @@ self: {
        executableHaskellDepends = [ base ];
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) opencv;};
 
@@ -8930,8 +8930,8 @@ self: {
        ];
        testHaskellDepends = [ base HTF ];
        description = "Generation of PDF documents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8954,8 +8954,8 @@ self: {
          parsec utf8-string
        ];
        description = "Extract Haskell declarations by name";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -8973,7 +8973,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Phone number parser and validator - This is now DEPRECATED!";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "HPi" = callPackage
@@ -8985,8 +8985,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ bcm2835 ];
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bcm2835 = null;};
 
@@ -9004,8 +9004,8 @@ self: {
        executableHaskellDepends = [ base glade glib gtk ];
        executablePkgconfigDepends = [ plplotd-gnome2 ];
        description = "A minimal monadic PLplot interface for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {plplotd-gnome2 = null;};
 
@@ -9025,7 +9025,7 @@ self: {
        ];
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9043,8 +9043,8 @@ self: {
          HROOT-io HROOT-math HROOT-tree template-haskell
        ];
        description = "Haskell binding to the ROOT data analysis framework";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9058,8 +9058,8 @@ self: {
          base fficxx fficxx-runtime template-haskell
        ];
        description = "Haskell binding to ROOT Core modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9075,8 +9075,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell
        ];
        description = "Haskell binding to ROOT Graf modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9092,8 +9092,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
        description = "Haskell binding to ROOT Hist modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9109,8 +9109,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
        description = "Haskell binding to ROOT IO modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9126,8 +9126,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
        description = "Haskell binding to ROOT Math modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9143,8 +9143,8 @@ self: {
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
        description = "Haskell binding to ROOT Tree modules";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9159,8 +9159,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base directory haskell98 ];
        description = "Haskell raytracer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9181,8 +9181,8 @@ self: {
          array base Cabal containers directory filepath parsec process unix
        ];
        description = "Generate FFI import declarations from C include files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9201,8 +9201,8 @@ self: {
        ];
        executableHaskellDepends = [ csv ];
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9240,7 +9240,7 @@ self: {
        ];
        description = "Convenience functions that use HSH, instances for HSH";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9252,8 +9252,8 @@ self: {
        sha256 = "0snix2qdj1d66v6qj6fl0zizl617kjzbmxiswdd5i0b5lzjkpagb";
        libraryHaskellDepends = [ base containers hashable hashtables ];
        description = "Faux heterogeneous sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9265,7 +9265,7 @@ self: {
        sha256 = "03gb5dd59mirwb11b98vbg60w2zwfsbr8akk7qbq01z7n7rkgsr7";
        libraryHaskellDepends = [ base ];
        description = "OpenStreetMap Slippy Map";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HSmarty" = callPackage
@@ -9284,8 +9284,8 @@ self: {
        ];
        testHaskellDepends = [ aeson attoparsec base HTF text ];
        description = "Small template engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9302,7 +9302,7 @@ self: {
          markov-chain pure-fft random UISF
        ];
        description = "Library for computer music education";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HSoundFile" = callPackage
@@ -9317,8 +9317,8 @@ self: {
          base binary bytestring filepath haskell98 mtl parallel
        ];
        description = "Audio file reading/writing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9339,7 +9339,7 @@ self: {
          template-haskell text time void
        ];
        description = "StringTemplate implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HStringTemplateHelpers" = callPackage
@@ -9356,7 +9356,7 @@ self: {
        ];
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9368,7 +9368,7 @@ self: {
        sha256 = "0vij1xp3gm7s0d5hqlpl6jm949gpimaxz8cr3njaa4kkgpw8yd4g";
        libraryHaskellDepends = [ base containers ];
        description = "Haskell Bindings for libsvm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HTF" = callPackage
@@ -9403,8 +9403,8 @@ self: {
          unordered-containers
        ];
        description = "The Haskell Test Framework";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9427,7 +9427,7 @@ self: {
          pureMD5 split test-framework test-framework-hunit
        ];
        description = "A library for client-side HTTP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -9439,7 +9439,7 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        doHaddock = false;
        description = "DEPRECATED Enable simple wrappers to Network.HTTP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HTab" = callPackage
@@ -9457,8 +9457,8 @@ self: {
          base cmdargs containers deepseq hylolib mtl random strict
        ];
        description = "Tableau based theorem prover for hybrid logics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9476,8 +9476,8 @@ self: {
          array base mtl random SDL SDL-image SDL-ttf
        ];
        description = "An SDL tic-tac-toe game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9490,7 +9490,7 @@ self: {
        libraryHaskellDepends = [ base call-stack deepseq ];
        testHaskellDepends = [ base call-stack deepseq filepath ];
        description = "A unit testing framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HUnit-Diff" = callPackage
@@ -9501,8 +9501,8 @@ self: {
        sha256 = "0dlsx6qicnrqkhb52jbgh31f0y6lxh32yl5gr6bg3fnqr36vc6x6";
        libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        description = "Assertions for HUnit with difference reporting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9524,7 +9524,7 @@ self: {
          parsec text time timeit unordered-containers
        ];
        description = "A test framework building on HUnit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HUnit-approx" = callPackage
@@ -9536,7 +9536,7 @@ self: {
        libraryHaskellDepends = [ base call-stack HUnit ];
        testHaskellDepends = [ base call-stack HUnit ];
        description = "Approximate equality for floating point numbers with HUnit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HXMPP" = callPackage
@@ -9562,8 +9562,8 @@ self: {
          xml-enumerator xml-types
        ];
        description = "A (prototyped) easy to use XMPP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9581,8 +9581,8 @@ self: {
          template-haskell
        ];
        description = "A Compiler from XQuery to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9597,8 +9597,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        description = "HaLeX enables modelling, manipulation and visualization of regular languages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9610,8 +9610,8 @@ self: {
        sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458";
        libraryHaskellDepends = [ base bytestring serialport stm ];
        description = "An Haskell library to drive the french Minitel through a serial port";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9623,8 +9623,8 @@ self: {
        sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz";
        libraryHaskellDepends = [ base template-haskell th-lift ];
        description = "Haskell bindings for Python";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9659,8 +9659,8 @@ self: {
          parsec turtle
        ];
        description = "the Haskell Refactorer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9681,7 +9681,7 @@ self: {
          base parsec QuickCheck tasty tasty-quickcheck text
        ];
        description = "The Haskell LaTeX library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -9699,8 +9699,8 @@ self: {
          haskell-src-exts mtl parsec
        ];
        description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9716,8 +9716,8 @@ self: {
          antiquoter base haskell-src-meta HaTeX template-haskell text
        ];
        description = "Quasiquoters for HaTeX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9737,8 +9737,8 @@ self: {
          test-framework-quickcheck
        ];
        description = "An implementation of the Version Space Algebra learning framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9775,8 +9775,8 @@ self: {
        libraryHaskellDepends = [ base containers network old-locale ];
        executableHaskellDepends = [ text time vty vty-ui ];
        description = "Simple chat";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9797,8 +9797,8 @@ self: {
          base Crypto directory hdaemonize hint mtl old-time parsec
        ];
        description = "A Procmail Replacement as Haskell EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9816,8 +9816,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
        description = "Aggression analysis for Tweets on Twitter";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9829,8 +9829,8 @@ self: {
        sha256 = "1jp8cwlp6h1wvvkh71813i3lzxc7ckxzc7nvvcsjvcz0apxcl7vv";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Haskell implementation of a HandlerSocket client (API)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9851,7 +9851,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hxt ];
        description = "Work with HTML more easily in HXT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Hangman" = callPackage
@@ -9865,8 +9865,8 @@ self: {
        executableHaskellDepends = [ base random transformers ];
        testHaskellDepends = [ base hspec transformers ];
        description = "The classic game of Hangman";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9884,8 +9884,8 @@ self: {
          base constraints generics-sop safe singletons
        ];
        description = "Type Safe and End to End Decision Tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9909,8 +9909,8 @@ self: {
          process sox template-haskell uu-parsinglib vector
        ];
        description = "Harmony Analysis and Retrieval of Music";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9932,7 +9932,7 @@ self: {
          uu-parsinglib
        ];
        description = "Parsing and unambiguously representing musical chords";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "HasBigDecimal" = callPackage
@@ -9944,7 +9944,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A library for arbitrary precision decimal numbers";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "HasCacBDD" = callPackage
@@ -9960,8 +9960,8 @@ self: {
        librarySystemDepends = [ CacBDD ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell bindings for CacBDD";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {CacBDD = null;};
 
@@ -9978,8 +9978,8 @@ self: {
          base haskell98 hmatrix hmatrix-special mtl parsec random
        ];
        description = "A Haskell library for inference using Gaussian processes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -9998,8 +9998,8 @@ self: {
          array base list-tries monad-loops mtl numbers parsec
        ];
        description = "Minimalist R5RS Scheme interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10019,7 +10019,7 @@ self: {
        ];
        description = "Simple shell written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10036,8 +10036,8 @@ self: {
          base containers directory ghc-prim HList tagged
        ];
        description = "HaskRel, Haskell as a DBMS with support for the relational algebra";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10061,8 +10061,8 @@ self: {
          graphviz haskell-src-exts HUnit pretty split syb text vector
        ];
        description = "Haskell source code analysis program";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10074,7 +10074,7 @@ self: {
        sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz";
        libraryHaskellDepends = [ array base containers random ];
        description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HaskellLM" = callPackage
@@ -10086,7 +10086,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10099,7 +10099,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10116,8 +10116,8 @@ self: {
          network-bsd old-time pretty text
        ];
        description = "Client support for POP3, SMTP, and IMAP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10134,8 +10134,8 @@ self: {
          base bytestring connection data-default HaskellNet network tls
        ];
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10159,8 +10159,8 @@ self: {
          test-framework-quickcheck2 time
        ];
        description = "A concurrent bittorrent client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10174,8 +10174,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs text ];
        description = "Haskell Tutorials by Evgeny Ukhanov";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10193,8 +10193,8 @@ self: {
          base containers HGL hmatrix MonadRandom random Yampa
        ];
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10213,7 +10213,7 @@ self: {
          text transformers
        ];
        description = "mastodon client module for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Hate" = callPackage
@@ -10236,8 +10236,8 @@ self: {
          random transformers vect vect-opengl vector
        ];
        description = "A small 2D game framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10259,8 +10259,8 @@ self: {
          network regex-posix SHA template-haskell time utf8-string
        ];
        description = "Haskell Web Application Kit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10287,8 +10287,8 @@ self: {
          snap-core snap-server tar text transformers xhtml-combinators zlib
        ];
        description = "The Hayoo! search engine for Haskell API search on hackage";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10300,7 +10300,7 @@ self: {
        sha256 = "04ppwm7vfzndrys8x1n8vfb41vzwx59r9xp4dkbiqmrms390pj6q";
        libraryHaskellDepends = [ base mtl process strict ];
        description = "A small cross-platform library for reading and modifying the system clipboard";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Hedi" = callPackage
@@ -10321,8 +10321,8 @@ self: {
          base editline mtl parsec pretty process QuickCheck regex-posix
        ];
        description = "Line oriented editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10341,8 +10341,8 @@ self: {
        ];
        testHaskellDepends = [ base linear subhask ];
        description = "automatically improve your code's numeric stability";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10361,8 +10361,8 @@ self: {
          unamb yjtools
        ];
        description = "Message-based middleware layer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10380,8 +10380,8 @@ self: {
          gtkglext IfElse mtl OpenGL parallel pretty random
        ];
        description = "Purely functional 2D graphics for visualization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10398,8 +10398,8 @@ self: {
          vector
        ];
        description = "A multi-index set with advanced query capabilites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10414,7 +10414,7 @@ self: {
        ];
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Hipmunk-Utils" = callPackage
@@ -10426,8 +10426,8 @@ self: {
        libraryHaskellDepends = [ base Hipmunk linear StateVar ];
        testHaskellDepends = [ base ];
        description = "Useful functions for Hipmunk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10446,7 +10446,7 @@ self: {
        ];
        description = "A playground for testing Hipmunk";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Hish" = callPackage
@@ -10465,8 +10465,8 @@ self: {
        executableHaskellDepends = [
          base directory MissingH process regex-tdfa time
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10477,7 +10477,7 @@ self: {
        version = "0.1.0.2";
        sha256 = "00f0a3lbpc7s70lzmnf9a7hjzc3yv8nfxcvz5nparr34x585zbxl";
        libraryHaskellDepends = [ base containers gnuplot ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Hmpf" = callPackage
@@ -10495,7 +10495,7 @@ self: {
        ];
        description = "An MPD client designed for a Home Theatre PC";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10520,8 +10520,8 @@ self: {
        ];
        testHaskellDepends = [ base process QuickCheck ];
        description = "Lightweight algorithmic debugging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10533,7 +10533,7 @@ self: {
        sha256 = "0y29gnbxrlj9fh0d5naa7ia1xs36fimszcbzif2zdw451jkk97r9";
        libraryHaskellDepends = [ base ];
        description = "Monoids with holes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Holumbus-Distribution" = callPackage
@@ -10553,7 +10553,7 @@ self: {
        ];
        description = "intra- and inter-program communication";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Holumbus-MapReduce" = callPackage
@@ -10575,7 +10575,7 @@ self: {
        ];
        description = "a distributed MapReduce framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Holumbus-Searchengine" = callPackage
@@ -10595,8 +10595,8 @@ self: {
          SHA unix
        ];
        description = "A search and indexing engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10617,7 +10617,7 @@ self: {
        ];
        description = "a distributed storage system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Homology" = callPackage
@@ -10647,8 +10647,8 @@ self: {
        ];
        testHaskellDepends = [ base process random ];
        description = "A Simple Key Value Store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10662,7 +10662,7 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Parser for host and port pairs like localhost:22";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Hricket" = callPackage
@@ -10675,8 +10675,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10704,8 +10704,8 @@ self: {
        ];
        testHaskellDepends = [ base directory filepath process ];
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10717,7 +10717,7 @@ self: {
        sha256 = "1kdf2yq3v8lr84h2pf1ydi6vrqfr685vbkxjz4ai5wd2mij8i361";
        libraryHaskellDepends = [ array base random ];
        description = "A haskell interface to Lester Ingber's adaptive simulating annealing code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HsHTSLib" = callPackage
@@ -10737,8 +10737,8 @@ self: {
          base bytestring conduit tasty tasty-golden tasty-hunit vector
        ];
        description = "Bindings to htslib";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -10750,8 +10750,8 @@ self: {
        sha256 = "1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps";
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10768,8 +10768,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ hyperestraier qdbm ];
        description = "HyperEstraier binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hyperestraier = null; qdbm = null;};
 
@@ -10783,8 +10783,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ Judy ];
        description = "Judy bindings, and some nice APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Judy = null;};
 
@@ -10799,7 +10799,7 @@ self: {
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base bytestring ];
        description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL-x509-system" = callPackage
@@ -10810,7 +10810,7 @@ self: {
        sha256 = "15mp70bqg1lzp971bzp6wym3bwzvxb76hzbgckygbfa722xyymhr";
        libraryHaskellDepends = [ base bytestring HsOpenSSL unix ];
        description = "Use the system's native CA certificate store with HsOpenSSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HsParrot" = callPackage
@@ -10824,8 +10824,8 @@ self: {
          base bytestring HsSyck pretty pugs-DrIFT
        ];
        description = "Haskell integration with Parrot virtual machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10837,8 +10837,8 @@ self: {
        sha256 = "15j8zm12lcp4gm8kmciw3xy7qckqmlygn0d2difsdb598y5ijz2z";
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10850,8 +10850,8 @@ self: {
        sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7";
        libraryHaskellDepends = [ base bytestring mtl stm ];
        description = "Partial Subversion (SVN) binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10866,7 +10866,7 @@ self: {
          base bytestring hashtables syb utf8-string
        ];
        description = "Fast, lightweight YAML loader and dumper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "HsTools" = callPackage
@@ -10877,7 +10877,7 @@ self: {
        sha256 = "0banfivx4xc0j3c1qmda31gvvrqqsg12fzizcpman2fvdlk7kn5l";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Haskell helper functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "HsWebots" = callPackage
@@ -10900,8 +10900,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Webots bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Controller = null; driver = null;};
 
@@ -10925,7 +10925,7 @@ self: {
          text
        ];
        description = "Pure Haskell YAML 1.2 processor";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "HsYAML-aeson" = callPackage
@@ -10943,7 +10943,7 @@ self: {
          unordered-containers vector
        ];
        description = "JSON to YAML Adapter";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "Hsed" = callPackage
@@ -10966,8 +10966,8 @@ self: {
          regex-posix
        ];
        description = "Stream Editor in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -10985,8 +10985,8 @@ self: {
          base containers parsec pretty process smtLib transformers
        ];
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11002,8 +11002,8 @@ self: {
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
        description = "API for controlling Philips Hue lights";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11021,8 +11021,8 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Easily bulk import CSV data to SQL Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11040,7 +11040,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ array base criterion Munkres random ];
        description = "A Linear Sum Assignment Problem (LSAP) solver";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Hydrogen" = callPackage
@@ -11060,8 +11060,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "The library for generating a WebGL scene for the web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11076,8 +11076,8 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Code for the Haskell course taught at the University of Seville";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11089,8 +11089,8 @@ self: {
        sha256 = "1p4h2hxwzp0bxkzh864vkqbwychi0j2c3rqck9vk5kfax5i1jfz8";
        libraryHaskellDepends = [ base containers directory ];
        description = "Indexable, serializable form of Data.Dynamic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11106,8 +11106,8 @@ self: {
          array base bytestring containers random
        ];
        description = "Iterated Function System generation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11128,7 +11128,7 @@ self: {
        ];
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11141,8 +11141,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11161,8 +11161,8 @@ self: {
          base bits-atomic ghc-prim HUnit QuickCheck time
        ];
        description = "Atomic compare and swap for IORefs and STRefs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11174,7 +11174,7 @@ self: {
        sha256 = "1w6f7jnjm4n0s4mr18yqv81rsnrh8f6806x523gnqljbyak18p1l";
        libraryHaskellDepends = [ base mtl QuickCheck Stream ];
        description = "A pure specification of the IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "IPv6Addr" = callPackage
@@ -11192,7 +11192,7 @@ self: {
          base HUnit test-framework test-framework-hunit text
        ];
        description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "IPv6DB" = callPackage
@@ -11220,8 +11220,8 @@ self: {
          aeson base hspec http-client http-types vector
        ];
        description = "A RESTful microService for IPv6-related data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11234,7 +11234,7 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11246,7 +11246,7 @@ self: {
        sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
        libraryHaskellDepends = [ base mtl ];
        description = "Anaphoric and miscellaneous useful control-flow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Imlib" = callPackage
@@ -11257,7 +11257,7 @@ self: {
        sha256 = "075x1vcrxdwknzbad05l08i5c79svf714yvv6990ffvsfykiilry";
        libraryHaskellDepends = [ array base X11 ];
        librarySystemDepends = [ imlib2 ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) imlib2;};
 
   "ImperativeHaskell" = callPackage
@@ -11268,8 +11268,8 @@ self: {
        sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "A library for writing Imperative style haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11292,8 +11292,8 @@ self: {
        sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm";
        libraryHaskellDepends = [ base PeanoWitnesses ];
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11305,8 +11305,8 @@ self: {
        sha256 = "03c0jlnlnqm6faiandfg0kzajffk03aazkrqwav3g4vc3cdqwfgp";
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11319,8 +11319,8 @@ self: {
        libraryHaskellDepends = [ base parsec QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Convert integers in various bases to and from strings";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11333,7 +11333,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers ];
        description = "Dynamically sized graph library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "InternedData" = callPackage
@@ -11359,7 +11359,7 @@ self: {
          base bytestring containers criterion deepseq text
        ];
        description = "Data interning (with compact regions where possible)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Interpolation" = callPackage
@@ -11373,7 +11373,7 @@ self: {
        ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Interpolation-maxs" = callPackage
@@ -11385,7 +11385,7 @@ self: {
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "IntervalMap" = callPackage
@@ -11403,7 +11403,7 @@ self: {
          weigh
        ];
        description = "Containers for intervals, with efficient search";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Irc" = callPackage
@@ -11419,8 +11419,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "DSL for IRC bots";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11452,8 +11452,8 @@ self: {
          vector
        ];
        description = "A typeclass to determine if a given value is null";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11471,8 +11471,8 @@ self: {
          hjson json JSONb parsec text vector
        ];
        description = "A combinator library on top of a generalised JSON type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11486,8 +11486,8 @@ self: {
          base bytestring json JSON-Combinator JSONb
        ];
        description = "Example uses of the JSON-Combinator library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11499,7 +11499,7 @@ self: {
        sha256 = "1xda2dy2mizpvxvn3gyhx7aql7pi26zvw044r3bm14xr5qj11q26";
        libraryHaskellDepends = [ base parsec ];
        description = "Parse JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JSONb" = callPackage
@@ -11519,8 +11519,8 @@ self: {
          containers utf8-string
        ];
        description = "JSON parser that uses byte strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11540,8 +11540,8 @@ self: {
          stm template-haskell unix zlib
        ];
        description = "Some utility functions for JYU projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11553,8 +11553,8 @@ self: {
        sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp";
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11571,8 +11571,8 @@ self: {
          base binary bytestring language-java-classfile
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11586,8 +11586,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11600,7 +11600,7 @@ self: {
        libraryHaskellDepends = [ base Euterpea random ];
        description = "Library for modeling jazz improvisation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Jdh" = callPackage
@@ -11611,8 +11611,8 @@ self: {
        sha256 = "0zg7xh3apm7x3c9gz876k5cis5jpng1bzf6g9ywbmmndry6dn1c0";
        libraryHaskellDepends = [ base ];
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11635,8 +11635,8 @@ self: {
          base containers mtl parsec pretty syb WebBits WebBits-Html
        ];
        description = "Design-by-contract for JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11658,8 +11658,8 @@ self: {
          test-framework-hunit text
        ];
        description = "Combinators for bidirectional JSON parsing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11676,8 +11676,8 @@ self: {
          aeson base bytestring json-autotype text
        ];
        description = "JuPyTer notebook parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11694,7 +11694,7 @@ self: {
          transformers vector zlib
        ];
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-blp" = callPackage
@@ -11717,8 +11717,8 @@ self: {
          text-show unordered-containers
        ];
        description = "BLP format decoder/encoder over JuicyPixels library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11748,7 +11748,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Blurhash is a very compact represenation of a placeholder for an image";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -11759,8 +11759,8 @@ self: {
        sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm";
        libraryHaskellDepends = [ base containers JuicyPixels ];
        description = "Functions for drawing lines, squares and so on pixel by pixel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11778,7 +11778,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
        description = "Efficiently scale, crop, flip images with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-repa" = callPackage
@@ -11791,7 +11791,7 @@ self: {
          base bytestring JuicyPixels repa vector
        ];
        description = "Convenience functions to obtain array representations of images";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-scale-dct" = callPackage
@@ -11810,7 +11810,7 @@ self: {
          base base-compat carray fft JuicyPixels time
        ];
        description = "Scale JuicyPixels images with DCT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-stbir" = callPackage
@@ -11826,7 +11826,7 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "Scale JuicyPixels images with stb_image_resize";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-util" = callPackage
@@ -11837,7 +11837,7 @@ self: {
        sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
        libraryHaskellDepends = [ base JuicyPixels vector ];
        description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "JunkDB" = callPackage
@@ -11852,8 +11852,8 @@ self: {
          aeson base binary bytestring conduit data-default directory
          filepath mtl network resourcet
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11868,8 +11868,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11884,8 +11884,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11897,8 +11897,8 @@ self: {
        sha256 = "16il25s1fb4b6ih6njsqxx7p7x0fc0kcwa5vqn7n7knqph6vvjaa";
        libraryHaskellDepends = [ base ];
        description = "A simple and comprehensive Haskell parsing library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11911,7 +11911,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base Cabal ];
        description = "Knuth–Morris–Pratt string searching algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "KSP" = callPackage
@@ -11922,8 +11922,8 @@ self: {
        sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6";
        libraryHaskellDepends = [ base ];
        description = "A library with the kerbal space program universe and demo code";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11935,8 +11935,8 @@ self: {
        sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5";
        libraryHaskellDepends = [ base hmatrix ];
        description = "A slightly extended Kalman filter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11949,7 +11949,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        description = "KdTree, for efficient search in K-dimensional point clouds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ketchup" = callPackage
@@ -11964,8 +11964,8 @@ self: {
          base base64-bytestring bytestring directory mime-types network text
        ];
        description = "A super small web framework for those who don't like big and fancy codebases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -11992,7 +11992,7 @@ self: {
        ];
        description = "A compiler from Curry to Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {kics = null;};
 
   "KiCS-debugger" = callPackage
@@ -12014,7 +12014,7 @@ self: {
        ];
        description = "debug features for kics";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "KiCS-prophecy" = callPackage
@@ -12030,7 +12030,7 @@ self: {
        executableHaskellDepends = [ base KiCS ];
        description = "a transformation used by the kics debugger";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Kleislify" = callPackage
@@ -12041,7 +12041,7 @@ self: {
        sha256 = "0f7f6sxb774h9dx6xy6wbcrc5b2i27k9m5ay3hq9hqsjg86qmxyl";
        libraryHaskellDepends = [ base ];
        description = "Variants of Control.Arrow functions, specialised to kleislis.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Konf" = callPackage
@@ -12053,7 +12053,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec ];
        description = "A configuration language and a parser";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Kriens" = callPackage
@@ -12064,8 +12064,8 @@ self: {
        sha256 = "1b6r4860qnnszs4giaidd8z1xch8vvq8qdyb9linrdhxpf5ad3sw";
        libraryHaskellDepends = [ base ];
        description = "Category for Continuation Passing Style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12082,7 +12082,7 @@ self: {
        ];
        description = "Library for automated composition and musical learning";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "KyotoCabinet" = callPackage
@@ -12096,8 +12096,8 @@ self: {
        libraryHaskellDepends = [ base bytestring extensible-exceptions ];
        librarySystemDepends = [ kyotocabinet ];
        description = "Kyoto Cabinet DB bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) kyotocabinet;};
 
@@ -12115,8 +12115,8 @@ self: {
          base cairo containers gtk mtl old-time parsec random
        ];
        description = "Plant growing programming game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12133,8 +12133,8 @@ self: {
        ];
        librarySystemDepends = [ openblasCompat ];
        description = "Linear Algebra on Typed Spaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openblasCompat;};
 
@@ -12150,7 +12150,7 @@ self: {
          base bytestring hspec lens mtl vector
        ];
        description = "LC-3 virtual machine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LDAP" = callPackage
@@ -12166,7 +12166,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        testSystemDepends = [ openldap ];
        description = "Haskell binding for C LDAP API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openldap;};
 
   "LDAPv3" = callPackage
@@ -12189,8 +12189,8 @@ self: {
          tasty-quickcheck text text-short
        ];
        description = "Lightweight Directory Access Protocol (LDAP) version 3";
-       license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12203,7 +12203,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "A continuation-based parser library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "LRU" = callPackage
@@ -12214,8 +12214,8 @@ self: {
        sha256 = "0yppxz78y5myh9f53yqz6naqj15vk2h7fl3h8h8dps72zw9c5aqn";
        libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Implements an LRU data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12236,8 +12236,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion time ];
        description = "LTS: Labelled Transition System";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12249,7 +12249,7 @@ self: {
        sha256 = "0liqz3n2ycidwmg8iz7mbm0d087fcfgphvbip8bsn0hpwlf10dvw";
        libraryHaskellDepends = [ base transformers ];
        description = "Tree with only leaves carrying the data";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "LambdaCalculator" = callPackage
@@ -12266,7 +12266,7 @@ self: {
          base binary bytestring haskeline mtl parsec pretty
        ];
        description = "A basic lambda calculator with beta reduction and a REPL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LambdaDB" = callPackage
@@ -12281,7 +12281,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "On-memory Database using Lambda Function environment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LambdaDesigner" = callPackage
@@ -12298,8 +12298,8 @@ self: {
          lens-aeson matrix text transformers vector
        ];
        description = "A type-safe EDSL for TouchDesigner written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12332,8 +12332,8 @@ self: {
        ];
        testHaskellDepends = [ async base filepath optparse-applicative ];
        description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12353,8 +12353,8 @@ self: {
          vector
        ];
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12370,8 +12370,8 @@ self: {
          base binary bytestring hmatrix random random-shuffle split
        ];
        description = "A configurable and extensible neural network library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12396,8 +12396,8 @@ self: {
          test-framework-quickcheck2 th-instances transformers tuple uniplate
        ];
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12416,7 +12416,7 @@ self: {
        ];
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12429,8 +12429,8 @@ self: {
        libraryHaskellDepends = [ base filepath hspec mtl process text ];
        testHaskellDepends = [ base filepath hspec mtl process text ];
        description = "A library to easily host Haskell based programming competitions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12447,8 +12447,8 @@ self: {
          pipes-parse
        ];
        description = "Library for RedPitaya";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12461,7 +12461,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A transfinite cardinal arithmetic library including all known large cardinals";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Lastik" = callPackage
@@ -12477,8 +12477,8 @@ self: {
          pureMD5 SHA zip-archive
        ];
        description = "A library for compiling programs in a variety of languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12515,7 +12515,7 @@ self: {
          base binary byteable bytestring criterion cryptonite memory
        ];
        description = "Lazy PBKDF2 generator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "LazyVault" = callPackage
@@ -12528,8 +12528,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath unix ];
        description = "A simple sandboxing tool for Haskell packages";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12545,8 +12545,8 @@ self: {
        executableHaskellDepends = [ base containers hmatrix vector ];
        testHaskellDepends = [ base containers hmatrix vector ];
        description = "The most frequently used machine learning tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12560,8 +12560,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory random SDL SDL-ttf ];
        description = "A Snake II clone written using SDL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12582,8 +12582,8 @@ self: {
        libraryPkgconfigDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libclang (a C++ parsing library)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;};
 
@@ -12603,7 +12603,7 @@ self: {
          utf8-string
        ];
        description = "Bindings to libzip, a library for manipulating zip archives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Limit" = callPackage
@@ -12614,8 +12614,8 @@ self: {
        sha256 = "1yd8c443ql17daicn3r9jiwxxjlpqnpnvkbxcszjha4i4ar94zq1";
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12630,8 +12630,8 @@ self: {
          array base cmdargs haskell98 QuickCheck
        ];
        description = "Partition the sequence of items to the subsequences in the order given";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12659,7 +12659,7 @@ self: {
          base bytestring containers criterion deepseq text
        ];
        description = "Collection of types for natural language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LinkChecker" = callPackage
@@ -12676,8 +12676,8 @@ self: {
          base containers haskell98 HTTP mtl network tagsoup
        ];
        description = "Check a bunch of local html files for broken links";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12690,8 +12690,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring HTF mtl ];
        testHaskellDepends = [ base binary bytestring HTF mtl ];
        description = "Algorithmic Doom map generation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12705,7 +12705,7 @@ self: {
        editedCabalFile = "11ws93cdzz7k4nvcld2d74155mdgcvyi6f6an7gpf9z4k523c11n";
        libraryHaskellDepends = [ base transformers ];
        description = "List monad transformer and class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ListLike" = callPackage
@@ -12726,7 +12726,7 @@ self: {
          random text utf8-string vector
        ];
        description = "Generalized support for list-like structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ListT" = callPackage
@@ -12744,8 +12744,8 @@ self: {
          base smallcheck tasty tasty-smallcheck transformers util
        ];
        description = "List transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12759,7 +12759,7 @@ self: {
          base directory filepath List transformers
        ];
        description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ListWriter" = callPackage
@@ -12771,7 +12771,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
        description = "define a list constant using Monadic syntax other than overhead [,]";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ListZipper" = callPackage
@@ -12782,7 +12782,7 @@ self: {
        sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple zipper for lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "LiterateMarkdown" = callPackage
@@ -12798,8 +12798,8 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "Converter to convert from .lhs to .md and vice versa.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12811,8 +12811,8 @@ self: {
        sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01";
        libraryHaskellDepends = [ base ];
        description = "Logic";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12849,8 +12849,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base cereal criterion deepseq ];
        description = "a parallel implementation of logic programming using distributed tree exploration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12872,8 +12872,8 @@ self: {
        ];
        librarySystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openmpi;};
 
@@ -12899,8 +12899,8 @@ self: {
          random stm test-framework test-framework-hunit transformers
        ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12927,8 +12927,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12949,8 +12949,8 @@ self: {
          utf8-string
        ];
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -12971,8 +12971,8 @@ self: {
          time-http unix zlib
        ];
        description = "HTTP Daemonic Library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13001,8 +13001,8 @@ self: {
          transformers
        ];
        description = "A static website and blog generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13015,8 +13015,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers mtl ];
        description = "Generate MASM code from haskell";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13028,8 +13028,8 @@ self: {
        sha256 = "0yh84vybrxs6bv3z4qx4n9m4xwsb4kw21l35s5v4gg8yllgbb79r";
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13048,8 +13048,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs split ];
        description = "Folding algorithm based on nucleotide cyclic motifs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13075,8 +13075,8 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "stateful, RESTful web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13088,8 +13088,8 @@ self: {
        sha256 = "0nlj914ahipyfqv1l7qr66pa0a8g4g6ks6mipc38z5f1jy0kjrva";
        libraryHaskellDepends = [ base transformers ];
        description = "The category of monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13117,8 +13117,8 @@ self: {
          tasty-quickcheck tasty-th
        ];
        description = "Library for using Mixed Integer Programming (MIP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13143,8 +13143,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "A GLPK backend to the MIP library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glpk;};
 
@@ -13156,8 +13156,8 @@ self: {
        sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y";
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Michael-Scott queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13171,8 +13171,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Builds decks out of a meta";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13202,8 +13202,8 @@ self: {
          template-haskell tf-random time transformers unix
        ];
        description = "Automatic inductive functional programmer by systematic search";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13222,8 +13222,8 @@ self: {
          transformers vector
        ];
        description = "Haskell library to interact with Mailchimp JSON API Version 3.0";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13240,8 +13240,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of key-value maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13255,7 +13255,7 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
        description = "mapWith: like fmap, but with additional parameters (isFirst, isLast, etc)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Mapping" = callPackage
@@ -13266,8 +13266,8 @@ self: {
        sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn";
        libraryHaskellDepends = [ base ];
        description = "Mapping";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13281,8 +13281,8 @@ self: {
        editedCabalFile = "1045p10l7smabidysk52m16sgqgfpa70ny8nwyn56238i02cd7ir";
        libraryHaskellDepends = [ base mtl ];
        description = "MaybeT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13294,8 +13294,8 @@ self: {
        sha256 = "034v9n6ldjn1hsv4rphvysbykm8x0jqa2prbw7k28fkp6m30j74x";
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13307,8 +13307,8 @@ self: {
        sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily";
        libraryHaskellDepends = [ base monads-fd transformers ];
        description = "MaybeT monad transformer using transformers instead of mtl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13328,8 +13328,8 @@ self: {
          pretty random regex-posix time
        ];
        description = "Console-based Role Playing Game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13341,8 +13341,8 @@ self: {
        sha256 = "0rnbg7w3qc3xsbzpw5is7w7qdjl2kqbr1acc744aggwlibazl59w";
        libraryHaskellDepends = [ base vector ];
        description = "Mean shift algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13354,8 +13354,8 @@ self: {
        sha256 = "1vy8ykjy9cpv661byqv21775zbyciqx2hf77c1nl58nn34x0s2ds";
        libraryHaskellDepends = [ base ];
        description = "A library for units of measurement";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13367,8 +13367,8 @@ self: {
        sha256 = "1qqdvrhqm187gi9dj78z9ijcrrk6wv0a9cx060aa0278nayr4b2w";
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13380,8 +13380,8 @@ self: {
        sha256 = "00vmxrydynn8kjqn48q6kmd802m4q4y1n7cqq33vsi482ijrjak1";
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13395,7 +13395,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base newtype-generics ];
        description = "Trie-based memo functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MetaHDBC" = callPackage
@@ -13411,7 +13411,7 @@ self: {
        ];
        description = "Statically checked database access";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13423,8 +13423,8 @@ self: {
        sha256 = "0gbxayv4wv7zk53iqvsvsbby1js5zlwf6802rix6h3fx4xpzllab";
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13436,8 +13436,8 @@ self: {
        sha256 = "1ks5h3vlla2d86wvf2a4z1qifsinya2skq8ygdk45ynnwk735y4x";
        libraryHaskellDepends = [ base hstats ];
        description = "Evaluation metrics commonly used in supervised machine learning";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13456,8 +13456,8 @@ self: {
          process time
        ];
        description = "Haskell mailing list manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13474,8 +13474,8 @@ self: {
          WaveFront
        ];
        description = "OpenGL for dummies";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13492,8 +13492,8 @@ self: {
          transformers url wreq xml
        ];
        description = "Interface for Microsoft Translator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13514,7 +13514,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A toy dependently typed programming language with type-based termination";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "MissingH" = callPackage
@@ -13537,7 +13537,7 @@ self: {
          old-time parsec regex-compat time unix
        ];
        description = "Large utility library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MissingK" = callPackage
@@ -13548,7 +13548,7 @@ self: {
        sha256 = "1x8ygk64v1crj92zwdv2jh7rw5n53k0wx0bkjmkjn2x1vklsdinz";
        libraryHaskellDepends = [ base glib template-haskell ];
        description = "Useful types and definitions missing from other libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MissingM" = callPackage
@@ -13565,7 +13565,7 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "findM and other missing 'M's";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MissingPy" = callPackage
@@ -13576,8 +13576,8 @@ self: {
        sha256 = "0390ap25qj6a37jllsih39q5apgvwdjdw5m7jgfrllkp5bng6yj6";
        libraryHaskellDepends = [ anydbm base MissingH ];
        description = "Haskell interface to Python";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13600,8 +13600,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13613,7 +13613,7 @@ self: {
        sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq";
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Modular arithmetic via Numeric-Prelude";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "Moe" = callPackage
@@ -13627,8 +13627,8 @@ self: {
        libraryHaskellDepends = [ base GLUT random ];
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13644,8 +13644,8 @@ self: {
          aeson base bytestring containers text unordered-containers
        ];
        description = "Utilities working with MoeDict.tw JSON dataset";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13661,8 +13661,8 @@ self: {
          base extensible-exceptions MonadCatchIO-transformers
        ];
        description = "Monad-transformer version of the Control.Exception module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13674,8 +13674,8 @@ self: {
        sha256 = "0jfq5v1jigxl9mnnvpqph9ayq840s9nyb5srym04mbicri4gbjan";
        libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        description = "Polymorphic combinators for working with foreign functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13691,8 +13691,8 @@ self: {
          base extensible-exceptions monads-tf transformers
        ];
        description = "Monad-transformer compatible version of the Control.Exception module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13708,8 +13708,8 @@ self: {
          base MonadCatchIO-transformers primitive transformers
        ];
        description = "Polymorphic combinators for working with foreign functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13721,8 +13721,8 @@ self: {
        sha256 = "1jq8ms16karqqa6qxp4n24f2v4bcc8n8mzfjm6b6q3n8hg7dj8yd";
        libraryHaskellDepends = [ base free mmorph mtl transformers ];
        description = "Methods for composing monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13739,8 +13739,8 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell ];
        executableHaskellDepends = [ base haskell98 process ];
        description = "Automatically generate layered monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13752,7 +13752,7 @@ self: {
        sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
        libraryHaskellDepends = [ base mtl ];
        description = "MonadPrompt, implementation & examples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MonadRandom" = callPackage
@@ -13767,7 +13767,7 @@ self: {
          base mtl primitive random transformers transformers-compat
        ];
        description = "Random-number generation monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MonadRandomLazy" = callPackage
@@ -13778,7 +13778,7 @@ self: {
        sha256 = "0zqw3g69dx72rjmmbjjgvv06jr7j64fy4c4zkqyra4h5hxflb282";
        libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "MonadStack" = callPackage
@@ -13789,8 +13789,8 @@ self: {
        sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz";
        libraryHaskellDepends = [ base mtl ];
        description = "Generalizing lift to monad stacks";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13806,7 +13806,7 @@ self: {
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
        description = "2-D arcade scroller";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13822,8 +13822,8 @@ self: {
        executableHaskellDepends = [ ansi-terminal base process time ];
        testHaskellDepends = [ ansi-terminal base doctest process time ];
        description = "A minimalistic CLI Pomodoro timer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13842,8 +13842,8 @@ self: {
          array base containers directory free free-game mtl
        ];
        description = "A simple tetris clone";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13855,8 +13855,8 @@ self: {
        sha256 = "0250xqc5fgl8mg9yb0ykbfmxnyxacqbvi692irgfw89gf9vkh886";
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13868,8 +13868,8 @@ self: {
        sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0";
        libraryHaskellDepends = [ base Monatron transformers ];
        description = "MonadIO instances for the Monatron transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13881,8 +13881,8 @@ self: {
        sha256 = "1p8s2agsni56h7vlydbhy7qhi0qkwafpcrsfafrlg44gvpwff15y";
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13894,7 +13894,7 @@ self: {
        sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z";
        libraryHaskellDepends = [ base containers split ];
        description = "Morse code";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "MuCheck" = callPackage
@@ -13914,8 +13914,8 @@ self: {
          temporary time
        ];
        description = "Automated Mutation Testing";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13930,8 +13930,8 @@ self: {
        libraryHaskellDepends = [ base HUnit MuCheck ];
        executableHaskellDepends = [ base HUnit MuCheck ];
        description = "Automated Mutation Testing for HUnit tests";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13946,8 +13946,8 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-core MuCheck ];
        executableHaskellDepends = [ base hspec hspec-core MuCheck ];
        description = "Automated Mutation Testing for Hspec tests";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13962,8 +13962,8 @@ self: {
        libraryHaskellDepends = [ base MuCheck QuickCheck ];
        executableHaskellDepends = [ base MuCheck QuickCheck ];
        description = "Automated Mutation Testing for QuickCheck tests";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13978,8 +13978,8 @@ self: {
        libraryHaskellDepends = [ base MuCheck smallcheck ];
        executableHaskellDepends = [ base MuCheck smallcheck ];
        description = "Automated Mutation Testing for SmallCheck tests";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -13991,7 +13991,7 @@ self: {
        sha256 = "169mgcyls0dsifnbp615r4i3g64ga2vbczsiv4aq17d1nma8sw19";
        libraryHaskellDepends = [ array base ];
        description = "Munkres' assignment algorithm (hungarian method)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Munkres-simple" = callPackage
@@ -14002,8 +14002,8 @@ self: {
        sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb";
        libraryHaskellDepends = [ array base bimap containers Munkres ];
        description = "Simple and typesafe layer over the Munkres package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14023,7 +14023,7 @@ self: {
          transformers unliftio-core vector xml-conduit xml-types
        ];
        description = "interface to MusicBrainz XML2 and JSON web services";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "MusicBrainz-libdiscid" = callPackage
@@ -14070,8 +14070,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        description = "Most likely order of mutation events in RNA";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14087,8 +14087,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        benchmarkHaskellDepends = [ base time ];
        description = "Generate all primes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14102,8 +14102,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14116,7 +14116,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A transparent nested Map structure";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14157,8 +14157,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time
        ];
        description = "A Haskell interface to Lego Mindstorms NXT";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bluetooth = null;};
 
@@ -14177,8 +14177,8 @@ self: {
          unordered-containers
        ];
        description = "Generate NXC Code from DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14200,7 +14200,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "NameGenerator" = callPackage
@@ -14213,7 +14213,7 @@ self: {
        editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i";
        libraryHaskellDepends = [ base containers random ];
        description = "A name generator written in Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "NanoProlog" = callPackage
@@ -14227,8 +14227,8 @@ self: {
        libraryHaskellDepends = [ base containers ListLike uu-parsinglib ];
        executableHaskellDepends = [ base uu-parsinglib ];
        description = "Very small interpreter for a Prolog-like language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14241,7 +14241,7 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim vector ];
        description = "Naperian Functors for APL-like programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "NaperianNetCDF" = callPackage
@@ -14255,8 +14255,8 @@ self: {
        libraryHaskellDepends = [ base hnetcdf Naperian vector ];
        executableHaskellDepends = [ base hnetcdf Naperian split ];
        description = "Instances of NcStore for hypercuboids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14286,8 +14286,8 @@ self: {
          mwc-random random unordered-containers vector
        ];
        description = "Simple scoring schemes for word alignments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14301,8 +14301,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring strict ];
        description = "Natural sorting for strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14320,8 +14320,8 @@ self: {
          base containers ContextAlgebra lattices multiset QuickCheck
        ];
        description = "Context Algebra of near";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14344,8 +14344,8 @@ self: {
          network stm vector
        ];
        description = "Simple networked key/value store";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14357,8 +14357,8 @@ self: {
        sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735";
        libraryHaskellDepends = [ base comonad distributive ];
        description = "Nested composition of functors with a type index tracking nesting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14370,7 +14370,7 @@ self: {
        sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv";
        libraryHaskellDepends = [ base random vector ];
        description = "A port of John Skilling's nested sampling C code to Haskell";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "NetSNMP" = callPackage
@@ -14383,8 +14383,8 @@ self: {
        librarySystemDepends = [ net_snmp ];
        testHaskellDepends = [ base bytestring HUnit process ];
        description = "Bindings for net-snmp's C API for clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {net_snmp = null;};
 
@@ -14405,7 +14405,7 @@ self: {
        ];
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "NewBinary" = callPackage
@@ -14417,7 +14417,7 @@ self: {
        libraryHaskellDepends = [ array base integer ];
        description = "A binary I/O library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {integer = null;};
 
@@ -14429,7 +14429,7 @@ self: {
        sha256 = "1k6qdp4zmqjl2f6cqy1zzzl6ncb2m9r0qgh4c24i2h5kkxmm3cab";
        libraryHaskellDepends = [ base binary ];
        description = "9P2000 in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ninjas" = callPackage
@@ -14448,8 +14448,8 @@ self: {
          networked-game random
        ];
        description = "Ninja game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14461,7 +14461,7 @@ self: {
        sha256 = "0g9vqkpcmn66922z2yqp29h4kp2n2xnz1rva294h0kh39hiklrlv";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Placeholder package to preserve debug ability via conditional builds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "NoSlow" = callPackage
@@ -14480,8 +14480,8 @@ self: {
          storablevector template-haskell uvector vector
        ];
        description = "Microbenchmarks for various array libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14494,8 +14494,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Remove all the functions come from Debug.Trace after debugging";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14507,7 +14507,7 @@ self: {
        sha256 = "0sjyq8nilqhmlhbagi1ms2zh7fyhzci9w5hj3dyxpd2ccq1bbvyq";
        libraryHaskellDepends = [ array base data-default vector ];
        description = "A Haskell coherent noise generator based on libnoise";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Nomyx" = callPackage
@@ -14526,8 +14526,8 @@ self: {
          Nomyx-Core Nomyx-Language Nomyx-Web safe stm time
        ];
        description = "A Nomic game in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14554,8 +14554,8 @@ self: {
          template-haskell temporary text time unix
        ];
        description = "A Nomic game in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14575,8 +14575,8 @@ self: {
          time-recurrence
        ];
        description = "Language to express rules for Nomic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14594,8 +14594,8 @@ self: {
          time time-recurrence
        ];
        description = "Language to express rules for Nomic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14620,8 +14620,8 @@ self: {
          web-routes-happstack web-routes-regular web-routes-th
        ];
        description = "Web gui for Nomyx";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14633,8 +14633,8 @@ self: {
        sha256 = "0nycv791c6b5bcaz5y9wm3wxn1p930p163qs1rpdiix04fnaxgxl";
        libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14651,8 +14651,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A list with a length of at least one";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14664,7 +14664,7 @@ self: {
        sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
        libraryHaskellDepends = [ base ];
        description = "Instances of numeric classes for functions and tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "NumLazyByteString" = callPackage
@@ -14675,7 +14675,7 @@ self: {
        sha256 = "17ca34hxaz9xk3ykkzp14n7wb31aiza12859k3rmvwhnq4j89jqs";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Num, Enum, Eq, Integral, Ord, Real, and Show instances for Lazy ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "NumberSieves" = callPackage
@@ -14686,8 +14686,8 @@ self: {
        sha256 = "1w8y46ivli37rlhkdrnw13qv6f0m13a88w0qkfw949b09vdp2nw2";
        libraryHaskellDepends = [ array base ];
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14700,8 +14700,8 @@ self: {
        libraryHaskellDepends = [ base containers primes ];
        testHaskellDepends = [ base containers HUnit primes ];
        description = "A library for number theoretic computations, written in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14730,8 +14730,8 @@ self: {
          ADPfusion base ghc-prim mtl primitive PrimitiveArray vector
        ];
        description = "Nussinov78 using the ADPfusion library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14743,8 +14743,8 @@ self: {
        sha256 = "1m7qx5zydz5jpk6a55k7rzchlwmkd91gsiqmn26qqn50ab3di35j";
        libraryHaskellDepends = [ base ];
        description = "A little library to calculate nutrition values of food items";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14756,8 +14756,8 @@ self: {
        sha256 = "1w8lpi2r315b4ry234gi4rq09j92zvhr9ibxwsig6544cbb5g8qm";
        libraryHaskellDepends = [ base mtl ];
        description = "A context aware binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14782,8 +14782,8 @@ self: {
        ];
        executableHaskellDepends = [ base filepath ];
        description = "ONC RPC (aka Sun RPC) and XDR library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14799,8 +14799,8 @@ self: {
          base comonad-transformers containers data-lens hxt newtype
        ];
        description = "Parse OpenStreetMap files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14820,8 +14820,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14833,8 +14833,8 @@ self: {
        sha256 = "05lrqq4008vnfs2x8kxlyrgdvxmzk04rqvn0w65b691bp3vwnbf9";
        libraryHaskellDepends = [ base containers ghc template-haskell ];
        description = "Object oriented programming for haskell using multiparameter typeclasses";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14850,8 +14850,8 @@ self: {
          comctl32 comdlg32 gdi32 kernel32 ole32 shell32 user32 winmm
          winspool
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
@@ -14865,7 +14865,7 @@ self: {
        sha256 = "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj";
        libraryHaskellDepends = [ base transformers ];
        description = "Explicitly handled object names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Obsidian" = callPackage
@@ -14882,8 +14882,8 @@ self: {
          mwc-random process rdtsc text value-supply vector
        ];
        description = "Embedded language for GPU Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Octree" = callPackage
@@ -14900,8 +14900,8 @@ self: {
          base criterion deepseq ghc-prim lens linear QuickCheck
        ];
        description = "Simple unbalanced Octree for storing data about 3D points";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14915,8 +14915,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provides a wrapper for deriving word types with fewer bits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14929,8 +14929,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14967,8 +14967,8 @@ self: {
          text text-zipper time transformers vector vty
        ];
        description = "Text UI library for performing parallel remote SSH operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -14980,7 +14980,7 @@ self: {
        sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc";
        libraryHaskellDepends = [ base ];
        description = "Singleton Tuple";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Only" = callPackage
@@ -14993,7 +14993,7 @@ self: {
        editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr";
        libraryHaskellDepends = [ base deepseq ];
        description = "The 1-tuple type or single-value \"collection\"";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "OpenAFP" = callPackage
@@ -15009,8 +15009,8 @@ self: {
          hashtables mtl process regex-compat
        ];
        description = "IBM AFP document format parser and generator";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15031,8 +15031,8 @@ self: {
          xhtml
        ];
        description = "Assorted utilities to work with AFP data streams";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15051,7 +15051,7 @@ self: {
        ];
        librarySystemDepends = [ openal ];
        description = "A binding to the OpenAL cross-platform 3D audio API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openal;};
 
   "OpenCL" = callPackage
@@ -15065,8 +15065,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell high-level wrapper for OpenCL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OpenCL = null;};
 
@@ -15078,8 +15078,8 @@ self: {
        sha256 = "1a9nlrmxp3jwc3hbj79xm35aypfby04qy01fk4vyrp19diiinl07";
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15091,8 +15091,8 @@ self: {
        sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s";
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15111,7 +15111,7 @@ self: {
          text transformers
        ];
        description = "A binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "OpenGLCheck" = callPackage
@@ -15124,8 +15124,8 @@ self: {
          base checkers haskell98 OpenGL QuickCheck
        ];
        description = "Quickcheck instances for various data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15142,7 +15142,7 @@ self: {
        ];
        librarySystemDepends = [ libGL ];
        description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
   "OpenGLRaw21" = callPackage
@@ -15154,7 +15154,7 @@ self: {
        libraryHaskellDepends = [ OpenGLRaw ];
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "OpenSCAD" = callPackage
@@ -15173,8 +15173,8 @@ self: {
          tasty tasty-hunit testpack
        ];
        description = "ADT wrapper and renderer for OpenSCAD models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15186,8 +15186,8 @@ self: {
        sha256 = "0ad96lbwcwl7vvk5vx1mmb0wj28c541jwd9nsm7l5na9qdxfhzvj";
        libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        description = "OpenVG (ShivaVG-0.2.1) binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15199,8 +15199,8 @@ self: {
        sha256 = "1fdg5b8f2x36x6gmdkazkmhqgknagd0kzr70hydygsmqbf2im5x2";
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15212,8 +15212,8 @@ self: {
        sha256 = "1b880lrzdxww3j19zspnj49ifsn89n0ac1h5xf7nn83847k8q2qk";
        libraryHaskellDepends = [ array base containers mtl ];
        description = "Groebner basis computation for Operads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15225,7 +15225,7 @@ self: {
        sha256 = "07l2fagp60ykhsr3dxclkfgg1pxawj2xf0wxrn3dksjdlx0hg5j5";
        libraryHaskellDepends = [ base hashable syb ];
        description = "The OptDir type for representing optimization directions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "OrPatterns" = callPackage
@@ -15241,8 +15241,8 @@ self: {
          template-haskell
        ];
        description = "A quasiquoter for or-patterns";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15262,8 +15262,8 @@ self: {
          random
        ];
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15283,7 +15283,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Efficient ordered (by popcount) enumeration of bits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ordinals" = callPackage
@@ -15294,7 +15294,7 @@ self: {
        sha256 = "04xk74rl2d6vp1kn197hsbkkwdvwvqpjqg3kgkpkl2i0r90y8lsi";
        libraryHaskellDepends = [ base ];
        description = "Ordinal arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ordinary" = callPackage
@@ -15309,8 +15309,8 @@ self: {
        executableHaskellDepends = [ base safe threepenny-gui ];
        testHaskellDepends = [ base safe threepenny-gui ];
        description = "A Programming Language in Construction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15326,8 +15326,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15339,7 +15339,7 @@ self: {
        sha256 = "08mkq72zv9ywp002vwjk7gl6pq6915zdd06sp4ap935aqdjrhn0p";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Arrow parser combinators similar to Parsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PBKDF2" = callPackage
@@ -15352,8 +15352,8 @@ self: {
        editedCabalFile = "0gnvhijrjj39z9y4m1ic2nys2yi3ida7yh93b9q88r6i02m2k23f";
        libraryHaskellDepends = [ base binary bytestring Crypto random ];
        description = "Make password-based security schemes more secure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15368,7 +15368,7 @@ self: {
        ];
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15386,7 +15386,7 @@ self: {
        ];
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15400,7 +15400,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        description = "A library for analysis of 3-D protein coordinates";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "PPrinter" = callPackage
@@ -15411,8 +15411,8 @@ self: {
        sha256 = "1fcvjrsq40nc2z4dg5f3bkz9h8psp89ay28k1jnwxqgh74xnylzc";
        libraryHaskellDepends = [ base containers ];
        description = "A generic derivable Haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15426,7 +15426,7 @@ self: {
        editedCabalFile = "0n1yrv1x1dxbjn9hjr8lk4k5in9c75ixzldlmszayi26bvax7329";
        libraryHaskellDepends = [ base ];
        description = "Priority Search Queue";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PTQ" = callPackage
@@ -15444,7 +15444,7 @@ self: {
        ];
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15464,8 +15464,8 @@ self: {
          random smtp-mail text time transformers
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15492,8 +15492,8 @@ self: {
          stringtable-atom utf8-string uuid
        ];
        description = "Page-oriented extraction and composition library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15512,8 +15512,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "a simple Paillier cryptosystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15534,8 +15534,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Pandoc support for literate Agda";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15560,8 +15560,8 @@ self: {
          typelevel-tensor vector
        ];
        description = "a code generator for partial differential equations solvers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15580,7 +15580,7 @@ self: {
          base hspec Parallel-Arrows-Definition split
        ];
        description = "BaseSpecs used for @Parallel-Arrows-Definition@ and Co";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Parallel-Arrows-Definition" = callPackage
@@ -15591,7 +15591,7 @@ self: {
        sha256 = "1zdsvg0nx2vnvgx9vcwq8l1kanfp056mmiscs3716lswkrvhdlbf";
        libraryHaskellDepends = [ base deepseq split ];
        description = "Multithreaded evaluation using Arrows";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Parallel-Arrows-Eden" = callPackage
@@ -15611,8 +15611,8 @@ self: {
          Parallel-Arrows-Definition QuickCheck split
        ];
        description = "Eden based backend for @Parallel-Arrows-Definition@";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15632,7 +15632,7 @@ self: {
          Parallel-Arrows-Definition split
        ];
        description = "GpH based backend for @Parallel-Arrows-Definition@ in a multicore variant";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Parallel-Arrows-ParMonad" = callPackage
@@ -15651,7 +15651,7 @@ self: {
          Parallel-Arrows-Definition split
        ];
        description = "Par Monad (@monad-par@) based backend for @Parallel-Arrows-Definition@";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Parry" = callPackage
@@ -15668,8 +15668,8 @@ self: {
          old-locale process random RSA SafeSemaphore time unix
        ];
        description = "A proven synchronization server for high performance computing";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15681,7 +15681,7 @@ self: {
        sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g";
        libraryHaskellDepends = [ base parsec ];
        description = "Parsec combinators for more complex objects";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "ParserFunction" = callPackage
@@ -15692,7 +15692,7 @@ self: {
        sha256 = "0l0j1mdycqsb5d32l7h0giwrj5yj54523gdn0bvim2vz67qrbxrq";
        libraryHaskellDepends = [ base containers parsec ];
        description = "Parse and evaluate mathematical expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PartialTypeSignatures" = callPackage
@@ -15703,7 +15703,7 @@ self: {
        sha256 = "04c01bcfrb79av2j9bivlwanmycasn7gjnc9gb5jm6gkwyvgv0h3";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        description = "emulate partial type signatures with template haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PasswordGenerator" = callPackage
@@ -15714,8 +15714,8 @@ self: {
        sha256 = "12lxylmpi2f1ahy6w1n7jmwn9kay4hajgr95xbnqqdzv4dw6whzw";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple library for generating passwords";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15730,7 +15730,7 @@ self: {
        libraryHaskellDepends = [ base cmdargs HTTP network network-uri ];
        executableHaskellDepends = [ base cmdargs ];
        description = "CLI for pasting to lpaste.net";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "PathTree" = callPackage
@@ -15746,8 +15746,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A tree used to merge and maintain paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15760,8 +15760,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libxml2;};
 
@@ -15773,7 +15773,7 @@ self: {
        sha256 = "0ss4p40gkqcw9bdh5iy0yar56gpsanrxld74q5dxvakrf8m6cqmz";
        libraryHaskellDepends = [ base ];
        description = "simple Peano numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PeanoWitnesses" = callPackage
@@ -15784,8 +15784,8 @@ self: {
        sha256 = "1g83jws23grl84gnq89rnppw6q7vsbhi9hk6lp5dq2n4818kamgg";
        libraryHaskellDepends = [ base ];
        description = "GADT type witnesses for Peano-style natural numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15802,8 +15802,8 @@ self: {
        ];
        librarySystemDepends = [ cmph ];
        description = "A perfect hashing library for mapping bytestrings to values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cmph = null;};
 
@@ -15815,8 +15815,8 @@ self: {
        sha256 = "0lmmsvqbnw0k321254xfqlzmddvymy0mj50ax7caqj2fnarfgy4l";
        libraryHaskellDepends = [ base ReplicateEffects ];
        description = "Permutations of effectful computations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15835,8 +15835,8 @@ self: {
          base containers maximal-cliques parallel vector
        ];
        description = "A versatile library for topological data analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15861,8 +15861,8 @@ self: {
          string-conversions temporary text time
        ];
        description = "Personal Happstack Server Utils";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15874,8 +15874,8 @@ self: {
        sha256 = "1453rjp5whl9vywiq8i86vjfa8ys1ppwabhvlibqwsbx804q9yhr";
        libraryHaskellDepends = [ base filepath process unix ];
        description = "Process piping library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15887,8 +15887,8 @@ self: {
        sha256 = "07rzwkhz4b6nymygrhcz07dxl8fnvfrmfpcdj9qz3mwrcyf1kp9n";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Partial isomorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15907,7 +15907,7 @@ self: {
          base containers directory mtl random regex-compat
        ];
        description = "Play Hangman Game";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PlayingCards" = callPackage
@@ -15922,8 +15922,8 @@ self: {
          base HUnit MonadRandom QuickCheck random-shuffle
        ];
        description = "Playing cards api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15945,8 +15945,8 @@ self: {
          transformers vector
        ];
        description = "Real-time line plotter for generic data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15966,8 +15966,8 @@ self: {
          process random
        ];
        description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -15979,7 +15979,7 @@ self: {
        sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w";
        libraryHaskellDepends = [ base containers regex-tdfa ];
        description = "Pluralize English words";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Pollutocracy" = callPackage
@@ -15993,7 +15993,7 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16007,8 +16007,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network splice ];
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16023,8 +16023,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
        description = "A binding for PortMedia/PortMidi";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -16036,7 +16036,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Thin wrapper over the C postgresql library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Prelude" = callPackage
@@ -16049,8 +16049,8 @@ self: {
        editedCabalFile = "14z8gv75jnvykk5naqcqqrdcx7160kzd3gnfdvx6rw4nqzsi6hw1";
        libraryHaskellDepends = [ base ];
        description = "A Prelude module replacement";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16084,7 +16084,7 @@ self: {
          vector-th-unbox
        ];
        description = "Efficient multidimensional arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "PrimitiveArray-Pretty" = callPackage
@@ -16106,8 +16106,8 @@ self: {
          test-framework-th
        ];
        description = "Pretty-printing for primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16119,7 +16119,7 @@ self: {
        sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16132,7 +16132,7 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16144,8 +16144,8 @@ self: {
        sha256 = "0vmjg91yq4p0121ypjx4l1hh77j8xj6ha7awdvrjk5fjmz9xryh3";
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16160,7 +16160,7 @@ self: {
        libraryHaskellDepends = [ base old-time random ];
        executableHaskellDepends = [ base old-time random ];
        description = "Propositional Logic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Proper" = callPackage
@@ -16174,8 +16174,8 @@ self: {
        libraryHaskellDepends = [ base containers syb ];
        executableHaskellDepends = [ base containers HUnit parsec syb ];
        description = "An implementation of propositional logic in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16187,7 +16187,7 @@ self: {
        sha256 = "0mx3kgkcbhppz2p6g8vb9yx27219ca2w7k36j60vfhszni1c4gid";
        libraryHaskellDepends = [ base mtl ];
        description = "Proximity sets in N dimensions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Pugs" = callPackage
@@ -16211,8 +16211,8 @@ self: {
          random stm stringtable-atom text time utf8-string
        ];
        description = "A Perl 6 Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16232,8 +16232,8 @@ self: {
        executableHaskellDepends = [ base ];
        doHaddock = false;
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16249,7 +16249,7 @@ self: {
          base network parsec Pup-Events-PQueue stm transformers
        ];
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Pup-Events-Demo" = callPackage
@@ -16267,8 +16267,8 @@ self: {
          Pup-Events-Server stm
        ];
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16280,7 +16280,7 @@ self: {
        sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx";
        libraryHaskellDepends = [ base stm ];
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Pup-Events-Server" = callPackage
@@ -16295,8 +16295,8 @@ self: {
          base network parsec Pup-Events-PQueue stm transformers
        ];
        description = "A networked event handling framework for hooking into other programs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16319,8 +16319,8 @@ self: {
          process template-haskell temporary text
        ];
        description = "Quasiquotations for a python like interpolated string formater";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16332,8 +16332,8 @@ self: {
        sha256 = "19xbnqm90b1wsxbjhjm1q1mld0rv4p6ga1chzl4i00yccpwsh7g8";
        libraryHaskellDepends = [ base containers mtl old-time random ];
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16345,8 +16345,8 @@ self: {
        sha256 = "0vbkvc0d7j4awvdiqs0kgz3fa9m0991zlzhs3w7rxi8if2crkn47";
        libraryHaskellDepends = [ base random vector ];
        description = "A library for fast, easy-to-use Q-learning";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16358,8 +16358,8 @@ self: {
        sha256 = "1f3wxc8ipb8ka02xq2snjs5wgl10mk528zjkpwdw5wf3fldhz037";
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16372,8 +16372,8 @@ self: {
        libraryHaskellDepends = [ base composition lens ];
        testHaskellDepends = [ base composition lens QuickCheck ];
        description = "QuadTree library for Haskell, with lens support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16390,7 +16390,7 @@ self: {
          th-lift-instances
        ];
        description = "A QuasiQuoter for Text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Quelea" = callPackage
@@ -16409,8 +16409,8 @@ self: {
          time transformers tuple unix uuid z3 zeromq4-haskell
        ];
        description = "Programming with Eventual Consistency over Cassandra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16425,8 +16425,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Annotation Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16444,7 +16444,7 @@ self: {
        ];
        testHaskellDepends = [ base deepseq process ];
        description = "Automatic testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "QuickCheck-GenT" = callPackage
@@ -16455,7 +16455,7 @@ self: {
        sha256 = "0bn594bgvavbphm5543kqljcc7hgxk4ir0fcdjw399sbfaxpn5yz";
        libraryHaskellDepends = [ base mtl QuickCheck random ];
        description = "A GenT monad transformer for QuickCheck library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "QuickCheck-safe" = callPackage
@@ -16468,7 +16468,7 @@ self: {
        editedCabalFile = "0my9s0kcxkizbfckb35l5hyr1pmhx32l2lviy7zqh93mlmv9ig4s";
        libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "QuickCheckVariant" = callPackage
@@ -16480,8 +16480,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16505,8 +16505,8 @@ self: {
          websockets-snap
        ];
        description = "Quick and easy data visualization with Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16521,8 +16521,8 @@ self: {
          aeson attoparsec base bytestring either text
        ];
        description = "Quick JSON extractions with Aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16540,8 +16540,8 @@ self: {
          base directory filepath pandoc-types process split
        ];
        executableHaskellDepends = [ base pandoc-types ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16558,7 +16558,7 @@ self: {
          base HUnit lens linear test-framework test-framework-hunit vector
        ];
        description = "The RANSAC algorithm for parameter estimation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "RBTree" = callPackage
@@ -16569,7 +16569,7 @@ self: {
        sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq";
        libraryHaskellDepends = [ base ];
        description = "Pure haskell Red-Black-Tree implemetation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "RESTng" = callPackage
@@ -16586,7 +16586,7 @@ self: {
        ];
        description = "A framework for writing RESTful applications";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "RFC1751" = callPackage
@@ -16602,7 +16602,7 @@ self: {
          base bytestring cereal hspec QuickCheck vector
        ];
        description = "RFC-1751 library for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "RJson" = callPackage
@@ -16617,8 +16617,8 @@ self: {
          array base bytestring containers iconv mtl parsec syb-with-class
        ];
        description = "A reflective JSON serializer/parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16631,8 +16631,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16653,8 +16653,8 @@ self: {
        ];
        executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {canlib = null; ftd2xx = null;};
 
@@ -16677,8 +16677,8 @@ self: {
          base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs
        ];
        description = "RNA secondary structure prediction";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16698,8 +16698,8 @@ self: {
          containers HsTools primitive PrimitiveArray RNAFold split vector
        ];
        description = "RNA secondary structure folding";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16725,8 +16725,8 @@ self: {
        ];
        executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16746,8 +16746,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "Draw RNA secondary structures";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16780,8 +16780,8 @@ self: {
          text time vector ViennaRNAParser
        ];
        description = "Unsupervized construction of RNA family models";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16802,8 +16802,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs split ];
        description = "RNA folding with non-canonical basepairs and base-triplets";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16824,7 +16824,7 @@ self: {
          SHA tagged test-framework test-framework-quickcheck2
        ];
        description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "RSolve" = callPackage
@@ -16838,7 +16838,7 @@ self: {
        libraryHaskellDepends = [ base containers lens mtl ];
        executableHaskellDepends = [ base containers lens mtl ];
        testHaskellDepends = [ base containers lens mtl ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "RabbitMQ" = callPackage
@@ -16859,7 +16859,7 @@ self: {
        ];
        description = "AMQP 0-9-1 client library for RabbitMQ servers";
        license = "BSD-3-Clause AND GPL-3.0-or-later";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16879,8 +16879,8 @@ self: {
          sdl2-image sdl2-mixer time
        ];
        description = "A puzzle game written in Haskell with a cat in lead role";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Random123" = callPackage
@@ -16899,7 +16899,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Haskell port of Random123 library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "RandomDotOrg" = callPackage
@@ -16910,8 +16910,8 @@ self: {
        sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c";
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16925,7 +16925,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random-fu ];
        description = "Randomness intuition trainer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Range" = callPackage
@@ -16936,8 +16936,8 @@ self: {
        sha256 = "0759508s75zba89jjr56sqpm7idgwsxynmf9zl9hwrz9q11fxrqh";
        libraryHaskellDepends = [ base ];
        description = "Data structure for managing ranges";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16952,7 +16952,7 @@ self: {
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "Ranged sets for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Ranka" = callPackage
@@ -16969,7 +16969,7 @@ self: {
        ];
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -16990,8 +16990,8 @@ self: {
          filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa
        ];
        description = "Soccer simulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17009,7 +17009,7 @@ self: {
          primitive transformers vector vector-algorithms
        ];
        description = "A pure haskell drawing engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Rattus" = callPackage
@@ -17026,7 +17026,7 @@ self: {
        ];
        testHaskellDepends = [ base containers ];
        description = "A modal FRP language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ReadArgs" = callPackage
@@ -17041,7 +17041,7 @@ self: {
        executableHaskellDepends = [ base system-filepath text ];
        testHaskellDepends = [ base hspec system-filepath text ];
        description = "Simple command line argument parsing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Redmine" = callPackage
@@ -17064,8 +17064,8 @@ self: {
          transformers
        ];
        description = "Library to access Redmine's REST services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17077,8 +17077,8 @@ self: {
        sha256 = "15qikbjbydbabc26skhavshzrsaz17a71q8hfxqvi5ix2bhhz4hm";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17094,7 +17094,7 @@ self: {
          base binary bytestring containers hashtables stringsearch
        ];
        description = "Write to and read from ByteStrings maintaining internal memory references";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Referees" = callPackage
@@ -17114,8 +17114,8 @@ self: {
          base cmdargs cond containers directory
        ];
        description = "A utility for computing distributions of material to review among reviewers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17131,8 +17131,8 @@ self: {
          base containers mtl template-haskell transformers
        ];
        description = "Generic programming library with representation types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17144,8 +17144,8 @@ self: {
        sha256 = "194nbnbrf5g3d2pch6z9zapzhi0i2z30vpgjj0h5x8bfwzpf1527";
        libraryHaskellDepends = [ base ];
        description = "Composable replication schemes of applicative functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17164,8 +17164,8 @@ self: {
          base directory HTTP json mtl network process random
        ];
        description = "Haskell bindings to ReviewBoard";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17177,8 +17177,8 @@ self: {
        sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw";
        libraryHaskellDepends = [ base ];
        description = "Tiny library to replace classic if/else";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17207,8 +17207,8 @@ self: {
          algebra base criterion deepseq massiv scheduler sscript
        ];
        description = "Parallel implementation of Ritt-Wu's algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17232,8 +17232,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest hspec lens vector ];
        description = "quasiquoter for inline-R code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17258,8 +17258,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Limits the size of a directory's contents";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17271,7 +17271,7 @@ self: {
        sha256 = "1gixw6793i4bcf1fsawfqdgvib5q7b1972fi0prrcwq7cp7nrgwr";
        libraryHaskellDepends = [ base ];
        description = "All hail the Royal Monad!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "RtMidi" = callPackage
@@ -17289,8 +17289,8 @@ self: {
        executableHaskellDepends = [ base pretty-simple vector ];
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) alsaLib;};
 
@@ -17302,8 +17302,8 @@ self: {
        sha256 = "0pwxsvkpdr4vzr6cpgjmkr55ip6ns3gcv8pma7dwzg21myx9c3vl";
        libraryHaskellDepends = [ base containers stm transformers ];
        description = "Reactive Extensions for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17324,8 +17324,8 @@ self: {
          Prelude text text-short time X
        ];
        description = "Library for accessing S3 compatible storage services";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17343,8 +17343,8 @@ self: {
          gnuplot hp2any-core parsec process utf8-string vector
        ];
        description = "A benchmark suite for runtime and heap measurements over a series of inputs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17364,8 +17364,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "ESCRIPT: a human friendly language for programming Bitcoin scripts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17382,8 +17382,8 @@ self: {
          base containers hspec QuickCheck scalendar text time
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17398,7 +17398,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
@@ -17412,7 +17412,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_gfx ];
        description = "Binding to libSDL_gfx";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL_gfx;};
 
   "SDL-image" = callPackage
@@ -17426,7 +17426,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_image ];
        description = "Binding to libSDL_image";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL_image;};
 
   "SDL-mixer" = callPackage
@@ -17440,7 +17440,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL_mixer;};
 
   "SDL-mpeg" = callPackage
@@ -17453,7 +17453,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
@@ -17467,7 +17467,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL_ttf;};
 
   "SDL2-ttf" = callPackage
@@ -17479,8 +17479,8 @@ self: {
        libraryHaskellDepends = [ base SDL2 ];
        librarySystemDepends = [ SDL2_ttf ];
        description = "Binding to libSDL-ttf";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {SDL2 = null; inherit (pkgs) SDL2_ttf;};
 
@@ -17499,8 +17499,8 @@ self: {
          sfml-audio sfml-graphics sfml-network sfml-system sfml-window
        ];
        description = "SFML bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {csfml-audio = null; csfml-graphics = null; 
          csfml-network = null; csfml-system = null; csfml-window = null; 
@@ -17515,8 +17515,8 @@ self: {
        sha256 = "001h9y9395mz6fr58s1i8svn4pyy5iqbkzzsp19xdphh4w69za9g";
        libraryHaskellDepends = [ base mtl SFML template-haskell ];
        description = "Higher level library on top of SFML";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17528,8 +17528,8 @@ self: {
        sha256 = "077yvys00kp8lmkvc4mbynmkk9nn2ib5rh38bqcw0wnwsvl7140i";
        libraryHaskellDepends = [ array base SDL Sprig ];
        description = "SFont SDL Bitmap Fonts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17541,8 +17541,8 @@ self: {
        sha256 = "0aj15lp5wbldaa9ndfvni1iq7kcrjv1syln9yz77jg6p8ndk61jv";
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17557,7 +17557,7 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL SG ];
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17569,8 +17569,8 @@ self: {
        sha256 = "1qwrhb7nw22v7j6d9x3a1ps9l7mjpwjy13zxssmimwfhbch055v3";
        libraryHaskellDepends = [ base mtl ];
        description = "(updated) Small geometry library for dealing with vectors and collision detection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17590,7 +17590,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Implementations of the SHA suite of message digest functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SHA2" = callPackage
@@ -17603,7 +17603,7 @@ self: {
          AES base bytestring monads-tf transformers
        ];
        description = "Fast, incremental SHA hashing for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SJW" = callPackage
@@ -17626,8 +17626,8 @@ self: {
        testHaskellDepends = [ base Cabal directory filepath random ];
        benchmarkHaskellDepends = [ base directory filepath random time ];
        description = "The Simple Javascript Wrench";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17644,8 +17644,8 @@ self: {
          old-time
        ];
        description = "A simple SMTP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17662,8 +17662,8 @@ self: {
        ];
        libraryToolDepends = [ c2hsc ];
        description = "Declarative coördination language for streaming networks";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17679,7 +17679,7 @@ self: {
          base hashable HDBC HDBC-sqlite3 mtl unordered-containers
        ];
        description = "Calculate db-data dependencies of functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SSTG" = callPackage
@@ -17694,8 +17694,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers ];
        description = "STG Symbolic Execution";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17707,8 +17707,8 @@ self: {
        sha256 = "18bz9qxsl7lq3j18ilczi175j3djwlpckzj5a65l4dj7d1sw1c35";
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        description = "STL 3D geometry format parsing and pretty-printing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17724,8 +17724,8 @@ self: {
          base binary bytestring transformers usb vector
        ];
        description = "STLink USB interface in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17742,8 +17742,8 @@ self: {
          transformers
        ];
        description = "control a STM32F103 microcontroller";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17755,7 +17755,7 @@ self: {
        sha256 = "0m6vvj4mfmmn1r21aglwdb6801bwr0ks60vbwz7y1cb97vsdad9v";
        libraryHaskellDepends = [ base ];
        description = "Definition for Peripherals,Registers and Fields from STM32F103xx.svd";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "STMonadTrans" = callPackage
@@ -17771,7 +17771,7 @@ self: {
          array base tasty tasty-hunit tasty-quickcheck transformers
        ];
        description = "A monad transformer version of the ST monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SVD2HS" = callPackage
@@ -17786,8 +17786,8 @@ self: {
          base containers pretty text xml-conduit xml-lens
        ];
        description = "translate a SVD of a Microcontroller to Haskell tables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17805,8 +17805,8 @@ self: {
          base haskell98 language-c pretty svgutils syb xml
        ];
        description = "Code generation tool for Quartz code from a SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17827,8 +17827,8 @@ self: {
          diagrams-lib directory parsec split text vector xml
        ];
        description = "Fonts from the SVG-Font format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17840,7 +17840,7 @@ self: {
        sha256 = "1a4rmp1rn6jv8nkab688i146ywiv4w6fp5bpm0slwgda2x0h6lp4";
        libraryHaskellDepends = [ base parsec ];
        description = "Parsing the path command of SVG";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SWMMoutGetMB" = callPackage
@@ -17856,7 +17856,7 @@ self: {
          pipes-bytestring pipes-parse split
        ];
        description = "A parser for SWMM 5 binary .OUT files";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "SableCC2Hs" = callPackage
@@ -17875,8 +17875,8 @@ self: {
          wl-pprint-text xml
        ];
        description = "Generate a parser (in Haskell) with the SableCC parser generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17888,7 +17888,7 @@ self: {
        sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623";
        libraryHaskellDepends = [ base ];
        description = "Library for safe (pattern match free) functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SafeSemaphore" = callPackage
@@ -17902,7 +17902,7 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ base HUnit ];
        description = "Much safer replacement for QSemN, QSem, and SampleVar";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Salsa" = callPackage
@@ -17914,8 +17914,8 @@ self: {
        libraryHaskellDepends = [ base bytestring file-embed ];
        librarySystemDepends = [ glib mono ];
        description = "A .NET Bridge for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
@@ -17939,8 +17939,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base data-default either hlint hspec mtl ];
        description = "Saturnin CI / Job System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17969,8 +17969,8 @@ self: {
          semirings vector vector-th-unbox
        ];
        description = "Base types and classes for statistics, sciences and humanities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -17995,8 +17995,8 @@ self: {
          text th-lift-instances time unordered-containers
        ];
        description = "Scientific workflow management system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18013,8 +18013,8 @@ self: {
          random SciFlow stm unordered-containers
        ];
        description = "Scientific workflow management system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18033,8 +18033,8 @@ self: {
          regex-compat sqlite-simple unix
        ];
        description = "Size limited temp filesystem based on fuse";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18053,8 +18053,8 @@ self: {
          random stm time unix
        ];
        description = "A cross platform P2P VPN application built using Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18068,8 +18068,8 @@ self: {
        editedCabalFile = "0rvalvvjadb0i0rh9z5lgw2hca4a9yw3cg2f6gcx7h30f5dp8x1j";
        libraryHaskellDepends = [ base bytestring ];
        description = "simple static linked SHA3 using private symbols and the ref impl";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18083,7 +18083,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Data structure for querying the set (or count) of intervals covering given point";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SelectSequencesFromMSA" = callPackage
@@ -18107,8 +18107,8 @@ self: {
          base cmdargs directory either-unwrap
        ];
        description = "Selects a representative subset of sequences from multiple sequence alignment";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18127,8 +18127,8 @@ self: {
          split tagsoup text
        ];
        description = "Command-line tool for maintaining the Semantique database";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18140,8 +18140,8 @@ self: {
        sha256 = "1mdw1z50gr02j5hycki5rl95b1yk7xfrdk056ajw9ghw48s0jpx6";
        libraryHaskellDepends = [ base bytestring containers mtl ];
        description = "A semigroup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18153,8 +18153,8 @@ self: {
        sha256 = "0vk63ni1a93win8if032nps5y0xi245cmjqq2j4xfsdddg5bdln5";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18170,8 +18170,8 @@ self: {
          base directory filepath hslogger mtl old-locale random time
        ];
        description = "Easy Loggingframework";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18185,8 +18185,8 @@ self: {
        testHaskellDepends = [ base containers util ];
        benchmarkHaskellDepends = [ base containers gauge util ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18214,7 +18214,7 @@ self: {
          filepath mtl parsec QuickCheck regex-tdfa
        ];
        description = "Shell script analysis tool";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Shellac" = callPackage
@@ -18227,8 +18227,8 @@ self: {
        editedCabalFile = "1nq7j00vfrhfzkbsgr6j28zr339gx5bcvq6x9mvh9qvs2jmcdz1z";
        libraryHaskellDepends = [ base directory mtl unix ];
        description = "A framework for creating shell envinronments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18242,8 +18242,8 @@ self: {
        editedCabalFile = "0ws8prjzj4j9yf1mqdnvlpv367cx4wfqa5jq5n6x7g9npwmd5ya0";
        libraryHaskellDepends = [ base Shellac Shellac-readline ];
        description = "\"compatline\" backend module for Shellac";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18257,8 +18257,8 @@ self: {
        editedCabalFile = "1wyal7nqnl5sj74d9mid2dw35d37b40v132cg3zhw9ys24k0jl6v";
        libraryHaskellDepends = [ base editline Shellac ];
        description = "Editline backend module for Shellac";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18270,8 +18270,8 @@ self: {
        sha256 = "0lhm2j8gl2vk4qasb2d6ips6qnvb4bg0mpb7mczqhahzq3i38sh4";
        libraryHaskellDepends = [ base haskeline mtl Shellac ];
        description = "Haskeline backend module for Shellac";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18285,8 +18285,8 @@ self: {
        editedCabalFile = "019p7q1nmi2v7rb1rjnch4zaz506c4ry28mkivhkqiq3ay1m86hs";
        libraryHaskellDepends = [ base readline Shellac ];
        description = "Readline backend module for Shellac";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18307,8 +18307,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        description = "grammars for TSP and SHP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18320,7 +18320,7 @@ self: {
        sha256 = "1nq4i4h43nfh86f6wgwng1ps6mcdl1ba96x9wsjl3qzn3blavyfh";
        libraryHaskellDepends = [ base ];
        description = "Show for * -> *";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle" = callPackage
@@ -18337,7 +18337,7 @@ self: {
          transformers unliftio wai wai-app-static warp
        ];
        description = "A programming model for declarative, high performance user interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle-backend-pardiff" = callPackage
@@ -18355,8 +18355,8 @@ self: {
          transformers-base unliftio
        ];
        description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18374,8 +18374,8 @@ self: {
          Shpadoinkle text transformers-base unliftio
        ];
        description = "Use the high-performance Snabbdom virtual dom library written in JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18387,8 +18387,8 @@ self: {
        sha256 = "0kxfsm4g6mwwcrpq8bm83v32jpp97bsvl6ay0ynnmss0yf70ymmi";
        libraryHaskellDepends = [ base compactable Shpadoinkle text ];
        description = "A backend for rendering Shpadoinkle as Text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18400,7 +18400,7 @@ self: {
        sha256 = "0zkiv0h37a3x3569xfvfzdy0dywxhcfx12jddqf9bpfyqsxmf42a";
        libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ];
        description = "Support for the native browser console";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle-debug" = callPackage
@@ -18411,7 +18411,7 @@ self: {
        sha256 = "1yvr3d40aa6sl3gpyr24a5hij63jm2p0jrx0kac7asjihvd6fk2g";
        libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ];
        description = "Debugging tools for Shpadoinkle applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle-developer-tools" = callPackage
@@ -18434,8 +18434,8 @@ self: {
          Shpadoinkle-backend-pardiff Shpadoinkle-html stm text time unliftio
        ];
        description = "Chrome extension to aide in development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18454,8 +18454,8 @@ self: {
          unliftio
        ];
        description = "Shpadoinkle as a static site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18487,8 +18487,8 @@ self: {
          sqlite-simple stm text unliftio wai wai-app-static warp
        ];
        description = "Example usages of Shpadoinkle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18507,8 +18507,8 @@ self: {
          time transformers unliftio
        ];
        description = "A typed, template generated Html DSL, and helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18520,7 +18520,7 @@ self: {
        sha256 = "1310ipmw2z8gdnvaqx1bydvc4p1iyhc7xv31vwbx2aszhmi873kq";
        libraryHaskellDepends = [ base lens Shpadoinkle text ];
        description = "Lens combinators for Shpadoinkle applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shpadoinkle-router" = callPackage
@@ -18543,8 +18543,8 @@ self: {
          Shpadoinkle-backend-static text unliftio wai wai-app-static warp
        ];
        description = "A single page application rounter for Shpadoinkle based on Servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18568,8 +18568,8 @@ self: {
          quickcheck-classes-base
        ];
        description = "A collection of common reusable types and components";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18581,7 +18581,7 @@ self: {
        sha256 = "105rnyrqzagfgbfdxbdx4wqhvdfxkd8d5jaxkyqd1zyvf0chi858";
        libraryHaskellDepends = [ base ];
        description = "4-way trie fuzzy search";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Shu-thing" = callPackage
@@ -18594,7 +18594,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT ];
        description = "A vector shooter game";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SimpleAES" = callPackage
@@ -18605,7 +18605,7 @@ self: {
        sha256 = "0s85xgwrhldyr2w3kcn9f72yjajmpz3d4dizq9p9z97rx4qva4vj";
        libraryHaskellDepends = [ base binary bytestring mwc-random ];
        description = "Fast AES encryption/decryption for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SimpleEA" = callPackage
@@ -18618,7 +18618,7 @@ self: {
          base mersenne-random-pure64 MonadRandom
        ];
        description = "Simple evolutionary algorithm framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "SimpleGL" = callPackage
@@ -18632,8 +18632,8 @@ self: {
          base GLFW JuicyPixels OpenGL SimpleH vector
        ];
        description = "A Simple Graphics Library from the SimpleH framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18651,7 +18651,7 @@ self: {
        ];
        description = "A light, clean and powerful Haskell utility library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "SimpleLog" = callPackage
@@ -18670,8 +18670,8 @@ self: {
          template-haskell text th-lift time transformers transformers-base
        ];
        description = "Simple, configurable logging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18692,8 +18692,8 @@ self: {
          base cmdargs dyre transformers wai-routes warp
        ];
        description = "A simple static file server, for when apache is overkill";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18706,7 +18706,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base Cabal ];
        description = "Simple table generator";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Sit" = callPackage
@@ -18727,7 +18727,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Prototypical type checker for Type Theory with Sized Natural Numbers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "SizeCompare" = callPackage
@@ -18754,8 +18754,8 @@ self: {
        ];
        testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18771,8 +18771,8 @@ self: {
          base containers DifferenceLogic FirstOrderTheory HUnit Proper
        ];
        description = "A tiny, lazy SMT solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18784,8 +18784,8 @@ self: {
        sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1";
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Library for parsing SMTLIB2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18808,8 +18808,8 @@ self: {
        executableSystemDepends = [ zip ];
        executableToolDepends = [ cpphs ];
        description = "E-library directory based on FUSE virtual file system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zip;};
 
@@ -18826,8 +18826,8 @@ self: {
          transformers
        ];
        description = "Abstract full system simulator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18847,8 +18847,8 @@ self: {
          random zlib
        ];
        description = "Football simulation framework for teaching functional programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18868,8 +18868,8 @@ self: {
          SoccerFun
        ];
        description = "OpenGL UI for the SoccerFun framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18882,8 +18882,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Sonnex is an alternative to Soundex for french language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18903,7 +18903,7 @@ self: {
        ];
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18921,7 +18921,7 @@ self: {
          JuicyPixels OpenAL OpenGL vector Win32
        ];
        description = "Assorted utility modules";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "SpaceInvaders" = callPackage
@@ -18936,8 +18936,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base HGL random Yampa ];
        description = "Video game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18959,8 +18959,8 @@ self: {
          text
        ];
        description = "Simple space pirate roguelike";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18972,8 +18972,8 @@ self: {
        sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2";
        libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        description = "Lock free Spin Counter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -18987,7 +18987,7 @@ self: {
          attoparsec base extra mtl mwc-random text
        ];
        description = "Random text generation based on spintax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Spock" = callPackage
@@ -19012,8 +19012,8 @@ self: {
          unordered-containers vault wai wai-extra
        ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19025,7 +19025,7 @@ self: {
        sha256 = "1wqbq8vgq5sifybw32prkmcjwm2dqz4z3sv8ci4s603a2sril7h7";
        libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Spock-api-ghcjs" = callPackage
@@ -19040,8 +19040,8 @@ self: {
          aeson base bytestring ghcjs-base hvect Spock-api text
        ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19053,7 +19053,7 @@ self: {
        sha256 = "0ra8y036vilsb75jb0lsfbdraygz6jm7b5l9002n7ixypbp2adya";
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Spock-auth" = callPackage
@@ -19064,8 +19064,8 @@ self: {
        sha256 = "1vcrl5dqjn0ri9ybza2yv80xvbv2iwrz5hj5rbhgy6i803ixlpx0";
        libraryHaskellDepends = [ base http-types Spock text time ];
        description = "Provides authentification helpers for Spock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19094,7 +19094,7 @@ self: {
          unordered-containers wai
        ];
        description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Spock-digestive" = callPackage
@@ -19110,7 +19110,7 @@ self: {
          unordered-containers wai
        ];
        description = "Digestive functors support for Spock";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Spock-lucid" = callPackage
@@ -19121,8 +19121,8 @@ self: {
        sha256 = "15r3vk78vbhqi09liq0a3zabya845zfmblqahgw6r2jjx49da9ii";
        libraryHaskellDepends = [ base lucid Spock transformers ];
        description = "Lucid support for Spock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19140,8 +19140,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HTF stm vector ];
        description = "Background workers for Spock";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19153,7 +19153,7 @@ self: {
        sha256 = "14d3fk0cal0svb2clbhbbk48fygwvb0k01aawfm72576mrz9mb18";
        libraryHaskellDepends = [ base xml ];
        description = "Write support for Excel's SpreadsheetML format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Sprig" = callPackage
@@ -19164,8 +19164,8 @@ self: {
        sha256 = "06jxs1hc69viv38nvafhn8ilj3xn2j9k543abgd8p69gc95w1lbn";
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to Sprig";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19179,7 +19179,7 @@ self: {
        editedCabalFile = "1n4zyl9iagzjx3i3zb5w24mf5x51nwwnnzrrc1rgkflvxlirm9md";
        libraryHaskellDepends = [ base deepseq nats stm ];
        description = "Stack data structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Stasis" = callPackage
@@ -19193,8 +19193,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
        description = "A simple MVCC like library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19206,7 +19206,7 @@ self: {
        sha256 = "12qg01aksbnc7cdh01y4z4jwrrhhwcakc9gh6ywxhq1bj591a9pf";
        libraryHaskellDepends = [ base stm transformers ];
        description = "State variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "StateVar-transformer" = callPackage
@@ -19217,7 +19217,7 @@ self: {
        sha256 = "1dbpxwjz6yf4ap20wm5ngvd0i0knkjsdahmd90ymddqj82v8w3d0";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "State variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "StatisticalMethods" = callPackage
@@ -19228,7 +19228,7 @@ self: {
        sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6";
        libraryHaskellDepends = [ base statistics tuple vector ];
        description = "Collection of useful statistical methods";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "StockholmAlignment" = callPackage
@@ -19244,8 +19244,8 @@ self: {
          vector
        ];
        description = "Libary for Stockholm aligmnent format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19261,8 +19261,8 @@ self: {
          base binary bytestring network time utf8-string
        ];
        description = "Client library for Stomp brokers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19274,8 +19274,8 @@ self: {
        sha256 = "1cicz4d5kyl9j4y3p79m3fk56vcqk3220a6y536dw525x6180dzw";
        libraryHaskellDepends = [ base containers ];
        description = "An abstract data type designed for the exchange of tree-like data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19295,8 +19295,8 @@ self: {
          Strafunski-StrategyLib template-haskell
        ];
        description = "Converts SDF to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19310,8 +19310,8 @@ self: {
        editedCabalFile = "1g9ksfgcz8fjasn78zq7w1yw9wk87i4gd5i0pf31gnf4l3963yz8";
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19329,8 +19329,8 @@ self: {
        ];
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        description = "General purpose templates in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19342,7 +19342,7 @@ self: {
        sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk";
        libraryHaskellDepends = [ base mtl ];
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Stream" = callPackage
@@ -19353,7 +19353,7 @@ self: {
        sha256 = "1l87l0kl4awzdyx6b28npwy6xf03r39d89iharsh06zgnd4y42wr";
        libraryHaskellDepends = [ base lazysmallcheck QuickCheck ];
        description = "A library for manipulating infinite lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "StrictBench" = callPackage
@@ -19366,7 +19366,7 @@ self: {
        libraryHaskellDepends = [ base benchpress parallel ];
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19385,8 +19385,8 @@ self: {
          base deepseq generics-sop HUnit QuickCheck
        ];
        description = "StrictCheck: Keep Your Laziness In Check";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19398,7 +19398,7 @@ self: {
        sha256 = "1wbixjgzad3s9jj16kl0gvwg82g3hqvkag9wr5j58w98a4qyqw8i";
        libraryHaskellDepends = [ base ];
        description = "String manipulation utilities";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "SuffixStructures" = callPackage
@@ -19424,8 +19424,8 @@ self: {
          base bytestring cmdargs criterion deepseq mwc-random vector
        ];
        description = "Suffix array construction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19442,7 +19442,7 @@ self: {
        ];
        description = "Library which aids constructing generic (SYB3-based) widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19460,7 +19460,7 @@ self: {
        ];
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19481,8 +19481,8 @@ self: {
          pretty statistics template-haskell time vector
        ];
        description = "Sybase 15 sysmon reports processor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19503,8 +19503,8 @@ self: {
          base Cabal directory filepath process unix
        ];
        description = "Testing By Convention";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19521,8 +19521,8 @@ self: {
          mtl numeric-tools parallel
        ];
        description = "Utilities for condensed matter physics tight binding calculations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19539,7 +19539,7 @@ self: {
          RefSerialize stm text
        ];
        description = "A Transactional cache with user-defined persistence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "THEff" = callPackage
@@ -19550,7 +19550,7 @@ self: {
        sha256 = "0rpjd93lsqg3dqfjndm9l1nzyrbfs5nnvc61lmbmbhg0bcy0jms8";
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH implementation of effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TORCS" = callPackage
@@ -19572,7 +19572,7 @@ self: {
        executableHaskellDepends = [ base bytestring Yampa ];
        description = "Bindings to the TORCS vehicle simulator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19595,8 +19595,8 @@ self: {
        sha256 = "0vz9j5vjypnkbzld18f6kczfj54disf43x5052s4n7gqzsjxpxvb";
        libraryHaskellDepends = [ base DeepArrow TypeCompose ];
        description = "Tangible Values -- composable interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19612,8 +19612,8 @@ self: {
          array base containers mtl template-haskell transformers
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19629,7 +19629,7 @@ self: {
          base containers HaXml mtl pretty template-haskell
        ];
        description = "Ferry Table Algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Tables" = callPackage
@@ -19642,8 +19642,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base cookbook ];
        description = "A client for Quill databases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19657,8 +19657,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec xhtml ];
        description = "Tool to render CSV into tables of various formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19678,7 +19678,7 @@ self: {
          mtl optparse-applicative text
        ];
        description = "Tahin Password Generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Tainted" = callPackage
@@ -19689,7 +19689,7 @@ self: {
        sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb";
        libraryHaskellDepends = [ base mtl ];
        description = "Tainted type, and associated operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Takusen" = callPackage
@@ -19702,8 +19702,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19715,8 +19715,8 @@ self: {
        sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp";
        libraryHaskellDepends = [ base comonad distributive Stream ];
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19735,8 +19735,8 @@ self: {
          xmonad-contrib
        ];
        description = "A collection of tools which can be used to access taskwarrior from xmonad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19752,8 +19752,8 @@ self: {
          aeson base bytestring either-unwrap fgl parsec text vector
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19773,8 +19773,8 @@ self: {
          EntrezHTTP fgl hxt parsec process Taxonomy text vector
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19803,8 +19803,8 @@ self: {
          template-haskell text
        ];
        description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19820,8 +19820,8 @@ self: {
          array base containers mtl SDL SDL-image SDL-mixer SFont Sprig
        ];
        description = "TeaHS Game Creation Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19833,7 +19833,7 @@ self: {
        sha256 = "0kyg43ah15fpvy8gypacimjnhb7j250jqksg6w5znz57fg0rari4";
        libraryHaskellDepends = [ base ];
        description = "Tensor data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TernaryTrees" = callPackage
@@ -19847,7 +19847,7 @@ self: {
        libraryHaskellDepends = [ base binary ];
        executableHaskellDepends = [ base ];
        description = "Efficient pure ternary tree Sets and Maps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TestExplode" = callPackage
@@ -19865,7 +19865,7 @@ self: {
          process text
        ];
        description = "Generates testcases from program-snippets";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "Theora" = callPackage
@@ -19877,7 +19877,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ogg = null; theora = null;};
 
@@ -19889,8 +19889,8 @@ self: {
        sha256 = "0fl6pk2vp765gyzc4afjdg0lgbnh5v08gfbp0kzny4ng25bmxqwa";
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19902,7 +19902,7 @@ self: {
        sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz";
        libraryHaskellDepends = [ base ];
        description = "Mutable objects that reside in their own threads";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Thrift" = callPackage
@@ -19919,7 +19919,7 @@ self: {
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Tic-Tac-Toe" = callPackage
@@ -19932,7 +19932,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base safe ];
        description = "Tic Tac Toe in your command line!";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "TicTacToe" = callPackage
@@ -19948,8 +19948,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A sub-project (exercise) for a functional programming course";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19961,7 +19961,7 @@ self: {
        sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik";
        libraryHaskellDepends = [ base binary bytestring dataenc ];
        description = "TigerHash with C implementation";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "TimePiece" = callPackage
@@ -19984,8 +19984,8 @@ self: {
          SDL-ttf
        ];
        description = "A simple tile-based digital clock screen saver";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -19997,8 +19997,8 @@ self: {
        sha256 = "1xxadd8pqbgl0z8vrqn8fm6x0c9l2y3a7irjmjkh9750x6hdb4b9";
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20010,8 +20010,8 @@ self: {
        sha256 = "0y8bl6w3ix2zjhm10wazgi70sr02ydc3hrwjbr6whk341n140wsh";
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20025,8 +20025,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers matrix random ];
        description = "Game for Lounge Marmelade";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20042,7 +20042,7 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20062,8 +20062,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A total map datatype";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20081,8 +20081,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Tournament related algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20094,7 +20094,7 @@ self: {
        sha256 = "0la19yynd7bpswi9012hf0vl9c4fdnn8p6y0287xanmdcs9zqz16";
        libraryHaskellDepends = [ base ];
        description = "Functions that should have been in Debug.Trace";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TransformeR" = callPackage
@@ -20111,8 +20111,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "eDSL in R for Safe Variable Transformarion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20126,8 +20126,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl ];
        description = "Tutorial on monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20139,7 +20139,7 @@ self: {
        sha256 = "04n1ld6h3q71iqnvwyabzj69vdy2x98w0drriyx13ykywbd31036";
        libraryHaskellDepends = [ base containers ];
        description = "A library to apply transformation to containers so as to maximize sharing of unchanged subcomponents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TreeCounter" = callPackage
@@ -20150,8 +20150,8 @@ self: {
        sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal";
        libraryHaskellDepends = [ base ref-mtl stm ];
        description = "Wait-free Tree Counter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20163,8 +20163,8 @@ self: {
        sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx";
        libraryHaskellDepends = [ base ];
        description = "A collection of heaps and search trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20176,7 +20176,7 @@ self: {
        sha256 = "0d1k4nblcnksh2j6b4v14r2xd2kn6cmqmyqhmy6wyz3kr0lyzxqd";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Transformer for Data.Tree";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "Treiber" = callPackage
@@ -20187,8 +20187,8 @@ self: {
        sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd";
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Lock free Treiber stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20205,8 +20205,8 @@ self: {
          optparse-applicative time
        ];
        description = "A simple trend Graph script";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20224,8 +20224,8 @@ self: {
          th-expand-syns transformers unpack-funcs vector
        ];
        description = "Automatic type inference of generalized tries with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20245,7 +20245,7 @@ self: {
          tagged
        ];
        description = "An implementation of the Twofish Symmetric-key cipher";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TypeClass" = callPackage
@@ -20264,8 +20264,8 @@ self: {
          SDL SDL-ttf transformers
        ];
        description = "Typing speed game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20279,7 +20279,7 @@ self: {
        editedCabalFile = "1pxg6az5vkl0zvs3zdvvvnhxqawd9fkkd44jmzzzyyibppgni6x4";
        libraryHaskellDepends = [ base base-orphans ];
        description = "Type composition classes & instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "TypeIlluminator" = callPackage
@@ -20292,8 +20292,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20305,8 +20305,8 @@ self: {
        sha256 = "1css4pb2x514s396c35brghgn3pgysdps8k09k1wcx5k2qpg90cx";
        libraryHaskellDepends = [ base ];
        description = "Some Nat-indexed types for GHC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20320,7 +20320,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers directory time ];
        description = "Command Line Typing speed tester";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "UISF" = callPackage
@@ -20335,7 +20335,7 @@ self: {
          array arrows base containers deepseq GLUT OpenGL stm transformers
        ];
        description = "Library for Arrowized Graphical User Interfaces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "UMM" = callPackage
@@ -20353,7 +20353,7 @@ self: {
        ];
        description = "A small command-line accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20371,8 +20371,8 @@ self: {
          QuickCheck regular template-haskell
        ];
        description = "Library for maintaining correctness of URLs within an application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20384,8 +20384,8 @@ self: {
        sha256 = "1l62z7798bby4fbrz62ic802g8zah3flb2pmsd3ky7y5903s3nxr";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "DEPRECATED A simple, liberal URL parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20409,8 +20409,8 @@ self: {
          base bytestring directory filepath hspec JuicyPixels time
        ];
        description = "Processing popular picture formats into .c or .raw format in RGB565";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20431,8 +20431,8 @@ self: {
          base bytestring criterion hashable QuickCheck quickcheck-instances
        ];
        description = "It provides the functionality like unix \"uniq\" utility";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "Unixutils" = callPackage
@@ -20448,7 +20448,7 @@ self: {
          process-extras pureMD5 regex-tdfa unix zlib
        ];
        description = "A crude interface between Haskell and Unix-like operating systems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Unixutils-shadow" = callPackage
@@ -20459,7 +20459,7 @@ self: {
        sha256 = "11m8lgq2rjvh7j8si7sqixf4k4ns65jy0zp6apqp0xc23c1znyr7";
        libraryHaskellDepends = [ base unix ];
        description = "A simple interface to shadow passwords (aka, shadow.h)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Updater" = callPackage
@@ -20470,8 +20470,8 @@ self: {
        sha256 = "0iry59pyd4iy0cmj6flr05lbk3696l1z8wswqcfp8q8m5ibykkz0";
        libraryHaskellDepends = [ base ];
        description = "Monadic FRP library based on stm";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20483,8 +20483,8 @@ self: {
        sha256 = "1y21v5k7s9sj8z5r3czp5i80x40zvyqxzr1xl28ardwj5q5rrvzp";
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20496,7 +20496,7 @@ self: {
        sha256 = "01xb68qh29q6b0pdxvadqw7q1p855k14jdz1qjlhg6785n0qp954";
        libraryHaskellDepends = [ base containers random ];
        description = "Some useful functions and shorthands";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "UtilityTM" = callPackage
@@ -20507,7 +20507,7 @@ self: {
        sha256 = "1mjy3w4sw32rbmm13yhmpidfsj91v3p58jvki16z0kzk3fswpa85";
        libraryHaskellDepends = [ base ];
        description = "Utility functions that are missing from the standard library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "VKHS" = callPackage
@@ -20537,8 +20537,8 @@ self: {
          regexpr text
        ];
        description = "Provides access to Vkontakte social network via public API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20562,8 +20562,8 @@ self: {
          aeson base doctest megaparsec prettyprinter text
        ];
        description = "VRML parser and generator for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20577,8 +20577,8 @@ self: {
          base bifunctors semigroupoids semigroups
        ];
        description = "A data-type like Either but with an accumulating Applicative";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20590,7 +20590,7 @@ self: {
        sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "Fixed-length lists and low-dimensional linear algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Vec-Boolean" = callPackage
@@ -20601,8 +20601,8 @@ self: {
        sha256 = "0zxxpychddmlrv7r190gn4dl282ak4qfk2d92l24qxi9fds1rshk";
        libraryHaskellDepends = [ base Boolean Vec ];
        description = "Provides Boolean instances for the Vec package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20614,8 +20614,8 @@ self: {
        sha256 = "0qsi1s8qp3fkr5alh2m7y1a1lm5xypjvmk174ywf0aga2y20bblm";
        libraryHaskellDepends = [ base OpenGLRaw Vec ];
        description = "Instances and functions to interoperate Vec and OpenGL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20627,8 +20627,8 @@ self: {
        sha256 = "0jwi9kgij8xd0419nkksgffwcn94fz6ijdq8s29b771409a1pkfc";
        doHaddock = false;
        description = "This package is obsolete";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20640,7 +20640,7 @@ self: {
        sha256 = "1hv8idxv9gniwwjs67q75bbcc5ry9r05cxjmsxk0q54l8zscdss2";
        libraryHaskellDepends = [ base Peano ];
        description = "a simple peano-indexed vector type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Verba" = callPackage
@@ -20654,8 +20654,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers matrix ];
        description = "A solver for the WordBrain game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20676,7 +20676,7 @@ self: {
        testToolDepends = [ c2hs ];
        description = "ViennaRNA v2 bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ViennaRNA-extras" = callPackage
@@ -20699,8 +20699,8 @@ self: {
          tasty-th vector
        ];
        description = "ViennaRNA v2 extensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20717,7 +20717,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "Villefort" = callPackage
@@ -20747,8 +20747,8 @@ self: {
          unbounded-delays webdriver
        ];
        description = "Villefort is a task manager and time tracker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20760,7 +20760,7 @@ self: {
        sha256 = "1jpw465n1abwi17s0yixg31f2zx28a24k3vh3kx59lknrw8q9jz1";
        libraryHaskellDepends = [ base ];
        description = "A binding for the Vulkan API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "VulkanMemoryAllocator" = callPackage
@@ -20773,7 +20773,7 @@ self: {
          base bytestring transformers vector vulkan
        ];
        description = "Bindings to the VulkanMemoryAllocator library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
@@ -20790,8 +20790,8 @@ self: {
          base bytestring containers parseargs
        ];
        description = "WAVE audio file IO library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20805,8 +20805,8 @@ self: {
        testHaskellDepends = [ base directory filepath ];
        doHaddock = false;
        description = "Generic text-editor logic for use with fixed-width fonts";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20821,8 +20821,8 @@ self: {
        libraryHaskellDepends = [ base brick microlens vty WEditor ];
        executableHaskellDepends = [ base brick vty WEditor ];
        description = "Text-editor widget with dynamic line-wrapping for use with Brick";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20835,8 +20835,8 @@ self: {
        libraryHaskellDepends = [ base hyphenation WEditor ];
        testHaskellDepends = [ base directory hyphenation WEditor ];
        description = "Language-specific hyphenation policies for WEditor";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20853,8 +20853,8 @@ self: {
          base directory filepath mtl unix WL500gPLib
        ];
        description = "A simple command line tools to control the Asus WL500gP router";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20869,8 +20869,8 @@ self: {
        libraryHaskellDepends = [ base curl mtl tagsoup ];
        executableHaskellDepends = [ base ];
        description = "A simple library to access to the WL 500gP router from the Haskell code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20890,8 +20890,8 @@ self: {
          base bytestring cryptohash hspec lens random split vector
        ];
        description = "WebMoney authentication module";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20903,8 +20903,8 @@ self: {
        sha256 = "13vfszyfyxwz4zi8zilifd0jad1gwlr75x931q8qbpi1kwr7mivk";
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20917,8 +20917,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers wx wxcore ];
        description = "WXDiffCtrl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20937,8 +20937,8 @@ self: {
        ];
        executableHaskellDepends = [ directory ghc-paths process ];
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20955,8 +20955,8 @@ self: {
          QuickCheck text transformers vector
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -20972,7 +20972,7 @@ self: {
          aeson base bytestring HTTP text unordered-containers
        ];
        description = "Library for interacting with the Weather Underground JSON API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "WebBits" = callPackage
@@ -20983,8 +20983,8 @@ self: {
        sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z";
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        description = "JavaScript analysis tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21001,7 +21001,7 @@ self: {
        ];
        description = "JavaScript analysis tools";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21018,8 +21018,8 @@ self: {
          base multiplate multiplate-simplified transformers WebBits
        ];
        description = "A Multiplate instance for JavaScript";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21038,8 +21038,8 @@ self: {
          xhtml
        ];
        description = "Continuation based web programming for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21054,8 +21054,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        executableHaskellDepends = [ base parsec ];
        description = "Logic interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21082,8 +21082,8 @@ self: {
          template-haskell text transformers unordered-containers vector
        ];
        description = "Regexp-like engine to scrap web data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21108,8 +21108,8 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "The frictionless WAI Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21121,8 +21121,8 @@ self: {
        sha256 = "0rzpf8z414qvkbks16zizsxsinvbdxbm1n0dbav11p286791xx1j";
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21135,8 +21135,8 @@ self: {
        revision = "1";
        editedCabalFile = "1ia6dk2fvxg3gzqdmcypdka6fcnnrza23hq1rhslj53jy3qzs3kn";
        description = "A binding to part of the Win32 library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = lib.platforms.none;
      }) {};
 
   "Win32_2_11_0_0" = callPackage
@@ -21146,8 +21146,8 @@ self: {
        version = "2.11.0.0";
        sha256 = "179v0jypafjnh98gl8wr6z6pq1r5h740xzm2b6axd2d33zlnacfm";
        description = "A binding to Windows Win32 API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = lib.platforms.none;
      }) {};
 
   "Win32-console" = callPackage
@@ -21158,8 +21158,8 @@ self: {
        sha256 = "0117f413db3qr09m7rc09q44mbhahjkaqczb04g5f24x7fbwrn39";
        libraryHaskellDepends = [ base Win32 ];
        description = "Binding to the Win32 console API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-dhcp-server" = callPackage
@@ -21170,8 +21170,8 @@ self: {
        sha256 = "0r0629nnjmlw245czxf4gyzrl0zhgm3fjgjy1bs8622zsvfdavrz";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        description = "Win32 DHCP Server Management API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-errors" = callPackage
@@ -21185,8 +21185,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell text Win32 ];
        testHaskellDepends = [ base hspec QuickCheck Win32 ];
        description = "Alternative error handling for Win32 foreign calls";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-extras" = callPackage
@@ -21200,8 +21200,8 @@ self: {
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ imm32 msimg32 ];
        description = "Provides missing Win32 API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {imm32 = null; msimg32 = null;};
 
   "Win32-junction-point" = callPackage
@@ -21212,8 +21212,8 @@ self: {
        sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        description = "Support for manipulating NTFS junction points";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-notify" = callPackage
@@ -21226,8 +21226,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers directory Win32 ];
        description = "A binding to part of the Win32 library for file notification";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-security" = callPackage
@@ -21240,8 +21240,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        description = "Haskell bindings to a security-related functions of the Windows API";
-       license = stdenv.lib.licenses.mit;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-services" = callPackage
@@ -21253,8 +21253,8 @@ self: {
        libraryHaskellDepends = [ base Win32 Win32-errors ];
        librarySystemDepends = [ Advapi32 ];
        description = "Windows service applications";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {Advapi32 = null;};
 
   "Win32-services-wrapper" = callPackage
@@ -21269,8 +21269,8 @@ self: {
          base directory filepath Win32 Win32-errors Win32-services
        ];
        description = "Wrapper code for making a Win32 service";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "Win32-shortcut" = callPackage
@@ -21284,8 +21284,8 @@ self: {
        libraryHaskellDepends = [ base mtl th-utilities Win32 ];
        librarySystemDepends = [ libossp_uuid ole32 ];
        description = "Support for manipulating shortcuts (.lnk files) on Windows";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = lib.platforms.none;
      }) {inherit (pkgs) libossp_uuid; ole32 = null;};
 
   "Wired" = callPackage
@@ -21301,8 +21301,8 @@ self: {
          base chalmers-lava2000 containers mtl QuickCheck
        ];
        description = "Wire-aware hardware description";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21342,8 +21342,8 @@ self: {
          tasty-th text
        ];
        description = "Bigram word pair alignments";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21357,8 +21357,8 @@ self: {
        editedCabalFile = "08i5izbni7xism94h6ncmdvfy88gny2vybapv0fkzgw3wyf6arhq";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21372,8 +21372,8 @@ self: {
        editedCabalFile = "1wdx2xv6zxvwkz3jkkd4vcdf9hyyivbfwyln9dd30m67ip7illp3";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21389,7 +21389,7 @@ self: {
        executableHaskellDepends = [ base boxes cmdargs ];
        description = "Plaintext prose redundancy linter";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "Workflow" = callPackage
@@ -21408,8 +21408,8 @@ self: {
          extensible-exceptions mtl old-time RefSerialize stm TCache vector
        ];
        description = "Workflow patterns over a monad for thread state logging & recovery";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21425,7 +21425,7 @@ self: {
        ];
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21457,7 +21457,7 @@ self: {
          libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
        ];
        description = "A binding to the X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
@@ -21473,8 +21473,8 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ libX11 ];
        description = "Missing bindings to the X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.xorg) libX11;};
 
@@ -21486,8 +21486,8 @@ self: {
        sha256 = "11jxlaad9jgjddd5v8ygy2rdrajrbm9dlp6f0mslvxa2wzn4v4r3";
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21500,8 +21500,8 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ Xdamage ];
        description = "A binding to the Xdamage X11 extension library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Xdamage = null;};
 
@@ -21514,8 +21514,8 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ Xfixes ];
        description = "A binding to the Xfixes X11 extension library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Xfixes = null;};
 
@@ -21539,7 +21539,7 @@ self: {
        sha256 = "19p71lc0hihfn0xzl29j01kd0zf9yalspwj7dava0ybc1rm3g62h";
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the Xshape X11 extension library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "XAttr" = callPackage
@@ -21562,8 +21562,8 @@ self: {
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ xinput ];
        description = "Bindings for the DirectX XInput library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {inherit (pkgs.xorg) xinput;};
 
   "XML" = callPackage
@@ -21582,8 +21582,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Extensible Markup Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "XMLParser" = callPackage
@@ -21594,7 +21594,7 @@ self: {
        sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik";
        libraryHaskellDepends = [ base parsec ];
        description = "A library to parse xml";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "XMMS" = callPackage
@@ -21608,7 +21608,7 @@ self: {
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        description = "XMMS2 client library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xmmsclient = null; xmmsclient-glib = null;};
 
@@ -21625,8 +21625,8 @@ self: {
          base haskell98 hsdns mtl network parsec random utf8-string
        ];
        description = "XMPP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21653,8 +21653,8 @@ self: {
          rdf4h text unordered-containers vector
        ];
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21667,7 +21667,7 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ libXau ];
        description = "A binding to the X11 authentication library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXau;};
 
   "Xec" = callPackage
@@ -21685,8 +21685,8 @@ self: {
          old-time SHA unix
        ];
        description = "Gtk command launcher with identicon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21698,8 +21698,8 @@ self: {
        sha256 = "0dv5nvvqy6w0ndjyab4bwhjpw1hlx8xi4bv2jw4rl8v6y68bilk1";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A library for writing XML and HTML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21711,8 +21711,8 @@ self: {
        sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx";
        libraryHaskellDepends = [ base ];
        description = "Pure haskell implementation of xorshift128plus random number generator";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21733,8 +21733,8 @@ self: {
          SDL-image SDL-mixer SDL-ttf transformers
        ];
        description = "Yet Another Pong Clone using SDL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21746,8 +21746,8 @@ self: {
        sha256 = "17pp79yr8jfmhx85vlr5kx7q5wha48p3ra7l4ligd583yxzvlnif";
        libraryHaskellDepends = [ array base HGL Yampa ];
        description = "Yampa-based library for programming robots";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21782,8 +21782,8 @@ self: {
          yesod-recaptcha yesod-static
        ];
        description = "A simple blog engine powered by Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21812,7 +21812,7 @@ self: {
        ];
        description = "YAML reference implementation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21829,7 +21829,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Elegant Functional Reactive Programming Language for Hybrid Systems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Yampa-core" = callPackage
@@ -21842,7 +21842,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random vector-space ];
        description = "Library for programming hybrid systems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "YampaSynth" = callPackage
@@ -21860,8 +21860,8 @@ self: {
          array base bytestring containers HCodecs Yampa
        ];
        description = "Software synthesizer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21873,7 +21873,7 @@ self: {
        sha256 = "1krp17rw25b7a280rf3idpfzkx39kpfcjqwznz96y0d2sdqbhg6p";
        libraryHaskellDepends = [ base containers parsec ];
        description = "A Minimal JSON Parser & Printer for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "Yogurt" = callPackage
@@ -21889,8 +21889,8 @@ self: {
          syb time
        ];
        description = "A MUD client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21910,8 +21910,8 @@ self: {
        ];
        executableSystemDepends = [ readline ];
        description = "A functional MUD client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) readline;};
 
@@ -21938,8 +21938,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Array, vector and text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21964,8 +21964,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Simple and high performance IO toolkit for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -21992,8 +21992,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22010,8 +22010,8 @@ self: {
          Z-IO
        ];
        description = "YAML tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22025,8 +22025,8 @@ self: {
        editedCabalFile = "17dsvvbv3kf0b85l15fdkbvfpjhcmqw3j54j8av59wqhqncgnx2r";
        libraryHaskellDepends = [ base vect ];
        description = "Polymer growth simulation method";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22042,8 +22042,8 @@ self: {
          base CC-delcont containers mtl network unix
        ];
        description = "Oleg's Zipper FS";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22058,8 +22058,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22071,7 +22071,7 @@ self: {
        sha256 = "05cnpl9c6i0j8jqr4j43b32jgryv34gahimhp9g1m45idgnl2sn0";
        libraryHaskellDepends = [ base TypeCompose ];
        description = "Zipping folds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ZipperAG" = callPackage
@@ -22082,7 +22082,7 @@ self: {
        sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9";
        libraryHaskellDepends = [ base syz ];
        description = "An implementationg of Attribute Grammars using Functional Zippers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Zora" = callPackage
@@ -22099,7 +22099,7 @@ self: {
        ];
        testHaskellDepends = [ base containers random tasty tasty-hunit ];
        description = "Graphing library wrapper + assorted useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "Zwaluw" = callPackage
@@ -22110,8 +22110,8 @@ self: {
        sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
        libraryHaskellDepends = [ base ];
        description = "Combinators for bidirectional URL routing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22131,7 +22131,7 @@ self: {
        ];
        description = "Compare genome assemblies";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22145,7 +22145,7 @@ self: {
        testHaskellDepends = [ base HUnit text ];
        description = "Parser for a language similar to Cucumber's Gherkin";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "abc-puzzle" = callPackage
@@ -22161,7 +22161,7 @@ self: {
          array base minisat random random-shuffle Safe
        ];
        description = "Generate instances of the ABC Logic Puzzle";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "abcBridge" = callPackage
@@ -22185,8 +22185,8 @@ self: {
          tasty-hunit tasty-quickcheck vector
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {abc = null;};
 
@@ -22200,8 +22200,8 @@ self: {
          base parsec prettify process semigroups
        ];
        description = "Haskell representation and parser for ABC notation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22221,8 +22221,8 @@ self: {
          scientific text time unordered-containers uuid vector
        ];
        description = "interconversion between aeson and bson";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22235,8 +22235,8 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
        description = "Simple boolean tests to see if a value abides by certain properties";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22256,8 +22256,8 @@ self: {
          test-framework test-framework-hunit text
        ];
        description = "Parse ABNF and generate parsers for the specified document";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22269,7 +22269,7 @@ self: {
        sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
        libraryHaskellDepends = [ array base containers random time ];
        description = "Abstract, parameterized interface to mutable Deques";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "abstract-deque-tests" = callPackage
@@ -22289,7 +22289,7 @@ self: {
          test-framework-hunit time
        ];
        description = "A test-suite for any queue or double-ended queue satisfying an interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "abstract-par" = callPackage
@@ -22300,7 +22300,7 @@ self: {
        sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
        libraryHaskellDepends = [ base deepseq ];
        description = "Type classes generalizing the functionality of the 'monad-par' library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "abstract-par-accelerate" = callPackage
@@ -22313,8 +22313,8 @@ self: {
          abstract-par accelerate array base vector
        ];
        description = "Provides the class ParAccelerate, nothing more";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22330,8 +22330,8 @@ self: {
          base profunctors transformers transformers-compat vinyl
        ];
        description = "Abstract binding trees for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22345,8 +22345,8 @@ self: {
          base hashable unordered-containers vector
        ];
        description = "Aho-Corasick string matching algorithm in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22358,8 +22358,8 @@ self: {
        sha256 = "1nsnbvllwznbqycw33f09vfgqvqmqfkcbi367clm6k4v6rfswzl3";
        libraryHaskellDepends = [ ac-machine base conduit text ];
        description = "Drive Aho-Corasick machines in Conduit pipelines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22379,8 +22379,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Sequence optimized for monoidal construction and folding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22408,7 +22408,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "An embedded language for accelerated array processing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "accelerate-arithmetic" = callPackage
@@ -22426,8 +22426,8 @@ self: {
          accelerate accelerate-utility base QuickCheck
        ];
        description = "Linear algebra and interpolation using the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22456,8 +22456,8 @@ self: {
          vector-th-unbox wide-word
        ];
        description = "Fixed-length large integer arithmetic for Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-blas" = callPackage
@@ -22485,8 +22485,8 @@ self: {
          criterion deepseq hmatrix mwc-random mwc-random-accelerate
        ];
        description = "Numeric Linear Algebra in Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-cublas" = callPackage
@@ -22513,8 +22513,8 @@ self: {
          base cuda hmatrix pooled-io random timeit utility-ht
        ];
        description = "Basic Linear Algebra using native CUBLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-cuda" = callPackage
@@ -22538,8 +22538,8 @@ self: {
          template-haskell text transformers unix unordered-containers
        ];
        description = "Accelerate backend for NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-cufft" = callPackage
@@ -22557,8 +22557,8 @@ self: {
          accelerate-utility base cuda cufft
        ];
        description = "Accelerate frontend to the CUFFT library (Fourier transform)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-examples" = callPackage
@@ -22598,8 +22598,8 @@ self: {
          repa-io scientific vector vector-algorithms
        ];
        description = "Examples using the Accelerate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-fft" = callPackage
@@ -22623,8 +22623,8 @@ self: {
          tasty tasty-hedgehog
        ];
        description = "FFT using the Accelerate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-fftw" = callPackage
@@ -22639,8 +22639,8 @@ self: {
          accelerate accelerate-io base carray fft storable-complex
        ];
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22666,8 +22666,8 @@ self: {
          accelerate-utility base criterion utility-ht
        ];
        description = "Fast Fourier transform and convolution using the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22686,8 +22686,8 @@ self: {
          accelerate-fourier base criterion
        ];
        description = "Compare different implementations of the Fast Fourier Transform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io" = callPackage
@@ -22698,7 +22698,7 @@ self: {
        sha256 = "048md40pfacxa1mbzncybxzwp9fzmsaq8i94pd8ai677n2zyw5cg";
        libraryHaskellDepends = [ accelerate base ];
        description = "Convert between Accelerate arrays and raw pointers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "accelerate-io-JuicyPixels" = callPackage
@@ -22713,8 +22713,8 @@ self: {
          accelerate accelerate-io-vector base JuicyPixels vector
        ];
        description = "Convert between Accelerate arrays and JuicyPixels images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-array" = callPackage
@@ -22730,8 +22730,8 @@ self: {
          accelerate array base hedgehog tasty tasty-hedgehog
        ];
        description = "Convert between Accelerate and array";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-bmp" = callPackage
@@ -22744,8 +22744,8 @@ self: {
          accelerate accelerate-io-bytestring base bmp
        ];
        description = "Convert between Accelerate arrays and BMP images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-bytestring" = callPackage
@@ -22756,8 +22756,8 @@ self: {
        sha256 = "15j42ahdcqpy4xbpp1xibfbjcrijy0hpfxp4k53qkb9bcqaknyq1";
        libraryHaskellDepends = [ accelerate base bytestring ];
        description = "Convert between Accelerate and ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-cereal" = callPackage
@@ -22771,8 +22771,8 @@ self: {
          accelerate accelerate-io-bytestring base cereal
        ];
        description = "Binary serialisation of Accelerate arrays using cereal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-repa" = callPackage
@@ -22783,8 +22783,8 @@ self: {
        sha256 = "084gzvfwz6prwra5393lfm5hgvssxwij0cdf24fq5nahzn7x2wrp";
        libraryHaskellDepends = [ accelerate base repa ];
        description = "Convert between Accelerate and Repa arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-io-serialise" = callPackage
@@ -22799,7 +22799,7 @@ self: {
          accelerate accelerate-io-bytestring base serialise
        ];
        description = "Binary serialisation of Accelerate arrays using serialise";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "accelerate-io-vector" = callPackage
@@ -22815,8 +22815,8 @@ self: {
          accelerate base hedgehog tasty tasty-hedgehog vector
        ];
        description = "Convert between Accelerate and vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-kullback-liebler" = callPackage
@@ -22842,8 +22842,8 @@ self: {
        benchmarkToolDepends = [ cpphs ];
        doHaddock = false;
        description = "Kullback-Liebler divergence";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -22863,7 +22863,7 @@ self: {
          unordered-containers vector
        ];
        description = "Accelerate backend component generating LLVM IR";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -22885,8 +22885,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ accelerate base ];
        description = "Accelerate backend for multicore CPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22908,8 +22908,8 @@ self: {
        ];
        testHaskellDepends = [ accelerate base ];
        description = "Accelerate backend for NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "accelerate-random" = callPackage
@@ -22920,8 +22920,8 @@ self: {
        sha256 = "1wqy11aw99gq7hd0g539synsh6kv8j4a09p9b1k29hpanjr009kd";
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22944,8 +22944,8 @@ self: {
          smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "a typesafe way encode accelerate matrices and vectors";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22957,8 +22957,8 @@ self: {
        sha256 = "1wdxypkgkjngrlkw4fnxqqqbcy3chaw5fim0xyzcbh52zd0b62wh";
        libraryHaskellDepends = [ accelerate base utility-ht ];
        description = "Utility functions for the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22970,8 +22970,8 @@ self: {
        sha256 = "16hgs81cs3zgbvsprh9lzvyxbh58g7rijf1d4j0dkrpnqnrvg0hy";
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        description = "A Haskell implementation of the Accentuate.us API.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -22983,8 +22983,8 @@ self: {
        sha256 = "13kg8mjrnif88r0w7b041x4vmzdm9aqrx4fskc3qv3smpq2q2ngs";
        libraryHaskellDepends = [ base filepath old-time time unix ];
        description = "Cross-platform support for retrieving file access times";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23011,8 +23011,8 @@ self: {
          th-format unliftio unliftio-core uuid
        ];
        description = "Provides Access Token for Services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23024,7 +23024,7 @@ self: {
        sha256 = "0dlszai5bz05algxm98kjhnjwa7mwj620d52vrsc4fxds8q84sjg";
        libraryHaskellDepends = [ base bifunctors lens semigroups ];
        description = "Data type like Either but with accumulating error type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ace" = callPackage
@@ -23042,7 +23042,7 @@ self: {
          base bifunctors hspec HUnit mtl parsec text
        ];
        description = "Attempto Controlled English parser and printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "achille" = callPackage
@@ -23065,8 +23065,8 @@ self: {
          tasty-hunit text time
        ];
        description = "A library for building static site generators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23098,7 +23098,7 @@ self: {
          base criterion directory mtl random system-fileio system-filepath
        ];
        description = "Add ACID guarantees to any serializable Haskell data structure";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acid-state-dist" = callPackage
@@ -23123,8 +23123,8 @@ self: {
          acid-state base criterion directory mtl safecopy
        ];
        description = "A replication backend for acid-state";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23140,8 +23140,8 @@ self: {
          acid-state base directory HsOpenSSL network safecopy
        ];
        description = "Add TLS support for Data.Acid.Remote";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23153,7 +23153,7 @@ self: {
        sha256 = "0bwlsdxk3lbir90xhar7xd83cwarqcm0a86gvwaghknpil2ay4cg";
        libraryHaskellDepends = [ base process ];
        description = "Writing and calling ACL2 from Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-all-monad" = callPackage
@@ -23164,8 +23164,8 @@ self: {
        sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad which is powerful enough to interpret any action";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23181,7 +23181,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A full featured empty project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-cadre" = callPackage
@@ -23192,7 +23192,7 @@ self: {
        sha256 = "1nclcq48r547rgmd4h0hf498z27d15lp4da9yb3a3sy7qk6m92bi";
        libraryHaskellDepends = [ base ];
        description = "car, cdr and more";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-circular-containers" = callPackage
@@ -23210,7 +23210,7 @@ self: {
          base containers doctest doctest-discover graph-wrapper
        ];
        description = "Spineless containers which are fast to read but inefficient to update";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-cofunctor" = callPackage
@@ -23221,7 +23221,7 @@ self: {
        sha256 = "0ydlnp0bbl5haci3a5x59sj2biylmpkqwzy749fhp8jn1cr8fg4x";
        libraryHaskellDepends = [ base ];
        description = "A Cofunctor is a structure from category theory dual to Functor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-colosson" = callPackage
@@ -23232,7 +23232,7 @@ self: {
        sha256 = "0mfnav0wb0ks365n3kghaic6nasp3qaznhmsdccx35h164ixj9vc";
        libraryHaskellDepends = [ base random ];
        description = "Determines whether it is numberwang";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-comonad" = callPackage
@@ -23243,8 +23243,8 @@ self: {
        sha256 = "1sc0alwdgfls18y4q4y0qkbzqm4fgzd9yv6dwwnzw3472vsz2x8s";
        libraryHaskellDepends = [ base comonad ];
        description = "A more efficient dualization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23259,7 +23259,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Maybe gives you a cute boy";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-cutegirl" = callPackage
@@ -23273,7 +23273,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Maybe gives you a cute girl";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "acme-default" = callPackage
@@ -23284,7 +23284,7 @@ self: {
        sha256 = "0hkx2zpk3w9vh1jdhpwkd7x7hwr3zf5z9n6f30rjrbyqmxnicpip";
        libraryHaskellDepends = [ base ];
        description = "A class for types with a distinguished aesthetically pleasing value";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "acme-dont" = callPackage
@@ -23296,7 +23296,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A \"don't\" construct";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-flipping-tables" = callPackage
@@ -23307,8 +23307,8 @@ self: {
        sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757";
        libraryHaskellDepends = [ base ];
        description = "Stop execution with rage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23320,7 +23320,7 @@ self: {
        sha256 = "0b99f1js5w5904rw20xfmg8sfv0l8fdcnp90jx4rrczcirp6h6iq";
        libraryHaskellDepends = [ base ];
        description = "The best applicative functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-grawlix" = callPackage
@@ -23331,7 +23331,7 @@ self: {
        sha256 = "170cvi3b13wb8imfz3yc3323v2dnyhrr080syjqam477ahwggwsn";
        libraryHaskellDepends = [ base ];
        description = "More readable names for commonly used symbols";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-hq9plus" = callPackage
@@ -23342,8 +23342,8 @@ self: {
        sha256 = "0da4ysj74fmhcbbvxxfb6w97pr870518k90vwnc3z8kglj1ni187";
        libraryHaskellDepends = [ base ];
        description = "An embedded DSL for the HQ9+ programming language";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23361,8 +23361,8 @@ self: {
          base bytestring extensible-exceptions mtl network pretty
        ];
        description = "fastest Haskell PONG server in the world";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23377,8 +23377,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23391,7 +23391,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The only true way to do IO in Haskell!";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "acme-iot" = callPackage
@@ -23402,7 +23402,7 @@ self: {
        sha256 = "0y43prc9ykkbyvrq879ys753cijphmya7ig1m3v1g7fwyy9n23gx";
        libraryHaskellDepends = [ base ghc-prim mtl transformers ];
        description = "IO monad transformer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "acme-kitchen-sink" = callPackage
@@ -23413,8 +23413,8 @@ self: {
        sha256 = "0b587ryd63zyap7c3a1dnm25y0k9a6i2sx26xzg0wrq8hfh0f815";
        libraryHaskellDepends = [ base ];
        description = "A place for dumping that does-not-feel-right code while you improve it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23426,8 +23426,8 @@ self: {
        sha256 = "039pz5lw3p8iy1gaijvbc8296djxcziw70a0rnw0iz3iy29w1fmc";
        libraryHaskellDepends = [ base text ];
        description = "free your haskell from the tyranny of npm!";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23439,7 +23439,7 @@ self: {
        sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32";
        libraryHaskellDepends = [ base parsec random random-shuffle text ];
        description = "LOLSPEAK translator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-lookofdisapproval" = callPackage
@@ -23450,7 +23450,7 @@ self: {
        sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
        libraryHaskellDepends = [ base ];
        description = "Express your disapproval";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-memorandom" = callPackage
@@ -23461,7 +23461,7 @@ self: {
        sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi";
        libraryHaskellDepends = [ base MemoTrie random ];
        description = "Memoized random number generation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "acme-microwave" = callPackage
@@ -23472,7 +23472,7 @@ self: {
        sha256 = "136lwxcimj241nq9l0x7icxk1q9xz826sg07d40yj87shir52j39";
        libraryHaskellDepends = [ base ];
        description = "The eighth wonder of the world, kitchen math!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-miscorder" = callPackage
@@ -23483,8 +23483,8 @@ self: {
        sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4";
        libraryHaskellDepends = [ base random ];
        description = "Miscellaneous newtypes for orderings of discutable use";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23496,7 +23496,7 @@ self: {
        sha256 = "0nvkgdj04i21gq5k541an8zjz0hzzy7dpi384yrhcyh14jsxhqz5";
        libraryHaskellDepends = [ base stm ];
        description = "Cause serious international side effects";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-mutable-package" = callPackage
@@ -23510,8 +23510,8 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base ];
        description = "A mutable package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23523,8 +23523,8 @@ self: {
        sha256 = "0lnrsndx7r00b7vgh9jmp5j635m4pb2bzx0lfhqidkzfc2llzwsm";
        libraryHaskellDepends = [ base time ];
        description = "An interface to the philosophical and metaphysical \"now\"";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23536,8 +23536,8 @@ self: {
        sha256 = "1p5rdssdmds6yqgv3yvlh835h180h9q9430j8i6qrhygqn8lmv87";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Define the less than and add and subtract for nats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23550,7 +23550,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A name for omitted definitions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-one" = callPackage
@@ -23561,7 +23561,7 @@ self: {
        sha256 = "11sgx648g5594w8m8x8r25x7s61jyyxazp5dcfyglvhc7zlrrvbb";
        doHaddock = false;
        description = "The identity element of package dependencies";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-operators" = callPackage
@@ -23572,8 +23572,8 @@ self: {
        sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w";
        libraryHaskellDepends = [ base ];
        description = "Operators of base, all in one place!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23585,8 +23585,8 @@ self: {
        sha256 = "1kjfpihicb6f3kn5gzr0ya8f73g4y3kvw7y4plv67cpbc1icnpjl";
        libraryHaskellDepends = [ acme-left-pad base ];
        description = "The flexibility of Haskell and the safety of PHP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23598,7 +23598,7 @@ self: {
        sha256 = "02gml2db5vigkwkx99lqzjkpfaqdc74x16bgdx62kf7r3nn37my9";
        libraryHaskellDepends = [ base split ];
        description = "Make more than one point in numeric literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-realworld" = callPackage
@@ -23609,7 +23609,7 @@ self: {
        sha256 = "0ffhichjhhic7d5cjypmd2zmcq0dpqiz5ygsw0y67v83hry0vf8r";
        libraryHaskellDepends = [ base ];
        description = "Primitives for manipulating the state of the universe";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-safe" = callPackage
@@ -23621,7 +23621,7 @@ self: {
        libraryHaskellDepends = [ acme-dont base ];
        description = "Safe versions of some infamous haskell functions such as fromJust";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "acme-schoenfinkel" = callPackage
@@ -23638,8 +23638,8 @@ self: {
          test-framework-th
        ];
        description = "Proper names for curry and uncurry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23652,7 +23652,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Smuggle arbitrary values in arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-strfry" = callPackage
@@ -23663,8 +23663,8 @@ self: {
        sha256 = "1r6xnkyx22khzq6hlb8bk0fnbb6hlwbf12wajhx8vcxa7bkhh8lb";
        libraryHaskellDepends = [ base bytestring ];
        description = "A binding to the glibc strfry function";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23678,8 +23678,8 @@ self: {
        editedCabalFile = "0i5hark97zl45iyiijxj07d2pg112kh3jcmjmscpbss5l5n02h23";
        libraryHaskellDepends = [ base ];
        description = "Stringly Typed Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23691,7 +23691,7 @@ self: {
        sha256 = "1anj8yygzcqkl4nwqwbrmwsqda84qcl8yzq7pgx2b7p895xcfa68";
        libraryHaskellDepends = [ base mtl ];
        description = "A Haskell port of the C/PHP strtok function";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-this" = callPackage
@@ -23704,8 +23704,8 @@ self: {
        editedCabalFile = "1xizmz9yyhxkkaynlk9x0l1nv5maz0shk3d1ipaphc9c6q4b1mjq";
        libraryHaskellDepends = [ base template-haskell ];
        description = "import This";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23717,7 +23717,7 @@ self: {
        sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb";
        libraryHaskellDepends = [ base ghc-prim mtl transformers ];
        description = "An easy way to perform and unperform IO and other stateful actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "acme-year" = callPackage
@@ -23730,7 +23730,7 @@ self: {
        testHaskellDepends = [ base time ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Get the current year";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "acme-zalgo" = callPackage
@@ -23743,7 +23743,7 @@ self: {
        editedCabalFile = "1l2m9hh6mbc59h17z17gcfzgza25jj912d413pw1q37r3v4y0a1c";
        libraryHaskellDepends = [ array base random ];
        description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "acme-zero" = callPackage
@@ -23754,8 +23754,8 @@ self: {
        sha256 = "06d4hpda8qwwq9wzkgx6fpiq39l1md8sfm9hnvh4r95xyg5q53f6";
        doHaddock = false;
        description = "The absorbing element of package dependencies";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23779,8 +23779,8 @@ self: {
          relude tasty tasty-golden text
        ];
        description = "AcousticBrainz API client";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23792,7 +23792,7 @@ self: {
        sha256 = "1spw70dw8x6d9dy5wg47fim4kpsvzgr25nmwpv8c4wd8g3gmnqmw";
        libraryHaskellDepends = [ base transformers ];
        description = "Abstraction over management of resources";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "action-permutations" = callPackage
@@ -23803,7 +23803,7 @@ self: {
        sha256 = "0rhlzpwshixpnqma7sk28f22dkwz39b6lcwnzmd31rcnz5cyw6d4";
        libraryHaskellDepends = [ base ];
        description = "Execute a set of actions (e.g. parsers) in each possible order";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "active" = callPackage
@@ -23823,8 +23823,8 @@ self: {
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
        description = "Abstractions for animation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23853,8 +23853,8 @@ self: {
          utf8-string xhtml
        ];
        description = "Haskell code presentation tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23868,8 +23868,8 @@ self: {
        editedCabalFile = "1v2sw9n9kiqc7cy0v1923ld645dykmk57bgdrgdgfv6qkfp6ghdd";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23881,8 +23881,8 @@ self: {
        sha256 = "1a9x42x0bysia00672qala6q6g5dgdfzwlzk2969c7q9gsxf63y9";
        libraryHaskellDepends = [ aeson base network-uri text time ];
        description = "ActivityPub Haskell Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23896,8 +23896,8 @@ self: {
          aeson base text time unordered-containers
        ];
        description = "An interface to the ActivityStreams specification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23910,8 +23910,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm time ];
        description = "Actors with multi-headed receive clauses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23927,8 +23927,8 @@ self: {
        ];
        doHaddock = false;
        description = "Semigroup actions and torsors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23949,7 +23949,7 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        benchmarkHaskellDepends = [ base criterion erf ];
        description = "Automatic Differentiation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "adaptive-containers" = callPackage
@@ -23960,8 +23960,8 @@ self: {
        sha256 = "16h0zi55hf9g07xisbcmgkx72m9laiqykh2r9nh2siczx3sxi1qk";
        libraryHaskellDepends = [ base ];
        description = "Self optimizing container types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23973,8 +23973,8 @@ self: {
        sha256 = "1kf4d3qf8nv61c7pajv234b2vil84c2cq40csnm456lg55qh53r1";
        libraryHaskellDepends = [ base template-haskell type-level ];
        description = "Self-optimizing tuple types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -23989,8 +23989,8 @@ self: {
          base bytestring cereal containers mtl network
        ];
        description = "Android Debug Bridge (ADB) protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24012,7 +24012,7 @@ self: {
          parsec-permutation strict text time
        ];
        description = "Convert adblock config files to privoxy format";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "addLicenseInfo" = callPackage
@@ -24025,7 +24025,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Adds license info to the top of a file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "addy" = callPackage
@@ -24046,8 +24046,8 @@ self: {
          tasty tasty-hedgehog tasty-hunit text text-icu validation-selective
        ];
        description = "A full-featured library for parsing, validating, and rendering email addresses";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24066,7 +24066,7 @@ self: {
        ];
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24088,8 +24088,8 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Approximate dictionary searching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24105,8 +24105,8 @@ self: {
        testHaskellDepends = [ base hs-functors ];
        benchmarkHaskellDepends = [ base gauge hs-functors ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24130,7 +24130,7 @@ self: {
        testHaskellDepends = [ base distributive generic-deriving hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Adjunctions and representable functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "adler32" = callPackage
@@ -24143,7 +24143,7 @@ self: {
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "An implementation of Adler-32, supporting rolling checksum operation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
   "adobe-swatch-exchange" = callPackage
@@ -24163,8 +24163,8 @@ self: {
          base binary bytestring data-binary-ieee754 language-css mtl pretty
        ];
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24185,8 +24185,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "ADP for multiple context-free languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24206,8 +24206,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Subword construction in adp-multi using monadiccp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24219,8 +24219,8 @@ self: {
        sha256 = "0cp14n2l3scbsp7f6s4r19ngn2ympns03pm6s07hdkpavvgli1zg";
        libraryHaskellDepends = [ base ];
        description = "Modelling, rendering and quantitative analysis on attack defense trees";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24243,8 +24243,8 @@ self: {
        ];
        testHaskellDepends = [ base directory filepath HUnit text ];
        description = "Advent of Code REST API bindings and servant API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24276,7 +24276,7 @@ self: {
          template-haskell th-lift th-lift-instances
        ];
        description = "Parse Advent of Code ASCII art letters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aern2-mp" = callPackage
@@ -24294,8 +24294,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Multi-precision ball (interval) arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24319,8 +24319,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exact real numbers via Cauchy sequences and MPFR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24353,7 +24353,7 @@ self: {
          these time time-compat unordered-containers uuid-types vector
        ];
        description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-applicative" = callPackage
@@ -24364,8 +24364,8 @@ self: {
        sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz";
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        description = "make To/From JSOn instances from an applicative description";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24378,7 +24378,7 @@ self: {
        libraryHaskellDepends = [ aeson attoparsec base ];
        testHaskellDepends = [ base ];
        description = "Embed an Attoparsec text parser into an Aeson parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-better-errors" = callPackage
@@ -24395,7 +24395,7 @@ self: {
          transformers-compat unordered-containers vector void
        ];
        description = "Better error messages when decoding JSON values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-bson" = callPackage
@@ -24412,7 +24412,7 @@ self: {
        ];
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "aeson-casing" = callPackage
@@ -24428,7 +24428,7 @@ self: {
          aeson base tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Tools to change the formatting of field names in Aeson instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-coerce" = callPackage
@@ -24439,7 +24439,7 @@ self: {
        sha256 = "0i6pv9hkwp4h7wwmnr6lwaqjkwykdgqkvpycm7fpyrlw5ipkp728";
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-combinators" = callPackage
@@ -24459,7 +24459,7 @@ self: {
          aeson base bytestring doctest hspec text utf8-string
        ];
        description = "Aeson combinators for dead simple JSON decoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-commit" = callPackage
@@ -24475,7 +24475,7 @@ self: {
          aeson aeson-qq base tasty tasty-hspec text
        ];
        description = "Parse Aeson data with commitment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-compat" = callPackage
@@ -24503,7 +24503,7 @@ self: {
          time-locale-compat unordered-containers vector
        ];
        description = "Compatibility layer for aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-decode" = callPackage
@@ -24521,8 +24521,8 @@ self: {
          aeson-qq base containers hedgehog text time
        ];
        description = "Easy functions for converting from Aeson.Value";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24535,7 +24535,7 @@ self: {
        libraryHaskellDepends = [ aeson base containers ];
        testHaskellDepends = [ aeson base containers ];
        description = "Apply default value to FromJSON instacnes' Maybe fields";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-deriving" = callPackage
@@ -24553,7 +24553,7 @@ self: {
          aeson base hedgehog regex-tdfa text unordered-containers
        ];
        description = "data types for compositional, type-directed serialization";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-diff" = callPackage
@@ -24580,7 +24580,7 @@ self: {
          quickcheck-instances text unordered-containers vector
        ];
        description = "Extract and apply patches to JSON documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-diff-generic" = callPackage
@@ -24599,8 +24599,8 @@ self: {
          th-abstraction time unordered-containers uuid-types vector
        ];
        description = "Apply a json-patch to any haskell datatype";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24629,7 +24629,7 @@ self: {
          tasty-quickcheck time time-parsers unordered-containers vector
        ];
        description = "Extra goodies for aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -24647,8 +24647,8 @@ self: {
          aeson base bytestring doctest text time unordered-containers
        ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24663,7 +24663,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Tools for creating flat JSON serializations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-flatten" = callPackage
@@ -24677,7 +24677,7 @@ self: {
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "JSON flatten for Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-flowtyped" = callPackage
@@ -24698,8 +24698,8 @@ self: {
          unordered-containers vector
        ];
        description = "Create Flow type definitions from Haskell data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24725,7 +24725,7 @@ self: {
          aeson aeson-qq base dependent-sum hspec HUnit
        ];
        description = "Derivation of Aeson instances for GADTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-generic-compat" = callPackage
@@ -24736,7 +24736,7 @@ self: {
        sha256 = "1kr3waa46k3619yvif0zh4lx7s0zhyghlr1c5kkrvg432i8wmdm6";
        libraryHaskellDepends = [ aeson base ];
        description = "Compatible generic class names of Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-helper" = callPackage
@@ -24749,7 +24749,7 @@ self: {
          aeson base text unordered-containers vector
        ];
        description = "Aeson helper func";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-injector" = callPackage
@@ -24773,8 +24773,8 @@ self: {
          scientific swagger2 tasty tasty-hunit tasty-quickcheck text vector
        ];
        description = "Injecting fields into aeson values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24791,7 +24791,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Aeson instances for iproute types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-json-ast" = callPackage
@@ -24802,7 +24802,7 @@ self: {
        sha256 = "0p9da4cpbj811b9va2rhhn95cqckhabhr9k4fjfd536dzrxqjigz";
        libraryHaskellDepends = [ aeson base json-ast ];
        description = "Integration layer for \"json-ast\" and \"aeson\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-lens" = callPackage
@@ -24818,7 +24818,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Lens of Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-match-qq" = callPackage
@@ -24838,8 +24838,8 @@ self: {
          aeson aeson-qq base hspec unordered-containers
        ];
        description = "Declarative JSON matchers";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24860,8 +24860,8 @@ self: {
          unordered-containers vector
        ];
        description = "Fast JSON parsing and encoding (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24881,7 +24881,7 @@ self: {
          optics-extra scientific text unordered-containers vector
        ];
        description = "Law-abiding optics for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-options" = callPackage
@@ -24894,8 +24894,8 @@ self: {
        editedCabalFile = "0sibi1vhgkx0v082iffpqxg1mshrwd1d1s3xnpaqn0rdpfpja31d";
        libraryHaskellDepends = [ aeson base ];
        description = "Options to derive FromJSON/ToJSON instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24911,7 +24911,7 @@ self: {
          aeson base parsec scientific text unordered-containers vector
        ];
        description = "Alternative JSON parser based on Parsec and Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-picker" = callPackage
@@ -24923,7 +24923,7 @@ self: {
        libraryHaskellDepends = [ aeson base lens lens-aeson text ];
        testHaskellDepends = [ base hspec text ];
        description = "Tiny library to get fields from JSON format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-prefix" = callPackage
@@ -24939,8 +24939,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hspec mtl text ];
        description = "Hiearchical prefixing for aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -24962,7 +24962,7 @@ self: {
          aeson attoparsec base bytestring cmdargs
        ];
        description = "JSON pretty-printing library and command-line tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-qq" = callPackage
@@ -24983,7 +24983,7 @@ self: {
          parsec scientific template-haskell text vector
        ];
        description = "JSON quasiquoter for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-quick" = callPackage
@@ -25003,7 +25003,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ aeson base bytestring criterion text ];
        description = "Quick JSON extractions with Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-result" = callPackage
@@ -25014,7 +25014,7 @@ self: {
        sha256 = "10bnzh7vlh42sip0z7mvx5jxrsi7p2s3vqy55pfg2pb17czzly2y";
        libraryHaskellDepends = [ aeson aeson-helper base text ];
        description = "API Result for aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-schema" = callPackage
@@ -25043,8 +25043,8 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        description = "Haskell JSON schema validator and parser generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25074,8 +25074,8 @@ self: {
          megaparsec template-haskell text th-test-utils unordered-containers
        ];
        description = "Easily consume JSON data on-demand with type-safety";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25088,7 +25088,7 @@ self: {
        libraryHaskellDepends = [ aeson base cereal ];
        testHaskellDepends = [ aeson base cereal hspec HUnit ];
        description = "Simple serialization functions for aeson types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-smart" = callPackage
@@ -25104,8 +25104,8 @@ self: {
          vector
        ];
        description = "Smart derivation of Aeson instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25121,8 +25121,8 @@ self: {
          aeson attoparsec base bytestring HsOpenSSL http-streams io-streams
        ];
        description = "An HTTP client library for JSON-based APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25142,8 +25142,8 @@ self: {
          vector
        ];
        description = "Transform JSON";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25163,8 +25163,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ aeson base hspec ];
        description = "Aeson instances for the Tiled map editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25177,7 +25177,7 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring failure text ];
        testHaskellDepends = [ base hspec ];
        description = "A generalization of Aeson over Failure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-typescript" = callPackage
@@ -25199,8 +25199,8 @@ self: {
          th-abstraction unordered-containers
        ];
        description = "Generate TypeScript definition files from your ADTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25218,8 +25218,8 @@ self: {
          aeson attoparsec base bytestring scientific text
        ];
        description = "Utilities for working with Aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25237,7 +25237,7 @@ self: {
          text text-builder transformers unordered-containers vector
        ];
        description = "API for parsing \"aeson\" JSON tree into Haskell types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-via" = callPackage
@@ -25251,7 +25251,7 @@ self: {
          aeson aeson-casing base newtype-generics text
        ];
        description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aeson-with" = callPackage
@@ -25267,7 +25267,7 @@ self: {
          vector
        ];
        description = "withXField combinators for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-yak" = callPackage
@@ -25278,7 +25278,7 @@ self: {
        sha256 = "0x5a5z0bmiljl9rfapyq6srffp6v3g25qvy0x692a5as66y5ahxg";
        libraryHaskellDepends = [ aeson base ];
        description = "Handle JSON that may or may not be a list, or exist";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aeson-yaml" = callPackage
@@ -25301,7 +25301,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Output any Aeson value as YAML (pure Haskell library)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "affection" = callPackage
@@ -25320,8 +25320,8 @@ self: {
          monad-parallel mtl OpenGL sdl2 stm text uuid vector
        ];
        description = "A simple Game Engine using SDL";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25335,7 +25335,7 @@ self: {
        editedCabalFile = "1avxd17y9k0afqjgb8gq254a6ys7dpncgiyrp6mxbngdcvjyahyc";
        libraryHaskellDepends = [ alg base ];
        description = "Affine spaces (generalized)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "affine-invariant-ensemble-mcmc" = callPackage
@@ -25350,8 +25350,8 @@ self: {
          base containers mwc-random primitive split vector
        ];
        description = "General-purpose sampling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25362,7 +25362,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1bldljkgsb9v7ss3l87mm4r9wjpp3z02hjnfdnp84pmaj0b34vam";
        libraryHaskellDepends = [ base ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "afis" = callPackage
@@ -25384,7 +25384,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Anti-forensic Information Splitter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "afv" = callPackage
@@ -25401,8 +25401,8 @@ self: {
          base bytestring directory language-c mtl process yices
        ];
        description = "Infinite state model checking of iterative C programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25416,8 +25416,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers uuagc uulib ];
        description = "Attribute Grammar picture generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25438,8 +25438,8 @@ self: {
          pandoc snap-core snap-server transformers utf8-string xhtml
        ];
        description = "Http server for Agda (prototype)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25460,8 +25460,8 @@ self: {
        ];
        executableHaskellDepends = [ Agda base network-uri transformers ];
        description = "Render just the Agda snippets of a literate Agda file to HTML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25478,8 +25478,8 @@ self: {
          pandoc-types
        ];
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25502,8 +25502,8 @@ self: {
        ];
        testHaskellDepends = [ base containers filepath hspec text ];
        description = "Check for unused code in an Agda project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25519,7 +25519,7 @@ self: {
          base directory filepath optparse-applicative
        ];
        description = "Translate .agda files into .lagda.tex files.";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "agentx" = callPackage
@@ -25540,8 +25540,8 @@ self: {
          snmp time transformers unix
        ];
        description = "AgentX protocol for write SNMP subagents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25574,8 +25574,8 @@ self: {
          base QuickCheck tasty tasty-ant-xml tasty-quickcheck
        ];
        description = "And-inverter graphs in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25604,8 +25604,8 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Aeronautical Information Package (AIP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25621,7 +25621,7 @@ self: {
          array base bytestring containers directory filepath mtl text time
        ];
        description = "air";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "air-extra" = callPackage
@@ -25637,7 +25637,7 @@ self: {
          parsec regexpr text time
        ];
        description = "air-extra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "air-spec" = callPackage
@@ -25649,7 +25649,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hspec text ];
        description = "air spec helper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "air-th" = callPackage
@@ -25660,8 +25660,8 @@ self: {
        sha256 = "0rhp56qvwiwlrs7pvpbslybvlp4xnllfjab6pap2chxgywas34pq";
        libraryHaskellDepends = [ air base template-haskell ];
        description = "air";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25681,8 +25681,8 @@ self: {
          transformers utf8-string wai
        ];
        description = "An Airbrake notifier for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25712,8 +25712,8 @@ self: {
          transformers wai
        ];
        description = "A Webmachine-inspired HTTP library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25731,8 +25731,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Requesting and introspecting Tables within an Airtable project";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25749,7 +25749,7 @@ self: {
          random semigroups vector
        ];
        description = "A multi-method simulation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-branches" = callPackage
@@ -25764,7 +25764,7 @@ self: {
          aivika aivika-transformers base containers mtl mwc-random random
        ];
        description = "Nested discrete event simulation module for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-distributed" = callPackage
@@ -25781,8 +25781,8 @@ self: {
          distributed-process exceptions mtl mwc-random random stm time
        ];
        description = "Parallel distributed discrete event simulation module for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25799,7 +25799,7 @@ self: {
          network-uri parallel-io split
        ];
        description = "Simulation experiments for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-experiment-cairo" = callPackage
@@ -25815,7 +25815,7 @@ self: {
          colour lens
        ];
        description = "Cairo-based charting backend for the Aivika simulation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-experiment-chart" = callPackage
@@ -25832,7 +25832,7 @@ self: {
          data-default-class filepath lens mtl split
        ];
        description = "Simulation experiments with charting for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-experiment-diagrams" = callPackage
@@ -25848,8 +25848,8 @@ self: {
          colour containers filepath lens
        ];
        description = "Diagrams-based charting backend for the Aivika simulation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25866,7 +25866,7 @@ self: {
          unordered-containers
        ];
        description = "GPSS-like DSL for Aivika";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-lattice" = callPackage
@@ -25882,7 +25882,7 @@ self: {
          random
        ];
        description = "Nested discrete event simulation module for the Aivika library using lattice";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-realtime" = callPackage
@@ -25898,7 +25898,7 @@ self: {
          random stm time vector
        ];
        description = "Soft real-time simulation module for the Aivika library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aivika-transformers" = callPackage
@@ -25914,7 +25914,7 @@ self: {
          semigroups vector
        ];
        description = "Transformers for the Aivika simulation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ajhc" = callPackage
@@ -25941,8 +25941,8 @@ self: {
          regex-compat syb temporary unix utf8-string zlib
        ];
        description = "Haskell compiler that produce binary through C language";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -25956,7 +25956,7 @@ self: {
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
        description = "OpenAL 1.1 raw API.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
@@ -25974,7 +25974,7 @@ self: {
          async base clock hspec stm time unbounded-delays
        ];
        description = "Wake up and perform an action at a certain time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alea" = callPackage
@@ -25990,7 +25990,7 @@ self: {
          base optparse-applicative random text
        ];
        description = "a diceware passphrase generator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "alerta" = callPackage
@@ -26008,8 +26008,8 @@ self: {
          servant-server text time
        ];
        description = "Bindings to the alerta REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26021,7 +26021,7 @@ self: {
        sha256 = "14fyckdwwhp786z2gg6m92xmz0rbvqwalj0bylqagi9n295ni74f";
        libraryHaskellDepends = [ base blaze-html text ];
        description = "Alert messages for web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alex" = callPackage
@@ -26038,7 +26038,7 @@ self: {
        executableToolDepends = [ happy ];
        testHaskellDepends = [ base process ];
        description = "Alex is a tool for generating lexical analysers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alex-meta" = callPackage
@@ -26054,7 +26054,7 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Quasi-quoter for Alex lexers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alex-prelude" = callPackage
@@ -26065,8 +26065,8 @@ self: {
        sha256 = "1ngxkr7jvy48pgq0sjqpi7a84qjm4fjny64hxksyvbj08l2rn7ha";
        libraryHaskellDepends = [ base time ];
        description = "Collection of useful functions for writing console applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26081,8 +26081,8 @@ self: {
          base bytestring deepseq template-haskell text
        ];
        description = "A set of functions for a common use case of Alex";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26101,8 +26101,8 @@ self: {
          text xmlgen
        ];
        description = "utility library for Alfred version 2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26124,7 +26124,7 @@ self: {
          quickcheck-instances text
        ];
        description = "Fast Aho-Corasick string searching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alg" = callPackage
@@ -26137,7 +26137,7 @@ self: {
        editedCabalFile = "0rm66k502d8la140ffawd38yaf0hr92h8x7xrq6krn6ypljwql0v";
        libraryHaskellDepends = [ base dual util ];
        description = "Algebraic structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alga" = callPackage
@@ -26169,8 +26169,8 @@ self: {
          tf-random transformers
        ];
        description = "Algorithmic automation for various DAWs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26189,7 +26189,7 @@ self: {
          semigroupoids semigroups tagged transformers void
        ];
        description = "Constructive abstract algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "algebra-checkers" = callPackage
@@ -26206,8 +26206,8 @@ self: {
          syb template-haskell th-instance-reification transformers
        ];
        description = "Model and test API surfaces algebraically";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26223,8 +26223,8 @@ self: {
          aeson base containers fgl mtl parsec template-haskell transformers
        ];
        description = "Infrastructure for DAG-shaped relational algebra plans";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26243,7 +26243,7 @@ self: {
          QuickCheck quickspec
        ];
        description = "Companion library for the book Algebra-Driven Design by Sandy Maguire";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "algebra-sql" = callPackage
@@ -26269,8 +26269,8 @@ self: {
          process template-haskell text time transformers
        ];
        description = "Relational Algebra and SQL Code Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26282,8 +26282,8 @@ self: {
        sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh";
        libraryHaskellDepends = [ accelerate base ];
        description = "General linear algebra structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26297,7 +26297,7 @@ self: {
        editedCabalFile = "0w3845hl7cppdk3zvhmz0zic7sbcklfircx97wf9dhh40q3qdcmi";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Conversions between algebraic classes and F-algebras";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "algebraic-graphs" = callPackage
@@ -26316,7 +26316,7 @@ self: {
          QuickCheck transformers
        ];
        description = "A library for algebraic graph construction and transformation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "algebraic-graphs-io" = callPackage
@@ -26342,7 +26342,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "I/O utilities and datasets for algebraic-graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -26357,8 +26357,8 @@ self: {
          algebra base basic-prelude lens semigroups
        ];
        description = "Algebraically structured Prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26384,8 +26384,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of Knuth's algorithm S";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26411,8 +26411,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A client implementing the Algolia search API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26424,7 +26424,7 @@ self: {
        sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9";
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "Sequence alignment algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "align-text" = callPackage
@@ -26437,8 +26437,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A simple unix filter to align text on specified substrings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26450,7 +26450,7 @@ self: {
        sha256 = "0hmnp08k04c0ag9fyp5sajg54r4gi57vrd9krk4g8y8fri0fgc00";
        libraryHaskellDepends = [ base ];
        description = "An aligned ForeignPtr type";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "alist" = callPackage
@@ -26461,7 +26461,7 @@ self: {
        sha256 = "0ydq2sxyfgij0rf54i3ajj4hdqjawhcdsgi822yrkq86xjvsxc4w";
        libraryHaskellDepends = [ base ];
        description = "lists with O(1) append";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "allocated-processor" = callPackage
@@ -26472,7 +26472,7 @@ self: {
        sha256 = "0jhz3q0972snrgd9c7lr934ddkwllwgw6anj7ax8hj4zi0zc615m";
        libraryHaskellDepends = [ base vector-space ];
        description = "Functional combinators for monadic actions that require allocation and de-allocation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alloy" = callPackage
@@ -26483,7 +26483,7 @@ self: {
        sha256 = "0hy3x87idw60rx2plv69i7hd22qxircvasvx9cjbd1w603vqk8zh";
        libraryHaskellDepends = [ base containers mtl syb vector ];
        description = "Generic programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alloy-proxy-fd" = callPackage
@@ -26494,7 +26494,7 @@ self: {
        sha256 = "1fhk5ydnf0l0n579gqg5lfg2cc9z8xbgqsqzgkpcw0046kp53rjw";
        libraryHaskellDepends = [ alloy base mtl ];
        description = "Some add-on instances for the Alloy library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ally-invest" = callPackage
@@ -26514,8 +26514,8 @@ self: {
          http-client-tls safe text time
        ];
        description = "Ally Invest integration library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26527,7 +26527,7 @@ self: {
        sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90";
        libraryHaskellDepends = [ base ];
        description = "Recurse while a predicate is satisfied";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alms" = callPackage
@@ -26549,8 +26549,8 @@ self: {
          stm syb template-haskell transformers tuple
        ];
        description = "a practical affine language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26571,8 +26571,8 @@ self: {
          transformers unix
        ];
        description = "A compiler for the Alpha language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26593,8 +26593,8 @@ self: {
          tasty-hedgehog tasty-hspec tasty-hunit text
        ];
        description = "A character between a-z";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26618,7 +26618,7 @@ self: {
        ];
        description = "Alpino data manipulation tools";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "alsa" = callPackage
@@ -26634,8 +26634,8 @@ self: {
        ];
        librarySystemDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) alsaLib;};
 
@@ -26648,8 +26648,8 @@ self: {
        libraryHaskellDepends = [ base extensible-exceptions ];
        libraryPkgconfigDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API (Exceptions)";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-gui" = callPackage
@@ -26666,8 +26666,8 @@ self: {
          alsa-core alsa-seq base midi midi-alsa wx wxcore
        ];
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26689,7 +26689,7 @@ self: {
        executableSystemDepends = [ alsaLib ];
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) alsaLib;};
 
@@ -26703,8 +26703,8 @@ self: {
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the ALSA simple mixer API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -26723,8 +26723,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API (PCM audio)";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -26737,8 +26737,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26759,8 +26759,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API (MIDI sequencer)";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
@@ -26773,8 +26773,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA sequencer library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26786,8 +26786,8 @@ self: {
        sha256 = "1jcc6cx0jj5ddvyq8xii9ar67ic3vlmy351qgybn74clpipgdyrm";
        libraryHaskellDepends = [ base composition ];
        description = "Alternative combinators for unorthodox function composition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26799,8 +26799,8 @@ self: {
        sha256 = "1l6fjvh38qh3jqz3hvf4km3bzyp9x9w6hn9qk0rvs2z7bkasssl9";
        libraryHaskellDepends = [ base ];
        description = "Extra utilities for alternatives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26818,8 +26818,8 @@ self: {
          base lifted-base monad-control transformers transformers-base
        ];
        description = "IO as Alternative instance (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26831,7 +26831,7 @@ self: {
        sha256 = "1cf7akvr9nac1483chh7rd3xp5i5zk78f245lw9ixj6v133lnis2";
        libraryHaskellDepends = [ base vector ];
        description = "Use vectors instead of lists for many and some";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alternators" = callPackage
@@ -26846,7 +26846,7 @@ self: {
          base lens mmorph mtl newtype-generics stm transformers
        ];
        description = "Handy functions when using transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "altfloat" = callPackage
@@ -26858,7 +26858,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Alternative floating point support for GHC";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "alto" = callPackage
@@ -26882,8 +26882,8 @@ self: {
        ];
        executableHaskellDepends = [ base warp ];
        description = "Implement a menu experience fit for web users";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26900,7 +26900,7 @@ self: {
          base bytestring cereal tasty tasty-hunit tasty-quickcheck
        ];
        description = "HTTP Alternative Services";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "alure" = callPackage
@@ -26913,7 +26913,7 @@ self: {
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) alure;};
 
@@ -26924,7 +26924,7 @@ self: {
        version = "0.1";
        sha256 = "15fwq1pmb3d46cgsj59q3iz2qs0lgvq5b9d6gxfysnjlm3sp0ivw";
        description = "provides a typeclass that is always satisfied";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "amazon-emailer" = callPackage
@@ -26943,8 +26943,8 @@ self: {
          mime-mail-ses postgresql-simple resourcet text time
        ];
        description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26959,8 +26959,8 @@ self: {
          base mtl snap snaplet-postgresql-simple text
        ];
        description = "Client library for amazon-emailer daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -26986,8 +26986,8 @@ self: {
          base bytestring http-conduit text transformers
        ];
        description = "Connector for Amazon Products API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -27012,8 +27012,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Comprehensive Amazon Web Services SDK";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -27031,7 +27031,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Alexa For Business SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-apigateway" = callPackage
@@ -27048,7 +27048,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon API Gateway SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
@@ -27065,7 +27065,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Application Auto Scaling SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-appstream" = callPackage
@@ -27082,7 +27082,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon AppStream SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-appsync" = callPackage
@@ -27099,7 +27099,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon AppSync SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-athena" = callPackage
@@ -27116,7 +27116,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Athena SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-autoscaling" = callPackage
@@ -27133,7 +27133,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Auto Scaling SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-autoscaling-plans" = callPackage
@@ -27150,7 +27150,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Auto Scaling Plans SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-batch" = callPackage
@@ -27167,7 +27167,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Batch SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-budgets" = callPackage
@@ -27184,7 +27184,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Budgets SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-certificatemanager" = callPackage
@@ -27201,7 +27201,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Certificate Manager SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-certificatemanager-pca" = callPackage
@@ -27218,7 +27218,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Certificate Manager Private Certificate Authority SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloud9" = callPackage
@@ -27235,7 +27235,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cloud9 SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-clouddirectory" = callPackage
@@ -27252,7 +27252,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudDirectory SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudformation" = callPackage
@@ -27269,7 +27269,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudFormation SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudfront" = callPackage
@@ -27286,7 +27286,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudFront SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudhsm" = callPackage
@@ -27303,7 +27303,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudHSM SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudhsmv2" = callPackage
@@ -27320,7 +27320,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudHSM V2 SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudsearch" = callPackage
@@ -27337,7 +27337,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudSearch SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
@@ -27354,7 +27354,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudSearch Domain SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudtrail" = callPackage
@@ -27371,7 +27371,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudTrail SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudwatch" = callPackage
@@ -27388,7 +27388,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudWatch SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudwatch-events" = callPackage
@@ -27405,7 +27405,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudWatch Events SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
@@ -27422,7 +27422,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CloudWatch Logs SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codebuild" = callPackage
@@ -27439,7 +27439,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodeBuild SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codecommit" = callPackage
@@ -27456,7 +27456,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodeCommit SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codedeploy" = callPackage
@@ -27473,7 +27473,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodeDeploy SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codepipeline" = callPackage
@@ -27490,7 +27490,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodePipeline SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-codestar" = callPackage
@@ -27507,7 +27507,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon CodeStar SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cognito-identity" = callPackage
@@ -27524,7 +27524,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cognito Identity SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
@@ -27541,7 +27541,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cognito Identity Provider SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cognito-sync" = callPackage
@@ -27558,7 +27558,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cognito Sync SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-comprehend" = callPackage
@@ -27575,7 +27575,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Comprehend SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-config" = callPackage
@@ -27592,7 +27592,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Config SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-connect" = callPackage
@@ -27609,7 +27609,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Connect Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-core" = callPackage
@@ -27641,7 +27641,7 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell text time
        ];
        description = "Core data types and functionality for Amazonka libraries";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cost-explorer" = callPackage
@@ -27658,7 +27658,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cost Explorer Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-cur" = callPackage
@@ -27675,7 +27675,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Cost and Usage Report Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-datapipeline" = callPackage
@@ -27692,7 +27692,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Data Pipeline SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-devicefarm" = callPackage
@@ -27709,7 +27709,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Device Farm SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-directconnect" = callPackage
@@ -27726,7 +27726,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Direct Connect SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-discovery" = callPackage
@@ -27743,7 +27743,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Application Discovery Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-dms" = callPackage
@@ -27760,7 +27760,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Database Migration Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ds" = callPackage
@@ -27777,7 +27777,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Directory Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-dynamodb" = callPackage
@@ -27794,7 +27794,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon DynamoDB SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-dynamodb-dax" = callPackage
@@ -27811,7 +27811,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon DynamoDB Accelerator (DAX) SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-dynamodb-streams" = callPackage
@@ -27828,7 +27828,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon DynamoDB Streams SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ec2" = callPackage
@@ -27845,7 +27845,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Compute Cloud SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -27862,7 +27862,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon EC2 Container Registry SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ecs" = callPackage
@@ -27879,7 +27879,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon EC2 Container Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-efs" = callPackage
@@ -27896,7 +27896,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic File System SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elasticache" = callPackage
@@ -27913,7 +27913,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon ElastiCache SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
@@ -27930,7 +27930,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Beanstalk SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elasticsearch" = callPackage
@@ -27947,7 +27947,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elasticsearch Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elastictranscoder" = callPackage
@@ -27964,7 +27964,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Transcoder SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elb" = callPackage
@@ -27981,7 +27981,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Load Balancing SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-elbv2" = callPackage
@@ -27998,7 +27998,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic Load Balancing SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-emr" = callPackage
@@ -28015,7 +28015,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elastic MapReduce SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-fms" = callPackage
@@ -28032,7 +28032,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Firewall Management Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-gamelift" = callPackage
@@ -28049,7 +28049,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon GameLift SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-glacier" = callPackage
@@ -28066,7 +28066,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Glacier SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-glue" = callPackage
@@ -28083,7 +28083,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Glue SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-greengrass" = callPackage
@@ -28100,7 +28100,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Greengrass SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-guardduty" = callPackage
@@ -28117,7 +28117,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon GuardDuty SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-health" = callPackage
@@ -28134,7 +28134,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Health APIs and Notifications SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iam" = callPackage
@@ -28151,7 +28151,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Identity and Access Management SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iam-policy" = callPackage
@@ -28172,7 +28172,7 @@ self: {
          aeson aeson-pretty base bytestring doctest hspec
        ];
        description = "Amazon IAM Policy Document DSL and Combinators";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-importexport" = callPackage
@@ -28189,7 +28189,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Import/Export SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-inspector" = callPackage
@@ -28206,7 +28206,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Inspector SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iot" = callPackage
@@ -28223,7 +28223,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon IoT SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iot-analytics" = callPackage
@@ -28240,7 +28240,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon IoT Analytics SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iot-dataplane" = callPackage
@@ -28257,7 +28257,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon IoT Data Plane SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-iot-jobs-dataplane" = callPackage
@@ -28274,7 +28274,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon IoT Jobs Data Plane SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis" = callPackage
@@ -28291,7 +28291,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-analytics" = callPackage
@@ -28308,7 +28308,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Analytics SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
@@ -28325,7 +28325,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Firehose SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-video" = callPackage
@@ -28342,7 +28342,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Video Streams SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-video-archived-media" = callPackage
@@ -28359,7 +28359,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Video Streams Archived Media SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kinesis-video-media" = callPackage
@@ -28376,7 +28376,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Kinesis Video Streams Media SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-kms" = callPackage
@@ -28393,7 +28393,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Key Management Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-lambda" = callPackage
@@ -28410,7 +28410,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Lambda SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-lex-models" = callPackage
@@ -28427,7 +28427,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Lex Model Building Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-lex-runtime" = callPackage
@@ -28444,7 +28444,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Lex Runtime Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -28461,7 +28461,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Lightsail SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
@@ -28478,7 +28478,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Marketplace Commerce Analytics SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-marketplace-entitlement" = callPackage
@@ -28495,7 +28495,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Marketplace Entitlement Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-marketplace-metering" = callPackage
@@ -28512,7 +28512,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Marketplace Metering SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mechanicalturk" = callPackage
@@ -28529,7 +28529,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Mechanical Turk SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mediaconvert" = callPackage
@@ -28546,7 +28546,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaConvert SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-medialive" = callPackage
@@ -28563,7 +28563,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaLive SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mediapackage" = callPackage
@@ -28580,7 +28580,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaPackage SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mediastore" = callPackage
@@ -28597,7 +28597,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaStore SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mediastore-dataplane" = callPackage
@@ -28614,7 +28614,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Elemental MediaStore Data Plane SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-migrationhub" = callPackage
@@ -28631,7 +28631,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Migration Hub SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ml" = callPackage
@@ -28648,7 +28648,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Machine Learning SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mobile" = callPackage
@@ -28665,7 +28665,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Mobile SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-mq" = callPackage
@@ -28682,7 +28682,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon MQ SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-opsworks" = callPackage
@@ -28699,7 +28699,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon OpsWorks SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-opsworks-cm" = callPackage
@@ -28716,7 +28716,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon OpsWorks for Chef Automate SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-organizations" = callPackage
@@ -28733,7 +28733,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Organizations SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-pinpoint" = callPackage
@@ -28750,7 +28750,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Pinpoint SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-polly" = callPackage
@@ -28767,7 +28767,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Polly SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-pricing" = callPackage
@@ -28784,7 +28784,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Price List Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-rds" = callPackage
@@ -28801,7 +28801,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Relational Database Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-redshift" = callPackage
@@ -28818,7 +28818,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Redshift SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-rekognition" = callPackage
@@ -28835,7 +28835,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Rekognition SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-resourcegroups" = callPackage
@@ -28852,7 +28852,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Resource Groups SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-resourcegroupstagging" = callPackage
@@ -28869,7 +28869,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Resource Groups Tagging API SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-route53" = callPackage
@@ -28886,7 +28886,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Route 53 SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-route53-autonaming" = callPackage
@@ -28903,7 +28903,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Route 53 Auto Naming SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-route53-domains" = callPackage
@@ -28920,7 +28920,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Route 53 Domains SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-s3" = callPackage
@@ -28937,7 +28937,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Storage Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -28956,8 +28956,8 @@ self: {
          dlist exceptions http-client lens mmorph mtl
        ];
        description = "Provides conduits to upload data to S3 using the Multipart API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -28975,7 +28975,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon SageMaker Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sagemaker-runtime" = callPackage
@@ -28992,7 +28992,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon SageMaker Runtime SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -29009,7 +29009,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon SimpleDB SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-secretsmanager" = callPackage
@@ -29026,7 +29026,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Secrets Manager SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-serverlessrepo" = callPackage
@@ -29043,7 +29043,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon ServerlessApplicationRepository SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-servicecatalog" = callPackage
@@ -29060,7 +29060,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Service Catalog SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ses" = callPackage
@@ -29077,7 +29077,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Email Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-shield" = callPackage
@@ -29094,7 +29094,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Shield SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sms" = callPackage
@@ -29111,7 +29111,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Server Migration Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-snowball" = callPackage
@@ -29128,7 +29128,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Import/Export Snowball SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sns" = callPackage
@@ -29145,7 +29145,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Notification Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sqs" = callPackage
@@ -29162,7 +29162,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Queue Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-ssm" = callPackage
@@ -29179,7 +29179,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Systems Manager (SSM) SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-stepfunctions" = callPackage
@@ -29196,7 +29196,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Step Functions SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-storagegateway" = callPackage
@@ -29213,7 +29213,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Storage Gateway SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-sts" = callPackage
@@ -29230,7 +29230,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Security Token Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-support" = callPackage
@@ -29247,7 +29247,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Support SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-swf" = callPackage
@@ -29264,7 +29264,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Simple Workflow Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-test" = callPackage
@@ -29285,7 +29285,7 @@ self: {
          unordered-containers yaml
        ];
        description = "Common functionality for Amazonka library test-suites";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-transcribe" = callPackage
@@ -29302,7 +29302,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Transcribe Service SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-translate" = callPackage
@@ -29319,7 +29319,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon Translate SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-waf" = callPackage
@@ -29336,7 +29336,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WAF SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-waf-regional" = callPackage
@@ -29353,7 +29353,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WAF Regional SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-workdocs" = callPackage
@@ -29370,7 +29370,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WorkDocs SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-workmail" = callPackage
@@ -29387,7 +29387,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WorkMail SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-workspaces" = callPackage
@@ -29404,7 +29404,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon WorkSpaces SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amazonka-xray" = callPackage
@@ -29421,7 +29421,7 @@ self: {
          time unordered-containers
        ];
        description = "Amazon X-Ray SDK";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "amby" = callPackage
@@ -29446,8 +29446,8 @@ self: {
        testHaskellDepends = [ base doctest tasty tasty-hunit vector ];
        benchmarkHaskellDepends = [ base statistics ];
        description = "Statistical data visualization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29479,7 +29479,7 @@ self: {
        ];
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29507,7 +29507,7 @@ self: {
          split stm text vector
        ];
        description = "Client library for AMQP servers (currently only RabbitMQ)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -29527,8 +29527,8 @@ self: {
          amqp base bytestring conduit hspec HUnit resourcet transformers
        ];
        description = "Conduit bindings for AMQP (see amqp package)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29545,8 +29545,8 @@ self: {
          amqp base bytestring hspec process streamly testcontainers text
        ];
        description = "A simple streamly wrapper for amqp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29567,7 +29567,7 @@ self: {
          utf8-string x509-system
        ];
        description = "AMQP toolset for the command line";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "amqp-worker" = callPackage
@@ -29593,8 +29593,8 @@ self: {
          aeson amqp base bytestring data-default exceptions monad-control
          monad-loops mtl resource-pool server split text transformers-base
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {server = null;};
 
@@ -29630,7 +29630,7 @@ self: {
        testHaskellDepends = [ base case-insensitive hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Find strings with permutations (anagrams) that match a regular expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "analyze" = callPackage
@@ -29652,8 +29652,8 @@ self: {
          tasty-quickcheck text unordered-containers vector
        ];
        description = "making data science easy and safe with data frames";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29670,8 +29670,8 @@ self: {
          snap-core time
        ];
        description = "Client for analyze service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29694,7 +29694,7 @@ self: {
          system-fileio system-filepath text
        ];
        description = "Simple literate programming preprocessor";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "anansi-hscolour" = callPackage
@@ -29709,7 +29709,7 @@ self: {
          anansi base bytestring containers hscolour monads-tf text
        ];
        description = "Colorized looms for Anansi";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "anansi-pandoc" = callPackage
@@ -29724,8 +29724,8 @@ self: {
          anansi base bytestring containers monads-tf pandoc text
        ];
        description = "Looms which use Pandoc to parse and produce a variety of formats";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29752,8 +29752,8 @@ self: {
          tagsoup text time vector
        ];
        description = "Anatomy: Atomo documentation system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29765,8 +29765,8 @@ self: {
        sha256 = "1wn0kap7bw6sp9yi1awcmxh11s5ra4b44qbf97plsvrmpfz15cc5";
        libraryHaskellDepends = [ base process ];
        description = "Android methods exposed to Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29778,8 +29778,8 @@ self: {
        sha256 = "07mgmpcwj7xi3ibmlcz45l645s5cbfnkr1brlhrzbnbyx72x7dr6";
        libraryHaskellDepends = [ base data-default ];
        description = "Turn regular Haskell programs into Android Activities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29806,8 +29806,8 @@ self: {
          base basic-prelude directory hspec hxt QuickCheck stringable
        ];
        description = "A pretty printer for Android Lint errors";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29835,8 +29835,8 @@ self: {
          unordered-containers
        ];
        description = "Process management and supervision daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29865,8 +29865,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A small, general-purpose programming language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29878,7 +29878,7 @@ self: {
        sha256 = "0csbs9yrl8vhlgs7zax06shqlhcjs38q91wnkz5d3f6a4588lyqi";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Convert camelCase to snake_case and vice versa";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "animascii" = callPackage
@@ -29899,8 +29899,8 @@ self: {
        ];
        testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
        description = "text-file based ASCII animator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29917,8 +29917,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base containers hspec vector ];
        description = "Animation for sprites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29937,8 +29937,8 @@ self: {
          text
        ];
        description = "Animation for sprites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29960,8 +29960,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Convert sprite frames to animate files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -29987,8 +29987,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Preview tool for sprite animation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30000,8 +30000,8 @@ self: {
        sha256 = "0wpx0jv2zyphhxi84bw4h1bw6apbazcadfxzzj90ddc3cb5lhv9n";
        libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
        description = "sdl2 + animate auxiliary library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30022,7 +30022,7 @@ self: {
        ];
        executableHaskellDepends = [ base data-default ];
        description = "Tools for interacting with Anki database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "annah" = callPackage
@@ -30045,8 +30045,8 @@ self: {
          base morte optparse-applicative system-fileio system-filepath text
        ];
        description = "Medium-level language that desugars to Morte";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30058,7 +30058,7 @@ self: {
        sha256 = "00f0pyf2fxdvwwz9bz3mpp7db39p1m83frvlif74kp0y1x8r20yp";
        libraryHaskellDepends = [ base ];
        description = "Semigroups with annihilators and utility functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "annotated-fix" = callPackage
@@ -30069,8 +30069,8 @@ self: {
        sha256 = "1lhyllmi8j9r5mdr5pngw1s1xzs1cwv2hh2ym8kkdrxvrq93dk2i";
        libraryHaskellDepends = [ base recursion-schemes ];
        description = "A fixpoint of a functor that can be annotated";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30084,7 +30084,7 @@ self: {
        editedCabalFile = "138k24qxvl90l7dwdw1b3w36mpw93n0xi0nljblqg88pxg7jcvjx";
        libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer, with annotation support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "anonymous-sums" = callPackage
@@ -30095,8 +30095,8 @@ self: {
        sha256 = "1bf27vzv21wi634vridxm2mvfjp3wwfwv50pcbdpzscwn4yc3if7";
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Anonymous sum types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30108,8 +30108,8 @@ self: {
        sha256 = "0a7f7d3xzn8nl9gyzr4wl7m83aszmw42nd0dj8b875khh7i01h0b";
        libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        description = "QuickCheck functions to accompany the anonymous-sums package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30121,7 +30121,7 @@ self: {
        sha256 = "1aj7p937c48laz5kkhil45lgkjiivcidky6vxxp3q5yvkymsijvb";
        libraryHaskellDepends = [ base ];
        description = "Haskell package to generate ANSI escape codes for styling strings in the terminal";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ansi-pretty" = callPackage
@@ -30141,7 +30141,7 @@ self: {
          vector
        ];
        description = "AnsiPretty for ansi-wl-pprint";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ansi-terminal" = callPackage
@@ -30154,7 +30154,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
        description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ansi-terminal_0_11" = callPackage
@@ -30167,8 +30167,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
        description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ansi-terminal-game" = callPackage
@@ -30194,8 +30194,8 @@ self: {
          linebreak mtl QuickCheck random split terminal-size timers-tick
        ];
        description = "sdl-like functions for terminal applications, based on ansi-terminal";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30211,7 +30211,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ansigraph" = callPackage
@@ -30225,8 +30225,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Terminal-based graphing via ANSI and Unicode";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30252,8 +30252,8 @@ self: {
          time time-locale-compat yesod yesod-auth
        ];
        description = "A web interface to Antisplice dungeons";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30276,8 +30276,8 @@ self: {
          transformers
        ];
        description = "Referring expressions for definitions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30303,8 +30303,8 @@ self: {
          ironforge mtl network plugins time transformers
        ];
        description = "This is an IRC bot for Mafia and Resistance";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30322,8 +30322,8 @@ self: {
          http-conduit resourcet safe text transformers
        ];
        description = "Interface for antigate.com captcha recognition API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30339,7 +30339,7 @@ self: {
        executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30361,8 +30361,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30376,8 +30376,8 @@ self: {
          aeson antiope-s3 avro base bytestring text
        ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30404,8 +30404,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30428,8 +30428,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30449,8 +30449,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30475,8 +30475,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30498,8 +30498,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30528,8 +30528,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30559,8 +30559,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30584,8 +30584,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30612,8 +30612,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30629,7 +30629,7 @@ self: {
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "antiprimes" = callPackage
@@ -30641,7 +30641,7 @@ self: {
        libraryHaskellDepends = [ base primes ];
        testHaskellDepends = [ base hspec ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "antiquoter" = callPackage
@@ -30652,8 +30652,8 @@ self: {
        sha256 = "1qv5iid7az7bn1jf6r7ffg5qqbcs8ypf78j4vrs5ajwp39jnbiiy";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Combinator library for quasi- and anti-quoting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30670,8 +30670,8 @@ self: {
          transformers
        ];
        description = "An engine for text-based dungeons";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30696,8 +30696,8 @@ self: {
          unordered-containers
        ];
        description = "A Haskell implementation of the ANTLR top-down parser generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30718,8 +30718,8 @@ self: {
          base bytestring enumerator haskell98 regex-posix
        ];
        description = "Haskell binding to the ANTLR parser generator C runtime library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {antlr3c = null;};
 
@@ -30736,7 +30736,7 @@ self: {
        libraryHaskellDepends = [ base containers MissingH mtl ];
        description = "Interface for DBM-like database systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30749,8 +30749,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base ghc-prim ];
        description = "prelude for Algebra of Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30771,8 +30771,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck
        ];
        description = "An implementation of the AOS signatures";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30793,8 +30793,8 @@ self: {
          base colour language-haskell-extract pango template-haskell
        ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libaosd;};
 
@@ -30807,7 +30807,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base inspection-testing transformers ];
        description = "Self-normalizing applicative expressions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ap-reflect" = callPackage
@@ -30818,7 +30818,7 @@ self: {
        sha256 = "16hh3ava0qc8w2y04a8gdh2qfxclh2mhim9zv17d16wlx9dq9qgs";
        libraryHaskellDepends = [ base ];
        description = "Partial evaluation reflection a la simple-reflect";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apache-md5" = callPackage
@@ -30844,7 +30844,7 @@ self: {
        ];
        benchmarkSystemDepends = [ openssl ];
        description = "Apache specific MD5 digest algorighm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "apart" = callPackage
@@ -30867,8 +30867,8 @@ self: {
          base comonad contravariant free hedgehog lens semigroupoids
        ];
        description = "Get all your structure and rip it apart";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30886,7 +30886,7 @@ self: {
        testHaskellDepends = [ base containers linear QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion linear ];
        description = "Fast Entity-Component-System library for game programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apecs-gloss" = callPackage
@@ -30901,7 +30901,7 @@ self: {
          apecs apecs-physics base containers gloss linear
        ];
        description = "Simple gloss renderer for apecs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apecs-physics" = callPackage
@@ -30917,7 +30917,7 @@ self: {
          apecs base containers inline-c linear template-haskell vector
        ];
        description = "2D physics for apecs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apecs-physics-gloss" = callPackage
@@ -30928,7 +30928,7 @@ self: {
        sha256 = "075rpm4l1na7j79vkh7n5c806zj7vvj2qxrxq6pkb6k6364ff249";
        libraryHaskellDepends = [ apecs apecs-physics base gloss ];
        description = "Gloss rendering for apecs-physics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apecs-stm" = callPackage
@@ -30944,8 +30944,8 @@ self: {
          vector
        ];
        description = "STM stores for apecs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30967,8 +30967,8 @@ self: {
          xdg-basedir
        ];
        description = "Server and community browser for the game Tremulous";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -30990,8 +30990,8 @@ self: {
          text transformers
        ];
        description = "Library for easily building REST API wrappers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31008,7 +31008,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base HUnit lens ];
        description = "option of aeson's deriveJSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "api-maker" = callPackage
@@ -31031,7 +31031,7 @@ self: {
          transformers-base
        ];
        description = "Package to make APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "api-monobank" = callPackage
@@ -31053,8 +31053,8 @@ self: {
          aeson base bytestring http-client http-conduit stm text time
        ];
        testHaskellDepends = [ base bytestring hs-coindesk-api ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hs-coindesk-api = null;};
 
@@ -31070,7 +31070,7 @@ self: {
          base bytestring directory opentheory-unicode
        ];
        description = "OpenTheory unicode character API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "api-rpc-factom" = callPackage
@@ -31095,8 +31095,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        description = "RPC API client for Factom";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31120,8 +31120,8 @@ self: {
          remote-monad text time transformers
        ];
        description = "simple json-rpc client for PegNet";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31156,8 +31156,8 @@ self: {
          tasty-quickcheck template-haskell text time unordered-containers
        ];
        description = "DSL for generating API boilerplate and docs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31178,8 +31178,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring text ];
        description = "Api bindings for Yoti services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31212,8 +31212,8 @@ self: {
          tasty-hunit tasty-quickcheck wai wai-extra
        ];
        description = "Simple and type safe web framework that generate web API documentation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31233,8 +31233,8 @@ self: {
          monad-control resourcet text wai
        ];
        description = "authenticate support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31252,8 +31252,8 @@ self: {
          clientsession data-default-class time unix-compat vault
        ];
        description = "clientsession support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31269,8 +31269,8 @@ self: {
          apiary base blaze-builder blaze-html bytestring cookie time wai
        ];
        description = "Cookie support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31282,8 +31282,8 @@ self: {
        sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm";
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        description = "eventsource support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31303,8 +31303,8 @@ self: {
          monad-control text transformers types-compat vault wai
        ];
        description = "helics support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31321,8 +31321,8 @@ self: {
          text transformers wai
        ];
        description = "A http client for Apiary";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31340,8 +31340,8 @@ self: {
          monad-control monad-logger transformers transformers-base
        ];
        description = "fast-logger support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31360,8 +31360,8 @@ self: {
          monad-control text transformers types-compat
        ];
        description = "memcached client for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31379,8 +31379,8 @@ self: {
          mongoDB resource-pool text time transformers
        ];
        description = "mongoDB support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31398,8 +31398,8 @@ self: {
          resource-pool resourcet transformers transformers-base
        ];
        description = "persistent support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31419,8 +31419,8 @@ self: {
          purescript text transformers types-compat unordered-containers
        ];
        description = "purescript compiler for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31432,8 +31432,8 @@ self: {
        sha256 = "0b9m165qs7nd9iisbkkx0vpdkv37bh0vvrwq769bjc2k8qkqspwl";
        libraryHaskellDepends = [ apiary base hedis transformers ];
        description = "redis support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31445,8 +31445,8 @@ self: {
        sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4";
        libraryHaskellDepends = [ apiary base wai ];
        description = "session support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31458,8 +31458,8 @@ self: {
        sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw";
        libraryHaskellDepends = [ apiary base wai-websockets websockets ];
        description = "websockets support for apiary web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31472,7 +31472,7 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring lens wreq ];
        testHaskellDepends = [ base ];
        description = "Consumer library for anapioficeandfire.com";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apis" = callPackage
@@ -31492,8 +31492,8 @@ self: {
          unordered-containers utf8-string yql
        ];
        description = "A Template Haskell library for generating type safe API calls";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31522,7 +31522,7 @@ self: {
          x509-store x509-system x509-validation
        ];
        description = "Apple Push Notification service HTTP/2 integration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apotiki" = callPackage
@@ -31551,8 +31551,8 @@ self: {
          wai-middleware-static zlib
        ];
        description = "a faster debian repository";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31567,8 +31567,8 @@ self: {
          base containers criterion deepseq lens mtl
        ];
        description = "applicative (functional) bidirectional programming beyond composition chains";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31587,7 +31587,7 @@ self: {
          base containers directory hspec HUnit mtl parsec text
        ];
        description = "A library to manage application settings (INI file-like)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "appar" = callPackage
@@ -31598,7 +31598,7 @@ self: {
        sha256 = "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4";
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple applicative parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "appc" = callPackage
@@ -31623,8 +31623,8 @@ self: {
          aeson base hspec hspec-smallcheck semver smallcheck text uuid
        ];
        description = "app container types and tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31637,7 +31637,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "applicative-extras" = callPackage
@@ -31648,7 +31648,7 @@ self: {
        sha256 = "1svsf8mvb816nksg1dh4dz3cms2zx2hjprz2z7h3zidpxmzs0pr8";
        libraryHaskellDepends = [ base ];
        description = "Instances for Applicative";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "applicative-fail" = callPackage
@@ -31666,8 +31666,8 @@ self: {
          base checkers mtl QuickCheck tasty tasty-quickcheck
        ];
        description = "Applicative functor and monad which collects all your fails";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31679,7 +31679,7 @@ self: {
        sha256 = "0rnjl7yz6nga4qi0jdvhf911yf1qk6gy2fm5236bsgc50d5wbaw0";
        libraryHaskellDepends = [ base ];
        description = "Applicative-based numeric instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "applicative-parsec" = callPackage
@@ -31695,8 +31695,8 @@ self: {
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "An applicative parser combinator library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31710,8 +31710,8 @@ self: {
        editedCabalFile = "0ccdnkl3pxkwcg7m3xalqwax1gzaj3hg85zb219y7cfva2pvz1jp";
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31727,8 +31727,8 @@ self: {
          base haskell-src-exts haskell-src-meta mtl syb template-haskell
        ];
        description = "Write applicative programs in direct style (generalizes idiom brackets)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31760,7 +31760,7 @@ self: {
          unix-compat
        ];
        description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "apportionment" = callPackage
@@ -31771,7 +31771,7 @@ self: {
        sha256 = "062v4a1ip7zy20b03z1jajqy2ylx5fl74p7px54b1vajf6vx0wcg";
        libraryHaskellDepends = [ base containers utility-ht ];
        description = "Round a set of numbers while maintaining its sum";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "approveapi" = callPackage
@@ -31798,8 +31798,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "ApproveAPI Haskell Client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31826,8 +31826,8 @@ self: {
          vector
        ];
        description = "Easy-to-use reasonable way of emulating approximate in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31859,7 +31859,7 @@ self: {
        ];
        description = "Approximate randomization test";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "approximate" = callPackage
@@ -31881,7 +31881,7 @@ self: {
          base directory doctest filepath semigroups simple-reflect
        ];
        description = "Approximate discrete values and numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "approximate-equality" = callPackage
@@ -31892,7 +31892,7 @@ self: {
        sha256 = "0pxvyb5a6vh0isba81flv7wjlwfn091xrma7g6wzr08bvqmix883";
        libraryHaskellDepends = [ base type-level-natural-number ];
        description = "Newtype wrappers for approximate equality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ar-timestamp-wiper" = callPackage
@@ -31906,7 +31906,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
        description = "Wipes time stamps from .a files (like ar -D)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arb-fft" = callPackage
@@ -31929,8 +31929,8 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck vector
        ];
        description = "Pure Haskell arbitrary length FFT library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31947,8 +31947,8 @@ self: {
        ];
        librarySystemDepends = [ arbb_dev ];
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {arbb_dev = null;};
 
@@ -31973,8 +31973,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Datadog client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -31992,7 +31992,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "LRU cache based on STM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arbor-monad-counter" = callPackage
@@ -32013,8 +32013,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Counter library for submitting metrics to a backend such as datadog";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32038,7 +32038,7 @@ self: {
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
        testToolDepends = [ hspec-discover ];
        description = "Simple logging library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arbor-monad-metric" = callPackage
@@ -32061,8 +32061,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Core metric library for publishing metrics";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32088,8 +32088,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Metric library backend for datadog";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32108,7 +32108,7 @@ self: {
          postgresql-simple text
        ];
        description = "Convenience types and functions for postgresql-simple";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arbtt" = callPackage
@@ -32137,7 +32137,7 @@ self: {
          transformers unix utf8-string
        ];
        description = "Automatic Rule-Based Time Tracker";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "arcgrid" = callPackage
@@ -32151,7 +32151,7 @@ self: {
        libraryHaskellDepends = [ base parsec parsec-numeric ];
        executableHaskellDepends = [ base ];
        description = "Parse ESRI/ArcInfo (ArcGrid) raster GIS files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arcgrid-viewer" = callPackage
@@ -32166,7 +32166,7 @@ self: {
          arcgrid base bytestring gloss transformers
        ];
        description = "Simple viewer for ESRI/ArcInfo (ArcGrid) geospatial data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arch-hs" = callPackage
@@ -32198,8 +32198,8 @@ self: {
          tar-conduit template-haskell text
        ];
        description = "Distribute hackage packages to archlinux";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32223,7 +32223,7 @@ self: {
          servant-client-core text time
        ];
        description = "Arch Linux official and AUR web interface binding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "archive" = callPackage
@@ -32244,8 +32244,8 @@ self: {
          regex-posix time unix Unixutils xhtml
        ];
        description = "A library and programs for creating hardlinked incremental archives or backups";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {debian-mirror = null; help = null;};
 
@@ -32262,8 +32262,8 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "Common interface using libarchive";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32279,7 +32279,7 @@ self: {
          base bytestring composition-prelude dir-traverse
        ];
        description = "Backpack signature for archive libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "archive-tar" = callPackage
@@ -32294,7 +32294,7 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "Common interface using the tar package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "archive-tar-bytestring" = callPackage
@@ -32310,7 +32310,7 @@ self: {
        ];
        libraryToolDepends = [ cpphs ];
        description = "Common interface using the tar-bytestring package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "archiver" = callPackage
@@ -32328,8 +32328,8 @@ self: {
          base bytestring containers process random
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32345,8 +32345,8 @@ self: {
          base Cabal containers directory filepath pretty
        ];
        description = "Support for working with Arch Linux packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32372,8 +32372,8 @@ self: {
          strict-concurrency xhtml
        ];
        description = "Website maintenance for Arch Linux packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32389,8 +32389,8 @@ self: {
          base containers download-curl feed tagsoup
        ];
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32409,8 +32409,8 @@ self: {
        ];
        testHaskellDepends = [ base directory process temporary ];
        description = "Arduino programming in haskell using the Copilot stream DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32436,8 +32436,8 @@ self: {
          base criterion directory mtl semigroups
        ];
        description = "A journaled data store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32454,8 +32454,8 @@ self: {
          time
        ];
        description = "Generate Attribute-Relation File Format (ARFF) files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32469,8 +32469,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory wx ];
        description = "An interpreter for the Argh! programming language in wxHaskell";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32497,8 +32497,8 @@ self: {
          QuickCheck
        ];
        description = "Measure your code's complexity";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32517,8 +32517,8 @@ self: {
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Memory-hard password hash and proof-of-work function";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32531,8 +32531,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32550,8 +32550,8 @@ self: {
          base bimap containers glib gtk HDBC indents mtl parsec
        ];
        description = "A computer assisted argumentation transcription and editing software";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32579,8 +32579,8 @@ self: {
          tasty-hunit utf8-string
        ];
        description = "Go-to-definition for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32604,8 +32604,8 @@ self: {
          regex-posix safe split system-filepath text time
        ];
        description = "Watcher and runner for Hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32634,8 +32634,8 @@ self: {
          lens-aeson process protolude QuickCheck temporary text unix
        ];
        description = "Run docker-compose with help from Nix/NixOS";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {};
 
   "arith-encode" = callPackage
@@ -32657,7 +32657,7 @@ self: {
          base binary containers hashable HUnit-Plus unordered-containers
        ];
        description = "A practical arithmetic encoding (aka Godel numbering) library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arithmatic" = callPackage
@@ -32668,7 +32668,7 @@ self: {
        sha256 = "0pxlla3jmpb4ll0hn8xvfb32kqx8053alvis9cryq060m3bd09aq";
        libraryHaskellDepends = [ base ];
        description = "do things with numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arithmetic" = callPackage
@@ -32695,7 +32695,7 @@ self: {
          opentheory-prime opentheory-primitive QuickCheck random
        ];
        description = "Natural number arithmetic";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arithmetic-circuits" = callPackage
@@ -32729,8 +32729,8 @@ self: {
          process-extras protolude semirings text vector wl-pprint-text
        ];
        description = "Arithmetic circuits for zkSNARKs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32761,7 +32761,7 @@ self: {
          mod random semirings vector
        ];
        description = "Efficient basic number-theoretic functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "arity-generic-liftA" = callPackage
@@ -32775,7 +32775,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Provides an arity-generic version of the liftA2, liftA3... liftAn functions.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "armada" = callPackage
@@ -32789,7 +32789,7 @@ self: {
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32810,8 +32810,8 @@ self: {
          aeson base bytestring containers directory hspec HUnit lens text
        ];
        description = "Prevent serialization backwards compatibility problems using golden tests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32826,8 +32826,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Library for reading ARPA n-gram models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32851,8 +32851,8 @@ self: {
          base hmatrix hspec QuickCheck vector vector-algorithms
        ];
        description = "Solve large scale eigenvalue problems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) arpack;};
 
@@ -32864,8 +32864,8 @@ self: {
        sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "array-builder" = callPackage
@@ -32879,8 +32879,8 @@ self: {
        libraryHaskellDepends = [ array-chunks base primitive run-st ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Builders for arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32898,8 +32898,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Lists of chunks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32925,8 +32925,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32941,8 +32941,8 @@ self: {
          array base doctest doctest-driver-gen hspec
        ];
        description = "IsList instances of Array for OverloadedLists extension";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32954,7 +32954,7 @@ self: {
        sha256 = "1p05vg8mdyad03aa7s1nrgw5xqgl80f6l7v0llhmi1q4xnrqrj3n";
        libraryHaskellDepends = [ array base ];
        description = "Memoization combinators using arrays for finite sub-domains of functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "array-primops" = callPackage
@@ -32971,8 +32971,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -32984,7 +32984,7 @@ self: {
        sha256 = "1gh7gmbm0djr78dqkf8q3ap9yk4gm3dq48k8jad9ssp3w19wpkan";
        libraryHaskellDepends = [ array base ];
        description = "Primitive functions for updating many elements in mutable arrays at once";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arrayfire" = callPackage
@@ -33008,8 +33008,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings to the ArrayFire general-purpose GPU library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {af = null;};
 
@@ -33027,8 +33027,8 @@ self: {
          tasty-smallcheck
        ];
        description = "Memory-efficient ArrayList implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33040,7 +33040,7 @@ self: {
        sha256 = "0v3ab3h3rg38dvmyqqfsysgfpib8i81s87wr965cf7lxhfx3lg61";
        libraryHaskellDepends = [ base ];
        description = "Extra functions for Control.Arrow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arrow-improve" = callPackage
@@ -33054,8 +33054,8 @@ self: {
          arrows base pointed profunctors semigroupoids
        ];
        description = "Improved arrows";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33067,8 +33067,8 @@ self: {
        sha256 = "11rzpq8mml00amb0hd09bwwhpn199jr8mxp0454ljkpbgqc5jm9s";
        libraryHaskellDepends = [ base containers fail mtl ];
        description = "List arrows for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33080,8 +33080,8 @@ self: {
        sha256 = "02zampc6cc5a9fvdvxkz2r6i5sxf5w0qilsvsx8jxiw4kprbghii";
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33096,7 +33096,7 @@ self: {
        executableHaskellDepends = [ array base containers haskell-src ];
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33118,7 +33118,7 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts NoHoed ];
        description = "A preprocessor and quasiquoter for translating arrow notation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33130,7 +33130,7 @@ self: {
        sha256 = "02db4byzz8xb4c36y0v867g9kd3a9p04r4cj1np717k20qrwjnpn";
        libraryHaskellDepends = [ base Stream ];
        description = "Arrow classes and transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "artery" = callPackage
@@ -33143,8 +33143,8 @@ self: {
          base containers profunctors transformers
        ];
        description = "A simple, arrow-based reactive programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33158,8 +33158,8 @@ self: {
        editedCabalFile = "09hmx0x4fz80kby7w1n9rc7sibbmpsvl4i3rc3h91hs53ban4yd4";
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Basic types and instances for Valve's Artifact Card-set API";
-       license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33183,7 +33183,7 @@ self: {
          file-embed hashable parsec process shell-escape template-haskell
        ];
        description = "Archive execution tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "arxiv" = callPackage
@@ -33210,8 +33210,8 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog jwt mtl text time ];
        description = "Atlassian Service Authentication Protocol";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33223,7 +33223,7 @@ self: {
        sha256 = "1c5ip8q9b6xnvh3li03iilmqz33rrlis78zs0lh4jva67b37akqk";
        libraryHaskellDepends = [ base MissingH ];
        description = "Generic markup builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ascii" = callPackage
@@ -33240,7 +33240,7 @@ self: {
          ascii-th base bytestring data-ascii text
        ];
        description = "The ASCII character set and encoding";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-art-to-unicode" = callPackage
@@ -33255,7 +33255,7 @@ self: {
        executableHaskellDepends = [ base strict ];
        testHaskellDepends = [ base doctest ];
        description = "ASCII Art to Unicode Box Drawing converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ascii-case" = callPackage
@@ -33266,7 +33266,7 @@ self: {
        sha256 = "1qs1rccslixsg4szgp7y98sqhhn0asp9qmk9vfrwdjfipmf3z72p";
        libraryHaskellDepends = [ ascii-char base hashable ];
        description = "ASCII letter case";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-char" = callPackage
@@ -33277,7 +33277,7 @@ self: {
        sha256 = "0pglcppji9irbz0fjc6hb1fv7qjbjcii6k4qdv389l7kbb77w318";
        libraryHaskellDepends = [ base hashable ];
        description = "A Char type representing an ASCII character";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-cows" = callPackage
@@ -33288,7 +33288,7 @@ self: {
        sha256 = "0ddnjsqmaqrs2kxys32zqpmvkyway4dqj35x2q3gqxmsir3qg8zq";
        libraryHaskellDepends = [ base random-extras random-fu text ];
        description = "A collection of ASCII cows. Moo.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ascii-flatten" = callPackage
@@ -33302,8 +33302,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base text ];
        description = "Flattens European non-ASCII characaters into ASCII";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33315,7 +33315,7 @@ self: {
        sha256 = "19l50ksqa7jdsl0pmrmy8q8jbgmb1j3hr63jjzys220f0agsgcwr";
        libraryHaskellDepends = [ ascii-char base hashable ];
        description = "ASCII character groups";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-holidays" = callPackage
@@ -33330,7 +33330,7 @@ self: {
          base random random-shuffle terminfo time
        ];
        description = "ASCII animations for the holidays!";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "ascii-predicates" = callPackage
@@ -33341,7 +33341,7 @@ self: {
        sha256 = "0dzrxqhq7vqplg4aanc4kindwpizv3d777ri81sj1m1zn3vzvrrq";
        libraryHaskellDepends = [ ascii-char base ];
        description = "Various categorizations of ASCII characters";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-progress" = callPackage
@@ -33361,7 +33361,7 @@ self: {
          async base concurrent-output data-default hspec QuickCheck time
        ];
        description = "A simple progress bar for the console";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ascii-string" = callPackage
@@ -33383,8 +33383,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Compact representation of ASCII strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33398,7 +33398,7 @@ self: {
          ascii-char base bytestring hashable text
        ];
        description = "Representing ASCII with refined supersets";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-table" = callPackage
@@ -33414,8 +33414,8 @@ self: {
          vector wl-pprint-extras
        ];
        description = "ASCII table";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33430,7 +33430,7 @@ self: {
          ascii-char ascii-superset base template-haskell
        ];
        description = "Template Haskell support for ASCII";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ascii-vector-avc" = callPackage
@@ -33452,8 +33452,8 @@ self: {
          split zlib
        ];
        description = "Process Ascii Vectors for Advantest 93k";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33466,8 +33466,8 @@ self: {
        libraryHaskellDepends = [ base bytestring conduit ];
        testHaskellDepends = [ base bytestring conduit hspec ];
        description = "Conduit for encoding ByteString into Ascii85";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33482,7 +33482,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base hspec random raw-strings-qq silently ];
        description = "Line charts in terminal";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "asciidiagram" = callPackage
@@ -33505,7 +33505,7 @@ self: {
          optparse-applicative rasterific-svg svg-tree text
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asic" = callPackage
@@ -33519,7 +33519,7 @@ self: {
        executableHaskellDepends = [ asil base bytestring utf8-string ];
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33562,7 +33562,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Library for creating and querying segmented feeds";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "asil" = callPackage
@@ -33581,7 +33581,7 @@ self: {
        ];
        description = "Action Script Instrumentation Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33596,8 +33596,8 @@ self: {
          aeson base hashable primitive scientific text
        ];
        description = "asn type and encoding/decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33622,8 +33622,8 @@ self: {
          test-framework test-framework-hunit text vector
        ];
        description = "Encode and decode ASN.1";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33640,8 +33640,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33660,7 +33660,7 @@ self: {
          asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
        ];
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asn1-parse" = callPackage
@@ -33673,7 +33673,7 @@ self: {
          asn1-encoding asn1-types base bytestring
        ];
        description = "Simple monadic parser for ASN1 stream types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asn1-types" = callPackage
@@ -33684,7 +33684,7 @@ self: {
        sha256 = "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq";
        libraryHaskellDepends = [ base bytestring hourglass memory ];
        description = "ASN.1 types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asn1dump" = callPackage
@@ -33701,7 +33701,7 @@ self: {
          asn1-encoding asn1-types base bytestring pem
        ];
        description = "Dump ASN1 structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aspell-pipe" = callPackage
@@ -33712,7 +33712,7 @@ self: {
        sha256 = "09dw4v4j5pmqi8pdh3p7kk7f8pph5w33s7vd21fgvhv3arnrj6p8";
        libraryHaskellDepends = [ async base process text ];
        description = "Pipe-based interface to the Aspell program";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "assembler" = callPackage
@@ -33726,8 +33726,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-binary parsec ];
        executableHaskellDepends = [ base containers ghc-binary parsec ];
        description = "Haskell Assembler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghc-binary = null;};
 
@@ -33744,8 +33744,8 @@ self: {
          base bytestring Cabal directory filepath system-posix-redirect
        ];
        description = "Helpers for Control.Exception.assert";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33758,7 +33758,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base pretty-show text ];
        description = "Syntactic sugar improving 'assert' and 'error'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "assertions" = callPackage
@@ -33773,8 +33773,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base containers ];
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33786,7 +33786,7 @@ self: {
        sha256 = "1c0678qjkr1q3pi20ch05k8ri4zxcc1drc4j44fvb1sz7b8y260c";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "A build-time Cabal library that bundles executables with assets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "asset-map" = callPackage
@@ -33803,8 +33803,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Asset map support for the JavaScript broccoli-asset-rev library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33818,8 +33818,8 @@ self: {
        librarySystemDepends = [ assimp ];
        libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) assimp;};
 
@@ -33831,7 +33831,7 @@ self: {
        sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q";
        libraryHaskellDepends = [ base bifunctors tagged ];
        description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "assoc-list" = callPackage
@@ -33843,7 +33843,7 @@ self: {
        libraryHaskellDepends = [ base contravariant ];
        testHaskellDepends = [ base contravariant doctest hedgehog ];
        description = "Association lists (lists of tuples)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "assoc-listlike" = callPackage
@@ -33856,7 +33856,7 @@ self: {
        libraryHaskellDepends = [ base contravariant ListLike ];
        testHaskellDepends = [ base contravariant doctest hedgehog ];
        description = "Association lists (list-like collections of tuples)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "assumpta" = callPackage
@@ -33877,8 +33877,8 @@ self: {
          quickcheck-io
        ];
        description = "An SMTP client library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33897,7 +33897,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec mtl QuickCheck text ];
        description = "Core functionality for an SMTP client";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ast-monad" = callPackage
@@ -33911,8 +33911,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A library for constructing AST by using do-notation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33927,8 +33927,8 @@ self: {
        libraryHaskellDepends = [ ast-monad base text ];
        testHaskellDepends = [ ast-monad base hspec text ];
        description = "A library for writing JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -33941,7 +33941,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "vocabulary representation for predicting program properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "astar" = callPackage
@@ -33954,7 +33954,7 @@ self: {
          base hashable psqueues unordered-containers
        ];
        description = "General A* search algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "astar-monad" = callPackage
@@ -33965,7 +33965,7 @@ self: {
        sha256 = "1df99k3c299nzfxbqnzkqggagf7l8p2fwa9igxy9ydg8b0rqc6xf";
        libraryHaskellDepends = [ base logict mtl ];
        testHaskellDepends = [ base hspec lens logict mtl ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "astrds" = callPackage
@@ -33984,8 +33984,8 @@ self: {
          SDL-image SDL-mixer SDL-ttf unix
        ];
        description = "an incomplete 2d space game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34003,7 +34003,7 @@ self: {
          test-framework-quickcheck2 time
        ];
        description = "Amateur astronomical computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "astview" = callPackage
@@ -34023,8 +34023,8 @@ self: {
          glib Glob gtk gtksourceview2 hint mtl process syb
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
-       license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsdOriginal;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34036,7 +34036,7 @@ self: {
        sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn";
        libraryHaskellDepends = [ base containers syb ];
        description = "Interfacing between hint and astview";
-       license = stdenv.lib.licenses.bsdOriginal;
+       license = lib.licenses.bsdOriginal;
      }) {};
 
   "async" = callPackage
@@ -34056,7 +34056,7 @@ self: {
          base HUnit stm test-framework test-framework-hunit
        ];
        description = "Run IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-ajax" = callPackage
@@ -34067,7 +34067,7 @@ self: {
        sha256 = "012j2kbf4829g4xzbzc1vqb9ybhr05v4zlipvhcn4pqmfb3vgshi";
        libraryHaskellDepends = [ async base ghcjs-ajax text ];
        description = "Crossbrowser async AJAX Bindings for GHCJS";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "async-combinators" = callPackage
@@ -34088,8 +34088,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34106,8 +34106,8 @@ self: {
          base concurrency dejafu HUnit hunit-dejafu
        ];
        description = "Run MonadConc operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34119,7 +34119,7 @@ self: {
        sha256 = "0hyc27mphjpc7m9khs47ch0q6j6hy2hmibk82vzrfmc3rfjxa1hd";
        libraryHaskellDepends = [ async base deepseq split ];
        description = "Useful concurrent combinators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "async-extras" = callPackage
@@ -34135,7 +34135,7 @@ self: {
          transformers-base
        ];
        description = "Extra Utilities for the Async Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-io-either" = callPackage
@@ -34146,7 +34146,7 @@ self: {
        sha256 = "0sksphy0i46w83kw3fhksiyhz9nn337d4xc3ppihdksi79a6ncph";
        libraryHaskellDepends = [ async base retry transformers ];
        description = "Could be useful";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-manager" = callPackage
@@ -34160,8 +34160,8 @@ self: {
        libraryHaskellDepends = [ async base stm unordered-containers ];
        executableHaskellDepends = [ async base stm unordered-containers ];
        description = "A thread manager for async";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34182,7 +34182,7 @@ self: {
          transformers-base
        ];
        description = "A modified version of async that supports worker groups and many-to-many task dependencies";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "async-refresh" = callPackage
@@ -34204,7 +34204,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Package implementing core logic for refreshing of expiring data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-refresh-tokens" = callPackage
@@ -34226,7 +34226,7 @@ self: {
          test-framework-hunit unliftio
        ];
        description = "Package implementing core logic for refreshing of expiring access tokens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "async-timer" = callPackage
@@ -34244,8 +34244,8 @@ self: {
          async base containers criterion tasty tasty-hunit
        ];
        description = "Provides API for timer based execution of IO actions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34257,8 +34257,8 @@ self: {
        sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s";
        libraryHaskellDepends = [ base ];
        description = "Distinguish between synchronous and asynchronous exceptions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34272,7 +34272,7 @@ self: {
        editedCabalFile = "0vh6k6397f3y03y28shx0gf0lvdlb6pdcdhd1j8r1svhjbyphfdp";
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "serialisation for Haskell values with sharing support";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "aterm-utils" = callPackage
@@ -34286,8 +34286,8 @@ self: {
        libraryHaskellDepends = [ aterm base mtl transformers wl-pprint ];
        executableHaskellDepends = [ aterm base transformers wl-pprint ];
        description = "Utility functions for working with aterms as generated by Minitermite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34301,7 +34301,7 @@ self: {
        editedCabalFile = "0h3y24p4296qxwcmynsrqwnxpk024p9c835yh8s366skcjwmhk4x";
        libraryHaskellDepends = [ base ];
        description = "Arrow Transformer Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atlassian-connect-core" = callPackage
@@ -34326,8 +34326,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ zlib ];
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -34349,8 +34349,8 @@ self: {
          scientific text time-units unordered-containers vector
        ];
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34367,7 +34367,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "1976 US Standard Atmosphere Model";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "atmos-dimensional" = callPackage
@@ -34378,7 +34378,7 @@ self: {
        sha256 = "19rlcp1zn3k838c5ixsn6i09nclfwvd9prbirxy5fmch0yjlp39d";
        libraryHaskellDepends = [ atmos base dimensional ];
        description = "dimensional wrapper on atmos package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atmos-dimensional-tf" = callPackage
@@ -34389,8 +34389,8 @@ self: {
        sha256 = "05g2v7ppbcvaw0dk9f0z0gb7k33c4lk2cm2ziyqahxmwsz928khm";
        libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34415,8 +34415,8 @@ self: {
          QuickCheck resourcet text time transformers
        ];
        description = "An interface of ATND API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34428,7 +34428,7 @@ self: {
        sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807";
        libraryHaskellDepends = [ base bimap containers mtl process syb ];
        description = "An EDSL for embedded hard realtime applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atom-basic" = callPackage
@@ -34443,7 +34443,7 @@ self: {
          base base64-bytestring bytestring network network-uri text time
        ];
        description = "Basic Atom feed construction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atom-conduit" = callPackage
@@ -34470,7 +34470,7 @@ self: {
          uri-bytestring xml-conduit xml-types
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
-       license = stdenv.lib.licenses.cc0;
+       license = lib.licenses.cc0;
      }) {};
 
   "atom-msp430" = callPackage
@@ -34481,8 +34481,8 @@ self: {
        sha256 = "02h1g35f3bd3cjjhr28g63vk1mnghshq9586wa922rfl79jp6jcs";
        libraryHaskellDepends = [ atom base mtl ];
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34498,7 +34498,7 @@ self: {
          base directory filelock filepath io-string-like
        ];
        description = "Functions to atomically write to files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atomic-modify" = callPackage
@@ -34509,8 +34509,8 @@ self: {
        sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5";
        libraryHaskellDepends = [ base stm ];
        description = "A typeclass for mutable references that have an atomic modify operation";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34522,7 +34522,7 @@ self: {
        sha256 = "0gidqyk913vhcz3q4vnpadx3vkkrwb66rqhsxvdba8g2p5z63a12";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        description = "A safe approach to CAS and other atomic ops in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "atomic-primops-foreign" = callPackage
@@ -34540,8 +34540,8 @@ self: {
          base bits-atomic HUnit test-framework test-framework-hunit time
        ];
        description = "An atomic counter implemented using the FFI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34554,8 +34554,8 @@ self: {
        libraryHaskellDepends = [ atomic-primops base primitive vector ];
        testHaskellDepends = [ base vector ];
        description = "Atomic operations on Data.Vector types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34574,7 +34574,7 @@ self: {
          base bytestring filepath hspec temporary text unix-compat
        ];
        description = "Atomically write to a file";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "atomo" = callPackage
@@ -34599,8 +34599,8 @@ self: {
          time vector
        ];
        description = "A highly dynamic, extremely simple, very fun programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34618,8 +34618,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit time ];
        description = "Translation from Ocaml to Haskell of John Harrison's ATP code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34631,7 +34631,7 @@ self: {
        sha256 = "0rlv4ikz8k1yjwnqq6yrk1cf4dv9y8jw5i1qaa9m7k6sya2dy6ci";
        libraryHaskellDepends = [ base mtl ];
        description = "A small collection of monad (transformer) instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ats-format" = callPackage
@@ -34651,7 +34651,7 @@ self: {
          process text toml-parser
        ];
        description = "A source-code formatter for ATS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ats-pkg" = callPackage
@@ -34685,8 +34685,8 @@ self: {
        ];
        doHaddock = false;
        description = "A build tool for ATS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34705,8 +34705,8 @@ self: {
          zlib
        ];
        description = "ATS scripts for Cabal builds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34724,8 +34724,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        testSystemDepends = [ storable ];
        description = "Marshal ATS types into Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {storable = null;};
 
@@ -34737,8 +34737,8 @@ self: {
        sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
        libraryHaskellDepends = [ base failure ];
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34758,8 +34758,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "A script I use to run \"attic\" for my backups";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34783,8 +34783,8 @@ self: {
          test-framework-hunit text
        ];
        description = "Efficient parsing and serialisation of S-Expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34807,8 +34807,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob QuickCheck ];
        description = "Minimal mail delivery agent (MDA) for local mail with maildir support";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34839,7 +34839,7 @@ self: {
          transformers unordered-containers vector
        ];
        description = "Fast combinator parsing for bytestrings and text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-arff" = callPackage
@@ -34850,7 +34850,7 @@ self: {
        sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "An ARFF file parser using Attoparsec";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "attoparsec-base64" = callPackage
@@ -34861,7 +34861,7 @@ self: {
        sha256 = "1rvkc7kaya42a8djkyj642r5dq952gwkhinif9r22ijaic656cq8";
        libraryHaskellDepends = [ attoparsec base bytestring text word8 ];
        description = "Fetch only base64 characters, erroring in the attoparsec monad on failure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-binary" = callPackage
@@ -34872,7 +34872,7 @@ self: {
        sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Binary processing extensions to Attoparsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-conduit" = callPackage
@@ -34884,7 +34884,7 @@ self: {
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
        description = "Consume attoparsec parsers via conduit. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "attoparsec-csv" = callPackage
@@ -34896,7 +34896,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        description = "A parser for CSV files that uses Attoparsec";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "attoparsec-data" = callPackage
@@ -34912,7 +34912,7 @@ self: {
          uuid
        ];
        description = "Parsers for the standard Haskell data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "attoparsec-enumerator" = callPackage
@@ -34925,8 +34925,8 @@ self: {
          attoparsec base bytestring enumerator text
        ];
        description = "Pass input from an enumerator to an Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34938,7 +34938,7 @@ self: {
        sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d";
        libraryHaskellDepends = [ attoparsec base ];
        description = "Port of parsec's expression parser to attoparsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-ip" = callPackage
@@ -34954,8 +34954,8 @@ self: {
          attoparsec base ip QuickCheck tasty tasty-quickcheck text vector
        ];
        description = "Parse IP data types with attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -34971,7 +34971,7 @@ self: {
          attoparsec base base-compat-batteries text time time-compat
        ];
        description = "Parsing of ISO 8601 dates, originally from aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-iteratee" = callPackage
@@ -34986,8 +34986,8 @@ self: {
          attoparsec base bytestring iteratee transformers
        ];
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35005,7 +35005,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "An Attoparsec compatibility layer for Parsec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "attoparsec-path" = callPackage
@@ -35021,7 +35021,7 @@ self: {
          attoparsec base QuickCheck quickcheck-instances text
        ];
        description = "Convenience bindings between path and attoparsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "attoparsec-text" = callPackage
@@ -35032,8 +35032,8 @@ self: {
        sha256 = "1qq42lp1sah80a6lnnafi6pwl61b4w4q4jk1pbb7pg5p06mmk315";
        libraryHaskellDepends = [ array attoparsec base containers text ];
        description = "(deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35045,8 +35045,8 @@ self: {
        sha256 = "0cffcwji141js09r7avb15b08xl4s8cgk5vxyrqaq7zw40hhb1gz";
        libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        description = "(deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35062,7 +35062,7 @@ self: {
          attoparsec base bytestring scientific text time
        ];
        description = "Attoparsec parsers of time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "attoparsec-trans" = callPackage
@@ -35073,8 +35073,8 @@ self: {
        sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7";
        libraryHaskellDepends = [ attoparsec base transformers ];
        description = "Interleaved effects for attoparsec parsers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35096,8 +35096,8 @@ self: {
          quickcheck-instances strict tasty tasty-quickcheck text vector
        ];
        description = "URI parser / printer using attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35115,7 +35115,7 @@ self: {
          QuickCheck
        ];
        description = "Variable-length integer decoding for Attoparsec";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "attosplit" = callPackage
@@ -35126,8 +35126,8 @@ self: {
        sha256 = "01sh8k9n9040xqx1lbn74rcf59j54n5861d9db1y5cdy7qssxyg4";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35144,8 +35144,8 @@ self: {
          array base Cabal directory epic haskell98
        ];
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35167,7 +35167,7 @@ self: {
          transformers utility-ht xml-basic
        ];
        description = "Interchange with the Audacity sound signal editor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "audiovisual" = callPackage
@@ -35187,8 +35187,8 @@ self: {
          random template-haskell transformers vector void WAVE
        ];
        description = "A battery-included audiovisual framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35209,7 +35209,7 @@ self: {
        executablePkgconfigDepends = [ augeas ];
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) augeas;};
 
@@ -35228,8 +35228,8 @@ self: {
          process
        ];
        description = "Renaming media collections in a breeze";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35250,8 +35250,8 @@ self: {
          base http-client http-client-tls tasty tasty-hunit
        ];
        description = "Access metadata from the Arch Linux User Repository";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35268,8 +35268,8 @@ self: {
          mtl text
        ];
        description = "ArchLinux AUR json v5 API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35306,8 +35306,8 @@ self: {
          versions
        ];
        description = "A secure package manager for Arch Linux and the AUR";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35327,7 +35327,7 @@ self: {
          resourcet text transformers unordered-containers xml-conduit
        ];
        description = "Authentication methods for Haskell web applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "authenticate-kerberos" = callPackage
@@ -35338,7 +35338,7 @@ self: {
        sha256 = "06k8xi9n44xq63dpmcv4l0vg35y19dk5x1ibyay05w58k4kv4fdq";
        libraryHaskellDepends = [ base process text ];
        description = "Authentication methods for Haskell web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "authenticate-ldap" = callPackage
@@ -35349,8 +35349,8 @@ self: {
        sha256 = "1wsx43l7jl40jpzhiv2fjc1mnpsaaryrjpqaiyqsn3ahacsy4ly5";
        libraryHaskellDepends = [ base LDAP text transformers ];
        description = "LDAP authentication for Haskell web applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35371,7 +35371,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Library to authenticate with OAuth for Haskell web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "authinfo-hs" = callPackage
@@ -35382,8 +35382,8 @@ self: {
        sha256 = "1jv0y4y2ig8dx95xw3zbxc1h9mv3wi3r8xqx00llmf2qs6wgdlp5";
        libraryHaskellDepends = [ attoparsec base network text ];
        description = "Password querying for .authinfo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35402,8 +35402,8 @@ self: {
          transformers trifecta
        ];
        description = "A library for writing papers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35421,7 +35421,7 @@ self: {
          profunctors random semigroups transformers
        ];
        description = "Denotative, locally stateful programming DSL & platform";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "auto-update" = callPackage
@@ -35433,7 +35433,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base exceptions hspec HUnit retry ];
        description = "Efficiently run periodic, on-demand actions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "autoapply" = callPackage
@@ -35451,7 +35451,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Template Haskell to automatically pass values to functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "autoexporter" = callPackage
@@ -35465,7 +35465,7 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ base ];
        description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "autom" = callPackage
@@ -35480,8 +35480,8 @@ self: {
          base bytestring colour ghc-prim gloss JuicyPixels random vector
        ];
        description = "Generates and displays patterns from next nearest neighbors cellular automata";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35506,8 +35506,8 @@ self: {
          tasty tasty-hunit tasty-leancheck tasty-quickcheck
        ];
        description = "automata";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35526,7 +35526,7 @@ self: {
          base bytestring cryptonite quickcheck-simple
        ];
        description = "Automotive CSE emulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "automotive-cse" = callPackage
@@ -35545,7 +35545,7 @@ self: {
          quickcheck-simple
        ];
        description = "Automotive CSE emulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "autonix-deps" = callPackage
@@ -35566,8 +35566,8 @@ self: {
          regex-tdfa resourcet semigroups text transformers xml
        ];
        description = "Library for Nix expression dependency generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35591,8 +35591,8 @@ self: {
          autonix-deps base containers lens mtl
        ];
        description = "Generate dependencies for KDE 5 Nix expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35604,8 +35604,8 @@ self: {
        sha256 = "1z1w6bvsfhnia2dxihcay6a9va2ik1bg805zkfb0vn4vcxn76dcc";
        libraryHaskellDepends = [ base Cabal dir-traverse filepath ];
        description = "Custom Setup to automate package modules discovery";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35620,7 +35620,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process unix ];
        description = "EDSL for Procmail scripts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "avahi" = callPackage
@@ -35634,7 +35634,7 @@ self: {
        libraryHaskellDepends = [ base bytestring dbus text ];
        executableHaskellDepends = [ base bytestring dbus text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "avatar-generator" = callPackage
@@ -35647,8 +35647,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base JuicyPixels random ];
        description = "A simple random avatar icon generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35662,7 +35662,7 @@ self: {
        editedCabalFile = "0x6inm86nkc8cnsgnblfxhmhld0mpbvvx9pi8cdiysp7xkac3j4h";
        libraryHaskellDepends = [ base semigroups vector-space ];
        description = "An average (arithmetic mean) monoid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "avers" = callPackage
@@ -35695,8 +35695,8 @@ self: {
          rethinkdb-client-driver text
        ];
        description = "Server-side implementation of the Avers storage model";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35713,8 +35713,8 @@ self: {
          vector
        ];
        description = "Types describing the core and extended Avers APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35733,8 +35733,8 @@ self: {
          swagger2 text unordered-containers
        ];
        description = "Swagger documentation for the Avers API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35755,8 +35755,8 @@ self: {
          transformers wai wai-websockets websockets
        ];
        description = "Server implementation of the Avers API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35782,7 +35782,7 @@ self: {
        ];
        description = "Diagrams for the Cessna 172 aircraft in aviation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {aviation-cessna172-weight-balance = null; 
          aviation-units = null; aviation-weight-balance = null;};
@@ -35800,8 +35800,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A compile-time balanced AVL tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35813,8 +35813,8 @@ self: {
        sha256 = "1k2nw0ibxbr8dhw9css6vryqd8p5klfvk5vxz6h9w61z8y32f430";
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        description = "AVR Crosspack actions for shake build systems";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35852,7 +35852,7 @@ self: {
          random raw-strings-qq text transformers unordered-containers vector
        ];
        description = "Avro serialization support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "avro-piper" = callPackage
@@ -35886,8 +35886,8 @@ self: {
          unordered-containers
        ];
        description = "Tool for decoding avro";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35907,7 +35907,7 @@ self: {
        ];
        testHaskellDepends = [ attoparsec base lens pretty-show text ];
        description = "Parse aviation weather reports";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "awesome-prelude" = callPackage
@@ -35918,8 +35918,8 @@ self: {
        sha256 = "0mvfirb41jnjvq4mpky0xpdrh238hjwslfqg82ksnam001sxnpng";
        libraryHaskellDepends = [ base ];
        description = "A prelude which I can be happy with. Based on base-prelude.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35935,8 +35935,8 @@ self: {
          aeson attoparsec awesomium-raw base containers text vector
        ];
        description = "High-level Awesomium bindings";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35948,8 +35948,8 @@ self: {
        sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd";
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -35963,8 +35963,8 @@ self: {
        librarySystemDepends = [ awesomium ];
        libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {awesomium = null;};
 
@@ -36002,7 +36002,7 @@ self: {
          tasty-quickcheck text time transformers transformers-base
        ];
        description = "Amazon Web Services (AWS) for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "aws-cloudfront-signed-cookies" = callPackage
@@ -36025,7 +36025,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog neat-interpolation ];
        description = "Generate signed cookies for AWS CloudFront";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "aws-cloudfront-signer" = callPackage
@@ -36041,8 +36041,8 @@ self: {
          crypto-pubkey-types RSA time
        ];
        description = "For signing AWS CloudFront HTTP URL requests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36062,8 +36062,8 @@ self: {
          configuration-tools mtl text transformers
        ];
        description = "Configuration types, parsers & renderers for AWS services";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36081,8 +36081,8 @@ self: {
          http-conduit http-types json-togo resourcet text transformers
        ];
        description = "Conduit-based interface for AWS DynamoDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36105,8 +36105,8 @@ self: {
          resourcet scientific text time
        ];
        description = "Haskell bindings for Amazon DynamoDB Streams";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36130,8 +36130,8 @@ self: {
          unordered-containers
        ];
        description = "Helper function and types for working with amazonka";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36161,8 +36161,8 @@ self: {
          unordered-containers vector yaml
        ];
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36185,8 +36185,8 @@ self: {
          aeson base io-streams system-filepath turtle
        ];
        description = "Capture and manage AWS EC2 known_host pubkeys";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36209,8 +36209,8 @@ self: {
          aeson base Cabal containers QuickCheck regex-compat safe text
        ];
        description = "Haskell suite for the Elastic Transcoder service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36236,8 +36236,8 @@ self: {
          tagged tasty tasty-quickcheck text time transformers
        ];
        description = "Bindings for Amazon Web Services (AWS) General Reference";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36263,8 +36263,8 @@ self: {
          tasty tasty-quickcheck text transformers
        ];
        description = "Bindings for Amazon Kinesis";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36299,8 +36299,8 @@ self: {
          monad-control mtl optparse-applicative text transformers
        ];
        description = "A producer & consumer client library for AWS Kinesis";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36329,8 +36329,8 @@ self: {
          time transformers
        ];
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36350,8 +36350,8 @@ self: {
          lens-aeson mtl old-locale text time wreq zip-archive
        ];
        description = "Haskell bindings for AWS Lambda";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36371,7 +36371,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Haskell runtime for AWS Lambda";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "aws-lambda-haskell-runtime-wai" = callPackage
@@ -36394,8 +36394,8 @@ self: {
          unordered-containers vault wai
        ];
        description = "Run wai applications on AWS Lambda";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36418,8 +36418,8 @@ self: {
        ];
        executableHaskellDepends = [ aeson base lens lens-aeson text ];
        description = "Haskell on AWS Lambda Runtime API";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36441,8 +36441,8 @@ self: {
          process text time unordered-containers
        ];
        description = "Keep your AWS credentials file up to date with MFA-carrying credentials";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36468,8 +36468,8 @@ self: {
          resourcet statistics text time transformers vector
        ];
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36487,8 +36487,8 @@ self: {
          resourcet text time xml-conduit xml-hamlet
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36517,8 +36517,8 @@ self: {
          transformers
        ];
        description = "AWS SDK for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36540,8 +36540,8 @@ self: {
          template-haskell text time time-locale-compat
        ];
        description = "The text converter for aws-sdk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36562,8 +36562,8 @@ self: {
          base bytestring conduit hspec mtl resourcet text xml-conduit
        ];
        description = "The xml parser for aws-sdk package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36583,8 +36583,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Wrapper over Amazonka's SES";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36608,8 +36608,8 @@ self: {
          filepath http-types old-locale safe text time
        ];
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36627,8 +36627,8 @@ self: {
          conduit lens mtl resourcet text timespan unordered-containers
        ];
        description = "Dead simple bindings to commonly used AWS Services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36652,8 +36652,8 @@ self: {
          tasty tasty-quickcheck text transformers
        ];
        description = "Bindings for AWS SNS Version 2013-03-31";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36705,8 +36705,8 @@ self: {
        ];
        testToolDepends = [ hpack tasty-discover ];
        description = "The Axel programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36723,8 +36723,8 @@ self: {
          transient transient-universe
        ];
        description = "Web EDSL for running in browsers and server nodes using transient";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36744,8 +36744,8 @@ self: {
          semigroups template-haskell th-printf transformers
        ];
        description = "Specify axioms for type classes and quickCheck all available instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {control-invariants = null;};
 
@@ -36764,8 +36764,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec shelly text urbit-hob ];
        description = "Interact with Azimuth from Haskell";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36784,8 +36784,8 @@ self: {
          base Diff directory filepath hspec options process unix
        ];
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36803,8 +36803,8 @@ self: {
          http-conduit http-types network time
        ];
        description = "Windows Azure ACS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36823,8 +36823,8 @@ self: {
          wreq
        ];
        description = "send email with microsoft azure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36852,8 +36852,8 @@ self: {
        libraryToolDepends = [ proto-lens-protoc ];
        testHaskellDepends = [ base ];
        description = "Azure Functions Worker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36872,8 +36872,8 @@ self: {
          tls-extra transformers
        ];
        description = "Haskell bindings for the Microsoft Azure Service Management API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36891,8 +36891,8 @@ self: {
          conduit connection http-client http-conduit http-types network text
        ];
        description = "Haskell wrapper over Microsoft Azure ServiceBus REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36922,8 +36922,8 @@ self: {
          unix-compat utf8-string
        ];
        description = "A simple library for accessing Azure blob storage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -36949,7 +36949,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion pipes ];
        description = "Immutable disk-based B* trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "b9" = callPackage
@@ -36990,8 +36990,8 @@ self: {
          text unordered-containers vector yaml
        ];
        description = "A tool and library for building virtual machine images";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37005,7 +37005,7 @@ self: {
        librarySystemDepends = [ babl ];
        libraryPkgconfigDepends = [ babl ];
        description = "Haskell bindings to BABL library";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {inherit (pkgs) babl;};
 
   "babylon" = callPackage
@@ -37022,7 +37022,7 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37055,8 +37055,8 @@ self: {
          unliftio-core
        ];
        description = "A client library to access Backblaze B2 cloud storage in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37075,7 +37075,7 @@ self: {
        ];
        description = "Rotates backdrops for X11 displays using Imagemagic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37097,7 +37097,7 @@ self: {
          mwc-random time vector
        ];
        description = "Heterogeneous automatic differentation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "backstop" = callPackage
@@ -37120,8 +37120,8 @@ self: {
          base filepath HUnit process QuickCheck unix
        ];
        description = "Backstop a target directory by source directories";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37137,7 +37137,7 @@ self: {
        testHaskellDepends = [ base primes tasty tasty-hunit ];
        testToolDepends = [ tasty-discover ];
        description = "A backtracking monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -37153,8 +37153,8 @@ self: {
          transformers
        ];
        description = "A monad transformer for backtracking exceptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37166,8 +37166,8 @@ self: {
        sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam";
        libraryHaskellDepends = [ base transformers ];
        description = "A state monad that runs the state in reverse through the computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37182,7 +37182,7 @@ self: {
        executableHaskellDepends = [ base gd X11 ];
        description = "braindead utility to compose Xinerama backgrounds";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bag" = callPackage
@@ -37193,8 +37193,8 @@ self: {
        sha256 = "18n7ggrfm39mn4rva661hkxj75gjx2p3jcm0hlzpcshxyk93iblr";
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37228,8 +37228,8 @@ self: {
          wai wai-extra warp
        ];
        description = "Continuous integration system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37253,8 +37253,8 @@ self: {
          http-client-tls text time
        ];
        description = "Shipwire API client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37276,7 +37276,7 @@ self: {
        ];
        description = "A blog engine on Hack";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37298,7 +37298,7 @@ self: {
        ];
        description = "bamboo-launcher";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37317,7 +37317,7 @@ self: {
        ];
        description = "A highlight middleware";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37336,8 +37336,8 @@ self: {
          haskell98 hxt mps utf8-string xhtml
        ];
        description = "A photo album middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37356,8 +37356,8 @@ self: {
          hack-contrib hcheat mps network rss utf8-string xhtml
        ];
        description = "bamboo blueprint theme";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37381,7 +37381,7 @@ self: {
        ];
        description = "bamboo mini html5 theme";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37399,8 +37399,8 @@ self: {
          base com directory filepath old-time pretty process regex-compat
        ];
        description = "A Windows Installer (MSI) generator framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37415,7 +37415,7 @@ self: {
        executableHaskellDepends = [ base cmdargs samtools ];
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37430,8 +37430,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "For when a type should never be an instance of a class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37444,8 +37444,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
        description = "A library for determining US bank holidays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37458,7 +37458,7 @@ self: {
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        description = "Calculation of bank holidays in England and Wales";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "banwords" = callPackage
@@ -37477,8 +37477,8 @@ self: {
          vector
        ];
        description = "Generalized word blacklister";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37495,7 +37495,7 @@ self: {
          base distributive QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Classes for working with types that can change clothes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "barbies-th" = callPackage
@@ -37507,7 +37507,7 @@ self: {
        libraryHaskellDepends = [ barbies base split template-haskell ];
        testHaskellDepends = [ barbies base ];
        description = "Create strippable HKD via TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "barbly" = callPackage
@@ -37527,8 +37527,8 @@ self: {
          text
        ];
        description = "Create status bar menus for macOS from executables";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "x86_64-darwin" ];
      }) {};
 
   "barchart" = callPackage
@@ -37542,8 +37542,8 @@ self: {
        libraryHaskellDepends = [ base csv diagrams filepath ];
        executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
        description = "Creating Bar Charts in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37555,8 +37555,8 @@ self: {
        sha256 = "14blxjhapn9g7cp7374f5s2nln7wgyb7a6z50gp04lnqf1aw6kmg";
        libraryHaskellDepends = [ base bytestring HPDF ];
        description = "Generate Code 128 barcodes as PDFs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37568,8 +37568,8 @@ self: {
        sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7";
        libraryHaskellDepends = [ base containers QuickCheck text time ];
        description = "QuickCheck implementations for common types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37591,7 +37591,7 @@ self: {
        ];
        description = "A web based environment for learning and tinkering with Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "barrie" = callPackage
@@ -37603,7 +37603,7 @@ self: {
        libraryHaskellDepends = [ base containers filepath glib gtk ];
        description = "Declarative Gtk GUI library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37628,8 +37628,8 @@ self: {
          base bytestring lens-family-core tasty tasty-golden
        ];
        description = "Shields.io style badge generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37641,8 +37641,8 @@ self: {
        sha256 = "014nc21wnrklsvy5z7w4v9p9psn6bl210l7v97gj42cv6a8jk5nm";
        libraryHaskellDepends = [ base comonad mtl transformers ];
        description = "Implementation of barrier monad, can use custom front/back type";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37656,8 +37656,8 @@ self: {
          ghc-prim invalid-cabal-flag-settings rts
        ];
        description = "Basic libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {invalid-cabal-flag-settings = null;};
 
@@ -37669,7 +37669,7 @@ self: {
        sha256 = "1nyvkaij4m01jndw72xl8931czz1xp6jpnynpajabys2ahabb9jk";
        libraryHaskellDepends = [ base unix ];
        description = "A compatibility layer for base";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base-compat-batteries" = callPackage
@@ -37684,7 +37684,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "base-compat with extra batteries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base-compat-migrate" = callPackage
@@ -37698,8 +37698,8 @@ self: {
        libraryHaskellDepends = [ base base-compat ];
        doHaddock = false;
        description = "Helps migrating projects to base-compat(-batteries)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37715,7 +37715,7 @@ self: {
          base base16-bytestring base64-bytestring bytestring text
        ];
        description = "Binary-to-text encodings (e.g. base64)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base-feature-macros" = callPackage
@@ -37727,8 +37727,8 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Semantic CPP feature macros for base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37740,8 +37740,8 @@ self: {
        sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms";
        libraryHaskellDepends = [ base ];
        description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37753,8 +37753,8 @@ self: {
        sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263";
        libraryHaskellDepends = [ base ];
        description = "The IO functions included in base delimited into small, composable classes";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37767,7 +37767,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "\"base\" package sans \"Prelude\" module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base-orphans" = callPackage
@@ -37781,7 +37781,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Backwards-compatible orphan instances for base";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base-prelude" = callPackage
@@ -37792,7 +37792,7 @@ self: {
        sha256 = "0nn5v2y9kl7i3n21250m7cvn55lvkmzj22wx6q4kaag5ycwwczrs";
        libraryHaskellDepends = [ base ];
        description = "The most complete prelude formed solely from the \"base\" package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base-unicode-symbols" = callPackage
@@ -37803,7 +37803,7 @@ self: {
        sha256 = "0qkhp4ybmx4nbqqkrmw3hkm47bv61i2wpi20qb09wvk10g2dcr23";
        libraryHaskellDepends = [ base ];
        description = "Unicode alternatives for common functions and operators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base16" = callPackage
@@ -37829,7 +37829,7 @@ self: {
          random-bytestring text
        ];
        description = "Fast RFC 4648-compliant Base16 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base16-bytestring" = callPackage
@@ -37843,7 +37843,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [ base bytestring ];
        description = "Fast base16 (hex) encoding and decoding for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base16-bytestring_1_0_1_0" = callPackage
@@ -37862,8 +37862,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "RFC 4648-compliant Base16 encodings for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "base16-lens" = callPackage
@@ -37880,7 +37880,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest lens ];
        description = "Optics for the Base16 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base32" = callPackage
@@ -37905,7 +37905,7 @@ self: {
          base bytestring criterion deepseq memory random-bytestring text
        ];
        description = "Fast RFC 4648-compliant Base32 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base32-bytestring" = callPackage
@@ -37920,8 +37920,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast base32 and base32hex codec for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -37939,7 +37939,7 @@ self: {
        libraryHaskellDepends = [ base base32 bytestring lens text ];
        testHaskellDepends = [ base doctest lens ];
        description = "Optics for the Base32 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base32-z-bytestring" = callPackage
@@ -37959,8 +37959,8 @@ self: {
          base bytestring criterion z-base32-bytestring
        ];
        description = "Fast z-base32 and z-base32hex codec for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {z-base32-bytestring = null;};
 
@@ -37974,7 +37974,7 @@ self: {
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        description = "Fast and safe representation of a Base-32 string";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base58-bytestring" = callPackage
@@ -37992,7 +37992,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Implementation of BASE58 transcoding for ByteStrings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "base58address" = callPackage
@@ -38012,7 +38012,7 @@ self: {
        ];
        description = "Parsing and serialization for Base58 addresses (Bitcoin and Ripple)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "base58string" = callPackage
@@ -38025,7 +38025,7 @@ self: {
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        description = "Fast and safe representation of a Base-58 string";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "base62" = callPackage
@@ -38045,8 +38045,8 @@ self: {
          wide-word
        ];
        description = "Base62 encoding and decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38073,7 +38073,7 @@ self: {
          random-bytestring text
        ];
        description = "Fast RFC 4648-compliant Base64 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base64-bytes" = callPackage
@@ -38097,8 +38097,8 @@ self: {
          random
        ];
        description = "Base64 encoding of byte sequences";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38120,7 +38120,7 @@ self: {
          base bytestring containers criterion deepseq
        ];
        description = "Fast base64 encoding and decoding for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base64-bytestring_1_2_0_1" = callPackage
@@ -38139,8 +38139,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Fast base64 encoding and decoding for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "base64-bytestring-type" = callPackage
@@ -38163,7 +38163,7 @@ self: {
          tasty-quickcheck
        ];
        description = "A newtype around ByteString, for base64 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base64-conduit" = callPackage
@@ -38182,8 +38182,8 @@ self: {
          transformers
        ];
        description = "Base64-encode and decode streams of bytes. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38199,7 +38199,7 @@ self: {
        libraryHaskellDepends = [ base base64 bytestring lens text ];
        testHaskellDepends = [ base doctest lens ];
        description = "Optics for the Base64 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "base64-string" = callPackage
@@ -38211,7 +38211,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Base64 implementation for String's";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "base91" = callPackage
@@ -38232,7 +38232,7 @@ self: {
          base bytestring mono-traversable QuickCheck text
        ];
        description = "A Generic Base91 Encoder & Decoder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "basement" = callPackage
@@ -38245,7 +38245,7 @@ self: {
        editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Foundation scrap box of array & string";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "basen" = callPackage
@@ -38263,7 +38263,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "basen-bytestring" = callPackage
@@ -38274,7 +38274,7 @@ self: {
        sha256 = "131aamd4kq7jdmpl4ammgqgykbh81mkziaf0kpic5c20al4a73lp";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring QuickCheck ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "baserock-schema" = callPackage
@@ -38301,8 +38301,8 @@ self: {
          yaml-pretty-extras
        ];
        description = "Baserock Definitions Schema";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38314,8 +38314,8 @@ self: {
        sha256 = "038xxyjy3c9rpz1cf811dy1yxjyjq3cjphq7h6ivj73qpfx6bwch";
        libraryHaskellDepends = [ base network pureMD5 utf8-string ];
        description = "A BaseX client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38332,7 +38332,7 @@ self: {
          shell-escape
        ];
        description = "Bash generation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "basic" = callPackage
@@ -38347,8 +38347,8 @@ self: {
          base stm template-haskell transformers util
        ];
        description = "Lifting values from base types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38360,7 +38360,7 @@ self: {
        sha256 = "0gz4jpdp0zjn5yils4wplrg2mghpmxsh9f9yv07n81qb8mxwhg5p";
        libraryHaskellDepends = [ base ];
        description = "A small package to access the cpuid instruction directly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "basic-lens" = callPackage
@@ -38371,7 +38371,7 @@ self: {
        sha256 = "1qnlzxbwz9fh78sw78xs0sf3wx94m5ipw1adfaf02d291z81mrys";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Basic lens type and functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "basic-prelude" = callPackage
@@ -38387,7 +38387,7 @@ self: {
          unordered-containers vector
        ];
        description = "An enhanced core prelude; a common foundation for alternate preludes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "basic-sop" = callPackage
@@ -38400,8 +38400,8 @@ self: {
          base deepseq generics-sop QuickCheck text
        ];
        description = "Basic examples and functions for generics-sop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38419,7 +38419,7 @@ self: {
        ];
        description = "An interpreter for a small functional language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38437,7 +38437,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec stm timespan ];
        description = "Simplify queuing up data and processing it in batch";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "batch-rename" = callPackage
@@ -38450,7 +38450,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath Glob ];
        description = "Make Linux or MacOS do things like \"rename *.mp3 *.mp4\"";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "batchd" = callPackage
@@ -38481,8 +38481,8 @@ self: {
          wai-middleware-static warp x509-store yaml
        ];
        description = "Batch processing toolset for Linux / Unix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38496,8 +38496,8 @@ self: {
          aeson base containers http-conduit text
        ];
        description = "API client for Battle.Net";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38511,8 +38511,8 @@ self: {
          base battlenet http-conduit text yesod-core
        ];
        description = "Yesod integration for the battlenet package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38530,8 +38530,8 @@ self: {
          swagger2 template-haskell text vector
        ];
        description = "Core definitions for BattlePlace.io service";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38545,8 +38545,8 @@ self: {
          base battleplace servant servant-client
        ];
        description = "Public API definitions of BattlePlace.io service";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38570,8 +38570,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Compute number of possible arrangements in the battleship game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38604,8 +38604,8 @@ self: {
          wai-handler-fastcgi yesod
        ];
        description = "A web-based implementation of battleships including an AI opponent";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38625,8 +38625,8 @@ self: {
          statistics stm transformers vector
        ];
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38644,8 +38644,8 @@ self: {
          base cmdargs directory filepath hxt hxt-xpath listsafe MissingH
        ];
        description = "HTML Coverage Reports for Rules_Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38660,7 +38660,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath transformers ];
        executableHaskellDepends = [ base filepath ];
        description = "Locate Bazel runfiles location";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "bbdb" = callPackage
@@ -38672,7 +38672,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Ability to read, write, and modify BBDB files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "bbi" = callPackage
@@ -38692,8 +38692,8 @@ self: {
          tasty-golden tasty-hunit vector
        ];
        description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38713,8 +38713,8 @@ self: {
          aeson base containers country doctest hspec iso639 QuickCheck text
        ];
        description = "Language tags as specified by BCP 47";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38734,8 +38734,8 @@ self: {
          base bcp47 cassava hspec path-pieces persistent QuickCheck
        ];
        description = "BCP47 orphan instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38749,7 +38749,7 @@ self: {
          base bytestring data-default entropy memory
        ];
        description = "Haskell bindings to the bcrypt password hash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bdcs" = callPackage
@@ -38794,8 +38794,8 @@ self: {
          persistent-sqlite persistent-template resourcet text time unix
        ];
        description = "Tools for managing a content store of software packages";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ostree;};
 
@@ -38832,8 +38832,8 @@ self: {
          string-conversions string-qq temporary text time wai warp
        ];
        description = "BDCS API Server";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libgit2-glib;};
 
@@ -38851,8 +38851,8 @@ self: {
          test-framework-hunit
        ];
        description = "Behavior-Driven Development DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38864,7 +38864,7 @@ self: {
        sha256 = "17zapldywid4xq0a6qdxh6hnk5igjjgplfydnr800xdpicicbrww";
        libraryHaskellDepends = [ base bytestring ];
        description = "Simple, fast binary diff/patch";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bdo" = callPackage
@@ -38879,8 +38879,8 @@ self: {
        libraryHaskellDepends = [ aeson base network text url ];
        executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38900,8 +38900,8 @@ self: {
          pretty semigroups tagged text time uniplate
        ];
        description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38939,8 +38939,8 @@ self: {
          postgresql-simple QuickCheck splitmix
        ];
        description = "DB migration library for beam, targeting Postgres";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38962,8 +38962,8 @@ self: {
          base bytestring tasty tasty-hunit text time
        ];
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -38984,8 +38984,8 @@ self: {
          uuid-types vector
        ];
        description = "SQL DDL support and migrations support library for Beam";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39003,8 +39003,8 @@ self: {
          hashable mtl mysql network-uri scientific text time
        ];
        description = "Connection layer between beam and MySQL/MariaDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39020,8 +39020,8 @@ self: {
          base beam-core beam-migrate lens postgresql-simple
        ];
        description = "A newtype for wrapping newtypes into beam schemas";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39048,8 +39048,8 @@ self: {
          postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector
        ];
        description = "Connection layer between beam and postgres";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39072,8 +39072,8 @@ self: {
          tasty-expected-failure tasty-hunit text time
        ];
        description = "Beam driver for SQLite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39095,8 +39095,8 @@ self: {
          template-haskell text
        ];
        description = "Template Haskell utilities for beam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39121,8 +39121,8 @@ self: {
          integer-gmp murmur-hash
        ];
        description = "Generic serializer/deserializer with compact representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39138,7 +39138,7 @@ self: {
          base dunai MonadRandom mtl simple-affine-space transformers
        ];
        description = "FRP Yampa replacement implemented with Monadic Stream Functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "beautifHOL" = callPackage
@@ -39152,7 +39152,7 @@ self: {
        executableHaskellDepends = [ array base haskell98 mtl ];
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39180,8 +39180,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39199,8 +39199,8 @@ self: {
        testHaskellDepends = [ base bech32 hspec template-haskell ];
        testToolDepends = [ hspec-discover ];
        description = "Template Haskell extensions to the Bech32 library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39217,8 +39217,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Efficient Matrix and Vector operations in 100% Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39242,8 +39242,8 @@ self: {
          unordered-containers vector
        ];
        description = "Bindings to the beeminder.com JSON API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39267,8 +39267,8 @@ self: {
          utf8-string xhtml
        ];
        description = "Bein is a provenance and workflow management system for bioinformatics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39297,8 +39297,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "HTTP client DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39318,7 +39318,7 @@ self: {
          base criterion optparse-applicative process silently text turtle
        ];
        description = "Command-line benchmark tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bench-graph" = callPackage
@@ -39334,8 +39334,8 @@ self: {
        ];
        testHaskellDepends = [ base split text ];
        description = "Plot and compare benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39362,8 +39362,8 @@ self: {
        ];
        testHaskellDepends = [ base split text ];
        description = "Show, plot and compare benchmark results";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39375,7 +39375,7 @@ self: {
        sha256 = "1zwk05lf76xcdbqrbaid3whmn04injrg7dnlji2v2i5li0pnpr3c";
        libraryHaskellDepends = [ base process random time ];
        description = "Test the time it takes to run a haskell function";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "benchpress" = callPackage
@@ -39389,7 +39389,7 @@ self: {
        libraryHaskellDepends = [ base mtl time ];
        executableHaskellDepends = [ base bytestring time ];
        description = "Micro-benchmarking with detailed statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bencode" = callPackage
@@ -39408,7 +39408,7 @@ self: {
          base bytestring containers hspec QuickCheck
        ];
        description = "Parsers and printers for bencoded data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bencodex" = callPackage
@@ -39431,8 +39431,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bencodex reader/writer for Haskell";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39456,7 +39456,7 @@ self: {
          attoparsec base bencode bytestring criterion deepseq ghc-prim
        ];
        description = "A library for encoding and decoding of BEncode data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bento" = callPackage
@@ -39467,7 +39467,7 @@ self: {
        sha256 = "14li436dp33r4fygkbxr6rjljdamc0yhxv34wafsy4xsv8h898pb";
        libraryHaskellDepends = [ base ];
        description = "🍱 Manage stateful components";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "berkeleydb" = callPackage
@@ -39479,8 +39479,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) db;};
 
@@ -39506,8 +39506,8 @@ self: {
          parseargs process transformers
        ];
        description = "An implementation of Python 3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39530,8 +39530,8 @@ self: {
          tasty-hunit tasty-smallcheck
        ];
        description = "BERT implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39543,8 +39543,8 @@ self: {
        sha256 = "0bv68nn6ijf1wv57kwp4yj6s75g960pds0n9wihxwkr4hh5azls1";
        libraryHaskellDepends = [ base ];
        description = "Extended GCD of polynomials over F_p[x]";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39571,8 +39571,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39589,8 +39589,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39613,8 +39613,8 @@ self: {
          random stm time-units vty
        ];
        description = "A horizontal version of tetris for braille users";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39626,7 +39626,7 @@ self: {
        sha256 = "0pa6f7vadslvff0hlm939r2h8k130f16l2sjnzci79n54q9kadw3";
        libraryHaskellDepends = [ base ];
        description = "Function combinator \"between\" and derived combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bf-cata" = callPackage
@@ -39654,8 +39654,8 @@ self: {
          template-haskell unix
        ];
        description = "Bidirectionalization for Free! (POPL'09)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39667,7 +39667,7 @@ self: {
        sha256 = "1qswfjrij01g7g85iiyxpvk1k5hgnf6ll7jcf6b33k6dawi3a4qr";
        libraryHaskellDepends = [ base containers mtl ];
        description = "\"Bidirectionalization for Free\" for Monomorphic Transformations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bglib" = callPackage
@@ -39688,7 +39688,7 @@ self: {
          serialport stm
        ];
        description = "Implementation of the BGAPI serial protocol";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bgmax" = callPackage
@@ -39699,8 +39699,8 @@ self: {
        sha256 = "0cgxdq5dfs9dvj5ly9sd52pf75yslrnds45hg9nwv5zrfld90rdv";
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        description = "Parse BgMax-files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39716,8 +39716,8 @@ self: {
          base bytestring mtl parallel pipes streaming-commons
        ];
        description = "Blocked GZip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39740,7 +39740,7 @@ self: {
        ];
        description = "Simple terminal GUI for local hoogle";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39763,8 +39763,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "A database based bibliography manager for BibTeX";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39778,7 +39778,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
        description = "Parse, format and processing BibTeX files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bidirectional" = callPackage
@@ -39790,8 +39790,8 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        testHaskellDepends = [ base hedgehog mtl ];
        description = "Simple bidirectional serialization and deserialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39811,8 +39811,8 @@ self: {
          template-haskell unix utf8-string xhtml
        ];
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39825,7 +39825,7 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39838,7 +39838,7 @@ self: {
        libraryHaskellDepends = [ base bytestring dataenc mtl ];
        description = "Extra helper functions for bidirectional specifications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39852,7 +39852,7 @@ self: {
        editedCabalFile = "1yc56avikf0xnmd7cm2hh93vgwcpxyiw1d208s4hp80i8iprkp2n";
        libraryHaskellDepends = [ base category ];
        description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bifunctors" = callPackage
@@ -39874,7 +39874,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -39907,8 +39907,8 @@ self: {
          uu-parsinglib
        ];
        description = "A parser for the Billboard chord dataset";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39927,7 +39927,7 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39947,7 +39947,7 @@ self: {
        ];
        description = "Leksah plugin base";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -39970,7 +39970,7 @@ self: {
        ];
        description = "Leksah plugin base";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {leksah-dummy = null; leksah-main = null; 
          leksah-plugin-pane = null;};
@@ -39989,7 +39989,7 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40006,7 +40006,7 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40025,7 +40025,7 @@ self: {
          base containers deepseq exceptions QuickCheck template-haskell
        ];
        description = "Bidirectional mapping between two key types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bimap-server" = callPackage
@@ -40040,7 +40040,7 @@ self: {
          aeson base bimap binary directory http-types unix wai warp
        ];
        description = "Two-column database server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bimaps" = callPackage
@@ -40067,7 +40067,7 @@ self: {
          vector
        ];
        description = "bijections with multiple implementations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bin" = callPackage
@@ -40082,7 +40082,7 @@ self: {
          base dec deepseq fin hashable QuickCheck
        ];
        description = "Bin: binary natural numbers";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "binary_0_8_8_0" = callPackage
@@ -40108,8 +40108,8 @@ self: {
          unordered-containers zlib
        ];
        description = "Binary serialisation for Haskell values using lazy ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "binary-bits" = callPackage
@@ -40128,8 +40128,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Bit parsing/writing on top of binary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40141,8 +40141,8 @@ self: {
        sha256 = "1w3cwnliaw1dxgg1zgsg13hp4qdhxb18pfrm99bhmfq81p26ghk8";
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Flexible way to ease transmission of binary data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40162,7 +40162,7 @@ self: {
          quickcheck-assertions resourcet
        ];
        description = "data serialization/deserialization conduit library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "binary-derive" = callPackage
@@ -40173,8 +40173,8 @@ self: {
        sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl";
        libraryHaskellDepends = [ base binary ghc-prim ];
        description = "Automatic deriving of Binary using GHC.Generics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40186,7 +40186,7 @@ self: {
        sha256 = "1246lsk6bfwkrcspdsavmbz5ym3dvjc8ik3r0nc2if9x55cx5rqm";
        libraryHaskellDepends = [ base binary ];
        description = "Simple wrappers around enum types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-ext" = callPackage
@@ -40211,8 +40211,8 @@ self: {
          transformers-base
        ];
        description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40228,8 +40228,8 @@ self: {
          base bytestring monads-tf peggy template-haskell
        ];
        description = "read/write binary file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40245,7 +40245,7 @@ self: {
          base binary bytestring data-binary-ieee754 syb text
        ];
        description = "Generic binary serialisation using binary and syb";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-ieee754" = callPackage
@@ -40256,7 +40256,7 @@ self: {
        sha256 = "0m2dxr5a4rb18jh1xj5yxjpjybn6bz5pjxd2cx06nd6dif4qki0m";
        libraryHaskellDepends = [ array base binary ];
        description = "Backport ieee754 float double combinators to older binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-indexed-tree" = callPackage
@@ -40268,7 +40268,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40294,7 +40294,7 @@ self: {
          time-compat unordered-containers vector
        ];
        description = "Orphan instances for binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-io" = callPackage
@@ -40313,7 +40313,7 @@ self: {
          async base binary bytestring hspec process stm
        ];
        description = "Read and write values of types that implement Binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-list" = callPackage
@@ -40329,7 +40329,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lists of length a power of two";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-literal-qq" = callPackage
@@ -40342,7 +40342,7 @@ self: {
        editedCabalFile = "0rs6ymklp25lmk0hs8paxi4d8qjxjqpmbg2jbpzdagci39h3m9b1";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Extends Haskell with binary literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-orphans" = callPackage
@@ -40361,7 +40361,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Compatibility package for binary; provides instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-parser" = callPackage
@@ -40379,7 +40379,7 @@ self: {
          tasty-quickcheck
        ];
        description = "A highly-efficient but limited parser API specialised for bytestrings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "binary-parsers" = callPackage
@@ -40408,7 +40408,7 @@ self: {
          unordered-containers vector
        ];
        description = "Extends binary with parsec/attoparsec style parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-protocol" = callPackage
@@ -40419,8 +40419,8 @@ self: {
        sha256 = "1hn6jc4j20z8ni7rpcyamam898yl6jy7zinrhy2rdjvx0p5br13h";
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Monad to ease implementing a binary network protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40436,8 +40436,8 @@ self: {
          base binary bytestring mtl zeromq-haskell
        ];
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40454,8 +40454,8 @@ self: {
          base directory doctest filepath hspec QuickCheck
        ];
        description = "Binary and exponential searches";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40467,7 +40467,7 @@ self: {
        sha256 = "0qdbz2qvvqiaqp859fn00470gzxpvw8k3v0wqclgqps3zj9g9854";
        libraryHaskellDepends = [ base bytestring cborg serialise ];
        description = "Yet Another Binary Serialisation Library (compatibility shim)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-shared" = callPackage
@@ -40489,7 +40489,7 @@ self: {
        sha256 = "06v3qxyl2mvwi3y29rxxf91b2vxvlh5gfznwlnzb4mxzd00aakgl";
        libraryHaskellDepends = [ base binary bytestring containers mtl ];
        description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-store" = callPackage
@@ -40509,8 +40509,8 @@ self: {
          base binary-list QuickCheck tasty tasty-quickcheck
        ];
        description = "Format to store data using the binary transform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {binary-transform = null;};
 
@@ -40528,8 +40528,8 @@ self: {
          QuickCheck
        ];
        description = "data serialization/deserialization io-streams library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40542,7 +40542,7 @@ self: {
        libraryHaskellDepends = [ array base bytestring mtl ];
        testHaskellDepends = [ base bytestring ];
        description = "Binary deserialisation using strict ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binary-tagged" = callPackage
@@ -40572,8 +40572,8 @@ self: {
          unordered-containers
        ];
        description = "Tagged binary serialisation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40592,7 +40592,7 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "binary-typed" = callPackage
@@ -40613,8 +40613,8 @@ self: {
          base binary bytestring criterion deepseq
        ];
        description = "Type-safe binary serialization";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40626,7 +40626,7 @@ self: {
        sha256 = "1i183ab4bbq3yarijnb2pwgbi9k1w1nc0fs6ph8d8xnysj6ws8l8";
        libraryHaskellDepends = [ base binary ];
        description = "VarInt encoding/decoding via Data.Binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binarydefer" = callPackage
@@ -40637,7 +40637,7 @@ self: {
        sha256 = "06q255kip3j31bmj01fqkikvjxbklvcaa1kv3al8v04nkqx6rg3p";
        libraryHaskellDepends = [ base ];
        description = "Binary serialization with deferred loading";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binaryen" = callPackage
@@ -40650,7 +40650,7 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "Haskell bindings to binaryen";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bind-marshal" = callPackage
@@ -40667,8 +40667,8 @@ self: {
          numeric-prelude random stm strict transformers type-level-tf unix
        ];
        description = "Data marshaling library that uses type level equations to optimize buffering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40683,8 +40683,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base HTF HUnit QuickCheck random ];
        description = "Data Binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40699,8 +40699,8 @@ self: {
        libraryHaskellDepends = [ base binding-core gtk mtl ];
        testHaskellDepends = [ base binding-core directory gtk ];
        description = "Data Binding in Gtk2Hs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40715,8 +40715,8 @@ self: {
        libraryHaskellDepends = [ base binding-core stm wx wxcore ];
        testHaskellDepends = [ base binding-core directory wx ];
        description = "Data Binding in WxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40728,7 +40728,7 @@ self: {
        sha256 = "0zczf1yfjnfzdzv33j33vcc71zsf88a5qxsdmswxrpzika3rs6i0";
        libraryHaskellDepends = [ base ];
        description = "Deprecated package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-DSL" = callPackage
@@ -40739,7 +40739,7 @@ self: {
        sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3";
        libraryHaskellDepends = [ base ];
        description = "FFI domain specific language, on top of hsc2hs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-EsounD" = callPackage
@@ -40751,8 +40751,8 @@ self: {
        libraryHaskellDepends = [ base bindings-audiofile bindings-DSL ];
        libraryPkgconfigDepends = [ esound ];
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {esound = null;};
 
@@ -40774,7 +40774,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Low-level bindings to GLFW OpenGL library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
          inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; 
@@ -40791,8 +40791,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ K8055D ];
        description = "Bindings to Velleman K8055 dll";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {K8055D = null;};
 
@@ -40805,8 +40805,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ apr ];
        description = "Low level bindings to Apache Portable Runtime (APR)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) apr;};
 
@@ -40819,8 +40819,8 @@ self: {
        libraryHaskellDepends = [ base bindings-apr bindings-DSL ];
        libraryPkgconfigDepends = [ apr-util ];
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {apr-util = null;};
 
@@ -40833,7 +40833,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ audiofile ];
        description = "Low level bindings to audiofile";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {inherit (pkgs) audiofile;};
 
   "bindings-bfd" = callPackage
@@ -40848,8 +40848,8 @@ self: {
        librarySystemDepends = [ bfd opcodes ];
        libraryToolDepends = [ alex happy ];
        description = "Bindings for libbfd, a library of the GNU `binutils'";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bfd = null; opcodes = null;};
 
@@ -40862,8 +40862,8 @@ self: {
        libraryHaskellDepends = [ bindings-DSL ];
        librarySystemDepends = [ dttools ];
        description = "Bindings to the CCTools WorkQueue C library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dttools = null;};
 
@@ -40883,7 +40883,7 @@ self: {
        librarySystemDepends = [ codec2 ];
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Very low-level FFI bindings for Codec2";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {inherit (pkgs) codec2;};
 
   "bindings-common" = callPackage
@@ -40894,8 +40894,8 @@ self: {
        sha256 = "1zbm8v5xp4pay6h0y24ngf8nw96ab0zr754b9n2zczadiarccmcb";
        libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -40909,8 +40909,8 @@ self: {
        librarySystemDepends = [ dc1394 ];
        libraryToolDepends = [ c2hs ];
        description = "Library for using firewire (iidc-1394) cameras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dc1394 = null;};
 
@@ -40923,8 +40923,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL bindings-posix ];
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
@@ -40937,8 +40937,8 @@ self: {
        librarySystemDepends = [ eskit ];
        libraryPkgconfigDepends = [ eskit ];
        description = "Bindings to ESKit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {eskit = null;};
 
@@ -40951,8 +40951,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {fann = null;};
 
@@ -40965,8 +40965,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ fluidsynth ];
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
@@ -40979,8 +40979,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {friso = null;};
 
@@ -40993,7 +40993,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings to GLib";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) glib;};
 
   "bindings-gobject" = callPackage
@@ -41005,7 +41005,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings supporting GObject and derived libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) glib;};
 
   "bindings-gpgme" = callPackage
@@ -41017,7 +41017,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ gpgme ];
        description = "Project bindings-* raw interface to gpgme";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gpgme;};
 
   "bindings-gsl" = callPackage
@@ -41029,8 +41029,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gsl;};
 
@@ -41043,7 +41043,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
        libraryPkgconfigDepends = [ gts ];
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {inherit (pkgs) gts;};
 
   "bindings-hamlib" = callPackage
@@ -41060,8 +41060,8 @@ self: {
        librarySystemDepends = [ hamlib ];
        executableHaskellDepends = [ base ];
        description = "Hamlib bindings for Haskell";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) hamlib;};
 
@@ -41073,8 +41073,8 @@ self: {
        sha256 = "1d94irqliswjqx65k147mj8i9j34xhfn5lyk5xa7ycf3m5b1g95z";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41088,7 +41088,7 @@ self: {
        librarySystemDepends = [ blas liblapack ];
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "bindings-libcddb" = callPackage
@@ -41100,7 +41100,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libcddb ];
        description = "Low level binding to libcddb";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libcddb;};
 
   "bindings-libffi" = callPackage
@@ -41112,7 +41112,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libffi ];
        description = "Low level bindings to libffi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libffi;};
 
   "bindings-libftdi" = callPackage
@@ -41125,7 +41125,7 @@ self: {
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libftdi; libusb = null;};
 
@@ -41138,8 +41138,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ g15 ];
        description = "Bindings to libg15";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {g15 = null;};
 
@@ -41151,8 +41151,8 @@ self: {
        sha256 = "18vjsgvndmxbxvyapxkgkx36qgh2yrdg8dfaqpcd9zr3yl84kxnq";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low level bindings to libpci";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41165,8 +41165,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ librrd ];
        description = "Low level bindings to RRDtool";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {librrd = null;};
 
@@ -41183,8 +41183,8 @@ self: {
        ];
        librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {stemmer = null;};
 
@@ -41197,8 +41197,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libusb ];
        description = "Low level bindings to libusb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libusb = null;};
 
@@ -41211,8 +41211,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ v4l2 ];
        description = "bindings to libv4l2 for Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {v4l2 = null;};
 
@@ -41225,7 +41225,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libzip ];
        description = "Low level bindings to libzip";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libzip;};
 
   "bindings-linux-videodev2" = callPackage
@@ -41236,8 +41236,8 @@ self: {
        sha256 = "0k8h0i8qfmx6fg5d7mbh57brp8h896j9070bss9jmds4bhizhpw9";
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41250,8 +41250,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ lxc ];
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
@@ -41262,7 +41262,7 @@ self: {
        sha256 = "19qdf5z6mf8j8inlnax0nv1wiv4va27z4a303hpkbgda459093nd";
        libraryHaskellDepends = [ bindings-posix ];
        description = "(deprecated) see bindings-posix instead";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-monetdb-mapi" = callPackage
@@ -41274,8 +41274,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {monetdb-mapi = null;};
 
@@ -41287,8 +41287,8 @@ self: {
        sha256 = "18i68ivsrdndjpfnyq6dlmmkkx22v3rp619nm26af8ka3qai12j5";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "bindings to mpdecimal library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41306,7 +41306,7 @@ self: {
          base bytestring hspec HUnit QuickCheck quickcheck-io
        ];
        description = "bindings to nettle crypto library";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) nettle;};
 
   "bindings-parport" = callPackage
@@ -41317,7 +41317,7 @@ self: {
        sha256 = "1q404clpqzv0gik80ycipl94hvj27397z5cw1cs7b0yxlypllg3j";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "parport bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-portaudio" = callPackage
@@ -41329,7 +41329,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL vector ];
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
@@ -41340,7 +41340,7 @@ self: {
        sha256 = "02bcb40jpwylcl48g48r2yd3j7pmij94975r3dcnmyk76kyp3fc3";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to Posix";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-potrace" = callPackage
@@ -41352,7 +41352,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ potrace ];
        description = "Low-level bindings to the potrace bitmap tracing library";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {inherit (pkgs) potrace;};
 
   "bindings-ppdev" = callPackage
@@ -41363,8 +41363,8 @@ self: {
        sha256 = "18px429hplpabfhapwasbdgw8ynfm3vr5rf81pp173j1z0bv4ygq";
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41385,7 +41385,7 @@ self: {
          base cmdargs containers directory filepath process text unix
        ];
        description = "Wrapping saga_cmd";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "bindings-sane" = callPackage
@@ -41397,7 +41397,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ sane-backends ];
        description = "FFI bindings to libsane";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {inherit (pkgs) sane-backends;};
 
   "bindings-sc3" = callPackage
@@ -41411,7 +41411,7 @@ self: {
        librarySystemDepends = [ scsynth ];
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {scsynth = null;};
 
@@ -41428,7 +41428,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Low level bindings to SIPC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {sipc = null;};
 
@@ -41440,7 +41440,7 @@ self: {
        sha256 = "0fiibm7nrsx9pzi2lvhhbw71bah6s22h3jvn417ng3lj6ghhzii6";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low-level bindings to sophia library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-sqlite3" = callPackage
@@ -41452,7 +41452,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ sqlite ];
        description = "Low level bindings to sqlite3";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) sqlite;};
 
   "bindings-svm" = callPackage
@@ -41463,7 +41463,7 @@ self: {
        sha256 = "1nnmyxn28qdfy2sclnxv2mf2d426vrzgs7f0vvqri6fkjnvmk11b";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low level bindings to libsvm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bindings-uname" = callPackage
@@ -41474,7 +41474,7 @@ self: {
        sha256 = "1lsw4dh5vgmfvrx62ns5kmngzlmjzbxkx43x5i2k5qlmzp1pa3hk";
        libraryHaskellDepends = [ base ];
        description = "Low-level binding to POSIX uname(3)";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "bindings-wlc" = callPackage
@@ -41487,8 +41487,8 @@ self: {
        librarySystemDepends = [ wlc ];
        testHaskellDepends = [ base ];
        description = "Bindings against the wlc library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {wlc = null;};
 
@@ -41501,8 +41501,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gmp yices ];
        description = "Bindings to the Yices theorem prover";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "bindynamic" = callPackage
@@ -41515,8 +41515,8 @@ self: {
        editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663";
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41535,8 +41535,8 @@ self: {
          base containers directory dlist filepath
        ];
        description = "Embed data into object files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41553,8 +41553,8 @@ self: {
          base binembed bytestring containers filepath
        ];
        description = "Example project using binembed to embed data in object files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41568,7 +41568,7 @@ self: {
          base binary bytestring data-binary-ieee754
        ];
        description = "A collection of various methods for reading and writing bini files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bins" = callPackage
@@ -41586,7 +41586,7 @@ self: {
          tagged vector-sized
        ];
        description = "Aggregate continuous values into discrete bins";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "binsm" = callPackage
@@ -41604,7 +41604,7 @@ self: {
        ];
        description = "binary files splitter and merger";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bio" = callPackage
@@ -41625,7 +41625,7 @@ self: {
        executableHaskellDepends = [ base bytestring random ];
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41642,8 +41642,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41658,7 +41658,7 @@ self: {
        ];
        description = "Library for reading ace assembly files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41671,7 +41671,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41686,7 +41686,7 @@ self: {
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41699,7 +41699,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Library for reading fasta sequence files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41712,7 +41712,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "A library for reading FASTQ files";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41735,8 +41735,8 @@ self: {
          unordered-containers vector vector-algorithms zlib
        ];
        description = "bioinformatics support library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41773,8 +41773,8 @@ self: {
          random
        ];
        description = "A collection of bioinformatics tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41791,7 +41791,7 @@ self: {
        ];
        description = "Library for reading phd sequence files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41809,7 +41809,7 @@ self: {
        executableHaskellDepends = [ cmdargs unordered-containers ];
        description = "Library and executables for working with PSL files";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41826,8 +41826,8 @@ self: {
        libraryHaskellDepends = [ array base binary biocore bytestring ];
        executableHaskellDepends = [ array base cmdargs mtl ];
        description = "Library and executables for working with SFF files";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41850,8 +41850,8 @@ self: {
          transformers zlib-conduit
        ];
        description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41872,7 +41872,7 @@ self: {
          bytestring hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "birch-beer" = callPackage
@@ -41906,8 +41906,8 @@ self: {
          lens optparse-generic sparse-linear-algebra text text-show vector
        ];
        description = "Plot a colorful tree";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41928,8 +41928,8 @@ self: {
          haskell98 MissingH mtl parsec process rallod
        ];
        description = "A simple, sinatra-inspired web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41942,8 +41942,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Birds of Paradise";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -41961,7 +41961,7 @@ self: {
          base configurator directory filepath mtl selda selda-sqlite text
        ];
        description = "A small tool that clears qutebrowser cookies";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "bisect-binary" = callPackage
@@ -41981,8 +41981,8 @@ self: {
          yaml
        ];
        description = "Determine relevant parts of binary data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42014,7 +42014,7 @@ self: {
        ];
        description = "Plays chess";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42027,8 +42027,8 @@ self: {
        libraryHaskellDepends = [ base numeric-qq ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42048,7 +42048,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Encode binary protocols with some odd bit numbers into a bytestring";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bit-stream" = callPackage
@@ -42068,8 +42068,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42086,7 +42086,7 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        description = "Simple bit vectors for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitarray" = callPackage
@@ -42099,7 +42099,7 @@ self: {
        editedCabalFile = "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45";
        libraryHaskellDepends = [ array base ];
        description = "Mutable and immutable bit arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitcoin-address" = callPackage
@@ -42120,8 +42120,8 @@ self: {
          hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        description = "Bitcoin address generation and rendering. Parsing coming soon.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42146,8 +42146,8 @@ self: {
          http-client lens text wreq
        ];
        description = "Provides access to the RPC API of Bitcoin Core";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42170,8 +42170,8 @@ self: {
          lens text wreq
        ];
        description = "Higher level constructs on top of the bitcoin-api package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42192,8 +42192,8 @@ self: {
          base bitcoin-tx bitcoin-types bytestring hexstring hspec
        ];
        description = "Utility functions for manipulating bitcoin blocks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42216,8 +42216,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "BIP 158 compact block filters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42232,7 +42232,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cryptonite memory ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "Bitcoin hash primitives";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "bitcoin-hs" = callPackage
@@ -42255,8 +42255,8 @@ self: {
          random tasty tasty-hunit tasty-quickcheck time transformers
        ];
        description = "Partial implementation of the Bitcoin protocol (as of 2013)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42274,7 +42274,7 @@ self: {
          tasty-hunit
        ];
        description = "Bitcoin keys";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "bitcoin-payment-channel" = callPackage
@@ -42315,7 +42315,7 @@ self: {
        ];
        description = "Instant, two-party Bitcoin payments";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {blockchain-restful-address-index-api = null;};
 
@@ -42339,8 +42339,8 @@ self: {
          test-framework-quickcheck2 text unix unordered-containers watchdog
        ];
        description = "Library to communicate with the Satoshi Bitcoin daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42358,8 +42358,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "Compilation, manipulation and decompilation of Bitcoin scripts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42383,8 +42383,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Resources for working with miniscript, and script descriptors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42405,8 +42405,8 @@ self: {
          base bitcoin-script bytestring hexstring hspec
        ];
        description = "Utility functions for manipulating bitcoin transactions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42426,7 +42426,7 @@ self: {
          base base58string bytestring hexstring hspec
        ];
        description = "Provides consistent low-level types used commonly among Bitcoin implementations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bitcoind-regtest" = callPackage
@@ -42455,8 +42455,8 @@ self: {
          servant-client tasty tasty-hunit temporary text
        ];
        description = "A library for working with bitcoin-core regtest networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42478,8 +42478,8 @@ self: {
          servant-jsonrpc-client text time transformers
        ];
        description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42495,8 +42495,8 @@ self: {
          base Bitly directory filepath regexpr
        ];
        description = "A command line tool to access bit.ly URL shortener.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42508,7 +42508,7 @@ self: {
        sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
        libraryHaskellDepends = [ base bytestring ];
        description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitmap-opengl" = callPackage
@@ -42519,7 +42519,7 @@ self: {
        sha256 = "1wq1p0vvif750gpyh2kq3agzwga3hx0fq28irbw5dgrz462dd9pv";
        libraryHaskellDepends = [ base bitmap OpenGL ];
        description = "OpenGL support for Data.Bitmap.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitmaps" = callPackage
@@ -42535,8 +42535,8 @@ self: {
          stb-image string-class tagged zlib
        ];
        description = "Bitmap library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42554,7 +42554,7 @@ self: {
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
        description = "Various bit twiddling and bitwise serialization primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bits-atomic" = callPackage
@@ -42567,8 +42567,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42584,7 +42584,7 @@ self: {
        testHaskellDepends = [ base bits bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Bits instance for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bits-bytestring-lazy" = callPackage
@@ -42601,7 +42601,7 @@ self: {
          base bits-bytestring bytestring criterion
        ];
        description = "Bits instance for lazy bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bits-conduit" = callPackage
@@ -42618,8 +42618,8 @@ self: {
          base bytestring conduit criterion random
        ];
        description = "Bitstream support for Conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42640,7 +42640,7 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
        description = "Useful bitwise operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bits-extras" = callPackage
@@ -42654,8 +42654,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gcc_s = null;};
 
@@ -42678,8 +42678,8 @@ self: {
        ];
        benchmarkSystemDepends = [ gmp ];
        description = "A space-efficient set data structure";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp;};
 
@@ -42704,7 +42704,7 @@ self: {
          th-lift-instances vector
        ];
        description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bitspeak" = callPackage
@@ -42723,7 +42723,7 @@ self: {
        executablePkgconfigDepends = [ gtk2 pango ];
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
 
@@ -42742,7 +42742,7 @@ self: {
          base base-unicode-symbols bytestring QuickCheck vector
        ];
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "bitstring" = callPackage
@@ -42753,7 +42753,7 @@ self: {
        sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8";
        libraryHaskellDepends = [ base bytestring ];
        description = "Lazy bit strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bittorrent" = callPackage
@@ -42785,8 +42785,8 @@ self: {
          network QuickCheck quickcheck-instances text time
        ];
        description = "Bittorrent protocol implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42807,7 +42807,7 @@ self: {
        ];
        executableHaskellDepends = [ base text turtle ];
        description = "Bindings for the Bittrex API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitvec" = callPackage
@@ -42831,7 +42831,7 @@ self: {
          base containers gauge integer-gmp random vector
        ];
        description = "Space-efficient bit vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
   "bitvec_1_1_0_0" = callPackage
@@ -42854,8 +42854,8 @@ self: {
          base containers gauge integer-gmp random vector
        ];
        description = "Space-efficient bit vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bitwise" = callPackage
@@ -42870,7 +42870,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bitwise-enum" = callPackage
@@ -42893,8 +42893,8 @@ self: {
          aeson array base deepseq gauge mono-traversable vector wide-word
        ];
        description = "Bitwise operations on bounded enumerations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42918,8 +42918,8 @@ self: {
          http-types microlens safe text time
        ];
        description = "A Haskell library for working with the BitX bitcoin exchange";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42935,8 +42935,8 @@ self: {
          base-noprelude containers directory regexpr text
        ];
        description = "A lousy Prelude replacement by a lousy dude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42948,8 +42948,8 @@ self: {
        sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij";
        libraryHaskellDepends = [ base containers text ];
        description = "A lousy Prelude replacement by a lousy dude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42961,7 +42961,7 @@ self: {
        sha256 = "0av4gkh2vr9righ26hbagh8j30i8k4sp3af98lmwm5gf81vs5az4";
        libraryHaskellDepends = [ base containers ];
        description = "BK-tree implementation";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "bkr" = callPackage
@@ -42984,8 +42984,8 @@ self: {
          http-conduit MissingH pureMD5 random strict text unix utf8-string
        ];
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -42997,7 +42997,7 @@ self: {
        sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9";
        libraryHaskellDepends = [ array base containers ];
        description = "A set data structure with approximate searching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bla" = callPackage
@@ -43011,8 +43011,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 unix ];
        description = "a stupid cron";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43033,7 +43033,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "The pirate bay client";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "blacktip" = callPackage
@@ -43054,7 +43054,7 @@ self: {
          async base criterion network-info time
        ];
        description = "Decentralized, k-ordered unique ID generator";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "blake2" = callPackage
@@ -43072,7 +43072,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A library providing BLAKE2";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "blake3" = callPackage
@@ -43084,7 +43084,7 @@ self: {
        libraryHaskellDepends = [ base memory ];
        testHaskellDepends = [ base memory tasty tasty-hunit ];
        description = "BLAKE3 hashing algorithm";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "blakesum" = callPackage
@@ -43095,8 +43095,8 @@ self: {
        sha256 = "15k3vf9jqcw1a9gyppkhn5ibj7ld8mb2irfhbwd3plj86xyxxa0g";
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43114,8 +43114,8 @@ self: {
          base blakesum bytestring haskell98 text vector
        ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43140,7 +43140,7 @@ self: {
          wai wai-extra warp
        ];
        description = "HTML5 Canvas Graphics Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blanks" = callPackage
@@ -43159,7 +43159,7 @@ self: {
          tasty tasty-hunit text
        ];
        description = "Fill-in-the-blanks - A library factoring out substitution from ASTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blas" = callPackage
@@ -43170,8 +43170,8 @@ self: {
        sha256 = "1q6fkw2bsppymy5wi7mgkl09caij52xplw64786548z9i95r0bli";
        libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        description = "Bindings to the BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43188,7 +43188,7 @@ self: {
          transformers
        ];
        description = "Auto-generated interface to Fortran BLAS via CArrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blas-comfort-array" = callPackage
@@ -43204,7 +43204,7 @@ self: {
          storable-complex transformers
        ];
        description = "Auto-generated interface to Fortran BLAS via comfort-array";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blas-ffi" = callPackage
@@ -43218,7 +43218,7 @@ self: {
        libraryHaskellDepends = [ base netlib-ffi ];
        libraryPkgconfigDepends = [ blas ];
        description = "Auto-generated interface to Fortran BLAS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) blas;};
 
   "blas-hs" = callPackage
@@ -43231,7 +43231,7 @@ self: {
        librarySystemDepends = [ blas ];
        testHaskellDepends = [ base vector ];
        description = "Low-level Haskell bindings to Blas";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -43245,7 +43245,7 @@ self: {
        ];
        description = "Library for reading Blast XML output";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43263,8 +43263,8 @@ self: {
          base blaze-html dates directory HaTeX process split tagsoup text
        ];
        description = "Blog in LaTeX";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43276,7 +43276,7 @@ self: {
        sha256 = "01n6cw3fjmlj5pmdy122ch4kbf6srvwlz356rr6nxfrm0ndcxp38";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-bootstrap" = callPackage
@@ -43287,7 +43287,7 @@ self: {
        sha256 = "0qsis1hwd8sqcciibxwy8p6irszwa2fy5m75qxp46ymfal5lrdak";
        libraryHaskellDepends = [ base blaze-html text ];
        description = "Blaze helper functions for bootstrap pages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "blaze-builder" = callPackage
@@ -43307,7 +43307,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text utf8-string
        ];
        description = "Efficient buffered output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-builder-conduit" = callPackage
@@ -43319,7 +43319,7 @@ self: {
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
        description = "Convert streams of builders to streams of bytestrings. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-builder-enumerator" = callPackage
@@ -43337,8 +43337,8 @@ self: {
          streaming-commons transformers
        ];
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43357,8 +43357,8 @@ self: {
        ];
        testHaskellDepends = [ base colonnade doctest ];
        description = "blaze-html backend for colonnade";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43374,7 +43374,7 @@ self: {
          base containers directory filepath tagsoup
        ];
        description = "Tool to convert HTML to BlazeHtml code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-html" = callPackage
@@ -43395,7 +43395,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "A blazingly fast HTML combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-html-contrib" = callPackage
@@ -43410,8 +43410,8 @@ self: {
          base blaze-html cgi data-default network safe text
        ];
        description = "Some contributions to add handy things to blaze html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43423,8 +43423,8 @@ self: {
        sha256 = "11bw5ywvi7dlz5inch3z0vlg936ch1rnp99bh4nmwskvszidd7kg";
        libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        description = "A hexpat backend for blaze-html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43440,8 +43440,8 @@ self: {
          base blaze-markup bytestring html-truncate tagsoup text
        ];
        description = "A truncator for blaze-html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43463,8 +43463,8 @@ self: {
          text unordered-containers vector
        ];
        description = "tiny library for encoding json";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43482,7 +43482,7 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "A blazingly fast markup combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-shields" = callPackage
@@ -43495,7 +43495,7 @@ self: {
          base blaze-html blaze-markup blaze-svg text
        ];
        description = "create svg by Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-svg" = callPackage
@@ -43506,7 +43506,7 @@ self: {
        sha256 = "0q5a4wam0sidng0cfsivwkyph9snyilk7rsdx4vb6wz9l6xz397n";
        libraryHaskellDepends = [ base blaze-markup mtl ];
        description = "SVG combinator library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-textual" = callPackage
@@ -43527,7 +43527,7 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        description = "Fast rendering of common datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blaze-textual-native" = callPackage
@@ -43543,8 +43543,8 @@ self: {
          time vector
        ];
        description = "Fast rendering of common datatypes (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43556,7 +43556,7 @@ self: {
        sha256 = "03gx3ylxz7xa86ngi33dm347ni6a4mcq4fizlx3majpfdk5fs38c";
        libraryHaskellDepends = [ base blaze-html blaze-markup ];
        description = "...";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "blazeT" = callPackage
@@ -43573,8 +43573,8 @@ self: {
          transformers
        ];
        description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43606,8 +43606,8 @@ self: {
          quickcheck-instances random text transformers uuid
        ];
        description = "Bluetooth Low Energy (BLE) peripherals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43623,7 +43623,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Password entry tool";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "blink1" = callPackage
@@ -43641,8 +43641,8 @@ self: {
          base bytestring text unix usb vector
        ];
        description = "Control library for blink(1) LED from ThingM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43661,8 +43661,8 @@ self: {
          old-time parseargs pretty
        ];
        description = "Python to bytecode compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43678,8 +43678,8 @@ self: {
          base binary bytestring containers mtl pretty utf8-string
        ];
        description = "Support code for Blip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43703,8 +43703,8 @@ self: {
          text time transformers unordered-containers
        ];
        description = "Generic blockchain implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43726,8 +43726,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Blockhash perceptual image hash algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43739,7 +43739,7 @@ self: {
        sha256 = "00xlj503h6073f9sk7a1p2b66nw2lryyvxxbawwz030mjdb6hgps";
        libraryHaskellDepends = [ base containers parallel ];
        description = "Composable, blocking transactions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "blogination" = callPackage
@@ -43760,8 +43760,8 @@ self: {
        ];
        executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43790,8 +43790,8 @@ self: {
          unix-compat unordered-containers vector
        ];
        description = "Elasticsearch client library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43814,8 +43814,8 @@ self: {
          http-client-tls lens retry tasty tasty-hunit text time
        ];
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43833,7 +43833,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Pure and impure Bloom Filter implementations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bloomfilter-redis" = callPackage
@@ -43854,8 +43854,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Distributed bloom filters on Redis (using the Hedis client)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43877,8 +43877,8 @@ self: {
          text
        ];
        description = "BLOSUM generator";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43894,7 +43894,7 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43912,8 +43912,8 @@ self: {
          base blubber-server bytestring cereal containers gloss network unix
        ];
        description = "The blubber client; connects to the blubber server";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43935,8 +43935,8 @@ self: {
          process random scotty text transformers unix
        ];
        description = "The blubber server, serves blubber clients";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -43963,7 +43963,7 @@ self: {
          base data-default deepseq hspec mtl QuickCheck time
        ];
        description = "Configurable blue light filter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "bludigon" = callPackage
@@ -43989,7 +43989,7 @@ self: {
          base data-default deepseq hspec mtl QuickCheck time
        ];
        description = "Configurable blue light filter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "bluemix-sdk" = callPackage
@@ -44004,7 +44004,7 @@ self: {
          aeson base bytestring http-client http-types text vector
        ];
        description = "Bindings to Bluemix APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bluetile" = callPackage
@@ -44026,8 +44026,8 @@ self: {
        ];
        executablePkgconfigDepends = [ gtk2 ];
        description = "full-featured tiling for the GNOME desktop environment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2;};
 
@@ -44041,8 +44041,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gtk ];
        description = "Utilities for Bluetile";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44058,8 +44058,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44081,8 +44081,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Convert between pointfree and pointful expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44094,7 +44094,7 @@ self: {
        sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Read and write uncompressed BMP image files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bno055-haskell" = callPackage
@@ -44107,8 +44107,8 @@ self: {
          base bytestring cereal h2c mtl resourcet
        ];
        description = "Library for communication with the Bosch BNO055 orientation sensor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44160,7 +44160,7 @@ self: {
          transformers unix
        ];
        description = "Copy a directory tree, making zero-size sparse copies of big files";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "bogre-banana" = callPackage
@@ -44177,8 +44177,8 @@ self: {
          base hogre hois monad-control random reactive-banana
        ];
        executableHaskellDepends = [ base hogre hois random ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44207,8 +44207,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Generate Haskell boilerplate";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44232,8 +44232,8 @@ self: {
          unordered-containers vector
        ];
        description = "Bolt driver for Neo4j";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44259,8 +44259,8 @@ self: {
          aeson base bytestring containers directory filepath megaparsec text
        ];
        description = "Analytic sampler compiler for combinatorial systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44278,7 +44278,7 @@ self: {
          QuickCheck transformers unordered-containers vector
        ];
        description = "Uniform random generators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bond" = callPackage
@@ -44311,8 +44311,8 @@ self: {
          tasty-golden tasty-hunit tasty-quickcheck text unordered-containers
        ];
        description = "Bond schema compiler and code generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44341,8 +44341,8 @@ self: {
          base bytestring criterion filepath vector
        ];
        description = "Runtime support for BOND serialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44364,8 +44364,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Bond code generator for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44393,8 +44393,8 @@ self: {
          base criterion data-default-class type-level-sets
        ];
        description = "Anonymous records and overloaded labels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44406,8 +44406,8 @@ self: {
        sha256 = "1d3wzj4nh8f436wfqhdlhrpxhrrhqh97wrfyykm26bnngy4kdsk6";
        libraryHaskellDepends = [ base bookkeeper type-level-sets ];
        description = "Permissions for bookkeeper records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44424,7 +44424,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A module for bookkeeping by double entry";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bookkeeping-jp" = callPackage
@@ -44440,7 +44440,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Helper functions for Japanese bookkeeping";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bool-extras" = callPackage
@@ -44451,7 +44451,7 @@ self: {
        sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
        libraryHaskellDepends = [ base ];
        description = "A fold function for Bool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bool8" = callPackage
@@ -44462,7 +44462,7 @@ self: {
        sha256 = "0hrh3sh19hjdjjm5g1xwvhkf8l13qdrdrxvnylh8sn3d54krhixw";
        libraryHaskellDepends = [ base ];
        description = "Alternative Bool type stored as byte";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boolean-like" = callPackage
@@ -44477,7 +44477,7 @@ self: {
          attoparsec base bytestring containers semigroups text vector
        ];
        description = "Logical combinatory operations dealing with datatypes representing booleans by their constructors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boolean-list" = callPackage
@@ -44488,7 +44488,7 @@ self: {
        sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs";
        libraryHaskellDepends = [ base bytestring HUnit ];
        description = "convert numbers to binary coded lists";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "boolean-normal-forms" = callPackage
@@ -44504,8 +44504,8 @@ self: {
          base cond containers QuickCheck tasty tasty-quickcheck
        ];
        description = "Boolean normal form: NNF, DNF & CNF";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44525,8 +44525,8 @@ self: {
        testHaskellDepends = [ base ];
        testSystemDepends = [ boolector ];
        description = "Haskell bindings for the Boolector SMT solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) boolector;};
 
   "boolexpr" = callPackage
@@ -44537,8 +44537,8 @@ self: {
        sha256 = "14v894clplpcc1visqn337p7vmacj5hgx41vr60pwvflmv98d8xn";
        libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44550,7 +44550,7 @@ self: {
        sha256 = "0057303m23p81v60jcsc3p7n2rs2rzrvbg5m18pc0fk95q2q2rim";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boolsimplifier" = callPackage
@@ -44563,7 +44563,7 @@ self: {
        editedCabalFile = "0xqm0vn9i49b75fnvnvcnr9m4zwvhqynrkcjdxghrsxayg420lnh";
        libraryHaskellDepends = [ base containers ];
        description = "Simplification tools for simple propositional formulas";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boomange" = callPackage
@@ -44581,7 +44581,7 @@ self: {
          base containers descrilo directory filepath simtreelo
        ];
        description = "A bookmarks manager with an HTML generator";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "boombox" = callPackage
@@ -44596,8 +44596,8 @@ self: {
          base bytestring comonad semigroupoids semigroups transformers
        ];
        description = "Chronokinetic stream sources and incremental consumers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44611,7 +44611,7 @@ self: {
          base mtl semigroups template-haskell text
        ];
        description = "Library for invertible parsing and printing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boomslang" = callPackage
@@ -44630,8 +44630,8 @@ self: {
          font-opengl-basic4x6 GLFW-b MonadRandom mtl OpenGL
        ];
        description = "Boomshine clone";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44644,7 +44644,7 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base ];
        description = "OOP primitives for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boopadoop" = callPackage
@@ -44667,8 +44667,8 @@ self: {
          base bytestring containers primes semialign split vector WAVE
        ];
        description = "Mathematically sound sound synthesis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44681,7 +44681,7 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        testHaskellDepends = [ base exceptions hspec mtl ];
        description = "IoC Monad in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "boots-app" = callPackage
@@ -44705,8 +44705,8 @@ self: {
        ];
        executableHaskellDepends = [ base time ];
        description = "Factory for quickly building an application";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44724,8 +44724,8 @@ self: {
          servant servant-client text unordered-containers
        ];
        description = "Factory for quickly building a microservice";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44745,8 +44745,8 @@ self: {
          servant-swagger swagger2 text unordered-containers vault wai warp
        ];
        description = "Factory for quickly building a web application";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44758,7 +44758,7 @@ self: {
        sha256 = "19dm3l8v8ggllpgvq20avna6wph6i2w50aabxynvw4kw9m6c3c44";
        libraryHaskellDepends = [ base text ];
        description = "Bootstrap CSS Framework type-safe interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bordacount" = callPackage
@@ -44770,7 +44770,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Implementation of the Borda count election method";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "borel" = callPackage
@@ -44801,8 +44801,8 @@ self: {
          zeromq4-haskell
        ];
        description = "Metering System for OpenStack metrics provided by Vaultaire";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44823,7 +44823,7 @@ self: {
          vec
        ];
        description = "Boring and Absurd types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boring-game" = callPackage
@@ -44838,7 +44838,7 @@ self: {
        executableHaskellDepends = [ base gloss ];
        testHaskellDepends = [ base ];
        description = "An educational game";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boring-window-switcher" = callPackage
@@ -44852,8 +44852,8 @@ self: {
        libraryHaskellDepends = [ base gtk transformers X11 ];
        executableHaskellDepends = [ base ];
        description = "A boring window switcher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44865,8 +44865,8 @@ self: {
        sha256 = "0crs1c6v298zqkjzkdgicigx22gvp9xv7bjlynbyckvx0lrvfmrc";
        libraryHaskellDepends = [ arrows base Stream ];
        description = "bots for functional reactive programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44878,7 +44878,7 @@ self: {
        sha256 = "0kdqz901fpdgggmkm9rpnpv7gma9c8d887bszhnz6xd3v96gg7xn";
        libraryHaskellDepends = [ base semigroups zero ];
        description = "Like Maybe, but with a different Monoid instance";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "botpp" = callPackage
@@ -44892,7 +44892,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Build tool for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44918,7 +44918,7 @@ self: {
          transformers-compat vector void
        ];
        description = "Making de Bruijn Succ Less";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bound-extras" = callPackage
@@ -44940,7 +44940,7 @@ self: {
          transformers utf8-string
        ];
        description = "ScopeH and ScopeT extras for bound";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bound-gen" = callPackage
@@ -44951,7 +44951,7 @@ self: {
        sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp";
        libraryHaskellDepends = [ base bound monad-gen mtl ];
        description = "Unwrap Scope's with globally fresh values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bounded-array" = callPackage
@@ -44962,8 +44962,8 @@ self: {
        sha256 = "0zv5a82rm6hwikgls2hw9d18igvfgw655s5pw5h1xbwcv1d8d0ji";
        libraryHaskellDepends = [ array base ];
        description = "Arrays with a value for every index";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -44976,7 +44976,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A strict, immutable, thread-safe, single-ended, bounded queue";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bounded-tchan" = callPackage
@@ -44987,7 +44987,7 @@ self: {
        sha256 = "12c78dz3y1ly05hckd9pf0j4fpknk383qyb5yrhps4sc2m3i9k9w";
        libraryHaskellDepends = [ base stm ];
        description = "Bounded Transactional channels (queues)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "boundingboxes" = callPackage
@@ -44998,7 +44998,7 @@ self: {
        sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8";
        libraryHaskellDepends = [ base lens ];
        description = "A generic boundingbox for an arbitrary vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bower-json" = callPackage
@@ -45018,7 +45018,7 @@ self: {
          aeson base bytestring tasty tasty-hunit text unordered-containers
        ];
        description = "Read bower.json from Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bowntz" = callPackage
@@ -45033,8 +45033,8 @@ self: {
          base containers GLUT hosc hsc3 random
        ];
        description = "audio-visual pseudo-physical simulation of colliding circles";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45062,8 +45062,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "boxes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45080,8 +45080,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45105,8 +45105,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Box websockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45118,7 +45118,7 @@ self: {
        sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "A hack to use GHC.Prim primitives in GHCi";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "boxes" = callPackage
@@ -45130,7 +45130,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base QuickCheck split ];
        description = "2D text pretty-printing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bpann" = callPackage
@@ -45141,7 +45141,7 @@ self: {
        sha256 = "02c8xyzs4kz9cx7ql48kq5cxf686vvd5mqrprkikynif9r4dk7w8";
        libraryHaskellDepends = [ base random split ];
        description = "backpropagation neuronal network";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bpath" = callPackage
@@ -45158,7 +45158,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A minimal typed unix path library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "braid" = callPackage
@@ -45180,8 +45180,8 @@ self: {
          diagrams-svg split
        ];
        description = "Types and functions to work with braids and Khovanov homology";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45195,8 +45195,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base containers parsec ];
        description = "primitive imperative language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45222,7 +45222,7 @@ self: {
        sha256 = "1c1xg56dh0qbiy7jga436pmp8x8rhkkpf3gb54kqg8asajswdh0s";
        libraryHaskellDepends = [ base directory process ];
        description = "BrainFuck monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "brainfuck-tut" = callPackage
@@ -45236,7 +45236,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [ array base ];
        description = "A simple BF interpreter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "brainheck" = callPackage
@@ -45255,7 +45255,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Brainh*ck interpreter in haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "break" = callPackage
@@ -45266,7 +45266,7 @@ self: {
        sha256 = "0wpj29a8lpimb0mjif4f6jmx6q9pkpkn5xplmkbjzkqgxi0bp23n";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Break from a loop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "breakout" = callPackage
@@ -45280,7 +45280,7 @@ self: {
        executableHaskellDepends = [ base haskgame mtl SDL ];
        description = "A simple Breakout game implementation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45304,8 +45304,8 @@ self: {
          warp-tls
        ];
        description = "a url shortener";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45319,8 +45319,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base parallel random SDL ];
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45347,7 +45347,7 @@ self: {
          base containers microlens QuickCheck vector
        ];
        description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "brick-dropdownmenu" = callPackage
@@ -45365,8 +45365,8 @@ self: {
          pointedlist vector vty
        ];
        description = "A drop-down menu widget for brick";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45386,7 +45386,7 @@ self: {
          base brick comonad containers directory directory-tree filepath
          free vector vty
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "brick-skylighting" = callPackage
@@ -45403,7 +45403,7 @@ self: {
          base brick containers skylighting-core text vty
        ];
        description = "Show syntax-highlighted text in your Brick UI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bricks" = callPackage
@@ -45426,8 +45426,8 @@ self: {
          parsec template-haskell text transformers
        ];
        description = "Bricks is a lazy functional language based on Nix";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45446,8 +45446,8 @@ self: {
          base containers doctest either-list-functions text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45463,8 +45463,8 @@ self: {
          base bricks-internal containers hedgehog template-haskell text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45485,8 +45485,8 @@ self: {
          bricks-syntax containers doctest hedgehog parsec text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45507,8 +45507,8 @@ self: {
          doctest hedgehog template-haskell text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45529,8 +45529,8 @@ self: {
          exceptions hint text
        ];
        description = "...";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45551,8 +45551,8 @@ self: {
          base binary cmdargs containers directory filepath text
        ];
        description = "Simple part of speech tagger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45585,8 +45585,8 @@ self: {
          yaml
        ];
        description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.agpl3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.agpl3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "broadcast-chan" = callPackage
@@ -45602,7 +45602,7 @@ self: {
        libraryHaskellDepends = [ base transformers unliftio-core ];
        benchmarkHaskellDepends = [ async base criterion deepseq stm ];
        description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "broadcast-chan-conduit" = callPackage
@@ -45622,7 +45622,7 @@ self: {
          base broadcast-chan-tests conduit containers
        ];
        description = "Conduit-based parallel streaming code for broadcast-chan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "broadcast-chan-pipes" = callPackage
@@ -45640,7 +45640,7 @@ self: {
          base broadcast-chan-tests containers foldl pipes pipes-safe
        ];
        description = "Pipes-based parallel streaming code for broadcast-chan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "broadcast-chan-tests" = callPackage
@@ -45664,7 +45664,7 @@ self: {
          base broadcast-chan containers foldl monad-loops random
        ];
        description = "Helpers for generating tests for broadcast-chan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "broccoli" = callPackage
@@ -45675,8 +45675,8 @@ self: {
        sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh";
        libraryHaskellDepends = [ base containers stm time ];
        description = "Small library for interactive functional programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45704,8 +45704,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Finds broken links in text files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45719,8 +45719,8 @@ self: {
        librarySystemDepends = [ broker ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "Haskell bindings to Broker, Bro's messaging library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {broker = null;};
 
@@ -45738,8 +45738,8 @@ self: {
          aeson base bytestring network-uri text time tz uuid-types
        ];
        description = "Common types and URIs for the BronyRadioGermany API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45760,8 +45760,8 @@ self: {
          time uuid
        ];
        description = "Streaming interface for the BronyRadioGermany API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45781,8 +45781,8 @@ self: {
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Brotli (RFC7932) compression and decompression";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) brotli;};
 
@@ -45803,8 +45803,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Conduit interface for Brotli (RFC7932) compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45825,8 +45825,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "IO-Streams interface for Brotli (RFC7932) compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45843,8 +45843,8 @@ self: {
          unordered-containers wreq
        ];
        description = "A reader and interface for the Browser Capabilities Project data files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45868,7 +45868,7 @@ self: {
          base blaze-builder bytestring deepseq gauge semigroups
        ];
        description = "Chunked HTTP transfer encoding for bytestring builders";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bsd-sysctl" = callPackage
@@ -45879,8 +45879,8 @@ self: {
        sha256 = "0wflh3ncd47j2v70m6lbdmaif974fimv3dd4wyj6krb03vq6lvpd";
        libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45902,8 +45902,8 @@ self: {
          test-framework-quickcheck2 text time
        ];
        description = "BSON documents are JSON-like objects with a standard binary encoding";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45915,8 +45915,8 @@ self: {
        sha256 = "11a8k6rngz5rdgccwnifiydsfc87hlgy4mp6chi30m2jvdq92imb";
        libraryHaskellDepends = [ base bson ghc-prim text ];
        description = "Generic functionality for BSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45928,8 +45928,8 @@ self: {
        sha256 = "03ifgmifk0dx6fzws1qlx3c1nslrkvwman5g3c4iag842bl03gxp";
        libraryHaskellDepends = [ base bson ghc-prim ];
        description = "Generics functionality for BSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45941,8 +45941,8 @@ self: {
        sha256 = "0q5ixrfgybf80q0x2p80qjy1kqarm2129hmzzqgcpn7jvqbv8fyp";
        libraryHaskellDepends = [ base bson lens text ];
        description = "BSON lenses";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -45957,7 +45957,7 @@ self: {
        ];
        description = "Mapping between BSON and algebraic data types";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bspack" = callPackage
@@ -45976,7 +45976,7 @@ self: {
          base blaze-builder bytestring criterion sandi
        ];
        description = "A simple and fast bytestring packer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bsparse" = callPackage
@@ -45989,8 +45989,8 @@ self: {
        editedCabalFile = "0vlcwcgmlk4ghwhiyy4234driyvq5ap5g587nmf23fh8b54g7j3q";
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple unassuming parser for bytestring";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46010,8 +46010,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
        description = "B-Tree on Unmanaged Heap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46035,7 +46035,7 @@ self: {
        ];
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46049,7 +46049,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring time unix ];
        description = "Bindings to the btrfs API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "buchhaltung" = callPackage
@@ -46087,8 +46087,8 @@ self: {
          text time transformers unordered-containers vector yaml
        ];
        description = "Automates most of your plain text accounting data entry in ledger format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46110,8 +46110,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Simple mutable low-level buffer for IO";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46136,8 +46136,8 @@ self: {
          text vector
        ];
        description = "Library for efficiently building up buffers, one piece at a time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46166,8 +46166,8 @@ self: {
          aeson base buffer-builder bytestring criterion deepseq text vector
        ];
        description = "Serialize Aeson values with Data.BufferBuilder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46181,7 +46181,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Read from stdin and write to stdout in large blocks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "buffet" = callPackage
@@ -46210,8 +46210,8 @@ self: {
        ];
        doHaddock = false;
        description = "Assembles many Dockerfiles in one";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46228,8 +46228,8 @@ self: {
          transformers
        ];
        description = "An implementation of Buffon machines";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46243,7 +46243,7 @@ self: {
          base mtl multiset random template-haskell
        ];
        description = "Perfect simulation of discrete random variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bug" = callPackage
@@ -46254,7 +46254,7 @@ self: {
        sha256 = "1xfynvp5fyn46gg3p5qq9cmb1dnw2dyf3bz6w5wdvikfvs19dwhq";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Better alternatives to the \"error\" function";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bugsnag-haskell" = callPackage
@@ -46279,8 +46279,8 @@ self: {
          aeson aeson-qq base doctest hspec text time unliftio yaml
        ];
        description = "Bugsnag error reporter for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46298,7 +46298,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hedgehog ];
        description = "A Bugsnag client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bugzilla" = callPackage
@@ -46318,8 +46318,8 @@ self: {
          time transformers unordered-containers vector
        ];
        description = "A Haskell interface to the Bugzilla native REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46342,7 +46342,7 @@ self: {
          transformers unordered-containers vector
        ];
        description = "A Haskell interface to the Bugzilla native REST API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "build" = callPackage
@@ -46359,8 +46359,8 @@ self: {
        ];
        testHaskellDepends = [ base containers extra mtl transformers ];
        description = "Build systems a la carte";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46372,8 +46372,8 @@ self: {
        sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx";
        libraryHaskellDepends = [ base bytestring containers dlist text ];
        description = "Typeclass for builders of linear data structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46390,8 +46390,8 @@ self: {
          process stm temporary text time
        ];
        description = "Rehackable components for writing buildbots and test harnesses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46405,8 +46405,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base buildbox parseargs ];
        description = "Tools for working with buildbox benchmark result files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46421,8 +46421,8 @@ self: {
          base byte-order primitive primitive-unaligned
        ];
        description = "bounded ByteArray builder type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46460,8 +46460,8 @@ self: {
          vector
        ];
        description = "A library and an executable that provide an easy API for a Haskell IDE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46475,8 +46475,8 @@ self: {
        libraryPkgconfigDepends = [ bullet ];
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the Bullet physics engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) bullet;};
 
@@ -46514,8 +46514,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Bulletproofs are short zero-knowledge proofs without a trusted setup";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46540,8 +46540,8 @@ self: {
          reflex-dom-helpers text time witherable
        ];
        description = "Reflex infused with bulma (css)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46561,8 +46561,8 @@ self: {
          base Cabal containers fclabels process regex-compat split strict
        ];
        description = "Automatically bump package versions, also transitively";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46578,8 +46578,8 @@ self: {
        executableHaskellDepends = [ base cmdargs text unix ];
        testHaskellDepends = [ base doctest hspec ];
        description = "CLI tool to beautify JSON string";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46597,8 +46597,8 @@ self: {
          aeson base bitcoin-script bytestring cassava process scientific
        ];
        description = "List OP_RETURN cryptocurrency transaction outputs";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46616,7 +46616,7 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec QuickCheck text ];
        description = "Parse and render URI templates";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "burst-detection" = callPackage
@@ -46629,8 +46629,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Burst detection algorithms";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46647,8 +46647,8 @@ self: {
          base bytestring errors serialport transformers
        ];
        description = "Haskell interface to the Bus Pirate binary interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46665,8 +46665,8 @@ self: {
          pretty time
        ];
        description = "Almost but not quite entirely unlike FRP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46683,8 +46683,8 @@ self: {
          parsec pretty time
        ];
        description = "Almost but not quite entirely unlike FRP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46701,8 +46701,8 @@ self: {
          network old-locale pretty time
        ];
        description = "Almost but not quite entirely unlike FRP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46735,7 +46735,7 @@ self: {
        testSystemDepends = [ libpcap ];
        testPkgconfigDepends = [ gio-unix ];
        description = "Draw sequence diagrams of D-Bus traffic";
-       license = stdenv.lib.licenses.lgpl21Plus;
+       license = lib.licenses.lgpl21Plus;
      }) {gio-unix = null; inherit (pkgs) libpcap; 
          system-glib = pkgs.glib;};
 
@@ -46757,7 +46757,7 @@ self: {
          multistate pretty transformers unsafe
        ];
        description = "Chops a command or program invocation into digestable pieces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "butter" = callPackage
@@ -46778,8 +46778,8 @@ self: {
          network-simple stm template-haskell text transformers
        ];
        description = "Monad Transformer for Asyncronous Message Passing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46801,8 +46801,8 @@ self: {
          base bytestring gl-capture GLUT OpenGLRaw repa repa-devil
        ];
        description = "butterfly tilings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46816,7 +46816,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Bit-vector arithmetic library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bv-embed" = callPackage
@@ -46827,7 +46827,7 @@ self: {
        sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79";
        libraryHaskellDepends = [ base ];
        description = "Define embeddings of small bit vectors into larger ones";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bv-little" = callPackage
@@ -46854,7 +46854,7 @@ self: {
          smallcheck
        ];
        description = "Efficient little-endian bit vector library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bv-sized" = callPackage
@@ -46872,8 +46872,8 @@ self: {
          base bytestring hedgehog parameterized-utils tasty tasty-hedgehog
        ];
        description = "a bitvector datatype that is parameterized by the vector width";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46897,8 +46897,8 @@ self: {
          optparse-applicative relude tasty tasty-hunit terminfo-hs text
        ];
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46910,8 +46910,8 @@ self: {
        sha256 = "0x4yh9li0pi2r9pjih000a143iw9kaz7r4z72510kv6kzkkcr9mn";
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46927,7 +46927,7 @@ self: {
          base extra hspec parsec parsec-numbers text
        ];
        description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "byte-order" = callPackage
@@ -46939,7 +46939,7 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unaligned ];
        testHaskellDepends = [ base primitive ];
        description = "Portable big-endian and little-endian conversions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "byteable" = callPackage
@@ -46951,7 +46951,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Type class for sequence of bytes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytearray-parsing" = callPackage
@@ -46962,8 +46962,8 @@ self: {
        sha256 = "1b1lz0y1a20v05bpa4xlxchc6k025gmm17hj3ysmv6j2i3k8micd";
        libraryHaskellDepends = [ base bytestring primitive text ];
        description = "Parsing of bytearray-based data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -46994,8 +46994,8 @@ self: {
          base byteslice gauge natural-arithmetic primitive text-short
        ];
        description = "Serialize to a small byte arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47010,7 +47010,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Flexible byte dump helpers for human readers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytehash" = callPackage
@@ -47036,8 +47036,8 @@ self: {
          primitive-unlifted split unordered-containers
        ];
        description = "Universal hashing of bytes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47053,8 +47053,8 @@ self: {
          base bytebuild byteslice natural-arithmetic posix-api primitive
        ];
        description = "Fast logging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47066,7 +47066,7 @@ self: {
        sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
        libraryHaskellDepends = [ base ];
        description = "Exposes the native endianness or byte ordering of the system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytes" = callPackage
@@ -47089,7 +47089,7 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Sharing code for serialization between binary and cereal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "byteset" = callPackage
@@ -47102,7 +47102,7 @@ self: {
        editedCabalFile = "1lgxxxrmw4g32pa861n6qbfpzwv14wfjrlp4hv5zd9hygy6v6q2p";
        libraryHaskellDepends = [ base binary ];
        description = "Set of bytes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "byteslice" = callPackage
@@ -47124,8 +47124,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge primitive ];
        description = "Slicing managed and unmanaged memory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47150,8 +47150,8 @@ self: {
          base byteslice bytestring gauge primitive
        ];
        description = "Nonresumable byte parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47165,8 +47165,8 @@ self: {
        editedCabalFile = "0qhx61v75cqpgrb88h5gpc4a6vg17dgrw555q2kgi2hvip61z5lr";
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        description = "Fast, compact, strict and lazy byte strings with a list interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bytestring-arbitrary" = callPackage
@@ -47183,8 +47183,8 @@ self: {
          base bytestring criterion cryptohash QuickCheck
        ];
        description = "Arbitrary instances for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47197,7 +47197,7 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ];
        doHaddock = false;
        description = "The new bytestring builder, packaged outside of GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-builder-varword" = callPackage
@@ -47213,8 +47213,8 @@ self: {
          attoparsec attoparsec-varword base bytestring hspec QuickCheck
        ];
        description = "Variable-length integer encoding";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47228,8 +47228,8 @@ self: {
        editedCabalFile = "05q4ilixyd4zc15imh7x7gqwv4pmicyjj9zx5fhx1p1ps89jiap3";
        libraryHaskellDepends = [ base bytestring utf8-string ];
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47254,7 +47254,7 @@ self: {
          base bytestring criterion text transformers
        ];
        description = "Type-classes to convert values to and from ByteString";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "bytestring-csv" = callPackage
@@ -47265,8 +47265,8 @@ self: {
        sha256 = "0x7qklb36jwxry1ih5x3jw7s861vlvd5g9h7yn7b2x64c0phyj0r";
        libraryHaskellDepends = [ array base bytestring dlist ];
        description = "Parse CSV formatted data efficiently";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47278,7 +47278,7 @@ self: {
        sha256 = "0iq59if3in08ssashk80wvh6yh1yr115387fi9kj952v6bzvzw1q";
        libraryHaskellDepends = [ base bytestring ];
        description = "Simple, fast binary diff/patch";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bytestring-encoding" = callPackage
@@ -47295,7 +47295,7 @@ self: {
          tasty-th text
        ];
        description = "ByteString ↔ Text converter based on GHC.IO.Encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-encodings" = callPackage
@@ -47309,7 +47309,7 @@ self: {
        testHaskellDepends = [ base bytestring hedgehog ];
        benchmarkHaskellDepends = [ base bytestring gauge text ];
        description = "checks to see if a given bytestring adheres to a certain encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bytestring-from" = callPackage
@@ -47328,7 +47328,7 @@ self: {
        ];
        description = "A type-class to convert values from ByteString";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bytestring-handle" = callPackage
@@ -47347,7 +47347,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "ByteString-backed Handles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-lexing" = callPackage
@@ -47360,7 +47360,7 @@ self: {
        editedCabalFile = "0icnbv83h542vkmn51ykzc4w1g7nl4w6d6lj79909hnwr2g10616";
        libraryHaskellDepends = [ base bytestring ];
        description = "Parse and produce literals efficiently from strict or lazy bytestrings";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "bytestring-mmap" = callPackage
@@ -47371,7 +47371,7 @@ self: {
        sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "mmap support for strict ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-nums" = callPackage
@@ -47384,7 +47384,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Parse numeric literals from ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-plain" = callPackage
@@ -47399,8 +47399,8 @@ self: {
          base bytestring deepseq ghc-prim hashable
        ];
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47417,7 +47417,7 @@ self: {
          base bytestring terminal-progress-bar text time
        ];
        description = "A library for tracking the consumption of a lazy ByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-read" = callPackage
@@ -47440,8 +47440,8 @@ self: {
          text
        ];
        description = "fast ByteString to number converting library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47455,8 +47455,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit rematch ];
        doHaddock = false;
        description = "Rematch support for ByteString";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47469,7 +47469,7 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "Backport copy of ShortByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-show" = callPackage
@@ -47486,8 +47486,8 @@ self: {
          array base binary bytestring containers integer-gmp
        ];
        description = "Efficient conversion of values into readable byte strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47511,7 +47511,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "An efficient strict bytestring builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bytestring-substring" = callPackage
@@ -47522,8 +47522,8 @@ self: {
        sha256 = "1vn1r8m0ldydnrazyckkn4lpv3g5ns37j91a5649jnrprjpy08dn";
        libraryHaskellDepends = [ base bytestring pipes primitive ];
        description = "break bytestrings up into substrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47540,8 +47540,8 @@ self: {
          attoparsec base bytestring Cabal hspec QuickCheck text time
        ];
        description = "Library for Time parsing from ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47556,7 +47556,7 @@ self: {
          base byteorder bytestring QuickCheck vector
        ];
        description = "Convert between ByteString and Vector.Storable without copying";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bytestring-tree-builder" = callPackage
@@ -47577,7 +47577,7 @@ self: {
          base-prelude bytestring criterion deepseq
        ];
        description = "A very efficient ByteString builder implementation based on the binary tree";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "bytestring-trie" = callPackage
@@ -47590,8 +47590,8 @@ self: {
        editedCabalFile = "1qpv52ywp8r30s3m9qyjiqiwa6clg3zp095yhs2d4533amprryly";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "An efficient finite map from (byte)strings to values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47610,8 +47610,8 @@ self: {
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
        description = "Bytestrings with typenat lengths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47623,8 +47623,8 @@ self: {
        sha256 = "1g99vbp14ki563lb41y1fxlgvdmrmq1y0xsk0ia1m438rdpnh2qd";
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47636,8 +47636,8 @@ self: {
        sha256 = "019axq65hmgmszkc1lyyyy8rpv5xkjbf1pmgz1bz0hnc8lgv58pd";
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47649,8 +47649,8 @@ self: {
        sha256 = "07hx3072zg9y3kj6h99yl8fd3n115x4z8z411c1cpx1hj292d57f";
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47663,7 +47663,7 @@ self: {
        libraryHaskellDepends = [ base safe ];
        testHaskellDepends = [ base Cabal HUnit QuickCheck ];
        description = "Human friendly conversion between byte units (KB, MB, GB...)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bz2" = callPackage
@@ -47687,7 +47687,7 @@ self: {
        ];
        benchmarkToolDepends = [ cpphs ];
        description = "Bindings to libbz2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bzip-signature" = callPackage
@@ -47700,7 +47700,7 @@ self: {
          base bytestring composition-prelude lens
        ];
        description = "Backpack signature for BZip compression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "bzlib" = callPackage
@@ -47712,7 +47712,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
@@ -47738,7 +47738,7 @@ self: {
          resourcet
        ];
        description = "Streaming compression/decompression via conduits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
@@ -47749,8 +47749,8 @@ self: {
        sha256 = "04hj3d26rp7ibv15n48y4xkfld3nnh6dqn8shxvw1h546z1316pw";
        libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47762,8 +47762,8 @@ self: {
        sha256 = "1za4wcrjrxqk8yqy1bddzxw8xxx0vlxyy31dj1glb5azx6qh7qp2";
        libraryHaskellDepends = [ base ];
        description = "C IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47784,8 +47784,8 @@ self: {
        executableHaskellDepends = [ base options ];
        testHaskellDepends = [ base ];
        description = "Simpe mosquito MQTT binding able to work with the Amazons IoT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mosquitto;};
 
@@ -47798,7 +47798,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "CStorable class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "c-storable-deriving" = callPackage
@@ -47809,7 +47809,7 @@ self: {
        sha256 = "0zx6r7sfaxl4k2s2b213vm12fskcssy01b828i8rqxixwfjjshv8";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generate C-like storable instances from datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "c0check" = callPackage
@@ -47823,7 +47823,7 @@ self: {
        executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47836,7 +47836,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47848,8 +47848,8 @@ self: {
        sha256 = "1i62ilk95p1vjyk7gl1fv7lwq6yk3ysfn3v1bbyfpabf97gzr0d9";
        libraryHaskellDepends = [ base network unix ];
        description = "C10k server library using prefork";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47863,7 +47863,7 @@ self: {
        librarySystemDepends = [ libxml2 ];
        libraryPkgconfigDepends = [ libxml2 ];
        description = "Bindings to the c14n implementation in libxml";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libxml2;};
 
   "c2ats" = callPackage
@@ -47885,8 +47885,8 @@ self: {
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
        description = "Translate C code into ATS";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -47911,7 +47911,7 @@ self: {
          transformers
        ];
        description = "C->Haskell FFI tool that gives some cross-language type safety";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "c2hs-extra" = callPackage
@@ -47923,7 +47923,7 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ c2hs ];
        description = "Convenient marshallers for complicate C types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "c2hsc" = callPackage
@@ -47948,7 +47948,7 @@ self: {
        ];
        testHaskellDepends = [ base here hspec logging monad-logger text ];
        description = "Convert C API header files to .hsc and .hsc.helper.c files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ca" = callPackage
@@ -47961,7 +47961,7 @@ self: {
        editedCabalFile = "1s7qxji4a44qrsmfajrpzjfg06aksxxf41b5y8bgrc93m2iyn4xw";
        libraryHaskellDepends = [ alg base ];
        description = "Cellular Automata";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ca-province-codes" = callPackage
@@ -47973,7 +47973,7 @@ self: {
        libraryHaskellDepends = [ aeson base text ];
        testHaskellDepends = [ aeson base hspec QuickCheck text ];
        description = "ISO 3166-2:CA Province Codes and Names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cab" = callPackage
@@ -47996,8 +47996,8 @@ self: {
          directory filepath process
        ];
        description = "A maintenance command of Haskell cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48012,8 +48012,8 @@ self: {
        libraryHaskellDepends = [ base youProbablyWantCapitalCabal ];
        doHaddock = false;
        description = "placeholder for Cabal package, you want the upper case Cabal";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {youProbablyWantCapitalCabal = null;};
 
@@ -48025,8 +48025,8 @@ self: {
        sha256 = "0m3xq3k4s6rn90vd2sp115jyb722vi9wgih3lz05fnc2bypyg6zi";
        libraryHaskellDepends = [ base Cabal filepath ];
        description = "Cabal support for creating AppImage applications";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48044,8 +48044,8 @@ self: {
          base Cabal directory filepath HTTP optparse-applicative
        ];
        description = "Check how up-to-date your .cabal dependencies are.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48057,7 +48057,7 @@ self: {
        sha256 = "16hhvsqdj91pgzlgmwpba8ajjp2jssyf71rw9pwrixshj6826ps2";
        libraryHaskellDepends = [ base Cabal directory extra filepath ];
        description = "Build time library that autodetects exposed modules";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cabal-bounds" = callPackage
@@ -48081,8 +48081,8 @@ self: {
          base directory filepath Glob process tasty tasty-golden
        ];
        description = "A command line program for managing the dependency versions in a cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48094,7 +48094,7 @@ self: {
        sha256 = "004xr0f59fg6h6rxlf7sf6m2mi6p32h2z3vs9b56hddmxp3gn4vl";
        libraryHaskellDepends = [ base Cabal ];
        description = "Adds executable dependencies to the Cabal build";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-bundle-clib" = callPackage
@@ -48110,8 +48110,8 @@ self: {
          time
        ];
        description = "Bundling C/C++ projects in Cabal package made easy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48147,8 +48147,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "CI Assistant for Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48171,8 +48171,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48186,8 +48186,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal optparse-applicative ];
        description = "Repeatable builds for cabalized Haskell projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48207,8 +48207,8 @@ self: {
          mtl optparse-applicative pretty process tar utf8-string
        ];
        description = "query tools for the local cabal database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48233,7 +48233,7 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal debian lens mtl pretty ];
        description = "Create a Debianization for a Cabal package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -48248,8 +48248,8 @@ self: {
          base Cabal containers directory filepath
        ];
        description = "Compose a list of a project's transitive dependencies with their licenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48272,8 +48272,8 @@ self: {
        ];
        executableToolDepends = [ cabal-install ];
        description = "Manage sandboxed Haskell build environments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48287,8 +48287,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48302,7 +48302,7 @@ self: {
        editedCabalFile = "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "A Setup.hs helper for doctests running";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-edit" = callPackage
@@ -48323,7 +48323,7 @@ self: {
          optparse-applicative process store time
        ];
        description = "Cabal utility";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cabal-file" = callPackage
@@ -48346,7 +48346,7 @@ self: {
          simple-cabal simple-cmd simple-cmd-args
        ];
        description = "Cabal file access";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-file-th" = callPackage
@@ -48361,8 +48361,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal ];
        description = "Template Haskell expressions for reading fields from a project's cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48387,7 +48387,7 @@ self: {
          zlib
        ];
        description = "Generate a FlatPak manifest from a Cabal package description";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-fmt" = callPackage
@@ -48415,7 +48415,7 @@ self: {
        doHaddock = false;
        description = "Format .cabal files";
        license = "GPL-3.0-or-later AND BSD-3-Clause";
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "cabal-ghc-dynflags" = callPackage
@@ -48426,8 +48426,8 @@ self: {
        sha256 = "13kxlmz5w0aazafrlignd55zclwl9sb213jry4vhfibgjrg18w8f";
        libraryHaskellDepends = [ base Cabal ghc transformers ];
        description = "Conveniently configure GHC's dynamic flags for use with Cabal projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48444,8 +48444,8 @@ self: {
          base Cabal directory filepath process
        ];
        description = "Set up ghci with options taken from a .cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48463,8 +48463,8 @@ self: {
          base containers directory options parsec process split temporary
        ];
        description = "Generate graphs of install-time Cabal dependencies";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48495,7 +48495,7 @@ self: {
        ];
        doCheck = false;
        description = "Give Haskell development tools access to Cabal project environment";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cabal-info" = callPackage
@@ -48515,8 +48515,8 @@ self: {
          base Cabal filepath optparse-applicative
        ];
        description = "Read information from cabal files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48548,8 +48548,8 @@ self: {
          mv bash-completion $out/share/bash-completion/completions
        '';
        description = "The command-line interface for Cabal and Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install-bundle" = callPackage
@@ -48568,8 +48568,8 @@ self: {
        ];
        executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -48589,8 +48589,8 @@ self: {
          old-time pretty process random time unix zlib
        ];
        description = "Temporary version of cabal-install for ghc-7.2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48610,8 +48610,8 @@ self: {
          old-time pretty process random time unix zlib
        ];
        description = "Temporary version of cabal-install for ghc-7.4";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48641,7 +48641,7 @@ self: {
        ];
        description = "Utilities to work with cabal-install files";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48658,8 +48658,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Lenses and traversals for the Cabal library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48686,7 +48686,7 @@ self: {
          test-framework test-framework-hunit text
        ];
        description = "Cabal support for creating Mac OSX application bundles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-meta" = callPackage
@@ -48707,8 +48707,8 @@ self: {
          base hspec shelly system-filepath text unix
        ];
        description = "build multiple packages at once";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48726,8 +48726,8 @@ self: {
          base containers directory filepath process simple-get-opt vty
        ];
        description = "A monitor for cabal builds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48745,8 +48745,8 @@ self: {
          base bytestring containers directory HTTP process tar
        ];
        description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48774,7 +48774,7 @@ self: {
          semialign singleton-bool text these topograph transformers vector
        ];
        description = "Library and utility for processing cabal's plan.json file";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "cabal-progdeps" = callPackage
@@ -48787,8 +48787,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Show dependencies of program being built in current directory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48805,8 +48805,8 @@ self: {
          uniplate
        ];
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48828,7 +48828,7 @@ self: {
          simple-cabal simple-cmd simple-cmd-args time unix
        ];
        description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -48841,7 +48841,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Shell scripts for support of Cabal maintenance";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-setup" = callPackage
@@ -48854,8 +48854,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
        description = "The user interface for building and installing Cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48873,7 +48873,7 @@ self: {
          base bytestring cereal directory filepath process tar zlib
        ];
        description = "Sign and verify Cabal packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-sort" = callPackage
@@ -48892,8 +48892,8 @@ self: {
          filepath process transformers utility-ht
        ];
        description = "Topologically sort cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48915,8 +48915,8 @@ self: {
          system-fileio system-filepath tar text transformers
        ];
        description = "Alternative install procedure to avoid the diamond dependency issue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48932,8 +48932,8 @@ self: {
          base Cabal filepath ghc pqc QuickCheck
        ];
        description = "Automated test tool for cabal projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48951,7 +48951,7 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        testHaskellDepends = [ base hspec process regex-posix ];
        description = "A program for finding temporary build file during cabal-test";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-test-compat" = callPackage
@@ -48962,7 +48962,7 @@ self: {
        sha256 = "15lxyrza1n9saac1awjx482gi7wq3sshqf4ich6k9xkfj464lrdq";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        description = "Compatibility interface of cabal test-suite";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-test-quickcheck" = callPackage
@@ -48975,8 +48975,8 @@ self: {
        editedCabalFile = "1q0zs98z8wvr0gzy27ff688fpsgwxjypwjsyzs8v2v6gqd49iwri";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        description = "QuickCheck for Cabal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -48992,7 +48992,7 @@ self: {
          base binary bytestring Cabal containers ghc template-haskell
        ];
        description = "Helper functions for writing custom Setup.hs scripts.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -49005,7 +49005,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath mtl process ];
        description = "Uninstall cabal packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cabal-upload" = callPackage
@@ -49018,8 +49018,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath HTTP network ];
        description = "Command-line tool for uploading packages to Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49039,8 +49039,8 @@ self: {
          filepath mtl pretty process
        ];
        description = "Create Arch Linux packages from Cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49056,8 +49056,8 @@ self: {
          base Cabal hsemail hxt parsec process
        ];
        description = "Cabal to Description-of-a-Project (DOAP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49072,8 +49072,8 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ base curl directory ];
        description = "make gentoo's .ebuild file from .cabal file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49092,8 +49092,8 @@ self: {
          text unordered-containers yaml
        ];
        description = "A tool to generate .ghci file from .cabal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49130,8 +49130,8 @@ self: {
          export HOME="$TMPDIR/home"
        '';
        description = "Convert Cabal files into Nix build instructions";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "cabal2spec" = callPackage
@@ -49152,8 +49152,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
        description = "Convert Cabal files into rpm spec files";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "cabalQuery" = callPackage
@@ -49171,8 +49171,8 @@ self: {
          base Cabal containers directory MissingH
        ];
        description = "A simple tool to query cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49188,7 +49188,7 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        testHaskellDepends = [ base directory doctest filepath process ];
        description = "alias for cabal install from given git repo";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cabalgraph" = callPackage
@@ -49207,8 +49207,8 @@ self: {
          base bytestring Cabal containers directory filepath pretty process
        ];
        description = "Generate pretty graphs of module trees from cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49227,8 +49227,8 @@ self: {
          text
        ];
        description = "Provides access to the cabal file data for shell scripts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49244,7 +49244,7 @@ self: {
        executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49260,7 +49260,7 @@ self: {
        executableHaskellDepends = [ base Cabal filepath haskell98 ];
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49274,8 +49274,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
        description = "Verify installed package version against user-specified constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49294,8 +49294,8 @@ self: {
          process unix
        ];
        description = "Cabal binary sandboxes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49308,8 +49308,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ cabocha ];
        testHaskellDepends = [ base text-format ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cabocha = null;};
 
@@ -49326,7 +49326,7 @@ self: {
        ];
        testHaskellDepends = [ base clock hspec stm transformers ];
        description = "An in-memory key/value store with expiration support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cache-polysemy" = callPackage
@@ -49344,8 +49344,8 @@ self: {
          base cache clock hashable polysemy polysemy-plugin
        ];
        description = "cached hashmaps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49363,8 +49363,8 @@ self: {
          quickcheck-assertions shake text
        ];
        description = "Cache values to disk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49379,7 +49379,7 @@ self: {
        libraryHaskellDepends = [ base stm time transformers ];
        executableHaskellDepends = [ base ];
        description = "A simple library to cache a single IO action with timeout";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cached-traversable" = callPackage
@@ -49394,7 +49394,7 @@ self: {
          base binary bytestring containers directory filepath mtl
        ];
        description = "Transparent, persistent caching of lazy, traversable structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "caching" = callPackage
@@ -49412,8 +49412,8 @@ self: {
          base dlist hashable mtl psqueues ref-tf transformers
        ];
        description = "Cache combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49430,8 +49430,8 @@ self: {
          base hspec stm stm-containers text time timespan
        ];
        description = "A vault-style cache implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49472,7 +49472,7 @@ self: {
          temporary
        ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "cachix-api" = callPackage
@@ -49503,7 +49503,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Servant HTTP API specification for https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cacophony" = callPackage
@@ -49530,8 +49530,8 @@ self: {
          async base base16-bytestring bytestring criterion deepseq
        ];
        description = "A library implementing the Noise protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49548,7 +49548,7 @@ self: {
          base binary bytestring hspec QuickCheck random
        ];
        description = "That rabbit's got a vicious streak a mile wide!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "caf" = callPackage
@@ -49559,7 +49559,7 @@ self: {
        sha256 = "1yrl3ffkfwgs4kljx57m1ldam087s7iby2qs74c4crxkrcj0j7a8";
        libraryHaskellDepends = [ base ];
        description = "A library of Concurrency Abstractions using Futures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cafeteria-prelude" = callPackage
@@ -49570,8 +49570,8 @@ self: {
        sha256 = "1iyasmd8zcg98vy7ffhxyyr664f02ird5z7rks9n67ixv7n60mrl";
        libraryHaskellDepends = [ base ];
        description = "Prelude subsets—take only what you want!";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49590,8 +49590,8 @@ self: {
          mtl optparse-applicative process protocol-buffers
          protocol-buffers-descriptor template-haskell temporary text
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49610,7 +49610,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ cairo ];
        description = "Binding to the Cairo library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) cairo;};
 
   "cairo-appbase" = callPackage
@@ -49624,7 +49624,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo glib gtk ];
        description = "A template for building new GUI applications using GTK and Cairo";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cairo-canvas" = callPackage
@@ -49637,7 +49637,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random time ];
        description = "Simpler drawing API for Cairo";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cairo-core" = callPackage
@@ -49657,8 +49657,8 @@ self: {
        libraryPkgconfigDepends = [ cairo ];
        libraryToolDepends = [ c2hs ];
        description = "Cairo Haskell binding (partial)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) cairo;};
 
@@ -49682,7 +49682,7 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49712,8 +49712,8 @@ self: {
          transformers utf8-string
        ];
        description = "Third cake the Makefile EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49731,8 +49731,8 @@ self: {
          base GLUT gluturtle lojbanParser yjsvg yjtools
        ];
        description = "run turtle like LOGO with lojban";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49747,8 +49747,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
        description = "Calendar Layout Algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49762,7 +49762,7 @@ self: {
        librarySystemDepends = [ cal3d ];
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cal3d = null;};
 
@@ -49778,7 +49778,7 @@ self: {
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        description = "Examples for the Cal3d animation library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49791,7 +49791,7 @@ self: {
        libraryHaskellDepends = [ base cal3d OpenGL ];
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49822,8 +49822,8 @@ self: {
          unboxing-vector unordered-containers vector websockets x509-system
        ];
        description = "A library for writing discord bots in haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49837,8 +49837,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49860,8 +49860,8 @@ self: {
          base containers gtk parsec plot-gtk-ui QuickCheck
        ];
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49883,7 +49883,7 @@ self: {
        ];
        description = "Calculation tool and library supporting units";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49901,8 +49901,8 @@ self: {
          base containers cpphs lens mtl parsec transformers
        ];
        description = "a logic programming language based on the calculus of constructions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49918,7 +49918,7 @@ self: {
          base containers html old-time utility-ht
        ];
        description = "List years with the same calendars";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "calenderweek" = callPackage
@@ -49933,8 +49933,8 @@ self: {
          base megaparsec optparse-generic text time
        ];
        description = "Commandline tool to get week of the year";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49960,8 +49960,8 @@ self: {
          WAVE
        ];
        description = "The call game engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -49983,8 +49983,8 @@ self: {
          hspec lens mtl process split trifecta unix
        ];
        description = "A simple library to call Alloy given a specification";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50003,8 +50003,8 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring data-msgpack mtl ];
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50017,7 +50017,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base nanospec ];
        description = "Use GHC call-stacks in a backward compatible way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "camfort" = callPackage
@@ -50054,8 +50054,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "CamFort - Cambridge Fortran infrastructure";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) flint;};
 
@@ -50070,7 +50070,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring Imlib terminfo ];
        description = "write image files onto 256(or 24bit) color terminals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "campfire" = callPackage
@@ -50088,8 +50088,8 @@ self: {
          transformers unordered-containers url
        ];
        description = "Haskell implementation of the Campfire API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50102,7 +50102,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base deepseq hspec HUnit mtl ];
        description = "Generic implementation of the Has and CoHas patterns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "candid" = callPackage
@@ -50134,8 +50134,8 @@ self: {
          tasty-smallcheck template-haskell text unordered-containers vector
        ];
        description = "Candid integration";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50147,8 +50147,8 @@ self: {
        sha256 = "1srixf1m7pzgr16y2xfckhi0xk9js68ps9zw8kvnw01c37x85f48";
        libraryHaskellDepends = [ arithmoi array base containers random ];
        description = "Arithmetic for Psychedelically Large Numbers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50160,8 +50160,8 @@ self: {
        sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf";
        libraryHaskellDepends = [ base deepseq directory filepath ];
        description = "Abstract data type for canonical file paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50185,8 +50185,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring containers criterion ];
        description = "Canonical JSON for signing and hashing JSON values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50198,7 +50198,7 @@ self: {
        sha256 = "1dkw0w43ajjgpczp8hmclr93v9scl75rlnsmxdjvwmv9phpj5559";
        libraryHaskellDepends = [ base unix yaml ];
        description = "A pattern for configuring programs";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "canteven-http" = callPackage
@@ -50217,8 +50217,8 @@ self: {
          transformers unix uuid wai wai-extra
        ];
        description = "Utilities for HTTP programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50230,8 +50230,8 @@ self: {
        sha256 = "1vcax1ipkd8s44pasr8qdrgjav4n2jnxd2qwamrl7kf6lm1i8n18";
        libraryHaskellDepends = [ aeson base ];
        description = "data types to describe HTTP services";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50249,8 +50249,8 @@ self: {
          template-haskell text time transformers yaml
        ];
        description = "A canteven way of setting up logging for your program";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50266,8 +50266,8 @@ self: {
          base Cabal old-locale time timezone-series tz
        ];
        description = "Date / time parsing utilities that try to guess the date / time format";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50284,7 +50284,7 @@ self: {
          text
        ];
        description = "A few utilites and helpers for using Template Haskell in your projects";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cantor" = callPackage
@@ -50306,8 +50306,8 @@ self: {
          hxt-xpath parsec QuickCheck split
        ];
        description = "Application for analysis of java source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50325,7 +50325,7 @@ self: {
        testHaskellDepends = [ base containers hspec mtl ];
        testToolDepends = [ hspec-discover ];
        description = "Convert data to and from a natural number representation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cao" = callPackage
@@ -50347,7 +50347,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "CAO Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50362,8 +50362,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50387,8 +50387,8 @@ self: {
          unliftio
        ];
        description = "Extensional capabilities and deriving combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50410,7 +50410,7 @@ self: {
          tasty-hunit tasty-smallcheck teardown time uuid
        ];
        description = "OTP-like supervision trees in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "capnp" = callPackage
@@ -50449,8 +50449,8 @@ self: {
          safe-exceptions stm supervisors text transformers vector
        ];
        description = "Cap'n Proto for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50462,8 +50462,8 @@ self: {
        sha256 = "0sik7svknaam6fhlvb4p1ijwaiwrgssrdl9gmq1wmfx66g069xi9";
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50479,8 +50479,8 @@ self: {
          base Cabal directory filepath process
        ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50503,8 +50503,8 @@ self: {
          transformers utility-ht
        ];
        description = "Simple web-server for organizing car-pooling for an event";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50529,8 +50529,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
        description = "High-level OpenGL bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50545,8 +50545,8 @@ self: {
          base mysql-simple postgresql-simple split time
        ];
        description = "some spaghetti code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50564,8 +50564,8 @@ self: {
          base bytestring filepath haskell98 IfElse MissingH
        ];
        description = "Drop emails from threads being watched into special CC folder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50587,8 +50587,8 @@ self: {
          QuickCheck quiet random text transformers vector
        ];
        description = "Algorithms for coin selection and fee balancing";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50621,8 +50621,8 @@ self: {
        ];
        testToolDepends = [ cardano-tx ];
        description = "Library utilities for constructing and signing Cardano transactions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cardano-binary = null; cardano-crypto = null; 
          cardano-crypto-wrapper = null; cardano-ledger = null; 
@@ -50645,8 +50645,8 @@ self: {
          highlighting-kate mtl pandoc pango process text time
        ];
        description = "A presentation tool written with Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50664,7 +50664,7 @@ self: {
        testHaskellDepends = [ array base ix-shapable QuickCheck ];
        benchmarkHaskellDepends = [ array base ];
        description = "A C-compatible array library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "carte" = callPackage
@@ -50682,8 +50682,8 @@ self: {
          time transformers tuple
        ];
        description = "Carte: A commandline pastebin server";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50712,8 +50712,8 @@ self: {
          time transformers
        ];
        description = "Specify Cabal files in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50733,7 +50733,7 @@ self: {
          time unix unordered-containers vector
        ];
        description = "A hashing class for content-addressed storage";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cas-hashable-s3" = callPackage
@@ -50749,7 +50749,7 @@ self: {
          resourcet
        ];
        description = "ContentHashable instances for S3 objects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cas-store" = callPackage
@@ -50773,7 +50773,7 @@ self: {
          tasty tasty-hunit unix
        ];
        description = "A content-addressed storage";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "casa-abbreviations-and-acronyms" = callPackage
@@ -50795,8 +50795,8 @@ self: {
          optparse-applicative wreq
        ];
        description = "CASA Abbreviations and Acronyms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50818,7 +50818,7 @@ self: {
          unliftio-core unordered-containers
        ];
        description = "Client for Casa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "casa-types" = callPackage
@@ -50836,7 +50836,7 @@ self: {
          path-pieces persistent text
        ];
        description = "Types for Casa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "casa-types_0_0_2" = callPackage
@@ -50852,8 +50852,8 @@ self: {
          path-pieces persistent text
        ];
        description = "Types for Casa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casadi-bindings" = callPackage
@@ -50877,8 +50877,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "mid-level bindings to CasADi";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi = null;};
 
@@ -50895,8 +50895,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ casadi_control ];
        description = "low level bindings to casadi-control";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi_control = null;};
 
@@ -50913,8 +50913,8 @@ self: {
        ];
        librarySystemDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi = null;};
 
@@ -50927,8 +50927,8 @@ self: {
        libraryHaskellDepends = [ base containers vector ];
        librarySystemDepends = [ casadi ];
        description = "low level bindings to CasADi";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi = null;};
 
@@ -50945,8 +50945,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi_ipopt_interface = null;};
 
@@ -50963,8 +50963,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {casadi_snopt_interface = null;};
 
@@ -50981,8 +50981,8 @@ self: {
          utf8-string web-routes
        ];
        description = "DSL for HTML CSS (Cascading Style Sheets)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -50998,7 +50998,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Convert between different cases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "case-insensitive" = callPackage
@@ -51015,7 +51015,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Case insensitive string comparison";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "case-insensitive-match" = callPackage
@@ -51036,7 +51036,7 @@ self: {
          text
        ];
        description = "A simplified, faster way to do case-insensitive matching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cased" = callPackage
@@ -51047,8 +51047,8 @@ self: {
        sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543";
        libraryHaskellDepends = [ base text ];
        description = "Track string casing in its type";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ jb55 ];
      }) {};
 
   "caseof" = callPackage
@@ -51059,8 +51059,8 @@ self: {
        sha256 = "1j8r8ldaxgyvka3zpqfl8qp0mbwrnh1s1xl5fgx3jjzqxlisfdp3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Combinators for casing on constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51079,8 +51079,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion mwc-random rerebase ];
        description = "A converter for spinal, snake and camel cases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51097,8 +51097,8 @@ self: {
          base deepseq haskell98 HaXml network parallel pretty
        ];
        description = "the Computer Algebra SHell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51113,7 +51113,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Convert between various source code casing conventions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "casr-logbook" = callPackage
@@ -51128,7 +51128,7 @@ self: {
        ];
        description = "CASR 61.345 Pilot Personal Logbook";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-html" = callPackage
@@ -51148,7 +51148,7 @@ self: {
        ];
        description = "CASR 61.345 Pilot Personal Logbook HTML output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-meta" = callPackage
@@ -51165,7 +51165,7 @@ self: {
        ];
        description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-meta-html" = callPackage
@@ -51186,7 +51186,7 @@ self: {
        ];
        description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook) HTML output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-reports" = callPackage
@@ -51205,7 +51205,7 @@ self: {
        ];
        description = "CASR 61.345 logbook (casr-logbook) reports.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-reports-html" = callPackage
@@ -51226,7 +51226,7 @@ self: {
        ];
        description = "CASR 61.345 logbook reports HTML output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-reports-meta" = callPackage
@@ -51245,7 +51245,7 @@ self: {
        ];
        description = "Reports on meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-reports-meta-html" = callPackage
@@ -51268,7 +51268,7 @@ self: {
        ];
        description = "HTML output for reports on meta-information about entries in a CASR 61.345 logbook";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "casr-logbook-types" = callPackage
@@ -51287,7 +51287,7 @@ self: {
        ];
        description = "CASR 61.345 Pilot Personal Logbook";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cassandra-cql" = callPackage
@@ -51305,8 +51305,8 @@ self: {
          uuid
        ];
        description = "Haskell client for Cassandra's CQL protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51319,7 +51319,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers Thrift ];
        description = "thrift bindings to the cassandra database";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cassava" = callPackage
@@ -51346,7 +51346,7 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        description = "A CSV parsing and encoding library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cassava-conduit" = callPackage
@@ -51366,8 +51366,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conduit interface for cassava package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51386,7 +51386,7 @@ self: {
          base bytestring cassava template-haskell vector
        ];
        description = "CSV-file embedding library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cassava-generic" = callPackage
@@ -51402,7 +51402,7 @@ self: {
          unordered-containers vector
        ];
        description = "Cassave instances for functor-like datatypes like `Either String a`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cassava-megaparsec" = callPackage
@@ -51420,7 +51420,7 @@ self: {
          base bytestring cassava hspec hspec-megaparsec vector
        ];
        description = "Megaparsec parser of CSV files that plays nicely with Cassava";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cassava-records" = callPackage
@@ -51442,8 +51442,8 @@ self: {
          unordered-containers vector
        ];
        description = "Auto-generation of records data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51465,7 +51465,7 @@ self: {
          tasty-quickcheck vector
        ];
        description = "io-streams interface for the cassava CSV library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cassette" = callPackage
@@ -51476,8 +51476,8 @@ self: {
        sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x";
        libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51505,8 +51505,8 @@ self: {
          test-framework-quickcheck2 text Thrift time
        ];
        description = "A high level driver for the Cassandra datastore";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51518,7 +51518,7 @@ self: {
        sha256 = "14dwsy80v1k0d9ksxb83h5lrz311d3nsgzcxxvivcdj4jzjlbm94";
        libraryHaskellDepends = [ base ];
        description = "Abstact cast pattern";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "castagnoli" = callPackage
@@ -51536,8 +51536,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring primitive text ];
        description = "Portable CRC-32C";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {primitive-slice = null;};
 
@@ -51560,7 +51560,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Multicast, thread-safe, and fast logger";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "castle" = callPackage
@@ -51578,8 +51578,8 @@ self: {
          system-filepath text
        ];
        description = "A tool to manage shared cabal-install sandboxes";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51594,8 +51594,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        description = "Equation Manipulator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51608,8 +51608,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exposes a Template Haskell function for generating catamorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51621,8 +51621,8 @@ self: {
        sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "MonadThrow and MonadCatch, using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51634,8 +51634,8 @@ self: {
        sha256 = "1kx6195mfnw4aqmcd1m4s8z5l1s8zh69in00p9a0mxm3xj3pfvpl";
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51647,7 +51647,7 @@ self: {
        sha256 = "18ihv16g4w0s6n89c64j4998hbsgzhp5w9ph2gdkygq7f30cx7f2";
        libraryHaskellDepends = [ base void ];
        description = "Categories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "category" = callPackage
@@ -51658,7 +51658,7 @@ self: {
        sha256 = "0iya7q3b1z1bxv4amsibmc1lrmf7dng76nzcnanwy300jm1n42w7";
        libraryHaskellDepends = [ alg base dual transformers ];
        description = "Categorical types and classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "category-extras" = callPackage
@@ -51685,8 +51685,8 @@ self: {
        ];
        doHaddock = false;
        description = "A meta-package documenting various packages inspired by category theory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51698,7 +51698,7 @@ self: {
        sha256 = "198bpnmmkwzx9z0n850pgzr2i9yw0kmd4g2m3fhifkhgy6zfidji";
        libraryHaskellDepends = [ base bytestring comonad text ];
        description = "Highbrow approach to type-safe printf format specifications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "category-traced" = callPackage
@@ -51711,8 +51711,8 @@ self: {
        editedCabalFile = "0c4bb2wa3yd1blnji9i1bpx883y2q7aklqckyr5n8c5bzwwyb9ql";
        libraryHaskellDepends = [ base categories ];
        description = "Traced monoidal categories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51732,8 +51732,8 @@ self: {
          template-haskell terminal-size transformers vcs-revision
        ];
        description = "Simple tool to display text files with line numbers and paging";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51745,7 +51745,7 @@ self: {
        sha256 = "0kydmb5f714pfgjz6drqi91m43bgs2sfap2nbww92xxyjbcls3j6";
        libraryHaskellDepends = [ aeson base transformers validity ];
        description = "Keep track of warnings and errors during calculations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cautious-file" = callPackage
@@ -51763,8 +51763,8 @@ self: {
          base bytestring directory filepath unix
        ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51781,8 +51781,8 @@ self: {
          base cautious genvalidity genvalidity-hspec genvalidity-hspec-aeson
          hspec QuickCheck
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51799,8 +51799,8 @@ self: {
        ];
        testHaskellDepends = [ base base16-bytestring hspec ];
        description = "Cayenne Low Power Payload";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "cayley-client" = callPackage
@@ -51819,8 +51819,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec unordered-containers ];
        description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51833,7 +51833,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base random ];
        description = "Complex numbers, quaternions, octonions, sedenions, etc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cblrepo" = callPackage
@@ -51856,7 +51856,7 @@ self: {
        ];
        description = "Tool to maintain a database of CABAL packages and their dependencies";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cbor-tool" = callPackage
@@ -51877,7 +51877,7 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "A tool for manipulating CBOR";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cborg" = callPackage
@@ -51901,7 +51901,7 @@ self: {
          tasty-hunit tasty-quickcheck text vector
        ];
        description = "Concise Binary Object Representation (CBOR)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cborg-json" = callPackage
@@ -51924,7 +51924,7 @@ self: {
          zlib
        ];
        description = "A library for encoding JSON as CBOR";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ccast" = callPackage
@@ -51935,7 +51935,7 @@ self: {
        sha256 = "1yls8b1kjmdc8gh1i4vaaav1sgvfccyjfqxjpvb7gw27ivma3v7l";
        libraryHaskellDepends = [ base template-haskell ];
        description = "typesafe c-style casts; useful for FFI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cci" = callPackage
@@ -51957,8 +51957,8 @@ self: {
          process random time
        ];
        description = "Bindings for the CCI networking library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cci = null;};
 
@@ -51970,8 +51970,8 @@ self: {
        sha256 = "18gnm6skzdnh6cis7l7v3d5813zn6irw6nywg6shffrn8v2y6xh7";
        libraryHaskellDepends = [ base bytestring ];
        description = "A Haskell implementation of the CCNx network protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -51988,8 +51988,8 @@ self: {
        ];
        librarySystemDepends = [ dttools ];
        description = "High-level interface to CCTools' WorkQueue library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dttools = null;};
 
@@ -52011,7 +52011,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Extract dependencies from C code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cedict" = callPackage
@@ -52029,7 +52029,7 @@ self: {
        ];
        description = "Convenient Chinese phrase & character lookup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52044,8 +52044,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text time ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "CEF log format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52059,8 +52059,8 @@ self: {
        librarySystemDepends = [ cef ];
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Raw CEF3 bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cef = null; inherit (pkgs) gtk2;};
 
@@ -52072,8 +52072,8 @@ self: {
        sha256 = "0h4k5mcbpxxv7nd9vf3nc2ynsnncc97q3q5s58gj10q2qpmvl1v7";
        libraryHaskellDepends = [ base cef3-raw ];
        description = "Simple wrapper around cef3-raw";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52097,8 +52097,8 @@ self: {
          text transformers vaultaire-common
        ];
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52112,8 +52112,8 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ c2hs ];
        description = "Cairo-based CellRenderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2;};
 
@@ -52138,8 +52138,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "A tool to build a novel";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52167,8 +52167,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Protect and control API access with cerberus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52188,7 +52188,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A binary serialization library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cereal-conduit" = callPackage
@@ -52208,7 +52208,7 @@ self: {
          base bytestring cereal conduit HUnit mtl transformers
        ];
        description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cereal-data-dword" = callPackage
@@ -52219,7 +52219,7 @@ self: {
        sha256 = "14z0h7hz170l1zhz7add01q9n0v2diijskdrwfzqhvcka7a69566";
        libraryHaskellDepends = [ base cereal data-dword ];
        description = "Integration of \"cereal\" and \"data-dword\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cereal-derive" = callPackage
@@ -52230,8 +52230,8 @@ self: {
        sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb";
        libraryHaskellDepends = [ base cereal ghc-prim ];
        description = "Automatic deriving of Serialize using GHC.Generics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52243,8 +52243,8 @@ self: {
        sha256 = "0lpsj4f7v4sgrr6lf8jl07xwj8j3i3wj23as0imswk71f7xwfnnk";
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52256,8 +52256,8 @@ self: {
        sha256 = "1gr22ziz9bj4q3y8j1vg46m648zqvbajfdks8p64xc28ci25pw2s";
        libraryHaskellDepends = [ array base cereal ];
        description = "Floating point support for the 'cereal' serialization library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52280,8 +52280,8 @@ self: {
          criterion io-streams
        ];
        description = "io-streams support for the cereal binary serialization library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52305,8 +52305,8 @@ self: {
          unordered-containers vector
        ];
        description = "An extended serialization library on top of \"cereal\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52329,8 +52329,8 @@ self: {
          criterion io-streams transformers
        ];
        description = "Use cereal to encode/decode io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52342,7 +52342,7 @@ self: {
        sha256 = "0k1ml0z5rksvrhz15i9afld7bybgylqmy5nmvik3p98zd3s1ayiw";
        libraryHaskellDepends = [ base cereal text ];
        description = "Data.Text instances for the cereal serialization library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "cereal-time" = callPackage
@@ -52354,8 +52354,8 @@ self: {
        libraryHaskellDepends = [ base cereal time ];
        testHaskellDepends = [ base cereal hspec QuickCheck time ];
        description = "Serialize instances for types from `time` package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52369,7 +52369,7 @@ self: {
          base cereal hashable unordered-containers
        ];
        description = "Integration of \"cereal\" and \"unordered-containers\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cereal-uuid" = callPackage
@@ -52380,7 +52380,7 @@ self: {
        sha256 = "1jg8rkndb1q1l0dnqrkkl0mlsxkcyqcfldb5k8kk9d2lg3plz030";
        libraryHaskellDepends = [ base cereal uuid ];
        description = "Integration of \"cereal\" and \"uuid\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cereal-vector" = callPackage
@@ -52392,7 +52392,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [ base cereal QuickCheck vector ];
        description = "Serialize instances for Data.Vector types.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "certificate" = callPackage
@@ -52413,8 +52413,8 @@ self: {
          directory filepath mtl pem process time
        ];
        description = "Certificates and Key Reader/Writer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52432,8 +52432,8 @@ self: {
          test-framework-th
        ];
        description = "Exact real arithmetic using continued fractions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52450,8 +52450,8 @@ self: {
          aeson base containers hspec raw-strings-qq
        ];
        description = "A library getting the environment when running on Cloud Foundry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52469,8 +52469,8 @@ self: {
          base bytestring containers data-default dequeue mtl
        ];
        description = "cfipu processor for toy brainfuck-like language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52489,8 +52489,8 @@ self: {
          value-supply
        ];
        description = "Constraint Functional-Logic Programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52508,8 +52508,8 @@ self: {
          base bytestring containers data-default dequeue mtl
        ];
        description = "cfopu processor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52530,8 +52530,8 @@ self: {
          unordered-containers utf8-string void
        ];
        description = "Parser for categorial grammars";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52551,8 +52551,8 @@ self: {
        ];
        doHaddock = false;
        description = "generates Haskell bindings and C wrappers for C++ libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52571,7 +52571,7 @@ self: {
          parsec time xhtml
        ];
        description = "A library for writing CGI programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cgi-undecidable" = callPackage
@@ -52582,7 +52582,7 @@ self: {
        sha256 = "1xh3q0s7398gd3513ycxypnj0m9jn0kdbb7459dsb459kbvzdpab";
        libraryHaskellDepends = [ base cgi mtl ];
        description = "Undecidable instances for the cgi package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cgi-utils" = callPackage
@@ -52595,8 +52595,8 @@ self: {
        editedCabalFile = "0lnx7n8pagi3pw57cz4nz01lhfjmsyhk3z3kwgfrmdyrb3kb276z";
        libraryHaskellDepends = [ base cgi containers mtl random ];
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52622,8 +52622,8 @@ self: {
          unordered-containers utf8-string yaml
        ];
        description = "Command line tool";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52636,7 +52636,7 @@ self: {
        libraryHaskellDepends = [ base containers JuicyPixels ];
        testHaskellDepends = [ base containers hspec JuicyPixels ];
        description = "Library decoding chain codes from images";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "chainweb-mining-client" = callPackage
@@ -52662,8 +52662,8 @@ self: {
          wai-extra
        ];
        description = "Mining Client for Kadena Chainweb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52711,8 +52711,8 @@ self: {
          wai-middleware-prometheus warp
        ];
        description = "A REST Web Api server template for building (micro)services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52724,7 +52724,7 @@ self: {
        sha256 = "1iyyz3rmnry3myw985qmqjyikhq41dw16rjs5gfgqbx7j1wrykpj";
        libraryHaskellDepends = [ base ];
        description = "Terminal string styling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chalkboard" = callPackage
@@ -52742,8 +52742,8 @@ self: {
          data-reify directory GLUT OpenGLRaw process time
        ];
        description = "Combinators for building and processing 2D images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52755,8 +52755,8 @@ self: {
        sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2";
        libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        description = "OpenGL based viewer for chalkboard rendered images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52769,7 +52769,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process random ];
        description = "Hardware description EDSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chan" = callPackage
@@ -52781,7 +52781,7 @@ self: {
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base stm ];
        description = "Some extra kit for Chans";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chan-split" = callPackage
@@ -52792,7 +52792,7 @@ self: {
        sha256 = "1mzvrxcf263gs61hj7gafra1cqvpfbzy7rza7ql0xvnmj2g2ybrc";
        libraryHaskellDepends = [ base stm ];
        description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "change-monger" = callPackage
@@ -52806,7 +52806,7 @@ self: {
        libraryHaskellDepends = [ base process ];
        executableHaskellDepends = [ directory ];
        description = "Parse VCS changelogs into ChangeLogs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "changelogged" = callPackage
@@ -52835,7 +52835,7 @@ self: {
          unordered-containers
        ];
        description = "Changelog manager for Git projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "char-decode" = callPackage
@@ -52849,7 +52849,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Convert legacy byte encodings to and from Unicode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "char-qq" = callPackage
@@ -52860,7 +52860,7 @@ self: {
        sha256 = "01mbavg50g64bmlvjr499hzv1975imri2zwj91964g58xghfba9q";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Quasiquoters for characters and codepoints";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "character-cases" = callPackage
@@ -52879,8 +52879,8 @@ self: {
          template-haskell
        ];
        description = "Exposes subspecies types of Char. And naming cases.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52904,8 +52904,8 @@ self: {
          random snap snap-core snap-extras snap-server text xmlhtml
        ];
        description = "Rapid prototyping websites with Snap and Heist";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52923,7 +52923,7 @@ self: {
          array base bytestring containers semigroups unordered-containers
        ];
        description = "Fast unicode character sets based on complemented PATRICIA tries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "charsetdetect" = callPackage
@@ -52964,8 +52964,8 @@ self: {
          filepath hashable lens optparse-applicative text time
        ];
        description = "Command-line utility to draw charts from input data easily";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -52977,8 +52977,8 @@ self: {
        sha256 = "0sfv86c9sj8ihrrv56kk61fkzikxh765rz4lrp5paymri5l0m408";
        libraryHaskellDepends = [ base Chart ];
        description = "Easily render histograms with Chart";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53009,8 +53009,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Charting library targetting SVGs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53034,8 +53034,8 @@ self: {
        executableHaskellDepends = [ base numhask ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53060,8 +53060,8 @@ self: {
          tasty-hspec
        ];
        description = "Native haskell charts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53089,8 +53089,8 @@ self: {
          aeson async base bytestring containers http-types mtl one-liner
          process scientific text wai warp
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53113,7 +53113,7 @@ self: {
          vector
        ];
        description = "Chase & Lev work-stealing lock-free double-ended queues (deques)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chassis" = callPackage
@@ -53132,7 +53132,7 @@ self: {
          profunctors rio text time vinyl
        ];
        description = "Prelude with algebraic constructs and polykinds on";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chatter" = callPackage
@@ -53166,8 +53166,8 @@ self: {
          tasty-quickcheck text tokenize unordered-containers
        ];
        description = "A library of simple NLP algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53185,7 +53185,7 @@ self: {
          template-haskell text time transformers unix
        ];
        description = "Some monad transformers and typeclasses for text in- and output abstraction";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "chatty-text" = callPackage
@@ -53198,8 +53198,8 @@ self: {
        editedCabalFile = "11vpzarrbk0jlsnamrnf4xp3gzkgwrbs6x5mr9m5rr4lrw1f9q0v";
        libraryHaskellDepends = [ base chatty transformers ];
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53211,7 +53211,7 @@ self: {
        sha256 = "1pzg0bf73shwl91x4011khw62wgv33y5862gq110q8g913w4jrjw";
        libraryHaskellDepends = [ base mtl text transformers ];
        description = "Some utilities every serious chatty-based application may need";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "chatwork" = callPackage
@@ -53239,8 +53239,8 @@ self: {
          servant-server text warp
        ];
        description = "The ChatWork API in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53262,7 +53262,7 @@ self: {
        ];
        executableHaskellDepends = [ base blaze-html bytestring text ];
        description = "Experimental markdown processor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cheapskate-highlight" = callPackage
@@ -53279,7 +53279,7 @@ self: {
          base blaze-html cheapskate highlighting-kate text
        ];
        description = "Code highlighting for cheapskate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cheapskate-lucid" = callPackage
@@ -53292,7 +53292,7 @@ self: {
        editedCabalFile = "197nx95xw21i7zyvgzcgnr36ab6vrk17c66iz8ndwz61vp1jf6hc";
        libraryHaskellDepends = [ base blaze-html cheapskate lucid ];
        description = "Use cheapskate with Lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cheapskate-terminal" = callPackage
@@ -53318,8 +53318,8 @@ self: {
          hscolour terminal-size text
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53332,7 +53332,7 @@ self: {
        libraryHaskellDepends = [ base bytestring email-validate ];
        librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {resolv = null;};
 
   "check-pvp" = callPackage
@@ -53351,8 +53351,8 @@ self: {
          haskell-src-exts hse-cpp non-empty tagged transformers utility-ht
        ];
        description = "Check whether module and package imports conform to the PVP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53366,8 +53366,8 @@ self: {
        editedCabalFile = "110g32gvn5cjdf4cbvv642asziinsh50b1c5675qzza77jg7hwid";
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53381,7 +53381,7 @@ self: {
          array base QuickCheck random semigroupoids
        ];
        description = "Check properties on standard classes and data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "checkmate" = callPackage
@@ -53411,8 +53411,8 @@ self: {
          QuickCheck quickcheck-text temporary text
        ];
        description = "Generate checklists relevant to a given patch";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53424,7 +53424,7 @@ self: {
        sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik";
        libraryHaskellDepends = [ base explicit-exception utility-ht ];
        description = "Compute and verify checksums of ISBN, IBAN, etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chell" = callPackage
@@ -53442,7 +53442,7 @@ self: {
          template-haskell text transformers
        ];
        description = "A simple and intuitive library for automated testing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chell-hunit" = callPackage
@@ -53453,7 +53453,7 @@ self: {
        sha256 = "18p9rhs81b43jb95dqg650h3cajsw45w7cgsavkm18h0qhrz41kb";
        libraryHaskellDepends = [ base chell HUnit ];
        description = "HUnit support for the Chell testing library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chell-quickcheck" = callPackage
@@ -53464,8 +53464,8 @@ self: {
        sha256 = "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03";
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53493,8 +53493,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "The core library for Cherry Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cherry-core = null;};
 
@@ -53528,8 +53528,8 @@ self: {
          process random stm text time unordered-containers vector
        ];
        description = "Basic chess library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53543,7 +53543,7 @@ self: {
          array attoparsec base bytestring containers
        ];
        description = "Simple library for validating chess moves and parsing PGN files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chevalier-common" = callPackage
@@ -53560,8 +53560,8 @@ self: {
          protobuf text unordered-containers vaultaire-common zeromq4-haskell
        ];
        description = "Query interface for Chevalier";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53586,8 +53586,8 @@ self: {
          typed-process unix unliftio
        ];
        description = "tmux api";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53609,7 +53609,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge mtl random ];
        description = "Lazy infinite streams with O(1) indexing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chiphunk" = callPackage
@@ -53627,8 +53627,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for Chipmunk2D physics engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53648,8 +53648,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Helper for the Major System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53661,7 +53661,7 @@ self: {
        sha256 = "0qcyf6nqi0nyhbf3xwyib95y29j5ir94d5vg449mkpr92crf8ryk";
        libraryHaskellDepends = [ base ];
        description = "A solution to boolean blindness";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "choose" = callPackage
@@ -53672,8 +53672,8 @@ self: {
        sha256 = "1kzyl1n7shrsagkaqxb9ac9iyjzxn4f1f7hmxgid12iwfd5yqsg3";
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Choose random elements from a stream";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53690,8 +53690,8 @@ self: {
          base choose optparse-applicative text
        ];
        description = "Command-line program to choose random element from a stream";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53709,8 +53709,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A module containing basic functions that the prelude does not offer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53728,8 +53728,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A module containing basic geo functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53745,8 +53745,8 @@ self: {
          base containers deepseq extensible-exceptions pretty stm
        ];
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53758,8 +53758,8 @@ self: {
        sha256 = "1x14xl9hm9n3zczj6xhffvpac09q5a13i94fhkq2kzj2s3rk1b4z";
        libraryHaskellDepends = [ base chp chp-plus mtl ];
        description = "MTL class instances for the CHP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53776,8 +53776,8 @@ self: {
          QuickCheck stm
        ];
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53793,8 +53793,8 @@ self: {
          base containers deepseq mtl pretty TypeCompose
        ];
        description = "A mirror implementation of chp that generates a specification of the program";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53806,8 +53806,8 @@ self: {
        sha256 = "0d4hcqpjxmns1fhq918s6z9f4bxlbjlkxzq5xkpqwjxpzy83wq23";
        libraryHaskellDepends = [ base chp chp-plus transformers ];
        description = "Transformers instances for the CHP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53824,8 +53824,8 @@ self: {
          pqueue unordered-containers
        ];
        description = "Constraint Handling Rules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53844,7 +53844,7 @@ self: {
          unordered-containers vector
        ];
        description = "Datatypes required for chr library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chr-lang" = callPackage
@@ -53863,8 +53863,8 @@ self: {
        ];
        executableHaskellDepends = [ base chr-data ];
        description = "AST + surface language around chr";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53878,8 +53878,8 @@ self: {
        editedCabalFile = "0h3qyn306sxqsvxmz9hfba169nkc3hx7ygkxr5j2sz033fvi31jc";
        libraryHaskellDepends = [ base containers uulib ];
        description = "Parsing for chr library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53893,7 +53893,7 @@ self: {
        editedCabalFile = "15v5bv7azi7qw33rg849wggpy07ingd8fp24dm0azwgwsqd05mb9";
        libraryHaskellDepends = [ base containers ];
        description = "Pretty printing for chr library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chromatin" = callPackage
@@ -53928,8 +53928,8 @@ self: {
          strings transformers typed-process unliftio
        ];
        description = "neovim package manager";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53943,8 +53943,8 @@ self: {
          base deepseq ghc-prim thyme vector-space
        ];
        description = "measure timings of data evaluation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -53961,7 +53961,7 @@ self: {
          aeson base bytestring hourglass hspec QuickCheck vector
        ];
        description = "Time to manipulate time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chronos" = callPackage
@@ -53989,7 +53989,7 @@ self: {
          text thyme time vector
        ];
        description = "A performant time library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chronos-bench" = callPackage
@@ -54009,8 +54009,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        benchmarkHaskellDepends = [ base ];
        description = "Benchmarking tool with focus on comparing results";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54024,7 +54024,7 @@ self: {
        editedCabalFile = "04fh1g2wfm69hz1hjg4ds2c3npdx6z2mgwddlkqr2sdbnngnmv10";
        libraryHaskellDepends = [ base Cabal chs-deps ];
        description = "Cabal with c2hs dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chs-deps" = callPackage
@@ -54041,7 +54041,7 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "c2hs dependency analyzer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "chu2" = callPackage
@@ -54058,8 +54058,8 @@ self: {
          utf8-string
        ];
        description = "FFI for Chu2 Agda Web Server Interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54078,7 +54078,7 @@ self: {
        testHaskellDepends = [ base HUnit text transformers unix ];
        description = "Behaviour Driven Development like Cucumber for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "chunked-data" = callPackage
@@ -54093,7 +54093,7 @@ self: {
          base bytestring containers semigroups text transformers vector
        ];
        description = "Typeclasses for dealing with various chunked data representations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "chunks" = callPackage
@@ -54105,7 +54105,7 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        description = "Simple template library with static safety";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54121,8 +54121,8 @@ self: {
        executableHaskellDepends = [ base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring HUnit text ];
        description = "Human-readable storage of text/binary objects";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54134,8 +54134,8 @@ self: {
        sha256 = "018k9a014q4zprsla5k5hrdq1zwpp7hmckc0ldaj7nf6vg1hxas2";
        libraryHaskellDepends = [ base ];
        description = "Automatically convert Generic instances to and from church representations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54148,7 +54148,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Removed; please see fmlist";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "church-maybe" = callPackage
@@ -54159,8 +54159,8 @@ self: {
        sha256 = "0zcpqsaq5ic8zw88r1kqjb592qy174b0ljjhj5qp90cvzmm7bwyz";
        libraryHaskellDepends = [ base deepseq semigroupoids semigroups ];
        description = "Church encoded Maybe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54174,7 +54174,7 @@ self: {
          base bifunctors semigroups transformers
        ];
        description = "Church encoded pair";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "churros" = callPackage
@@ -54192,8 +54192,8 @@ self: {
          async base containers doctest random stm time unagi-chan
        ];
        description = "Channel/Arrow based streaming computation library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54216,8 +54216,8 @@ self: {
          uuid wreq
        ];
        description = "Cielo API v3 Bindings for Haskell";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54229,8 +54229,8 @@ self: {
        sha256 = "0farjdyq6w33jm0qqdkfd6l7b8rr6k55dqfha643mj6nh1y904az";
        libraryHaskellDepends = [ base bytestring language-c ];
        description = "An interface to CIL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54251,7 +54251,7 @@ self: {
        executableHaskellDepends = [ base bytestring groom text ];
        testHaskellDepends = [ base hspec ];
        description = "Simple C-like programming language";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "cinvoke" = callPackage
@@ -54263,8 +54263,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ cinvoke ];
        description = "A binding to cinvoke";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cinvoke = null;};
 
@@ -54276,8 +54276,8 @@ self: {
        sha256 = "0518cbfyjh13ghihvnxvbhlw4060cqw5047bdrflphmigwbvpplb";
        libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        description = "A monad for concurrent IO on a thread pool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54303,7 +54303,7 @@ self: {
          crypto-cipher-types mtl
        ];
        description = "Fast AES cipher implementation with advanced mode of operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-aes128" = callPackage
@@ -54326,7 +54326,7 @@ self: {
          base bytestring cereal criterion crypto-api entropy tagged
        ];
        description = "AES and common modes using AES-NI when available";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-blowfish" = callPackage
@@ -54351,8 +54351,8 @@ self: {
          crypto-cipher-types mtl
        ];
        description = "Blowfish cipher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54378,7 +54378,7 @@ self: {
          crypto-cipher-types mtl
        ];
        description = "Camellia block cipher primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-des" = callPackage
@@ -54403,7 +54403,7 @@ self: {
          crypto-cipher-types mtl
        ];
        description = "DES and 3DES primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-rc4" = callPackage
@@ -54428,7 +54428,7 @@ self: {
          crypto-cipher-types deepseq mtl
        ];
        description = "Fast RC4 cipher implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cipher-rc5" = callPackage
@@ -54439,7 +54439,7 @@ self: {
        sha256 = "0l9lhyqn74mlgwm4mplm94i0x2xjmvnxnp8nm3h6aj8v5ishl1md";
        libraryHaskellDepends = [ base split ];
        description = "Pure RC5 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ciphersaber2" = callPackage
@@ -54453,8 +54453,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring ];
        executableHaskellDepends = [ array base bytestring parseargs ];
        description = "Implementation of CipherSaber2 RC4 cryptography";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54466,7 +54466,7 @@ self: {
        sha256 = "0n3m7kjyqic10dl06zic5qjb1yb1ff8jn9d1wchrarkprcw25knc";
        libraryHaskellDepends = [ base directory mtl ];
        description = "A Compiler IR Compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "circle-packing" = callPackage
@@ -54479,7 +54479,7 @@ self: {
        editedCabalFile = "1jp1b6l5v1llmggy316s4bb78wjvgq8iya0i2zz4k5v6l5dl8ln2";
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "circlehs" = callPackage
@@ -54496,8 +54496,8 @@ self: {
          text time transformers unordered-containers
        ];
        description = "The CircleCI REST API for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54526,7 +54526,7 @@ self: {
          unordered-containers
        ];
        description = "An implementation of the \"circuit breaker\" pattern to disable repeated calls to a failing system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "circular" = callPackage
@@ -54543,8 +54543,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Circular fixed-sized mutable vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54556,7 +54556,7 @@ self: {
        sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz";
        libraryHaskellDepends = [ aeson base text vector ];
        description = "Cirru Parser in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cisco-spark-api" = callPackage
@@ -54584,7 +54584,7 @@ self: {
          http-conduit http-types network-uri text wai warp
        ];
        description = "DEPRECATED in favor of webex-teams-api";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "citation-resolve" = callPackage
@@ -54607,8 +54607,8 @@ self: {
          base directory doctest filepath hspec MissingH QuickCheck
        ];
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54635,7 +54635,7 @@ self: {
          text timeit transformers
        ];
        description = "Generates citations and bibliography from CSL styles";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "citeproc-hs" = callPackage
@@ -54654,8 +54654,8 @@ self: {
          syb time utf8-string
        ];
        description = "A Citation Style Language implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54675,8 +54675,8 @@ self: {
          pandoc pandoc-types parsec tagsoup texmath utf8-string yaml
        ];
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54694,7 +54694,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Bindings to CityHash";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cj-token" = callPackage
@@ -54716,8 +54716,8 @@ self: {
          base hspec jwt QuickCheck text text-conversions time
        ];
        description = "A new Haskeleton package";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54735,8 +54735,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Data about Chinese, Japanese and Korean characters and languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54750,8 +54750,8 @@ self: {
        testHaskellDepends = [ base criterion random ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Clifford Algebra of three dimensional space";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54763,8 +54763,8 @@ self: {
        sha256 = "0sa1gaclh7b3mpqiiyqqn2gqfwkwj2ig5yzjk1y0hkzyc7rz4l3k";
        libraryHaskellDepends = [ base cl3 hmatrix ];
        description = "Interface to/from Cl3 and HMatrix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54776,8 +54776,8 @@ self: {
        sha256 = "15431azhvwk2fcd3aca5snpqrp8kf7zdlbyxh99i1xfdhvq4vc78";
        libraryHaskellDepends = [ base cl3 linear ];
        description = "Interface to/from Cl3 and Linear";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54796,8 +54796,8 @@ self: {
          split
        ];
        description = "Simple CLI RPN calculator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54832,8 +54832,8 @@ self: {
          tasty-th transformers-compat
        ];
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54866,8 +54866,8 @@ self: {
          tasty-hunit tasty-th transformers transformers-compat
        ];
        description = "claferIG is an interactive tool that generates instances of Clafer models";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54887,8 +54887,8 @@ self: {
          utf8-string
        ];
        description = "A wiki-based IDE for literate modeling with Clafer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54901,8 +54901,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring text ];
        testHaskellDepends = [ aeson base bytestring ];
        description = "JSON Compilation Database Format encoding and decoding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54925,8 +54925,8 @@ self: {
        librarySystemDepends = [ clang ];
        testHaskellDepends = [ base bytestring lens ];
        description = "Pure C++ code analysis with libclang";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (self.llvmPackages) clang;};
 
@@ -54942,8 +54942,8 @@ self: {
          base bytestring directory safe strict time
        ];
        description = "Command-line spaced-repetition software";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54961,8 +54961,8 @@ self: {
          lens-aeson scientific text unordered-containers vector wreq
        ];
        description = "API Client for the Clarifai API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -54982,8 +54982,8 @@ self: {
          th-lift time transformers utility-ht vhdl
        ];
        description = "CAES Language for Synchronous Hardware (CLaSH)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55013,8 +55013,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "CAES Language for Synchronous Hardware";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55052,8 +55052,8 @@ self: {
          tasty-hunit template-haskell text transformers unordered-containers
        ];
        description = "CAES Language for Synchronous Hardware - As a Library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55068,8 +55068,8 @@ self: {
        libraryHaskellDepends = [
          base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55108,8 +55108,8 @@ self: {
          base criterion deepseq template-haskell
        ];
        description = "CAES Language for Synchronous Hardware - Prelude library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55123,7 +55123,7 @@ self: {
        libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-systemverilog" = callPackage
@@ -55140,8 +55140,8 @@ self: {
          unordered-containers wl-pprint-text
        ];
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55159,8 +55159,8 @@ self: {
          unordered-containers wl-pprint-text
        ];
        description = "CAES Language for Synchronous Hardware - Verilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55178,8 +55178,8 @@ self: {
          unordered-containers wl-pprint-text
        ];
        description = "CAES Language for Synchronous Hardware - VHDL backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55191,7 +55191,7 @@ self: {
        sha256 = "03d4ygqhqbg4cvfjp8c5cyy0fkgf1fpzc1li45bqc555jrxwszwr";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Library for classification of media files";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "classify-frog" = callPackage
@@ -55222,8 +55222,8 @@ self: {
          xml-basic
        ];
        description = "Classify sounds produced by Xenopus laevis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55240,8 +55240,8 @@ self: {
          vector wreq
        ];
        description = "Super simple InfluxDB package in Classy-MTL style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55262,8 +55262,8 @@ self: {
        executableHaskellDepends = [ base miso rfc ];
        testHaskellDepends = [ base miso rfc ];
        description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55279,8 +55279,8 @@ self: {
          base lifted-base monad-control parallel resourcet transformers
        ];
        description = "Fork of the monad-parallel package using monad-control";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55307,7 +55307,7 @@ self: {
          base containers hspec QuickCheck transformers unordered-containers
        ];
        description = "A typeclass-based Prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "classy-prelude-conduit" = callPackage
@@ -55326,7 +55326,7 @@ self: {
          base bytestring conduit hspec QuickCheck transformers
        ];
        description = "classy-prelude together with conduit functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "classy-prelude-yesod" = callPackage
@@ -55344,7 +55344,7 @@ self: {
          yesod-static
        ];
        description = "Provide a classy prelude including common Yesod functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "classyplate" = callPackage
@@ -55358,8 +55358,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        benchmarkHaskellDepends = [ base criterion parallel uniplate ];
        description = "Fuseable type-class based generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55373,7 +55373,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover mtl text ];
        testToolDepends = [ hspec-discover ];
        description = "CSS preprocessor as embedded Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clckwrks" = callPackage
@@ -55407,8 +55407,8 @@ self: {
        librarySystemDepends = [ openssl ];
        libraryToolDepends = [ hsx2hs ];
        description = "A secure, reliable content management system (CMS) and blogging platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -55431,8 +55431,8 @@ self: {
          parsec
        ];
        description = "a command-line interface for adminstrating some aspects of clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55454,8 +55454,8 @@ self: {
        ];
        executableToolDepends = [ hsx2hs ];
        description = "clckwrks.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55481,8 +55481,8 @@ self: {
        ];
        libraryToolDepends = [ hsx2hs ];
        description = "bug tracking plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55506,8 +55506,8 @@ self: {
        ];
        libraryToolDepends = [ hsx2hs ];
        description = "ircbot plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55532,8 +55532,8 @@ self: {
          uuid uuid-orphans web-plugins web-routes web-routes-th
        ];
        description = "mailing list plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55556,8 +55556,8 @@ self: {
          web-routes web-routes-th
        ];
        description = "media plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55583,8 +55583,8 @@ self: {
        ];
        libraryToolDepends = [ hsx2hs ];
        description = "support for CMS/Blogging in clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55609,8 +55609,8 @@ self: {
          web-routes-th
        ];
        description = "support redirects for CMS/Blogging in clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55628,8 +55628,8 @@ self: {
          mtl text web-plugins
        ];
        description = "simple bootstrap based template for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55647,8 +55647,8 @@ self: {
          web-plugins
        ];
        description = "simple bootstrap based template for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55661,8 +55661,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base clckwrks hsp text ];
        description = "geo bootstrap based template for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55674,8 +55674,8 @@ self: {
        sha256 = "04sh2077pn67y1apgzx6rp4z15dw7qbvwg6yrwg416k40ilz7nbd";
        libraryHaskellDepends = [ base bytestring hashable text ];
        description = "Haskell bindings to Google's Compact Language Detector 2";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55693,7 +55693,7 @@ self: {
          base cmdargs containers directory HSH IfElse
        ];
        description = "Keep your home dir clean by finding old conf files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clean-unions" = callPackage
@@ -55704,8 +55704,8 @@ self: {
        sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
        libraryHaskellDepends = [ base ];
        description = "Open unions without need for Typeable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55724,8 +55724,8 @@ self: {
          wl-pprint-extras wl-pprint-terminfo
        ];
        description = "Colorized LESS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55740,8 +55740,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        executableHaskellDepends = [ parsec ];
        description = "A CSS preprocessor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55753,8 +55753,8 @@ self: {
        sha256 = "1x2q496jqvgqjbwncszl1h9ylkq6rn8h2fsp7w771xkyslfq46xy";
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Lexes C++ code into simple tokens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55771,7 +55771,7 @@ self: {
        libraryHaskellDepends = [ base basement foundation ];
        executableHaskellDepends = [ base basement foundation ];
        description = "CLI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cli-builder" = callPackage
@@ -55787,8 +55787,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55808,8 +55808,8 @@ self: {
          terminal-size text time transformers which
        ];
        description = "Miscellaneous utilities for building and working with command line interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55826,8 +55826,8 @@ self: {
          logging-effect megaparsec mtl text
        ];
        description = "Bindings to the git command-line interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55844,8 +55844,8 @@ self: {
          text
        ];
        description = "Bindings to the nix command-line interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55857,7 +55857,7 @@ self: {
        sha256 = "09ycy8500si810ysn70khc2np1zy21a1647kva8lkcj4pjbb1bvx";
        libraryHaskellDepends = [ base directory process ];
        description = "Helper setup scripts for packaging command-line tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "click-clack" = callPackage
@@ -55876,7 +55876,7 @@ self: {
        ];
        description = "Toy game (tetris on billiard board). Hipmunk in action.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clickhouse-haskell" = callPackage
@@ -55912,8 +55912,8 @@ self: {
          unordered-containers uri-encode uuid vector word8
        ];
        description = "A Haskell library as database client for Clickhouse";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55939,7 +55939,7 @@ self: {
          transformers
        ];
        description = "Securely store session data in a client-side cookie";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "clif" = callPackage
@@ -55956,8 +55956,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base time ];
        description = "A Clifford algebra number type for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -55990,8 +55990,8 @@ self: {
          base criterion numeric-prelude stream-fusion
        ];
        description = "A Clifford algebra library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56011,8 +56011,8 @@ self: {
          optparse-applicative pointedlist process time vector vty
        ];
        description = "Command Line Interface File Manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56035,7 +56035,7 @@ self: {
          unliftio-core
        ];
        description = "Building blocks for a GHCi-like REPL with colon-commands";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clingo" = callPackage
@@ -56054,8 +56054,8 @@ self: {
        ];
        librarySystemDepends = [ clingo ];
        description = "Haskell bindings to the Clingo ASP solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) clingo;};
 
@@ -56067,8 +56067,8 @@ self: {
        sha256 = "0qhi727irlkvi4ygx5qvd6h1zzz22588lymi39s0gcjir473a538";
        libraryHaskellDepends = [ base process ];
        description = "A simple Haskell library for copying text to the clipboard in a cross-platform way";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56080,8 +56080,8 @@ self: {
        sha256 = "0s4n8d07190yarkxpa2kjphkm6lw2ljgwcix3x6m3lxcxrvc3nr0";
        libraryHaskellDepends = [ base ];
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56107,8 +56107,8 @@ self: {
          assertions base data-default filepath old-locale parsec time
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56121,8 +56121,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Tiny library to pretty print sparklines onto the CLI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56135,7 +56135,7 @@ self: {
        libraryHaskellDepends = [ base natural-induction peano ];
        description = "Counted list";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clit" = callPackage
@@ -56157,8 +56157,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Post tweets from stdin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56176,7 +56176,7 @@ self: {
          base foldl process system-filepath temporary text turtle
        ];
        description = "Clone and benchmark Haskell cabal projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clock" = callPackage
@@ -56189,7 +56189,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "High-resolution clock functions: monotonic, realtime, cputime";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clock-extras" = callPackage
@@ -56201,7 +56201,7 @@ self: {
        libraryHaskellDepends = [ base clock ];
        testHaskellDepends = [ base hspec ];
        description = "A couple functions that probably should be in the 'clock' package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clocked" = callPackage
@@ -56217,8 +56217,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ QtCore ];
        description = "timer functionality to clock IO commands";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {QtCore = null;};
 
@@ -56235,8 +56235,8 @@ self: {
          timezone-series
        ];
        description = "Parse IRC logs such as the #haskell logs on tunes.org";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56256,8 +56256,8 @@ self: {
          system-fileio system-filepath text transformers
        ];
        description = "Clone all github repositories from a given user";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56277,7 +56277,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Integers bounded by a closed interval";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "closure" = callPackage
@@ -56288,8 +56288,8 @@ self: {
        sha256 = "1z9clkwjpj01g258h8bldlc759vwsgdlyppn29sr11kyani1zjwf";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "Depth- and breadth-first set closures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56313,8 +56313,8 @@ self: {
        ];
        doHaddock = false;
        description = "The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56343,8 +56343,8 @@ self: {
          optparse-applicative text these transformers yaml
        ];
        description = "A tool for interacting with AWS CloudFormation";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56361,8 +56361,8 @@ self: {
          crypto-pubkey-types old-locale RSA time
        ];
        description = "CloudFront URL signer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56378,7 +56378,7 @@ self: {
          array base binary bytestring containers network time unix zlib
        ];
        description = "Haskell CloudI API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cloudyfs" = callPackage
@@ -56398,7 +56398,7 @@ self: {
        ];
        description = "A cloud in the file system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clr-bindings" = callPackage
@@ -56414,7 +56414,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Glue between clr-host and clr-typed";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clr-host" = callPackage
@@ -56434,7 +56434,7 @@ self: {
        librarySystemDepends = [ glib mono ];
        testHaskellDepends = [ base ];
        description = "Hosting the Common Language Runtime";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "clr-inline" = callPackage
@@ -56463,8 +56463,8 @@ self: {
          pipes process split template-haskell temporary text transformers
        ];
        description = "Quasiquoters for inline C# and F#";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56476,7 +56476,7 @@ self: {
        sha256 = "1mnwxfmhz548bb1g17bddhmvd6lzl66bfi1a7f0j3phh7lgna4s1";
        libraryHaskellDepends = [ base text ];
        description = "Marshaling for the clr";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clr-typed" = callPackage
@@ -56488,7 +56488,7 @@ self: {
        libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ];
        testHaskellDepends = [ base clr-marshal hspec text ];
        description = "A strongly typed Haskell interface to the CLR type system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clr-win-linker" = callPackage
@@ -56503,7 +56503,7 @@ self: {
          base directory pipes pipes-safe process
        ];
        description = "A GHC linker wrapper tool to workaround a GHC >8.2 bug";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cltw" = callPackage
@@ -56516,7 +56516,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base curl mtl random tagsoup ];
        description = "Command line Twitter utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "clua" = callPackage
@@ -56533,8 +56533,8 @@ self: {
          base bytestring containers haskell98 language-c pretty pretty-show
        ];
        description = "C to Lua data wrapper generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56546,7 +56546,7 @@ self: {
        sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc";
        libraryHaskellDepends = [ base containers tree-fun ];
        description = "Calculate the clumpiness of leaf properties in a tree";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "cluss" = callPackage
@@ -56557,8 +56557,8 @@ self: {
        sha256 = "1q5km2f8zwnzcwnzj0khnszsgrb1x53zp0ryjwz2nfx9ajvh7zgg";
        libraryHaskellDepends = [ base template-haskell ];
        description = "simple alternative to type classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56584,8 +56584,8 @@ self: {
          base criterion hierarchical-clustering matrices mwc-random vector
        ];
        description = "High performance clustering algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56605,7 +56605,7 @@ self: {
        ];
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56624,7 +56624,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
 
@@ -56643,7 +56643,7 @@ self: {
        ];
        description = "CMA-ES wrapper in Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cmake-syntax" = callPackage
@@ -56660,7 +56660,7 @@ self: {
          base bytestring hspec raw-strings-qq trifecta
        ];
        description = "Parser for the CMake syntax (CMakeLists.txt and .cmake files)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmark" = callPackage
@@ -56677,7 +56677,7 @@ self: {
          base blaze-html cheapskate criterion discount markdown sundown text
        ];
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmark-gfm" = callPackage
@@ -56694,7 +56694,7 @@ self: {
          base blaze-html cheapskate criterion discount markdown sundown text
        ];
        description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmark-highlight" = callPackage
@@ -56710,8 +56710,8 @@ self: {
          base blaze-html cmark highlighting-kate text
        ];
        description = "Code highlighting for cmark";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56725,7 +56725,7 @@ self: {
        editedCabalFile = "1mizbv18bl8qrgz27wlz7sb6cfhblmp7p7gh7dqq8g0r4djrvqg5";
        libraryHaskellDepends = [ base cmark lucid ];
        description = "Use cmark with Lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmark-patterns" = callPackage
@@ -56736,8 +56736,8 @@ self: {
        sha256 = "15pdlcc0ak1pbx7qz6w5xfv4g9wkapx0flxqqkhcksa4k1h3hr1f";
        libraryHaskellDepends = [ base cmark ];
        description = "Pattern synonyms for cmark";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56756,8 +56756,8 @@ self: {
          base base-prelude cmark containers hspec QuickCheck text
        ];
        description = "Represent cmark-parsed Markdown as a tree of sections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56769,8 +56769,8 @@ self: {
        sha256 = "1hb92cgblmwp49lv0x0ib8g557mhjk6db7ihnim75ldii2f93dnm";
        libraryHaskellDepends = [ base ];
        description = "A binding to the standard C math library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56790,8 +56790,8 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56808,8 +56808,8 @@ self: {
          base hspec hspec-laws HUnit QuickCheck quickcheck-instances text
        ];
        description = "Library to compose and reuse command line fragments";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56827,7 +56827,7 @@ self: {
          base filepath process template-haskell transformers
        ];
        description = "Command line argument processing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmdargs-browser" = callPackage
@@ -56847,7 +56847,7 @@ self: {
          process text transformers wai wai-handler-launch
        ];
        description = "Helper to enter cmdargs command lines using a web browser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmdlib" = callPackage
@@ -56860,8 +56860,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56883,8 +56883,8 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "Declarative command-line option parsing and documentation library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56897,8 +56897,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hedgehog ];
        description = "(C)oncurrent (M)onoidal (F)olds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56910,7 +56910,7 @@ self: {
        sha256 = "1hym074a8akzg3c96b1yczmdw5pgn4g0ahqxsxhg8d0kf8lzi5ph";
        libraryHaskellDepends = [ base ];
        description = "Events and Channels as in Concurrent ML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cmonad" = callPackage
@@ -56921,8 +56921,8 @@ self: {
        sha256 = "07adwhpsmg3q4nhifjpdjv2dy1m08n0qkvlssmbl3b6gklvb82sk";
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56941,8 +56941,8 @@ self: {
        ];
        testSystemDepends = [ cmph ];
        description = "low level interface to CMPH";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cmph = null;};
 
@@ -56957,8 +56957,8 @@ self: {
          base ghc magic-tyfams should-not-typecheck
        ];
        description = "Compare types of any kinds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -56985,8 +56985,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Write consistent git commit messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57029,8 +57029,8 @@ self: {
          parsec StockholmAlignment template-haskell text vector
        ];
        description = "Detailed visualization of CMs, HMMs and their comparisions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57052,8 +57052,8 @@ self: {
          prettyclass process split stringtable-atom unix zlib
        ];
        description = "Compiler/Translator for CnC Specification Files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57065,7 +57065,7 @@ self: {
        sha256 = "12vybpji4bxwn8in18xqp4l2js1cbnn8fgk3r6m5c8idp769ph2m";
        libraryHaskellDepends = [ array base bytestring file-embed text ];
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "co-log" = callPackage
@@ -57091,7 +57091,7 @@ self: {
        executableToolDepends = [ markdown-unlit ];
        testHaskellDepends = [ base co-log-core hedgehog ];
        description = "Composable Contravariant Comonadic Logging Library";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "co-log-concurrent" = callPackage
@@ -57102,7 +57102,7 @@ self: {
        sha256 = "07z4aklk7dc2fhbc30kd9hbdvq71sa4ip6r2pyifcpn3p2pr3mna";
        libraryHaskellDepends = [ base co-log-core stm ];
        description = "Asynchronous backend for co-log library";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "co-log-core" = callPackage
@@ -57116,7 +57116,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Composable Contravariant Comonadic Logging Library";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "co-log-json" = callPackage
@@ -57131,7 +57131,7 @@ self: {
          aeson base bytestring co-log-core containers string-conv text
        ];
        description = "Structured messages support in co-log ecosystem";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "co-log-polysemy" = callPackage
@@ -57145,8 +57145,8 @@ self: {
        libraryHaskellDepends = [ base co-log-core polysemy ];
        executableHaskellDepends = [ base co-log-core polysemy ];
        description = "Composable Contravariant Comonadic Logging Library";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57170,8 +57170,8 @@ self: {
          polysemy-plugin
        ];
        description = "A Polysemy logging effect for high quality (unstructured) logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57192,8 +57192,8 @@ self: {
          universum unix
        ];
        description = "Syslog implementation on top of 'co-log-core'";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57212,8 +57212,8 @@ self: {
          base generic-random tasty tasty-quickcheck tasty-travis
        ];
        description = "Command-line options and DSV parsing and printing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57239,7 +57239,7 @@ self: {
          linear megaparsec mtl parallel random split template-haskell text
        ];
        description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cobot-io" = callPackage
@@ -57262,8 +57262,8 @@ self: {
          neat-interpolation QuickCheck split text vector
        ];
        description = "Biological data file formats and IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57287,8 +57287,8 @@ self: {
          regex-tdfa text
        ];
        description = "Biological data file formats and IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {RNA = null;};
 
@@ -57300,8 +57300,8 @@ self: {
        sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
        libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57314,7 +57314,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Windows code page library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "codec" = callPackage
@@ -57336,8 +57336,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Simple bidirectional serialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57352,8 +57352,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text zlib ];
        testHaskellDepends = [ base bytestring filepath process text ];
        description = "Erlang VM byte code assembler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57376,8 +57376,8 @@ self: {
          QuickCheck regex-compat
        ];
        description = "Cross-platform structure serialisation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57389,7 +57389,7 @@ self: {
        sha256 = "0kbn76g6ly1pjd9higi0k0f26hplm0jhz85b23inn0bjli14n2cl";
        libraryHaskellDepends = [ base bytestring ];
        description = "A library to read and write mailboxes in mbox format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "codec-rpm" = callPackage
@@ -57412,8 +57412,8 @@ self: {
          HUnit parsec pretty text
        ];
        description = "A library for manipulating RPM files";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57437,8 +57437,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Codecov.io support for Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57457,8 +57457,8 @@ self: {
          MissingH process regex-posix time
        ];
        description = "Tool that automatically runs arbitrary commands when files change on disk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57472,8 +57472,8 @@ self: {
        editedCabalFile = "11kw4xs61c5d3kvlanx9waws8sj5k4d5445a8w1p5zx69x9im7bg";
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        description = "Submit and retrieve paste output from CodePad.org.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57501,8 +57501,8 @@ self: {
          test-framework test-framework-hunit text time witherable
        ];
        description = "Graphics library for CodeWorld";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57528,8 +57528,8 @@ self: {
          http-client-tls network process transformers yaml
        ];
        description = "A ctags file generator for cabal project dependencies";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57545,8 +57545,8 @@ self: {
          base comonad haskell-src-meta parsec template-haskell uniplate
        ];
        description = "A notation for comonads, analogous to the do-notation for monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57559,7 +57559,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base unliftio ];
        description = "Having trouble deriving instances because of type roles? Solve it here!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "coerce-util" = callPackage
@@ -57570,7 +57570,7 @@ self: {
        sha256 = "0v4ymcrqij8q9s8pcgbfrnl8y379fki3zp80lg4xqvbx0i89vsxf";
        libraryHaskellDepends = [ base ];
        description = "utils for Data.Coerce";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "coercible-subtypes" = callPackage
@@ -57583,7 +57583,7 @@ self: {
        editedCabalFile = "05bd9lp5jp31ac039vq0p58kr03g5ai3cyymc4ikhbnl3x44hx4d";
        libraryHaskellDepends = [ base profunctors ];
        description = "Coercible but only in one direction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "coercible-utils" = callPackage
@@ -57596,8 +57596,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "Utility functions for Coercible types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57610,7 +57610,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers ];
        description = "Extra utilities for manipulating nominal and representational coercions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "coformat" = callPackage
@@ -57648,7 +57648,7 @@ self: {
          xml-conduit yaml
        ];
        description = "Generate clang-format config based on some existing code base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cofunctor" = callPackage
@@ -57659,7 +57659,7 @@ self: {
        sha256 = "0xn4k1c7l9z3g0slbwvlfg9kpfq8jbk0qf9363qz7azv7ks1149p";
        libraryHaskellDepends = [ base ];
        description = "DEPRECATED: use the \"contravariant\" package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cognimeta-utils" = callPackage
@@ -57686,7 +57686,7 @@ self: {
        ];
        description = "Utilities for Cognimeta products (such as perdure). API may change often.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "coin" = callPackage
@@ -57710,7 +57710,7 @@ self: {
        ];
        description = "Simple account manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57749,8 +57749,8 @@ self: {
          transformers unordered-containers uuid websockets
        ];
        description = "Connector library for the coinbase exchange";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57783,8 +57783,8 @@ self: {
          unagi-streams unordered-containers uuid vector websockets wuss
        ];
        description = "Client for Coinbase Pro";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57803,8 +57803,8 @@ self: {
          array base combinat containers tasty tasty-hunit
        ];
        description = "Equivariant CSM classes of coincident root loci";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57828,8 +57828,8 @@ self: {
          ListZipper monad-atom mtl nlp-scores split swift-lda text vector
        ];
        description = "Colada implements incremental word class class induction using online LDA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57847,8 +57847,8 @@ self: {
          pipes-attoparsec pipes-network text transformers
        ];
        description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57864,7 +57864,7 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "File transfer via QR Codes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "collada-output" = callPackage
@@ -57881,8 +57881,8 @@ self: {
          base collada-types containers SVGPath time vector xml
        ];
        description = "Generate animated 3d objects in COLLADA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57894,7 +57894,7 @@ self: {
        sha256 = "1qs1bxxkjb6clszv8mahbmwdwbqpdr5hcxwn3nq5d6wc2xgb4y6r";
        libraryHaskellDepends = [ base containers OpenGL tuple vector ];
        description = "Data exchange between graphics applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "collapse-duplication" = callPackage
@@ -57916,8 +57916,8 @@ self: {
          base bytestring cassava containers lens optparse-generic split
        ];
        description = "Collapse the duplication output into clones and return their frequencies";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57931,8 +57931,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "utility for collapsing adjacent writes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57955,8 +57955,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Collection+JSON—Hypermedia Type Tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57970,8 +57970,8 @@ self: {
          array base bytestring containers QuickCheck
        ];
        description = "Useful standard collections types and related functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -57985,8 +57985,8 @@ self: {
        editedCabalFile = "073x7vwgsj2xcqpywqdwk7pbj9zc9sinm17sknafgyxacx1r15xl";
        libraryHaskellDepends = [ array base QuickCheck ];
        description = "API for collection data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58002,8 +58002,8 @@ self: {
          array base bytestring collections-api containers
        ];
        description = "Useful standard collections types and related functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58036,8 +58036,8 @@ self: {
          ansi-wl-pprint base doctest fast-logger QuickCheck semigroupoids
        ];
        description = "Generic types and functions for columnar encoding and decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58062,8 +58062,8 @@ self: {
          friday-devil split v4l2 vector vector-space yaml
        ];
        description = "Count colors in images";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58076,7 +58076,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Styled console text output using ANSI escape sequences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "colorize-haskell" = callPackage
@@ -58090,7 +58090,7 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base haskell-lexer ];
        executableHaskellDepends = [ ansi-terminal base haskell-lexer ];
        description = "Highligt Haskell source";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "colorless" = callPackage
@@ -58112,8 +58112,8 @@ self: {
          aeson base containers hspec scientific text tuple vector
        ];
        description = "Colorless | The Programmatic IDL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58130,8 +58130,8 @@ self: {
          text-conversions
        ];
        description = "Http Client addon for Colorless";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58145,8 +58145,8 @@ self: {
          aeson base colorless mtl scotty text wai
        ];
        description = "Scotty server add-on for Colorless";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58160,7 +58160,7 @@ self: {
        editedCabalFile = "0q152j8ybnga46azvfg3xmsjk01lz4wkhlli07cd92803vc4d6dl";
        libraryHaskellDepends = [ base lens linear profunctors ];
        description = "A type for colors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "colour" = callPackage
@@ -58177,7 +58177,7 @@ self: {
          base QuickCheck random test-framework test-framework-quickcheck2
        ];
        description = "A model for human colour/color perception";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "colour-accelerate" = callPackage
@@ -58188,7 +58188,7 @@ self: {
        sha256 = "1j7ff2wb58yf346z2abr1v1yq498fxm498rdf1g62ppf6vkdplw8";
        libraryHaskellDepends = [ accelerate base ];
        description = "Working with colours in Accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "colour-space" = callPackage
@@ -58205,8 +58205,8 @@ self: {
          linear linearmap-category manifolds semigroups vector-space
        ];
        description = "Instances of the manifold-classes for colour types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58218,7 +58218,7 @@ self: {
        sha256 = "1iglvl6k8vrq45h5r8r2ng575dgg30jfw1zq19zld72914mmvjdz";
        libraryHaskellDepends = [ ansi-terminal base bytestring text ];
        description = "Convenient interface for printing colourful messages";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "coltrane" = callPackage
@@ -58234,8 +58234,8 @@ self: {
          wai-extra warp
        ];
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58256,8 +58256,8 @@ self: {
        ];
        doHaddock = false;
        description = "Enhanced serialization using seeking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58275,8 +58275,8 @@ self: {
          template-haskell text time unordered-containers vector
        ];
        description = "A CSV toolkit based on cassava and enum-text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58288,8 +58288,8 @@ self: {
        sha256 = "1y6zm63jyigf631f2b0bqw1yhmr6hifaspqivy7qy30brmr5a27m";
        doHaddock = false;
        description = "Haskell COM support library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58308,8 +58308,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "Commonmark processing in pure haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "comark-html" = callPackage
@@ -58328,8 +58328,8 @@ self: {
          base cmark comark-syntax comark-testutils criterion deepseq text
        ];
        description = "Commonmark (markdown) to HTML renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {comark-testutils = null;};
 
@@ -58355,8 +58355,8 @@ self: {
          text
        ];
        description = "Parser for Commonmark (markdown)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {comark-testutils = null;};
 
@@ -58368,8 +58368,8 @@ self: {
        sha256 = "0y1fp6griivzzxwp621cm2mrizxmrnjazhayl21aqfp7mb5i4ib2";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Definitions of AST that represents a Commonmark (markdown) document";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58393,8 +58393,8 @@ self: {
          transformers
        ];
        description = "Generate and manipulate various combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58414,7 +58414,7 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "Generate and manipulate various combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "combinat-diagrams" = callPackage
@@ -58430,8 +58430,8 @@ self: {
          linear transformers
        ];
        description = "Graphical representations for various combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58453,8 +58453,8 @@ self: {
          template-haskell th-lift trifecta void
        ];
        description = "SKI Combinator interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58473,7 +58473,7 @@ self: {
          array base containers QuickCheck transformers utility-ht
        ];
        description = "Count, enumerate, rank and unrank combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "combinatorial-problems" = callPackage
@@ -58489,7 +58489,7 @@ self: {
        ];
        description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58501,7 +58501,7 @@ self: {
        sha256 = "101b3lycfav6wqdqjhs0v93vgy4g3pfn5xyimip0x3alq0q2ix9a";
        libraryHaskellDepends = [ base ];
        description = "Efficient computation of common combinatoric functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "combobuffer" = callPackage
@@ -58516,8 +58516,8 @@ self: {
          base containers template-haskell vector vector-space
        ];
        description = "Various buffer implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58540,7 +58540,7 @@ self: {
          base ChasingBottoms containers QuickCheck tagged
        ];
        description = "Arrays where the index type is a function of the shape type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comfort-graph" = callPackage
@@ -58558,7 +58558,7 @@ self: {
          base containers QuickCheck transformers utility-ht
        ];
        description = "Graph structure with type parameters for nodes and edges";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comic" = callPackage
@@ -58574,8 +58574,8 @@ self: {
          time uuid
        ];
        description = "A format for describing comics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58589,7 +58589,7 @@ self: {
        testHaskellDepends = [ base QuickCheck text ];
        description = "CSV Parser & Producer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "command" = callPackage
@@ -58600,7 +58600,7 @@ self: {
        sha256 = "0qj6i5r1iz3d8visqpd74xwkribxzs4p66b1vgp0i3jiqgfrn2hw";
        libraryHaskellDepends = [ base deepseq process ];
        description = "Conveniently run shell commands";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "command-qq" = callPackage
@@ -58616,7 +58616,7 @@ self: {
          base doctest hspec template-haskell text transformers
        ];
        description = "Quasiquoters for external commands";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "commander" = callPackage
@@ -58631,8 +58631,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "pattern matching against string based commands";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58649,7 +58649,7 @@ self: {
        ];
        testHaskellDepends = [ base commandert text unordered-containers ];
        description = "A command line argument/option parser library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "commandert" = callPackage
@@ -58661,7 +58661,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad for commanders";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "commodities" = callPackage
@@ -58684,8 +58684,8 @@ self: {
          lens QuickCheck semigroups thyme transformers
        ];
        description = "Library for working with commoditized amounts and price histories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58708,7 +58708,7 @@ self: {
          base bytestring containers criterion text transformers
        ];
        description = "Pure Haskell commonmark parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "commonmark-cli" = callPackage
@@ -58728,7 +58728,7 @@ self: {
          pretty-simple text
        ];
        description = "Command-line commonmark converter and highlighter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "commonmark-extensions" = callPackage
@@ -58752,7 +58752,7 @@ self: {
          base bytestring commonmark containers criterion text transformers
        ];
        description = "Pure Haskell commonmark parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "commonmark-pandoc" = callPackage
@@ -58767,7 +58767,7 @@ self: {
          base commonmark commonmark-extensions containers pandoc-types text
        ];
        description = "Bridge between commonmark and pandoc AST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "commsec" = callPackage
@@ -58782,8 +58782,8 @@ self: {
          base bytestring cipher-aes128 crypto-api network
        ];
        description = "Provide communications security using symmetric ephemeral keys";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58802,8 +58802,8 @@ self: {
          network RSA
        ];
        description = "Key agreement for commsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58821,7 +58821,7 @@ self: {
          tasty-hunit tasty-quickcheck vector
        ];
        description = "Commutative binary operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comonad" = callPackage
@@ -58837,7 +58837,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Comonads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comonad-extras" = callPackage
@@ -58853,7 +58853,7 @@ self: {
          transformers
        ];
        description = "Exotic comonad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comonad-random" = callPackage
@@ -58865,7 +58865,7 @@ self: {
        libraryHaskellDepends = [ base category-extras random ];
        description = "Comonadic interface for random values";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "comonad-transformers" = callPackage
@@ -58877,7 +58877,7 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        doHaddock = false;
        description = "This package has been merged into comonad 4.0";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "comonads-fd" = callPackage
@@ -58889,7 +58889,7 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        doHaddock = false;
        description = "This package has been merged into comonad 4.0";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compact" = callPackage
@@ -58902,7 +58902,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ghc-compact ];
        testHaskellDepends = [ base directory ];
        description = "Non-GC'd, contiguous storage for immutable data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compact-list" = callPackage
@@ -58914,8 +58914,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base ];
        description = "An append only list in a compact region";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58929,8 +58929,8 @@ self: {
          array base binary bytestring containers
        ];
        description = "Compact Data.Map implementation using Data.Binary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58950,8 +58950,8 @@ self: {
          transformers
        ];
        description = "Mutable arrays living on the compact heap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58965,8 +58965,8 @@ self: {
        libraryHaskellDepends = [ base compact ghc-prim primitive vector ];
        testHaskellDepends = [ base compact hspec ];
        description = "Mutable vector with different GC characteristics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -58981,7 +58981,7 @@ self: {
        libraryHaskellDepends = [ base mtl primitive transformers ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Stacks, queues, and deques with compact representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compact-socket" = callPackage
@@ -58997,8 +58997,8 @@ self: {
          unix
        ];
        description = "Socket functions for compact normal form";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59012,8 +59012,8 @@ self: {
        editedCabalFile = "03cw0x4dg0qwaysf2sndyzm27sva6x415dxd70fs2vcbys5m1j8j";
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59027,8 +59027,8 @@ self: {
        editedCabalFile = "1akx1kzpirl1fc3lfcrsa88jvrk023f9qyj2b2fbpz4p11d07qfc";
        libraryHaskellDepends = [ base bytestring ];
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59045,8 +59045,8 @@ self: {
          base primitive QuickCheck random tasty tasty-hunit tasty-quickcheck
        ];
        description = "Small vectors of small integers stored very compactly";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59058,8 +59058,8 @@ self: {
        sha256 = "1qw47ps6bnp6xwaksqq7plry0ivsm18f0vf79yi1n755w6p49648";
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59072,7 +59072,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A read-only memory-efficient key-value store";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compare-type" = callPackage
@@ -59083,7 +59083,7 @@ self: {
        sha256 = "1s6p3ni8pqxbp08ci4w6y646wrh60s0g34figrwdcqrywscyicsb";
        libraryHaskellDepends = [ base ];
        description = "compare types of any kinds in haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compdata" = callPackage
@@ -59110,8 +59110,8 @@ self: {
          template-haskell th-expand-syns transformers uniplate
        ];
        description = "Compositional Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59127,8 +59127,8 @@ self: {
          base compdata containers criterion projection
        ];
        description = "Tree automata on Compositional Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59150,8 +59150,8 @@ self: {
          unordered-containers vector
        ];
        description = "Compositional Data Types on DAGs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59167,7 +59167,7 @@ self: {
          base composition containers deriving-compat fixplate tree-view
        ];
        description = "Compdata basics implemented on top of Fixplate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compdata-param" = callPackage
@@ -59187,8 +59187,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "Parametric Compositional Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59206,7 +59206,7 @@ self: {
          pandoc pandoc-throw path rio vinyl
        ];
        description = "Parse a Pandoc to a composite value";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "compdoc-dhall-decoder" = callPackage
@@ -59224,7 +59224,7 @@ self: {
          text
        ];
        description = "Allows you to write FromDhall instances for Compdoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compendium-client" = callPackage
@@ -59240,8 +59240,8 @@ self: {
          servant-client text
        ];
        description = "Client for the Compendium schema server";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59265,7 +59265,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Compensated floating-point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "competition" = callPackage
@@ -59276,8 +59276,8 @@ self: {
        sha256 = "07c6b6yai8x9i8qndimzmyp5bzhwckis8kg207n152gnskk7i3zn";
        libraryHaskellDepends = [ base filepath parsec ];
        description = "Helpers and runners for code competitions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59289,8 +59289,8 @@ self: {
        sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril";
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59307,7 +59307,7 @@ self: {
          base binary parsec tasty tasty-hunit tasty-quickcheck tasty-th text
        ];
        description = "Parser for common compiler warning formats";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "complex-generic" = callPackage
@@ -59320,8 +59320,8 @@ self: {
        editedCabalFile = "00v0mr5fc090wph3s9ks3ppf81nqbkd0yfa347fkn3zrq3daqr8f";
        libraryHaskellDepends = [ base template-haskell ];
        description = "complex numbers with non-mandatory RealFloat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59333,7 +59333,7 @@ self: {
        sha256 = "0q0ffpqir4f2ch7d7p2fxgb73n7dg7xf19rg78an7i7zdl430cfj";
        libraryHaskellDepends = [ base ];
        description = "A simple integration function to integrate a complex-valued complex functions";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "complexity" = callPackage
@@ -59349,8 +59349,8 @@ self: {
          transformers
        ];
        description = "Empirical algorithmic complexity";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59371,7 +59371,7 @@ self: {
          teardown
        ];
        description = "Monad for allocation and cleanup of application resources";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "componentm-devel" = callPackage
@@ -59384,7 +59384,7 @@ self: {
          base componentm foreign-store rio teardown
        ];
        description = "Easy REPL driven development using ComponentM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composable-associations" = callPackage
@@ -59396,7 +59396,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base lens tasty tasty-hunit ];
        description = "Types and helpers for composing types into a single larger key-value type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composable-associations-aeson" = callPackage
@@ -59415,7 +59415,7 @@ self: {
          aeson base bytestring doctest tasty tasty-hunit tasty-quickcheck
        ];
        description = "Aeson ToJSON/FromJSON implementation for the types of composable-associations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "compose-ltr" = callPackage
@@ -59427,7 +59427,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "More intuitive, left-to-right function composition";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "compose-trans" = callPackage
@@ -59438,8 +59438,8 @@ self: {
        sha256 = "0p2fd0knfbfjk4s0aalzrsrzpxffrykmaprxyakbgs1lmp4jyq9z";
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59467,7 +59467,7 @@ self: {
          unordered-containers vector vinyl
        ];
        description = "JSON for Vinyl records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-aeson-cofree-list" = callPackage
@@ -59482,7 +59482,7 @@ self: {
          aeson base composite-aeson composite-aeson-writeonly free vector
        ];
        description = "Print a Cofree [] as a JSON value";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composite-aeson-path" = callPackage
@@ -59493,7 +59493,7 @@ self: {
        sha256 = "08p988iq7y76px61dlj5jq35drmnrf4khi27wpqgh3pg9d96yihx";
        libraryHaskellDepends = [ base composite-aeson path ];
        description = "Formatting data for the path library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-aeson-refined" = callPackage
@@ -59508,7 +59508,7 @@ self: {
          aeson-better-errors base composite-aeson mtl refined
        ];
        description = "composite-aeson support for Refined from the refined package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-aeson-throw" = callPackage
@@ -59523,7 +59523,7 @@ self: {
          aeson aeson-better-errors base composite-aeson exceptions
        ];
        description = "MonadThrow behaviour for composite-aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composite-aeson-writeonly" = callPackage
@@ -59537,7 +59537,7 @@ self: {
          aeson aeson-better-errors base composite-aeson
        ];
        description = "WriteOnly indicators for composite-aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composite-base" = callPackage
@@ -59560,7 +59560,7 @@ self: {
          unliftio-core vinyl
        ];
        description = "Shared utilities for composite-* packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-binary" = callPackage
@@ -59571,7 +59571,7 @@ self: {
        sha256 = "07d88krkpplprnw57j4bqi71p8bmj0wz28yw41wgl2p5g2h7zccp";
        libraryHaskellDepends = [ base binary composite-base ];
        description = "Orphan binary instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-ekg" = callPackage
@@ -59585,7 +59585,7 @@ self: {
          base composite-base ekg-core lens text vinyl
        ];
        description = "EKG Metrics for Vinyl records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-hashable" = callPackage
@@ -59596,7 +59596,7 @@ self: {
        sha256 = "0zwv6m9nzz0g3ngmfznxh6wmprhcgdbfxrsgylnr6990ppk0bmg1";
        libraryHaskellDepends = [ base composite-base hashable ];
        description = "Orphan hashable instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composite-opaleye" = callPackage
@@ -59618,8 +59618,8 @@ self: {
          vinyl
        ];
        description = "Opaleye SQL for Vinyl records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59641,8 +59641,8 @@ self: {
          lens QuickCheck swagger2 template-haskell text vinyl
        ];
        description = "Swagger for Vinyl records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59654,7 +59654,7 @@ self: {
        sha256 = "0y5xz4q5z2lw3jy3fdm5rl19sd969cdpq1a44ar45dpab0qffr41";
        libraryHaskellDepends = [ base composite-base ];
        description = "Tuple functions for composite records";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composite-xstep" = callPackage
@@ -59665,7 +59665,7 @@ self: {
        sha256 = "18q75ynlywr6yap6nn11x5kzxncn0b6ghmvbg642617pznznpfm9";
        libraryHaskellDepends = [ base composite-base vinyl ];
        description = "ReaderT transformer pattern for higher kinded composite data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "composition" = callPackage
@@ -59675,7 +59675,7 @@ self: {
        version = "1.0.2.1";
        sha256 = "0smdyzcnfwiab1wnazmk4szali1ckh7dqcdp9vn7qnnabq7k08vi";
        description = "Combinators for unorthodox function composition";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composition-extra" = callPackage
@@ -59686,7 +59686,7 @@ self: {
        sha256 = "0abipab6bx138rynpkh4daj53bv5yqbw94zfswysyq6iix529669";
        libraryHaskellDepends = [ base composition contravariant ];
        description = "Combinators for unorthodox structure composition";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composition-prelude" = callPackage
@@ -59697,7 +59697,7 @@ self: {
        sha256 = "151inlk43m96pnasc6llsjh8vxyc9b1i7xdgf1sp5p5072bzq305";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "composition-tree" = callPackage
@@ -59709,8 +59709,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Composition trees for arbitrary monoids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59730,8 +59730,8 @@ self: {
        testHaskellDepends = [ base c smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base c criterion ];
        description = "Compositional Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {c = null;};
 
@@ -59744,7 +59744,7 @@ self: {
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base-prelude ];
        description = "Sum and Product types and such";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "comprehensions-ghc" = callPackage
@@ -59758,8 +59758,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols ghc syb util ];
        testHaskellDepends = [ base ];
        description = "Plugin to generalize comprehensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59779,8 +59779,8 @@ self: {
          semigroupoids semigroups unordered-containers
        ];
        description = "Compressed containers and reducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59793,7 +59793,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Common compression algorithms";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "compstrat" = callPackage
@@ -59808,8 +59808,8 @@ self: {
          base compdata mtl template-haskell th-expand-syns transformers
        ];
        description = "Strategy combinators for compositional data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59827,8 +59827,8 @@ self: {
          template-haskell th-expand-syns
        ];
        description = "Automatically converting ASTs into compositional data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59880,8 +59880,8 @@ self: {
          test-framework-hunit transformers type-natural vector
        ];
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59898,8 +59898,8 @@ self: {
          vector
        ];
        description = "Collection of algorithms in Computational Geometry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59911,8 +59911,8 @@ self: {
        sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260";
        libraryHaskellDepends = [ base ];
        description = "Advanced notions of computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -59924,7 +59924,7 @@ self: {
        sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A library for postfix control flow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conceit" = callPackage
@@ -59938,7 +59938,7 @@ self: {
          base bifunctors semigroupoids semigroups void
        ];
        description = "Concurrent actions that may fail with a value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concise" = callPackage
@@ -59955,7 +59955,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "Utilities for Control.Lens.Cons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concorde" = callPackage
@@ -59966,7 +59966,7 @@ self: {
        sha256 = "0903lrj6bzajjdr01hbld1jm6vf7assn84hqk4kgrrs1mr3ykc20";
        libraryHaskellDepends = [ base containers process safe temporary ];
        description = "Simple interface to the Concorde solver for the Traveling Salesperson Problem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concraft" = callPackage
@@ -59990,8 +59990,8 @@ self: {
          transformers vector vector-binary zlib
        ];
        description = "Morphological disambiguation based on constrained CRFs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60013,8 +60013,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "Part-of-speech tagger for Croatian";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60043,8 +60043,8 @@ self: {
          dhall filepath pedestrian-dag sgd tagset-positional text
        ];
        description = "Morphological tagger for Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60089,7 +60089,7 @@ self: {
        ];
        description = "Library for the Concrete data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60107,7 +60107,7 @@ self: {
        ];
        description = "Automatically generated Thrift definitions for the Concrete data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60128,7 +60128,7 @@ self: {
        ];
        description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60148,8 +60148,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Binary and Hashable instances for TypeRep";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60165,7 +60165,7 @@ self: {
          base free mtl natural-transformation stm transformers
        ];
        description = "A client side web UI framework for Haskell. Core framework.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrency" = callPackage
@@ -60181,7 +60181,7 @@ self: {
          transformers
        ];
        description = "Typeclasses, functions, and data types for concurrency and STM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "concurrency-benchmarks" = callPackage
@@ -60203,8 +60203,8 @@ self: {
          async base deepseq gauge mtl random streamly transformers
        ];
        description = "Benchmarks to compare concurrency APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60216,7 +60216,7 @@ self: {
        sha256 = "13idx7w5k8rk3qqls3yn9xqwk116xsqb36ya3vxkb5x4q4vix3mv";
        libraryHaskellDepends = [ base ];
        description = "Simple thread barriers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-batch" = callPackage
@@ -60227,7 +60227,7 @@ self: {
        sha256 = "1f77p053hpiaf7xp916rff9hp29hisk7cwxcq72l5v4h4g3ps59d";
        libraryHaskellDepends = [ base clock stm ];
        description = "Concurrent batching queue based on STM with timeout";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-buffer" = callPackage
@@ -60246,8 +60246,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Concurrent expanding buffer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60272,7 +60272,7 @@ self: {
        ];
        testHaskellDepends = [ async base dns hspec ];
        description = "Concurrent DNS cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-extra" = callPackage
@@ -60289,7 +60289,7 @@ self: {
          unbounded-delays
        ];
        description = "Extra concurrency primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-hashtable" = callPackage
@@ -60313,8 +60313,8 @@ self: {
          hashable random stm stm-containers unordered-containers vector
        ];
        description = "Thread-safe hash tables for multi-cores!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dictionary-type = null;};
 
@@ -60336,8 +60336,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60354,7 +60354,7 @@ self: {
          terminal-size text transformers unix
        ];
        description = "Ungarble output from several threads or commands";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "concurrent-resource-map" = callPackage
@@ -60366,7 +60366,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers random stm ];
        description = "Concurrent resource map";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -60377,7 +60377,7 @@ self: {
        sha256 = "0k0iwax6nx4jvqh7rawis5dp7lxx8bc3r3x0rr8qy7vsp14lmvgg";
        libraryHaskellDepends = [ base ];
        description = "An abstraction for inter-thread RPC based on MVars";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "concurrent-sa" = callPackage
@@ -60388,7 +60388,7 @@ self: {
        sha256 = "1szvw0vih5jx2hvgb3h7mqh05im3pw687h7dshiy4ii5vs9pi6d6";
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Concurrent simulated annealing system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-split" = callPackage
@@ -60399,7 +60399,7 @@ self: {
        sha256 = "0i9gak7q3ay8g1kzq7dg0bs36bg88n7kwy3h1r6jrni7mz7jh05f";
        libraryHaskellDepends = [ base ];
        description = "MVars and Channels with distinguished input and output side";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-st" = callPackage
@@ -60410,7 +60410,7 @@ self: {
        sha256 = "08zjpyf1jrsn161z9dngag63s47vrvz4m8aani9lvmlacbzpjfwd";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Concurrent Haskell in ST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-state" = callPackage
@@ -60423,8 +60423,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        description = "MTL-like library using TVars";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60439,7 +60439,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim hashable ];
        testHaskellDepends = [ base containers ];
        description = "A fast concurrent unique identifier supply with a pure API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrent-utilities" = callPackage
@@ -60452,7 +60452,7 @@ self: {
        editedCabalFile = "1jf0sx6yq557aspa3wm12hkc64pmfnc39kbc5wsa2k7ksash3k15";
        libraryHaskellDepends = [ base ];
        description = "More utilities and broad-used datastructures for concurrency";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "concurrentoutput" = callPackage
@@ -60463,7 +60463,7 @@ self: {
        sha256 = "0fd372awmxrngbcb2phyzy3az9j2327kdhjnm7c5mm808vix67a8";
        libraryHaskellDepends = [ base ];
        description = "Ungarble output from several threads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cond" = callPackage
@@ -60474,7 +60474,7 @@ self: {
        sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
        libraryHaskellDepends = [ base ];
        description = "Basic conditional and boolean operators with monadic variants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "condor" = callPackage
@@ -60495,8 +60495,8 @@ self: {
          base binary Cabal containers glider-nlp HUnit text
        ];
        description = "Information retrieval library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60508,8 +60508,8 @@ self: {
        sha256 = "1raf8mrnfnn90ymcnyhqf1kzb9mpfsk83qlmajibjd8n94iq76nd";
        libraryHaskellDepends = [ array base ];
        description = "Library for Condorcet voting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60521,8 +60521,8 @@ self: {
        sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp";
        libraryHaskellDepends = [ array base containers random stm time ];
        description = "a library for live coding and real-time musical applications";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60534,7 +60534,7 @@ self: {
        sha256 = "1plml14h5d31jr3bvjjgaxcdqssxqfwwnbz9c5gvjlds6lla145p";
        doHaddock = false;
        description = "a library for displaying musical time in a terminal-based clock";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "conductive-hsc3" = callPackage
@@ -60550,8 +60550,8 @@ self: {
          hosc hsc3 random
        ];
        description = "a library with examples of using Conductive with hsc3";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60563,8 +60563,8 @@ self: {
        sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi";
        libraryHaskellDepends = [ base conductive-base random ];
        description = "a library of functions which are useful for composing music";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60581,7 +60581,7 @@ self: {
          transformers
        ];
        description = "Lightweight composable continuation-based stream processors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit" = callPackage
@@ -60609,7 +60609,7 @@ self: {
          transformers vector
        ];
        description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-algorithms" = callPackage
@@ -60644,7 +60644,7 @@ self: {
          streaming-commons transformers unliftio-core vector
        ];
        description = "Conduit-based algorithms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-audio" = callPackage
@@ -60657,7 +60657,7 @@ self: {
        editedCabalFile = "0zldqx1r2wmvqwg8r6x7v65h2nqr7fjcxab74f0f5i1nqsd5b51a";
        libraryHaskellDepends = [ base conduit vector ];
        description = "Combinators to efficiently slice and dice audio streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit-audio-lame" = callPackage
@@ -60676,8 +60676,8 @@ self: {
        librarySystemDepends = [ mp3lame ];
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the LAME MP3 library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mp3lame = null;};
 
@@ -60697,8 +60697,8 @@ self: {
        librarySystemDepends = [ samplerate ];
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the libsamplerate resampling library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {samplerate = null;};
 
@@ -60715,7 +60715,7 @@ self: {
          transformers
        ];
        description = "conduit-audio interface to the libsndfile audio file library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit-combinators" = callPackage
@@ -60727,7 +60727,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "DEPRECATED Functionality merged into the conduit package itself";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-concurrent-map" = callPackage
@@ -60743,7 +60743,7 @@ self: {
        ];
        testHaskellDepends = [ base conduit hspec HUnit say ];
        description = "Concurrent, order-preserving mapping Conduit";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-connection" = callPackage
@@ -60763,7 +60763,7 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "Conduit source and sink for Network.Connection.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit-extra" = callPackage
@@ -60791,7 +60791,7 @@ self: {
          base bytestring bytestring-builder conduit gauge transformers
        ];
        description = "Batteries included conduit: adapters for common libraries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conduit-find" = callPackage
@@ -60825,8 +60825,8 @@ self: {
          transformers-base unix-compat
        ];
        description = "A file-finding conduit that allows user control over traversals";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60847,8 +60847,8 @@ self: {
          base bytestring conduit criterion mtl text
        ];
        description = "Conduit for character encoding conversion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60860,7 +60860,7 @@ self: {
        sha256 = "0ys65vs5wb412bimmsmkmf14krk2339n9rswynnwy3rdb74bsswf";
        libraryHaskellDepends = [ base conduit mtl ];
        description = "Merge multiple sorted conduits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conduit-network-stream" = callPackage
@@ -60875,8 +60875,8 @@ self: {
          base bytestring conduit mtl network-conduit resourcet
        ];
        description = "A base layer for network protocols using Conduits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60899,7 +60899,7 @@ self: {
          tasty-hunit
        ];
        description = "Parsing framework based on conduit";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "conduit-resumablesink" = callPackage
@@ -60915,8 +60915,8 @@ self: {
          base bytestring conduit hspec resourcet transformers void
        ];
        description = "Allows conduit to resume sinks to feed multiple sources into it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60940,8 +60940,8 @@ self: {
          test-framework-hunit throttle-io-stream unliftio unliftio-core
        ];
        description = "Throttle Conduit Producers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60961,8 +60961,8 @@ self: {
        executableHaskellDepends = [ attoparsec base conduit resourcet ];
        testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
        description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -60987,8 +60987,8 @@ self: {
          resourcet text transformers unix unliftio unordered-containers
        ];
        description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61015,8 +61015,8 @@ self: {
          zip-archive
        ];
        description = "Zip archive interface for the Conduit Virtual File System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61035,7 +61035,7 @@ self: {
          quickcheck-instances tasty tasty-quickcheck zstd
        ];
        description = "Conduit-based ZStd Compression";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conf" = callPackage
@@ -61051,8 +61051,8 @@ self: {
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
        description = "Parser for Haskell-based configuration files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61069,7 +61069,7 @@ self: {
          aeson base binary bytestring directory hspec QuickCheck
        ];
        description = "read, parse json config";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "confcrypt" = callPackage
@@ -61104,8 +61104,8 @@ self: {
          parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck
          text transformers
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61125,7 +61125,7 @@ self: {
          QuickCheck text
        ];
        description = "Configuration management library";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer_1_0_0_1" = callPackage
@@ -61144,8 +61144,8 @@ self: {
          QuickCheck text
        ];
        description = "Configuration management library";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "conferer-aeson" = callPackage
@@ -61165,7 +61165,7 @@ self: {
          unordered-containers vector
        ];
        description = "conferer's source for reading json files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-dhall" = callPackage
@@ -61185,8 +61185,8 @@ self: {
          hspec text
        ];
        description = "Configuration for reading dhall files";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61199,7 +61199,7 @@ self: {
        libraryHaskellDepends = [ base conferer hedis text ];
        testHaskellDepends = [ base conferer hedis hspec text ];
        description = "conferer's FromConfig instances for hedis settings";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-hspec" = callPackage
@@ -61211,7 +61211,7 @@ self: {
        libraryHaskellDepends = [ base conferer hspec-core text ];
        testHaskellDepends = [ base conferer hspec hspec-core text ];
        description = "conferer's FromConfig instances for hspec Config";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-provider-dhall" = callPackage
@@ -61231,8 +61231,8 @@ self: {
          directory hspec text
        ];
        description = "Configuration for reading dhall files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61253,8 +61253,8 @@ self: {
          unordered-containers vector
        ];
        description = "conferer's provider for reading json files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61273,8 +61273,8 @@ self: {
          base conferer conferer-provider-json hspec yaml
        ];
        description = "Configuration for reading yaml files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61293,7 +61293,7 @@ self: {
          base conferer hspec snap-core snap-server text
        ];
        description = "conferer's FromConfig instances for snap Config";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-source-dhall" = callPackage
@@ -61313,8 +61313,8 @@ self: {
          directory hspec text
        ];
        description = "Configuration for reading dhall files";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61335,8 +61335,8 @@ self: {
          unordered-containers vector
        ];
        description = "conferer's source for reading json files";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61354,8 +61354,8 @@ self: {
          base conferer conferer-source-json hspec yaml
        ];
        description = "Configuration for reading yaml files";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61371,7 +61371,7 @@ self: {
          base conferer hspec http-types text wai warp
        ];
        description = "conferer's FromConfig instances for warp settings";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "conferer-yaml" = callPackage
@@ -61383,7 +61383,7 @@ self: {
        libraryHaskellDepends = [ base conferer conferer-aeson yaml ];
        testHaskellDepends = [ base conferer conferer-aeson hspec yaml ];
        description = "Configuration for reading yaml files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "confetti" = callPackage
@@ -61404,7 +61404,7 @@ self: {
          base tasty tasty-hunit tasty-smallcheck text
        ];
        description = "A simple config file swapping tool";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conffmt" = callPackage
@@ -61421,8 +61421,8 @@ self: {
          base language-conf megaparsec optparse-applicative pretty text
        ];
        description = "A .conf file formatter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61437,8 +61437,8 @@ self: {
        libraryHaskellDepends = [ base deiko-config exceptions text ];
        testHaskellDepends = [ base deiko-config tasty tasty-hunit text ];
        description = "derive typeclass instances for decoding types from HOCON conf";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61459,7 +61459,7 @@ self: {
          base containers directory hedgehog ini text unordered-containers
        ];
        description = "A library for simple INI-based configuration files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "config-manager" = callPackage
@@ -61480,7 +61480,7 @@ self: {
          text time unordered-containers
        ];
        description = "Configuration management";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "config-parser" = callPackage
@@ -61492,8 +61492,8 @@ self: {
        libraryHaskellDepends = [ base parsec text ];
        testHaskellDepends = [ base extra hspec lens parsec text ];
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61511,8 +61511,8 @@ self: {
        ];
        testHaskellDepends = [ base config-value text ];
        description = "Schema definitions for the config-value package";
-       license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.isc;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "config-select" = callPackage
@@ -61527,8 +61527,8 @@ self: {
          base directory filepath unix vty-menu
        ];
        description = "A small program for swapping out dot files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61543,8 +61543,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base text ];
        description = "Simple, layout-based value language similar to YAML or JSON";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "config-value-getopt" = callPackage
@@ -61557,8 +61557,8 @@ self: {
        editedCabalFile = "1b5wfbqjjx6y8ll5h3vp2cmcdrcnjd3295y8ykd25yjx6f3swsja";
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61587,8 +61587,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "parser for config files, shell variables, command line args";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61600,8 +61600,8 @@ self: {
        sha256 = "1jqc5xpbxrlnpxk2yci861gpxl5c9vm9lffchrpp1hk8ag5wkxk1";
        libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61633,7 +61633,7 @@ self: {
          unordered-containers yaml
        ];
        description = "Tools for specifying and parsing configurations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "configurator" = callPackage
@@ -61655,7 +61655,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Configuration management";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "configurator-export" = callPackage
@@ -61672,7 +61672,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Pretty printer and exporter for configurations from the \"configurator\" library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "configurator-ng" = callPackage
@@ -61695,8 +61695,8 @@ self: {
          test-framework-hunit text
        ];
        description = "The next generation of configuration management";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61717,7 +61717,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Reduced parser for configurator-ng config files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "confsolve" = callPackage
@@ -61735,8 +61735,8 @@ self: {
          time unordered-containers
        ];
        description = "A command line tool for resolving conflicts of file synchronizers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61748,8 +61748,8 @@ self: {
        sha256 = "1pj4kby5pba1xfz2fvv2lij7h2i8crf3qkhgs3rp4ziay0jkg18v";
        libraryHaskellDepends = [ array base containers ];
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61761,7 +61761,7 @@ self: {
        sha256 = "1is3j61ra1whjpm8rq89yj9rscqj1ipgqlnh1nwvyzi2nggl06ya";
        libraryHaskellDepends = [ base containers random ];
        description = "Sparse matrix linear-equation solver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "conjure" = callPackage
@@ -61781,8 +61781,8 @@ self: {
          old-time parsec pretty random stm unix
        ];
        description = "A BitTorrent client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61800,8 +61800,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Tools for functors from Hask^k to Hask";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61816,8 +61816,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
        description = "A logger for a concurrent program";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61837,7 +61837,7 @@ self: {
          socks tls x509 x509-store x509-system x509-validation
        ];
        description = "Simple and easy network connections API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "connection-pool" = callPackage
@@ -61854,7 +61854,7 @@ self: {
          streaming-commons time transformers-base
        ];
        description = "Connection pool built on top of resource-pool and streaming-commons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "connection-string" = callPackage
@@ -61870,8 +61870,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest text ];
        description = "A library for parsing connection strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61888,8 +61888,8 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog ];
        description = "Orders, Galois connections, and lattices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61907,8 +61907,8 @@ self: {
        ];
        testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61926,8 +61926,8 @@ self: {
          parsec parsec-extra split transformers unix utility-ht
        ];
        description = "Interpret the command line and a config file as commands and options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61939,7 +61939,7 @@ self: {
        sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw";
        libraryHaskellDepends = [ base ];
        description = "console user prompts";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "console-style" = callPackage
@@ -61950,7 +61950,7 @@ self: {
        sha256 = "0zxxs59bzgf81d3ww285znmmciij3rswfgyc89ngxb6p86l8x0bd";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Styled console text output using ANSI escape sequences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "const-math-ghc-plugin" = callPackage
@@ -61962,8 +61962,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc ];
        testHaskellDepends = [ base directory process ];
        description = "Compiler plugin for constant math elimination";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61975,7 +61975,7 @@ self: {
        sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd";
        libraryHaskellDepends = [ attoparsec base bytestring vector ];
        description = "Parse ByteStrings of a prescribed length";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constr-eq" = callPackage
@@ -61986,8 +61986,8 @@ self: {
        sha256 = "0vk3cz6897vjnn1q7y1sqxy42ii4pq5h7jxw1zyybi99p6c4vgm6";
        libraryHaskellDepends = [ base ];
        description = "Equality by only Constructor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -61999,7 +61999,7 @@ self: {
        sha256 = "00bd12gkv5yrqn52dyw3yjk2yind3m6d11k2d517gxanq9jqyx2c";
        libraryHaskellDepends = [ base ];
        description = "Generalization of standard Functor, Foldable, and Traversable classes";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "constrained-categories" = callPackage
@@ -62014,8 +62014,8 @@ self: {
          base contravariant fail semigroups tagged trivial-constraint void
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62035,8 +62035,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constrained Categories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62049,8 +62049,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dynamic typing with retained constraints";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62074,8 +62074,8 @@ self: {
          smallcheck transformers vector
        ];
        description = "Typeclasses and instances for monads with constraints";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62089,7 +62089,7 @@ self: {
        editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj";
        libraryHaskellDepends = [ base ];
        description = "Normalised Deep Embeddings for Constrained Type-Class Instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constrained-platform-instances" = callPackage
@@ -62102,7 +62102,7 @@ self: {
          array base constrained containers vector
        ];
        description = "Instances of standard platform types for 'constrained' package";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "constraint" = callPackage
@@ -62115,7 +62115,7 @@ self: {
        editedCabalFile = "0ivca43m1lqi75462z4hacvzs27whqzjnby7y7jjji8kqaw8wlda";
        libraryHaskellDepends = [ base category unconstrained ];
        description = "Reified constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraint-classes" = callPackage
@@ -62126,7 +62126,7 @@ self: {
        sha256 = "08b9rsvrmwkb1gl3x7d24cpghfband7cgzw4ldvxzjqvgmnyf9jy";
        libraryHaskellDepends = [ base constraints transformers ];
        description = "Various typeclasses using ConstraintKinds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraint-manip" = callPackage
@@ -62137,8 +62137,8 @@ self: {
        sha256 = "1kxg2iid906rw53r12rha8q3031ixdi3wlviprswig911x9c0zbk";
        libraryHaskellDepends = [ base indextype ];
        description = "Some conviencience type functions for manipulating constraints";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62150,7 +62150,7 @@ self: {
        sha256 = "1v1m5vvicjmmz7mdp6fqf75fi2vf0hy25fyxgxpd4d7fbbyjvnh1";
        libraryHaskellDepends = [ base category constraint reflection ];
        description = "Constraint reflection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraint-tuples" = callPackage
@@ -62161,7 +62161,7 @@ self: {
        sha256 = "16f9y0q771f3mc38g8jpr875c8grjav6sg9lwbhg7nmcvcczwqk2";
        libraryHaskellDepends = [ base ];
        description = "Partially applicable constraint tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraints" = callPackage
@@ -62180,7 +62180,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Constraint manipulation";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "constraints-deriving" = callPackage
@@ -62201,7 +62201,7 @@ self: {
          base bytestring filepath ghc ghc-paths path path-io
        ];
        description = "Manipulating constraints and deriving class instances programmatically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constraints-emerge" = callPackage
@@ -62217,8 +62217,8 @@ self: {
        ];
        testHaskellDepends = [ base constraints hspec transformers ];
        description = "Defer instance lookups until runtime";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62235,7 +62235,7 @@ self: {
        libraryHaskellDepends = [ base constraints template-haskell ];
        executableHaskellDepends = [ aeson base constraints ];
        description = "Utility package for constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constrictor" = callPackage
@@ -62246,7 +62246,7 @@ self: {
        sha256 = "17vdyc2r9fgblh2pjwdrya7iyrb83ay09zhpfvn80rrrj3d2nd8x";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "strict versions of many things in base";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "construct" = callPackage
@@ -62272,7 +62272,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Haskell version of the Construct library for easy specification of file formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "constructible" = callPackage
@@ -62287,8 +62287,8 @@ self: {
          base binary-search complex-generic integer-roots
        ];
        description = "Exact computation with constructible real numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62300,8 +62300,8 @@ self: {
        sha256 = "17ab0vkq5w3zwh76ws7b82wbc0871qdmvrxhxga78h3h0axjiz1x";
        libraryHaskellDepends = [ base QuickCheck type-level ];
        description = "A library of constructive algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62326,8 +62326,8 @@ self: {
          tasty-hunit text transformers typed-process unliftio uuid
        ];
        description = "A consul client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62354,8 +62354,8 @@ self: {
          transformers transformers-base
        ];
        description = "Concurrent PostgreSQL data consumers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62369,8 +62369,8 @@ self: {
          base containers convert lens text vector
        ];
        description = "Containers abstraction and utilities";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62382,7 +62382,7 @@ self: {
        sha256 = "1vlwaf363ymxpq0ry3h1lbn1dlyvf0dmja1q410ks0byz8kc77r7";
        libraryHaskellDepends = [ base vector ];
        description = "Functions for building containers from a known number of elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "container-classes" = callPackage
@@ -62393,7 +62393,7 @@ self: {
        sha256 = "18mx50mp9pv1a33kcwmckz6r4a0j6rlc1165ivn9cj8iiwpmd6pv";
        libraryHaskellDepends = [ base ];
        description = "Generic classes for interacting with different container types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "containers_0_6_4_1" = callPackage
@@ -62404,8 +62404,8 @@ self: {
        sha256 = "0vn43a7bf49pih9b65b359xf3658d96dpm9j35i8x8j61vlrcsid";
        libraryHaskellDepends = [ array base deepseq ];
        description = "Assorted concrete container types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "containers-accelerate" = callPackage
@@ -62423,8 +62423,8 @@ self: {
          hashable-accelerate hedgehog tasty tasty-hedgehog
        ];
        description = "Hashing-based container types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "containers-benchmark" = callPackage
@@ -62441,8 +62441,8 @@ self: {
          base bytestring containers criterion deepseq ghc-prim random
        ];
        description = "Extensive benchmark suite for containers package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62454,7 +62454,7 @@ self: {
        sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Provide orphan NFData instances for containers as needed. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "containers-unicode-symbols" = callPackage
@@ -62465,7 +62465,7 @@ self: {
        sha256 = "006znsrwz3sssvg53mail2xd98hq6y4l83140sd2fzyg4df25js7";
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        description = "Unicode alternatives for common functions and operators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "containers-verified" = callPackage
@@ -62476,8 +62476,8 @@ self: {
        sha256 = "08cwfn71ffvjfp252l3whic90rqyq1jvrk0m9xp54kh3g2rdqma9";
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62502,8 +62502,8 @@ self: {
          hspec memory mtl resourcet temporary
        ];
        description = "Store and retrieve data from an on-disk store";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62519,7 +62519,7 @@ self: {
        testHaskellDepends = [ async base ghc-prim hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Thread-indexed, nested contexts";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "context-free-art" = callPackage
@@ -62542,7 +62542,7 @@ self: {
          base bifunctors blaze-markup blaze-svg HUnit random text text-show
        ];
        description = "Generate art from context-free grammars";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "context-free-grammar" = callPackage
@@ -62565,8 +62565,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Basic algorithms on context-free grammars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62585,7 +62585,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Modify HTTP requests/responses using context";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "context-resource" = callPackage
@@ -62598,7 +62598,7 @@ self: {
        testHaskellDepends = [ async base context hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Thread-safe, pool-compatible resource provider";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "context-stack" = callPackage
@@ -62611,8 +62611,8 @@ self: {
          base classy-prelude mtl unordered-containers
        ];
        description = "An abstraction of a stack and stack-based monadic context";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62631,7 +62631,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Add request-specific (or not!) context to your WAI applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "contiguous" = callPackage
@@ -62654,8 +62654,8 @@ self: {
          base primitive random random-shuffle weigh
        ];
        description = "Unified interface for primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62667,8 +62667,8 @@ self: {
        sha256 = "0jfqxz0v107xw6mjr0wb1abb6v5zd3siy7z0gk9nqcvyacb80z4a";
        libraryHaskellDepends = [ base contiguous primitive ];
        description = "contiguous with bounds checks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62680,8 +62680,8 @@ self: {
        sha256 = "0nnxr6yihb82c7in0hsb7k9jkjccx5040pvxj5gb06ahzz5ls5yn";
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "dft of contiguous memory structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62698,8 +62698,8 @@ self: {
          transformers-base
        ];
        description = "Monads with suspension and arbitrary-spot reentry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62713,7 +62713,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Types and functions for working with continued fractions in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "continued-fractions" = callPackage
@@ -62730,7 +62730,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Continued fractions";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "continuum" = callPackage
@@ -62746,8 +62746,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62762,8 +62762,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62775,7 +62775,7 @@ self: {
        sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br";
        libraryHaskellDepends = [ base ];
        description = "Arrow and contravariant tracers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contracheck-applicative" = callPackage
@@ -62790,7 +62790,7 @@ self: {
          base containers contravariant generics-sop microlens mmorph
        ];
        description = "Validation types/typeclass based on the contravariance";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contravariant" = callPackage
@@ -62801,7 +62801,7 @@ self: {
        sha256 = "1haxsq7jl95gzmbjdr2pgza9b7j0j3f26wwkf494gphz6c76yls4";
        libraryHaskellDepends = [ base StateVar transformers ];
        description = "Contravariant functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contravariant-extras" = callPackage
@@ -62816,7 +62816,7 @@ self: {
          base contravariant template-haskell template-haskell-compat-v0208
        ];
        description = "Extras for the \"contravariant\" package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "control" = callPackage
@@ -62832,8 +62832,8 @@ self: {
          base basic stm template-haskell transformers
        ];
        description = "Class of monad transformers which control operations can be lifted thru";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62845,7 +62845,7 @@ self: {
        sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
        libraryHaskellDepends = [ base ];
        description = "Useful combinators for boolean expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-dotdotdot" = callPackage
@@ -62856,7 +62856,7 @@ self: {
        sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
        libraryHaskellDepends = [ base ];
        description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-dsl" = callPackage
@@ -62874,7 +62874,7 @@ self: {
          base containers doctest doctest-discover temporary
        ];
        description = "An alternative to monads in do-notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-event" = callPackage
@@ -62886,7 +62886,7 @@ self: {
        libraryHaskellDepends = [ base containers stm time ];
        testHaskellDepends = [ base containers stm time ];
        description = "Event scheduling system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-iso" = callPackage
@@ -62901,8 +62901,8 @@ self: {
          base bytestring newtype-generics profunctors text
        ];
        description = "A typeclass for type isomorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62914,8 +62914,8 @@ self: {
        sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
        libraryHaskellDepends = [ attempt base transformers ];
        description = "Monad transformer for attempt. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62932,7 +62932,7 @@ self: {
          transformers-base
        ];
        description = "Explicitly typed, checked exceptions with stack traces";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-exception-monadsfd" = callPackage
@@ -62947,8 +62947,8 @@ self: {
          base control-monad-exception monads-fd transformers
        ];
        description = "Monads-fd instances for the EMT exceptions monad transformer";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -62964,7 +62964,7 @@ self: {
          base control-monad-exception monads-tf transformers
        ];
        description = "Monads-tf instances for the EMT exceptions monad transformer";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-exception-mtl" = callPackage
@@ -62976,7 +62976,7 @@ self: {
        libraryHaskellDepends = [ base control-monad-exception mtl ];
        doHaddock = false;
        description = "MTL instances for the EMT exceptions monad transformer";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-failure" = callPackage
@@ -62987,8 +62987,8 @@ self: {
        sha256 = "1g304wb1fhx81iw2vv7nv6cp2qmy69frwiv3vax85lxw03s4nlkq";
        libraryHaskellDepends = [ base failure transformers ];
        description = "A class for monads which can fail with an error. (deprecated)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63000,8 +63000,8 @@ self: {
        sha256 = "0j9i85vq033789vx2589mfqwk954hqy1wla527ssbyf05k6vkn8j";
        libraryHaskellDepends = [ base failure mtl ];
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63013,7 +63013,7 @@ self: {
        sha256 = "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33";
        libraryHaskellDepends = [ base transformers ];
        description = "Free monads and monad transformers";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-loop" = callPackage
@@ -63024,7 +63024,7 @@ self: {
        sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj";
        libraryHaskellDepends = [ base transformers transformers-base ];
        description = "Simple monad transformer for imperative-style loops";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-monad-omega" = callPackage
@@ -63035,7 +63035,7 @@ self: {
        sha256 = "1zx92zyvv10w61rzwhn1d4kggzmi9hggsyjcdav424280x31wb7n";
        libraryHaskellDepends = [ base ];
        description = "A breadth-first list monad";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "control-monad-queue" = callPackage
@@ -63046,7 +63046,7 @@ self: {
        sha256 = "1dfiys93i7wnbf33dgb324gp57ab5y7pn405hq8iciq2c7kzfa6l";
        libraryHaskellDepends = [ base ];
        description = "Reusable corecursive queues, via continuations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "control-timeout" = callPackage
@@ -63057,7 +63057,7 @@ self: {
        sha256 = "1g1x6c4dafckwcw48v83f3nm2sxv8kynwv8ib236ay913ycgayvg";
        libraryHaskellDepends = [ base containers stm time ];
        description = "Timeout handling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contstuff" = callPackage
@@ -63068,7 +63068,7 @@ self: {
        sha256 = "0rw2bslajjch057fsxf881wi39bsd9y6196j0kb0lz47r0zn8003";
        libraryHaskellDepends = [ base transformers ];
        description = "Fast, easy to use CPS-based monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "contstuff-monads-tf" = callPackage
@@ -63079,8 +63079,8 @@ self: {
        sha256 = "0j4y76ar0m642jxcyrvlrxagawrlq637cvx3fqprw5sl5cslgxh5";
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63092,8 +63092,8 @@ self: {
        sha256 = "0b5vskp1bxqpi4ffcxwjw6kr0jd6n8v8jlhf03p54ckfd5ym4ai6";
        libraryHaskellDepends = [ base contstuff transformers ];
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63105,7 +63105,7 @@ self: {
        sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj";
        libraryHaskellDepends = [ base ];
        description = "Limit operations for converging sequences";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "conversion" = callPackage
@@ -63118,7 +63118,7 @@ self: {
        editedCabalFile = "17hrwyhlcch970vb4gk793xhcpg035n0gxypbjz58vkka04j3d4d";
        libraryHaskellDepends = [ base-prelude ];
        description = "Universal converter between values of different types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conversion-bytestring" = callPackage
@@ -63129,7 +63129,7 @@ self: {
        sha256 = "0ybh702mrwjvm48i03bb5hfiiz5qypyxyz5n14wai0kjn4ks1qwh";
        libraryHaskellDepends = [ base-prelude bytestring conversion ];
        description = "\"Conversion\" instances for the \"bytestring\" library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conversion-case-insensitive" = callPackage
@@ -63140,7 +63140,7 @@ self: {
        sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp";
        libraryHaskellDepends = [ case-insensitive conversion ];
        description = "\"Conversion\" instances for the \"case-insensitive\" library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conversion-text" = callPackage
@@ -63155,7 +63155,7 @@ self: {
          base-prelude bytestring conversion conversion-bytestring text
        ];
        description = "\"Conversion\" instances for the \"text\" library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "conversions" = callPackage
@@ -63176,8 +63176,8 @@ self: {
          source-constraints template-haskell text unliftio-core
        ];
        description = "Injective explicit total and partial conversions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63195,8 +63195,8 @@ self: {
          lens template-haskell text utf8-string
        ];
        description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63220,8 +63220,8 @@ self: {
          pipes-bytestring pipes-csv text vector
        ];
        description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63239,7 +63239,7 @@ self: {
          base bytestring containers mtl old-locale old-time text time
        ];
        description = "Typeclasses and instances for converting between types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "convertible-ascii" = callPackage
@@ -63255,8 +63255,8 @@ self: {
          convertible-text failure text
        ];
        description = "convertible instances for ascii";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63277,8 +63277,8 @@ self: {
          time
        ];
        description = "Typeclasses and instances for converting between types (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63290,7 +63290,7 @@ self: {
        sha256 = "0bdsdq5m4skh3sh6dfz7jrdcsnyg5vb392n6gcqm9s1m0749r4b3";
        libraryHaskellDepends = [ base directory strict ];
        description = "Tiered general-purpose libraries with domain-specific applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cookie" = callPackage
@@ -63310,7 +63310,7 @@ self: {
          text time
        ];
        description = "HTTP cookie parsing and rendering";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cookies" = callPackage
@@ -63323,8 +63323,8 @@ self: {
          base bytestring chronos hashable text time
        ];
        description = "web cookies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63337,8 +63337,8 @@ self: {
        libraryHaskellDepends = [ base lens papa transformers ];
        testHaskellDepends = [ base HUnit lens ];
        description = "A representation of latitude and longitude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63359,8 +63359,8 @@ self: {
        ];
        executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
        description = "A stream DSL for writing embedded C programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63383,8 +63383,8 @@ self: {
          language-c99-simple pretty process QuickCheck
        ];
        description = "A compiler for Copilot targeting C99";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63401,8 +63401,8 @@ self: {
          pretty process
        ];
        description = "Copilot interface to a C model-checker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63414,7 +63414,7 @@ self: {
        sha256 = "0l13zqycini9fkiy90i0dzi831lqv8lwpdk0dzrk9r0c545iy2ga";
        libraryHaskellDepends = [ base dlist mtl pretty ];
        description = "An intermediate representation for Copilot";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "copilot-language" = callPackage
@@ -63430,8 +63430,8 @@ self: {
          ghc-prim mtl
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63447,8 +63447,8 @@ self: {
          array base containers copilot-language data-reify mtl parsec
        ];
        description = "Libraries for the Copilot language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63464,8 +63464,8 @@ self: {
          base containers copilot-core directory filepath pretty sbv
        ];
        description = "A compiler for CoPilot targeting SBV";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63483,8 +63483,8 @@ self: {
          directory mtl parsec pretty process random transformers xml
        ];
        description = "k-induction for Copilot";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63504,8 +63504,8 @@ self: {
        ];
        testHaskellDepends = [ base hlint ];
        description = "Haskell interface to the Fedora Copr system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63532,7 +63532,7 @@ self: {
          which
        ];
        description = "Yet another shell monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "core" = callPackage
@@ -63543,8 +63543,8 @@ self: {
        sha256 = "1fqgfbd3in8l84250kda67paakz4sr2ywf5qzsy403546w7q9ccz";
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63564,7 +63564,7 @@ self: {
        executableHaskellDepends = [ array base ];
        executableToolDepends = [ alex happy ];
        description = "compile your own mini functional language with Core";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "core-data" = callPackage
@@ -63581,7 +63581,7 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "Convenience wrappers around common data structures and encodings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "core-haskell" = callPackage
@@ -63596,8 +63596,8 @@ self: {
          base haskeline haskell-src-exts hint
        ];
        description = "A subset of Haskell using in UCC for teaching purpose";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63619,7 +63619,7 @@ self: {
          transformers unix
        ];
        description = "Opinionated Haskell Interoperability";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "core-text" = callPackage
@@ -63636,7 +63636,7 @@ self: {
          prettyprinter template-haskell text text-short
        ];
        description = "A rope type based on a finger tree over UTF-8 fragments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "corebot-bliki" = callPackage
@@ -63662,8 +63662,8 @@ self: {
          yesod
        ];
        description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63681,7 +63681,7 @@ self: {
        executableHaskellDepends = [ base process unix ];
        testHaskellDepends = [ base process ];
        description = "Write your main like it can call itself back";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "corenlp-parser" = callPackage
@@ -63701,8 +63701,8 @@ self: {
        ];
        librarySystemDepends = [ rocksdb ];
        description = "Launches CoreNLP and parses the JSON output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) rocksdb;};
 
@@ -63725,7 +63725,7 @@ self: {
        ];
        description = "classy optical monadic state";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "coroutine-enumerator" = callPackage
@@ -63737,7 +63737,7 @@ self: {
        libraryHaskellDepends = [ base enumerator monad-coroutine ];
        description = "Bridge between the monad-coroutine and enumerator packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63750,7 +63750,7 @@ self: {
        libraryHaskellDepends = [ base iteratee monad-coroutine ];
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63762,8 +63762,8 @@ self: {
        sha256 = "1hgpy3fswhars994mz3756firiy0g5brx7w9is4nfhg8mr5vf3yg";
        libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63782,8 +63782,8 @@ self: {
          vector
        ];
        description = "A CouchDB view server for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63810,8 +63810,8 @@ self: {
        ];
        testToolDepends = [ couchdb ];
        description = "A modern, lightweight, complete client for CouchDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -63840,8 +63840,8 @@ self: {
          unordered-containers
        ];
        description = "Couch DB client library using http-conduit and aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63869,8 +63869,8 @@ self: {
          utf8-string vector
        ];
        description = "Couch DB client library using http-enumerator and aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63882,7 +63882,7 @@ self: {
        sha256 = "1az2vr1rjq4pfgzswwbwgfq4kcb8kq759vn5kl7ghzaqr7b6vkgx";
        libraryHaskellDepends = [ base ];
        description = "Bijective mappings between values and possibly infinite prefixes of [0..]";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "countable" = callPackage
@@ -63898,7 +63898,7 @@ self: {
          base bytestring silently tasty tasty-golden tasty-hunit
        ];
        description = "Countable, Searchable, Finite, Empty classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "countable-inflections" = callPackage
@@ -63914,8 +63914,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Countable Text Inflections";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63927,8 +63927,8 @@ self: {
        sha256 = "0jc34nrbzxzilrr1s2k7krrp9g5xc40hpf2srw6mccfrcsyacsnc";
        libraryHaskellDepends = [ base containers ];
        description = "An object frequency counter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63949,7 +63949,7 @@ self: {
          base QuickCheck quickcheck-classes tasty tasty-quickcheck
        ];
        description = "Country data type and functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "country-codes" = callPackage
@@ -63965,8 +63965,8 @@ self: {
        libraryHaskellDepends = [ aeson base deepseq shakespeare text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
        description = "ISO 3166 country codes and i18n names";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -63991,8 +63991,8 @@ self: {
          test-framework test-framework-hunit
        ];
        description = "A message-passing library for simplifying network applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64012,8 +64012,8 @@ self: {
          optparse-applicative process stm text time unix
        ];
        description = "Simple and flexible CI system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64026,8 +64026,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Exhaustivity Checking Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64041,7 +64041,7 @@ self: {
          base groups primitive refined semirings
        ];
        description = "Coya monoids";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cparsing" = callPackage
@@ -64057,8 +64057,8 @@ self: {
          split template-haskell transformers
        ];
        description = "A simple C++ parser with preprocessor features. C++ refactorings included.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64078,8 +64078,8 @@ self: {
          resourcet
        ];
        description = "Conduit-based CPIO";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64110,8 +64110,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
        description = "Build tool for C";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64129,8 +64129,8 @@ self: {
        ];
        librarySystemDepends = [ cplex ];
        description = "high-level CPLEX interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) cplex;};
 
   "cplusplus-th" = callPackage
@@ -64146,8 +64146,8 @@ self: {
        ];
        testHaskellDepends = [ base process QuickCheck ];
        description = "C++ Foreign Import Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64161,7 +64161,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Bindings for C++ demangling routines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cpphs" = callPackage
@@ -64194,7 +64194,7 @@ self: {
          base bytestring criterion crypto-random mtl
        ];
        description = "Crypto Pseudo Random Number Generator using AES in counter mode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cprng-aes-effect" = callPackage
@@ -64212,8 +64212,8 @@ self: {
          extensible-effects
        ];
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64228,7 +64228,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers directory parallel ];
        description = "Symbolic cryptographic protocol analyzer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cpu" = callPackage
@@ -64242,7 +64242,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Cpu information and properties helpers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cpuid" = callPackage
@@ -64266,7 +64266,7 @@ self: {
        sha256 = "0mans1i26w3rl1vvf9isn8y6lvmn9dlf2c0znbgjxj605jcy7cyi";
        libraryHaskellDepends = [ attoparsec base bytestring deepseq ];
        description = "Haskell Library for Checking CPU Information";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cpuperf" = callPackage
@@ -64279,8 +64279,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl process ];
        description = "Modify the cpu frequency on OpenBSD systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64296,8 +64296,8 @@ self: {
        testHaskellDepends = [ base text ];
        testPkgconfigDepends = [ python3 ];
        description = "Bindings for libpython";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) python3;};
 
@@ -64320,7 +64320,7 @@ self: {
        ];
        description = "Cassandra CQL binary protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cql-io" = callPackage
@@ -64347,8 +64347,8 @@ self: {
        ];
        doHaddock = false;
        description = "Cassandra CQL client";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64360,8 +64360,8 @@ self: {
        sha256 = "14mr1i7g61h25fn2xa02iyzq1mxcgzkisfmiakdakiya4zxjk10f";
        libraryHaskellDepends = [ base bytestring cql-io tinylog ];
        description = "Tinylog integration for cql-io";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64374,7 +64374,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Command-Query Responsibility Segregation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cqrs-core" = callPackage
@@ -64390,8 +64390,8 @@ self: {
          uuid-types
        ];
        description = "Command-Query Responsibility Segregation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64413,8 +64413,8 @@ self: {
          transformers uuid-types wai-extra wai-middleware-static warp
        ];
        description = "Example for cqrs package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64431,8 +64431,8 @@ self: {
        ];
        testHaskellDepends = [ base cqrs-core cqrs-testkit hspec random ];
        description = "Memory backend for the cqrs package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64456,8 +64456,8 @@ self: {
          pg-harness-client postgresql-libpq random resource-pool uuid-types
        ];
        description = "PostgreSQL backend for the cqrs package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64478,8 +64478,8 @@ self: {
          text transformers
        ];
        description = "SQLite3 backend for the cqrs package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64496,8 +64496,8 @@ self: {
          transformers
        ];
        description = "Command-Query Responsibility Segregation Test Support";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64515,8 +64515,8 @@ self: {
          lifted-base random transformers uuid-types
        ];
        description = "Command-Query Responsibility Segregation Test Support";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64529,7 +64529,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Command-Query Responsibility Segregation. Modules for the basic types.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cr" = callPackage
@@ -64547,8 +64547,8 @@ self: {
          base cmdargs directory process shelly text transformers unix
        ];
        description = "Code review tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64562,7 +64562,7 @@ self: {
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {crack = null;};
 
@@ -64577,7 +64577,7 @@ self: {
        libraryHaskellDepends = [ array base FloatingHex ];
        executableHaskellDepends = [ array base FloatingHex ];
        description = "Crack various integer, floating-point data formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "craft" = callPackage
@@ -64608,8 +64608,8 @@ self: {
          base hspec hspec-megaparsec megaparsec QuickCheck
        ];
        description = "A UNIX configuration management library in Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64623,8 +64623,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base colour mtl vector-space ];
        description = "2D graphics library with integrated TikZ output";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64636,8 +64636,8 @@ self: {
        sha256 = "16in87l2v49k785fldm7fvprywg0v497kz29jr22y91q5j5gnm4z";
        libraryHaskellDepends = [ base cairo craftwerk mtl ];
        description = "Cairo backend for Craftwerk";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64655,8 +64655,8 @@ self: {
          base cairo containers craftwerk craftwerk-cairo gtk mtl
        ];
        description = "Gtk UI for Craftwerk";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64677,8 +64677,8 @@ self: {
          tagsoup text time
        ];
        description = "Simulation user crawl paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64711,8 +64711,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "HTTP Racing Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64730,8 +64730,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Implements various Cyclic Redundancy Checks (CRC)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64743,8 +64743,8 @@ self: {
        sha256 = "15x3xwq2vyg474m09jak1c2zx9w5acpfjgmy5jj4asxj33z9n7bz";
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64756,7 +64756,7 @@ self: {
        sha256 = "0x943wmcbj679kj7q2a2ipjycq17ajm71m487vkb8b6gdrdy8f2z";
        libraryHaskellDepends = [ array base ];
        description = "Compute CRC16 checksums using a lookup table";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crc32c" = callPackage
@@ -64773,7 +64773,7 @@ self: {
          base bytestring hspec hspec-core QuickCheck
        ];
        description = "Haskell bindings for crc32c";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crdt" = callPackage
@@ -64789,8 +64789,8 @@ self: {
          safe stm time vector
        ];
        description = "Conflict-free replicated data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64809,8 +64809,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Garbage collected event folding CRDT";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64836,8 +64836,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Framework for artificial life experiments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64857,8 +64857,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "Library to access secure credential storage providers";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64880,7 +64880,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Secure Credentials Storage and Distribution";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "credentials-cli" = callPackage
@@ -64905,7 +64905,7 @@ self: {
        ];
        description = "Secure Credentials Administration";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "crf-chain1" = callPackage
@@ -64922,8 +64922,8 @@ self: {
          parallel random sgd vector vector-binary-instances vector-th-unbox
        ];
        description = "First-order, linear-chain conditional random fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64943,8 +64943,8 @@ self: {
          vector-binary vector-th-unbox
        ];
        description = "First-order, constrained, linear-chain conditional random fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64962,8 +64962,8 @@ self: {
          logfloat monad-codec parallel sgd vector vector-binary
        ];
        description = "Second-order, generic, constrained, linear conditional random fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -64982,8 +64982,8 @@ self: {
          vector-binary vector-th-unbox
        ];
        description = "Second-order, tiered, constrained, linear conditional random fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65012,8 +65012,8 @@ self: {
          vector
        ];
        description = "Crit-bit maps and sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65051,7 +65051,7 @@ self: {
          tasty-quickcheck vector
        ];
        description = "Robust, reliable performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "criterion-compare" = callPackage
@@ -65072,8 +65072,8 @@ self: {
          data-default filepath lens lucid optparse-applicative text vector
        ];
        description = "A simple tool for visualising differences in Criterion benchmark results";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65089,7 +65089,7 @@ self: {
          aeson base base-compat binary containers deepseq vector
        ];
        description = "Criterion measurement functionality and associated types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "criterion-plus" = callPackage
@@ -65116,8 +65116,8 @@ self: {
          transformers transformers-base vector
        ];
        description = "Enhancement of the \"criterion\" benchmarking library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65136,8 +65136,8 @@ self: {
          aeson base blaze-html blaze-markup bytestring containers filepath
        ];
        description = "Convert criterion output to HTML reports";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65154,8 +65154,8 @@ self: {
          unix
        ];
        description = "CRIU RPC client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65169,8 +65169,8 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
        libraryPkgconfigDepends = [ protobuf ];
        description = "Criu RPC protocol buffer types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) protobuf;};
 
@@ -65186,8 +65186,8 @@ self: {
        libraryHaskellDepends = [ base containers free mtl text ];
        testHaskellDepends = [ base containers hedgehog hspec mtl ];
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65199,8 +65199,8 @@ self: {
        sha256 = "1fgsmf2k0v1j7b3gv06q9c65410qa2ivl59rwkm7j931wsymsg26";
        libraryHaskellDepends = [ base digits QuickCheck safe ];
        description = "An implementation of Douglas Crockford's base32 encoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65219,8 +65219,8 @@ self: {
          mersenne-random-pure64 mtl parallel
        ];
        description = "An offline renderer supporting ray tracing and photon mapping";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65243,7 +65243,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ attoparsec base criterion text time ];
        description = "Cron datatypes and Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cron-compat" = callPackage
@@ -65264,8 +65264,8 @@ self: {
          text time transformers
        ];
        description = "Cron datatypes and Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65283,7 +65283,7 @@ self: {
          text transformers unordered-containers vector
        ];
        description = "Another bloated standard library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cruncher-types" = callPackage
@@ -65295,8 +65295,8 @@ self: {
        libraryHaskellDepends = [ aeson base containers lens text ];
        testHaskellDepends = [ base hlint ];
        description = "Request and Response types for Eval.so's API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65315,8 +65315,8 @@ self: {
          transformers unix
        ];
        description = "A runghc replacement with transparent caching";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65338,8 +65338,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65357,7 +65357,7 @@ self: {
          base bytestring cereal entropy tagged transformers
        ];
        description = "A generic interface for cryptographic operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-api-tests" = callPackage
@@ -65376,7 +65376,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A test framework and KATs for cryptographic operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-cipher-benchmarks" = callPackage
@@ -65392,8 +65392,8 @@ self: {
          securemem
        ];
        description = "Generic cryptography cipher benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65416,7 +65416,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Generic cryptography cipher tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-cipher-types" = callPackage
@@ -65428,7 +65428,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base byteable bytestring securemem ];
        description = "Generic cryptography cipher types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-classical" = callPackage
@@ -65445,8 +65445,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "An educational tool for studying classical cryptography schemes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65468,8 +65468,8 @@ self: {
          cryptocipher cryptohash-cryptoapi hspec skein transformers
        ];
        description = "Conduit interface for cryptographic operations (from crypto-api)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65491,7 +65491,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-keys-ssh" = callPackage
@@ -65504,8 +65504,8 @@ self: {
          base base64-bytestring binary bytestring
        ];
        description = "Like crypto-pubkey-openssh but not dependent on any specific crypto library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65526,8 +65526,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Multihash library on top of cryptonite crypto library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65551,7 +65551,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion mtl ];
        description = "Cryptographic numbers: functions and algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-pubkey" = callPackage
@@ -65577,7 +65577,7 @@ self: {
          cryptohash deepseq mtl
        ];
        description = "Public Key cryptography";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-pubkey-openssh" = callPackage
@@ -65600,8 +65600,8 @@ self: {
          QuickCheck tasty tasty-quickcheck temporary
        ];
        description = "OpenSSH keys decoder/encoder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65613,7 +65613,7 @@ self: {
        sha256 = "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby";
        libraryHaskellDepends = [ asn1-encoding asn1-types base ];
        description = "Generic cryptography Public keys algorithm types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-random" = callPackage
@@ -65626,7 +65626,7 @@ self: {
        editedCabalFile = "1ax1iafbbqkcrvjnnxlvqh2zgpx8xzcbxl6l870207bpzwrja2f1";
        libraryHaskellDepends = [ base bytestring securemem unix vector ];
        description = "Simple cryptographic random related types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-random-api" = callPackage
@@ -65637,7 +65637,7 @@ self: {
        sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
        libraryHaskellDepends = [ base bytestring entropy ];
        description = "Simple random generators API for cryptography related code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-random-effect" = callPackage
@@ -65655,8 +65655,8 @@ self: {
          transformers
        ];
        description = "A random effect using crypto-random";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65673,7 +65673,7 @@ self: {
          transformers-base
        ];
        description = "Cryptographic random number generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-simple" = callPackage
@@ -65687,8 +65687,8 @@ self: {
          base bytestring cryptonite hspec QuickCheck
        ];
        description = "A simple high level encryption interface based on cryptonite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65710,7 +65710,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Easy-and-safe-to-use high-level cryptography based on Sodium";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "crypto-token" = callPackage
@@ -65721,7 +65721,7 @@ self: {
        sha256 = "1djn3fhxm639qarjjrax60p3kva54baj8sdcdlng02034kjzx6i6";
        libraryHaskellDepends = [ array base cryptonite memory ];
        description = "crypto tokens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "crypto-totp" = callPackage
@@ -65736,7 +65736,7 @@ self: {
          base bytestring cereal containers cryptohash tagged unix
        ];
        description = "Provides generation and verification services for time-based one-time keys";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptocipher" = callPackage
@@ -65752,8 +65752,8 @@ self: {
          cipher-rc4 crypto-cipher-types
        ];
        description = "Symmetrical block and stream ciphers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65772,8 +65772,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-expectations MissingH ];
        description = "Haskell wrapper for the cryptocompare API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65797,8 +65797,8 @@ self: {
          tasty-hunit text transformers
        ];
        description = "Interledger Crypto-Conditions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65820,7 +65820,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base byteable bytestring criterion ];
        description = "collection of crypto hashes, fast, pure and practical";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-conduit" = callPackage
@@ -65836,7 +65836,7 @@ self: {
          transformers
        ];
        description = "cryptohash conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-cryptoapi" = callPackage
@@ -65852,7 +65852,7 @@ self: {
          base bytestring cereal crypto-api cryptonite memory tagged
        ];
        description = "Crypto-api interfaces for cryptohash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-md5" = callPackage
@@ -65872,7 +65872,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical MD5 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha1" = callPackage
@@ -65892,7 +65892,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical SHA-1 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha256" = callPackage
@@ -65914,7 +65914,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical SHA-256 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha512" = callPackage
@@ -65934,7 +65934,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical SHA-512 implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptoids" = callPackage
@@ -65953,8 +65953,8 @@ self: {
          directory exceptions filepath memory
        ];
        description = "Reversable and secure encoding of object ids as a bytestring";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65968,8 +65968,8 @@ self: {
        editedCabalFile = "0c3cq648sh5cpj0isknhayamzgzv8avixxfpzr4riags70jr28ld";
        libraryHaskellDepends = [ base cryptoids-types exceptions ];
        description = "Typeclass-based interface to cryptoids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -65987,8 +65987,8 @@ self: {
          aeson base binary deepseq hashable http-api-data path-pieces
        ];
        description = "Shared types for encrypting internal object identifiers before exposure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66025,8 +66025,8 @@ self: {
          base criterion deepseq directory filepath sbv text
        ];
        description = "Cryptol: The Language of Cryptography";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66049,7 +66049,7 @@ self: {
          base bytestring deepseq gauge memory random
        ];
        description = "Cryptography Primitives sink";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptonite-conduit" = callPackage
@@ -66072,7 +66072,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "cryptonite conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptonite-openssl" = callPackage
@@ -66092,7 +66092,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Crypto stuff using OpenSSL cryptographic library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "cryptostore" = callPackage
@@ -66113,7 +66113,7 @@ self: {
          tasty-hunit tasty-quickcheck x509
        ];
        description = "Serialization of cryptographic data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cryptsy-api" = callPackage
@@ -66134,8 +66134,8 @@ self: {
          unordered-containers vector
        ];
        description = "Bindings for Cryptsy cryptocurrency exchange API";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66147,8 +66147,8 @@ self: {
        sha256 = "14mh098kgckncips17bdsbg08q78xk1114174zq860z4znmc1gxv";
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66176,8 +66176,8 @@ self: {
        sha256 = "123x10ircbj8lrsqapf6cb9b3ibjgp1q8l862a3i6i0ak7ash49f";
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for common subexpression elimination";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66209,8 +66209,8 @@ self: {
          base criterion simple-vec3 strict vector
        ];
        description = "Analytical CSG (Constructive Solid Geometry) library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66226,7 +66226,7 @@ self: {
          base csound-expression csound-sampler sharc-timbre transformers
        ];
        description = "a gallery of Csound instruments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-controllers" = callPackage
@@ -66237,7 +66237,7 @@ self: {
        sha256 = "1p2fa00djwyrv7fdrngawmk3r41q6a4mlsqgdm4qajmivbj0sg9m";
        libraryHaskellDepends = [ base csound-expression ];
        testHaskellDepends = [ base csound-expression ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-expression" = callPackage
@@ -66256,7 +66256,7 @@ self: {
          process temporal-media transformers
        ];
        description = "library to make electronic music";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-expression-dynamic" = callPackage
@@ -66273,7 +66273,7 @@ self: {
          deriving-compat hashable transformers wl-pprint
        ];
        description = "dynamic core for csound-expression library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-expression-opcodes" = callPackage
@@ -66288,7 +66288,7 @@ self: {
          base csound-expression-dynamic csound-expression-typed transformers
        ];
        description = "opcodes for the library csound-expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-expression-typed" = callPackage
@@ -66308,7 +66308,7 @@ self: {
          NumInstances temporal-media transformers wl-pprint
        ];
        description = "typed core for the library csound-expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csound-sampler" = callPackage
@@ -66319,7 +66319,7 @@ self: {
        sha256 = "0mi7w39adkn5l1h05arfap3c0ddb8j65wv96i3jrswpc3ljf3b2y";
        libraryHaskellDepends = [ base csound-expression transformers ];
        description = "A musical sampler based on Csound";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csp" = callPackage
@@ -66349,8 +66349,8 @@ self: {
          base directory filepath haskeline libcspm mtl
        ];
        description = "A command line type checker for CSPM files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66362,8 +66362,8 @@ self: {
        sha256 = "029r1a6w76v9nqf70w3p5yqjmmnba4xyi3ldx10wl526d247r9r9";
        libraryHaskellDepends = [ base containers pretty ];
        description = "AST and pretty printer for CSPm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66375,8 +66375,8 @@ self: {
        sha256 = "150gdsf059x658z6cbclrydzbynw06nhrpf4i1l9gwb6siarvjv9";
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66393,8 +66393,8 @@ self: {
          shakespeare text
        ];
        description = "Defining and manipulating css easing strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66417,8 +66417,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2 text
        ];
        description = "Parsing, rendering and manipulating css selectors in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66440,7 +66440,7 @@ self: {
          base criterion deepseq directory scientific text
        ];
        description = "High-performance CSS tokenizer and serializer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "css-text" = callPackage
@@ -66452,7 +66452,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
        description = "CSS parser and renderer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "csv" = callPackage
@@ -66463,7 +66463,7 @@ self: {
        sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c";
        libraryHaskellDepends = [ base filepath parsec ];
        description = "CSV loader and dumper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "csv-conduit" = callPackage
@@ -66489,7 +66489,7 @@ self: {
          test-framework test-framework-hunit text transformers vector
        ];
        description = "A flexible, fast, conduit-based CSV parser library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "csv-enumerator" = callPackage
@@ -66506,8 +66506,8 @@ self: {
          directory enumerator safe transformers unix-compat
        ];
        description = "A flexible, fast, enumerator-based CSV parser library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66526,7 +66526,7 @@ self: {
        ];
        description = "A collection of CSV tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66538,7 +66538,7 @@ self: {
        sha256 = "1p5waqb9sj3xjrc01isqbii282sxs865ciyy03f7kzi66as5j6g9";
        libraryHaskellDepends = [ base containers csv filepath process ];
        description = "Scripts for manipulating tables stored as CSV files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "csv-to-qif" = callPackage
@@ -66559,7 +66559,7 @@ self: {
          split spreadsheet
        ];
        description = "A small program that will read csv files and create qif files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ctemplate" = callPackage
@@ -66571,8 +66571,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ ctemplate ];
        description = "Binding to the Google ctemplate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ctemplate = null;};
 
@@ -66584,8 +66584,8 @@ self: {
        sha256 = "0sqrg04zlwq62jggjvrd1dq7a2alwx2190w6b19d3jn51n0s907m";
        libraryHaskellDepends = [ array base ];
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66602,8 +66602,8 @@ self: {
        libraryHaskellDepends = [ array base chatty-text chatty-utils ];
        executableHaskellDepends = [ array base chatty-text chatty-utils ];
        description = "A programming language for text modification";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66627,7 +66627,7 @@ self: {
          random-shuffle stm transformers unordered-containers
        ];
        description = "Non-blocking concurrent map";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cube" = callPackage
@@ -66644,8 +66644,8 @@ self: {
          base bytestring cereal containers hspec STL
        ];
        description = "Cubic DSL for 3D printing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66664,7 +66664,7 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Implementation of Univalence in Cubical Sets";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cubicbezier" = callPackage
@@ -66682,7 +66682,7 @@ self: {
        ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Efficient manipulating of 2D cubic bezier curves";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cubicspline" = callPackage
@@ -66693,7 +66693,7 @@ self: {
        sha256 = "0ycv395qskjw8xryzam6skc92m4iixf6065grvfh23avlsffsv2v";
        libraryHaskellDepends = [ base hmatrix safe ];
        description = "Natural cubic spline interpolation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cublas" = callPackage
@@ -66710,8 +66710,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to the CUDA BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cuboid" = callPackage
@@ -66724,8 +66724,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66748,8 +66748,8 @@ self: {
        ];
        doHaddock = false;
        description = "Haskell Implementation of Cuckoo Filters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66776,7 +66776,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck time
        ];
        description = "Pure and impure Cuckoo Filter";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cuda" = callPackage
@@ -66796,8 +66796,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base pretty ];
        description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cudd" = callPackage
@@ -66810,7 +66810,7 @@ self: {
        librarySystemDepends = [ cudd ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the CUDD binary decision diagrams library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) cudd;};
 
   "cue-sheet" = callPackage
@@ -66835,7 +66835,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Support for construction, rendering, and parsing of CUE sheets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cufft" = callPackage
@@ -66852,8 +66852,8 @@ self: {
        libraryHaskellDepends = [ base cuda ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for the CUFFT library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "curl" = callPackage
@@ -66867,7 +66867,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ curl ];
        description = "Haskell binding to libcurl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) curl;};
 
   "curl-aeson" = callPackage
@@ -66878,7 +66878,7 @@ self: {
        sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx";
        libraryHaskellDepends = [ aeson base curl text utf8-string ];
        description = "Communicate with HTTP service using JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curl-cookiejar" = callPackage
@@ -66893,7 +66893,7 @@ self: {
          attoparsec base bytestring conduit conduit-extra http-client time
        ];
        description = "Parsing and pretty-printing of cURL/wget cookie jars";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "curl-runnings" = callPackage
@@ -66925,8 +66925,8 @@ self: {
          raw-strings-qq text
        ];
        description = "A framework for declaratively writing curl based API tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -66942,7 +66942,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "bindings to libcurl, the multiprotocol file transfer library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "currencies" = callPackage
@@ -66954,7 +66954,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "Currencies representation, pretty printing and conversion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "currency" = callPackage
@@ -66969,7 +66969,7 @@ self: {
        ];
        description = "Types representing standard and non-standard currencies";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "currency-codes" = callPackage
@@ -66985,8 +66985,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base bson hspec QuickCheck ];
        description = "ISO-4217 Currency Codes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67002,8 +67002,8 @@ self: {
          aeson base http-conduit text unordered-containers
        ];
        description = "Typesafe currency conversion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67015,7 +67015,7 @@ self: {
        sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5";
        libraryHaskellDepends = [ base old-locale process split ];
        description = "Get the current system locale in System.Locale format";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "curry" = callPackage
@@ -67028,7 +67028,7 @@ self: {
        editedCabalFile = "15blz8y7jvxznm3j6sak4kcqq5c4apd4fkh60ixc36pbgc2q9kip";
        libraryHaskellDepends = [ base ];
        description = "Curry types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curry-base" = callPackage
@@ -67045,7 +67045,7 @@ self: {
        ];
        testHaskellDepends = [ base Cabal filepath mtl ];
        description = "Functions for manipulating Curry programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curry-frontend" = callPackage
@@ -67072,8 +67072,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal curry-base filepath ];
        description = "Compile the functional logic language Curry to several intermediate formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67091,7 +67091,7 @@ self: {
          http-types mtl regex-pcre text transformers wai warp
        ];
        description = "A simple HTTP server framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curryer-rpc" = callPackage
@@ -67121,8 +67121,8 @@ self: {
          async base bytestring criterion network winery
        ];
        description = "Fast, Haskell RPC";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67137,7 +67137,7 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Easy to use FFI Bridge for using Rust in Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cursedcsv" = callPackage
@@ -67156,8 +67156,8 @@ self: {
          natural-sort parseargs primitive regex-tdfa safe unix vector
        ];
        description = "Terminal tool for viewing tabular data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67174,7 +67174,7 @@ self: {
          validity-text
        ];
        description = "Purely Functional Cursors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cursor-brick" = callPackage
@@ -67184,7 +67184,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "018i8yrdcj69qf00vz1sx7is5cx1a7vn5b8kr9b226n7vxlr3nzd";
        libraryHaskellDepends = [ base brick cursor text ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cursor-fuzzy-time" = callPackage
@@ -67199,7 +67199,7 @@ self: {
          base containers cursor deepseq fuzzy-time megaparsec microlens text
          time validity validity-time
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "cursor-fuzzy-time-gen" = callPackage
@@ -67225,8 +67225,8 @@ self: {
        benchmarkHaskellDepends = [
          base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67252,7 +67252,7 @@ self: {
          base criterion cursor genvalidity-criterion
        ];
        description = "Generators for Purely Functional Cursors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "curve25519" = callPackage
@@ -67270,7 +67270,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Fast implementations of the curve25519 elliptic curve primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "curves" = callPackage
@@ -67286,8 +67286,8 @@ self: {
          base bytestring containers filepath HaXml JuicyPixels QuickCheck
        ];
        description = "Library for drawing curve based images";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67305,8 +67305,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to CUDA Solver, a LAPACK-like library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cusparse" = callPackage
@@ -67321,8 +67321,8 @@ self: {
        libraryHaskellDepends = [ base cuda half storable-complex ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to the CUDA Sparse BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "custom-prelude" = callPackage
@@ -67334,7 +67334,7 @@ self: {
        libraryHaskellDepends = [ base basic-prelude monad-loops ];
        description = "An enhanced prelude, serving as a foundation for my projects";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67372,7 +67372,7 @@ self: {
        testPkgconfigDepends = [ pocketsphinx sphinxbase ];
        testToolDepends = [ c2hs ];
        description = "Cuts out uninteresting parts of videos by detecting silences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;};
 
   "cutter" = callPackage
@@ -67389,7 +67389,7 @@ self: {
          base bytestring explicit-exception spreadsheet utility-ht
        ];
        description = "Cut files according to a position list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cv-combinators" = callPackage
@@ -67408,8 +67408,8 @@ self: {
          allocated-processor base HOpenCV vector-space
        ];
        description = "Functional Combinators for Computer Vision";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67421,7 +67421,7 @@ self: {
        sha256 = "0ywwkwm3sfm8dx447512jm57pdy8sr29z6bvnd3q58h5prz3r2nm";
        libraryHaskellDepends = [ aeson base text ];
        description = "simple and efficient cve datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "cyclotomic" = callPackage
@@ -67439,7 +67439,7 @@ self: {
          test-framework-quickcheck2 test-framework-smallcheck
        ];
        description = "A subfield of the complex numbers for exact calculation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "cypher" = callPackage
@@ -67458,8 +67458,8 @@ self: {
          transformers-base unordered-containers vector
        ];
        description = "Haskell bindings for the neo4j \"cypher\" query language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67472,7 +67472,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base transformers ];
        description = "CZipWith class and deriving via TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "d-bus" = callPackage
@@ -67502,8 +67502,8 @@ self: {
          tasty-quickcheck tasty-th text xml-hamlet
        ];
        description = "Permissively licensed D-Bus client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67516,7 +67516,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base doctest ];
        description = "Digits 0-9";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "d3d11binding" = callPackage
@@ -67535,8 +67535,8 @@ self: {
        ];
        executableHaskellDepends = [ base c-storable-deriving vect Win32 ];
        description = "A raw binding for the directX 11";
-       license = stdenv.lib.licenses.mit;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       platforms = [ "armv7l-linux" ];
      }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; 
          d3dxof = null; dxgi = null; dxguid = null;};
 
@@ -67548,8 +67548,8 @@ self: {
        sha256 = "0wrxvfgss9fiv1pwsdi1md0plc4mf9sadkhgm46dsfq16dwrp3q2";
        libraryHaskellDepends = [ base mtl random text ];
        description = "Declarative visualization on a web browser with DSL approach";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67562,7 +67562,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory unix ];
        description = "Start background daemons by double-forking";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "daemons" = callPackage
@@ -67590,7 +67590,7 @@ self: {
          test-framework-hunit unix
        ];
        description = "Daemons in Haskell made fun and easy";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "dag" = callPackage
@@ -67606,8 +67606,8 @@ self: {
          base hspec QuickCheck quickcheck-instances
        ];
        description = "Compile-time, type-safe directed acyclic graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67626,8 +67626,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        description = "Parsing dAmn messages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67650,8 +67650,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Basic Slack bot framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67682,8 +67682,8 @@ self: {
          utf8-string
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67702,8 +67702,8 @@ self: {
          prednote rainbow text time transformers
        ];
        description = "Prints a series of dates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67753,7 +67753,7 @@ self: {
          mv contrib/darcs_completion $out/share/bash-completion/completions/darcs
        '';
        description = "a distributed, interactive, smart revision control system";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "darcs-benchmark" = callPackage
@@ -67775,8 +67775,8 @@ self: {
          zlib
        ];
        description = "Comparative benchmark suite for darcs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67809,7 +67809,7 @@ self: {
        executableSystemDepends = [ curl ];
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) curl;};
 
@@ -67829,7 +67829,7 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Darcs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67852,7 +67852,7 @@ self: {
        executableSystemDepends = [ curl ncurses zlib ];
        description = "David's Advanced Version Control System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
          inherit (pkgs) zlib;};
@@ -67873,8 +67873,8 @@ self: {
          directory filepath hashed-storage mtl old-time utf8-string
        ];
        description = "Import/export git fast-import streams to/from darcs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67893,8 +67893,8 @@ self: {
          time
        ];
        description = "Generate graphs of darcs repository activity";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67913,7 +67913,7 @@ self: {
        ];
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67927,7 +67927,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Shell scripts for support of darcs workflow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "darcs2dot" = callPackage
@@ -67944,8 +67944,8 @@ self: {
          base containers darcs graph-wrapper string-conversions
        ];
        description = "Outputs dependencies of darcs patches in dot format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67974,7 +67974,7 @@ self: {
        ];
        description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -67998,7 +67998,7 @@ self: {
        ];
        description = "Track application of Darcs patches";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68026,8 +68026,8 @@ self: {
          base binary bytestring criterion transformers
        ];
        description = "Utility and parser for DarkPlaces demo files";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68044,8 +68044,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec hspec-core ];
        description = "Darkplaces rcon client library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68075,8 +68075,8 @@ self: {
          text
        ];
        description = "Darplaces rcon utility";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68094,8 +68094,8 @@ self: {
        libraryToolDepends = [ alex ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Parser for darkplaces colorful text";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68116,8 +68116,8 @@ self: {
          text transformers
        ];
        description = "Convert package Haddock to Dash docsets (IDE docs)";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68129,7 +68129,7 @@ self: {
        sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x";
        libraryHaskellDepends = [ array base containers transformers ];
        description = "Utilities for accessing and manipulating fields of records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-accessor-monadLib" = callPackage
@@ -68141,7 +68141,7 @@ self: {
        libraryHaskellDepends = [ base data-accessor monadLib ];
        description = "Accessor functions for monadLib's monads";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "data-accessor-monads-fd" = callPackage
@@ -68154,8 +68154,8 @@ self: {
          base data-accessor monads-fd transformers
        ];
        description = "Use Accessor to access state in monads-fd State monad class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68169,8 +68169,8 @@ self: {
          base data-accessor monads-tf transformers
        ];
        description = "Use Accessor to access state in monads-tf State monad type family";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68182,7 +68182,7 @@ self: {
        sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
        libraryHaskellDepends = [ base data-accessor mtl ];
        description = "Use Accessor to access state in mtl State monad class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-accessor-template" = callPackage
@@ -68198,7 +68198,7 @@ self: {
          base data-accessor template-haskell utility-ht
        ];
        description = "Utilities for accessing and manipulating fields of records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-accessor-transformers" = callPackage
@@ -68209,7 +68209,7 @@ self: {
        sha256 = "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10";
        libraryHaskellDepends = [ base data-accessor transformers ];
        description = "Use Accessor to access state in transformers State monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-as" = callPackage
@@ -68220,7 +68220,7 @@ self: {
        sha256 = "1rqdffwyxrnvsrqchnknjdmdz7afzhplyalnrclrm5zm6gj0dlia";
        libraryHaskellDepends = [ base profunctors ];
        description = "Simple extensible sum";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-ascii" = callPackage
@@ -68236,7 +68236,7 @@ self: {
          text
        ];
        description = "Type-safe, bytestring-based ASCII values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-aviary" = callPackage
@@ -68247,8 +68247,8 @@ self: {
        sha256 = "03jhlb7w98bwx5xa23as9i6id0qxcl4f7k9rql2cgcy8nxf7c2xn";
        libraryHaskellDepends = [ base ];
        description = "Combinator birds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68260,8 +68260,8 @@ self: {
        sha256 = "1l95mrl6333hp46vsv54fglg4gwz8p14z3rysx6115blc81yx18x";
        libraryHaskellDepends = [ base ];
        description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68285,8 +68285,8 @@ self: {
          aeson base lens postgresql-simple string-conv time
        ];
        description = "A database library with a focus on ease of use, type safety and useful error messages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68298,7 +68298,7 @@ self: {
        sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
        libraryHaskellDepends = [ base binary ];
        description = "Parser/Serialiser for IEEE-754 floating-point values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-bword" = callPackage
@@ -68310,7 +68310,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Extra operations on binary words of fixed length";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-carousel" = callPackage
@@ -68323,7 +68323,7 @@ self: {
        editedCabalFile = "1sk3qvn9pb1l170qqrxwv9mxj80p5276zzwl0rfn5403mpa1gajn";
        libraryHaskellDepends = [ base containers lens ];
        description = "A rotating sequence data structure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-category" = callPackage
@@ -68333,7 +68333,7 @@ self: {
        version = "0.10";
        sha256 = "1mb72r17982w2sslmvi5nzpf7i702iikc7j4h68gzlfnm426jk9q";
        description = "Category theory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-cell" = callPackage
@@ -68344,7 +68344,7 @@ self: {
        sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr";
        libraryHaskellDepends = [ base ];
        description = "Generic cellular data representation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-check" = callPackage
@@ -68356,8 +68356,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Library for checking and normalization of data (e.g. from web forms)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68369,7 +68369,7 @@ self: {
        sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
        libraryHaskellDepends = [ base deepseq ];
        description = "Type-indexed runtime-checked properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-clist" = callPackage
@@ -68382,7 +68382,7 @@ self: {
        editedCabalFile = "13hg7a3d4ky8b765dl03ryxg28lq8iaqj5ky3j51r0i1i4f2a9hy";
        libraryHaskellDepends = [ base deepseq QuickCheck ];
        description = "Simple functional ring type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-combinator-gen" = callPackage
@@ -68393,8 +68393,8 @@ self: {
        sha256 = "0f1qw5rk9x3yd7nfhkwmpig7a6dc46yzl78fi8aaxpwqbsazpkjy";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special combinator from any data type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68406,7 +68406,7 @@ self: {
        sha256 = "15bifxba0yddpq5yz23hq9k2s7vkzcrwjpwvbw0kkjf3wjjay5bp";
        libraryHaskellDepends = [ base constraints ];
        description = "Define Backwards Compatibility Schemes for Arbitrary Data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-concurrent-queue" = callPackage
@@ -68417,8 +68417,8 @@ self: {
        sha256 = "0rmn4pq5pgvam78vxp4y7431jai8dklml322r4nw47jjc1m20kmv";
        libraryHaskellDepends = [ base stm ];
        description = "A Library for directional queues";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68430,8 +68430,8 @@ self: {
        sha256 = "0hdkj8fpa0mmi57ljl744kkh6hk99d4x8dbm2djprw7rvrj5irg8";
        libraryHaskellDepends = [ base ];
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68447,7 +68447,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
        description = "Generically compare data by their constructors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-cycle" = callPackage
@@ -68461,8 +68461,8 @@ self: {
          base collections-api collections-base-instances
        ];
        description = "a cyclic doubly linked list";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68480,7 +68480,7 @@ self: {
          data-default-instances-dlist data-default-instances-old-locale
        ];
        description = "A class for types with a default value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-class" = callPackage
@@ -68491,7 +68491,7 @@ self: {
        sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag";
        libraryHaskellDepends = [ base ];
        description = "A class for types with a default value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-extra" = callPackage
@@ -68517,7 +68517,7 @@ self: {
          data-default-instances-vector
        ];
        description = "A class for types with a default value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-generics" = callPackage
@@ -68538,7 +68538,7 @@ self: {
          text time unordered-containers vector
        ];
        description = "A class for types with a default value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-base" = callPackage
@@ -68549,7 +68549,7 @@ self: {
        sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Default instances for types in base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-bytestring" = callPackage
@@ -68562,7 +68562,7 @@ self: {
        editedCabalFile = "0gpdba4y17rp0kp9pd2qj6r4pnrc86vx47fkk3zfkggmv73pa82r";
        libraryHaskellDepends = [ base bytestring data-default-class ];
        description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-case-insensitive" = callPackage
@@ -68575,7 +68575,7 @@ self: {
        editedCabalFile = "0w8k7zjxwbj1y2acxadg956pfpf7y70jc23wgjivqvafbv69ra25";
        libraryHaskellDepends = [ case-insensitive data-default-class ];
        description = "Default instance for CI type from case-insensitive package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-containers" = callPackage
@@ -68586,7 +68586,7 @@ self: {
        sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
        libraryHaskellDepends = [ base containers data-default-class ];
        description = "Default instances for types in containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-dlist" = callPackage
@@ -68597,7 +68597,7 @@ self: {
        sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
        libraryHaskellDepends = [ base data-default-class dlist ];
        description = "Default instances for types in dlist";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-new-base" = callPackage
@@ -68608,7 +68608,7 @@ self: {
        sha256 = "0hzi7szmjf2df3v4aaid6pk6i4ma25k78v5mcxkhd6w52ifg67c3";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Default instances for types in newer versions of base package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-old-locale" = callPackage
@@ -68619,7 +68619,7 @@ self: {
        sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
        libraryHaskellDepends = [ base data-default-class old-locale ];
        description = "Default instances for types in old-locale";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-text" = callPackage
@@ -68632,7 +68632,7 @@ self: {
        editedCabalFile = "01125vbzwq35rkppm96x8fnwjyfid7x6ay6wq8n0qhr0skhcp2js";
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Default instances for (lazy and strict) Text and Text Builder";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-unordered-containers" = callPackage
@@ -68647,7 +68647,7 @@ self: {
          data-default-class unordered-containers
        ];
        description = "Default instances for unordered-containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-default-instances-vector" = callPackage
@@ -68660,7 +68660,7 @@ self: {
        editedCabalFile = "0piq9b9ywzyk12glndy9w6dka6d5zrc1mywq5j032li3j6sbwy4a";
        libraryHaskellDepends = [ data-default-class vector ];
        description = "Default instances for types defined in vector package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-dispersal" = callPackage
@@ -68681,8 +68681,8 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68700,7 +68700,7 @@ self: {
        testHaskellDepends = [ base hspec tagged ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Extensible records and polymorphic variants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-diverse-lens" = callPackage
@@ -68716,8 +68716,8 @@ self: {
        ];
        testHaskellDepends = [ base data-diverse hspec lens tagged ];
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68734,7 +68734,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Stick two binary words together to get a bigger one";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-easy" = callPackage
@@ -68752,8 +68752,8 @@ self: {
          QuickCheck safe text transformers unix
        ];
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68767,8 +68767,8 @@ self: {
          base data-flags data-serializer data-sword
        ];
        description = "Executable and Linkable Format (ELF) data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68793,8 +68793,8 @@ self: {
          hashable utf8-string
        ];
        description = "Embed files and other binary blobs inside executables without Template Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68806,8 +68806,8 @@ self: {
        sha256 = "0brfvlx7hihgnlc87r3n17dncbydfwxs49dc8kgppxycqqss6vh1";
        libraryHaskellDepends = [ base ];
        description = "Combinator emoticons: data-aviary in the flavor of emoticons";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68819,7 +68819,7 @@ self: {
        sha256 = "1h1abz87nha7cpw50yvf8fwvcca350wnnz2d3z9k30sg6wq4y7cc";
        libraryHaskellDepends = [ base ];
        description = "Endian-sensitive data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-extend-generic" = callPackage
@@ -68833,7 +68833,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Extend Haskell data or newtype like in OOP languages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-extra" = callPackage
@@ -68844,7 +68844,7 @@ self: {
        sha256 = "0py4a3mzqga25y6y1sirvc9369n3b7y5kpm5f9m613yjlypv6pc1";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-filepath" = callPackage
@@ -68859,8 +68859,8 @@ self: {
          base bifunctors ghc-prim semigroups split template-haskell
        ];
        description = "A type safe file path data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68880,7 +68880,7 @@ self: {
        executableHaskellDepends = [ base containers data-default ];
        testHaskellDepends = [ base containers data-default hspec ];
        description = "Generate data-files Cabal file field from existing files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-filter" = callPackage
@@ -68891,7 +68891,7 @@ self: {
        sha256 = "1yz22b42rqsf4i9p4lnl06l8id3f1a84dng96q2nk1mmih9v3pbm";
        libraryHaskellDepends = [ base data-default ];
        description = "Utilities for filtering";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "data-fin" = callPackage
@@ -68907,8 +68907,8 @@ self: {
          smallcheck tagged
        ];
        description = "Finite totally ordered sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68921,8 +68921,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Simple integral finite set";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68934,7 +68934,7 @@ self: {
        sha256 = "184rz8ypgrb3sxy9wiaq321d82p689w7dcwkc0qkjlabd7nv6ncy";
        libraryHaskellDepends = [ base deepseq hashable ];
        description = "Fixpoint data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-fix-cse" = callPackage
@@ -68945,7 +68945,7 @@ self: {
        sha256 = "1v8ffi5c0sz8q2fla6fab4css3pkjmi0knx5d04mvffhw66bjhbz";
        libraryHaskellDepends = [ base containers data-fix transformers ];
        description = "Common subexpression elimination for the fixploint types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-flags" = callPackage
@@ -68956,7 +68956,7 @@ self: {
        sha256 = "183h2dzqrp9wl4sg59sijlhqw5pgi10xgw7cx8vz1s86rkia3hj8";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package for working with bit masks and flags in general";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-flagset" = callPackage
@@ -68967,8 +68967,8 @@ self: {
        sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2";
        libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -68980,7 +68980,7 @@ self: {
        sha256 = "1415cf59wkf1599qcqmrpn9m4v9br3d763v1809mwg9bm2310x65";
        libraryHaskellDepends = [ base containers ];
        description = "Fold function applications. Framework for variadic functions.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-forest" = callPackage
@@ -68992,7 +68992,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "A simple multi-way tree data structure";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "data-fresh" = callPackage
@@ -69003,7 +69003,7 @@ self: {
        sha256 = "1hz30myv78mw4sf19k1yg4qikrnxsa5ng0ff4naxyz1zyi2m87f1";
        libraryHaskellDepends = [ base free transformers ];
        description = "Interface and functor transformers for fresh values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-function-meld" = callPackage
@@ -69014,7 +69014,7 @@ self: {
        sha256 = "0gnnd23cwhg8l46a4y3brb059mhh9a05l8qbwpf6avl5cj5jkgwd";
        libraryHaskellDepends = [ base ];
        description = "Map the arguments and return value of functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-function-tacit" = callPackage
@@ -69025,7 +69025,7 @@ self: {
        sha256 = "0fxmacmcnzvzspscliqbx31rmvif7ymc1knjijmx9pb92yaibcla";
        libraryHaskellDepends = [ base ];
        description = "Write functions in tacit (pointless) style using Applicative and De Bruijn index notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-has" = callPackage
@@ -69037,7 +69037,7 @@ self: {
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion transformers ];
        description = "Simple extensible product";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-hash" = callPackage
@@ -69053,7 +69053,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Combinators for building fast hashing functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-index" = callPackage
@@ -69065,7 +69065,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base doctest ];
        description = "Extending the concept of indices for lists and other containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-interval" = callPackage
@@ -69085,8 +69085,8 @@ self: {
          QuickCheck syb tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Interval datatype, interval arithmetic and interval-based containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69098,7 +69098,7 @@ self: {
        sha256 = "0m5xww8zvsa0whxl89wndpbdz9p5n03q3h3a904nqrxh966psfkb";
        libraryHaskellDepends = [ base ];
        description = "A simple lazy, infinite trie from integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-ivar" = callPackage
@@ -69109,8 +69109,8 @@ self: {
        sha256 = "1vnbmvihkrcknys33sam9zlb5qk5qqkxz6w3wamsbdmpp0q6zfb2";
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69126,7 +69126,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Json Token datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-kiln" = callPackage
@@ -69141,8 +69141,8 @@ self: {
          base containers data-fix IfElse mtl transformers
        ];
        description = "Sculpt mutable recursive data with reference equality; bake it using a data kiln into an immutable lazy structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69154,8 +69154,8 @@ self: {
        sha256 = "0vck7a3vgdqml2pg3ilkw41d52pmx452sgh2h2q4qzysq26vw49w";
        libraryHaskellDepends = [ base convert data-construction lens ];
        description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69167,7 +69167,7 @@ self: {
        sha256 = "1w8r4vw731dmam8vcidz9a4wb2swqd5djsf9vkkxihxnphh0a1x5";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-lens" = callPackage
@@ -69182,8 +69182,8 @@ self: {
          base comonad containers semigroupoids transformers
        ];
        description = "Used to be Haskell 98 Lenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69197,8 +69197,8 @@ self: {
          base comonad data-lens mtl transformers
        ];
        description = "Lenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69211,8 +69211,8 @@ self: {
        libraryHaskellDepends = [ base data-lens ixset ];
        testHaskellDepends = [ QuickCheck ];
        description = "A Lens for IxSet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69224,7 +69224,7 @@ self: {
        sha256 = "0vmkvhl7zcsaxnx7d7b59cnrdnlnr9cfn910rpn34jny7fkydlvj";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Simple lenses, minimum dependencies";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-lens-template" = callPackage
@@ -69235,8 +69235,8 @@ self: {
        sha256 = "1w1a32298naha7sv8d0v018l8z1bmwpwnb3jg09a3n65ci9hy2zm";
        libraryHaskellDepends = [ base data-lens template-haskell ];
        description = "Utilities for Data.Lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69248,7 +69248,7 @@ self: {
        sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8";
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with sequences within lists";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "data-list-zigzag" = callPackage
@@ -69259,7 +69259,7 @@ self: {
        sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q";
        libraryHaskellDepends = [ base ];
        description = "A list but with a balanced enumeration of Cartesian product";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-map-multikey" = callPackage
@@ -69270,8 +69270,8 @@ self: {
        sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf";
        libraryHaskellDepends = [ base containers ];
        description = "Data.Map with multiple, unique keys";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69283,7 +69283,7 @@ self: {
        sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
        libraryHaskellDepends = [ array base data-inttrie ];
        description = "Combinators for building memo tables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-msgpack" = callPackage
@@ -69309,7 +69309,7 @@ self: {
          base bytestring criterion deepseq QuickCheck
        ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-msgpack-types" = callPackage
@@ -69326,7 +69326,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-named" = callPackage
@@ -69337,7 +69337,7 @@ self: {
        sha256 = "03f4xc4ayql17s48ajza2ny79j885mcmp0x3mrwcfdc42dlnd7nb";
        libraryHaskellDepends = [ attoparsec base binary containers text ];
        description = "Data types for named entities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-nat" = callPackage
@@ -69348,8 +69348,8 @@ self: {
        sha256 = "1yzxkch0xzy76iyad0yshfnpvz38xklqdlyj8lgqnqsllw0vwh0m";
        libraryHaskellDepends = [ base semigroups ];
        description = "data Nat = Zero | Succ Nat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69361,8 +69361,8 @@ self: {
        sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
        libraryHaskellDepends = [ base bytestring failure text time ];
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69379,8 +69379,8 @@ self: {
          failure JSONb text
        ];
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69399,8 +69399,8 @@ self: {
          failure text transformers yaml
        ];
        description = "Serialize data to and from Yaml files (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69412,7 +69412,7 @@ self: {
        sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx";
        libraryHaskellDepends = [ base ];
        description = "A data type for non-exclusive disjunction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-ordlist" = callPackage
@@ -69423,7 +69423,7 @@ self: {
        sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
        libraryHaskellDepends = [ base ];
        description = "Set and bag operations on ordered lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-partition" = callPackage
@@ -69434,7 +69434,7 @@ self: {
        sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb";
        libraryHaskellDepends = [ base containers ];
        description = "A pure disjoint set (union find) data structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-pprint" = callPackage
@@ -69447,8 +69447,8 @@ self: {
        editedCabalFile = "0gk2x4z7m0816gq6p22y5y8r1iydi4154xbn474i9nsbk56kp2by";
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69460,8 +69460,8 @@ self: {
        sha256 = "0ylimakhw37klz2axg8qrdhwag34mfa1byb2z2mz2i8z0w4737j8";
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69480,8 +69480,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69493,7 +69493,7 @@ self: {
        sha256 = "0xqgzcpp9b0y2w5h1nln529dizdplhpfl41vxvbhxxcdkng3j53v";
        libraryHaskellDepends = [ base data-accessor stm transformers ];
        description = "Unify STRef and IORef in plain Haskell 98";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-reify" = callPackage
@@ -69512,7 +69512,7 @@ self: {
        testHaskellDepends = [ base base-compat hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Reify a recursive data structure into an explicit graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-reify-cse" = callPackage
@@ -69523,8 +69523,8 @@ self: {
        sha256 = "0vjfpbp0maqwirvi8j21z9qbs396l76dk5npn8zxac56j0i6l62r";
        libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69536,8 +69536,8 @@ self: {
        sha256 = "14k4agv5z8vlvb21vmfz9x1dcz6cgph6ix6qrac9mfyylywdffa9";
        libraryHaskellDepends = [ base generic-deriving lens ];
        description = "Alternative to Show data printing utility";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69549,8 +69549,8 @@ self: {
        sha256 = "0186py0zj9k987vxbsaxbckc7ik64rx87kq3mzkjzvam9qcc0rmj";
        libraryHaskellDepends = [ base poly-control prologue ];
        description = "Data types for returning results distinguishable by types";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69562,8 +69562,8 @@ self: {
        sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        description = "A typeclass for reversing order of contents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69576,7 +69576,7 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69588,8 +69588,8 @@ self: {
        sha256 = "01gv16yz5y3wyc370a2snihz95wdnl7sk1jz9k7aypixsaw28a2f";
        libraryHaskellDepends = [ base lens typelevel ];
        description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69608,7 +69608,7 @@ self: {
          base binary bytestring cereal tasty tasty-quickcheck
        ];
        description = "Common API for serialization libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-size" = callPackage
@@ -69621,8 +69621,8 @@ self: {
          base bytestring containers deepseq text
        ];
        description = "Profiling of data structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69634,8 +69634,8 @@ self: {
        sha256 = "0h6z4yibjbnzck2fvh9mnppz9j0lzgx8nzmzm08q5yzmzjydy3rk";
        libraryHaskellDepends = [ base vector-space ];
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69647,8 +69647,8 @@ self: {
        sha256 = "1xllcy2yn26shmcibnjczi7nm3mp9rqa6685iqc8a8vcic7mqcj9";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69675,8 +69675,8 @@ self: {
          pretty-simple text time
        ];
        description = "ARM SVD and CubeMX XML parser and pretty printer for STM32 family";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "data-store" = callPackage
@@ -69702,8 +69702,8 @@ self: {
          vector
        ];
        description = "Type safe, in-memory dictionary with multidimensional keys";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69722,8 +69722,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "An efficient implementation of maps from strings to arbitrary values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69744,8 +69744,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Program that infers the fastest data structure available for your program";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69762,8 +69762,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Shorter binary words";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69775,7 +69775,7 @@ self: {
        sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8";
        libraryHaskellDepends = [ base ];
        description = "Tensor and Group typeclasses";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "data-textual" = callPackage
@@ -69795,7 +69795,7 @@ self: {
          text-printer type-hint
        ];
        description = "Human-friendly textual representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-timeout" = callPackage
@@ -69810,7 +69810,7 @@ self: {
          base data-textual parsers stm tagged text-printer transformers-base
        ];
        description = "64-bit timeouts of nanosecond precision";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-transform" = callPackage
@@ -69821,7 +69821,7 @@ self: {
        sha256 = "0l0pbr0fg7i09lv05bhv0gl80x2mxxyvxa0n5jdknh5xfphqga96";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-tree-print" = callPackage
@@ -69834,7 +69834,7 @@ self: {
        editedCabalFile = "00qpzhm3lndhpql8aj93aj6r3x9n0gw3nx6n0q60xxrd6agyjifq";
        libraryHaskellDepends = [ base pretty syb ];
        description = "Print Data instances as a nested tree";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-treify" = callPackage
@@ -69845,7 +69845,7 @@ self: {
        sha256 = "03xchr2h0f54rlcq285xaq5bakjq13mbjwz3xi3kfa6i71rr2rk9";
        libraryHaskellDepends = [ base containers ty ];
        description = "Reify a recursive data structure into an explicit graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "data-type" = callPackage
@@ -69856,8 +69856,8 @@ self: {
        sha256 = "1x3wsnilp9sxy061sfmyyg0f6b0k2lxvi0g4qf2gkldrz32c4qvj";
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69869,8 +69869,8 @@ self: {
        sha256 = "0zhpr40sf1vqa4k7f4j5crjkd701xls86whxrhdq8v8h08ssxvxj";
        libraryHaskellDepends = [ base ];
        description = "utilities for handle data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69887,8 +69887,8 @@ self: {
          base containers hspec regex-tdfa template-haskell
        ];
        description = "A library for creating type safe validations";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69900,8 +69900,8 @@ self: {
        sha256 = "11ia37q28xz8a87xkc8yyvqqd3qzfvcbdnp2caxdbzvdnjbazhmk";
        libraryHaskellDepends = [ base safe ];
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69918,7 +69918,7 @@ self: {
        ];
        testHaskellDepends = [ async base vector ];
        description = "Dynamic growable resizable mutable generic vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "database-id-class" = callPackage
@@ -69929,8 +69929,8 @@ self: {
        sha256 = "0zm053ll1vwd5gdwq4p3zpl9f010q894nk3djaad3ry4y2mirsc4";
        libraryHaskellDepends = [ aeson base ];
        description = "Class for types with a database id";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69946,8 +69946,8 @@ self: {
          aeson base database-id-class groundhog template-haskell
        ];
        description = "HasId/Groundhog interop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -69965,7 +69965,7 @@ self: {
          postgresql-simple text time transformers
        ];
        description = "Database versioning and migration (experimental)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "database-study" = callPackage
@@ -69976,8 +69976,8 @@ self: {
        sha256 = "1aqp7a46p758f1q99cn700mgc1dic896gpsih3vj2fmffqj42gd7";
        libraryHaskellDepends = [ base containers ];
        description = "Demonstrate how a database can be implemented the functional way";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70005,8 +70005,8 @@ self: {
          transformers-base unliftio unordered-containers vector
        ];
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70042,8 +70042,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Datadog tracing client and mock agent";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70057,7 +70057,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
        description = "Data encoding library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "datafix" = callPackage
@@ -70089,8 +70089,8 @@ self: {
          filepath ghc ghc-paths lattices primitive text transformers turtle
        ];
        description = "Fixing data-flow problems";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70114,8 +70114,8 @@ self: {
          aeson base bytestring containers hspec HUnit parsec vector
        ];
        description = "Generate Graphviz documents from a Haskell representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70133,7 +70133,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck stm ];
        benchmarkHaskellDepends = [ base criterion stm ];
        description = "A Pure-Haskell Timely Dataflow System";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "datalog" = callPackage
@@ -70160,8 +70160,8 @@ self: {
          text
        ];
        description = "An implementation of datalog in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70180,7 +70180,7 @@ self: {
        ];
        description = "Tool to help pack files into the minimum number of CDs/DVDs/etc";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70202,7 +70202,7 @@ self: {
          scientific string-conversions text unordered-containers vector wreq
        ];
        description = "Client for DataRobot API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "datasets" = callPackage
@@ -70232,8 +70232,8 @@ self: {
          req safe-exceptions streaming
        ];
        description = "Classical data sets for statistics and machine learning";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70252,8 +70252,8 @@ self: {
          attoparsec base base64-bytestring bytestring HTF text
        ];
        description = "Handle data-urls";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70265,7 +70265,7 @@ self: {
        sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb";
        libraryHaskellDepends = [ base bytestring ];
        description = "Date cacher";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "date-conversions" = callPackage
@@ -70277,8 +70277,8 @@ self: {
        libraryHaskellDepends = [ base dates time ];
        testHaskellDepends = [ base dates hspec QuickCheck time ];
        description = "Date conversions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70295,8 +70295,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Small library for parsing different dates formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70316,7 +70316,7 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70336,7 +70336,7 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70351,8 +70351,8 @@ self: {
        libraryHaskellDepends = [ base parsec pretty text time ];
        executableHaskellDepends = [ base filepath parsec pretty text ];
        description = "Generates DDL suggestions based on a CSV file";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70368,8 +70368,8 @@ self: {
          base binary containers mtl transformers vector vector-binary
        ];
        description = "Directed acyclic word graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70390,7 +70390,7 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "Directed acyclic word graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dbcleaner" = callPackage
@@ -70402,8 +70402,8 @@ self: {
        libraryHaskellDepends = [ base postgresql-simple text ];
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70417,8 +70417,8 @@ self: {
          base binary bytestring monad-loops rwlock
        ];
        description = "Read and write XBase \".dbf\" files";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70439,8 +70439,8 @@ self: {
          base binary bytestring haskell98 process uulib
        ];
        description = "Decompiler Bytecode Java";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70459,8 +70459,8 @@ self: {
          text time
        ];
        description = "A *simple* database migration tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70487,7 +70487,7 @@ self: {
          yaml-light
        ];
        description = "An implementation of relational database \"migrations\"";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dbmigrations-mysql" = callPackage
@@ -70508,8 +70508,8 @@ self: {
          base dbmigrations HUnit mysql mysql-simple process
        ];
        description = "The dbmigrations tool built for MySQL databases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70528,8 +70528,8 @@ self: {
          base dbmigrations HDBC HDBC-postgresql HUnit process
        ];
        description = "The dbmigrations tool built for PostgreSQL databases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70544,8 +70544,8 @@ self: {
        executableHaskellDepends = [ base dbmigrations HDBC-sqlite3 ];
        testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ];
        description = "The dbmigrations tool built for SQLite databases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70573,7 +70573,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        doCheck = false;
        description = "A client library for the D-Bus IPC system";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "dbus-client" = callPackage
@@ -70588,8 +70588,8 @@ self: {
          base containers dbus-core monads-tf text transformers
        ];
        description = "Monadic and object-oriented interfaces to DBus";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70607,8 +70607,8 @@ self: {
          network parsec text unix vector xml-types
        ];
        description = "Low-level D-Bus protocol implementation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70625,7 +70625,7 @@ self: {
          base dbus hslogger optparse-applicative
        ];
        description = "Expose a dbus server to control hslogger";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dbus-qq" = callPackage
@@ -70641,8 +70641,8 @@ self: {
        ];
        testHaskellDepends = [ base containers dbus QuickCheck ];
        description = "Quasi-quoter for DBus functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70658,7 +70658,7 @@ self: {
          base containers dbus syb template-haskell text
        ];
        description = "TemplateHaskell generator of DBus bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dbus-th-introspection" = callPackage
@@ -70678,7 +70678,7 @@ self: {
          base cmdargs containers dbus dbus-th template-haskell
        ];
        description = "Generate bindings for DBus calls by using DBus introspection and dbus-th";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dclabel" = callPackage
@@ -70700,8 +70700,8 @@ self: {
          quickcheck-instances
        ];
        description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70713,8 +70713,8 @@ self: {
        sha256 = "1bfc9ip4fqzjzlzppkrnspnm6gc50f4rkf0wngnxyj7f79fvjr6k";
        libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70734,8 +70734,8 @@ self: {
        executableHaskellDepends = [ base filepath optparse-applicative ];
        testHaskellDepends = [ base ];
        description = "DCPU-16 Emulator & Assembler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70747,8 +70747,8 @@ self: {
        sha256 = "1mw0qn7c6ag2w6gn6pwpjf979m3p5v3p9a1kal2x8g8ncx98dcn5";
        libraryHaskellDepends = [ base dates time ];
        description = "Discordian Date Types for Haskell";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70764,8 +70764,8 @@ self: {
          base containers deepseq parsec transformers wl-pprint
        ];
        description = "Disciplined Disciple Compiler common utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70785,8 +70785,8 @@ self: {
          deepseq directory filepath mtl process text time
        ];
        description = "Disciplined Disciple Compiler build framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70799,8 +70799,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ];
        description = "Disciplined Disciple Compiler base libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70817,8 +70817,8 @@ self: {
          parsec text transformers wl-pprint
        ];
        description = "Disciplined Disciple Compiler core language and type checker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70832,8 +70832,8 @@ self: {
          base containers ddc-core ddc-core-tetra
        ];
        description = "Disciplined Disciple Compiler PHP code generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70849,8 +70849,8 @@ self: {
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70868,8 +70868,8 @@ self: {
          ddc-core-tetra deepseq limp limp-cbc mtl transformers
        ];
        description = "Disciplined Disciple Compiler data flow compiler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70886,8 +70886,8 @@ self: {
          ddc-core-simpl mtl text transformers
        ];
        description = "Disciplined Disciple Compiler LLVM code generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70903,8 +70903,8 @@ self: {
          array base containers ddc-core deepseq mtl text transformers
        ];
        description = "Disciplined Disciple Compiler C code generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70920,8 +70920,8 @@ self: {
          array base containers ddc-core deepseq mtl transformers
        ];
        description = "Disciplined Disciple Compiler code transformations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70938,8 +70938,8 @@ self: {
          mtl pretty-show text transformers
        ];
        description = "Disciplined Disciple Compiler intermediate language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70959,8 +70959,8 @@ self: {
          deepseq directory filepath mtl process time transformers
        ];
        description = "Disciplined Disciple Compiler top-level driver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70972,8 +70972,8 @@ self: {
        sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f";
        libraryHaskellDepends = [ base containers ddc-base directory ];
        description = "Disciplined Disciple Compiler user interface support";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -70990,8 +70990,8 @@ self: {
          mtl pretty-show text transformers
        ];
        description = "Disciplined Disciple Compiler source language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71014,8 +71014,8 @@ self: {
          process transformers
        ];
        description = "Disciplined Disciple Compiler command line tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71033,8 +71033,8 @@ self: {
          base buildbox containers directory filepath process random stm
        ];
        description = "Disciplined Disciple Compiler test driver and buildbot";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71053,8 +71053,8 @@ self: {
          haskeline haskell-src-exts
        ];
        description = "Disciple Core language interactive interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71081,7 +71081,7 @@ self: {
          base criterion free-vector-spaces lens linear vector
        ];
        description = "Delay differential equations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dead-code-detection" = callPackage
@@ -71106,8 +71106,8 @@ self: {
          string-conversions uniplate
        ];
        description = "detect dead code in haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71123,8 +71123,8 @@ self: {
          base containers parsec template-haskell transformers vector
        ];
        description = "Dead simple JSON parser, with some Template Haskell sugar";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71154,7 +71154,7 @@ self: {
          base Cabal HUnit parsec pretty regex-tdfa text
        ];
        description = "Modules for working with the Debian package system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "debian-binary" = callPackage
@@ -71168,7 +71168,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath HSH ];
        description = "Utilities to work with debian binary packages";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "debian-build" = callPackage
@@ -71186,7 +71186,7 @@ self: {
        ];
        executableHaskellDepends = [ base filepath transformers ];
        description = "Debian package build sequence tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "debug" = callPackage
@@ -71214,8 +71214,8 @@ self: {
          aeson base bytestring containers directory extra filepath text
        ];
        description = "Simple trace-based debugger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71227,7 +71227,7 @@ self: {
        sha256 = "19k9f92pjh52qnr31l0468hn2klkb8wszs7azwczvxzg8aq7krld";
        libraryHaskellDepends = [ base groom process temporary ];
        description = "Display a colorized diff between two Haskell values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "debug-dump" = callPackage
@@ -71238,7 +71238,7 @@ self: {
        sha256 = "0il889gy8fdi1yxm7f1nmj4s5gxqyq35jm8p5fax6yhj6lmyciwl";
        libraryHaskellDepends = [ base bytestring directory random text ];
        description = "File-based debug output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "debug-me" = callPackage
@@ -71266,8 +71266,8 @@ self: {
          wai-websockets warp websockets
        ];
        description = "secure remote debugging";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71284,8 +71284,8 @@ self: {
          aeson base debug-hoed directory filepath yaml
        ];
        description = "A preprocessor for the debug package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {debug-hoed = null;};
 
@@ -71298,7 +71298,7 @@ self: {
        libraryHaskellDepends = [ base clock containers ];
        testHaskellDepends = [ base ];
        description = "Debug.Trace equivalent for timing computations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "debug-trace-var" = callPackage
@@ -71309,8 +71309,8 @@ self: {
        sha256 = "12dlnvzvnjk6z37pnajmghd5wcrzkf4pkpc0r2nrjp4h3p9pjkqp";
        libraryHaskellDepends = [ base template-haskell unicode-show ];
        description = "You do not have to write variable names twice in Debug.Trace";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71325,8 +71325,8 @@ self: {
        libraryHaskellDepends = [ base lens random transformers ];
        executableHaskellDepends = [ base ];
        description = "More useful trace functions for investigating bugs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71339,7 +71339,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Convert Unicode characters with burrs to their ASCII counterparts";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dec" = callPackage
@@ -71352,7 +71352,7 @@ self: {
        editedCabalFile = "1v5f5yby0cld1ziqqgkcx8b50qkpviplspm82a6wl7lw28cjm0hs";
        libraryHaskellDepends = [ base ];
        description = "Decidable propositions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "decepticons" = callPackage
@@ -71363,8 +71363,8 @@ self: {
        sha256 = "1fnp2c2rdpihvxm5j22z1mrf8pnpcnasvfsrlg7lvg5m76md7k3v";
        libraryHaskellDepends = [ base comonad-transformers ];
        description = "The categorical dual of transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71380,8 +71380,8 @@ self: {
          base functor-products microlens singletons vinyl
        ];
        description = "Combinators for manipulating dependently-typed predicates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71396,8 +71396,8 @@ self: {
        libraryHaskellDepends = [ base binary binary-bits deepseq mtl ];
        testHaskellDepends = [ base binary doctest hspec QuickCheck ];
        description = "An implementation of the General Decimal Arithmetic Specification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71412,8 +71412,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71433,7 +71433,7 @@ self: {
        ];
        testHaskellDepends = [ base mwc-probability ];
        description = "DIY Markov Chains";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "decode-utf8" = callPackage
@@ -71449,7 +71449,7 @@ self: {
          api-opentheory-unicode base opentheory-unicode
        ];
        description = "Decode a UTF-8 byte stream on standard input";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "decoder-conduit" = callPackage
@@ -71460,8 +71460,8 @@ self: {
        sha256 = "0z5krcl4xd385f7v2bsnfyr7zidqwfjvc6b432gbbn2vcrx966c7";
        libraryHaskellDepends = [ base binary bytestring conduit ];
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71485,7 +71485,7 @@ self: {
        ];
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71504,8 +71504,8 @@ self: {
        testHaskellDepends = [ base doctest rank2classes ];
        testToolDepends = [ markdown-unlit ];
        description = "Deep natural and unnatural tree transformations, including attribute grammars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71522,8 +71522,8 @@ self: {
          base containers doctest HUnit mtl QuickCheck safe transformers
        ];
        description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71551,8 +71551,8 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Deep Learning in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71571,8 +71571,8 @@ self: {
          array base ghc-prim HUnit test-framework test-framework-hunit
        ];
        description = "Deep evaluation of data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "deepseq-bounded" = callPackage
@@ -71595,8 +71595,8 @@ self: {
          parallel random syb template-haskell
        ];
        description = "Bounded deepseq, including support for generic deriving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71615,7 +71615,7 @@ self: {
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
        ];
        description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deepseq-instances" = callPackage
@@ -71626,7 +71626,7 @@ self: {
        sha256 = "0shhk3hqy02qkrbbd85sbzhga7pvk6fwjnadnp6dkip55gllm24z";
        libraryHaskellDepends = [ array base deepseq stm ];
        description = "Candidate NFData Instances for Types in base";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "deepseq-magic" = callPackage
@@ -71637,8 +71637,8 @@ self: {
        sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp";
        libraryHaskellDepends = [ base ];
        description = "Deep evaluation of data structures without NFData";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71651,8 +71651,8 @@ self: {
        libraryHaskellDepends = [ base deepseq template-haskell ];
        testHaskellDepends = [ base deepseq template-haskell ];
        description = "Template Haskell based deriver for optimised NFData instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71664,8 +71664,8 @@ self: {
        sha256 = "1hisk6yfq4182ak7d1mi1kmnwwlcl8w7gwc8wqkq4l8m3zfyij8k";
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71677,8 +71677,8 @@ self: {
        sha256 = "1rz37w83awji034spyv4cnfbqb6r98r1bbvzh2i979qh5c5s6ckg";
        libraryHaskellDepends = [ base cluss ];
        description = "default arguments in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71701,7 +71701,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Abstractions over deferred folds";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "definitive-base" = callPackage
@@ -71718,7 +71718,7 @@ self: {
        ];
        description = "The base modules of the Definitive framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-filesystem" = callPackage
@@ -71739,7 +71739,7 @@ self: {
        ];
        description = "A library that enable you to interact with the filesystem in a definitive way";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-graphics" = callPackage
@@ -71762,7 +71762,7 @@ self: {
        ];
        description = "A definitive package allowing you to open windows, read image files and render text to be displayed or saved";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-parser" = callPackage
@@ -71780,7 +71780,7 @@ self: {
        ];
        description = "A parser combinator library for the Definitive framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-reactive" = callPackage
@@ -71799,7 +71799,7 @@ self: {
        ];
        description = "A simple Reactive library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-sound" = callPackage
@@ -71819,7 +71819,7 @@ self: {
        ];
        description = "A definitive package to handle sound and play it back";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "deiko-config" = callPackage
@@ -71834,7 +71834,7 @@ self: {
          array base containers exceptions mtl parsec text transformers
        ];
        description = "Small and typesafe configuration library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dejafu" = callPackage
@@ -71850,7 +71850,7 @@ self: {
          leancheck profunctors random transformers
        ];
        description = "A library for unit-testing concurrent programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "deka" = callPackage
@@ -71862,8 +71862,8 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec transformers ];
        librarySystemDepends = [ mpdec ];
        description = "Decimal floating point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mpdec = null;};
 
@@ -71884,8 +71884,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
        description = "Tests for deka, decimal floating point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71902,8 +71902,8 @@ self: {
        ];
        testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        description = "Build a Delaunay triangulation of a set of points";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71920,7 +71920,7 @@ self: {
        ];
        testHaskellDepends = [ async base dimensional exceptions time ];
        description = "More useful and humain delaying functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "delicious" = callPackage
@@ -71934,8 +71934,8 @@ self: {
          base bytestring curl feed json nano-md5 xml
        ];
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71951,8 +71951,8 @@ self: {
          attoparsec base binary bytestring bytestring-show
        ];
        description = "Parse character delimited textual data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71965,8 +71965,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base uhc-util uulib ];
        description = "Library for dealing with tab and/or comma (or other) separated files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -71990,8 +71990,8 @@ self: {
        ];
        testHaskellDepends = [ base directory filepath hspec ];
        description = "A library for detecting file changes";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72013,8 +72013,8 @@ self: {
          base binary bytestring containers monad-atom nlp-scores text
        ];
        description = "Online entropy-based model of lexical category acquisition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72026,8 +72026,8 @@ self: {
        sha256 = "0kq6kz064jy6x1b7x46h2a9mf9n5irzbkzr4dd2by4yvac9yc5kw";
        libraryHaskellDepends = [ base ];
        description = "Generalized the Prelude more functionally";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72040,8 +72040,8 @@ self: {
        libraryHaskellDepends = [ base free transformers ];
        testHaskellDepends = [ base hspec ];
        description = "Demarcating transformed monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72056,8 +72056,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
        description = "Functions supporting bulk file and directory name normalization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72082,8 +72082,8 @@ self: {
          transformers transformers-compat vector
        ];
        description = "Mutable and immutable dense multidimensional arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72105,8 +72105,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Dense int-set";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72125,7 +72125,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Simple and incomplete pure haskell implementation of linear algebra";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "dep-t" = callPackage
@@ -72142,7 +72142,7 @@ self: {
          transformers unliftio-core
        ];
        description = "Reader-like monad transformer for dependency injection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dependency" = callPackage
@@ -72159,7 +72159,7 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Dependency resolution for package management";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dependent-hashmap" = callPackage
@@ -72178,8 +72178,8 @@ self: {
          mtl unordered-containers
        ];
        description = "Dependent hash maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72194,7 +72194,7 @@ self: {
        libraryHaskellDepends = [ base containers dependent-sum ];
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dependent-map" = callPackage
@@ -72210,7 +72210,7 @@ self: {
        ];
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dependent-monoidal-map" = callPackage
@@ -72226,8 +72226,8 @@ self: {
          dependent-sum dependent-sum-aeson-orphans
        ];
        description = "Dependent map that uses semigroup mappend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72239,8 +72239,8 @@ self: {
        sha256 = "0rvl1svd0ya8wrmlimkcb7iki33gvpm5h0ix9vac2id38l4a4fh9";
        libraryHaskellDepends = [ base lens mtl prologue ];
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72252,8 +72252,8 @@ self: {
        sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8";
        libraryHaskellDepends = [ base ];
        description = "Dependent sum type";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dependent-sum" = callPackage
@@ -72264,7 +72264,7 @@ self: {
        sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1";
        libraryHaskellDepends = [ base constraints-extras some ];
        description = "Dependent sum type";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "dependent-sum-aeson-orphans" = callPackage
@@ -72280,7 +72280,7 @@ self: {
          dependent-sum some
        ];
        description = "JSON instances for DSum, DMap, and Some";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dependent-sum-template" = callPackage
@@ -72296,7 +72296,7 @@ self: {
        ];
        testHaskellDepends = [ base constraints-extras dependent-sum ];
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "depends" = callPackage
@@ -72317,8 +72317,8 @@ self: {
          transformers yaml-config
        ];
        description = "A simple configuration management tool for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72338,7 +72338,7 @@ self: {
        ];
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72355,7 +72355,7 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Double-ended priority queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deptrack-core" = callPackage
@@ -72366,8 +72366,8 @@ self: {
        sha256 = "11v9yvvsp3m3igpqqqqkx1cp648s87xpa4d06vbsxnz4k6yp4bjj";
        libraryHaskellDepends = [ base containers dlist mtl parsec ];
        description = "DepTrack Core types and model";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72386,8 +72386,8 @@ self: {
          text
        ];
        description = "DepTrack applied to DevOps";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72400,8 +72400,8 @@ self: {
        libraryHaskellDepends = [ base containers deptrack-core dotgen ];
        testHaskellDepends = [ base containers deptrack-core dotgen ];
        description = "Facilitate Graphviz representations of DepTrack dependencies";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72420,7 +72420,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Double-ended queues";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dequeue" = callPackage
@@ -72434,8 +72434,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck safe ];
        testHaskellDepends = [ base Cabal cabal-test-quickcheck ];
        description = "A typeclass and an implementation for double-ended queues";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72448,7 +72448,7 @@ self: {
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72463,7 +72463,7 @@ self: {
        ];
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72484,8 +72484,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A program and library to derive instances for data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72497,8 +72497,8 @@ self: {
        sha256 = "0bggj2jb3bbgxcz75v8q2yx29v88skiwjaj3fxkkynnv5zvrbgwr";
        libraryHaskellDepends = [ base instant-generics template-haskell ];
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72510,8 +72510,8 @@ self: {
        sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp";
        libraryHaskellDepends = [ base data-default ];
        description = "Generic instances for enumerating complex data types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72533,8 +72533,8 @@ self: {
          base haskell-src-exts haskell-src-meta template-haskell
        ];
        description = "Instance deriving for (a subset of) GADTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72548,7 +72548,7 @@ self: {
          base bifunctors reflection template-haskell
        ];
        description = "Derive class instances though various kinds of lifting";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "derive-monoid" = callPackage
@@ -72563,8 +72563,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base semigroups ];
        description = "derive Semigroup/Monoid/IsList";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72578,7 +72578,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Derive Storable instances with GHC.Generics.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "derive-storable-plugin" = callPackage
@@ -72597,7 +72597,7 @@ self: {
          base criterion deepseq derive-storable
        ];
        description = "GHC core plugin supporting the derive-storable package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "derive-topdown" = callPackage
@@ -72612,7 +72612,7 @@ self: {
          base mtl primitive syb template-haskell th-expand-syns transformers
        ];
        description = "Help Haskellers derive class instances for composited data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "derive-trie" = callPackage
@@ -72623,8 +72623,8 @@ self: {
        sha256 = "11c378mh5razibd9ljffm5353v4plrgvkfb62p6029f04sf29jnc";
        libraryHaskellDepends = [ array base containers template-haskell ];
        description = "Automatic derivation of Trie implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72641,7 +72641,7 @@ self: {
          aeson base hspec template-haskell text unordered-containers
        ];
        description = "Derive ToJSON/FromJSON instances in a more prefix-friendly manner";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "deriving-aeson" = callPackage
@@ -72653,7 +72653,7 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        testHaskellDepends = [ aeson base bytestring ];
        description = "Type driven generic aeson instance customisation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deriving-compat" = callPackage
@@ -72676,7 +72676,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deriving-show-simple" = callPackage
@@ -72688,7 +72688,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Derive a Show instance without field selector names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "derp" = callPackage
@@ -72699,7 +72699,7 @@ self: {
        sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk";
        libraryHaskellDepends = [ base containers ];
        description = "Derivative Parsing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "derp-lib" = callPackage
@@ -72710,8 +72710,8 @@ self: {
        sha256 = "0j883w01k9scz6cfxljkw9s2kgs9f7vdxyyxxhlvvkgzb0050v0x";
        libraryHaskellDepends = [ base derp ];
        description = "combinators based on parsing with derivatives (derp) package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72727,7 +72727,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Parse and render JSON simply";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "describe" = callPackage
@@ -72748,8 +72748,8 @@ self: {
          profunctors QuickCheck template-haskell text transformers
        ];
        description = "Combinators for describing binary data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72761,7 +72761,7 @@ self: {
        sha256 = "00rk7m54igmrsi8j2fmql7c5wgyg7x5ws8397753470x5k2qv2ap";
        libraryHaskellDepends = [ base ];
        description = "Loads a list of items with fields";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "descript-lang" = callPackage
@@ -72795,8 +72795,8 @@ self: {
          transformers yaml
        ];
        description = "Library, interpreter, and CLI for Descript programming language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72816,7 +72816,7 @@ self: {
          aeson base bifunctors containers hspec HUnit mtl text transformers
        ];
        description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "desert" = callPackage
@@ -72836,7 +72836,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "a simple build tool for OCaml projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "despair" = callPackage
@@ -72847,7 +72847,7 @@ self: {
        sha256 = "0nl1sgbvxgg5ajgwj24l6qxlsin5g0bly50j8w7sg7jkn3v0r9kc";
        libraryHaskellDepends = [ base random ];
        description = "Despair";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deterministic-game-engine" = callPackage
@@ -72859,8 +72859,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
        description = "Simple deterministic game engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72883,7 +72883,7 @@ self: {
          template-haskell
        ];
        description = "JSON and CSV encoding for rationals as decimal point numbers";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "detour-via-uom" = callPackage
@@ -72904,8 +72904,8 @@ self: {
          uom-plugin
        ];
        description = "JSON and CSV encoding for quantities";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72924,7 +72924,7 @@ self: {
          unordered-containers zlib
        ];
        description = "Markov chain text generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "deunicode" = callPackage
@@ -72937,8 +72937,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring utf8-string ];
        description = "Get rid of unicode (utf-8) symbols in Haskell sources";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72957,8 +72957,8 @@ self: {
          text unix unordered-containers
        ];
        description = "A small tool to make it easier to update program managed by Angel";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72980,8 +72980,8 @@ self: {
          source-constraints tasty tasty-mgolden text typed-process
        ];
        description = "Haskell development tool agregate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -72995,8 +72995,8 @@ self: {
          base bytestring containers elf hdis86 syb
        ];
        description = "Find gadgets for return-oriented programming on x86";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73016,7 +73016,7 @@ self: {
          time
        ];
        description = "Type, render and parse the df1 hierarchical structured log format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "df1-html" = callPackage
@@ -73036,7 +73036,7 @@ self: {
          text time xmlbf
        ];
        description = "Render and parse df1 logs as HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dfinity-radix-tree" = callPackage
@@ -73071,8 +73071,8 @@ self: {
          tasty-quickcheck temporary text transformers unordered-containers
        ];
        description = "A generic data integrity layer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) leveldb;};
 
@@ -73084,7 +73084,7 @@ self: {
        sha256 = "1ybq5bnh85dbr9lfx5d6qw87x9qc8fs0yvbi1a6860an13lvrzy7";
        libraryHaskellDepends = [ base scientific ];
        description = "A package for precise decimal arithmatic using rationals";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dfsbuild" = callPackage
@@ -73104,7 +73104,7 @@ self: {
        ];
        description = "Build Debian From Scratch CD/DVD images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73117,8 +73117,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Implementation of DGIM algorithm";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73130,8 +73130,8 @@ self: {
        sha256 = "100xlxqhy33kllyb4dy7q0bwwy5wn9w45qy1cb5f0yb0dqff1pnx";
        libraryHaskellDepends = [ base HTTP mtl network split ];
        description = "Haskell front-end for DGS' bot interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73183,8 +73183,8 @@ self: {
        ];
        doCheck = false;
        description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dhall" = callPackage
@@ -73240,7 +73240,7 @@ self: {
        ];
        doCheck = false;
        description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dhall-bash" = callPackage
@@ -73261,7 +73261,7 @@ self: {
          base bytestring dhall optparse-generic text
        ];
        description = "Compile Dhall to Bash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dhall-check" = callPackage
@@ -73278,8 +73278,8 @@ self: {
          base containers dhall directory filepath fsnotify text trifecta
        ];
        description = "Check all dhall files in a project";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73311,8 +73311,8 @@ self: {
          turtle
        ];
        description = "Generate HTML docs from a dhall package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73345,8 +73345,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Translate concourse config from Dhall to YAML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73378,7 +73378,7 @@ self: {
          aeson base bytestring dhall tasty tasty-hunit tasty-silver text
        ];
        description = "Convert between Dhall and JSON or YAML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dhall-lex" = callPackage
@@ -73397,7 +73397,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec hspec-dirstream ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Lexer for the Dhall language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dhall-lsp-server" = callPackage
@@ -73428,7 +73428,7 @@ self: {
          QuickCheck tasty tasty-hspec text
        ];
        description = "Language Server Protocol (LSP) server for Dhall";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dhall-nix" = callPackage
@@ -73451,8 +73451,8 @@ self: {
          base dhall hnix optparse-generic text
        ];
        description = "Dhall to Nix compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73476,8 +73476,8 @@ self: {
          prettyprinter text transformers turtle
        ];
        description = "Convert Dhall projects to Nix packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73495,8 +73495,8 @@ self: {
          base dhall optparse-applicative text
        ];
        description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73525,8 +73525,8 @@ self: {
          tasty tasty-golden tasty-hunit text
        ];
        description = "Compile Dhall expressions to Cabal files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73557,7 +73557,7 @@ self: {
          tasty-hunit text
        ];
        description = "Convert between Dhall and YAML";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -73575,8 +73575,8 @@ self: {
          attoparsec base bytestring chronos ip tasty tasty-hunit
        ];
        description = "Parse a DHCP lease file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73610,8 +73610,8 @@ self: {
        ];
        doHaddock = false;
        description = "Dhall/YAML configurable concurrent integration test executor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73627,7 +73627,7 @@ self: {
          base containers df1 di-core di-df1 di-handle di-monad exceptions
        ];
        description = "Typeful hierarchical structured logging using di, mtl and df1";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-core" = callPackage
@@ -73646,7 +73646,7 @@ self: {
          tasty-quickcheck time
        ];
        description = "Typeful hierarchical structured logging without monad towers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-df1" = callPackage
@@ -73665,7 +73665,7 @@ self: {
          time
        ];
        description = "Write logs in the df1 format using the di logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-handle" = callPackage
@@ -73678,7 +73678,7 @@ self: {
          base bytestring di-core exceptions unix
        ];
        description = "IO support for file handles in di-core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-monad" = callPackage
@@ -73693,7 +73693,7 @@ self: {
          base containers di-core exceptions mtl pipes stm transformers
        ];
        description = "mtl flavoured typeful hierarchical structured logging for di-core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "di-polysemy" = callPackage
@@ -73706,7 +73706,7 @@ self: {
          base df1 di-core di-df1 di-handle polysemy
        ];
        description = "DI logger wrapped for Polysemy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dia-base" = callPackage
@@ -73719,8 +73719,8 @@ self: {
        editedCabalFile = "0jp6vxj2m984dl7gnphs7119zxs8pplhq73nnicvbhjcliixyl6w";
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73738,8 +73738,8 @@ self: {
          base containers data-pprint deepseq dia-base mtl xhtml
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73756,8 +73756,8 @@ self: {
        ];
        doHaddock = false;
        description = "Embedded domain-specific language for declarative vector graphics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73771,8 +73771,8 @@ self: {
        editedCabalFile = "1cqibxx1a00m8nl9k48c0m0ln589rr4qw3f41xl1jk68b83r3x1k";
        libraryHaskellDepends = [ base cubicbezier diagrams-lib ];
        description = "deprecated, part of diagrams-contrib since 1.4";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73798,8 +73798,8 @@ self: {
          Rasterific time
        ];
        description = "Braille diagrams with plain text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73828,8 +73828,8 @@ self: {
          filepath JuicyPixels lens svg-builder
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73852,8 +73852,8 @@ self: {
          vector
        ];
        description = "Cairo backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73872,8 +73872,8 @@ self: {
          optparse-applicative statestack text
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73902,8 +73902,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Collection of user contributions to diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73923,8 +73923,8 @@ self: {
          monoid-extras mtl profunctors semigroups unordered-containers
        ];
        description = "Core libraries for diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73940,8 +73940,8 @@ self: {
          base containers diagrams-lib fgl graphviz split
        ];
        description = "Graph layout and drawing with GraphViz and diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73957,8 +73957,8 @@ self: {
          base cairo diagrams-cairo diagrams-lib gtk
        ];
        description = "Backend for rendering diagrams directly to GTK windows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -73989,8 +73989,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74007,8 +74007,8 @@ self: {
          transformers
        ];
        description = "HsQML (Qt5) backend for Diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "diagrams-html5" = callPackage
@@ -74026,8 +74026,8 @@ self: {
          statestack static-canvas text
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74061,8 +74061,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion diagrams-core ];
        description = "Embedded domain-specific language for declarative graphics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74088,8 +74088,8 @@ self: {
          filepath linear optparse-applicative pandoc-types text
        ];
        description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74107,8 +74107,8 @@ self: {
          monoid-extras mtl semigroups split vector-space
        ];
        description = "PDF backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74128,8 +74128,8 @@ self: {
          optparse-applicative process split texrunner time vector zlib
        ];
        description = "PGF backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74150,8 +74150,8 @@ self: {
          statestack
        ];
        description = "Postscript backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74166,8 +74166,8 @@ self: {
          array base colour diagrams-core diagrams-lib
        ];
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74190,8 +74190,8 @@ self: {
        ];
        testHaskellDepends = [ base diagrams-core diagrams-lib ];
        description = "Rasterific backend for diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74209,8 +74209,8 @@ self: {
          monoid-extras mtl reflex reflex-dom reflex-dom-contrib
        ];
        description = "reflex backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "diagrams-rubiks-cube" = callPackage
@@ -74225,8 +74225,8 @@ self: {
          adjunctions base data-default-class diagrams-lib distributive lens
        ];
        description = "Library for drawing the Rubik's Cube";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74243,7 +74243,7 @@ self: {
          base deepseq tasty tasty-hunit tasty-quickcheck
        ];
        description = "Pure Haskell solver routines used by diagrams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diagrams-svg" = callPackage
@@ -74264,8 +74264,8 @@ self: {
          optparse-applicative semigroups split svg-builder text
        ];
        description = "SVG backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74279,8 +74279,8 @@ self: {
          base diagrams-core diagrams-lib dlist mtl
        ];
        description = "TikZ backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74298,8 +74298,8 @@ self: {
          base cairo diagrams-cairo diagrams-lib wx wxcore
        ];
        description = "Backend for rendering diagrams in wxWidgets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74317,8 +74317,8 @@ self: {
          webkitgtk3
        ];
        description = "Simple dialog-based user interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dialogflow-fulfillment" = callPackage
@@ -74338,7 +74338,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A Dialogflow Fulfillment library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dib" = callPackage
@@ -74361,8 +74361,8 @@ self: {
          base containers directory filepath mtl process time
        ];
        description = "A simple, forward build system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74376,7 +74376,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base parsec random-fu transformers ];
        description = "Simplistic D&D style dice-rolling system";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "dice-entropy-conduit" = callPackage
@@ -74395,7 +74395,7 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "Cryptographically secure n-sided dice via rejection sampling";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "dice2tex" = callPackage
@@ -74408,8 +74408,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Convert a Diceware wordlist into a printer-ready LaTeX file";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74423,8 +74423,8 @@ self: {
          base binary bytestring pretty safe time
        ];
        description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74453,8 +74453,8 @@ self: {
          random tagged text time
        ];
        description = "Tools to handle StarDict dictionaries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74468,7 +74468,7 @@ self: {
        editedCabalFile = "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439";
        libraryHaskellDepends = [ base containers ];
        description = "Sharing/memoization of class members";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dictparser" = callPackage
@@ -74483,8 +74483,8 @@ self: {
        executableHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74502,8 +74502,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Discrete Interval Encoding Trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74515,8 +74515,8 @@ self: {
        sha256 = "19sn53b4sb0sa7ibcz9wvpn3vhja0yx62p8f9ibawrycm4cpbpzl";
        libraryHaskellDepends = [ base Enum util ];
        description = "Diff and patch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74532,7 +74532,7 @@ self: {
        testHaskellDepends = [ base Diff ];
        description = "A diff algorithm based on recursive longest common substrings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "diff-parse" = callPackage
@@ -74544,7 +74544,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec text ];
        description = "A parser for diff file formats";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "diff3" = callPackage
@@ -74560,7 +74560,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Perform a 3-way difference of documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diffarray" = callPackage
@@ -74571,7 +74571,7 @@ self: {
        sha256 = "0p95i1xzp0bdm0zrdil79rfxfyz372y2qjdxyvxdzxvfb1mvalcm";
        libraryHaskellDepends = [ array base ];
        description = "DiffArray";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diffcabal" = callPackage
@@ -74589,8 +74589,8 @@ self: {
          process
        ];
        description = "Diff two .cabal files syntactically";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74610,7 +74610,7 @@ self: {
          parallel-io process process-extras unix
        ];
        description = "Tools for diffing stdout";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "difference-monoid" = callPackage
@@ -74629,8 +74629,8 @@ self: {
          adjunctions base comonad containers deepseq distributive doctest
          groups hedgehog hedgehog-checkers QuickCheck semigroupoids
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74656,8 +74656,8 @@ self: {
          text-show vector
        ];
        description = "Finds out whether an entity comes from different distributions (statuses)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74671,8 +74671,8 @@ self: {
        editedCabalFile = "0gkcsdf9jrfs5lwhayl808flwlv446mixdn3n91v5gsxbcqqrsi7";
        libraryHaskellDepends = [ base containers ];
        description = "diff on maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74698,8 +74698,8 @@ self: {
          tasty-hunit text
        ];
        description = "Generate todo lists from source code";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74711,7 +74711,7 @@ self: {
        sha256 = "1156jr67fjpp68r2qnq0py80cmk42cz356aarqsd8al98dnvxxn6";
        libraryHaskellDepends = [ base math-functions ];
        description = "A (deprecated) implementation of the digamma function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digest" = callPackage
@@ -74723,7 +74723,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
   "digest-pure" = callPackage
@@ -74736,7 +74736,7 @@ self: {
        testHaskellDepends = [ array base bytestring digest QuickCheck ];
        description = "Pure hash functions for bytestrings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "digest-sig" = callPackage
@@ -74750,7 +74750,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        doHaddock = false;
        description = "Signature for digest";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-bootstrap" = callPackage
@@ -74766,8 +74766,8 @@ self: {
          digestive-functors-blaze http-types text
        ];
        description = "Speed up form designing using digestive functors and bootstrap";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74784,8 +74784,8 @@ self: {
          lucid-foundation text
        ];
        description = "Speed up form designing using digestive functors and foundation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74807,7 +74807,7 @@ self: {
          test-framework-quickcheck2 text time
        ];
        description = "A practical formlet library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-aeson" = callPackage
@@ -74828,8 +74828,8 @@ self: {
          tasty-hunit text
        ];
        description = "Run digestive-functors forms against JSON";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74845,7 +74845,7 @@ self: {
          base blaze-html blaze-markup digestive-functors text
        ];
        description = "Blaze frontend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-happstack" = callPackage
@@ -74860,8 +74860,8 @@ self: {
          base bytestring digestive-functors happstack-server text
        ];
        description = "Happstack backend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74878,7 +74878,7 @@ self: {
          xmlhtml
        ];
        description = "Heist frontend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-hsp" = callPackage
@@ -74890,8 +74890,8 @@ self: {
        libraryHaskellDepends = [ base digestive-functors hsp hsx text ];
        libraryToolDepends = [ trhsx ];
        description = "HSP support for digestive-functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74903,7 +74903,7 @@ self: {
        sha256 = "176vc7gsm0379100imk1i8y8r2gx0l66dijgmxkqbq1qwkjfizs5";
        libraryHaskellDepends = [ base digestive-functors lucid text ];
        description = "Lucid frontend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-scotty" = callPackage
@@ -74921,7 +74921,7 @@ self: {
          wai-extra
        ];
        description = "Scotty backend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digestive-functors-snap" = callPackage
@@ -74937,7 +74937,7 @@ self: {
          mtl snap-core text
        ];
        description = "Snap backend for the digestive-functors library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digit" = callPackage
@@ -74958,7 +74958,7 @@ self: {
          tasty tasty-hedgehog tasty-hspec tasty-hunit text
        ];
        description = "A data-type representing digits 0-9 and other combinations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "digitalocean-kzs" = callPackage
@@ -74975,8 +74975,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest hspec ];
        description = "digitalocean api for haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -74989,8 +74989,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Converts integers to lists of digits and back";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75009,7 +75009,7 @@ self: {
        ];
        testHaskellDepends = [ base fgl hashable massiv QuickCheck ];
        description = "Directed Graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dihaa" = callPackage
@@ -75026,7 +75026,7 @@ self: {
          base FontyFruity JuicyPixels Rasterific vector
        ];
        description = "ASCII based Diagram drawing in Haskell (Idea based on ditaa)";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "dijkstra-simple" = callPackage
@@ -75038,7 +75038,7 @@ self: {
        libraryHaskellDepends = [ base containers fingertree ];
        testHaskellDepends = [ base containers fingertree hspec ];
        description = "A simpler Dijkstra shortest paths implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dimensional" = callPackage
@@ -75061,7 +75061,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Statically checked physical dimensions, using Type Families and Data Kinds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dimensional-codata" = callPackage
@@ -75072,8 +75072,8 @@ self: {
        sha256 = "1bmal7i0zvfivri5w7fbl4n0gyybnr2wy2cvz21b33jrzjblr1g0";
        libraryHaskellDepends = [ base dimensional numtype-dk ];
        description = "CODATA Recommended Physical Constants with Dimensional Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75085,8 +75085,8 @@ self: {
        sha256 = "052daw4kj1ivj3h2lvs39m3xz1xy5ra8fj5pmpfnjmjgg5kfv2w1";
        libraryHaskellDepends = [ base numtype-tf time ];
        description = "Statically checked physical dimensions, implemented using type families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75102,7 +75102,7 @@ self: {
          base Cabal constraints-deriving QuickCheck
        ];
        description = "Safe type-level dimensionality for multidimensional data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dingo-core" = callPackage
@@ -75125,8 +75125,8 @@ self: {
          unordered-containers wai wai-eventsource wai-extra warp web-css
        ];
        description = "Dingo is a Rich Internet Application platform based on the Warp web server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75146,8 +75146,8 @@ self: {
          shakespeare-js template-haskell text transformers
        ];
        description = "Dingo Example";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75166,8 +75166,8 @@ self: {
          unordered-containers
        ];
        description = "Dingo Widgets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75188,7 +75188,7 @@ self: {
          base tasty tasty-quickcheck tasty-th text unordered-containers
        ];
        description = "A convenient tagless EDSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diohsc" = callPackage
@@ -75213,7 +75213,7 @@ self: {
          unix x509 x509-store x509-validation
        ];
        description = "Gemini client";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "diophantine" = callPackage
@@ -75225,8 +75225,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
        description = "A quadratic diophantine equation solving library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75242,8 +75242,8 @@ self: {
          base containers HUnit parsec transformers TypeNat
        ];
        description = "Diplomacy board game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75267,8 +75267,8 @@ self: {
          TypeNat wai warp warp-tls
        ];
        description = "Play Diplomacy over HTTP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75285,7 +75285,7 @@ self: {
          base criterion directory dirstream pipes pipes-safe system-filepath
        ];
        description = "Simple directory traversal library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "direct-binary-files" = callPackage
@@ -75296,8 +75296,8 @@ self: {
        sha256 = "0ci6av8sgrlsn12dbpvqf3imq9w1hm2ll5np2fz7gh9760vvdidr";
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Serialization and deserialization monads for streams and ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75309,7 +75309,7 @@ self: {
        sha256 = "0698l8zylkgafx8g91icysz6rq2lyrnd25blhday67s9vkdpbvxh";
        libraryHaskellDepends = [ base unix ];
        description = "Library to switch to daemon mode using built-in OS facilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "direct-fastcgi" = callPackage
@@ -75324,8 +75324,8 @@ self: {
          base bytestring containers mtl network utf8-string
        ];
        description = "Native implementation of the FastCGI protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75344,8 +75344,8 @@ self: {
          transformers-base unix utf8-string
        ];
        description = "Native webserver that acts as a library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75357,7 +75357,7 @@ self: {
        sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q";
        libraryHaskellDepends = [ base bytestring ];
        description = "An implementation of the MurmurHash3 algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "direct-plugins" = callPackage
@@ -75368,8 +75368,8 @@ self: {
        sha256 = "03f7jrx0skqiirvpzzakk3wwwdjanjxpzv8j5nwpzvqpb4syshcr";
        libraryHaskellDepends = [ base ghc ghc-paths ];
        description = "Lightweight replacement for Plugins, specific to GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75389,8 +75389,8 @@ self: {
          base bytestring directory filepath safe-exceptions
        ];
        description = "Bindings to RocksDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75407,7 +75407,7 @@ self: {
          base base16-bytestring bytestring directory HUnit temporary text
        ];
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "directed-cubical" = callPackage
@@ -75423,8 +75423,8 @@ self: {
          unordered-containers vector
        ];
        description = "Finite directed cubical complexes and associated algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75437,8 +75437,8 @@ self: {
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "directory-contents" = callPackage
@@ -75457,8 +75457,8 @@ self: {
        executableHaskellDepends = [ base filepath text ];
        testHaskellDepends = [ base filepath ];
        description = "Recursively build, navigate, and operate on a tree of directory contents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75483,7 +75483,7 @@ self: {
          transformers unix unordered-containers
        ];
        description = "Directory layout DSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "directory-listing-webpage-parser" = callPackage
@@ -75497,7 +75497,7 @@ self: {
          base bytestring network-uri tagsoup text time
        ];
        description = "directory listing webpage parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "directory-tree" = callPackage
@@ -75509,7 +75509,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [ base directory filepath process ];
        description = "A simple directory-like tree datatype, with useful IO functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "direm" = callPackage
@@ -75522,8 +75522,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory ];
        description = "Deletes a directory and retains its contents in the parent directory";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75539,8 +75539,8 @@ self: {
          aeson base containers hblock safecopy text time
          unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75557,7 +75557,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec log-domain mwc-random vector ];
        description = "Multivariate Dirichlet distribution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dirstream" = callPackage
@@ -75574,7 +75574,7 @@ self: {
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
        description = "Easily stream directory contents in constant memory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dirtree" = callPackage
@@ -75596,7 +75596,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A small library for working with directories";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "disassembler" = callPackage
@@ -75607,7 +75607,7 @@ self: {
        sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c";
        libraryHaskellDepends = [ array base containers mtl parsec ];
        description = "Disassembler for X86 & AMD64 machine code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "discogs-haskell" = callPackage
@@ -75630,8 +75630,8 @@ self: {
          transformers
        ];
        description = "Client for Discogs REST API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75643,7 +75643,7 @@ self: {
        sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj";
        libraryHaskellDepends = [ base containers ];
        description = "DisCoCat implementation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "discord-gateway" = callPackage
@@ -75660,8 +75660,8 @@ self: {
          aeson base discord-types hslogger transformers url websockets wuss
        ];
        description = "An API wrapper for Discord in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75685,7 +75685,7 @@ self: {
        ];
        executableHaskellDepends = [ base text unliftio ];
        description = "Write bots for Discord in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "discord-hs" = callPackage
@@ -75701,8 +75701,8 @@ self: {
          websockets
        ];
        description = "An API wrapper for Discord in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75734,8 +75734,8 @@ self: {
          unboxing-vector unordered-containers vector
        ];
        description = "Discord verification bot";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75755,8 +75755,8 @@ self: {
          hslogger http-client mtl req stm text time url
        ];
        description = "An API wrapper for Discord in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75775,8 +75775,8 @@ self: {
          vector
        ];
        description = "Type information for discord-hs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75788,8 +75788,8 @@ self: {
        sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d";
        libraryHaskellDepends = [ base time ];
        description = "library for handling Discordian calendar dates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75802,7 +75802,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ markdown ];
        description = "Haskell bindings to the discount Markdown library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {markdown = null;};
 
   "discrete" = callPackage
@@ -75815,8 +75815,8 @@ self: {
        editedCabalFile = "1ary1xyh2gy099p1madapfqhw2r1ys1pd8xg396xxaas4vjmqqkh";
        libraryHaskellDepends = [ base ];
        description = "replacement for enum";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75828,7 +75828,7 @@ self: {
        sha256 = "1in70wlm6qcmc743v0w1lha4wffjinbwsgcyq44gzk0lb79ix6lb";
        libraryHaskellDepends = [ base ];
        description = "Discrete Intervals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "discrete-space-map" = callPackage
@@ -75843,7 +75843,7 @@ self: {
          adjunctions base comonad distributive keys semigroupoids
        ];
        description = "A discrete space map";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "discrimination" = callPackage
@@ -75871,7 +75871,7 @@ self: {
          splitmix unordered-containers vector vector-algorithms
        ];
        description = "Fast generic linear-time sorting, joins and container construction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "disjoint-containers" = callPackage
@@ -75890,8 +75890,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Disjoint containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75908,8 +75908,8 @@ self: {
          base containers HUnit mtl QuickCheck transformers
        ];
        description = "Persistent disjoint-sets, a.k.a union-find.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75922,8 +75922,8 @@ self: {
        libraryHaskellDepends = [ base primitive ref-tf vector ];
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
        description = "Monadic disjoint set";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -75935,7 +75935,7 @@ self: {
        sha256 = "0yy4gp5jhfsj3gbk7gh3yplxkxxfsmrl84chp4wfr4v46ff9pc2m";
        libraryHaskellDepends = [ array base ];
        description = "Imperative ST/IO based disjoint set data structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "disk-free-space" = callPackage
@@ -75948,7 +75948,7 @@ self: {
        editedCabalFile = "0x0wjycr3rhw9vcq51b4sz8cf7mcvx7whhywv72y25r9385lxb3i";
        libraryHaskellDepends = [ base ];
        description = "Retrieve information about disk space usage";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diskhash" = callPackage
@@ -75966,7 +75966,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
        description = "Disk-based hash table";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "display" = callPackage
@@ -75977,7 +75977,7 @@ self: {
        sha256 = "0hn1zdis621h87r4mr35vic9473iwqcdjnmmfgs1j5dfsh62kd6b";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Display things for humans to read";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "display-haskell-do" = callPackage
@@ -75988,7 +75988,7 @@ self: {
        sha256 = "0j2rsmgmkfwy0w96y1qzr5vmhr16qgd46rka8ya17rakb4rzvi3q";
        libraryHaskellDepends = [ aeson base text ];
        description = "A display API for HaskellDO";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "disposable" = callPackage
@@ -75999,7 +75999,7 @@ self: {
        sha256 = "0kzyzbhhjm005fi2n59j4in58kps4rciaza9pzi0qd2xnn9j5iqv";
        libraryHaskellDepends = [ base ghcjs-base-stub stm ];
        description = "Allows storing different resource-releasing actions together";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dist-upload" = callPackage
@@ -76013,8 +76013,8 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath process ];
        doHaddock = false;
        description = "Generate/Upload cabal package to Hackage";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76028,8 +76028,8 @@ self: {
        editedCabalFile = "0iysmnl4p1fsb4zd0mmr6q7zc7w90jrwcxxm7vi38658x19r8qmq";
        libraryHaskellDepends = [ base ];
        description = "Useful distance datatype and functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76042,7 +76042,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Generate readable distances between times";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "distributed-closure" = callPackage
@@ -76061,7 +76061,7 @@ self: {
        executableHaskellDepends = [ async base binary bytestring ];
        testHaskellDepends = [ base binary hspec QuickCheck ];
        description = "Serializable closures for distributed programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "distributed-fork" = callPackage
@@ -76079,7 +76079,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Like 'forkIO', but uses remote machines instead of local threads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "distributed-fork-aws-lambda" = callPackage
@@ -76105,8 +76105,8 @@ self: {
          base distributed-fork tasty tasty-hunit text
        ];
        description = "AWS Lambda backend for distributed-fork";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76131,8 +76131,8 @@ self: {
          base binary bytestring network-transport-tcp
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76160,8 +76160,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "Cloud Haskell Async API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76184,8 +76184,8 @@ self: {
          rank1dynamic transformers unix
        ];
        description = "Microsoft Azure backend for Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76215,8 +76215,8 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76232,8 +76232,8 @@ self: {
          base distributed-process ekg-core text unordered-containers
        ];
        description = "Collect node stats for EKG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76269,8 +76269,8 @@ self: {
          test-framework-quickcheck2 time transformers unordered-containers
        ];
        description = "Execution Framework for The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76301,8 +76301,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Cloud Haskell Extras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76335,8 +76335,8 @@ self: {
          test-framework-quickcheck2 time transformers unordered-containers
        ];
        description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76362,8 +76362,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "monad-control style typeclass and transformer instances for Process monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76380,8 +76380,8 @@ self: {
          transformers-base
        ];
        description = "Orphan instances for MonadBase and MonadBaseControl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76402,8 +76402,8 @@ self: {
        ];
        executableHaskellDepends = [ base distributed-process mtl ];
        description = "Peer-to-peer node discovery for Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76434,8 +76434,8 @@ self: {
          test-framework-quickcheck2 time transformers unordered-containers
        ];
        description = "The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76468,8 +76468,8 @@ self: {
          unordered-containers
        ];
        description = "Cloud Haskell Extended Process Registry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76492,8 +76492,8 @@ self: {
          transformers
        ];
        description = "Simple zero-configuration backend for Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76525,8 +76525,8 @@ self: {
          test-framework-hunit time transformers unordered-containers
        ];
        description = "Supervisors for The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76546,8 +76546,8 @@ self: {
          stm test-framework test-framework-hunit
        ];
        description = "Cloud Haskell Test Support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76584,8 +76584,8 @@ self: {
          test-framework-quickcheck2 time transformers unordered-containers
        ];
        description = "Task Framework for The Cloud Haskell Application Platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76609,8 +76609,8 @@ self: {
          test-framework
        ];
        description = "Tests and test support tools for distributed-process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76639,8 +76639,8 @@ self: {
          network-transport-tcp transformers
        ];
        description = "A Zookeeper back-end for Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76656,7 +76656,7 @@ self: {
          base binary bytestring containers deepseq rank1dynamic
        ];
        description = "Compositional, type-safe, polymorphic static values and closures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "distribution" = callPackage
@@ -76669,8 +76669,8 @@ self: {
          array base containers MonadRandom random
        ];
        description = "Finite discrete probability distributions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76688,8 +76688,8 @@ self: {
        ];
        testHaskellDepends = [ base deepseq hspec lens ];
        description = "Types and functions to manipulate the Nixpkgs distribution";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "distribution-opensuse" = callPackage
@@ -76710,7 +76710,7 @@ self: {
        executableHaskellDepends = [ base containers text turtle ];
        testHaskellDepends = [ base ];
        description = "Types, functions, and tools to manipulate the openSUSE distribution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "distribution-plot" = callPackage
@@ -76726,8 +76726,8 @@ self: {
          distribution lens
        ];
        description = "Easily plot distributions from the distribution package..";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76743,7 +76743,7 @@ self: {
        testHaskellDepends = [ base generic-deriving hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Distributive functors -- Dual to Traversable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ditto" = callPackage
@@ -76756,7 +76756,7 @@ self: {
          base containers mtl semigroups text torsor
        ];
        description = "ditto is a type-safe HTML form generation and validation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ditto-lucid" = callPackage
@@ -76767,7 +76767,7 @@ self: {
        sha256 = "1if543wf7div8ww90ifdh75i2w99lhbfh8pfnzmd1yaw2j1m35ff";
        libraryHaskellDepends = [ base ditto lucid path-pieces text ];
        description = "Add support for using lucid with Ditto";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "diversity" = callPackage
@@ -76789,8 +76789,8 @@ self: {
          base containers fasta optparse-applicative pipes semigroups
        ];
        description = "Quantify the diversity of a population";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76828,8 +76828,8 @@ self: {
          time vector
        ];
        description = "A wiki implemented with a firm theoretical foundation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76845,8 +76845,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Hit drums with haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76862,7 +76862,7 @@ self: {
          array base containers haskeline mtl pretty
        ];
        description = "Generate Haskell code from a type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "djinn-ghc" = callPackage
@@ -76877,7 +76877,7 @@ self: {
          async base containers djinn-lib ghc mtl transformers
        ];
        description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "djinn-lib" = callPackage
@@ -76890,7 +76890,7 @@ self: {
        editedCabalFile = "0zz4q631wpxdm4h499j0m1kin4n1ahnwzb0x2jh6vd463i89xlbk";
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Generate Haskell code from a type. Library extracted from djinn package.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "djinn-th" = callPackage
@@ -76903,8 +76903,8 @@ self: {
          base containers logict template-haskell
        ];
        description = "Generate executable Haskell code from a type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76925,8 +76925,8 @@ self: {
          time unix xdg-userdirs
        ];
        description = "Fedora image download tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -76939,7 +76939,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Difference lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dlist_1_0" = callPackage
@@ -76951,8 +76951,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Difference lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dlist-instances" = callPackage
@@ -76963,7 +76963,7 @@ self: {
        sha256 = "0nsgrr25r4qxv2kpn7i20hra8jjkyllxfrhh5hml3ysjdz010jni";
        libraryHaskellDepends = [ base dlist semigroups ];
        description = "Difference lists instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dlist-nonempty" = callPackage
@@ -76987,7 +76987,7 @@ self: {
          base base-compat criterion dlist dlist-instances
        ];
        description = "Non-empty difference lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dmc" = callPackage
@@ -76999,7 +76999,7 @@ self: {
        libraryHaskellDepends = [ base process ];
        testHaskellDepends = [ base hspec process QuickCheck ];
        description = "cmd for common cases";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "dmcc" = callPackage
@@ -77027,8 +77027,8 @@ self: {
          monad-control monad-logger random stm text unix unliftio websockets
        ];
        description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77044,8 +77044,8 @@ self: {
          base containers directory lens mtl process transformers
        ];
        description = "Complete bindings to the dmenu and dmenu2 command line tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77063,8 +77063,8 @@ self: {
          base containers directory dmenu lens mtl process transformers
        ];
        description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77082,8 +77082,8 @@ self: {
          base containers directory dmenu lens mtl process transformers
        ];
        description = "Mounting and unmounting linux devices as user with dmenu and pmount";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77101,8 +77101,8 @@ self: {
          base containers directory dmenu lens mtl process transformers
        ];
        description = "dmenu script for searching the web with customizable search engines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77127,7 +77127,7 @@ self: {
        doHaddock = false;
        testTarget = "spec";
        description = "DNS library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dnscache" = callPackage
@@ -77145,8 +77145,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Caching DNS resolver library and mass DNS resolver utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77159,8 +77159,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        description = "Asynchronous DNS RBL lookup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77173,8 +77173,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ dns_sd ];
        description = "DNS service discovery bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dns_sd = null;};
 
@@ -77188,7 +77188,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion mtl text ];
        description = "Do notation for free";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "do-notation" = callPackage
@@ -77200,7 +77200,7 @@ self: {
        libraryHaskellDepends = [ base indexed ];
        testHaskellDepends = [ base indexed ];
        description = "Generalize do-notation to work on monads and indexed monads simultaneously";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "do-notation-dsl" = callPackage
@@ -77216,7 +77216,7 @@ self: {
          base containers doctest doctest-discover temporary
        ];
        description = "An alternative to monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dobutok" = callPackage
@@ -77227,8 +77227,8 @@ self: {
        sha256 = "06wi9p4gyxqiwaih1hg5p4wypi77si5y8c1akqsvh3ssr0sds74r";
        libraryHaskellDepends = [ base ];
        description = "Creates the time intervals for CLI changing messages on the screen";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77240,7 +77240,7 @@ self: {
        sha256 = "1qps4zvk3qn2d93778cs2b6kf1k9fjgw5248hyx9v0n05crfw2i8";
        libraryHaskellDepends = [ base ];
        description = "The library is intended to print updated messages on the terminal screen";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-effects" = callPackage
@@ -77251,7 +77251,7 @@ self: {
        sha256 = "10xpr7nqhx1djsgcgfr40v7axkl8a0fxx16vrpvr7h525ygyibp5";
        libraryHaskellDepends = [ base dobutokO-frequency ];
        description = "A library to deal with SoX effects and possibilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-frequency" = callPackage
@@ -77262,7 +77262,7 @@ self: {
        sha256 = "11ngz39dqdcv6xkff9b590cbhd94gx1q71v6cz3birmhvbf8qwrm";
        libraryHaskellDepends = [ base ];
        description = "Helps to create experimental music. Working with frequencies and types.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-poetry" = callPackage
@@ -77284,7 +77284,7 @@ self: {
          uniqueness-periods vector
        ];
        description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-poetry-general" = callPackage
@@ -77295,7 +77295,7 @@ self: {
        sha256 = "0gdhihblshxq70av2x8ni7vywdfic750kwq7qsbhagrqr71fvqb1";
        libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ];
        description = "Helps to order the 7 or less words (first of all the Ukrainian ones) to obtain somewhat suitable for poetry or music text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO-poetry-general-languages" = callPackage
@@ -77311,7 +77311,7 @@ self: {
          uniqueness-periods-general vector
        ];
        description = "Helps to order the 7 or less words to obtain somewhat suitable for poetry or music text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO2" = callPackage
@@ -77334,7 +77334,7 @@ self: {
          mmsyn7ukr process uniqueness-periods vector
        ];
        description = "Helps to create experimental music from a file (or its part) and a Ukrainian text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO3" = callPackage
@@ -77350,7 +77350,7 @@ self: {
          mmsyn7s mmsyn7ukr process vector
        ];
        description = "Helps to create more complex experimental music from a file (especially timbre)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dobutokO4" = callPackage
@@ -77366,7 +77366,7 @@ self: {
          vector-doublezip
        ];
        description = "Helps to create experimental music. Uses SoX inside.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "doc-review" = callPackage
@@ -77391,8 +77391,8 @@ self: {
          xml-basic
        ];
        description = "Document review Web application, like http://book.realworldhaskell.org/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77411,8 +77411,8 @@ self: {
          text
        ];
        description = "Checks Haddock comments for pitfalls and version changes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77431,8 +77431,8 @@ self: {
          old-locale tagsoup time
        ];
        description = "Generate an HTML index of installed Haskell packages and their documentation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77466,8 +77466,8 @@ self: {
          vector
        ];
        description = "An API client for docker written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77490,8 +77490,8 @@ self: {
          turtle
        ];
        description = "Builds a docker image and caches all of its intermediate stages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77525,8 +77525,8 @@ self: {
        ];
        testHaskellDepends = [ base HTF text vector ];
        description = "A build tool for multiple docker image layers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77539,7 +77539,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A Haskell DSL for generating Dockerfiles";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dockerfile-creator" = callPackage
@@ -77560,7 +77560,7 @@ self: {
          hspec language-docker megaparsec mtl process template-haskell text
          th-lift th-lift-instances time
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "doclayout" = callPackage
@@ -77578,7 +77578,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion mtl text ];
        description = "A prettyprinting library for laying out text documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "docopt" = callPackage
@@ -77598,8 +77598,8 @@ self: {
          template-haskell text th-lift
        ];
        description = "A command-line interface parser that will make you smile";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77620,7 +77620,7 @@ self: {
          unordered-containers vinyl yaml
        ];
        description = "Vinyl-based records with hierarchical field names, default values and documentation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "docstrings" = callPackage
@@ -77633,7 +77633,7 @@ self: {
          base containers heredoc template-haskell
        ];
        description = "Docstrings for documentation in the repl";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "doctemplates" = callPackage
@@ -77659,7 +77659,7 @@ self: {
          aeson base containers criterion doclayout filepath mtl text
        ];
        description = "Pandoc-style document templates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "doctest" = callPackage
@@ -77688,7 +77688,7 @@ self: {
          stringbuilder syb transformers
        ];
        description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "doctest_0_17" = callPackage
@@ -77717,8 +77717,8 @@ self: {
          stringbuilder syb transformers
        ];
        description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -77740,7 +77740,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        doHaddock = false;
        description = "Easy way to run doctests via cabal";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "doctest-discover-configurator" = callPackage
@@ -77764,8 +77764,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        doHaddock = false;
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77781,8 +77781,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Generate driver file for doctest's cabal integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77798,7 +77798,7 @@ self: {
          base doctest-lib QuickCheck semigroups transformers
        ];
        description = "Run doctest's in a Cabal.Test.exitcode-stdio environment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "doctest-lib" = callPackage
@@ -77809,7 +77809,7 @@ self: {
        sha256 = "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2";
        libraryHaskellDepends = [ base ];
        description = "Parts of doctest exposed as library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "doctest-prop" = callPackage
@@ -77821,8 +77821,8 @@ self: {
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77839,8 +77839,8 @@ self: {
          servant-client text
        ];
        description = "Low-level bindings to the DocuSign API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77857,8 +77857,8 @@ self: {
          servant-client text
        ];
        description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77878,8 +77878,8 @@ self: {
          http-types servant-client servant-client-core text uuid
        ];
        description = "Client bindings for the DocuSign API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77898,8 +77898,8 @@ self: {
          optparse-generic text uuid
        ];
        description = "DocuSign examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77926,8 +77926,8 @@ self: {
          tasty-hunit temporary
        ];
        description = "Documentation generator for Vim plug-ins";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77956,8 +77956,8 @@ self: {
          urlencoded utility-ht
        ];
        description = "Automatic Bibtex and fulltext of scientific articles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -77978,7 +77978,7 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Flag packer & handler for flaggable data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dollaridoos" = callPackage
@@ -77989,7 +77989,7 @@ self: {
        sha256 = "1pipbyfpny8mq540rpfkgkwbc3mc13yf6xm1h9vxm0fnaa8kcbw9";
        libraryHaskellDepends = [ base profunctors semigroups ];
        description = "A newtype for monetary values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dom-events" = callPackage
@@ -78001,7 +78001,7 @@ self: {
        libraryHaskellDepends = [ base text unordered-containers ];
        testHaskellDepends = [ base ];
        description = "DOM Events expressed as Haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dom-lt" = callPackage
@@ -78015,7 +78015,7 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dom-parser" = callPackage
@@ -78036,7 +78036,7 @@ self: {
          xml-conduit
        ];
        description = "Simple monadic DOM parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dom-selector" = callPackage
@@ -78056,7 +78056,7 @@ self: {
          template-haskell text th-lift xml-conduit
        ];
        description = "DOM traversal by CSS selectors for xml-conduit package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "domain" = callPackage
@@ -78080,8 +78080,8 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell text th-orphans
        ];
        description = "Codegen helping you define domain models";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78100,7 +78100,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest pretty-simple ];
        description = "Domain authentication library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "domain-core" = callPackage
@@ -78116,8 +78116,8 @@ self: {
          th-lift-instances
        ];
        description = "Low-level API of \"domain\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78136,8 +78136,8 @@ self: {
        ];
        testHaskellDepends = [ domain optics rerebase ];
        description = "Integration of domain with optics";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78153,7 +78153,7 @@ self: {
        executableHaskellDepends = [ base containers lens mtl random ];
        testHaskellDepends = [ base containers hspec lens mtl random ];
        description = "A simulator for the board game Dominion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "domplate" = callPackage
@@ -78169,8 +78169,8 @@ self: {
          yaml
        ];
        description = "A simple templating library using HTML5 as its template language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78184,7 +78184,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
        description = "Datatypes and encoding for graphviz dot files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dot-linker" = callPackage
@@ -78210,8 +78210,8 @@ self: {
          unordered-containers
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78225,7 +78225,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers graphviz hxt text ];
        description = "Converter from GraphViz .dot format to yEd GraphML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dotenv" = callPackage
@@ -78253,7 +78253,7 @@ self: {
          hspec-megaparsec megaparsec process text transformers yaml
        ];
        description = "Loads environment variables from dotenv files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dotfs" = callPackage
@@ -78284,8 +78284,8 @@ self: {
        ];
        doHaddock = false;
        description = "Filesystem to manage and parse dotfiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78299,7 +78299,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        description = "A simple interface for building .dot graph files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dotnet-timespan" = callPackage
@@ -78310,7 +78310,7 @@ self: {
        sha256 = "1hws424hf4ifijmz2xn3jvwvayll5jig83bgkl9zavwipkzqvjnq";
        libraryHaskellDepends = [ base ];
        description = ".NET TimeSpan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "double-conversion" = callPackage
@@ -78327,7 +78327,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Fast conversion between double precision floating point and text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "double-extra" = callPackage
@@ -78343,7 +78343,7 @@ self: {
          rawstring-qm text
        ];
        description = "Missing presentations for Double numbers (fixed, scientific etc.)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "double-metaphone" = callPackage
@@ -78365,8 +78365,8 @@ self: {
        sha256 = "0libb7w3a8ffcr08x6s3xqzhbkxb8n111f53g638jr0xpz3r98yv";
        libraryHaskellDepends = [ base ];
        description = "Doublify API toolkit for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78378,7 +78378,7 @@ self: {
        sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd";
        libraryHaskellDepends = [ acl2 base ];
        description = "The Dove verification language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dovin" = callPackage
@@ -78405,7 +78405,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A proof assistant for Magic: The Gathering puzzles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dow" = callPackage
@@ -78423,8 +78423,8 @@ self: {
          array base directory elerea GLFW mersenne-random OpenGL
        ];
        description = "Dungeons of Wor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78437,7 +78437,7 @@ self: {
        libraryHaskellDepends = [ base bytestring feed tagsoup xml ];
        testHaskellDepends = [ base hspec ];
        description = "High-level file download based on URLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "download-curl" = callPackage
@@ -78450,7 +78450,7 @@ self: {
        editedCabalFile = "032f19gn7bnx3fpfdwclm1z1hsxaya6yml7p2hcg3b2ad6d11pyl";
        libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ];
        description = "High-level file download based on URLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "download-media-content" = callPackage
@@ -78467,8 +78467,8 @@ self: {
          base bytestring filepath http-enumerator tagsoup text
        ];
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78485,8 +78485,8 @@ self: {
          base directory filepath network-uri process safe
        ];
        description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78498,8 +78498,8 @@ self: {
        sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l";
        libraryHaskellDepends = [ base ];
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78519,8 +78519,8 @@ self: {
          reflection scientific text transformers
        ];
        description = "dozens api library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78534,8 +78534,8 @@ self: {
          array base ghc-prim pretty random vector
        ];
        description = "Data Parallel Haskell common config and debugging functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78554,8 +78554,8 @@ self: {
          old-time parseargs random vector
        ];
        description = "Data Parallel Haskell example programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78572,8 +78572,8 @@ self: {
          template-haskell vector
        ];
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78589,8 +78589,8 @@ self: {
          array base dph-base dph-prim-par ghc random template-haskell vector
        ];
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78607,8 +78607,8 @@ self: {
          pretty random template-haskell vector
        ];
        description = "Data Parallel Haskell lifted array combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78620,7 +78620,7 @@ self: {
        sha256 = "0csgd8ghbxv1vwp95dn98qv1zp8229fffm9j274bmjg857588i97";
        doHaddock = false;
        description = "(deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dph-prim-interface" = callPackage
@@ -78631,8 +78631,8 @@ self: {
        sha256 = "17m03gylc61d7mx26rz70kwmi014rv1g14683vraa1b77pci5h8j";
        libraryHaskellDepends = [ base dph-base random vector ];
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78649,8 +78649,8 @@ self: {
          vector
        ];
        description = "Data Parallel Haskell segmented arrays. (production version)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78666,8 +78666,8 @@ self: {
          base dph-base dph-prim-interface ghc-prim primitive random vector
        ];
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78679,7 +78679,7 @@ self: {
        sha256 = "10s6qq4ayh85wvhnyl7dfdr72a76irvg83s71lww8ig988599ygp";
        doHaddock = false;
        description = "(deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dpkg" = callPackage
@@ -78699,8 +78699,8 @@ self: {
        testSystemDepends = [ dpkg ];
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
@@ -78714,8 +78714,8 @@ self: {
          base containers deepseq random semigroups
        ];
        description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78739,7 +78739,7 @@ self: {
          optparse-applicative streaming-commons unix unordered-containers
        ];
        description = "a lightweight DNS proxy server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "drClickOn" = callPackage
@@ -78750,8 +78750,8 @@ self: {
        sha256 = "10rcmqa2x5xlh5pqfsg9dagf2lmrwc2bby3zklzv3x4s3yqg2ar3";
        libraryHaskellDepends = [ base containers ];
        description = "Monadic FRP";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78772,8 +78772,8 @@ self: {
          template-haskell text transformers
        ];
        description = "Automatic derivation of optimized QuickCheck random generators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78791,7 +78791,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "playing draw poker";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "drawille" = callPackage
@@ -78805,8 +78805,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A port of asciimoo's drawille to haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78829,8 +78829,8 @@ self: {
          time unordered-containers vector
        ];
        description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78847,8 +78847,8 @@ self: {
          base tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Simple schema management for arbitrary databases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78869,8 +78869,8 @@ self: {
          base drifter either postgresql-simple tasty tasty-hunit text
        ];
        description = "PostgreSQL support for the drifter schema migration tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78890,8 +78890,8 @@ self: {
          tasty-hunit text time transformers
        ];
        description = "SQLite support for the drifter schema migraiton tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78903,7 +78903,7 @@ self: {
        sha256 = "1c5mv0klhdavbsaa1mng0q15vy0cz6x8ijfzgaf1f18yyxvb0q1q";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        description = "Boozy streaming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "drmaa" = callPackage
@@ -78916,8 +78916,8 @@ self: {
        librarySystemDepends = [ drmaa ];
        libraryToolDepends = [ c2hs ];
        description = "A Haskell bindings to the DRMAA C library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {drmaa = null;};
 
@@ -78936,8 +78936,8 @@ self: {
          aeson base bytestring containers extensible formatting hspec
          microlens req servant-server text warp
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78966,8 +78966,8 @@ self: {
          servant-client-core text
        ];
        description = "Dropbox API client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -78989,8 +78989,8 @@ self: {
          urlencoded utf8-string
        ];
        description = "A library to access the Dropbox HTTP API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79009,8 +79009,8 @@ self: {
          time
        ];
        description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79026,7 +79026,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base bytestring pureMD5 ];
        description = "An implementation of the Drunken Bishop visual fingerprinting algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ds-kanren" = callPackage
@@ -79040,8 +79040,8 @@ self: {
        libraryHaskellDepends = [ base containers logict ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79061,8 +79061,8 @@ self: {
          string-conversions
        ];
        description = "Helper functions for setting up Double Submit Cookie defense for forms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79090,8 +79090,8 @@ self: {
          test-framework-quickcheck2 text vector
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79109,8 +79109,8 @@ self: {
          parallel primitive repa strict transformers vector
        ];
        description = "DSMC library for rarefied gas dynamics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79130,8 +79130,8 @@ self: {
          mtl repa strict transformers vector
        ];
        description = "DSMC toolkit for rarefied gas dynamics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79143,8 +79143,8 @@ self: {
        sha256 = "1vv32n736ncjsy4psp8zlqmpp0r7mncjq65zwkhq5i99jx4chb1q";
        libraryHaskellDepends = [ base parsec ];
        description = "Haskell Doge Serialized Object Notation Parser";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79156,8 +79156,8 @@ self: {
        sha256 = "1zflz9vhcz7psssn6hrizmwdmrvpagxhl0648k6f1n9xj50kp99y";
        libraryHaskellDepends = [ base parsec ];
        description = "DSON parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79172,7 +79172,7 @@ self: {
        libraryHaskellDepends = [ array base containers random ];
        testHaskellDepends = [ array base containers QuickCheck ];
        description = "Haskell Digital Signal Processing";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "dstring" = callPackage
@@ -79183,8 +79183,8 @@ self: {
        sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
        libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        description = "Difference strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79207,7 +79207,7 @@ self: {
          text vector
        ];
        description = "DSV (delimiter-separated values)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dtab" = callPackage
@@ -79227,7 +79227,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dtd" = callPackage
@@ -79246,8 +79246,8 @@ self: {
          uri-conduit xml-catalog xml-conduit xml-types
        ];
        description = "Parse and render DTD files (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79263,8 +79263,8 @@ self: {
          attoparsec base containers dtd-types text xml-types
        ];
        description = "Parse and render XML DTDs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79276,7 +79276,7 @@ self: {
        sha256 = "1h5ypjnpjim2lwlc6jfp8ixqg7zbkj7fg2kpnlwnyj29n9g58rka";
        libraryHaskellDepends = [ base text xml-types ];
        description = "Basic types for representing XML DTDs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dtrace" = callPackage
@@ -79289,7 +79289,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to the DTrace system tracing utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dtw" = callPackage
@@ -79306,8 +79306,8 @@ self: {
          test-framework-quickcheck2 thyme vector vector-space
        ];
        description = "(Fast) Dynamic Time Warping";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79321,7 +79321,7 @@ self: {
        editedCabalFile = "1cm80lc3p8bpzj0crxccx2fp33p171gz4j56r9fc5g5kza390nrb";
        libraryHaskellDepends = [ base ];
        description = "Dual category";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dual-game" = callPackage
@@ -79340,7 +79340,7 @@ self: {
          base bifunctors cereal gloss network websockets
        ];
        description = "Network multiplayer 2D shooting game";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dual-tree" = callPackage
@@ -79358,8 +79358,8 @@ self: {
          base monoid-extras QuickCheck semigroups testing-feat
        ];
        description = "Rose trees with cached and accumulating monoidal annotations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79377,7 +79377,7 @@ self: {
        ];
        description = "Automatically generate dual constructions";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79403,7 +79403,7 @@ self: {
          tasty-quickcheck text time uri-bytestring xml-conduit xml-types
        ];
        description = "XML streaming parser/renderer for the Dublin Core standard elements";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "duckling" = callPackage
@@ -79434,7 +79434,7 @@ self: {
        ];
        description = "A Haskell library for parsing text into structured data";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "duet" = callPackage
@@ -79461,8 +79461,8 @@ self: {
          monad-logger mtl parsec syb text
        ];
        description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79480,8 +79480,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A computer “algebra” system that knows nothing about algebra, at the core";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79502,7 +79502,7 @@ self: {
          template-haskell text
        ];
        description = "Dumps the names and values of expressions to ease debugging";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "dump-core" = callPackage
@@ -79519,8 +79519,8 @@ self: {
          text
        ];
        description = "A plug-in for rendering GHC core";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79537,7 +79537,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit transformers ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dunai-core" = callPackage
@@ -79551,8 +79551,8 @@ self: {
          base MonadRandom transformers transformers-base
        ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79566,7 +79566,7 @@ self: {
          base dunai normaldistribution QuickCheck
        ];
        description = "Testing library for Dunai";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "duplo" = callPackage
@@ -79602,8 +79602,8 @@ self: {
          base HUnit MissingH QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Frontend development build tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79617,8 +79617,8 @@ self: {
        editedCabalFile = "018pwi48hx6jcy9gkbbc4gcbjxa2n8b4lbfmd18mnm49ymwyyqlv";
        libraryHaskellDepends = [ base bytestring directory filepath ];
        description = "durable/atomic file system writes (from rio package)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79635,7 +79635,7 @@ self: {
          base doctest hspec parsec template-haskell time
        ];
        description = "A tiny compile-time time utility library inspired by zeit/ms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dustme" = callPackage
@@ -79657,7 +79657,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dvault" = callPackage
@@ -79675,8 +79675,8 @@ self: {
          process vector
        ];
        description = "Dead simple password manager";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79699,8 +79699,8 @@ self: {
          test-framework-quickcheck2 unordered-containers
        ];
        description = "Efficient automatic differentiation and code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79714,8 +79714,8 @@ self: {
        libraryPkgconfigDepends = [ dvdread ];
        libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dvdread = null;};
 
@@ -79727,8 +79727,8 @@ self: {
        sha256 = "0dp6acmrvlns85nzbbh65vd6fjam04h11kxd9bk6j6hqa2qaqa43";
        libraryHaskellDepends = [ base bytestring filepath transformers ];
        description = "Read/write DVI and TFM file";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79741,7 +79741,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Dvorak encoding for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dwarf" = callPackage
@@ -79753,8 +79753,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79770,7 +79770,7 @@ self: {
          base binary bytestring containers text text-show transformers
        ];
        description = "Parser for DWARF debug format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dwarfadt" = callPackage
@@ -79789,8 +79789,8 @@ self: {
        ];
        executableHaskellDepends = [ base containers dwarf-el ];
        description = "High-level wrapper around the dwarf library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79803,7 +79803,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A minimal testing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dx9base" = callPackage
@@ -79814,8 +79814,8 @@ self: {
        sha256 = "16gwlpxfgh78sx7cb2ryqklhz5smhwk51ma260d6rg082nhy5y3i";
        libraryHaskellDepends = [ base Win32 ];
        description = "Backend for a binding to the Microsoft DirectX 9 API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "dx9d3d" = callPackage
@@ -79827,8 +79827,8 @@ self: {
        libraryHaskellDepends = [ base dx9base Win32 ];
        librarySystemDepends = [ d3d9 ];
        description = "A binding to the Microsoft DirectX 9 API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {d3d9 = null;};
 
   "dx9d3dx" = callPackage
@@ -79840,8 +79840,8 @@ self: {
        libraryHaskellDepends = [ base dx9base dx9d3d Win32 ];
        librarySystemDepends = [ d3dx9 ];
        description = "A binding to the Microsoft DirectX 9 D3DX API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" ];
      }) {d3dx9 = null;};
 
   "dyckword" = callPackage
@@ -79857,8 +79857,8 @@ self: {
        libraryHaskellDepends = [ base exact-combinatorics text ];
        testHaskellDepends = [ ansi-terminal base hspec text ];
        description = "A library for working with binary Dyck words";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79872,8 +79872,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base generics-sop ];
        description = "Programatically identify space leaks in your program";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79890,7 +79890,7 @@ self: {
          text unordered-containers vector
        ];
        description = "A dynamic type for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dynamic-cabal" = callPackage
@@ -79911,8 +79911,8 @@ self: {
          tasty-hunit tasty-th
        ];
        description = "Access the functions from the Cabal library without depending on it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79929,7 +79929,7 @@ self: {
          base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers
        ];
        description = "Draw and update graphs in real time with OpenGL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dynamic-graphs" = callPackage
@@ -79956,8 +79956,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion primitive ];
        description = "Dynamic graph algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -79969,7 +79969,7 @@ self: {
        sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz";
        libraryHaskellDepends = [ base containers template-haskell unix ];
        description = "Automatically derive dynamic linking methods from a data type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dynamic-loader" = callPackage
@@ -79985,7 +79985,7 @@ self: {
          base directory ghc-prim hashable hashtables time transformers
        ];
        description = "lightweight loader of GHC-based modules or packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dynamic-mvector" = callPackage
@@ -79996,8 +79996,8 @@ self: {
        sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2";
        libraryHaskellDepends = [ base primitive vector ];
        description = "A wrapper around MVector that enables pushing, popping and extending";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80016,8 +80016,8 @@ self: {
          base doctest ghc hspec lens QuickCheck transformers
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80044,8 +80044,8 @@ self: {
          vector-space
        ];
        description = "Interactive diagram windows";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80066,8 +80066,8 @@ self: {
          HUnit-Plus unordered-containers utf8-string
        ];
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80083,7 +80083,7 @@ self: {
          base binary bytestring hashable unordered-containers
        ];
        description = "Optionally serializable dynamic state keyed by type";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "dynamodb-simple" = callPackage
@@ -80110,8 +80110,8 @@ self: {
          unordered-containers
        ];
        description = "Typesafe library for working with DynamoDB database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80124,8 +80124,8 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-paths ];
        testHaskellDepends = [ base ghc ghc-paths hspec ];
        description = "Dynamically runtime loading packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80157,8 +80157,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "your dynamic optimization buddy";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80175,7 +80175,7 @@ self: {
          process time unix xdg-basedir
        ];
        description = "Dynamic reconfiguration in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "dywapitchtrack" = callPackage
@@ -80186,8 +80186,8 @@ self: {
        sha256 = "1fmn8aypgcvmbpfs0dr8yfkqq4p5jw2mh0wldjhhl6bffymkszgf";
        libraryHaskellDepends = [ base bytestring transformers ];
        description = "Bindings to the dywapitchtrack pitch tracking library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80223,8 +80223,8 @@ self: {
          unordered-containers vector
        ];
        description = "Configure dzen2 bars in Dhall language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80237,7 +80237,7 @@ self: {
        libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80251,8 +80251,8 @@ self: {
        libraryHaskellDepends = [ base dlist template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Template Haskell library for writing monadic expressions more easily";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80267,7 +80267,7 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Socket operations with timeouts";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "eap" = callPackage
@@ -80284,7 +80284,7 @@ self: {
          base binary bytestring cryptonite memory mtl pretty-hex
        ];
        description = "Extensible Authentication Protocol (EAP)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "earclipper" = callPackage
@@ -80299,8 +80299,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base filepath hspec ];
        description = "Ear Clipping Triangulation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80312,7 +80312,7 @@ self: {
        sha256 = "0nssl7n697rzwlfb5lq4kl64j4mrb4i19rp5kzjpmc7iin9fzxsf";
        libraryHaskellDepends = [ base vector ];
        description = "Binding to C++ earcut library";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "early" = callPackage
@@ -80333,8 +80333,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Early return syntax in do-notation (GHC plugin)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80346,7 +80346,7 @@ self: {
        sha256 = "1psg2d64igvjgskzk8y92xxbh14rzlnvcpv8l3nqx8x5950hxdxk";
        libraryHaskellDepends = [ base data-default ];
        description = "Robert Penner's easing equations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "easy-api" = callPackage
@@ -80361,8 +80361,8 @@ self: {
          aeson base bytestring either http-conduit mtl resourcet text
        ];
        description = "Utility code for building HTTP API bindings more quickly";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80375,7 +80375,7 @@ self: {
        libraryHaskellDepends = [ base hspec ];
        testHaskellDepends = [ base hspec ];
        description = "Parses command line arguments";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "easy-bitcoin" = callPackage
@@ -80392,8 +80392,8 @@ self: {
          deepseq lens postgresql-simple safe text
        ];
        description = "types and functions for bitcoin applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80405,7 +80405,7 @@ self: {
        sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
        libraryHaskellDepends = [ base directory filepath time unix ];
        description = "Cross-platform File handling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "easyjson" = callPackage
@@ -80420,8 +80420,8 @@ self: {
          base mtl parsec text unordered-containers vector
        ];
        description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80433,8 +80433,8 @@ self: {
        sha256 = "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk";
        libraryHaskellDepends = [ base process ];
        description = "A tiny plotting library, utilizes gnuplot for plotting";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80446,7 +80446,7 @@ self: {
        sha256 = "0vj9j41706lalxc2sankpnxrn3mg650wfd4rl6yw32pns6bdq86f";
        libraryHaskellDepends = [ base bytestring containers mtl zlib ];
        description = "User-friendly creation of EPS, PostScript, and PDF files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "easytensor" = callPackage
@@ -80467,8 +80467,8 @@ self: {
          base constraints-deriving dimensions time
        ];
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80480,8 +80480,8 @@ self: {
        sha256 = "0gi8p76x7h78frv3yrg6a7qnzjczx3j7warqclc36pkwv050dn3i";
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
        description = "Use easytensor with vulkan-api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80501,8 +80501,8 @@ self: {
          base directory hedgehog profunctors transformers unix
        ];
        description = "Simple, expressive testing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80514,8 +80514,8 @@ self: {
        sha256 = "0r3pl63fxrrfafwp3791xh0c47pb4jqqcm9lk52g0gaqg0s8x5qk";
        libraryHaskellDepends = [ base time ];
        description = "Time in ebeats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80534,8 +80534,8 @@ self: {
          aeson base bytestring cond directory parsec
        ];
        description = "Parser combinators & EBNF, BFFs!";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80555,7 +80555,7 @@ self: {
          QuickCheck SHA
        ];
        description = "The Amazon EC2 style signature calculator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ec2-unikernel" = callPackage
@@ -80574,8 +80574,8 @@ self: {
          directory filepath lens process semigroups temporary text time unix
        ];
        description = "A handy tool for uploading unikernels to Amazon's EC2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80594,8 +80594,8 @@ self: {
        testHaskellDepends = [ base base16-bytestring bytestring Cabal ];
        benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Elliptic Curve Cryptography for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80607,8 +80607,8 @@ self: {
        sha256 = "1j2h568k2j8kpclvam3hghi13ddyas5d7c8nf469gwr80wmnyqxs";
        libraryHaskellDepends = [ base bytestring eccrypto ];
        description = "provides \"ed25519\" API using \"eccrypto\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80625,7 +80625,7 @@ self: {
        ];
        description = "Basic ECDSA signing implementation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "echo" = callPackage
@@ -80640,7 +80640,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
        description = "A cross-platform, cross-console way to handle echoing terminal input";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ecma262" = callPackage
@@ -80658,8 +80658,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A ECMA-262 interpreter library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80675,7 +80675,7 @@ self: {
          base containers kan-extensions mtl transformers
        ];
        description = "A GHC.Generics based entity component system.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ecu" = callPackage
@@ -80693,8 +80693,8 @@ self: {
        ];
        executableSystemDepends = [ canlib ];
        description = "Tools for automotive ECU development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {canlib = null;};
 
@@ -80714,7 +80714,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Ed25519 cryptographic signatures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ed25519-donna" = callPackage
@@ -80725,7 +80725,7 @@ self: {
        sha256 = "0kpqh4fzij9152sazbwxmbzv1b16ih17lwmr1bkii2xi5kkjbnvd";
        libraryHaskellDepends = [ base bytestring crypto-api ];
        description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eddie" = callPackage
@@ -80742,8 +80742,8 @@ self: {
          base bifunctors classy-prelude hint optparse-applicative safe
        ];
        description = "Command line file filtering with haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80775,8 +80775,8 @@ self: {
          tasty-golden text
        ];
        description = "Templating language with similar syntax and features to Liquid or Jinja2";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80788,8 +80788,8 @@ self: {
        sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj";
        libraryHaskellDepends = [ base containers deepseq parallel ];
        description = "Semi-explicit parallel programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80801,8 +80801,8 @@ self: {
        sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q";
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80823,8 +80823,8 @@ self: {
          ghc-events-parallel gtk mtl text zip-archive
        ];
        description = "A Tool to Visualize Parallel Functional Program Executions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80836,7 +80836,7 @@ self: {
        sha256 = "0zxg57381wi23r17mgzl16ajgg61icxyy25kxyxyji9hw5aw22nw";
        libraryHaskellDepends = [ base binary bytestring text ];
        description = "EDF parsing library";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "edge" = callPackage
@@ -80854,8 +80854,8 @@ self: {
          ALUT base cmdtheline containers gloss OpenAL random wraparound
        ];
        description = "Top view space combat arcade game";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80883,8 +80883,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Tools for efficient immutable graphs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80896,8 +80896,8 @@ self: {
        sha256 = "1bznnqa4jmaj315sp1r0zr8g15s91yxbzdglki733hvwrsir05dj";
        libraryHaskellDepends = [ base bytestring cereal hedis ];
        description = "Statically typechecked client for Redis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80918,8 +80918,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A monad for rewriting things";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -80943,7 +80943,7 @@ self: {
          array base containers criterion deepseq process random time unix
        ];
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "edit-distance-linear" = callPackage
@@ -80964,7 +80964,7 @@ self: {
          array base bytestring criterion text text-metrics
        ];
        description = "Efficient implementation of the Levenshtein edit distance in linear memory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "edit-distance-vector" = callPackage
@@ -80978,7 +80978,7 @@ self: {
          base QuickCheck quickcheck-instances vector
        ];
        description = "Calculate edit distances and edit scripts between vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "edit-lenses" = callPackage
@@ -80991,8 +80991,8 @@ self: {
          base containers data-default lattices mtl
        ];
        description = "Symmetric, stateful edit lenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81006,7 +81006,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Programs demoing the use of symmetric, stateful edit lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "editable" = callPackage
@@ -81017,8 +81017,8 @@ self: {
        sha256 = "15jz0b913xd8yd3nzk4vrlj0vzbhjarl05h9j0mdcfgxns5j0yxi";
        libraryHaskellDepends = [ base text vty vty-ui ];
        description = "Interactive editors for Generics";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81030,8 +81030,8 @@ self: {
        sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
        libraryHaskellDepends = [ base ];
        description = "Bindings to the editline library (libedit)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81054,7 +81054,7 @@ self: {
          base bytestring conduit conduit-extra resourcet
        ];
        description = "Open the user's $VISUAL or $EDITOR for text input";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "editpipe" = callPackage
@@ -81071,7 +81071,7 @@ self: {
          base optparse-applicative process temporary unix
        ];
        description = "Edit stdin using an editor before sending to stdout";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "effect-handlers" = callPackage
@@ -81089,8 +81089,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81102,8 +81102,8 @@ self: {
        sha256 = "0lrx586ij1c09hv1rj14l2xi3papzdg8496kas6czdld0kfj8kw1";
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81115,8 +81115,8 @@ self: {
        sha256 = "08zalj8svp78ykqbf5nhd6khgygz8dplcvjd19w3hvgm08y4kxqi";
        libraryHaskellDepends = [ base constraints mtl transformers ];
        description = "Reducing the pain of transformer stacks with duplicated effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81138,7 +81138,7 @@ self: {
        ];
        description = "A monadic embedding of aspect oriented programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "effective-aspects-mzv" = callPackage
@@ -81159,7 +81159,7 @@ self: {
        ];
        description = "A monadic embedding of aspect oriented programming, using \"Monads, Zippers and Views\" instead of mtl";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "effects" = callPackage
@@ -81170,7 +81170,7 @@ self: {
        sha256 = "06cx0l9vxpjpgc1cxai19hw9rxfq89m61qvf7wxp1w2xd6yqa7xk";
        libraryHaskellDepends = [ base containers newtype-generics void ];
        description = "Computational Effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "effects-parser" = callPackage
@@ -81181,7 +81181,7 @@ self: {
        sha256 = "0vjjld95kg02a4nr2a0lwlcwaq3867qvbbjk8b1g6fd3d1qj456r";
        libraryHaskellDepends = [ base effects ];
        description = "Parser Effect for the Control.Effects Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "effet" = callPackage
@@ -81201,7 +81201,7 @@ self: {
          transformers-base
        ];
        description = "An Effect System based on Type Classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "effin" = callPackage
@@ -81212,8 +81212,8 @@ self: {
        sha256 = "1kq5n25m7bzw4zrz35b5zc8r4q0p0ai801hdf7r537fim0ia973x";
        libraryHaskellDepends = [ base mtl ];
        description = "A Typeable-free implementation of extensible effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81249,8 +81249,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion transformers ];
        description = "Programming language with non-linear pattern-matching against non-free data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81272,8 +81272,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Manipulating Egison patterns: abstract syntax, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81293,8 +81293,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Parser and pretty printer for Egison pattern expressions in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81317,8 +81317,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Parser and pretty printer for Egison pattern expressions to use with TH";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81332,8 +81332,8 @@ self: {
          base egison mtl parsec template-haskell
        ];
        description = "A quasi quotes for using Egison expression in Haskell code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81352,8 +81352,8 @@ self: {
          transformers
        ];
        description = "A tutorial program for the Egison programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81365,7 +81365,7 @@ self: {
        sha256 = "05yjwrywpmh58rgx2if1za78g0x9xziv74cpvwnp7pr9b4s9i6zv";
        libraryHaskellDepends = [ base ];
        description = "Egyptian fractions in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ehaskell" = callPackage
@@ -81384,7 +81384,7 @@ self: {
        ];
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81405,8 +81405,8 @@ self: {
          transformers
        ];
        description = "Embedded haskell template using quasiquotes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81425,8 +81425,8 @@ self: {
        ];
        librarySystemDepends = [ eibclient ];
        description = "EIBd Client";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {eibclient = null;};
 
@@ -81446,8 +81446,8 @@ self: {
          base binary bytestring ghc-prim mtl primitive transformers vector
        ];
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81468,7 +81468,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Combinators for working with sums";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "either-both" = callPackage
@@ -81480,7 +81480,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Either or both";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "either-list-functions" = callPackage
@@ -81492,8 +81492,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81509,7 +81509,7 @@ self: {
        testHaskellDepends = [ base doctest hspec transformers ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "‘MonadFail’ instance for a wrapper of ‘ExceptT String m a’";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "either-unwrap" = callPackage
@@ -81520,8 +81520,8 @@ self: {
        sha256 = "0g1f5m7bcpnyg2sdvwx8x34ml6dqfrn326s8pbfciaqqf7wddayc";
        libraryHaskellDepends = [ base ];
        description = "Functions for probing and unwrapping values inside of Either";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81533,7 +81533,7 @@ self: {
        sha256 = "069w3qbyghs1w8wqimj54dwblq5rx1ylgflzzc4cwnjn0aqzgs45";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ejdb2-binding" = callPackage
@@ -81553,8 +81553,8 @@ self: {
          aeson base directory tasty tasty-hunit unordered-containers vector
        ];
        description = "Binding to EJDB2 C library, an embedded JSON noSQL database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ejdb2 = null; libejdb2 = null;};
 
@@ -81575,7 +81575,7 @@ self: {
          snap-server text time transformers unordered-containers
        ];
        description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-bosun" = callPackage
@@ -81592,8 +81592,8 @@ self: {
          text time unordered-containers vector wreq
        ];
        description = "Send ekg metrics to a Bosun instance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81610,8 +81610,8 @@ self: {
          vector
        ];
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81629,8 +81629,8 @@ self: {
          lens resourcet semigroups text time unordered-containers
        ];
        description = "An ekg backend for Amazon Cloudwatch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81649,7 +81649,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base ];
        description = "Tracking of system metrics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-elastic" = callPackage
@@ -81665,8 +81665,8 @@ self: {
          unordered-containers wreq
        ];
        description = "Push metrics to elastic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81684,8 +81684,8 @@ self: {
          http-client lens req text time unordered-containers
        ];
        description = "Push metrics to elasticsearch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81702,7 +81702,7 @@ self: {
          unordered-containers vector
        ];
        description = "An EKG backend to send statistics to influxdb";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-json" = callPackage
@@ -81718,7 +81718,7 @@ self: {
          aeson base ekg-core text unordered-containers
        ];
        description = "JSON encoding of ekg metrics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-log" = callPackage
@@ -81734,8 +81734,8 @@ self: {
          time unix unordered-containers
        ];
        description = "Push metrics to a log file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81755,7 +81755,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Easily expose your EKG metrics to Prometheus";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ekg-push" = callPackage
@@ -81772,8 +81772,8 @@ self: {
          base bytestring ekg-core text time unordered-containers
        ];
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81794,8 +81794,8 @@ self: {
          unordered-containers
        ];
        description = "Passes ekg statistics to rrdtool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81811,7 +81811,7 @@ self: {
          base bytestring ekg-core network text time unordered-containers
        ];
        description = "Push metrics to statsd";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ekg-wai" = callPackage
@@ -81831,8 +81831,8 @@ self: {
          text time transformers unordered-containers wai wai-app-static warp
        ];
        description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81844,7 +81844,7 @@ self: {
        sha256 = "1am1j05z79prlybq3hg8vr4gwhl354af4dg9y1qr57vpp6gcpfwv";
        libraryHaskellDepends = [ base hmatrix safe ];
        description = "Find the elbow point";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "electrum-mnemonic" = callPackage
@@ -81856,7 +81856,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "elenco-albero" = callPackage
@@ -81868,7 +81868,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "make tree from a list";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "elerea" = callPackage
@@ -81882,7 +81882,7 @@ self: {
          base containers transformers transformers-base
        ];
        description = "A minimalistic FRP library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elerea-examples" = callPackage
@@ -81895,8 +81895,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81909,7 +81909,7 @@ self: {
        libraryHaskellDepends = [ base elerea SDL ];
        description = "Elerea FRP wrapper for SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "elevator" = callPackage
@@ -81920,8 +81920,8 @@ self: {
        sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2";
        libraryHaskellDepends = [ base extensible transformers ];
        description = "Immediately lifts to a desired level";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81934,7 +81934,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [ base bytestring containers hspec ];
        description = "An Elf parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eliminators" = callPackage
@@ -81954,7 +81954,7 @@ self: {
        testHaskellDepends = [ base hspec singleton-nats singletons ];
        testToolDepends = [ hspec-discover ];
        description = "Dependently typed elimination functions using singletons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elision" = callPackage
@@ -81968,8 +81968,8 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        executableHaskellDepends = [ base ];
        description = "Arrows with holes";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -81995,8 +81995,8 @@ self: {
          tasty-quickcheck text wl-pprint-text
        ];
        description = "Elliptic curve library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82013,7 +82013,7 @@ self: {
          aeson base containers hspec QuickCheck text
        ];
        description = "Derive Elm types and Json code from Haskell types, using aeson's options";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -82029,7 +82029,7 @@ self: {
          template-haskell
        ];
        description = "Compile Elm code to JS within Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-compiler" = callPackage
@@ -82067,7 +82067,7 @@ self: {
          unordered-containers
        ];
        description = "Values to help with elm-package, elm-make, and elm-lang.org.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-core-sources" = callPackage
@@ -82082,7 +82082,7 @@ self: {
          base bytestring containers file-embed template-haskell
        ];
        description = "Source files for the Elm runtime and standard libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-export" = callPackage
@@ -82104,7 +82104,7 @@ self: {
        ];
        description = "A library to generate Elm types from Haskell source";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "elm-export-persistent" = callPackage
@@ -82120,8 +82120,8 @@ self: {
          unordered-containers
        ];
        description = "elm-export persistent entities";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ jb55 ];
      }) {};
 
   "elm-get" = callPackage
@@ -82146,7 +82146,7 @@ self: {
          mtl network optparse-applicative process vector
        ];
        description = "Tool for sharing and using Elm libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-hybrid" = callPackage
@@ -82160,7 +82160,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Combine Elm with Haskell for data based applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-init" = callPackage
@@ -82180,7 +82180,7 @@ self: {
          directory file-embed filepath process text time
        ];
        description = "Set up basic structure for an elm project";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "elm-make" = callPackage
@@ -82200,7 +82200,7 @@ self: {
          optparse-applicative text
        ];
        description = "A build tool for Elm projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-package" = callPackage
@@ -82229,7 +82229,7 @@ self: {
          time unordered-containers vector zip-archive
        ];
        description = "Package manager for Elm libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-reactor" = callPackage
@@ -82253,7 +82253,7 @@ self: {
          unordered-containers websockets websockets-snap
        ];
        description = "Interactive development tool for Elm programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-repl" = callPackage
@@ -82278,7 +82278,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "a REPL for Elm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-server" = callPackage
@@ -82297,7 +82297,7 @@ self: {
          process snap-core snap-server unordered-containers
        ];
        description = "Server for developing Elm projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-street" = callPackage
@@ -82320,8 +82320,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        doHaddock = false;
        description = "Crossing the road between Haskell and Elm";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82342,7 +82342,7 @@ self: {
          unordered-containers
        ];
        description = "Elm syntax and pretty-printing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm-websocket" = callPackage
@@ -82371,8 +82371,8 @@ self: {
          warp websockets
        ];
        description = "Generate ELM code from a Wai websocket application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82388,7 +82388,7 @@ self: {
          base blaze-markup Elm shakespeare-js text yesod-core
        ];
        description = "The Elm language Yesod compatibility module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elm2nix" = callPackage
@@ -82413,7 +82413,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Turn your Elm project into buildable Nix project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elminator" = callPackage
@@ -82431,7 +82431,7 @@ self: {
          aeson base containers mtl template-haskell text
        ];
        description = "Generate ELM types/encoders/decoders from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elo" = callPackage
@@ -82443,7 +82443,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty ];
        description = "Elo Rating Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "elocrypt" = callPackage
@@ -82466,7 +82466,7 @@ self: {
        ];
        description = "Generate easy-to-remember, hard-to-guess passwords";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "elsa" = callPackage
@@ -82487,8 +82487,8 @@ self: {
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
        description = "A tiny language for understanding the lambda-calculus";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82506,8 +82506,8 @@ self: {
          aeson base bytestring elynx-tools optparse-applicative slynx tlynx
        ];
        description = "Validate and (optionally) redo ELynx analyses";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82530,7 +82530,7 @@ self: {
          base containers elynx-tools hmatrix hspec mwc-random vector
        ];
        description = "Simulate molecular sequences along trees";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "elynx-nexus" = callPackage
@@ -82542,7 +82542,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        testHaskellDepends = [ base hspec ];
        description = "Import and export Nexus files";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "elynx-seq" = callPackage
@@ -82562,7 +82562,7 @@ self: {
          base bytestring elynx-tools hspec matrices vector
        ];
        description = "Handle molecular sequences";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "elynx-tools" = callPackage
@@ -82584,7 +82584,7 @@ self: {
          vector zlib
        ];
        description = "Tools for ELynx";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "elynx-tree" = callPackage
@@ -82609,8 +82609,8 @@ self: {
          base criterion elynx-tools microlens mwc-random parallel
        ];
        description = "Handle phylogenetic trees";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82629,8 +82629,8 @@ self: {
          base doctest tasty tasty-hspec tasty-quickcheck xkbcommon
        ];
        description = "library to parse emacs style keybinding into the modifiers and the chars";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82650,8 +82650,8 @@ self: {
          transformers-base vector void
        ];
        description = "Utilities to write Emacs dynamic modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82668,8 +82668,8 @@ self: {
          old-time parsec process time
        ];
        description = "Sending eMail in Haskell made easy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82691,8 +82691,8 @@ self: {
          tasty-quickcheck text time
        ];
        description = "Parsing and rendering of email and MIME headers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82708,8 +82708,8 @@ self: {
          aeson attoparsec base bytestring containers HTTP network
        ];
        description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82726,7 +82726,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
        description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "email-validate-json" = callPackage
@@ -82737,7 +82737,7 @@ self: {
        sha256 = "06fwm2m83pqp1l4sij7vmxhcry2w8dcp52cwwvpkfimw8iszxqqc";
        libraryHaskellDepends = [ aeson base email-validate text ];
        description = "Aeson instances for email-validate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "email-validator" = callPackage
@@ -82762,7 +82762,7 @@ self: {
          parallel-io pcre-light tasty tasty-hunit
        ];
        description = "Perform basic syntax and deliverability checks on email addresses";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "emailaddress" = callPackage
@@ -82782,8 +82782,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Wrapper around email-validate library adding instances for common type classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82806,8 +82806,8 @@ self: {
          text-icu time word8
        ];
        description = "An email parser that will parse everything";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82824,8 +82824,8 @@ self: {
          base filepath her-lexer MissingH process
        ];
        description = "Embed the values in scope in the haddock documentation of the module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82837,8 +82837,8 @@ self: {
        sha256 = "07xc7kdnlbfwr08zhgjphbcmn8ycilp6pna3nk4y0w2hw87g7db0";
        libraryHaskellDepends = [ base embeddock time ];
        description = "Example of using embeddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82850,8 +82850,8 @@ self: {
        sha256 = "1nk689j21ghaiymqnddlf4j8pgb9z61xflfrcgxw3zrxiv5jslk6";
        libraryHaskellDepends = [ base chronos ];
        description = "execute actions periodically while avoiding drift";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82870,8 +82870,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "support for embroidery formats in haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82902,7 +82902,7 @@ self: {
          vector vector-sized
        ];
        description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "emgm" = callPackage
@@ -82914,8 +82914,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit QuickCheck syb ];
        description = "Extensible and Modular Generics for the Masses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82934,7 +82934,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "emoji utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "emojis" = callPackage
@@ -82946,7 +82946,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base HUnit text ];
        description = "Conversion between emoji characters and their names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "empty" = callPackage
@@ -82957,7 +82957,7 @@ self: {
        sha256 = "0ap7qby3n5qiwf791z4li05h0l6p6xi899wkmg6x8z6bb8z9q2d9";
        doHaddock = false;
        description = "Ceci n'est pas une package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "empty-monad" = callPackage
@@ -82968,8 +82968,8 @@ self: {
        sha256 = "0h68fff0qpyapkpsqcd6mgg8nyxcbjsw389dv8z8vm4hrqh1pip5";
        libraryHaskellDepends = [ base ];
        description = "A container that always has no values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -82986,8 +82986,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) enchant;};
 
@@ -83008,7 +83008,7 @@ self: {
          transformers transformers-base
        ];
        description = "Catching all exceptions from within an enclosed computation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "encode-string" = callPackage
@@ -83024,7 +83024,7 @@ self: {
          base bytestring QuickCheck quickcheck-instances text
        ];
        description = "Safe string conversion and encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "encoding" = callPackage
@@ -83045,8 +83045,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit QuickCheck ];
        description = "A library for various character encodings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83060,8 +83060,8 @@ self: {
          base chunked-data deepseq transformers-base
        ];
        description = "Encoding-aware file I/O";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83085,8 +83085,8 @@ self: {
          universum
        ];
        description = "Typed encryption with persistent support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83104,7 +83104,7 @@ self: {
          base between data-default-class mtl transformers
        ];
        description = "Endomorphism utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eng-stemmer" = callPackage
@@ -83123,7 +83123,7 @@ self: {
          base containers doctest tasty tasty-hunit text
        ];
        description = "An English language stemmer (Porter2)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "engine-io" = callPackage
@@ -83141,8 +83141,8 @@ self: {
          unordered-containers vector websockets
        ];
        description = "A Haskell implementation of Engine.IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83161,8 +83161,8 @@ self: {
          pipes-attoparsec pipes-wai socket-io text transformers
          unordered-containers wai wai-websockets websockets
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83179,8 +83179,8 @@ self: {
          base bytestring containers engine-io io-streams lifted-base
          snap-core unordered-containers websockets websockets-snap
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83199,8 +83199,8 @@ self: {
          wai-websockets websockets
        ];
        description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83217,8 +83217,8 @@ self: {
          base bytestring conduit conduit-extra engine-io http-types text
          unordered-containers wai wai-websockets websockets yesod-core
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83230,7 +83230,7 @@ self: {
        sha256 = "1akk15q4nn1c0d36x224qikq7639kz05dfvnxck71h4y3hkl1inj";
        libraryHaskellDepends = [ base ];
        description = "A numeric type for managing and automating engineering units";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "entangle" = callPackage
@@ -83246,8 +83246,8 @@ self: {
        ];
        executableHaskellDepends = [ base matrix quipper-core ];
        description = "An application (and library) to convert quipper circuits into Qpmc models";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83262,7 +83262,7 @@ self: {
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base bytestring unix ];
        description = "A platform independent entropy source";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "entwine" = callPackage
@@ -83291,8 +83291,8 @@ self: {
          transformers-either
        ];
        description = "entwine - Concurrency tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83309,7 +83309,7 @@ self: {
          base generic-random hspec microlens QuickCheck template-haskell
        ];
        description = "Generate an ADT being a subset of another ADT, and the corresponding mappings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enum-text" = callPackage
@@ -83325,8 +83325,8 @@ self: {
          unordered-containers
        ];
        description = "A text rendering and parsing toolkit for enumerated types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83343,8 +83343,8 @@ self: {
          base bytestring enum-text fmt rio text
        ];
        description = "Making fmt available with rio";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83356,7 +83356,7 @@ self: {
        sha256 = "1m3f79acnrssz89490vwxp1dabqadzda3a95yg6gh6mpn7x0gkw5";
        libraryHaskellDepends = [ base ];
        description = "small enum types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enum-utf8" = callPackage
@@ -83372,8 +83372,8 @@ self: {
          unordered-containers
        ];
        description = "An experimental Utf8 parsing toolkit for enumerated types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83385,7 +83385,7 @@ self: {
        sha256 = "1v94y0a3rlkg3qlbv70d1zj2vjhssf1f89xlgb5cnsy9az07517q";
        libraryHaskellDepends = [ base control-monad-omega tagged ];
        description = "A typeclass for enumerating all values a type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enumerate" = callPackage
@@ -83404,8 +83404,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "enumerate all the values in a finite type (automatically)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83426,8 +83426,8 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "simple package for inverting functions and testing totality, via brute enumeration of the domain";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83444,7 +83444,7 @@ self: {
        ];
        testHaskellDepends = [ arith-encode base binary HUnit-Plus ];
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enumerator" = callPackage
@@ -83460,8 +83460,8 @@ self: {
          base bytestring containers text transformers
        ];
        description = "Reliable, high-performance processing with left-fold enumerators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83473,8 +83473,8 @@ self: {
        sha256 = "0xbrkv65m206qlvnjlbfb52kvjhw91rdnihwv3y31p2qj5zlz29p";
        libraryHaskellDepends = [ base enumerator mtl ];
        description = "Enumerator instances for monads-fd classes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83486,8 +83486,8 @@ self: {
        sha256 = "0s47j6pf05nwl105i2vwvsn18gis1v96gid85kj49ngb8ax0pjsp";
        libraryHaskellDepends = [ base enumerator monads-tf ];
        description = "Enumerator instances for monads-tf classes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83499,8 +83499,8 @@ self: {
        sha256 = "1fq4zmhc825bmyslfm7kbsa29qq773cgrz4npj2bcfl0jkbl3ndc";
        libraryHaskellDepends = [ base enummapset-th ];
        description = "Finitely represented /total/ EnumMaps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83525,8 +83525,8 @@ self: {
          base containers criterion deepseq mtl
        ];
        description = "Map of maps using Enum types as keys";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83538,7 +83538,7 @@ self: {
        sha256 = "0p4klnhwr10yiv3w209vl1j09280257z0pz626ynbxbff4mh9wg4";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Enum wrappers for IntMap and IntSet";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enummapset" = callPackage
@@ -83556,7 +83556,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "IntMap and IntSet with Enum keys/elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enummapset-th" = callPackage
@@ -83569,7 +83569,7 @@ self: {
          base containers deepseq template-haskell
        ];
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "enumset" = callPackage
@@ -83583,7 +83583,7 @@ self: {
          base data-accessor semigroups storable-record
        ];
        description = "Sets of enumeration values represented by machine words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "env-extra" = callPackage
@@ -83601,8 +83601,8 @@ self: {
          base exceptions tasty tasty-hunit text transformers
        ];
        description = "Safe helpers for accessing and modifying environment variables";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83632,8 +83632,8 @@ self: {
          transformers
        ];
        description = "Pull configuration information from the ENV";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83648,7 +83648,7 @@ self: {
        libraryHaskellDepends = [ aeson base http-api-data mtl text ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "envparse" = callPackage
@@ -83660,7 +83660,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec text ];
        description = "Parse environment variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "envstatus" = callPackage
@@ -83681,8 +83681,8 @@ self: {
          base ConfigFile parsec PyF tasty tasty-hspec
        ];
        description = "Display efficiently the state of the local environment";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83702,7 +83702,7 @@ self: {
          transformers
        ];
        description = "An environmentally friendly way to deal with environment variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "envy-extensible" = callPackage
@@ -83719,7 +83719,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Provides FromEnv in envy instance for Record of extensible";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "epanet-haskell" = callPackage
@@ -83730,8 +83730,8 @@ self: {
        sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx";
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for EPANET";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83743,8 +83743,8 @@ self: {
        sha256 = "0sg5pipzc4s9xq83ari7rigjbvhyh76kqnp57i98bs3k54ba53ym";
        libraryHaskellDepends = [ base stm time ];
        description = "Baisc, Erlang-like message passing supporting sockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83765,8 +83765,8 @@ self: {
          trifecta vector
        ];
        description = "A library for simulating epidemics as birth-death processes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83784,8 +83784,8 @@ self: {
          array base Cabal directory mtl process
        ];
        description = "Compiler for a simple functional language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83800,7 +83800,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "epoll bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83813,8 +83813,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83832,7 +83832,7 @@ self: {
          base bytestring filepath old-time utf8-string xml zip-archive
        ];
        description = "EPUB E-Book construction support library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "epub-metadata" = callPackage
@@ -83855,7 +83855,7 @@ self: {
          utf8-string zip-archive
        ];
        description = "Library for parsing epub document metadata";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "epub-tools" = callPackage
@@ -83876,7 +83876,7 @@ self: {
          base directory epub-metadata filepath HUnit mtl parsec regex-compat
        ];
        description = "Command line utilities for working with epub files";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "epubname" = callPackage
@@ -83892,8 +83892,8 @@ self: {
          base directory epub-metadata mtl regex-compat
        ];
        description = "Rename epub ebook files based on meta information";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83905,7 +83905,7 @@ self: {
        sha256 = "1bcvjpbdis79dd09i07l7rjkh7j79qbpwb731rgr9k9215268wfa";
        libraryHaskellDepends = [ base semigroupoids ];
        description = "Leibnizian equality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "equal-files" = callPackage
@@ -83938,7 +83938,7 @@ self: {
          base containers template-haskell th-desugar th-extras void
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "equational-reasoning_0_6_0_4" = callPackage
@@ -83953,8 +83953,8 @@ self: {
          base containers template-haskell th-desugar void
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "equational-reasoning-induction" = callPackage
@@ -83967,8 +83967,8 @@ self: {
          base singletons template-haskell th-extras
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -83990,8 +83990,8 @@ self: {
          tasty-hunit time
        ];
        description = "Application level triggered, and edge triggered event multiqueues";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84012,7 +84012,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Maintaining an equivalence relation implemented as union-find using STT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "erd" = callPackage
@@ -84035,7 +84035,7 @@ self: {
          parsec raw-strings-qq tasty tasty-hunit text yaml
        ];
        description = "An entity-relationship diagram generator from a plain text description";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "erf" = callPackage
@@ -84046,7 +84046,7 @@ self: {
        sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
        libraryHaskellDepends = [ base ];
        description = "The error function, erf, and related functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "erf-native" = callPackage
@@ -84058,7 +84058,7 @@ self: {
        libraryHaskellDepends = [ base polynomial ];
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84075,7 +84075,7 @@ self: {
        ];
        description = "FFI interface to Erlang";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84088,8 +84088,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "A text censorship library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84108,8 +84108,8 @@ self: {
          aeson aeson-pretty base bytestring containers eros text
        ];
        description = "DEPRECATED in favor of eros-http";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84129,8 +84129,8 @@ self: {
          warp
        ];
        description = "JSON HTTP interface to Eros";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84145,7 +84145,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        executableHaskellDepends = [ base containers text ];
        description = "Source code error pretty printing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "errno" = callPackage
@@ -84156,7 +84156,7 @@ self: {
        sha256 = "0jix16b2c24pfbc3rig01nl68zdwpi28zzbciscalmq8lkpp10fa";
        libraryHaskellDepends = [ base mtl ];
        description = "a FFI utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-analyze" = callPackage
@@ -84168,7 +84168,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        description = "Parse ghc and cabal error messages and give their causes for easier resolution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-codes" = callPackage
@@ -84180,8 +84180,8 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        testHaskellDepends = [ base ];
        description = "Error code functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84204,8 +84204,8 @@ self: {
          unordered-containers
        ];
        description = "Provides API for enriching errors with contexts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84217,8 +84217,8 @@ self: {
        sha256 = "0rv59fhlfr03qis957mjgl4gyk1i5axfyvr680z3ykbfd3k5gc1s";
        libraryHaskellDepends = [ base either mtl transformers ];
        description = "Error Continuations";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84230,8 +84230,8 @@ self: {
        sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j";
        libraryHaskellDepends = [ base mtl text text-render ];
        description = "A useful type for collecting error messages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84243,8 +84243,8 @@ self: {
        sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5";
        libraryHaskellDepends = [ base template-haskell ];
        description = "An error replacement with call-site metadata";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84256,7 +84256,7 @@ self: {
        sha256 = "1gfi3jvag662xbsiv75ndb8p9s3c7j6lny15a9gqk8wd4l71myid";
        libraryHaskellDepends = [ base template-haskell ];
        description = "error functions that show file location information";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-message" = callPackage
@@ -84271,8 +84271,8 @@ self: {
          ansi-wl-pprint base containers either-unwrap InfixApplicative mtl
        ];
        description = "Composable error messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84284,7 +84284,7 @@ self: {
        sha256 = "0ry06vhz7mrl7i587vw3pv2ralh8aw7km6jfhagww0hmckwdjqmm";
        libraryHaskellDepends = [ base containers text ];
        description = "Composable, hierarchical errors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-or-utils" = callPackage
@@ -84295,7 +84295,7 @@ self: {
        sha256 = "14n5h69wknns3b6ij8avdijwlpwykalkpvx2q57cg6zv0ywnvmwz";
        libraryHaskellDepends = [ base containers error-or text ];
        description = "Utilities using ErrorOr datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "error-util" = callPackage
@@ -84306,8 +84306,8 @@ self: {
        sha256 = "01jfbq43ps6wjl9z5l1g8zfdi225mfn3xy59n6vrfxh0vsi1c6fz";
        libraryHaskellDepends = [ base transformers ];
        description = "Set of utils and operators for error handling";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84320,7 +84320,7 @@ self: {
        libraryHaskellDepends = [ base base-orphans ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "An orphan Eq instance for ErrorCall";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "errors" = callPackage
@@ -84335,7 +84335,7 @@ self: {
          base exceptions safe text transformers transformers-compat
        ];
        description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "errors-ext" = callPackage
@@ -84354,8 +84354,8 @@ self: {
          monad-control monad-loops mtl transformers
        ];
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84379,8 +84379,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "A script to concatenate AIP ERSA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84407,8 +84407,8 @@ self: {
        ];
        testHaskellDepends = [ array base directory doctest filepath ];
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84426,8 +84426,8 @@ self: {
          array base containers ersatz toysolver transformers
        ];
        description = "toysat driver as backend for ersatz";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84450,8 +84450,8 @@ self: {
          aeson attoparsec base bytestring yaml
        ];
        description = "Easy Runtime Templates";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84468,8 +84468,8 @@ self: {
          base bytestring hspec QuickCheck silently text
        ];
        description = "ANSI Escape Sequence Text Decoration Made Easy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84491,7 +84491,7 @@ self: {
          base doctest hspec QuickCheck quickcheck-properties
        ];
        description = "Produce Text with terminal escape sequences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "escoger" = callPackage
@@ -84517,8 +84517,8 @@ self: {
        ];
        doHaddock = false;
        description = "Terminal fuzzy selector";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84542,8 +84542,8 @@ self: {
        ];
        doHaddock = false;
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84608,8 +84608,8 @@ self: {
          yesod-form yesod-static yesod-test
        ];
        description = "Espial is an open-source, web-based bookmarking server";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84638,7 +84638,7 @@ self: {
          tagged text time transformers unliftio unordered-containers vector
        ];
        description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ess" = callPackage
@@ -84649,8 +84649,8 @@ self: {
        sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq";
        libraryHaskellDepends = [ base ];
        description = "The type-level S combinator in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84674,7 +84674,7 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        description = "General purpose live coding framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-gloss" = callPackage
@@ -84689,7 +84689,7 @@ self: {
          base essence-of-live-coding foreign-store gloss syb transformers
        ];
        description = "General purpose live coding framework - Gloss backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-gloss-example" = callPackage
@@ -84707,7 +84707,7 @@ self: {
          transformers
        ];
        description = "General purpose live coding framework - Gloss example";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-pulse" = callPackage
@@ -84722,7 +84722,7 @@ self: {
          base essence-of-live-coding foreign-store pulse-simple transformers
        ];
        description = "General purpose live coding framework - pulse backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-pulse-example" = callPackage
@@ -84740,7 +84740,7 @@ self: {
          pulse-simple transformers vector
        ];
        description = "General purpose live coding framework - pulse backend example";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-quickcheck" = callPackage
@@ -84756,7 +84756,7 @@ self: {
          transformers
        ];
        description = "General purpose live coding framework - QuickCheck integration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "essence-of-live-coding-warp" = callPackage
@@ -84772,7 +84772,7 @@ self: {
        ];
        testHaskellDepends = [ base essence-of-live-coding http-client ];
        description = "General purpose live coding framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "estimator" = callPackage
@@ -84786,7 +84786,7 @@ self: {
          ad base distributive lens linear reflection
        ];
        description = "State-space estimation algorithms such as Kalman Filters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "estimators" = callPackage
@@ -84802,8 +84802,8 @@ self: {
          prettyclass QuickCheck text
        ];
        description = "Tool for managing probability estimation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84821,7 +84821,7 @@ self: {
        ];
        description = "Repeats from ESTs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84839,7 +84839,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base rio tasty tasty-hunit ];
        description = "Declarative configuration spec for Haskell projects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "etcd" = callPackage
@@ -84858,7 +84858,7 @@ self: {
        testHaskellDepends = [ async base hspec MonadRandom mtl text ];
        description = "Client for etcd, a highly-available key value store";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "eternal" = callPackage
@@ -84874,8 +84874,8 @@ self: {
          base base-unicode-symbols transformers utf8-string
        ];
        description = "everything breaking the Fairbairn threshold";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84896,8 +84896,8 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
        ];
        description = "Native event-sourcing database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84915,8 +84915,8 @@ self: {
          potoki QuickCheck text time timestamp
        ];
        description = "Automatic timestamping for Eternity";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84945,8 +84945,8 @@ self: {
          base criterion deepseq lens mtl transformers
        ];
        description = "Monad transformers and classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84970,8 +84970,8 @@ self: {
          hspec protolude text wl-pprint-text
        ];
        description = "A Ethereum contract analyzer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -84999,8 +84999,8 @@ self: {
          base ethereum-analyzer-deps hflags monad-logger protolude
        ];
        description = "A CLI frontend for ethereum-analyzer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85018,7 +85018,7 @@ self: {
          containers deepseq fast-logger global-lock monad-logger split text
        ];
        description = "Stripped dependencies of ethereum-analyzer";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ethereum-analyzer-webui" = callPackage
@@ -85046,8 +85046,8 @@ self: {
          base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger
        ];
        description = "A web frontend for ethereum-analyzer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85076,8 +85076,8 @@ self: {
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "A Haskell version of an Ethereum client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85102,8 +85102,8 @@ self: {
          transformers
        ];
        description = "A modified Merkle Patricia DB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85122,7 +85122,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Ethereum Recursive Length Prefix Encoding";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "eths-rlp" = callPackage
@@ -85138,7 +85138,7 @@ self: {
          base bytestring doctest hspec QuickCheck quickcheck-instances
        ];
        description = "Ethereum Recursive Length Prefix Encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ety" = callPackage
@@ -85158,7 +85158,7 @@ self: {
          base bytestring curl random text-icu utf8-string xml
        ];
        description = "Random etymology online entry";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "euler" = callPackage
@@ -85171,7 +85171,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Mathematics utilities for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "euler-tour-tree" = callPackage
@@ -85194,7 +85194,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Euler tour trees";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "euphoria" = callPackage
@@ -85218,8 +85218,8 @@ self: {
          base criterion deepseq enummapset-th unordered-containers
        ];
        description = "Dynamic network FRP with events and continuous values";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85237,8 +85237,8 @@ self: {
          http-types monad-control mtl time
        ];
        description = "Free foreign exchange/currency feed from the European Central Bank";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85256,7 +85256,7 @@ self: {
        libraryPkgconfigDepends = [ libevdev ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to libevdev";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libevdev;};
 
   "evdev-streamly" = callPackage
@@ -85272,7 +85272,7 @@ self: {
          streamly streamly-fsnotify unix
        ];
        description = "Bridge for working with evdev and streamly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eve" = callPackage
@@ -85290,7 +85290,7 @@ self: {
          base data-default hspec hspec-core lens mtl
        ];
        description = "An extensible event framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eve-cli" = callPackage
@@ -85306,8 +85306,8 @@ self: {
          base bytestring eve lens mtl text vty
        ];
        testHaskellDepends = [ base bytestring eve lens mtl text vty ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85319,7 +85319,7 @@ self: {
        sha256 = "1d0bxg1dg66g1yv291cp4jh3xv3caxrddqrwb0g6g1929dl019fa";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        description = "Efficient effect handlers based on evidence translation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "event" = callPackage
@@ -85332,8 +85332,8 @@ self: {
          base containers semigroups transformers
        ];
        description = "Monoidal, monadic and first-class events";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85345,8 +85345,8 @@ self: {
        sha256 = "1jkrc1k0ixjs95fvj36gr08igpx5vqff5zc6bi9f04ldxqz4wbap";
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85358,7 +85358,7 @@ self: {
        sha256 = "1515v1khdkr145z5inrm2ardhpzfsbncpl5wmfd9nmilw97da9ld";
        libraryHaskellDepends = [ base containers ];
        description = "Event handlers";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "event-list" = callPackage
@@ -85393,8 +85393,8 @@ self: {
          prettyclass priority-queue stateref
        ];
        description = "Event-graph simulation monad transformer";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85410,7 +85410,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eventful-core" = callPackage
@@ -85432,7 +85432,7 @@ self: {
          uuid
        ];
        description = "Core module for eventful";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "eventful-dynamodb" = callPackage
@@ -85455,8 +85455,8 @@ self: {
          quickcheck-instances safe text unordered-containers vector
        ];
        description = "Library for eventful DynamoDB event stores";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85476,7 +85476,7 @@ self: {
          safe stm
        ];
        description = "In-memory implementations for eventful";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "eventful-postgresql" = callPackage
@@ -85498,8 +85498,8 @@ self: {
          persistent-postgresql text
        ];
        description = "Postgres implementations for eventful";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85518,8 +85518,8 @@ self: {
          persistent-template text uuid
        ];
        description = "Common library for SQL event stores";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85542,8 +85542,8 @@ self: {
          text uuid
        ];
        description = "SQLite implementations for eventful";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85559,7 +85559,7 @@ self: {
          aeson aeson-casing base eventful-core extra hspec monad-logger text
        ];
        description = "Common module used for eventful tests";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "eventlog2html" = callPackage
@@ -85582,8 +85582,8 @@ self: {
        ];
        executableHaskellDepends = [ aeson base filepath text ];
        description = "Visualise an eventlog";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85602,8 +85602,8 @@ self: {
          suspend text timers websockets
        ];
        description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85623,7 +85623,7 @@ self: {
          string-conversions text transformers-base unordered-containers uuid
        ];
        description = "Provides an eventsourcing high level API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eventsource-geteventstore-store" = callPackage
@@ -85647,8 +85647,8 @@ self: {
          tasty tasty-hspec transformers-base
        ];
        description = "GetEventStore store implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85665,7 +85665,7 @@ self: {
          text transformers-base uuid
        ];
        description = "Provides common test specification for Store implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eventsource-stub-store" = callPackage
@@ -85686,7 +85686,7 @@ self: {
          streaming tasty tasty-hspec
        ];
        description = "An in-memory stub store implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "eventsourced" = callPackage
@@ -85707,7 +85707,7 @@ self: {
          base blaze-builder bytestring HUnit wai-extra
        ];
        description = "Server-Sent Events the UNIX way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "eventsourcing" = callPackage
@@ -85728,7 +85728,7 @@ self: {
          unordered-containers
        ];
        description = "CQRS/ES library";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "eventsourcing-postgresql" = callPackage
@@ -85744,7 +85744,7 @@ self: {
          stm unordered-containers
        ];
        description = "PostgreSQL adaptor for eventsourcing";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "eventstore" = callPackage
@@ -85778,9 +85778,9 @@ self: {
          unordered-containers uuid vector
        ];
        description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85792,7 +85792,7 @@ self: {
        sha256 = "1rc0g5rn8hzglm2b4biaf8jvj5kb2j1s5vsxnm24q2gvrvjg03sx";
        libraryHaskellDepends = [ async base stm ];
        description = "Run a process every so often";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "every-bit-counts" = callPackage
@@ -85803,8 +85803,8 @@ self: {
        sha256 = "0r959iyd5nsw3sj7p0gwsccdgaald9lwisg0lvq9qynyz09kh4vj";
        libraryHaskellDepends = [ base haskell98 ];
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85824,8 +85824,8 @@ self: {
        ];
        executableToolDepends = [ alex happy uuagc ];
        description = "An interpreter for EWE programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85841,7 +85841,7 @@ self: {
          base exceptions hashable stm time transformers vector
        ];
        description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exact-combinatorics" = callPackage
@@ -85852,7 +85852,7 @@ self: {
        sha256 = "1ay98m9prmd1pi85v2n0rs2432hzb7mxizzg79sv0ln24an8amvj";
        libraryHaskellDepends = [ base ];
        description = "Efficient exact computation of combinatoric functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exact-cover" = callPackage
@@ -85866,8 +85866,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers tasty tasty-hunit ];
        description = "Efficient exact cover solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85886,7 +85886,7 @@ self: {
          base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Exact rational multiples of pi (and integer powers of pi)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exact-real" = callPackage
@@ -85906,7 +85906,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Exact real arithmetic";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exact-real-positional" = callPackage
@@ -85917,8 +85917,8 @@ self: {
        sha256 = "0qh1aqyi2k7djwqykj888hxjisip9ahg2ap43cj0xmdvfh9p0351";
        libraryHaskellDepends = [ base ];
        description = "Framework for Exact Real Arithmetic in the Positional Number System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85933,7 +85933,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Example Haskell Project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "except-exceptions" = callPackage
@@ -85946,8 +85946,8 @@ self: {
        editedCabalFile = "09i2w1ry7vmjc0a4d05a4hs7kdj3brn5jrxsy638f6acj41g5dhk";
        libraryHaskellDepends = [ base exceptions transformers ];
        description = "Safely deal with exceptions in ExceptT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -85959,7 +85959,7 @@ self: {
        sha256 = "0hph7mng5llcvazq9mqh9pndgbjjwivgmhpqlbf4r1xii7c0ymnx";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Exception type hierarchy with TemplateHaskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-mailer" = callPackage
@@ -85970,7 +85970,7 @@ self: {
        sha256 = "068zhr90gldin0f6xafqp1pncf6rhhm3gagnvn6r3p0kx060ia23";
        libraryHaskellDepends = [ base hslogger mime-mail text ];
        description = "Catch all runtime exceptions and send an email";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-monads-fd" = callPackage
@@ -85985,8 +85985,8 @@ self: {
          base exception-transformers monads-fd transformers
        ];
        description = "Exception monad transformer instances for monads-fd classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86002,7 +86002,7 @@ self: {
          base exception-transformers monads-tf transformers
        ];
        description = "Exception monad transformer instances for monads-tf classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-mtl" = callPackage
@@ -86015,7 +86015,7 @@ self: {
          base exception-transformers mtl transformers
        ];
        description = "Exception monad transformer instances for mtl classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-transformers" = callPackage
@@ -86032,7 +86032,7 @@ self: {
          transformers-compat
        ];
        description = "Type classes and monads for unchecked extensible exceptions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exception-via" = callPackage
@@ -86043,7 +86043,7 @@ self: {
        sha256 = "046f787jw3v1c61q9c9canq0m266wv39rsk0613fyrhl96sss66m";
        libraryHaskellDepends = [ base template-haskell ];
        description = "DerivingVia for your hierarchical exceptions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exceptional" = callPackage
@@ -86054,8 +86054,8 @@ self: {
        sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns";
        libraryHaskellDepends = [ base exceptions ];
        description = "Essentially the Maybe type with error messages";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86071,8 +86071,8 @@ self: {
        testHaskellDepends = [ base hspec process temporary ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "An exception-free readFile for use with '+RTS -xc -RTS' projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86095,8 +86095,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
        description = "Extensible optionally-pure exceptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "exchangerates" = callPackage
@@ -86124,8 +86124,8 @@ self: {
          validity-containers validity-time yaml
        ];
        description = "A Haskell client for https://exchangeratesapi.io/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86140,8 +86140,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base directory process text ];
        description = "Tool to run stack exec prj-exe more easy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86166,7 +86166,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Provides the SHA1 hash of the program executable";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "executable-path" = callPackage
@@ -86177,7 +86177,7 @@ self: {
        sha256 = "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww";
        libraryHaskellDepends = [ base directory filepath unix ];
        description = "Finding out the full path of the executable";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "executor" = callPackage
@@ -86189,8 +86189,8 @@ self: {
        libraryHaskellDepends = [ async base process ];
        testHaskellDepends = [ async base doctest hspec process ];
        description = "Shell helpers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86221,8 +86221,8 @@ self: {
          mtl multistate process transformers
        ];
        description = "Tool to search/generate (haskell) expressions with a given type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86250,7 +86250,7 @@ self: {
          transformers transformers-base xml-conduit xml-lens
        ];
        description = "A library for crawling exhentai";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exhaustive" = callPackage
@@ -86264,7 +86264,7 @@ self: {
          base generics-sop template-haskell transformers
        ];
        description = "Compile time checks that a computation considers producing data through all possible constructors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exherbo-cabal" = callPackage
@@ -86288,8 +86288,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86302,8 +86302,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) exif;};
 
@@ -86323,7 +86323,7 @@ self: {
          string-conversions temporary text unordered-containers vector
        ];
        description = "Haskell bindings to ExifTool";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exigo-schema" = callPackage
@@ -86348,8 +86348,8 @@ self: {
          resourcet template-haskell temporary text
        ];
        description = "database schema for exigo marking/assessment tools";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86371,7 +86371,7 @@ self: {
          QuickCheck singletons tasty tasty-hunit tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -86389,7 +86389,7 @@ self: {
          aeson base bytestring exinst QuickCheck tasty tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exinst-bytes" = callPackage
@@ -86409,7 +86409,7 @@ self: {
          tasty tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exinst-cereal" = callPackage
@@ -86428,7 +86428,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exinst-deepseq" = callPackage
@@ -86439,8 +86439,8 @@ self: {
        sha256 = "0q9fq5w6lir3qqybf8d0j0hhs33zsvv1xg49669cv5irl9hixh9z";
        libraryHaskellDepends = [ base constraints deepseq exinst ];
        description = "Derive instances for the `deepseq` library for your existential types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86454,8 +86454,8 @@ self: {
          base constraints exinst hashable singletons
        ];
        description = "Derive instances for the `hashable` library for your existential types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86474,7 +86474,7 @@ self: {
          base binary exinst QuickCheck serialise tasty tasty-quickcheck
        ];
        description = "Dependent pairs and their instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exist" = callPackage
@@ -86485,7 +86485,7 @@ self: {
        sha256 = "0w2ip29f99qzi3wxicydkv991ws0lhnar3w0qka54r2mjb3xzrk9";
        libraryHaskellDepends = [ base base-unicode-symbols util ];
        description = "Dependent sum type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exist-instances" = callPackage
@@ -86500,7 +86500,7 @@ self: {
          base base-unicode-symbols constraint exist util
        ];
        description = "Instances for \"exist\" package (requires more language extensions and dependencies)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "existential" = callPackage
@@ -86520,8 +86520,8 @@ self: {
          unordered-containers
        ];
        description = "Existential types with lens-like accessors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {control-invariants = null;};
 
@@ -86533,8 +86533,8 @@ self: {
        sha256 = "1f7v2f7jmqx0nkl2wla88mnb21nava74b73rvsmfbj4kxmwchsgy";
        libraryHaskellDepends = [ base contravariant ];
        description = "Existential datatypes holding evidence of constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86546,7 +86546,7 @@ self: {
        sha256 = "00cyli96zkyqhjr3lqzrislqyk72xwm2dcqvjagklidh32d4k8ja";
        libraryHaskellDepends = [ base ];
        description = "Exit codes as defined by BSD";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "exitcode" = callPackage
@@ -86566,8 +86566,8 @@ self: {
          tasty-hunit tasty-quickcheck transformers
        ];
        description = "Monad transformer for exit codes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86582,7 +86582,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Compression and decompression in the exomizer format";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "exotic-list-monads" = callPackage
@@ -86597,7 +86597,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Non-standard monads on lists and non-empty lists";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exp-cache" = callPackage
@@ -86619,7 +86619,7 @@ self: {
        testHaskellDepends = [
          base HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "exp-extended" = callPackage
@@ -86630,8 +86630,8 @@ self: {
        sha256 = "14bz6wfzd8b51s09d2psg5hv5zq4f8lplgx0yvd3n0z704x3mcy6";
        libraryHaskellDepends = [ base ];
        description = "floating point with extended exponent range";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86656,7 +86656,7 @@ self: {
          base bimap containers gauge prettyprinter raw-strings-qq
        ];
        description = "Linear programming over exponent pairs";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "expand" = callPackage
@@ -86670,7 +86670,7 @@ self: {
        ];
        description = "Extensible Pandoc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86686,8 +86686,8 @@ self: {
          base bytestring enumerator hexpat text transformers xml-types
        ];
        description = "Enumerator-based API for Expat";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86720,7 +86720,7 @@ self: {
          unliftio-core vector
        ];
        description = "Perform scientific experiments stored in a DB, and generate reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "expiring-cache-map" = callPackage
@@ -86738,7 +86738,7 @@ self: {
          base bytestring containers hashable time unordered-containers
        ];
        description = "General purpose simple caching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "expiring-containers" = callPackage
@@ -86761,8 +86761,8 @@ self: {
          tasty-hunit tasty-quickcheck timestamp
        ];
        description = "Expiring containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86774,7 +86774,7 @@ self: {
        sha256 = "0mkc7d346vdsjg83a253986w4pps53r262w1if91q16kx6qci7yy";
        libraryHaskellDepends = [ base ];
        description = "Create values which expire after a period of time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "explain" = callPackage
@@ -86789,8 +86789,8 @@ self: {
          ansi-wl-pprint base haskell-src-exts
        ];
        description = "Show how expressions are parsed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86805,8 +86805,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86818,8 +86818,8 @@ self: {
        sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y";
        libraryHaskellDepends = [ base ];
        description = "explicit computation of determinant of small matrices";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86833,7 +86833,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq semigroups transformers ];
        description = "Exceptions which are explicit in the type signature";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "explicit-iomodes" = callPackage
@@ -86844,8 +86844,8 @@ self: {
        sha256 = "0irz1zy6iaipym73x343zvr6cqym6ci2vbjbyr564d29ymd6ldzd";
        libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        description = "File handles with explicit IOModes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86857,8 +86857,8 @@ self: {
        sha256 = "0h3dlgkd2gx8zr3sh949nhqgrdg943dgpp4v1n599jjjpqpw16hj";
        libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        description = "Extends explicit-iomodes with ByteString operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86870,8 +86870,8 @@ self: {
        sha256 = "12ny5wa1j1wp8fbg5k8zkv4a3axmssxcvfvhg3frsm4dych6hmyg";
        libraryHaskellDepends = [ base explicit-iomodes text ];
        description = "Extends explicit-iomodes with Text operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86885,8 +86885,8 @@ self: {
          base containers derive mtl template-haskell
        ];
        description = "Explicit Sharing of Monadic Effects";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86900,8 +86900,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base directory pngload ];
        description = "Experimental Plot data Reconstructor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86922,8 +86922,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "A distribution of the 'containers' package, with all modules exposed";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86937,7 +86937,7 @@ self: {
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base leancheck ];
        description = "Dynamically-typed expressions involving applications and variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "expression-parser" = callPackage
@@ -86948,8 +86948,8 @@ self: {
        sha256 = "1ldp1f2c823byx4ag8jpmq9bhw26lq98fz7ljqslffs37pc098qs";
        libraryHaskellDepends = [ base ];
        description = "Generalization of parsec's expression parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86967,8 +86967,8 @@ self: {
        ];
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -86987,8 +86987,8 @@ self: {
          base containers expressions singletons transformers z3
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87017,8 +87017,8 @@ self: {
          tasty tasty-hunit text unordered-containers wl-pprint
        ];
        description = "A simple expressions language based on row types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87036,8 +87036,8 @@ self: {
          pretty syb
        ];
        description = "Libraries for processing GHC Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87060,8 +87060,8 @@ self: {
          xml
        ];
        description = "automated printing for extemp speakers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87074,7 +87074,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base template-haskell text ];
        testHaskellDepends = [ attoparsec base template-haskell text ];
        description = "TH to define a new record data type that extends the existing record data type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extended-categories" = callPackage
@@ -87085,8 +87085,8 @@ self: {
        sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72";
        libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        description = "Extended Categories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87099,7 +87099,7 @@ self: {
        libraryHaskellDepends = [ base transformers vector ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Heap and Vector container types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extended-containers-lens" = callPackage
@@ -87110,7 +87110,7 @@ self: {
        sha256 = "107nfyrp62h6qwc3ra08cd9vyaanc7442wcbfmm83aw05fav3p43";
        libraryHaskellDepends = [ base extended-containers lens ];
        description = "lens instances for extended-containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extended-reals" = callPackage
@@ -87127,7 +87127,7 @@ self: {
          tasty-th
        ];
        description = "Extension of real numbers with positive/negative infinities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extensible" = callPackage
@@ -87149,7 +87149,7 @@ self: {
        ];
        testHaskellDepends = [ base lens QuickCheck template-haskell ];
        description = "Extensible, efficient, optics-friendly data types and effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extensible-data" = callPackage
@@ -87164,8 +87164,8 @@ self: {
          base data-lens hashable template-haskell unordered-containers
        ];
        description = "Sums/products/lists/trees which can be extended in other modules";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87191,7 +87191,7 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "An Alternative to Monad Transformers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "extensible-effects-concurrent" = callPackage
@@ -87225,8 +87225,8 @@ self: {
          base criterion deepseq extensible-effects text unliftio
        ];
        description = "Message passing concurrency as extensible-effect";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87238,7 +87238,7 @@ self: {
        sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
        libraryHaskellDepends = [ base ];
        description = "Extensible exceptions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extensible-skeleton" = callPackage
@@ -87256,8 +87256,8 @@ self: {
        ];
        testHaskellDepends = [ base extensible ];
        description = "Operational-based extensible effect library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87269,7 +87269,7 @@ self: {
        sha256 = "0s51rvsg41dymk173fxf7065yynlgx234xjs149lzm00gcwv92r6";
        libraryHaskellDepends = [ base lens ];
        description = "light-weight, extensible sums and products over types and kinds";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "extensions" = callPackage
@@ -87296,7 +87296,7 @@ self: {
          hspec-hedgehog text
        ];
        description = "Parse Haskell Language Extensions";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "external-sort" = callPackage
@@ -87309,8 +87309,8 @@ self: {
          base binary bytestring EdisonAPI EdisonCore
        ];
        description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87329,7 +87329,7 @@ self: {
          base directory filepath QuickCheck quickcheck-instances unix
        ];
        description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -87349,8 +87349,8 @@ self: {
          async base Cabal containers package-description-remote
        ];
        description = "Given a hackage package outputs the list of its dependencies";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87362,7 +87362,7 @@ self: {
        sha256 = "1bf0naqx0gb66dr7g58lfaba87zmg09ynzdb3cyyymwcv4l1knp8";
        libraryHaskellDepends = [ base transformers ];
        description = "A functor, where the \"stored\" value is isomorphic to Identity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "extractelf" = callPackage
@@ -87380,8 +87380,8 @@ self: {
          optparse-applicative
        ];
        description = "Extract an ELF's metadata and sections into files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87397,8 +87397,8 @@ self: {
          aeson base bytestring http-client http-client-tls text time
        ];
        description = "API Client for ExtraLife team and user data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87415,7 +87415,7 @@ self: {
        ];
        testHaskellDepends = [ base express leancheck speculate ];
        description = "generalize counter-examples of test properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ez-couch" = callPackage
@@ -87438,8 +87438,8 @@ self: {
          vector
        ];
        description = "A high level static library for working with CouchDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87453,8 +87453,8 @@ self: {
        editedCabalFile = "1x0fskz64l9xvywiif9jmmnjkkr7pbdri9y6k3cxgl47yipi0kf2";
        libraryHaskellDepends = [ base transformers z3 ];
        description = "Z3 bonds with pure interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87466,8 +87466,8 @@ self: {
        sha256 = "1vxhfr4wqm2bclnq15lp4q496w3916ll9chj6mcqbn0r64bmmkn8";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special f-algebra combinator from any data type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87483,8 +87483,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87496,8 +87496,8 @@ self: {
        sha256 = "0apgad2rqpgxypm10n98agmfrlxydcawvsvyafdwj8jhynfycx03";
        libraryHaskellDepends = [ base free ];
        description = "Faceted computation for dynamic information flow security";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87521,7 +87521,7 @@ self: {
          base containers parsec pretty QuickCheck random time
        ];
        description = "Factoring integers and polynomials";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "factory" = callPackage
@@ -87547,7 +87547,7 @@ self: {
        ];
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87561,8 +87561,8 @@ self: {
        editedCabalFile = "03v6p3vlilz6vk5xlvw3r31cqicx3m1xjii9shcqpacxvlh2zzlp";
        libraryHaskellDepends = [ base exceptions mtl template-haskell ];
        description = "Refined types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87580,8 +87580,8 @@ self: {
          HTTP MissingH text unordered-containers utf8-string vector
        ];
        description = "A driver for the Factual API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87593,7 +87593,7 @@ self: {
        sha256 = "00n5m3fa14y882rnzw7pwc154bgp46rhvvj2cghldvybxmj61zgm";
        libraryHaskellDepends = [ base ];
        description = "Forward Automatic Differentiation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fadno" = callPackage
@@ -87613,8 +87613,8 @@ self: {
          base containers fadno-xml hspec hspec-contrib HUnit lens
        ];
        description = "Minimal library for music generation and notation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87631,8 +87631,8 @@ self: {
          diagrams-rasterific lens random
        ];
        description = "Braid representations in Haskell";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87647,8 +87647,8 @@ self: {
          base containers Decimal lens mtl parsec xml
        ];
        description = "XML/XSD combinators/schemas/codegen";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87660,7 +87660,7 @@ self: {
        sha256 = "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d";
        doHaddock = false;
        description = "Forward-compatible MonadFail class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "failable" = callPackage
@@ -87671,7 +87671,7 @@ self: {
        sha256 = "1vffrjywaxwfpzb6a34il772mkkaqwv9372aibijnvwf82rnglwg";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A 'Failable' error monad class to unify failure across monads that can fail";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "failable-list" = callPackage
@@ -87682,8 +87682,8 @@ self: {
        sha256 = "0bq0q9n4wnacjqs517i12kl56m16n5ff4gk8kamh87gqkd58w06x";
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87695,7 +87695,7 @@ self: {
        sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
        libraryHaskellDepends = [ base transformers ];
        description = "A simple type class for success/failure computations. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "failure-detector" = callPackage
@@ -87711,8 +87711,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck time
        ];
        description = "Failure Detectors implimented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87730,7 +87730,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lists with fair choice";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fair-predicates" = callPackage
@@ -87742,7 +87742,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Fair Predicates";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "fake" = callPackage
@@ -87758,8 +87758,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec random text time ];
        description = "Randomly generated fake data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87772,8 +87772,8 @@ self: {
        libraryHaskellDepends = [ base base-prelude split X11 ];
        librarySystemDepends = [ libXtst ];
        description = "A crossplatform library to simulate keyboard input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.xorg) libXtst;};
 
@@ -87806,8 +87806,8 @@ self: {
          template-haskell text time unordered-containers vector yaml
        ];
        description = "Library for producing fake data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87819,7 +87819,7 @@ self: {
        sha256 = "0rf4mr9977p70vsinr3iga6l5wzkxnkxd52j4jmdmrk5b6i3flcp";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec text ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fakedata-quickcheck" = callPackage
@@ -87835,8 +87835,8 @@ self: {
          base fakedata hspec hspec-core QuickCheck random regex-tdfa text
        ];
        description = "Fake a -> Gen a";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87853,7 +87853,7 @@ self: {
          base containers exceptions hspec QuickCheck
        ];
        description = "Extensible fake file system for testing";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "fakepull" = callPackage
@@ -87865,7 +87865,7 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        testHaskellDepends = [ base exceptions hspec mtl QuickCheck ];
        description = "Monad to pull from fake stream-like objects";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "faker" = callPackage
@@ -87877,7 +87877,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base gimlh random split ];
        description = "Pure Haskell library for generating fake data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "faktory" = callPackage
@@ -87899,8 +87899,8 @@ self: {
        testHaskellDepends = [ aeson base hspec markdown-unlit ];
        testToolDepends = [ markdown-unlit ];
        description = "Faktory Worker for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87912,7 +87912,7 @@ self: {
        sha256 = "0jj806klxagv65ddxb85gdy89m46p4yqxr9y5s5gc4arb5xzlwjq";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base transformers ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "falling-turnip" = callPackage
@@ -87931,8 +87931,8 @@ self: {
          repa-algorithms vector
        ];
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87952,7 +87952,7 @@ self: {
        ];
        description = "A fun falling blocks game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87964,7 +87964,7 @@ self: {
        sha256 = "1yqbq038axx9a2j3kbdm11w3fgvkix2w7dqhrbf353r2n8vigxg8";
        libraryHaskellDepends = [ base ];
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "family-tree" = callPackage
@@ -87980,8 +87980,8 @@ self: {
          unordered-containers
        ];
        description = "A family tree library for the Haskell programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -87995,7 +87995,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast hash functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-arithmetic" = callPackage
@@ -88013,8 +88013,8 @@ self: {
        ];
        doHaddock = false;
        description = "Fast functions on integers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88034,7 +88034,7 @@ self: {
          scientific template-haskell text unordered-containers vector
        ];
        description = "Fast ByteString Builder";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "fast-combinatorics" = callPackage
@@ -88052,8 +88052,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Fast combinatorics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88073,8 +88073,8 @@ self: {
        benchmarkHaskellDepends = [ base digits gauge ];
        doHaddock = false;
        description = "Integer-to-digits conversion";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88090,7 +88090,7 @@ self: {
          base containers mtl process temporary text transformers
        ];
        description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-logger" = callPackage
@@ -88109,7 +88109,7 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec ];
        testToolDepends = [ hspec-discover ];
        description = "A fast logging system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-math" = callPackage
@@ -88120,7 +88120,7 @@ self: {
        sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425";
        libraryHaskellDepends = [ base ];
        description = "Non IEEE-754 compliant compile-time floating-point optimisations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-mult" = callPackage
@@ -88131,7 +88131,7 @@ self: {
        sha256 = "0lpgfb1a2kf0c9w9br2izzqn0f66pchydnq87a7z74lzs5jm1bba";
        libraryHaskellDepends = [ base ghc-prim integer-gmp strict-base ];
        description = "Numeric type with asymptotically faster multiplications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-nats" = callPackage
@@ -88142,8 +88142,8 @@ self: {
        sha256 = "1kp34h0ghpr3hwkbybwy954kbbdkbychzhjh4g1q44b2a8rgi5w1";
        libraryHaskellDepends = [ base ];
        description = "Natural Numbers with no overhead";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88170,7 +88170,7 @@ self: {
          base bytestring tasty tasty-hunit text void
        ];
        description = "Fast incremental vi and emacs tags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-tagsoup" = callPackage
@@ -88185,7 +88185,7 @@ self: {
          base bytestring containers tagsoup text text-icu
        ];
        description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fast-tagsoup-utf8-only" = callPackage
@@ -88196,7 +88196,7 @@ self: {
        sha256 = "10svhgjvp1802jawr1s5chkincl2xhh6k0grm60f216jpasbvff4";
        libraryHaskellDepends = [ base bytestring tagsoup text ];
        description = "Fast parser for tagsoup package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fasta" = callPackage
@@ -88213,8 +88213,8 @@ self: {
          pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
        ];
        description = "A simple, mindless parser for fasta files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88226,8 +88226,8 @@ self: {
        sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm";
        libraryHaskellDepends = [ base hmatrix vector ];
        description = "Bayesian modeling algorithms accelerated for particular model structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88240,7 +88240,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cgi ];
        librarySystemDepends = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) fcgi;};
 
   "fastedit" = callPackage
@@ -88261,8 +88261,8 @@ self: {
          QuickCheck
        ];
        description = "find nearest neighbours by edit-distance";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88279,8 +88279,8 @@ self: {
          network-fancy
        ];
        description = "Fast Internet Relay Chat (IRC) library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88300,8 +88300,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "A highly experimental Fastly API client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88320,7 +88320,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A fast, but bare bones, bytestring parser combinators library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fastpbkdf2" = callPackage
@@ -88340,7 +88340,7 @@ self: {
          base bytestring criterion cryptonite pbkdf
        ];
        description = "Haskell bindings to the fastpbkdf2 C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "fastsum" = callPackage
@@ -88359,8 +88359,8 @@ self: {
          base deepseq ghc-prim hashable template-haskell
        ];
        description = "A fast open-union type suitable for 100+ contained alternatives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88375,8 +88375,8 @@ self: {
          base bytestring cassava hxt network-uri text
        ];
        description = "Utilities for working with DuckDuckHack's FatHead Instant Answers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88388,8 +88388,8 @@ self: {
        sha256 = "04m6hfj0sqhmq89fwfq4igz1rc0p3rzkhfg6fzsw5kyda2c8bbz0";
        libraryHaskellDepends = [ base yices ];
        description = "A fault tree analysis library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88420,8 +88420,8 @@ self: {
        ];
        executableHaskellDepends = [ base mtl optparse-applicative split ];
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88434,8 +88434,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base fay ];
        description = "The base package for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88453,8 +88453,8 @@ self: {
          base Cabal data-default directory fay filepath safe split text
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88469,8 +88469,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "DOM FFI wrapper library for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88483,8 +88483,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "W3C compliant implementation of GeoPosition API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88497,8 +88497,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Clientside HTML generation for fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88511,8 +88511,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "jQuery bindings for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88525,8 +88525,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "Like IORef but for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88539,8 +88539,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "SimpleJSON library for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88555,8 +88555,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay fay-base text ];
        description = "Fay Text type represented as JavaScript strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88569,8 +88569,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "Persistent FFI bindings for using jsUri in Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88583,8 +88583,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "Websockets FFI library for Fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88611,7 +88611,7 @@ self: {
          unliftio
        ];
        description = "Bindings to Facebook's API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fb-persistent" = callPackage
@@ -88622,8 +88622,8 @@ self: {
        sha256 = "1il06mlvvjybfnqpdnir9nr1g0irf84fa4q8lzavrlqgny8f294s";
        libraryHaskellDepends = [ base cereal fb persistent text time ];
        description = "Provides Persistent instances to Facebook types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88652,8 +88652,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring filepath hspec text ];
        description = "High-level bindings to Facebook Messenger Platform API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88670,8 +88670,8 @@ self: {
          unordered-containers
        ];
        description = "Algo for Formal Concept Analysis";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88688,8 +88688,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl ];
        description = "Cache a function (a -> b)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88709,8 +88709,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A faster way to navigate directories using the command line";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88726,8 +88726,8 @@ self: {
        executableHaskellDepends = [ base first-class-families ];
        testHaskellDepends = [ base doctest first-class-families Glob ];
        description = "Data structures and algorithms for first-class-families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88740,8 +88740,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88753,8 +88753,8 @@ self: {
        sha256 = "1yvsnk9awik143jh2268w1l5x70kmky60gac10fy2y1450dcn65x";
        libraryHaskellDepends = [ base cgi HaXml xhtml ];
        description = "Server-Side Integration for FCKeditor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88774,7 +88774,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "First class accessor labels implemented as lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fclabels-monadlib" = callPackage
@@ -88785,8 +88785,8 @@ self: {
        sha256 = "1j15fxrpwnjnbjkswsy6jxn8f0bj2nhcdsf5976i7rka7gsjzr3d";
        libraryHaskellDepends = [ base fclabels monadLib ];
        description = "MonadLib monadic interface for the \"fclabels\" package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88818,8 +88818,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Admin API for Firebase Cloud Messaging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88831,7 +88831,7 @@ self: {
        sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
        libraryHaskellDepends = [ base containers dbus ];
        description = "Desktop Notifications client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fdo-trash" = callPackage
@@ -88851,8 +88851,8 @@ self: {
          base Diff directory filepath old-locale parsec time unix url
        ];
        description = "Utilities related to freedesktop Trash standard";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88864,7 +88864,7 @@ self: {
        sha256 = "03jpdg50g43lb3akfyfs0yh630igqfm0dg62bk4s5yv23cmbn8vf";
        libraryHaskellDepends = [ base containers microlens-platform mtl ];
        testHaskellDepends = [ base containers microlens-platform mtl ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "feature-flags" = callPackage
@@ -88875,7 +88875,7 @@ self: {
        sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f";
        libraryHaskellDepends = [ base text ];
        description = "A simple library for dynamically enabling and disabling functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "feature-flipper" = callPackage
@@ -88893,8 +88893,8 @@ self: {
          base bytestring containers digest hspec mtl text
        ];
        description = "A minimally obtrusive feature flag library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88916,8 +88916,8 @@ self: {
          persistent persistent-postgresql
        ];
        description = "A minimally obtrusive feature flag library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -88940,7 +88940,7 @@ self: {
        sha256 = "0hynmwic940vmna0czavbp1wx856ad9am7i6r0d2hq8jynrsin5w";
        libraryHaskellDepends = [ base ];
        description = "Library for Fedora distribution versions";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "fedora-haskell-tools" = callPackage
@@ -88959,7 +88959,7 @@ self: {
          process simple-cmd simple-cmd-args split time unix
        ];
        description = "Building and maintenance tools for Fedora Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "fedora-img-dl" = callPackage
@@ -88979,8 +88979,8 @@ self: {
          xdg-userdirs
        ];
        description = "Fedora image download tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89003,8 +89003,8 @@ self: {
          io-streams lens text
        ];
        description = "Haskell interface to the Fedora Packages webapp API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89020,7 +89020,7 @@ self: {
        executableHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Short description of your package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "feed" = callPackage
@@ -89046,7 +89046,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "feed-cli" = callPackage
@@ -89064,8 +89064,8 @@ self: {
          base directory feed old-locale old-time time xml
        ];
        description = "A simple command line interface for creating and updating feeds like RSS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89083,8 +89083,8 @@ self: {
          time-interval time-units timerep transformers utf8-string
        ];
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89101,8 +89101,8 @@ self: {
          network-uri text transformers
        ];
        description = "Utility for fetching feeds with redirect info and HTML link detection";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89141,8 +89141,8 @@ self: {
          tasty-smallcheck temporary text transformers
        ];
        description = "CI service around gipeda";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89164,8 +89164,8 @@ self: {
          raw-strings-qq scotty text transformers wai warp wreq xml
        ];
        description = "Translate syndication feeds";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89184,8 +89184,8 @@ self: {
          regex-posix tagsoup time utf8-string
        ];
        description = "(unsupported)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89202,8 +89202,8 @@ self: {
          base bytestring download-curl feed hs-twitter
        ];
        description = "Send posts from a feed to Twitter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89231,8 +89231,8 @@ self: {
        executableSystemDepends = [ mxnet ];
        executableToolDepends = [ c2hs ];
        description = "FFI to MXNet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mxnet;};
 
@@ -89260,8 +89260,8 @@ self: {
          optparse-applicative palette Rasterific repa rio store
        ];
        description = "Cocodataset with cocoapi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89288,8 +89288,8 @@ self: {
        executableSystemDepends = [ mxnet ];
        testHaskellDepends = [ base fei-base hspec streaming ];
        description = "mxnet dataiters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mxnet;};
 
@@ -89319,8 +89319,8 @@ self: {
          stm-conduit vector
        ];
        description = "Some datasets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89341,8 +89341,8 @@ self: {
          optparse-applicative random-source repa resourcet rio store
        ];
        description = "fei examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89359,8 +89359,8 @@ self: {
          text transformers-base vector
        ];
        description = "A collection of standard models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89382,8 +89382,8 @@ self: {
          transformers-base type-combinators uuid wl-pprint-text
        ];
        description = "Train a neural network with MXNet in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89412,8 +89412,8 @@ self: {
          base criterion data-default deepseq feldspar-language
        ];
        description = "Compiler for the Feldspar language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gcc_s = null;};
 
@@ -89437,8 +89437,8 @@ self: {
          tasty-quickcheck tasty-th utf8-string
        ];
        description = "A functional embedded language for DSP and parallelism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89456,8 +89456,8 @@ self: {
          feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv
        ];
        description = "Signal Processing extension for Feldspar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {feldspar-compiler-shim = null; monadic-edsl-priv = null;};
 
@@ -89480,7 +89480,7 @@ self: {
          api-opentheory-unicode base opentheory-unicode
        ];
        description = "Converting a chess position from FEN notation to text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fences" = callPackage
@@ -89492,7 +89492,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "To be written";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "fenfire" = callPackage
@@ -89512,7 +89512,7 @@ self: {
        executableSystemDepends = [ raptor ];
        description = "Graph-based notetaking system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {raptor = null;};
 
@@ -89538,8 +89538,8 @@ self: {
          tasty-hunit tasty-quickcheck time
        ];
        description = "Generate and verify HMAC-based authentication tokens";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89570,8 +89570,8 @@ self: {
          yesod yesod-test
        ];
        description = "Remote multi-db SQLCipher server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89583,8 +89583,8 @@ self: {
        sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b";
        libraryHaskellDepends = [ base containers regex-compat ];
        description = "Simple functions for loading config files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89599,8 +89599,8 @@ self: {
        libraryHaskellDepends = [ base HTTP json network utf8-string ];
        executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89622,8 +89622,8 @@ self: {
          unordered-containers
        ];
        description = "automatic C++ binding generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89635,7 +89635,7 @@ self: {
        sha256 = "05ljkq3zv8nfx4xhvqql13qd81v46bnxnja8f8590yrf3zfqg87x";
        libraryHaskellDepends = [ base bytestring template-haskell ];
        description = "Runtime for fficxx-generated library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ffmpeg-light" = callPackage
@@ -89657,7 +89657,7 @@ self: {
          ffmpeg libavcodec libavdevice libavformat libswscale
        ];
        description = "Minimal bindings to the FFmpeg library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -89674,8 +89674,8 @@ self: {
          base bytestring haskell98 hs-ffmpeg SDL stm
        ];
        description = "Tutorials on ffmpeg usage to play video/audio";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89693,7 +89693,7 @@ self: {
        libraryPkgconfigDepends = [ fftw fftwFloat ];
        testHaskellDepends = [ base carray QuickCheck storable-complex ];
        description = "Bindings to the FFTW library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
@@ -89705,7 +89705,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fftw ];
        description = "Low level bindings to FFTW";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) fftw;};
 
   "ffunctor" = callPackage
@@ -89724,8 +89724,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "FFunctor typeclass";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89743,7 +89743,7 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        benchmarkHaskellDepends = [ base deepseq microbench ];
        description = "Martin Erwig's Functional Graph Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fgl-arbitrary" = callPackage
@@ -89755,7 +89755,7 @@ self: {
        libraryHaskellDepends = [ base fgl QuickCheck ];
        testHaskellDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fgl-extras-decompositions" = callPackage
@@ -89766,8 +89766,8 @@ self: {
        sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s";
        libraryHaskellDepends = [ base containers fgl ];
        description = "Graph decomposition algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89779,7 +89779,7 @@ self: {
        sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq";
        libraryHaskellDepends = [ base dotgen fgl ];
        description = "Convert FGL graphs to dot (graphviz) files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fib" = callPackage
@@ -89790,7 +89790,7 @@ self: {
        sha256 = "17pk2fzgr4jjmpam52vmqg69927gfsl81w61h7q9zsf1vzd0qnix";
        libraryHaskellDepends = [ base-noprelude integer-gmp semirings ];
        description = "fibonacci algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fibon" = callPackage
@@ -89811,8 +89811,8 @@ self: {
          process regex-compat statistics syb tabular time vector
        ];
        description = "Tools for running and analyzing Haskell benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89824,7 +89824,7 @@ self: {
        sha256 = "18jqb4ynjsnpvydzpqzh7l5wyrjb3s3kxgc6a6ipwb6w2hygyf7k";
        libraryHaskellDepends = [ base ];
        description = "Fast computation of Fibonacci numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ficketed" = callPackage
@@ -89844,8 +89844,8 @@ self: {
          wai wai-app-static warp
        ];
        description = "update statically hosted file in a push stule through socketed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89861,8 +89861,8 @@ self: {
          array base containers fclabels monads-fd transformers
        ];
        description = "First-class record field combinators with infix record field syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89878,7 +89878,7 @@ self: {
          base base64-bytestring containers json mtl utf8-string
        ];
        description = "Abusing monadic syntax JSON objects generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fieldwise" = callPackage
@@ -89890,8 +89890,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89903,8 +89903,8 @@ self: {
        sha256 = "03bxiicvfwia5g0whg454ph2s34n8firjcqhn6d7qvbim338hkxq";
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "Manipulation of FIG files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89918,8 +89918,8 @@ self: {
          base bytestring clock directory zip-archive
        ];
        description = "Provide a uniform interface over file archives and directories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89935,8 +89935,8 @@ self: {
          base parsec process system-filepath template-haskell text
        ];
        description = "Quasiquoter for system commands involving filepaths";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -89953,7 +89953,7 @@ self: {
        ];
        testHaskellDepends = [ base filepath ];
        description = "Use Template Haskell to embed file contents directly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "file-embed-lzma" = callPackage
@@ -89972,7 +89972,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        description = "Use Template Haskell to embed (LZMA compressed) data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "file-embed-poly" = callPackage
@@ -89990,8 +89990,8 @@ self: {
          base bytestring directory file-embed filepath hspec
        ];
        description = "Use Template Haskell to embed file contents directly";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90009,8 +90009,8 @@ self: {
        ];
        testHaskellDepends = [ base lifted-base process ];
        description = "common functions that show file location information";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90033,7 +90033,7 @@ self: {
          regex-compat regex-pcre
        ];
        description = "Takes a Haskell source-code file and outputs its modules";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "file-path-th" = callPackage
@@ -90050,7 +90050,7 @@ self: {
          base directory file-embed filepath template-haskell
        ];
        description = "Template Haskell utilities for filepaths";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "file-templates" = callPackage
@@ -90068,7 +90068,7 @@ self: {
          transformers unordered-containers
        ];
        description = "Use templates for files and directories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "filecache" = callPackage
@@ -90087,8 +90087,8 @@ self: {
          base containers directory filepath hspec stm temporary
        ];
        description = "A cache system associating values to files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90110,8 +90110,8 @@ self: {
          base directory either mtl tasty tasty-hunit text time transformers
        ];
        description = "Diffing and patching module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90124,7 +90124,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ async base process ];
        description = "Portable interface to file locking (flock / LockFileEx)";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "filemanip" = callPackage
@@ -90139,7 +90139,7 @@ self: {
          base bytestring directory filepath mtl unix-compat
        ];
        description = "Expressive file and directory manipulation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fileneglect" = callPackage
@@ -90150,8 +90150,8 @@ self: {
        sha256 = "1s00jlq6cbab0fasx0ngg1n3ilzi634d4a4aday4jngsnvbwb735";
        libraryHaskellDepends = [ base hinotify stm ];
        description = "Block thread until a file stops being modified";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90166,8 +90166,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Library for manipulating FilePaths in a cross platform way";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "filepath-bytestring" = callPackage
@@ -90179,7 +90179,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring filepath QuickCheck ];
        description = "Library for manipulating RawFilePaths in a cross platform way";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "filepath-crypto" = callPackage
@@ -90198,8 +90198,8 @@ self: {
          cryptoids-types exceptions filepath sandi template-haskell
        ];
        description = "Reversable and secure encoding of object ids as filepaths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90211,8 +90211,8 @@ self: {
        sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp";
        libraryHaskellDepends = [ base base-io-access filepath ];
        description = "IO Access for filepath";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90229,8 +90229,8 @@ self: {
          transformers
        ];
        description = "Functions on System.FilePath";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90243,7 +90243,7 @@ self: {
        libraryHaskellDepends = [ base directory extra filepath ];
        testHaskellDepends = [ base directory extra filepath QuickCheck ];
        description = "File path glob-like matching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fileplow" = callPackage
@@ -90259,8 +90259,8 @@ self: {
          base bytestring hspec mtl QuickCheck temporary
        ];
        description = "Library to process and search large files or a collection of files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90281,7 +90281,7 @@ self: {
          base Diff directory filepath HUnit mtl time
        ];
        description = "Interface for versioning file stores";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "filesystem-abstractions" = callPackage
@@ -90298,8 +90298,8 @@ self: {
          base bytestring list-tries posix-paths semigroups
        ];
        description = "A shared set of abstractions and types for representing filessytem data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90321,8 +90321,8 @@ self: {
          transformers
        ];
        description = "Use system-filepath data types with conduits. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90338,8 +90338,8 @@ self: {
          base enumerator system-fileio system-filepath transformers unix
        ];
        description = "Enumerator-based API for manipulating the filesystem";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90356,8 +90356,8 @@ self: {
          filepath mtl unix
        ];
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90374,8 +90374,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest hspec unordered-containers ];
        description = "Flexible string substitution";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90397,7 +90397,7 @@ self: {
        executableHaskellDepends = [ aeson base bytestring scotty ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Filterable request logging wai middleware. Change how data is logged and when.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "filters-basic" = callPackage
@@ -90408,7 +90408,7 @@ self: {
        sha256 = "09q6fb8cv7di67wb8zhky8qpbwivzax59xik1zbcjf3sp465a337";
        libraryHaskellDepends = [ base ];
        description = "Allows to change the structure of the function output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "filtrable" = callPackage
@@ -90419,7 +90419,7 @@ self: {
        sha256 = "11jas9w611pslc3hanybsdwrh4292zvgigng8y4cv7gm0j908xng";
        libraryHaskellDepends = [ base transformers ];
        description = "Class of filtrable containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "filtrable_0_1_6_0" = callPackage
@@ -90433,8 +90433,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of filtrable containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fin" = callPackage
@@ -90450,7 +90450,7 @@ self: {
        libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ];
        testHaskellDepends = [ base inspection-testing tagged ];
        description = "Nat and Fin: peano naturals and finite numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "final" = callPackage
@@ -90461,7 +90461,7 @@ self: {
        sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
        libraryHaskellDepends = [ base stm transformers ];
        description = "utility to add extra safety to monadic returns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "final-pretty-printer" = callPackage
@@ -90476,8 +90476,8 @@ self: {
          ansi-terminal base containers exceptions mtl temporary text
        ];
        description = "Extensible pretty printing with semantic annotations and proportional fonts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90503,8 +90503,8 @@ self: {
          optparse-applicative text tree-fun unordered-containers
        ];
        description = "Find the clumpiness of labels in a tree";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90539,8 +90539,8 @@ self: {
          transformers-base unix-compat
        ];
        description = "A file-finding conduit that allows user control over traversals";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90552,8 +90552,8 @@ self: {
        sha256 = "1iiyfp8p0iaf39brii95wp6887ds63bx8qrrm4raks8y4b1hflrc";
        libraryHaskellDepends = [ base Cabal directory filepath mtl ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90572,8 +90572,8 @@ self: {
          http-directory simple-cmd-args text
        ];
        description = "List http/html files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90591,7 +90591,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Generic finger-tree structure, with example instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fingertree-psqueue" = callPackage
@@ -90602,8 +90602,8 @@ self: {
        sha256 = "14kc0ijx44q7whniickjj3h9ag1pixn51dlxjs6n2ypaclcjz34z";
        libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90615,8 +90615,8 @@ self: {
        sha256 = "1ja8cqxpqhvssbcywph3zna946g1li5hlzsqab9lhg6vw0baakdn";
        libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90641,7 +90641,7 @@ self: {
          template-haskell typelits-witnesses vector vector-sized
        ];
        description = "A better, more type-safe Enum";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "finitary-derive" = callPackage
@@ -90664,8 +90664,8 @@ self: {
          hedgehog-classes
        ];
        description = "Flexible and easy deriving of type classes for finitary types";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90684,7 +90684,7 @@ self: {
          base hedgehog hspec hspec-hedgehog optics-core
        ];
        description = "Prisms and Isos between finitary types";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "finite-field" = callPackage
@@ -90704,7 +90704,7 @@ self: {
          tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Finite Fields";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "finite-typelits" = callPackage
@@ -90715,7 +90715,7 @@ self: {
        sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj";
        libraryHaskellDepends = [ base deepseq ];
        description = "A type inhabited by finitely many values, indexed by type-level naturals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "finito" = callPackage
@@ -90733,7 +90733,7 @@ self: {
          base numeric-domains propeller split transformers
        ];
        description = "Constraint Solver for Finite Domains";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "firebase-database" = callPackage
@@ -90760,7 +90760,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Google Firebase Database SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {nano-http = null;};
 
@@ -90778,7 +90778,7 @@ self: {
          http-types mtl regex-pcre text transformers wai warp
        ];
        description = "A simple HTTP server framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "firefly-example" = callPackage
@@ -90794,8 +90794,8 @@ self: {
          aeson base blaze-html firefly mtl text wai
        ];
        description = "A simple example using Firefly";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90808,8 +90808,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "First and Last generalized to return up to n values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90824,7 +90824,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "First class type families";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "first-class-instances" = callPackage
@@ -90841,8 +90841,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "First class typeclass instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90854,7 +90854,7 @@ self: {
        sha256 = "1bh8ndf77pfh851d7szx0q2lpima6zm1d652s9j7jzchr7icyjvs";
        libraryHaskellDepends = [ base transformers ];
        description = "First class patterns and pattern matching, using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "firstify" = callPackage
@@ -90871,8 +90871,8 @@ self: {
          base containers directory filepath homeomorphic mtl Safe yhccore
        ];
        description = "Defunctionalisation for Yhc Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90897,7 +90897,7 @@ self: {
        ];
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90917,8 +90917,8 @@ self: {
          QuickCheck text
        ];
        description = "FIT file decoder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90942,8 +90942,8 @@ self: {
          statistics vector
        ];
        description = "Parse FITS files";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -90957,7 +90957,7 @@ self: {
        librarySystemDepends = [ cfitsio ];
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) cfitsio;};
 
@@ -90974,7 +90974,7 @@ self: {
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base pretty ];
        description = "refining property sets for testing Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fix-imports" = callPackage
@@ -90997,8 +90997,8 @@ self: {
          mtl pretty process split test-karya text time uniplate
        ];
        description = "Program to manage the imports of a haskell module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91013,7 +91013,7 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91025,8 +91025,8 @@ self: {
        sha256 = "01fxzhd2wqzp0paba64q5psfc4qvc4b8i88rdkn6mxlkm21gkp6y";
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91038,7 +91038,7 @@ self: {
        sha256 = "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j";
        libraryHaskellDepends = [ base ];
        description = "Signed 15.16 precision fixed point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-length" = callPackage
@@ -91052,7 +91052,7 @@ self: {
          base non-empty storable-record tfp utility-ht
        ];
        description = "Lists with statically known length based on non-empty package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-list" = callPackage
@@ -91063,7 +91063,7 @@ self: {
        sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb";
        libraryHaskellDepends = [ base ];
        description = "A fixed length list type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-point" = callPackage
@@ -91074,8 +91074,8 @@ self: {
        sha256 = "010gx32av4cn5bqq1zrrcah50ay528vw01fvv1xhfpkrx1ll9wka";
        libraryHaskellDepends = [ base ];
        description = "Binary fixed-point arithmetic";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91087,8 +91087,8 @@ self: {
        sha256 = "029mn44d1i794b1pbpa0zmf6b20zl0cvsf77mbfdkqnyx8986883";
        libraryHaskellDepends = [ base fixed-point vector ];
        description = "Unbox instances for the fixed-point package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91100,8 +91100,8 @@ self: {
        sha256 = "10b29gqy3rpwd5wf2b65p0llm8ksyp1p7k43rm1n5g5z67wkd7dx";
        libraryHaskellDepends = [ base fixed-point vector-space ];
        description = "vector-space instances for the fixed-point package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91117,8 +91117,8 @@ self: {
          base hmpfr integer-gmp reflection tagged template-haskell
        ];
        description = "Fixed Precision Arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91130,8 +91130,8 @@ self: {
        sha256 = "0vb5h2v2qx19d7xibf7ksv2cha2pngh49mfpkh43f9vrwc6042ph";
        libraryHaskellDepends = [ array base tagged ];
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91143,8 +91143,8 @@ self: {
        sha256 = "0rk5ym38m48khss38v8x09sdfz2nyhw7bw3dbjzy5qad09nzsipl";
        libraryHaskellDepends = [ async base clock time ];
        description = "Pure Haskell library to repeat an action at a specific frequency";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91157,7 +91157,7 @@ self: {
        libraryHaskellDepends = [ base deepseq primitive ];
        testHaskellDepends = [ base doctest filemanip primitive ];
        description = "Generic vectors with statically known size";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-vector-binary" = callPackage
@@ -91173,8 +91173,8 @@ self: {
          base binary fixed-vector tasty tasty-quickcheck
        ];
        description = "Binary instances for fixed-vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91191,8 +91191,8 @@ self: {
          base fixed-vector serialise tasty tasty-quickcheck
        ];
        description = "Binary instances for fixed-vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91209,8 +91209,8 @@ self: {
          base cereal fixed-vector tasty tasty-quickcheck
        ];
        description = "Cereal instances for fixed-vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91228,7 +91228,7 @@ self: {
        libraryHaskellDepends = [ base deepseq fixed-vector primitive ];
        testHaskellDepends = [ base doctest fixed-vector ];
        description = "Library for working with product types generically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixed-width" = callPackage
@@ -91239,8 +91239,8 @@ self: {
        sha256 = "0gxmw70d1bdqjqrz3d1an009x7bqzlv41dfydp7b49ina5as9ry7";
        libraryHaskellDepends = [ base ];
        description = "Fixed width subsets of an Int64/Word64";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91252,7 +91252,7 @@ self: {
        sha256 = "01ss9rzg2r4gii6f7771n4vdyg022skyws6ncc3l62xycgz153a7";
        libraryHaskellDepends = [ base random ];
        description = "A fixed-precision real number type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixedwidth-hs" = callPackage
@@ -91268,7 +91268,7 @@ self: {
          aeson attoparsec base bytestring text
        ];
        description = "Quick parsing of fixed-width data formats";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fixer" = callPackage
@@ -91296,8 +91296,8 @@ self: {
          validity-time yaml
        ];
        description = "A Haskell client for http://fixer.io/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91319,8 +91319,8 @@ self: {
          tasty tasty-quickcheck temporary
        ];
        description = "File-backed recursive data structures";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91345,8 +91345,8 @@ self: {
          old-time QuickCheck text
        ];
        description = "FIX (co)parser";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91368,8 +91368,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91386,7 +91386,7 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck
        ];
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixpoint" = callPackage
@@ -91397,7 +91397,7 @@ self: {
        sha256 = "05h1cw1gpnwk1qjlia4l27j375cva8pp75fzn99w2rxsv6khszpb";
        libraryHaskellDepends = [ base ];
        description = "Data types as fixpoints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fixtime" = callPackage
@@ -91408,7 +91408,7 @@ self: {
        sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5";
        libraryHaskellDepends = [ base time ];
        description = "Some fixes to the time package";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "fizz-buzz" = callPackage
@@ -91419,7 +91419,7 @@ self: {
        sha256 = "1c0nar70857awmzxh6w12xvplqrgp1qh2r7rlnaqvwcfzqkghav4";
        libraryHaskellDepends = [ base ];
        description = "Functional Fizz/Buzz";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fizzbuzz" = callPackage
@@ -91430,8 +91430,8 @@ self: {
        sha256 = "0iia37wsxvaff28ln4l9hzdg458vcnak3jj4kjnsrbbfysan5wlx";
        libraryHaskellDepends = [ base ];
        description = "test";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91449,8 +91449,8 @@ self: {
          async base bytestring network-simple optparse-applicative
        ];
        description = "FizzBuzz as a service";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91477,8 +91477,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Complete high-level binding to libFLAC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {FLAC = null;};
 
@@ -91499,8 +91499,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91518,7 +91518,7 @@ self: {
          base binary deepseq HTTP optparse-applicative process
        ];
        description = "Verify FLAC files ripped form CD using AccurateRip™";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "flags-applicative" = callPackage
@@ -91534,7 +91534,7 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec text ];
        description = "Applicative flag parsing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flamethrower" = callPackage
@@ -91545,8 +91545,8 @@ self: {
        sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x";
        libraryHaskellDepends = [ base template-haskell text ];
        description = "A template engine for HTML";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91563,8 +91563,8 @@ self: {
          base either optparse-applicative pipes
        ];
        description = "FlameGraphs of profiling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91609,8 +91609,8 @@ self: {
          these turtle unliftio-path vinyl
        ];
        description = "Generate language learning flashcards from video";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91637,7 +91637,7 @@ self: {
          unordered-containers vector
        ];
        description = "Principled and efficient bit-oriented binary serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flat-maybe" = callPackage
@@ -91648,8 +91648,8 @@ self: {
        sha256 = "0kxyr7k47lsw7xg523kf98d57p6i1iz5dmyp91zg1xs2hsbjgvlq";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Strict Maybe without space and indirection overhead";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91668,7 +91668,7 @@ self: {
        ];
        testHaskellDepends = [ base vector ];
        description = "Painless general-purpose sampling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "flat-tex" = callPackage
@@ -91681,7 +91681,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory parsec ];
        description = "flatten a latex multi-file latex document and remove all comments";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "flatbuffers" = callPackage
@@ -91716,8 +91716,8 @@ self: {
          scientific template-haskell text text-manipulate vector
        ];
        description = "Haskell implementation of the FlatBuffers protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91732,8 +91732,8 @@ self: {
        libraryHaskellDepends = [ base constraints transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck transformers ];
        description = "Work generically on your datatype without knowing its shape nor its contents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91749,7 +91749,7 @@ self: {
          base containers template-haskell th-extras transformers
        ];
        description = "Generate default function implementations for complex type classes";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "flexible-time" = callPackage
@@ -91760,8 +91760,8 @@ self: {
        sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
        libraryHaskellDepends = [ base bytestring unix-time ];
        description = "simple extension of Data.UnixTime.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91776,7 +91776,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base bytestring text ];
        description = "A configurable reimplementation of unlit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flexiwrap" = callPackage
@@ -91787,8 +91787,8 @@ self: {
        sha256 = "0vvl9w3i374k720sscbcsbha89fcfk1hcvdr0nk4y7gkp13xwdba";
        libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        description = "Flexible wrappers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91802,8 +91802,8 @@ self: {
          base data-type flexiwrap mtl smallcheck
        ];
        description = "SmallCheck (Serial) instances for flexiwrap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91816,7 +91816,7 @@ self: {
        libraryHaskellDepends = [ base clock ];
        testHaskellDepends = [ base clock hspec QuickCheck ];
        description = "work with durations of time using the Flick as the smallest unit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flickr" = callPackage
@@ -91834,8 +91834,8 @@ self: {
        ];
        executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91847,7 +91847,7 @@ self: {
        sha256 = "17w40nfmdb4crg23fnqn663i4a60dx5714rcyaiqllm4r25n5qv9";
        libraryHaskellDepends = [ base bytestring parsec utf8-string ];
        description = "A parser for IGC files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "flight-kml" = callPackage
@@ -91870,7 +91870,7 @@ self: {
          tasty-quickcheck tasty-smallcheck template-haskell time
        ];
        description = "Parsing of pilot tracklogs dumped as KML";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "flink-statefulfun" = callPackage
@@ -91891,8 +91891,8 @@ self: {
        ];
        libraryToolDepends = [ proto-lens-protoc ];
        description = "Flink stateful functions SDK";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91906,7 +91906,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process safe-exceptions ];
        description = "e.g. `flip systemctl foo.service start` does `systemctl start foo.service`";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "flippers" = callPackage
@@ -91919,7 +91919,7 @@ self: {
        editedCabalFile = "1d3k5prcb5nl7gwq30h4n7qsbl86hrj42zpvrqwsr9lir2jss279";
        libraryHaskellDepends = [ base ];
        description = "Variations on flip for multiple arguments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flite" = callPackage
@@ -91935,8 +91935,8 @@ self: {
          array base containers haskell98 parsec
        ];
        description = "f-lite compiler, interpreter and libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91957,7 +91957,7 @@ self: {
          base bytestring mtl parsec regex-compat text
        ];
        description = "Generate flow charts from your code base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "float-binstring" = callPackage
@@ -91973,8 +91973,8 @@ self: {
          attoparsec base hspec HUnit QuickCheck split text
        ];
        description = "C99 printf \"%a\" style formatting and parsing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -91986,7 +91986,7 @@ self: {
        sha256 = "0f4nrj5qy6j6d9ll22zjkbgvw2rx0x2w7nllhl929zdbmhxrjk73";
        libraryHaskellDepends = [ base integer-gmp ];
        description = "FFI bindings for C _Float128";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "floating-bits" = callPackage
@@ -91999,8 +91999,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conversions between floating and integral values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92012,7 +92012,7 @@ self: {
        sha256 = "1zsxjwgm8nkphnmsbz03yvplc2r02qybb387n910j4j6vya98khc";
        libraryHaskellDepends = [ array base integer-gmp ];
        description = "Alternative faster String representations for Double and Float, String representations for more general numeric types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flock" = callPackage
@@ -92030,7 +92030,7 @@ self: {
        ];
        description = "Wrapper for flock(2)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "floskell" = callPackage
@@ -92065,7 +92065,7 @@ self: {
          haskell-src-exts text utf8-string
        ];
        description = "A flexible Haskell source code pretty printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flow" = callPackage
@@ -92077,7 +92077,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "flow-er" = callPackage
@@ -92089,8 +92089,8 @@ self: {
        libraryHaskellDepends = [ base flow ];
        testHaskellDepends = [ base doctest flow QuickCheck ];
        description = "More directional operators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92109,7 +92109,7 @@ self: {
          base containers dotgen mtl parsec QuickCheck
        ];
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flowdock" = callPackage
@@ -92128,8 +92128,8 @@ self: {
          pipes-parse template-haskell text unordered-containers uuid
        ];
        description = "Flowdock client library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92166,8 +92166,8 @@ self: {
          transformers unordered-containers vector
        ];
        description = "API integration with Flowdock";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92195,8 +92195,8 @@ self: {
          tasty-quickcheck text time unordered-containers
        ];
        description = "Flowdock REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92215,7 +92215,7 @@ self: {
        ];
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92228,8 +92228,8 @@ self: {
        libraryHaskellDepends = [ base containers syb ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92248,8 +92248,8 @@ self: {
          directory MonadRandom mtl random
        ];
        description = "Simulate 454 pyrosequencing";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92282,8 +92282,8 @@ self: {
        ];
        testToolDepends = [ alex happy ];
        description = "A layout spec language for memory managers implemented in Rust";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92308,8 +92308,8 @@ self: {
          base directory filepath mtl OpenGLRaw parsec text
        ];
        description = "FLTK bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU; inherit (pkgs) pkg-config;};
@@ -92327,8 +92327,8 @@ self: {
          base bytestring directory fltkhs process stm
        ];
        description = "FLTKHS demos. Please scroll to the bottom for more information.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fltkhs-fluid-demos" = callPackage
@@ -92341,8 +92341,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Demos";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fltkhs-fluid-examples" = callPackage
@@ -92355,8 +92355,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92370,8 +92370,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base fltkhs ];
        description = "Fltkhs template project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fltkhs-themes" = callPackage
@@ -92389,8 +92389,8 @@ self: {
        ];
        librarySystemDepends = [ fontconfig ];
        description = "A set of themed widgets that provides drop in replacements to the ones in FLTKHS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) fontconfig;};
 
   "fluent-logger" = callPackage
@@ -92414,8 +92414,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92432,7 +92432,7 @@ self: {
        ];
        description = "Conduit interface for fluent-logger";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fluffy" = callPackage
@@ -92452,7 +92452,7 @@ self: {
          resource-pool text time uuid-types yesod-core yesod-static
        ];
        description = "A simple web application as a online practice website for XDU SE 2017 fall SPM";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "fluffy-parser" = callPackage
@@ -92467,8 +92467,8 @@ self: {
          base binary bytestring pandoc parsec postgresql-simple
        ];
        description = "The parser for fluffy to parsec the question bank in .docx type";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92491,7 +92491,7 @@ self: {
          aeson base containers hspec scientific text vector
        ];
        description = "Code-generated, Auto-versioned, & Smart Web APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fluid-idl-http-client" = callPackage
@@ -92507,7 +92507,7 @@ self: {
          text-conversions
        ];
        description = "Http Client addon for Fluid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fluid-idl-scotty" = callPackage
@@ -92520,7 +92520,7 @@ self: {
          aeson base fluid-idl mtl scotty text wai
        ];
        description = "Scotty server add-on for Fluid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fluidsynth" = callPackage
@@ -92534,8 +92534,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL containers directory ];
        librarySystemDepends = [ fluidsynth ];
        description = "Haskell bindings to FluidSynth";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
@@ -92551,7 +92551,7 @@ self: {
        testHaskellDepends = [ async base hspec QuickCheck stm ];
        benchmarkHaskellDepends = [ async base deepseq old-time stm ];
        description = "Concurrent bouded blocking queues optimized for flushing. Both IO and STM implementations.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "flux-monoid" = callPackage
@@ -92562,8 +92562,8 @@ self: {
        sha256 = "0aa5p8604j63zz8rfxcp4p4110k27ys5dcy980kg5hjzba7aj54m";
        libraryHaskellDepends = [ base ];
        description = "A monoid for tracking changes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92581,8 +92581,8 @@ self: {
          base directory filepath mtl process Unixutils
        ];
        description = "A Friendly Markup language without syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92594,7 +92594,7 @@ self: {
        sha256 = "19h95ph7lh7llw6j1v1rssrdi5k7xw8x0iac9rgzss371s2w3g9d";
        libraryHaskellDepends = [ base ];
        description = "FoldMap lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fmt" = callPackage
@@ -92621,7 +92621,7 @@ self: {
          text vector
        ];
        description = "A new formatting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fmt-for-rio" = callPackage
@@ -92632,8 +92632,8 @@ self: {
        sha256 = "0hxf1cgch4l5vwnsg4449ing3qi40kpfcwjg4l807sw0b18ccwar";
        libraryHaskellDepends = [ base enum-text-rio ];
        description = "Adaptor for getting fmt to work with rio";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92646,8 +92646,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base fmt ];
        testHaskellDepends = [ ansi-terminal base fmt ];
        description = "ANSI terminal colors formatters for fmt library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92669,7 +92669,7 @@ self: {
          unordered-containers wai wai-extra
        ];
        description = "A functional web framework";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "fn-extra" = callPackage
@@ -92688,8 +92688,8 @@ self: {
          wai-extra wai-util xmlhtml
        ];
        description = "Extras for Fn, a functional web framework";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92707,7 +92707,7 @@ self: {
          tasty-quickcheck
        ];
        description = "A general abstraction for manipulating elements of container data structures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "focuslist" = callPackage
@@ -92731,7 +92731,7 @@ self: {
          QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell
        ];
        description = "Lists with a focused element";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fold-debounce" = callPackage
@@ -92747,7 +92747,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec stm time ];
        description = "Fold multiple events that happen in a given period of time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fold-debounce-conduit" = callPackage
@@ -92766,7 +92766,7 @@ self: {
          base conduit hspec resourcet stm transformers
        ];
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foldable-ix" = callPackage
@@ -92777,7 +92777,7 @@ self: {
        sha256 = "1lvf1n8mnv3imlry4nqdv8c2c930yic0raqs2awnbmyyy1c6fc79";
        libraryHaskellDepends = [ base ];
        description = "Functions to find out the indices of the elements in the Foldable structures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "foldable1" = callPackage
@@ -92788,7 +92788,7 @@ self: {
        sha256 = "02p9wg0rcp7qvjp588y6r2szz7ja5x1idl04vn3hr7mbrbjq9ml5";
        libraryHaskellDepends = [ base transformers util ];
        description = "Foldable types with at least 1 element";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foldl" = callPackage
@@ -92811,7 +92811,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foldl-exceptions" = callPackage
@@ -92825,7 +92825,7 @@ self: {
        libraryHaskellDepends = [ base foldl safe-exceptions ];
        testHaskellDepends = [ base doctest ];
        description = "Exception handling with FoldM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "foldl-incremental" = callPackage
@@ -92846,8 +92846,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers criterion foldl ];
        description = "incremental folds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92872,8 +92872,8 @@ self: {
          base criterion foldl mwc-random statistics vector
        ];
        description = "Statistical functions from the statistics package implemented as Folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92900,8 +92900,8 @@ self: {
          base criterion foldl lens-family-core
        ];
        description = "Transducers for foldl folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92923,8 +92923,8 @@ self: {
          text transformers
        ];
        description = "Attoparsec and foldl-transduce integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92950,7 +92950,7 @@ self: {
          base bytestring deepseq directory doctest filepath mtl semigroups
        ];
        description = "Beautiful Folding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "folds-common" = callPackage
@@ -92963,8 +92963,8 @@ self: {
        libraryHaskellDepends = [ base containers folds ];
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -92983,7 +92983,7 @@ self: {
          array base containers gloss optparse-applicative xml
        ];
        description = "Toolset for Folger Shakespeare Library's XML annotated plays";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "follow" = callPackage
@@ -93011,8 +93011,8 @@ self: {
          text time transformers unordered-containers yaml
        ];
        description = "Haskell library to follow content published on any subject";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93037,7 +93037,7 @@ self: {
          path text unix utf8-string
        ];
        description = "Be notified when a file gets appended, solely with what was added. Warning - only works on linux and for files that are strictly appended, like log files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "follower" = callPackage
@@ -93055,8 +93055,8 @@ self: {
          old-locale strict time
        ];
        description = "Follow Tweets anonymously";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93069,8 +93069,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ foma ];
        description = "Simple Haskell bindings for Foma";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) foma;};
 
@@ -93082,7 +93082,7 @@ self: {
        sha256 = "1njwikgrsm52diq84j6lgjcndssk3ihmgp7fndwjq9m2v2h346gh";
        libraryHaskellDepends = [ base ];
        description = "A Font Awesome data type enumerating all icon classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "font-opengl-basic4x6" = callPackage
@@ -93096,8 +93096,8 @@ self: {
        libraryHaskellDepends = [ base OpenGL ];
        executableHaskellDepends = [ base GLFW-b OpenGL ];
        description = "Basic4x6 font for OpenGL";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93114,7 +93114,7 @@ self: {
        ];
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93130,7 +93130,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "for-free" = callPackage
@@ -93146,8 +93146,8 @@ self: {
          transformers
        ];
        description = "Functor, Monad, MonadPlus, etc for free";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93168,8 +93168,8 @@ self: {
          transformers vector
        ];
        description = "A library accelerates imperative style programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93186,8 +93186,8 @@ self: {
          base containers data-default-class lens linear
        ];
        description = "Simple force-directed layout";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93202,7 +93202,7 @@ self: {
        executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93214,8 +93214,8 @@ self: {
        sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby";
        libraryHaskellDepends = [ aeson base text ];
        description = "A Haskell library for working with forecast.io data.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93227,7 +93227,7 @@ self: {
        sha256 = "1pj30p7z5nq8j95z9c4kjv6spandfch3r0dvx3n8wsbh3270dvxj";
        libraryHaskellDepends = [ base ];
        description = "Types and instances for implementing a Storable with different peek and poke";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foreign-store" = callPackage
@@ -93238,7 +93238,7 @@ self: {
        sha256 = "1p436dn6l5zjzizcsj0hn10s2n907gr7c8y89i4sm3h69lhqlw86";
        libraryHaskellDepends = [ base ];
        description = "Store a stable pointer in a foreign context to be retrieved later";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foreign-var" = callPackage
@@ -93251,8 +93251,8 @@ self: {
        editedCabalFile = "077s05370sx7pn053z1y6ygjg77dsvpcd5r8ivx9q9rk8m1hdjgr";
        libraryHaskellDepends = [ base stm transformers ];
        description = "Encapsulating mutatable state in external libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93268,8 +93268,8 @@ self: {
          aeson base comonad deepseq free hashable profunctors semigroupoids
        ];
        description = "Tree and Forest types";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93291,8 +93291,8 @@ self: {
          aeson base bytestring containers HUnit mtl tasty tasty-hunit
        ];
        description = "Recursively delete CloudFormation stacks and their dependants";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93307,8 +93307,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Library for generating fake placeholder data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93320,7 +93320,7 @@ self: {
        sha256 = "0qnl3bvqiwh6d7lm3w06is5ivh025c7024695m7fzajvzbpk67jp";
        libraryHaskellDepends = [ base transformers ];
        description = "An implementation of forkIO for monad stacks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "forma" = callPackage
@@ -93338,7 +93338,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base containers hspec mtl text ];
        description = "Parse and validate forms in JSON format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "formal" = callPackage
@@ -93360,8 +93360,8 @@ self: {
          parsec process text transformers urlencoded wl-pprint-text
        ];
        description = "A statically typed, functional programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93374,8 +93374,8 @@ self: {
        libraryHaskellDepends = [ haskell2010 parsec ];
        testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        description = "Rendering from and scanning to format strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93388,7 +93388,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "Various number formatting functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "format-status" = callPackage
@@ -93405,8 +93405,8 @@ self: {
          base data-concurrent-queue old-locale stm text time
        ];
        description = "A utility for writing the date to dzen2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93424,8 +93424,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Number text formatting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93446,8 +93446,8 @@ self: {
          lens old-locale QuickCheck text time
        ];
        description = "Business-quality formatting of numbers, dates, and other things";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93466,7 +93466,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec semigroups text ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "formatting_7_1_1" = callPackage
@@ -93486,8 +93486,8 @@ self: {
          scientific text time transformers
        ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "forml" = callPackage
@@ -93511,8 +93511,8 @@ self: {
          process text urlencoded utf8-string zlib
        ];
        description = "A statically typed, functional programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93529,8 +93529,8 @@ self: {
          transformers xhtml
        ];
        description = "Formlets implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93547,8 +93547,8 @@ self: {
        ];
        libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93570,8 +93570,8 @@ self: {
          ansi-wl-pprint base containers lens text trifecta
        ];
        description = "Formura is a simple language to describe stencil computation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93599,8 +93599,8 @@ self: {
          type-level
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93617,7 +93617,7 @@ self: {
          base directory doctest hspec old-time process QuickCheck random
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "forth-hll" = callPackage
@@ -93628,8 +93628,8 @@ self: {
        sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3";
        libraryHaskellDepends = [ array-forth base free mtl ];
        description = "A simple eDSL for generating arrayForth code";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93658,8 +93658,8 @@ self: {
          filepath GenericPretty hspec mtl pretty text uniplate
        ];
        description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93674,8 +93674,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base text ];
        testHaskellDepends = [ base doctest hspec ];
        description = "Interactive terminal prompt";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93687,7 +93687,7 @@ self: {
        sha256 = "0q11h91mlbaflxl35sya5r4h9r5d18v5ib0hplrzcnsgwchdcd3f";
        libraryHaskellDepends = [ base SafeSemaphore stm unagi-chan ];
        description = "Concurrent channels with a forwarding primitive";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "foscam-directory" = callPackage
@@ -93706,8 +93706,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Foscam File format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93727,8 +93727,8 @@ self: {
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
        description = "Foscam File format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93755,8 +93755,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Foscam File format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93772,7 +93772,7 @@ self: {
        testHaskellDepends = [ base basement ];
        benchmarkHaskellDepends = [ base basement gauge ];
        description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "foundation-edge" = callPackage
@@ -93783,7 +93783,7 @@ self: {
        sha256 = "0dqpalqn9p10vmz3sw60aga76rpi4d92hrvq2v91pv44p1iva2mb";
        libraryHaskellDepends = [ bytestring foundation text ];
        description = "foundation's edge with the conventional set of packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fountain" = callPackage
@@ -93794,7 +93794,7 @@ self: {
        sha256 = "0mxzrvrag2qwn22llklmdkcf4icd8n9ifg1awd9q7ffll8a1a67p";
        libraryHaskellDepends = [ base containers random ];
        description = "A fountain codec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fourmolu" = callPackage
@@ -93822,7 +93822,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fourmolu_0_3_0_0" = callPackage
@@ -93850,8 +93850,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fp-ieee" = callPackage
@@ -93869,8 +93869,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "IEEE 754-2019 compliant operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93907,8 +93907,8 @@ self: {
          optparse-applicative process safe text unordered-containers
        ];
        description = "Simple interface to the FP Complete IDE API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -93927,7 +93927,7 @@ self: {
          base bytestring cryptonite integer-logarithms vector
        ];
        description = "Format-preserving encryption";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fpipe" = callPackage
@@ -93938,7 +93938,7 @@ self: {
        sha256 = "1b6r19yy9wh5w8xb0ajjxsd2qyzjnkgyav1975qv92wwxslyxwr8";
        libraryHaskellDepends = [ base ];
        description = "F#-style composition and application";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fplll" = callPackage
@@ -93954,8 +93954,8 @@ self: {
        libraryPkgconfigDepends = [ fplll ];
        testHaskellDepends = [ base ];
        description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>";
-       license = stdenv.lib.licenses.lgpl21Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fplll;};
 
@@ -93967,7 +93967,7 @@ self: {
        sha256 = "15qpfi3b9vnpm17q3y64nsrhlj5vi9rgrgysjfk98aw1gkj9mvv4";
        libraryHaskellDepends = [ base ];
        description = "A library for NLA operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fpnla-examples" = callPackage
@@ -93991,8 +93991,8 @@ self: {
          test-framework-quickcheck2 time vector
        ];
        description = "Example implementations for FPNLA library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94018,8 +94018,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "IEEE754r floating point conformance tests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94038,7 +94038,7 @@ self: {
        ];
        description = "Installed package query tool for Gentoo Linux";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fractal" = callPackage
@@ -94051,7 +94051,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Draw Newton, Julia and Mandelbrot fractals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fractals" = callPackage
@@ -94063,8 +94063,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base integer-gmp QuickCheck ];
        description = "A collection of useful fractal curve encoders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94076,8 +94076,8 @@ self: {
        sha256 = "0ajkrp7babip4y0symj65yanyazsazp7lsbbsa3il2b6kp9fwgxd";
        libraryHaskellDepends = [ base semigroups ];
        description = "Fractions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94093,7 +94093,7 @@ self: {
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94117,8 +94117,8 @@ self: {
        ];
        executableHaskellDepends = [ pretty ];
        description = "A simple web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghc-binary = null;};
 
@@ -94130,7 +94130,7 @@ self: {
        sha256 = "0wy1c9xgd6ykymqciga1sla83wfdwy17p88bygfp6pflbc0rw57g";
        libraryHaskellDepends = [ base frame pandoc ];
        description = "A markdown to Frame GUI writer for Pandoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "franchise" = callPackage
@@ -94141,8 +94141,8 @@ self: {
        sha256 = "144fywp5fcix5i06wvwvzwsr19bgxpajx7bi7jw43hnm3rlcj4vr";
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94169,7 +94169,7 @@ self: {
          base bytestring network optparse-applicative stm vector
        ];
        description = "Append-only database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fraxl" = callPackage
@@ -94188,8 +94188,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base time ];
        description = "Cached and parallel data fetching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94209,8 +94209,8 @@ self: {
          text uuid
        ];
        description = "RabbitMQ Messaging API supporting request-response";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94231,7 +94231,7 @@ self: {
          transformers transformers-base
        ];
        description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free_5_1_6" = callPackage
@@ -94249,8 +94249,8 @@ self: {
          transformers transformers-base
        ];
        description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "free-algebras" = callPackage
@@ -94270,8 +94270,8 @@ self: {
          mtl transformers
        ];
        description = "Free algebras";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94283,7 +94283,7 @@ self: {
        sha256 = "1s5fdl7sgqhwk3zqrbv9qjzp7r12wyh4pwz38yywzhc32gl0vm4r";
        libraryHaskellDepends = [ base ];
        description = "free categories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free-category" = callPackage
@@ -94300,8 +94300,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "efficient data types for free categories and arrows";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94313,8 +94313,8 @@ self: {
        sha256 = "1caiwxhm2wx0cnr2g4zvk2qv170jps14lf9j1q40qvx5qy3fxwlz";
        libraryHaskellDepends = [ base type-aligned ];
        description = "Free monads suitable for concurrent computation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94329,7 +94329,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "An extensible effects library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free-functors" = callPackage
@@ -94346,7 +94346,7 @@ self: {
          profunctors template-haskell transformers
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free-game" = callPackage
@@ -94367,8 +94367,8 @@ self: {
          StateVar template-haskell transformers vector void
        ];
        description = "Create games for free";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94385,8 +94385,8 @@ self: {
          time transformers
        ];
        description = "An HTTP Client based on Free Monads";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94402,8 +94402,8 @@ self: {
          base comonad-transformers free kan-extensions mtl transformers
        ];
        description = "Operational Applicative, Alternative, Monad and MonadPlus from free types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94419,8 +94419,8 @@ self: {
          base containers haskell-src haskell-src-exts mtl pretty syb
        ];
        description = "Automatic generation of free theorems";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94439,8 +94439,8 @@ self: {
        ];
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94458,8 +94458,8 @@ self: {
          old-locale old-time parsec pretty syb utf8-string xhtml
        ];
        description = "Taming Selective Strictness";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94478,8 +94478,8 @@ self: {
          utf8-string xhtml
        ];
        description = "Taming Selective Strictness";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94499,8 +94499,8 @@ self: {
          process time xhtml
        ];
        description = "CGI-based web interface for the free-theorems package";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94516,8 +94516,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94533,8 +94533,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94552,7 +94552,7 @@ self: {
          base lens linear MemoTrie pragmatic-show vector vector-space
        ];
        description = "Instantiate the classes from the vector-space package with types from linear";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "free-vl" = callPackage
@@ -94569,7 +94569,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
        description = "van Laarhoven encoded Free Monad with Extensible Effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freekick2" = callPackage
@@ -94591,7 +94591,7 @@ self: {
        ];
        description = "A soccer game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94611,8 +94611,8 @@ self: {
          transformers
        ];
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94627,8 +94627,8 @@ self: {
        librarySystemDepends = [ freenect freenect_sync ];
        libraryPkgconfigDepends = [ libfreenect ];
        description = "Interface to the Kinect device";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freenect; freenect_sync = null; 
          libfreenect = null;};
 
@@ -94649,7 +94649,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion free mtl ];
        description = "Implementation of the Freer Monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freer-converse" = callPackage
@@ -94665,8 +94665,8 @@ self: {
          base freer-effects tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Handle effects conversely using monadic conversation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94687,8 +94687,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion free mtl ];
        description = "Implementation of effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94700,7 +94700,7 @@ self: {
        sha256 = "14d5683z37xyahrw6dbcv516lmc8vasl1bc6zvdy3wr4y4g1qyzd";
        libraryHaskellDepends = [ base ];
        description = "Freer indexed monad for type-level resource-aware effectual operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freer-simple" = callPackage
@@ -94727,7 +94727,7 @@ self: {
          base criterion extensible-effects free mtl
        ];
        description = "Implementation of a friendly effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freer-simple-catching" = callPackage
@@ -94739,8 +94739,8 @@ self: {
        libraryHaskellDepends = [ base freer-simple ];
        testHaskellDepends = [ base freer-simple hspec ];
        description = "Checked runtime exceptions with freer-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94761,8 +94761,8 @@ self: {
          http-types
        ];
        description = "Make HTTP requests with freer-simple!";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94775,8 +94775,8 @@ self: {
        libraryHaskellDepends = [ base containers freer-simple time ];
        testHaskellDepends = [ base containers freer-simple hspec time ];
        description = "Automatic profling of freer-simple programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94789,8 +94789,8 @@ self: {
        libraryHaskellDepends = [ base containers freer-simple random ];
        testHaskellDepends = [ base containers freer-simple hspec random ];
        description = "Random number generators using freer-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94803,8 +94803,8 @@ self: {
        libraryHaskellDepends = [ base freer-simple time ];
        testHaskellDepends = [ base freer-simple hspec time ];
        description = "freer-simple interface to IO based time functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94822,8 +94822,8 @@ self: {
          array base cpphs directory mtl parallel pretty random syb
        ];
        description = "A Haskell syntax extension for generalised sections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94845,8 +94845,8 @@ self: {
          aeson base bytestring containers data-default hspec hspec-core
        ];
        description = "Access the Freesound Project database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94861,8 +94861,8 @@ self: {
          base boundingboxes bytestring freetype2 linear
        ];
        description = "Single line text rendering for OpenGL ES";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94877,7 +94877,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base template-haskell ];
        description = "Haskell bindings for FreeType 2 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "french-cards" = callPackage
@@ -94889,7 +94889,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "French Playing Cards";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "freq" = callPackage
@@ -94906,8 +94906,8 @@ self: {
        testHaskellDepends = [ base bytestring containers hedgehog ];
        benchmarkHaskellDepends = [ base bytestring containers gauge ];
        description = "Are you ready to get freaky?";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94924,7 +94924,7 @@ self: {
        ];
        description = "Fresco binding for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fresh" = callPackage
@@ -94935,8 +94935,8 @@ self: {
        sha256 = "1441yv55bwmiwnr6jsccq91anq8vhc2a4ka0irn3i2i9cjzw0gkw";
        libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        description = "Introduce fresh variables into Haskell source code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -94959,7 +94959,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        description = "A functional image processing library for Haskell";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "friday-devil" = callPackage
@@ -94975,8 +94975,8 @@ self: {
        ];
        librarySystemDepends = [ libdevil ];
        description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libdevil;};
 
@@ -94993,7 +94993,7 @@ self: {
          base bytestring file-embed friday hspec JuicyPixels
        ];
        description = "Converts between the Friday and JuicyPixels image types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "friday-scale-dct" = callPackage
@@ -95008,8 +95008,8 @@ self: {
          base base-compat carray fft friday vector
        ];
        description = "Scale Friday images with DCT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95025,8 +95025,8 @@ self: {
          base bifunctors lens optparse-applicative
        ];
        description = "Attempt to pretty-print any input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95041,7 +95041,7 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        testHaskellDepends = [ base hspec old-locale time ];
        description = "Print time information in friendly ways";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "frisby" = callPackage
@@ -95054,7 +95054,7 @@ self: {
          array base containers fail mtl semigroups
        ];
        description = "Linear time composable parser for PEG grammars";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "from-sum" = callPackage
@@ -95066,7 +95066,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Combinators for working with Maybe and Either";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fromhtml" = callPackage
@@ -95080,7 +95080,7 @@ self: {
        libraryHaskellDepends = [ base bytestring process-extras text ];
        executableHaskellDepends = [ base bytestring process-extras text ];
        description = "Simple adapter for transformation of HTML to other formats";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "front" = callPackage
@@ -95099,8 +95099,8 @@ self: {
          fay-dom fay-websockets mtl stm text websockets
        ];
        description = "A reactive frontend web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95117,7 +95117,7 @@ self: {
          attoparsec base bytestring hspec QuickCheck text yaml
        ];
        description = "Parses frontmatter as used in Jekyll markdown files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "frotate" = callPackage
@@ -95131,7 +95131,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative time ];
        testHaskellDepends = [ base doctest ];
        description = "Advanced rotation of backups and other things";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "frown" = callPackage
@@ -95145,7 +95145,7 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "LALR(k) parser generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95157,8 +95157,8 @@ self: {
        sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Arduino programming without the hassle of C";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95173,8 +95173,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Principled practical FRP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95190,8 +95190,8 @@ self: {
          base containers frpnow gloss mtl transformers
        ];
        description = "Program awesome stuff with Gloss and frpnow!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95208,8 +95208,8 @@ self: {
          base containers frpnow glib gtk mtl transformers
        ];
        description = "Program GUIs with GTK and frpnow!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95223,8 +95223,8 @@ self: {
          base containers frpnow glib gtk3 mtl text
        ];
        description = "Program GUIs with GTK3 and frpnow!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95239,8 +95239,8 @@ self: {
        libraryHaskellDepends = [ base frpnow vty ];
        executableHaskellDepends = [ base containers frpnow vty ];
        description = "Program terminal applications with vty and frpnow!";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95255,7 +95255,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Lexical extension for Quasi-Quotations using French-Quotes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fs-events" = callPackage
@@ -95266,8 +95266,8 @@ self: {
        sha256 = "0jw6cx9fzzs8r20acjq8nq8zjhwiwnvg1b0kc97c2sij1bhw6pw4";
        libraryHaskellDepends = [ base ];
        description = "A haskell binding to the FSEvents API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95279,8 +95279,8 @@ self: {
        sha256 = "1lhvq4pqgsc52hzgh39ijw4yqw6r4pgq7shv8y5xfgyjibzkmf8m";
        libraryHaskellDepends = [ base hint ];
        description = "csv parser for fsh";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95292,7 +95292,7 @@ self: {
        sha256 = "1scmvhbsn988x6j4a94ibg1c7adrxf8lzn06n9n1iv62bjd450m3";
        libraryHaskellDepends = [ base ];
        description = "some F# operators, high priority pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fsmActions" = callPackage
@@ -95307,8 +95307,8 @@ self: {
          base containers fgl filepath graphviz MissingH mtl parsec pretty
        ];
        description = "Finite state machines and FSM actions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95332,7 +95332,7 @@ self: {
          unix-compat
        ];
        description = "Cross platform library for file change notification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fsnotify-conduit" = callPackage
@@ -95351,7 +95351,7 @@ self: {
          transformers
        ];
        description = "Get filesystem notifications as a stream of events";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fst" = callPackage
@@ -95370,8 +95370,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Finite state transducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95383,8 +95383,8 @@ self: {
        sha256 = "07lx4928d1fnjbpfmky4jhhk7sqj98b11vdbv4f67p3bwfn5lrp8";
        libraryHaskellDepends = [ base directory filepath ];
        description = "File system utilities for Haskell that are missing from built in libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95404,8 +95404,8 @@ self: {
          system-filepath text time-units turtle
        ];
        description = "Wait and observe events on the filesystem for a path, with a timeout";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95426,8 +95426,8 @@ self: {
          base directory fsnotify haskeline optparse-applicative process
        ];
        description = "File System watching tool with cli and slave functionalities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95446,7 +95446,7 @@ self: {
          regex-pcre-builtin system-filepath unix
        ];
        description = "Watch a file/directory and run a command when it's modified";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ft-generator" = callPackage
@@ -95459,8 +95459,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl parsec ];
        description = "implementation accompanying a WFLP'19 paper";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95478,8 +95478,8 @@ self: {
          base base-unicode-symbols bytestring safe transformers usb
        ];
        description = "A thin layer over USB to communicate with FTDI chips";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95497,7 +95497,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hspec ];
        description = "Transfer files with FTP and FTPS";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "ftp-client-conduit" = callPackage
@@ -95513,7 +95513,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Transfer file with FTP and FTPS with Conduit";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "ftp-conduit" = callPackage
@@ -95529,8 +95529,8 @@ self: {
          utf8-string
        ];
        description = "FTP client package with conduit interface based off http-conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95549,7 +95549,7 @@ self: {
        ];
        description = "FTP Client and Server Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95561,7 +95561,7 @@ self: {
        sha256 = "1gj7j6mpfgv7ra3v9pm8gbvzbdmcvjri4zzmllx84d138l983k6g";
        libraryHaskellDepends = [ base ShowF type-unary ];
        description = "Depth-typed functor-based trees, both top-down and bottom-up";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ftshell" = callPackage
@@ -95579,8 +95579,8 @@ self: {
          base containers free-theorems mtl pretty Shellac Shellac-readline
        ];
        description = "Shell interface to the FreeTheorems library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95592,7 +95592,7 @@ self: {
        sha256 = "0g0qy0lcixbjm5srmfl1dnci4m09zwqcs5dpknpnsdc4b4l3925r";
        libraryHaskellDepends = [ base ];
        description = "A recapitulated prelude with minimal dependencies and profligate exports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "full-sessions" = callPackage
@@ -95603,8 +95603,8 @@ self: {
        sha256 = "0irm1zrggjl9zrapzxfl3kj32d81k30c8nbmr3bf9ramjg65xm90";
        libraryHaskellDepends = [ base ghc network ];
        description = "a monad for protocol-typed network programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95625,7 +95625,7 @@ self: {
          array base containers QuickCheck tasty tasty-quickcheck text vector
        ];
        description = "In-memory full text search engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fullstop" = callPackage
@@ -95644,8 +95644,8 @@ self: {
          base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Simple sentence segmenter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95674,8 +95674,8 @@ self: {
          unordered-containers utf8-string vcs-web-hook-parse
        ];
        description = "IRC bot for fun, learning, creativity and collaboration";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95694,8 +95694,8 @@ self: {
          network-uri
        ];
        description = "Report events to FunBot over a JSON/HTTP API";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95707,7 +95707,7 @@ self: {
        sha256 = "075h2iwa4vjhl2ckv7qv4n5s1zfvsnsam06xsznhqpjb9m2m1208";
        libraryHaskellDepends = [ aeson base text ];
        description = "Interact with FunBot's external events";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "funbot-git-hook" = callPackage
@@ -95726,8 +95726,8 @@ self: {
          hit network-uri template text utf8-string
        ];
        description = "Git hook which sends events to FunBot";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95740,8 +95740,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath pretty process ];
        description = "Functional MetaPost is a Haskell frontend to the MetaPost language";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "funcons-intgen" = callPackage
@@ -95760,8 +95760,8 @@ self: {
          iml-tools mtl pretty regex-applicative split text uu-cco
        ];
        description = "Generate Funcons interpreters from CBS description files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {iml-tools = null;};
 
@@ -95779,8 +95779,8 @@ self: {
          base containers funcons-tools gll text
        ];
        description = "call-by-value lambda-calculus with meta-programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95796,8 +95796,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base funcons-tools funcons-values ];
        description = "A modular interpreter for executing SIMPLE funcons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95823,8 +95823,8 @@ self: {
          random-strings regex-applicative split text TypeCompose vector
        ];
        description = "A modular interpreter for executing funcons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95840,8 +95840,8 @@ self: {
          base bv containers multiset text vector
        ];
        description = "Library providing values and operations on values in a fixed universe";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95854,7 +95854,7 @@ self: {
        libraryHaskellDepends = [ base tagged ];
        testHaskellDepends = [ base tagged ];
        description = "Create poly variadic functions for monoidal results";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "function-combine" = callPackage
@@ -95865,8 +95865,8 @@ self: {
        sha256 = "1m8bmqxb9kar3y8zv22qs2a6kzd636m5li1r2q4y6pps0nglv9i9";
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95878,8 +95878,8 @@ self: {
        sha256 = "0dxym6xrylngw8r5spi246nmi8fvvxxx776qismcr04zqshv7ygw";
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Instances of the Algebra.* classes for functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95891,8 +95891,8 @@ self: {
        sha256 = "1la9xqm5gs6a6cb18wyx9wr0nx6p5ryhczvb72d0zm6xrjrf0r5s";
        libraryHaskellDepends = [ base HList ];
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95904,7 +95904,7 @@ self: {
        sha256 = "1l72f0zz2hfhxydsmi0kqcq7mwib0cvk050mdhgyqgqdglphdpi9";
        libraryHaskellDepends = [ base ];
        description = "KMP implemented on haskell's built-in cons-cell-based lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "functor" = callPackage
@@ -95917,8 +95917,8 @@ self: {
        editedCabalFile = "1cjr0x65q1hmls7jszmngbibbif1l9jipjgkndpr33d84ry10hnj";
        libraryHaskellDepends = [ base category ];
        description = "Functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95930,7 +95930,7 @@ self: {
        sha256 = "0jshf7and80p0gq26zz83xj4p3ff8lppa5252qg0646xsr06lfkr";
        doHaddock = false;
        description = "This package has been subsumed by semigroupoids";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "functor-classes-compat" = callPackage
@@ -95947,7 +95947,7 @@ self: {
          base containers hashable unordered-containers vector
        ];
        description = "Data.Functor.Classes instances for core packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "functor-combinators" = callPackage
@@ -95974,8 +95974,8 @@ self: {
          semigroupoids tasty tasty-hedgehog transformers trivial-constraint
        ];
        description = "Tools for functor combinator-based program design";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -95992,7 +95992,7 @@ self: {
          TypeCompose
        ];
        description = "Functor combinators with tries & zippers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "functor-friends" = callPackage
@@ -96003,8 +96003,8 @@ self: {
        sha256 = "1apbdfhmhw1f30w62wwq6nr98pqhqbadp9c05vc424jm82v0169d";
        libraryHaskellDepends = [ base recursion-schemes ];
        description = "Friendly helpers for your recursion schemes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96018,8 +96018,8 @@ self: {
        editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96031,7 +96031,7 @@ self: {
        sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg";
        libraryHaskellDepends = [ base ];
        description = "Monad-style combinators for functors";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "functor-products" = callPackage
@@ -96042,8 +96042,8 @@ self: {
        sha256 = "12rybs7d7m38sfnh9vqs375mzc0k8y0g0dgmwn2c23k9dn5r55jv";
        libraryHaskellDepends = [ base microlens singletons text vinyl ];
        description = "General functor products for various Foldable instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96055,8 +96055,8 @@ self: {
        sha256 = "1sf4d3af4kf341g7slpylm2113cy0597fngr5ldlds8znylspmms";
        libraryHaskellDepends = [ base ghc-prim lens ];
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96068,8 +96068,8 @@ self: {
        sha256 = "1aa4f6yp4vrrrs3rswhjxw2gij3mwn8yf299kgv42wd03xazyxrs";
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96081,7 +96081,7 @@ self: {
        sha256 = "0nfnjxihn0nhj0rhi1wvqax1f95wskr3fwb7c2clz4lvsma6bfg6";
        libraryHaskellDepends = [ base ];
        description = "(.:) and friends, syntax for Functor and Applicative.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "funflow" = callPackage
@@ -96120,8 +96120,8 @@ self: {
          text unix
        ];
        description = "Workflows with arrows";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96143,8 +96143,8 @@ self: {
          tasty-hunit temporary unix
        ];
        description = "Utility functions for using funflow with nix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96161,7 +96161,7 @@ self: {
          TypeCompose
        ];
        description = "GLL parser with simple combinator interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "funion" = callPackage
@@ -96178,8 +96178,8 @@ self: {
          base bytestring directory filepath haskell98 HFuse unix
        ];
        description = "A unioning file-system using HFuse";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96195,8 +96195,8 @@ self: {
        testHaskellDepends = [ base hscolour ipprint tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
        description = "funnyPrint function to colorize GHCi output";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96208,8 +96208,8 @@ self: {
        sha256 = "0zblrfg8mfbc1hzxb36hk2lb3c167xmpcvg8h595m9kjpdmj4ayw";
        libraryHaskellDepends = [ base mtl ];
        description = "A generalization of pattern matching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96231,8 +96231,8 @@ self: {
          QuickCheck random time
        ];
        description = "A modern DPLL-style SAT solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96244,8 +96244,8 @@ self: {
        sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4";
        libraryHaskellDepends = [ base ];
        description = "Type-level function utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96266,7 +96266,7 @@ self: {
        testToolDepends = [ markdown-unlit ];
        benchmarkHaskellDepends = [ base gauge transformers ];
        description = "A fast, flexible, fused effect system";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-exceptions" = callPackage
@@ -96283,7 +96283,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Handle exceptions thrown in IO with fused-effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-lens" = callPackage
@@ -96295,7 +96295,7 @@ self: {
        libraryHaskellDepends = [ base fused-effects microlens ];
        testHaskellDepends = [ base fused-effects hspec microlens ];
        description = "Monadic lens combinators for fused-effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-mwc-random" = callPackage
@@ -96313,7 +96313,7 @@ self: {
        testHaskellDepends = [ base fused-effects mwc-random vector ];
        benchmarkHaskellDepends = [ base fused-effects-random gauge ];
        description = "High-quality random number generation as an effect";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-optics" = callPackage
@@ -96324,7 +96324,7 @@ self: {
        sha256 = "16q5b7b46k4hi8c46kq57dxidh2djzksc7s8jb65k341bbvlsy1w";
        libraryHaskellDepends = [ base fused-effects optics-core ];
        description = "Bridge between the optics and fused-effects ecosystems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-random" = callPackage
@@ -96335,7 +96335,7 @@ self: {
        sha256 = "0krcyx4hhvkxh0rbfwxb52xgb4rl45dflyx3aw8xryp6wn9my770";
        libraryHaskellDepends = [ base fused-effects random transformers ];
        description = "Random number generation for fused-effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-readline" = callPackage
@@ -96354,7 +96354,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A readline-like effect and carrier for fused-effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fused-effects-resumable" = callPackage
@@ -96367,8 +96367,8 @@ self: {
          base deepseq fused-effects transformers
        ];
        description = "Resumable exceptions for the fused-effects ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96385,8 +96385,8 @@ self: {
          unliftio-pool
        ];
        description = "A fused-effects adapter for squeal-postgresql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96403,8 +96403,8 @@ self: {
          base fused-effects tasty tasty-hunit template-haskell
        ];
        description = "Template Haskell helpers for fused-effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96419,8 +96419,8 @@ self: {
        libraryHaskellDepends = [ base pipes-safe transformers void ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Effectful streaming library based on shortcut fusion techniques";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96437,7 +96437,7 @@ self: {
          transformers
        ];
        description = "GHC plugin to make stream fusion more predictable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fusion-plugin-types" = callPackage
@@ -96448,7 +96448,7 @@ self: {
        sha256 = "14lzymjna6faiwj7bdm1jrz42jfj3w1wi2hv66mldjhadf45613d";
        libraryHaskellDepends = [ base ];
        description = "Types for the fusion-plugin package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "futhark" = callPackage
@@ -96486,7 +96486,7 @@ self: {
          sexp-grammar tasty tasty-hunit tasty-quickcheck text
        ];
        description = "An optimising compiler for a functional, array-oriented language";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "futhask" = callPackage
@@ -96500,7 +96500,7 @@ self: {
        libraryHaskellDepends = [ base directory raw-strings-qq split ];
        executableHaskellDepends = [ base directory raw-strings-qq split ];
        description = "Generate Haskell wrappers for Futhark libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "futun" = callPackage
@@ -96513,8 +96513,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network unix ];
        description = "Simple IP-over-UDP tunnel using TUNTAP";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96526,8 +96526,8 @@ self: {
        sha256 = "1gvv1m6sfxdc28h4rzp5dh6hrz6nfh031nhs192606v8wg78m3ri";
        libraryHaskellDepends = [ base ];
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96539,7 +96539,7 @@ self: {
        sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv";
        libraryHaskellDepends = [ base transformers ];
        description = "realtime resource handling with manual concurrency";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "futures" = callPackage
@@ -96550,7 +96550,7 @@ self: {
        sha256 = "0dx484i5q58yw3h6j9qp42x546vkky3sc29cqbr9969sfilmbqz8";
        libraryHaskellDepends = [ base ];
        description = "Simple and fast implementation of Future";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fuzzcheck" = callPackage
@@ -96568,7 +96568,7 @@ self: {
          base hspec hspec-expectations HUnit QuickCheck
        ];
        description = "A simple checker for stress testing monadic code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fuzzy" = callPackage
@@ -96580,7 +96580,7 @@ self: {
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [ base HUnit ];
        description = "Filters a list based on a fuzzy string search";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fuzzy-dates" = callPackage
@@ -96592,7 +96592,7 @@ self: {
        libraryHaskellDepends = [ base hourglass hspec lens parsec ];
        testHaskellDepends = [ base hourglass hspec lens parsec ];
        description = "Libary for parsing dates in strings in varied formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fuzzy-parse" = callPackage
@@ -96611,7 +96611,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Tools for processing unstructured text data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fuzzy-time" = callPackage
@@ -96625,7 +96625,7 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq megaparsec text time validity validity-time
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "fuzzy-time-gen" = callPackage
@@ -96649,8 +96649,8 @@ self: {
        benchmarkHaskellDepends = [
          base criterion fuzzy-time genvalidity-criterion
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96671,8 +96671,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time
        ];
        description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96692,7 +96692,7 @@ self: {
          unordered-containers vector
        ];
        description = "Fuzzy set for approximate string matching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fuzzytime" = callPackage
@@ -96724,7 +96724,7 @@ self: {
        ];
        testHaskellDepends = [ async base hspec ];
        description = "Fast Mutable Vars";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "fwgl" = callPackage
@@ -96739,8 +96739,8 @@ self: {
          base hashable transformers unordered-containers vect vector Yampa
        ];
        description = "Game engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96757,8 +96757,8 @@ self: {
          unordered-containers vect vector
        ];
        description = "FWGL GLFW backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96774,8 +96774,8 @@ self: {
          base fwgl ghcjs-base hashable unordered-containers vect
        ];
        description = "FWGL GHCJS backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96787,7 +96787,7 @@ self: {
        sha256 = "1awscv2y8ywcyyn08hdmlh3qdjs33akr7grfdfls59rmhidg4fhd";
        libraryHaskellDepends = [ base ];
        description = "Horizontally composable effects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "g-npm" = callPackage
@@ -96800,8 +96800,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96834,8 +96834,8 @@ self: {
          tasty-hunit text time unordered-containers
        ];
        description = "Haskell symbolic execution engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96847,8 +96847,8 @@ self: {
        sha256 = "1g42xkc4jc1a94s1krr1yrn191f8d6rmcpwk9ndwzk3nwby9v1vf";
        libraryHaskellDepends = [ base g2 ];
        description = "G2Q allows constraint programming, via writing Haskell predicates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96861,8 +96861,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A theorem prover for propositional logic that uses G4ip";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96880,7 +96880,7 @@ self: {
        executableToolDepends = [ happy ];
        testHaskellDepends = [ base ];
        description = "Theorem prover for intuitionistic propositional logic using G4ip";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gact" = callPackage
@@ -96898,7 +96898,7 @@ self: {
        ];
        description = "General Alignment Clustering Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96925,8 +96925,8 @@ self: {
          vector
        ];
        description = "FFTs over finite fields";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96952,8 +96952,8 @@ self: {
          protolude QuickCheck semirings vector wl-pprint-text
        ];
        description = "Galois field library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -96968,7 +96968,7 @@ self: {
        executableHaskellDepends = [ array base hscurses random text ];
        testHaskellDepends = [ array base hspec ];
        description = "Conway's Game of Life";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "game-probability" = callPackage
@@ -96979,8 +96979,8 @@ self: {
        sha256 = "1wl29h702g79kwy4ca35x1q37aaj3rphf1i9vdm2hmd44bzrwvkk";
        libraryHaskellDepends = [ base containers probability random ];
        description = "Simple probability library for dice rolls, card games and similar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97006,7 +97006,7 @@ self: {
        executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97037,8 +97037,8 @@ self: {
          tasty-quickcheck text time
        ];
        description = "Tool for generating TOTP MFA tokens";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97059,8 +97059,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Gamma function and related functions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97072,7 +97072,7 @@ self: {
        sha256 = "0gj7ln0xq1a7zzxhyl636z854xfq714kmh2ld30ll0dskr701l1p";
        libraryHaskellDepends = [ base containers mtl stm transformers ];
        description = "Non-deterministic parallelism with bags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "garepinoh" = callPackage
@@ -97086,8 +97086,8 @@ self: {
        libraryHaskellDepends = [ base haskeline transformers ];
        executableHaskellDepends = [ base haskeline transformers ];
        description = "reverse prefix notation calculator and calculation library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97099,7 +97099,7 @@ self: {
        sha256 = "0r8wybcqn7g24q8abrw757h76r75l4jh4hjx91yh44h4c1r6k4yf";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gargoyle" = callPackage
@@ -97114,7 +97114,7 @@ self: {
          base directory filelock filepath network process unix
        ];
        description = "Automatically spin up and spin down local daemons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gargoyle-postgresql" = callPackage
@@ -97135,7 +97135,7 @@ self: {
          base bytestring gargoyle process text unix
        ];
        description = "Manage PostgreSQL servers with gargoyle";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gargoyle-postgresql-connect" = callPackage
@@ -97154,8 +97154,8 @@ self: {
          gargoyle-postgresql-nix postgresql-simple resource-pool
        ];
        description = "Connect to gargoyle-managed postgresql instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97176,8 +97176,8 @@ self: {
          base gargoyle gargoyle-postgresql which
        ];
        description = "Manage PostgreSQL servers with gargoyle and nix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97190,7 +97190,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base hspec mtl transformers ];
        description = "A monad transformer for keeping track of where you've come from";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "garsia-wachs" = callPackage
@@ -97201,7 +97201,7 @@ self: {
        sha256 = "0mks5nwc19i0wsc5hhxh0ji2bh0224y3r89b3p9dfzzn64n3za6v";
        libraryHaskellDepends = [ base ];
        description = "A Functional Implementation of the Garsia-Wachs Algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gas" = callPackage
@@ -97212,8 +97212,8 @@ self: {
        sha256 = "1khapcq5yfx46pmc3y5nax8p5v5ckbis8v4f53jng6j59cd27c3f";
        libraryHaskellDepends = [ base free transformers ];
        description = "Limit how many steps a program may take";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97225,7 +97225,7 @@ self: {
        sha256 = "0dhna3mj7mdyk1n0x3barpn5g4hkjl9fnbr403xym1dm8rl7r7hg";
        libraryHaskellDepends = [ base binary containers mtl QuickCheck ];
        description = "A framework of algebraic classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gather" = callPackage
@@ -97236,8 +97236,8 @@ self: {
        sha256 = "0ajh8ygks61knc17vgsm5dsnqhkcrz2s0gaw6xyppq415wijgv0m";
        libraryHaskellDepends = [ base ];
        description = "An applicative for parsing unordered things, heterogenous sorting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97257,7 +97257,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base ];
        description = "small framework for performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gbu" = callPackage
@@ -97272,8 +97272,8 @@ self: {
          base containers fgl Graphalyze haskell98 mtl regex-posix
        ];
        description = "planar graph embedding into a plane";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97285,7 +97285,7 @@ self: {
        sha256 = "0cql0csrwqddpw28qmpr47mcnszmdc2szwvbnardr86pmjhvgwph";
        libraryHaskellDepends = [ base ];
        description = "Poor Richard's Memory Manager";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gc-monitoring-wai" = callPackage
@@ -97301,8 +97301,8 @@ self: {
          unordered-containers wai
        ];
        description = "a wai application to show GHC.GCStats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97332,8 +97332,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "GCode processor";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "gconf" = callPackage
@@ -97349,8 +97349,8 @@ self: {
        libraryPkgconfigDepends = [ GConf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME configuration database system";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.gnome2) GConf;};
 
@@ -97367,7 +97367,7 @@ self: {
          expat fontconfig freetype gd libjpeg libpng zlib
        ];
        description = "A Haskell binding to a subset of the GD graphics library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; 
          inherit (pkgs) freetype; inherit (pkgs) gd; 
          inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
@@ -97404,8 +97404,8 @@ self: {
          tasty-th text time unordered-containers vector websockets wuss
        ];
        description = "API Wrapping for Coinbase's GDAX exchange";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97420,7 +97420,7 @@ self: {
        libraryHaskellDepends = [ base bytestring megaparsec text time ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
        description = "GDELT V2 (Global Database of Events, Language, and Tone)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gdiff" = callPackage
@@ -97431,7 +97431,7 @@ self: {
        sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc";
        libraryHaskellDepends = [ base ];
        description = "Generic diff and patch";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gdiff-ig" = callPackage
@@ -97446,8 +97446,8 @@ self: {
          array base ghc-prim instant-generics template-haskell
        ];
        description = "Generic diff for the instant-generics library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97466,8 +97466,8 @@ self: {
          base containers gdiff mtl template-haskell th-expand-syns uniplate
        ];
        description = "Generate gdiff GADTs and Instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97486,7 +97486,7 @@ self: {
          transformers
        ];
        description = "recursive atomic build system";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gdp" = callPackage
@@ -97500,7 +97500,7 @@ self: {
        libraryHaskellDepends = [ base lawful ];
        executableHaskellDepends = [ base ];
        description = "Reason about invariants and preconditions with ghosts of departed proofs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gearbox" = callPackage
@@ -97513,7 +97513,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
        description = "zooming rotating fractal gears graphics demo";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gedcom" = callPackage
@@ -97530,8 +97530,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec megaparsec text-all ];
        description = "Parser for the GEDCOM genealogy file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97552,8 +97552,8 @@ self: {
          text-icu time
        ];
        description = "Geek blog engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97578,7 +97578,7 @@ self: {
        ];
        description = "Geek blog engine server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97599,8 +97599,8 @@ self: {
        librarySystemDepends = [ gegl ];
        libraryPkgconfigDepends = [ gegl ];
        description = "Haskell bindings to GEGL library";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gegl;};
 
@@ -97619,8 +97619,8 @@ self: {
        ];
        executableHaskellDepends = [ base linear mtl vector ];
        description = "A graphics description language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97638,8 +97638,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "FreeType2 based text rendering for the gelatin realtime rendering system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97651,8 +97651,8 @@ self: {
        sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r";
        libraryHaskellDepends = [ base FontyFruity gelatin linear vector ];
        description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97674,8 +97674,8 @@ self: {
        ];
        executableHaskellDepends = [ base gelatin lens linear mtl vector ];
        description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97693,8 +97693,8 @@ self: {
        libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ];
        executableHaskellDepends = [ base either filepath sdl2 ];
        description = "An SDL2 backend for the gelatin renderer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97707,8 +97707,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring filepath gelatin ];
        description = "Gelatin's OpenGL shaders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97724,7 +97724,7 @@ self: {
          base gemini-server network-uri transformers
        ];
        description = "A simple Happstack-style Gemini router";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gemini-server" = callPackage
@@ -97742,7 +97742,7 @@ self: {
          utf8-string
        ];
        description = "A lightweight server for the Gemini protocol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gemini-textboard" = callPackage
@@ -97763,7 +97763,7 @@ self: {
          network-uri nonce sqlite-simple text time transformers
        ];
        description = "A barebones textboard for the Gemini protocol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gemstone" = callPackage
@@ -97781,7 +97781,7 @@ self: {
        ];
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97797,8 +97797,8 @@ self: {
          base bytestring Cabal containers filepath hackage-db pretty
        ];
        description = "Code to generate instances for the package \"ghc-instances\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97816,8 +97816,8 @@ self: {
          base bytestring optparse-applicative random vector
        ];
        description = "Create wordlist-based passwords easily";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97834,8 +97834,8 @@ self: {
          transformers
        ];
        description = "A testing framework inspired by QuickCheck and SmallCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97851,8 +97851,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        executableHaskellDepends = [ attoparsec base text ];
        description = "Identify a persons gender by their first name";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97868,8 +97868,8 @@ self: {
        librarySystemDepends = [ genders ];
        testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {genders = null;};
 
@@ -97885,7 +97885,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Library for generating interface documentation from types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "general-games" = callPackage
@@ -97901,7 +97901,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit MonadRandom ];
        description = "Library supporting simulation of a number of games";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "general-prelude" = callPackage
@@ -97915,8 +97915,8 @@ self: {
          base lens pointless-fun strict system-filepath
        ];
        description = "Prelude replacement using generalized type classes where possible";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97928,8 +97928,8 @@ self: {
        sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd";
        libraryHaskellDepends = [ base List transformers ];
        description = "Python-generators notation for creation of monadic lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97941,8 +97941,8 @@ self: {
        sha256 = "0i51xx2hhjqjdvyzy2jza921jcfhy37azyp1cfaakvrj9kxl2w2q";
        libraryHaskellDepends = [ base mtl random ];
        description = "Actually useful monadic random value generators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97962,8 +97962,8 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
        ];
        description = "stringly-named getters for generic data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -97980,7 +97980,7 @@ self: {
          unordered-containers vector
        ];
        description = "Derivation of Aeson instances using GHC generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-arbitrary" = callPackage
@@ -97991,7 +97991,7 @@ self: {
        sha256 = "1imw36k5kxfl7ik0mzjxa8xzqg6hs3k253kpi19a9l53wxa0mwv9";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generic implementation for QuickCheck's Arbitrary";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-binary" = callPackage
@@ -98002,8 +98002,8 @@ self: {
        sha256 = "1h6xs56c351137mjc3hdba7yfcw8jy9dvzj0vdrgwm0dprn0xh29";
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        description = "Generic Data.Binary derivation using GHC generics.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98019,8 +98019,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Automatically convert Generic instances to and from church representations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98033,7 +98033,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell th-abstraction ];
        testHaskellDepends = [ base HUnit ];
        description = "Constraints via Generic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-data" = callPackage
@@ -98059,7 +98059,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Deriving instances with GHC.Generics and related utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-data-surgery" = callPackage
@@ -98075,7 +98075,7 @@ self: {
          base generic-data show-combinators tasty tasty-hunit
        ];
        description = "Surgery for generic data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-deepseq" = callPackage
@@ -98088,7 +98088,7 @@ self: {
        editedCabalFile = "16x2sj8wq6wbda93910r8vyddi1j4yzzr0172bih0anc93mrmvaq";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic deep evaluation of data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-deriving" = callPackage
@@ -98107,7 +98107,7 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        testToolDepends = [ hspec-discover ];
        description = "Generic programming library for generalised deriving";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-deriving_1_14" = callPackage
@@ -98124,8 +98124,8 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        testToolDepends = [ hspec-discover ];
        description = "Generic programming library for generalised deriving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "generic-enum" = callPackage
@@ -98137,8 +98137,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ array base bytestring hspec ];
        description = "An Enum class that fixes some deficiences with Prelude's Enum";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98150,8 +98150,8 @@ self: {
        sha256 = "1wwhbn3hpanr5ya1dc8spaf1r38sc1hglpz3d6mqizlna0p9a68l";
        libraryHaskellDepends = [ base ];
        description = "Generically derived enumerations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98163,7 +98163,7 @@ self: {
        sha256 = "084rfdmcw071dslnw86n2w58xiqhkaldf7qjcmlizykqc15si5xh";
        libraryHaskellDepends = [ base containers text ];
        description = "Generic Environment Generator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-functor" = callPackage
@@ -98175,7 +98175,7 @@ self: {
        libraryHaskellDepends = [ ap-normalize base ];
        testHaskellDepends = [ base transformers ];
        description = "Deriving generalized functors with GHC.Generics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-lens" = callPackage
@@ -98193,7 +98193,7 @@ self: {
          base doctest HUnit inspection-testing lens profunctors
        ];
        description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-lens-core" = callPackage
@@ -98204,7 +98204,7 @@ self: {
        sha256 = "0h7fjh3zk8lkkmdj3w3wg72gbmnr8wz9wfm58ryvx0036l284qji";
        libraryHaskellDepends = [ base indexed-profunctors text ];
        description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-lens-labels" = callPackage
@@ -98215,8 +98215,8 @@ self: {
        sha256 = "0lhzxknz8117zc28d7l9wfvln5lp7alxfx8f6q4b986i93dzkl09";
        libraryHaskellDepends = [ base generic-lens ];
        description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98231,7 +98231,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Monomorphic field lens like with generic-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-lucid-scaffold" = callPackage
@@ -98242,8 +98242,8 @@ self: {
        sha256 = "13lry3hqqrqgk5z9dc6q6hr70iqky4ssra2l71y51gnrg1kprkrz";
        libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98255,7 +98255,7 @@ self: {
        sha256 = "1h27gd7f0px3xgan9liqwav8xhl0smn6nhdmi7ggd18mjafa1ngv";
        libraryHaskellDepends = [ base generics-sop ];
        description = "First class pattern matching";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-maybe" = callPackage
@@ -98276,8 +98276,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "A generic version of Data.Maybe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98289,7 +98289,7 @@ self: {
        sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g";
        libraryHaskellDepends = [ base ];
        description = "Derive monoid instances for product types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-optics" = callPackage
@@ -98307,7 +98307,7 @@ self: {
          base doctest HUnit inspection-testing optics-core
        ];
        description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-optics-lite" = callPackage
@@ -98321,7 +98321,7 @@ self: {
        libraryHaskellDepends = [ base generic-lens-lite optics-core ];
        testHaskellDepends = [ base optics-core ];
        description = "Monomorphic field opics like with generic-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-override" = callPackage
@@ -98332,7 +98332,7 @@ self: {
        sha256 = "13v5zrhhzjzm4fib5zjsp4sf1hhgx9450mmy4v12h7bgljz8xfd5";
        libraryHaskellDepends = [ base ];
        description = "Provides functionality for overriding instances for generic derivation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-override-aeson" = callPackage
@@ -98344,8 +98344,8 @@ self: {
        libraryHaskellDepends = [ aeson base generic-override ];
        testHaskellDepends = [ aeson base generic-override hspec text ];
        description = "Provides orphan instances necessary for integrating generic-override and aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98364,8 +98364,8 @@ self: {
          base bytestring containers tasty tasty-hunit text vector
        ];
        description = "Pretty printing for Generic value";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98380,7 +98380,7 @@ self: {
          base deepseq inspection-testing QuickCheck
        ];
        description = "Generic random generators for QuickCheck";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "generic-records" = callPackage
@@ -98391,7 +98391,7 @@ self: {
        sha256 = "0xga8vm89xjgzmnz5032kqyq1q8nhbf01n55xjgda4kfjzkx1yr0";
        libraryHaskellDepends = [ base ];
        description = "Magic record operations using generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generic-server" = callPackage
@@ -98402,8 +98402,8 @@ self: {
        sha256 = "0bl3gfqdw6sdwcailzkzmpz433cpxf6np9w9qnkwwa05xhcpd2k6";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple generic TCP/IP server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98416,8 +98416,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        description = "Generic implementation of Storable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98430,7 +98430,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98444,8 +98444,8 @@ self: {
        editedCabalFile = "1dxf7c66vncw8zn0848g0bk2i2msbrb4njzvkzwvlaiphq0gqg10";
        libraryHaskellDepends = [ base containers transformers ];
        description = "A map, where the keys may be complex structured data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98460,8 +98460,8 @@ self: {
          base HaXml mtl syb-with-class template-haskell
        ];
        description = "Marshalling Haskell values to/from XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98476,8 +98476,8 @@ self: {
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [ base hxt tasty tasty-hunit tasty-th ];
        description = "Generic generation of HXT XmlPickler instances using GHC Generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98496,7 +98496,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A library for generic programming that aims to be easy to understand";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generics-mrsop" = callPackage
@@ -98510,8 +98510,8 @@ self: {
          base containers mtl sop-core template-haskell
        ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98523,8 +98523,8 @@ self: {
        sha256 = "01fkfk18h8dpl6w3ipx85ay9qj8s56xl7022ids21a0slyc4ml4s";
        libraryHaskellDepends = [ base generics-mrsop ];
        description = "Reimplementation of the gdiff algorithm for generics-mrsop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98546,7 +98546,7 @@ self: {
          base criterion deepseq template-haskell
        ];
        description = "Generic Programming using True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "generics-sop-lens" = callPackage
@@ -98557,7 +98557,7 @@ self: {
        sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks";
        libraryHaskellDepends = [ base generics-sop lens ];
        description = "Lenses for types in generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "genericserialize" = callPackage
@@ -98569,8 +98569,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98598,8 +98598,8 @@ self: {
          persistent-sqlite persistent-template text
        ];
        description = "Opinionated bootstrapping for Haskell web services";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98623,8 +98623,8 @@ self: {
          persistent-template text
        ];
        description = "Opinionated bootstrapping for Haskell web services";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98638,8 +98638,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98664,7 +98664,7 @@ self: {
        executableHaskellDepends = [ base GenI ];
        description = "GenI graphical user interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98688,8 +98688,8 @@ self: {
          base bytestring cmdargs directory filepath GenI json text
        ];
        description = "Companion tools for use with the GenI surface realiser";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98710,7 +98710,7 @@ self: {
        ];
        description = "Conversion utility for the GenI generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98723,7 +98723,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base containers mtl template-haskell ];
        description = "Generate generalized fmap, foldMap and traverse";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geniplate" = callPackage
@@ -98734,8 +98734,8 @@ self: {
        sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98747,7 +98747,7 @@ self: {
        sha256 = "08w4rslxzv6z85qzam1yazjb6vrzcr55vsjjyjgsi86pb1a8hr3b";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geniserver" = callPackage
@@ -98769,7 +98769,7 @@ self: {
        ];
        description = "Simple HTTP server for GenI results";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98781,8 +98781,8 @@ self: {
        sha256 = "1a9b2h4swfwx5zwcyr2zdhxdxi9f68pwpglijxhxb5javjc4dppr";
        libraryHaskellDepends = [ base MonadRandom syb syz ];
        description = "Genetic programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98795,8 +98795,8 @@ self: {
        libraryHaskellDepends = [ base parsec transformers ];
        testHaskellDepends = [ base HUnit parsec transformers ];
        description = "Gentle markup language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -98811,7 +98811,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck random validity ];
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        description = "Testing utilities for the validity library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-aeson" = callPackage
@@ -98833,7 +98833,7 @@ self: {
          aeson base genvalidity genvalidity-hspec hspec
        ];
        description = "GenValidity support for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-bytestring" = callPackage
@@ -98858,7 +98858,7 @@ self: {
          QuickCheck
        ];
        description = "GenValidity support for ByteString";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-containers" = callPackage
@@ -98882,7 +98882,7 @@ self: {
          QuickCheck
        ];
        description = "GenValidity support for containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-criterion" = callPackage
@@ -98899,7 +98899,7 @@ self: {
          base criterion genvalidity QuickCheck
        ];
        description = "Criterion benchmarks for generators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec" = callPackage
@@ -98918,7 +98918,7 @@ self: {
          base genvalidity hspec hspec-core QuickCheck
        ];
        description = "Standard spec's for GenValidity instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
@@ -98940,7 +98940,7 @@ self: {
          validity
        ];
        description = "Standard spec's for aeson-related instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-binary" = callPackage
@@ -98959,7 +98959,7 @@ self: {
          base binary genvalidity genvalidity-property hspec validity
        ];
        description = "Standard spec's for binary-related Instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-cereal" = callPackage
@@ -98979,7 +98979,7 @@ self: {
          validity
        ];
        description = "Standard spec's for cereal-related instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-hashable" = callPackage
@@ -99000,7 +99000,7 @@ self: {
          hspec hspec-core QuickCheck validity
        ];
        description = "Standard spec's for Hashable instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-optics" = callPackage
@@ -99019,7 +99019,7 @@ self: {
          microlens validity
        ];
        description = "Standard spec's for lens";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-persistent" = callPackage
@@ -99039,7 +99039,7 @@ self: {
          genvalidity-text hspec persistent QuickCheck text validity
        ];
        description = "Standard spec's for persistent-related instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-mergeful" = callPackage
@@ -99064,7 +99064,7 @@ self: {
        benchmarkHaskellDepends = [
          base criterion genvalidity-criterion mergeful
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-mergeless" = callPackage
@@ -99090,7 +99090,7 @@ self: {
        benchmarkHaskellDepends = [
          base criterion genvalidity-criterion mergeless
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-path" = callPackage
@@ -99110,7 +99110,7 @@ self: {
          base criterion genvalidity genvalidity-criterion path QuickCheck
        ];
        description = "GenValidity support for Path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-property" = callPackage
@@ -99126,7 +99126,7 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Standard properties for functions on `Validity` types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-scientific" = callPackage
@@ -99144,7 +99144,7 @@ self: {
          base genvalidity genvalidity-hspec hspec QuickCheck scientific
        ];
        description = "GenValidity support for Scientific";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-text" = callPackage
@@ -99167,7 +99167,7 @@ self: {
          base criterion genvalidity genvalidity-criterion QuickCheck text
        ];
        description = "GenValidity support for Text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-time" = callPackage
@@ -99187,7 +99187,7 @@ self: {
          base criterion genvalidity-criterion time
        ];
        description = "GenValidity support for time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-typed-uuid" = callPackage
@@ -99211,7 +99211,7 @@ self: {
          QuickCheck typed-uuid
        ];
        description = "Generators for Phantom-Typed version of UUID";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-unordered-containers" = callPackage
@@ -99232,7 +99232,7 @@ self: {
          validity
        ];
        description = "GenValidity support for unordered-containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-uuid" = callPackage
@@ -99254,7 +99254,7 @@ self: {
          base criterion genvalidity genvalidity-criterion QuickCheck uuid
        ];
        description = "GenValidity support for UUID";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "genvalidity-vector" = callPackage
@@ -99272,7 +99272,7 @@ self: {
          base genvalidity genvalidity-hspec hspec vector
        ];
        description = "GenValidity support for vector";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "geo-resolver" = callPackage
@@ -99294,8 +99294,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Performs geo location lookups and parses the results";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99312,7 +99312,7 @@ self: {
          array base binary bytestring bzlib template-haskell th-lift
        ];
        description = "High precision conversion between GPS and UK Grid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geocalc" = callPackage
@@ -99323,7 +99323,7 @@ self: {
        sha256 = "1bvbvrkxh8dvm796ilpp294qlacid6aap2ljdi9pmz1lkf20fxjg";
        libraryHaskellDepends = [ base ];
        description = "Libary for calculating distances between two coordinates in WSG84";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geocode-google" = callPackage
@@ -99338,7 +99338,7 @@ self: {
          base containers hjson HTTP network network-uri
        ];
        description = "Geocoding using the Google Web API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geodetic" = callPackage
@@ -99354,8 +99354,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Geodetic calculations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99367,8 +99367,8 @@ self: {
        sha256 = "1v7dl3nl9gp8pj469sk41k8nz34s1dngpinif06v8bbpms31i0bd";
        libraryHaskellDepends = [ base dimensional lens semigroups ];
        description = "Types for geodetic operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99388,7 +99388,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Terrestrial coordinate systems and geodetic calculations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geohash" = callPackage
@@ -99399,7 +99399,7 @@ self: {
        sha256 = "1pdx4pnq893kkjmgg0bgh9bfvfqdvzfq5fi02zfyhw3h8h4k05v4";
        libraryHaskellDepends = [ array base ];
        description = "Geohash latitudes and longitudes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geoip2" = callPackage
@@ -99415,7 +99415,7 @@ self: {
          reinterpret-cast text
        ];
        description = "Pure haskell interface to MaxMind GeoIP database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geojson" = callPackage
@@ -99436,7 +99436,7 @@ self: {
          tasty-quickcheck text validation
        ];
        description = "A thin GeoJSON Layer above the aeson library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "geojson-types" = callPackage
@@ -99447,8 +99447,8 @@ self: {
        sha256 = "10kcrvimb7mdy59bk7x7nwkzhp85ws4511xakcl6bgiwhls39x4j";
        libraryHaskellDepends = [ aeson base bson bytestring lens text ];
        description = "GeoJSON data types including JSON/BSON conversion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99467,8 +99467,8 @@ self: {
          siphon test-framework test-framework-hunit text
        ];
        description = "Geolite CSV Parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99481,8 +99481,8 @@ self: {
        libraryHaskellDepends = [ base ieee754 linear QuickCheck ];
        testHaskellDepends = [ base ieee754 linear QuickCheck ];
        description = "package for geometry in euklidean 2d space";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99503,8 +99503,8 @@ self: {
        ];
        testSystemDepends = [ geos ];
        description = "Bindings for GEOS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) geos;};
 
@@ -99523,8 +99523,8 @@ self: {
          time
        ];
        description = "Fetch from emusic using .emx files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99536,8 +99536,8 @@ self: {
        sha256 = "0jsr8cmbnllcswdvf1rp11sc6cpjhwr22x7kx9sk3dw8bv772jjc";
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99557,7 +99557,7 @@ self: {
          QuickCheck safe silently tagged
        ];
        description = "Create command line interfaces with ease";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "getopt-simple" = callPackage
@@ -99568,7 +99568,7 @@ self: {
        sha256 = "1pf40nc3jzprv4wn9h8mr0nhzxzilffgkapxg3k0qksfxydzv7pp";
        libraryHaskellDepends = [ base containers ];
        description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gf" = callPackage
@@ -99603,7 +99603,7 @@ self: {
        preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';
        description = "Grammatical Framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ggtsTC" = callPackage
@@ -99617,8 +99617,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers parsec ];
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99636,8 +99636,8 @@ self: {
          base directory github memory text vector
        ];
        description = "Github Standard Labeler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99657,7 +99657,7 @@ self: {
        executableHaskellDepends = [ aeson base bytestring ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Script helpers for interacting with GitHub";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc_8_10_2" = callPackage
@@ -99676,8 +99676,8 @@ self: {
          terminfo time transformers unix
        ];
        description = "The GHC API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-api-compat" = callPackage
@@ -99689,7 +99689,7 @@ self: {
        libraryHaskellDepends = [ ghc ];
        doHaddock = false;
        description = "GHC-API compatibility helpers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-boot_8_8_3" = callPackage
@@ -99706,8 +99706,8 @@ self: {
          base binary bytestring directory filepath ghc-boot-th
        ];
        description = "Shared functionality between GHC and its boot libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-boot-th_8_10_2" = callPackage
@@ -99718,8 +99718,8 @@ self: {
        sha256 = "1jic3l319b02f8b4r87c48645xhn5784vhgz2mp7d0zi2srrsfcz";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the `template-haskell` library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-byteorder" = callPackage
@@ -99732,7 +99732,7 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "\"GHC.ByteOrder\" API Compatibility Layer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-call-stack-extras" = callPackage
@@ -99743,7 +99743,7 @@ self: {
        sha256 = "01gvyl2r7jqxca33gdavv6l2a6yz4xh2ndmb4v0y2mdgc9sskymc";
        libraryHaskellDepends = [ base ];
        description = "Extra utilities for HasCallStack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-check" = callPackage
@@ -99760,7 +99760,7 @@ self: {
          safe-exceptions template-haskell transformers
        ];
        description = "detect mismatches between compile-time and run-time versions of the ghc api";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-clippy-plugin" = callPackage
@@ -99777,8 +99777,8 @@ self: {
          base dhall ghc text text-icu text-regex-replace
        ];
        description = "Override GHC error messages to the user's liking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99792,8 +99792,8 @@ self: {
        editedCabalFile = "09l51r0nk7vj6a9crz7q5sv4962mnq18xb6zkxfl6cnm28v85nsk";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "In memory storage of deeply evaluated data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-core" = callPackage
@@ -99810,7 +99810,7 @@ self: {
          base colorize-haskell directory filepath pcre-light process
        ];
        description = "Display GHC's core and assembly output in a pager";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-core-html" = callPackage
@@ -99828,7 +99828,7 @@ self: {
          base blaze-html bytestring containers mtl parsec process
        ];
        description = "Core to HTML display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-core-smallstep" = callPackage
@@ -99840,8 +99840,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        testHaskellDepends = [ base ghc ghc-paths ];
        description = "A small-step semantics for Core";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99853,8 +99853,8 @@ self: {
        sha256 = "19iapv0m2g7d5i88pg9h19r89hafwj5f3h5682sp37irl4mzwkww";
        libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ];
        description = "Determine the size of data structures in GHC's memory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99870,8 +99870,8 @@ self: {
          base bytestring directory filepath ghc serialise text
        ];
        description = "An AST and compiler plugin for dumping GHC's Core representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99896,8 +99896,8 @@ self: {
          process unordered-containers vector
        ];
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99921,8 +99921,8 @@ self: {
          regex-tdfa-text
        ];
        description = "Handy tools for working with @ghc-dump@ dumps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99934,8 +99934,8 @@ self: {
        sha256 = "0aw4wnbzfw031xqmq0lpi4zz2md1f43nj921ni91mhdl5xgqcajm";
        libraryHaskellDepends = [ base ghc ];
        description = "Explicitly prevent sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -99955,7 +99955,7 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Library and tool for parsing .eventlog files from GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-events-analyze" = callPackage
@@ -99978,8 +99978,8 @@ self: {
          th-lift th-lift-instances transformers unordered-containers
        ];
        description = "Analyze and visualize event logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100003,8 +100003,8 @@ self: {
          array base binary bytestring containers transformers
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100028,7 +100028,7 @@ self: {
          ghc-boot ghc-paths HUnit mtl silently syb
        ];
        description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -100041,7 +100041,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath process ];
        description = "Graph performance of Haskell programs with different GC flags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-generic-instances" = callPackage
@@ -100052,8 +100052,8 @@ self: {
        sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h";
        libraryHaskellDepends = [ base ghc ];
        description = "Derived instances of GHC.Generic of the GHC AST";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100073,7 +100073,7 @@ self: {
        ];
        testHaskellDepends = [ base deepseq ];
        description = "Extract the heap representation of Haskell values and thunks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-hotswap" = callPackage
@@ -100085,7 +100085,7 @@ self: {
        libraryHaskellDepends = [ base concurrent-extra deepseq ghci ];
        description = "Library for hot-swapping shared objects in GHC";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-imported-from" = callPackage
@@ -100121,8 +100121,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Find the Haddock documentation for a symbol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100144,8 +100144,8 @@ self: {
          process template-haskell time unix
        ];
        description = "Easily import all instances contained in GHC distributed libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100158,8 +100158,8 @@ self: {
        libraryHaskellDepends = [ base ghc hashable ];
        testHaskellDepends = [ base inspection-testing ];
        description = "A magic typeclass that just does it";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100179,7 +100179,7 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-lib-parser" = callPackage
@@ -100198,7 +100198,7 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-lib-parser-ex" = callPackage
@@ -100218,7 +100218,7 @@ self: {
          tasty-hunit uniplate
        ];
        description = "Algorithms on GHC parse trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-make" = callPackage
@@ -100233,7 +100233,7 @@ self: {
          base process shake unordered-containers
        ];
        description = "Accelerated version of ghc --make";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-man-completion" = callPackage
@@ -100246,8 +100246,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec process ];
        description = "Generate a bash completion from the GHC manpage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100294,8 +100294,8 @@ self: {
          base criterion directory filepath temporary
        ];
        description = "Happy Haskell Hacking";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100310,7 +100310,7 @@ self: {
          base exceptions extensible-exceptions ghc mtl
        ];
        description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-options" = callPackage
@@ -100332,8 +100332,8 @@ self: {
          transformers unix
        ];
        description = "Utilities for extracting GHC options needed to compile a given Haskell target";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bin-package-db = null;};
 
@@ -100359,8 +100359,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A parallel wrapper for 'ghc --make'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100373,7 +100373,7 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        description = "Haskell source parser from GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghc-paths" = callPackage
@@ -100387,7 +100387,7 @@ self: {
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-pkg-autofix" = callPackage
@@ -100404,8 +100404,8 @@ self: {
          base Cabal cmdargs filepath parsec process split
        ];
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100420,8 +100420,8 @@ self: {
          base Cabal directory filepath ghc ghc-paths
        ];
        description = "Provide library support for ghc-pkg information";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100437,8 +100437,8 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "Type checker plugins without the type checking";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100450,8 +100450,8 @@ self: {
        sha256 = "06nc87f4mcqcddllysb75qj942y5mmdwss7h9z3m0m93lbxxy6a2";
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-prof" = callPackage
@@ -100472,7 +100472,7 @@ self: {
          tasty-hunit temporary text
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -100484,7 +100484,7 @@ self: {
        libraryHaskellDepends = [ aeson base text vector ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Parser for GHC's JSON profiling output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-prof-aeson-flamegraph" = callPackage
@@ -100502,7 +100502,7 @@ self: {
          optparse-applicative text vector
        ];
        description = "Turn GHC `-pj` profiling output into FlameGraph format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-prof-flamegraph" = callPackage
@@ -100518,7 +100518,7 @@ self: {
          base filepath optparse-applicative process
        ];
        description = "Generates flamegraphs from GHC .prof files.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghc-proofs" = callPackage
@@ -100530,8 +100530,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        testHaskellDepends = [ base transformers ];
        description = "GHC plugin to prove program equations by simplification";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100543,7 +100543,7 @@ self: {
        sha256 = "1hg5iddlh87hir5vqjby2bihah4xcyarsfcgff3gd8l2h7mqi2dn";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-session" = callPackage
@@ -100562,8 +100562,8 @@ self: {
        ];
        executableHaskellDepends = [ base transformers ];
        description = "Simplified GHC API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100579,8 +100579,8 @@ self: {
          base binary bytestring directory filepath ghc ghc-paths
        ];
        description = "Simplified interface to the GHC API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100597,7 +100597,7 @@ self: {
          base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Constructs Haskell syntax trees for the GHC API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-srcspan-plugin" = callPackage
@@ -100608,8 +100608,8 @@ self: {
        sha256 = "10zh7i4nx4ds3f1d7m2m1caqnxmi3dh6a900fl8mcp6a09isvglh";
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100621,8 +100621,8 @@ self: {
        sha256 = "0rwx7l89r5yfi1187c0zgx1ph2rsagyvrizb1c0vnbyrwhpbslh0";
        libraryHaskellDepends = [ base ghc ];
        description = "Data and Typeable instances for the GHC API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100634,8 +100634,8 @@ self: {
        sha256 = "0mfnlp0z64999cc3jgzi3x5s428gs5jsqmmbr2n5v7shh0csnff4";
        libraryHaskellDepends = [ base bytestring ghc syb ];
        description = "Scrap Your Boilerplate utilities for the GHC API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100651,7 +100651,7 @@ self: {
        testHaskellDepends = [ base hspec text ];
        testToolDepends = [ hspec-discover ];
        description = "Syntax highlighter for Haskell using lexer of GHC itself";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-tags-core" = callPackage
@@ -100680,8 +100680,8 @@ self: {
          pipes-attoparsec pipes-bytestring text
        ];
        description = "a library to work with tags created from Haskell parsed tree";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100703,8 +100703,8 @@ self: {
          pipes-bytestring pipes-safe text
        ];
        description = "A compiler plugin which generates tags file from GHC parsed syntax tree";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100716,8 +100716,8 @@ self: {
        sha256 = "13qhwjbhyi3nrjdvc0fdgxf4kz55my541mz2j3sndpxsmbymqs3m";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
@@ -100728,7 +100728,7 @@ self: {
        sha256 = "0v9y444gydfyk56y7adpabd633yv1d8jmddvgg272n8jpdpagw67";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghc-time-alloc-prof" = callPackage
@@ -100747,8 +100747,8 @@ self: {
          temporary text
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100760,7 +100760,7 @@ self: {
        sha256 = "074pvam1mb5sranh04i6xcs55vgk3h45vg0mdxnbxc3jmmv76lgi";
        libraryHaskellDepends = [ base ];
        description = "Provides bindings to functions starting and stopping the RTS timers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-trace-events" = callPackage
@@ -100772,7 +100772,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-typelits-extra" = callPackage
@@ -100795,7 +100795,7 @@ self: {
          tasty-hunit
        ];
        description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
@@ -100815,7 +100815,7 @@ self: {
          base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
        ];
        description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
@@ -100831,7 +100831,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghc-typelits-presburger" = callPackage
@@ -100856,7 +100856,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-typelits-presburger_0_5_0_0" = callPackage
@@ -100881,8 +100881,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-usage" = callPackage
@@ -100896,8 +100896,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc ];
        executableHaskellDepends = [ base ghc-paths unix ];
        description = "Print minimal export lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100916,8 +100916,8 @@ self: {
          svgcairo text transformers xdot
        ];
        description = "Live visualization of data structures in GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100929,7 +100929,7 @@ self: {
        sha256 = "1xsfznfypgmv67qdxm8zvl8n84hj47akjn9fsdi66b8flbx8c0gm";
        libraryHaskellDepends = [ base directory ghc time ];
        description = "Dump the ghc flags during compilation";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ghci_8_10_2" = callPackage
@@ -100946,8 +100946,8 @@ self: {
          ghc-boot-th ghc-heap template-haskell transformers unix
        ];
        description = "The library supporting GHC's interactive interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghci-dap" = callPackage
@@ -100972,8 +100972,8 @@ self: {
          time transformers unix
        ];
        description = "ghci-dap is a GHCi having DAP interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -100985,8 +100985,8 @@ self: {
        sha256 = "1jlym5k2d43avkgw7ff3pdaad5j2q5yq803cy74bgy0z69x77v1w";
        libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        description = "Display simple diagrams from ghci";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101005,8 +101005,8 @@ self: {
          mtl process unix
        ];
        description = "An implementation of ghci using the Haskeline line-input library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101019,7 +101019,7 @@ self: {
        libraryHaskellDepends = [ base binary ];
        testHaskellDepends = [ base binary doctest QuickCheck ];
        description = "GHCi as a Hex Calculator interactive";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghci-history-parser" = callPackage
@@ -101031,8 +101031,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base doctest hspec parsec ];
        description = "parse output of ghci \":history\" command";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101044,8 +101044,8 @@ self: {
        sha256 = "06lg1czsr6k5h18aks33p2kbahiidhv7xsrv7n1fcvqsgglzgk3z";
        libraryHaskellDepends = [ base ghc MissingH ];
        description = "A library for interactively evaluating Haskell code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101067,8 +101067,8 @@ self: {
          haskeline process syb time transformers unix
        ];
        description = "Next generation GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101080,8 +101080,8 @@ self: {
        sha256 = "01syl5c6ana4m8d3jc5pbi64zf3c4l2x0r7jwkizm7kymszmbns5";
        libraryHaskellDepends = [ base hscolour ipprint ];
        description = "colored pretty-printing within ghci";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101098,7 +101098,7 @@ self: {
          wai-app-static warp websockets
        ];
        description = "A websocket server that survives GHCi reloads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghcid" = callPackage
@@ -101124,7 +101124,7 @@ self: {
          fsnotify process tasty tasty-hunit terminal-size time unix
        ];
        description = "GHCi based bare bones IDE";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghcide_0_7_0_0" = callPackage
@@ -101180,9 +101180,9 @@ self: {
          aeson base directory filepath shake shake-bench text yaml
        ];
        description = "The core of an IDE";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ maralorn ];
        broken = true;
      }) {shake-bench = null;};
 
@@ -101242,9 +101242,9 @@ self: {
          aeson base directory filepath shake shake-bench text yaml
        ];
        description = "The core of an IDE";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ maralorn ];
        broken = true;
      }) {shake-bench = null;};
 
@@ -101256,7 +101256,7 @@ self: {
        sha256 = "0yf2lpd7n891i61w1g0zbmi2zv93a2jzifxdsrqj39wxhl6afpc6";
        libraryHaskellDepends = [ aeson base http-types text ];
        description = "Crossbrowser AJAX Bindings for GHCJS";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-base_0_2_0_0" = callPackage
@@ -101282,8 +101282,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "base library for GHCJS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghcjs-prim = null;};
 
@@ -101301,7 +101301,7 @@ self: {
          scientific text transformers unordered-containers vector
        ];
        description = "Allow GHCJS projects to compile under GHC and develop using intero";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghcjs-codemirror" = callPackage
@@ -101313,7 +101313,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Installs CodeMirror JavaScript files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-dom" = callPackage
@@ -101328,7 +101328,7 @@ self: {
          base containers ghcjs-dom-jsaddle text transformers
        ];
        description = "DOM library that supports both GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-dom-hello" = callPackage
@@ -101349,8 +101349,8 @@ self: {
          base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl
        ];
        description = "GHCJS DOM Hello World, an example package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghcjs-dom-jsaddle" = callPackage
@@ -101362,7 +101362,7 @@ self: {
        libraryHaskellDepends = [ jsaddle-dom ];
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-dom-jsffi" = callPackage
@@ -101372,8 +101372,8 @@ self: {
        version = "0.9.4.0";
        sha256 = "02m0qszdl3kxyhjrzj1ph9gwbr9jkzak2v1b47v6ywsm7hmjgn7w";
        description = "DOM library using JSFFI and GHCJS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101388,8 +101388,8 @@ self: {
          base glib gtk3 text transformers webkitgtk3
        ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghcjs-fetch" = callPackage
@@ -101406,8 +101406,8 @@ self: {
          aeson base bytestring case-insensitive ghcjs-base-stub http-types
        ];
        description = "GHCJS bindings for the JavaScript Fetch API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101424,8 +101424,8 @@ self: {
          transient transient-universe
        ];
        description = "Client-side web EDSL for transient nodes running in the web browser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101437,7 +101437,7 @@ self: {
        sha256 = "0b3hj0gm9gcgwpg8f7vxy87fasgpgn27ciyafhmy6b4fnnmn41kn";
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-promise" = callPackage
@@ -101448,8 +101448,8 @@ self: {
        sha256 = "06zq3bqcrci7zgkgphkhv5awzw75ivg6hn9avx9c4yp2c1ra3593";
        libraryHaskellDepends = [ base ghcjs-base protolude ];
        description = "Bidirectional bidings to javascript's promise";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101468,8 +101468,8 @@ self: {
          template-haskell
        ];
        description = "Virtual-dom bindings for GHCJS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghcjs-ffiqq = null; ghcjs-prim = null;};
 
@@ -101487,7 +101487,7 @@ self: {
          base base64-bytestring binary bytestring ghcjs-base text
        ];
        description = "Deprecated: use ghcjs-base's native websockets";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ghcjs-xhr" = callPackage
@@ -101498,8 +101498,8 @@ self: {
        sha256 = "07nra5d0hc70v23wqaivwj96lakiz34vv96m9khi5y9f5lsads0l";
        libraryHaskellDepends = [ base ghcjs-base text ];
        description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101526,8 +101526,8 @@ self: {
          wai-websockets warp websockets yesod yesod-static
        ];
        description = "Interactive Haskell interpreter in a browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101546,8 +101546,8 @@ self: {
          regex-tdfa-text scientific text
        ];
        description = "GHC .prof files viewer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101561,7 +101561,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base zenc ];
        description = "Decode Z-encoded strings from GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghost-buster" = callPackage
@@ -101573,7 +101573,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Existential type utilites";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ght" = callPackage
@@ -101597,7 +101597,7 @@ self: {
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101617,7 +101617,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ atk ];
        description = "Atk bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
@@ -101640,7 +101640,7 @@ self: {
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
   "gi-cairo-again" = callPackage
@@ -101655,8 +101655,8 @@ self: {
          base cairo-core haskell-gi-base template-haskell
        ];
        description = "Bridge between packages gi-* and cairo-core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -101672,7 +101672,7 @@ self: {
          base gi-cairo gi-cairo-render haskell-gi-base mtl
        ];
        description = "GI friendly Binding to the Cairo library";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "gi-cairo-render" = callPackage
@@ -101689,7 +101689,7 @@ self: {
        libraryPkgconfigDepends = [ cairo ];
        libraryToolDepends = [ c2hs ];
        description = "GI friendly Binding to the Cairo library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) cairo;};
 
   "gi-dbusmenu" = callPackage
@@ -101708,7 +101708,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libdbusmenu ];
        description = "Dbusmenu bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenugtk3" = callPackage
@@ -101732,7 +101732,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
        description = "DbusmenuGtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
@@ -101756,7 +101756,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Gdk bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdk_4_0_2" = callPackage
@@ -101780,8 +101780,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gdk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {gtk4 = null;};
 
   "gi-gdkpixbuf" = callPackage
@@ -101802,7 +101802,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gdk-pixbuf ];
        description = "GdkPixbuf bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk-pixbuf;};
 
   "gi-gdkx11" = callPackage
@@ -101824,7 +101824,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        description = "GdkX11 bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdkx11_4_0_2" = callPackage
@@ -101846,8 +101846,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk4-x11 ];
        description = "GdkX11 bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {gtk4-x11 = null;};
 
   "gi-ggit" = callPackage
@@ -101868,7 +101868,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libgit2-glib ];
        description = "libgit2-glib bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libgit2-glib;};
 
   "gi-gio" = callPackage
@@ -101887,7 +101887,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        description = "Gio bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
@@ -101906,7 +101906,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gobject-introspection ];
        description = "GIRepository (gobject-introspection) bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gobject-introspection;};
 
   "gi-glib" = callPackage
@@ -101925,7 +101925,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
@@ -101944,7 +101944,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "gi-graphene" = callPackage
@@ -101963,8 +101963,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ graphene-gobject ];
        description = "Graphene bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {graphene-gobject = null;};
 
@@ -101989,8 +101989,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gsk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gtk4 = null;};
 
@@ -102010,7 +102010,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer ];
        description = "GStreamer bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs.gst_all_1) gstreamer;};
 
   "gi-gstaudio" = callPackage
@@ -102031,8 +102031,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerAudio bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
@@ -102054,7 +102054,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerBase bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstpbutils" = callPackage
@@ -102078,8 +102078,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer-pbutils ];
        description = "GStreamer Plugins Base Utils bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gstreamer-pbutils = null;};
 
@@ -102101,8 +102101,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer-tag ];
        description = "GStreamer Tag bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gstreamer-tag = null;};
 
@@ -102124,7 +102124,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerVideo bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
@@ -102148,7 +102148,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gtk_4_0_3" = callPackage
@@ -102172,8 +102172,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {gtk4 = null;};
 
   "gi-gtk-declarative" = callPackage
@@ -102197,8 +102197,8 @@ self: {
          unordered-containers vector
        ];
        description = "Declarative GTK+ programming in Haskell";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102217,8 +102217,8 @@ self: {
          pipes-concurrency text
        ];
        description = "Declarative GTK+ programming in Haskell in the style of Pux";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102236,7 +102236,7 @@ self: {
          gi-gtk haskell-gi-base mtl text transformers
        ];
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "gi-gtkosxapplication" = callPackage
@@ -102257,8 +102257,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "GtkosxApplication bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
@@ -102283,8 +102283,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtksheet ];
        description = "GtkSheet bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gtksheet = null;};
 
@@ -102309,7 +102309,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtksourceview3 ];
        description = "GtkSource bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtksourceview3;};
 
   "gi-handy" = callPackage
@@ -102333,8 +102333,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ libhandy ];
        description = "libhandy bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libhandy;};
 
@@ -102354,7 +102354,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ];
        description = "HarfBuzz bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;};
 
   "gi-ibus" = callPackage
@@ -102375,7 +102375,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ ibus ];
        description = "IBus bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) ibus;};
 
   "gi-javascriptcore" = callPackage
@@ -102394,8 +102394,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
   "gi-notify" = callPackage
@@ -102416,7 +102416,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libnotify ];
        description = "Libnotify bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libnotify;};
 
   "gi-ostree" = callPackage
@@ -102437,8 +102437,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ ostree ];
        description = "OSTree bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.lgpl21;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -102463,7 +102463,7 @@ self: {
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        description = "Pango bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-pangocairo" = callPackage
@@ -102489,7 +102489,7 @@ self: {
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        description = "PangoCairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-poppler" = callPackage
@@ -102510,8 +102510,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ poppler_gi ];
        description = "Poppler bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) poppler_gi;};
 
@@ -102533,7 +102533,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libsecret ];
        description = "Libsecret bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = callPackage
@@ -102554,7 +102554,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libsoup ];
        description = "Libsoup bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libsoup;};
 
   "gi-vte" = callPackage
@@ -102578,7 +102578,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ vte_291 ];
        description = "Vte bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {vte_291 = pkgs.vte;};
 
   "gi-webkit" = callPackage
@@ -102600,8 +102600,8 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        doHaddock = false;
        description = "WebKit bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "gi-webkit2" = callPackage
@@ -102625,8 +102625,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "WebKit2 bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
   "gi-webkit2webextension" = callPackage
@@ -102650,8 +102650,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "WebKit2-WebExtension bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
   "gi-wnck" = callPackage
@@ -102674,8 +102674,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ libwnck ];
        description = "Wnck bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libwnck;};
 
@@ -102695,7 +102695,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "xlib bindings";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) xlibsWrapper;};
 
   "giak" = callPackage
@@ -102714,8 +102714,8 @@ self: {
          filepath mtl process semigroups stm stm-chans text unix wybor
        ];
        description = "Fuzzy finder for cabal executables";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102727,7 +102727,7 @@ self: {
        sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l";
        libraryHaskellDepends = [ base split ];
        description = "Haskell parser for GIML";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ginger" = callPackage
@@ -102759,7 +102759,7 @@ self: {
          utf8-string
        ];
        description = "An implementation of the Jinja2 template language in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gingersnap" = callPackage
@@ -102780,7 +102780,7 @@ self: {
          transformers
        ];
        description = "Consistent and safe JSON APIs with snap-core and (by default) postgresql-simple";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ginsu" = callPackage
@@ -102803,8 +102803,8 @@ self: {
        ];
        executableSystemDepends = [ openssl ];
        description = "Ginsu Gale Client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -102823,7 +102823,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ system-glib ];
        description = "Binding to GIO";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {system-glib = pkgs.glib;};
 
   "gipeda" = callPackage
@@ -102845,8 +102845,8 @@ self: {
          unordered-containers vector yaml
        ];
        description = "Git Performance Dashboard";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102872,8 +102872,8 @@ self: {
          network-uri text
        ];
        description = "Giphy HTTP API wrapper and CLI search tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102891,8 +102891,8 @@ self: {
          aeson base bytestring conduit http-conduit text
        ];
        description = "A reliable command-line client for gist.github.com";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102917,8 +102917,8 @@ self: {
        ];
        doCheck = false;
        description = "Git operations in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -102937,8 +102937,8 @@ self: {
          system-filepath text transformers unix
        ];
        description = "Determine which Git repositories need actions to be taken";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103010,8 +103010,8 @@ self: {
        checkPhase = ''PATH+=":$PWD" git-annex test'';
        enableSharedExecutables = false;
        description = "manage files with git, without checking their contents into git";
-       license = stdenv.lib.licenses.agpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.agpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
@@ -103034,7 +103034,7 @@ self: {
          base brick hspec microlens optparse-applicative process vector vty
        ];
        description = "git checkout command-line tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "git-checklist" = callPackage
@@ -103053,7 +103053,7 @@ self: {
        ];
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103075,8 +103075,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A simple parser for Git configuration files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103096,8 +103096,8 @@ self: {
        ];
        executableHaskellDepends = [ base relude ];
        description = "Haskell Git Helper Tool";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103118,8 +103118,8 @@ self: {
          test-framework-quickcheck2 time utf8-string
        ];
        description = "Bindings to the date parsing from Git";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103135,7 +103135,7 @@ self: {
          base directory filepath process template-haskell
        ];
        description = "Use TH to embed Git repo information";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "git-fmt" = callPackage
@@ -103157,8 +103157,8 @@ self: {
          pipes-concurrency process temporary text time
        ];
        description = "Custom git command for formatting code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103181,7 +103181,7 @@ self: {
          process text
        ];
        description = "A Git subcommand to show total addition, deletion per file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "git-gpush" = callPackage
@@ -103201,8 +103201,8 @@ self: {
          transformers
        ];
        description = "More intelligent push-to-GitHub utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103216,8 +103216,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base base-compat process ];
        description = "Move a git branch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103234,7 +103234,7 @@ self: {
          http-types network-uri text
        ];
        description = "git-lfs protocol";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "git-mediate" = callPackage
@@ -103252,7 +103252,7 @@ self: {
          optparse-applicative process unix-compat
        ];
        description = "Tool to help resolving git conflicts";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "git-monitor" = callPackage
@@ -103275,8 +103275,8 @@ self: {
          template-haskell text time transformers unix unordered-containers
        ];
        description = "Passively snapshots working tree changes efficiently";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103293,8 +103293,8 @@ self: {
          enumerator filepath zlib-enum
        ];
        description = "Git object and its parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103326,8 +103326,8 @@ self: {
          optparse-applicative text
        ];
        description = "Git remote helper to store git objects on IPFS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103356,8 +103356,8 @@ self: {
          split text time transformers unix unix-compat utf8-string
        ];
        description = "repairs a damaged git repository";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103377,8 +103377,8 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal ];
        description = "A sanity checker for your git history";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103408,8 +103408,8 @@ self: {
        ];
        testToolDepends = [ git ];
        description = "A framework for pre-commit checks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103429,7 +103429,7 @@ self: {
          base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "More efficient replacement to the great git-radar";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gitcache" = callPackage
@@ -103446,7 +103446,7 @@ self: {
          base cryptonite directory filepath process utf8-string
        ];
        description = "Simple git utility to use and manage clone cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gitdo" = callPackage
@@ -103465,8 +103465,8 @@ self: {
          optparse-applicative sqlite-simple system-filepath text turtle wreq
        ];
        description = "Create Github issues out of TODO comments in code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103486,7 +103486,7 @@ self: {
          temporary unliftio
        ];
        description = "Compile git revision info into Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "github" = callPackage
@@ -103516,7 +103516,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Access to the GitHub API, v3";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "github-backup" = callPackage
@@ -103543,8 +103543,8 @@ self: {
        ];
        executableToolDepends = [ git ];
        description = "backs up everything github knows about a repository, to the repository";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) git;};
 
@@ -103570,8 +103570,8 @@ self: {
          vector vector-instances
        ];
        description = "Access to the GitHub API, v3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103588,7 +103588,7 @@ self: {
          wai-logger warp
        ];
        description = "GitHub webhooks library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "github-release" = callPackage
@@ -103608,7 +103608,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "github-rest" = callPackage
@@ -103631,7 +103631,7 @@ self: {
          tasty-quickcheck text time transformers unliftio unliftio-core
        ];
        description = "Query the GitHub REST API programmatically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "github-tools" = callPackage
@@ -103650,8 +103650,8 @@ self: {
          http-client-tls monad-parallel tabular tagsoup text time vector
        ];
        description = "Various Github helper utilities";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103671,7 +103671,7 @@ self: {
        ];
        description = "Type definitions for objects used by the GitHub v3 API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "github-utils" = callPackage
@@ -103682,8 +103682,8 @@ self: {
        sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5";
        libraryHaskellDepends = [ base basic-prelude github text ];
        description = "Useful functions that use the GitHub API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103702,8 +103702,8 @@ self: {
          uuid vector
        ];
        description = "GitHub WebHook Handler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103722,8 +103722,8 @@ self: {
          github-webhook-handler snap-core uuid
        ];
        description = "GitHub WebHook Handler implementation for Snap";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103742,7 +103742,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hspec text vector ];
        description = "Aeson instances for GitHub Webhook payloads";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "githud" = callPackage
@@ -103767,8 +103767,8 @@ self: {
          tasty-smallcheck
        ];
        description = "Heads up, and you see your GIT context";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103787,8 +103787,8 @@ self: {
          text
        ];
        description = "Apply GitHub .gitignore templates to already existing repositories.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103841,8 +103841,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec rio ];
        description = "Gitlab Web API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103862,7 +103862,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "A Haskell library for the GitLab web API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gitlib" = callPackage
@@ -103884,8 +103884,8 @@ self: {
          unliftio-core unordered-containers
        ];
        description = "API library for working with Git repositories";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103913,8 +103913,8 @@ self: {
          tagged text transformers
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103932,8 +103932,8 @@ self: {
          hspec-expectations HUnit
        ];
        description = "Run tests between repositories";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103960,8 +103960,8 @@ self: {
          transformers
        ];
        description = "Libgit2 backend for gitlib";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -103991,8 +103991,8 @@ self: {
          monad-logger resourcet temporary text transformers
        ];
        description = "Gitlib repository backend for storing Git objects in Amazon S3";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104006,8 +104006,8 @@ self: {
          base exceptions gitlib mtl transformers
        ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104026,8 +104026,8 @@ self: {
          unliftio-core
        ];
        description = "Test library for confirming gitlib backend compliance";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104046,8 +104046,8 @@ self: {
          unordered-containers
        ];
        description = "Generic utility functions for working with Git repositories";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104063,7 +104063,7 @@ self: {
          base base-compat directory filepath process template-haskell
        ];
        description = "Compile git revision info into Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gitson" = callPackage
@@ -104088,8 +104088,8 @@ self: {
          aeson base criterion directory random transformers
        ];
        description = "A document store library for Git + JSON";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104105,8 +104105,8 @@ self: {
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
        description = "Gitter.im API client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104134,8 +104134,8 @@ self: {
          text
        ];
        description = "CLI Giphy search tool with previews in iTerm 2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104148,7 +104148,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gjk2d" = callPackage
@@ -104159,7 +104159,7 @@ self: {
        sha256 = "1wpaiaki61a7wl56qv6ycz9hgc9f8wvqdcqxpxaqvndxmri4njsv";
        libraryHaskellDepends = [ base linear ];
        testHaskellDepends = [ base linear ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gl" = callPackage
@@ -104176,7 +104176,7 @@ self: {
        ];
        librarySystemDepends = [ libGL ];
        description = "Complete OpenGL raw bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
   "gl-capture" = callPackage
@@ -104187,7 +104187,7 @@ self: {
        sha256 = "0pcan0fpb1mfwda69f8z8pdrdav79rdm31yvmrk98dca7al7k583";
        libraryHaskellDepends = [ base bytestring OpenGL ];
        description = "simple image capture from OpenGL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glabrous" = callPackage
@@ -104207,7 +104207,7 @@ self: {
          base directory either hspec text unordered-containers
        ];
        description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glade" = callPackage
@@ -104223,8 +104223,8 @@ self: {
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ libglade ];
        description = "Binding to the glade library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.gnome2) libglade;};
 
@@ -104236,8 +104236,8 @@ self: {
        sha256 = "06kzakvssmldjgx0s8qm0a3cd9glmwrdnh690sv708jcvg8x45y3";
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104262,7 +104262,7 @@ self: {
          transformers
        ];
        description = "A simply typed lambda calculus interpreter, written with GADTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glapp" = callPackage
@@ -104278,8 +104278,8 @@ self: {
          base containers GLFW-b lens mtl OpenGL
        ];
        description = "An OpenGL micro framework";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104293,7 +104293,7 @@ self: {
        editedCabalFile = "15zppqxc064yqc0wrmlnhaji2lg95fg598ikz03c3j4w1g5v1wdb";
        libraryHaskellDepends = [ base vector ];
        description = "Graphical Lasso algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glaze" = callPackage
@@ -104304,7 +104304,7 @@ self: {
        sha256 = "18925rqf3ah1k7xcb15zk0gcbc4slvvhr5lsz32fh96gid089cdv";
        libraryHaskellDepends = [ base lens ];
        description = "Framework for rendering things with metadata/headers and values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glazier" = callPackage
@@ -104325,8 +104325,8 @@ self: {
          tagged transformers unliftio unliftio-core
        ];
        description = "Extensible effects using ContT, State and variants";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104342,8 +104342,8 @@ self: {
          base glazier mmorph pipes stm stm-extras transformers
        ];
        description = "A threaded rendering framework using glaizer and pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104363,8 +104363,8 @@ self: {
          newtype-generics stm tagged transformers unliftio unliftio-core
        ];
        description = "ReactJS binding using Glazier.Command.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104389,8 +104389,8 @@ self: {
          unordered-containers
        ];
        description = "Examples of using glazier-react";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104410,8 +104410,8 @@ self: {
          lens-misc monadlist mtl tagged transformers
        ];
        description = "Generic widget library using glazier-react";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104436,8 +104436,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Tiny cli to fetch PR info from gitlab";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104455,7 +104455,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        description = "Binding to the GLIB library for Gtk2Hs";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "glicko" = callPackage
@@ -104471,8 +104471,8 @@ self: {
        ];
        testHaskellDepends = [ base data-default hspec ];
        description = "Glicko-2 implementation in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104485,8 +104485,8 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base Cabal containers hspec text ];
        description = "Natural Language Processing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104501,7 +104501,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ppm split ];
        description = "A simple ray tracer in an early stage of development";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glirc" = callPackage
@@ -104531,8 +104531,8 @@ self: {
        executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
-       license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.isc;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "gll" = callPackage
@@ -104548,7 +104548,7 @@ self: {
          TypeCompose
        ];
        description = "GLL parser with simple combinator interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glob-posix" = callPackage
@@ -104566,8 +104566,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion Glob MissingH ];
        description = "Haskell bindings for POSIX glob library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104585,8 +104585,8 @@ self: {
          syntax-trees-fork-bairyn tagged template-haskell
        ];
        description = "Library enabling unique top-level declarations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104607,8 +104607,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
        description = "Global mutable configuration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104620,7 +104620,7 @@ self: {
        sha256 = "0b2sz9ag6wcr0amgrx08l7924brfansnh9rv64wg9s3nk4ni2sxp";
        libraryHaskellDepends = [ base ];
        description = "A global lock implemented without unsafePerformIO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "global-variables" = callPackage
@@ -104631,8 +104631,8 @@ self: {
        sha256 = "0fvhh6q6z114qyi5rhwzxhrlqfhx6af97187b49lyvx2k9zkzvzp";
        libraryHaskellDepends = [ base containers stm ];
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104657,7 +104657,7 @@ self: {
        doHaddock = false;
        description = "ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104673,7 +104673,7 @@ self: {
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
        description = "Painless 2D vector graphics, animations and simulations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -104688,7 +104688,7 @@ self: {
          accelerate base gloss gloss-rendering linear-accelerate
        ];
        description = "Extras to interface Gloss and Accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -104699,7 +104699,7 @@ self: {
        sha256 = "0wx546hm1afgq0al5bk1g2qfgg9r520whm6igz18lkc9fsksjfgd";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gloss-banana" = callPackage
@@ -104712,8 +104712,8 @@ self: {
        editedCabalFile = "0nia67zywmxyvcnlk0a906dijh9h7m6w48330n9gs2mjkhkyqb13";
        libraryHaskellDepends = [ base gloss reactive-banana ];
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104725,8 +104725,8 @@ self: {
        sha256 = "17gwy13z4lymm9dpj26q4ihcl198gqn9kpcjdw8lcgfcg4gxszsm";
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104746,8 +104746,8 @@ self: {
          gloss-raster random repa repa-algorithms repa-io vector
        ];
        description = "Examples using the gloss library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104767,8 +104767,8 @@ self: {
        executableHaskellDepends = [ base gloss ];
        testHaskellDepends = [ base directory filepath gloss JuicyPixels ];
        description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104780,8 +104780,8 @@ self: {
        sha256 = "01k9600f9lv65n9bi2v40gzcl14gg9cm27fxz8yk4kx1hk5hv980";
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        description = "Gloss wrapper that simplifies writing games";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104803,7 +104803,7 @@ self: {
          base bmp bytestring gloss JuicyPixels vector
        ];
        description = "Load any image supported by Juicy.Pixels in your gloss application";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gloss-raster" = callPackage
@@ -104818,7 +104818,7 @@ self: {
          base containers ghc-prim gloss gloss-rendering repa
        ];
        description = "Parallel rendering of raster images";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -104833,8 +104833,8 @@ self: {
          accelerate base colour-accelerate gloss gloss-accelerate
        ];
        description = "Parallel rendering of raster images using Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gloss-rendering" = callPackage
@@ -104849,7 +104849,7 @@ self: {
          base bmp bytestring containers GLUT OpenGL
        ];
        description = "Gloss picture data types and rendering functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gloss-sodium" = callPackage
@@ -104860,8 +104860,8 @@ self: {
        sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za";
        libraryHaskellDepends = [ base gloss sodium ];
        description = "A Sodium interface to the Gloss drawing package";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104880,8 +104880,8 @@ self: {
        testSystemDepends = [ glpk ];
        testToolDepends = [ tasty-discover ];
        description = "Low-level Haskell bindings to GLPK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glpk;};
 
@@ -104900,8 +104900,8 @@ self: {
          array base containers deepseq gasp mtl
        ];
        description = "Comprehensive GLPK linear programming bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glpk;};
 
@@ -104920,8 +104920,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring directory filepath shower ];
        description = "glTF scene loader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104951,8 +104951,8 @@ self: {
          transformers-base unordered-containers
        ];
        description = "Make better services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -104977,7 +104977,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glue-core" = callPackage
@@ -105001,7 +105001,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glue-ekg" = callPackage
@@ -105025,7 +105025,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "glue-example" = callPackage
@@ -105045,7 +105045,7 @@ self: {
          transformers-base unordered-containers
        ];
        description = "Make better services and clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gluturtle" = callPackage
@@ -105058,7 +105058,7 @@ self: {
          base convertible GLUT stm yjsvg yjtools
        ];
        description = "turtle like LOGO with glut";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gmap" = callPackage
@@ -105073,8 +105073,8 @@ self: {
          array AvlTree base COrdering QuickCheck random
        ];
        description = "Composable maps and generic tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105093,8 +105093,8 @@ self: {
          priority-queue qd reflection Vec
        ];
        description = "Mandelbrot Set explorer using GTK";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105107,7 +105107,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gmp ];
        description = "GMP integer conversions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
   "gnome-desktop" = callPackage
@@ -105123,7 +105123,7 @@ self: {
        ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105140,7 +105140,7 @@ self: {
        libraryPkgconfigDepends = [ libgnome-keyring ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libgnome-keyring";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs.gnome3) gnome-keyring; 
          inherit (pkgs) libgnome-keyring;};
 
@@ -105159,7 +105159,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gnome-vfs = null; gnome-vfs_module = null;};
 
@@ -105187,8 +105187,8 @@ self: {
          conduit conduit-extra lens sbp tasty tasty-golden tasty-hunit time
        ];
        description = "GNSS Converters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105211,8 +105211,8 @@ self: {
        testPkgconfigDepends = [ libidn ];
        testToolDepends = [ c2hs ];
        description = "Bindings for GNU IDN";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libidn;};
 
@@ -105234,7 +105234,7 @@ self: {
          utility-ht
        ];
        description = "2D and 3D plots using gnuplot";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gnutls" = callPackage
@@ -105248,7 +105248,7 @@ self: {
        librarySystemDepends = [ gnutls ];
        libraryPkgconfigDepends = [ gnutls ];
        description = "Bindings for GNU libgnutls";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) gnutls;};
 
   "goa" = callPackage
@@ -105262,8 +105262,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105283,8 +105283,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Core imports for Geometric Optimization Libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105299,8 +105299,8 @@ self: {
        libraryHaskellDepends = [ base goal-core hmatrix vector ];
        executableHaskellDepends = [ base goal-core ];
        description = "Scientific computing on geometric objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105320,8 +105320,8 @@ self: {
        ];
        executableHaskellDepends = [ base goal-core goal-geometry vector ];
        description = "Manifolds of probability distributions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105345,8 +105345,8 @@ self: {
          vector
        ];
        description = "Mealy based simulation tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105364,7 +105364,7 @@ self: {
        testHaskellDepends = [ base bytestring cereal QuickCheck safe ];
        description = "Time Series Compression";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "goatee" = callPackage
@@ -105381,8 +105381,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit mtl parsec ];
        description = "A monadic take on a 2,500-year-old board game - library";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105403,8 +105403,8 @@ self: {
        executableHaskellDepends = [ base gtk ];
        testHaskellDepends = [ base HUnit ];
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105426,8 +105426,8 @@ self: {
        executableHaskellDepends = [ base criterion random weigh ];
        testHaskellDepends = [ base hspec hspec-core ];
        description = "Go-style channels";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105450,8 +105450,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        doHaddock = false;
        description = "Haskell bindings for the Godot game engine API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105463,8 +105463,8 @@ self: {
        sha256 = "1whl3fvwxh26nsb4l6brljsmwl891w5yxlsv69mdfvfb1rl7p64f";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "The Gofer 2.30 standard prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -105487,7 +105487,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Extensible interface to Web APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "goggles-gcs" = callPackage
@@ -105503,7 +105503,7 @@ self: {
          text unix-time
        ];
        description = "`goggles` interface to Google Cloud Storage";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gogol" = callPackage
@@ -105527,7 +105527,7 @@ self: {
        ];
        description = "Comprehensive Google Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-abusiveexperiencereport" = callPackage
@@ -105539,7 +105539,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Abusive Experience Report SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-acceleratedmobilepageurl" = callPackage
@@ -105551,7 +105551,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Accelerated Mobile Pages (AMP) URL SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-accessapproval" = callPackage
@@ -105563,7 +105563,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Access Approval SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-accesscontextmanager" = callPackage
@@ -105575,7 +105575,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Access Context Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adexchange-buyer" = callPackage
@@ -105587,7 +105587,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Ad Exchange Buyer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adexchange-seller" = callPackage
@@ -105599,7 +105599,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Ad Exchange Seller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adexchangebuyer2" = callPackage
@@ -105611,7 +105611,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Ad Exchange Buyer API II SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adexperiencereport" = callPackage
@@ -105623,7 +105623,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Ad Experience Report SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-admin-datatransfer" = callPackage
@@ -105635,7 +105635,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Admin Data Transfer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-admin-directory" = callPackage
@@ -105647,7 +105647,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Admin Directory SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-admin-emailmigration" = callPackage
@@ -105659,7 +105659,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Email Migration API v2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-admin-reports" = callPackage
@@ -105671,7 +105671,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Admin Reports SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adsense" = callPackage
@@ -105683,7 +105683,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google AdSense Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-adsense-host" = callPackage
@@ -105695,7 +105695,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google AdSense Host SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-affiliates" = callPackage
@@ -105707,7 +105707,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Affiliate Network SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-alertcenter" = callPackage
@@ -105719,7 +105719,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google G Suite Alert Center SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-analytics" = callPackage
@@ -105731,7 +105731,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-analyticsreporting" = callPackage
@@ -105743,7 +105743,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Analytics Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-android-enterprise" = callPackage
@@ -105755,7 +105755,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play EMM SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-android-publisher" = callPackage
@@ -105767,7 +105767,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-androiddeviceprovisioning" = callPackage
@@ -105779,7 +105779,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Android Device Provisioning Partner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-androidmanagement" = callPackage
@@ -105791,7 +105791,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Android Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-appengine" = callPackage
@@ -105803,7 +105803,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google App Engine Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-activity" = callPackage
@@ -105815,7 +105815,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Drive Activity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-calendar" = callPackage
@@ -105827,7 +105827,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Calendar SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-licensing" = callPackage
@@ -105839,7 +105839,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Enterprise License Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-reseller" = callPackage
@@ -105851,7 +105851,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Enterprise Apps Reseller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-apps-tasks" = callPackage
@@ -105863,7 +105863,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Tasks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-appstate" = callPackage
@@ -105875,7 +105875,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google App State SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-autoscaler" = callPackage
@@ -105887,7 +105887,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Compute Engine Autoscaler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-bigquery" = callPackage
@@ -105899,7 +105899,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google BigQuery SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-bigquerydatatransfer" = callPackage
@@ -105911,7 +105911,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google BigQuery Data Transfer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-bigtableadmin" = callPackage
@@ -105923,7 +105923,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Bigtable Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-billing" = callPackage
@@ -105935,7 +105935,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Billing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-binaryauthorization" = callPackage
@@ -105947,7 +105947,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Binary Authorization SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-blogger" = callPackage
@@ -105959,7 +105959,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Blogger SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-books" = callPackage
@@ -105971,7 +105971,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Books SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-chat" = callPackage
@@ -105983,7 +105983,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Hangouts Chat SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-civicinfo" = callPackage
@@ -105995,7 +105995,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Civic Information SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-classroom" = callPackage
@@ -106007,7 +106007,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Classroom SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudasset" = callPackage
@@ -106019,7 +106019,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Asset SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-clouderrorreporting" = callPackage
@@ -106031,7 +106031,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Error Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudfunctions" = callPackage
@@ -106043,7 +106043,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Functions SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudidentity" = callPackage
@@ -106055,7 +106055,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Identity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudiot" = callPackage
@@ -106067,7 +106067,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud IoT SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudkms" = callPackage
@@ -106079,7 +106079,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Key Management Service (KMS) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudmonitoring" = callPackage
@@ -106091,7 +106091,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudprivatecatalog" = callPackage
@@ -106103,7 +106103,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Private Catalog SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudprivatecatalogproducer" = callPackage
@@ -106115,7 +106115,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Private Catalog Producer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudprofiler" = callPackage
@@ -106127,7 +106127,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Profiler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudscheduler" = callPackage
@@ -106139,7 +106139,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Scheduler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudsearch" = callPackage
@@ -106151,7 +106151,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudshell" = callPackage
@@ -106163,7 +106163,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Shell SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudtasks" = callPackage
@@ -106175,7 +106175,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Tasks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-cloudtrace" = callPackage
@@ -106187,7 +106187,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Trace SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-commentanalyzer" = callPackage
@@ -106199,7 +106199,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Perspective Comment Analyzer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-composer" = callPackage
@@ -106211,7 +106211,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Composer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-compute" = callPackage
@@ -106223,7 +106223,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Compute Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-consumersurveys" = callPackage
@@ -106235,7 +106235,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Consumer Surveys SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-container" = callPackage
@@ -106247,7 +106247,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Kubernetes Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-containeranalysis" = callPackage
@@ -106259,7 +106259,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Container Analysis SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-containerbuilder" = callPackage
@@ -106271,7 +106271,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Build SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-core" = callPackage
@@ -106294,7 +106294,7 @@ self: {
        testHaskellDepends = [ base tasty ];
        description = "Core data types and functionality for Gogol libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-customsearch" = callPackage
@@ -106306,7 +106306,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google CustomSearch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dataflow" = callPackage
@@ -106318,7 +106318,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Dataflow SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-datafusion" = callPackage
@@ -106330,7 +106330,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Data Fusion SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dataproc" = callPackage
@@ -106342,7 +106342,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Dataproc SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-datastore" = callPackage
@@ -106354,7 +106354,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Datastore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-debugger" = callPackage
@@ -106366,7 +106366,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Debugger SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-deploymentmanager" = callPackage
@@ -106378,7 +106378,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Deployment Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dfareporting" = callPackage
@@ -106390,7 +106390,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google DCM/DFA Reporting And Trafficking SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dialogflow" = callPackage
@@ -106402,7 +106402,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Dialogflow SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-digitalassetlinks" = callPackage
@@ -106414,7 +106414,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Digital Asset Links SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-discovery" = callPackage
@@ -106426,7 +106426,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google API Discovery Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dlp" = callPackage
@@ -106438,7 +106438,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Data Loss Prevention (DLP) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-dns" = callPackage
@@ -106450,7 +106450,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud DNS SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-docs" = callPackage
@@ -106462,7 +106462,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Docs SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-bids" = callPackage
@@ -106474,7 +106474,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google DoubleClick Bid Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-search" = callPackage
@@ -106486,7 +106486,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google DoubleClick Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-drive" = callPackage
@@ -106498,7 +106498,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Drive SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-driveactivity" = callPackage
@@ -106510,7 +106510,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Drive Activity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-factchecktools" = callPackage
@@ -106522,7 +106522,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Fact Check Tools SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-file" = callPackage
@@ -106534,7 +106534,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Filestore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firebase-dynamiclinks" = callPackage
@@ -106546,7 +106546,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Firebase Dynamic Links SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firebase-rules" = callPackage
@@ -106558,7 +106558,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Firebase Rules SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firebasehosting" = callPackage
@@ -106570,7 +106570,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Firebase Hosting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firebaseremoteconfig" = callPackage
@@ -106582,7 +106582,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Firebase Remote Config SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-firestore" = callPackage
@@ -106594,7 +106594,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Firestore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-fitness" = callPackage
@@ -106606,7 +106606,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Fitness SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-fonts" = callPackage
@@ -106618,7 +106618,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Fonts Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-freebasesearch" = callPackage
@@ -106630,7 +106630,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Freebase Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-fusiontables" = callPackage
@@ -106642,7 +106642,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Fusion Tables SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-games" = callPackage
@@ -106654,7 +106654,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Game Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-games-configuration" = callPackage
@@ -106666,7 +106666,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Game Services Publishing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-games-management" = callPackage
@@ -106678,7 +106678,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Game Services Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-genomics" = callPackage
@@ -106690,7 +106690,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Genomics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-gmail" = callPackage
@@ -106702,7 +106702,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Gmail SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-groups-migration" = callPackage
@@ -106714,7 +106714,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Groups Migration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-groups-settings" = callPackage
@@ -106726,7 +106726,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Groups Settings SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-healthcare" = callPackage
@@ -106738,7 +106738,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Healthcare SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-iam" = callPackage
@@ -106750,7 +106750,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Identity and Access Management (IAM) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-iamcredentials" = callPackage
@@ -106762,7 +106762,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google IAM Service Account Credentials SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-iap" = callPackage
@@ -106774,7 +106774,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Identity-Aware Proxy SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-identity-toolkit" = callPackage
@@ -106786,7 +106786,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Identity Toolkit SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-indexing" = callPackage
@@ -106798,7 +106798,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Indexing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-jobs" = callPackage
@@ -106810,7 +106810,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Talent Solution SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-kgsearch" = callPackage
@@ -106822,7 +106822,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Knowledge Graph Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-language" = callPackage
@@ -106834,7 +106834,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Natural Language SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-latencytest" = callPackage
@@ -106846,7 +106846,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Network Performance Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-libraryagent" = callPackage
@@ -106858,7 +106858,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Library Agent SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-logging" = callPackage
@@ -106870,7 +106870,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Logging SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-manufacturers" = callPackage
@@ -106882,7 +106882,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Manufacturer Center SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-maps-coordinate" = callPackage
@@ -106894,7 +106894,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Maps Coordinate SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-maps-engine" = callPackage
@@ -106906,7 +106906,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Maps Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-mirror" = callPackage
@@ -106918,7 +106918,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Mirror SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-ml" = callPackage
@@ -106930,7 +106930,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Machine Learning Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-monitoring" = callPackage
@@ -106942,7 +106942,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Stackdriver Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-oauth2" = callPackage
@@ -106954,7 +106954,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google OAuth2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-oslogin" = callPackage
@@ -106966,7 +106966,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud OS Login SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-pagespeed" = callPackage
@@ -106978,7 +106978,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google PageSpeed Insights SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-partners" = callPackage
@@ -106990,7 +106990,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Partners SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-people" = callPackage
@@ -107002,7 +107002,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google People SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-photoslibrary" = callPackage
@@ -107014,7 +107014,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Photos Library SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-play-moviespartner" = callPackage
@@ -107026,7 +107026,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Movies Partner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-playcustomapp" = callPackage
@@ -107038,7 +107038,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Play Custom App Publishing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-plus" = callPackage
@@ -107050,7 +107050,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google + SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-plus-domains" = callPackage
@@ -107062,7 +107062,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google + Domains SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-poly" = callPackage
@@ -107074,7 +107074,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Poly SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-prediction" = callPackage
@@ -107086,7 +107086,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Prediction SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-proximitybeacon" = callPackage
@@ -107098,7 +107098,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Proximity Beacon SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-pubsub" = callPackage
@@ -107110,7 +107110,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Pub/Sub SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-qpxexpress" = callPackage
@@ -107122,7 +107122,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google QPX Express SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-redis" = callPackage
@@ -107134,7 +107134,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Memorystore for Redis SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-remotebuildexecution" = callPackage
@@ -107146,7 +107146,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Remote Build Execution SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-replicapool" = callPackage
@@ -107158,7 +107158,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Replica Pool SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-replicapool-updater" = callPackage
@@ -107170,7 +107170,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Compute Engine Instance Group Updater SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-resourcemanager" = callPackage
@@ -107182,7 +107182,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Resource Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-resourceviews" = callPackage
@@ -107194,7 +107194,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Compute Engine Instance Groups SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-run" = callPackage
@@ -107206,7 +107206,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Run SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-runtimeconfig" = callPackage
@@ -107218,7 +107218,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Runtime Configuration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-safebrowsing" = callPackage
@@ -107230,7 +107230,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Safe Browsing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-script" = callPackage
@@ -107242,7 +107242,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Apps Script SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-searchconsole" = callPackage
@@ -107254,7 +107254,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Search Console URL Testing Tools SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-securitycenter" = callPackage
@@ -107266,7 +107266,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Security Command Center SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-servicebroker" = callPackage
@@ -107278,7 +107278,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Broker SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-serviceconsumermanagement" = callPackage
@@ -107290,7 +107290,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Consumer Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-servicecontrol" = callPackage
@@ -107302,7 +107302,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Control SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-servicemanagement" = callPackage
@@ -107314,7 +107314,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-servicenetworking" = callPackage
@@ -107326,7 +107326,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Networking SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-serviceusage" = callPackage
@@ -107338,7 +107338,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service Usage SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-serviceuser" = callPackage
@@ -107350,7 +107350,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Service User SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-sheets" = callPackage
@@ -107362,7 +107362,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Sheets SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-shopping-content" = callPackage
@@ -107374,7 +107374,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Content API for Shopping SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-siteverification" = callPackage
@@ -107386,7 +107386,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Site Verification SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-slides" = callPackage
@@ -107398,7 +107398,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Slides SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-sourcerepo" = callPackage
@@ -107410,7 +107410,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Source Repositories SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-spanner" = callPackage
@@ -107422,7 +107422,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Spanner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-spectrum" = callPackage
@@ -107434,7 +107434,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Spectrum Database SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-speech" = callPackage
@@ -107446,7 +107446,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Speech-to-Text SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-sqladmin" = callPackage
@@ -107458,7 +107458,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud SQL Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-storage" = callPackage
@@ -107470,7 +107470,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Storage JSON SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-storage-transfer" = callPackage
@@ -107482,7 +107482,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Storage Transfer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-streetviewpublish" = callPackage
@@ -107494,7 +107494,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Street View Publish SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-surveys" = callPackage
@@ -107506,7 +107506,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Surveys SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-tagmanager" = callPackage
@@ -107518,7 +107518,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Tag Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-taskqueue" = callPackage
@@ -107530,7 +107530,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google TaskQueue SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-testing" = callPackage
@@ -107542,7 +107542,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Testing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-texttospeech" = callPackage
@@ -107554,7 +107554,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Text-to-Speech SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-toolresults" = callPackage
@@ -107566,7 +107566,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Tool Results SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-tpu" = callPackage
@@ -107578,7 +107578,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud TPU SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-tracing" = callPackage
@@ -107590,7 +107590,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Tracing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-translate" = callPackage
@@ -107602,7 +107602,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Translation SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-urlshortener" = callPackage
@@ -107614,7 +107614,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google URL Shortener SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-useraccounts" = callPackage
@@ -107626,7 +107626,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud User Accounts SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-vault" = callPackage
@@ -107638,7 +107638,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google G Suite Vault SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-videointelligence" = callPackage
@@ -107650,7 +107650,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Video Intelligence SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-vision" = callPackage
@@ -107662,7 +107662,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Cloud Vision SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-webmaster-tools" = callPackage
@@ -107674,7 +107674,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Search Console SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-websecurityscanner" = callPackage
@@ -107686,7 +107686,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google Web Security Scanner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-youtube" = callPackage
@@ -107698,7 +107698,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google YouTube Data SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-youtube-analytics" = callPackage
@@ -107710,7 +107710,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google YouTube Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gogol-youtube-reporting" = callPackage
@@ -107722,7 +107722,7 @@ self: {
        libraryHaskellDepends = [ base gogol-core ];
        description = "Google YouTube Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "goldplate" = callPackage
@@ -107742,8 +107742,8 @@ self: {
          unordered-containers
        ];
        description = "A lightweight golden test runner";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107755,8 +107755,8 @@ self: {
        sha256 = "0njlbvlqzm9282rwk21klr3jq6m46i2qz46xbsdhw9jg2dawq97j";
        libraryHaskellDepends = [ base renderable transformers varying ];
        description = "Graphical user interfaces that are renderable, change over time and eventually produce a value";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107776,8 +107776,8 @@ self: {
          random scientific stm text time unordered-containers
        ];
        description = "Client for the Google Cloud APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107789,7 +107789,7 @@ self: {
        sha256 = "12ib4y8cjg0dvvizy8yxgjaqvyawdy7vxmh1ab12b4yg40wwsg6g";
        libraryHaskellDepends = [ aeson base bytestring HTTP lens mtl ];
        description = "Simple interface to the google.com/dictionary API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "google-drive" = callPackage
@@ -107812,8 +107812,8 @@ self: {
          hspec-expectations-lifted load-env text time
        ];
        description = "Google Drive API access";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107832,8 +107832,8 @@ self: {
          syb text time
        ];
        description = "Google HTML5 Slide generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107848,7 +107848,7 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra http-conduit text
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "google-mail-filters" = callPackage
@@ -107864,8 +107864,8 @@ self: {
        ];
        testHaskellDepends = [ base google-search text time xml-conduit ];
        description = "Write GMail filters and output to importable XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107882,8 +107882,8 @@ self: {
          text
        ];
        description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107904,8 +107904,8 @@ self: {
          base bytestring hoauth2 hspec http-conduit load-env text
        ];
        description = "Google OAuth2 token negotiation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107925,8 +107925,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Opininated use of Google Authentication for ease";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107944,7 +107944,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Get Google OAuth2 token for CLI tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "google-oauth2-jwt" = callPackage
@@ -107959,8 +107959,8 @@ self: {
          base base64-bytestring bytestring HsOpenSSL RSA text unix-time
        ];
        description = "Get a signed JWT for Google Service Accounts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107972,8 +107972,8 @@ self: {
        sha256 = "1jn22iykcl6694lsshj7xxnqx33d6spqlr2q93v6ak3yaygxd7hr";
        libraryHaskellDepends = [ base free nats text time ];
        description = "EDSL for Google and GMail search expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -107997,8 +107997,8 @@ self: {
          wai-extra warp
        ];
        description = "Google APIs for server to server applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108018,8 +108018,8 @@ self: {
          servant servant-client servant-JuicyPixels text utf8-string
        ];
        description = "Bindings to the Google Maps Static API (formerly Static Maps API)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108036,8 +108036,8 @@ self: {
          servant-client text transformers
        ];
        description = "Google Translate API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108055,8 +108055,8 @@ self: {
          http-enumerator http-types mtl text time timerep transformers url
        ];
        description = "Haskell implementation of the Google+ API v1";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108075,8 +108075,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Google Polyline Encoder/Decoder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108097,7 +108097,7 @@ self: {
          mime-types network optparse-applicative text wai warp
        ];
        description = "proxy gopher over http";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gopherbot" = callPackage
@@ -108115,7 +108115,7 @@ self: {
        ];
        description = "Spidering robot to download files from Gopherspace";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108144,8 +108144,8 @@ self: {
          unordered-containers vector wreq
        ];
        description = "GoPro Plus Client API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108164,8 +108164,8 @@ self: {
          unordered-containers
        ];
        description = "Core of FRP game engine called Gore&Ash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108183,8 +108183,8 @@ self: {
          resourcet transformers transformers-base unordered-containers
        ];
        description = "Gore&Ash engine extension that implements actor style of programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108207,8 +108207,8 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "Core module for Gore&Ash engine that embeds async IO actions into game loop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108234,8 +108234,8 @@ self: {
          text-show time transformers unordered-containers vector
        ];
        description = "Demonstration game for Gore&Ash game engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108252,8 +108252,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Core module for Gore&Ash engine for GLFW input events";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108273,8 +108273,8 @@ self: {
          lambdacube-compiler lambdacube-gl mtl text unordered-containers
        ];
        description = "Core module for Gore&Ash engine that do something";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108293,8 +108293,8 @@ self: {
          unordered-containers
        ];
        description = "Core module for gore-and-ash with logging utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108316,8 +108316,8 @@ self: {
          typesafe-endian unordered-containers
        ];
        description = "Core module for Gore&Ash engine with low level network API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108336,8 +108336,8 @@ self: {
          unordered-containers
        ];
        description = "Gore&Ash core module for integration with SDL library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108357,8 +108357,8 @@ self: {
          hashable mtl text unordered-containers
        ];
        description = "Gore&Ash module for high level network synchronization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108378,7 +108378,7 @@ self: {
          scientific text unix unordered-containers vector
        ];
        description = "A Haskell Vault KVv2 secret engine client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gotta-go-fast" = callPackage
@@ -108396,7 +108396,7 @@ self: {
          word-wrap
        ];
        description = "A command line utility for practicing typing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gpah" = callPackage
@@ -108416,8 +108416,8 @@ self: {
          uniplate uu-parsinglib zlib
        ];
        description = "Generic Programming Use in Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108429,7 +108429,7 @@ self: {
        sha256 = "1fm0k6n6fb5a3wvmb2l6k4zq3sdfxv16cb2y2zmjgxgj5n3gy9s8";
        libraryHaskellDepends = [ base ];
        description = "Generalized Pitch Class Sets for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gpio" = callPackage
@@ -108451,7 +108451,7 @@ self: {
          base directory exceptions monad-control optparse-generic safe
        ];
        description = "Haskell GPIO interface, designed specifically for the RaspberryPi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gpolyline" = callPackage
@@ -108462,7 +108462,7 @@ self: {
        sha256 = "01bsl7s8r33jgvk9lyca02awj43acii8spa6sskz19ivhm2adcr8";
        libraryHaskellDepends = [ base split ];
        description = "Pure module for encoding/decoding Google Polyline";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gps" = callPackage
@@ -108482,8 +108482,8 @@ self: {
          test-framework-quickcheck2 time vector
        ];
        description = "For manipulating GPS coordinates and trails";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108504,8 +108504,8 @@ self: {
          tar time xsd
        ];
        description = "GPS to HTML Summary Report";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108522,8 +108522,8 @@ self: {
          void xml-conduit xml-types
        ];
        description = "Read GPX files using conduits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108537,8 +108537,8 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Applicative non-linear consumption";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108551,8 +108551,8 @@ self: {
        libraryHaskellDepends = [ base containers grab text ];
        testHaskellDepends = [ base containers hedgehog text ];
        description = "Applicative parsers for form parameter lists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108569,8 +108569,8 @@ self: {
          base directory filepath hspec network process stm unix
        ];
        description = "Library to write graceful shutdown / upgrade service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108589,8 +108589,8 @@ self: {
          aeson aeson-pretty base bytestring Diff tasty tasty-hunit
        ];
        description = "API for creating grafana dashboards represented as json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108609,8 +108609,8 @@ self: {
          aeson base containers hspec mtl test-fixture text
        ];
        description = "Monadic correlated log events";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108634,8 +108634,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A Haskell client for Grakn";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108654,7 +108654,7 @@ self: {
        ];
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108690,8 +108690,8 @@ self: {
          rank2classes text
        ];
        description = "parsers that combine into grammars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108708,8 +108708,8 @@ self: {
          grapefruit-ui
        ];
        description = "Examples using the Grapefruit library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108727,8 +108727,8 @@ self: {
          arrows base containers fingertree semigroups TypeCompose
        ];
        description = "Functional Reactive Programming core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108740,8 +108740,8 @@ self: {
        sha256 = "0j1jy4rq11gk7j08cz7skdqlbnjrciiv0vi491lvmbbwmvf15cd6";
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        description = "A record system for Functional Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108760,8 +108760,8 @@ self: {
          grapefruit-records
        ];
        description = "Declarative user interface programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108781,8 +108781,8 @@ self: {
          grapefruit-records grapefruit-ui gtk3 transformers
        ];
        description = "GTK+-based backend for declarative user interface programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108797,7 +108797,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graph-core" = callPackage
@@ -108817,8 +108817,8 @@ self: {
          unordered-containers vector
        ];
        description = "Fast, memory efficient and persistent graph implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108843,7 +108843,7 @@ self: {
          mwc-random QuickCheck
        ];
        description = "Functions for generating structured or random FGL graphs";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "graph-matchings" = callPackage
@@ -108854,8 +108854,8 @@ self: {
        sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv";
        libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108869,8 +108869,8 @@ self: {
          base base-unicode-symbols containers mtl
        ];
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108890,8 +108890,8 @@ self: {
          graph-rewriting-layout OpenGL parsec
        ];
        description = "Interactive graph rewriting system implementing various well-known combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108908,8 +108908,8 @@ self: {
          graph-rewriting-layout OpenGL
        ];
        description = "OpenGL interface for interactive port graph rewriting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108931,8 +108931,8 @@ self: {
          OpenGL parsec
        ];
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108948,8 +108948,8 @@ self: {
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
        description = "Force-directed node placement intended for incremental graph drawing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108969,8 +108969,8 @@ self: {
          graph-rewriting-layout OpenGL parsec
        ];
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -108986,8 +108986,8 @@ self: {
          base base-unicode-symbols containers graph-rewriting
        ];
        description = "Evaluation strategies for port-graph rewriting systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109009,8 +109009,8 @@ self: {
          uu-parsinglib
        ];
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109031,8 +109031,8 @@ self: {
          graph-rewriting-layout IndentParser OpenGL parsec
        ];
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109044,8 +109044,8 @@ self: {
        sha256 = "1a9qq5gpyxg6j6ja3kjldnf11wywjvvxpwvgiahlsrmwfw2c8d74";
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Serialization of data structures with references";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109061,8 +109061,8 @@ self: {
          base containers fgl mtl parsec syb template-haskell
        ];
        description = "A simple wrapper & quasi quoter for fgl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109078,8 +109078,8 @@ self: {
          base containers data-lens data-lens-template mtl
        ];
        description = "Graph walk abstraction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109096,7 +109096,7 @@ self: {
          array base containers deepseq hspec QuickCheck
        ];
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graphbuilder" = callPackage
@@ -109113,8 +109113,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A declarative, monadic graph construction language for small graphs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109131,8 +109131,8 @@ self: {
          mtl transformers
        ];
        description = "A minimal Graph Theory library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109150,8 +109150,8 @@ self: {
          base bitmap bitmap-opengl FTGL OpenGL stb-image
        ];
        description = "A functional interface to 2D drawing in OpenGL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109167,8 +109167,8 @@ self: {
          base bitmap-opengl containers hxt OpenGL stb-image transformers
        ];
        description = "Load 3D geometry in the COLLADA format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109180,8 +109180,8 @@ self: {
        sha256 = "0bcqj0n8qqaqfrn21qgkf8si5qgxl3qlsc8djy0rqhnfi2grb8nh";
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109200,8 +109200,8 @@ self: {
        ];
        executableHaskellDepends = [ base CV wx wxcore ];
        description = "Tools for creating graphical UIs, based on wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109222,7 +109222,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Graphs and networks library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graphmod" = callPackage
@@ -109240,7 +109240,7 @@ self: {
          pretty
        ];
        description = "Present the module dependencies of a program as a \"dot\" graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graphmod-plugin" = callPackage
@@ -109258,8 +109258,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A reimplementation of graphmod as a source plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109285,7 +109285,7 @@ self: {
        ];
        description = "Haskell GraphQL implementation";
        license = "MPL-2.0 AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109315,8 +109315,8 @@ self: {
          attoparsec base criterion exceptions protolude transformers
        ];
        description = "GraphQL API";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109347,8 +109347,8 @@ self: {
          tasty tasty-hunit template-haskell text transformers unliftio-core
        ];
        description = "A client for Haskell programs to query a GraphQL API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109364,8 +109364,8 @@ self: {
          aeson aeson-helper base graphql text unordered-containers vector
        ];
        description = "GraphQL Utils";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109377,8 +109377,8 @@ self: {
        sha256 = "0sm0j1d2h6b2d3ksbbdyvzyvwl306mb64yikwkdwp2izfy387lwg";
        libraryHaskellDepends = [ base containers json text ];
        description = "GraphQL interface middleware for SQL databases";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109396,7 +109396,7 @@ self: {
          array base containers transformers transformers-compat void
        ];
        description = "A simple monadic graph library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graphted" = callPackage
@@ -109407,8 +109407,8 @@ self: {
        sha256 = "0y2nqsygqcxb0w7x1irikqqx10m209nihqmxqy1s18snrlvh06c9";
        libraryHaskellDepends = [ base indexed ];
        description = "Graph indexed monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109426,8 +109426,8 @@ self: {
          base containers dotgen haskell-src-exts haskell98 uniplate
        ];
        description = "A simple tool to illustrate dependencies between Haskell types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109455,8 +109455,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A declarative library for describing dependencies between data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109484,8 +109484,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "A declarative library for describing dependencies between data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109512,7 +109512,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "Bindings to Graphviz for graph visualisation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) graphviz;};
 
   "graql" = callPackage
@@ -109529,8 +109529,8 @@ self: {
        testHaskellDepends = [ base hspec markdown-unlit text ];
        testToolDepends = [ markdown-unlit ];
        description = "Execute Graql queries on a Grakn graph";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109555,8 +109555,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "GRASP implementation for the AMMM project";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109573,7 +109573,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "Generate Gravatar image URLs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gray-code" = callPackage
@@ -109585,8 +109585,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Gray code encoder/decoder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109603,7 +109603,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Gray encoding schemes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "graylog" = callPackage
@@ -109625,7 +109625,7 @@ self: {
        ];
        description = "Support for graylog output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "greencard" = callPackage
@@ -109639,8 +109639,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ array base containers pretty ];
        description = "GreenCard, a foreign function pre-processor for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109653,8 +109653,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers greencard pretty ];
        description = "A foreign function interface pre-processor library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109675,7 +109675,7 @@ self: {
        ];
        executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ];
        description = "Simple clipboard manager to be integrated with rofi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; 
          inherit (pkgs) xlibsWrapper;};
 
@@ -109691,8 +109691,8 @@ self: {
          base binary bytestring clock hostname network stm system-uuid time
        ];
        description = "A scalable distributed logger with a high-precision global time axis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109716,8 +109716,8 @@ self: {
        ];
        testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ];
        description = "Graph database client for TinkerPop3 Gremlin Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109741,8 +109741,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
        description = "Practical Deep Learning in Haskell";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109760,7 +109760,7 @@ self: {
        ];
        description = "Generalised replicate functions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "greskell" = callPackage
@@ -109781,7 +109781,7 @@ self: {
          hspec text unordered-containers
        ];
        description = "Haskell binding for Gremlin graph query language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "greskell-core" = callPackage
@@ -109802,7 +109802,7 @@ self: {
          text unordered-containers vector
        ];
        description = "Haskell binding for Gremlin graph query language - core data types and tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "greskell-websocket" = callPackage
@@ -109824,7 +109824,7 @@ self: {
          vector
        ];
        description = "Haskell client for Gremlin Server using WebSocket serializer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "grid" = callPackage
@@ -109840,7 +109840,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Tools for working with regular grids (graphs, lattices)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "grid-proto" = callPackage
@@ -109862,8 +109862,8 @@ self: {
          sdl2-mixer sdl2-ttf StateVar text vector
        ];
        description = "Grid-based prototyping framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109876,8 +109876,8 @@ self: {
        libraryHaskellDepends = [ base earclipper gjk gridbox ];
        testHaskellDepends = [ base earclipper gjk gridbox hspec ];
        description = "Collision detection for GridBox";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109890,7 +109890,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A grid box model";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gridfs" = callPackage
@@ -109908,7 +109908,7 @@ self: {
        ];
        description = "GridFS (MongoDB file storage) implementation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gridland" = callPackage
@@ -109926,8 +109926,8 @@ self: {
          SDL-image SDL-mixer tuple vector
        ];
        description = "Grid-based multimedia engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109950,7 +109950,7 @@ self: {
          adjunctions base comonad deepseq distributive gauge singletons
          vector
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "grm" = callPackage
@@ -109971,8 +109971,8 @@ self: {
        ];
        executableToolDepends = [ happy ];
        description = "grm grammar converter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -109987,7 +109987,7 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        executableHaskellDepends = [ base ];
        description = "Pretty printing for well-behaved Show instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groot" = callPackage
@@ -110036,8 +110036,8 @@ self: {
          vector yaml
        ];
        description = "Command line utility to manage AWS ECS resources";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110052,8 +110052,8 @@ self: {
        libraryHaskellDepends = [ base mtl ncurses ];
        executableHaskellDepends = [ base lens mtl ncurses ];
        description = "A spoof on gloss for terminal animation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110073,7 +110073,7 @@ self: {
          transformers transformers-base transformers-compat
        ];
        description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-converters" = callPackage
@@ -110091,8 +110091,8 @@ self: {
          groundhog-th tasty tasty-hunit tasty-quickcheck
        ];
        description = "Extended Converter Library for groundhog embedded types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110116,7 +110116,7 @@ self: {
          groundhog-th mtl
        ];
        description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-mysql" = callPackage
@@ -110133,7 +110133,7 @@ self: {
          mysql mysql-simple resource-pool resourcet text time transformers
        ];
        description = "MySQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-postgresql" = callPackage
@@ -110151,7 +110151,7 @@ self: {
          time transformers vector
        ];
        description = "PostgreSQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-sqlite" = callPackage
@@ -110168,7 +110168,7 @@ self: {
          resource-pool resourcet text transformers unordered-containers
        ];
        description = "Sqlite3 backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groundhog-th" = callPackage
@@ -110184,7 +110184,7 @@ self: {
          text time unordered-containers yaml
        ];
        description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "group-by-date" = callPackage
@@ -110202,7 +110202,7 @@ self: {
          transformers unix-compat utility-ht
        ];
        description = "Shell command for grouping files by dates into folders";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "group-theory" = callPackage
@@ -110217,7 +110217,7 @@ self: {
        libraryHaskellDepends = [ base containers groups ];
        testHaskellDepends = [ base doctest ];
        description = "The theory of groups";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "group-with" = callPackage
@@ -110233,8 +110233,8 @@ self: {
          base Cabal containers hspec hspec-expectations QuickCheck
        ];
        description = "Classify objects by key-generating function, like SQL GROUP BY";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110252,7 +110252,7 @@ self: {
          base code-page criterion optparse-applicative random utility-ht
        ];
        description = "Replacement definition of Data.List.GroupBy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "grouped-list" = callPackage
@@ -110267,8 +110267,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Grouped lists. Equal consecutive elements are grouped.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110280,7 +110280,7 @@ self: {
        sha256 = "0gpjlq9f2il4vp7ihh1sf5g2jr1rbi5big5c6dhjk961n8b1dq0z";
        libraryHaskellDepends = [ base ];
        description = "A Groupoid class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groupoids" = callPackage
@@ -110292,7 +110292,7 @@ self: {
        libraryHaskellDepends = [ base semigroupoids ];
        doHaddock = false;
        description = "This package has been absorbed into semigroupoids 4.0";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groups" = callPackage
@@ -110303,7 +110303,7 @@ self: {
        sha256 = "0ghabk9r3pqccwfshy80p460awv0niyfi3nirg5bqnxm923c4njn";
        libraryHaskellDepends = [ base ];
        description = "Groups";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "groups-generic" = callPackage
@@ -110314,8 +110314,8 @@ self: {
        sha256 = "1rnil9qashpvrjxmziymf447pnqpqpnga0lxlk7413y4dprn2rad";
        libraryHaskellDepends = [ base generic-data groups ];
        description = "Generically derive Group instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110335,7 +110335,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Mutable vector with efficient appends";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "growler" = callPackage
@@ -110356,8 +110356,8 @@ self: {
          unordered-containers vector wai wai-extra warp
        ];
        description = "A revised version of the scotty library that attempts to be simpler and more performant";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110369,8 +110369,8 @@ self: {
        sha256 = "1ymvgsrqhnym2wv5j8mbhh8i3r7y0jcz19k927qmffqk7sacfxg1";
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110387,8 +110387,8 @@ self: {
          network proto-lens proto-lens-runtime
        ];
        description = "gRPC client for etcd";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110417,8 +110417,8 @@ self: {
          async base bytestring criterion proto3-suite random
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110444,8 +110444,8 @@ self: {
          transformers turtle unix
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gpr = null; inherit (pkgs) grpc;};
 
@@ -110467,8 +110467,8 @@ self: {
          old-locale OpenGL OpenGLRaw parallel qd qd-vec ruff time Vec
        ];
        description = "fractal explorer GUI using the ruff library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110487,8 +110487,8 @@ self: {
          random ruff Vec
        ];
        description = "Mandelbrot Set examples using ruff and gruff";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110506,7 +110506,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gsasl ];
        description = "Bindings for GNU libgsasl";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) gsasl;};
 
   "gsc-weighting" = callPackage
@@ -110517,7 +110517,7 @@ self: {
        sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5";
        libraryHaskellDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gscholar-rss" = callPackage
@@ -110534,8 +110534,8 @@ self: {
          base feed http-conduit scalpel-core text uri xml-types
        ];
        description = "scrapes google scholar, provides RSS feed";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110548,8 +110548,8 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base vector ];
        description = "Bindings the the GSL random number generation facilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110561,8 +110561,8 @@ self: {
        sha256 = "1qf5m3zksn16mlgavrwbq6yd1mbyafy27qf1ws4nmkxl8ci0k48i";
        libraryHaskellDepends = [ base gsl-random random-fu ];
        description = "Instances for using gsl-random with random-fu";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110580,8 +110580,8 @@ self: {
          base containers mtl parsec permute sindre text X11
        ];
        description = "A visual generic menu";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gssapi" = callPackage
@@ -110595,7 +110595,7 @@ self: {
        libraryHaskellDepends = [ base bytestring resourcet transformers ];
        librarySystemDepends = [ gssapi_krb5 krb5 ];
        description = "libgssapi and libkrb5 bindings for haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {gssapi_krb5 = null; inherit (pkgs) krb5;};
 
   "gssapi-wai" = callPackage
@@ -110611,7 +110611,7 @@ self: {
          http-types vault wai wai-extra
        ];
        description = "WAI Middleware for SPNEGO authentiaction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gstorable" = callPackage
@@ -110627,8 +110627,8 @@ self: {
          base generic-storable ghc-prim hspec QuickCheck
        ];
        description = "Generic implementation of Storable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110648,8 +110648,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GStreamer open source multimedia framework";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gst-plugins-base = null; gstreamer = null;};
 
@@ -110683,8 +110683,8 @@ self: {
          base csv directory filepath rowrecord split
        ];
        description = "The General Transit Feed Specification format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110700,8 +110700,8 @@ self: {
          base protocol-buffers protocol-buffers-descriptor
        ];
        description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110720,7 +110720,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Binding to the Gtk+ graphical user interface library";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk2;};
 
   "gtk-helpers" = callPackage
@@ -110735,7 +110735,7 @@ self: {
          array base gio glib gtk mtl process template-haskell
        ];
        description = "A collection of auxiliary operations and widgets related to Gtk+";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gtk-jsinput" = callPackage
@@ -110746,7 +110746,7 @@ self: {
        sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0";
        libraryHaskellDepends = [ base gtk json transformers ];
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gtk-largeTreeStore" = callPackage
@@ -110762,7 +110762,7 @@ self: {
        ];
        testHaskellDepends = [ base containers gtk3 hspec ];
        description = "Large TreeStore support for gtk2hs";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "gtk-mac-integration" = callPackage
@@ -110778,8 +110778,8 @@ self: {
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
        description = "Bindings for the Gtk/OS X integration library";
-       license = stdenv.lib.licenses.lgpl21;
-       platforms = [ "x86_64-darwin" ];
+       license = lib.licenses.lgpl21;
+       platforms = [ "armv7l-linux" "x86_64-darwin" ];
      }) {inherit (pkgs) gtk-mac-integration-gtk2;};
 
   "gtk-serialized-event" = callPackage
@@ -110796,8 +110796,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk2 ];
        description = "GTK+ Serialized event";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2;};
 
@@ -110809,7 +110809,7 @@ self: {
        sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws";
        libraryHaskellDepends = [ base gtk ];
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gtk-sni-tray" = callPackage
@@ -110839,7 +110839,7 @@ self: {
          optparse-applicative status-notifier-item text unix
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
@@ -110850,7 +110850,7 @@ self: {
        sha256 = "19p3w1zvnaazfd01yy4cl00sl53xc7kqgqhsw7l3psadmwk6x4w1";
        libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
        description = "Libary for creating strut windows with gi-gtk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gtk-toggle-button-list" = callPackage
@@ -110861,7 +110861,7 @@ self: {
        sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706";
        libraryHaskellDepends = [ base gtk ];
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gtk-toy" = callPackage
@@ -110872,8 +110872,8 @@ self: {
        sha256 = "0zf3k0c5h5wcgkqr8np5kvgz4c9nha86k5whsn4f1wk0ikj98dfq";
        libraryHaskellDepends = [ base containers gtk ];
        description = "Convenient Gtk canvas with mouse and keyboard input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -110886,7 +110886,7 @@ self: {
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "A wrapper around the eggtraymanager library for Linux system trays";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) xlibsWrapper;};
 
   "gtk2hs-buildtools" = callPackage
@@ -110907,7 +110907,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
        description = "Tools to build the Gtk2Hs suite of User Interface libraries";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "gtk2hs-cast-glade" = callPackage
@@ -110923,7 +110923,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: glade package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-glib" = callPackage
@@ -110935,7 +110935,7 @@ self: {
        libraryHaskellDepends = [ base glib ];
        description = "A type class for cast functions of Gtk2hs: glib package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gnomevfs" = callPackage
@@ -110951,7 +110951,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gnomevfs package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtk" = callPackage
@@ -110967,7 +110967,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtk package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtkglext" = callPackage
@@ -110983,7 +110983,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtkglext package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtksourceview2" = callPackage
@@ -111000,7 +111000,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtksourceview2 package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-th" = callPackage
@@ -111012,7 +111012,7 @@ self: {
        libraryHaskellDepends = [ base hint template-haskell ];
        description = "A type class for cast functions of Gtk2hs: TH package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "gtk2hs-hello" = callPackage
@@ -111025,8 +111025,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base glib gtk3 transformers ];
        description = "Gtk2Hs Hello World, an example package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111039,7 +111039,7 @@ self: {
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111060,7 +111060,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Binding to the Gtk+ 3 graphical user interface library";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
   "gtk3-helpers" = callPackage
@@ -111075,7 +111075,7 @@ self: {
          array base gio glib gtk3 mtl process template-haskell
        ];
        description = "A collection of auxiliary operations and widgets related to Gtk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "gtk3-mac-integration" = callPackage
@@ -111091,8 +111091,8 @@ self: {
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "Bindings for the Gtk/OS X integration library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
@@ -111111,8 +111111,8 @@ self: {
        libraryPkgconfigDepends = [ gtkglext ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GTK+ OpenGL Extension";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; 
          inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; 
@@ -111134,8 +111134,8 @@ self: {
        libraryPkgconfigDepends = [ gtkimageview ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkImageView library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtkimageview;};
 
@@ -111155,7 +111155,7 @@ self: {
        ];
        description = "Gnome rsync progress display";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111175,8 +111175,8 @@ self: {
        libraryPkgconfigDepends = [ gtksourceview ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtksourceview;};
 
@@ -111196,8 +111196,8 @@ self: {
        libraryPkgconfigDepends = [ gtksourceview3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
@@ -111209,7 +111209,7 @@ self: {
        sha256 = "15a6g0bkjf9r0zl7x61ip05kb7k4rf7yxr7z8jybs5q8g78i1b0c";
        libraryHaskellDepends = [ base ];
        description = "Memory allocation with added stress tests and integrity checks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "guarded-rewriting" = callPackage
@@ -111220,8 +111220,8 @@ self: {
        sha256 = "04396pd4c4yqpw6ai5ciigva9l3acdz7yn4d5hvyks52khv5fsf9";
        libraryHaskellDepends = [ base instant-generics ];
        description = "Datatype-generic rewriting with preconditions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111233,8 +111233,8 @@ self: {
        sha256 = "1xaj8zl6cbgks3r0asbnkz1ixq1hlglpjxdymj6ikyjq955sxmzj";
        libraryHaskellDepends = [ base HList ];
        description = "Generate simple combinators given their type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111247,7 +111247,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text uuid uuid-types ];
        testHaskellDepends = [ base HUnit ];
        description = "A simple wrapper around uuid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "gulcii" = callPackage
@@ -111261,8 +111261,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        description = "graphical untyped lambda calculus interactive interpreter";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111274,7 +111274,7 @@ self: {
        sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2";
        libraryHaskellDepends = [ base ];
        description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "gw" = callPackage
@@ -111287,8 +111287,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base unix ];
        description = "ghcWithPackages cmdline util";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111302,8 +111302,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base extra GiveYouAHead ];
        description = "A binary version of GiveYouAHead";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111325,8 +111325,8 @@ self: {
          base exceptions http-client servant-client
        ];
        description = "REST client to the gym-http-api project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111350,8 +111350,8 @@ self: {
          stm template-haskell transformers utf8-string vinyl
        ];
        description = "Haskell library for retrieving data from various booru image sites";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111375,8 +111375,8 @@ self: {
          tasty-hunit tasty-quickcheck temporary time transformers unix
        ];
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111400,8 +111400,8 @@ self: {
          base containers hspec QuickCheck split text
        ];
        description = "Reversi game in haskell/blank-canvas";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111428,8 +111428,8 @@ self: {
          vector-algorithms vty
        ];
        description = "An Implementation of Game 2048";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111441,8 +111441,8 @@ self: {
        sha256 = "16aljqvzf8n1js0drqii99z3v8xba0468w27c9vmf5w483awkqjb";
        libraryHaskellDepends = [ base bytestring mtl resourcet ];
        description = "Bindings to Linux I2C with support for repeated-start transactions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111458,8 +111458,8 @@ self: {
          base bytestring containers mtl serialport time
        ];
        description = "Control your Arduino board from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111487,7 +111487,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bdd = null; mem = null;};
 
@@ -111504,7 +111504,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) cudd; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
@@ -111521,8 +111521,8 @@ self: {
        executableHaskellDepends = [ base hashable ];
        testHaskellDepends = [ base hashable ];
        description = "Conceptual modelling support for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111539,7 +111539,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to CSound API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {csound64 = null; inherit (pkgs) libsndfile;};
 
@@ -111551,8 +111551,8 @@ self: {
        sha256 = "1ays1qy2zsl3h49ryr2y9dymfv1ak1m1d0jvarmqwg3nb49armhm";
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111565,8 +111565,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111583,8 +111583,8 @@ self: {
          text time zlib
        ];
        description = "Haskell GELF library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111608,8 +111608,8 @@ self: {
          filepath hooplext mtl parsec pretty template-haskell transformers
        ];
        description = "A library for analyzing and transforming LLVM (3.5) assembly codes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hooplext = null;};
 
@@ -111627,8 +111627,8 @@ self: {
          old-locale old-time pureMD5 random time
        ];
        description = "Library to interact with the @Mollom anti-spam service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111643,8 +111643,8 @@ self: {
        libraryHaskellDepends = [ base hOff-parser OpenGL ];
        executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ];
        description = "The tool to transform the OFF to other image format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111656,7 +111656,7 @@ self: {
        sha256 = "1vjvn4sr9nb7dd0in57kay6sb49nqzs377v6k9570h5faaj1dyci";
        libraryHaskellDepends = [ base parsec ];
        description = "The parser to parser the OFF(Object File Format, Princeton ModelNet)";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hOpenPGP" = callPackage
@@ -111703,7 +111703,7 @@ self: {
          zlib
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hPDB" = callPackage
@@ -111722,8 +111722,8 @@ self: {
          text unordered-containers vector zlib
        ];
        description = "Protein Databank file format library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111750,8 +111750,8 @@ self: {
          iterable linear mtl process template-haskell text time vector
        ];
        description = "Examples for hPDB library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111767,8 +111767,8 @@ self: {
          aeson base bytestring http-conduit network text
        ];
        description = "Pushover.net API functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111780,8 +111780,8 @@ self: {
        sha256 = "1kc03mgsxijszdvxw4qwq4fnd0ln61v08rk9y1k6kx9vyqc7bilc";
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111793,7 +111793,7 @@ self: {
        sha256 = "188rs1g2yacka8c4wbqkhwjrin95f3ribm8007lqsxiapaj1d89y";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "haskell implementation of RESP (REdis Serialization Protocol)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hS3" = callPackage
@@ -111812,7 +111812,7 @@ self: {
          network-uri old-locale old-time random regex-compat utf8-string
        ];
        description = "Interface to Amazon's Simple Storage Service (S3)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hScraper" = callPackage
@@ -111828,8 +111828,8 @@ self: {
          process regex-compat text transformers
        ];
        description = "A Haskell library to scrape and crawl web-pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111846,8 +111846,8 @@ self: {
          utf8-string
        ];
        description = "Interface to Amazon's SimpleDB service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111861,8 +111861,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base ];
        description = "Parser, print and manipulate structures in PDB file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111874,8 +111874,8 @@ self: {
        sha256 = "08zmzzwbvqsyz7v5grjwg81434bdr3zkkd12ifhk76xg2p0xfhmk";
        libraryHaskellDepends = [ base containers hmatrix random ];
        description = "Multidimensional arrays and simple tensor computations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111892,7 +111892,7 @@ self: {
        executableSystemDepends = [ blas liblapack ];
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
@@ -111910,7 +111910,7 @@ self: {
          base directory gtk3 process split text
        ];
        description = "A Gtk mixer GUI application for FreeBSD";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haar" = callPackage
@@ -111926,8 +111926,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Haar wavelet transforms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111952,8 +111952,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "Haskell message bot framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -111965,7 +111965,7 @@ self: {
        sha256 = "07h9a8l32j6j5ssrl7f1j02jlmn5f7c48h88fn7lbzhj24kqasl3";
        libraryHaskellDepends = [ base ];
        description = "customizable pretty printer library for tables";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "hablo" = callPackage
@@ -111985,8 +111985,8 @@ self: {
          optparse-applicative parsec template text time unix
        ];
        description = "A minimalist static blog generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112009,8 +112009,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A blog system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112022,7 +112022,7 @@ self: {
        sha256 = "0m0wfg74kmpz6ydldz5h9z5xd54957v1rprl9wal9sjr0pzl28a7";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Template Haskell framework for automatic FFI code generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack" = callPackage
@@ -112034,7 +112034,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring data-default ];
        description = "a Haskell Webserver Interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack-contrib" = callPackage
@@ -112053,8 +112053,8 @@ self: {
          time utf8-string
        ];
        description = "Hack contrib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112072,7 +112072,7 @@ self: {
        ];
        description = "Hack helper that renders Press templates";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112090,8 +112090,8 @@ self: {
          utf8-string
        ];
        description = "hack-frontend-happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112103,7 +112103,7 @@ self: {
        sha256 = "0m0af44jv03djn5i2lgrnnvvcdqx44qppfx76m1bwr7gv1vzm432";
        libraryHaskellDepends = [ base bytestring cgi containers hack ];
        description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack-handler-cgi" = callPackage
@@ -112114,8 +112114,8 @@ self: {
        sha256 = "0pm8vs94dbaahqrdwfffwa1jb9ghyjnq48sirlw1dj2gcsa3np2x";
        libraryHaskellDepends = [ base bytestring hack ];
        description = "Hack handler using CGI protocol. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112135,7 +112135,7 @@ self: {
        ];
        description = "hack handler implementation using epoll";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112155,7 +112155,7 @@ self: {
        librarySystemDepends = [ event ];
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {event = null;};
 
@@ -112168,8 +112168,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ];
        librarySystemDepends = [ fcgi ];
        description = "Hack handler direct to fastcgi (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fcgi;};
 
@@ -112187,8 +112187,8 @@ self: {
          mtl network
        ];
        description = "Hack Happstack server handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112205,8 +112205,8 @@ self: {
          base bytestring containers data-default hack hyena network
        ];
        description = "Hyena hack handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112222,7 +112222,7 @@ self: {
        ];
        description = "Hack Kibro handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112238,8 +112238,8 @@ self: {
          base bytestring failure hack network web-encodings
        ];
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112253,8 +112253,8 @@ self: {
          base bytestring hack split web-encodings
        ];
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112270,8 +112270,8 @@ self: {
          base clientsession hack old-locale predicates time web-encodings
        ];
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112283,7 +112283,7 @@ self: {
        sha256 = "1x7526939h7g44yyscyk324gdb40cryyiffh13iinf8aw1rach70";
        libraryHaskellDepends = [ base hack split zlib ];
        description = "Automatic gzip compression of responses. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack-middleware-jsonp" = callPackage
@@ -112298,8 +112298,8 @@ self: {
          base bytestring bytestring-class hack web-encodings
        ];
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112311,7 +112311,7 @@ self: {
        sha256 = "1b6jzdisv58scyzb9pxhqrnz74sy0j96jkbbnf84wccwbwn4rf28";
        libraryHaskellDepends = [ base bytestring data-default ];
        description = "a Haskell Webserver Interface (V2)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack2-contrib" = callPackage
@@ -112327,7 +112327,7 @@ self: {
          hack2 network-uri text time
        ];
        description = "Hack2 contrib";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack2-contrib-extra" = callPackage
@@ -112345,7 +112345,7 @@ self: {
          filepath hack2 hack2-contrib network old-locale old-time time
        ];
        description = "Hack2 contrib extra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hack2-handler-happstack-server" = callPackage
@@ -112362,8 +112362,8 @@ self: {
          happstack-server mtl network
        ];
        description = "Hack2 Happstack server handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112384,8 +112384,8 @@ self: {
          stm text unix zeromq-haskell
        ];
        description = "Hack2 Mongrel2 HTTP handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112404,8 +112404,8 @@ self: {
          snap-server
        ];
        description = "Hack2 Snap server handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112422,8 +112422,8 @@ self: {
          air base data-default hack2 hack2-interface-wai warp
        ];
        description = "Hack2 warp handler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112440,7 +112440,7 @@ self: {
          http-types network safe wai
        ];
        description = "Hack2 interface to WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-api" = callPackage
@@ -112458,8 +112458,8 @@ self: {
        ];
        testHaskellDepends = [ base http-client-tls servant-client ];
        description = "An API binding to Hackage API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112480,8 +112480,8 @@ self: {
          filepath tar time utf8-string
        ];
        description = "Access cabal-install's Hackage database via Data.Map";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hackage-diff" = callPackage
@@ -112500,8 +112500,8 @@ self: {
          haskell-src-exts HTTP mtl process text
        ];
        description = "Compare the public API of different versions of a Hackage library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112531,8 +112531,8 @@ self: {
          base monad-logger optparse-applicative
        ];
        description = "Simple mirroring utility for Hackage";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112551,7 +112551,7 @@ self: {
          old-locale old-time parsedate
        ];
        description = "Generate cumulative graphs of hackage uploads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-processing" = callPackage
@@ -112564,8 +112564,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal containers hackage-db ];
        description = "Process 00-index.tar.gz from Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112589,8 +112589,8 @@ self: {
          unordered-containers wai warp zlib zlib-conduit
        ];
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112613,8 +112613,8 @@ self: {
          zlib
        ];
        description = "Manage secure file-based package repositories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112644,7 +112644,7 @@ self: {
          unordered-containers vector zlib
        ];
        description = "Hackage security library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-security-HTTP" = callPackage
@@ -112659,7 +112659,7 @@ self: {
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
        description = "Hackage security bindings against the HTTP library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-server" = callPackage
@@ -112697,8 +112697,8 @@ self: {
          vector xml zlib
        ];
        description = "The Hackage web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112717,7 +112717,7 @@ self: {
          old-time parsedate tagsoup
        ];
        description = "Generate sparkline graphs of hackage statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hackage-whatsnew" = callPackage
@@ -112735,8 +112735,8 @@ self: {
          temporary
        ];
        description = "Check for differences between working directory and hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112750,8 +112750,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base download feed tagsoup ];
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112765,8 +112765,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base feed feed2twitter ];
        description = "Send new Hackage releases to Twitter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112784,8 +112784,8 @@ self: {
          base Cabal containers directory filepath mtl process regex-tdfa
        ];
        description = "Hackage testing tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112810,8 +112810,8 @@ self: {
          quickcheck-instances
        ];
        description = "API for Hacker News";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112828,7 +112828,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ];
        description = "\"Hack\" like a programmer in movies and games!";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hackmanager" = callPackage
@@ -112848,8 +112848,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate useful files for Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112901,8 +112901,8 @@ self: {
          transformers-base
        ];
        description = "Lightweight Erlang-style actors for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112914,8 +112914,8 @@ self: {
        sha256 = "0nxcl3v9gnnyjzdpk30m2pmrhwcva9rky2dxrj4nnkr67ajm2dj0";
        libraryHaskellDepends = [ base stm ];
        description = "Practical actors for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112932,8 +112932,8 @@ self: {
        doCheck = false;
        preCheck = "unset GHC_PACKAGE_PATH";
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112950,8 +112950,8 @@ self: {
        doCheck = false;
        preCheck = "unset GHC_PACKAGE_PATH";
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -112976,8 +112976,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113002,8 +113002,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113015,8 +113015,8 @@ self: {
        sha256 = "1nqq7k8ssl6h1d501d8ayzsdlihnbfrqy4l5z43msc6lr7ffvz2r";
        libraryHaskellDepends = [ base ];
        description = "A documentation-only package exemplifying haddock markup features";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113035,8 +113035,8 @@ self: {
          array base Cabal containers directory filepath ghc ghc-paths pretty
        ];
        description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113057,8 +113057,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haddock-library" = callPackage
@@ -113080,7 +113080,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "haddock-test" = callPackage
@@ -113095,8 +113095,8 @@ self: {
          base bytestring Cabal directory filepath process syb xhtml xml
        ];
        description = "Test utilities for Haddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113118,8 +113118,8 @@ self: {
          sqlite-simple tagsoup text transformers
        ];
        description = "Generate docset of Dash by Haddock haskell documentation tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113148,7 +113148,7 @@ self: {
          ShellCheck split text
        ];
        description = "Dockerfile Linter JavaScript API";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hadoop-formats" = callPackage
@@ -113165,8 +113165,8 @@ self: {
        librarySystemDepends = [ snappy ];
        testHaskellDepends = [ base bytestring filepath text vector ];
        description = "Read/write file formats commonly used by Hadoop";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) snappy;};
 
@@ -113187,8 +113187,8 @@ self: {
        ];
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        description = "Use the Hadoop RPC interface from Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113204,7 +113204,7 @@ self: {
        testHaskellDepends = [ base bytestring conduit extra hspec ];
        testToolDepends = [ hspec-discover ];
        description = "A simple Hadoop streaming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hadoop-tools" = callPackage
@@ -113230,8 +113230,8 @@ self: {
          tasty-quickcheck vector
        ];
        description = "Fast command line tools for working with Hadoop";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113250,7 +113250,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest filemanip process ];
        description = "Confirm delegation of NS and MX records";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "hafar" = callPackage
@@ -113262,8 +113262,8 @@ self: {
        libraryHaskellDepends = [ base intervals mtl ];
        testHaskellDepends = [ base intervals mtl QuickCheck ];
        description = "Affine arithmetic library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113290,8 +113290,8 @@ self: {
          base directory filemanip filepath optparse-applicative
        ];
        description = "A static site generator with blogging/comments support";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113313,7 +113313,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A graph library offering mutable, immutable, and inductive graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haha" = callPackage
@@ -113327,7 +113327,7 @@ self: {
        libraryHaskellDepends = [ base containers time ];
        executableHaskellDepends = [ base containers time ];
        description = "A simple library for creating animated ascii art on ANSI terminals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hahp" = callPackage
@@ -113344,8 +113344,8 @@ self: {
        ];
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113368,8 +113368,8 @@ self: {
          tasty-hunit tasty-th text
        ];
        description = "A typed template engine, subset of jinja2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113390,7 +113390,7 @@ self: {
          netrc network-uri optparse-applicative parsec process text wreq
        ];
        description = "A service for pull-based continuous deployment based on hydra";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hailgun" = callPackage
@@ -113408,7 +113408,7 @@ self: {
          transformers
        ];
        description = "Mailgun REST api interface for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hailgun-send" = callPackage
@@ -113423,8 +113423,8 @@ self: {
          base bytestring configurator hailgun text
        ];
        description = "A program to send emails throught the Mailgun api";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113440,7 +113440,7 @@ self: {
          base email-validate hailgun mtl text transformers
        ];
        description = "Easy-to-use wrapper for the hailgun package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hails" = callPackage
@@ -113481,8 +113481,8 @@ self: {
          wai-test
        ];
        description = "Multi-app web platform framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {quickcheck-lio-instances = null;};
 
@@ -113501,7 +113501,7 @@ self: {
          iterio-server mongoDB mtl
        ];
        description = "Dynamic launcher of Hails applications";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "hairy" = callPackage
@@ -113529,8 +113529,8 @@ self: {
          base criterion http-types mtl persistent scotty time wai wai-extra
        ];
        description = "A JSON REST API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113560,8 +113560,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
        description = "A probabilistic programming embedded DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113589,8 +113589,8 @@ self: {
        sha256 = "1ddmnzan16vn0fbp1fgsidahayihhr0vw8saypdqq7lnhqw8j9d4";
        libraryHaskellDepends = [ base HTTP network ];
        description = "Akismet spam protection library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113605,8 +113605,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        executableHaskellDepends = [ base ];
        description = "Minimal akka-inspired actor library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113623,8 +113623,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "A mako-like quasi-quoter template library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113664,8 +113664,8 @@ self: {
        ];
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) utillinux;};
 
@@ -113680,8 +113680,8 @@ self: {
          base directory filepath hakyll pandoc process
        ];
        description = "A package allowing to write Hakyll blog posts in Rmd";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113698,8 +113698,8 @@ self: {
          transformers xhtml
        ];
        description = "Wrapper to integrate literate Agda files with Hakyll";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113716,8 +113716,8 @@ self: {
          pandoc pandoc-types process text
        ];
        description = "Hakyll extension for rendering Coq code using Alectryon";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113729,8 +113729,8 @@ self: {
        sha256 = "11dl3rqls2yxkmycx63xr1cix4adk6b29sbwr4v5n48bqamr7p1j";
        libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        description = "Blaze templates for Hakyll";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113746,8 +113746,8 @@ self: {
        libraryHaskellDepends = [ base hakyll pandoc ];
        executableHaskellDepends = [ base directory filepath hakyll ];
        description = "Extra modules for the hakyll website compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113764,8 +113764,8 @@ self: {
        ];
        testHaskellDepends = [ base blaze-html bytestring cassava hspec ];
        description = "Generate Html tables from Csv files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113784,8 +113784,8 @@ self: {
        ];
        executableHaskellDepends = [ base hakyll ];
        description = "Compile Elm code for inclusion in Hakyll static site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113797,8 +113797,8 @@ self: {
        sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam";
        libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        description = "automatic hyphenation for Hakyll";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113824,7 +113824,7 @@ self: {
        ];
        description = "A Hakyll library for internationalization";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-contrib-links" = callPackage
@@ -113843,8 +113843,8 @@ self: {
          base binary QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A hakyll library that helps maintain a separate links database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113875,7 +113875,7 @@ self: {
          temporary text time xml-types
        ];
        description = "Convert from other blog engines to Hakyll";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hakyll-dhall" = callPackage
@@ -113895,8 +113895,8 @@ self: {
        ];
        executableHaskellDepends = [ base dhall hakyll ];
        description = "Dhall compiler for Hakyll";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113911,8 +113911,8 @@ self: {
          base containers data-default filepath hakyll
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113927,7 +113927,7 @@ self: {
          base blaze-html blaze-markup Elm hakyll mtl
        ];
        description = "Hakyll wrapper for the Elm compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hakyll-favicon" = callPackage
@@ -113941,8 +113941,8 @@ self: {
        libraryHaskellDepends = [ base filepath hakyll ];
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113957,8 +113957,8 @@ self: {
          base filestore hakyll time time-locale-compat
        ];
        description = "FileStore utilities for Hakyll";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113980,8 +113980,8 @@ self: {
          JuicyPixels JuicyPixels-extra tasty tasty-hunit
        ];
        description = "Hakyll utilities to work with images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -113993,8 +113993,8 @@ self: {
        sha256 = "1w8wmqdfxf9w4mb9k77gak9iqxysa7mbb5phfh9a0hy30vx2qb1d";
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        description = "Integrate ogmarkup document with Hakyll";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114006,8 +114006,8 @@ self: {
        sha256 = "03s51ql10g6vjsrzwxa2jwff4wckp7vf3sg9r6hdsbh30l4720il";
        libraryHaskellDepends = [ base bytestring hakyll typed-process ];
        description = "Hakyll compiler for arbitrary external processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114023,8 +114023,8 @@ self: {
          aeson-pretty base data-default-class filepath hakyll hsass
        ];
        description = "Hakyll SASS compiler over hsass";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114036,8 +114036,8 @@ self: {
        sha256 = "1c86lzfri5s3xzh5qyw1rpbv1wag26vbxl7pbcmjl25ad380riax";
        libraryHaskellDepends = [ base containers hakyll ];
        description = "Adds series functionality to hakyll";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114055,8 +114055,8 @@ self: {
          base blaze-html containers hakyll shakespeare text
        ];
        description = "Hakyll Hamlet compiler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114078,8 +114078,8 @@ self: {
          regex-posix split tasty tasty-hunit tasty-quickcheck
        ];
        description = "A shortcode extension module for Hakyll";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114096,8 +114096,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl pandoc text ];
        description = "Use shortcut-links in markdown file for Hakyll";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114114,8 +114114,8 @@ self: {
        ];
        testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
        description = "Typescript and javascript hakyll compilers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114137,8 +114137,8 @@ self: {
          http-types mtl text time unordered-containers
        ];
        description = "A runtime environment for Haskell applications running on AWS Lambda";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114167,8 +114167,8 @@ self: {
          test-framework-hunit
        ];
        description = "A tool to generate missing import statements for Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114186,7 +114186,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Half-precision floating-point";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "halfs" = callPackage
@@ -114209,8 +114209,8 @@ self: {
          fingertree HFuse mtl QuickCheck random time unix
        ];
        description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114225,7 +114225,7 @@ self: {
        libraryHaskellDepends = [ base directory HaXml pandoc ];
        description = "Haskell Static Web Page Generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114255,8 +114255,8 @@ self: {
          time
        ];
        description = "A live recompiler";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114273,8 +114273,8 @@ self: {
          base doctest hspec matrix matrix-as-xyz parsec QuickCheck
        ];
        description = "Symmetry operations generater of Hall Symbols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114295,8 +114295,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Library implementing Halma rules";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114315,8 +114315,8 @@ self: {
          gtk halma mtl mvc pipes timeit
        ];
        description = "GTK application for playing Halma";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114341,8 +114341,8 @@ self: {
          vector
        ];
        description = "Telegram bot for playing Halma";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114356,7 +114356,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base hint process ];
        description = "looks for functions given a set of example input/outputs";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "halves" = callPackage
@@ -114368,8 +114368,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base hedgehog lens ];
        description = "Split or combine data structures to and from halves, quarters, eighths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114389,8 +114389,8 @@ self: {
          mime-types network-uri simple-tar text XenDevice
        ];
        description = "A simple, static HaLVM web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {HALVMCore = null; XenDevice = null;};
 
@@ -114417,7 +114417,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114429,7 +114429,7 @@ self: {
        sha256 = "19792k9pwpkqwqznxm00nbq22swnayz7fv60ly0wsw5zmf1g6wv8";
        libraryHaskellDepends = [ base HCodecs newtype ];
        description = "Binding to the OS level Midi services (fork of system-midi)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hamilton" = callPackage
@@ -114454,7 +114454,7 @@ self: {
          vector-sized vty
        ];
        description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hamlet" = callPackage
@@ -114466,7 +114466,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "Haml-like template files that are compile-time checked (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hampp" = callPackage
@@ -114484,8 +114484,8 @@ self: {
          preprocessor-tools
        ];
        description = "Haskell macro preprocessor";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114509,8 +114509,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114524,8 +114524,8 @@ self: {
        editedCabalFile = "1dik6zsi0x310m2x9qy64c0b4bd2gag1l6v1nsh09xqj7vlfpp5v";
        libraryHaskellDepends = [ array base deepseq hashable ];
        description = "A purely functional and persistent hash map";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114547,7 +114547,7 @@ self: {
          optparse-applicative resourcet stm-conduit unix
        ];
        description = "Intel AMT serial-over-lan (SOL) client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hamusic" = callPackage
@@ -114566,8 +114566,8 @@ self: {
        ];
        executableHaskellDepends = [ filepath ];
        description = "Library to handle abstract music";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114580,7 +114580,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base text ];
        description = "Convert Halfwidth Katakana to Fullwidth Katakana";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hanabi-dealer" = callPackage
@@ -114593,8 +114593,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers random ];
        description = "Hanabi card game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114606,7 +114606,7 @@ self: {
        sha256 = "1ldfq3y9h9wvhqd3qs99hdi0d02016s7vkmf74p6wppkrzgfs3xn";
        libraryHaskellDepends = [ base ];
        description = "This package is deprecated. It formerly contained Haskell utilities for data structures and data manipulation.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "handa-gdata" = callPackage
@@ -114635,8 +114635,8 @@ self: {
          split time unix-compat utf8-string xml
        ];
        description = "Library and command-line utility for accessing Google services and APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114656,7 +114656,7 @@ self: {
          aeson base bytestring containers scientific
        ];
        description = "Geographic and Geometric Data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "handa-opengl" = callPackage
@@ -114672,7 +114672,7 @@ self: {
          split vector-space
        ];
        description = "Utility functions for OpenGL and GLUT";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "handle-like" = callPackage
@@ -114683,8 +114683,8 @@ self: {
        sha256 = "1h3wl4pqnz53ijrw8656j1rgfj61adzvgxm0qvg74wl3hi83xkgd";
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114705,8 +114705,8 @@ self: {
          base bytestring tasty tasty-hunit tasty-th
        ];
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114730,7 +114730,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "API Client for the handwriting.io API.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hangman" = callPackage
@@ -114744,7 +114744,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl random utility-ht ];
        description = "Hangman implementation in Haskell written in two hours";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hannahci" = callPackage
@@ -114765,8 +114765,8 @@ self: {
          wai-middleware-static yaml
        ];
        description = "Simple Continuous Integration/Deployment System";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114790,8 +114790,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Network Stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114803,8 +114803,8 @@ self: {
        sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s";
        libraryHaskellDepends = [ base bytestring hans pcap ];
        description = "Driver for real ethernet devices for HaNS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114816,8 +114816,8 @@ self: {
        sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b";
        libraryHaskellDepends = [ base bytestring hans pfq ];
        description = "Driver for real ethernet devices for HaNS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {pfq = null;};
 
@@ -114849,8 +114849,8 @@ self: {
          split text transformers unix utf8-string
        ];
        description = "Korean spell checker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114869,8 +114869,8 @@ self: {
          base checkers hspec QuickCheck quickcheck-text text
        ];
        description = "Graphviz code generation with Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114901,7 +114901,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "happindicator" = callPackage
@@ -114919,8 +114919,8 @@ self: {
        libraryPkgconfigDepends = [ libappindicator-gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the appindicator library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libappindicator-gtk2;};
 
@@ -114935,8 +114935,8 @@ self: {
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        description = "Binding to the appindicator library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libappindicator-gtk3;};
 
@@ -114955,7 +114955,7 @@ self: {
        ];
        description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114978,7 +114978,7 @@ self: {
        ];
        description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\".";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -114992,8 +114992,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115007,8 +115007,8 @@ self: {
        libraryHaskellDepends = [
          base bytestring HAppS-Server hsp mtl plugins
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115025,8 +115025,8 @@ self: {
          hsp mtl network plugins RJson
        ];
        description = "Utilities for using HSP templates in HAppS applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115051,8 +115051,8 @@ self: {
          syb
        ];
        description = "A Happstack Tutorial that is its own web 2.0-type demo.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115067,8 +115067,8 @@ self: {
        libraryHaskellDepends = [ base happstack-server ];
        doHaddock = false;
        description = "The haskell application server stack + code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115087,8 +115087,8 @@ self: {
          random
        ];
        description = "A Happstack Authentication Suite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115118,8 +115118,8 @@ self: {
          web-routes-happstack web-routes-hsp web-routes-th
        ];
        description = "Happstack Authentication Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115136,7 +115136,7 @@ self: {
          mtl safecopy transformers-base
        ];
        description = "client-side session data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-contrib" = callPackage
@@ -115156,8 +115156,8 @@ self: {
          old-time syb unix
        ];
        description = "Web related tools and services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115179,8 +115179,8 @@ self: {
          syb-with-class-instances-text template-haskell text time
        ];
        description = "Happstack data manipulation libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115198,8 +115198,8 @@ self: {
          happstack-server mtl random template-haskell time xhtml
        ];
        description = "Cross-request user interactions for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115225,8 +115225,8 @@ self: {
          web-routes-mtl
        ];
        description = "A package for building Facebook applications using Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115243,7 +115243,7 @@ self: {
          utf8-string
        ];
        description = "Happstack extension for use with FastCGI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-fay" = callPackage
@@ -115258,8 +115258,8 @@ self: {
          aeson base fay happstack-fay-ajax happstack-server mtl
        ];
        description = "Support for using Fay with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115272,8 +115272,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Support for using Fay with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115294,8 +115294,8 @@ self: {
          web-routes web-routes-happstack web-routes-hsp web-routes-th
        ];
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115307,8 +115307,8 @@ self: {
        sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
        libraryHaskellDepends = [ base happstack-server shakespeare text ];
        description = "Support for Hamlet HTML templates in Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115325,8 +115325,8 @@ self: {
          heist mtl text
        ];
        description = "Support for using Heist templates in Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115350,8 +115350,8 @@ self: {
          text utf8-string
        ];
        description = "Convenience functions for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115368,7 +115368,7 @@ self: {
          utf8-string
        ];
        description = "Support for using HSP templates in Happstack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-hstringtemplate" = callPackage
@@ -115383,8 +115383,8 @@ self: {
          base bytestring happstack-server hslogger HStringTemplate mtl
        ];
        description = "Support for using HStringTemplate in Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115403,8 +115403,8 @@ self: {
          syb-with-class template-haskell
        ];
        description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115422,8 +115422,8 @@ self: {
          jmacro text utf8-string wl-pprint-text
        ];
        description = "Support for using JMacro with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115437,8 +115437,8 @@ self: {
          base bytestring happstack-server mtl text
        ];
        description = "Happstack minus the useless stuff";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115454,8 +115454,8 @@ self: {
          base happstack-server monad-peel mtl transformers
        ];
        description = "monad-peel instances for Happstack types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115471,8 +115471,8 @@ self: {
          base happstack-server mtl plugins-auto template-haskell th-lift
        ];
        description = "The haskell application server stack + reload";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115501,7 +115501,7 @@ self: {
          base bytestring containers HUnit parsec zlib
        ];
        description = "Web related tools and services";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -115519,7 +115519,7 @@ self: {
        ];
        librarySystemDepends = [ openssl ];
        description = "extend happstack-server with https:// support (TLS/SSL)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "happstack-server-tls-cryptonite" = callPackage
@@ -115536,8 +115536,8 @@ self: {
          happstack-server hslogger network sendfile time tls unix
        ];
        description = "Extend happstack-server with native HTTPS support (TLS/SSL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115558,8 +115558,8 @@ self: {
          stm syb template-haskell unix
        ];
        description = "Event-based distributed state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115575,7 +115575,7 @@ self: {
          base containers happstack-server list-tries transformers
        ];
        description = "Support for static URL routing with overlap detection for Happstack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happstack-util" = callPackage
@@ -115598,8 +115598,8 @@ self: {
          template-haskell time unix unix-compat
        ];
        description = "Web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115621,8 +115621,8 @@ self: {
          web-routes-happstack web-routes-th
        ];
        description = "Utilities for using YUI3 with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115642,8 +115642,8 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        testHaskellDepends = [ base process ];
        description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "happy" = callPackage
@@ -115658,7 +115658,7 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        testHaskellDepends = [ base process ];
        description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "happy-dot" = callPackage
@@ -115676,7 +115676,7 @@ self: {
          array base clock language-dot transformers xml
        ];
        description = "Parser for dot made with happy";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "happy-hour" = callPackage
@@ -115687,8 +115687,8 @@ self: {
        sha256 = "1pj61x1ynspk3avfsy9735blzggz78r4b35gin1bza619gp9yzsb";
        libraryHaskellDepends = [ base Chart Chart-diagrams ];
        description = "Generate simple okay-looking bar plots without much effort";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115705,7 +115705,7 @@ self: {
        ];
        libraryToolDepends = [ happy ];
        description = "Quasi-quoter for Happy parsers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "happybara" = callPackage
@@ -115721,8 +115721,8 @@ self: {
          time transformers transformers-base
        ];
        description = "Acceptance test framework for web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115742,8 +115742,8 @@ self: {
          process text time transformers transformers-base vector word8
        ];
        description = "WebKit Happybara driver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115755,8 +115755,8 @@ self: {
        sha256 = "0vh9ig9mvg12qgysk7gbqwiib3m2ciwi10asb1i0x25xjp585shi";
        libraryHaskellDepends = [ base directory filepath process ];
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115775,8 +115775,8 @@ self: {
          base hspec QuickCheck quickcheck-instances
        ];
        description = "Capstone bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) capstone;};
 
@@ -115792,8 +115792,8 @@ self: {
          base containers parsec split tagsoup text transformers
        ];
        description = "jQuery for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115815,8 +115815,8 @@ self: {
          QuickCheck random template-haskell vector
        ];
        description = "A Haskell implementation of the Quil instruction set for quantum computing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115831,7 +115831,7 @@ self: {
          aeson base bytestring directory filepath text
        ];
        description = "HAR spec in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "harchive" = callPackage
@@ -115850,7 +115850,7 @@ self: {
        executableSystemDepends = [ openssl sqlite ];
        description = "Networked content addressed backup and restore software";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
@@ -115868,8 +115868,8 @@ self: {
          mtl operational-alacarte pretty syntactic
        ];
        description = "Deep embedding of hardware descriptions with code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115890,8 +115890,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Haskell program configuration using higher kinded data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115911,7 +115911,7 @@ self: {
        ];
        description = "A Gentoo package query tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115937,8 +115937,8 @@ self: {
          base containers derive hlint hslogger hspec HUnit QuickCheck
        ];
        description = "A web service specification compiler that generates implementation and tests";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115955,8 +115955,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) groonga;};
 
@@ -115975,8 +115975,8 @@ self: {
          scotty text time transformers wai-extra
        ];
        description = "Yet another Groonga http server";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -115988,7 +115988,7 @@ self: {
        sha256 = "0n30bvpfijaji8p2lk3vc0dfcgd2sclwakvbi31jma4z1i03k89q";
        libraryHaskellDepends = [ base ];
        description = "HaRP allows pattern-matching with regular expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "harpy" = callPackage
@@ -116004,8 +116004,8 @@ self: {
          template-haskell
        ];
        description = "Runtime code generation for x86 machine code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116026,8 +116026,8 @@ self: {
          aeson base bytestring file-embed hspec time
        ];
        description = "Bindings for Harvest API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116041,8 +116041,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Entity based records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116054,8 +116054,8 @@ self: {
        sha256 = "0yyrfd8mgxwyfgwcg61q7yj2cq2zj6zlk1l340y4vzj71r53qgc4";
        libraryHaskellDepends = [ base has template-haskell ];
        description = "Template Haskell function for Has records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116076,8 +116076,8 @@ self: {
          base bytestring containers hspec QuickCheck text
        ];
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116103,8 +116103,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Extras for hasbolt library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116146,7 +116146,7 @@ self: {
          base bytestring conduit cryptohash hex path
        ];
        description = "Decompress SAPCAR archives";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "hascard" = callPackage
@@ -116181,8 +116181,8 @@ self: {
          tasty-quickcheck text vector vty word-wrap
        ];
        description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116204,8 +116204,8 @@ self: {
          network safe-exceptions stm template-haskell uuid
        ];
        description = "Cassandra driver for haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116225,7 +116225,7 @@ self: {
        ];
        description = "Hascat Web Server";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hascat-lib" = callPackage
@@ -116243,7 +116243,7 @@ self: {
        ];
        description = "Hascat Package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hascat-setup" = callPackage
@@ -116265,7 +116265,7 @@ self: {
        doHaddock = false;
        description = "Hascat Installation helper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hascat-system" = callPackage
@@ -116282,7 +116282,7 @@ self: {
        ];
        description = "Hascat System Package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hash" = callPackage
@@ -116300,8 +116300,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Hashing tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116317,7 +116317,7 @@ self: {
          base base16-bytestring blake2 bytestring directory filepath
        ];
        description = "Hash as cache";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "hash-tree" = callPackage
@@ -116336,7 +116336,7 @@ self: {
          memory QuickCheck
        ];
        description = "Merkle Hash Tree";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashable" = callPackage
@@ -116363,7 +116363,7 @@ self: {
          base bytestring criterion ghc-prim integer-gmp siphash text
        ];
        description = "A class for types that can be converted to a hash value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashable-accelerate" = callPackage
@@ -116374,8 +116374,8 @@ self: {
        sha256 = "04cfwd1vyz4xm87ah3x1avs2yzqi6ygcd3sl70v50g492dfl6738";
        libraryHaskellDepends = [ accelerate base template-haskell ];
        description = "A class for types which can be converted into a hash value";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hashable-extras" = callPackage
@@ -116394,8 +116394,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Higher-rank Hashable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116414,8 +116414,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
        description = "Automatically generates Hashable instances with GHC.Generics.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116429,8 +116429,8 @@ self: {
        editedCabalFile = "00ngp3hqp3i0xbx00vdgv92pq0n1q5dffjfjni5bnb3rzlafsvvl";
        libraryHaskellDepends = [ base hashable sorted-list time ];
        description = "Provides instances missing from Hashable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116444,7 +116444,7 @@ self: {
        editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk";
        libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashabler" = callPackage
@@ -116462,8 +116462,8 @@ self: {
          template-haskell text
        ];
        description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116482,8 +116482,8 @@ self: {
          extensible-exceptions filepath mmap mtl zlib
        ];
        description = "Hashed file storage support code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116497,8 +116497,8 @@ self: {
        editedCabalFile = "16lgwd9wsjbqjbibg1qmgbb24r6x2rcsihc205cddjs3qxk8mkdc";
        libraryHaskellDepends = [ base containers simple-money ];
        description = "A library for working with HashFlare.io contracts and hashrates";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116511,7 +116511,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers split ];
        testHaskellDepends = [ base bytestring containers split ];
        description = "Hashids generates short, unique, non-sequential ids from numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hashing" = callPackage
@@ -116534,7 +116534,7 @@ self: {
          array base bytestring cryptonite mtl QuickCheck template-haskell
        ];
        description = "A pure haskell library implements several hash algorithms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hashmap" = callPackage
@@ -116545,7 +116545,7 @@ self: {
        sha256 = "0ma7svf9nanlfbj9nkk6bzk4m98i7xd71xrdc3a5dmmws5yba1nw";
        libraryHaskellDepends = [ base containers deepseq hashable ];
        description = "Persistent containers Map and Set based on hashing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashmap-throw" = callPackage
@@ -116556,7 +116556,7 @@ self: {
        sha256 = "0dibdmpb6nyhn37xfdw8wgam4a2w8b3hl04ivg08d1ybq4a4m1k5";
        libraryHaskellDepends = [ base exceptions hashable hashmap ];
        description = "Throw behaviour for hashmap lookup";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hashrename" = callPackage
@@ -116572,7 +116572,7 @@ self: {
          base bytestring cryptohash directory filepath
        ];
        description = "Rename every file in a directory with his SHA1 hash";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hashring" = callPackage
@@ -116588,8 +116588,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Efficient consistent hashing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116608,7 +116608,7 @@ self: {
          unordered-containers
        ];
        description = "Benchmark of hash table implementations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashtables" = callPackage
@@ -116629,7 +116629,7 @@ self: {
          vector
        ];
        description = "Mutable hash tables in the ST monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hashtables-plus" = callPackage
@@ -116650,8 +116650,8 @@ self: {
          transformers
        ];
        description = "Extensions for a \"hashtables\" library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116663,8 +116663,8 @@ self: {
        sha256 = "03wn142r0sh7adfghjqwb2mgq4rgkqs8nq2rx2jq717dr2xp987n";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Process-Based Discrete Event Simulation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116682,8 +116682,8 @@ self: {
          base constraints ghc-prim reflection tagged transformers void
        ];
        description = "Categories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116702,8 +116702,8 @@ self: {
          regex-compat xhtml
        ];
        description = "Generate homepages for cabal packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116722,7 +116722,7 @@ self: {
        ];
        description = "Utility to generate bindings for BlackBerry Cascades";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskakafka" = callPackage
@@ -116746,7 +116746,7 @@ self: {
          base bytestring containers either-unwrap hspec regex-posix
        ];
        description = "Kafka bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) rdkafka;};
 
   "haskanoid" = callPackage
@@ -116766,7 +116766,7 @@ self: {
        ];
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskarrow" = callPackage
@@ -116783,8 +116783,8 @@ self: {
          base cmdargs containers cpphs directory her-lexer split
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116805,8 +116805,8 @@ self: {
          http-types monads-tf stm text wai warp
        ];
        description = "Easily-extensible chatbot for Slack messaging service";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116831,8 +116831,8 @@ self: {
          transformers unix-compat
        ];
        description = "Computes and audits file hashes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116851,7 +116851,7 @@ self: {
          process-extras text
        ];
        description = "Generate tags file for Haskell project and its nearest deps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskeem" = callPackage
@@ -116870,7 +116870,7 @@ self: {
        ];
        description = "A small scheme interpreter";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116895,8 +116895,8 @@ self: {
          base bytestring containers HUnit process text unix
        ];
        description = "A command-line interface for user input, written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskeline-class" = callPackage
@@ -116907,8 +116907,8 @@ self: {
        sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
        libraryHaskellDepends = [ base haskeline mtl ];
        description = "Class interface for working with Haskeline";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116919,7 +116919,7 @@ self: {
        version = "0.4.0.0";
        sha256 = "0bbjbrhxdms8wbv1dh129l2pkqw5rfva26121ayfx5vr8h7aa7zf";
        libraryHaskellDepends = [ ansi-terminal base haskeline mtl safe ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskelisp" = callPackage
@@ -116932,8 +116932,8 @@ self: {
        editedCabalFile = "0h900mw5kzd9fvywpbhfd9acnfwp3qk7nfi9yr9ibamjb8s87cm1";
        libraryHaskellDepends = [ base containers mtl protolude text ];
        description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116959,8 +116959,8 @@ self: {
          base binary bytestring foundation lens text
        ];
        description = "Haskell Application BlockChain Interface (ABCI) Server Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -116983,8 +116983,8 @@ self: {
          xml2json
        ];
        description = "haskell client of aliyun service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117017,8 +117017,8 @@ self: {
          transformers
        ];
        description = "Transform text from the command-line using Haskell expressions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117031,7 +117031,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring QuickCheck random ];
        description = "A bcrypt implementation for haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-bitmex-client" = callPackage
@@ -117057,8 +117057,8 @@ self: {
          http-client-tls katip mtl text time websockets
        ];
        description = "Complete BitMEX Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117086,8 +117086,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Auto-generated bitmex API Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117107,8 +117107,8 @@ self: {
          base bytestring mtl QuickCheck tasty tasty-quickcheck tasty-th
        ];
        description = "BrainFuck interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117139,8 +117139,8 @@ self: {
        ];
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117161,8 +117161,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory process ];
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117174,8 +117174,8 @@ self: {
        sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7";
        libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117195,8 +117195,8 @@ self: {
          base bimap boolean-list bytestring containers
        ];
        description = "compress files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117212,8 +117212,8 @@ self: {
          base containers lens pretty-show protolude split text
        ];
        description = "Core Types for NLP";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117225,8 +117225,8 @@ self: {
        sha256 = "1r0vhaxcsszrcqnw70gz8xpfrqddmxf9kpka63gix1bjic4alzjn";
        libraryHaskellDepends = [ base deepseq ];
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117241,7 +117241,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base unix ];
        description = "Haskell implementation of the DAP interface data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-debug-adapter" = callPackage
@@ -117276,8 +117276,8 @@ self: {
          process resourcet safe-exceptions text
        ];
        description = "Haskell Debug Adapter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117294,8 +117294,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Client library for the Disque datastore";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117318,8 +117318,8 @@ self: {
        executableHaskellDepends = [ base ghc text ];
        testHaskellDepends = [ base ];
        description = "A program to find and display the docs and type of a name";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117332,8 +117332,8 @@ self: {
        libraryHaskellDepends = [ base eigen vector ];
        testHaskellDepends = [ base eigen vector ];
        description = "Some utility functions for haskell-eigen library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117346,7 +117346,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base syb template-haskell ];
        description = "Simple parser parser from Haskell to TemplateHaskell expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-fake-user-agent" = callPackage
@@ -117359,7 +117359,7 @@ self: {
        editedCabalFile = "03pqk1bc2j5xfchwmccbyq2sa57fy7w3ky6apa0wjr4zwni17pb5";
        libraryHaskellDepends = [ base bytestring lens tagsoup wreq ];
        description = "Simple library for retrieving current user agent strings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "haskell-formatter" = callPackage
@@ -117386,8 +117386,8 @@ self: {
          QuickCheck tasty tasty-hunit
        ];
        description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117414,8 +117414,8 @@ self: {
          system-filepath text transformers transformers-base unix
        ];
        description = "A Haskell ftp server with configurable backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117432,8 +117432,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Typesafe generation of haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117455,7 +117455,7 @@ self: {
          base filepath haskell-src-exts old-locale time uniplate
        ];
        description = "GetText runtime library implementation in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-gi" = callPackage
@@ -117477,7 +117477,7 @@ self: {
        libraryPkgconfigDepends = [ glib gobject-introspection ];
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
   "haskell-gi-base" = callPackage
@@ -117489,7 +117489,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
   "haskell-gi-overloading" = callPackage
@@ -117500,7 +117500,7 @@ self: {
        sha256 = "0ak8f79ia9zlk94zr02sq8bqi5n5pd8ria8w1dj3adcdvpw9gmry";
        doHaddock = false;
        description = "Overloading support for haskell-gi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-go-checkers" = callPackage
@@ -117513,8 +117513,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers gloss ];
        description = "Go and Checkers game in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117533,7 +117533,7 @@ self: {
          tagsoup text wreq
        ];
        description = "Simple library for accessing Google Trends";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "haskell-holes-th" = callPackage
@@ -117545,8 +117545,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base template-haskell transformers ];
        description = "Infer haskell code by given type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117569,8 +117569,8 @@ self: {
          tasty-hunit
        ];
        description = "Bindings to the igraph C library (v0.8.0).";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117589,7 +117589,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "create haskell import graph for graphviz";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-in-space" = callPackage
@@ -117602,8 +117602,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HGL random ];
        description = "'Asteroids' arcade games";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117623,8 +117623,8 @@ self: {
          servant-client split text unordered-containers vector wai
        ];
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117636,7 +117636,7 @@ self: {
        sha256 = "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii";
        libraryHaskellDepends = [ base ];
        description = "A fully compliant Haskell 98 lexer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-lsp" = callPackage
@@ -117665,7 +117665,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-lsp_0_24_0_0" = callPackage
@@ -117694,8 +117694,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskell-lsp-client" = callPackage
@@ -117715,8 +117715,8 @@ self: {
          base directory haskell-lsp lens process text unix
        ];
        description = "A haskell package to build your own Language Server client";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117734,7 +117734,7 @@ self: {
          lens network-uri scientific text unordered-containers
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-lsp-types_0_24_0_0" = callPackage
@@ -117751,8 +117751,8 @@ self: {
          lens network-uri scientific text unordered-containers
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haskell-menu" = callPackage
@@ -117763,7 +117763,7 @@ self: {
        sha256 = "18s8g82v3h4b7maz6di43vfym6d3w16j4rbh5sjh4ps26yjnnfy4";
        libraryHaskellDepends = [ base containers ];
        description = "A simple menu system for Haskell programs";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "haskell-ml" = callPackage
@@ -117782,8 +117782,8 @@ self: {
        executableHaskellDepends = [ base hmatrix random-shuffle ];
        testHaskellDepends = [ base MonadRandom ];
        description = "Machine learning in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117796,7 +117796,7 @@ self: {
        libraryHaskellDepends = [ array base bytestring cereal ];
        testHaskellDepends = [ array base bytestring cereal hspec ];
        description = "A cereal-based parser for the Modbus protocol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-mpfr" = callPackage
@@ -117808,7 +117808,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117828,7 +117828,7 @@ self: {
        librarySystemDepends = [ open-pal open-rte openmpi ];
        libraryToolDepends = [ c2hs ];
        description = "Distributed parallel programming in Haskell using MPI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
@@ -117851,7 +117851,7 @@ self: {
          tasty tasty-golden traverse-with-class
        ];
        description = "Name resolution library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -117882,8 +117882,8 @@ self: {
          unordered-containers vector
        ];
        description = "A Haskell neo4j client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117898,8 +117898,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "OpenFlow protocol in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117921,8 +117921,8 @@ self: {
          system-fileio system-filepath text turtle
        ];
        description = "Manage nix overrides for haskell packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117941,8 +117941,8 @@ self: {
          transformers transformers-compat
        ];
        description = "Haskell suite library for package management and integration with Cabal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117962,8 +117962,8 @@ self: {
          old-locale poppler template-haskell time zlib
        ];
        description = "Tool for presenting PDF-based presentations";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -117992,8 +117992,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "A test system for the Haskell Platform environment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118015,8 +118015,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A terminal music player based on afplay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118034,7 +118034,7 @@ self: {
        ];
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118050,8 +118050,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec inline-c text ];
        testPkgconfigDepends = [ libpostal ];
        description = "Haskell binding for the libpostal library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libpostal = null;};
 
@@ -118075,7 +118075,7 @@ self: {
          unordered-containers vector
        ];
        description = "A haskell library for PostGIS geometry types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-proxy-list" = callPackage
@@ -118093,7 +118093,7 @@ self: {
          text wreq
        ];
        description = "Simple library for retrieving proxy servers info from https://proxy-list.org";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "haskell-qrencode" = callPackage
@@ -118105,7 +118105,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ qrencode ];
        description = "Haskell bindings for libqrencode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) qrencode;};
 
   "haskell-read-editor" = callPackage
@@ -118117,8 +118117,8 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        testHaskellDepends = [ base directory hspec process ];
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118135,8 +118135,8 @@ self: {
          transformers
        ];
        description = "Reflect Haskell types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118148,8 +118148,8 @@ self: {
        sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6";
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118164,7 +118164,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Let the Haskell logo talk to your users!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-snake" = callPackage
@@ -118184,7 +118184,7 @@ self: {
          base containers lens linear mtl random sdl2 sdl2-ttf text vector
        ];
        description = "Snake game implemetation in Haskell using SDL2";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "haskell-spacegoo" = callPackage
@@ -118200,8 +118200,8 @@ self: {
          text vector vector-space
        ];
        description = "Client API for Rocket Scissor Spacegoo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118216,8 +118216,8 @@ self: {
        libraryHaskellDepends = [ array base pretty syb ];
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118238,7 +118238,7 @@ self: {
        ];
        doCheck = false;
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-src-exts-observe" = callPackage
@@ -118251,8 +118251,8 @@ self: {
        editedCabalFile = "1n4f4yylk09g95040g6pbcygzp95yadihv0sxr4sj87j0d4xa6fc";
        libraryHaskellDepends = [ base haskell-src-exts Hoed ];
        description = "Observable orphan instances for haskell-src-exts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118266,8 +118266,8 @@ self: {
          base haskell-src-exts lens template-haskell
        ];
        description = "Prisms with newtype wrappers for haskell-src-exts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118284,8 +118284,8 @@ self: {
        ];
        testHaskellDepends = [ base haskell-src-exts hspec ];
        description = "A quasiquoter for haskell-src-exts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118299,8 +118299,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty print haskell code with comments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118312,7 +118312,7 @@ self: {
        sha256 = "1jfdjaikmjx9sfairp4jjn0vzhw5vhwrg43y082ddpc1bgx2jw7m";
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "A simplified view on the haskell-src-exts AST";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "haskell-src-exts-util" = callPackage
@@ -118328,7 +118328,7 @@ self: {
          transformers uniplate
        ];
        description = "Helper functions for working with haskell-src-exts trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-src-match" = callPackage
@@ -118348,8 +118348,8 @@ self: {
          base filepath hspec interpolatedstring-perl6 template-haskell text
        ];
        description = "Testing code generators piece by piece";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118371,7 +118371,7 @@ self: {
          template-haskell
        ];
        description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -118387,8 +118387,8 @@ self: {
          template-haskell
        ];
        description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118407,8 +118407,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec typed-process ];
        testToolDepends = [ hspec-discover ];
        description = "haskell-stack-trace-plugin";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118421,7 +118421,7 @@ self: {
        libraryHaskellDepends = [ base lens semigroups text time ];
        testHaskellDepends = [ base doctest ];
        description = "Some useful wrappers and functions for building time ranges";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-to-elm" = callPackage
@@ -118443,7 +118443,7 @@ self: {
          unordered-containers
        ];
        description = "Generate Elm types and JSON encoders and decoders from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell-token-utils" = callPackage
@@ -118466,8 +118466,8 @@ self: {
          mtl pretty QuickCheck rosezipper semigroups syb uniplate
        ];
        description = "Utilities to tie up tokens to an AST";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118484,8 +118484,8 @@ self: {
          uniplate
        ];
        description = "Haskell AST for efficient tooling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118503,8 +118503,8 @@ self: {
          safe split template-haskell uniplate
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118521,8 +118521,8 @@ self: {
          references
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118538,8 +118538,8 @@ self: {
          base containers ghc haskell-tools-ast mtl references uniplate
        ];
        description = "Conversions on Haskell-Tools AST to prepare for refactorings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118557,8 +118557,8 @@ self: {
          references safe split template-haskell transformers uniplate
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118590,8 +118590,8 @@ self: {
          template-haskell time transformers uniplate
        ];
        description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118627,8 +118627,8 @@ self: {
          time
        ];
        description = "Command-line frontend for Haskell-tools Refact";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118662,8 +118662,8 @@ self: {
          tasty-hunit
        ];
        description = "Background process for Haskell-tools that editors can connect to";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118688,8 +118688,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Debugging Tools for Haskell-tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118720,8 +118720,8 @@ self: {
          tasty-hunit websockets
        ];
        description = "A web-based demo for Haskell-tools Refactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118752,8 +118752,8 @@ self: {
          template-haskell time transformers uniplate
        ];
        description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118770,8 +118770,8 @@ self: {
          uniplate
        ];
        description = "Pretty printing of Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118801,8 +118801,8 @@ self: {
          transformers uniplate
        ];
        description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118824,8 +118824,8 @@ self: {
          tasty tasty-hunit
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118859,8 +118859,8 @@ self: {
          test-framework-quickcheck2 time x509
        ];
        description = "A Haskell Tor Node";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118874,8 +118874,8 @@ self: {
          base containers haskell-src-exts pretty
        ];
        description = "A type checker for Haskell/haskell-src-exts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118887,8 +118887,8 @@ self: {
        sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38";
        libraryHaskellDepends = [ base process ];
        description = "Simple TypeScript API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118900,8 +118900,8 @@ self: {
        sha256 = "1pqh1v0klpi8iq882l5gk0fsf87kabq6rw1wjwkiq6fvw8cc1l97";
        libraryHaskellDepends = [ base binary bytestring network ];
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118944,7 +118944,7 @@ self: {
        executableHaskellDepends = [ base hspec text ];
        executableToolDepends = [ hspec-discover ];
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskell2010" = callPackage
@@ -118955,8 +118955,8 @@ self: {
        sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m";
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "Compatibility with Haskell 2010";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118968,8 +118968,8 @@ self: {
        sha256 = "02amj6wza3aaw3i84yjh6zwn7v5g3v1d748ajc7gv6cpd4904pzq";
        libraryHaskellDepends = [ array base ];
        description = "Haskell 2020[draft] Standard Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -118985,8 +118985,8 @@ self: {
          array base directory old-locale old-time process time
        ];
        description = "Compatibility with Haskell 98";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119002,8 +119002,8 @@ self: {
          array base directory old-locale old-time process time
        ];
        description = "Compatibility with Haskell 98";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119019,8 +119019,8 @@ self: {
          base containers directory mtl old-locale old-time pretty time
        ];
        description = "A library of combinators for generating and executing SQL statements";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119032,8 +119032,8 @@ self: {
        sha256 = "1l9ifff33xbgdr6fahnzz00nb7va2r0i3pncjd1j8bbnyya1w2kl";
        libraryHaskellDepends = [ base containers haskelldb HDBC ];
        description = "Bracketed HDBC session for HaskellDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119049,8 +119049,8 @@ self: {
          base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-mtl mtl
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119067,8 +119067,8 @@ self: {
          MonadCatchIO-transformers transformers
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119085,8 +119085,8 @@ self: {
          MonadCatchIO-transformers transformers
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119103,8 +119103,8 @@ self: {
          monad-control transformers-base
        ];
        description = "Bracketed HaskellDB HDBC session using lifted-base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119119,8 +119119,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ];
        executableHaskellDepends = [ haskelldb ];
        description = "HaskellDB support for the dynamically loaded drivers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119138,8 +119138,8 @@ self: {
          base containers directory haskelldb mtl old-time
        ];
        description = "An experimental HaskellDB back-end in pure Haskell (no SQL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119155,8 +119155,8 @@ self: {
          base containers convertible haskelldb HDBC mtl old-time
        ];
        description = "HaskellDB support for HDBC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119174,8 +119174,8 @@ self: {
          base haskelldb haskelldb-hdbc HDBC HDBC-mysql mtl
        ];
        description = "HaskellDB support for the HDBC MySQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119193,8 +119193,8 @@ self: {
          base haskelldb haskelldb-hdbc HDBC HDBC-odbc mtl
        ];
        description = "HaskellDB support for the HDBC ODBC driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119213,8 +119213,8 @@ self: {
        ];
        executableSystemDepends = [ postgresql ];
        description = "HaskellDB support for the HDBC PostgreSQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) postgresql;};
 
@@ -119232,8 +119232,8 @@ self: {
          base haskelldb haskelldb-hdbc HDBC HDBC-sqlite3 mtl
        ];
        description = "HaskellDB support for the HDBC SQLite driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119245,8 +119245,8 @@ self: {
        sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0";
        libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        description = "HaskellDB support for HSQL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119264,8 +119264,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-mysql mtl
        ];
        description = "HaskellDB support for the HSQL MySQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119283,8 +119283,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-odbc mtl
        ];
        description = "HaskellDB support for the HSQL ODBC driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119302,8 +119302,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-oracle mtl
        ];
        description = "HaskellDB support for the HSQL Oracle driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hsql-oracle = null;};
 
@@ -119321,8 +119321,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-postgresql mtl
        ];
        description = "HaskellDB support for the HSQL PostgreSQL driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119340,8 +119340,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-sqlite mtl
        ];
        description = "HaskellDB support for the HSQL SQLite driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hsql-sqlite = null;};
 
@@ -119359,8 +119359,8 @@ self: {
          base haskelldb haskelldb-hsql hsql hsql-sqlite3 mtl
        ];
        description = "HaskellDB support for the HSQL SQLite3 driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119372,8 +119372,8 @@ self: {
        sha256 = "12whvz0qy9lqk1frfl5px9lhr1nwy519vj2z9c3g8nqjzscwzayb";
        libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        description = "Template Haskell utilities for HaskellDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119384,8 +119384,8 @@ self: {
        version = "1.0.0";
        sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy";
        description = "HaskellDB support for WXHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119401,8 +119401,8 @@ self: {
          base containers haskell-src-exts mtl template-haskell
        ];
        description = "For parsing Haskell-ish languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119426,8 +119426,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A scrabble library capturing the core game logic of scrabble";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119445,8 +119445,8 @@ self: {
          base cryptohash directory either filepath mtl process text
        ];
        description = "Command line tool for running Haskell scripts with a hashbang";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119479,7 +119479,7 @@ self: {
          vector
        ];
        description = "Elm to Haskell translation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskelzinc" = callPackage
@@ -119495,8 +119495,8 @@ self: {
          base containers directory filepath parsec pretty process
        ];
        description = "CP in Haskell through MiniZinc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119511,8 +119511,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Compiler from I- to S-Expressions for the Scheme Programming Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119540,8 +119540,8 @@ self: {
          vector
        ];
        description = "A transactional, ACID compliant, embeddable key-value store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119565,7 +119565,7 @@ self: {
          transformers vector
        ];
        description = "B+-tree implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskey-mtl" = callPackage
@@ -119585,8 +119585,8 @@ self: {
          transformers
        ];
        description = "A monad transformer supporting Haskey transactions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119598,8 +119598,8 @@ self: {
        sha256 = "061dhk7d9d8mnb1rs7077q383sqlby8s31ips8jjadkkhyxi5lvz";
        libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        description = "Haskell game library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119616,8 +119616,8 @@ self: {
          text time unordered-containers
        ];
        description = "Haskell bindings to refheap";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119637,8 +119637,8 @@ self: {
          th-lift unordered-containers
        ];
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119659,7 +119659,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Haskell Evaluation inside of LaTeX code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskmon" = callPackage
@@ -119675,8 +119675,8 @@ self: {
          vector
        ];
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119702,8 +119702,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Implementation of the Bitcoin protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119721,8 +119721,8 @@ self: {
          mtl network-bitcoin text transformers transformers-base
        ];
        description = "An adapter for haskoin to network-bitcoin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119754,8 +119754,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119778,8 +119778,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Implementation of Bitcoin cryptographic primitives";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119811,8 +119811,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "P2P library for Bitcoin and Bitcoin Cash";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119835,8 +119835,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Implementation of the Bitcoin network protocol messages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119861,8 +119861,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Implementation of Bitcoin script parsing and evaluation";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119908,8 +119908,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119935,8 +119935,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Data for Haskoin Store";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -119959,8 +119959,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Utility functions for the Network.Haskoin project";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120003,8 +120003,8 @@ self: {
          unordered-containers
        ];
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120023,7 +120023,7 @@ self: {
        ];
        description = "Web Application Abstraction";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120040,7 +120040,7 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120059,7 +120059,7 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120085,7 +120085,7 @@ self: {
        ];
        description = "The Haskore Computer Music System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120104,7 +120104,7 @@ self: {
        ];
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120127,7 +120127,7 @@ self: {
        ];
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120148,7 +120148,7 @@ self: {
        ];
        description = "Music rendering coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120160,7 +120160,7 @@ self: {
        sha256 = "1aq8lwyj4whz4llkwgx7n44rnrhk6ykyi8cpb0cjsabk3h29mm0b";
        libraryHaskellDepends = [ base ];
        description = "The February 2000 version of Haskore";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haskseg" = callPackage
@@ -120185,7 +120185,7 @@ self: {
          random-shuffle text vector zlib
        ];
        description = "Simple unsupervised segmentation model";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktags" = callPackage
@@ -120213,7 +120213,7 @@ self: {
          utf8-string
        ];
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch" = callPackage
@@ -120242,8 +120242,8 @@ self: {
        ];
        doHaddock = false;
        description = "Torch for tensors and neural networks in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120273,8 +120273,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Code generation tools for Hasktorch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120291,7 +120291,7 @@ self: {
          base hasktorch-types-th hspec QuickCheck text
        ];
        description = "Testing library for Hasktorch's FFI bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch-ffi-th" = callPackage
@@ -120309,8 +120309,8 @@ self: {
          base hasktorch-ffi-tests hasktorch-types-th hspec QuickCheck text
        ];
        description = "Bindings to Torch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ATen = null;};
 
@@ -120333,8 +120333,8 @@ self: {
          hasktorch-types-thc hspec QuickCheck text
        ];
        description = "Bindings to Cutorch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ATen = null;};
 
@@ -120363,8 +120363,8 @@ self: {
        ];
        doHaddock = false;
        description = "Core Hasktorch abstractions wrapping FFI bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120390,8 +120390,8 @@ self: {
        ];
        doHaddock = false;
        description = "Backpack signatures for Tensor operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120407,8 +120407,8 @@ self: {
          base hasktorch-signatures-types hasktorch-types-th
        ];
        description = "Functions to partially satisfy tensor signatures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120425,8 +120425,8 @@ self: {
        ];
        doHaddock = false;
        description = "Signatures for support tensors in hasktorch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120441,7 +120441,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        doHaddock = false;
        description = "Core types for Hasktorch backpack signatures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch-types-th" = callPackage
@@ -120455,7 +120455,7 @@ self: {
        libraryHaskellDepends = [ base inline-c ];
        libraryToolDepends = [ c2hs ];
        description = "C-types for Torch";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch-types-thc" = callPackage
@@ -120467,7 +120467,7 @@ self: {
        libraryHaskellDepends = [ base hasktorch-types-th inline-c ];
        libraryToolDepends = [ c2hs ];
        description = "C-types for Cutorch";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasktorch-zoo" = callPackage
@@ -120487,8 +120487,8 @@ self: {
          vector
        ];
        description = "Neural architectures in hasktorch";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120513,8 +120513,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Haskus binary format manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120534,8 +120534,8 @@ self: {
          optparse-applicative optparse-simple process temporary text yaml
        ];
        description = "Haskus system build tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120558,8 +120558,8 @@ self: {
          base containers doctest tasty tasty-quickcheck
        ];
        description = "Haskus utility modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120576,8 +120576,8 @@ self: {
          haskus-utils-data template-haskell text
        ];
        description = "Compatibility modules with other external packages (ByteString, etc.)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120595,8 +120595,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Haskus data utility modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120611,8 +120611,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Haskus types utility modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120635,8 +120635,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
        description = "Variant and EADT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120653,8 +120653,8 @@ self: {
          haskus-utils-compat lucid text
        ];
        description = "Haskus web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120686,8 +120686,8 @@ self: {
          persistent-template split tagsoup text time utf8-string
        ];
        description = "HTTP server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120702,8 +120702,8 @@ self: {
        libraryHaskellDepends = [ base mtl old-time wtk ];
        executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120722,8 +120722,8 @@ self: {
          wtk-gtk
        ];
        description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120754,7 +120754,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion directory text ];
        description = "CSS Minifier";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasparql-client" = callPackage
@@ -120765,8 +120765,8 @@ self: {
        sha256 = "1ln0kdm40y6l8sncrjl0mj9bpd30ffg3msaxyd6fq520ypyws9pm";
        libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        description = "This package enables to write SPARQL queries to remote endpoints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120779,7 +120779,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ aspell ];
        description = "Haskell bindings to aspell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) aspell;};
 
   "hasql" = callPackage
@@ -120807,7 +120807,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "An efficient PostgreSQL driver with a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-backend" = callPackage
@@ -120823,8 +120823,8 @@ self: {
          vector
        ];
        description = "API for backends of \"hasql\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120847,8 +120847,8 @@ self: {
          vector
        ];
        description = "Encodable and Decodable classes for hasql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120871,8 +120871,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "A declarative abstraction over PostgreSQL Cursor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120890,8 +120890,8 @@ self: {
          contravariant-extras hasql hasql-transaction transformers
        ];
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120912,8 +120912,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Toolkit for constructing Hasql statements dynamically";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120932,8 +120932,8 @@ self: {
          vector
        ];
        description = "Generic encoder and decoder deriving for Hasql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -120950,7 +120950,7 @@ self: {
          time uuid vector
        ];
        description = "Implicit definitions for Hasql, such as default codecs for standard types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-migration" = callPackage
@@ -120970,7 +120970,7 @@ self: {
          base bytestring hasql hasql-transaction hspec transformers
        ];
        description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasql-notifications" = callPackage
@@ -120992,7 +120992,7 @@ self: {
        executableHaskellDepends = [ base hasql ];
        testHaskellDepends = [ base bytestring hasql hspec QuickCheck ];
        description = "LISTEN/NOTIFY support for Hasql";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasql-optparse-applicative" = callPackage
@@ -121007,7 +121007,7 @@ self: {
          base-prelude hasql hasql-pool optparse-applicative
        ];
        description = "\"optparse-applicative\" parsers for \"hasql\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-pipes" = callPackage
@@ -121022,7 +121022,7 @@ self: {
          base bytestring-tree-builder hasql pipes pipes-safe protolude
        ];
        description = "A pipe to stream a postgres database cursor in the hasql ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasql-pool" = callPackage
@@ -121034,7 +121034,7 @@ self: {
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        testHaskellDepends = [ base-prelude hasql hspec ];
        description = "A pool of connections for Hasql";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-postgres" = callPackage
@@ -121069,8 +121069,8 @@ self: {
          QuickCheck quickcheck-instances scientific text time vector
        ];
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121085,8 +121085,8 @@ self: {
          base-prelude hasql-postgres optparse-applicative
        ];
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121121,8 +121121,8 @@ self: {
          resource-pool split stm text time tmp-postgres transformers
        ];
        description = "A PostgreSQL backed queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121139,8 +121139,8 @@ self: {
          unordered-containers vector
        ];
        description = "A somewhat opinionated \"simpler\" API to hasql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121159,8 +121159,8 @@ self: {
          text uuid vector
        ];
        description = "Template Haskell utilities for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121179,7 +121179,7 @@ self: {
        ];
        testHaskellDepends = [ async hasql rebase ];
        description = "Composable abstraction over retryable transactions for Hasql";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hasql-url" = callPackage
@@ -121195,8 +121195,8 @@ self: {
        ];
        testHaskellDepends = [ base hasql tasty tasty-quickcheck ];
        description = "Parse PostgreSQL connection URI into Hasql.Connection Settings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121212,7 +121212,7 @@ self: {
          base binary bytestring dlist mtl mysql-haskell scientific text time
        ];
        description = "composable SQL generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hastache" = callPackage
@@ -121240,8 +121240,8 @@ self: {
          base bytestring directory HUnit mtl syb text
        ];
        description = "Haskell implementation of Mustache templates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121258,8 +121258,8 @@ self: {
          unordered-containers vector
        ];
        description = "render hastache templates using aeson values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121273,8 +121273,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base curl filepath mtl ];
        description = "A universal pastebin tool, written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121294,8 +121294,8 @@ self: {
          wai wai-websockets warp websockets
        ];
        description = "Framework for type-safe, distributed web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121323,8 +121323,8 @@ self: {
          unix utf8-string
        ];
        description = "Haskell To ECMAScript compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bin-package-db = null;};
 
@@ -121339,8 +121339,8 @@ self: {
          base data-default haste-compiler transformers
        ];
        description = "Google API bindings for the Haste compiler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haste-lib" = callPackage
@@ -121358,8 +121358,8 @@ self: {
          utf8-string
        ];
        description = "Base libraries for haste-compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121374,8 +121374,8 @@ self: {
          base containers directory filepath haste-lib
        ];
        description = "A port of blaze-markup and blaze-html to Haste";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121387,8 +121387,8 @@ self: {
        sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8";
        libraryHaskellDepends = [ base haste-compiler transformers ];
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "haste-prim" = callPackage
@@ -121399,8 +121399,8 @@ self: {
        sha256 = "1gmvvqy0xy396r3jnfmdhh70j7k73qs38cw9znwgl8jjywpzrmw5";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Low level primitives for the Haste compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121426,7 +121426,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A program to download subtitle files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hasty-hamiltonian" = callPackage
@@ -121443,7 +121443,7 @@ self: {
        ];
        testHaskellDepends = [ ad base mwc-probability ];
        description = "Speedy traversal through parameter space";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hat" = callPackage
@@ -121467,7 +121467,7 @@ self: {
        ];
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hatex-guide" = callPackage
@@ -121483,8 +121483,8 @@ self: {
          transformers
        ];
        description = "HaTeX User's Guide";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121508,7 +121508,7 @@ self: {
        ];
        description = "XMPP client with 9P and (optionally) GTK interfaces";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hath" = callPackage
@@ -121528,7 +121528,7 @@ self: {
          base cmdargs process split tasty tasty-hunit tasty-quickcheck
        ];
        description = "Hath manipulates network blocks in CIDR notation";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "hats" = callPackage
@@ -121558,8 +121558,8 @@ self: {
          async attoparsec base bytestring criterion random stm
        ];
        description = "Haskell client for the NATS messaging system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121582,8 +121582,8 @@ self: {
          base test-framework test-framework-quickcheck2
        ];
        description = "A truth table generator for classical propositional logic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121606,7 +121606,7 @@ self: {
          base http-client http-client-tls monad-logger text
        ];
        description = "Library for checking for weak/compromised passwords";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haven" = callPackage
@@ -121625,8 +121625,8 @@ self: {
          http-types mtl process SHA temporary transformers xml
        ];
        description = "Recursively retrieve maven dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121651,8 +121651,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Implementation of the rules of Love Letter";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121674,8 +121674,8 @@ self: {
          regex-tdfa SHA time utf8-string
        ];
        description = "A twitter client for GTK+. Beta version.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121701,8 +121701,8 @@ self: {
          text transformers
        ];
        description = "Haskell cash-flow and tax simulation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121729,7 +121729,7 @@ self: {
          unordered-containers
        ];
        description = "A Haskell library for efficient, concurrent, and concise data access";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haxl-amazonka" = callPackage
@@ -121745,8 +121745,8 @@ self: {
          transformers
        ];
        description = "Haxl data source for accessing AWS services through amazonka";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121769,8 +121769,8 @@ self: {
          unordered-containers vector
        ];
        description = "An example Haxl data source for accessing the Facebook Graph API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121795,8 +121795,8 @@ self: {
          utf8-string zlib
        ];
        description = "Readable HaxBall replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121817,7 +121817,7 @@ self: {
          utf8-string
        ];
        description = "XML-RPC client and server library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "haxr-th" = callPackage
@@ -121828,8 +121828,8 @@ self: {
        sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif";
        libraryHaskellDepends = [ base haxr template-haskell ];
        description = "Automatic deriving of XML-RPC structs for Haskell records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121846,8 +121846,8 @@ self: {
          url
        ];
        description = "A simple HTTP proxy server library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121868,8 +121868,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base process xml ];
        description = "Haskell bindings for the C Wayland library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs) wayland;};
 
@@ -121888,8 +121888,8 @@ self: {
          pandoc url
        ];
        description = "Hayoo CLI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121908,8 +121908,8 @@ self: {
          base cairo filepath glade gtk haskell98 process svgcairo time unix
        ];
        description = "N-back memory game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121939,8 +121939,8 @@ self: {
          vector
        ];
        description = "Bayesian Networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121957,8 +121957,8 @@ self: {
          base directory ghc ghc-mod ghc-paths libhbb
        ];
        description = "Haskell Busy Bee, a backend for text editors";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121970,8 +121970,8 @@ self: {
        sha256 = "1glld44m6h8yfh5h63w9q5isy238j0j312ycx43va1xa80x5r4dq";
        libraryHaskellDepends = [ base bytestring Decimal digits split ];
        description = "Packed binary-coded decimal (BCD) serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -121987,8 +121987,8 @@ self: {
          attoparsec base blaze-builder bytestring containers network
        ];
        description = "Client for the beanstalkd workqueue service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122007,8 +122007,8 @@ self: {
        ];
        executableSystemDepends = [ SDL_mixer ];
        description = "A simple step sequencer GUI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) SDL_mixer;};
 
@@ -122045,8 +122045,8 @@ self: {
          optparse-applicative parsec primitive text transformers vector
        ];
        description = "An optimizing Brainfuck compiler and evaluator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122064,8 +122064,8 @@ self: {
        librarySystemDepends = [ blas liblapack ];
        testHaskellDepends = [ base hspec primitive vector ];
        description = "Human friendly BLAS and Lapack bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
@@ -122085,8 +122085,8 @@ self: {
          hashable path-pieces safecopy text unordered-containers uuid vector
        ];
        description = "A mutable vector that provides indexation on the datatype fields it stores";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122121,7 +122121,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Minimal extensible web-browser";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hbro-contrib" = callPackage
@@ -122154,7 +122154,7 @@ self: {
        ];
        description = "Third-party extensions to hbro";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hburg" = callPackage
@@ -122174,8 +122174,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Haskell Bottom Up Rewrite Generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122188,7 +122188,7 @@ self: {
        libraryHaskellDepends = [ base containers gasp mtl ];
        description = "Haskell CAD library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122202,8 +122202,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring language-c ];
        description = "A toy C compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122216,8 +122216,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base colour random ];
        description = "haskell cg (minus)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122233,8 +122233,8 @@ self: {
          base cairo colour filepath hcg-minus process
        ];
        description = "haskell cg (minus) (cairo rendering)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122247,8 +122247,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mps ];
        description = "A collection of code cheatsheet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122281,8 +122281,8 @@ self: {
          text-format-heavy unix unix-bytestring unordered-containers yaml
        ];
        description = "Implementation of checkers (\"draughts\") board game - server application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122299,8 +122299,8 @@ self: {
          array attoparsec base containers hlint hspec QuickCheck text
        ];
        description = "Chess library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122321,8 +122321,8 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A testing library for command line applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122345,8 +122345,8 @@ self: {
          async base bytestring HUnit network QuickCheck random
        ];
        description = "CoAP implementation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122370,7 +122370,7 @@ self: {
          base base64-bytestring bytestring criterion ghc-prim reflection
        ];
        description = "An implementation of the Consistent Overhead Byte Stuffing algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hcom" = callPackage
@@ -122381,8 +122381,8 @@ self: {
        sha256 = "1ps6q3sn0dlkhxkwgpq9jj0rklrnsgsrrlk63g9jr8lfris2wlzq";
        doHaddock = false;
        description = "Haskell COM support library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122400,7 +122400,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base data-default HUnit ieee754 mtl ];
        description = "Easily convert between latitude/longitude, UTM and OSGB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hcount" = callPackage
@@ -122420,8 +122420,8 @@ self: {
          stan text
        ];
        description = "Haskell name counts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122438,8 +122438,8 @@ self: {
          random stm time
        ];
        description = "A simple job scheduler, which just runs some IO action at a given time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122460,8 +122460,8 @@ self: {
          base directory HaskellForMaths QuickCheck text
        ];
        description = "Virtual Rubik's cube of arbitrary size";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122474,8 +122474,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ bluetooth cwiid ];
        description = "Library to interface with the wiimote";
-       license = stdenv.lib.licenses.gpl2;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.gpl2;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
@@ -122490,7 +122490,7 @@ self: {
          base bytestring extensible-exceptions filepath hsyslog mtl unix
        ];
        description = "Library to handle the details of writing daemons for UNIX";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hdaemonize-buildfix" = callPackage
@@ -122505,8 +122505,8 @@ self: {
          base extensible-exceptions filepath hsyslog mtl unix
        ];
        description = "Library to handle the details of writing daemons for UNIX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122523,8 +122523,8 @@ self: {
          vector
        ];
        description = "Deserialize from HDBC rows to FromJSON instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122536,8 +122536,8 @@ self: {
        sha256 = "034zsmqgavh4ns69f6j4a1afyqbd1b7h35macmf20vzxj0j0bawj";
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122576,8 +122576,8 @@ self: {
          time uuid
        ];
        description = "Haskell Database Independent interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122598,8 +122598,8 @@ self: {
          resourcet test-framework test-framework-quickcheck2 transformers
        ];
        description = "Conduit glue for HDBI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122627,8 +122627,8 @@ self: {
          test-framework-quickcheck2 text time uuid
        ];
        description = "PostgreSQL driver for hdbi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122648,8 +122648,8 @@ self: {
          test-framework text
        ];
        description = "SQlite driver for HDBI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122669,8 +122669,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text time uuid
        ];
        description = "test suite for testing HDBI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122690,8 +122690,8 @@ self: {
          network process syb time transformers unix
        ];
        description = "Persistent GHC powered background server for FAST haskell development tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122710,7 +122710,7 @@ self: {
        ];
        description = "HDF: Uniform Rate Audio Signal Processing in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122731,7 +122731,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "High-level bindings to the HDF5 \"lite\" interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) hdf5;};
 
   "hdiff" = callPackage
@@ -122763,8 +122763,8 @@ self: {
          prettyprinter-ansi-terminal QuickCheck text
        ];
        description = "Pattern-Expression-based differencing of arbitrary types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122779,8 +122779,8 @@ self: {
          base cgi Crypto network parsec random time
        ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122799,8 +122799,8 @@ self: {
        executableHaskellDepends = [ array base haskell98 pretty ];
        executableToolDepends = [ happy ];
        description = "An IDL compiler for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122812,8 +122812,8 @@ self: {
        sha256 = "0qr8d4qbvkncv4im0iwwdr9khvkyy4ky8wnwxri1jqhylcq8vdks";
        libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122826,8 +122826,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ markdown ];
        description = "Haskell bindings to the Discount markdown library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {markdown = null;};
 
@@ -122841,8 +122841,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122870,8 +122870,8 @@ self: {
          unordered-containers vector
        ];
        description = "A Digital Ocean client in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122896,8 +122896,8 @@ self: {
        ];
        testHaskellDepends = [ base containers mtl ];
        description = "Haskell docs tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122924,8 +122924,8 @@ self: {
          network-transport-tcp random template-haskell time
        ];
        description = "Haskell distributed parallel Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122941,8 +122941,8 @@ self: {
          array base bytestring cereal containers deepseq template-haskell
        ];
        description = "Explicit closures in Haskell distributed parallel Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122962,8 +122962,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -122979,7 +122979,7 @@ self: {
          base case-insensitive megaparsec parser-combinators selective
        ];
        description = "More informative parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "headergen" = callPackage
@@ -122998,8 +122998,8 @@ self: {
          time
        ];
        description = "Creates a header for a haskell source file";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123027,7 +123027,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "License Header Manager";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heap" = callPackage
@@ -123039,7 +123039,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heap-console" = callPackage
@@ -123057,8 +123057,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "interactively inspect Haskell values at runtime";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123070,7 +123070,7 @@ self: {
        sha256 = "0vg39qm8g69n10ys9v9knnaq5dqdjndj6ffy0xb78bwrr3rm5mci";
        libraryHaskellDepends = [ base ];
        description = "Asymptotically optimal Brodal/Okasaki heaps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heapsize" = callPackage
@@ -123088,7 +123088,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Determine the size of runtime data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heapsort" = callPackage
@@ -123101,8 +123101,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base ];
        description = "Heapsort of MArrays as a demo of imperative programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123118,8 +123118,8 @@ self: {
          base co-log co-log-core ekg ekg-core ekg-statsd heart-core text
        ];
        description = "An opinionated app prelude and framework in the UnliftIO style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123139,8 +123139,8 @@ self: {
          unliftio-core unordered-containers
        ];
        description = "An opinionated library prelude in the UnliftIO style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123152,8 +123152,8 @@ self: {
        sha256 = "059dx7paaniwmxgyzapv0542jf8yb4vzbg8501d2j779ixvzm80d";
        libraryHaskellDepends = [ async base io-streams time ];
        description = "Heartbeats for io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123183,8 +123183,8 @@ self: {
          vector
        ];
        description = "Find and annotate ITDs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123208,8 +123208,8 @@ self: {
          pipes pipes-text safe text turtle vector
        ];
        description = "Find and annotate ITDs with assembly or read pair joining";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123228,7 +123228,7 @@ self: {
          text
        ];
        description = "Compression and decompression using heatshrink";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heavy-log-shortcuts" = callPackage
@@ -123243,8 +123243,8 @@ self: {
          base fast-logger heavy-logger monad-control text text-format-heavy
        ];
        description = "Simle api for heavy logger";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123266,8 +123266,8 @@ self: {
          thread-local-storage transformers-base
        ];
        description = "Full-weight logging based on fast-logger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123283,8 +123283,8 @@ self: {
          amazonka-core base binary heavy-logger template-haskell text
        ];
        description = "heavy-logger compatibility with amazonka-core logging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123305,8 +123305,8 @@ self: {
          text text-format-heavy
        ];
        description = "Orphan instances for data types in heavy-logger package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123319,8 +123319,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Hebrew dates and prayer times";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123333,8 +123333,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123347,7 +123347,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Oh heck, it's a heckin' case conversion library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "heckle" = callPackage
@@ -123366,8 +123366,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory process split ];
        description = "Jekyll in Haskell (feat. LaTeX)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123392,7 +123392,7 @@ self: {
          base containers mmorph mtl pretty-show text transformers
        ];
        description = "Release with confidence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -123407,8 +123407,8 @@ self: {
          base containers hedgehog semigroupoids semigroups
        ];
        testHaskellDepends = [ base either hedgehog ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123420,8 +123420,8 @@ self: {
        sha256 = "0zfk967xzpwfh3y3ys8d0c3zcz251dnp41xha11613ji3yfk0wff";
        libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123442,7 +123442,7 @@ self: {
          aeson base binary comonad containers hedgehog vector
        ];
        description = "Hedgehog will eat your typeclass bugs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-corpus" = callPackage
@@ -123453,7 +123453,7 @@ self: {
        sha256 = "194pj8mjia5v4mc0hcyxgipf15j0dr44w02r1bcf89b4b8vnk5hq";
        libraryHaskellDepends = [ base ];
        description = "hedgehog-corpus";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-fakedata" = callPackage
@@ -123465,8 +123465,8 @@ self: {
        libraryHaskellDepends = [ base fakedata hedgehog random ];
        testHaskellDepends = [ base containers fakedata hedgehog ];
        description = "Use 'fakedata' with 'hedgehog'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123482,7 +123482,7 @@ self: {
          base contravariant hedgehog transformers
        ];
        description = "Function generation for `hedgehog`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-gen" = callPackage
@@ -123495,7 +123495,7 @@ self: {
          base bytestring hedgehog text typerep-map
        ];
        description = "Customizable Gen for ADT using Generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-gen-json" = callPackage
@@ -123519,8 +123519,8 @@ self: {
          timerep tz unordered-containers vector
        ];
        description = "JSON generators for Hedgehog";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123532,8 +123532,8 @@ self: {
        sha256 = "1166jwk3f4bfw54qaxk3q3gxrfmffwwfkmd8xyvwj7i3whwzxq0f";
        libraryHaskellDepends = [ base hedgehog ];
        description = "GHC Generics automatically derived hedgehog generators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123551,8 +123551,8 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog ];
        description = "Golden testing capabilities for hedgehog using Aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123566,7 +123566,7 @@ self: {
        editedCabalFile = "0ddmwz3ngamij2k4paf7508dnzqn4qjpgwypbpr8d6s2y95jbvfh";
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
        description = "Use QuickCheck generators in Hedgehog and vice versa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedgehog-servant" = callPackage
@@ -123589,8 +123589,8 @@ self: {
          string-conversions text
        ];
        description = "Hedgehog property testing for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123616,7 +123616,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base mtl time ];
        description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedis-config" = callPackage
@@ -123631,8 +123631,8 @@ self: {
          aeson base bytestring hedis scientific text time
        ];
        description = "Easy trivial configuration for Redis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123643,7 +123643,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "165a7pw1i1i9gxljmx03zavza5qjyir09bwk067cfr5an9razvq6";
        libraryHaskellDepends = [ base envy hedis scientific time ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedis-monadic" = callPackage
@@ -123659,7 +123659,7 @@ self: {
          transformers-compat
        ];
        description = "A la MonadReader for Redis connection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedis-namespace" = callPackage
@@ -123674,8 +123674,8 @@ self: {
        executableHaskellDepends = [ base bytestring hedis mtl ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123697,8 +123697,8 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        description = "Caching mandatory data with Redis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123710,8 +123710,8 @@ self: {
        sha256 = "1dq7rpqg35caqj664q2ndqgd59mq7cfjahkaka5mlk1k5yjvz7av";
        libraryHaskellDepends = [ base bytestring either hedis mtl ];
        description = "A simplified API for hedis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123729,8 +123729,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "Tags for hedis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123752,7 +123752,7 @@ self: {
          base containers hedgehog megaparsec text time uuid-types vector
        ];
        description = "EDN parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hedn-functor" = callPackage
@@ -123769,8 +123769,8 @@ self: {
          base containers hedn recursion-schemes text vector
        ];
        description = "Base functor for EDN AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123786,8 +123786,8 @@ self: {
        executableHaskellDepends = [ base haskeline ];
        testHaskellDepends = [ base doctest ];
        description = "A small library and executable for generating dice rolls";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123813,8 +123813,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion weigh ];
        description = "Tidy data in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123833,8 +123833,8 @@ self: {
          transformers
        ];
        description = "An extensible build helper for haskell, in the vein of leiningen";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123877,7 +123877,7 @@ self: {
          vector xmlhtml
        ];
        description = "An Haskell template system supporting both HTML5 and XML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heist-aeson" = callPackage
@@ -123893,8 +123893,8 @@ self: {
          vector xmlhtml
        ];
        description = "Use JSON directly from Heist templates";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123908,8 +123908,8 @@ self: {
          base heist template-haskell text xmlhtml
        ];
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123932,7 +123932,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Typechecking terms of the Edinburgh Logical Framework (LF)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "helics" = callPackage
@@ -123955,8 +123955,8 @@ self: {
          newrelic-collector-client newrelic-common newrelic-transaction
        ];
        description = "New Relic® agent SDK wrapper for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {newrelic-collector-client = null; newrelic-common = null; 
          newrelic-transaction = null;};
@@ -123975,8 +123975,8 @@ self: {
          base bytestring data-default-class helics vault wai
        ];
        description = "New Relic® agent SDK wrapper for wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -123990,8 +123990,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec process ];
        description = "An incomplete Elisp compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124016,7 +124016,7 @@ self: {
        ];
        description = "The Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124032,7 +124032,7 @@ self: {
          base bytestring deepseq lifted-base mtl random text transformers
        ];
        description = "A backwards-compatible, modern replacement for the Prelude";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "helix" = callPackage
@@ -124056,8 +124056,8 @@ self: {
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
        description = "Web development micro framework for haskell with typesafe URLs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124082,8 +124082,8 @@ self: {
        ];
        executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124103,8 +124103,8 @@ self: {
          mtl network regex-pcre safe stm tar utf8-string zlib
        ];
        description = "Distributed hackage mirror";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124129,8 +124129,8 @@ self: {
          base containers Lucu mtl network regex-posix
        ];
        description = "Simple, distributed, anonymous data sharing network";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124144,7 +124144,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Hello World, an example package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "helm" = callPackage
@@ -124166,7 +124166,7 @@ self: {
        executableHaskellDepends = [ base linear random ];
        testHaskellDepends = [ base hspec ];
        description = "A functionally reactive game engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "help-esb" = callPackage
@@ -124182,8 +124182,8 @@ self: {
          uuid
        ];
        description = "A Haskell client for the Help.com team's ESB.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124201,8 +124201,8 @@ self: {
          array base binary bytestring hemkay-core portaudio
        ];
        description = "A module music mixer and player";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124214,7 +124214,7 @@ self: {
        sha256 = "0br41879jynw3dzb2hlb07m55zmzgyim6gi8i48bzimbi70c9z89";
        libraryHaskellDepends = [ array base binary bytestring ];
        description = "A device independent module music mixer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hemokit" = callPackage
@@ -124243,8 +124243,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
        benchmarkHaskellDepends = [ base conduit criterion mtl ];
        description = "Haskell port of the Emokit EEG project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124265,8 +124265,8 @@ self: {
          transformers uuid
        ];
        description = "Haskell bindings to Xen hypervisor interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xenctrl = null;};
 
@@ -124281,8 +124281,8 @@ self: {
          base bitset bytestring network typesafe-endian
        ];
        description = "Bindings and high level interface for to ENet v1.3.9";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124294,8 +124294,8 @@ self: {
        sha256 = "0b7syzfzbcznjb98hi4k8bp46ss08s9qg2763bnnm1b10i7km23z";
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124307,8 +124307,8 @@ self: {
        sha256 = "1hbx48r8zdmyr5qjf0b3pagmamj8pibsp7ca7bxdgk4jz8pxv2my";
        libraryHaskellDepends = [ base mtl split ];
        description = "A lexer for Haskell source code";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124320,8 +124320,8 @@ self: {
        sha256 = "1gkcd9ikaxjirxh8haq8b9a372n1dlaq63n9xzq9gsyazkxz7lgn";
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124339,8 +124339,8 @@ self: {
          base containers ghc-prim indents mtl parsec regex-posix
        ];
        description = "HAML to ERB translator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124399,8 +124399,8 @@ self: {
        ];
        doHaddock = false;
        description = "Runs Continuous Integration tasks on your machines";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "hercules-ci-api-agent" = callPackage
@@ -124430,8 +124430,8 @@ self: {
          time uuid
        ];
        description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {};
 
   "hercules-ci-api-core" = callPackage
@@ -124453,8 +124453,8 @@ self: {
          string-conv swagger2 text time uuid
        ];
        description = "Types and convenience modules use across Hercules CI API packages";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {};
 
   "here" = callPackage
@@ -124469,7 +124469,7 @@ self: {
          base haskell-src-meta mtl parsec template-haskell
        ];
        description = "Here docs & interpolated strings via quasiquotation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heredoc" = callPackage
@@ -124480,7 +124480,7 @@ self: {
        sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9";
        libraryHaskellDepends = [ base template-haskell ];
        description = "multi-line string / here document using QuasiQuotes";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "heredocs" = callPackage
@@ -124496,8 +124496,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring doctest text ];
        description = "Heredocument on Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124510,7 +124510,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base doctest ];
        description = "haskell time manipulation in a 'kerf like' style";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hermit" = callPackage
@@ -124539,8 +124539,8 @@ self: {
          temporary
        ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124556,8 +124556,8 @@ self: {
          base containers ghc ghc-prim hermit syb template-haskell
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124578,8 +124578,8 @@ self: {
          mtl optparse-applicative semigroups split vty
        ];
        description = "A command-line manager for delicious kitchen recipes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124594,7 +124594,7 @@ self: {
        libraryHaskellDepends = [ base random text ];
        executableHaskellDepends = [ base random text ];
        description = "Think back of the five tenets of hero club";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heroku" = callPackage
@@ -124606,7 +124606,7 @@ self: {
        libraryHaskellDepends = [ base network-uri text ];
        testHaskellDepends = [ base hspec network-uri text ];
        description = "helpers for deploying to Heroku";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heroku-persistent" = callPackage
@@ -124622,7 +124622,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec persistent-postgresql ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "herringbone" = callPackage
@@ -124641,8 +124641,8 @@ self: {
          transformers unix-compat
        ];
        description = "A library for compiling and serving static web assets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124659,8 +124659,8 @@ self: {
          system-filepath template-haskell text
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124677,8 +124677,8 @@ self: {
          system-filepath text time wai wai-app-static
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124705,8 +124705,8 @@ self: {
          process text time uniplate unix
        ];
        description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124725,7 +124725,7 @@ self: {
        ];
        description = "Haskell's embedded SQL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124746,8 +124746,8 @@ self: {
          base criterion deepseq hvect template-haskell vinyl
        ];
        description = "Fast heterogeneous data structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124759,7 +124759,7 @@ self: {
        sha256 = "1fnzj37kya5gqjchm3yq0709ay50n0spb24x5rxkxfbl0yy2nzk7";
        libraryHaskellDepends = [ base ];
        description = "Pure heterogeneous maps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "heterocephalus" = callPackage
@@ -124777,7 +124777,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A type-safe template engine for working with front end development tools";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "heterogeneous-list-literals" = callPackage
@@ -124789,8 +124789,8 @@ self: {
        libraryHaskellDepends = [ base Only ];
        testHaskellDepends = [ base ];
        description = "Allows the use of tuples as literals for Heterogeneous collections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124808,8 +124808,8 @@ self: {
          base constraint-manip hspec indextype polydata
        ];
        description = "A heterogeneous list type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124827,7 +124827,7 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Text Tetris";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -124842,8 +124842,8 @@ self: {
          base containers deepseq parallel random text
        ];
        description = "A genetic programming based on tree structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124891,7 +124891,7 @@ self: {
        ];
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
@@ -124907,8 +124907,8 @@ self: {
          base bytestring cairo filepath haskell98
        ];
        description = "Genetic Mona Lisa problem in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124927,8 +124927,8 @@ self: {
          base bytestring cairo dph-seq filepath haskell98
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124940,7 +124940,7 @@ self: {
        sha256 = "1mc66758254d93m7vab7q6lhn7qphzxd6wyc3v6yq1diy0gji4va";
        libraryHaskellDepends = [ base bytestring ];
        description = "Convert strings into hexadecimal and back";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hex-text" = callPackage
@@ -124953,8 +124953,8 @@ self: {
        libraryHaskellDepends = [ base base16-bytestring bytestring text ];
        testHaskellDepends = [ base doctest ];
        description = "ByteString-Text hexidecimal conversions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124966,8 +124966,8 @@ self: {
        sha256 = "1bx49z3ycc24bsn0x0617x0gmgapan6qnwnwq6v0w06gjrahr4r4";
        libraryHaskellDepends = [ base containers ];
        description = "Haskell scripting interface for HexChat";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -124980,7 +124980,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "A library for forming hexdumps";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "hexif" = callPackage
@@ -124991,8 +124991,8 @@ self: {
        sha256 = "1asv5vs694mcifffvm5a4gsplpz7frk3p3zr9lqqv1f172ql9lql";
        libraryHaskellDepends = [ base binary bytestring filepath ];
        description = "Reading Exif data form a JPEG file with Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125011,8 +125011,8 @@ self: {
          random
        ];
        description = "A small game based on domino-like hexagonal tiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125025,7 +125025,7 @@ self: {
        libraryHaskellDepends = [ base bytestring extra ];
        testHaskellDepends = [ base bytestring ];
        description = "XML subset DOM parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hexml-lens" = callPackage
@@ -125045,8 +125045,8 @@ self: {
          base bytestring doctest hexml hspec lens QuickCheck wreq
        ];
        description = "Lenses for the hexml package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125064,7 +125064,7 @@ self: {
        ];
        librarySystemDepends = [ expat ];
        description = "XML parser/formatter based on expat";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) expat;};
 
   "hexpat-iteratee" = callPackage
@@ -125081,8 +125081,8 @@ self: {
          List parallel transformers
        ];
        description = "Chunked XML parsing using iteratees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125098,7 +125098,7 @@ self: {
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
        description = "Lenses for Hexpat";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hexpat-pickle" = callPackage
@@ -125114,7 +125114,7 @@ self: {
          utf8-string
        ];
        description = "XML picklers based on hexpat, source-code-similar to those of the HXT package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hexpat-pickle-generic" = callPackage
@@ -125131,8 +125131,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Picklers for de/serialising Generic data types to and from XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125148,7 +125148,7 @@ self: {
          base bytestring hexpat List mtl parser-combinators text
          transformers
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hexpat-tagsoup" = callPackage
@@ -125159,7 +125159,7 @@ self: {
        sha256 = "0481446ba5m0h8lxmp216gzll0wr77mhk6hvm087749fwjj597aj";
        libraryHaskellDepends = [ base hexpat tagsoup ];
        description = "Parse (possibly malformed) HTML to hexpat tree";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hexpr" = callPackage
@@ -125173,8 +125173,8 @@ self: {
          base data-ref either mtl parsec transformers
        ];
        description = "A framework for symbolic, homoiconic languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125192,8 +125192,8 @@ self: {
          mime-types mtl text transformers vault wai warp
        ];
        description = "An express-like http framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125209,8 +125209,8 @@ self: {
          base bytestring containers parsec template-haskell
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125228,7 +125228,7 @@ self: {
        ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        description = "Fast and safe representation of a hex string";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hext" = callPackage
@@ -125244,8 +125244,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "a text classification library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125257,7 +125257,7 @@ self: {
        sha256 = "0iq6kj7mijxppjghpqx19s79sj6k1jqf21gfi8jqbj6bq7j2cdvj";
        libraryHaskellDepends = [ base ];
        description = "Generic and niche utility functions and more for Haskell";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "hextream" = callPackage
@@ -125280,8 +125280,8 @@ self: {
          tasty tasty-golden tasty-hunit text
        ];
        description = "Streaming-friendly XML parsers";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125313,8 +125313,8 @@ self: {
          utf8-string wai wai-extra warp
        ];
        description = "A server for Eye-Fi SD cards";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125336,8 +125336,8 @@ self: {
          universe-base
        ];
        description = "Heyting and Boolean algebras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125353,8 +125353,8 @@ self: {
        librarySystemDepends = [ doublefann ];
        libraryPkgconfigDepends = [ fann ];
        description = "Haskell binding to the FANN library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {doublefann = null; fann = null;};
 
@@ -125373,8 +125373,8 @@ self: {
          MonadCatchIO-transformers network transformers
        ];
        description = "Flash debugger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125390,8 +125390,8 @@ self: {
        libraryHaskellDepends = [ base eprocess mtl ];
        executableHaskellDepends = [ wx wxcore ];
        description = "Four in a Row in Haskell!!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125403,7 +125403,7 @@ self: {
        sha256 = "0lmjgwgfp1s2ag2fbi6n8yryafb5qz87yb0p122lxzm3487sf98h";
        libraryHaskellDepends = [ base containers template-haskell text ];
        description = "Command line flag parser, very similar to Google's gflags";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hfmt" = callPackage
@@ -125432,8 +125432,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125453,8 +125453,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125471,7 +125471,7 @@ self: {
        ];
        testHaskellDepends = [ base base-unicode-symbols hspec text ];
        description = "Simple Haskell formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hfov" = callPackage
@@ -125482,8 +125482,8 @@ self: {
        sha256 = "04qwmjxm06akvpakc5imcx0ls9zlsz74s4r9p7xzj0q5fv20z09l";
        libraryHaskellDepends = [ base ];
        description = "Field-of-view calculation for low-resolution 2D raster grids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125502,8 +125502,8 @@ self: {
          gd GLUT OpenGL OpenGLRaw
        ];
        description = "OpenGL fractal renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125519,7 +125519,7 @@ self: {
        librarySystemDepends = [ Cocoa ];
        libraryToolDepends = [ CoreServices ];
        description = "File/folder watching for OS X";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; 
          inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;};
@@ -125534,8 +125534,8 @@ self: {
          base containers haskell-src mtl pretty syb
        ];
        description = "A library for fusing a subset of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125555,7 +125555,7 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Mercurial";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125578,8 +125578,8 @@ self: {
        sha256 = "08a8lmh1rg3d1rmpfhcc2fzyc0kybqhzahx4hrvfrqjw7czcnmrw";
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125598,8 +125598,8 @@ self: {
          test-framework test-framework-hunit
        ];
        description = "GDB Machine Interface: program-driven control of GDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125617,8 +125617,8 @@ self: {
          transformers transformers-base unordered-containers
        ];
        description = "A Gearman client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125635,7 +125635,7 @@ self: {
        ];
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125647,8 +125647,8 @@ self: {
        sha256 = "0l460mmbla7354dldil0d7qzba7dp4jhhsna0s27gdd9aad4flsd";
        libraryHaskellDepends = [ base containers ];
        description = "A geometric library with bindings to GPC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125675,7 +125675,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest doctest-discover QuickCheck ];
        description = "Geometric Algorithms, Data structures, and Data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hgeometry-combinatorial" = callPackage
@@ -125706,7 +125706,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Data structures, and Data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hgeometry-ipe" = callPackage
@@ -125738,8 +125738,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Reading and Writing ipe7 files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125760,8 +125760,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Writing geometric primitives from HGeometry as SVG Files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125776,8 +125776,8 @@ self: {
        librarySystemDepends = [ geos ];
        testHaskellDepends = [ base MissingH ];
        description = "Simple Haskell bindings to GEOS C API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) geos;};
 
@@ -125800,8 +125800,8 @@ self: {
          base Cabal containers deepseq filepath haskell-src-exts uniplate
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125825,8 +125825,8 @@ self: {
        testHaskellDepends = [ base hspec spherical ];
        doHaddock = false;
        description = "Library and for GIS with Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125847,8 +125847,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs directory ];
        description = "Haskell bindings to the GitHub API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125865,7 +125865,7 @@ self: {
        ];
        description = "Various animations generated using HGL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {HTam = null;};
 
@@ -125878,8 +125878,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell interface to GMP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125899,7 +125899,7 @@ self: {
        ];
        description = "An haskell port of the java version of gom";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125911,8 +125911,8 @@ self: {
        sha256 = "0j6ybi8f5csa9rpbpy8dc9p6l6vf2qh2zk589a9nqj2phllz7mwf";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Gopher server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125935,8 +125935,8 @@ self: {
          ansi-terminal base optparse-applicative
        ];
        description = "Search Haskell source code from the command line";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -125952,7 +125952,7 @@ self: {
          aeson base bytestring directory filepath process template-haskell
        ];
        description = "Compile Mercurial (hg) version info into Haskell code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hgrib" = callPackage
@@ -125970,8 +125970,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base directory hspec ];
        description = "Unofficial bindings for GRIB API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {grib_api = null;};
 
@@ -125984,8 +125984,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ harp ];
        description = "Binding to libharp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {harp = null;};
 
@@ -126012,8 +126012,8 @@ self: {
          ghc-boot hlint hspec process syb
        ];
        description = "Happy Haskell Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126027,8 +126027,8 @@ self: {
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Bindings to https://www.open-mpi.org/projects/hwloc";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126059,7 +126059,7 @@ self: {
          temporary text time
        ];
        description = "Generate scaffold for cabal project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hi-file-parser" = callPackage
@@ -126073,7 +126073,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring rio vector ];
        testHaskellDepends = [ base binary bytestring hspec rio vector ];
        description = "Parser for GHC's hi files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hi3status" = callPackage
@@ -126093,8 +126093,8 @@ self: {
        ];
        executableHaskellDepends = [ base dbus process ];
        description = "Status line for i3bar";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126115,7 +126115,7 @@ self: {
        ];
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126130,7 +126130,7 @@ self: {
        executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126144,7 +126144,7 @@ self: {
        libraryPkgconfigDepends = [ hidapi ];
        libraryToolDepends = [ c2hs ];
        description = "Interface to hidapi library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) hidapi;};
 
   "hid-examples" = callPackage
@@ -126178,8 +126178,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        doHaddock = false;
        description = "Examples to accompany the book \"Haskell in Depth\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126196,7 +126196,7 @@ self: {
        ];
        librarySystemDepends = [ systemd ];
        description = "Haskell bindings to HIDAPI";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) systemd;};
 
   "hidden-char" = callPackage
@@ -126210,8 +126210,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Provides cross-platform getHiddenChar function";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126242,7 +126242,7 @@ self: {
          unordered-containers yaml
        ];
        description = "Set up a GHC API session";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hie-compat" = callPackage
@@ -126258,7 +126258,7 @@ self: {
          transformers
        ];
        description = "HIE files for GHC 8.6 and other HIE file backports";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hie-core" = callPackage
@@ -126294,8 +126294,8 @@ self: {
          parser-combinators tasty tasty-hunit text
        ];
        description = "The core of an IDE";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126321,8 +126321,8 @@ self: {
          base directory filepath ghc ghc-paths hspec process
        ];
        description = "Generates a references DB from .hie files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126334,8 +126334,8 @@ self: {
        sha256 = "11fjfmdjzvid0352d346p5xf44bl7dn8bd8pms5pi34xysdyr7pg";
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126349,7 +126349,7 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hierarchical-clustering-diagrams" = callPackage
@@ -126368,8 +126368,8 @@ self: {
          HUnit
        ];
        description = "Draw diagrams of dendrograms made by hierarchical-clustering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126381,8 +126381,8 @@ self: {
        sha256 = "1yzhw7kgz5iljm8ndh5kyr18367cl6l120m1gkn5x9hpsh9mlamm";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126413,8 +126413,8 @@ self: {
          filepath hmatrix lens optparse-generic safe text text-show vector
        ];
        description = "Hierarchical spectral clustering of a graph";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126437,8 +126437,8 @@ self: {
          transformers-compat
        ];
        description = "Predicated traversal of generated trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126454,8 +126454,8 @@ self: {
          base directory filepath mtl old-time stm timers-updatable
        ];
        description = "Notification library for a filesystem hierarchy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126476,7 +126476,7 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        testHaskellDepends = [ base ];
        description = "WiFi connection script generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "higgledy" = callPackage
@@ -126495,8 +126495,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Partial types as a type constructor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126512,7 +126512,7 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Memory usage statistics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126536,7 +126536,7 @@ self: {
          transformers transformers-base unliftio
        ];
        description = "A rich monadic API for working with leveldb databases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "higherorder" = callPackage
@@ -126549,8 +126549,8 @@ self: {
        editedCabalFile = "0nflwfx4gng0kk2lxfsrrk10sgjln7jq4zl3ydv8i0n4m472b1y5";
        libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126568,8 +126568,8 @@ self: {
          aeson base bytestring criterion deepseq text
        ];
        description = "Spec based JSON parsing/serialisation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126588,8 +126588,8 @@ self: {
          aeson base bytestring highjson hspec lens QuickCheck swagger2 text
        ];
        description = "Derive swagger instances from highjson specs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126610,8 +126610,8 @@ self: {
          QuickCheck swagger2 text
        ];
        description = "Template Haskell helpers for highjson specs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126643,7 +126643,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Command line tool for highlighting parts of files matching a regex";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "highlight-versions" = callPackage
@@ -126659,8 +126659,8 @@ self: {
          ansi-terminal base Cabal containers hackage-db
        ];
        description = "Highlight package versions which differ from the latest version on Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126678,7 +126678,7 @@ self: {
          base blaze-html bytestring filepath mtl pcre-light text
        ];
        description = "source code highlighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "highlighter2" = callPackage
@@ -126695,7 +126695,7 @@ self: {
          base blaze-html bytestring containers filepath mtl pcre-light text
        ];
        description = "source code highlighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "highlighting-kate" = callPackage
@@ -126736,7 +126736,7 @@ self: {
          transformers
        ];
        description = "Generate STL models from SRTM elevation data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "himerge" = callPackage
@@ -126755,7 +126755,7 @@ self: {
        ];
        description = "Haskell Graphical User Interface for Emerge";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mozembed = null;};
 
@@ -126776,8 +126776,8 @@ self: {
          base bytestring directory gtk HTTP http-conduit network temporary
        ];
        description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126799,8 +126799,8 @@ self: {
          unordered-containers vector
        ];
        description = "multithreaded snmp poller for riemann";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126835,8 +126835,8 @@ self: {
          haskell-src-exts mtl utf8-string
        ];
        description = "Extensible Haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126853,8 +126853,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec ];
        description = "Template for Hindley-Milner based languages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126870,7 +126870,7 @@ self: {
          base containers deepseq hinduce-missingh parallel vector
        ];
        description = "Apriori algorithm for association rule mining";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hinduce-classifier" = callPackage
@@ -126881,8 +126881,8 @@ self: {
        sha256 = "1cdx916xkpsy2ilsmmdkyqax2gb0cx6sgkydvjbiw7qibd76ylza";
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126900,8 +126900,8 @@ self: {
          base convertible hinduce-classifier hinduce-missingh layout
        ];
        description = "Decision Tree Classifiers for hInduce";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126921,8 +126921,8 @@ self: {
          layout vector
        ];
        description = "Example data for hInduce";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126934,7 +126934,7 @@ self: {
        sha256 = "1606fz8qhvwqidi798y3mxlmbmwn8yp3a4cl59j4i8s05vgbaj9z";
        libraryHaskellDepends = [ base ];
        description = "Utility functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hinfo" = callPackage
@@ -126953,7 +126953,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base optparse-applicative text yaml ];
        description = "Command Line App With Info on your Haskell App";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hinit" = callPackage
@@ -126983,8 +126983,8 @@ self: {
          base fused-effects path-io quickcheck-text
        ];
        description = "Generic project initialization tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -126999,8 +126999,8 @@ self: {
        libraryHaskellDepends = [ async base containers directory unix ];
        testHaskellDepends = [ base directory ];
        description = "Haskell binding to inotify";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hinotify" = callPackage
@@ -127014,7 +127014,7 @@ self: {
        libraryHaskellDepends = [ async base bytestring containers unix ];
        testHaskellDepends = [ base bytestring directory unix ];
        description = "Haskell binding to inotify";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hinotify-bytestring" = callPackage
@@ -127032,7 +127032,7 @@ self: {
          base bytestring directory posix-paths unix utf8-string
        ];
        description = "Haskell binding to inotify, using ByteString filepaths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hinquire" = callPackage
@@ -127052,8 +127052,8 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Generate armet style query strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127070,7 +127070,7 @@ self: {
        ];
        description = "Installer wrapper for Haskell applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127091,7 +127091,7 @@ self: {
          base containers directory exceptions filepath HUnit stm unix
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hint-server" = callPackage
@@ -127106,8 +127106,8 @@ self: {
          base eprocess exceptions hint monad-loops mtl
        ];
        description = "A server process that runs hint";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127129,8 +127129,8 @@ self: {
          base directory exceptions extensible-exceptions filepath HUnit unix
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127157,8 +127157,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell / Erlang interoperability library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127174,7 +127174,7 @@ self: {
        executableHaskellDepends = [ base haskell98 random ];
        description = "Space Invaders";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127186,8 +127186,8 @@ self: {
        sha256 = "137jjwcs3a9n2zybkqqfdy2m1a2ahpdcmficwfmn7ykdz487xcsq";
        libraryHaskellDepends = [ base haskell98 Stream ];
        description = "Streams and Unique Fixed Points";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127212,8 +127212,8 @@ self: {
          base criterion deepseq repa repa-algorithms vector
        ];
        description = "Haskell Image Processing (HIP) Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127238,8 +127238,8 @@ self: {
          wreq
        ];
        description = "A library for building HipChat Bots";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127258,8 +127258,8 @@ self: {
          string-conversions text time
        ];
        description = "Hipchat API bindings in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127275,8 +127275,8 @@ self: {
          base containers hgeometry hxt parsec split text text-format
        ];
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127292,7 +127292,7 @@ self: {
          base bytestring directory functors mtl
        ];
        description = "an IPS patcher";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hircules" = callPackage
@@ -127311,7 +127311,7 @@ self: {
        ];
        description = "IRC client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127332,8 +127332,8 @@ self: {
          vector-space
        ];
        description = "Calculates IRT 2PL and 3PL models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127349,8 +127349,8 @@ self: {
          base bytestring conduit http-conduit http-types text time
        ];
        description = "Unofficial API bindings to KISSmetrics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127374,8 +127374,8 @@ self: {
          hist-pl-fusion hist-pl-lexicon hist-pl-lmf pipes polimorf
        ];
        description = "Umbrella package for the historical dictionary of Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127390,8 +127390,8 @@ self: {
          base binary containers dawg text text-binary
        ];
        description = "A generic, DAWG-based dictionary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127408,8 +127408,8 @@ self: {
          text text-binary
        ];
        description = "Merging historical dictionary with PoliMorf";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127426,8 +127426,8 @@ self: {
          hist-pl-types pipes text transformers
        ];
        description = "A binary representation of the historical dictionary of Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127439,8 +127439,8 @@ self: {
        sha256 = "146vz15fig8k1wcvcw7fg64abxvg1nyarvhigz9jkzf5yngkzwvm";
        libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        description = "LMF parsing for the historical dictionary of Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127452,7 +127452,7 @@ self: {
        sha256 = "146ywyh67a0hasgcpfmffrj8w1kg6anksaa3mm9f80k83shqhvrb";
        libraryHaskellDepends = [ base parsec ];
        description = "A simple EDSL for transliteration rules";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hist-pl-types" = callPackage
@@ -127463,8 +127463,8 @@ self: {
        sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v";
        libraryHaskellDepends = [ base binary text text-binary ];
        description = "Types in the historical dictionary of Polish";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127479,7 +127479,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        description = "Library for histograms creation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "histogram-fill-binary" = callPackage
@@ -127490,7 +127490,7 @@ self: {
        sha256 = "0dkvdc5sbnarpdam9gg6q1rvc5xx51pga0whzf6mq81yjn2ydvqy";
        libraryHaskellDepends = [ base binary histogram-fill vector ];
        description = "Binary instances for histogram-fill package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "histogram-fill-cereal" = callPackage
@@ -127501,7 +127501,7 @@ self: {
        sha256 = "1kaj56b7cp2c4s0fdkirw48igy54zhdrcrjsjpyv4cnywq8nvqrq";
        libraryHaskellDepends = [ base cereal histogram-fill vector ];
        description = "Binary instances for histogram-fill package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "historian" = callPackage
@@ -127518,8 +127518,8 @@ self: {
          base containers directory filepath process regex-compat regex-posix
        ];
        description = "Extract the interesting bits from shell history";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127538,8 +127538,8 @@ self: {
          base bytestring containers git hashable hashtables hourglass
        ];
        description = "Git like program in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127555,8 +127555,8 @@ self: {
          base containers fgl hashable hit transformers unordered-containers
        ];
        description = "Use graph algorithms to access and manipulate Git repos";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127578,8 +127578,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base github hspec text ];
        description = "Haskell Git Helper Tool";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127596,8 +127596,8 @@ self: {
          text unordered-containers vector
        ];
        description = "Jcase library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127609,7 +127609,7 @@ self: {
        sha256 = "0wmzxwi24q7r0yxnalzqnn3k0bzf7wc4ql26dv94pvzir156kahj";
        libraryHaskellDepends = [ base containers hjson parsec ];
        description = "XPath-like syntax for querying JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hjs" = callPackage
@@ -127627,8 +127627,8 @@ self: {
          array base bytestring containers directory mtl parsec regex-compat
        ];
        description = "JavaScript Parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127652,7 +127652,7 @@ self: {
          base directory extra filepath process unix
        ];
        description = "Haskell implementation of a javascript minifier";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hjson" = callPackage
@@ -127663,7 +127663,7 @@ self: {
        sha256 = "1r59g5ypqjsldflsddg7pzpa6j8jps5nwm4h9cwiw7qk734rjik8";
        libraryHaskellDepends = [ base containers parsec ];
        description = "JSON parsing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hjson-query" = callPackage
@@ -127674,8 +127674,8 @@ self: {
        sha256 = "0sj86rm5pz0q9079f5kjnpz51dxvvq72waaf8h64jzrrhkpz8mlx";
        libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127697,8 +127697,8 @@ self: {
          vector
        ];
        description = "JSON Pointer library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127729,8 +127729,8 @@ self: {
          wai-app-static warp
        ];
        description = "JSON Schema library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127751,7 +127751,7 @@ self: {
          tasty-quickcheck text transformers unordered-containers
        ];
        description = "Majority Judgment";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hjugement-cli" = callPackage
@@ -127780,8 +127780,8 @@ self: {
          time transformers unix unordered-containers
        ];
        description = "Majority Judgment and Helios-C command line tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127809,7 +127809,7 @@ self: {
          transformers
        ];
        description = "A cryptographic protocol for the Majority Judgment";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hkd" = callPackage
@@ -127835,7 +127835,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ aeson base ];
        description = "Apply default value for optional field of HKD";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hkd-delta" = callPackage
@@ -127846,8 +127846,8 @@ self: {
        sha256 = "0qb20y6nca61h4mpgyhi6xfcwxf4q92pscr5zqd8yklfcz4qqyz9";
        libraryHaskellDepends = [ base ];
        description = "Definition of \"Delta structures\" for higher kinded data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127859,8 +127859,8 @@ self: {
        sha256 = "0s3siyp85k84c9j1srg8y78ia6yj9s6vls9y1hnkgsmg1mx755qg";
        libraryHaskellDepends = [ base profunctors ];
        description = "Generic lens/prism/traversal-kinded data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127873,7 +127873,7 @@ self: {
        libraryHaskellDepends = [ base byteable bytestring cryptohash ];
        testHaskellDepends = [ base byteable bytestring cryptohash hspec ];
        description = "Implementation of HKDF (RFC 5869)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hkgr" = callPackage
@@ -127892,7 +127892,7 @@ self: {
          simple-cmd-args xdg-basedir
        ];
        description = "Simple Hackage release workflow for package maintainers";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hkt" = callPackage
@@ -127907,8 +127907,8 @@ self: {
          base hspec inspection-testing protolude text
        ];
        description = "A library for higher kinded types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127928,7 +127928,7 @@ self: {
          template-haskell transformers uniplate utf8-string
        ];
        description = "A library to build valid LaTeX files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hlbfgsb" = callPackage
@@ -127946,8 +127946,8 @@ self: {
          base HUnit test-framework test-framework-hunit vector
        ];
        description = "Haskell binding to L-BFGS-B version 3.0";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gfortran;};
 
@@ -127969,8 +127969,8 @@ self: {
          array base bytestring bytestring-csv containers haskell98 parallel
        ];
        description = "Fast algorithm for mining closed frequent itemsets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -127993,7 +127993,7 @@ self: {
          websockets
        ];
        description = "Web Socket interface to Leap Motion controller";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hledger" = callPackage
@@ -128036,8 +128036,8 @@ self: {
          utility-ht wizards
        ];
        description = "Command-line interface for the hledger accounting system";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hledger-api" = callPackage
@@ -128061,8 +128061,8 @@ self: {
          wai-extra warp
        ];
        description = "Web API server for the hledger accounting tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128082,7 +128082,7 @@ self: {
        ];
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128096,7 +128096,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
        description = "Compares the transactions in two ledger files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hledger-flow" = callPackage
@@ -128119,7 +128119,7 @@ self: {
          base containers foldl HUnit path path-io stm text turtle
        ];
        description = "An hledger workflow focusing on automated statement import and classification";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hledger-iadd" = callPackage
@@ -128154,7 +128154,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A terminal UI as drop-in replacement for hledger add";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hledger-interest" = callPackage
@@ -128172,8 +128172,8 @@ self: {
          base Cabal Decimal hledger-lib mtl text time
        ];
        description = "computes interest for a given account";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hledger-irr" = callPackage
@@ -128191,8 +128191,8 @@ self: {
          text time
        ];
        description = "computes the internal rate of return of an investment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128229,7 +128229,7 @@ self: {
          uglymemo unordered-containers utf8-string
        ];
        description = "A reusable library providing the core functionality of hledger";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hledger-makeitso" = callPackage
@@ -128250,7 +128250,7 @@ self: {
          base containers foldl HUnit stm text turtle
        ];
        description = "An hledger workflow focusing on automated statement import and classification";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hledger-stockquotes" = callPackage
@@ -128273,7 +128273,7 @@ self: {
          base hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        description = "Generate HLedger Price Directives From Daily Stock Quotes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hledger-ui" = callPackage
@@ -128296,8 +128296,8 @@ self: {
          split text text-zipper time transformers unix vector vty
        ];
        description = "Curses-style terminal interface for the hledger accounting system";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hledger-vty" = callPackage
@@ -128315,7 +128315,7 @@ self: {
        ];
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128351,8 +128351,8 @@ self: {
          base hledger hledger-lib hspec text yesod yesod-test
        ];
        description = "Web-based user interface for the hledger accounting system";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hlibBladeRF" = callPackage
@@ -128366,8 +128366,8 @@ self: {
        libraryPkgconfigDepends = [ libbladeRF ];
        testHaskellDepends = [ base hlint ];
        description = "Haskell binding to libBladeRF SDR library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libbladeRF;};
 
@@ -128383,7 +128383,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Bindings to https://github.com/anrieff/libcpuid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hlibev" = callPackage
@@ -128395,8 +128395,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        librarySystemDepends = [ ev ];
        description = "FFI interface to libev";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ev = null;};
 
@@ -128409,8 +128409,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fam;};
 
@@ -128425,7 +128425,7 @@ self: {
        testHaskellDepends = [ base process ];
        testToolDepends = [ git ];
        description = "Low-level bindings to libgit2";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) git; inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
@@ -128440,7 +128440,7 @@ self: {
        librarySystemDepends = [ libsass ];
        testHaskellDepends = [ base hspec ];
        description = "Low-level bindings to Libsass";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
@@ -128465,8 +128465,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Source code suggestions";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "hlint-test" = callPackage
@@ -128480,7 +128480,7 @@ self: {
        libraryHaskellDepends = [ base hlint ];
        executableHaskellDepends = [ base hlint ];
        description = "Run hlint in test suite";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hlist" = callPackage
@@ -128493,7 +128493,7 @@ self: {
        editedCabalFile = "0qcvl0krnhyvvn857p1b6mc65mglbplywcmx8n8vb8ikw5vhkh68";
        libraryHaskellDepends = [ base ];
        description = "Heterogeneous list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hlivy" = callPackage
@@ -128510,8 +128510,8 @@ self: {
          resourcet text transformers unordered-containers
        ];
        description = "Client library for the Apache Livy REST API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128523,8 +128523,8 @@ self: {
        sha256 = "1q3jsnxy7x0lv7wqfv9hlqnr22661k4agbb8yjbhj32fxyjqrn4f";
        libraryHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent, extendable and easy-to-use logging library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128543,8 +128543,8 @@ self: {
          base bytestring curl regex-base regex-posix
        ];
        description = "Library and utility interfacing to longurl.org";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128562,8 +128562,8 @@ self: {
          hlrdb-core memory random store time unordered-containers zstd
        ];
        description = "High-level Redis Database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128582,8 +128582,8 @@ self: {
          unordered-containers
        ];
        description = "High-level Redis Database Core API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128597,7 +128597,7 @@ self: {
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128615,7 +128615,7 @@ self: {
          hls-plugin-api lens shake text transformers unordered-containers
        ];
        description = "Class/instance management plugin for Haskell Language Server";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hls-eval-plugin" = callPackage
@@ -128637,7 +128637,7 @@ self: {
          unordered-containers
        ];
        description = "Eval plugin for Haskell Language Server";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hls-exactprint-utils" = callPackage
@@ -128654,7 +128654,7 @@ self: {
          hls-plugin-api retrie syb text transformers
        ];
        description = "Common utilities to interaction between ghc-exactprint and HLS plugins";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hls-explicit-imports-plugin" = callPackage
@@ -128671,8 +128671,8 @@ self: {
          hls-plugin-api shake text unordered-containers
        ];
        description = "Explicit imports plugin for Haskell Language Server";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128691,7 +128691,7 @@ self: {
          hls-plugin-api text unordered-containers
        ];
        description = "Haddock comments plugin for Haskell Language Server";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hls-hlint-plugin" = callPackage
@@ -128712,8 +128712,8 @@ self: {
          temporary text transformers unordered-containers
        ];
        description = "Hlint integration plugin with Haskell Language Server";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128734,7 +128734,7 @@ self: {
          unordered-containers
        ];
        description = "Haskell Language Server API for plugin communication";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hls-retrie-plugin" = callPackage
@@ -128753,8 +128753,8 @@ self: {
          shake text transformers unordered-containers
        ];
        description = "Retrie integration plugin for Haskell Language Server";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128774,7 +128774,7 @@ self: {
          syb text transformers unordered-containers
        ];
        description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hlwm" = callPackage
@@ -128789,8 +128789,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base stm transformers unix X11 ];
        description = "Bindings to the herbstluftwm window manager";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128806,7 +128806,7 @@ self: {
        ];
        description = "Haskell LilyPond";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128825,8 +128825,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A tool and library for Markov chains based text generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128840,8 +128840,8 @@ self: {
          base containers mtl network parsec xhtml
        ];
        description = "Simple wikitext-like markup format implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128861,7 +128861,7 @@ self: {
        ];
        librarySystemDepends = [ openblasCompat ];
        description = "Numeric Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openblasCompat;};
 
   "hmatrix-backprop" = callPackage
@@ -128883,7 +128883,7 @@ self: {
          microlens microlens-platform vector-sized vinyl
        ];
        description = "hmatrix operations lifted for backprop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmatrix-banded" = callPackage
@@ -128897,8 +128897,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix transformers ];
        librarySystemDepends = [ liblapack ];
        description = "HMatrix interface to LAPACK functions for banded matrices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {liblapack = null;};
 
@@ -128910,7 +128910,7 @@ self: {
        sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb";
        libraryHaskellDepends = [ base bytestring cassava hmatrix vector ];
        description = "CSV encoding and decoding for hmatrix";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmatrix-glpk" = callPackage
@@ -128922,7 +128922,7 @@ self: {
        libraryHaskellDepends = [ base containers hmatrix ];
        librarySystemDepends = [ glpk ];
        description = "Linear Programming based on GLPK";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
@@ -128937,7 +128937,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gsl ];
        description = "Numerical computation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
@@ -128953,7 +128953,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ gsl ];
        description = "GSL Statistics interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-mmap" = callPackage
@@ -128964,8 +128964,8 @@ self: {
        sha256 = "03z1f1xqw4hqh41q6hh8p103cl7dg9hqcawqlinapfmkvw5mzy8d";
        libraryHaskellDepends = [ base hmatrix mmap ];
        description = "Memory map Vector from disk into memory efficiently";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -128986,7 +128986,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion hmatrix ];
        description = "Low-level machine learning auxiliary functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "hmatrix-nipals" = callPackage
@@ -128999,8 +128999,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix ];
        description = "NIPALS method for Principal Components Analysis on large data-sets";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129013,7 +129013,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ];
        testHaskellDepends = [ base doctest ];
        description = "Interface HMatrix with the NLOPT minimizer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
@@ -129025,7 +129025,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix vector ];
        librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) QuadProgpp;};
 
   "hmatrix-repa" = callPackage
@@ -129036,7 +129036,7 @@ self: {
        sha256 = "1gki1qp8gi8953iqq9i6nsxrjjgjqsq7q105icjp585f01la9hsi";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        description = "Adaptors for interoperability between hmatrix and repa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmatrix-sparse" = callPackage
@@ -129049,8 +129049,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ];
        description = "Sparse linear solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
 
@@ -129062,7 +129062,7 @@ self: {
        sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz";
        libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
        description = "Interface to GSL special functions";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hmatrix-static" = callPackage
@@ -129078,7 +129078,7 @@ self: {
        ];
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129106,8 +129106,8 @@ self: {
          base bytestring cassava clock hmatrix optparse-applicative
        ];
        description = "hmatrix interface to sundials";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {sundials_arkode = null; sundials_cvode = null;};
 
@@ -129123,8 +129123,8 @@ self: {
        testHaskellDepends = [ base hmatrix hspec QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        description = "SVDLIBC bindings for HMatrix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129140,8 +129140,8 @@ self: {
          base haskell-src-exts haskell-src-meta hmatrix template-haskell
        ];
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129159,8 +129159,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck random ];
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        description = "Tests for hmatrix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129177,7 +129177,7 @@ self: {
          base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized
        ];
        description = "Conversions between hmatrix and vector-sized types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmeap" = callPackage
@@ -129193,7 +129193,7 @@ self: {
        ];
        description = "Haskell Meapsoft Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129214,7 +129214,7 @@ self: {
        ];
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129230,7 +129230,7 @@ self: {
          base binary containers monad-stm stm transformers
        ];
        description = "In-memory relational database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmenu" = callPackage
@@ -129243,8 +129243,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base MissingH process ];
        description = "CLI fuzzy finder and launcher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129264,8 +129264,8 @@ self: {
        executableHaskellDepends = [ base probable vector ];
        testHaskellDepends = [ base HUnit vector ];
        description = "HMEP Multi Expression Programming – a genetic programming variant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129277,7 +129277,7 @@ self: {
        sha256 = "0q2b2hk6s0fnyw67yfrbmiv7m2cwdcz1q86zzcna4ci5gyv0j07d";
        libraryHaskellDepends = [ base stm ];
        description = "Binding to the OS level MIDI services";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hmk" = callPackage
@@ -129297,7 +129297,7 @@ self: {
        ];
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129313,8 +129313,8 @@ self: {
          array base data-memocombinators list-extras logfloat
        ];
        description = "A hidden markov model library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129333,8 +129333,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using HMatrix primitives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129355,8 +129355,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using LAPACK primitives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129378,7 +129378,7 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -129412,7 +129412,7 @@ self: {
        libraryHaskellDepends = [ base integer-gmp ];
        librarySystemDepends = [ mpfr ];
        description = "Haskell binding to the MPFR library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) mpfr;};
 
   "hmt" = callPackage
@@ -129433,7 +129433,7 @@ self: {
        ];
        description = "Haskell Music Theory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129452,7 +129452,7 @@ self: {
        ];
        description = "Haskell Music Theory Diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129472,7 +129472,7 @@ self: {
        ];
        description = "Interpreter for the MUMPS langugae";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129502,8 +129502,8 @@ self: {
        ];
        testSystemDepends = [ netcdf ];
        description = "Haskell NetCDF library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) netcdf;};
 
@@ -129560,7 +129560,7 @@ self: {
          template-haskell text time transformers unordered-containers
        ];
        description = "Haskell implementation of the Nix language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hnix-store-core" = callPackage
@@ -129588,7 +129588,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hnix-store-core_0_4_1_0" = callPackage
@@ -129617,8 +129617,8 @@ self: {
          tasty-hspec tasty-hunit tasty-quickcheck temporary text unix
        ];
        description = "Core effects for interacting with the Nix store";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hnix-store-remote" = callPackage
@@ -129635,7 +129635,7 @@ self: {
          network nix-derivation text time unordered-containers
        ];
        description = "Remote hnix store";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hnn" = callPackage
@@ -129653,7 +129653,7 @@ self: {
          vector-binary-instances zlib
        ];
        description = "A reasonably fast and simple neural network library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hnock" = callPackage
@@ -129668,7 +129668,7 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
        description = "A Nock interpreter";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hnop" = callPackage
@@ -129681,7 +129681,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hnormalise" = callPackage
@@ -129722,8 +129722,8 @@ self: {
          aeson attoparsec base criterion random text
        ];
        description = "Log message normalisation tool producing structured JSON messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129739,8 +129739,8 @@ self: {
        ];
        testHaskellDepends = [ base compdata patch-combinators ];
        description = "Generic rewrite rules with safe treatment of variables and binders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129758,8 +129758,8 @@ self: {
          old-locale random RSA SHA time utf8-string
        ];
        description = "A Haskell implementation of OAuth 1.0a protocol.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129780,7 +129780,7 @@ self: {
          uri-bytestring-aeson
        ];
        description = "Haskell OAuth2 authentication client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hob" = callPackage
@@ -129807,8 +129807,8 @@ self: {
          base containers gtk3 gtksourceview3 hspec mtl text
        ];
        description = "A source code editor aiming for the convenience of use";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129826,8 +129826,8 @@ self: {
          base filemanip filepath fsnotify system-filepath text
        ];
        description = "A small file watcher for OSX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129845,8 +129845,8 @@ self: {
          tagged template-haskell th-expand-syns transformers vector
        ];
        description = "A library for canonically representing terms with binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129866,8 +129866,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        testSystemDepends = [ ocilib ];
        description = "FFI binding to OCILIB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ocilib = null;};
 
@@ -129910,8 +129910,8 @@ self: {
          tasty-smallcheck text unordered-containers word8
        ];
        description = "Interact with the docker registry and generate nix build instructions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129924,7 +129924,7 @@ self: {
        libraryHaskellDepends = [ base hspec MissingH parsec split ];
        testHaskellDepends = [ base hspec MissingH parsec split ];
        description = "Small library for typesafe's configuration specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hodatime" = callPackage
@@ -129947,8 +129947,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "A fully featured date/time library based on Nodatime";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129967,8 +129967,8 @@ self: {
          text time
        ];
        description = "hoe: Haskell One-liner Evaluator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -129981,7 +129981,7 @@ self: {
        libraryHaskellDepends = [ base mtl star-to-star template-haskell ];
        description = "defining @mtl@-ready monads as * -> * fixed-points";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hog" = callPackage
@@ -129998,8 +129998,8 @@ self: {
          base cmdargs filepath irc network old-locale time unix
        ];
        description = "Simple IRC logger bot";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130017,8 +130017,8 @@ self: {
          array base bytestring containers HUnit mtl old-locale random time
        ];
        description = "Library and tools to manipulate the Ogg container format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130044,8 +130044,8 @@ self: {
          optparse-applicative servant-client text time transformers
        ];
        description = "Bindings to the Toggl.com REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130061,8 +130061,8 @@ self: {
        libraryToolDepends = [ cgen cgen-hs grgen ];
        doHaddock = false;
        description = "Haskell binding to a subset of OGRE";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
@@ -130078,8 +130078,8 @@ self: {
        executableHaskellDepends = [ base hogre ];
        executableSystemDepends = [ OgreMain ];
        description = "Examples for using Hogre";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OgreMain = null;};
 
@@ -130095,8 +130095,8 @@ self: {
        librarySystemDepends = [ OIS ];
        executableHaskellDepends = [ base X11 ];
        description = "OIS bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OIS = null;};
 
@@ -130110,7 +130110,7 @@ self: {
        editedCabalFile = "1xp8l236gflh5njl3s8f0d2ahqypks70pfjnawskc0fcnl818qpa";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hol" = callPackage
@@ -130140,8 +130140,8 @@ self: {
          transformers
        ];
        description = "Higher order logic";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130153,8 +130153,8 @@ self: {
        sha256 = "1j2ql6izsd85skd6l9j1qfg7pj5rf513096s9bkvqip9bb4ibr4r";
        libraryHaskellDepends = [ base random safe ];
        description = "An engine for Texas hold'em Poker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130166,8 +130166,8 @@ self: {
        sha256 = "05ba87wk9b5i5b4gsfvsj16rv91dqsmzyys6b5fkssrxh2ika36c";
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130179,7 +130179,7 @@ self: {
        sha256 = "13f6f647ykssqgdqw4fp7gnr2ardxbcn41ksgs15v5dx1n1xvan1";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "holmes" = callPackage
@@ -130203,7 +130203,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit tasty-discover ];
        description = "Tools and combinators for solving constraint problems";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "holy-project" = callPackage
@@ -130237,8 +130237,8 @@ self: {
        ];
        doCheck = false;
        description = "Start your Haskell project with cabal, git and tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130250,8 +130250,8 @@ self: {
        sha256 = "1wm15bdz02sjgpz2n266xd50q3p6mncnv8mhimky6ps1kmzb5r6c";
        libraryHaskellDepends = [ base containers mtl QuickCheck ];
        description = "Homeomorphic Embedding Test";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130265,8 +130265,8 @@ self: {
          array base directory haskell98 random time
        ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130281,7 +130281,7 @@ self: {
        ];
        description = "DirectSound extension (Windows) for the Hommage sound library";
        license = "GPL";
-       platforms = stdenv.lib.platforms.none;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "homoiconic" = callPackage
@@ -130293,8 +130293,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130309,7 +130309,7 @@ self: {
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base OneTuple Only single-tuple ];
        description = "Homotuple, all whose elements are the same type";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "homplexity" = callPackage
@@ -130336,8 +130336,8 @@ self: {
          base filepath haskell-src-exts hspec template-haskell
        ];
        description = "Haskell code quality tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130351,7 +130351,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hourglass split ];
        executableHaskellDepends = [ base hourglass split ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "honi" = callPackage
@@ -130367,8 +130367,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
@@ -130380,7 +130380,7 @@ self: {
        sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf";
        libraryHaskellDepends = [ base ];
        description = "Cross-platform interface to the PC speaker";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hoobuddy" = callPackage
@@ -130398,8 +130398,8 @@ self: {
          mtl process yaml
        ];
        description = "Simple tool for fetching and merging hoogle data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130412,8 +130412,8 @@ self: {
        libraryHaskellDepends = [ array base FPretty ghc-prim ];
        testHaskellDepends = [ base ghc-prim ];
        description = "Debugging by observing in place";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130425,8 +130425,8 @@ self: {
        sha256 = "15rj6qfyhihzc5svl3dwkn387x7bbkl5am7h0kj5jjj8hv2q1pnc";
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130438,8 +130438,8 @@ self: {
        sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02";
        libraryHaskellDepends = [ array base ];
        description = "Debugging by observing in place";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130457,8 +130457,8 @@ self: {
          array astar base containers hfov monad-loops mtl ncurses random
        ];
        description = "A small, toy roguelike";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130479,8 +130479,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs hoodle-core ];
        description = "Executable for hoodle";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130497,8 +130497,8 @@ self: {
          strict text
        ];
        description = "text builder for hoodle file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130531,8 +130531,8 @@ self: {
        ];
        librarySystemDepends = [ libX11 libXi ];
        description = "Core library for hoodle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
 
@@ -130558,8 +130558,8 @@ self: {
          unordered-containers xournal-parser
        ];
        description = "extra hoodle tools";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130577,8 +130577,8 @@ self: {
          lens mtl strict text transformers xournal-types
        ];
        description = "Hoodle file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130605,8 +130605,8 @@ self: {
          base cmdargs directory directory-tree filepath gtk3
        ];
        description = "publish hoodle files as a static web site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130627,8 +130627,8 @@ self: {
          uuid
        ];
        description = "Hoodle file renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130645,8 +130645,8 @@ self: {
          vector
        ];
        description = "Data types for programs for hoodle file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130679,7 +130679,7 @@ self: {
        executableHaskellDepends = [ base ];
        testTarget = "--test-option=--no-net";
        description = "Haskell API Search";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hoogle-index" = callPackage
@@ -130698,8 +130698,8 @@ self: {
          optparse-applicative process temporary transformers
        ];
        description = "Easily generate Hoogle indices for installed packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130711,8 +130711,8 @@ self: {
        sha256 = "0gwdqpml8kn8xxxaq628d4way29k2f31f5av49fx7qj150h5qs5b";
        libraryHaskellDepends = [ base directory process text ];
        description = "run executables in a directory as hooks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130729,7 +130729,7 @@ self: {
          network stm
        ];
        description = "Abstraction over creating network connections with SOCKS5 and TLS";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "hoop" = callPackage
@@ -130750,8 +130750,8 @@ self: {
          parsec pretty template-haskell text
        ];
        description = "Object-Oriented Programming in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130771,8 +130771,8 @@ self: {
          test-framework-hunit
        ];
        description = "A library to support dataflow analysis and optimization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130796,8 +130796,8 @@ self: {
          snap-core snap-server text time transformers unix xml
        ];
        description = "Haskell Media Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130814,8 +130814,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell binding to libopencc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) opencc;};
 
@@ -130835,8 +130835,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Haskell bindings for OpenCL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OpenCL = null;};
 
@@ -130868,7 +130868,7 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "hOpenPGP-based command-line tools";
-       license = stdenv.lib.licenses.agpl3Plus;
+       license = lib.licenses.agpl3Plus;
      }) {};
 
   "hopenssl" = callPackage
@@ -130883,8 +130883,8 @@ self: {
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "FFI Bindings to OpenSSL's EVP Digest Interface";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {inherit (pkgs) openssl;};
 
   "hopfield" = callPackage
@@ -130915,8 +130915,8 @@ self: {
          QuickCheck random vector
        ];
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
@@ -130939,7 +130939,7 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Hopfield Networks for unsupervised learning in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hopfli" = callPackage
@@ -130953,7 +130953,7 @@ self: {
        libraryHaskellDepends = [ base bytestring zlib ];
        testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
        description = "Bidings to Google's Zopfli compression library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hoppy-docs" = callPackage
@@ -130967,8 +130967,8 @@ self: {
          base haskell-src hoppy-generator hoppy-runtime
        ];
        description = "C++ FFI generator - Documentation";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -130985,8 +130985,8 @@ self: {
          process temporary text
        ];
        description = "C++ FFI generator - Code generator";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131000,8 +131000,8 @@ self: {
          base Cabal containers directory filepath
        ];
        description = "C++ FFI generator - Runtime support";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131016,8 +131016,8 @@ self: {
          base filepath haskell-src hoppy-generator
        ];
        description = "C++ FFI generator - Standard library bindings";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131050,8 +131050,8 @@ self: {
          filepath process QuickCheck text transformers vector
        ];
        description = "Handy Operations on Power Series";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131071,8 +131071,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "A language based on homotopy type theory with an interval type";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131090,7 +131090,7 @@ self: {
          timezone-series
        ];
        description = "date time";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "horizon" = callPackage
@@ -131101,8 +131101,8 @@ self: {
        sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4";
        libraryHaskellDepends = [ AC-Angle base time ];
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131121,8 +131121,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Rename function definitions returned by SMT solvers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131140,7 +131140,7 @@ self: {
          time transformers
        ];
        description = "Haskell Open Sound Control";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hosc-json" = callPackage
@@ -131159,7 +131159,7 @@ self: {
        ];
        description = "Haskell Open Sound Control JSON Serialisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131181,7 +131181,7 @@ self: {
        ];
        description = "Haskell Open Sound Control Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {www-minus = null;};
 
@@ -131200,7 +131200,7 @@ self: {
          hashable iproute microlens-th text
        ];
        description = "Network Host Addresses";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hostname" = callPackage
@@ -131211,7 +131211,7 @@ self: {
        sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
        libraryHaskellDepends = [ base ];
        description = "A very simple package providing a cross-platform means of determining the hostname";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hostname-validate" = callPackage
@@ -131222,7 +131222,7 @@ self: {
        sha256 = "0my8g4kqf9mz7ii79ff53rwkx3yv9kkn4jbm60q4b7g1rzhb3bvz";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Validate hostnames e.g. localhost or foo.co.uk.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hosts-server" = callPackage
@@ -131239,8 +131239,8 @@ self: {
          attoparsec base bytestring data-default dns iproute network
        ];
        description = "An dns server which is extremely easy to config";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131259,8 +131259,8 @@ self: {
          haskell-src-exts optparse-applicative split
        ];
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131272,8 +131272,8 @@ self: {
        sha256 = "1c614gvwypfqaj4gqsdimqq40i34w393vikq5hhy3d4qll2qp8hv";
        libraryHaskellDepends = [ base plugins ];
        description = "Simple code hotswapping";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131293,7 +131293,7 @@ self: {
          base bytestring deepseq gauge mtl old-locale time
        ];
        description = "simple performant time related library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hourglass-fuzzy-parsing" = callPackage
@@ -131304,8 +131304,8 @@ self: {
        sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37";
        libraryHaskellDepends = [ base hourglass parsec ];
        description = "A small library for parsing more human friendly date/time formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131322,7 +131322,7 @@ self: {
          aeson base hourglass hspec hspec-expectations text
        ];
        description = "Orphan Aeson instances to hourglass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "houseman" = callPackage
@@ -131351,8 +131351,8 @@ self: {
          streaming-commons temporary text time trifecta unix
        ];
        description = "A Haskell implementation of Foreman";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131365,7 +131365,7 @@ self: {
        libraryHaskellDepends = [ base indexed ];
        testHaskellDepends = [ base do-notation indexed ];
        description = "Non-interactive proof assistant monad for first-order logic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hp2any-core" = callPackage
@@ -131381,8 +131381,8 @@ self: {
          old-locale process time
        ];
        description = "Heap profiling helper library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131404,8 +131404,8 @@ self: {
        ];
        executableSystemDepends = [ freeglut libGL libGLU ];
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
@@ -131427,8 +131427,8 @@ self: {
          glib gtk gtkglext hp2any-core hp2any-graph OpenGL time
        ];
        description = "A utility to visualise and compare heap profiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131443,7 +131443,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers filepath ];
        description = "A tool for converting GHC heap-profiles to HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hp2pretty" = callPackage
@@ -131461,7 +131461,7 @@ self: {
          optparse-applicative semigroups text
        ];
        description = "generate pretty graphs from heap profiles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpack" = callPackage
@@ -131499,7 +131499,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A modern format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hpack-convert" = callPackage
@@ -131530,8 +131530,8 @@ self: {
          split temporary text unordered-containers vector yaml
        ];
        description = "Convert Cabal manifests into hpack's package.yamls";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131562,8 +131562,8 @@ self: {
          tasty-golden text transformers utf8-string yaml
        ];
        description = "hpack's dhalling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131581,8 +131581,8 @@ self: {
          aeson base cmdargs filepath hpaco-lib strict utf8-string yaml
        ];
        description = "Modular template compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131600,8 +131600,8 @@ self: {
          mtl parsec safe split strict transformers
        ];
        description = "Modular template compiler library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131623,8 +131623,8 @@ self: {
          process time wx wxcore
        ];
        description = "A scrapbook for Haskell developers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131637,8 +131637,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) papi;};
 
@@ -131667,7 +131667,7 @@ self: {
        ];
        description = "Haskell paste web site";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131687,8 +131687,8 @@ self: {
          lifted-base network optparse-applicative process safe utf8-string
        ];
        description = "A command-line client for hpaste.org";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131705,7 +131705,7 @@ self: {
          utf8-string word8
        ];
        description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpath-directory" = callPackage
@@ -131728,7 +131728,7 @@ self: {
          process time unix unix-bytestring utf8-string
        ];
        description = "Alternative to 'directory' package with ByteString based filepaths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpath-filepath" = callPackage
@@ -131739,7 +131739,7 @@ self: {
        sha256 = "01sclksryvl8z56asxda2q4wx0snc89482xlav6mrgzxsi432a07";
        libraryHaskellDepends = [ base bytestring unix word8 ];
        description = "ByteString based filepath manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpath-io" = callPackage
@@ -131756,7 +131756,7 @@ self: {
          safe-exceptions streamly time unix
        ];
        description = "High-level IO operations on files/directories";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpath-posix" = callPackage
@@ -131767,7 +131767,7 @@ self: {
        sha256 = "1gxqrlxcm01ysd3hs61rhzfa3inxsj1w0hncydf1q66skshabzmf";
        libraryHaskellDepends = [ base bytestring hpath-filepath unix ];
        description = "Some low-level POSIX glue code, that is not in 'unix'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc_0_6_0_3" = callPackage
@@ -131782,8 +131782,8 @@ self: {
          base containers directory filepath time
        ];
        description = "Code Coverage Library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hpc-codecov" = callPackage
@@ -131804,7 +131804,7 @@ self: {
          base directory filepath tar tasty tasty-hunit
        ];
        description = "Generate codecov report from hpc data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc-coveralls" = callPackage
@@ -131829,8 +131829,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Coveralls.io support for Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131857,7 +131857,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Convert HPC output into LCOV format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc-strobe" = callPackage
@@ -131868,7 +131868,7 @@ self: {
        sha256 = "1fgw4pf72684mi7s5pqvfj75s8y004rxf3ww377kyrlw1mb7405c";
        libraryHaskellDepends = [ base filepath hpc ];
        description = "Hpc-generated strobes for a running Haskell program";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc-threshold" = callPackage
@@ -131885,7 +131885,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq hspec ];
        description = "Ensure the code coverage is above configured thresholds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpc-tracer" = callPackage
@@ -131903,8 +131903,8 @@ self: {
          unix
        ];
        description = "Tracer with AJAX interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131928,7 +131928,7 @@ self: {
          base bytestring memory optparse-applicative semigroups utf8-string
        ];
        description = "A tool for looking through PDF file using Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hpg" = callPackage
@@ -131941,8 +131941,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random ];
        description = "a simple password generator";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131972,8 +131972,8 @@ self: {
          protolude QuickCheck
        ];
        description = "Monads for GPIO in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -131990,8 +131990,8 @@ self: {
          transformers
        ];
        description = "monadic, reactive Formlets running in the Web browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hplaylist" = callPackage
@@ -132006,7 +132006,7 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132027,7 +132027,7 @@ self: {
        ];
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132048,7 +132048,7 @@ self: {
        executableHaskellDepends = [ base directory filepath time ];
        testHaskellDepends = [ base bytestring transformers ];
        description = "A Haskell pre-processor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hpqtypes" = callPackage
@@ -132077,8 +132077,8 @@ self: {
          unordered-containers uuid-types vector
        ];
        description = "Haskell bindings to libpqtypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) postgresql;};
 
@@ -132104,8 +132104,8 @@ self: {
          tasty-hunit text transformers uuid-types
        ];
        description = "Extra utilities for hpqtypes library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132135,8 +132135,8 @@ self: {
        ];
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132165,8 +132165,8 @@ self: {
        ];
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132189,7 +132189,7 @@ self: {
          wai-extra warp warp-tls
        ];
        description = "a lightweight HTTP proxy server, and more";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "hps" = callPackage
@@ -132202,7 +132202,7 @@ self: {
        libraryHaskellDepends = [ base filepath hcg-minus process ];
        description = "Haskell Postscript";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132219,7 +132219,7 @@ self: {
        executableHaskellDepends = [ base cairo gtk hps random ];
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132231,8 +132231,8 @@ self: {
        sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc";
        libraryHaskellDepends = [ base vector ];
        description = "A nice implementation of the k-Means algorithm";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132246,7 +132246,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libpuz";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hpygments" = callPackage
@@ -132261,8 +132261,8 @@ self: {
          aeson base bytestring process process-extras
        ];
        description = "Highlight source code using Pygments";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132279,7 +132279,7 @@ self: {
        ];
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132295,8 +132295,8 @@ self: {
          base lens optparse-applicative parsec text
        ];
        description = "pyrg utility done right";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132326,8 +132326,8 @@ self: {
          base criterion deepseq megaparsec text validation
        ];
        description = "Python language tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132358,7 +132358,7 @@ self: {
        ];
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132371,7 +132371,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132389,7 +132389,7 @@ self: {
          test-framework-hunit text xmlhtml
        ];
        description = "A query language for transforming HTML5";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hranker" = callPackage
@@ -132402,8 +132402,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132423,8 +132423,8 @@ self: {
        ];
        testHaskellDepends = [ base hset transformers-base ];
        description = "Generalization of MonadReader and ReaderT using hset";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132440,8 +132440,8 @@ self: {
          base comonad hreader hset lens lens-action profunctors
        ];
        description = "Optics for hreader package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132470,8 +132470,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A Type dependent Highlevel HTTP client library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132496,8 +132496,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Conduit streaming support for Hreq";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132518,8 +132518,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Core functionality for Hreq Http client library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132532,7 +132532,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base process tasty tasty-hunit ];
        description = "File size in human readable format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hricket" = callPackage
@@ -132545,8 +132545,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132572,8 +132572,8 @@ self: {
          base containers hspec hspec-core HUnit kazura-queue QuickCheck
        ];
        description = "A Riemann Client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132596,7 +132596,7 @@ self: {
          aeson attoparsec base QuickCheck text vector
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -132608,7 +132608,7 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ GeoIP ];
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {GeoIP = null;};
 
   "hs-bibutils" = callPackage
@@ -132640,8 +132640,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion cryptohash ];
        benchmarkSystemDepends = [ libb2 ];
        description = "A cryptohash-inspired library for blake2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libb2;};
 
@@ -132660,8 +132660,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Compression and decompression in the brotli format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {brotlidec = null; brotlienc = null;};
 
@@ -132673,7 +132673,7 @@ self: {
        sha256 = "02dd7kli8nm01jxs0p8imqvbdr4yzqizi6bwyyr228p3wscbdsn8";
        libraryHaskellDepends = [ base bytestring gd random ];
        description = "Generate images suitable for use as CAPTCHAs in online web-form security";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-carbon" = callPackage
@@ -132685,7 +132685,7 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel random ];
        testHaskellDepends = [ base HUnit ];
        description = "A Haskell framework for parallel monte carlo simulations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hs-carbon-examples" = callPackage
@@ -132702,8 +132702,8 @@ self: {
          base deepseq gloss hs-carbon monad-loops mtl tf-random
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132719,8 +132719,8 @@ self: {
          array base bytestring bytestring-mmap directory filepath mtl
        ];
        description = "A library for reading CDB (Constant Database) files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132741,8 +132741,8 @@ self: {
          base containers directory filepath megaparsec
        ];
        description = "Conllu validating parser and utils";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132772,8 +132772,8 @@ self: {
          regex-tdfa template-haskell text time
        ];
        description = "Dependency Injection library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132786,8 +132786,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ole32 = null; oleaut32 = null;};
 
@@ -132810,7 +132810,7 @@ self: {
          raw-strings-qq template-haskell text time
        ];
        description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hs-excelx" = callPackage
@@ -132825,8 +132825,8 @@ self: {
          base bytestring containers mtl text time xml-conduit zip-archive
        ];
        description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132838,8 +132838,8 @@ self: {
        sha256 = "0j52drd3pb6ssgngfqxdsvvjjnx11nsmxwjsin6cmbv0nifpyq51";
        libraryHaskellDepends = [ base bytestring haskell98 ];
        description = "Bindings to FFMPEG library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132853,8 +132853,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fltk fltk_images ];
        description = "Binding to GUI library FLTK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fltk; fltk_images = null;};
 
@@ -132866,7 +132866,7 @@ self: {
        sha256 = "1cigaggilr05pgizj11g5c40ln38zb5q8p0igliamkhx7fz3axis";
        libraryHaskellDepends = [ base dual tagged transformers ];
        description = "Functors from products of Haskell and its dual to Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-gchart" = callPackage
@@ -132878,7 +132878,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
        description = "Haskell wrapper for the Google Chart API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-gen-iface" = callPackage
@@ -132896,8 +132896,8 @@ self: {
          haskell-src-exts hse-cpp mtl tagged
        ];
        description = "Utility to generate haskell-names interface files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132913,8 +132913,8 @@ self: {
          base containers directory filepath parsec process
        ];
        description = "Haskell wrapper around the GIZA++ toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132927,8 +132927,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src ];
        testHaskellDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132940,7 +132940,7 @@ self: {
        sha256 = "04dm8c5ilaw4agljfp7k31ln2j5m1shyg4zb3x36rjkbs807z8sf";
        libraryHaskellDepends = [ base hs-functors ];
        description = "Indexed applicative functors and monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-java" = callPackage
@@ -132959,8 +132959,8 @@ self: {
          filepath Glob LibZip MissingH mtl parsec utf8-string
        ];
        description = "Java .class files assembler/disassembler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -132974,8 +132974,8 @@ self: {
          aeson base bytestring HTTP network text
        ];
        description = "JSON-RPC client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133002,8 +133002,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Logo interpreter written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133028,8 +133028,8 @@ self: {
          base bytestring lens managed QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {mesos = null; inherit (pkgs) protobuf;};
 
   "hs-multiaddr" = callPackage
@@ -133047,8 +133047,8 @@ self: {
          base bytestring either-unwrap hs-multihash hspec iproute sandi
        ];
        description = "Multiaddr library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hs-multihash = null;};
 
@@ -133062,8 +133062,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HandsomeSoup hxt random ];
        description = "Name generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133078,7 +133078,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base containers emojis text ];
        description = "The OpenMoji emoji dataset";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-pattrans" = callPackage
@@ -133103,8 +133103,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "DSL for musical patterns and transformation, based on contravariant functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133124,8 +133124,8 @@ self: {
          array base directory glib gtk MonadPrompt mtl random
        ];
        description = "Programmer's Mine Sweeper in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133137,7 +133137,7 @@ self: {
        sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f";
        libraryHaskellDepends = [ base bytestring ];
        description = "PHP session and values serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-pkg-config" = callPackage
@@ -133150,8 +133150,8 @@ self: {
        editedCabalFile = "1kj5lrv2a9mgzqbwkznpsgjgs5s9wnwrcsab2mykxpkm8f71nk81";
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Create pkg-config configuration files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133172,8 +133172,8 @@ self: {
          zip-archive
        ];
        description = "A library for Passbook pass creation & signing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133188,7 +133188,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Bindings to C pipe functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-profunctors" = callPackage
@@ -133199,7 +133199,7 @@ self: {
        sha256 = "09iylf1xjxsikjyaib9902na33bkfs8nv3wasyvikg4g82xqay5y";
        libraryHaskellDepends = [ base hs-functors ];
        description = "Profunctors from Haskell to Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-re" = callPackage
@@ -133210,8 +133210,8 @@ self: {
        sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Easy to use Regex";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133228,8 +133228,8 @@ self: {
          unordered-containers
        ];
        description = "A Haskell client for RQlite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133250,8 +133250,8 @@ self: {
        executableSystemDepends = [ notifier ];
        testHaskellDepends = [ base protolude ];
        description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {notifier = null;};
 
@@ -133272,8 +133272,8 @@ self: {
          base containers hspec tasty tasty-hunit xml-conduit
        ];
        description = "Simple and easy web scraping and automation in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133289,7 +133289,7 @@ self: {
        libraryHaskellDepends = [ base directory network ];
        testHaskellDepends = [ base HUnit network temporary unix ];
        description = "Write a server supporting Server::Starter's protocol in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs-snowtify" = callPackage
@@ -133305,8 +133305,8 @@ self: {
          base either safe safe-exceptions text turtle
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133325,8 +133325,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Convert an eventlog into the speedscope json format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133344,8 +133344,8 @@ self: {
          base HTTP json mime network old-locale old-time random utf8-string
        ];
        description = "Haskell binding to the Twitter API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133361,7 +133361,7 @@ self: {
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
        description = "Commandline Twitter feed archiver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133373,8 +133373,8 @@ self: {
        sha256 = "0qb7gsbki3ciqddxp9j46rnx64vv622n2p9vidv1b000wbmmrz15";
        libraryHaskellDepends = [ base old-locale time ];
        description = "Implements the RFC 2426 vCard 3.0 spec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133394,8 +133394,8 @@ self: {
          base bytestring containers filepath tasty tasty-hunit temporary
        ];
        description = "Client library for Facebook's Watchman tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133416,7 +133416,7 @@ self: {
          base bytestring criterion ghc-prim zlib
        ];
        description = "Haskell bindings to the Zstandard compression algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs2048" = callPackage
@@ -133440,7 +133440,7 @@ self: {
          base criterion hastache random statistics
        ];
        description = "A 2048 clone in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hs2ats" = callPackage
@@ -133464,7 +133464,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Create ATS types from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hs2bf" = callPackage
@@ -133482,8 +133482,8 @@ self: {
          array base containers directory filepath haskell-src mtl
        ];
        description = "Haskell to Brainfuck compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133502,7 +133502,7 @@ self: {
        ];
        description = "Generate graphviz-code from Haskell-code";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hs2ps" = callPackage
@@ -133514,8 +133514,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Translate Haskell types to PureScript";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133540,8 +133540,8 @@ self: {
        sha256 = "0p77xndqpqfyjw9y7q791pysrpz3zkimw8mcxyfl4yrh34sammx9";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133554,7 +133554,7 @@ self: {
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base HUnit lens ];
        description = "PID control loop";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hsSqlite3" = callPackage
@@ -133571,7 +133571,7 @@ self: {
        ];
        description = "Sqlite3 bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133584,8 +133584,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring dlist mtl ];
        librarySystemDepends = [ xenctrl ];
        description = "FFI bindings to the Xen Control library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xenctrl = null;};
 
@@ -133618,7 +133618,7 @@ self: {
          uuid xml-conduit
        ];
        description = "Akamai API(Edgegrid and Netstorage)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsaml2" = callPackage
@@ -133645,8 +133645,8 @@ self: {
          network-uri semigroups string-conversions time x509
        ];
        description = "OASIS Security Assertion Markup Language (SAML) V2.0";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libxml2;};
 
@@ -133671,7 +133671,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Integrating Sass into Haskell applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsautogui" = callPackage
@@ -133687,8 +133687,8 @@ self: {
        ];
        testHaskellDepends = [ base cpython hspec ];
        description = "Haskell bindings for PyAutoGUI, a library for automating user interaction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133703,8 +133703,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base Hclip HTTP process unix ];
        description = "(ab)Use Google Translate as a speech synthesiser";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133722,7 +133722,7 @@ self: {
          base bytestring containers directory filepath preprocessor-tools
        ];
        description = "Preprocesses a file, adding blobs from files as string literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsbackup" = callPackage
@@ -133740,8 +133740,8 @@ self: {
          old-locale strict time
        ];
        description = "simple utility for rolling filesystem backups";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133755,8 +133755,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ attoparsec base text vector ];
        description = "A command line calculator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133779,8 +133779,8 @@ self: {
          test-framework-hunit text time
        ];
        description = "Launch and gather data from Haskell and non-Haskell benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133799,8 +133799,8 @@ self: {
          time
        ];
        description = "Backend for uploading benchmark data to CodeSpeed";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133824,8 +133824,8 @@ self: {
          split statistics text
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133845,7 +133845,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsc3" = callPackage
@@ -133864,8 +133864,8 @@ self: {
          transformers vector
        ];
        description = "Haskell SuperCollider";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133882,7 +133882,7 @@ self: {
        ];
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133896,7 +133896,7 @@ self: {
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        description = "haskell supercollider cairo drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133915,7 +133915,7 @@ self: {
        ];
        description = "haskell supercollider data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133929,7 +133929,7 @@ self: {
        libraryHaskellDepends = [ base hsc3 safe ];
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133943,7 +133943,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        description = "haskell supercollider graph drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133964,7 +133964,7 @@ self: {
        ];
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -133990,7 +133990,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134012,7 +134012,7 @@ self: {
        ];
        description = "Haskell SuperCollider Language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134033,7 +134033,7 @@ self: {
        ];
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134052,7 +134052,7 @@ self: {
        ];
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134073,7 +134073,7 @@ self: {
        ];
        description = "Create and control scsynth processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134087,7 +134087,7 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134106,7 +134106,7 @@ self: {
        ];
        description = "hsc3 re-writing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134134,7 +134134,7 @@ self: {
        ];
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134148,7 +134148,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134166,7 +134166,7 @@ self: {
        ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134180,7 +134180,7 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134203,7 +134203,7 @@ self: {
        ];
        description = "Haskell SuperCollider Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134230,8 +134230,8 @@ self: {
          regex-compat temporary text transformers unix
        ];
        description = "Very simple file/directory structure scaffolding writer monad EDSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134247,7 +134247,7 @@ self: {
        librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
@@ -134264,8 +134264,8 @@ self: {
          Thrift
        ];
        description = "cassandra database interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134280,8 +134280,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        description = "Command line client and library for SoundCloud.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134296,7 +134296,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base random random-shuffle ];
        description = "minimal ncurses-like library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hschema" = callPackage
@@ -134313,7 +134313,7 @@ self: {
          natural-transformation profunctors text unordered-containers vector
        ];
        description = "Describe schemas for your Haskell data types";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hschema-aeson" = callPackage
@@ -134342,7 +134342,7 @@ self: {
          scientific text time unordered-containers vector
        ];
        description = "Describe schemas for your Haskell data types";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hschema-prettyprinter" = callPackage
@@ -134360,7 +134360,7 @@ self: {
          vector
        ];
        description = "Describe schemas for your Haskell data types";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hschema-quickcheck" = callPackage
@@ -134377,7 +134377,7 @@ self: {
          quickcheck-instances text unordered-containers vector
        ];
        description = "Describe schemas for your Haskell data types";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "hsclock" = callPackage
@@ -134391,7 +134391,7 @@ self: {
        executableHaskellDepends = [ base cairo glib gtk old-time ];
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134429,8 +134429,8 @@ self: {
          base directory mtl process test-simple Unixutils
        ];
        description = "cscope like browser for Haskell code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134446,7 +134446,7 @@ self: {
          base directory filepath process time
        ];
        description = "Haskell shell script template";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "hscuid" = callPackage
@@ -134465,8 +134465,8 @@ self: {
        executableHaskellDepends = [ base criterion ];
        testHaskellDepends = [ base containers text ];
        description = "Collision-resistant IDs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134497,7 +134497,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base hscurses random safe unix ];
        description = "hscurses swimming fish example";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "hsdev" = callPackage
@@ -134540,8 +134540,8 @@ self: {
          hformat hspec lens lens-aeson mtl text
        ];
        description = "Haskell development library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134555,7 +134555,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SDIF";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134570,8 +134570,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        description = "hsdip - a Diplomacy parser/renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134588,8 +134588,8 @@ self: {
        libraryHaskellDepends = [ base containers network ];
        librarySystemDepends = [ adns ];
        description = "Asynchronous DNS Resolver";
-       license = stdenv.lib.licenses.lgpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.lgpl3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {inherit (pkgs) adns;};
 
   "hsdns-cache" = callPackage
@@ -134604,8 +134604,8 @@ self: {
          base hsdns network SafeSemaphore text time unordered-containers
        ];
        description = "Caching asynchronous DNS resolver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134617,7 +134617,7 @@ self: {
        sha256 = "0k2bmsk6d3ym7z71bwxicc0b8wsw0camjgxgbybx4pdz0261dc7f";
        libraryHaskellDepends = [ base cpphs haskell-src-exts ];
        description = "Preprocess+parse haskell code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsebaysdk" = callPackage
@@ -134634,7 +134634,7 @@ self: {
          time transformers unordered-containers
        ];
        description = "Haskell eBay SDK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsemail" = callPackage
@@ -134646,8 +134646,8 @@ self: {
        libraryHaskellDepends = [ base parsec time time-compat ];
        testHaskellDepends = [ base hspec parsec time ];
        description = "Parsec parsers for the Internet Message format (e-mail)";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hsemail-ns" = callPackage
@@ -134659,7 +134659,7 @@ self: {
        libraryHaskellDepends = [ base mtl old-time parsec ];
        testHaskellDepends = [ base doctest hspec old-time parsec ];
        description = "Internet Message Parsers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsendxmpp" = callPackage
@@ -134677,7 +134677,7 @@ self: {
        ];
        description = "sendxmpp clone, sending XMPP messages via CLI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsenv" = callPackage
@@ -134697,8 +134697,8 @@ self: {
          io-streams mtl process safe split unix
        ];
        description = "Virtual Haskell Environment builder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134712,7 +134712,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs wai-app-static warp ];
        description = "Simple http server in haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hset" = callPackage
@@ -134724,8 +134724,8 @@ self: {
        libraryHaskellDepends = [ base deepseq tagged type-fun ];
        testHaskellDepends = [ base HUnit tagged ];
        description = "Primitive list with elements of unique types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134744,7 +134744,7 @@ self: {
          base binary bytestring containers hspec HUnit iconv text time
        ];
        description = "EXIF handling library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsfacter" = callPackage
@@ -134755,8 +134755,8 @@ self: {
        sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q";
        libraryHaskellDepends = [ base containers language-puppet text ];
        description = "A small and ugly library that emulates the output of the puppet facter program";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134772,8 +134772,8 @@ self: {
          base hdaemonize hslogger network process
        ];
        description = "Incremental builder for flash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134787,8 +134787,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ghc ];
        description = "Z-decoder";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134812,8 +134812,8 @@ self: {
          uri-encode
        ];
        description = "Salesforce API Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134827,7 +134827,7 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
@@ -134841,7 +134841,7 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
@@ -134854,8 +134854,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -134903,7 +134903,7 @@ self: {
        librarySystemDepends = [ blas liblapack ];
        libraryPkgconfigDepends = [ gsl ];
        description = "Signal processing and EEG data analysis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; liblapack = null;};
 
   "hsilop" = callPackage
@@ -134919,7 +134919,7 @@ self: {
          base directory filepath haskeline xdg-basedir
        ];
        description = "RPN calculator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsimport" = callPackage
@@ -134946,7 +134946,7 @@ self: {
        ];
        doHaddock = false;
        description = "Extend the import list of a Haskell source file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsini" = callPackage
@@ -134965,7 +134965,7 @@ self: {
          tasty-quickcheck tasty-th
        ];
        description = "ini configuration files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsinspect" = callPackage
@@ -134987,8 +134987,8 @@ self: {
          transformers
        ];
        description = "Inspect Haskell source files";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135019,8 +135019,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "LSP interface over the hsinspect binary";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135041,7 +135041,7 @@ self: {
          optparse-applicative process safe-exceptions transformers
        ];
        description = "Install Haskell software";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "hskeleton" = callPackage
@@ -135052,8 +135052,8 @@ self: {
        sha256 = "0f06xir28rzpwphk14gkpww8l7gbws4habhm26915idpnd4bva2w";
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135069,8 +135069,8 @@ self: {
          base Cabal directory filepath process unix
        ];
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135084,8 +135084,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {svm = null;};
 
@@ -135102,8 +135102,8 @@ self: {
          base Cabal hint MemoTrie process regex-compat
        ];
        description = "Resolves links to Haskell identifiers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135123,7 +135123,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Versatile logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hslogger-reader" = callPackage
@@ -135141,8 +135141,8 @@ self: {
          attoparsec base hslogger optparse-applicative text text-icu time
        ];
        description = "Parsing hslogger-produced logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135154,8 +135154,8 @@ self: {
        sha256 = "1fg7nz63c3nbpibm5q4mm7rvch7ihf3rlbh6jnhdj6qdspvm38p8";
        libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135194,8 +135194,8 @@ self: {
          base conduit hspec QuickCheck split stm transformers
        ];
        description = "A library to work with, or as, a logstash server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135218,7 +135218,7 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Bindings to Lua, an embeddable scripting language";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) lua5_3;};
 
   "hslua_1_3_0" = callPackage
@@ -135240,8 +135240,8 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Bindings to Lua, an embeddable scripting language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) lua5_3;};
 
   "hslua-aeson" = callPackage
@@ -135262,7 +135262,7 @@ self: {
          quickcheck-instances scientific text unordered-containers vector
        ];
        description = "Allow aeson data types to be used with lua";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hslua-module-doclayout" = callPackage
@@ -135278,7 +135278,7 @@ self: {
          base doclayout hslua tasty tasty-hunit tasty-lua
        ];
        description = "Lua module wrapping Text.DocLayout.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hslua-module-system" = callPackage
@@ -135296,7 +135296,7 @@ self: {
          base hslua tasty tasty-hunit tasty-lua text
        ];
        description = "Lua module wrapper around Haskell's System module";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hslua-module-text" = callPackage
@@ -135312,7 +135312,7 @@ self: {
          base hslua tasty tasty-hunit tasty-lua text
        ];
        description = "Lua module for text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsluv-haskell" = callPackage
@@ -135324,8 +135324,8 @@ self: {
        libraryHaskellDepends = [ base colour ];
        testHaskellDepends = [ aeson base bytestring colour containers ];
        description = "HSLuv conversion utility";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135349,8 +135349,8 @@ self: {
          freetype2 GraphicsMagick lcms libxml2
        ];
        description = "FFI bindings for the GraphicsMagick library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
          jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg; 
@@ -135370,7 +135370,7 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit mtl ];
        description = "A collection of miscellaneous modules";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsmodetweaks" = callPackage
@@ -135387,8 +135387,8 @@ self: {
          base containers directory hpack protolude text
        ];
        description = "Tool for generating .dir-locals.el for intero";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135400,8 +135400,8 @@ self: {
        sha256 = "08gbrwrc85in34nrgjm0zr5sjz2zbjc7hk2zlpvk1dq8x62a6wsg";
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Simple SMTP Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135415,7 +135415,7 @@ self: {
        librarySystemDepends = [ libsndfile ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libsndfile";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) libsndfile;};
 
   "hsndfile-storablevector" = callPackage
@@ -135426,7 +135426,7 @@ self: {
        sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z";
        libraryHaskellDepends = [ base hsndfile storablevector ];
        description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
-       license = stdenv.lib.licenses.lgpl2;
+       license = lib.licenses.lgpl2;
      }) {};
 
   "hsndfile-vector" = callPackage
@@ -135437,7 +135437,7 @@ self: {
        sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig";
        libraryHaskellDepends = [ base hsndfile vector ];
        description = "Haskell bindings for libsndfile (Data.Vector interface)";
-       license = stdenv.lib.licenses.lgpl2;
+       license = lib.licenses.lgpl2;
      }) {};
 
   "hsnock" = callPackage
@@ -135458,8 +135458,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Nock 5K interpreter";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135471,7 +135471,7 @@ self: {
        sha256 = "0f8xpmzmg71l7qn1vjvzncsx8r7vfpzvlnlq0029ixf64gshbmzl";
        libraryHaskellDepends = [ base vector ];
        description = "A coherent 3d noise library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsns" = callPackage
@@ -135484,8 +135484,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135504,8 +135504,8 @@ self: {
          stm stm-chans text
        ];
        description = "Haskell NSQ client";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135522,8 +135522,8 @@ self: {
        libraryHaskellDepends = [ array base mtl network old-time random ];
        executableHaskellDepends = [ unix ];
        description = "Libraries to use SNTP protocol and small client/server implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135548,8 +135548,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Haskell library that supports command-line flag processing";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135588,8 +135588,8 @@ self: {
          time wai
        ];
        description = "Iron, Hawk, Oz: Web auth protocols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135601,7 +135601,7 @@ self: {
        sha256 = "1ayfywgrlmzivsq6lirmgvl65x1shf8041lzw2yh245rkmd91lsf";
        libraryHaskellDepends = [ base mtl text ];
        description = "Haskell Server Pages is a library for writing dynamic server-side web pages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsp-cgi" = callPackage
@@ -135612,8 +135612,8 @@ self: {
        sha256 = "0m1xylqzmi2c1c92zk5bq6232id9fmjlx4s88ic2fvf5a389n11n";
        libraryHaskellDepends = [ base containers harp hsp network ];
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135625,7 +135625,7 @@ self: {
        sha256 = "10za4f07a5agg3zgy32fdz02vg9fl344qswhzj5mnx8wpnxmr3y6";
        libraryHaskellDepends = [ base bytestring dataenc gd ];
        description = "Sparklines for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsparql" = callPackage
@@ -135646,8 +135646,8 @@ self: {
          test-framework-hunit text wai warp
        ];
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135664,7 +135664,7 @@ self: {
        ];
        description = "Haskell Spear Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135680,7 +135680,7 @@ self: {
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
        description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec_2_7_8" = callPackage
@@ -135695,8 +135695,8 @@ self: {
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
        description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -135714,7 +135714,7 @@ self: {
          attoparsec base bytestring hspec hspec-expectations text
        ];
        description = "Utility functions for testing your attoparsec parsers with hspec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-bracket" = callPackage
@@ -135725,7 +135725,7 @@ self: {
        sha256 = "1d6262frfaghmq77nqsvcalm6w4jl7bn995bkphx461skhm8n300";
        libraryHaskellDepends = [ base hspec ];
        description = "The bracket definitions for Hspec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-checkers" = callPackage
@@ -135737,7 +135737,7 @@ self: {
        libraryHaskellDepends = [ base checkers hspec ];
        testHaskellDepends = [ base checkers hspec ];
        description = "Allows to use checkers properties from hspec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-contrib" = callPackage
@@ -135751,7 +135751,7 @@ self: {
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        description = "Contributed functionality for Hspec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-core" = callPackage
@@ -135778,7 +135778,7 @@ self: {
        testToolDepends = [ hspec-meta ];
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
        description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-core_2_7_8" = callPackage
@@ -135805,8 +135805,8 @@ self: {
        testToolDepends = [ hspec-meta ];
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
        description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-dirstream" = callPackage
@@ -135824,7 +135824,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Helper functions to simplify adding integration tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-discover" = callPackage
@@ -135843,7 +135843,7 @@ self: {
        ];
        testToolDepends = [ hspec-meta ];
        description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-discover_2_7_8" = callPackage
@@ -135862,8 +135862,8 @@ self: {
        ];
        testToolDepends = [ hspec-meta ];
        description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-expectations" = callPackage
@@ -135875,7 +135875,7 @@ self: {
        libraryHaskellDepends = [ base call-stack HUnit ];
        testHaskellDepends = [ base call-stack HUnit nanospec ];
        description = "Catchy combinators for HUnit";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-expectations-json" = callPackage
@@ -135892,8 +135892,8 @@ self: {
        ];
        testHaskellDepends = [ aeson-qq base hspec ];
        description = "Hspec expectations for JSON Values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135910,7 +135910,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec lens silently ];
        description = "Hspec expectations for the lens stuff";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "hspec-expectations-lifted" = callPackage
@@ -135921,7 +135921,7 @@ self: {
        sha256 = "0a1qwz0n80lph8m9cq6cb06m8bsmqgg8ifx0acpylvrrkd8g3k92";
        libraryHaskellDepends = [ base hspec-expectations transformers ];
        description = "A version of hspec-expectations generalized to MonadIO";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-expectations-match" = callPackage
@@ -135937,8 +135937,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "An hspec expectation that asserts a value matches a pattern";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135954,8 +135954,8 @@ self: {
          base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo
        ];
        description = "hspec-expectations with pretty printing on failure";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -135972,7 +135972,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec HUnit text ];
        description = "Catchy combinators for HUnit";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-experimental" = callPackage
@@ -135984,8 +135984,8 @@ self: {
        libraryHaskellDepends = [ base hspec HUnit QuickCheck ];
        testHaskellDepends = [ base hspec-meta ];
        description = "An experimental DSL for testing on top of Hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136003,7 +136003,7 @@ self: {
        executableHaskellDepends = [ base directory optparse-applicative ];
        testHaskellDepends = [ base directory hspec hspec-core silently ];
        description = "Golden tests for hspec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-golden-aeson" = callPackage
@@ -136024,7 +136024,7 @@ self: {
          quickcheck-arbitrary-adt silently transformers
        ];
        description = "Use tests to monitor changes in Aeson serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-hashable" = callPackage
@@ -136040,8 +136040,8 @@ self: {
          base hashable hspec hspec-core QuickCheck silently
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136060,7 +136060,7 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog hspec ];
        description = "Integrate Hedgehog and Hspec!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-jenkins" = callPackage
@@ -136071,8 +136071,8 @@ self: {
        sha256 = "16aql0fyssc16z85isskccq93dj5i1pydblnf2q1np7z6pl1azy2";
        libraryHaskellDepends = [ base blaze-markup hspec ];
        description = "Jenkins-friendly XML formatter for Hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136086,7 +136086,7 @@ self: {
        testHaskellDepends = [ base hspec markdown-unlit QuickCheck ];
        testToolDepends = [ markdown-unlit ];
        description = "Document and test laws for standard type classes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-leancheck" = callPackage
@@ -136098,7 +136098,7 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ];
        testHaskellDepends = [ base hspec leancheck ];
        description = "LeanCheck support for the Hspec test framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-megaparsec" = callPackage
@@ -136114,7 +136114,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
        description = "Utility functions for testing Megaparsec parsers with Hspec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-meta" = callPackage
@@ -136142,7 +136142,7 @@ self: {
          setenv stm time transformers
        ];
        description = "A version of Hspec which is used to test Hspec itself";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-monad-control" = callPackage
@@ -136157,8 +136157,8 @@ self: {
          base hspec-core monad-control transformers transformers-base
        ];
        description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136175,7 +136175,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "A testing framework for Haskell using Hspec";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "hspec-need-env" = callPackage
@@ -136189,7 +136189,7 @@ self: {
        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;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-parsec" = callPackage
@@ -136203,7 +136203,7 @@ self: {
        libraryHaskellDepends = [ base hspec-expectations parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Hspec expectations for testing Parsec parsers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-pg-transact" = callPackage
@@ -136219,8 +136219,8 @@ self: {
          text tmp-postgres
        ];
        description = "Helpers for creating database tests with hspec and pg-transact";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136239,7 +136239,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-contrib transformers ];
        description = "Test Framework for checking server's status";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-setup" = callPackage
@@ -136268,8 +136268,8 @@ self: {
          projectroot QuickCheck split strict
        ];
        description = "Add an hspec test-suite in one command";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136281,8 +136281,8 @@ self: {
        sha256 = "0b4y84vqyx22kihr0sbbxzr6sdz99hi2rhyl09r8ddzkzqadfii3";
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136299,7 +136299,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl stm ];
        description = "Find slow test cases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-smallcheck" = callPackage
@@ -136318,7 +136318,7 @@ self: {
          smallcheck
        ];
        description = "SmallCheck support for the Hspec testing framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-snap" = callPackage
@@ -136341,8 +136341,8 @@ self: {
          transformers
        ];
        description = "A library for testing with Hspec and the Snap Web Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136354,7 +136354,7 @@ self: {
        sha256 = "1svdw7z92cxfflyahq1gn6kfb33p7pl4byqp5a4baj7b5gd18rqg";
        libraryHaskellDepends = [ base directory hspec safe strict ];
        description = "Simple project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hspec-structured-formatter" = callPackage
@@ -136364,8 +136364,8 @@ self: {
        version = "0.1.0.3";
        sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj";
        libraryHaskellDepends = [ base hspec ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136380,7 +136380,7 @@ self: {
        libraryHaskellDepends = [ base hspec-core ];
        testHaskellDepends = [ base hspec hspec-core ];
        description = "Table-driven (by-example) HSpec tests";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -136395,7 +136395,7 @@ self: {
          base hspec hspec-contrib hspec-core HUnit QuickCheck
        ];
        description = "Run test-framework tests with Hspec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-test-framework-th" = callPackage
@@ -136411,7 +136411,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec-test-framework HUnit ];
        description = "Run test-framework tests with Hspec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-test-sandbox" = callPackage
@@ -136423,8 +136423,8 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-core test-sandbox ];
        testHaskellDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136448,7 +136448,7 @@ self: {
          wai-extra
        ];
        description = "Experimental Hspec support for testing WAI applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-wai_0_11_1" = callPackage
@@ -136471,8 +136471,8 @@ self: {
          wai-extra
        ];
        description = "Experimental Hspec support for testing WAI applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-wai-json" = callPackage
@@ -136489,7 +136489,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-wai ];
        description = "Testing JSON APIs with hspec-wai";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hspec-wai-json_0_11_0" = callPackage
@@ -136506,8 +136506,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-wai ];
        description = "Testing JSON APIs with hspec-wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-webdriver" = callPackage
@@ -136524,8 +136524,8 @@ self: {
          stm text transformers unordered-containers webdriver
        ];
        description = "Write end2end web application tests using webdriver and hspec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136539,8 +136539,8 @@ self: {
        editedCabalFile = "1q0pw1ggki7h839jicf2k0lllbm219qjcr3407hvcih9vfkbw03j";
        libraryHaskellDepends = [ base hspec hspec-discover ];
        description = "Alpha version of Hspec 2.0";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136552,8 +136552,8 @@ self: {
        sha256 = "0y45jizkf2kfj3yjjkq96kavkfp74vf5dyyjvi9pj3kshf8sx8il";
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
        description = "Spec for testing properties for variant types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136572,8 +136572,8 @@ self: {
          RSA unix utf8-string
        ];
        description = "Wrapper for PKCS #11 interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136585,7 +136585,7 @@ self: {
        sha256 = "1qnqg2gg93l5dp2nyvvaq7n58gsnljvbafbhfpvys48g5ry2dk7a";
        libraryHaskellDepends = [ base old-time ];
        description = "Session handler for HSP";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "hspread" = callPackage
@@ -136600,8 +136600,8 @@ self: {
          base binary bytestring containers extensible-exceptions network
        ];
        description = "A client library for the spread toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136616,8 +136616,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring vty ];
        doHaddock = false;
        description = "A terminal presentation tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136643,8 +136643,8 @@ self: {
          test-framework-hunit
        ];
        description = "The Haskell Stream Processor command line utility";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136656,8 +136656,8 @@ self: {
        sha256 = "0i53n42ynq22fzlz4kpmri4q4abmi4dz8bz0izn307is1pmk4bby";
        libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136672,8 +136672,8 @@ self: {
        libraryHaskellDepends = [ base Cabal hsql ];
        librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mysqlclient = null;};
 
@@ -136686,8 +136686,8 @@ self: {
        libraryHaskellDepends = [ base hsql old-time ];
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) unixODBC;};
 
@@ -136700,8 +136700,8 @@ self: {
        libraryHaskellDepends = [ base hsql old-time ];
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) postgresql;};
 
@@ -136714,8 +136714,8 @@ self: {
        libraryHaskellDepends = [ base hsql ];
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) sqlite;};
 
@@ -136737,8 +136737,8 @@ self: {
          base containers directory QuickCheck tagged text
        ];
        description = "Haskell binding for Qt Quick";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -136750,8 +136750,8 @@ self: {
        libraryHaskellDepends = [ base hsqml template-haskell text ];
        libraryPkgconfigDepends = [ qt5 ];
        description = "HsQML (Qt5) data model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -136766,8 +136766,8 @@ self: {
          base exceptions hsqml-datamodel type-list vinyl
        ];
        description = "HsQML DataModel instances for Vinyl Rec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-demo-manic" = callPackage
@@ -136783,8 +136783,8 @@ self: {
          base containers hsqml MonadRandom text
        ];
        description = "HsQML-based clone of Pipe Mania";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -136802,8 +136802,8 @@ self: {
          base containers deepseq directory hsqml OddWord text
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -136821,8 +136821,8 @@ self: {
          base containers hsqml sqlite-simple text transformers
        ];
        description = "Sticky notes example program implemented in HsQML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -136836,8 +136836,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        description = "HsQML sample programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -136855,8 +136855,8 @@ self: {
          base containers deepseq directory hsqml OddWord tagged
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hsreadability" = callPackage
@@ -136879,8 +136879,8 @@ self: {
          text
        ];
        description = "Access to the Readability API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136895,8 +136895,8 @@ self: {
          attoparsec base bytestring network utf8-string
        ];
        description = "RELP (Reliable Event Logging Protocol) server implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -136911,7 +136911,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {seccomp = null;};
 
@@ -136935,7 +136935,7 @@ self: {
          memory stm tasty tasty-hunit tasty-quickcheck
        ];
        description = "SSH protocol implementation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hsshellscript" = callPackage
@@ -136960,7 +136960,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell for Unix shell scripting tasks";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hssourceinfo" = callPackage
@@ -136975,7 +136975,7 @@ self: {
          base containers directory filepath regexpr
        ];
        description = "get haskell source code info";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hssqlppp" = callPackage
@@ -136996,8 +136996,8 @@ self: {
          tasty tasty-hunit template-haskell text transformers uniplate
        ];
        description = "SQL parser and type checker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137016,8 +137016,8 @@ self: {
          base hssqlppp syb tasty tasty-hunit template-haskell text
        ];
        description = "hssqlppp extras which need template-haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137040,8 +137040,8 @@ self: {
        ];
        executableToolDepends = [ cpphs ];
        description = "Haskell version of tar CLI utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137057,7 +137057,7 @@ self: {
          array base hmatrix hmatrix-gsl-stats random vector
        ];
        description = "Statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hstats" = callPackage
@@ -137068,8 +137068,8 @@ self: {
        sha256 = "1a0rzbnbxd7r9b0ibs74nzijbdhj019wssdk1fls2r9i0w1v6i9h";
        libraryHaskellDepends = [ base ];
        description = "Statistical Computing in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137081,8 +137081,8 @@ self: {
        sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4";
        libraryHaskellDepends = [ base bytestring mtl network text ];
        description = "Quick and dirty statsd interface";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137100,8 +137100,8 @@ self: {
          base directory filepath ghc ghc-paths HUnit mtl QuickCheck random
        ];
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137115,8 +137115,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137145,8 +137145,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Distributed instant messaging over Tor";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hstox" = callPackage
@@ -137173,8 +137173,8 @@ self: {
        executableHaskellDepends = [ base process ];
        testHaskellDepends = [ async base ];
        description = "A Tox protocol implementation in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137199,8 +137199,8 @@ self: {
          base bytestring conduit resourcet transformers
        ];
        description = "Tradeking API bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137218,8 +137218,8 @@ self: {
          base cmdargs directory filepath haskell-src-exts syb text vector
        ];
        description = "Checks Haskell source code for style compliance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137240,8 +137240,8 @@ self: {
          mtl parallel QuickCheck random unordered-containers vector xml
        ];
        description = "A two player abstract strategy game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137263,8 +137263,8 @@ self: {
          system-filepath text text-format time transformers unix
        ];
        description = "One-time, faithful conversion of Subversion repositories to Git";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137293,8 +137293,8 @@ self: {
          http-client http-client-tls hxt QuickCheck text
        ];
        description = "Sudoku game with a GTK3 interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137314,7 +137314,7 @@ self: {
          shakespeare text transformers
        ];
        description = "Synthesizable Verilog DSL supporting for multiple clock and reset";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hswip" = callPackage
@@ -137327,7 +137327,7 @@ self: {
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
          swipl = null;};
@@ -137344,8 +137344,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137359,8 +137359,8 @@ self: {
          base hsp jmacro mtl text wl-pprint-text
        ];
        description = "hsp+jmacro support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137372,8 +137372,8 @@ self: {
        sha256 = "1051fh4yjnsax60v4rfh5r87n660ygq033gmg710nm3gw57ihkl2";
        libraryHaskellDepends = [ base hsx mtl ];
        description = "XHTML utilities to use together with HSX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137396,7 +137396,7 @@ self: {
          template-haskell utf8-string
        ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hsyscall" = callPackage
@@ -137407,8 +137407,8 @@ self: {
        sha256 = "0ysi317vwgksaq78k31sb8s34rjjhl4w8ncvycfsmmdnv7cdg2ld";
        libraryHaskellDepends = [ base ];
        description = "FFI to syscalls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137424,8 +137424,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "FFI interface to syslog(3) from POSIX.1-2001";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "hsyslog-tcp" = callPackage
@@ -137440,8 +137440,8 @@ self: {
          base bytestring hsyslog hsyslog-udp network text time
        ];
        description = "syslog over TCP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137458,7 +137458,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec time ];
        description = "Log to syslog over a network via UDP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hszephyr" = callPackage
@@ -137470,8 +137470,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl time ];
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {com_err = null; zephyr = null;};
 
@@ -137491,7 +137491,7 @@ self: {
        testHaskellDepends = [ base directory filepath hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings to TagLib, audio meta-data library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) taglib;};
 
   "htags" = callPackage
@@ -137506,8 +137506,8 @@ self: {
          base directory filepath haskell-src mtl
        ];
        description = "A Haskell98 parsing tags program similar to ctags";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137525,8 +137525,8 @@ self: {
          base bytestring bzlib directory filepath old-locale tar time zlib
        ];
        description = "Command-line tar archive utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137538,7 +137538,7 @@ self: {
        sha256 = "18kgglc22k4v66hh9yf2qa7zx60ka2xl9bvzpinvc5v4zv0prl7l";
        libraryHaskellDepends = [ base ];
        description = "Tautology Proving Logic in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htdp-image" = callPackage
@@ -137554,8 +137554,8 @@ self: {
          base gloss HUnit test-framework test-framework-hunit
        ];
        description = "Beginner friendly graphics library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137571,8 +137571,8 @@ self: {
        libraryToolDepends = [ gcc ];
        executableHaskellDepends = [ base ];
        description = "A library for testing correctness of pseudo random number generators in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gcc;};
 
@@ -137589,8 +137589,8 @@ self: {
          zlib
        ];
        description = "Import from the Tiled map editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137604,7 +137604,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
        description = "Timing utility for the command line";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htirage" = callPackage
@@ -137620,7 +137620,7 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck text transformers
        ];
        description = "Equiprobable draw from publicly verifiable random data";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "htlset" = callPackage
@@ -137631,8 +137631,8 @@ self: {
        sha256 = "0i7qipq0dbyd9zqjl1n6sxzma066293gpbxwqwd84wiw3vw2gz3w";
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Set";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137644,7 +137644,7 @@ self: {
        sha256 = "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c";
        libraryHaskellDepends = [ base ];
        description = "HTML combinator library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-charset" = callPackage
@@ -137668,8 +137668,8 @@ self: {
          base bytestring doctest doctest-discover hlint QuickCheck
        ];
        description = "Determine character encoding of HTML documents/fragments";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137690,7 +137690,7 @@ self: {
          base bytestring containers deepseq hspec HUnit text xml-conduit
        ];
        description = "Parse HTML documents using xml-conduit datatypes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "html-email-validate" = callPackage
@@ -137707,7 +137707,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Validating an email address against HTML standard";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-entities" = callPackage
@@ -137722,7 +137722,7 @@ self: {
          attoparsec base base-prelude text unordered-containers
        ];
        description = "A codec library for HTML-escaped text and HTML-entities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "html-entity" = callPackage
@@ -137742,7 +137742,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "HTML entity decoding and encoding for Text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-entity-map" = callPackage
@@ -137758,7 +137758,7 @@ self: {
          base criterion text unordered-containers
        ];
        description = "Map from HTML5 entity names to the corresponding Unicode text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-kure" = callPackage
@@ -137769,8 +137769,8 @@ self: {
        sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l";
        libraryHaskellDepends = [ base hxt kure ];
        description = "HTML rewrite engine, using KURE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137809,7 +137809,7 @@ self: {
          attoparsec base criterion deepseq tagsoup text
        ];
        description = "A high-performance HTML tokenizer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-rules" = callPackage
@@ -137820,8 +137820,8 @@ self: {
        sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw";
        libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        description = "Perform traversals of HTML structures using sets of rules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137844,8 +137844,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "An \"attoparsec\"-based HTML tokenizer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -137857,7 +137857,7 @@ self: {
        sha256 = "1d66kdg81774b8isw1mfkl54sgmaz0n04n6shd5jjz18sjwyxp14";
        libraryHaskellDepends = [ base tagsoup ];
        description = "A HTML truncator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html-validator-cli" = callPackage
@@ -137884,7 +137884,7 @@ self: {
          hspec http-conduit text utf8-string
        ];
        description = "A command-line interface for https://validator.w3.org/";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html2hamlet" = callPackage
@@ -137903,7 +137903,7 @@ self: {
          optparse-declarative regex-tdfa text wl-pprint-text xml-conduit
        ];
        description = "HTML to Hamlet converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "html5-entity" = callPackage
@@ -137917,7 +137917,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "A library for looking up and validating HTML5 entities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htn" = callPackage
@@ -137929,7 +137929,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "resolver using htn algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htodo" = callPackage
@@ -137942,7 +137942,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HDBC HDBC-sqlite3 ];
        description = "A todo application";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htoml" = callPackage
@@ -137967,7 +137967,7 @@ self: {
          unordered-containers vector
        ];
        description = "Parser for TOML files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htoml-megaparsec" = callPackage
@@ -137993,7 +137993,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        doHaddock = false;
        description = "Parser for TOML files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "htrace" = callPackage
@@ -138004,7 +138004,7 @@ self: {
        sha256 = "0ar1w9p6ppag2vp8kw6byirhfdfs4r639pjh5icnyiiliz6jkvlx";
        libraryHaskellDepends = [ base ];
        description = "Hierarchical tracing for debugging of lazy evaluation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hts" = callPackage
@@ -138017,7 +138017,7 @@ self: {
        libraryHaskellDepends = [ base hmt xml ];
        description = "Haskell Music Typesetting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138041,8 +138041,8 @@ self: {
          htsn-common hxt MissingH network process tasty tasty-hunit unix
        ];
        description = "Parse XML files from The Sports Network feed";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138056,7 +138056,7 @@ self: {
          ansi-terminal base hslogger transformers
        ];
        description = "Display/logging facilities used by both htsn and htsn-import";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "htsn-import" = callPackage
@@ -138085,8 +138085,8 @@ self: {
          split tasty tasty-hunit time transformers tuple
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138098,8 +138098,8 @@ self: {
        sha256 = "15wbafj54yfipp3pfqk0yd5qlzm76457mngv1fs899sp31y2m2cv";
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138112,7 +138112,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Functions for working with HTTP Accept headers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-api-data" = callPackage
@@ -138139,7 +138139,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-api-data_0_4_3" = callPackage
@@ -138164,8 +138164,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -138176,8 +138176,8 @@ self: {
        sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
        libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        description = "Attoparsec parsers for http-types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138205,7 +138205,7 @@ self: {
        ];
        doCheck = false;
        description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client_0_7_4" = callPackage
@@ -138232,8 +138232,8 @@ self: {
        ];
        doCheck = false;
        description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -138251,8 +138251,8 @@ self: {
          transformers utf8-string
        ];
        description = "HTTP authorization (both basic and digest) done right";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138265,7 +138265,7 @@ self: {
        libraryHaskellDepends = [ base http-client ];
        doHaddock = false;
        description = "Frontend support for using http-client with conduit (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-extra" = callPackage
@@ -138284,7 +138284,7 @@ self: {
          http-types random text transformers
        ];
        description = "wrapper for http-client exposing cookies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-client-lens" = callPackage
@@ -138299,8 +138299,8 @@ self: {
          base bytestring http-client http-types lens network
        ];
        description = "Optics for http-client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138313,7 +138313,7 @@ self: {
        libraryHaskellDepends = [ base http-client ];
        doHaddock = false;
        description = "Generate multipart uploads for http-client. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-openssl" = callPackage
@@ -138332,7 +138332,7 @@ self: {
        ];
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-openssl_0_3_3" = callPackage
@@ -138351,8 +138351,8 @@ self: {
        ];
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-client-overrides" = callPackage
@@ -138374,7 +138374,7 @@ self: {
          base bytestring http-client tasty tasty-hunit text
        ];
        description = "HTTP client overrides";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-client-request-modifiers" = callPackage
@@ -138390,8 +138390,8 @@ self: {
          network network-uri
        ];
        description = "Convenient monadic HTTP request modifiers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138408,7 +138408,7 @@ self: {
          network-bsd utf8-string
        ];
        description = "restricting the servers that http-client will use";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-session" = callPackage
@@ -138423,8 +138423,8 @@ self: {
          base-prelude bytestring either http-client mtl-prelude
        ];
        description = "A simple abstraction over the \"http-client\" connection manager";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138441,8 +138441,8 @@ self: {
          io-streams mtl transformers
        ];
        description = "http-client for io-streams supporting openssl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138469,7 +138469,7 @@ self: {
        benchmarkHaskellDepends = [ base gauge http-client ];
        doCheck = false;
        description = "http-client backend using the connection package and tls library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-client-websockets" = callPackage
@@ -138487,8 +138487,8 @@ self: {
          base bytestring hspec http-client-tls network-uri websockets
        ];
        description = "Glue code for http-client and websockets";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138506,7 +138506,7 @@ self: {
          directory mtl network text transformers unordered-containers
        ];
        description = "Common types for HTTP clients and servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-conduit" = callPackage
@@ -138534,7 +138534,7 @@ self: {
        ];
        doCheck = false;
        description = "HTTP client package with conduit interface and HTTPS support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -138560,8 +138560,8 @@ self: {
          resourcet text time transformers wai warp
        ];
        description = "Browser interface to the http-conduit package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138579,8 +138579,8 @@ self: {
          http-client-openssl http-types network network-uri text time zlib
        ];
        description = "HTTP downloader tailored for web-crawler needs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138597,7 +138597,7 @@ self: {
          base bytestring doctest hspec old-locale time
        ];
        description = "HTTP Date parser/formatter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-directory" = callPackage
@@ -138615,8 +138615,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "http directory listing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138634,8 +138634,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec ];
        description = "High level HTTP client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138662,7 +138662,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Verified downloads with retries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-encodings" = callPackage
@@ -138679,7 +138679,7 @@ self: {
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
        description = "A library for encoding and decoding bodies of HTTP messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-enumerator" = callPackage
@@ -138703,8 +138703,8 @@ self: {
          utf8-string zlib-enum
        ];
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138716,8 +138716,8 @@ self: {
        sha256 = "1x073nw7fagbj16x42n7xgyr5liv69l0g4ig1f4adzdc9p997l27";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138740,7 +138740,7 @@ self: {
        ];
        description = "HTTP and WebSocket client based on io-streams";
        license = "BSD-3-Clause AND GPL-2.0-or-later";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138763,8 +138763,8 @@ self: {
          tasty-quickcheck text wai wai-extra
        ];
        description = "Generic kinds and types for working with HTTP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138783,7 +138783,7 @@ self: {
          base bytestring hspec http-types QuickCheck quickcheck-instances
        ];
        description = "A low-level HTTP library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-link-header" = callPackage
@@ -138807,7 +138807,7 @@ self: {
          base criterion directory network-uri text transformers
        ];
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "http-link-header_1_2_0" = callPackage
@@ -138831,8 +138831,8 @@ self: {
          network-uri text transformers
        ];
        description = "A parser and writer for the HTTP Link header per RFC 5988";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "http-listen" = callPackage
@@ -138849,8 +138849,8 @@ self: {
          base bytestring exceptions HTTP network transformers
        ];
        description = "Listen to HTTP requests and handle them in arbitrary ways";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138873,7 +138873,7 @@ self: {
          test-framework test-framework-quickcheck2 utf8-string
        ];
        description = "Processing HTTP Content-Type and Accept headers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-mock" = callPackage
@@ -138889,7 +138889,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "HTTP mocking and expectations library for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "http-monad" = callPackage
@@ -138908,8 +138908,8 @@ self: {
          network-uri parsec semigroups transformers utility-ht
        ];
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138926,8 +138926,8 @@ self: {
          transformers
        ];
        description = "A type unsafe http library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138947,8 +138947,8 @@ self: {
          http-types pipes pipes-bytestring pipes-safe transformers wai
        ];
        description = "Serve a WAI application with http-pony";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -138960,7 +138960,7 @@ self: {
        sha256 = "14fbqw5bqsbyvr99g4bpk54n38mz2ilkyb6979rgdr2fpvzkv6rr";
        libraryHaskellDepends = [ base case-insensitive lens profunctors ];
        description = "Tag http headers as case insensitive";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-pony-transformer-http" = callPackage
@@ -138975,7 +138975,7 @@ self: {
          attoparsec base bytestring pipes pipes-attoparsec transformers
        ];
        description = "Transform raw TCP stream to a basic HTTP type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-pony-transformer-startline" = callPackage
@@ -138988,7 +138988,7 @@ self: {
          attoparsec base bytestring http-types lens
        ];
        description = "transform HTTP startlines to tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-proxy" = callPackage
@@ -139015,8 +139015,8 @@ self: {
          vault wai wai-conduit warp warp-tls
        ];
        description = "A library for writing HTTP and HTTPS proxies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139032,7 +139032,7 @@ self: {
          aeson base bytestring http-conduit network-uri text
        ];
        description = "Simple http queries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-querystring" = callPackage
@@ -139048,8 +139048,8 @@ self: {
          base bytestring containers doctest hspec http-types QuickCheck
        ];
        description = "The HTTP query builder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139069,8 +139069,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Declarative DSL for parsing an HTTP response";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139095,7 +139095,7 @@ self: {
          transformers unliftio wai warp
        ];
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-rfc7807" = callPackage
@@ -139115,8 +139115,8 @@ self: {
          servant servant-server tasty tasty-hunit text
        ];
        description = "RFC7807 style response messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139132,8 +139132,8 @@ self: {
          base HTTP mime network network-uri text unix url utf8-string
        ];
        description = "A library for writing Haskell web servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139147,8 +139147,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139180,7 +139180,7 @@ self: {
          unordered-containers
        ];
        description = "An HTTP client using io-streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-test" = callPackage
@@ -139199,7 +139199,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Test framework for HTTP APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-trace" = callPackage
@@ -139218,7 +139218,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Tracking http redirects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "http-types" = callPackage
@@ -139236,7 +139236,7 @@ self: {
          base bytestring doctest hspec QuickCheck quickcheck-instances text
        ];
        description = "Generic HTTP types for Haskell (for both client and server code)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http-wget" = callPackage
@@ -139247,8 +139247,8 @@ self: {
        sha256 = "1sbg4gpx8ikaxb15wflm7fnjnkr32fj07bva62z54dsm630s37fx";
        libraryHaskellDepends = [ base failure process transformers ];
        description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139280,7 +139280,7 @@ self: {
          mwc-random network-byte-order psqueues stm
        ];
        description = "HTTP/2 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http2-client" = callPackage
@@ -139298,7 +139298,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A native HTTP2 client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http2-client-exe" = callPackage
@@ -139317,7 +139317,7 @@ self: {
          lifted-async lifted-base optparse-applicative time tls
        ];
        description = "A command-line http2 client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http2-client-grpc" = callPackage
@@ -139336,8 +139336,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139354,8 +139354,8 @@ self: {
          zlib
        ];
        description = "Encoders based on `proto-lens` for gRPC over HTTP2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139374,7 +139374,7 @@ self: {
          proto3-wire zlib
        ];
        description = "Encoders based on `proto3-wire` for gRPC over HTTP2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "http2-grpc-types" = callPackage
@@ -139388,7 +139388,7 @@ self: {
          base binary bytestring case-insensitive zlib
        ];
        description = "Types for gRPC over HTTP2 common for client and servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "httpd-shed" = callPackage
@@ -139401,7 +139401,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base network network-bsd network-uri ];
        description = "A simple web-server with an interact style API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "https-everywhere-rules" = callPackage
@@ -139424,8 +139424,8 @@ self: {
          taggy-lens text text-icu
        ];
        description = "High-level access to HTTPS Everywhere rulesets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139440,8 +139440,8 @@ self: {
          base directory filepath functor-infix text
        ];
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139460,7 +139460,7 @@ self: {
        ];
        description = "Specification of HTTP request/response generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139474,8 +139474,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
        description = "harmonic analyser and tuner for musical instruments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139503,8 +139503,8 @@ self: {
        ];
        testSystemDepends = [ tvm_runtime ];
        description = "Bindings for TVM machine learning framework";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {tvm_runtime = null;};
 
@@ -139518,8 +139518,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base OpenGL random SDL ];
        description = "A two player abstract strategy game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139538,7 +139538,7 @@ self: {
          process regex-compat unix utf8-string
        ];
        description = "For multiplexing GHC installations and providing development sandboxes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hubigraph" = callPackage
@@ -139550,7 +139550,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers haxr mtl ];
        description = "A haskell wrap for Ubigraph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hubris" = callPackage
@@ -139575,7 +139575,7 @@ self: {
        executableSystemDepends = [ ruby ];
        description = "Support library for Hubris, the Ruby <=> Haskell bridge";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) ruby;};
 
   "huck" = callPackage
@@ -139595,8 +139595,8 @@ self: {
          unordered-containers
        ];
        description = "huck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139608,7 +139608,7 @@ self: {
        sha256 = "0ajyqwnpdhby9h6skl3l0dys53ycnyq7y7r72ma7x0b5rdi3djd2";
        libraryHaskellDepends = [ base ];
        description = "Haskell IOT on Intel Edison and other Linux computers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "huff" = callPackage
@@ -139628,8 +139628,8 @@ self: {
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ base ];
        description = "A fast-foward-based planner";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139641,8 +139641,8 @@ self: {
        sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3";
        libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139659,8 +139659,8 @@ self: {
          yhccore
        ];
        description = "Hugs Front-end to Yhc Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139687,8 +139687,8 @@ self: {
          mtl network split strict text time unix utf8-string
        ];
        description = "IRC server written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139721,8 +139721,8 @@ self: {
          vty witherable-class
        ];
        description = "A TUI MPD client, inspired by ncmpcpp";
-       license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139734,8 +139734,8 @@ self: {
        sha256 = "0lr2m5gci1k0x7w1i49cb6nhbnnkym4raaagn916ahf79y05jv7d";
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for parsing text entered by humans";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139749,7 +139749,7 @@ self: {
        testHaskellDepends = [ base doctest Glob time ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provide duration helper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "human-text" = callPackage
@@ -139760,8 +139760,8 @@ self: {
        sha256 = "0v6wrs9mcmiwk9ladjcibw1yqpbbl0y6v9i3ni39v0byby0a2zpa";
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for converting values to human-friendly text";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139773,8 +139773,8 @@ self: {
        sha256 = "0pzfhp65afkdc33pjbxzcf68c02w6nq8sxqspfwbn78dghg9cbrn";
        libraryHaskellDepends = [ base bytestring deepseq ghc text ];
        description = "Redefinition-free prelude alternative";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139800,7 +139800,7 @@ self: {
        ];
        description = "Haskell UPnP Media Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139823,7 +139823,7 @@ self: {
          QuickCheck split
        ];
        description = "CSS-like syntax for file system manipulation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hunit-dejafu" = callPackage
@@ -139834,7 +139834,7 @@ self: {
        sha256 = "11d52blw31mcsg7c3w1f7khy3vk2p03h4c5z6ja6wb9k5bg4d004";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hunit-gui" = callPackage
@@ -139849,8 +139849,8 @@ self: {
        libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        description = "A GUI testrunner for HUnit";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139862,7 +139862,7 @@ self: {
        sha256 = "089l8n1yjcf6sypr76r8p0djwpcqaa5xdk1d0m2k9piig9fnzr40";
        libraryHaskellDepends = [ base HUnit parsec ];
        description = "An HUnit Testable instance for Parsec parser unit tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hunit-rematch" = callPackage
@@ -139874,8 +139874,8 @@ self: {
        libraryHaskellDepends = [ base HUnit rematch ];
        testHaskellDepends = [ base hspec HUnit rematch ];
        description = "HUnit support for rematch";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139895,7 +139895,7 @@ self: {
        ];
        description = "Unpacker tool with DWIM";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139912,8 +139912,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq stm ];
        benchmarkPkgconfigDepends = [ hunspell ];
        description = "Hunspell thread-safe FFI bindings for spell checking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) hunspell;};
 
@@ -139945,8 +139945,8 @@ self: {
          time
        ];
        description = "A search and indexing engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139970,8 +139970,8 @@ self: {
          wai-extra wai-middleware-static warp
        ];
        description = "A search and indexing engine server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -139995,8 +139995,8 @@ self: {
          time transformers unordered-containers
        ];
        description = "A Command line Interface for the Hunt server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {hunt-client = null;};
 
@@ -140025,8 +140025,8 @@ self: {
          http-types QuickCheck simple temporary transformers wai wai-extra
        ];
        description = "Upload packages or documentation to a hackage server";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140042,8 +140042,8 @@ self: {
          array base bytestring containers kangaroo
        ];
        description = "Extract function names from Windows DLLs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140068,8 +140068,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory network-uri ];
        description = "Haskell URL resolver";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140088,8 +140088,8 @@ self: {
          aeson base bytestring containers here hspec text
        ];
        description = "Haskell bindings for Hurriyet API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140114,8 +140114,8 @@ self: {
          parsec process transformers
        ];
        description = "R5RS Scheme interpreter, compiler, and library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140131,8 +140131,8 @@ self: {
          array base containers husk-scheme json mtl transformers
        ];
        description = "Extra libraries for the husk Scheme platform";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140151,7 +140151,7 @@ self: {
        ];
        description = "A simple command line calculator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140172,8 +140172,8 @@ self: {
          websockets wuss
        ];
        description = "A program for the button on Reddit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140187,8 +140187,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec parsec-numbers ];
        description = "Quick implemention of Hutton's Razor";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140200,8 +140200,8 @@ self: {
        sha256 = "0i8h380nszd7hk7x6l7qx0ri6k12551li2m77gspzakcf47l6ldp";
        libraryHaskellDepends = [ base easyplot ];
        description = "Fuzzy logic library with support for T1, IT2, GT2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140214,7 +140214,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Simple strict heterogeneous lists";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hvega" = callPackage
@@ -140233,7 +140233,7 @@ self: {
          tasty-golden text unordered-containers
        ];
        description = "Create Vega-Lite visualizations (version 4) in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hvega-theme" = callPackage
@@ -140244,7 +140244,7 @@ self: {
        sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv";
        libraryHaskellDepends = [ base hvega text ];
        description = "Theme for hvega";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "hw-aeson" = callPackage
@@ -140263,7 +140263,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Convenience functions for Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-all" = callPackage
@@ -140290,8 +140290,8 @@ self: {
          hw-string-parse hw-succinct hw-uri hw-xml
        ];
        description = "Demo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140328,7 +140328,7 @@ self: {
        ];
        doHaddock = false;
        description = "Balanced parentheses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-bits" = callPackage
@@ -140351,7 +140351,7 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-ci-assist" = callPackage
@@ -140372,8 +140372,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        doHaddock = false;
        description = "CI Assistant for Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140399,7 +140399,7 @@ self: {
          base bytestring conduit criterion mmap vector
        ];
        description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hw-conduit-merges" = callPackage
@@ -140416,7 +140416,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Additional merges and joins for Conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-diagnostics" = callPackage
@@ -140429,7 +140429,7 @@ self: {
        testHaskellDepends = [ base doctest doctest-discover ];
        testToolDepends = [ doctest-discover ];
        description = "Diagnostics library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-dsv" = callPackage
@@ -140470,8 +140470,8 @@ self: {
          mmap vector
        ];
        description = "Unbelievably fast streaming DSV file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140505,7 +140505,7 @@ self: {
          base bits-extra bytestring criterion hw-bits hw-prim vector
        ];
        description = "File Dump";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-eliasfano" = callPackage
@@ -140544,7 +140544,7 @@ self: {
          hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector
        ];
        description = "Elias-Fano";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-excess" = callPackage
@@ -140569,7 +140569,7 @@ self: {
          base bytestring criterion hw-prim vector
        ];
        description = "Excess";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-fingertree" = callPackage
@@ -140587,7 +140587,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Generic finger-tree structure, with example instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-fingertree-strict" = callPackage
@@ -140607,7 +140607,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Generic strict finger-tree structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-hedgehog" = callPackage
@@ -140621,7 +140621,7 @@ self: {
        testHaskellDepends = [ base doctest doctest-discover ];
        testToolDepends = [ doctest-discover ];
        description = "Extra hedgehog functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-hspec-hedgehog" = callPackage
@@ -140640,7 +140640,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Interoperability between hspec and hedgehog";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-int" = callPackage
@@ -140658,7 +140658,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Additional facilities for Integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-ip" = callPackage
@@ -140689,7 +140689,7 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        doHaddock = false;
        description = "Library for manipulating IP addresses and CIDR blocks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-json" = callPackage
@@ -140733,8 +140733,8 @@ self: {
        ];
        doHaddock = false;
        description = "Memory efficient JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140764,8 +140764,8 @@ self: {
          base bytestring criterion hw-json lens
        ];
        description = "Lens for hw-json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140792,8 +140792,8 @@ self: {
        ];
        testToolDepends = [ doctest-discover ];
        description = "SIMD-based JSON semi-indexer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140831,8 +140831,8 @@ self: {
          base bytestring criterion directory mmap
        ];
        description = "Memory efficient JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140872,8 +140872,8 @@ self: {
          base bytestring criterion directory mmap
        ];
        description = "Memory efficient JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140900,8 +140900,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Avro support for Kafka infrastructure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -140926,7 +140926,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Kafka bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) rdkafka;};
 
   "hw-kafka-conduit" = callPackage
@@ -140951,7 +140951,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Conduit bindings for hw-kafka-client";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hw-mquery" = callPackage
@@ -140973,7 +140973,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Monadic query DSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-packed-vector" = callPackage
@@ -141006,7 +141006,7 @@ self: {
          base criterion directory hedgehog hspec hw-prim vector
        ];
        description = "Packed Vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-parser" = callPackage
@@ -141026,7 +141026,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Simple parser support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-prim" = callPackage
@@ -141053,7 +141053,7 @@ self: {
          base bytestring criterion mmap transformers vector
        ];
        description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -141073,8 +141073,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141114,7 +141114,7 @@ self: {
        ];
        doHaddock = false;
        description = "Rank-select";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-rankselect-base" = callPackage
@@ -141140,7 +141140,7 @@ self: {
          base bits-extra criterion hw-bits hw-prim vector
        ];
        description = "Rank-select base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-simd" = callPackage
@@ -141172,8 +141172,8 @@ self: {
          transformers vector
        ];
        description = "SIMD library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141202,7 +141202,7 @@ self: {
          transformers vector
        ];
        description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-string-parse" = callPackage
@@ -141214,7 +141214,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
        description = "String parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-succinct" = callPackage
@@ -141232,7 +141232,7 @@ self: {
          mono-traversable text vector word8
        ];
        description = "Succint datastructures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hw-uri" = callPackage
@@ -141267,8 +141267,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Supports IO on URIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141283,7 +141283,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hw-prim vector ];
        testHaskellDepends = [ base hspec QuickCheck vector ];
        description = "Vector type with convenient typeclass instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hw-xml" = callPackage
@@ -141326,7 +141326,7 @@ self: {
          resourcet vector
        ];
        description = "XML parser based on succinct data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -141344,8 +141344,8 @@ self: {
          unix
        ];
        description = "Initial version of firewall Authentication for IITK network";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141368,8 +141368,8 @@ self: {
          transformers
        ];
        description = "Haskell Web Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141390,8 +141390,8 @@ self: {
        executableToolDepends = [ alex happy ];
        testHaskellDepends = [ array base Cabal containers mtl ];
        description = "An implementation of Neil D. Jones' While language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141410,7 +141410,7 @@ self: {
          base directory extra filepath hint simple-cmd-args
        ];
        description = "Commandline text processing with Haskell functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hworker" = callPackage
@@ -141431,8 +141431,8 @@ self: {
          text time uuid
        ];
        description = "A reliable at-least-once job queue built on top of redis";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141449,8 +141449,8 @@ self: {
          time unordered-containers
        ];
        description = "Library for sending email with Amazon's SES and hworker";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141483,8 +141483,8 @@ self: {
          containers hedgehog hspec magic-wormhole protolude saltine text
        ];
        description = "magic-wormhole client";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141503,8 +141503,8 @@ self: {
          regex-compat text unix
        ];
        description = "Simple Haskell Web Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141524,8 +141524,8 @@ self: {
          base bytestring Cabal criterion cryptohash parallel
        ];
        description = "Hashing with SL2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141537,8 +141537,8 @@ self: {
        sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9";
        libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141552,8 +141552,8 @@ self: {
          base bytestring hwsl2 reducers semigroups
        ];
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141565,8 +141565,8 @@ self: {
        sha256 = "04wkgql6gs9glmp9kj5awis5b15vmwgkyqzi814k9514k3c7c1rb";
        libraryHaskellDepends = [ base ];
        description = "Haskell extras (missing utility functions)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141585,8 +141585,8 @@ self: {
          xml-types
        ];
        description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141613,8 +141613,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs ];
        description = "A pen notetaking program written in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141633,7 +141633,7 @@ self: {
          parsec
        ];
        description = "A collection of tools for processing XML with Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-binary" = callPackage
@@ -141649,7 +141649,7 @@ self: {
        ];
        description = "Serialisation and deserialisation of HXT XmlTrees";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-cache" = callPackage
@@ -141666,7 +141666,7 @@ self: {
        ];
        description = "Cache for HXT XML Documents and other binary data";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-charproperties" = callPackage
@@ -141677,7 +141677,7 @@ self: {
        sha256 = "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm";
        libraryHaskellDepends = [ base ];
        description = "Character properties and classes for XML and Unicode";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-css" = callPackage
@@ -141690,7 +141690,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hxt parsec split ];
        description = "CSS selectors for HXT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hxt-curl" = callPackage
@@ -141702,7 +141702,7 @@ self: {
        libraryHaskellDepends = [ base bytestring curl hxt parsec ];
        description = "LibCurl interface for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-expat" = callPackage
@@ -141714,7 +141714,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hexpat hxt ];
        description = "Expat parser for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-extras" = callPackage
@@ -141725,7 +141725,7 @@ self: {
        sha256 = "1bv8kcra2vgjbp7k0yczlrfbjh7ib2xixaqpnnd60hq84878nzb1";
        libraryHaskellDepends = [ base hxt ];
        description = "Extra functions for HXT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hxt-filter" = callPackage
@@ -141742,7 +141742,7 @@ self: {
        ];
        description = "A collection of tools for processing XML with Haskell (Filter variant)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-http" = callPackage
@@ -141757,7 +141757,7 @@ self: {
          base bytestring HTTP hxt network network-uri parsec
        ];
        description = "Interface to native Haskell HTTP package HTTP";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-pickle-utils" = callPackage
@@ -141770,8 +141770,8 @@ self: {
        editedCabalFile = "0d5fg718y7xzw76ip33q0w1liqk70q9074qkd198mjnijxjcrkf3";
        libraryHaskellDepends = [ base hxt mtl ];
        description = "Utility functions for using HXT picklers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141793,7 +141793,7 @@ self: {
          base bytestring criterion deepseq parsec text
        ];
        description = "A regular expression library for W3C XML Schema regular expressions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-relaxng" = callPackage
@@ -141809,7 +141809,7 @@ self: {
          network-uri parsec
        ];
        description = "The HXT RelaxNG validator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-tagsoup" = callPackage
@@ -141825,7 +141825,7 @@ self: {
        ];
        description = "TagSoup parser for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-unicode" = callPackage
@@ -141836,7 +141836,7 @@ self: {
        sha256 = "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v";
        libraryHaskellDepends = [ base hxt-charproperties ];
        description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hxt-xpath" = callPackage
@@ -141851,7 +141851,7 @@ self: {
        ];
        description = "The XPath modules for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxt-xslt" = callPackage
@@ -141867,7 +141867,7 @@ self: {
        ];
        description = "The XSLT modules for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hxthelper" = callPackage
@@ -141879,7 +141879,7 @@ self: {
        libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        description = "Helper functions for HXT";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141891,8 +141891,8 @@ self: {
        sha256 = "0faiyflyhmn2y0bs920qgm9xkj9i69lzxhsg4rxffal989gi32z8";
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141906,8 +141906,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers HUnit random ];
        description = "A Yahtzee game implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141929,8 +141929,8 @@ self: {
          unordered-containers
        ];
        description = "Literate-style Documentation Generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141947,8 +141947,8 @@ self: {
          base containers haskell98 mtl parsec
        ];
        description = "A implementation of a type-checker for Lambda-H";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -141964,7 +141964,7 @@ self: {
          base deepseq primitive semigroups vector
        ];
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hydra-hs" = callPackage
@@ -141977,8 +141977,8 @@ self: {
        librarySystemDepends = [ sixense_x64 ];
        testHaskellDepends = [ base ];
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {sixense_x64 = null;};
 
@@ -142010,8 +142010,8 @@ self: {
          text time transformers unix
        ];
        description = "NCurses interface to view multiple ByteString streams in parallel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142028,8 +142028,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
        description = "An alternate Prelude";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142050,8 +142050,8 @@ self: {
          hydrogen-parsing hydrogen-prelude hydrogen-syntax
        ];
        description = "Hydrogen Data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142067,8 +142067,8 @@ self: {
          base containers hydrogen-multimap hydrogen-prelude
        ];
        description = "Hydrogen Command Line Arguments Parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142080,8 +142080,8 @@ self: {
        sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88";
        libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        description = "Hydrogen Data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142093,8 +142093,8 @@ self: {
        sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93";
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Hydrogen Multimap";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142108,8 +142108,8 @@ self: {
          base containers hydrogen-prelude parsec
        ];
        description = "Hydrogen Parsing Utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142129,8 +142129,8 @@ self: {
          regex-base regex-tdfa strict text time transformers uuid
        ];
        description = "Hydrogen Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142142,8 +142142,8 @@ self: {
        sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh";
        libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        description = "Hydrogen Prelude /w Parsec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142160,8 +142160,8 @@ self: {
          uuid
        ];
        description = "Hydrogen Syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142176,8 +142176,8 @@ self: {
          base containers hydrogen-prelude parsec time
        ];
        description = "Hydrogen Tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142189,7 +142189,7 @@ self: {
        sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38";
        libraryHaskellDepends = [ base ];
        description = "Hydrogen Version Type";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hyena" = callPackage
@@ -142206,8 +142206,8 @@ self: {
          mtl network network-bytestring unix
        ];
        description = "Simple web application server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142229,8 +142229,8 @@ self: {
          process text wai warp websockets
        ];
        description = "WebGL live-coding environment for writing shaders with Hylogen";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142242,7 +142242,7 @@ self: {
        sha256 = "0ha9bn7mqyqwpxzzcd4p0hm59dbrf3rcnpyihjkgnb7j4wk1f1rx";
        libraryHaskellDepends = [ base data-reify vector-space ];
        description = "GLSL embedded in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "hylolib" = callPackage
@@ -142258,7 +142258,7 @@ self: {
        ];
        description = "Tools for hybrid logics related programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142274,7 +142274,7 @@ self: {
        executableHaskellDepends = [ base hylolib mtl ];
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142291,7 +142291,7 @@ self: {
        ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142303,7 +142303,7 @@ self: {
        sha256 = "14vl52v4qshdyp45qrg8ii8xzpi6n05qdgz3ri59wis8hdw1v06z";
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hyper-extra" = callPackage
@@ -142318,8 +142318,8 @@ self: {
          base diagrams-lib diagrams-svg hyper QuickCheck svg-builder text
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142339,8 +142339,8 @@ self: {
          hint hyper scotty text transformers
        ];
        description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142359,8 +142359,8 @@ self: {
          pipes pretty
        ];
        description = "a fast, trustworthy HTTP(s) server built";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142376,8 +142376,8 @@ self: {
          adjunctions base distributive profunctors transformers
        ];
        description = "Hyperfunctions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142405,8 +142405,8 @@ self: {
          base hspec lens QuickCheck text unordered-containers
        ];
        description = "Reliable performance measurement with robust data export";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142432,7 +142432,7 @@ self: {
          simple-reflect
        ];
        description = "An approximate streaming (constant space) unique object counter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hyperloglogplus" = callPackage
@@ -142448,8 +142448,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit semigroups tasty tasty-hunit ];
        description = "Approximate cardinality estimation using constant space";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142465,8 +142465,8 @@ self: {
          aeson attoparsec base bytestring http-enumerator http-types
        ];
        description = "A thin wrapper for the Hyperpublic API";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142478,7 +142478,7 @@ self: {
        sha256 = "0pnp5d1a0hwn6jm8v6i7yygd831q2bvsz6qb9n8db8n17lfxikx4";
        libraryHaskellDepends = [ base containers ];
        description = "Text hyphenation algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hyphenation" = callPackage
@@ -142500,7 +142500,7 @@ self: {
          base containers doctest unordered-containers
        ];
        description = "Configurable Knuth-Liang hyphenation";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "hypher" = callPackage
@@ -142529,8 +142529,8 @@ self: {
          transformers-base unordered-containers vector
        ];
        description = "A Haskell neo4j client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142575,7 +142575,7 @@ self: {
        librarySystemDepends = [ z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings for the Z3 Theorem Prover";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
   "hzaif" = callPackage
@@ -142592,7 +142592,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "This package is Zaif Exchange Api wrapper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hzenhan" = callPackage
@@ -142604,7 +142604,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base containers QuickCheck text ];
        description = "Zenhan library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hzenity" = callPackage
@@ -142619,7 +142619,7 @@ self: {
          base containers data-default process process-extras text time
        ];
        description = "Haskell interface to Zenity dialogs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "hzk" = callPackage
@@ -142637,7 +142637,7 @@ self: {
        ];
        testSystemDepends = [ zookeeper_mt ];
        description = "Haskell client library for Apache Zookeeper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) zookeeper_mt;};
 
   "hzulip" = callPackage
@@ -142661,8 +142661,8 @@ self: {
          scotty stm stm-conduit text transformers
        ];
        description = "A haskell wrapper for the Zulip API";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142683,8 +142683,8 @@ self: {
          base containers hspec tasty tasty-hspec text
        ];
        description = "Internationalization for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142704,7 +142704,7 @@ self: {
          transformers turtle
        ];
        description = "Base i3blocks written in haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "i3ipc" = callPackage
@@ -142721,8 +142721,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "A type-safe wrapper around i3's IPC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142741,8 +142741,8 @@ self: {
          time
        ];
        description = "iCalendar data types, parser, and printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142755,7 +142755,7 @@ self: {
        libraryHaskellDepends = [ base interleavableIO mtl ];
        description = "Version of Control.Exception using InterleavableIO.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "iap-verifier" = callPackage
@@ -142771,8 +142771,8 @@ self: {
          monads-tf text transformers
        ];
        description = "A simple wrapper of In-App-Purchase receipt validate APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142789,8 +142789,8 @@ self: {
          attoparsec base bytestring network unix
        ];
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142809,8 +142809,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        description = "Validate and generate IBANs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142822,7 +142822,7 @@ self: {
        sha256 = "0yrdh4y0ssldg0lmrbr6yk0zg2sihirp3mnh20dvg3m887kdhrj1";
        libraryHaskellDepends = [ base dbus directory unix xdg-basedir ];
        description = "A simple uncomplete ibus api";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "ical" = callPackage
@@ -142843,8 +142843,8 @@ self: {
        executableHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
        description = "iCalendar format parser and org-mode converter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142890,8 +142890,8 @@ self: {
          wai-websockets warp websockets
        ];
        description = "A fast JSON document store with push notification support";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ rkrzr ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ rkrzr ];
      }) {};
 
   "icfpc2020-galaxy" = callPackage
@@ -142902,7 +142902,7 @@ self: {
        sha256 = "17m8vp3kikpscagb40972r9a8i6ng8wjc697zdslj5zl95rpyrvd";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "A strange message received at the Pegovka observatory";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "icon-fonts" = callPackage
@@ -142913,7 +142913,7 @@ self: {
        sha256 = "0lc5filf2xydjrsq9d5qlwz3y76pn590pjiqjjhibkk4dhnys3gs";
        libraryHaskellDepends = [ base ];
        description = "Package for handling icon fonts in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iconv" = callPackage
@@ -142924,7 +142924,7 @@ self: {
        sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin";
        libraryHaskellDepends = [ base bytestring ];
        description = "String encoding conversion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iconv-typed" = callPackage
@@ -142940,8 +142940,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Type safe iconv wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -142988,8 +142988,8 @@ self: {
          test-framework test-framework-hunit text unix utf8-string
        ];
        description = "An IDE backend library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143014,8 +143014,8 @@ self: {
          unix-compat
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143027,7 +143027,7 @@ self: {
        sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0";
        libraryHaskellDepends = [ base ];
        description = "RTS for the IDE backend";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ide-backend-server" = callPackage
@@ -143050,8 +143050,8 @@ self: {
          transformers unix unordered-containers zlib
        ];
        description = "An IDE backend server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143071,8 +143071,8 @@ self: {
          QuickCheck random streaming-commons time uniplate wai wl-pprint
        ];
        description = "Feedback services for intelligent tutoring systems";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143091,7 +143091,7 @@ self: {
        ];
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143105,8 +143105,8 @@ self: {
          base containers ideas parsec QuickCheck
        ];
        description = "Common types for mathematical domain reasoners";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143122,8 +143122,8 @@ self: {
          base containers ideas ideas-math-types
        ];
        description = "Interactive domain reasoner for statistics";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143136,8 +143136,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Idempotent monoids";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143160,7 +143160,7 @@ self: {
          base bytestring criterion JuicyPixels random tf-random
        ];
        description = "Flexible generation of identicons";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "identicon-style-squares" = callPackage
@@ -143180,7 +143180,7 @@ self: {
          base bytestring cryptohash identicon JuicyPixels
        ];
        description = "Squares style for the identicon package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "identifiers" = callPackage
@@ -143204,8 +143204,8 @@ self: {
          base binary bytestring cereal criterion deepseq text
        ];
        description = "Numeric identifiers for values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143231,8 +143231,8 @@ self: {
          MissingH polyparse process text utf8-string
        ];
        description = "ID3v2 (tagging standard for MP3 files) library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143244,7 +143244,7 @@ self: {
        sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp";
        libraryHaskellDepends = [ base punycode stringprep text ];
        description = "Implements IDNA (RFC 3490)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "idna2008" = callPackage
@@ -143255,8 +143255,8 @@ self: {
        sha256 = "1pd62pr1hyk565mxc15f5lxyms58bywcqll5ya6cnzw20lv4lzlz";
        libraryHaskellDepends = [ base punycode split ];
        description = "Converts Unicode hostnames into ASCII";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143277,7 +143277,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A project manage tool for Idris";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "idris" = callPackage
@@ -143321,8 +143321,8 @@ self: {
          time transformers
        ];
        description = "Functional Programming Language with Dependent Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp;};
 
@@ -143334,7 +143334,7 @@ self: {
        sha256 = "0ckhmy10l4kchr5bg1hlygrj86ij0wrj3r8in9g3c3jhh00dx3km";
        libraryHaskellDepends = [ base ];
        description = "Utilities for dealing with IEEE floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ieee-utils" = callPackage
@@ -143345,8 +143345,8 @@ self: {
        sha256 = "0548m1xjvzf65kkklmqjr2f5h85zdfpvxmdbx5rcg33zi8aiqfgk";
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143358,7 +143358,7 @@ self: {
        sha256 = "0x0mkvnf3q4yfh7bi7hv6364gy0l57syzy9xgzyax8z94zh465c3";
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ieee754" = callPackage
@@ -143369,7 +143369,7 @@ self: {
        sha256 = "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f";
        libraryHaskellDepends = [ base ];
        description = "Utilities for dealing with IEEE floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ieee754-parser" = callPackage
@@ -143396,8 +143396,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit stocks ];
        description = "Library for the IEX Trading API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143409,7 +143409,7 @@ self: {
        sha256 = "078lg8b6n4bhlhh6ax4k4n8k8fk7hiwcnzyr4h9zbq6vczl77xi8";
        libraryHaskellDepends = [ base ];
        description = "(?) and (?>) conditional operator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ifcxt" = callPackage
@@ -143423,8 +143423,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "put if statements within type constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143452,7 +143452,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "An inductive-form set constraint solver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ig" = callPackage
@@ -143473,8 +143473,8 @@ self: {
          time transformers transformers-base unordered-containers
        ];
        description = "Bindings to Instagram's API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143497,8 +143497,8 @@ self: {
          transformers wl-pprint-text
        ];
        description = "An keyboard-driven interactive graph editor";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143517,8 +143517,8 @@ self: {
        libraryPkgconfigDepends = [ ige-mac-integration ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Bindings for the Gtk/OS X integration library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ige-mac-integration = null;};
 
@@ -143538,8 +143538,8 @@ self: {
        executableHaskellDepends = [ base directory path ];
        testHaskellDepends = [ base HTF text ];
        description = "Handle ignore files of different VCSes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143557,8 +143557,8 @@ self: {
        librarySystemDepends = [ igraph ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the igraph C library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) igraph;};
 
@@ -143572,7 +143572,7 @@ self: {
          ad base poly semirings text vector-space
        ];
        description = "International Geomagnetic Reference Field";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ihaskell" = callPackage
@@ -143607,8 +143607,8 @@ self: {
          raw-strings-qq setenv shelly text transformers
        ];
        description = "A Haskell backend kernel for the IPython project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143624,8 +143624,8 @@ self: {
          aeson aeson-pretty base bytestring here ihaskell text
        ];
        description = "IHaskell display instances for Aeson";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143637,8 +143637,8 @@ self: {
        sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw";
        libraryHaskellDepends = [ base ihaskell ];
        description = "IHaskell display instances for basic types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143650,8 +143650,8 @@ self: {
        sha256 = "1733lg13v3pn95249gxbxrvbwfg2a95badvf98vkx6hx2mbxv9q7";
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        description = "IHaskell display instances for blaze-html types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143668,8 +143668,8 @@ self: {
          ihaskell
        ];
        description = "IHaskell display instances for charts types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143686,8 +143686,8 @@ self: {
          directory ihaskell text
        ];
        description = "IHaskell display instances for diagram types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143699,8 +143699,8 @@ self: {
        sha256 = "1cbfhv9kg33dj28mn6mhhi363pz9jr2kw4ph64ga1fiawlj563l0";
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
        description = "IHaskell display instances for basic types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143712,8 +143712,8 @@ self: {
        sha256 = "1qdcx0y52w805z5dg2xwsy1ykbbk05i4k04y0w3r4r3wwjvq3kk6";
        libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
        description = "IHaskell display instance for Gnuplot (from gnuplot package)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143725,8 +143725,8 @@ self: {
        sha256 = "1min39vd75rn7vwpmggf8a30fhlv5zphhmckb5a4g6lqg5v1kf1y";
        libraryHaskellDepends = [ base bytestring ihaskell process ];
        description = "IHaskell display instance for GraphViz (external binary)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143738,8 +143738,8 @@ self: {
        sha256 = "0rsfavpxm14bbrjcsi9rps3p1bjhhgvam0znhn8vwfmic3fpsda8";
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
        description = "IHaskell display instances for hatex";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143751,8 +143751,8 @@ self: {
        sha256 = "0k7h33cqj58dv4hrsdjgnbykh036mrvbw6cbr98xlkdq5062pnzp";
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143770,8 +143770,8 @@ self: {
          ihaskell-blaze inline-r template-haskell temporary
        ];
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143786,8 +143786,8 @@ self: {
          base bytestring directory ihaskell JuicyPixels
        ];
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143804,8 +143804,8 @@ self: {
          text utf8-string
        ];
        description = "IHaskell display instances for bytestrings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143821,8 +143821,8 @@ self: {
          aeson base here ihaskell parsec random text unordered-containers
        ];
        description = "IHaskell display instances for Parsec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143834,8 +143834,8 @@ self: {
        sha256 = "12bi8im5489kmy0d26kn3hljkj4c1xynsa97h6nh5dp53awklm3y";
        libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        description = "IHaskell display instance for Plot (from plot package)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143853,8 +143853,8 @@ self: {
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
        ];
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143872,8 +143872,8 @@ self: {
          text unix unordered-containers vector vinyl
        ];
        description = "IPython standard widgets for IHaskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143887,7 +143887,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Interpolated Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "ihttp" = callPackage
@@ -143905,8 +143905,8 @@ self: {
        ];
        executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143924,7 +143924,7 @@ self: {
          base criterion lens loop transformers vector
        ];
        description = "Optimised list functions for doing index-related things";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "illuminate" = callPackage
@@ -143944,8 +143944,8 @@ self: {
        executableHaskellDepends = [ array base containers html xhtml ];
        executableToolDepends = [ alex ];
        description = "A fast syntax highlighting library built with alex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -143959,7 +143959,7 @@ self: {
        editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7";
        libraryHaskellDepends = [ base bytestring ];
        description = "Determine the type of an image by reading the first bytes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "imagefilters" = callPackage
@@ -143970,7 +143970,7 @@ self: {
        sha256 = "1n7awx8wsm6z0sp54jri3sp403n14wzr08vjj4a422q1lf306l3y";
        libraryHaskellDepends = [ base gd ];
        description = "Image Filters (contrast, brightness, gaussian blur, etc)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "imagemagick" = callPackage
@@ -143995,7 +143995,7 @@ self: {
        testPkgconfigDepends = [ imagemagick ];
        description = "bindings to imagemagick library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
@@ -144014,8 +144014,8 @@ self: {
          template-haskell transformers vcs-revision
        ];
        description = "Command-line image paste utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144036,7 +144036,7 @@ self: {
          base bytestring conduit conduit-extra hspec resourcet
        ];
        description = "Determine the size of some common image formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "imap" = callPackage
@@ -144062,8 +144062,8 @@ self: {
          tasty-quickcheck text transformers word8
        ];
        description = "An efficient IMAP client library, with SSL and streaming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144081,8 +144081,8 @@ self: {
          base bytestring directory HaskellNet HsOpenSSL network text
        ];
        description = "Downloads email from imap SSL servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144105,7 +144105,7 @@ self: {
        ];
        description = "Minimalistic reference manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144121,8 +144121,8 @@ self: {
          base data-default-class http-client req text xml-conduit xml-lens
        ];
        description = "A function to post an image to imgur";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144143,8 +144143,8 @@ self: {
          base curl directory haskell98 hxt hxt-xpath url
        ];
        description = "Uploader for Imgur";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144157,8 +144157,8 @@ self: {
        libraryHaskellDepends = [ base imj-base imj-prelude mtl ];
        testHaskellDepends = [ base ];
        description = "Animation Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144183,8 +144183,8 @@ self: {
          ansi-terminal base imj-prelude mtl text time
        ];
        description = "Game engine with geometry, easing, animated text, delta rendering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144205,8 +144205,8 @@ self: {
        executableHaskellDepends = [ base imj-prelude ];
        testHaskellDepends = [ base imj-base mtl text ];
        description = "A game with flying numbers and 8-bit color animations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144222,8 +144222,8 @@ self: {
          base imj-prelude optparse-applicative
        ];
        description = "An application to determine the maximum capacity of stdout buffer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144235,8 +144235,8 @@ self: {
        sha256 = "1nv3fxps3i4znibv98qygxdl22dzri5zkw6hjaqajb4nlnh4bd0v";
        libraryHaskellDepends = [ base mtl text ];
        description = "Prelude library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144275,8 +144275,8 @@ self: {
          typed-process typerep-map uri-bytestring xml-conduit xml-types
        ];
        description = "Execute arbitrary actions for each item from RSS/Atom feeds";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144295,8 +144295,8 @@ self: {
          base lifted-base stm tasty tasty-hunit transformers
        ];
        description = "Spawn threads that never die (unless told to do so)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -144310,7 +144310,7 @@ self: {
        libraryHaskellDepends = [ base stm unliftio-core ];
        testHaskellDepends = [ base stm tasty tasty-hunit transformers ];
        description = "Spawn threads that never die (unless told to do so)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "immortal-queue" = callPackage
@@ -144322,7 +144322,7 @@ self: {
        libraryHaskellDepends = [ async base immortal ];
        testHaskellDepends = [ base stm tasty tasty-hunit ];
        description = "Build a pool of queue-processing worker threads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "immortal-worker" = callPackage
@@ -144338,8 +144338,8 @@ self: {
          unliftio-core
        ];
        description = "Create worker threads that logs exceptions and restarts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144363,8 +144363,8 @@ self: {
          parsec richreports split staticanalysis text uxadt
        ];
        description = "Multi-platform parser analyzer and generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144390,8 +144390,8 @@ self: {
          tasty-th
        ];
        description = "Deep embedding of imperative programs with code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144408,8 +144408,8 @@ self: {
          operational-alacarte pretty syntactic
        ];
        description = "Deep embedding of VHDL programs with code generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144422,8 +144422,8 @@ self: {
        libraryHaskellDepends = [ base containers named template-haskell ];
        doHaddock = false;
        description = "Framework for defaulting superclasses";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144454,7 +144454,7 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        benchmarkHaskellDepends = [ base criterion parsec ];
        description = "A math-inspired programmatic 2D & 3D CAD system";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "implicit-hie" = callPackage
@@ -144480,7 +144480,7 @@ self: {
          hspec-attoparsec text transformers yaml
        ];
        description = "Auto generate hie-bios cradles & hie.yaml";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "implicit-hie-cradle" = callPackage
@@ -144500,7 +144500,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Auto generate hie-bios cradles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "implicit-logging" = callPackage
@@ -144513,8 +144513,8 @@ self: {
        editedCabalFile = "02x6cmbxyw26y5azhjrx8461vngsj27l0a255xvhg2pl25zwfbfs";
        libraryHaskellDepends = [ base mtl time transformers ];
        description = "A logging framework built around implicit parameters";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144526,8 +144526,8 @@ self: {
        sha256 = "1da01fnwxf1350ywawvl58qf479q2rz81wi9s8lvw2n3d75qpn8i";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Named and unnamed implicit parameters with defaults";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144560,8 +144560,8 @@ self: {
          universum unordered-containers
        ];
        description = "Tool for haskell imports refactoring";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144574,8 +144574,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath mtl ];
        testHaskellDepends = [ base directory filepath mtl ];
        description = "Generate code for importing directories automatically";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144587,8 +144587,8 @@ self: {
        sha256 = "0557f8a9aaslkhpyp7b6zidg88a3472ya31rp8amqf71393nvkqp";
        libraryHaskellDepends = [ base lens ];
        description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144609,8 +144609,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal Imprevu ];
        description = "Reactive programming language based on a DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Imprevu = null;};
 
@@ -144631,8 +144631,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal ];
        description = "Imprevu support for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "imprint" = callPackage
@@ -144646,8 +144646,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring constraints ];
        testHaskellDepends = [ base binary constraints hspec ];
        description = "Serialization of arbitrary Haskell expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144659,8 +144659,8 @@ self: {
        sha256 = "0z8w7lgk263ickb4l3ajhvy1bjq38bbiiw6c048a3yn4h8kpg67a";
        libraryHaskellDepends = [ base mtl yices ];
        description = "An imperative, verifiable programming language for high assurance applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144683,7 +144683,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Mutable containers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "in-other-words" = callPackage
@@ -144704,7 +144704,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A higher-order effect system where the sky's the limit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inbox" = callPackage
@@ -144715,7 +144715,7 @@ self: {
        sha256 = "12012di97775da8ijv0qjwaxls36kvly0j7nvqqj15ai3kf9yarq";
        libraryHaskellDepends = [ async base error-or text time ];
        description = "Inbox for asychronous messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inc-ref" = callPackage
@@ -144726,7 +144726,7 @@ self: {
        sha256 = "0hr25bdwq2a1mj74wb8dvb95jyfqx13rz0h4makyb5kqlhxz40xl";
        libraryHaskellDepends = [ base stm ];
        description = "A STM reference useful for incremental computing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inch" = callPackage
@@ -144748,8 +144748,8 @@ self: {
          presburger pretty
        ];
        description = "A type-checker for Haskell with integer constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144761,8 +144761,8 @@ self: {
        sha256 = "1dsrx48srmrqcw4y60prgnzxzr7nc7vyzjv0nnr2vaay3j6pxkii";
        libraryHaskellDepends = [ base ];
        description = "Simple parser combinators for lexical analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144781,7 +144781,7 @@ self: {
        testHaskellDepends = [ base bytestring ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Inclusion of files in executables at compile-time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "incremental" = callPackage
@@ -144797,7 +144797,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "incremental update library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "incremental-computing" = callPackage
@@ -144817,8 +144817,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
        description = "Incremental computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144842,8 +144842,8 @@ self: {
          QuickCheck
        ];
        description = "Package for doing incremental computations on maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144867,7 +144867,7 @@ self: {
          base bytestring criterion deepseq monoid-subclasses text
        ];
        description = "Generic parser library capable of providing partial results from partial input";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -144878,7 +144878,7 @@ self: {
        sha256 = "1a75jkv48awijwdch0lnvcxdihh8ns9rflzgsbbhw8p34k1jpz8s";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Simple, Incremental SAT Solving as a Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "increments" = callPackage
@@ -144897,8 +144897,8 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        description = "type classes for incremental updates to data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144913,7 +144913,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Fix your indentation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indentation" = callPackage
@@ -144929,8 +144929,8 @@ self: {
          parsec parsers trifecta
        ];
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144942,8 +144942,8 @@ self: {
        sha256 = "1l1zk5wz9x0m4ird1qk8shi1fkcm3sq2nwkjj6wz2sicp0xkx6h9";
        libraryHaskellDepends = [ base mtl ];
        description = "Indentation sensitive parsing combinators core library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144958,8 +144958,8 @@ self: {
        libraryHaskellDepends = [ base indentation-core mtl parsec ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Indentation sensitive parsing combinators for Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144976,8 +144976,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit trifecta ];
        description = "Indentation sensitive parsing combinators for Trifecta";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -144991,7 +144991,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec ];
        description = "A parser for indentation based structures";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "indents" = callPackage
@@ -145003,7 +145003,7 @@ self: {
        libraryHaskellDepends = [ base mtl parsec ];
        testHaskellDepends = [ base mtl parsec tasty tasty-hunit ];
        description = "indentation sensitive parser-combinators for parsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "index-core" = callPackage
@@ -145014,8 +145014,8 @@ self: {
        sha256 = "014fr720vvl1zs0hl6ljsa1dskwby6zqrlwrrhv0pk1nsmxbilbm";
        libraryHaskellDepends = [ base ];
        description = "Indexed Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145037,8 +145037,8 @@ self: {
          unordered-containers vector vector-th-unbox
        ];
        description = "Tools for entity indexation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145050,7 +145050,7 @@ self: {
        sha256 = "1hpmzg9ziqgng4wh4g0x4p6sdvn9f31hymwxdvfffydzqq70k17g";
        libraryHaskellDepends = [ base ];
        description = "Haskell98 indexed functors, monads, comonads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-containers" = callPackage
@@ -145063,7 +145063,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Simple, no-frills indexed lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-do-notation" = callPackage
@@ -145077,7 +145077,7 @@ self: {
          base haskell-src-meta indexed template-haskell
        ];
        description = "Do notation for indexed monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-extras" = callPackage
@@ -145090,7 +145090,7 @@ self: {
        editedCabalFile = "0103q2ns33wmcnlhda2lcrz2x1kr2cyfxpv7akj6y09k7q19ir77";
        libraryHaskellDepends = [ base bifunctors indexed mtl pointed ];
        description = "Indexed functors, monads and comonads that require extensions to Haskell98";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-free" = callPackage
@@ -145101,7 +145101,7 @@ self: {
        sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx";
        libraryHaskellDepends = [ base indexed ];
        description = "indexed monads for free";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-list-literals" = callPackage
@@ -145113,7 +145113,7 @@ self: {
        libraryHaskellDepends = [ base Only ];
        testHaskellDepends = [ base hspec ];
        description = "Type safe indexed list literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-profunctors" = callPackage
@@ -145124,7 +145124,7 @@ self: {
        sha256 = "0rdvj62rapkkj5zv5jyx2ynfwn2iszx1w2q08j9ik17zklqv9pri";
        libraryHaskellDepends = [ base ];
        description = "Utilities for indexed profunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indexed-traversable" = callPackage
@@ -145135,7 +145135,7 @@ self: {
        sha256 = "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs";
        libraryHaskellDepends = [ array base containers transformers ];
        description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "indexed-traversable-instances" = callPackage
@@ -145159,7 +145159,7 @@ self: {
          vector
        ];
        description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "indextype" = callPackage
@@ -145171,8 +145171,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145184,7 +145184,7 @@ self: {
        sha256 = "1dw0fy3v2hfvlaw371af2c288v4p0wyg43h88clswids3nh1lpn8";
        libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ];
        description = "Indian Language Font Converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "indices" = callPackage
@@ -145199,8 +145199,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Multi-dimensional statically bounded indices";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145226,8 +145226,8 @@ self: {
          raw-strings-qq template-haskell text time
        ];
        description = "A collection of implementations of IndieWeb algorithms";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145263,8 +145263,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Convenient imperative eDSL over Lorentz";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {cleveland = null;};
 
@@ -145277,8 +145277,8 @@ self: {
        libraryHaskellDepends = [ array base deepseq vector ];
        testHaskellDepends = [ array base deepseq QuickCheck text vector ];
        description = "Non-contiguous interval data types with potentially infinite ranges";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145297,7 +145297,7 @@ self: {
          base directory filepath hspec text text-metrics
        ];
        description = "Infer software license from a given license file";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "infer-upstream" = callPackage
@@ -145314,8 +145314,8 @@ self: {
          ansi-wl-pprint base github optparse-applicative parsec process text
        ];
        description = "Find the repository from where a given repo was forked";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145336,8 +145336,8 @@ self: {
          unordered-containers wai
        ];
        description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145358,8 +145358,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative parsec ];
        description = "Type inference and checker for JavaScript (experimental)";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145371,7 +145371,7 @@ self: {
        sha256 = "18sf9798nna155xix71lw68k19r7ayk9kmppjzd76yxa61r38g41";
        libraryHaskellDepends = [ base ];
        description = "Exhaustively searchable infinite sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "infinity" = callPackage
@@ -145386,8 +145386,8 @@ self: {
        executableHaskellDepends = [
          base binary Cabal filepath ghc irc plugins
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145400,7 +145400,7 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src ];
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145420,7 +145420,7 @@ self: {
          base containers hspec hspec-megaparsec megaparsec QuickCheck text
        ];
        description = "Inflections library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inflist" = callPackage
@@ -145432,8 +145432,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        description = "An infinite list type and operations thereon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145461,7 +145461,7 @@ self: {
          template-haskell time vector
        ];
        description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "informative" = callPackage
@@ -145489,8 +145489,8 @@ self: {
          time-locale-compat yesod yesod-auth yesod-core yesod-form
        ];
        description = "A yesod subsite serving a wiki";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145507,7 +145507,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec unordered-containers ];
        description = "Quick and easy configuration files in the INI format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ini-qq" = callPackage
@@ -145521,8 +145521,8 @@ self: {
        libraryHaskellDepends = [ base ini template-haskell text ];
        testHaskellDepends = [ base HUnit ini raw-strings-qq text ];
        description = "Quasiquoter for INI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145542,8 +145542,8 @@ self: {
          testpack trifecta
        ];
        description = "Processing for .ini files with duplicate sections and options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145555,8 +145555,8 @@ self: {
        sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504";
        libraryHaskellDepends = [ base ];
        description = "Initialization and Deinitialization of 'Storable' values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145567,7 +145567,7 @@ self: {
        version = "1.0";
        sha256 = "1dhssqy5369vzcxkkrv8bi5bjz0z67dawwzc27mz9m40bq7324j0";
        description = "A class for injective (one-to-one) functions";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "inj-base" = callPackage
@@ -145578,7 +145578,7 @@ self: {
        sha256 = "1cvhk4ww55nd85rwhaagaz2fihcakrqxy9r37jdp3jghaybk9p9d";
        libraryHaskellDepends = [ base inj ];
        description = "'Inj' instances for 'base'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inject" = callPackage
@@ -145597,7 +145597,7 @@ self: {
          attoparsec base hspec hspec-expectations process text
        ];
        description = "A minimalistic template engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inject-function" = callPackage
@@ -145608,8 +145608,8 @@ self: {
        sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl";
        libraryHaskellDepends = [ base ];
        description = "Monadic functions with injected parameters";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145638,8 +145638,8 @@ self: {
          uniplate
        ];
        description = "Inline some Assembly in ur Haskell!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145665,7 +145665,7 @@ self: {
          unordered-containers vector
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inline-c-cpp" = callPackage
@@ -145683,7 +145683,7 @@ self: {
          base containers hspec inline-c safe-exceptions
        ];
        description = "Lets you embed C++ code into Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inline-c-cpp_0_4_0_3" = callPackage
@@ -145702,8 +145702,8 @@ self: {
          vector
        ];
        description = "Lets you embed C++ code into Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "inline-c-win32" = callPackage
@@ -145718,7 +145718,7 @@ self: {
          base containers inline-c template-haskell Win32
        ];
        description = "Win32 API Context for the inline-c library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inline-java" = callPackage
@@ -145742,8 +145742,8 @@ self: {
          base criterion deepseq jni jvm singletons
        ];
        description = "Java interop via inline Java code in Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145778,8 +145778,8 @@ self: {
          template-haskell vector
        ];
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) R;};
 
@@ -145800,7 +145800,7 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base text ];
        description = "Interactive literate programming";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "input-parsers" = callPackage
@@ -145816,7 +145816,7 @@ self: {
          text transformers
        ];
        description = "Extension of the parsers library with more capability and efficiency";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inquire" = callPackage
@@ -145829,8 +145829,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ aether base text ];
        description = "Console client for encyclopedias";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {aether = null;};
 
@@ -145855,7 +145855,7 @@ self: {
          unordered-containers
        ];
        description = "Associative containers retaining insertion order for traversals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inserts" = callPackage
@@ -145866,8 +145866,8 @@ self: {
        sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477";
        libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        description = "Stupid simple bytestring templates";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145885,7 +145885,7 @@ self: {
          async base bytestring cmdargs pipes pipes-network
        ];
        description = "A simple proxy for debugging plaintext protocols communication";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "inspection-testing" = callPackage
@@ -145901,7 +145901,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "GHC plugin to do inspection testing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "inspector-wrecker" = callPackage
@@ -145923,8 +145923,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Create benchmarks from the HAR files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145959,8 +145959,8 @@ self: {
          regex-tdfa retry scientific text unix unordered-containers
        ];
        description = "SDK for adding custom Instana tracing support to Haskell applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -145972,7 +145972,7 @@ self: {
        sha256 = "0wvb3hia5n0nmfd5ih17qp6f7517s164c5mhrn29ai7vv20x6vbx";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Controls how the compiler searches for instances using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "instance-map" = callPackage
@@ -145988,8 +145988,8 @@ self: {
          aeson base binary bytestring containers hspec mtl template-haskell
        ];
        description = "Template haskell utilities for helping with deserialization etc. of existential types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146006,8 +146006,8 @@ self: {
          aeson base instant-generics tasty tasty-quickcheck
        ];
        description = "Generic Aeson instances through instant-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146024,8 +146024,8 @@ self: {
          base bytes instant-generics tasty tasty-quickcheck
        ];
        description = "Generic Serial instances through instant-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146037,8 +146037,8 @@ self: {
        sha256 = "088fwsj4hllp96ik91wpqyjfjcb5n64sb6b4fqfvplcsn3zzlvv0";
        libraryHaskellDepends = [ base deepseq instant-generics ];
        description = "Generic NFData instances through instant-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146052,8 +146052,8 @@ self: {
        editedCabalFile = "1z5224dfrwlz29clxb2x2s4cn88sfgmq4264zj4vgkkgakvp848w";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        description = "Generic programming library with a sum of products view";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146065,8 +146065,8 @@ self: {
        sha256 = "0xrs81j6dmwd5xb69rn24ibngkhrs51n9kr8bs292vhj0awm3y4b";
        libraryHaskellDepends = [ base hashable instant-generics ];
        description = "Generic Hashable instances through instant-generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146081,7 +146081,7 @@ self: {
        libraryHaskellDepends = [ base instant-generics mtl ];
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146101,8 +146101,8 @@ self: {
          http-types network scotty text wai wai-extra
        ];
        description = "Basic HTTP gateway to save articles to Instapaper";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146114,8 +146114,8 @@ self: {
        sha256 = "0wh95zjdv9j1n3ccg2j08av43qnb9vmiyvqvyi70p47dr481npl8";
        libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146127,7 +146127,7 @@ self: {
        sha256 = "1fc3vgxxzk6rw0y6d40jiyrc66fd1ig7nk4bdmfn1q595q5iwnz3";
        libraryHaskellDepends = [ array base containers music-diatonic ];
        description = "Render Instrument Chords";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "int-cast" = callPackage
@@ -146145,7 +146145,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Checked conversions between integral types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "int-multimap" = callPackage
@@ -146166,8 +146166,8 @@ self: {
          unordered-containers
        ];
        description = "A data structure that associates each Int key with a set of values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146182,8 +146182,8 @@ self: {
        libraryHaskellDepends = [ base containers primitive ];
        testHaskellDepends = [ base containers doctest primitive ];
        description = "Advent of Code 2019 intcode interpreter";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146195,8 +146195,8 @@ self: {
        sha256 = "06302vwkc99l5gdbk3r25w84gi9cj18jcf8ipi189vpnmw42awwf";
        libraryHaskellDepends = [ ghc-prim ];
        description = "Integer library based on GMP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "integer-logarithms" = callPackage
@@ -146214,7 +146214,7 @@ self: {
          tasty-smallcheck
        ];
        description = "Integer logarithms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "integer-pure" = callPackage
@@ -146224,8 +146224,8 @@ self: {
        version = "1.0";
        sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146244,7 +146244,7 @@ self: {
          base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "Integer roots and perfect powers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "integer-simple" = callPackage
@@ -146255,7 +146255,7 @@ self: {
        sha256 = "1z8hfl4wnsb3bypv3arms0sbvixkalhlcchv35vwziy5wnflnsvn";
        libraryHaskellDepends = [ ghc-prim ];
        description = "Simple Integer library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "integration" = callPackage
@@ -146266,7 +146266,7 @@ self: {
        sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc";
        libraryHaskellDepends = [ base parallel ];
        description = "Fast robust numeric integration via tanh-sinh quadrature";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "integreat" = callPackage
@@ -146292,8 +146292,8 @@ self: {
          vector
        ];
        description = "Integrate different assays";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146312,8 +146312,8 @@ self: {
        ];
        librarySystemDepends = [ intel_aes ];
        description = "Hardware accelerated AES encryption and Random Number Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {intel_aes = null;};
 
@@ -146334,8 +146334,8 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "A GHC Core plugin for intensional datatype refinement checking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146352,7 +146352,7 @@ self: {
          base bytestring hspec main-tester mtl silently
        ];
        description = "instantly create REPL from any function";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interactive-plot" = callPackage
@@ -146371,7 +146371,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Interactive quick time series plotting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interchangeable" = callPackage
@@ -146382,7 +146382,7 @@ self: {
        sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh";
        libraryHaskellDepends = [ base containers ];
        description = "A type class for interchangeable data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interleavableGen" = callPackage
@@ -146396,7 +146396,7 @@ self: {
        executableHaskellDepends = [ base directory haskell-src hint mtl ];
        description = "Generates a version of a module using InterleavableIO";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "interleavableIO" = callPackage
@@ -146408,7 +146408,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Use other Monads in functions that asks for an IO Monad";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "interleave" = callPackage
@@ -146419,7 +146419,7 @@ self: {
        sha256 = "062ixqbrrmamwv3fj6vpfcxy35p37i1wpmsxk1gl9n06n0lg9a8c";
        libraryHaskellDepends = [ base ];
        description = "Combinators for supporting interleaving of different behaviours";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interlude" = callPackage
@@ -146448,8 +146448,8 @@ self: {
          string-conv text transformers witherable
        ];
        description = "Prelude replacement based on protolude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146467,7 +146467,7 @@ self: {
          array base bytestring hashable text unordered-containers
        ];
        description = "Efficient hash-consing for arbitrary data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "internetmarke" = callPackage
@@ -146486,7 +146486,7 @@ self: {
        ];
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146513,8 +146513,8 @@ self: {
          transformers
        ];
        description = "Complete interactive development program for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146546,7 +146546,7 @@ self: {
          text transformers unordered-containers vector
        ];
        description = "Tracery-like randomized text interpolation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interpol" = callPackage
@@ -146569,8 +146569,8 @@ self: {
          test-framework-hunit
        ];
        description = "GHC preprocessor and library to enable variable interpolation in strings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146588,7 +146588,7 @@ self: {
          quickcheck-instances template-haskell text
        ];
        description = "String interpolation done right";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interpolatedstring-perl6" = callPackage
@@ -146605,7 +146605,7 @@ self: {
          base bytestring haskell-src-meta template-haskell text
        ];
        description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "interpolatedstring-qq" = callPackage
@@ -146620,8 +146620,8 @@ self: {
          base haskell-src-meta-mwotton template-haskell
        ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146637,8 +146637,8 @@ self: {
          base haskell-src-meta-mwotton template-haskell
        ];
        description = "DO NOT USE THIS. interpolatedstring-qq works now.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146657,8 +146657,8 @@ self: {
          base bytestring haskell-src-meta HUnit template-haskell text
        ];
        description = "QuasiQuoter for multi-line interpolated strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146675,7 +146675,7 @@ self: {
          array base containers QuickCheck utility-ht
        ];
        description = "piecewise linear and cubic Hermite interpolation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interpolator" = callPackage
@@ -146696,7 +146696,7 @@ self: {
          product-profunctors profunctors QuickCheck template-haskell text
        ];
        description = "Runtime interpolation of environment variables in records using profunctors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interprocess" = callPackage
@@ -146710,7 +146710,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base typed-process ];
        description = "Shared memory and control structures for IPC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interruptible" = callPackage
@@ -146728,8 +146728,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal either transformers ];
        description = "Monad transformers that can be run and resumed later, conserving their context";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146741,7 +146741,7 @@ self: {
        sha256 = "1z0ca16vp3j9l2nkzg8gck2jrysqn2fw4vxr2br0j41fp7iss5wx";
        libraryHaskellDepends = [ base base-prelude transformers ];
        description = "An abstraction over interspersing monadic actions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "interval" = callPackage
@@ -146755,8 +146755,8 @@ self: {
        libraryHaskellDepends = [ base deepseq fingertree ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Intervals with adherences";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146769,7 +146769,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "An implementation of Allen's interval algebra for temporal logic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "interval-functor" = callPackage
@@ -146781,7 +146781,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base hedgehog ];
        description = "Intervals of functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "intervals" = callPackage
@@ -146801,7 +146801,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Interval Arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "intmap-graph" = callPackage
@@ -146812,7 +146812,7 @@ self: {
        sha256 = "0g4kf7d4yh29jlb5a2f8awjbmaan2f7m1ybkcihayp83lvjld4v0";
        libraryHaskellDepends = [ base containers text vector word8 ];
        description = "A graph library that allows to explore edges after their type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "intricacy" = callPackage
@@ -146835,7 +146835,7 @@ self: {
        ];
        executablePkgconfigDepends = [ ncurses ];
        description = "A game of competitive puzzle-design";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) ncurses;};
 
   "intrinsic-superclasses" = callPackage
@@ -146850,7 +146850,7 @@ self: {
          base containers haskell-src-meta mtl template-haskell
        ];
        description = "A quasiquoter for better instance deriving and default methods";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "intro" = callPackage
@@ -146872,7 +146872,7 @@ self: {
          writer-cps-mtl
        ];
        description = "Safe and minimal prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "intro-prelude" = callPackage
@@ -146887,8 +146887,8 @@ self: {
        testHaskellDepends = [ intro ];
        doHaddock = false;
        description = "Intro reexported as Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146909,8 +146909,8 @@ self: {
          validity-containers
        ];
        description = "A prelude for safe new projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146930,8 +146930,8 @@ self: {
          introduction path path-io QuickCheck time
        ];
        description = "A prelude for the tests of safe new projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146943,8 +146943,8 @@ self: {
        sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0";
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
        description = "Pure, mergeable, succinct Int sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -146964,7 +146964,7 @@ self: {
          base containers criterion random unordered-containers vector
        ];
        description = "An imperative integer set written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "invariant" = callPackage
@@ -146986,7 +146986,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell98 invariant functors";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "invertible" = callPackage
@@ -147004,7 +147004,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "invertible-grammar" = callPackage
@@ -147023,7 +147023,7 @@ self: {
          tagged template-haskell text transformers
        ];
        description = "Invertible parsing combinators framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "invertible-hlist" = callPackage
@@ -147034,8 +147034,8 @@ self: {
        sha256 = "1824j4k8y5mn16vyk1h3mb72gr19j6rc833w24yqjxjlqw81y3y5";
        libraryHaskellDepends = [ base HList invertible ];
        description = "invertible functions and instances for HList";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147049,7 +147049,7 @@ self: {
          base hxt hxt-charproperties invertible mtl
        ];
        description = "invertible transformer instances for HXT Picklers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "invertible-syntax" = callPackage
@@ -147060,8 +147060,8 @@ self: {
        sha256 = "0kyi7gq0a792v4lwmpq8i56vzwk6g7cjc3lbpxch47jsqv8lfhbp";
        libraryHaskellDepends = [ base partial-isomorphisms ];
        description = "Invertible syntax descriptions for both parsing and pretty printing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147073,7 +147073,7 @@ self: {
        sha256 = "1nms6w5b8apdz9xlwdqyj9n4m0b192simxg9zl7pv8zkyklyb3aw";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        description = "Semigroups with involution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-capture" = callPackage
@@ -147091,8 +147091,8 @@ self: {
          base bytestring hspec hspec-core streaming-bytestring unix
        ];
        description = "Capture IO actions' stdout and stderr";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147112,8 +147112,8 @@ self: {
          base hspec lifted-base monad-control transformers
        ];
        description = "Choice for IO and lifted IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147126,7 +147126,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
        description = "Easy I/O model to learn IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-manager" = callPackage
@@ -147140,7 +147140,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        description = "Skeleton library around the IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-memoize" = callPackage
@@ -147151,7 +147151,7 @@ self: {
        sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7";
        libraryHaskellDepends = [ async base ];
        description = "Memoize IO actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-reactive" = callPackage
@@ -147165,8 +147165,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147179,7 +147179,7 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base hspec transformers ];
        description = "Exception safe resource management with dynamic regions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-storage" = callPackage
@@ -147190,7 +147190,7 @@ self: {
        sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
        libraryHaskellDepends = [ base containers ];
        description = "A key-value store in the IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-streams" = callPackage
@@ -147216,7 +147216,7 @@ self: {
          time transformers vector zlib zlib-bindings
        ];
        description = "Simple, composable, and easy-to-use stream I/O";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-streams-haproxy" = callPackage
@@ -147237,7 +147237,7 @@ self: {
          test-framework-hunit transformers
        ];
        description = "HAProxy protocol 1.5 support for io-streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-streams-http" = callPackage
@@ -147253,7 +147253,7 @@ self: {
          transformers
        ];
        description = "http-client for io-streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-string-like" = callPackage
@@ -147266,7 +147266,7 @@ self: {
        editedCabalFile = "0fn9zq62js0xybfbhd673hbh5zp0l2v1p2ddknwkclh4i01i03i6";
        libraryHaskellDepends = [ base binary bytestring text ];
        description = "Classes to handle Prelude style IO functions for different datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "io-throttle" = callPackage
@@ -147280,7 +147280,7 @@ self: {
        libraryHaskellDepends = [ base SafeSemaphore threads ];
        testHaskellDepends = [ base ];
        description = "Limit number of IO actions started per second";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ioctl" = callPackage
@@ -147293,8 +147293,8 @@ self: {
        editedCabalFile = "15i0plam5pr3zkvmmy0g5q9v1fwvp49r4gsyx3y5j89svyffwqaq";
        libraryHaskellDepends = [ base network unix ];
        description = "Type-safe I/O control package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147315,8 +147315,8 @@ self: {
          base containers ivory ivory-backend-c mtl
        ];
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147328,7 +147328,7 @@ self: {
        sha256 = "1iwi1675ggfwfh5as0zj19q4375b58hrb3g4jfn8myrhlhncixpl";
        libraryHaskellDepends = [ base ];
        description = "iorefs with a unique stable index";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "iostring" = callPackage
@@ -147339,8 +147339,8 @@ self: {
        sha256 = "0bqi5b8j0i56nqm2fw2ylk6qnc2hm41qx36p93hs0f8javpmv1nn";
        libraryHaskellDepends = [ base bytestring path text ];
        description = "A class of strings that can be involved in IO";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147352,8 +147352,8 @@ self: {
        sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0";
        libraryHaskellDepends = [ base ];
        description = "run IOs in a single thread";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147365,8 +147365,8 @@ self: {
        sha256 = "0ylwrim2wfx3v03syd8v0iwf9kbw9154wlxsp8wc1d3n6sz7p1cc";
        libraryHaskellDepends = [ base ];
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147397,8 +147397,8 @@ self: {
          text
        ];
        description = "Library for IP and MAC addresses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147413,8 +147413,8 @@ self: {
        libraryHaskellDepends = [ base cpu network template-haskell ];
        testHaskellDepends = [ base cpu network tasty tasty-hunit ];
        description = "Quasiquoter for IP addresses";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147426,8 +147426,8 @@ self: {
        sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0";
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Location Haskell package for IP geolocation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147439,8 +147439,8 @@ self: {
        sha256 = "1hi1q0kiqqp96w29y9699s66rmyr7k0fp6s7z86ll9n3bmf0a4g4";
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Proxy Haskell package for proxy detection";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147454,7 +147454,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs IPv6Addr text ];
        description = "Commandline tool to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ipatch" = callPackage
@@ -147472,8 +147472,8 @@ self: {
          unix
        ];
        description = "interactive patch editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147489,8 +147489,8 @@ self: {
          base binary bytestring dlist mtl network network-bytestring stm
        ];
        description = "High level inter-process communication library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147507,7 +147507,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec unix ];
        description = "Simple inter-process communication through IPCVars";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ipfs" = callPackage
@@ -147532,8 +147532,8 @@ self: {
          text vector yaml
        ];
        description = "Access IPFS locally and remotely";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147549,8 +147549,8 @@ self: {
          aeson base bytestring http-media http-types servant text
        ];
        description = "Auto-generated IPFS HTTP API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147572,8 +147572,8 @@ self: {
          text
        ];
        description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147595,8 +147595,8 @@ self: {
        libraryPkgconfigDepends = [ ipopt nlopt ];
        libraryToolDepends = [ c2hs ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;};
 
@@ -147608,8 +147608,8 @@ self: {
        sha256 = "08x8lfy0dll09y7cvfgmif5gvj7j2kxd8qac3fndmq4z45wiy90s";
        libraryHaskellDepends = [ base haskell-src sr-extra ];
        description = "Tiny helper for pretty-printing values in ghci console";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147631,7 +147631,7 @@ self: {
          QuickCheck safe
        ];
        description = "IP Routing Table";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -147649,8 +147649,8 @@ self: {
        ];
        executableHaskellDepends = [ base QuickCheck syb ];
        description = "iptables rules parser/printer library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147675,8 +147675,8 @@ self: {
          time unix utf8-string
        ];
        description = "web-interface for iptables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147700,7 +147700,7 @@ self: {
          unordered-containers vector
        ];
        description = "Data structure for working with Jupyter notebooks (ipynb)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ipython-kernel" = callPackage
@@ -147722,7 +147722,7 @@ self: {
          transformers unordered-containers uuid zeromq4-haskell
        ];
        description = "A library for creating kernels for IPython frontends";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "irc" = callPackage
@@ -147739,7 +147739,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A small library for parsing IRC messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "irc-bytestring" = callPackage
@@ -147750,7 +147750,7 @@ self: {
        sha256 = "09n4y93x74wblbz89s1hwzmanwwi72cj0baz72485svarg55kid7";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "serialization and parsing of IRC messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "irc-client" = callPackage
@@ -147770,7 +147770,7 @@ self: {
          x509-store x509-validation
        ];
        description = "An IRC client library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "irc-colors" = callPackage
@@ -147781,7 +147781,7 @@ self: {
        sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0";
        libraryHaskellDepends = [ base text ];
        description = "Colourize your IRC strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "irc-conduit" = callPackage
@@ -147799,7 +147799,7 @@ self: {
          x509-validation
        ];
        description = "Streaming IRC message library using conduits";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "irc-core" = callPackage
@@ -147818,8 +147818,8 @@ self: {
        ];
        testHaskellDepends = [ base hashable HUnit text ];
        description = "IRC core library for glirc";
-       license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.isc;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "irc-ctcp" = callPackage
@@ -147830,7 +147830,7 @@ self: {
        sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n";
        libraryHaskellDepends = [ base bytestring text ];
        description = "A CTCP encoding and decoding library for IRC clients";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "irc-dcc" = callPackage
@@ -147854,8 +147854,8 @@ self: {
          tasty-hspec tasty-quickcheck utf8-string
        ];
        description = "A DCC message parsing and helper library for IRC clients";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147876,8 +147876,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Library for writing fun IRC bots";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147896,8 +147896,8 @@ self: {
          time-units unordered-containers
        ];
        description = "Another library for writing IRC clients";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147914,8 +147914,8 @@ self: {
        ];
        testHaskellDepends = [ base text ];
        description = "Add color and style decorations to IRC messages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147929,8 +147929,8 @@ self: {
          base irc-fun-types regex-applicative text
        ];
        description = "Types and functions for working with the IRC protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147942,8 +147942,8 @@ self: {
        sha256 = "15q9sfpazrnplj8yp1v641amnw8zcvwb9wp8siy8fbhi6gcx5lip";
        libraryHaskellDepends = [ base hashable text ];
        description = "Common types for IRC related packages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -147966,7 +147966,7 @@ self: {
          parsec random SafeSemaphore stm time unix
        ];
        description = "A library for writing IRC bots";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ircbouncer" = callPackage
@@ -147977,7 +147977,7 @@ self: {
        sha256 = "1bn0m9x89pqknz8gn8gk9is6w6px4hznp3fqqb5dxwssmmjm99zm";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ireal" = callPackage
@@ -147988,7 +147988,7 @@ self: {
        sha256 = "0wxwr74rhf2kmx8dz629k707ir10w4mlkvis50v113kh87d990lj";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Real numbers and intervals with relatively efficient exact arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iri" = callPackage
@@ -148014,8 +148014,8 @@ self: {
          tasty-quickcheck
        ];
        description = "RFC-based resource identifier library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148043,8 +148043,8 @@ self: {
          base extra multistate text transformers unordered-containers yaml
        ];
        description = "Automated Local Cabal Package Testing and Uploading";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148056,8 +148056,8 @@ self: {
        sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr";
        libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        description = "Iron.IO message queueing client library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148080,8 +148080,8 @@ self: {
          antisplice base chatty chatty-utils mtl transformers
        ];
        description = "A technical demo for Antisplice";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148093,8 +148093,8 @@ self: {
        sha256 = "05a1k70cj4rlaz7yx84m7riz6zhsb588vfyzkza2gr4i5wlhjr6c";
        libraryHaskellDepends = [ ad base data-default-class statistics ];
        description = "Item Response Theory functions for use in computerized adaptive testing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148107,7 +148107,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Generic pattern predicates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "isbn" = callPackage
@@ -148119,7 +148119,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "ISBN Validation and Manipulation";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "isdicom" = callPackage
@@ -148138,8 +148138,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "An executable and library to determine if a file is a DICOM file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148151,8 +148151,8 @@ self: {
        sha256 = "10f09br33xy5ldl924kfnnlc5ilwq44hd17s2qdf9jm75q4sa7d5";
        libraryHaskellDepends = [ base vacuum ];
        description = "Check whether a value has been evaluated";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148166,7 +148166,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gtk3 ];
        description = "A program to show the size of image and whether suitable for wallpaper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "islink" = callPackage
@@ -148177,7 +148177,7 @@ self: {
        sha256 = "1mxfs8k0znc7v2iynjnhr4k5c9as4ip37ybvxnvjfqy4dld9rgyg";
        libraryHaskellDepends = [ base unordered-containers ];
        description = "Check if an HTML element is a link";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ismtp" = callPackage
@@ -148193,8 +148193,8 @@ self: {
          lifted-base monad-control netlines network vector
        ];
        description = "Advanced ESMTP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148207,7 +148207,7 @@ self: {
        libraryHaskellDepends = [ base mtl profunctors ];
        testHaskellDepends = [ base mtl ];
        description = "Deriving via arbitrary isomorphisms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "iso3166-country-codes" = callPackage
@@ -148231,7 +148231,7 @@ self: {
        sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj";
        libraryHaskellDepends = [ base ];
        description = "ISO-639-1 language codes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iso8583-bitmaps" = callPackage
@@ -148247,7 +148247,7 @@ self: {
          th-lift
        ];
        description = "Parse and merge ISO 8583-style bitmaps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iso8601-duration" = callPackage
@@ -148266,8 +148266,8 @@ self: {
          time
        ];
        description = "Types and parser for ISO8601 durations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148280,7 +148280,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit time ];
        description = "Convert to/from the ISO 8601 time format";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "isobmff" = callPackage
@@ -148305,8 +148305,8 @@ self: {
          base binary bytestring criterion tagged type-spec
        ];
        description = "A parser and generator for the ISO-14496-12/14 base media file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148331,8 +148331,8 @@ self: {
          base binary bytestring criterion tagged type-spec
        ];
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148349,8 +148349,8 @@ self: {
          unordered-containers uri vector
        ];
        description = "Bindings to the isoHunt torrent search API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148369,8 +148369,8 @@ self: {
          base containers hspec megaparsec QuickCheck
        ];
        description = "Isotopic masses and relative abundances";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148383,7 +148383,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Positive integers test";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "it-has" = callPackage
@@ -148395,7 +148395,7 @@ self: {
        libraryHaskellDepends = [ base generic-lens ];
        testHaskellDepends = [ base generic-lens QuickCheck ];
        description = "Automatically derivable Has instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "itanium-abi" = callPackage
@@ -148413,7 +148413,7 @@ self: {
          base HUnit process test-framework test-framework-hunit
        ];
        description = "An implementation of name mangling/demangling for the Itanium ABI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "itcli" = callPackage
@@ -148431,8 +148431,8 @@ self: {
          time uuid yaml
        ];
        description = "Issue Tracker for the CLI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148460,8 +148460,8 @@ self: {
          vty
        ];
        description = "A brick Widget for selectable summary of many elements on a terminal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148480,8 +148480,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "iteratees for statistical processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148500,8 +148500,8 @@ self: {
        ];
        librarySystemDepends = [ zlib ];
        description = "Iteratee-based IO with pipe operators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -148516,7 +148516,7 @@ self: {
          base mtl tagged template-haskell vector
        ];
        description = "API for hierarchical multilevel collections";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "iteratee" = callPackage
@@ -148545,8 +148545,8 @@ self: {
          mtl transformers transformers-base unix
        ];
        description = "Iteratee-based I/O";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148559,8 +148559,8 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee mtl ];
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
@@ -148578,8 +148578,8 @@ self: {
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
        description = "Iteratee-based I/O";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148595,8 +148595,8 @@ self: {
          base iteratee ListLike parsec reference transformers
        ];
        description = "Package allowing parsec parser initeratee";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148610,8 +148610,8 @@ self: {
          base iteratee stm stm-chans transformers
        ];
        description = "Concurrent iteratees using STM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148628,8 +148628,8 @@ self: {
          transformers unix
        ];
        description = "Library for building servers with IterIO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148646,8 +148646,8 @@ self: {
        libraryHaskellDepends = [ base base64-bytestring bytestring ];
        executableHaskellDepends = [ base bytestring ];
        description = "Enable graphical display of images inline on some terminals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148661,8 +148661,8 @@ self: {
        editedCabalFile = "0pd14gfdpd12h1vlrk3dfg5vxlpd1jv2zi32nxic7p09wz59dkpk";
        libraryHaskellDepends = [ base iterm-show JuicyPixels ];
        description = "Orphan Show instances for JuciyPixels image types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148680,8 +148680,8 @@ self: {
          base diagrams-lib diagrams-rasterific iterm-show JuicyPixels
        ];
        description = "Orphan Show instances for diagrams package that render inline in some terminals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148698,7 +148698,7 @@ self: {
          alg base smallcheck tasty tasty-smallcheck
        ];
        description = "Intervals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ivar-simple" = callPackage
@@ -148709,7 +148709,7 @@ self: {
        sha256 = "0a8wm3jj5widp3awdsgl8jidxyhw97d9iijl65frwd9kjfzsc678";
        libraryHaskellDepends = [ base ];
        description = "Write once concurrency primitives";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ivor" = callPackage
@@ -148727,8 +148727,8 @@ self: {
          base binary containers directory haskell98 mtl parsec
        ];
        description = "Theorem proving library based on dependent type theory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148747,8 +148747,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148764,7 +148764,7 @@ self: {
          base directory filepath HStringTemplate text utf8-string
        ];
        description = "Manage additional data files during Ivory compilation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ivory-avr-atmega328p-registers" = callPackage
@@ -148777,8 +148777,8 @@ self: {
          base base-compat ivory ivory-hw monadLib
        ];
        description = "Ivory register bindings for the Atmega328p";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148799,8 +148799,8 @@ self: {
          process srcloc template-haskell
        ];
        description = "Ivory C backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148819,8 +148819,8 @@ self: {
        ];
        executableHaskellDepends = [ base ivory ivory-backend-c ];
        description = "Ivory bit-data support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148839,8 +148839,8 @@ self: {
          base base-compat containers ivory monadLib tasty tasty-hunit
        ];
        description = "Simple concrete evaluator for Ivory programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148863,8 +148863,8 @@ self: {
          monadLib pretty QuickCheck template-haskell
        ];
        description = "Ivory examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148877,8 +148877,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148895,8 +148895,8 @@ self: {
          monadLib pretty
        ];
        description = "Ivory compiler optimizations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148918,8 +148918,8 @@ self: {
          ivory-stdlib monadLib process QuickCheck tasty tasty-hunit
        ];
        description = "QuickCheck driver for Ivory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148936,8 +148936,8 @@ self: {
          base base-compat filepath ivory ivory-artifact monadLib
        ];
        description = "Serialization library for Ivory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148950,8 +148950,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148967,8 +148967,8 @@ self: {
          base invertible-syntax partial-isomorphisms snap snap-core
        ];
        description = "A lightweight web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -148981,7 +148981,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ wirelesstools ];
        description = "Bindings for the iw C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) wirelesstools;};
 
   "ix" = callPackage
@@ -149000,7 +149000,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Indexed monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ix-shapable" = callPackage
@@ -149011,7 +149011,7 @@ self: {
        sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh";
        libraryHaskellDepends = [ array base ];
        description = "Reshape multi-dimensional arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ixdopp" = callPackage
@@ -149024,8 +149024,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base preprocessor-tools syb ];
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149039,8 +149039,8 @@ self: {
        editedCabalFile = "064bqv1i43car216ajjiq7j9vz2ha0rxhmpin83ajrchva1yd7sq";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149059,7 +149059,7 @@ self: {
          base Cabal containers HUnit QuickCheck random
        ];
        description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ixset-typed" = callPackage
@@ -149078,7 +149078,7 @@ self: {
          base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ixset-typed-binary-instance" = callPackage
@@ -149089,7 +149089,7 @@ self: {
        sha256 = "1jgqc1ys5pvfkha8pyddz5f01qsmv9a83xw0q75njk8zhqajlyvx";
        libraryHaskellDepends = [ base binary ixset-typed ];
        description = "Binary instance for ixset-typed";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ixset-typed-conversions" = callPackage
@@ -149105,7 +149105,7 @@ self: {
          zipper-extra
        ];
        description = "Conversions from ixset-typed to other containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ixset-typed-hashable-instance" = callPackage
@@ -149116,7 +149116,7 @@ self: {
        sha256 = "0bwajqlj1kpis2616lrmcymmag66fkmdrsrj0r3kf8j6090zxmyv";
        libraryHaskellDepends = [ base hashable ixset-typed ];
        description = "Hashable instance for ixset-typed";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ixshader" = callPackage
@@ -149132,8 +149132,8 @@ self: {
          template-haskell text
        ];
        description = "A shallow embedding of the OpenGL Shading Language in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149153,8 +149153,8 @@ self: {
          haskell98 hoauth mtl old-locale parsec time utf8-string xml
        ];
        description = "CLI (command line interface) to YQL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149168,8 +149168,8 @@ self: {
        libraryHaskellDepends = [ base bytestring repa unix ];
        testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
        description = "J in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149190,8 +149190,8 @@ self: {
          strings syb transformers
        ];
        description = "j2hs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149203,7 +149203,7 @@ self: {
        sha256 = "1654hjzagmnaq3p9irjgdg0crgx01v2r3qnprb09a32xg4cf6xam";
        libraryHaskellDepends = [ base ];
        description = "Extra functions I require in base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jack" = callPackage
@@ -149236,8 +149236,8 @@ self: {
        libraryPkgconfigDepends = [ libjack2 ];
        libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libjack2;};
 
@@ -149249,8 +149249,8 @@ self: {
        sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd";
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149263,8 +149263,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base doctest ];
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149290,8 +149290,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Generate flamegraphs from Jaeger .json dumps.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149307,8 +149307,8 @@ self: {
          base containers directory monads-fd transformers
        ];
        description = "Jailed IO monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149322,8 +149322,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
        description = "Strip version restrictions from Cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "jalaali" = callPackage
@@ -149336,7 +149336,7 @@ self: {
        testHaskellDepends = [ base hspec time ];
        benchmarkHaskellDepends = [ base deepseq time ];
        description = "Jalaali calendar systems";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jalla" = callPackage
@@ -149359,7 +149359,7 @@ self: {
        ];
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
@@ -149380,7 +149380,7 @@ self: {
        ];
        executableHaskellDepends = [ base boxes directory filepath ];
        description = "Export sheet music and audio from Windows/Mac app Jammit";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "japanese-calendar" = callPackage
@@ -149392,7 +149392,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Data type of Japanese Calendar (Wareki)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "japanese-holidays" = callPackage
@@ -149405,7 +149405,7 @@ self: {
        testHaskellDepends = [ base doctest hspec time ];
        testToolDepends = [ hspec-discover ];
        description = "Japanese holidays utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jarfind" = callPackage
@@ -149426,7 +149426,7 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149448,8 +149448,8 @@ self: {
        ];
        doHaddock = false;
        description = "Jarification of Haskell sources";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149469,8 +149469,8 @@ self: {
        executableHaskellDepends = [ aeson base bytestring text ];
        testHaskellDepends = [ aeson base bytestring text ];
        description = "A fast JASONETTE-iOS JSON combinator library for haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149487,7 +149487,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Create immutable algebraic data structures for Java";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "java-bridge" = callPackage
@@ -149510,8 +149510,8 @@ self: {
          named-records names split strings syb
        ];
        description = "Bindings to the JNI and a high level interface generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149523,8 +149523,8 @@ self: {
        sha256 = "0wjxm0h5xlsab7iphcabb66c7gjxy7hyb502inlj5zxq1ic5ghzv";
        libraryHaskellDepends = [ base java-bridge transformers ];
        description = "Utilities for working with the java-bridge package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149536,8 +149536,8 @@ self: {
        sha256 = "1ms8m95mara3pp7qdg8jn2ajbq3zj8pnbs1b9jhpxbdkl5220768";
        libraryHaskellDepends = [ base diet ];
        description = "Functions to simulate Java's Character class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149552,7 +149552,7 @@ self: {
        libraryHaskellDepends = [ base random-shuffle ];
        executableHaskellDepends = [ base ];
        description = "The etude of the Haskell programming";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "java-reflect" = callPackage
@@ -149563,8 +149563,8 @@ self: {
        sha256 = "1vdfq3c8chqhss6jiy139yrm45mij4kjdwxf2wrsfm4064j0n3wc";
        libraryHaskellDepends = [ base containers hx java-bridge ];
        description = "Tools for reflecting on Java classes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149586,7 +149586,7 @@ self: {
        ];
        description = "Java class files";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "javascript-bridge" = callPackage
@@ -149607,8 +149607,8 @@ self: {
        executableHaskellDepends = [ base scotty text ];
        testHaskellDepends = [ aeson base scotty stm text time wai-extra ];
        description = "Remote Monad for JavaScript on the browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149629,7 +149629,7 @@ self: {
        ];
        executableHaskellDepends = [ base ghcjs-base-stub ];
        description = "Extra javascript functions when using GHCJS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "javasf" = callPackage
@@ -149649,8 +149649,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149667,8 +149667,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "A utility to print the target version of Java class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149690,8 +149690,8 @@ self: {
          aeson-pretty base optparse-applicative text
        ];
        description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149707,8 +149707,8 @@ self: {
          aeson base bytestring http-conduit text transformers
        ];
        description = "JCDecaux self-service bicycles API client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149727,8 +149727,8 @@ self: {
        ];
        executableHaskellDepends = [ base mtl network ];
        description = "Implementation of Java Debug Interface";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149750,8 +149750,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate a cabal freeze file from a stack.yaml";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149775,8 +149775,8 @@ self: {
        ];
        testHaskellDepends = [ base containers tasty-hspec text ];
        description = "Generate nix for Jenkins plugins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149806,8 +149806,8 @@ self: {
          transformers
        ];
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149830,8 +149830,8 @@ self: {
          quantities regex-compat
        ];
        description = "Unit conversion and manipulation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149847,7 +149847,7 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base parsec tasty tasty-hunit text ];
        description = "Handle Jira wiki markup";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jmacro" = callPackage
@@ -149873,8 +149873,8 @@ self: {
          unordered-containers vector wl-pprint-text
        ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149893,8 +149893,8 @@ self: {
          vector
        ];
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149911,8 +149911,8 @@ self: {
          jmacro-rpc mtl
        ];
        description = "Happstack backend for jmacro-rpc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149928,8 +149928,8 @@ self: {
          aeson base bytestring containers jmacro jmacro-rpc mtl snap-core
        ];
        description = "Snap backend for jmacro-rpc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149950,8 +149950,8 @@ self: {
        ];
        testHaskellDepends = [ base protolude tasty ];
        description = "Common utilities for running a web service";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149964,8 +149964,8 @@ self: {
        libraryHaskellDepends = [ base casing free jmacro ];
        testHaskellDepends = [ base casing free jmacro ];
        description = "Jmonkey is very restricted but handy EDSL for JavaScript";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -149986,8 +149986,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base hspec singletons ];
        description = "Complete JNI raw bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) jdk;};
 
@@ -150013,8 +150013,8 @@ self: {
          QuickCheck stm
        ];
        description = "A job queue library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150035,8 +150035,8 @@ self: {
          time transformers warp
        ];
        description = "A library for creating a jobs management website running custom jobs";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150049,8 +150049,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        description = "Parallel Join Patterns with Guards and Propagation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150064,8 +150064,8 @@ self: {
          aeson base bytestring lens text url wreq
        ];
        description = "Bindings for Join push notifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150077,8 +150077,8 @@ self: {
        sha256 = "0hjlyyylbh471696v9b1jckm7d4gfp1ka978sr1j0005d03gwv35";
        libraryHaskellDepends = [ base ];
        description = "Join list - symmetric list type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150094,7 +150094,7 @@ self: {
          adjunctions base comonad distributive transformers
        ];
        description = "Trying to compose non-composable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jonathanscard" = callPackage
@@ -150109,8 +150109,8 @@ self: {
          base bytestring containers HTTP json mtl network old-locale time
        ];
        description = "An implementation of the Jonathan's Card API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150129,7 +150129,7 @@ self: {
        testHaskellDepends = [ base hspec HUnit markdown-unlit ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Geographical Position Calculations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jort" = callPackage
@@ -150143,7 +150143,7 @@ self: {
        executableHaskellDepends = [ array base gtk ];
        description = "JP's own ray tracer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jose" = callPackage
@@ -150173,7 +150173,7 @@ self: {
          vector x509
        ];
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "jose-jwt" = callPackage
@@ -150197,7 +150197,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
        description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jot" = callPackage
@@ -150215,8 +150215,8 @@ self: {
          yaml
        ];
        description = "Tiny markdown notebook";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150228,8 +150228,8 @@ self: {
        sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx";
        libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150241,7 +150241,7 @@ self: {
        sha256 = "0k31r994cw1w79v2zqkj64jhbfyym1j96vawvqc5pvw2mjk1f5in";
        libraryHaskellDepends = [ base containers fingertree lens vector ];
        description = "Jump point search for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "js-chart" = callPackage
@@ -150254,7 +150254,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Obtain minified chart.js code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "js-dgtable" = callPackage
@@ -150267,7 +150267,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Obtain minified jquery.dgtable code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "js-flot" = callPackage
@@ -150280,7 +150280,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        description = "Obtain minified flot code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "js-good-parts" = callPackage
@@ -150291,8 +150291,8 @@ self: {
        sha256 = "0i3r3xl8hi2a3d6hrj77vbfi54bkq4pidrjcz13vz4az9dvz6k75";
        libraryHaskellDepends = [ base wl-pprint ];
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150307,7 +150307,7 @@ self: {
        testHaskellDepends = [ base HTTP ];
        doCheck = false;
        description = "Obtain minified jQuery code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle" = callPackage
@@ -150328,7 +150328,7 @@ self: {
          transformers unliftio-core unordered-containers vector
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle-clib" = callPackage
@@ -150343,7 +150343,7 @@ self: {
          aeson base base-compat bytestring data-default jsaddle text
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle-dom" = callPackage
@@ -150359,7 +150359,7 @@ self: {
          base base-compat exceptions jsaddle lens text transformers
        ];
        description = "DOM library that uses jsaddle to support both GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle-hello" = callPackage
@@ -150372,8 +150372,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base jsaddle lens text ];
        description = "JSaddle Hello World, an example package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150400,7 +150400,7 @@ self: {
          websockets
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jsaddle-webkit2gtk" = callPackage
@@ -150419,8 +150419,8 @@ self: {
          jsaddle text unix webkit2gtk3-javascriptcore
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jsaddle-webkitgtk" = callPackage
@@ -150438,8 +150438,8 @@ self: {
          webkitgtk3-javascriptcore
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jsaddle-wkwebview" = callPackage
@@ -150455,8 +150455,8 @@ self: {
          text
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150473,8 +150473,8 @@ self: {
          webkitgtk3-javascriptcore
        ];
        description = "High level interface for webkit-javascriptcore";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jsmw" = callPackage
@@ -150485,8 +150485,8 @@ self: {
        sha256 = "1r36w2h5007qln56gnyyd7w6bcqiymn1jw287z0waf4fhpy02ygq";
        libraryHaskellDepends = [ base DOM mtl WebBits ];
        description = "Javascript Monadic Writer base package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150504,7 +150504,7 @@ self: {
          array base bytestring containers mtl parsec pretty syb text
        ];
        description = "Support for serialising Haskell to and from JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-alt" = callPackage
@@ -150515,8 +150515,8 @@ self: {
        sha256 = "1ivmbm5gw362vlss1w5s2z7byrzxdh8z1qdfsh0xmywkvwx56l5q";
        libraryHaskellDepends = [ aeson base ];
        description = "Union 'alternative' or Either that has untagged JSON encoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150538,7 +150538,7 @@ self: {
          lens lens-aeson text unordered-containers url
        ];
        description = "Utilities for generating JSON-API payloads";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-api-lib" = callPackage
@@ -150562,7 +150562,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Utilities for generating JSON-API payloads";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-assertions" = callPackage
@@ -150577,8 +150577,8 @@ self: {
          aeson base indexed indexed-free lens lens-aeson text
        ];
        description = "Test that your (Aeson) JSON encoding matches your expectations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150594,7 +150594,7 @@ self: {
          base scientific text unordered-containers vector
        ];
        description = "Universal JSON AST datastructure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-ast-json-encoder" = callPackage
@@ -150611,8 +150611,8 @@ self: {
          json-encoder scientific text unordered-containers vector
        ];
        description = "Encoders of JSON AST";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150627,8 +150627,8 @@ self: {
          base json-ast QuickCheck quickcheck-instances
        ];
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150663,8 +150663,8 @@ self: {
          unordered-containers vector
        ];
        description = "Automatic type declaration for JSON input data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150687,8 +150687,8 @@ self: {
          bytestringparser-temporary containers utf8-string
        ];
        description = "JSON parser that uses byte strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150707,8 +150707,8 @@ self: {
          unordered-containers utf8-string vector
        ];
        description = "Data structure agnostic JSON serialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150724,7 +150724,7 @@ self: {
        testHaskellDepends = [ base-prelude bytestring text ];
        benchmarkHaskellDepends = [ aeson criterion rebase ];
        description = "Direct-to-bytes JSON Builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-directory" = callPackage
@@ -150746,8 +150746,8 @@ self: {
          aeson base bytestring filepath mtl process text
        ];
        description = "Load JSON from files in a directory structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150765,8 +150765,8 @@ self: {
          contravariant-extras scientific semigroups text
        ];
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150784,8 +150784,8 @@ self: {
          enumerator json-types text transformers
        ];
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150802,8 +150802,8 @@ self: {
          unordered-containers yaml
        ];
        description = "Utility functions to extend Aeson";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150820,7 +150820,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring filepath hspec ];
        description = "JSON Feed";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-fu" = callPackage
@@ -150841,8 +150841,8 @@ self: {
          text time unordered-containers vector
        ];
        description = "Generic JSON serialization / deserialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150867,8 +150867,8 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "Incremental JSON parser with early termination and a declarative DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150881,8 +150881,8 @@ self: {
        libraryHaskellDepends = [ base json ];
        testHaskellDepends = [ base hspec json QuickCheck ];
        description = "Extends Text.JSON to handle literal JS objects.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150896,7 +150896,7 @@ self: {
        editedCabalFile = "0bs7fa02jjq9r7bn3vlwn4xq93yllj62h3bb5g2lsihx1svk7lkn";
        libraryHaskellDepends = [ attoparsec base base-prelude text ];
        description = "JSON Pointer parsing and interpretation utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-pointer-aeson" = callPackage
@@ -150911,7 +150911,7 @@ self: {
          aeson base-prelude json-pointer unordered-containers vector
        ];
        description = "Integration layer for \"json-pointer\" and \"aeson\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-pointer-hasql" = callPackage
@@ -150927,8 +150927,8 @@ self: {
          aeson either hasql json-pointer rebase transformers
        ];
        description = "JSON Pointer extensions for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -150953,7 +150953,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "JSON Pointer (RFC 6901) parsing, access, and modification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-python" = callPackage
@@ -150969,8 +150969,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) python;};
 
@@ -150988,7 +150988,7 @@ self: {
        ];
        description = "Json Quasiquatation library for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "json-rpc" = callPackage
@@ -151019,7 +151019,7 @@ self: {
          vector
        ];
        description = "Fully-featured JSON-RPC 2.0 library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-rpc-client" = callPackage
@@ -151046,8 +151046,8 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        description = "JSON-RPC 2.0 on the client side.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151068,7 +151068,7 @@ self: {
          aeson base QuickCheck quickcheck-simple text
        ];
        description = "Generic encoder and decode for JSON-RPC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-rpc-server" = callPackage
@@ -151092,7 +151092,7 @@ self: {
          text unordered-containers vector
        ];
        description = "JSON-RPC 2.0 on the server side.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json-schema" = callPackage
@@ -151117,8 +151117,8 @@ self: {
          generic-aeson tasty tasty-hunit tasty-th text vector
        ];
        description = "Types and type classes for defining JSON schemas";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151135,8 +151135,8 @@ self: {
          unordered-containers vector
        ];
        description = "Generics JSON (de)serialization using generics-sop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151152,7 +151152,7 @@ self: {
          aeson aeson-pretty base bytestring libgit time-units
        ];
        description = "Keep program state in JSON files";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "json-stream" = callPackage
@@ -151172,7 +151172,7 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "Incremental applicative JSON parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-syntax" = callPackage
@@ -151200,8 +151200,8 @@ self: {
          primitive scientific-notation text
        ];
        description = "High-performance JSON parser and encoder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151233,7 +151233,7 @@ self: {
          microlens-platform mtl nonempty-containers raw-strings-qq
          recursion-schemes text unordered-containers vector
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json-togo" = callPackage
@@ -151250,8 +151250,8 @@ self: {
          transformers unordered-containers vector
        ];
        description = "Effectful parsing of JSON documents";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151279,8 +151279,8 @@ self: {
          scientific-notation text
        ];
        description = "Tokenize JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151300,8 +151300,8 @@ self: {
          scientific string-conversions tar text unordered-containers vector
        ];
        description = "A collection of JSON tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151325,8 +151325,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A polymorphic, type-safe, json-structured tracing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151338,7 +151338,7 @@ self: {
        sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn";
        libraryHaskellDepends = [ base containers text ];
        description = "Basic types for representing JSON";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "json2" = callPackage
@@ -151354,8 +151354,8 @@ self: {
          parsec pretty time utf8-string
        ];
        description = "Library provides support for JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151371,8 +151371,8 @@ self: {
          base containers HDBC json2 json2-types time utf8-string
        ];
        description = "Support JSON for SQL Database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151384,7 +151384,7 @@ self: {
        sha256 = "0gr5mfi68hvk8wajw6wbimmwxd0rgjwqrg3mjyfppkr1nwkyfzpr";
        libraryHaskellDepends = [ base containers ];
        description = "Defined JSON data types and function for renders JSON to string";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json2yaml" = callPackage
@@ -151397,7 +151397,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ aeson base bytestring yaml ];
        description = "Utility to convert a file from JSON to YAML format. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "json5hs" = callPackage
@@ -151412,7 +151412,7 @@ self: {
          array base bytestring containers mtl pretty syb text
        ];
        description = "Serialising to and from JSON5";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jsonextfilter" = callPackage
@@ -151432,8 +151432,8 @@ self: {
          unordered-containers vector
        ];
        description = "Filter select values in JSON objects to unix programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151454,8 +151454,8 @@ self: {
          aeson buffer-builder gauge rerebase text-builder
        ];
        description = "Fast and simple JSON encoding toolkit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151477,7 +151477,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Library to parse and execute JSONPath";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jsonresume" = callPackage
@@ -151492,8 +151492,8 @@ self: {
          aeson base bytestring old-locale text time unordered-containers
        ];
        description = "Parser and datatypes for the JSON Resume format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151514,8 +151514,8 @@ self: {
          aeson base bytestring conduit conduit-extra hspec text
        ];
        description = "JSON-RPC 2.0 server over a Conduit.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151547,8 +151547,8 @@ self: {
          scientific text uniplate unordered-containers vector
        ];
        description = "JSON to JSON Schema";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151570,8 +151570,8 @@ self: {
          aeson base bytestring containers process tagged text
        ];
        description = "JSON Schema generator from Algebraic data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151592,8 +151592,8 @@ self: {
          vector
        ];
        description = "Interpolate JSON object values into SQL strings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151614,8 +151614,8 @@ self: {
          vector
        ];
        description = "JSON to TSV transformer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151636,8 +151636,8 @@ self: {
          unordered-containers vector xlsx
        ];
        description = "json to xlsx converter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151662,7 +151662,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Cherry picking in JSON objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jspath" = callPackage
@@ -151677,8 +151677,8 @@ self: {
          base bytestring bytestring-trie JSONb utf8-string
        ];
        description = "Extract substructures from JSON by following a path";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151703,8 +151703,8 @@ self: {
          wai-middleware-static warp
        ];
        description = "Manage users in MariaDB >= 10.1.1";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151731,8 +151731,8 @@ self: {
          optparse-applicative text unordered-containers yaml
        ];
        description = "Tableau-based theorem prover for justification logic";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151748,8 +151748,8 @@ self: {
        librarySystemDepends = [ Judy ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Judy = null;};
 
@@ -151766,7 +151766,7 @@ self: {
        ];
        executableHaskellDepends = [ base JuicyPixels ];
        description = "Draw and fill lines, rectangles and polygons";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "juicy-gcode" = callPackage
@@ -151784,7 +151784,7 @@ self: {
          svg-tree text
        ];
        description = "SVG to G-Code converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jukebox" = callPackage
@@ -151805,7 +151805,7 @@ self: {
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ base ];
        description = "A first-order reasoning toolbox";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jump" = callPackage
@@ -151817,7 +151817,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base criterion hspec ];
        description = "Nothing to see here, move along";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "jumpthefive" = callPackage
@@ -151831,7 +151831,7 @@ self: {
        libraryHaskellDepends = [ base parallel ];
        executableHaskellDepends = [ base parallel ];
        description = "an elementary symmetric chiffre for pragmatically protecting one's effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "junit-xml" = callPackage
@@ -151844,7 +151844,7 @@ self: {
        libraryHaskellDepends = [ base text xml-conduit ];
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Producing JUnit-style XML test reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "jupyter" = callPackage
@@ -151871,8 +151871,8 @@ self: {
          unordered-containers zeromq4-haskell
        ];
        description = "A library for creating and using Jupyter kernels";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151889,7 +151889,7 @@ self: {
          base containers ghc-prim hspec QuickCheck should-not-typecheck
        ];
        description = "Keyed container types with type-checked proofs of key presence";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "jvm" = callPackage
@@ -151912,8 +151912,8 @@ self: {
          base criterion deepseq jni singletons text
        ];
        description = "Call JVM methods from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151938,8 +151938,8 @@ self: {
          base criterion deepseq jvm split vector
        ];
        description = "Provides batched marshalling of values between Java and Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151972,8 +151972,8 @@ self: {
          text vector
        ];
        description = "A library for reading Java class-files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -151990,8 +151990,8 @@ self: {
          fingertree pretty zlib
        ];
        description = "A parser for JVM bytecode files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152016,8 +152016,8 @@ self: {
          base criterion deepseq jvm streaming text vector
        ];
        description = "Expose Java iterators as streams from the streaming package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152046,7 +152046,7 @@ self: {
          unordered-containers vector x509 x509-store
        ];
        description = "JSON Web Token (JWT) decoding and encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "kademlia" = callPackage
@@ -152067,8 +152067,8 @@ self: {
          tasty-hunit tasty-quickcheck transformers transformers-compat
        ];
        description = "An implementation of the Kademlia DHT Protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152080,7 +152080,7 @@ self: {
        sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kafka-client" = callPackage
@@ -152099,8 +152099,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152115,8 +152115,8 @@ self: {
        libraryHaskellDepends = [ base containers hw-kafka-client ];
        testHaskellDepends = [ base hw-kafka-client monad-parallel text ];
        description = "Synchronous Kafka Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152137,8 +152137,8 @@ self: {
          aeson base binary bytestring cereal linear milena mtl
        ];
        description = "UI device events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152153,8 +152153,8 @@ self: {
        libraryHaskellDepends = [ base GLUT kafka-device OpenGL ];
        executableHaskellDepends = [ base GLUT kafka-device OpenGL ];
        description = "GLUT events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152175,8 +152175,8 @@ self: {
          aeson base binary bytestring cereal kafka-device yaml
        ];
        description = "Linux joystick events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152195,8 +152195,8 @@ self: {
          aeson base hleap kafka-device websockets
        ];
        description = "Leap Motion events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152217,8 +152217,8 @@ self: {
          aeson base binary bytestring cereal kafka-device yaml
        ];
        description = "Linux SpaceNavigator events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152233,8 +152233,8 @@ self: {
        libraryHaskellDepends = [ base kafka-device vrpn ];
        executableHaskellDepends = [ base kafka-device vrpn ];
        description = "VRPN events via a Kafka message broker";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152257,8 +152257,8 @@ self: {
        ];
        doHaddock = false;
        description = "Haskell Kaleidoscope tutorial";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152278,8 +152278,8 @@ self: {
          random-fu-multivariate
        ];
        description = "Kalman and particle filters and smoothers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152298,7 +152298,7 @@ self: {
          transformers transformers-compat
        ];
        description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kangaroo" = callPackage
@@ -152309,8 +152309,8 @@ self: {
        sha256 = "1l7b71dhrxd2g3nbqg3h0n5dvgxr23av1cy1f0mvw347y91rx36x";
        libraryHaskellDepends = [ array base ];
        description = "Binary parsing with random access";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152337,7 +152337,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ aeson base containers criterion text ];
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kansas-comet" = callPackage
@@ -152356,7 +152356,7 @@ self: {
          transformers unordered-containers
        ];
        description = "A JavaScript push mechanism based on the comet idiom";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kansas-lava" = callPackage
@@ -152378,8 +152378,8 @@ self: {
          sized-types strict template-haskell
        ];
        description = "Kansas Lava is a hardware simulator and VHDL generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152399,8 +152399,8 @@ self: {
          kansas-lava network sized-types
        ];
        description = "FPGA Cores Written in Kansas Lava";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152419,8 +152419,8 @@ self: {
          kansas-lava kansas-lava-cores netlist network sized-types
        ];
        description = "Kansas Lava support files for the Papilio FPGA board";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152437,8 +152437,8 @@ self: {
          base containers kansas-lava mustache shake text vector
        ];
        description = "Shake rules for building Kansas Lava projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152454,8 +152454,8 @@ self: {
          base comonad containers minioperational mtl transformers
        ];
        description = "Good stateful automata";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152483,8 +152483,8 @@ self: {
          raw-strings-qq text vector
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152503,7 +152503,7 @@ self: {
          aeson attoparsec base hspec text unordered-containers vector
        ];
        description = "A simple template engine, inspired by jinja2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "katip" = callPackage
@@ -152538,7 +152538,7 @@ self: {
          safe-exceptions text time transformers unix
        ];
        description = "A structured logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "katip-datadog" = callPackage
@@ -152560,7 +152560,7 @@ self: {
          safe-exceptions tasty tasty-hunit text unordered-containers
        ];
        description = "Datadog scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "katip-elasticsearch" = callPackage
@@ -152591,8 +152591,8 @@ self: {
          unordered-containers uuid
        ];
        description = "ElasticSearch scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152606,8 +152606,8 @@ self: {
          aeson base bytestring hw-kafka-client katip
        ];
        description = "Katip scribe to send logs to Kafka";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152624,7 +152624,7 @@ self: {
          unliftio
        ];
        description = "Logstash backend for katip";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "katip-logzio" = callPackage
@@ -152650,7 +152650,7 @@ self: {
          uri-bytestring vector warp
        ];
        description = "Logz.IO scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "katip-raven" = callPackage
@@ -152666,8 +152666,8 @@ self: {
          unordered-containers
        ];
        description = "Katip scribe for raven (https://sentry.io)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152684,8 +152684,8 @@ self: {
          text time
        ];
        description = "Katip scribe that logs to Rollbar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152704,8 +152704,8 @@ self: {
          aeson base katip scientific text unordered-containers
        ];
        description = "A katip scribe for logging to json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152722,8 +152722,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Syslog Katip Scribe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152745,8 +152745,8 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ];
        testHaskellDepends = [ base bytestring directory mtl ];
        description = "Client for the Kattis judge system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152780,8 +152780,8 @@ self: {
          filepath hxt ilist json mtl parsec regex-tdfa text transformers
        ];
        description = "A haskell implementation of Katydid";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152803,7 +152803,7 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog text unordered-containers ];
        description = "Key-value store in single files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kawaii" = callPackage
@@ -152828,8 +152828,8 @@ self: {
          warp warp-tls
        ];
        description = "Utilities for serving static sites and blogs with Wai/Warp";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152852,8 +152852,8 @@ self: {
          tasty-smallcheck text
        ];
        description = "stats.NBA.com library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152876,7 +152876,7 @@ self: {
          atomic-primops base criterion primitive stm
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kbq-gu" = callPackage
@@ -152908,8 +152908,8 @@ self: {
        ];
        testHaskellDepends = [ base kcd-parser tasty tasty-hunit ];
        description = "Kayak .kcd parsing library.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {kcd-parser = null;};
 
@@ -152923,8 +152923,8 @@ self: {
          base lens linear vector vector-algorithms
        ];
        description = "A simple k-d tree implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152943,8 +152943,8 @@ self: {
          process
        ];
        description = "Build profiles for kdesrc-build";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -152963,7 +152963,7 @@ self: {
          process
        ];
        description = "Build profiles for kdesrc-build";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "kdt" = callPackage
@@ -152981,7 +152981,7 @@ self: {
          MonadRandom QuickCheck
        ];
        description = "Fast and flexible k-d trees for various types of point queries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "keccak" = callPackage
@@ -153007,8 +153007,8 @@ self: {
          base bytestring cryptonite gauge memory
        ];
        description = "cryptographic functions based on the sponge construction";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153036,7 +153036,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keep-alive" = callPackage
@@ -153048,7 +153048,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "TCP keep alive implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-callbacks" = callPackage
@@ -153059,7 +153059,7 @@ self: {
        sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq";
        libraryHaskellDepends = [ base mtl ];
        description = "Mutable memory locations with callbacks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-i18n" = callPackage
@@ -153075,8 +153075,8 @@ self: {
          utf8-string
        ];
        description = "Rapid Gtk Application Development - I18N";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153088,7 +153088,7 @@ self: {
        sha256 = "1j7vhkghdh4hrap7g2xshpd2fw3acgwvi68f2c01mqmfi5dl4z2n";
        libraryHaskellDepends = [ base ];
        description = "Haskell on Gtk rails - Gtk-based controller for MVC applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-mvc-environment-gtk" = callPackage
@@ -153104,8 +153104,8 @@ self: {
          keera-hails-mvc-view-gtk
        ];
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153122,8 +153122,8 @@ self: {
          template-haskell
        ];
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153140,8 +153140,8 @@ self: {
          template-haskell
        ];
        description = "Rapid Gtk Application Development - Protected Reactive Models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153153,7 +153153,7 @@ self: {
        sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1";
        libraryHaskellDepends = [ base directory filepath MissingK ];
        description = "Haskell on Gtk rails - Easy handling of configuration files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-mvc-solutions-gtk" = callPackage
@@ -153174,8 +153174,8 @@ self: {
          network network-uri template-haskell
        ];
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153187,7 +153187,7 @@ self: {
        sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p";
        libraryHaskellDepends = [ base ];
        description = "Haskell on Gtk rails - Generic View for MVC applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-mvc-view-gtk" = callPackage
@@ -153200,7 +153200,7 @@ self: {
          base gtk gtk-helpers keera-hails-mvc-view
        ];
        description = "Haskell on Gtk rails - Gtk-based View for MVC applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keera-hails-reactive-cbmvar" = callPackage
@@ -153218,8 +153218,8 @@ self: {
          base directory filepath hlint process regex-posix
        ];
        description = "Reactive Haskell on Rails - CBMVars as reactive values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153235,8 +153235,8 @@ self: {
          base directory fsnotify keera-hails-reactivevalues system-filepath
        ];
        description = "Haskell on Rails - Files as Reactive Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153253,8 +153253,8 @@ self: {
          keera-hails-reactivevalues mtl transformers
        ];
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153272,8 +153272,8 @@ self: {
          keera-hails-reactivevalues mtl transformers
        ];
        description = "Keera Hails Reactive bindings for HTML DOM via GHCJS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153289,8 +153289,8 @@ self: {
          base bytestring keera-hails-reactivevalues network network-bsd
        ];
        description = "Haskell on Rails - Sockets as Reactive Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153305,8 +153305,8 @@ self: {
          base keera-callbacks keera-hails-reactivevalues
        ];
        description = "Haskell on Rails - Polling based Readable RVs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153320,8 +153320,8 @@ self: {
          base keera-hails-reactivevalues wx wxcore
        ];
        description = "Haskell on Rails - Reactive Fields for WX widgets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153337,8 +153337,8 @@ self: {
          base keera-callbacks keera-hails-reactivevalues time Yampa
        ];
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153350,8 +153350,8 @@ self: {
        sha256 = "1c72sc68wqvsxhjr7y16k7iw784swk8wfp2j7xw0y0ggdjlamn0x";
        libraryHaskellDepends = [ base keera-hails-reactivevalues lens ];
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153371,8 +153371,8 @@ self: {
        ];
        testToolDepends = [ cabal-install ];
        description = "Haskell on Rails - Reactive Values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153408,7 +153408,7 @@ self: {
        executableSystemDepends = [ SDL_mixer ];
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) SDL_mixer;};
 
   "keiretsu" = callPackage
@@ -153430,7 +153430,7 @@ self: {
        ];
        description = "Multi-process orchestration for development and integration testing";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "kempe" = callPackage
@@ -153464,8 +153464,8 @@ self: {
        ];
        doHaddock = false;
        description = "Kempe compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153488,8 +153488,8 @@ self: {
          mtl process resourcet temporary-resourcet text transformers
        ];
        description = "Manage and abstract your packer configurations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153511,7 +153511,7 @@ self: {
          QuickCheck temporary
        ];
        description = "Haskell implementation of nix-hash";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "keter" = callPackage
@@ -153544,8 +153544,8 @@ self: {
          base bytestring conduit hspec HUnit transformers unix
        ];
        description = "Web application deployment manager, focusing on Haskell web frameworks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153567,7 +153567,7 @@ self: {
        ];
        description = "a dAmn ↔ IRC proxy";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153579,7 +153579,7 @@ self: {
        sha256 = "18wgalv0hr5ndr7mbywr7ilyc504kzf28xyymmkj1fm66wb93n4k";
        libraryHaskellDepends = [ base transformers ];
        description = "Type-safe unconstrained dynamic typing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "key-state" = callPackage
@@ -153591,7 +153591,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Manage key and button states and statuses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "key-vault" = callPackage
@@ -153605,7 +153605,7 @@ self: {
          base base-unicode-symbols containers key util
        ];
        description = "Store of values of arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keycloak-hs" = callPackage
@@ -153628,7 +153628,7 @@ self: {
          unordered-containers word8 wreq
        ];
        executableHaskellDepends = [ base hslogger ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keycode" = callPackage
@@ -153643,7 +153643,7 @@ self: {
          base containers ghc-prim template-haskell
        ];
        description = "Maps web browser keycodes to their corresponding keyboard keys";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keyed" = callPackage
@@ -153654,8 +153654,8 @@ self: {
        sha256 = "0q53nv4babmvj1nzc2my3d88aqm8yxl10rd396y62z7412jvnp5q";
        libraryHaskellDepends = [ base containers vector ];
        description = "Generic indexing for many data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153667,7 +153667,7 @@ self: {
        sha256 = "0hf7lmx8bgl5lh1i71x56nfbgnp8xrqfza3s5acq9i16g21ri292";
        libraryHaskellDepends = [ base bytestring containers text xeno ];
        description = "Tools for macOS .keylayout files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "keyring" = callPackage
@@ -153680,8 +153680,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
        description = "Keyring access";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153700,7 +153700,7 @@ self: {
          unordered-containers
        ];
        description = "Keyed functors and containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "keysafe" = callPackage
@@ -153729,8 +153729,8 @@ self: {
          unix unix-compat utf8-string wai warp zxcvbn-c
        ];
        description = "back up a secret key securely to the cloud";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153762,8 +153762,8 @@ self: {
          unordered-containers
        ];
        description = "Managing stores of secret things";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153780,8 +153780,8 @@ self: {
          mmap storable-record
        ];
        description = "Pure Haskell key/value store implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153803,8 +153803,8 @@ self: {
          base containers hspec parsec parseerror-eq
        ];
        description = "Extract data from a keyword-args config file format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153824,8 +153824,8 @@ self: {
          parsec text transformers unix unordered-containers yaml
        ];
        description = "Command-line file tagging and organization tool";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153838,8 +153838,8 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ base stm ];
        description = "A lightweight, structured-concurrency library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153851,7 +153851,7 @@ self: {
        sha256 = "0yfyx4jyz0n3p2w6pca3nxc72s01240n3siy5sx883ldz706adls";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kicad-data" = callPackage
@@ -153872,8 +153872,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Parser and writer for KiCad files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153891,8 +153891,8 @@ self: {
          vector
        ];
        description = "Parses kat.ph torrent dumps";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153911,8 +153911,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "Kick Channels: bounded channels with non-blocking writes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153931,8 +153931,8 @@ self: {
          base bytestring cmdargs hostname old-time parsec twine
        ];
        description = "Process KIF iOS test logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -153944,7 +153944,7 @@ self: {
        sha256 = "0wq0jfi8jdah6mwc6amrfjs5ld0bz86y53va9sm0hzvpiyb4bpcq";
        libraryHaskellDepends = [ base ];
        description = "Utilities to work with lists of types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kind-generics" = callPackage
@@ -153955,7 +153955,7 @@ self: {
        sha256 = "1ldfi5rvs3mxlbpy0nfyx8mq58xjkk76c13fmvmgqcpgb8gvmrnx";
        libraryHaskellDepends = [ base kind-apply ];
        description = "Generic programming in GHC style for arbitrary kinds and GADTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kind-generics-th" = callPackage
@@ -153971,7 +153971,7 @@ self: {
        ];
        testHaskellDepends = [ base kind-generics template-haskell ];
        description = "Template Haskell support for generating `GenericK` instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kinds" = callPackage
@@ -153982,7 +153982,7 @@ self: {
        sha256 = "169f2b0nn7mkjws6c5sb3mih2p6snhfq42bkfds3zxz01y53v2g5";
        libraryHaskellDepends = [ base ];
        description = "Emulation of subkinds and subkind polymorphism";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kit" = callPackage
@@ -154002,8 +154002,8 @@ self: {
          unordered-containers yaml
        ];
        description = "A dependency manager for Xcode (Objective-C) projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154025,8 +154025,8 @@ self: {
          step-function text transformers
        ];
        description = "Kleene algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154044,7 +154044,7 @@ self: {
          base base-compat deepseq doctest QuickCheck template-haskell
        ];
        description = "A list type based on the Kleene star and plus";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "kmeans" = callPackage
@@ -154055,7 +154055,7 @@ self: {
        sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix";
        libraryHaskellDepends = [ base ];
        description = "K-means clustering algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "kmeans-par" = callPackage
@@ -154076,8 +154076,8 @@ self: {
          base criterion deepseq metric normaldistribution random vector
        ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154094,8 +154094,8 @@ self: {
        executableHaskellDepends = [ base probable vector ];
        benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154115,8 +154115,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Advanced keyboard remapping utility";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154129,8 +154129,8 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck ];
        testHaskellDepends = [ array base QuickCheck ];
        description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154152,8 +154152,8 @@ self: {
          base comfort-array llvm-extra llvm-tf QuickCheck tfp utility-ht
        ];
        description = "Repa-like array processing using LLVM JIT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154167,8 +154167,8 @@ self: {
          base knead llvm-extra llvm-tf utility-ht
        ];
        description = "Linear algebra and interpolation using LLVM JIT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154186,7 +154186,7 @@ self: {
        testHaskellDepends = [ base ];
        doHaddock = false;
        description = "Ties the knot on data structures that reference each other by unique keys";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "knit-haskell" = callPackage
@@ -154220,8 +154220,8 @@ self: {
          random-source store streamly text
        ];
        description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154233,7 +154233,7 @@ self: {
        sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c";
        libraryHaskellDepends = [ base bytestring transformers ];
        description = "Memory-backed handles";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "knots" = callPackage
@@ -154251,8 +154251,8 @@ self: {
        ];
        executableHaskellDepends = [ base containers parallel ];
        description = "Khovanov homology computations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154266,8 +154266,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        doHaddock = false;
        description = "\"map German words to code representing pronunciation\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154284,8 +154284,8 @@ self: {
          unjson utf8-string yaml
        ];
        description = "JSON config file parsing based on unjson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154303,7 +154303,7 @@ self: {
          monad-control mtl time transformers transformers-base
        ];
        description = "Utilities for working with many HStringTemplate templates from files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "koofr-client" = callPackage
@@ -154321,7 +154321,7 @@ self: {
          http-types mtl
        ];
        description = "Client to Koofr API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "korea-holidays" = callPackage
@@ -154340,7 +154340,7 @@ self: {
          aeson base hspec monad-extras split template-haskell time yaml
        ];
        description = "Korea Holidays";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "korfu" = callPackage
@@ -154356,7 +154356,7 @@ self: {
        ];
        description = "The Korfu ORF Utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154372,8 +154372,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath mtl time unix ];
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154391,8 +154391,8 @@ self: {
          aeson base bytestring http-client http-client-tls mtl
        ];
        description = "Kraken.io API client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154423,8 +154423,8 @@ self: {
          PyF req safe-exceptions text unordered-containers
        ];
        description = "Krank checks your code source comments for important markers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154450,8 +154450,8 @@ self: {
          raw-strings-qq text vector
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154477,8 +154477,8 @@ self: {
          base bytestring criterion monad-logger mtl
        ];
        description = "KRPC protocol implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154490,8 +154490,8 @@ self: {
        sha256 = "1xj9bnwiws3rnax3rlf67p8dh487w07xl99h81a9j1wjkqysldym";
        libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154503,7 +154503,7 @@ self: {
        sha256 = "0lvdb3z73nm5csnrvjd3dvzxm411ns8wz07wcpaxqk26szc5igv1";
        libraryHaskellDepends = [ base directory ];
        description = "System management tooling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ktx" = callPackage
@@ -154515,8 +154515,8 @@ self: {
        libraryHaskellDepends = [ base bytestring OpenGL ];
        libraryPkgconfigDepends = [ egl glew ];
        description = "A binding for libktx from Khronos";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {egl = null; inherit (pkgs) glew;};
 
@@ -154536,8 +154536,8 @@ self: {
          vector
        ];
        description = "Khronos texture format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154573,8 +154573,8 @@ self: {
          x509-validation yaml
        ];
        description = "Client library for Kubernetes";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154602,8 +154602,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Auto-generated kubernetes-client-core API Client";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154620,7 +154620,7 @@ self: {
          unordered-containers
        ];
        description = "Create Kubernetes Admission Webhooks in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "kuifje" = callPackage
@@ -154631,8 +154631,8 @@ self: {
        sha256 = "0f7ldw506g4r6f7s803iwq49syfl1zmxdyyr62arbzg6h5qg81j7";
        libraryHaskellDepends = [ base boxes containers lens ];
        description = "A Quantitative Information Flow aware programming language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154646,8 +154646,8 @@ self: {
        editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3";
        libraryHaskellDepends = [ base dlist transformers ];
        description = "Combinators for Strategic Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154659,8 +154659,8 @@ self: {
        sha256 = "0bfcmx1fz521vkc2lrbpyvaqcy4c29h5xp6wmyxvgrjjnq32ld1b";
        libraryHaskellDepends = [ base kure template-haskell ];
        description = "Generator for Boilerplate KURE Combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154693,8 +154693,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Find the alpha emoji";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154707,7 +154707,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal ];
        librarySystemDepends = [ kyotocabinet ];
        description = "Mid level bindings to Kyoto Cabinet";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) kyotocabinet;};
 
   "l-bfgs-b" = callPackage
@@ -154719,8 +154719,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ lbfgsb ];
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {lbfgsb = null;};
 
@@ -154732,7 +154732,7 @@ self: {
        sha256 = "182w8l9h2zw8lxr1fahnmcasbd09z2z00ii7gkmq2y95dm3k4w0a";
        libraryHaskellDepends = [ base text time ];
        description = "Enables providing localization as typeclass instances in separate files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "labeled-graph" = callPackage
@@ -154743,8 +154743,8 @@ self: {
        sha256 = "060nvnlh1h8vxi6k2hsz79fn4xypangdj5v4q0kc6abyf9garf7r";
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154756,7 +154756,7 @@ self: {
        sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
        libraryHaskellDepends = [ base ];
        description = "Labeled tree structure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "labels" = callPackage
@@ -154767,7 +154767,7 @@ self: {
        sha256 = "04rh8c9ncd9radarz4fjka9hc3i6crvibpyj3y8qpij0acmw1d76";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Anonymous records via named tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "laborantin-hs" = callPackage
@@ -154790,8 +154790,8 @@ self: {
          random split text transformers uuid
        ];
        description = "an experiment management framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154815,8 +154815,8 @@ self: {
          attoparsec base bytestring preamble tasty tasty-hunit
        ];
        description = "LabSat TCP Interface Wrapper";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154838,8 +154838,8 @@ self: {
          parsec QuickCheck random safecopy template-haskell transformers
        ];
        description = "A complicated turn-based game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154873,8 +154873,8 @@ self: {
          yesod-static
        ];
        description = "A complicated turn-based game - Web server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154887,8 +154887,8 @@ self: {
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base hspec servant servant-foreign text ];
        description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154900,7 +154900,7 @@ self: {
        sha256 = "0d65dqvbfrrvgdnagjyiq8xf7635rd46wda722g85dxzxr1l7mbn";
        libraryHaskellDepends = [ base ];
        description = "fizzy n dizzy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lagrangian" = callPackage
@@ -154920,8 +154920,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "Solve Lagrange multiplier problems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154941,8 +154941,8 @@ self: {
          template-haskell text transformers
        ];
        description = "Minimalistic type-checked compile-time template engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154954,7 +154954,7 @@ self: {
        sha256 = "07i0fw7hvkzky9rwrnh4b3i35crbv4mkj0w001dwkgsh1flzh95f";
        libraryHaskellDepends = [ base ];
        description = "Lambda Calculi Abstract Syntax Trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lambda-bridge" = callPackage
@@ -154968,8 +154968,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -154989,8 +154989,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hlint hspec HUnit ];
        description = "A lambda calculus interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155006,7 +155006,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Lambda Calculus interpreter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lambda-canvas" = callPackage
@@ -155017,8 +155017,8 @@ self: {
        sha256 = "14wl1w1sc0j1yjfad5v00346ccxp0grfs1677hnjqwisashdac92";
        libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        description = "Educational drawing canvas for FP explorers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155045,8 +155045,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "a Paralell-DEVS implementaion based on distributed-process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155061,8 +155061,8 @@ self: {
          base containers funspection mtl read-bounded
        ];
        description = "Declarative command-line parser with type-driven pattern matching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155074,7 +155074,7 @@ self: {
        sha256 = "0s3y55yqa5js1q3rfq8dgdip6rnjag4w5j5vdldghq9ax5yph3gd";
        libraryHaskellDepends = [ base ];
        description = "A library to emulate laceholders similar to Scala";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lambda-sampler" = callPackage
@@ -155090,7 +155090,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Boltzmann sampler utilities for lambda calculus";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lambda-toolbox" = callPackage
@@ -155103,8 +155103,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "An application to work with the lambda calculus (for learning)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155118,8 +155118,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
        description = "Untyped Lambda calculus to JavaScript compiler";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155131,8 +155131,8 @@ self: {
        sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155147,7 +155147,7 @@ self: {
        executableHaskellDepends = [ base haskell98 html ];
        description = "RSS 2.0 feed generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155165,8 +155165,8 @@ self: {
          base bytestring haskeline lambdaBase mtl network
        ];
        description = "...";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155358,7 +155358,7 @@ self: {
        ];
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155385,7 +155385,7 @@ self: {
        ];
        description = "Lambdabot plugin for XMPP (Jabber) protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lambdabot-zulip" = callPackage
@@ -155405,8 +155405,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit text ];
        description = "Lambdabot for Zulip Chat";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155425,8 +155425,8 @@ self: {
          base cmdargs containers dyre glade gtk mtl network webkit
        ];
        description = "Webkit Browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lambdacms-core" = callPackage
@@ -155450,8 +155450,8 @@ self: {
          base classy-prelude classy-prelude-yesod hspec yesod yesod-core
        ];
        description = "LambdaCms 'core' subsite for Yesod apps";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155468,8 +155468,8 @@ self: {
          time yesod yesod-form
        ];
        description = "LambdaCms \"media\" extension";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155483,8 +155483,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155498,8 +155498,8 @@ self: {
          base bullet lambdacube-engine mtl vector
        ];
        description = "Example for combining LambdaCube and Bullet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155524,8 +155524,8 @@ self: {
          aeson base bytestring filepath optparse-applicative
        ];
        description = "LambdaCube 3D is a DSL to program GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155541,8 +155541,8 @@ self: {
          base bytestring bytestring-trie containers mtl vector
        ];
        description = "LambdaCube 3D IR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155559,8 +155559,8 @@ self: {
          mtl vector
        ];
        description = "LambdaCube 3D EDSL definition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155580,8 +155580,8 @@ self: {
          vector-algorithms xml zip-archive
        ];
        description = "3D rendering engine written entirely in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155598,8 +155598,8 @@ self: {
          base elerea GLFW-b lambdacube-engine mtl
        ];
        description = "Examples for LambdaCube";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155618,8 +155618,8 @@ self: {
          vector vector-algorithms
        ];
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155631,8 +155631,8 @@ self: {
        sha256 = "1xq1l27p5k863yklhiw0ldrq5ri9h5fg7wj7k2nbbwm7860mha0z";
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155654,8 +155654,8 @@ self: {
          vector
        ];
        description = "Samples for LambdaCube 3D";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155677,7 +155677,7 @@ self: {
        ];
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155703,8 +155703,8 @@ self: {
          twitter-conduit twitter-types utf8-string
        ];
        description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155718,8 +155718,8 @@ self: {
          base clash-prelude Lambdaya template-haskell
        ];
        description = "Fpga bus core and serialization for RedPitaya";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155737,8 +155737,8 @@ self: {
          attoparsec attoparsec-enumerator base bytestring enumerator gtk mtl
        ];
        description = "Diff Viewer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155764,8 +155764,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Fairly complete high-level binding to LAME encoder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mp3lame = null;};
 
@@ -155782,8 +155782,8 @@ self: {
        ];
        testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ];
        description = "A strange and unnecessary selective test-running library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155795,8 +155795,8 @@ self: {
        sha256 = "1nmyirpf07q7lrgfdqxwaspa173a2g3077gy9k7rpviw8pg2az0w";
        libraryHaskellDepends = [ base bytestring http-streams Mapping ];
        description = "A Lisp";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155829,8 +155829,8 @@ self: {
          text
        ];
        description = "Parser, pretty-printer, and more for the Modula-2 programming language";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155849,8 +155849,8 @@ self: {
          vector
        ];
        description = "ASN.1 encoding and decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155870,7 +155870,7 @@ self: {
          base HUnit parsec syb test-framework test-framework-hunit
        ];
        description = "Parsing of ASN1 definitions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-ats" = callPackage
@@ -155894,7 +155894,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Parser and pretty-printer for ATS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-avro" = callPackage
@@ -155912,7 +155912,7 @@ self: {
          avro base hspec hspec-megaparsec megaparsec text vector
        ];
        description = "Language definition and parser for AVRO files";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "language-bash" = callPackage
@@ -155930,7 +155930,7 @@ self: {
          tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
        ];
        description = "Parsing and pretty-printing Bash shell scripts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-boogie" = callPackage
@@ -155952,8 +155952,8 @@ self: {
          stream-monad time transformers
        ];
        description = "Interpreter and language infrastructure for Boogie";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -155972,7 +155972,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base directory filepath process ];
        description = "Analysis and generation of C code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-c_0_9_0_1" = callPackage
@@ -155990,8 +155990,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base directory filepath process ];
        description = "Analysis and generation of C code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "language-c-comments" = callPackage
@@ -156004,8 +156004,8 @@ self: {
        libraryHaskellDepends = [ array base language-c ];
        libraryToolDepends = [ alex ];
        description = "Extracting comments from C code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156022,8 +156022,8 @@ self: {
          template-haskell
        ];
        description = "Inline C & Objective-C code in Haskell for language interoperability";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156048,7 +156048,7 @@ self: {
          test-framework-hunit
        ];
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-c99" = callPackage
@@ -156059,7 +156059,7 @@ self: {
        sha256 = "0k4a1chca328sa3w7aghhi446kqfrbp6h5jaj2rddd8f8qjz5pag";
        libraryHaskellDepends = [ base pretty ];
        description = "An implementation of the C99 AST that strictly follows the standard";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "language-c99-simple" = callPackage
@@ -156072,7 +156072,7 @@ self: {
          base language-c99 language-c99-util mtl
        ];
        description = "C-like AST to simplify writing C99 programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "language-c99-util" = callPackage
@@ -156083,7 +156083,7 @@ self: {
        sha256 = "0rdwb29d2aa9mqkn5b4acwviymxy18sjfmzr01j7n3j4n3q4d2lz";
        libraryHaskellDepends = [ base language-c99 ];
        description = "Utilities for language-c99";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "language-cil" = callPackage
@@ -156094,7 +156094,7 @@ self: {
        sha256 = "1150fzhkn9zfxmam27wf2nyhai0ab66aaw8fqak559v39p0nri10";
        libraryHaskellDepends = [ base bool-extras ];
        description = "Manipulating Common Intermediate Language AST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-conf" = callPackage
@@ -156117,8 +156117,8 @@ self: {
          pretty QuickCheck semigroups text transformers
        ];
        description = "Conf parsers and pretty-printers for the Haskell programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156133,8 +156133,8 @@ self: {
        libraryHaskellDepends = [ array base parsec pretty text ];
        libraryToolDepends = [ alex ];
        description = "C# source code manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156146,7 +156146,7 @@ self: {
        sha256 = "0gwsa9i9jxlnp60z3dh1rkk2zds74llxwjxzrsnhbmi71rmmiggx";
        libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-dart" = callPackage
@@ -156158,8 +156158,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "Manipulating Dart source: abstract syntax and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156199,8 +156199,8 @@ self: {
        ];
        doHaddock = false;
        description = "A language for generative literature";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156222,7 +156222,7 @@ self: {
          megaparsec prettyprinter QuickCheck split text time
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "language-dockerfile" = callPackage
@@ -156250,8 +156250,8 @@ self: {
          transformers unordered-containers yaml
        ];
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156267,7 +156267,7 @@ self: {
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base parsec ];
        description = "A library for the analysis and creation of Graphviz DOT files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-ecmascript" = callPackage
@@ -156292,8 +156292,8 @@ self: {
          uniplate
        ];
        description = "JavaScript parser and pretty-printer library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156309,8 +156309,8 @@ self: {
          base containers language-ecmascript parsec uniplate
        ];
        description = "JavaScript static analysis library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156329,8 +156329,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "Parser and pretty printer for the Eiffel language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156348,8 +156348,8 @@ self: {
        testHaskellDepends = [ base hspec mtl pretty protolude ];
        testToolDepends = [ doctest ];
        description = "Generate elm code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156363,8 +156363,8 @@ self: {
        libraryHaskellDepends = [ array base haskell-src parsec syb ];
        libraryToolDepends = [ alex happy ];
        description = "Fortran lexer and parser, language support, and extensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156376,8 +156376,8 @@ self: {
        sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf";
        libraryHaskellDepends = [ base bifunctors parsers ];
        description = "Something similar to Dijkstra's guarded command language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156391,7 +156391,7 @@ self: {
        editedCabalFile = "0gkllr25h5msjvlcx1pch6a4ndm7yymdqh4ya95drc7gns0kz1zc";
        libraryHaskellDepends = [ base text ];
        description = "Datatypes and parsing/printing functions to represent the Gemini markup language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-glsl" = callPackage
@@ -156412,7 +156412,7 @@ self: {
          base HUnit parsec prettyclass test-framework test-framework-hunit
        ];
        description = "GLSL abstract syntax tree, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-go" = callPackage
@@ -156424,7 +156424,7 @@ self: {
        libraryHaskellDepends = [ array base parsec utf8-string ];
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156437,8 +156437,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156452,7 +156452,7 @@ self: {
        editedCabalFile = "1chx4g8ngb1hpyh3r9rbl8rkjkm67klms4wmw3p1g2llg47vvqip";
        libraryHaskellDepends = [ base regex-posix template-haskell ];
        description = "Module to automatically extract functions from the local code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-hcl" = callPackage
@@ -156476,8 +156476,8 @@ self: {
          base criterion directory filepath text
        ];
        description = "HCL parsers and pretty-printers for the Haskell programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156497,7 +156497,7 @@ self: {
          base directory filepath mtl tasty tasty-hunit tasty-quickcheck
        ];
        description = "Java source manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-java-classfile" = callPackage
@@ -156514,8 +156514,8 @@ self: {
          data-flags deepseq language-java LibZip mtl parsec utf8-string
        ];
        description = "Parser for Java .class files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156537,7 +156537,7 @@ self: {
          QuickCheck utf8-light utf8-string
        ];
        description = "Parser for JavaScript";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-js" = callPackage
@@ -156549,7 +156549,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "javascript parser for es6 and es7";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-kort" = callPackage
@@ -156572,8 +156572,8 @@ self: {
          base bytestring QuickCheck smaoin text vocabulary-kadma
        ];
        description = "Parser and serializer for the Kort information language";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156598,8 +156598,8 @@ self: {
          base criterion directory filepath text
        ];
        description = "Lua parser and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156616,8 +156616,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156643,8 +156643,8 @@ self: {
          tasty-hunit tasty-quickcheck unordered-containers
        ];
        description = "Lua parser and pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156659,8 +156659,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec pretty ];
        executableHaskellDepends = [ base pretty ];
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156699,8 +156699,8 @@ self: {
          versions
        ];
        description = "A library for dealing with the Ninja build language";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156716,8 +156716,8 @@ self: {
          base deepseq lens parsec-class pretty QuickCheck
        ];
        description = "Data types and functions to represent the Nix language";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "language-oberon" = callPackage
@@ -156748,8 +156748,8 @@ self: {
          grammatical-parsers prettyprinter tasty tasty-hunit text
        ];
        description = "Parser, pretty-printer, and more for the Oberon programming language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156767,8 +156767,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Analysis and generation of Objective C code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156794,8 +156794,8 @@ self: {
          string-qq tasty tasty-golden tasty-hunit
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -156812,8 +156812,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        executableHaskellDepends = [ attoparsec base bytestring ];
        description = "A simple parser for OpenSCAD";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156834,8 +156834,8 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Pig parser in haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156847,7 +156847,7 @@ self: {
        sha256 = "1wxihyf320xsqi114dbl2cwylkc261d5wgd7migb1lh23gxnhhz2";
        libraryHaskellDepends = [ base megaparsec text ];
        description = "Language definition and parser for Protocol Buffers";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "language-puppet" = callPackage
@@ -156889,8 +156889,8 @@ self: {
          transformers unordered-containers vector
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156907,7 +156907,7 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Parsing and pretty printing of Python code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-python-colour" = callPackage
@@ -156922,8 +156922,8 @@ self: {
          base haskell98 language-python xhtml
        ];
        description = "Generate coloured XHTML for Python code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156937,7 +156937,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base language-python ];
        description = "testing code for the language-python library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-qux" = callPackage
@@ -156953,8 +156953,8 @@ self: {
          transformers
        ];
        description = "Utilities for working with the Qux language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -156984,8 +156984,8 @@ self: {
          statistics weigh
        ];
        description = "Parsing and pretty printing of Rust code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157000,7 +157000,7 @@ self: {
          ansi-wl-pprint base bytestring containers text
        ];
        description = "AST and pretty printer for Sally";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "language-sh" = callPackage
@@ -157014,8 +157014,8 @@ self: {
          base directory filepath mtl parsec pcre-light
        ];
        description = "A package for parsing shell scripts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157034,7 +157034,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
        description = "AST and parser for the ZeroC Slice language (Specification language for ICE)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "language-spelling" = callPackage
@@ -157054,8 +157054,8 @@ self: {
          base bytestring criterion random-shuffle time
        ];
        description = "Various tools to detect/correct mistakes in words";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157071,8 +157071,8 @@ self: {
          array base bytestring containers mtl template-haskell utf8-string
        ];
        description = "Full parser and generator for SQL as implemented by SQLite3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157087,8 +157087,8 @@ self: {
        libraryHaskellDepends = [ array base hashable text ];
        testHaskellDepends = [ base deepseq tasty tasty-hunit text ];
        description = "A parser and printer for the SyGuS 2.0 language.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157111,8 +157111,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Parser and pretty printer for the Thrift IDL format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157135,8 +157135,8 @@ self: {
          text
        ];
        description = "A Parser for the Type Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157148,8 +157148,8 @@ self: {
        sha256 = "07lm3d4m7c6j2b5gywqm05189iwkh2zjiv5xwwmcw1fm2a63r2zd";
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "A library for working with TypeScript Definition files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157161,8 +157161,8 @@ self: {
        sha256 = "03n5cnr71zq3fl0ajjiyzjq2x2848lwd9gfp4kjkkjaxw0lb6bka";
        libraryHaskellDepends = [ base pretty ];
        description = "VHDL AST and pretty printer in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157175,8 +157175,8 @@ self: {
        libraryHaskellDepends = [ base parsec wl-pprint ];
        testHaskellDepends = [ base HUnit ];
        description = "Parser and Pretty Printer for WebIDL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157190,7 +157190,7 @@ self: {
        testHaskellDepends = [ base deepseq ];
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
        description = "Matrix programming library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lapack" = callPackage
@@ -157221,8 +157221,8 @@ self: {
          unique-logic-tf utility-ht
        ];
        description = "Numerical Linear Algebra using LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157239,8 +157239,8 @@ self: {
          transformers
        ];
        description = "Auto-generated interface to Fortran LAPACK via CArrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157257,8 +157257,8 @@ self: {
          storable-complex transformers
        ];
        description = "Auto-generated interface to Fortran LAPACK via comfort-array";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157271,8 +157271,8 @@ self: {
        libraryHaskellDepends = [ base netlib-ffi ];
        libraryPkgconfigDepends = [ liblapack ];
        description = "Auto-generated interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {liblapack = null;};
 
@@ -157297,7 +157297,7 @@ self: {
          unordered-containers utility-ht vector
        ];
        description = "Generator for Haskell interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "large-hashable" = callPackage
@@ -157325,8 +157325,8 @@ self: {
          deepseq safecopy text transformers
        ];
        description = "Efficiently hash (large) Haskell values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157344,7 +157344,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lat" = callPackage
@@ -157363,8 +157363,8 @@ self: {
          HDBC-sqlite3 hsini HTTP mtl old-locale regex-compat tagsoup time
        ];
        description = "Tool to track security alerts on LWN";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157395,8 +157395,8 @@ self: {
          transformers
        ];
        description = "Find the latest version of a package on npm";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157408,7 +157408,7 @@ self: {
        sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw";
        libraryHaskellDepends = [ base containers utility-ht ];
        description = "Parse, format and process LaTeX files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "latex-formulae-hakyll" = callPackage
@@ -157426,8 +157426,8 @@ self: {
          pandoc-types
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157446,8 +157446,8 @@ self: {
          transformers
        ];
        description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157469,8 +157469,8 @@ self: {
          base latex-formulae-image pandoc-types
        ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157493,7 +157493,7 @@ self: {
        executableHaskellDepends = [ base HaTeX process template-haskell ];
        testHaskellDepends = [ base ];
        description = "Function table specifications in latex";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "latex-live-snippets" = callPackage
@@ -157508,7 +157508,7 @@ self: {
          base directory filepath lens MissingH
        ];
        description = "Automatically inline Haskell snippets into LaTeX documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "latex-svg-hakyll" = callPackage
@@ -157523,8 +157523,8 @@ self: {
          base hakyll latex-svg-image latex-svg-pandoc lrucache pandoc-types
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157542,8 +157542,8 @@ self: {
          directory filepath parsec process temporary transformers
        ];
        description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157563,8 +157563,8 @@ self: {
        ];
        executableHaskellDepends = [ base latex-svg-image pandoc-types ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157591,8 +157591,8 @@ self: {
          universe-reverse-instances unordered-containers
        ];
        description = "Fine-grained library for constructing and manipulating lattices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157625,8 +157625,8 @@ self: {
          unordered-containers uuid vector
        ];
        description = "Server-side SDK for integrating with LaunchDarkly";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157644,8 +157644,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "High and low-level interface to the Novation Launchpad midi controller";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157657,7 +157657,7 @@ self: {
        sha256 = "014drjks30wij31fm371q5d8m6x3fpf3z52dim6zmxxv0r0pjmh0";
        libraryHaskellDepends = [ base ];
        description = "Assert the lawfulness of your typeclass instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lawless-concurrent-machines" = callPackage
@@ -157678,8 +157678,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157691,7 +157691,7 @@ self: {
        sha256 = "0hmsqpm3jakp5q274q47c9gvb2i4asc25nrfypblkvnpvnh6q172";
        libraryHaskellDepends = [ base ];
        description = "Common mathematical laws";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lax" = callPackage
@@ -157702,7 +157702,7 @@ self: {
        sha256 = "12f0k2545nk50cvs3gd41dhsfls19xkhvn3avhmgx69y57mhalcy";
        libraryHaskellDepends = [ base ];
        description = "Lax arrows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "layered-state" = callPackage
@@ -157724,8 +157724,8 @@ self: {
          criterion deepseq either kan-extensions mtl-c timeit
        ];
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157737,8 +157737,8 @@ self: {
        sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf";
        libraryHaskellDepends = [ base transformers ];
        description = "Modular type class machinery for monad transformer stacks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157758,8 +157758,8 @@ self: {
          OpenGLRaw pretty-show
        ];
        description = "A prototypical 2d platform game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157771,8 +157771,8 @@ self: {
        sha256 = "126r47n5aaz3ksl7fwfc5lg5wniy46lscr1c3z7d2sdk10rhbql9";
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157784,8 +157784,8 @@ self: {
        sha256 = "0rm0w5l4g865ais4rg3vdfx6fyzp1dginlhlabvqclbjwwzkiyqi";
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157797,8 +157797,8 @@ self: {
        sha256 = "1ddynm3jl7c4jakxk2lxy954a9245j2664an0kyh9inn51j17p9r";
        libraryHaskellDepends = [ alex-tools base text ];
        description = "A collection of different layout implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157814,8 +157814,8 @@ self: {
          base container layered-state prologue terminal-text text
        ];
        description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157827,7 +157827,7 @@ self: {
        sha256 = "02a9iw0ns12hszi5rim4x6pa15y3zycmbcmcwmsr6m31rzgz8ryp";
        libraryHaskellDepends = [ base comonad ];
        description = "Explicit laziness for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lazy-csv" = callPackage
@@ -157841,7 +157841,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
        description = "Efficient lazy parsers for CSV (comma-separated values)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lazy-hash" = callPackage
@@ -157859,8 +157859,8 @@ self: {
          template-haskell vector-space
        ];
        description = "Identifiers for not-yet-computed values";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157881,8 +157881,8 @@ self: {
          temporary
        ];
        description = "Storing computed values for re-use when the same program runs again";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157894,7 +157894,7 @@ self: {
        sha256 = "0fbvm8wwvp4xm4rq2mdfnrra7c88dps91j7ay2vn7iqmpdkcwly9";
        libraryHaskellDepends = [ base ];
        description = "Lazy IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lazy-io-streams" = callPackage
@@ -157907,8 +157907,8 @@ self: {
        editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm";
        libraryHaskellDepends = [ base bytestring io-streams ];
        description = "Get lazy with your io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157925,8 +157925,8 @@ self: {
        testHaskellDepends = [ base doctest lens ];
        testToolDepends = [ markdown-unlit ];
        description = "Lazy-Spined Monadic Priority Queues";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157938,8 +157938,8 @@ self: {
        sha256 = "1vicd1yzcz3kw3r0widfx04j4qbzz4912j5v8c2bhd0z9hvc22vp";
        libraryHaskellDepends = [ base size-based ];
        description = "Finds values satisfying a lazy predicate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157951,8 +157951,8 @@ self: {
        sha256 = "0bc2n7x8fydmzc84yb5zbdaca1r4qwpk7zlvbgcycycr87fk7p7n";
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157972,8 +157972,8 @@ self: {
          aeson base hspec microstache text transformers
        ];
        description = "An EDSL for programming the Game Boy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -157987,7 +157987,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base transformers unsafe ];
        description = "Run IO actions lazily while respecting their order";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lazyset" = callPackage
@@ -158004,8 +158004,8 @@ self: {
          base containers data-ordlist time timeit
        ];
        description = "Set and Map from lazy/infinite lists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158017,7 +158017,7 @@ self: {
        sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
        libraryHaskellDepends = [ base ];
        description = "A library for demand-driven testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lazysplines" = callPackage
@@ -158028,7 +158028,7 @@ self: {
        sha256 = "13ll6w4g0pv2bq5dsyiz4v9ywsdax6pjzb1d64fsqvq1zqr490ix";
        libraryHaskellDepends = [ base ];
        description = "Differential solving with lazy splines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lbfgs" = callPackage
@@ -158040,7 +158040,7 @@ self: {
        libraryHaskellDepends = [ array base vector ];
        description = "L-BFGS optimization";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lca" = callPackage
@@ -158053,7 +158053,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "O(log n) persistent online lowest common ancestor search without preprocessing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lcs" = callPackage
@@ -158065,7 +158065,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Find longest common sublist of two lists";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ld-intervals" = callPackage
@@ -158076,8 +158076,8 @@ self: {
        sha256 = "1mi94kdc61d4vhzvcr4gvzy3zl2wrd4i353gpmmaxp652rm9xm99";
        libraryHaskellDepends = [ base ];
        description = "Data structures for representing arbitrary intervals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158093,8 +158093,8 @@ self: {
          base containers ghc-prim mtl random-fu random-source rvar vector
        ];
        description = "Online Latent Dirichlet Allocation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158113,7 +158113,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec process semigroups ];
        description = "Pure Haskell LDAP Client Library";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "ldapply" = callPackage
@@ -158131,8 +158131,8 @@ self: {
          unordered-containers
        ];
        description = "LDIF idempotent apply tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158155,8 +158155,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "The LDAP Data Interchange Format (LDIF) tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158175,8 +158175,8 @@ self: {
          base blaze-html directory filepath pandoc split
        ];
        description = "A simple portfolio generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158195,8 +158195,8 @@ self: {
          seqaid template-haskell
        ];
        description = "Robust space leak, and its strictification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158212,8 +158212,8 @@ self: {
          base base-unicode-symbols text-utf8 transformers util
        ];
        description = "Bonds to Lean theorem prover";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158232,7 +158232,7 @@ self: {
          template-haskell
        ];
        description = "A maximally lazy, simple implementation of the Peano numbers with minimal dependencies";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leancheck" = callPackage
@@ -158244,7 +158244,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "leancheck-enum-instances" = callPackage
@@ -158255,7 +158255,7 @@ self: {
        sha256 = "0l14npnkwdr3vcdjv2b20a0g3cka0nd93cm6hrq16dcphm1ckaj1";
        libraryHaskellDepends = [ base enum-types leancheck ];
        description = "listable instances for small enum types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "leancheck-instances" = callPackage
@@ -158273,7 +158273,7 @@ self: {
          base bytestring containers leancheck nats text
        ];
        description = "Common LeanCheck instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "leankit-api" = callPackage
@@ -158286,7 +158286,7 @@ self: {
          aeson base bytestring colour curl split
        ];
        description = "LeanKit API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leanpub-concepts" = callPackage
@@ -158297,7 +158297,7 @@ self: {
        sha256 = "1vf62iryqmj8ll16cm5xpwaqzlhw8rb7p6pshm87assm9lnw3k8c";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Types for the Leanpub API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leanpub-wreq" = callPackage
@@ -158314,8 +158314,8 @@ self: {
          time transformers unordered-containers wreq
        ];
        description = "Use the Leanpub API via Wreq";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158329,8 +158329,8 @@ self: {
        editedCabalFile = "1n3r1c58626nzqmjb068kz3ckb3xsn9v62i70yvzk2g6j29fpz2g";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base tasty tasty-hunit time ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158343,7 +158343,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base QuickCheck time ];
        description = "Leap seconds announced at library release time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "learn" = callPackage
@@ -158354,8 +158354,8 @@ self: {
        sha256 = "1i2rn4pmgbqxj0xsjqp5rh50lv6zgnblbjgwmqh5cxb3dsillvpj";
        libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158376,7 +158376,7 @@ self: {
          base gloss gnuplot not-gloss spatial-math
        ];
        description = "Haskell code for learning physics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -158393,8 +158393,8 @@ self: {
          base gloss gnuplot learn-physics not-gloss spatial-math
        ];
        description = "examples for learn-physics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158410,7 +158410,7 @@ self: {
          base containers deepseq hmatrix random-fu random-source vector
        ];
        description = "Yet another library for hidden Markov models";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leb128" = callPackage
@@ -158429,8 +158429,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "LEB128 encoding logic for and in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158447,7 +158447,7 @@ self: {
          base bytestring tasty tasty-hunit tasty-quickcheck
        ];
        description = "LEB128 and SLEB128 encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "leetify" = callPackage
@@ -158461,8 +158461,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers ];
        description = "Leetify text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158476,7 +158476,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base hscharm random random-shuffle ];
        description = "left4dead-inspired roguelike";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "legion" = callPackage
@@ -158497,8 +158497,8 @@ self: {
          stm text time transformers unix uuid wai wai-extra warp
        ];
        description = "Distributed, stateful, homogeneous microservice framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158524,8 +158524,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A discovery service based on Legion";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158545,8 +158545,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Client library for communicating with legion-discovery";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158568,8 +158568,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Extra non-essential utilities for building legion applications";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158608,7 +158608,7 @@ self: {
        executableHaskellDepends = [ base gi-gtk-hs leksah-server stm ];
        description = "Haskell IDE written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gtk3;};
 
   "leksah-server" = callPackage
@@ -158646,7 +158646,7 @@ self: {
        ];
        description = "Metadata collection for leksah";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158663,8 +158663,8 @@ self: {
          io-streams mtl scientific text vector
        ];
        description = "Bindings for the LendingClub marketplace API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158706,7 +158706,7 @@ self: {
          generic-deriving transformers unordered-containers vector
        ];
        description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -158717,7 +158717,7 @@ self: {
        sha256 = "1sk3iy5qv24mifx0gwd5z714lf3y3s4zpbff09mqk42whk2sdd0y";
        libraryHaskellDepends = [ accelerate base lens ];
        description = "Instances to mix lens with Accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-action" = callPackage
@@ -158736,7 +158736,7 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Monadic Getters and Folds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-aeson" = callPackage
@@ -158759,7 +158759,7 @@ self: {
          base doctest generic-deriving semigroups simple-reflect
        ];
        description = "Law-abiding lenses for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lens-core" = callPackage
@@ -158781,7 +158781,7 @@ self: {
        sha256 = "0kkwb32ndhxhlz01pn4xh825x95l8g45cs4h5wxkjh24rywl3rrp";
        libraryHaskellDepends = [ base bytestring cassava lens ];
        testHaskellDepends = [ base bytestring cassava lens ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-datetime" = callPackage
@@ -158792,7 +158792,7 @@ self: {
        sha256 = "1m6cns38xggw8kcc9h0mf4q024cvc8njm7n33f8gi7hwyxxqs7xv";
        libraryHaskellDepends = [ base lens time ];
        description = "Lenses for Data.Time.* types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-errors" = callPackage
@@ -158804,7 +158804,7 @@ self: {
        libraryHaskellDepends = [ base either lens ];
        testHaskellDepends = [ base containers either hspec lens ];
        description = "Error handling in lens chains";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-family" = callPackage
@@ -158819,7 +158819,7 @@ self: {
          base containers lens-family-core mtl transformers
        ];
        description = "Lens Families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-family_2_1_0" = callPackage
@@ -158834,8 +158834,8 @@ self: {
          base containers lens-family-core mtl transformers
        ];
        description = "Lens Families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lens-family-core" = callPackage
@@ -158846,7 +158846,7 @@ self: {
        sha256 = "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 2022 Lens Families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-family-core_2_1_0" = callPackage
@@ -158857,8 +158857,8 @@ self: {
        sha256 = "1jjzm2f4ixjwysyk8gybzpb98rlf2mmzn0nfg8qvhkf5gl87jv3v";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 2022 Lens Families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lens-family-th" = callPackage
@@ -158870,7 +158870,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell transformers ];
        description = "Generate lens-family style lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-filesystem" = callPackage
@@ -158888,8 +158888,8 @@ self: {
          base directory filepath hspec lens lens-action
        ];
        description = "Lens interface for your filesystem; still a bit experimental";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158901,8 +158901,8 @@ self: {
        sha256 = "0zz2w01knsj1zn9vj8g3dbhvh0sgnibr5wm9dn91qv0bmps745z7";
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158914,7 +158914,7 @@ self: {
        sha256 = "1jyqxi83imkyd318m17p2z84zqaxyb08mk5gy7q7saay2blmz4jr";
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        description = "Miscellaneous lens utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-named" = callPackage
@@ -158925,7 +158925,7 @@ self: {
        sha256 = "1w6y1caah0yr7gilwsv7ji7pp3mz1m9wlx5zpq0n0z1q2wbdsmfp";
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Helper for use with lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-prelude" = callPackage
@@ -158942,8 +158942,8 @@ self: {
          mtl text time transformers unordered-containers vector
        ];
        description = "Alternate prelude that exports lens combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -158963,7 +158963,7 @@ self: {
          base doctest filepath lens process tasty tasty-hunit
        ];
        description = "Optics for system processes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-properties" = callPackage
@@ -158976,7 +158976,7 @@ self: {
        editedCabalFile = "1ky3xzh3cgam5ncx7n25xbll7vqw3x7vyhprfmxm34pshkxbrjh7";
        libraryHaskellDepends = [ base lens QuickCheck transformers ];
        description = "QuickCheck properties for lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-regex" = callPackage
@@ -158996,7 +158996,7 @@ self: {
          base directory doctest filepath regex-posix
        ];
        description = "Lens powered regular expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-regex-pcre" = callPackage
@@ -159020,7 +159020,7 @@ self: {
          template-haskell text
        ];
        description = "A lensy interface to regular expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-simple" = callPackage
@@ -159035,8 +159035,8 @@ self: {
          base lens-family lens-family-core lens-family-th mtl transformers
        ];
        description = "simplified import of elementary lens-family combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159050,7 +159050,7 @@ self: {
          base fclabels generics-sop transformers
        ];
        description = "Computing lenses generically using generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lens-text-encoding" = callPackage
@@ -159061,8 +159061,8 @@ self: {
        sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv";
        libraryHaskellDepends = [ base bytestring lens text ];
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159077,8 +159077,8 @@ self: {
        libraryHaskellDepends = [ base ghc lens ];
        executableHaskellDepends = [ base ghc ghc-exactprint lens ];
        description = "Rewrites Template Haskell splices using the API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159090,8 +159090,8 @@ self: {
        sha256 = "1hrp9d6qja7yc3zj68w3hylgflyfsvh79m8daw9030yjdxm525za";
        libraryHaskellDepends = [ base lens time ];
        description = "lens for Data.Time";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159108,8 +159108,8 @@ self: {
          base containers dwergaz hlint lens-family text toml-parser
        ];
        description = "Lenses for toml-parser";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159122,8 +159122,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base doctest ];
        description = "Tutorial for the lens library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159135,8 +159135,8 @@ self: {
        sha256 = "0lsdp6rgacsa13fppa2dfn2nz8cdrvj5clmlshzrv1h0423hfgbp";
        libraryHaskellDepends = [ base singletons ];
        description = "Type-level lenses using singletons";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159153,8 +159153,8 @@ self: {
          template-haskell
        ];
        description = "Collection of missing lens utilities";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159169,7 +159169,7 @@ self: {
        libraryHaskellDepends = [ base lens xml ];
        testHaskellDepends = [ base lens xml ];
        description = "Lenses for the xml package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lenses" = callPackage
@@ -159180,7 +159180,7 @@ self: {
        sha256 = "1wwl0f1f1scflnbjgqcinkpvpvhn21942bfbg8vlimdap6i5d49h";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Simple Functional Lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lensref" = callPackage
@@ -159192,8 +159192,8 @@ self: {
        libraryHaskellDepends = [ base monad-control mtl transformers ];
        testHaskellDepends = [ base ];
        description = "References which can be joined and on which lenses can be applied";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159220,8 +159220,8 @@ self: {
          semigroups terminal-progress-bar text
        ];
        description = "frugal issue tracker";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159239,7 +159239,7 @@ self: {
          base base-unicode-symbols hs-functors transformers
        ];
        description = "Van Laarhoven lenses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lenz-mtl" = callPackage
@@ -159257,7 +159257,7 @@ self: {
        ];
        description = "mtl operations with Van Laarhoven lenses";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lenz-template" = callPackage
@@ -159275,7 +159275,7 @@ self: {
        ];
        description = "Van Laarhoven lens templates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "less-arbitrary" = callPackage
@@ -159303,7 +159303,7 @@ self: {
          vector
        ];
        description = "Linear time testing with variant of Arbitrary class that always terminates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "level-monad" = callPackage
@@ -159314,8 +159314,8 @@ self: {
        sha256 = "1l5jyhpvbcj4fmyggp8bjy4gx9igcydply3yb1s23fxdcz0b638a";
        libraryHaskellDepends = [ base fmlist ];
        description = "Non-Determinism Monad for Level-Wise Search";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159340,7 +159340,7 @@ self: {
          tasty tasty-quickcheck temporary transformers
        ];
        description = "Haskell bindings to LevelDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -159363,7 +159363,7 @@ self: {
          QuickCheck transformers
        ];
        description = "Haskell bindings to LevelDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) leveldb;};
 
   "levmar" = callPackage
@@ -159374,8 +159374,8 @@ self: {
        sha256 = "0v2mfqw4irzpfq100i1rm5djfqzvxilq9i7pcslsb92jkcv2zgbc";
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        description = "An implementation of the Levenberg-Marquardt algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159389,8 +159389,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159410,8 +159410,8 @@ self: {
        testHaskellDepends = [ base util ];
        benchmarkHaskellDepends = [ base gauge util ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159428,7 +159428,7 @@ self: {
          base deepseq regex-applicative srcloc tasty tasty-hunit
        ];
        description = "Simple lexer based on applicative regular expressions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lfst" = callPackage
@@ -159440,8 +159440,8 @@ self: {
        libraryHaskellDepends = [ base containers doctest lattices ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "L-Fuzzy Set Theory implementation in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159469,8 +159469,8 @@ self: {
          vector
        ];
        description = "Lens GUI Toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159482,8 +159482,8 @@ self: {
        sha256 = "0a5h1d0sdnpy209k4zkmcrrxl4b000226hif098bqs9pngpbgki1";
        libraryHaskellDepends = [ haskell2010 ];
        description = "Data structures for the Les Houches Accord";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159504,7 +159504,7 @@ self: {
        ];
        description = "Simple spreadsheet program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159518,8 +159518,8 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        description = "LHC Haskell Compiler";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159531,8 +159531,8 @@ self: {
        sha256 = "08725r5i71ni9ip4qbc5fr111j256rsii936yvxbd7kbbw4ap2a9";
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159551,8 +159551,8 @@ self: {
          base cmdargs filepath haskell-src-exts syb uu-parsinglib
        ];
        description = "Literate highlighter preprocessor for lhs2tex";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159567,7 +159567,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath Glob ];
        description = "Compile lhs in bird style to md, html, hs";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "lhs2tex" = callPackage
@@ -159602,8 +159602,8 @@ self: {
          base directory filepath process regex-posix
        ];
        description = "Tool for using pdflatex with .lhs files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159619,7 +159619,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A binding to the libBF library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "libGenI" = callPackage
@@ -159636,7 +159636,7 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159667,8 +159667,8 @@ self: {
          base bytestring criterion tar tar-conduit temporary
        ];
        description = "Haskell interface to libarchive";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libarchive;};
 
@@ -159685,7 +159685,7 @@ self: {
        ];
        librarySystemDepends = [ archive ];
        description = "Read many archive formats with libarchive and conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {archive = null;};
 
   "libconfig" = callPackage
@@ -159705,8 +159705,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base doctest doctest-prop lens ];
        description = "Haskell bindings to libconfig";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libconfig;};
 
@@ -159727,8 +159727,8 @@ self: {
          base directory filepath mtl test-framework
        ];
        description = "A library providing a parser, type checker and evaluator for CSPM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159741,8 +159741,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
@@ -159756,7 +159756,7 @@ self: {
        librarySystemDepends = [ ffi ];
        libraryPkgconfigDepends = [ libffi ];
        description = "A binding to libffi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {ffi = null; inherit (pkgs) libffi;};
 
   "libffi-dynamic" = callPackage
@@ -159768,7 +159768,7 @@ self: {
        libraryHaskellDepends = [ base contravariant hashable intern ];
        librarySystemDepends = [ ffi ];
        description = "LibFFI interface with dynamic bidirectional type-driven binding generation";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {ffi = null;};
 
   "libfuse3" = callPackage
@@ -159792,8 +159792,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion unix ];
        description = "A Haskell binding for libfuse-3.x";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fuse3;};
 
@@ -159805,7 +159805,7 @@ self: {
        sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x";
        libraryHaskellDepends = [ base mtl process ];
        description = "Simple Git Wrapper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libgraph" = callPackage
@@ -159822,7 +159822,7 @@ self: {
          array base containers monads-tf process union-find
        ];
        description = "Store and manipulate data in a graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libhbb" = callPackage
@@ -159845,8 +159845,8 @@ self: {
          base bytestring ghc ghc-paths hspec mtl syb
        ];
        description = "Backend for text editors to provide better Haskell editing support";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159865,8 +159865,8 @@ self: {
          http-types resource-pool stm text
        ];
        description = "libinfluxdb";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159895,8 +159895,8 @@ self: {
          xml-conduit
        ];
        description = "Jenkins API interface";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159927,8 +159927,8 @@ self: {
          transformers unordered-containers uuid
        ];
        description = "A Haskell implementation of JSON Web Token (JWT)";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159955,8 +159955,8 @@ self: {
          xml-html-conduit-lens
        ];
        description = "Lastfm API interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -159992,8 +159992,8 @@ self: {
          test-framework-th text time transformers
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160007,8 +160007,8 @@ self: {
          base bindings-DSL enumerator mtl vector
        ];
        description = "liblinear iteratee";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160022,8 +160022,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "FFI interface to libltdl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160036,8 +160036,8 @@ self: {
        libraryHaskellDepends = [ base bytestring data-default vector ];
        librarySystemDepends = [ modbus ];
        description = "Haskell bindings to the C modbus library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {modbus = null;};
 
@@ -160070,8 +160070,8 @@ self: {
          test-framework-th text time transformers
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160094,7 +160094,7 @@ self: {
          utf8-string
        ];
        description = "An MPD client library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "libnix" = callPackage
@@ -160112,8 +160112,8 @@ self: {
          base directory errors protolude tasty tasty-hunit text
        ];
        description = "Bindings to the nix package manager";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160126,7 +160126,7 @@ self: {
        libraryHaskellDepends = [ base bytestring glib gtk ];
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libnotify;};
 
   "libnvvm" = callPackage
@@ -160144,8 +160144,8 @@ self: {
          base bytestring Cabal HUnit test-framework test-framework-hunit
        ];
        description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {nvvm = null;};
 
   "liboath-hs" = callPackage
@@ -160166,8 +160166,8 @@ self: {
        executableHaskellDepends = [ base bytestring time ];
        testHaskellDepends = [ base ];
        description = "Bindings to liboath";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {liboath = null; oath = null;};
 
@@ -160183,8 +160183,8 @@ self: {
          base CC-delcont containers mtl template-haskell unix
        ];
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160198,8 +160198,8 @@ self: {
        librarySystemDepends = [ pafe ];
        testHaskellDepends = [ base bytestring iconv transformers ];
        description = "Wrapper for libpafe";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {pafe = null;};
 
@@ -160212,8 +160212,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ postgresql ];
        description = "libpq binding for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) postgresql;};
 
@@ -160265,8 +160265,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Raft consensus algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160278,8 +160278,8 @@ self: {
        sha256 = "07xg59f48jw78mjbx83bz1rc2fxvdnlb08cdfd7hwkj43a127kxn";
        libraryHaskellDepends = [ base bytestring curl ];
        description = "Wrapper to Random.org API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160300,8 +160300,8 @@ self: {
          vector
        ];
        description = "Bindings to the Librato API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160320,7 +160320,7 @@ self: {
          text uri-bytestring url
        ];
        description = "Use Libravatar, the decentralized avatar delivery service";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "librdkafka" = callPackage
@@ -160331,7 +160331,7 @@ self: {
        sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libretls" = callPackage
@@ -160348,8 +160348,8 @@ self: {
        libraryPkgconfigDepends = [ libtls ];
        testHaskellDepends = [ base containers hspec HUnit libressl ];
        description = "libtls bindings";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libressl = null; libtls = null;};
 
@@ -160362,7 +160362,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Use Roman Numerals as a Numeric Datatype (sort of)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libsodium" = callPackage
@@ -160380,7 +160380,7 @@ self: {
        ];
        testPkgconfigDepends = [ libsodium ];
        description = "Low-level bindings to the libsodium C library";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {inherit (pkgs) libsodium;};
 
   "libssh2" = callPackage
@@ -160398,8 +160398,8 @@ self: {
        libraryPkgconfigDepends = [ libssh2 ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libssh2;};
 
@@ -160417,8 +160417,8 @@ self: {
          base bytestring conduit libssh2 stm transformers
        ];
        description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160437,7 +160437,7 @@ self: {
          http-conduit profunctors text
        ];
        description = "StackExchange API interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "libsystemd-daemon" = callPackage
@@ -160456,8 +160456,8 @@ self: {
          base HUnit network test-framework test-framework-hunit
        ];
        description = "Haskell bindings for libsystemd-daemon";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
@@ -160477,7 +160477,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ systemd ];
        description = "Haskell bindings to libsystemd-journal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -160491,8 +160491,8 @@ self: {
        librarySystemDepends = [ taglib ];
        libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib C library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) taglib;};
 
@@ -160507,7 +160507,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        libraryPkgconfigDepends = [ libtelnet ];
        description = "Bindings to libtelnet";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {inherit (pkgs) libtelnet;};
 
   "libversion" = callPackage
@@ -160519,7 +160519,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        libraryPkgconfigDepends = [ libversion ];
        description = "Haskell binding to libversion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libversion;};
 
   "libvirt-hs" = callPackage
@@ -160532,7 +160532,7 @@ self: {
        libraryPkgconfigDepends = [ libvirt ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libvirt;};
 
   "libvorbis" = callPackage
@@ -160543,7 +160543,7 @@ self: {
        sha256 = "19mx07gvwsqhbish8cbbiplgpw75birn19sl0hhn2300kpryyxfb";
        libraryHaskellDepends = [ base bytestring cpu ];
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libxls" = callPackage
@@ -160554,8 +160554,8 @@ self: {
        sha256 = "03klm9s27v06s65ypy6bsshnif20mprhynvqrmcw90brzmgiihf6";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Bindings to libxls";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160571,7 +160571,7 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ libxml2 ];
        description = "Binding to libxml2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libxml2;};
 
   "libxml-enumerator" = callPackage
@@ -160586,8 +160586,8 @@ self: {
          base bytestring enumerator libxml-sax text transformers xml-types
        ];
        description = "Enumerator-based API for libXML's SAX interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160601,7 +160601,7 @@ self: {
        librarySystemDepends = [ libxml2 ];
        libraryPkgconfigDepends = [ libxml2 ];
        description = "Bindings for the libXML2 SAX interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libxml2;};
 
   "libxslt" = callPackage
@@ -160613,8 +160613,8 @@ self: {
        libraryHaskellDepends = [ base bytestring libxml ];
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xslt = null;};
 
@@ -160626,7 +160626,7 @@ self: {
        sha256 = "1dcpbsjg6n305l07isxmavgp01lbv1qggy16acjyxjlz35pxchlg";
        libraryHaskellDepends = [ base bytestring conduit resourcet ];
        description = "Low-level, streaming YAML interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "libzfs" = callPackage
@@ -160644,7 +160644,7 @@ self: {
        executableHaskellDepends = [ base mtl transformers ];
        executableSystemDepends = [ nvpair zfs ];
        description = "Bindings to libzfs, for dealing with the Z File System and Zpools";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {nvpair = null; inherit (pkgs) zfs;};
 
   "licensor" = callPackage
@@ -160664,7 +160664,7 @@ self: {
          base Cabal cmdargs containers directory
        ];
        description = "A license compatibility helper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lie" = callPackage
@@ -160678,8 +160678,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Lie Algebras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160694,7 +160694,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        description = "Conway's Life cellular automaton";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "life-sync" = callPackage
@@ -160720,7 +160720,7 @@ self: {
          text tomland
        ];
        description = "Synchronize personal configs across multiple machines";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "lift-generics" = callPackage
@@ -160742,7 +160742,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lift-read-show" = callPackage
@@ -160753,7 +160753,7 @@ self: {
        sha256 = "0sp725nflvqzxvhycjj1v9j46y4cx1vvbr9k6pfwz585n35gs1a0";
        libraryHaskellDepends = [ base ];
        description = "Helper methods to define `Read1`, `Read2`, `Show1`, `Show2` instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifted-async" = callPackage
@@ -160774,7 +160774,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ async base criterion deepseq ];
        description = "Run lifted IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifted-base" = callPackage
@@ -160795,7 +160795,7 @@ self: {
          base criterion monad-control monad-peel transformers
        ];
        description = "lifted IO operations from the base library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifted-base-tf" = callPackage
@@ -160818,8 +160818,8 @@ self: {
          base criterion lifted-base monad-control monad-peel transformers
        ];
        description = "lifted IO operations from the base library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160837,8 +160837,8 @@ self: {
          lifted-async lifted-base mtl safe stm text transformers
        ];
        description = "A sensible set of defaults for writing lifted custom Preludes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160855,7 +160855,7 @@ self: {
          transformers-base transformers-compat
        ];
        description = "STM operations lifted through monad transformer stacks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifted-threads" = callPackage
@@ -160870,7 +160870,7 @@ self: {
          base monad-control threads transformers-base
        ];
        description = "lifted IO operations from the threads library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lifter" = callPackage
@@ -160888,8 +160888,8 @@ self: {
          array base bitmap bytestring directory filepath gloss mtl stb-image
        ];
        description = "A boulderdash-like game and solution validator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160901,8 +160901,8 @@ self: {
        sha256 = "03h30lbhppi9hmpsc8fhsrsad6w9sjs9n53lz76czz3iqaknkcrb";
        libraryHaskellDepends = [ base text ];
        description = "Expand ligatures in unicode text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160914,7 +160914,7 @@ self: {
        sha256 = "1hxfx514ar9hr9gqzzdgd7avfvlsvr7lv6hgza5k04b2xm73ysrp";
        libraryHaskellDepends = [ base ];
        description = "Lightweight Implementation of Generics and Dynamics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "light" = callPackage
@@ -160928,7 +160928,7 @@ self: {
        libraryHaskellDepends = [ base containers gjk2d lens linear mtl ];
        testHaskellDepends = [ base containers lens linear QuickCheck ];
        description = "a simple physics engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lightning-haskell" = callPackage
@@ -160949,8 +160949,8 @@ self: {
          aeson api-builder base bytestring hspec text transformers
        ];
        description = "Haskell client for lightning-viz REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -160982,8 +160982,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "LightStep OpenTracing client library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161000,8 +161000,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161018,8 +161018,8 @@ self: {
          template-haskell
        ];
        description = "A QuasiQuoter for lighttpd configuration files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161036,8 +161036,8 @@ self: {
          prettify process semigroups vector-space
        ];
        description = "Bindings to Lilypond";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161054,7 +161054,7 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck tasty-th
        ];
        description = "representation of Integer Linear Programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "limp-cbc" = callPackage
@@ -161071,8 +161071,8 @@ self: {
          base limp QuickCheck tasty tasty-quickcheck
        ];
        description = "bindings for integer linear programming solver Coin/CBC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161084,7 +161084,7 @@ self: {
        sha256 = "0yfw2m1l7240xir3qa8i11c5q7appaji4kgcjyhdc0rz6p3j55iy";
        libraryHaskellDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linda" = callPackage
@@ -161095,8 +161095,8 @@ self: {
        sha256 = "0d58i69hvry9vzr4i7f1yhhm99808vqw238hfjc3sr51plc1is45";
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161126,8 +161126,8 @@ self: {
          base containers hashable mtl random-fu rosezipper text uuid warp
        ];
        description = "Zen gardening, based on l-systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161139,7 +161139,7 @@ self: {
        sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1";
        libraryHaskellDepends = [ base ];
        description = "L-systems in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "line" = callPackage
@@ -161162,7 +161162,7 @@ self: {
          text time transformers
        ];
        description = "Haskell SDK for the LINE API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "line-bot-sdk" = callPackage
@@ -161196,8 +161196,8 @@ self: {
          servant-client-core servant-server text time transformers wai warp
        ];
        description = "Haskell SDK for LINE Messaging API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161211,7 +161211,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Convert newlines in text";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "line-drawing" = callPackage
@@ -161223,8 +161223,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "raster line drawing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161238,7 +161238,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Display the number of bytes of each line";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "line2pdf" = callPackage
@@ -161252,7 +161252,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        executableHaskellDepends = [ base bytestring containers ];
        description = "Simple command-line utility to convert text into PDF";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear" = callPackage
@@ -161280,7 +161280,7 @@ self: {
          simple-reflect test-framework test-framework-hunit vector
        ];
        description = "Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear-accelerate" = callPackage
@@ -161297,7 +161297,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Lifting linear vector spaces into Accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -161317,8 +161317,8 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A linear algebra library with bindings to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161340,8 +161340,8 @@ self: {
          utility-ht
        ];
        description = "Compute resistance of linear electrical circuits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161367,8 +161367,8 @@ self: {
          tasty-smallcheck
        ];
        description = "A simple library for linear codes (coding theory, error correction)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161381,7 +161381,7 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A simple grammar for building linear equations and inclusive inequalities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear-maps" = callPackage
@@ -161395,8 +161395,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers HUnit ];
        description = "Finite maps for linear use";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161412,8 +161412,8 @@ self: {
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
        description = "Isomorphisms between linear and OpenGL types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161426,7 +161426,7 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        testHaskellDepends = [ base hspec network tasty-hspec ];
        description = "Typed sockets";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "linear-tests" = callPackage
@@ -161441,7 +161441,7 @@ self: {
          base hspec hspec-core lens linear QuickCheck
        ];
        description = "Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linear-vect" = callPackage
@@ -161452,8 +161452,8 @@ self: {
        sha256 = "0i6z10pgqcykkygl6kq63phx5hvwi2d84j2f5vw4nrnic59sm9jy";
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161465,7 +161465,7 @@ self: {
        sha256 = "0lrrgix4m2sbfw9ydcqnx45lka0grl8ndiiy3cs1xg4xpcy2fkjw";
        libraryHaskellDepends = [ base sbv ];
        description = "Use SMT solvers to solve linear systems over integers and rationals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linearmap-category" = callPackage
@@ -161484,8 +161484,8 @@ self: {
          semigroups tagged transformers vector vector-space
        ];
        description = "Native, complete, matrix-free linear algebra";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161499,8 +161499,8 @@ self: {
          base containers ghc-prim mtl transformers
        ];
        description = "Linear scan register allocator, formally verified in Coq";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161521,8 +161521,8 @@ self: {
          lens-family-core linearscan QuickCheck transformers
        ];
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161534,7 +161534,7 @@ self: {
        sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7";
        libraryHaskellDepends = [ base hyphenation ];
        description = "breaks strings to fit width";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linenoise" = callPackage
@@ -161554,7 +161554,7 @@ self: {
          base bytestring exceptions mtl text unliftio-core
        ];
        description = "A lightweight readline-replacement library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lines-of-action" = callPackage
@@ -161565,8 +161565,8 @@ self: {
        sha256 = "1sikhdahhxqi9i285zphbpnz60vyxjdhvz2qd70hmy7x3ckymb42";
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161589,7 +161589,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "File extension based programming language detection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linguistic-ordinals" = callPackage
@@ -161600,7 +161600,7 @@ self: {
        sha256 = "11f01j9qak8rhaj84gkx27qhfc334cj9pchi7qcb6brpqbwgdsik";
        libraryHaskellDepends = [ base text ];
        description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "link-relations" = callPackage
@@ -161615,7 +161615,7 @@ self: {
          base bytestring hashable unordered-containers uri-bytestring
        ];
        description = "Use web link relation types (RFC 5988) in Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "linkchk" = callPackage
@@ -161633,7 +161633,7 @@ self: {
        ];
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161650,8 +161650,8 @@ self: {
          base containers extcore filepath process
        ];
        description = "Combines multiple GHC Core modules into a single module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161664,8 +161664,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "A pure linked list which is mutable through iterators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161688,8 +161688,8 @@ self: {
          base containers criterion deepseq hashable unordered-containers
        ];
        description = "Persistent LinkedHashMap data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161712,8 +161712,8 @@ self: {
          uri-bytestring wai wreq
        ];
        description = "A Haskell library for the Slack API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161740,8 +161740,8 @@ self: {
          uri-encode wai warp
        ];
        description = "Lightweight library for building HTTP API";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161759,8 +161759,8 @@ self: {
          quickcheck-instances text
        ];
        description = "Aeson JSON support for Linnet";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161781,8 +161781,8 @@ self: {
          quickcheck-classes quickcheck-instances wai warp
        ];
        description = "Conduit-backed support for streaming in Linnet";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161804,8 +161804,8 @@ self: {
          text
        ];
        description = "Bindings to the Linode API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161822,8 +161822,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Haskell wrapper for the Linode v4 API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161840,8 +161840,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ blkid ];
        description = "Linux libblkid";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {blkid = null;};
 
@@ -161853,8 +161853,8 @@ self: {
        sha256 = "0dd1ii1n6y9frilnkxikzahp9xrh3i334i7syvd8fyxp51dpzgy1";
        libraryHaskellDepends = [ base filepath ];
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161868,7 +161868,7 @@ self: {
        editedCabalFile = "1gnjyc8q7xq60pm362hwibwh97jw8pv66xvqv88cm9nbh0ccf6q2";
        libraryHaskellDepends = [ base bytestring time unix ];
        description = "Bindings to Linux evdev input device interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-file-extents" = callPackage
@@ -161881,7 +161881,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
        description = "Retrieve file fragmentation information under Linux";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-framebuffer" = callPackage
@@ -161893,7 +161893,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL unix ];
        description = "Linux fbdev (framebuffer device, /dev/fbX) utility functions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "linux-inotify" = callPackage
@@ -161904,7 +161904,7 @@ self: {
        sha256 = "1dl71xkfjlwjsmv0mqf2fpkfjl3hyzk5q1drsykg7rdblpjfbzlc";
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-kmod" = callPackage
@@ -161916,8 +161916,8 @@ self: {
        libraryHaskellDepends = [ base directory ];
        libraryPkgconfigDepends = [ libkmod ];
        description = "Linux kernel modules support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libkmod = null;};
 
@@ -161929,7 +161929,7 @@ self: {
        sha256 = "12bwrniaxg6gm347jdgbf535pdz4z57pkyiwa98c903y9q9ssnyi";
        libraryHaskellDepends = [ base bytestring ];
        description = "Mount and unmount filesystems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-namespaces" = callPackage
@@ -161940,7 +161940,7 @@ self: {
        sha256 = "1rvkzfmd07sz46k059ly80cjgwx67igfw8zsw8c6ljsp3hsdn4hl";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Work with linux namespaces: create new or enter existing ones";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linux-perf" = callPackage
@@ -161962,8 +161962,8 @@ self: {
          unix
        ];
        description = "Read files generated by perf on Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161981,8 +161981,8 @@ self: {
          base bytestring mmap posix-waitpid process template-haskell unix
        ];
        description = "Wrapping of Linux' ptrace(2)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -161994,7 +161994,7 @@ self: {
        sha256 = "0rpq5sm557gm227id2rfsffgr47lrj4d4kpzh194d74dx2qkg5g6";
        libraryHaskellDepends = [ base bytestring ];
        description = "Read, set and list extended attributes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "linx-gateway" = callPackage
@@ -162014,8 +162014,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Implementation of the Enea LINX gateway protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162027,7 +162027,7 @@ self: {
        sha256 = "04hcbvxskjji04sxx4jydac62sh6h7jlggn7kfwm8axmwjczjjqs";
        libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lio-eci11" = callPackage
@@ -162044,7 +162044,7 @@ self: {
        ];
        description = "Labeled IO library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162061,7 +162061,7 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lio-simple" = callPackage
@@ -162085,8 +162085,8 @@ self: {
          simple-templates text
        ];
        description = "LIO support for the Simple web framework";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162098,8 +162098,8 @@ self: {
        sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generators for random sequences of English-like nonsense text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162124,8 +162124,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
        description = "Liquid template language library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162139,8 +162139,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ];
        description = "Drop-in base replacement for LiquidHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162156,8 +162156,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ];
        description = "LiquidHaskell specs for the bytestring package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162173,8 +162173,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ containers liquid-base liquidhaskell ];
        description = "LiquidHaskell specs for the containers package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162208,7 +162208,7 @@ self: {
        testSystemDepends = [ git nettools z3 ];
        doCheck = false;
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) git; inherit (pkgs) nettools; 
          inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
@@ -162222,8 +162222,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ ghc-prim liquidhaskell ];
        description = "Drop-in ghc-prim replacement for LiquidHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162238,8 +162238,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ liquid-base liquidhaskell parallel ];
        description = "LiquidHaskell specs for the parallel package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162259,8 +162259,8 @@ self: {
          liquid-prelude liquid-vector liquidhaskell process
        ];
        description = "A battery-included platform for LiquidHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162277,8 +162277,8 @@ self: {
          bytestring containers liquid-base liquidhaskell
        ];
        description = "General utility modules for LiquidHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162292,8 +162292,8 @@ self: {
        setupHaskellDepends = [ base Cabal liquidhaskell ];
        libraryHaskellDepends = [ liquid-base liquidhaskell vector ];
        description = "LiquidHaskell specs for the vector package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162334,7 +162334,7 @@ self: {
        ];
        testSystemDepends = [ z3 ];
        description = "Liquid Types for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
   "liquidhaskell-cabal" = callPackage
@@ -162347,8 +162347,8 @@ self: {
        editedCabalFile = "0c76lchw32dzfn8q4qckxqjzcnw909x7niiwlzadas8mv9p93ybl";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "Liquid Haskell integration for Cabal and Stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162365,7 +162365,7 @@ self: {
        executableHaskellDepends = [ base liquidhaskell-cabal ];
        description = "Demo of Liquid Haskell integration for Cabal and Stack";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lispparser" = callPackage
@@ -162376,7 +162376,7 @@ self: {
        sha256 = "1hj5fwmzxp2gw2gx86wa1fy36jmmh3sf8kd4acc8x0rghpmlw0w8";
        libraryHaskellDepends = [ base parsec ];
        description = "Simple parser for LISP S-expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-duplicate" = callPackage
@@ -162388,7 +162388,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Group and delete duplicates from a list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-extras" = callPackage
@@ -162399,7 +162399,7 @@ self: {
        sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw";
        libraryHaskellDepends = [ base ];
        description = "Common not-so-common functions for lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-filter" = callPackage
@@ -162411,7 +162411,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Special takes and drops on lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-fusion-probe" = callPackage
@@ -162423,8 +162423,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162436,7 +162436,7 @@ self: {
        sha256 = "0w9f68cr4k0p8zl81y8ax19i6ypzks0y27hdlz71wwmgn5v2y63l";
        libraryHaskellDepends = [ base ];
        description = "Functions for grouping a list into sublists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-mux" = callPackage
@@ -162447,8 +162447,8 @@ self: {
        sha256 = "147zb156g79a5p1w0b9vcvjy5x7nsrhng5rgjqq3cy3xpbam4nys";
        libraryHaskellDepends = [ base ];
        description = "List Multiplexing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162461,7 +162461,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Predicates on lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-prompt" = callPackage
@@ -162481,8 +162481,8 @@ self: {
          ansi-terminal base data-default hspec stm terminal-size vty
        ];
        description = "A simple list prompt UI for the terminal";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162509,8 +162509,8 @@ self: {
          MissingH tasty tasty-hunit tasty-quickcheck
        ];
        description = "List all remote forwards for mail accounts stored in a SQL database";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162522,7 +162522,7 @@ self: {
        sha256 = "0mb2kwj3gvykwh0iywwzqdnma27nxs1hl1rvnp3qxi893p4ikyiw";
        libraryHaskellDepends = [ base ];
        description = "Easily and clearly create lists with only one element in them";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "list-t" = callPackage
@@ -162538,7 +162538,7 @@ self: {
        ];
        testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
        description = "ListT done right";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -162556,8 +162556,8 @@ self: {
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
        description = "An \"attoparsec\" adapter for \"list-t\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162581,8 +162581,8 @@ self: {
          list-t-attoparsec list-t-text text xml-types
        ];
        description = "Streaming HTML parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162598,8 +162598,8 @@ self: {
          base-prelude bytestring http-client list-t mtl-prelude
        ];
        description = "A streaming HTTP client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162616,7 +162616,7 @@ self: {
          resource-pool stm
        ];
        description = "A \"libcurl\"-based streaming HTTP client";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "list-t-text" = callPackage
@@ -162635,8 +162635,8 @@ self: {
          quickcheck-instances text transformers
        ];
        description = "A streaming text codec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162649,7 +162649,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
        description = "List monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-tries" = callPackage
@@ -162667,7 +162667,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Tries and Patricia tries: finite sets and maps for list keys";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "list-tuple" = callPackage
@@ -162686,7 +162686,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "List-like operations for tuples";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "list-witnesses" = callPackage
@@ -162702,8 +162702,8 @@ self: {
          vinyl
        ];
        description = "Witnesses for working with type-level lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162715,8 +162715,8 @@ self: {
        sha256 = "0sklydccvdbxnj0c79lj7pcvw5v0bkycs9zp566gdcfy08qcjq79";
        libraryHaskellDepends = [ base ];
        description = "Provides zips with default values";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162739,8 +162739,8 @@ self: {
          tasty-hedgehog tasty-hunit tasty-quickcheck transformers
        ];
        description = "A list zipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162758,8 +162758,8 @@ self: {
          servant servant-client text time transformers
        ];
        description = "A client library to the ListenBrainz project";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162771,8 +162771,8 @@ self: {
        sha256 = "0mkhnqn7wxspzxvivhaksxmxp7d6x9bazhl28nl9gck56bpa90sm";
        libraryHaskellDepends = [ base bytestring ListLike text vector ];
        description = "Extra instances of the ListLike class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162784,7 +162784,7 @@ self: {
        sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln";
        libraryHaskellDepends = [ base list-extras split ];
        description = "Functions for dealing with lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lists-flines" = callPackage
@@ -162795,7 +162795,7 @@ self: {
        sha256 = "0srpivpf43xn0zj64phq90hkrchjih92sxx984c5zx9nrrcvyxwf";
        libraryHaskellDepends = [ base ];
        description = "Additional data and structures to some 'String'-related lists";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "listsafe" = callPackage
@@ -162806,7 +162806,7 @@ self: {
        sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs";
        libraryHaskellDepends = [ base exceptions ];
        description = "Safe wrappers for partial list functions, supporting MonadThrow";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "liszt" = callPackage
@@ -162841,8 +162841,8 @@ self: {
          vector vector-th-unbox winery
        ];
        description = "Append only key-list database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162863,7 +162863,7 @@ self: {
        ];
        description = "A simple tool for literate programming";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162875,8 +162875,8 @@ self: {
        sha256 = "06n4svp0qss78l8827qmppmd63877wq01d6w9xagd10vn3c4hs2j";
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162896,8 +162896,8 @@ self: {
          unliftio-core
        ];
        description = "Basic logging based on co-log";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162914,7 +162914,7 @@ self: {
          resourcet unliftio-core
        ];
        description = "When you need just the RIO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "live-sequencer" = callPackage
@@ -162942,7 +162942,7 @@ self: {
        ];
        description = "Live coding of MIDI music";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -162965,8 +162965,8 @@ self: {
        ];
        executableHaskellDepends = [ base mvc pipes ];
        description = "Liveplotting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {andromeda = null;};
 
@@ -162978,8 +162978,8 @@ self: {
        sha256 = "0393ccnlink30492aw1gyv4jzd7rsckd8ymkm1wgbpma13vkf67h";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ picosat ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) picosat;};
 
@@ -162991,7 +162991,7 @@ self: {
        sha256 = "057bp1f1mpzlgg408b02x1bdzsixrrkcl1536nyvhp43rvxmgj61";
        libraryHaskellDepends = [ base ];
        description = "Purely functional sets and heaps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "llsd" = callPackage
@@ -163011,8 +163011,8 @@ self: {
          time utf8-string uuid
        ];
        description = "An implementation of the LLSD data system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163029,8 +163029,8 @@ self: {
          type-level
        ];
        description = "Bindings to the LLVM compiler toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163058,8 +163058,8 @@ self: {
          llvm-data-interop transformers uniplate unordered-containers
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163071,8 +163071,8 @@ self: {
        sha256 = "1f76nb85hnidp06v6lbl4aasac4h7ff9r8i054m8cnby2vc59r4n";
        libraryHaskellDepends = [ base mtl ];
        description = "FFI bindings to the LLVM compiler toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163093,8 +163093,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163106,8 +163106,8 @@ self: {
        sha256 = "07q6dvwkg7h6qkwq0a7719g82anipj2pk0xid5p24pvzssa9z22w";
        libraryHaskellDepends = [ base llvm-base ];
        description = "Utilities for bindings to the LLVM compiler toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163128,8 +163128,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163147,8 +163147,8 @@ self: {
          storable-enum storable-record tfp transformers utility-ht
        ];
        description = "Support for writing an EDSL with LLVM-JIT as target";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163167,8 +163167,8 @@ self: {
          tfp transformers unsafe utility-ht
        ];
        description = "Processor specific intrinsics for the llvm interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163194,8 +163194,8 @@ self: {
        ];
        doHaddock = false;
        description = "Utility functions for the llvm interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163210,8 +163210,8 @@ self: {
        libraryHaskellDepends = [ base enumset ];
        librarySystemDepends = [ LLVM ];
        description = "FFI bindings to the LLVM compiler toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {LLVM = null;};
 
@@ -163229,8 +163229,8 @@ self: {
          base bytestring containers regex-posix utility-ht
        ];
        description = "Tools for maintaining the llvm-ffi package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163257,8 +163257,8 @@ self: {
          transformers transformers-compat
        ];
        description = "General purpose LLVM bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {llvm-config = null;};
 
@@ -163279,8 +163279,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163304,8 +163304,8 @@ self: {
          base containers HUnit llvm-general-pure tasty tasty-hunit
        ];
        description = "QuasiQuoting llvm code for llvm-general";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163332,7 +163332,7 @@ self: {
          transformers
        ];
        description = "General purpose LLVM bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {llvm-config = null;};
 
   "llvm-hs-pretty" = callPackage
@@ -163352,7 +163352,7 @@ self: {
          tasty-hspec tasty-hunit text transformers
        ];
        description = "A pretty printer for LLVM IR";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "llvm-hs-pure" = callPackage
@@ -163372,7 +163372,7 @@ self: {
          base containers mtl tasty tasty-hunit tasty-quickcheck transformers
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "llvm-ht" = callPackage
@@ -163387,8 +163387,8 @@ self: {
          base bytestring directory mtl process type-level
        ];
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163407,8 +163407,8 @@ self: {
          base Cabal explicit-exception process transformers utility-ht
        ];
        description = "Generate Pkg-Config configuration file for LLVM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163425,8 +163425,8 @@ self: {
          template-haskell th-abstraction
        ];
        description = "A pretty printing library inspired by the llvm binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163453,8 +163453,8 @@ self: {
          base bytestring directory filepath llvm-pretty process
        ];
        description = "LLVM bitcode parsing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163476,8 +163476,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tfp utility-ht ];
        doHaddock = false;
        description = "Bindings to the LLVM compiler toolkit using type families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163505,8 +163505,8 @@ self: {
          process-conduit unordered-containers
        ];
        description = "Useful tools built on llvm-analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163519,7 +163519,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ lmdb ];
        description = "Lightning MDB bindings";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {inherit (pkgs) lmdb;};
 
   "lmdb-high-level" = callPackage
@@ -163541,7 +163541,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Higher level API for working with LMDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lmdb-simple" = callPackage
@@ -163556,7 +163556,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Simple API for LMDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lmonad" = callPackage
@@ -163576,8 +163576,8 @@ self: {
          transformers-base
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163598,8 +163598,8 @@ self: {
          yesod-persistent
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163611,8 +163611,8 @@ self: {
        sha256 = "1vszir1b79fdn545k3k86mgqhivyg8s5vv5v24y4cp4cc47aiwmi";
        libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
        description = "Client-side load balancing utilities";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163629,7 +163629,7 @@ self: {
          base directory doctest hspec parsec temporary
        ];
        description = "Load environment variables from a file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "load-font" = callPackage
@@ -163645,8 +163645,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ c2hs ];
        description = "A cross platform library for loading bundled fonts into your application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163658,7 +163658,7 @@ self: {
        sha256 = "13q2yxqyzkh099jwz32plmdc71p4w2gkajx5bbi3fkvl2gylqlk6";
        libraryHaskellDepends = [ base ];
        description = "Load average parsing from /proc/loadavg and bindings to getloadavg (3)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "loc" = callPackage
@@ -163670,7 +163670,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hedgehog ];
        description = "Types representing line and column positions and ranges in text files";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "loc-test" = callPackage
@@ -163681,7 +163681,7 @@ self: {
        sha256 = "0jg6p0lfd5xgrwbmlskj5f1x8l5b0b3dqh460ds2nii8isccgvcq";
        libraryHaskellDepends = [ base containers hedgehog loc ];
        description = "Test-related utilities related to the /loc/ package";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "local-address" = callPackage
@@ -163692,8 +163692,8 @@ self: {
        sha256 = "1846lhs0jc8finxcp1hfgifzs7hwzzxvmmv03laxzl63p5h2k8x9";
        libraryHaskellDepends = [ base network ];
        description = "Functions to get local interface address";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163711,7 +163711,7 @@ self: {
        ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163723,7 +163723,7 @@ self: {
        sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd";
        libraryHaskellDepends = [ base containers text transformers ];
        description = "Library for localization (l10n)";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "localize" = callPackage
@@ -163741,8 +163741,8 @@ self: {
          transformers
        ];
        description = "GNU Gettext-based messages localization library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163754,8 +163754,8 @@ self: {
        sha256 = "15mkhpp2r9l94qkqdxfc0llw9nbxcj8n3a70qs5lmv416a1i4qk2";
        libraryHaskellDepends = [ base text ];
        description = "Source location helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163768,8 +163768,8 @@ self: {
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Location-aware variants of partial functions";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ gridaphobe ];
      }) {};
 
   "located-monad-logger" = callPackage
@@ -163780,8 +163780,8 @@ self: {
        sha256 = "1xkckg3qgqrqmkli9d6cbzqf5aanqpbxchy650yflpjygwapn4xn";
        libraryHaskellDepends = [ base monad-logger text ];
        description = "Location-aware logging without Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163800,7 +163800,7 @@ self: {
          base bytestring containers cryptonite hspec HUnit QuickCheck
        ];
        description = "Human exchangable identifiers and locators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "loch" = callPackage
@@ -163814,8 +163814,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163827,7 +163827,7 @@ self: {
        sha256 = "1hvdkcyrlnv65q8x8h0441x30wr9bbfbg3961xd3fy9an5r961fc";
        libraryHaskellDepends = [ base pretty template-haskell ];
        description = "Support for precise error locations in source files (Template Haskell version)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lock-file" = callPackage
@@ -163847,7 +163847,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Provide exclusive access to a resource using lock file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "locked-poll" = callPackage
@@ -163868,8 +163868,8 @@ self: {
          regex-genex tasty tasty-golden tasty-hunit tasty-quickcheck time
        ];
        description = "Very simple poll lock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163890,7 +163890,7 @@ self: {
          ghc-prim HUnit test-framework test-framework-hunit
        ];
        description = "Michael and Scott lock-free queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lockpool" = callPackage
@@ -163901,7 +163901,7 @@ self: {
        sha256 = "004lipzc3rbvixhmx4ssngmpsp3pcrdd1hw9byqmi0jp4xm17xxi";
        libraryHaskellDepends = [ base clock stm ];
        description = "set a maximum on the number of concurrent actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log" = callPackage
@@ -163927,8 +163927,8 @@ self: {
          transformers-base
        ];
        description = "Structured logging solution with multiple backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -163948,7 +163948,7 @@ self: {
          transformers-base unliftio-core unordered-containers
        ];
        description = "Structured logging solution (base package)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log-domain" = callPackage
@@ -163971,7 +163971,7 @@ self: {
          base doctest generic-deriving semigroups simple-reflect
        ];
        description = "Log-domain arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log-effect" = callPackage
@@ -163993,7 +163993,7 @@ self: {
          transformers-base
        ];
        description = "An extensible log effect using extensible-effects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "log-effect-syslog" = callPackage
@@ -164009,7 +164009,7 @@ self: {
          transformers-base
        ];
        description = "Syslog functions for log-effect";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log-elasticsearch" = callPackage
@@ -164029,7 +164029,7 @@ self: {
          vector
        ];
        description = "Structured logging solution (Elasticsearch back end)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "log-postgres" = callPackage
@@ -164050,8 +164050,8 @@ self: {
          text-show time unordered-containers vector
        ];
        description = "Structured logging solution (PostgreSQL back end)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164074,8 +164074,8 @@ self: {
          unjson vector wai warp
        ];
        description = "Utils for working with logs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164111,8 +164111,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Flexible, configurable, monadic and pretty logging";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164127,7 +164127,7 @@ self: {
        executableHaskellDepends = [ base containers json parsec ];
        description = "Turn log file records into JSON";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164158,8 +164158,8 @@ self: {
          time vformat vformat-aeson vformat-time yaml
        ];
        description = "A python logging style log library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164179,8 +164179,8 @@ self: {
          base bytestring fast-logger hspec uuid-types
        ];
        description = "Request logger middleware for Logentries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164192,7 +164192,7 @@ self: {
        sha256 = "10kza99pzs0ajn6xqd66sm059xp43i2sl0mnd8257q1av1qvsx7p";
        libraryHaskellDepends = [ array base ];
        description = "Log-domain floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "logger" = callPackage
@@ -164209,8 +164209,8 @@ self: {
          time-locale-compat transformers transformers-compat unagi-chan
        ];
        description = "Fast & extensible logging framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164229,7 +164229,7 @@ self: {
        ];
        executableHaskellDepends = [ base protolude stm ];
        description = "Run FastLogger in a thread and direct all queued messages to it";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "logging" = callPackage
@@ -164247,7 +164247,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec unix ];
        description = "Simplified logging in IO for application writers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logging-effect" = callPackage
@@ -164270,7 +164270,7 @@ self: {
          prettyprinter text time
        ];
        description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -164289,8 +164289,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Supplemental packages for `logging-effect`";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164309,8 +164309,8 @@ self: {
        ];
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "TH splices to augment log messages with file info";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164329,8 +164329,8 @@ self: {
        ];
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "Handy logging handler combinators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164343,7 +164343,7 @@ self: {
        libraryHaskellDepends = [ base call-stack transformers ];
        testHaskellDepends = [ base hspec ];
        description = "Simple logging abstraction that allows multiple back-ends";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logging-facade-journald" = callPackage
@@ -164362,7 +164362,7 @@ self: {
          unordered-containers
        ];
        description = "Journald back-end for logging-facade";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logging-facade-syslog" = callPackage
@@ -164373,8 +164373,8 @@ self: {
        sha256 = "1acfkmr3cgprij9sfa0hfqyni6s8py22s3n0xa8qhy3syz1j72zb";
        libraryHaskellDepends = [ base hsyslog logging-facade ];
        description = "A logging back-end to syslog(3) for the logging-facade library";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "logic-TPTP" = callPackage
@@ -164421,8 +164421,8 @@ self: {
          PropLogic safe set-extra syb
        ];
        description = "Framework for propositional and first order logic, theorem proving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164434,8 +164434,8 @@ self: {
        sha256 = "061x6g92334m2776xclh8mcbjind3l595pggc0g7yi4qzs31zbdc";
        libraryHaskellDepends = [ base logict transformers ];
        description = "Backtracking mutable references in the ST and IO monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164450,8 +164450,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base mtl tasty tasty-hunit ];
        description = "A backtracking logic-programming monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "logict" = callPackage
@@ -164465,7 +164465,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ async base mtl tasty tasty-hunit ];
        description = "A backtracking logic-programming monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "logict-state" = callPackage
@@ -164476,8 +164476,8 @@ self: {
        sha256 = "17rx8rj6m4jny52zh4daw6ac9pyp0yns470nm0bf2z9y69mfr63g";
        libraryHaskellDepends = [ base logict mtl transformers ];
        description = "Library for logic programming based on haskell package logict";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164490,7 +164490,7 @@ self: {
        libraryHaskellDepends = [ base deepseq text ];
        testHaskellDepends = [ base text ];
        description = "Log Level Datatype";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logplex-parse" = callPackage
@@ -164502,8 +164502,8 @@ self: {
        libraryHaskellDepends = [ base iso8601-time parsec text time ];
        testHaskellDepends = [ base hspec time ];
        description = "Parse Heroku application/logplex documents";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164516,7 +164516,7 @@ self: {
        libraryHaskellDepends = [ base hsyslog logging-facade time ];
        testHaskellDepends = [ base hspec hsyslog logging-facade time ];
        description = "A logging framework for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "logstash" = callPackage
@@ -164534,7 +164534,7 @@ self: {
          stm-chans time tls unbounded-delays unliftio
        ];
        description = "Logstash client library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lojban" = callPackage
@@ -164556,8 +164556,8 @@ self: {
        ];
        executableHaskellDepends = [ haskell98 ];
        description = "Useful utilities for the Lojban language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164572,8 +164572,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "lojban parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164588,8 +164588,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164603,8 +164603,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base lojbanParser yjtools ];
        description = "Prolog with lojban";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164633,8 +164633,8 @@ self: {
        ];
        testHaskellDepends = [ base test-framework ];
        description = "A library for lattice cryptography";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164655,8 +164655,8 @@ self: {
          test-framework time
        ];
        description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164673,8 +164673,8 @@ self: {
          MonadRandom split statistics
        ];
        description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164696,8 +164696,8 @@ self: {
          text-format transformers
        ];
        description = "Calculus for LOL (λω language)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164717,8 +164717,8 @@ self: {
        testHaskellDepends = [ base lol lol-apps test-framework ];
        benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ];
        description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164738,8 +164738,8 @@ self: {
        testHaskellDepends = [ base lol-tests ];
        benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164759,8 +164759,8 @@ self: {
        ];
        testHaskellDepends = [ base lol test-framework ];
        description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164785,8 +164785,8 @@ self: {
          monad-classes tasty tasty-hunit text text-format transformers
        ];
        description = "Type inferencer for LOL (λω language)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164804,8 +164804,8 @@ self: {
          template utf8-string
        ];
        description = "A minimum web dev DSL in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164817,7 +164817,7 @@ self: {
        sha256 = "0byrpngsh1a8w9n5nbw9lfmj4nmh33avzfh883zw9ya10pfa7x3g";
        libraryHaskellDepends = [ base integer-gmp ];
        description = "FFI bindings for C long double";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "longboi" = callPackage
@@ -164828,8 +164828,8 @@ self: {
        sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977";
        libraryHaskellDepends = [ base ];
        description = "Dependently-typed linked list implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164861,8 +164861,8 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell
        ];
        description = "Fast Brute-force search using parallelism";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164877,8 +164877,8 @@ self: {
        libraryHaskellDepends = [ base primitive template-haskell ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Statically generate lookup tables using Template Haskell";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164895,7 +164895,7 @@ self: {
          base criterion foldl mtl random vector
        ];
        description = "Fast loops (for when GHC can't optimize forM_)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "loop-effin" = callPackage
@@ -164906,8 +164906,8 @@ self: {
        sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52";
        libraryHaskellDepends = [ base effin ];
        description = "control-monad-loop port for effin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164919,8 +164919,8 @@ self: {
        sha256 = "1yvw91gn1iyw72rbq455zzrbb3pq8ph9cv1c6800qzjyxx0694bd";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformer supporting various styles of while loop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164938,8 +164938,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "inline self-recursive definitions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164957,8 +164957,8 @@ self: {
        testHaskellDepends = [
          aeson base hspec optparse-applicative text time unliftio
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164976,8 +164976,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -164996,8 +164996,8 @@ self: {
          process random
        ];
        description = "Find all biological feedback loops within an ecosystem graph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165038,8 +165038,8 @@ self: {
          unordered-containers utf8-string wai-logger xml-conduit yaml
        ];
        description = "A command line interface to online radios";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165054,8 +165054,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Library for generating filler text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165078,8 +165078,8 @@ self: {
          with-utf8
        ];
        description = "EDSL for the Michelson Language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165093,8 +165093,8 @@ self: {
        librarySystemDepends = [ loris ];
        libraryToolDepends = [ c2hs ];
        description = "interface to Loris API";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {loris = null;};
 
@@ -165113,8 +165113,8 @@ self: {
          process split
        ];
        description = "Minecraft 1.7 server proxy that answers to queries when the server is offline";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165133,7 +165133,7 @@ self: {
        ];
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165147,7 +165147,7 @@ self: {
          base bytestring JuicyPixels text vector
        ];
        description = "Turning images into text using Braille font";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "loup" = callPackage
@@ -165167,8 +165167,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165180,8 +165180,8 @@ self: {
        sha256 = "1xwxsg4bz83xg4sjm69vz7zaxi7wjnn2xlqs8gha78ylpq105szw";
        libraryHaskellDepends = [ base gl linear vector ];
        description = "Basic gl wrapper and reference";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165194,7 +165194,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Low dimensional linear algebra";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lp-diagrams" = callPackage
@@ -165212,7 +165212,7 @@ self: {
          vector
        ];
        description = "An EDSL for diagrams based based on linear constraints";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "lp-diagrams-svg" = callPackage
@@ -165232,7 +165232,7 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165244,7 +165244,7 @@ self: {
        sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw";
        libraryHaskellDepends = [ base containers contravariant ];
        description = "a simple, pure LRU cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lrucaching" = callPackage
@@ -165264,7 +165264,7 @@ self: {
          base containers deepseq hashable hspec QuickCheck transformers
        ];
        description = "LRU cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lrucaching-haxl" = callPackage
@@ -165275,7 +165275,7 @@ self: {
        sha256 = "0pn2f671ak1grzjigyvan5wagh9vyqhsz86jfy1z281rd2pw4gk2";
        libraryHaskellDepends = [ base hashable haxl lrucaching psqueues ];
        description = "Combine lrucaching and haxl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ls-usb" = callPackage
@@ -165293,8 +165293,8 @@ self: {
          usb-id-database vector
        ];
        description = "List USB devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165312,8 +165312,8 @@ self: {
          base bytestring Cabal containers directory filepath pretty process
        ];
        description = "List exported modules from a set of .cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165344,7 +165344,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lsp-test" = callPackage
@@ -165371,7 +165371,7 @@ self: {
          text unordered-containers
        ];
        description = "Functional test framework for LSP servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lsp-test_0_11_0_7" = callPackage
@@ -165398,8 +165398,8 @@ self: {
          text unordered-containers
        ];
        description = "Functional test framework for LSP servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lsp-types" = callPackage
@@ -165420,7 +165420,7 @@ self: {
          temporary text unordered-containers
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lss" = callPackage
@@ -165440,8 +165440,8 @@ self: {
          language-css-attoparsec text
        ];
        description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {language-css-attoparsec = null;};
 
@@ -165457,8 +165457,8 @@ self: {
          base haskell98 uu-parsinglib wx wxcore
        ];
        description = "Paint an L-System Grammar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165490,7 +165490,7 @@ self: {
          text transformers unordered-containers
        ];
        description = "Parameterized file evaluator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lti13" = callPackage
@@ -165510,8 +165510,8 @@ self: {
          aeson base bytestring file-embed hspec QuickCheck text th-utilities
        ];
        description = "Core functionality for LTI 1.3.";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165531,7 +165531,7 @@ self: {
          wai wai-extra xml-conduit xml-hamlet yesod-core
        ];
        description = "Partial implementation of a service provider for LTI 1.1.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ltk" = callPackage
@@ -165552,7 +165552,7 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Leksah tool kit";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk3;};
 
@@ -165564,7 +165564,7 @@ self: {
        sha256 = "0h3jxngsdmakcr35zapxjaykjsqs44lxxk86d5i4rg0gi0i9qw3g";
        libraryHaskellDepends = [ base vcd ];
        description = "Using linear temporal logic (LTL) to verify embedded software and hardware";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lua-bc" = callPackage
@@ -165582,8 +165582,8 @@ self: {
          vector
        ];
        description = "Lua bytecode parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165600,7 +165600,7 @@ self: {
          vector
        ];
        description = "Library for loading Lua bytecode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "luachunk" = callPackage
@@ -165616,8 +165616,8 @@ self: {
          text
        ];
        description = "Library functions for reading and writing Lua chunks";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165639,8 +165639,8 @@ self: {
          text-binary
        ];
        description = "Helpers for Haskell integration with Lua";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165652,7 +165652,7 @@ self: {
        sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h";
        libraryHaskellDepends = [ base unamb ];
        description = "information operators: least upper bound (lub) and greatest lower bound (glb)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lucid" = callPackage
@@ -165677,7 +165677,7 @@ self: {
          base blaze-builder bytestring criterion deepseq text transformers
        ];
        description = "Clear to write, read and edit DSL for HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lucid-cdn" = callPackage
@@ -165688,7 +165688,7 @@ self: {
        sha256 = "119d92xc047r98pw0phxplm57nc2jdjz6smkas9hr95mck0d16db";
        libraryHaskellDepends = [ base lucid ];
        description = "Curated list of CDN imports for lucid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lucid-colonnade" = callPackage
@@ -165699,8 +165699,8 @@ self: {
        sha256 = "0gbpfh1ky5pq0f0rz619hxfgll4yj0ky056dvrvq0s741l3gnhv8";
        libraryHaskellDepends = [ base colonnade lucid text ];
        description = "Helper functions for using lucid with colonnade";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165717,7 +165717,7 @@ self: {
        ];
        testHaskellDepends = [ base directory lucid ];
        description = "Generate more HTML with Lucid - Bootstrap, Rdash, Vega-Lite, Leaflet JS, Email";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "lucid-foundation" = callPackage
@@ -165733,7 +165733,7 @@ self: {
          base hspec QuickCheck quickcheck-instances
        ];
        description = "Basic Zurb Foundation API in Lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lucid-svg" = callPackage
@@ -165746,7 +165746,7 @@ self: {
          base blaze-builder lucid text transformers
        ];
        description = "DSL for SVG using lucid for HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lucienne" = callPackage
@@ -165768,7 +165768,7 @@ self: {
        ];
        description = "Server side feed aggregator/reader";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165780,8 +165780,8 @@ self: {
        sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz";
        libraryHaskellDepends = [ base digits QuickCheck ];
        description = "An implementation of Luhn's check digit algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165797,8 +165797,8 @@ self: {
          base containers haskell98 haskgame MaybeT mtl SDL
        ];
        description = "Purely FunctionaL User Interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165813,8 +165813,8 @@ self: {
          aeson base http-client lens text vector wreq
        ];
        description = "An unofficial client for the LUIS NLP service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165828,8 +165828,8 @@ self: {
        libraryHaskellDepends = [ air base bytestring libffi ];
        librarySystemDepends = [ objc ];
        description = "Simple ObjectiveC runtime binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {objc = null;};
 
@@ -165868,7 +165868,7 @@ self: {
          base contravariant exceptions mtl prettyprinter text
        ];
        description = "Trek through your code forest and make logs";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "luminance" = callPackage
@@ -165884,8 +165884,8 @@ self: {
          semigroups transformers vector void
        ];
        description = "Type-safe, type-level and stateless graphics framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165904,8 +165904,8 @@ self: {
          resourcet transformers
        ];
        description = "Luminance samples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165919,8 +165919,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell-src-exts text vector ];
        description = "Create ctags compatible tags files for Haskell programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165933,8 +165933,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec transformers ];
        testHaskellDepends = [ base mtl parsec ];
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165962,8 +165962,8 @@ self: {
          text time transformers vector
        ];
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -165986,8 +165986,8 @@ self: {
          array base containers directory filepath parsec wl-pprint
        ];
        description = "The Lazy Virtual Machine (LVM)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166011,8 +166011,8 @@ self: {
        sha256 = "0nxwmbcfbwpd4dx1zmcdxrb9n7q12v17khi4h4qi7hiwy2zxk8wv";
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        description = "High level Haskell bindings to LXC (Linux containers)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166042,8 +166042,8 @@ self: {
          base exceptions hspec hspec-core random text turtle uuid
        ];
        description = "LXD client written in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166064,7 +166064,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text yaml
        ];
        description = "Read the configuration file of the standard LXD client";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "lye" = callPackage
@@ -166081,8 +166081,8 @@ self: {
          base containers free HCodecs lens parsers transformers trifecta
        ];
        description = "A Lilypond-compiling music box";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166100,7 +166100,7 @@ self: {
          base bytestring criterion deepseq quicklz snappy
        ];
        description = "LZ4 compression for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lz4-bytes" = callPackage
@@ -166116,8 +166116,8 @@ self: {
          base byteslice primitive tasty tasty-quickcheck
        ];
        description = "Bindings to LZ4";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166141,8 +166141,8 @@ self: {
          base bytestring bytestring-arbitrary conduit QuickCheck resourcet
        ];
        description = "LZ4 compression for conduits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166171,8 +166171,8 @@ self: {
          unliftio-core
        ];
        description = "Conduit implementing the official LZ4 frame streaming format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166191,7 +166191,7 @@ self: {
          base bytestring criterion filepath temporary
        ];
        description = "lz4 bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lzip" = callPackage
@@ -166202,8 +166202,8 @@ self: {
        sha256 = "0ccwckq0gkrnahf224s59gsdd9baay1dfc8fh1kz2r87rbygzsk7";
        libraryHaskellDepends = [ base bytestring ];
        description = "Lzip compression / Lzlib bindings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166224,7 +166224,7 @@ self: {
          base bytestring criterion filepath temporary
        ];
        description = "lzlib bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lzma" = callPackage
@@ -166243,7 +166243,7 @@ self: {
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "LZMA/XZ compression and decompression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
@@ -166254,8 +166254,8 @@ self: {
        sha256 = "1mczl0vb4zsh9y9wng30wb645crzxrhh3c19qiqhwarsxyw9rv8a";
        doHaddock = false;
        description = "liblzma C library and headers for use by LZMA bindings";
-       license = stdenv.lib.licenses.publicDomain;
-       platforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       platforms = lib.platforms.none;
      }) {};
 
   "lzma-conduit" = callPackage
@@ -166275,7 +166275,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Conduit interface for lzma/xz compression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "lzma-enumerator" = callPackage
@@ -166296,8 +166296,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Enumerator interface for lzma/xz compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) lzma;};
 
@@ -166318,8 +166318,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "IO-Streams interface for lzma/xz compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166335,8 +166335,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "minilzo bundled for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166353,8 +166353,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring Cabal ];
        description = "Library for talking to the mDNSResponder daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166371,8 +166371,8 @@ self: {
          base containers template-haskell text vector
        ];
        description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166384,8 +166384,8 @@ self: {
        sha256 = "0zhjpszj8qm1kqx2q7g9a41crbmqvqis7qlx65a1l36ywk78gnyd";
        libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166406,8 +166406,8 @@ self: {
          saltine transformers
        ];
        description = "A toolkit for working with macaroons";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166434,7 +166434,7 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring hspec ];
        description = "Macbeth - A beautiful and minimalistic FICS client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166448,7 +166448,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base binary parsec process ];
        description = "Obtain the host MAC address on *NIX and Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "machination" = callPackage
@@ -166460,7 +166460,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Plot charts as unicode strings";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "machinecell" = callPackage
@@ -166478,8 +166478,8 @@ self: {
          base doctest hspec mtl profunctors QuickCheck semigroups
        ];
        description = "Arrow based stream transducers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166504,7 +166504,7 @@ self: {
          base conduit criterion mtl pipes streaming
        ];
        description = "Networked stream transducers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "machines-amazonka" = callPackage
@@ -166525,8 +166525,8 @@ self: {
          monad-control mtl resourcet stm stm-containers time transformers
        ];
        description = "Machine transducers for Amazonka calls";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166547,8 +166547,8 @@ self: {
          attoparsec base bytestring machines tasty tasty-hunit text
        ];
        description = "Parse machines streams with attoparsec parsers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166560,8 +166560,8 @@ self: {
        sha256 = "0lh6q99xfmxl53gkxlrbjh1pfbkff8faxr9fycks98cfcmnlbzv0";
        libraryHaskellDepends = [ base binary bytestring machines ];
        description = "Binary utilities for the machines library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166573,8 +166573,8 @@ self: {
        sha256 = "1rlc5pr70z899zjs2q5p7qy5pm9gjpnm9pww934cxmlwrp1sck9b";
        libraryHaskellDepends = [ base bytestring machines ];
        description = "ByteString support for machines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166590,8 +166590,8 @@ self: {
          base directory filepath machines machines-io transformers
        ];
        description = "Directory (system) utilities for the machines library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166603,8 +166603,8 @@ self: {
        sha256 = "1n8skhf48q7dissrq7hpgsccjgh1hspjqh331m58z8id9xry133g";
        libraryHaskellDepends = [ base bytestring machines text ];
        description = "Transcode encodings with machines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166620,8 +166620,8 @@ self: {
          base bytestring chunked-data machines transformers
        ];
        description = "IO utilities for the machines library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166636,8 +166636,8 @@ self: {
          base chunked-data machines machines-io process
        ];
        description = "Process (system) utilities for the machines library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166652,8 +166652,8 @@ self: {
          base basic-prelude machines streaming-commons
        ];
        description = "Decompression support for machines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166666,8 +166666,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for Mach-O object format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166691,7 +166691,7 @@ self: {
          unordered-containers
        ];
        description = "An API client library for Mackerel";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "maclight" = callPackage
@@ -166715,8 +166715,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Control screen and keyboard backlights on MACs under Linux";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166732,8 +166732,8 @@ self: {
          base containers managed mtl profunctors tagged transformers
        ];
        description = "Haskell bindings to C-based Mac OS SDK frameworks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166753,8 +166753,8 @@ self: {
          filepath graph-visit mtl process transformers unix
        ];
        description = "Make a macosx app standalone deployable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166779,8 +166779,8 @@ self: {
          process unix uuid
        ];
        description = "Alternative rm command for macOS that remove files/dirs to the system trash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166803,7 +166803,7 @@ self: {
          random-shuffle raw-strings-qq transformers
        ];
        description = "Monadic DSL for building constraint solvers using basic propagators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "madlang" = callPackage
@@ -166833,8 +166833,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-megaparsec text ];
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
        description = "Randomized templating language DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166850,8 +166850,8 @@ self: {
        executableHaskellDepends = [ array base containers mtl random ];
        executableSystemDepends = [ ncurses ];
        description = "Rogue-like";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -166864,7 +166864,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ file ];
        description = "Interface to C file/magic library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) file;};
 
   "magic-tyfams" = callPackage
@@ -166875,8 +166875,8 @@ self: {
        sha256 = "1vgbbmv2807cyi6hh2137nw6dldn84qall828d64lg2ja6zj6xii";
        libraryHaskellDepends = [ base ghc ghc-tcplugins-extra syb ];
        description = "Write plugins for magic type families with ease";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166907,8 +166907,8 @@ self: {
          spake2 stm tasty tasty-hedgehog tasty-hspec
        ];
        description = "Interact with Magic Wormhole";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166939,8 +166939,8 @@ self: {
          wai-middleware-metrics
        ];
        description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166958,8 +166958,8 @@ self: {
          base comfort-array lapack transformers utility-ht
        ];
        description = "Compute solutions for Magico puzzle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166973,8 +166973,8 @@ self: {
        libraryHaskellDepends = [ base deepseq profunctors semigroups ];
        testHaskellDepends = [ base ghc-prim ];
        description = "magma is an algebraic structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -166986,7 +166986,7 @@ self: {
        sha256 = "006axj7hwdiq3gyxx9rpqz9ji1g7xpal7j8wrlgfa2as1s73076b";
        libraryHaskellDepends = [ base ];
        description = "Magma-like objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mahoro" = callPackage
@@ -167007,7 +167007,7 @@ self: {
        ];
        description = "ImageBoards to XMPP gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167029,8 +167029,8 @@ self: {
          text
        ];
        description = "A simple static web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167053,8 +167053,8 @@ self: {
          optparse-applicative resource-pool time
        ];
        description = "Preconfigured email connection pool on top of smtp";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167070,8 +167070,8 @@ self: {
          aeson base bytestring mtl text time xml zip-archive zlib
        ];
        description = "A parser library for DMARC and SMTP TLS reports";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167096,7 +167096,7 @@ self: {
          tasty-hunit
        ];
        description = "Count mailboxes in a SQL database";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "mailchimp" = callPackage
@@ -167114,8 +167114,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Bindings for the MailChimp API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167134,8 +167134,8 @@ self: {
          text transformers wai-extra
        ];
        description = "MailChimp subscription request handler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167155,8 +167155,8 @@ self: {
          these time transformers unordered-containers wreq
        ];
        description = "API binding for Mailgun";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167173,7 +167173,7 @@ self: {
          base bytestring hspec hspec-core QuickCheck text
        ];
        description = "Capture stdout/stderr/exit code, and replace stdin of your main function";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mainland-pretty" = callPackage
@@ -167186,7 +167186,7 @@ self: {
          base containers srcloc text transformers
        ];
        description = "Pretty printing designed for printing source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "majordomo" = callPackage
@@ -167206,8 +167206,8 @@ self: {
          base bytestring cmdargs threads unix
        ];
        description = "Majordomo protocol for ZeroMQ";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167219,8 +167219,8 @@ self: {
        sha256 = "1442xw8i9jgk3hqavqikks98qs9l3i37lk63xyzpdgnlkfqapzka";
        libraryHaskellDepends = [ haskell2010 ];
        description = "Boyer-Moore Majority Vote Algorithm";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167239,7 +167239,7 @@ self: {
        ];
        description = "Change duplicated files into hard-links";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167251,8 +167251,8 @@ self: {
        sha256 = "1bls9gfdlwvaq90g2dllc4vb2rrp6zplx12g35byx6xvwj26lxra";
        libraryHaskellDepends = [ base mono-traversable ];
        description = "Make a MonoFoldable type into an ordinary Foldable type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167273,8 +167273,8 @@ self: {
          github haskeline lens lens-datetime mtl process text time
        ];
        description = "Make a cabalized package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167286,8 +167286,8 @@ self: {
        sha256 = "0sc2fa45a046lw5x5z839gb1zk0d5nj663ghxajiclm6iw65kl2n";
        libraryHaskellDepends = [ base directory filepath HSH process ];
        description = "Helper for writing redo scripts in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167305,8 +167305,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Simple Makefile parser and generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167334,8 +167334,8 @@ self: {
          unordered-containers
        ];
        description = "Database migration and testing as a library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167351,7 +167351,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Static Website Generator in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "managed" = callPackage
@@ -167362,7 +167362,7 @@ self: {
        sha256 = "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad for managed values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "manatee" = callPackage
@@ -167382,8 +167382,8 @@ self: {
          template-haskell text unix utf8-string
        ];
        description = "The Haskell/Gtk+ Integrated Live Environment";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167409,8 +167409,8 @@ self: {
        ];
        doHaddock = false;
        description = "Virtual package to install all Manatee packages";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "manatee-anything" = callPackage
@@ -167430,8 +167430,8 @@ self: {
          split stm text unix utf8-string
        ];
        description = "Multithread interactive input/search framework for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167451,8 +167451,8 @@ self: {
          mtl stm text utf8-string webkit
        ];
        description = "Browser extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "manatee-core" = callPackage
@@ -167475,8 +167475,8 @@ self: {
          template-haskell text time unix utf8-string
        ];
        description = "The core of Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167499,8 +167499,8 @@ self: {
          old-time regex-tdfa stm template-haskell text utf8-string
        ];
        description = "Download Manager extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167521,8 +167521,8 @@ self: {
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
        ];
        description = "Editor extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167543,8 +167543,8 @@ self: {
          manatee-core mtl old-locale old-time stm text utf8-string
        ];
        description = "File manager extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167565,8 +167565,8 @@ self: {
          gtkimageview manatee-core regex-tdfa stm text utf8-string
        ];
        description = "Image viewer extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167591,8 +167591,8 @@ self: {
          regex-posix split stm template-haskell text unix utf8-string
        ];
        description = "IRC client extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167614,8 +167614,8 @@ self: {
          text time unix utf8-string
        ];
        description = "Mplayer client extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167636,8 +167636,8 @@ self: {
          manatee-core mtl poppler stm text utf8-string
        ];
        description = "PDF viewer extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167657,8 +167657,8 @@ self: {
          proc stm text
        ];
        description = "Process manager extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167679,8 +167679,8 @@ self: {
          filepath gtk manatee-core stm text utf8-string webkit
        ];
        description = "Feed reader extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "manatee-template" = callPackage
@@ -167699,8 +167699,8 @@ self: {
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
        ];
        description = "Template code to create Manatee application";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167720,8 +167720,8 @@ self: {
          stm text unix vte
        ];
        description = "Terminal Emulator extension for Manatee";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167741,8 +167741,8 @@ self: {
          filepath gtk manatee-core regex-tdfa stm text
        ];
        description = "Welcome module to help user play Manatee quickly";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167756,7 +167756,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Simple mancala game";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "mandrill" = callPackage
@@ -167780,8 +167780,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Library for interfacing with the Mandrill JSON API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167800,8 +167800,8 @@ self: {
          array base bytestring containers directory filepath GLUT hslua time
        ];
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167840,8 +167840,8 @@ self: {
          unordered-containers utf8-string vector wai warp x509-system
        ];
        description = "Bindings to the MangoPay API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167858,8 +167858,8 @@ self: {
          semigroups vector-space
        ];
        description = "Sampling random points on general manifolds";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167889,8 +167889,8 @@ self: {
          tasty-hunit tasty-quickcheck vector-space
        ];
        description = "Coordinate-free hypersurfaces";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167902,7 +167902,7 @@ self: {
        sha256 = "1bvmr0gcfj7zd0rff0qjlzjy8hqdbh52ljiiazrmqmb9abdsciq3";
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
        description = "The basic classes for the manifolds hierarchy";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "map-classes" = callPackage
@@ -167918,7 +167918,7 @@ self: {
          utility-ht
        ];
        description = "A set of classes and instances for working with key/value mappings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "map-exts" = callPackage
@@ -167932,8 +167932,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base bytestring cassava containers ];
        description = "Extensions to Data.Map";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -167961,7 +167961,7 @@ self: {
          unordered-containers
        ];
        description = "foldl wrappers for map-reduce";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "map-syntax" = callPackage
@@ -167979,7 +167979,7 @@ self: {
          base containers deepseq hspec HUnit mtl QuickCheck transformers
        ];
        description = "Syntax sugar for defining maps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mapalgebra" = callPackage
@@ -167999,8 +167999,8 @@ self: {
          tasty-hunit tasty-quickcheck vector
        ];
        description = "Efficient, polymorphic Map Algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168023,8 +168023,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        description = "A functional programming language focused around maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168040,7 +168040,7 @@ self: {
          aeson base bytestring exceptions goggles mtl req text
        ];
        description = "Bindings to the MapQuest API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "maquinitas-tidal" = callPackage
@@ -168051,7 +168051,7 @@ self: {
        sha256 = "0apr5qkir3b6mnczi50lf3p349p1q3bl1sn4yg9dls2n3m147mf7";
        libraryHaskellDepends = [ base tidal ];
        description = "library for MIDI control of hardware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "marihana" = callPackage
@@ -168067,7 +168067,7 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        testHaskellDepends = [ base directory filepath process ];
        description = "Minimal tool to make your blog in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "marionetta" = callPackage
@@ -168084,8 +168084,8 @@ self: {
          base containers gloss mtl splines vector vector-space
        ];
        description = "A study of marionetta movements";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168109,7 +168109,7 @@ self: {
          containers directory filepath hspec text transformers
        ];
        description = "Convert Markdown to HTML, with XSS protection";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "markdown-kate" = callPackage
@@ -168131,8 +168131,8 @@ self: {
          system-filepath text transformers
        ];
        description = "Convert Markdown to HTML, with XSS protection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168144,8 +168144,8 @@ self: {
        sha256 = "0cq0s9yixkg98vhsgiv1xjia2cn0b4q6gjl1wv0q7yrm26anaqcq";
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168167,7 +168167,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Literate Haskell support for Markdown";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "markdown2svg" = callPackage
@@ -168185,8 +168185,8 @@ self: {
          papillon png-file yjsvg
        ];
        description = "markdown to svg converter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168199,8 +168199,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base ];
        description = "Pretty-printing library, with scoping, based on pretty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168212,7 +168212,7 @@ self: {
        sha256 = "1ka44rvrl9ppshbjmk95997cna670bqwjsharcr9qsalp6pchmdf";
        libraryHaskellDepends = [ base ];
        description = "Simple interpreter for Markov's normal algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "markov-chain" = callPackage
@@ -168240,7 +168240,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Computations for Markov chain usage models";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "markov-processes" = callPackage
@@ -168256,8 +168256,8 @@ self: {
        ];
        testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168270,8 +168270,8 @@ self: {
        libraryHaskellDepends = [ base comonad MonadRandom ];
        testHaskellDepends = [ base HTF MonadRandom ];
        description = "Realizations of Markov chains";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168290,8 +168290,8 @@ self: {
          text transformers-base urlpath
        ];
        description = "Abstraction for HTML-embedded content";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168312,8 +168312,8 @@ self: {
          pandoc temporary text transformers webkit
        ];
        description = "A simple markup document preview (markdown, textile, reStructuredText)";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "marmalade-upload" = callPackage
@@ -168340,8 +168340,8 @@ self: {
          aeson base exceptions tasty tasty-hunit text transformers
        ];
        description = "Upload packages to Marmalade";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168376,8 +168376,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168393,8 +168393,8 @@ self: {
          array base bytestring colour gloss MonadRandom mtl random
        ];
        description = "Generates mountainous terrain using a random walk algorithm";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168410,7 +168410,7 @@ self: {
          base bytestring kan-extensions lens mtl
        ];
        description = "A ContT-based wrapper for Haskell-to-C marshalling functions";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "marvin" = callPackage
@@ -168444,8 +168444,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "A framework for modular, portable chat bots";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168462,8 +168462,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "Compile time string interpolation a la Scala and CoffeeScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168487,7 +168487,7 @@ self: {
          base configurator dlist parsek pretty
        ];
        description = "Markup language preprocessor for Haskell";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -168509,8 +168509,8 @@ self: {
          twitter-types
        ];
        description = "@minamiyama1994_bot on haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168526,7 +168526,7 @@ self: {
          array base bytestring ghc-prim integer-gmp network text
        ];
        description = "Fast and extensible bytestring builder";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "massiv" = callPackage
@@ -168548,7 +168548,7 @@ self: {
          template-haskell
        ];
        description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "massiv-io" = callPackage
@@ -168570,7 +168570,7 @@ self: {
          QuickCheck random template-haskell
        ];
        description = "Import/export of Image files into massiv Arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "massiv-persist" = callPackage
@@ -168590,8 +168590,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Compatibility of 'massiv' with 'persist'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168612,7 +168612,7 @@ self: {
          base deepseq doctest hspec QuickCheck template-haskell unliftio
        ];
        description = "Work stealing scheduler for Massiv (Массив) and other parallel applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "massiv-serialise" = callPackage
@@ -168629,8 +168629,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Compatibility of 'massiv' with 'serialise'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168653,7 +168653,7 @@ self: {
          hspec massiv mwc-random primitive QuickCheck scheduler vector
        ];
        description = "Library that contains generators, properties and tests for Massiv Array Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "master-plan" = callPackage
@@ -168677,8 +168677,8 @@ self: {
          random-shuffle text
        ];
        description = "The project management tool for hackers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168692,7 +168692,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random ];
        description = "console mastermind decypher";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matchable" = callPackage
@@ -168710,7 +168710,7 @@ self: {
        ];
        testHaskellDepends = [ base containers doctest hspec ];
        description = "A type class for Matchable Functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matchable-th" = callPackage
@@ -168726,7 +168726,7 @@ self: {
        ];
        testHaskellDepends = [ base containers matchable ];
        description = "Generates Matchable instances using TemplateHaskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matcher" = callPackage
@@ -168741,7 +168741,7 @@ self: {
          base base-prelude profunctors success text transformers
        ];
        description = "A composable abstraction for checking or converting a context value";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "matchers" = callPackage
@@ -168753,8 +168753,8 @@ self: {
        libraryHaskellDepends = [ base bytestring prednote text ];
        librarySystemDepends = [ pcre ];
        description = "Text matchers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) pcre;};
 
@@ -168767,7 +168767,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog ];
        description = "A variety of mathematical utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "math-functions" = callPackage
@@ -168790,7 +168790,7 @@ self: {
          base data-default-class gauge random vector
        ];
        description = "Collection of tools for numeric computations";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "math-grads" = callPackage
@@ -168807,8 +168807,8 @@ self: {
        ];
        testHaskellDepends = [ array base containers hspec random ];
        description = "Library containing graph data structures and graph algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168820,8 +168820,8 @@ self: {
        sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq";
        libraryHaskellDepends = [ base ];
        description = "Class for interpolation of values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168833,8 +168833,8 @@ self: {
        sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx";
        libraryHaskellDepends = [ base ];
        description = "Typeclass for metric spaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168853,7 +168853,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A library for formulating and solving math programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "math-programming-glpk" = callPackage
@@ -168875,8 +168875,8 @@ self: {
        testSystemDepends = [ glpk ];
        testToolDepends = [ tasty-discover ];
        description = "A GLPK backend to the math-programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) glpk;};
 
@@ -168892,8 +168892,8 @@ self: {
          base math-programming tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Utility functions for testing implementations of the math-programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168920,8 +168920,8 @@ self: {
          test-framework-hunit time unix url
        ];
        description = "A program for creating and managing a static weblog with LaTeX math and diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168933,7 +168933,7 @@ self: {
        sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Parse and evaluate math expressions with variables and functions";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "mathflow" = callPackage
@@ -168952,8 +168952,8 @@ self: {
          template-haskell text
        ];
        description = "Dependently typed tensorflow modeler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -168973,7 +168973,7 @@ self: {
          graphviz HTTP process safe tagsoup text
        ];
        description = "Discover your (academic) ancestors!";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "mathista" = callPackage
@@ -168996,7 +168996,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec parsec ];
        description = "A small programming language for numerical computing";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "mathlink" = callPackage
@@ -169012,8 +169012,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "Write Mathematica packages in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169036,8 +169036,8 @@ self: {
        ];
        executableSystemDepends = [ eng mat mx ];
        description = "Matlab bindings and interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {eng = null; mat = null; inherit (pkgs) mx;};
 
   "matplotlib" = callPackage
@@ -169059,7 +169059,7 @@ self: {
          tasty tasty-expected-failure tasty-golden tasty-hunit temporary
        ];
        description = "Bindings to Matplotlib; a Python plotting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrices" = callPackage
@@ -169076,7 +169076,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "native matrix based on vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrix" = callPackage
@@ -169095,7 +169095,7 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A native implementation of matrix operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrix-as-xyz" = callPackage
@@ -169112,8 +169112,8 @@ self: {
          base doctest hspec matrix parsec QuickCheck
        ];
        description = "Read and Display Jones-Faithful notation for spacegroup and planegroup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169132,7 +169132,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Optics for the \"matrix\" package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrix-market" = callPackage
@@ -169143,8 +169143,8 @@ self: {
        sha256 = "1hzpjkmwr24073mf9i13rx3n23ri0b5vmvwx8k9lxbrg1821hy28";
        libraryHaskellDepends = [ base bytestring ];
        description = "Read and write NIST Matrix Market files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169164,7 +169164,7 @@ self: {
          base directory exceptions hspec QuickCheck
        ];
        description = "Parsing and serialization functions for the NIST Matrix Market format";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "matrix-market-pure" = callPackage
@@ -169175,7 +169175,7 @@ self: {
        sha256 = "05jjf5wnxhbafrca1qfzlrxvysy5bff22mzk45pia5b9gwdhygn1";
        libraryHaskellDepends = [ array base containers ];
        description = "Pure and composable reader and writer of the Matrix Market format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matrix-sized" = callPackage
@@ -169196,8 +169196,8 @@ self: {
          tasty-quickcheck vector
        ];
        description = "Haskell matrix library with interface to C++ linear algebra libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169217,7 +169217,7 @@ self: {
          vector
        ];
        description = "Type-safe matrix operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matroid" = callPackage
@@ -169229,7 +169229,7 @@ self: {
        libraryHaskellDepends = [ base containers hspec QuickCheck ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "matroid (combinatorial pre-geometries) library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "matsuri" = callPackage
@@ -169249,7 +169249,7 @@ self: {
        ];
        description = "ncurses XMPP client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169289,8 +169289,8 @@ self: {
          Unique uuid
        ];
        description = "Terminal client for the Mattermost chat system";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "mattermost-api" = callPackage
@@ -169318,8 +169318,8 @@ self: {
          text unordered-containers
        ];
        description = "Client API for Mattermost chat system";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "mattermost-api-qc" = callPackage
@@ -169334,8 +169334,8 @@ self: {
          base containers mattermost-api QuickCheck text time
        ];
        description = "QuickCheck instances for the Mattermost client API library";
-       license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       license = lib.licenses.isc;
+       maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
   "maude" = callPackage
@@ -169350,8 +169350,8 @@ self: {
          base directory filepath process process-extras temporary text xml
        ];
        description = "An interface to the Maude rewriting system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169373,8 +169373,8 @@ self: {
          vector
        ];
        description = "Compute Maximum Entropy Distributions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169399,7 +169399,7 @@ self: {
        ];
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169422,7 +169422,7 @@ self: {
        ];
        description = "GUI for maxent-learner-hw";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169434,7 +169434,7 @@ self: {
        sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh";
        libraryHaskellDepends = [ base containers vector ];
        description = "Enumerate all maximal cliques of a graph";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "maxsharing" = callPackage
@@ -169455,8 +169455,8 @@ self: {
          process uuagc uuagc-cabal
        ];
        description = "Maximal sharing of terms in the lambda calculus with letrec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169469,7 +169469,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Simple higher order function for Maybe";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "maybench" = callPackage
@@ -169487,8 +169487,8 @@ self: {
          base benchpress Cabal directory filepath mtl process time
        ];
        description = "Automated benchmarking tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169502,7 +169502,7 @@ self: {
        editedCabalFile = "11jikczq21fnhsvr6n33qbb5q6ixbhab4s0js8n39zwgmglighz5";
        libraryHaskellDepends = [ base safe text time time-locale-compat ];
        description = "Read and write standard mailbox files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mbox-tools" = callPackage
@@ -169520,8 +169520,8 @@ self: {
          process pureMD5
        ];
        description = "A collection of tools to process mbox files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169540,7 +169540,7 @@ self: {
          utility-ht
        ];
        description = "List contents of an mbox file containing e-mails";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mbtiles" = callPackage
@@ -169558,7 +169558,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Haskell MBTiles client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mbug" = callPackage
@@ -169583,8 +169583,8 @@ self: {
          tagsoup text time xdg-basedir
        ];
        description = "download bugs mailboxes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169611,8 +169611,8 @@ self: {
          base binary bytestring criterion deepseq groups
        ];
        description = "Bindings to mcl, a generic and fast pairing-based cryptography library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;};
 
@@ -169632,8 +169632,8 @@ self: {
          MissingH polyparse process text unix
        ];
        description = "Machine Configuration Manager";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169646,8 +169646,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gloss ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169675,8 +169675,8 @@ self: {
          base criterion log-domain microlens mwc-random
        ];
        description = "Sample from a posterior using Markov chain Monte Carlo";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169692,8 +169692,8 @@ self: {
          base containers hakaru hmatrix mwc-random primitive statistics
        ];
        description = "Combinators for MCMC sampling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169705,8 +169705,8 @@ self: {
        sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq";
        libraryHaskellDepends = [ base MonadRandom ];
        description = "MCMC applied to probabilistic program synthesis";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169720,7 +169720,7 @@ self: {
          base containers mwc-probability transformers
        ];
        description = "Common types for sampling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mcpi" = callPackage
@@ -169734,8 +169734,8 @@ self: {
        libraryHaskellDepends = [ base network split transformers ];
        executableHaskellDepends = [ base transformers ];
        description = "Connect to MineCraft running on a Raspberry PI";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169754,8 +169754,8 @@ self: {
          transformers wreq
        ];
        description = "Haskell interface to Fedora's mdapi";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169775,8 +169775,8 @@ self: {
          ansi-terminal base directory pandoc terminfo
        ];
        description = "Markdown viewer in your terminal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169790,7 +169790,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Command-line tool to run a command on each of the items";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mdp" = callPackage
@@ -169806,8 +169806,8 @@ self: {
        executableHaskellDepends = [ base vector ];
        testHaskellDepends = [ base HTF HUnit QuickCheck vector ];
        description = "Tools for solving Markov Decision Processes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169830,8 +169830,8 @@ self: {
          tasty-hunit text time uuid
        ];
        description = "Manipulate FSMs and store them in PostgreSQL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169852,8 +169852,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169865,7 +169865,7 @@ self: {
        sha256 = "12px5awgvblmpyfr92f83gkbhnr8qy8ip3h3gqnp46yhy6yr2js3";
        libraryHaskellDepends = [ base semigroups ];
        description = "calculate varieties of mean/average using semigroup";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mecab" = callPackage
@@ -169877,8 +169877,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ mecab ];
        description = "A Haskell binding to MeCab";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mecab;};
 
@@ -169890,8 +169890,8 @@ self: {
        sha256 = "0r9n04r6rv9dn38l469h40mk7fbmjwq0m72jvq69qahjw11y5lns";
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169905,7 +169905,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "A constructive solid geometry (CSG) modeling language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mechs" = callPackage
@@ -169916,8 +169916,8 @@ self: {
        sha256 = "04z4qsjmls6h1ndczirldprn42pngm9v8g7kbmwilp7gk1zl0wyx";
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -169935,7 +169935,7 @@ self: {
          base bytestring storable-endian transformers utility-ht
        ];
        description = "Parse song module files from Amiga MED and OctaMED";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "medea" = callPackage
@@ -169962,7 +169962,7 @@ self: {
          QuickCheck quickcheck-instances text unordered-containers vector
        ];
        description = "A schema language for JSON";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mediabus" = callPackage
@@ -169992,8 +169992,8 @@ self: {
          template-haskell text time transformers type-spec vector
        ];
        description = "Multimedia streaming on top of Conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170021,8 +170021,8 @@ self: {
          time vector
        ];
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {fdk-aac = null;};
 
@@ -170060,8 +170060,8 @@ self: {
          tagged template-haskell text time transformers type-spec vector
        ];
        description = "Receive and Send RTP Packets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170074,7 +170074,7 @@ self: {
        libraryHaskellDepends = [ base heap ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Constant-time queries for the median of a stream of numeric data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mediawiki" = callPackage
@@ -170092,8 +170092,8 @@ self: {
          base HTTP mime network pretty utf8-string xml
        ];
        description = "Interfacing with the MediaWiki API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170137,8 +170137,8 @@ self: {
          servant-client servant-server text time
        ];
        description = "Haskell SDK for communicating with the Medium API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170159,7 +170159,7 @@ self: {
          QuickCheck semigroupoids semigroups
        ];
        description = "A silly container";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "mega-sdist" = callPackage
@@ -170177,8 +170177,8 @@ self: {
          yaml
        ];
        description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170190,8 +170190,8 @@ self: {
        sha256 = "158j4wc9j8vpi3k095nfsimjavfmrxgzil3d4a3yqphpk96fz9ci";
        libraryHaskellDepends = [ base megaparsec mtl text ];
        description = "lisp parser using mega-parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170214,7 +170214,7 @@ self: {
          base containers criterion deepseq text weigh
        ];
        description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "megaparsec-tests" = callPackage
@@ -170240,7 +170240,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Test utilities and the test suite of Megaparsec";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "meldable-heap" = callPackage
@@ -170254,7 +170254,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mellon-core" = callPackage
@@ -170273,8 +170273,8 @@ self: {
          quickcheck-instances time transformers
        ];
        description = "Control physical access devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170286,8 +170286,8 @@ self: {
        sha256 = "0hg878il0d31lfqwkb3rsd7gxbhs5cb1sxgc3rwdv70fdg63iirp";
        libraryHaskellDepends = [ base hpio mellon-core protolude ];
        description = "GPIO support for mellon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170329,8 +170329,8 @@ self: {
          wai wai-extra warp
        ];
        description = "A REST web service for Mellon controllers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170352,8 +170352,8 @@ self: {
          base containers HUnit mtl test-framework test-framework-hunit
        ];
        description = "A functional scripting language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170370,7 +170370,7 @@ self: {
          th-lift
        ];
        description = "Indices for type level lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "membrain" = callPackage
@@ -170386,7 +170386,7 @@ self: {
          base doctest Glob hedgehog hspec type-spec
        ];
        description = "Type-safe memory units";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "memcache" = callPackage
@@ -170407,8 +170407,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A memcached client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170428,8 +170428,8 @@ self: {
          memcache-haskell mtl network resourcet split
        ];
        description = "Conduit library for memcache procotol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170452,8 +170452,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
        description = "Memcache procotol library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170466,7 +170466,7 @@ self: {
        libraryHaskellDepends = [ base bytestring network utf8-light ];
        description = "haskell bindings for memcached";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "memcached-binary" = callPackage
@@ -170488,8 +170488,8 @@ self: {
          base bytestring data-default-class hspec HUnit network process
        ];
        description = "memcached client using binary protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170506,7 +170506,7 @@ self: {
          base bytestring cereal hspec QuickCheck vector
        ];
        description = "Efficient in memory indexed database";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "memexml" = callPackage
@@ -170517,7 +170517,7 @@ self: {
        sha256 = "1x3gi54d1yzxi2046vb62dxa6jvbhggsazh4dasxcbjc1pkq6pp8";
        libraryHaskellDepends = [ base hxt ];
        description = "Library for reading Meme XML output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "meminfo" = callPackage
@@ -170530,7 +170530,7 @@ self: {
        editedCabalFile = "0i6znbcw4yyf8jzkixx5dxbklzfnh79hmywvwwamdmjgi39akpi5";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Library for reading `/proc/meminfo`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "memis" = callPackage
@@ -170555,8 +170555,8 @@ self: {
          wai-middleware-static warp
        ];
        description = "Memis Efficient Manual Image Sorting";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170568,8 +170568,8 @@ self: {
        sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19";
        libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170581,7 +170581,7 @@ self: {
        sha256 = "0x6vpf5kcr4icli0hjdqzphbpsakh0yn2ih2jyh65hnk1nh4j8n7";
        libraryHaskellDepends = [ base direct-sqlite text ];
        description = "memoize functions using SQLite3 database";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "memoization-utils" = callPackage
@@ -170597,8 +170597,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec time time-units ];
        description = "Utilities for memoizing functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170611,7 +170611,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "A memoization library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "memorable-bits" = callPackage
@@ -170639,7 +170639,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Generate human memorable strings from binary data";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "memory" = callPackage
@@ -170657,7 +170657,7 @@ self: {
        ];
        testHaskellDepends = [ base basement bytestring foundation ];
        description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "memorypool" = callPackage
@@ -170672,8 +170672,8 @@ self: {
          base containers transformers unsafe vector
        ];
        description = "basic memory pool outside of haskell heap/GC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170715,8 +170715,8 @@ self: {
          tasty-th vector
        ];
        description = "Haskell binding for Menoh DNN inference library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {menoh = null;};
 
@@ -170735,8 +170735,8 @@ self: {
          aeson base hspec QuickCheck regex-tdfa scientific text
        ];
        description = "Data Validation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170763,7 +170763,7 @@ self: {
          base bytestring directory HUnit optparse-applicative text
        ];
        description = "Haskell binding to Mercury API for ThingMagic RFID readers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "merge-bash-history" = callPackage
@@ -170782,7 +170782,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base ];
        description = "command line utility to merge bash_history";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mergeful" = callPackage
@@ -170797,7 +170797,7 @@ self: {
          aeson base containers deepseq mtl text time validity
          validity-containers validity-time
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mergeful-persistent" = callPackage
@@ -170821,8 +170821,8 @@ self: {
          validity validity-persistent
        ];
        description = "Support for using mergeful from persistent-based databases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {genvalidity-persistent = null; validity-persistent = null;};
 
@@ -170837,7 +170837,7 @@ self: {
        libraryHaskellDepends = [
          aeson base containers deepseq mtl validity validity-containers
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mergeless-persistent" = callPackage
@@ -170861,8 +170861,8 @@ self: {
          text validity
        ];
        description = "Support for using mergeless from persistent-based databases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {genvalidity-persistent = null;};
 
@@ -170888,7 +170888,7 @@ self: {
          memory merkle-tree mwc-random QuickCheck random random-bytestring
        ];
        description = "Merkle Tree Logs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "merkle-patricia-db" = callPackage
@@ -170914,8 +170914,8 @@ self: {
          test-framework-hunit transformers
        ];
        description = "A modified Merkle Patricia DB";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170935,8 +170935,8 @@ self: {
          random tasty tasty-quickcheck
        ];
        description = "An implementation of a Merkle tree and merkle tree proofs of inclusion";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -170948,7 +170948,7 @@ self: {
        sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
        libraryHaskellDepends = [ base old-time ];
        description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mersenne-random-pure64" = callPackage
@@ -170961,7 +170961,7 @@ self: {
        editedCabalFile = "0pxq0xz42x60993rl4pr4pia80jv1xcqh6njvjzfvn75018j4gw5";
        libraryHaskellDepends = [ base random time ];
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "messagepack" = callPackage
@@ -170983,7 +170983,7 @@ self: {
          test-framework-quickcheck2 test-framework-th
        ];
        description = "Serialize instance for Message Pack Object";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "messagepack-rpc" = callPackage
@@ -171000,8 +171000,8 @@ self: {
          base bytestring cereal containers messagepack network-simple
        ];
        description = "Message Pack RPC over TCP";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171015,8 +171015,8 @@ self: {
          base bytestring HTTP http-conduit network
        ];
        description = "Messente SMS Gateway";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171028,8 +171028,8 @@ self: {
        sha256 = "0pxsg67r2z0f9zxr8m98sndlii0bixyxwgjkc31z5743ciw9ch0c";
        libraryHaskellDepends = [ base loch-th template-haskell ];
        description = "Utility library providing miscellaneous meta-programming utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171046,8 +171046,8 @@ self: {
          mwc-random transformers vector
        ];
        description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171065,8 +171065,8 @@ self: {
          array base meta-par QuickCheck transformers vector
        ];
        description = "Support for integrated Accelerate computations within Meta-par";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171078,8 +171078,8 @@ self: {
        sha256 = "0860ggpksvaagrb1gqvnpp8gx6xd6h05dqg2ciis6i2my9gxmcmz";
        libraryHaskellDepends = [ base text time ];
        description = "metadata library for semantic web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171092,7 +171092,7 @@ self: {
        libraryHaskellDepends = [ arrows base random Stream ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171105,7 +171105,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "metamorphisms: ana . cata or understanding folds and unfolds";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "metaplug" = callPackage
@@ -171116,8 +171116,8 @@ self: {
        sha256 = "086n9kqyi2jqki31jgylm0r63ahgvw3pf7mi5hln2m86a5x4ij4n";
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171143,8 +171143,8 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Australian METAR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171169,8 +171169,8 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "HTTP for METAR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171184,7 +171184,7 @@ self: {
        testHaskellDepends = [ base hspec rio transformers ];
        testToolDepends = [ hspec-discover ];
        description = "rebindable methods for improving testability";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metric" = callPackage
@@ -171202,8 +171202,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        description = "Metric spaces";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171226,7 +171226,7 @@ self: {
          async base HUnit lens mwc-random primitive QuickCheck
        ];
        description = "High-performance application metric tracking";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "metricsd-client" = callPackage
@@ -171237,8 +171237,8 @@ self: {
        sha256 = "1q807wvmj1q605257jj60h0j2wal6ypjiad9wkjmv836p3mis5q9";
        libraryHaskellDepends = [ base network ];
        description = "Client for the metrics aggregator Metricsd";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171255,7 +171255,7 @@ self: {
          unliftio unordered-containers
        ];
        description = "A simple tcp and udp socket server framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-socket" = callPackage
@@ -171271,7 +171271,7 @@ self: {
          transformers unliftio
        ];
        description = "Socket transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-transport-crypto" = callPackage
@@ -171289,7 +171289,7 @@ self: {
          base bytestring cryptonite metro QuickCheck quickcheck-instances
        ];
        description = "Crypto transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-transport-tls" = callPackage
@@ -171305,7 +171305,7 @@ self: {
          x509-validation
        ];
        description = "TLS transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-transport-websockets" = callPackage
@@ -171316,7 +171316,7 @@ self: {
        sha256 = "1jyy3sssz8ixwqdlf8zph05pfrm6qnf56sjsq8bx6yah9psy92dg";
        libraryHaskellDepends = [ base bytestring metro websockets ];
        description = "Websockets transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metro-transport-xor" = callPackage
@@ -171327,7 +171327,7 @@ self: {
        sha256 = "1hx839sxd2lrx6vsxswi4i88x1d1489jcdmh2vbnc2dvnssnqcpv";
        libraryHaskellDepends = [ base bytestring metro unliftio ];
        description = "XOR transport for metro";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "metronome" = callPackage
@@ -171340,8 +171340,8 @@ self: {
          base data-lens data-lens-template hosc stm
        ];
        description = "Time Synchronized execution";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171362,8 +171362,8 @@ self: {
          base deepseq hspec HUnit QuickCheck should-not-typecheck
        ];
        description = "Typesafe music composition";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171375,8 +171375,8 @@ self: {
        sha256 = "0ayz8sdxakrwb0arnbq9rv876f5jbkmycj3jr00p82vhfdyvwll2";
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Pure Profunctor Functional Lenses";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171393,7 +171393,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mgeneric" = callPackage
@@ -171406,8 +171406,8 @@ self: {
          base containers lens mtl template-haskell
        ];
        description = "Generics with multiple parameters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171423,8 +171423,8 @@ self: {
          base haskell-src-meta parsec split template-haskell
        ];
        description = "Multiple Instance for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171440,8 +171440,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171470,7 +171470,7 @@ self: {
          wai-websockets warp websockets yaml
        ];
        description = "A Micro service gateway";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "micro-recursion-schemes" = callPackage
@@ -171487,8 +171487,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base HUnit template-haskell ];
        description = "Simple recursion schemes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171512,7 +171512,7 @@ self: {
          tasty tasty-quickcheck text unordered-containers vector
        ];
        description = "A tiny JSON library with light dependency footprint";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "microbase" = callPackage
@@ -171524,7 +171524,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "A minimal base to work around GHC bugs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "microbench" = callPackage
@@ -171535,7 +171535,7 @@ self: {
        sha256 = "05yphn77rxg7zqpn27292yvmah2634hqfx2mgfyp5yws5ickrvkg";
        libraryHaskellDepends = [ base time ];
        description = "Microbenchmark Haskell code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microc" = callPackage
@@ -171550,7 +171550,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "microc compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microformats2-parser" = callPackage
@@ -171586,8 +171586,8 @@ self: {
          raw-strings-qq template-haskell text time xml-lens
        ];
        description = "A Microformats 2 parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171603,8 +171603,8 @@ self: {
          aeson base data-default-class pandoc-types setters text time
        ];
        description = "Microformats 2 types (with Aeson instances)";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171616,8 +171616,8 @@ self: {
        sha256 = "1dfkiiiksb4wnf6kgxmla37w1xmmxpzim4ribjckvn58pd2hn2a0";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Array-backed extensible records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171629,7 +171629,7 @@ self: {
        sha256 = "1z6zdprpr193a56r5s67q75554rrqyp2kk6srxn1gif7fd54sj2f";
        libraryHaskellDepends = [ base ];
        description = "A tiny lens library with no dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens_0_4_12_0" = callPackage
@@ -171640,8 +171640,8 @@ self: {
        sha256 = "10q7gl9yavcln58sxdxzih7ff0ixxq5hpd87icvxw97yqf1p6hmm";
        libraryHaskellDepends = [ base ];
        description = "A tiny lens library with no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "microlens-aeson" = callPackage
@@ -171662,7 +171662,7 @@ self: {
          text unordered-containers vector
        ];
        description = "Law-abiding lenses for Aeson, using microlens";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "microlens-contra" = callPackage
@@ -171673,7 +171673,7 @@ self: {
        sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m";
        libraryHaskellDepends = [ base microlens ];
        description = "True folds and getters for microlens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-each" = callPackage
@@ -171684,8 +171684,8 @@ self: {
        sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
        libraryHaskellDepends = [ base microlens ];
        description = "'each' for microlens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171701,7 +171701,7 @@ self: {
          array base bytestring containers microlens transformers
        ];
        description = "microlens + array, bytestring, containers, transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-ghc_0_4_13" = callPackage
@@ -171716,8 +171716,8 @@ self: {
          array base bytestring containers microlens transformers
        ];
        description = "microlens + array, bytestring, containers, transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "microlens-mtl" = callPackage
@@ -171732,7 +171732,7 @@ self: {
          base microlens mtl transformers transformers-compat
        ];
        description = "microlens support for Reader/Writer/State from mtl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-platform" = callPackage
@@ -171748,7 +171748,7 @@ self: {
          text unordered-containers vector
        ];
        description = "microlens + all batteries included (best for apps)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-platform_0_4_2" = callPackage
@@ -171764,8 +171764,8 @@ self: {
          text unordered-containers vector
        ];
        description = "microlens + all batteries included (best for apps)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "microlens-process" = callPackage
@@ -171782,7 +171782,7 @@ self: {
        libraryHaskellDepends = [ base filepath microlens process ];
        testHaskellDepends = [ base doctest microlens process ];
        description = "Micro-optics for the process library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microlens-th" = callPackage
@@ -171799,7 +171799,7 @@ self: {
        ];
        testHaskellDepends = [ base microlens tagged ];
        description = "Automatic generation of record lenses for microlens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "micrologger" = callPackage
@@ -171816,8 +171816,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec text ];
        description = "A super simple logging module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171835,8 +171835,8 @@ self: {
          http-media mtl safe servant servant-client text time xml
        ];
        description = "Bindings to the Microsoft Translator API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171848,7 +171848,7 @@ self: {
        sha256 = "0615gdbsk7i3w71adjp69zabw4mli965wffm2h846hp6pjj31xcb";
        libraryHaskellDepends = [ base QuickCheck time ];
        description = "Tiny QuickCheck test library with minimal dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microstache" = callPackage
@@ -171868,7 +171868,7 @@ self: {
          aeson base bytestring containers hspec parsec text
        ];
        description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "microtimer" = callPackage
@@ -171879,7 +171879,7 @@ self: {
        sha256 = "09w8jn6g8fq3zsp2ahdrzv33mvayh8vladmc2wf8pbmpmdii0kap";
        libraryHaskellDepends = [ base time ];
        description = "A tiny library for benchmarking IO actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mida" = callPackage
@@ -171910,8 +171910,8 @@ self: {
          tf-random transformers
        ];
        description = "Language for algorithmic generation of MIDI files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -171923,7 +171923,7 @@ self: {
        sha256 = "1dkja5arps41wanhv1jnkf99xrc8f5aiimp27myd595lqqdr87s2";
        libraryHaskellDepends = [ base containers safe stm ];
        description = "Hot-swappable FRP";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "midi" = callPackage
@@ -171958,8 +171958,8 @@ self: {
          alsa-seq base data-accessor midi utility-ht
        ];
        description = "Convert between datatypes of the midi and the alsa packages";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midi-music-box" = callPackage
@@ -171978,8 +171978,8 @@ self: {
          optparse-applicative utility-ht
        ];
        description = "Convert MIDI file to music box punch tape";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172001,7 +172001,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A simple and fast library for working with MIDI messages";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "midi-util" = callPackage
@@ -172015,7 +172015,7 @@ self: {
          base containers event-list midi non-negative
        ];
        description = "Utility functions for processing MIDI files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "midi-utils" = callPackage
@@ -172031,8 +172031,8 @@ self: {
          base bytestring directory event-list midi parsec process
        ];
        description = "Utilities for working with MIDI data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172052,8 +172052,8 @@ self: {
          random transformers utility-ht wx wxcore
        ];
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172071,8 +172071,8 @@ self: {
          alsa-core alsa-seq base containers gtk mtl stm
        ];
        description = "A control midi surface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172093,8 +172093,8 @@ self: {
          hslogger network parsec time unix webserver
        ];
        description = "Simple Web Server in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172127,7 +172127,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec http-client ];
        description = "High performance web server on WAI/warp";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mighty-metropolis" = callPackage
@@ -172147,7 +172147,7 @@ self: {
          base containers foldl hspec mcmc-types mwc-probability mwc-random
        ];
        description = "The Metropolis algorithm";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "migrant-core" = callPackage
@@ -172163,8 +172163,8 @@ self: {
          base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Semi-automatic database schema migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172183,8 +172183,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Semi-automatic database schema migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172205,8 +172205,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Semi-automatic database schema migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172224,8 +172224,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Semi-automatic database schema migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172240,7 +172240,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "MikMod bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172266,8 +172266,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Lambda calculus interpreter";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172284,8 +172284,8 @@ self: {
          http-types mtl wai wai-extra
        ];
        description = "A minimum web dev DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172309,8 +172309,8 @@ self: {
          tasty-hspec tasty-quickcheck
        ];
        description = "A Kafka client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172324,7 +172324,7 @@ self: {
        editedCabalFile = "07r4kyjm2bk8knyhbfivgxlxnxp7qqlcnzp61f2hi7d1s7clg290";
        libraryHaskellDepends = [ base text ];
        description = "Working with MIME types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mime-directory" = callPackage
@@ -172340,7 +172340,7 @@ self: {
        ];
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172358,7 +172358,7 @@ self: {
        ];
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        description = "Compose MIME email messages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mime-mail-ses" = callPackage
@@ -172387,7 +172387,7 @@ self: {
          base bytestring case-insensitive tasty tasty-hunit time
        ];
        description = "Send mime-mail messages via Amazon SES";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mime-string" = callPackage
@@ -172404,7 +172404,7 @@ self: {
        ];
        description = "MIME implementation for String's";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mime-types" = callPackage
@@ -172415,7 +172415,7 @@ self: {
        sha256 = "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha";
        libraryHaskellDepends = [ base bytestring containers text ];
        description = "Basic mime-type handling types and functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "min-max-pqueue" = callPackage
@@ -172432,7 +172432,7 @@ self: {
          base containers criterion integer-logarithms random
        ];
        description = "Double-ended priority queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minecraft" = callPackage
@@ -172443,7 +172443,7 @@ self: {
        sha256 = "07h6hgq4k1wm4ldwb29fgmmbl9ygrlbq3qv3ymfvc25l5rvgss4h";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minecraft-data" = callPackage
@@ -172461,8 +172461,8 @@ self: {
          time vector zlib
        ];
        description = "a DSL for generating minecraft commands and levels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172478,7 +172478,7 @@ self: {
        executableHaskellDepends = [ base directory mtl random ];
        description = "Minesweeper simulation using neural networks";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "minesweeper" = callPackage
@@ -172497,8 +172497,8 @@ self: {
          filepath glade gtk random time
        ];
        description = "Minesweeper game which is always solvable without guessing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172520,8 +172520,8 @@ self: {
        executableHaskellDepends = [ base sort ];
        testHaskellDepends = [ base hspec primes ];
        description = "Template Haskell Implementation of Egison Pattern Matching";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172533,7 +172533,7 @@ self: {
        sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172";
        libraryHaskellDepends = [ base vector ];
        description = "Bindings to Miniball, a smallest enclosing ball library";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "miniforth" = callPackage
@@ -172554,8 +172554,8 @@ self: {
          base containers lens mtl parsec readline
        ];
        description = "Miniature FORTH-like interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172571,8 +172571,8 @@ self: {
          array base bytestring containers mtl semigroups text transformers
        ];
        description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172604,8 +172604,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A SDL2-based graphics library, batteries-included";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172626,8 +172626,8 @@ self: {
        ];
        executableHaskellDepends = [ base lens minilight mtl ];
        description = "A binding library of minilight for Lua langauge";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172640,7 +172640,7 @@ self: {
        libraryHaskellDepends = [ base containers directory filepath ];
        description = "Minimal ini like configuration library with a few extras";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "minimorph" = callPackage
@@ -172656,7 +172656,7 @@ self: {
          base HUnit test-framework test-framework-hunit text
        ];
        description = "English spelling functions with an emphasis on simplicity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minimung" = callPackage
@@ -172669,8 +172669,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172708,7 +172708,7 @@ self: {
          unordered-containers xml-conduit
        ];
        description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "minions" = callPackage
@@ -172723,8 +172723,8 @@ self: {
          ansi-terminal base MissingH process time
        ];
        description = "A fast parallel ssh tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172741,8 +172741,8 @@ self: {
          transformers
        ];
        description = "fast and simple operational monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172760,7 +172760,7 @@ self: {
        ];
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172780,8 +172780,8 @@ self: {
          old-locale old-time process safe split template-haskell
        ];
        description = "Minimalistic file rotation utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172793,7 +172793,7 @@ self: {
        sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd";
        libraryHaskellDepends = [ async base ];
        description = "A Haskell bundle of the Minisat SAT solver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minisat-solver" = callPackage
@@ -172805,7 +172805,7 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        benchmarkHaskellDepends = [ base containers easyrender ];
        description = "High-level Haskell bindings for the MiniSat SAT solver";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ministg" = callPackage
@@ -172823,8 +172823,8 @@ self: {
          transformers xhtml
        ];
        description = "an interpreter for an operational semantics for the STG machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172839,7 +172839,7 @@ self: {
          base containers filepath OpenGL stb-truetype
        ];
        description = "Layout and render text with TrueType fonts using OpenGL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "miniutter" = callPackage
@@ -172856,7 +172856,7 @@ self: {
          base containers HUnit test-framework test-framework-hunit text
        ];
        description = "Simple English clause creation from arbitrary words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "minizinc-process" = callPackage
@@ -172876,8 +172876,8 @@ self: {
          aeson base hashable hedgehog hspec hspec-hedgehog
        ];
        description = "A set of helpers to call minizinc models";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172892,7 +172892,7 @@ self: {
          base mono-traversable semigroups transformers
        ];
        description = "Express the minimum length of a container in its type";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "minst-idx" = callPackage
@@ -172905,8 +172905,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
        description = "Read and write IDX data that is used in e.g. the MINST database.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172918,7 +172918,7 @@ self: {
        sha256 = "1njhz7wjmsk5pbr7gfkl95k50npkmm0iyxp3j93bbsg4rmxzg2kw";
        libraryHaskellDepends = [ base ];
        description = "A reliable way to detect the presence of a MinTTY console on Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mios" = callPackage
@@ -172941,8 +172941,8 @@ self: {
          base bytestring ghc-prim hspec primitive vector
        ];
        description = "A Minisat-based CDCL SAT solver in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172961,8 +172961,8 @@ self: {
          transformers twitter-conduit
        ];
        description = "Tweet mirror";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -172984,7 +172984,7 @@ self: {
        ];
        executableHaskellDepends = [ monad-loops regex-base regex-pcre ];
        description = "fortune-mod clone";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "mismi-core" = callPackage
@@ -173007,8 +173007,8 @@ self: {
          mmorph resourcet transformers
        ];
        description = "AWS Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mismi-core-test = null;};
 
@@ -173021,7 +173021,7 @@ self: {
        libraryHaskellDepends = [ base mismi-p text ];
        testHaskellDepends = [ base hedgehog mismi-p text ];
        description = "AWS Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mismi-p" = callPackage
@@ -173034,7 +173034,7 @@ self: {
        editedCabalFile = "1nhb8lz21qn4rmgwn0b8vr771fcpykg13zvp7qsrsz5jvd3ylifg";
        libraryHaskellDepends = [ base text ];
        description = "A commmon prelude for the mismi project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mismi-s3" = callPackage
@@ -173075,8 +173075,8 @@ self: {
          text transformers unix uuid
        ];
        description = "AWS Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mismi-core-test = null; mismi-s3-core-test = null;};
 
@@ -173089,7 +173089,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base mismi-p text ];
        testHaskellDepends = [ base hedgehog mismi-p text ];
        description = "AWS Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "miso" = callPackage
@@ -173108,8 +173108,8 @@ self: {
          network-uri servant servant-lucid text transformers vector
        ];
        description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173121,8 +173121,8 @@ self: {
        sha256 = "02xcj7ic4fh3h08h89naa2rl0rkksqx426wx8k8v0zl0d7rd12jc";
        libraryHaskellDepends = [ aeson base ghcjs-base miso ];
        description = "Miso state transition logger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173135,8 +173135,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173154,7 +173154,7 @@ self: {
          attoparsec base bytestring containers pretty-simple text
        ];
        description = "Convert HTML to miso View syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "miss" = callPackage
@@ -173184,8 +173184,8 @@ self: {
          unix
        ];
        description = "A Haskell git implimentation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173204,8 +173204,8 @@ self: {
          mtl posix-paths
        ];
        description = "Useability extras built on top of miss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173217,7 +173217,7 @@ self: {
        sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy";
        libraryHaskellDepends = [ base ];
        description = "Convenience functions for FFI work";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "missing-py2" = callPackage
@@ -173231,8 +173231,8 @@ self: {
          anydbm base Cabal directory HUnit MissingH
        ];
        description = "Haskell interface to Python";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173259,7 +173259,7 @@ self: {
          monad-parallel process text time unordered-containers
        ];
        description = "Vim plugin manager written in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mix-arrows" = callPackage
@@ -173270,8 +173270,8 @@ self: {
        sha256 = "0m70l09bmr8b95d87rpz4vdircdar2rsvnamr2g07542wx024931";
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173288,8 +173288,8 @@ self: {
          array base containers simple-tabular
        ];
        description = "Find optimal mixed strategies for two-player games";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173307,7 +173307,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
        description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mixpanel-client" = callPackage
@@ -173330,8 +173330,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Mixpanel client";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173347,7 +173347,7 @@ self: {
        executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173367,7 +173367,7 @@ self: {
        ];
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173382,8 +173382,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec pretty ];
        executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173395,8 +173395,8 @@ self: {
        sha256 = "06mwmahyp781wigjva12kz7w75vjkkprl8k1yiqd1yd0162vp31k";
        libraryHaskellDepends = [ base haskell98 ];
        description = "Monadic List alternative to lazy I/O";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173420,7 +173420,7 @@ self: {
          vector
        ];
        description = "Machine Learning Toolbox";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mm2" = callPackage
@@ -173431,8 +173431,8 @@ self: {
        sha256 = "0zn629lm41z6b59snnjkqdk41ryimjhd5yapiwykl5fg0f7wmap3";
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173446,7 +173446,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Memory mapped files for POSIX and Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmark" = callPackage
@@ -173475,7 +173475,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text weigh ];
        description = "Strict markdown processor for writers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmark-cli" = callPackage
@@ -173498,7 +173498,7 @@ self: {
          unordered-containers
        ];
        description = "Command line interface to the MMark markdown processor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmark-ext" = callPackage
@@ -173520,7 +173520,7 @@ self: {
        testHaskellDepends = [ base hspec lucid mmark skylighting text ];
        testToolDepends = [ hspec-discover ];
        description = "Commonly useful extensions for the MMark markdown processor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmorph" = callPackage
@@ -173533,7 +173533,7 @@ self: {
          base mtl transformers transformers-compat
        ];
        description = "Monad morphisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mmsyn2" = callPackage
@@ -173544,7 +173544,7 @@ self: {
        sha256 = "06n8vxqafc698ahml782klb41g9bfsvqdrl4k0blnn3m3vavnzxy";
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for multiple (Ord a) => a -> b transformations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn2-array" = callPackage
@@ -173555,7 +173555,7 @@ self: {
        sha256 = "0dcvs5s11s840fvl17h5qrz5x6fmzvvjkfxmbk8r0p13n4k2a0ny";
        libraryHaskellDepends = [ base ];
        description = "A library with less dependencies that can be used for multiple Ord a => a -> b transformations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn3" = callPackage
@@ -173566,7 +173566,7 @@ self: {
        sha256 = "0fpn0lzr93aaha9741spc7vmlg5c4x5wb3p4qvxzp57w85zqdwm3";
        libraryHaskellDepends = [ base directory ];
        description = "A small library to deal with executable endings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn4" = callPackage
@@ -173580,7 +173580,7 @@ self: {
        libraryHaskellDepends = [ base directory mmsyn3 process ];
        executableHaskellDepends = [ base directory mmsyn3 process ];
        description = "The \"glue\" between electronic tables and GraphViz";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn5" = callPackage
@@ -173591,7 +173591,7 @@ self: {
        sha256 = "0xbdmlq71pjnsls67mydrfzajnnyyzp0dvzgrg2lms3pssvzs6f1";
        libraryHaskellDepends = [ base ];
        description = "Various additional operations on lists (some with intermediate Monads)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn6ukr" = callPackage
@@ -173614,7 +173614,7 @@ self: {
          ukrainian-phonetics-basic vector
        ];
        description = "A musical instrument synthesizer or a tool for Ukrainian language listening";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn6ukr-array" = callPackage
@@ -173637,7 +173637,7 @@ self: {
          ukrainian-phonetics-basic-array
        ];
        description = "A musical instrument synthesizer or a tool for Ukrainian language listening";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn7h" = callPackage
@@ -173659,8 +173659,8 @@ self: {
          process vector
        ];
        description = "Produces a sound recording specified by the Ukrainian text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173681,7 +173681,7 @@ self: {
          base directory mmsyn2 mmsyn3 mmsyn7ukr process vector
        ];
        description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn7s" = callPackage
@@ -173695,7 +173695,7 @@ self: {
        libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
        executableHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
        description = "Shows a sorted list of the Ukrainian sounds representations that can be used by mmsyn7 series of programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn7ukr" = callPackage
@@ -173716,7 +173716,7 @@ self: {
          base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector
        ];
        description = "A simple basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmsyn7ukr-common" = callPackage
@@ -173727,7 +173727,7 @@ self: {
        sha256 = "000xkm0yvj6sxmnkzax98gc3rv0cfkfglfznf84p32axmxa4vg0q";
        libraryHaskellDepends = [ base directory mmsyn3 process ];
        description = "Some common for mmsyn7ukr and mmsyn7ukr-array functionality using SoX";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mmtf" = callPackage
@@ -173747,8 +173747,8 @@ self: {
          http-conduit QuickCheck text
        ];
        description = "Macromolecular Transmission Format implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173760,8 +173760,8 @@ self: {
        sha256 = "0bb19l52s56y2dwyskvjwdal7387ii2dg9cc1l6f341y3695nj7l";
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173775,8 +173775,8 @@ self: {
        editedCabalFile = "1iby6x0pkqz4447nr5aqpzch2msqb76bdypcprpi5y8djr51x248";
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173790,7 +173790,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
        description = "Read and write IDX data that is used in e.g. the MNIST database.";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "moan" = callPackage
@@ -173806,8 +173806,8 @@ self: {
          tagset-positional text zlib
        ];
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173826,7 +173826,7 @@ self: {
          relude text wai warp yaml
        ];
        description = "A HTTP server for testing HTTP clients";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "mock-time" = callPackage
@@ -173848,7 +173848,7 @@ self: {
          unliftio-core
        ];
        description = "Mock time in tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mockazo" = callPackage
@@ -173866,7 +173866,7 @@ self: {
          base constraints hspec multistate relude template-haskell
        ];
        description = "Mock records of functions easily";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mockery" = callPackage
@@ -173886,7 +173886,7 @@ self: {
          temporary
        ];
        description = "Support functions for automated testing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mod" = callPackage
@@ -173907,7 +173907,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base time ];
        description = "Fast type-safe modular arithmetic";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "modbus-tcp" = callPackage
@@ -173920,7 +173920,7 @@ self: {
          base bytestring cereal mtl transformers
        ];
        description = "Communicate with Modbus devices over TCP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "model" = callPackage
@@ -173939,7 +173939,7 @@ self: {
          base containers doctest filemanip ghc-prim pretty tasty tasty-hunit
        ];
        description = "Derive a model of a data type using Generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "modelicaparser" = callPackage
@@ -173955,8 +173955,8 @@ self: {
          ansi-terminal base containers filepath parsec QuickCheck
        ];
        description = "A parser for the modelica language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -173983,7 +173983,7 @@ self: {
          base bytestring criterion deepseq megaparsec text weigh
        ];
        description = "Modern library for working with URIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "modify-fasta" = callPackage
@@ -174006,8 +174006,8 @@ self: {
          semigroups split text transformers
        ];
        description = "Modify fasta (and CLIP) files in several optional ways";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174028,8 +174028,8 @@ self: {
          base directory filepath haskell98 mtl utf8-string
        ];
        description = "Haskell source splitter driven by special comments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174041,7 +174041,7 @@ self: {
        sha256 = "1igg7am4z1kfvpyp5a53rsqan5i209rp1s0z9xamqydx60ilc2s3";
        libraryHaskellDepends = [ base ghc-typelits-knownnat ];
        description = "Type-safe modular arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "modular-arithmetic" = callPackage
@@ -174053,7 +174053,7 @@ self: {
        libraryHaskellDepends = [ base typelits-witnesses ];
        testHaskellDepends = [ base doctest typelits-witnesses ];
        description = "A type for integers modulo some constant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "modular-prelude" = callPackage
@@ -174070,8 +174070,8 @@ self: {
          system-filepath text transformers unordered-containers vector
        ];
        description = "A new Prelude featuring first class modules";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174083,8 +174083,8 @@ self: {
        sha256 = "1izinrgd9a6sm57isg8jgs4wjidczwqcxl6vg5h4gy5zz9dg8xnx";
        libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        description = "Reifying ClassyPrelude a la ModularPrelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174100,8 +174100,8 @@ self: {
          base hmatrix sparse-linear-algebra spectral-clustering vector
        ];
        description = "Find the modularity of a network";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174132,8 +174132,8 @@ self: {
          base containers filepath haskell-src-exts HUnit process
        ];
        description = "Clean up module imports, split and merge modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174150,8 +174150,8 @@ self: {
          transformers
        ];
        description = "Template Haskell for introspecting a module's declarations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174171,8 +174171,8 @@ self: {
          nats pandoc-types parsec prettify process semigroups text
        ];
        description = "Modular C code generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174188,8 +174188,8 @@ self: {
          air base bytestring data-default dlist mtl text
        ];
        description = "html with style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174212,8 +174212,8 @@ self: {
          unordered-containers
        ];
        description = "A functional firewall killer";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174236,8 +174236,8 @@ self: {
          old-locale old-time parsec process transformers unix utility-ht
        ];
        description = "Modular Haskell Web Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174268,8 +174268,8 @@ self: {
          smallcheck stm text time unordered-containers vector
        ];
        description = "A glorified string replacement tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174295,8 +174295,8 @@ self: {
          tasty-hunit time
        ];
        description = "Mollie API client for Haskell http://www.mollie.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174313,7 +174313,7 @@ self: {
          transformers-compat
        ];
        description = "A better error monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-atom" = callPackage
@@ -174324,8 +174324,8 @@ self: {
        sha256 = "16dnp6wz0s56gm58k6m5cv5c47hb2vz1m4a3pqvrg3j97y344c3q";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically convert object to unique integers and back";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174337,8 +174337,8 @@ self: {
        sha256 = "1k4rcrdjjs52p9mnsbwp0gmb2inivhcqw044l56dbc080yxrk32j";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174350,7 +174350,7 @@ self: {
        sha256 = "0zjyy9apc5zr51nh31p3f6bzbnfbc40hkf9p52370ynj4513lz4r";
        libraryHaskellDepends = [ base exceptions ];
        description = "An applicative monad that batches commands for later more efficient execution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-bayes" = callPackage
@@ -174382,8 +174382,8 @@ self: {
          process vector
        ];
        description = "A library for probabilistic programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174396,7 +174396,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "This package has been removed";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-branch" = callPackage
@@ -174407,8 +174407,8 @@ self: {
        sha256 = "0g82ccql6pmj319ji3zpmxab78qwdlrjsl7cdfhjvv4m1i4kmzdf";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monadic abstraction for computations that can be branched and run independently";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174424,7 +174424,7 @@ self: {
          base contravariant invariant MonadRandom mtl primitive transformers
        ];
        description = "Monad, monad transformer, and typeclass representing choices";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "monad-chronicle" = callPackage
@@ -174440,7 +174440,7 @@ self: {
          transformers-compat
        ];
        description = "These as a transformer, ChronicleT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-classes" = callPackage
@@ -174461,7 +174461,7 @@ self: {
          transformers
        ];
        description = "more flexible mtl";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-classes-logging" = callPackage
@@ -174479,7 +174479,7 @@ self: {
          base logging-effect monad-classes tasty tasty-hunit transformers
        ];
        description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-codec" = callPackage
@@ -174492,7 +174492,7 @@ self: {
          base binary containers data-lens-light mtl
        ];
        description = "Monadic conversion between complex data structures and unique integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-connect" = callPackage
@@ -174507,7 +174507,7 @@ self: {
          base bytestring connection exceptions transformers
        ];
        description = "Transformer for TCP connection with TLS and SOCKS support";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monad-control" = callPackage
@@ -174522,7 +174522,7 @@ self: {
          base stm transformers transformers-base transformers-compat
        ];
        description = "Lift control operations, like exception catching, through monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-control-aligned" = callPackage
@@ -174537,7 +174537,7 @@ self: {
          base stm transformers transformers-base transformers-compat
        ];
        description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-control-identity" = callPackage
@@ -174552,7 +174552,7 @@ self: {
          base monad-control transformers transformers-base
        ];
        description = "Stronger classes than monad-control";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-coroutine" = callPackage
@@ -174583,7 +174583,7 @@ self: {
        ];
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        description = "A monad transformer for weighted graph searches";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-exception" = callPackage
@@ -174599,8 +174599,8 @@ self: {
          transformers-base
        ];
        description = "Exstensible monadic exceptions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174616,7 +174616,7 @@ self: {
          base mmorph monad-control stm transformers transformers-base
        ];
        description = "Extra utility functions for working with monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-finally" = callPackage
@@ -174632,7 +174632,7 @@ self: {
          transformers-base transformers-compat
        ];
        description = "Guard monadic computations with cleanup actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-fork" = callPackage
@@ -174643,8 +174643,8 @@ self: {
        sha256 = "15xwavq4yc3xfif4isjh9m0q9h1bh7pmv2i3rh99sndmd34cdpwc";
        libraryHaskellDepends = [ base monad-control ];
        description = "Type class for monads which support a fork operation";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174656,7 +174656,7 @@ self: {
        sha256 = "0rc4r6sg29sjgh9xsk7q80h0lixhyxs60bszj5dnn8yf7w18b15y";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple monad for generating fresh integers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-hash" = callPackage
@@ -174672,7 +174672,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring cryptonite transformers ];
        description = "Monad transformer for incremental hashing";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monad-http" = callPackage
@@ -174693,8 +174693,8 @@ self: {
          transformers transformers-compat
        ];
        description = "A class of monads which can do http requests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174706,8 +174706,8 @@ self: {
        sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7";
        libraryHaskellDepends = [ base ];
        description = "Monads with an unsaveInterleaveIO-like operation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174722,7 +174722,7 @@ self: {
          base coercion-extras mmorph mtl transformers
        ];
        description = "A reader monad that gives the environment access to the entire transformer stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-io-adapter" = callPackage
@@ -174739,7 +174739,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec transformers-base ];
        description = "Adapters between MonadIO and MonadBase IO";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "monad-journal" = callPackage
@@ -174754,7 +174754,7 @@ self: {
          base monad-control mtl transformers transformers-base
        ];
        description = "Pure logger typeclass and monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-levels" = callPackage
@@ -174769,8 +174769,8 @@ self: {
          base constraints transformers transformers-compat
        ];
        description = "Specific levels of monad transformers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174789,8 +174789,8 @@ self: {
          base containers deepseq hspec logict mtl QuickCheck
        ];
        description = "Monad transformers for combining local and global state";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174810,8 +174810,8 @@ self: {
          monad-control template-haskell text text-show transformers
        ];
        description = "A simple and fast logging monad";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174833,7 +174833,7 @@ self: {
          transformers-compat unliftio-core
        ];
        description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-logger-extras" = callPackage
@@ -174851,7 +174851,7 @@ self: {
        ];
        executableHaskellDepends = [ base monad-logger ];
        description = "Utilities for composing loggers, coloring output, plus a few orphan instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -174865,7 +174865,7 @@ self: {
          aeson base monad-logger template-haskell text
        ];
        description = "JSON-friendly Logging APIs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-logger-logstash" = callPackage
@@ -174881,7 +174881,7 @@ self: {
          transformers unliftio
        ];
        description = "Logstash backend for monad-logger";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-logger-prefix" = callPackage
@@ -174899,7 +174899,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion monad-logger ];
        description = "Add prefixes to your monad-logger output";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "monad-logger-syslog" = callPackage
@@ -174916,7 +174916,7 @@ self: {
          base bytestring fast-logger hsyslog monad-logger text transformers
        ];
        description = "syslog output for monad-logger";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-loops" = callPackage
@@ -174928,7 +174928,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Monadic loops";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monad-loops-stm" = callPackage
@@ -174939,7 +174939,7 @@ self: {
        sha256 = "0y7j2xpr1s7ggwm3vvpb5mlagsnxhq9qpncapibhk2pbf2d5r7as";
        libraryHaskellDepends = [ base stm ];
        description = "Monadic loops for STM";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monad-lrs" = callPackage
@@ -174958,8 +174958,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "a monad to calculate linear recursive sequence";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -174975,7 +174975,7 @@ self: {
          base base-compat MonadRandom mtl random transformers
        ];
        description = "Markov process monad";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-memo" = callPackage
@@ -174998,7 +174998,7 @@ self: {
          array base containers criterion primitive transformers vector
        ];
        description = "Memoization monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-mersenne-random" = callPackage
@@ -175011,8 +175011,8 @@ self: {
        editedCabalFile = "1kyfaridmi15wcib9gxns6v252pdhgsbyi303sqrvwhwpx9n3rl4";
        libraryHaskellDepends = [ base mersenne-random-pure64 ];
        description = "An efficient random generator monad, based on the Mersenne Twister";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175030,7 +175030,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A convenient wrapper around EKG metrics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-metrics-extensible" = callPackage
@@ -175050,8 +175050,8 @@ self: {
          stm text
        ];
        description = "An extensible and type-safe wrapper around EKG metrics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175070,8 +175070,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad transformer for mocking mtl-style typeclasses";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175083,8 +175083,8 @@ self: {
        sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        description = "Open recursion for when you need it";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175096,7 +175096,7 @@ self: {
        sha256 = "1x65jvh816a296y2ds8vysfzl83am4pwwrnap4zdg0prpcxfpwl8";
        libraryHaskellDepends = [ base containers mtl text vector ];
        description = "Monad for observation extraction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-par" = callPackage
@@ -175122,7 +175122,7 @@ self: {
          time
        ];
        description = "A library for parallel programming based on a monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-par-extras" = callPackage
@@ -175137,7 +175137,7 @@ self: {
          abstract-par base cereal deepseq mtl random transformers
        ];
        description = "Combinators and extra features for Par monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-parallel" = callPackage
@@ -175151,7 +175151,7 @@ self: {
          base parallel transformers transformers-compat
        ];
        description = "Parallel execution of monadic computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-parallel-progressbar" = callPackage
@@ -175166,8 +175166,8 @@ self: {
          base monad-parallel monadIO terminal-progress-bar
        ];
        description = "Parallel execution of monadic computations with a progress bar";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175179,8 +175179,8 @@ self: {
        sha256 = "08rm902kclapqh1iafjrsqspf0szhbx5jaqv6hh9p5zbg8ipdkhc";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Parameterized monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175200,7 +175200,7 @@ self: {
          test-framework-hunit transformers
        ];
        description = "Lift control operations like exception catching through monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-persist" = callPackage
@@ -175221,8 +175221,8 @@ self: {
          persistent-template text transformers
        ];
        description = "An mtl-style typeclass and transformer for persistent";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175234,7 +175234,7 @@ self: {
        sha256 = "1vi6g65hdyq5vq78mfag0qljxgzb6vq83m82x3cpgjl7dr9k5h1x";
        libraryHaskellDepends = [ base primitive transformers ];
        description = "Type class for monad transformers stack with pirimitive base monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-products" = callPackage
@@ -175245,7 +175245,7 @@ self: {
        sha256 = "1skcjjkn14fh92l4rx3akxjg1c85jqhnlwvkkzqwz9g15bdy3gq2";
        libraryHaskellDepends = [ base semigroupoids ];
        description = "Monad products";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-ran" = callPackage
@@ -175256,8 +175256,8 @@ self: {
        sha256 = "04y9s2b4hz2f8khr0q62xy0f6l2v896s7x03i3s18i14bwscqlax";
        libraryHaskellDepends = [ base ghc-prim mtl ];
        description = "Fast monads and monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175274,8 +175274,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Record and replay the results of monadic actions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175287,7 +175287,7 @@ self: {
        sha256 = "0hc9dbqhd609lzn79c25zwhm55262i9yip16ag9rysxv6rxbshml";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        description = "Resumption and reactive resumption monads for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-skeleton" = callPackage
@@ -175298,7 +175298,7 @@ self: {
        sha256 = "17jm69pwysx2kbx06n80iy396nbj5dys9iwdivargfzx7xql0s59";
        libraryHaskellDepends = [ base ];
        description = "Monads of program skeleta";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-st" = callPackage
@@ -175309,7 +175309,7 @@ self: {
        sha256 = "025zi9xzliwgyasq5hrfxwzg4ksj3kj0ys2kp62fi1n4ddbih64f";
        libraryHaskellDepends = [ base transformers ];
        description = "Provides a MonadST class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-state" = callPackage
@@ -175324,8 +175324,8 @@ self: {
          AbortT-transformers base fclabels monads-tf transformers
        ];
        description = "Utility library for monads, particularly those involving state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175338,8 +175338,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base stm ];
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175356,8 +175356,8 @@ self: {
        libraryHaskellDepends = [ base exceptions ghc-prim primitive ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "ST monad with efficient explicit errors";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175372,8 +175372,8 @@ self: {
          base bytestring containers deepseq monads-tf
        ];
        description = "ST-like monad capturing variables to regions and supporting IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175385,8 +175385,8 @@ self: {
        sha256 = "007rsq9x0dq8xmiimgqb0v8k15xizx63qmc76b1b8a66nfsd9w56";
        libraryHaskellDepends = [ base monad-stlike-io stm ];
        description = "ST-like monad capturing variables to regions and supporting STM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175398,7 +175398,7 @@ self: {
        sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
        libraryHaskellDepends = [ base stm transformers ];
        description = "MonadSTM class analogous to MonadIO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-supply" = callPackage
@@ -175410,7 +175410,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Stateful supply monad";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "monad-task" = callPackage
@@ -175421,8 +175421,8 @@ self: {
        sha256 = "02qp31w0zgms07b13km3aiina4iqbzxkiajab3b0czmc17xv4kx4";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A monad transformer that turns event processing into co-routine programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175435,7 +175435,7 @@ self: {
        libraryHaskellDepends = [ base mtl time ];
        testHaskellDepends = [ base mtl time ];
        description = "Type class for monads which carry the notion of the current time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monad-timing" = callPackage
@@ -175452,8 +175452,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hlint hspec transformers ];
        description = "Monad transformer for recording timing events";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175465,8 +175465,8 @@ self: {
        sha256 = "0jv3pcmbm3bph42hhr4i0l3dchapixf5j5gd7ybs9j3bbk3yydk9";
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175480,8 +175480,8 @@ self: {
        editedCabalFile = "1qkccw4xd4i112d6mkw8dgsnwfrnqcg1shk9s5cwyn55pwlmnn3x";
        libraryHaskellDepends = [ base mtl unordered-containers ];
        description = "Generic first-order unification";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175497,7 +175497,7 @@ self: {
          base constraints monad-control transformers transformers-base
        ];
        description = "Typeclasses for representing monad transformer unlifting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-unlift-ref" = callPackage
@@ -175514,7 +175514,7 @@ self: {
          mutable-containers resourcet stm transformers transformers-base
        ];
        description = "Typeclasses for representing monad transformer unlifting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monad-validate" = callPackage
@@ -175534,7 +175534,7 @@ self: {
          text transformers transformers-base unordered-containers vector
        ];
        description = "A monad transformer for data validation";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "monad-var" = callPackage
@@ -175545,8 +175545,8 @@ self: {
        sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88";
        libraryHaskellDepends = [ base base-compat stm ];
        description = "Generic operations over variables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175558,8 +175558,8 @@ self: {
        sha256 = "1hmigg0cbrsdvf6s0z2wn3s81q12qg3c30jjlsrw4jdfwv1qn13f";
        libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175571,7 +175571,7 @@ self: {
        sha256 = "1a3gb70fkh28ck13zdkphdip2kzdcivzdrsg9fdn3nci9scbdp2w";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadLib" = callPackage
@@ -175584,7 +175584,7 @@ self: {
        editedCabalFile = "072k4hnqkrfq80yh4qz2zw72fn43zm8l5rbjnckjaqdx4l315p11";
        libraryHaskellDepends = [ base ];
        description = "A collection of monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadLib-compose" = callPackage
@@ -175595,8 +175595,8 @@ self: {
        sha256 = "14byhdcby094qpgmkblysnplz5r88xnfk7rnfddihzz4jgjzlvy1";
        libraryHaskellDepends = [ base monadLib ];
        description = "Arrow-like monad composition for monadLib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175608,8 +175608,8 @@ self: {
        sha256 = "1k1jqi0q2n34xd07qp3fd4jw48iq4909m1pq2dm90sg46n6003sr";
        libraryHaskellDepends = [ base transformers ];
        description = "The Acme and AcmeT monads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175637,7 +175637,7 @@ self: {
          transformers-compat
        ];
        description = "A monad for using CryptoRandomGen";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadfibre" = callPackage
@@ -175663,7 +175663,7 @@ self: {
          array base stm transformers transformers-compat
        ];
        description = "Boxed and unboxed arrays for monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadic-recursion-schemes" = callPackage
@@ -175679,8 +175679,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Recursion Schemes for Monadic version";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175698,8 +175698,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175718,8 +175718,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
          gecodeset = null; gecodesupport = null;};
@@ -175732,7 +175732,7 @@ self: {
        sha256 = "18hbi4vxj9lfcla11b17sb88ysskxavq00zmrjx62cpyzkp85yxh";
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "Reversibly allow monad transformer stacks to run in IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadlist" = callPackage
@@ -175743,7 +175743,7 @@ self: {
        sha256 = "1zpxqp5zhcpk4358xqrapvkcfyazpdsdlrw3g14518y2kwnfifq6";
        libraryHaskellDepends = [ base ];
        description = "Monadic versions of list functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadloc" = callPackage
@@ -175754,7 +175754,7 @@ self: {
        sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
        libraryHaskellDepends = [ base template-haskell transformers ];
        description = "A class for monads which can keep a monadic call trace";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "monadloc-pp" = callPackage
@@ -175771,8 +175771,8 @@ self: {
          base filepath haskell-src-exts monadloc pretty syb
        ];
        description = "A preprocessor for generating monadic call traces";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175792,8 +175792,8 @@ self: {
          monad-control template-haskell text text-show transformers
        ];
        description = "A simple and fast logging monad";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175807,7 +175807,7 @@ self: {
          base monad-control mtl transformers-base
        ];
        description = "A monoid for monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadplus" = callPackage
@@ -175820,8 +175820,8 @@ self: {
        editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp";
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175833,8 +175833,8 @@ self: {
        sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monad classes, using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175846,7 +175846,7 @@ self: {
        sha256 = "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad classes, using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monadtransform" = callPackage
@@ -175857,7 +175857,7 @@ self: {
        sha256 = "0i586zh6247jfmkw2x27j0aq47yz1c71irj9iwrlx1zrmvzak1yv";
        libraryHaskellDepends = [ base transformers ];
        description = "A type-class for transforming monads (homomorphism) in a transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monarch" = callPackage
@@ -175875,8 +175875,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Monadic interface for TokyoTyrant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175900,8 +175900,8 @@ self: {
          timerep transformers wai warp
        ];
        description = "Haskell bindings for the Mondo API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175913,8 +175913,8 @@ self: {
        sha256 = "069jmlnrgia36ncl5mqaqq0iaqwrhx6ig5jjnlxr40vfdi4m4dw6";
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175927,8 +175927,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Money";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175961,8 +175961,8 @@ self: {
          nonce parsec random random-shuffle stm text tls transformers-base
        ];
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -175983,8 +175983,8 @@ self: {
          text transformers
        ];
        description = "message queue using MongoDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176002,8 +176002,8 @@ self: {
          case-insensitive containers http-types text zeromq-haskell
        ];
        description = "Mongrel2 Handler Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176017,8 +176017,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176043,8 +176043,8 @@ self: {
          base containers directory mtl optparse-applicative process unix
        ];
        description = "A system state collecting library and application";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176056,8 +176056,8 @@ self: {
        sha256 = "1qnbw9pd06czwyj2xcsjdigg7bj8d23p3ljnnkgd3d0r67qxxlxm";
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "Folds for monomorphic containers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176081,7 +176081,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge mwc-random vector ];
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -176098,7 +176098,7 @@ self: {
          semigroupoids semigroups transformers vector-instances
        ];
        description = "Extra typeclass instances for mono-traversable";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mono-traversable-keys" = callPackage
@@ -176116,7 +176116,7 @@ self: {
          vector-instances
        ];
        description = "Type-classes for interacting with monomorphic containers with a key";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mono-traversable-wrapper" = callPackage
@@ -176127,7 +176127,7 @@ self: {
        sha256 = "1jv40qwj08vfsy06cdrwdi05j06b1q3q7p30gh60ccq9l8y1qi2d";
        libraryHaskellDepends = [ base mono-traversable ];
        description = "Wrapper providing Foldable instance for MonoFoldables";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "monoid" = callPackage
@@ -176138,8 +176138,8 @@ self: {
        sha256 = "13k5s9y37igvrsfbw5q76zy10fm585dijx10qk32c4agih9fxyfv";
        libraryHaskellDepends = [ base containers lens mtl ];
        description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176151,8 +176151,8 @@ self: {
        sha256 = "1sq2ll3ac3fxb0gdcy6gzjlv5j17pnrj8zs2bhi2s96dx2gp6zrv";
        libraryHaskellDepends = [ base mtl ];
        description = "A library for (left, right) zero monoids and backtracking with cut";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176168,8 +176168,8 @@ self: {
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "Various extra monoid-related definitions and utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176182,8 +176182,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring containers ];
        description = "a practical monoid implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176195,7 +176195,7 @@ self: {
        sha256 = "14xs1nvf0ngx4jvinkhzq3ainhs159zx0396z88y21vvc8kw42i5";
        libraryHaskellDepends = [ base ];
        description = "Support for modifying record fields of monoidal type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoid-statistics" = callPackage
@@ -176215,7 +176215,7 @@ self: {
          base math-functions QuickCheck tasty tasty-quickcheck
        ];
        description = "Monoids for calculation of statistics of sample";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoid-subclasses" = callPackage
@@ -176234,7 +176234,7 @@ self: {
          tasty tasty-quickcheck text vector
        ];
        description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -176245,7 +176245,7 @@ self: {
        sha256 = "1243r77m5ywphwyhw7kn9vb2ha5m5zj375bd61fprdfiwi3z3as3";
        libraryHaskellDepends = [ base semigroups ];
        description = "Monoid counterparts to some ubiquitous monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoidal-containers" = callPackage
@@ -176263,7 +176263,7 @@ self: {
          semigroups these unordered-containers
        ];
        description = "Containers with monoidal accumulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monoidplus" = callPackage
@@ -176276,8 +176276,8 @@ self: {
          base contravariant semigroups transformers
        ];
        description = "Extra classes/functions about monoids";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176293,8 +176293,8 @@ self: {
          array base bytestring containers fingertree parallel text
        ];
        description = "Deprecated: Use 'reducers'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176306,7 +176306,7 @@ self: {
        sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln";
        libraryHaskellDepends = [ base ];
        description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "monopati" = callPackage
@@ -176322,8 +176322,8 @@ self: {
          base directory free hedgehog peano split transformers
        ];
        description = "Well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176344,8 +176344,8 @@ self: {
          zeromq-haskell
        ];
        description = "Riak Resolution Proxy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {riak-bump = null; stats-web = null;};
 
@@ -176367,8 +176367,8 @@ self: {
          unordered-containers zeromq-haskell
        ];
        description = "Riak Resolution Proxy Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {riak-bump = null; stats-web = null;};
 
@@ -176389,8 +176389,8 @@ self: {
          test-framework-quickcheck2 transformers vector
        ];
        description = "A monad and transformer for Monte Carlo calculations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176411,8 +176411,8 @@ self: {
          time-compat
        ];
        description = "Month, YearMonth, Quarter, YearQuarter types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176429,8 +176429,8 @@ self: {
          base containers smallcheck tasty tasty-quickcheck tasty-smallcheck
        ];
        description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176454,8 +176454,8 @@ self: {
          timerep transformers wai warp
        ];
        description = "Haskell bindings for the Monzo API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176477,8 +176477,8 @@ self: {
          MonadRandom mtl parallel random random-shuffle time vector
        ];
        description = "Genetic algorithm library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176495,7 +176495,7 @@ self: {
          text time transformers yaml
        ];
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "more-containers" = callPackage
@@ -176507,7 +176507,7 @@ self: {
        libraryHaskellDepends = [ base binary containers ];
        testHaskellDepends = [ base binary containers hspec ];
        description = "A few more collections";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "more-extensible-effects" = callPackage
@@ -176518,7 +176518,7 @@ self: {
        sha256 = "1sl4m02ji5my13kajcr2csqm24jph01qsihxj5dj66cxgw99idq1";
        libraryHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "morfette" = callPackage
@@ -176538,8 +176538,8 @@ self: {
          pretty QuickCheck text utf8-string vector
        ];
        description = "A tool for supervised learning of morphology";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176557,8 +176557,8 @@ self: {
        ];
        librarySystemDepends = [ morfeusz ];
        description = "Bindings to the morphological analyser Morfeusz";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {morfeusz = null;};
 
@@ -176595,8 +176595,8 @@ self: {
          morley-prelude named optparse-applicative text vinyl with-utf8
        ];
        description = "Developer tools for the Michelson Language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176608,7 +176608,7 @@ self: {
        sha256 = "1nrwrz54xg0v9v8f1caccpdav1d0nnjqy8r8wmj5cgf9y30jfzjf";
        libraryHaskellDepends = [ base-noprelude universum ];
        description = "A custom prelude used in Morley";
-       license = stdenv.lib.licenses.agpl3Plus;
+       license = lib.licenses.agpl3Plus;
      }) {};
 
   "morloc" = callPackage
@@ -176646,8 +176646,8 @@ self: {
          tasty-quickcheck template-haskell text unordered-containers yaml
        ];
        description = "A multi-lingual, typed, workflow language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176667,7 +176667,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A simple database migrator for PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "morpheus-graphql" = callPackage
@@ -176691,7 +176691,7 @@ self: {
          template-haskell text transformers unordered-containers vector
        ];
        description = "Morpheus GraphQL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morpheus-graphql-cli" = callPackage
@@ -176711,8 +176711,8 @@ self: {
          base bytestring filepath morpheus-graphql optparse-applicative
        ];
        description = "Morpheus GraphQL CLI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176736,7 +176736,7 @@ self: {
          unordered-containers
        ];
        description = "Morpheus GraphQL Client";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morpheus-graphql-core" = callPackage
@@ -176761,7 +176761,7 @@ self: {
          th-lift-instances transformers unordered-containers vector
        ];
        description = "Morpheus GraphQL Core";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morpheus-graphql-subscriptions" = callPackage
@@ -176784,7 +176784,7 @@ self: {
          unordered-containers uuid websockets
        ];
        description = "Morpheus GraphQL Subscriptions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morphisms" = callPackage
@@ -176794,7 +176794,7 @@ self: {
        version = "0.1.1";
        sha256 = "0waj252x6xpxaph50l248r0xf44xzfsz6jpmza5mwi9qf1br6dws";
        description = "It's all about functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "morphisms-functors" = callPackage
@@ -176805,8 +176805,8 @@ self: {
        sha256 = "1mv2sjn68n55482496icg84nbf3mn85fizf4q42781qn689np60q";
        libraryHaskellDepends = [ morphisms ];
        description = "Functors, theirs compositions and transformations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176818,8 +176818,8 @@ self: {
        sha256 = "16p5wj9yq6qsbzaqsx0p33fkginkf5mbqg4y7pak2wx1v7aqll2m";
        libraryHaskellDepends = [ morphisms morphisms-functors ];
        description = "Inventory is state and store";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176831,8 +176831,8 @@ self: {
        sha256 = "1d5jbjp8ih1fsna8w2mkw217ybsxdhyh7acq0r7b9iwngh52jj6b";
        libraryHaskellDepends = [ morphisms ];
        description = "Algebraic structures";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176866,8 +176866,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176886,8 +176886,8 @@ self: {
          stm-chans transformers
        ];
        description = "Generación interactiva de mosaicos";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176899,7 +176899,7 @@ self: {
        sha256 = "0c80pf189gkxr3zrf8r5rsw5gli1kk4q4pd3giww9wxwpc2nyjln";
        libraryHaskellDepends = [ base ];
        description = "Mosquitto client library bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "moss" = callPackage
@@ -176915,7 +176915,7 @@ self: {
          unix-compat
        ];
        description = "Haskell client for Moss";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "moto" = callPackage
@@ -176940,7 +176940,7 @@ self: {
          safe-exceptions tasty tasty-hunit tasty-quickcheck text time
        ];
        description = "General purpose migrations library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "moto-postgresql" = callPackage
@@ -176956,8 +176956,8 @@ self: {
          text
        ];
        description = "PostgreSQL-based migrations registry for moto";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -176979,7 +176979,7 @@ self: {
        ];
        testHaskellDepends = [ base indexed indexed-extras row-types ];
        description = "Type-safe effectful state machines in Haskell";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "motor-diagrams" = callPackage
@@ -176998,8 +176998,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177017,8 +177017,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177031,7 +177031,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177066,8 +177066,8 @@ self: {
          system-filepath text time
        ];
        description = "Plays videos using GStreamer and GTK+";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177080,7 +177080,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "This is a library for calculating moving averages on lists of numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mp" = callPackage
@@ -177104,8 +177104,8 @@ self: {
          simple-ui template-haskell text unix utf8-string vty
        ];
        description = "Music player for linux";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177122,7 +177122,7 @@ self: {
        ];
        description = "MP3 decoder for teaching";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mpdmate" = callPackage
@@ -177137,8 +177137,8 @@ self: {
          base directory network powermate unix
        ];
        description = "MPD/PowerMate executable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177151,7 +177151,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpg123 ];
        description = "Mpg132 bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) mpg123;};
 
   "mpi-hs" = callPackage
@@ -177170,7 +177170,7 @@ self: {
        testHaskellDepends = [ base monad-loops ];
        testSystemDepends = [ mpich ];
        description = "MPI bindings for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {inherit (pkgs) mpich;};
 
   "mpi-hs-binary" = callPackage
@@ -177187,7 +177187,7 @@ self: {
        executableHaskellDepends = [ base mpi-hs ];
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mpi-hs-cereal" = callPackage
@@ -177204,7 +177204,7 @@ self: {
        executableHaskellDepends = [ base mpi-hs ];
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mpi-hs-store" = callPackage
@@ -177221,7 +177221,7 @@ self: {
        executableHaskellDepends = [ base mpi-hs ];
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mplayer-spot" = callPackage
@@ -177241,7 +177241,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Save your spot when watching movies with @mplayer@";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mpppc" = callPackage
@@ -177255,7 +177255,7 @@ self: {
        ];
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177274,8 +177274,8 @@ self: {
          base devtools source-constraints text unliftio-core
        ];
        description = "A minimalish prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177292,8 +177292,8 @@ self: {
          orders text transformers
        ];
        description = "a monadic, extensible pretty printing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177305,8 +177305,8 @@ self: {
        sha256 = "11c62m19ngap44fv4gnv0ln8iff1b08dg2vclj16jx1fj8pqps9y";
        libraryHaskellDepends = [ base containers dbus mtl ];
        description = "Interface for MPRIS";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177324,8 +177324,8 @@ self: {
          base containers haskell98 mtl parsec pretty transformers unbound
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177345,8 +177345,8 @@ self: {
          utf8-string
        ];
        description = "simply oo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177371,8 +177371,8 @@ self: {
        ];
        executableToolDepends = [ c2hs ];
        description = "A work in progress Multipath TCP path manager";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177391,8 +177391,8 @@ self: {
          base directory filepath gtk mtl process template-haskell unix
        ];
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177421,8 +177421,8 @@ self: {
          base binary bytestring criterion text
        ];
        description = "An MQTT protocol implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177439,8 +177439,8 @@ self: {
          stm text transformers
        ];
        description = "A MQTT client library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177453,7 +177453,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A simple way to read environment variables in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mrifk" = callPackage
@@ -177467,7 +177467,7 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        description = "Decompiles Glulx files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177479,8 +177479,8 @@ self: {
        sha256 = "1qmfki808284yz8l5l30s10q6idhlmp864wi6xbk14chh331xaiw";
        libraryHaskellDepends = [ base ];
        description = "Modular Refiable Matching, first-class matches";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177501,8 +177501,8 @@ self: {
          base doctest profunctors tasty tasty-quickcheck vector
        ];
        description = "metric spaces";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177526,7 +177526,7 @@ self: {
          x509-system
        ];
        description = "TDS Protocol implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "msgpack" = callPackage
@@ -177548,8 +177548,8 @@ self: {
          async base bytestring QuickCheck tasty tasty-quickcheck
        ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177568,8 +177568,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        description = "Aeson adapter for MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177596,8 +177596,8 @@ self: {
          base bytestring criterion deepseq QuickCheck
        ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177619,8 +177619,8 @@ self: {
        executableHaskellDepends = [ base cmdargs directory peggy ];
        testHaskellDepends = [ base hspec ];
        description = "An IDL Compiler for MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177641,8 +177641,8 @@ self: {
        ];
        testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
        description = "A MessagePack-RPC Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177664,8 +177664,8 @@ self: {
        ];
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177687,7 +177687,7 @@ self: {
          QuickCheck text unordered-containers vector
        ];
        description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "msh" = callPackage
@@ -177703,8 +177703,8 @@ self: {
          template-haskell text
        ];
        description = "Object-Oriented Programming in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177718,8 +177718,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177740,7 +177740,7 @@ self: {
          text time tls uuid-types
        ];
        description = "SQL Server client library implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mstate" = callPackage
@@ -177751,7 +177751,7 @@ self: {
        sha256 = "13jv04skkb0ysxx9gswynp7fg7yz3nwy5zhzp209fbwr9izxcm05";
        libraryHaskellDepends = [ base fail monad-peel mtl stm ];
        description = "MState: A consistent State monad for concurrent applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "msu" = callPackage
@@ -177768,7 +177768,7 @@ self: {
          base directory filepath mtl parsec process xdg-basedir
        ];
        description = "Monitor Setup Utility";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mtgoxapi" = callPackage
@@ -177794,8 +177794,8 @@ self: {
          text time transformers unordered-containers vector watchdog
        ];
        description = "Library to communicate with Mt.Gox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177807,8 +177807,8 @@ self: {
        sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad classes, using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mtl-c" = callPackage
@@ -177819,8 +177819,8 @@ self: {
        sha256 = "12zays8x0b65dc11s95f5j6gwz2kksh9md5m9cpal1yj5qydmmrd";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Very strict CPS'd transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177833,7 +177833,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        doHaddock = false;
        description = "Backported Control.Monad.Except module from mtl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mtl-evil-instances" = callPackage
@@ -177848,8 +177848,8 @@ self: {
          base monad-control mtl transformers transformers-base
        ];
        description = "Instances for the mtl classes for all monad transformers";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177861,8 +177861,8 @@ self: {
        sha256 = "1v7wm6gsp3c9kad6slxwj68s3050zqkv6k4n5h827vgx7na694pz";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Higher order versions of MTL classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177874,7 +177874,7 @@ self: {
        sha256 = "0cqjl0mcnj6qgx46qxjygndzlgch4mc0q0sm3wbd4fynjfhdv9n4";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mtl-tf" = callPackage
@@ -177885,8 +177885,8 @@ self: {
        sha256 = "0z9vinxhbbg4lpf8mxi0h3jbz4kv6x3ih05q44kjh4z8mpm9szzy";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad Transformer Library with Type Families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177906,7 +177906,7 @@ self: {
          base contravariant hspec hspec-core lens mtl profunctors
        ];
        description = "MTL classes without the functional dependency";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mtl-uplift" = callPackage
@@ -177918,7 +177918,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base mtl ];
        description = "Lift substacks of monad transformer stacks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mtlparse" = callPackage
@@ -177940,8 +177940,8 @@ self: {
        sha256 = "0s0cniqn1fb7rq14w3wjh7mkzkxpndj1h1wrgssxds6cs3vkk4dn";
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -177955,7 +177955,7 @@ self: {
        librarySystemDepends = [ mtp ];
        description = "Bindings to libmtp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {mtp = null;};
 
@@ -177967,7 +177967,7 @@ self: {
        sha256 = "1l4kjrmr5v8pkhf48w0ym6dlrsvaf21p3x5sykq1rxwp821cqglv";
        libraryHaskellDepends = [ base bifunctors ];
        description = "Tree with Meta and Content parameters";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "mtsl" = callPackage
@@ -177978,7 +177978,7 @@ self: {
        sha256 = "02zfqimal6f5a1wldfy4abk7mvmvac71j9m01bxzw5ydmm057wgh";
        libraryHaskellDepends = [ base mtl ];
        description = "Reified monad transformer stacks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mu-avro" = callPackage
@@ -178003,8 +178003,8 @@ self: {
          avro base bytestring containers mu-schema
        ];
        description = "Avro serialization support for Mu microservices";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178034,8 +178034,8 @@ self: {
          aeson base conduit mu-rpc mu-schema regex-tdfa text wai-extra warp
        ];
        description = "GraphQL support for Mu";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178059,8 +178059,8 @@ self: {
          stm-conduit template-haskell text th-abstraction tracing
        ];
        description = "gRPC clients from Mu definitions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178080,8 +178080,8 @@ self: {
          mu-avro mu-protobuf mu-rpc mu-schema
        ];
        description = "gRPC for Mu, common modules for client and server";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178108,8 +178108,8 @@ self: {
          stm-conduit wai warp warp-grpc warp-tls
        ];
        description = "gRPC servers for Mu definitions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178126,8 +178126,8 @@ self: {
          mu-avro mu-schema resourcet
        ];
        description = "Utilities for interoperation between Mu and Kafka";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178143,8 +178143,8 @@ self: {
          base containers generic-lens lens mu-rpc mu-schema sop-core text
        ];
        description = "Lenses for @mu-schema@ terms";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178159,8 +178159,8 @@ self: {
          base containers mu-schema optics-core sop-core
        ];
        description = "Optics for @mu-schema@ terms";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178177,8 +178177,8 @@ self: {
          transformers
        ];
        description = "Utilities for interoperation between Mu and Persistent";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178195,8 +178195,8 @@ self: {
          wai-middleware-prometheus
        ];
        description = "Metrics support for Mu using Prometheus";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178222,8 +178222,8 @@ self: {
          base bytestring containers mu-schema proto3-wire text
        ];
        description = "Protocol Buffers serialization and gRPC schema import for Mu microservices";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178240,8 +178240,8 @@ self: {
          template-haskell text wai
        ];
        description = "Protocol-independent declaration of services and servers";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178260,8 +178260,8 @@ self: {
          vector
        ];
        description = "Format-independent schemas for serialization";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178285,8 +178285,8 @@ self: {
          aeson base conduit mu-rpc mu-schema servant-server text warp
        ];
        description = "Servant servers for Mu definitions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178300,8 +178300,8 @@ self: {
          base containers mu-rpc text tracing-control
        ];
        description = "Tracing support for Mu";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178337,8 +178337,8 @@ self: {
          base directory free hspec mtl QuickCheck time unix
        ];
        description = "Multi-version deployer for web applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178360,7 +178360,7 @@ self: {
        ];
        description = "Continuous deployment server for use with GitHub";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "muesli" = callPackage
@@ -178376,8 +178376,8 @@ self: {
          psqueues time
        ];
        description = "A simple document-oriented database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178399,7 +178399,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Safely evaluate pure Haskell expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mulang" = callPackage
@@ -178431,8 +178431,8 @@ self: {
        ];
        testToolDepends = [ alex happy ];
        description = "An intermediate language designed to perform advanced code analysis";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178444,8 +178444,8 @@ self: {
        sha256 = "1if1ip22y7w59lkyshn4ic4p46zrfs4kcdzzjai9l8xbscavgdl6";
        libraryHaskellDepends = [ base ];
        description = "MULTEXT-East morphosyntactic descriptors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178467,8 +178467,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "A tool supporting multi cabal project builds";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178482,7 +178482,7 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        testToolDepends = [ hspec-discover ];
        description = "A few multimap variants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multi-instance" = callPackage
@@ -178494,8 +178494,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Typeclasses augmented with a phantom type parameter";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178508,8 +178508,8 @@ self: {
        libraryHaskellDepends = [ base composition containers ];
        testHaskellDepends = [ base containers HTF ];
        description = "Trie of sets, as a model for compound names having multiple values";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178530,8 +178530,8 @@ self: {
          base tasty tasty-hunit tasty-quickcheck text
        ];
        description = "A network address format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178550,8 +178550,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th
        ];
        description = "Command lines for options that take multiple arguments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178574,8 +178574,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178594,7 +178594,7 @@ self: {
          transformers
        ];
        description = "create many files from one";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multifocal" = callPackage
@@ -178619,8 +178619,8 @@ self: {
          process syb
        ];
        description = "Bidirectional Two-level Transformation of XML Schemas";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178644,8 +178644,8 @@ self: {
          cryptohash hex io-streams optparse-applicative
        ];
        description = "Multihash library and CLI executable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178665,7 +178665,7 @@ self: {
        ];
        testHaskellDepends = [ base cryptonite doctest hedgehog ];
        description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multihash-serialise" = callPackage
@@ -178682,8 +178682,8 @@ self: {
        ];
        testHaskellDepends = [ base cryptonite hedgehog serialise ];
        description = "CBOR encoding of multihashes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178695,7 +178695,7 @@ self: {
        sha256 = "1bripl4vqj275n4wnka7vrdcjyyppbc773pfsbmvfjvl2qqi5jrb";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "hashmap from keys to hashsets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multilinear" = callPackage
@@ -178716,8 +178716,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq weigh ];
        description = "Comprehensive and efficient (multi)linear algebra implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178741,8 +178741,8 @@ self: {
          base criterion deepseq directory either multilinear transformers
        ];
        description = "Conduit-based input/output capability for multilinear package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178754,7 +178754,7 @@ self: {
        sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
        libraryHaskellDepends = [ base containers ];
        description = "A multimap";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "multipart" = callPackage
@@ -178765,7 +178765,7 @@ self: {
        sha256 = "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn";
        libraryHaskellDepends = [ base bytestring parsec stringsearch ];
        description = "Parsers for the HTTP multipart format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multipart-names" = callPackage
@@ -178781,7 +178781,7 @@ self: {
          base HUnit lens test-framework test-framework-hunit
        ];
        description = "Handling of multipart names in various casing styles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multipass" = callPackage
@@ -178797,8 +178797,8 @@ self: {
          newtype unordered-containers
        ];
        description = "Folding data with multiple named passes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178810,8 +178810,8 @@ self: {
        sha256 = "0m4wmh5iib5g1qxzj23q330gznib7q80r405df10k9685aqafgn3";
        libraryHaskellDepends = [ base parsec utf8-string ];
        description = "Parser and builder for unix-path-like objects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178826,7 +178826,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base transformers ];
        description = "Lightweight generic library for mutually recursive data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "multiplate-simplified" = callPackage
@@ -178838,8 +178838,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base multiplate transformers ];
        description = "Shorter, more generic functions for Multiplate";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178856,8 +178856,8 @@ self: {
          base containers fez-conf mtl process
        ];
        description = "Wrapper program for duplicity, adding config files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178878,7 +178878,7 @@ self: {
          text unordered-containers
        ];
        description = "Generalized system for reading and writing to distributed systems that have primary/replica topologies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multipool-persistent" = callPackage
@@ -178898,7 +178898,7 @@ self: {
          unordered-containers
        ];
        description = "Read and write from appropriate persistent sql instances in replicated environments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multipool-persistent-postgresql" = callPackage
@@ -178922,8 +178922,8 @@ self: {
          unliftio-core unordered-containers
        ];
        description = "Read and write appropriately from both master and replicated postgresql instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178944,7 +178944,7 @@ self: {
          base bytestring mtl multipool postgresql-simple resource-pool
          unliftio-core unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multiprocess" = callPackage
@@ -178955,7 +178955,7 @@ self: {
        sha256 = "06f1yq4x9jc7cv8nxsqbm47xbv6b2cp1q8xkbhlqr9dbz8cvf5my";
        libraryHaskellDepends = [ base ];
        description = "Multiprocess architecture library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multirec" = callPackage
@@ -178967,8 +178967,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Generic programming for families of recursive datatypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178984,8 +178984,8 @@ self: {
          base containers mtl multirec syb template-haskell th-expand-syns
        ];
        description = "Alternative multirec instances deriver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -178997,8 +178997,8 @@ self: {
        sha256 = "1cj1rfjqxwc06vr5w12fqbcpjb0fjsphf8vp40sp2naizpvvnmzs";
        libraryHaskellDepends = [ base binary multirec ];
        description = "Generic Data.Binary instances using MultiRec.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179015,7 +179015,7 @@ self: {
          base checkers doctest QuickCheck tasty tasty-quickcheck
        ];
        description = "The Data.MultiSet container type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multiset-comb" = callPackage
@@ -179028,7 +179028,7 @@ self: {
        editedCabalFile = "1amjahzg4lpgmhf4v456waa216afjpq3gcb45pqid5km9z1ycjdg";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Combinatorial algorithms over multisets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multisetrewrite" = callPackage
@@ -179040,8 +179040,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm ];
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179060,7 +179060,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec transformers ];
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "multivariant" = callPackage
@@ -179090,8 +179090,8 @@ self: {
          transformers
        ];
        description = "Multivariant assignments generation language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179110,8 +179110,8 @@ self: {
          base smallcheck tasty tasty-smallcheck Vector
        ];
        description = "Vectors of packed tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Vector = null;};
 
@@ -179132,8 +179132,8 @@ self: {
          HStringTemplate markdown MissingH process text
        ];
        description = "Static blog generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179151,7 +179151,7 @@ self: {
        ];
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179177,8 +179177,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Simple CUI Twitter Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179190,7 +179190,7 @@ self: {
        sha256 = "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9";
        libraryHaskellDepends = [ base bytestring ];
        description = "MurmurHash2 implementation for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "murmur3" = callPackage
@@ -179210,7 +179210,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "murmurhash3" = callPackage
@@ -179221,8 +179221,8 @@ self: {
        sha256 = "1hz6rf1qrzgixx19bn9hnp07jfb61wnrjq5bgqnd3px569afwdb2";
        libraryHaskellDepends = [ haskell2010 ];
        description = "32-bit non-cryptographic hashing";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179249,8 +179249,8 @@ self: {
        ];
        testHaskellDepends = [ base classy-prelude ];
        description = "Minimalist MPD client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179262,7 +179262,7 @@ self: {
        sha256 = "0cxbhk25kn3hpkmb6h0brcf03yyi6kaz3i3l3lv2rzgfxv14a2pg";
        libraryHaskellDepends = [ average base semigroups ];
        description = "Abstract representation of musical articulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-diatonic" = callPackage
@@ -179274,7 +179274,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Implementation of basic western musical theory objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-dynamics" = callPackage
@@ -179288,7 +179288,7 @@ self: {
          average base music-dynamics-literal semigroups
        ];
        description = "Abstract representation of musical dynamics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-dynamics-literal" = callPackage
@@ -179299,7 +179299,7 @@ self: {
        sha256 = "19bql45aqjfkhvpkfbvfcsc8p1mzg93n966r1yv5rwps6s2x86d5";
        libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded dynamics literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-graphics" = callPackage
@@ -179315,8 +179315,8 @@ self: {
          music-score process
        ];
        description = "Diagrams-based visualization of musical data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179339,8 +179339,8 @@ self: {
          vector-space vector-space-points
        ];
        description = "Musical instruments, parts and playing techniques";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179358,8 +179358,8 @@ self: {
          positive semigroups type-unary vector-space vector-space-points
        ];
        description = "Musical pitch representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179373,7 +179373,7 @@ self: {
        editedCabalFile = "0v86clbcjkgg7psx8jbxq4za66v8ln1vkr7ywrm0vz6vbgkg356f";
        libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded pitch literals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "music-preludes" = callPackage
@@ -179400,8 +179400,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179425,8 +179425,8 @@ self: {
          transformers-compat vector-space vector-space-points
        ];
        description = "Musical score and part representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179446,8 +179446,8 @@ self: {
          music-preludes music-score semigroups unordered-containers
        ];
        description = "Interaction with Sibelius";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179467,8 +179467,8 @@ self: {
        ];
        doHaddock = false;
        description = "A set of libraries for composition, analysis and manipulation of music";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179486,8 +179486,8 @@ self: {
          base Cabal containers directory fgl process shelly split text unix
        ];
        description = "Utility for developing the Music Suite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179512,8 +179512,8 @@ self: {
        executableHaskellDepends = [ base ];
        executablePkgconfigDepends = [ gtk3 ];
        description = "Supply your tunes info without leaving your music player";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gtk3;};
 
@@ -179547,8 +179547,8 @@ self: {
          test-framework-smallcheck text time transformers xmlhtml
        ];
        description = "Send an email to all MusicBrainz editors";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179567,8 +179567,8 @@ self: {
          transformers
        ];
        description = "Sound synthesis library, to be used with GHCJS and Web Audio API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghcjs-prim = null;};
 
@@ -179584,8 +179584,8 @@ self: {
          base containers directory HaXml old-time pretty
        ];
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179603,7 +179603,7 @@ self: {
          reverse-apply semigroups type-unary xml
        ];
        description = "A representation of the MusicXML format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mustache" = callPackage
@@ -179632,7 +179632,7 @@ self: {
          lens process tar temporary text unordered-containers wreq yaml zlib
        ];
        description = "A mustache template parser library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mustache-haskell" = callPackage
@@ -179656,8 +179656,8 @@ self: {
          vector
        ];
        description = "Straight implementation of mustache templates";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179677,7 +179677,7 @@ self: {
        ];
        description = "Utility to generate Haskell code from Mustache templates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mutable" = callPackage
@@ -179698,7 +179698,7 @@ self: {
          transformers vector vinyl
        ];
        description = "Automatic piecewise-mutable references for your types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mutable-containers" = callPackage
@@ -179717,7 +179717,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers gauge vector ];
        description = "Abstactions and concrete implementations of mutable containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mutable-iter" = callPackage
@@ -179732,8 +179732,8 @@ self: {
          base iteratee MonadCatchIO-transformers transformers vector
        ];
        description = "iteratees based upon mutable buffers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179752,7 +179752,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base extra primitive ];
        description = "Interoperate mutable references with regular lens";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "mute-unmute" = callPackage
@@ -179770,8 +179770,8 @@ self: {
          process
        ];
        description = "Watches your screensaver and (un)mutes music when you (un)lock the screen";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179783,8 +179783,8 @@ self: {
        sha256 = "09diqzb4vp7bcg6v16fgjb70mi68i8srnyxf6qga58va6avbc4wg";
        libraryHaskellDepends = [ base safe-exceptions ];
        description = "A trivial lock based on MVar";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179801,8 +179801,8 @@ self: {
          pipes-concurrency transformers
        ];
        description = "Model-view-controller";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179814,8 +179814,8 @@ self: {
        sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
        libraryHaskellDepends = [ async base foldl mvc ];
        description = "Concurrent and combinable updates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179834,8 +179834,8 @@ self: {
          maccatcher mtl network parsec time uuid
        ];
        description = "Client library for metaverse systems like Second Life";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -179851,7 +179851,7 @@ self: {
          base containers mwc-random primitive transformers
        ];
        description = "Sampling function-based probability distributions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "mwc-probability-transition" = callPackage
@@ -179870,7 +179870,7 @@ self: {
          base hspec logging-effect mwc-probability QuickCheck
        ];
        description = "A Markov stochastic transition operator with logging";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mwc-random" = callPackage
@@ -179884,7 +179884,7 @@ self: {
        ];
        doCheck = false;
        description = "Fast, high quality pseudo random number generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mwc-random_0_15_0_1" = callPackage
@@ -179908,8 +179908,8 @@ self: {
        ];
        doCheck = false;
        description = "Fast, high quality pseudo random number generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mwc-random-accelerate" = callPackage
@@ -179920,7 +179920,7 @@ self: {
        sha256 = "1a8b36l60p29461y0gacgjzarlyrncl54r7x4zh2rgvs2w7mjdc5";
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -179935,7 +179935,7 @@ self: {
          base monad-primitive mwc-random primitive transformers vector
        ];
        description = "Monadic interface for mwc-random";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mx-state-codes" = callPackage
@@ -179947,7 +179947,7 @@ self: {
        libraryHaskellDepends = [ aeson base text ];
        testHaskellDepends = [ aeson base hspec QuickCheck text ];
        description = "ISO 3166-2:MX State Codes and Names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mxnet" = callPackage
@@ -179967,8 +179967,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "MXNet interface in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mxnet;};
 
@@ -179986,8 +179986,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mxnet streaming ];
        description = "mxnet dataiters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180001,8 +180001,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mxnet ];
        description = "Examples for MXNet in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180028,8 +180028,8 @@ self: {
          streaming-utils unordered-containers vector
        ];
        description = "Train a neural network with MXNet in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180043,8 +180043,8 @@ self: {
        librarySystemDepends = [ mxnet ];
        libraryToolDepends = [ c2hs ];
        description = "NNVM interface in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) mxnet;};
 
@@ -180069,8 +180069,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180095,8 +180095,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "spam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180121,8 +180121,8 @@ self: {
          ansi-terminal base Cabal Euterpea QuickCheck
        ];
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180146,8 +180146,8 @@ self: {
          http-client-tls network-uri text yaml
        ];
        description = "Export from MyAnimeList";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180161,7 +180161,7 @@ self: {
          base cgi curl directory mtl process split
        ];
        description = "Binding to mybitcoin.com's Shopping Cart Interface.";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "myo" = callPackage
@@ -180184,8 +180184,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Haskell binding to the Myo armband";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180202,8 +180202,8 @@ self: {
          regex-posix snap snap-core time
        ];
        description = "Sessions and continuations for Snap web apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180223,8 +180223,8 @@ self: {
          snap-core snap-server text time
        ];
        description = "Example projects using mysnapsession";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180240,7 +180240,7 @@ self: {
        librarySystemDepends = [ mysql ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "A low-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
@@ -180257,8 +180257,8 @@ self: {
          base bytestring extensible-effects mysql mysql-simple
        ];
        description = "An extensible mysql effect using extensible-effects and mysql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180282,7 +180282,7 @@ self: {
          base bytestring io-streams tasty tasty-hunit text time vector
        ];
        description = "pure haskell MySQL driver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mysql-haskell-nem" = callPackage
@@ -180297,7 +180297,7 @@ self: {
          base bytestring io-streams mysql-haskell scientific text time
        ];
        description = "Adds a interface like mysql-simple to mysql-haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mysql-haskell-openssl" = callPackage
@@ -180313,8 +180313,8 @@ self: {
          wire-streams
        ];
        description = "TLS support for mysql-haskell package using openssl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180333,7 +180333,7 @@ self: {
        ];
        testHaskellDepends = [ base blaze-builder hspec text ];
        description = "A mid-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "mysql-simple-quasi" = callPackage
@@ -180348,8 +180348,8 @@ self: {
          base haskell-src-meta mysql-simple template-haskell
        ];
        description = "Quasi-quoter for use with mysql-simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180365,8 +180365,8 @@ self: {
          base mysql mysql-simple template-haskell typedquery utf8-string
        ];
        description = "Typed extension to mysql simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180385,8 +180385,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "Bindings for Mystem morphological analyzer executabe";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180411,8 +180411,8 @@ self: {
          unordered-containers wai wai-extra wai-middleware-static warp
        ];
        description = "Web application to view and kill MySQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180435,8 +180435,8 @@ self: {
        ];
        testHaskellDepends = [ bytestring text ];
        description = "A Haskell client for the Myxine GUI server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180448,8 +180448,8 @@ self: {
        sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l";
        libraryHaskellDepends = [ base transformers ];
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180467,7 +180467,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "An n-ary version of Functor";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "n-m" = callPackage
@@ -180482,7 +180482,7 @@ self: {
        executableHaskellDepends = [ base HSH mtl process ];
        description = "Utility to call iwconfig";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "n-tuple" = callPackage
@@ -180493,8 +180493,8 @@ self: {
        sha256 = "0gq2s7cfivzspr446h21c79md6wzg2q8wzmx8kivbxiixsr3bxva";
        libraryHaskellDepends = [ base singletons vector ];
        description = "Homogeneous tuples of arbitrary length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180508,7 +180508,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers text ];
        testHaskellDepends = [ base hspec ];
        description = "Abstract Protocol Loop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "n2o-nitro" = callPackage
@@ -180523,7 +180523,7 @@ self: {
          base base64-bytestring binary bytestring containers n2o text
        ];
        description = "Nitro Elements, Events and Actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "n2o-protocols" = callPackage
@@ -180539,8 +180539,8 @@ self: {
          time
        ];
        description = "N2O Protocols Starter Pack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180559,8 +180559,8 @@ self: {
          websockets
        ];
        description = "N2O adapter for WebSockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180575,7 +180575,7 @@ self: {
        libraryHaskellDepends = [ base bifunctors exceptions mtl text ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Package for writing monitoring plugins";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nagios-config" = callPackage
@@ -180589,7 +180589,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "EDSL to specify Nagios configuration files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "nagios-perfdata" = callPackage
@@ -180607,7 +180607,7 @@ self: {
          base bytestring hspec HUnit MissingH transformers
        ];
        description = "Parse Nagios performance data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nagios-plugin-ekg" = callPackage
@@ -180630,8 +180630,8 @@ self: {
          base bytestring hspec HUnit nagios-check text transformers
        ];
        description = "Monitor ekg metrics via Nagios";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180670,8 +180670,8 @@ self: {
          unliftio-core unordered-containers uuid vector wai warp
        ];
        description = "Client library for the Nakadi Event Broker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180686,7 +180686,7 @@ self: {
        libraryHaskellDepends = [ aeson attoparsec base lens text wreq ];
        executableHaskellDepends = [ base text ];
        description = "Tool to keep namecoin names updated and well";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "named" = callPackage
@@ -180700,7 +180700,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Named parameters (keyword arguments) for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "named-formlet" = callPackage
@@ -180715,7 +180715,7 @@ self: {
          base blaze-html bytestring containers mtl text transformers
        ];
        description = "A simple formlet library with named formlets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "named-lock" = callPackage
@@ -180726,8 +180726,8 @@ self: {
        sha256 = "1db12f2q395yk6pwz5gnb2q0kf4s868z8d1vvwa7vngnfc1h924i";
        libraryHaskellDepends = [ base containers ];
        description = "A named lock that is created on demand";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180739,7 +180739,7 @@ self: {
        sha256 = "0ykcmmnns63zjfd00kd9941c33l19n9c5b5xkin4n7r9v0qvirwr";
        libraryHaskellDepends = [ base binary names template-haskell ];
        description = "Flexible records with named fields";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "named-servant" = callPackage
@@ -180749,8 +180749,8 @@ self: {
        version = "0.2.0";
        sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53";
        libraryHaskellDepends = [ base named servant ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180766,8 +180766,8 @@ self: {
          base named named-servant servant servant-client-core
        ];
        description = "client support for named-servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180783,8 +180783,8 @@ self: {
          base named named-servant servant servant-server text
        ];
        description = "server support for named-servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180797,8 +180797,8 @@ self: {
        libraryHaskellDepends = [ base singletons text ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dependently-typed sums and products, tagged by field name";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180817,8 +180817,8 @@ self: {
          base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "fortran90 namelist parser/pretty printer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180830,7 +180830,7 @@ self: {
        sha256 = "0sjjp90zfrkjavj8fqyscnvc9d72mkvv8f7ajd47jba92mhwzr5g";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type level names";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "names-th" = callPackage
@@ -180841,7 +180841,7 @@ self: {
        sha256 = "12ally0n6ixsxj0zwbvw439dbx29phvh0rd6l5sd0c5a514a32aa";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Manipulate name strings for TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "namespace" = callPackage
@@ -180853,8 +180853,8 @@ self: {
        libraryHaskellDepends = [ base containers monoid-extras ];
        testHaskellDepends = [ base ];
        description = "A Generic Haskell library for managing namespaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -180872,7 +180872,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A threadsafe binding to glibc's crypt_r function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nano-erl" = callPackage
@@ -180883,7 +180883,7 @@ self: {
        sha256 = "04pfk3a9m6fgspyk2vriixldsx2y9p2jcwzfjfvpgjiq5dl602ip";
        libraryHaskellDepends = [ base stm ];
        description = "Small library for Erlang-style actor semantics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nano-hmac" = callPackage
@@ -180895,8 +180895,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        description = "Bindings to OpenSSL HMAC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -180911,8 +180911,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        description = "Efficient, ByteString bindings to OpenSSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -180931,7 +180931,7 @@ self: {
        ];
        description = "A toy dependently-typed language";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nanocurses" = callPackage
@@ -180943,8 +180943,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ ncurses ];
        description = "Simple Curses binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -180957,8 +180957,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nanomsg ];
        description = "nanomsg - scalability protocols library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) nanomsg;};
 
@@ -180983,8 +180983,8 @@ self: {
          base bytestring criterion zeromq4-haskell
        ];
        description = "Bindings to the nanomsg library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) nanomsg;};
 
@@ -180996,8 +180996,8 @@ self: {
        sha256 = "00ghdzkzshk24g7v42hq7zq0dxsq8vjpkslj41dxdnx0zizwbn3m";
        libraryHaskellDepends = [ base bytestring ListLike ];
        description = "An implementation of attoparsec-like parser around list-like";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181010,7 +181010,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec silently ];
        description = "A lightweight implementation of a subset of Hspec's API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nanovg" = callPackage
@@ -181031,8 +181031,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        description = "Haskell bindings for nanovg";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
@@ -181051,8 +181051,8 @@ self: {
          base GLFW-b monad-loops nanovg OpenGL safe-exceptions text
        ];
        description = "Simple interface to rendering with NanoVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181072,8 +181072,8 @@ self: {
          kanji microlens microlens-aeson optparse-applicative text
        ];
        description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181091,8 +181091,8 @@ self: {
          adjunctions base comonad distributive free streams transformers
        ];
        description = "Efficient representable functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181112,7 +181112,7 @@ self: {
        doHaddock = false;
        description = "A library for working with anything map related";
        license = "(Apache-2.0 OR BSD-3-Clause)";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181124,8 +181124,8 @@ self: {
        sha256 = "1ng1rzj1lf6h9g3pk8gsz05bnck72rp5j62iwn82vlcw8pyk0fsc";
        libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181137,7 +181137,7 @@ self: {
        sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
        libraryHaskellDepends = [ base ];
        description = "Lazy binary natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nat-sized-numbers" = callPackage
@@ -181149,8 +181149,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base doctest hedgehog QuickCheck ];
        description = "Variable-sized numbers from type-level nats";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181167,8 +181167,8 @@ self: {
          http-types multiset tls transformers xml
        ];
        description = "NationStates API client";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181189,7 +181189,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        testHaskellDepends = [ base ];
        description = "Native library manager for Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nats" = callPackage
@@ -181202,7 +181202,7 @@ self: {
        editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc";
        doHaddock = false;
        description = "Natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nats-client" = callPackage
@@ -181228,8 +181228,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Another Haskell client for NATS (https://nats.io)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181250,8 +181250,8 @@ self: {
          random text
        ];
        description = "Haskell API for NATS messaging system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181270,7 +181270,7 @@ self: {
          tasty-hunit tasty-quickcheck transformers
        ];
        description = "Natural number";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-arithmetic" = callPackage
@@ -181281,7 +181281,7 @@ self: {
        sha256 = "0zw1dax3a67cpilq57ykbrjybz9kc45qflpr6mwfz79hpx9pcld0";
        libraryHaskellDepends = [ base ];
        description = "Arithmetic of natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-induction" = callPackage
@@ -181294,7 +181294,7 @@ self: {
        editedCabalFile = "012kjygd54rxinmaplqnbw0hkfm4wp829j0afjxr6h40x22gwzn5";
        libraryHaskellDepends = [ base peano ];
        description = "Induction over natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-number" = callPackage
@@ -181310,8 +181310,8 @@ self: {
          type-level-natural-number-induction
        ];
        description = "Natural numbers tagged with a type-level representation of the number";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181323,7 +181323,7 @@ self: {
        sha256 = "0cj9lnnlvry425bkixqv9fh5b9xhy7dmwcqsxprj6lamccvxspwn";
        libraryHaskellDepends = [ base ];
        description = "Natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-sort" = callPackage
@@ -181334,7 +181334,7 @@ self: {
        sha256 = "0l3bkbqzrlpdhzazqqlx71ah0m13ypa0981qvw3sn9q8d0sbfwkv";
        libraryHaskellDepends = [ base bytestring parsec text ];
        description = "User-friendly text collation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "natural-transformation" = callPackage
@@ -181352,7 +181352,7 @@ self: {
          base containers quickcheck-instances tasty tasty-quickcheck
        ];
        description = "A natural transformation package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "naturalcomp" = callPackage
@@ -181363,7 +181363,7 @@ self: {
        sha256 = "1l594lkd3yb52lhh0raygvk3jlzwkcc2pmcqjmg02dmd6j6mw42x";
        libraryHaskellDepends = [ base text utf8-string ];
        description = "Natural-order string comparison";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "naturals" = callPackage
@@ -181374,7 +181374,7 @@ self: {
        sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
        libraryHaskellDepends = [ base ];
        description = "Constructors and related functions for natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "naver-translate" = callPackage
@@ -181389,8 +181389,8 @@ self: {
          aeson base iso639 lens lens-aeson network-uri random text wreq
        ];
        description = "Interface to Naver Translate";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181410,8 +181410,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text zlib
        ];
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181430,7 +181430,7 @@ self: {
          stm unix
        ];
        description = "CPU load and memory usage indicators for i3bar";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ncurses" = callPackage
@@ -181447,7 +181447,7 @@ self: {
        librarySystemDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
        description = "Modernised bindings to GNU ncurses";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) ncurses;};
 
   "ndjson-conduit" = callPackage
@@ -181460,7 +181460,7 @@ self: {
          aeson attoparsec base bytestring conduit
        ];
        description = "Conduit-based parsing and serialization for newline delimited JSON";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "neat" = callPackage
@@ -181474,8 +181474,8 @@ self: {
        libraryHaskellDepends = [ base filepath parsec ];
        executableHaskellDepends = [ base filepath parsec ];
        description = "A Fast Retargetable Template Engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181494,7 +181494,7 @@ self: {
          tasty-quickcheck
        ];
        description = "A quasiquoter for neat and simple multiline text interpolation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "needle" = callPackage
@@ -181510,8 +181510,8 @@ self: {
          template-haskell text vector
        ];
        description = "ASCII-fied arrow notation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181528,8 +181528,8 @@ self: {
          random transformers
        ];
        description = "A NEAT library for Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181549,8 +181549,8 @@ self: {
          random
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181569,7 +181569,7 @@ self: {
          old-time process time
        ];
        description = "General tools for Neil";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "neither" = callPackage
@@ -181580,8 +181580,8 @@ self: {
        sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf";
        libraryHaskellDepends = [ base failure transformers ];
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181602,8 +181602,8 @@ self: {
          process random tagged tasty tasty-hunit tasty-smallcheck temporary
        ];
        description = "Neko VM code generation and disassembly library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181625,7 +181625,7 @@ self: {
          random text transformers
        ];
        description = "a TCP tunnel with packet length obfuscation";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "nemesis" = callPackage
@@ -181640,7 +181640,7 @@ self: {
          base containers directory dlist Glob lens mtl process time
        ];
        description = "a task management tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nemesis-titan" = callPackage
@@ -181657,8 +181657,8 @@ self: {
          nemesis random uuid
        ];
        description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181692,8 +181692,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Neptune Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181720,8 +181720,8 @@ self: {
          polysoup sgd tagsoup temporary text text-binary tokenize vector
        ];
        description = "Nerf, a named entity recognition tool based on linear-chain CRFs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181740,8 +181740,8 @@ self: {
          base bytestring doctest Glob lens tasty tasty-hunit text
        ];
        description = "Lens-based HTTP toolkit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181757,8 +181757,8 @@ self: {
          base bytestring http-types lens nero text wai wai-extra
        ];
        description = "WAI adapter for Nero server applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181770,8 +181770,8 @@ self: {
        sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s";
        libraryHaskellDepends = [ base nero nero-wai warp ];
        description = "Run Nero server applications with Warp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181787,8 +181787,8 @@ self: {
          base bytestring containers text transformers unix
        ];
        testHaskellDepends = [ base bytestring containers hedgehog text ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181818,8 +181818,8 @@ self: {
          wai-middleware-verbs wai-transformers
        ];
        description = "Declarative, compositional Wai responses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181836,8 +181836,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "List-like data structures with O(log(n)) random access";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181850,7 +181850,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "Nested set model implementation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "nestedmap" = callPackage
@@ -181866,8 +181866,8 @@ self: {
          base base-unicode-symbols containers data-ordlist hspec QuickCheck
        ];
        description = "A library for nested maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181883,8 +181883,8 @@ self: {
          base bytestring containers ghc-binary hslogger monad-loops network
        ];
        description = "Concurrent over the network execution library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghc-binary = null;};
 
@@ -181918,8 +181918,8 @@ self: {
          tasty-quickcheck text websockets
        ];
        description = "An MQTT Protocol Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181936,8 +181936,8 @@ self: {
          base HUnit lens net-mqtt tasty tasty-hunit tasty-quickcheck
        ];
        description = "Optics for net-mqtt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181959,8 +181959,8 @@ self: {
          optparse-applicative random stm text uuid
        ];
        description = "Make RPC calls via an MQTT broker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -181985,8 +181985,8 @@ self: {
          hspec text time vector
        ];
        description = "A graph database middleware to maintain a time-varying graph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182007,8 +182007,8 @@ self: {
          base doctest doctest-discover hspec net-spider optparse-applicative
        ];
        description = "CLI option parsers for NetSpider objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182027,8 +182027,8 @@ self: {
          base doctest doctest-discover hspec net-spider pangraph text
        ];
        description = "Conversion between net-spider and pangraph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182050,8 +182050,8 @@ self: {
          text
        ];
        description = "NetSpider data model and utility for RPL networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182078,8 +182078,8 @@ self: {
          net-spider net-spider-cli net-spider-rpl optparse-applicative text
        ];
        description = "CLI executable of NetSpider.RPL.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182093,8 +182093,8 @@ self: {
        editedCabalFile = "00wqr9nnjn8hm0r8xa5qrgqva5r0pcf32hlksrqhkzy12yl2kv08";
        libraryHaskellDepends = [ base bytestring hosc network ];
        description = "Netclock protocol";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182109,7 +182109,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ libsodium ];
        description = "Bindings to the low-level netcode.io library.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libsodium;};
 
   "netcore" = callPackage
@@ -182140,8 +182140,8 @@ self: {
          random syb
        ];
        description = "The NetCore compiler and runtime system for OpenFlow networks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182170,8 +182170,8 @@ self: {
          random stm transformers vty
        ];
        description = "NetEase Cloud Music FM client in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182185,7 +182185,7 @@ self: {
          array base carray netlib-ffi transformers
        ];
        description = "Helper modules for CArray wrappers to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlib-comfort-array" = callPackage
@@ -182198,7 +182198,7 @@ self: {
          base comfort-array netlib-ffi transformers
        ];
        description = "Helper modules for comfort-array wrappers to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlib-ffi" = callPackage
@@ -182213,7 +182213,7 @@ self: {
          base guarded-allocation storable-complex transformers
        ];
        description = "Helper modules for FFI to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlines" = callPackage
@@ -182231,8 +182231,8 @@ self: {
        ];
        executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182251,7 +182251,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Netlink communication for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlist" = callPackage
@@ -182262,7 +182262,7 @@ self: {
        sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67";
        libraryHaskellDepends = [ base binary containers syb ];
        description = "Netlist AST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netlist-to-vhdl" = callPackage
@@ -182273,7 +182273,7 @@ self: {
        sha256 = "1f62l4i1l1z47gbrv49xx5y78ykcf6iq6bish3sx5fw46mhcr1j4";
        libraryHaskellDepends = [ base netlist pretty ];
        description = "Convert a Netlist AST to VHDL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netpbm" = callPackage
@@ -182292,7 +182292,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Loading PBM, PGM, PPM image files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "netrc" = callPackage
@@ -182310,7 +182310,7 @@ self: {
          base bytestring tasty tasty-golden tasty-quickcheck
        ];
        description = "Parser for .netrc files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "netrium" = callPackage
@@ -182329,8 +182329,8 @@ self: {
          base containers directory filepath HaXml pretty process
        ];
        description = "Contract normaliser and simulator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182347,8 +182347,8 @@ self: {
          transformers
        ];
        description = "Simplify static Networking tasks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182362,8 +182362,8 @@ self: {
          base bytestring enumerator transformers
        ];
        description = "Enumerator-based netstring parsing";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182389,7 +182389,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "safe nettle binding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -182405,8 +182405,8 @@ self: {
          network-data random time
        ];
        description = "FRP for controlling networks of OpenFlow switches";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182422,8 +182422,8 @@ self: {
          base containers directory filepath mtl nettle-openflow unix
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182440,8 +182440,8 @@ self: {
          mtl network parsec syb
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182458,7 +182458,7 @@ self: {
          transformers
        ];
        description = "Functional reactive programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "netwire-input" = callPackage
@@ -182469,7 +182469,7 @@ self: {
        sha256 = "1f9xxlcpy2brqn5hv0mdc428fav402jsqa1b8h4s8b09qa3v1ii9";
        libraryHaskellDepends = [ base deepseq netwire ];
        description = "Input handling abstractions for netwire";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "netwire-input-glfw" = callPackage
@@ -182486,7 +182486,7 @@ self: {
          base containers deepseq GLFW-b mtl netwire-input stm
        ];
        description = "GLFW instance of netwire-input";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "netwire-input-javascript" = callPackage
@@ -182501,8 +182501,8 @@ self: {
          base containers ghcjs-base netwire netwire-input transformers
        ];
        description = "JavaScript instance of netwire-input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182525,8 +182525,8 @@ self: {
          transformers vinyl vinyl-gl
        ];
        description = "Netwire/GLFW/VinylGL input handling demo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182543,8 +182543,8 @@ self: {
          base bytestring doctest HUnit test-framework test-framework-hunit
        ];
        description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network" = callPackage
@@ -182559,7 +182559,7 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec HUnit ];
        testToolDepends = [ hspec-discover ];
        description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network_3_1_2_1" = callPackage
@@ -182578,8 +182578,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-address" = callPackage
@@ -182597,8 +182597,8 @@ self: {
          base Cabal QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "IP data structures and textual representation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182621,8 +182621,8 @@ self: {
          hspec-expectations mtl network network-simple transformers uuid
        ];
        description = "Haskell API for I2P anonymous networking";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182652,8 +182652,8 @@ self: {
          text transformers
        ];
        description = "Haskell API for Tor anonymous networking";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182671,8 +182671,8 @@ self: {
          http-client-tls http-types text time tls
        ];
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182694,8 +182694,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Arbitrary Instances for Network Types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182719,8 +182719,8 @@ self: {
        ];
        doCheck = false;
        description = "Utility functions for running a parser against a socket";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182743,8 +182743,8 @@ self: {
          unordered-containers vector
        ];
        description = "An interface to bitcoind";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182758,7 +182758,7 @@ self: {
        editedCabalFile = "1hc3jdbmpq2wxh82xfx452v2m2l97jbdaqqbmj5nz4lljxa2696r";
        libraryHaskellDepends = [ base deepseq network ];
        description = "POSIX network database (<netdb.h>) API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-builder" = callPackage
@@ -182779,8 +182779,8 @@ self: {
          base cabal-test-bin hspec hspec-server process
        ];
        description = "Linux NetworkNameSpace Builder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182793,7 +182793,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring doctest ];
        description = "Network byte order utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-bytestring" = callPackage
@@ -182806,8 +182806,8 @@ self: {
        editedCabalFile = "0znp4qkad1sd650kjqhbbrr2ap7bb772g3db92k7r2rrydr19cdl";
        libraryHaskellDepends = [ base bytestring network unix ];
        description = "Fast, memory-efficient, low-level networking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182821,8 +182821,8 @@ self: {
          base bytestring network text time vector
        ];
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182835,7 +182835,7 @@ self: {
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
        description = "Stream socket data using conduits. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-conduit-tls" = callPackage
@@ -182855,7 +182855,7 @@ self: {
          base bytestring conduit conduit-extra connection HUnit mtl
        ];
        description = "Create TLS-aware network code with conduits";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "network-connection" = callPackage
@@ -182870,8 +182870,8 @@ self: {
          base bytestring containers network network-bytestring stm
        ];
        description = "A wrapper around a generic stream-like connection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182883,7 +182883,7 @@ self: {
        sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz";
        libraryHaskellDepends = [ base bytestring cereal pretty ];
        description = "Library for network data structures and their serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-dbus" = callPackage
@@ -182900,7 +182900,7 @@ self: {
        ];
        description = "D-Bus";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-dns" = callPackage
@@ -182922,8 +182922,8 @@ self: {
          base data-serializer data-textual network-ip posix-socket
        ];
        description = "Domain Name System data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182939,8 +182939,8 @@ self: {
          base bytestring enumerator network transformers
        ];
        description = "Enumerators for network sockets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182952,7 +182952,7 @@ self: {
        sha256 = "0myzfvmv6xny7nmq2p5dhyrz8yl7n48p4brkarkacs07k1zyldj9";
        libraryHaskellDepends = [ base bytestring ];
        description = "Networking support with a cleaner API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-hans" = callPackage
@@ -182963,8 +182963,8 @@ self: {
        sha256 = "1gv1y0iz90r30rmp8g40ksf39fvgznjihy68sspahpf8r24srlwq";
        libraryHaskellDepends = [ base bytestring hans parsec ];
        description = "HaNS to Network shims for easier HaNS integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182976,8 +182976,8 @@ self: {
        sha256 = "0hxbzzdjrxnx9pknsbma7iyfr3pxrsff5n9mhbkpaqaizhibq7q7";
        libraryHaskellDepends = [ array base containers mtl ];
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -182991,7 +182991,7 @@ self: {
        editedCabalFile = "07kiw56lhc56kqrnvpa11f5nnnid6by3aq00jrkcbbg7w0q71a6d";
        libraryHaskellDepends = [ base ];
        description = "Access the local computer's basic network configuration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-interfacerequest" = callPackage
@@ -183002,8 +183002,8 @@ self: {
        sha256 = "0qa5rbbcw9axg7mj4kjj027hfsclnw85cj8nmi6jvrzq2yhhk56c";
        libraryHaskellDepends = [ base bytestring ioctl network ];
        description = "Haskell bindings for the ifreq structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183025,7 +183025,7 @@ self: {
          text-printer
        ];
        description = "Internet Protocol data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-manager-tui" = callPackage
@@ -183049,7 +183049,7 @@ self: {
        ];
        doHaddock = false;
        description = "network-manager tui";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-messagepack-rpc" = callPackage
@@ -183065,7 +183065,7 @@ self: {
          unordered-containers
        ];
        description = "MessagePack RPC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-messagepack-rpc-websocket" = callPackage
@@ -183085,8 +183085,8 @@ self: {
          network-messagepack-rpc QuickCheck skews text wss-client
        ];
        description = "WebSocket backend for MessagePack RPC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183103,7 +183103,7 @@ self: {
        ];
        description = "Send metrics to Ganglia, Graphite, and statsd";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-minihttp" = callPackage
@@ -183122,8 +183122,8 @@ self: {
          old-locale stm tagsoup time unix
        ];
        description = "A ByteString based library for writing HTTP(S) servers and clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183136,7 +183136,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring network unix ];
        description = "Recvmsg and sendmsg bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-msgpack-rpc" = callPackage
@@ -183158,8 +183158,8 @@ self: {
        ];
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183171,7 +183171,7 @@ self: {
        sha256 = "0whvi0pbwjy6dbwfdf9rv1j3yr3lcmfp3q7a8pwq63g537l4l2l3";
        libraryHaskellDepends = [ base network network-bsd ];
        description = "Simple multicast library";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "network-netpacket" = callPackage
@@ -183187,8 +183187,8 @@ self: {
          network-interfacerequest
        ];
        description = "Haskell bindings for low-level packet sockets (AF_PACKET)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183205,7 +183205,7 @@ self: {
        ];
        description = "Library for writing PGI applications";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "network-protocol-xmpp" = callPackage
@@ -183221,8 +183221,8 @@ self: {
          text transformers xml-types
        ];
        description = "Client library for the XMPP protocol";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183240,8 +183240,8 @@ self: {
          containers control-timeout network network-bytestring stm
        ];
        description = "A cross-platform RPC library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183253,7 +183253,7 @@ self: {
        sha256 = "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple network runner library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-server" = callPackage
@@ -183268,7 +183268,7 @@ self: {
        executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183284,8 +183284,8 @@ self: {
          base base64-bytestring bytestring network
        ];
        description = "Provide a service at the data type level";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183302,7 +183302,7 @@ self: {
          transformers
        ];
        description = "Simple network sockets usage patterns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-simple-sockaddr" = callPackage
@@ -183317,8 +183317,8 @@ self: {
          base bytestring directory exceptions network transformers
        ];
        description = "network-simple for resolved addresses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183337,7 +183337,7 @@ self: {
          x509-validation
        ];
        description = "Simple interface to TLS secured network sockets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-simple-ws" = callPackage
@@ -183353,7 +183353,7 @@ self: {
          websockets
        ];
        description = "Simple interface to WebSockets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-simple-wss" = callPackage
@@ -183369,8 +183369,8 @@ self: {
          safe-exceptions websockets
        ];
        description = "Simple interface to TLS secured WebSockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183382,8 +183382,8 @@ self: {
        sha256 = "00qf22nwzsv8229gb7yqaaafiz573xl4v78mn1zf9ajvwzvwb63r";
        libraryHaskellDepends = [ base network ];
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183400,8 +183400,8 @@ self: {
          transformers
        ];
        description = "ByteString and Text streams for networking";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183423,8 +183423,8 @@ self: {
          random-fu statistics stm text transformers vector
        ];
        description = "A few network topic model implementations for bayes-stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183440,7 +183440,7 @@ self: {
          base binary bytestring deepseq hashable transformers
        ];
        description = "Network abstraction layer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-transport-amqp" = callPackage
@@ -183465,8 +183465,8 @@ self: {
          tasty-hunit
        ];
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183478,7 +183478,7 @@ self: {
        sha256 = "0i2rwl1hwbp87kvnhfc6h0v2zy1hbfgrz0wx1vicd9m76nzbynx3";
        libraryHaskellDepends = [ base bytestring network-transport ];
        description = "Compose network transports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-transport-inmemory" = callPackage
@@ -183498,8 +183498,8 @@ self: {
          base network-transport network-transport-tests
        ];
        description = "In-memory instantiation of Network.Transport";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183519,7 +183519,7 @@ self: {
          base bytestring network network-transport network-transport-tests
        ];
        description = "TCP instantiation of Network.Transport";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-transport-tests" = callPackage
@@ -183535,7 +183535,7 @@ self: {
          random
        ];
        description = "Unit tests for Network.Transport implementations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-transport-zeromq" = callPackage
@@ -183563,7 +183563,7 @@ self: {
          base binary bytestring criterion distributed-process
        ];
        description = "ZeroMQ backend for network-transport";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-types-icmp" = callPackage
@@ -183575,7 +183575,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Types for representing ICMP and ICMPv6 messages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-uri" = callPackage
@@ -183593,7 +183593,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "URI manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-uri-flag" = callPackage
@@ -183607,7 +183607,7 @@ self: {
        libraryHaskellDepends = [ network network-uri ];
        doHaddock = false;
        description = "Pseudo-package encapsulating flag(network-uri) Cabal boilerplate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-uri-json" = callPackage
@@ -183624,8 +183624,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "FromJSON and ToJSON Instances for Network.URI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183637,7 +183637,7 @@ self: {
        sha256 = "1z4qqdr2b64pf5xx73bqgjrlqnvi0x6ziqqbzc7x1ka736cdak2w";
        libraryHaskellDepends = [ base network-uri ];
        description = "Lenses for network-uri";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "network-uri-static" = callPackage
@@ -183649,7 +183649,7 @@ self: {
        libraryHaskellDepends = [ base network-uri template-haskell ];
        testHaskellDepends = [ base doctest ];
        description = "A small utility to declare type-safe static URIs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "network-voicetext" = callPackage
@@ -183665,8 +183665,8 @@ self: {
          resourcet transformers utf8-string
        ];
        description = "VoiceText Web API wrapper";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183678,8 +183678,8 @@ self: {
        sha256 = "1fnqc1vbahy6zy632s9kam8bv7108bhmynyh2iwkqb7ybkkj37i9";
        libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183693,8 +183693,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base haskell98 network webserver ];
        description = "WebSocket library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183712,8 +183712,8 @@ self: {
          base binary bytestring containers network time transformers
        ];
        description = "Networked-game support library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183746,8 +183746,8 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec MonadRandom ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Neural Networks in native Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183759,7 +183759,7 @@ self: {
        sha256 = "1pmgy3qmijkw3g542pg9wxzqncql3h2mh7slibgz8x0w9sfydmbd";
        libraryHaskellDepends = [ base constraints ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "neural-network-blashs" = callPackage
@@ -183778,8 +183778,8 @@ self: {
          base blas-hs hmatrix hspec neural-network-base QuickCheck vector
        ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183797,8 +183797,8 @@ self: {
        ];
        librarySystemDepends = [ blas ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) blas;};
 
@@ -183856,8 +183856,8 @@ self: {
        ];
        doHaddock = false;
        description = "Future-proof system for plain-text notes";
-       license = stdenv.lib.licenses.agpl3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.agpl3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "newhope" = callPackage
@@ -183888,8 +183888,8 @@ self: {
          trifecta vector
        ];
        description = "Library implementing the NewHope cryptographic key-exchange protocol";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183903,8 +183903,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory old-time ];
        description = "List ports newer than N days on a FreeBSD system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183933,8 +183933,8 @@ self: {
          unordered-containers warp
        ];
        description = "A basic newsletter implimentation, using various backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183950,8 +183950,8 @@ self: {
          base exceptions lens machines mailgun mime-mail mtl newsletter text
        ];
        description = "A mailgun backend for the newsletter package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -183969,7 +183969,7 @@ self: {
        libraryHaskellDepends = [ base containers fixedprec random ];
        executableHaskellDepends = [ base random time ];
        description = "Exact and approximate synthesis of quantum circuits";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "newt" = callPackage
@@ -183989,8 +183989,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs containers mtl ];
        description = "A trivially simple app to create things from simple templates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184004,7 +184004,7 @@ self: {
        editedCabalFile = "0261ljw57c7l7mw3z553s6ak8lmgyqwmfhk1m2jv6snra2i5shs4";
        libraryHaskellDepends = [ base ];
        description = "A typeclass and set of functions for working with newtypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "newtype-deriving" = callPackage
@@ -184020,8 +184020,8 @@ self: {
          transformers-base
        ];
        description = "Instance derivers for newtype wrappers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184040,7 +184040,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base gauge semigroups ];
        description = "A typeclass and set of functions for working with newtypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "newtype-th" = callPackage
@@ -184056,8 +184056,8 @@ self: {
          base haskell-src-meta newtype syb template-haskell
        ];
        description = "A template haskell deriver to create Control.Newtype instances.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184074,8 +184074,8 @@ self: {
          random
        ];
        description = "Newtype Wrapper Zoo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184087,7 +184087,7 @@ self: {
        sha256 = "1s1mzy1m3wpawv1ci85dl02105v550l1fdi5rxi5gqnxb0jrg4fs";
        libraryHaskellDepends = [ base Kleislify newtype ];
        description = "Extra functions for the Control.Newtype typeclass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "next-ref" = callPackage
@@ -184099,8 +184099,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base hspec ];
        description = "A concurrency primitive for a slow consumer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184112,8 +184112,8 @@ self: {
        sha256 = "0wld4nc6hcv642km60vvjyclsfwnpfavq59mqm8fm3a73al4csyw";
        libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184125,7 +184125,7 @@ self: {
        sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a";
        libraryHaskellDepends = [ base deepseq ];
        description = "NF data type to statically enforce normal form";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nfc" = callPackage
@@ -184140,8 +184140,8 @@ self: {
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
        description = "libnfc bindings";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {nfc = null;};
 
@@ -184163,7 +184163,7 @@ self: {
          zlib
        ];
        description = "Ngram models for compressing and classifying text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ngrams-loader" = callPackage
@@ -184181,8 +184181,8 @@ self: {
        ];
        executableHaskellDepends = [ base parseargs ];
        description = "Ngrams loader based on http://www.ngrams.info format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184199,7 +184199,7 @@ self: {
          unix
        ];
        description = "Helper module for Nginx haskell module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ngx-export-tools" = callPackage
@@ -184214,7 +184214,7 @@ self: {
          aeson base binary bytestring ngx-export safe template-haskell
        ];
        description = "Extra tools for Nginx haskell module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ngx-export-tools-extra" = callPackage
@@ -184236,8 +184236,8 @@ self: {
          unordered-containers
        ];
        description = "More extra tools for Nginx haskell module";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184254,8 +184254,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "High performance CSS EDSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184276,8 +184276,8 @@ self: {
          test-framework-hunit
        ];
        description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184301,8 +184301,8 @@ self: {
          shakespeare text transformers type-of-html weigh
        ];
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184316,7 +184316,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base nicify-lib ];
        description = "Pretty print the standard output of default `Show` instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nicify-lib" = callPackage
@@ -184327,7 +184327,7 @@ self: {
        sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx";
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Pretty print the standard output of default `Show` instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nicovideo-translator" = callPackage
@@ -184349,8 +184349,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184372,7 +184372,7 @@ self: {
        ];
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184384,7 +184384,7 @@ self: {
        sha256 = "1k177w8lccpqq4mwj089v7fbqvbrqskqxqj0gaingm0kmskggaaj";
        libraryHaskellDepends = [ base integer-logarithms ];
        description = "Finite nimber arithmetic";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nirum" = callPackage
@@ -184422,8 +184422,8 @@ self: {
          unordered-containers
        ];
        description = "IDL compiler and RPC/distributed object framework for microservices";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184437,7 +184437,7 @@ self: {
        editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q";
        libraryHaskellDepends = [ base bytestring http-conduit xml ];
        description = "Haskell interface to the nist random beacon";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nitro" = callPackage
@@ -184448,8 +184448,8 @@ self: {
        sha256 = "17aqzk1kq670fwawia0qjmd8ld1b0h8zh0w8j8x4y48hlzyb75xb";
        libraryHaskellDepends = [ base bytestring ];
        description = "Haskell bindings for Nitro";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184486,7 +184486,7 @@ self: {
          unordered-containers
        ];
        description = "Easy dependency management for Nix projects";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nix-delegate" = callPackage
@@ -184505,8 +184505,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Convenient utility for distributed Nix builds";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184525,8 +184525,8 @@ self: {
          optparse-generic text turtle
        ];
        description = "Deploy Nix-built software to a NixOS machine";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184551,8 +184551,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ attoparsec base criterion text ];
        description = "Parse and render *.drv files";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "nix-diff" = callPackage
@@ -184570,8 +184570,8 @@ self: {
          optparse-applicative text unix vector
        ];
        description = "Explain why two Nix derivations differ";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ terlar ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ terlar ];
      }) {};
 
   "nix-eval" = callPackage
@@ -184587,7 +184587,7 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Evaluate Haskell expressions using Nix to get packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184617,8 +184617,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        doHaddock = false;
        description = "Convert a tree of files into fixed-output derivations";
-       license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184638,8 +184638,8 @@ self: {
          attoparsec base filepath hspec QuickCheck text
        ];
        description = "Parse and render .narinfo files";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "nix-paths" = callPackage
@@ -184651,8 +184651,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        libraryToolDepends = [ nix ];
        description = "Knowledge of Nix's installation directories";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {inherit (pkgs) nix;};
 
   "nix-thunk" = callPackage
@@ -184679,8 +184679,8 @@ self: {
          base cli-extras optparse-applicative text
        ];
        description = "Lightweight dependency management with Nix";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184711,8 +184711,8 @@ self: {
          transformers unordered-containers vector yaml zlib
        ];
        description = "cabal/stack to nix translation tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184734,8 +184734,8 @@ self: {
          typed-process unordered-containers vty
        ];
        description = "Interactively browse a Nix store paths dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ utdemir ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ utdemir ];
      }) {};
 
   "nixdu" = callPackage
@@ -184755,7 +184755,7 @@ self: {
          typed-process unordered-containers vty
        ];
        description = "Interactively browse a Nix store paths dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nixfmt" = callPackage
@@ -184777,7 +184777,7 @@ self: {
          base cmdargs directory filepath safe-exceptions text unix
        ];
        description = "An opinionated formatter for Nix";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "nixfromnpm" = callPackage
@@ -184803,8 +184803,8 @@ self: {
          transformers unix unordered-containers
        ];
        description = "Generate nix expressions from npm packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184816,7 +184816,7 @@ self: {
        sha256 = "1q38cs0747fyf94y35cq734yzmsdcyfmmk5w6qv563jns55qj36c";
        doHaddock = false;
        description = "this package is obsolete; see cabal2nix instead";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nixpkgs-update" = callPackage
@@ -184840,8 +184840,8 @@ self: {
          text time unix vector
        ];
        description = "Tool for semi-automatic updating of nixpkgs repository";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184860,8 +184860,8 @@ self: {
          zlib
        ];
        description = "Manipulating the National Corpus of Polish (NKJP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184875,7 +184875,7 @@ self: {
        librarySystemDepends = [ nlopt ];
        testHaskellDepends = [ base vector ];
        description = "Low-level bindings to the NLOPT optimization library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) nlopt;};
 
   "nlp-scores" = callPackage
@@ -184886,8 +184886,8 @@ self: {
        sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m";
        libraryHaskellDepends = [ base containers strict ];
        description = "Scoring functions commonly used for evaluation in NLP and IR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184903,8 +184903,8 @@ self: {
          base containers nlp-scores split text
        ];
        description = "NLP scoring command-line programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184921,8 +184921,8 @@ self: {
        libraryPkgconfigDepends = [ glib libnm-glib ];
        executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
          nm-glib = null;};
@@ -184936,7 +184936,7 @@ self: {
        libraryHaskellDepends = [ base bytestring utf8-string ];
        description = "Bindings to the Nyctergatis Markup Engine";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nmis-parser" = callPackage
@@ -184948,8 +184948,8 @@ self: {
        libraryHaskellDepends = [ base containers megaparsec ];
        testHaskellDepends = [ base Nmis ];
        description = "NMIS file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Nmis = null;};
 
@@ -184964,7 +184964,7 @@ self: {
        libraryHaskellDepends = [ base random split ];
        testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ];
        description = "A tiny neural network";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nntp" = callPackage
@@ -184980,7 +184980,7 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -184992,7 +184992,7 @@ self: {
        sha256 = "19yswbnwwfp7n33irdk12vggczhxp198cjd68jdbaz1wcd00ryld";
        libraryHaskellDepends = [ base ];
        description = "Workaround for GHC bug #2189";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "no-role-annots" = callPackage
@@ -185004,8 +185004,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Role annotations without -XRoleAnnotations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185017,7 +185017,7 @@ self: {
        sha256 = "1jczx8d4ah74wiishdcv335hlr0330wwq0vfb5rv4gmrvbpkgllf";
        libraryHaskellDepends = [ base ];
        description = "A type class for choosing sentinel-like values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "noether" = callPackage
@@ -185039,8 +185039,8 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Math in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185054,8 +185054,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185069,8 +185069,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185094,8 +185094,8 @@ self: {
          base HTF HUnit parsec QuickCheck string-qq
        ];
        description = "A friendly language for graphic design";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185112,8 +185112,8 @@ self: {
          regex-compat text yaml
        ];
        description = "A static site generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185138,8 +185138,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Name-binding & alpha-equivalence";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185151,7 +185151,7 @@ self: {
        sha256 = "1wd2vd0qn8ln3a5r29gikdcr4c2c2rf43p6kq3wmqm8ww30djgca";
        libraryHaskellDepends = [ base containers ];
        description = "Binders and alpha-equivalence made easy";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "nomyx-api" = callPackage
@@ -185172,8 +185172,8 @@ self: {
          swagger2 text transformers wai wai-cors wai-extra warp yaml
        ];
        description = "REST API for Nomyx";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-core" = callPackage
@@ -185201,8 +185201,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal ];
        description = "A Nomic game in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-language" = callPackage
@@ -185221,8 +185221,8 @@ self: {
          time-recurrence
        ];
        description = "Language to express rules for Nomic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-library" = callPackage
@@ -185239,8 +185239,8 @@ self: {
          shortcut time time-recurrence
        ];
        description = "Library of rules for Nomyx";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-server" = callPackage
@@ -185261,8 +185261,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal ];
        description = "A Nomic game in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nomyx-web" = callPackage
@@ -185286,8 +185286,8 @@ self: {
          split stm text time web-routes web-routes-happstack web-routes-th
        ];
        description = "Web gui for Nomyx";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {nomyx-auth = null;};
 
@@ -185303,7 +185303,7 @@ self: {
        ];
        testHaskellDepends = [ base containers QuickCheck utility-ht ];
        description = "List-like structures with static restrictions on the number of elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "non-empty-containers" = callPackage
@@ -185313,7 +185313,7 @@ self: {
        version = "0.1.4.0";
        sha256 = "1frjpvx3nzymkwyxz0zc4p11pvxdihx3d3hi31w3d9qanwncbc96";
        libraryHaskellDepends = [ base containers semigroupoids ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "non-empty-sequence" = callPackage
@@ -185324,7 +185324,7 @@ self: {
        sha256 = "0a6xk2ijj3lzhqzdrk6q89538d1a62aw8x0ccvkq2kyl1dlahwc0";
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Non-empty sequence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "non-empty-text" = callPackage
@@ -185337,7 +185337,7 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec QuickCheck text ];
        description = "Non empty Data.Text type";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "non-empty-zipper" = callPackage
@@ -185349,8 +185349,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185381,7 +185381,7 @@ self: {
          unliftio unliftio-core
        ];
        description = "Generate cryptographic nonces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nondeterminism" = callPackage
@@ -185404,7 +185404,7 @@ self: {
        sha256 = "1ymndk1aqaw0n0vgj9gbajm5ma21ld77g0a06z92frqi8wvp67ii";
        libraryHaskellDepends = [ base comonad semigroups ];
        description = "NonEmpty for Alternative types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nonempty-containers" = callPackage
@@ -185425,7 +185425,7 @@ self: {
          semigroupoids tasty tasty-hedgehog text these vector
        ];
        description = "Non-empty variants of containers data types, with full API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nonempty-lift" = callPackage
@@ -185439,8 +185439,8 @@ self: {
        libraryHaskellDepends = [ base comonad semigroupoids ];
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "nonempty structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185456,7 +185456,7 @@ self: {
        libraryHaskellDepends = [ base deepseq primitive vector ];
        testHaskellDepends = [ base doctest ];
        description = "Non-empty vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nonemptymap" = callPackage
@@ -185467,7 +185467,7 @@ self: {
        sha256 = "1pzs51kmsyarv62qqbskhw2xlkjp74bwcgs9a8ri1jk96m64rg94";
        libraryHaskellDepends = [ base containers semigroupoids ];
        description = "A NonEmptyMap Implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nonfree" = callPackage
@@ -185478,7 +185478,7 @@ self: {
        sha256 = "0qm1iwm3y69z146w64wx5wwa4cdpa0ka7gz055dalf06xky35qji";
        libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nonlinear-optimization" = callPackage
@@ -185508,7 +185508,7 @@ self: {
          ad base nonlinear-optimization primitive reflection vector
        ];
        description = "Wrapper of nonlinear-optimization package for using with AD package";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "nonlinear-optimization-backprop" = callPackage
@@ -185526,7 +185526,7 @@ self: {
          reflection vector
        ];
        description = "Wrapper of nonlinear-optimization package for using with backprop package";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "noodle" = callPackage
@@ -185541,7 +185541,7 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "the noodle programming language";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "normaldistribution" = callPackage
@@ -185552,7 +185552,7 @@ self: {
        sha256 = "1q7p0bx435amqb7r9qksix0mrbpnqsyfb44chjyz6xkgjj0s6yvd";
        libraryHaskellDepends = [ base random ];
        description = "Minimum fuss normally distributed random values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "normalization-insensitive" = callPackage
@@ -185575,8 +185575,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Normalization insensitive string comparison";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185598,7 +185598,7 @@ self: {
          base bytestring cassava containers optparse-generic text vector
        ];
        description = "Normalize data using a variety of methods";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "normalize-imports" = callPackage
@@ -185612,7 +185612,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Sort and align Haskell import statements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "not-gloss" = callPackage
@@ -185628,7 +185628,7 @@ self: {
          vector vector-binary-instances
        ];
        description = "Painless 3D graphics, no affiliation with gloss";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "not-gloss-examples" = callPackage
@@ -185645,8 +185645,8 @@ self: {
          base containers GLUT linear not-gloss spatial-math X11
        ];
        description = "examples for not-gloss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185659,7 +185659,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Useful utility functions that only depend on base";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "notcpp" = callPackage
@@ -185671,8 +185671,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185691,7 +185691,7 @@ self: {
          base containers ghc-prim hedgehog random stm tasty tasty-hedgehog
        ];
        description = "Examine values for unexpected thunks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "notifications-tray-icon" = callPackage
@@ -185716,8 +185716,8 @@ self: {
          base bytestring github haskeline hslogger optparse-applicative text
          transformers tuple
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185737,7 +185737,7 @@ self: {
        librarySystemDepends = [ notmuch talloc ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding to Notmuch, the mail indexer";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;};
 
   "notmuch-haskell" = callPackage
@@ -185756,7 +185756,7 @@ self: {
        executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) notmuch;};
 
@@ -185795,7 +185795,7 @@ self: {
        ];
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185813,7 +185813,7 @@ self: {
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
        description = "A data type for representing numeric values, except zero";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "now-haskell" = callPackage
@@ -185849,8 +185849,8 @@ self: {
          unordered-containers vector
        ];
        description = "Zeit Now haskell-side integration and introspection tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185865,7 +185865,7 @@ self: {
        libraryHaskellDepends = [ base bytestring template-haskell ];
        testHaskellDepends = [ base bytestring template-haskell ];
        description = "Here document without variable expansion like PHP Nowdoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "np-extras" = callPackage
@@ -185878,8 +185878,8 @@ self: {
        editedCabalFile = "1imcizgbckwcmxwjicads55g0v6abprz3g69b6blkkgmcq5r9x6b";
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185895,8 +185895,8 @@ self: {
          base binary containers numeric-prelude reflection tagged
        ];
        description = "Linear algebra for the numeric-prelude framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185915,8 +185915,8 @@ self: {
          old-locale process split time unix
        ];
        description = "A collection of random tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -185937,7 +185937,7 @@ self: {
          stm-conduit text unliftio
        ];
        description = "Concurrency library in the style of Erlang/OTP";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "nri-env-parser" = callPackage
@@ -185951,7 +185951,7 @@ self: {
          base modern-uri network-uri nri-prelude text
        ];
        description = "Read environment variables as settings to build 12-factor apps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nri-prelude" = callPackage
@@ -185975,7 +185975,7 @@ self: {
          pretty-show safe-exceptions terminal-size text time vector
        ];
        description = "A Prelude inspired by the Elm programming language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nsis" = callPackage
@@ -185990,7 +185990,7 @@ self: {
          base directory process transformers uniplate
        ];
        description = "DSL for producing Windows Installer using NSIS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nth-prime" = callPackage
@@ -186008,7 +186008,7 @@ self: {
          base opentheory-prime opentheory-primitive
        ];
        description = "Computing the nth prime";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ntha" = callPackage
@@ -186029,7 +186029,7 @@ self: {
        executableHaskellDepends = [ base containers haskeline lens mtl ];
        testHaskellDepends = [ base containers hspec pretty ];
        description = "A tiny statically typed functional programming language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nthable" = callPackage
@@ -186039,7 +186039,7 @@ self: {
        version = "0.1";
        sha256 = "1qi1wq7wbnp3sv3c2v4185mnq80646vcsnqq16mqlshiy164wsly";
        libraryHaskellDepends = [ base type-level ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ntp-control" = callPackage
@@ -186057,8 +186057,8 @@ self: {
          base bytestring bytestring-lexing cereal network old-locale time
        ];
        description = "Client library for NTP control messaging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186083,8 +186083,8 @@ self: {
          base basic-prelude bytestring conduit optparse-generic
        ];
        description = "NTRIP client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186096,7 +186096,7 @@ self: {
        sha256 = "0raz6azyj7a3fygpmylhz38b75zy57xdrginbhj2d6vwzxhkmscd";
        libraryHaskellDepends = [ base ];
        description = "N-ary sum/product types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nuha" = callPackage
@@ -186108,8 +186108,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base vector ];
        description = "Multidimensional arrays, Linear algebra, Numerical analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186127,8 +186127,8 @@ self: {
          wai-extra warp
        ];
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186140,8 +186140,8 @@ self: {
        sha256 = "19vwgyscil4rmgfnla8msmhgamn6j3wfy7wqghb539byca0gim0c";
        libraryHaskellDepends = [ base ];
        description = "A package for working with nullary type classes";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186154,8 +186154,8 @@ self: {
        libraryHaskellDepends = [ base bytestring pipes ];
        testHaskellDepends = [ base hspec pipes ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186167,7 +186167,7 @@ self: {
        sha256 = "0ikhjcjwziv55gnf79fhajhgp5m3441snxg8amc241h5iw4rls8x";
        libraryHaskellDepends = [ base inj ];
        description = "Non-negative numbers";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "number" = callPackage
@@ -186178,7 +186178,7 @@ self: {
        sha256 = "0la9dx2072f0gjrfq8p33qal7ma4202x5f8h2n4bhwkjln67n5bj";
        libraryHaskellDepends = [ base ];
        description = "A library for real numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "number-length" = callPackage
@@ -186197,7 +186197,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Number of digits in a number in decimal and hexadecimal representation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "number-show" = callPackage
@@ -186210,7 +186210,7 @@ self: {
        editedCabalFile = "1lsxi6704g6svw0834haggp6j97kb6r51583lr2a3kn1ni2zh60c";
        libraryHaskellDepends = [ base microlens microlens-th ];
        description = "Flexible and accurate (for a given precision) numerical->string conversion";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "numbered-semigroups" = callPackage
@@ -186223,8 +186223,8 @@ self: {
        editedCabalFile = "04wkhb2r275nax8wh00w6c4pxfaky190g2bsviw39jyi7wr2f33c";
        libraryHaskellDepends = [ base call-stack semigroups ];
        description = "A sequence of semigroups, for composing stuff in multiple spatial directions";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186236,7 +186236,7 @@ self: {
        sha256 = "0hh4km2zbvs7rsb142f1rifqvwzajh0grgky2vyyyf48dk5plrlv";
        libraryHaskellDepends = [ base containers vector ];
        description = "Combinators for creating bijections from some type to the natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numbers" = callPackage
@@ -186252,7 +186252,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Various number types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numerals" = callPackage
@@ -186273,8 +186273,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Convert numbers to number words";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186296,8 +186296,8 @@ self: {
          fingertree HUnit test-framework test-framework-hunit
        ];
        description = "Convert numbers to number words";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186309,7 +186309,7 @@ self: {
        sha256 = "0n5wcg2snpivbp6giqrcd1y97215y6n3hbgbnb6w2gi7qsmyyq10";
        libraryHaskellDepends = [ base ];
        description = "Numeric Domains";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numeric-extras" = callPackage
@@ -186320,7 +186320,7 @@ self: {
        sha256 = "1mk11c0gz1yjy5b8dvq6czfny57pln0bs7x28fz38qyr44872067";
        libraryHaskellDepends = [ base ];
        description = "Useful tools from the C standard library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numeric-limits" = callPackage
@@ -186331,7 +186331,7 @@ self: {
        sha256 = "0lsi0my45lpd30vjbwdbzhisz8r3lryvg1c80qcmwipnxklnr5cb";
        libraryHaskellDepends = [ base ];
        description = "Various floating point limit related constants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numeric-ode" = callPackage
@@ -186359,8 +186359,8 @@ self: {
          mtl plots vector vector-space
        ];
        description = "Ode solvers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186380,7 +186380,7 @@ self: {
          semigroups storable-record utility-ht
        ];
        description = "An experimental alternative hierarchy of numeric type classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numeric-qq" = callPackage
@@ -186397,8 +186397,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        doCheck = false;
        description = "Quasi-quoters for numbers of different bases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186425,8 +186425,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "A framework for numeric ranges";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186439,7 +186439,7 @@ self: {
        libraryHaskellDepends = [ base ieee754 primitive vector ];
        testHaskellDepends = [ base HUnit ];
        description = "Collection of numerical tools for integration, differentiation etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numerical" = callPackage
@@ -186460,8 +186460,8 @@ self: {
          transformers vector
        ];
        description = "core package for Numerical Haskell project";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186473,7 +186473,7 @@ self: {
        sha256 = "1f9ar8kdwzi8xarzb7mrq204v1n3n8kh0fbqv06l9677vv1pc19v";
        libraryHaskellDepends = [ base ];
        description = "Peano numbers with attendant bells and whistles";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "numhask" = callPackage
@@ -186488,7 +186488,7 @@ self: {
          base bifunctors mmorph protolude text transformers
        ];
        description = "numeric classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numhask_0_7_1_0" = callPackage
@@ -186504,8 +186504,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "A numeric class hierarchy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "numhask-array" = callPackage
@@ -186521,8 +186521,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Multi-dimensional array interface for numhask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186539,8 +186539,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "numerical free algebras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186557,8 +186557,8 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog numhask numhask-prelude ];
        description = "Laws and tests for numhask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186575,8 +186575,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186589,8 +186589,8 @@ self: {
        libraryHaskellDepends = [ base numhask protolude ];
        testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186611,8 +186611,8 @@ self: {
          base doctest numhask-prelude numhask-test tasty
        ];
        description = "Numbers that are range representations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186631,8 +186631,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Numerical spaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186649,8 +186649,8 @@ self: {
        ];
        testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
        description = "Laws and tests for numhask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186662,7 +186662,7 @@ self: {
        sha256 = "0bbl7f3qd26sa92k73qni3r1jwxxrfq5k19hcvh5rgdh5ig9d6v8";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numtype" = callPackage
@@ -186673,7 +186673,7 @@ self: {
        sha256 = "1pdawf6zyany5jz5jmszwbm7ms7c125if52v9cw0chy0xz5ahdym";
        libraryHaskellDepends = [ base ];
        description = "Type-level (low cardinality) integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numtype-dk" = callPackage
@@ -186686,7 +186686,7 @@ self: {
        editedCabalFile = "0892xm8vyyvl1glg4vniz8r5ydg1nz3zmbpgk5mxdih6wi6nmpy4";
        libraryHaskellDepends = [ base ];
        description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "numtype-tf" = callPackage
@@ -186697,7 +186697,7 @@ self: {
        sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
        libraryHaskellDepends = [ base ];
        description = "Type-level (low cardinality) integers, implemented using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nurbs" = callPackage
@@ -186717,7 +186717,7 @@ self: {
          base base-unicode-symbols hspec lens linear
        ];
        description = "NURBS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nuxeo" = callPackage
@@ -186736,7 +186736,7 @@ self: {
          http-types text time url
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nvim-hs" = callPackage
@@ -186775,7 +186775,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -186798,7 +186798,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "nvim-hs-ghcid" = callPackage
@@ -186818,7 +186818,7 @@ self: {
        ];
        executableHaskellDepends = [ base nvim-hs ];
        description = "Neovim plugin that runs ghcid to update the quickfix list";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "nvvm" = callPackage
@@ -186837,8 +186837,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to NVVM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nyan" = callPackage
@@ -186851,7 +186851,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring mtl ncurses text ];
        description = "Bored? Nyan cat!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "nylas" = callPackage
@@ -186868,8 +186868,8 @@ self: {
          pipes-bytestring pipes-http pipes-parse text time wreq
        ];
        description = "Client for the Nylas API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186888,8 +186888,8 @@ self: {
          base cairo containers glade glib gtk mtl parsec random
        ];
        description = "An interactive GUI for manipulating L-systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186916,7 +186916,7 @@ self: {
          text vector
        ];
        description = "A bullet-hell game made with SDL2";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "o-clock" = callPackage
@@ -186937,7 +186937,7 @@ self: {
        ];
        testToolDepends = [ doctest markdown-unlit ];
        description = "Type-safe time library";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "oanda-rest-api" = callPackage
@@ -186961,8 +186961,8 @@ self: {
          text thyme transformers vector
        ];
        description = "Client to the OANDA REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -186985,8 +186985,8 @@ self: {
          uri-bytestring xml-conduit xml-conduit-writer
        ];
        description = "Extensible Resource Descriptor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187006,7 +187006,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        description = "Fully Automatic Luxury OAuth 1.0a headers";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "oauth2-jwt-bearer" = callPackage
@@ -187031,8 +187031,8 @@ self: {
          streaming-commons text warp x509 x509-store
        ];
        description = "OAuth2 jwt-bearer client flow as per rfc7523";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187058,8 +187058,8 @@ self: {
          network-uri text time transformers
        ];
        description = "Simple OAuth for http-client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187084,8 +187084,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Communicate to OBD interfaces over ELM327";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187103,7 +187103,7 @@ self: {
        testHaskellDepends = [ array base containers text ];
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187124,7 +187124,7 @@ self: {
        doHaddock = false;
        description = "Oberon0 Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187144,8 +187144,8 @@ self: {
          OpenGL OpenGLCheck QuickCheck
        ];
        description = "Reads and writes obj models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187166,8 +187166,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Rather unique identifier for things that need to be stored";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187186,8 +187186,8 @@ self: {
          unordered-containers void witherable
        ];
        description = "Composable objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187211,8 +187211,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "An implementation of the Oblivious Transfer protocol in Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187224,7 +187224,7 @@ self: {
        sha256 = "0hi9y867yg48nv0756ylblxmsdw9vkfg72n0bb0ali227695d6qb";
        libraryHaskellDepends = [ base transformers ];
        description = "Continuation patterns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "observable-sharing" = callPackage
@@ -187235,7 +187235,7 @@ self: {
        sha256 = "1lqig0r4f7gqjdymsc4jpwspc3jr01xkmk5cgiqr5ngxvk6zw3j0";
        libraryHaskellDepends = [ base containers ];
        description = "Simple observable sharing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ocaml-export" = callPackage
@@ -187262,8 +187262,8 @@ self: {
          wai-extra warp
        ];
        description = "Convert Haskell types in OCaml types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187276,7 +187276,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Object capability based IO";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ochan" = callPackage
@@ -187294,8 +187294,8 @@ self: {
          async base bytestring mtl oref text transformers
        ];
        description = "Owned channels in the Ownership Monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187312,7 +187312,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A module to manage payroll books for Japanese companies";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "octane" = callPackage
@@ -187336,8 +187336,8 @@ self: {
          rattletrap text
        ];
        description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187368,8 +187368,8 @@ self: {
          base base-compat dotenv hspec hspec-expectations text transformers
        ];
        description = "A tested, minimal wrapper around GitHub's API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187390,8 +187390,8 @@ self: {
          array base bytestring containers hexpr mtl parsec symbol text
        ];
        description = "Lisp with more dynamism, more power, more simplicity";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187408,8 +187408,8 @@ self: {
        ];
        librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
        description = "Oculus Rift ffi providing head tracking data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXinerama; ovr = null; 
@@ -187440,8 +187440,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ async base text weigh ];
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) unixODBC;};
 
@@ -187493,8 +187493,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A full-featured PostgreSQL-backed job queue (with an admin UI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187510,8 +187510,8 @@ self: {
          aeson base bytestring containers text unordered-containers
        ];
        description = "Provides Go package metadata";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187532,8 +187532,8 @@ self: {
        ];
        testToolDepends = [ c2hs ];
        description = "Oracle Database Bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "oeis" = callPackage
@@ -187549,7 +187549,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "oeis2" = callPackage
@@ -187568,8 +187568,8 @@ self: {
          text vector
        ];
        description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187581,8 +187581,8 @@ self: {
        sha256 = "03sb2bmjw8v01908zkzmw8njsmqy5k2hcnv6ajbia7n8qawyhivj";
        libraryHaskellDepends = [ base parsec3 vector ];
        description = "A parser for simplified-syntax OFF files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187597,7 +187597,7 @@ self: {
        libraryHaskellDepends = [ base parsec pretty time ];
        executableHaskellDepends = [ base parsec pretty time ];
        description = "Parser for OFX data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ogmarkup" = callPackage
@@ -187613,8 +187613,8 @@ self: {
          base hspec hspec-megaparsec megaparsec shakespeare text
        ];
        description = "A lightweight markup language for story writers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187638,8 +187638,8 @@ self: {
          test-framework-quickcheck2 text-format-simple
        ];
        description = "Interface to the Ohloh API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187656,8 +187656,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187683,8 +187683,8 @@ self: {
          time
        ];
        description = "OpenID Connect 1.0 library for RP";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187697,8 +187697,8 @@ self: {
        libraryHaskellDepends = [ base hogre ];
        librarySystemDepends = [ OIS ];
        description = "wrapper for OIS input manager for use with hogre";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {OIS = null;};
 
@@ -187712,7 +187712,7 @@ self: {
        editedCabalFile = "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs";
        libraryHaskellDepends = [ base ];
        description = "locale library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "old-time" = callPackage
@@ -187725,7 +187725,7 @@ self: {
        editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9";
        libraryHaskellDepends = [ base old-locale ];
        description = "Time library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "old-version" = callPackage
@@ -187737,7 +187737,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Basic versioning library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "olwrapper" = callPackage
@@ -187762,8 +187762,8 @@ self: {
          snap-loader-static snap-server snaplet-fay text
        ];
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187775,8 +187775,8 @@ self: {
        sha256 = "1wiasb3f22g47n54jhxv1c74a0ghxsknrakjdgj3fqlw878g3aan";
        libraryHaskellDepends = [ base ];
        description = "Actor pattern utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187794,8 +187794,8 @@ self: {
          safe-exceptions template-haskell text unix wai
        ];
        description = "Haskell utilities for building embedded Elm programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187810,8 +187810,8 @@ self: {
          base monad-logger safe-exceptions transformers
        ];
        description = "Monad transformer providing MonadFail";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187827,8 +187827,8 @@ self: {
          base http-types monad-logger safe-exceptions uuid wai
        ];
        description = "om-http-logging";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187846,8 +187846,8 @@ self: {
          base optparse-applicative shakespeare-text shelly text
        ];
        description = "A simple tool to generate OMakefile for latex files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187867,8 +187867,8 @@ self: {
          transformers transformers-base unordered-containers vector-space
        ];
        description = "Render engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187887,8 +187887,8 @@ self: {
          array base containers directory filepath pretty time
        ];
        description = "A purely functional programming language and a proof system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187907,7 +187907,7 @@ self: {
        ];
        description = "Data encoding and decoding command line utilities";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "omnifmt" = callPackage
@@ -187934,8 +187934,8 @@ self: {
          temporary text time
        ];
        description = "A pretty-printer wrapper to faciliate ease of formatting during development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187954,8 +187954,8 @@ self: {
          wai wai-extra warp
        ];
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187976,8 +187976,8 @@ self: {
          base bytestring GenericPretty network process random
        ];
        description = "Program that sends traffic through SSH tunnels on-demand";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -187989,8 +187989,8 @@ self: {
        sha256 = "09knyhswd0jgiwx1p1qra1hppnkny7yqjrzmqspxdxjhl0zs91fz";
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "HTML-parsing primitives for Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188011,7 +188011,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "memoization for IO actions and functions";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "one-line-aeson-text" = callPackage
@@ -188024,7 +188024,7 @@ self: {
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        testHaskellDepends = [ base doctest ];
        description = "Pretty-printing short Aeson values as text";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "one-liner" = callPackage
@@ -188043,7 +188043,7 @@ self: {
        ];
        testHaskellDepends = [ base contravariant HUnit ];
        description = "Constraint-based generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "one-liner-instances" = callPackage
@@ -188054,7 +188054,7 @@ self: {
        sha256 = "1gy900nd5n6cffqw63hlkqg4ly86wjlfqgdcm1zy2nyx7dxg914k";
        libraryHaskellDepends = [ base one-liner random ];
        description = "Generics-based implementations for common typeclasses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "one-time-password" = callPackage
@@ -188072,7 +188072,7 @@ self: {
          base bytestring cryptonite tasty tasty-hunit time
        ];
        description = "HMAC-Based and Time-Based One-Time Passwords";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "oneOfN" = callPackage
@@ -188083,7 +188083,7 @@ self: {
        sha256 = "05gycp2zvq08bjl9dx1lm3cjr12i50k3cwq4al34y1rlp2r531lk";
        libraryHaskellDepends = [ base ];
        description = "Anonymous coproduct type";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "oneormore" = callPackage
@@ -188094,8 +188094,8 @@ self: {
        sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p";
        libraryHaskellDepends = [ base ];
        description = "A never-empty list type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188116,8 +188116,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188136,8 +188136,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest numhask-prelude ];
        description = "See readme.md";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188162,8 +188162,8 @@ self: {
        sha256 = "0iy4hpibiz6v93kz8jv5phb96sh6ygcdakf9vqss5d5622s5pgf1";
        libraryHaskellDepends = [ base ];
        description = "partition lenses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188175,8 +188175,8 @@ self: {
        sha256 = "1d0yn5bj04ircxbi12rx80kds54zssmq4j9kqyk05nmv506x76k0";
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188188,7 +188188,7 @@ self: {
        sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
        libraryHaskellDepends = [ base ];
        description = "Support for OO-like prototypes";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "op" = callPackage
@@ -188200,8 +188200,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers doctest ];
        description = "Common operators encouraging large-scale easy reading";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188232,7 +188232,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "An SQL-generating DSL targeting PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -188250,8 +188250,8 @@ self: {
          product-profunctors transformers
        ];
        description = "Opaleye wrapped up in classy MTL attire";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188276,8 +188276,8 @@ self: {
          QuickCheck semigroups sqlite-simple time
        ];
        description = "An SQL-generating DSL targeting SQLite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188299,8 +188299,8 @@ self: {
          base opaleye postgresql-simple product-profunctors
        ];
        description = "A monad transformer for Opaleye";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188316,8 +188316,8 @@ self: {
          base constraints recursion-schemes row-types template-haskell
        ];
        description = "Open algebraic data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188337,8 +188337,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Open algebraic data type examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188353,7 +188353,7 @@ self: {
        libraryHaskellDepends = [ base process ];
        executableHaskellDepends = [ base ];
        description = "Open a web browser from Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "open-haddock" = callPackage
@@ -188366,8 +188366,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base basic-prelude text turtle ];
        description = "Open haddock HTML documentation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188391,7 +188391,7 @@ self: {
        ];
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188404,8 +188404,8 @@ self: {
        libraryHaskellDepends = [ base either mtl transformers ];
        testHaskellDepends = [ base ];
        description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188416,7 +188416,7 @@ self: {
        version = "0.1";
        sha256 = "0dz6ci2i43mghp0v40q11pz2q3511m25sxds44dixish14cs5gym";
        libraryHaskellDepends = [ attoparsec base conduit mtl text ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "open-typerep" = callPackage
@@ -188433,8 +188433,8 @@ self: {
        testHaskellDepends = [ base syntactic ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Open type representations and dynamic types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188449,8 +188449,8 @@ self: {
        libraryHaskellDepends = [ base type-fun ];
        executableHaskellDepends = [ base type-fun ];
        description = "Extensible, type-safe unions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188468,7 +188468,7 @@ self: {
        ];
        testHaskellDepends = [ base mtl tasty tasty-hunit witness ];
        description = "open witnesses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "openai-hs" = callPackage
@@ -188490,8 +188490,8 @@ self: {
          servant-client-core text vector
        ];
        description = "Unofficial OpenAI client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188506,7 +188506,7 @@ self: {
          aeson base casing servant text time vector
        ];
        description = "Unofficial OpenAI servant types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "openapi-petstore" = callPackage
@@ -188533,8 +188533,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Auto-generated openapi-petstore API Client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188554,8 +188554,8 @@ self: {
          yaml
        ];
        description = "Types for OpenAPI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188591,8 +188591,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "OpenAPI 3.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188629,8 +188629,8 @@ self: {
          yaml
        ];
        description = "OpenAPI3 Haskell Client Code Generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188642,8 +188642,8 @@ self: {
        sha256 = "1cvcqv6fx9jszrlv46xn7b3rfxk4bymzc42ndzzvnpwj592yd55i";
        libraryHaskellDepends = [ aeson base data-default text time ];
        description = "A Haskell implementation of the Swiss Meteo Net data API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188657,7 +188657,7 @@ self: {
        librarySystemDepends = [ atomspace-cwrapper ];
        description = "Haskell Bindings for the AtomSpace";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {atomspace-cwrapper = null;};
 
   "opencv" = callPackage
@@ -188688,7 +188688,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion repa ];
        hardeningDisable = [ "bindnow" ];
        description = "Haskell binding to OpenCV-3.x";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) opencv3;};
 
   "opencv-extra" = callPackage
@@ -188712,7 +188712,7 @@ self: {
          template-haskell text transformers vector
        ];
        description = "Haskell binding to OpenCV-3.x extra modules";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "opencv-raw" = callPackage
@@ -188724,8 +188724,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL Cabal vector ];
        libraryPkgconfigDepends = [ opencv ];
        description = "Raw Haskell bindings to OpenCV >= 2.0";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) opencv;};
 
@@ -188737,8 +188737,8 @@ self: {
        sha256 = "1bv729ljw07arz9fzg0nqj6fkpwkxkjds073cz3zr9in0a5b1531";
        libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        description = "A library for working with Open Data Tables";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188755,7 +188755,7 @@ self: {
        ];
        description = "Fetch exchange rates from OpenExchangeRates.org";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "openexr-write" = callPackage
@@ -188772,7 +188772,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring directory hspec vector ];
        description = "Library for writing images in OpenEXR HDR file format";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "openflow" = callPackage
@@ -188789,7 +188789,7 @@ self: {
        ];
        description = "OpenFlow";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "opengl-dlp-stereo" = callPackage
@@ -188805,7 +188805,7 @@ self: {
          base data-default GLUT OpenGL vector
        ];
        description = "Library and example for using DLP stereo in OpenGL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opengl-spacenavigator" = callPackage
@@ -188821,7 +188821,7 @@ self: {
          base binary data-default GLUT OpenGL
        ];
        description = "Library and example for using a SpaceNavigator-compatible 3-D mouse with OpenGL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opengles" = callPackage
@@ -188845,8 +188845,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {EGL = null; GLESv2 = null;};
 
@@ -188865,7 +188865,7 @@ self: {
          network network-uri time xml
        ];
        description = "An implementation of the OpenID-2.0 spec.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "openid-connect" = callPackage
@@ -188890,8 +188890,8 @@ self: {
          tasty-hunit text time unordered-containers
        ];
        description = "An OpenID Connect library that does all the heavy lifting for you";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -188916,7 +188916,7 @@ self: {
        ];
        description = "Implementation of the OpenPGP message format";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "openpgp-Crypto" = callPackage
@@ -188938,7 +188938,7 @@ self: {
        ];
        description = "Implementation of cryptography for use with OpenPGP using the Crypto library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "openpgp-asciiarmor" = callPackage
@@ -188958,7 +188958,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "OpenPGP (RFC4880) ASCII Armor codec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "openpgp-crypto-api" = callPackage
@@ -188984,7 +188984,7 @@ self: {
        ];
        description = "Implement cryptography for OpenPGP using crypto-api compatible libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "opensoundcontrol-ht" = callPackage
@@ -189000,7 +189000,7 @@ self: {
        ];
        description = "Haskell OpenSoundControl utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189020,7 +189020,7 @@ self: {
          text transformers
        ];
        description = "Haskell API Wrapper for the Open Source License API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "openssh-github-keys" = callPackage
@@ -189042,8 +189042,8 @@ self: {
          base hspec keyword-args octohat optparse-applicative parsec text
        ];
        description = "Fetch OpenSSH keys from a GitHub team";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189060,8 +189060,8 @@ self: {
        ];
        testHaskellDepends = [ base cereal hedgehog time ];
        description = "Haskell implementation of openssh protocol primitives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189073,7 +189073,7 @@ self: {
        sha256 = "1p59wlkirz4dwyhsnzzzbvy2cwfizn2zky5sxrsmnrzfkbpx1ig5";
        libraryHaskellDepends = [ base directory HsOpenSSL time unix ];
        description = "Create OpenSSL keypairs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "openssl-streams" = callPackage
@@ -189092,7 +189092,7 @@ self: {
          test-framework-hunit
        ];
        description = "OpenSSL network support for io-streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "opentelemetry" = callPackage
@@ -189106,7 +189106,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring exceptions ghc-trace-events hashable
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "opentelemetry-extra" = callPackage
@@ -189142,7 +189142,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [ base gauge opentelemetry ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "opentelemetry-http-client" = callPackage
@@ -189155,8 +189155,8 @@ self: {
        libraryHaskellDepends = [
          base http-client http-types opentelemetry text
        ];
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189183,7 +189183,7 @@ self: {
          ghc-events http-client http-types opentelemetry opentelemetry-extra
          splitmix text typed-process unordered-containers
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "opentelemetry-wai" = callPackage
@@ -189197,7 +189197,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-types opentelemetry text wai
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "opentheory" = callPackage
@@ -189209,7 +189209,7 @@ self: {
        libraryHaskellDepends = [ base opentheory-primitive QuickCheck ];
        testHaskellDepends = [ base opentheory-primitive QuickCheck ];
        description = "The standard theory library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-bits" = callPackage
@@ -189225,7 +189225,7 @@ self: {
          QuickCheck
        ];
        description = "Natural number to bit-list conversions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-byte" = callPackage
@@ -189241,7 +189241,7 @@ self: {
          opentheory-probability QuickCheck
        ];
        description = "Bytes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-char" = callPackage
@@ -189263,8 +189263,8 @@ self: {
          random
        ];
        description = "Unicode characters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189282,7 +189282,7 @@ self: {
          base opentheory opentheory-primitive QuickCheck
        ];
        description = "The divides relation on natural numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-fibonacci" = callPackage
@@ -189300,7 +189300,7 @@ self: {
          base opentheory opentheory-primitive opentheory-stream QuickCheck
        ];
        description = "Fibonacci numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-parser" = callPackage
@@ -189317,7 +189317,7 @@ self: {
          base opentheory opentheory-primitive QuickCheck
        ];
        description = "Stream parsers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-prime" = callPackage
@@ -189337,7 +189337,7 @@ self: {
          opentheory-stream QuickCheck
        ];
        description = "Prime natural numbers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-primitive" = callPackage
@@ -189349,7 +189349,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck random ];
        testHaskellDepends = [ base QuickCheck random ];
        description = "Haskell primitives used by OpenTheory packages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-probability" = callPackage
@@ -189363,7 +189363,7 @@ self: {
          base opentheory opentheory-primitive QuickCheck
        ];
        description = "Probability";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-stream" = callPackage
@@ -189377,7 +189377,7 @@ self: {
          base opentheory opentheory-primitive QuickCheck
        ];
        description = "Infinite stream types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentheory-unicode" = callPackage
@@ -189398,7 +189398,7 @@ self: {
          opentheory-primitive opentheory-probability QuickCheck
        ];
        description = "Unicode characters";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "opentok" = callPackage
@@ -189430,8 +189430,8 @@ self: {
          unordered-containers utf8-string uuid
        ];
        description = "An OpenTok SDK for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189449,8 +189449,8 @@ self: {
          pretty-hex time unordered-containers vector
        ];
        description = "Opentype loading and writing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189473,8 +189473,8 @@ self: {
          base directory optparse-applicative time xdg-basedir
        ];
        description = "Access data at OpenWeatherMap";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189491,8 +189491,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189507,7 +189507,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        executableHaskellDepends = [ base mtl random ];
        description = "Implementation of difficult monads made easy with operational semantics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "operational-alacarte" = callPackage
@@ -189519,7 +189519,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base ];
        description = "A version of Operational suitable for extensible EDSLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "operational-class" = callPackage
@@ -189530,7 +189530,7 @@ self: {
        sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b";
        libraryHaskellDepends = [ base operational transformers ];
        description = "MonadProgram typeclass for the operational package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "operational-extra" = callPackage
@@ -189545,8 +189545,8 @@ self: {
          base bytestring operational text time transformers
        ];
        description = "Interpretation functions and simple instruction sets for operational";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189565,8 +189565,8 @@ self: {
          text-builder unordered-containers
        ];
        description = "Compiler for OpLang, an esoteric programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189578,7 +189578,7 @@ self: {
        sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x";
        libraryHaskellDepends = [ base directory xml ];
        description = "Representing and handling OPML subscription information";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "opml-conduit" = callPackage
@@ -189606,7 +189606,7 @@ self: {
          uri-bytestring xml-conduit
        ];
        description = "Streaming parser/renderer for the OPML 2.0 format.";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "opn" = callPackage
@@ -189624,8 +189624,8 @@ self: {
          process text unordered-containers
        ];
        description = "Open files or URLs using associated programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189654,7 +189654,7 @@ self: {
          unordered-containers vector
        ];
        description = "Optics as an abstract interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optics-core" = callPackage
@@ -189669,7 +189669,7 @@ self: {
          array base containers indexed-profunctors transformers
        ];
        description = "Optics as an abstract interface: core definitions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optics-extra" = callPackage
@@ -189686,7 +189686,7 @@ self: {
          optics-core text transformers unordered-containers vector
        ];
        description = "Extra utilities and instances for optics-core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optics-th" = callPackage
@@ -189705,7 +189705,7 @@ self: {
        ];
        testHaskellDepends = [ base optics-core tagged ];
        description = "Optics construction using TemplateHaskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optics-vl" = callPackage
@@ -189720,7 +189720,7 @@ self: {
          base indexed-profunctors optics-core profunctors
        ];
        description = "Utilities for compatibility with van Laarhoven optics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optima" = callPackage
@@ -189737,8 +189737,8 @@ self: {
        ];
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189754,8 +189754,8 @@ self: {
          base bytestring hasql hasql-pool optima text time
        ];
        description = "Command-line arguments parsing for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189780,8 +189780,8 @@ self: {
          base bytestring criterion deepseq vector
        ];
        description = "Optimal Block boundary determination for rsync-like behaviours";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189797,8 +189797,8 @@ self: {
          ad base distributive linear semigroupoids vector
        ];
        description = "Numerical optimization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189817,8 +189817,8 @@ self: {
          uniplate wl-pprint
        ];
        description = "A supercompiler for f-lite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189830,7 +189830,7 @@ self: {
        sha256 = "1m02b0wcsmfdlmh5cnwfylnpc1cizmfcmjxdiwab5bjbbi0xvkaj";
        libraryHaskellDepends = [ base ];
        description = "A strict version of Maybe";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "optional" = callPackage
@@ -189844,8 +189844,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "Using type-classes for optional function arguments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189859,7 +189859,7 @@ self: {
        editedCabalFile = "0fda6mhm44qpbc9hfkf6jxnm3a7qszabywsmxa2iw0dz734a9xl3";
        libraryHaskellDepends = [ base ];
        description = "Optional function arguments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "options" = callPackage
@@ -189875,7 +189875,7 @@ self: {
          base chell chell-quickcheck containers monads-tf transformers
        ];
        description = "A powerful and easy-to-use command-line option parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "options-time" = callPackage
@@ -189887,8 +189887,8 @@ self: {
        libraryHaskellDepends = [ base options time ];
        testHaskellDepends = [ base chell options time ];
        description = "Command-line option types for dates and times";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189907,7 +189907,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optparse-applicative_0_16_1_0" = callPackage
@@ -189923,8 +189923,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "optparse-applicative-simple" = callPackage
@@ -189940,8 +189940,8 @@ self: {
        ];
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189953,7 +189953,7 @@ self: {
        sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr";
        libraryHaskellDepends = [ base mtl ];
        description = "Declarative command line option parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "optparse-enum" = callPackage
@@ -189967,8 +189967,8 @@ self: {
          base enum-text fmt optparse-applicative text
        ];
        description = "An enum-text based toolkit for optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -189985,7 +189985,7 @@ self: {
          system-filepath text time transformers void
        ];
        description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optparse-generic_1_4_4" = callPackage
@@ -190001,8 +190001,8 @@ self: {
          transformers void
        ];
        description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "optparse-helper" = callPackage
@@ -190015,8 +190015,8 @@ self: {
        editedCabalFile = "13zhsnpdw3kckjrc3sz2i5cqgxwd6sisvik02q0j43d940jmmdk0";
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Helper functions for optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190035,7 +190035,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Simple interface to optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optparse-text" = callPackage
@@ -190047,7 +190047,7 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base hspec optparse-applicative text ];
        description = "Data.Text helpers for optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "optparse-version" = callPackage
@@ -190057,7 +190057,7 @@ self: {
        version = "0.3.0.0";
        sha256 = "08mv8ah4g5xs91245gpgh6r0mgdz6rk7ykk1ywr8gfwn3dx1zm7x";
        libraryHaskellDepends = [ base optparse-applicative ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orbits" = callPackage
@@ -190078,7 +190078,7 @@ self: {
          tagged tasty tasty-quickcheck tasty-th units units-defs
        ];
        description = "Types and functions for Kepler orbits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orc" = callPackage
@@ -190095,8 +190095,8 @@ self: {
          base deepseq monadIO mtl process random stm
        ];
        description = "Orchestration-style co-ordination EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190120,8 +190120,8 @@ self: {
          wreq
        ];
        description = "An API client for http://orchestrate.io/.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190142,8 +190142,8 @@ self: {
          salvia-extras stm time unix xml
        ];
        description = "Haskell Wiki Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190163,8 +190163,8 @@ self: {
          salvia-extras stm
        ];
        description = "Haskell Wiki Demo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190176,7 +190176,7 @@ self: {
        sha256 = "062wkfpww1ic3xiy26k22369azk5wjlpn5wm5xh1w75kc9crv263";
        libraryHaskellDepends = [ base void ];
        description = "Creating Ord instances instantly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "order-maintenance" = callPackage
@@ -190192,8 +190192,8 @@ self: {
          base Cabal cabal-test-quickcheck containers QuickCheck transformers
        ];
        description = "Algorithms for the order maintenance problem with a safe interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190211,7 +190211,7 @@ self: {
          base containers criterion deepseq random
        ];
        description = "Order statistic trees based on weight-balanced trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "order-statistics" = callPackage
@@ -190226,8 +190226,8 @@ self: {
          base containers math-functions statistics vector vector-space
        ];
        description = "L-Estimators for robust statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190240,7 +190240,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A definition of Posets";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ordered-containers" = callPackage
@@ -190251,7 +190251,7 @@ self: {
        sha256 = "1j92dm36s0cfhc7s4k3dk36ibkvr6w1nhaq6q1m5vkbh1qrwfnn7";
        libraryHaskellDepends = [ base containers ];
        description = "Set- and Map-like types that remember the order elements were inserted";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orderly-workers" = callPackage
@@ -190262,7 +190262,7 @@ self: {
        sha256 = "0w032z05yxl7zqdganxvd8rklzli5k8bya2648hk8scl51q98390";
        libraryHaskellDepends = [ base stm ];
        description = "Fork concurrent worker threads and produce ordered results";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orders" = callPackage
@@ -190275,7 +190275,7 @@ self: {
        editedCabalFile = "1ilyg95l97xp4ym402g499ysfbwqsw413kpk4gvi5hd861xx2laj";
        libraryHaskellDepends = [ base containers ];
        description = "basic orders";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ordinal" = callPackage
@@ -190294,8 +190294,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        testToolDepends = [ hspec-discover ];
        description = "Convert numbers to words in different languages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190310,8 +190310,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190326,8 +190326,8 @@ self: {
        ];
        testHaskellDepends = [ base containers either mtl transformers ];
        description = "Owned references in the Ownership Monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190345,8 +190345,8 @@ self: {
        ];
        testHaskellDepends = [ base megaparsec tasty tasty-hunit text ];
        description = "Parser for Emacs org-mode files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190361,8 +190361,8 @@ self: {
          base containers hashable lucid org-mode text
        ];
        description = "Lucid integration for org-mode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190376,7 +190376,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec regex-compat ];
        description = "Basic org to anki exporter";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "organize-imports" = callPackage
@@ -190389,8 +190389,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ attoparsec base text ];
        description = "Organize scala imports";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190410,8 +190410,8 @@ self: {
          QuickCheck random regex-posix syb text
        ];
        description = "Org Mode library for haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190434,7 +190434,7 @@ self: {
          thyme unordered-containers
        ];
        description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orgstat" = callPackage
@@ -190468,8 +190468,8 @@ self: {
          transformers universum
        ];
        description = "Statistics visualizer for org-mode";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190488,8 +190488,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "An un-SYB framework for transforming heterogenous data through folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190509,7 +190509,7 @@ self: {
          http-types iso8601-time lens mtl string-conversions text time
          unordered-containers word8 wreq
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orizentic" = callPackage
@@ -190530,8 +190530,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec jwt mtl time ];
        description = "Token-based authentication and authorization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190562,7 +190562,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "orthotope" = callPackage
@@ -190582,7 +190582,7 @@ self: {
          test-framework-quickcheck2 vector
        ];
        description = "Multidimensional arrays inspired by APL";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "os-release" = callPackage
@@ -190602,7 +190602,7 @@ self: {
          pretty-simple tasty tasty-golden tasty-hspec text
        ];
        description = "/etc/os-release helpers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "osc" = callPackage
@@ -190617,8 +190617,8 @@ self: {
          attoparsec base binary bytestring data-binary-ieee754 network
        ];
        description = "A library to handle messages in the OSC protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190630,8 +190630,8 @@ self: {
        sha256 = "1452a2y085xbj5q83g6y8f9vrxmlq804i8kyx6rfwyzfvzq5s3ic";
        libraryHaskellDepends = [ base colour gloss random ];
        description = "Implements an osculatory packing (kissing circles) algorithm and display";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190651,7 +190651,7 @@ self: {
        ];
        executableHaskellDepends = [ base process ];
        description = "Show keys pressed with an on-screen display (Linux only)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "oset" = callPackage
@@ -190667,8 +190667,8 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        testToolDepends = [ hspec-discover ];
        description = "An insertion-order-preserving set";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190688,8 +190688,8 @@ self: {
          base conduit exceptions hspec resourcet text xml-conduit xml-types
        ];
        description = "Parse and operate on OSM data in efficient way";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190711,8 +190711,8 @@ self: {
          text time transformers transformers-base
        ];
        description = "Download Open Street Map tiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190731,8 +190731,8 @@ self: {
          process temporary
        ];
        description = "Better conversion of Oxford Scholarship Online material to PDF";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190745,8 +190745,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190767,8 +190767,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Real-time collaborative editing with Operational Transformation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190794,8 +190794,8 @@ self: {
          aeson base binary bytestring h-gpgme text yaml
        ];
        description = "OTP Authenticator (a la google) command line client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190813,8 +190813,8 @@ self: {
          base containers parsec split uniplate
        ];
        description = "Pretty-printer for Ott parse trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190839,7 +190839,7 @@ self: {
          vector-algorithms
        ];
        description = "External sorting package based on Conduit";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "overhang" = callPackage
@@ -190850,7 +190850,7 @@ self: {
        sha256 = "07iafybg45130jhwin6jj2fnkgcwra367f5df91xn34kaj9zas0x";
        libraryHaskellDepends = [ base ];
        description = "Hang loose with your lambdas!";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "overload" = callPackage
@@ -190865,7 +190865,7 @@ self: {
          base simple-effects template-haskell th-expand-syns
        ];
        description = "Finite overloading";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "overloaded" = callPackage
@@ -190891,8 +190891,8 @@ self: {
        ];
        doHaddock = false;
        description = "Overloaded pragmas as a plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190914,8 +190914,8 @@ self: {
          test-framework-hunit
        ];
        description = "Overloaded Records based on current GHC proposal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190929,8 +190929,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "An alternative to some of the Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190946,8 +190946,8 @@ self: {
          array base bytestring lens transformers vector
        ];
        description = "Bidirectional fast ByteString packer/unpacker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190962,8 +190962,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Fetches a 'GenericPackageDescription' from Hackage";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190982,8 +190982,8 @@ self: {
          base Cabal filemanip filepath groom packdeps process
        ];
        description = "Utilities for working with cabal packages and your package database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -190999,8 +190999,8 @@ self: {
          base Cabal Diff filepath haskell-src-exts
        ];
        description = "Haskell Package Versioning Tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191014,7 +191014,7 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
        description = "Universal build and CI testing for Haskell packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "packdeps" = callPackage
@@ -191038,7 +191038,7 @@ self: {
          base Cabal containers optparse-applicative process semigroups text
        ];
        description = "Check your cabal packages for lagging dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "packed" = callPackage
@@ -191054,8 +191054,8 @@ self: {
          base containers ghc-prim hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        benchmarkHaskellDepends = [ base gauge ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191083,8 +191083,8 @@ self: {
          vector-binary-instances
        ];
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191103,8 +191103,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Efficient “spreadsheet table” like maps with multiple marginals";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191118,8 +191118,8 @@ self: {
        editedCabalFile = "1kqbbvvpb0zn19dp4lx598iwgpbswz1qvclrcy5v27vjivzk9hyb";
        libraryHaskellDepends = [ array base ];
        description = "(Deprecated) Packed Strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191136,7 +191136,7 @@ self: {
          base bytestring tasty tasty-hunit tasty-quickcheck
        ];
        description = "Fast byte serializer and unserializer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "packer-messagepack" = callPackage
@@ -191154,8 +191154,8 @@ self: {
          base bytestring containers hedgehog packer safe-exceptions text
        ];
        description = "MessagePack Serialization an Deserialization for Packer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191175,8 +191175,8 @@ self: {
          QuickCheck
        ];
        description = "Serialization library for GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191197,8 +191197,8 @@ self: {
          process split
        ];
        description = "Tool for detecting redundant Cabal package dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191212,8 +191212,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base deepseq directory-tree ];
        description = "Read whole Pacman database which pushes it into the memory cache";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191229,8 +191229,8 @@ self: {
          base containers hmidi minioperational transformers
        ];
        description = "Controlling padKONTROL native mode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191249,7 +191249,7 @@ self: {
          servant-client servant-client-core time
        ];
        description = "API to the Paddle payment processor";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pads-haskell" = callPackage
@@ -191276,8 +191276,8 @@ self: {
          transformers
        ];
        description = "PADS data description language for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191296,8 +191296,8 @@ self: {
        ];
        executableHaskellDepends = [ base text wreq ];
        description = "Pagarme API wrapper";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191319,7 +191319,7 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring conduit-extra text ];
        description = "Open up a pager, like 'less' or 'more'";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "pagerduty" = callPackage
@@ -191343,7 +191343,7 @@ self: {
        ];
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pagination" = callPackage
@@ -191357,7 +191357,7 @@ self: {
        libraryHaskellDepends = [ base deepseq exceptions ];
        testHaskellDepends = [ base exceptions hspec QuickCheck ];
        description = "Framework-agnostic pagination boilerplate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pagure-cli" = callPackage
@@ -191375,7 +191375,7 @@ self: {
          optparse-applicative simple-cmd-args text
        ];
        description = "Pagure client";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "pagure-hook-receiver" = callPackage
@@ -191390,8 +191390,8 @@ self: {
          base containers scotty shelly text transformers unix
        ];
        description = "Receive hooks from pagure and do things with them";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191407,7 +191407,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Colorization of text for command-line output";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pairing" = callPackage
@@ -191433,8 +191433,8 @@ self: {
          MonadRandom protolude tasty-quickcheck
        ];
        description = "Bilinear pairings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191450,8 +191450,8 @@ self: {
          array base colour containers MonadRandom
        ];
        description = "Utilities for choosing and creating color schemes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191465,7 +191465,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base bytestring containers ];
        description = "Finding palindromes in strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pam" = callPackage
@@ -191480,9 +191480,9 @@ self: {
        librarySystemDepends = [ pam ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {pam = null;};
 
@@ -191500,8 +191500,8 @@ self: {
        testHaskellDepends = [ base byteslice primitive ];
        benchmarkHaskellDepends = [ base byteslice gauge primitive ];
        description = "Parse syslog traffic from PAN-OS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191523,7 +191523,7 @@ self: {
        ];
        description = "A simple static blog engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191580,8 +191580,8 @@ self: {
          mv "man/"*.1 $out/share/man/man1/
        '';
        description = "Conversion between markup formats";
-       license = stdenv.lib.licenses.gpl2Plus;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.gpl2Plus;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "pandoc-citeproc" = callPackage
@@ -191616,7 +191616,7 @@ self: {
        ];
        doCheck = false;
        description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -191633,7 +191633,7 @@ self: {
          base directory filepath pandoc-types process text-conversions
        ];
        description = "Insert a preamble before pandoc-citeproc's bibliography";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "pandoc-crossref" = callPackage
@@ -191669,7 +191669,7 @@ self: {
          utility-ht
        ];
        description = "Pandoc filter for cross-references";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "pandoc-csv2table" = callPackage
@@ -191684,8 +191684,8 @@ self: {
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
        executableHaskellDepends = [ base csv pandoc pandoc-types ];
        description = "Convert CSV to Pandoc Table Markdown";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191697,7 +191697,7 @@ self: {
        sha256 = "032fx8fy134hysg10y5c57c7jkvq8lkc0q2r8ylc54qbfmvqd820";
        libraryHaskellDepends = [ base dhall either pandoc text ];
        description = "Decodes pandoc to dhall";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-emphasize-code" = callPackage
@@ -191722,7 +191722,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A Pandoc filter for emphasizing code in fenced blocks";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "pandoc-filter-graphviz" = callPackage
@@ -191741,8 +191741,8 @@ self: {
          directory filepath pandoc pandoc-types process text
        ];
        description = "A Pandoc filter to use graphviz";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191773,8 +191773,8 @@ self: {
          skylighting text
        ];
        description = "Pandoc filter formatting Haskell code fragments using GHC lexer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191791,7 +191791,7 @@ self: {
          skylighting-extensions skylighting-modding text
        ];
        description = "Syntax highlighting customization for Pandoc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pandoc-include" = callPackage
@@ -191811,8 +191811,8 @@ self: {
        ];
        doHaddock = false;
        description = "Include other Markdown files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191837,7 +191837,7 @@ self: {
          tasty-hunit text
        ];
        description = "A Pandoc filter for including code from source files";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "pandoc-japanese-filters" = callPackage
@@ -191856,8 +191856,8 @@ self: {
          pandoc-types shelly system-fileio system-filepath text
        ];
        description = "Japanese-specific markup filters for pandoc";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191869,8 +191869,8 @@ self: {
        sha256 = "0prc0wv808l1l7m6rg78r6alwqgajj0h2yn3w7sgxmsvxdr8aj1w";
        libraryHaskellDepends = [ base containers lens pandoc-types text ];
        description = "Lenses for Pandoc documents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191884,7 +191884,7 @@ self: {
          base containers pandoc-types relude text
        ];
        description = "Extract \"contextual links\" from Pandoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-markdown-ghci-filter" = callPackage
@@ -191909,8 +191909,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191933,7 +191933,7 @@ self: {
        ];
        description = "Pandoc filter to include CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191957,8 +191957,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Render and insert PlantUML diagrams with Pandoc";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -191993,7 +191993,7 @@ self: {
          base criterion pandoc-types template-haskell text
        ];
        description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "pandoc-pyplot" = callPackage
@@ -192023,8 +192023,8 @@ self: {
          mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text
        ];
        description = "A Pandoc filter to include figures generated from Python code blocks";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192039,8 +192039,8 @@ self: {
        libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ];
        executableHaskellDepends = [ base pandoc-types ];
        description = "Convert Pandoc Markdown-style footnotes into sidenotes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192058,7 +192058,7 @@ self: {
          base bytestring containers extra pandoc pandoc-types text
        ];
        description = "Pandoc filter to customize links, images and paragraphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-throw" = callPackage
@@ -192069,7 +192069,7 @@ self: {
        sha256 = "1i737mv2sgm65c53ggrxnscga92fya5khb5nhgbg1nnqgy2sjkm8";
        libraryHaskellDepends = [ base exceptions pandoc ];
        description = "MonadThrow behaviour for Pandoc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pandoc-types" = callPackage
@@ -192092,7 +192092,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -192105,8 +192105,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192124,8 +192124,8 @@ self: {
          text transformers
        ];
        description = "Utility functions to work with Pandoc in Haskell applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192144,7 +192144,7 @@ self: {
          temporary text
        ];
        description = "Pandoc filter for native Vim code highlighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pandora" = callPackage
@@ -192154,7 +192154,7 @@ self: {
        version = "0.3.5";
        sha256 = "1cw6wm122zwbn61980vqr2prsc3qpnnaqgk0m3wvxs03dygarpja";
        description = "A box of patterns and paradigms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pang-a-lambda" = callPackage
@@ -192173,8 +192173,8 @@ self: {
          transformers Yampa
        ];
        description = "A super-pang clone";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192194,7 +192194,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ pango ];
        description = "Binding to the Pango text rendering engine";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {inherit (pkgs) pango;};
 
   "pangraph" = callPackage
@@ -192211,8 +192211,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring containers HUnit ];
        description = "A set of parsers for graph languages and conversions to graph libaries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192234,8 +192234,8 @@ self: {
          QuickCheck syb tagged tasty tasty-quickcheck
        ];
        description = "Pandoc filter to unwrap nested blocks";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {lazysmallcheck2012 = null;};
 
@@ -192247,7 +192247,7 @@ self: {
        sha256 = "0hidfg8yzp5vzq8y422c442b45jkr8a9s38s8n78wyi5811fpp0m";
        libraryHaskellDepends = [ base gitrev template-haskell ];
        description = "A convenient way to panic";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "panpipe" = callPackage
@@ -192268,8 +192268,8 @@ self: {
          base pandoc QuickCheck tasty tasty-quickcheck
        ];
        description = "Pandoc filter to execute code blocks";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192298,8 +192298,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        description = "Pansite: a simple web site management tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192341,7 +192341,7 @@ self: {
          unliftio unordered-containers vector yaml zip-archive
        ];
        description = "Content addressable Haskell package management";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pantry-tmp" = callPackage
@@ -192395,8 +192395,8 @@ self: {
          zip-archive
        ];
        description = "Content addressable Haskell package management";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192420,8 +192420,8 @@ self: {
          papa-x-export papa-x-implement
        ];
        description = "Reasonable default import";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192435,8 +192435,8 @@ self: {
          base papa-base-export papa-base-implement
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192448,8 +192448,8 @@ self: {
        sha256 = "120b3ks9h3m9w6z365hmqrcp349kh3w8ii4kgki1zxjhh9z05mnm";
        libraryHaskellDepends = [ base semigroups ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192461,8 +192461,8 @@ self: {
        sha256 = "07wpz625sdsjajaf3imqns92hs4h5gwjlmmfsr5mk9rbb3zph7ck";
        libraryHaskellDepends = [ base papa-base-export semigroups ];
        description = "Useful base functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192478,7 +192478,7 @@ self: {
          base papa-bifunctors-export papa-bifunctors-implement
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-bifunctors-export" = callPackage
@@ -192491,7 +192491,7 @@ self: {
        editedCabalFile = "1d5jvb35as6kb9nmv99gv38v7rzl7c9mdg3ypwzmdqg0646m9k7m";
        libraryHaskellDepends = [ base bifunctors ];
        description = "export useful functions from `bifunctors`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-bifunctors-implement" = callPackage
@@ -192502,7 +192502,7 @@ self: {
        sha256 = "0s1hcpchiz9xrip25z677lkglmflnqibrvy98xmn2ppzp489pm24";
        libraryHaskellDepends = [ base bifunctors ];
        description = "useful `bifunctors` functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-export" = callPackage
@@ -192522,8 +192522,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Reasonable default import";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192545,8 +192545,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Reasonable default import";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192563,8 +192563,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Third party libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192578,7 +192578,7 @@ self: {
          base papa-lens-export papa-lens-implement
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-lens-export" = callPackage
@@ -192589,7 +192589,7 @@ self: {
        sha256 = "1sckrsfljk8r9jkjv1ccpzw6bk4fq50zwvkddhfidjrjnfvkycfb";
        libraryHaskellDepends = [ base lens ];
        description = "export useful functions from `lens`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-lens-implement" = callPackage
@@ -192600,7 +192600,7 @@ self: {
        sha256 = "1x7439f7s625mdhnphvwy4pj7llpj6qsvzgvhzjcfg9m3n2a8bn4";
        libraryHaskellDepends = [ base lens ];
        description = "useful `lens` functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-prelude" = callPackage
@@ -192616,8 +192616,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192634,8 +192634,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192652,8 +192652,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192670,8 +192670,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192688,8 +192688,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192705,8 +192705,8 @@ self: {
          base papa-semigroupoids-export papa-semigroupoids-implement
        ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192718,7 +192718,7 @@ self: {
        sha256 = "0arqnnavjmpk0r9rfmpkyr3cxgc3gcr01ym8p15ix0iv0svghhx3";
        libraryHaskellDepends = [ base semigroupoids ];
        description = "export useful functions from `semigroupoids`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-semigroupoids-implement" = callPackage
@@ -192729,8 +192729,8 @@ self: {
        sha256 = "0walc4zzm8cyjmjl577zrc01lkgf321r8law5mwhlr7n9ihiqfxg";
        libraryHaskellDepends = [ base semigroupoids semigroups ];
        description = "useful `semigroupoids` functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192742,7 +192742,7 @@ self: {
        sha256 = "1dvnnpdbiaxry2mxsfxlm0c42zi8ssx0sxj6m9z5mihwcf76cpld";
        libraryHaskellDepends = [ base papa-x-export papa-x-implement ];
        description = "Prelude with only useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-x-export" = callPackage
@@ -192753,7 +192753,7 @@ self: {
        sha256 = "1l0rklbpg9py2cbp22qlshcxh51wxv9ayiixqh32q70jsgfbkind";
        libraryHaskellDepends = [ base ];
        description = "export useful functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "papa-x-implement" = callPackage
@@ -192764,7 +192764,7 @@ self: {
        sha256 = "1hwd93nig7vgqsdy3qyxrgvjcq8wwbj98z6r66wpp7lw8jfpqhff";
        libraryHaskellDepends = [ base ];
        description = "useful functions reimplemented";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paphragen" = callPackage
@@ -192777,8 +192777,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring containers ];
        description = "A passphrase generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192799,8 +192799,8 @@ self: {
          base directory filepath monads-tf template-haskell transformers
        ];
        description = "packrat parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192814,8 +192814,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192838,8 +192838,8 @@ self: {
          wai-app-static wai-websockets warp websockets word8
        ];
        description = "The Haskell library and examples for the kids programming robot paprika";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192856,8 +192856,8 @@ self: {
          base hedgehog refined template-haskell validators
        ];
        description = "ParDual class for Parallel <-> Sequential";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192869,7 +192869,7 @@ self: {
        sha256 = "0rmv6wyisdg4srzjykikqqigfji6x5zn1cz2v3cyl0dms4yr4lig";
        libraryHaskellDepends = [ base directory filepath parallel-io ];
        description = "Traverse a directory in parallel";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "para" = callPackage
@@ -192880,7 +192880,7 @@ self: {
        sha256 = "0l5abmqi548s10f87m124ld4hhphhl1szljyc04a13fah4dsqjbh";
        libraryHaskellDepends = [ base ];
        description = "Text paragraph formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paragon" = callPackage
@@ -192907,8 +192907,8 @@ self: {
        ];
        executableToolDepends = [ alex ];
        description = "Paragon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192922,7 +192922,7 @@ self: {
        editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6";
        libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
        description = "Parallel programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parallel-io" = callPackage
@@ -192939,7 +192939,7 @@ self: {
          base containers extensible-exceptions random
        ];
        description = "Combinators for executing IO actions in parallel on a thread pool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parallel-tasks" = callPackage
@@ -192954,8 +192954,8 @@ self: {
          base bytestring cereal deepseq here old-locale stm time
          transformers vector vector-algorithms
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192967,7 +192967,7 @@ self: {
        sha256 = "08r8xl3x5zvsy3d3ss9m9l7kb0dyp7hjrwxlnz7g2jl7p5x8rjbd";
        libraryHaskellDepends = [ base parallel tree-monad ];
        description = "Parallel Tree Search";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "parameterized" = callPackage
@@ -192979,8 +192979,8 @@ self: {
        libraryHaskellDepends = [ base data-diverse transformers ];
        testHaskellDepends = [ base data-diverse hspec transformers ];
        description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -192992,7 +192992,7 @@ self: {
        sha256 = "0fsghadd533qzav40xi3yfb8xmfv4wqsqmb0bk93rczyzyff2900";
        libraryHaskellDepends = [ base template-haskell type-level ];
        description = "Parameterized data library implementing lightweight dependent types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parameterized-utils" = callPackage
@@ -193014,8 +193014,8 @@ self: {
          tasty-ant-xml tasty-hedgehog tasty-hunit
        ];
        description = "Classes and data structures for working with data-kind indexed types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193034,7 +193034,7 @@ self: {
          base bytestring tasty tasty-golden tasty-hunit temporary
        ];
        description = "Generate labelled test/benchmark trees from sets of parameters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paranoia" = callPackage
@@ -193059,8 +193059,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "http proxy server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193072,8 +193072,8 @@ self: {
        sha256 = "0598hz6zqcn4lh5y3vr54z4jh4ampxnh8rq29k6p5vnmrpvn4lq4";
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193085,8 +193085,8 @@ self: {
        sha256 = "0bc2gyvc1i3l3p702zs6hfkab7fmc7li5kh4mdzy3a91gzgsl3jh";
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193098,8 +193098,8 @@ self: {
        sha256 = "0m3dsjay3av4y0v4j76wxybmk4mkjdhqq81w1wsfr173d4blgxf3";
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193115,8 +193115,8 @@ self: {
          base bytestring containers mtl text transformers utf8-string word8
        ];
        description = "A simple parser-combinator library, a bit like Parsec but without the frills";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193145,8 +193145,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193158,8 +193158,8 @@ self: {
        sha256 = "0b05zrc3v1hczasgg8ir83qfsz52lq02kwgn9nd39wnfliw6a4n0";
        libraryHaskellDepends = [ base ];
        description = "A library for cause-effect relationships";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193183,7 +193183,7 @@ self: {
          base bytestring parser-combinators random tasty tasty-hunit text
        ];
        description = "Parser combinators with fast-path and slower fallback for error reporting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "parochial" = callPackage
@@ -193206,8 +193206,8 @@ self: {
          base Cabal optparse-generic protolude
        ];
        description = "Help Manage project specific documentation";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193244,8 +193244,8 @@ self: {
          mtl process QuickCheck text
        ];
        description = "Streaming Parquet reader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193257,7 +193257,7 @@ self: {
        sha256 = "0amh3h49xi65kx8l34cy5jkai1f0d9l1qxp4937f3cjf7afif0pj";
        libraryHaskellDepends = [ array base bytestring parsec ];
        description = "DIMACS CNF parser library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parse-gcstats" = callPackage
@@ -193276,7 +193276,7 @@ self: {
          text
        ];
        description = "Parse machine-readable GHC GC stats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parse-help" = callPackage
@@ -193293,8 +193293,8 @@ self: {
        ];
        testHaskellDepends = [ cmdargs ];
        description = "generate command line arguments from a --help output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193310,8 +193310,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base process ];
        description = "Parse command-line arguments";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193330,8 +193330,8 @@ self: {
          base HUnit mtl test-framework test-framework-hunit
        ];
        description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "parsec-class" = callPackage
@@ -193342,7 +193342,7 @@ self: {
        sha256 = "0wqpivsrjsp9996fz6lb06rxl3860afc4l8hbx8d1vxhwv2lx702";
        libraryHaskellDepends = [ base parsec ];
        description = "Class of types that can be constructed from their text representation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "parsec-extra" = callPackage
@@ -193353,7 +193353,7 @@ self: {
        sha256 = "00n7vzkkd70ndjlxhwnnl4mlh0892idc813kj4j1a14xa85sndj9";
        libraryHaskellDepends = [ base monads-tf parsec ];
        description = "Some miscellaneous basic string parsers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec-free" = callPackage
@@ -193368,8 +193368,8 @@ self: {
          base bytestring containers free lens mtl parsec text transformers
        ];
        description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193381,7 +193381,7 @@ self: {
        sha256 = "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp";
        libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec-numeric" = callPackage
@@ -193399,7 +193399,7 @@ self: {
        ];
        description = "Parsec combinators for parsing Haskell numeric types";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "parsec-parsers" = callPackage
@@ -193413,8 +193413,8 @@ self: {
        libraryHaskellDepends = [ base parsec parsers ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Parsing instances for Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193427,7 +193427,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec QuickCheck ];
        description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec-pratt" = callPackage
@@ -193441,8 +193441,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base containers mtl parsec pretty ];
        description = "Pratt Parser combinator for Parsec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193454,7 +193454,7 @@ self: {
        sha256 = "1pzspf5fimjlki5fn3lxz1kdpd9pf2ww8z9sf08zaiyfp4ms15n1";
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Parsec parsers for Tagsoup tag streams";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "parsec-trace" = callPackage
@@ -193465,7 +193465,7 @@ self: {
        sha256 = "085899pyr7sff5d5zgr9pmflv3384hwm7p2b5k2lf0pcnvzf2mgw";
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Add a hierarchical trace to Parsec parsers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "parsec-utils" = callPackage
@@ -193476,7 +193476,7 @@ self: {
        sha256 = "0pfdl9zsdzxcbjh37234djcbg6sdhqzx3fnin0b55hxn78k26ivi";
        libraryHaskellDepends = [ base parsec ];
        description = "Utility functions and combinators for Text.Parsec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec1" = callPackage
@@ -193487,7 +193487,7 @@ self: {
        sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf";
        libraryHaskellDepends = [ base ];
        description = "Portable monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsec2" = callPackage
@@ -193498,8 +193498,8 @@ self: {
        sha256 = "075y56pbi02ssyb965di1b6d2047jdjwq2wp2maraqjm6gdk824y";
        libraryHaskellDepends = [ base ];
        description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193511,8 +193511,8 @@ self: {
        sha256 = "00p3kffqmsi6lvxbpa60nql3lgm9vnxsspp8m0jz2d2hfl7hadqf";
        libraryHaskellDepends = [ base bytestring mtl text ];
        description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193524,7 +193524,7 @@ self: {
        sha256 = "0i7fvbhvvmf5nld51kv9v0vpb42dlnpivxcl7ll0zwa3gzks2cm5";
        libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from Char sequences";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsedate" = callPackage
@@ -193535,7 +193535,7 @@ self: {
        sha256 = "0gsylvm8srddmh3g3ysjgqqmgp0ddg6pdi2sz15v6nrvsqfabiip";
        libraryHaskellDepends = [ base old-locale old-time parsec ];
        description = "Data and time parsing for CalendarTime";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parseerror-eq" = callPackage
@@ -193547,8 +193547,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Adds and Eq instance for Parsec's ParseError if needed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193560,7 +193560,7 @@ self: {
        sha256 = "090yhbbh2i5lwfwrfml0n54ziy8mz3mgmwnykr4ab06w1ylc2zh4";
        libraryHaskellDepends = [ base ];
        description = "Parallel Parsing Processes";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "parsely" = callPackage
@@ -193570,8 +193570,8 @@ self: {
        version = "0.1";
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
        libraryHaskellDepends = [ base mtl parsec ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193583,7 +193583,7 @@ self: {
        sha256 = "0k95nvgnl5820y094yfh7b868l0xd1diclm4kx9560p5rm02w5h3";
        libraryHaskellDepends = [ base ];
        description = "Lightweight package providing commonly useful parser combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parser-combinators-tests" = callPackage
@@ -193605,8 +193605,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Test suite of parser-combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193622,8 +193622,8 @@ self: {
          aeson base bytestring haskell-src-exts text
        ];
        description = "Prints Haskell parse trees in JSON";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193638,8 +193638,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec mtl ];
        description = "An interface to create production rules using augmented grammars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193661,8 +193661,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "TH parser generator for splitting bytestring into fixed-width fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193684,7 +193684,7 @@ self: {
          attoparsec base bytestring parsec QuickCheck quickcheck-instances
        ];
        description = "Parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "parsers-megaparsec" = callPackage
@@ -193701,8 +193701,8 @@ self: {
          base fail megaparsec mtl parsers semigroups text transformers
        ];
        description = "`parsers` instances for Megaparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193726,8 +193726,8 @@ self: {
          array base binary bytestring containers deepseq mtl
        ];
        description = "NMR-STAR file format parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193739,8 +193739,8 @@ self: {
        sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Monadic parser combinators derived from Parsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193761,7 +193761,7 @@ self: {
          base QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Parser combinators with slicing, error recovery, and syntax highlighting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "partage" = callPackage
@@ -193779,8 +193779,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit tasty tasty-hunit ];
        description = "Parsing factorized";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193792,7 +193792,7 @@ self: {
        sha256 = "1pgmiddwhk40bzhwznv6lwmxglsnp41z45qhpd5cm0nh2wmzgx5p";
        libraryHaskellDepends = [ base ];
        description = "A nullary type class for partial functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "partial-handler" = callPackage
@@ -193803,7 +193803,7 @@ self: {
        sha256 = "0cf1748zyr07zv0ffi44rf5b9f7ygdybbdcl7m7c0zj14kq2miwl";
        libraryHaskellDepends = [ base ];
        description = "A composable exception handler";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "partial-isomorphisms" = callPackage
@@ -193814,7 +193814,7 @@ self: {
        sha256 = "0r51ykq6i11gzypv93bnw8pzn4zdyrabiiqfpbhpvs0rj6k1ymac";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Partial isomorphisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "partial-lens" = callPackage
@@ -193829,8 +193829,8 @@ self: {
          base comonad-transformers data-lens transformers
        ];
        description = "Haskell 98 Partial Lenses";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193848,7 +193848,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Provides typeclass suitable for types admitting a partial order";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "partial-records" = callPackage
@@ -193859,8 +193859,8 @@ self: {
        sha256 = "0vp5d0jdbk451a563a4hzkycyqh41w6plb39dfn0bv6li4a5qp8h";
        libraryHaskellDepends = [ base template-haskell transformers ];
        description = "Template haskell utilities for constructing records with default values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193873,7 +193873,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hedgehog ];
        description = "A partial binary associative operator";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "partial-semigroup-hedgehog" = callPackage
@@ -193884,7 +193884,7 @@ self: {
        sha256 = "0n0j8xlrz66mzkvrsa083b9057n3rgbir7pwqxqycwzgj18g68s6";
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        description = "Property testing for partial semigroups using Hedgehog";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "partial-semigroup-test" = callPackage
@@ -193896,7 +193896,7 @@ self: {
        libraryHaskellDepends = [ partial-semigroup-hedgehog ];
        doHaddock = false;
        description = "Testing utilities for the partial-semigroup package";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "partial-uri" = callPackage
@@ -193908,7 +193908,7 @@ self: {
        libraryHaskellDepends = [ base network-uri ];
        description = "Datatype for passing around unresolved URIs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "partly" = callPackage
@@ -193930,8 +193930,8 @@ self: {
          aeson base base64-bytestring binary bytestring QuickCheck vector
        ];
        description = "Inspect, create, and alter MBRs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193950,8 +193950,8 @@ self: {
          mwc-random pretty primitive process random
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -193979,8 +193979,8 @@ self: {
          random
        ];
        description = "a simple password manager";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194001,8 +194001,8 @@ self: {
          passman-core resourcet text X11 yaml
        ];
        description = "Deterministic password generator command line interface";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "passman-core" = callPackage
@@ -194027,8 +194027,8 @@ self: {
        ];
        doHaddock = false;
        description = "Deterministic password generator core";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "password" = callPackage
@@ -194051,7 +194051,7 @@ self: {
          template-haskell text
        ];
        description = "Hashing and checking of passwords";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "password-instances" = callPackage
@@ -194074,7 +194074,7 @@ self: {
          template-haskell text
        ];
        description = "typeclass instances for password package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "passwords" = callPackage
@@ -194085,8 +194085,8 @@ self: {
        sha256 = "0x345pfa28abj152kkr1afnaraf4r8pj0216ack79brxvdhlk6li";
        libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194103,8 +194103,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec microlens protolude ];
        description = "PostgreSQL Abstract Syntax Tree Assember";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194116,8 +194116,8 @@ self: {
        sha256 = "1425gzss5maqzrphrvvsw60lkapwg3wfjx10c59qkylx63k5ixjl";
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194132,7 +194132,7 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ];
        description = "A simple command line pasting utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194161,8 +194161,8 @@ self: {
          base directory QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Terminal-based presentations using Pandoc";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194183,7 +194183,7 @@ self: {
        ];
        testHaskellDepends = [ base directory filemanip filepath hlint ];
        description = "Data structures for describing changes to other data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "patch-combinators" = callPackage
@@ -194195,7 +194195,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "A library for patching functions and data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "patch-image" = callPackage
@@ -194220,8 +194220,8 @@ self: {
          unordered-containers utility-ht vector
        ];
        description = "Compose a big image from overlapping parts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "patches-vector" = callPackage
@@ -194239,8 +194239,8 @@ self: {
          base criterion doctest hspec QuickCheck vector
        ];
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194265,7 +194265,7 @@ self: {
          genvalidity-property hspec mtl QuickCheck validity
        ];
        description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "path_0_8_0" = callPackage
@@ -194287,8 +194287,8 @@ self: {
          genvalidity-property hspec mtl QuickCheck template-haskell validity
        ];
        description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "path-binary-instance" = callPackage
@@ -194299,7 +194299,7 @@ self: {
        sha256 = "19ck3ja66vcgl90wyw6r9d2h50kdv9gjs7sxjgciam6v6867vb0y";
        libraryHaskellDepends = [ base binary path ];
        description = "Binary instance for Path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "path-dhall-instance" = callPackage
@@ -194310,7 +194310,7 @@ self: {
        sha256 = "17igz9936lfivph9rr04075sp7ik5k8byljw2vj0zx8lnznjwn6a";
        libraryHaskellDepends = [ base dhall either path text ];
        description = "ToDhall and FromDhall instances for Path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "path-extensions" = callPackage
@@ -194321,7 +194321,7 @@ self: {
        sha256 = "0pvjb26arsj892addi9x26v8naislh87x6av70k8fjnsish3pnj5";
        libraryHaskellDepends = [ base exceptions path ];
        description = "Enumeration of common filetype extensions for use with the path library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "path-extra" = callPackage
@@ -194338,7 +194338,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "URLs without host information";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "path-io" = callPackage
@@ -194358,7 +194358,7 @@ self: {
          unix-compat
        ];
        description = "Interface to ‘directory’ package for users of ‘path’";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "path-like" = callPackage
@@ -194369,7 +194369,7 @@ self: {
        sha256 = "1hr58zcgcybd34zzas5kf0jgcm5z2wdlbhskwj9233503nnlwkq9";
        libraryHaskellDepends = [ base path ];
        description = "PathLike, FileLike and DirLike type classes for the Path library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "path-pieces" = callPackage
@@ -194383,8 +194383,8 @@ self: {
        libraryHaskellDepends = [ base text time ];
        testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "Components of paths";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
   "path-text-utf8" = callPackage
@@ -194397,7 +194397,7 @@ self: {
          base bytestring path safe-exceptions text
        ];
        description = "Read and write UTF-8 text files";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "path-utils" = callPackage
@@ -194408,7 +194408,7 @@ self: {
        sha256 = "0k6wfy8vzddfhxsd5zlbjd4397syqhdg6i8v49d218m0qqfhzkpj";
        libraryHaskellDepends = [ base exceptions path split text ];
        description = "Handful of simple utility functions for the path library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pathfinding" = callPackage
@@ -194419,7 +194419,7 @@ self: {
        sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80";
        libraryHaskellDepends = [ base containers ];
        description = "pathfinding in grid and graphs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pathfindingcore" = callPackage
@@ -194437,8 +194437,8 @@ self: {
          array base-noprelude bizzlelude tasty tasty-hunit
        ];
        description = "A toy pathfinding library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194450,7 +194450,7 @@ self: {
        sha256 = "04877061vp9fv5qd0cdazmn8dd1l0zsqpxvw1awvbzjyfzl31k1y";
        libraryHaskellDepends = [ base bytestring random ];
        description = "Pathological ByteStrings for testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paths" = callPackage
@@ -194468,7 +194468,7 @@ self: {
          time
        ];
        description = "Library for representing and manipulating type-safe file paths";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pathtype" = callPackage
@@ -194487,7 +194487,7 @@ self: {
        ];
        testHaskellDepends = [ base random ];
        description = "Type-safe replacement for System.FilePath etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pathwalk" = callPackage
@@ -194499,7 +194499,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath transformers ];
        testHaskellDepends = [ base ];
        description = "Path walking utilities for Haskell programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "patience" = callPackage
@@ -194510,7 +194510,7 @@ self: {
        sha256 = "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i";
        libraryHaskellDepends = [ base containers ];
        description = "Patience diff and longest increasing subsequence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "patronscraper" = callPackage
@@ -194523,8 +194523,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HandsomeSoup hxt ];
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194536,7 +194536,7 @@ self: {
        sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
        libraryHaskellDepends = [ base mtl ];
        description = "Arrows for Pretty Printing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pattern-matcher" = callPackage
@@ -194548,7 +194548,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers mtl QuickCheck ];
        description = "A library for compiling pattern-matching to decision trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pattern-trie" = callPackage
@@ -194572,7 +194572,7 @@ self: {
          base bytestring containers criterion deepseq hashable text
        ];
        description = "Pattern tries";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "patterns" = callPackage
@@ -194589,7 +194589,7 @@ self: {
        ];
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194603,7 +194603,7 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        description = "Greatest convex majorants and least concave minorants";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "paymill" = callPackage
@@ -194615,7 +194615,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "This is an unofficial client for the Paymill API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "paypal-adaptive-hoops" = callPackage
@@ -194639,8 +194639,8 @@ self: {
          test-framework-hunit text
        ];
        description = "Client for a limited part of PayPal's Adaptive Payments API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194657,8 +194657,8 @@ self: {
          mtl old-locale text time wai
        ];
        description = "PayPal API, currently supporting \"ButtonManager\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194675,8 +194675,8 @@ self: {
          http-types lens safe text time wreq
        ];
        description = "A client to connect to PayPal's REST API (v1)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194692,8 +194692,8 @@ self: {
          base containers HTTP network process
        ];
        description = "pastebin command line application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194713,8 +194713,8 @@ self: {
        ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Utility CLI for working with protobuf files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194726,8 +194726,8 @@ self: {
        sha256 = "16dki82d9x6rpkbax090ax8ynwjxv31cvpzpy51ynq83kjg3v2z9";
        libraryHaskellDepends = [ base hslua string-qq ];
        description = "pbc for HsLua";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194746,7 +194746,7 @@ self: {
          base binary byteable bytedump bytestring cryptohash utf8-string
        ];
        description = "Haskell implementation of the PBKDF functions from RFC-2898";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcap" = callPackage
@@ -194757,7 +194757,7 @@ self: {
        sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
        libraryHaskellDepends = [ base bytestring network time ];
        description = "A system-independent interface for user-level packet capture";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcap-conduit" = callPackage
@@ -194770,7 +194770,7 @@ self: {
          base bytestring conduit pcap transformers
        ];
        description = "Conduit <-> libpcap";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcap-enumerator" = callPackage
@@ -194784,8 +194784,8 @@ self: {
          base bytestring enumerator pcap transformers
        ];
        description = "Convert a pcap into an enumerator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194815,8 +194815,8 @@ self: {
          genvalidity-property hspec hspec-core lens QuickCheck resourcet
          text unliftio-core validity
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194841,8 +194841,8 @@ self: {
          test-framework-hunit text vector
        ];
        description = "PCD file loader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194860,8 +194860,8 @@ self: {
          transformers void
        ];
        description = "A one file compiler for PCF";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194876,8 +194876,8 @@ self: {
          base binary bytestring containers vector zlib
        ];
        description = "PCF font parsing and rendering library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194893,8 +194893,8 @@ self: {
          base bytestring pcf-font template-haskell vector
        ];
        description = "Template Haskell for embedding text rendered using PCF fonts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194912,7 +194912,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Haskell bindings to the PCG random number generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcgen" = callPackage
@@ -194927,7 +194927,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck random ];
        benchmarkHaskellDepends = [ base criterion deepseq random ];
        description = "A fast, pseudorandom number generator";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pcre-heavy" = callPackage
@@ -194946,7 +194946,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A regexp (regex) library on top of pcre-light you can actually use";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "pcre-less" = callPackage
@@ -194957,7 +194957,7 @@ self: {
        sha256 = "1widnpz4r2az96lwxrq21vm21j9j7b4sn86kqn2iih3xs2dpwqf9";
        libraryHaskellDepends = [ array base regex-pcre ];
        description = "Nicer interface to regex-pcre";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcre-light" = callPackage
@@ -194970,7 +194970,7 @@ self: {
        librarySystemDepends = [ pcre ];
        testHaskellDepends = [ base bytestring containers HUnit mtl ];
        description = "Portable regex library for Perl 5 compatible regular expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) pcre;};
 
   "pcre-light-extra" = callPackage
@@ -194981,8 +194981,8 @@ self: {
        sha256 = "1kjh36gglszd16rsh0rm2q5fxjlfipzld4hw0l2r23y0flbqkbvx";
        libraryHaskellDepends = [ base bytestring pcre-light ];
        description = "pcre-light extra functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -194999,7 +194999,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ];
        description = "Perl-like substitute and split for PCRE regexps";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pcre2" = callPackage
@@ -195022,7 +195022,7 @@ self: {
          regex-pcre-builtin template-haskell text
        ];
        description = "Regular expressions via the PCRE2 C library (included)";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pdf-slave" = callPackage
@@ -195047,8 +195047,8 @@ self: {
          shelly system-filepath text transformers yaml
        ];
        description = "Tool to generate PDF from haskintex templates and YAML input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195082,8 +195082,8 @@ self: {
          base lens optparse-applicative text wai-extra warp
        ];
        description = "Web service for pdf-slave tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {pdf-slave-server-api = null;};
 
@@ -195099,8 +195099,8 @@ self: {
          aeson base base64-bytestring bytestring containers text
        ];
        description = "Template format definition for pdf-slave tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195117,8 +195117,8 @@ self: {
          pdf-toolbox-core text
        ];
        description = "A collection of tools for processing PDF files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195135,8 +195135,8 @@ self: {
          transformers zlib-bindings
        ];
        description = "A collection of tools for processing PDF files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195155,8 +195155,8 @@ self: {
          transformers
        ];
        description = "A collection of tools for processing PDF files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195177,8 +195177,8 @@ self: {
          transformers
        ];
        description = "Simple pdf viewer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195211,7 +195211,7 @@ self: {
          base mtl old-locale process-extras text time time-locale-compat
        ];
        description = "Wrapper around the pdfinfo command";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pdfname" = callPackage
@@ -195228,8 +195228,8 @@ self: {
          base directory filepath optparse-applicative pdfinfo text
        ];
        description = "Name a PDF file using information from the pdfinfo command";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195245,8 +195245,8 @@ self: {
          base directory pdfinfo process temporary
        ];
        description = "split two-column PDFs, so there is one column per page";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195268,8 +195268,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        testToolDepends = [ hspec-discover ];
        description = "Extracts text from PDF using poppler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {poppler-cpp = null;};
 
@@ -195286,8 +195286,8 @@ self: {
          base directory filepath ghc ghc-paths old-time process
        ];
        description = "pdynload is polymorphic dynamic linking library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195303,8 +195303,8 @@ self: {
          base derive GLUT List template-haskell time TypeCompose
        ];
        description = "Experiemental library for composable interactive programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195319,7 +195319,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Peano numbers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "peano-inf" = callPackage
@@ -195330,7 +195330,7 @@ self: {
        sha256 = "1w8rvlckqcy41ciq2csb2nf83l969nwvvrrlm0x1yzf5i6ibg33b";
        libraryHaskellDepends = [ base containers lazysmallcheck ];
        description = "Lazy Peano numbers including observable infinity value";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pec" = callPackage
@@ -195354,8 +195354,8 @@ self: {
          old-time process shake syb uniplate wl-pprint
        ];
        description = "pec embedded compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195368,8 +195368,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195390,8 +195390,8 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "An implementation of Pedersen commitment schemes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195405,8 +195405,8 @@ self: {
        editedCabalFile = "1434n6ncyyryjqzn3xcg73nwvcr6si7cnf2k8g2qrp0xmrq0nx8b";
        libraryHaskellDepends = [ array base binary containers ];
        description = "A pedestrian implementation of directed acyclic graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195424,8 +195424,8 @@ self: {
          base containers filepath haskeline logict mtl parsec
        ];
        description = "a lazy non-deterministic concatenative programming language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195444,8 +195444,8 @@ self: {
          template-haskell
        ];
        description = "The Parser Generator for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195463,8 +195463,8 @@ self: {
          QuickCheck
        ];
        description = "Package to solve the Generalized Pell Equation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195483,7 +195483,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Privacy Enhanced Mail (PEM) format reader and writer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pencil" = callPackage
@@ -195506,8 +195506,8 @@ self: {
          base doctest mtl text unordered-containers
        ];
        description = "Static site generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195519,7 +195519,7 @@ self: {
        sha256 = "12c5bzn3ac8783lny56n7rd8a1ik4ayfm1pr5v7gm7z53f7iz0qy";
        libraryHaskellDepends = [ base containers parsec ];
        description = "Tools for manipulating the Penn TreeBank";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "penntreebank-megaparsec" = callPackage
@@ -195539,8 +195539,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Parser combinators for trees in the Penn Treebank format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195569,8 +195569,8 @@ self: {
          tasty tasty-quickcheck text time transformers
        ];
        description = "Extensible double-entry accounting system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195589,8 +195589,8 @@ self: {
          pretty-show semigroups text transformers
        ];
        description = "Deprecated - use penny package instead";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195612,8 +195612,8 @@ self: {
          pretty-show rainbow semigroups split text time transformers
        ];
        description = "Deprecated - use penny package instead";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195649,8 +195649,8 @@ self: {
          tasty-hunit tasty-quickcheck tasty-smallcheck text uuid websockets
        ];
        description = "Create beautiful diagrams just by typing mathematical notation in plain text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195662,8 +195662,8 @@ self: {
        sha256 = "1qy8hghpvp9idiq4ksn55n1dpx7823s7mjfvqfgrmhj0xl1b1y54";
        libraryHaskellDepends = [ base binary bytestring haskell98 ];
        description = "A parser for PE object files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195683,8 +195683,8 @@ self: {
          base bytestring criterion network-uri
        ];
        description = "Percent encode/decode ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195697,7 +195697,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base leancheck ];
        description = "simple printf-style string formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "perceptron" = callPackage
@@ -195708,8 +195708,8 @@ self: {
        sha256 = "0w1vrsv43z92y6vsv9nzs2pjlqkhrxvzh53r2722530lzff34m78";
        libraryHaskellDepends = [ base ];
        description = "The perceptron learning algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195737,8 +195737,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq filepath ];
        benchmarkToolDepends = [ cpphs ];
        description = "Find duplicate images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195768,7 +195768,7 @@ self: {
        ];
        description = "Robust persistence for acyclic immutable data";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "peregrin" = callPackage
@@ -195785,8 +195785,8 @@ self: {
          transformers
        ];
        description = "Database migration support for use in other libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195803,8 +195803,8 @@ self: {
        ];
        testHaskellDepends = [ base deepseq doctest rdtsc ];
        description = "Low-level run time measurement";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195827,8 +195827,8 @@ self: {
          text vector
        ];
        description = "analysis example using perf";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195858,7 +195858,7 @@ self: {
          vector
        ];
        description = "Perfect minimal hashing implementation in native Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "perfect-vector-shuffle" = callPackage
@@ -195884,7 +195884,7 @@ self: {
          vector
        ];
        description = "Library for performing vector shuffles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "perfecthash" = callPackage
@@ -195907,8 +195907,8 @@ self: {
          unordered-containers
        ];
        description = "A perfect hashing library for mapping bytestrings to values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195926,8 +195926,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Perhaps, a monad";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195949,7 +195949,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit text time ];
        description = "Parse and format date periods, collapse and expand their text representations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "periodic" = callPackage
@@ -195964,8 +195964,8 @@ self: {
        executableHaskellDepends = [ base cereal hedis text time ];
        testHaskellDepends = [ base cereal hedis hspec text time ];
        description = "A reliable at-least-once periodic job scheduler backed by redis";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -195983,7 +195983,7 @@ self: {
          periodic-common resource-pool transformers unliftio
        ];
        description = "Periodic task system haskell client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "periodic-client-exe" = callPackage
@@ -196007,7 +196007,7 @@ self: {
          streaming-commons text unix-time unliftio warp websockets
        ];
        description = "Periodic task system haskell client executables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "periodic-common" = callPackage
@@ -196023,7 +196023,7 @@ self: {
          text unliftio vector
        ];
        description = "Periodic task system common";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "periodic-polynomials" = callPackage
@@ -196034,7 +196034,7 @@ self: {
        sha256 = "1y7hj8cjdy5zpp7sg7yfaafcid7ssf23g4az6fwk2hrcrk97sf2i";
        libraryHaskellDepends = [ base vector ];
        description = "A library for working with periodic polynomials (very basic functionality)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "periodic-server" = callPackage
@@ -196063,8 +196063,8 @@ self: {
          unliftio
        ];
        description = "Periodic task system haskell server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196081,8 +196081,8 @@ self: {
          base HUnit mtl test-framework test-framework-hunit
        ];
        description = "permutation Applicative and Monad with many mtl instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196097,8 +196097,8 @@ self: {
        setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        description = "A library for permutations and combinations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196122,8 +196122,8 @@ self: {
          tasty-smallcheck universe-base
        ];
        description = "Permutations of finite sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196135,8 +196135,8 @@ self: {
        sha256 = "03g1d9h26f1id0pnaigy9xy1cv5pvzqcjrwgzn75xnnbm5c3y9ch";
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196154,7 +196154,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Minimal serialization library with focus on performance";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persist-state" = callPackage
@@ -196173,7 +196173,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Serialization library with state and leb128 encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persist2er" = callPackage
@@ -196188,8 +196188,8 @@ self: {
          base optparse-applicative persistent text
        ];
        description = "Transforms persist's quasi-quoted syntax into ER format";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196210,7 +196210,7 @@ self: {
        ];
        testHaskellDepends = [ base quickcheck-simple ];
        description = "Binding between SQL database values and haskell records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistable-types-HDBC-pg" = callPackage
@@ -196230,7 +196230,7 @@ self: {
          base relational-query relational-query-HDBC text-postgresql
        ];
        description = "HDBC and Relational-Record instances of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent" = callPackage
@@ -196257,8 +196257,8 @@ self: {
          text time transformers unordered-containers vector
        ];
        description = "Type-safe, multi-backend data serialization";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-audit" = callPackage
@@ -196287,8 +196287,8 @@ self: {
          persistent-sqlite persistent-template text time transformers
        ];
        description = "Parses a Persist Model file and produces Audit Models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196300,8 +196300,8 @@ self: {
        sha256 = "09akf8vpkn2jskf1vf9mq96sakqzr7mfs8hhri8qlbkwx3i5nr6f";
        libraryHaskellDepends = [ base cereal persistent text ];
        description = "Helper functions for writing Persistent instances";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196321,8 +196321,8 @@ self: {
          base bytestring hspec persistent-postgresql text
        ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196343,7 +196343,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Documentation DSL for persistent entities";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "persistent-equivalence" = callPackage
@@ -196354,8 +196354,8 @@ self: {
        sha256 = "14nn01bbwskllbccgcnwnjwzyws6vppqv4l51n6pcvhwbphn18qz";
        libraryHaskellDepends = [ array base diffarray ];
        description = "Persistent equivalence relations (aka union-find)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196367,7 +196367,7 @@ self: {
        sha256 = "1a9h7dfj9v47di4pwg3fwzwa550fh8wj2ri1w2kd8xbw9xym5kqk";
        libraryHaskellDepends = [ base persistent text ];
        description = "Derive Persistent classes generically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-hssqlppp" = callPackage
@@ -196383,8 +196383,8 @@ self: {
          persistent-template template-haskell text th-lift
        ];
        description = "Declare Persistent entities using SQL SELECT query syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196396,7 +196396,7 @@ self: {
        sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn";
        libraryHaskellDepends = [ base bytestring iproute persistent ];
        description = "Persistent instances for types in iproute";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-iproute" = callPackage
@@ -196412,7 +196412,7 @@ self: {
          path-pieces persistent text
        ];
        description = "Persistent instances for types in iproute";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-map" = callPackage
@@ -196429,7 +196429,7 @@ self: {
        ];
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196454,8 +196454,8 @@ self: {
          temporary text time yaml
        ];
        description = "Manual migrations for the persistent library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196483,8 +196483,8 @@ self: {
          unliftio-core
        ];
        description = "Backend for the persistent library using mongoDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196510,7 +196510,7 @@ self: {
          unliftio
        ];
        description = "Monad transformer for the persistent API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -196536,7 +196536,7 @@ self: {
          unliftio-core
        ];
        description = "Backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
@@ -196568,8 +196568,8 @@ self: {
          unliftio-core
        ];
        description = "A pure haskell backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196590,8 +196590,8 @@ self: {
          transformers
        ];
        description = "Backend for the persistent library using ODBC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196613,7 +196613,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Efficient and correct pagination for persistent or esqueleto queries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-parser" = callPackage
@@ -196625,7 +196625,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec text ];
        description = "Parse persistent model files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-postgresql" = callPackage
@@ -196655,7 +196655,7 @@ self: {
          vector
        ];
        description = "Backend for the persistent library using postgresql";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "persistent-protobuf" = callPackage
@@ -196671,8 +196671,8 @@ self: {
          protocol-buffers-descriptor template-haskell text
        ];
        description = "Template-Haskell helpers for integrating protobufs with persistent";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196695,7 +196695,7 @@ self: {
          resourcet template-haskell text unliftio
        ];
        description = "Provides a quasi-quoter for raw SQL for persistent";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "persistent-ratelimit" = callPackage
@@ -196706,8 +196706,8 @@ self: {
        sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m";
        libraryHaskellDepends = [ base time yesod ];
        description = "A library for rate limiting activities with a persistent backend";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196731,7 +196731,7 @@ self: {
          time transformers utf8-string
        ];
        description = "Backend for persistent library using Redis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-refs" = callPackage
@@ -196744,7 +196744,7 @@ self: {
          base containers mtl ref-fd transformers
        ];
        description = "Haskell references backed by an IntMap for persistence and reversibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-relational-record" = callPackage
@@ -196767,8 +196767,8 @@ self: {
          test-framework test-framework-hunit test-framework-th text time
        ];
        description = "relational-record on persisten backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196789,7 +196789,7 @@ self: {
          aeson base hspec http-api-data persistent QuickCheck text
        ];
        description = "Database agnostic, spatially indexed type for geographic points";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "persistent-sqlite" = callPackage
@@ -196820,8 +196820,8 @@ self: {
          time transformers unliftio-core
        ];
        description = "Backend for the persistent library using sqlite3";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
   "persistent-template" = callPackage
@@ -196848,8 +196848,8 @@ self: {
          template-haskell text
        ];
        description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-template-classy" = callPackage
@@ -196869,8 +196869,8 @@ self: {
          template-haskell text
        ];
        description = "Generate classy lens field accessors for persistent models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196894,8 +196894,8 @@ self: {
          transformers-base unliftio unliftio-core unordered-containers
        ];
        description = "Tests for Persistent";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196920,7 +196920,7 @@ self: {
          resource-pool resourcet template-haskell text transformers
        ];
        description = "Type safe access to multiple database schemata";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "persistent-vector" = callPackage
@@ -196937,8 +196937,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "A persistent sequence based on array mapped tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196968,8 +196968,8 @@ self: {
          utf8-string
        ];
        description = "Backend for persistent library using Zookeeper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -196986,8 +196986,8 @@ self: {
          unordered-containers
        ];
        description = "Persona (BrowserID) library";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197009,8 +197009,8 @@ self: {
          pem persona scotty shakespeare text time transformers unix wai x509
        ];
        description = "Persona (BrowserID) Identity Provider";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197026,7 +197026,7 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197053,8 +197053,8 @@ self: {
          x509-store
        ];
        description = "Pretty Easy YOshikuni-made TLS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197072,8 +197072,8 @@ self: {
          crypto-pubkey-types monads-tf word24 x509 x509-store
        ];
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197090,8 +197090,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A Pretty Extraordinary Zipper library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197108,8 +197108,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit text ];
        description = "PostgreSQL database performance insights";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197129,8 +197129,8 @@ self: {
          async base ini postgresql-simple random scotty text transformers
        ];
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197142,7 +197142,7 @@ self: {
        sha256 = "06gqra5q20sc13slh5vz95bi1vq0ai43qfh7npcyv258zwv40qnh";
        libraryHaskellDepends = [ base bytestring HTTP ];
        description = "Client library for pg-harness-server";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "pg-harness-server" = callPackage
@@ -197161,8 +197161,8 @@ self: {
          warp
        ];
        description = "REST service for creating temporary PostgreSQL databases";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197188,8 +197188,8 @@ self: {
          resource-pool
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197213,8 +197213,8 @@ self: {
          test-framework test-framework-quickcheck2 text
        ];
        description = "Simple storage interface to PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197236,8 +197236,8 @@ self: {
          postgresql-libpq postgresql-simple tmp-postgres
        ];
        description = "A postgresql-simple transaction monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197263,8 +197263,8 @@ self: {
          tagsoup text time transformers unix vector vty
        ];
        description = "browse directory listing webpages and download files from them";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197277,8 +197277,8 @@ self: {
        libraryHaskellDepends = [ base containers pretty ];
        librarySystemDepends = [ gu pgf ];
        description = "Bindings to the C version of the PGF runtime";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gu = null; inherit (pkgs) pgf;};
 
@@ -197290,7 +197290,7 @@ self: {
        sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
        libraryHaskellDepends = [ array base bytestring parsec ];
        description = "Pure Haskell implementation of PGM image format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pgp-wordlist" = callPackage
@@ -197307,7 +197307,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "Translate between binary data and a human-readable collection of words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pgsql-simple" = callPackage
@@ -197326,8 +197326,8 @@ self: {
          network old-locale pcre-light text time utf8-string
        ];
        description = "A mid-level PostgreSQL client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197352,8 +197352,8 @@ self: {
          uuid vector
        ];
        description = "Streaming Postgres bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197366,7 +197366,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Phantom State Transformer. Like State Monad, but without values.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "phasechange" = callPackage
@@ -197380,8 +197380,8 @@ self: {
          array base ghc-prim monad-st primitive vector
        ];
        description = "Freezing, thawing, and copy elision";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197396,8 +197396,8 @@ self: {
          base bytestring containers QuickCheck text
        ];
        description = "Incremental multiple pass parser library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197416,7 +197416,7 @@ self: {
        ];
        testSystemDepends = [ pHash ];
        description = "Haskell bindings to pHash, the open source perceptual hash library";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {pHash = null;};
 
   "phizzle" = callPackage
@@ -197432,7 +197432,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Library for checking if a given link is in a phishtank json file";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "phoityne" = callPackage
@@ -197455,8 +197455,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197479,7 +197479,7 @@ self: {
          text transformers
        ];
        description = "Haskell Debug Adapter for Visual Studio Code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "phone-metadata" = callPackage
@@ -197493,7 +197493,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Phonenumber Metadata - NOTE: this is now deprecated!";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "phone-numbers" = callPackage
@@ -197507,8 +197507,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring ];
        description = "Haskell bindings to the libphonenumber library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {phonenumber = null; inherit (pkgs) protobuf;};
 
@@ -197526,8 +197526,8 @@ self: {
          HsOpenSSL http-conduit network time transformers
        ];
        description = "Push notifications for Android and iOS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197539,7 +197539,7 @@ self: {
        sha256 = "0pjvjqxp37n901s16ys5qq5rzblamz8izvsd1992w06bcyrs36cw";
        libraryHaskellDepends = [ array base containers regex-compat ];
        description = "Phonetic codes: Soundex and Phonix";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "phonetic-languages-common" = callPackage
@@ -197550,7 +197550,7 @@ self: {
        sha256 = "16m215rydybgn7wi5g3lh694z8zja2yr7b5p1rn33vgph2h5i8v7";
        libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "A generalization of the uniqueness-periods-vector-common package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-constaints" = callPackage
@@ -197561,7 +197561,7 @@ self: {
        sha256 = "17n4m9zbl1h6g76wxrqxc3wwcd0m5qjmbiakvmvbcdv7nffc8xyh";
        libraryHaskellDepends = [ base vector ];
        description = "Constraints to filter the needed permutations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-constraints" = callPackage
@@ -197572,7 +197572,7 @@ self: {
        sha256 = "11m389rpz7ddvmkf5wrasc41kmy67fki234fjcgi1djk8iawp5pw";
        libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "Constraints to filter the needed permutations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-constraints-array" = callPackage
@@ -197583,7 +197583,7 @@ self: {
        sha256 = "0mxn7xvggiii4cmpqmxx5mkk660z9q8s3n09kaqbmwszf5l86ynd";
        libraryHaskellDepends = [ base subG ];
        description = "Constraints to filter the needed permutations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-examples" = callPackage
@@ -197616,7 +197616,7 @@ self: {
          vector
        ];
        description = "A generalization of the uniqueness-periods-vector-examples functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-filters-array" = callPackage
@@ -197627,7 +197627,7 @@ self: {
        sha256 = "0gi2hbdzb62s0hvx9j8w936bwiypv6xvh5xndmx4w1kf8r2lkagy";
        libraryHaskellDepends = [ base filters-basic mmsyn2-array ];
        description = "Allows to change the structure of the function output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-general" = callPackage
@@ -197643,7 +197643,7 @@ self: {
          subG vector
        ];
        description = "A generalization of the uniqueness-periods-vector-general functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-permutations" = callPackage
@@ -197654,7 +197654,7 @@ self: {
        sha256 = "1y6izwnlphy528y6j4qg97pzi4nkw7j8vnlp63brnil9wd5765wa";
        libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "Commonly used versions of the phonetic-languages-common package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-permutations-array" = callPackage
@@ -197665,7 +197665,7 @@ self: {
        sha256 = "1r8fwdphn3h9zpbrdbbgmqjwv6gwcl205ahr3kqwz6sfg78bflj4";
        libraryHaskellDepends = [ base subG ];
        description = "Permutations and universal set related functions for the phonetic-languages series";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-plus" = callPackage
@@ -197684,7 +197684,7 @@ self: {
          uniqueness-periods-vector-stats
        ];
        description = "Some common shared between different packages functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-properties" = callPackage
@@ -197701,7 +197701,7 @@ self: {
          phonetic-languages-vector ukrainian-phonetics-basic vector
        ];
        description = "A generalization of the uniqueness-periods-vector-properties package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-rhythmicity" = callPackage
@@ -197712,7 +197712,7 @@ self: {
        sha256 = "1ljblyk0m1fs3n2gj72w6gs62dxjk5gsn8x6p7fwlwhvaa316wm3";
        libraryHaskellDepends = [ base ];
        description = "Allows to estimate the rhythmicity metrices for the text (usually, the Ukrainian poetic one)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-base" = callPackage
@@ -197726,7 +197726,7 @@ self: {
          base phonetic-languages-permutations-array subG
        ];
        description = "A simplified version of the phonetic-languages functionality common for some different realizations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-common" = callPackage
@@ -197741,7 +197741,7 @@ self: {
          base phonetic-languages-permutations subG subG-instances vector
        ];
        description = "A simplified version of the phonetic-languages-functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-examples-array" = callPackage
@@ -197785,7 +197785,7 @@ self: {
          ukrainian-phonetics-basic-array uniqueness-periods-vector-stats
        ];
        description = "Helps to create Ukrainian texts with the given phonetic properties";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-examples-common" = callPackage
@@ -197808,7 +197808,7 @@ self: {
          ukrainian-phonetics-basic-array
        ];
        description = "Some commonly used by phonetic-languages-simplified* series functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-lists-examples" = callPackage
@@ -197842,7 +197842,7 @@ self: {
          uniqueness-periods-vector-stats vector
        ];
        description = "Simplified and somewhat optimized version of the phonetic-languages-examples";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-properties-array" = callPackage
@@ -197859,7 +197859,7 @@ self: {
          phonetic-languages-simplified-base ukrainian-phonetics-basic-array
        ];
        description = "A generalization of the uniqueness-periods-vector-properties package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-properties-lists" = callPackage
@@ -197877,7 +197877,7 @@ self: {
          vector
        ];
        description = "A generalization of the uniqueness-periods-vector-properties package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-simplified-properties-lists-double" = callPackage
@@ -197895,7 +197895,7 @@ self: {
          vector
        ];
        description = "A generalization of the uniqueness-periods-vector-properties package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-ukrainian" = callPackage
@@ -197906,7 +197906,7 @@ self: {
        sha256 = "1z9frcwvy9njq1flk3hd2n4z8l4ad7f248w8h1pgjl1fbz6fv9dc";
        libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ];
        description = "Prepares Ukrainian text to be used as a phonetic language text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-ukrainian-array" = callPackage
@@ -197917,7 +197917,7 @@ self: {
        sha256 = "0h88qcdkckgn5cjyjiwvdxci8p04h12xr6jj5pjp4wzqyp6a5wcf";
        libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ];
        description = "Prepares Ukrainian text to be used as a phonetic language text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phonetic-languages-vector" = callPackage
@@ -197928,7 +197928,7 @@ self: {
        sha256 = "12mhmrfpdkxl00yfvy5jc74c7xnrj10pcydnn3xdhzj0fvp1zrll";
        libraryHaskellDepends = [ base vector ];
        description = "A generalization of the functionality of the uniqueness-periods-vector package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "phooey" = callPackage
@@ -197943,8 +197943,8 @@ self: {
          array base mtl reactive TypeCompose wx wxcore
        ];
        description = "Functional user interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197966,8 +197966,8 @@ self: {
          regex-posix time unix
        ];
        description = "Rename photo image files based on EXIF shoot date";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -197981,8 +197981,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl SDL transformers ];
        description = "A fractal viewer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198015,8 +198015,8 @@ self: {
          vector
        ];
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198028,7 +198028,7 @@ self: {
        sha256 = "07ysi2xq73g29pv4c3zvwq9zf1yjl2aszb1zkim49n00f5bxfnqc";
        libraryHaskellDepends = [ base ];
        description = "dimensions, quantities and constants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pi-calculus" = callPackage
@@ -198048,8 +198048,8 @@ self: {
          io-streams mtl network parsec RSA transformers
        ];
        description = "Applied pi-calculus interpreter";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198073,8 +198073,8 @@ self: {
          QuickCheck transformers unbound-generics
        ];
        description = "Demo implementation of typechecker for dependently-typed language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198100,8 +198100,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Lightweight access control solution for the pijul vcs";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198123,7 +198123,7 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "Control an Adafruit character LCD and keypad kit on a Raspberry Pi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pia-forward" = callPackage
@@ -198143,8 +198143,8 @@ self: {
          xdg-basedir
        ];
        description = "Set up port forwarding with the Private Internet Access VPN service";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198167,8 +198167,8 @@ self: {
          base containers errors filepath network streams text transformers
        ];
        description = "Remotely controlling Java Swing applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198183,8 +198183,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix JuicyPixels vector ];
        executableHaskellDepends = [ base cli hmatrix ];
        description = "simple image manipulation functions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198196,8 +198196,8 @@ self: {
        sha256 = "13c1n06v6mh9lyplfg0y1gdijk2mhxg4ln59v7i2z4j1y65y8cz9";
        libraryHaskellDepends = [ base containers network stm text ];
        description = "Instant StatsD in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198220,8 +198220,8 @@ self: {
          base containers mtl picosat pretty QuickCheck
        ];
        description = "Utilities for symbolic predicate logic expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198254,8 +198254,8 @@ self: {
          parsec scientific text unordered-containers vector
        ];
        description = "Fast combinator parsing for bytestrings and text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198268,7 +198268,7 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [ base containers random rdtsc transformers ];
        description = "Bindings to the PicoSAT solver";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pictikz" = callPackage
@@ -198281,8 +198281,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base matrix transformers xml ];
        description = "Converts a svg image to tikz code";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198299,7 +198299,7 @@ self: {
        libraryHaskellDepends = [ base directory process unix ];
        executableHaskellDepends = [ base ];
        description = "Do signal handling and orphan reaping for Unix PID1 init processes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pidfile" = callPackage
@@ -198310,7 +198310,7 @@ self: {
        sha256 = "0z0k923gb0b01r35x1qp4i1743mcn84cj3m12ss7jbxql768jigf";
        libraryHaskellDepends = [ base unix ];
        description = "Run an IO action protected by a pidfile";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pier" = callPackage
@@ -198330,8 +198330,8 @@ self: {
          transformers unordered-containers yaml
        ];
        description = "Yet another Haskell build system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198351,8 +198351,8 @@ self: {
          http-types process shake temporary text unix
        ];
        description = "A library for writing forwards-declared build systems in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198366,8 +198366,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198384,8 +198384,8 @@ self: {
          base containers random random-shuffle
        ];
        description = "dice game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198400,7 +198400,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl parsec text ];
        description = "Yet another text-to-html converter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pinboard" = callPackage
@@ -198424,8 +198424,8 @@ self: {
          text time transformers unliftio unliftio-core unordered-containers
        ];
        description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198446,8 +198446,8 @@ self: {
          transformers
        ];
        description = "Back up the notes you've saved to Pinboard";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198472,8 +198472,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "An alternative implementation of Thrift for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198493,8 +198493,8 @@ self: {
          optparse-applicative prettyprinter text unordered-containers
        ];
        description = "A code generator for the pinch Thrift library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198513,8 +198513,8 @@ self: {
          transformers
        ];
        description = "Write grammars, not parsers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198538,7 +198538,7 @@ self: {
          base containers linear mtl sdl2 sdl2-image stm text
        ];
        description = "Functional 2D Game Framework";
-       license = stdenv.lib.licenses.zlib;
+       license = lib.licenses.zlib;
      }) {};
 
   "ping" = callPackage
@@ -198556,8 +198556,8 @@ self: {
          stm transformers
        ];
        description = "icmp echo requests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198579,7 +198579,7 @@ self: {
          attoparsec base hspec iproute QuickCheck quickcheck-text
        ];
        description = "Attoparsec parsers of ping utility";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "ping-wrapper" = callPackage
@@ -198602,7 +198602,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Haskell Ping wrapper";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pinpon" = callPackage
@@ -198636,8 +198636,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest protolude ];
        description = "A gateway for various cloud notification services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198649,8 +198649,8 @@ self: {
        sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc";
        libraryHaskellDepends = [ base enumerator pipes transformers ];
        description = "A bidirectional bridge between pipes and iteratees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198667,7 +198667,7 @@ self: {
          base bytestring editor-open Hclip safe
        ];
        description = "Open your editor, pipe the output to the system clipboard";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "piped" = callPackage
@@ -198688,7 +198688,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Conduit with a smaller core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipeline" = callPackage
@@ -198699,7 +198699,7 @@ self: {
        sha256 = "1bz7pfyfgc1cps5pwy31m5z3r6kxi5c4661qa60q333y0rd2y2j1";
        libraryHaskellDepends = [ base transformers ];
        description = "Continuation patterns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes" = callPackage
@@ -198722,7 +198722,7 @@ self: {
          base criterion mtl optparse-applicative transformers
        ];
        description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -198738,7 +198738,7 @@ self: {
          pipes-bytestring pipes-parse transformers
        ];
        description = "Encode and decode JSON streams using Aeson and Pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-async" = callPackage
@@ -198758,8 +198758,8 @@ self: {
          stm transformers-base
        ];
        description = "A higher-level interface to using concurrency with pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198779,7 +198779,7 @@ self: {
          text transformers
        ];
        description = "Attoparsec and Pipes integration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-attoparsec-streaming" = callPackage
@@ -198799,8 +198799,8 @@ self: {
          attoparsec base bytestring pipes-core transformers
        ];
        description = "Streaming parsing in the pipes-core framework with Attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198816,8 +198816,8 @@ self: {
          base bytestring mtl parallel pipes streaming-commons
        ];
        description = "Blocked GZip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198839,7 +198839,7 @@ self: {
          smallcheck tasty tasty-hunit tasty-smallcheck transformers
        ];
        description = "Encode and decode binary streams using the pipes and binary libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-break" = callPackage
@@ -198855,7 +198855,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring mtl pipes QuickCheck ];
        description = "Pipes to group by any delimiter (such as lines with carriage returns)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-brotli" = callPackage
@@ -198871,8 +198871,8 @@ self: {
          base bytestring pipes pipes-bytestring QuickCheck
        ];
        description = "Brotli (RFC7932) compressors and decompressors for the Pipes package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198889,7 +198889,7 @@ self: {
          transformers
        ];
        description = "ByteString support for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-bzip" = callPackage
@@ -198912,7 +198912,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base ];
        description = "Streaming compression/decompression via pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
@@ -198928,8 +198928,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cacophony pipes ];
        testHaskellDepends = [ base hlint ];
        description = "Pipes for Noise-secured network connections";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -198944,7 +198944,7 @@ self: {
        libraryHaskellDepends = [ base lens mtl pipes pipes-extras ];
        testHaskellDepends = [ base hspec pipes transformers ];
        description = "Allows instances for Category, Arrow and ArrowChoice for Pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-cborg" = callPackage
@@ -198965,7 +198965,7 @@ self: {
          tasty tasty-quickcheck transformers
        ];
        description = "Encode and decode cborg streams using the pipes and cborg libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-cellular" = callPackage
@@ -198976,7 +198976,7 @@ self: {
        sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc";
        libraryHaskellDepends = [ base bytestring data-cell pipes ];
        description = "Pipes-based combinators for cellular data processing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-cellular-csv" = callPackage
@@ -198990,7 +198990,7 @@ self: {
          base bytestring data-cell pipes pipes-cellular
        ];
        description = "Efficient pipes-based cellular CSV codec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-cereal" = callPackage
@@ -199005,8 +199005,8 @@ self: {
          base bytestring cereal mtl pipes pipes-bytestring pipes-parse
        ];
        description = "Encode and decode binary streams using the pipes and cereal libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199022,8 +199022,8 @@ self: {
          base bytestring cereal-plus errors mtl pipes pipes-bytestring text
        ];
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199041,7 +199041,7 @@ self: {
          async base bytestring pipes pipes-safe process stm unix
        ];
        description = "Streaming to and from subprocesses using Pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-concurrency" = callPackage
@@ -199059,7 +199059,7 @@ self: {
        ];
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-conduit" = callPackage
@@ -199070,8 +199070,8 @@ self: {
        sha256 = "1nzylhmi3f2m0xnqgx0m9g0p5pwl6xnidsz8ykzmv8wafrh60dh8";
        libraryHaskellDepends = [ base conduit mtl pipes-core ];
        description = "Conduit adapters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199087,8 +199087,8 @@ self: {
          base categories lifted-base monad-control transformers void
        ];
        description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199100,8 +199100,8 @@ self: {
        sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf";
        libraryHaskellDepends = [ base courier pipes ];
        description = "Pipes utilities for interfacing with the courier message-passing framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199123,7 +199123,7 @@ self: {
          test-framework test-framework-hunit vector
        ];
        description = "Fast, streaming csv parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pipes-errors" = callPackage
@@ -199134,8 +199134,8 @@ self: {
        sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76";
        libraryHaskellDepends = [ base errors pipes ];
        description = "Integration between pipes and errors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199163,8 +199163,8 @@ self: {
          transformers zlib zlib-conduit zlib-enum
        ];
        description = "Various basic utilities for Pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199183,7 +199183,7 @@ self: {
          base HUnit pipes test-framework test-framework-hunit transformers
        ];
        description = "Extra utilities for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-fastx" = callPackage
@@ -199198,7 +199198,7 @@ self: {
          attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring
        ];
        description = "Streaming parsers for Fasta and Fastq";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-files" = callPackage
@@ -199225,8 +199225,8 @@ self: {
          text transformers unix
        ];
        description = "Fast traversal of directory trees using pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199249,7 +199249,7 @@ self: {
          mtl pipes pipes-concurrency pipes-misc stm transformers
        ];
        description = "Reactively combines Producers so that a value is yielded as soon as possible";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-group" = callPackage
@@ -199267,7 +199267,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-http" = callPackage
@@ -199284,7 +199284,7 @@ self: {
          base bytestring http-client http-client-tls pipes
        ];
        description = "HTTP client with pipes interface";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-illumina" = callPackage
@@ -199299,8 +199299,8 @@ self: {
          base bytestring directory filepath pipes pipes-bgzf
        ];
        description = "Illumina NGS data processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199314,7 +199314,7 @@ self: {
        editedCabalFile = "06vg9vlczmmlpvqnnwn12kyb9c741y50hl8ky0vvdlkwlb90zncq";
        libraryHaskellDepends = [ base containers heaps pipes ];
        description = "Interleave and merge streams of elements";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-io" = callPackage
@@ -199328,8 +199328,8 @@ self: {
        libraryHaskellDepends = [ base pipes pipes-parse ];
        testHaskellDepends = [ base hspec pipes ];
        description = "Stateful IO streams based on pipes";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199347,7 +199347,7 @@ self: {
          pipes-safe text transformers transformers-base
        ];
        description = "Kafka in the Pipes ecosystem";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pipes-key-value-csv" = callPackage
@@ -199370,8 +199370,8 @@ self: {
          QuickCheck reflection text transformers vinyl vinyl-utils
        ];
        description = "Streaming processing of CSV files preceded by key-value pairs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199388,7 +199388,7 @@ self: {
          base bytestring lens mtl pipes pipes-group QuickCheck
        ];
        description = "Pipes for grouping by lines with carriage returns";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-lzma" = callPackage
@@ -199407,7 +199407,7 @@ self: {
          base bytestring pipes pipes-bytestring QuickCheck
        ];
        description = "LZMA compressors and decompressors for the Pipes package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-misc" = callPackage
@@ -199427,7 +199427,7 @@ self: {
          base hspec lens mmorph pipes pipes-concurrency stm transformers
        ];
        description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-mongodb" = callPackage
@@ -199439,8 +199439,8 @@ self: {
        libraryHaskellDepends = [ base monad-control mongoDB pipes ];
        testHaskellDepends = [ base monad-control mongoDB pipes text ];
        description = "Stream results from MongoDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199457,7 +199457,7 @@ self: {
          transformers
        ];
        description = "Use network sockets together with the pipes library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-network-tls" = callPackage
@@ -199474,7 +199474,7 @@ self: {
          pipes-network pipes-safe tls transformers
        ];
        description = "TLS-secured network connections support for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-network-ws" = callPackage
@@ -199487,7 +199487,7 @@ self: {
          base bytestring network-simple-ws pipes
        ];
        description = "WebSockets support for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-ordered-zip" = callPackage
@@ -199499,7 +199499,7 @@ self: {
        libraryHaskellDepends = [ base pipes pipes-safe ];
        testHaskellDepends = [ base foldl hspec pipes pipes-safe ];
        description = "merge two ordered Producers into a new Producer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-p2p" = callPackage
@@ -199516,8 +199516,8 @@ self: {
          network-simple-sockaddr pipes pipes-concurrency pipes-network
        ];
        description = "P2P network nodes with pipes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199536,8 +199536,8 @@ self: {
          network-simple-sockaddr pipes pipes-network pipes-p2p
        ];
        description = "Examples using pipes-p2p";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199549,7 +199549,7 @@ self: {
        sha256 = "1a87q6l610rhxr23qfzzzif3zpfjhw3mg5gfcyjwqac25hdq73yj";
        libraryHaskellDepends = [ base pipes transformers ];
        description = "Parsing infrastructure for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-postgresql-simple" = callPackage
@@ -199566,7 +199566,7 @@ self: {
          pipes-safe postgresql-simple stm text transformers
        ];
        description = "Convert various postgresql-simple calls to work with pipes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pipes-protolude" = callPackage
@@ -199588,8 +199588,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Alternate Prelude for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199601,7 +199601,7 @@ self: {
        sha256 = "1xsb0cxksrrkv81yk9qb7b3g7niz3sc7sz0960hxn16hwjymkv5k";
        libraryHaskellDepends = [ base mwc-random pipes vector ];
        description = "Producers for handling randomness";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-rt" = callPackage
@@ -199615,8 +199615,8 @@ self: {
        libraryHaskellDepends = [ base mwc-random pipes time ];
        executableHaskellDepends = [ base pipes time ];
        description = "A few pipes to control the timing of yields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199639,8 +199639,8 @@ self: {
          QuickCheck tasty tasty-quickcheck text
        ];
        description = "A simple interface for streaming data to and from Amazon S3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199657,7 +199657,7 @@ self: {
          transformers transformers-base
        ];
        description = "Safety for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-shell" = callPackage
@@ -199677,8 +199677,8 @@ self: {
          pipes-safe process stm stm-chans text
        ];
        description = "Create proper Pipes from System.Process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199692,8 +199692,8 @@ self: {
          base pipes pipes-safe sqlite-simple text
        ];
        description = "Functions that smash Pipes and sqlite-simple together";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199711,7 +199711,7 @@ self: {
          pipes-safe streaming-commons text transformers
        ];
        description = "properly streaming text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -199734,8 +199734,8 @@ self: {
          base doctest foldl free pipes tasty tasty-hunit text
        ];
        description = "Interfacing pipes with foldl folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199751,8 +199751,8 @@ self: {
          base monad-primitive pipes primitive transformers vector
        ];
        description = "Various proxies for streaming data into vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199768,7 +199768,7 @@ self: {
          base blaze-builder bytestring http-types pipes transformers wai
        ];
        description = "A port of wai-conduit for the pipes ecosystem";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pipes-websockets" = callPackage
@@ -199786,7 +199786,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "WebSockets in the Pipes framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pipes-zeromq4" = callPackage
@@ -199803,8 +199803,8 @@ self: {
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
        description = "Pipes integration for ZeroMQ messaging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199825,7 +199825,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Zlib and GZip compression and decompression for Pipes streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pisigma" = callPackage
@@ -199844,8 +199844,8 @@ self: {
          mtl parsec text utf8-string
        ];
        description = "A dependently typed core language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199868,8 +199868,8 @@ self: {
          base bytestring optparse-applicative text unordered-containers yaml
        ];
        description = "Account management tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199890,8 +199890,8 @@ self: {
          transformers
        ];
        description = "Pitch tracking library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199915,8 +199915,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "A library and a CLI tool for accessing Pivotal Tracker API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199940,7 +199940,7 @@ self: {
          uri-encode vector
        ];
        description = "Pixela client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pixelated-avatar-generator" = callPackage
@@ -199961,8 +199961,8 @@ self: {
          base bytestring hspec JuicyPixels QuickCheck
        ];
        description = "A library and application for generating pixelated avatars";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -199987,7 +199987,7 @@ self: {
          base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text
        ];
        description = "Haskell game engine like fantasy console";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pkcs1" = callPackage
@@ -200019,8 +200019,8 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509
        ];
        description = "PKCS#10 library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200033,8 +200033,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ];
        description = "PKCS #7 padding in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200048,8 +200048,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200069,8 +200069,8 @@ self: {
          http-directory simple-cmd simple-cmd-args text
        ];
        description = "Package tree diff tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200083,7 +200083,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Implementation of the PKTree spatial index data structure";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "placeholders" = callPackage
@@ -200094,7 +200094,7 @@ self: {
        sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Placeholders for use while developing Haskell code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plaid" = callPackage
@@ -200125,7 +200125,7 @@ self: {
          microlens microlens-th pretty-simple QuickCheck text time wai
        ];
        description = "Plaid.com api integration library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plailude" = callPackage
@@ -200136,8 +200136,8 @@ self: {
        sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i";
        libraryHaskellDepends = [ base bytestring mtl time unix ];
        description = "plaimi's prelude";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200158,8 +200158,8 @@ self: {
          tasty tasty-hunit transformers
        ];
        description = "Applicative/Arrow for resource estimation and progress tracking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200178,8 +200178,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec path path-io ];
        description = "Failure-tolerant file and directory editing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200196,8 +200196,8 @@ self: {
          deepseq
        ];
        description = "A representation of planar graphs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200221,8 +200221,8 @@ self: {
          unliftio-core
        ];
        description = "Token Introspection for PlanB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200277,8 +200277,8 @@ self: {
          uuid-types vault vector vector-builder writer-cps-mtl
        ];
        description = "Planet Mitchell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200295,8 +200295,8 @@ self: {
          tasty-rerun weigh
        ];
        description = "Planet Mitchell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200308,8 +200308,8 @@ self: {
        sha256 = "049dqzxygj81kzb5zqpw8cc3ql1hakwl3j84dzqhrc6vk6r9a50q";
        libraryHaskellDepends = [ adjunctions base protolude ];
        description = "The core of a numeric prelude, taken from numhask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200323,8 +200323,8 @@ self: {
          base bytestring containers mtl utf8-string
        ];
        description = "Simple templating library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200348,8 +200348,8 @@ self: {
        ];
        testHaskellDepends = [ base containers fgl hspec vector ];
        description = "General Framework for compiler development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200373,7 +200373,7 @@ self: {
          attoparsec base bytestring filepath hspec text word8
        ];
        description = "Library and executable for working with playlist files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "playlists-http" = callPackage
@@ -200391,7 +200391,7 @@ self: {
          text transformers
        ];
        description = "Library to glue together playlists and http-client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plex" = callPackage
@@ -200409,7 +200409,7 @@ self: {
          async base bytestring deepseq hspec QuickCheck unix
        ];
        description = "run a subprocess, combining stdout and stderr";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "plist" = callPackage
@@ -200421,8 +200421,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200446,8 +200446,8 @@ self: {
          text time
        ];
        description = "Remote monad for editing plists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200468,7 +200468,7 @@ self: {
        ];
        description = "Plivo API wrapper for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "plocketed" = callPackage
@@ -200481,8 +200481,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative socketed ];
        description = "plot data from stdin through socketed";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200498,7 +200498,7 @@ self: {
          array base cairo colour hmatrix mtl pango transformers
        ];
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plot-gtk" = callPackage
@@ -200509,8 +200509,8 @@ self: {
        sha256 = "1fq75kg8f1sm9bmn89w5c54arr2y1xv0lswbvnxc4rmfc98l82lw";
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        description = "GTK plots and interaction with GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200527,8 +200527,8 @@ self: {
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
        description = "A quick way to use Mathematica like Manipulation abilities";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200542,8 +200542,8 @@ self: {
          base glib gtk3 hmatrix mtl plot process
        ];
        description = "GTK3 plots and interaction with GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200560,8 +200560,8 @@ self: {
          base colour gtk hmatrix plot text vector
        ];
        description = "A plotting tool with Mathematica like Manipulation abilities";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200580,7 +200580,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A lightweight plotting library, exporting to SVG";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plot-light-examples" = callPackage
@@ -200600,7 +200600,7 @@ self: {
          scientific text time
        ];
        description = "Example binaries for plot-light";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plotfont" = callPackage
@@ -200628,7 +200628,7 @@ self: {
          microlens-th text time
        ];
        description = "Haskell bindings to Plotly.js";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ploton" = callPackage
@@ -200647,7 +200647,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A useful cli tool to draw figures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plots" = callPackage
@@ -200672,8 +200672,8 @@ self: {
          semigroups split statistics time transformers vector
        ];
        description = "Diagrams based plotting library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200685,7 +200685,7 @@ self: {
        sha256 = "17vr3c9dnd1jabx66qih7z19mk0irrxzab51gl5gifcgdxlf4s3x";
        libraryHaskellDepends = [ base curl split ];
        description = "Plotserver API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "plucky" = callPackage
@@ -200697,7 +200697,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base mtl ];
        description = "A library and technique for handling errors via plucking constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plugins" = callPackage
@@ -200714,8 +200714,8 @@ self: {
          ghc-prim haskell-src process random split
        ];
        description = "Dynamic linking for Haskell and C objects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200732,8 +200732,8 @@ self: {
        ];
        testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200752,8 +200752,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th template-haskell
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200765,8 +200765,8 @@ self: {
        sha256 = "1lih19zjz5yrrjvrgk8zv5xrvld57ykdxxhdrvhwh6bqyzzarqjj";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200779,8 +200779,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "Plurality monad: Zero, one, or at least two";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200793,8 +200793,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        testHaskellDepends = [ base hspec ];
        description = "Pluralize";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200814,7 +200814,7 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring linear vector ];
        description = "PLY file loader";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "plzwrk" = callPackage
@@ -200833,8 +200833,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl text unordered-containers ];
        description = "A front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200850,8 +200850,8 @@ self: {
          array base binary-file bytestring monads-tf template-haskell zlib
        ];
        description = "read/write png file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200868,8 +200868,8 @@ self: {
          array base bytestring haskell98 mtl parsec zlib
        ];
        description = "Pure Haskell loader for PNG images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200882,8 +200882,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200895,7 +200895,7 @@ self: {
        sha256 = "0h6wsqv6c36cmk30gs3rjdjbxxq9zih49pmzhj2dh9nyxsqbj2yw";
        libraryHaskellDepends = [ base bytestring ];
        description = "PNM image format header parsing and pretty printing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pocket" = callPackage
@@ -200910,8 +200910,8 @@ self: {
          aeson base bytestring exceptions http-conduit http-types text
        ];
        description = "Bindings for the Pocket API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200946,8 +200946,8 @@ self: {
          hspec-test-sandbox shakespeare test-sandbox text transformers
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200966,8 +200966,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Point octree, with bounding boxes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -200986,7 +200986,7 @@ self: {
          transformers-compat unordered-containers
        ];
        description = "Pointed and copointed data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pointedalternative" = callPackage
@@ -200997,8 +200997,8 @@ self: {
        sha256 = "12l380hgl17l0jxdx38kipvnip6gz4p9n27n03h9q37k5qhzjfha";
        libraryHaskellDepends = [ base mtl semigroups transformers ];
        description = "Alternative done right";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201010,7 +201010,7 @@ self: {
        sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l";
        libraryHaskellDepends = [ base binary ];
        description = "A zipper-like comonad which works as a list, tracking a position";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pointfree" = callPackage
@@ -201035,7 +201035,7 @@ self: {
        ];
        description = "Tool for refactoring expressions into pointfree form";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pointfree-fancy" = callPackage
@@ -201057,8 +201057,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck ];
        doHaddock = false;
        description = "Tool for refactoring expressions into pointfree form";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201077,8 +201077,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Pointful refactoring tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201090,7 +201090,7 @@ self: {
        sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h";
        libraryHaskellDepends = [ base ];
        description = "Some common point-free combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pointless-haskell" = callPackage
@@ -201101,8 +201101,8 @@ self: {
        sha256 = "0f0bnd6dyi1ancdxd2hkszshws9d8jz8iamz5pir0i4nsj69mqyx";
        libraryHaskellDepends = [ base GHood process syb ];
        description = "Pointless Haskell library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201118,8 +201118,8 @@ self: {
          base containers derive pointless-haskell process QuickCheck
        ];
        description = "Pointless Lenses library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201135,8 +201135,8 @@ self: {
          base containers mtl pointless-haskell pointless-lenses process
        ];
        description = "Pointless Rewrite library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201168,8 +201168,8 @@ self: {
          unboxing-vector unordered-containers vector
        ];
        description = "Discord verification bot";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201186,8 +201186,8 @@ self: {
          proto-lens text
        ];
        description = "Haskell types for the Pokemon Go protobuf protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201200,8 +201200,8 @@ self: {
        libraryHaskellDepends = [ array base mtl random vector ];
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {poker-eval = null;};
 
@@ -201219,8 +201219,8 @@ self: {
          HTTP http-client http-conduit http-types strict text time
        ];
        description = "PokitDok Platform API Client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201232,7 +201232,7 @@ self: {
        sha256 = "1f0anpxc57vxa5z0x4wrfay0g1sw2qwnz5nkz74y9vmh8vd99kkh";
        libraryHaskellDepends = [ base ];
        description = "Complex numbers in polar form";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polar-configfile" = callPackage
@@ -201244,8 +201244,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        testHaskellDepends = [ base containers HUnit MissingH mtl parsec ];
        description = "Fork of ConfigFile for Polar Game Engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201258,8 +201258,8 @@ self: {
        libraryHaskellDepends = [ base containers lens mtl ];
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201278,8 +201278,8 @@ self: {
          text-binary transformers
        ];
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201305,7 +201305,7 @@ self: {
          base Cabal directory filepath hedgehog hspec relude text
        ];
        description = "Haskell PVP version adviser";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "polimorf" = callPackage
@@ -201316,7 +201316,7 @@ self: {
        sha256 = "0pdz9fwqdwhqm1l81jnji3nm8y51dmfg5i84ggp8gmqfsiczvbj3";
        libraryHaskellDepends = [ base binary containers text ];
        description = "Handling the PoliMorf dictionary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "poll" = callPackage
@@ -201327,7 +201327,7 @@ self: {
        sha256 = "0agdl2bxw7ca05kqyc8dix4kvjdh67i91hn1scmcngjd3gz8gzmr";
        libraryHaskellDepends = [ base enumset utility-ht ];
        description = "Bindings to poll.h";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "poly" = callPackage
@@ -201351,7 +201351,7 @@ self: {
          base deepseq gauge mod semirings vector
        ];
        description = "Polynomials";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "poly-arity" = callPackage
@@ -201362,7 +201362,7 @@ self: {
        sha256 = "0afxrwq5is4l954kmlqm76g0zpy4jw6vvx2275q8xph4zr2ac46b";
        libraryHaskellDepends = [ base constraints ];
        description = "Tools for working with functions of undetermined arity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "poly-cont" = callPackage
@@ -201373,8 +201373,8 @@ self: {
        sha256 = "05pkz6v2xyva73ibb5v97c7fh5zjpvkhahfgnnxycrlnsag5ckgy";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Poly-kinded continuations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201386,8 +201386,8 @@ self: {
        sha256 = "044xsfpxwp3h7vsx86y2d099qmgiiknslmh3jjfnbr2qy9aj73r6";
        libraryHaskellDepends = [ base lens ];
        description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201399,7 +201399,7 @@ self: {
        sha256 = "1csi81i0j3hk2gsc3c0rx939i67b0mj2pi064giw20yspqqjrp27";
        libraryHaskellDepends = [ base requirements ];
        description = "Polykinded extensible records";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "polyToMonoid" = callPackage
@@ -201410,7 +201410,7 @@ self: {
        sha256 = "068acarrpd66682yjscm6l5k9kj9p8zxbf3hi76kz7gvkhkbsjj8";
        libraryHaskellDepends = [ base ];
        description = "Polyvariadic functions mapping to a given monoid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polydata" = callPackage
@@ -201428,8 +201428,8 @@ self: {
          base constraint-manip hspec indextype polydata-core
        ];
        description = "Wrap together data and it's constraints";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201441,8 +201441,8 @@ self: {
        sha256 = "1wdi8a1s235knb98bmhfqvy7qbqvj804dx6rn846x8aj50drjjqv";
        libraryHaskellDepends = [ base ];
        description = "Core data definitions for the \"polydata\" package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201455,7 +201455,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Polygonal maps";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "polynom" = callPackage
@@ -201478,7 +201478,7 @@ self: {
        ];
        description = "Polynomial types and operations";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "polynomial" = callPackage
@@ -201500,8 +201500,8 @@ self: {
          test-framework-quickcheck2 vector vector-space
        ];
        description = "Polynomials";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201559,7 +201559,7 @@ self: {
          transformers type-errors type-errors-pretty unagi-chan
        ];
        description = "Higher-order, low-boilerplate free monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polysemy-RandomFu" = callPackage
@@ -201580,8 +201580,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Experimental, RandomFu effect and interpreters for polysemy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201604,7 +201604,7 @@ self: {
        ];
        description = "Polysemy effect for chronos";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201620,7 +201620,7 @@ self: {
          base containers exceptions extra polysemy polysemy-zoo
        ];
        description = "Extra Input and Output functions for polysemy..";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-fs" = callPackage
@@ -201635,7 +201635,7 @@ self: {
          base bytestring path polysemy rio temporary text unliftio-path
        ];
        description = "Low level filesystem operations for polysemy";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polysemy-fskvstore" = callPackage
@@ -201650,7 +201650,7 @@ self: {
          base bytestring path polysemy polysemy-zoo rio unliftio-path
        ];
        description = "Run a KVStore as a filesystem in polysemy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-http" = callPackage
@@ -201683,7 +201683,7 @@ self: {
        ];
        description = "Polysemy effect for http-client";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201700,7 +201700,7 @@ self: {
          unliftio-path
        ];
        description = "Run a KVStore as a single json file in polysemy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-methodology" = callPackage
@@ -201715,8 +201715,8 @@ self: {
          base co-log-polysemy polysemy polysemy-plugin polysemy-zoo
        ];
        description = "Domain modelling algebra for polysemy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201733,8 +201733,8 @@ self: {
          polysemy-vinyl vinyl
        ];
        description = "Functions for using polysemy-methodology with composite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201746,8 +201746,8 @@ self: {
        sha256 = "1ym2da08wy5pbdijrvn769w644dyma8hc010f8phqjnpkhq4j0z5";
        libraryHaskellDepends = [ base optics polysemy polysemy-zoo ];
        description = "Optics for Polysemy";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201763,8 +201763,8 @@ self: {
          base path polysemy polysemy-extra polysemy-plugin
        ];
        description = "Polysemy versions of Path functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201788,7 +201788,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Disambiguate obvious uses of effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polysemy-resume" = callPackage
@@ -201808,7 +201808,7 @@ self: {
        ];
        description = "Polysemy error tracking";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201833,7 +201833,7 @@ self: {
        ];
        description = "Polysemy effects for testing";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201858,7 +201858,7 @@ self: {
        ];
        description = "Polysemy effect for time";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201873,7 +201873,7 @@ self: {
        libraryHaskellDepends = [
          base formatting path path-utils polysemy text turtle
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-vinyl" = callPackage
@@ -201884,7 +201884,7 @@ self: {
        sha256 = "1545a125bfgi5314dxhak5dnx9h5kwanzgbp1f88f96hlxik1rjh";
        libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ];
        description = "Functions for mapping vinyl records in polysemy";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "polysemy-webserver" = callPackage
@@ -201905,7 +201905,7 @@ self: {
          polysemy-plugin text wai wai-websockets warp websockets
        ];
        description = "Start web servers from within a Polysemy effect stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polysemy-zoo" = callPackage
@@ -201929,7 +201929,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Experimental, user-contributed effects and interpreters for polysemy";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polyseq" = callPackage
@@ -201949,8 +201949,8 @@ self: {
        ];
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201964,7 +201964,7 @@ self: {
          base containers deepseq polyparse tagsoup
        ];
        description = "Online XML parsing with polyparse and tagsoup";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "polytypeable" = callPackage
@@ -201975,8 +201975,8 @@ self: {
        sha256 = "0vb2adm97ypi553lsjz7333q3dg9fmi0incrxlikqixk0f3ajaq8";
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -201988,8 +201988,8 @@ self: {
        sha256 = "1hbpamgqsmsjkzjjva15f566yra77hwasp88b6y68nx9qa36a821";
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202004,7 +202004,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Creation and application of polyvariadic functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pomaps" = callPackage
@@ -202029,8 +202029,8 @@ self: {
          base criterion deepseq lattices random vector
        ];
        description = "Maps and sets of partial orders";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202049,8 +202049,8 @@ self: {
          process time unix wx wxcore
        ];
        description = "pomodoro timer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202074,8 +202074,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec protolude ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202087,8 +202087,8 @@ self: {
        sha256 = "1nq4z063g429hxwf4vbyyr2b2s7sn325m0h6ggf793inlj48ci0h";
        libraryHaskellDepends = [ base mtl ];
        description = "PEG parser combinator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202106,8 +202106,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec network QuickCheck ];
        description = "A simple embedded pingable server that runs in the background";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202127,7 +202127,7 @@ self: {
        ];
        description = "Extended Personal Media Network (XPMN) media server";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pontarius-xmpp" = callPackage
@@ -202165,8 +202165,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "An XMPP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202183,7 +202183,7 @@ self: {
        ];
        description = "XEPs implementation on top of pontarius-xmpp";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pontarius-xpmn" = callPackage
@@ -202199,7 +202199,7 @@ self: {
        ];
        description = "Extended Personal Media Network (XPMN) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pony" = callPackage
@@ -202212,7 +202212,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Can I have a pony?";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pool" = callPackage
@@ -202225,8 +202225,8 @@ self: {
        editedCabalFile = "0lf9m19hl5asyb85xc8h34kh0iqpfdpwzil4lm5lskvn4fbi77n7";
        libraryHaskellDepends = [ base monad-control transformers ];
        description = "Thread-safe resource pools. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202244,8 +202244,8 @@ self: {
          base monad-control resource-pool resourcet transformers
        ];
        description = "Resource pool allocations via ResourceT. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202264,7 +202264,7 @@ self: {
          utility-ht
        ];
        description = "Run jobs on a limited number of threads and support data dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pop3-client" = callPackage
@@ -202276,8 +202276,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl network ];
        description = "POP3 Client Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202291,7 +202291,7 @@ self: {
        libraryHaskellDepends = [ base directory haskell98 unix ];
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202313,8 +202313,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck store ];
        testToolDepends = [ hspec-discover ];
        description = "Static key-value storage backed by poppy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202335,8 +202335,8 @@ self: {
        libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler_gi ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler_gi;};
@@ -202349,7 +202349,7 @@ self: {
        sha256 = "06z723fgqwvcxgxy63pqwmjb6xkcl69xmdry117f0i5rhy0aix3y";
        libraryHaskellDepends = [ base ];
        description = "Empty Cabal package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "porcupine-core" = callPackage
@@ -202391,8 +202391,8 @@ self: {
          unliftio-core unordered-containers url vector vinyl yaml zlib
        ];
        description = "Express portable, composable and reusable data tasks and pipelines";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202421,8 +202421,8 @@ self: {
          text transformers unordered-containers
        ];
        description = "A location accessor for porcupine to connect to HTTP sources/sinks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202453,8 +202453,8 @@ self: {
          unordered-containers
        ];
        description = "A location accessor for porcupine to connect to AWS S3 sources/sinks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202473,7 +202473,7 @@ self: {
        ];
        executableHaskellDepends = [ base warp ];
        description = "A minimalist HTTP server framework written on top of wai";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "port-utils" = callPackage
@@ -202485,7 +202485,7 @@ self: {
        libraryHaskellDepends = [ base network ];
        testHaskellDepends = [ async base hspec network stm transformers ];
        description = "Utilities for creating and waiting on ports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "portable-lines" = callPackage
@@ -202496,7 +202496,7 @@ self: {
        sha256 = "1l94p3s56a3kfqc8fzqc52z12rhg3c8xsmgcw1i20dnl8aygalsh";
        libraryHaskellDepends = [ base bytestring ];
        description = "Alternative 'lines' implementation that understands CR-LF and CR";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "portable-template-haskell-lens" = callPackage
@@ -202507,7 +202507,7 @@ self: {
        sha256 = "14xg0zdyml5jx8jbgrk7b3697qs2schxjrb9iviqi1hnkcaqq75q";
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Lenses for the AST of Template Haskell 2.11 and Template Haskell < 2.11";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "portager" = callPackage
@@ -202526,8 +202526,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec mtl QuickCheck text ];
        description = "DSL for configuring Gentoo portage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202541,7 +202541,7 @@ self: {
        librarySystemDepends = [ portaudio ];
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) portaudio;};
 
   "porte" = callPackage
@@ -202558,8 +202558,8 @@ self: {
          base bytestring containers extensible-exceptions stringsearch
        ];
        description = "FreeBSD ports index search and analysis tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202571,7 +202571,7 @@ self: {
        sha256 = "12pvav3xx4mdjnvza15yhkdcphxlsjns2s1i66h2nfgbb9lc8h0q";
        libraryHaskellDepends = [ base ];
        description = "Implementation of the Porter stemming algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ports" = callPackage
@@ -202583,7 +202583,7 @@ self: {
        libraryHaskellDepends = [ base haskell98 unix ];
        description = "The Haskell Ports Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202596,7 +202596,7 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        description = "Library to interact with port tools on FreeBSD";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "poseidon" = callPackage
@@ -202618,8 +202618,8 @@ self: {
          text time unordered-containers uuid
        ];
        description = "Simple extensible library to run SQL file against PostgreSQL database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202640,8 +202640,8 @@ self: {
          QuickCheck scientific text time unordered-containers uuid
        ];
        description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202653,7 +202653,7 @@ self: {
        sha256 = "034vlx889sgwvn7g2s1vl3w0nf1vs0c2c1gc0vn77wd9l1vw0hfg";
        libraryHaskellDepends = [ base nats semigroups ];
        description = "Positive integers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "positron" = callPackage
@@ -202670,8 +202670,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Experiment";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202689,8 +202689,8 @@ self: {
        ];
        librarySystemDepends = [ acl ];
        description = "Support for Posix ACL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) acl;};
 
@@ -202711,8 +202711,8 @@ self: {
          base primitive primitive-unlifted tasty tasty-hunit
        ];
        description = "posix bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) systemd;};
 
@@ -202724,7 +202724,7 @@ self: {
        sha256 = "1462njrxsfb26xavpwji17p172bsy6ivicsjzfvh8sq60rqyzjv1";
        libraryHaskellDepends = [ base ];
        description = "POSIX error codes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-escape" = callPackage
@@ -202735,7 +202735,7 @@ self: {
        sha256 = "0yrx8cr6qximfy0vh7qqljlkj27q9gksrnqmqbnj2hk5bsa5l48w";
        libraryHaskellDepends = [ base ];
        description = "Quote arguments to be passed through the Unix shell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-filelock" = callPackage
@@ -202747,7 +202747,7 @@ self: {
        libraryHaskellDepends = [ base transformers unix ];
        description = "Nice wrapper around POSIX fcntl advisory locks";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "posix-paths" = callPackage
@@ -202766,7 +202766,7 @@ self: {
          base bytestring criterion directory filepath process unix
        ];
        description = "POSIX filepath/directory functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-pty" = callPackage
@@ -202779,7 +202779,7 @@ self: {
        librarySystemDepends = [ util ];
        testHaskellDepends = [ base bytestring process ];
        description = "Pseudo terminal interaction with subprocesses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {util = null;};
 
   "posix-realtime" = callPackage
@@ -202790,8 +202790,8 @@ self: {
        sha256 = "01yz9p66m8w5418mqrrbz33dib97pscw329382wh0bi75swvlb39";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202808,7 +202808,7 @@ self: {
          transformers-base unix
        ];
        description = "Bindings to the POSIX socket API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-timer" = callPackage
@@ -202819,7 +202819,7 @@ self: {
        sha256 = "01s9hd23xcgdnryi72vj635435ccryv98a911l0zipxmvq4d8ri8";
        libraryHaskellDepends = [ base transformers-base unix ];
        description = "Bindings to POSIX clock and timer functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "posix-waitpid" = callPackage
@@ -202832,8 +202832,8 @@ self: {
        editedCabalFile = "12amy5ss3myr4c8bl5k3qpx3y78sp4pw4jdzvcg5sncpq7np3hdh";
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202851,7 +202851,7 @@ self: {
          base directory process split time timerep transformers unix X11
        ];
        description = "Sleep tracker for X11, using XScreenSaver extension and manual input";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "possible" = callPackage
@@ -202862,7 +202862,7 @@ self: {
        sha256 = "1r3xg8yni440h0yzcq5a4w27l3877y7bdvx70jf6agcyqhsl4ppj";
        libraryHaskellDepends = [ base ];
        description = "Three valued Data.Maybe";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "possibly" = callPackage
@@ -202873,7 +202873,7 @@ self: {
        sha256 = "08pannfx1831xp4zj4q3qp64vjr208df83qdwvzzlrn9ffc9ikaj";
        libraryHaskellDepends = [ base ];
        description = "type Possibly a = Either String a";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "post-mess-age" = callPackage
@@ -202884,7 +202884,7 @@ self: {
        sha256 = "0k6njm7fbj7y6bzqkfpdby4az13i2sqg7lacnn5ry2hkrfqrmxnh";
        libraryHaskellDepends = [ base ];
        description = "Send messages to a handle concurrently without getting them mixed";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postcodes" = callPackage
@@ -202895,8 +202895,8 @@ self: {
        sha256 = "1z0d5pl11jymd0jj1k50si35lq2af3y0apiyz6mbi25zl5x49bi8";
        libraryHaskellDepends = [ aeson base bytestring HTTP ];
        description = "A library that gets postcode information from the uk-postcodes.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202915,8 +202915,8 @@ self: {
          base bytestring filepath postgresql-simple process
        ];
        description = "Library for easily running embedded PostgreSQL server for tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202933,7 +202933,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "An Options type representing options for postgres connections";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgres-tmp" = callPackage
@@ -202944,8 +202944,8 @@ self: {
        sha256 = "1zx5inxczzlhyb5f89f92f0ngzln49qahzraqr6ksvi5r7n7gk86";
        libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        description = "Create a temporary database that is deleted after performing some operation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -202978,8 +202978,8 @@ self: {
          time unordered-containers wai-extra websockets
        ];
        description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203009,7 +203009,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-common" = callPackage
@@ -203025,7 +203025,7 @@ self: {
          attoparsec base bytestring postgresql-simple
        ];
        description = "Library for sharing common PostgreSQL types across Haskell PostgreSQL libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-common-persistent" = callPackage
@@ -203043,7 +203043,7 @@ self: {
          base bytestring persistent postgresql-common text
        ];
        description = "Persistent compatibility for postgresql-common";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-config" = callPackage
@@ -203059,7 +203059,7 @@ self: {
          resource-pool time
        ];
        description = "Types for easy adding postgresql configuration to your program";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-connector" = callPackage
@@ -203076,7 +203076,7 @@ self: {
          resourcet time transformers-base
        ];
        description = "Initial project postgresql-connector from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-copy-escape" = callPackage
@@ -203087,7 +203087,7 @@ self: {
        sha256 = "08ld3rqjjjhlikcv1cpxjqs8wlsjhvv7qq9fjb032hx6mvcqwz0i";
        libraryHaskellDepends = [ base bytestring ];
        description = "Format data to feed to a PostgreSQL COPY FROM statement";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-cube" = callPackage
@@ -203098,7 +203098,7 @@ self: {
        sha256 = "0jla8rxnrk995qxyp5dgwm2d6yrcafyz5mj7yqr6v5jyzh6b59c3";
        libraryHaskellDepends = [ base bytestring postgresql-simple ];
        description = "Cube support for postgresql-simple";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-error-codes" = callPackage
@@ -203109,7 +203109,7 @@ self: {
        sha256 = "1r1dv1pi1z16q0v1329g2j856j3afdlhv42qhgdabl9p4wyrvm76";
        libraryHaskellDepends = [ bytestring ];
        description = "PostgreSQL error codes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-libpq" = callPackage
@@ -203123,7 +203123,7 @@ self: {
        librarySystemDepends = [ postgresql ];
        testHaskellDepends = [ base bytestring ];
        description = "low-level binding to libpq";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
   "postgresql-libpq-notify" = callPackage
@@ -203140,7 +203140,7 @@ self: {
          tmp-postgres
        ];
        description = "Minimal dependency PostgreSQL notifications library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-lo-stream" = callPackage
@@ -203156,8 +203156,8 @@ self: {
          postgresql-simple
        ];
        description = "Utilities for streaming PostgreSQL LargeObjects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203175,8 +203175,8 @@ self: {
        ];
        testHaskellDepends = [ base generics-sop hspec postgresql-simple ];
        description = "Generic deserialization of PostgreSQL rows based on column names";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203221,7 +203221,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Converter for question mark style and dollar sign style of PostgreSQL SQL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-pure" = callPackage
@@ -203270,7 +203270,7 @@ self: {
          text time utf8-string vector
        ];
        description = "pure Haskell PostgreSQL driver";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-query" = callPackage
@@ -203301,8 +203301,8 @@ self: {
          tasty-quickcheck tasty-th text time
        ];
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203324,7 +203324,7 @@ self: {
          base basic-prelude optparse-applicative shelly text time
        ];
        description = "PostgreSQL Schema Management";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple" = callPackage
@@ -203352,7 +203352,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base vector ];
        description = "Mid-Level PostgreSQL client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple-bind" = callPackage
@@ -203372,8 +203372,8 @@ self: {
          base bytestring hspec postgresql-simple text
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203389,7 +203389,7 @@ self: {
          base haskell-src-meta mtl parsec postgresql-simple template-haskell
        ];
        description = "Interpolated SQL queries via quasiquotation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple-migration" = callPackage
@@ -203412,8 +203412,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
        description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203433,8 +203433,8 @@ self: {
          transformers
        ];
        description = "Implementation of named parameters for `postgresql-simple` library";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203458,7 +203458,7 @@ self: {
          optparse-applicative postgres-options postgresql-simple
        ];
        description = "An optparse-applicative and envy parser for postgres options";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple-queue" = callPackage
@@ -203483,8 +203483,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL backed queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203496,8 +203496,8 @@ self: {
        sha256 = "05plsdm4i4nw35pcbbk1yb91gpj6jq5hygsqijdmnsxyl9d6vbby";
        libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        description = "Generic functions for postgresql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203514,8 +203514,8 @@ self: {
          transformers typedquery utf8-string
        ];
        description = "Typed extension for PostgreSQL simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203536,7 +203536,7 @@ self: {
          base postgresql-simple tasty tasty-quickcheck
        ];
        description = "Parse postgres:// url into ConnectInfo";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-syntax" = callPackage
@@ -203560,8 +203560,8 @@ self: {
          tasty-quickcheck
        ];
        description = "PostgreSQL AST parsing and rendering";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203575,7 +203575,7 @@ self: {
          base monad-control mtl postgresql-simple
        ];
        description = "a transactional monad on top of postgresql-simple";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "postgresql-tx" = callPackage
@@ -203586,7 +203586,7 @@ self: {
        sha256 = "1q8yh16wxgfdvr3090i395ba20lzv2iyq5sswrzm9slcbnan353d";
        libraryHaskellDepends = [ base transformers ];
        description = "A safe transaction monad for use with various PostgreSQL Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-tx-monad-logger" = callPackage
@@ -203597,7 +203597,7 @@ self: {
        sha256 = "00gyhjfq13rknh4hpizmfizqv84b8l8ziik36gjyq1vsmfg5da43";
        libraryHaskellDepends = [ base monad-logger postgresql-tx ];
        description = "postgresql-tx interfacing for use with monad-logger";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-tx-query" = callPackage
@@ -203616,8 +203616,8 @@ self: {
          postgresql-tx-simple transformers transformers-base
        ];
        description = "postgresql-tx interfacing for use with postgresql-query";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203633,7 +203633,7 @@ self: {
          base bytestring postgresql-simple postgresql-tx transformers
        ];
        description = "postgresql-tx interfacing for use with postgresql-simple";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-tx-squeal" = callPackage
@@ -203649,8 +203649,8 @@ self: {
          records-sop squeal-postgresql unliftio
        ];
        description = "postgresql-tx interfacing for use with squeal-postgresql";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203664,8 +203664,8 @@ self: {
          base postgresql-simple postgresql-tx-squeal
        ];
        description = "Connection interop from postgresql-simple connections to postgresql-libpq connections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203694,7 +203694,7 @@ self: {
          base bytestring criterion network time tls
        ];
        description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "postgresql-typed-lifted" = callPackage
@@ -203710,8 +203710,8 @@ self: {
          postgresql-typed transformers-base
        ];
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203760,8 +203760,8 @@ self: {
          time transformers-base wai wai-extra
        ];
        description = "REST API for any Postgres database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203797,8 +203797,8 @@ self: {
          wai-extra
        ];
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203817,8 +203817,8 @@ self: {
          pipes-parse tls uuid
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203837,8 +203837,8 @@ self: {
          http-types network-api-support text
        ];
        description = "Library for postmarkapp.com HTTP Api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203855,8 +203855,8 @@ self: {
          http-streams io-streams text time
        ];
        description = "Send email via Postmark using io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203878,7 +203878,7 @@ self: {
        ];
        description = "Postmaster ESMTP Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203892,8 +203892,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Command line Dreamcast VMU filesystem toolset";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203905,8 +203905,8 @@ self: {
        sha256 = "1hc7jp7q6mdqva40v0dppihp1bnl30h7vxnkawg0kmczq5p9js35";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203929,8 +203929,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Streaming serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203953,8 +203953,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Integration of \"potoki\" and \"conduit\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203982,8 +203982,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Low-level components of \"potoki\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -203999,8 +203999,8 @@ self: {
          acquire base bytestring hasql potoki-core profunctors text vector
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204014,8 +204014,8 @@ self: {
          acquire base bytestring potoki-core zlib
        ];
        description = "Streaming ZLib decompression";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204032,7 +204032,7 @@ self: {
          JuicyPixels vector
        ];
        description = "Trace bitmap images to paths using potrace";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "potrace-diagrams" = callPackage
@@ -204045,8 +204045,8 @@ self: {
        editedCabalFile = "1iwsxi5zkqqjf9wr460bqjpghcvjhpgqgk27a11ji6bpdf6gnhga";
        libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
        description = "Potrace bindings for the diagrams library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204061,8 +204061,8 @@ self: {
        libraryHaskellDepends = [ base directory unix ];
        executableHaskellDepends = [ base ];
        description = "bindings for Griffin PowerMate USB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204074,8 +204074,8 @@ self: {
        sha256 = "0z3nqv8l9h0kwdaqb2vnk7vx5d0hmx02giv2k01llk7vznlkqqny";
        libraryHaskellDepends = [ base ];
        description = "Tools for PowerPC programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204089,7 +204089,7 @@ self: {
        libraryHaskellDepends = [ async base contravariant timespan ];
        testHaskellDepends = [ async base hspec stm ];
        description = "A flexible job queue with exchangeable backends";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "powerqueue-distributed" = callPackage
@@ -204107,7 +204107,7 @@ self: {
        ];
        testHaskellDepends = [ async base hspec powerqueue stm timespan ];
        description = "A distributed worker backend for powerqueu";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "powerqueue-levelmem" = callPackage
@@ -204133,8 +204133,8 @@ self: {
        ];
        benchmarkSystemDepends = [ leveldb snappy ];
        description = "A high performance in memory and LevelDB backend for powerqueue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
@@ -204148,8 +204148,8 @@ self: {
          aws-simple base powerqueue text timespan
        ];
        description = "A Amazon SQS backend for powerqueue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204161,7 +204161,7 @@ self: {
        sha256 = "0nzvxi1ybfxb1zqkbfqfic8j3mf3r6i2zdyjf7x41rz6m6lhqfcy";
        libraryHaskellDepends = [ base mtl ];
        description = "a tiny PPM image generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pprecord" = callPackage
@@ -204172,8 +204172,8 @@ self: {
        sha256 = "1gpr6sndh3pc43f1aks7wq8h969bbj2rc01rvaq9pkdnwqlqr7r4";
        libraryHaskellDepends = [ base boxes ];
        description = "A library for pretty printing Records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204197,7 +204197,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Pretty Print containers in a tabular format";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pqc" = callPackage
@@ -204208,8 +204208,8 @@ self: {
        sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4";
        libraryHaskellDepends = [ base QuickCheck random stm ];
        description = "Parallel batch driver for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204222,7 +204222,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Reliable, persistent, fast priority queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -204237,8 +204237,8 @@ self: {
          base containers ghc-prim MaybeT mtl stateful-mtl uvector
        ];
        description = "Fully encapsulated monad transformers with queuelike functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204257,8 +204257,8 @@ self: {
          base bytestring data-default directory json mps
        ];
        description = "Practice Room";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204279,8 +204279,8 @@ self: {
          unordered-containers vector
        ];
        description = "A pragmatic Prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204297,7 +204297,7 @@ self: {
          base tasty tasty-hunit tasty-quickcheck vector-space
        ];
        description = "Alternative Show class that gives shorter view if possible";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "prairie" = callPackage
@@ -204315,7 +204315,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base ];
        description = "A first class record field library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "preamble" = callPackage
@@ -204336,8 +204336,8 @@ self: {
          unordered-containers uuid
        ];
        description = "Yet another prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204357,7 +204357,7 @@ self: {
        ];
        description = "Diff Cabal packages";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "precursor" = callPackage
@@ -204373,8 +204373,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Prelude replacement";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204386,8 +204386,8 @@ self: {
        sha256 = "09kpqc281r4inrcnlsqspry6bvyzpa8npmjzqmmnpxscz58fq8nb";
        libraryHaskellDepends = [ base hashable hashtables HSet ];
        description = "Simple cached predicates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204416,8 +204416,8 @@ self: {
          tries unordered-containers
        ];
        description = "Predicative tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204429,8 +204429,8 @@ self: {
        sha256 = "03rw51jpfcl827nrv1fxlghqwg0mk89l1rkqwd743lnsydwzi15h";
        libraryHaskellDepends = [ base ];
        description = "Helper class for passing context along a predicate value";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204444,8 +204444,8 @@ self: {
        editedCabalFile = "1b02l2fdfxvlsvhcmkpsp0vzc0igsd0nrb64yb7af5a7z08cc9c0";
        libraryHaskellDepends = [ adjunctions base deepseq lens mtl ];
        description = "A library for writing predicates and transformations over predicates in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204472,8 +204472,8 @@ self: {
          tasty-quickcheck template-haskell text these time
        ];
        description = "Predicates, Refinement types and Dsl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204485,7 +204485,7 @@ self: {
        sha256 = "0ly64xml5gbazyq07s409swgysvlwjc19w4x46yp1684ifv0gghf";
        libraryHaskellDepends = [ base ];
        description = "A couple of convenience functions for forming predicates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "predictive" = callPackage
@@ -204496,7 +204496,7 @@ self: {
        sha256 = "0n1ilbr3zs8gaji37xn5iab5nwk02my3g18x8bci6pp8znisrbi0";
        libraryHaskellDepends = [ base containers ];
        description = "Predict the future, backtrack on failure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prednote" = callPackage
@@ -204517,8 +204517,8 @@ self: {
          tasty tasty-quickcheck tasty-th text transformers
        ];
        description = "Evaluate and display trees of predicates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204541,8 +204541,8 @@ self: {
          rainbow-tests text
        ];
        description = "Tests and QuickCheck generators to accompany prednote";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204556,7 +204556,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring ];
        description = "Prefetch stdin even before stdout is ready";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prefix-expression" = callPackage
@@ -204567,7 +204567,7 @@ self: {
        sha256 = "0brw6rrykfsg67ckcfs3d5x4n7m8c6vbnh9hqrk1iq9whlz6vpwy";
        libraryHaskellDepends = [ base regex-pcre-builtin ];
        testHaskellDepends = [ base hspec ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prefix-units" = callPackage
@@ -204584,7 +204584,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "A basic library for SI/binary prefix units";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prefork" = callPackage
@@ -204606,8 +204606,8 @@ self: {
          base cab containers directory filepath hspec process stm unix
        ];
        description = "A library for building a prefork-style server quickly";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204627,8 +204627,8 @@ self: {
          text-conversions time tuple unordered-containers vector
        ];
        description = "Prelude for applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204650,8 +204650,8 @@ self: {
          string-conversions
        ];
        description = "A larger alternative to the Prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204663,7 +204663,7 @@ self: {
        sha256 = "1mv00d5k5wqb39iyghdbf4lfqznwb1whcc9a564ly4wzka70y9f1";
        libraryHaskellDepends = [ base ];
        description = "Provide Prelude and Data.List with fixed content across GHC versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prelude-edsl" = callPackage
@@ -204674,7 +204674,7 @@ self: {
        sha256 = "0ms63ggqciin92qld07cx6110n534idk38hzj7c69jw68cz3bw1f";
        libraryHaskellDepends = [ base ];
        description = "An EDSL-motivated subset of the Prelude";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prelude-extras" = callPackage
@@ -204685,7 +204685,7 @@ self: {
        sha256 = "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9";
        libraryHaskellDepends = [ base ];
        description = "Higher order versions of Prelude classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prelude-generalize" = callPackage
@@ -204696,8 +204696,8 @@ self: {
        sha256 = "0h452pn7zs97z5gv2p3x9pg61phphwcw5y5g1w38k3gihdvym8jl";
        libraryHaskellDepends = [ base comonad logict transformers ];
        description = "Another kind of alternate Prelude file";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204711,8 +204711,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204724,7 +204724,7 @@ self: {
        sha256 = "1avj11a5bqn8sxizzh1fxhw3dvd55xsimbbhdwymxfn45vvfswr7";
        libraryHaskellDepends = [ base ];
        description = "A slightly better (but conservative) Prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "prelude-safeenum" = callPackage
@@ -204735,7 +204735,7 @@ self: {
        sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl";
        libraryHaskellDepends = [ base ];
        description = "A redefinition of the Prelude's Enum class in order to render it safe";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prelude2010" = callPackage
@@ -204746,7 +204746,7 @@ self: {
        sha256 = "0f4ggnm3a57b4gqw07fq3ash43dxsy0bmg16b8wj33yik96qk06l";
        libraryHaskellDepends = [ prelude-compat ];
        description = "Provide Prelude with fixed content across GHC versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "preludeplus" = callPackage
@@ -204757,7 +204757,7 @@ self: {
        sha256 = "08sxfgr8xh0rbg9nv3k93970mjcqgjyv1qy0kmwksl11fsih6sr3";
        libraryHaskellDepends = [ base containers ];
        description = "Generalizes List functions and replaces partials with NonEmpty equivalents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "preprocess-haskell" = callPackage
@@ -204776,8 +204776,8 @@ self: {
          system-filepath temporary text turtle unix
        ];
        description = "Preprocess Haskell Repositories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204798,8 +204798,8 @@ self: {
          base directory haskell-src-exts hspec process temporary
        ];
        description = "Remove cpp annotations to get the source ready for static analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204811,7 +204811,7 @@ self: {
        sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp";
        libraryHaskellDepends = [ base mtl parsec syb ];
        description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "preql" = callPackage
@@ -204849,8 +204849,8 @@ self: {
        ];
        benchmarkToolDepends = [ alex happy ];
        description = "safe PostgreSQL queries using Quasiquoters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204865,8 +204865,8 @@ self: {
        libraryHaskellDepends = [ base containers pretty ];
        testHaskellDepends = [ base QuickCheck ];
        description = "A decision procedure for quantifier-free linear arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204878,8 +204878,8 @@ self: {
        sha256 = "0ys2ibfh518r9rg9bl2m5cmyfxmri47g8wg7q0n5fcbsh4sb7s5s";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Make presentations for data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204892,7 +204892,7 @@ self: {
        libraryHaskellDepends = [ base containers json mtl parsec ];
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204912,8 +204912,8 @@ self: {
          scientific text transformers
        ];
        description = "An HDBC connector for Presto";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -204925,7 +204925,7 @@ self: {
        sha256 = "18bwgz2cgkd6n9gwpwipv2bc6d5501mflmr0r2akwy98q2gb9qg8";
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Haskell2010 structured text formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty_1_1_3_6" = callPackage
@@ -204938,8 +204938,8 @@ self: {
        testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Pretty-printing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pretty-class" = callPackage
@@ -204950,7 +204950,7 @@ self: {
        sha256 = "1qdfp2kpahzflq9a3idwmb0pqs4l7almxn5rbw5gp2pmdx81p3am";
        libraryHaskellDepends = [ base pretty ];
        description = "Pretty printing class similar to Show";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-compact" = callPackage
@@ -204985,7 +204985,7 @@ self: {
          base data-default Diff tasty tasty-hunit tasty-test-reporter text
        ];
        description = "Pretty printing a diff of two values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-display" = callPackage
@@ -205000,7 +205000,7 @@ self: {
        executableHaskellDepends = [ ansi-wl-pprint base pretty-show ];
        testHaskellDepends = [ base ];
        description = "Typeclass for human-readable display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-error" = callPackage
@@ -205013,7 +205013,7 @@ self: {
          base basic-prelude bytestring pretty-show
        ];
        description = "Pretty error messages for runtime invariants";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pretty-ghci" = callPackage
@@ -205037,8 +205037,8 @@ self: {
          base directory filepath prettyprinter process
        ];
        description = "Functionality for beautifying GHCi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205050,7 +205050,7 @@ self: {
        sha256 = "0c8pa0rdb2q8rf4acy4gww0hj5lrzclzdh52yi2aiaaij4lqzir7";
        libraryHaskellDepends = [ base bytestring ];
        description = "A library for hex dumps of ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-loc" = callPackage
@@ -205061,7 +205061,7 @@ self: {
        sha256 = "196slpa651p7yq8107c4pkwdfkfmg2bn6ibyqz22c46psklyrisb";
        libraryHaskellDepends = [ base text ];
        description = "Tracking and highlighting of locations in source files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-ncols" = callPackage
@@ -205072,8 +205072,8 @@ self: {
        sha256 = "0bvd8wgjrj9g86b1z8m9mjzswibrmhasgajnkgr2dlizl5lg7faq";
        libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205091,7 +205091,7 @@ self: {
          validity validity-time
        ];
        description = "Pretty relative time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pretty-show" = callPackage
@@ -205111,7 +205111,7 @@ self: {
        libraryToolDepends = [ happy ];
        executableHaskellDepends = [ base ];
        description = "Tools for working with derived `Show` instances and generic inspection of values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pretty-show-ansi-wl" = callPackage
@@ -205127,7 +205127,7 @@ self: {
        ];
        libraryToolDepends = [ happy ];
        description = "Like pretty-show, but only for ansi-wl-pprint";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pretty-simple" = callPackage
@@ -205151,8 +205151,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ cdepillabout ];
      }) {};
 
   "pretty-sop" = callPackage
@@ -205167,7 +205167,7 @@ self: {
        testHaskellDepends = [ base generics-sop pretty-show ];
        testToolDepends = [ markdown-unlit ];
        description = "A generic pretty-printer using generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-terminal" = callPackage
@@ -205183,7 +205183,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
        description = "Styling and coloring terminal output with ANSI escape sequences";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-tree" = callPackage
@@ -205194,7 +205194,7 @@ self: {
        sha256 = "0cf856qjacc0lmiina44s00i17ga2qrfr7wdlxhwiqdmpsh5g3fw";
        libraryHaskellDepends = [ base boxes containers ];
        description = "Pretty-print trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pretty-types" = callPackage
@@ -205206,8 +205206,8 @@ self: {
        libraryHaskellDepends = [ base mtl tagged ];
        testHaskellDepends = [ base hspec tagged ];
        description = "A small pretty printing DSL for complex types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205219,7 +205219,7 @@ self: {
        sha256 = "08vqwhbda9qyqmgg469w0ijy090j5wj9xwd54ph6m0rzypbjw8hd";
        libraryHaskellDepends = [ base ];
        description = "prettier function composition by (°)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prettyclass" = callPackage
@@ -205230,7 +205230,7 @@ self: {
        sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5";
        libraryHaskellDepends = [ base pretty ];
        description = "Pretty printing class similar to Show";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prettyprinter" = callPackage
@@ -205255,7 +205255,7 @@ self: {
          QuickCheck random text transformers
        ];
        description = "A modern, easy to use, well-documented, extensible pretty-printer";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-ansi-terminal" = callPackage
@@ -205273,7 +205273,7 @@ self: {
          text
        ];
        description = "ANSI terminal backend for the »prettyprinter« package";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-compat-annotated-wl-pprint" = callPackage
@@ -205284,7 +205284,7 @@ self: {
        sha256 = "0plkzvwbqilmh711fbbki9r37i01n00kmzr6cxjgjw0ak1m2djbn";
        libraryHaskellDepends = [ base prettyprinter text ];
        description = "Drop-in compatibility package to migrate from »annotated-wl-pprint« to »prettyprinter«";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-compat-ansi-wl-pprint" = callPackage
@@ -205301,7 +205301,7 @@ self: {
          base prettyprinter prettyprinter-ansi-terminal text
        ];
        description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-compat-wl-pprint" = callPackage
@@ -205314,7 +205314,7 @@ self: {
        editedCabalFile = "0cb1i1hmr6wl8lacy3w822h273lapqhp537snxgbmhf9xvfckbpr";
        libraryHaskellDepends = [ base prettyprinter text ];
        description = "Prettyprinter compatibility module for previous users of the wl-pprint package";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-convert-ansi-wl-pprint" = callPackage
@@ -205331,7 +205331,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "prettyprinter-graphviz" = callPackage
@@ -205342,7 +205342,7 @@ self: {
        sha256 = "1lqf296jr2jfg86apn729payq2rkk95pdidl7n62xx4bniax7fvm";
        libraryHaskellDepends = [ base graphviz prettyprinter text ];
        description = "A prettyprinter backend for graphviz";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prettyprinter-lucid" = callPackage
@@ -205353,8 +205353,8 @@ self: {
        sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh";
        libraryHaskellDepends = [ base lucid prettyprinter text ];
        description = "A prettyprinter backend for lucid";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205368,8 +205368,8 @@ self: {
        editedCabalFile = "120lhr6g3grsybq5bp0vg38cdb78dysq8nwa206ghzigaxs34vcd";
        libraryHaskellDepends = [ base prettyprinter vty ];
        description = "prettyprinter backend for vty";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205385,8 +205385,8 @@ self: {
          base containers pretty strict-data text util-plus
        ];
        description = "The method of previewing data (instead of wholly show-ing it)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205398,7 +205398,7 @@ self: {
        sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4";
        libraryHaskellDepends = [ ghc-prim ];
        description = "An ergonomic but conservative interface to ghc-prim";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "prim-array" = callPackage
@@ -205411,8 +205411,8 @@ self: {
        editedCabalFile = "120v58dhida6ms5wd4skw32y2mc70594dhipmz2zp4kjcqmllmdq";
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205425,8 +205425,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "Prim typeclass instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205438,8 +205438,8 @@ self: {
        sha256 = "0fyjxpk4xllkh3r5b7fbb4sb6whxwbdm5lr9zn44qb9v4g0nx2d8";
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205455,7 +205455,7 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck spoon ];
        benchmarkHaskellDepends = [ base criterion ghc-prim spoon ];
        description = "Catch errors thrown from pure computations using primops";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prim-uniq" = callPackage
@@ -205466,7 +205466,7 @@ self: {
        sha256 = "1l7jlv3pfasn89n2wpgff972npy423vqsidkkn5crxfyqjyzxbdv";
        libraryHaskellDepends = [ base dependent-sum primitive ];
        description = "Opaque unique identifiers in primitive state monads";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "primal" = callPackage
@@ -205480,8 +205480,8 @@ self: {
        libraryHaskellDepends = [ base deepseq transformers ];
        testHaskellDepends = [ base doctest template-haskell ];
        description = "Primeval world of Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205501,8 +205501,8 @@ self: {
          base criterion deepseq primal primitive random
        ];
        description = "Unified interface for memory managemenet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205515,7 +205515,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "prime number tools";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "primes" = callPackage
@@ -205526,7 +205526,7 @@ self: {
        sha256 = "0ny6fzr967d1fifk050k95j9snnbjjif2bxf3v9s93k3zdc6bmkl";
        libraryHaskellDepends = [ base ];
        description = "Efficient, purely functional generation of prime numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primes-type" = callPackage
@@ -205539,8 +205539,8 @@ self: {
        testHaskellDepends = [ base HTF primes ];
        benchmarkHaskellDepends = [ base criterion primes ];
        description = "Type-safe prime numbers";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205556,7 +205556,7 @@ self: {
        executableHaskellDepends = [ base foundation ];
        executableSystemDepends = [ primesieve ];
        description = "FFI bindings for the primesieve library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) primesieve;};
 
   "primitive" = callPackage
@@ -205577,7 +205577,7 @@ self: {
          transformers-compat
        ];
        description = "Primitive memory-related operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-addr" = callPackage
@@ -205588,7 +205588,7 @@ self: {
        sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2";
        libraryHaskellDepends = [ base primitive ];
        description = "Addresses to unmanaged memory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-atomic" = callPackage
@@ -205600,8 +205600,8 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        testHaskellDepends = [ base primitive primitive-unlifted ];
        description = "Wrappers for primops around atomic operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205613,8 +205613,8 @@ self: {
        sha256 = "1h4gsririgjw8p72dz2p91yq8mxr37qca8rshmxmkmmds8yv6w1s";
        libraryHaskellDepends = [ base primitive ];
        description = "primitive functions with bounds-checking";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205640,8 +205640,8 @@ self: {
          base containers gauge ghc-prim primitive primitive-unlifted random
        ];
        description = "containers backed by arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205653,8 +205653,8 @@ self: {
        sha256 = "1xnyyw76kh42fy1b1wkc143bg3588gbp48990xdskcad1aj4fyan";
        libraryHaskellDepends = [ primitive ];
        description = "convenience class for PrimMonad m/PrimState m";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205677,8 +205677,8 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
        ];
        description = "Extras for the \"primitive\" library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205691,8 +205691,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base primitive QuickCheck ];
        description = "using the `Prim` interface for the FFI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205704,8 +205704,8 @@ self: {
        sha256 = "0sbn3h426i6i609iyybar10lywpsklgfkzp355cg8dpfp4a3ibsf";
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base doctest QuickCheck ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205723,8 +205723,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Arrays of Maybes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205736,7 +205736,7 @@ self: {
        sha256 = "0aspdlzx1xaw1fyiy8vnzadbklpg7hn2mb1g9qmw2vpkxglpspmi";
        libraryHaskellDepends = [ base primitive ];
        description = "Types for offsets into unboxed arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-simd" = callPackage
@@ -205750,8 +205750,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion deepseq random vector ];
        description = "SIMD data types and functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205773,8 +205773,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205786,8 +205786,8 @@ self: {
        sha256 = "1kdrzam5m2svxrpa7k3byg061i5xs0lc6q12hwgiq6l09savql6j";
        libraryHaskellDepends = [ base primitive ];
        description = "primitive operations on StableNames";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205800,7 +205800,7 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base primitive ];
        description = "Unaligned access to primitive arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-unlifted" = callPackage
@@ -205812,7 +205812,7 @@ self: {
        libraryHaskellDepends = [ base bytestring primitive text-short ];
        testHaskellDepends = [ base primitive stm ];
        description = "Primitive GHC types with unlifted types inside";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "primitive-unlifted_1_0_0_0" = callPackage
@@ -205831,8 +205831,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Primitive GHC types with unlifted types inside";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "primula-board" = callPackage
@@ -205855,7 +205855,7 @@ self: {
        ];
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205875,7 +205875,7 @@ self: {
        ];
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205892,8 +205892,8 @@ self: {
          unordered-containers vector vinyl
        ];
        description = "Classes and data structures complementing the singletons library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205908,7 +205908,7 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        executableHaskellDepends = [ base ];
        description = "Print all ANSI console colors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "print-debugger" = callPackage
@@ -205919,8 +205919,8 @@ self: {
        sha256 = "10c4dsf0kz5ydbx5gr8dzcd280l6nj8dd6h77k56ggy5icnhx6p8";
        libraryHaskellDepends = [ base split ];
        description = "Debug print formatting library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205932,7 +205932,7 @@ self: {
        sha256 = "02wl9hq7jkz4yzkb744xwgnbss0w2sdpi02d3ms2q5rvc03ixnh6";
        libraryHaskellDepends = [ base ];
        description = "Can be used to coordinate the printing output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "printcess" = callPackage
@@ -205948,8 +205948,8 @@ self: {
          base containers hspec HUnit lens mtl QuickCheck transformers
        ];
        description = "Pretty printing with indentation, mixfix operators, and automatic line breaks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -205965,7 +205965,7 @@ self: {
          base bytestring containers data-default template-haskell
        ];
        description = "A Perl printf like formatter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "printf-safe" = callPackage
@@ -205976,7 +205976,7 @@ self: {
        sha256 = "17bazxp86h96r12ca7mr1k7krh3zxh7dipgx5p6n8h08dgfsmijl";
        libraryHaskellDepends = [ base ];
        description = "Type safe interface for Text.Printf";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prints" = callPackage
@@ -205991,8 +205991,8 @@ self: {
          base hscolour pretty-show pretty-simple text transformers
        ];
        description = "The Artist Formerly Known as Prints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206006,7 +206006,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base xosd ];
        description = "Simple tool to display some text on an on-screen display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "priority-queue" = callPackage
@@ -206017,8 +206017,8 @@ self: {
        sha256 = "0nsiil0yl32m80a1kpg3z0wd5fxwkpz2lzf66pa06iy24q0rz5lf";
        libraryHaskellDepends = [ base containers queue reord stateref ];
        description = "Simple implementation of a priority queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206036,7 +206036,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Cooperative task prioritization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "private-hackage-uploader" = callPackage
@@ -206054,7 +206054,7 @@ self: {
        ];
        executableHaskellDepends = [ base directory shelly text ];
        description = "Upload a package to the public or private hackage, building its docs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "privileged-concurrency" = callPackage
@@ -206069,7 +206069,7 @@ self: {
          base contravariant lifted-base stm unliftio unliftio-core
        ];
        description = "Provides privilege separated versions of the concurrency primitives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prizm" = callPackage
@@ -206087,7 +206087,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Convert colors to different color spaces, interpolate colors, and transform colors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "probability" = callPackage
@@ -206101,7 +206101,7 @@ self: {
          base containers random transformers utility-ht
        ];
        description = "Probabilistic Functional Programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "probable" = callPackage
@@ -206121,8 +206121,8 @@ self: {
          base criterion mwc-random mwc-random-monad vector
        ];
        description = "Easy and reasonably efficient probabilistic programming and random generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206141,8 +206141,8 @@ self: {
          xformat
        ];
        description = "Parse process information for Linux";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206158,7 +206158,7 @@ self: {
          attoparsec base bytestring network unix
        ];
        description = "Parse /proc/net/{tcp,tcp6,udp,udp6}";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "process_1_6_10_0" = callPackage
@@ -206172,8 +206172,8 @@ self: {
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "process-conduit" = callPackage
@@ -206193,8 +206193,8 @@ self: {
          base bytestring conduit conduit-extra hspec resourcet
        ];
        description = "Conduits for processes (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206212,7 +206212,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Process extras";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "process-iterio" = callPackage
@@ -206230,8 +206230,8 @@ self: {
          base bytestring cpphs iterIO process transformers
        ];
        description = "IterIO Process Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206243,8 +206243,8 @@ self: {
        sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
        libraryHaskellDepends = [ base directory filepath unix ];
        description = "Process libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206261,8 +206261,8 @@ self: {
          base bytestring deepseq ListLike process text
        ];
        description = "Process extras";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206279,8 +206279,8 @@ self: {
          text time unix utf8-string
        ];
        description = "Run a process and do reportsing on its progress";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206297,8 +206297,8 @@ self: {
          template-haskell text
        ];
        description = "Quasi-Quoters for exec process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206330,8 +206330,8 @@ self: {
          void
        ];
        description = "Streaming interface to system processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206350,8 +206350,8 @@ self: {
          transformers
        ];
        description = "Web graphic applications with processing.js.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206368,7 +206368,7 @@ self: {
          transformers utf8-string vector-space
        ];
        description = "Computer graphics for kids and artists with Processing implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "processmemory" = callPackage
@@ -206379,8 +206379,8 @@ self: {
        sha256 = "12p7974x43w06jwaf7hlv2wxlgqnq9kb10mgjl9c4l7hbpbg3y0z";
        libraryHaskellDepends = [ base binary bytestring process ];
        description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206396,7 +206396,7 @@ self: {
          array attoparsec base bytestring containers deepseq mtl
        ];
        description = "a creation kit for instruction sets and cpu simulators and development tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "procrastinating-structure" = callPackage
@@ -206408,7 +206408,7 @@ self: {
        libraryHaskellDepends = [ base procrastinating-variable ];
        description = "Pure structures that can be incrementally created in impure code";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "procrastinating-variable" = callPackage
@@ -206419,8 +206419,8 @@ self: {
        sha256 = "12px0nk7j74hyfzcvxacd9020gk3cd3ijqb7fjmmg8y33354jkc4";
        libraryHaskellDepends = [ base ];
        description = "Haskell values that cannot be evaluated immediately";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206432,8 +206432,8 @@ self: {
        sha256 = "1md75jc32nfnvs7ygf1mna00gl0wmimp2lkdcs9r9v0iy4b1hr5m";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "get information on processes in Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206452,7 +206452,7 @@ self: {
          base bytestring hspec HUnit process QuickCheck text
        ];
        description = "An IO library for testing interactive command line programs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "producer" = callPackage
@@ -206469,8 +206469,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Simple streaming datatype";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206484,7 +206484,7 @@ self: {
        editedCabalFile = "0ssd2yc8c3h2y5yra8y49sphxwpj8jd7ss6h058nabld0hrbvjm2";
        libraryHaskellDepends = [ base category ];
        description = "Product category";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "product-isomorphic" = callPackage
@@ -206496,7 +206496,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell th-data-compat ];
        testHaskellDepends = [ base template-haskell ];
        description = "Weaken applicative functor on products";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "product-profunctors" = callPackage
@@ -206515,7 +206515,7 @@ self: {
        testHaskellDepends = [ base profunctors ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "product-profunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prof-flamegraph" = callPackage
@@ -206528,8 +206528,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Generate flamegraphs from ghc RTS .prof files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206545,8 +206545,8 @@ self: {
          base containers filepath haskell98 parsec
        ];
        description = "Convert GHC profiles into GraphViz's dot format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206565,8 +206565,8 @@ self: {
          base containers filepath haskell-src-exts semigroups uniplate zenc
        ];
        description = "generate pretty source from time/allocation profiles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206585,7 +206585,7 @@ self: {
          scientific text
        ];
        description = "Restructure GHC profile reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profiteur" = callPackage
@@ -206605,7 +206605,7 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "Treemap visualiser for GHC prof files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctor-arrows" = callPackage
@@ -206616,7 +206616,7 @@ self: {
        sha256 = "136d594l4magjibq44fs64bqafvcdy8jm2gijs6x1whpab0vl44k";
        libraryHaskellDepends = [ base comonad lawz profunctors ];
        description = "Profunctor arrows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -206628,7 +206628,7 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        doHaddock = false;
        description = "This package has been absorbed into profunctors 4.0";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctor-misc" = callPackage
@@ -206639,7 +206639,7 @@ self: {
        sha256 = "0akgx4gasd0p0skqrr29xdm0yp0dppzx21skk00is0lrwmldhqkg";
        libraryHaskellDepends = [ base comonad contravariant profunctors ];
        description = "Profunctor miscellany";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctor-monad" = callPackage
@@ -206655,8 +206655,8 @@ self: {
          base hashable mtl transformers unordered-containers
        ];
        description = "Monadic bidirectional programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206678,8 +206678,8 @@ self: {
        ];
        executableHaskellDepends = [ base doctest mtl ];
        description = "A compact optics library compatible with the typeclasses in profunctors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {coapplicative = null;};
 
@@ -206698,7 +206698,7 @@ self: {
          tagged transformers
        ];
        description = "Profunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "profunctors_5_6_1" = callPackage
@@ -206714,8 +206714,8 @@ self: {
          tagged transformers
        ];
        description = "Profunctors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "progress" = callPackage
@@ -206726,8 +206726,8 @@ self: {
        sha256 = "0cac4v6k2nrpglnf3680y334kw4k0s6xfm86wrfyszl5sq2a7w94";
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206739,8 +206739,8 @@ self: {
        sha256 = "1mdzwbzkf9ja7i21hds26gqn2ll4hnidbcq145yigkfzv93r6hq6";
        libraryHaskellDepends = [ ansi-terminal async base stm ];
        description = "Live diagnostics for concurrent activity";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206754,8 +206754,8 @@ self: {
        editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1";
        libraryHaskellDepends = [ base deepseq mtl time ];
        description = "Functionality for reporting function progress";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206769,8 +206769,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base io-reactive ];
        description = "Progressbar API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206787,8 +206787,8 @@ self: {
          txt-sushi
        ];
        description = "Automates the recording and graphing of criterion benchmarks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206807,8 +206807,8 @@ self: {
          process text
        ];
        description = "Multilabel classification model which learns sequentially (online)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206822,7 +206822,7 @@ self: {
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) proj;};
 
@@ -206893,8 +206893,8 @@ self: {
          vector-binary-instances websockets winery
        ];
        description = "Relational Algebra Engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206916,7 +206916,7 @@ self: {
          QuickCheck resourcet text transformers
        ];
        description = "Specify Haskell project templates and generate files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "projectile" = callPackage
@@ -206935,8 +206935,8 @@ self: {
          tasty-hunit tasty-rerun text vector
        ];
        description = "Go to README.md";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206950,7 +206950,7 @@ self: {
        editedCabalFile = "02ykpvapl8ypzrggf0b6bdcy6wcwbkwrczhbq3ccc02282lv8pc0";
        libraryHaskellDepends = [ base ];
        description = "Projection function for arbitrarily nested binary product types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "projectroot" = callPackage
@@ -206962,7 +206962,7 @@ self: {
        libraryHaskellDepends = [ base directory ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to the projectroot C logic";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "prolens" = callPackage
@@ -206978,8 +206978,8 @@ self: {
          base doctest hedgehog hspec hspec-hedgehog inspection-testing
        ];
        description = "Profunctor-based lightweight implementation of optics";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -206996,7 +206996,7 @@ self: {
          transformers
        ];
        description = "A Prolog interpreter written in Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "prolog-graph" = callPackage
@@ -207013,8 +207013,8 @@ self: {
          base cmdargs fgl graphviz mtl prolog prolog-graph-lib text
        ];
        description = "A command line tool to visualize query resolution in Prolog";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207026,7 +207026,7 @@ self: {
        sha256 = "1qxikgryyh47zm0qwbsa7lpqmiphbl1askjjjc0rfr9dh5f0wclr";
        libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
        description = "Generating images of resolution trees for Prolog queries";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "prologue" = callPackage
@@ -207051,8 +207051,8 @@ self: {
          transformers transformers-base typelevel vector
        ];
        description = "Better, more general Prelude exporting common utilities";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207074,8 +207074,8 @@ self: {
          swagger2 text time uuid vector
        ];
        description = "ITProTV's custom prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207093,7 +207093,7 @@ self: {
          http-client-tls http-types network-uri text transformers wai warp
        ];
        description = "Prometheus Haskell Client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prometheus-client" = callPackage
@@ -207119,7 +207119,7 @@ self: {
          base bytestring criterion random text utf8-string
        ];
        description = "Haskell client library for http://prometheus.io.";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "prometheus-effect" = callPackage
@@ -207146,8 +207146,8 @@ self: {
        testHaskellDepends = [ base text weigh ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Instrument applications with metrics and publish/push to Prometheus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207164,7 +207164,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "prometheus-proc" = callPackage
@@ -207180,7 +207180,7 @@ self: {
          unix unix-memory
        ];
        description = "Export metrics from /proc for the current process";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prometheus-wai-middleware" = callPackage
@@ -207200,7 +207200,7 @@ self: {
          async base http-types prometheus wai warp
        ];
        description = "Instrument a wai application with various metrics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "promise" = callPackage
@@ -207211,8 +207211,8 @@ self: {
        sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg";
        libraryHaskellDepends = [ async base ];
        description = "A monadic interface for async";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207224,7 +207224,7 @@ self: {
        sha256 = "0q7jjk9dqli4vi46j94gywxp0fp80b7r0k0g4ymyf8n12lcr0z5z";
        libraryHaskellDepends = [ base primitive ];
        description = "Lazy demand-driven promises";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prompt" = callPackage
@@ -207239,7 +207239,7 @@ self: {
          base base-compat mtl transformers transformers-compat
        ];
        description = "Monad (and transformer) for deferred-effect pure prompt-response queries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pronounce" = callPackage
@@ -207255,8 +207255,8 @@ self: {
          base binary containers filepath mtl safe text
        ];
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207268,8 +207268,8 @@ self: {
        sha256 = "1wcm5wxzqm4lq340l3ga15cmjfabpf8njnvma3zagwyhmndabxfw";
        libraryHaskellDepends = [ base ];
        description = "Proof Combinators used in Liquid Haskell for Theorem Proving";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207285,8 +207285,8 @@ self: {
          base colour containers directory filepath repa repa-devil spawn
        ];
        description = "Functional synthesis of images and animations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207298,7 +207298,7 @@ self: {
        sha256 = "00v1j1mv5dl6vivkfqv9w9jvw1jh3085mpkax5x0cyndhqcw027x";
        libraryHaskellDepends = [ base ];
        description = "A Simple Propagator Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "propellor" = callPackage
@@ -207320,7 +207320,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "property-based host configuration management in haskell";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "properties" = callPackage
@@ -207331,8 +207331,8 @@ self: {
        sha256 = "04a35zxgps9rn6y86x3jf6gma6kjl8izmnyl45hz64cl9yb5dwwi";
        libraryHaskellDepends = [ base ];
        description = "check quickCheck properties in real time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207344,7 +207344,7 @@ self: {
        sha256 = "1amgzvg7xp7i5ppxmyhh1dhbv4zgwwvg9cdrc719flsndxp4xvar";
        libraryHaskellDepends = [ base ];
        description = "common properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "property-list" = callPackage
@@ -207363,8 +207363,8 @@ self: {
          transformers vector xml
        ];
        description = "Apple property list parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207376,8 +207376,8 @@ self: {
        sha256 = "1vm01qvd0jgcdpqx3p2h6gafhxi5x7bs8r5a6xsk4zz6cc1cbw4m";
        libraryHaskellDepends = [ base glade glib gtk ];
        description = "A library for functional GUI development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207390,7 +207390,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Reusable quickcheck properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prosidy" = callPackage
@@ -207417,8 +207417,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "A simple language for writing documents";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207435,8 +207435,8 @@ self: {
          prosidy text unordered-containers
        ];
        description = "A DSL for processing Prosidy documents";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207455,7 +207455,7 @@ self: {
          base deepseq free hspec inspection-testing kan-extensions
        ];
        description = "Explore continuations with trepidation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "prosper" = callPackage
@@ -207472,8 +207472,8 @@ self: {
          io-streams mtl text transformers vector
        ];
        description = "Bindings to the Prosper marketplace API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207492,8 +207492,8 @@ self: {
        libraryPkgconfigDepends = [ libpulse libpulse-simple ];
        libraryToolDepends = [ c2hs ];
        description = "Simple audio library for Windows, Linux, OSX";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libpulse = null; libpulse-simple = null; 
          inherit (pkgs) libpulseaudio;};
@@ -207511,8 +207511,8 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        libraryToolDepends = [ c2hs ];
        description = "Simple audio library for SDL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) SDL2;};
 
@@ -207552,8 +207552,8 @@ self: {
          unliftio utf8-string
        ];
        description = "neovim project manager";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207575,7 +207575,7 @@ self: {
          base bytestring QuickCheck tasty tasty-quickcheck vector
        ];
        description = "A lens-based implementation of protocol buffers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto-lens-arbitrary" = callPackage
@@ -207590,8 +207590,8 @@ self: {
          base bytestring containers lens-family proto-lens QuickCheck text
        ];
        description = "Arbitrary instances for proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207613,8 +207613,8 @@ self: {
          proto-lens-runtime test-framework test-framework-hunit
        ];
        description = "Utilities functions to proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207631,8 +207631,8 @@ self: {
          lens-labels proto-lens text
        ];
        description = "Protocol buffers for describing the definitions of messages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207649,7 +207649,7 @@ self: {
          proto-lens-runtime text vector
        ];
        description = "JSON protobuf encoding for proto-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto-lens-optparse" = callPackage
@@ -207662,7 +207662,7 @@ self: {
          base optparse-applicative proto-lens text
        ];
        description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto-lens-protobuf-types" = callPackage
@@ -207680,7 +207680,7 @@ self: {
        ];
        libraryToolDepends = [ proto-lens-protoc protobuf ];
        description = "Basic protocol buffer message types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protoc" = callPackage
@@ -207701,7 +207701,7 @@ self: {
          lens-family pretty proto-lens proto-lens-runtime text
        ];
        description = "Protocol buffer compiler for the proto-lens library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-runtime" = callPackage
@@ -207717,7 +207717,7 @@ self: {
          text vector
        ];
        doHaddock = false;
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto-lens-setup" = callPackage
@@ -207733,7 +207733,7 @@ self: {
          proto-lens-protoc temporary text
        ];
        description = "Cabal support for codegen with proto-lens";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proto3-suite" = callPackage
@@ -207773,8 +207773,8 @@ self: {
          text transformers turtle vector
        ];
        description = "A low level library for writing out data in the Protocol Buffers wire format";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207798,7 +207798,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "proto3-wire_1_2_0" = callPackage
@@ -207823,8 +207823,8 @@ self: {
          tasty-quickcheck text transformers vector
        ];
        description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "protobuf" = callPackage
@@ -207845,7 +207845,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck text unordered-containers
        ];
        description = "Google Protocol Buffers via GHC.Generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protobuf-native" = callPackage
@@ -207868,8 +207868,8 @@ self: {
          protocol-buffers-fork QuickCheck text utf8-string
        ];
        description = "Protocol Buffers via C++";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207895,7 +207895,7 @@ self: {
          hspec parsec QuickCheck quickcheck-instances split text
        ];
        description = "Simple Protocol Buffers library (proto2)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "protocol" = callPackage
@@ -207906,8 +207906,8 @@ self: {
        sha256 = "16pbhfggw46jdjyljqr6dr0mlzmfhvwmw3lg1s5rp90zg4jgvha0";
        libraryHaskellDepends = [ base freer-indexed singletons ];
        description = "Model distributed system as type-level multi-party protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207925,7 +207925,7 @@ self: {
          directory filepath mtl parsec syb text utf8-string vector
        ];
        description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
@@ -207941,7 +207941,7 @@ self: {
          base bytestring containers protocol-buffers
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -207957,8 +207957,8 @@ self: {
          base bytestring containers protocol-buffers-fork
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207975,8 +207975,8 @@ self: {
          utf8-string
        ];
        description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -207993,7 +207993,7 @@ self: {
          template-haskell text transformers
        ];
        description = "parser and printer for radius protocol packet";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protocol-radius-test" = callPackage
@@ -208010,7 +208010,7 @@ self: {
        ];
        testHaskellDepends = [ base quickcheck-simple ];
        description = "testsuit of protocol-radius haskell package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "protolude" = callPackage
@@ -208029,7 +208029,7 @@ self: {
          mtl mtl-compat stm text transformers transformers-compat
        ];
        description = "A small prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "protolude-lifted" = callPackage
@@ -208043,8 +208043,8 @@ self: {
          async base lifted-async lifted-base protolude
        ];
        description = "Protolude with lifted-base and lifted-async";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208061,8 +208061,8 @@ self: {
          adjunctions base bifunctors comonad compactable containers
          contravariant distributive linear mtl profunctors tagged
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208081,8 +208081,8 @@ self: {
          test-framework-hunit
        ];
        description = "Simple XML templating library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208094,8 +208094,8 @@ self: {
        sha256 = "1kzinhdy622gzg3mzfln15vgi890i2l3lkrgrw0n0yb08r2n53i7";
        libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208116,8 +208116,8 @@ self: {
          unordered-containers wai warp
        ];
        description = "The server for ProveEverywhere";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208136,8 +208136,8 @@ self: {
          time
        ];
        description = "Computations that automatically track data dependencies";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208149,7 +208149,7 @@ self: {
        sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r";
        libraryHaskellDepends = [ base ];
        description = "Make functions consume Proxy instead of undefined";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "proxy" = callPackage
@@ -208160,7 +208160,7 @@ self: {
        sha256 = "1465mvkdq9cv202sj2hiwa8a2a07906dww2msan235fvkrnhj9jz";
        libraryHaskellDepends = [ base ];
        description = "proxy helpers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "proxy-kindness" = callPackage
@@ -208171,8 +208171,8 @@ self: {
        sha256 = "0wpzj6hnlxvgd7lfd2921mrk97aw7ljf77jry3my97zdapkxz8i7";
        libraryHaskellDepends = [ base tagged ];
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208184,8 +208184,8 @@ self: {
        sha256 = "12lwn64znci7l5l7sa3g7hm0rmnjvykci7k65mz5c2zdwx3zgvdd";
        libraryHaskellDepends = [ base ];
        description = "Mapping of Proxy Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208215,8 +208215,8 @@ self: {
          base containers hspec monad-logger mtl stm
        ];
        description = "Language support for the PureScript programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208241,8 +208241,8 @@ self: {
          tasty-th temporary
        ];
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208256,8 +208256,8 @@ self: {
        editedCabalFile = "1xc7acqd7zss6zd2n43n0kd5qiv1i8m5wlnskrw5sdj7i1ddsrj5";
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208269,7 +208269,7 @@ self: {
        sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9";
        libraryHaskellDepends = [ base template-haskell time ];
        description = "cpp-style built-in macros using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "psi" = callPackage
@@ -208282,7 +208282,7 @@ self: {
          base bytestring deepseq semigroups text
        ];
        description = "Yet another custom Prelude";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "psql-helpers" = callPackage
@@ -208293,7 +208293,7 @@ self: {
        sha256 = "1x0r68mfv56rp87j8ick875wbq3qzkii9ia60amx6xr40x1acg7i";
        libraryHaskellDepends = [ base postgresql-simple ];
        description = "A small collection of helper functions to generate postgresql queries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "psql-utils" = callPackage
@@ -208308,7 +208308,7 @@ self: {
          aeson base hashable postgresql-simple resource-pool time
        ];
        description = "PostgreSQL Simple util tools";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "psqueues" = callPackage
@@ -208333,7 +208333,7 @@ self: {
          hashable mtl PSQueue random unordered-containers
        ];
        description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pstemmer" = callPackage
@@ -208347,7 +208347,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
        description = "A Haskell Implementation of the Porter Stemmer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pthread" = callPackage
@@ -208360,7 +208360,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings for the pthread library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ptr" = callPackage
@@ -208380,7 +208380,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Abstractions for operations on pointers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ptr-poker" = callPackage
@@ -208395,8 +208395,8 @@ self: {
        testHaskellDepends = [ hedgehog numeric-limits rerebase ];
        benchmarkHaskellDepends = [ gauge rerebase ];
        description = "Pointer poking action construction and composition toolkit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208415,7 +208415,7 @@ self: {
          base bytestring hedis optparse-generic pipes pipes-bytestring text
        ];
        description = "Pipe stdin to a redis pub/sub channel";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "publicsuffix" = callPackage
@@ -208430,7 +208430,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -208449,7 +208449,7 @@ self: {
          utf8-string
        ];
        description = "Is a given string a domain suffix?";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "publicsuffixlistcreate" = callPackage
@@ -208466,8 +208466,8 @@ self: {
        ];
        testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
        description = "Create the publicsuffixlist package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208495,8 +208495,8 @@ self: {
          unordered-containers
        ];
        description = "Publishing tools for papers, books, and presentations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208529,8 +208529,8 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "PubNub Haskell SDK";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208549,8 +208549,8 @@ self: {
        ];
        executableHaskellDepends = [ fastcgi ];
        description = "A library for Google/SixApart pubsub hub interaction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208580,8 +208580,8 @@ self: {
          test-framework-quickcheck2 text time vector
        ];
        description = "A CLI assistant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208598,8 +208598,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "pugixml binding";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208623,8 +208623,8 @@ self: {
          pretty random stm utf8-string
        ];
        description = "DrIFT with pugs-specific rules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208638,7 +208638,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pugs-compat" = callPackage
@@ -208657,8 +208657,8 @@ self: {
          syb time unix utf8-string
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208670,8 +208670,8 @@ self: {
        sha256 = "1px8qvz7afws2w8scplxs4zm628anvh5ssbf0ba9hajh686h133i";
        libraryHaskellDepends = [ array base haskell98 ];
        description = "Haskell PCRE binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208683,7 +208683,7 @@ self: {
        sha256 = "0npq49hm17h3p7acmvbg10qkqx74asbk3f6c2rlw7zaa1zhb9r6d";
        libraryHaskellDepends = [ async base containers time ];
        description = "Synchronize actions to a time pulse";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pulse-simple" = callPackage
@@ -208695,7 +208695,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libpulseaudio;};
 
   "pulseaudio" = callPackage
@@ -208709,7 +208709,7 @@ self: {
        libraryHaskellDepends = [ base containers stm unix ];
        librarySystemDepends = [ libpulseaudio ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
@@ -208727,8 +208727,8 @@ self: {
          base mtl regex-tdfa tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Multilingual unsupervised sentence tokenization with Punkt";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208745,7 +208745,7 @@ self: {
          base bytestring cereal encoding HUnit mtl QuickCheck text
        ];
        description = "Encode unicode strings to ascii forms according to RFC 3492";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "puppetresources" = callPackage
@@ -208763,8 +208763,8 @@ self: {
          mtl text
        ];
        description = "A program that displays the puppet resources associated to a node given .pp files.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208783,8 +208783,8 @@ self: {
          base bytestring containers mtl test-simple Unixutils vector
        ];
        description = "Another pure-haskell CDB (Constant Database) implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208796,7 +208796,7 @@ self: {
        sha256 = "1zzravfgxbx07c38pf0p73a9nzjk2pbq3hzfw8v9zkqj95b3l94i";
        libraryHaskellDepends = [ base ];
        description = "Fast Fourier Transform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pure-io" = callPackage
@@ -208809,8 +208809,8 @@ self: {
        editedCabalFile = "04r055y62f46lxhm4wbfmdk115fslw7lapw06r16lzb1l48m0phj";
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208822,8 +208822,8 @@ self: {
        sha256 = "125vnkjx6n7pgflk9iqg7b6daw55a1rdfi9pfgp39ikfcx9vhb3p";
        libraryHaskellDepends = [ base containers ];
        description = "A pure priority queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208842,8 +208842,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Tests for the pure-priority-queue package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208859,7 +208859,7 @@ self: {
        testHaskellDepends = [
          base hspec mono-traversable QuickCheck random-shuffle transformers
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "pure-zlib" = callPackage
@@ -208884,8 +208884,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base base-compat bytestring time ];
        description = "A Haskell-only implementation of zlib / DEFLATE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -208906,7 +208906,7 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "purebred-email" = callPackage
@@ -208933,7 +208933,7 @@ self: {
          tasty-hedgehog tasty-hunit tasty-quickcheck text time
        ];
        description = "types and parser for email messages (including MIME)";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "purescheme-wai-routing-core" = callPackage
@@ -208955,8 +208955,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Simple Routing functions for Wai Applications";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209029,8 +209029,8 @@ self: {
        testToolDepends = [ happy hspec-discover ];
        doCheck = false;
        description = "PureScript Programming Language Compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209051,7 +209051,7 @@ self: {
          base containers hspec hspec-expectations-pretty-diff text
        ];
        description = "Generate PureScript data types from Haskell data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -209068,7 +209068,7 @@ self: {
          base containers directory filepath optparse-applicative text vector
        ];
        description = "A fast alternative to Purescript's `psc-bundle` to be used during development";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "purescript-iso" = callPackage
@@ -209097,8 +209097,8 @@ self: {
          zeromq4-simple
        ];
        description = "Isomorphic trivial data type definitions over JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209121,8 +209121,8 @@ self: {
          optparse-applicative purescript text
        ];
        description = "TypeScript Declaration File (.d.ts) generator for PureScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209139,7 +209139,7 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "A cli client for pursuit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "push-notifications" = callPackage
@@ -209158,8 +209158,8 @@ self: {
          resourcet text time transformers
        ];
        description = "Push notifications for Android and iOS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209183,8 +209183,8 @@ self: {
          tls-extra transformers unordered-containers xml-conduit
        ];
        description = "A server-side library for sending push notifications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209210,8 +209210,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec ];
        description = "Send push notifications to mobile iOS devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209231,8 +209231,8 @@ self: {
          stm text tls tls-extra unordered-containers xml-types
        ];
        description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209251,8 +209251,8 @@ self: {
          unordered-containers xml-conduit yesod
        ];
        description = "A general library for sending/receiving push notif. through dif. services.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209269,7 +209269,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Simple push support for pushbullet";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pushbullet-types" = callPackage
@@ -209285,7 +209285,7 @@ self: {
          time unordered-containers
        ];
        description = "Datatypes used by the Pushbullet APIs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pusher-haskell" = callPackage
@@ -209301,8 +209301,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "A Pusher.com client written in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209324,7 +209324,7 @@ self: {
          aeson base bytestring hspec QuickCheck text unordered-containers
        ];
        description = "Haskell client library for the Pusher Channels HTTP API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pusher-ws" = callPackage
@@ -209343,8 +209343,8 @@ self: {
          unordered-containers websockets wuss
        ];
        description = "Implementation of the Pusher WebSocket protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209370,8 +209370,8 @@ self: {
          transformers unix unordered-containers yaml
        ];
        description = "Tool to synchronize directories with rsync, zfs or git-annex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209392,7 +209392,7 @@ self: {
          base bytestring http-client tasty tasty-hunit text time
        ];
        description = "A Haskell Pushover API library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "putlenses" = callPackage
@@ -209408,8 +209408,8 @@ self: {
          template-haskell transformers
        ];
        description = "Put-based lens library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209441,8 +209441,8 @@ self: {
          tasty tasty-hspec tasty-hunit text yaml
        ];
        description = "Creating graphics for pencil puzzles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209461,8 +209461,8 @@ self: {
          puzzle-draw yaml
        ];
        description = "Creating graphics for pencil puzzles, command line tools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209481,7 +209481,7 @@ self: {
          async base deepseq genvalidity hspec primitive QuickCheck
        ];
        description = "Mutable variable with primitive values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pvd" = callPackage
@@ -209500,8 +209500,8 @@ self: {
        ];
        executableSystemDepends = [ libdevil ];
        description = "A photo viewer daemon application with remote controlling abilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libdevil;};
 
@@ -209525,7 +209525,7 @@ self: {
        ];
        testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ];
        description = "Public Verifiable Secret Sharing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "pwstore-cli" = callPackage
@@ -209546,7 +209546,7 @@ self: {
          test-framework-hunit
        ];
        description = "Command line interface for the pwstore library";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "pwstore-fast" = callPackage
@@ -209561,7 +209561,7 @@ self: {
          base base64-bytestring binary byteable bytestring cryptohash random
        ];
        description = "Secure password storage";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pwstore-purehaskell" = callPackage
@@ -209576,7 +209576,7 @@ self: {
          base base64-bytestring byteable bytestring random SHA
        ];
        description = "Secure password storage, in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "pxsl-tools" = callPackage
@@ -209606,8 +209606,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) python;};
 
@@ -209624,8 +209624,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) python;};
 
@@ -209649,8 +209649,8 @@ self: {
          test-framework-hunit
        ];
        description = "Serialization/deserialization using Python Pickle format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209669,8 +209669,8 @@ self: {
          base doctest lens lens-properties tasty tasty-quickcheck
        ];
        description = "Efficient alternating finger trees";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209684,8 +209684,8 @@ self: {
          base fclabels QuickCheck template-haskell
        ];
        description = "Compile time generation of operation invariance tests for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209702,7 +209702,7 @@ self: {
        executableHaskellDepends = [ base hmatrix ];
        testHaskellDepends = [ base hmatrix linear tasty tasty-hunit ];
        description = "A library for implementing Quantum Algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "qd" = callPackage
@@ -209714,8 +209714,8 @@ self: {
        libraryHaskellDepends = [ base floatshow ];
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {qd = null;};
 
@@ -209727,8 +209727,8 @@ self: {
        sha256 = "0lj5kg0sjkck89phvi239xb2k7hxmxg9dh7yg2df2iaj4c2m2ync";
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209747,8 +209747,8 @@ self: {
        ];
        testHaskellDepends = [ base transformers ];
        description = "Simple prover";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209772,8 +209772,8 @@ self: {
          process simple-sql-parser split sqlite-simple syb text zlib
        ];
        description = "Command line tool qhs, SQL queries on CSV and TSV files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209786,8 +209786,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ qhull ];
        description = "Simple bindings to Qhull, a library for computing convex hulls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) qhull;};
 
@@ -209807,8 +209807,8 @@ self: {
          tasty-quickcheck text time
        ];
        description = "A simple QIF file format parser / printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209829,8 +209829,8 @@ self: {
          template-haskell
        ];
        description = "Typesafe library for linear algebra";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209847,7 +209847,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Implementation of interpolated multiline strings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "qnap-decrypt" = callPackage
@@ -209878,7 +209878,7 @@ self: {
          temporary utf8-string
        ];
        description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "qq-literals" = callPackage
@@ -209892,7 +209892,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base network-uri template-haskell ];
        description = "Compile-time checked literal values via QuasiQuoters";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "qr-imager" = callPackage
@@ -209911,8 +209911,8 @@ self: {
        libraryPkgconfigDepends = [ qrencode ];
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) qrencode;};
 
@@ -209932,8 +209932,8 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring ];
        description = "Library to generate QR codes from bytestrings and objects and scale image files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -209946,7 +209946,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers mtl vector ];
        description = "QR Code library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "qrcode-core" = callPackage
@@ -209962,7 +209962,7 @@ self: {
          text vector
        ];
        description = "QR code library in pure Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "qrcode-juicypixels" = callPackage
@@ -209978,7 +209978,7 @@ self: {
          vector
        ];
        description = "Converts a qrcode-core image to JuicyPixels";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "qsem" = callPackage
@@ -209989,8 +209989,8 @@ self: {
        sha256 = "1y9c22jr0frflgzmpzpz4d7zgcz7wbql8xwr6bx912rh6gm4gx9h";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "quantity semaphores";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210008,7 +210008,7 @@ self: {
        ];
        description = "Qt bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {qtc_core = null; qtc_gui = null; qtc_network = null; 
          qtc_opengl = null; qtc_script = null; qtc_tools = null;};
 
@@ -210024,8 +210024,8 @@ self: {
        libraryHaskellDepends = [ base process qtah-generator ];
        librarySystemDepends = [ qtbase ];
        description = "Qt bindings for Haskell - C++ library";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
@@ -210043,8 +210043,8 @@ self: {
          base binary bytestring containers filepath hoppy-runtime qtah-qt5
        ];
        description = "Example programs for Qtah Qt bindings";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210067,8 +210067,8 @@ self: {
        ];
        doHaddock = false;
        description = "Generator for Qtah Qt bindings";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210088,8 +210088,8 @@ self: {
        libraryToolDepends = [ qtbase ];
        testHaskellDepends = [ base hoppy-runtime HUnit ];
        description = "Qt bindings for Haskell";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
@@ -210103,7 +210103,7 @@ self: {
          aeson attoparsec base http-types mtl text
        ];
        description = "Convenience parser combinators for URI query strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quadratic-irrational" = callPackage
@@ -210123,7 +210123,7 @@ self: {
          tasty tasty-quickcheck
        ];
        description = "An implementation of quadratic irrationals";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quandl-api" = callPackage
@@ -210140,7 +210140,7 @@ self: {
          text time time-locale-compat unordered-containers
        ];
        description = "Quandl.com API library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quantfin" = callPackage
@@ -210159,8 +210159,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Quant finance library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210179,8 +210179,8 @@ self: {
          unordered-containers vector
        ];
        description = "Rage against the quantification";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210201,7 +210201,7 @@ self: {
          regex-compat
        ];
        description = "Unit conversion and manipulation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quantum-arrow" = callPackage
@@ -210213,7 +210213,7 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210236,8 +210236,8 @@ self: {
        executableHaskellDepends = [ base haskeline mtl ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Retrieve, store and manage real quantum random data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210259,8 +210259,8 @@ self: {
          servant-server stm text time uuid wai wai-extra warp warp-tls
        ];
        description = "Coronavirus quarantine timer web app for your things";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210279,8 +210279,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Quite Useless DB";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210303,8 +210303,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Quenya verb conjugator";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210324,8 +210324,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210342,8 +210342,8 @@ self: {
          unordered-containers
        ];
        description = "Demo package containing queryparser examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210363,8 +210363,8 @@ self: {
          text unordered-containers yaml
        ];
        description = "Parsing for Hive SQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210384,8 +210384,8 @@ self: {
          text unordered-containers yaml
        ];
        description = "Parsing for Presto SQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210405,8 +210405,8 @@ self: {
          text unordered-containers yaml
        ];
        description = "Parsing for Vertica SQL queries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210425,7 +210425,7 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from query strings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "questioner" = callPackage
@@ -210440,8 +210440,8 @@ self: {
          ansi-terminal base readline terminal-size
        ];
        description = "A package for prompting values from the command-line";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210453,7 +210453,7 @@ self: {
        sha256 = "0fx2svkj2sy2wd056lha9h20hy2z6gjspzl11jmv7i3rdwwfr6f7";
        libraryHaskellDepends = [ base stm ];
        description = "Abstraction typeclasses for queue-like things";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "queuelike" = callPackage
@@ -210464,8 +210464,8 @@ self: {
        sha256 = "0nvs9ln55wrczpn948i4z110rbfp0rv2wv8iz94lbyxhilhyjf1z";
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210477,7 +210477,7 @@ self: {
        sha256 = "1bccyvm300bkm3n98ayjc3syfcakjnf26bs2mdqdjimdfw2f0g6n";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generator random test data for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quick-schema" = callPackage
@@ -210496,8 +210496,8 @@ self: {
          vector
        ];
        description = "Slimmed down json schema language and validator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210519,7 +210519,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "quick & easy benchmarking of command-line programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210538,8 +210538,8 @@ self: {
          thyme yaml
        ];
        description = "QuickBooks API binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210556,7 +210556,7 @@ self: {
          base hspec lens QuickCheck template-haskell transformers
        ];
        description = "Generic typeclasses for generating arbitrary ADTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-arbitrary-template" = callPackage
@@ -210573,8 +210573,8 @@ self: {
          tasty-quickcheck template-haskell
        ];
        description = "Generate QuickCheck Gen for Sum Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210587,7 +210587,7 @@ self: {
        libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ];
        testHaskellDepends = [ base hspec ieee754 QuickCheck ];
        description = "HUnit like assertions for QuickCheck";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "quickcheck-classes" = callPackage
@@ -210610,7 +210610,7 @@ self: {
          semigroupoids tagged tasty tasty-quickcheck transformers vector
        ];
        description = "QuickCheck common typeclasses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-classes-base" = callPackage
@@ -210626,7 +210626,7 @@ self: {
          QuickCheck tagged transformers
        ];
        description = "QuickCheck common typeclasses from `base`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-combinators" = callPackage
@@ -210636,7 +210636,7 @@ self: {
        version = "0.0.5";
        sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-enum-instances" = callPackage
@@ -210647,7 +210647,7 @@ self: {
        sha256 = "117lpk15z288ad1bzakwf1z0jcdm7w5c0584lzwpgkmgqr3jgzdc";
        libraryHaskellDepends = [ base enum-types QuickCheck ];
        description = "arbitrary instances for small enum types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-higherorder" = callPackage
@@ -210663,7 +210663,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck test-fun ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "QuickCheck extension for higher-order properties";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-instances" = callPackage
@@ -210688,7 +210688,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring QuickCheck ];
        description = "Common quickcheck instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-io" = callPackage
@@ -210699,7 +210699,7 @@ self: {
        sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        description = "Use HUnit assertions as QuickCheck properties";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-poly" = callPackage
@@ -210715,8 +210715,8 @@ self: {
          regex-tdfa
        ];
        description = "Automating QuickCheck for polymorphic and overlaoded properties";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210728,7 +210728,7 @@ self: {
        sha256 = "0hr61w1wpah1p4h87iz17aby53ysa8waqsl0als8b69in0zyv29w";
        libraryHaskellDepends = [ base ];
        description = "QuickCheck properties for standard type classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-property-comb" = callPackage
@@ -210739,8 +210739,8 @@ self: {
        sha256 = "0wqz2amhwf1djbwwdin142mzp94mxbzb12khznijissjdz38knp5";
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Combinators for Quickcheck Property construction and diagnostics";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210752,8 +210752,8 @@ self: {
        sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c";
        libraryHaskellDepends = [ base either QuickCheck transformers ];
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210769,8 +210769,8 @@ self: {
          base containers QuickCheck regex-genex regex-tdfa
        ];
        description = "Generate regex-constrained strings for QuickCheck";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210786,8 +210786,8 @@ self: {
          base hxt hxt-relaxng QuickCheck quickcheck-regex
        ];
        description = "Generate RelaxNG-constrained XML documents for QuickCheck";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210800,8 +210800,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck rematch ];
        testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        description = "QuickCheck support for rematch";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210817,8 +210817,8 @@ self: {
          base lens QuickCheck template-haskell th-printf
        ];
        description = "Customizable reports for quickcheck properties";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210832,7 +210832,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory process QuickCheck ];
        description = "Automated test tool for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-simple" = callPackage
@@ -210843,7 +210843,7 @@ self: {
        sha256 = "0ah32y1p39p3d0696zp4mlf4bj67ggh73sb8nvf21snkwll86dai";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Test properties and default-mains for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickcheck-special" = callPackage
@@ -210856,7 +210856,7 @@ self: {
        editedCabalFile = "1whwmij115vw0qwkzlkc4z4yhj7iwwqjhf5aaxn5np0gh2gzihb3";
        libraryHaskellDepends = [ base QuickCheck special-values ];
        description = "Edge cases and special values for QuickCheck Arbitrary instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-state-machine" = callPackage
@@ -210893,8 +210893,8 @@ self: {
          tree-diff unliftio unliftio-core vector wai warp
        ];
        description = "Test monadic programs using state machine based models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210918,8 +210918,8 @@ self: {
          strict tasty tasty-quickcheck temporary
        ];
        description = "Test monadic programs using state machine based models";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210936,8 +210936,8 @@ self: {
          base QuickCheck tasty tasty-quickcheck text
        ];
        description = "Helper to build generators with Text.StringRandom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210950,7 +210950,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring QuickCheck text ];
        testHaskellDepends = [ base bytestring QuickCheck text ];
        description = "Alternative arbitrary instance for Text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-transformer" = callPackage
@@ -210961,7 +210961,7 @@ self: {
        sha256 = "0al0p44qi9j829zcnv43kqf4pxaxr6fb48vkq1an15hdk6svx11j";
        libraryHaskellDepends = [ base QuickCheck random transformers ];
        description = "A GenT monad transformer for QuickCheck library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickcheck-unicode" = callPackage
@@ -210972,7 +210972,7 @@ self: {
        sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generator and shrink functions for testing Unicode-related software";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "quickcheck-webdriver" = callPackage
@@ -210983,8 +210983,8 @@ self: {
        sha256 = "12jkj8jy4f0mix658pd8jfgwx268fs3bbqz90mac1vvag4c72i0h";
        libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        description = "Utilities for using WebDriver with QuickCheck";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -210996,7 +210996,7 @@ self: {
        sha256 = "0shigzw0r59cwa22f56522qfv0lsaq1z2861lgy1lhhclzswr6zg";
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        description = "Get counterexamples from QuickCheck as Haskell values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickjs-hs" = callPackage
@@ -211019,7 +211019,7 @@ self: {
          tasty-quickcheck text unordered-containers vector
        ];
        description = "Wrapper for the QuickJS Javascript Engine";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quicklz" = callPackage
@@ -211036,7 +211036,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "QuickLZ compression for ByteStrings";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "quickpull" = callPackage
@@ -211051,8 +211051,8 @@ self: {
        executableHaskellDepends = [ base directory filepath QuickCheck ];
        testHaskellDepends = [ base directory filepath QuickCheck ];
        description = "Generate Main module with QuickCheck tests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211067,7 +211067,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base doctest QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion random vector ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "quickset" = callPackage
@@ -211078,8 +211078,8 @@ self: {
        sha256 = "0xiw57wi9z567nmp4h0vfcw3sr9dciy29jadn47bvi3q278v7zdy";
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211091,7 +211091,7 @@ self: {
        sha256 = "1aa56ng45la91kd40hvqmg5mdprmw7mdgg0zjfz0l71qg2yka14a";
        libraryHaskellDepends = [ aeson attoparsec base bytestring text ];
        description = "Quick JSON extractions with Aeson";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickspec" = callPackage
@@ -211109,7 +211109,7 @@ self: {
          twee-lib uglymemo
        ];
        description = "Equational laws for free!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quickterm" = callPackage
@@ -211127,7 +211127,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "An interface for describing and executing terminal applications";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "quicktest" = callPackage
@@ -211142,8 +211142,8 @@ self: {
          base directory haskell98 mtl process
        ];
        description = "A reflective batch tester for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211162,8 +211162,8 @@ self: {
          servant-server text warp
        ];
        description = "A quick webapp generator for any file processing tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211176,7 +211176,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Generic deriving of Read/Show with no record labels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "quipper" = callPackage
@@ -211192,8 +211192,8 @@ self: {
        ];
        doHaddock = false;
        description = "Meta-package for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211217,8 +211217,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A set of algorithms implemented in Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211234,8 +211234,8 @@ self: {
        ];
        doHaddock = false;
        description = "Meta-package for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211247,8 +211247,8 @@ self: {
        sha256 = "0kj7836h61h13kw4k74wfa96pr0w12k32mmmy0ry43wmk56zy318";
        libraryHaskellDepends = [ base Cabal process quipper-language ];
        description = "Some functions to aid in the creation of Cabal packages for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211264,8 +211264,8 @@ self: {
          base containers mtl primes random template-haskell
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211286,8 +211286,8 @@ self: {
        ];
        doHaddock = false;
        description = "Miscellaneous code snippets that illustrate various Quipper features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211308,8 +211308,8 @@ self: {
        ];
        executableHaskellDepends = [ base process ];
        description = "Quipper, an embedded functional programming language for quantum computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211332,8 +211332,8 @@ self: {
          quipper-utils random
        ];
        description = "The standard libraries for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211350,8 +211350,8 @@ self: {
          quipper-core random template-haskell unix
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211373,8 +211373,8 @@ self: {
        ];
        doHaddock = false;
        description = "Miscellaneous stand-alone tools for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211391,8 +211391,8 @@ self: {
          base containers mtl newsynth process random template-haskell unix
        ];
        description = "Utility libraries for Quipper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211404,8 +211404,8 @@ self: {
        sha256 = "1gg02lnrd2c1wq8zhbj8n355v23ijzm5nj0jyply91sppjma9w7x";
        libraryHaskellDepends = [ base mmorph transformers ];
        description = "Quiver finite stream processing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211422,8 +211422,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck quiver transformers ];
        description = "Binary serialisation support for Quivers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211435,8 +211435,8 @@ self: {
        sha256 = "1iwp6z76n2iramd21l2j9gvsqzq3j90qprblscp1yvk73fq4vcmz";
        libraryHaskellDepends = [ base bytestring quiver ];
        description = "Quiver combinators for bytestring streaming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211448,8 +211448,8 @@ self: {
        sha256 = "0l8c5vhhbjlijvx27mda62y6sq6lr7irva6c47fhvf26zfgx41p8";
        libraryHaskellDepends = [ base data-cell quiver ];
        description = "Quiver combinators for cellular data processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211465,8 +211465,8 @@ self: {
          base bytestring data-cell quiver quiver-bytestring
        ];
        description = "Quiver combinators for cellular CSV data processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211478,8 +211478,8 @@ self: {
        sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp";
        libraryHaskellDepends = [ base enumerator quiver ];
        description = "Bridge between Quiver and Iteratee paradigms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211492,8 +211492,8 @@ self: {
        libraryHaskellDepends = [ base dlist quiver ];
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Group and chunk values within a Quiver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211511,8 +211511,8 @@ self: {
          base bytestring http-client http-client-tls quiver
        ];
        description = "Adapter to stream over HTTP(s) with quiver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211528,8 +211528,8 @@ self: {
          base exceptions quiver resourcet transformers transformers-base
        ];
        description = "Extra instances for Quiver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211542,8 +211542,8 @@ self: {
        libraryHaskellDepends = [ base quiver ];
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Interleave values from multiple Quivers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211567,8 +211567,8 @@ self: {
          quiver-instances resourcet temporary transformers
        ];
        description = "Sort the values in a quiver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211587,8 +211587,8 @@ self: {
          base hspec postgresql-simple raw-strings-qq text
        ];
        description = "Test helpers which help generate data for projects that use postgresql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211613,8 +211613,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit mtl ];
        description = "A Quoridor implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211630,7 +211630,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base template-haskell ];
        description = "Divide without division";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "qux" = callPackage
@@ -211648,8 +211648,8 @@ self: {
          llvm-general mtl optparse-applicative pretty
        ];
        description = "Command line binary for working with the Qux language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211672,7 +211672,7 @@ self: {
          ukrainian-phonetics-basic-array
        ];
        description = "Can be used to calculate the durations of the approximations of the Ukrainian phonemes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "r3x-haskell-sdk" = callPackage
@@ -211698,7 +211698,7 @@ self: {
          aeson base blaze-html bytestring case-insensitive containers cookie
          http-types mtl regex-pcre text transformers wai warp
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "raaz" = callPackage
@@ -211724,8 +211724,8 @@ self: {
          pretty
        ];
        description = "The raaz cryptographic library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211755,8 +211755,8 @@ self: {
        sha256 = "19g2lc3vmnapccdxf390cmkfl9bd3agcn01kk8ccd4lmaqn2c12d";
        libraryHaskellDepends = [ array base containers data-reify ];
        description = "Reverse Automatic Differentiation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211771,8 +211771,8 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        testHaskellDepends = [ base HUnit lens ];
        description = "Isomorphisms for measurements that use radians";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211789,8 +211789,8 @@ self: {
          base Cabal containers hspec lens parsec QuickCheck
        ];
        description = "Chemistry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211806,8 +211806,8 @@ self: {
          base Cabal containers hspec parsec QuickCheck
        ];
        description = "Chemistry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211823,7 +211823,7 @@ self: {
          base binary bytestring cryptonite iproute lens memory
        ];
        description = "Remote Authentication Dial In User Service (RADIUS)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "radix" = callPackage
@@ -211836,8 +211836,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath ];
        description = "Command-line tool for emitting numbers in various bases";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211862,7 +211862,7 @@ self: {
          unordered-containers
        ];
        description = "Radix tree data structive over short byte-strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "radixtree" = callPackage
@@ -211883,7 +211883,7 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base criterion deepseq QuasiText text vector
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rados-haskell" = callPackage
@@ -211906,8 +211906,8 @@ self: {
          async base bytestring criterion mtl transformers
        ];
        description = "librados haskell bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {rados = null;};
 
@@ -211926,8 +211926,8 @@ self: {
          tostring zlib
        ];
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211950,8 +211950,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit process ];
        description = "Compiler and editor for the esolang rail";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211975,8 +211975,8 @@ self: {
          transformers vector
        ];
        description = "Decrypt Ruby on Rails sessions in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -211992,7 +211992,7 @@ self: {
          base bytestring lens QuickCheck terminfo text
        ];
        description = "Print text to terminal with colors and effects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rainbow-tests" = callPackage
@@ -212007,8 +212007,8 @@ self: {
          barecheck base QuickCheck rainbow terminfo text
        ];
        description = "Tests and QuickCheck generators to accompany rainbow";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212028,7 +212028,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "Two-dimensional box pretty printing, with colors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rake" = callPackage
@@ -212069,8 +212069,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "distributed-process node";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212087,8 +212087,8 @@ self: {
          transformers vector zlib
        ];
        description = "Stream based PDF library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212113,8 +212113,8 @@ self: {
          http-types lens req servant-server text warp
        ];
        description = "The Rakuten API in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212134,7 +212134,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Random access lists";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "ral-lens" = callPackage
@@ -212147,7 +212147,7 @@ self: {
        editedCabalFile = "0j7lxlbj2klhcx12xixp3glhbvc9k1pccaiqm2kqr5l3lkrcnirv";
        libraryHaskellDepends = [ base bin fin lens ral ];
        description = "Length-indexed random access lists: lens utilities";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "ral-optics" = callPackage
@@ -212160,7 +212160,7 @@ self: {
        editedCabalFile = "0b2j3iqzbaly8niw3snsmn1z5a34kv4jw8sh3fscsja6zfx0ffgv";
        libraryHaskellDepends = [ base bin fin optics-core ral ];
        description = "Length-indexed random access lists: optics utilities";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "ralist" = callPackage
@@ -212177,8 +212177,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Random access list with a list compatible interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212191,8 +212191,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 ];
        description = "'$' in reverse";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212208,8 +212208,8 @@ self: {
          aeson base bytestring text unordered-containers yaml
        ];
        description = "RESTful API Modeling Language (RAML) library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212223,7 +212223,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "🏰 Determine how intervals relate to each other";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "ramus" = callPackage
@@ -212237,7 +212237,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quickcheck-io ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Elm signal system for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rand-vars" = callPackage
@@ -212248,8 +212248,8 @@ self: {
        sha256 = "165jvx59vzmpxp7gw60ivfka77kgc1irwijikkwja7jb4dm4ay3x";
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212268,8 +212268,8 @@ self: {
          unix
        ];
        description = "Program for picking a random file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212284,8 +212284,8 @@ self: {
          base containers microspec tf-random vector
        ];
        description = "Easy-to-use randomness for livecoding";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212300,7 +212300,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
        description = "random number library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random_1_2_0" = callPackage
@@ -212325,8 +212325,8 @@ self: {
          base gauge mtl rdtsc split splitmix time
        ];
        description = "Pseudo-random number generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "random-access-file" = callPackage
@@ -212348,7 +212348,7 @@ self: {
          vector
        ];
        description = "Random file access methods, supporting application-level page cache";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-access-list" = callPackage
@@ -212359,8 +212359,8 @@ self: {
        sha256 = "1ymbs3f38l6ch0nphsy9pi32yb1a4hazn3grm9fl0dvgqw28xl8r";
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212378,7 +212378,7 @@ self: {
          mwc-random pcg-random primitive random
        ];
        description = "Efficient generation of random bytestrings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "random-class" = callPackage
@@ -212391,7 +212391,7 @@ self: {
        editedCabalFile = "125p09srh4kxj5bnjsl3i2jn4q09ci3kbyb96pb9kmzz1jn4i0rz";
        libraryHaskellDepends = [ base primitive transformers util ];
        description = "Class of random value generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-derive" = callPackage
@@ -212402,8 +212402,8 @@ self: {
        sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p";
        libraryHaskellDepends = [ base random template-haskell ];
        description = "A Template Haskell helper for deriving Random instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212415,8 +212415,8 @@ self: {
        sha256 = "1m28np0zfabp1n1d08przh35bxfr1l7d39kj4a5z61jkchmsaxyf";
        libraryHaskellDepends = [ base extensible-effects random ];
        description = "A simple random generator library for extensible-effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212428,8 +212428,8 @@ self: {
        sha256 = "0p1n5dfdsp00q9mlhd7xcl93k5d0wji91p59858gmfx9xf8j0p0h";
        libraryHaskellDepends = [ base effin random ];
        description = "A simple random generator library for effin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212444,7 +212444,7 @@ self: {
          array base containers random-fu random-source
        ];
        description = "Additional functions for random values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-fu" = callPackage
@@ -212461,7 +212461,7 @@ self: {
          random-source rvar syb template-haskell transformers vector
        ];
        description = "Random number generation";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "random-fu_0_2_7_7" = callPackage
@@ -212478,8 +212478,8 @@ self: {
          random-source rvar syb template-haskell transformers vector
        ];
        description = "Random number generation";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "random-fu-multivariate" = callPackage
@@ -212491,7 +212491,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix mtl random-fu ];
        testHaskellDepends = [ base ];
        description = "Multivariate distributions for random-fu";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-hypergeometric" = callPackage
@@ -212508,8 +212508,8 @@ self: {
          QuickCheck random-fu vector
        ];
        description = "Random variate generation from hypergeometric distributions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212521,7 +212521,7 @@ self: {
        sha256 = "1sj88ccw4pnqlwbga78pvsvzib4irg7xzz4lhqs89xkdz7l043dy";
        libraryHaskellDepends = [ base QuickCheck random safe text ];
        description = "Expose Random and Arbitrary instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "random-shuffle" = callPackage
@@ -212532,7 +212532,7 @@ self: {
        sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j";
        libraryHaskellDepends = [ base MonadRandom random ];
        description = "Random shuffle implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-source" = callPackage
@@ -212549,7 +212549,7 @@ self: {
          primitive random stateref syb template-haskell th-extras
        ];
        description = "Generic basis for random number generators";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "random-source_0_3_0_11" = callPackage
@@ -212566,8 +212566,8 @@ self: {
          primitive random stateref syb template-haskell th-extras
        ];
        description = "Generic basis for random number generators";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "random-stream" = callPackage
@@ -212578,8 +212578,8 @@ self: {
        sha256 = "0q191kz3hmjzrgs143nja5gcis07igb38f51mwqw64zx7vjqvx66";
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212596,7 +212596,7 @@ self: {
          bytestring entropy
        ];
        description = "Generate a random base 16, 58, or 64 string";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-strings" = callPackage
@@ -212611,7 +212611,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base containers mtl QuickCheck ];
        description = "Generate random strings with specific qualities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "random-tree" = callPackage
@@ -212627,7 +212627,7 @@ self: {
          transformers tree-fun
        ];
        description = "Create random trees";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "random-variates" = callPackage
@@ -212647,7 +212647,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory HUnit random ];
        description = "\"Uniform RNG => Non-Uniform RNGs\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "randomgen" = callPackage
@@ -212665,7 +212665,7 @@ self: {
        ];
        executableSystemDepends = [ openssl ];
        description = "A fast, SMP parallel random data generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
   "randproc" = callPackage
@@ -212676,7 +212676,7 @@ self: {
        sha256 = "0fb0239fwvn1n3rbdr03k4kx1igzbb638a1iq0ln1k1i1fpaayd7";
        libraryHaskellDepends = [ base ];
        description = "Data structures and support functions for working with random processes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "randsolid" = callPackage
@@ -212689,7 +212689,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random X11 ];
        description = "Set the background of your root window to a random colour";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "range" = callPackage
@@ -212706,7 +212706,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "An efficient and versatile range library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "range-set-list" = callPackage
@@ -212724,7 +212724,7 @@ self: {
          base containers deepseq hashable tasty tasty-quickcheck
        ];
        description = "Memory efficient sets with ranges of elements";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "range-space" = callPackage
@@ -212744,8 +212744,8 @@ self: {
          test-framework-quickcheck2 time vector-space vector-space-points
        ];
        description = "A Range type with vector-space instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212757,8 +212757,8 @@ self: {
        sha256 = "01n1m3ibi44pjg04mg16j751fjzkspmnq8bzxz55qbyi22wshnwc";
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212770,7 +212770,7 @@ self: {
        sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv";
        libraryHaskellDepends = [ base containers ];
        description = "Ranges and various functions on them";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rank-product" = callPackage
@@ -212788,7 +212788,7 @@ self: {
          base bytestring cassava containers lens optparse-generic vector
        ];
        description = "Find the rank product of a data set";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "rank1dynamic" = callPackage
@@ -212804,7 +212804,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rank2classes" = callPackage
@@ -212825,7 +212825,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "standard type constructor class hierarchy, only with methods of rank 2 types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rapid" = callPackage
@@ -212840,8 +212840,8 @@ self: {
          async base containers foreign-store stm
        ];
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212857,8 +212857,8 @@ self: {
          base clock kan-extensions process transformers unix
        ];
        description = "External terminal support for rapid";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212883,8 +212883,8 @@ self: {
          base eve hspec lens QuickCheck quickcheck-instances text yi-rope
        ];
        description = "A modular text editor";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212904,8 +212904,8 @@ self: {
          rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope
        ];
        description = "Example user config for Rasa";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212920,8 +212920,8 @@ self: {
          base containers data-default lens rasa text
        ];
        description = "Rasa Ext for useful buffer utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212936,8 +212936,8 @@ self: {
          base containers data-default lens rasa text
        ];
        description = "Rasa Ext for running commands";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212953,8 +212953,8 @@ self: {
          base data-default lens mtl rasa text text-lens yi-rope
        ];
        description = "Rasa Ext adding cursor(s)";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212971,8 +212971,8 @@ self: {
          yi-rope
        ];
        description = "Rasa Ext for filesystem actions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -212984,8 +212984,8 @@ self: {
        sha256 = "1wv3bkfq92h7b91x88mzqcijbpb2kh7zkgg4ljxdx59qi4lb7hry";
        libraryHaskellDepends = [ base lens mtl rasa ];
        description = "Rasa Ext for logging state/actions";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213002,8 +213002,8 @@ self: {
          text vty yi-rope
        ];
        description = "Rasa extension for rendering to terminal with vty";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213015,8 +213015,8 @@ self: {
        sha256 = "0grfj3qxlmk63x5cxrbibkhrrgij077f7sr0kj6vcl0np7a5dl98";
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        description = "Rasa Ext for populating status-bar";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213028,8 +213028,8 @@ self: {
        sha256 = "198phwvsndsk149rj744znjzw8w2n0238pbv07d7rfs2c1987s04";
        libraryHaskellDepends = [ base data-default lens rasa ];
        description = "Rasa Ext managing rendering styles";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213046,8 +213046,8 @@ self: {
          yi-rope
        ];
        description = "Rasa Ext managing rendering views";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213066,8 +213066,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Rasa Ext for vim bindings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213096,8 +213096,8 @@ self: {
          tasty-quickcheck vector
        ];
        description = "A command-line client for Reddit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213125,7 +213125,7 @@ self: {
          optparse-applicative Rasterific svg-tree
        ];
        description = "SVG renderer based on Rasterific";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rate-limit" = callPackage
@@ -213136,7 +213136,7 @@ self: {
        sha256 = "0zb19vwzyj1vg890776r3bprmjzhs9kr2r1vqa42nxv9nvwvnljm";
        libraryHaskellDepends = [ base stm time time-units ];
        description = "A basic library for rate-limiting IO actions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ratel" = callPackage
@@ -213154,7 +213154,7 @@ self: {
        ];
        testHaskellDepends = [ base filepath hspec ];
        description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ratel-wai" = callPackage
@@ -213169,7 +213169,7 @@ self: {
          base bytestring case-insensitive containers http-client ratel wai
        ];
        description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ratelimiter" = callPackage
@@ -213187,7 +213187,7 @@ self: {
          base containers extra mtl time timespan vector
        ];
        description = "In-memory rate limiter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rating-chgk-info" = callPackage
@@ -213215,8 +213215,8 @@ self: {
        testHaskellDepends = [ base-noprelude relude ];
        benchmarkHaskellDepends = [ base-noprelude gauge relude ];
        description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213228,7 +213228,7 @@ self: {
        sha256 = "17mqfqvh59vid7sb0vr029az4pn8bb83axf706ngc6i5lir49709";
        libraryHaskellDepends = [ base ];
        description = "Implementations of several rating systems: Elo, Glicko, etc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ratio-int" = callPackage
@@ -213239,7 +213239,7 @@ self: {
        sha256 = "06kqr4iyi184sa8y2vdkw5h0pvh5f8lwcqb8mbcn34lpqm961s7g";
        libraryHaskellDepends = [ base ];
        description = "Fast specialisation of Data.Ratio for Int.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rational-list" = callPackage
@@ -213255,8 +213255,8 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "finite or repeating lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213290,8 +213290,8 @@ self: {
          unix unordered-containers utf8-string
        ];
        description = "Forward build system, with caching and speculation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213315,8 +213315,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring filepath HUnit temporary ];
        description = "Parse and generate Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213337,7 +213337,7 @@ self: {
          aeson base bytestring hspec time unordered-containers
        ];
        description = "Haskell client for Sentry logging service";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "raven-haskell-scotty" = callPackage
@@ -213352,8 +213352,8 @@ self: {
          base bytestring case-insensitive mtl raven-haskell scotty text wai
        ];
        description = "Sentry http interface for Scotty web server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213377,8 +213377,8 @@ self: {
          tasty-th
        ];
        description = "Resource-Aware Feldspar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213391,7 +213391,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base HUnit ];
        description = "Raw string literals for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rawfilepath" = callPackage
@@ -213403,7 +213403,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring ];
        description = "Use RawFilePath instead of FilePath";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "rawr" = callPackage
@@ -213420,8 +213420,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Anonymous extensible records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213433,7 +213433,7 @@ self: {
        sha256 = "1zk82akj2p4hl9hqwr30fixqfkjlpnb02qwhhflvcpv8gnxpg88i";
        libraryHaskellDepends = [ base bytestring template-haskell text ];
        description = "Simple raw string quotation and dictionary interpolation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "raz" = callPackage
@@ -213450,8 +213450,8 @@ self: {
          base containers criterion deepseq MonadRandom random transformers
        ];
        description = "Random Access Zippers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213470,8 +213470,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
        description = "Common text/parsing tools for Razom language packages";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213492,7 +213492,7 @@ self: {
        ];
        description = "RESTful Bitcoin Payment Channel Protocol Servant API description";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bitcoin-payment-protocol = null;};
 
@@ -213508,7 +213508,7 @@ self: {
        executableHaskellDepends = [ base bio bytestring containers ];
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213531,8 +213531,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge mwc-random ];
        description = "Randomized Binary Search Trees";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213556,8 +213556,8 @@ self: {
          base dde hmatrix Learning linear random vector
        ];
        description = "Reservoir Computing, fast RNNs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213573,8 +213573,8 @@ self: {
          base binary bytestring data-binary-ieee754 network QuickCheck split
        ];
        description = "Haskell client for Rserve";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213603,7 +213603,7 @@ self: {
          primitive rdtsc time transformers
        ];
        description = "Read-Copy-Update for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rdf" = callPackage
@@ -213621,7 +213621,7 @@ self: {
          base bytestring criterion deepseq text
        ];
        description = "Representation and Incremental Processing of RDF Data";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rdf4h" = callPackage
@@ -213651,7 +213651,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A library for RDF processing in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rdioh" = callPackage
@@ -213673,8 +213673,8 @@ self: {
          transformers urlencoded
        ];
        description = "A Haskell wrapper for Rdio's API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213686,7 +213686,7 @@ self: {
        sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal";
        libraryHaskellDepends = [ base ];
        description = "Binding for the rdtsc machine instruction";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rdtsc-enolan" = callPackage
@@ -213697,7 +213697,7 @@ self: {
        sha256 = "0v3x7ga4gx5q4gwh8xdhb2arlmjyilr9igz28wysy9qqlcdw775q";
        libraryHaskellDepends = [ base ];
        description = "Binding to sources of high-efficiency, high-precision, monotonically increasing relative time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "re2" = callPackage
@@ -213710,7 +213710,7 @@ self: {
        librarySystemDepends = [ re2 ];
        testHaskellDepends = [ base bytestring HUnit vector ];
        description = "Bindings to the re2 regular expression library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) re2;};
 
   "react-flux" = callPackage
@@ -213728,8 +213728,8 @@ self: {
          unordered-containers
        ];
        description = "A binding to React based on the Flux application architecture for GHCJS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213741,8 +213741,8 @@ self: {
        sha256 = "171q9h2yd78bcwsbhzhggin9wvnwc560vr73zw7abbx2q8aik4q4";
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213760,8 +213760,8 @@ self: {
          unordered-containers void
        ];
        description = "Haskell React bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213779,8 +213779,8 @@ self: {
          aeson aeson-pretty base bytestring scotty time transformers
        ];
        description = "react-tutorial web server";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213795,8 +213795,8 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        executableHaskellDepends = [ base mtl QuickCheck ];
        description = "pluggable pure logic serializable reactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213814,7 +213814,7 @@ self: {
        ];
        description = "Push-pull functional reactive programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reactive-bacon" = callPackage
@@ -213826,8 +213826,8 @@ self: {
        libraryHaskellDepends = [ base old-time stm ];
        testHaskellDepends = [ base containers HUnit old-time stm ];
        description = "FRP (functional reactive programming) framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213849,8 +213849,8 @@ self: {
          reactive-midyim transformers utility-ht
        ];
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213873,8 +213873,8 @@ self: {
          unordered-containers vault
        ];
        description = "Library for functional reactive programming (FRP)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213891,8 +213891,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213908,8 +213908,8 @@ self: {
          base non-empty reactive-banana transformers utility-ht
        ];
        description = "Extend reactive-banana to multiple events per time point";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213926,8 +213926,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Simple reactive programming with GTK GObject Introspection";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213944,8 +213944,8 @@ self: {
          SDL-ttf
        ];
        description = "Reactive Banana bindings for SDL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213958,8 +213958,8 @@ self: {
        libraryHaskellDepends = [ base reactive-banana sdl2 ];
        testHaskellDepends = [ base ];
        description = "Reactive Banana integration with SDL2";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213974,8 +213974,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        description = "Examples for the reactive-banana library, using threepenny-gui";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -213993,8 +213993,8 @@ self: {
          base cabal-macosx reactive-banana wx wxcore
        ];
        description = "Examples for the reactive-banana library, using wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214011,8 +214011,8 @@ self: {
          vector-space
        ];
        description = "Connect Reactive and FieldTrip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214028,8 +214028,8 @@ self: {
          base GLUT old-time OpenGL reactive vector-space
        ];
        description = "Connects Reactive and GLUT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214041,7 +214041,7 @@ self: {
        sha256 = "115zjaymcx1dm7lwdqjq810j664a2kj8phrvjkhfkdsl95srqc85";
        libraryHaskellDepends = [ base ];
        description = "minimal fork of io-reactive";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reactive-io" = callPackage
@@ -214052,7 +214052,7 @@ self: {
        sha256 = "0s7a29cfzb2j5xvqykx1n5naci2np36zjs3qyq0i4yzjf3qprr63";
        libraryHaskellDepends = [ base transformers ];
        description = "IO-oriented FRP library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reactive-jack" = callPackage
@@ -214072,8 +214072,8 @@ self: {
          utility-ht
        ];
        description = "Process MIDI events via reactive-banana and JACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214093,8 +214093,8 @@ self: {
          transformers utility-ht
        ];
        description = "Process MIDI events via reactive-banana";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214111,8 +214111,8 @@ self: {
          base monad-parallel SDL stm transformers
        ];
        description = "Reactive programming via imperative threads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214131,7 +214131,7 @@ self: {
        ];
        description = "An alternate implementation of push-pull FRP";
        license = "GPL";
-       platforms = stdenv.lib.platforms.none;
+       platforms = [ "armv7l-linux" ];
      }) {};
 
   "reactor" = callPackage
@@ -214147,8 +214147,8 @@ self: {
          transformers
        ];
        description = "Reactor - task parallel reactive programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214160,8 +214160,8 @@ self: {
        sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl";
        libraryHaskellDepends = [ base ];
        description = "Class for reading bounded values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214184,8 +214184,8 @@ self: {
        testHaskellDepends = [
          base bytestring containers directory hspec text
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214199,7 +214199,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory process ];
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "read-env-var" = callPackage
@@ -214211,7 +214211,7 @@ self: {
        libraryHaskellDepends = [ base exceptions transformers ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Functions for safely reading environment variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "read-io" = callPackage
@@ -214223,8 +214223,8 @@ self: {
        libraryHaskellDepends = [ base containers directory filepath ];
        testHaskellDepends = [ base containers directory filepath hspec ];
        description = "Read IO library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214245,7 +214245,7 @@ self: {
          aeson base http-conduit optparse-applicative text xml-conduit
        ];
        description = "Extracts text of main article from HTML document";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "readable" = callPackage
@@ -214256,7 +214256,7 @@ self: {
        sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Reading from Text and ByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "readcsv" = callPackage
@@ -214269,7 +214269,7 @@ self: {
        editedCabalFile = "1lcgpdjlv1kaasyhk327cvkw4ar06mr7ks8xrkvxf27njdiv035s";
        libraryHaskellDepends = [ base ];
        description = "Lightweight CSV parser/emitter based on ReadP";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reader-soup" = callPackage
@@ -214286,7 +214286,7 @@ self: {
          transformers transformers-base unliftio-core vinyl
        ];
        description = "Vinyl-based reader-like monad composition";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "readline" = callPackage
@@ -214299,7 +214299,7 @@ self: {
        librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
 
@@ -214311,8 +214311,8 @@ self: {
        sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8";
        libraryHaskellDepends = [ base readline StateVar ];
        description = "Readline with variables (setX/getY) wrapped in state vars";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214334,8 +214334,8 @@ self: {
        executableHaskellDepends = [ base numhask ];
        testHaskellDepends = [ base doctest numhask ];
        description = "Literate programming support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214349,8 +214349,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bliplib parseargs ];
        description = "Read and pretty print Python bytecode (.pyc) files.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214368,8 +214368,8 @@ self: {
          base binary bytestring data-binary-ieee754 filepath monad-loops
        ];
        description = "Code for reading ESRI Shapefiles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214386,7 +214386,7 @@ self: {
          base quickcheck-instances tasty tasty-quickcheck time
        ];
        description = "Tiny library to calculate date considering when your day realy ends";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "really-simple-xml-parser" = callPackage
@@ -214397,8 +214397,8 @@ self: {
        sha256 = "1qmrfisnvm9a25a9ssg4r466yna69vzbwn7s7f4zql28cndg3syy";
        libraryHaskellDepends = [ base parsec ];
        description = "A really simple XML parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214435,8 +214435,8 @@ self: {
          tasty-rerun temporary text vector
        ];
        description = "Animation library based on SVGs";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214462,8 +214462,8 @@ self: {
          tasty-quickcheck tasty-rerun temporary text typed-process vector
        ];
        description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214485,7 +214485,7 @@ self: {
          QuickCheck quickcheck-instances text time
        ];
        description = "Generate Reason types from Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reasonable-lens" = callPackage
@@ -214496,8 +214496,8 @@ self: {
        sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam";
        libraryHaskellDepends = [ base mtl split template-haskell ];
        description = "Lens implementation. It is more small but adequately.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214511,7 +214511,7 @@ self: {
        editedCabalFile = "1ky8nncf441i32hni0090lm5vrh67dqvj99c09c1i58gxjad4gln";
        libraryHaskellDepends = [ base ];
        description = "Just size Operational Monad implementation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rebase" = callPackage
@@ -214532,7 +214532,7 @@ self: {
          transformers unordered-containers uuid vector void
        ];
        description = "A more progressive alternative to the \"base\" package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rebase_1_10_0_1" = callPackage
@@ -214553,8 +214553,8 @@ self: {
          transformers unordered-containers uuid vector vector-instances void
        ];
        description = "A more progressive alternative to the \"base\" package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rebindable" = callPackage
@@ -214565,7 +214565,7 @@ self: {
        sha256 = "0zd1ik544hcfwmxwg0jvfsw6giwkzppf7hb573a9ck0xm6daslp7";
        libraryHaskellDepends = [ base data-default-class indexed ];
        description = "A library to facilitate rebinding of Haskell syntax";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "recaptcha" = callPackage
@@ -214576,7 +214576,7 @@ self: {
        sha256 = "03a3f34lcd387112pfa931wwna58av5yv4jvx4nl0zkryp1p4qd2";
        libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
        description = "Functions for using the reCAPTCHA service in web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recommender-als" = callPackage
@@ -214591,7 +214591,7 @@ self: {
          base containers data-default-class hmatrix parallel random vector
        ];
        description = "Recommendations using alternating least squares algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "record" = callPackage
@@ -214606,8 +214606,8 @@ self: {
          base base-prelude basic-lens template-haskell transformers
        ];
        description = "Anonymous records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214624,8 +214624,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base-prelude hspec record ];
        description = "Instances of \"aeson\" classes for the \"record\" types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214643,7 +214643,7 @@ self: {
        executableHaskellDepends = [ base extra ];
        testHaskellDepends = [ base extra filepath record-hasfield ];
        description = "Preprocessor to allow record.field syntax";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "record-encode" = callPackage
@@ -214659,8 +214659,8 @@ self: {
          base doctest generics-sop hspec QuickCheck vector
        ];
        description = "Generic encoding of records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214684,8 +214684,8 @@ self: {
          test-framework-hunit
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214698,7 +214698,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A version of GHC.Records as available in future GHCs.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "record-preprocessor" = callPackage
@@ -214717,8 +214717,8 @@ self: {
        benchmarkHaskellDepends = [ base-prelude basic-lens record ];
        doHaddock = false;
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214742,8 +214742,8 @@ self: {
          base-prelude conversion conversion-text record text
        ];
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214756,7 +214756,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Alter your records with ease";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "records" = callPackage
@@ -214769,8 +214769,8 @@ self: {
        editedCabalFile = "01ydi3gzgr72z56i1rdq10g4xrfz2f9vz6vn03mp84r74k5zdgrv";
        libraryHaskellDepends = [ base kinds type-functions ];
        description = "A flexible record system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214789,7 +214789,7 @@ self: {
          base deepseq generics-sop hspec should-not-typecheck
        ];
        description = "Record subtyping and record utilities with generics-sop";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "records-th" = callPackage
@@ -214805,8 +214805,8 @@ self: {
          type-functions unordered-containers
        ];
        description = "Template Haskell declarations for the records package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214818,7 +214818,7 @@ self: {
        sha256 = "0k5as7i7xyas6qhpr7wpnnf0rc93nsh4s9gsxdsk72xkwd86chkj";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "A recursion schemes library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recursion-schemes" = callPackage
@@ -214835,7 +214835,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit template-haskell transformers ];
        description = "Representing common recursion patterns as higher-order functions";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "recursion-schemes-ext" = callPackage
@@ -214854,7 +214854,7 @@ self: {
          base criterion deepseq recursion-schemes
        ];
        description = "Amateur addenda to recursion-schemes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recursion-schemes-ix" = callPackage
@@ -214870,7 +214870,7 @@ self: {
          base containers hspec mtl QuickCheck singlethongs
        ];
        description = "Recursion schemes over indexed Functors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recursive-line-count" = callPackage
@@ -214887,7 +214887,7 @@ self: {
          base bytestring containers filepath gtk mtl process
        ];
        description = "Count lines in files and display them hierarchically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "recursors" = callPackage
@@ -214899,8 +214899,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214919,8 +214919,8 @@ self: {
        ];
        doHaddock = false;
        description = "Extensible records and variants indexed by a type-level Red-Black tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214933,7 +214933,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Red Black Trees implemented in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "redHandlers" = callPackage
@@ -214951,7 +214951,7 @@ self: {
        ];
        description = "Monadic HTTP request handlers combinators to build a standalone web apps";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reddit" = callPackage
@@ -214974,8 +214974,8 @@ self: {
          http-client http-client-tls text time transformers yaml
        ];
        description = "Library for interfacing with Reddit's API";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -214992,7 +214992,7 @@ self: {
          old-time utf8-string
        ];
        description = "A driver for Redis key-value database";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "redis-hs" = callPackage
@@ -215003,8 +215003,8 @@ self: {
        sha256 = "1irayxwkdksc9v70g7il7zl7pmkrim2admcgjwcm9inyca7618wg";
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        description = "A simple Redis library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215033,7 +215033,7 @@ self: {
          base bytestring criterion hedis redis-resp tinylog transformers
        ];
        description = "Yet another redis client";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "redis-job-queue" = callPackage
@@ -215044,7 +215044,7 @@ self: {
        sha256 = "1znjmgmlha2adwrmfgbyr10hg0lw99xas610cswf4c9hrbw0gqjy";
        libraryHaskellDepends = [ aeson base bytestring hedis ];
        description = "Simple priority job queue backed by Redis";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "redis-resp" = callPackage
@@ -215061,7 +215061,7 @@ self: {
          double-conversion operational semigroups split transformers
        ];
        description = "REdis Serialization Protocol (RESP) implementation";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "redis-simple" = callPackage
@@ -215072,8 +215072,8 @@ self: {
        sha256 = "0kzs5lc2y40dzx57k0klz0k9zijhi7mh0awi6rzhzd3h5z1gdr43";
        libraryHaskellDepends = [ base binary bytestring redis ];
        description = "Simple redis bindings for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215089,7 +215089,7 @@ self: {
          aeson async base bytestring hashable haxl hedis network time
        ];
        description = "Combine redis caching and haxl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "redland" = callPackage
@@ -215101,8 +215101,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {raptor2 = null; redland = null;};
 
@@ -215120,7 +215120,7 @@ self: {
          base bytestring containers directory filepath process pureMD5
        ];
        description = "software build system, make replacement, implementation of djb's redo";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "reduce-equations" = callPackage
@@ -215145,8 +215145,8 @@ self: {
          text
        ];
        description = "Simplify a set of equations by removing redundancies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215166,7 +215166,7 @@ self: {
          semigroups text transformers unordered-containers
        ];
        description = "Semigroups, specialized containers and a general map/reduce framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reedsolomon" = callPackage
@@ -215193,8 +215193,8 @@ self: {
          base criterion exceptions loop mtl primitive vector
        ];
        description = "Reed-Solomon Erasure Coding in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215208,8 +215208,8 @@ self: {
          base hamid HCodecs stm time vector-space
        ];
        description = "A reimplementation of the Reactive library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215220,7 +215220,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9";
        libraryHaskellDepends = [ base crypto-api ];
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "ref" = callPackage
@@ -215231,8 +215231,8 @@ self: {
        sha256 = "109illgbz4g4a6qavgc4wvyxfjvjhyrxa2gpps67avmr1v90gihr";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215249,7 +215249,7 @@ self: {
          unordered-containers
        ];
        description = "Extra stuff for mutable references";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ref-fd" = callPackage
@@ -215260,7 +215260,7 @@ self: {
        sha256 = "1camr7cv1fglicyp2ivv7qv1yidj36zxcglfvmw7giqdj7r7j5w8";
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ref-mtl" = callPackage
@@ -215271,8 +215271,8 @@ self: {
        sha256 = "0wijkaf3qyp6qjz0cwyhb89z5jrcz792hx8m9a43xrp7v2f84080";
        libraryHaskellDepends = [ base mtl stm transformers ];
        description = "A type class for monads with references compatible with the mtl2 library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215284,7 +215284,7 @@ self: {
        sha256 = "0pq9pm8jsx9w1q81pf5pvc361ad8dbyklw94jq47drr2i0dc7n20";
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "refact" = callPackage
@@ -215295,7 +215295,7 @@ self: {
        sha256 = "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a";
        libraryHaskellDepends = [ base ];
        description = "Specify refactorings to perform with apply-refact";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "refcount" = callPackage
@@ -215316,8 +215316,8 @@ self: {
          unordered-containers
        ];
        description = "Container with element counts";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215329,7 +215329,7 @@ self: {
        sha256 = "1gqbbiwhx5wq1g73m3apwyrrpapqzimincmw2b64fpkkykq66dq1";
        libraryHaskellDepends = [ base stm ];
        description = "A class for references in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "references" = callPackage
@@ -215351,8 +215351,8 @@ self: {
          uniplate
        ];
        description = "Selectors for reading and updating data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215370,8 +215370,8 @@ self: {
          base clippard cmdargs directory filepath haskheap network
        ];
        description = "A command-line tool for pasting to https://www.refheap.com";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215389,7 +215389,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Refinement types with static and runtime checking";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "refined-http-api-data" = callPackage
@@ -215400,8 +215400,8 @@ self: {
        sha256 = "0064cz00lp023kbn5vqpcsgjzsxd5a9s5fl1klsq6jlk1cmi5c0m";
        libraryHaskellDepends = [ base http-api-data refined text ];
        description = "http-api-data instances for refined types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215418,7 +215418,7 @@ self: {
          base checkers exceptions hspec logict mmorph mtl QuickCheck
        ];
        description = "Toolkit for building proof automation systems";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "refinery_0_3_0_0" = callPackage
@@ -215434,8 +215434,8 @@ self: {
          base checkers exceptions hspec logict mmorph mtl QuickCheck
        ];
        description = "Toolkit for building proof automation systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflection" = callPackage
@@ -215450,7 +215450,7 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflection-extras" = callPackage
@@ -215464,8 +215464,8 @@ self: {
          aeson base constraints lens reflection tagged
        ];
        description = "Utilities for the reflection package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215478,7 +215478,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base type-aligned ];
        description = "Efficient free and operational monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflex" = callPackage
@@ -215516,7 +215516,7 @@ self: {
          loch-th mtl primitive process ref-tf split stm time transformers
        ];
        description = "Higher-order Functional Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflex-animation" = callPackage
@@ -215532,8 +215532,8 @@ self: {
          semigroups vector-space
        ];
        description = "Continuous animations support for reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215559,8 +215559,8 @@ self: {
          witherable
        ];
        description = "Reflex bindings for TCP sockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215581,8 +215581,8 @@ self: {
        ];
        executableHaskellDepends = [ base http-types reflex wai ];
        description = "Reflex interface to `wai`";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215603,8 +215603,8 @@ self: {
        ];
        executableHaskellDepends = [ base lens reflex witherable ];
        description = "A basic Reflex host for backend work";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215622,8 +215622,8 @@ self: {
          base bytestring jsaddle-webkit2gtk reflex reflex-dom-core text
        ];
        description = "Functional Reactive Web Apps with Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "reflex-dom-colonnade" = callPackage
@@ -215639,8 +215639,8 @@ self: {
          semigroups text vector
        ];
        description = "Use colonnade with reflex-dom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-dom-contrib" = callPackage
@@ -215658,8 +215658,8 @@ self: {
          string-conv text time transformers
        ];
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-dom-core" = callPackage
@@ -215698,8 +215698,8 @@ self: {
          websockets which
        ];
        description = "Functional Reactive Web Apps with Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {chrome-test-utils = null;};
 
@@ -215718,8 +215718,8 @@ self: {
        ];
        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;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-dom-helpers" = callPackage
@@ -215735,8 +215735,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Html tag helpers for reflex-dom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-dom-pandoc" = callPackage
@@ -215755,7 +215755,7 @@ self: {
          reflex reflex-dom-core safe skylighting text time
        ];
        description = "Render Pandoc documents to HTML using reflex-dom";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflex-dom-retractable" = callPackage
@@ -215770,8 +215770,8 @@ self: {
          base containers jsaddle mtl ref-tf reflex reflex-dom
        ];
        description = "Routing and retractable back button for reflex-dom";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215787,8 +215787,8 @@ self: {
          base containers lens reflex reflex-dom-core safe text
        ];
        description = "Reflex functions for SVG elements";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215811,8 +215811,8 @@ self: {
          these
        ];
        description = "various dynamic containers for Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215824,7 +215824,7 @@ self: {
        sha256 = "0mv17j5g0h7y1ym4563xr1vc0sdvw0g4wdpx0a9aryk3i0k0i4mx";
        libraryHaskellDepends = [ base deepseq reflex ];
        description = "External reference with reactivity support";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reflex-fsnotify" = callPackage
@@ -215839,8 +215839,8 @@ self: {
          base containers directory filepath fsnotify reflex
        ];
        description = "Reflex FRP interface for watching files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215865,8 +215865,8 @@ self: {
          time
        ];
        description = "Interact with a GADT API in your reflex-dom application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215894,8 +215894,8 @@ self: {
          base directory process reflex reflex-process temporary
        ];
        description = "A GHCi widget library for use in reflex applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215921,8 +215921,8 @@ self: {
          reflex text
        ];
        description = "Helper functions to use reflex with gi-gtk";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215938,8 +215938,8 @@ self: {
          base dependent-sum gloss mtl reflex transformers
        ];
        description = "An reflex interface for gloss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215967,8 +215967,8 @@ self: {
          reflex-transformers transformers
        ];
        description = "A simple scene-graph using reflex and gloss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -215985,8 +215985,8 @@ self: {
          template-haskell text
        ];
        description = "Use jsx-like syntax in Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reflex-libtelnet" = callPackage
@@ -216002,8 +216002,8 @@ self: {
          dependent-sum-template lens libtelnet reflex
        ];
        description = "Reflex bindings for libtelnet";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216019,8 +216019,8 @@ self: {
          base jsaddle mtl reflex reflex-external-ref text
        ];
        description = "Localization library for reflex";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216038,8 +216038,8 @@ self: {
          base containers reflex reflex-dom reflex-localize text
        ];
        description = "Helper widgets for reflex-localize";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216055,7 +216055,7 @@ self: {
          base jsaddle mtl reflex reflex-external-ref
        ];
        description = "Utilities to split reflex app to authorized and not authorized contexts";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reflex-orphans" = callPackage
@@ -216071,8 +216071,8 @@ self: {
          base deepseq dependent-map mtl ref-tf reflex tasty tasty-hunit
        ];
        description = "Useful missing instances for Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216098,8 +216098,8 @@ self: {
          process ref-tf reflex unix
        ];
        description = "Reflex FRP interface for running system processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216119,8 +216119,8 @@ self: {
        ];
        executableHaskellDepends = [ base mtl reflex ];
        description = "SDL2 and reflex FRP";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216141,7 +216141,7 @@ self: {
          ref-tf reflex these transformers
        ];
        description = "reflex host methods for testing without external events";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -216156,8 +216156,8 @@ self: {
          base containers lens mtl reflex semigroups stateWriter transformers
        ];
        description = "Collections and switchable Monad transformers for Reflex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216184,8 +216184,8 @@ self: {
          base containers reflex text time transformers vty
        ];
        description = "Reflex FRP host and widgets for VTY applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216197,7 +216197,7 @@ self: {
        sha256 = "0dl0jz5ibcj4vafpf0a0v52rac4nmmif69817g7qgxavc093nq82";
        libraryHaskellDepends = [ base containers mtl semigroups text ];
        description = "reform is a type-safe HTML form generation and validation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-blaze" = callPackage
@@ -216210,7 +216210,7 @@ self: {
          base blaze-html blaze-markup reform text
        ];
        description = "Add support for using blaze-html with Reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-hamlet" = callPackage
@@ -216223,7 +216223,7 @@ self: {
          base blaze-markup reform shakespeare text
        ];
        description = "Add support for using Hamlet with Reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-happstack" = callPackage
@@ -216238,7 +216238,7 @@ self: {
          base bytestring happstack-server mtl random reform text utf8-string
        ];
        description = "Happstack support for reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-hsp" = callPackage
@@ -216249,7 +216249,7 @@ self: {
        sha256 = "1vjbj41yl158h59wcx190jb4s627bhrhcbp21ykn93n4j454kfns";
        libraryHaskellDepends = [ base hsp hsx2hs reform text ];
        description = "Add support for using HSP with Reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reform-lucid" = callPackage
@@ -216260,7 +216260,7 @@ self: {
        sha256 = "1a3jfk0i87vqwxxlspzy44lf2i3bxxxy20pnbysczzf8i113y9zi";
        libraryHaskellDepends = [ base lucid path-pieces reform text ];
        description = "Add support for using lucid with Reform";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reformat" = callPackage
@@ -216271,8 +216271,8 @@ self: {
        sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am";
        libraryHaskellDepends = [ base parsec ];
        description = "The parser and render to parsec and render the string";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216296,8 +216296,8 @@ self: {
          base base-unicode-symbols category gauge hs-functors transformers
        ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216313,8 +216313,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        description = "Environment Monad with automatic resource refreshment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216327,7 +216327,7 @@ self: {
        libraryHaskellDepends = [ aeson base containers text ];
        testHaskellDepends = [ base ];
        description = "Formatted JSON generator for API server inspired by normalizr";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "refurb" = callPackage
@@ -216357,8 +216357,8 @@ self: {
          these these-lens thyme transformers-base vector-space
        ];
        description = "Tools for maintaining a database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216372,8 +216372,8 @@ self: {
        editedCabalFile = "1dzisg5cdb2jrcp6xmkzmgzd00phqhgf1iddlm2c10x49lbqsrld";
        libraryHaskellDepends = [ base ];
        description = "Register allocation API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216397,8 +216397,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        doHaddock = false;
        description = "Register allocation by graph colorization";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216410,7 +216410,7 @@ self: {
        sha256 = "18m8di3syz0r01bq9vpglk5x87sw6y38wqnl8zg3z80i67fzfd4m";
        libraryHaskellDepends = [ base ];
        description = "Types used in register allocation API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex" = callPackage
@@ -216429,7 +216429,7 @@ self: {
          time-locale-compat transformers unordered-containers utf8-string
        ];
        description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-applicative" = callPackage
@@ -216452,7 +216452,7 @@ self: {
          parsers parsers-megaparsec
        ];
        description = "Regex-based parsing with applicative interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "regex-applicative-text" = callPackage
@@ -216465,7 +216465,7 @@ self: {
        editedCabalFile = "1jgmhqhlhj9zhxwikmhiq71fj1900iqiyg6r9l5y7xjk7arwscmi";
        libraryHaskellDepends = [ base regex-applicative text ];
        description = "regex-applicative on text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-base" = callPackage
@@ -216480,7 +216480,7 @@ self: {
          array base bytestring containers mtl text
        ];
        description = "Common \"Text.Regex.*\" API for Regex matching";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-compat" = callPackage
@@ -216493,7 +216493,7 @@ self: {
        editedCabalFile = "1d2k9zj51rhy695vlx6cfcmik6a0yyk5kl6aza7nqsqc6zwhidif";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Replaces/Enhances \"Text.Regex\"";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-compat-tdfa" = callPackage
@@ -216504,7 +216504,7 @@ self: {
        sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
        libraryHaskellDepends = [ array base regex-base regex-tdfa ];
        description = "Unicode Support version of Text.Regex, using regex-tdfa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-deriv" = callPackage
@@ -216521,8 +216521,8 @@ self: {
          hashtables mtl parallel parsec regex-base
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216536,8 +216536,8 @@ self: {
        editedCabalFile = "089gzj8yih2f4ijyk9c49zyq6cws68z2rnklhiww9f3nb75lg6a9";
        libraryHaskellDepends = [ base mtl parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216558,7 +216558,7 @@ self: {
          stringsearch tagged text
        ];
        description = "PCRE wrapper";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "regex-easy" = callPackage
@@ -216573,7 +216573,7 @@ self: {
          array base bytestring regex-pcre string-conversions
        ];
        description = "sugar for regex-pcre";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-examples" = callPackage
@@ -216608,7 +216608,7 @@ self: {
          utf8-string
        ];
        description = "Tutorial, tests and example programs for regex";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-generator" = callPackage
@@ -216626,8 +216626,8 @@ self: {
          base bytestring hspec HUnit random regex-pcre
        ];
        description = "Generate a random string from a PCRE";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216647,7 +216647,7 @@ self: {
        executableHaskellDepends = [ base containers mtl regex-tdfa sbv ];
        description = "From a regex, generate all possible strings it can match";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "regex-parsec" = callPackage
@@ -216660,8 +216660,8 @@ self: {
        editedCabalFile = "19y0kgmqpcz4k0l3cfjbxirq844zqm71gaz7117pm399x8bz1df7";
        libraryHaskellDepends = [ base parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216680,7 +216680,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ pcre ];
        description = "PCRE Backend for \"Text.Regex\" (regex-base)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) pcre;};
 
   "regex-pcre-builtin" = callPackage
@@ -216695,7 +216695,7 @@ self: {
          array base bytestring containers regex-base text
        ];
        description = "PCRE Backend for \"Text.Regex\" (regex-base)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-pcre-text" = callPackage
@@ -216711,8 +216711,8 @@ self: {
          text
        ];
        description = "Text-based PCRE API for regex-base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216729,8 +216729,8 @@ self: {
          parsec regex-base
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216746,7 +216746,7 @@ self: {
          array base bytestring containers regex-base
        ];
        description = "POSIX Backend for \"Text.Regex\" (regex-base)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-posix-clib" = callPackage
@@ -216757,7 +216757,7 @@ self: {
        sha256 = "1y4vmiq1xksxxd84yvyark6axsz51ywb6slswbddlxbdpcpfday7";
        doHaddock = false;
        description = "\"Regex for Windows\" C library";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "regex-posix-unittest" = callPackage
@@ -216775,8 +216775,8 @@ self: {
          array base bytestring containers mtl regex-base regex-posix
        ];
        description = "Unit tests for the plaform's Posix regex library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216798,7 +216798,7 @@ self: {
          text utf8-string
        ];
        description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-tdfa-pipes" = callPackage
@@ -216813,8 +216813,8 @@ self: {
          array base lens monads-tf pipes regex-base regex-tdfa
        ];
        description = "Parse with regular expressions on Producers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216826,8 +216826,8 @@ self: {
        sha256 = "1l0yk2m2k4ybjx3pidcn2xpij9cnyi76ar74llf09vwv764mh36f";
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
        description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216843,8 +216843,8 @@ self: {
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216858,8 +216858,8 @@ self: {
        editedCabalFile = "00swglzmdw30g4bn47z6j71all0djjb2hjm7bkfl7pza4wv14wpv";
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216878,8 +216878,8 @@ self: {
          array base bytestring containers mtl regex-base regex-tdfa
        ];
        description = "Unit tests for the regex-tdfa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216897,8 +216897,8 @@ self: {
          array base bytestring regex-base regex-tdfa utf8-string
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216913,8 +216913,8 @@ self: {
        libraryHaskellDepends = [ base regex-base ];
        librarySystemDepends = [ tre ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tre;};
 
@@ -216926,8 +216926,8 @@ self: {
        sha256 = "02pwls2yfp9y6g7lcfnkxjfbz3h280y9ifqh870bis16fa8dy6gv";
        libraryHaskellDepends = [ base ];
        description = "Type-level regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216946,7 +216946,7 @@ self: {
          unordered-containers
        ];
        description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "regex-wrapper" = callPackage
@@ -216964,8 +216964,8 @@ self: {
          text
        ];
        description = "Types that can only be constructed if they match a regular expression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -216977,8 +216977,8 @@ self: {
        sha256 = "1dmhvnz6sj80kdnm2v7n0lvx8g9arhf9pqqzkn0rwzfhr2by0ss4";
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "A regular expression library for W3C XML Schema regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217034,8 +217034,8 @@ self: {
          base containers derive-trie template-haskell weighted-regexp
        ];
        description = "Regular Expressions on Tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217059,8 +217059,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Regular expressions via symbolic manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217074,8 +217074,8 @@ self: {
          base bytestring pcre-light template-haskell
        ];
        description = "A quasiquoter for PCRE regexes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217090,8 +217090,8 @@ self: {
          base base-unicode-symbols regions transformers
        ];
        description = "Regional memory pointers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217107,8 +217107,8 @@ self: {
          base base-unicode-symbols monad-control transformers
        ];
        description = "Provides the region monad for safely opening and working with scarce resources";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217124,8 +217124,8 @@ self: {
          base-unicode-symbols monads-fd regions transformers
        ];
        description = "Monads-fd instances for the RegionT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217141,8 +217141,8 @@ self: {
          base-unicode-symbols monads-tf regions transformers
        ];
        description = "Monads-tf instances for the RegionT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217154,8 +217154,8 @@ self: {
        sha256 = "1s0sr42k1kmwgmrnj5zcan0j9br8xrrm1vdnj6yhliqdfz41ifc0";
        libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        description = "mtl instances for the RegionT monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217167,8 +217167,8 @@ self: {
        sha256 = "0zsvpsqksms9fh0zwyngb0sm1scffi47ipphgfn7b5m3km9z6cjj";
        libraryHaskellDepends = [ base ];
        description = "A computationally universal register machine implementation at the type-level";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217196,7 +217196,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "data structure for assembling components";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "registry-hedgehog" = callPackage
@@ -217221,8 +217221,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "utilities to work with Hedgehog generators and `registry`";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217234,8 +217234,8 @@ self: {
        sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj";
        libraryHaskellDepends = [ ad base vector ];
        description = "Linear and logistic regression through automatic differentiation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217247,8 +217247,8 @@ self: {
        sha256 = "0f74xwyrnz39cl24kazvk8rd3px2l2ycx6a5jaqlab6wiwi5xclq";
        libraryHaskellDepends = [ base vector ];
        description = "Simple linear and quadratic regression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217262,8 +217262,8 @@ self: {
        editedCabalFile = "0hrr2drpmrsb3jim2lgfx7nx2pvycdvfff51j2v3ihgdy8d8zqrw";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217275,8 +217275,8 @@ self: {
        sha256 = "0x1sbps0ccwpvf6fx1jnbjxylqsvvfzkkynliip9jyh6gkhm44vx";
        libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217292,8 +217292,8 @@ self: {
          applicative-extras base fclabels formlets json mtl regular xhtml
        ];
        description = "Generic programming for the web";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217305,8 +217305,8 @@ self: {
        sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
        libraryHaskellDepends = [ base hxt regular text ];
        description = "Generic generation of HXT XmlPickler instances using Regular";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217322,7 +217322,7 @@ self: {
        testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217340,8 +217340,8 @@ self: {
          base cmdargs parallel-io shelly split system-filepath text
        ];
        description = "Rebuild default.hoo from many .hoo files in the current directory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217359,8 +217359,8 @@ self: {
          attoparsec base bytestring containers directory regex-tdfa split
        ];
        description = "Process lists easily";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217372,8 +217372,8 @@ self: {
        sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Reify records to Maps and back again";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217390,7 +217390,7 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Serialize data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217406,7 +217406,7 @@ self: {
        testHaskellDepends = [ base data-binary-ieee754 hspec loop ];
        benchmarkHaskellDepends = [ base criterion data-binary-ieee754 ];
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "relacion" = callPackage
@@ -217417,8 +217417,8 @@ self: {
        sha256 = "1jq3ii9j8s7q8fr7ac2pdr2l33jvzsyyq70cjd9q1spqa1v6k976";
        libraryHaskellDepends = [ array base containers ];
        description = "A relation data structure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217437,7 +217437,7 @@ self: {
          tasty tasty-hspec text vector
        ];
        description = "Sensible RLP encoding";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "relation" = callPackage
@@ -217455,7 +217455,7 @@ self: {
        ];
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "A data structure representing Relations on Sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-postgresql8" = callPackage
@@ -217472,8 +217472,8 @@ self: {
          relational-query-HDBC template-haskell time transformers
        ];
        description = "PostgreSQL v8.x driver for haskell-relational-record";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217498,7 +217498,7 @@ self: {
          base containers product-isomorphic quickcheck-simple transformers
        ];
        description = "Typeful, Modular, Relational, algebraic query engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-query-HDBC" = callPackage
@@ -217522,7 +217522,7 @@ self: {
          base convertible HDBC QuickCheck quickcheck-simple
        ];
        description = "HDBC instance of relational-query and typed query interface for HDBC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-query-postgresql-pure" = callPackage
@@ -217548,8 +217548,8 @@ self: {
          postgresql-pure relational-query relational-query-HDBC
        ];
        description = "The connector of relational-record and postgresql-pure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217567,7 +217567,7 @@ self: {
          product-isomorphic relational-query relational-query-HDBC
        ];
        description = "Meta package of Relational Record";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-record-examples" = callPackage
@@ -217590,7 +217590,7 @@ self: {
          base product-isomorphic relational-query template-haskell time
        ];
        description = "Examples of Haskell Relationa Record";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relational-schemas" = callPackage
@@ -217606,7 +217606,7 @@ self: {
          template-haskell time
        ];
        description = "RDBMSs' schema templates for relational-query";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relative-date" = callPackage
@@ -217620,8 +217620,8 @@ self: {
          base concatenative datetime mtl parsec time
        ];
        description = "Durations and generalized time parsing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217640,8 +217640,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Automation of Haskell package release process";
-       license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "relevant-time" = callPackage
@@ -217652,8 +217652,8 @@ self: {
        sha256 = "0978g03dlkgx45hxzk3lwl68iln8jnf0hldchac4yqp4c9rsxf22";
        libraryHaskellDepends = [ aeson base chronos text torsor ];
        description = "humanised relevant time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217667,7 +217667,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Bindings to the low-level reliable.io library.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "relit" = callPackage
@@ -217678,7 +217678,7 @@ self: {
        sha256 = "03cnra0yfpijp65p1x0wv4fvc1p1l27lcb00k22ijrcy2mxqr9cg";
        libraryHaskellDepends = [ base regex-base template-haskell ];
        description = "Literal for regular expression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reload" = callPackage
@@ -217713,8 +217713,8 @@ self: {
          websockets
        ];
        description = "A web based Haskell IDE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217736,7 +217736,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge unordered-containers ];
        description = "Safe, performant, user-friendly and lightweight Haskell Standard Library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "remark" = callPackage
@@ -217755,8 +217755,8 @@ self: {
          base GenericPretty tasty tasty-golden tasty-hunit
        ];
        description = "A DSL for marking student work";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217778,8 +217778,8 @@ self: {
          base GenericPretty tasty tasty-golden tasty-hunit
        ];
        description = "A DSL for marking student work";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217792,7 +217792,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "A simple api for matchers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rematch-text" = callPackage
@@ -217804,7 +217804,7 @@ self: {
        libraryHaskellDepends = [ base rematch text ];
        testHaskellDepends = [ base hspec HUnit rematch text ];
        description = "`rematch` matchers for Data.Text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "remote" = callPackage
@@ -217821,8 +217821,8 @@ self: {
          pureMD5 stm syb template-haskell time utf8-string
        ];
        description = "Cloud Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217838,8 +217838,8 @@ self: {
          array base ghc ghc-paths json network
        ];
        description = "Interface to ghci debugger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217864,8 +217864,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Remote Monad implementation of the JSON RPC protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217883,8 +217883,8 @@ self: {
          aeson base lens natural-transformation remote-json wreq
        ];
        description = "Web client wrapper for remote-json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217902,8 +217902,8 @@ self: {
          scotty text transformers warp
        ];
        description = "Web server wrapper for remote-json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217926,8 +217926,8 @@ self: {
          quickcheck-instances tasty tasty-quickcheck
        ];
        description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217960,8 +217960,8 @@ self: {
          system-filepath text time transformers-base
        ];
        description = "A library for client-server applications based on custom protocols";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217977,8 +217977,8 @@ self: {
          base bytestring fmt semigroups text transformers
        ];
        description = "Simple Utf8 wrapper for ByteString Builder with conversion classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -217990,7 +217990,7 @@ self: {
        sha256 = "1idn0jg74wm3ksy5n4jk2dzsij64r1byghr6qc03g4d85n6mmsni";
        libraryHaskellDepends = [ base containers hashable transformers ];
        description = "An API for managing renderable resources";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "reord" = callPackage
@@ -218001,7 +218001,7 @@ self: {
        sha256 = "07lxnfj0q565ydjzgcnb9dhjlrs7s1h6ybam7aic68lfd4p0hr7y";
        libraryHaskellDepends = [ base ];
        description = "Ad-hoc Ord instances";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "reorderable" = callPackage
@@ -218017,7 +218017,7 @@ self: {
        ];
        description = "Define compound types that do not depend on member order";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "repa" = callPackage
@@ -218034,7 +218034,7 @@ self: {
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
        description = "High performance, regular, shape polymorphic parallel arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "repa-algorithms" = callPackage
@@ -218047,8 +218047,8 @@ self: {
        editedCabalFile = "0lvb1sn95qca9m1b8cy0a2j9gjzqm8g5v68ykglffjskv78d0jfm";
        libraryHaskellDepends = [ base repa vector ];
        description = "Algorithms using the Repa array library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218066,8 +218066,8 @@ self: {
          repa-convert repa-eval repa-scalar repa-stream text vector
        ];
        description = "Bulk array representations and operators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218080,8 +218080,8 @@ self: {
        libraryHaskellDepends = [ base repa ];
        doHaddock = false;
        description = "(deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218097,8 +218097,8 @@ self: {
          base bytestring double-conversion primitive repa-scalar text vector
        ];
        description = "Packing and unpacking flat tables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218111,8 +218111,8 @@ self: {
        libraryHaskellDepends = [ base repa transformers ];
        librarySystemDepends = [ libdevil ];
        description = "Support for image reading and writing of Repa arrays using in-place FFI calls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libdevil;};
 
@@ -218124,8 +218124,8 @@ self: {
        sha256 = "13dla66r1k85zibic3291xdwgv8hf44z9i6814p14xk8cqgbj9an";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Low-level parallel operators on bulk random-accessble arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218146,8 +218146,8 @@ self: {
          template-haskell vector
        ];
        description = "Examples using the Repa array library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218168,7 +218168,7 @@ self: {
          base criterion deepseq random repa repa-algorithms
        ];
        description = "Perform fft with repa via FFTW";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "repa-flow" = callPackage
@@ -218186,8 +218186,8 @@ self: {
          vector
        ];
        description = "Data-parallel data flows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218205,7 +218205,7 @@ self: {
          base binary bmp bytestring old-time repa vector
        ];
        description = "Read and write Repa arrays in various formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "repa-linear-algebra" = callPackage
@@ -218216,8 +218216,8 @@ self: {
        sha256 = "18lryk19dfcgq8d09lyc4bchg3gxlr1n8k4m50np2zmhk911n3jn";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        description = "HMatrix operations for Repa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218234,8 +218234,8 @@ self: {
          mtl
        ];
        description = "Data Flow Fusion GHC Plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218253,8 +218253,8 @@ self: {
          base bytestring double-conversion primitive time vector
        ];
        description = "Scalar data types and conversions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218266,8 +218266,8 @@ self: {
        sha256 = "1kldz4d4cv0vliqw78ywbcfgh0mw4i5cd93j0jdagvhsbhlxlp5k";
        libraryHaskellDepends = [ base ghc ghc-prim vector ];
        description = "Series Expressionss API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218286,7 +218286,7 @@ self: {
          base directory filepath hsndfile hsndfile-vector repa vector
        ];
        description = "Reading and writing sound files with repa arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "repa-stream" = callPackage
@@ -218297,8 +218297,8 @@ self: {
        sha256 = "0xdsnfmm8pw1daprz609h5qmiz9qdiv7n1zxk0yvxqmfpm3r4kl9";
        libraryHaskellDepends = [ base mtl primitive repa-scalar vector ];
        description = "Stream functions not present in the vector library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218319,7 +218319,7 @@ self: {
        executableHaskellDepends = [ base gloss repa ];
        description = "Provides high-level access to webcams";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218333,8 +218333,8 @@ self: {
          base ghc ghc-paths haskell-src-exts parsec
        ];
        description = "IRC friendly REPL library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218353,7 +218353,7 @@ self: {
          semigroupoids text transformers
        ];
        description = "Toolkit for quickly whipping up config files and command-line interfaces";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "replace-attoparsec" = callPackage
@@ -218368,7 +218368,7 @@ self: {
          attoparsec base bytestring Cabal parsers text
        ];
        description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "replace-megaparsec" = callPackage
@@ -218384,7 +218384,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring Cabal megaparsec text ];
        description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "replica" = callPackage
@@ -218405,8 +218405,8 @@ self: {
          QuickCheck quickcheck-instances template-haskell text wai
          wai-websockets websockets
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218433,8 +218433,8 @@ self: {
        executableHaskellDepends = [ base bytestring hedis-namespace mtl ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218451,7 +218451,7 @@ self: {
        ];
        testHaskellDepends = [ base containers mtl process ];
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "repo-based-blog" = callPackage
@@ -218479,8 +218479,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Blogging module using blaze html for markup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218496,8 +218496,8 @@ self: {
          base base-unicode-symbols dstring random string-combinators
        ];
        description = "Render overloaded expressions to their textual representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218509,7 +218509,7 @@ self: {
        sha256 = "1ypfb65ghjwxzsx525lcqc3f6pdr357lw6c2xgn54d4f3xi6xphj";
        libraryHaskellDepends = [ base containers syb text ];
        description = "Tree representation and pretty-printing of data structures based on SYB";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "representable-functors" = callPackage
@@ -218527,8 +218527,8 @@ self: {
          transformers
        ];
        description = "Representable functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218541,7 +218541,7 @@ self: {
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "This package has been absorbed into profunctor-extras";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "representable-tries" = callPackage
@@ -218559,8 +218559,8 @@ self: {
          semigroups transformers
        ];
        description = "Tries from representations of polynomial functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218575,8 +218575,8 @@ self: {
          base mtl syb syz text transformers uniplate
        ];
        description = "Scrap Your Reprinter";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218589,8 +218589,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec ];
        description = "Define and combine \"materialized\" projections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218624,7 +218624,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        doCheck = false;
        description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "req-conduit" = callPackage
@@ -218648,8 +218648,8 @@ self: {
          base bytestring conduit conduit-extra req resourcet temporary weigh
        ];
        description = "Conduit helpers for the req HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218672,8 +218672,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Provides OAuth2 authentication for use with Req";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218689,8 +218689,8 @@ self: {
        executableHaskellDepends = [ aeson base modern-uri req text ];
        testHaskellDepends = [ base hspec modern-uri req ];
        description = "Provides URI/URL helper functions for use with Req";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218707,8 +218707,8 @@ self: {
          base http-client http-types HUnit lens tasty tasty-hunit wai wreq
        ];
        description = "A local http server to catch the HTTP redirect";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218720,8 +218720,8 @@ self: {
        sha256 = "1aqcsm9a3zd11k7d4nbvxsy7l35fr77z7gyhrl7rvflnixid29ws";
        libraryHaskellDepends = [ base free mtl transformers ];
        description = "A transformer for generic requests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218753,7 +218753,7 @@ self: {
          mtl optparse-generic relude text
        ];
        description = "Scrap your qualified import clutter";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "requirements" = callPackage
@@ -218764,7 +218764,7 @@ self: {
        sha256 = "1s0s3p0dy07222ks83w3spfw9df33q5lggqv3dw4m9hd5x16a6zi";
        libraryHaskellDepends = [ base ];
        description = "Abstraction to manage user defined Type Errors";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "rere" = callPackage
@@ -218790,7 +218790,7 @@ self: {
          fin parsec vec
        ];
        description = "Regular-expressions extended with fixpoints for context-free powers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rerebase" = callPackage
@@ -218801,7 +218801,7 @@ self: {
        sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rerebase_1_10_0_1" = callPackage
@@ -218812,8 +218812,8 @@ self: {
        sha256 = "0kqcd80a4z1hynmdwb78dzif0iim6gwk9pdzkgzspf8kxir5adf3";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reroute" = callPackage
@@ -218837,7 +218837,7 @@ self: {
          random regex-compat text unordered-containers vector
        ];
        description = "abstract implementation of typed and untyped web routing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rescue" = callPackage
@@ -218868,8 +218868,8 @@ self: {
          transformers-base world-peace
        ];
        description = "More understandable exceptions";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218893,8 +218893,8 @@ self: {
          http-types network process QuickCheck unix warp
        ];
        description = "Reserve reloads web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218906,8 +218906,8 @@ self: {
        sha256 = "0ywskms53cnhyywryvsr6mi9qyba6l6dncpj0hx59k0rdr5nb25h";
        libraryHaskellDepends = [ base containers random ];
        description = "Unweighted reservoir sampling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218919,8 +218919,8 @@ self: {
        sha256 = "1arv9mcbg5xa6vzv6k85mcxdz38x26ipwhk8613qdd94a2hhf8nx";
        libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        description = "High performance variable binders";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218934,8 +218934,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base comfort-array lapack ];
        description = "Compute total resistance of a cube of resistors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -218954,8 +218954,8 @@ self: {
          base bytestring directory filepath tasty tasty-hunit
        ];
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "resolv" = callPackage
@@ -218973,7 +218973,7 @@ self: {
          base bytestring directory filepath tasty tasty-hunit
        ];
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "resolve" = callPackage
@@ -218990,8 +218990,8 @@ self: {
          hslogger iproute network parsec stm stm-containers transformers
        ];
        description = "A name resolusion library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219010,8 +219010,8 @@ self: {
          optparse-applicative process unix
        ];
        description = "Remove trivial conflict markers in a git repository";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219030,8 +219030,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "A port of the package 'resourcet' for extensible effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219045,8 +219045,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring directory ];
        description = "Embed data files via C and FFI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219063,7 +219063,7 @@ self: {
          vector
        ];
        description = "A high-performance striped resource pooling implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "resource-pool-catchio" = callPackage
@@ -219079,8 +219079,8 @@ self: {
          transformers-base vector
        ];
        description = "Fork of resource-pool, with a MonadCatchIO constraint";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219096,7 +219096,7 @@ self: {
          base free kan-extensions monad-control resource-pool transformers
        ];
        description = "A monadic interface for resource-pool";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "resource-simple" = callPackage
@@ -219112,8 +219112,8 @@ self: {
          transformers transformers-base
        ];
        description = "Allocate resources which are guaranteed to be released";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219130,7 +219130,7 @@ self: {
        ];
        testHaskellDepends = [ base exceptions hspec transformers ];
        description = "Deterministic allocation and freeing of scarce resources";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "resourcet-pool" = callPackage
@@ -219141,7 +219141,7 @@ self: {
        sha256 = "1jf6sbyhxrqbkdxiv330rk46kdvbrr0c4pybnm9cmij9wdqs15bd";
        libraryHaskellDepends = [ base resource-pool resourcet ];
        description = "A small library to convert a Pool into an Acquire";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "respond" = callPackage
@@ -219169,8 +219169,8 @@ self: {
          aeson base fast-logger http-types text wai
        ];
        description = "process and route HTTP requests and generate responses on top of WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219192,8 +219192,8 @@ self: {
          transformers-base transformers-compat uri-encode utf8-string
        ];
        description = "Utility library for use in generated API client libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219221,8 +219221,8 @@ self: {
          transformers transformers-compat unordered-containers
        ];
        description = "Rest API library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219245,8 +219245,8 @@ self: {
        ];
        executableHaskellDepends = [ base base-compat rest-gen ];
        description = "Example project for rest";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219274,8 +219274,8 @@ self: {
          test-framework-hunit
        ];
        description = "Documentation and client generation from rest definition";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219293,8 +219293,8 @@ self: {
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
        description = "Rest driver for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219312,8 +219312,8 @@ self: {
          snap-core unordered-containers uri-encode utf8-string
        ];
        description = "Rest driver for Snap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219330,8 +219330,8 @@ self: {
          unordered-containers
        ];
        description = "Maps with stringy keys that can be transcoded to JSON and XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219351,8 +219351,8 @@ self: {
          generic-xmlpickler hxt json-schema rest-stringmap text uuid
        ];
        description = "Silk Rest Framework Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219372,8 +219372,8 @@ self: {
          mime-types mtl rest-core text unordered-containers wai
        ];
        description = "Rest driver for WAI applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219385,8 +219385,8 @@ self: {
        sha256 = "0bar7sy53pylq13wkbb4j3i7y81g6y203njkh9vlid7nh109j409";
        libraryHaskellDepends = [ aeson base bytestring unix ];
        description = "Minimal live coding library for model-view-event-update applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219406,8 +219406,8 @@ self: {
          readable snap snap-core snap-extras template-haskell text time
          time-locale-compat xmlhtml
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219426,7 +219426,7 @@ self: {
          base bytestring containers tasty tasty-hunit temporary text
        ];
        description = "Easy Git repository serialization";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "restricted-workers" = callPackage
@@ -219444,8 +219444,8 @@ self: {
          transformers-base unix
        ];
        description = "Running worker processes under system resource restrictions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219460,8 +219460,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base directory filepath utf8-string ];
        description = "Convert between camel case and separated words style";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219474,7 +219474,7 @@ self: {
        libraryHaskellDepends = [ base bifunctors keys mtl transformers ];
        testHaskellDepends = [ base ];
        description = "Encode success or at least one error";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "resumable-exceptions" = callPackage
@@ -219486,7 +219486,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformer for resumable exceptions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rethinkdb" = callPackage
@@ -219509,8 +219509,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ aeson async base criterion text ];
        description = "A driver for RethinkDB 2.2";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219539,8 +219539,8 @@ self: {
          base criterion text time unordered-containers vector
        ];
        description = "Client driver for RethinkDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219556,8 +219556,8 @@ self: {
          aeson base mtl rethinkdb text transformers unordered-containers
        ];
        description = "Useful tools for modeling data with rethinkdb";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219577,8 +219577,8 @@ self: {
          unordered-containers utf8-string vector
        ];
        description = "RethinkDB driver for Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219607,7 +219607,7 @@ self: {
          syb tasty tasty-hunit temporary text unordered-containers
        ];
        description = "A powerful, easy-to-use codemodding tool for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "retry" = callPackage
@@ -219627,7 +219627,7 @@ self: {
          tasty-hedgehog tasty-hunit time transformers
        ];
        description = "Retry combinators for monadic actions that may fail";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "retryer" = callPackage
@@ -219640,8 +219640,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative process ];
        description = "Retry failed commands";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219656,7 +219656,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base ];
        description = "Reverse State monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "revdectime" = callPackage
@@ -219680,7 +219680,7 @@ self: {
        sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb";
        libraryHaskellDepends = [ base ];
        description = "Standard version of the reverse apply operator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reverse-arguments" = callPackage
@@ -219691,7 +219691,7 @@ self: {
        sha256 = "0f9dz654rqz0yrh1qvl6947ds5pfl2bsy7gnv4i8swlaj1n8dmzi";
        libraryHaskellDepends = [ base ];
        description = "Reverse the arguments of arbitrary functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "reverse-geocoding" = callPackage
@@ -219706,8 +219706,8 @@ self: {
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
        description = "Simple reverse geocoding using OpenStreeMap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219721,8 +219721,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base process ];
        description = "Text-only reversi (aka othelo) game";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219738,8 +219738,8 @@ self: {
          base bytestring directory multiarg process
        ];
        description = "open file and rewrite it with new contents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219759,8 +219759,8 @@ self: {
        ];
        executableHaskellDepends = [ base prettyprinter ];
        description = "Inspection of rewriting steps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219772,8 +219772,8 @@ self: {
        sha256 = "0gnd8awqjnm905m29yldy3z7w7jvilj5svijz63lzmwbjknfh6bs";
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219791,7 +219791,7 @@ self: {
          pcre-light template-haskell
        ];
        description = "A quasi-quoter for typeful results of regex captures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rezoom" = callPackage
@@ -219810,7 +219810,7 @@ self: {
        ];
        description = "Github resume generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219844,8 +219844,8 @@ self: {
          warp wreq
        ];
        description = "Robert Fischer's Common library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219857,8 +219857,8 @@ self: {
        sha256 = "1s3r5wpap3rj7fxx1wvxjk5671jcnllvplz631vagwbyl9p755zh";
        libraryHaskellDepends = [ base envy network rfc-prelude time ];
        description = "Environment variable support from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219876,8 +219876,8 @@ self: {
          rfc-prelude scientific servant-server vector wreq
        ];
        description = "The HTTP client extensions from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219901,8 +219901,8 @@ self: {
          tuple unliftio unliftio-core uuid-types
        ];
        description = "The Prelude from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219919,8 +219919,8 @@ self: {
          rfc-prelude transformers
        ];
        description = "The PostgreSQL extensions from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219932,8 +219932,8 @@ self: {
        sha256 = "00r8mghkgqgf6mh4v5jspahdcpb3bj5i82rmiyasv01a7gp6gzsg";
        libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ];
        description = "The Redis extensions from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219955,8 +219955,8 @@ self: {
          servant-server servant-swagger servant-swagger-ui swagger2 wai wreq
        ];
        description = "The Servant extensions from the Robert Fischer Commons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -219968,7 +219968,7 @@ self: {
        sha256 = "065x5fgsqdi4d5sjd1gridwshag3afdbip1g8qi4jz41xdi2xm38";
        libraryHaskellDepends = [ base network-simple rfc1413-types ];
        description = "rfc1413 server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rfc1413-types" = callPackage
@@ -219981,7 +219981,7 @@ self: {
        editedCabalFile = "1v55q9z4k4c4qb30hmavf3hvwi1i9a351i12ycwzmlj0vv382byk";
        libraryHaskellDepends = [ base bytestring ];
        description = "An rfc1413 parser and response renderer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rfc1751" = callPackage
@@ -219997,7 +219997,7 @@ self: {
          base bytestring cereal hspec QuickCheck vector
        ];
        description = "RFC-1751 library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rfc3339" = callPackage
@@ -220009,7 +220009,7 @@ self: {
        libraryHaskellDepends = [ base timerep ];
        doHaddock = false;
        description = "Parse and display time according to RFC3339 (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rfc5051" = callPackage
@@ -220021,7 +220021,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base text ];
        description = "Simple unicode collation as per RFC5051";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rg" = callPackage
@@ -220040,8 +220040,8 @@ self: {
          vector
        ];
        description = "A dynamic/unbounded alternative to Bounded Enum";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220053,7 +220053,7 @@ self: {
        sha256 = "0vhqw2hylv0228g48b4q81fs0pjgmv68rzlasnz39g6yqddws97c";
        libraryHaskellDepends = [ base ];
        description = "Haskell types for working with RGB colors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rhbzquery" = callPackage
@@ -220073,7 +220073,7 @@ self: {
        ];
        testHaskellDepends = [ base simple-cmd ];
        description = "Bugzilla query tool";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "rhine" = callPackage
@@ -220090,7 +220090,7 @@ self: {
          simple-affine-space time transformers vector-sized
        ];
        description = "Functional Reactive Programming with type-level clocks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rhine-gloss" = callPackage
@@ -220104,7 +220104,7 @@ self: {
        libraryHaskellDepends = [ base dunai gloss rhine transformers ];
        executableHaskellDepends = [ base ];
        description = "Gloss backend for Rhine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rhythm-game-tutorial" = callPackage
@@ -220122,8 +220122,8 @@ self: {
          base call containers lens mtl objective split
        ];
        description = "Haskell rhythm game tutorial";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220157,7 +220157,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
        description = "A Haskell client for the Riak decentralized data store";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "riak-protobuf" = callPackage
@@ -220173,7 +220173,7 @@ self: {
        ];
        description = "Haskell types for the Riak protocol buffer API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "riak-protobuf-lens" = callPackage
@@ -220195,7 +220195,7 @@ self: {
        ];
        description = "Lenses for riak-protobuf";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rib" = callPackage
@@ -220225,8 +220225,8 @@ self: {
          safe-exceptions shake text time wai wai-app-static warp
        ];
        description = "Static site generator based on Shake";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220248,7 +220248,7 @@ self: {
          text time wai wai-app-static warp
        ];
        description = "Static site generator based on Shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ribbit" = callPackage
@@ -220259,8 +220259,8 @@ self: {
        sha256 = "076m5w4w08z8migb0v8vb6lybs06x1bfvxqfi9g633lz464hyi9v";
        libraryHaskellDepends = [ base Only postgresql-simple text time ];
        description = "Type-level Relational DB combinators";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220295,7 +220295,7 @@ self: {
        ];
        description = "api extensions for nvim-hs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ribosome-root" = callPackage
@@ -220327,7 +220327,7 @@ self: {
        ];
        description = "api extensions for nvim-hs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ribosome-test" = callPackage
@@ -220349,7 +220349,7 @@ self: {
        ];
        description = "test helpers for ribosome";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "richreports" = callPackage
@@ -220360,7 +220360,7 @@ self: {
        sha256 = "0mik0m6nziwm6z517wkxdmjp92nh3qz1m8yk3x5897zafgs1y5kk";
        libraryHaskellDepends = [ ascetic base MissingH ];
        description = "Integrated pretty-printing and error/static analysis reporting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ridley" = callPackage
@@ -220388,8 +220388,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "Quick metrics to grow your app strong";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220407,8 +220407,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Handy metrics that don't belong to ridley";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220438,8 +220438,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "A Riemann client for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220458,8 +220458,8 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring filepath ];
        description = "RIFF parser for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220476,7 +220476,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A mid-level wrapper for vega-lite";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ring-buffer" = callPackage
@@ -220490,8 +220490,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl primitive vector ];
        testHaskellDepends = [ base HUnit QuickCheck vector ];
        description = "A concurrent, mutable ring-buffer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220508,8 +220508,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit primitive QuickCheck ];
        description = "mutable ring buffers with atomic updates in GHC Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220526,7 +220526,7 @@ self: {
          semigroupoids
        ];
        description = "Ring-like objects";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rio" = callPackage
@@ -220552,7 +220552,7 @@ self: {
          unordered-containers vector
        ];
        description = "A standard library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rio-orphans" = callPackage
@@ -220572,7 +220572,7 @@ self: {
          resourcet rio transformers-base
        ];
        description = "Orphan instances for the RIO type in the rio package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rio-prettyprint" = callPackage
@@ -220588,7 +220588,7 @@ self: {
          path rio text
        ];
        description = "Pretty-printing for RIO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "riot" = callPackage
@@ -220608,7 +220608,7 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -220629,7 +220629,7 @@ self: {
        ];
        description = "Ripple payment system library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ripple-federation" = callPackage
@@ -220647,7 +220647,7 @@ self: {
        ];
        description = "Utilities and types to work with the Ripple federation protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "risc-v" = callPackage
@@ -220666,8 +220666,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "RISC-V";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220683,8 +220683,8 @@ self: {
        executableHaskellDepends = [ array base containers mtl pretty ];
        executableToolDepends = [ alex happy ];
        description = "Reduced instruction set i386 simulator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220699,8 +220699,8 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell representation of the RISC-V instruction set architecture";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220721,7 +220721,7 @@ self: {
          unordered-containers vector
        ];
        description = "Parses and renders RISON strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rivers" = callPackage
@@ -220732,8 +220732,8 @@ self: {
        sha256 = "0x7r04mwxwnqckfk865dckml4am11zx80a9k5kc91kz5ikq1ns64";
        libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        description = "Rivers are like Streams, but different";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220747,8 +220747,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
        description = "A project management tool for Haskell applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220760,7 +220760,7 @@ self: {
        sha256 = "0gpvlxrg6m4avxk6zhym20mx7ha2qdjr1dkjzjwsvyk4fhcjk399";
        libraryHaskellDepends = [ base postgresql-simple rivet-core text ];
        description = "Rivet migration library postgresql backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rivet-autoimporter" = callPackage
@@ -220773,7 +220773,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
        description = "Database migration library; automatic importer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rivet-core" = callPackage
@@ -220785,7 +220785,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
        description = "Database migration library; core functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rivet-migration" = callPackage
@@ -220796,8 +220796,8 @@ self: {
        sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd";
        libraryHaskellDepends = [ base postgresql-simple text ];
        description = "Postgresql migration support for project management tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220809,8 +220809,8 @@ self: {
        sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf";
        libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        description = "Basic deployment support for project management tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220836,8 +220836,8 @@ self: {
          base containers mtl unordered-containers
        ];
        description = "Collection of Reinforcement Learning algorithms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220860,8 +220860,8 @@ self: {
          network-simple random transformers
        ];
        description = "A Haskell codec for RL-Glue";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220873,7 +220873,7 @@ self: {
        sha256 = "17v8sbgfk1mnm6qfqsnrjcm2nh7i2bibgyr6bh0bic8cfcx0haia";
        libraryHaskellDepends = [ base ];
        description = "Lists with cheap snocs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rlwe-challenges" = callPackage
@@ -220897,8 +220897,8 @@ self: {
        ];
        executableHaskellDepends = [ ansi-terminal base options time ];
        description = "Ring-LWE/LWR challenges using Lol";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220915,8 +220915,8 @@ self: {
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "Restricted monad library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220945,8 +220945,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -220964,7 +220964,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "RNG within an IORef for convenient concurrent use";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rob" = callPackage
@@ -220985,8 +220985,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        testHaskellDepends = [ base directory ];
        description = "Simple projects generator";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221006,8 +221006,8 @@ self: {
          monad-control mtl process resourcet text time unix
        ];
        description = "A build daemon for Haskell development";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221029,7 +221029,7 @@ self: {
          servant-client servant-flatten servant-server string-conversions
        ];
        description = "Automatic session-aware servant testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "robot" = callPackage
@@ -221043,7 +221043,7 @@ self: {
        ];
        description = "Simulate keyboard and mouse events";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "robots-txt" = callPackage
@@ -221062,8 +221062,8 @@ self: {
          transformers
        ];
        description = "Parser for robots.txt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221078,8 +221078,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "ROC online clustering algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221097,8 +221097,8 @@ self: {
          base containers gloss optparse-applicative roc-cluster
        ];
        description = "Gloss interactive demo for roc-cluster package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221118,7 +221118,7 @@ self: {
          vector-sized
        ];
        description = "Implementation of the ROC National ID standard";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rock" = callPackage
@@ -221143,8 +221143,8 @@ self: {
          hashable hedgehog mtl unordered-containers
        ];
        description = "A build system for incremental, parallel, and demand-driven computations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221167,8 +221167,8 @@ self: {
          QuickCheck resourcet temporary transformers
        ];
        description = "Haskell bindings to RocksDB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) rocksdb;};
 
@@ -221189,7 +221189,7 @@ self: {
          string-conversions unliftio
        ];
        description = "Haskell bindings for RocksDB";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) rocksdb;};
 
   "rocksdb-query" = callPackage
@@ -221208,8 +221208,8 @@ self: {
          base cereal data-default hspec rocksdb-haskell-jprupp unliftio
        ];
        description = "RocksDB database querying library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221228,7 +221228,7 @@ self: {
        ];
        description = "Sci-fi roguelike game. Client application.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "roguestar-engine" = callPackage
@@ -221249,7 +221249,7 @@ self: {
        ];
        description = "Sci-fi roguelike game. Backend.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "roguestar-gl" = callPackage
@@ -221267,7 +221267,7 @@ self: {
        ];
        description = "Sci-fi roguelike game. Client library.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "roguestar-glut" = callPackage
@@ -221281,7 +221281,7 @@ self: {
        executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
        description = "Sci-fi roguelike game. GLUT front-end.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "roku-api" = callPackage
@@ -221296,8 +221296,8 @@ self: {
          base bytestring http-client network text xml xml-extractors
        ];
        description = "Bindings to Roku's External Control API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221309,7 +221309,7 @@ self: {
        sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2";
        libraryHaskellDepends = [ base containers ];
        description = "Composable class-based roles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rollbar" = callPackage
@@ -221325,8 +221325,8 @@ self: {
          network resourcet text vector
        ];
        description = "error tracking through rollbar.com";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221344,8 +221344,8 @@ self: {
        executableHaskellDepends = [ base rollbar-client ];
        testHaskellDepends = [ base ];
        description = "Simple CLI tool to perform commons tasks such as tracking deploys";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221369,8 +221369,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Core library to communicate with Rollbar API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221393,8 +221393,8 @@ self: {
          QuickCheck text unordered-containers
        ];
        description = "Core Rollbar data types and APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221419,8 +221419,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Provides error reporting capabilities to WAI based applications through Rollbar API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221442,8 +221442,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Provides error reporting capabilities to Yesod applications through Rollbar API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221464,8 +221464,8 @@ self: {
          base optparse-applicative random regex-applicative
        ];
        description = "Playing with applicatives and dice!";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221477,7 +221477,7 @@ self: {
        sha256 = "1l39dlq8pn38b48iwqgrnh83h74qkmm34l5m9a0rbg76s2z04c43";
        libraryHaskellDepends = [ base stm ];
        description = "Bounded channel for STM that discards old entries when full";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "roman-numerals" = callPackage
@@ -221490,7 +221490,7 @@ self: {
          base base-unicode-symbols bytestring text
        ];
        description = "Parsing and pretty printing of Roman numerals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "romkan" = callPackage
@@ -221507,7 +221507,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Japanese Romaji <-> Japanese Kana conversion library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ron" = callPackage
@@ -221526,7 +221526,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ];
        description = "RON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ron-rdt" = callPackage
@@ -221542,8 +221542,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Replicated Data Types (RON-RDT)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221561,8 +221561,8 @@ self: {
          ron-rdt template-haskell text transformers
        ];
        description = "RON-Schema";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221580,8 +221580,8 @@ self: {
          mtl network-info ron ron-rdt stm text tf-random transformers
        ];
        description = "RON Storage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221593,7 +221593,7 @@ self: {
        sha256 = "0xzsz4w153mbkkkv07558xkv83fph4g98hvjf6iljwvbbp47l0j9";
        libraryHaskellDepends = [ base tagged ];
        description = "Root-finding algorithms (1-dimensional)";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "rope" = callPackage
@@ -221606,8 +221606,8 @@ self: {
          base bytestring fingertree mtl utf8-string
        ];
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221624,7 +221624,7 @@ self: {
          base QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Ropes optimised for updating using UTF-16 code units and row/column pairs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rosa" = callPackage
@@ -221644,7 +221644,7 @@ self: {
          wreq
        ];
        description = "Query the namecoin blockchain";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "rose" = callPackage
@@ -221658,7 +221658,7 @@ self: {
        libraryHaskellDepends = [ base comonad free indexed-traversable ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "rose trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rose-trees" = callPackage
@@ -221686,8 +221686,8 @@ self: {
          unordered-containers witherable
        ];
        description = "Various trie implementations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221703,8 +221703,8 @@ self: {
          base containers deepseq minilens mtl transformers
        ];
        description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221720,8 +221720,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Common rose tree/forest functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221733,7 +221733,7 @@ self: {
        sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc";
        libraryHaskellDepends = [ base containers ];
        description = "Generic zipper implementation for Data.Tree";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "roshask" = callPackage
@@ -221765,8 +221765,8 @@ self: {
          filepath mtl pureMD5 tasty tasty-hunit testpack transformers
        ];
        description = "Haskell support for the ROS robotics framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221784,8 +221784,8 @@ self: {
          lens-family-core pureMD5 template-haskell text
        ];
        description = "ROS message parser, render, TH";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221803,8 +221803,8 @@ self: {
          base filepath monad-logger rosmsg rospkg stack temporary text
        ];
        description = "ROS message management tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221825,7 +221825,7 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
        description = "ROS package system information";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rosso" = callPackage
@@ -221836,8 +221836,8 @@ self: {
        sha256 = "0cz5kqpvq9qjkdy2x3y6aqia3armawjjsnv2pxifl0l6f9hhrvis";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221850,7 +221850,7 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base bytestring hspec QuickCheck text ];
        description = "Fast ROT13 cipher for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rotating-log" = callPackage
@@ -221869,8 +221869,8 @@ self: {
          base bytestring directory filepath time time-locale-compat
        ];
        description = "Size-limited, concurrent, automatically-rotating log writer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221887,7 +221887,7 @@ self: {
          base QuickCheck semigroups tasty tasty-quickcheck
        ];
        description = "A simple round-robin data type";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rounded" = callPackage
@@ -221905,8 +221905,8 @@ self: {
        libraryPkgconfigDepends = [ mpfr ];
        testHaskellDepends = [ base long-double ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
@@ -221931,8 +221931,8 @@ self: {
          array base deepseq fp-ieee gauge primitive vector
        ];
        description = "Directed rounding for built-in floating types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221944,8 +221944,8 @@ self: {
        sha256 = "1d2vaijcna8gwcrhsjpclqw4gjdvdpmnrlyszqzcxnqf0l206a6y";
        libraryHaskellDepends = [ array base numeric-extras ];
        description = "Explicit floating point rounding mode wrappers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221961,7 +221961,7 @@ self: {
          base containers pretty safe template-haskell text xml-types
        ];
        description = "Bidirectional (de-)serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -221981,8 +221981,8 @@ self: {
          aeson base bytestring lens-aeson roundtrip text vector
        ];
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -221994,7 +221994,7 @@ self: {
        sha256 = "1lad64y877rf36dgldkc7qcg5xagjc00z4cf2r1ahamv379df8d7";
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -222015,8 +222015,8 @@ self: {
          text xml-enumerator xml-types
        ];
        description = "Bidirectional (de-)serialization for XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222033,7 +222033,7 @@ self: {
        ];
        description = "Utility to generate routes for use with yesod-routes";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "route-planning" = callPackage
@@ -222051,8 +222051,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "A library and utilities for creating a route";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222069,7 +222069,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        doHaddock = false;
        description = "Row types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "row-types" = callPackage
@@ -222087,7 +222087,7 @@ self: {
        testHaskellDepends = [ base generic-lens ];
        benchmarkHaskellDepends = [ base deepseq gauge ];
        description = "Open Records and Variants";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "rowdy" = callPackage
@@ -222099,7 +222099,7 @@ self: {
        libraryHaskellDepends = [ base containers dlist mtl ];
        testHaskellDepends = [ base containers dlist hspec mtl ];
        description = "An EDSL for web application routes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rowdy-yesod" = callPackage
@@ -222111,7 +222111,7 @@ self: {
        libraryHaskellDepends = [ base rowdy yesod-core ];
        testHaskellDepends = [ base hspec rowdy yesod-core ];
        description = "An EDSL for web application routes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "rowrecord" = callPackage
@@ -222122,8 +222122,8 @@ self: {
        sha256 = "0gcrdy75f0rqfayn37frwcixb086x4s7dygphxhxbpvyl8sjnl0l";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222140,8 +222140,8 @@ self: {
          template-haskell th-lift
        ];
        description = "type safe rpcs provided as basic IO actions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222160,8 +222160,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "a remote procedure call framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222181,8 +222181,8 @@ self: {
          hslogger iproute parsec unix
        ];
        description = "Receiver Policy Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222196,8 +222196,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222222,8 +222222,8 @@ self: {
        ];
        testHaskellDepends = [ base extra hspec simple-cmd unix ];
        description = "Order RPM packages by dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222240,8 +222240,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text ];
        description = "Recurrence rule parser and formatter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222261,8 +222261,8 @@ self: {
          rsagl-math stm Vec Vec-OpenGLRaw
        ];
        description = "The RogueStar Animation and Graphics Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222278,8 +222278,8 @@ self: {
          array arrows base containers mtl old-time random rsagl-math stm
        ];
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222296,8 +222296,8 @@ self: {
          random Vec Vec-OpenGLRaw
        ];
        description = "The RogueStar Animation and Graphics Library: Mathematics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222311,7 +222311,7 @@ self: {
        testHaskellDepends = [ base QuickCheck safe ];
        description = "Range set";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rspp" = callPackage
@@ -222322,8 +222322,8 @@ self: {
        sha256 = "132s7pbm49fgpiq7znr72h52wcmwblljblr0s0krr56593gp2rry";
        libraryHaskellDepends = [ base ];
        description = "A Rational Street Performer Protocol solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222337,8 +222337,8 @@ self: {
        editedCabalFile = "0ql1ffjw0g1sdyz9icin4cq86i5b9ljzhvpivfbbyaipg2nc9z0s";
        libraryHaskellDepends = [ base HaXml network network-uri time ];
        description = "A library for generating RSS 2.0 feeds.";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222369,8 +222369,8 @@ self: {
          tasty-quickcheck text time uri-bytestring xml-conduit xml-types
        ];
        description = "Streaming parser/renderer for the RSS standard";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222394,8 +222394,8 @@ self: {
          text time transformers utf8-string
        ];
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222407,8 +222407,8 @@ self: {
        sha256 = "14l2jww91w993b61xn1m9y9wh27dvy1l1x2fh7g9f0l8mc5a9dpv";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "stream-fusion framework from vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222437,8 +222437,8 @@ self: {
          tasty-hunit tasty-quickcheck text word24
        ];
        description = "Haskell bindings for RTCM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222451,7 +222451,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "dynamic linker tools for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rtlsdr" = callPackage
@@ -222464,8 +222464,8 @@ self: {
        librarySystemDepends = [ rtl-sdr ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to librtlsdr";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rtl-sdr;};
 
   "rtnetlink" = callPackage
@@ -222487,8 +222487,8 @@ self: {
          base bytestring exceptions hspec linux-namespaces socket unix
        ];
        description = "Manipulate network devices, addresses, and routes on Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222505,8 +222505,8 @@ self: {
          mtl network split utf8-string
        ];
        description = "A library for communicating with RTorrent over its XML-RPC interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222527,7 +222527,7 @@ self: {
          QuickCheck temporary utf8-string
        ];
        description = "Parsing and manipulation of rtorrent state file contents";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "rts-loader" = callPackage
@@ -222546,8 +222546,8 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal process ];
        description = "Dynamically load Haskell libraries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222565,8 +222565,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
        description = "Binding to the C++ audio stretching library Rubber Band";
-       license = stdenv.lib.licenses.gpl3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.gpl3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -222584,8 +222584,8 @@ self: {
          base bytestring cereal containers fail hspec mtl string-conv vector
        ];
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222602,8 +222602,8 @@ self: {
          process template-haskell trifecta
        ];
        description = "rubyish quasiquoters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222615,8 +222615,8 @@ self: {
        sha256 = "1id3rpfzqwhnmv2w4p35a70zfanwrpazix27ak1hzaz1jd2yfmz5";
        libraryHaskellDepends = [ array base mtl parsec safe strict Vec ];
        description = "relatively useful fractal functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222638,8 +222638,8 @@ self: {
          smallcheck template-haskell
        ];
        description = "Pliable records";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222658,8 +222658,8 @@ self: {
          base Cabal containers mtl shuffle uhc-util uuagc uuagc-cabal uulib
        ];
        description = "Ruler tool for UHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222678,7 +222678,7 @@ self: {
          uulib
        ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222690,7 +222690,7 @@ self: {
        sha256 = "1ra8rv7cbsj1x8vfd3sbynd7a73v9arfimzcfhg9j6blqcii2i2d";
        libraryHaskellDepends = [ base data-default filepath process ];
        description = "Running newly generated Haskell source module";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "run-st" = callPackage
@@ -222701,8 +222701,8 @@ self: {
        sha256 = "11if8xwv22ry0mxrglg3pcx3cx8ljnq56f3m9vjkr9jcj2881dvf";
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        description = "runST without boxing penalty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222714,8 +222714,8 @@ self: {
        sha256 = "07drd0xvkg06p2fsbncafnr7wzkrs4m6sfs1szbbscggw3pxh4fp";
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222733,7 +222733,7 @@ self: {
          base cmdargs directory filepath old-time process
        ];
        description = "runghc replacement for fast repeated runs";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "runhs" = callPackage
@@ -222752,8 +222752,8 @@ self: {
        ];
        testHaskellDepends = [ base directory hspec process ];
        description = "Stack wrapper for single-file Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222771,8 +222771,8 @@ self: {
          async base bytestring optparse-applicative process stm
        ];
        description = "Run multiple commands, interleaving output and errors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222784,7 +222784,7 @@ self: {
        sha256 = "12fn0lsil0rj0pj0ixzppsdw2fmj0cnzci4fh11z9rcggwbz6pms";
        testHaskellDepends = [ base data-memocombinators time ];
        description = "A simple memoization helper library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "runtime-arbitrary" = callPackage
@@ -222795,8 +222795,8 @@ self: {
        sha256 = "1lb9c174vmbcjpm4y1j2jwngbzx5s0s1iiq8iam5g87h475k2bh1";
        libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ];
        description = "Runtime generation of Arbitrary values";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222814,8 +222814,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "RISC-V";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222831,7 +222831,7 @@ self: {
          base MonadPrompt mtl random-source transformers
        ];
        description = "Random Variables";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "rwlock" = callPackage
@@ -222842,7 +222842,7 @@ self: {
        sha256 = "0isx32ayaqh7vhcyl11ykdy8f1chs1fdw73h3c2r53k989yfkmba";
        libraryHaskellDepends = [ base monad-loops-stm stm syb ];
        description = "Multiple-read / single-write locks";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "rws" = callPackage
@@ -222862,8 +222862,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Packet Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222879,7 +222879,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec text ];
        testHaskellDepends = [ base HUnit parsec QuickCheck text ];
        description = "A flexible, extensible s-expression library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "s-cargot-letbind" = callPackage
@@ -222891,7 +222891,7 @@ self: {
        libraryHaskellDepends = [ base s-cargot text ];
        testHaskellDepends = [ base HUnit parsec s-cargot text ];
        description = "Enables let-binding and let-expansion for s-cargot defined S-expressions";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "s-expression" = callPackage
@@ -222905,8 +222905,8 @@ self: {
        libraryHaskellDepends = [ base derive-monoid lens semigroups ];
        executableHaskellDepends = [ base ];
        description = "simple general-purpose s-expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222928,7 +222928,7 @@ self: {
          case-insensitive cryptohash http-types time utf8-string
        ];
        description = "Pre-signed Amazon S3 URLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe" = callPackage
@@ -222940,7 +222940,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-access" = callPackage
@@ -222951,7 +222951,7 @@ self: {
        sha256 = "13fw3b4sgrqymkq27n0727y5m8d3h6h44lfb9faip98bakr5d8v5";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple environment to control access to data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-buffer-monad" = callPackage
@@ -222966,8 +222966,8 @@ self: {
          base hspec mtl safe-exceptions stm unliftio
        ];
        description = "A monadic buffer resilient to exceptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -222979,8 +222979,8 @@ self: {
        sha256 = "059mn68pj57dvjzmv3vypv0askx02f4hlalbzsr34cn2h7ndw6df";
        libraryHaskellDepends = [ base ];
        description = "A friendly shorthand for an old friend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223000,7 +223000,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Safe and very efficient arithmetic operations on fixed decimal point numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-exceptions" = callPackage
@@ -223014,7 +223014,7 @@ self: {
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
        description = "Safe, consistent, and easy exception handling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safe-exceptions-checked" = callPackage
@@ -223032,7 +223032,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Safe, checked exceptions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-failure" = callPackage
@@ -223043,7 +223043,7 @@ self: {
        sha256 = "102fjardfdf9zy0vyalgq6m1l64356b0a0xaam49j31lqgfldaw7";
        libraryHaskellDepends = [ base failure ];
        description = "Library for safe functions (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-failure-cme" = callPackage
@@ -223056,7 +223056,7 @@ self: {
          base control-monad-exception safe-failure
        ];
        description = "control-monad-exception Instances for safe-failure";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "safe-foldable" = callPackage
@@ -223067,7 +223067,7 @@ self: {
        sha256 = "1l87j0liv0hgdv3f3d4s4962df5q5xcyhmnfz2fj773r1v62wzya";
        libraryHaskellDepends = [ base ];
        description = "Safe wrappers for null-partial Foldable operations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safe-freeze" = callPackage
@@ -223078,8 +223078,8 @@ self: {
        sha256 = "12mqgak0rla20n9b4m6ynx64bwr06njcr849csc0z0r573xw2v33";
        libraryHaskellDepends = [ base indexed mtl vector ];
        description = "Support for safely freezing multiple arrays in the ST monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223091,8 +223091,8 @@ self: {
        sha256 = "0an3hy28fpdw3v5gjx13fbszzp4r2p65l8mgks0pdflscf2cwwv5";
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223117,7 +223117,7 @@ self: {
          temporary text time unordered-containers uuid uuid-types vector
        ];
        description = "Automatic JSON format versioning";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safe-lazy-io" = callPackage
@@ -223131,8 +223131,8 @@ self: {
          base extensible-exceptions parallel strict-io
        ];
        description = "A library providing safe lazy IO features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223150,8 +223150,8 @@ self: {
          base hspec hspec-core QuickCheck should-not-typecheck
        ];
        description = "Tired of accidentally calling length on tuples? Relief at last!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223173,7 +223173,7 @@ self: {
          tasty-hunit tasty-quickcheck text vector-space
        ];
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-aeson" = callPackage
@@ -223190,7 +223190,7 @@ self: {
          text
        ];
        description = "Instances from the aeson library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-cereal" = callPackage
@@ -223207,7 +223207,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Instances from the cereal library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-serialise" = callPackage
@@ -223224,7 +223224,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Instances from the serialise library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-store" = callPackage
@@ -223241,7 +223241,7 @@ self: {
          text
        ];
        description = "Instances from the store library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-money-xmlbf" = callPackage
@@ -223258,7 +223258,7 @@ self: {
          xmlbf
        ];
        description = "Instances from the xmlbf library for the safe-money library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "safe-plugins" = callPackage
@@ -223273,8 +223273,8 @@ self: {
          base directory filepath haskell-src-exts plugins Unixutils
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223294,8 +223294,8 @@ self: {
          th-lift
        ];
        description = "Well-typed, flexible and variadic printf for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223311,7 +223311,7 @@ self: {
          base constraints containers deepseq hmatrix mtl singletons
        ];
        description = "Dependently typed tensor algebra";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safecopy" = callPackage
@@ -223334,7 +223334,7 @@ self: {
          template-haskell time vector
        ];
        description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -223351,8 +223351,8 @@ self: {
          microlens safecopy template-haskell th-abstraction uniplate
        ];
        description = "Making SafeCopy migrations easier";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223376,8 +223376,8 @@ self: {
          template-haskell time vector
        ];
        description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223395,8 +223395,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "overflow-checked Int type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223419,7 +223419,7 @@ self: {
          test-framework-th unix
        ];
        description = "Write output to disk atomically";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "safepath" = callPackage
@@ -223431,8 +223431,8 @@ self: {
        libraryHaskellDepends = [ base text validity ];
        testHaskellDepends = [ base doctest ];
        description = "Safe Paths in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223449,8 +223449,8 @@ self: {
          regional-pointers regions transformers
        ];
        description = "Type-safe file handling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223467,8 +223467,8 @@ self: {
          safer-file-handles transformers
        ];
        description = "Extends safer-file-handles with ByteString operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223484,8 +223484,8 @@ self: {
          explicit-iomodes-text regions safer-file-handles text transformers
        ];
        description = "Extends safer-file-handles with Text operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223497,8 +223497,8 @@ self: {
        sha256 = "00ykmy44paghgc3m731p1hh00zv11416pl2xil4cav7vrr43nb6h";
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "A simple type-safe routing library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223514,8 +223514,8 @@ self: {
          base containers ghc ghc-syb-utils HUnit syb
        ];
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223538,8 +223538,8 @@ self: {
          unordered-containers vector
        ];
        description = "Fast JSON parsing powered by Chad Austin's sajson library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223561,8 +223561,8 @@ self: {
        ];
        executableToolDepends = [ cpphs ];
        description = "Compression command-line tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223583,7 +223583,7 @@ self: {
          aeson base bytestring hspec time unordered-containers
        ];
        description = "Haskell representation of messages exchanged on the sakura.io platform.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "salak" = callPackage
@@ -223612,7 +223612,7 @@ self: {
          base criterion data-default mtl text time
        ];
        description = "Configuration (re)Loader and Parser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "salak-toml" = callPackage
@@ -223634,8 +223634,8 @@ self: {
          base criterion salak text time tomland unordered-containers
        ];
        description = "Configuration Loader for toml";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223657,7 +223657,7 @@ self: {
          base conduit criterion libyaml salak text
        ];
        description = "Configuration Loader for yaml";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "saltine" = callPackage
@@ -223676,7 +223676,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
@@ -223695,8 +223695,8 @@ self: {
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
        description = "Quickcheck implementations for some NaCl data";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libsodium;};
 
@@ -223709,7 +223709,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Semantic version numbers and constraints";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "salvia" = callPackage
@@ -223729,8 +223729,8 @@ self: {
          utf8-string
        ];
        description = "Modular web application framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223753,8 +223753,8 @@ self: {
        ];
        doHaddock = false;
        description = "Demo Salvia servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223775,8 +223775,8 @@ self: {
          transformers utf8-string
        ];
        description = "Collection of non-fundamental handlers for the Salvia web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223793,8 +223793,8 @@ self: {
          utf8-string
        ];
        description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223812,8 +223812,8 @@ self: {
          random safe salvia salvia-protocol stm time utf8-string
        ];
        description = "Session support for the Salvia webserver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223830,8 +223830,8 @@ self: {
          utf8-string
        ];
        description = "Websocket implementation for the Salvia Webserver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223845,7 +223845,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck storable-record ];
        description = "Handling of samples in an (audio) signal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sample-frame-np" = callPackage
@@ -223856,7 +223856,7 @@ self: {
        sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi";
        libraryHaskellDepends = [ base numeric-prelude sample-frame ];
        description = "Orphan instances for types from sample-frame and numericprelude";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sampling" = callPackage
@@ -223873,7 +223873,7 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Sample values from collections";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "samtools" = callPackage
@@ -223888,8 +223888,8 @@ self: {
        librarySystemDepends = [ zlib ];
        libraryToolDepends = [ c2hs ];
        description = "Binding to the C samtools library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -223910,8 +223910,8 @@ self: {
          base bytestring conduit filepath resourcet samtools transformers
        ];
        description = "Conduit interface to SAM/BAM format files through samtools";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223927,8 +223927,8 @@ self: {
          base bytestring enumerator samtools transformers
        ];
        description = "Enumerator interface to SamTools library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223945,8 +223945,8 @@ self: {
          base bytestring iteratee samtools transformers
        ];
        description = "Iteratee interface to SamTools library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223966,7 +223966,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Data encoding library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sandlib" = callPackage
@@ -223977,8 +223977,8 @@ self: {
        sha256 = "07wh6va4rpf6vvxnjqbmwfna3rg20ysjh2pnzylz6xzlayzq0pkx";
        libraryHaskellDepends = [ base ];
        description = "SAND data serialization and manipulation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -223997,8 +223997,8 @@ self: {
          process text unix-compat
        ];
        description = "Manages Cabal sandboxes to avoid rebuilding packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224010,8 +224010,8 @@ self: {
        sha256 = "0x8d5n2mydhwl9h7vzk7nr58b2aym9xb21p4m21rfa6vy6r2n438";
        libraryHaskellDepends = [ base deepseq portaudio ];
        description = "audio library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224039,8 +224039,8 @@ self: {
          network process text unordered-containers vector
        ];
        description = "A universal quickfix toolkit and his protocol";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224057,8 +224057,8 @@ self: {
          simple-pipe
        ];
        description = "SASL implementation using simple-pipe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224073,7 +224073,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CNF SATisfier";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224092,7 +224092,7 @@ self: {
        ];
        description = "A minimal SAT solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224112,7 +224112,7 @@ self: {
        testHaskellDepends = [ array base ];
        description = "SAT encoding monad";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224129,7 +224129,7 @@ self: {
        ];
        description = "driver for external satchmo backends";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224148,7 +224148,7 @@ self: {
        ];
        description = "examples that show how to use satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224165,7 +224165,7 @@ self: {
        ];
        description = "funsat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224178,7 +224178,7 @@ self: {
        libraryHaskellDepends = [ base containers process satchmo ];
        description = "minisat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224194,8 +224194,8 @@ self: {
          array base containers satchmo toysolver
        ];
        description = "toysat driver as backend for satchmo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224214,8 +224214,8 @@ self: {
          unix
        ];
        description = "re-export of the random generators from Hedgehog";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224234,8 +224234,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "Monadic streaming XML parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224255,7 +224255,7 @@ self: {
          base bytestring gauge text transformers unliftio
        ];
        description = "Send textual messages to a Handle in a thread-friendly way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "say-my-name" = callPackage
@@ -224266,7 +224266,7 @@ self: {
        sha256 = "1fc9jgyapdc0rlni6l60b8ya272vg8km8p97pb52f4gj5z48zk3j";
        libraryHaskellDepends = [ base ];
        description = "Require explicit type application for some type variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sbp" = callPackage
@@ -224293,7 +224293,7 @@ self: {
        ];
        testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
        description = "SwiftNav's SBP Library";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "sbp2udp" = callPackage
@@ -224313,7 +224313,7 @@ self: {
          streaming-commons
        ];
        description = "SBP to UDP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sbv" = callPackage
@@ -224344,7 +224344,7 @@ self: {
          gauge mtl process random silently syb time
        ];
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
@@ -224363,8 +224363,8 @@ self: {
          base directory filepath process tasty tasty-golden
        ];
        description = "Formally prove properties of Haskell programs using SBV/SMT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224384,8 +224384,8 @@ self: {
          proto-lens sc2-proto sc2-support text websockets
        ];
        description = "Low-level Starcraft II API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224405,8 +224405,8 @@ self: {
        ];
        libraryToolDepends = [ proto-lens-protoc protoc ];
        description = "A protocol buffer model for the Starcraft II bot API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {protoc = null;};
 
@@ -224423,8 +224423,8 @@ self: {
          text
        ];
        description = "Support and utility library for sc2hs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224453,7 +224453,7 @@ self: {
        ];
        description = "An interface to the Starcraft II bot API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sc3-rdu" = callPackage
@@ -224466,7 +224466,7 @@ self: {
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224484,8 +224484,8 @@ self: {
          bytestring enumerator mtl network network-enumerator
        ];
        description = "Library for writing fast/scalable TCP-based services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224499,8 +224499,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath gd ];
        description = "Scale an image to a new geometry";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224517,8 +224517,8 @@ self: {
          base containers hspec QuickCheck text time
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224545,8 +224545,8 @@ self: {
          aeson base hspec lens regex-compat stm text transformers wreq
        ];
        description = "Test webhooks locally";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224563,7 +224563,7 @@ self: {
          http-client-tls scalpel-core tagsoup text
        ];
        description = "A high level web scraping library for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "scalpel-core" = callPackage
@@ -224582,7 +224582,7 @@ self: {
        testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
        benchmarkHaskellDepends = [ base criterion tagsoup text ];
        description = "A high level web scraping library for Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "scalpel-search" = callPackage
@@ -224598,8 +224598,8 @@ self: {
          base hspec scalpel scalpel-core tagsoup text uri
        ];
        description = "scalpel scrapers for search engines";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224615,7 +224615,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
        description = "lexical style suggestions for source code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scan-metadata" = callPackage
@@ -224632,8 +224632,8 @@ self: {
          generic-lens hw-aeson hw-ip lens mtl text thyme unliftio-core
        ];
        description = "Metadata types for Albedo Scanners";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224646,8 +224646,8 @@ self: {
        libraryHaskellDepends = [ accelerate array base dph-base HUnit ];
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224660,7 +224660,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Easy and type-safe format strings for parsing and printing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "scanner" = callPackage
@@ -224677,7 +224677,7 @@ self: {
          attoparsec base bytestring cereal criterion text
        ];
        description = "Fast non-backtracking incremental combinator parsing for bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scanner-attoparsec" = callPackage
@@ -224689,7 +224689,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base scanner ];
        testHaskellDepends = [ attoparsec base bytestring hspec scanner ];
        description = "Inject attoparsec parser with backtracking into non-backtracking scanner";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scat" = callPackage
@@ -224712,7 +224712,7 @@ self: {
          vector
        ];
        description = "Generates unique passwords for various websites from a single password";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scc" = callPackage
@@ -224745,7 +224745,7 @@ self: {
        ];
        description = "Streaming component combinators";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224762,8 +224762,8 @@ self: {
          OpenGL process
        ];
        description = "Scene Graph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224779,8 +224779,8 @@ self: {
          base bytestring cgi extensible-exceptions network
        ];
        description = "A Haskell library for writing SCGI programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224798,8 +224798,8 @@ self: {
          base directory filepath old-locale time xturtle
        ];
        description = "Marge schedules and show EVR";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224821,7 +224821,7 @@ self: {
          transformers
        ];
        description = "Pure deterministic scheduled computations";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "schedule-planner" = callPackage
@@ -224840,8 +224840,8 @@ self: {
          options text text-icu transformers wai warp
        ];
        description = "Find the ideal lesson layout";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224862,7 +224862,7 @@ self: {
          template-haskell unliftio vector
        ];
        description = "Work stealing scheduler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "schedyield" = callPackage
@@ -224873,8 +224873,8 @@ self: {
        sha256 = "0lzhxlfxa660vx4y49gbg2q76v8dda00h3rznj5fhdjj29pkypgp";
        libraryHaskellDepends = [ base ];
        description = "Exposes standard POSIX function sched_yield";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224889,8 +224889,8 @@ self: {
          base groom hspec msgpack-binary QuickCheck
        ];
        description = "Encoding-independent schemas for Haskell data types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224915,8 +224915,8 @@ self: {
          unordered-containers
        ];
        description = "schema guided serialization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224945,8 +224945,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "JSON-biased spec and validation tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -224992,7 +224992,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225026,8 +225026,8 @@ self: {
          scholdoc-types temporary text yaml
        ];
        description = "Scholdoc fork of pandoc-citeproc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225051,7 +225051,7 @@ self: {
        ];
        description = "Scholdoc fork of texmath";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225068,7 +225068,7 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225080,7 +225080,7 @@ self: {
        sha256 = "1wwbalfkfg66azr9zizscvdc2csi9q73d6wq5bwbiq33z522nwxy";
        libraryHaskellDepends = [ base ];
        description = "Transformation of n-ary functions to unary functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sci-ratio" = callPackage
@@ -225092,8 +225092,8 @@ self: {
        libraryHaskellDepends = [ base hashable ];
        testHaskellDepends = [ base ];
        description = "Rational numbers in scientific notation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225127,8 +225127,8 @@ self: {
          network process regex safe split terminal-size text tls x509-store
        ];
        description = "Haskell query for SciDB via shim";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225140,7 +225140,7 @@ self: {
        sha256 = "0h60pdq3r32wl9h49i08iq496yf0qwvd0qmlmnk9jy5x3zcdwjmd";
        libraryHaskellDepends = [ base ];
        description = "Mathematical/physical/chemical constants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "science-constants-dimensional" = callPackage
@@ -225154,7 +225154,7 @@ self: {
          base dimensional numtype-dk science-constants
        ];
        description = "Mathematical/physical/chemical constants";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scientific" = callPackage
@@ -225177,7 +225177,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scientific-notation" = callPackage
@@ -225202,8 +225202,8 @@ self: {
          primitive run-st scientific
        ];
        description = "Scientific notation intended for tokenization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225229,8 +225229,8 @@ self: {
          utf8-string
        ];
        description = "Haskell IDE library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225265,8 +225265,8 @@ self: {
          utf8-string vector zlib
        ];
        description = "Command-line interface for browsing and searching packages documentation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225281,7 +225281,7 @@ self: {
        executableHaskellDepends = [ base bytestring containers process ];
        description = "Generates graphviz file of scons dependency information";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225299,8 +225299,8 @@ self: {
          mwc-random time unix zoom-cache
        ];
        description = "An interactive renderer for plotting time-series data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225324,8 +225324,8 @@ self: {
          zoom-cache
        ];
        description = "An interactive renderer for plotting time-series data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225343,8 +225343,8 @@ self: {
          persistent resource-pool scotty stm text transformers wai warp
        ];
        description = "scotty with batteries included";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225378,7 +225378,7 @@ self: {
          weigh
        ];
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scotty-binding-play" = callPackage
@@ -225396,8 +225396,8 @@ self: {
          base bytestring hspec http-client HUnit scotty text transformers
        ];
        description = "The Play Framework style data binding in Scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225412,8 +225412,8 @@ self: {
          base blaze-builder blaze-html mtl scotty wai
        ];
        description = "blaze-html integration for Scotty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225432,7 +225432,7 @@ self: {
          transformers
        ];
        description = "Cookie management helper functions for Scotty framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scotty-fay" = callPackage
@@ -225454,8 +225454,8 @@ self: {
          transformers wai wai-test
        ];
        description = "Fay integration for Scotty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225469,8 +225469,8 @@ self: {
          base ditto ditto-lucid lucid scotty text
        ];
        description = "Html form validation using `ditto`";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225487,8 +225487,8 @@ self: {
        executableHaskellDepends = [ aeson base scotty text ];
        testHaskellDepends = [ base ];
        description = "Response format helper for the Scotty web framework";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225505,8 +225505,8 @@ self: {
          warp
        ];
        description = "Easy Mustache templating support for Scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225518,7 +225518,7 @@ self: {
        sha256 = "06wcvjpaar8zd2y6p9j4pxs4l7rkw84s1kmcvacafkw43h1d2bx2";
        libraryHaskellDepends = [ base haxl scotty text ];
        description = "Combine scotty and haxl";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scotty-params-parser" = callPackage
@@ -225534,8 +225534,8 @@ self: {
          unordered-containers
        ];
        description = "HTTP-request's query parameters parser abstraction for \"scotty\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225548,7 +225548,7 @@ self: {
        libraryHaskellDepends = [ base bytestring scotty text wai ];
        testHaskellDepends = [ base doctest ];
        description = "Redirect to a normalized path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "scotty-resource" = callPackage
@@ -225563,8 +225563,8 @@ self: {
          base containers http-types scotty text transformers wai
        ];
        description = "A Better way of modeling web resources";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225590,8 +225590,8 @@ self: {
          string-conversions text wai
        ];
        description = "Webmachine-style REST library for scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225610,8 +225610,8 @@ self: {
          wai
        ];
        description = "Adding session functionality to scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225625,8 +225625,8 @@ self: {
          base scotty transformers wai warp warp-tls
        ];
        description = "TLS for Scotty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225642,7 +225642,7 @@ self: {
          aeson aeson-result base http-types scotty text
        ];
        description = "Scotty utils library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scotty-view" = callPackage
@@ -225658,8 +225658,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base scotty text transformers ];
        executableHaskellDepends = [ base scotty text transformers ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225681,8 +225681,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring io-streams ];
        description = "An SCP protocol implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225702,8 +225702,8 @@ self: {
          parallel split
        ];
        description = "Scrabble play generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225727,8 +225727,8 @@ self: {
          base extensible rio scrapbook-core tasty tasty-hunit yaml
        ];
        description = "collect posts of site that is wrote in config yaml using feed or scraping";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225750,8 +225750,8 @@ self: {
          tasty-hunit xml-conduit xml-types yaml
        ];
        description = "Core Package for scrapbook";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225778,8 +225778,8 @@ self: {
          test-framework-quickcheck2 text validation
        ];
        description = "Scrape websites for changes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225806,8 +225806,8 @@ self: {
          tasty-quickcheck-laws transformers
        ];
        description = "Stack of error, reader, writer, state, and prompt monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225830,8 +225830,8 @@ self: {
          url
        ];
        description = "Scrobbling server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225852,7 +225852,7 @@ self: {
          vector
        ];
        description = "scroll(6), a roguelike game";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "scrypt" = callPackage
@@ -225872,7 +225872,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Stronger password hashing via sequential memory-hard functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scrz" = callPackage
@@ -225896,7 +225896,7 @@ self: {
        ];
        description = "Process management and supervision daemon";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "scuttlebutt-types" = callPackage
@@ -225913,7 +225913,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base bytestring hspec text ];
        description = "generic types for Secure Scuttlebutt";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "scythe" = callPackage
@@ -225928,8 +225928,8 @@ self: {
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ base bytestring ];
        description = "Fast CSV lexing on ByteString";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225952,7 +225952,7 @@ self: {
        executableToolDepends = [ alex ];
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225971,8 +225971,8 @@ self: {
          vector
        ];
        description = "Distributed SDE solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -225990,7 +225990,7 @@ self: {
          test-framework-hunit transformers
        ];
        description = "A parser for SDF version 2.1 using Parsec";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sdl-try-drivers" = callPackage
@@ -226003,7 +226003,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base pretty-simple sdl2 text ];
        description = "small testing tool for sdl2 and accelerated drivers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sdl2" = callPackage
@@ -226024,7 +226024,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        testHaskellDepends = [ base deepseq linear vector weigh ];
        description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -226035,7 +226035,7 @@ self: {
        sha256 = "1diz8irrrc7mvy5fnm679xpl3dyy9ynr7a6d900yi3dn0zamq939";
        libraryHaskellDepends = [ base cairo linear sdl2 ];
        description = "Render with Cairo on SDL textures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sdl2-cairo-image" = callPackage
@@ -226050,8 +226050,8 @@ self: {
          base cairo convertible JuicyPixels linear sdl2 sdl2-cairo vector
        ];
        description = "An image loading and rendering library for sdl2 / sdl2-cairo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226075,8 +226075,8 @@ self: {
          base Cabal hspec hspec-core lrucache QuickCheck stm
        ];
        description = "image compositing with sdl2 - declarative style";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226090,8 +226090,8 @@ self: {
        editedCabalFile = "09bgygx1il6j4s243frlm4xl0z5drpdqn8fdgsid8m5b2m8c48ya";
        libraryHaskellDepends = [ base sdl2 ];
        description = "Run of the mill, frames per second timer implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226115,7 +226115,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 SDL2_gfx ];
        executableHaskellDepends = [ base linear sdl2 vector ];
        description = "Bindings to SDL2_gfx";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;};
 
   "sdl2-image" = callPackage
@@ -226136,7 +226136,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 SDL2_image ];
        executableHaskellDepends = [ base sdl2 text ];
        description = "Bindings to SDL2_image";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-mixer" = callPackage
@@ -226158,8 +226158,8 @@ self: {
        librarySystemDepends = [ SDL2_mixer ];
        libraryPkgconfigDepends = [ SDL2_mixer ];
        description = "Bindings to SDL2_mixer";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2_mixer;};
 
   "sdl2-sprite" = callPackage
@@ -226179,7 +226179,7 @@ self: {
          base optparse-simple sdl2 sdl2-image split text
        ];
        description = "Sprite previewer/animator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sdl2-ttf" = callPackage
@@ -226197,8 +226197,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
        description = "Bindings to SDL2_ttf";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
@@ -226209,7 +226209,7 @@ self: {
        sha256 = "1hckjr6fprw2y7wb4zz035rnhqj6xs7djnlkhdyzmir9g5xa3cr6";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Self-delimiting numeric values encoding library";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "sdr" = callPackage
@@ -226240,9 +226240,9 @@ self: {
          base criterion primitive storable-complex vector
        ];
        description = "A software defined radio library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226267,7 +226267,7 @@ self: {
        ];
        description = "Small web framework using Warp and WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "seakale" = callPackage
@@ -226278,8 +226278,8 @@ self: {
        sha256 = "0pb0d0y7cxry6np5412j7d2xm5wlp97gc15za3iqc7n38bdffjvy";
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226295,8 +226295,8 @@ self: {
          base bytestring free mtl postgresql-libpq seakale time
        ];
        description = "PostgreSQL backend for Seakale";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226312,8 +226312,8 @@ self: {
          base bytestring free mtl recursion-schemes seakale
        ];
        description = "Helpers to test code using Seakale";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226325,7 +226325,7 @@ self: {
        sha256 = "0x2m280qbfaswr2gk26d26dwg2s3v1nk4n93zh2fh1ikpkw13dfq";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell support for global configuration data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "search" = callPackage
@@ -226343,7 +226343,7 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Infinite search in finite time with Hilbert's epsilon";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "search-algorithms" = callPackage
@@ -226355,7 +226355,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Common graph search algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sec" = callPackage
@@ -226366,8 +226366,8 @@ self: {
        sha256 = "1ryl0nm1a37r606xhxy6ykf3c8c1gml6gdqna428w8y3a2vg5q2v";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Semantic Editor Combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226383,7 +226383,7 @@ self: {
        executableHaskellDepends = [ base haskeline ];
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of the SECD abstract machine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "secdh" = callPackage
@@ -226398,8 +226398,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        description = "SECDH Machine Simulator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226411,8 +226411,8 @@ self: {
        sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw";
        libraryHaskellDepends = [ base ];
        description = "A simple library for static information-flow security in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226440,8 +226440,8 @@ self: {
        ];
        testToolDepends = [ cpphs ];
        description = "Second Transfer HTTP/2 web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226465,8 +226465,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) secp256k1;};
 
@@ -226492,7 +226492,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-legacy" = callPackage
@@ -226517,8 +226517,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "fork of secp256k1";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226536,8 +226536,8 @@ self: {
          base containers diagrams-cairo diagrams-lib haskell-qrencode random
        ];
        description = "Secret Santa game assigner using QR-Codes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226558,7 +226558,7 @@ self: {
          test-framework test-framework-quickcheck2 vector
        ];
        description = "Information-theoretic secure secret sharing";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "secrm" = callPackage
@@ -226571,8 +226571,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226588,8 +226588,8 @@ self: {
          base bytestring directory HsOpenSSL network process transformers
        ];
        description = "Secure point-to-point connectivity library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226601,8 +226601,8 @@ self: {
        sha256 = "0af16j1j77849idfs7cb0hvi1wkf60qlnkfdvqnp40qrwzpbqn9c";
        libraryHaskellDepends = [ base bytestring containers network ];
        description = "Setups secure (unsorted) UDP packet transfer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226616,7 +226616,7 @@ self: {
          base byteable bytestring ghc-prim memory
        ];
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sednaDBXML" = callPackage
@@ -226632,8 +226632,8 @@ self: {
        ];
        librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {sedna = null;};
 
@@ -226653,8 +226653,8 @@ self: {
          symmetry-operations-symbols
        ];
        description = "Read and Display Seitz Symbol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226673,7 +226673,7 @@ self: {
          uuid-types
        ];
        description = "Multi-backend, high-level EDSL for interacting with SQL databases";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selda-json" = callPackage
@@ -226686,7 +226686,7 @@ self: {
        editedCabalFile = "1gajzv8zhj8i3bxzjh81vjn8j2igh3nrawfpddvxg1ayb5l2d2y0";
        libraryHaskellDepends = [ aeson base bytestring selda text ];
        description = "JSON support for the Selda database library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selda-postgresql" = callPackage
@@ -226704,7 +226704,7 @@ self: {
          selda-json text time uuid-types
        ];
        description = "PostgreSQL backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selda-sqlite" = callPackage
@@ -226722,7 +226722,7 @@ self: {
          uuid-types
        ];
        description = "SQLite backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "select" = callPackage
@@ -226733,7 +226733,7 @@ self: {
        sha256 = "180cj5m0bap1lb19s68icpn1dvk2s395cmlcc6dnwz3mpbj5alj0";
        libraryHaskellDepends = [ base ];
        description = "Wrap the select(2) POSIX function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "selections" = callPackage
@@ -226744,7 +226744,7 @@ self: {
        sha256 = "0vl7rqrz0p5m7iwymaw3b8l2kbaikwhmkhq82hq79581vj99fdpw";
        libraryHaskellDepends = [ base ];
        description = "Combinators for operating with selections over an underlying functor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "selective" = callPackage
@@ -226761,7 +226761,7 @@ self: {
          tasty-quickcheck transformers
        ];
        description = "Selective applicative functors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selectors" = callPackage
@@ -226777,8 +226777,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "CSS Selectors for DOM traversal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226790,8 +226790,8 @@ self: {
        sha256 = "0vr3d891pj947lv2grgbc83nm828gz9bbz6dp8mnf9bsji3ih7l7";
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226811,8 +226811,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec text webdriver ];
        description = "Run the selenium standalone server for usage with webdriver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226832,8 +226832,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226845,7 +226845,7 @@ self: {
        sha256 = "100a427r8xjfv7fsh7khj3db9klqwnalfy33w23khxqp7k1bkq3n";
        libraryHaskellDepends = [ base directory executable-path unix ];
        description = "Restarts the current executable (on binary change)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "selinux" = callPackage
@@ -226857,8 +226857,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ selinux ];
        description = "SELinux bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {selinux = null;};
 
@@ -226870,7 +226870,7 @@ self: {
        sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98";
        libraryHaskellDepends = [ base ];
        description = "Framework and service for analyzing and diffing untrusted code";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "semantic-source" = callPackage
@@ -226890,8 +226890,8 @@ self: {
          base hedgehog tasty tasty-hedgehog tasty-hunit text
        ];
        description = "Types and functionality for working with source code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226903,7 +226903,7 @@ self: {
        sha256 = "1349pzjs91xayx4dib520037mmgh4lvyc0wjx8h8yf492dvfbdkr";
        libraryHaskellDepends = [ base ];
        description = "Various concurrency abstractions built on top of semaphores";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semdoc" = callPackage
@@ -226923,8 +226923,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Evaluate code snippets in Literate Haskell";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226940,8 +226940,8 @@ self: {
          base lens profunctors semigroupoids transformers tuple-morph
        ];
        description = "Weakened partial isomorphisms, reversible computations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226958,7 +226958,7 @@ self: {
          unordered-containers vector
        ];
        description = "Align and Zip type-classes from the common Semialign ancestor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semialign-extras" = callPackage
@@ -226976,8 +226976,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Extra functions for working with Semialigns";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -226996,7 +226996,7 @@ self: {
          vector
        ];
        description = "SemialignWithIndex, i.e. izipWith and ialignWith";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semialign-optics" = callPackage
@@ -227014,7 +227014,7 @@ self: {
          unordered-containers vector
        ];
        description = "SemialignWithIndex, i.e. izipWith and ialignWith";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semibounded-lattices" = callPackage
@@ -227026,8 +227026,8 @@ self: {
        libraryHaskellDepends = [ base containers lattices ];
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227039,7 +227039,7 @@ self: {
        sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh";
        libraryHaskellDepends = [ base profunctors semigroupoids ];
        description = "Semigroupoids that depend on PolyKinds";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semigroupoids" = callPackage
@@ -227058,7 +227058,7 @@ self: {
          transformers-compat unordered-containers
        ];
        description = "Semigroupoids: Category sans id";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -227078,8 +227078,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "RebindableSyntax using the semigroupoids package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227091,7 +227091,7 @@ self: {
        sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr";
        libraryHaskellDepends = [ base ];
        description = "Anything that associates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semigroups-actions" = callPackage
@@ -227102,8 +227102,8 @@ self: {
        sha256 = "0vns2vdchszw34i12s9rfl4cm76ympfrivpb397j2vzg2i7bghqb";
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Semigroups actions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227122,7 +227122,7 @@ self: {
          base doctest QuickCheck quickcheck-instances
        ];
        description = "Semilattices";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semiring" = callPackage
@@ -227135,8 +227135,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
        description = "Semirings, ring-like structures used for dynamic programming applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227162,8 +227162,8 @@ self: {
          base containers criterion random vector
        ];
        description = "Basic semiring class and instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227175,7 +227175,7 @@ self: {
        sha256 = "0a7xd58jl3dm03z2wv4iyp3dfjnpydn3lmlz25azqna57x9ip3f0";
        libraryHaskellDepends = [ base ];
        description = "A module for dealing with semirings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semirings" = callPackage
@@ -227190,7 +227190,7 @@ self: {
          base base-compat-batteries containers hashable unordered-containers
        ];
        description = "two monoids as one, in holy haskimony";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "semver" = callPackage
@@ -227207,7 +227207,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Representation, manipulation, and de/serialisation of Semantic Versions";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "semver-range" = callPackage
@@ -227226,7 +227226,7 @@ self: {
          unordered-containers
        ];
        description = "An implementation of semver and semantic version ranges";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sendfile" = callPackage
@@ -227237,7 +227237,7 @@ self: {
        sha256 = "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0";
        libraryHaskellDepends = [ base bytestring network ];
        description = "A portable sendfile library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sendgrid-haskell" = callPackage
@@ -227253,8 +227253,8 @@ self: {
          monad-control text transformers
        ];
        description = "Sengrid API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227273,8 +227273,8 @@ self: {
          base lens semigroups tasty tasty-hunit text wreq
        ];
        description = "Sendgrid v3 API library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227301,8 +227301,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Automatically run Hspec tests on file modifications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227320,8 +227320,8 @@ self: {
          aeson base bytestring containers process stm zeromq3-haskell
        ];
        description = "Distributed sensor network for the raspberry pi";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227343,8 +227343,8 @@ self: {
          process temporary text time unix unix-compat vector wreq
        ];
        description = "A tool to send command execution results to Sensu";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227358,8 +227358,8 @@ self: {
          base mecab random-shuffle text transformers
        ];
        description = "Easily generating message of japanese natural language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227376,7 +227376,7 @@ self: {
          unordered-containers vector
        ];
        description = "Parser for the SentiWordNet tab-separated file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sentry" = callPackage
@@ -227396,8 +227396,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory filepath unix ];
        description = "Process monitoring tool written and configured in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227409,7 +227409,7 @@ self: {
        sha256 = "0pl7dcs9w4dzzajlfnkrjl5kgsx8zdzzl5hvikh9v9djsmw2290h";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seonbi" = callPackage
@@ -227445,8 +227445,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "SmartyPants for Korean language";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227469,7 +227469,7 @@ self: {
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
        description = "A data type with elements separated by values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seqaid" = callPackage
@@ -227493,8 +227493,8 @@ self: {
          base Cabal cpphs directory process regex-base regex-pcre temporary
        ];
        description = "Dynamic strictness control, including space leak repair";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227506,7 +227506,7 @@ self: {
        sha256 = "01a3fhymyp7279hym03zzz6qkh5h47nq5y1xglar0n46imjr98af";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seqid" = callPackage
@@ -227517,7 +227517,7 @@ self: {
        sha256 = "07xxpdrr3lqqnzcxbync46c0kz3d2i7k4day630a6x6zmzpyay0i";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seqid-streams" = callPackage
@@ -227528,7 +227528,7 @@ self: {
        sha256 = "0dd0vxs216ri0hdkz49hzzrryil7hhqb55cc9z6ca8f337imanm8";
        libraryHaskellDepends = [ base io-streams seqid ];
        description = "Sequence ID IO-Streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "seqloc" = callPackage
@@ -227548,8 +227548,8 @@ self: {
          unordered-containers vector
        ];
        description = "Handle sequence locations for bioinformatics";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227583,8 +227583,8 @@ self: {
          transformers transformers-base unordered-containers vector
        ];
        description = "Read and write BED and GTF format genome annotations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227597,7 +227597,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers transformers ];
        description = "A type class for sequences and various sequence data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sequence-formats" = callPackage
@@ -227620,7 +227620,7 @@ self: {
          tasty-hunit transformers vector
        ];
        description = "A package with basic parsing utilities for several Bioinformatic data formats";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sequenceTools" = callPackage
@@ -227648,7 +227648,7 @@ self: {
          base bytestring hspec pipes sequence-formats vector
        ];
        description = "A package with tools for processing DNA sequencing data";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sequent-core" = callPackage
@@ -227663,8 +227663,8 @@ self: {
          base bytestring containers ghc transformers
        ];
        description = "Alternative Core language for GHC plugins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227676,7 +227676,7 @@ self: {
        sha256 = "0vd7nrkx59vsxrhpb46kgzbvz7v830wh5zx3vg9494wvski983y6";
        libraryHaskellDepends = [ base bytestring ];
        description = "Sequential numbers that allow arbitrarily inserting numbers - for containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sequor" = callPackage
@@ -227699,8 +227699,8 @@ self: {
          text vector
        ];
        description = "A sequence labeler based on Collins's sequence perceptron";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227717,7 +227717,7 @@ self: {
          resourcet text
        ];
        description = "Interact with Serf via Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serial" = callPackage
@@ -227747,7 +227747,7 @@ self: {
          system-fileio transformers
        ];
        description = "Test your 'Aeson' 'Serialize' and 'Binary' instances for stability over time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serialise" = callPackage
@@ -227779,7 +227779,7 @@ self: {
          pretty semigroups store tar text time vector zlib
        ];
        description = "A binary serialisation library for Haskell values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "serialise-uuid" = callPackage
@@ -227798,7 +227798,7 @@ self: {
          uuid-types
        ];
        description = "Encode and decode UUID values in CBOR using uuid-types, cborg and serialise";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "serialize-instances" = callPackage
@@ -227815,8 +227815,8 @@ self: {
          base cereal hashable semigroups unordered-containers
        ];
        description = "Instances for Serialize of cereal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227829,7 +227829,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Cross platform serial port library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "serokell-util" = callPackage
@@ -227859,8 +227859,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "General-purpose functions by Serokell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227879,8 +227879,8 @@ self: {
        ];
        executableHaskellDepends = [ base singletons text ];
        description = "Simple project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227894,8 +227894,8 @@ self: {
          base containers http-kinder singletons text
        ];
        description = "Dependently typed API framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227920,8 +227920,8 @@ self: {
          tasty-quickcheck text wai wai-extra
        ];
        description = "Dependently typed API servers with Serv";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227948,7 +227948,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -227968,8 +227968,8 @@ self: {
          base JuicyPixels servant servant-server wai warp
        ];
        description = "Servant support for JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -227995,8 +227995,8 @@ self: {
          silently string-conversions temporary text
        ];
        description = "generic tests for aeson serialization in servant";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228012,7 +228012,7 @@ self: {
          aeson base jose lens servant text unordered-containers
        ];
        description = "Authentication combinators for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-auth-client" = callPackage
@@ -228038,7 +228038,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-client/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-auth-cookie" = callPackage
@@ -228068,8 +228068,8 @@ self: {
          base bytestring criterion cryptonite servant-server
        ];
        description = "Authentication via encrypted cookies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228094,8 +228094,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-docs/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228131,8 +228131,8 @@ self: {
          time transformers wai wai-extra with-location
        ];
        description = "Authentication via HMAC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228161,7 +228161,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -228181,7 +228181,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-swagger/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -228200,8 +228200,8 @@ self: {
          time transformers uuid wai
        ];
        description = "Servant based API and server for token based authorisation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228223,8 +228223,8 @@ self: {
          transformers transformers-base uuid
        ];
        description = "Acid-state backend for servant-auth-token server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228241,8 +228241,8 @@ self: {
          servant-swagger swagger2 text
        ];
        description = "Servant based API for token based authorisation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228264,8 +228264,8 @@ self: {
          transformers unliftio-core uuid vector
        ];
        description = "Leveldb backend for servant-auth-token server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228285,8 +228285,8 @@ self: {
          servant-server text time transformers unliftio-core uuid
        ];
        description = "Persistent backend for servant-auth-token server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228309,8 +228309,8 @@ self: {
          vector
        ];
        description = "RocksDB backend for servant-auth-token server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228326,8 +228326,8 @@ self: {
          base mtl servant-server text time wai wordpress-auth
        ];
        description = "Authenticate Routes Using Wordpress Cookies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228345,8 +228345,8 @@ self: {
          servant-server text warp
        ];
        description = "Avro content type for Servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228361,7 +228361,7 @@ self: {
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-cassava" = callPackage
@@ -228382,8 +228382,8 @@ self: {
          servant-server wai warp
        ];
        description = "Servant CSV content-type for cassava";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228408,8 +228408,8 @@ self: {
          tasty-hunit wai
        ];
        description = "Checked exceptions for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228431,8 +228431,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Checked exceptions for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228460,8 +228460,8 @@ self: {
          random servant servant-client servant-server text vinyl warp
        ];
        description = "Command line interface for Servant API clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228492,7 +228492,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-client-core" = callPackage
@@ -228515,7 +228515,7 @@ self: {
        testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Core functionality and class for client function generation for servant APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-client-js" = callPackage
@@ -228534,8 +228534,8 @@ self: {
          servant servant-client-core text transformers transformers-base
        ];
        description = "A servant client for frontend JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228557,8 +228557,8 @@ self: {
          servant-server-namedargs warp
        ];
        description = "Automatically derive API client functions with named and optional parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228579,7 +228579,7 @@ self: {
          resourcet servant servant-client servant-server wai warp
        ];
        description = "Servant Stream support for conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-csharp" = callPackage
@@ -228598,8 +228598,8 @@ self: {
          unordered-containers uuid uuid-types
        ];
        description = "Generate servant client library for C#";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228611,8 +228611,8 @@ self: {
        sha256 = "12nsdpcmv0xijvp89x3ksnf1mpdwbhwrn86c2y1cayvspvv1iilr";
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228638,8 +228638,8 @@ self: {
          quickcheck-instances servant-db text time transformers-base
        ];
        description = "Derive a postgres client to database API specified by servant-db";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228661,8 +228661,8 @@ self: {
          wai warp
        ];
        description = "Servant Dhall content-type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228691,8 +228691,8 @@ self: {
          tasty-golden tasty-hunit transformers
        ];
        description = "generate API docs for your servant webservice";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228715,8 +228715,8 @@ self: {
          unordered-containers
        ];
        description = "Generate endpoints overview for Servant API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228740,8 +228740,8 @@ self: {
          base ede http-media servant-server text unordered-containers warp
        ];
        description = "Combinators for rendering EDE templates in servant web applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228768,8 +228768,8 @@ self: {
          aeson base ekg ekg-core process servant-server text wai warp
        ];
        description = "Helpers for using ekg with servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228792,8 +228792,8 @@ self: {
          aeson base Diff elm-bridge hspec HUnit servant servant-client text
        ];
        description = "Automatically derive Elm functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228817,7 +228817,7 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Servant Errors wai-middlware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "servant-examples" = callPackage
@@ -228839,8 +228839,8 @@ self: {
          warp
        ];
        description = "Example programs for servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228855,7 +228855,7 @@ self: {
          aeson base exceptions http-types servant text
        ];
        description = "Extensible exceptions for servant APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-exceptions-server" = callPackage
@@ -228871,7 +228871,7 @@ self: {
          servant-exceptions servant-server text wai
        ];
        description = "Extensible exceptions for servant API servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-fiat-content" = callPackage
@@ -228884,8 +228884,8 @@ self: {
          base bytestring http-media servant text
        ];
        description = "Fiat content types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228897,7 +228897,7 @@ self: {
        sha256 = "0j8dv8010yr63sl3ks0an64ry53ajc2xd47vpd6i1svhb9b6l79i";
        libraryHaskellDepends = [ base servant ];
        description = "Utilities for flattening servant API types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-foreign" = callPackage
@@ -228914,7 +228914,7 @@ self: {
        testHaskellDepends = [ base hspec servant ];
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-generate" = callPackage
@@ -228927,8 +228927,8 @@ self: {
        editedCabalFile = "11hmn45fsl78kq6lladgz29yjycmr7lxmkswc8f41zbcb4m8rzyk";
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228945,8 +228945,8 @@ self: {
          base network-uri servant servant-server text warp
        ];
        description = "Specify Servant APIs with records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228970,8 +228970,8 @@ self: {
        executableHaskellDepends = [ base text transformers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to GitHub API using servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -228994,7 +228994,7 @@ self: {
          aeson base bytestring servant-server text transformers wai warp
        ];
        description = "Servant combinators to facilitate writing GitHub webhooks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -229021,8 +229021,8 @@ self: {
          servant servant-server text wai warp
        ];
        description = "automatical derivation of querying functions for servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229049,8 +229049,8 @@ self: {
        executableToolDepends = [ markdown-unlit ];
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229084,8 +229084,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229110,8 +229110,8 @@ self: {
          http2-client mtl servant servant-client-core text tls transformers
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229128,8 +229128,8 @@ self: {
          base data-default http-media iCalendar servant
        ];
        description = "Servant support for iCalendar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229148,8 +229148,8 @@ self: {
          base hspec hspec-expectations language-ecmascript lens servant
        ];
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229173,8 +229173,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Automatically derive javascript functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229186,7 +229186,7 @@ self: {
        sha256 = "0qy2al8waycarh5973c43bdd9g4a9032waknjsbykhflwglvwmv5";
        libraryHaskellDepends = [ aeson base servant ];
        description = "JSON-RPC messages and endpoints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-jsonrpc-client" = callPackage
@@ -229201,7 +229201,7 @@ self: {
          aeson base servant servant-client-core servant-jsonrpc
        ];
        description = "Generate JSON-RPC servant clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-jsonrpc-server" = callPackage
@@ -229216,7 +229216,7 @@ self: {
          aeson base containers mtl servant servant-jsonrpc servant-server
        ];
        description = "JSON-RPC servant servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-kotlin" = callPackage
@@ -229241,8 +229241,8 @@ self: {
          servant servant-foreign shelly text time wl-pprint-text
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229257,7 +229257,7 @@ self: {
        libraryHaskellDepends = [ base http-media lucid servant text ];
        testHaskellDepends = [ base lucid servant-server wai warp ];
        description = "Servant support for lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-machines" = callPackage
@@ -229275,7 +229275,7 @@ self: {
          servant-client servant-server wai warp
        ];
        description = "Servant Stream support for machines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-match" = callPackage
@@ -229291,7 +229291,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec network-uri servant text ];
        description = "Standalone implementation of servant’s dispatching mechanism";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-matrix-param" = callPackage
@@ -229311,8 +229311,8 @@ self: {
          servant-server text transformers wai wai-extra warp
        ];
        description = "Matrix parameter combinator for servant";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229341,8 +229341,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Derive a mock server for free from your servant API types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229375,8 +229375,8 @@ self: {
          tasty-wai text
        ];
        description = "multipart/form-data (e.g file upload) support for servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229395,7 +229395,7 @@ self: {
          base hspec hspec-wai http-types servant servant-server
        ];
        description = "Add named endpoints to servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-namedargs" = callPackage
@@ -229407,8 +229407,8 @@ self: {
        libraryHaskellDepends = [ base named servant text ];
        testHaskellDepends = [ base hspec named QuickCheck servant ];
        description = "Combinators for servant providing named parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229430,8 +229430,8 @@ self: {
          warp
        ];
        description = "Servant Nix content-type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229460,8 +229460,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229477,7 +229477,7 @@ self: {
          base bytestring http-types servant-foreign servant-server text wai
        ];
        description = "Provide responses to OPTIONS requests for Servant applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "servant-pagination" = callPackage
@@ -229495,8 +229495,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck servant-server text ];
        description = "Type-safe pagination for Servant APIs";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229514,8 +229514,8 @@ self: {
          servant-docs string-conversions text unordered-containers
        ];
        description = "Use Pandoc to render servant API documentation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229537,7 +229537,7 @@ self: {
          wai warp
        ];
        description = "Servant Stream support for pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-polysemy" = callPackage
@@ -229562,8 +229562,8 @@ self: {
          servant-swagger servant-swagger-ui swagger2 text wai warp
        ];
        description = "Utilities for using servant in a polysemy stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229577,8 +229577,8 @@ self: {
        editedCabalFile = "15wcxjn22zmwj7dqrbg5kmca4niri6p4cs0gm8b3dnr1iv2l0jgq";
        libraryHaskellDepends = [ base resource-pool servant time ];
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229595,8 +229595,8 @@ self: {
          servant-response
        ];
        description = "Useful functions and instances for using servant with a PostgreSQL context";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229619,8 +229619,8 @@ self: {
          test-framework test-framework-hunit warp
        ];
        description = "Servant Content-Type for proto-lens protobuf modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229644,8 +229644,8 @@ self: {
          servant servant-foreign servant-subscriber text
        ];
        description = "Generate PureScript accessor functions for you servant API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229665,8 +229665,8 @@ self: {
          text time unordered-containers
        ];
        description = "Bindings to the Pushbullet API using servant-client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229688,8 +229688,8 @@ self: {
          servant-foreign text
        ];
        description = "Automatically derive python functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229718,8 +229718,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229731,7 +229731,7 @@ self: {
        sha256 = "05gv21y7vzw7gdbsk0nax47rnn4isjmx7hbbwilsv0cj7l8qm1bk";
        libraryHaskellDepends = [ base servant ];
        description = "Embed a raw 'Application' in a Servant API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-rawm-client" = callPackage
@@ -229742,8 +229742,8 @@ self: {
        sha256 = "0ldjhmmfdh0jpfaz4sg1b9n5l23wza3w0m8bvvf80gvl7p6fk0fj";
        libraryHaskellDepends = [ base servant-client-core servant-rawm ];
        description = "The client implementation of servant-rawm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229759,8 +229759,8 @@ self: {
          base http-media http-types lens servant-docs servant-rawm
        ];
        description = "Documentation generator for 'RawM' endpoints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229777,7 +229777,7 @@ self: {
          wai-app-static
        ];
        description = "The server implementation of servant-rawm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-reason" = callPackage
@@ -229797,8 +229797,8 @@ self: {
          process reason-export servant servant-foreign text wl-pprint-text
        ];
        description = "Derive Reason types to interact with a Haskell backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229821,8 +229821,8 @@ self: {
          transformers
        ];
        description = "servant API generator for reflex apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229836,7 +229836,7 @@ self: {
        editedCabalFile = "1lhxc5kjz4459v65h57imv3k9l9nrkgid1qqlbwb4987q7y83qay";
        libraryHaskellDepends = [ aeson base http-types text ];
        description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-router" = callPackage
@@ -229855,8 +229855,8 @@ self: {
          base blaze-html servant servant-blaze servant-server warp
        ];
        description = "Servant router for non-server applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229871,7 +229871,7 @@ self: {
        libraryHaskellDepends = [ base casing servant-foreign text ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-scotty" = callPackage
@@ -229889,8 +229889,8 @@ self: {
          transformers
        ];
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229913,8 +229913,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "Generate Robots.txt and Sitemap.xml specification for your servant API.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229934,8 +229934,8 @@ self: {
        ];
        doHaddock = false;
        description = "Generates a servant API module";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -229971,7 +229971,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-server-namedargs" = callPackage
@@ -229988,8 +229988,8 @@ self: {
          servant-namedargs servant-server string-conversions text wai
        ];
        description = "Automatically derive API server functions with named and optional parameters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230012,8 +230012,8 @@ self: {
          tasty-hunit tasty-quickcheck text
        ];
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230051,8 +230051,8 @@ self: {
          temporary text time transformers
        ];
        description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230075,7 +230075,7 @@ self: {
          aeson base http-media servant-server warp
        ];
        description = "Content-Types for rendering Mustache in servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-static-th" = callPackage
@@ -230101,7 +230101,7 @@ self: {
          tasty-hunit wai
        ];
        description = "Embed a directory of static files in your Servant server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-streaming" = callPackage
@@ -230115,8 +230115,8 @@ self: {
        libraryHaskellDepends = [ base http-types servant ];
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230142,8 +230142,8 @@ self: {
          servant-streaming servant-streaming-server streaming warp
        ];
        description = "Client instances for the 'servant-streaming' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230161,8 +230161,8 @@ self: {
          base lens servant servant-docs servant-streaming
        ];
        description = "Client instances for the 'servant-docs' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230189,8 +230189,8 @@ self: {
          warp
        ];
        description = "Server instances for the 'servant-streaming' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230217,7 +230217,7 @@ self: {
        ];
        executableHaskellDepends = [ base purescript-bridge ];
        description = "When REST is not enough ...";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger" = callPackage
@@ -230245,7 +230245,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger-tags" = callPackage
@@ -230261,8 +230261,8 @@ self: {
          servant-server servant-swagger swagger2 text
        ];
        description = "Swagger Tags for Servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230279,7 +230279,7 @@ self: {
          servant-swagger-ui-core swagger2 text
        ];
        description = "Servant swagger ui";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger-ui-core" = callPackage
@@ -230297,7 +230297,7 @@ self: {
          wai-app-static
        ];
        description = "Servant swagger ui core components";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger-ui-jensoleg" = callPackage
@@ -230315,7 +230315,7 @@ self: {
          servant-swagger-ui-core swagger2 text
        ];
        description = "Servant swagger ui: Jens-Ole Graulund theme";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-swagger-ui-redoc" = callPackage
@@ -230333,7 +230333,7 @@ self: {
          servant-swagger-ui-core swagger2 text
        ];
        description = "Servant swagger ui: ReDoc theme";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-to-elm" = callPackage
@@ -230355,8 +230355,8 @@ self: {
          servant-multipart text
        ];
        description = "Automatically generate Elm clients for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230387,7 +230387,7 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck text time
          transformers
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "servant-waargonaut" = callPackage
@@ -230411,8 +230411,8 @@ self: {
          wl-pprint-annotated
        ];
        description = "Servant Integration for Waargonaut JSON Package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230431,7 +230431,7 @@ self: {
          base bytestring servant servant-server transformers warp
        ];
        description = "Servant support for delivering WebAssembly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-websockets" = callPackage
@@ -230453,7 +230453,7 @@ self: {
          aeson base conduit servant-server text wai warp websockets
        ];
        description = "Small library providing WebSocket endpoints for servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-xml" = callPackage
@@ -230468,7 +230468,7 @@ self: {
          base bytestring http-media servant xmlbf xmlbf-xeno
        ];
        description = "Servant support for the XML Content-Type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servant-yaml" = callPackage
@@ -230489,8 +230489,8 @@ self: {
          wai warp yaml
        ];
        description = "Servant support for yaml";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230502,8 +230502,8 @@ self: {
        sha256 = "1pga7l2akxqhkfq6gqaiiz6svvhzb83dbc5bw487kkrs3vriyyc3";
        libraryHaskellDepends = [ base singletons ];
        description = "Types and definitions of servant-zeppelin combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230527,8 +230527,8 @@ self: {
          warp
        ];
        description = "Client library for servant-zeppelin combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230552,8 +230552,8 @@ self: {
          string-conversions warp wreq
        ];
        description = "Server library for servant-zeppelin combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230575,8 +230575,8 @@ self: {
          servant-swagger servant-zeppelin swagger2
        ];
        description = "Swagger instances for servant-zeppelin combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230592,8 +230592,8 @@ self: {
          aeson base bytestring http-types mtl text void wai warp
        ];
        description = "Auto-generate a server for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230621,7 +230621,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serversession" = callPackage
@@ -230645,7 +230645,7 @@ self: {
          unordered-containers
        ];
        description = "Secure, modular server-side sessions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serversession-backend-acid-state" = callPackage
@@ -230665,8 +230665,8 @@ self: {
          unordered-containers
        ];
        description = "Storage backend for serversession using acid-state";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230693,8 +230693,8 @@ self: {
          time transformers unordered-containers
        ];
        description = "Storage backend for serversession using persistent and an RDBMS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230716,8 +230716,8 @@ self: {
          transformers unordered-containers
        ];
        description = "Storage backend for serversession using Redis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230735,7 +230735,7 @@ self: {
          time transformers unordered-containers
        ];
        description = "Snap bindings for serversession";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serversession-frontend-wai" = callPackage
@@ -230752,7 +230752,7 @@ self: {
          time transformers unordered-containers vault wai wai-session
        ];
        description = "wai-session bindings for serversession";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "serversession-frontend-yesod" = callPackage
@@ -230770,8 +230770,8 @@ self: {
          yesod-core
        ];
        description = "Yesod bindings for serversession";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230789,8 +230789,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Tools for building services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230806,7 +230806,7 @@ self: {
          aeson base bytestring generic-deriving text text-show
        ];
        description = "JSON to Sql";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "servius" = callPackage
@@ -230824,7 +230824,7 @@ self: {
          shakespeare text wai wai-app-static
        ];
        description = "Warp web server with template rendering";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ses-html" = callPackage
@@ -230840,7 +230840,7 @@ self: {
          HsOpenSSL http-streams tagsoup time
        ];
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -230856,8 +230856,8 @@ self: {
          transformers
        ];
        description = "Snaplet for the ses-html package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230873,7 +230873,7 @@ self: {
        ];
        description = "Session Types for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230895,8 +230895,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory exceptions hspec ];
        description = "Session types library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230919,8 +230919,8 @@ self: {
          base distributed-process hspec network-transport-tcp sessiontypes
        ];
        description = "Session types distributed";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -230949,7 +230949,7 @@ self: {
          transformers utility-ht
        ];
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "set-extra" = callPackage
@@ -230960,7 +230960,7 @@ self: {
        sha256 = "10kbvd09hp12rlfkc15xqiglrbxzi7gchb0aazqyg77ah66wjn10";
        libraryHaskellDepends = [ base containers mtl syb ];
        description = "Functions that could be added to Data.Set.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "set-monad" = callPackage
@@ -230971,7 +230971,7 @@ self: {
        sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "set-of" = callPackage
@@ -230982,8 +230982,8 @@ self: {
        sha256 = "0npsxff611frdb2a5xbyd4ipn3qb8ji6a1yygxid7pk7qsx0spj1";
        libraryHaskellDepends = [ base containers ];
        description = "Sets of fixed size, with typelits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231001,8 +231001,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Set of elements sorted by a different data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231022,8 +231022,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Treating files as sets to perform rapid set manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231037,7 +231037,7 @@ self: {
        editedCabalFile = "0ny4g3kjys0hqg41mnwrsymy1bwhl8l169kis4y4fa58sb06m4f5";
        libraryHaskellDepends = [ base unix ];
        description = "A cross-platform library for setting environment variables";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "setgame" = callPackage
@@ -231053,8 +231053,8 @@ self: {
        libraryHaskellDepends = [ base random vty ];
        executableHaskellDepends = [ base ];
        description = "A console interface to the game of Set";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231068,7 +231068,7 @@ self: {
        editedCabalFile = "0l0hlxhjspm05hxd06972ilw4c3ni72mnzcyljg3a01i8pxi53cl";
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to setlocale";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "setoid" = callPackage
@@ -231086,8 +231086,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A Haskell implementation of setoid";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231109,7 +231109,7 @@ self: {
          base containers doctest hlint hspec protolude
        ];
        description = "Perform set operations on files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "setops" = callPackage
@@ -231120,7 +231120,7 @@ self: {
        sha256 = "1mja48p8g9prfk53218qbv83ks6rs63s0n6jad0jgrj1221afpvg";
        libraryHaskellDepends = [ base containers ];
        description = "Uniform names (and Unicode operators) for set operations on data structures";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "sets" = callPackage
@@ -231152,7 +231152,7 @@ self: {
          witherable
        ];
        description = "Ducktyped set interface for Haskell containers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "setters" = callPackage
@@ -231165,8 +231165,8 @@ self: {
        editedCabalFile = "0rck3kizbzr5vffisnnhl3fsl4vw3n0s3mb7lcgggd4b40hp7zy4";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231178,7 +231178,7 @@ self: {
        sha256 = "1hnbr2r99i2cgjl329zh7i1g059vq2id3d2drmx0gzmw6x9nvqs8";
        libraryHaskellDepends = [ base text unordered-containers ];
        description = "Runtime-editable program settings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "sexp" = callPackage
@@ -231202,8 +231202,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "S-Expression parsing/printing made fun and easy";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231233,7 +231233,7 @@ self: {
          base bytestring criterion deepseq text
        ];
        description = "Invertible grammar combinators for S-expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sexp-show" = callPackage
@@ -231248,7 +231248,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base pretty-show ];
        description = "Produce a s-expression representation of Show values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sexpr" = callPackage
@@ -231263,7 +231263,7 @@ self: {
          base base64-string binary bytestring pretty
        ];
        description = "S-expression printer and parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sexpr-parser" = callPackage
@@ -231280,8 +231280,8 @@ self: {
        executableHaskellDepends = [ base bytestring megaparsec process ];
        testHaskellDepends = [ base data-default hspec megaparsec ];
        description = "Simple s-expression parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231303,7 +231303,7 @@ self: {
        ];
        description = "A flexible library for parsing and printing S-expression";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sext" = callPackage
@@ -231321,8 +231321,8 @@ self: {
          base bytestring tasty tasty-hunit template-haskell
        ];
        description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231336,7 +231336,7 @@ self: {
        librarySystemDepends = [ libsndfile openal ];
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
 
   "sfmt" = callPackage
@@ -231347,8 +231347,8 @@ self: {
        sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6";
        libraryHaskellDepends = [ base bytestring entropy primitive ];
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231369,8 +231369,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zlib;};
 
@@ -231395,8 +231395,8 @@ self: {
          random-shuffle tasty tasty-hunit temporary vector
        ];
        description = "Stochastic gradient descent library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231413,8 +231413,8 @@ self: {
          time transformers
        ];
        description = "SGF (Smart Game Format) parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231429,7 +231429,7 @@ self: {
        executableHaskellDepends = [ base bio regex-compat ];
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231456,8 +231456,8 @@ self: {
          transformers unix
        ];
        description = "Record your shell session and print in the markdown format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231472,8 +231472,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring io-streams SHA ];
        executableHaskellDepends = [ base io-streams SHA ];
        description = "SHA hashes for io-streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231490,8 +231490,8 @@ self: {
          base byteslice natural-arithmetic primitive small-bytearray-builder
        ];
        description = "SHA-1 Hash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231505,8 +231505,8 @@ self: {
        editedCabalFile = "164nw1gg6yl3fb4pqbgxxphafw2120a8kryhqx0i09l8c1n49557";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A control structure used to combine heterogenous types with delayed effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231529,8 +231529,8 @@ self: {
          system-filepath text
        ];
        description = "An automated way to run doctests in files that are changing";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231560,7 +231560,7 @@ self: {
          base binary bytestring containers cryptohash HUnit process
        ];
        description = "A fast SOCKS5 proxy that help you get through firewalls";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shady-gen" = callPackage
@@ -231578,7 +231578,7 @@ self: {
        ];
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "shady-graphics" = callPackage
@@ -231596,7 +231596,7 @@ self: {
        ];
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "shake" = callPackage
@@ -231629,7 +231629,7 @@ self: {
          utf8-string
        ];
        description = "Build system library, like Make, but more accurate dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-ats" = callPackage
@@ -231646,7 +231646,7 @@ self: {
          microlens shake shake-c shake-cabal shake-ext text
        ];
        description = "Utilities for building ATS projects with shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-bindist" = callPackage
@@ -231661,8 +231661,8 @@ self: {
          archive-sig base bytestring bz2 lzlib shake zlib zstd
        ];
        description = "Rules for binary distributions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231674,7 +231674,7 @@ self: {
        sha256 = "1bhi4rfvhin16c4xhx50dxjhr2gfpngasv7fps9fhm6is372ln9v";
        libraryHaskellDepends = [ base cdeps composition-prelude shake ];
        description = "Library for building C code with shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-cabal" = callPackage
@@ -231690,7 +231690,7 @@ self: {
          hashable shake
        ];
        description = "Shake library for use with cabal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-cabal-build" = callPackage
@@ -231705,8 +231705,8 @@ self: {
          base Cabal directory filepath process
        ];
        description = "Utility for building Shake build systems using Cabal sandboxes";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231718,7 +231718,7 @@ self: {
        sha256 = "1n52fjay6xgx65ihin6zxx05q42mfkdqi9888hn8dnn70kf5j7cg";
        libraryHaskellDepends = [ base directory shake ];
        description = "Shake rules for CCJS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-dhall" = callPackage
@@ -231734,8 +231734,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dhall dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231747,7 +231747,7 @@ self: {
        sha256 = "057ph5ai8pswzymln8l6i2hdn1vgi3hwyji1z6s4bh71xnc0sn5r";
        libraryHaskellDepends = [ base shake ];
        description = "Elm builds in shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-ext" = callPackage
@@ -231758,7 +231758,7 @@ self: {
        sha256 = "12pfi6rc4y8rjndym0crzyjfmcqnnrh61hww1vrnl614hs00iw6h";
        libraryHaskellDepends = [ base directory shake ];
        description = "Helper functions for linting with shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-extras" = callPackage
@@ -231773,8 +231773,8 @@ self: {
          base bytestring cmdargs directory filepath shake
        ];
        description = "Extra utilities for shake build systems";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231790,7 +231790,7 @@ self: {
          base containers directory filepath futhark shake text
        ];
        description = "Dependency tracking for Futhark";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-google-closure-compiler" = callPackage
@@ -231801,7 +231801,7 @@ self: {
        sha256 = "1z9znpcsnc6qizx0rnkww3pbxpk77pmrn6dvn8jqm2pppwbpjw0g";
        libraryHaskellDepends = [ base directory shake ];
        description = "Shake rules for the Google closure compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-language-c" = callPackage
@@ -231819,7 +231819,7 @@ self: {
        testHaskellDepends = [ base directory doctest hspec shake ];
        doCheck = false;
        description = "Utilities for cross-compiling with Shake";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "shake-literate" = callPackage
@@ -231830,7 +231830,7 @@ self: {
        sha256 = "0wx3mh62b8kq20qw15zg35nl4l066i11mzgj0vxlvys5a6902ijn";
        libraryHaskellDepends = [ base cpphs shake ];
        description = "Rules for building literate programs in shake";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-minify" = callPackage
@@ -231843,8 +231843,8 @@ self: {
          base bytestring css-text hjsmin shake text
        ];
        description = "Shake Minify Rules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231858,7 +231858,7 @@ self: {
          base directory filepath hasmin shake text
        ];
        description = "Shake rules for CSS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shake-pack" = callPackage
@@ -231869,8 +231869,8 @@ self: {
        sha256 = "13v9p6idndg3xy8fb63g037csgmj5kaxj0903kx5py050cj6rbaz";
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        description = "Shake File Pack Rule";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231882,8 +231882,8 @@ self: {
        sha256 = "0sjw0hcs6i9c8vfirrk90y5xd3cf0f9c0wa2p5pqimc5wfid9plk";
        libraryHaskellDepends = [ base path path-io shake ];
        description = "path alternatives to shake functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231901,8 +231901,8 @@ self: {
        ];
        executableHaskellDepends = [ base shake ];
        description = "Shake build system on-disk caching";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -231914,7 +231914,7 @@ self: {
        sha256 = "09zinaphlmdshny3hiyibbqqkfflj2rkxh8zkpnnk5dvf2qb15p5";
        libraryHaskellDepends = [ base extra path rio shake ];
        description = "Re-export of Shake using well-typed paths and ReaderT";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shake-plus-extended" = callPackage
@@ -231933,7 +231933,7 @@ self: {
          path-binary-instance rio shake shake-plus within
        ];
        description = "Experimental extensions to shake-plus";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakebook" = callPackage
@@ -231978,8 +231978,8 @@ self: {
          zipper-extra
        ];
        description = "Shake-based technical documentation generator; HTML & PDF";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232008,8 +232008,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "simple and interactive command-line build tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232024,7 +232024,7 @@ self: {
          base basic-prelude directory lifted-base shake
        ];
        description = "Shake helpers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakespeare" = callPackage
@@ -232048,8 +232048,8 @@ self: {
          text time transformers
        ];
        description = "A toolkit for making compile-time interpolated templates";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
   "shakespeare-babel" = callPackage
@@ -232065,8 +232065,8 @@ self: {
          template-haskell
        ];
        description = "compile es2015";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232079,7 +232079,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "Stick your haskell variables into css at compile time. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakespeare-i18n" = callPackage
@@ -232091,7 +232091,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "A type-based approach to internationalization. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakespeare-js" = callPackage
@@ -232103,7 +232103,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shakespeare-sass" = callPackage
@@ -232118,8 +232118,8 @@ self: {
          base hsass shakespeare template-haskell yesod yesod-core
        ];
        description = "SASS support for Shakespeare and Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232132,7 +232132,7 @@ self: {
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
        description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shana" = callPackage
@@ -232144,7 +232144,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory regex-posix ];
        description = "treat haskell functions as unix pipes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shannon-fano" = callPackage
@@ -232161,7 +232161,7 @@ self: {
          base bytestring optparse-generic QuickCheck
        ];
        description = "Shannon-fano compression algorithm in Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shapefile" = callPackage
@@ -232176,8 +232176,8 @@ self: {
          base binary bytestring data-binary-ieee754 dbf filepath rwlock
        ];
        description = "Parser and related tools for ESRI shapefile format";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232196,8 +232196,8 @@ self: {
          base containers proxy-kindness QuickCheck tagged template-haskell
        ];
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232225,7 +232225,7 @@ self: {
          QuickCheck shapes-math transformers vector vector-th-unbox
        ];
        description = "physics engine and other tools for 2D shapes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shapes-demo" = callPackage
@@ -232244,7 +232244,7 @@ self: {
          sdl2 shapes StateVar text transformers vector
        ];
        description = "demos for the 'shapes' package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shapes-math" = callPackage
@@ -232267,7 +232267,7 @@ self: {
          base ghc-prim hspec linear QuickCheck template-haskell
        ];
        description = "faster vector/matrix math using unboxed numbers and Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sharc-timbre" = callPackage
@@ -232278,7 +232278,7 @@ self: {
        sha256 = "1cwzks95jlpa4cd99mz5cz509h7j8k08w53xpvwny1bdb3p1cpsa";
        libraryHaskellDepends = [ base ];
        description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shared-buffer" = callPackage
@@ -232295,8 +232295,8 @@ self: {
          test-framework-quickcheck2 unix
        ];
        description = "A circular buffer built on shared memory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232310,8 +232310,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base Cabal hspec lens text ];
        description = "a tiny library for using shared lens fields";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232324,7 +232324,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ base bytestring unix ];
        description = "POSIX shared memory";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sharedio" = callPackage
@@ -232335,7 +232335,7 @@ self: {
        sha256 = "08hmmb2nn2lpirdnpp928m6xadzkv8k90x1nycw2b58vp1rpk7zv";
        libraryHaskellDepends = [ base ];
        description = "Bundles shared calls to IO functions to perform them only once";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "she" = callPackage
@@ -232351,8 +232351,8 @@ self: {
        libraryHaskellDepends = [ base filepath mtl ];
        executableHaskellDepends = [ base filepath mtl ];
        description = "A Haskell preprocessor adding miscellaneous features";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232383,8 +232383,8 @@ self: {
          transformers wreq
        ];
        description = "Test webhooks locally";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232408,7 +232408,7 @@ self: {
          template-haskell
        ];
        description = "Write shell scripts with Conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shell-escape" = callPackage
@@ -232421,7 +232421,7 @@ self: {
          base binary bytestring containers vector
        ];
        description = "Shell escaping library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shell-monad" = callPackage
@@ -232432,7 +232432,7 @@ self: {
        sha256 = "1mms4k2y7gxzilax0hqhgqppckx0mm5nj7fjzqhmn211rsc2s1qn";
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shell-pipe" = callPackage
@@ -232448,7 +232448,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pipe streams through external shell commands";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232460,7 +232460,7 @@ self: {
        sha256 = "1n15v0avvkxvczmyjc6g4z9axr5c61n8jlpa1cm4xr3qk7spm1mi";
        libraryHaskellDepends = [ base ];
        description = "Utility functions for writing command-line programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shellish" = callPackage
@@ -232476,8 +232476,8 @@ self: {
          unix-compat
        ];
        description = "shell-/perl- like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232494,8 +232494,8 @@ self: {
          unix
        ];
        description = "Simple interface for shell scripting in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232512,8 +232512,8 @@ self: {
          tagsoup text utf8-string xml
        ];
        description = "Extra functionality for shellmate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232531,7 +232531,7 @@ self: {
        executableToolDepends = [ markdown-unlit ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Out of the shell solution for scripting in Haskell";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "shellout" = callPackage
@@ -232545,7 +232545,7 @@ self: {
        libraryHaskellDepends = [ async base stm text typed-process ];
        executableHaskellDepends = [ async base stm text typed-process ];
        description = "A threaded manager for Haskell that can run and stream external process output/err/exits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shelltestrunner" = callPackage
@@ -232577,7 +232577,7 @@ self: {
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec ];
        description = "Parse strings into words, like a shell would";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shelly" = callPackage
@@ -232606,7 +232606,7 @@ self: {
          transformers-base unix unix-compat
        ];
        description = "shell-like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shelly-extra" = callPackage
@@ -232622,7 +232622,7 @@ self: {
          async base hspec HUnit mtl SafeSemaphore shelly text
        ];
        description = "shelly features that require extra dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shentong" = callPackage
@@ -232640,7 +232640,7 @@ self: {
          unordered-containers vector
        ];
        description = "A Haskell implementation of the Shen programming language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shh" = callPackage
@@ -232670,8 +232670,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Simple shell scripting from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "shh-extras" = callPackage
@@ -232685,7 +232685,7 @@ self: {
        libraryHaskellDepends = [ base hostname shh time ];
        testHaskellDepends = [ base tasty ];
        description = "Utility functions for using shh";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shift" = callPackage
@@ -232703,7 +232703,7 @@ self: {
          filepath optparse-applicative
        ];
        description = "A tool to quickly switch between directories";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shikensu" = callPackage
@@ -232723,7 +232723,7 @@ self: {
          tasty-hunit text unordered-containers
        ];
        description = "Run a sequence of functions on in-memory representations of files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "shimmer" = callPackage
@@ -232743,8 +232743,8 @@ self: {
          base bytestring containers filepath haskeline text
        ];
        description = "The Reflective Lambda Machine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232760,8 +232760,8 @@ self: {
          base ghcjs-dom ghcjs-prim keycode mtl time transformers
        ];
        description = "Declarative graphics for the browser using GHCJS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghcjs-prim = null;};
 
@@ -232774,8 +232774,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        description = "Examples for the shine package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232790,8 +232790,8 @@ self: {
        libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ];
        testHaskellDepends = [ base ghcjs-dom keycode shine varying ];
        description = "FRP interface for shine using the varying package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "shivers-cfg" = callPackage
@@ -232806,8 +232806,8 @@ self: {
          base containers directory HPDF language-dot mtl pretty process
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232819,8 +232819,8 @@ self: {
        sha256 = "0ywb8bfkdpqqv2spb92j9rzx4fv5k1c7b65wj0zwnn9rp7ckq59v";
        libraryHaskellDepends = [ base curl ];
        description = "A very basic SOAP package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232841,8 +232841,8 @@ self: {
          vector
        ];
        description = "A haskell API binding for shopify.com";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232854,7 +232854,7 @@ self: {
        sha256 = "02gcr6glp1kjs4l7ds8487dbblr1pw8nyq34i3rg1hskz0b83l6z";
        libraryHaskellDepends = [ base ];
        description = "Short-circuit values and expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shortcut" = callPackage
@@ -232866,7 +232866,7 @@ self: {
        revision = "1";
        editedCabalFile = "14yp03pynaw3wwj6fnnr6ns7f74h2x7m75wvg3dkxc0dv6snl9l7";
        libraryHaskellDepends = [ base ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shortcut-links" = callPackage
@@ -232878,8 +232878,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base doctest ];
        description = "Link shortcuts for use in text markup";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232891,8 +232891,8 @@ self: {
        sha256 = "1srqbc2kx1zn0xlzv94y7kqdrflmdck3jy6d2fl75zhf11wilxw3";
        libraryHaskellDepends = [ base text ];
        description = "Shorten a variety of string-like types adding ellipsis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232907,7 +232907,7 @@ self: {
          base deepseq hspec hspec-expectations HUnit
        ];
        description = "A HUnit/hspec assertion library to verify that an expression does not typecheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "show" = callPackage
@@ -232932,7 +232932,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Combinators to write Show instances";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "show-please" = callPackage
@@ -232947,7 +232947,7 @@ self: {
          base mtl parsec template-haskell th-orphans time
        ];
        description = "A wrapper type V with improved Show instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "show-prettyprint" = callPackage
@@ -232967,8 +232967,8 @@ self: {
          base containers doctest prettyprinter trifecta
        ];
        description = "Robust prettyprinter for output of auto-generated Show instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -232980,7 +232980,7 @@ self: {
        sha256 = "1sppi8vj1cg7gwz7vagc1cry22b814wlwbm6jjj1c4d5f4kmpyyv";
        libraryHaskellDepends = [ base ];
        description = "convert types into string values in haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "showdown" = callPackage
@@ -232994,8 +232994,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk random ];
        description = "A simple gtk based Russian Roulette game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233019,7 +233019,7 @@ self: {
          utf8-string vector
        ];
        description = "Clean up the formatting of 'show' output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shpider" = callPackage
@@ -233035,8 +233035,8 @@ self: {
          tagsoup-parsec time url web-encodings
        ];
        description = "Web automation library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233050,7 +233050,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl ];
        description = "A Haskell pattern splitter with emacs attachments";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "shqq" = callPackage
@@ -233065,7 +233065,7 @@ self: {
          base parsec posix-escape process template-haskell unix
        ];
        description = "Embed shell commands with interpolated Haskell variables, and capture output";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shuffle" = callPackage
@@ -233086,8 +233086,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Shuffle tool for UHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233099,7 +233099,7 @@ self: {
        sha256 = "1imidmpjs1ps6j9hzizhknfgw6zwb8qb8zphfknjv9zgjmwn15x4";
        libraryHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shunyalib" = callPackage
@@ -233110,7 +233110,7 @@ self: {
        sha256 = "1yh6xcfhjwb02y731s0lh1y6q63cdfmbnvxv3djylkf1hwdkqhpa";
        libraryHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "shwifty" = callPackage
@@ -233128,8 +233128,8 @@ self: {
          uuid-types vector
        ];
        description = "Generate swift types from haskell types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233143,8 +233143,8 @@ self: {
          base bytestring hsI2C time transformers
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233170,8 +233170,8 @@ self: {
          hmatrix JuicyPixels random random-shuffle split vector
        ];
        description = "Machine Learning algorithms";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233183,7 +233183,7 @@ self: {
        sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m";
        libraryHaskellDepends = [ base ];
        description = "Sieve is an implementation of the Sieve abstract data type";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "sifflet" = callPackage
@@ -233206,8 +233206,8 @@ self: {
          base Cabal cairo containers fgl HUnit parsec process
        ];
        description = "Simple, visual, functional language for learning about recursion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233226,8 +233226,8 @@ self: {
        ];
        librarySystemDepends = [ gdk_x11 gtk_x11 ];
        description = "Library of modules shared by sifflet and its tests and its exporters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
@@ -233247,7 +233247,7 @@ self: {
          tasty-smallcheck
        ];
        description = "Rounding rationals to significant digits and decimal places";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "sigma-ij" = callPackage
@@ -233268,8 +233268,8 @@ self: {
          base combinat optparse-applicative time
        ];
        description = "Thom polynomials of second order Thom-Boardman singularities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233292,8 +233292,8 @@ self: {
          tasty-quickcheck tasty-th universe-base
        ];
        description = "Arithmetic over signs and sets of signs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233322,8 +233322,8 @@ self: {
          secp256k1-haskell text universum unordered-containers
        ];
        description = "Deterministic serialisation and signatures with proto-lens support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233343,7 +233343,7 @@ self: {
          lens-family proto-lens proto-lens-protoc proto-lens-runtime text
        ];
        description = "Deterministic serialisation and signatures with proto-lens support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "signal" = callPackage
@@ -233357,7 +233357,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        executableHaskellDepends = [ base ];
        description = "Multiplatform signal support for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "signals" = callPackage
@@ -233373,8 +233373,8 @@ self: {
          observable-sharing operational-alacarte
        ];
        description = "Synchronous signal processing for DSLs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233392,7 +233392,7 @@ self: {
          hexstring scientific text unordered-containers vector
        ];
        description = "Hmac sha256 signature json and http payload";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "signed-multiset" = callPackage
@@ -233403,8 +233403,8 @@ self: {
        sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747";
        libraryHaskellDepends = [ base containers ];
        description = "Multisets with negative membership";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233417,7 +233417,7 @@ self: {
        libraryHaskellDepends = [ base deepseq directory ];
        testHaskellDepends = [ base deepseq directory nanospec temporary ];
        description = "Prevent or capture writing to stdout and other handles";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "silkscreen" = callPackage
@@ -233428,8 +233428,8 @@ self: {
        sha256 = "0gmp71cipwc0ymydckhvw9g8q3j4pm8cq2la2rbvm0rr9z7c2l40";
        libraryHaskellDepends = [ base prettyprinter ];
        description = "Prettyprinting transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233447,8 +233447,8 @@ self: {
        ];
        testHaskellDepends = [ base quantification savage text ];
        description = "A generator for different kinds of data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233460,8 +233460,8 @@ self: {
        sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m";
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        description = "simple interface to GHC's SIMD instructions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233480,7 +233480,7 @@ self: {
        ];
        description = "stochastic simulation engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233515,7 +233515,7 @@ self: {
          unordered-containers vector wai wai-extra
        ];
        description = "A minimalist web framework for the WAI server interface";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "simple-actors" = callPackage
@@ -233529,8 +233529,8 @@ self: {
          base chan-split contravariant mtl transformers
        ];
        description = "A library for more structured concurrent programming, based on the Actor Model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233547,7 +233547,7 @@ self: {
          base directory filepath hlint process regex-posix
        ];
        description = "A simple library for affine and vector spaces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-atom" = callPackage
@@ -233558,8 +233558,8 @@ self: {
        sha256 = "1kqkaay3r03plxvvyan3hdgj2rfynygnisi6hrsjwqgj4nw6va17";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Atom (or symbol) datatype for fast comparision and sorting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233572,8 +233572,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {bluetooth = null;};
 
@@ -233596,8 +233596,8 @@ self: {
          test-framework-quickcheck2 tuple uniplate
        ];
        description = "A simple C value type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233611,7 +233611,7 @@ self: {
          base bytestring Cabal directory filepath
        ];
        description = "Cabal file wrapper library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-cmd" = callPackage
@@ -233624,7 +233624,7 @@ self: {
          base directory extra filepath process unix
        ];
        description = "Simple String-based process commands";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-cmd-args" = callPackage
@@ -233635,7 +233635,7 @@ self: {
        sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd";
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Simple command args parsing and execution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-conduit" = callPackage
@@ -233666,8 +233666,8 @@ self: {
          transformers-base vector void
        ];
        description = "A simple streaming I/O library based on monadic folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233685,8 +233685,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Simple config file parser generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233702,8 +233702,8 @@ self: {
          base blaze-html hashable language-css unordered-containers
        ];
        description = "simple binding of css and html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233719,8 +233719,8 @@ self: {
          base conduit-combinators http-client http-conduit mtl transformers
        ];
        description = "A simple wrapper of http-conduit for file download";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233742,7 +233742,7 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion mtl transformers ];
        description = "A simple effect system that integrates with MTL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-enumeration" = callPackage
@@ -233754,7 +233754,7 @@ self: {
        libraryHaskellDepends = [ base integer-gmp ];
        testHaskellDepends = [ base doctest ];
        description = "Finite or countably infinite sequences of values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-eval" = callPackage
@@ -233768,8 +233768,8 @@ self: {
        libraryHaskellDepends = [ base parsec text transformers ];
        executableHaskellDepends = [ base text ];
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233781,8 +233781,8 @@ self: {
        sha256 = "14fh3z3vqkmfgvgxja431ivm3lk1ksgrxaqjzz25wdc493j640ka";
        libraryHaskellDepends = [ base bindings-dc1394 CV ];
        description = "Simplified interface for firewire cameras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233800,7 +233800,7 @@ self: {
        ];
        description = "Forms that configure themselves based on type";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "simple-genetic-algorithm" = callPackage
@@ -233814,8 +233814,8 @@ self: {
        libraryHaskellDepends = [ base parallel random ];
        executableHaskellDepends = [ base deepseq parallel random ];
        description = "Simple parallel genetic algorithm implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233836,7 +233836,7 @@ self: {
          base deepseq MonadRandom parallel random transformers
        ];
        description = "Simple parallel genetic algorithm implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-get-opt" = callPackage
@@ -233847,7 +233847,7 @@ self: {
        sha256 = "0xr5gi22ifq6nw0q0w1rf66djsns4gfv2l9yjvxhbxr4j8bqmwik";
        libraryHaskellDepends = [ base ];
        description = "A simple library for processing command-line options";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-index" = callPackage
@@ -233862,8 +233862,8 @@ self: {
          base containers hashable safecopy unordered-containers
        ];
        description = "Allows simple indexation on any data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233884,7 +233884,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec microlens-platform text ];
        description = "Simple log for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-log-syslog" = callPackage
@@ -233895,8 +233895,8 @@ self: {
        sha256 = "1619jsxgz5afmwhjcixg54i7dhh8jl29cmziifjrg60mm4rf2c34";
        libraryHaskellDepends = [ base hsyslog simple-log text ];
        description = "Syslog backend for simple-log";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233908,7 +233908,7 @@ self: {
        sha256 = "16ap76da3pvigl9gwpzb6miy13z5ypgh318cnqfyij0l5hrg4qg4";
        libraryHaskellDepends = [ base fast-logger monad-logger mtl text ];
        description = "A very simple but efficient logging framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "simple-logging" = callPackage
@@ -233930,8 +233930,8 @@ self: {
          simple-effects string-conv text time vector
        ];
        description = "Logging effect to plug into the simple-effects framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233945,7 +233945,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A simple LTL checker";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-money" = callPackage
@@ -233956,8 +233956,8 @@ self: {
        sha256 = "0bhiqnk7nh2y4qk7zkbfygna7kcg0gwqy8a5m70dqxs3f34h3fwf";
        libraryHaskellDepends = [ base containers ];
        description = "Simple library to handle and interexchange money";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -233977,8 +233977,8 @@ self: {
          base containers deepseq parallel random split
        ];
        description = "Simple parallel neural networks implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234000,8 +234000,8 @@ self: {
          mtl parsec system-filepath text text-render unordered-containers
        ];
        description = "Simple parsing/pretty printing for Nix expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234013,7 +234013,7 @@ self: {
        sha256 = "1njzw6zjarlpjrmbkxwivr9azj8v1298bsd1ai3ddlmylwyhn24r";
        libraryHaskellDepends = [ base ];
        description = "The Observer pattern";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-pascal" = callPackage
@@ -234030,8 +234030,8 @@ self: {
          base containers filepath mtl parsec simple-stacked-vm
        ];
        description = "Simplified Pascal language to SSVM compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234050,8 +234050,8 @@ self: {
          transformers-base
        ];
        description = "simple pipeline library like conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234069,7 +234069,7 @@ self: {
          resource-pool simple transformers
        ];
        description = "Connector package for integrating postgresql-orm with the Simple web framework";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "simple-reflect" = callPackage
@@ -234080,7 +234080,7 @@ self: {
        sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7";
        libraryHaskellDepends = [ base ];
        description = "Simple reflection of expressions containing variables";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-rope" = callPackage
@@ -234091,8 +234091,8 @@ self: {
        sha256 = "187ghgn8nivvn5m8nsn0vrjh8mr6h7n6r1p1119gr4h3m2hpmrpl";
        libraryHaskellDepends = [ base bytestring QuickCheck ];
        description = "Memory-efficient strings with concatenation and splitting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234110,7 +234110,7 @@ self: {
          process resourcet unix
        ];
        description = "Cross platform library for the sendfile system call";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-server" = callPackage
@@ -234127,7 +234127,7 @@ self: {
        ];
        description = "Simple Server interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234145,7 +234145,7 @@ self: {
          cookie cryptohash http-types simple transformers wai wai-extra
        ];
        description = "Cookie-based session management for the Simple web framework";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "simple-sessions" = callPackage
@@ -234156,7 +234156,7 @@ self: {
        sha256 = "08abag1im9gp2jpndd12sv911ca2qwh6frrz6qr87mj11xfhbky5";
        libraryHaskellDepends = [ base indexed synchronous-channels ];
        description = "A simple implementation of session types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-smt" = callPackage
@@ -234167,7 +234167,7 @@ self: {
        sha256 = "0bwb3r2gqm81nmf0hc0mgj8vp2a48kmzx0h7h42lprp4d4irwmy2";
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-sql-parser" = callPackage
@@ -234181,7 +234181,7 @@ self: {
        libraryHaskellDepends = [ base mtl parsec pretty ];
        testHaskellDepends = [ base mtl parsec pretty tasty tasty-hunit ];
        description = "A parser for SQL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-src-utils" = callPackage
@@ -234196,7 +234196,7 @@ self: {
        executableHaskellDepends = [ base extra text ];
        testHaskellDepends = [ base extra tasty tasty-hunit text ];
        description = "source code editing utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-stacked-vm" = callPackage
@@ -234213,8 +234213,8 @@ self: {
          array base binary-state containers filepath mtl parsec
        ];
        description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234226,8 +234226,8 @@ self: {
        sha256 = "0p7rd8y6rhwg0ap6cib7l32bglvfkvbzg938pdwpb2ss6cv8b9zs";
        libraryHaskellDepends = [ base ];
        description = "Simple tabular-text formatter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234243,8 +234243,8 @@ self: {
          base bytestring cereal containers filepath time
        ];
        description = "Simple, pure, file-system-free reading of tar files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234263,7 +234263,7 @@ self: {
          aeson attoparsec base hspec HUnit scientific vector
        ];
        description = "A basic template language for the Simple web framework";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "simple-text-format" = callPackage
@@ -234279,7 +234279,7 @@ self: {
          base hspec microlens-platform text unordered-containers
        ];
        description = "Simple text based format strings with named identifiers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simple-ui" = callPackage
@@ -234296,8 +234296,8 @@ self: {
          transformers vector vty
        ];
        description = "UI library for terminal";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234309,8 +234309,8 @@ self: {
        sha256 = "1dzsr15lq32dqsbhb639vzlx2d6m2kx0qax75ik2z765r5h9f9sa";
        libraryHaskellDepends = [ base first-class-families ];
        description = "Simple arithmetic with SI units using type-checked dimensional analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234328,8 +234328,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Three-dimensional vectors of doubles with basic operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234342,8 +234342,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base hspec lens ];
        description = "Zippers made slightly easier";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234357,7 +234357,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234374,8 +234374,8 @@ self: {
          base containers either generic-deriving hspec lens text
        ];
        description = "Short description of your package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234392,8 +234392,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec HUnit knob ];
        description = "Simple IRC Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234405,8 +234405,8 @@ self: {
        sha256 = "1cmzln3lya1scz10c6p33aqwy7djivc1dm9qkpkbwp2c8adq02bw";
        libraryHaskellDepends = [ base bytestring simpleirc ];
        description = "Lenses for simpleirc types";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234421,7 +234421,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simplemesh" = callPackage
@@ -234432,7 +234432,7 @@ self: {
        sha256 = "1cq8h96kr1qnxqma7if3pmxcw05nrirpnw703r4cba75xwgwlqcl";
        libraryHaskellDepends = [ base linear ];
        description = "Generators for primitive meshes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simplenote" = callPackage
@@ -234448,8 +234448,8 @@ self: {
          utf8-string
        ];
        description = "Haskell interface for the simplenote API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234468,8 +234468,8 @@ self: {
          base ghc-paths haskell-src-exts process uniplate
        ];
        description = "A simplified Haskell prelude for teaching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234483,8 +234483,8 @@ self: {
        editedCabalFile = "09dd2d70jhkw3svsf4680f9250w4c7s9396w6dac2l2ypxxiq0p6";
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Very simple SMTP Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234497,7 +234497,7 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ libssh2 ];
        description = "Simple wrapper around libssh2";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libssh2;};
 
   "simplest-sqlite" = callPackage
@@ -234513,8 +234513,8 @@ self: {
        ];
        librarySystemDepends = [ sqlite ];
        description = "Simplest SQLite3 binding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) sqlite;};
 
@@ -234532,7 +234532,7 @@ self: {
          base directory filepath mtl process random regex-compat split time
        ];
        description = "A simple markup language that translates to LaTeX";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "simplex-basic" = callPackage
@@ -234553,7 +234553,7 @@ self: {
          transformers
        ];
        description = "Very basic simplex implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simplistic-generics" = callPackage
@@ -234568,7 +234568,7 @@ self: {
          base containers deepseq kind-apply mtl template-haskell
        ];
        description = "Generic programming without too many type classes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "simseq" = callPackage
@@ -234583,7 +234583,7 @@ self: {
        executableHaskellDepends = [ base bio bytestring random ];
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234595,7 +234595,7 @@ self: {
        sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8";
        libraryHaskellDepends = [ base containers ];
        description = "Load data organized in a tree";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "since" = callPackage
@@ -234606,7 +234606,7 @@ self: {
        sha256 = "1zy1vwna8a0421l3jvdm8mg36xwgj4xl3p2xkf678ahbzk0179vs";
        libraryHaskellDepends = [ base time ];
        description = "Get the number of seconds since the last invocation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sindre" = callPackage
@@ -234633,7 +234633,7 @@ self: {
        ];
        executablePkgconfigDepends = [ libXft ];
        description = "A programming language for simple GUIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXft;};
 
   "single-tuple" = callPackage
@@ -234646,7 +234646,7 @@ self: {
        testHaskellDepends = [ base hspec OneTuple Only ];
        testToolDepends = [ hspec-discover ];
        description = "a class for single tuple implementations";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "singlethongs" = callPackage
@@ -234658,7 +234658,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Like singletons, but much smaller";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singleton-bool" = callPackage
@@ -234671,7 +234671,7 @@ self: {
        editedCabalFile = "118j0h29nqg2acqbzif2ffqnanjbwnqmv2kch9z7xiwqkz6iq8an";
        libraryHaskellDepends = [ base dec ];
        description = "Type level booleans";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singleton-dict" = callPackage
@@ -234682,8 +234682,8 @@ self: {
        sha256 = "125mb6j4gf3qcgmvjf6zibnzl7sw8jcmrh60nig16ahk55cjczic";
        libraryHaskellDepends = [ base singletons ];
        description = "Typelevel balanced search trees via a singletonized Data.Map";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234695,7 +234695,7 @@ self: {
        sha256 = "0qmkqfj8rch9qcczs05lm5l3sx29slmqw156g4hhr3d735xg4nk1";
        libraryHaskellDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singleton-typelits" = callPackage
@@ -234706,8 +234706,8 @@ self: {
        sha256 = "08xn7qv9kwhj9i69bpzigd76581rpq2jz410gmvr29g5ag1d0k08";
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234733,7 +234733,7 @@ self: {
          turtle
        ];
        description = "A framework for generating singleton types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singletons-presburger" = callPackage
@@ -234750,7 +234750,7 @@ self: {
          base ghc ghc-typelits-presburger reflection singletons
        ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "singletons-presburger_0_5_0_0" = callPackage
@@ -234767,8 +234767,8 @@ self: {
          base ghc ghc-typelits-presburger mtl reflection singletons
        ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "singnal" = callPackage
@@ -234779,8 +234779,8 @@ self: {
        sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj";
        libraryHaskellDepends = [ base ];
        description = "Singnal";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234802,7 +234802,7 @@ self: {
        ];
        description = "Multivariate polynomial factorization via bindings to Singular-factory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {singular-factory = null;};
 
@@ -234814,8 +234814,8 @@ self: {
        sha256 = "04ny9450h2mlw1j0gn6a1vvgwsk3gbhhzshqv2sbcg5pwkzkdrzp";
        libraryHaskellDepends = [ base ];
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234836,7 +234836,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "siphash: a fast short input PRF";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "siphon" = callPackage
@@ -234862,8 +234862,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Encode and decode CSV files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234888,8 +234888,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Siren Tools for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234906,8 +234906,8 @@ self: {
          remote SHA transformers
        ];
        description = "Sirkel, a Chord DHT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234919,7 +234919,7 @@ self: {
        sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
        libraryHaskellDepends = [ base lens taggy taggy-lens text ];
        description = "Sitemap parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sitemap-gen" = callPackage
@@ -234935,7 +234935,7 @@ self: {
          base bytestring HUnit raw-strings-qq tasty tasty-hunit time
        ];
        description = "Generate XML Sitemaps & Sitemap Indexes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sitepipe" = callPackage
@@ -234955,8 +234955,8 @@ self: {
          unordered-containers yaml
        ];
        description = "A simple to understand static site generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -234976,7 +234976,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Sixel library to show images in a terminal emulator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sixfiguregroup" = callPackage
@@ -234992,8 +234992,8 @@ self: {
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
        description = "A six figure group of time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235006,7 +235006,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers lens mtl ];
        testHaskellDepends = [ base bytestring containers lens mtl ];
        description = "An eDSL for writing 65(C)02 bytecode";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "size-based" = callPackage
@@ -235023,8 +235023,8 @@ self: {
          base dictionary-sharing template-haskell testing-type-modifiers
        ];
        description = "Sized functors, for size-based enumerations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235053,7 +235053,7 @@ self: {
          singletons subcategories template-haskell th-lift vector
        ];
        description = "Sized sequence data-types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sized_1_0_0_0" = callPackage
@@ -235079,8 +235079,8 @@ self: {
          subcategories template-haskell th-lift type-natural vector
        ];
        description = "Sized sequence data-types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sized-grid" = callPackage
@@ -235104,8 +235104,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Multidimensional grids with sized specified at compile time";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235124,8 +235124,8 @@ self: {
          array base base-compat containers singletons
        ];
        description = "Sized types in Haskell using the GHC Nat kind";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235142,8 +235142,8 @@ self: {
          singletons template-haskell type-natural
        ];
        description = "Size-parameterized vector types and functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235163,8 +235163,8 @@ self: {
          system-fileio system-filepath text unix
        ];
        description = "Recursively show space (size and i-nodes) used in subdirectories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235186,8 +235186,8 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Simple JavaScript Profiler";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235206,7 +235206,7 @@ self: {
          base bytestring cereal crypto-api filepath hspec tagged
        ];
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "skeletal-set" = callPackage
@@ -235224,8 +235224,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Skeletal set - a set with equivalence relation different from equality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235244,8 +235244,8 @@ self: {
          process time
        ];
        description = "a tool to access the OSX keychain";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235264,8 +235264,8 @@ self: {
          transformers transformers-compat
        ];
        description = "Manage project skeletons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235281,8 +235281,8 @@ self: {
          base blaze-html bytestring containers http-types text wai
        ];
        description = "An overly complex Haskell web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235301,8 +235301,8 @@ self: {
          wreq xml-conduit
        ];
        description = "A MyAnimeList.net client.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235319,8 +235319,8 @@ self: {
          async base bytestring deque envy hspec network websockets
        ];
        description = "A very quick-and-dirty WebSocket server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235334,7 +235334,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of pure skip lists";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "skip-var" = callPackage
@@ -235347,7 +235347,7 @@ self: {
        editedCabalFile = "0vl2y19l7xhlq08f91ggycj4imfdxvkj2fsaz8ifc0waxk3q7ja8";
        libraryHaskellDepends = [ base ];
        description = "Skip variables";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "skulk" = callPackage
@@ -235359,8 +235359,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Eclectic collection of utility functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235383,8 +235383,8 @@ self: {
          base conduit-extra optparse-generic preamble shakers
        ];
        description = "Skylark client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235407,7 +235407,7 @@ self: {
          pretty-show text
        ];
        description = "syntax highlighting library";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "skylighting-core" = callPackage
@@ -235438,7 +235438,7 @@ self: {
          base containers criterion directory filepath text
        ];
        description = "syntax highlighting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "skylighting-extensions" = callPackage
@@ -235453,7 +235453,7 @@ self: {
          base containers skylighting skylighting-modding text
        ];
        description = "Customized Skylighting syntax highlighters";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "skylighting-lucid" = callPackage
@@ -235466,8 +235466,8 @@ self: {
          base containers lucid skylighting-core text
        ];
        description = "Lucid support for Skylighting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235479,7 +235479,7 @@ self: {
        sha256 = "11wmasn3hhva7jxmrjigbgvhrsnwvrx1ksbhjhdp46ii2jnyk0i3";
        libraryHaskellDepends = [ base containers skylighting-core text ];
        description = "Utilities for modifying Skylighting syntaxes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "skype4hs" = callPackage
@@ -235496,8 +235496,8 @@ self: {
          time transformers-base word8 X11
        ];
        description = "Skype Desktop API binding for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235517,8 +235517,8 @@ self: {
          haskell98 IfElse old-locale regex-pcre time utf8-string
        ];
        description = "Export Skype chat logs to text files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {ghc-binary = null;};
 
@@ -235535,8 +235535,8 @@ self: {
          transformers
        ];
        description = "Haskell API for interacting with Slack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235560,7 +235560,7 @@ self: {
        executableHaskellDepends = [ base lens mtl text ];
        testHaskellDepends = [ base ];
        description = "Bindings to the Slack RTM API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "slack-notify-haskell" = callPackage
@@ -235579,8 +235579,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Slack notifier for Haskell project";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235606,7 +235606,7 @@ self: {
          aeson base bytestring interpolate lens lens-aeson mtl network-uri
          text transformers wreq
        ];
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "slack-verify" = callPackage
@@ -235624,7 +235624,7 @@ self: {
          base base16-bytestring bytestring cryptonite hspec
        ];
        description = "Slack API Request Verification HMAC";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "slack-web" = callPackage
@@ -235647,8 +235647,8 @@ self: {
          time
        ];
        description = "Bindings for the Slack web API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235676,7 +235676,7 @@ self: {
          string-conversions unordered-containers
        ];
        description = "A note taking CLI tool";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "slave-thread" = callPackage
@@ -235696,8 +235696,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "A fundamental solution to ghost threads and silent exceptions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235712,7 +235712,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        executableHaskellDepends = [ base time ];
        description = "zZzzZz";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "slice-cpp-gen" = callPackage
@@ -235730,7 +235730,7 @@ self: {
          language-slice MissingH
        ];
        description = "Generate C++ skeletons from slice files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sliceofpy" = callPackage
@@ -235754,8 +235754,8 @@ self: {
          template-haskell text
        ];
        description = "Python-ish slicing traversals for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235772,7 +235772,7 @@ self: {
          unordered-containers
        ];
        description = "A quick & easy static site builder built with shake and pandoc";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "slidemews" = callPackage
@@ -235791,7 +235791,7 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235807,8 +235807,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Functional reactive user interface programming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235829,8 +235829,8 @@ self: {
          tasty-hedgehog tasty-hunit text
        ];
        description = "SLIP-0032: Extended serialization format for BIP-32 wallets";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235843,7 +235843,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Sized list";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "sloane" = callPackage
@@ -235864,8 +235864,8 @@ self: {
          optparse-applicative resourcet stringsearch text transformers
        ];
        description = "A command line interface to Sloane's OEIS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235884,7 +235884,7 @@ self: {
          base Chart Chart-cairo colour data-default-class lens
        ];
        description = "Visualize mathematical function's slope fields";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "slot-lambda" = callPackage
@@ -235900,8 +235900,8 @@ self: {
          template-haskell vector
        ];
        description = "Write lambdas without naming the parameters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235913,8 +235913,8 @@ self: {
        sha256 = "0x3iw1mqbl3q723kkxr6b0i1hxcfb4sink4kmg6xnpzd3hwaspq9";
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235927,7 +235927,7 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        testHaskellDepends = [ base hspec primitive vector ];
        description = "Pure Haskell slotmap implementation over ST or IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "slug" = callPackage
@@ -235948,8 +235948,8 @@ self: {
          base exceptions hspec http-api-data path-pieces QuickCheck text
        ];
        description = "Type-safe slugs for Yesod ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -235965,7 +235965,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        testToolDepends = [ hspec-discover ];
        description = "Convert text into slugs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "slynx" = callPackage
@@ -235987,8 +235987,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Handle molecular sequences";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236001,8 +236001,8 @@ self: {
        libraryHaskellDepends = [ base bytebuild byteslice ];
        doHaddock = false;
        description = "Serialize to bytes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236014,8 +236014,8 @@ self: {
        sha256 = "16fgxsg8grxhqx6d4s3mm89qbkw2k72qvr4r701ih1i8gmf1ms1z";
        libraryHaskellDepends = [ base bytestring deepseq hashable ];
        description = "low-level unboxed arrays, with minimal features";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236038,7 +236038,7 @@ self: {
          attoparsec base containers data-default parsec text
        ];
        description = "Flatten camel case text in LaTeX files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smallcheck" = callPackage
@@ -236049,7 +236049,7 @@ self: {
        sha256 = "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4";
        libraryHaskellDepends = [ base logict mtl pretty ];
        description = "A property-based testing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smallcheck-kind-generics" = callPackage
@@ -236066,8 +236066,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236079,8 +236079,8 @@ self: {
        sha256 = "1jyn1bsn78jsnf5lzscvqzbf68ljf82vclq0k9aba58r2dayxn47";
        libraryHaskellDepends = [ base smallcheck smallcheck-series ];
        description = "SmallCheck properties for common laws";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236096,8 +236096,8 @@ self: {
          base lens smallcheck smallcheck-series transformers
        ];
        description = "SmallCheck properties for lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236117,7 +236117,7 @@ self: {
          base doctest Glob smallcheck tasty tasty-hunit tasty-smallcheck
        ];
        description = "Extra SmallCheck series and utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smallpt-hs" = callPackage
@@ -236130,8 +236130,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base vector ];
        description = "A Haskell port of the smallpt path tracer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236147,8 +236147,8 @@ self: {
          base bytestring deepseq hashable smallarray text utf8-string
        ];
        description = "A Unicode text type, optimized for low memory overhead";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236164,7 +236164,7 @@ self: {
        libraryHaskellDepends = [ base bytestring random text uuid ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "Utilities for the Smaoin semantic information model";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "smap" = callPackage
@@ -236195,8 +236195,8 @@ self: {
          strict text transformers unordered-containers
        ];
        description = "A command line tool for working with sets and maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236210,8 +236210,8 @@ self: {
          base bytestring containers template-haskell
        ];
        description = "group strings or bytestrings by words in common";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236232,8 +236232,8 @@ self: {
          base containers generic-deriving ghc-prim mtl QuickCheck random
        ];
        description = "A smarter QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236245,8 +236245,8 @@ self: {
        sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package exposing a helper function for generating smart constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236272,7 +236272,7 @@ self: {
          text
        ];
        description = "Haskell Behavior Tree Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smartword" = callPackage
@@ -236288,8 +236288,8 @@ self: {
          base haskell98 pretty unix utf8-string
        ];
        description = "Web based flash card for Word Smart I and II vocabularies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236306,7 +236306,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Combinators for Maybe types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smash-aeson" = callPackage
@@ -236319,7 +236319,7 @@ self: {
        editedCabalFile = "1y0k6gz9qlr98f543607zkx6a97fnzh3zrbi2b59rlljp0rjvdw8";
        libraryHaskellDepends = [ aeson base smash unordered-containers ];
        description = "Aeson support for the smash library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smash-lens" = callPackage
@@ -236331,7 +236331,7 @@ self: {
        libraryHaskellDepends = [ base lens smash ];
        testHaskellDepends = [ base ];
        description = "Optics for the `smash` library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smash-microlens" = callPackage
@@ -236345,7 +236345,7 @@ self: {
        libraryHaskellDepends = [ base microlens smash ];
        testHaskellDepends = [ base ];
        description = "Optics for the `smash` library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smash-optics" = callPackage
@@ -236356,7 +236356,7 @@ self: {
        sha256 = "1jf60vx8hlmyjgap91fvwn0p0hnazpcimshhkz5lsys0ynd4pcwh";
        libraryHaskellDepends = [ base optics-core smash ];
        description = "Optics for the `smash` library using `optics-core`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smcdel" = callPackage
@@ -236382,8 +236382,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Symbolic Model Checking for Dynamic Epistemic Logic";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236395,8 +236395,8 @@ self: {
        sha256 = "1d3kjyskwzc7p5bi6pv9yxfa6l6dqkkqc24dmmxl5wx7vmbfma25";
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236415,8 +236415,8 @@ self: {
          base doctest exceptions free Glob hspec mtl process QuickCheck text
          transformers yaml
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236428,8 +236428,8 @@ self: {
        sha256 = "0k1yy1bhgavsmm40zz1i6ihyfksb6fr06wxlbqyj1y0igmrrrlrw";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236441,8 +236441,8 @@ self: {
        sha256 = "0ylhzs0lc7fxp54s74slffkr8rnasy4pak4snyi5jnvma0wiz55g";
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236466,8 +236466,8 @@ self: {
          smith-client text transformers transformers-bifunctors unix
        ];
        description = "Command line tool for <https://smith.st/ Smith>.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236491,8 +236491,8 @@ self: {
          transformers
        ];
        description = "API client for <https://smith.st/ Smith>.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236505,7 +236505,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base linear text vector ];
        description = "Smooth curves via several interpolation modes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smsaero" = callPackage
@@ -236521,8 +236521,8 @@ self: {
          servant-client servant-docs text time
        ];
        description = "SMSAero API and HTTP client based on servant library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236538,7 +236538,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Interface to Satisfiability Modulo Theories solvers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smt-lib" = callPackage
@@ -236549,8 +236549,8 @@ self: {
        sha256 = "1phm50pabahrpxrzp25mfhpafzhp4hz8cxp6fp93rwh4cl7cckky";
        libraryHaskellDepends = [ array base directory polyparse ];
        description = "Parsing and printing SMT-LIB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236563,8 +236563,8 @@ self: {
        libraryHaskellDepends = [ base parsec text ];
        testHaskellDepends = [ base HUnit parsec text ];
        description = "A Haskell parser for SMT-LIB version 2.6";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236576,7 +236576,7 @@ self: {
        sha256 = "0bws90179vl2ycvnsmi0zni1vg71bdlhkgg0qdvqmls2rjyh5q3j";
        libraryHaskellDepends = [ base pretty ];
        description = "A library for working with the SMTLIB format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smtlib2" = callPackage
@@ -236592,8 +236592,8 @@ self: {
          template-haskell
        ];
        description = "A type-safe interface to communicate with an SMT solver";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236610,8 +236610,8 @@ self: {
          mtl smtlib2 smtlib2-pipe text
        ];
        description = "Dump the communication with an SMT solver for debugging purposes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236633,8 +236633,8 @@ self: {
          base Cabal cabal-test-quickcheck smtlib2 smtlib2-quickcheck
        ];
        description = "A type-safe interface to communicate with an SMT solver";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236650,8 +236650,8 @@ self: {
          base containers dependent-map dependent-sum mtl QuickCheck smtlib2
        ];
        description = "Helper functions to create SMTLib expressions in QuickCheck";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236663,8 +236663,8 @@ self: {
        sha256 = "12828gfip43pwjwnhd0smvkz1ar71gbp4lkv3njli6yp5dbcwfi5";
        libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ];
        description = "Get timing informations for SMT queries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236683,7 +236683,7 @@ self: {
          text
        ];
        description = "Simple email sending via SMTP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "smtp-mail-ng" = callPackage
@@ -236703,8 +236703,8 @@ self: {
          x509-system
        ];
        description = "An SMTP client EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236719,7 +236719,7 @@ self: {
        executableHaskellDepends = [ base haskell98 network process ];
        description = "Listen for SMTP traffic and send it to an MTA script";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "smtps-gmail" = callPackage
@@ -236737,8 +236737,8 @@ self: {
          tls transformers
        ];
        description = "Gmail SMTP Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236761,8 +236761,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory filepath ];
        description = "GHC Source Plugin that helps to manage imports";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236784,8 +236784,8 @@ self: {
          typed-process
        ];
        description = "GHC Source Plugin that helps to minimise imports and generate explicit exports";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236799,8 +236799,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random split terminal-size ];
        description = "A basic console snake game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236812,8 +236812,8 @@ self: {
        sha256 = "1iy3m20ldc98agdi7n71ik8k2f62ybfg719z79lcf8pzynbfsrbd";
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236849,7 +236849,7 @@ self: {
          unordered-containers xmlhtml
        ];
        description = "Top-level package for the Snap Web Framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-accept" = callPackage
@@ -236864,8 +236864,8 @@ self: {
          base bytestring case-insensitive http-media snap-core
        ];
        description = "Accept header branching for the Snap web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236877,7 +236877,7 @@ self: {
        sha256 = "1v3izzvxadjplir47ipi087sj6fcmfj5ivlhbkpp9ld7vj8sv2hi";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-auth-cli" = callPackage
@@ -236897,8 +236897,8 @@ self: {
          utf8-string
        ];
        description = "Command-line tool to manage Snap AuthManager database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236910,7 +236910,7 @@ self: {
        sha256 = "0hc8k0cviq7ayjymsfr435bnfw35pa4f80i7x4ypn2539fykavmk";
        libraryHaskellDepends = [ base blaze-html snap-core ];
        description = "blaze-html integration for Snap";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-blaze-clay" = callPackage
@@ -236921,8 +236921,8 @@ self: {
        sha256 = "05zi9rjd37xznjj8yhm5har12mfrclsrwd9fbcwh5ngccd7h7fiy";
        libraryHaskellDepends = [ base blaze-html clay snap-core ];
        description = "blaze-html-clay integration for Snap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236936,8 +236936,8 @@ self: {
          base configurator text unordered-containers
        ];
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -236972,7 +236972,7 @@ self: {
          vector zlib
        ];
        description = "Snap: A Haskell Web Framework (core interfaces and types)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-cors" = callPackage
@@ -236984,7 +236984,7 @@ self: {
        libraryHaskellDepends = [ snap-core ];
        doHaddock = false;
        description = "Add CORS headers to Snap applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-elm" = callPackage
@@ -237000,7 +237000,7 @@ self: {
          transformers
        ];
        description = "Serve Elm files through the Snap web framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-error-collector" = callPackage
@@ -237016,8 +237016,8 @@ self: {
          transformers
        ];
        description = "Collect errors in batches and dispatch them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237049,8 +237049,8 @@ self: {
          tasty-quickcheck
        ];
        description = "A collection of useful helpers and utilities for Snap web applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237066,7 +237066,7 @@ self: {
          attoparsec base bytestring containers snap-core
        ];
        description = "Language handling for Snap";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-loader-dynamic" = callPackage
@@ -237082,7 +237082,7 @@ self: {
          time unix
        ];
        description = "Snap dynamic loader";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-loader-static" = callPackage
@@ -237093,7 +237093,7 @@ self: {
        sha256 = "0598xvy2jk6xc4xhhjqy2v8f5s7k8x13v4wadw8r37h81jpbic00";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Snap static loader";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-predicates" = callPackage
@@ -237119,7 +237119,7 @@ self: {
        ];
        description = "Declarative routing for Snap";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "snap-routes" = callPackage
@@ -237136,8 +237136,8 @@ self: {
          mime-types path-pieces random snap template-haskell text
        ];
        description = "Typesafe URLs for Snap applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237180,7 +237180,7 @@ self: {
          vector
        ];
        description = "A web server for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-stream" = callPackage
@@ -237195,8 +237195,8 @@ self: {
          attoparsec base bytestring io-streams snap-core
        ];
        description = "Streaming Snap handlers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237218,7 +237218,7 @@ self: {
          hashable old-time template-haskell text
        ];
        description = "Scaffolding CLI for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snap-testing" = callPackage
@@ -237241,8 +237241,8 @@ self: {
          transformers
        ];
        description = "A library for BDD-style testing with the Snap Web Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237260,8 +237260,8 @@ self: {
          snap-core text xmlhtml
        ];
        description = "Snap Framework utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237277,8 +237277,8 @@ self: {
          base bytestring heist mtl snap snap-core text web-routes xmlhtml
        ];
        description = "Type safe URLs for Snap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237292,8 +237292,8 @@ self: {
          acid-state base mtl snap text transformers
        ];
        description = "acid-state snaplet for Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237318,8 +237318,8 @@ self: {
          transformers unordered-containers xmlhtml
        ];
        description = "Generic action log snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237337,8 +237337,8 @@ self: {
          resource-pool snap transformers
        ];
        description = "Snap framework snaplet for the AMQP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237359,8 +237359,8 @@ self: {
          vector
        ];
        description = "Provides an Acid-State backend for the Auth Snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237378,8 +237378,8 @@ self: {
          snap snap-core
        ];
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237396,8 +237396,8 @@ self: {
          utf8-string
        ];
        description = "A Snaplet for CSS minification";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237421,8 +237421,8 @@ self: {
          transformers unordered-containers uri-bytestring xmlhtml
        ];
        description = "Alternate authentication snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237439,8 +237439,8 @@ self: {
          unordered-containers
        ];
        description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237460,8 +237460,8 @@ self: {
          snap-core transformers
        ];
        description = "Fay integration for Snap with request- and pre-compilation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237478,7 +237478,7 @@ self: {
          string-conversions transformers
        ];
        description = "Serve javascript files compiled with GHCJS";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snaplet-hasql" = callPackage
@@ -237495,8 +237495,8 @@ self: {
          hasql-backend lens mtl snap text time
        ];
        description = "A Hasql snaplet";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237512,8 +237512,8 @@ self: {
          base haxl MonadCatchIO-transformers snap transformers
        ];
        description = "Snaplet for Facebook's Haxl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237534,8 +237534,8 @@ self: {
          unordered-containers
        ];
        description = "HDBC snaplet for Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237552,8 +237552,8 @@ self: {
          base configurator hslogger mtl snap transformers
        ];
        description = "Snap framework snaplet for the Logger API library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237577,7 +237577,7 @@ self: {
          snap-loader-static text transformers xmlhtml
        ];
        description = "snaplet-i18n";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snaplet-influxdb" = callPackage
@@ -237595,8 +237595,8 @@ self: {
          monad-control mtl network snap text transformers
        ];
        description = "Snap framework snaplet for the InfluxDB library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237613,7 +237613,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec-snap hspec2 lens snap text ];
        description = "Lexical Style Sheets - Snap Web Framework adaptor";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snaplet-mandrill" = callPackage
@@ -237629,8 +237629,8 @@ self: {
          base configurator mandrill mtl network snap transformers
        ];
        description = "Snap framework snaplet for the Mandrill API library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237650,8 +237650,8 @@ self: {
          snap-core template-haskell text time
        ];
        description = "Snap Framework MongoDB support as Snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237666,8 +237666,8 @@ self: {
          base lens mongoDB mtl snap text transformers
        ];
        description = "Minimalistic MongoDB Snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237688,8 +237688,8 @@ self: {
          resource-pool-catchio snap text transformers unordered-containers
        ];
        description = "mysql-simple snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237715,8 +237715,8 @@ self: {
          test-framework-hunit text
        ];
        description = "snaplet-oauth";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237739,8 +237739,8 @@ self: {
          time transformers unordered-containers
        ];
        description = "persistent snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237765,8 +237765,8 @@ self: {
          transformers transformers-base unordered-containers
        ];
        description = "postgresql-simple snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237783,8 +237783,8 @@ self: {
          base configurator mtl postmark snap text transformers
        ];
        description = "Postmark snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237801,8 +237801,8 @@ self: {
          string-conv text transformers
        ];
        description = "Automatic (re)compilation of purescript projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237820,8 +237820,8 @@ self: {
          lens MonadCatchIO-transformers mtl snap text transformers
        ];
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237841,8 +237841,8 @@ self: {
          network snap snap-core text time transformers unordered-containers
        ];
        description = "Redis support for Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237862,8 +237862,8 @@ self: {
          text utf8-string websockets websockets-snap
        ];
        description = "CRUD for JSON data with Redis storage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237881,8 +237881,8 @@ self: {
          lens mtl snap snap-accept snap-core text utf8-string xmlhtml
        ];
        description = "REST resources for the Snap web framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237900,8 +237900,8 @@ self: {
          riak-protobuf snap snap-core time transformers
        ];
        description = "A Snaplet for the Riak database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237919,8 +237919,8 @@ self: {
          snap-core transformers
        ];
        description = "Sass integration for Snap with request- and pre-compilation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237937,8 +237937,8 @@ self: {
          time unordered-containers
        ];
        description = "Modularised session state for Snaplets, in a Snaplet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237955,8 +237955,8 @@ self: {
          sednaDBXML snap
        ];
        description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -237973,8 +237973,8 @@ self: {
          snap text transformers
        ];
        description = "Snaplet for the ses-html package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238005,8 +238005,8 @@ self: {
          text time transformers unordered-containers
        ];
        description = "sqlite-simple snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238026,8 +238026,8 @@ self: {
          snaplet-sqlite-simple sqlite-simple text time unordered-containers
        ];
        description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238046,8 +238046,8 @@ self: {
          text text-format transformers xmlhtml
        ];
        description = "Stripe snaplet for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238064,8 +238064,8 @@ self: {
          network snap snap-core
        ];
        description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238083,8 +238083,8 @@ self: {
          PSQueue random regex-posix snap snap-core time
        ];
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238111,8 +238111,8 @@ self: {
          unordered-containers xmlhtml
        ];
        description = "A snaplet that communicates with wordpress over its api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238131,7 +238131,7 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Bindings to the Google Snappy library for fast compression/decompression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) snappy;};
 
   "snappy-conduit" = callPackage
@@ -238142,8 +238142,8 @@ self: {
        sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi";
        libraryHaskellDepends = [ base bytestring conduit snappy ];
        description = "Conduit bindings for Snappy (see snappy package)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238155,7 +238155,7 @@ self: {
        sha256 = "0nxmaj84y48zsagdx3nzc8c845yziwgvx27zafc59zajsfqgqkh6";
        libraryHaskellDepends = [ array base binary bytestring snappy ];
        description = "Snappy Framing Format in Haskell";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -238166,8 +238166,8 @@ self: {
        sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk";
        libraryHaskellDepends = [ base bytestring iteratee snappy ];
        description = "An enumeratee that uses Google's snappy compression library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238182,7 +238182,7 @@ self: {
          base binary bytestring snappy snappy-framing
        ];
        description = "Lazy bytestring compression and decompression";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sndfile-enumerators" = callPackage
@@ -238200,8 +238200,8 @@ self: {
          word24
        ];
        description = "Audio file reading/writing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238217,8 +238217,8 @@ self: {
          base classy-prelude containers lens linear mtl ncurses transformers
        ];
        description = "Tiny, declarative wrapper around ncurses";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238230,8 +238230,8 @@ self: {
        sha256 = "0yyway7rhx1x2p6mxfrs6xw22ylc780hsppbq2xkd4rpd1cdw54n";
        libraryHaskellDepends = [ base haste-compiler ];
        description = "A compositional web UI library, which draws to a Canvas element";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "snipcheck" = callPackage
@@ -238242,8 +238242,8 @@ self: {
        sha256 = "1x9jjfznvzz9pa4n54q6xja0axifnlgbp9aw93hvcr4w8f94gfp0";
        libraryHaskellDepends = [ base containers pandoc process text ];
        description = "Markdown tester";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238257,7 +238257,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
        description = "Extracts labeled snippets of code to files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snm" = callPackage
@@ -238278,8 +238278,8 @@ self: {
          base containers directory filepath HsSyck parsec safe spoonutil
        ];
        description = "The Simple Nice-Looking Manual Generator";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238298,8 +238298,8 @@ self: {
          network stm vector
        ];
        description = "SNMP protocol library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238322,8 +238322,8 @@ self: {
          optparse-applicative parsec random
        ];
        description = "Strategic board game of medium complexity";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238336,8 +238336,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring mps ];
        description = "encode any binary instance to white space";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238360,7 +238360,7 @@ self: {
          base criterion language-haskell-extract text
        ];
        description = "Bindings to the Snowball library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "snowflake" = callPackage
@@ -238373,7 +238373,7 @@ self: {
        editedCabalFile = "1y5v3nsin8iyxvh0abfhs7ma75p5zjvha0lp41801pdiikacfzha";
        libraryHaskellDepends = [ base time ];
        description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers.";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "snowflake-core" = callPackage
@@ -238385,8 +238385,8 @@ self: {
        libraryHaskellDepends = [ base time-exts ];
        testHaskellDepends = [ base QuickCheck ];
        description = "twitter's snowflake";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238405,8 +238405,8 @@ self: {
          snowflake-core
        ];
        description = "snowflake http server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238424,7 +238424,7 @@ self: {
          base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random
        ];
        description = "randomized fractal snowflakes demo";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "snowtify" = callPackage
@@ -238440,8 +238440,8 @@ self: {
          base either safe safe-exceptions text turtle
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238465,7 +238465,7 @@ self: {
          xml-conduit-writer
        ];
        description = "SOAP client tools";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "soap-openssl" = callPackage
@@ -238483,7 +238483,7 @@ self: {
          http-client-openssl soap text
        ];
        description = "TLS-enabled SOAP transport (using openssl bindings)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "soap-tls" = callPackage
@@ -238502,7 +238502,7 @@ self: {
          http-client-tls soap text tls x509 x509-store x509-validation
        ];
        description = "TLS-enabled SOAP transport (using tls package)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sock2stream" = callPackage
@@ -238520,7 +238520,7 @@ self: {
        ];
        description = "Tunnel a socket over a single datastream (stdin/stdout)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sockaddr" = callPackage
@@ -238531,7 +238531,7 @@ self: {
        sha256 = "1h74k5pipv9314y1d2wgpwgvyxfp6pcnq5051fdqr1shqlkpwbs2";
        libraryHaskellDepends = [ base byteorder bytestring network ];
        description = "Printing SockAddr";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "socket" = callPackage
@@ -238547,7 +238547,7 @@ self: {
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "An extensible socket library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "socket-activation" = callPackage
@@ -238560,8 +238560,8 @@ self: {
        editedCabalFile = "0bvm8ik8fp0v5gjw6q4h767zgs1i4ydckdypvqa85sarc985hkmp";
        libraryHaskellDepends = [ base network transformers unix ];
        description = "systemd socket activation library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238573,7 +238573,7 @@ self: {
        sha256 = "1wvrdgz0ybacbzg91vi8jiswr02lj7hz61cksmcfii2qsmzpfgb7";
        libraryHaskellDepends = [ base socket ];
        description = "Definitions for using ICMP with the `socket` library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "socket-io" = callPackage
@@ -238588,8 +238588,8 @@ self: {
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238603,8 +238603,8 @@ self: {
        librarySystemDepends = [ lksctp-tools ];
        testHaskellDepends = [ base bytestring socket ];
        description = "STCP socket extensions library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) lksctp-tools;};
 
@@ -238621,8 +238621,8 @@ self: {
          async base bytestring socket tasty tasty-hunit unix
        ];
        description = "Unix domain sockets";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238649,8 +238649,8 @@ self: {
          template-haskell text wai wai-websockets warp websockets
        ];
        description = "simpe tool to serve piped data over http and websocket";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238679,8 +238679,8 @@ self: {
          transformers-base unordered-containers vector wai warp
        ];
        description = "Socket.IO server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238711,8 +238711,8 @@ self: {
        ];
        doHaddock = false;
        description = "High-level network sockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238738,8 +238738,8 @@ self: {
          aeson base bytestring either network text websockets
        ];
        description = "A small websocket backend provider";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238753,7 +238753,7 @@ self: {
          base basement bytestring cereal network
        ];
        description = "Socks proxy (ver 5)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sodium" = callPackage
@@ -238764,8 +238764,8 @@ self: {
        sha256 = "00qs1calial08a185ma5hm17lmmzig0yjf3710d5ikq1bmrgcqga";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238778,8 +238778,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238792,8 +238792,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ softfloat ];
        description = "Haskell bindings for SoftFloat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {softfloat = null;};
 
@@ -238807,7 +238807,7 @@ self: {
        editedCabalFile = "0r4786crxih8z4dwi0grpga2kp8ivvnmwa0lhddmn16bfqwa16s9";
        libraryHaskellDepends = [ base time ];
        description = "Simple library for solar calculations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "solga" = callPackage
@@ -238830,8 +238830,8 @@ self: {
          wai wai-extra
        ];
        description = "Simple typesafe web routing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238849,8 +238849,8 @@ self: {
          solga swagger2 text unordered-containers
        ];
        description = "Swagger generation for Solga";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238875,8 +238875,8 @@ self: {
          transformers uri-encode
        ];
        description = "A minimal Solr client library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238892,7 +238892,7 @@ self: {
        executableHaskellDepends = [ base containers filepath ];
        testHaskellDepends = [ base containers QuickCheck ];
        description = "Solving simple games";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "some" = callPackage
@@ -238904,7 +238904,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base ];
        description = "Existential type: Some";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sonic-visualiser" = callPackage
@@ -238925,7 +238925,7 @@ self: {
        ];
        description = "Sonic Visualiser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -238939,7 +238939,7 @@ self: {
        editedCabalFile = "1d4sagrlhmvai3f4hvb9rn8aqsjbvi00z0mzv1gds9nblshk83xd";
        libraryHaskellDepends = [ base deepseq ];
        description = "True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sophia" = callPackage
@@ -238958,7 +238958,7 @@ self: {
          base binary bindings-sophia bytestring criterion directory
        ];
        description = "Bindings to Sophia library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sort" = callPackage
@@ -238969,7 +238969,7 @@ self: {
        sha256 = "03bpyn0mimfyilfjs26b9c8sclbzsbardjhy6d822jybg548kqyf";
        libraryHaskellDepends = [ base ];
        description = "A Haskell sorting toolkit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sort-by-pinyin" = callPackage
@@ -238985,7 +238985,7 @@ self: {
          air base bytestring containers here template-haskell text
        ];
        description = "sort by pinyin";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sorted" = callPackage
@@ -238996,8 +238996,8 @@ self: {
        sha256 = "0rzcxhzc4s4sbdnysmjh1i8pd39jyx7a4hbhkarsp2qbx29s4h03";
        libraryHaskellDepends = [ base ];
        description = "Efficient, type-safe sorted sequences";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239010,7 +239010,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Type-enforced sorted lists and related functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sortee" = callPackage
@@ -239022,7 +239022,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Generate string for sort key";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sorting" = callPackage
@@ -239033,8 +239033,8 @@ self: {
        sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n";
        libraryHaskellDepends = [ base ];
        description = "Utils for sorting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239048,8 +239048,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring ];
        description = "Sort lines per file size";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239073,8 +239073,8 @@ self: {
          temporary text type-errors-pretty vector
        ];
        description = "Souffle Datalog bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239097,8 +239097,8 @@ self: {
          utility-ht
        ];
        description = "Approximate a song from other pieces of sound";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239112,8 +239112,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio delay line";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239127,8 +239127,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base split WAVE ];
        description = "sound generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239152,8 +239152,8 @@ self: {
          template-haskell time unix
        ];
        description = "The server backend for the source code iPhone app";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239173,7 +239173,7 @@ self: {
          text
        ];
        description = "Source constraints GHC plugin";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sourcemap" = callPackage
@@ -239195,7 +239195,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Implementation of source maps as proposed by Google and Mozilla";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sousit" = callPackage
@@ -239214,8 +239214,8 @@ self: {
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239253,7 +239253,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ sox ];
        description = "Write, read, convert audio signals using libsox";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) sox;};
 
   "soyuz" = callPackage
@@ -239271,8 +239271,8 @@ self: {
          trifecta uniplate vector
        ];
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239292,7 +239292,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Experimental library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "spacecookie" = callPackage
@@ -239315,7 +239315,7 @@ self: {
          socket systemd transformers unix
        ];
        description = "Gopher Library and Server Daemon";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "spacefill" = callPackage
@@ -239327,7 +239327,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Generators for space-filling curves";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "spacepart" = callPackage
@@ -239338,8 +239338,8 @@ self: {
        sha256 = "118wch92ix54jp1hi4qw9mk46571lnak4df8ji83bs2vz3vax6jp";
        libraryHaskellDepends = [ base vector-space ];
        description = "Space partition data structures. Currently only a QuadTree.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239358,7 +239358,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Optimization over arbitrary search spaces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spake2" = callPackage
@@ -239384,8 +239384,8 @@ self: {
          QuickCheck tasty tasty-hspec
        ];
        description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239403,8 +239403,8 @@ self: {
          base containers gloss lens linear MonadRandom mtl netwire
        ];
        description = "A breakout clone written in netwire and gloss";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239430,8 +239430,8 @@ self: {
          zip-archive
        ];
        description = "Distributed Apache Spark applications in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239449,7 +239449,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "An SPARQL 1.1 Protocol client library.";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sparrow" = callPackage
@@ -239477,8 +239477,8 @@ self: {
          wai-transformers websockets websockets-simple wuss
        ];
        description = "Unified streaming data-dependency framework for web apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239490,8 +239490,8 @@ self: {
        sha256 = "1q1vpwrr96k41p9zj5x7mjd3817iq9a762q3jfqkwd0cb41iyka6";
        libraryHaskellDepends = [ base containers ];
        description = "A sparse set-based parsing library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239519,8 +239519,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ array base criterion deepseq vector ];
        description = "A playground of sparse linear algebra primitives using Morton ordering";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239538,8 +239538,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Effective linear algebra on sparse matrices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239562,7 +239562,7 @@ self: {
          mwc-random primitive QuickCheck scientific
        ];
        description = "Numerical computing in native Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sparse-tensor" = callPackage
@@ -239584,7 +239584,7 @@ self: {
          base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "typesafe tensor algebra library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sparsebit" = callPackage
@@ -239595,8 +239595,8 @@ self: {
        sha256 = "1a4gsnmr1y8b05iws2vrmjqbs5y9svfsz0jb3k19dddn1aszzm07";
        libraryHaskellDepends = [ base haskell98 ];
        description = "Sparse bitmaps for pattern match coverage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239608,8 +239608,8 @@ self: {
        sha256 = "19h9vy7arhi35rqafbq3nf9a50vnlw5mbfwvl6sp1j61w0yxai95";
        libraryHaskellDepends = [ base containers ];
        description = "A Logic Programming Library for Test-Data Generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239625,8 +239625,8 @@ self: {
          base containers data-default monadplus nats pointed semigroups
        ];
        description = "Lightweight parsing library based on partial functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239639,8 +239639,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base dlist mps mtl ];
        description = "brainless form validation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239660,7 +239660,7 @@ self: {
          base doctest QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spatial-rotations" = callPackage
@@ -239682,7 +239682,7 @@ self: {
          tasty-quickcheck vector-space
        ];
        description = "Rotate about any suitable axis";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "spawn" = callPackage
@@ -239693,7 +239693,7 @@ self: {
        sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8";
        libraryHaskellDepends = [ base ];
        description = "Tiny library for concurrent computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spdx" = callPackage
@@ -239712,7 +239712,7 @@ self: {
          base base-compat Cabal QuickCheck tasty-quickcheck
        ];
        description = "SPDX license expression language, Extras";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spdx-license" = callPackage
@@ -239728,7 +239728,7 @@ self: {
        ];
        testHaskellDepends = [ base directory hspec megaparsec text ];
        description = "SPDX license templates";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spe" = callPackage
@@ -239740,7 +239740,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Combinatorial species lite";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "special-functors" = callPackage
@@ -239751,8 +239751,8 @@ self: {
        sha256 = "0c68af104qxn9lhzshcy9s466q10n3ic7q4navqi53mmmmznivrd";
        libraryHaskellDepends = [ base mtl ];
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239770,8 +239770,8 @@ self: {
          mwc-random path-pieces primitive safecopy text uuid
        ];
        description = "Simple data types that help me here and there";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239785,7 +239785,7 @@ self: {
          base bytestring ieee754 scientific text
        ];
        description = "Typeclass providing special values";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "specialize-th" = callPackage
@@ -239811,8 +239811,8 @@ self: {
          type-sub-th uniplate universe-th
        ];
        description = "Create specialized types from polymorphic ones using TH";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239831,8 +239831,8 @@ self: {
          template-haskell
        ];
        description = "Computational combinatorial species";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239850,8 +239850,8 @@ self: {
          sparse-linear-algebra statistics vector
        ];
        description = "Library for spectral clustering";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239867,7 +239867,7 @@ self: {
        testHaskellDepends = [ base express leancheck ];
        benchmarkHaskellDepends = [ base express leancheck ];
        description = "discovery of properties about Haskell functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "speculation" = callPackage
@@ -239878,8 +239878,8 @@ self: {
        sha256 = "0gsdxgi1bw33z7v23m2fq8ynqxz06swjv4ikl8mqmlp0hwd69gvk";
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
        description = "A framework for safe, programmable, speculative parallelism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239892,8 +239892,8 @@ self: {
        libraryHaskellDepends = [ speculation ];
        doHaddock = false;
        description = "Merged into 'speculation'. Use that instead.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239924,8 +239924,8 @@ self: {
          text-format-heavy
        ];
        description = "Speechmatics api client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239943,7 +239943,7 @@ self: {
        ];
        testHaskellDepends = [ base containers ];
        description = "Speedy slice sampling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "spelling-suggest" = callPackage
@@ -239964,8 +239964,8 @@ self: {
          base edit-distance parseargs phonetic-code sqlite
        ];
        description = "Spelling suggestion tool with library and command-line interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -239977,7 +239977,7 @@ self: {
        sha256 = "1h014k4yi0aachbbni011a1jkzi31lrxhpi8h5q5f2vkgb18k1g4";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "Geometry on a sphere";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sphero" = callPackage
@@ -239992,8 +239992,8 @@ self: {
          base bytestring cereal containers mtl simple-bluetooth
        ];
        description = "Orbotix Sphero client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240010,8 +240010,8 @@ self: {
          xml
        ];
        description = "Haskell bindings to the Sphinx full-text searching daemon";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240025,8 +240025,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240045,8 +240045,8 @@ self: {
        libraryHaskellDepends = [ base MissingH parsec split ];
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Transform queries for sphinx input";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240063,8 +240063,8 @@ self: {
          JuicyPixels-repa OpenGL
        ];
        description = "An FRP-based game engine written in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240085,8 +240085,8 @@ self: {
        ];
        executablePkgconfigDepends = [ libsoup ];
        description = "Experimental web browser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libsoup;};
 
   "spine" = callPackage
@@ -240097,7 +240097,7 @@ self: {
        sha256 = "1sk2vkslcbmr4z87xc7q38ywbj118bcgqrkz9fqsp7jffxvy4bgv";
        libraryHaskellDepends = [ base ];
        description = "Simple implementation of the generic spine view";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spir-v" = callPackage
@@ -240108,8 +240108,8 @@ self: {
        sha256 = "1jnnc9pgy22iayln4ljgirr4ixspjn7iljyxz2pp7fxgvmvb3msr";
        libraryHaskellDepends = [ base ];
        description = "Some utilities for reading and writing SPIR-V files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240136,8 +240136,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Spiros Boosalis's Custom Prelude";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240149,8 +240149,8 @@ self: {
        sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl";
        libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240168,8 +240168,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Provides an annotated splay tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240181,7 +240181,7 @@ self: {
        sha256 = "0lsfkm4vfipzbnqpf3yli6fwrv5a5mwbs149dfzhs7spa9kbxyl1";
        libraryHaskellDepends = [ base network ];
        description = "Cross-platform Socket to Socket Data Splicing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spline3" = callPackage
@@ -240204,8 +240204,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck vector
        ];
        description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240227,8 +240227,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion polynomial vector ];
        description = "B-Splines, other splines, and NURBS";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240240,7 +240240,7 @@ self: {
        sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6";
        libraryHaskellDepends = [ base containers ghc hlint stm ];
        description = "HLint as a GHC source plugin";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "split" = callPackage
@@ -240252,7 +240252,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Combinator library for splitting lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "split-channel" = callPackage
@@ -240263,7 +240263,7 @@ self: {
        sha256 = "0w2sgj1f5ydfvhm80d3pbka9988jwl80n14bp5nisawpd2glxvak";
        libraryHaskellDepends = [ base ];
        description = "Control.Concurrent.Chan split into sending and receiving halves.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "split-morphism" = callPackage
@@ -240275,8 +240275,8 @@ self: {
        libraryHaskellDepends = [ base invariant lens ];
        testHaskellDepends = [ base invariant lens QuickCheck ];
        description = "Split Epimorphisms and Monomorphisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240295,7 +240295,7 @@ self: {
          transformers utility-ht
        ];
        description = "Split a big audio file into pieces at positions of silence";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "split-tchan" = callPackage
@@ -240306,7 +240306,7 @@ self: {
        sha256 = "0qwcbvnm2vlr4bmn8r1q3ycamvgs0nfap4dkyzgp54f9rrl73x2p";
        libraryHaskellDepends = [ base stm ];
        description = "STM's TChan split into sending and receiving halves";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "splitmix" = callPackage
@@ -240329,7 +240329,7 @@ self: {
          base clock containers criterion random tf-random
        ];
        description = "Fast Splittable PRNG";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "splitter" = callPackage
@@ -240344,8 +240344,8 @@ self: {
          base directory filepath parsec range
        ];
        description = "Use numerical ranges to split out certain lines from a file";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240365,7 +240365,7 @@ self: {
          strptime template-haskell time vcs-revision
        ];
        description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spool" = callPackage
@@ -240376,7 +240376,7 @@ self: {
        sha256 = "1svkz3cxkyi6f3akakjfk1cvij85xy69v52d88gh97xgiawp5346";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Convert between ByteString and Vector.Storable without copying";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spoon" = callPackage
@@ -240389,7 +240389,7 @@ self: {
        editedCabalFile = "09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74";
        libraryHaskellDepends = [ base deepseq ];
        description = "Catch errors thrown from pure computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spoonutil" = callPackage
@@ -240406,8 +240406,8 @@ self: {
          base directory extensible-exceptions filepath parsec
        ];
        description = "Spoon's utilities. Simple testing and nice looking error reporting.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240419,7 +240419,7 @@ self: {
        sha256 = "1mkcb9qi9d3izf3nhn0bmiiwfhvak6ky71wq7qnrq3imsarrni6s";
        libraryHaskellDepends = [ base deepseq ];
        description = "Catch errors from pure computations in a Maybe/Either";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "spoty" = callPackage
@@ -240435,8 +240435,8 @@ self: {
          unordered-containers wreq
        ];
        description = "Spotify web API wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240453,7 +240453,7 @@ self: {
          base explicit-exception transformers utility-ht
        ];
        description = "Read and write spreadsheets from and to CSV files in a lazy way";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sprinkles" = callPackage
@@ -240496,8 +240496,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck temporary wai-extra
        ];
        description = "JSON API to HTML website wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240509,8 +240509,8 @@ self: {
        sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk";
        libraryHaskellDepends = [ base lens mtl vector ];
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240535,8 +240535,8 @@ self: {
          SHA split text time tls unix utf8-string x509 yaml
        ];
        description = "HTTP proxy for authenticating users via OAuth2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240562,8 +240562,8 @@ self: {
          warp
        ];
        description = "Web interface to sproxy database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240589,8 +240589,8 @@ self: {
          wai wai-conduit warp warp-tls word8 yaml
        ];
        description = "Secure HTTP proxy for authenticating users via OAuth2";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240610,8 +240610,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion hmatrix random ];
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240637,8 +240637,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time unix
        ];
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240655,8 +240655,8 @@ self: {
          transformers-base
        ];
        description = "common middle-level sql client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240672,8 +240672,8 @@ self: {
          base data-default-class mysql mysql-simple sql-simple text
        ];
        description = "mysql backend for sql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240690,8 +240690,8 @@ self: {
          time
        ];
        description = "conection pool for sql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240707,8 +240707,8 @@ self: {
          base data-default-class postgresql-simple sql-simple text
        ];
        description = "postgresql backend for sql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240720,8 +240720,8 @@ self: {
        sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1";
        libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        description = "sqlite backend for sql-simple";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240734,7 +240734,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "SQL keywords data constructors into OverloadedString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sqlcipher" = callPackage
@@ -240752,8 +240752,8 @@ self: {
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base filepath hspec temporary ];
        description = "Haskell binding to sqlcipher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -240766,7 +240766,7 @@ self: {
        libraryHaskellDepends = [ base logging text transformers ];
        librarySystemDepends = [ unixODBC ];
        description = "Bindings for SQL/CLI (ODBC) C API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) unixODBC;};
 
   "sqlcli-odbc" = callPackage
@@ -240777,7 +240777,7 @@ self: {
        sha256 = "1rfhdaa0wmvc78nbjhi93p9sv66xa6rjr79yyhlkqi1d335b8vb5";
        libraryHaskellDepends = [ base logging sqlcli ];
        description = "ODBC specific definitions to be used by SQL CLI clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sqlite" = callPackage
@@ -240794,8 +240794,8 @@ self: {
        librarySystemDepends = [ sqlite ];
        testHaskellDepends = [ base ];
        description = "Haskell binding to sqlite3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) sqlite;};
 
@@ -240817,7 +240817,7 @@ self: {
          base base16-bytestring bytestring direct-sqlite HUnit text time
        ];
        description = "Mid-Level SQLite client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sqlite-simple-errors" = callPackage
@@ -240829,8 +240829,8 @@ self: {
        libraryHaskellDepends = [ base parsec sqlite-simple text ];
        testHaskellDepends = [ base mtl sqlite-simple text ];
        description = "Wrapper around errors from sqlite-simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240847,8 +240847,8 @@ self: {
          typedquery utf8-string
        ];
        description = "Typed extension to sqlite simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240860,8 +240860,8 @@ self: {
        sha256 = "1r9y3p355rl57pnm84flx734zzjxnnc53fkcfdkykxi5wi5j05v0";
        libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240883,8 +240883,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240900,7 +240900,7 @@ self: {
          adjunctions base bifunctors comonad distributive profunctors
        ];
        description = "The double category of Hask functors and profunctors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "squeal-postgresql" = callPackage
@@ -240940,8 +240940,8 @@ self: {
          with-utf8
        ];
        description = "Squeal PostgreSQL Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -240959,7 +240959,7 @@ self: {
          text
        ];
        description = "Use databases with the version 3 series of the SQLite C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "squeeze" = callPackage
@@ -240983,7 +240983,7 @@ self: {
        ];
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241011,8 +241011,8 @@ self: {
          userid uuid uuid-orphans uuid-types zlib
        ];
        description = "Module limbo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241032,7 +241032,7 @@ self: {
        ];
        description = "Build and install Debian packages completely from source";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241044,7 +241044,7 @@ self: {
        sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6";
        libraryHaskellDepends = [ base ];
        description = "Data types for managing source code locations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "srec" = callPackage
@@ -241055,7 +241055,7 @@ self: {
        sha256 = "028sb4znvdqsygipcsf44j0xazk03pdfkirzrczmxcd11srh3h1k";
        libraryHaskellDepends = [ base bytestring ];
        description = "Parsing and processing s-records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sscan" = callPackage
@@ -241073,8 +241073,8 @@ self: {
          temporary text time vty
        ];
        description = "text UI for scanning with SANE";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241092,8 +241092,8 @@ self: {
          MonadCatchIO-mtl mtl transformers utf8-string
        ];
        description = "Simple SCGI Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241106,7 +241106,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Formats Strings with subscript or superscript characters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ssh" = callPackage
@@ -241137,8 +241137,8 @@ self: {
        ];
        doCheck = false;
        description = "A pure-Haskell SSH server library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241159,7 +241159,7 @@ self: {
          test-framework-quickcheck2 text unix
        ];
        description = "Read and interpret the SSH known-hosts file";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ssh-tunnel" = callPackage
@@ -241176,8 +241176,8 @@ self: {
          base foldl http-client managed text transformers turtle uuid
        ];
        description = "Proxy http-client via ssh tunnel";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241198,8 +241198,8 @@ self: {
          base containers hspec keyword-args nagios-check parsec
        ];
        description = "Check sshd configuration for adherence to best practices";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241219,7 +241219,7 @@ self: {
          regex-compat stm unix
        ];
        description = "Wrapper daemon to manage an ssh tunnel";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sssp" = callPackage
@@ -241247,8 +241247,8 @@ self: {
          wai-extra warp
        ];
        description = "HTTP proxy for S3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241267,8 +241267,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241283,7 +241283,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        description = "Comma-separated-value (CSV) read, show and write routines";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "st2" = callPackage
@@ -241294,8 +241294,8 @@ self: {
        sha256 = "0i7v9yacwgf6aj67c4r2n8zcm07jrcff9nl52sx7ylsjs65ym2qz";
        libraryHaskellDepends = [ base gdp ghc-prim primitive ];
        description = "shared heap regions between local mutable state threads";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241312,8 +241312,8 @@ self: {
          base criterion fingertree heaps mwc-random pqueue vector
        ];
        description = "Purely functional stable heaps (fair priority queues)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241325,8 +241325,8 @@ self: {
        sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w";
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Heterogeneous maps keyed by StableNames";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241339,8 +241339,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base ghc-prim ];
        description = "algorithms around stable marriage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241354,8 +241354,8 @@ self: {
        editedCabalFile = "1wlz6cpbvf8mi4c78dwwbdxsk2wax3y7q27hy78h83gl0cbnfiij";
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241380,8 +241380,8 @@ self: {
          QuickCheck tasty tasty-quickcheck text
        ];
        description = "Trees whose branches are resistant to change";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241418,7 +241418,7 @@ self: {
          aeson base criterion deepseq megaparsec text
        ];
        description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack" = callPackage
@@ -241512,7 +241512,7 @@ self: {
          $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
        '';
        description = "The Haskell Tool Stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack-all" = callPackage
@@ -241530,7 +241530,7 @@ self: {
          simple-cmd-args text
        ];
        description = "CLI tool for building across Stackage major versions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack-bump" = callPackage
@@ -241553,8 +241553,8 @@ self: {
          lens-aeson optparse-applicative process QuickCheck strict text yaml
        ];
        description = "Dead simple version bumping for hpack packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241572,7 +241572,7 @@ self: {
          base directory extra filemanip filepath simple-cmd simple-cmd-args
        ];
        description = "Clean away old stack build artefacts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack-fix" = callPackage
@@ -241585,8 +241585,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base options text turtle ];
        description = "Console program used to fix Stack build errors automatically";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241613,8 +241613,8 @@ self: {
          time
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241630,8 +241630,8 @@ self: {
          base monad-logger path stack time transformers
        ];
        description = "Wrapper to use stack as a library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241673,8 +241673,8 @@ self: {
          transformers yaml
        ];
        description = "A program for extending Stack to add distributed capabilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241693,8 +241693,8 @@ self: {
        ];
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241714,8 +241714,8 @@ self: {
          directory filepath MissingH stm terminal-size time vty
        ];
        description = "An equivalent to cabal run for stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241743,8 +241743,8 @@ self: {
          lens lens-aeson MissingH process stm-containers text time wreq
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241766,7 +241766,7 @@ self: {
          process text
        ];
        description = "Create etags for Haskell projects based on Stack snapshots";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stack-templatizer" = callPackage
@@ -241779,7 +241779,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring directory filepath ];
        description = "Generate a stack template from a folder";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stack-type" = callPackage
@@ -241790,8 +241790,8 @@ self: {
        sha256 = "13kc36p62kmni6lksr3j5mlndc1rmmgir9p0k7qcv5ph6rbrc47k";
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241808,8 +241808,8 @@ self: {
        libraryHaskellDepends = [ base filepath process ];
        executableHaskellDepends = [ base filepath process ];
        description = "Call ghc within stack by calling ghc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241826,7 +241826,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Parse a stack.yaml file";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stack2cabal" = callPackage
@@ -241852,8 +241852,8 @@ self: {
          http-client-tls optparse-applicative process safe temporary text
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241880,8 +241880,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Convert stack.yaml files into Nix build instructions.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241900,8 +241900,8 @@ self: {
          stackage-upload
        ];
        description = "Dummy package forcing installation of other Stackage packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241926,8 +241926,8 @@ self: {
          aeson base optparse-applicative stackage-cli text
        ];
        description = "Calculate and print (in different formats) Stackage build plans";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241948,8 +241948,8 @@ self: {
          optparse-applicative parsec process stackage-cli system-fileio text
        ];
        description = "A CLI executable for cabal-based stackage commands";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -241971,8 +241971,8 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        description = "A CLI library for stackage commands";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242017,8 +242017,8 @@ self: {
          http-client http-client-tls QuickCheck text yaml
        ];
        description = "Tools for curating Stackage bundles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242040,7 +242040,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Secure download of packages for cabal-install";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stackage-metadata" = callPackage
@@ -242067,8 +242067,8 @@ self: {
          stackage-install stackage-update tar text transformers yaml
        ];
        description = "DEPRECATED Grab current metadata for all packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242092,8 +242092,8 @@ self: {
          unordered-containers vector yaml
        ];
        description = "Tool for querying Stackage";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242114,8 +242114,8 @@ self: {
          directory filepath optparse-applicative process stackage-cli text
        ];
        description = "Work with shared stackage sandboxes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242139,8 +242139,8 @@ self: {
          unordered-containers yaml
        ];
        description = "An executable for downloading a Haskell setup";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242166,8 +242166,8 @@ self: {
          optparse-applicative text
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242187,8 +242187,8 @@ self: {
          text time unordered-containers vector
        ];
        description = "Shared data types between various Stackage packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242203,7 +242203,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        executableHaskellDepends = [ base ];
        description = "Update your package index incrementally (requires git)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stackage-upload" = callPackage
@@ -242225,8 +242225,8 @@ self: {
          base optparse-applicative stackage-cli
        ];
        description = "A more secure version of cabal upload which uses HTTPS";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242257,8 +242257,8 @@ self: {
          yaml
        ];
        description = "Convert Stack files into Nix build instructions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242282,7 +242282,7 @@ self: {
          recursion-schemes rosezipper safe text transformers utf8-string
        ];
        description = "Program to fold GHC prof files into flamegraph input";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "stacked-dag" = callPackage
@@ -242301,7 +242301,7 @@ self: {
        ];
        testHaskellDepends = [ base containers doctest graphviz text ];
        description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "staf" = callPackage
@@ -242313,7 +242313,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Numerical statistics for Foldable containers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "stagen" = callPackage
@@ -242336,7 +242336,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Static site generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stan" = callPackage
@@ -242367,7 +242367,7 @@ self: {
        ];
        doHaddock = false;
        description = "Haskell STatic ANalyser";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "standalone-derive-topdown" = callPackage
@@ -242378,8 +242378,8 @@ self: {
        sha256 = "179pm3wixdqg7786l8ys2nwpx7anpnvsl63bj25cgs8082g587v0";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "This package will derive class instance along the data type declaration tree. (Deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242397,8 +242397,8 @@ self: {
          base Cabal containers directory filepath optparse-applicative
        ];
        description = "Generate standalone haddock documentation for a set of packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242410,7 +242410,7 @@ self: {
        sha256 = "03lk46s8v3pgxgk4ddyf382rspqvkf61v9bffhym0pd4didnz9d5";
        libraryHaskellDepends = [ base ];
        description = "*-semirings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "star-to-star" = callPackage
@@ -242422,7 +242422,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "the * -> * types, operators, and covariant instances";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "star-to-star-contra" = callPackage
@@ -242434,7 +242434,7 @@ self: {
        libraryHaskellDepends = [ base star-to-star ];
        description = "contravariant instances for * -> * types and operators";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "starling" = callPackage
@@ -242447,8 +242447,8 @@ self: {
          base binary bytestring failure transformers
        ];
        description = "A memcached client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242469,7 +242469,7 @@ self: {
        ];
        description = "Space simulation game";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "starter" = callPackage
@@ -242480,7 +242480,7 @@ self: {
        sha256 = "14rxrs1gjsm26m7rk4rj9b2389zca0j24kjl7sfznqpxgk99qmpx";
        libraryHaskellDepends = [ base fsnotify ];
        description = "Develop applications without restarts";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "stash" = callPackage
@@ -242495,8 +242495,8 @@ self: {
          aeson attoparsec base bytestring directory hashable text vector
        ];
        description = "To be written";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242509,7 +242509,7 @@ self: {
        libraryHaskellDepends = [ arrows base mtl ];
        description = "Data.State";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242526,8 +242526,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec transformers ];
        description = "Monad transformers for holding bags of state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242541,7 +242541,7 @@ self: {
        libraryHaskellDepends = [ aeson base shakespeare text ];
        testHaskellDepends = [ aeson base hspec QuickCheck text ];
        description = "ISO 3166-2:US state codes and i18n names";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "state-plus" = callPackage
@@ -242553,8 +242553,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        description = "MonadPlus for StateT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242567,7 +242567,7 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Better records for State monad states";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242586,7 +242586,7 @@ self: {
          vector
        ];
        description = "A faster variant of the RWS monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "statechart" = callPackage
@@ -242599,7 +242599,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base polyparse ];
        description = "Compiles Rhapsody statecharts to C";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stateful-mtl" = callPackage
@@ -242610,8 +242610,8 @@ self: {
        sha256 = "19645rqfqbcvngq8hj7bryl35lgx7p5k55vgsxa1a2hm2kq8vm5h";
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242623,7 +242623,7 @@ self: {
        sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Abstraction for things that work like IORef";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "statestack" = callPackage
@@ -242636,8 +242636,8 @@ self: {
          base mtl transformers transformers-compat
        ];
        description = "Simple State-like monad transformer with saveable and restorable state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242649,8 +242649,8 @@ self: {
        sha256 = "05clniwqk4i3zz22jzbjj2x9cgkxb2ks7mccjyp3gyy4zbm2xlmz";
        libraryHaskellDepends = [ applicative base transformers ];
        description = "The ST monad and STRefs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {applicative = null;};
 
@@ -242668,7 +242668,7 @@ self: {
        librarySystemDepends = [ libstatgrab ];
        description = "Collect system level metrics and statistics";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libstatgrab;};
 
   "static" = callPackage
@@ -242688,7 +242688,7 @@ self: {
          base doctest mtl tasty tasty-hunit transformers
        ];
        description = "Type-safe and interoperable static values and closures";
-       license = stdenv.lib.licenses.gpl3Plus;
+       license = lib.licenses.gpl3Plus;
      }) {};
 
   "static-canvas" = callPackage
@@ -242701,8 +242701,8 @@ self: {
        editedCabalFile = "1z3mi5z590xxmipd5fxylcmf39rrwvmwva2rkk6km1nxb5kfasl7";
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        description = "DSL to generate HTML5 Canvas javascript";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242719,8 +242719,8 @@ self: {
          template-haskell
        ];
        description = "Serialisable static pointers to functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242732,7 +242732,7 @@ self: {
        sha256 = "0nkgx4s389027zi23wmbc6wqnmplvjvbrsbyzy7zn41mbwmzqz8l";
        libraryHaskellDepends = [ array base containers hashable primes ];
        description = "Immutable hash";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "static-resources" = callPackage
@@ -242753,7 +242753,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 time
        ];
        description = "JavaScript and Css files concat for http optimization. Now with LESS support.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "static-tensor" = callPackage
@@ -242776,8 +242776,8 @@ self: {
          base criterion deepseq linear mwc-random vector
        ];
        description = "Tensors of statically known size";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242799,8 +242799,8 @@ self: {
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Lists, Texts, ByteStrings and Vectors of statically known length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242812,7 +242812,7 @@ self: {
        sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf";
        libraryHaskellDepends = [ base MissingH ];
        description = "Reusable static analysis interfaces and modules";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "statistics" = callPackage
@@ -242838,7 +242838,7 @@ self: {
          tasty-hunit tasty-quickcheck vector vector-algorithms
        ];
        description = "A library of statistical types, data, and functions";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "statistics-dirichlet" = callPackage
@@ -242853,8 +242853,8 @@ self: {
          base deepseq hmatrix-special nonlinear-optimization vector
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242866,8 +242866,8 @@ self: {
        sha256 = "17w7vz0jarbyf9y72bn9yg134q6ja5ymfyl1v9nx94glbhbybrlf";
        libraryHaskellDepends = [ base vector ];
        description = "An implementation of high performance, minimal statistics functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242883,8 +242883,8 @@ self: {
          base math-functions mwc-random primitive statistics
        ];
        description = "Random variate generation from hypergeometric distributions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242900,7 +242900,7 @@ self: {
          base MonadRandom random random-shuffle safe statistics vector
        ];
        description = "Linear regression between two samples, based on the 'statistics' package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "statistics-skinny" = callPackage
@@ -242925,7 +242925,7 @@ self: {
          tasty-quickcheck vector vector-algorithms
        ];
        description = "A library of statistical types, data, and functions";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "stats" = callPackage
@@ -242938,8 +242938,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base statistics text vector ];
        description = "command line statistics";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242955,8 +242955,8 @@ self: {
          base bytestring monad-control mtl network random
        ];
        description = "StatsD API";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242974,8 +242974,8 @@ self: {
          network network-uri old-time random time-units
        ];
        description = "Statsd UDP client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -242991,7 +242991,7 @@ self: {
          base bytestring monad-control network text transformers-base
        ];
        description = "DataDog-flavored StatsD client";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "statsdi" = callPackage
@@ -243014,8 +243014,8 @@ self: {
          base bytestring hspec network stm tasty tasty-hspec time
        ];
        description = "A lovely [Dog]StatsD implementation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243039,7 +243039,7 @@ self: {
          base dbus dbus-hslogger hslogger optparse-applicative
        ];
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "statvfs" = callPackage
@@ -243050,8 +243050,8 @@ self: {
        sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1";
        libraryHaskellDepends = [ base ];
        description = "Get unix filesystem statistics with statfs, statvfs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243081,7 +243081,7 @@ self: {
          text unordered-containers
        ];
        description = "What version is the package X in stackage lts-Y.ZZ?";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stb-image" = callPackage
@@ -243092,7 +243092,7 @@ self: {
        sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
        libraryHaskellDepends = [ base bitmap bytestring ];
        description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "stb-image-redux_0_2_1_2" = callPackage
@@ -243104,8 +243104,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243118,8 +243118,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243131,7 +243131,7 @@ self: {
        sha256 = "1fk9qkra5f18wql76vakdq9796z0dbg1d4apv2zjj47rla43ii38";
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "stc-lang" = callPackage
@@ -243164,8 +243164,8 @@ self: {
          test-framework-hunit time transformers
        ];
        description = "A library for implicit, monadic dataflow parallelism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243177,7 +243177,7 @@ self: {
        sha256 = "0ldn5yxpj99yhhp5x7zlxjmd9qgqyjg68avr19k7argwcf3nr9y9";
        doHaddock = false;
        description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stdata" = callPackage
@@ -243188,8 +243188,8 @@ self: {
        sha256 = "0ijir2knl4vc1cpzzmf32wcjfdc958li1wd7w5vdmgk4bx45kybf";
        libraryHaskellDepends = [ base parsec syb template-haskell ];
        description = "Structure Data Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243212,8 +243212,8 @@ self: {
          aeson base base64-bytestring binary bytestring split text
        ];
        description = "Parse Structured Test Data Format (STDF)";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243239,8 +243239,8 @@ self: {
          quickcheck-instances scientific word8
        ];
        description = "A simple and high performance IO toolkit for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libuv;};
 
@@ -243254,8 +243254,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory parsec transformers ];
        description = "List and launch steam games from the cli";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243286,7 +243286,7 @@ self: {
          regex-tdfa semigroups stm streaming text yaml
        ];
        description = "A file watcher and development tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stego-uuid" = callPackage
@@ -243299,8 +243299,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cryptonite memory uuid ];
        testHaskellDepends = [ base random uuid ];
        description = "Generator and verifier for steganographic numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243312,8 +243312,8 @@ self: {
        sha256 = "1pg6bk9p1agip8nqzvdpw1hjjf0nwq9fmr58750wda6il7nljx3m";
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to the Snowball stemming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243327,8 +243327,8 @@ self: {
        editedCabalFile = "0pvghdxgd56yjm33lrzk6343lklnfdw77g30vhbfddwwdx1ifx2v";
        libraryHaskellDepends = [ base text ];
        description = "Extract the stem of a German inflected word form";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243347,7 +243347,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Staircase functions or piecewise constant functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stepwise" = callPackage
@@ -243358,7 +243358,7 @@ self: {
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
        libraryHaskellDepends = [ base containers mtl ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243376,8 +243376,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Positive rational numbers represented as paths in the Stern-Brocot tree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243406,8 +243406,8 @@ self: {
          tasty-rerun tasty-smallcheck template-haskell text
        ];
        description = "Educational implementation of the STG (Spineless Tagless G-machine)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243419,7 +243419,7 @@ self: {
        sha256 = "0iw1ia3sf4rwzbkcckbxzr288i6lbgv7vaaynyrkg2c17gjs492a";
        libraryHaskellDepends = [ base ];
        description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stitch" = callPackage
@@ -243436,7 +243436,7 @@ self: {
        testHaskellDepends = [ base Cabal hspec text ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "lightweight CSS DSL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm_2_5_0_0" = callPackage
@@ -243449,8 +243449,8 @@ self: {
        editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "stm-actor" = callPackage
@@ -243466,7 +243466,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec mtl stm stm-queue ];
        description = "A simplistic actor model based on STM";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stm-channelize" = callPackage
@@ -243477,7 +243477,7 @@ self: {
        sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm";
        libraryHaskellDepends = [ base stm ];
        description = "Transactional I/O for duplex streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-chans" = callPackage
@@ -243491,7 +243491,7 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base stm ];
        description = "Additional types of channels for STM";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-chunked-queues" = callPackage
@@ -243503,8 +243503,8 @@ self: {
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        description = "Chunked Communication Queues";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243530,7 +243530,7 @@ self: {
          test-framework-quickcheck2 transformers unliftio
        ];
        description = "Introduces conduits to channels, and promotes using conduits concurrently";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-containers" = callPackage
@@ -243550,8 +243550,8 @@ self: {
          quickcheck-text rerebase
        ];
        description = "Containers for STM";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243564,7 +243564,7 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base stm ];
        description = "Updatable one-shot timer polled with STM";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-extras" = callPackage
@@ -243575,7 +243575,7 @@ self: {
        sha256 = "0pmpf1r8q1favrbgvrnggvs93vwvml79yfqbs4xjqnjsglahl8c8";
        libraryHaskellDepends = [ base stm ];
        description = "Extra STM functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-firehose" = callPackage
@@ -243593,8 +243593,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit stm ];
        description = "Conduits and STM operations for fire hoses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243621,8 +243621,8 @@ self: {
          rebase
        ];
        description = "STM-specialised Hash Array Mapped Trie";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243635,7 +243635,7 @@ self: {
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base hspec stm ];
        description = "A library for constructing incremental computations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stm-io-hooks" = callPackage
@@ -243646,7 +243646,7 @@ self: {
        sha256 = "021s1ck8b09z6khaky2g8ymxf37hznqrl9n4sakb8j57mhliayvc";
        libraryHaskellDepends = [ array base mtl stm ];
        description = "Launch your IO-actions from within the STM monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-lifted" = callPackage
@@ -243657,7 +243657,7 @@ self: {
        sha256 = "0zsah3s288cgb2h4gdjqvby1c3xp95nvgd561sdhigxcwlxk2658";
        libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-linkedlist" = callPackage
@@ -243668,7 +243668,7 @@ self: {
        sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr";
        libraryHaskellDepends = [ base stm ];
        description = "Mutable, doubly linked lists for STM";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-orelse-io" = callPackage
@@ -243679,7 +243679,7 @@ self: {
        sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4";
        libraryHaskellDepends = [ base stm ];
        description = "Choose between the return value of an STM operation and an IO action";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-promise" = callPackage
@@ -243691,8 +243691,8 @@ self: {
        libraryHaskellDepends = [ base mtl process stm unix ];
        testHaskellDepends = [ base QuickCheck stm ];
        description = "Simple STM Promises for IO computations and external processes";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243709,7 +243709,7 @@ self: {
          async base criterion deepseq hspec stm time
        ];
        description = "An implementation of a real-time concurrent queue";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stm-queue-extras" = callPackage
@@ -243720,7 +243720,7 @@ self: {
        sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100";
        libraryHaskellDepends = [ base stm stm-chans ];
        description = "Extra queue utilities for STM";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "stm-sbchan" = callPackage
@@ -243731,7 +243731,7 @@ self: {
        sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s";
        libraryHaskellDepends = [ base stm stm-tlist ];
        description = "Bounded channel for STM where item sizes can vary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-split" = callPackage
@@ -243742,7 +243742,7 @@ self: {
        sha256 = "06c41p01x62p79bzwryjxr34l7cj65gl227fwwsvd9l6ihk8grp8";
        libraryHaskellDepends = [ base stm ];
        description = "TMVars, TVars and TChans with distinguished input and output side";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-stats" = callPackage
@@ -243755,8 +243755,8 @@ self: {
          base containers stm template-haskell time
        ];
        description = "retry statistics for STM transactions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243771,7 +243771,7 @@ self: {
        libraryHaskellDepends = [ base concurrent-supply ];
        testHaskellDepends = [ async base QuickCheck random Unique ];
        description = "STM wrapper around Control.Concurrent.Supply.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stm-tlist" = callPackage
@@ -243782,7 +243782,7 @@ self: {
        sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6";
        libraryHaskellDepends = [ base stm ];
        description = "Mutable, singly-linked list in STM";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stmcontrol" = callPackage
@@ -243794,8 +243794,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        description = "Control communication among retrying transactions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243811,8 +243811,8 @@ self: {
          base Chart Chart-cairo containers mtl random
        ];
        description = "Monadic composition of probabilistic functions and sampling";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243830,8 +243830,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Library for the IEX Trading API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243906,7 +243906,7 @@ self: {
        libraryHaskellDepends = [ base clock transformers ];
        testHaskellDepends = [ base clock hspec ];
        description = "A simple stopwatch utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable" = callPackage
@@ -243917,8 +243917,8 @@ self: {
        sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg";
        libraryHaskellDepends = [ base mtl ];
        description = "Storable type class for variable-sized data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243930,7 +243930,7 @@ self: {
        sha256 = "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s";
        libraryHaskellDepends = [ base base-orphans ];
        description = "Storable instance for Complex";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable-endian" = callPackage
@@ -243943,7 +243943,7 @@ self: {
        editedCabalFile = "12f8sscsvsarlwz3p6kk9vbvqsbyhs8lhafgn9h7c0z6pz1amrya";
        libraryHaskellDepends = [ base byteorder ];
        description = "Storable instances with endianness";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable-enum" = callPackage
@@ -243954,7 +243954,7 @@ self: {
        sha256 = "01nllxm3fx9f1cxay80bwvmpawrwipk7d2c6xb1q5fr3iwnqqaa2";
        libraryHaskellDepends = [ base prelude-compat ];
        description = "Wrapper that makes any Enum type Storable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable-record" = callPackage
@@ -243969,7 +243969,7 @@ self: {
          base semigroups transformers utility-ht
        ];
        description = "Elegant definition of Storable instances for records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storable-static-array" = callPackage
@@ -243980,8 +243980,8 @@ self: {
        sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm";
        libraryHaskellDepends = [ array base tagged vector ];
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -243995,7 +243995,7 @@ self: {
          base base-orphans storable-record utility-ht
        ];
        description = "Storable instance for pairs and triples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storablevector" = callPackage
@@ -244018,7 +244018,7 @@ self: {
          base deepseq sample-frame unsafe utility-ht
        ];
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storablevector-carray" = callPackage
@@ -244029,7 +244029,7 @@ self: {
        sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i";
        libraryHaskellDepends = [ base carray storablevector utility-ht ];
        description = "Conversion between storablevector and carray";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "storablevector-streamfusion" = callPackage
@@ -244044,8 +244044,8 @@ self: {
          base storablevector stream-fusion utility-ht
        ];
        description = "Conversion between storablevector and stream-fusion lists with fusion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244094,7 +244094,7 @@ self: {
          unordered-containers vector vector-binary-instances void weigh
        ];
        description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "store-core" = callPackage
@@ -244109,7 +244109,7 @@ self: {
          base bytestring ghc-prim primitive text transformers
        ];
        description = "Fast and lightweight binary serialization";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "store-streaming" = callPackage
@@ -244131,7 +244131,7 @@ self: {
          transformers void
        ];
        description = "Streaming interfaces for `store`";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stp" = callPackage
@@ -244145,8 +244145,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base regex-compat ];
        description = "Simple Theorem Prover";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244163,8 +244163,8 @@ self: {
          utf8-string
        ];
        description = "A type class to abstract between many different string types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244189,7 +244189,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stratum-tool" = callPackage
@@ -244209,8 +244209,8 @@ self: {
          unordered-containers vector
        ];
        description = "Client for Stratum protocol";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244226,8 +244226,8 @@ self: {
          base stratux-http stratux-types stratux-websockets
        ];
        description = "A library for stratux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244250,8 +244250,8 @@ self: {
          transformers
        ];
        description = "A demonstration of the stratux library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244267,8 +244267,8 @@ self: {
          aeson base HTTP network-uri stratux-types transformers utf8-string
        ];
        description = "A library for using HTTP with stratux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244284,8 +244284,8 @@ self: {
          aeson base bytestring lens scientific text time
        ];
        description = "A library for reading JSON output from stratux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244302,8 +244302,8 @@ self: {
          websockets
        ];
        description = "A library for using websockets with stratux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244323,8 +244323,8 @@ self: {
          base bytestring criterion ghc-prim temporary vector
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244338,8 +244338,8 @@ self: {
        editedCabalFile = "1jyb8mc99ag72y4bqxw997klrikhnxqrbacmx2ag5kmwsd1v1p12";
        libraryHaskellDepends = [ base ];
        description = "Faster Haskell lists using stream fusion";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244353,8 +244353,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base logict ];
        description = "Simple, Fair and Terminating Backtracking Monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244366,8 +244366,8 @@ self: {
        sha256 = "0dg5hmv61jnpqby4v5g4wpsb7ynsm56fmb3xj2pixswnzqz31ian";
        libraryHaskellDepends = [ base bytestring hidapi mtl split ];
        description = "Control library for the Elgato Stream Deck";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244386,8 +244386,8 @@ self: {
          random transformers utility-ht
        ];
        description = "Programmatically edit MIDI event streams via ALSA";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244403,7 +244403,7 @@ self: {
          base containers ghc-prim mmorph mtl transformers transformers-base
        ];
        description = "an elementary streaming prelude and general stream type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-attoparsec" = callPackage
@@ -244422,7 +244422,7 @@ self: {
          tasty-hunit
        ];
        description = "Attoparsec integration for the streaming ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-base64" = callPackage
@@ -244443,8 +244443,8 @@ self: {
          streaming-with tasty tasty-golden
        ];
        description = "Streaming conversion from/to base64";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244470,8 +244470,8 @@ self: {
          streaming streamly template-haskell transformers vector
        ];
        description = "Benchmarks to compare streaming packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244490,7 +244490,7 @@ self: {
          base binary bytestring hspec streaming streaming-bytestring
        ];
        description = "Streaming interface to binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-bracketed" = callPackage
@@ -244507,7 +244507,7 @@ self: {
          streaming-commons tasty tasty-hunit
        ];
        description = "A resource management decorator for \"streaming\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "streaming-brotli" = callPackage
@@ -244527,8 +244527,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Streaming interface for Brotli (RFC7932) compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244550,7 +244550,7 @@ self: {
          tasty-smallcheck transformers
        ];
        description = "Fast, effectful byte streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-cassava" = callPackage
@@ -244571,8 +244571,8 @@ self: {
          vector
        ];
        description = "Cassava support for the streaming ecosystem";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244595,7 +244595,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
        description = "Common lower-level functions needed by various streaming data libraries";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "streaming-concurrency" = callPackage
@@ -244619,8 +244619,8 @@ self: {
          testbench
        ];
        description = "Concurrency support for the streaming ecosystem";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244637,8 +244637,8 @@ self: {
        ];
        testHaskellDepends = [ base conduit hspec streaming ];
        description = "Bidirectional support between the streaming and conduit libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244655,8 +244655,8 @@ self: {
          streaming-attoparsec streaming-bytestring wai-extra
        ];
        description = "Client-side consumption of a ServerEvent";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244677,7 +244677,7 @@ self: {
          streaming tasty tasty-hunit tasty-quickcheck
        ];
        description = "Translate pull-based stream folds into push-based iteratees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-fft" = callPackage
@@ -244692,8 +244692,8 @@ self: {
          base contiguous-fft ghc-prim prim-instances primitive streaming
        ];
        description = "online streaming fft";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244710,7 +244710,7 @@ self: {
          base containers tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "streaming-lzma" = callPackage
@@ -244730,8 +244730,8 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        description = "Streaming interface for LZMA/XZ compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244754,8 +244754,8 @@ self: {
          vector zlib
        ];
        description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244777,8 +244777,8 @@ self: {
          streaming-attoparsec streaming-bytestring tasty tasty-hunit
        ];
        description = "Stream packets via libpcap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244799,8 +244799,8 @@ self: {
          vector
        ];
        description = "Perfectly streaming PNG image decoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244818,7 +244818,7 @@ self: {
          resourcet safe-exceptions streaming transformers
        ];
        description = "Stream postgresql-query results using the streaming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streaming-process" = callPackage
@@ -244842,8 +244842,8 @@ self: {
          streaming-bytestring
        ];
        description = "Streaming support for running system process";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244865,8 +244865,8 @@ self: {
          streaming-with transformers
        ];
        description = "Sorting streams";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244888,8 +244888,8 @@ self: {
          streaming-bytestring streaming-commons transformers
        ];
        description = "http, attoparsec, pipes and other utilities for the streaming libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244905,8 +244905,8 @@ self: {
          base bytestring bytestring-builder http-types streaming wai
        ];
        description = "Streaming Wai utilities";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ jb55 ];
      }) {};
 
   "streaming-with" = callPackage
@@ -244923,8 +244923,8 @@ self: {
          base exceptions managed streaming-bytestring temporary transformers
        ];
        description = "with/bracket-style idioms for use with streaming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -244952,7 +244952,7 @@ self: {
          transformers
        ];
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-archive" = callPackage
@@ -244973,8 +244973,8 @@ self: {
        ];
        testSystemDepends = [ archive ];
        description = "Stream data from archives using the streamly library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {archive = null;};
 
@@ -244991,7 +244991,7 @@ self: {
          base binary bytestring hspec QuickCheck streamly
        ];
        description = "Integration of streamly and binary";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-bytestring" = callPackage
@@ -245013,7 +245013,7 @@ self: {
          base bytestring deepseq gauge random streamly
        ];
        description = "Library for streamly and bytestring interoperation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-cassava" = callPackage
@@ -245039,7 +245039,7 @@ self: {
          vector weigh
        ];
        description = "CSV streaming support via cassava for the streamly ecosystem";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-fsnotify" = callPackage
@@ -245054,7 +245054,7 @@ self: {
          base filepath fsnotify semirings streamly text time
        ];
        description = "Folder watching as a Streamly stream";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamly-lmdb" = callPackage
@@ -245073,8 +245073,8 @@ self: {
        ];
        testSystemDepends = [ lmdb ];
        description = "Stream data to or from LMDB databases using the streamly library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) lmdb;};
 
@@ -245096,7 +245096,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Posix related streaming APIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "streamproc" = callPackage
@@ -245109,8 +245109,8 @@ self: {
        editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs";
        libraryHaskellDepends = [ base ];
        description = "Stream Processer Arrow";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245126,7 +245126,7 @@ self: {
          adjunctions base comonad distributive semigroupoids semigroups
        ];
        description = "Various Haskell 2010 stream comonads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strelka" = callPackage
@@ -245147,8 +245147,8 @@ self: {
          transformers unordered-containers url-decoders uuid
        ];
        description = "A simple, flexible and composable web-router";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245165,7 +245165,7 @@ self: {
          unordered-containers
        ];
        description = "Core components of \"strelka\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strelka-wai" = callPackage
@@ -245181,7 +245181,7 @@ self: {
          strelka-core text unordered-containers wai warp
        ];
        description = "WAI compatibility layer for \"strelka\"";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strict" = callPackage
@@ -245197,7 +245197,7 @@ self: {
          transformers
        ];
        description = "Strict data types and String IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-base" = callPackage
@@ -245210,7 +245210,7 @@ self: {
        editedCabalFile = "17zgiwiahgjvdamfcffx2dj88qlks4sgrmsqancz5vayp4yf9x1g";
        libraryHaskellDepends = [ base ];
        description = "Strict versions of base data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-base-types" = callPackage
@@ -245225,8 +245225,8 @@ self: {
          aeson base quickcheck-instances strict strict-lens
        ];
        description = "Strict variants of the types provided in base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245238,7 +245238,7 @@ self: {
        sha256 = "1h2nk5fn6gclzkwn5mbkb7gcqisms8y5m3kr64hd9lska3n39n82";
        libraryHaskellDepends = [ base deepseq ];
        description = "Strict concurrency abstractions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-data" = callPackage
@@ -245262,8 +245262,8 @@ self: {
          base containers deepseq doctest hashable HTF vector
        ];
        description = "A collection of commonly used strict data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245275,8 +245275,8 @@ self: {
        sha256 = "0hx1zp99npwdp5w3q93xfidcw59lxskilmbqc80xi97d4w4h8jrb";
        libraryHaskellDepends = [ base ghc syb ];
        description = "Compiler plugin for making Haskell strict";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245290,7 +245290,7 @@ self: {
        editedCabalFile = "0lvazdvzfaawrbj3pklc9p3q1ajfclzirpsiw84hhgn16pqy7fnz";
        libraryHaskellDepends = [ base ];
        description = "Strict Identity Monad, handy for writing fast code!";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-io" = callPackage
@@ -245301,7 +245301,7 @@ self: {
        sha256 = "1jcm1p1slbdxmbnmvqihvgf2czfaj4yks4hyqiv9ng95w9cfpagr";
        libraryHaskellDepends = [ base deepseq extensible-exceptions ];
        description = "A library wrapping standard IO modules to provide strict IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-lens" = callPackage
@@ -245312,7 +245312,7 @@ self: {
        sha256 = "0hwrbrjhgkh83474mci3ipg8nqims7b18w7i6xajz3xxq3cik5vn";
        libraryHaskellDepends = [ base lens strict ];
        description = "Lenses for types in strict package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-list" = callPackage
@@ -245329,7 +245329,7 @@ self: {
          tasty-quickcheck
        ];
        description = "Strict linked list";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strict-optics" = callPackage
@@ -245340,7 +245340,7 @@ self: {
        sha256 = "1x4p2fksljd9xfy4mxdz5pxcskxz2qg2ma28d6y4j2v4728r0x8a";
        libraryHaskellDepends = [ base optics-core strict ];
        description = "Optics for types in strict package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-tuple" = callPackage
@@ -245352,7 +245352,7 @@ self: {
        libraryHaskellDepends = [ base bifunctors deepseq hashable ];
        testHaskellDepends = [ base ];
        description = "Strict tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-tuple-lens" = callPackage
@@ -245365,8 +245365,8 @@ self: {
        editedCabalFile = "0875r7kva6ym17fdklh18vm4s04sd9pj0w55km8jv2kmbkmfja8k";
        libraryHaskellDepends = [ base lens strict-tuple ];
        description = "Optics for the `strict-tuple` library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245383,7 +245383,7 @@ self: {
          unordered-containers vector
        ];
        description = "A type level predicate ranging over strict types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strict-writer" = callPackage
@@ -245395,7 +245395,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
        description = "A stricter writer, which uses StateT in order to avoid space leaks";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strictify" = callPackage
@@ -245410,7 +245410,7 @@ self: {
          base directory filepath process unix
        ];
        description = "Find a local optimum of strictness annotations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strictly" = callPackage
@@ -245421,8 +245421,8 @@ self: {
        sha256 = "1a3azrg9ksb4kmbckjqw3krxj0app6q19ighd6k3z7xpf682qx3c";
        libraryHaskellDepends = [ base deepseq ];
        description = "Combinators for strictifying functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245434,7 +245434,7 @@ self: {
        sha256 = "1l94p8c9j8a2dbpwj5q7d1m61gdhmi6vllz34g8d9qjfwpnx7z6z";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-class" = callPackage
@@ -245445,7 +245445,7 @@ self: {
        sha256 = "1s0bj0wvwriw4516za6ar7w7zsz5mmnf1dba0ch239n27rb00nwf";
        libraryHaskellDepends = [ base bytestring tagged text ];
        description = "String class library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-combinators" = callPackage
@@ -245456,7 +245456,7 @@ self: {
        sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl";
        libraryHaskellDepends = [ base ];
        description = "Polymorphic functions to build and combine stringlike values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-conv" = callPackage
@@ -245467,7 +245467,7 @@ self: {
        sha256 = "0fb04bm384rpiq7kd7v783z1sriqialvjyn0f6dg2si9dwza0ngj";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Standardized conversion between string types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-conversions" = callPackage
@@ -245484,7 +245484,7 @@ self: {
          utf8-string
        ];
        description = "Simplifies dealing with different types for strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-convert" = callPackage
@@ -245500,7 +245500,7 @@ self: {
          base bytestring tasty tasty-hunit text utf8-string
        ];
        description = "Universal string conversions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-fromto" = callPackage
@@ -245511,7 +245511,7 @@ self: {
        sha256 = "0vnf500vahgccbbg7zvxqjxllvyq3jxzf2difqwh46fp62jfqwmx";
        libraryHaskellDepends = [ base bytestring memory text ];
        description = "Conversions between common string types, as well as Base16/Base32/Base64";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-interpolate" = callPackage
@@ -245541,7 +245541,7 @@ self: {
          neat-interpolation QuickCheck text
        ];
        description = "Haskell string/text/bytestring interpolation that just works";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-isos" = callPackage
@@ -245556,8 +245556,8 @@ self: {
          base bytestring mono-traversable safe text type-iso
        ];
        description = "Tools for working with isomorphisms of strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245569,7 +245569,7 @@ self: {
        sha256 = "1b87532fhv2wn6pnzsaw20lzj5j399smlfn7lai0h0ph2axb2dbi";
        libraryHaskellDepends = [ base bytestring text ];
        description = "A package that aims to provide a uniform interface to string-like types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-qq" = callPackage
@@ -245581,7 +245581,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base HUnit text ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "string-quote" = callPackage
@@ -245593,8 +245593,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245618,8 +245618,8 @@ self: {
          tasty-quickcheck text
        ];
        description = "A library for generating random string from a regular experession";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245635,7 +245635,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "longest common substring";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "string-transform" = callPackage
@@ -245651,7 +245651,7 @@ self: {
          base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
        ];
        description = "simple and easy haskell string transform wrapper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "string-typelits" = callPackage
@@ -245666,8 +245666,8 @@ self: {
          base template-haskell type-combinators type-combinators-quote
        ];
        description = "Type-level Chars and Strings, with decidable equality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245679,7 +245679,7 @@ self: {
        sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7";
        libraryHaskellDepends = [ base bytestring system-filepath text ];
        description = "A Stringable type class, in the spirit of Foldable and Traversable";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stringbuilder" = callPackage
@@ -245691,7 +245691,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A writer monad for multi-line string literals";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stringlike" = callPackage
@@ -245708,8 +245708,8 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Transformations to several string-like types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245727,7 +245727,7 @@ self: {
          text-icu
        ];
        description = "Implements the \"StringPrep\" algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strings" = callPackage
@@ -245738,7 +245738,7 @@ self: {
        sha256 = "1xz9v3w5s13yhk7iy9dw6i8s2jc6c0b1ci96dwmcq9a1n3l3ng4v";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Functions for working with strings, including Text, ByteString, etc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stringsearch" = callPackage
@@ -245751,7 +245751,7 @@ self: {
        editedCabalFile = "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378";
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Fast searching, splitting and replacing of ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stringtable-atom" = callPackage
@@ -245762,8 +245762,8 @@ self: {
        sha256 = "1wp6w12bflrqcwi09y7s1crj72n4pbj8bkpwj2ia5gaqn5x56wjs";
        libraryHaskellDepends = [ base binary bytestring containers syb ];
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245779,7 +245779,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strip-ansi-escape" = callPackage
@@ -245793,7 +245793,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Strip ANSI escape code from string";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "stripe" = callPackage
@@ -245809,8 +245809,8 @@ self: {
          unordered-containers utf8-string
        ];
        description = "A Haskell implementation of the Stripe API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245822,7 +245822,7 @@ self: {
        sha256 = "0n4q3hsgqrqypmkkim8mcksdlljgldr908wqxlcz6k1wsv9klyc6";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Types for the Stripe API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-core" = callPackage
@@ -245838,7 +245838,7 @@ self: {
          unordered-containers
        ];
        description = "Stripe API for Haskell - Pure Core";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-haskell" = callPackage
@@ -245849,7 +245849,7 @@ self: {
        sha256 = "02ydf9i632r2clhvf1f9v0yx7vmpmh37mch1jshazrw3my6sq1vl";
        libraryHaskellDepends = [ base stripe-core stripe-http-client ];
        description = "Stripe API for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-hs" = callPackage
@@ -245874,8 +245874,8 @@ self: {
          timespan vector
        ];
        description = "Unofficial Stripe client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245895,7 +245895,7 @@ self: {
          base free hspec http-client stripe-core stripe-tests
        ];
        description = "Stripe API for Haskell - http-client backend";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-http-streams" = callPackage
@@ -245915,8 +245915,8 @@ self: {
        ];
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245933,8 +245933,8 @@ self: {
          stripe-signature text unordered-containers
        ];
        description = "Listen for Stripe webhook events with Scotty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -245951,7 +245951,7 @@ self: {
          unordered-containers vector
        ];
        description = "Unofficial Stripe servant types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stripe-signature" = callPackage
@@ -245968,7 +245968,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring text ];
        description = "Verification of Stripe webhook signatures";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-tests" = callPackage
@@ -245985,7 +245985,7 @@ self: {
          text time transformers unordered-containers
        ];
        description = "Tests for Stripe API bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "stripe-wreq" = callPackage
@@ -246001,8 +246001,8 @@ self: {
          unordered-containers wreq
        ];
        description = "Use the Stripe API via Wreq";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246020,7 +246020,7 @@ self: {
          mtl scientific text time transformers unordered-containers vector
        ];
        description = "Stripe-Library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strips" = callPackage
@@ -246034,7 +246034,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec mtl ];
        description = "resolver using strips algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "strive" = callPackage
@@ -246053,7 +246053,7 @@ self: {
        testHaskellDepends = [ base bytestring markdown-unlit time ];
        testToolDepends = [ markdown-unlit ];
        description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "strongswan-sql" = callPackage
@@ -246084,8 +246084,8 @@ self: {
          network structured-cli text transformers
        ];
        description = "Interface library for strongSwan SQL backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246097,7 +246097,7 @@ self: {
        sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
        libraryHaskellDepends = [ base bytestring text time ];
        description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "structs" = callPackage
@@ -246119,7 +246119,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Strict GC'd imperative object-oriented programming with cheap pointers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "structural-induction" = callPackage
@@ -246139,8 +246139,8 @@ self: {
          testing-feat
        ];
        description = "Instantiate structural induction schemas for algebraic data types";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246153,8 +246153,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        testHaskellDepends = [ base HUnit mtl ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246176,7 +246176,7 @@ self: {
          unordered-containers uuid-types vector
        ];
        description = "Structure (hash) of your data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "structured-cli" = callPackage
@@ -246196,7 +246196,7 @@ self: {
        ];
        executableHaskellDepends = [ base data-default mtl split ];
        description = "Application library for building interactive console CLIs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "structured-cli_2_7_0_1" = callPackage
@@ -246214,8 +246214,8 @@ self: {
        ];
        executableHaskellDepends = [ base data-default mtl split ];
        description = "Application library for building interactive console CLIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "structured-haskell-mode" = callPackage
@@ -246235,8 +246235,8 @@ self: {
          base descriptive ghc-prim haskell-src-exts text
        ];
        description = "Structured editing Emacs mode for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "structured-mongoDB" = callPackage
@@ -246255,7 +246255,7 @@ self: {
        ];
        description = "Structured MongoDB interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246286,8 +246286,8 @@ self: {
          unordered-containers vector
        ];
        description = "\"Advanced\" Data Structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246304,8 +246304,8 @@ self: {
          base tasty tasty-hunit tasty-quickcheck transformers
        ];
        description = "A monad transformer version of the ST monad";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246329,8 +246329,8 @@ self: {
          unbounded-delays
        ];
        description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246351,8 +246351,8 @@ self: {
          lambdacube-bullet lambdacube-engine mtl random vector
        ];
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246380,8 +246380,8 @@ self: {
          attoparsec base snipcheck tasty tasty-ant-xml tasty-hunit
        ];
        description = "(Stutter Text|String)-Utterer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246408,8 +246408,8 @@ self: {
        testHaskellDepends = [ base base-compat bytestring hspec ];
        doHaddock = false;
        description = "Format Cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246440,7 +246440,7 @@ self: {
          test-framework test-framework-hunit text
        ];
        description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "stylist" = callPackage
@@ -246461,8 +246461,8 @@ self: {
          regex-tdfa scientific text unordered-containers
        ];
        description = "Apply CSS styles to a document tree";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246475,7 +246475,7 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Ways to output stylized text on ANSI consoles";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246515,8 +246515,8 @@ self: {
          svg-builder text transformers warp websockets
        ];
        description = "An applicative functor that seamlessly talks to HTML inputs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246534,8 +246534,8 @@ self: {
          tasty-quickcheck
        ];
        description = "Get the total, put a single element";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246547,7 +246547,7 @@ self: {
        sha256 = "17fzdwlmh8ykwqn9h9a60wpnvqbgbz0wk6cgcrglbj0i41jy28jv";
        libraryHaskellDepends = [ base ];
        description = "Some extension to the Foldable and Monoid classes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "subG-instances" = callPackage
@@ -246558,7 +246558,7 @@ self: {
        sha256 = "0nyhd0l0cd1q62ch9jbjyv33f9sdidpgkjbkb0hj4dagqyxpv0jy";
        libraryHaskellDepends = [ base subG vector ];
        description = "Additional instances for the InsertLeft class from subG package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "subcategories" = callPackage
@@ -246587,7 +246587,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Subcategories induced by class constraints";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "subhask" = callPackage
@@ -246613,8 +246613,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion MonadRandom ];
        description = "Type safe interface for programming in subcategories of Hask";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246636,8 +246636,8 @@ self: {
          base containers lens mtl parsec pretty template-haskell
        ];
        description = "Toolchain of subleq computer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246659,8 +246659,8 @@ self: {
          base cmark hlint hspec template-haskell text
        ];
        description = "Extract a part from CommonMark/Markdown docs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246672,7 +246672,7 @@ self: {
        sha256 = "199kslgxlhxv8zx3mj5pxgicjxyff7vzjhw13fwfxcf9pa9289nv";
        libraryHaskellDepends = [ base split ];
        description = "subnetting calculator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "subsample" = callPackage
@@ -246690,8 +246690,8 @@ self: {
          base bytestring cassava containers optparse-generic text vector
        ];
        description = "Subsample data";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246710,8 +246710,8 @@ self: {
          attoparsec base hspec NoTrace parsers QuickCheck text
        ];
        description = "Match / replace substrings with a parser combinators";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246723,7 +246723,7 @@ self: {
        sha256 = "1kkr6zbnv777gnv2lwq3pyxq3vv5r24f4avwv5g4dds3y8d8mv3q";
        libraryHaskellDepends = [ attoparsec base containers text ];
        description = "A parser for .srt and .sub files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "subtitles" = callPackage
@@ -246736,7 +246736,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base split ];
        description = "Modify SRT subtitle files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "subwordgraph" = callPackage
@@ -246748,8 +246748,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Subword graph implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246762,7 +246762,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "Helps when going \"seed values\" -> alternatives and optional -> answers";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "success" = callPackage
@@ -246777,7 +246777,7 @@ self: {
          base monad-control mtl transformers transformers-base
        ];
        description = "A version of Either specialised for encoding of success or failure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "successors" = callPackage
@@ -246788,8 +246788,8 @@ self: {
        sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg";
        libraryHaskellDepends = [ base ];
        description = "An applicative functor to manage successors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246810,8 +246810,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Simple and moderately efficient suffix array implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246826,8 +246826,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        executableHaskellDepends = [ base HUnit ];
        description = "n log n implementation of suffix array";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246839,7 +246839,7 @@ self: {
        sha256 = "1ddk2hp27al9jzcgkrhv7v1i7knci4l22flkgb2r94h96z5nhfq6";
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Efficient, lazy suffix tree implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sugarhaskell" = callPackage
@@ -246853,7 +246853,7 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Library-based syntactic extensibility for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246865,8 +246865,8 @@ self: {
        sha256 = "1pvw7zgvfr0z2gjy224gd92ayh20j3v97rdlqmq6k6g4yabdpgci";
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246879,7 +246879,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Library for reducing the boilerplate involved with sum types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "summer" = callPackage
@@ -246891,7 +246891,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base ];
        description = "An implementation of extensible products and sums";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "summoner" = callPackage
@@ -246918,8 +246918,8 @@ self: {
          validation-selective
        ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246939,8 +246939,8 @@ self: {
        ];
        executableHaskellDepends = [ base relude ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246958,8 +246958,8 @@ self: {
          base bytestring data-default lens serialport transformers vector
        ];
        description = "A Haskell interface to SUMP-compatible logic analyzers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -246971,7 +246971,7 @@ self: {
        sha256 = "09xh3pbyarflfjk17bn2isgpmsq49d6gmq7z918kf4c32fc7x6yb";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Bindings to the sundown markdown library";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "sunlight" = callPackage
@@ -246987,8 +246987,8 @@ self: {
          tuple
        ];
        description = "Test Cabalized package against multiple dependency versions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247006,8 +247006,8 @@ self: {
          semigroups tagged template-haskell transformers vector-space
        ];
        description = "Monadic Javascript Compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247029,8 +247029,8 @@ self: {
          sunroof-server
        ];
        description = "Tests for Sunroof";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247052,8 +247052,8 @@ self: {
          wai-middleware-static warp
        ];
        description = "Monadic Javascript Compiler - Server Utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247083,8 +247083,8 @@ self: {
          process QuickCheck text transformers unix validity validity-path
        ];
        description = "Configure your dotfile deployment with a DSL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247099,8 +247099,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec ];
        description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247118,7 +247118,7 @@ self: {
          async base buffer-builder bytestring criterion
        ];
        description = "Efficiently build a bytestring from smaller chunks";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "supercollider-ht" = callPackage
@@ -247136,7 +247136,7 @@ self: {
        ];
        description = "Haskell SuperCollider utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247160,7 +247160,7 @@ self: {
        ];
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247177,8 +247177,8 @@ self: {
          template-haskell type-eq
        ];
        description = "Access an instance's constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247193,7 +247193,7 @@ self: {
          base Cabal containers directory filepath
        ];
        description = "Additional documentation markup and Unicode support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "superevent" = callPackage
@@ -247218,8 +247218,8 @@ self: {
          transformers uuid vector
        ];
        description = "A simple opinionated event store implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247236,8 +247236,8 @@ self: {
        ];
        testHaskellDepends = [ base containers ghc QuickCheck ];
        description = "Plugin and base library to support supermonads in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247258,8 +247258,8 @@ self: {
        ];
        testHaskellDepends = [ aeson async base bytestring streamly text ];
        description = "Apache Pulsar client for Haskell";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247278,8 +247278,8 @@ self: {
          process time uniplate
        ];
        description = "A Supercompiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247299,7 +247299,7 @@ self: {
          aeson base bookkeeper criterion deepseq labels text
        ];
        description = "Supercharged anonymous records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "supervisor" = callPackage
@@ -247312,8 +247312,8 @@ self: {
          base containers exceptions monadloc mtl
        ];
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247332,7 +247332,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Monitor groups of threads with non-hierarchical lifetimes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "supplemented" = callPackage
@@ -247350,8 +247350,8 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "Early termination for monads";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247363,8 +247363,8 @@ self: {
        sha256 = "1nhq7lfzsbh9ra1m1n7649q35ch6l1lgm110p1qbxgvv6w6xmz41";
        libraryHaskellDepends = [ base lens mtl template-haskell ];
        description = "An output coverage checker";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247376,7 +247376,7 @@ self: {
        sha256 = "0wphk3dabba6rgd9lkxbsmq5vivvyy6b4jfxfndqb53yhdj5nkrg";
        libraryHaskellDepends = [ base lifted-base transformers-base ];
        description = "Simple package that allows for long thread suspensions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sv" = callPackage
@@ -247404,8 +247404,8 @@ self: {
          vector
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247427,7 +247427,7 @@ self: {
          base bytestring cassava HUnit sv-core text validation vector
        ];
        description = "Integration to use sv with cassava's parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sv-core" = callPackage
@@ -247454,7 +247454,7 @@ self: {
          tasty tasty-quickcheck text validation vector
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "sv-svfactor" = callPackage
@@ -247471,8 +247471,8 @@ self: {
          base bytestring lens profunctors sv-core svfactor validation
        ];
        description = "sv-core + svfactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247498,8 +247498,8 @@ self: {
          tasty-hedgehog tasty-hunit text trifecta utf8-string vector
        ];
        description = "Syntax-preserving CSV manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247517,8 +247517,8 @@ self: {
          base blaze-builder bytestring hashable text unordered-containers
        ];
        description = "DSL for building SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247534,8 +247534,8 @@ self: {
          base blaze-builder bytestring hashable text unordered-containers
        ];
        description = "DSL for building SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247553,7 +247553,7 @@ self: {
          scientific text transformers vector xml
        ];
        description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "svg2q" = callPackage
@@ -247570,8 +247570,8 @@ self: {
          base haskell98 language-c pretty svgutils syb xml
        ];
        description = "Code generation tool for Quartz code from a SVG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247588,8 +247588,8 @@ self: {
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
        description = "Binding to the libsvg-cairo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) librsvg;};
 
@@ -247613,8 +247613,8 @@ self: {
          lens linear mtl pretty-simple process reanimate-svg safe text
        ];
        description = "Optimise SVGs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247629,8 +247629,8 @@ self: {
        libraryHaskellDepends = [ base xml ];
        executableHaskellDepends = [ base filepath xml ];
        description = "Helper functions for dealing with SVG files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247642,7 +247642,7 @@ self: {
        sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz";
        libraryHaskellDepends = [ array base ];
        description = "A support vector machine written in Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "svm-light-utils" = callPackage
@@ -247655,8 +247655,8 @@ self: {
        editedCabalFile = "0mrnfxg1h3mrbx192n8hl7m9i64n8cfrai2yksvhkgp6b8qxqnma";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Parsers and formatters for the SVMlight input file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247673,8 +247673,8 @@ self: {
          monad-par mwc-random vector
        ];
        description = "Medium level, simplified, bindings to libsvm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247693,8 +247693,8 @@ self: {
          attoparsec base bytestring directory doctest filepath zlib
        ];
        description = "Library for reading Subversion dump files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247712,7 +247712,7 @@ self: {
        testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "Implementation of swagger data model";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "swagger-petstore" = callPackage
@@ -247739,8 +247739,8 @@ self: {
          semigroups text time transformers unordered-containers vector
        ];
        description = "Auto-generated openapi-petstore API Client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247770,8 +247770,8 @@ self: {
          optparse-applicative random swagger2 text
        ];
        description = "Testing of Swagger APIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247806,7 +247806,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "swapper" = callPackage
@@ -247823,8 +247823,8 @@ self: {
        ];
        librarySystemDepends = [ tokyocabinet ];
        description = "Transparently swapping data from in-memory structures to disk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
@@ -247844,8 +247844,8 @@ self: {
          random-shuffle readline system-fileio system-filepath text
        ];
        description = "Clojure without alphanumerics";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247868,8 +247868,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Shallow embedding implementation of non-linear pattern matching";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247881,8 +247881,8 @@ self: {
        sha256 = "1jx5941kb97w4zpgz7m1r2x2lxllmi1i9a9nmwflinyj74xxg1rl";
        libraryHaskellDepends = [ base mtl pretty ];
        description = "A library for creating Shockwave Flash (SWF) files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247898,8 +247898,8 @@ self: {
          array base containers ghc-prim mwc-random primitive vector
        ];
        description = "Online sampler for Latent Dirichlet Allocation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247925,7 +247925,7 @@ self: {
          test-framework test-framework-hunit text time
        ];
        description = "A semantic web toolkit";
-       license = stdenv.lib.licenses.lgpl21;
+       license = lib.licenses.lgpl21;
      }) {};
 
   "swiss-ephemeris" = callPackage
@@ -247939,8 +247939,8 @@ self: {
        testHaskellDepends = [ base directory hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings for the Swiss Ephemeris C library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247964,8 +247964,8 @@ self: {
          wai-middleware-static warp warp-tls x509
        ];
        description = "A simple web server for serving directories";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -247979,7 +247979,7 @@ self: {
          base containers polyparse text xml-types
        ];
        description = "A SXML-parser";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "syb" = callPackage
@@ -247991,7 +247991,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers HUnit mtl ];
        description = "Scrap Your Boilerplate";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "syb-extras" = callPackage
@@ -248004,8 +248004,8 @@ self: {
        editedCabalFile = "1a0kb7an663vhhi4wd4hfc5235bampxcyl8g5ssajm6ggs7n7gm3";
        libraryHaskellDepends = [ base eq prelude-extras ];
        description = "Higher order versions of the Scrap Your Boilerplate classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248022,7 +248022,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        description = "Scrap Your Boilerplate With Class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "syb-with-class-instances-text" = callPackage
@@ -248033,8 +248033,8 @@ self: {
        sha256 = "0vnpqk89nxs0anx62mzasl9wrcscw18vwc284y067ryb086aj2hf";
        libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248061,7 +248061,7 @@ self: {
        testToolDepends = [ sydtest-discover ];
        description = "An advanced modern testing framework for Haskell with good defaults and advanced testing features";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {sydtest-discover = null;};
 
   "syfco" = callPackage
@@ -248081,8 +248081,8 @@ self: {
          array base containers convertible directory mtl parsec transformers
        ];
        description = "Synthesis Format Conversion Tool / Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248109,7 +248109,7 @@ self: {
        ];
        description = "Lambda calculus visualization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248122,8 +248122,8 @@ self: {
        libraryHaskellDepends = [ base containers hashable vector ];
        testHaskellDepends = [ base hashable QuickCheck ];
        description = "Permutations, patterns, and statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248135,8 +248135,8 @@ self: {
        sha256 = "1ppq86fv5knfdcfn3pfiyg7v9k1aq47xp0b6yn8bwkfhcxxmbbhp";
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        description = "Plot permutations; an addition to the sym package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248153,8 +248153,8 @@ self: {
          text transformers
        ];
        description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248176,8 +248176,8 @@ self: {
          tasty tasty-golden text time transformers treeseq
        ];
        description = "Library for reading and writing Atom";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248189,7 +248189,7 @@ self: {
        sha256 = "1yvlvsr38b1ydplpz1jldy816sngmic273iajcmhr73rlyzk5y3d";
        libraryHaskellDepends = [ base ];
        description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "symantic-cli" = callPackage
@@ -248205,8 +248205,8 @@ self: {
          transformers
        ];
        description = "Symantics for parsing and documenting a CLI";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248223,7 +248223,7 @@ self: {
          base containers tasty tasty-hunit text transformers
        ];
        description = "Document symantics";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "symantic-grammar" = callPackage
@@ -248239,7 +248239,7 @@ self: {
          base megaparsec tasty tasty-hunit text transformers
        ];
        description = "Library for symantic grammars";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "symantic-http" = callPackage
@@ -248255,8 +248255,8 @@ self: {
          text transformers
        ];
        description = "Symantic combinators for deriving clients or a server from an HTTP API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248275,8 +248275,8 @@ self: {
          symantic-http text time transformers word8
        ];
        description = "symantic-http applied to the derivation of HTTP clients";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248303,8 +248303,8 @@ self: {
          time transformers wai wai-extra warp
        ];
        description = "Demo for symantic-http and its companion libraries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248326,8 +248326,8 @@ self: {
          symantic-http text time transformers word8
        ];
        description = "Streaming support through pipes for symantic-http";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248346,8 +248346,8 @@ self: {
          text time transformers wai warp word8
        ];
        description = "symantic-http applied to the derivation of HTTP servers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248375,8 +248375,8 @@ self: {
          transformers wai wai-extra warp
        ];
        description = "Test symantic-http and its companion libraries";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248399,8 +248399,8 @@ self: {
          tasty-hunit text transformers
        ];
        description = "Symantics for common types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248424,8 +248424,8 @@ self: {
          transformers unix unordered-containers
        ];
        description = "Parser combinators statically optimized and staged via typed meta-programming";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248449,8 +248449,8 @@ self: {
          symantic-base tasty tasty-golden text transformers treeseq
        ];
        description = "Library for reading, validating and writing XML";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248482,8 +248482,8 @@ self: {
          websockets-simple-extra
        ];
        description = "Data serialization, communication, and operation verification implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248497,7 +248497,7 @@ self: {
        editedCabalFile = "0jdbaap11pkgb6m98v57k7qnx62pqxy7pa2i7293ywa4q305qgm1";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "A 'Symbol' type for fast symbol comparison";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "symbolic-link" = callPackage
@@ -248509,8 +248509,8 @@ self: {
        libraryHaskellDepends = [ base directory unix ];
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Symlink functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248522,7 +248522,7 @@ self: {
        sha256 = "19hlvyq5s4lvqi8n4qwxy4fgi33y72n8h4lw5bbb35sbq9jlw69c";
        libraryHaskellDepends = [ base ];
        description = "Symbol manipulation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "symengine" = callPackage
@@ -248537,8 +248537,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
@@ -248557,8 +248557,8 @@ self: {
        testHaskellDepends = [ base ];
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
@@ -248572,7 +248572,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "Monoids for sameness and uniqueness";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "symmetry-operations-symbols" = callPackage
@@ -248588,8 +248588,8 @@ self: {
          base doctest hspec matrix matrix-as-xyz parsec QuickCheck
        ];
        description = "Derivation of symbols and coordinate triplets Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248605,7 +248605,7 @@ self: {
          ansi-terminal base monad-loops random
        ];
        description = "Minimal implementation(s) of the classic electronic memory game";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "sync" = callPackage
@@ -248616,8 +248616,8 @@ self: {
        sha256 = "10c2divizmjij5w7x2ky6dzhq6y6wr6qq1pwl7wlhgv663y9yalk";
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248655,8 +248655,8 @@ self: {
          aeson base bytestring directory filepath process temporary time
        ];
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248668,7 +248668,7 @@ self: {
        sha256 = "0xzpjq3h3mqdi553v7p6xm3i74nvbhz5igjlhfh6snlmr7p1cdvb";
        libraryHaskellDepends = [ base ];
        description = "Synchronous communication channels";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "syncthing-hs" = callPackage
@@ -248695,8 +248695,8 @@ self: {
          vector wreq
        ];
        description = "Haskell bindings for the Syncthing REST API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248721,7 +248721,7 @@ self: {
        ];
        description = "Similar code analysis";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Synt = null;};
 
@@ -248745,8 +248745,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Generic representation and manipulation of abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248758,7 +248758,7 @@ self: {
        sha256 = "1sqnmarmdm4mha28h8gbp3jddlig84v7zqn53a29047w3877g3gw";
        libraryHaskellDepends = [ base ];
        description = "Distfix expression parsing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "syntax" = callPackage
@@ -248775,8 +248775,8 @@ self: {
          base lens mono-traversable scientific semi-iso text vector
        ];
        description = "Reversible parsing and pretty-printing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248792,8 +248792,8 @@ self: {
          attoparsec base bytestring scientific semi-iso syntax text vector
        ];
        description = "Syntax instances for Attoparsec";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248812,8 +248812,8 @@ self: {
          syntax-printer text
        ];
        description = "Example application using syntax, a library for abstract syntax descriptions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248832,8 +248832,8 @@ self: {
          syntax-attoparsec syntax-printer text
        ];
        description = "Example JSON parser/pretty-printer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248848,8 +248848,8 @@ self: {
          base pretty scientific semi-iso syntax text
        ];
        description = "Syntax instance for pretty, the pretty printing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248866,8 +248866,8 @@ self: {
          text vector
        ];
        description = "Text and ByteString printers for 'syntax'";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248883,8 +248883,8 @@ self: {
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
        description = "Convert between different Haskell syntax trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248900,8 +248900,8 @@ self: {
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248920,8 +248920,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base cassava haskell-conll hspec ];
        description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -248944,7 +248944,7 @@ self: {
        ];
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249054,7 +249054,7 @@ self: {
        ];
        description = "Audio signal processing with dynamic physical dimensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {UniqueLogicNP = null;};
 
@@ -249083,8 +249083,8 @@ self: {
        ];
        doHaddock = false;
        description = "Efficient signal processing using runtime compilation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249124,7 +249124,7 @@ self: {
        libraryHaskellDepends = [ base process text ];
        testHaskellDepends = [ base doctest ];
        description = "Auth with smbclient command";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "sys-process" = callPackage
@@ -249144,8 +249144,8 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        description = "A replacement for System.Exit and System.Process.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249158,7 +249158,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec hspec-expectations ];
        description = "Haskell Interface for getting overall system statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-argv0" = callPackage
@@ -249169,7 +249169,7 @@ self: {
        sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
        libraryHaskellDepends = [ base bytestring system-filepath text ];
        description = "Get argv[0] as a FilePath";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-canonicalpath" = callPackage
@@ -249185,8 +249185,8 @@ self: {
        ];
        testHaskellDepends = [ base basic-prelude chell system-filepath ];
        description = "Abstract data type for canonical paths with some utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249205,8 +249205,8 @@ self: {
          base directory doctest filepath QuickCheck
        ];
        description = "A replacement for System.Exit and System.Process";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249218,7 +249218,7 @@ self: {
        sha256 = "1hig7m7arrj6hmgix8abkidy6wf1a4a4y72k81csq90kv5jhynxk";
        libraryHaskellDepends = [ base ];
        description = "Error reporting functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-extra" = callPackage
@@ -249232,8 +249232,8 @@ self: {
        libraryHaskellDepends = [ base bytestring directory process ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A bunch of system utilities used by other projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249253,7 +249253,7 @@ self: {
          transformers unix
        ];
        description = "Consistent filesystem interaction across GHC versions (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-filepath" = callPackage
@@ -249272,7 +249272,7 @@ self: {
          base bytestring chell chell-quickcheck QuickCheck text
        ];
        description = "High-level, byte-based file and directory path manipulations (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-gpio" = callPackage
@@ -249283,7 +249283,7 @@ self: {
        sha256 = "1i718k96xvsfl9rh1x4n5ra88838wd6rzmj3p70bfkxxrsvv1zi4";
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "GPIO wrapper libary for Raspberry Pi";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-info" = callPackage
@@ -249294,7 +249294,7 @@ self: {
        sha256 = "10a43hb20gb8vgggibsnd3xg3al1wm4phjpp1mf2hnkf4nwxilm4";
        libraryHaskellDepends = [ base ];
        description = "Get the name of the operating system";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-inotify" = callPackage
@@ -249305,8 +249305,8 @@ self: {
        sha256 = "0ndw4vcvvf7p6nb5vn91mhbj4w9lmgm4cl0jzsks4mxs625bv4lg";
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to Linux's inotify interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249329,8 +249329,8 @@ self: {
          transformers unix
        ];
        description = "Lifted versions of System functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249347,8 +249347,8 @@ self: {
        ];
        testHaskellDepends = [ base directory hedgehog pretty-show ];
        description = "A library for accessing the /proc filesystem in Linux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249365,8 +249365,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Get system locales";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249378,7 +249378,7 @@ self: {
        sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "A toy module to temporarily redirect a program's stdout";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-random-effect" = callPackage
@@ -249404,8 +249404,8 @@ self: {
          base criterion deepseq extensible-effects vector
        ];
        description = "Random number generation for extensible effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249425,7 +249425,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Runs system tests of applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "system-time-monotonic" = callPackage
@@ -249436,7 +249436,7 @@ self: {
        sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
        libraryHaskellDepends = [ base time ];
        description = "Simple library for using the system's monotonic clock";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "system-util" = callPackage
@@ -249457,8 +249457,8 @@ self: {
          semigroups system-lifted template-haskell transformers
        ];
        description = "Various system utils lifted to EitherT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {easy-data = null;};
 
@@ -249478,7 +249478,7 @@ self: {
        ];
        librarySystemDepends = [ libossp_uuid ];
        description = "Bindings to system UUID functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) libossp_uuid;};
 
   "systemd" = callPackage
@@ -249492,7 +249492,7 @@ self: {
        ];
        testHaskellDepends = [ base network unix ];
        description = "Systemd facilities (Socket activation, Notify)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "systemstats" = callPackage
@@ -249510,8 +249510,8 @@ self: {
          transformers
        ];
        description = "An application that regularly logs system stats for later analysis";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249523,7 +249523,7 @@ self: {
        sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
        libraryHaskellDepends = [ base syb ];
        description = "Scrap Your Zippers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "t-regex" = callPackage
@@ -249540,8 +249540,8 @@ self: {
          QuickCheck recursion-schemes template-haskell transformers
        ];
        description = "Matchers and grammars using tree regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249553,8 +249553,8 @@ self: {
        sha256 = "1pnikcyczwy7x4gf35pxkmr9p8b6smqb637r1h8rc9p2hjag2kak";
        libraryHaskellDepends = [ base t3-game t3-server ];
        description = "tic-tac-toe Rexports for client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249571,7 +249571,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec ];
        description = "tic-tac-toe core";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "t3-server" = callPackage
@@ -249590,8 +249590,8 @@ self: {
          text time transformers unordered-containers vector wai
        ];
        description = "tic-tac-toe server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249607,8 +249607,8 @@ self: {
          base containers ghc-prim mtl Takusen template-haskell time
        ];
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249623,7 +249623,7 @@ self: {
        libraryHaskellDepends = [ base safe text ];
        description = "Table layout";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "table" = callPackage
@@ -249638,8 +249638,8 @@ self: {
          base csv optparse-applicative process split
        ];
        description = "Simple tool to generate tables from DSV input";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249664,8 +249664,8 @@ self: {
          QuickCheck
        ];
        description = "Format tabular data as grid or table";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249677,8 +249677,8 @@ self: {
        sha256 = "1v5g4fbbspgm4smjxk499a0grh5xsr18688kmivql8knhxh1351k";
        libraryHaskellDepends = [ base ];
        description = "A table tennis game tracking engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249696,8 +249696,8 @@ self: {
          base cgi containers html mtl parsec QuickCheck
        ];
        description = "An interactive theorem prover based on semantic tableaux";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249721,8 +249721,8 @@ self: {
          unordered-containers
        ];
        description = "In-memory storage with multiple keys using lenses and traversals";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249743,8 +249743,8 @@ self: {
          time transformers utf8-string xml
        ];
        description = "Azure Table Storage REST API Wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249763,7 +249763,7 @@ self: {
        ];
        description = "Pretty-printing of CSV files";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tabloid" = callPackage
@@ -249781,8 +249781,8 @@ self: {
          regex-posix
        ];
        description = "View the output of shell commands in a table";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249797,8 +249797,8 @@ self: {
        libraryHaskellDepends = [ base filepath monadlist mtl tagged ];
        executableHaskellDepends = [ base filepath monadlist mtl tagged ];
        description = "Indents source files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249810,7 +249810,7 @@ self: {
        sha256 = "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb";
        libraryHaskellDepends = [ base csv html mtl ];
        description = "Two-dimensional data tables with rendering functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "taffybar" = callPackage
@@ -249854,7 +249854,7 @@ self: {
        ];
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -249865,8 +249865,8 @@ self: {
        sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249882,8 +249882,8 @@ self: {
          attoparsec base blaze-builder bytestring enumerator
        ];
        description = "streamlined html tag parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249922,7 +249922,7 @@ self: {
          base deepseq template-haskell transformers
        ];
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagged-binary" = callPackage
@@ -249935,7 +249935,7 @@ self: {
          base base-compat binary bytestring pureMD5
        ];
        description = "Provides tools for serializing data tagged with type information";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tagged-exception-core" = callPackage
@@ -249948,8 +249948,8 @@ self: {
          base exceptions mmorph mtl transformers
        ];
        description = "Reflect exceptions using phantom types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249961,7 +249961,7 @@ self: {
        sha256 = "1n5jafvcck6mq14fb1wrgclkrkxz4vd1x09y028awz66makn5v1c";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Trivial monad transformer that allows identical monad stacks have different types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagged-list" = callPackage
@@ -249980,8 +249980,8 @@ self: {
          type-level-natural-number-operations
        ];
        description = "Lists tagged with a type-level natural number representing their length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -249995,8 +249995,8 @@ self: {
          base tagged template-haskell type-spine
        ];
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250010,8 +250010,8 @@ self: {
          base time transformers unordered-containers
        ];
        description = "Simple wrappers for timing IO actions (single-threaded)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250028,7 +250028,7 @@ self: {
          semigroupoids tagged
        ];
        description = "Monad transformer carrying an extra phantom type tag";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagging" = callPackage
@@ -250039,7 +250039,7 @@ self: {
        sha256 = "012lcbp2c9a38s4l2i9jaiqcxaidk93v7gxcnf9lplixrnzczy93";
        libraryHaskellDepends = [ base bytestring pcre-light ];
        description = "Library for tagging data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "taggy" = callPackage
@@ -250067,7 +250067,7 @@ self: {
          attoparsec base criterion tagsoup text vector
        ];
        description = "Efficient and simple HTML/XML parsing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "taggy-lens" = callPackage
@@ -250085,7 +250085,7 @@ self: {
          base doctest hspec lens taggy text unordered-containers
        ];
        description = "Lenses for the taggy html/xml parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "taglib" = callPackage
@@ -250114,8 +250114,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ taglib ];
        description = "An FFI layer over TagLib's C bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) taglib;};
 
@@ -250131,7 +250131,7 @@ self: {
          base binary containers parsec text text-binary
        ];
        description = "Positional tags and tagsets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagshare" = callPackage
@@ -250142,7 +250142,7 @@ self: {
        sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj";
        libraryHaskellDepends = [ base containers mtl ];
        description = "TagShare - explicit sharing with tags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagsoup" = callPackage
@@ -250158,7 +250158,7 @@ self: {
          base bytestring deepseq directory process QuickCheck time
        ];
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tagsoup-ht" = callPackage
@@ -250182,7 +250182,7 @@ self: {
        ];
        description = "alternative parser for the tagsoup package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250199,8 +250199,8 @@ self: {
          base hspec megaparsec raw-strings-qq tagsoup
        ];
        description = "A Tag token parser and Tag specific parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250218,8 +250218,8 @@ self: {
          tagsoup tagsoup-selection transformers
        ];
        description = "Tagsoup Navigate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250231,8 +250231,8 @@ self: {
        sha256 = "0h62kqls8nrq5wqxbzvxav4kfn1lxc6qm5vg8dhkvqdp5z6xnkzk";
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250244,8 +250244,8 @@ self: {
        sha256 = "0wqw4g5bg8zrkdxfsr8gn0g4a6dvz83b3hyvhdwqf2q1v3i5jw9d";
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250266,8 +250266,8 @@ self: {
          base bytestring tagsoup unicode-show utf8-string
        ];
        description = "Black magic tagsoup";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250288,7 +250288,7 @@ self: {
          base bytestring conduit hspec HUnit QuickCheck resourcet text
        ];
        description = "streamlined html tag parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tai" = callPackage
@@ -250305,8 +250305,8 @@ self: {
          base clock lens mtl parsers time trifecta wreq
        ];
        description = "Support library to enable TAI usage on systems with time kept in UTC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250325,8 +250325,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Tai64 Labels for Haskell";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250350,7 +250350,7 @@ self: {
          streaming-eversion tasty tasty-hunit text
        ];
        description = "Tail files in Unix, using hinotify";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tak" = callPackage
@@ -250370,7 +250370,7 @@ self: {
          random-shuffle safe
        ];
        description = "A library encoding the rules of Tak, and a playtak.com client.";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "tak-ai" = callPackage
@@ -250387,7 +250387,7 @@ self: {
          base HUnit matrix parsec random-shuffle tak
        ];
        description = "AI(s) for playing Tak on playtak.com";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "takahashi" = callPackage
@@ -250399,8 +250399,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250415,8 +250415,8 @@ self: {
        libraryHaskellDepends = [ base mtl old-time time ];
        librarySystemDepends = [ clntsh ];
        description = "Database library with left-fold interface for Oracle";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {clntsh = null;};
 
@@ -250432,8 +250432,8 @@ self: {
          base containers mtl pretty transformers unbound
        ];
        description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250464,7 +250464,7 @@ self: {
        ];
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250484,7 +250484,7 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250507,7 +250507,7 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250526,7 +250526,7 @@ self: {
        ];
        description = "Utility library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250538,7 +250538,7 @@ self: {
        sha256 = "0im6m05lj6nfap6qqff9qmb8vvv4i3g17pcqdg6rqb2xx86dfnjj";
        libraryHaskellDepends = [ base containers mtl safe text ];
        description = "Blaze-style HTML templates as a Monad Transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tangle" = callPackage
@@ -250549,7 +250549,7 @@ self: {
        sha256 = "1ylv73v6ydf39zfks9762dsz27sxr7sbmmk7k628yqc9czj3nj60";
        libraryHaskellDepends = [ base transformers ];
        description = "HKD record builder";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tao" = callPackage
@@ -250560,7 +250560,7 @@ self: {
        sha256 = "0iqsah4l87bd25cpk575hsq5qbx506gz1ajf6fyv6pmi0sb1w2hb";
        libraryHaskellDepends = [ base ];
        description = "Type-level assertion operators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tao-example" = callPackage
@@ -250571,7 +250571,7 @@ self: {
        sha256 = "1ch09fgj46fy5h33rcqlbkm02v8cq246bpxswxfdj8p9g1dkkpk5";
        libraryHaskellDepends = [ base tao ];
        description = "Example usage of the tao package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tapioca" = callPackage
@@ -250588,8 +250588,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec vector ];
        description = "A tasty enhancement to cassava for easy csv exporting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250616,7 +250616,7 @@ self: {
          filepath time
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tar-bytestring" = callPackage
@@ -250645,7 +250645,7 @@ self: {
          hpath-filepath hpath-posix safe-exceptions these time unix word8
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tar-conduit" = callPackage
@@ -250670,7 +250670,7 @@ self: {
          deepseq directory filepath hspec
        ];
        description = "Extract and create tar files using conduit for streaming";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tardis" = callPackage
@@ -250683,7 +250683,7 @@ self: {
        editedCabalFile = "1wp6vp90g19hv8r2l83ava7qxf0933gb7ni2zgyfa66vlvxvhibv";
        libraryHaskellDepends = [ base mmorph mtl ];
        description = "Bidirectional state monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "target" = callPackage
@@ -250721,8 +250721,8 @@ self: {
          xml-conduit
        ];
        description = "Generate test-suites from refinement types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) z3;};
 
@@ -250745,7 +250745,7 @@ self: {
          text text-zipper vector vty
        ];
        description = "Terminal Art";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "task" = callPackage
@@ -250764,8 +250764,8 @@ self: {
          directory filepath old-locale random text time unix
        ];
        description = "A command line tool for keeping track of tasks you worked on";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250802,8 +250802,8 @@ self: {
          temporary text transformers vector
        ];
        description = "Distributed processing of changing tasks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250833,8 +250833,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A command-line kanban board/task manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250853,7 +250853,7 @@ self: {
          async base containers fgl hspec stm transformers
        ];
        description = "Manage pools of possibly interdependent tasks using STM and async";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "taskwarrior" = callPackage
@@ -250877,8 +250877,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Types and aeson instances for taskwarrior tasks";
-       license = stdenv.lib.licenses.agpl3Plus;
-       maintainers = with stdenv.lib.maintainers; [ maralorn ];
+       license = lib.licenses.agpl3Plus;
+       maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
   "tasty" = callPackage
@@ -250895,7 +250895,7 @@ self: {
          stm tagged unbounded-delays unix wcwidth
        ];
        description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty_1_4_0_3" = callPackage
@@ -250912,8 +250912,8 @@ self: {
          tagged unbounded-delays unix wcwidth
        ];
        description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tasty-ant-xml" = callPackage
@@ -250930,7 +250930,7 @@ self: {
          stm tagged tasty transformers xml
        ];
        description = "Render tasty output to XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-ant-xml_1_1_8" = callPackage
@@ -250947,8 +250947,8 @@ self: {
          stm tagged tasty transformers xml
        ];
        description = "Render tasty output to XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tasty-auto" = callPackage
@@ -250968,8 +250968,8 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "Auto discovery for Tasty with support for ingredients and test tree generation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -250995,8 +250995,8 @@ self: {
          tasty-hunit temporary text transformers
        ];
        description = "BDD tests language and tasty provider";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251008,7 +251008,7 @@ self: {
        sha256 = "0jzaqra7gsrvy33j1g6bnrwg7x5pyg5p50l5mgvpz71kd946725l";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-discover" = callPackage
@@ -251034,7 +251034,7 @@ self: {
          tasty-smallcheck
        ];
        description = "Test discovery for the tasty framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-expected-failure" = callPackage
@@ -251050,7 +251050,7 @@ self: {
          base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit
        ];
        description = "Mark tasty tests as failure expected";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-fail-fast" = callPackage
@@ -251066,8 +251066,8 @@ self: {
          base directory tasty tasty-golden tasty-hunit tasty-tap
        ];
        description = "Adds the ability to fail a tasty test suite on first test failure";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251084,7 +251084,7 @@ self: {
          base tasty tasty-expected-failure tasty-hunit
        ];
        description = "Simple focus mechanism for tasty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-golden" = callPackage
@@ -251106,7 +251106,7 @@ self: {
          base directory filepath process tasty tasty-hunit temporary
        ];
        description = "Golden tests support for tasty";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-golden_2_3_4" = callPackage
@@ -251129,8 +251129,8 @@ self: {
          base directory filepath process tasty tasty-hunit temporary
        ];
        description = "Golden tests support for tasty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tasty-groundhog-converters" = callPackage
@@ -251148,8 +251148,8 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Tasty Tests for groundhog converters";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251168,7 +251168,7 @@ self: {
          base hedgehog tasty tasty-expected-failure
        ];
        description = "Integration for tasty and hedgehog";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-hedgehog-coverage" = callPackage
@@ -251190,8 +251190,8 @@ self: {
          base hedgehog tasty tasty-expected-failure
        ];
        description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251208,7 +251208,7 @@ self: {
          tasty-smallcheck
        ];
        description = "Hspec support for the Tasty test framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-html" = callPackage
@@ -251226,7 +251226,7 @@ self: {
          semigroups stm tagged tasty text transformers
        ];
        description = "Render tasty output to HTML";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-hunit" = callPackage
@@ -251237,7 +251237,7 @@ self: {
        sha256 = "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp";
        libraryHaskellDepends = [ base call-stack tasty ];
        description = "HUnit support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-hunit-adapter" = callPackage
@@ -251248,7 +251248,7 @@ self: {
        sha256 = "06rywmn6gc1qyhf65iwm6i0ysg99ygr2ghk1alkklz4ycagidyvg";
        libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
        description = "Use existing HUnit tests with tasty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-hunit-compat" = callPackage
@@ -251259,7 +251259,7 @@ self: {
        sha256 = "0kfxga9j1iy7f00gj3dsh45ywyi7qzdlrmp16gr4ir3b08rwhj2m";
        libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
        description = "Integration of `HUnit` with `tasty`";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "tasty-integrate" = callPackage
@@ -251289,8 +251289,8 @@ self: {
          transformers
        ];
        description = "automated integration of QuickCheck properties into tasty suites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251310,8 +251310,8 @@ self: {
          tasty-hunit unix
        ];
        description = "Render tasty output to both console and XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251327,7 +251327,7 @@ self: {
          base bytestring containers stm tagged tasty text
        ];
        description = "JSON reporter for the tasty testing framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-kat" = callPackage
@@ -251343,7 +251343,7 @@ self: {
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
        description = "Known Answer Tests (KAT) framework for tasty";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-laws" = callPackage
@@ -251360,8 +251360,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck smallcheck-laws tasty ];
        description = "Test common laws";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251374,7 +251374,7 @@ self: {
        libraryHaskellDepends = [ base leancheck tasty ];
        testHaskellDepends = [ base leancheck tasty ];
        description = "LeanCheck support for the Tasty test framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-lens" = callPackage
@@ -251390,8 +251390,8 @@ self: {
        ];
        testHaskellDepends = [ base lens tasty ];
        description = "Tasty TestTrees for Lens validation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251410,7 +251410,7 @@ self: {
          base directory filepath hslua tasty tasty-hunit
        ];
        description = "Write tests in Lua, integrate into tasty";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-mgolden" = callPackage
@@ -251435,8 +251435,8 @@ self: {
          tasty-hunit text typed-process
        ];
        description = "Golden testing provider for tasty with muti-line diff output";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251451,7 +251451,7 @@ self: {
          base deepseq directory filepath process tasty
        ];
        description = "Use tasty framework to test whether a program executes correctly";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-quickcheck" = callPackage
@@ -251467,7 +251467,7 @@ self: {
        ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
        description = "QuickCheck support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-quickcheck-laws" = callPackage
@@ -251482,7 +251482,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck tasty ];
        description = "Pre-built tasty trees for checking lawful class properties using QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-rerun" = callPackage
@@ -251500,7 +251500,7 @@ self: {
          transformers
        ];
        description = "Rerun only tests which failed in a previous test run";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-silver" = callPackage
@@ -251523,8 +251523,8 @@ self: {
          transformers
        ];
        description = "A fancy test runner, including support for golden tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251542,7 +251542,7 @@ self: {
          base optparse-applicative smallcheck tagged tasty
        ];
        description = "SmallCheck support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-stats" = callPackage
@@ -251557,8 +251557,8 @@ self: {
          base containers directory process stm tagged tasty time
        ];
        description = "Collect statistics of your Tasty testsuite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251581,7 +251581,7 @@ self: {
        ];
        doHaddock = false;
        description = "Tests defined by Search Using Golden Answer References";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "tasty-tap" = callPackage
@@ -251597,7 +251597,7 @@ self: {
          base directory tasty tasty-golden tasty-hunit
        ];
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tasty-test-reporter" = callPackage
@@ -251615,7 +251615,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Producing JUnit-style XML test reports";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-test-vector" = callPackage
@@ -251628,7 +251628,7 @@ self: {
        editedCabalFile = "131ldlbp4ji1m8wayl8h28ykcda29bsvifa3mw8513mnqnndgahc";
        libraryHaskellDepends = [ base tasty ];
        description = "Test vector support for tasty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-th" = callPackage
@@ -251644,7 +251644,7 @@ self: {
        ];
        testHaskellDepends = [ base tasty-hunit ];
        description = "Automatic tasty test case discovery using TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-tmux" = callPackage
@@ -251660,7 +251660,7 @@ self: {
          typed-process
        ];
        description = "Terminal user acceptance testing (UAT) via tmux";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "tasty-travis" = callPackage
@@ -251674,7 +251674,7 @@ self: {
        libraryHaskellDepends = [ base tasty ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fancy Travis CI output for tasty tests";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tasty-wai" = callPackage
@@ -251692,7 +251692,7 @@ self: {
        ];
        testHaskellDepends = [ base http-types tasty wai ];
        description = "Test 'wai' endpoints via Test.Tasty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tateti-tateti" = callPackage
@@ -251707,8 +251707,8 @@ self: {
          array base lens-simple mtl ncurses random
        ];
        description = "Meta tic-tac-toe ncurses game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251720,7 +251720,7 @@ self: {
        sha256 = "10vw3y3vimqpb22amhk7n0d0jni46j60iva1gqa28ky8lhqq8ssz";
        libraryHaskellDepends = [ base ];
        description = "Tau, the ratio between any circle's circumference and radius";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tax" = callPackage
@@ -251733,7 +251733,7 @@ self: {
          base dollaridoos profunctors semigroups
        ];
        description = "Types and combinators for taxes";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "tbox" = callPackage
@@ -251751,7 +251751,7 @@ self: {
        ];
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251767,8 +251767,8 @@ self: {
          aws base bytestring conduit http-conduit network TCache text
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251786,8 +251786,8 @@ self: {
          base bytestring tokyocabinet-haskell utf8-string
        ];
        description = "TokyoCabinet CLI interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251803,7 +251803,7 @@ self: {
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HUnit ];
        description = "Very simple config file reading";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tcod-haskell" = callPackage
@@ -251821,8 +251821,8 @@ self: {
        ];
        libraryPkgconfigDepends = [ libtcod ];
        description = "Bindings to libtcod roguelike engine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libtcod;};
 
@@ -251834,7 +251834,7 @@ self: {
        sha256 = "05cnlbrdddbrdwlm8s7b76ydwrn49vaifdgaklfhv8rzz9dfpvbr";
        libraryHaskellDepends = [ base containers ];
        description = "Simple text configuration file parser library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tcp" = callPackage
@@ -251845,8 +251845,8 @@ self: {
        sha256 = "1wqkfnkd2di9a6h0br33fd7jaf1yqpaf7kjnpjwp52l4xv04ajlv";
        libraryHaskellDepends = [ base containers old-time ];
        description = "A purely functional TCP implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251869,7 +251869,7 @@ self: {
          test-framework-hunit
        ];
        description = "One stop solution for tcp client and server with tls support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tcp-streams-openssl" = callPackage
@@ -251890,8 +251890,8 @@ self: {
          test-framework-hunit
        ];
        description = "Tcp streams using openssl for tls support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251919,8 +251919,8 @@ self: {
          transformers
        ];
        description = "Test framework wrapper";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251942,7 +251942,7 @@ self: {
          vector vector-algorithms
        ];
        description = "On-line accumulation of rank-based statistics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tdigest-Chart" = callPackage
@@ -251963,8 +251963,8 @@ self: {
          tdigest vector
        ];
        description = "Chart generation from tdigest";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -251992,8 +251992,8 @@ self: {
        ];
        testSystemDepends = [ tdlib ];
        description = "complete binding to the Telegram Database Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tdlib;};
 
@@ -252022,8 +252022,8 @@ self: {
          template-haskell text
        ];
        description = "Codegen for TDLib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252044,8 +252044,8 @@ self: {
          polysemy-plugin tdlib-gen text
        ];
        description = "Types and Functions generated from tdlib api spec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252061,7 +252061,7 @@ self: {
          base bytestring template-haskell transformers xhtml
        ];
        description = "TDoc is a typed document builder with support for (X)HTML";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tds" = callPackage
@@ -252082,8 +252082,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252096,7 +252096,7 @@ self: {
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252118,7 +252118,7 @@ self: {
          base gauge rio typed-process unliftio
        ];
        description = "Build safe and composable teardown sub-routines for resources";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "techlab" = callPackage
@@ -252139,8 +252139,8 @@ self: {
          polysemy-plugin polysemy-vinyl polysemy-zoo
        ];
        description = "Bleeding edge prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252172,7 +252172,7 @@ self: {
        ];
        doHaddock = false;
        description = "Procedures and Sequences";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "teeth" = callPackage
@@ -252183,8 +252183,8 @@ self: {
        sha256 = "0vkaf4prvyi8056mq7kmnn9h7l8z6in2272vzmr1fnchqi7xnn8c";
        libraryHaskellDepends = [ base ];
        description = "Dental data types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252200,7 +252200,7 @@ self: {
          base exceptions fallible prettyprinter prettyprinter-ansi-terminal
        ];
        description = "Prettier error";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "telegram" = callPackage
@@ -252215,8 +252215,8 @@ self: {
          aeson base bytestring data-default http-conduit url utf8-string
        ];
        description = "Telegram API client";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252244,8 +252244,8 @@ self: {
          servant-client servant-client-core text transformers utf8-string
        ];
        description = "Telegram Bot API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252266,8 +252266,8 @@ self: {
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
        description = "Telegram Bot microframework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252299,8 +252299,8 @@ self: {
          unordered-containers
        ];
        description = "Easy to use library for building Telegram bots";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252325,8 +252325,8 @@ self: {
          servant-client-core servant-multipart telegram-types text time
        ];
        description = "Servant bindings to the Telegram bot API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252348,8 +252348,8 @@ self: {
          mime-types open-union servant servant-multipart text time
        ];
        description = "Types used in Telegram bot API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252370,7 +252370,7 @@ self: {
          base http-client http-client-tls in-other-words
        ];
        description = "Binding to the telegraph API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "teleport" = callPackage
@@ -252390,8 +252390,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A tool to quickly switch between directories";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252414,8 +252414,8 @@ self: {
          tasty-quickcheck vector
        ];
        description = "Telnet client and other things";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252435,8 +252435,8 @@ self: {
          regex-pcre split tagsoup text time transformers
        ];
        description = "IRC tellbot";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252458,7 +252458,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "A dead-simple shell interpolation templating utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tempi" = callPackage
@@ -252469,8 +252469,8 @@ self: {
        sha256 = "08hjgs32cx3vcm6sga4xc7ijcj3lbjlg133vkri06xfi0v3hjgnp";
        libraryHaskellDepends = [ base time ];
        description = "For representing musical tempi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252482,7 +252482,7 @@ self: {
        sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg";
        libraryHaskellDepends = [ base mtl text ];
        description = "Simple string substitution";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "template-default" = callPackage
@@ -252493,8 +252493,8 @@ self: {
        sha256 = "1fxfyfnwlw9yslbz012rygw2j5iywplybmgbaawkfq4jda7yail4";
        libraryHaskellDepends = [ base data-default template-haskell ];
        description = "declaring Default instances just got even easier";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252506,8 +252506,8 @@ self: {
        sha256 = "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g";
        libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ];
        description = "Support library for Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "template-haskell-compat-v0208" = callPackage
@@ -252518,7 +252518,7 @@ self: {
        sha256 = "1s1ynp568i7y5v062kliia46c3cmaijslf2hlmdkkqfdvf8fmzp1";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A backwards compatibility layer for Template Haskell newer than 2.8";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "template-haskell-optics" = callPackage
@@ -252531,7 +252531,7 @@ self: {
          base containers optics-core template-haskell
        ];
        description = "Optics for template-haskell types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "template-haskell-util" = callPackage
@@ -252544,8 +252544,8 @@ self: {
          base GenericPretty ghc-prim template-haskell
        ];
        description = "Some utilities for template Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252566,8 +252566,8 @@ self: {
          base parsec QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Haskell's Simple Markup Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252587,7 +252587,7 @@ self: {
          unordered-containers uri-encode
        ];
        description = "Template Toolkit implementation for Haskell";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "template-yj" = callPackage
@@ -252598,8 +252598,8 @@ self: {
        sha256 = "1vj856dcmnipzxkzs3y33sgkyldqirq8rz9mi6grllv6mqq6lgj2";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Process template file";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252613,8 +252613,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base mtl tagsoup uniplate ];
        description = "Make template from website";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252632,8 +252632,8 @@ self: {
          regex-compat regex-posix template-haskell time utf8-string
        ];
        description = "A PostgreSQL access library with compile-time SQL type inference";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252650,7 +252650,7 @@ self: {
          base hspec hspec-attoparsec HUnit QuickCheck text
        ];
        description = "Simple string templater";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tempo" = callPackage
@@ -252671,7 +252671,7 @@ self: {
        executableHaskellDepends = [ base MissingH mtl time ];
        testHaskellDepends = [ base ];
        description = "Command-line tool to log time-tracking information into JIRA Tempo plugin";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tempodb" = callPackage
@@ -252688,8 +252688,8 @@ self: {
          http-streams io-streams mtl old-locale text time
        ];
        description = "A small Haskell wrapper around the TempoDB api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252707,8 +252707,8 @@ self: {
          temporal-music-notation temporal-music-notation-western
        ];
        description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252720,7 +252720,7 @@ self: {
        sha256 = "04qbbx32rs6mz5w3j7wj2hx744x858rv60hmpla3zpx2491r0qi9";
        libraryHaskellDepends = [ base Boolean ];
        description = "data types for temporal media";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporal-music-notation" = callPackage
@@ -252733,7 +252733,7 @@ self: {
          base data-default temporal-media vector
        ];
        description = "music notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporal-music-notation-demo" = callPackage
@@ -252748,7 +252748,7 @@ self: {
          base binary data-default HCodecs temporal-music-notation
        ];
        description = "generates midi from score notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporal-music-notation-western" = callPackage
@@ -252759,7 +252759,7 @@ self: {
        sha256 = "012pv4l5r3ijnyid7b8h1lpifjs7cf3k4a13f6773r93qfgvxpkc";
        libraryHaskellDepends = [ base temporal-music-notation ];
        description = "western music notation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporary" = callPackage
@@ -252777,7 +252777,7 @@ self: {
          base base-compat directory filepath tasty tasty-hunit unix
        ];
        description = "Portable temporary file and directory support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporary-rc" = callPackage
@@ -252792,7 +252792,7 @@ self: {
          base directory exceptions filepath transformers unix
        ];
        description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "temporary-resourcet" = callPackage
@@ -252810,7 +252810,7 @@ self: {
          base directory resourcet tasty tasty-hunit transformers
        ];
        description = "Portable temporary files and directories with automatic deletion";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tempus" = callPackage
@@ -252830,8 +252830,8 @@ self: {
        ];
        executableToolDepends = [ happy ];
        description = "Interpreter for the FRP language Tempus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252847,7 +252847,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Programmers' time tracker";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "tensor" = callPackage
@@ -252859,8 +252859,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim random vector ];
        testHaskellDepends = [ base QuickCheck random ];
        description = "A completely type-safe library for linear algebra";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252884,8 +252884,8 @@ self: {
          hint singletons text vector vector-sized
        ];
        description = "Create valid deep neural network architectures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252914,8 +252914,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "TensorFlow bindings";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libtensorflow = null;};
 
@@ -252936,8 +252936,8 @@ self: {
          base bytestring lens-family proto-lens tensorflow text
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -252966,8 +252966,8 @@ self: {
          test-framework-hunit text
        ];
        description = "TensorBoard related functionality";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253001,8 +253001,8 @@ self: {
          test-framework test-framework-hunit text transformers vector
        ];
        description = "TensorFlow demo application for learning MNIST model";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {tensorflow-mnist-input-data = null;};
 
@@ -253020,8 +253020,8 @@ self: {
          optparse-applicative proto-lens semigroups tensorflow-proto text
        ];
        description = "Code generation for TensorFlow operations";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253051,8 +253051,8 @@ self: {
          base criterion deepseq tensorflow transformers vector
        ];
        description = "Friendly layer around TensorFlow bindings";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253070,7 +253070,7 @@ self: {
        ];
        libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
@@ -253086,7 +253086,7 @@ self: {
          base bytestring cereal test-framework test-framework-quickcheck2
        ];
        description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "tensorflow-records-conduit" = callPackage
@@ -253102,7 +253102,7 @@ self: {
          resourcet tensorflow-records
        ];
        description = "Conduit wrappers for TensorFlow.Records.";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "tensorflow-test" = callPackage
@@ -253113,7 +253113,7 @@ self: {
        sha256 = "1z2anh5ikjpsb1sjfn290bcf5rcxsmzb0gwdk9czdnlmx3fig0ip";
        libraryHaskellDepends = [ base HUnit vector ];
        description = "Some common functions for test suites";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "tensors" = callPackage
@@ -253132,7 +253132,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq vector ];
        description = "Tensor in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "term-rewriting" = callPackage
@@ -253149,8 +253149,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HUnit QuickCheck ];
        description = "Term Rewriting Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253164,7 +253164,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "termbox bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "termbox-banana" = callPackage
@@ -253177,8 +253177,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base reactive-banana termbox ];
        description = "reactive-banana + termbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253194,8 +253194,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base ];
        description = "Bindings to the Termbox library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253210,7 +253210,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base cli ];
        description = "Composable terminal colors";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "terminal" = callPackage
@@ -253230,7 +253230,7 @@ self: {
          tasty-hunit tasty-quickcheck text transformers
        ];
        description = "Portable terminal interaction library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "terminal-progress-bar" = callPackage
@@ -253247,7 +253247,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion time ];
        description = "A progress bar in the terminal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "terminal-punch" = callPackage
@@ -253265,7 +253265,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck time ];
        description = "Simple terminal-based time tracker";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "terminal-size" = callPackage
@@ -253276,7 +253276,7 @@ self: {
        sha256 = "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm";
        libraryHaskellDepends = [ base ];
        description = "Get terminal window height and width";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "terminal-text" = callPackage
@@ -253291,8 +253291,8 @@ self: {
          ansi-terminal base container layered-state prologue text
        ];
        description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253304,8 +253304,8 @@ self: {
        sha256 = "1k32s5vzkxnsawj8vdscyfc96hk0s97zpj1mgw1hk93hwcrxn9wh";
        libraryHaskellDepends = [ base containers contravariant ];
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253318,8 +253318,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ncurses ];
        description = "Haskell bindings to the terminfo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "terminfo-hs" = callPackage
@@ -253335,7 +253335,7 @@ self: {
        ];
        testHaskellDepends = [ base directory errors filepath QuickCheck ];
        description = "A pure-Haskell (no FFI) module for accessing terminfo databases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "termonad" = callPackage
@@ -253370,7 +253370,7 @@ self: {
          QuickCheck tasty tasty-hedgehog tasty-hspec
        ];
        description = "Terminal emulator configurable in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; 
          vte_291 = pkgs.vte;};
 
@@ -253389,8 +253389,8 @@ self: {
          time-units transformers unix vty
        ];
        description = "Plot time series in your terminal using commands stdout";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253408,8 +253408,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "a ternary library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253423,7 +253423,7 @@ self: {
        librarySystemDepends = [ terralib4c translib ];
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {terralib4c = null; translib = null;};
 
@@ -253444,8 +253444,8 @@ self: {
          base containers mtl process syb transformers
        ];
        description = "A semantic parser for lojban";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253471,8 +253471,8 @@ self: {
          wreq
        ];
        description = "Tesla API client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253494,8 +253494,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Test monadic side-effects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253520,7 +253520,7 @@ self: {
          time xml
        ];
        description = "Framework for running and organising tests, with HUnit and QuickCheck support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-doctest" = callPackage
@@ -253536,8 +253536,8 @@ self: {
        ];
        testHaskellDepends = [ base test-framework ];
        description = "Test.Framework wrapper for DocTest";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253553,7 +253553,7 @@ self: {
          base bytestring filepath mtl process temporary test-framework
        ];
        description = "Golden tests support for test-framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "test-framework-hunit" = callPackage
@@ -253569,7 +253569,7 @@ self: {
          base extensible-exceptions HUnit test-framework
        ];
        description = "HUnit support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-leancheck" = callPackage
@@ -253581,7 +253581,7 @@ self: {
        libraryHaskellDepends = [ base leancheck test-framework ];
        testHaskellDepends = [ base leancheck test-framework ];
        description = "LeanCheck support for test-framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-program" = callPackage
@@ -253592,7 +253592,7 @@ self: {
        sha256 = "10p6xxxbfx3yr71wdbvk7qhm3xkxq3a1dv4hgcirzynsdfk36s3z";
        libraryHaskellDepends = [ base directory process test-framework ];
        description = "Test framework support for running simple test programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-quickcheck" = callPackage
@@ -253607,8 +253607,8 @@ self: {
          base deepseq extensible-exceptions QuickCheck random test-framework
        ];
        description = "QuickCheck support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253626,7 +253626,7 @@ self: {
          base extensible-exceptions QuickCheck random test-framework
        ];
        description = "QuickCheck-2 support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-sandbox" = callPackage
@@ -253646,8 +253646,8 @@ self: {
          base HUnit test-framework test-sandbox test-sandbox-hunit
        ];
        description = "test-sandbox support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253667,8 +253667,8 @@ self: {
          test-framework-smallcheck
        ];
        description = "Functions for conveniently marking some of the tests in a suite as being skipped";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253682,7 +253682,7 @@ self: {
          base smallcheck test-framework transformers
        ];
        description = "Support for SmallCheck tests in test-framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-testing-feat" = callPackage
@@ -253694,8 +253694,8 @@ self: {
        libraryHaskellDepends = [ base test-framework testing-feat ];
        testHaskellDepends = [ base test-framework testing-feat ];
        description = "A test framework provider for testing-feat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253712,7 +253712,7 @@ self: {
          template-haskell test-framework
        ];
        description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-framework-th-prime" = callPackage
@@ -253727,8 +253727,8 @@ self: {
          base cpphs haskell-src-exts template-haskell test-framework
        ];
        description = "Template Haskell for test framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253741,7 +253741,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Testable functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "test-invariant" = callPackage
@@ -253756,7 +253756,7 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion QuickCheck ];
        description = "Provide common invariants to be checked with QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "test-karya" = callPackage
@@ -253780,8 +253780,8 @@ self: {
          text
        ];
        description = "Testing framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253801,7 +253801,7 @@ self: {
        ];
        executableHaskellDepends = [ base simple-get-opt ];
        description = "A library to make a quick test-runner script";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "test-monad-laws" = callPackage
@@ -253821,7 +253821,7 @@ self: {
          base mtl QuickCheck quickcheck-higherorder tasty tasty-quickcheck
        ];
        description = "Laws for mtl classes as QuickCheck properties";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "test-pkg" = callPackage
@@ -253832,8 +253832,8 @@ self: {
        sha256 = "0fncybd3sxrbnrd4l1hri18rhfg9h0fm3k4305iwh4l65fbwg2n8";
        libraryHaskellDepends = [ base ];
        description = "Just tests Hackage";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253861,8 +253861,8 @@ self: {
          template-haskell text transformers transformers-compat unix
        ];
        description = "Sandbox for system tests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253894,8 +253894,8 @@ self: {
          shakespeare test-sandbox text unix
        ];
        description = "Lightweight development enviroments using test-sandbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253907,8 +253907,8 @@ self: {
        sha256 = "0v8nfgjn46q4z5ic5vlqm240dfkk0ci90n86bb3b7nk3hvka1zpk";
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        description = "HUnit convenience functions for use with test-sandbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253924,8 +253924,8 @@ self: {
          base mtl QuickCheck random test-sandbox transformers
        ];
        description = "QuickCheck convenience functions for use with test-sandbox";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253939,8 +253939,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover silently ];
        testToolDepends = [ hspec-discover ];
        description = "Catchy combinators for HUnit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253959,8 +253959,8 @@ self: {
          base executable-path mtl process QuickCheck
        ];
        description = "Simple Perl inspired testing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253979,7 +253979,7 @@ self: {
        ];
        description = "Write your tests in comments";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -253994,7 +253994,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Small test package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "testbench" = callPackage
@@ -254015,8 +254015,8 @@ self: {
          streaming-cassava streaming-with temporary transformers weigh
        ];
        description = "Create tests and benchmarks together";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254039,8 +254039,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover tasty-discover ];
        description = "Docker containers for your integration tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254056,8 +254056,8 @@ self: {
          base QuickCheck size-based testing-type-modifiers
        ];
        description = "Functional Enumeration of Algebraic Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254069,7 +254069,7 @@ self: {
        sha256 = "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5";
        libraryHaskellDepends = [ base ];
        description = "Data type modifiers for property based testing";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "testloop" = callPackage
@@ -254087,8 +254087,8 @@ self: {
          time unix
        ];
        description = "Quick feedback loop for test suites";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254106,7 +254106,7 @@ self: {
        ];
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254121,8 +254121,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base filepath gtk ];
        description = "Display a monitor test pattern";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254138,7 +254138,7 @@ self: {
        ];
        description = "Easy unit test driver framework";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254153,7 +254153,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base GLUT random ];
        description = "A 2-D clone of Tetris";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tex-join-bib" = callPackage
@@ -254173,7 +254173,7 @@ self: {
          base optparse-generic system-filepath text
        ];
        description = "Compile separate tex files with the same bibliography";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tex2txt" = callPackage
@@ -254187,8 +254187,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq parsec ];
        executableHaskellDepends = [ base containers deepseq parsec ];
        description = "LaTeX to plain-text conversion";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254209,8 +254209,8 @@ self: {
          temporary unix
        ];
        description = "View your latex output while editing";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254233,7 +254233,7 @@ self: {
          utf8-string xml
        ];
        description = "Conversion between formats used to represent mathematics";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "texrunner" = callPackage
@@ -254255,8 +254255,8 @@ self: {
          base bytestring HUnit lens test-framework test-framework-hunit
        ];
        description = "Functions for running Tex from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254281,8 +254281,8 @@ self: {
        ];
        doCheck = false;
        description = "An efficient packed Unicode text type";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-all" = callPackage
@@ -254296,8 +254296,8 @@ self: {
          base bytestring text text-format utf8-string
        ];
        description = "Everything Data.Text related in one package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254314,8 +254314,8 @@ self: {
          unordered-containers
        ];
        description = "EDSL to create HTML documents with plots based on the C3.js library.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254327,7 +254327,7 @@ self: {
        sha256 = "1vcrsg7v8n6znh1pd9kbm20bc6dg3zijd3xjdjljadf15vfkd5f6";
        libraryHaskellDepends = [ base text ];
        description = "Text styling for ANSI terminals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-binary" = callPackage
@@ -254338,7 +254338,7 @@ self: {
        sha256 = "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn";
        libraryHaskellDepends = [ base binary text ];
        description = "Binary instances for text types";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "text-builder" = callPackage
@@ -254359,7 +254359,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "An efficient strict text builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "text-containers" = callPackage
@@ -254381,8 +254381,8 @@ self: {
          tasty-quickcheck text text-short vector
        ];
        description = "Memory-efficient string-indexed container types";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254400,7 +254400,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec text ];
        testToolDepends = [ hspec-discover ];
        description = "Safe conversions between textual types";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "text-cp437" = callPackage
@@ -254416,7 +254416,7 @@ self: {
          base bytestring QuickCheck quickcheck-text text
        ];
        description = "Conversion of Text to and from CP437";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-format" = callPackage
@@ -254434,7 +254434,7 @@ self: {
          time transformers
        ];
        description = "Text formatting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-format-heavy" = callPackage
@@ -254452,8 +254452,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec time ];
        description = "Full-weight string formatting library, analog of Python's string.format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254465,7 +254465,7 @@ self: {
        sha256 = "0iqs3v03kirjczlp7jpqdqzrfvqsbm260g110abkbpbxws3szqhk";
        libraryHaskellDepends = [ base MissingH ];
        description = "Simple text formatting library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-generic-pretty" = callPackage
@@ -254489,8 +254489,8 @@ self: {
          tasty-hunit tasty-quickcheck time unordered-containers
        ];
        description = "A generic, derivable, haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254511,7 +254511,7 @@ self: {
          test-framework-quickcheck2 text
        ];
        description = "Bindings to the ICU library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) icu;};
 
   "text-icu-normalized" = callPackage
@@ -254534,8 +254534,8 @@ self: {
          test-framework-quickcheck2 test-framework-th text text-icu
        ];
        description = "Dealing with Strict Text in NFC normalization";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254554,7 +254554,7 @@ self: {
          text-icu
        ];
        description = "ICU transliteration";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -254570,7 +254570,7 @@ self: {
        ];
        description = "Json Quasiquatation for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-latin1" = callPackage
@@ -254586,7 +254586,7 @@ self: {
          text
        ];
        description = "Latin-1 (including ASCII) utility functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-ldap" = callPackage
@@ -254607,7 +254607,7 @@ self: {
          base bytestring QuickCheck quickcheck-simple random
        ];
        description = "Parser and Printer for LDAP text data stream";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-lens" = callPackage
@@ -254619,8 +254619,8 @@ self: {
        libraryHaskellDepends = [ base extra lens text ];
        testHaskellDepends = [ base hspec lens ];
        description = "Lenses for operating over text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254636,8 +254636,8 @@ self: {
          base containers parsers text text-loc transformers
        ];
        description = "Monadic parsing combinator library with attention to locations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254649,7 +254649,7 @@ self: {
        sha256 = "069v99jnlayl2srl09355i56wpry0f6mq4bfp8lj0sxcsm1bzpgw";
        libraryHaskellDepends = [ base hashable ];
        description = "Line-column locations within a text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-locale-encoding" = callPackage
@@ -254660,7 +254660,7 @@ self: {
        sha256 = "1ls41s45qwrmmac8k1gryvxbhhczqy2wanwanw48m7xnbv52p9fg";
        libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        description = "Encode and decode Text to/from ByteString using TextEncoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-manipulate" = callPackage
@@ -254674,7 +254674,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Case conversion, word boundary manipulation, and textual subjugation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-manipulate_0_3_0_0" = callPackage
@@ -254687,8 +254687,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Case conversion, word boundary manipulation, and textual subjugation";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-markup" = callPackage
@@ -254705,8 +254705,8 @@ self: {
          base QuickCheck quickcheck-text tasty tasty-quickcheck text
        ];
        description = "A data structure for mapping metadata to text subsequences";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254724,7 +254724,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
        description = "Calculate various string metrics efficiently";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-normal" = callPackage
@@ -254740,8 +254740,8 @@ self: {
          base hspec QuickCheck quickcheck-instances
        ];
        description = "Unicode-normalized text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254760,8 +254760,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
        ];
        description = "Library for converting between line/column and byte offset";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254778,8 +254778,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest HTF text ];
        description = "Utils for text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254794,8 +254794,8 @@ self: {
        libraryHaskellDepends = [ base regex-applicative ];
        testHaskellDepends = [ base QuickCheck regex-applicative ];
        description = "Handling positions in text and position-tagging it";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254812,7 +254812,7 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "Parser and Printer of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-printer" = callPackage
@@ -254830,7 +254830,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Abstract interface for text builders/printers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-regex-replace" = callPackage
@@ -254846,7 +254846,7 @@ self: {
          base hspec QuickCheck smallcheck text text-icu
        ];
        description = "Easy replacement when using text-icu regexes";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "text-region" = callPackage
@@ -254864,7 +254864,7 @@ self: {
        ];
        testHaskellDepends = [ base base-unicode-symbols hspec lens text ];
        description = "Marking text regions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-register-machine" = callPackage
@@ -254875,8 +254875,8 @@ self: {
        sha256 = "0g0iihfin5vjfk69r7jjw4vs3l1k3f0kkg3bbc4xqm274vd72bph";
        libraryHaskellDepends = [ base containers mtl vector ];
        description = "A Haskell implementation of the 1# Text Register Machine";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254888,7 +254888,7 @@ self: {
        sha256 = "1p78xsr25qxmfgsl73lzfn7j32ni897667k48448fkihdsg0a15g";
        libraryHaskellDepends = [ base classy-prelude mtl parsec text ];
        description = "A type class for rendering objects as text, pretty-printing, etc";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "text-replace" = callPackage
@@ -254905,8 +254905,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative parsec ];
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
        description = "Simple text replacements from a list of search/replace pairs";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -254929,7 +254929,7 @@ self: {
          text
        ];
        description = "Memory-efficient representation of Unicode text strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-show" = callPackage
@@ -254961,7 +254961,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
        description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-show-instances" = callPackage
@@ -254994,7 +254994,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Additional instances for text-show";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-stream-decode" = callPackage
@@ -255010,7 +255010,7 @@ self: {
        testHaskellDepends = [ base bytestring deepseq hspec text ];
        benchmarkHaskellDepends = [ base bytestring criterion text ];
        description = "Streaming decoding functions for UTF encodings. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "text-time" = callPackage
@@ -255026,7 +255026,7 @@ self: {
          attoparsec base Cabal formatting hspec QuickCheck text time
        ];
        description = "Library for Time parsing from Text into UTCTime";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-trie" = callPackage
@@ -255043,8 +255043,8 @@ self: {
          silently smallcheck text
        ];
        description = "An efficient finite map from Text to values, based on bytestring-trie";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255062,7 +255062,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "UTF-7 encoding/decoding for Data.Text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-utf8" = callPackage
@@ -255086,8 +255086,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "An efficient packed UTF-8 backed Unicode text type";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255100,8 +255100,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base HTF text ];
        description = "Various text utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255119,7 +255119,7 @@ self: {
        ];
        description = "Serialize Data to XML (strings)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-xml-qq" = callPackage
@@ -255130,8 +255130,8 @@ self: {
        sha256 = "0311in43n89bk1fg4y9qglvbbl47ygvcvr0f7zpr8bpaqbb1ard5";
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        description = "Quasiquoter for xml. XML DSL in Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255145,7 +255145,7 @@ self: {
        libraryHaskellDepends = [ base deepseq text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "A text editor zipper library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "text-zipper-monad" = callPackage
@@ -255157,8 +255157,8 @@ self: {
        libraryHaskellDepends = [ base mtl text-zipper ];
        testHaskellDepends = [ base hspec text-zipper ];
        description = "Monadic interface to the text-zipper package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255175,8 +255175,8 @@ self: {
          base HUnit lens QuickCheck semigroups text
        ];
        description = "Non-empty values of `Data.Text`.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255188,7 +255188,7 @@ self: {
        sha256 = "04mhchvnk20r7ra2m568lvbzqzcwnh7vsyzj01r50cwylacgwwvd";
        libraryHaskellDepends = [ array base ];
        description = "Plot functions in text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "textlocal" = callPackage
@@ -255204,7 +255204,7 @@ self: {
          unix-time
        ];
        description = "Haskell wrapper for textlocal SMS gateway";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "textmatetags" = callPackage
@@ -255217,8 +255217,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 process ];
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255239,8 +255239,8 @@ self: {
          tasty tasty-hunit text transformers
        ];
        description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255252,7 +255252,7 @@ self: {
        sha256 = "15r3lrd6qrhhsll6qlbvgd5g545mj2s6banahwlibcimqqdw8s9h";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "textual" = callPackage
@@ -255263,8 +255263,8 @@ self: {
        sha256 = "0facdj7h789pz7ll43wdkfn6zs6d4q1ns61wq64d2gixwi2fq06y";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Textual type class for data that represent text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255276,7 +255276,7 @@ self: {
        sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
        libraryHaskellDepends = [ base primitive random time ];
        description = "High-quality splittable pseudorandom number generator";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tfp" = callPackage
@@ -255288,7 +255288,7 @@ self: {
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Type-level integers, booleans, lists using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tfp-th" = callPackage
@@ -255299,8 +255299,8 @@ self: {
        sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm";
        libraryHaskellDepends = [ base template-haskell tfp ];
        description = "Template-Haskell code for tfp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255325,8 +255325,8 @@ self: {
          base hslogger mtl network QuickCheck transformers
        ];
        description = "A library for building tftp servers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255338,8 +255338,8 @@ self: {
        sha256 = "0lpc5z575y7cq03ww2knr5qdkfb36qnim5y1gkh552r9k3pfdjhf";
        libraryHaskellDepends = [ base bytestring ];
        description = "Reading and writing of tga image files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255354,7 +255354,7 @@ self: {
        ];
        testHaskellDepends = [ base containers template-haskell ];
        description = "Nicer interface for reified information about data types";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "th-alpha" = callPackage
@@ -255373,8 +255373,8 @@ self: {
          base derive tasty tasty-hunit tasty-quickcheck template-haskell
        ];
        description = "Alpha equivalence for TH Exp";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255386,7 +255386,7 @@ self: {
        sha256 = "0p5zpiqk8141a4n362m3kpd92sx0192gpv172ixdnfgabk07gn1z";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for bang-type template";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-build" = callPackage
@@ -255397,8 +255397,8 @@ self: {
        sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6";
        libraryHaskellDepends = [ base template-haskell ];
        description = "More convenient construction of TH ASTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255411,7 +255411,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Compile-time CAS(Computer Algebra System)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "th-compat" = callPackage
@@ -255428,7 +255428,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Backward- (and forward-)compatible Quote and Code types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-constraint-compat" = callPackage
@@ -255439,7 +255439,7 @@ self: {
        sha256 = "1wx35f24gryal0h0gadq351gws82qvficcq23pyd1ajrxhgnv3zc";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Compatibility for type constraint template";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-context" = callPackage
@@ -255462,8 +255462,8 @@ self: {
          template-haskell text th-desugar th-orphans th-reify-many
        ];
        description = "Test instance context";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255475,7 +255475,7 @@ self: {
        sha256 = "03d5ddbxzfn60ysxxn17q7gzdlls8hvlsvhzai4mn0qfjpwi6ljx";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for data definition template of TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-desugar" = callPackage
@@ -255497,7 +255497,7 @@ self: {
          th-orphans
        ];
        description = "Functions to desugar Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-dict-discovery" = callPackage
@@ -255508,8 +255508,8 @@ self: {
        sha256 = "1dmkj8is73mwngy1dw3ba34744whqj0jc243bjnkyrrwkbwn55ih";
        libraryHaskellDepends = [ base constraints template-haskell ];
        description = "Automatically discover available dictionaries at compile time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255523,7 +255523,7 @@ self: {
        testHaskellDepends = [ base markdown-unlit ];
        testToolDepends = [ markdown-unlit ];
        description = "Template Haskell splice that expands to an environment variable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-expand-syns" = callPackage
@@ -255535,7 +255535,7 @@ self: {
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-extras" = callPackage
@@ -255546,7 +255546,7 @@ self: {
        sha256 = "1vgvqgfm2lvx6v5r2mglwyl63647c9n6b9a5ikqc93pjm98g9vwg";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "A grab bag of functions for use with Template Haskell";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "th-fold" = callPackage
@@ -255557,8 +255557,8 @@ self: {
        sha256 = "10n1aw74xi5gzs1847dhiv6yjxcz99idw91hvf34zhhs8hp8zf2z";
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH fold generator";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255575,8 +255575,8 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
        description = "Template Haskell based support for format strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255588,7 +255588,7 @@ self: {
        sha256 = "09xxfgyy56284cd2fry8pshlpawva4yq1k6bhza5samn694yinkq";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Simple inline IO action into compiled code using TH";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-instance-reification" = callPackage
@@ -255608,8 +255608,8 @@ self: {
          tasty-quickcheck template-haskell
        ];
        description = "Fixed versions of instances reification functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255633,8 +255633,8 @@ self: {
          test-framework-quickcheck2 th-kinds th-lift
        ];
        description = "A place to collect orphan instances for Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255650,8 +255650,8 @@ self: {
          base containers mtl template-haskell th-orphans
        ];
        description = "Automated kind inference in Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255667,8 +255667,8 @@ self: {
          base containers mtl template-haskell th-orphans
        ];
        description = "Automated kind inference in Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255689,8 +255689,8 @@ self: {
          tasty-quickcheck template-haskell
        ];
        description = "Template Haskell construction utilities";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255706,7 +255706,7 @@ self: {
        ];
        testHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Derive Template Haskell's Lift class for datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-lift-instances" = callPackage
@@ -255725,7 +255725,7 @@ self: {
          base bytestring containers QuickCheck template-haskell text vector
        ];
        description = "Lift instances for template-haskell for common data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-nowq" = callPackage
@@ -255738,7 +255738,7 @@ self: {
        testHaskellDepends = [ base markdown-unlit ];
        testToolDepends = [ markdown-unlit ];
        description = "Template Haskell splice that expands to current time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-orphans" = callPackage
@@ -255759,7 +255759,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Orphan instances for TH datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-pprint" = callPackage
@@ -255770,8 +255770,8 @@ self: {
        sha256 = "1c6h6jw82a8bdb8kqxcam63vbrz04dl8m2ypcmfw5qm88b61zl1f";
        libraryHaskellDepends = [ base lens pretty template-haskell ];
        description = "Simplify and render Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255792,7 +255792,7 @@ self: {
          base hspec HUnit QuickCheck template-haskell text
        ];
        description = "Quasiquoters for printf";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "th-reify-compat" = callPackage
@@ -255803,7 +255803,7 @@ self: {
        sha256 = "171m4fibjq4ml33xvbb0qdm625adknsdgz8flb4xhag075z2w6xg";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for the result type of TH reify";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-reify-many" = callPackage
@@ -255819,7 +255819,7 @@ self: {
        ];
        testHaskellDepends = [ base template-haskell ];
        description = "Recurseively reify template haskell datatype info";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-sccs" = callPackage
@@ -255830,8 +255830,8 @@ self: {
        sha256 = "0vrjqwdjv2922kqmh57ypbslbv1m829wag78addqsr4vjd9b3zl6";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255843,7 +255843,7 @@ self: {
        sha256 = "0jmajcnw832df503jbg2fmrmnskc43i07214vpc4fw359cgd7yn3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility shim for Bang and Strict in Template Haskell";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "th-tc" = callPackage
@@ -255858,8 +255858,8 @@ self: {
          base containers lens mtl template-haskell th-orphans transformers
        ];
        description = "Typechecking in Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255881,7 +255881,7 @@ self: {
          th-orphans transformers
        ];
        description = "Utility functions for testing Template Haskell code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "th-to-exp" = callPackage
@@ -255893,8 +255893,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Provides a way to persist data from compile-time to runtime";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255906,8 +255906,8 @@ self: {
        sha256 = "1hmhpcxg0hhqhb8qmqqi9x8jb4h8a6045k0q8162mm0vl47s4rz2";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Tracing Q monad computation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255935,8 +255935,8 @@ self: {
          aeson base HUnit network-uri syb template-haskell th-lift
        ];
        description = "Graph of the subtype relation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255957,7 +255957,7 @@ self: {
          template-haskell text th-orphans vector
        ];
        description = "Collection of useful functions for use with Template Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "thank-you-stars" = callPackage
@@ -255979,8 +255979,8 @@ self: {
          base Cabal containers directory filepath hspec
        ];
        description = "Give your dependencies stars on GitHub!";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -255996,8 +255996,8 @@ self: {
          base contravariant semigroups slave-thread unagi-chan
        ];
        description = "Minimalistic actor library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256024,7 +256024,7 @@ self: {
          tasty-hunit text time
        ];
        description = "Haskell API bindings for http://themoviedb.org";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "themplate" = callPackage
@@ -256045,7 +256045,7 @@ self: {
          optparse-applicative text transformers transformers-compat
        ];
        description = "Project templating tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "thentos-cookie-session" = callPackage
@@ -256071,7 +256071,7 @@ self: {
        ];
        description = "All-in-one session handling for servant-based frontends";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256083,8 +256083,8 @@ self: {
        sha256 = "05z0jppjbw70rlyh2qis27xp8vdx9fgn7i22ckxb0m2y75gffq61";
        libraryHaskellDepends = [ base HTTP json utf8-string ];
        description = "A common library for TheoremQuest, a theorem proving game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256098,8 +256098,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base HTTP network theoremquest ];
        description = "A simple client for the TheoremQuest theorem proving game";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256111,7 +256111,7 @@ self: {
        sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p";
        libraryHaskellDepends = [ assoc base binary deepseq hashable ];
        description = "An either-or-both data type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "these-lens" = callPackage
@@ -256122,7 +256122,7 @@ self: {
        sha256 = "1nwknm17x7vkx9936z7xa6hqw69pgig185if1dninrvyxvv59kps";
        libraryHaskellDepends = [ base lens these ];
        description = "Lenses for These";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "these-optics" = callPackage
@@ -256133,7 +256133,7 @@ self: {
        sha256 = "1xwf2m03cbb2z40mdab70d042nmvcxpgdq94rmajbqqpb072yivq";
        libraryHaskellDepends = [ base optics-core these ];
        description = "Optics for These";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "these-skinny" = callPackage
@@ -256146,7 +256146,7 @@ self: {
        editedCabalFile = "0q1izcz4kxrnl7sh0sxamxxq02mkxww88vr6v04pwj8alyhkd4z2";
        libraryHaskellDepends = [ base deepseq ];
        description = "A fork of the 'these' package without the dependency bloat";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "thespian" = callPackage
@@ -256157,7 +256157,7 @@ self: {
        sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Lightweight Erlang-style actors for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "theta-functions" = callPackage
@@ -256168,7 +256168,7 @@ self: {
        sha256 = "0m9k1b75ja5a6vq7jdqzsbqjc4fh1kzy29rzss08ph6700bm6z8f";
        libraryHaskellDepends = [ base ];
        description = "Theta-functions implemented as trigonometric series";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "thih" = callPackage
@@ -256182,8 +256182,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base pretty ];
        description = "Typing Haskell In Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256202,8 +256202,8 @@ self: {
          base edit-distance parseargs phonetic-code sqlite
        ];
        description = "Command-line spelling word suggestion tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256231,8 +256231,8 @@ self: {
          text-zipper time vector vty websockets
        ];
        description = "A modern TUI typing game featuring online racing against friends";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256251,8 +256251,8 @@ self: {
          template-haskell
        ];
        description = "Datatype Manipulation with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256266,7 +256266,7 @@ self: {
        testHaskellDepends = [ base containers hspec stm ];
        testToolDepends = [ hspec-discover ];
        description = "Simple Haskell thread management in hierarchical manner";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "thread-local-storage" = callPackage
@@ -256279,7 +256279,7 @@ self: {
        testHaskellDepends = [ atomic-primops base ];
        benchmarkHaskellDepends = [ atomic-primops base criterion ];
        description = "Several options for thread-local-storage (TLS) in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "thread-supervisor" = callPackage
@@ -256298,7 +256298,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A simplified implementation of Erlang/OTP like supervisor over thread";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "threadPool" = callPackage
@@ -256331,7 +256331,7 @@ self: {
          monad-control-aligned mtl stm tmapmvar
        ];
        description = "Manage concurrently operating threads without having to spark them";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threadmanager" = callPackage
@@ -256342,8 +256342,8 @@ self: {
        sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
        libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256361,7 +256361,7 @@ self: {
          base concurrent-extra HUnit stm test-framework test-framework-hunit
        ];
        description = "Fork threads and wait for their result";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threads-extras" = callPackage
@@ -256373,7 +256373,7 @@ self: {
        libraryHaskellDepends = [ base stm threads ];
        testHaskellDepends = [ base ];
        description = "Extends the threads package with a bounded thread group";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threads-pool" = callPackage
@@ -256384,7 +256384,7 @@ self: {
        sha256 = "1x1yafxaaf8r02cqipqnm9shj74kja1bqdp0d1cq5kdhcnh22xkz";
        libraryHaskellDepends = [ base containers mtl stm ];
        description = "A library to operate with pool of haskell's IO threads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threads-supervisor" = callPackage
@@ -256407,7 +256407,7 @@ self: {
          tasty-quickcheck time transformers
        ];
        description = "Simple, IO-based library for Erlang-style thread supervision";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "threadscope" = callPackage
@@ -256428,7 +256428,7 @@ self: {
          text time unix
        ];
        description = "A graphical tool for profiling parallel Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threefish" = callPackage
@@ -256444,7 +256444,7 @@ self: {
          tagged
        ];
        description = "The Threefish block cipher and the Skein hash function for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threepenny-editors" = callPackage
@@ -256462,8 +256462,8 @@ self: {
          semigroups text threepenny-gui
        ];
        description = "Composable algebraic editors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256490,7 +256490,7 @@ self: {
          vector websockets websockets-snap
        ];
        description = "GUI framework that uses the web browser as a display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "threepenny-gui-contextmenu" = callPackage
@@ -256504,8 +256504,8 @@ self: {
        libraryHaskellDepends = [ base threepenny-gui ];
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Write simple nested context menus for threepenny-gui";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256520,8 +256520,8 @@ self: {
        libraryHaskellDepends = [ base clay text threepenny-gui ];
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Flexbox layouts for Threepenny-gui";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256544,8 +256544,8 @@ self: {
          base bytestring hspec QuickCheck unordered-containers
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256557,7 +256557,7 @@ self: {
        sha256 = "16alzsalzlvwg3cjfy8yysv8z72v7v1in1hbi5prz6gm1ws4rcly";
        libraryHaskellDepends = [ base ];
        description = "Type-threaded list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throttle" = callPackage
@@ -256568,7 +256568,7 @@ self: {
        sha256 = "1yxmq7244a8bcw1jg00dqcpwzf8h1333c51k9d0v39flpkzp5qlc";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throttle-io-stream" = callPackage
@@ -256585,7 +256585,7 @@ self: {
          test-framework-hunit text
        ];
        description = "Throttler between arbitrary IO producer and consumer functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throttled" = callPackage
@@ -256596,7 +256596,7 @@ self: {
        sha256 = "0grzdhgpba5wjylr3ci4xp1cx6d26jhh0r018n4l3fzi1zivwagg";
        libraryHaskellDepends = [ async base stm ];
        description = "Concurrent processing of a Foldable, throttled by CPU count";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throttled-io-loop" = callPackage
@@ -256608,8 +256608,8 @@ self: {
        libraryHaskellDepends = [ base natural-numbers time ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Loop over an action but throttle it to a certain rate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256623,7 +256623,7 @@ self: {
        editedCabalFile = "1fdy2wyczl2jncy9gg0asasb8bybcnif8aqnw9fq73sr1778kjpf";
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        description = "Convert textual types through Text without needing O(n^2) instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "throwable-exceptions" = callPackage
@@ -256641,7 +256641,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "throwable-exceptions gives the easy way to throw exceptions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "thumbnail" = callPackage
@@ -256652,7 +256652,7 @@ self: {
        sha256 = "1ms7pzw4lrpkpv6sb0l7jvw5a0n5j7fc9wyi28bq7ik22d4sc8kd";
        libraryHaskellDepends = [ base bytestring gd ];
        description = "generate thumbnail image";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "thumbnail-plus" = callPackage
@@ -256675,8 +256675,8 @@ self: {
          transformers
        ];
        description = "Generate thumbnails easily and safely";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256693,8 +256693,8 @@ self: {
          nonce resourcet text
        ];
        description = "Image thumbnail creation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256725,7 +256725,7 @@ self: {
          vector vector-space
        ];
        description = "A faster time library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tianbar" = callPackage
@@ -256762,8 +256762,8 @@ self: {
          vector xdg-basedir
        ];
        description = "A desktop bar based on WebKit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
 
   "tibetan-utils" = callPackage
@@ -256781,7 +256781,7 @@ self: {
          base hspec hspec-megaparsec megaparsec text
        ];
        description = "Parse and display tibetan numerals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tic-tac-toe" = callPackage
@@ -256795,8 +256795,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk haskell98 ];
        description = "Useful if reading \"Why FP matters\" by John Hughes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256813,7 +256813,7 @@ self: {
        libraryHaskellDepends = [ async base safe-exceptions ];
        testHaskellDepends = [ async base deepseq doctest Glob hspec ];
        description = "A concurrent utility inspired by Ticker in golang";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tickle" = callPackage
@@ -256833,8 +256833,8 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "A port of @Data.Binary@";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256846,8 +256846,8 @@ self: {
        sha256 = "0xpfcabhlpnp883jb23sjcilan1cwwykvvlqvc6qzhda63fcyqp1";
        libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
        description = "3D Tic-Tac-Toe game";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256868,7 +256868,7 @@ self: {
        testHaskellDepends = [ base containers deepseq microspec parsec ];
        benchmarkHaskellDepends = [ base criterion weigh ];
        description = "Pattern language for improvised music";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tidal-midi" = callPackage
@@ -256885,8 +256885,8 @@ self: {
          base containers PortMidi tidal time transformers
        ];
        description = "MIDI support for tidal";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256900,8 +256900,8 @@ self: {
          base bytestring containers serialport tidal
        ];
        description = "Serial support for tidal";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256922,8 +256922,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Visual rendering for Tidal patterns and osc messages";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256936,7 +256936,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256948,8 +256948,8 @@ self: {
        sha256 = "13jazsgjs95hykshjsvjx05hdhj5jcl85sqhci4hmjhyivplxc58";
        libraryHaskellDepends = [ base deepseq time ];
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256966,8 +256966,8 @@ self: {
          array base containers uuagc uuagc-cabal uulib
        ];
        description = "Tiger Compiler of Universiteit Utrecht";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -256979,7 +256979,7 @@ self: {
        sha256 = "069gwshl52cngbm563snyvjdgm39cgrlpq446mh45adjmbfd26c4";
        libraryHaskellDepends = [ base ];
        description = "Tightly binding infix function application";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "tightrope" = callPackage
@@ -256995,8 +256995,8 @@ self: {
          wai-extra wreq
        ];
        description = "Nice API for a Slackbot";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257015,8 +257015,8 @@ self: {
          simple-pipe time
        ];
        description = "Tiny and Incrementally-Growing HTTP library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257029,7 +257029,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        description = "Slippy map tile functionality";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tilings" = callPackage
@@ -257040,7 +257040,7 @@ self: {
        sha256 = "03a9bc4zbfb3c0dd75rxj7h9pj3sc23l9a9gmabcww5nsx8kpjys";
        libraryHaskellDepends = [ base ];
        description = "substitution tilings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timberc" = callPackage
@@ -257059,8 +257059,8 @@ self: {
        ];
        executableToolDepends = [ happy ];
        description = "The Timber Compiler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257079,8 +257079,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "A time library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "time-cache" = callPackage
@@ -257095,7 +257095,7 @@ self: {
          auto-update base text time time-units transformers
        ];
        description = "Cache current time and formatted time text";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "time-compat" = callPackage
@@ -257112,7 +257112,7 @@ self: {
          tasty-quickcheck time
        ];
        description = "Compatibility package for time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-extras" = callPackage
@@ -257123,8 +257123,8 @@ self: {
        sha256 = "1k9adm922l431gyk8figx5df1n2xk5awir2fpijnvvyphrwk5p3l";
        libraryHaskellDepends = [ base time ];
        description = "Data instances for the time package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257146,8 +257146,8 @@ self: {
          old-locale QuickCheck random text time tz
        ];
        description = "Yet another time library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257171,8 +257171,8 @@ self: {
          QuickCheck tagged time
        ];
        description = "Parse and format HTTP/1.1 Date and Time strings";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257184,7 +257184,7 @@ self: {
        sha256 = "097yab0j9dpplq65a9x6liisdrakag6azmylis4yxv2zlg1f2wrl";
        libraryHaskellDepends = [ base time-units ];
        description = "Use a time unit class, but hold a concrete time type";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "time-io-access" = callPackage
@@ -257195,8 +257195,8 @@ self: {
        sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb";
        libraryHaskellDepends = [ base base-io-access time ];
        description = "IO Access for time";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257208,7 +257208,7 @@ self: {
        sha256 = "07nh97x1mx5hc48xqv3gk3cgls6xpb829h3bzsjx8rwqnzybijyq";
        libraryHaskellDepends = [ base data-lens-light time ];
        description = "Lens-based interface to Data.Time data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-locale-compat" = callPackage
@@ -257219,7 +257219,7 @@ self: {
        sha256 = "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7";
        libraryHaskellDepends = [ base old-locale time ];
        description = "Compatibile module for time-format locale";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-locale-vietnamese" = callPackage
@@ -257230,7 +257230,7 @@ self: {
        sha256 = "0xhbfdzrlhj3096w2dgk2ijpzs4kzym11sz3r0h8r19a3jrjs1ln";
        libraryHaskellDepends = [ base time ];
        description = "Vietnamese locale for date and time format";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "time-machine" = callPackage
@@ -257242,8 +257242,8 @@ self: {
        libraryHaskellDepends = [ base mtl time tz ];
        testHaskellDepends = [ base hspec HUnit mtl time tz ];
        description = "A library to mock the current time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257255,7 +257255,7 @@ self: {
        sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh";
        libraryHaskellDepends = [ auto-update base ];
        description = "Scalable timer";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "time-out" = callPackage
@@ -257272,7 +257272,7 @@ self: {
        ];
        testHaskellDepends = [ base time-units transformers ];
        description = "Timers, timeouts, alarms, monadic wrappers";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "time-parsers" = callPackage
@@ -257291,7 +257291,7 @@ self: {
          template-haskell text time
        ];
        description = "Parsers for types in `time`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-patterns" = callPackage
@@ -257302,7 +257302,7 @@ self: {
        sha256 = "0qyg2y41c0bn296zyxfhjjjm0bxn4vmns242vl90j0b0siz69qr0";
        libraryHaskellDepends = [ base intervals time ];
        description = "Patterns for recurring events";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-qq" = callPackage
@@ -257318,8 +257318,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Quasi-quoter for UTCTime times";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257336,8 +257336,8 @@ self: {
          base doctest doctest-discover template-haskell time
        ];
        description = "Quasi-quoters for dates and times";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257355,8 +257355,8 @@ self: {
          test-framework-hunit time
        ];
        description = "Generate recurring dates";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257371,8 +257371,8 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        executableHaskellDepends = [ base ];
        description = "Time series analysis";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257386,8 +257386,8 @@ self: {
        testHaskellDepends = [ base Cabal hspec QuickCheck ];
        doHaddock = false;
        description = "Library for Time Series processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257399,7 +257399,7 @@ self: {
        sha256 = "16g0i6r6vj9w4lbn12jqrhgbbjjca8wbzq6546dz08aks1yrk0g1";
        libraryHaskellDepends = [ base ];
        description = "A basic library for defining units of time as types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "time-w3c" = callPackage
@@ -257412,8 +257412,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base convertible parsec time ];
        description = "Parse, format and convert W3C Date and Time";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257451,8 +257451,8 @@ self: {
          time-units transformers
        ];
        description = "Distributed systems execution emulation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257465,8 +257465,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257480,7 +257480,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
        description = "time each line of terminal output";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "timeit" = callPackage
@@ -257493,7 +257493,7 @@ self: {
        editedCabalFile = "0d4vjg48xyqjmydnjqjxica0zr30vgb91b3vv75cig686ikpjmq7";
        libraryHaskellDepends = [ base ];
        description = "Time monadic computations with an IO base";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timelens" = callPackage
@@ -257504,7 +257504,7 @@ self: {
        sha256 = "0r57fib5nzvrk8gsn26364l1a14zj9sg3kv2db4pjzy3dq0zmrpl";
        libraryHaskellDepends = [ base lens time ];
        description = "Lenses for the time package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeless" = callPackage
@@ -257517,7 +257517,7 @@ self: {
          ansi-terminal base linear time transformers
        ];
        description = "An Arrow based Functional Reactive Programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeless-tutorials" = callPackage
@@ -257531,7 +257531,7 @@ self: {
        libraryHaskellDepends = [ base timeless ];
        executableHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timelike" = callPackage
@@ -257542,7 +257542,7 @@ self: {
        sha256 = "0gxpagh4pp0wfraryxvij52gm7b42alsgg8l34xsf6p06cxh8h5d";
        libraryHaskellDepends = [ base transformers ];
        description = "Type classes for types representing time";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "timelike-clock" = callPackage
@@ -257553,7 +257553,7 @@ self: {
        sha256 = "1bnwp4bzn58pmdcwnrarafvh8m28ahwsgl6lysrnyv7k2krb7qny";
        libraryHaskellDepends = [ base clock timelike transformers ];
        description = "Timelike interface for the clock library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "timelike-time" = callPackage
@@ -257564,7 +257564,7 @@ self: {
        sha256 = "07a853ggcbzggcm5sg943mgb7b2qy1dzmh2ghmix9iiyc5pm6jxy";
        libraryHaskellDepends = [ base time timelike transformers ];
        description = "Timelike interface for the time library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "timemap" = callPackage
@@ -257589,8 +257589,8 @@ self: {
          base containers criterion focus hashable list-t stm stm-containers
          time unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257607,8 +257607,8 @@ self: {
          base exceptions mtl QuickCheck tasty tasty-quickcheck time
        ];
        description = "Generalized sleep and timeout functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257624,7 +257624,7 @@ self: {
          base ghc-prim lifted-base monad-control mtl transformers-base
        ];
        description = "Updatable timeouts as a Monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeout-with-results" = callPackage
@@ -257636,7 +257636,7 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel ];
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257652,8 +257652,8 @@ self: {
          attoparsec base bytestring containers convertible mtl time
        ];
        description = "Attoparsec parsers for various Date/Time formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257674,7 +257674,7 @@ self: {
          time transformers vcs-revision
        ];
        description = "A tool for visualizing time series from log files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeprint" = callPackage
@@ -257685,8 +257685,8 @@ self: {
        sha256 = "1anb14bih8728jsygx86fq077fs0gmy4gnkaa489zy5gh468a4bg";
        libraryHaskellDepends = [ base datetime ];
        description = "Prints timestamps after each line evaluated";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257699,7 +257699,7 @@ self: {
        libraryHaskellDepends = [ atomic-primops base psqueues vector ];
        testHaskellDepends = [ base ];
        description = "A timer wheel";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timerep" = callPackage
@@ -257717,7 +257717,7 @@ self: {
          base QuickCheck tasty tasty-hunit tasty-quickcheck text time
        ];
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timers" = callPackage
@@ -257732,7 +257732,7 @@ self: {
          base lifted-base monad-control suspend transformers-base
        ];
        description = "Simple package that implements timers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timers-tick" = callPackage
@@ -257744,7 +257744,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "tick based timers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timers-updatable" = callPackage
@@ -257755,7 +257755,7 @@ self: {
        sha256 = "1naw59xvbfhgz49qhvgzng4xjf4fzi59gl996pcp5l6s2sbpx4mw";
        libraryHaskellDepends = [ base stm ];
        description = "timers which are updatable in the remaining time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timeseries" = callPackage
@@ -257774,8 +257774,8 @@ self: {
          text-time time vector
        ];
        description = "Library for Time Series processing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257787,7 +257787,7 @@ self: {
        sha256 = "1gzrdwysyk3lj5pr53w63c8mk0i22rip4v2jp4h38f85lanzwb2b";
        libraryHaskellDepends = [ base time ];
        description = "Useful timespan datatype and functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "timestamp" = callPackage
@@ -257802,7 +257802,7 @@ self: {
          base cereal foldl generic-random hashable QuickCheck time
        ];
        description = "Space-efficient Unix timestamp and utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "timestamp-subprocess-lines" = callPackage
@@ -257819,7 +257819,7 @@ self: {
          base bytestring process split time transformers
        ];
        description = "Run a command and timestamp its stdout/stderr lines";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timestamper" = callPackage
@@ -257832,7 +257832,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base old-locale time ];
        description = "Read standard input and prepend each line with a timestamp";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "timeutils" = callPackage
@@ -257847,8 +257847,8 @@ self: {
        executableHaskellDepends = [ base brick microlens time vty ];
        testHaskellDepends = [ base hspec microlens time ];
        description = "Time utilities";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257868,8 +257868,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings for the zone-detect C library; plus tz-aware utils";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257885,7 +257885,7 @@ self: {
          base binary bytestring extensible-exceptions time timezone-series
        ];
        description = "A pure Haskell parser and renderer for binary Olson timezone files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timezone-olson-th" = callPackage
@@ -257900,8 +257900,8 @@ self: {
          base template-haskell time timezone-olson timezone-series
        ];
        description = "Load TimeZoneSeries from an Olson file at compile time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257913,7 +257913,7 @@ self: {
        sha256 = "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5";
        libraryHaskellDepends = [ base deepseq time ];
        description = "Enhanced timezone handling for Data.Time";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "timezone-unix" = callPackage
@@ -257933,8 +257933,8 @@ self: {
          base directory leapseconds tasty tasty-golden tasty-hunit time
          timezone-series
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257946,7 +257946,7 @@ self: {
        sha256 = "078p6gzzb7f9g68lm3q5806azhrs6li35ras9jnb9gs2r6i0w83j";
        libraryHaskellDepends = [ base time ];
        description = "Convenient functions for getting times";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tini" = callPackage
@@ -257958,8 +257958,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Tiny INI file and configuration library with a minimal dependency footprint";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257985,8 +257985,8 @@ self: {
        executableToolDepends = [ require ];
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -257998,8 +257998,8 @@ self: {
        sha256 = "04bcz2ifkrw0f6razvzpycvzdbarv1ain800l4rapqyqzykgzxjw";
        libraryHaskellDepends = [ async base time ];
        description = "tiny no-brainer job scheduler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258015,8 +258015,8 @@ self: {
          attoparsec base bytestring hex serialport unix
        ];
        description = "TinyMesh - communicating with auto-meshing sensor network";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258041,8 +258041,8 @@ self: {
          vector
        ];
        description = "A fast DOM parser for a subset of XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258055,7 +258055,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        libraryToolDepends = [ c2hs ];
        description = "Wrapper around the 'tiny file dialogs' C library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tinylog" = callPackage
@@ -258072,7 +258072,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simplistic logging using fast-logger";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "tinytemplate" = callPackage
@@ -258084,8 +258084,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base QuickCheck text ];
        description = "A tiny text templating library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258110,8 +258110,8 @@ self: {
          base optparse-applicative pretty pretty-show tip-lib
        ];
        description = "Convert from Haskell to Tip";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258135,8 +258135,8 @@ self: {
          base filepath optparse-applicative pretty
        ];
        description = "tons of inductive problems - support library and tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258153,7 +258153,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec vector ];
        description = "Navigating and editing JSON data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "titan" = callPackage
@@ -258181,8 +258181,8 @@ self: {
          keera-hails-reactivevalues mtl network network-bsd template-haskell
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258200,8 +258200,8 @@ self: {
          base IfElse network network-bsd stm transformers Yampa
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258213,8 +258213,8 @@ self: {
        sha256 = "0h7d4152nd8mx4slyjss4kf7n1xn99vc5hnk072apqfv301vpbx3";
        libraryHaskellDepends = [ base Yampa ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258230,8 +258230,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Convert English Words to Title Case";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "tkhs" = callPackage
@@ -258249,8 +258249,8 @@ self: {
        ];
        testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
        description = "Simple Presentation Utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258277,8 +258277,8 @@ self: {
          web-routes yesod yesod-core yesod-form yesod-static
        ];
        description = "A web-based visualizer for GHC Profiling Reports";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258291,7 +258291,7 @@ self: {
        libraryHaskellDepends = [ base containers network-uri text ];
        testHaskellDepends = [ base HUnit network-uri text ];
        description = "This project separates subdomains, domains, and top-level-domains from URLs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tldr" = callPackage
@@ -258312,7 +258312,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Haskell tldr client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tlex" = callPackage
@@ -258441,7 +258441,7 @@ self: {
          gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation
        ];
        description = "TLS/SSL protocol native implementation (Server and Client)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tls-debug" = callPackage
@@ -258460,7 +258460,7 @@ self: {
          tls-session-manager x509 x509-store x509-system x509-validation
        ];
        description = "Set of programs for TLS testing and debugging";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tls-extra" = callPackage
@@ -258479,8 +258479,8 @@ self: {
          crypto-random cryptohash mtl network pem time tls vector
        ];
        description = "TLS extra default values and helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258496,7 +258496,7 @@ self: {
          auto-update base basement bytestring clock memory psqueues tls
        ];
        description = "In-memory TLS session manager";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tlynx" = callPackage
@@ -258518,8 +258518,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Handle phylogenetic trees";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258535,7 +258535,7 @@ self: {
          base containers hashable stm unordered-containers
        ];
        description = "An insert-ordered multimap (indexed FIFO) which consumes values as you lookup";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tmapmvar" = callPackage
@@ -258555,7 +258555,7 @@ self: {
          tasty tasty-quickcheck unordered-containers
        ];
        description = "A single-entity stateful Map in STM, similar to tmapchan";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tmp-postgres" = callPackage
@@ -258590,8 +258590,8 @@ self: {
          base criterion deepseq postgres-options postgresql-simple temporary
        ];
        description = "Start and stop a temporary postgres";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258607,7 +258607,7 @@ self: {
          base bytestring directory template text
        ];
        description = "simple executable for templating";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tn" = callPackage
@@ -258629,8 +258629,8 @@ self: {
          base bytestring file-embed optparse-applicative optparse-helper
        ];
        description = "A simple daily journal program";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258643,7 +258643,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring utf8-string ];
        description = "Library for encoding/decoding TNET strings for PGI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "to" = callPackage
@@ -258662,7 +258662,7 @@ self: {
          base containers gauge text unordered-containers
        ];
        description = "Simple, safe, boring type conversions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "to-haskell" = callPackage
@@ -258676,8 +258676,8 @@ self: {
          base containers haskell-src-exts transformers
        ];
        description = "A type class and some utilities for generating Haskell code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258691,8 +258691,8 @@ self: {
        editedCabalFile = "1p5q59gswv86pk7hxpg1n81q4szhwx8rwfx5hsibdz9i9mgz2bbs";
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258704,8 +258704,8 @@ self: {
        sha256 = "1h5aq3shagzgh1j8sbslvi2rrkqv1djm595d522ci8hpj6h8vxl9";
        libraryHaskellDepends = [ bytestring pretty text to-string-class ];
        description = "Instances for the ToString class";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258724,8 +258724,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Twitter bot generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258737,8 +258737,8 @@ self: {
        sha256 = "1gh2jdrxph0x9cc03kk8xxjyicivwcqfs9qv2nfr7mn570cmjrmw";
        libraryHaskellDepends = [ base ];
        description = "A todo bottom";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258764,8 +258764,8 @@ self: {
          utf8-string
        ];
        description = "Easy-to-use TODOs manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258784,8 +258784,8 @@ self: {
          array base bytestring containers filepath hexpat hexpat-pickle
        ];
        description = "Reading and writing Haskell data from and to XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258804,7 +258804,7 @@ self: {
        ];
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258819,7 +258819,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        description = "Rate limiter using lazy bucket algorithm";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "token-limiter" = callPackage
@@ -258840,8 +258840,8 @@ self: {
          async base clock QuickCheck tasty tasty-hunit text
        ];
        description = "Fast rate limiting using the token bucket algorithm (BSD)";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258867,8 +258867,8 @@ self: {
          base bytestring conduit hashable hspec process streaming-commons
          text unordered-containers
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258880,8 +258880,8 @@ self: {
        sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch";
        libraryHaskellDepends = [ base containers text ];
        description = "A regex lexer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258898,7 +258898,7 @@ self: {
          base bytestring criterion deepseq filepath split text
        ];
        description = "Simple tokenizer for English text";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tokenizer-monad" = callPackage
@@ -258909,7 +258909,7 @@ self: {
        sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn";
        libraryHaskellDepends = [ base bytestring text ];
        description = "An efficient and easy-to-use tokenizer monad";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tokenizer-streaming" = callPackage
@@ -258925,8 +258925,8 @@ self: {
          streaming-commons text tokenizer-monad
        ];
        description = "A variant of tokenizer-monad that supports streaming";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258951,8 +258951,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "TokTok C code style checker";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258968,7 +258968,7 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        executableHaskellDepends = [ base bytestring gf iconv ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -258987,8 +258987,8 @@ self: {
        testHaskellDepends = [ base bytestring directory HUnit mtl ];
        testSystemDepends = [ tokyocabinet ];
        description = "Haskell binding of Tokyo Cabinet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
@@ -259002,9 +259002,9 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ tokyocabinet tokyotyrant ];
        description = "FFI bindings to libtokyotyrant";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
@@ -259016,8 +259016,8 @@ self: {
        sha256 = "0xffc0xjkg1jqdq7s5x0y4gi13s9yhpcwb5zvrcbmv194bp65xx1";
        libraryHaskellDepends = [ base OpenAL stm vector ];
        description = "Easy to use library for audio programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259034,8 +259034,8 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring containers old-locale time
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259050,7 +259050,7 @@ self: {
        libraryHaskellDepends = [ array base text time ];
        libraryToolDepends = [ alex happy ];
        description = "Parser for the TOML configuration language";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "tomland" = callPackage
@@ -259081,7 +259081,7 @@ self: {
          unordered-containers
        ];
        description = "Bidirectional TOML serialization";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "tomlcheck" = callPackage
@@ -259098,7 +259098,7 @@ self: {
          base htoml-megaparsec megaparsec optparse-applicative text
        ];
        description = "Command-line tool to check syntax of TOML files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tonalude" = callPackage
@@ -259110,7 +259110,7 @@ self: {
        libraryHaskellDepends = [ base bytestring rio unliftio ];
        testHaskellDepends = [ base bytestring doctest Glob rio unliftio ];
        description = "A standard library for Tonatona framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tonaparser" = callPackage
@@ -259124,7 +259124,7 @@ self: {
        libraryHaskellDepends = [ base envy rio say ];
        testHaskellDepends = [ base doctest envy Glob rio say tonatona ];
        description = "Scalable way to pass runtime configurations for tonatona";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tonatona" = callPackage
@@ -259136,7 +259136,7 @@ self: {
        libraryHaskellDepends = [ base rio tonaparser ];
        testHaskellDepends = [ base doctest Glob rio tonaparser ];
        description = "meta application framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tonatona-google-server-api" = callPackage
@@ -259158,8 +259158,8 @@ self: {
          tonatona
        ];
        description = "tonatona plugin for google-server-api";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259172,7 +259172,7 @@ self: {
        libraryHaskellDepends = [ base rio tonaparser tonatona ];
        testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ];
        description = "tonatona plugin for logging";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tonatona-persistent-postgresql" = callPackage
@@ -259192,8 +259192,8 @@ self: {
          resource-pool rio tonaparser tonatona
        ];
        description = "tonatona plugin for accessing PostgreSQL database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259214,8 +259214,8 @@ self: {
          resource-pool rio tonaparser tonatona
        ];
        description = "tonatona plugin for accessing Sqlite database";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259239,8 +259239,8 @@ self: {
          wai-extra warp
        ];
        description = "tonatona plugin for servant";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259285,8 +259285,8 @@ self: {
          vector
        ];
        description = "Cluster single cells and analyze cell clade relationships";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259322,8 +259322,8 @@ self: {
          text time wai warp yaml
        ];
        description = "Manage the TODO entries in your code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259365,8 +259365,8 @@ self: {
          base directory doctest filemanip tasty tasty-hunit zm
        ];
        description = "Top (typed oriented protocol) API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259386,7 +259386,7 @@ self: {
        ];
        description = "OpenGL Arcade Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259402,7 +259402,7 @@ self: {
          base base-compat base-orphans containers vector
        ];
        description = "Directed acyclic graphs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "torch" = callPackage
@@ -259413,8 +259413,8 @@ self: {
        sha256 = "1bai1vxd2vfxl9zn37dvrb05yh4knr5gw5syqpi6lxxd3lf0ngzc";
        libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        description = "Simple unit test library (or framework)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259430,7 +259430,7 @@ self: {
          base bencode binary bytestring containers filepath syb
        ];
        description = "BitTorrent file parser and generater";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "torsor" = callPackage
@@ -259441,7 +259441,7 @@ self: {
        sha256 = "173dn2n24xdlyymw5hqd6qd1r6h65bqrhpkcl49kccxr10xgb8vm";
        libraryHaskellDepends = [ base ];
        description = "Torsor Typeclass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tostring" = callPackage
@@ -259452,7 +259452,7 @@ self: {
        sha256 = "0c95a1vjnnn3bwdz8v5hv7q2sbzn23ban3hcwqmwhmzc9ba019zg";
        libraryHaskellDepends = [ base case-insensitive text utf8-string ];
        description = "The ToString class";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "total" = callPackage
@@ -259463,7 +259463,7 @@ self: {
        sha256 = "0zr3b83pwjbarxsl9kva6va3cp9b4npfp77yp0nh9q1za00344vk";
        libraryHaskellDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "total-alternative" = callPackage
@@ -259474,7 +259474,7 @@ self: {
        sha256 = "1krm6jymnrr6iiys16rwar60avnaxpbn583szarnd4lqjhk0g5cq";
        libraryHaskellDepends = [ base ];
        description = "Alternative interface for total versions of partial function on the Prelude";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "total-map" = callPackage
@@ -259485,8 +259485,8 @@ self: {
        sha256 = "015bj6g4hjp38fc8bm5z57w6akdgvyab6j2sc666x0qdxgrdwp88";
        libraryHaskellDepends = [ base containers semiring-num ];
        description = "Finitely represented total maps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259503,7 +259503,7 @@ self: {
          linear reflection semigroups vector
        ];
        description = "Dense and sparse total maps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "touched" = callPackage
@@ -259517,8 +259517,8 @@ self: {
        libraryHaskellDepends = [ base directory process time ];
        executableHaskellDepends = [ base cmdargs ];
        description = "Library (and cli) to execute a procedure on file change";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259536,7 +259536,7 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        description = "A numeric tower";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "toxcore" = callPackage
@@ -259565,8 +259565,8 @@ self: {
          saltine text
        ];
        description = "A Tox protocol implementation in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259592,8 +259592,8 @@ self: {
          data-default-class hspec QuickCheck saltine
        ];
        description = "Haskell bindings to the C reference implementation of Tox";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {toxcore = null;};
 
@@ -259613,8 +259613,8 @@ self: {
          silently time
        ];
        description = "Client library for Toxiproxy: a TCP failure testing proxy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259671,8 +259671,8 @@ self: {
          array base criterion data-default-class vector
        ];
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259709,8 +259709,8 @@ self: {
          pipes-safe process stm transformers trifecta
        ];
        description = "simple, parallel job scheduling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259736,8 +259736,8 @@ self: {
          wai warp websockets wuss
        ];
        description = "Applications for interacting with the Pushbullet API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259779,8 +259779,8 @@ self: {
          prettyprinter QuickCheck scientific text
        ];
        description = "Parser and pretty printer for the TPTP language";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259797,8 +259797,8 @@ self: {
          transformers-base
        ];
        description = "A monad transformer for tracing provenience of errors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259810,8 +259810,8 @@ self: {
        sha256 = "1fiz1v9d4ck8na68cywha53vgbgdk6iqad1zv6pj3lq0pwvkx6aw";
        libraryHaskellDepends = [ base containers mtl ];
        description = "functions for logging the arguments and results of function calls";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259823,8 +259823,8 @@ self: {
        sha256 = "0c5nsq9x59rmdkyvcrr1v94kjya48nhl9pnsad6xdmh77msf33xy";
        libraryHaskellDepends = [ base ];
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259836,8 +259836,8 @@ self: {
        sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9";
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259850,7 +259850,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base mtl transformers ];
        description = "Tracing utilities for Functor/Applicative/Monad types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tracetree" = callPackage
@@ -259867,8 +259867,8 @@ self: {
          base bifunctors containers json mtl transformers
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259889,7 +259889,7 @@ self: {
          base containers hspec mtl stm text unliftio
        ];
        description = "Distributed tracing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tracing-control" = callPackage
@@ -259912,7 +259912,7 @@ self: {
          text
        ];
        description = "Distributed tracing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tracked-files" = callPackage
@@ -259927,8 +259927,8 @@ self: {
        executableHaskellDepends = [ base directory process text ];
        testHaskellDepends = [ base directory hspec process ];
        description = "Package to list all tracked and untracked existing files via Git";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259941,7 +259941,7 @@ self: {
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259960,8 +259960,8 @@ self: {
          text time vty
        ];
        description = "A command-line tool for live monitoring";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259983,8 +259983,8 @@ self: {
          base hedgehog mmorph postgresql-simple resource-pool text
        ];
        description = "Tools for postgresql-simple";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -259996,8 +259996,8 @@ self: {
        sha256 = "03s31yfhnv9h1h51810vx8dsfs8r09bqigr9hs3kgb3107vyny77";
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260030,7 +260030,7 @@ self: {
          megaparsec mtl pretty-show tasty tasty-hedgehog tasty-hunit text
          time transformers unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
   "traildb" = callPackage
@@ -260053,8 +260053,8 @@ self: {
          base bytestring cereal criterion deepseq directory random
        ];
        description = "TrailDB bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {Judy = null; traildb = null;};
 
@@ -260077,8 +260077,8 @@ self: {
          http-types regexpr text unordered-containers uri
        ];
        description = "Tools and a library for working with Trajectory";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260090,7 +260090,7 @@ self: {
        sha256 = "0hkwl1dygghym6w5qci53ylkhk298bzddfvahisr2gw5wibknrfs";
        libraryHaskellDepends = [ base ];
        description = "Monadic effect framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trans-fx-data" = callPackage
@@ -260101,7 +260101,7 @@ self: {
        sha256 = "0y4hnn1ixgsqd9x829cxyn0n2psxpjczxxaa99jv9wrfwfvssgid";
        libraryHaskellDepends = [ base trans-fx-core ];
        description = "Monadic effect framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trans-fx-io" = callPackage
@@ -260113,7 +260113,7 @@ self: {
        libraryHaskellDepends = [ base time trans-fx-core trans-fx-data ];
        testHaskellDepends = [ base time trans-fx-core ];
        description = "Monadic effect framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transaction" = callPackage
@@ -260129,7 +260129,7 @@ self: {
          base doctest Glob hspec mono-traversable QuickCheck
        ];
        description = "Monadic representation of transactions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "transactional-events" = callPackage
@@ -260142,8 +260142,8 @@ self: {
        editedCabalFile = "10sdjrzyld7wpzw687vrs91vk98pf3zk1cv9hj11jqnbnlbfbqcs";
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260162,8 +260162,8 @@ self: {
          mtl process semigroups
        ];
        description = "Text transformer and interpreter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260192,8 +260192,8 @@ self: {
          base bytestring cpu hspec QuickCheck sqlcli store time transformers
        ];
        description = "ODBC database transfer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260214,8 +260214,8 @@ self: {
          base containers criterion mtl multirec parsec QuickCheck
        ];
        description = "Generic representation of tree transformations";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260227,8 +260227,8 @@ self: {
        sha256 = "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "transformers-abort" = callPackage
@@ -260244,7 +260244,7 @@ self: {
          transformers-base
        ];
        description = "Error and short-circuit monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-base" = callPackage
@@ -260259,7 +260259,7 @@ self: {
          base base-orphans stm transformers transformers-compat
        ];
        description = "Lift computations from the bottom of a transformer stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-bifunctors" = callPackage
@@ -260272,7 +260272,7 @@ self: {
        editedCabalFile = "1vjyk2ldwfi2pkvk79p37ii5xgg1399kxqhkq3l4wvag4j5p4afs";
        libraryHaskellDepends = [ base mmorph transformers ];
        description = "Bifunctors over monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-compat" = callPackage
@@ -260283,7 +260283,7 @@ self: {
        sha256 = "1yd936az31g9995frc84g05rrb5b7w59ajssc5183lp6wm8h4bky";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "A small compatibility shim for the transformers library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-compose" = callPackage
@@ -260294,8 +260294,8 @@ self: {
        sha256 = "0kvhl5s1js6i639hc6c4ib9jmgy4l1503ifs30a9ajrk97nagp6d";
        libraryHaskellDepends = [ base transformers ];
        description = "Arrow-like / category-like composition for transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260307,7 +260307,7 @@ self: {
        sha256 = "0h0qbhk7b4wm3h06m26ga3i6rqw60fjs469iq6p3j6pdvq58bb5x";
        libraryHaskellDepends = [ base transformers ];
        description = "Control flow data type and monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-convert" = callPackage
@@ -260325,8 +260325,8 @@ self: {
          HUnit QuickCheck text transformers unix
        ];
        description = "Sensible conversions between some of the monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260345,8 +260345,8 @@ self: {
          base criterion effect-interpreters mtl pipes transformers
        ];
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {effect-interpreters = null;};
 
@@ -260358,7 +260358,7 @@ self: {
        sha256 = "1hjkiz3dhk4dp8a4lgpyns4nd867lg7ydq4r4zf57w4i6ys7j4l7";
        libraryHaskellDepends = [ base exceptions text transformers ];
        description = "An Either monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-except" = callPackage
@@ -260369,7 +260369,7 @@ self: {
        sha256 = "1i89k4bml223f7m3pin73vrz51xb2j7q7rr39x9v587hmm40mvkm";
        libraryHaskellDepends = [ base exceptions text transformers ];
        description = "An Except monad transformer with";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-fix" = callPackage
@@ -260382,7 +260382,7 @@ self: {
        editedCabalFile = "126gyjr8jp42md6nblx7c0kan97jgsakvsf2vzv2pj828ax1icrs";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad transformer for evaluating to a fixpoint";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-free" = callPackage
@@ -260395,7 +260395,7 @@ self: {
        editedCabalFile = "1zkizjg2pincjf9kj254153bsrivywk141wz9wlnl0i56wl9cy7i";
        libraryHaskellDepends = [ base transformers ];
        description = "Free monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transformers-lift" = callPackage
@@ -260408,8 +260408,8 @@ self: {
          base transformers writer-cps-transformers
        ];
        description = "Ad-hoc type classes for lifting";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260421,8 +260421,8 @@ self: {
        sha256 = "0m1vvdfi661mmxm5rghsfnwcjd2r0r7ryc3jk0nwlzs0kaw5xi1s";
        libraryHaskellDepends = [ base transformers ];
        description = "A unified interface for the run operation of monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260434,7 +260434,7 @@ self: {
        sha256 = "09f9n3cxi3sjmd8yscvcyahvdsqa5db5bckj9ryaflswsdm0ximq";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Supply applicative, monad, applicative transformer and monad transformer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "transient" = callPackage
@@ -260454,7 +260454,7 @@ self: {
          transformers
        ];
        description = "composing programs with multithreading, events and distributed computing";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "transient-universe" = callPackage
@@ -260489,8 +260489,8 @@ self: {
          transformers transient vector websockets
        ];
        description = "fully composable remote execution for the creation of distributed systems";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260507,8 +260507,8 @@ self: {
          transient-universe x509-store x509-system
        ];
        description = "transient with secure communications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260522,8 +260522,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base fingertree ];
        description = "Integer sets with a constant time translate operation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260536,8 +260536,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base curl json network utf8-string ];
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260555,8 +260555,8 @@ self: {
        executableHaskellDepends = [ base text turtle ];
        testHaskellDepends = [ base HUnit ];
        description = "Translation cli tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260575,8 +260575,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Type Safe Web Routing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260593,8 +260593,8 @@ self: {
          http-media http-types text trasa
        ];
        description = "Type safe http requests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260612,8 +260612,8 @@ self: {
          mtl path-pieces quantification text trasa trasa-server
        ];
        description = "Extra functions for trasa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260632,8 +260632,8 @@ self: {
          unordered-containers
        ];
        description = "generate forms using lucid, ditto and trasa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260650,8 +260650,8 @@ self: {
          reflex reflex-dom text trasa
        ];
        description = "Reactive Type Safe Routing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "trasa-server" = callPackage
@@ -260667,8 +260667,8 @@ self: {
          mtl text trasa wai
        ];
        description = "Type safe web server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260685,8 +260685,8 @@ self: {
        ];
        testHaskellDepends = [ base trasa ];
        description = "Template Haskell to generate trasa routes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260702,8 +260702,8 @@ self: {
        testHaskellDepends = [ base template-haskell util ];
        benchmarkHaskellDepends = [ base gauge template-haskell util ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260718,7 +260718,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Generic applicative traversals";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "travis" = callPackage
@@ -260735,8 +260735,8 @@ self: {
          aeson base bytestring http-conduit transformers
        ];
        description = "A simple client implementation using Travis CI API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260766,8 +260766,8 @@ self: {
          yaml
        ];
        description = ".travis.yml preprocessor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260782,7 +260782,7 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative process ];
        executableHaskellDepends = [ base ];
        description = "A better travis_wait";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trawl" = callPackage
@@ -260800,8 +260800,8 @@ self: {
          split
        ];
        description = "A tool for finding haddocks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260816,8 +260816,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk process ];
        description = "Tray Icon application to PowerOff / Reboot computer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260832,8 +260832,8 @@ self: {
        libraryHaskellDepends = [ base deepseq mersenne-random-pure64 ];
        testHaskellDepends = [ base doctest Glob hspec hspec-core ];
        description = "Efficient implementation of the implicit treap data structure";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260861,7 +260861,7 @@ self: {
          tagged tasty tasty-golden tasty-quickcheck trifecta
        ];
        description = "Diffing of (expression) trees";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "tree-fun" = callPackage
@@ -260872,7 +260872,7 @@ self: {
        sha256 = "07vgsps4kjld75ndnjjaigsk5vvg11vjp740pznhsw79k3qjbs9a";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Library for functions pertaining to tree exploration and manipulation";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tree-monad" = callPackage
@@ -260883,7 +260883,7 @@ self: {
        sha256 = "0ny57rygkgwn8i733gz2zb12i5niq5q7lrqvzfwsnjd0b40yighf";
        libraryHaskellDepends = [ base ];
        description = "Non-Determinism Monad for Tree Search";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-render-text" = callPackage
@@ -260894,8 +260894,8 @@ self: {
        sha256 = "04mmmj443aa8lkdj33dsk7zf985mnzfikzg10715vn5khrll0pgq";
        libraryHaskellDepends = [ base boxes containers mtl ];
        description = "Configurable text rendering of trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -260913,7 +260913,7 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog ];
        description = "Unstable bindings for the tree-sitter parsing library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-go" = callPackage
@@ -260925,7 +260925,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Go";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-haskell" = callPackage
@@ -260938,7 +260938,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-java" = callPackage
@@ -260950,7 +260950,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Java";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-json" = callPackage
@@ -260962,7 +260962,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for JSON";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-php" = callPackage
@@ -260974,7 +260974,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for PHP";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-python" = callPackage
@@ -260986,7 +260986,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Python";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-ql" = callPackage
@@ -260998,7 +260998,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for QL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-ruby" = callPackage
@@ -261010,7 +261010,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Ruby";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-rust" = callPackage
@@ -261022,7 +261022,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Rust";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-tsx" = callPackage
@@ -261034,7 +261034,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for TSX";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-sitter-typescript" = callPackage
@@ -261046,7 +261046,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for TypeScript";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tree-traversals" = callPackage
@@ -261058,8 +261058,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest mtl ];
        description = "Functions and newtype wrappers for traversing Trees";
-       license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.cc0;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261073,7 +261073,7 @@ self: {
        editedCabalFile = "0f4sls511c4axp92r07yk0b4h9wvlbk5345643q4gvy1adxwdyw5";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Render trees as foldable HTML and Unicode art";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "treefold" = callPackage
@@ -261088,7 +261088,7 @@ self: {
        testHaskellDepends = [ base doctest hedgehog ];
        benchmarkHaskellDepends = [ base containers criterion random ];
        description = "Provides folds which try to combine elements in a balanced way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "treemap" = callPackage
@@ -261108,8 +261108,8 @@ self: {
          tasty-hunit text transformers
        ];
        description = "A tree of Data.Map.";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261125,8 +261125,8 @@ self: {
          base Cabal containers filepath ghc html parsec regex-posix
        ];
        description = "Generates HTML for Data.Tree as TreeMap";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261146,8 +261146,8 @@ self: {
        ];
        doHaddock = false;
        description = "Treemap related commands for producing foldable TreeMap HTML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261159,8 +261159,8 @@ self: {
        sha256 = "0an35kz6hq5m7wc16d08v1i05zr8fp4v2yrf6zay2lfas1ilh3i2";
        libraryHaskellDepends = [ base haste-compiler sneathlane-haste ];
        description = "Structure Editing Combinators";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "treeseq" = callPackage
@@ -261171,7 +261171,7 @@ self: {
        sha256 = "105gj9s8gp4xc4i7ank8m6pjc80kywl7vn53qdxfrndaljv4kark";
        libraryHaskellDepends = [ base containers ];
        description = "Library for a multi-way tree (rose tree), using Seq (finger tree) for forests";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "treeviz" = callPackage
@@ -261184,7 +261184,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
        description = "Visualization of computation decomposition trees";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trek" = callPackage
@@ -261195,7 +261195,7 @@ self: {
        sha256 = "02rvyq11591d83rxhmb3c9bi7ahsh7lpwf2a7am2fd3625l5rq55";
        libraryHaskellDepends = [ base logict mtl ];
        testHaskellDepends = [ base logict mtl ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trek-app" = callPackage
@@ -261228,8 +261228,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL Database Migrator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261253,8 +261253,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL Database Migrator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261266,7 +261266,7 @@ self: {
        sha256 = "038qn30g82c2wzalhbgb6cglclld8kfmi6m1q76mr9yl9s2h6mf1";
        libraryHaskellDepends = [ base lens logict mtl trek ];
        testHaskellDepends = [ base lens logict mtl trek ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tremulous-query" = callPackage
@@ -261281,8 +261281,8 @@ self: {
          attoparsec base bytestring containers deepseq mtl network
        ];
        description = "Library for polling Tremulous servers";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261293,8 +261293,8 @@ self: {
        version = "0.2.2";
        sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3";
        description = "Deprecated";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261311,7 +261311,7 @@ self: {
          base dlist doctest hedgehog hspec hspec-hedgehog splitmix
        ];
        description = "Trial Data Structure";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "trial-optparse-applicative" = callPackage
@@ -261322,7 +261322,7 @@ self: {
        sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn";
        libraryHaskellDepends = [ base optparse-applicative trial ];
        description = "Trial helper functions for optparse-applicative";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "trial-tomland" = callPackage
@@ -261333,7 +261333,7 @@ self: {
        sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23";
        libraryHaskellDepends = [ base text tomland trial ];
        description = "Trial helper functions for tomland";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "triangulation" = callPackage
@@ -261348,8 +261348,8 @@ self: {
          array base collada-types haskell98 tuple vector vector-algorithms
        ];
        description = "triangulation of polygons";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261369,7 +261369,7 @@ self: {
          base containers criterion deepseq mwc-random vector
        ];
        description = "Simple Map-based Trie";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tries" = callPackage
@@ -261398,8 +261398,8 @@ self: {
          unordered-containers
        ];
        description = "Various trie implementations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261427,7 +261427,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest parsers QuickCheck ];
        description = "A modern parser combinator library with convenient diagnostics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trigger" = callPackage
@@ -261448,8 +261448,8 @@ self: {
        executableHaskellDepends = [ base protolude ];
        testHaskellDepends = [ base hspec protolude ];
        description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261465,8 +261465,8 @@ self: {
        executableHaskellDepends = [ base directory optparse-applicative ];
        testHaskellDepends = [ base hspec ];
        description = "A command-line tool for trimming whitespace";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261481,7 +261481,7 @@ self: {
        executableHaskellDepends = [ base bio bytestring simpleargs ];
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261497,8 +261497,8 @@ self: {
          base bytestring cereal filepath leveldb-haskell
        ];
        description = "A very simple triple store";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261518,7 +261518,7 @@ self: {
          tasty-quickcheck
        ];
        description = "TripleSec is a simple, triple-paranoid, symmetric encryption library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "trivia" = callPackage
@@ -261529,8 +261529,8 @@ self: {
        sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
        libraryHaskellDepends = [ base comonad distributive ];
        description = "The trivial monad and comonad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261542,8 +261542,8 @@ self: {
        sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5";
        libraryHaskellDepends = [ base ];
        description = "Constraints that any type, resp. no type fulfills";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261555,8 +261555,8 @@ self: {
        sha256 = "1in9jjfzbqws4bk83082yra2gcb5b095948qyji63ckbz3igp0k2";
        libraryHaskellDepends = [ base semiring-simple ];
        description = "A library for tropical mathematics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261581,8 +261581,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "A Tropical Geometry package for Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261597,8 +261597,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base containers template-haskell time ];
        description = "Template Haskell hack to violate module abstractions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261612,8 +261612,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio file compressor-limiter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261636,8 +261636,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hastache tasty tasty-hunit ];
        description = "Haskell template code generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261649,7 +261649,7 @@ self: {
        sha256 = "0p8z1n7y6zfx7ff349fb8d8ld08hj70yz2s9sb3wf8riv0rywzp4";
        libraryHaskellDepends = [ base ];
        description = "Typeclass for truthfulness of values";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "tsession" = callPackage
@@ -261662,8 +261662,8 @@ self: {
        editedCabalFile = "0msyf0rkd6aj8y632ippnrz554r6r5l7j45dnlnqlf1kls29kn5g";
        libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261677,8 +261677,8 @@ self: {
          base happstack-server transformers tsession
        ];
        description = "A Transaction Framework for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261691,7 +261691,7 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ async base stm ];
        description = "Hides duplicating channels when broadcasting";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tskiplist" = callPackage
@@ -261723,7 +261723,7 @@ self: {
        ];
        description = "-";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tslogger" = callPackage
@@ -261737,7 +261737,7 @@ self: {
          async base bytestring containers random text
        ];
        description = "Thread-safe logging, with additional interleaving fuzz-testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tsne" = callPackage
@@ -261769,8 +261769,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gloss stm vector ];
        description = "Real time TSP tour visualization";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261788,8 +261788,8 @@ self: {
          base Decimal parsec pretty process split time
        ];
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261801,7 +261801,7 @@ self: {
        sha256 = "1vr1l4pm02pwr8238qd9j0drkildns8m79qyq0lbzll30gc12vhx";
        libraryHaskellDepends = [ base ];
        description = "BK-tree implementation";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "tsuntsun" = callPackage
@@ -261821,8 +261821,8 @@ self: {
          typed-process
        ];
        description = "Interacts with tesseract to ease reading of RAW Japanese manga";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261837,7 +261837,7 @@ self: {
        libraryHaskellDepends = [ base HUnit split ];
        executableHaskellDepends = [ base ];
        description = "Convert tsv to csv";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tsvsql" = callPackage
@@ -261855,8 +261855,8 @@ self: {
          string-qq text unordered-containers
        ];
        description = "Template tsv into SQL";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261885,8 +261885,8 @@ self: {
          text time transformers
        ];
        description = "An API binding Web.Spock to Database.Beam";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261909,8 +261909,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "This is task management tool for yourself, that inspired by scrum";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -261927,7 +261927,7 @@ self: {
          base bytestring tasty tasty-hunit template-haskell text
        ];
        description = "Textual Type Classes";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ttl-hashtables" = callPackage
@@ -261949,7 +261949,7 @@ self: {
          hspec mtl transformers
        ];
        description = "Extends hashtables so that entries added can be expired after a TTL";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ttn" = callPackage
@@ -261967,8 +261967,8 @@ self: {
          aeson base hspec hspec-expectations raw-strings-qq
        ];
        description = "Things Tracker Network JSON Types";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "ttn-client" = callPackage
@@ -261988,8 +261988,8 @@ self: {
        ];
        executableHaskellDepends = [ base text time ttn ];
        description = "TheThingsNetwork client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262017,7 +262017,7 @@ self: {
          unordered-containers vector
        ];
        description = "Contention-free STM hash map";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "tttool" = callPackage
@@ -262042,8 +262042,8 @@ self: {
          random split spool template-haskell text time vector yaml zlib
        ];
        description = "Working with files for the Tiptoi® pen";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262060,8 +262060,8 @@ self: {
          transformers
        ];
        description = "Write stream processing computations with side effects in a series of tubes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262073,8 +262073,8 @@ self: {
        sha256 = "0q6g2wcjddb9r1l9fxpn2qcssw5gyfwsam15rc3q6xjqbwz7fm41";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Interface to TUN/TAP drivers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262088,8 +262088,8 @@ self: {
        editedCabalFile = "15jav5fj1ggjczn2mh4yv5rmsfydwc17vzlah3j1z5mkyq1691i8";
        libraryHaskellDepends = [ base ioctl ];
        description = "A simple tun/tap library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262104,8 +262104,8 @@ self: {
        libraryHaskellDepends = [ base cpphs ];
        executableHaskellDepends = [ base haskell-src-exts parsec2 ];
        description = "Homogeneous tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262117,7 +262117,7 @@ self: {
        sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg";
        libraryHaskellDepends = [ base OneTuple ];
        description = "Various functions on tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tuple-gen" = callPackage
@@ -262128,8 +262128,8 @@ self: {
        sha256 = "0bgwsxq8wrh76hhbwadv0rag4c7dx3644zrh2aflnsych0rncvd7";
        libraryHaskellDepends = [ base combinat ];
        description = "Enum instances for tuples where the digits increase with the same speed";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262141,7 +262141,7 @@ self: {
        sha256 = "034yzdwksydl9dxprv786lznwdfafa1nnzcsywjd40zv6las3gdm";
        libraryHaskellDepends = [ base ];
        description = "Generic operations on tuples";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "tuple-hlist" = callPackage
@@ -262153,7 +262153,7 @@ self: {
        libraryHaskellDepends = [ base HList OneTuple ];
        description = "Functions to convert between tuples and HLists";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "tuple-lenses" = callPackage
@@ -262164,8 +262164,8 @@ self: {
        sha256 = "1qq1sla89410wr9pnkmj100izkraad1gr163815p3dvh7qi04c7w";
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Stock FieldN combos and generators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262179,8 +262179,8 @@ self: {
        editedCabalFile = "1npahk37am7x6n4lfdk6y1i1690drg39j63gzb2jx5ivzxhlcp43";
        libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262192,8 +262192,8 @@ self: {
        sha256 = "09993bfndv2iljq6sspihysv22d2f8g0lar03p7ghiyp81m6j0ax";
        libraryHaskellDepends = [ base type-combinators ];
        description = "various operations on n-ary tuples via GHC.Generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262206,7 +262206,7 @@ self: {
        libraryHaskellDepends = [ base generics-sop ];
        testHaskellDepends = [ base generics-sop ];
        description = "functions on n-ary tuples using generics-sop";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "tuple-th" = callPackage
@@ -262217,7 +262217,7 @@ self: {
        sha256 = "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Generate (non-recursive) utility functions for tuples of statically known size";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tupleinstances" = callPackage
@@ -262228,8 +262228,8 @@ self: {
        sha256 = "0kcmcg1fxsslpzpg766r9hr8aysg0s5fyang2xc0aa77zi71qyi3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Functor, Applicative and Monad for n-ary tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262246,7 +262246,7 @@ self: {
          base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck
        ];
        description = "Small monomorphic tuples";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tuples-homogenous-h98" = callPackage
@@ -262257,7 +262257,7 @@ self: {
        sha256 = "0fhz246wh6x0s0sjkmd3qcylsx2gfrmgmvgb7js2zjg91y7zqnh2";
        libraryHaskellDepends = [ base ];
        description = "Wrappers for n-ary tuples with Traversable and Applicative/Monad instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "turing" = callPackage
@@ -262280,8 +262280,8 @@ self: {
        sha256 = "1anh6x4vdkys5b89ni18gsh3fl68v667qg5aw1867s4hwlvsii35";
        libraryHaskellDepends = [ base ];
        description = "A simple simulator for Turing machines";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262295,8 +262295,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262313,8 +262313,8 @@ self: {
          base containers hspec hspecVariant QuickCheck QuickCheckVariant
        ];
        description = "An implementation of Turing Machine and Automaton";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262330,7 +262330,7 @@ self: {
        executableHaskellDepends = [ base containers vector ];
        testHaskellDepends = [ base HUnit ];
        description = "Haskell port of Deniz Yuret's Turkish deasciifier";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "turn-loop" = callPackage
@@ -262341,7 +262341,7 @@ self: {
        sha256 = "180yplkjf0c4n17a5ad2pakjwnh7830rldzmaqjj7gwcl3pg0lc6";
        libraryHaskellDepends = [ base containers stm ];
        description = "Manage multiple turned-based sessions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "turni" = callPackage
@@ -262354,7 +262354,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers MonadRandom random ];
        description = "shifts scheduling tool";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "turtle" = callPackage
@@ -262377,7 +262377,7 @@ self: {
        testHaskellDepends = [ base doctest system-filepath temporary ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "turtle_1_5_21" = callPackage
@@ -262400,8 +262400,8 @@ self: {
        testHaskellDepends = [ base doctest system-filepath temporary ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -262417,8 +262417,8 @@ self: {
        executableHaskellDepends = [ base turtle ];
        testHaskellDepends = [ base HUnit parsec ];
        description = "Collection of command line options and parsers for these options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262432,7 +262432,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring ];
        description = "Trailing Whitespace";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tweak" = callPackage
@@ -262443,8 +262443,8 @@ self: {
        sha256 = "1l5y94gac9s55wgn6w610pqb63c8l20vmlpsnmgbzw1f9vbnzgiw";
        libraryHaskellDepends = [ base containers lens stm transformers ];
        description = "A library for incremental computing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262461,8 +262461,8 @@ self: {
          base containers jukebox pretty split twee-lib
        ];
        description = "An equational theorem prover";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262478,7 +262478,7 @@ self: {
          base containers dlist ghc-prim pretty primitive transformers vector
        ];
        description = "An equational theorem prover";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tweet-hs" = callPackage
@@ -262505,8 +262505,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        description = "Command-line tool for twitter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262518,7 +262518,7 @@ self: {
        sha256 = "1kmf907i6g6lfhw8g403b6701srrd298n4r53dvcqzy72c5qaixl";
        libraryHaskellDepends = [ base gloss parsec time ];
        description = "Lab Assignments Environment at Univeriteit Twente";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "twentefp-eventloop-graphics" = callPackage
@@ -262535,8 +262535,8 @@ self: {
          base network text twentefp-number twentefp-websockets
        ];
        description = "Used as Lab Assignments Environment at the University of Twente";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262548,8 +262548,8 @@ self: {
        sha256 = "03aj2awy7prznv8m7048idvn0vs3rfrbcamr4zakjdpxyjknz054";
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262561,8 +262561,8 @@ self: {
        sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir";
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262574,7 +262574,7 @@ self: {
        sha256 = "1kh0a6h4syx98ygwidw6cc24ci91v1blshpfcczx96z850x1h6xf";
        libraryHaskellDepends = [ base parsec ];
        description = "Lab Assignments Environment at Univeriteit Twente";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "twentefp-rosetree" = callPackage
@@ -262588,8 +262588,8 @@ self: {
          base twentefp-eventloop-graphics twentefp-number
        ];
        description = "RoseTree type and show functions for lab assignment of University of Twente";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262601,8 +262601,8 @@ self: {
        sha256 = "0mmj96xbqjzm4cylk39pib9jfwh6m350q1cwf6ij8pl0swab3b0g";
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262621,8 +262621,8 @@ self: {
          network random SHA text
        ];
        description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262652,8 +262652,8 @@ self: {
          base Cabal cabal-test-quickcheck HUnit-Plus QuickCheck split vector
        ];
        description = "Rubik's cube solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262679,8 +262679,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "They Work For You API Client Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262711,8 +262711,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "CLI twitter client";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262734,7 +262734,7 @@ self: {
        ];
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262747,7 +262747,7 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262774,8 +262774,8 @@ self: {
        ];
        doCheck = false;
        description = "Twilio REST API library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262794,8 +262794,8 @@ self: {
          QuickCheck text time
        ];
        description = "Twilio API interaction";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262813,7 +262813,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "TwiML library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "twine" = callPackage
@@ -262828,8 +262828,8 @@ self: {
          base bytestring containers convertible filepath mtl parsec
        ];
        description = "very simple template language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262851,8 +262851,8 @@ self: {
          proto-lens-jsonpb proto-lens-runtime servant text wai
        ];
        description = "Haskell twirp foundations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262869,7 +262869,7 @@ self: {
        ];
        description = "Simulator of twisty puzzles à la Rubik's Cube";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "twitch" = callPackage
@@ -262889,7 +262889,7 @@ self: {
          optparse-applicative time transformers
        ];
        description = "A high level file watcher DSL";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "twitter" = callPackage
@@ -262906,8 +262906,8 @@ self: {
          base curl directory filepath json mtl old-locale readline time xml
        ];
        description = "A Haskell-based CLI Twitter client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262938,8 +262938,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Twitter API package with conduit interface and Streaming API support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262958,8 +262958,8 @@ self: {
          transformers
        ];
        description = "Twitter API package with enumerator interface and Streaming API support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -262981,8 +262981,8 @@ self: {
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "Client for fetching Twitter timeline via Oauth";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263004,7 +263004,7 @@ self: {
          unordered-containers
        ];
        description = "Twitter JSON parser and types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -263019,7 +263019,7 @@ self: {
          base lens template-haskell text time twitter-types
        ];
        description = "Twitter JSON types (lens powered)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tx" = callPackage
@@ -263034,8 +263034,8 @@ self: {
          base bytestring cereal safecopy stm transformers
        ];
        description = "Persistent transactions on top of STM";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263054,8 +263054,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263073,7 +263073,7 @@ self: {
          base binary bytestring containers directory parsec regex-posix
        ];
        description = "The SQL link in your *NIX chain";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "txt2rtf" = callPackage
@@ -263097,8 +263097,8 @@ self: {
        sha256 = "08qpdyb1dbkif4zwrap6478fsf7lha6hk18wm0r4803avrr5w2bb";
        libraryHaskellDepends = [ base ];
        description = "Deprecated in favor of eros";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263112,7 +263112,7 @@ self: {
        editedCabalFile = "0sxqrkqchr3zcks68wljp722f5sndxz1fw5a2qi599i984v91y0l";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Typed type representations and equality proofs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "tyfam-witnesses" = callPackage
@@ -263123,8 +263123,8 @@ self: {
        sha256 = "0gsx2syy58gq7n2yi4whslbnwg4dh34x8jy56h11k8z6n01inppc";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Provide proof witnesses for closed type family evaluation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263143,8 +263143,8 @@ self: {
          base bytestring directory filepath ghc process
        ];
        description = "Analyzes Haskell source files for easy reference";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263157,7 +263157,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Various type-aligned sequence data structures";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-assertions" = callPackage
@@ -263169,8 +263169,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec test-fixture ];
        description = "Runtime type assertions for testing";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263182,7 +263182,7 @@ self: {
        sha256 = "11kbnfbvclkdwirnnpdi4f20pibdar4l47anvnkaxxl330zi7yfh";
        libraryHaskellDepends = [ base ];
        description = "Type-level booleans via type-families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-cache" = callPackage
@@ -263197,8 +263197,8 @@ self: {
          base containers lens lens-utils template-haskell
        ];
        description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263215,8 +263215,8 @@ self: {
          type-spine
        ];
        description = "Type-level serialization of type constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263230,8 +263230,8 @@ self: {
        editedCabalFile = "1m975zq2mxlzk5h4nzrkaxjx5w79p3ws3yli3m6cn3245pjygv5w";
        libraryHaskellDepends = [ base ];
        description = "A collection of data types for type-level programming";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263247,8 +263247,8 @@ self: {
          base haskell-src-meta template-haskell type-combinators
        ];
        description = "Quasiquoters for the 'type-combinators' package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263260,8 +263260,8 @@ self: {
        sha256 = "00cwlfcka2d1wcp7159r3sk3gz852dmc71jvjfr8bn1rrr781n0q";
        libraryHaskellDepends = [ base singletons type-combinators ];
        description = "Interop between /type-combinators/ and /singletons/";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263273,8 +263273,8 @@ self: {
        sha256 = "0rmqy3wcypyq09gnfz0xvkr2ly9gnpsjnil2n981ajfxsk2shi58";
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263289,8 +263289,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
        description = "Type equality evidence you can carry around";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263304,7 +263304,7 @@ self: {
        editedCabalFile = "1a3irpv5kyg3rywhmcp5fwg5irrdbdr0hrlw7asdk113nakrba7j";
        libraryHaskellDepends = [ base ];
        description = "Data.Type.Equality compat package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-equality-check" = callPackage
@@ -263315,7 +263315,7 @@ self: {
        sha256 = "1r0g2xpkyj3765z07s559xy9vx4ipwnlk13sxrbcjds7wghfb8ci";
        libraryHaskellDepends = [ base type-level ];
        description = "Type equality check";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-errors" = callPackage
@@ -263336,7 +263336,7 @@ self: {
          th-abstraction
        ];
        description = "Tools for writing better type errors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-errors-pretty" = callPackage
@@ -263350,7 +263350,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Combinators for writing pretty type errors easily";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "type-fun" = callPackage
@@ -263362,8 +263362,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Collection of widely reimplemented type families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263375,7 +263375,7 @@ self: {
        sha256 = "1ib1d5z9wxc63hq2gyxplpzs49k5rfafgz1r59bqsqh63yk4lly8";
        libraryHaskellDepends = [ base kinds ];
        description = "Emulation of type-level functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-hint" = callPackage
@@ -263386,7 +263386,7 @@ self: {
        sha256 = "1fcrma7m6y7i1y42rzhv7qch8xkk93lkh1767saw4hsb9fzwsq8i";
        libraryHaskellDepends = [ base ];
        description = "Guide type inference with proxy values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-indexed-queues" = callPackage
@@ -263408,8 +263408,8 @@ self: {
          base containers criterion pqueue random
        ];
        description = "Queues with verified and unverified versions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263421,8 +263421,8 @@ self: {
        sha256 = "1lakw4mvkii32a570zain510n9x7b2ka2r3qj5rpil1j4bpc662w";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type Level 2s- and 16s- Complement Integers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263435,8 +263435,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263453,7 +263453,7 @@ self: {
          vector-builder
        ];
        description = "Typeclasses for injective relations and isomorphisms between types";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "type-level" = callPackage
@@ -263464,7 +263464,7 @@ self: {
        sha256 = "03w9dkb2d8351y2ic2wxh1sr2dnwh9ph9qa5mak0iciqraxvqxlr";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Type-level programming library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-bst" = callPackage
@@ -263475,8 +263475,8 @@ self: {
        sha256 = "0c51p6dy84ddikj6jch5hljn1i37q38wbak3chbc3ds5r674y5hk";
        libraryHaskellDepends = [ base ];
        description = "type-level binary search trees in haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263489,7 +263489,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Provides integers lifted to the type level";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-kv-list" = callPackage
@@ -263501,7 +263501,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        description = "A module for hash map like object with type level keys";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "type-level-natural-number" = callPackage
@@ -263512,7 +263512,7 @@ self: {
        sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk";
        libraryHaskellDepends = [ base ];
        description = "Simple type level natural numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-natural-number-induction" = callPackage
@@ -263525,8 +263525,8 @@ self: {
          base transformers type-level-natural-number
        ];
        description = "High-level combinators for performing inductive operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263538,8 +263538,8 @@ self: {
        sha256 = "0vql5q5zhbhmwv0wqqb0xi4ayqdsz149rymhs730c583pq0h9r3w";
        libraryHaskellDepends = [ base type-level-natural-number ];
        description = "Basic operations on type-level natural numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263552,7 +263552,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Type level numbers implemented using type families";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-sets" = callPackage
@@ -263565,7 +263565,7 @@ self: {
        editedCabalFile = "0cc0ws2plharq0gvindgmkp1fs82zd43zijkh7wf0ilfnr2l17z2";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-level-tf" = callPackage
@@ -263576,7 +263576,7 @@ self: {
        sha256 = "07q69219yvf7rpfwilp70hvx2fzsxklvld7j3gayj17l9wp23g2m";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Type-level programming library (type families)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-list" = callPackage
@@ -263587,8 +263587,8 @@ self: {
        sha256 = "03395ivxda6mihjzn89rzvf0nkk0g16n207wvz4f61ky8r5mzfpz";
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263605,7 +263605,7 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "Type-indexed maps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "type-natural" = callPackage
@@ -263625,7 +263625,7 @@ self: {
          template-haskell
        ];
        description = "Type-level natural and proofs of their properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-natural_1_0_0_0" = callPackage
@@ -263652,8 +263652,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Type-level natural and proofs of their properties";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "type-of-html" = callPackage
@@ -263674,7 +263674,7 @@ self: {
          text weigh
        ];
        description = "High performance type driven html generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-of-html-static" = callPackage
@@ -263686,8 +263686,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-of-html ];
        testHaskellDepends = [ base type-of-html ];
        description = "Optimize static parts of type-of-html";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263699,7 +263699,7 @@ self: {
        sha256 = "1cm3vfarjpwm885i5w5mjyg1ibg9bm5q34hbacpl3c9q9l1vwl4j";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Various type-level operators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-ord" = callPackage
@@ -263712,8 +263712,8 @@ self: {
          base template-haskell type-digits type-spine
        ];
        description = "Type-level comparison operator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263729,8 +263729,8 @@ self: {
          base template-haskell type-cereal type-ord type-spine
        ];
        description = "Generic type-level comparison of types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263742,8 +263742,8 @@ self: {
        sha256 = "1ygg511j0av1g94mclrsf3p0qb2kc89jcz9nfr5fm073a2jlzlih";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263756,8 +263756,8 @@ self: {
        libraryHaskellDepends = [ base cmptype ];
        testHaskellDepends = [ base cmptype ];
        description = "Type-level sets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263773,8 +263773,8 @@ self: {
          base containers syb template-haskell transformers type-equality
        ];
        description = "Sets and functions-as-relations in the type system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263787,7 +263787,7 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        testHaskellDepends = [ base ];
        description = "Type Level Specification by Example";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "type-spine" = callPackage
@@ -263798,8 +263798,8 @@ self: {
        sha256 = "0vy9ixmz1xm3dd0376s0h66q7qi64jqc5kqsqjpcg7akxidl03hi";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263826,8 +263826,8 @@ self: {
          unordered-containers vector
        ];
        description = "Type structure analysis";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263852,8 +263852,8 @@ self: {
          th-instances tuple uniplate
        ];
        description = "Substitute types for other types with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263871,8 +263871,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Tree representations of datatypes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263892,7 +263892,7 @@ self: {
          vector-space
        ];
        description = "Type-level and typed unary natural numbers, inequality proofs, vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typeable-th" = callPackage
@@ -263904,8 +263904,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base ];
        description = "Automatic deriving of TypeableN instances with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -263933,7 +263933,7 @@ self: {
          unordered-containers utf8-string wai wai-extra warp yaml
        ];
        description = "Admin console framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typed-digits" = callPackage
@@ -263950,7 +263950,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Digits, indexed by their base at the type level";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "typed-duration" = callPackage
@@ -263965,7 +263965,7 @@ self: {
          base lifted-base monad-control transformers-base
        ];
        description = "Thread delay and timeout functions with typed arguments";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typed-encoding" = callPackage
@@ -263985,8 +263985,8 @@ self: {
          QuickCheck quickcheck-instances symbols text
        ];
        description = "Type safe string transformations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264006,8 +264006,8 @@ self: {
          quickcheck-instances typed-encoding
        ];
        description = "Bridge between encoding and typed-encoding packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264027,7 +264027,7 @@ self: {
          transformers unliftio-core
        ];
        description = "Run external processes, with strong typing of streams";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -264046,8 +264046,8 @@ self: {
        ];
        executableHaskellDepends = [ base diagrams-lib text ];
        description = "Typed and composable spreadsheets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264069,8 +264069,8 @@ self: {
          make-monofoldable-foldable mono-traversable vector
        ];
        description = "A stream based replacement for lists";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264087,7 +264087,7 @@ self: {
          text uuid validity validity-uuid
        ];
        description = "Phantom-Typed version of UUID";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "typed-uuid_0_1_0_0" = callPackage
@@ -264104,8 +264104,8 @@ self: {
          text uuid validity validity-uuid yamlparse-applicative
        ];
        description = "Phantom-Typed version of UUID";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "typed-wire" = callPackage
@@ -264129,8 +264129,8 @@ self: {
          aeson base bytestring directory filepath HTF process temporary text
        ];
        description = "Language-independent type-safe communication";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264146,7 +264146,7 @@ self: {
          aeson base base64-bytestring bytestring text time
        ];
        description = "Haskell utility library required for code generated by typed-wire compiler";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typedflow" = callPackage
@@ -264160,8 +264160,8 @@ self: {
          base ghc-typelits-knownnat mtl pretty-compact
        ];
        description = "Typed frontend to TensorFlow and higher-order deep learning";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264178,8 +264178,8 @@ self: {
          transformers
        ];
        description = "Parser for SQL augmented with types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264191,8 +264191,8 @@ self: {
        sha256 = "11s10arrbri1f71jfpynhmwh53cgkrfxsrqch1f02j0aii7n0lpv";
        libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        description = "Create a unique hash value for a type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264209,8 +264209,8 @@ self: {
          primitive transformers
        ];
        description = "Useful type level operations (type families and related operators)";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264229,8 +264229,8 @@ self: {
        ];
        testHaskellDepends = [ base ghc-prim vinyl ];
        description = "Solve type equalities using custom type-level rewrite rules";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264248,8 +264248,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264261,7 +264261,7 @@ self: {
        sha256 = "1a2ahf8imbk8zff2i7cfag2irax8qdd4r6vb00hil34i67p980ij";
        libraryHaskellDepends = [ base symbols text ];
        description = "Type-safe printf from parsing GHC TypeLits Symbol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typelits-witnesses" = callPackage
@@ -264272,7 +264272,7 @@ self: {
        sha256 = "1khy5nacmsl7h4vg7driv4yb9m3zvkhbf8divyhd249i6bdmql70";
        libraryHaskellDepends = [ base dependent-sum ];
        description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "typenums" = callPackage
@@ -264284,8 +264284,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type level numbers using existing Nat functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264299,7 +264299,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base process ];
        description = "Small script for inferring types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typeparams" = callPackage
@@ -264315,8 +264315,8 @@ self: {
          template-haskell vector
        ];
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264341,7 +264341,7 @@ self: {
        ];
        doHaddock = false;
        description = "Efficient implementation of a dependent map with types as keys";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "types-compat" = callPackage
@@ -264354,8 +264354,8 @@ self: {
        editedCabalFile = "0h8hlx3zb7s8dfh275ich99j4aa4gdj2f8yvzwpmzgylcvn1gfwg";
        libraryHaskellDepends = [ base ];
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264367,7 +264367,7 @@ self: {
        sha256 = "1kg4pvrnf7vwvrcb998l9w08dpdy9hg7x2d9h5s3lqpnvvxfgcfj";
        libraryHaskellDepends = [ base ];
        description = "Enforce endianness with types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typesafe-precure" = callPackage
@@ -264386,8 +264386,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264407,8 +264407,8 @@ self: {
          language-typescript parsec split syb utf8-string
        ];
        description = "A documentation generator for TypeScript Definition files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264446,8 +264446,8 @@ self: {
          template-haskell vector
        ];
        description = "Just let me draw nice text already";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264463,7 +264463,7 @@ self: {
          base containers parallel polynomials-bernstein vector
        ];
        description = "Drawings for printed text documents";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "typson-beam" = callPackage
@@ -264485,8 +264485,8 @@ self: {
          tasty-hedgehog tasty-hunit test-fixture typson-core
        ];
        description = "Typson Beam Integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264502,7 +264502,7 @@ self: {
          aeson base containers profunctors text unordered-containers vector
        ];
        description = "Type-safe PostgreSQL JSON Querying";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "typson-esqueleto" = callPackage
@@ -264526,8 +264526,8 @@ self: {
          text typson-core
        ];
        description = "Typson Esqueleto Integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264550,8 +264550,8 @@ self: {
          test-fixture text typson-core
        ];
        description = "Typson Selda Integration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264572,8 +264572,8 @@ self: {
          test-framework test-framework-hunit text vector
        ];
        description = "Type derived JSON parsing using Aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264601,7 +264601,7 @@ self: {
        ];
        preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
        description = "Efficient time zone handling";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "tzdata" = callPackage
@@ -264622,7 +264622,7 @@ self: {
          test-framework-th unix
        ];
        description = "Time zone database (as files and as a module)";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "u2f" = callPackage
@@ -264640,8 +264640,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring either-unwrap hspec text ];
        description = "Haskell Universal Two Factor helper toolbox library thing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264662,7 +264662,7 @@ self: {
        ];
        description = "A simplistic dependently-typed language with parametricity";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ua-parser" = callPackage
@@ -264687,7 +264687,7 @@ self: {
          filepath pcre-light text yaml
        ];
        description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uacpid" = callPackage
@@ -264707,7 +264707,7 @@ self: {
          regex-compat time time-locale-compat unix
        ];
        description = "Userspace Advanced Configuration and Power Interface event daemon";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uber" = callPackage
@@ -264719,8 +264719,8 @@ self: {
        libraryHaskellDepends = [ aeson base text webapi ];
        testHaskellDepends = [ base hspec text ];
        description = "Uber client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264732,8 +264732,8 @@ self: {
        sha256 = "12p948706scjiazlwv0x1afl3v8fhv4a3l8yqn1x4y9xnr4pfmc9";
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        description = "Generate overloaded lenses from plain data declaration";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264764,7 +264764,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "The Ucam-Webauth protocol, used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264787,7 +264787,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Types for the Ucam-Webauth protocol, as used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264806,8 +264806,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "Unicode Character Database — Predicates on characters specified by Unicode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264820,8 +264820,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) icu;};
 
@@ -264843,7 +264843,7 @@ self: {
          utf8-string
        ];
        description = "Small DBus implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "udbus-model" = callPackage
@@ -264856,7 +264856,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring udbus xml ];
        description = "Model API for udbus introspection and definitions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "udcode" = callPackage
@@ -264867,7 +264867,7 @@ self: {
        sha256 = "1namnm91divk1x8ki7wfbd79f4nrym58r4ki9yamj2giv4nxda36";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Does a set of code words form a uniquely decodable code?";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "udev" = callPackage
@@ -264881,8 +264881,8 @@ self: {
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
        libraryPkgconfigDepends = [ systemd ];
        description = "libudev bindings";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) systemd;};
 
   "udp-conduit" = callPackage
@@ -264897,8 +264897,8 @@ self: {
          base chunked-data conduit-combinators mono-traversable network
        ];
        description = "Simple fire-and-forget conduit UDP wrappers";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264912,8 +264912,8 @@ self: {
          base bytestring network resourcet streaming
        ];
        description = "Streaming to and from UDP socket";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264925,7 +264925,7 @@ self: {
        sha256 = "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy";
        libraryHaskellDepends = [ base containers ];
        description = "A simple (but internally ugly) memoization function";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "uhc-light" = callPackage
@@ -264952,8 +264952,8 @@ self: {
          transformers uhc-util utf8-string uulib vector
        ];
        description = "Part of UHC packaged as cabal/hackage installable library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264973,8 +264973,8 @@ self: {
          process time time-compat transformers uulib vector
        ];
        description = "UHC utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -264988,8 +264988,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring split ];
        description = "hex dumper for UTF-8 text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265014,7 +265014,7 @@ self: {
          optparse-applicative
        ];
        description = "Minimal HTTP client library optimized for benchmarking";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "ui-command" = callPackage
@@ -265027,8 +265027,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265044,7 +265044,7 @@ self: {
          aeson base bytestring cereal dataenc text uuid
        ];
        description = "Simple unique identifier datatype, serializable and encodable as base32";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ukrainian-phonetics-basic" = callPackage
@@ -265055,7 +265055,7 @@ self: {
        sha256 = "1sgch686yq6yqm6yz63v4hcprslfzn82an1ndxbgy0m7d7ipdavx";
        libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ukrainian-phonetics-basic-array" = callPackage
@@ -265066,7 +265066,7 @@ self: {
        sha256 = "1v5nzcnyrkhz5r2igxdp07ac506p0nnmjiskxxil5rzhab9zf8kn";
        libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ulid" = callPackage
@@ -265090,7 +265090,7 @@ self: {
          base deepseq format-numbers text time
        ];
        description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "una" = callPackage
@@ -265107,7 +265107,7 @@ self: {
          base bytestring cmdargs directory filepath io-storage process
        ];
        description = "Universal un-archiver utility";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unagi-bloomfilter" = callPackage
@@ -265124,8 +265124,8 @@ self: {
          atomic-primops base bytestring hashabler primitive
        ];
        description = "A fast, cache-efficient, concurrent bloom filter";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265143,7 +265143,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ async base criterion ];
        description = "Fast concurrent queues with a Chan-like API, and more";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unagi-streams" = callPackage
@@ -265154,7 +265154,7 @@ self: {
        sha256 = "11vr8zxyksqb2np6f77d9ai6xrb7fpfjbgv191h3pppcanysm4w3";
        libraryHaskellDepends = [ base io-streams unagi-chan ];
        description = "Unagi Chan IO-Streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unamb" = callPackage
@@ -265169,7 +265169,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Unambiguous choice";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unamb-custom" = callPackage
@@ -265180,8 +265180,8 @@ self: {
        sha256 = "0r694wi9xg8brgcwl2kyv5amp6v539l121s9bpmd5lhjdnrvqjwk";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functional concurrency with unamb using a custom scheduler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265205,7 +265205,7 @@ self: {
        ];
        doHaddock = false;
        description = "Opinionated Haskell Interoperability";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbound" = callPackage
@@ -265224,8 +265224,8 @@ self: {
          template-haskell transformers
        ];
        description = "Generic support for programming with names and binders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265248,7 +265248,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Support for programming with names and binders using GHC Generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbound-kind-generics" = callPackage
@@ -265263,7 +265263,7 @@ self: {
          base kind-generics kind-generics-th unbound-generics
        ];
        description = "Support for programming with names and binders using kind-generics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbounded-delays" = callPackage
@@ -265274,7 +265274,7 @@ self: {
        sha256 = "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar";
        libraryHaskellDepends = [ base ];
        description = "Unbounded thread delays and timeouts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbounded-delays-units" = callPackage
@@ -265285,8 +265285,8 @@ self: {
        sha256 = "02j4i2dms15vb87ar3m99hvpxrjdakljyql708zs716k1jdm7614";
        libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        description = "Thread delays and timeouts using proper time units";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265298,7 +265298,7 @@ self: {
        sha256 = "1xk9x1viprvswjp62xrg2mvm34b0qamflb1phpyfh9bspy8f1qqd";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "All the standard sum types but strict and unboxed as possible";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unboxed-containers" = callPackage
@@ -265311,8 +265311,8 @@ self: {
        editedCabalFile = "16j16v36jabr9lpmjm52zbfz82m0ckd4p0f3z8123aawvzcvayji";
        libraryHaskellDepends = [ base containers ];
        description = "Self-optimizing unboxed sets using view patterns and data families";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265325,7 +265325,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive ];
        testHaskellDepends = [ async base HUnit ];
        description = "Fast unboxed references for ST and IO monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unboxed-references" = callPackage
@@ -265339,8 +265339,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        executableHaskellDepends = [ base vector ];
        description = "A library for reference cells backed by unboxed-vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265363,7 +265363,7 @@ self: {
          base deepseq mono-traversable primitive vector
        ];
        description = "A newtype-friendly variant of unboxed vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unbreak" = callPackage
@@ -265383,8 +265383,8 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring cmdargs ];
        description = "Secure and resilient remote file storage utility";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265399,7 +265399,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Customize uncaught exception handling";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "uncertain" = callPackage
@@ -265415,7 +265415,7 @@ self: {
          transformers
        ];
        description = "Manipulating numbers with inherent experimental/measurement uncertainty";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unconstrained" = callPackage
@@ -265427,7 +265427,7 @@ self: {
        revision = "1";
        editedCabalFile = "13fj2jlh44774www49fwp7h7z6gr23scfbvg745rpywys49c0559";
        description = "Null constraint";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unescaping-print" = callPackage
@@ -265440,8 +265440,8 @@ self: {
        editedCabalFile = "113p28z74lvsc7c6v93ilvbyp2fn5h1qsymksn3mi2ndxwq3vz3f";
        libraryHaskellDepends = [ base ];
        description = "Tiny package providing unescaping versions of show and print";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265458,7 +265458,7 @@ self: {
        ];
        description = "IO without any non-error, synchronous exceptions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unexceptionalio-trans" = callPackage
@@ -265472,7 +265472,7 @@ self: {
        libraryHaskellDepends = [ base transformers unexceptionalio ];
        description = "A wrapper around UnexceptionalIO using monad transformers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unfix-binders" = callPackage
@@ -265483,8 +265483,8 @@ self: {
        sha256 = "0aw4ihkzwz220pgg84p47zp37i5dqn7cxqcqa2lfzi23y9sp5iss";
        libraryHaskellDepends = [ base ];
        description = "Unfixing and recursion schemes for data types with binders";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265502,7 +265502,7 @@ self: {
          base containers ghc-prim one-liner QuickCheck random transformers
        ];
        description = "Class of data structures that can be unfolded";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -265518,7 +265518,7 @@ self: {
          unit-constraint unordered-containers
        ];
        description = "An alternative to the Unfoldable typeclass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ungadtagger" = callPackage
@@ -265529,7 +265529,7 @@ self: {
        sha256 = "1hn30p9vpsvkph54grzwdrca5vh9grpa7d0w1zlvim1mnvqxmn4b";
        libraryHaskellDepends = [ base ];
        description = "Abstract GADTs from typelevel tags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uni-events" = callPackage
@@ -265541,7 +265541,7 @@ self: {
        libraryHaskellDepends = [ base containers uni-util ];
        description = "Event handling for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265558,7 +265558,7 @@ self: {
        ];
        description = "Graphs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265576,7 +265576,7 @@ self: {
        ];
        description = "Graphical User Interface for Haskell Programs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265593,7 +265593,7 @@ self: {
        ];
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265609,7 +265609,7 @@ self: {
        ];
        description = "Reactors for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265627,7 +265627,7 @@ self: {
        ];
        description = "Graphs binding";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265645,7 +265645,7 @@ self: {
        ];
        description = "Utilities for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265660,7 +265660,7 @@ self: {
        libraryHaskellDepends = [ base containers semigroups ];
        testHaskellDepends = [ base containers utility-ht ];
        description = "Construct and transform unicode characters";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unicode-names" = callPackage
@@ -265673,7 +265673,7 @@ self: {
          array base containers unicode-properties
        ];
        description = "Unicode 3.2.0 character names";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unicode-normalization" = callPackage
@@ -265685,8 +265685,8 @@ self: {
        libraryHaskellDepends = [ base bytestring compact-string ];
        librarySystemDepends = [ icu ];
        description = "Unicode normalization using the ICU library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) icu;};
 
@@ -265698,8 +265698,8 @@ self: {
        sha256 = "05zakihlk06wckzgm43f3g26fjdn4gb3d1ypw4vcwqmipq2dbfsw";
        libraryHaskellDepends = [ base ];
        description = "Unicode notation for some definitions in Prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265711,7 +265711,7 @@ self: {
        sha256 = "06zrr2z9irbsxwf7fbnhp2sg36ykb2amfys2y78nzn0mw63xb3q1";
        libraryHaskellDepends = [ array base containers ];
        description = "Unicode 3.2.0 character properties";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unicode-show" = callPackage
@@ -265723,8 +265723,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "print and show in unicode";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265736,8 +265736,8 @@ self: {
        sha256 = "0y1awqrf1x2in158linszma69zyz3zp14h3rmdx3vmbmif9fvbyv";
        libraryHaskellDepends = [ base containers ];
        description = "Unicode alternatives for common functions and operators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265760,7 +265760,7 @@ self: {
          base deepseq filepath gauge path path-io text
        ];
        description = "Unicode normalization";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unicode-tricks" = callPackage
@@ -265775,8 +265775,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Functions to work with unicode blocks more convenient";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265799,7 +265799,7 @@ self: {
        ];
        testHaskellDepends = [ base text ];
        description = "Make writing in unicode easy";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unidecode" = callPackage
@@ -265811,7 +265811,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Haskell binding of Unidecode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unification-fd" = callPackage
@@ -265822,7 +265822,7 @@ self: {
        sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
        libraryHaskellDepends = [ base containers logict mtl ];
        description = "Simple generic unification algorithms";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uniform-io" = callPackage
@@ -265841,8 +265841,8 @@ self: {
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ attoparsec base bytestring Cabal ];
        description = "Uniform IO over files, network, anything";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) openssl;};
 
@@ -265859,7 +265859,7 @@ self: {
          adjunctions base deepseq distributive prelude-extras
        ];
        description = "Uniform pairs with class instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "union" = callPackage
@@ -265877,8 +265877,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265892,7 +265892,7 @@ self: {
        editedCabalFile = "13cwjh03n82sgshbk4fdlvhc0pb3v979sdcdrpvnpjdqmvcprs92";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Efficient union and equivalence testing of sets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "union-find-array" = callPackage
@@ -265903,7 +265903,7 @@ self: {
        sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk";
        libraryHaskellDepends = [ array base mtl ];
        description = "union find data structure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "union-map" = callPackage
@@ -265914,8 +265914,8 @@ self: {
        sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l";
        libraryHaskellDepends = [ base containers extensible ];
        description = "Heterogeneous map by open unions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265927,7 +265927,7 @@ self: {
        sha256 = "07jl3an9y4gbpmsq2gcbp3xwyvrnvkjcxcpq1702cc320c8zq542";
        libraryHaskellDepends = [ base ];
        description = "Helpers which allow safe partial pattern matching in lambdas";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uniplate" = callPackage
@@ -265944,7 +265944,7 @@ self: {
          base containers ghc-prim hashable syb unordered-containers
        ];
        description = "Help writing simple, concise and fast generic operations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uniprot-kb" = callPackage
@@ -265962,8 +265962,8 @@ self: {
          attoparsec base hspec neat-interpolation QuickCheck text
        ];
        description = "UniProt-KB format parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -265979,7 +265979,7 @@ self: {
          base bytestring unordered-containers
        ];
        description = "uniq-deep";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unique" = callPackage
@@ -265990,7 +265990,7 @@ self: {
        sha256 = "1dgln2dr64ma1isqskj1qnjslg9smmr7jssg8hmk68wp36i3rwkd";
        libraryHaskellDepends = [ base hashable ];
        description = "Fully concurrent unique identifiers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unique-logic" = callPackage
@@ -266008,7 +266008,7 @@ self: {
          base non-empty QuickCheck semigroups transformers utility-ht
        ];
        description = "Solve simple simultaneous equations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unique-logic-tf" = callPackage
@@ -266026,7 +266026,7 @@ self: {
          base non-empty QuickCheck semigroups transformers utility-ht
        ];
        description = "Solve simple simultaneous equations";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uniqueid" = callPackage
@@ -266037,8 +266037,8 @@ self: {
        sha256 = "0s1jw29g5s9ll8hbfkyalhdjpsv54w1n63mz4jph36dbq68zb7g6";
        libraryHaskellDepends = [ base ];
        description = "Splittable Unique Identifier Supply";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266055,8 +266055,8 @@ self: {
          base checkers containers doctest QuickCheck
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266068,7 +266068,7 @@ self: {
        sha256 = "1r5wnc9gdinxigqf9sb58k8rvbkbqmn71d2gxpg1xz3fgxs35cqq";
        libraryHaskellDepends = [ base mmsyn6ukr vector ];
        description = "Can be used to produce the 'uniquenessPeriods' function and related functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-general" = callPackage
@@ -266079,7 +266079,7 @@ self: {
        sha256 = "117svylwp76rgygc1fa871qz0ghv5hsfj7lr63zy1r3zcakak45q";
        libraryHaskellDepends = [ base vector ];
        description = "Can be used to produce the similar to 'String.Ukrainian.UniquenessPeriods' functions.";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector" = callPackage
@@ -266090,7 +266090,7 @@ self: {
        sha256 = "0nl6rpxsmjw4zsw5x550wlifhrhy4pzkvjxhklb0183n9pl8nkkd";
        libraryHaskellDepends = [ base vector ];
        description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-common" = callPackage
@@ -266101,7 +266101,7 @@ self: {
        sha256 = "1h7xv3g7rpa2bj7mlydvfn9g14j911jrarpl7665h3rfb6fdq4zq";
        libraryHaskellDepends = [ base vector ];
        description = "Generalization of the dobutokO-poetry-general package functionality";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-examples" = callPackage
@@ -266132,7 +266132,7 @@ self: {
          uniqueness-periods-vector-stats vector
        ];
        description = "Usage examples for the uniqueness-periods-vector series of packages";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-filters" = callPackage
@@ -266143,7 +266143,7 @@ self: {
        sha256 = "0hm4g7bqsi598z3wfjj9xy5rv3hfxwyk0vbkyqwvq99xr2pwr415";
        libraryHaskellDepends = [ base mmsyn2 vector ];
        description = "A library allows to change the structure of the 'RealFrac' function output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-general" = callPackage
@@ -266158,7 +266158,7 @@ self: {
          base print-info uniqueness-periods-vector-common vector
        ];
        description = "Some kind of the optimization approach to data inner structure";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-properties" = callPackage
@@ -266177,7 +266177,7 @@ self: {
          uniqueness-periods-vector-common vector
        ];
        description = "Metrices for the maximum element for the uniqueness-periods-vector packages family";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uniqueness-periods-vector-stats" = callPackage
@@ -266188,7 +266188,7 @@ self: {
        sha256 = "1vw12a6q1h2in2llyy49n54s20sh8i4ry9vr2rwy8q0xfvfq9v25";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "A very basic descriptive statistics";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unit" = callPackage
@@ -266200,7 +266200,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Aliases for `()`";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unit-constraint" = callPackage
@@ -266211,7 +266211,7 @@ self: {
        sha256 = "0nayhjyprph6bg2hhrvd91nmrzz1bixlfib4cxsxpj8n014fhva4";
        libraryHaskellDepends = [ base constraints ];
        description = "Extremely simple typeclass";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "units" = callPackage
@@ -266233,7 +266233,7 @@ self: {
          units-parser vector-space
        ];
        description = "A domain-specific type system for dimensional analysis";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "units-attoparsec" = callPackage
@@ -266248,8 +266248,8 @@ self: {
          attoparsec base template-haskell text units units-defs
        ];
        description = "Attoparsec parsers for the units package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266261,7 +266261,7 @@ self: {
        sha256 = "1g55hnhd9bgqp649jgmq41s5i5j0gfpn3iwqaxvmikwaasyr69ki";
        libraryHaskellDepends = [ base template-haskell units ];
        description = "Definitions for use with the units package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "units-parser" = callPackage
@@ -266278,7 +266278,7 @@ self: {
          template-haskell
        ];
        description = "A parser for units of measure";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unittyped" = callPackage
@@ -266290,8 +266290,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "An extendable library for type-safe computations including units";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266314,7 +266314,7 @@ self: {
          ansi-terminal ansi-wl-pprint base mtl optparse-applicative
          semigroups split text
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unitym" = callPackage
@@ -266325,7 +266325,7 @@ self: {
        sha256 = "16rvv72ya9dp5x0lr6n4kbslgqds87x3fbf9v5rsylx0dgig48js";
        libraryHaskellDepends = [ base text transformers ];
        description = "A monad type class shared between web services";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unitym-servant" = callPackage
@@ -266340,7 +266340,7 @@ self: {
          base mtl servant-server text transformers unitym
        ];
        description = "Implementaation of unitym for Servant servers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unitym-yesod" = callPackage
@@ -266351,8 +266351,8 @@ self: {
        sha256 = "1qg0iqww3yq5kzy6x9fc3p64vcsa53ricagnknzwhhjirh9yy3yw";
        libraryHaskellDepends = [ base unitym yesod ];
        description = "Implementation of the unity monad for the Yesod framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266372,7 +266372,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Universal";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "universal-binary" = callPackage
@@ -266384,8 +266384,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266402,8 +266402,8 @@ self: {
          universe-reverse-instances universe-some
        ];
        description = "A class for finite and recursively enumerable types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266417,7 +266417,7 @@ self: {
        libraryHaskellDepends = [ base containers tagged transformers ];
        testHaskellDepends = [ base containers QuickCheck ];
        description = "A class for finite and recursively enumerable types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "universe-dependent-sum" = callPackage
@@ -266428,7 +266428,7 @@ self: {
        sha256 = "0fwqx4fzs9s09fwrf715simqb0vxnx3z7q35zbv9mkj1m6nbrsk5";
        libraryHaskellDepends = [ base universe-some ];
        description = "Universe instances for types from dependent-sum";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "universe-instances-base" = callPackage
@@ -266441,8 +266441,8 @@ self: {
        editedCabalFile = "03g5vpmmymfjx4p1l2v275vn2dknb7m91wmh01aw8f26224f7sjw";
        libraryHaskellDepends = [ base universe-base ];
        description = "Universe instances for types from the base package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266458,8 +266458,8 @@ self: {
          adjunctions base comonad containers universe-base
        ];
        description = "Universe instances for types from selected extra packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266473,8 +266473,8 @@ self: {
        editedCabalFile = "0fyhcfkriq4zcvqrr33x5ywxxmpyjjy0bz78pq2x38vpgqagiz4p";
        libraryHaskellDepends = [ base universe-base ];
        description = "Universe instances for types from the transformers and mtl packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266486,8 +266486,8 @@ self: {
        sha256 = "0wzvrnccj9hq1x55vy7a8xzppgf0zmbnlm3yz02qx3dglq97w4n4";
        libraryHaskellDepends = [ base containers universe-base ];
        description = "Instances of standard classes that are made possible by enumerations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266505,7 +266505,7 @@ self: {
        ];
        testHaskellDepends = [ base some template-haskell universe-base ];
        description = "Universe instances for Some from some";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "universe-th" = callPackage
@@ -266527,8 +266527,8 @@ self: {
          test-framework-quickcheck2 th-instances tuple uniplate
        ];
        description = "Construct a Dec's ancestor list";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266555,7 +266555,7 @@ self: {
          base containers gauge unordered-containers
        ];
        description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "universum_1_7_1" = callPackage
@@ -266580,8 +266580,8 @@ self: {
          base containers gauge text unordered-containers
        ];
        description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -266594,8 +266594,8 @@ self: {
        editedCabalFile = "1hfpipkxmkr0fgjz1i4mm0ah1s7bgb28yb8sjn32rafj4lzszn2m";
        libraryHaskellDepends = [ base bytestring time ];
        description = "POSIX functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix-bytestring" = callPackage
@@ -266606,7 +266606,7 @@ self: {
        sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53";
        libraryHaskellDepends = [ base bytestring ];
        description = "Unix/Posix-specific functions for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-compat" = callPackage
@@ -266619,7 +266619,7 @@ self: {
        editedCabalFile = "1yx38asvjaxxlfs8lpbq0dwd84ynhgi7hw91rn32i1hsmz7yn22m";
        libraryHaskellDepends = [ base unix ];
        description = "Portable POSIX-compatibility layer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-fcntl" = callPackage
@@ -266632,8 +266632,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
        description = "Comprehensive bindings to fcntl(2)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266645,8 +266645,8 @@ self: {
        sha256 = "07ysmd9ks5lm2lg1dik75m509ryn5azw28j9hcisknf5bmrfy9li";
        libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266658,7 +266658,7 @@ self: {
        sha256 = "1qy28y1apm2dxp47v0ngxj4ww3iyq4lj0n0i4z9phyr1122fglig";
        libraryHaskellDepends = [ base ];
        description = "Support for writev, pwrite and pread";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-memory" = callPackage
@@ -266675,7 +266675,7 @@ self: {
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
        ];
        description = "Unix memory syscalls";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-process-conduit" = callPackage
@@ -266696,8 +266696,8 @@ self: {
          base bytestring conduit hspec transformers unix
        ];
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266709,7 +266709,7 @@ self: {
        sha256 = "1n21cd6chih86g6kfl6b0x4k533ykzz93anhf6wga3033rvy09wj";
        libraryHaskellDepends = [ base unix ];
        description = "POSIX pseudo-terminal support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unix-time" = callPackage
@@ -266726,7 +266726,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Unix time parser/formatter and utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unjson" = callPackage
@@ -266751,7 +266751,7 @@ self: {
          unordered-containers vector
        ];
        description = "Bidirectional JSON parsing and generation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unlambda" = callPackage
@@ -266776,8 +266776,8 @@ self: {
        sha256 = "06ygxv8c1435rn9yrg27l1zsihzh4argqn677g0qrigw6wcvn0gg";
        libraryHaskellDepends = [ base ghc-prim semigroups ];
        description = "GHC Haskell lists of non-thunks (things of kind TYPE 'UnliftedRep)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266803,7 +266803,7 @@ self: {
          time transformers unix unliftio-core
        ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unliftio-core" = callPackage
@@ -266816,7 +266816,7 @@ self: {
        editedCabalFile = "16k5fxlm9xpbd0ca861nmhb1j2ahyid02m1vbg1vzb5ckbm48glv";
        libraryHaskellDepends = [ base transformers ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unliftio-path" = callPackage
@@ -266827,7 +266827,7 @@ self: {
        sha256 = "1ila58yyk2vfshaz6d5kp4vdcgjrlnwnqnrjm949qlcv36srvzg9";
        libraryHaskellDepends = [ base exceptions path time unliftio ];
        description = "UnliftIO using well-typed Paths";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "unliftio-pool" = callPackage
@@ -266842,7 +266842,7 @@ self: {
          base resource-pool time transformers unliftio-core
        ];
        description = "Data.Pool generalized to MonadUnliftIO.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unliftio-streams" = callPackage
@@ -266856,8 +266856,8 @@ self: {
          base bytestring io-streams text unliftio-core
        ];
        description = "Generalization of io-streams to MonadUnliftIO";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266872,7 +266872,7 @@ self: {
        libraryHaskellDepends = [ base directory text ];
        executableHaskellDepends = [ base directory text ];
        description = "Tool to convert literate code between styles or to code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unm-hip" = callPackage
@@ -266888,7 +266888,7 @@ self: {
        ];
        description = "A Library for the manipulation of images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266902,7 +266902,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base storable-endian utility-ht ];
        description = "Extract useful information from Amiga MED files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "unordered-containers" = callPackage
@@ -266924,7 +266924,7 @@ self: {
          random
        ];
        description = "Efficient hashing-based container types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unordered-containers-rematch" = callPackage
@@ -266942,8 +266942,8 @@ self: {
          base hashable hspec HUnit rematch unordered-containers
        ];
        description = "Rematch support for unordered containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266959,8 +266959,8 @@ self: {
          base deepseq dlist hashable unordered-containers
        ];
        description = "Graph library using unordered-containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266977,8 +266977,8 @@ self: {
          base containers deepseq primitive QuickCheck tasty tasty-quickcheck
        ];
        description = "A specialization of `HashMap Int v`";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -266994,8 +266994,8 @@ self: {
          base bytestring primitive template-haskell transformers vector
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267013,7 +267013,7 @@ self: {
        executableHaskellDepends = [ base ];
        doHaddock = false;
        description = "Unpacked containers via backpack";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "unpacked-either" = callPackage
@@ -267025,8 +267025,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267039,8 +267039,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267055,8 +267055,8 @@ self: {
        libraryHaskellDepends = [ base primitive wide-word ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "maybes of numeric values with fewer indirections";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267068,7 +267068,7 @@ self: {
        sha256 = "10mc9kjjqf82ddi586g5r6h065znhj9s0ih9w800yw4xl65ygayv";
        libraryHaskellDepends = [ base bytestring text-short ];
        description = "optional text that unpacks well";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unpacked-these" = callPackage
@@ -267084,8 +267084,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked these data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267102,8 +267102,8 @@ self: {
        ];
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked validation data type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267124,8 +267124,8 @@ self: {
          scientific text unordered-containers vector
        ];
        description = "An attoparsec roundtrip";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267137,8 +267137,8 @@ self: {
        sha256 = "0n05777fqqpbgnh9jab04ayw1j1as4wkkbrjixi1288fhi44m87p";
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for loop unrolling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267151,7 +267151,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Unified interface to unsafe functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unsafe-promises" = callPackage
@@ -267162,7 +267162,7 @@ self: {
        sha256 = "1018c3q0aq6l0011az661dvlibiv6jvwdv4c40bi8pwapri66k70";
        libraryHaskellDepends = [ base threads ];
        description = "Create pure futures using lazy IO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unsafely" = callPackage
@@ -267175,8 +267175,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Flexible access control for unsafe operations and instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267189,7 +267189,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Like unsafeperformIO, but for the ST monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unscramble" = callPackage
@@ -267207,8 +267207,8 @@ self: {
          array base optparse-applicative stream-fusion unordered-containers
        ];
        description = "Solve Boggle-like word games";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267227,8 +267227,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "An extension removing the sequentiality from monads";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267242,7 +267242,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "Utility construction of the graph depending unusable packages";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "unused" = callPackage
@@ -267270,8 +267270,8 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec text ];
        description = "A command line tool to identify unused code";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267283,7 +267283,7 @@ self: {
        sha256 = "08q1zvc61gh2l8212xb2p4nvjx7p0qaw1q69085xzgg3hn5rwig2";
        libraryHaskellDepends = [ base ];
        description = "Unwrapping sums/products lifted to functors";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "uom-plugin" = callPackage
@@ -267301,8 +267301,8 @@ self: {
        ];
        testHaskellDepends = [ base hlint tasty tasty-hunit ];
        description = "Units of measure as a GHC typechecker plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267320,8 +267320,8 @@ self: {
          base directory filepath lambda-options mtl split
        ];
        description = "Command-line tool to generate paths for moving upward in a file system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267336,7 +267336,7 @@ self: {
        executableHaskellDepends = [ base ports-tools process ];
        description = "Software management tool";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "update-monad" = callPackage
@@ -267346,7 +267346,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0l6gbfw0rmhkk2iq3wd2zzyld2nvjmbrlg7rqqv962cahs5mydns";
        libraryHaskellDepends = [ base mtl ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "update-nix-fetchgit" = callPackage
@@ -267376,8 +267376,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A program to update fetchgit values in Nix expressions";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "update-repos" = callPackage
@@ -267399,7 +267399,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Update all your git repositories with just one command";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "uploadcare" = callPackage
@@ -267415,8 +267415,8 @@ self: {
          http-types old-locale time
        ];
        description = "Haskell client for Uploadcare";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267428,7 +267428,7 @@ self: {
        sha256 = "17hi7ibasy0lhvzhv52k0dynvhxlsmywliymyygwk1jv740z1bdz";
        libraryHaskellDepends = [ base ];
        description = "Upload test";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "upskirt" = callPackage
@@ -267439,8 +267439,8 @@ self: {
        sha256 = "0528345xiq2xmi9fwzv0rvbjqfhcvyhkik8c453yr2nr03k0zs4c";
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267457,8 +267457,8 @@ self: {
          req req-conduit text uuid
        ];
        description = "Talk to Urbit from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267475,8 +267475,8 @@ self: {
          req req-conduit text uuid
        ];
        description = "Talk to Urbit from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267492,7 +267492,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-core QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Hoon-style atom manipulation and printing functions";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "ureader" = callPackage
@@ -267515,8 +267515,8 @@ self: {
          tagsoup terminal-size text time xml
        ];
        description = "Minimalistic CLI RSS reader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267537,8 +267537,8 @@ self: {
          mime-types mtl optparse-applicative process syb text
        ];
        description = "Ur/Web static content generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267550,8 +267550,8 @@ self: {
        sha256 = "0gfv54ys1h4ac3dhaypnpnm4w781857n2k8680jflnjbkqlandrr";
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        description = "Library for working with URIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267580,7 +267580,7 @@ self: {
          network-uri
        ];
        description = "Haskell URI parsing as ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uri-bytestring-aeson" = callPackage
@@ -267593,7 +267593,7 @@ self: {
          aeson base bytestring text uri-bytestring
        ];
        description = "Aeson instances for URI Bytestring";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uri-conduit" = callPackage
@@ -267610,8 +267610,8 @@ self: {
          network system-fileio system-filepath text transformers
        ];
        description = "Read and write URIs (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267628,7 +267628,7 @@ self: {
          base bytestring network-uri text utf8-string
        ];
        description = "Unicode aware uri-encoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uri-encoder" = callPackage
@@ -267647,8 +267647,8 @@ self: {
          base bytestring criterion network-uri
        ];
        description = "A uri encoder to make your strings less readable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267665,8 +267665,8 @@ self: {
          transformers
        ];
        description = "Read and write URIs (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267685,8 +267685,8 @@ self: {
          uri-enumerator
        ];
        description = "uri-enumerator backend for the file scheme (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267703,8 +267703,8 @@ self: {
        ];
        testHaskellDepends = [ base data-default hspec lens ];
        description = "A simple library for parsing and generating URIs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267719,8 +267719,8 @@ self: {
        libraryHaskellDepends = [ base containers utf8-string ];
        executableHaskellDepends = [ base ];
        description = "URI template library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267744,8 +267744,8 @@ self: {
          ansi-wl-pprint base HUnit mtl template-haskell
        ];
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267757,7 +267757,7 @@ self: {
        sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
        libraryHaskellDepends = [ base utf8-string ];
        description = "A library for working with URLs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "url-bytes" = callPackage
@@ -267780,8 +267780,8 @@ self: {
          weigh
        ];
        description = "Memory efficient url type and parser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267804,8 +267804,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ criterion http-types rerebase ];
        description = "Decoders for URL-encoding (aka Percent-encoding)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267819,8 +267819,8 @@ self: {
        editedCabalFile = "1fbgzz9yhqc5lx15n551r190g2a6f1plf3clpar76fj3wqn6x4nr";
        libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267838,8 +267838,8 @@ self: {
          base bytestring containers mtl network old-time
        ];
        description = "Parallel link checker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267853,8 +267853,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base network ];
        description = "Decode percent-encoded strings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267866,8 +267866,8 @@ self: {
        sha256 = "1kg25w5pnmsnjwycnf0q6d65cqfw5d0xn9rwyn4ybhh3a8q2yaa8";
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267883,8 +267883,8 @@ self: {
        libraryHaskellDepends = [ base mtl network network-uri split ];
        testHaskellDepends = [ base network network-uri QuickCheck ];
        description = "Generate or process x-www-urlencoded data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267904,8 +267904,8 @@ self: {
          split strict text transformers transformers-base vector
        ];
        description = "Painfully simple URL deployment";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267918,8 +267918,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec ];
        description = "Universal Resource Names";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267936,8 +267936,8 @@ self: {
          template-haskell transformers
        ];
        description = "A package for updatable discrete distributions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267955,8 +267955,8 @@ self: {
          base filepath mtl optparse-applicative parsec process syb
        ];
        description = "XML parser-printer supporting Ur/Web syntax extensions";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -267968,7 +267968,7 @@ self: {
        sha256 = "16zlg48pa254bwn7kimd9mn78q0mlczhj683nhxbdd5l7yqrgkm6";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base doctest doctest-discover hspec time ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "usb" = callPackage
@@ -267983,8 +267983,8 @@ self: {
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
        description = "Communicate with USB devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268001,8 +268001,8 @@ self: {
          transformers usb
        ];
        description = "Iteratee enumerators for the usb package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268016,8 +268016,8 @@ self: {
        editedCabalFile = "1p780v435frqi04gc8db1jj1ra9c98jpdwmy4p274azp0gi51q9z";
        libraryHaskellDepends = [ attoparsec base bytestring usb ];
        description = "Parser and request Library for USB HIDs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268037,8 +268037,8 @@ self: {
          containers-unicode-symbols parsimony
        ];
        description = "A database of USB identifiers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268055,8 +268055,8 @@ self: {
          usb vector
        ];
        description = "Iteratee enumerators for the usb package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268073,8 +268073,8 @@ self: {
          regions text transformers usb
        ];
        description = "Type-safe communication with USB devices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268089,7 +268089,7 @@ self: {
        libraryHaskellDepends = [ base random-fu text ];
        executableHaskellDepends = [ base random-fu text ];
        description = "A collection of user agents";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "userid" = callPackage
@@ -268104,8 +268104,8 @@ self: {
          aeson base boomerang cereal safecopy web-routes web-routes-th
        ];
        description = "The UserId type and useful instances for web development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268121,7 +268121,7 @@ self: {
          aeson base bcrypt path-pieces text time
        ];
        description = "A library simplifying user management for web applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "users-mysql-haskell" = callPackage
@@ -268140,8 +268140,8 @@ self: {
          time transformers users uuid
        ];
        description = "A mysql-haskell backend for the users library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268162,8 +268162,8 @@ self: {
          base hspec monad-logger persistent-sqlite temporary text users-test
        ];
        description = "A persistent backend for the users package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268180,7 +268180,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec postgresql-simple users-test ];
        description = "A PostgreSQL backend for the users package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "users-test" = callPackage
@@ -268191,7 +268191,7 @@ self: {
        sha256 = "0gmcbimbp8sj282c915m9bka4fj238xsf8szqmnv20n01kx4k1gn";
        libraryHaskellDepends = [ base hspec text users ];
        description = "Library to test backends for the users library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "utc" = callPackage
@@ -268211,7 +268211,7 @@ self: {
          test-framework test-framework-quickcheck2 text
        ];
        description = "A pragmatic time and date library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "utf" = callPackage
@@ -268224,8 +268224,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base gauge ];
        description = "UTF-8";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268244,7 +268244,7 @@ self: {
          base bytestring charsetdetect-ae hspec text text-short utf8-string
        ];
        description = "A string conversion library that assumes utf8";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "utf8-env" = callPackage
@@ -268255,7 +268255,7 @@ self: {
        sha256 = "0ls2ls2n12igm1day730sp1gfcwxvkkqd2xdp2lmyp2ldp0d72zp";
        libraryHaskellDepends = [ base mtl utf8-string ];
        description = "UTF-8 aware substitutes for functions in System.Environment";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "utf8-light" = callPackage
@@ -268266,7 +268266,7 @@ self: {
        sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "Unicode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "utf8-prelude" = callPackage
@@ -268280,8 +268280,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268294,7 +268294,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base HUnit ];
        description = "Support for reading and writing UTF8 Strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "utf8-validator" = callPackage
@@ -268311,8 +268311,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constant-space UTF8 validator for ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268326,7 +268326,7 @@ self: {
        editedCabalFile = "16hbcmcq2674j37gl808n5i02kv0vn3nwq5l2a6v5lj0dn34nicb";
        libraryHaskellDepends = [ base transformers ];
        description = "Utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "util-exception" = callPackage
@@ -268339,8 +268339,8 @@ self: {
        editedCabalFile = "1h5s7qkdgfifw35dg7wzsr42q1dcficrjvw9b1qhff00m7avdam0";
        libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268354,8 +268354,8 @@ self: {
        testHaskellDepends = [ base logict ];
        benchmarkHaskellDepends = [ base gauge logict ];
        description = "See README for more info";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268372,8 +268372,8 @@ self: {
        ];
        testHaskellDepends = [ base containers HTF QuickCheck ];
        description = "A collection of commonly used utils";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268387,8 +268387,8 @@ self: {
        editedCabalFile = "0wlgp8cq7gg585x041djxprm6a3kih1dkx2fbpg6bwi850ihglir";
        libraryHaskellDepends = [ base primitive ];
        description = "Primitive memory-related utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268405,8 +268405,8 @@ self: {
        libraryHaskellDepends = [ base control primitive util ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for stateful primitive types and types based on them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268425,8 +268425,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for universal types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268439,7 +268439,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uu-cco" = callPackage
@@ -268450,8 +268450,8 @@ self: {
        sha256 = "008ckslrc60959k6l6mvk8dixr6vmfmiir6qj8wakgixcyd6ar6d";
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Utilities for compiler construction: core functionality";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268465,8 +268465,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        description = "Utilities for compiler construction: example programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268478,8 +268478,8 @@ self: {
        sha256 = "06ddh2fcvy0zbzzdgpcx8kvlssrcmxx4swgkl8iy7223llanx0px";
        libraryHaskellDepends = [ base uu-cco uulib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268491,8 +268491,8 @@ self: {
        sha256 = "1sshnlqb0ydxgrhm0i1c3mpnixfsqwrf3gl59yz4rhiw5hy33z71";
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268506,7 +268506,7 @@ self: {
        editedCabalFile = "1wzc2aacqh1ndyk2dawzqbig7m0khdb05q9pzplhhfhfrbgn4pjr";
        libraryHaskellDepends = [ base ];
        description = "An interleaving combinator for use with applicative style implementations";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uu-options" = callPackage
@@ -268524,7 +268524,7 @@ self: {
          uu-parsinglib
        ];
        description = "Parse command line options using uu-interleave and uu-parsinglib";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uu-parsinglib" = callPackage
@@ -268535,7 +268535,7 @@ self: {
        sha256 = "0v5vcxfix04hmwc7ajni4xrv0g099pr2j79bqx1n24s1cvimlpyj";
        libraryHaskellDepends = [ base ListLike time uu-interleaved ];
        description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uu-tc" = callPackage
@@ -268548,7 +268548,7 @@ self: {
        editedCabalFile = "1jz4w3fnhaz631yrlxrxj1vfl0i0vby038v70hmwhsg10wz7w764";
        libraryHaskellDepends = [ base ];
        description = "Haskell 98 parser combinators for INFOB3TC at Utrecht University";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuagc" = callPackage
@@ -268568,7 +268568,7 @@ self: {
        ];
        executableHaskellDepends = [ base uuagc-cabal ];
        description = "Attribute Grammar System of Universiteit Utrecht";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuagc-bootstrap" = callPackage
@@ -268590,8 +268590,8 @@ self: {
          mtl uulib
        ];
        description = "Attribute Grammar System of Universiteit Utrecht";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268607,7 +268607,7 @@ self: {
          base Cabal containers directory filepath mtl process uulib
        ];
        description = "Cabal plugin for UUAGC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuagc-diagrams" = callPackage
@@ -268618,8 +268618,8 @@ self: {
        sha256 = "0x4dhbzl5xvs3mrg7256hg673nbr4k6kjszyavjs61klcq58asm7";
        libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268636,7 +268636,7 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "A debugger for the UUAG system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "uuid" = callPackage
@@ -268663,7 +268663,7 @@ self: {
          base criterion mersenne-random-pure64 random
        ];
        description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuid-aeson" = callPackage
@@ -268676,8 +268676,8 @@ self: {
        editedCabalFile = "056ql7mx42rswj5zphazl1h5mmvd84v8xnlwyln2jx7l7rb5rrjz";
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268698,8 +268698,8 @@ self: {
          wide-word
        ];
        description = "UUID parsing using byteverse packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268718,8 +268718,8 @@ self: {
          exceptions uuid
        ];
        description = "Reversable and secure encoding of object ids as uuids";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268731,7 +268731,7 @@ self: {
        sha256 = "1gfm7bxmr2b5hn4x3dr231ra0b1nwp36x2808w3l43yglz8zwp74";
        libraryHaskellDepends = [ base bytestring uuid ];
        description = "Universally Unique Identifiers with little-endian-ish encoding tools";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uuid-orphans" = callPackage
@@ -268746,7 +268746,7 @@ self: {
          base safecopy text th-lift uuid-types web-routes
        ];
        description = "Orphan instances for the UUID datatype";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuid-quasi" = callPackage
@@ -268757,7 +268757,7 @@ self: {
        sha256 = "09ijnbj2znaqanaxghql3yy1fqb0nsjhrwi6kfzg4h8nrw1ir2pj";
        libraryHaskellDepends = [ base template-haskell uuid ];
        description = "Supplemental package for 'uuid' allowing quasiquotation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uuid-types" = callPackage
@@ -268781,7 +268781,7 @@ self: {
          base bytestring containers criterion deepseq random
        ];
        description = "Type definitions for Universally Unique Identifiers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uulib" = callPackage
@@ -268792,7 +268792,7 @@ self: {
        sha256 = "10j40q1b1fkx0fv56cn0kkilbqhyh6xxya536xlbx365lnc1rk0i";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Haskell Utrecht Tools Library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "uusi" = callPackage
@@ -268813,7 +268813,7 @@ self: {
          base Cabal HUnit microlens microlens-th text
        ];
        description = "Tweak dependencies in .cabal files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "uvector" = callPackage
@@ -268826,8 +268826,8 @@ self: {
        editedCabalFile = "023may02r17xg5wqh0lplcjdfiwaprbqn9p6jgmqs935qf9zz2g2";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Fast unboxed arrays with a flexible interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268839,8 +268839,8 @@ self: {
        sha256 = "0jzlirrar7grq3h02k22zxyvy1wmfrjw9lscnhpjqmsxjli1jh81";
        libraryHaskellDepends = [ base uvector ];
        description = "Efficient algorithms for uvector unboxed arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268852,8 +268852,8 @@ self: {
        sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43";
        libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268865,7 +268865,7 @@ self: {
        sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la";
        libraryHaskellDepends = [ base process ];
        description = "Utility function for reading a source of loaded uzbl pages";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "v4l2" = callPackage
@@ -268881,8 +268881,8 @@ self: {
          bindings-posix containers ioctl
        ];
        description = "interface to Video For Linux Two (V4L2)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268896,8 +268896,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base GLUT v4l2 ];
        description = "video for linux two examples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268919,8 +268919,8 @@ self: {
        ];
        testHaskellDepends = [ base process ];
        description = "the cabal companion";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268938,8 +268938,8 @@ self: {
        ];
        testHaskellDepends = [ base Cabal containers ];
        description = "Core algorithms and datatypes used by vabal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268951,8 +268951,8 @@ self: {
        sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "Graph representation of the GHC heap";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268969,8 +268969,8 @@ self: {
          svgcairo vacuum
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -268982,8 +268982,8 @@ self: {
        sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
        libraryHaskellDepends = [ base filepath graphviz vacuum ];
        description = "A library for transforming vacuum graphs into GraphViz output";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269003,8 +269003,8 @@ self: {
          process stb-image
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269016,8 +269016,8 @@ self: {
        sha256 = "0zpag42dr2763ddrwdy7744lqkd6207ljfw3bqm6db3a1128861z";
        libraryHaskellDepends = [ base containers hubigraph vacuum ];
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269041,7 +269041,7 @@ self: {
          attoparsec base directory filepath process QuickCheck text
        ];
        description = "Runs commands on remote machines using ssh";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "valid" = callPackage
@@ -269052,7 +269052,7 @@ self: {
        sha256 = "1c029mb3szixs9rr5i7ri2nm0ya5gv5r6bv8hzsyw90ys5nbgcz5";
        libraryHaskellDepends = [ base util ];
        description = "Type isomorphic to `Either` with `Applicative` instance which combines errors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "valid-names" = callPackage
@@ -269063,8 +269063,8 @@ self: {
        sha256 = "14gpkb6pbkvmny17g2gpq6i6kq7ahmcnkgrcrwm72vda12wxsl78";
        libraryHaskellDepends = [ base containers MonadRandom ];
        description = "Valid operator/module characters";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269076,7 +269076,7 @@ self: {
        sha256 = "19d02sblyxg73prlrmlcs4vclzxzg2pzlrp67f2kx94nsw0v3l4p";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "validate-input" = callPackage
@@ -269095,8 +269095,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Input validation combinator library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269116,7 +269116,7 @@ self: {
          template-haskell
        ];
        description = "Compile-time checking for partial smart-constructors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "validated-types" = callPackage
@@ -269128,8 +269128,8 @@ self: {
        libraryHaskellDepends = [ base refined text ];
        testHaskellDepends = [ base ];
        description = "Type-level constraints on strings and other input";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269148,7 +269148,7 @@ self: {
        ];
        testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
        description = "A data-type like Either but with an accumulating Applicative";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "validation-selective" = callPackage
@@ -269166,7 +269166,7 @@ self: {
          base doctest hedgehog hspec hspec-hedgehog selective text
        ];
        description = "Lighweight pure data validation based on Applicative and Selective functors";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "validations" = callPackage
@@ -269187,8 +269187,8 @@ self: {
          transformers
        ];
        description = "A nice way to define field validations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269207,7 +269207,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Straightforward validation monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "validators" = callPackage
@@ -269219,7 +269219,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base containers doctest Glob hspec text ];
        description = "Composable validations for your Haskell data types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity" = callPackage
@@ -269231,7 +269231,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Validity typeclass";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-aeson" = callPackage
@@ -269248,7 +269248,7 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec validity ];
        description = "Validity instances for aeson";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-bytestring" = callPackage
@@ -269259,7 +269259,7 @@ self: {
        sha256 = "0ck7pn8c8srwdwpcx6x4ihixff07kigq8q9sjkc3zzyf54n93f3x";
        libraryHaskellDepends = [ base bytestring validity ];
        description = "Validity instances for bytestring";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-containers" = callPackage
@@ -269270,7 +269270,7 @@ self: {
        sha256 = "1qw5p60dr54d2wh49y6x33hbks4d74m8pr5zygblzk0y70warqld";
        libraryHaskellDepends = [ base containers validity ];
        description = "Validity instances for containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-path" = callPackage
@@ -269286,7 +269286,7 @@ self: {
          base filepath genvalidity-hspec hspec path validity
        ];
        description = "Validity instances for Path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-primitive" = callPackage
@@ -269297,7 +269297,7 @@ self: {
        sha256 = "0r9wy91qr2c8lf6llv9qyirb1vjkq4nb41zqph5ip9gjjj7fzk9y";
        libraryHaskellDepends = [ base primitive validity ];
        description = "Validity instances for primitive";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-scientific" = callPackage
@@ -269308,7 +269308,7 @@ self: {
        sha256 = "0vqqwlhamykz1vb5gc6krkcq3ixdmkld17c5vsxd0drnjcsllfkp";
        libraryHaskellDepends = [ base scientific validity ];
        description = "Validity instances for scientific";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-text" = callPackage
@@ -269319,7 +269319,7 @@ self: {
        sha256 = "1sdcivm7mbvi71zkm36g95wrb0y8fzhrnryp01m2wpmhffk1z5cf";
        libraryHaskellDepends = [ base bytestring text validity ];
        description = "Validity instances for text";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-time" = callPackage
@@ -269330,7 +269330,7 @@ self: {
        sha256 = "02lwa2w84m4mm2lpg5dhg5p0ndba5r152bjm4iy76y2qsfkva0ap";
        libraryHaskellDepends = [ base time validity ];
        description = "Validity instances for time";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-unordered-containers" = callPackage
@@ -269343,7 +269343,7 @@ self: {
          base hashable unordered-containers validity
        ];
        description = "Validity instances for unordered-containers";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-uuid" = callPackage
@@ -269354,7 +269354,7 @@ self: {
        sha256 = "1m4z9q8m07ssrg6a4lj7501kjnbp9hazg3gyfwrbdbrw7p7jjd9l";
        libraryHaskellDepends = [ base uuid validity ];
        description = "Validity instances for uuid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "validity-vector" = callPackage
@@ -269365,7 +269365,7 @@ self: {
        sha256 = "0jbfd3h9k0b4ifaaqqar54r86hm1jiixyxrgs2ln7ni00b0ncv1y";
        libraryHaskellDepends = [ base hashable validity vector ];
        description = "Validity instances for vector";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "valor" = callPackage
@@ -269377,7 +269377,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base hspec text transformers ];
        description = "Simple general structured validation library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "value-supply" = callPackage
@@ -269388,8 +269388,8 @@ self: {
        sha256 = "0fd6rk46sgdbdmfdr9wy0f3qzwaymgd9hl9v735g2a4bqiqanmb5";
        libraryHaskellDepends = [ base ];
        description = "A library for generating values without having to thread state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269412,8 +269412,8 @@ self: {
          optparse-applicative process uniplate
        ];
        description = "Analyze and visualize expression trees";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269431,8 +269431,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ array base criterion deepseq ];
        description = "Mutable variables and tuples";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269444,7 +269444,7 @@ self: {
        sha256 = "12l536ca32dhvylp3kizq664lsfysmc5r0hqzs50aqrbx8db40ji";
        libraryHaskellDepends = [ base stm ];
        description = "The VarMonad typeclass, generalizing types of references";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "varan" = callPackage
@@ -269463,7 +269463,7 @@ self: {
        ];
        description = "Process mpileup output to identify significant differences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269480,8 +269480,8 @@ self: {
          type-level-natural-number
        ];
        description = "variable-precision floating point";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269494,8 +269494,8 @@ self: {
        libraryHaskellDepends = [ base mtl stm ];
        testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        description = "Monads with variables, without deep magic";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269510,8 +269510,8 @@ self: {
          base cereal containers deepseq semigroupoids
        ];
        description = "nominal value with possible variations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269536,7 +269536,7 @@ self: {
          base contravariant criterion time transformers
        ];
        description = "FRP through value streams and monadic splines";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vault" = callPackage
@@ -269551,7 +269551,7 @@ self: {
          base containers hashable semigroups unordered-containers
        ];
        description = "a persistent store for values of arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vault-tool" = callPackage
@@ -269567,7 +269567,7 @@ self: {
          unordered-containers
        ];
        description = "Client library for HashiCorp's Vault tool (via HTTP API)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vault-tool-server" = callPackage
@@ -269586,8 +269586,8 @@ self: {
          aeson base tasty-hunit temporary vault-tool
        ];
        description = "Utility library for spawning a HashiCorp Vault process";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269604,8 +269604,8 @@ self: {
          unordered-containers vault-tool
        ];
        description = "A monad transformer for vault-tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269629,8 +269629,8 @@ self: {
          unordered-containers
        ];
        description = "Common types and instances for Vaultaire";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269647,8 +269647,8 @@ self: {
          lmdb random stm transformers
        ];
        description = "semi-transparent persistence for Haskell using LMDB, STM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269664,8 +269664,8 @@ self: {
          array base bytestring bytestring-builder vcache
        ];
        description = "patricia tries modeled above VCache";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269680,7 +269680,7 @@ self: {
        ];
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269695,8 +269695,8 @@ self: {
        libraryHaskellDepends = [ base extra shelly system-filepath ];
        executableHaskellDepends = [ base shelly text ];
        description = "Recursively check that a directory is under version control";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269708,7 +269708,7 @@ self: {
        sha256 = "0x0smhllghzn0xjfk5cwxaf1vnd2yp3saxw92ylyws8a546mzhzm";
        libraryHaskellDepends = [ base polyparse ];
        description = "Reading and writing VCD files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vcf" = callPackage
@@ -269724,8 +269724,8 @@ self: {
          attoparsec base bytestring hspec hspec-expectations
        ];
        description = "A package to parse VCF files inspired in similar python libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269737,7 +269737,7 @@ self: {
        sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg";
        libraryHaskellDepends = [ base process ];
        description = "Facilities for accessing the version control revision of the current directory";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vcs-web-hook-parse" = callPackage
@@ -269748,7 +269748,7 @@ self: {
        sha256 = "02lm4czrjwbnfmhybqn80j8xravi37z1a319s23hgxdbxpw970nv";
        libraryHaskellDepends = [ aeson base bytestring text ];
        description = "Parse development platform web hook messages";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "vcsgui" = callPackage
@@ -269772,7 +269772,7 @@ self: {
        ];
        description = "GUI library for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269797,7 +269797,7 @@ self: {
        ];
        description = "Wrapper for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269821,7 +269821,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion fin vector ];
        description = "Vec: length-indexed (sized) list";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vec-lens" = callPackage
@@ -269834,7 +269834,7 @@ self: {
        editedCabalFile = "0grj1abb7gjbzw06672464r75wjnmra9d12yvlmdm1qyj9zya0ph";
        libraryHaskellDepends = [ base fin lens vec ];
        description = "Vec: length-indexed (sized) list: lens support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vec-optics" = callPackage
@@ -269847,7 +269847,7 @@ self: {
        editedCabalFile = "10abn334qhbik8s8lx1r54vcbj3d2s091j2w98mq3cllksa8dmv0";
        libraryHaskellDepends = [ base fin optics-core vec ];
        description = "Vec: length-indexed (sized) list: optics support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vect" = callPackage
@@ -269858,7 +269858,7 @@ self: {
        sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, tailored to computer graphics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vect-floating" = callPackage
@@ -269869,8 +269869,8 @@ self: {
        sha256 = "1kxsjsiqqpi7k0xz597z7r2fd45s38plgk6jplzxagg0i3bm0q4g";
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269884,8 +269884,8 @@ self: {
        editedCabalFile = "05k20xd7rcf3hypbbw53bv8yl65sgpdawdfmskypk3mbl1w5fymg";
        libraryHaskellDepends = [ accelerate base vect-floating ];
        description = "Accelerate instances for vect-floating types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269897,8 +269897,8 @@ self: {
        sha256 = "1qp98j6bgldjcs71pd7iqc5sjf1ixb1jj0l267hw532j4yf81dig";
        libraryHaskellDepends = [ base OpenGL vect ];
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -269917,7 +269917,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck template-haskell transformers
        ];
        description = "Efficient Arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-algorithms" = callPackage
@@ -269934,7 +269934,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base mwc-random vector ];
        description = "Efficient algorithms for vector arrays";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-binary" = callPackage
@@ -269945,7 +269945,7 @@ self: {
        sha256 = "1qdjibh3ywfa0lvawdahnr9qhh2qy6899lm5inbzmksjpykgbazz";
        libraryHaskellDepends = [ base binary vector ];
        description = "Binary instances for vector types (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-binary-instances" = callPackage
@@ -269964,7 +269964,7 @@ self: {
          base binary bytestring deepseq gauge vector
        ];
        description = "Instances of Data.Binary for vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-buffer" = callPackage
@@ -269975,7 +269975,7 @@ self: {
        sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv";
        libraryHaskellDepends = [ base deepseq vector ];
        description = "A buffer compatible with Data.Vector.*";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-builder" = callPackage
@@ -269993,7 +269993,7 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        description = "Vector builder";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-bytes-instances" = callPackage
@@ -270005,7 +270005,7 @@ self: {
        libraryHaskellDepends = [ base bytes vector ];
        testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ];
        description = "Serial (from the bytes package) for Vector (from the vector package)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-bytestring" = callPackage
@@ -270023,8 +270023,8 @@ self: {
        ];
        testHaskellDepends = [ base directory QuickCheck random ];
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270043,7 +270043,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest hedgehog hedgehog-classes ];
        description = "circular vectors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-clock" = callPackage
@@ -270062,8 +270062,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        description = "Vector clocks for versioning message flows";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270082,8 +270082,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        description = "Conduit utilities for vectors";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270095,7 +270095,7 @@ self: {
        sha256 = "0z98f0fjn90x3azdbsnjpx61r9lna9hb67bjnmmhvil9a7hpd65x";
        libraryHaskellDepends = [ base vector ];
        description = "Some special functions to work with Vector (with zip)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-endian" = callPackage
@@ -270109,8 +270109,8 @@ self: {
        ];
        doHaddock = false;
        description = "Storable vectors with cpu-independent representation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270127,7 +270127,7 @@ self: {
          vector
        ];
        description = "Utilities for the \"vector\" library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-fft" = callPackage
@@ -270138,7 +270138,7 @@ self: {
        sha256 = "1aygafvsx3wybbp6hqg5ddkawl8m5m6s6dg5hbrlyibz2whrp1fs";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Native FFT and IFFT for vector";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-fftw" = callPackage
@@ -270156,7 +270156,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        description = "A binding to the fftw library for one-dimensional vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
@@ -270170,8 +270170,8 @@ self: {
          base ghc-prim primitive vector vector-th-unbox
        ];
        description = "vectors that perform the fmap operation in constant time";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270183,8 +270183,8 @@ self: {
        sha256 = "14v0qj2r484pwbjhdymvdqjnsbqszl9wr71hv6wsvs2d8ja1bajl";
        libraryHaskellDepends = [ base vector ];
        description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270200,7 +270200,7 @@ self: {
          base comonad hashable keys pointed semigroupoids semigroups vector
        ];
        description = "Orphan Instances for 'Data.Vector'";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-instances-collections" = callPackage
@@ -270213,8 +270213,8 @@ self: {
          base collections-api template-haskell vector
        ];
        description = "Instances of the Data.Collections classes for Data.Vector.*";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270229,7 +270229,7 @@ self: {
        libraryHaskellDepends = [ base mmap primitive vector ];
        testHaskellDepends = [ base QuickCheck temporary vector ];
        description = "Memory map immutable and mutable vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-random" = callPackage
@@ -270242,8 +270242,8 @@ self: {
        editedCabalFile = "0ys49lp4hqdm9hmfirfycksi31k03w7i6fralmqz6p9l4rc1lcyy";
        libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        description = "Generate vectors filled with high quality pseudorandom numbers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270255,8 +270255,8 @@ self: {
        sha256 = "1k30n5qh16sdfxy77vp10bx52lb1ffmjn70vg87hx12j8wg9vbv6";
        libraryHaskellDepends = [ base vector ];
        description = "(deprecated) Read instances for 'Data.Vector'";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270269,7 +270269,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base tasty tasty-quickcheck vector ];
        description = "Vectors with O(1) reverse";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-shuffling" = callPackage
@@ -270280,7 +270280,7 @@ self: {
        sha256 = "04kpp7529jd4avhprfxdy6nfikx3d3ans0knhz3lspms4iky068i";
        libraryHaskellDepends = [ base random vector ];
        description = "Algorithms for vector shuffling";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-sized" = callPackage
@@ -270297,7 +270297,7 @@ self: {
          finite-typelits hashable indexed-list-literals primitive vector
        ];
        description = "Size tagged vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-space" = callPackage
@@ -270308,7 +270308,7 @@ self: {
        sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc";
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-space-map" = callPackage
@@ -270320,8 +270320,8 @@ self: {
        libraryHaskellDepends = [ base containers vector-space ];
        testHaskellDepends = [ base doctest ];
        description = "vector-space operations for finite maps using Data.Map";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270339,8 +270339,8 @@ self: {
          test-framework-quickcheck2 test-framework-th vector-space
        ];
        description = "Instances of vector-space classes for OpenGL types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270354,8 +270354,8 @@ self: {
        editedCabalFile = "1284ds38z70696vsh695hx74nyslmgaqfv4lz0wadvmzcrw0hwb4";
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270372,7 +270372,7 @@ self: {
          base QuickCheck split tasty tasty-quickcheck vector
        ];
        description = "Combinator library for splitting vectors";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vector-static" = callPackage
@@ -270383,8 +270383,8 @@ self: {
        sha256 = "19spzrk64j2rgyi15dvs8gfbx3nc79ybssaxkv8dn9df4fwksv91";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Statically checked sizes on Data.Vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270396,7 +270396,7 @@ self: {
        sha256 = "04vaizcc78q94vpaly28iwhlwk6nwrsa6jmcq2afdl6yqp63njc6";
        libraryHaskellDepends = [ base deepseq parallel vector ];
        description = "A parallel evaluation strategy for boxed vectors";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vector-text" = callPackage
@@ -270411,8 +270411,8 @@ self: {
          base binary prologue text vector vector-binary-instances
        ];
        description = "Text implementation based on unboxed char vector";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270427,7 +270427,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vectortiles" = callPackage
@@ -270454,7 +270454,7 @@ self: {
          unordered-containers vector
        ];
        description = "GIS Vector Tiles, as defined by Mapbox";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vega-view" = callPackage
@@ -270473,8 +270473,8 @@ self: {
          http-types scotty text unordered-containers
        ];
        description = "Easily view Vega or Vega-Lite visualizations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270501,8 +270501,8 @@ self: {
          QuickCheck utf8-light
        ];
        description = "ASCII platform-adventure game";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270514,8 +270514,8 @@ self: {
        sha256 = "0wai72bqb1vp4p7ml1yj2jdmkjglihai9vhmgj7ri6y2qgzkpwly";
        libraryHaskellDepends = [ base regex-pcre ];
        description = "Regular expressions made easy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270531,7 +270531,7 @@ self: {
          base binary deepseq dhall generic-lens serialise
        ];
        description = "Simple enum that encodes application verbosity";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "verdict" = callPackage
@@ -270548,8 +270548,8 @@ self: {
        executableHaskellDepends = [ base markdown-unlit text ];
        testHaskellDepends = [ base hspec ];
        description = "Validation framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270570,8 +270570,8 @@ self: {
          aeson base containers hspec unordered-containers vector verdict
        ];
        description = "JSON instances and JSON Schema for verdict";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270587,8 +270587,8 @@ self: {
          base containers lens mtl sbv transformers union vinyl
        ];
        description = "An intermediate language for Hoare logic style verification";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270611,8 +270611,8 @@ self: {
          base hspec jwt QuickCheck text text-conversions time
        ];
        description = "A new Haskeleton package";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270625,8 +270625,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ alex happy ];
        description = "Verilog preprocessor, parser, and AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270663,8 +270663,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion lens ];
        description = "Random verilog generation and simulator testing";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270677,8 +270677,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring semigroupoids ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Type-safe data versioning";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270699,8 +270699,8 @@ self: {
          versioning wai wai-extra
        ];
        description = "Servant combinators for the versioning library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270721,7 +270721,7 @@ self: {
          tasty-quickcheck text
        ];
        description = "Types and parsers for software version numbers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vflow-types" = callPackage
@@ -270741,8 +270741,8 @@ self: {
          quickcheck-classes text
        ];
        description = "types for ingesting vflow data with aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270763,7 +270763,7 @@ self: {
          base containers exceptions hspec QuickCheck template-haskell
        ];
        description = "A Python str.format() like formatter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vformat-aeson" = callPackage
@@ -270785,7 +270785,7 @@ self: {
          vformat
        ];
        description = "Extend vformat to Aeson datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vformat-time" = callPackage
@@ -270799,7 +270799,7 @@ self: {
        libraryHaskellDepends = [ base time vformat ];
        testHaskellDepends = [ base time vformat ];
        description = "Extend vformat to time datatypes";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vfr-waypoints" = callPackage
@@ -270820,8 +270820,8 @@ self: {
          base fuzzy lens optparse-applicative
        ];
        description = "VFR waypoints, as published in the AIP (ERSA)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270851,8 +270851,8 @@ self: {
          base containers doctest lens QuickCheck tasty tasty-quickcheck text
        ];
        description = "A pager for grep";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270878,8 +270878,8 @@ self: {
          random test-framework test-framework-quickcheck2 text time
        ];
        description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270891,8 +270891,8 @@ self: {
        sha256 = "1bi8n8m9an1hcj4c6i2ifqyadg32nq4viffi1kiihaw3j7dh552b";
        libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270908,8 +270908,8 @@ self: {
        testHaskellDepends = [
          base containers doctest QuickCheck quickcheck-classes
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270928,8 +270928,8 @@ self: {
          vector vector-algorithms vty
        ];
        description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270941,8 +270941,8 @@ self: {
        sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h";
        libraryHaskellDepends = [ base mtl ];
        description = "Views allow you to run a State monad on part of a state";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -270983,8 +270983,8 @@ self: {
          yesod-core yesod-platform
        ];
        description = "An extensible dead-man's switch system";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271011,8 +271011,8 @@ self: {
          parsec process relude temporary text themoviedb time yaml
        ];
        description = "Frontend for video metadata tagging tools";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271042,8 +271042,8 @@ self: {
          transformers wcwidth
        ];
        description = "An MPD client with vim-like key bindings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) ncurses;};
 
@@ -271064,8 +271064,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Interpreter for microcomputer-era BASIC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271088,7 +271088,7 @@ self: {
          base criterion linear microlens mwc-random primitive tagged vector
        ];
        description = "Extensible Records";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vinyl-generics" = callPackage
@@ -271105,7 +271105,7 @@ self: {
          text vinyl
        ];
        description = "Convert plain records to vinyl (and vice versa), generically";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vinyl-gl" = callPackage
@@ -271126,7 +271126,7 @@ self: {
          vinyl
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vinyl-json" = callPackage
@@ -271142,8 +271142,8 @@ self: {
        ];
        testHaskellDepends = [ base hlint ];
        description = "Provide json instances automagically to vinyl types";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271155,7 +271155,7 @@ self: {
        sha256 = "1vxw57c17lajq6qb2kcblymbg42y7ddh85kiik5kwmbxgfmqyrrv";
        libraryHaskellDepends = [ base vinyl ];
        description = "Loeb's theorem for extensible records";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vinyl-named-sugar" = callPackage
@@ -271166,8 +271166,8 @@ self: {
        sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h";
        libraryHaskellDepends = [ base vinyl ];
        description = "Syntax sugar for vinyl records using overloaded labels";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271182,8 +271182,8 @@ self: {
          base operational operational-extra vinyl-plus
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271203,8 +271203,8 @@ self: {
        ];
        testHaskellDepends = [ base doctest vinyl ];
        description = "Vinyl records utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271216,8 +271216,8 @@ self: {
        sha256 = "0lcpg2mxmr41lqpn5ksc35c0w16s45z6qq9wjbm0cv8r047k9bq5";
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        description = "Utilities for vinyl";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271236,8 +271236,8 @@ self: {
          text vector vinyl
        ];
        description = "Vectors for vinyl vectors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271257,8 +271257,8 @@ self: {
          safe split
        ];
        description = "Virtual Haskell Environment builder";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271270,8 +271270,8 @@ self: {
        sha256 = "0a1abwjg2c41xxmmn7dalvk2lfh1h76waj327dxzjsg0lkkjvhx4";
        libraryHaskellDepends = [ base containers ];
        description = "Simple computation of visibility polygons";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271293,8 +271293,8 @@ self: {
          xmms2-client xmms2-client-glib
        ];
        description = "An XMMS2 client";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271322,8 +271322,8 @@ self: {
          strict-concurrency svgcairo value-supply
        ];
        description = "Visualize the graph-rewrite steps of a Haskell program";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271342,8 +271342,8 @@ self: {
          process regexpr split uniplate
        ];
        description = "Create a visual profile of a program's source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271363,8 +271363,8 @@ self: {
          mtl optparse-applicative parsec template-haskell text
        ];
        description = "Visualize CBN reduction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271376,8 +271376,8 @@ self: {
        sha256 = "0f7rwww8gcfg6q0xq6z8c3010gx0vxr0v6yf143qxqjx02f93d1p";
        libraryHaskellDepends = [ base mtl profunctors ];
        description = "Profunctor optics via the profunctor representation theorem";
-       license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271399,7 +271399,7 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271413,7 +271413,7 @@ self: {
        testHaskellDepends = [ base bytestring cereal microspec time ];
        description = "Open Sound Control encode/decode";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271434,7 +271434,7 @@ self: {
        ];
        description = "Implementation of SuperCollider server specifications";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271452,8 +271452,8 @@ self: {
          resourcet text time xml-conduit xml-hamlet
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271468,7 +271468,7 @@ self: {
        libraryHaskellDepends = [ base bytestring process unix ];
        executableHaskellDepends = [ base bytestring process unix ];
        description = "Pseudo terminal interaction with subprocesses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vocabulary-kadma" = callPackage
@@ -271481,7 +271481,7 @@ self: {
        editedCabalFile = "0p70z83k5cg9yl91afks3ipvzv61nf5i7v0yqz59x1vdmml7fis0";
        libraryHaskellDepends = [ base smaoin ];
        description = "Smaoin vocabulary definitions of the base framework";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "voicebase" = callPackage
@@ -271505,8 +271505,8 @@ self: {
        ];
        testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
        description = "Upload audio files to voicebase to get a transcription";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271518,7 +271518,7 @@ self: {
        sha256 = "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk";
        libraryHaskellDepends = [ base ];
        description = "A Haskell 98 logically uninhabited data type";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vorbiscomment" = callPackage
@@ -271532,7 +271532,7 @@ self: {
          base binary-strict bytestring mtl utf8-string
        ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -271543,8 +271543,8 @@ self: {
        sha256 = "09z6nbsj4rqzhksk75glrsrmcs21p8x0jmcpqs6rc9iizz79db8g";
        libraryHaskellDepends = [ base bytestring ];
        description = "Vowpal Wabbit utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271556,8 +271556,8 @@ self: {
        sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff";
        libraryHaskellDepends = [ base bytestring process utf8-string ];
        description = "Haskell bindings for libvoyeur";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271574,8 +271574,8 @@ self: {
        libraryHaskellDepends = [ base primitive util vector ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Priority queue based on vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271592,7 +271592,7 @@ self: {
        executableHaskellDepends = [ base ];
        executableSystemDepends = [ quat vrpn ];
        description = "Bindings to VRPN";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {quat = null; inherit (pkgs) vrpn;};
 
   "vt-utils" = callPackage
@@ -271616,7 +271616,7 @@ self: {
          time transformers unordered-containers vector wai warp
        ];
        description = "Vector and Text utilities";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "vte" = callPackage
@@ -271633,8 +271633,8 @@ self: {
        libraryPkgconfigDepends = [ vte ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) vte;};
 
@@ -271652,8 +271652,8 @@ self: {
        libraryPkgconfigDepends = [ vte ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) vte;};
 
@@ -271689,7 +271689,7 @@ self: {
          utf8-string vector
        ];
        description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "vty-examples" = callPackage
@@ -271709,8 +271709,8 @@ self: {
          utf8-string vector vty
        ];
        description = "Examples programs using the vty library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271724,8 +271724,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base vty ];
        description = "A lib for displaying a menu and getting a selection using VTY";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271747,8 +271747,8 @@ self: {
        ];
        executableHaskellDepends = [ base QuickCheck random text vty ];
        description = "An interactive terminal user interface library for Vty";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271760,8 +271760,8 @@ self: {
        sha256 = "1c60bvhk1riilj7sl7x7nw4d9yg56f2k0ps1aivmjm0q4brhgnx7";
        libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        description = "Extra vty-ui functionality not included in the core library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271774,7 +271774,7 @@ self: {
        libraryHaskellDepends = [ base bytestring transformers vector ];
        libraryPkgconfigDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {vulkan = null;};
 
@@ -271786,8 +271786,8 @@ self: {
        sha256 = "1afnj053p3azm9wwdsr49w2s82k64lb0f12ak2g2v8vgidrjl7qk";
        libraryHaskellDepends = [ base ];
        description = "Low-level low-overhead vulkan api bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271809,7 +271809,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Utils for the vulkan package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "waargonaut" = callPackage
@@ -271847,8 +271847,8 @@ self: {
          zippers
        ];
        description = "JSON wrangling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271872,8 +271872,8 @@ self: {
          process select text udev unordered-containers vector X11 yaml
        ];
        description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271896,8 +271896,8 @@ self: {
          JuicyPixels
        ];
        description = "DOOM WAD file utilities";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271918,8 +271918,8 @@ self: {
          remote-monad scotty semigroups stm text wai-middleware-static
        ];
        description = "A haskell binding of the Web Audio API ala blank-canvas";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -271937,7 +271937,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Web Application Interface";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai_3_2_3" = callPackage
@@ -271954,8 +271954,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        testToolDepends = [ hspec-discover ];
        description = "Web Application Interface";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-accept-language" = callPackage
@@ -271975,7 +271975,7 @@ self: {
          base file-embed wai wai-app-static warp
        ];
        description = "Rewrite based on Accept-Language header";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-app-file-cgi" = callPackage
@@ -272002,7 +272002,7 @@ self: {
          hspec HTTP http-types unix wai warp
        ];
        description = "File/CGI/Rev Proxy App of WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-app-static" = callPackage
@@ -272037,7 +272037,7 @@ self: {
          unix-compat wai wai-extra zlib
        ];
        description = "WAI application for static serving";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-cli" = callPackage
@@ -272057,8 +272057,8 @@ self: {
          warp-tls
        ];
        description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272074,7 +272074,7 @@ self: {
          base bytestring conduit http-types transformers wai
        ];
        description = "conduit wrappers for WAI";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-control" = callPackage
@@ -272090,7 +272090,7 @@ self: {
          websockets
        ];
        description = "Run wai Applications in IO based monads";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-cors" = callPackage
@@ -272114,7 +272114,7 @@ self: {
          websockets
        ];
        description = "CORS for WAI";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-devel" = callPackage
@@ -272142,8 +272142,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec stm ];
        description = "A web server for the development of WAI compliant web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272161,7 +272161,7 @@ self: {
        ];
        description = "Helpers to bind digestive-functors onto wai requests";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-dispatch" = callPackage
@@ -272173,7 +272173,7 @@ self: {
        libraryHaskellDepends = [ base text wai yesod-routes ];
        description = "Nice wrapper around yesod-routes for use with WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-enforce-https" = callPackage
@@ -272194,7 +272194,7 @@ self: {
          base bytestring case-insensitive hspec http-types wai wai-extra
        ];
        description = "Enforce HTTPS in Wai server app safely";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-eventsource" = callPackage
@@ -272206,7 +272206,7 @@ self: {
        libraryHaskellDepends = [ wai ];
        doHaddock = false;
        description = "WAI support for server-sent events (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-extra" = callPackage
@@ -272236,7 +272236,7 @@ self: {
          zlib
        ];
        description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-extra_3_1_6" = callPackage
@@ -272266,8 +272266,8 @@ self: {
          zlib
        ];
        description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-feature-flags" = callPackage
@@ -272286,7 +272286,7 @@ self: {
        ];
        executableHaskellDepends = [ base wai warp ];
        description = "Feature flag support for WAI applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -272302,7 +272302,7 @@ self: {
          transformers wai
        ];
        description = "Run CGI apps on WAI";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-git-http" = callPackage
@@ -272325,8 +272325,8 @@ self: {
          warp
        ];
        description = "Git http-backend CGI App of WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272338,8 +272338,8 @@ self: {
        sha256 = "0a06yrakg9gwjjj4f9nr474j8i8xz642aj56m8vaq621i1kn7jaq";
        libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        description = "Graceful shutdown for WAI applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272360,8 +272360,8 @@ self: {
        ];
        executableHaskellDepends = [ cmdargs ];
        description = "WAI server that automatically reloads code after modification. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272374,8 +272374,8 @@ self: {
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        librarySystemDepends = [ fcgi ];
        description = "Wai handler to fastcgi";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) fcgi;};
 
@@ -272392,7 +272392,7 @@ self: {
          transformers wai warp
        ];
        description = "Launch a web app in the default browser";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-handler-scgi" = callPackage
@@ -272403,8 +272403,8 @@ self: {
        sha256 = "0h7d78d641bjsnmxsnz4b7s9pw4x0y0xi8bld51y4nqnbjl8gvac";
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        description = "Wai handler to SCGI (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272421,8 +272421,8 @@ self: {
          transformers wai
        ];
        description = "Web Application Interface handler using snap-server. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272435,8 +272435,8 @@ self: {
        libraryHaskellDepends = [ base wai warp ];
        libraryPkgconfigDepends = [ QtWebKit ];
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {QtWebKit = null;};
 
@@ -272453,7 +272453,7 @@ self: {
        ];
        description = "Nice wrapper around hastache for use with WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-hmac-auth" = callPackage
@@ -272475,8 +272475,8 @@ self: {
          wai-extra
        ];
        description = "hmac authentication tools for WAI apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272493,7 +272493,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "WAI utilities for HTTP/2";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-lambda" = callPackage
@@ -272518,7 +272518,7 @@ self: {
          wai
        ];
        description = "Haskell Webapps on AWS Lambda";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-lens" = callPackage
@@ -272533,8 +272533,8 @@ self: {
          base bytestring http-types lens network text vault wai
        ];
        description = "Lenses for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272550,8 +272550,8 @@ self: {
          base bytestring conduit http-types text transformers wai wai-extra
        ];
        description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272568,7 +272568,7 @@ self: {
          time uuid wai
        ];
        description = "A logging middleware for WAI applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-logger" = callPackage
@@ -272585,7 +272585,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-logger-buffered" = callPackage
@@ -272608,8 +272608,8 @@ self: {
          base bytestring containers data-default time wai
        ];
        description = "Buffer requets before logging them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272626,8 +272626,8 @@ self: {
          wai-logger
        ];
        description = "A logging system for preforked WAI apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272657,8 +272657,8 @@ self: {
          warp wreq
        ];
        description = "Compiling and serving assets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272695,7 +272695,7 @@ self: {
          time uri-bytestring wai wai-extra warp
        ];
        description = "Authentication middleware that secures WAI application";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-middleware-brotli" = callPackage
@@ -272721,8 +272721,8 @@ self: {
          tasty-hunit wai wai-extra
        ];
        description = "WAI middleware for brotli compression";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-middleware-cache" = callPackage
@@ -272743,8 +272743,8 @@ self: {
          test-framework-hunit wai wai-test
        ];
        description = "Caching middleware for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272763,8 +272763,8 @@ self: {
          wai-middleware-cache
        ];
        description = "Redis backend for wai-middleware-cache";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272780,7 +272780,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "WAI Middleware to cache things";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-caching-lru" = callPackage
@@ -272797,7 +272797,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-caching-redis" = callPackage
@@ -272814,7 +272814,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Cache Wai Middleware using Redis backend";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-catch" = callPackage
@@ -272827,8 +272827,8 @@ self: {
          base bytestring http-types lifted-base wai
        ];
        description = "Wai error catching middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272848,7 +272848,7 @@ self: {
          base base-compat-batteries http-types tasty tasty-wai wai
        ];
        description = "GNU Terry Pratchett - Add the X-Clacks-Overhead Header to Wai Responses";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-consul" = callPackage
@@ -272870,8 +272870,8 @@ self: {
          transformers void wai wai-conduit
        ];
        description = "Wai Middleware for Consul";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272904,8 +272904,8 @@ self: {
          wai-logger wai-transformers warp
        ];
        description = "Route to different middlewares based on the incoming Accept header";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272937,8 +272937,8 @@ self: {
          text transformers wai wai-app-static wai-extra warp
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272965,8 +272965,8 @@ self: {
          random resourcet text vault wai wai-conduit warp warp-tls
        ];
        description = "WAI middleware that delegates handling of requests";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -272984,8 +272984,8 @@ self: {
          http-types unix-compat unordered-containers wai
        ];
        description = "WAI ETag middleware for static files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273001,7 +273001,7 @@ self: {
          base bytestring http-types streaming-commons wai
        ];
        description = "WAI middleware to unzip request bodies";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "wai-middleware-headers" = callPackage
@@ -273012,8 +273012,8 @@ self: {
        sha256 = "10ap355j4dx42y7ycf1plpbg04wazv0q62mi3ibza8sb33hiiprh";
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "cors and addHeaders for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273036,7 +273036,7 @@ self: {
          regex-compat wai wai-extra
        ];
        description = "HMAC Authentication Middleware for WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-hmac-client" = callPackage
@@ -273056,8 +273056,8 @@ self: {
          word8
        ];
        description = "WAI HMAC Authentication Middleware Client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273076,7 +273076,7 @@ self: {
          aeson base binary bytestring http-types text wai
        ];
        description = "Converts errors from plaintext to json";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-metrics" = callPackage
@@ -273098,7 +273098,7 @@ self: {
          wai-extra
        ];
        description = "A WAI middleware to collect EKG request metrics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -273116,8 +273116,8 @@ self: {
          base Cabal directory mtl split text wai wai-middleware-static warp
        ];
        description = "WAI middleware for preprocessing static files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273135,7 +273135,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "WAI middlware for exposing http://prometheus.io metrics.";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "wai-middleware-rollbar" = callPackage
@@ -273151,8 +273151,8 @@ self: {
          rollbar-hs text time uuid wai
        ];
        description = "Middleware that communicates to Rollbar";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273173,8 +273173,8 @@ self: {
          test-framework-hunit text wai wai-test
        ];
        description = "Wai dispatch middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273196,7 +273196,7 @@ self: {
          time wai wai-extra
        ];
        description = "WAI Slack request verification middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-middleware-static" = callPackage
@@ -273223,7 +273223,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "WAI middleware that serves requests to static files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-static-caching" = callPackage
@@ -273241,8 +273241,8 @@ self: {
          unix wai
        ];
        description = "WAI middleware that serves requests to static files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273261,7 +273261,7 @@ self: {
          wai-extra
        ];
        description = "Serve embedded static files as a Wai middleware";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-throttle" = callPackage
@@ -273284,7 +273284,7 @@ self: {
          transformers wai wai-extra
        ];
        description = "WAI Middleware for Request Throttling";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-travisci" = callPackage
@@ -273302,8 +273302,8 @@ self: {
          transformers vault wai
        ];
        description = "WAI middleware for authenticating webhook payloads from Travis CI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273323,7 +273323,7 @@ self: {
          transformers-base unordered-containers wai wai-transformers
        ];
        description = "Route Wai middlewares based on HTTP verbs";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-predicates" = callPackage
@@ -273346,7 +273346,7 @@ self: {
        ];
        description = "WAI request predicates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-rate-limit" = callPackage
@@ -273357,7 +273357,7 @@ self: {
        sha256 = "1z7npcf0smzyfjvkmpa6dw08sg3ywx4cc4kafgxk95dh8yqnmidw";
        libraryHaskellDepends = [ base http-types wai ];
        description = "Rate limiting as WAI middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-rate-limit-redis" = callPackage
@@ -273374,8 +273374,8 @@ self: {
          wai wai-extra wai-rate-limit warp
        ];
        description = "Redis backend for rate limiting as WAI middleware";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273394,8 +273394,8 @@ self: {
          base bytestring criterion http-types text wai
        ];
        description = "Declarative request parsing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273407,8 +273407,8 @@ self: {
        sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va";
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "Response interface for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273431,7 +273431,7 @@ self: {
          unordered-containers wai
        ];
        description = "WAI middleware for path-based request routing with captures";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "wai-router" = callPackage
@@ -273442,8 +273442,8 @@ self: {
        sha256 = "1827mk64vyivdc12z4h230c4b993i6g8wl4sl0364jda586z58p7";
        libraryHaskellDepends = [ base text wai ];
        description = "Provides basic routing on URL paths for WAI";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273468,8 +273468,8 @@ self: {
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
        description = "Typesafe URLs for Wai applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273496,8 +273496,8 @@ self: {
          base criterion http-types wai wai-predicates
        ];
        description = "Declarative routing for WAI";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273516,7 +273516,7 @@ self: {
          x509 x509-store xml-conduit
        ];
        description = "SAML2 assertion validation as WAI middleware";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-secure-cookies" = callPackage
@@ -273539,8 +273539,8 @@ self: {
          base bytestring hspec hspec-expectations hspec-wai http-types wai
          wai-extra
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273559,7 +273559,7 @@ self: {
        ];
        description = "Flexible session middleware for WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-session-alt" = callPackage
@@ -273575,8 +273575,8 @@ self: {
          wai-transformers
        ];
        description = "An alternative session middleware for WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273594,7 +273594,7 @@ self: {
        ];
        description = "Session store based on clientsession";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-session-mysql" = callPackage
@@ -273614,8 +273614,8 @@ self: {
          base bytestring data-default mysql-simple text wai-session
        ];
        description = "MySQL backed Wai session store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273638,8 +273638,8 @@ self: {
          wai-session
        ];
        description = "PostgreSQL backed Wai session store";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273657,7 +273657,7 @@ self: {
        ];
        description = "Session store based on Tokyo Cabinet";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-slack-middleware" = callPackage
@@ -273669,7 +273669,7 @@ self: {
        libraryHaskellDepends = [ aeson base http-client http-types wai ];
        testHaskellDepends = [ base ];
        description = "A Slack middleware for WAI";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-static-cache" = callPackage
@@ -273688,8 +273688,8 @@ self: {
          vector-algorithms wai
        ];
        description = "A simple cache for serving static files in a WAI middleware";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273706,7 +273706,7 @@ self: {
          wai-extra
        ];
        description = "generate static html pages from a WAI application";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-test" = callPackage
@@ -273718,7 +273718,7 @@ self: {
        libraryHaskellDepends = [ wai ];
        doHaddock = false;
        description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wai-thrift" = callPackage
@@ -273733,8 +273733,8 @@ self: {
          base blaze-builder bytestring http-types thrift wai
        ];
        description = "Thrift transport layer for Wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273750,8 +273750,8 @@ self: {
          base bytestring containers http-types time wai
        ];
        description = "Wai middleware for request throttling";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273768,7 +273768,7 @@ self: {
          base exceptions extractable-singleton monad-control-aligned
          transformers wai wai-websockets websockets
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wai-util" = callPackage
@@ -273786,7 +273786,7 @@ self: {
        ];
        description = "Collection of utility functions for use with WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-websockets" = callPackage
@@ -273809,7 +273809,7 @@ self: {
          transformers wai wai-app-static warp websockets
        ];
        description = "Provide a bridge between WAI and the websockets package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wait-handle" = callPackage
@@ -273820,7 +273820,7 @@ self: {
        sha256 = "09080zx6m4lqli85867ilck82gvgnz4vkq9nxx5f1v5fli1i0n7m";
        libraryHaskellDepends = [ base ];
        description = "Wait handles are MVars which can only be written to once, and from which values can never be removed";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "waitfree" = callPackage
@@ -273831,8 +273831,8 @@ self: {
        sha256 = "09hlqli7zpcxfa8w7vh937gc3rxp7s8q8v1zs8ciwnmh6ca4i8rq";
        libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273857,8 +273857,8 @@ self: {
          aeson base http-types tasty tasty-hunit wai wai-extra
        ];
        description = "A very simple Wai router";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273877,7 +273877,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Functions to manipulate records";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "waldo" = callPackage
@@ -273909,8 +273909,8 @@ self: {
          warp zlib-conduit
        ];
        description = "A generator of comics based on some ascertainable data about the requester";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273932,8 +273932,8 @@ self: {
        executableHaskellDepends = [ base JuicyPixels yaml ];
        testHaskellDepends = [ base ];
        description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -273962,7 +273962,7 @@ self: {
          pipes-zlib text time transformers
        ];
        description = "A parser for the Web Archive (WARC) format";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "warp" = callPackage
@@ -273995,7 +273995,7 @@ self: {
          http-types network time-manager unix unix-compat x509
        ];
        description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -274011,8 +274011,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Dynamic configurable warp HTTP server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274030,7 +274030,7 @@ self: {
          http2-grpc-types unliftio-core wai warp warp-tls
        ];
        description = "A minimal gRPC server on top of Warp";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "warp-static" = callPackage
@@ -274050,8 +274050,8 @@ self: {
          wai-app-static wai-extra warp
        ];
        description = "Static file server based on Warp and wai-app-static (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274063,8 +274063,8 @@ self: {
        sha256 = "1gi9xkaa3wi5n2vhmlc7s4zm48l2fakwnd7bw007hzfqi17zz13x";
        libraryHaskellDepends = [ base network systemd unix wai warp ];
        description = "Socket activation and other systemd integration for the Warp web server (WAI)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274081,7 +274081,7 @@ self: {
          streaming-commons tls tls-session-manager wai warp
        ];
        description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -274101,7 +274101,7 @@ self: {
          warp warp-tls x509
        ];
        description = "set group and user id before running server";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "warped" = callPackage
@@ -274118,8 +274118,8 @@ self: {
          monad-control preamble uuid wai wai-conduit wai-cors warp
        ];
        description = "Warp and Wai Library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274148,8 +274148,8 @@ self: {
        ];
        testToolDepends = [ alex happy ];
        description = "WebAssembly Language Toolkit and Interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274163,8 +274163,8 @@ self: {
        editedCabalFile = "1hmjlva0pbvbbl3vcngqlqrisx32qzlc9pl96zh2rb6m25riisdg";
        libraryHaskellDepends = [ base mtl time ];
        description = "Simple control structure to re-try an action with exponential backoff";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274181,8 +274181,8 @@ self: {
          system-filepath
        ];
        description = "Opinionated filesystem watcher";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274211,8 +274211,8 @@ self: {
          system-filepath tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "File change watching utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274226,7 +274226,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath process ];
        description = "Command-line tool for converting audio files and filling in ID3 tags";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wave" = callPackage
@@ -274248,7 +274248,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Work with WAVE and RF64 files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wavefront" = callPackage
@@ -274263,8 +274263,8 @@ self: {
          attoparsec base dlist filepath mtl text transformers vector
        ];
        description = "Wavefront OBJ loader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274283,8 +274283,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec linear ];
        description = "Wavefront .obj file loader";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274301,8 +274301,8 @@ self: {
          delimited-text
        ];
        description = "Parse WaveSurfer files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274323,8 +274323,8 @@ self: {
          base bytestring filepath pretty-show split vector
        ];
        description = "Process WAVE files in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274338,7 +274338,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        description = "Native wcwidth";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "weak-bag" = callPackage
@@ -274349,8 +274349,8 @@ self: {
        sha256 = "0jh5xv02wlifjqdvm2cr9mi3wjj4f14s1ap5pphin2rdzklhl3rc";
        libraryHaskellDepends = [ base containers ];
        description = "Mutable bag backed by weak pointers to each item";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274367,8 +274367,8 @@ self: {
          utf8-string vector
        ];
        description = "Weather API implemented in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274381,7 +274381,7 @@ self: {
        libraryHaskellDepends = [ base gtk webkit ];
        description = "Web Browser In Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "web-css" = callPackage
@@ -274392,8 +274392,8 @@ self: {
        sha256 = "1havyvd6f0xagynxpar2jsmx5x1izwl7wgxia0wbwbzaj0fzn2k2";
        libraryHaskellDepends = [ base text ];
        description = "Simple functions for CSS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274411,8 +274411,8 @@ self: {
          base bytestring directory failure old-locale text time
        ];
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274428,7 +274428,7 @@ self: {
          base happstack-server safe snap snap-core snap-server
        ];
        description = "Wrappers for web frameworks to ease usage with the FP Complete environment";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "web-inv-route" = callPackage
@@ -274448,7 +274448,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring HUnit network-uri text ];
        description = "Composable, reversible, efficient web routing using invertible invariants and bijections";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -274466,8 +274466,8 @@ self: {
          zeromq-haskell
        ];
        description = "Bindings for the Mongrel2 web server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274486,8 +274486,8 @@ self: {
          base directory filepath open-browser temporary text
        ];
        description = "Library to present content to an user via their browser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274507,8 +274507,8 @@ self: {
          lens mtl Stream text vector wl-pprint-text
        ];
        description = "Monoidally construct web pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274524,7 +274524,7 @@ self: {
          base binary bytestring containers http-types mtl stm text
        ];
        description = "dynamic plugin system for web applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-push" = callPackage
@@ -274545,8 +274545,8 @@ self: {
          base base64-bytestring binary bytestring hspec
        ];
        description = "Send messages using Web Push protocol";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274576,8 +274576,8 @@ self: {
          base doctest lens lucid numhask tasty tasty-hspec text
        ];
        description = "representations of a web page";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274596,7 +274596,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-boomerang" = callPackage
@@ -274609,7 +274609,7 @@ self: {
          base boomerang mtl parsec text web-routes
        ];
        description = "Use boomerang for type-safe URL parsers/printers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-generics" = callPackage
@@ -274620,7 +274620,7 @@ self: {
        sha256 = "16nykkzjznl9zq2qgn87lpqxkz8yx83s7949lv4vzapp4hjv04yy";
        libraryHaskellDepends = [ base parsec text web-routes ];
        description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-happstack" = callPackage
@@ -274635,7 +274635,7 @@ self: {
          base bytestring happstack-server text web-routes
        ];
        description = "Adds support for using web-routes with Happstack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-hsp" = callPackage
@@ -274646,7 +274646,7 @@ self: {
        sha256 = "1arc22l7xk49fp80i1fkvj8xj71lqxrs2g5gnvjzwlkc0azzaz6a";
        libraryHaskellDepends = [ base hsp text web-routes ];
        description = "Adds XMLGenerator instance for RouteT monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-mtl" = callPackage
@@ -274657,7 +274657,7 @@ self: {
        sha256 = "1k35ch294p2pkf7mbip8wy9rin956y31sq68b4cdrj9sj9891rx5";
        libraryHaskellDepends = [ base web-routes ];
        description = "Extends web-routes with mtl-based MonadIO / MonadTrans RouteT instances";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-quasi" = callPackage
@@ -274670,8 +274670,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274683,8 +274683,8 @@ self: {
        sha256 = "0fysbzdal8sl8pk4sj7i9cma351r0m9lry5pi3ra7fn0czcajajy";
        libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274701,7 +274701,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ];
        description = "Support for deriving PathInfo using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routes-transformers" = callPackage
@@ -274712,8 +274712,8 @@ self: {
        sha256 = "0pm1v9wqlzi6cg92lajbwbnhsdm509371i8mvyvvj6qa5m58cdib";
        libraryHaskellDepends = [ base transformers web-routes ];
        description = "Extends web-routes with some transformers instances for RouteT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274729,7 +274729,7 @@ self: {
          base bytestring http-types text wai web-routes
        ];
        description = "Library for maintaining correctness of URLs within an application";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "web-routing" = callPackage
@@ -274748,8 +274748,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "simple routing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274789,8 +274789,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Web3 API for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274817,8 +274817,8 @@ self: {
          http-types QuickCheck text time vector wai wai-extra warp
        ];
        description = "WAI based library for web api";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274841,8 +274841,8 @@ self: {
          base hspec http-types network text transformers wai
        ];
        description = "Haskell web app framework based on WAI & Warp";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274862,8 +274862,8 @@ self: {
          hashable memory serialise text x509 x509-validation
        ];
        description = "Web Authentication API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274888,7 +274888,7 @@ self: {
          unliftio-core unordered-containers wai
        ];
        description = "A super-simple web server framework";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "webcloud" = callPackage
@@ -274904,8 +274904,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Turn an optparse-applicative program into a CGI program!";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274933,8 +274933,8 @@ self: {
          unordered-containers
        ];
        description = "Webmachine inspired toolkit for building http applications and services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274950,8 +274950,8 @@ self: {
          base hvect mtl path-pieces reroute text unordered-containers
        ];
        description = "A simple request dispatcher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274969,8 +274969,8 @@ self: {
          unordered-containers wai wai-lens webcrank webcrank-dispatch
        ];
        description = "Build a WAI Application from Webcrank Resources";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -274994,7 +274994,7 @@ self: {
          transformers-base unordered-containers vector zip-archive
        ];
        description = "a Haskell client for the Selenium WebDriver protocol";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "webdriver-angular" = callPackage
@@ -275015,8 +275015,8 @@ self: {
          webdriver
        ];
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275043,8 +275043,8 @@ self: {
        ];
        testHaskellDepends = [ base parallel text ];
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275080,8 +275080,8 @@ self: {
          transformers unordered-containers vector wreq
        ];
        description = "Bindings to the WebDriver API";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275111,7 +275111,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "A Haskell bindings for Webex Teams API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webex-teams-conduit" = callPackage
@@ -275137,7 +275137,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Conduit wrapper of Webex Teams List API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webex-teams-pipes" = callPackage
@@ -275163,7 +275163,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Pipes wrapper of Webex Teams List API";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webfinger-client" = callPackage
@@ -275181,8 +275181,8 @@ self: {
          uri-bytestring
        ];
        description = "WebFinger client library";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275209,7 +275209,7 @@ self: {
          template-haskell text unordered-containers wai
        ];
        description = "Composable, type-safe library to build HTTP API servers";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "webidl" = callPackage
@@ -275229,8 +275229,8 @@ self: {
          base bytestring HSFFIG LEXER parsec pretty utf8-env utf8-string
        ];
        description = "Parser and Pretty Printer for the Web IDL Language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {LEXER = null;};
 
@@ -275250,7 +275250,7 @@ self: {
          filepath hopfli optparse-applicative text vector xmlgen zlib
        ];
        description = "webfont generator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webkit" = callPackage
@@ -275269,8 +275269,8 @@ self: {
        libraryPkgconfigDepends = [ webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Webkit library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {webkit = null;};
 
   "webkit-javascriptcore" = callPackage
@@ -275283,8 +275283,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {webkit = null;};
 
@@ -275298,7 +275298,7 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) webkitgtk;};
 
   "webkitgtk3" = callPackage
@@ -275318,8 +275318,8 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Webkit library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "webkitgtk3-javascriptcore" = callPackage
@@ -275333,8 +275333,8 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        description = "JavaScriptCore FFI from webkitgtk";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "webp" = callPackage
@@ -275354,7 +275354,7 @@ self: {
          base bytestring JuicyPixels tasty tasty-hunit
        ];
        description = "JuicyPixels support for WebP format";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {inherit (pkgs) libwebp;};
 
   "webpage" = callPackage
@@ -275367,7 +275367,7 @@ self: {
          base blaze-html data-default lucid text
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "webrtc-vad" = callPackage
@@ -275378,7 +275378,7 @@ self: {
        sha256 = "0lylc3axcamrmjaarx3aacbjc9d0rkhmdgq1g2pc5j0lsf8ndk49";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Easy voice activity detection";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "webserver" = callPackage
@@ -275395,8 +275395,8 @@ self: {
          old-locale parsec process stm time unix zlib
        ];
        description = "HTTP server library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275416,8 +275416,8 @@ self: {
          optparse-applicative optparse-simple pretty-show text wai warp
        ];
        description = "Show programming language printed values in a web UI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275431,8 +275431,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base filepath gtk webkit ];
        description = "Transforms URLs to PNGs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "websockets" = callPackage
@@ -275466,7 +275466,7 @@ self: {
        ];
        doCheck = false;
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "websockets-rpc" = callPackage
@@ -275493,8 +275493,8 @@ self: {
          wai-transformers websockets websockets-simple
        ];
        description = "Simple streaming RPC mechanism using WebSockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275519,7 +275519,7 @@ self: {
          transformers wai-transformers websockets
        ];
        description = "Composable websockets clients";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "websockets-simple-extra" = callPackage
@@ -275529,7 +275529,7 @@ self: {
        version = "0.0.0";
        sha256 = "1ckni1imxh4k1nxivvj9p1mffzvdmyjc20nas8b90dkkxblgnk1j";
        libraryHaskellDepends = [ base mtl websockets-simple ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "websockets-snap" = callPackage
@@ -275545,7 +275545,7 @@ self: {
          snap-server websockets
        ];
        description = "Snap integration for the websockets library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "webwire" = callPackage
@@ -275565,8 +275565,8 @@ self: {
          wai-extra
        ];
        description = "Functional reactive web framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275580,7 +275580,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        description = "a wedding announcement";
-       license = stdenv.lib.licenses.publicDomain;
+       license = lib.licenses.publicDomain;
      }) {};
 
   "wedged" = callPackage
@@ -275599,7 +275599,7 @@ self: {
        ];
        description = "Wedged postcard generator";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "weeder" = callPackage
@@ -275623,7 +275623,7 @@ self: {
          optparse-applicative transformers
        ];
        description = "Detect dead code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "weekdaze" = callPackage
@@ -275653,7 +275653,7 @@ self: {
        ];
        description = "A school-timetable problem-solver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275669,7 +275669,7 @@ self: {
        ];
        testHaskellDepends = [ base deepseq ];
        description = "Measure allocations of a Haskell functions/values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "weighted" = callPackage
@@ -275680,8 +275680,8 @@ self: {
        sha256 = "1xizw6509rwj3l75haxl8sgdbd5mailj14d6qgy77r83g9qr6p8s";
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
        description = "Writer monad which uses semiring constraint";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275696,8 +275696,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
        description = "Weighted Regular Expression Matcher";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275709,7 +275709,7 @@ self: {
        sha256 = "1va2b10g3h2wfl9d7f27d55z5c93fvz41sb023l4c2ym1w9kw8zv";
        libraryHaskellDepends = [ base ];
        description = "A weighted nondeterministic search monad";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "welshy" = callPackage
@@ -275728,8 +275728,8 @@ self: {
          resourcet text transformers unordered-containers wai warp
        ];
        description = "Haskell web framework (because Scotty had trouble yodeling)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275747,7 +275747,7 @@ self: {
          base bytestring filemanip filepath optparse-applicative split
        ];
        description = "Pretty-printing of codebases";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "werewolf" = callPackage
@@ -275771,8 +275771,8 @@ self: {
          optparse-applicative random-shuffle text transformers
        ];
        description = "A game engine for playing werewolf within an arbitrary chat client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275792,8 +275792,8 @@ self: {
          mtl optparse-applicative process text wai warp werewolf
        ];
        description = "A chat interface for playing werewolf in Slack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275830,8 +275830,8 @@ self: {
          tasty-quickcheck text transformers versions
        ];
        description = "Solver-agnostic symbolic values support for issuing queries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275843,8 +275843,8 @@ self: {
        sha256 = "1xxks0jxjwph7372jqnscm6z0b28zz3dvb49b2aw37jmnvwrfdcy";
        libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        description = "MongoDB plugin for Wheb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275856,8 +275856,8 @@ self: {
        sha256 = "025chjp41qbjr9m6c3pd9v510h4aac1rvbyrki3c7617sca8a45h";
        libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        description = "Redis connection for Wheb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275869,8 +275869,8 @@ self: {
        sha256 = "1wykpp325336kk7a1vnnjffankcw0kaw3jcfin53cp8hsx4bwfdp";
        libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        description = "Strapped templates for Wheb";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275882,7 +275882,7 @@ self: {
        sha256 = "1c1l79bdpqfg4n3p5gkc3x362m9k11hmyydr2y3j0xs4hhm3d5aa";
        libraryHaskellDepends = [ base shelly template-haskell text ];
        description = "Determine the full path to an executable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "while-lang-parser" = callPackage
@@ -275893,8 +275893,8 @@ self: {
        sha256 = "0dlq2rldak4lb0w8hcx7aigdj7b59crp1k130p36cha7zpqdixll";
        libraryHaskellDepends = [ base indents parsec ];
        description = "Parser for the While language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275913,8 +275913,8 @@ self: {
          base containers GLUT mtl OpenGL process random X11
        ];
        description = "A Haskell window manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275926,8 +275926,8 @@ self: {
        sha256 = "0kbyv0q6z2d2plblafqcmwcfiyhdbijqnqg2w7qxr7dklka8245v";
        libraryHaskellDepends = [ base parsec template-haskell ];
        description = "Mustache templates with Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275943,7 +275943,7 @@ self: {
        executableHaskellDepends = [ haskell98 random ];
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275957,8 +275957,8 @@ self: {
        editedCabalFile = "07jpszzhzfygz920y09j4xrkw6pgwbpxqn79lavzz0w6jpd447y1";
        libraryHaskellDepends = [ base network network-uri split ];
        description = "WHOIS client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -275975,7 +275975,7 @@ self: {
          base cairo colour directory hsnoise MonadRandom mtl random
          random-fu random-shuffle random-source relude temporary time
        ];
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "why3" = callPackage
@@ -275993,8 +275993,8 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        description = "Haskell support for the Why3 input format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276012,8 +276012,8 @@ self: {
          quickcheck-classes semirings
        ];
        description = "Data types for large but fixed width signed and unsigned integers";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276031,7 +276031,7 @@ self: {
          base criterion primitive random vector
        ];
        description = "CG coefficients and Wigner symbols";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wigner-ville-accelerate" = callPackage
@@ -276043,8 +276043,8 @@ self: {
        libraryHaskellDepends = [ accelerate accelerate-fft base ];
        testHaskellDepends = [ base wigner ];
        description = "Wigner-ville transform using the Accelerate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {wigner = null;};
 
@@ -276061,7 +276061,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring filepath hspec time ];
        description = "Scrape WikiCFP web site";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wikipedia4epub" = callPackage
@@ -276080,8 +276080,8 @@ self: {
          regex-base regex-posix tagsoup url xml zip-archive zlib
        ];
        description = "Wikipedia EPUB E-Book construction from Firefox history";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276100,7 +276100,7 @@ self: {
          base hspec microlens QuickCheck stm transformers
        ];
        description = "Dynamic key binding framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wild-bind-indicator" = callPackage
@@ -276117,8 +276117,8 @@ self: {
          wild-bind
        ];
        description = "Graphical indicator for WildBind";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276135,8 +276135,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Task to install and export everything you need to use WildBind in X11";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276156,7 +276156,7 @@ self: {
          async base hspec text time transformers wild-bind X11
        ];
        description = "X11-specific implementation for WildBind";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wilton-ffi" = callPackage
@@ -276167,7 +276167,7 @@ self: {
        sha256 = "1kpr1rg3nbvjvj29pa4b8ls52x0j6ixidnh6nm2jw3c2gplhmr5d";
        libraryHaskellDepends = [ aeson base bytestring utf8-string ];
        description = "Haskell modules support for Wilton JavaScript runtime";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "win-hp-path" = callPackage
@@ -276181,7 +276181,7 @@ self: {
        libraryHaskellDepends = [ base split ];
        executableHaskellDepends = [ base process split ];
        description = "Work with multiple Haskell Platform versions on Windows";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "windns" = callPackage
@@ -276195,8 +276195,8 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ dnsapi ];
        description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {dnsapi = null;};
 
@@ -276214,8 +276214,8 @@ self: {
          base Crypto dataenc mtl network parsec pretty split time urlencoded
        ];
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276227,8 +276227,8 @@ self: {
        sha256 = "0xamx4yhyv264mka4ypp0r1xh3xv7ba31sis3lbhjycn4i07wlhd";
        doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276266,8 +276266,8 @@ self: {
          serialise store text vector
        ];
        description = "A compact, well-typed seralisation format for Haskell values";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276284,8 +276284,8 @@ self: {
        ];
        librarySystemDepends = [ kernel32 ws2_32 ];
        description = "I/O library for Windows";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {kernel32 = null; ws2_32 = null;};
 
@@ -276311,7 +276311,7 @@ self: {
          criterion io-streams transformers
        ];
        description = "Fast binary io-streams adapter";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wires" = callPackage
@@ -276328,8 +276328,8 @@ self: {
          base deepseq mtl profunctors semigroupoids these
        ];
        description = "Functional reactive programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276346,8 +276346,8 @@ self: {
          base hspec mtl QuickCheck template-haskell transformers
        ];
        description = "Wiring, promotion and demotion of types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276362,7 +276362,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        description = "Access GPIO pins on Raspberry Pi via wiringPi library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "witch" = callPackage
@@ -276378,7 +276378,7 @@ self: {
          base bytestring containers hspec QuickCheck text
        ];
        description = "Convert values from one type into another";
-       license = stdenv.lib.licenses.isc;
+       license = lib.licenses.isc;
      }) {};
 
   "with-index" = callPackage
@@ -276389,7 +276389,7 @@ self: {
        sha256 = "0dv81mp66l0j0dfa0mm9vqmdfxvhfg5py1gxqwh1jvpr8iks1q8q";
        libraryHaskellDepends = [ base ];
        description = "A tiny library for composing indexed traversals";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "with-location" = callPackage
@@ -276401,7 +276401,7 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Use ImplicitParams-based source locations in a backward compatible way";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "with-utf8" = callPackage
@@ -276425,7 +276425,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "Get your IO right on the first try";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "withdependencies" = callPackage
@@ -276441,7 +276441,7 @@ self: {
        ];
        testHaskellDepends = [ base conduit hspec HUnit mtl ];
        description = "Run computations that depend on one or more elements in a stream";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "witherable" = callPackage
@@ -276464,7 +276464,7 @@ self: {
          tasty-quickcheck transformers unordered-containers vector
        ];
        description = "filterable traversable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "witherable-class" = callPackage
@@ -276480,7 +276480,7 @@ self: {
          unordered-containers vector
        ];
        description = "Witherable = Traversable + Filterable";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "witherable-class_0_0_1" = callPackage
@@ -276491,8 +276491,8 @@ self: {
        sha256 = "0995ixa9yzym7fsrgj77j0lyz7y5nnbkn0m2ndxdc401viyhkigd";
        libraryHaskellDepends = [ base witherable ];
        description = "Witherable = Traversable + Filterable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "within" = callPackage
@@ -276507,7 +276507,7 @@ self: {
          base comonad exceptions free hashable path path-like
        ];
        description = "A value within another path";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "witness" = callPackage
@@ -276522,7 +276522,7 @@ self: {
          base constraints countable semigroupoids transformers
        ];
        description = "values that witness types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "witty" = callPackage
@@ -276535,8 +276535,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network unix ];
        description = "A network server to show bottlenecks of GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276548,7 +276548,7 @@ self: {
        sha256 = "0bldcvd7zjask8myh1nwj59ml4q6wlinp2h7q6hdfjg8djf2mnca";
        libraryHaskellDepends = [ base transformers ];
        description = "the fantastical wizard monoid";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wizards" = callPackage
@@ -276565,7 +276565,7 @@ self: {
          base containers control-monad-free haskeline mtl transformers
        ];
        description = "High level, generic library for interrogative user interfaces";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wkt" = callPackage
@@ -276583,8 +276583,8 @@ self: {
          base filepath lens linear tasty tasty-golden trifecta
        ];
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276608,8 +276608,8 @@ self: {
          scientific trifecta vector
        ];
        description = "A parser of WKT, WKB and eWKB";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276621,7 +276621,7 @@ self: {
        sha256 = "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c";
        libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wl-pprint-annotated" = callPackage
@@ -276637,7 +276637,7 @@ self: {
          base containers deepseq tasty tasty-hunit text
        ];
        description = "Pretty printer with annotation support";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wl-pprint-ansiterm" = callPackage
@@ -276653,8 +276653,8 @@ self: {
          transformers wl-pprint-extras
        ];
        description = "ANSI Terminal support with wl-pprint-extras";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276670,7 +276670,7 @@ self: {
          base bytestring colorful-monoids text wl-pprint-annotated
        ];
        description = "Wadler/Leijen pretty printer supporting colorful console output";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wl-pprint-extras" = callPackage
@@ -276689,8 +276689,8 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        description = "A free monad based on the Wadler/Leijen pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276708,8 +276708,8 @@ self: {
          transformers wl-pprint-extras
        ];
        description = "A color pretty printer with terminfo support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276721,7 +276721,7 @@ self: {
        sha256 = "030ckgzz14sv2c317g4j5g68hyq9xi40cmv0apwclw6sc6xgsvly";
        libraryHaskellDepends = [ base base-compat text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wlc-hs" = callPackage
@@ -276739,8 +276739,8 @@ self: {
        librarySystemDepends = [ wlc ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for the wlc library";
-       license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {wlc = null;};
 
@@ -276776,8 +276776,8 @@ self: {
          safe system-fileio system-filepath text transformers
        ];
        description = "A simple and highly performant HTTP file server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276789,8 +276789,8 @@ self: {
        sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b";
        libraryHaskellDepends = [ base ];
        description = "Convenient typeclass for defining arbitrary-index enums";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276806,8 +276806,8 @@ self: {
          base binary bytestring filepath zlib
        ];
        description = "Web Open Font Format (WOFF) unpacker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276822,8 +276822,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network split ];
        executableHaskellDepends = [ base ];
        description = "Send a Wake on LAN Magic Packet";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276846,8 +276846,8 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-generic ];
        description = "Amazon Simple Workflow Service Wrapper";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276860,7 +276860,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        description = "Real time group editor without operational transform";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "word" = callPackage
@@ -276878,8 +276878,8 @@ self: {
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Words of arbitrary size";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276894,7 +276894,7 @@ self: {
        libraryHaskellDepends = [ base binary containers ];
        testHaskellDepends = [ base binary containers hspec QuickCheck ];
        description = "Implementation of a finite trie over words";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "word-vector" = callPackage
@@ -276905,7 +276905,7 @@ self: {
        sha256 = "1fkbxrr7qh6dj9w7wihxjvb3d8kgcymz0zp8avnqpx5jsvwd5jdm";
        libraryHaskellDepends = [ base bytestring ghc-prim vector ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "word-wrap" = callPackage
@@ -276920,7 +276920,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "A library for word-wrapping";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "word24" = callPackage
@@ -276937,7 +276937,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "24-bit word and int types for GHC";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "word2vec-model" = callPackage
@@ -276964,8 +276964,8 @@ self: {
          unordered-containers vector
        ];
        description = "Reading word2vec binary models";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -276979,7 +276979,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Word8 library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wordchoice" = callPackage
@@ -277005,8 +277005,8 @@ self: {
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion pandoc text ];
        description = "Get word counts and distributions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277018,7 +277018,7 @@ self: {
        sha256 = "1jdcv5h41k5xckviyc0p0k0q68s371llcvmkdbg78vh4b3xw7cd5";
        doHaddock = false;
        description = "None";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wordexp" = callPackage
@@ -277030,7 +277030,7 @@ self: {
        libraryHaskellDepends = [ array base semigroups ];
        libraryToolDepends = [ c2hs ];
        description = "wordexp(3) wrappers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wordify" = callPackage
@@ -277059,8 +277059,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
          unordered-containers
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277079,8 +277079,8 @@ self: {
          base MonadRandom optparse-applicative text vector
        ];
        description = "Command-line tool to get random words";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277101,7 +277101,7 @@ self: {
        benchmarkHaskellDepends = [ base deepseq gauge OddWord weigh ];
        doHaddock = false;
        description = "arbitrary bit size Words";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wordpass" = callPackage
@@ -277123,8 +277123,8 @@ self: {
          QuickCheck text unix-compat vector
        ];
        description = "Dictionary-based password generator";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277143,7 +277143,7 @@ self: {
          uri-encode
        ];
        description = "Validate Wordpress Cookies & Nonces; Build Wordpress Hashes & Salts";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "words" = callPackage
@@ -277155,7 +277155,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory text ];
        description = "Cross-platform access to a list of words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wordsearch" = callPackage
@@ -277169,8 +277169,8 @@ self: {
        libraryHaskellDepends = [ array base containers fclabels ];
        executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277189,7 +277189,7 @@ self: {
          process
        ];
        description = "Compare two files as sets of N-tuples of words";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "work-time" = callPackage
@@ -277203,8 +277203,8 @@ self: {
        libraryHaskellDepends = [ base containers megaparsec text ];
        executableHaskellDepends = [ base text ];
        description = "A library for parsing a chat-based work hour reporting scheme";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277217,8 +277217,8 @@ self: {
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Workday calculations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277241,8 +277241,8 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277262,8 +277262,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277286,8 +277286,8 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "manipulate `workflow-types:Workflow`'s";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277306,8 +277306,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277322,8 +277322,8 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        description = "Automate keyboard/mouse/clipboard/application interaction";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277340,7 +277340,7 @@ self: {
          base doctest Glob should-not-typecheck tasty tasty-hunit text
        ];
        description = "Open Union and Open Product Types";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "worldturtle" = callPackage
@@ -277351,7 +277351,7 @@ self: {
        sha256 = "0h5r74ba0wjhyp8yl3clxgq5yfdr51fdkfn2xz4ahizxycyrx14f";
        libraryHaskellDepends = [ base containers gloss lens matrix mtl ];
        description = "Turtle graphics";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wp-archivebot" = callPackage
@@ -277366,8 +277366,8 @@ self: {
          base feed HTTP network parallel tagsoup
        ];
        description = "Subscribe to a wiki's RSS feed and archive external links";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277379,7 +277379,7 @@ self: {
        sha256 = "03pmfwwx2ykjglzrc4k09q2lv8piq107j32dg0r1aadj2ysc9fzq";
        libraryHaskellDepends = [ base ];
        description = "Wrap a function's return value with another function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wraparound" = callPackage
@@ -277390,7 +277390,7 @@ self: {
        sha256 = "161mz5bfmx13s9azh3dss64fw98vbaab8krysr9pbbp9dh79i1cf";
        libraryHaskellDepends = [ base ];
        description = "Convenient handling of points on a seamless 2-dimensional plane";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wraxml" = callPackage
@@ -277411,7 +277411,7 @@ self: {
        ];
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277450,8 +277450,8 @@ self: {
          optparse-applicative transformers wreq
        ];
        description = "An HTTP Performance Benchmarker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277484,8 +277484,8 @@ self: {
          resourcet scotty stm temporary text time transformers wai-cors
        ];
        description = "A web interface for Wrecker, the HTTP Performance Benchmarker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277526,7 +277526,7 @@ self: {
          transformers unix-compat unordered-containers uuid vector
        ];
        description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wreq-helper" = callPackage
@@ -277541,7 +277541,7 @@ self: {
          aeson aeson-result base bytestring http-client lens text wreq
        ];
        description = "Wreq response process";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wreq-patchable" = callPackage
@@ -277579,8 +277579,8 @@ self: {
          transformers unix-compat unordered-containers uuid vector
        ];
        description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277618,8 +277618,8 @@ self: {
          transformers unix-compat uuid vector
        ];
        description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277631,7 +277631,7 @@ self: {
        sha256 = "0dgjjybbc4nza1a0af2j8jxscyhlcwdspmvy8zsmcczzcdhx2b2h";
        libraryHaskellDepends = [ base bytestring text utf8-string wreq ];
        description = "Simple wrapper to use wreq without Strings";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wright" = callPackage
@@ -277648,8 +277648,8 @@ self: {
          assertions base bed-and-breakfast containers filepath lens
        ];
        description = "Colour space transformations and metrics";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277666,7 +277666,7 @@ self: {
          monad-control mtl stm stm-chans
        ];
        description = "Buffer your writes, transparently";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "write-buffer-stm" = callPackage
@@ -277677,7 +277677,7 @@ self: {
        sha256 = "0q03pnkw3343jmcs2f2mrx84g3wj3plcagnjdviphzsg7rrf3a4l";
        libraryHaskellDepends = [ base stm stm-chans write-buffer-core ];
        description = "A write buffer for STM channels and queues";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "writer-cps-exceptions" = callPackage
@@ -277692,7 +277692,7 @@ self: {
          base exceptions transformers writer-cps-transformers
        ];
        description = "Control.Monad.Catch instances for the stricter CPS WriterT and RWST";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "writer-cps-full" = callPackage
@@ -277710,8 +277710,8 @@ self: {
          writer-cps-transformers
        ];
        description = "WriteT and RWST monad transformers (Reexport with all dependencies)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277728,8 +277728,8 @@ self: {
          writer-cps-transformers
        ];
        description = "Lens instances for the stricter CPS WriterT and RWST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277745,8 +277745,8 @@ self: {
          base monads-tf transformers writer-cps-transformers
        ];
        description = "MonadWriter orphan instances for writer-cps-transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277760,8 +277760,8 @@ self: {
        editedCabalFile = "0dqpbpaidwa7ahk0n7pv397mv7ncr26p3vcrjh1xzl6vk26bdah5";
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
        description = "MFunctor instance for CPS style WriterT and RWST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277776,7 +277776,7 @@ self: {
          base mtl transformers writer-cps-transformers
        ];
        description = "MonadWriter orphan instances for writer-cps-transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "writer-cps-transformers" = callPackage
@@ -277788,7 +277788,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        doHaddock = false;
        description = "WriteT and RWST monad transformers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wryte" = callPackage
@@ -277800,7 +277800,7 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base ];
        description = "Pretty output for source generators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ws" = callPackage
@@ -277824,8 +277824,8 @@ self: {
          websockets wuss
        ];
        description = "A simple CLI utility for interacting with a websocket";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277848,7 +277848,7 @@ self: {
          wai-websockets warp websockets
        ];
        description = "Unagi chan based websocket client";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "wsdl" = callPackage
@@ -277867,8 +277867,8 @@ self: {
          base bytestring file-embed hspec network-uri
        ];
        description = "WSDL parsing in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277886,8 +277886,8 @@ self: {
          base bencode bytestring containers directory safe utf8-string
        ];
        description = "A small tool to list, add and remove webseeds from a torrent file";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277909,8 +277909,8 @@ self: {
          wai-app-static wai-websockets warp websockets
        ];
        description = "Terminal emulator over websockets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277929,8 +277929,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "WSJT-X UDP protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277949,8 +277949,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring envy hspec skews text ];
        description = "A-little-higher-level WebSocket client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277979,8 +277979,8 @@ self: {
          network-conduit-tls streaming-commons text
        ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -277992,8 +277992,8 @@ self: {
        sha256 = "080y0ks5q6bv7dvla08x4cvcmzd13b5v1c5p5336k0vkg2c3fq79";
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278009,8 +278009,8 @@ self: {
          base containers gtk lenses mtl old-locale parsec time wtk
        ];
        description = "GTK tools within Wojcik Tool Kit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278026,8 +278026,8 @@ self: {
          base directory symbolic-link unix yaml
        ];
        description = "Unimportant Unix adminstration tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278043,8 +278043,8 @@ self: {
          base containers directory filepath vector-space wumpus-core
        ];
        description = "Basic objects and system code built on Wumpus-Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278058,8 +278058,8 @@ self: {
        editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h";
        libraryHaskellDepends = [ base containers time vector-space ];
        description = "Pure Haskell PostScript and SVG generation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278075,8 +278075,8 @@ self: {
          base containers vector-space wumpus-basic wumpus-core
        ];
        description = "High-level drawing objects built on Wumpus-Basic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278092,8 +278092,8 @@ self: {
          base vector-space wumpus-basic wumpus-core wumpus-drawing
        ];
        description = "Microprints - \"greek-text\" pictures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278110,8 +278110,8 @@ self: {
          wumpus-drawing
        ];
        description = "Drawing trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278126,7 +278126,7 @@ self: {
          base bytestring connection network websockets
        ];
        description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "wx" = callPackage
@@ -278139,7 +278139,7 @@ self: {
        libraryHaskellDepends = [ base stm time wxcore ];
        description = "wxHaskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wxAsteroids" = callPackage
@@ -278153,8 +278153,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory random wx wxcore ];
        description = "Try to avoid the asteroids with your space ship";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278169,8 +278169,8 @@ self: {
        libraryHaskellDepends = [ base old-time wx wxcore Yampa ];
        executableHaskellDepends = [ base wx wxcore Yampa ];
        description = "An implementation of Fruit using wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278182,8 +278182,8 @@ self: {
        sha256 = "0q90djdvma20ngnp45q0kkyv2p1jsmsc7p9rzv76sywzqilha852";
        libraryHaskellDepends = [ base cubicbezier wx wxcore ];
        description = "Simple zoomable canvas for wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278208,7 +278208,7 @@ self: {
        postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs) wxGTK;};
 
@@ -278229,7 +278229,7 @@ self: {
        libraryPkgconfigDepends = [ wxGTK ];
        description = "wxHaskell core";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
@@ -278246,8 +278246,8 @@ self: {
          base containers directory filepath parsec process strict time
        ];
        description = "helper tool for building wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278262,8 +278262,8 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base wx wxcore ];
        description = "An example of how to implement a basic notepad with wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278279,8 +278279,8 @@ self: {
          base convertible Imlib wx yjsvg yjtools
        ];
        description = "turtle like LOGO with wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278302,7 +278302,7 @@ self: {
          semigroups terminal-size text transformers unix
        ];
        description = "Console line fuzzy search";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "wyvern" = callPackage
@@ -278320,8 +278320,8 @@ self: {
          parsec process sgf split
        ];
        description = "An autoresponder for Dragon Go Server";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278338,8 +278338,8 @@ self: {
          type-level
        ];
        description = "A embedded DSL for manipulating DSP languages in Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278353,7 +278353,7 @@ self: {
        editedCabalFile = "1c561z9xvfcd7ddbiw3r0frhjvsrklachd38s66fzwjdgw1sl124";
        libraryHaskellDepends = [ base utf8-string X11 ];
        description = "A binding to the xim of X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x11-xinput" = callPackage
@@ -278366,7 +278366,7 @@ self: {
        librarySystemDepends = [ libXi ];
        libraryToolDepends = [ c2hs ];
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXi;};
 
   "x509" = callPackage
@@ -278389,7 +278389,7 @@ self: {
          tasty-quickcheck
        ];
        description = "X509 reader and writer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x509-store" = callPackage
@@ -278409,7 +278409,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
        description = "X.509 collection accessing and storing methods";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x509-system" = callPackage
@@ -278425,7 +278425,7 @@ self: {
          x509-store
        ];
        description = "Handle per-operating-system X.509 accessors and storage";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x509-util" = callPackage
@@ -278444,7 +278444,7 @@ self: {
          hourglass memory pem x509 x509-store x509-system x509-validation
        ];
        description = "Utility for X509 certificate and chain";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x509-validation" = callPackage
@@ -278466,7 +278466,7 @@ self: {
          x509-store
        ];
        description = "X.509 Certificate and CRL validation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "x86-64bit" = callPackage
@@ -278482,7 +278482,7 @@ self: {
          base deepseq monads-tf QuickCheck tardis vector
        ];
        description = "Runtime code generation for x86 64 bit machine code";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xattr" = callPackage
@@ -278500,8 +278500,8 @@ self: {
          test-framework-hunit unix
        ];
        description = "Haskell extended file attributes interface";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -278514,7 +278514,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base old-time select X11 ];
        description = "Simple battery indicator";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xcb-types" = callPackage
@@ -278525,7 +278525,7 @@ self: {
        sha256 = "1168vg2f3qd5yiwg2fcps0ciqpwns6scyk89bd07ws3qh6kayqfr";
        libraryHaskellDepends = [ base containers mtl pretty xml ];
        description = "Parses XML files used by the XCB project";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xcffib" = callPackage
@@ -278554,7 +278554,7 @@ self: {
        ];
        description = "A cffi-based python binding for X";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "xchat-plugin" = callPackage
@@ -278571,8 +278571,8 @@ self: {
          base directory filepath process unix
        ];
        description = "XChat";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278588,8 +278588,8 @@ self: {
          base bytestring containers mtl network transformers
        ];
        description = "Partial implementation of the XCP protocol with ethernet as transport layer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278615,8 +278615,8 @@ self: {
          text transformers transformers-base unix-compat
        ];
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278628,7 +278628,7 @@ self: {
        sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4";
        libraryHaskellDepends = [ base directory filepath ];
        description = "A basic implementation of the XDG Base Directory specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xdg-desktop-entry" = callPackage
@@ -278644,7 +278644,7 @@ self: {
          transformers unix
        ];
        description = "Parse files conforming to the xdg desktop entry spec";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xdg-userdirs" = callPackage
@@ -278658,7 +278658,7 @@ self: {
          base containers directory filepath xdg-basedir
        ];
        description = "Basic implementation of XDG user directories specification";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xdot" = callPackage
@@ -278678,8 +278678,8 @@ self: {
          base cairo deepseq graphviz gtk3 text transformers
        ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278702,7 +278702,7 @@ self: {
          ghc-prim hexml hexpat time weigh xml
        ];
        description = "A fast event-based XML parser in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xenstore" = callPackage
@@ -278715,8 +278715,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278737,8 +278737,8 @@ self: {
        libraryPkgconfigDepends = [ libxfconf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "FFI bindings to xfconf";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libxfconf = null;};
 
@@ -278751,8 +278751,8 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278768,7 +278768,7 @@ self: {
        executableHaskellDepends = [ base foundation ];
        executableSystemDepends = [ xgboost ];
        description = "XGBoost library for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) xgboost;};
 
   "xhaskell-library" = callPackage
@@ -278783,8 +278783,8 @@ self: {
          base bytestring containers ghc-prim mtl parsec regex-base
        ];
        description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278801,8 +278801,8 @@ self: {
          Xauth
        ];
        description = "X Haskell Bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278818,8 +278818,8 @@ self: {
          base hashable mtl transformers unordered-containers xhb
        ];
        description = "Atom cache for XHB";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278836,8 +278836,8 @@ self: {
          xhb-atom-cache
        ];
        description = "EWMH utilities for XHB";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278849,8 +278849,8 @@ self: {
        sha256 = "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w";
        libraryHaskellDepends = [ base ];
        description = "An XHTML combinator library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "xhtml-combinators" = callPackage
@@ -278864,7 +278864,7 @@ self: {
          base containers random text transformers xml
        ];
        description = "Fast and easy to use XHTML combinators";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xilinx-lava" = callPackage
@@ -278880,8 +278880,8 @@ self: {
        ];
        executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278897,7 +278897,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to xine-lib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {libxine = null; xine = null;};
 
@@ -278921,8 +278921,8 @@ self: {
          aeson base bytestring containers HTF text time
        ];
        description = "Wrapper for the XING API, v1";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -278938,7 +278938,7 @@ self: {
          base bytestring conduit conduit-extra transformers
        ];
        description = "Conduit of keys pressed by xinput";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xkbcommon" = callPackage
@@ -278962,8 +278962,8 @@ self: {
        testHaskellDepends = [ base unix ];
        benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libxkbcommon;};
 
@@ -278983,8 +278983,8 @@ self: {
          base bytestring directory filepath HTTP network tagsoup
        ];
        description = "Downloads the most recent xkcd comic";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279000,8 +279000,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl xml ];
        description = "A simple monadic language for parsing XML structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279023,8 +279023,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279048,8 +279048,8 @@ self: {
          zip-archive
        ];
        description = "Streaming Excel file generation and parsing";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279078,8 +279078,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279096,8 +279096,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Xlsx table cell value extraction utility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279116,8 +279116,8 @@ self: {
          transformers xlsx
        ];
        description = "Simple and incomplete Excel file templater";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279131,7 +279131,7 @@ self: {
        editedCabalFile = "15cxa19dp8nqvrrp0bmndkdas2jzg573x8ri75r6kiv8r4vkv8y7";
        libraryHaskellDepends = [ base bytestring text ];
        description = "A simple XML library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-basic" = callPackage
@@ -279147,7 +279147,7 @@ self: {
          utility-ht
        ];
        description = "Basics for XML/HTML representation and processing";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-catalog" = callPackage
@@ -279163,8 +279163,8 @@ self: {
          xml-conduit
        ];
        description = "Parse XML catalog files (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279188,7 +279188,7 @@ self: {
          resourcet text transformers xml-types
        ];
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -279207,8 +279207,8 @@ self: {
          xml-types
        ];
        description = "Historical cursors & decoding on top of xml-conduit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279233,7 +279233,7 @@ self: {
        ];
        description = "Streaming XML parser based on conduits";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "xml-conduit-stylist" = callPackage
@@ -279249,8 +279249,8 @@ self: {
          unordered-containers xml-conduit
        ];
        description = "Bridge between xml-conduit/html-conduit and stylist";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279267,7 +279267,7 @@ self: {
        ];
        testHaskellDepends = [ base text ];
        description = "Warm and fuzzy creation of XML documents";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-enumerator" = callPackage
@@ -279290,8 +279290,8 @@ self: {
          xml-types
        ];
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279309,8 +279309,8 @@ self: {
          base containers enumerator xml-enumerator xml-types
        ];
        description = "Parser combinators for xml-enumerator and compatible XML parsers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279322,8 +279322,8 @@ self: {
        sha256 = "0ivzl1ikijrbz5mi75rxa340dxf7ilyzlxzka25si91jmjq0a9xa";
        libraryHaskellDepends = [ base mtl transformers xml ];
        description = "Extension to the xml package to extract data from parsed xml";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279344,7 +279344,7 @@ self: {
          text xml-conduit
        ];
        description = "Hamlet-style quasiquoter for XML content";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-helpers" = callPackage
@@ -279355,7 +279355,7 @@ self: {
        sha256 = "0rrk0j7m8ws86hbjw0l4ryq4m9i8llhsag2sfisy5r1iv2zwa0lv";
        libraryHaskellDepends = [ base xml ];
        description = "Some useful helper functions for the xml library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-html-conduit-lens" = callPackage
@@ -279373,8 +279373,8 @@ self: {
          base doctest hspec hspec-expectations-lens lens xml-conduit
        ];
        description = "Optics for xml-conduit and html-conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279397,7 +279397,7 @@ self: {
          base doctest Glob tasty tasty-hunit text xml-conduit
        ];
        description = "Quasi-quoters for XML and HTML Documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-indexed-cursor" = callPackage
@@ -279416,7 +279416,7 @@ self: {
          xml-conduit
        ];
        description = "Indexed XML cursors similar to 'Text.XML.Cursor' from xml-conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-isogen" = callPackage
@@ -279439,7 +279439,7 @@ self: {
          xml-conduit-writer
        ];
        description = "Generate XML-isomorphic types";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-lens" = callPackage
@@ -279454,7 +279454,7 @@ self: {
          base case-insensitive containers lens text xml-conduit
        ];
        description = "Lenses, traversals, and prisms for xml-conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-monad" = callPackage
@@ -279468,8 +279468,8 @@ self: {
          base mtl transformers transformers-compose xml
        ];
        description = "Monadic extensions to the xml package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279484,7 +279484,7 @@ self: {
          base containers optics-core text xml-conduit
        ];
        description = "Optics for xml-conduit";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-parsec" = callPackage
@@ -279496,7 +279496,7 @@ self: {
        libraryHaskellDepends = [ base HaXml parsec ];
        description = "Parsing XML with Parsec";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279514,7 +279514,7 @@ self: {
          xml-types
        ];
        description = "XML picklers based on xml-types, ported from hexpat-pickle";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml-pipe" = callPackage
@@ -279525,8 +279525,8 @@ self: {
        sha256 = "0j5fjnf6r7cagcl1ni5idwj1k5q6vjp6c59ajwsx39iqx1kdmly4";
        libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        description = "XML parser which uses simple-pipe";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279541,8 +279541,8 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base cmdargs unix ];
        description = "Pretty print XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279563,8 +279563,8 @@ self: {
          x509 x509-store x509-validation xml-pipe xmpipe
        ];
        description = "Push XML from/to client to/from server over XMPP or HTTP";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279576,8 +279576,8 @@ self: {
        sha256 = "16wszpvz8cp8nx18rmgyjy6mqk9awd3yf9w0is5rw77r73w88nwq";
        libraryHaskellDepends = [ base-prelude free text ];
        description = "A parser-agnostic declarative API for querying XML-documents";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279594,8 +279594,8 @@ self: {
          xml-types
        ];
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279619,8 +279619,8 @@ self: {
          tasty-smallcheck text xml-conduit xml-query xml-types
        ];
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279642,7 +279642,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        description = "Library and command line tool for converting XML files to json";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-to-json-fast" = callPackage
@@ -279656,7 +279656,7 @@ self: {
        libraryHaskellDepends = [ base tagsoup text ];
        executableHaskellDepends = [ base directory process ];
        description = "Fast, light converter of xml to json capable of handling huge xml files";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml-tydom-conduit" = callPackage
@@ -279677,8 +279677,8 @@ self: {
          tasty-quickcheck text time xml-conduit
        ];
        description = "Typed XML encoding for an xml-conduit backend";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279690,8 +279690,8 @@ self: {
        sha256 = "09svwcfcqmxrczs7qb4haf68dnb8q47cm19f504cqfnr4brs093l";
        libraryHaskellDepends = [ base containers mtl QuickCheck text ];
        description = "Typed XML encoding (core library)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279703,7 +279703,7 @@ self: {
        sha256 = "102cm0nvfmf9gn8hvn5z8qvmg931laczs33wwd5iyz9bc37f9mfs";
        libraryHaskellDepends = [ base deepseq text ];
        description = "Basic types for representing XML";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xml2html" = callPackage
@@ -279714,7 +279714,7 @@ self: {
        sha256 = "1kf4vjg4cfkd4vx8jpikbb0ib4pglmyf5vqrg3j0yllmycj22ska";
        libraryHaskellDepends = [ base xml-conduit ];
        description = "blaze-html instances for xml-conduit types (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xml2json" = callPackage
@@ -279743,8 +279743,8 @@ self: {
          aeson base bytestring hspec resourcet text transformers
        ];
        description = "translate xml to json";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279764,7 +279764,7 @@ self: {
        ];
        description = "Convert BLAST output in XML format to CSV or HTML";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279786,7 +279786,7 @@ self: {
          tasty-quickcheck text transformers
        ];
        description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "xmlbf-xeno" = callPackage
@@ -279806,7 +279806,7 @@ self: {
          tasty-quickcheck text unordered-containers xmlbf
        ];
        description = "xeno backend support for the xmlbf library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "xmlbf-xmlhtml" = callPackage
@@ -279827,7 +279827,7 @@ self: {
          tasty-quickcheck text unordered-containers xmlbf
        ];
        description = "xmlhtml backend support for the xmlbf library";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "xmlgen" = callPackage
@@ -279850,7 +279850,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion text ];
        description = "Fast XML generation library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmlhtml" = callPackage
@@ -279874,7 +279874,7 @@ self: {
          unordered-containers
        ];
        description = "XML parser and renderer with HTML 5 quirks mode";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmltv" = callPackage
@@ -279896,8 +279896,8 @@ self: {
          wl-pprint-terminfo xdg-basedir xml
        ];
        description = "Show tv channels in the terminal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279914,8 +279914,8 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279928,8 +279928,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 xmms2-client ];
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -279974,8 +279974,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge mtl time ];
        description = "A Minimalistic Text Based Status Bar";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
+       license = lib.licenses.bsd3;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
 
@@ -280003,8 +280003,8 @@ self: {
          install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs
        '';
        description = "A tiling window manager";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "xmonad-bluetilebranch" = callPackage
@@ -280023,8 +280023,8 @@ self: {
          process unix X11
        ];
        description = "A tiling window manager";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280044,8 +280044,8 @@ self: {
          X11 X11-xft xmonad
        ];
        description = "Third party extensions for xmonad";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ peti ];
      }) {};
 
   "xmonad-contrib-bluetilebranch" = callPackage
@@ -280063,8 +280063,8 @@ self: {
          xmonad-bluetilebranch
        ];
        description = "Third party extensions for xmonad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280076,8 +280076,8 @@ self: {
        sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9";
        libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        description = "Third party extensions for xmonad";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280092,8 +280092,8 @@ self: {
        libraryHaskellDepends = [ base dbus utf8-string ];
        executableHaskellDepends = [ base dbus utf8-string ];
        testHaskellDepends = [ base dbus utf8-string ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280110,7 +280110,7 @@ self: {
          xmonad xmonad-contrib
        ];
        description = "XMonad config entry point wrapper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xmonad-eval" = callPackage
@@ -280126,8 +280126,8 @@ self: {
          random unix X11 xmonad xmonad-contrib
        ];
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280147,7 +280147,7 @@ self: {
          regex-posix X11 xmonad xmonad-contrib
        ];
        description = "Third party extensions for xmonad with wacky dependencies";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmonad-screenshot" = callPackage
@@ -280158,7 +280158,7 @@ self: {
        sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1";
        libraryHaskellDepends = [ base gtk xmonad ];
        description = "Workspaces screenshooting utility for XMonad";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xmonad-spotify" = callPackage
@@ -280169,7 +280169,7 @@ self: {
        sha256 = "0hps37yqn3grgg65wm3j41dh40fqi64ni12mgk0lfigw2fghfnvj";
        libraryHaskellDepends = [ base containers dbus X11 ];
        description = "Bind media keys to work with Spotify";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmonad-utils" = callPackage
@@ -280182,7 +280182,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ghc random unix X11 ];
        description = "A small collection of X utilities";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmonad-vanessa" = callPackage
@@ -280205,8 +280205,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec xmonad ];
        description = "Custom xmonad, which builds with stack or cabal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280224,7 +280224,7 @@ self: {
          alsa-mixer base composition-prelude containers X11
        ];
        description = "XMonad volume controls";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xmonad-wallpaper" = callPackage
@@ -280237,7 +280237,7 @@ self: {
        editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28";
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
-       license = stdenv.lib.licenses.lgpl3;
+       license = lib.licenses.lgpl3;
      }) {};
 
   "xmonad-windownames" = callPackage
@@ -280252,8 +280252,8 @@ self: {
          base containers utf8-string xmonad xmonad-contrib
        ];
        description = "A library to automatically put named windows into the DynamicLog";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280270,8 +280270,8 @@ self: {
          simple-pipe uuid xml-pipe
        ];
        description = "XMPP implementation using simple-PIPE";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280292,8 +280292,8 @@ self: {
          base bytestring criterion ghc-byteorder
        ];
        description = "Efficient XOR masking";
-       license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280323,8 +280323,8 @@ self: {
          base gauge random xorshift Xorshift128Plus
        ];
        description = "Simple implementation of xorshift+ PRNG";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280337,7 +280337,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ xosd ];
        description = "A binding to the X on-screen display";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) xosd;};
 
   "xournal-builder" = callPackage
@@ -280354,8 +280354,8 @@ self: {
          xournal-types
        ];
        description = "text builder for xournal file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280377,8 +280377,8 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs ];
        description = "convert utility for xoj files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280398,8 +280398,8 @@ self: {
          xml-types xournal-types zlib-conduit
        ];
        description = "Xournal file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280417,8 +280417,8 @@ self: {
          TypeCompose xournal-types
        ];
        description = "Xournal file renderer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280436,8 +280436,8 @@ self: {
          base bytestring cereal containers lens strict TypeCompose
        ];
        description = "Data types for programs for xournal file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280454,7 +280454,7 @@ self: {
          base hxt hxt-xpath optparse-applicative text
        ];
        description = "Command line tool to extract DSV data from HTML and XML with XPATH expressions";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xrefcheck" = callPackage
@@ -280497,8 +280497,8 @@ self: {
          universum with-utf8 yaml
        ];
        testToolDepends = [ hspec-discover ];
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280517,7 +280517,7 @@ self: {
        ];
        description = "Cluster EST sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280534,8 +280534,8 @@ self: {
          base directory doctest filepath QuickCheck quickcheck-instances
        ];
        description = "XML Schema data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280547,7 +280547,7 @@ self: {
        sha256 = "0xljcmc8rsvkpchrdam3lpp4igq1gmym9v3drp15a9k8rfa8irmi";
        libraryHaskellDepends = [ base HUnit QuickCheck uniplate vector ];
        description = "cryptanalysis of Blizzard's broken SHA-1 implementation";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "xslt" = callPackage
@@ -280559,8 +280559,8 @@ self: {
        libraryHaskellDepends = [ base libxml ];
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {xslt = null;};
 
@@ -280581,7 +280581,7 @@ self: {
          text utf8-string
        ];
        description = "sanitize untrusted HTML to prevent XSS attacks";
-       license = stdenv.lib.licenses.bsd2;
+       license = lib.licenses.bsd2;
      }) {};
 
   "xtc" = callPackage
@@ -280593,8 +280593,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base wx wxcore ];
        description = "eXtended & Typed Controls for wxHaskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280607,7 +280607,7 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ libXtst ];
        description = "Thin FFI bindings to X11 XTest library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXtst;};
 
   "xturtle" = callPackage
@@ -280622,7 +280622,7 @@ self: {
          base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools
        ];
        description = "turtle like LOGO";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "xxhash" = callPackage
@@ -280639,8 +280639,8 @@ self: {
          base bytestring criterion deepseq digest hashable murmur-hash
        ];
        description = "A Haskell implementation of the xxHash algorithm";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280659,7 +280659,7 @@ self: {
          xxhash
        ];
        description = "Bindings to the C implementation the xxHash algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "y0l0bot" = callPackage
@@ -280677,8 +280677,8 @@ self: {
          split text time
        ];
        description = "#plaimi's all-encompassing bot";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280694,7 +280694,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base word8 ];
        description = "Yet Another Brainfuck Interpreter";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yabi-muno" = callPackage
@@ -280712,8 +280712,8 @@ self: {
        ];
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Yet Another Brainfuck Interpreter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280737,8 +280737,8 @@ self: {
          yesod-core yesod-form zlib
        ];
        description = "Personal Hackage replacement for testing new packages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280760,8 +280760,8 @@ self: {
          servant servant-client
        ];
        description = "Read quotes from Yahoo Finance API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280777,8 +280777,8 @@ self: {
          attoparsec base cassava conduit lens mtl text vector wreq
        ];
        description = "Streaming aproach to the yahoo finance api";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280790,8 +280790,8 @@ self: {
        sha256 = "064qakx4khzz9ih9isw46c8pm8wpg662fwnis4d64nszy6y9yfck";
        libraryHaskellDepends = [ base HTTP network xml ];
        description = "Yahoo Web Search Services";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280805,8 +280805,8 @@ self: {
        librarySystemDepends = [ yajl ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings for YAJL, an event-based JSON implementation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) yajl;};
 
@@ -280822,8 +280822,8 @@ self: {
          base bytestring enumerator json-types text transformers yajl
        ];
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280840,7 +280840,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        description = "A strongly typed IRC library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yall" = callPackage
@@ -280851,8 +280851,8 @@ self: {
        sha256 = "131x7hl309zpwl31k6mwqd4fdrhkcwxvn4dvlky9bh3prc8kdm2s";
        libraryHaskellDepends = [ base categories transformers ];
        description = "Lenses with a southern twang";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280886,8 +280886,8 @@ self: {
          vector wai warp
        ];
        description = "A wrapper of servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280911,7 +280911,7 @@ self: {
          wai-logger yaml
        ];
        description = "Yam App";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yam-config" = callPackage
@@ -280927,8 +280927,8 @@ self: {
          unordered-containers vault yaml
        ];
        description = "Yam Configuation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280946,8 +280946,8 @@ self: {
          resourcet salak servant-server text unliftio-core yam
        ];
        description = "Yam DataSource Middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280958,7 +280958,7 @@ self: {
        version = "0.2.0";
        sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895";
        libraryHaskellDepends = [ base cron yam-app ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yam-logger" = callPackage
@@ -280973,8 +280973,8 @@ self: {
          aeson base fast-logger monad-logger text vault yam-config
        ];
        description = "Yam Logger";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -280991,8 +280991,8 @@ self: {
          servant-server text yam
        ];
        description = "Yam Redis Middleware";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281009,8 +281009,8 @@ self: {
          aeson base http-types lens servant servant-server servant-swagger
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281031,8 +281031,8 @@ self: {
          yam-logger
        ];
        description = "Yam transaction";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281045,8 +281045,8 @@ self: {
        libraryHaskellDepends = [
          base containers persistent-odbc yam-app
        ];
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281061,7 +281061,7 @@ self: {
        libraryHaskellDepends = [
          base containers persistent-postgresql unliftio-core yam-app
        ];
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yam-web" = callPackage
@@ -281090,8 +281090,8 @@ self: {
          vault wai wai-extra warp yam-config yam-logger yam-transaction
        ];
        description = "Yam Web";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281104,7 +281104,7 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl ];
        description = "Simple memoisation function";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml" = callPackage
@@ -281133,7 +281133,7 @@ self: {
          unordered-containers vector
        ];
        description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml-combinators" = callPackage
@@ -281153,7 +281153,7 @@ self: {
          aeson base doctest tasty tasty-hunit text unordered-containers
        ];
        description = "YAML parsing combinators for improved validation and error reporting";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yaml-config" = callPackage
@@ -281172,7 +281172,7 @@ self: {
          unordered-containers yaml
        ];
        description = "Configuration management";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yaml-light" = callPackage
@@ -281183,7 +281183,7 @@ self: {
        sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk";
        libraryHaskellDepends = [ base bytestring containers HsSyck ];
        description = "A light-weight wrapper with utility functions around HsSyck";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml-light-lens" = callPackage
@@ -281199,7 +281199,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        description = "Lens interface to yaml-light";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml-pretty-extras" = callPackage
@@ -281211,8 +281211,8 @@ self: {
        libraryHaskellDepends = [ base microlens-platform rio yaml ];
        testHaskellDepends = [ base hspec microlens-platform rio ];
        description = "Extra functionality for pretty printing Yaml documents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281231,8 +281231,8 @@ self: {
          vector wreq yaml
        ];
        description = "Simple library for network (HTTP REST-like) YAML RPC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281249,8 +281249,8 @@ self: {
          yaml yaml-rpc
        ];
        description = "Scotty server backend for yaml-rpc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281267,8 +281267,8 @@ self: {
          yaml yaml-rpc
        ];
        description = "Snap server backend for yaml-rpc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281296,7 +281296,7 @@ self: {
          unordered-containers vector yaml
        ];
        description = "Read multiple yaml-files and override fields recursively";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yaml-unscrambler" = callPackage
@@ -281322,8 +281322,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck
        ];
        description = "Flexible declarative YAML parsing toolkit";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281360,7 +281360,7 @@ self: {
        ];
        description = "Compares the keys from two yaml files";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yamlparse-applicative" = callPackage
@@ -281387,7 +281387,7 @@ self: {
          unordered-containers
        ];
        description = "Declaritive configuration parsing with free docs";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yampa-canvas" = callPackage
@@ -281402,7 +281402,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
        description = "blank-canvas frontend for Yampa";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -281419,8 +281419,8 @@ self: {
          base GLFW-b newtype OpenGL vector-space Yampa
        ];
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281434,8 +281434,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base gloss Yampa ];
        description = "A GLOSS backend for Yampa";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281453,8 +281453,8 @@ self: {
          base GLUT newtype OpenGL vector-space Yampa-core
        ];
        description = "Connects Yampa and GLUT";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281473,8 +281473,8 @@ self: {
          base data-memocombinators linear sdl2 StateVar text vector Yampa
        ];
        description = "Yampa and SDL2 made easy";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281493,8 +281493,8 @@ self: {
          base Cabal QuickCheck random tasty tasty-quickcheck Yampa
        ];
        description = "Testing library for Yampa";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281508,8 +281508,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gloss random Yampa ];
        description = "2048 game clone using Yampa/Gloss";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281527,8 +281527,8 @@ self: {
          text transformers unordered-containers wreq
        ];
        description = "Bindings to Yandex translate API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281542,8 +281542,8 @@ self: {
        editedCabalFile = "0p55j9q5idzw5bmpg0i4vkifaadzvf3fdhjd02bh2ym2y15g0csk";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Yet another option parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281555,8 +281555,8 @@ self: {
        sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
        libraryHaskellDepends = [ base ];
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281576,7 +281576,7 @@ self: {
        executableHaskellDepends = [ base regex-tdfa ];
        testHaskellDepends = [ base ];
        description = "Yet Another Parser Builder (YAPB)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yarn-lock" = callPackage
@@ -281597,8 +281597,8 @@ self: {
          tasty-th text
        ];
        description = "Represent and parse yarn.lock files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281636,8 +281636,8 @@ self: {
          yarn-lock
        ];
        description = "Convert yarn.lock files to nix expressions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281654,8 +281654,8 @@ self: {
          template-haskell
        ];
        description = "Yet another array library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281668,8 +281668,8 @@ self: {
        libraryHaskellDepends = [ base yarr ];
        librarySystemDepends = [ libdevil ];
        description = "Image IO for Yarr library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libdevil;};
 
@@ -281689,7 +281689,7 @@ self: {
          attoparsec base hspec mtl unordered-containers vector
        ];
        description = "Yet Another Template Engine";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yavie" = callPackage
@@ -281708,8 +281708,8 @@ self: {
        ];
        executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281728,7 +281728,7 @@ self: {
          th-abstraction transformers
        ];
        description = "Total recursion schemes";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "yaya-hedgehog" = callPackage
@@ -281739,7 +281739,7 @@ self: {
        sha256 = "0aw932d2yr3w84ia44y46w4w96bc8gdag63h66rhx3v7gwmkwdwg";
        libraryHaskellDepends = [ base deriving-compat hedgehog yaya ];
        description = "Hedgehog testing support for the Yaya recursion scheme library";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "yaya-test" = callPackage
@@ -281756,8 +281756,8 @@ self: {
          base deriving-compat hedgehog yaya yaya-hedgehog
        ];
        description = "Test suites for `yaya`";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281773,7 +281773,7 @@ self: {
          base bifunctors comonad either free lens yaya
        ];
        description = "Non-total extensions to the Yaya recursion scheme library";
-       license = stdenv.lib.licenses.agpl3;
+       license = lib.licenses.agpl3;
      }) {};
 
   "yaya-unsafe-test" = callPackage
@@ -281789,8 +281789,8 @@ self: {
          base hedgehog yaya yaya-hedgehog yaya-unsafe
        ];
        description = "Test suites for `yaya-unsafe`";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281805,8 +281805,8 @@ self: {
          base containers csv mtl uniplate yhccore
        ];
        description = "Additional utilities to work with Yhc Core";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281842,8 +281842,8 @@ self: {
          aeson base numbered-semigroups tasty tasty-hunit tasty-quickcheck
        ];
        description = "Yesod-based server for interactive presentation slides";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281862,7 +281862,7 @@ self: {
          xdg-basedir
        ];
        description = "small dmenu wrapper";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yeller" = callPackage
@@ -281887,8 +281887,8 @@ self: {
          http-client-tls http-types network stm text unordered-containers
        ];
        description = "A Yeller Client For Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281910,7 +281910,7 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Extended yes command to reproduce phrases in Yes! Precure 5";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yeshql" = callPackage
@@ -281921,8 +281921,8 @@ self: {
        sha256 = "07wbblsyc1f2kc47s2z4sg4s7qmgn44kvpvdvq9cf59g5nvm4wkd";
        libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
        description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281942,7 +281942,7 @@ self: {
          base containers stm tasty tasty-hunit tasty-quickcheck
        ];
        description = "YesQL-style SQL database abstraction (core)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yeshql-hdbc" = callPackage
@@ -281962,8 +281962,8 @@ self: {
          base containers HDBC stm tasty tasty-hunit tasty-quickcheck
        ];
        description = "YesQL-style SQL database abstraction (HDBC backend)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -281985,8 +281985,8 @@ self: {
          tasty-quickcheck
        ];
        description = "YesQL-style SQL database abstraction (postgresql-simple backend)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282008,7 +282008,7 @@ self: {
          wai-logger warp yaml yesod-core yesod-form yesod-persistent
        ];
        description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-alerts" = callPackage
@@ -282023,7 +282023,7 @@ self: {
          alerts base blaze-html blaze-markup safe text yesod-core
        ];
        description = "Alert messages for the Yesod framework";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-angular" = callPackage
@@ -282039,8 +282039,8 @@ self: {
          transformers yesod
        ];
        description = "Angular JS integratoin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282060,8 +282060,8 @@ self: {
          shakespeare template-haskell text transformers yesod yesod-core
        ];
        description = "Angular Helpers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282084,8 +282084,8 @@ self: {
          yesod-core yesod-test
        ];
        description = "Automatically generate article previews for a yesod site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282114,7 +282114,7 @@ self: {
          unordered-containers wai yesod-core yesod-form yesod-persistent
        ];
        description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -282136,8 +282136,8 @@ self: {
          text xml-conduit yesod yesod-auth yesod-test
        ];
        description = "An account authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282162,8 +282162,8 @@ self: {
          text xml-conduit yesod yesod-auth yesod-test
        ];
        description = "An account authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282181,7 +282181,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec text yesod yesod-test ];
        description = "Yesod Middleware for HTTP Basic Authentication";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-bcrypt" = callPackage
@@ -282197,8 +282197,8 @@ self: {
          yesod-persistent
        ];
        description = "BCrypt salted and hashed passwords in a database as auth for yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282215,8 +282215,8 @@ self: {
          yesod-form yesod-persistent
        ];
        description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282238,8 +282238,8 @@ self: {
          yesod-auth yesod-core
        ];
        description = "Desk.com remote authentication support for Yesod apps.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282257,7 +282257,7 @@ self: {
          text time transformers unliftio wai yesod-auth yesod-core yesod-fb
        ];
        description = "Authentication backend for Yesod using Facebook";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
@@ -282282,7 +282282,7 @@ self: {
          yesod-test
        ];
        description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage
@@ -282300,8 +282300,8 @@ self: {
          text yesod-auth yesod-core yesod-form yesod-persistent yesod-static
        ];
        description = "An account authentication plugin for yesod with encrypted token transfer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282319,8 +282319,8 @@ self: {
          yesod-auth yesod-core yesod-form
        ];
        description = "Kerberos Authentication for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282337,8 +282337,8 @@ self: {
          yesod-auth yesod-core yesod-form
        ];
        description = "LDAP Authentication for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282354,8 +282354,8 @@ self: {
          aeson base LDAP text yesod-auth yesod-core yesod-form
        ];
        description = "Very simlple LDAP auth for yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282373,8 +282373,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Yesod LDAP authentication plugin";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282397,8 +282397,8 @@ self: {
          yesod-auth yesod-core
        ];
        description = "A yesod-auth plugin for LTI 1.3";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282415,8 +282415,8 @@ self: {
          yesod-core yesod-form
        ];
        description = "A plugin for Yesod to provide email-only authentication";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282433,7 +282433,7 @@ self: {
          yesod-core yesod-form
        ];
        description = "OAuth Authentication for Yesod";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-oauth2" = callPackage
@@ -282455,8 +282455,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec uri-bytestring ];
        description = "OAuth 2.0 authentication plugins";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282479,8 +282479,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec uri-bytestring ];
        description = "OAuth 2.0 authentication plugins";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282496,8 +282496,8 @@ self: {
          base hamlet pam text yesod-auth yesod-core yesod-form
        ];
        description = "Provides PAM authentication module";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282514,8 +282514,8 @@ self: {
          yesod-form
        ];
        description = "Authentication plugin for Yesod using smbclient";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282534,8 +282534,8 @@ self: {
          yesod-auth yesod-core
        ];
        description = "Zendesk remote authentication support for Yesod apps";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282563,7 +282563,7 @@ self: {
          unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib
        ];
        description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -282579,8 +282579,8 @@ self: {
          transformers yesod-core yesod-elements
        ];
        description = "Bootstrap widgets for yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282599,8 +282599,8 @@ self: {
          yesod-core yesod-elements
        ];
        description = "Helper functions for using yesod with colonnade";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282619,8 +282619,8 @@ self: {
          yesod-form yesod-markdown
        ];
        description = "A generic comments interface for a Yesod application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282642,8 +282642,8 @@ self: {
          base blaze-html hspec hspec-expectations utf8-string
        ];
        description = "PDF Content Type for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282662,8 +282662,8 @@ self: {
          yesod
        ];
        description = "Continuations for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282701,7 +282701,7 @@ self: {
          base blaze-html bytestring gauge shakespeare text
        ];
        description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-crud" = callPackage
@@ -282718,8 +282718,8 @@ self: {
          random safe stm uuid yesod-core yesod-form yesod-persistent
        ];
        description = "Generic administrative CRUD operations as a Yesod subsite";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282738,8 +282738,8 @@ self: {
          yesod-persistent
        ];
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282761,7 +282761,7 @@ self: {
          yesod-test
        ];
        description = "Add CSP headers to Yesod apps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-datatables" = callPackage
@@ -282787,8 +282787,8 @@ self: {
          test-framework-quickcheck2 text transformers
        ];
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282800,7 +282800,7 @@ self: {
        sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
        libraryHaskellDepends = [ base yesod-core ];
        description = "Default config and main functions for your yesod application (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-dsl" = callPackage
@@ -282826,8 +282826,8 @@ self: {
          shakespeare strict text
        ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282843,7 +282843,7 @@ self: {
          base blaze-html blaze-markup bytestring text yesod-core
        ];
        description = "Non template haskell markup building function in the spirit of lucid";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-eventsource" = callPackage
@@ -282858,7 +282858,7 @@ self: {
          base blaze-builder conduit transformers wai wai-extra yesod-core
        ];
        description = "Server-sent events support for Yesod apps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-examples" = callPackage
@@ -282879,8 +282879,8 @@ self: {
        ];
        executableSystemDepends = [ sqlite ];
        description = "Example programs using the Yesod Web Framework. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) sqlite;};
 
@@ -282902,8 +282902,8 @@ self: {
          text
        ];
        description = "Fast live-reloading for yesod applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282923,8 +282923,8 @@ self: {
          transformers utf8-string yesod-core yesod-form yesod-static
        ];
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282941,7 +282941,7 @@ self: {
          memory text wai yesod-core
        ];
        description = "Useful glue functions between the fb library and Yesod";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-filter" = callPackage
@@ -282962,8 +282962,8 @@ self: {
          template-haskell text time yesod-persistent
        ];
        description = "Automatic filter generator for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -282986,7 +282986,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec text time ];
        description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
@@ -283001,7 +283001,7 @@ self: {
          base blaze-html blaze-markup shakespeare text yesod-core yesod-form
        ];
        description = "renderBootstrap4";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-form-bulma" = callPackage
@@ -283024,7 +283024,7 @@ self: {
          base email-validate shakespeare text yesod-core yesod-form
        ];
        description = "support Bulma form for Yesod";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-form-json" = callPackage
@@ -283040,7 +283040,7 @@ self: {
          yesod-core yesod-form
        ];
        description = "Extension for Yesod web framework to handle JSON requests as applicative forms";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-form-multi" = callPackage
@@ -283056,7 +283056,7 @@ self: {
          yesod-core yesod-form
        ];
        description = "Multi-input form handling for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-form-richtext" = callPackage
@@ -283072,8 +283072,8 @@ self: {
          yesod-core yesod-form
        ];
        description = "Various rich-text WYSIWYG editors for Yesod forms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283090,7 +283090,7 @@ self: {
          yesod-core
        ];
        description = "Host content provided by a Git repo";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-gitrev" = callPackage
@@ -283105,8 +283105,8 @@ self: {
        ];
        testHaskellDepends = [ base yesod-core ];
        description = "A subsite for displaying git information";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283123,8 +283123,8 @@ self: {
          text time yesod yesod-form
        ];
        description = "A collection of various small helpers useful in any yesod application";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283143,8 +283143,8 @@ self: {
          yesod-form
        ];
        description = "Code for using the ip package with yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283166,8 +283166,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Background jobs library for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283179,7 +283179,7 @@ self: {
        sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
        libraryHaskellDepends = [ base yesod-core ];
        description = "Generate content for Yesod using the aeson package. (deprecated)";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-katip" = callPackage
@@ -283196,7 +283196,7 @@ self: {
          monad-logger network text wai wai-extra yesod-core ytl
        ];
        description = "Logging bridge between Yesod and Katip";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-links" = callPackage
@@ -283207,8 +283207,8 @@ self: {
        sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y";
        libraryHaskellDepends = [ base text yesod-core ];
        description = "A typeclass which simplifies creating link widgets throughout your site";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283220,8 +283220,8 @@ self: {
        sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip";
        libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283241,8 +283241,8 @@ self: {
          persistent-template text time yesod yesod-core
        ];
        description = "Yesod library for MangoPay API access";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283261,8 +283261,8 @@ self: {
        ];
        testHaskellDepends = [ base blaze-html hspec text ];
        description = "Tools for using markdown in a yesod application";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283279,8 +283279,8 @@ self: {
          JuicyPixels vector yesod
        ];
        description = "Simple display of media types, served by yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283297,7 +283297,7 @@ self: {
          time xml-conduit yesod-core
        ];
        description = "Helper functions and data types for producing News feeds";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-page-cursor" = callPackage
@@ -283321,8 +283321,8 @@ self: {
          persistent persistent-sqlite persistent-template scientific text
          time unliftio unliftio-core wai-extra yesod yesod-core yesod-test
        ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283334,8 +283334,8 @@ self: {
        sha256 = "088m7prg774wdh8fp7zljxj65zj5krl4pggl63anv2wk7nlw27py";
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283354,8 +283354,8 @@ self: {
          resourcet shakespeare utf8-string wai-test yesod yesod-test
        ];
        description = "Pagination in Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283379,7 +283379,7 @@ self: {
          yesod-test
        ];
        description = "A pagination approach for yesod";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-paypal-rest" = callPackage
@@ -283392,8 +283392,8 @@ self: {
          base paypal-rest-client time yesod-core
        ];
        description = "Yesod plugin to use PayPal with the paypal-rest-client library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283415,7 +283415,7 @@ self: {
          wai-extra yesod-core
        ];
        description = "Some helpers for using Persistent from Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-platform" = callPackage
@@ -283484,8 +283484,8 @@ self: {
          yesod-routes yesod-static yesod-test
        ];
        description = "Meta package for Yesod (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283506,8 +283506,8 @@ self: {
          aeson base shakespeare text transformers yesod yesod-form
        ];
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283519,8 +283519,8 @@ self: {
        sha256 = "0v3xvhk5nxc2y3c21y6h7w6lg5vm1s2vzf9f02qw8gj928vsidzg";
        libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283540,8 +283540,8 @@ self: {
          system-filepath template-haskell text time transformers yesod-core
        ];
        description = "PureScript integration for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283565,8 +283565,8 @@ self: {
          vector yaml yesod-core
        ];
        description = "RAML style route definitions for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283589,8 +283589,8 @@ self: {
          yesod-raml-mock
        ];
        description = "The raml helper executable";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283607,8 +283607,8 @@ self: {
          yesod-markdown yesod-raml
        ];
        description = "A html documentation generator library for RAML";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283632,8 +283632,8 @@ self: {
          yesod-raml yesod-test
        ];
        description = "A mock-handler generator library from RAML";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283652,8 +283652,8 @@ self: {
          yesod-form
        ];
        description = "Dead simple support for reCAPTCHA on Yesod applications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283669,7 +283669,7 @@ self: {
          aeson base classy-prelude http-conduit yesod-core yesod-form
        ];
        description = "yesod recaptcha2";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-routes" = callPackage
@@ -283690,8 +283690,8 @@ self: {
          text
        ];
        description = "Efficient routing for Yesod. (deprecated)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283708,8 +283708,8 @@ self: {
          system-filepath text yesod-core
        ];
        description = "Generate Flow routes for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283726,8 +283726,8 @@ self: {
          yesod-routes
        ];
        description = "generate TypeScript routes for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283745,7 +283745,7 @@ self: {
        ];
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283762,8 +283762,8 @@ self: {
          text yesod-core
        ];
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283780,8 +283780,8 @@ self: {
          yesod-core
        ];
        description = "A simple quasiquoter to include sass code in yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283799,8 +283799,8 @@ self: {
          pool-conduit random text time wai yesod-core
        ];
        description = "Redis-Powered Sessions for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283817,7 +283817,7 @@ self: {
          xml-types yesod-core
        ];
        description = "Generate XML sitemaps";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-static" = callPackage
@@ -283850,7 +283850,7 @@ self: {
          yesod-test
        ];
        description = "Static file serving subsite for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-static-angular" = callPackage
@@ -283875,8 +283875,8 @@ self: {
          text yesod-core yesod-static yesod-test
        ];
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283893,8 +283893,8 @@ self: {
          template-haskell yesod-static
        ];
        testHaskellDepends = [ base yesod-static ];
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283910,7 +283910,7 @@ self: {
          base bytestring containers contravariant semigroups text yesod-core
        ];
        description = "HTML tables for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-tableview" = callPackage
@@ -283921,7 +283921,7 @@ self: {
        sha256 = "1qf7439c31a8xi0qs8fn2xdlrldi42n1k25lj6vn061lm8wg35yy";
        libraryHaskellDepends = [ base hamlet persistent yesod ];
        description = "Table view for Yesod applications";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-test" = callPackage
@@ -283947,7 +283947,7 @@ self: {
          yesod-core yesod-form
        ];
        description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -283964,8 +283964,8 @@ self: {
          transformers wai wai-test yesod-default
        ];
        description = "Utility functions for testing JSON web services written in Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -283982,7 +283982,7 @@ self: {
          yesod-form yesod-persistent
        ];
        description = "Yesod support for Text.Markdown.";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-tls" = callPackage
@@ -283998,8 +283998,8 @@ self: {
          warp warp-tls yesod
        ];
        description = "Provides main functions using warp-tls for yesod projects";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284023,7 +284023,7 @@ self: {
          yesod-form yesod-test
        ];
        description = "Transloadit support for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-vend" = callPackage
@@ -284044,8 +284044,8 @@ self: {
          resourcet text yesod yesod-form
        ];
        description = "Simple CRUD classes for easy view creation for Yesod";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284062,7 +284062,7 @@ self: {
          yesod-core
        ];
        description = "WebSockets support for Yesod";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yesod-websockets-extra" = callPackage
@@ -284077,7 +284077,7 @@ self: {
          base enclosed-exceptions transformers websockets yesod-websockets
        ];
        description = "Extension to yesod-websockets";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yesod-worker" = callPackage
@@ -284093,8 +284093,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284125,7 +284125,7 @@ self: {
          text transformers transformers-base void
        ];
        description = "Yet Another Logger";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "yggdrasil" = callPackage
@@ -284141,8 +284141,8 @@ self: {
        ];
        testHaskellDepends = [ base cryptonite hspec QuickCheck ];
        description = "Executable specifications of composable cryptographic protocols";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.agpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284154,8 +284154,8 @@ self: {
        sha256 = "18gjzlpxn0hp723ybjgq1zdbpl35iqphs7b8r5x9ddbkm435sw93";
        libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        description = "Yhc's Internal Core language";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284174,8 +284174,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        description = "Calculation of YH sequence system";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284198,8 +284198,8 @@ self: {
          yi-mode-haskell yi-mode-javascript yi-rope
        ];
        description = "Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284218,8 +284218,8 @@ self: {
          yi-rope
        ];
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284250,8 +284250,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
        description = "Yi editor core library";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284268,8 +284268,8 @@ self: {
          transformers-base yi-core yi-rope
        ];
        description = "Dynamic configuration support for Yi";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284281,8 +284281,8 @@ self: {
        sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv";
        libraryHaskellDepends = [ base containers split yi-language ];
        description = "Simple mapping from colour names used in emacs to Color";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284302,8 +284302,8 @@ self: {
          yi-language yi-rope
        ];
        description = "Pango frontend for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284321,8 +284321,8 @@ self: {
          stm text vty yi-core yi-language yi-rope
        ];
        description = "Vty frontend for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284341,8 +284341,8 @@ self: {
          yi-rope
        ];
        description = "Fuzzy open plugin for yi";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284370,8 +284370,8 @@ self: {
          text yi-core yi-language yi-rope
        ];
        description = "Yi editor incremental reader";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284387,8 +284387,8 @@ self: {
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
        description = "Cua keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284406,8 +284406,8 @@ self: {
          text transformers-base yi-core yi-language yi-misc-modes yi-rope
        ];
        description = "Emacs keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284434,8 +284434,8 @@ self: {
          unordered-containers yi-core yi-language yi-rope
        ];
        description = "Vim keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284463,8 +284463,8 @@ self: {
          unordered-containers
        ];
        description = "Collection of language-related Yi libraries";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284482,8 +284482,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "Yi editor miscellaneous modes";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284501,8 +284501,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "Yi editor haskell mode";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284521,8 +284521,8 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        description = "Yi editor javascript mode";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284534,8 +284534,8 @@ self: {
        sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
        libraryHaskellDepends = [ base yi ];
        description = "Monokai colour theme for the Yi text editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284555,7 +284555,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A rope data structure used by Yi";
-       license = stdenv.lib.licenses.gpl2;
+       license = lib.licenses.gpl2;
      }) {};
 
   "yi-snippet" = callPackage
@@ -284575,8 +284575,8 @@ self: {
          base containers tasty-hunit tasty-th yi-rope
        ];
        description = "Snippet support for yi";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284588,8 +284588,8 @@ self: {
        sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc";
        libraryHaskellDepends = [ base yi ];
        description = "Solarized colour theme for the Yi text editor";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284601,8 +284601,8 @@ self: {
        sha256 = "152ys2x416322c13nxmi25wpilq0ddd6hj36mr25jaacf1qszv6q";
        libraryHaskellDepends = [ base yi ];
        description = "Spolsky colour theme for the Yi text editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284626,8 +284626,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284641,8 +284641,8 @@ self: {
          base bindings-yices containers transformers
        ];
        description = "Simple interface to the Yices SMT (SAT modulo theories) solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yices-painless" = callPackage
@@ -284658,8 +284658,8 @@ self: {
        ];
        librarySystemDepends = [ gmp yices ];
        description = "An embedded language for programming the Yices SMT solver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "yiyd" = callPackage
@@ -284681,7 +284681,7 @@ self: {
          yaml
        ];
        testToolDepends = [ hspec-discover ];
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "yjftp" = callPackage
@@ -284701,7 +284701,7 @@ self: {
        executableHaskellDepends = [ hsConfigure ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284716,7 +284716,7 @@ self: {
        libraryHaskellDepends = [ base directory ftphs mtl process unix ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284728,7 +284728,7 @@ self: {
        sha256 = "0zif4sqrd7kv1546vcp1q78bb8k94mkiqxh7glix6gvv7gabfdzp";
        libraryHaskellDepends = [ base HaXml ];
        description = "make SVG string from Haskell data";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yjtools" = callPackage
@@ -284755,7 +284755,7 @@ self: {
          base containers parsec QuickCheck quickcheck-instances
        ];
        description = "A Minimal JSON Parser & Printer for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "yoctoparsec" = callPackage
@@ -284768,8 +284768,8 @@ self: {
        editedCabalFile = "00icvzsb8l70w5dcy0kkxrg0hpq273r8zyy6cx6hscpzgck090jf";
        libraryHaskellDepends = [ base free mtl ];
        description = "A truly tiny monadic parsing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284781,8 +284781,8 @@ self: {
        sha256 = "0qkg8aykr8whjrkwfnsds3bjbrb51r83rd60mpdwcs12zyqlpi0d";
        libraryHaskellDepends = [ base ];
        description = "Parser combinators for young padawans";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284796,7 +284796,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bindings-DSL ieee754 ];
        description = "Bindings to Facebook's Yoga layout library";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yoko" = callPackage
@@ -284815,8 +284815,8 @@ self: {
          type-functions type-ord type-ord-spine-cereal type-spine
        ];
        description = "Generic Programming with Disbanded Data Types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284828,8 +284828,8 @@ self: {
        sha256 = "1rpkxlfvk84zl965ik5bpplzcskd96wsnicp66ixnfs9bkqfj7qb";
        libraryHaskellDepends = [ base containers haskell98 ];
        description = "A library for digital circuit description";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284844,7 +284844,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring process utility-ht ];
        description = "Upload video to YouTube via YouTube API";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yql" = callPackage
@@ -284870,8 +284870,8 @@ self: {
          base containers ecma262 exceptions hxt opendatatable
        ];
        description = "A YQL engine to execute Open Data Tables";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284895,7 +284895,7 @@ self: {
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284910,7 +284910,7 @@ self: {
          base mtl pointed template-haskell yesod-core
        ];
        description = "mtl-style transformations for Yesod sites";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "yu-auth" = callPackage
@@ -284924,8 +284924,8 @@ self: {
        libraryHaskellDepends = [ base cryptonite memory yu-utils ];
        testHaskellDepends = [ base MonadRandom random yu-utils ];
        description = "Auth module for Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284938,8 +284938,8 @@ self: {
        libraryHaskellDepends = [ base yu-auth yu-utils ];
        testHaskellDepends = [ base blaze-markup hspec yu-utils ];
        description = "The core of Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284955,8 +284955,8 @@ self: {
          base cmdargs yaml yu-auth yu-core yu-utils
        ];
        description = "The launcher for Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284974,8 +284974,8 @@ self: {
          base cmdargs directory echo filepath process yu-auth yu-utils
        ];
        description = "Tool for Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -284999,8 +284999,8 @@ self: {
          warp xml-hamlet yesod-core
        ];
        description = "Utils for Yu";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285013,7 +285013,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Grids defined by layout hints and implemented on top of Yahoo grids";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yuuko" = callPackage
@@ -285036,8 +285036,8 @@ self: {
          haskell98 mtl network parsec
        ];
        description = "A transcendental HTML parser gently wrapping the HXT library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285050,8 +285050,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring lattices mtl ];
        testHaskellDepends = [ array base bytestring hspec mtl ];
        description = "Row-major coordinates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285090,8 +285090,8 @@ self: {
          time transformers vector xml-conduit
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285109,7 +285109,7 @@ self: {
        librarySystemDepends = [ gomp z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings for the Z3 Theorem Prover";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) gomp; inherit (pkgs) z3;};
 
   "z3-encoding" = callPackage
@@ -285121,8 +285121,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl z3 ];
        testHaskellDepends = [ base containers hspec z3 ];
        description = "High-level assertion encoding to Z3 solver";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285146,8 +285146,8 @@ self: {
          tasty-quickcheck text vector-sized
        ];
        description = "Implementation of the z85 binary codec";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285160,8 +285160,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Simple-minded abstract binding trees";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285173,7 +285173,7 @@ self: {
        sha256 = "0nxz74svi7as52vr84jr58zmcykll8g5kcq795cxs4zf720ahqsz";
        libraryHaskellDepends = [ base ];
        description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zampolit" = callPackage
@@ -285191,8 +285191,8 @@ self: {
          parsec time
        ];
        description = "A tool for checking how much work is done on group projects";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285204,8 +285204,8 @@ self: {
        sha256 = "131lfik05gkr7mqnxf2ibbv5nxjy2x76r5mpvwgzj06nq4v9n527";
        libraryHaskellDepends = [ base papillon ];
        description = "lojban parser (zasni gerna)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285219,8 +285219,8 @@ self: {
        libraryPkgconfigDepends = [ zbar ];
        libraryToolDepends = [ c2hs ];
        description = "zbar bindings in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zbar;};
 
@@ -285234,7 +285234,7 @@ self: {
          array base containers mersenne-random-pure64
        ];
        description = "Zobrist keys for game state tracking";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zenacy-html" = callPackage
@@ -285267,7 +285267,7 @@ self: {
          raw-strings-qq text
        ];
        description = "A standard compliant HTML parsing library";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "zenacy-unicode" = callPackage
@@ -285283,7 +285283,7 @@ self: {
          base bytestring HUnit test-framework test-framework-hunit text
        ];
        description = "Unicode utilities for Haskell";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "zenc" = callPackage
@@ -285294,7 +285294,7 @@ self: {
        sha256 = "0p0h7vz14k9v8gsnpkb9ca61i1k67vvsjg0bzy0ag4m20k94zlb2";
        libraryHaskellDepends = [ base ];
        description = "GHC style name Z-encoding and Z-decoding";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zendesk-api" = callPackage
@@ -285315,8 +285315,8 @@ self: {
          transformers unordered-containers x509 x509-store x509-validation
        ];
        description = "Zendesk API for Haskell programming language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285330,8 +285330,8 @@ self: {
        editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z";
        libraryHaskellDepends = [ base ];
        description = "@zenhack's personal custom prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285351,8 +285351,8 @@ self: {
          random text transformers
        ];
        description = "An automated proof system for Haskell programs";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285378,7 +285378,7 @@ self: {
        testHaskellDepends = [ base directory filepath ];
        doHaddock = false;
        description = "Zeolite is a statically-typed, general-purpose programming language";
-       license = stdenv.lib.licenses.asl20;
+       license = lib.licenses.asl20;
      }) {};
 
   "zephyr" = callPackage
@@ -285410,8 +285410,8 @@ self: {
        ];
        testToolDepends = [ purescript ];
        description = "Zephyr, tree-shaking for the PureScript language";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285423,7 +285423,7 @@ self: {
        sha256 = "1yb00wcgcyckzlf8kdxsdxpqra0r1sakwdph7pv9naa6q8zhhllw";
        libraryHaskellDepends = [ base semigroups ];
        description = "Semigroups with absorption";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zerobin" = callPackage
@@ -285444,8 +285444,8 @@ self: {
          base bytestring docopt raw-strings-qq
        ];
        description = "Post to 0bin services";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285464,8 +285464,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Bindings to ZeroMQ 2.1.x";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zeromq;};
 
@@ -285482,8 +285482,8 @@ self: {
          transformers zeromq3-haskell
        ];
        description = "Conduit bindings for zeromq3-haskell";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285506,8 +285506,8 @@ self: {
          MonadCatchIO-transformers QuickCheck transformers
        ];
        description = "Bindings to ZeroMQ 3.x";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) zeromq;};
 
@@ -285534,8 +285534,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Haskell implementation of the ZeroMQ clone pattern";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285554,8 +285554,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Conduit wrapper around zeromq4-haskell";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285577,7 +285577,7 @@ self: {
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Bindings to ZeroMQ 4.x";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq4-patterns" = callPackage
@@ -285600,8 +285600,8 @@ self: {
          test-framework-quickcheck2
        ];
        description = "Haskell implementation of several ZeroMQ patterns";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285617,7 +285617,7 @@ self: {
          aeson base bytestring constraints hashable uuid zeromq4-haskell
        ];
        description = "More constrained extensions to zeromq4-haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zeroth" = callPackage
@@ -285640,8 +285640,8 @@ self: {
          monoid-record process syb template-haskell
        ];
        description = "ZeroTH - remove unnecessary TH dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285666,8 +285666,8 @@ self: {
        ];
        testHaskellDepends = [ base ];
        description = "Command-line utility for working with zettelkast files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285691,8 +285691,8 @@ self: {
          genvalidity-path hspec path path-io QuickCheck stm
        ];
        description = "zifter";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285708,8 +285708,8 @@ self: {
          base directory filepath path path-io process safe zifter
        ];
        description = "zifter-cabal";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285721,8 +285721,8 @@ self: {
        sha256 = "1fsrair0c0a6j2jmghcxvbs3dr6j7gzh3yfimflva64nvwfx8vb8";
        libraryHaskellDepends = [ base path process zifter ];
        description = "zifter-git";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285738,8 +285738,8 @@ self: {
          base filepath path path-io process safe zifter
        ];
        description = "zifter-google-java-format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285755,8 +285755,8 @@ self: {
          base directory filepath path path-io process safe zifter
        ];
        description = "zifter-hindent";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285771,8 +285771,8 @@ self: {
          base filepath hlint path path-io safe zifter
        ];
        description = "zifter-hlint";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285792,8 +285792,8 @@ self: {
          zifter
        ];
        description = "zifter-stack";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285810,8 +285810,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285832,7 +285832,7 @@ self: {
          conduit-extra hspec lzma
        ];
        description = "Read and parse ZIM files";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
   "zinza" = callPackage
@@ -285854,7 +285854,7 @@ self: {
          tasty-golden tasty-hunit tasty-quickcheck
        ];
        description = "Typed templates with jinja like syntax";
-       license = stdenv.lib.licenses.gpl2Plus;
+       license = lib.licenses.gpl2Plus;
      }) {};
 
   "zio" = callPackage
@@ -285872,7 +285872,7 @@ self: {
          base mtl transformers unexceptionalio unexceptionalio-trans
        ];
        description = "App-centric Monad-transformer based on Scala ZIO (UIO + ReaderT + ExceptT)";
-       license = stdenv.lib.licenses.mpl20;
+       license = lib.licenses.mpl20;
      }) {};
 
   "zip" = callPackage
@@ -285902,7 +285902,7 @@ self: {
          filepath hspec QuickCheck temporary text time transformers
        ];
        description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zip-archive" = callPackage
@@ -285928,7 +285928,7 @@ self: {
        ];
        testToolDepends = [ unzip which ];
        description = "Library for creating and modifying zip archives";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) unzip; inherit (pkgs) which;};
 
   "zip-conduit" = callPackage
@@ -285957,8 +285957,8 @@ self: {
          temporary zip-archive
        ];
        description = "Working with zip archives via conduits";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -285983,7 +285983,7 @@ self: {
          text time transformers
        ];
        description = "ZIP archive streaming using conduits";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zipedit" = callPackage
@@ -285995,8 +285995,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process ];
        description = "Create simple list editor interfaces";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286012,8 +286012,8 @@ self: {
          base bytestring mersenne-random-pure64 mtl safe
        ];
        description = "Zipkin-style request tracing monad";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286025,8 +286025,8 @@ self: {
        sha256 = "1p8yn91snyv5p6bmll7d0gm0zbrhp99fl4kziq0vkbchlpcdjapf";
        libraryHaskellDepends = [ base multirec ];
        description = "Generic zipper for families of recursive datatypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286041,7 +286041,7 @@ self: {
          base comonad comonad-extras exceptions split
        ];
        description = "Zipper utils that weren't in Control.Comonad.Store.Zipper";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "zippers" = callPackage
@@ -286061,7 +286061,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion lens ];
        description = "Traversal based zippers";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zippo" = callPackage
@@ -286072,8 +286072,8 @@ self: {
        sha256 = "1ihdird5yryfb2ki9bwwchj8bxjcmmgjkp3hl605zzhi2lz3awx2";
        libraryHaskellDepends = [ base mtl yall ];
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286095,8 +286095,8 @@ self: {
          iso3166-country-codes servant-client
        ];
        description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286116,8 +286116,8 @@ self: {
          aeson base base-compat here hspec iso3166-country-codes text tz
        ];
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286135,7 +286135,7 @@ self: {
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Compression and decompression in the gzip and zlib formats";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage
@@ -286149,7 +286149,7 @@ self: {
        libraryHaskellDepends = [ base bytestring zlib ];
        testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
        description = "Low-level bindings to the zlib package";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zlib-conduit" = callPackage
@@ -286161,7 +286161,7 @@ self: {
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
        description = "Streaming compression/decompression via conduits. (deprecated)";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zlib-enum" = callPackage
@@ -286178,8 +286178,8 @@ self: {
          base bytestring enumerator transformers zlib-bindings
        ];
        description = "Enumerator interface for zlib compression";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286191,7 +286191,7 @@ self: {
        sha256 = "1sv6yx7p06zk653d3rmcj0lh2rzwzfi25v9sz9n8kq4r712n79g5";
        libraryHaskellDepends = [ base bytestring profunctors zlib ];
        description = "Lenses for zlib";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zm" = callPackage
@@ -286213,8 +286213,8 @@ self: {
          tasty tasty-hunit tasty-quickcheck text timeit
        ];
        description = "Language independent, reproducible, absolute types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286229,8 +286229,8 @@ self: {
        libraryHaskellDepends = [ base bytestring zeromq3-haskell ];
        executableHaskellDepends = [ base bytestring ];
        description = "Command-line tool for ZeroMQ";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286242,7 +286242,7 @@ self: {
        sha256 = "127c36pdp7rq03amz6r3pji1crw0f7q5xp0baf782yq71fjgy4c5";
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Read and write MIDI files";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zmidi-score" = callPackage
@@ -286259,8 +286259,8 @@ self: {
          directory filepath mtl parallel-io text zmidi-core
        ];
        description = "Representing MIDI a simple score";
-       license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286279,7 +286279,7 @@ self: {
        ];
        description = "A socat-like tool for zeromq library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "zoneinfo" = callPackage
@@ -286290,8 +286290,8 @@ self: {
        sha256 = "1n27j8ca79a1ijn7k7dp61kjz62i6zfzlns8n0kwgyvpx413ws8y";
        libraryHaskellDepends = [ base time ];
        description = "ZoneInfo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286310,8 +286310,8 @@ self: {
          base directory filepath ghc hint mtl
        ];
        description = "A rake/thor-like task runner written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286343,8 +286343,8 @@ self: {
          test-framework-quickcheck2 transformers type-level unix
        ];
        description = "A streamable, seekable, zoomable cache file format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286361,8 +286361,8 @@ self: {
          type-level zoom-cache
        ];
        description = "Library for zoom-cache PCM audio codecs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286382,8 +286382,8 @@ self: {
          mtl ui-command vector zoom-cache zoom-cache-pcm
        ];
        description = "Tools for generating zoom-cache-pcm files";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.lgpl21;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286395,8 +286395,8 @@ self: {
        sha256 = "0axkg2cp0gdlf82w0lfff740cd1d5zq4s9rqg0hg9v9vx7ahwg3l";
        libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286413,7 +286413,7 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zre" = callPackage
@@ -286446,8 +286446,8 @@ self: {
          base bytestring QuickCheck quickcheck-instances uuid
        ];
        description = "ZRE protocol implementation";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ sorki ];
+       license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sorki ];
      }) {};
 
   "zsdd" = callPackage
@@ -286462,8 +286462,8 @@ self: {
          base containers hashable mtl unordered-containers
        ];
        description = "Zero-Suppressed and Reduced Decision Diagrams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286477,8 +286477,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath mtl ];
        description = "Ascii bars representing battery status";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286499,7 +286499,7 @@ self: {
          base bytestring criterion ghc-prim zlib
        ];
        description = "Haskell bindings to the Zstandard compression algorithm";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zsyntax" = callPackage
@@ -286513,8 +286513,8 @@ self: {
        ];
        testHaskellDepends = [ base containers mtl multiset ];
        description = "Automated theorem prover for the Zsyntax biochemical calculus";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286535,7 +286535,7 @@ self: {
          unix unordered-containers
        ];
        description = "Multi-file, colored, filtered log tailer";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "ztar" = callPackage
@@ -286556,8 +286556,8 @@ self: {
          quickcheck-instances tasty tasty-quickcheck
        ];
        description = "Creating and extracting arbitrary archives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286596,8 +286596,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        description = "A lisp processor, An inline-lisp, in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286609,7 +286609,7 @@ self: {
        sha256 = "1382h7fib8vicjh7axdwp2i4zjm0ysgw0b1f5nkn38dqgwbfwlik";
        libraryHaskellDepends = [ base ];
        description = "Password strength estimation";
-       license = stdenv.lib.licenses.bsd3;
+       license = lib.licenses.bsd3;
      }) {};
 
   "zxcvbn-dvorak" = callPackage
@@ -286627,8 +286627,8 @@ self: {
          unordered-containers zlib zxcvbn-hs
        ];
        description = "Password strength estimation based on zxcvbn";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
 
@@ -286665,7 +286665,7 @@ self: {
          unordered-containers vector zlib
        ];
        description = "Password strength estimation based on zxcvbn";
-       license = stdenv.lib.licenses.mit;
+       license = lib.licenses.mit;
      }) {};
 
   "zydiskell" = callPackage
@@ -286683,7 +286683,7 @@ self: {
          base bytestring containers fixed-vector storable-record
        ];
        description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler";
-       license = stdenv.lib.licenses.gpl3;
+       license = lib.licenses.gpl3;
      }) {};
 
 }
diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/pkgs/development/haskell-modules/initial-packages.nix
index 6ab7da96911..3bbf9c037dd 100644
--- a/pkgs/development/haskell-modules/initial-packages.nix
+++ b/pkgs/development/haskell-modules/initial-packages.nix
@@ -1,2 +1,2 @@
-args@{ pkgs, stdenv, callPackage }: self:
+args@{ pkgs, lib, callPackage }: self:
    (import ./hackage-packages.nix args self)
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 4ae3f0b2427..91937b88eaf 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -11,9 +11,13 @@
 , # package-set used for non-haskell dependencies (all of nixpkgs)
   pkgs
 
-, # stdenv to use for building haskell packages
+, # stdenv provides our build and host platforms
   stdenv
 
+, # this module provides the list of known licenses and maintainers
+  lib
+
+  # needed for overrideCabal & packageSourceOverrides
 , haskellLib
 
 , # hashes for downloading Hackage packages
@@ -22,7 +26,7 @@
 , # compiler to use
   ghc
 
-, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and
+, # A function that takes `{ pkgs, lib, callPackage }` as the first arg and
   # `self` as second, and returns a set of haskell packages
   package-set
 
@@ -169,7 +173,7 @@ let
       };
     });
 
-in package-set { inherit pkgs stdenv callPackage; } self // {
+in package-set { inherit pkgs lib callPackage; } self // {
 
     inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages;
 

From d07ff60c02351c20537106ad0d3fe8a8f6e82265 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jan 2021 19:36:11 +0100
Subject: [PATCH 628/956] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.16.0-9-ga573266 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/61c759fc797fec930eaed15016faa4bdf7c53c75.
---
 .../haskell-modules/hackage-packages.nix      | 811 +++++++++---------
 1 file changed, 408 insertions(+), 403 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8d8bfde3879..520f21ec899 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3132,6 +3132,25 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "ChasingBottoms_1_3_1_10" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
+     , syb
+     }:
+     mkDerivation {
+       pname = "ChasingBottoms";
+       version = "1.3.1.10";
+       sha256 = "1flr56hd8ny0ddlv1agi0ikdjv5wgx0aba6xqdsn3nv6dyw9nbf3";
+       libraryHaskellDepends = [
+         base containers mtl QuickCheck random syb
+       ];
+       testHaskellDepends = [
+         array base containers mtl QuickCheck random syb
+       ];
+       description = "For testing partial and infinite values";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "CheatSheet" = callPackage
     ({ mkDerivation, base, containers, directory }:
      mkDerivation {
@@ -6291,7 +6310,7 @@ self: {
          transformers trifecta unordered-containers vector
        ];
        description = "(Context-free) grammars in formal language theory";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -6758,23 +6777,6 @@ self: {
      }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, OpenGL, StateVar
-     , transformers
-     }:
-     mkDerivation {
-       pname = "GLUT";
-       version = "2.7.0.15";
-       sha256 = "0271vnf6wllhxjwy0m348x90kv27aybxcbqkkglmd5w4cpwjg5g9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base containers OpenGL StateVar transformers
-       ];
-       description = "A binding for the OpenGL Utility Toolkit";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "GLUT_2_7_0_16" = callPackage
     ({ mkDerivation, array, base, containers, OpenGL, StateVar
      , transformers
      }:
@@ -6789,7 +6791,6 @@ self: {
        ];
        description = "A binding for the OpenGL Utility Toolkit";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "GLUtil" = callPackage
@@ -9487,12 +9488,27 @@ self: {
        pname = "HUnit";
        version = "1.6.1.0";
        sha256 = "1rpi52rnjpyv379rm6n3s706z6mv114aychf03dq456wfa4b7123";
+       revision = "1";
+       editedCabalFile = "1pb42lix1fzhvcc2g7kz5lw8fsz6kcj9b7almr7kvv38f8vmbn5i";
        libraryHaskellDepends = [ base call-stack deepseq ];
        testHaskellDepends = [ base call-stack deepseq filepath ];
        description = "A unit testing framework for Haskell";
        license = lib.licenses.bsd3;
      }) {};
 
+  "HUnit_1_6_2_0" = callPackage
+    ({ mkDerivation, base, call-stack, deepseq, filepath }:
+     mkDerivation {
+       pname = "HUnit";
+       version = "1.6.2.0";
+       sha256 = "1as4sw5y39c3zrmr6sb8zbw74c9gdn4401y0dx45ih7zf6457dxh";
+       libraryHaskellDepends = [ base call-stack deepseq ];
+       testHaskellDepends = [ base call-stack deepseq filepath ];
+       description = "A unit testing framework for Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "HUnit-Diff" = callPackage
     ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }:
      mkDerivation {
@@ -17612,8 +17628,8 @@ self: {
      }:
      mkDerivation {
        pname = "SJW";
-       version = "0.1.2.2";
-       sha256 = "0ffwlsm8ynmi1nyx1a8j65p9llk7s68g3srkgk1i47rvddn70h6q";
+       version = "0.1.2.3";
+       sha256 = "10ky2pd83wng5bgpqimdyxvhlfpwbssgh576ss28f1rzm6b8wqcm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32170,32 +32186,35 @@ self: {
      }) {};
 
   "arch-hs" = callPackage
-    ({ mkDerivation, aeson, algebraic-graphs, base, bytestring, Cabal
-     , conduit, conduit-extra, containers, deepseq, Diff, directory
-     , filepath, hackage-db, megaparsec, microlens, microlens-th
+    ({ mkDerivation, aeson, algebraic-graphs, arch-web, base
+     , bytestring, Cabal, conduit, conduit-extra, containers, deepseq
+     , Diff, directory, filepath, hackage-db, http-client
+     , http-client-tls, megaparsec, microlens, microlens-th
      , neat-interpolation, optparse-applicative, polysemy, prettyprinter
-     , prettyprinter-ansi-terminal, req, split, tar-conduit
+     , prettyprinter-ansi-terminal, servant-client, split, tar-conduit
      , template-haskell, text
      }:
      mkDerivation {
        pname = "arch-hs";
-       version = "0.6.2.0";
-       sha256 = "10v2n1m5608g2lqgn16bwwhlafbj2hhnsnvm22pfff4ahnvj7880";
+       version = "0.7.0.0";
+       sha256 = "0nlsxlqmjg0nw9dgd3l8s1zphzcwrbcvmv30s5y5xbfm06zc5wc7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson algebraic-graphs base bytestring Cabal conduit conduit-extra
-         containers deepseq Diff directory filepath hackage-db megaparsec
-         microlens microlens-th neat-interpolation optparse-applicative
-         polysemy prettyprinter prettyprinter-ansi-terminal req split
-         tar-conduit template-haskell text
+         aeson algebraic-graphs arch-web base bytestring Cabal conduit
+         conduit-extra containers deepseq Diff directory filepath hackage-db
+         http-client http-client-tls megaparsec microlens microlens-th
+         neat-interpolation optparse-applicative polysemy prettyprinter
+         prettyprinter-ansi-terminal servant-client split tar-conduit
+         template-haskell text
        ];
        executableHaskellDepends = [
-         aeson algebraic-graphs base bytestring Cabal conduit conduit-extra
-         containers deepseq Diff directory filepath hackage-db megaparsec
-         microlens microlens-th neat-interpolation optparse-applicative
-         polysemy prettyprinter prettyprinter-ansi-terminal req split
-         tar-conduit template-haskell text
+         aeson algebraic-graphs arch-web base bytestring Cabal conduit
+         conduit-extra containers deepseq Diff directory filepath hackage-db
+         http-client http-client-tls megaparsec microlens microlens-th
+         neat-interpolation optparse-applicative polysemy prettyprinter
+         prettyprinter-ansi-terminal servant-client split tar-conduit
+         template-haskell text
        ];
        description = "Distribute hackage packages to archlinux";
        license = lib.licenses.mit;
@@ -35250,7 +35269,7 @@ self: {
          base http-client http-client-tls tasty tasty-hunit
        ];
        description = "Access metadata from the Arch Linux User Repository";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -35306,7 +35325,7 @@ self: {
          versions
        ];
        description = "A secure package manager for Arch Linux and the AUR";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -37120,7 +37139,7 @@ self: {
          base filepath HUnit process QuickCheck unix
        ];
        description = "Backstop a target directory by source directories";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -39877,6 +39896,29 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "bifunctors_5_5_10" = callPackage
+    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
+     , hspec-discover, QuickCheck, tagged, template-haskell
+     , th-abstraction, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "bifunctors";
+       version = "5.5.10";
+       sha256 = "03d96df4j1aq9z7hrk3n519g3h7fjgjf82fmgp6wxxbaigyrqwp7";
+       libraryHaskellDepends = [
+         base base-orphans comonad containers tagged template-haskell
+         th-abstraction transformers
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck template-haskell transformers
+         transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bifunctors";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "bighugethesaurus" = callPackage
     ({ mkDerivation, base, HTTP, split }:
      mkDerivation {
@@ -43297,10 +43339,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-builder";
-       version = "0.4.1.0";
-       sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i";
-       revision = "1";
-       editedCabalFile = "1p66mh9z3aqgind755xzf39pvl2hwjnwrlwiwyj653yzb1gn6c9j";
+       version = "0.4.2.1";
+       sha256 = "01hbx82djckj2x74sk9kc79111djq7f2af3zl5i21y9zkjy8js3f";
        libraryHaskellDepends = [ base bytestring deepseq text ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -46927,7 +46967,7 @@ self: {
          base extra hspec parsec parsec-numbers text
        ];
        description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
      }) {};
 
   "byte-order" = callPackage
@@ -49106,8 +49146,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.15.6";
-       sha256 = "0jkdy36qpi7b7a14dg0iqgn4k3cia8wj1yi8pg82v430rspnkfdb";
+       version = "2.16.0";
+       sha256 = "0kxxn218r1r9fia72zv8xzb8yji5y2jbwzqz033ljvwbm3abxp2k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50020,6 +50060,19 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "call-stack_0_3_0" = callPackage
+    ({ mkDerivation, base, nanospec }:
+     mkDerivation {
+       pname = "call-stack";
+       version = "0.3.0";
+       sha256 = "0ski7ihdxah7x4x07qgkjljg8hzqs9d6aa5k4cmr40bzp3i8s3mq";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base nanospec ];
+       description = "Use GHC call-stacks in a backward compatible way";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "camfort" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, fgl, filepath, flint, fortran-src
@@ -56192,6 +56245,20 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "clock_0_8_2" = callPackage
+    ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "clock";
+       version = "0.8.2";
+       sha256 = "0qg4ljwmw28vvxjzr4sknh8220abjcx2b0sq3ljqprh3qw8b2p8b";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "High-resolution clock functions: monotonic, realtime, cputime";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "clock-extras" = callPackage
     ({ mkDerivation, base, clock, hspec }:
      mkDerivation {
@@ -61110,25 +61177,6 @@ self: {
      }) {};
 
   "conferer" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , filepath, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "conferer";
-       version = "1.0.0.0";
-       sha256 = "0hxlr45yfzv1lxw9lz7mk5risshdhmznxz0xqx5bsdyl7nbd79pv";
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath text
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory filepath hspec
-         QuickCheck text
-       ];
-       description = "Configuration management library";
-       license = lib.licenses.mpl20;
-     }) {};
-
-  "conferer_1_0_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , filepath, hspec, QuickCheck, text
      }:
@@ -61145,7 +61193,6 @@ self: {
        ];
        description = "Configuration management library";
        license = lib.licenses.mpl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "conferer-aeson" = callPackage
@@ -76680,8 +76727,8 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-nixpkgs";
-       version = "1.3.1";
-       sha256 = "1113qizh931inpim0ajfwihcvlp26n1l4bf36v0jakd34k70mm8g";
+       version = "1.4.0";
+       sha256 = "1935lg05bfzwrvppi11r05nhwa1gkmvv0xqv1kqkbc87bk6pvp5g";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq language-nix lens
          pretty process split
@@ -76930,6 +76977,28 @@ self: {
        broken = true;
      }) {};
 
+  "dl-fedora_0_7_6" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, filepath
+     , http-directory, http-types, optparse-applicative, regex-posix
+     , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
+     }:
+     mkDerivation {
+       pname = "dl-fedora";
+       version = "0.7.6";
+       sha256 = "03npp2cq1259w590am87v0r4q48pfjq2zb2b04hymlr6hi3a8xw5";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory extra filepath http-directory http-types
+         optparse-applicative regex-posix simple-cmd simple-cmd-args text
+         time unix xdg-userdirs
+       ];
+       description = "Fedora image download tool";
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "dlist" = callPackage
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
      mkDerivation {
@@ -79172,7 +79241,7 @@ self: {
        libraryHaskellDepends = [ array base containers random ];
        testHaskellDepends = [ array base containers QuickCheck ];
        description = "Haskell Digital Signal Processing";
-       license = lib.licenses.gpl2;
+       license = lib.licenses.gpl2Only;
      }) {};
 
   "dstring" = callPackage
@@ -83927,21 +83996,6 @@ self: {
      }) {};
 
   "equational-reasoning" = callPackage
-    ({ mkDerivation, base, containers, template-haskell, th-desugar
-     , th-extras, void
-     }:
-     mkDerivation {
-       pname = "equational-reasoning";
-       version = "0.6.0.3";
-       sha256 = "003prif9pjjcj67nv6hxr0y70ik5qg1sddzh82y97a1l7m6kigfq";
-       libraryHaskellDepends = [
-         base containers template-haskell th-desugar th-extras void
-       ];
-       description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "equational-reasoning_0_6_0_4" = callPackage
     ({ mkDerivation, base, containers, template-haskell, th-desugar
      , void
      }:
@@ -83954,7 +84008,6 @@ self: {
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "equational-reasoning-induction" = callPackage
@@ -95014,15 +95067,15 @@ self: {
      }) {};
 
   "friendly" = callPackage
-    ({ mkDerivation, base, bifunctors, lens, optparse-applicative }:
+    ({ mkDerivation, base, bifunctors, optparse-applicative }:
      mkDerivation {
        pname = "friendly";
-       version = "0.1.0.2";
-       sha256 = "18j9nw76rwsikf5wyv33mw04mn4xmdnk757c26zfbcx8rkcwjqzn";
+       version = "0.1.0.3";
+       sha256 = "1djmj4nmn4g36iab0z7npgc34vvfspvafr5a4bblnv41glx1wpc1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bifunctors lens optparse-applicative
+         base bifunctors optparse-applicative
        ];
        description = "Attempt to pretty-print any input";
        license = lib.licenses.bsd3;
@@ -99846,12 +99899,14 @@ self: {
      }) {};
 
   "ghc-datasize" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-heap, ghc-prim }:
+    ({ mkDerivation, base, deepseq, ghc-lib-parser-ex, ghc-prim }:
      mkDerivation {
        pname = "ghc-datasize";
-       version = "0.2.2";
-       sha256 = "19iapv0m2g7d5i88pg9h19r89hafwj5f3h5682sp37irl4mzwkww";
-       libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ];
+       version = "0.2.3";
+       sha256 = "1sbzharb72ngbq10mqvia4yb71mkhk5s5n1xd8nm11xpvqy4q28k";
+       libraryHaskellDepends = [
+         base deepseq ghc-lib-parser-ex ghc-prim
+       ];
        description = "Determine the size of data structures in GHC's memory";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -100835,31 +100890,6 @@ self: {
      }) {};
 
   "ghc-typelits-presburger" = callPackage
-    ({ mkDerivation, base, containers, equational-reasoning, ghc
-     , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty
-     , tasty-discover, tasty-expected-failure, tasty-hunit, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-presburger";
-       version = "0.4.0.0";
-       sha256 = "0sz8n323vcwgx3haq6235k1hs0yqg8qnksqk5wwz9a2gkb45gqn2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers ghc ghc-tcplugins-extra mtl pretty reflection syb
-         transformers
-       ];
-       testHaskellDepends = [
-         base equational-reasoning tasty tasty-discover
-         tasty-expected-failure tasty-hunit text
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "ghc-typelits-presburger_0_5_0_0" = callPackage
     ({ mkDerivation, base, containers, equational-reasoning, ghc
      , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty
      , tasty-discover, tasty-expected-failure, tasty-hunit, text
@@ -100882,7 +100912,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ghc-usage" = callPackage
@@ -104472,8 +104501,6 @@ self: {
        testHaskellDepends = [ base data-default hspec ];
        description = "Glicko-2 implementation in Haskell";
        license = lib.licenses.gpl3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "glider-nlp" = callPackage
@@ -111969,20 +111996,24 @@ self: {
      }) {};
 
   "hablo" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, lucid, mtl, optparse-applicative, parsec, template
-     , text, time, unix
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , directory, filepath, lucid, mtl, optparse-applicative, parsec
+     , SJW, template, text, time, unix
      }:
      mkDerivation {
        pname = "hablo";
-       version = "1.0.1.0";
-       sha256 = "1jbbh8d2xdcdgm4kq4yn6i6h9g996m2zqklg8s5b5h5jlzk7hfvs";
-       isLibrary = false;
+       version = "1.1.0.1";
+       sha256 = "0jn547idw8ypa5b6wbavpwr4haidgh89gg61bscpxn0psx6r5ahc";
+       isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers directory filepath lucid mtl
-         optparse-applicative parsec template text time unix
+         optparse-applicative parsec SJW template text time unix
+       ];
+       executableHaskellDepends = [ base mtl ];
+       testHaskellDepends = [
+         base Cabal containers directory filepath lucid mtl text
        ];
        description = "A minimalist static blog generator";
        license = lib.licenses.bsd3;
@@ -116066,8 +116097,10 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.4.3";
-       sha256 = "1sfnr6qrv95ryf6c4hpj3vj8v6y64qjjd2fnz4x9i37win9wcb1z";
+       version = "0.1.4.4";
+       sha256 = "0kk1lamyms1mf8d290c3asnvgk51i8sqj810whms2a5346w9n4ll";
+       revision = "1";
+       editedCabalFile = "1bnbhq6k2af08riyaplfgm2lzghhi3nc0ijiw0yk1y5pq618zhxy";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default mtl network text
@@ -123619,6 +123652,32 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_14_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit
+     , mtl, network, network-uri, resource-pool, scanner, stm
+     , test-framework, test-framework-hunit, text, time, tls
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.14.1";
+       sha256 = "0n7hwg8mp4v512g7s8cblmai0j00l1149bbdacm6s7d0plnk0qqd";
+       libraryHaskellDepends = [
+         async base bytestring bytestring-lexing containers deepseq errors
+         exceptions HTTP mtl network network-uri resource-pool scanner stm
+         text time tls unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base bytestring doctest HUnit mtl stm test-framework
+         test-framework-hunit text time
+       ];
+       benchmarkHaskellDepends = [ base mtl time ];
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
      , time
@@ -124891,7 +124950,7 @@ self: {
        ];
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
-       license = lib.licenses.agpl3;
+       license = lib.licenses.agpl3Only;
      }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
@@ -126300,25 +126359,25 @@ self: {
      }) {};
 
   "hiedb" = callPackage
-    ({ mkDerivation, algebraic-graphs, array, base, bytestring
-     , containers, directory, extra, filepath, ghc, ghc-paths
-     , hie-compat, hspec, lucid, mtl, optparse-applicative, process
-     , sqlite-simple, terminal-size, text
+    ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base
+     , bytestring, containers, directory, extra, filepath, ghc
+     , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative
+     , process, sqlite-simple, temporary, text
      }:
      mkDerivation {
        pname = "hiedb";
-       version = "0.2.0.0";
-       sha256 = "02c5q935g59j8wm86mci2k78qmhs5kg1hg2jpxy5ylj7vfszwhvk";
+       version = "0.3.0.0";
+       sha256 = "1g2dzprxja8isw4irgbh8aabzr9iswb9szpn5nwnvbkzkabfqabd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         algebraic-graphs array base bytestring containers directory extra
-         filepath ghc hie-compat lucid mtl optparse-applicative
-         sqlite-simple terminal-size text
+         algebraic-graphs ansi-terminal array base bytestring containers
+         directory extra filepath ghc hie-compat lucid mtl
+         optparse-applicative sqlite-simple text
        ];
        executableHaskellDepends = [ base ghc-paths ];
        testHaskellDepends = [
-         base directory filepath ghc ghc-paths hspec process
+         base directory filepath ghc ghc-paths hspec process temporary
        ];
        description = "Generates a references DB from .hie files";
        license = lib.licenses.bsd3;
@@ -128705,6 +128764,8 @@ self: {
        pname = "hls-hlint-plugin";
        version = "0.1.0.0";
        sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq";
+       revision = "1";
+       editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s";
        libraryHaskellDepends = [
          aeson apply-refact base binary bytestring containers data-default
          deepseq Diff directory extra filepath ghc ghcide hashable
@@ -128726,8 +128787,8 @@ self: {
        pname = "hls-plugin-api";
        version = "0.6.0.0";
        sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi";
-       revision = "1";
-       editedCabalFile = "1x0zmwv34ns9i2104mrxxb9wji7z0ds212b4dsfgd4j844yirkwa";
+       revision = "2";
+       editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji";
        libraryHaskellDepends = [
          aeson base containers data-default Diff hashable haskell-lsp
          hslogger lens process regex-tdfa shake text unix
@@ -135669,21 +135730,6 @@ self: {
      }) {};
 
   "hspec" = callPackage
-    ({ mkDerivation, base, hspec-core, hspec-discover
-     , hspec-expectations, QuickCheck
-     }:
-     mkDerivation {
-       pname = "hspec";
-       version = "2.7.6";
-       sha256 = "0ynd111mwm5ykl74nb7ac7mz1b9xvs1hqjdksfm83dy2sj4axwpx";
-       libraryHaskellDepends = [
-         base hspec-core hspec-discover hspec-expectations QuickCheck
-       ];
-       description = "A Testing Framework for Haskell";
-       license = lib.licenses.mit;
-     }) {};
-
-  "hspec_2_7_8" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
      }:
@@ -135696,7 +135742,6 @@ self: {
        ];
        description = "A Testing Framework for Haskell";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -135755,33 +135800,6 @@ self: {
      }) {};
 
   "hspec-core" = callPackage
-    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
-     , deepseq, directory, filepath, hspec-expectations, hspec-meta
-     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
-     , silently, stm, temporary, tf-random, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-core";
-       version = "2.7.6";
-       sha256 = "1j9kpvjf1yz3bl32cklxz8dnykc48ya67lin4r2hvbzcd3kg63rf";
-       libraryHaskellDepends = [
-         ansi-terminal array base call-stack clock deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv stm tf-random transformers
-       ];
-       testHaskellDepends = [
-         ansi-terminal array base call-stack clock deepseq directory
-         filepath hspec-expectations hspec-meta HUnit process QuickCheck
-         quickcheck-io random setenv silently stm temporary tf-random
-         transformers
-       ];
-       testToolDepends = [ hspec-meta ];
-       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
-       description = "A Testing Framework for Haskell";
-       license = lib.licenses.mit;
-     }) {};
-
-  "hspec-core_2_7_8" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -135806,7 +135824,6 @@ self: {
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
        description = "A Testing Framework for Haskell";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-dirstream" = callPackage
@@ -135828,25 +135845,6 @@ self: {
      }) {};
 
   "hspec-discover" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
-     }:
-     mkDerivation {
-       pname = "hspec-discover";
-       version = "2.7.6";
-       sha256 = "12n26rxdrpk54fqrgrdj7r8kyq3fla3na10j4pnsjkir72bvhd17";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base directory filepath hspec-meta QuickCheck
-       ];
-       testToolDepends = [ hspec-meta ];
-       description = "Automatically discover and run Hspec tests";
-       license = lib.licenses.mit;
-     }) {};
-
-  "hspec-discover_2_7_8" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
@@ -135863,7 +135861,6 @@ self: {
        testToolDepends = [ hspec-meta ];
        description = "Automatically discover and run Hspec tests";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hspec-expectations" = callPackage
@@ -140929,6 +140926,31 @@ self: {
        license = lib.licenses.mit;
      }) {inherit (pkgs) rdkafka;};
 
+  "hw-kafka-client_4_0_2" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
+     , either, hspec, hspec-discover, monad-loops, rdkafka, text
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "hw-kafka-client";
+       version = "4.0.2";
+       sha256 = "166gi8mj2ljv4xcjrhi2pgjmnj112998fzbzjfpf5ckj54d20ch9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring containers text transformers unix
+       ];
+       librarySystemDepends = [ rdkafka ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bifunctors bytestring containers either hspec monad-loops text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Kafka bindings for Haskell";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) rdkafka;};
+
   "hw-kafka-conduit" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, conduit
      , conduit-extra, containers, exceptions, extra, hspec
@@ -145669,24 +145691,6 @@ self: {
      }) {};
 
   "inline-c-cpp" = callPackage
-    ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "inline-c-cpp";
-       version = "0.4.0.2";
-       sha256 = "0nb7n2q47jbny7rj9y1hn6lnailnmpy4y7j6jaalny123kxsdipp";
-       libraryHaskellDepends = [
-         base containers inline-c safe-exceptions template-haskell
-       ];
-       testHaskellDepends = [
-         base containers hspec inline-c safe-exceptions
-       ];
-       description = "Lets you embed C++ code into Haskell";
-       license = lib.licenses.mit;
-     }) {};
-
-  "inline-c-cpp_0_4_0_3" = callPackage
     ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions
      , template-haskell, vector
      }:
@@ -145703,7 +145707,6 @@ self: {
        ];
        description = "Lets you embed C++ code into Haskell";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "inline-c-win32" = callPackage
@@ -158683,8 +158686,8 @@ self: {
        pname = "lens";
        version = "4.19.2";
        sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j";
-       revision = "2";
-       editedCabalFile = "1bp6s0ifwdmzv946krxgxqakw02iriqmzvvcypwrgcynrn9wkn9y";
+       revision = "3";
+       editedCabalFile = "1anqghjbi0wyvqpg7qcbph5rfq78sjpdavrajh4z6f20kzy4mn45";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -171519,8 +171522,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microbase";
-       version = "4.14.0.0.6";
-       sha256 = "1wnng6ik7p4id5p7crbk9gwy0c4rg2rggkphc4wqfmc2zgpl1ywq";
+       version = "4.15.0.0.1";
+       sha256 = "0dslfkfvjr5zfdw5vmxi1xrblvy3g0l13d38m4c30rgl3nhxyjlm";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "A minimal base to work around GHC bugs";
@@ -173310,6 +173313,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "mixed-types-num_0_4_1" = callPackage
+    ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck
+     , smallcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.4.1";
+       sha256 = "159zx9b5p3g1ywhnbihjbxkpxylgrkhhrswmazymqbh49f4s758y";
+       libraryHaskellDepends = [
+         base hspec hspec-smallcheck mtl QuickCheck smallcheck
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "mixpanel-client" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec
      , hspec-discover, http-client, http-client-tls, markdown-unlit
@@ -177371,7 +177392,7 @@ self: {
        ];
        executableToolDepends = [ c2hs ];
        description = "A work in progress Multipath TCP path manager";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -183856,7 +183877,7 @@ self: {
        ];
        doHaddock = false;
        description = "Future-proof system for plain-text notes";
-       license = lib.licenses.agpl3;
+       license = lib.licenses.agpl3Only;
        maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
@@ -193206,7 +193227,7 @@ self: {
          base Cabal optparse-generic protolude
        ];
        description = "Help Manage project specific documentation";
-       license = lib.licenses.agpl3;
+       license = lib.licenses.agpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -197758,8 +197779,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-array";
-       version = "0.2.1.0";
-       sha256 = "12ri0dv6ifswnp983asa0yyd7xl58ic22payxpri6653f58lkc4h";
+       version = "0.2.2.0";
+       sha256 = "1b8i9kgybidiczlpwyb2grgkxgyscdnldfpj75snwnpyyw40qlfs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197791,19 +197812,15 @@ self: {
   "phonetic-languages-simplified-examples-common" = callPackage
     ({ mkDerivation, base, heaps, mmsyn2-array
      , phonetic-languages-constraints-array
-     , phonetic-languages-simplified-common
-     , phonetic-languages-simplified-properties-lists-double
      , phonetic-languages-ukrainian-array, subG
      , ukrainian-phonetics-basic-array
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-common";
-       version = "0.1.0.0";
-       sha256 = "0khgv7gycsr1qvc0d158ics2zmxvpybrr5k105ifq93y2qgcjqpa";
+       version = "0.1.1.0";
+       sha256 = "09h63czjpab863gi7806k1yw4q9mykszvvnb3zwbv9i97nfbvnfa";
        libraryHaskellDepends = [
          base heaps mmsyn2-array phonetic-languages-constraints-array
-         phonetic-languages-simplified-common
-         phonetic-languages-simplified-properties-lists-double
          phonetic-languages-ukrainian-array subG
          ukrainian-phonetics-basic-array
        ];
@@ -205201,8 +205218,8 @@ self: {
     ({ mkDerivation, base, hspec, mtl, tagged }:
      mkDerivation {
        pname = "pretty-types";
-       version = "0.3.0.1";
-       sha256 = "06dkyk3zdi9wv77yza0vgwl9v8zhyazyhdjbffkqpism07c80rgv";
+       version = "0.4.0.0";
+       sha256 = "0vfsriviwbrbs9kwg8jwfk5ih9ckv1bfgdxbkcqz8cfaxmbqx4f7";
        libraryHaskellDepends = [ base mtl tagged ];
        testHaskellDepends = [ base hspec tagged ];
        description = "A small pretty printing DSL for complex types";
@@ -222867,6 +222884,24 @@ self: {
        broken = true;
      }) {};
 
+  "rz-pipe" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HTTP, process
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "rz-pipe";
+       version = "0.1.0";
+       sha256 = "0x8mdry5l8b4dnpi43g2vqj9haggi7asnjhdz864bw17gr53g8vx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring HTTP process utf8-string
+       ];
+       executableHaskellDepends = [ aeson base ];
+       description = "Pipe interface for Rizin";
+       license = lib.licenses.mit;
+     }) {};
+
   "s-cargot" = callPackage
     ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck, text
      }:
@@ -225127,7 +225162,7 @@ self: {
          network process regex safe split terminal-size text tls x509-store
        ];
        description = "Haskell query for SciDB via shim";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -227623,6 +227658,30 @@ self: {
        license = lib.licenses.gpl3;
      }) {};
 
+  "sequence-formats_1_5_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, errors
+     , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
+     , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "sequence-formats";
+       version = "1.5.2";
+       sha256 = "0n09mw9z8bjqr8dc32l7swp25vgci7m2hb1w6masgv2cw8irh7as";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers errors exceptions foldl
+         lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
+         transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec pipes pipes-safe tasty
+         tasty-hunit transformers vector
+       ];
+       description = "A package with basic parsing utilities for several Bioinformatic data formats";
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "sequenceTools" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec
      , lens-family, optparse-applicative, pipes, pipes-group
@@ -229920,17 +229979,17 @@ self: {
 
   "servant-serf" = callPackage
     ({ mkDerivation, attoparsec, base, hpack, mtl, optparse-applicative
-     , parser-combinators, regex-base, regex-tdfa, text, tomland
+     , parser-combinators, regex-base, regex-tdfa, text
      }:
      mkDerivation {
        pname = "servant-serf";
-       version = "0.0.3";
-       sha256 = "10ky0hmz1484jz0grwmac9208vlv4k8jwzn2imbrn405p76iifdm";
+       version = "0.1.0";
+       sha256 = "08x4d595czal5j5dgd08bps4swsrh547nnmk4i006jjvbl0315nf";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
          attoparsec base hpack mtl optparse-applicative parser-combinators
-         regex-base regex-tdfa text tomland
+         regex-base regex-tdfa text
        ];
        doHaddock = false;
        description = "Generates a servant API module";
@@ -230086,8 +230145,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-static-th";
-       version = "0.2.4.0";
-       sha256 = "1xmikym19kq912apmh6zcdjzbz23mhn580pvsy5ll35ylqziaflk";
+       version = "1.0.0.0";
+       sha256 = "1iky6bk92vzhsw31hfdhgclr4nq1kmic6w9mwd5fzjhbs5vcmm15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -234737,23 +234796,6 @@ self: {
      }) {};
 
   "singletons-presburger" = callPackage
-    ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection
-     , singletons
-     }:
-     mkDerivation {
-       pname = "singletons-presburger";
-       version = "0.4.0.0";
-       sha256 = "0jdyynjapviks042jw3vfq27yk3wvjg7n7xmq3m3x0v195731jph";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base ghc ghc-typelits-presburger reflection singletons
-       ];
-       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "singletons-presburger_0_5_0_0" = callPackage
     ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl
      , reflection, singletons
      }:
@@ -234768,7 +234810,6 @@ self: {
        ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "singnal" = callPackage
@@ -235029,34 +235070,6 @@ self: {
      }) {};
 
   "sized" = callPackage
-    ({ mkDerivation, base, constraints, containers, deepseq
-     , equational-reasoning, ghc-typelits-knownnat
-     , ghc-typelits-presburger, hashable, hspec, inspection-testing
-     , lens, mono-traversable, singletons, singletons-presburger
-     , subcategories, template-haskell, th-lift, these, type-natural
-     , vector
-     }:
-     mkDerivation {
-       pname = "sized";
-       version = "0.9.0.0";
-       sha256 = "0pj21mnh5prxxbis6735na68ggqzslyqj5djkhzdvr364ajmbnd1";
-       revision = "1";
-       editedCabalFile = "1ij5avi0k4p5ms5g9l8yyy3mp0d0z05lap8jwx99zgz3rri7s4sw";
-       libraryHaskellDepends = [
-         base constraints containers deepseq equational-reasoning
-         ghc-typelits-knownnat ghc-typelits-presburger hashable lens
-         mono-traversable singletons singletons-presburger subcategories
-         these type-natural vector
-       ];
-       testHaskellDepends = [
-         base containers hspec inspection-testing mono-traversable
-         singletons subcategories template-haskell th-lift vector
-       ];
-       description = "Sized sequence data-types";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "sized_1_0_0_0" = callPackage
     ({ mkDerivation, base, constraints, containers, deepseq
      , equational-reasoning, ghc-typelits-knownnat
      , ghc-typelits-presburger, hashable, hspec, inspection-testing
@@ -235080,7 +235093,6 @@ self: {
        ];
        description = "Sized sequence data-types";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sized-grid" = callPackage
@@ -241585,7 +241597,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base options text turtle ];
        description = "Console program used to fix Stack build errors automatically";
-       license = lib.licenses.agpl3;
+       license = lib.licenses.agpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -241852,7 +241864,7 @@ self: {
          http-client-tls optparse-applicative process safe temporary text
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -242282,7 +242294,7 @@ self: {
          recursion-schemes rosezipper safe text transformers utf8-string
        ];
        description = "Program to fold GHC prof files into flamegraph input";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
      }) {};
 
   "stacked-dag" = callPackage
@@ -247988,12 +248000,27 @@ self: {
        pname = "syb";
        version = "0.7.1";
        sha256 = "0077vxzyi9ppbphi2ialac3p376k49qly1kskdgf57wdwix9qjp0";
+       revision = "1";
+       editedCabalFile = "0rgxzwnbwawi8visnpq74s51n0qi9rzgnxsm2bdmi4vwfn3lb6w0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers HUnit mtl ];
        description = "Scrap Your Boilerplate";
        license = lib.licenses.bsd3;
      }) {};
 
+  "syb_0_7_2_1" = callPackage
+    ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "syb";
+       version = "0.7.2.1";
+       sha256 = "15ld5929n3lzfb5sy9nnm77x2l6i2sgsxw47jdrqcrz6fxpwc1qq";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
+       description = "Scrap Your Boilerplate";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "syb-extras" = callPackage
     ({ mkDerivation, base, eq, prelude-extras }:
      mkDerivation {
@@ -249083,7 +249110,7 @@ self: {
        ];
        doHaddock = false;
        description = "Efficient signal processing using runtime compilation";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -251569,8 +251596,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-sugar";
-       version = "1.0.1.0";
-       sha256 = "1q5m6x5w95dds1f00sr6nn7lgs0q2g7ivdxd8ghfm529pss2143n";
+       version = "1.0.1.1";
+       sha256 = "1mkph7g4ybvy4h4rblr60bnalj5jf1acfgdqcw0ggwmbhfbzbg68";
        libraryHaskellDepends = [
          base directory filemanip filepath logict optparse-applicative
          prettyprinter tagged tasty
@@ -254260,25 +254287,18 @@ self: {
        broken = true;
      }) {};
 
-  "text_1_2_4_0" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
-     , quickcheck-unicode, random, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
+  "text_1_2_4_1" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq, ghc-prim
+     , integer-gmp, template-haskell
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.4.0";
-       sha256 = "0k739i0sjrbl029y5j8n5v1hqa68z00xazvrahjhyl69mp4s5qna";
+       version = "1.2.4.1";
+       sha256 = "0bnb4g5lpranra58zpwqh14hvwdh6zc4nz3hwppzrpdahi10s7hv";
        libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
          template-haskell
        ];
-       testHaskellDepends = [
-         array base binary bytestring deepseq directory ghc-prim HUnit
-         integer-gmp QuickCheck quickcheck-unicode random template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
        doCheck = false;
        description = "An efficient packed Unicode text type";
        license = lib.licenses.bsd2;
@@ -258402,8 +258422,8 @@ self: {
      }:
      mkDerivation {
        pname = "tlex-th";
-       version = "0.2.0.0";
-       sha256 = "03wninr37d989fc3l33gcflfjsnwrni2j8lryh7qv0vxr90l5mqp";
+       version = "0.2.0.1";
+       sha256 = "19hlj81rxnki90imiz4zjklfl4ffbpkkd9iycq4wbj92i9vw4n8v";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array base containers ghc-prim template-haskell tlex tlex-core
@@ -259779,7 +259799,7 @@ self: {
          prettyprinter QuickCheck scientific text
        ];
        description = "Parser and pretty printer for the TPTP language";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -263609,26 +263629,6 @@ self: {
      }) {};
 
   "type-natural" = callPackage
-    ({ mkDerivation, base, constraints, equational-reasoning
-     , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons
-     , singletons-presburger, template-haskell
-     }:
-     mkDerivation {
-       pname = "type-natural";
-       version = "0.9.0.0";
-       sha256 = "1jg8qqha60mxj7mrbi69jbcniayksyggi2s7fxy88ap4ay1hky3a";
-       revision = "1";
-       editedCabalFile = "0iybmf7c6lzrbdyslhlwzd7z6sq9sdanfv3lrw1hmp7lrmnmrfij";
-       libraryHaskellDepends = [
-         base constraints equational-reasoning ghc-typelits-natnormalise
-         ghc-typelits-presburger singletons singletons-presburger
-         template-haskell
-       ];
-       description = "Type-level natural and proofs of their properties";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "type-natural_1_0_0_0" = callPackage
     ({ mkDerivation, base, constraints, equational-reasoning, ghc
      , ghc-typelits-knownnat, ghc-typelits-natnormalise
      , ghc-typelits-presburger, integer-logarithms, QuickCheck
@@ -263653,7 +263653,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Type-level natural and proofs of their properties";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "type-of-html" = callPackage
@@ -263909,6 +263908,19 @@ self: {
        broken = true;
      }) {};
 
+  "typecheck-plugin-nat-simple" = callPackage
+    ({ mkDerivation, base, containers, ghc }:
+     mkDerivation {
+       pname = "typecheck-plugin-nat-simple";
+       version = "0.1.0.1";
+       sha256 = "1d35zj6gi3h9ybgvdi16x1lrjg0fgn8lhi36ia04f56qmsc3bk4j";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base containers ghc ];
+       testHaskellDepends = [ base containers ghc ];
+       description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "typed-admin" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, data-default-class
      , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session
@@ -266558,7 +266570,7 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "universum_1_7_1" = callPackage
+  "universum_1_7_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -266566,8 +266578,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "1.7.1";
-       sha256 = "0jsdzhy0h5d6znnrdgzr29b6qkriidck5s6yp52pci30rfv1d29z";
+       version = "1.7.2";
+       sha256 = "1ka7q5vr9xkf8z5mzpkp648mpf8az7b14lnhbvfakg3v5xy3f7gb";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable microlens
          microlens-mtl mtl safe-exceptions stm text transformers
@@ -266622,6 +266634,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "unix-compat_0_5_3" = callPackage
+    ({ mkDerivation, base, unix }:
+     mkDerivation {
+       pname = "unix-compat";
+       version = "0.5.3";
+       sha256 = "1j75i3dj489rz60ij3nfza774mb7mw33amhdkm10dd0dxabvb4q8";
+       libraryHaskellDepends = [ base unix ];
+       description = "Portable POSIX-compatibility layer";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "unix-fcntl" = callPackage
     ({ mkDerivation, base, foreign-var }:
      mkDerivation {
@@ -266819,6 +266843,38 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "unliftio-messagebox" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, criterion
+     , data-default, hashable, HUnit, mtl, QuickCheck, tasty, tasty-html
+     , tasty-hunit, tasty-quickcheck, text, unagi-chan, unliftio
+     }:
+     mkDerivation {
+       pname = "unliftio-messagebox";
+       version = "1.0.2";
+       sha256 = "0pl75f3wbcy31b4firqw0y2mdl3axjdwx0w1vckidprv8sncsrm7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers data-default hashable mtl QuickCheck
+         text unagi-chan unliftio
+       ];
+       executableHaskellDepends = [
+         atomic-primops base containers data-default hashable mtl QuickCheck
+         text unagi-chan unliftio
+       ];
+       testHaskellDepends = [
+         atomic-primops base containers data-default hashable HUnit mtl
+         QuickCheck tasty tasty-html tasty-hunit tasty-quickcheck text
+         unagi-chan unliftio
+       ];
+       benchmarkHaskellDepends = [
+         atomic-primops base containers criterion data-default hashable mtl
+         QuickCheck text unagi-chan unliftio
+       ];
+       description = "Fast and robust message queues for concurrent processes";
+       license = lib.licenses.bsd2;
+     }) {};
+
   "unliftio-path" = callPackage
     ({ mkDerivation, base, exceptions, path, time, unliftio }:
      mkDerivation {
@@ -270501,7 +270557,7 @@ self: {
          QuickCheck utf8-light
        ];
        description = "ASCII platform-adventure game";
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};
@@ -271826,8 +271882,8 @@ self: {
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.8.0.1";
-       sha256 = "1rfmj9c87ql6mfqspx58qpqx6k1pvvfvgngzbjfpdx62xknxflkf";
+       version = "0.8.0.2";
+       sha256 = "0w36jcgm1vq1212vd3mzwcfk6qwprz49afyshfjqcll6yq8vwp16";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
@@ -271924,23 +271980,6 @@ self: {
      }) {};
 
   "wai" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hspec-discover
-     , http-types, network, text, transformers, vault
-     }:
-     mkDerivation {
-       pname = "wai";
-       version = "3.2.2.1";
-       sha256 = "058871axlq6r0gcqxbjw37w57df9xbv81dmz99b1zq59wf329xzy";
-       libraryHaskellDepends = [
-         base bytestring http-types network text transformers vault
-       ];
-       testHaskellDepends = [ base bytestring hspec ];
-       testToolDepends = [ hspec-discover ];
-       description = "Web Application Interface";
-       license = lib.licenses.mit;
-     }) {};
-
-  "wai_3_2_3" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hspec-discover
      , http-types, network, text, vault
      }:
@@ -271955,7 +271994,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Web Application Interface";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-accept-language" = callPackage
@@ -272210,36 +272248,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, call-stack, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, http2, HUnit, iproute, network, old-locale, resourcet
-     , streaming-commons, text, time, transformers, unix, unix-compat
-     , vault, void, wai, wai-logger, word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.1.5";
-       sha256 = "1xq4w3i3mazdcpb7d60sag6bqqp33sgx0hf808bbjjk6bf03qraw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring call-stack
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types http2 HUnit iproute network
-         old-locale resourcet streaming-commons text time transformers unix
-         unix-compat vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive cookie fast-logger hspec
-         http-types http2 HUnit iproute resourcet text time transformers wai
-         zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_1_6" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, call-stack, case-insensitive, containers, cookie
      , data-default-class, directory, fast-logger, hspec, http-types
@@ -272267,7 +272275,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-feature-flags" = callPackage
@@ -284681,7 +284688,7 @@ self: {
          yaml
        ];
        testToolDepends = [ hspec-discover ];
-       license = lib.licenses.gpl3;
+       license = lib.licenses.gpl3Only;
      }) {};
 
   "yjftp" = callPackage
@@ -285880,21 +285887,19 @@ self: {
      , cereal, conduit, conduit-extra, conduit-zstd, containers, digest
      , directory, dlist, exceptions, filepath, hspec, monad-control, mtl
      , QuickCheck, resourcet, temporary, text, time, transformers
-     , transformers-base
+     , transformers-base, unix
      }:
      mkDerivation {
        pname = "zip";
-       version = "1.6.0";
-       sha256 = "1k00g2952yf3iyq1p6pjn307zsxsc9j3iq6lih3rr8vysiijivcx";
-       revision = "1";
-       editedCabalFile = "1x8f4l08cfi3sawmhmd7q8krmh3nylgd32q0qx4i2zh2kpvj4ww9";
+       version = "1.7.0";
+       sha256 = "11vdxpyxnh7hbsrpk8g90fd9abbk27dxi9g0mhxc1lxc6syjkzgl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra conduit-zstd containers digest directory dlist
          exceptions filepath monad-control mtl resourcet text time
-         transformers transformers-base
+         transformers transformers-base unix
        ];
        executableHaskellDepends = [ base filepath ];
        testHaskellDepends = [

From 952ebcf65f996a459141be786b349e7886b1b216 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 20 Jan 2021 17:13:24 +0100
Subject: [PATCH 629/956] haskellPackages.haskell-language-server: Fixing build

by pinning apply-refact
---
 .../haskell-modules/configuration-common.nix  |  4 +++
 .../configuration-hackage2nix.yaml            |  1 +
 .../haskell-modules/hackage-packages.nix      | 31 +++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e2d17a8a69f..4c161c453c5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1420,6 +1420,10 @@ self: super: {
     lsp-test = dontCheck self.lsp-test_0_11_0_7;
     fourmolu = self.fourmolu_0_3_0_0;
   });
+  # 2021-01-20
+  # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0
+  # https://github.com/haskell/haskell-language-server/issues/1240
+  apply-refact = super.apply-refact_0_8_2_1;
 
   fourmolu = dontCheck super.fourmolu;
   # 1. test requires internet
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c74a4c8c972..1587e1dba61 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2700,6 +2700,7 @@ extra-packages:
   - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
   - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
   - ghcide == 0.7.0.0                   # Needed for hls 0.8.0
+  - apply-refact == 0.8.2.1             # Needed for hls 0.8.0
 
 package-maintainers:
   peti:
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 520f21ec899..17d5c8968e6 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -31748,6 +31748,37 @@ self: {
        broken = true;
      }) {};
 
+  "apply-refact_0_8_2_1" = callPackage
+    ({ mkDerivation, base, containers, directory, extra, filemanip
+     , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative
+     , process, refact, silently, syb, tasty, tasty-expected-failure
+     , tasty-golden, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "apply-refact";
+       version = "0.8.2.1";
+       sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory extra filemanip ghc ghc-exactprint
+         process refact syb transformers unix-compat
+       ];
+       executableHaskellDepends = [
+         base containers directory extra filemanip filepath ghc ghc-boot-th
+         ghc-exactprint optparse-applicative process refact syb transformers
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base containers directory extra filemanip filepath ghc ghc-boot-th
+         ghc-exactprint optparse-applicative process refact silently syb
+         tasty tasty-expected-failure tasty-golden transformers unix-compat
+       ];
+       description = "Perform refactorings specified by the refact library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "apply-refact" = callPackage
     ({ mkDerivation, base, containers, directory, extra, filemanip
      , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative

From 412a9e7d7c8992d77e382f53b7eb1ebefb271735 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Jan 2021 20:42:46 +0100
Subject: [PATCH 630/956] all-cabal-hashes: update to Hackage at
 2021-01-22T18:56:49Z

---
 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 2fcc47149fa..551610c5ad5 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/545d5cafa765c97ad6026ac96f42a246fea7675b.tar.gz";
-  sha256 = "0v35kbbhmyc5yn1k4v9j32d2bj7zwlwfrwf1cppifdvwdhfs25vv";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/214ceb3bed92d49a0dffc6c2d8d21b1d0bcc7c25.tar.gz";
+  sha256 = "1m8rm46w9xc8z8dvjg3i0bqpx9630i6ff681dp445q8wv7ji9y2v";
 }

From d9d8d9e8c2d368f18781813797d07e875a8224f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 19:52:54 +0000
Subject: [PATCH 631/956] precice: 2.1.1 -> 2.2.0

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

diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix
index e9e67737d32..64fe54cbce2 100644
--- a/pkgs/development/libraries/precice/default.nix
+++ b/pkgs/development/libraries/precice/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "precice";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = pname;
     rev = "v${version}";
-    sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg";
+    sha256 = "sha256-AQc+p/twsfkzwpWeznGpLLSqINKSrWCwH+PdNIrdYA8=";
   };
 
   cmakeFlags = [

From 84733f9589df1b893f36338b8734c127190a43fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 20:10:26 +0000
Subject: [PATCH 632/956] pure-prompt: 1.15.0 -> 1.16.0

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

diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix
index dfc9593a532..a15c9b5bbb9 100644
--- a/pkgs/shells/zsh/pure-prompt/default.nix
+++ b/pkgs/shells/zsh/pure-prompt/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "pure-prompt";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "pure";
     rev = "v${version}";
-    sha256 = "0r4y8bglwdq85dwlxh9sm23ppzy1z7i8kmjny5mx9css0likj8qv";
+    sha256 = "sha256-fnk4lLRASX7FFAovAiRd9sm4jNlnFIJ78UCzdsXYVfM=";
   };
 
   installPhase = ''

From b4f60bfcacdef81570eb25abde911270e21119d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Jan 2021 21:14:54 +0100
Subject: [PATCH 633/956] python3Packages.mpd2: add hexa to maintainers

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

diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix
index df7db2e7dd8..7fdf64c0e4b 100644
--- a/pkgs/development/python-modules/mpd2/default.nix
+++ b/pkgs/development/python-modules/mpd2/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     description = "A Python client module for the Music Player Daemon";
     homepage = "https://github.com/Mic92/python-mpd2";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ rvl mic92 ];
+    maintainers = with maintainers; [ rvl mic92 hexa ];
   };
 
 }

From d2cf178924186a01312296b3366bef6dfa3b8a38 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 22 Jan 2021 20:17:27 +0000
Subject: [PATCH 634/956] qbec: 0.12.2 -> 0.13.4

---
 pkgs/applications/networking/cluster/qbec/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix
index 18a753ca3ca..a4f15586ad0 100644
--- a/pkgs/applications/networking/cluster/qbec/default.nix
+++ b/pkgs/applications/networking/cluster/qbec/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "qbec";
-  version = "0.12.2";
+  version = "0.13.4";
 
   src = fetchFromGitHub {
     owner = "splunk";
     repo = "qbec";
     rev = "v${version}";
-    sha256 = "10bf9ja44n1gzhb5znqbmr1xjc87akrsdyxfvrz4f5bd3p1fh6j0";
+    sha256 = "sha256-jbGEkBBXb1dDv4E7vEPVyvDahz27Kpyo3taenCH/vfw=";
   };
 
-  vendorSha256 = "0xkmccm6cyw1p5mah7psbpfsfaw8f09r1a2k4iksfggrn9mimaam";
+  vendorSha256 = "sha256-rzxtLaGUl8hxcJ+GWlrkjN+f7mb0lXrtkHj/pBO8HzQ=";
 
   doCheck = false;
 

From b989a9802f78aa5dab6376dd29e62b4852334a71 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 22 Jan 2021 21:58:46 +0100
Subject: [PATCH 635/956] libredwg: 0.10.1.3707 -> 0.12

Fix CVE-2020-15807
---
 pkgs/development/libraries/libredwg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix
index 358a8490e69..5fca199acb0 100644
--- a/pkgs/development/libraries/libredwg/default.nix
+++ b/pkgs/development/libraries/libredwg/default.nix
@@ -6,13 +6,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libredwg";
-  version = "0.10.1.3707";
+  version = "0.12";
 
   src = fetchFromGitHub {
     owner = "LibreDWG";
     repo = pname;
     rev = version;
-    sha256 = "009n96lx4ahf05ryvm09z0l9956vz94r8pliyb88j0jficl0pxkf";
+    sha256 = "0ayhp3ym30hzp5f6dz7mmp9hpxf6a48nx3kq5crcmzycm5fllbn7";
     fetchSubmodules = true;
   };
 

From 3e385dc28574afd9fb130bf9cbc42f4382c75328 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 22 Jan 2021 22:42:58 +0100
Subject: [PATCH 636/956] nodePackages: regenerate with node2nix 1.9.0

---
 .../cluster/spacegun/node-composition.nix     |    8 +-
 .../cluster/spacegun/node-packages.nix        | 3765 +++++-----
 .../networking/n8n/node-composition.nix       |    8 +-
 pkgs/applications/networking/n8n/node-env.nix |   39 +-
 .../networking/n8n/node-packages.nix          | 1490 ++--
 .../commitizen/node-composition.nix           |    8 +-
 .../commitizen/node-env.nix                   |   45 +-
 .../commitizen/node-packages.nix              | 1868 ++---
 .../elm/packages/generate-node-packages.sh    |    4 +-
 .../elm/packages/node-composition.nix         |   10 +-
 .../compilers/elm/packages/node-env.nix       |  542 --
 .../compilers/elm/packages/node-packages.nix  | 1475 ++--
 .../misc/google-clasp/google-clasp.nix        |    8 +-
 .../misc/google-clasp/node-packages.nix       |  834 +--
 .../development/node-packages/composition.nix |    8 +-
 pkgs/development/node-packages/node-env.nix   |  169 +-
 .../node-packages/node-packages.nix           | 6514 ++++++++---------
 .../web/newman/node-composition.nix           |    8 +-
 pkgs/development/web/newman/node-env.nix      |   83 +-
 pkgs/development/web/newman/node-packages.nix |  761 +-
 .../web/remarkjs/node-packages.nix            | 2056 +++---
 pkgs/development/web/remarkjs/nodepkgs.nix    |    8 +-
 .../node-packages-generated.nix               |  335 +-
 pkgs/misc/base16-builder/node-packages.nix    |   10 +-
 pkgs/misc/base16-builder/supplement.nix       |  153 +-
 .../node-composition.nix                      |    8 +-
 .../matrix-appservice-slack/node-packages.nix | 1135 +--
 .../cryptpad/node-packages-generated.nix      |   40 +-
 .../web-apps/cryptpad/node-packages.nix       |    8 +-
 .../whitebophir/node-packages-generated.nix   |  154 +-
 .../web-apps/whitebophir/node-packages.nix    |    8 +-
 pkgs/servers/zigbee2mqtt/node-packages.nix    | 2779 +++++--
 pkgs/servers/zigbee2mqtt/node.nix             |    8 +-
 .../networking/airfield/node-packages.nix     |  174 +-
 pkgs/tools/networking/airfield/node.nix       |    8 +-
 pkgs/tools/package-management/nixui/nixui.nix |    8 +-
 .../nixui/node-packages.nix                   |   24 +-
 37 files changed, 12870 insertions(+), 11693 deletions(-)
 delete mode 100644 pkgs/development/compilers/elm/packages/node-env.nix

diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
index 89b805fc153..7cbb2328ae7 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
index 423e34f10df..611b0c73db0 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-packages.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
@@ -1,97 +1,160 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/code-frame-7.8.3" = {
+    "@babel/code-frame-7.12.11" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.8.3";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz";
-        sha512 = "3d85pd9lfbm8yrlpn6wj9g56snbnpr9fx0w1b9x26jbirc2xfrvnifwzprp0f6bhqijshgm0q35axic8d11v4j0kq493dapcyk33n3b";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
+        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
       };
     };
-    "@babel/core-7.8.7" = {
+    "@babel/core-7.12.10" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.8.7";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz";
-        sha512 = "34gjbasmqp8z2rbwlc5b9sfnvs7fw1hm3i5bcdk0ddymr9b280fbcgfx6mgiwhkv3gzgawjvzcg1bzqp9f0hhifkhrdg8r4fqbnl6dc";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz";
+        sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
       };
     };
-    "@babel/generator-7.8.8" = {
+    "@babel/generator-7.12.11" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.8.8";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz";
-        sha512 = "0k5w5pcsv2m6992nh49qjil2b1aqzdbdrcxzcp89v7wq9wx7llnx5ijyzl9w895iry3hnp8mk3srgp52kgz4swvjqf9lwdxxrb99b0w";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
+        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
       };
     };
-    "@babel/helper-function-name-7.8.3" = {
+    "@babel/helper-function-name-7.12.11" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.8.3";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz";
-        sha512 = "0w35m1kq2dmsgdgjxvpmg6gxm1rzl1jqf23h3k7pwh9nmwsmqbgv0rzy7fs6dq31dqq6j17bwyww0091r41aj0rl3zi1nj2a1gn0b04";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
+        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
       };
     };
-    "@babel/helper-get-function-arity-7.8.3" = {
+    "@babel/helper-get-function-arity-7.12.10" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.8.3";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz";
-        sha512 = "12g2gjipd8svg02d12iqbf0rz4m99g36qccn3f81xij3ac4f7kqzx0407xma49h11j88iz8jil2whj7j96wqpwd67abi23xczwd2l0m";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
+        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
       };
     };
-    "@babel/helper-plugin-utils-7.8.3" = {
+    "@babel/helper-member-expression-to-functions-7.12.7" = {
+      name = "_at_babel_slash_helper-member-expression-to-functions";
+      packageName = "@babel/helper-member-expression-to-functions";
+      version = "7.12.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
+        sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
+      };
+    };
+    "@babel/helper-module-imports-7.12.5" = {
+      name = "_at_babel_slash_helper-module-imports";
+      packageName = "@babel/helper-module-imports";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+        sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
+      };
+    };
+    "@babel/helper-module-transforms-7.12.1" = {
+      name = "_at_babel_slash_helper-module-transforms";
+      packageName = "@babel/helper-module-transforms";
+      version = "7.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
+        sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
+      };
+    };
+    "@babel/helper-optimise-call-expression-7.12.10" = {
+      name = "_at_babel_slash_helper-optimise-call-expression";
+      packageName = "@babel/helper-optimise-call-expression";
+      version = "7.12.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
+        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
+      };
+    };
+    "@babel/helper-plugin-utils-7.10.4" = {
       name = "_at_babel_slash_helper-plugin-utils";
       packageName = "@babel/helper-plugin-utils";
-      version = "7.8.3";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz";
-        sha512 = "1jj9ibj72hqv1qm4hvdnk728fi9mihrwhq0xcs2qlxbs8iz9d2zb4a23sm7ny0s42asrdyy2s98shgnqm0rhn2314k6pcyxspiymrwg";
+        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz";
+        sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
       };
     };
-    "@babel/helper-split-export-declaration-7.8.3" = {
+    "@babel/helper-replace-supers-7.12.11" = {
+      name = "_at_babel_slash_helper-replace-supers";
+      packageName = "@babel/helper-replace-supers";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
+        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
+      };
+    };
+    "@babel/helper-simple-access-7.12.1" = {
+      name = "_at_babel_slash_helper-simple-access";
+      packageName = "@babel/helper-simple-access";
+      version = "7.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
+        sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
+      };
+    };
+    "@babel/helper-split-export-declaration-7.12.11" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.8.3";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz";
-        sha512 = "1sgm6wd88kmizvig5m0ims97vmlylfii72xcw4k01h2wsw3cpc312s1asnjrq5y472hcqfh2mwn8dwpqkpcvs0ssqwnz1c1xhwz47fz";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
+        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
       };
     };
-    "@babel/helpers-7.8.4" = {
+    "@babel/helper-validator-identifier-7.12.11" = {
+      name = "_at_babel_slash_helper-validator-identifier";
+      packageName = "@babel/helper-validator-identifier";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
+        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
+      };
+    };
+    "@babel/helpers-7.12.5" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.8.4";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz";
-        sha512 = "3rr2xlnr2hmpbrgysgs0jyrz4bjyg80cxij1wn899v53zqj4i1bcm3ajpnr03v1swlczkzapn7nvzmzhwlqxl1hw5pciq8h0zpxxxjl";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
+        sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
       };
     };
-    "@babel/highlight-7.8.3" = {
+    "@babel/highlight-7.10.4" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.8.3";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz";
-        sha512 = "09353nlk7ng0h135l14dhwk4jahsdrapvd0185wra8l73wjbnkb11jl42znj1rxypb38jlzcraxf4xdka1ssis5khgjvgql2kkk4zix";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz";
+        sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.8.8" = {
+    "@babel/parser-7.12.11" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.8.8";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz";
-        sha512 = "1q85si9966ra57f43dccjanxnyy65c66lykxgv5z231wpi4w023nk8l7s8m54bp9fv4yd3pl682yh0krny22qmfygxggc2g61dldvlq";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
+        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
       };
     };
     "@babel/plugin-syntax-object-rest-spread-7.8.3" = {
@@ -100,34 +163,34 @@ let
       version = "7.8.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz";
-        sha512 = "2a9vg6b6p2rfhcflic2w6rbrbiqrdgj4ra2q20g1qv6ncwmvja2jq8snygwfw1ll1k94rqnbj4hc1fpizgr1v35rfvxqvwr6658r2jy";
+        sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==";
       };
     };
-    "@babel/template-7.8.6" = {
+    "@babel/template-7.12.7" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.8.6";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz";
-        sha512 = "0z8kzrpis50nr4vsyqr77cpqad0xfsacw45jdhwsl89mdzpvy8wcvc0kdy938kb0ll069plxhgy3a3fpag408ci2pb47gxzrhy2rcyd";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
+        sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.8.6" = {
+    "@babel/traverse-7.12.12" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.8.6";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz";
-        sha512 = "3s53fzm55c14accqfxhvdck1vkj87489w0rhcl7zj8phf9iz21qs0garpghgs0h1cj4s4n2fb7czipdm2mlrj19iaygh37zsv8ja7yq";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
+        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
       };
     };
-    "@babel/types-7.8.7" = {
+    "@babel/types-7.12.12" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.8.7";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz";
-        sha512 = "0kj404kqcscn0qdpis6kha2263fb0njap0qqcjbwf38jv9qvpxw39f84iiyjspgwz7v1bqcdpjpfb274dkgh2v9ih10w57i85wfnr4k";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
+        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
       };
     };
     "@cnakazawa/watch-1.0.4" = {
@@ -136,7 +199,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz";
-        sha512 = "2hl7iz90jal2f27hgyb5rbmcp96p182xkmflyj5rsyqqffng8vkzz3fcjvbvcpdykij40ax4yirdc6p68yrmjvai7hr8y93mj20indz";
+        sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==";
       };
     };
     "@jest/console-24.9.0" = {
@@ -145,7 +208,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz";
-        sha512 = "0nwvmyk8p01b6331xizblr7h9kkgp8rybjpfj1pa57h9w47lsnpyzzhh9vsji9q361bg17fmxwkgxs10k7nk9lcmfvphag7qipzms36";
+        sha512 = "Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==";
       };
     };
     "@jest/core-24.9.0" = {
@@ -154,7 +217,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz";
-        sha512 = "3c0jsaq55pcz4gx9sg9dccqpakbdfplm0w715lw904p8lvvz6p9899j47ndfcpnb5pba3vdzr96f5gmanwgmskyapshm51hrvg2120n";
+        sha512 = "Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==";
       };
     };
     "@jest/environment-24.9.0" = {
@@ -163,7 +226,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz";
-        sha512 = "1lpii90h62jy8h2awivnqdjarsicik5g1npmsyjm8yq24iv3n6d0ilgajw3v95qrw5m2gcpsy82cyqb35xkn9sn7i4gg1ngwjb503g4";
+        sha512 = "5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==";
       };
     };
     "@jest/fake-timers-24.9.0" = {
@@ -172,7 +235,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz";
-        sha512 = "3s57a5043fphl08b2gb8frph1gm1x47lb7za0n0iqspr4p0iwibvm7wmzgal27b8h2v93i229cyh786kymy80l3b3bhqjwqmlsiqr3r";
+        sha512 = "eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==";
       };
     };
     "@jest/reporters-24.9.0" = {
@@ -181,7 +244,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz";
-        sha512 = "0dkr3yy0x1n8b1226aczwz75785nl21hh913sadyqj48j0fq4sr9n2q2b2v23gqg6p63p4hcjcsdadlway599n57bgvf7ns539igvls";
+        sha512 = "mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==";
       };
     };
     "@jest/source-map-24.9.0" = {
@@ -190,7 +253,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz";
-        sha512 = "038h2qlv880agd1b1mqxmkxbqv76ikcvdas4gjzkppg77yzd61ww2nwvliwgymc860niaa9xsi2p5svrwg80hrk4w6bwrbcd723nz7x";
+        sha512 = "/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==";
       };
     };
     "@jest/test-result-24.9.0" = {
@@ -199,7 +262,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz";
-        sha512 = "2464cq11b9d51nrx8j5vi5m2572rrhi001l2lxz84wg5r6bkpskkszrk3s47w51h1rgm668ix0fgzwhgihjcxkafiy15738n0fnnhaw";
+        sha512 = "XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==";
       };
     };
     "@jest/test-sequencer-24.9.0" = {
@@ -208,7 +271,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz";
-        sha512 = "3h61jyz33sya4wglmvp4f1m5lhxagwv76gdbjafdxfc1nag58vdv4b65yiggsry5xx9ixjd8j1grjw3d3rsjy8gpifnv49li99srapa";
+        sha512 = "6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==";
       };
     };
     "@jest/transform-24.9.0" = {
@@ -217,7 +280,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz";
-        sha512 = "2cwna8zadqd9ahyf32pyg0hgrnn8qwwg55cdyw5imfbvj9g9kljwsbagx87074kzp3rdai22glvwkwpv7lk0aa49dw5ziai4fdi9i2d";
+        sha512 = "TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==";
       };
     };
     "@jest/types-24.9.0" = {
@@ -226,7 +289,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz";
-        sha512 = "03hdscpch75yk366szkrfi63n6mqd5hscqslcpxklq5j99n05qg1p54zj51jhcld1dvkc4hgw0vmzjcr0qncphfb54yx9jsxp6vp8jw";
+        sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==";
       };
     };
     "@kubernetes/client-node-0.10.3" = {
@@ -235,7 +298,7 @@ let
       version = "0.10.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.3.tgz";
-        sha512 = "0ra42q33nywyiwiccxcg501ajdc1rz1lvg6kfwk6xypi1vlkmmvxiywc20y4s6v48i40m8j5sl2y40ni9jg7v396w86wcczsb6va3wv";
+        sha512 = "mw+1zdKfMW4QN2ns82SKFhAvqC4SVUAiItto4oFg3Me+a510h3h9N5O7ad6m4efAmlQBlMc6Y5FHz70dAwuiMg==";
       };
     };
     "@sindresorhus/is-0.7.0" = {
@@ -244,7 +307,7 @@ let
       version = "0.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz";
-        sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q";
+        sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
       };
     };
     "@types/accepts-1.3.5" = {
@@ -253,7 +316,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz";
-        sha512 = "30y19l2wp8plrlgcj6fn0qc7wdy72rcn69zvmn8463738bx4mz7pxwl8dml92gi7y1ry2hqzaq0ljvk8wfp6f9k0v092kpazlingrwc";
+        sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==";
       };
     };
     "@types/axios-0.14.0" = {
@@ -265,49 +328,49 @@ let
         sha1 = "ec2300fbe7d7dddd7eb9d3abf87999964cafce46";
       };
     };
-    "@types/babel-types-7.0.7" = {
+    "@types/babel-types-7.0.9" = {
       name = "_at_types_slash_babel-types";
       packageName = "@types/babel-types";
-      version = "7.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz";
-        sha512 = "18iifcb27svl3qmsh5vvpidyw3cj6hhif0il25xsg76vq9gb4h8gmfqs5hv3is2dab09a6nwbinf6f1q641spv7spr33a9ynxp426vl";
-      };
-    };
-    "@types/babel__core-7.1.6" = {
-      name = "_at_types_slash_babel__core";
-      packageName = "@types/babel__core";
-      version = "7.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz";
-        sha512 = "17ggrqy35zds8rkpa2kglnk8f5dc43sgbkbjcfjbaygi53jxwm9ji6vr1xqanhs2yn4spla51fjdypl2hsfdrkfhpkzban0ridf2fdm";
-      };
-    };
-    "@types/babel__generator-7.6.1" = {
-      name = "_at_types_slash_babel__generator";
-      packageName = "@types/babel__generator";
-      version = "7.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz";
-        sha512 = "1xw1hijlii2sxf25d5pcqlgqsb6vpzw7c3z9s0s20f1cdyyb768cajmxxk3l1c9g8md3h797v6pzvjvpjmw8q83aw8w69agcpxsc4kc";
-      };
-    };
-    "@types/babel__template-7.0.2" = {
-      name = "_at_types_slash_babel__template";
-      packageName = "@types/babel__template";
-      version = "7.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz";
-        sha512 = "199fw9pirw68kdc47d80sy6gg5g6m8raxawnxwpcs0nc6bmxrv19qmv1212lfyw67a2l5b5abxz9g0i1fwnrxm6h6rqkv4njw5b7bpw";
-      };
-    };
-    "@types/babel__traverse-7.0.9" = {
-      name = "_at_types_slash_babel__traverse";
-      packageName = "@types/babel__traverse";
       version = "7.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz";
-        sha512 = "2vza0zha9nrlal5hgfdbaavx6xqxq195whl8274barqkyw26vrvvi9d7jkwp4harbx158wsxwjh4ypgkyb9w9cg73iz7fkdppq50hcc";
+        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz";
+        sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA==";
+      };
+    };
+    "@types/babel__core-7.1.12" = {
+      name = "_at_types_slash_babel__core";
+      packageName = "@types/babel__core";
+      version = "7.1.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz";
+        sha512 = "wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==";
+      };
+    };
+    "@types/babel__generator-7.6.2" = {
+      name = "_at_types_slash_babel__generator";
+      packageName = "@types/babel__generator";
+      version = "7.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz";
+        sha512 = "MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==";
+      };
+    };
+    "@types/babel__template-7.4.0" = {
+      name = "_at_types_slash_babel__template";
+      packageName = "@types/babel__template";
+      version = "7.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz";
+        sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==";
+      };
+    };
+    "@types/babel__traverse-7.11.0" = {
+      name = "_at_types_slash_babel__traverse";
+      packageName = "@types/babel__traverse";
+      version = "7.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz";
+        sha512 = "kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==";
       };
     };
     "@types/babylon-6.16.5" = {
@@ -316,7 +379,7 @@ let
       version = "6.16.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.5.tgz";
-        sha512 = "3pvh96p07fz7ib5j5519lk4xm59i6yv2dyy4xsmjv853fi61lziwz0q03y3bih2nvvskcy82jqsaxaadagjmrr9wdbkv9m5qzkrwzf4";
+        sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==";
       };
     };
     "@types/body-parser-1.19.0" = {
@@ -325,7 +388,7 @@ let
       version = "1.19.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz";
-        sha512 = "0av4v9bdhgbq0jils3jajym9gcfddyx63g2xx8fh6vqafqb5vdcm98p1kfl70ydih9m393zp13krslmii5bmf05ngyaxn139nn0kpsv";
+        sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
       };
     };
     "@types/caseless-0.12.2" = {
@@ -334,7 +397,7 @@ let
       version = "0.12.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz";
-        sha512 = "39jv2a7v9mi41wxbv242icriy5asbzyk95iy25ay3gwa1d6yi40cd6gclbzn81hig9xvvi5z7j2gq4ybirjfyihpq8wa3s160r33jg9";
+        sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==";
       };
     };
     "@types/command-line-args-5.0.0" = {
@@ -343,25 +406,34 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.0.0.tgz";
-        sha512 = "0vcqbwg68hir26fcyaqqn0w6i70cas8zn2ibhk9j0vl5mnwd2j448fvl6lqx5cny62szngdbjz6bxqfiz3ig360w3x663pr55gqzqz1";
+        sha512 = "4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg==";
       };
     };
-    "@types/connect-3.4.33" = {
+    "@types/connect-3.4.34" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.33";
+      version = "3.4.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz";
-        sha512 = "3n5gxr7z1jn60gvcnzls1c3fgzbv171acdp4shbn095wnbb8hdba3cjq1sac8aina3bg957ww5hg89swcgbdjfp9irmkkiqfs8npqfv";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz";
+        sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==";
       };
     };
-    "@types/cookies-0.7.4" = {
+    "@types/content-disposition-0.5.3" = {
+      name = "_at_types_slash_content-disposition";
+      packageName = "@types/content-disposition";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.3.tgz";
+        sha512 = "P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg==";
+      };
+    };
+    "@types/cookies-0.7.6" = {
       name = "_at_types_slash_cookies";
       packageName = "@types/cookies";
-      version = "0.7.4";
+      version = "0.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz";
-        sha512 = "2pzkddkjlxs4h8rpkh6xd381f0m6hwhxsmfx7f4vkzjxv55hyvdx7km3ks4wckd7jz0rfzzr45nphaggj48q0iwin25n0ar6qrsscd1";
+        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.6.tgz";
+        sha512 = "FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w==";
       };
     };
     "@types/cron-1.7.2" = {
@@ -370,7 +442,7 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.2.tgz";
-        sha512 = "17az71shn84qjqsnb5646z4amysvnhmgpsxj0ja2w2zlykmn7m3q1bchgrd30indnd0z8ryxzhisgd78yij87nv04wjfm9c2wnlsjh0";
+        sha512 = "AEpNLRcsVSc5AdseJKNHpz0d4e8+ow+abTaC0fKDbAU86rF1evoFF0oC2fV9FdqtfVXkG2LKshpLTJCFOpyvTg==";
       };
     };
     "@types/events-3.0.0" = {
@@ -379,43 +451,43 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
-        sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi";
+        sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
       };
     };
-    "@types/express-4.17.3" = {
+    "@types/express-4.17.11" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.3";
+      version = "4.17.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz";
-        sha512 = "1vd6aidhc6l28s5r9hjg2bzmmbmqp0dspsdp2h6affggfb9g8rzzxnbjxdan9n1b1n0d44n3amcx6yvzs1pdrzinf5j79zpk120dir3";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz";
+        sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==";
       };
     };
-    "@types/express-serve-static-core-4.17.2" = {
+    "@types/express-serve-static-core-4.17.18" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.2";
+      version = "4.17.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz";
-        sha512 = "1pa7rrhwf6wzp8lnbk2zjgvc2sxks36bw23p060kz1mm4kwyipddhn9zg4n2wnmym7a9ahw6fhk3ircal30f8ih8i7ancrdjwr74pqj";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
+        sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
       };
     };
-    "@types/formidable-1.0.31" = {
+    "@types/formidable-1.0.32" = {
       name = "_at_types_slash_formidable";
       packageName = "@types/formidable";
-      version = "1.0.31";
+      version = "1.0.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/formidable/-/formidable-1.0.31.tgz";
-        sha512 = "3fx9xxa6d30fvgc3rkag182sjjpi43qdyzf9l6l050zi8hk2h4511m0pb59k7ha611khkjg7bamvxry5v1ig1zdb4lgsi15vzk4r23l";
+        url = "https://registry.npmjs.org/@types/formidable/-/formidable-1.0.32.tgz";
+        sha512 = "jOAB5+GFW+C+2xdvUcpd/CnYg2rD5xCyagJLBJU+9PB4a/DKmsAqS9yZI3j/Q9zwvM7ztPHaAIH1ijzp4cezdQ==";
       };
     };
-    "@types/glob-7.1.1" = {
+    "@types/glob-7.1.3" = {
       name = "_at_types_slash_glob";
       packageName = "@types/glob";
-      version = "7.1.1";
+      version = "7.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
-        sha512 = "3dhbgdkzpgx010hfgkhndrb094kbd3z6s4waicihnl0rp3jk0f0gs8vvzi84xzissrhml1dfgvbdhahzbh75nny1g6429fnqvlp866l";
+        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz";
+        sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==";
       };
     };
     "@types/http-assert-1.5.1" = {
@@ -424,16 +496,25 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz";
-        sha512 = "1cn6djbpsp6rky1sllzs6s311xz0zhzkwb38s68w83ij8whsygjr87ymzbp0x3gbxxnvhfa1xh1c5vxfan6q3dz2gbjgiv9kzphlq1w";
+        sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==";
       };
     };
-    "@types/istanbul-lib-coverage-2.0.1" = {
+    "@types/http-errors-1.8.0" = {
+      name = "_at_types_slash_http-errors";
+      packageName = "@types/http-errors";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.8.0.tgz";
+        sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA==";
+      };
+    };
+    "@types/istanbul-lib-coverage-2.0.3" = {
       name = "_at_types_slash_istanbul-lib-coverage";
       packageName = "@types/istanbul-lib-coverage";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
-        sha512 = "2b0br9w70brjpzw8ck05lr79v6hc4sdk1q2jq6qs55nw869ylsfwng48ghj0yjcm9skkn76g8ry8rdf2b35i2iynbh957k7m3cl64l5";
+        url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz";
+        sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==";
       };
     };
     "@types/istanbul-lib-report-3.0.0" = {
@@ -442,16 +523,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
-        sha512 = "2parlinb7jrj152li79c6fs089y970f0s7yvzpkid8m4r8cgr9rn54bhg5ak7hsw6yvs9isx0diwjq20fb3dggnc5la2m6z0dfa0ld6";
+        sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==";
       };
     };
-    "@types/istanbul-reports-1.1.1" = {
+    "@types/istanbul-reports-1.1.2" = {
       name = "_at_types_slash_istanbul-reports";
       packageName = "@types/istanbul-reports";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
-        sha512 = "0s1jhax5h82lqchx13zj07h3zpyhqzckbnc76yl3a864xy91x11s06q3b2nds5pi89059xxa2b57p45ja90da60hr1gay9i5w3275jj";
+        url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz";
+        sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==";
       };
     };
     "@types/jest-24.9.1" = {
@@ -460,16 +541,16 @@ let
       version = "24.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz";
-        sha512 = "3hkz9dl54is1hmjiscs6sdvmafpv192bb3qz6sq6yq862dhvl4i5qwqbikbkmcn1576jiccpvrc35kvlng132piy45hwm6j8lggrg8m";
+        sha512 = "Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==";
       };
     };
-    "@types/js-yaml-3.12.2" = {
+    "@types/js-yaml-3.12.6" = {
       name = "_at_types_slash_js-yaml";
       packageName = "@types/js-yaml";
-      version = "3.12.2";
+      version = "3.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz";
-        sha512 = "2x03h69ivbpj4lsrpq698phn44jbq45jq31zdr7k30phrfv8r0gxr35qi98qbqa6rb599k8nhgj7gwnvll5lw6ml5j263961vz6w8fh";
+        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.6.tgz";
+        sha512 = "cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ==";
       };
     };
     "@types/keygrip-1.0.2" = {
@@ -478,16 +559,16 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz";
-        sha512 = "0mqq8pzrfh058ha153xmyrbvcwpqq02z0ap89pw2rgfw9ll8c78dnxa0161i3pjhz7q0n7kizh73841637s4spc35qygnkkx96nk60q";
+        sha512 = "GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==";
       };
     };
-    "@types/koa-2.11.2" = {
+    "@types/koa-2.11.6" = {
       name = "_at_types_slash_koa";
       packageName = "@types/koa";
-      version = "2.11.2";
+      version = "2.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.2.tgz";
-        sha512 = "2b2i4xy8zwfig5p744i5n32krsyvgbdjg1nzr2dawwykr9m6zp37l4g8m0mr7936yzd80yiwn2rmq4n6d1fcj6dkndnwd8dm2axwhyr";
+        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.6.tgz";
+        sha512 = "BhyrMj06eQkk04C97fovEDQMpLpd2IxCB4ecitaXwOKGq78Wi2tooaDOWOFGajPk8IkQOAtMppApgSVkYe1F/A==";
       };
     };
     "@types/koa-compose-3.2.5" = {
@@ -496,16 +577,16 @@ let
       version = "3.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz";
-        sha512 = "02hhnlq6kz27g5y2vlnj3pk1rnm16gh2qb7hf3gpxrarxrz35pc40y0aiz34ncaiggpk8306yz9q0pwm75mc099m1cy9m04xbycdj87";
+        sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==";
       };
     };
-    "@types/koa-router-7.4.0" = {
+    "@types/koa-router-7.4.1" = {
       name = "_at_types_slash_koa-router";
       packageName = "@types/koa-router";
-      version = "7.4.0";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.0.tgz";
-        sha512 = "1m9sk2skfl0vrggx53s3d3aw2ijphxkig9mjiw90016ljmz7hryyi3z74qxwmfvwg265k0cvhffq0c7j1aaxd210klsl9w2cf274hqa";
+        url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.1.tgz";
+        sha512 = "Hg78TXz78QYfEgdq3nTeRmQFEwJKZljsXb/DhtexmyrpRDRnl59oMglh9uPj3/WgKor0woANrYTnxA8gaWGK2A==";
       };
     };
     "@types/koa-send-4.1.2" = {
@@ -514,7 +595,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/koa-send/-/koa-send-4.1.2.tgz";
-        sha512 = "10xa7f3s5sdnr0ks3gbdmd635qyj160yj9b737qagw4bqbzg0hbk3irnvih4y0dc3i5lg8m8jf4p0nx52gv4vwwyhvxn5avzwi8mymd";
+        sha512 = "rfqKIv9bFds39Jxvsp8o3YJLnEQVPVriYA14AuO2OY65IHh/4UX4U/iMs5L0wATpcRmm1bbe0BNk23TRwx3VQQ==";
       };
     };
     "@types/koa-static-4.0.1" = {
@@ -523,7 +604,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/koa-static/-/koa-static-4.0.1.tgz";
-        sha512 = "3isnj0yxhf6xg0ymb317xj4a4fxdywk1xb0wadc5ghimab8m3q6vx3yv7zzyi84hx8wdm83fw65z108n0cdvnhij28hfw64jyvmqaj9";
+        sha512 = "SSpct5fEcAeRkBHa3RiwCIRfDHcD1cZRhwRF///ZfvRt8KhoqRrhK6wpDlYPk/vWHVFE9hPGqh68bhzsHkir4w==";
       };
     };
     "@types/koa-views-2.0.4" = {
@@ -532,16 +613,16 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.4.tgz";
-        sha512 = "2bkbmh8mba0sm82lp0ividj4l09lbmdw1swfpf7kvdrc1q3710q1y57zysr0kpg3j4ngy4m4gf73a4cwqcjx1rsbmjb22wgp1a42qb8";
+        sha512 = "aGFBVLiPC7FkXTqHLhnmjKhx3COV+GeJHO9OkLX/p/iAQTgDB5bbnsddx3XgrS6aACWyxR3BpQJVDdSqCNY1lw==";
       };
     };
-    "@types/lodash-4.14.149" = {
+    "@types/lodash-4.14.168" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.149";
+      version = "4.14.168";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz";
-        sha512 = "0jnvvzg602jxgjxl0fvi7iws4msvxvkff6mqvinyy0fcmxfxrpf46k30r6s0z7cb12r17sg0j6nbhg8s8xbvgf2rmgv0vvzkg6slcca";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz";
+        sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==";
       };
     };
     "@types/lodash.clonedeep-4.5.6" = {
@@ -550,16 +631,16 @@ let
       version = "4.5.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz";
-        sha512 = "2010qs0qh6d3vd77rhbwid7xvq511bgzp9vj4s3k2mlzqj78jwgb60dc84mdl4c38fz3bgx5shl6k57dm9mxbw90iq0s4lxpmi66kbh";
+        sha512 = "cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA==";
       };
     };
-    "@types/mime-2.0.1" = {
+    "@types/mime-1.3.2" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
-      version = "2.0.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz";
-        sha512 = "35iimmp0d3zg4774qavnq9wh54dgnxfks59fks65f8q8d1008x00a1fmkdnxcs27znlc69mzbxp1frzpxx85c5w4x0ha5prgs0ks0hp";
+        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
+        sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -568,7 +649,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
-        sha512 = "2ff7lcgph45bp2v5zsaxcy00rbh5n5h4njbicwhqilz66pd1lw7xfrpfl4i4ppfcx78zg9cp582b5fjif0dg7r18m44vxfksslvlyml";
+        sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
     "@types/mkdirp-0.5.2" = {
@@ -577,25 +658,25 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz";
-        sha512 = "177ihvl818zn0w93xipz417pm2cj2jzwnqs2khkj0k2dd7gs6ssv460affznfiii54a5l8qffigcq6xl74zsy6339c7cqpvkdd9r62k";
+        sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==";
       };
     };
-    "@types/node-10.17.17" = {
+    "@types/node-10.17.51" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.17";
+      version = "10.17.51";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz";
-        sha512 = "3qw8j56g9078d7lahi73ifnpbk2x385diqgq1qgr62drcxbqgjnkbncy25nhdas05hwkfgzf69r2bj4x6mdwr1yrsrmbpagfr36g4w2";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.51.tgz";
+        sha512 = "KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg==";
       };
     };
-    "@types/node-12.12.30" = {
+    "@types/node-12.19.15" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.12.30";
+      version = "12.19.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz";
-        sha512 = "0rdl54cn0jbb3g2mlp09fywwf8d6plyspmiggr5rja9z93z4n606kj8srbgjk9f83wjxd9qmq20ixj2a90369whvrmsbsp4zhblqgxk";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz";
+        sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==";
       };
     };
     "@types/ora-3.2.0" = {
@@ -604,7 +685,16 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/ora/-/ora-3.2.0.tgz";
-        sha512 = "3xvxw1cs55wdb1ihpg8df91crz17agjwq79kd342s137kwkz823n8adxxrr74fnb1rn0ffsq9zacyz2cv642ljn41dj39ha2pvpsncf";
+        sha512 = "jll99xUKpiFbIFZSQcxm4numfsLaOWBzWNaRk3PvTSE7BPqTzzOCFmS0mQ7m8qkTfmYhuYbehTGsxkvRLPC++w==";
+      };
+    };
+    "@types/qs-6.9.5" = {
+      name = "_at_types_slash_qs";
+      packageName = "@types/qs";
+      version = "6.9.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz";
+        sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==";
       };
     };
     "@types/range-parser-1.2.3" = {
@@ -613,25 +703,25 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz";
-        sha512 = "0w59kqlbrl9ich2pv2xqanzmg9f51404zqsba9l8aimqd77zbrdxcyq9q13xfnhr0d1dz4mx6z7n976ryc2nk2gfch5p507njm5f0bv";
+        sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
       };
     };
-    "@types/request-2.48.4" = {
+    "@types/request-2.48.5" = {
       name = "_at_types_slash_request";
       packageName = "@types/request";
-      version = "2.48.4";
+      version = "2.48.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz";
-        sha512 = "21mnsvbrykpzp1f1rd2ibk3nsgr8kyqikk5rdmq4qlkpf10gnpxp414hnvnbwjp27l5hvpc5l0fx0qhw20h7zi143qw6iwq68qpansv";
+        url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz";
+        sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==";
       };
     };
-    "@types/serve-static-1.13.3" = {
+    "@types/serve-static-1.13.9" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.3";
+      version = "1.13.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz";
-        sha512 = "39fm32fi9qpb1bz4q399y9rzv02ywml2m1qmclyr1ckrmy4vdn8nv5f9986ckn19yapxif0ljs0gc717xd7dmssjnh37qrxkp1d56m2";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
+        sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
       };
     };
     "@types/stack-utils-1.0.1" = {
@@ -640,25 +730,25 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz";
-        sha512 = "29j551rin7d7ygf7pd95db51b4jf48vsjnl03l4djdi6sh5jsk2f4kxwf21ixzj92mwq8y4cfhbcihwppxfkm4pkb5sqiv91a1833cp";
+        sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==";
       };
     };
-    "@types/tough-cookie-2.3.6" = {
+    "@types/tough-cookie-4.0.0" = {
       name = "_at_types_slash_tough-cookie";
       packageName = "@types/tough-cookie";
-      version = "2.3.6";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz";
-        sha512 = "0yla1v86agvz3wlkdjcn7i4hpgb02nwjsafg0xkdkclbiil08fkxjj9c4q4yj785ps3gdc5p3sqx2y0rajg1v6x068ih418g4r42wy0";
+        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz";
+        sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==";
       };
     };
-    "@types/underscore-1.9.4" = {
+    "@types/underscore-1.10.24" = {
       name = "_at_types_slash_underscore";
       packageName = "@types/underscore";
-      version = "1.9.4";
+      version = "1.10.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.4.tgz";
-        sha512 = "1czi6sv1hf482wlzsl9an3s18r033aiy54airz2558f1g32ppkz3jy44mnhzwyi9g87miwggp4l8yfgc95d4qg6qka6ywq2q48dcc8a";
+        url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.24.tgz";
+        sha512 = "T3NQD8hXNW2sRsSbLNjF/aBo18MyJlbw0lSpQHB/eZZtScPdexN4HSa8cByYwTw9Wy7KuOFr81mlDQcQQaZ79w==";
       };
     };
     "@types/websocket-0.0.40" = {
@@ -667,7 +757,7 @@ let
       version = "0.0.40";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/websocket/-/websocket-0.0.40.tgz";
-        sha512 = "0ajm2lr5mbfin316js7lzg3fvvhyd78ms1y929ppwqbg1fv6k9qnbcbz472p637xx29azlgiy3l0zzv4zvcmi9f7df5z0l80mkmxnwm";
+        sha512 = "ldteZwWIgl9cOy7FyvYn+39Ah4+PfpVE72eYKw75iy2L0zTbhbcwvzeJ5IOu6DQP93bjfXq0NGHY6FYtmYoqFQ==";
       };
     };
     "@types/ws-6.0.4" = {
@@ -676,187 +766,187 @@ let
       version = "6.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz";
-        sha512 = "318vy2l4c8cw6nm061l15pp3ss2llblyy2y7a8w92vp6da3n7s3iiha5shpxrmc5c3gv0ap0vq9x10vv64g5np1xggdlnwrnigyp4ry";
+        sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==";
       };
     };
-    "@types/yargs-13.0.8" = {
+    "@types/yargs-13.0.11" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "13.0.8";
+      version = "13.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz";
-        sha512 = "36csm2rf0wi6cj680qswwvyl3lvh88ayl578165z8d1hxh6saswzn2g2zl5v20c08jg9rdjhqwwi336yj0jh6l76fy0yldv04pwf2sw";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz";
+        sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==";
       };
     };
-    "@types/yargs-parser-15.0.0" = {
+    "@types/yargs-parser-20.2.0" = {
       name = "_at_types_slash_yargs-parser";
       packageName = "@types/yargs-parser";
-      version = "15.0.0";
+      version = "20.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
-        sha512 = "35k8bcpm51w11xbny2a8gqgz12pdn3pw8w0jf36jzlkcmpkrqlqnqf9gbrwj9sah0pv05clzlgk2a7kvnr9q3h1za4rbw9dzxdc23ql";
+        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz";
+        sha512 = "37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==";
       };
     };
-    "@webassemblyjs/ast-1.8.5" = {
+    "@webassemblyjs/ast-1.9.0" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz";
-        sha512 = "00rj3q9igpw0cihw48xx7qpmmv64yy821bvy52dqxqc7w8kq2hga2f2v2g5j83is5kdz4hfdla4a3h6q5lwpdshxynrzsqr0ag1z4v8";
+        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz";
+        sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.8.5" = {
+    "@webassemblyjs/floating-point-hex-parser-1.9.0" = {
       name = "_at_webassemblyjs_slash_floating-point-hex-parser";
       packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz";
-        sha512 = "2shwdw16zcsl2rkvyc8jlgcs5564si8m64b0v9f8ssmrxmrd84c82brnwbyblhynqldvyr8f3fl9pjvfgzw0phz0qm5mfzbc7svp7zn";
+        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz";
+        sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==";
       };
     };
-    "@webassemblyjs/helper-api-error-1.8.5" = {
+    "@webassemblyjs/helper-api-error-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-api-error";
       packageName = "@webassemblyjs/helper-api-error";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz";
-        sha512 = "363avw28ls7abwqcy7wvhdr853pccnzd9b58i1k7l1aax5cads499b494i1lwj4nlb8ksypy3nchr97i9y5r57k91dag7ig7fgyvbv5";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz";
+        sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.8.5" = {
+    "@webassemblyjs/helper-buffer-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-buffer";
       packageName = "@webassemblyjs/helper-buffer";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz";
-        sha512 = "3yxqbq2lizijhxxr5ics6i0c5hc6c00fw4dqlqiq669mr1b0zalzs0670psbddmd4sq3yks567n1wr00l5flg6lwf34xlcjfgr92ba6";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz";
+        sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==";
       };
     };
-    "@webassemblyjs/helper-code-frame-1.8.5" = {
+    "@webassemblyjs/helper-code-frame-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-code-frame";
       packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz";
-        sha512 = "0ljgrac16148nv6nbzk5jisalyjx3pgm4vdcbzympzn143367w1k82lvpr7iwrslildvi6ck1jj9vjqy8fj2fkyli6qhr4v5dsil02m";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz";
+        sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==";
       };
     };
-    "@webassemblyjs/helper-fsm-1.8.5" = {
+    "@webassemblyjs/helper-fsm-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-fsm";
       packageName = "@webassemblyjs/helper-fsm";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz";
-        sha512 = "2imw7y018r4hyvyaaw2cpvrv3qp9bv4vg816l2yvl79xwd2dnplmsmmwsv3vmy2b8mvdjzq0dknkd2i6sjbgpzgn4ychicfqvz9f6wi";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz";
+        sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==";
       };
     };
-    "@webassemblyjs/helper-module-context-1.8.5" = {
+    "@webassemblyjs/helper-module-context-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-module-context";
       packageName = "@webassemblyjs/helper-module-context";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz";
-        sha512 = "3gfr1zif7fxlfbpfkcqncq8vmrimncn6pmvh0x7av1pb82a9vhhahpy2mkrgdrc3w62gw0lbbhj4zwgrxzgabaf246vadx6gvdl3vgw";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz";
+        sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==";
       };
     };
-    "@webassemblyjs/helper-wasm-bytecode-1.8.5" = {
+    "@webassemblyjs/helper-wasm-bytecode-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz";
-        sha512 = "10klm32913whkdnjk7jgf262lgl6wqv9qkw6ssjg1lmlzwa0qbn159l962j6pfx3idzaf4w014gmcy17wssdri6v1xxj3dph4qiivha";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz";
+        sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.8.5" = {
+    "@webassemblyjs/helper-wasm-section-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-wasm-section";
       packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz";
-        sha512 = "2s3d3bh4wrizs5y2p480qnxs5m1hx9pfkppa38f7mk9w49cfq6h0gq5c0q79aqrl4jpyzqzmrsdbyx9562q1bb547mm9y8i7kgkqpam";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz";
+        sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==";
       };
     };
-    "@webassemblyjs/ieee754-1.8.5" = {
+    "@webassemblyjs/ieee754-1.9.0" = {
       name = "_at_webassemblyjs_slash_ieee754";
       packageName = "@webassemblyjs/ieee754";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz";
-        sha512 = "3g8bqb43s1n4nrzn5f7vrhdpi88mnr49xpwcq5jb0ql7baslh3cxni2rijp0hng7daai5d0n7dnn0llyazis2mckwzvcaggi90sz839";
+        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz";
+        sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==";
       };
     };
-    "@webassemblyjs/leb128-1.8.5" = {
+    "@webassemblyjs/leb128-1.9.0" = {
       name = "_at_webassemblyjs_slash_leb128";
       packageName = "@webassemblyjs/leb128";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz";
-        sha512 = "3ncjzk3d9pjnjd0vfagpbaa02jpmgapq2hyamzpfpaidshgcyqbz6rfhfp3arvjcdxpws4d9bi0wf552pzr9vs9i8rv4y159jwi8mm6";
+        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz";
+        sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==";
       };
     };
-    "@webassemblyjs/utf8-1.8.5" = {
+    "@webassemblyjs/utf8-1.9.0" = {
       name = "_at_webassemblyjs_slash_utf8";
       packageName = "@webassemblyjs/utf8";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz";
-        sha512 = "27hlgvdfxw9arxzrdrnfd7zmzp953439jyjh8acb3g2nm0ysr9il2xl3v0dklr9yvv6jkmj7s9yi29l2izgghypxqvjrblhv5zf1g2k";
+        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz";
+        sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.8.5" = {
+    "@webassemblyjs/wasm-edit-1.9.0" = {
       name = "_at_webassemblyjs_slash_wasm-edit";
       packageName = "@webassemblyjs/wasm-edit";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz";
-        sha512 = "3lzdvq0vwmp3civ70pdrr3970i7viiywnwry8ysmvmfbd4zhkffs4d5vyy5ibvxmmass9nlmvs3cd8fwh633yx8prr0wnqc5wrl9383";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz";
+        sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==";
       };
     };
-    "@webassemblyjs/wasm-gen-1.8.5" = {
+    "@webassemblyjs/wasm-gen-1.9.0" = {
       name = "_at_webassemblyjs_slash_wasm-gen";
       packageName = "@webassemblyjs/wasm-gen";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz";
-        sha512 = "1d2nc7b2zjdyaxyrvxm5mck8aj0p95dznknn8j8wi5d3ah55zpf2kp18kk79l55fbb7k9vhri74yqbks9ay9qrwbh12si6l897l29h4";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz";
+        sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.8.5" = {
+    "@webassemblyjs/wasm-opt-1.9.0" = {
       name = "_at_webassemblyjs_slash_wasm-opt";
       packageName = "@webassemblyjs/wasm-opt";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz";
-        sha512 = "3npgmsia24ap1yhdpdn1c9bwdq71glsxdyn7kyphz5x4gnxl97v04iwgcsaj2k1di5vgq1m8mlqfrllxk4fvviwl8xd11ylxyc3dahw";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz";
+        sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.8.5" = {
+    "@webassemblyjs/wasm-parser-1.9.0" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz";
-        sha512 = "2bprpybs2qm4m1fbdd877aqj8s153j4gg32bf8qnmigqnjcfwl6mxmbzb90xq7qx6zvwqniv4rirgd40b4c2qab6bfdgsjk9xh14bd6";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz";
+        sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==";
       };
     };
-    "@webassemblyjs/wast-parser-1.8.5" = {
+    "@webassemblyjs/wast-parser-1.9.0" = {
       name = "_at_webassemblyjs_slash_wast-parser";
       packageName = "@webassemblyjs/wast-parser";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz";
-        sha512 = "2r6vw7gg4ij9mjl2f564mwnjsrn7nzsvr1gcrpch0f87xayvjky82f4cn6sh0d8714fpqqqrfq6a1797jnnqs2xidsp2n4abkac59bm";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz";
+        sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==";
       };
     };
-    "@webassemblyjs/wast-printer-1.8.5" = {
+    "@webassemblyjs/wast-printer-1.9.0" = {
       name = "_at_webassemblyjs_slash_wast-printer";
       packageName = "@webassemblyjs/wast-printer";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz";
-        sha512 = "0r5hhrrqk2ww81xjvbxjglp0sh6igz55pjy45ly4786kq3b723vlhqsydr7j87sb3zyww9zvjil08jmk8dcr2978zpmk1h47sj38if3";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz";
+        sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -865,7 +955,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
-        sha512 = "1wczr2c331gq4q6w6nsiylqs6q6dp0j2lvc231826gfrdhr3lcimmyhswp4g0b5p7k7k525gq6gh0wpg65sjlp2s4f0n6ww18m2fzqd";
+        sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==";
       };
     };
     "@xtuc/long-4.2.2" = {
@@ -874,16 +964,16 @@ let
       version = "4.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz";
-        sha512 = "00n8akj5s578b8r7vcdz817cnmga21vznz895kygvb0j780968szj171f91b0bgvz880ff7zq025q4087cgxb2fqpyg01sgil2ymq9n";
+        sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==";
       };
     };
-    "abab-2.0.3" = {
+    "abab-2.0.5" = {
       name = "abab";
       packageName = "abab";
-      version = "2.0.3";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz";
-        sha512 = "192f58ba6nxqhzyxlp9dlj156ry71s8mlfvgbg37kj2slffixrwj2s3zwpnyyhy4mh5m7sy3idir119mk518hjhii6skd9djwz77hdn";
+        url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz";
+        sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==";
       };
     };
     "abbrev-1.1.1" = {
@@ -892,7 +982,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
     "accepts-1.3.7" = {
@@ -901,7 +991,7 @@ let
       version = "1.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
-        sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2";
+        sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
       };
     };
     "acorn-3.3.0" = {
@@ -928,25 +1018,25 @@ let
       version = "5.7.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz";
-        sha512 = "0k4pivh1yagdalb26khf36wscaxi3kbv6w48zg5jsll2scl2wq4f4gxcq9ggnzf37l4y446n4a3bmr85wx0fnwk89pvp1n1drabwgyl";
+        sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==";
       };
     };
-    "acorn-6.4.1" = {
+    "acorn-6.4.2" = {
       name = "acorn";
       packageName = "acorn";
-      version = "6.4.1";
+      version = "6.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz";
-        sha512 = "1s65pswzbh0155lsrdln08lifgs34zb53vkfl8fvxwnfmrc84vj01m9b31w4n846k7vk8lr5ns6wqf0fxc8xz98vkihldxsgn9ksl35";
+        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz";
+        sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==";
       };
     };
-    "acorn-7.1.1" = {
+    "acorn-7.4.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "7.1.1";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz";
-        sha512 = "29c8jlhwnfbnqa2s1v593lcpksv4hl56lywss4gy6w0mwmhx4ydf2n7var8bhcf39nm9asph0ybnf1hkw0s0j91qi7r99ir01v7pmv9";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
+        sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
       };
     };
     "acorn-globals-3.1.0" = {
@@ -964,7 +1054,7 @@ let
       version = "4.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz";
-        sha512 = "38gm4qa9sr1znbnlv4w33f1zrqsvldv66yqlflsc7r5ifxwsnpizsa93yxd3d1a8wy08j424smizrywkzam36z4jpsf0ixm3l9d0mvj";
+        sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==";
       };
     };
     "acorn-walk-6.2.0" = {
@@ -973,16 +1063,16 @@ let
       version = "6.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz";
-        sha512 = "1q392w8cii4phm8maghmlfjzgzmwhd2n0xadah315lqflygnaf5g7gn6lhbdfszf1sdqx5j4bik89qa6zg03n8cfj1b6w7my74yrszd";
+        sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
       };
     };
-    "acorn-walk-7.1.1" = {
+    "acorn-walk-7.2.0" = {
       name = "acorn-walk";
       packageName = "acorn-walk";
-      version = "7.1.1";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz";
-        sha512 = "10s7pz9c2jqw7sjmkkwfb6kyyfgb7qqpmz2gc0fq9phhmfknyw029x1jbw0cwi47wbacpwkw65601arnid2l95lmz0xbzv6ddilznf1";
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz";
+        sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==";
       };
     };
     "aggregate-error-1.0.0" = {
@@ -994,13 +1084,13 @@ let
         sha1 = "888344dad0220a72e3af50906117f48771925fac";
       };
     };
-    "ajv-6.12.0" = {
+    "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.0";
+      version = "6.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
-        sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
+        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
     "ajv-errors-1.0.1" = {
@@ -1009,16 +1099,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz";
-        sha512 = "24kqslzd256yc0dckqcg8n1rngyfzdflfznp55hnhkv3rhyzirjhpj31rgiiryyjlw8a64x9ba7hdqkpiwf6jpllwyyyhr7zqxmy90c";
+        sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==";
       };
     };
-    "ajv-keywords-3.4.1" = {
+    "ajv-keywords-3.5.2" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "3.4.1";
+      version = "3.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz";
-        sha512 = "1lyjmfg70gijr3gjs63qmawfazm5mz8vb1bknyy1vzdif6a30vi3dpwkrlv4j4i5dg56jd3fliqgfq0rxbm98a42jxbgnyxmdn65va4";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz";
+        sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==";
       };
     };
     "align-text-0.1.4" = {
@@ -1036,7 +1126,7 @@ let
       version = "3.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz";
-        sha512 = "2n6gl8300ihln724832pvvzrii5c4qjli9xc16s632ywnyrfbv1kmcqg133v25583hqhflpsfi2yhkjy6nhzj0si5v36zhym0cifxc4";
+        sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==";
       };
     };
     "ansi-escapes-3.2.0" = {
@@ -1045,7 +1135,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
-        sha512 = "12pp3q4c44hrzr2xl9vqjigwjn2wr1j0lhvshl75z5m6a97hqkd047sdcma1inzjvxhpkzk1qkvag7cw3sya32s9wsfasr6xsnnj63h";
+        sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
       };
     };
     "ansi-html-0.0.7" = {
@@ -1081,7 +1171,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm";
+        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
       };
     };
     "ansi-styles-2.2.1" = {
@@ -1099,7 +1189,7 @@ let
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
+        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
     "any-promise-1.3.0" = {
@@ -1117,7 +1207,16 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz";
-        sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6";
+        sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
+      };
+    };
+    "anymatch-3.1.1" = {
+      name = "anymatch";
+      packageName = "anymatch";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz";
+        sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==";
       };
     };
     "aproba-1.2.0" = {
@@ -1126,7 +1225,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
       };
     };
     "argparse-1.0.10" = {
@@ -1135,7 +1234,7 @@ let
       version = "1.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
       };
     };
     "arr-diff-4.0.0" = {
@@ -1153,7 +1252,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
+        sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==";
       };
     };
     "arr-union-3.1.0" = {
@@ -1171,7 +1270,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz";
-        sha512 = "3aqfm29ppm74q3q0xlxldmf1a3vbkl9a6fbljf211cfgc7asjbkdglbpr6a5a04r0rvnk7y709k6nvaqa2nb3df1ipgqfh2hl1v2jsf";
+        sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==";
       };
     };
     "array-equal-1.0.0" = {
@@ -1198,7 +1297,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz";
-        sha512 = "2swmvaw9xcvzv29i247057pq4khyss7gnc0p244v1l2g2p2xpsr47m0dfaf54yscd3fc9njh3kvwly99w8shvd9p5fq6nvwwmqg7mw4";
+        sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==";
       };
     };
     "array-union-1.0.2" = {
@@ -1243,16 +1342,16 @@ let
       version = "0.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
-        sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g";
+        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
       };
     };
-    "asn1.js-4.10.1" = {
+    "asn1.js-5.4.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.10.1";
+      version = "5.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
-        sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz";
+        sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
       };
     };
     "assert-1.5.0" = {
@@ -1261,7 +1360,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz";
-        sha512 = "1n2xh5m359gm4my50j2206n32q2h044lqrl8h122gjn41fizlrh32j1lj7wqfix1iblyvi7zvdgvzbf97f840lr17vfk8ph1imj0fqh";
+        sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==";
       };
     };
     "assert-plus-1.0.0" = {
@@ -1288,7 +1387,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
-        sha512 = "0ga6b0jymkw4jrfvjilhfrddml29l1nrvj7r57d140p7rn31mmbni4j9z343v2zzz2zcnlsr2s17kmlgjkyvs9pxrf88an11pm9y77r";
+        sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
       };
     };
     "async-2.6.3" = {
@@ -1297,7 +1396,7 @@ let
       version = "2.6.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz";
-        sha512 = "1g679kw2qqpqx1yd4s778r8rw3cv9qwmib5x3klk64kcl5ndw71bljcpav5jkk6grizlpvrqszsbs6fkmnlvcq5fnz2q33mrnb6zyfd";
+        sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==";
       };
     };
     "async-each-1.0.3" = {
@@ -1306,7 +1405,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz";
-        sha512 = "00vbg0zvq40mmvzz9q3klkk5ly5jh75kc8s3bf7j2ff9zivla3wlc8d622gajjq4w66mln5570dc936my6wh08ippfj5jagj51s3xfg";
+        sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==";
       };
     };
     "async-limiter-1.0.1" = {
@@ -1315,7 +1414,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
-        sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj";
+        sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==";
       };
     };
     "asynckit-0.4.0" = {
@@ -1333,7 +1432,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz";
-        sha512 = "1rbq2rl2ry0y3nkqs3013vgjrnzf03609rg58092r8zkvzzn6v15grhv2yhzb48sz74zmjcj8ix7f5whrfp4zvsxyzrh64fhs9awvjs";
+        sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
       };
     };
     "awesome-typescript-loader-5.2.1" = {
@@ -1342,7 +1441,7 @@ let
       version = "5.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz";
-        sha512 = "3b9ng7k3l7342hb2qqggp8y84ifzgb7ncjwjjn770gy7fda0c9aq897i7c4gn4w8l02xg88pji4pad46wr6j5755wmwl1q9w3lglnxj";
+        sha512 = "slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g==";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -1354,13 +1453,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.9.1" = {
+    "aws4-1.11.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.9.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
-        sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
+        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
     "axios-0.19.2" = {
@@ -1369,7 +1468,7 @@ let
       version = "0.19.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
-        sha512 = "0fa6ngb4rkbyp5r4ccjgs2ykdbz8i2hcr41av59jicgq6mfva739kcd6n5dqzj3hsx7d4qi201g93li3qddn14bz9qvh76irgj2cf3y";
+        sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
       };
     };
     "babel-6.23.0" = {
@@ -1396,7 +1495,7 @@ let
       version = "6.26.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
-        sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a";
+        sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==";
       };
     };
     "babel-generator-6.26.1" = {
@@ -1405,7 +1504,7 @@ let
       version = "6.26.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz";
-        sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz";
+        sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==";
       };
     };
     "babel-helper-builder-binary-assignment-operator-visitor-6.24.1" = {
@@ -1522,7 +1621,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz";
-        sha512 = "0iziajgh09ldyj02pmxdkxhzy1wj6n84az4l30p7pllaxlbz9g678q59b0309wfihbj82n4v85pi66n9crksz0f6chy2dx2zisrvnwy";
+        sha512 = "ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==";
       };
     };
     "babel-messages-6.23.0" = {
@@ -1549,7 +1648,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz";
-        sha512 = "1kj4z39mavs3h7wmb3nwrvhjddb1r138q61nisldfzcb52aikgi0hgg7yvql7xlvy7pxygx7wka7gimvcvbdhjwidwcn0qj8l5n3fp4";
+        sha512 = "5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==";
       };
     };
     "babel-plugin-jest-hoist-24.9.0" = {
@@ -1558,7 +1657,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz";
-        sha512 = "1gvgnf01laddy7cnxb2ggd1qg1zlsj3s72azdvib6vi9sqmbc7snzhxy6xw4dsmpypb64ncqxlk1mmasy0sycqhs53bk9qmzzc00hyq";
+        sha512 = "2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==";
       };
     };
     "babel-plugin-syntax-async-functions-6.13.0" = {
@@ -1702,7 +1801,7 @@ let
       version = "6.26.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz";
-        sha512 = "3sy41x9jlzyzy6wzsj60asahzm6hg9gmr6r1cckdqhzmvckl7jbfb5zwr0nslndnhqgjwdmvxsah41h8v8286hjqbfbhxn4w4w52pq9";
+        sha512 = "CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==";
       };
     };
     "babel-plugin-transform-es2015-modules-systemjs-6.24.1" = {
@@ -1828,7 +1927,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz";
-        sha512 = "0g45grnsjds9va8zwb68gpm4ngzmnb351bbvphnmis7bifsh2ny2c00bwah57fn1yv87fs69hriimbysbm15dpsvfbpf3lazdlpdr7l";
+        sha512 = "9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==";
       };
     };
     "babel-preset-jest-24.9.0" = {
@@ -1837,7 +1936,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz";
-        sha512 = "01858ghqwnl2b16rmrwwf6w6z3awwvxm22ld8vnfghf6lil3pkxdjjpfn70iib4plm4ynwrfrsiyr0gf3qxjzgi8k9wfk1q26xd8d4b";
+        sha512 = "izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==";
       };
     };
     "babel-register-6.26.0" = {
@@ -1891,7 +1990,7 @@ let
       version = "6.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz";
-        sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb";
+        sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -1909,16 +2008,16 @@ let
       version = "0.11.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz";
-        sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5";
+        sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
       };
     };
-    "base64-js-1.3.1" = {
+    "base64-js-1.5.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.3.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
-        sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
+        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
       };
     };
     "base64url-3.0.1" = {
@@ -1927,7 +2026,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz";
-        sha512 = "3hb3l768r5h0x6z47fw1kn6v50cx9xncmm6yzbhvrvgja0j26fwvhpyh8ppwnf1c2j8g62c912l7cq5h755fpdiafqhg4yxplz59gca";
+        sha512 = "ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==";
       };
     };
     "batch-0.6.1" = {
@@ -1954,7 +2053,7 @@ let
       version = "6.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz";
-        sha512 = "0dhyz488lykv8avkn9y738mnlkgkffxwsp5xmh9sffsh1xxdnigsd9a6l01vj0bdzqdmzqq0pbw31qh9x06fll38i7s19z2h9mljq06";
+        sha512 = "BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==";
       };
     };
     "big.js-5.2.2" = {
@@ -1963,7 +2062,7 @@ let
       version = "5.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz";
-        sha512 = "2cin34lhbrlligarblnrqnl6f419mkpqd4abjms0y1fk1mxzb6rqvh1sg0zif7bgskirhh6shxnqa444syk4cf87fmndil954xzc8mz";
+        sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
       };
     };
     "binary-extensions-1.13.1" = {
@@ -1972,7 +2071,16 @@ let
       version = "1.13.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz";
-        sha512 = "0drjfs8xmgc4rfi8nbbx7adsinnc5m0nc96dw3r3gars8zvg1kzay5a7a5s3islf13wmw7q9v15i7d2gdghs1lp6rh2wl6x80hcqzjj";
+        sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
+      };
+    };
+    "binary-extensions-2.2.0" = {
+      name = "binary-extensions";
+      packageName = "binary-extensions";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
+        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
       };
     };
     "bindings-1.5.0" = {
@@ -1981,7 +2089,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz";
-        sha512 = "24xpa35sym31k1x9hs78jbmsh58yx7ldkn03d4g5qhmvm0bi5cwqvpn2s6r8hkwhks5mhm81gz878gbp5g9b2s7zniy7gm1z6vvysm7";
+        sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
       };
     };
     "bluebird-3.7.2" = {
@@ -1990,16 +2098,25 @@ let
       version = "3.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
-        sha512 = "2v12rs2wvv94hrlyv0nadxn9x11796k9mk7a8vg0bqsry8m2pbyy9dribalwikh34qkk3rp6gnis849y5z9x5mxzbbdgkfhc3l674sy";
+        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
       };
     };
-    "bn.js-4.11.8" = {
+    "bn.js-4.11.9" = {
       name = "bn.js";
       packageName = "bn.js";
-      version = "4.11.8";
+      version = "4.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
-        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz";
+        sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==";
+      };
+    };
+    "bn.js-5.1.3" = {
+      name = "bn.js";
+      packageName = "bn.js";
+      version = "5.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz";
+        sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==";
       };
     };
     "body-parser-1.19.0" = {
@@ -2008,7 +2125,7 @@ let
       version = "1.19.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz";
-        sha512 = "2rl5ww96fwgmxdqhqmnknsaafw44vsr2xz7vf7nax8qz9jy8bmmdyawcy6yfny0wm7pi8m2jssakzjc1nin8z8207kv0gclpnrhy4bn";
+        sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==";
       };
     };
     "bonjour-3.5.0" = {
@@ -2026,7 +2143,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
     "braces-2.3.2" = {
@@ -2035,7 +2152,16 @@ let
       version = "2.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz";
-        sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8";
+        sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
+      };
+    };
+    "braces-3.0.2" = {
+      name = "braces";
+      packageName = "braces";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
+        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
       };
     };
     "brorand-1.1.0" = {
@@ -2053,7 +2179,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
-        sha512 = "2ijqy6cba233jd04p2sd4a372z807f9rsykxzbf3sn50102h7nv57bid0bldh9is9c4yajgdjwlif9xpnz5xsx06clij6ipq9wm93pn";
+        sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
       };
     };
     "browser-resolve-1.11.3" = {
@@ -2062,7 +2188,7 @@ let
       version = "1.11.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz";
-        sha512 = "1slq1pnm0b2903am1rl17iczlsl08sq4rckkr5fgkchgzfac13kiibwdk08yy2m62lgir8dmj9d61vil8q0vrm1d2mzw1qn2vaf443v";
+        sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==";
       };
     };
     "browserify-aes-1.2.0" = {
@@ -2071,7 +2197,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
-        sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v";
+        sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==";
       };
     };
     "browserify-cipher-1.0.1" = {
@@ -2080,7 +2206,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
-        sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h";
+        sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==";
       };
     };
     "browserify-des-1.0.2" = {
@@ -2089,25 +2215,25 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz";
-        sha512 = "3j1gv3firnsbjppm47ldxbav9rmh3plq026zn728wvhgf19i4r7kxzyyj7hpibhjv61lcm9i4b869yy90c8hfj7w8rmr17p2zbhwah6";
+        sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
       };
     };
-    "browserify-rsa-4.0.1" = {
+    "browserify-rsa-4.1.0" = {
       name = "browserify-rsa";
       packageName = "browserify-rsa";
-      version = "4.0.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
-        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz";
+        sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==";
       };
     };
-    "browserify-sign-4.0.4" = {
+    "browserify-sign-4.2.1" = {
       name = "browserify-sign";
       packageName = "browserify-sign";
-      version = "4.0.4";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
-        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
+        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz";
+        sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==";
       };
     };
     "browserify-zlib-0.2.0" = {
@@ -2116,7 +2242,7 @@ let
       version = "0.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
-        sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
+        sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
     "browserslist-3.2.8" = {
@@ -2125,7 +2251,7 @@ let
       version = "3.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz";
-        sha512 = "00i65frm5jkbv8pzc13i02fzd39q0ahh653zzjzhq35pz6p0idajfjqg1b7mnnlvxymihcpmd1cfhwaj51hnqjmh4alrg8sjrq6hxaq";
+        sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==";
       };
     };
     "bs-logger-0.2.6" = {
@@ -2134,7 +2260,7 @@ let
       version = "0.2.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz";
-        sha512 = "2i44nrigqkrnr7acqqppsmv9y97b55vma5fwg30jdhy9m4pc13rb3bpfxm8r560fp81605chdi27mx8dpy3mji3hwxhfvk6ih507px5";
+        sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==";
       };
     };
     "bser-2.1.1" = {
@@ -2143,7 +2269,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz";
-        sha512 = "30jby01rqjgx78xnzyysjav12c0cj8dcwd40wprcfh1jn3768cdkb834q1zyf3wivhifi47xqa7jai7x16m1jv1mq4g40f69ws56341";
+        sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==";
       };
     };
     "buffer-4.9.2" = {
@@ -2152,7 +2278,16 @@ let
       version = "4.9.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz";
-        sha512 = "1d85syv6ashl8f3a6h553d185cg3vq6nhjqnc80vr2z3bak0c9xbm1jawfk9zs43xz34yih6h6j3bhb3njkahdqpji12fsc4kfsmby6";
+        sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==";
+      };
+    };
+    "buffer-5.7.1" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz";
+        sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==";
       };
     };
     "buffer-from-1.1.1" = {
@@ -2161,7 +2296,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
-        sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri";
+        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
       };
     };
     "buffer-indexof-1.1.1" = {
@@ -2170,7 +2305,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz";
-        sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3";
+        sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==";
       };
     };
     "buffer-xor-1.0.3" = {
@@ -2182,6 +2317,15 @@ let
         sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
       };
     };
+    "bufferutil-4.0.3" = {
+      name = "bufferutil";
+      packageName = "bufferutil";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.3.tgz";
+        sha512 = "yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw==";
+      };
+    };
     "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
@@ -2215,7 +2359,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz";
-        sha512 = "073ccjmvxf726gcgzy0pksvi8x8r51dq6hyv69sc75ynrin7anwk9q3sqhbbbjhqjjrmq42s5f5gdbcgj2jxai6ldpyq6y2ny78payd";
+        sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
       };
     };
     "cacache-10.0.4" = {
@@ -2224,16 +2368,16 @@ let
       version = "10.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz";
-        sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f";
+        sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==";
       };
     };
-    "cacache-12.0.3" = {
+    "cacache-12.0.4" = {
       name = "cacache";
       packageName = "cacache";
-      version = "12.0.3";
+      version = "12.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz";
-        sha512 = "0zsyrn5azk0hm2mhfsa2wwz1g66wis9f7ifxl2sphms1i91z75mfmky892g7c538slj94fgd8nlbjnw5irki49vn5gfl586f5ynd9wj";
+        url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz";
+        sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==";
       };
     };
     "cache-base-1.0.1" = {
@@ -2242,7 +2386,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz";
-        sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0";
+        sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
     "cache-content-type-1.0.1" = {
@@ -2251,7 +2395,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz";
-        sha512 = "209nv86cqszi98b5mij2w84m5ixnnwxh211nv0zjgfi46l52fp437hqznnc0ckm5nlgr4labfn16wxa7s7lmnaac4vdwliqb9krzar0";
+        sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==";
       };
     };
     "cacheable-request-2.1.4" = {
@@ -2263,13 +2407,22 @@ let
         sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d";
       };
     };
+    "call-bind-1.0.2" = {
+      name = "call-bind";
+      packageName = "call-bind";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
+        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
+      };
+    };
     "callsites-3.1.0" = {
       name = "callsites";
       packageName = "callsites";
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz";
-        sha512 = "1ljrfqkxsjdvl02qlx1xdsw8csg4az6dkwvlk0zmcz7x3b6q3kbggd8i3ai8jcjicabdsqkhvpjy0898xcdf21m42ajyrggql167h1z";
+        sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
       };
     };
     "camelcase-1.2.1" = {
@@ -2296,16 +2449,16 @@ let
       version = "5.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
-        sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg";
+        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
-    "caniuse-lite-1.0.30001035" = {
+    "caniuse-lite-1.0.30001179" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001035";
+      version = "1.0.30001179";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz";
-        sha512 = "0nv07k5fhwwhak7xbp0kf2z0v2bpjicyrs11c9d14cipzzgcx6has5910iwc7yhh3mja5h52d93x3hrmfam66yk27agdqw09f172mhb";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz";
+        sha512 = "blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -2314,7 +2467,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz";
-        sha512 = "3m6md2j1rsn26hijf0yfbbfnx6w2jrrqhr2b2xwjc9lyzvypidyz5krczc9wb04z1vq4mgb759ljwn7iggiiigijzhp38lk162zy91y";
+        sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==";
       };
     };
     "caseless-0.12.0" = {
@@ -2350,7 +2503,7 @@ let
       version = "2.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
-        sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j";
+        sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
     "character-parser-2.2.0" = {
@@ -2368,7 +2521,7 @@ let
       version = "8.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz";
-        sha512 = "30ql79azwkvqg2pfwvc0zp51fbwpijfbxdrnw5v5vsd3j2k6bzi5d78p78b877fzrji6clkw284pdakba5jg7dvmjwnx60lg1k8m5v2";
+        sha512 = "YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==";
       };
     };
     "chokidar-2.1.8" = {
@@ -2377,7 +2530,16 @@ let
       version = "2.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz";
-        sha512 = "21d2yf3364v025ivy6ak1bh61qvvq9llryh8c1rhvrif1kalx0j996x8m0qs717cgl97q5c40awyv8gi8hbmpgfpl6zvkff6xmm8rk6";
+        sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
+      };
+    };
+    "chokidar-3.5.1" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "3.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz";
+        sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==";
       };
     };
     "chownr-1.1.4" = {
@@ -2386,7 +2548,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
-        sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "chrome-trace-event-1.0.2" = {
@@ -2395,7 +2557,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz";
-        sha512 = "06mh145f12ppkxn7xdzrvh7rrjg9c770rqai08m8r5i31br1ihc96i63dyn0c4arfl1hl0za33kzy5i09x4agz77c11xv7hb33z7vzm";
+        sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==";
       };
     };
     "ci-info-2.0.0" = {
@@ -2404,7 +2566,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz";
-        sha512 = "04yh5kqsx5akwc3rlcwqrvz3lrb8mak15ysxan17hw9pp00kmf20m8d9dpbnkq612wc1wwvjzcci1wgivd8cbak5j7dzl6rv89bplp6";
+        sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==";
       };
     };
     "cipher-base-1.0.4" = {
@@ -2413,7 +2575,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
+        sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==";
       };
     };
     "class-utils-0.3.6" = {
@@ -2422,7 +2584,7 @@ let
       version = "0.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
-        sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58";
+        sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
     "clean-css-4.2.3" = {
@@ -2431,7 +2593,7 @@ let
       version = "4.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz";
-        sha512 = "0ad50l577m99sgpcdd49zspq8h9n9i3hhngapg9y5q76s7zwdz3hmaw2kc2jg30lk4z3wlyp9kgiyg71dvg0fg89g1xyr3qvq61dhsm";
+        sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==";
       };
     };
     "clean-stack-1.3.0" = {
@@ -2452,13 +2614,13 @@ let
         sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
       };
     };
-    "cli-spinners-2.2.0" = {
+    "cli-spinners-2.5.0" = {
       name = "cli-spinners";
       packageName = "cli-spinners";
-      version = "2.2.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz";
-        sha512 = "0lj50waj40l4a51whihhvrjb838jqjkp1znn7dqgw6bsb1z7qwfyaxfggwmy3122rvnz4gxa8fn7qmp94zk03q8265khqikmiy3f1dn";
+        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz";
+        sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==";
       };
     };
     "cliui-2.1.0" = {
@@ -2470,22 +2632,13 @@ let
         sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
       };
     };
-    "cliui-4.1.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
-        sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0";
-      };
-    };
     "cliui-5.0.0" = {
       name = "cliui";
       packageName = "cliui";
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
-        sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx";
+        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
       };
     };
     "clone-1.0.4" = {
@@ -2521,16 +2674,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/co-body/-/co-body-5.2.0.tgz";
-        sha512 = "36nr6zz2qri7lg37azg3n5lq5cwgfi3pf7j35l908qlc0shbbi353k47ama8q7p8c4gb9czdjpr7xy05ar7pnqwdcr1hlpan91wnzxi";
-      };
-    };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+        sha512 = "sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ==";
       };
     };
     "collection-visit-1.0.0" = {
@@ -2548,7 +2692,7 @@ let
       version = "1.9.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
-        sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21";
+        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
       };
     };
     "color-name-1.1.3" = {
@@ -2566,7 +2710,7 @@ let
       version = "1.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
-        sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm";
+        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
       };
     };
     "command-line-args-5.1.1" = {
@@ -2575,7 +2719,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz";
-        sha512 = "1dffdcll80c4cs7d9026187ild861bw26qph26frx8hx2dv23wwsw5g68kykqs8g2da57f62s56psxplx3bxcsprd85v5kbr4dxxgw4";
+        sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==";
       };
     };
     "commander-2.20.3" = {
@@ -2584,7 +2728,7 @@ let
       version = "2.20.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
-        sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s";
+        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
     "commondir-1.0.1" = {
@@ -2602,7 +2746,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz";
-        sha512 = "136ravx3m3gf0ca84sf21hj47wmpqyjzmx6yvhj0b14mga7xcxfcgdc7yj9z8klcbr4yfqzy88fksmf233qx68a9ysw7yh1lixyrpa5";
+        sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
       };
     };
     "compressible-2.0.18" = {
@@ -2611,7 +2755,7 @@ let
       version = "2.0.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz";
-        sha512 = "13341lfj8d36v6gha16xmv92w4875z8irqdbns3jxlkc3a63aswys5sajq97y1sd42l08inw1l0s51r4l9lv20w6gy14nsxzvnfnp80";
+        sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==";
       };
     };
     "compression-1.7.4" = {
@@ -2620,7 +2764,7 @@ let
       version = "1.7.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz";
-        sha512 = "24kqcbwm455isy2yiyfrdrsh011qi09pbgylw1jws2yfmiwmwp2j8pmax52c41z3x1n84v1j5va29dnxwygkl4pw599b9gx6c7qi94d";
+        sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==";
       };
     };
     "concat-map-0.0.1" = {
@@ -2638,7 +2782,7 @@ let
       version = "1.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
-        sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
       };
     };
     "condense-newlines-0.2.1" = {
@@ -2656,7 +2800,7 @@ let
       version = "1.1.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz";
-        sha512 = "2hg7rni4gx8l765i8qzkp9dv69c8r06i8rxxkkkrsklbd8iz6ingxnp10r4fqqrm9jxy3gp8yp0lzpybwdf27kq49abkyxwrchqwmvb";
+        sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
       };
     };
     "connect-history-api-fallback-1.6.0" = {
@@ -2665,7 +2809,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz";
-        sha512 = "0p9s5aqb76hamj9z64zd53ndh5r1jv76iw97hwrylmwwjprjn1246hrr5nvp5vs1xwwipq6dv7zj4qwywbn3n4cxc3llfdzvbvh37kv";
+        sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==";
       };
     };
     "console-browserify-1.2.0" = {
@@ -2674,7 +2818,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz";
-        sha512 = "168x7bp4xr522yw92himv9xv14q336ps1kkg79qcmarg3q4yzpd52pa8x8zgq11b6996f8053799k6365437si3pk85w5z4y8xiijb4";
+        sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==";
       };
     };
     "consolidate-0.15.1" = {
@@ -2683,7 +2827,7 @@ let
       version = "0.15.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz";
-        sha512 = "0rx5m8ygvw7y8rfs0fgpl6ppwk6gm7299qsnm005x88ws9yzb9fcj143f2irjsb94k8x9kdw7pap819dgg3w6x0jayhq9hcpfg3lvhd";
+        sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==";
       };
     };
     "constantinople-3.1.2" = {
@@ -2692,7 +2836,7 @@ let
       version = "3.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz";
-        sha512 = "2xnhrmlbkfpcvckxxrl0hjp6qhhqv1p7c6pwxgqp1g0sa5q5cc514xn48g9x8kqj7g1imzciwgb2msbhvhn0w0v92mb7105l43drqy9";
+        sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==";
       };
     };
     "constants-browserify-1.0.0" = {
@@ -2710,7 +2854,7 @@ let
       version = "0.5.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz";
-        sha512 = "3976ggkw1lp21a6m3s19blb9a74kq7a0spw47v0m3vvi1k5wiamrsn20slcr9byx80x2la2sppkwjp7x10gc58142dl7412pvpv84qk";
+        sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==";
       };
     };
     "content-type-1.0.4" = {
@@ -2719,7 +2863,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
-        sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4";
+        sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
       };
     };
     "convert-source-map-1.7.0" = {
@@ -2728,7 +2872,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz";
-        sha512 = "2hgf7brri4yaflx3y24d2cvznsk0km17mq8mp7sb2hhskf45hcamlgf8vzzbimw36lw128bjbf442p2rx96d1bhn9sk044p69gn8lp0";
+        sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==";
       };
     };
     "cookie-0.4.0" = {
@@ -2737,7 +2881,7 @@ let
       version = "0.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz";
-        sha512 = "1g7bscknfpc6zgznz77hvll6cy5m9jv7zg9nkpdqzmgi0vhv75kh8iyqf6rdslkml47l3jihsz7hy0i8x5n6bfx9ba0kvvrp9y7qypq";
+        sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==";
       };
     };
     "cookie-signature-1.0.6" = {
@@ -2755,7 +2899,7 @@ let
       version = "0.8.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz";
-        sha512 = "2iqv33i76hmss097a18gkv8v1kawzs5zkgkri3nnrql9160y2vpkasv8dqj7l4c9hh6y6ki6nv072y13jrxzfcgp3kvay8zjh1fr8zi";
+        sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==";
       };
     };
     "copy-concurrently-1.0.5" = {
@@ -2764,7 +2908,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
-        sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz";
+        sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==";
       };
     };
     "copy-descriptor-0.1.1" = {
@@ -2782,16 +2926,16 @@ let
       version = "4.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz";
-        sha512 = "1j7l2xm5blz3ylmq1c0mwlkfbx9faqm09zid0czbyyfr05236pkgvzjzfr7syqb95mgzkzxdag697p4wwsxpcr7my88admlbw491r33";
+        sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
       };
     };
-    "core-js-2.6.11" = {
+    "core-js-2.6.12" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.11";
+      version = "2.6.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
-        sha512 = "1db6yjq48a8kkrfrxd0miblcf7nk2b4afgpr8dfgjl3jvz3xclvrqmz590hx2h59jh79lgl35r101lw5jqs46qybizdbpgzljjyf277";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz";
+        sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2803,13 +2947,13 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "create-ecdh-4.0.3" = {
+    "create-ecdh-4.0.4" = {
       name = "create-ecdh";
       packageName = "create-ecdh";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
-        sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r";
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz";
+        sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==";
       };
     };
     "create-hash-1.2.0" = {
@@ -2818,7 +2962,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
-        sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg";
+        sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==";
       };
     };
     "create-hmac-1.1.7" = {
@@ -2827,7 +2971,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
-        sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h";
+        sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
     "cron-1.8.2" = {
@@ -2836,7 +2980,7 @@ let
       version = "1.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz";
-        sha512 = "35a9lj0cl50q669jhxl1f68myxinkmbdbl2yn4z3d93swlckjjiganjcn8iphg2867jil7ahkpapx5md94lw5102ny46a5i5virqk8s";
+        sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==";
       };
     };
     "cross-spawn-6.0.5" = {
@@ -2845,7 +2989,7 @@ let
       version = "6.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
-        sha512 = "1csj16gwq9riz0pm73dlxhbnsl1r3ldc5v0aincwj71ambi6xf3kc1kgsbwaakd8rj16k4mrli2syrjd57g6cr81zdzivdd2jn4ndbr";
+        sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
       };
     };
     "crypto-browserify-3.12.0" = {
@@ -2854,7 +2998,7 @@ let
       version = "3.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
-        sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz";
+        sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==";
       };
     };
     "cssom-0.3.8" = {
@@ -2863,7 +3007,7 @@ let
       version = "0.3.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz";
-        sha512 = "1i0h2rg4hb1j2430jc46n2zjc5gqg26brpl2ypjank206vjwdbk4n1svfk7nrbdsx7czd1a025a9h6ssh9qhscw4r7vi0fynwflcjvg";
+        sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==";
       };
     };
     "cssstyle-1.4.0" = {
@@ -2872,7 +3016,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz";
-        sha512 = "1460djxnz2dn84cx1wln5l004dy95pgik0h5bij3f7gw1i45p3mnsylwdps4r37gckfzqv5zvyh3gx95dr0ca01zmx8qpvqhrjwn6hq";
+        sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==";
       };
     };
     "cyclist-1.0.1" = {
@@ -2890,7 +3034,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz";
-        sha512 = "0abwyrfpd8rm9bwzgcaxcwd92d07c31cxw1fgs7h51ri2igw4vib1a5x69cg14wqisjad1d0fhglca6218qm9dngr17yhwv8f295bcv";
+        sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
       };
     };
     "dashdash-1.14.1" = {
@@ -2908,7 +3052,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz";
-        sha512 = "1wvgs0ccidbr67x52w8wx58knvvy7ir6j05z1sa3f4rdnpr3dvdlf6rwapfb09z0mi9w129llzvhxa0lj8jy84zpdwzxm0yvcirhdb1";
+        sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==";
       };
     };
     "debug-2.6.9" = {
@@ -2917,7 +3061,7 @@ let
       version = "2.6.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
-        sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc";
+        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
     "debug-3.1.0" = {
@@ -2926,25 +3070,25 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
+        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
-    "debug-3.2.6" = {
+    "debug-3.2.7" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.6";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
-        sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
+        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
-    "debug-4.1.1" = {
+    "debug-4.3.2" = {
       name = "debug";
       packageName = "debug";
-      version = "4.1.1";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
-        sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
+        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
       };
     };
     "decamelize-1.2.0" = {
@@ -2998,7 +3142,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz";
-        sha512 = "2067xswfnhdrq76l5wqibx50y8r46q0sdbkax2nxq6gq0ljjrrmmq95k99vnkgcz5xc7r1hhv0w7bw978krjxvdmnawam3ma2nhraw7";
+        sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
       };
     };
     "defaults-1.0.3" = {
@@ -3016,7 +3160,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
-        sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw";
+        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
       };
     };
     "define-property-0.2.5" = {
@@ -3043,7 +3187,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz";
-        sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg";
+        sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==";
       };
     };
     "del-4.1.1" = {
@@ -3052,7 +3196,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz";
-        sha512 = "1fkk8r4abk9009whl0yqapv13rjzj6mr01ghkxpbjkrvr6a6n6hg492mdr72wf3dc13zp3dmzq6z4bzm31h59q7q4anjgrf988sw0a3";
+        sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -3088,7 +3232,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz";
-        sha512 = "2phijq20j255bs4jjs11j5pa0x7y1084k6ch9xa8wgzp71zzgbpm23wyzbcs0mszvj971l9i5aav40sddm000484sl3ij4xzvlcgfc3";
+        sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==";
       };
     };
     "des.js-1.0.1" = {
@@ -3097,7 +3241,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz";
-        sha512 = "085ljc5q2yk3jabd61p91n821q4prv13qalbfni9ybcb900b4mmcdnndi5b5prfs9wybp13asd13shlxgrbsgvyfx7nbgvby6jkhhj3";
+        sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==";
       };
     };
     "destroy-1.0.4" = {
@@ -3142,7 +3286,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz";
-        sha512 = "0mncqs8asq6722qr5jcv5bwi1653nd4s61s9mb9iyk3jkv83w9iynwjfd6ynp1jwsmr7qaspk6yd1x8c05qi9pxikikwfkbnajd3334";
+        sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==";
       };
     };
     "diff-sequences-24.9.0" = {
@@ -3151,7 +3295,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz";
-        sha512 = "1xvcq6cya1qr0slk88xxgibba4win89nmmy6945vzi0cqs3f4h72inwbk7wb05v55c23sx69grj872yyk5mnswd2qz33jangf9rcghf";
+        sha512 = "Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==";
       };
     };
     "diffie-hellman-5.0.3" = {
@@ -3160,7 +3304,7 @@ let
       version = "5.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
-        sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj";
+        sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
     "dir-glob-2.2.2" = {
@@ -3169,7 +3313,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz";
-        sha512 = "2rlgbmwy8bl5xqrwifdqhggx21ac4c8k6vgq7ia2h6cxmaiprrlm1p99cn4hb4dmax9wwk4vx96bc50b7ngxgx74fvqbk0njj5w3lkz";
+        sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==";
       };
     };
     "dns-equal-1.0.0" = {
@@ -3187,7 +3331,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz";
-        sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i";
+        sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==";
       };
     };
     "dns-txt-2.0.2" = {
@@ -3214,7 +3358,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
-        sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f";
+        sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
       };
     };
     "domexception-1.0.1" = {
@@ -3223,16 +3367,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz";
-        sha512 = "2x8mi3fy0wghky9i6bmz1d26yz1bbd4zmaqyc45fhrqhw8kdg6a4k4zz6jn9bisnxr8bff7fypz0vncby6sw8d2ld6r627v94ra1a5d";
+        sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==";
       };
     };
-    "duplexer-0.1.1" = {
+    "duplexer-0.1.2" = {
       name = "duplexer";
       packageName = "duplexer";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
-        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz";
+        sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==";
       };
     };
     "duplexer3-0.1.4" = {
@@ -3250,7 +3394,7 @@ let
       version = "3.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz";
-        sha512 = "3k23dn0v8n7r3ds3v137vmw1vg3ngd6fw3bb4hasa6bm40qasvdaidjwx0wb4gakp8xvdrsckjn0wkmmi90z8a2sswj8cxhznxgrg6k";
+        sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -3268,7 +3412,7 @@ let
       version = "0.15.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz";
-        sha512 = "3ggssjvjbrq0q12nr33bfbd8qdmmyapkiivxczlp66gi9y14s7dhaqxdmvbmg6lkzzli17w6v3rx3fyb0d82zl18ysgmskxbhq0ip1k";
+        sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==";
       };
     };
     "ee-first-1.1.1" = {
@@ -3286,25 +3430,25 @@ let
       version = "2.7.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
-        sha512 = "2ad39acbba96hqbgf714pacri515xjn8jd43bkfb1wwp04vflpjj0qhnnmsq074g7d1kycyj1bmf620s43qb3x74hrfb4ky3v5axygf";
+        sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
-    "electron-to-chromium-1.3.376" = {
+    "electron-to-chromium-1.3.642" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.376";
+      version = "1.3.642";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz";
-        sha512 = "27ngh0x7siic0nydq0xics24lnqfqjb2d6ja2fdfp1z979lisiy52m8cbbvrxp2ksr3nlk4s4yg5v4rll49wxjzry63gczrbihwzzvj";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz";
+        sha512 = "cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==";
       };
     };
-    "elliptic-6.5.2" = {
+    "elliptic-6.5.3" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.2";
+      version = "6.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz";
-        sha512 = "33kzl02iwbq3pl33ihcdq9nm48yzhfj96183zzra06hp3z6bacz3d99pl74jziwygys4npxbxwnvszz12wl8lpkjw8b4r9ki797p33z";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz";
+        sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -3313,16 +3457,7 @@ let
       version = "7.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
-        sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b";
-      };
-    };
-    "emojis-list-2.1.0" = {
-      name = "emojis-list";
-      packageName = "emojis-list";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
-        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
+        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
       };
     };
     "emojis-list-3.0.0" = {
@@ -3331,7 +3466,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
-        sha512 = "3cib7aw0206bfcb324aqh3fsda46mjxghd08gaasxagv6jfc74r2jvcv78rb8h10m879w42nbrn3q8rjifg9s5rclbpr2hzq7bqqk7y";
+        sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==";
       };
     };
     "encodeurl-1.0.2" = {
@@ -3349,34 +3484,25 @@ let
       version = "1.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz";
-        sha512 = "3jyw0a0c7m1yxglwk7i5jh8zb3vvx7f9l4frbskxkgf9cyf4i8ww26p8bimnsryrh1dx7lwrxq64vbpjwfcv1svd4lg8m07fa53bv7s";
+        sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
       };
     };
-    "enhanced-resolve-4.1.0" = {
+    "enhanced-resolve-4.5.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "4.1.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
-        sha512 = "2g5bp8yrd5ixqfg81db9ifalcqdyjxmrc4va86ljng9vnhkk2v0gxc7w28q00wnlp0j6sjilzj7dh4mkj2z49z2jkjwzjgd4j9yzzhp";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz";
+        sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==";
       };
     };
-    "enhanced-resolve-4.1.1" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz";
-        sha512 = "2w4dww5r1bxbycbb3kq0pdl9v56942678c53j9rwikxf05xd2n5h0b3a6914wxcmzr9wx4m0w56adp3qp21rk1wzkhbybxb9z67djpp";
-      };
-    };
-    "errno-0.1.7" = {
+    "errno-0.1.8" = {
       name = "errno";
       packageName = "errno";
-      version = "0.1.7";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
-        sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii";
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz";
+        sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==";
       };
     };
     "error-ex-1.3.2" = {
@@ -3385,25 +3511,16 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
-        sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd";
+        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "error-inject-1.0.0" = {
-      name = "error-inject";
-      packageName = "error-inject";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz";
-        sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
-      };
-    };
-    "es-abstract-1.17.4" = {
+    "es-abstract-1.18.0-next.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.17.4";
+      version = "1.18.0-next.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
-        sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
+        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -3412,7 +3529,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0";
+        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
     "es5-ext-0.10.53" = {
@@ -3421,7 +3538,7 @@ let
       version = "0.10.53";
       src = fetchurl {
         url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz";
-        sha512 = "3wl9jgj276xsjcf4gvc9w7gg403rg02s1i24r7scvhwg0mmgbqwsszjk94xnzfd3wj4y2khk6wbz8dm9j6lvlcwrbbd324d1svr5kay";
+        sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==";
       };
     };
     "es6-iterator-2.0.3" = {
@@ -3439,7 +3556,7 @@ let
       version = "4.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
-        sha512 = "3zz892nih7z36hb24sqg3wgzgzp81zjq7h8bbrpdh80yxp46r9rk2ddhr65zqg9ygi4s8ph9fs3in3gkinvqwfhqlpy5iasjz3wd40w";
+        sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
       };
     };
     "es6-symbol-3.1.3" = {
@@ -3448,7 +3565,7 @@ let
       version = "3.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz";
-        sha512 = "0sgbv9jpq91di424qar8xiw36az4msxqhgpk1ixq5hv4wdbgaxs45q8i671icpg085bh1j7hj93iyszp7x9fmhld30jj3kff6gri7il";
+        sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==";
       };
     };
     "escape-html-1.0.3" = {
@@ -3469,13 +3586,22 @@ let
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "escodegen-1.14.1" = {
+    "escape-string-regexp-2.0.0" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz";
+        sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==";
+      };
+    };
+    "escodegen-1.14.3" = {
       name = "escodegen";
       packageName = "escodegen";
-      version = "1.14.1";
+      version = "1.14.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz";
-        sha512 = "14kvh9zgpdp6ci9l9nqwwlhjz8gidkhgsv1yj8i7jbh087fchwwn62440spqk09f3qz13jrdyqdgfhf2yddkm7p6hgx4jbjqhspnsq6";
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz";
+        sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==";
       };
     };
     "eslint-scope-4.0.3" = {
@@ -3484,7 +3610,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz";
-        sha512 = "2p4myi99y1nk5dy7fvmbspjdynigw3dzkhcm7zaiwfyw2wp6j61y0i8mba18ksv9qi2s1wp6w6xhn7471qs631bqwmz8fzmvas6xdd7";
+        sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
       };
     };
     "esprima-4.0.1" = {
@@ -3493,16 +3619,16 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
-        sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq";
+        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
       };
     };
-    "esrecurse-4.2.1" = {
+    "esrecurse-4.3.0" = {
       name = "esrecurse";
       packageName = "esrecurse";
-      version = "4.2.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz";
-        sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b";
+        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz";
+        sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==";
       };
     };
     "estraverse-4.3.0" = {
@@ -3511,7 +3637,16 @@ let
       version = "4.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
-        sha512 = "2kh3lczc7smb84ryllqrdvrknxl3h47khh7li6n9m76mj9jfh1ahz2jm8ffpcaac7i4k8zkf3sc3nczzp7djgqmsi6wrkynywlygnfz";
+        sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
+      };
+    };
+    "estraverse-5.2.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz";
+        sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==";
       };
     };
     "esutils-2.0.3" = {
@@ -3520,7 +3655,7 @@ let
       version = "2.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
-        sha512 = "3m321j8gmjllmmi1zyvbz0lsmkkjq26bvfr8niwr5b8saxh6icixmpxixyspjb40l54vpx3r3zvln190i47cx16y5x2lf1qg6liqnwi";
+        sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
       };
     };
     "etag-1.8.1" = {
@@ -3532,22 +3667,22 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
-    "eventemitter3-4.0.0" = {
+    "eventemitter3-4.0.7" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "4.0.0";
+      version = "4.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz";
-        sha512 = "05cdww9h7f3kjfmv478p0rcq2ia3lcrvqmsh155hd6wm895i2jn6j68w0ly09c3gjn8hshfdvnh99qchipbclycnb241y993m2d5sm9";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz";
+        sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==";
       };
     };
-    "events-3.1.0" = {
+    "events-3.2.0" = {
       name = "events";
       packageName = "events";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz";
-        sha512 = "1d21craxji58ccc5l8c39mw7pgk0is7gj1sixm8v1va1zc81hrw8426b9rhrv7z2kwqvix5l7cyfc8awwypj19him6ffd67qbqaxzs6";
+        url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz";
+        sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==";
       };
     };
     "eventsource-1.0.7" = {
@@ -3556,7 +3691,7 @@ let
       version = "1.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz";
-        sha512 = "02zyvvhbzxhb7q9pzn867l80whipj03h4nkzjw1r8kppkmgaw0fcgvnkkv11fkfnlcdhkr9f55xrap5qpvbggkad4y4jkymxgpzbfg0";
+        sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -3565,7 +3700,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
-        sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx";
+        sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
       };
     };
     "exec-sh-0.3.4" = {
@@ -3574,7 +3709,7 @@ let
       version = "0.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz";
-        sha512 = "3a56in0wklcqf6hk0n22z22yg9kzb7y4xj7yfmj2sahbnkjbr5s0sngpzrr60r5rq9b3f0f1m13da5fn9mfz7p3b5nbxgxmrs8lhhdh";
+        sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==";
       };
     };
     "execa-1.0.0" = {
@@ -3583,7 +3718,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
-        sha512 = "0nbazkdhh5zqw7l7y4ml860h6pbn72x5kp2iaknqbdk0ygcrp3yh6bnq0brzzsyk3f72ard3ss3kp9a2ffsglib3yiamqwm4mrz3mk9";
+        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
       };
     };
     "exit-0.1.2" = {
@@ -3619,7 +3754,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz";
-        sha512 = "38r26vw1qwvgj86dijd5hps0b5ijk4qq0zy9dcgc2dpafq6jjx1x4k9lpaqs1mbkg4d9a29qkx914y9waavswvgwvcmv8n8qp3l1xf2";
+        sha512 = "wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==";
       };
     };
     "express-4.17.1" = {
@@ -3628,7 +3763,7 @@ let
       version = "4.17.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz";
-        sha512 = "3i2sxjf2x1r9wbfdyh5ll8ybbnqq6n4xfxdlc4dsqhssljrlih18csqg142lf16lcfcdgsmvf9pff0rzxjw7p0shnlmpajipwxpswlq";
+        sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
       };
     };
     "ext-1.4.0" = {
@@ -3637,7 +3772,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz";
-        sha512 = "3n50kbfjicn887f19ragi6k288srkjidzvcnphnb2f8bqw4vn10y73p3ryjyqq0xgrdxnwhy2j9favm7pfb3j3vhf5dmi8licsbkv19";
+        sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==";
       };
     };
     "extend-3.0.2" = {
@@ -3646,7 +3781,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
-        sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -3673,7 +3808,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
-        sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin";
+        sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
       };
     };
     "extsprintf-1.3.0" = {
@@ -3685,13 +3820,13 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-3.1.1" = {
+    "fast-deep-equal-3.1.3" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
-        sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
+        sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
       };
     };
     "fast-json-stable-stringify-2.1.0" = {
@@ -3700,7 +3835,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
-        sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn";
+        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
     "fast-levenshtein-2.0.6" = {
@@ -3712,22 +3847,13 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "faye-websocket-0.10.0" = {
-      name = "faye-websocket";
-      packageName = "faye-websocket";
-      version = "0.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz";
-        sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
-      };
-    };
     "faye-websocket-0.11.3" = {
       name = "faye-websocket";
       packageName = "faye-websocket";
       version = "0.11.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz";
-        sha512 = "0wgmgai5pj0yjcc4gs5b6r94gr8ycsbv1xyjw055cxfy4vm6yrpqp0mpr89ychmzgr5y0mggqrljf9jhb8n5iq63bi3r9yqidpbhv0g";
+        sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==";
       };
     };
     "fb-watchman-2.0.1" = {
@@ -3736,16 +3862,16 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz";
-        sha512 = "1b67x7n9c1irns63lipsffgi0zm9kfms6k87mznvhak81dijqvfy26nqr3j5mw41mqb3vbbhxbbmcdgc787laz3kaq45slq0wlwjhqf";
+        sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==";
       };
     };
-    "figgy-pudding-3.5.1" = {
+    "figgy-pudding-3.5.2" = {
       name = "figgy-pudding";
       packageName = "figgy-pudding";
-      version = "3.5.1";
+      version = "3.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
-        sha512 = "39n5js2y984px4bvwavskv70pazpjnrvy5lnyqif5pdh6pgfinnl3b5zknfkqvlws7gnylmlwryzfpdvh0jgpgsiphx8a64fhjb3lmw";
+        url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz";
+        sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==";
       };
     };
     "file-uri-to-path-1.0.0" = {
@@ -3754,7 +3880,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
-        sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi";
+        sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
       };
     };
     "filesize-3.6.1" = {
@@ -3763,7 +3889,7 @@ let
       version = "3.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz";
-        sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c";
+        sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==";
       };
     };
     "fill-range-4.0.0" = {
@@ -3775,13 +3901,22 @@ let
         sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
       };
     };
+    "fill-range-7.0.1" = {
+      name = "fill-range";
+      packageName = "fill-range";
+      version = "7.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
+        sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
+      };
+    };
     "finalhandler-1.1.2" = {
       name = "finalhandler";
       packageName = "finalhandler";
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz";
-        sha512 = "1cfqk6g78cb12b1cki4pbcspsy40d0yny513myqji716njyhc5hrj7ll539kz96m6vn27168hhyqvd52cr5x1cs85mm7igfkrdrq1b8";
+        sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
       };
     };
     "find-cache-dir-1.0.0" = {
@@ -3799,7 +3934,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
-        sha512 = "0wjlwmvadzac6hwmxv6hsc16z3285i2y0nkwpg4366flza0rx30s3ncx93xn8hkkpxr493zi5b0h94jczinr87h2m6gbhrl265qzbjf";
+        sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==";
       };
     };
     "find-replace-3.0.0" = {
@@ -3808,7 +3943,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz";
-        sha512 = "04qvcapazb6cj527naq4ycrydqph63gpsq9ly76cvnxy7cm9xwdn2q62rlyvn7iynvm59akggz5jiiygzzbq7wrpwh218124fdzcdp9";
+        sha512 = "6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==";
       };
     };
     "find-up-2.1.0" = {
@@ -3826,7 +3961,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
-        sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p";
+        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
       };
     };
     "findup-sync-3.0.0" = {
@@ -3835,7 +3970,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz";
-        sha512 = "1i4px24rzp6x5wczj63r720lxw2rl1yvsk8w36bcmmdsyji2yx59p1nxy3v0hqjfr5s9vzrxh55v83ly3d0mf5r78hw32awp1mdzdv1";
+        sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==";
       };
     };
     "flush-write-stream-1.1.1" = {
@@ -3844,7 +3979,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz";
-        sha512 = "3pkp1ymgv73zg0d94la628nagxyngq7zm1jmngx6vjc6vi5d4jkmvfygvgac6w6x929hqljwygaidq2znk3l5xd4apdvxvpas21g7nx";
+        sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==";
       };
     };
     "follow-redirects-1.5.10" = {
@@ -3853,7 +3988,16 @@ let
       version = "1.5.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
-        sha512 = "1alfnscb0lnmf1ka8d5jrp48bizkbqrdz616r7q9yv4afqadlli1xmmf7lsvany1kmmnmwpvhbgx70mvcsnjf1ywjnzmkmk53h6apni";
+        sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
+      };
+    };
+    "for-each-0.3.3" = {
+      name = "for-each";
+      packageName = "for-each";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz";
+        sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==";
       };
     };
     "for-in-1.0.2" = {
@@ -3880,7 +4024,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
-        sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn";
+        sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
       };
     };
     "form-data-2.5.1" = {
@@ -3889,7 +4033,7 @@ let
       version = "2.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz";
-        sha512 = "1aa6m5c13kybvcycjdyhr0qbb7097qs7kah89bbhynjs9r5fl6ibbhscpin31nshzhw5nszw5c6x10krrig90afh88la456cgflsvcv";
+        sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==";
       };
     };
     "formidable-1.2.2" = {
@@ -3898,7 +4042,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz";
-        sha512 = "3jm9bdwpbsvpf9f7v9gh2dc01p5pg77g1q6g6jwxyaqykr6q6ljp3gvkbxrxa6wkhlnw52qd130f4nx8f6zwf74h8jgy8rmxsdhpj2p";
+        sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==";
       };
     };
     "forwarded-0.1.2" = {
@@ -3955,13 +4099,22 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.11" = {
+    "fsevents-1.2.13" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.11";
+      version = "1.2.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz";
-        sha512 = "0gh6646md6jag20cv3p6c36gf1k2h417lp8a7pwfdbvnbz9khs69hgs344jf2lk7pfqr8gyh13j56n9qvk2ad7nlq0isym93sbpgv7s";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz";
+        sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==";
+      };
+    };
+    "fsevents-2.3.1" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz";
+        sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==";
       };
     };
     "function-bind-1.1.1" = {
@@ -3970,25 +4123,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
+        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
-    "gensync-1.0.0-beta.1" = {
+    "gensync-1.0.0-beta.2" = {
       name = "gensync";
       packageName = "gensync";
-      version = "1.0.0-beta.1";
+      version = "1.0.0-beta.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
-        sha512 = "1r0jph65fg2w5p612lr79rb1k2xyvr3cymg0cbsk8nrncdm82l4k1k8sflk3q32zahpdjfsfs15rdqcj7wgahrpzw3picmmsgl05hdg";
-      };
-    };
-    "get-caller-file-1.0.3" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
-        sha512 = "3mw8nv3r73b3lp2pzj116p27flkrv1vq6v0ika46w3xqfinm6gxn38glryibvy834mja8ib4j9cjq27qn164z3793c9g88y79asppny";
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
+        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
       };
     };
     "get-caller-file-2.0.5" = {
@@ -3997,7 +4141,16 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz";
-        sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g";
+        sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
+      };
+    };
+    "get-intrinsic-1.0.2" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
+        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
       };
     };
     "get-paths-0.0.7" = {
@@ -4006,7 +4159,7 @@ let
       version = "0.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.7.tgz";
-        sha512 = "2sbm9wgxb9lh20hl3rj1zrpvgq14kxvd16hq6p9drh7z26f6nmy4jp0irbaqk1gjal152shl7kwkwk6gskvla18p0qs8p5mn2vlj1yk";
+        sha512 = "0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA==";
       };
     };
     "get-stream-3.0.0" = {
@@ -4024,7 +4177,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
-        sha512 = "3pwlllj9naaqzlc5axbxz4jqg3v533xd9jz945mjd3zmca3hh3pr1dpwc7416kjszw6igk060v6x2dgwpr7m1rd4djavmvr8bhavihq";
+        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
       };
     };
     "get-value-2.0.6" = {
@@ -4051,7 +4204,7 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
     "glob-parent-3.1.0" = {
@@ -4063,13 +4216,22 @@ let
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
+    "glob-parent-5.1.1" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
+        sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
+      };
+    };
     "global-modules-1.0.0" = {
       name = "global-modules";
       packageName = "global-modules";
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz";
-        sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h";
+        sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==";
       };
     };
     "global-modules-2.0.0" = {
@@ -4078,7 +4240,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz";
-        sha512 = "3q8nyi4i93sc7kfx7mmzmkr3656h7f27f5dkwx0908mz2m4bdih9024qmbss87anjf9d817zbr0mmm2zr9pfli2qw41zxv9j2cdyril";
+        sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==";
       };
     };
     "global-prefix-1.0.2" = {
@@ -4096,7 +4258,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz";
-        sha512 = "1dda0wwyqq1k8qa0cy6ifchm9zfbq0bsrvq68gccp4haqp0hgqs5ax1hrpxkcl9k9j3g1nb0nzi19v8ikcxxc9y6i37a24mjjfah03b";
+        sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==";
       };
     };
     "globals-11.12.0" = {
@@ -4105,7 +4267,7 @@ let
       version = "11.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz";
-        sha512 = "1ab6f0n8yjl3zkl6dwhvxpxh63b4acc7nj7i21z3dx1fz1jv1c3673qpkwiavmcbbf8jlkxapx0x8ybzz5w2yra4ln24lh687y6kq2q";
+        sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
       };
     };
     "globals-9.18.0" = {
@@ -4114,7 +4276,7 @@ let
       version = "9.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab";
+        sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
       };
     };
     "globby-6.1.0" = {
@@ -4141,16 +4303,16 @@ let
       version = "8.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz";
-        sha512 = "05i0zb81f4c0z48y9mjckyajm586ygznh8y8di5g0qrg3vi9hpbw2q3cf548as8zx9b4g1q5zf2cab43yx21wnan1l0qsz19zjhjdda";
+        sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==";
       };
     };
-    "graceful-fs-4.2.3" = {
+    "graceful-fs-4.2.4" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.3";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
-        sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
+        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
       };
     };
     "growly-1.3.0" = {
@@ -4168,16 +4330,16 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz";
-        sha512 = "0y1sp7474a0w8329a3d69dgqdbaj7azkx415kcdrkri95c6gyvpj6c3mp5v0jdwjasq01xw07lr5l551z77ch0nkcszn7m8d7mf5l8l";
+        sha512 = "FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==";
       };
     };
-    "handle-thing-2.0.0" = {
+    "handle-thing-2.0.1" = {
       name = "handle-thing";
       packageName = "handle-thing";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz";
-        sha512 = "28zz3rsr08yf5sib0pnnwyk99023ll7bp73z28r1pb6j722bfdhxmzww91cyh713b3a6bqvfxlglancn95pwdnsb5w8w2sda9xk72vp";
+        url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz";
+        sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==";
       };
     };
     "har-schema-2.0.0" = {
@@ -4189,13 +4351,13 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-5.1.3" = {
+    "har-validator-5.1.5" = {
       name = "har-validator";
       packageName = "har-validator";
-      version = "5.1.3";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
-        sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz";
+        sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==";
       };
     };
     "has-1.0.3" = {
@@ -4204,7 +4366,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
-        sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz";
+        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
       };
     };
     "has-ansi-2.0.0" = {
@@ -4231,7 +4393,7 @@ let
       version = "1.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz";
-        sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx";
+        sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
       };
     };
     "has-symbols-1.0.1" = {
@@ -4240,7 +4402,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
-        sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw";
+        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
       };
     };
     "has-to-string-tag-x-1.4.1" = {
@@ -4249,7 +4411,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz";
-        sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx";
+        sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==";
       };
     };
     "has-value-0.3.1" = {
@@ -4288,13 +4450,13 @@ let
         sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
       };
     };
-    "hash-base-3.0.4" = {
+    "hash-base-3.1.0" = {
       name = "hash-base";
       packageName = "hash-base";
-      version = "3.0.4";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
-        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz";
+        sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==";
       };
     };
     "hash.js-1.1.7" = {
@@ -4303,7 +4465,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz";
-        sha512 = "1f5xc15zpy3b7hssv57xnd92ja5r073zvd2pczvncxmy1jnbjcx716riyr2syvah88qk7328a6fz049mziv2k837093xqxd86r9m8xm";
+        sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==";
       };
     };
     "hmac-drbg-1.0.1" = {
@@ -4330,7 +4492,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz";
-        sha512 = "1qc7ngn9k1w5lcqx2ygqb2x9f03knfbsym25l6qsp6q9qdcxa4fzwwjsh9d9lm5l1569v19rjp7sdnz11087f4b6sv34rav9rcacabr";
+        sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
       };
     };
     "hoopy-0.1.4" = {
@@ -4339,7 +4501,7 @@ let
       version = "0.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz";
-        sha512 = "1yx4ynb45w5hn214j6xm2357i3hcbhyh21d7040ikmi9ywaqsjycbzp390wp1qixpyjnc8aaacwzqyf1cvlfz7c5fs6brxbd7xjq5qx";
+        sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==";
       };
     };
     "hosted-git-info-2.8.8" = {
@@ -4348,7 +4510,7 @@ let
       version = "2.8.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
-        sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z";
+        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
       };
     };
     "hpack.js-2.1.6" = {
@@ -4366,25 +4528,25 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz";
-        sha512 = "1ir4rhs26z0x26nr1bca94rbgyginfyrdza1a550ish1ssv5cf9j94dgl2j47n65yvjsnmhx8m749bljr3qjn7pdndcp7l35375jngg";
+        sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==";
       };
     };
-    "html-entities-1.2.1" = {
+    "html-entities-1.4.0" = {
       name = "html-entities";
       packageName = "html-entities";
-      version = "1.2.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz";
-        sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
+        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz";
+        sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==";
       };
     };
-    "html-escaper-2.0.0" = {
+    "html-escaper-2.0.2" = {
       name = "html-escaper";
       packageName = "html-escaper";
-      version = "2.0.0";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz";
-        sha512 = "0i7fxa00a4a7qdgxkiafdbpwvm5x80fivcnhmwbd8qdyxf18zdxzmriqq48k5a7yr7vn0hhzvvf1nki2105hqn29fznnn0iw42vv2vb";
+        url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz";
+        sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==";
       };
     };
     "http-assert-1.4.1" = {
@@ -4393,7 +4555,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz";
-        sha512 = "21ixj6v0igbmy7zx5g4kpqp9fr495ki1jm8qszg1gbwmwcbji51n4zcpm6ll8a927m626rw4vkdamvsi90azmsnapm2d5lkl6mkpp5d";
+        sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw==";
       };
     };
     "http-cache-semantics-3.8.1" = {
@@ -4402,7 +4564,7 @@ let
       version = "3.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz";
-        sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75";
+        sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
       };
     };
     "http-deceiver-1.2.7" = {
@@ -4429,7 +4591,7 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz";
-        sha512 = "13c4825kzqlxdqfjrlrwh15ira0bjm9m3b8qcrfzaysiky1m3gb6dv6gcjgpnap9mbl0fajqiibzp1w5r8qnyn8glaj4wgzf6vh2i5r";
+        sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
       };
     };
     "http-errors-1.7.3" = {
@@ -4438,25 +4600,34 @@ let
       version = "1.7.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz";
-        sha512 = "1zx0vws4k6lcw8j8pgc2yrwfw56s6n2z4dvhd9lcj9l1ywnl9ssianilmrlzr6ravkqxv0xbdqg4cn0q3l72d8h0achvcdbqp8dfd35";
+        sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==";
       };
     };
-    "http-parser-js-0.4.10" = {
+    "http-errors-1.8.0" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz";
+        sha512 = "4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==";
+      };
+    };
+    "http-parser-js-0.5.3" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.4.10";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz";
-        sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz";
+        sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==";
       };
     };
-    "http-proxy-1.18.0" = {
+    "http-proxy-1.18.1" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.18.0";
+      version = "1.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz";
-        sha512 = "2jhzdgr7gcgj58mf798ak1a638wm4mnp45pk48im1rf03dpw39alpyabd7rqwqgjrilaggnmh6nd3m9pqnyn76q3mw5g7rzjf43d0pk";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz";
+        sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==";
       };
     };
     "http-proxy-middleware-0.19.1" = {
@@ -4465,7 +4636,7 @@ let
       version = "0.19.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz";
-        sha512 = "3fl42r9rpdqm0jrrd2wqws6syv02r8cqgy0j6ddrjvn5p3by8shm0mmbych1g5k9i5agc70x6z2904nrgidkdnlq1pwafqhcf0i6xn8";
+        sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==";
       };
     };
     "http-signature-1.2.0" = {
@@ -4492,16 +4663,16 @@ let
       version = "0.4.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
       };
     };
-    "ieee754-1.1.13" = {
+    "ieee754-1.2.1" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.13";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
-        sha512 = "179jm8fhl2advz4j63klrp57sm99wvyb5jcxwfr9rhi730ybcxkyfqrr0pmwvir12zjzpkwwvjjkjclwrss7lpab7dg2myqc8izpxz2";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz";
+        sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
       };
     };
     "iferr-0.1.5" = {
@@ -4519,7 +4690,7 @@ let
       version = "3.3.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz";
-        sha512 = "2x7za00gs7ipwcq29bslxcdv7j47m28jx14n9ybs5h2icr4024jn5ppmbs6953g2qb3amhs1gg5x0s48ky3mk7ybi36wchsb7kks2ry";
+        sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==";
       };
     };
     "import-local-2.0.0" = {
@@ -4528,7 +4699,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz";
-        sha512 = "04jd526svpmpgya7i580qcb13s9b6bw4s9hng2fsni2gxsz6h8vqxl8gbm5k575yxm5aqhy001rl7p1iy60rsi6371cvynfdpi39avg";
+        sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==";
       };
     };
     "imurmurhash-0.1.4" = {
@@ -4555,7 +4726,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz";
-        sha512 = "3s364ysa3q0sxc852a6rlbx0y8spayvg5csradd7s9vn2fr0ky3xpfhy5kkv6afgji3df7kyiswx296kwfakydii9xygqzxgkwn6a90";
+        sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==";
       };
     };
     "inflation-2.0.0" = {
@@ -4600,16 +4771,16 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.5" = {
+    "ini-1.3.8" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.5";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
+        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
     "internal-ip-4.3.0" = {
@@ -4618,16 +4789,16 @@ let
       version = "4.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz";
-        sha512 = "05c6ydjyg8633b07vn5g168r5lxwvl5k1mjm55brfx35c1z18195bh67f7cfk4bjvyapxfhh8q5i7pv75k353rfp0rcpkgsa2iw2p2b";
+        sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
       };
     };
-    "interpret-1.2.0" = {
+    "interpret-1.4.0" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.2.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz";
-        sha512 = "1pibn9f6dn61lmilqiv8hb4aix4b78xf9sdws3rnl060vvv6l4qrw6gfmncq5n0f0rah2yj1ssfg80chaw9y5aa860wfdcccb4ghgcr";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz";
+        sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==";
       };
     };
     "into-stream-3.1.0" = {
@@ -4645,16 +4816,7 @@ let
       version = "2.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz";
-        sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6";
-      };
-    };
-    "invert-kv-2.0.0" = {
-      name = "invert-kv";
-      packageName = "invert-kv";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
-        sha512 = "0lamd4l8hybnh42bg1nav09fj3h7k31vnvsqbqk3mhbhml32042k8hpixhiapqfssi1jyhnw31mdv9zx0fvxzxqi8igahyh5zznzxf0";
+        sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==";
       };
     };
     "ip-1.1.5" = {
@@ -4681,7 +4843,7 @@ let
       version = "1.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
-        sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh";
+        sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
       };
     };
     "is-absolute-url-3.0.3" = {
@@ -4690,7 +4852,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz";
-        sha512 = "3ssxj0ds0anzx5qcgn5lcawrsv3br0zbi1qcfpi9sslp4iwzb0hr9aqy3y72rf9c0bwb0h5svy7l341j0arlkyvx2yp85pfgqhqv6d2";
+        sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==";
       };
     };
     "is-accessor-descriptor-0.1.6" = {
@@ -4708,7 +4870,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
-        sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v";
+        sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -4729,22 +4891,31 @@ let
         sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
       };
     };
+    "is-binary-path-2.1.0" = {
+      name = "is-binary-path";
+      packageName = "is-binary-path";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
+        sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
+      };
+    };
     "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
-        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
+        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-callable-1.1.5" = {
+    "is-callable-1.2.2" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.5";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
-        sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
+        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
       };
     };
     "is-ci-2.0.0" = {
@@ -4753,7 +4924,16 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz";
-        sha512 = "3inmiidgnyxsaypy9cq2pxcc0n7xcfsy3dlkjhk22y97vwz45b0hg972wj27kc0q5dd7k0zywjl3y5fjsqiq7fvllp1sh19p7p57wk1";
+        sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
+      };
+    };
+    "is-core-module-2.2.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
+        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
       };
     };
     "is-data-descriptor-0.1.4" = {
@@ -4771,7 +4951,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
-        sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d";
+        sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
     "is-date-object-1.0.2" = {
@@ -4780,7 +4960,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai";
+        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -4789,7 +4969,7 @@ let
       version = "0.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz";
-        sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a";
+        sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==";
       };
     };
     "is-descriptor-1.0.2" = {
@@ -4798,7 +4978,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz";
-        sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r";
+        sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
       };
     };
     "is-expression-3.0.0" = {
@@ -4825,7 +5005,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz";
-        sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba";
+        sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==";
       };
     };
     "is-extglob-2.1.1" = {
@@ -4843,16 +5023,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
-        sha512 = "3gj0k3vlpbc7zg5xkl8yjnilqs2dmk3ks67shchrfmnzkj6r4aad994xwfczx99ccjx6cixdqg4sawk2m92lqhh6jmfl17zlnv8rp3i";
-      };
-    };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+        sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
       };
     };
     "is-fullwidth-code-point-2.0.0" = {
@@ -4870,16 +5041,16 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz";
-        sha512 = "14qphsynlkivbpi3hhf3wmcjh8f5s9d2z6nr1h98ijygyj2jql330h1w52a4z33plgjma305w3rn3nf28q4n6j1qfmz2byq4gih2cki";
+        sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==";
       };
     };
-    "is-generator-function-1.0.7" = {
+    "is-generator-function-1.0.8" = {
       name = "is-generator-function";
       packageName = "is-generator-function";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz";
-        sha512 = "2vr3bz9zc2d62mnsg16ppb5h2v5h9yfyjbijysi34b10vsly1fn1g4hmqwi40fng3i9pmbkc7vapr3yl23yxc96b2jgvqcf1h9kk5v1";
+        url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz";
+        sha512 = "2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==";
       };
     };
     "is-glob-3.1.0" = {
@@ -4897,7 +5068,16 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
-        sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4";
+        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+      };
+    };
+    "is-negative-zero-2.0.1" = {
+      name = "is-negative-zero";
+      packageName = "is-negative-zero";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
+        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
       };
     };
     "is-number-3.0.0" = {
@@ -4909,13 +5089,22 @@ let
         sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
       };
     };
-    "is-object-1.0.1" = {
+    "is-number-7.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
+        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
+      };
+    };
+    "is-object-1.0.2" = {
       name = "is-object";
       packageName = "is-object";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz";
-        sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
+        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz";
+        sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==";
       };
     };
     "is-path-cwd-2.2.0" = {
@@ -4924,7 +5113,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz";
-        sha512 = "0aws7clcb9cyvvb4430df9fhfnpg9bl1n07ymzp7jdzia0bvjg25gyd39xp2xhgkgpkqazw8csglblifdql0rpj4kfwg1r26xnkdpn3";
+        sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==";
       };
     };
     "is-path-in-cwd-2.1.0" = {
@@ -4933,7 +5122,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz";
-        sha512 = "12yyg4jlg5mmiy2g0r91hz29v3jh5g2wyhdgs1qrfswx2sp7bfsn5g4632yfxmhrpjcy03bxfj12v93yd6pdykkpsmyz912g1f1rnmc";
+        sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==";
       };
     };
     "is-path-inside-2.1.0" = {
@@ -4942,7 +5131,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz";
-        sha512 = "0b5h3ls9n24ma1wqpfsv7n034ryz86rfn1vkz5g0sih2abi9wrs0vx6w583s6qhcgqa6rx5w5layfz7hlakhxvf07qcnnn36x7s2b62";
+        sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==";
       };
     };
     "is-plain-obj-1.1.0" = {
@@ -4960,25 +5149,25 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
+        sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
       };
     };
-    "is-promise-2.1.0" = {
+    "is-promise-2.2.2" = {
       name = "is-promise";
       packageName = "is-promise";
-      version = "2.1.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
-        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz";
+        sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==";
       };
     };
-    "is-regex-1.0.5" = {
+    "is-regex-1.1.1" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.5";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
-        sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
+        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
       };
     };
     "is-retry-allowed-1.2.0" = {
@@ -4987,7 +5176,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
-        sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5";
+        sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
       };
     };
     "is-stream-1.1.0" = {
@@ -5005,7 +5194,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v";
+        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -5032,7 +5221,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz";
-        sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr";
+        sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==";
       };
     };
     "is-wsl-1.1.0" = {
@@ -5095,7 +5284,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz";
-        sha512 = "3bk7frapznyd2q46p7kbk6w1wby8dfjj14p06j485n3s08nc398ah9d3wlr1q59sj5hv1cycvalkmn1vfzlamkp93d69981ccvny406";
+        sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==";
       };
     };
     "isstream-0.1.2" = {
@@ -5113,7 +5302,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz";
-        sha512 = "2cgkn8swx4450c0m0alr4lb4fvqjyh3v9mg6ivx2sa9vq0hkb7r0yz87srf8263j089kpjmpnsl6d3l5vg7x4f4kk39n20gw6gg79gi";
+        sha512 = "8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==";
       };
     };
     "istanbul-lib-instrument-3.3.0" = {
@@ -5122,7 +5311,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz";
-        sha512 = "1j5bcfrd9sgjpm1mpgxv847jwwcjfpzfkynjcidpf4mwxbn0p6gz622rcrmbliphcbnw0nxipw0d7aw0gva7rym3lci9rz8icvwhyg6";
+        sha512 = "5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==";
       };
     };
     "istanbul-lib-report-2.0.8" = {
@@ -5131,7 +5320,7 @@ let
       version = "2.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz";
-        sha512 = "2qm8v7vck1yv85lkx7n060wdvrr547mfrc83xyr6sl4p4av7r6c5jh6mdbvxiqz2m6d5spj6v8fksa9dc6c5r86hjhqh47pkqdmww3w";
+        sha512 = "fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==";
       };
     };
     "istanbul-lib-source-maps-3.0.6" = {
@@ -5140,7 +5329,7 @@ let
       version = "3.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz";
-        sha512 = "1gm71m2lqpb1p2lrwmf9f9g2maz48s133zvk0zzlblgwnjgnn6dx129cbsx8znklhanwwgck6fwnfpsy5sga5pnwfbpw923rg6cm3j7";
+        sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==";
       };
     };
     "istanbul-reports-2.2.7" = {
@@ -5149,7 +5338,7 @@ let
       version = "2.2.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz";
-        sha512 = "0m8fjnnvxyyd03g22xna4jnypd01jbvdsz5k9jnqlb1v678zikdzidq7p1x4pdlg1dfzfa9g8lzz01srnamalpmrj5qxrb8ppy4bvds";
+        sha512 = "uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==";
       };
     };
     "isurl-1.0.0" = {
@@ -5158,7 +5347,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
-        sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl";
+        sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==";
       };
     };
     "jest-24.9.0" = {
@@ -5167,7 +5356,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz";
-        sha512 = "0dz2j03p5zng926y4l7d5ivp918xscx0rmpavzyh02wy397hc3qr7m8w90zyfizy0gkwcq6xcdw4a3p1rqpqyg8sy0xvvb6aqph3yb2";
+        sha512 = "YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==";
       };
     };
     "jest-changed-files-24.9.0" = {
@@ -5176,7 +5365,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz";
-        sha512 = "2m70h82g3b9fhgyvzvg189inyc1zq20jz8nv763k4zcqg05pswzg92kjwkk26ry257qpk1p7cdg5hivchvmmg5xhh1ms756xnjxd979";
+        sha512 = "6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==";
       };
     };
     "jest-cli-24.9.0" = {
@@ -5185,7 +5374,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz";
-        sha512 = "0d2yrlapfahrl57m7nwz7lw04gvx72f61sq0w8mga9c1ly2jqm1jfb7jx4xjwqy4rshz0xxrj1zcpy5s60m14n7l1b70kxd50mx2lpr";
+        sha512 = "+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==";
       };
     };
     "jest-config-24.9.0" = {
@@ -5194,7 +5383,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz";
-        sha512 = "1yjki6v7vm537dmjkfkdbmb9gqw90j3sz1815j1ckx21rb2pshsdpk7qccjn6hfbcn7zy287wb48ynbz6kq7mpvxplhlqamkd0fs124";
+        sha512 = "RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==";
       };
     };
     "jest-diff-24.9.0" = {
@@ -5203,7 +5392,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz";
-        sha512 = "02sb3bshly5aqlan0hxxw54d15jm33d68zhyl9mr86lwy736g3gdvcs18d3jv9zr82vnnnhcdvi7fc7fd4aglxai8v92x00rx7fpix8";
+        sha512 = "qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==";
       };
     };
     "jest-docblock-24.9.0" = {
@@ -5212,7 +5401,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz";
-        sha512 = "009kyd5sgsjr8fa7ayc30pggfywigyh6a49rwk6fs1lcn5r61iy7ffza0zssbbra98yp64qgjinbmk09m0pp1yyf0sw096cj1vf6l0p";
+        sha512 = "F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==";
       };
     };
     "jest-each-24.9.0" = {
@@ -5221,7 +5410,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz";
-        sha512 = "2i6r417rcfrcfm30qy6ahwx0bgnwmj43d9l43vj1fkzj22dp6aygkx8qb6v09iw43q0y2b8pmfdw1k2gjy2wdnbqdf8wnvgh13v9n1q";
+        sha512 = "ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==";
       };
     };
     "jest-environment-jsdom-24.9.0" = {
@@ -5230,7 +5419,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz";
-        sha512 = "2s9xjipxcg6j92q67l7c9xcc6dy8d5nhjw722j501cxha0fabdp0ld1vzdw9y4hnqbvcy2h6kagjv9vlccbvqxm03p34is1sdblbzv6";
+        sha512 = "Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==";
       };
     };
     "jest-environment-node-24.9.0" = {
@@ -5239,7 +5428,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz";
-        sha512 = "2wbp9q6p3l2n5zd9s9788rpbyy4xgf07fgf1q8vgnndzgk87jiillyhsjliznj924bssn8pwadqaimgsdpa7pg9q4rk5ir7zvcibpp9";
+        sha512 = "6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==";
       };
     };
     "jest-get-type-24.9.0" = {
@@ -5248,7 +5437,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz";
-        sha512 = "3qs6d7i3xgiwb787y3d4ymij99fqgrcn6bg0bz27ic0nr58cw49njbhnrb7jpmkq3823mqs1snx7rvz97zlhac7hh5jwyr560riwjwm";
+        sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==";
       };
     };
     "jest-haste-map-24.9.0" = {
@@ -5257,7 +5446,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz";
-        sha512 = "26w4jc0ic0x8j1vza10vnf1aqahg1wknvq9q40kbsv5i9j5h3krvjb8akjgkkpv9gjh9frq04kyml8gg01d8saliy92vflnrfd4bxci";
+        sha512 = "kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==";
       };
     };
     "jest-jasmine2-24.9.0" = {
@@ -5266,7 +5455,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz";
-        sha512 = "37r7lh1ni9sizsffg7zcymwr8v30jhnz5kxmpq06i4c5d2b62nmpnci0w2kfmx0nq21ndp6829ypajdbgrdpzn57rzalq0s128fzbha";
+        sha512 = "Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==";
       };
     };
     "jest-leak-detector-24.9.0" = {
@@ -5275,7 +5464,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz";
-        sha512 = "2n6cx7niz5q8aryz2gahj0kz5s7vvj4xjn5py635kmmrhr7xa0immgd7h6id9zxccrxz8pn8rlp9maz447xfik1dyq32a927ch0b2dm";
+        sha512 = "tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==";
       };
     };
     "jest-matcher-utils-24.9.0" = {
@@ -5284,7 +5473,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz";
-        sha512 = "0fa7wakjy0cpr8scy7i55r1bp13r42n334abwv6p2zfkxa1dgkv0s00qm31437ixxv0rjah1d86vvjg6nvyn7hc62ifds9fgchzd71r";
+        sha512 = "OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==";
       };
     };
     "jest-message-util-24.9.0" = {
@@ -5293,7 +5482,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz";
-        sha512 = "2bq0saksr0nf5i1vj8lkrgwpb1ssyasmmxj0bwhn6ckf921bx3lapbg7wwzp96aa0qd81pv5n6gi0iz7cpvm4l67x9lhlvp4qbgqa50";
+        sha512 = "oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==";
       };
     };
     "jest-mock-24.9.0" = {
@@ -5302,16 +5491,16 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz";
-        sha512 = "3byaz1py3zmdifhw4743mrj6vq5mkqmkr83ps0w20i3dw2f46sqspx2prn9gyvcqa0i7za0gy6ff0gc28qjrcp4fxqayjlvjlvih4fw";
+        sha512 = "3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==";
       };
     };
-    "jest-pnp-resolver-1.2.1" = {
+    "jest-pnp-resolver-1.2.2" = {
       name = "jest-pnp-resolver";
       packageName = "jest-pnp-resolver";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz";
-        sha512 = "2fsj6wsh0r9hbal035dfnly528jk85b00z1rnikavh6zprlhwspq8rqjlv4ds0qkr2l62frwq803h6awxx3hgzpcbhgrqdrv7d700d6";
+        url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz";
+        sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==";
       };
     };
     "jest-regex-util-24.9.0" = {
@@ -5320,7 +5509,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz";
-        sha512 = "101f428mjhbpli5q63y48lr2j3010x571y5km5mfk2zxx9vrqwnwvprsib89f5nv2lysfr6cin7gxc6ryyqx7yfc8za1idfl1psd46k";
+        sha512 = "05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==";
       };
     };
     "jest-resolve-24.9.0" = {
@@ -5329,7 +5518,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz";
-        sha512 = "0qkydcrqaqslxls0wgkxipas27szpigp62bw03ab640ilj8ym1zfm9x9w0x1ghp14x218dq5jzraf5niwvdybch2lc4z5zma8nxx8jd";
+        sha512 = "TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==";
       };
     };
     "jest-resolve-dependencies-24.9.0" = {
@@ -5338,7 +5527,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz";
-        sha512 = "3xflqrzhsd48ckwqzd4cc5b2qxng8f9946lws7dam37gwd4dxb5spjsswqa624bh36ymv8il4i4gjv9x4ay5whms19qi7an17ldnvhn";
+        sha512 = "Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==";
       };
     };
     "jest-runner-24.9.0" = {
@@ -5347,7 +5536,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz";
-        sha512 = "1d1djjic2c29yjm7lccjh8vpa7imjmr3b4y87v255dvg7cn9p7v78298hzjvl00xkaqn4vrnwd9w6rq8hf9yagvf6hlkzrp491hjjra";
+        sha512 = "KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==";
       };
     };
     "jest-runtime-24.9.0" = {
@@ -5356,7 +5545,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz";
-        sha512 = "2gwrn1nf3fc73wdc0a4gjipld6ahf9iq9k37rdzp5wxish6691xnb4b72j31k2hksr6caijgdgjhgxsbxi36lgmx24zvpl5g616m0zj";
+        sha512 = "8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==";
       };
     };
     "jest-serializer-24.9.0" = {
@@ -5365,7 +5554,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz";
-        sha512 = "1nkvvhcv9qvpdxj7p66qpi46yy4yqvdw6kfdfpq3b00x4i4ypxa1c8m9s7xh672svcibgv3ghwzfh3limg7mjkx53mzffpw7aj245hg";
+        sha512 = "DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==";
       };
     };
     "jest-snapshot-24.9.0" = {
@@ -5374,7 +5563,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz";
-        sha512 = "1xq7ysip1hh99xijwdhk5xmax44mkf7r0ggqdfzdmfnj7h75myfzr39nwi3ljvgwgj7lwkliz9bidivggmgl9fd13qvvcwj66ryp3xq";
+        sha512 = "uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==";
       };
     };
     "jest-util-24.9.0" = {
@@ -5383,7 +5572,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz";
-        sha512 = "0xcvxjx6b045jaki9zg2qjf7j10fv9wmlq2173553l6z11g73id4xgv591r7wdjd81x088fmmv2c53pq60fcjhddiqy562iqm9ikry7";
+        sha512 = "x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==";
       };
     };
     "jest-validate-24.9.0" = {
@@ -5392,7 +5581,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz";
-        sha512 = "12y3aryz98ppjhkz6zs9pix68d6ng43dq40wyvjhdzlf1cyyfs27qk9ra1zir84g2y42smvq7rclxj8sbkzh8ic9am0h2s05vl2vwhw";
+        sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==";
       };
     };
     "jest-watcher-24.9.0" = {
@@ -5401,7 +5590,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz";
-        sha512 = "1kqdbclywg8vhhvh6dhrmzmdfj1ivkwdl639qxam38nxvvv869b7j9shaag8zg7cmc5nlw67yhhc7p1pynv6r491l4pcpcgy8wwpxzv";
+        sha512 = "+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==";
       };
     };
     "jest-worker-24.9.0" = {
@@ -5410,16 +5599,16 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz";
-        sha512 = "1bj47m96z8b7jibrl7ybpmk88l2ic0yzwanlsimc1ca2gz8rhj0zaxaix9baxmyms63lq8dj2yxpafr739k3lhrl83pfjcc2vic8lz7";
+        sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==";
       };
     };
-    "js-beautify-1.10.3" = {
+    "js-beautify-1.13.4" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.10.3";
+      version = "1.13.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.3.tgz";
-        sha512 = "2yvdw134756wahvr97k7b7s5d10h3wf454j0vjmwhgbdsmqidlyccrqvjhlm82vdwc3m0074ad79wp4qwmpclhagi9ksvx80lh3zyf1";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.4.tgz";
+        sha512 = "M5yEWwonlEO3kPcCZ3K3KBSpFRZAEO3FAWC6wtbIGeyg7dusStxvF0WG+HRLBoMZqREXSRSxkkqClDE865x1sg==";
       };
     };
     "js-stringify-1.0.2" = {
@@ -5446,16 +5635,16 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz";
-        sha512 = "0lwyvximqkf1q5w94x2747nj2v035is66vzalrbl3f2gdh9k1m3m29p8zw6r65ps5784x2lxwz8akmv085l4ai358rwbp84axz59lj5";
+        sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
       };
     };
-    "js-yaml-3.13.1" = {
+    "js-yaml-3.14.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.13.1";
+      version = "3.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
-        sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
+        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
       };
     };
     "jsbn-0.1.1" = {
@@ -5473,7 +5662,7 @@ let
       version = "11.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz";
-        sha512 = "27wagw1v4qv7snvz46q94kvwfzs4p86izsab5rm1bjh4dj18k527msjszrcnvb924sbwk4pj0ncvdqn6jzwydcpvlsi721jgbiz3hyb";
+        sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==";
       };
     };
     "jsesc-0.5.0" = {
@@ -5500,7 +5689,7 @@ let
       version = "2.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz";
-        sha512 = "20bfkjw0zjachan7rfv75dn5ky7l12xhyz919mdhh9fjn395ss454ykknjza7fwyx09dj89makcs1xi341dvv4k1cvj94739ifbp2rr";
+        sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
       };
     };
     "json-buffer-3.0.0" = {
@@ -5518,7 +5707,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
-        sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls";
+        sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==";
       };
     };
     "json-schema-0.2.3" = {
@@ -5536,7 +5725,7 @@ let
       version = "0.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
-        sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5";
+        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
       };
     };
     "json-stringify-safe-5.0.1" = {
@@ -5554,7 +5743,7 @@ let
       version = "3.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz";
-        sha512 = "049m3dzsr3mcgk3g8hw79w9lr296zxs0qmmn45ngfzinyxsvqh6k52i49690bfjlhsv16yrs87vh4nh6lfy80xrdh02haicnnczrgvk";
+        sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==";
       };
     };
     "json5-0.5.1" = {
@@ -5572,16 +5761,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz";
-        sha512 = "0xzlb8ipv7y4s06gdr1j09fgp9a8xcjrwy5qq739vgadwzfyslk6xph4f9d8zv7rrc0fg3qn6fpwg3y1mrzf0hbi5qp8yng11cvi938";
+        sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
       };
     };
-    "json5-2.1.1" = {
+    "json5-2.1.3" = {
       name = "json5";
       packageName = "json5";
-      version = "2.1.1";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz";
-        sha512 = "22wbapqjyyia17kracx58ch53wppglmma2r3k2wzfjixnljynv3s7sscdxffl5v70j77j89wvq0ldmpm8xrxdbap3hqs4067mfcgvcp";
+        url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz";
+        sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==";
       };
     };
     "jsonpath-plus-0.19.0" = {
@@ -5590,7 +5779,7 @@ let
       version = "0.19.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-0.19.0.tgz";
-        sha512 = "29bszfdwjp446whcdh9mivbff8xl1v8jyamcwf6bg96mqr0jaghari3nfjqjrq33gv1di54kz17vrlj0bpakv2wwq0bpx6npjr7098r";
+        sha512 = "GSVwsrzW9LsA5lzsqe4CkuZ9wp+kxBb2GwNniaWzI2YFn5Ig42rSW8ZxVpWXaAfakXNrx5pgY5AbQq7kzX29kg==";
       };
     };
     "jsprim-1.4.1" = {
@@ -5617,7 +5806,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz";
-        sha512 = "00x227di73g3xvz8pmdhf4ykssibdigbhqw7kr6a22s8w54r7raw71apsc3r2bwda290y3wzsmay0xi59j27lh6icy295ky6a29r149";
+        sha512 = "iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==";
       };
     };
     "keyv-3.0.0" = {
@@ -5626,7 +5815,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz";
-        sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs";
+        sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==";
       };
     };
     "killable-1.0.1" = {
@@ -5635,7 +5824,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz";
-        sha512 = "272kk46rkfh4wq4mispvvy174y6fj8rlnf1m5z8pszpa2igz586k5f8vzz3q3nckxwvkcyqzf48sndd48krwzr9ag22mhjlm4nasfig";
+        sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==";
       };
     };
     "kind-of-3.2.2" = {
@@ -5662,7 +5851,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz";
-        sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l";
+        sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
       };
     };
     "kind-of-6.0.3" = {
@@ -5671,7 +5860,7 @@ let
       version = "6.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz";
-        sha512 = "23pm3j7jjxhl5igjj2mg91b2w2x6j39axjy2y7b1z0dp9jgnhxl885znwwvglzhnb5ssdc4v5vy04ks7xpwgzllyy1ngdmxbyxbbi3m";
+        sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
       };
     };
     "kleur-3.0.3" = {
@@ -5680,25 +5869,25 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz";
-        sha512 = "3rh87j32f450qslsmms0br15jzkv6b71n08xsms6wv6qfvdxv1b5cridqb7bmkwmvzffx9asikjs4vh328pmifhqn4iylcjafak6ckr";
+        sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==";
       };
     };
-    "koa-2.11.0" = {
+    "koa-2.13.1" = {
       name = "koa";
       packageName = "koa";
-      version = "2.11.0";
+      version = "2.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa/-/koa-2.11.0.tgz";
-        sha512 = "0q4rl38fvrdnml9ix2ka3nav9zd8ilxh6738b27nvx4r05y0lb17pjw7la9nqgq0q401alrkv1cyyliig40r88c1rd3jk2195s7v50j";
+        url = "https://registry.npmjs.org/koa/-/koa-2.13.1.tgz";
+        sha512 = "Lb2Dloc72auj5vK4X4qqL7B5jyDPQaZucc9sR/71byg7ryoD1NCaCm63CShk9ID9quQvDEi1bGR/iGjCG7As3w==";
       };
     };
-    "koa-body-4.1.1" = {
+    "koa-body-4.2.0" = {
       name = "koa-body";
       packageName = "koa-body";
-      version = "4.1.1";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-body/-/koa-body-4.1.1.tgz";
-        sha512 = "1wfnjmilqj9fhv5dhmhpr5vx38ja1x8599nnqwx2977mhz15ig66fpcyk2rim80l8b77ir6g6w3wz71hppb445gf129kapwa0lzzdmc";
+        url = "https://registry.npmjs.org/koa-body/-/koa-body-4.2.0.tgz";
+        sha512 = "wdGu7b9amk4Fnk/ytH8GuWwfs4fsB5iNkY8kZPpgQVb04QZSv85T0M8reb+cJmvLE8cjPYvBzRikD3s6qz8OoA==";
       };
     };
     "koa-compose-3.2.1" = {
@@ -5710,13 +5899,13 @@ let
         sha1 = "a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7";
       };
     };
-    "koa-compose-4.1.0" = {
+    "koa-compose-4.2.0" = {
       name = "koa-compose";
       packageName = "koa-compose";
-      version = "4.1.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz";
-        sha512 = "1grd8vfvlnkpwjj8da79mig7p54842wpxzf2dhkj4dmsjm3yh5afh7kq83pig53xbfg6fbds2iwkypgl7r6naqwblpwdf637bqxdq7h";
+        url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.2.0.tgz";
+        sha512 = "/Io2dpt3uU/wWkn2pkRBj3vudzsi6hMssGkREZCxLIczAIvLWy5Jw9PW7ctTxvcfXKCisbgsMLsgE1BvSZB6Kw==";
       };
     };
     "koa-convert-1.2.0" = {
@@ -5734,16 +5923,16 @@ let
       version = "7.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/koa-router/-/koa-router-7.4.0.tgz";
-        sha512 = "3x0wdvpg0jxpv26fd4vqhw116nw797i4pzxsgpwm17yll74h8gyxg25zjnwihnm36lhxs9bb1p5m7bm0qcym4lm2b0z17c0fw6mls11";
+        sha512 = "IWhaDXeAnfDBEpWS6hkGdZ1ablgr6Q6pGdXCyK38RbzuH4LkUOpPqPw+3f8l8aTDrQmBQ7xJc0bs2yV4dzcO+g==";
       };
     };
-    "koa-send-5.0.0" = {
+    "koa-send-5.0.1" = {
       name = "koa-send";
       packageName = "koa-send";
-      version = "5.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.0.tgz";
-        sha512 = "2fimqkgi0mli0fl0zfcylnbi29939cp2s7q8c60mnqiszbyyp4snkq5v87sfwjv04nkzc48l80jpkp3hdnw24fv6zp9vlpdbssnhipp";
+        url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.1.tgz";
+        sha512 = "tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==";
       };
     };
     "koa-static-5.0.0" = {
@@ -5752,16 +5941,16 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz";
-        sha512 = "1llav1xa767y46f8dhhapgqyyhc4hg7np4d34lbf0r0gg5fa9gi5lypzmn3q346rmym41g4jm0lb0hsnx6z0lpzmn4pc4aqgv49ib2j";
+        sha512 = "UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==";
       };
     };
-    "koa-views-6.2.1" = {
+    "koa-views-6.3.1" = {
       name = "koa-views";
       packageName = "koa-views";
-      version = "6.2.1";
+      version = "6.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-views/-/koa-views-6.2.1.tgz";
-        sha512 = "1xzbplyv8h0gli3blaz4k8s148m29iq39mqk1jpdh6qs14x1y5ayimfscy1rvl1wy0ix6hmd1cd9g8bcsbd8c8d4qdckfhaiz1yskf1";
+        url = "https://registry.npmjs.org/koa-views/-/koa-views-6.3.1.tgz";
+        sha512 = "weIaPs2cCHWT2qK8qHRmwlZ29xRCvUVy1v/z12AGavVV5j4QIU0W/Y7OVBBu1sTkcO9dDJ25ajGYHGZ/aY43IQ==";
       };
     };
     "lazy-cache-1.0.4" = {
@@ -5773,22 +5962,13 @@ let
         sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
       };
     };
-    "lcid-2.0.0" = {
-      name = "lcid";
-      packageName = "lcid";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
-        sha512 = "1wcm03j1xmwayngclsgc7xk3rfsn8d3lcas6yfxszjpjwa37nwiia213cxkagdfc56anijwb679bg42ak1w59d0bkq6j47wqdpw9wva";
-      };
-    };
     "left-pad-1.3.0" = {
       name = "left-pad";
       packageName = "left-pad";
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz";
-        sha512 = "08aih5wmcyaw8f8nxlcf6lhr8synqf7jpvcp0ah2vdkshckvhvw2a8sj2bqkf5dr3fq43rilnq8lj86zhasccqlrb09h0jd6lzlr3jw";
+        sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==";
       };
     };
     "leven-3.1.0" = {
@@ -5797,7 +5977,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz";
-        sha512 = "3acc4jl6xib9wx3gqgq9wqab262mwjyc8d6aa7igfiyfyami7w4g59b62if7hd8w0zh8k1q3kqkwdxgnqsvyygw6wdaak93gzw5mixa";
+        sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==";
       };
     };
     "levn-0.3.0" = {
@@ -5824,16 +6004,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz";
-        sha512 = "13mmy8rws80fp5mw0b7qwq5zvvlwq8v20hykp1npzsc5i5sw426j6sgi77js3lrqzbc8b7gjxhsrf26bi8xnn7ii8q64p2wskrspj96";
-      };
-    };
-    "loader-utils-1.2.3" = {
-      name = "loader-utils";
-      packageName = "loader-utils";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz";
-        sha512 = "1j5jpk2rz5n0365vhmgknl49zq4sav613jn87b6khghcfsj3xvm2y0zil8zai7rr7wx0fvx1w78297fyiic1yydvq34776xx3qp6jky";
+        sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
       };
     };
     "loader-utils-1.4.0" = {
@@ -5842,7 +6013,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
-        sha512 = "1sdj0mw1y0adq9fpaafpv91yz2ijx06s6fpzjfs0db47cry0q2xjcahr5aksf6vlxp7ripisvjz21hjkkdzrwh8pc3zm7vdq141czd8";
+        sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
       };
     };
     "locate-path-2.0.0" = {
@@ -5860,16 +6031,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
-        sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc";
+        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
-    "lodash-4.17.15" = {
+    "lodash-4.17.20" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.15";
+      version = "4.17.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
-        sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
+        sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
       };
     };
     "lodash.camelcase-4.3.0" = {
@@ -5914,16 +6085,16 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz";
-        sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm";
+        sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
       };
     };
-    "loglevel-1.6.7" = {
+    "loglevel-1.7.1" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.6.7";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz";
-        sha512 = "3y57kcbhh98x86dpx7apanxgnkqf5chybr4jnwhzljd3k2n9knm5h7fp9aiv6bzpyvq1xg0qssgg3i47ddiz80h7vahfj6hb8n9x3bi";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz";
+        sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==";
       };
     };
     "loglevelnext-1.0.5" = {
@@ -5932,7 +6103,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz";
-        sha512 = "3l63lnbnnsg2dgy8c89m5fxgdnl56a04hyiabic65zj4p9dsbh4jykr9jblvn8v7c7wx1a12mjv9gq69zfdfif00mw6q9pf8fmggzjp";
+        sha512 = "V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==";
       };
     };
     "long-4.0.0" = {
@@ -5941,7 +6112,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz";
-        sha512 = "0q7w59j4asw2i6n4hwbdrcigmaz042y2hsm31brmjfp3fg465mgqjmia2giil8kxbdh5ijdx00lv4a8n8lbj6srbziqczr22hmgxhsy";
+        sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==";
       };
     };
     "longest-1.0.1" = {
@@ -5959,7 +6130,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz";
-        sha512 = "3fhlaj5f55z0d4f45a5vsyz1r5k40qy6mfbxphjgnz8x4jx4d1g4pz4v2793viw0hk04a1a6zbiqxbjsjzhidp9jmmzhngzd8yb2awp";
+        sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==";
       };
     };
     "lowercase-keys-1.0.0" = {
@@ -5977,7 +6148,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
+        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
       };
     };
     "lru-cache-4.1.5" = {
@@ -5986,7 +6157,7 @@ let
       version = "4.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
-        sha512 = "3k64s8pgffvqc84ar3r2jjvxnrll916m1q6s4m2k8pq2gqvlrzy11hdhvx2662fa4x7h1hcpn9wmy4kk28rgk3sj76w2fpn8dn6armi";
+        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
       };
     };
     "lru-cache-5.1.1" = {
@@ -5995,7 +6166,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
-        sha512 = "3vjhn04mjkxbkfb4fh7xnlghlgmqffqp5i1w2vg1ndgh5izv7nwvr8lq1n1hypfs5pm3bvbk7wf3fjm2pavld1hipz0n8rp012l14ra";
+        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
       };
     };
     "make-dir-1.3.0" = {
@@ -6004,7 +6175,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz";
-        sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv";
+        sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
       };
     };
     "make-dir-2.1.0" = {
@@ -6013,7 +6184,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
-        sha512 = "12asfdw6jlwcqjli9xywj755wznjxadmh7q6abrhldss26wdsik8w39dqww20i3ilr9mjam1r80ickwzlp9w7dz15bvqa1wszwmfbrd";
+        sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
       };
     };
     "make-error-1.3.6" = {
@@ -6022,7 +6193,7 @@ let
       version = "1.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
-        sha512 = "2glh9fqac2bycfy6gmvv1r03pr484iglvv5ry3pjm6iz43h6qnkkw2l4sz9ydyadq6hip4wyjpj9jllbshxchh8k6lg5g5vsya23idk";
+        sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
     "makeerror-1.0.11" = {
@@ -6034,24 +6205,6 @@ let
         sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
       };
     };
-    "mamacro-0.0.3" = {
-      name = "mamacro";
-      packageName = "mamacro";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz";
-        sha512 = "1670fzjdl58zpljl3vblrzfz0805w0d99kdhf9rz4cgr1f2g01ibb5s5b1n7w7dqfv8lyig9zcqw2f0gsjlzxxwj4zc939fwn3k1hd8";
-      };
-    };
-    "map-age-cleaner-0.1.3" = {
-      name = "map-age-cleaner";
-      packageName = "map-age-cleaner";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
-        sha512 = "3gk1kdfw4z4pjghrxyn53gyb40gbk71ycv5mi2mbidwxg76mbfgkxcn88zkcrjw38mq6vn5kcarw4n5zq79ligh5k1s6gr8fgmg373c";
-      };
-    };
     "map-cache-0.2.2" = {
       name = "map-cache";
       packageName = "map-cache";
@@ -6076,7 +6229,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz";
-        sha512 = "29ds70y468n42xivsz4vrgy8rp2x4nxz52z1vkd1k49556gvn74pq998s510g3jgz9972m9yxs6yk1kw752blq97b9w8gaddkwlyay6";
+        sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
       };
     };
     "media-typer-0.3.0" = {
@@ -6088,15 +6241,6 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
-    "mem-4.3.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
-        sha512 = "3znrz98ggx92y1crm2y017k8lriwz4m9y4w451wm0h1jzsq7jgpafymdvgpznvx07l3xw8inznd78zzwyxdzhb0aq8scki9iwdrnzd9";
-      };
-    };
     "memory-fs-0.4.1" = {
       name = "memory-fs";
       packageName = "memory-fs";
@@ -6112,7 +6256,7 @@ let
       version = "0.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz";
-        sha512 = "0cgni6pl3js3s6ylnj3j9sydf6z5sbnpyi42xdh4437rd6c7xgbapzdq84wn8dzxrcf7sva66z7m6mna61sdagfs41078aa9rsjn3cc";
+        sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==";
       };
     };
     "merge-descriptors-1.0.1" = {
@@ -6130,7 +6274,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz";
-        sha512 = "3gyvijjr3va5jwglqgv7sqxm4a6nhzhj32sl68ffjf8axkzi5z25g0nl2r2mvw1kjs3z49wxjdclljkk4whzpqka4vzjg9fwylgzfv9";
+        sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==";
       };
     };
     "methods-1.1.2" = {
@@ -6148,7 +6292,7 @@ let
       version = "3.1.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz";
-        sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i";
+        sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
       };
     };
     "miller-rabin-4.0.1" = {
@@ -6157,7 +6301,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
-        sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp";
+        sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
       };
     };
     "mime-1.6.0" = {
@@ -6166,34 +6310,34 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
-        sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-2.4.4" = {
+    "mime-2.5.0" = {
       name = "mime";
       packageName = "mime";
-      version = "2.4.4";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz";
-        sha512 = "0c4qs0w88nqz2v7441rw9bbsgrsh50cifwmqm2i7c96yz2ncdy35cb5g42zhr6z0wmqqcwq5la04nnf1n4y3zncvgyg8b721hvnc71d";
+        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
+        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
       };
     };
-    "mime-db-1.43.0" = {
+    "mime-db-1.45.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.43.0";
+      version = "1.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
-        sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
+        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
       };
     };
-    "mime-types-2.1.26" = {
+    "mime-types-2.1.28" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.26";
+      version = "2.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
-        sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
+        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -6202,16 +6346,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd";
-      };
-    };
-    "mimic-fn-2.1.0" = {
-      name = "mimic-fn";
-      packageName = "mimic-fn";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
-        sha512 = "1r8csnc32c6rrvy8d5d1g33gba52m1863wdwl7qbancmzn795726im9mrwp20k3d8pl4x4msp7n6wpldvcwkmk5y4cy0h84ka9wx9is";
+        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
       };
     };
     "mimic-response-1.0.1" = {
@@ -6220,7 +6355,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz";
-        sha512 = "32nwz24nh1f2nbpk8i638ff8hsg1ajmc6746abkssjr951z28362k5a92dd1cfr7bd1l9f507cn0pbam04ixfgsaygskv87g6v1r4cg";
+        sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
     "minimalistic-assert-1.0.1" = {
@@ -6229,7 +6364,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
-        sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj";
+        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -6247,16 +6382,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
     "minimist-1.2.5" = {
@@ -6265,7 +6391,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "mississippi-2.0.0" = {
@@ -6274,7 +6400,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz";
-        sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync";
+        sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==";
       };
     };
     "mississippi-3.0.0" = {
@@ -6283,7 +6409,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz";
-        sha512 = "2895y9fw0xa9bmwbbkv3ziz5gnvr2b9k6kgh1b815ppwhgpcnbzsmn3bjvd2c1852hfakgnxw5hbn8kr8ff1pfbnm8x0lk3qm5gb3n7";
+        sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==";
       };
     };
     "mixin-deep-1.3.2" = {
@@ -6292,34 +6418,43 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz";
-        sha512 = "08fzp03g97vcq1dm4qs3kfjbazfs8h2m99bzdhn9caddpi4xr9bw9n9adlrv24qwfdw2jphwfhjszdwnykawd3ysj4ihp76zygh66jr";
+        sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==";
       };
     };
-    "mkdirp-0.5.1" = {
+    "mkdirp-0.5.5" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.1";
+      version = "0.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
       };
     };
-    "moment-2.24.0" = {
+    "mkdirp-1.0.4" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz";
+        sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
+      };
+    };
+    "moment-2.29.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.24.0";
+      version = "2.29.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
-        sha512 = "111s7ki890wwh47hr44ps1q5vsh23jpp56dlgvyzz7hg71np9xkrc7k683qvfs7zyijb9fdcwzvinjcnbz36lhn0hg2hhknm7xxypkd";
+        url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz";
+        sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==";
       };
     };
-    "moment-timezone-0.5.28" = {
+    "moment-timezone-0.5.32" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.28";
+      version = "0.5.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz";
-        sha512 = "0zr752vsxhfbfh884hzz8xbqkvs2l5778qwrkl7gxihdasi2ni80w61hvp858xclvgmcqgl2v8z1pjkffj5cbcihdb8aa1jy1k68cjc";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.32.tgz";
+        sha512 = "Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA==";
       };
     };
     "move-concurrently-1.0.1" = {
@@ -6346,7 +6481,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
-        sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn";
+        sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
       };
     };
     "ms-2.1.2" = {
@@ -6355,7 +6490,16 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+      };
+    };
+    "ms-2.1.3" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
       };
     };
     "multicast-dns-6.2.3" = {
@@ -6364,7 +6508,7 @@ let
       version = "6.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz";
-        sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf";
+        sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==";
       };
     };
     "multicast-dns-service-types-1.1.0" = {
@@ -6382,16 +6526,16 @@ let
       version = "2.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz";
-        sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg";
+        sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
-    "nan-2.14.0" = {
+    "nan-2.14.2" = {
       name = "nan";
       packageName = "nan";
-      version = "2.14.0";
+      version = "2.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
-        sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0";
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz";
+        sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -6400,7 +6544,7 @@ let
       version = "1.2.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz";
-        sha512 = "04al0wvh9hw1p9bblk847c5nbi3lcjz2pg5yzpqdzgllk57firrqinn4yk169iddaagdf9s5l987xh43z87w3hm9h0pqv0i7pcix6ky";
+        sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
     "natural-compare-1.4.0" = {
@@ -6418,16 +6562,16 @@ let
       version = "0.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
-        sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5";
+        sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
       };
     };
-    "neo-async-2.6.1" = {
+    "neo-async-2.6.2" = {
       name = "neo-async";
       packageName = "neo-async";
-      version = "2.6.1";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz";
-        sha512 = "1kvffl97cs76iidch6z424p50m0wdryx6h6b1jdgr71bfg035szlxcdl6dz9jy71aj8msvprdq2ilbs9jisbim3g1b4l2bfy3qsc9lb";
+        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz";
+        sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==";
       };
     };
     "next-tick-1.0.0" = {
@@ -6445,7 +6589,16 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz";
-        sha512 = "0swp764n5mcgqfjbm3hsw9iayqy46490y4lvqyk6www0a02bw130mji8lvsvlr34sc29rai5i4vpwwhh76mzplf6ljrlvwyszjphy6n";
+        sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
+      };
+    };
+    "node-forge-0.10.0" = {
+      name = "node-forge";
+      packageName = "node-forge";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz";
+        sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==";
       };
     };
     "node-forge-0.8.5" = {
@@ -6454,16 +6607,16 @@ let
       version = "0.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz";
-        sha512 = "3nzl12m7r7d345xjm7a1kq3yjdwfa9x892djy3444h7jaav25zmzh0bcg2f24ympwh7qmyihgpx7b2dgpka52nw5k2zw9vydchi0lxw";
+        sha512 = "vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q==";
       };
     };
-    "node-forge-0.9.0" = {
-      name = "node-forge";
-      packageName = "node-forge";
-      version = "0.9.0";
+    "node-gyp-build-4.2.3" = {
+      name = "node-gyp-build";
+      packageName = "node-gyp-build";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz";
-        sha512 = "0lhlm8x38i28zwmjycgdcyzcqlb0x3z8scjx7vm3s4ypj99bfj7pmv18yxjsnz532z7g9li2aa1x54hbv61dmvbvm4yj3z9ml6rl17c";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz";
+        sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==";
       };
     };
     "node-int64-0.4.0" = {
@@ -6475,13 +6628,13 @@ let
         sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
       };
     };
-    "node-jose-1.1.3" = {
+    "node-jose-1.1.4" = {
       name = "node-jose";
       packageName = "node-jose";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-jose/-/node-jose-1.1.3.tgz";
-        sha512 = "3qb1g8mkwn2vfqj84a62sp2dfg52334f3dj7ab240w51qrf2wl2s62qjvjz46jid9r3dmasxs0hp1zbjgnqkbg9kiii8nl6if5mzslj";
+        url = "https://registry.npmjs.org/node-jose/-/node-jose-1.1.4.tgz";
+        sha512 = "L31IFwL3pWWcMHxxidCY51ezqrDXMkvlT/5pLTfNw5sXmmOLJuN6ug7txzF/iuZN55cRpyOmoJrotwBQIoo5Lw==";
       };
     };
     "node-libs-browser-2.2.1" = {
@@ -6490,7 +6643,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz";
-        sha512 = "3jhlmpgvcnjkg1bh3qp6rqp4a4plsih4bcfqkg0by0acj58r2m1x1jlsgw1k114920vlsvwl563lfjh844mpm02ykcs14gxq47xrz47";
+        sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==";
       };
     };
     "node-modules-regexp-1.0.0" = {
@@ -6508,16 +6661,16 @@ let
       version = "5.4.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz";
-        sha512 = "3qq3cn12n130r2k8aldr2fn3afv21m8ichf87yj7nfp251ypmb5kv9vxs70k93g9nr6164l7crvyzmw4j6b3lr8yj5f739qrcch319k";
+        sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==";
       };
     };
-    "nopt-4.0.3" = {
+    "nopt-5.0.0" = {
       name = "nopt";
       packageName = "nopt";
-      version = "4.0.3";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
-        sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha";
+        url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz";
+        sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==";
       };
     };
     "normalize-package-data-2.5.0" = {
@@ -6526,7 +6679,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
-        sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z";
+        sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
       };
     };
     "normalize-path-2.1.1" = {
@@ -6544,7 +6697,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
-        sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9";
+        sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
     "normalize-url-2.0.1" = {
@@ -6553,7 +6706,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz";
-        sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg";
+        sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==";
       };
     };
     "npm-run-path-2.0.2" = {
@@ -6565,22 +6718,13 @@ let
         sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
       };
     };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
-      };
-    };
     "nwsapi-2.2.0" = {
       name = "nwsapi";
       packageName = "nwsapi";
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz";
-        sha512 = "22vnwmwzxgzp9flhivwzrsa2jr754ysi133p4wdqdfgvg1mvhbjh1hv7ahbl7i2m7zv4vs6higga9c1gydywvwsi53y47qqvjsilq47";
+        sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -6589,7 +6733,7 @@ let
       version = "0.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
-        sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x";
+        sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
       };
     };
     "object-assign-4.1.1" = {
@@ -6616,16 +6760,16 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz";
-        sha512 = "06crm6ynp4rxakk4frrb4kjmi758r38fs5h0f6b7giyxhj0dghb6mdx7sbp0nhnk2w8cyb1bli07d9nbm086i34j8yx641qjpzawarr";
+        sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==";
       };
     };
-    "object-inspect-1.7.0" = {
+    "object-inspect-1.9.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.7.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
-        sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
+        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -6634,7 +6778,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
-        sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n";
+        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
       };
     };
     "object-visit-1.0.1" = {
@@ -6646,22 +6790,22 @@ let
         sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
       };
     };
-    "object.assign-4.1.0" = {
+    "object.assign-4.1.2" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.0";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
-        sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
       };
     };
-    "object.getownpropertydescriptors-2.1.0" = {
+    "object.getownpropertydescriptors-2.1.1" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
-        sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz";
+        sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==";
       };
     };
     "object.pick-1.3.0" = {
@@ -6679,7 +6823,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz";
-        sha512 = "0vcjqppr8sr1in2haifxl9q8v6kgn8pddc4ffkjbx5n2fasb3kdrx7mybkfxqdaqfch2hqrwa87rrwllqd5lrmx73md609682xp0z9x";
+        sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==";
       };
     };
     "oidc-token-hash-3.0.2" = {
@@ -6688,7 +6832,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-3.0.2.tgz";
-        sha512 = "127wvn9pnb5jjxqhkr54w07z6s0njlqvrv4k8cnn2vf5y4hpbykcl2cyn8yw8zwqhzv6bqikhza5nkhmv1zm8kgpazddzgj9zryjg3m";
+        sha512 = "dTzp80/y/da+um+i+sOucNqiPpwRL7M/xPwj7pH1TFA2/bqQ+OK2sJahSXbemEoLtPkHcFLyhLhLWZa9yW5+RA==";
       };
     };
     "on-finished-2.3.0" = {
@@ -6706,7 +6850,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz";
-        sha512 = "2n6994y8y4b146a5wpzzgw779yc227cqkmwsifc3fbn2kc9dzypjigqf72bpgsqrk7gs93l6fk4iqdk752jnsnpr89j58sbabw09455";
+        sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==";
       };
     };
     "once-1.4.0" = {
@@ -6736,13 +6880,13 @@ let
         sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4";
       };
     };
-    "opener-1.5.1" = {
+    "opener-1.5.2" = {
       name = "opener";
       packageName = "opener";
-      version = "1.5.1";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz";
-        sha512 = "2yg0r89kjihas5gr319kw75b6bjalmhpy6yfabd8g7vnldsddnnwsdbzb3942c9c9zrbz8pwa17an3rkcb8nwdd8lw72l9njz5i51l2";
+        url = "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz";
+        sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==";
       };
     };
     "openid-client-2.5.0" = {
@@ -6751,7 +6895,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/openid-client/-/openid-client-2.5.0.tgz";
-        sha512 = "339via1h7paxj3qwnzzs6p7x4r3p51k55pc6z85dpzk2gslhp84fnwa4scgcaib9xai7smcc5y7vgb88p20awllvda6v8a4ph7lay5p";
+        sha512 = "t3hFD7xEoW1U25RyBcRFaL19fGGs6hNVTysq9pgmiltH0IVUPzH/bQV9w24pM5Q7MunnGv2/5XjIru6BQcWdxg==";
       };
     };
     "opn-5.5.0" = {
@@ -6760,7 +6904,7 @@ let
       version = "5.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz";
-        sha512 = "2qa90jg1bw4yx1an6vbx2cp7lpk6xwa94yrbr6mkpl2h95wl4iinlmlzzy2z5ihm79d4ypkjkf3w5m7cjl79775amsbav5x021fk89y";
+        sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==";
       };
     };
     "optionator-0.8.3" = {
@@ -6769,7 +6913,7 @@ let
       version = "0.8.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz";
-        sha512 = "1n905a6d9xvmaqhy1xvpk4m7amkpx4wmky0w9764biihzkgachffm975qq5yqy4qjri2pbrrck994dsnz4ipmv4kbb7b4wx02jbv1gq";
+        sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==";
       };
     };
     "ora-3.4.0" = {
@@ -6778,7 +6922,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz";
-        sha512 = "1i331n8qj60jz6f51yfczwaspwsj57sykmgj34cwzhvlp761l2rx1iwqd247xys1749hhddfp6mmzznfp32dxqkjkl5ffsvsfwhgp3q";
+        sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==";
       };
     };
     "original-1.0.2" = {
@@ -6787,7 +6931,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz";
-        sha512 = "038qn5613vi5gjik4pmng7zf2ib4w81hjyzy9dhflj7kw1p1ll09nq63x9rnkyyflkv33lq8bx0fbw1gzlpp4asy24l7adam2bma847";
+        sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==";
       };
     };
     "os-browserify-0.3.0" = {
@@ -6808,15 +6952,6 @@ let
         sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
       };
     };
-    "os-locale-3.1.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz";
-        sha512 = "3frcfnhc4914snsnfqyqrz253i5dd31202gbx4dzkp6bvc8f7wnqhfyc89zp662v016gdqa7wb1z2g6p8nzk6cxzwscwn0qii3pgjb7";
-      };
-    };
     "os-tmpdir-1.0.2" = {
       name = "os-tmpdir";
       packageName = "os-tmpdir";
@@ -6826,22 +6961,13 @@ let
         sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
-    "osenv-0.1.5" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
-      };
-    };
     "p-any-1.1.0" = {
       name = "p-any";
       packageName = "p-any";
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
-        sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i";
+        sha512 = "Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g==";
       };
     };
     "p-cancelable-0.4.1" = {
@@ -6850,16 +6976,7 @@ let
       version = "0.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
-        sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw";
-      };
-    };
-    "p-defer-1.0.0" = {
-      name = "p-defer";
-      packageName = "p-defer";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz";
-        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
+        sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==";
       };
     };
     "p-each-series-1.0.0" = {
@@ -6889,31 +7006,22 @@ let
         sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
       };
     };
-    "p-is-promise-2.1.0" = {
-      name = "p-is-promise";
-      packageName = "p-is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
-        sha512 = "0z3jpi001p4scg2h40kyy7mjvscz8l9mpdp79lhk9b19lyiz140gbwi8963dr5nrysmkrl0hy52v6ikg2wzfsmk8m6ccasgak1b8xb3";
-      };
-    };
     "p-limit-1.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
-        sha512 = "3sh18calqxbww99pxc84hldflmj0i915g8npihlmazw8wjqabihi9475v0ll3fhx44sxn35j014j1k5d2xr73q3mpwkmx09n2q1gxxy";
+        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
       };
     };
-    "p-limit-2.2.2" = {
+    "p-limit-2.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.2";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
-        sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
       };
     };
     "p-locate-2.0.0" = {
@@ -6931,7 +7039,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
-        sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7";
+        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
       };
     };
     "p-map-2.1.0" = {
@@ -6940,7 +7048,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz";
-        sha512 = "0bx813aqd3627xffp035h9nimfd19i0l6may47yd0k7x2bngiyp8z31im58ac1nnxy3gdb3yiilagbyqlb7qwc8wdw06f3wjwmgqxnb";
+        sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==";
       };
     };
     "p-reduce-1.0.0" = {
@@ -6958,7 +7066,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz";
-        sha512 = "3gknqxqyn23vmgcqsvnvspzynkbkfn74f3plq72wj54kcyy5f3mbq3lw8pj2gwpmbkqcv7w0wvk3vv54dlny5j5dgv48khkwviqckjw";
+        sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==";
       };
     };
     "p-some-2.0.1" = {
@@ -6976,7 +7084,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz";
-        sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk";
+        sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
       };
     };
     "p-try-1.0.0" = {
@@ -6994,7 +7102,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
       };
     };
     "pako-1.0.11" = {
@@ -7003,7 +7111,7 @@ let
       version = "1.0.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz";
-        sha512 = "1imm2ygnj1himskq6lblzdh3ngc6p9gkvhrbzivalqf3nwafzfglpmbh8wkaz0rsiaxh67jzxbb16m2ygapfcnfwqg9gkdqzkqc24p2";
+        sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
       };
     };
     "parallel-transform-1.2.0" = {
@@ -7012,16 +7120,16 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz";
-        sha512 = "35gr4098wc5ibbrpckgva8l9v50z6mcii4y3kv6wc1ymz3aj2i444y3m2qm2ngf0k02ylqkg3gn7g6awkqfs56ppljy5wmpifcd4srz";
+        sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==";
       };
     };
-    "parse-asn1-5.1.5" = {
+    "parse-asn1-5.1.6" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.5";
+      version = "5.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
-        sha512 = "16n59f599pq8832a6c5wyxnqdf4vrqrdnclzs6vp9m2z2h9qmxamjk6xcrl1aal758jyba0pvyz1bkf7npm7achfxxa29jwaygihhwf";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz";
+        sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==";
       };
     };
     "parse-json-4.0.0" = {
@@ -7048,7 +7156,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz";
-        sha512 = "0a10cnny1cy9csxrw2736fjbhqp0jqv8hnghr7gz9jrlkclw91f8rzg1173b43b3dbc1qq68g7vy4hq4b45r3bmw5j52kvpwxw7pdjn";
+        sha512 = "VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==";
       };
     };
     "parseurl-1.3.3" = {
@@ -7057,7 +7165,7 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz";
-        sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a";
+        sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==";
       };
     };
     "pascalcase-0.1.1" = {
@@ -7075,7 +7183,7 @@ let
       version = "0.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz";
-        sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5";
+        sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==";
       };
     };
     "path-dirname-1.0.2" = {
@@ -7129,7 +7237,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
-        sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r";
+        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
       };
     };
     "path-to-regexp-0.1.7" = {
@@ -7147,7 +7255,7 @@ let
       version = "1.8.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz";
-        sha512 = "1a1s16c1sx28yq8nh8sqkj9izaypszmxfk27x5hl1wid9611b5viffw9vbwqw6sik20ksgmh18dqndglbvq82dii4jl0aal353ck3cz";
+        sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==";
       };
     };
     "path-type-3.0.0" = {
@@ -7156,16 +7264,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz";
-        sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg";
+        sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==";
       };
     };
-    "pbkdf2-3.0.17" = {
+    "pbkdf2-3.1.1" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.17";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz";
-        sha512 = "2s4nd3yv3kkyywvh5rkrvbr6w2h6a4q786v548w895ralcq9cllqzyxr0jgxf911k3zpmzycimsg3ggww3lkrhd3bk9wribrgjaby2k";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz";
+        sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==";
       };
     };
     "performance-now-2.1.0" = {
@@ -7177,6 +7285,15 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
+    "picomatch-2.2.2" = {
+      name = "picomatch";
+      packageName = "picomatch";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
+        sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
+      };
+    };
     "pify-2.3.0" = {
       name = "pify";
       packageName = "pify";
@@ -7201,7 +7318,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz";
-        sha512 = "3d9a1zsv7ca8ffpp7ffl67vp0ahiq78ix1jl21b4nfklinh2ilwh6c45f93syclab0b49p3cfq8d4agpphrbmf6xgfxgzjv268387xq";
+        sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==";
       };
     };
     "pinkie-2.0.4" = {
@@ -7228,7 +7345,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz";
-        sha512 = "0caxkzsq2j5ypg50bxyjcbyz66cpicl6gay0pzaskr5gwjf6m239v6qmydj5kwr15n1j5mdf8n24q22cnn4rxp7gmk7n8yc6qnnmqss";
+        sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==";
       };
     };
     "pkg-dir-2.0.0" = {
@@ -7246,7 +7363,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz";
-        sha512 = "2znan90js3xrk8a8cvzv7vrjma5dgr9hkk4kpcgciyawbjz404a4rpdj6gngx1dc7f1xzmfm3q0an1rq69qyk2cmawhsy98i40pnkpw";
+        sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==";
       };
     };
     "pn-1.1.0" = {
@@ -7255,16 +7372,16 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz";
-        sha512 = "2fgy9i99qaapk6lrqsf0i396i0hw5prvpn2wwsccs7j9jz8960r59vjz98kjhfiif2pyf4fiizrwpminc29rdhpld2v8m7n18hxm8fs";
+        sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==";
       };
     };
-    "portfinder-1.0.25" = {
+    "portfinder-1.0.28" = {
       name = "portfinder";
       packageName = "portfinder";
-      version = "1.0.25";
+      version = "1.0.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz";
-        sha512 = "0388smj2gw4cwp6pddy75jr5x6sha60s4w055dpxpag7fi9ql9vxrkidnzc1v5h2zp6ra350y8q4n6lqsg0dq12blsm1iavf2f4jjg8";
+        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz";
+        sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==";
       };
     };
     "posix-character-classes-0.1.1" = {
@@ -7300,7 +7417,7 @@ let
       version = "1.19.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz";
-        sha512 = "1xv5n13ms7da26nl80isb703rvq4nwrpqsz4xh8z4bakjh79c631x9pnjrqfhyc77bcjr818yclpxzlq4k9qbh4dr78s87z7g4ficxk";
+        sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==";
       };
     };
     "pretty-2.0.0" = {
@@ -7318,7 +7435,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz";
-        sha512 = "2f2qn4f43m108j6kw127wvywyyci2c5jdrnfb093ql7f626hwz0qh5z4nwllgpzs4gvdc7l5ljxy2xamzk85xsdgv6rls4791jlqink";
+        sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==";
       };
     };
     "private-0.1.8" = {
@@ -7327,7 +7444,7 @@ let
       version = "0.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz";
-        sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n";
+        sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
       };
     };
     "process-0.11.10" = {
@@ -7345,7 +7462,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
+        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
     "promise-7.3.1" = {
@@ -7354,7 +7471,7 @@ let
       version = "7.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
+        sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -7366,13 +7483,13 @@ let
         sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
       };
     };
-    "prompts-2.3.1" = {
+    "prompts-2.4.0" = {
       name = "prompts";
       packageName = "prompts";
-      version = "2.3.1";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz";
-        sha512 = "0sdg37c3assj1gk6ybvyhzvkp891zqq7xqj34gcl41dnqgxyl5skijyf75pz5mhfi7cz8315id6430wnr4231yarpfqdhc21jazd0x8";
+        url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz";
+        sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==";
       };
     };
     "proto-list-1.2.4" = {
@@ -7390,7 +7507,7 @@ let
       version = "2.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
-        sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn";
+        sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
       };
     };
     "prr-1.0.1" = {
@@ -7411,13 +7528,13 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "psl-1.7.0" = {
+    "psl-1.8.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
-        sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4";
+        url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
+        sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
       };
     };
     "public-encrypt-4.0.3" = {
@@ -7426,7 +7543,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz";
-        sha512 = "3qnsvs746b98ifyv12qj1g6hl6fq25vip5mswhvn3gnl7r32fids6mw3jb0gdcqrrl5x9ik475sf0vx6mbhmif49idkwjwrhbr5lnnd";
+        sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==";
       };
     };
     "pug-2.0.4" = {
@@ -7435,7 +7552,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug/-/pug-2.0.4.tgz";
-        sha512 = "2zis5am87x72261l3vnqzms2cybdk6bc8kqa6xdjxd337yayy3c4h3s3zm175iv61h3p2pvzpl40qs7g17vnrwg5wrx5s72bc71l6jy";
+        sha512 = "XhoaDlvi6NIzL49nu094R2NA6P37ijtgMDuWE+ofekDChvfKnzFal60bhSdiy8y2PBO6fmz3oMEIcfpBVRUdvw==";
       };
     };
     "pug-attrs-2.0.4" = {
@@ -7444,7 +7561,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.4.tgz";
-        sha512 = "08vr4ngaa625x9jh03hs5alwzwlbw9wpgsxppr9r1vl28y3f8kyr4xis9li3dxpinrqacz4vnnwqidms56qvw2xf74z0l6ncikpi9jd";
+        sha512 = "TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ==";
       };
     };
     "pug-code-gen-2.0.2" = {
@@ -7453,7 +7570,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.2.tgz";
-        sha512 = "05xmnv15k0jm1wyvk92ih7wlf6w3l17qja8f59gjl101lk1lp5hw34bqb2rzi1l8wlvi1cwnncbhvsaj6biha0q17yiy7y0zxd8a4wi";
+        sha512 = "kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw==";
       };
     };
     "pug-error-1.3.3" = {
@@ -7462,7 +7579,7 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.3.tgz";
-        sha512 = "24id0x6g1wh6gq1b72ibrp653d0knzzlg0aqsfap9m7cqsx49vvn1ma5ghs67q98wbjfig18irgp42gdnkq0jf1b1069nlg8j2dhkd8";
+        sha512 = "qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ==";
       };
     };
     "pug-filters-3.1.1" = {
@@ -7471,7 +7588,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.1.tgz";
-        sha512 = "112912ajq0dfvbibdba458952wpd9cyl0na8fn7p40fyx4i5igki4z0f541aj8nvy679i1rj9m8p1cjmxnd25qww215bjc444vy6mwl";
+        sha512 = "lFfjNyGEyVWC4BwX0WyvkoWLapI5xHSM3xZJFUhx4JM4XyyRdO8Aucc6pCygnqV2uSgJFaJWW3Ft1wCWSoQkQg==";
       };
     };
     "pug-lexer-4.1.0" = {
@@ -7480,7 +7597,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.1.0.tgz";
-        sha512 = "0y1ljrsfpv6jacmhcghkn6s9n46vm0ziwrf55fyqb0g0afwhsx0bbmh5xhq9lz2xg1df3905zfy9bin02xf0mlrjqk6v3kd836757lb";
+        sha512 = "i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA==";
       };
     };
     "pug-linker-3.0.6" = {
@@ -7489,7 +7606,7 @@ let
       version = "3.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.6.tgz";
-        sha512 = "375crip8jzn5kx6lbx19nc12dyxqxc1wq0i3pmbjr8km8kc0p9j1kysysl69djiq0n663yxpqsjdv97in7dbcni02lh6zbdgfw1za3d";
+        sha512 = "bagfuHttfQOpANGy1Y6NJ+0mNb7dD2MswFG2ZKj22s8g0wVsojpRlqveEQHmgXXcfROB2RT6oqbPYr9EN2ZWzg==";
       };
     };
     "pug-load-2.0.12" = {
@@ -7498,7 +7615,7 @@ let
       version = "2.0.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.12.tgz";
-        sha512 = "2rdg2l72v2hwsiyiz0rvqff2vfd07dlxacs1qf3qhxcl861wgl96jrcjp6733nn53cc36bc83qiy8p90i5ypmyg4qh1cpdjkhd61ajj";
+        sha512 = "UqpgGpyyXRYgJs/X60sE6SIf8UBsmcHYKNaOccyVLEuT6OPBIMo6xMPhoJnqtB3Q3BbO4Z3Bjz5qDsUWh4rXsg==";
       };
     };
     "pug-parser-5.0.1" = {
@@ -7507,7 +7624,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.1.tgz";
-        sha512 = "30blpbplbbgh6xfirijjqbbfxkp3f70iz7scbspw6z56pw6g4nrkz9swd9bz1wadaij38mazdhybz212cwwpj637rzrxvilxhmylqcw";
+        sha512 = "nGHqK+w07p5/PsPIyzkTQfzlYfuqoiGjaoqHv1LjOv2ZLXmGX1O+4Vcvps+P4LhxZ3drYSljjq4b+Naid126wA==";
       };
     };
     "pug-runtime-2.0.5" = {
@@ -7516,7 +7633,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.5.tgz";
-        sha512 = "2vnj0qdc3rhxbi060mkcss7mwn6avl864vj16shbf9fwf97a2lblkd9g1g6pivqgxszzvrh3ilcaaqp5sbvdw5ycg88g7vfgwmdgsiz";
+        sha512 = "P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw==";
       };
     };
     "pug-strip-comments-1.0.4" = {
@@ -7525,7 +7642,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.4.tgz";
-        sha512 = "2zpmf1c507g195spdxrm7wsfaxrd3kjifxvkfgj7wlbva0vmfydnh8wjsajqph42qzdhmym1y51la62qyiqhybsqi95ij5q4ksgz64b";
+        sha512 = "i5j/9CS4yFhSxHp5iKPHwigaig/VV9g+FgReLJWWHEHbvKsbqL0oP/K5ubuLco6Wu3Kan5p7u7qk8A4oLLh6vw==";
       };
     };
     "pug-walk-1.1.8" = {
@@ -7534,7 +7651,7 @@ let
       version = "1.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.8.tgz";
-        sha512 = "1a288y26wmpn6f09g6z69xqmqazcvqn36fgrzwjm7wh9ik5pgqn44qvg06ibq2lvp9svz6nly5wni9v35y83plgpgipfbylk4rvgjqq";
+        sha512 = "GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA==";
       };
     };
     "pump-2.0.1" = {
@@ -7543,7 +7660,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz";
-        sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf";
+        sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==";
       };
     };
     "pump-3.0.0" = {
@@ -7552,7 +7669,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
-        sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
+        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
       };
     };
     "pumpify-1.5.1" = {
@@ -7561,7 +7678,7 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz";
-        sha512 = "1sxm2mh7jmxhjqdrpdqrhc61ipk2cjyyyvsn9hmxlxnlpsasyzjdicl98pm63zv30012qhrxl57vdpdnnq2m2hl4w4ybgn7gqimjad0";
+        sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==";
       };
     };
     "punycode-1.3.2" = {
@@ -7588,7 +7705,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx";
+        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
     "qs-6.5.2" = {
@@ -7597,7 +7714,7 @@ let
       version = "6.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
-        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
     "qs-6.7.0" = {
@@ -7606,7 +7723,7 @@ let
       version = "6.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz";
-        sha512 = "34x6fm4dnq8m0kps5ann831k8fvx7jzlrcw8vvri0ki2g2ywdrjr8j5y14bvj9c0fd01ndsyx43y6ji51bfhnxk2gr5fpsks52429sl";
+        sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
     "query-string-5.1.1" = {
@@ -7615,7 +7732,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
-        sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2";
+        sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
       };
     };
     "querystring-0.2.0" = {
@@ -7636,13 +7753,13 @@ let
         sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
       };
     };
-    "querystringify-2.1.1" = {
+    "querystringify-2.2.0" = {
       name = "querystringify";
       packageName = "querystringify";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz";
-        sha512 = "1yd3j6k7rr39qm5zsh0k86znfksfcz9rbj48vv2dbsicnvvgzvw1vwl17vk2jlxszwqjiqsj9hy88r74wsdxf8by7a3wia2hk2cpdy3";
+        url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz";
+        sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==";
       };
     };
     "randombytes-2.1.0" = {
@@ -7651,7 +7768,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
-        sha512 = "2cimbs750ysa2wxsiw9mmc1xqjb8w0c4s22p2mv2n676s8hchvzcl1l5p78jnk62d2jzacpr9zbl9w64kaqnipcbaa25q7ywn47g2dx";
+        sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
       };
     };
     "randomfill-1.0.4" = {
@@ -7660,7 +7777,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz";
-        sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk";
+        sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==";
       };
     };
     "range-parser-1.2.1" = {
@@ -7669,7 +7786,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz";
-        sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y";
+        sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
       };
     };
     "raw-body-2.4.0" = {
@@ -7678,7 +7795,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz";
-        sha512 = "3flyhj96ayiy8is22lwh9sp1yqq9ksym43x22yri2ikzladqqzxj6z657bc0xb5f2wl7qr2ja4byf57c9f7l2d3wqdglxih886zrv70";
+        sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==";
       };
     };
     "raw-body-2.4.1" = {
@@ -7687,16 +7804,25 @@ let
       version = "2.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz";
-        sha512 = "1ngfzkci4v3yg989xbriv2giv775w4z9l34hyzfjhyh5ap8wdvc1sggkmqnkz19hgm5r3xyszrs7sppwslxi05r90sg14m6bql8hsgm";
+        sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==";
       };
     };
-    "react-is-16.13.0" = {
+    "react-is-16.13.1" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.13.0";
+      version = "16.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz";
-        sha512 = "00g57i5q020lc9cdswy1ba9bqds0a5wbpy88abfcbnjf0v54fmv4qcch3ad3336sdkxy4mjq3zaf142agbc0vkryipj14n79cpjslqq";
+        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz";
+        sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==";
+      };
+    };
+    "react-zlib-js-1.0.5" = {
+      name = "react-zlib-js";
+      packageName = "react-zlib-js";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/react-zlib-js/-/react-zlib-js-1.0.5.tgz";
+        sha512 = "TLcPdmqhIl+ylwOwlfm1WUuI7NVvhAv3L74d1AabhjyaAbmLOROTA/Q4EQ/UMCFCOjIkVim9fT3UZOQSFk/mlA==";
       };
     };
     "read-pkg-3.0.0" = {
@@ -7714,7 +7840,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz";
-        sha512 = "28400v5dwid6mc9x40s2mwfbkn22vj0dzx0ix8n2bffjx4p2ivb9b60bh743c74kdp0v391rdmladhgvrjgzihns456n977gr451sz9";
+        sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
       };
     };
     "readable-stream-2.3.7" = {
@@ -7723,7 +7849,7 @@ let
       version = "2.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
     "readable-stream-3.6.0" = {
@@ -7732,7 +7858,7 @@ let
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
-        sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05";
+        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
       };
     };
     "readdirp-2.2.1" = {
@@ -7741,7 +7867,16 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz";
-        sha512 = "2yzl88bp25ig1xnrzqmqiwpfxyqkmdw27h3p90a4a58q0964xcijcx4i948msnlvin9f6hn5hmpxj1s90jzkj8aqxr5d04mmzr3z5fl";
+        sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
+      };
+    };
+    "readdirp-3.5.0" = {
+      name = "readdirp";
+      packageName = "readdirp";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
+        sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
       };
     };
     "realpath-native-1.1.0" = {
@@ -7750,7 +7885,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz";
-        sha512 = "26fzz602hwidkkqwv7nk72xq07nlymik92psrcs5pifzqypr63pgz0sy8dzda0bpzl7abkz4kiy2z4f1w07xx5ch0yqh802lw1hyn62";
+        sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==";
       };
     };
     "rechoir-0.6.2" = {
@@ -7762,13 +7897,13 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "regenerate-1.4.0" = {
+    "regenerate-1.4.2" = {
       name = "regenerate";
       packageName = "regenerate";
-      version = "1.4.0";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz";
-        sha512 = "0m5jil0f2yz4js80jxvwilkhq6im5h6h0pa4disk3fsv9lm23lz8ly5219518j47v4fn0h248s9jf5pqhxhcr6z5cmxvbnna0js6vnl";
+        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz";
+        sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
       };
     };
     "regenerator-runtime-0.11.1" = {
@@ -7777,7 +7912,7 @@ let
       version = "0.11.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
-        sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj";
+        sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
       };
     };
     "regenerator-transform-0.10.1" = {
@@ -7786,7 +7921,7 @@ let
       version = "0.10.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz";
-        sha512 = "3lxj64s9v2jksipiz0pphfy6m12cf7j96w64bqlzjwnasbpqhc5ws5bjzv3x9ld625v1z4f15l30izpv3p6l9w8h1qsvf6vy1pak5rw";
+        sha512 = "PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==";
       };
     };
     "regex-not-1.0.2" = {
@@ -7795,7 +7930,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz";
-        sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917";
+        sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
     "regexpu-core-2.0.0" = {
@@ -7840,7 +7975,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz";
-        sha512 = "3dbpfrs4yh7dd9572m6dc8cxcgqacnvd24xm9licnw1hygqv51a18a84gm04sjssajbm437rq01raggrzmnzk4jnmbnxrnmk78sl4ba";
+        sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==";
       };
     };
     "repeat-string-1.6.1" = {
@@ -7867,25 +8002,25 @@ let
       version = "2.88.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
-        sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj";
+        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "request-promise-core-1.1.3" = {
+    "request-promise-core-1.1.4" = {
       name = "request-promise-core";
       packageName = "request-promise-core";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz";
-        sha512 = "00riv5nw32j70g67b1ll1h599bvdbnkgasnwl1m26pfdgdmgr6zaq500mprx5n77yrnhza27vs3c9icb4z5h6wnwmlha6f81bw3d2s0";
+        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz";
+        sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==";
       };
     };
-    "request-promise-native-1.0.8" = {
+    "request-promise-native-1.0.9" = {
       name = "request-promise-native";
       packageName = "request-promise-native";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz";
-        sha512 = "0qx1n06bjj430fidkma2dr90dmrixiza4ymk561v1xxpd5yp7r36lwirgsdn0nvra7s4xs9gs1xhd6fxvlps6q1wh5xq7m4d8n71akm";
+        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz";
+        sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
       };
     };
     "require-directory-2.1.1" = {
@@ -7897,22 +8032,13 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    };
     "require-main-filename-2.0.0" = {
       name = "require-main-filename";
       packageName = "require-main-filename";
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
-        sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl";
+        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
       };
     };
     "requires-port-1.0.0" = {
@@ -7933,13 +8059,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.15.1" = {
+    "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.15.1";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
-        sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -8011,7 +8137,7 @@ let
       version = "0.1.15";
       src = fetchurl {
         url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz";
-        sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad";
+        sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
       };
     };
     "retry-0.12.0" = {
@@ -8038,7 +8164,7 @@ let
       version = "2.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
-        sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
       };
     };
     "ripemd160-2.0.2" = {
@@ -8047,7 +8173,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
-        sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla";
+        sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
       };
     };
     "rsvp-4.8.5" = {
@@ -8056,7 +8182,7 @@ let
       version = "4.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz";
-        sha512 = "2wdl1qh3bdrji9q0whkrhj7gzryfipskamagkg5dq54phmg5c7ifp8va0b8saxs4xmi6c5mlvkh6gbk6r4nqrld4v8ykx5f0ja0xwwx";
+        sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==";
       };
     };
     "run-queue-1.0.3" = {
@@ -8068,13 +8194,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "rxjs-6.5.4" = {
+    "rxjs-6.6.3" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.5.4";
+      version = "6.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz";
-        sha512 = "3nzzg67sr57cc5n1065xsxjgrwa405bgbgqm9l8w01lnr660cy8zdjk99hm2n0did4kd75nwiz3843mfbrw7bs100n7g8q4r1fi18wx";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz";
+        sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -8083,16 +8209,16 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
-    "safe-buffer-5.2.0" = {
+    "safe-buffer-5.2.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
-        sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
       };
     };
     "safe-regex-1.1.0" = {
@@ -8110,7 +8236,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "sane-4.1.0" = {
@@ -8119,7 +8245,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz";
-        sha512 = "1jdy0h2kdi5d2lnxafnbxnqssf306v0pffvw10jspi9v899n7rxknzs78k7nnrgy1mgyfragq91y4ci7z7xksbp92xw6py80h1g65l6";
+        sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==";
       };
     };
     "sax-1.2.4" = {
@@ -8128,7 +8254,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
       };
     };
     "schema-utils-1.0.0" = {
@@ -8137,7 +8263,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz";
-        sha512 = "3kgnvyq6cxrlx9xwba75z4wp364mf4y4d66d92zwhjdw8nqg5jxzp1bfl6n5srl0aircw32nmry28a4476cpb3ijqzz78hars4wqvlb";
+        sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==";
       };
     };
     "select-hose-2.0.0" = {
@@ -8149,13 +8275,13 @@ let
         sha1 = "625d8658f865af43ec962bfc376a37359a4994ca";
       };
     };
-    "selfsigned-1.10.7" = {
+    "selfsigned-1.10.8" = {
       name = "selfsigned";
       packageName = "selfsigned";
-      version = "1.10.7";
+      version = "1.10.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz";
-        sha512 = "165gijv79k6g333d52fwfnna4z0myalk0cywvf9b6pysjfwlib4cvldycwx6yiiy099v9s0yhgvhq1sn21dqy7r85kq4n6y5h2g1kgh";
+        url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz";
+        sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==";
       };
     };
     "semver-5.7.1" = {
@@ -8164,7 +8290,7 @@ let
       version = "5.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
     "semver-6.3.0" = {
@@ -8173,7 +8299,7 @@ let
       version = "6.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz";
-        sha512 = "17wg4dv63jhss5hwqd135zz67r5c30b7a1xz33kfa7knxr0wfypyb8mj2xmc3l71qkxrz569n89xwp5d77m7adn0sr5wzfjlh2m6zvg";
+        sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
       };
     };
     "send-0.17.1" = {
@@ -8182,7 +8308,7 @@ let
       version = "0.17.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz";
-        sha512 = "016qgvxg1si6vn34p7piyc8mhvmav1zscm294wkcjf221y1l9zk5kwk5z6yn1ixspj12df25bpazb2h3fdclcf59xqc2h4w46r4mi86";
+        sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
       };
     };
     "serialize-javascript-1.9.1" = {
@@ -8191,16 +8317,16 @@ let
       version = "1.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz";
-        sha512 = "3a0kvzr1rq0l6v4l587sv58i0xgajs9863srkhxxlzq3dk5mj8r5sag4yyxfidzsbwcbygbg7wdm2nja97kg5n4y9plxsl9hpkzymni";
+        sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==";
       };
     };
-    "serialize-javascript-2.1.2" = {
+    "serialize-javascript-4.0.0" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
-      version = "2.1.2";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz";
-        sha512 = "26vhlfjji0jk84cvbcpna4h1nfvdwj19g7rjmvz9mzlm277cpgz7xw9q61yrp3x4amas66fxrz0p2rrndv737j4imw4a5ql0614xkxf";
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz";
+        sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==";
       };
     };
     "serve-index-1.9.1" = {
@@ -8218,7 +8344,7 @@ let
       version = "1.14.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz";
-        sha512 = "0551vv6s1vgk5krzdn9cwnybsv6g4cyqpkk1dlkyv1pd8n7m8r7pi12r16bw12dzwl6ghj4qwizjsxc8vl26lv9c61fkq9r059yzji4";
+        sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -8236,7 +8362,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz";
-        sha512 = "15idn47lw67wfq0qfva85xnphqxkzz5apix6gwcnylmqw4ch7bqhq4vzdh53f327agpcg6pdzkbj8m72wm887wd8lqaydw20zbxq497";
+        sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==";
       };
     };
     "setimmediate-1.0.5" = {
@@ -8254,7 +8380,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
-        sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86";
+        sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==";
       };
     };
     "setprototypeof-1.1.1" = {
@@ -8263,7 +8389,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz";
-        sha512 = "01qxzb0a6jrcxa6qh776v04ihqrmcy3qfbp9drfsjhfcsmaqd21mppr3ndj970ixfh6bpm8ai45jyqyzjfjw26pcyd82y6pyrcl1xr6";
+        sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
+      };
+    };
+    "setprototypeof-1.2.0" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz";
+        sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
       };
     };
     "sha.js-2.4.11" = {
@@ -8272,7 +8407,7 @@ let
       version = "2.4.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
-        sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0";
+        sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
     "shebang-command-1.2.0" = {
@@ -8293,13 +8428,13 @@ let
         sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
       };
     };
-    "shelljs-0.8.3" = {
+    "shelljs-0.8.4" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.8.3";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz";
-        sha512 = "3ndzzikwq0c0084xy1s0v9q2msc8wc7qrmi0bi1llshsmlhfz4dn1k9i2r666ls7xmq62idmify0ksc1vq3mrjqcrqbm20na0m03kbx";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz";
+        sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==";
       };
     };
     "shellwords-0.1.1" = {
@@ -8308,7 +8443,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz";
-        sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w";
+        sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
       };
     };
     "sigmund-1.0.1" = {
@@ -8320,13 +8455,13 @@ let
         sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
       };
     };
-    "signal-exit-3.0.2" = {
+    "signal-exit-3.0.3" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
+        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
     "simple-git-1.96.0" = {
@@ -8335,16 +8470,16 @@ let
       version = "1.96.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz";
-        sha512 = "0ywlgw61ydavyi2sw2yvzlha4yaxcasrzzkfkvwhv51qm1pciagcmchampclwjrs40wnn0ydhbh1krn1krsrfr6rjyx46k9j76fw1gs";
+        sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ==";
       };
     };
-    "sisteransi-1.0.4" = {
+    "sisteransi-1.0.5" = {
       name = "sisteransi";
       packageName = "sisteransi";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz";
-        sha512 = "25g5in0cfm4qpjw7rw3pnqyln8svln98bh34hiwmmk51wkfyb93sg52x9xc2nahx1lhvg4np6v5dq8vbsm2k7v4pii9y9qdrsh0rsgx";
+        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz";
+        sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==";
       };
     };
     "slash-1.0.0" = {
@@ -8362,7 +8497,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz";
-        sha512 = "3sbrc1b1qf9m7lhlljmnc51k9bl7jbc9zfmdc4z55iafsck65d9ll77bifknvgvgbc0f0a7cvm1b785ab5d1avm27lm7kvnd3fs30k5";
+        sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==";
       };
     };
     "snapdragon-0.8.2" = {
@@ -8371,7 +8506,7 @@ let
       version = "0.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
-        sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n";
+        sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==";
       };
     };
     "snapdragon-node-2.1.1" = {
@@ -8380,7 +8515,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
-        sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv";
+        sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==";
       };
     };
     "snapdragon-util-3.0.1" = {
@@ -8389,25 +8524,25 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
-        sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr";
+        sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
       };
     };
-    "sockjs-0.3.19" = {
+    "sockjs-0.3.21" = {
       name = "sockjs";
       packageName = "sockjs";
-      version = "0.3.19";
+      version = "0.3.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz";
-        sha512 = "0pn77r3rgi2blxla6ilhf4madx8n0cprzb295mw5knx2hyhiwn60z8n8n8clsb1l0wddcrjj5x4rn24ydf2wnxbrn63xwb5lsa293sp";
+        url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz";
+        sha512 = "DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==";
       };
     };
-    "sockjs-client-1.4.0" = {
+    "sockjs-client-1.5.0" = {
       name = "sockjs-client";
       packageName = "sockjs-client";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz";
-        sha512 = "3pa683q7x6az2iwmd2bh0d2zwdkgklkfi4vpkwnxw4b49mgfdjkal83i9lzxlz6f6sqybyvb0mlyw0mmg9mdd76fawvi7izxz48ndp7";
+        url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz";
+        sha512 = "8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==";
       };
     };
     "sort-keys-2.0.0" = {
@@ -8425,7 +8560,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz";
-        sha512 = "0izwdwncwz4s14qn5ahkb2mpcdpxq2arn5185dlhljns4nylsw2xfm425zi115ik4kz1vfa97qyix3vf3i149dyi1ndq61iaf0knx5a";
+        sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==";
       };
     };
     "source-map-0.5.7" = {
@@ -8443,7 +8578,7 @@ let
       version = "0.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
-        sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
       };
     };
     "source-map-resolve-0.5.3" = {
@@ -8452,7 +8587,7 @@ let
       version = "0.5.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
-        sha512 = "2gq1flmkac2lzw8rs6vpch0sanmv8r9gv6bggwkgxzj3n7gw33lbqzk7nk9vvsckdjjkm132jzbl3nxc69cf9bb7xz4wnhpgd3gxp0y";
+        sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==";
       };
     };
     "source-map-support-0.4.18" = {
@@ -8461,16 +8596,16 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz";
-        sha512 = "1n37icn5xpsxs2x8szv6ifajjf066fskm04xn6agr79sid57n0yws4n0cis7m9q5hr0hxzr8dv2fnmmpgb4mvz8kiyv2g5ikbyb9g5n";
+        sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
       };
     };
-    "source-map-support-0.5.16" = {
+    "source-map-support-0.5.19" = {
       name = "source-map-support";
       packageName = "source-map-support";
-      version = "0.5.16";
+      version = "0.5.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz";
-        sha512 = "1ayqxcigra517ylxbrvri7jlw55cv0m6a8j9j6060c5xsh519ip69jjp4jk6bqcj5ra5y318k6la6lfhpsj0k8hhkyw1szbj128pz3r";
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz";
+        sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==";
       };
     };
     "source-map-url-0.4.0" = {
@@ -8482,49 +8617,49 @@ let
         sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
       };
     };
-    "spdx-correct-3.1.0" = {
+    "spdx-correct-3.1.1" = {
       name = "spdx-correct";
       packageName = "spdx-correct";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
-        sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn";
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz";
+        sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==";
       };
     };
-    "spdx-exceptions-2.2.0" = {
+    "spdx-exceptions-2.3.0" = {
       name = "spdx-exceptions";
       packageName = "spdx-exceptions";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
-        sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r";
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
+        sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
       };
     };
-    "spdx-expression-parse-3.0.0" = {
+    "spdx-expression-parse-3.0.1" = {
       name = "spdx-expression-parse";
       packageName = "spdx-expression-parse";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
-        sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2";
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
+        sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.5" = {
+    "spdx-license-ids-3.0.7" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.5";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
+        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
       };
     };
-    "spdy-4.0.1" = {
+    "spdy-4.0.2" = {
       name = "spdy";
       packageName = "spdy";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz";
-        sha512 = "2h245q80im9phjaghcl16kb4sv4n7igk0ch8dsqkq32dsfhcqysjx19blvd45whyaqh9r6309wc6pf6885apd1bcnn0yc2xy3f55rhx";
+        url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz";
+        sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==";
       };
     };
     "spdy-transport-3.0.0" = {
@@ -8533,7 +8668,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz";
-        sha512 = "1rha3zyhardm434kr4h4y44wxpd49hqzzxqk1d9lqg91bkzfbp6qkh9nahdkkmpgbkc5021x8c8cy1aqnaph5ib1a9hx32j9qadbhl6";
+        sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==";
       };
     };
     "split-string-3.1.0" = {
@@ -8542,7 +8677,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz";
-        sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp";
+        sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -8560,7 +8695,7 @@ let
       version = "1.16.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
-        sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x";
+        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
     "ssri-5.3.0" = {
@@ -8569,7 +8704,7 @@ let
       version = "5.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz";
-        sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x";
+        sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==";
       };
     };
     "ssri-6.0.1" = {
@@ -8578,16 +8713,16 @@ let
       version = "6.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz";
-        sha512 = "107yg08ib4232ppannc6fw8ml8p1fssnvcf88cpq3s5ybq3r5ppxnmc32rp40i0ppbgxcw9q04d5rc90if0q3xyp953swad93biws6x";
+        sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==";
       };
     };
-    "stack-utils-1.0.2" = {
+    "stack-utils-1.0.4" = {
       name = "stack-utils";
       packageName = "stack-utils";
-      version = "1.0.2";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz";
-        sha512 = "300alvgq7a9y0fyilyifhirpj9k0qvs6lx7g8msrs6lilcs8wjgl3jzckcs3mvp5v6bi2g7q6k1ml18zpgqvr5cf5wdylxrw4qzwd9i";
+        url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.4.tgz";
+        sha512 = "IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==";
       };
     };
     "static-extend-0.1.2" = {
@@ -8623,7 +8758,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz";
-        sha512 = "2mfvadpwj9mzxps4arl1frxlkz96hfp0sc5pvq76s0ijf8fgw26mm3a721zq3iz1f8155w3a41wkixbdlwn1cavv0mzics796da2zlx";
+        sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==";
       };
     };
     "stream-each-1.2.3" = {
@@ -8632,7 +8767,7 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz";
-        sha512 = "0pxki70s41jg18b738qvcwxlcakp6658ksicxkcgg8wp9q97fwp3mv13c5k38k47vxkyyk951k7gzavs3r7b93ackdyznh8zzch4lxy";
+        sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==";
       };
     };
     "stream-http-2.8.3" = {
@@ -8641,7 +8776,7 @@ let
       version = "2.8.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz";
-        sha512 = "19y2xbs1xzzpjwfdczl21d0d76ahd7013cr3mhfa6a8nbwwv9jpncng8idf0g8hnmnq2mcl3xh912rjlasl06wsz44qw3j7hdya8d7r";
+        sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
       };
     };
     "stream-shift-1.0.1" = {
@@ -8650,7 +8785,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz";
-        sha512 = "1ai59bc5x8d6a1c37fp2d2gi6q7x6fhza2jsf1sblrdvbza8j14a4xnp20lg65b8lzm0s95m3pqizblbj6ks44qf73gdllhbahaqa02";
+        sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==";
       };
     };
     "strict-uri-encode-1.1.0" = {
@@ -8671,49 +8806,31 @@ let
         sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
       };
     };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
-      };
-    };
-    "string-width-2.1.1" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
-      };
-    };
     "string-width-3.1.0" = {
       name = "string-width";
       packageName = "string-width";
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
-        sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx";
+        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
-    "string.prototype.trimleft-2.1.1" = {
-      name = "string.prototype.trimleft";
-      packageName = "string.prototype.trimleft";
-      version = "2.1.1";
+    "string.prototype.trimend-1.0.3" = {
+      name = "string.prototype.trimend";
+      packageName = "string.prototype.trimend";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
-        sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
       };
     };
-    "string.prototype.trimright-2.1.1" = {
-      name = "string.prototype.trimright";
-      packageName = "string.prototype.trimright";
-      version = "2.1.1";
+    "string.prototype.trimstart-1.0.3" = {
+      name = "string.prototype.trimstart";
+      packageName = "string.prototype.trimstart";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
-        sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
       };
     };
     "string_decoder-1.1.1" = {
@@ -8722,7 +8839,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
     "strip-ansi-3.0.1" = {
@@ -8749,7 +8866,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
-        sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f";
+        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
       };
     };
     "strip-bom-3.0.0" = {
@@ -8785,7 +8902,7 @@ let
       version = "5.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
-        sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2";
+        sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
       };
     };
     "supports-color-6.1.0" = {
@@ -8794,7 +8911,7 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz";
-        sha512 = "30pwyjmww4d54bf2m6lpw20ly4blhb88sy3gn6qcjih2rfq1s5zsl1nszzwgj2j1gqn3c8mw52df0z26rqyk8flzimb70scdmz67vd9";
+        sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==";
       };
     };
     "symbol-tree-3.2.4" = {
@@ -8803,7 +8920,7 @@ let
       version = "3.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz";
-        sha512 = "17zjr1mhbpxi4zhrmghix8hw1pi9svlwzjxz51mj2hxx9qpjwn1z9rlyrmdn55hbdiqnl8m9gkci2294swkkwp3rxpy05q3mkj680zm";
+        sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==";
       };
     };
     "tapable-1.1.3" = {
@@ -8812,25 +8929,25 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz";
-        sha512 = "283f6rp3hhj0lvi5smcvh4mq56mifjchgv6qlnr4qb1xs2fsyb2vy71b308h1285nngcz8q7cbmjp8qqzh0im71mx5wr3v6hrnvyqp1";
+        sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
       };
     };
-    "terser-4.6.6" = {
+    "terser-4.8.0" = {
       name = "terser";
       packageName = "terser";
-      version = "4.6.6";
+      version = "4.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz";
-        sha512 = "3b8jz65d3105j7jw1b5jv6ww4z89nr3zjvwzsv7sk6n6sn469bnwxf1x04n7cixyz2xrnlz24yx8sw30wmzzas4434dick6wg4hymp2";
+        url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz";
+        sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
       };
     };
-    "terser-webpack-plugin-1.4.3" = {
+    "terser-webpack-plugin-1.4.5" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
-      version = "1.4.3";
+      version = "1.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz";
-        sha512 = "2n44cgqgz070skn207m3l6zg3q444p1db54g0j87fcjxwyhmlfvgg3kak5v1ffhg765cdxah1l99kjdcy74mc75nlq7907zbiq5xk20";
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz";
+        sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==";
       };
     };
     "test-exclude-5.2.3" = {
@@ -8839,16 +8956,16 @@ let
       version = "5.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz";
-        sha512 = "3dgwbvh6yz24lh2kbdigw3j3kpxmmvlrqdhlc4innvrmyj0wvhs5ayckl00161sdx6a2pik344ggs49w9z1h6nh1v2fs542qyv33sik";
+        sha512 = "M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==";
       };
     };
-    "thenify-3.3.0" = {
+    "thenify-3.3.1" = {
       name = "thenify";
       packageName = "thenify";
-      version = "3.3.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz";
-        sha1 = "e69e38a1babe969b0108207978b9f62b88604839";
+        url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz";
+        sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==";
       };
     };
     "thenify-all-1.6.0" = {
@@ -8875,7 +8992,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz";
-        sha512 = "14xi6lbly1f37015ny2pzcnf5kaksjmpnhm61gfhwn686w5ac519qb1icxdda974n84f342g0y15kysj1hci2vl40z91aiivyhx2spy";
+        sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
       };
     };
     "thunky-1.1.0" = {
@@ -8884,7 +9001,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz";
-        sha512 = "2n8ys98dmv1625inb52cdr421ry82ri2sninmss1njzy9hxrlblw3fkvgr3na4d69glygww3g80bj4pgr9ik1zcm10ki0gd2yf3nxkq";
+        sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==";
       };
     };
     "timed-out-4.0.1" = {
@@ -8896,13 +9013,13 @@ let
         sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
-    "timers-browserify-2.0.11" = {
+    "timers-browserify-2.0.12" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.11";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz";
-        sha512 = "0lrwqck7qvpvxswx5kmydj9nmn2rwckzzfpdf5mf869fqrs9girj45i80hdv99b81m4g8fgwqx2lqk04k7zars7rldq3r89r3m9aipb";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz";
+        sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==";
       };
     };
     "tmpl-1.0.4" = {
@@ -8956,7 +9073,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz";
-        sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm";
+        sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==";
       };
     };
     "to-regex-range-2.1.1" = {
@@ -8968,13 +9085,22 @@ let
         sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
       };
     };
+    "to-regex-range-5.0.1" = {
+      name = "to-regex-range";
+      packageName = "to-regex-range";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
+        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
+      };
+    };
     "toidentifier-1.0.0" = {
       name = "toidentifier";
       packageName = "toidentifier";
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz";
-        sha512 = "1bip1yxcfy4c0yl2kwmj9jyzfg1ixyj564wd1aaf46rabdiasx62yznb8bwn9cki886f353axgca42zma7q9rb4b50lhm1zz7y8g8y9";
+        sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
       };
     };
     "token-stream-0.0.1" = {
@@ -8992,7 +9118,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
-        sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
     "tr46-1.0.1" = {
@@ -9019,7 +9145,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz";
-        sha512 = "0092ym5f8nqn9kwk6wczdd9g9cmyakl54rqrmrmhj1ncm4c5p8iy2sjxkxybnqp4y4bxsabar5kalggrz787665r6lnb49zpz4xlz3k";
+        sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==";
       };
     };
     "ts-jest-24.3.0" = {
@@ -9028,16 +9154,16 @@ let
       version = "24.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz";
-        sha512 = "1arvrclb8plyklschblbipqilv7gih7yh7my5flmpa6y50x0908x7viisbb5wj93v4r2d12xcbi9rm2n0jwljcraliqhi4hzw5pigqx";
+        sha512 = "Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ==";
       };
     };
-    "tslib-1.11.1" = {
+    "tslib-1.14.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.11.1";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
-        sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
+        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
     "tsscmp-1.0.6" = {
@@ -9046,7 +9172,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz";
-        sha512 = "104f0vccp42fba9r2ij7ww4r7mazkmvqgj8is4ipg0jfx190n967qq5b1g0n77kcmm4d2m3l3q3cmh5kqgdmv886514akn38c16s61g";
+        sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==";
       };
     };
     "tty-browserify-0.0.0" = {
@@ -9082,16 +9208,16 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
-        sha512 = "1z2f06mzr855vwxwr0wkndnkn3fnjcwisd3iajkh6dmzz0dn1a5amq7m798j1ass4kiymz4gn3q0c573l21377dkq1ap2i703jfv6gv";
+        sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
       };
     };
-    "type-2.0.0" = {
+    "type-2.1.0" = {
       name = "type";
       packageName = "type";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-2.0.0.tgz";
-        sha512 = "2iyk1bl159vr7i0r24jawi0lwrgns8xvsw72962lvzw6qshm5blls6p7spkpcqpgwb0p7liwdix0ph0j22dip1rg812xbw723rpj6r8";
+        url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz";
+        sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==";
       };
     };
     "type-check-0.3.2" = {
@@ -9109,7 +9235,7 @@ let
       version = "1.6.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz";
-        sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f";
+        sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
     "typedarray-0.0.6" = {
@@ -9127,16 +9253,16 @@ let
       version = "3.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz";
-        sha512 = "3cvrfgjsyvnh9fdyixjzx9mwkfcjfyhgsjizzxzmrsvb1pwch0y58crjh7p6b0ml9nl7jr55nx5dyslq3jn15qz555fl3a4qdfbrnyd";
+        sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typescript-3.8.3" = {
+    "typescript-3.9.7" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.8.3";
+      version = "3.9.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
-        sha512 = "3rwcbg3l3w3l2zr5y9lszqs30s29jzvh1w594rbdljyr582yi6vajzs2fg04s9p79klh3iv0980b91mbr94sl77h9nb7b2mgrz4929i";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz";
+        sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==";
       };
     };
     "typical-4.0.0" = {
@@ -9145,7 +9271,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz";
-        sha512 = "13n01mbvkc5ikjpc69q3ixakq46pp2nbagrwz2a40ff7as9sandwzp51nhh6hy42l9yxq2pjv2y1whds49yq7akh9c3211vyhigh0al";
+        sha512 = "VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==";
       };
     };
     "uglify-js-2.8.29" = {
@@ -9166,13 +9292,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "underscore-1.9.2" = {
+    "underscore-1.12.0" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.9.2";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
-        sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
+        sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
       };
     };
     "union-value-1.0.1" = {
@@ -9181,7 +9307,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz";
-        sha512 = "1g7i0bs3sa35zpsrr2l3wsz4j6bqpxgm77kg2fdz89irzw6nrk6j93j61wr134mg9rbf039xa4pp1dw0iqfsv15rkf8jn8y2fdxg5xl";
+        sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==";
       };
     };
     "unique-filename-1.1.1" = {
@@ -9190,7 +9316,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz";
-        sha512 = "0sp2fs9gsv3l6mc9kdk09z835d54gw04x02dlz9q208mda3f6bmqd4vix4634kv9njvvxcz3iswcj6fwcmszvima7wpv5knia678sjn";
+        sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==";
       };
     };
     "unique-slug-2.0.2" = {
@@ -9199,7 +9325,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz";
-        sha512 = "3dz3f3rqwqssr86c072j9m8m7l98l20b3i75diqrq5l871d647jmdf7pjjml7l83iqvjnb2frz7h6xbs8rpx3rkvk1h5i6swvsap1ff";
+        sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==";
       };
     };
     "unpipe-1.0.0" = {
@@ -9226,25 +9352,25 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz";
-        sha512 = "230pbhzxv0jr9n43qhghbsdbsp1rwalc3rclaqscwjaazi35s6vzw9p66s3ypk6yn3jgpmqflda2yh8j2rlypz9vihasfw5m6jhd739";
+        sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
       };
     };
-    "uri-js-4.2.2" = {
+    "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.2.2";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
-        sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
+        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     };
-    "urijs-1.19.2" = {
+    "urijs-1.19.5" = {
       name = "urijs";
       packageName = "urijs";
-      version = "1.19.2";
+      version = "1.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz";
-        sha512 = "3mmrbgqk7ihxy43py896gl9cv3q8bapnwfg5vcsd82b5mlkd3qa4i7vfdihpk5c2jxkhz5anm8qxxm31fahfi3xxkcr7q59ssmhixdk";
+        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.5.tgz";
+        sha512 = "48z9VGWwdCV5KfizHsE05DWS5fhK6gFlx5MjO7xu0Krc5FGPWzjlXEVV0nPMrdVuP7xmMHiPZ2HoYZwKOFTZOg==";
       };
     };
     "urix-0.1.0" = {
@@ -9271,7 +9397,7 @@ let
       version = "1.4.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz";
-        sha512 = "2bdb8rqxq8xd530jx6q8awb1y9idrvd8cfznrlyc1h8j4ra1icxcssfg7qldhssj6dxvibkvx6rnn1ljkjbxi95l58dn1y35ibrlyvp";
+        sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==";
       };
     };
     "url-parse-lax-3.0.0" = {
@@ -9298,7 +9424,16 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz";
-        sha512 = "2hzzynss1cv7kn1lf40hqk16qmbf38g7a28m27pcg05mg6vpf7sj0gy175fdscz534fxdi14622rmq3sdpib9c5ypjympjfg5ai40bk";
+        sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==";
+      };
+    };
+    "utf-8-validate-5.0.4" = {
+      name = "utf-8-validate";
+      packageName = "utf-8-validate";
+      version = "5.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.4.tgz";
+        sha512 = "MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q==";
       };
     };
     "util-0.10.3" = {
@@ -9316,7 +9451,7 @@ let
       version = "0.11.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz";
-        sha512 = "0fpzl6qczbzr5jniy99vgfxz1k4gdfl13lwwhlfysj22rm18ikfici89wpgv34v67ckays1d500fgk2dlzw95zncn9jvkdygjr40a0x";
+        sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -9328,13 +9463,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "util.promisify-1.0.1" = {
+    "util.promisify-1.1.1" = {
       name = "util.promisify";
       packageName = "util.promisify";
-      version = "1.0.1";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz";
-        sha512 = "2n8sxd1qdzc7pn348ayx8jm13kvi9wyjkshzwy1fam3aiy8phv8lbikbli433qvnq3ndnqj8yhcf9dgavm2xv6cvzk7cyy7zl5nkll3";
+        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz";
+        sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==";
       };
     };
     "utils-merge-1.0.1" = {
@@ -9352,16 +9487,16 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
-        sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
-    "v8-compile-cache-2.0.3" = {
+    "v8-compile-cache-2.2.0" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
-      version = "2.0.3";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz";
-        sha512 = "3givf3csckgfmf3aahy2cdnn1wanqnyjhxq52s8mi349v658g9izi20prr2y5m8gxrv69idkvvwp5njwqds49kbyhmkq1hc0iprvn88";
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+        sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==";
       };
     };
     "validate-npm-package-license-3.0.4" = {
@@ -9370,7 +9505,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
-        sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf";
+        sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
       };
     };
     "vary-1.1.2" = {
@@ -9397,7 +9532,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
-        sha512 = "00japcjqx1df1bgck837ds0xvg5dr7g4j30a38zhbmanqss2kyxs4p7pgmldlnxpa31js50gydy8x9qi89s4x74iidf6k6nfgqsc5ns";
+        sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
       };
     };
     "void-elements-2.0.1" = {
@@ -9415,7 +9550,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
-        sha512 = "1ykk57cjg94sdr82b43a5q815xrd4yhvpqzdwlpvfi50zv5zw4cincppdbkmizdc4zkmym57s8rqmpj5fpyxjl12kla136dy07gkhyg";
+        sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==";
       };
     };
     "walker-1.0.7" = {
@@ -9427,13 +9562,22 @@ let
         sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
       };
     };
-    "watchpack-1.6.0" = {
+    "watchpack-1.7.5" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "1.6.0";
+      version = "1.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz";
-        sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz";
+        sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==";
+      };
+    };
+    "watchpack-chokidar2-2.0.1" = {
+      name = "watchpack-chokidar2";
+      packageName = "watchpack-chokidar2";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz";
+        sha512 = "nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==";
       };
     };
     "wbuf-1.7.3" = {
@@ -9442,7 +9586,7 @@ let
       version = "1.7.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz";
-        sha512 = "066j9njgvk6mkjalv1zf1p8w9m2hrl97vz1iw8q6g9zlplhphz54j5j0ma0x9053zhczbyi3k1nr493vgnx1lk22hdwp2glg8x11kiv";
+        sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==";
       };
     };
     "wcwidth-1.0.1" = {
@@ -9460,52 +9604,52 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
-        sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1";
+        sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
-    "webpack-4.42.0" = {
+    "webpack-4.46.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "4.42.0";
+      version = "4.46.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz";
-        sha512 = "3my3qykp4laavc26aad536i8n5h6isv7rnrsv092i7nbyy7dkpi59w3jsxrz7yhbrzwvyiqs78kv8q2plswm8camnc1ij0hzhg52chk";
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz";
+        sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==";
       };
     };
-    "webpack-bundle-analyzer-3.6.1" = {
+    "webpack-bundle-analyzer-3.9.0" = {
       name = "webpack-bundle-analyzer";
       packageName = "webpack-bundle-analyzer";
-      version = "3.6.1";
+      version = "3.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz";
-        sha512 = "13z3rjpds6nclkfxhf6pdnmp78a485psglljlmzibrlx4anhldzw2rvdwi9hzzjpfpi8d7ihhwc1w8s1k23zgh00xqisjqz7hf7rxrm";
+        url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz";
+        sha512 = "Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==";
       };
     };
-    "webpack-cli-3.3.11" = {
+    "webpack-cli-3.3.12" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.11";
+      version = "3.3.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz";
-        sha512 = "3i5vq7c9hpjb8z9x68dq56cjmv5hs584vgci6zbc7n0m8y1fk4y1kv4pyrq4q9crlkwirwy6gh5w3q0a2xv43w5q42z1ikvd6x5yybm";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz";
+        sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==";
       };
     };
-    "webpack-dev-middleware-3.7.2" = {
+    "webpack-dev-middleware-3.7.3" = {
       name = "webpack-dev-middleware";
       packageName = "webpack-dev-middleware";
-      version = "3.7.2";
+      version = "3.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz";
-        sha512 = "27qjisacr2wrfj7r3z5hh2x7nrhadc27vg4kcalrdc7rrn8gnnlk64zf1pqmlkffy8klh8r0dr259v1sf6fjm886j5qlqjvpkcbh46p";
+        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz";
+        sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==";
       };
     };
-    "webpack-dev-server-3.10.3" = {
+    "webpack-dev-server-3.11.2" = {
       name = "webpack-dev-server";
       packageName = "webpack-dev-server";
-      version = "3.10.3";
+      version = "3.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz";
-        sha512 = "1wl6ahwwfvm7620d70by2abmqgvw54mdhr8bxhdnnsvjzincy83rg80vffb1vwm2cvxwdc9qpp7ipq8bqrkf773fi6lbk0qzxxdd2bv";
+        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz";
+        sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==";
       };
     };
     "webpack-log-1.2.0" = {
@@ -9514,7 +9658,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz";
-        sha512 = "0f0lcci53li31zhx7vhwaq4di0xvhd0n02rgy54kb4bcq6fzki0lz34s6ldzwf1ppaqw1n6jc3hp64blldhz8ianvbl3rzf54h2gl2k";
+        sha512 = "U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==";
       };
     };
     "webpack-log-2.0.0" = {
@@ -9523,7 +9667,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz";
-        sha512 = "191qr8nb4rszy53q0ydqfxr1pirimc3k3bi7mhgin5f15cd7vd28maxanyb248kdivmajhji580fv3a1i584icz3cc9bwvzykd0czvi";
+        sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==";
       };
     };
     "webpack-sources-1.4.3" = {
@@ -9532,34 +9676,34 @@ let
       version = "1.4.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz";
-        sha512 = "1wn7ixcv4b15kj3jn4c08n3pgrrd2kgzm2llh9viqx6a6k3j6rqzd5iksxdkalzaz6iic1q4fjj6wr9wfa07llf5a751mkgg3fx414n";
+        sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
       };
     };
-    "websocket-1.0.31" = {
+    "websocket-1.0.33" = {
       name = "websocket";
       packageName = "websocket";
-      version = "1.0.31";
+      version = "1.0.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz";
-        sha512 = "22yr8a52nsijkqybp8fgzvh69wxrhmcqmcmjvmdwl6m9qix0lxdyakbvznj0wr90nl3mw5j4srhgxp6p8ihipil2j5gha66bfk2w2jl";
+        url = "https://registry.npmjs.org/websocket/-/websocket-1.0.33.tgz";
+        sha512 = "XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA==";
       };
     };
-    "websocket-driver-0.7.3" = {
+    "websocket-driver-0.7.4" = {
       name = "websocket-driver";
       packageName = "websocket-driver";
-      version = "0.7.3";
+      version = "0.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz";
-        sha512 = "0b5m603phj37lw5vb70ijc77g29cz7vn1w1bs7rhkx1ax3gil0wys841m14gnm3p95lc630hs370dngh68p7aaq69yqw1yvysb5d73f";
+        url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz";
+        sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==";
       };
     };
-    "websocket-extensions-0.1.3" = {
+    "websocket-extensions-0.1.4" = {
       name = "websocket-extensions";
       packageName = "websocket-extensions";
-      version = "0.1.3";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz";
-        sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy";
+        url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz";
+        sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
     "whatwg-encoding-1.0.5" = {
@@ -9568,7 +9712,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";
-        sha512 = "09x9fa2rb8a6lmwy9hs7z4qn2bsyqw8l2hmfy50z3fa496x3p2xadmlccm8ad17nam5fz77z9mndw2yqp8jpvyw3ryz6f09ksdn56bg";
+        sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==";
       };
     };
     "whatwg-mimetype-2.3.0" = {
@@ -9577,7 +9721,7 @@ let
       version = "2.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz";
-        sha512 = "3zaycdfc1hh0i4r1c42vgkzwmlfv8j68d90f6i577735i40hk9p9m790g2z2dlmdkchn2z73yj0zs73fmpjdnx4xwrp80m6pv18r31k";
+        sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==";
       };
     };
     "whatwg-url-6.5.0" = {
@@ -9586,7 +9730,7 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz";
-        sha512 = "36rzky2jm48j68kfvdhvr0cmbnvr2liaagpnnypc59mlvq4bbcwx9qbdb93hbi4vwx0w287zphiardpmfwyjl2ab58b4k3zmi35j55f";
+        sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==";
       };
     };
     "whatwg-url-7.1.0" = {
@@ -9595,7 +9739,7 @@ let
       version = "7.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz";
-        sha512 = "1xa656b9abn0fnwqaybjm3h5gs9x26cc3zj7jkk5n3865l9d1wqpp461s4l3i2mgbwf90q6psgvbb80lbrmkihbl4xq7bj31m3bnjsr";
+        sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==";
       };
     };
     "which-1.3.1" = {
@@ -9604,7 +9748,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
-        sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
       };
     };
     "which-module-2.0.0" = {
@@ -9640,7 +9784,7 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";
-        sha512 = "2ykkqcs7vmimn8dsvs7xl55j0lbbrfj0nij9i7yqnxg9g759vqyrdis8w5n82k6xvas03x0xhgmbzjgsp7v803mzihx9d12vjnfcgqz";
+        sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
       };
     };
     "wordwrap-0.0.2" = {
@@ -9658,16 +9802,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz";
-        sha512 = "37m9wq9rvylb71n9kw3qghinwa3x4sggz82k29aall83izni78ijnh8rd6nhas8advw0lbnhby8z74vjlhp3sjsr4qm1wjw6r0kgz5f";
-      };
-    };
-    "wrap-ansi-2.1.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+        sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==";
       };
     };
     "wrap-ansi-5.1.0" = {
@@ -9676,7 +9811,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
-        sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0";
+        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
       };
     };
     "wrappy-1.0.2" = {
@@ -9694,7 +9829,7 @@ let
       version = "2.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz";
-        sha512 = "2zcd4w8bmjv2qg25v2ysnj63r717jb6zmrh2f4c92r0dh0zwj3ybyzg5h619b4adxksn67cg8y5pgn43hq7wl8ih3z7nchrj5wwaqac";
+        sha512 = "TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==";
       };
     };
     "ws-5.2.2" = {
@@ -9703,7 +9838,7 @@ let
       version = "5.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz";
-        sha512 = "0f6ay7yn6xslzh3h66d5krqnp48d9g3ikwk0ijiyyxfkwaqxxf3b0qdswy6ych79mj44315qd16snlnk6m6npc5l0habgy5lc7wb8cd";
+        sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==";
       };
     };
     "ws-6.2.1" = {
@@ -9712,7 +9847,7 @@ let
       version = "6.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz";
-        sha512 = "2l27cfiaw6syjvy6vbpqf5c2swd37bqviizzck6842xlankppm9j1sg79x3m8jpda8v6khcpnm5ssab1b8vf34qpviv41ww5mf8130q";
+        sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==";
       };
     };
     "xml-name-validator-3.0.0" = {
@@ -9721,7 +9856,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz";
-        sha512 = "0zzh3xf5vk49fghwrf83qvq6v98qin1brnwd7yyh7qs05gc1w3xni0w17sj33534jrkm2za7wkm4q5rhgpchds54i5grcj3vjk99403";
+        sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==";
       };
     };
     "xtend-4.0.2" = {
@@ -9730,16 +9865,16 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz";
-        sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic";
+        sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.0" = {
+    "y18n-4.0.1" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
+        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
       };
     };
     "yaeti-0.0.6" = {
@@ -9766,25 +9901,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
-      };
-    };
-    "yargs-12.0.5" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "12.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
-        sha512 = "1kjmh68p4rb4c04s0gk4ra20crfr32h6v9zhj4clrz61xanslza9g3drbf6471mmvqq3vmxk04grmgillx1rsp6v2zim7wqnr6gq71f";
-      };
-    };
-    "yargs-13.2.4" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "13.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz";
-        sha512 = "2ba88a0fmf5k7dddcbkyhlmh7pijzczza486f2vq9pyw739r7q4yy2xmv4hk8w4ibrj4sjgf6zw01phb89h4j9z3lkz1m2s09cc6vqw";
+        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
     "yargs-13.3.2" = {
@@ -9793,7 +9910,7 @@ let
       version = "13.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
-        sha512 = "19rg5b2rhj2kg44as5vv9jxmpr39lw250885w6nlfwyhvwd5nxnnx7fc35v7h615i65cik7k3wi7ac20c91kcgfi5wy7blgk31xjz81";
+        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
       };
     };
     "yargs-3.10.0" = {
@@ -9811,16 +9928,7 @@ let
       version = "10.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz";
-        sha512 = "1nj7f7y3kyrc1ijsgnaf4mdkxhxy38lnckavl6inh9wwzhx12xfmgq0n45x4fbj0y6rd1zhjv57l49qm07kqfd9a9cl1809bi3k48jl";
-      };
-    };
-    "yargs-parser-11.1.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "11.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
-        sha512 = "14iaywclwncdp3p7878q12cqgdc5rbkl0f6ghi9g7k7f4f1bbqi41dc5ki6hnqmy6jbfk0kx88m47vk3igrql5j6i7ar2a3cbyh3a8b";
+        sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==";
       };
     };
     "yargs-parser-13.1.2" = {
@@ -9829,7 +9937,7 @@ let
       version = "13.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
-        sha512 = "375nan6m28q81h8q9a8vmcxgiq7s81yn1ql7zdikac0c4j2kmxdjzmbq14fcp9jm4ilcfzkd9ym4x7c80s7r6g488wf13zz2wsyqmny";
+        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
       };
     };
     "ylru-1.2.1" = {
@@ -9838,7 +9946,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz";
-        sha512 = "2yw1b7v991krvw6f597i39x9sqp12qxlfnqz8zd75x00m7jp2a08b2zivbx59b5ih7ka14swqmpfk9ni2inkdjh363z0w1ksfl2p93x";
+        sha512 = "faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==";
       };
     };
   };
@@ -9854,52 +9962,54 @@ in
       sha256 = "589bfc9e3e26af38989144e8551547cbeb5ffc9a0b668a7a4cb211a2ebf7a931";
     };
     dependencies = [
-      sources."@babel/code-frame-7.8.3"
-      (sources."@babel/core-7.8.7" // {
+      sources."@babel/code-frame-7.12.11"
+      (sources."@babel/core-7.12.10" // {
         dependencies = [
-          sources."debug-4.1.1"
-          sources."json5-2.1.1"
-          sources."minimist-1.2.5"
+          sources."debug-4.3.2"
+          sources."json5-2.1.3"
           sources."ms-2.1.2"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.8.8" // {
+      (sources."@babel/generator-7.12.11" // {
         dependencies = [
           sources."jsesc-2.5.2"
           sources."source-map-0.5.7"
         ];
       })
-      sources."@babel/helper-function-name-7.8.3"
-      sources."@babel/helper-get-function-arity-7.8.3"
-      sources."@babel/helper-plugin-utils-7.8.3"
-      sources."@babel/helper-split-export-declaration-7.8.3"
-      sources."@babel/helpers-7.8.4"
-      (sources."@babel/highlight-7.8.3" // {
+      sources."@babel/helper-function-name-7.12.11"
+      sources."@babel/helper-get-function-arity-7.12.10"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
+      sources."@babel/helper-module-imports-7.12.5"
+      sources."@babel/helper-module-transforms-7.12.1"
+      sources."@babel/helper-optimise-call-expression-7.12.10"
+      sources."@babel/helper-plugin-utils-7.10.4"
+      sources."@babel/helper-replace-supers-7.12.11"
+      sources."@babel/helper-simple-access-7.12.1"
+      sources."@babel/helper-split-export-declaration-7.12.11"
+      sources."@babel/helper-validator-identifier-7.12.11"
+      sources."@babel/helpers-7.12.5"
+      (sources."@babel/highlight-7.10.4" // {
         dependencies = [
           sources."js-tokens-4.0.0"
         ];
       })
-      sources."@babel/parser-7.8.8"
+      sources."@babel/parser-7.12.11"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
-      sources."@babel/template-7.8.6"
-      (sources."@babel/traverse-7.8.6" // {
+      sources."@babel/template-7.12.7"
+      (sources."@babel/traverse-7.12.12" // {
         dependencies = [
-          sources."debug-4.1.1"
+          sources."debug-4.3.2"
           sources."globals-11.12.0"
           sources."ms-2.1.2"
         ];
       })
-      (sources."@babel/types-7.8.7" // {
+      (sources."@babel/types-7.12.12" // {
         dependencies = [
           sources."to-fast-properties-2.0.0"
         ];
       })
-      (sources."@cnakazawa/watch-1.0.4" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."@cnakazawa/watch-1.0.4"
       (sources."@jest/console-24.9.0" // {
         dependencies = [
           sources."slash-2.0.0"
@@ -9928,84 +10038,87 @@ in
       sources."@jest/types-24.9.0"
       (sources."@kubernetes/client-node-0.10.3" // {
         dependencies = [
-          sources."@types/node-10.17.17"
+          sources."@types/node-10.17.51"
         ];
       })
       sources."@sindresorhus/is-0.7.0"
       sources."@types/accepts-1.3.5"
       sources."@types/axios-0.14.0"
-      sources."@types/babel-types-7.0.7"
-      sources."@types/babel__core-7.1.6"
-      sources."@types/babel__generator-7.6.1"
-      sources."@types/babel__template-7.0.2"
-      sources."@types/babel__traverse-7.0.9"
+      sources."@types/babel-types-7.0.9"
+      sources."@types/babel__core-7.1.12"
+      sources."@types/babel__generator-7.6.2"
+      sources."@types/babel__template-7.4.0"
+      sources."@types/babel__traverse-7.11.0"
       sources."@types/babylon-6.16.5"
       sources."@types/body-parser-1.19.0"
       sources."@types/caseless-0.12.2"
       sources."@types/command-line-args-5.0.0"
-      sources."@types/connect-3.4.33"
-      sources."@types/cookies-0.7.4"
+      sources."@types/connect-3.4.34"
+      sources."@types/content-disposition-0.5.3"
+      sources."@types/cookies-0.7.6"
       sources."@types/cron-1.7.2"
       sources."@types/events-3.0.0"
-      sources."@types/express-4.17.3"
-      sources."@types/express-serve-static-core-4.17.2"
-      sources."@types/formidable-1.0.31"
-      sources."@types/glob-7.1.1"
+      sources."@types/express-4.17.11"
+      sources."@types/express-serve-static-core-4.17.18"
+      sources."@types/formidable-1.0.32"
+      sources."@types/glob-7.1.3"
       sources."@types/http-assert-1.5.1"
-      sources."@types/istanbul-lib-coverage-2.0.1"
+      sources."@types/http-errors-1.8.0"
+      sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
-      sources."@types/istanbul-reports-1.1.1"
+      sources."@types/istanbul-reports-1.1.2"
       sources."@types/jest-24.9.1"
-      sources."@types/js-yaml-3.12.2"
+      sources."@types/js-yaml-3.12.6"
       sources."@types/keygrip-1.0.2"
-      sources."@types/koa-2.11.2"
+      sources."@types/koa-2.11.6"
       sources."@types/koa-compose-3.2.5"
-      sources."@types/koa-router-7.4.0"
+      sources."@types/koa-router-7.4.1"
       sources."@types/koa-send-4.1.2"
       sources."@types/koa-static-4.0.1"
       sources."@types/koa-views-2.0.4"
-      sources."@types/lodash-4.14.149"
+      sources."@types/lodash-4.14.168"
       sources."@types/lodash.clonedeep-4.5.6"
-      sources."@types/mime-2.0.1"
+      sources."@types/mime-1.3.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-12.12.30"
+      sources."@types/node-12.19.15"
       sources."@types/ora-3.2.0"
+      sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
-      (sources."@types/request-2.48.4" // {
+      (sources."@types/request-2.48.5" // {
         dependencies = [
           sources."form-data-2.5.1"
         ];
       })
-      sources."@types/serve-static-1.13.3"
+      sources."@types/serve-static-1.13.9"
       sources."@types/stack-utils-1.0.1"
-      sources."@types/tough-cookie-2.3.6"
-      sources."@types/underscore-1.9.4"
+      sources."@types/tough-cookie-4.0.0"
+      sources."@types/underscore-1.10.24"
       sources."@types/websocket-0.0.40"
       sources."@types/ws-6.0.4"
-      sources."@types/yargs-13.0.8"
-      sources."@types/yargs-parser-15.0.0"
-      sources."@webassemblyjs/ast-1.8.5"
-      sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
-      sources."@webassemblyjs/helper-api-error-1.8.5"
-      sources."@webassemblyjs/helper-buffer-1.8.5"
-      sources."@webassemblyjs/helper-code-frame-1.8.5"
-      sources."@webassemblyjs/helper-fsm-1.8.5"
-      sources."@webassemblyjs/helper-module-context-1.8.5"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.8.5"
-      sources."@webassemblyjs/helper-wasm-section-1.8.5"
-      sources."@webassemblyjs/ieee754-1.8.5"
-      sources."@webassemblyjs/leb128-1.8.5"
-      sources."@webassemblyjs/utf8-1.8.5"
-      sources."@webassemblyjs/wasm-edit-1.8.5"
-      sources."@webassemblyjs/wasm-gen-1.8.5"
-      sources."@webassemblyjs/wasm-opt-1.8.5"
-      sources."@webassemblyjs/wasm-parser-1.8.5"
-      sources."@webassemblyjs/wast-parser-1.8.5"
-      sources."@webassemblyjs/wast-printer-1.8.5"
+      sources."@types/yargs-13.0.11"
+      sources."@types/yargs-parser-20.2.0"
+      sources."@webassemblyjs/ast-1.9.0"
+      sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
+      sources."@webassemblyjs/helper-api-error-1.9.0"
+      sources."@webassemblyjs/helper-buffer-1.9.0"
+      sources."@webassemblyjs/helper-code-frame-1.9.0"
+      sources."@webassemblyjs/helper-fsm-1.9.0"
+      sources."@webassemblyjs/helper-module-context-1.9.0"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.9.0"
+      sources."@webassemblyjs/helper-wasm-section-1.9.0"
+      sources."@webassemblyjs/ieee754-1.9.0"
+      sources."@webassemblyjs/leb128-1.9.0"
+      sources."@webassemblyjs/utf8-1.9.0"
+      sources."@webassemblyjs/wasm-edit-1.9.0"
+      sources."@webassemblyjs/wasm-gen-1.9.0"
+      sources."@webassemblyjs/wasm-opt-1.9.0"
+      sources."@webassemblyjs/wasm-parser-1.9.0"
+      sources."@webassemblyjs/wast-parser-1.9.0"
+      sources."@webassemblyjs/wast-printer-1.9.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."abab-2.0.3"
+      sources."abab-2.0.5"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."acorn-3.3.0"
@@ -10016,9 +10129,9 @@ in
       })
       sources."acorn-walk-6.2.0"
       sources."aggregate-error-1.0.0"
-      sources."ajv-6.12.0"
+      sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
-      sources."ajv-keywords-3.4.1"
+      sources."ajv-keywords-3.5.2"
       sources."align-text-0.1.4"
       sources."ansi-colors-3.2.4"
       sources."ansi-escapes-3.2.0"
@@ -10040,7 +10153,11 @@ in
       sources."array-unique-0.3.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
-      sources."asn1.js-4.10.1"
+      (sources."asn1.js-5.4.1" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       (sources."assert-1.5.0" // {
         dependencies = [
           sources."inherits-2.0.1"
@@ -10057,7 +10174,7 @@ in
       sources."atob-2.1.2"
       sources."awesome-typescript-loader-5.2.1"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.9.1"
+      sources."aws4-1.11.0"
       sources."axios-0.19.2"
       sources."babel-6.23.0"
       (sources."babel-code-frame-6.26.0" // {
@@ -10154,19 +10271,20 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."base64url-3.0.1"
       sources."batch-0.6.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bfj-6.1.2"
       sources."big.js-5.2.2"
-      sources."binary-extensions-1.13.1"
+      sources."binary-extensions-2.2.0"
       sources."bindings-1.5.0"
       sources."bluebird-3.7.2"
-      sources."bn.js-4.11.8"
+      sources."bn.js-5.1.3"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."depd-1.1.2"
           sources."http-errors-1.7.2"
           sources."inherits-2.0.3"
           sources."qs-6.7.0"
@@ -10190,16 +10308,21 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      sources."browserify-rsa-4.0.1"
-      sources."browserify-sign-4.0.4"
+      sources."browserify-rsa-4.1.0"
+      (sources."browserify-sign-4.2.1" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."browserify-zlib-0.2.0"
       sources."browserslist-3.2.8"
       sources."bs-logger-0.2.6"
       sources."bser-2.1.1"
-      sources."buffer-4.9.2"
+      sources."buffer-5.7.1"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
       sources."buffer-xor-1.0.3"
+      sources."bufferutil-4.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."byline-5.0.0"
       sources."bytes-3.1.0"
@@ -10217,18 +10340,25 @@ in
           sources."lowercase-keys-1.0.0"
         ];
       })
+      sources."call-bind-1.0.2"
       sources."callsites-3.1.0"
       sources."camelcase-1.2.1"
-      sources."caniuse-lite-1.0.30001035"
+      sources."caniuse-lite-1.0.30001179"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-2.4.2"
       sources."character-parser-2.2.0"
       sources."check-types-8.0.3"
-      (sources."chokidar-2.1.8" // {
+      (sources."chokidar-3.5.1" // {
         dependencies = [
+          sources."anymatch-3.1.1"
+          sources."braces-3.0.2"
+          sources."fill-range-7.0.1"
+          sources."fsevents-2.3.1"
+          sources."is-number-7.0.0"
           sources."normalize-path-3.0.0"
+          sources."to-regex-range-5.0.1"
         ];
       })
       sources."chownr-1.1.4"
@@ -10255,13 +10385,12 @@ in
       sources."clean-css-4.2.3"
       sources."clean-stack-1.3.0"
       sources."cli-cursor-2.1.0"
-      sources."cli-spinners-2.2.0"
+      sources."cli-spinners-2.5.0"
       sources."cliui-2.1.0"
       sources."clone-1.0.4"
       sources."clone-response-1.0.2"
       sources."co-4.6.0"
       sources."co-body-5.2.0"
-      sources."code-point-at-1.1.0"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -10300,11 +10429,7 @@ in
       })
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      (sources."cookies-0.8.0" // {
-        dependencies = [
-          sources."depd-2.0.0"
-        ];
-      })
+      sources."cookies-0.8.0"
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       (sources."copy-webpack-plugin-4.6.0" // {
@@ -10313,9 +10438,13 @@ in
           sources."p-try-1.0.0"
         ];
       })
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.3"
+      (sources."create-ecdh-4.0.4" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."cron-1.8.2"
@@ -10353,7 +10482,7 @@ in
       })
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."depd-1.1.2"
+      sources."depd-2.0.0"
       sources."des.js-1.0.1"
       sources."destroy-1.0.4"
       sources."detect-file-1.0.0"
@@ -10361,7 +10490,11 @@ in
       sources."detect-newline-2.1.0"
       sources."detect-node-2.0.4"
       sources."diff-sequences-24.9.0"
-      sources."diffie-hellman-5.0.3"
+      (sources."diffie-hellman-5.0.3" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."dir-glob-2.2.2"
       sources."dns-equal-1.0.0"
       sources."dns-packet-1.3.1"
@@ -10369,7 +10502,7 @@ in
       sources."doctypes-1.1.0"
       sources."domain-browser-1.2.0"
       sources."domexception-1.0.1"
-      sources."duplexer-0.1.1"
+      sources."duplexer-0.1.2"
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
@@ -10381,17 +10514,20 @@ in
       })
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.376"
-      sources."elliptic-6.5.2"
+      sources."electron-to-chromium-1.3.642"
+      (sources."elliptic-6.5.3" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.1.1"
-      sources."errno-0.1.7"
+      sources."enhanced-resolve-4.5.0"
+      sources."errno-0.1.8"
       sources."error-ex-1.3.2"
-      sources."error-inject-1.0.0"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
@@ -10399,15 +10535,19 @@ in
       sources."es6-symbol-3.1.3"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.14.1"
+      sources."escodegen-1.14.3"
       sources."eslint-scope-4.0.3"
       sources."esprima-4.0.1"
-      sources."esrecurse-4.2.1"
+      (sources."esrecurse-4.3.0" // {
+        dependencies = [
+          sources."estraverse-5.2.0"
+        ];
+      })
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."etag-1.8.1"
-      sources."eventemitter3-4.0.0"
-      sources."events-3.1.0"
+      sources."eventemitter3-4.0.7"
+      sources."events-3.2.0"
       sources."eventsource-1.0.7"
       sources."evp_bytestokey-1.0.3"
       sources."exec-sh-0.3.4"
@@ -10436,6 +10576,7 @@ in
       (sources."express-4.17.1" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."depd-1.1.2"
           sources."path-to-regexp-0.1.7"
           sources."qs-6.7.0"
           sources."safe-buffer-5.1.2"
@@ -10443,7 +10584,7 @@ in
       })
       (sources."ext-1.4.0" // {
         dependencies = [
-          sources."type-2.0.0"
+          sources."type-2.1.0"
         ];
       })
       sources."extend-3.0.2"
@@ -10454,12 +10595,12 @@ in
         ];
       })
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.1"
+      sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."faye-websocket-0.10.0"
+      sources."faye-websocket-0.11.3"
       sources."fb-watchman-2.0.1"
-      sources."figgy-pudding-3.5.1"
+      sources."figgy-pudding-3.5.2"
       sources."file-uri-to-path-1.0.0"
       sources."filesize-3.6.1"
       sources."fill-range-4.0.0"
@@ -10474,6 +10615,7 @@ in
       sources."findup-sync-3.0.0"
       sources."flush-write-stream-1.1.1"
       sources."follow-redirects-1.5.10"
+      sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -10484,10 +10626,11 @@ in
       sources."from2-2.3.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.2"
       (sources."get-paths-0.0.7" // {
         dependencies = [
           sources."pify-4.0.1"
@@ -10497,11 +10640,7 @@ in
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
-      (sources."glob-parent-3.1.0" // {
-        dependencies = [
-          sources."is-glob-3.1.0"
-        ];
-      })
+      sources."glob-parent-5.1.1"
       (sources."global-modules-2.0.0" // {
         dependencies = [
           sources."global-prefix-3.0.0"
@@ -10516,16 +10655,16 @@ in
           sources."get-stream-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.3"
+      sources."graceful-fs-4.2.4"
       sources."growly-1.3.0"
       (sources."gzip-size-5.1.1" // {
         dependencies = [
           sources."pify-4.0.1"
         ];
       })
-      sources."handle-thing-2.0.0"
+      sources."handle-thing-2.0.1"
       sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
+      sources."har-validator-5.1.5"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
@@ -10542,7 +10681,11 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hash-base-3.0.4"
+      (sources."hash-base-3.1.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."home-or-tmp-2.0.0"
@@ -10551,19 +10694,29 @@ in
       sources."hosted-git-info-2.8.8"
       sources."hpack.js-2.1.6"
       sources."html-encoding-sniffer-1.0.2"
-      sources."html-entities-1.2.1"
-      sources."html-escaper-2.0.0"
-      sources."http-assert-1.4.1"
+      sources."html-entities-1.4.0"
+      sources."html-escaper-2.0.2"
+      (sources."http-assert-1.4.1" // {
+        dependencies = [
+          sources."depd-1.1.2"
+          sources."http-errors-1.7.3"
+        ];
+      })
       sources."http-cache-semantics-3.8.1"
       sources."http-deceiver-1.2.7"
-      sources."http-errors-1.7.3"
-      sources."http-parser-js-0.4.10"
-      sources."http-proxy-1.18.0"
+      (sources."http-errors-1.8.0" // {
+        dependencies = [
+          sources."depd-1.1.2"
+          sources."setprototypeof-1.2.0"
+        ];
+      })
+      sources."http-parser-js-0.5.3"
+      sources."http-proxy-1.18.1"
       sources."http-proxy-middleware-0.19.1"
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
       sources."ignore-3.3.10"
       (sources."import-local-2.0.0" // {
@@ -10577,12 +10730,11 @@ in
       sources."inflation-2.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.5"
+      sources."ini-1.3.8"
       sources."internal-ip-4.3.0"
-      sources."interpret-1.2.0"
+      sources."interpret-1.4.0"
       sources."into-stream-3.1.0"
       sources."invariant-2.2.4"
-      sources."invert-kv-2.0.0"
       sources."ip-1.1.5"
       sources."ip-regex-2.1.0"
       sources."ipaddr.js-1.9.1"
@@ -10593,10 +10745,11 @@ in
         ];
       })
       sources."is-arrayish-0.2.1"
-      sources."is-binary-path-1.0.1"
+      sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.1.5"
+      sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.2.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -10618,17 +10771,18 @@ in
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-generator-fn-2.1.0"
-      sources."is-generator-function-1.0.7"
+      sources."is-generator-function-1.0.8"
       sources."is-glob-4.0.1"
+      sources."is-negative-zero-2.0.1"
       sources."is-number-3.0.0"
-      sources."is-object-1.0.1"
+      sources."is-object-1.0.2"
       sources."is-path-cwd-2.2.0"
       sources."is-path-in-cwd-2.1.0"
       sources."is-path-inside-2.1.0"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
-      sources."is-promise-2.1.0"
-      sources."is-regex-1.0.5"
+      sources."is-promise-2.2.2"
+      sources."is-regex-1.1.1"
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-symbol-1.0.3"
@@ -10656,7 +10810,7 @@ in
       })
       (sources."istanbul-lib-source-maps-3.0.6" // {
         dependencies = [
-          sources."debug-4.1.1"
+          sources."debug-4.3.2"
           sources."make-dir-2.1.0"
           sources."ms-2.1.2"
           sources."pify-4.0.1"
@@ -10689,7 +10843,7 @@ in
         ];
       })
       sources."jest-mock-24.9.0"
-      sources."jest-pnp-resolver-1.2.1"
+      sources."jest-pnp-resolver-1.2.2"
       sources."jest-regex-util-24.9.0"
       sources."jest-resolve-24.9.0"
       sources."jest-resolve-dependencies-24.9.0"
@@ -10723,17 +10877,21 @@ in
           sources."supports-color-6.1.0"
         ];
       })
-      sources."js-beautify-1.10.3"
+      (sources."js-beautify-1.13.4" // {
+        dependencies = [
+          sources."mkdirp-1.0.4"
+        ];
+      })
       sources."js-stringify-1.0.2"
       sources."js-tokens-3.0.2"
-      sources."js-yaml-3.13.1"
+      sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
       (sources."jsdom-11.12.0" // {
         dependencies = [
           sources."acorn-5.7.4"
           (sources."acorn-globals-4.3.4" // {
             dependencies = [
-              sources."acorn-6.4.1"
+              sources."acorn-6.4.2"
             ];
           })
           sources."ws-5.2.2"
@@ -10746,11 +10904,7 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
       sources."json3-3.3.3"
-      (sources."json5-1.0.1" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."json5-1.0.1"
       sources."jsonpath-plus-0.19.0"
       sources."jsprim-1.4.1"
       sources."jstransformer-1.0.0"
@@ -10759,9 +10913,9 @@ in
       sources."killable-1.0.1"
       sources."kind-of-3.2.2"
       sources."kleur-3.0.3"
-      sources."koa-2.11.0"
-      sources."koa-body-4.1.1"
-      sources."koa-compose-4.1.0"
+      sources."koa-2.13.1"
+      sources."koa-body-4.2.0"
+      sources."koa-compose-4.2.0"
       (sources."koa-convert-1.2.0" // {
         dependencies = [
           sources."koa-compose-3.2.1"
@@ -10772,16 +10926,20 @@ in
           sources."koa-compose-3.2.1"
         ];
       })
-      sources."koa-send-5.0.0"
-      sources."koa-static-5.0.0"
-      (sources."koa-views-6.2.1" // {
+      (sources."koa-send-5.0.1" // {
         dependencies = [
-          sources."debug-4.1.1"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."koa-static-5.0.0"
+      (sources."koa-views-6.3.1" // {
+        dependencies = [
+          sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
       sources."lazy-cache-1.0.4"
-      sources."lcid-2.0.0"
       sources."left-pad-1.3.0"
       sources."leven-3.1.0"
       sources."levn-0.3.0"
@@ -10789,13 +10947,13 @@ in
       sources."loader-runner-2.4.0"
       sources."loader-utils-1.4.0"
       sources."locate-path-3.0.0"
-      sources."lodash-4.17.15"
+      sources."lodash-4.17.20"
       sources."lodash.camelcase-4.3.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.memoize-4.1.2"
       sources."lodash.sortby-4.7.0"
       sources."log-symbols-2.2.0"
-      sources."loglevel-1.6.7"
+      sources."loglevel-1.7.1"
       sources."loglevelnext-1.0.5"
       sources."long-4.0.0"
       sources."longest-1.0.1"
@@ -10805,18 +10963,10 @@ in
       sources."make-dir-1.3.0"
       sources."make-error-1.3.6"
       sources."makeerror-1.0.11"
-      sources."mamacro-0.0.3"
-      sources."map-age-cleaner-0.1.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
-      (sources."mem-4.3.0" // {
-        dependencies = [
-          sources."mimic-fn-2.1.0"
-          sources."p-is-promise-2.1.0"
-        ];
-      })
       sources."memory-fs-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
@@ -10828,16 +10978,20 @@ in
           sources."kind-of-6.0.3"
         ];
       })
-      sources."miller-rabin-4.0.1"
+      (sources."miller-rabin-4.0.1" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."mime-1.6.0"
-      sources."mime-db-1.43.0"
-      sources."mime-types-2.1.26"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       (sources."mississippi-2.0.0" // {
         dependencies = [
           sources."pump-2.0.1"
@@ -10848,15 +11002,15 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."mkdirp-0.5.1"
-      sources."moment-2.24.0"
-      sources."moment-timezone-0.5.28"
+      sources."mkdirp-0.5.5"
+      sources."moment-2.29.1"
+      sources."moment-timezone-0.5.32"
       sources."move-concurrently-1.0.1"
       sources."ms-2.0.0"
       sources."multicast-dns-6.2.3"
       sources."multicast-dns-service-types-1.1.0"
       sources."mz-2.7.0"
-      sources."nan-2.14.0"
+      sources."nan-2.14.2"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -10866,25 +11020,26 @@ in
       })
       sources."natural-compare-1.4.0"
       sources."negotiator-0.6.2"
-      sources."neo-async-2.6.1"
+      sources."neo-async-2.6.2"
       sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
       sources."node-forge-0.8.5"
+      sources."node-gyp-build-4.2.3"
       sources."node-int64-0.4.0"
-      sources."node-jose-1.1.3"
+      sources."node-jose-1.1.4"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
+          sources."buffer-4.9.2"
           sources."punycode-1.4.1"
         ];
       })
       sources."node-modules-regexp-1.0.0"
       sources."node-notifier-5.4.3"
-      sources."nopt-4.0.3"
+      sources."nopt-5.0.0"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-2.1.1"
       sources."normalize-url-2.0.1"
       sources."npm-run-path-2.0.2"
-      sources."number-is-nan-1.0.1"
       sources."nwsapi-2.2.0"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
@@ -10901,11 +11056,11 @@ in
         ];
       })
       sources."object-hash-1.3.1"
-      sources."object-inspect-1.7.0"
+      sources."object-inspect-1.9.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.1.0"
+      sources."object.assign-4.1.2"
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."object.pick-1.3.0"
       sources."obuf-1.1.2"
       sources."oidc-token-hash-3.0.2"
@@ -10914,7 +11069,7 @@ in
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."only-0.0.2"
-      sources."opener-1.5.1"
+      sources."opener-1.5.2"
       sources."openid-client-2.5.0"
       sources."opn-5.5.0"
       sources."optionator-0.8.3"
@@ -10922,16 +11077,13 @@ in
       sources."original-1.0.2"
       sources."os-browserify-0.3.0"
       sources."os-homedir-1.0.2"
-      sources."os-locale-3.1.0"
       sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
       sources."p-any-1.1.0"
       sources."p-cancelable-0.4.1"
-      sources."p-defer-1.0.0"
       sources."p-each-series-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-1.1.0"
-      sources."p-limit-2.2.2"
+      sources."p-limit-2.3.0"
       sources."p-locate-3.0.0"
       sources."p-map-2.1.0"
       sources."p-reduce-1.0.0"
@@ -10941,7 +11093,7 @@ in
       sources."p-try-2.2.0"
       sources."pako-1.0.11"
       sources."parallel-transform-1.2.0"
-      sources."parse-asn1-5.1.5"
+      sources."parse-asn1-5.1.6"
       sources."parse-json-4.0.0"
       sources."parse-passwd-1.0.0"
       sources."parse5-4.0.0"
@@ -10960,8 +11112,9 @@ in
         ];
       })
       sources."path-type-3.0.0"
-      sources."pbkdf2-3.0.17"
+      sources."pbkdf2-3.1.1"
       sources."performance-now-2.1.0"
+      sources."picomatch-2.2.2"
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
@@ -10976,10 +11129,10 @@ in
         ];
       })
       sources."pn-1.1.0"
-      (sources."portfinder-1.0.25" // {
+      (sources."portfinder-1.0.28" // {
         dependencies = [
-          sources."debug-3.2.6"
-          sources."ms-2.1.2"
+          sources."debug-3.2.7"
+          sources."ms-2.1.3"
         ];
       })
       sources."posix-character-classes-0.1.1"
@@ -10993,13 +11146,17 @@ in
       sources."process-nextick-args-2.0.1"
       sources."promise-7.3.1"
       sources."promise-inflight-1.0.1"
-      sources."prompts-2.3.1"
+      sources."prompts-2.4.0"
       sources."proto-list-1.2.4"
       sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.7.0"
-      sources."public-encrypt-4.0.3"
+      sources."psl-1.8.0"
+      (sources."public-encrypt-4.0.3" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."pug-2.0.4"
       sources."pug-attrs-2.0.4"
       sources."pug-code-gen-2.0.2"
@@ -11023,12 +11180,18 @@ in
       sources."query-string-5.1.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
-      sources."querystringify-2.1.1"
+      sources."querystringify-2.2.0"
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.1"
-      sources."react-is-16.13.0"
+      (sources."raw-body-2.4.1" // {
+        dependencies = [
+          sources."depd-1.1.2"
+          sources."http-errors-1.7.3"
+        ];
+      })
+      sources."react-is-16.13.1"
+      sources."react-zlib-js-1.0.5"
       sources."read-pkg-3.0.0"
       sources."read-pkg-up-4.0.0"
       (sources."readable-stream-2.3.7" // {
@@ -11036,10 +11199,10 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."readdirp-2.2.1"
+      sources."readdirp-3.5.0"
       sources."realpath-native-1.1.0"
       sources."rechoir-0.6.2"
-      sources."regenerate-1.4.0"
+      sources."regenerate-1.4.2"
       sources."regenerator-runtime-0.11.1"
       sources."regenerator-transform-0.10.1"
       (sources."regex-not-1.0.2" // {
@@ -11060,12 +11223,12 @@ in
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
       sources."request-2.88.2"
-      sources."request-promise-core-1.1.3"
-      sources."request-promise-native-1.0.8"
+      sources."request-promise-core-1.1.4"
+      sources."request-promise-native-1.0.9"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
-      sources."resolve-1.15.1"
+      sources."resolve-1.19.0"
       sources."resolve-cwd-2.0.0"
       (sources."resolve-dir-1.0.1" // {
         dependencies = [
@@ -11075,6 +11238,7 @@ in
       sources."resolve-from-3.0.0"
       (sources."resolve-path-1.4.0" // {
         dependencies = [
+          sources."depd-1.1.2"
           sources."http-errors-1.6.3"
           sources."inherits-2.0.3"
           sources."setprototypeof-1.1.0"
@@ -11090,21 +11254,17 @@ in
       sources."ripemd160-2.0.2"
       sources."rsvp-4.8.5"
       sources."run-queue-1.0.3"
-      sources."rxjs-6.5.4"
-      sources."safe-buffer-5.2.0"
+      sources."rxjs-6.6.3"
+      sources."safe-buffer-5.2.1"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      (sources."sane-4.1.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."sane-4.1.0"
       sources."sax-1.2.4"
       sources."schema-utils-1.0.0"
       sources."select-hose-2.0.0"
-      (sources."selfsigned-1.10.7" // {
+      (sources."selfsigned-1.10.8" // {
         dependencies = [
-          sources."node-forge-0.9.0"
+          sources."node-forge-0.10.0"
         ];
       })
       sources."semver-5.7.1"
@@ -11115,6 +11275,8 @@ in
               sources."ms-2.0.0"
             ];
           })
+          sources."depd-1.1.2"
+          sources."http-errors-1.7.3"
           sources."ms-2.1.1"
         ];
       })
@@ -11122,6 +11284,7 @@ in
       (sources."serve-index-1.9.1" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."depd-1.1.2"
           sources."http-errors-1.6.3"
           sources."inherits-2.0.3"
           sources."setprototypeof-1.1.0"
@@ -11135,12 +11298,12 @@ in
       sources."sha.js-2.4.11"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
-      sources."shelljs-0.8.3"
+      sources."shelljs-0.8.4"
       sources."shellwords-0.1.1"
       sources."sigmund-1.0.1"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.3"
       sources."simple-git-1.96.0"
-      sources."sisteransi-1.0.4"
+      sources."sisteransi-1.0.5"
       sources."slash-1.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -11167,33 +11330,32 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      sources."sockjs-0.3.19"
-      (sources."sockjs-client-1.4.0" // {
+      sources."sockjs-0.3.21"
+      (sources."sockjs-client-1.5.0" // {
         dependencies = [
-          sources."debug-3.2.6"
-          sources."faye-websocket-0.11.3"
-          sources."ms-2.1.2"
+          sources."debug-3.2.7"
+          sources."ms-2.1.3"
         ];
       })
       sources."sort-keys-2.0.0"
       sources."source-list-map-2.0.1"
       sources."source-map-0.6.1"
       sources."source-map-resolve-0.5.3"
-      sources."source-map-support-0.5.16"
+      sources."source-map-support-0.5.19"
       sources."source-map-url-0.4.0"
-      sources."spdx-correct-3.1.0"
-      sources."spdx-exceptions-2.2.0"
-      sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.5"
-      (sources."spdy-4.0.1" // {
+      sources."spdx-correct-3.1.1"
+      sources."spdx-exceptions-2.3.0"
+      sources."spdx-expression-parse-3.0.1"
+      sources."spdx-license-ids-3.0.7"
+      (sources."spdy-4.0.2" // {
         dependencies = [
-          sources."debug-4.1.1"
+          sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
       (sources."spdy-transport-3.0.0" // {
         dependencies = [
-          sources."debug-4.1.1"
+          sources."debug-4.3.2"
           sources."ms-2.1.2"
           sources."readable-stream-3.6.0"
         ];
@@ -11207,7 +11369,11 @@ in
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."ssri-5.3.0"
-      sources."stack-utils-1.0.2"
+      (sources."stack-utils-1.0.4" // {
+        dependencies = [
+          sources."escape-string-regexp-2.0.0"
+        ];
+      })
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -11239,8 +11405,8 @@ in
         ];
       })
       sources."string-width-3.1.0"
-      sources."string.prototype.trimleft-2.1.1"
-      sources."string.prototype.trimright-2.1.1"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -11252,27 +11418,27 @@ in
       sources."supports-color-5.5.0"
       sources."symbol-tree-3.2.4"
       sources."tapable-1.1.3"
-      sources."terser-4.6.6"
-      (sources."terser-webpack-plugin-1.4.3" // {
+      sources."terser-4.8.0"
+      (sources."terser-webpack-plugin-1.4.5" // {
         dependencies = [
-          sources."cacache-12.0.3"
+          sources."cacache-12.0.4"
           sources."find-cache-dir-2.1.0"
           sources."make-dir-2.1.0"
           sources."mississippi-3.0.0"
           sources."pify-4.0.1"
           sources."pkg-dir-3.0.0"
-          sources."serialize-javascript-2.1.2"
+          sources."serialize-javascript-4.0.0"
           sources."ssri-6.0.1"
         ];
       })
       sources."test-exclude-5.2.3"
-      sources."thenify-3.3.0"
+      sources."thenify-3.3.1"
       sources."thenify-all-1.6.0"
       sources."throat-4.1.0"
       sources."through2-2.0.5"
       sources."thunky-1.1.0"
       sources."timed-out-4.0.1"
-      sources."timers-browserify-2.0.11"
+      sources."timers-browserify-2.0.12"
       sources."tmpl-1.0.4"
       sources."to-arraybuffer-1.0.1"
       sources."to-fast-properties-1.0.3"
@@ -11293,12 +11459,11 @@ in
       (sources."ts-jest-24.3.0" // {
         dependencies = [
           sources."camelcase-4.1.0"
-          sources."json5-2.1.1"
-          sources."minimist-1.2.5"
+          sources."json5-2.1.3"
           sources."yargs-parser-10.1.0"
         ];
       })
-      sources."tslib-1.11.1"
+      sources."tslib-1.14.1"
       sources."tsscmp-1.0.6"
       sources."tty-browserify-0.0.0"
       sources."tunnel-agent-0.6.0"
@@ -11308,7 +11473,7 @@ in
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
-      sources."typescript-3.8.3"
+      sources."typescript-3.9.7"
       sources."typical-4.0.0"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
@@ -11316,7 +11481,7 @@ in
         ];
       })
       sources."uglify-to-browserify-1.0.2"
-      sources."underscore-1.9.2"
+      sources."underscore-1.12.0"
       sources."union-value-1.0.1"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
@@ -11332,8 +11497,8 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.2.2"
-      sources."urijs-1.19.2"
+      sources."uri-js-4.4.1"
+      sources."urijs-1.19.5"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -11344,16 +11509,17 @@ in
       sources."url-parse-lax-3.0.0"
       sources."url-to-options-1.0.1"
       sources."use-3.1.1"
+      sources."utf-8-validate-5.0.4"
       (sources."util-0.11.1" // {
         dependencies = [
           sources."inherits-2.0.3"
         ];
       })
       sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.0.1"
+      sources."util.promisify-1.1.1"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
-      sources."v8-compile-cache-2.0.3"
+      sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
@@ -11361,84 +11527,81 @@ in
       sources."void-elements-2.0.1"
       sources."w3c-hr-time-1.0.2"
       sources."walker-1.0.7"
-      sources."watchpack-1.6.0"
+      sources."watchpack-1.7.5"
+      (sources."watchpack-chokidar2-2.0.1" // {
+        dependencies = [
+          sources."binary-extensions-1.13.1"
+          sources."chokidar-2.1.8"
+          sources."glob-parent-3.1.0"
+          sources."is-binary-path-1.0.1"
+          sources."is-glob-3.1.0"
+          sources."normalize-path-3.0.0"
+          sources."readdirp-2.2.1"
+        ];
+      })
       sources."wbuf-1.7.3"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
-      (sources."webpack-4.42.0" // {
+      (sources."webpack-4.46.0" // {
         dependencies = [
-          sources."acorn-6.4.1"
+          sources."acorn-6.4.2"
           sources."memory-fs-0.4.1"
         ];
       })
-      (sources."webpack-bundle-analyzer-3.6.1" // {
+      (sources."webpack-bundle-analyzer-3.9.0" // {
         dependencies = [
-          sources."acorn-7.1.1"
-          sources."acorn-walk-7.1.1"
+          sources."acorn-7.4.1"
+          sources."acorn-walk-7.2.0"
         ];
       })
-      (sources."webpack-cli-3.3.11" // {
+      (sources."webpack-cli-3.3.12" // {
         dependencies = [
           sources."cliui-5.0.0"
-          sources."emojis-list-2.1.0"
-          sources."enhanced-resolve-4.1.0"
-          sources."loader-utils-1.2.3"
-          sources."memory-fs-0.4.1"
           sources."supports-color-6.1.0"
-          sources."yargs-13.2.4"
+          sources."yargs-13.3.2"
         ];
       })
-      (sources."webpack-dev-middleware-3.7.2" // {
+      (sources."webpack-dev-middleware-3.7.3" // {
         dependencies = [
           sources."memory-fs-0.4.1"
-          sources."mime-2.4.4"
+          sources."mime-2.5.0"
           sources."webpack-log-2.0.0"
         ];
       })
-      (sources."webpack-dev-server-3.10.3" // {
+      (sources."webpack-dev-server-3.11.2" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
-          sources."camelcase-5.3.1"
-          (sources."cliui-4.1.0" // {
+          sources."binary-extensions-1.13.1"
+          sources."chokidar-2.1.8"
+          (sources."cliui-5.0.0" // {
             dependencies = [
-              sources."ansi-regex-3.0.0"
-              sources."strip-ansi-4.0.0"
+              sources."ansi-regex-4.1.0"
+              sources."strip-ansi-5.2.0"
             ];
           })
-          sources."debug-4.1.1"
-          sources."get-caller-file-1.0.3"
-          sources."is-fullwidth-code-point-1.0.0"
+          sources."debug-4.3.2"
+          sources."glob-parent-3.1.0"
+          sources."is-binary-path-1.0.1"
+          sources."is-glob-3.1.0"
           sources."ms-2.1.2"
-          sources."require-main-filename-1.0.1"
+          sources."normalize-path-3.0.0"
+          sources."readdirp-2.2.1"
           sources."semver-6.3.0"
-          (sources."string-width-2.1.1" // {
-            dependencies = [
-              sources."ansi-regex-3.0.0"
-              sources."is-fullwidth-code-point-2.0.0"
-              sources."strip-ansi-4.0.0"
-            ];
-          })
           sources."strip-ansi-3.0.1"
           sources."supports-color-6.1.0"
           sources."webpack-log-2.0.0"
-          (sources."wrap-ansi-2.1.0" // {
-            dependencies = [
-              sources."string-width-1.0.2"
-            ];
-          })
-          sources."yargs-12.0.5"
-          sources."yargs-parser-11.1.1"
+          sources."yargs-13.3.2"
         ];
       })
       sources."webpack-log-1.2.0"
       sources."webpack-sources-1.4.3"
-      (sources."websocket-1.0.31" // {
+      (sources."websocket-1.0.33" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
       })
-      sources."websocket-driver-0.7.3"
-      sources."websocket-extensions-0.1.3"
+      sources."websocket-driver-0.7.4"
+      sources."websocket-extensions-0.1.4"
       sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
       sources."whatwg-url-6.5.0"
@@ -11455,7 +11618,7 @@ in
       sources."ws-6.2.1"
       sources."xml-name-validator-3.0.0"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.0"
+      sources."y18n-4.0.1"
       sources."yaeti-0.0.6"
       sources."yallist-3.1.1"
       sources."yargs-3.10.0"
diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix
index f6cfb2cd2e4..64326c6b216 100644
--- a/pkgs/applications/networking/n8n/node-composition.nix
+++ b/pkgs/applications/networking/n8n/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix
index 759fa71c5aa..c2b723195b7 100644
--- a/pkgs/applications/networking/n8n/node-env.nix
+++ b/pkgs/applications/networking/n8n/node-env.nix
@@ -1,8 +1,11 @@
 # This file originates from node2nix
 
-{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
 
 let
+  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
+  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
+
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -242,8 +245,8 @@ let
       if(fs.existsSync("./package-lock.json")) {
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-          if(packageLock.lockfileVersion !== 1) {
-             process.stderr.write("Sorry, I only understand lock file version 1!\n");
+          if(![1, 2].includes(packageLock.lockfileVersion)) {
+             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
              process.exit(1);
           }
 
@@ -445,8 +448,8 @@ let
       '';
     } // extraArgs);
 
-  # Builds a development shell
-  buildNodeShell =
+  # Builds a node environment (a node_modules folder and a set of binaries)
+  buildNodeDependencies =
     { name
     , packageName
     , version
@@ -465,8 +468,8 @@ let
 
     let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-
-      nodeDependencies = stdenv.mkDerivation ({
+    in
+      stdenv.mkDerivation ({
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
@@ -512,6 +515,27 @@ let
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
       } // extraArgs);
+
+  # Builds a development shell
+  buildNodeShell =
+    { name
+    , packageName
+    , version
+    , src
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , reconstructLock ? false
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
+    let
+      nodeDependencies = buildNodeDependencies args;
     in
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
@@ -538,5 +562,6 @@ in
 {
   buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
   buildNodePackage = lib.makeOverridable buildNodePackage;
+  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
   buildNodeShell = lib.makeOverridable buildNodeShell;
 }
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index 09d2fc5ccdf..6ed97952ff5 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -13,13 +13,13 @@ let
         sha512 = "l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA==";
       };
     };
-    "@azure/ms-rest-js-1.9.0" = {
+    "@azure/ms-rest-js-1.9.1" = {
       name = "_at_azure_slash_ms-rest-js";
       packageName = "@azure/ms-rest-js";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz";
-        sha512 = "cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA==";
+        url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.1.tgz";
+        sha512 = "F1crHKhmsvFLM9fsnDyCGFd2E2KR9GEZm5oBVV5D5k2EBQ7u7idtSJlSF6RDLDIrGWtc4NnFdYwsoiW8NLlBQg==";
       };
     };
     "@azure/ms-rest-nodeauth-2.0.2" = {
@@ -31,6 +31,15 @@ let
         sha512 = "KmNNICOxt3EwViAJI3iu2VH8t8BQg5J2rSAyO4IUYLF9ZwlyYsP419pdvl4NBUhluAP2cgN7dfD2V6E6NOMZlQ==";
       };
     };
+    "@dabh/diagnostics-2.0.2" = {
+      name = "_at_dabh_slash_diagnostics";
+      packageName = "@dabh/diagnostics";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz";
+        sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
+      };
+    };
     "@icetee/ftp-0.3.15" = {
       name = "_at_icetee_slash_ftp";
       packageName = "@icetee/ftp";
@@ -40,31 +49,31 @@ let
         sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg==";
       };
     };
-    "@nodelib/fs.scandir-2.1.3" = {
+    "@nodelib/fs.scandir-2.1.4" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
-        sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
+        sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
       };
     };
-    "@nodelib/fs.stat-2.0.3" = {
+    "@nodelib/fs.stat-2.0.4" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
-        sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
+        sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
       };
     };
-    "@nodelib/fs.walk-1.2.4" = {
+    "@nodelib/fs.walk-1.2.6" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.4";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
-        sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
+        sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
       };
     };
     "@oclif/command-1.8.0" = {
@@ -112,13 +121,13 @@ let
         sha512 = "yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg==";
       };
     };
-    "@oclif/plugin-help-3.2.0" = {
+    "@oclif/plugin-help-3.2.1" = {
       name = "_at_oclif_slash_plugin-help";
       packageName = "@oclif/plugin-help";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.0.tgz";
-        sha512 = "7jxtpwVWAVbp1r46ZnTK/uF+FeZc6y4p1XcGaIUuPAp7wx6NJhIRN/iMT9UfNFX/Cz7mq+OyJz+E+i0zrik86g==";
+        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.1.tgz";
+        sha512 = "vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ==";
       };
     };
     "@servie/events-1.0.0" = {
@@ -166,13 +175,13 @@ let
         sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
       };
     };
-    "@types/connect-3.4.33" = {
+    "@types/connect-3.4.34" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.33";
+      version = "3.4.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz";
-        sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz";
+        sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==";
       };
     };
     "@types/debug-4.1.5" = {
@@ -184,13 +193,13 @@ let
         sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==";
       };
     };
-    "@types/express-4.17.9" = {
+    "@types/express-4.17.11" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.9";
+      version = "4.17.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.9.tgz";
-        sha512 = "SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz";
+        sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==";
       };
     };
     "@types/express-jwt-0.0.42" = {
@@ -202,13 +211,13 @@ let
         sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==";
       };
     };
-    "@types/express-serve-static-core-4.17.14" = {
+    "@types/express-serve-static-core-4.17.18" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.14";
+      version = "4.17.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz";
-        sha512 = "uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
+        sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
       };
     };
     "@types/express-unless-0.5.1" = {
@@ -247,13 +256,13 @@ let
         sha512 = "9bVao7LvyorRGZCw0VmH/dr7Og+NdjYSsKAxB43OQoComFbBgsEpoR9JW6+qSq/ogwVBg8GI2MfAlk4SYI4OLg==";
       };
     };
-    "@types/mime-2.0.3" = {
+    "@types/mime-1.3.2" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
-      version = "2.0.3";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz";
-        sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==";
+        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
+        sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -265,22 +274,22 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/node-12.19.8" = {
+    "@types/node-12.19.15" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.19.8";
+      version = "12.19.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.19.8.tgz";
-        sha512 = "D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz";
+        sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==";
       };
     };
-    "@types/node-14.14.10" = {
+    "@types/node-14.14.22" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.10";
+      version = "14.14.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz";
-        sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
+        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
       };
     };
     "@types/node-8.10.66" = {
@@ -337,13 +346,22 @@ let
         sha512 = "sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw==";
       };
     };
-    "@types/serve-static-1.13.8" = {
+    "@types/serve-static-1.13.9" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.8";
+      version = "1.13.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz";
-        sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
+        sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
+      };
+    };
+    "@types/snowflake-sdk-1.5.1" = {
+      name = "_at_types_slash_snowflake-sdk";
+      packageName = "@types/snowflake-sdk";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.5.1.tgz";
+        sha512 = "0RPrY9NZZn3botFzmW+Yo7Qx8J0KbIRfrWOzVFqG9iN6qo9WfpZwoqApC8Y6y9htZBdpfAweeVQdyMOm6B8Z9w==";
       };
     };
     "@types/tough-cookie-2.3.7" = {
@@ -409,6 +427,24 @@ let
         sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
       };
     };
+    "agent-base-2.1.1" = {
+      name = "agent-base";
+      packageName = "agent-base";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz";
+        sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7";
+      };
+    };
+    "agent-base-4.3.0" = {
+      name = "agent-base";
+      packageName = "agent-base";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz";
+        sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==";
+      };
+    };
     "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
@@ -418,6 +454,15 @@ let
         sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
+    "amqplib-0.6.0" = {
+      name = "amqplib";
+      packageName = "amqplib";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amqplib/-/amqplib-0.6.0.tgz";
+        sha512 = "zXCh4jQ77TBZe1YtvZ1n7sUxnTjnNagpy8MVi2yc1ive239pS3iLwm4e4d5o4XZGx1BdTKQ/U0ZmaDU3c8MxYQ==";
+      };
+    };
     "ansi-escapes-4.3.1" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
@@ -445,15 +490,6 @@ let
         sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
       };
     };
-    "ansi-regex-4.1.0" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
-      };
-    };
     "ansi-regex-5.0.0" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
@@ -589,13 +625,67 @@ let
         sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
       };
     };
-    "assert-options-0.6.2" = {
+    "asn1.js-4.10.1" = {
+      name = "asn1.js";
+      packageName = "asn1.js";
+      version = "4.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
+        sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
+      };
+    };
+    "asn1.js-5.4.1" = {
+      name = "asn1.js";
+      packageName = "asn1.js";
+      version = "5.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz";
+        sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
+      };
+    };
+    "asn1.js-rfc2560-4.0.6" = {
+      name = "asn1.js-rfc2560";
+      packageName = "asn1.js-rfc2560";
+      version = "4.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-4.0.6.tgz";
+        sha512 = "ysf48ni+f/efNPilq4+ApbifUPcSW/xbDeQAh055I+grr2gXgNRQqHew7kkO70WSMQ2tEOURVwsK+dJqUNjIIg==";
+      };
+    };
+    "asn1.js-rfc2560-5.0.1" = {
+      name = "asn1.js-rfc2560";
+      packageName = "asn1.js-rfc2560";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-5.0.1.tgz";
+        sha512 = "1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA==";
+      };
+    };
+    "asn1.js-rfc5280-2.0.1" = {
+      name = "asn1.js-rfc5280";
+      packageName = "asn1.js-rfc5280";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-2.0.1.tgz";
+        sha512 = "1e2ypnvTbYD/GdxWK77tdLBahvo1fZUHlQJqAVUuZWdYj0rdjGcf2CWYUtbsyRYpYUMwMWLZFUtLxog8ZXTrcg==";
+      };
+    };
+    "asn1.js-rfc5280-3.0.0" = {
+      name = "asn1.js-rfc5280";
+      packageName = "asn1.js-rfc5280";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-3.0.0.tgz";
+        sha512 = "Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg==";
+      };
+    };
+    "assert-options-0.7.0" = {
       name = "assert-options";
       packageName = "assert-options";
-      version = "0.6.2";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz";
-        sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw==";
+        url = "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz";
+        sha512 = "7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ==";
       };
     };
     "assert-plus-1.0.0" = {
@@ -607,6 +697,15 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
+    "async-1.5.2" = {
+      name = "async";
+      packageName = "async";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+      };
+    };
     "async-3.2.0" = {
       name = "async";
       packageName = "async";
@@ -643,15 +742,6 @@ let
         sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
-    "axios-0.19.0" = {
-      name = "axios";
-      packageName = "axios";
-      version = "0.19.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz";
-        sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==";
-      };
-    };
     "axios-0.19.2" = {
       name = "axios";
       packageName = "axios";
@@ -661,6 +751,15 @@ let
         sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
       };
     };
+    "axios-0.21.1" = {
+      name = "axios";
+      packageName = "axios";
+      version = "0.21.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
+        sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
+      };
+    };
     "balanced-match-1.0.0" = {
       name = "balanced-match";
       packageName = "balanced-match";
@@ -706,6 +805,33 @@ let
         sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb";
       };
     };
+    "big-integer-1.6.48" = {
+      name = "big-integer";
+      packageName = "big-integer";
+      version = "1.6.48";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz";
+        sha512 = "j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==";
+      };
+    };
+    "bignumber.js-2.4.0" = {
+      name = "bignumber.js";
+      packageName = "bignumber.js";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz";
+        sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8";
+      };
+    };
+    "bitsyntax-0.1.0" = {
+      name = "bitsyntax";
+      packageName = "bitsyntax";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz";
+        sha512 = "ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q==";
+      };
+    };
     "bl-2.2.1" = {
       name = "bl";
       packageName = "bl";
@@ -742,6 +868,24 @@ let
         sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
       };
     };
+    "bluebird-3.7.2" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
+        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
+      };
+    };
+    "bn.js-4.11.9" = {
+      name = "bn.js";
+      packageName = "bn.js";
+      version = "4.11.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz";
+        sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==";
+      };
+    };
     "body-parser-1.19.0" = {
       name = "body-parser";
       packageName = "body-parser";
@@ -787,6 +931,15 @@ let
         sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
       };
     };
+    "browser-request-0.3.3" = {
+      name = "browser-request";
+      packageName = "browser-request";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
+        sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17";
+      };
+    };
     "bson-1.1.5" = {
       name = "bson";
       packageName = "bson";
@@ -823,6 +976,15 @@ let
         sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
       };
     };
+    "buffer-more-ints-1.0.0" = {
+      name = "buffer-more-ints";
+      packageName = "buffer-more-ints";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz";
+        sha512 = "EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==";
+      };
+    };
     "buffer-writer-2.0.0" = {
       name = "buffer-writer";
       packageName = "buffer-writer";
@@ -859,6 +1021,15 @@ let
         sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
       };
     };
+    "cacheable-lookup-5.0.4" = {
+      name = "cacheable-lookup";
+      packageName = "cacheable-lookup";
+      version = "5.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz";
+        sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==";
+      };
+    };
     "callback-stream-1.1.0" = {
       name = "callback-stream";
       packageName = "callback-stream";
@@ -967,13 +1138,22 @@ let
         sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
       };
     };
-    "cheerio-1.0.0-rc.3" = {
+    "cheerio-1.0.0-rc.5" = {
       name = "cheerio";
       packageName = "cheerio";
-      version = "1.0.0-rc.3";
+      version = "1.0.0-rc.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz";
-        sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==";
+        url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz";
+        sha512 = "yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==";
+      };
+    };
+    "cheerio-select-tmp-0.1.1" = {
+      name = "cheerio-select-tmp";
+      packageName = "cheerio-select-tmp";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz";
+        sha512 = "YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ==";
       };
     };
     "chownr-1.1.4" = {
@@ -1003,13 +1183,13 @@ let
         sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==";
       };
     };
-    "cli-highlight-2.1.9" = {
+    "cli-highlight-2.1.10" = {
       name = "cli-highlight";
       packageName = "cli-highlight";
-      version = "2.1.9";
+      version = "2.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.9.tgz";
-        sha512 = "t8RNIZgiI24i/mslZ8XT8o660RUj5ZbUJpEZrZa/BNekTzdC2LfMRAnt0Y7sgzNM4FGW5tmWg/YnbTH8o1eIOQ==";
+        url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.10.tgz";
+        sha512 = "CcPFD3JwdQ2oSzy+AMG6j3LRTkNjM82kzcSKzoVw6cLanDCJNlsLjeqVTOTfOfucnWv5F0rmBemVf1m9JiIasw==";
       };
     };
     "cli-width-3.0.0" = {
@@ -1030,24 +1210,6 @@ let
         sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q==";
       };
     };
-    "cliui-5.0.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
-        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
-      };
-    };
-    "cliui-6.0.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz";
-        sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==";
-      };
-    };
     "cliui-7.0.4" = {
       name = "cliui";
       packageName = "cliui";
@@ -1138,6 +1300,15 @@ let
         sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96";
       };
     };
+    "colors-1.4.0" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz";
+        sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==";
+      };
+    };
     "colorspace-1.1.2" = {
       name = "colorspace";
       packageName = "colorspace";
@@ -1354,22 +1525,22 @@ let
         sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w==";
       };
     };
-    "css-select-1.2.0" = {
+    "css-select-3.1.2" = {
       name = "css-select";
       packageName = "css-select";
-      version = "1.2.0";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
-        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
+        url = "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz";
+        sha512 = "qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==";
       };
     };
-    "css-what-2.1.3" = {
+    "css-what-4.0.0" = {
       name = "css-what";
       packageName = "css-what";
-      version = "2.1.3";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
-        sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
+        url = "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz";
+        sha512 = "teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==";
       };
     };
     "d-1.0.1" = {
@@ -1426,15 +1597,6 @@ let
         sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
-    "debug-4.1.1" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
-        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
-      };
-    };
     "debug-4.3.1" = {
       name = "debug";
       packageName = "debug";
@@ -1444,6 +1606,15 @@ let
         sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
       };
     };
+    "debug-4.3.2" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
+        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
+      };
+    };
     "decamelize-1.2.0" = {
       name = "decamelize";
       packageName = "decamelize";
@@ -1480,13 +1651,13 @@ let
         sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
       };
     };
-    "denque-1.4.1" = {
+    "denque-1.5.0" = {
       name = "denque";
       packageName = "denque";
-      version = "1.4.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
-        sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==";
+        url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz";
+        sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==";
       };
     };
     "depd-1.1.2" = {
@@ -1543,13 +1714,22 @@ let
         sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
       };
     };
-    "dom-serializer-0.1.1" = {
+    "dom-serializer-0.2.2" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
-      version = "0.1.1";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz";
-        sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==";
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz";
+        sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
+      };
+    };
+    "dom-serializer-1.2.0" = {
+      name = "dom-serializer";
+      packageName = "dom-serializer";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz";
+        sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==";
       };
     };
     "domelementtype-1.3.1" = {
@@ -1561,6 +1741,15 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
+    "domelementtype-2.1.0" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
+        sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
+      };
+    };
     "domhandler-2.4.2" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -1570,13 +1759,31 @@ let
         sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
       };
     };
-    "domutils-1.5.1" = {
+    "domhandler-4.0.0" = {
+      name = "domhandler";
+      packageName = "domhandler";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz";
+        sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==";
+      };
+    };
+    "domutils-1.7.0" = {
       name = "domutils";
       packageName = "domutils";
-      version = "1.5.1";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
-        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz";
+        sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
+      };
+    };
+    "domutils-2.4.4" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "2.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz";
+        sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==";
       };
     };
     "dot-case-3.0.4" = {
@@ -1642,15 +1849,6 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "emoji-regex-7.0.3" = {
-      name = "emoji-regex";
-      packageName = "emoji-regex";
-      version = "7.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
-        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
-      };
-    };
     "emoji-regex-8.0.0" = {
       name = "emoji-regex";
       packageName = "emoji-regex";
@@ -1669,6 +1867,15 @@ let
         sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93";
       };
     };
+    "enabled-2.0.0" = {
+      name = "enabled";
+      packageName = "enabled";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz";
+        sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==";
+      };
+    };
     "encodeurl-1.0.2" = {
       name = "encodeurl";
       packageName = "encodeurl";
@@ -1750,6 +1957,24 @@ let
         sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
       };
     };
+    "es6-promise-4.2.8" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
+        sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
+      };
+    };
+    "es6-promisify-5.0.0" = {
+      name = "es6-promisify";
+      packageName = "es6-promisify";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
+        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
+      };
+    };
     "es6-set-0.1.5" = {
       name = "es6-set";
       packageName = "es6-set";
@@ -1921,13 +2146,13 @@ let
         sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
       };
     };
-    "fast-glob-3.2.4" = {
+    "fast-glob-3.2.5" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.4";
+      version = "3.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz";
-        sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
+        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
       };
     };
     "fast-json-stable-stringify-2.1.0" = {
@@ -1939,13 +2164,31 @@ let
         sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
-    "fastq-1.9.0" = {
+    "fast-safe-stringify-2.0.7" = {
+      name = "fast-safe-stringify";
+      packageName = "fast-safe-stringify";
+      version = "2.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz";
+        sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
+      };
+    };
+    "fastq-1.10.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.9.0";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz";
-        sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
+        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
+      };
+    };
+    "fecha-4.2.0" = {
+      name = "fecha";
+      packageName = "fecha";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz";
+        sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==";
       };
     };
     "fflate-0.3.11" = {
@@ -2002,24 +2245,6 @@ let
         sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
       };
     };
-    "find-up-3.0.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
-        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
-      };
-    };
-    "find-up-4.1.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
-        sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
-      };
-    };
     "flatted-2.0.2" = {
       name = "flatted";
       packageName = "flatted";
@@ -2029,6 +2254,24 @@ let
         sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
       };
     };
+    "fn.name-1.1.0" = {
+      name = "fn.name";
+      packageName = "fn.name";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz";
+        sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
+      };
+    };
+    "follow-redirects-1.13.1" = {
+      name = "follow-redirects";
+      packageName = "follow-redirects";
+      version = "1.13.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz";
+        sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==";
+      };
+    };
     "follow-redirects-1.5.10" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -2209,13 +2452,13 @@ let
         sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
       };
     };
-    "globby-11.0.1" = {
+    "globby-11.0.2" = {
       name = "globby";
       packageName = "globby";
-      version = "11.0.1";
+      version = "11.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz";
-        sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==";
+        url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz";
+        sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==";
       };
     };
     "gm-1.23.1" = {
@@ -2326,13 +2569,13 @@ let
         sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
-    "highlight.js-10.4.1" = {
+    "highlight.js-10.5.0" = {
       name = "highlight.js";
       packageName = "highlight.js";
-      version = "10.4.1";
+      version = "10.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz";
-        sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.5.0.tgz";
+        sha512 = "xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw==";
       };
     };
     "html-to-text-5.1.1" = {
@@ -2353,6 +2596,15 @@ let
         sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==";
       };
     };
+    "htmlparser2-6.0.0" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz";
+        sha512 = "numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw==";
+      };
+    };
     "http-errors-1.7.2" = {
       name = "http-errors";
       packageName = "http-errors";
@@ -2371,6 +2623,15 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
+    "https-proxy-agent-3.0.1" = {
+      name = "https-proxy-agent";
+      packageName = "https-proxy-agent";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz";
+        sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==";
+      };
+    };
     "iconv-lite-0.4.24" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
@@ -2488,13 +2749,13 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.5" = {
+    "ini-1.3.8" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.5";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
+        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
     "inquirer-7.3.3" = {
@@ -2542,15 +2803,6 @@ let
         sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==";
       };
     };
-    "is-buffer-2.0.5" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz";
-        sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==";
-      };
-    };
     "is-docker-2.1.1" = {
       name = "is-docker";
       packageName = "is-docker";
@@ -2659,6 +2911,15 @@ let
         sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==";
       };
     };
+    "is-stream-2.0.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
+        sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
+      };
+    };
     "is-typedarray-1.0.0" = {
       name = "is-typedarray";
       packageName = "is-typedarray";
@@ -2722,13 +2983,13 @@ let
         sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
-    "iso-639-1-2.1.4" = {
+    "iso-639-1-2.1.7" = {
       name = "iso-639-1";
       packageName = "iso-639-1";
-      version = "2.1.4";
+      version = "2.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.4.tgz";
-        sha512 = "pwJRHnpz1sCR5saQ+Hm1E2YESw2eLGKP5TzsYKXuQ7SIfvKWMRb9CHhptqunYpCIcRCpq3LgLuhYG5hiLPRbFQ==";
+        url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.7.tgz";
+        sha512 = "vPBh9Exxv0c430dRYiKtRt6TgErlsKy22Nkz473HFkzRkWTZeM7RLfX2raDoD7g74kA7HB4S2giwu6ZwiisQtg==";
       };
     };
     "isstream-0.1.2" = {
@@ -2740,13 +3001,13 @@ let
         sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     };
-    "js-yaml-3.14.0" = {
+    "js-yaml-3.14.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.0";
+      version = "3.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
-        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
+        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
       };
     };
     "jsbi-3.1.4" = {
@@ -2884,6 +3145,15 @@ let
         sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==";
       };
     };
+    "kuler-2.0.0" = {
+      name = "kuler";
+      packageName = "kuler";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz";
+        sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==";
+      };
+    };
     "leven-2.1.0" = {
       name = "leven";
       packageName = "leven";
@@ -2947,31 +3217,13 @@ let
         sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==";
       };
     };
-    "localtunnel-2.0.0" = {
+    "localtunnel-2.0.1" = {
       name = "localtunnel";
       packageName = "localtunnel";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.0.tgz";
-        sha512 = "g6E0aLgYYDvQDxIjIXkgJo2+pHj3sGg4Wz/XP3h2KtZnRsWPbOQY+hw1H8Z91jep998fkcVE9l+kghO+97vllg==";
-      };
-    };
-    "locate-path-3.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
-        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
-      };
-    };
-    "locate-path-5.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
-        sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
+        url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.1.tgz";
+        sha512 = "LiaI5wZdz0xFkIQpXbNI62ZnNn8IMsVhwxHmhA+h4vj8R9JG/07bQHWwQlyy7b95/5fVOCHJfIHv+a5XnkvaJA==";
       };
     };
     "lodash-4.17.20" = {
@@ -3109,6 +3361,15 @@ let
         sha1 = "370d1d3e85b72a7e1b0cdf2d272121306f23e4ed";
       };
     };
+    "logform-2.2.0" = {
+      name = "logform";
+      packageName = "logform";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz";
+        sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";
+      };
+    };
     "long-4.0.0" = {
       name = "long";
       packageName = "long";
@@ -3163,13 +3424,13 @@ let
         sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
       };
     };
-    "lru-memoizer-2.1.2" = {
+    "lru-memoizer-2.1.4" = {
       name = "lru-memoizer";
       packageName = "lru-memoizer";
-      version = "2.1.2";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.2.tgz";
-        sha512 = "N5L5xlnVcbIinNn/TJ17vHBZwBMt9t7aJDz2n97moWubjNl6VO9Ao2XuAGBBddkYdjrwR9HfzXbT6NfMZXAZ/A==";
+        url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz";
+        sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==";
       };
     };
     "mailparser-2.8.1" = {
@@ -3280,22 +3541,22 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.44.0" = {
+    "mime-db-1.45.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.44.0";
+      version = "1.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
-        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
+        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
       };
     };
-    "mime-types-2.1.27" = {
+    "mime-types-2.1.28" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.27";
+      version = "2.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
-        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
+        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
       };
     };
     "mimic-fn-2.1.0" = {
@@ -3307,6 +3568,15 @@ let
         sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
       };
     };
+    "minimalistic-assert-1.0.1" = {
+      name = "minimalistic-assert";
+      packageName = "minimalistic-assert";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
+        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
+      };
+    };
     "minimatch-3.0.4" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -3406,13 +3676,13 @@ let
         sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg==";
       };
     };
-    "mqtt-packet-6.6.0" = {
+    "mqtt-packet-6.7.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "6.6.0";
+      version = "6.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.6.0.tgz";
-        sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ==";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.7.0.tgz";
+        sha512 = "GzgeeCirQpB59FyhHvf8BLiIYgxctPSxuSyaF2vWnkt7paX7jtuQ8Gpl+DkHCxZmYuv7GQE6zcUAegpafd0MqQ==";
       };
     };
     "ms-2.0.0" = {
@@ -3442,13 +3712,13 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
-    "mssql-6.2.3" = {
+    "mssql-6.3.1" = {
       name = "mssql";
       packageName = "mssql";
-      version = "6.2.3";
+      version = "6.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mssql/-/mssql-6.2.3.tgz";
-        sha512 = "4TW/fA9UgzmVTNgjl65r6ISr6aL5QHnlptEt1A3jIpdzkNbFPIkRbUNz90324HIdE+5pKc3VqikOImcTrhd4og==";
+        url = "https://registry.npmjs.org/mssql/-/mssql-6.3.1.tgz";
+        sha512 = "ammxrhbdDpcBWhiZLiy6miiU7ELt9qFbGvwmPbiufn+tBHAYUFR/AgwE4/v4jzPzbatowscmhFx1U61L91uVzQ==";
       };
     };
     "mute-stream-0.0.8" = {
@@ -3478,40 +3748,40 @@ let
         sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
-    "n8n-core-0.54.0" = {
+    "n8n-core-0.59.0" = {
       name = "n8n-core";
       packageName = "n8n-core";
-      version = "0.54.0";
+      version = "0.59.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.54.0.tgz";
-        sha512 = "07Fts2MSm5acbsFPEVU7RXx38K5ryGVy6OE1g+Nbr8B0LuQiTEhCzC7x+AIfFDQlt/cQQEiPejaBGDZZm0kdpA==";
+        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.59.0.tgz";
+        sha512 = "fpAyG7bHHp1cdnVguLEu6AJ/UjKDzFH84PYxXnj9k18nDJoI0sMBRCXQCB5W2lNdnfp8Hq1fKpAuFrn2PARz9Q==";
       };
     };
-    "n8n-editor-ui-0.66.0" = {
+    "n8n-editor-ui-0.72.0" = {
       name = "n8n-editor-ui";
       packageName = "n8n-editor-ui";
-      version = "0.66.0";
+      version = "0.72.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.66.0.tgz";
-        sha512 = "BZTaiYffZ2+dbPOp0JjV+pZ4S7iD7r2oYTylwFbNRpEbIc4a0l8JbU0HRqHESdPR3yYDdUTmVXqk1fWfc8IgYw==";
+        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.72.0.tgz";
+        sha512 = "O3ZdlQtOvR9HXYwiXGpiD6rxIQL89gTwluOiTwY5G/9BoqrWnmt3U1mNjmVkKrA4CzSDlRYe7gyVfRri7E6n9w==";
       };
     };
-    "n8n-nodes-base-0.91.0" = {
+    "n8n-nodes-base-0.98.1" = {
       name = "n8n-nodes-base";
       packageName = "n8n-nodes-base";
-      version = "0.91.0";
+      version = "0.98.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.91.0.tgz";
-        sha512 = "75DVfQS/AkZBB6lIAAWHhM4wRkhHXCNf/30Fi0Cc+cihw7GW3O4bdXNhZKFwDTf70DYNATM0kBBEbSHvQusuCw==";
+        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.98.1.tgz";
+        sha512 = "NmKjzGypIR63AjnYA9tI+2mNvJes1ONPRrAaE9r9EYLE91Zzw58GKNRUh1UcSR754y3ha//9TAtkL2j9MTXiKA==";
       };
     };
-    "n8n-workflow-0.47.0" = {
+    "n8n-workflow-0.48.0" = {
       name = "n8n-workflow";
       packageName = "n8n-workflow";
-      version = "0.47.0";
+      version = "0.48.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.47.0.tgz";
-        sha512 = "1CbSOvVSf1KNM5izOEVsuMMEkuwiqezVH4hWS1Ts7pSdgSi8TrFCi4CE1J8qA0KBmWq5APh3vEJGFyvkLX6BOg==";
+        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.48.0.tgz";
+        sha512 = "3L1PM30NR3tpUNhUGI+eNI8smNEmxo+V5Vy+twqwM2d9hLA08ur1lwIqEQRzPnEMwLUtFohKuT5zN2bi1CNg+w==";
       };
     };
     "named-placeholders-1.1.2" = {
@@ -3541,13 +3811,13 @@ let
         sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0";
       };
     };
-    "needle-2.5.2" = {
+    "needle-2.6.0" = {
       name = "needle";
       packageName = "needle";
-      version = "2.5.2";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz";
-        sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
+        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
       };
     };
     "negotiator-0.6.2" = {
@@ -3613,13 +3883,13 @@ let
         sha512 = "BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ==";
       };
     };
-    "nodemailer-6.4.16" = {
+    "nodemailer-6.4.17" = {
       name = "nodemailer";
       packageName = "nodemailer";
-      version = "6.4.16";
+      version = "6.4.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.16.tgz";
-        sha512 = "68K0LgZ6hmZ7PVmwL78gzNdjpj5viqBdFqKrTtr9bZbJYj6BRj5W6WGkxXrEnUl3Co3CBXi3CZBUlpV/foGnOQ==";
+        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.17.tgz";
+        sha512 = "89ps+SBGpo0D4Bi5ZrxcrCiRFaMmkCt+gItMXQGzEtZVR3uAD3QAQIDoxTWnx3ky0Dwwy/dhFrQ+6NNGXpw/qQ==";
       };
     };
     "nopt-4.0.3" = {
@@ -3667,13 +3937,13 @@ let
         sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
       };
     };
-    "nth-check-1.0.2" = {
+    "nth-check-2.0.0" = {
       name = "nth-check";
       packageName = "nth-check";
-      version = "1.0.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz";
-        sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==";
+        url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz";
+        sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -3712,6 +3982,15 @@ let
         sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
+    "ocsp-1.2.0" = {
+      name = "ocsp";
+      packageName = "ocsp";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ocsp/-/ocsp-1.2.0.tgz";
+        sha1 = "469a1776b457dee67eb0201408c1946bac4076cc";
+      };
+    };
     "on-finished-2.3.0" = {
       name = "on-finished";
       packageName = "on-finished";
@@ -3739,6 +4018,15 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
+    "one-time-1.0.0" = {
+      name = "one-time";
+      packageName = "one-time";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz";
+        sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==";
+      };
+    };
     "onetime-5.1.2" = {
       name = "onetime";
       packageName = "onetime";
@@ -3748,13 +4036,13 @@ let
         sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
       };
     };
-    "open-7.3.0" = {
+    "open-7.3.1" = {
       name = "open";
       packageName = "open";
-      version = "7.3.0";
+      version = "7.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz";
-        sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==";
+        url = "https://registry.npmjs.org/open/-/open-7.3.1.tgz";
+        sha512 = "f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==";
       };
     };
     "openurl-1.1.1" = {
@@ -3820,42 +4108,6 @@ let
         sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==";
       };
     };
-    "p-limit-2.3.0" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
-        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
-      };
-    };
-    "p-locate-3.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
-        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
-      };
-    };
-    "p-locate-4.1.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
-        sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
-      };
-    };
-    "p-try-2.2.0" = {
-      name = "p-try";
-      packageName = "p-try";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
-      };
-    };
     "packet-reader-1.0.0" = {
       name = "packet-reader";
       packageName = "packet-reader";
@@ -3883,15 +4135,6 @@ let
         sha1 = "746a167638083a860b0eef6732cb27ed46c32977";
       };
     };
-    "parse5-3.0.3" = {
-      name = "parse5";
-      packageName = "parse5";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz";
-        sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==";
-      };
-    };
     "parse5-5.1.1" = {
       name = "parse5";
       packageName = "parse5";
@@ -3955,24 +4198,6 @@ let
         sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
-    "path-exists-3.0.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
-        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
-      };
-    };
-    "path-exists-4.0.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
-        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
-      };
-    };
     "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
@@ -4009,13 +4234,13 @@ let
         sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A==";
       };
     };
-    "peek-readable-3.1.0" = {
+    "peek-readable-3.1.3" = {
       name = "peek-readable";
       packageName = "peek-readable";
-      version = "3.1.0";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.0.tgz";
-        sha512 = "KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA==";
+        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz";
+        sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg==";
       };
     };
     "performance-now-2.1.0" = {
@@ -4054,13 +4279,13 @@ let
         sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==";
       };
     };
-    "pg-minify-1.6.1" = {
+    "pg-minify-1.6.2" = {
       name = "pg-minify";
       packageName = "pg-minify";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz";
-        sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g==";
+        url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz";
+        sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==";
       };
     };
     "pg-pool-3.2.2" = {
@@ -4072,13 +4297,13 @@ let
         sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==";
       };
     };
-    "pg-promise-10.8.1" = {
+    "pg-promise-10.9.1" = {
       name = "pg-promise";
       packageName = "pg-promise";
-      version = "10.8.1";
+      version = "10.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.8.1.tgz";
-        sha512 = "xRW3PBopAAPlSmOutfpxwrd0i1wfiVoJjkRC2xYzwk0PwWGLEOVKoDEHX4VoqjfIJ+SEEiILy5B5nUVvXpFFVA==";
+        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.9.1.tgz";
+        sha512 = "Om5sYmsm2NWXP+D0Soappb4fuidER9qNLcnVo9nBPFqwPfpnBZZPzzLaVvwBXs//+kJ9L4bBTXm2iWNAp39e2A==";
       };
     };
     "pg-protocol-1.4.0" = {
@@ -4153,13 +4378,13 @@ let
         sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA==";
       };
     };
-    "popsicle-transport-http-1.0.9" = {
+    "popsicle-transport-http-1.1.1" = {
       name = "popsicle-transport-http";
       packageName = "popsicle-transport-http";
-      version = "1.0.9";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.0.9.tgz";
-        sha512 = "55Os0JdCs35FI8cAsgMoKG6XXKR4Wh8qZIbL3rY5+IZqqjMIo3/3q3wSE98mUhHyLgjg9HQ6ep5wNfhbYCI7GQ==";
+        url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.1.1.tgz";
+        sha512 = "RNbifrl5ckXLk1X6YGhjDb0gL5yAH1nvultmboiVGLTnWDbwaoxhEP8He9epMFOPuSDuNJ//TMRoN+XfpN0KCw==";
       };
     };
     "popsicle-transport-xhr-2.0.0" = {
@@ -4522,6 +4747,15 @@ let
         sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
       };
     };
+    "requestretry-4.1.2" = {
+      name = "requestretry";
+      packageName = "requestretry";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz";
+        sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA==";
+      };
+    };
     "require-directory-2.1.1" = {
       name = "require-directory";
       packageName = "require-directory";
@@ -4531,15 +4765,6 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
-    "require-main-filename-2.0.0" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
-        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
-      };
-    };
     "require_optional-1.0.1" = {
       name = "require_optional";
       packageName = "require_optional";
@@ -4639,13 +4864,13 @@ let
         sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c";
       };
     };
-    "rss-parser-3.9.0" = {
+    "rss-parser-3.10.0" = {
       name = "rss-parser";
       packageName = "rss-parser";
-      version = "3.9.0";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.9.0.tgz";
-        sha512 = "wlRSfGrotOXuWo19Dtl2KmQt7o9i5zzCExUrxpechE0O54BAx7JD+xhWyGumPPqiJj771ndflV3sE3bTHen0HQ==";
+        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.10.0.tgz";
+        sha512 = "TC6FNvEmdFeaW6r/60MSJT7cp4d95X4M9As+mvNtxRx7YXHxpV95syMnWZthZSeD1BRN7SEKdq6c3nxMLQRopw==";
       };
     };
     "run-async-2.4.1" = {
@@ -4720,6 +4945,15 @@ let
         sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
       };
     };
+    "semver-5.0.3" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
+        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
+      };
+    };
     "semver-5.3.0" = {
       name = "semver";
       packageName = "semver";
@@ -4837,6 +5071,15 @@ let
         sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
+    "simple-lru-cache-0.0.2" = {
+      name = "simple-lru-cache";
+      packageName = "simple-lru-cache";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
+        sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
+      };
+    };
     "simple-swizzle-0.2.2" = {
       name = "simple-swizzle";
       packageName = "simple-swizzle";
@@ -4864,6 +5107,15 @@ let
         sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==";
       };
     };
+    "snowflake-sdk-1.5.3" = {
+      name = "snowflake-sdk";
+      packageName = "snowflake-sdk";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.5.3.tgz";
+        sha512 = "Env7ebuWyaPWLIsGbFf/AH8IdeSCshAfHg9cH6F9AHAG0uwtJEO4XPdNeOkxyV/xjykx69s1L4mHWwPksgj8VA==";
+      };
+    };
     "sparse-bitfield-3.0.3" = {
       name = "sparse-bitfield";
       packageName = "sparse-bitfield";
@@ -4873,13 +5125,13 @@ let
         sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11";
       };
     };
-    "spex-3.0.2" = {
+    "spex-3.2.0" = {
       name = "spex";
       packageName = "spex";
-      version = "3.0.2";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spex/-/spex-3.0.2.tgz";
-        sha512 = "ZNCrOso+oNv5P01HCO4wuxV9Og5rS6ms7gGAqugfBPjx1QwfNXJI3T02ldfaap1O0dlT1sB0Rk+mhDqxt3Z27w==";
+        url = "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz";
+        sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg==";
       };
     };
     "split2-3.2.2" = {
@@ -4981,6 +5233,15 @@ let
         sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
+    "stack-trace-0.0.10" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
+        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
+      };
+    };
     "statuses-1.5.0" = {
       name = "statuses";
       packageName = "statuses";
@@ -5035,15 +5296,6 @@ let
         sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
-    "string-width-3.1.0" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
-        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
-      };
-    };
     "string-width-4.2.0" = {
       name = "string-width";
       packageName = "string-width";
@@ -5089,15 +5341,6 @@ let
         sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
       };
     };
-    "strip-ansi-5.2.0" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
-        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
-      };
-    };
     "strip-ansi-6.0.0" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
@@ -5116,13 +5359,13 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "strtok3-6.0.4" = {
+    "strtok3-6.0.8" = {
       name = "strtok3";
       packageName = "strtok3";
-      version = "6.0.4";
+      version = "6.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.4.tgz";
-        sha512 = "rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ==";
+        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz";
+        sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw==";
       };
     };
     "supports-color-2.0.0" = {
@@ -5305,13 +5548,13 @@ let
         sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
       };
     };
-    "token-types-2.0.0" = {
+    "token-types-2.1.1" = {
       name = "token-types";
       packageName = "token-types";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz";
-        sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw==";
+        url = "https://registry.npmjs.org/token-types/-/token-types-2.1.1.tgz";
+        sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q==";
       };
     };
     "tough-cookie-2.5.0" = {
@@ -5332,6 +5575,15 @@ let
         sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==";
       };
     };
+    "triple-beam-1.3.0" = {
+      name = "triple-beam";
+      packageName = "triple-beam";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz";
+        sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==";
+      };
+    };
     "ts-expect-1.1.0" = {
       name = "ts-expect";
       packageName = "ts-expect";
@@ -5359,13 +5611,13 @@ let
         sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
-    "tslib-2.0.3" = {
+    "tslib-2.1.0" = {
       name = "tslib";
       packageName = "tslib";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz";
-        sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz";
+        sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==";
       };
     };
     "tsscmp-1.0.6" = {
@@ -5458,13 +5710,13 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typeorm-0.2.29" = {
+    "typeorm-0.2.30" = {
       name = "typeorm";
       packageName = "typeorm";
-      version = "0.2.29";
+      version = "0.2.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.29.tgz";
-        sha512 = "ih1vrTe3gEAGKRcWlcsTRxTL7gNjacQE498wVGuJ3ZRujtMqPZlbAWuC7xDzWCRjQnkZYNwZQeG9UgKfxSHB5g==";
+        url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.30.tgz";
+        sha512 = "qpr8AO3Phi6ZF7qMHOrRdNisVt8jE1KfmW0ooLFcXscA87aJ12aBPyB9cJfxGNjNwd7B3WIK9ZlBveWiqd74QA==";
       };
     };
     "uc.micro-1.0.6" = {
@@ -5548,13 +5800,13 @@ let
         sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==";
       };
     };
-    "uri-js-4.4.0" = {
+    "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
-        sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
+        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     };
     "url-parse-1.4.7" = {
@@ -5656,6 +5908,15 @@ let
         sha512 = "nzyFmHdy2FMg7mYraRytc2jr4QBaUY3TEGe3q3bK8EgS9WC98wxn2jrPxS/ruWm+JGzrEIIeufKweQzVoQEd+Q==";
       };
     };
+    "when-3.7.8" = {
+      name = "when";
+      packageName = "when";
+      version = "3.7.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz";
+        sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82";
+      };
+    };
     "which-1.3.1" = {
       name = "which";
       packageName = "which";
@@ -5665,15 +5926,6 @@ let
         sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
       };
     };
-    "which-module-2.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
-        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
-      };
-    };
     "wide-align-1.1.3" = {
       name = "wide-align";
       packageName = "wide-align";
@@ -5692,6 +5944,24 @@ let
         sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==";
       };
     };
+    "winston-3.3.3" = {
+      name = "winston";
+      packageName = "winston";
+      version = "3.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz";
+        sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==";
+      };
+    };
+    "winston-transport-4.4.0" = {
+      name = "winston-transport";
+      packageName = "winston-transport";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz";
+        sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==";
+      };
+    };
     "wmf-1.0.2" = {
       name = "wmf";
       packageName = "wmf";
@@ -5719,24 +5989,6 @@ let
         sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==";
       };
     };
-    "wrap-ansi-5.1.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
-        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
-      };
-    };
-    "wrap-ansi-6.2.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "6.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz";
-        sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==";
-      };
-    };
     "wrap-ansi-7.0.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -5755,13 +6007,13 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "ws-7.4.1" = {
+    "ws-7.4.2" = {
       name = "ws";
       packageName = "ws";
-      version = "7.4.1";
+      version = "7.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz";
-        sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==";
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz";
+        sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==";
       };
     };
     "xlsx-0.16.9" = {
@@ -5827,15 +6079,6 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.1" = {
-      name = "y18n";
-      packageName = "y18n";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
-        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
-      };
-    };
     "y18n-5.0.5" = {
       name = "y18n";
       packageName = "y18n";
@@ -5881,31 +6124,13 @@ let
         sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==";
       };
     };
-    "yargs-13.3.0" = {
+    "yargs-16.2.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "13.3.0";
+      version = "16.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
-        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
-      };
-    };
-    "yargs-15.4.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "15.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz";
-        sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==";
-      };
-    };
-    "yargs-16.1.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "16.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz";
-        sha512 = "hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz";
+        sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==";
       };
     };
     "yargs-parser-13.0.0" = {
@@ -5917,24 +6142,6 @@ let
         sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==";
       };
     };
-    "yargs-parser-13.1.2" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "13.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
-        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
-      };
-    };
-    "yargs-parser-18.1.3" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "18.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz";
-        sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
-      };
-    };
     "yargs-parser-20.2.4" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -5950,19 +6157,22 @@ in
   n8n = nodeEnv.buildNodePackage {
     name = "n8n";
     packageName = "n8n";
-    version = "0.96.0";
+    version = "0.103.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/n8n/-/n8n-0.96.0.tgz";
-      sha512 = "HllfTHaD5g98YeGRsGQEeOg1WUUxQr5jnYEWD1qjIWkTVYqVrtEWaEdOxDxnko3Fw7sh2XqtWk1HZHNCRSTQuA==";
+      url = "https://registry.npmjs.org/n8n/-/n8n-0.103.1.tgz";
+      sha512 = "5iEVB2AyWp/fj9/0oxJY/x/A2SaJ5zpmn9KdAgTOjLerxPFzaDD2MBjr5wPt69GpuanEkA2htt2wNw3xwSGWgQ==";
     };
     dependencies = [
       sources."@azure/ms-rest-azure-env-1.1.2"
-      (sources."@azure/ms-rest-js-1.9.0" // {
+      (sources."@azure/ms-rest-js-1.9.1" // {
         dependencies = [
+          sources."axios-0.21.1"
+          sources."follow-redirects-1.13.1"
           sources."tough-cookie-2.5.0"
         ];
       })
       sources."@azure/ms-rest-nodeauth-2.0.2"
+      sources."@dabh/diagnostics-2.0.2"
       (sources."@icetee/ftp-0.3.15" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -5970,13 +6180,13 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."@nodelib/fs.scandir-2.1.3"
-      sources."@nodelib/fs.stat-2.0.3"
-      sources."@nodelib/fs.walk-1.2.4"
+      sources."@nodelib/fs.scandir-2.1.4"
+      sources."@nodelib/fs.stat-2.0.4"
+      sources."@nodelib/fs.walk-1.2.6"
       sources."@oclif/command-1.8.0"
       (sources."@oclif/config-1.17.0" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."@oclif/errors-1.3.4" // {
@@ -5989,30 +6199,31 @@ in
       })
       sources."@oclif/linewrap-1.0.0"
       sources."@oclif/parser-3.8.5"
-      sources."@oclif/plugin-help-3.2.0"
+      sources."@oclif/plugin-help-3.2.1"
       sources."@servie/events-1.0.0"
       sources."@sqltools/formatter-1.2.2"
       sources."@tokenizer/token-0.1.1"
       sources."@types/bluebird-3.5.33"
       sources."@types/body-parser-1.19.0"
-      sources."@types/connect-3.4.33"
+      sources."@types/connect-3.4.34"
       sources."@types/debug-4.1.5"
-      sources."@types/express-4.17.9"
+      sources."@types/express-4.17.11"
       sources."@types/express-jwt-0.0.42"
-      sources."@types/express-serve-static-core-4.17.14"
+      sources."@types/express-serve-static-core-4.17.18"
       sources."@types/express-unless-0.5.1"
       sources."@types/ftp-0.3.31"
       sources."@types/glob-7.1.3"
       sources."@types/jsonwebtoken-8.5.0"
-      sources."@types/mime-2.0.3"
+      sources."@types/mime-1.3.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.10"
+      sources."@types/node-14.14.22"
       sources."@types/promise-ftp-1.3.4"
       sources."@types/promise-ftp-common-1.1.0"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
       sources."@types/readable-stream-2.3.9"
-      sources."@types/serve-static-1.13.8"
+      sources."@types/serve-static-1.13.9"
+      sources."@types/snowflake-sdk-1.5.1"
       sources."@types/tough-cookie-2.3.7"
       sources."@types/tunnel-0.0.0"
       sources."abbrev-1.1.1"
@@ -6024,7 +6235,19 @@ in
         ];
       })
       sources."adler-32-1.2.0"
+      (sources."agent-base-2.1.1" // {
+        dependencies = [
+          sources."semver-5.0.3"
+        ];
+      })
       sources."ajv-6.12.6"
+      (sources."amqplib-0.6.0" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -6043,7 +6266,10 @@ in
       sources."array-series-0.1.5"
       sources."array-union-2.1.0"
       sources."asn1-0.2.4"
-      sources."assert-options-0.6.2"
+      sources."asn1.js-5.4.1"
+      sources."asn1.js-rfc2560-5.0.1"
+      sources."asn1.js-rfc5280-3.0.0"
+      sources."assert-options-0.7.0"
       sources."assert-plus-1.0.0"
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
@@ -6055,8 +6281,17 @@ in
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bcryptjs-2.4.3"
+      sources."big-integer-1.6.48"
+      sources."bignumber.js-2.4.0"
+      (sources."bitsyntax-0.1.0" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."bl-2.2.1"
-      sources."bluebird-2.11.0"
+      sources."bluebird-3.7.2"
+      sources."bn.js-4.11.9"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -6067,23 +6302,26 @@ in
       sources."boolbase-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
+      sources."browser-request-0.3.3"
       sources."bson-1.1.5"
       sources."buffer-5.7.1"
       sources."buffer-equal-constant-time-1.0.1"
       sources."buffer-from-1.1.1"
+      sources."buffer-more-ints-1.0.0"
       sources."buffer-writer-2.0.0"
       sources."byte-length-1.0.2"
       sources."bytes-3.1.0"
+      sources."cacheable-lookup-5.0.4"
       sources."callback-stream-1.1.0"
       (sources."camel-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."camelcase-5.3.1"
       (sources."capital-case-1.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."cardinal-2.1.1"
@@ -6092,11 +6330,12 @@ in
       sources."chalk-2.4.2"
       (sources."change-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."chardet-0.7.0"
-      sources."cheerio-1.0.0-rc.3"
+      sources."cheerio-1.0.0-rc.5"
+      sources."cheerio-select-tmp-0.1.1"
       sources."chownr-1.1.4"
       (sources."clean-stack-3.0.1" // {
         dependencies = [
@@ -6104,23 +6343,15 @@ in
         ];
       })
       sources."cli-cursor-3.1.0"
-      (sources."cli-highlight-2.1.9" // {
+      (sources."cli-highlight-2.1.10" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
-          sources."cliui-6.0.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
-          sources."find-up-4.1.0"
           sources."has-flag-4.0.0"
-          sources."locate-path-5.0.0"
-          sources."p-locate-4.1.0"
           sources."parse5-5.1.1"
-          sources."path-exists-4.0.0"
           sources."supports-color-7.2.0"
-          sources."wrap-ansi-6.2.0"
-          sources."yargs-15.4.1"
-          sources."yargs-parser-18.1.3"
         ];
       })
       sources."cli-width-3.0.0"
@@ -6129,14 +6360,12 @@ in
           sources."safe-buffer-5.2.1"
         ];
       })
-      (sources."cliui-5.0.0" // {
+      (sources."cliui-7.0.4" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."emoji-regex-7.0.3"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-          sources."wrap-ansi-5.1.0"
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."wrap-ansi-7.0.0"
         ];
       })
       sources."code-point-at-1.1.0"
@@ -6150,6 +6379,7 @@ in
       sources."color-name-1.1.3"
       sources."color-string-1.5.4"
       sources."colornames-1.1.1"
+      sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."combined-stream-1.0.8"
       sources."commander-2.17.1"
@@ -6168,7 +6398,7 @@ in
       sources."console-control-strings-1.1.0"
       (sources."constant-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."content-disposition-0.5.3"
@@ -6187,29 +6417,34 @@ in
       })
       sources."crypto-js-4.0.0"
       sources."csrf-3.1.0"
-      sources."css-select-1.2.0"
-      sources."css-what-2.1.3"
+      sources."css-select-3.1.2"
+      sources."css-what-4.0.0"
       sources."d-1.0.1"
       sources."dashdash-1.14.1"
       sources."date-utils-1.2.21"
-      sources."debug-4.3.1"
+      sources."debug-4.3.2"
       sources."decamelize-1.2.0"
       sources."deep-extend-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."denque-1.4.1"
+      sources."denque-1.5.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."detect-libc-1.0.3"
-      sources."diagnostics-1.1.1"
+      (sources."diagnostics-1.1.1" // {
+        dependencies = [
+          sources."enabled-1.0.2"
+          sources."kuler-1.0.1"
+        ];
+      })
       sources."dir-glob-3.0.1"
-      sources."dom-serializer-0.1.1"
-      sources."domelementtype-1.3.1"
-      sources."domhandler-2.4.2"
-      sources."domutils-1.5.1"
+      sources."dom-serializer-1.2.0"
+      sources."domelementtype-2.1.0"
+      sources."domhandler-4.0.0"
+      sources."domutils-2.4.4"
       (sources."dot-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."dotenv-8.2.0"
@@ -6219,15 +6454,17 @@ in
       sources."ecdsa-sig-formatter-1.0.11"
       sources."ee-first-1.1.1"
       sources."emoji-regex-8.0.0"
-      sources."enabled-1.0.2"
+      sources."enabled-2.0.0"
       sources."encodeurl-1.0.2"
       sources."encoding-japanese-1.0.30"
       sources."end-of-stream-1.4.4"
-      sources."entities-1.1.2"
+      sources."entities-2.1.0"
       sources."env-variable-0.0.6"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
+      sources."es6-promise-4.2.8"
+      sources."es6-promisify-5.0.0"
       (sources."es6-set-0.1.5" // {
         dependencies = [
           sources."es6-symbol-3.1.1"
@@ -6258,9 +6495,11 @@ in
       sources."external-editor-3.1.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fastq-1.9.0"
+      sources."fast-safe-stringify-2.0.7"
+      sources."fastq-1.10.0"
+      sources."fecha-4.2.0"
       sources."fflate-0.3.11"
       sources."figlet-1.5.0"
       sources."figures-3.2.0"
@@ -6272,8 +6511,8 @@ in
           sources."ms-2.0.0"
         ];
       })
-      sources."find-up-3.0.0"
       sources."flatted-2.0.2"
+      sources."fn.name-1.1.0"
       (sources."follow-redirects-1.5.10" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -6310,7 +6549,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       (sources."gm-1.23.1" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -6330,19 +6569,36 @@ in
       sources."he-1.2.0"
       (sources."header-case-2.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."help-me-1.1.0"
-      sources."highlight.js-10.4.1"
-      sources."html-to-text-5.1.1"
-      (sources."htmlparser2-3.10.1" // {
+      sources."highlight.js-10.5.0"
+      (sources."html-to-text-5.1.1" // {
         dependencies = [
+          (sources."dom-serializer-0.2.2" // {
+            dependencies = [
+              sources."domelementtype-2.1.0"
+              sources."entities-2.1.0"
+            ];
+          })
+          sources."domelementtype-1.3.1"
+          sources."domhandler-2.4.2"
+          sources."domutils-1.7.0"
+          sources."entities-1.1.2"
+          sources."htmlparser2-3.10.1"
           sources."readable-stream-3.6.0"
         ];
       })
+      sources."htmlparser2-6.0.0"
       sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
+      (sources."https-proxy-agent-3.0.1" // {
+        dependencies = [
+          sources."agent-base-4.3.0"
+          sources."debug-3.2.7"
+        ];
+      })
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."ignore-5.1.8"
@@ -6358,7 +6614,7 @@ in
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."ini-1.3.5"
+      sources."ini-1.3.8"
       (sources."inquirer-7.3.3" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -6373,7 +6629,6 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-absolute-1.0.0"
       sources."is-arrayish-0.3.2"
-      sources."is-buffer-2.0.5"
       sources."is-docker-2.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -6383,15 +6638,16 @@ in
       sources."is-promise-1.0.1"
       sources."is-property-1.0.2"
       sources."is-relative-1.0.0"
+      sources."is-stream-2.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-unc-path-1.0.0"
       sources."is-windows-1.0.2"
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."iso-639-1-2.1.4"
+      sources."iso-639-1-2.1.7"
       sources."isstream-0.1.2"
-      sources."js-yaml-3.14.0"
+      sources."js-yaml-3.14.1"
       sources."jsbi-3.1.4"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
@@ -6410,7 +6666,7 @@ in
       sources."jwks-rsa-1.9.0"
       sources."jws-3.2.2"
       sources."kafkajs-1.15.0"
-      sources."kuler-1.0.1"
+      sources."kuler-2.0.0"
       sources."leven-2.1.0"
       sources."libbase64-1.2.1"
       (sources."libmime-5.0.0" // {
@@ -6421,13 +6677,13 @@ in
       sources."libqp-1.1.0"
       sources."limiter-1.1.5"
       sources."linkify-it-3.0.2"
-      (sources."localtunnel-2.0.0" // {
+      (sources."localtunnel-2.0.1" // {
         dependencies = [
-          sources."axios-0.19.0"
-          sources."debug-4.1.1"
+          sources."axios-0.21.1"
+          sources."debug-4.3.1"
+          sources."follow-redirects-1.13.1"
         ];
       })
-      sources."locate-path-3.0.0"
       sources."lodash-4.17.20"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.clonedeep-4.5.0"
@@ -6443,14 +6699,15 @@ in
       sources."lodash.template-4.5.0"
       sources."lodash.templatesettings-4.2.0"
       sources."lodash.unset-4.5.2"
+      sources."logform-2.2.0"
       sources."long-4.0.0"
       (sources."lower-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."lru-cache-6.0.0"
-      (sources."lru-memoizer-2.1.2" // {
+      (sources."lru-memoizer-2.1.4" // {
         dependencies = [
           sources."lru-cache-4.0.2"
           sources."yallist-2.1.2"
@@ -6478,9 +6735,10 @@ in
       sources."micromatch-4.0.2"
       sources."millisecond-0.1.2"
       sources."mime-1.6.0"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."mimic-fn-2.1.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       (sources."minipass-2.9.0" // {
@@ -6489,12 +6747,12 @@ in
         ];
       })
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.5"
+      sources."mkdirp-1.0.4"
       sources."moment-2.24.0"
       sources."moment-timezone-0.5.32"
       sources."mongodb-3.6.3"
       sources."mqtt-4.2.1"
-      (sources."mqtt-packet-6.6.0" // {
+      (sources."mqtt-packet-6.7.0" // {
         dependencies = [
           sources."bl-4.0.3"
           sources."inherits-2.0.4"
@@ -6502,7 +6760,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."mssql-6.2.3"
+      sources."mssql-6.3.1"
       sources."mute-stream-0.0.8"
       (sources."mysql2-2.1.0" // {
         dependencies = [
@@ -6512,14 +6770,14 @@ in
         ];
       })
       sources."mz-2.7.0"
-      sources."n8n-core-0.54.0"
-      sources."n8n-editor-ui-0.66.0"
-      (sources."n8n-nodes-base-0.91.0" // {
+      sources."n8n-core-0.59.0"
+      sources."n8n-editor-ui-0.72.0"
+      (sources."n8n-nodes-base-0.98.1" // {
         dependencies = [
           sources."moment-2.28.0"
         ];
       })
-      sources."n8n-workflow-0.47.0"
+      sources."n8n-workflow-0.48.0"
       (sources."named-placeholders-1.1.2" // {
         dependencies = [
           sources."lru-cache-4.1.5"
@@ -6528,7 +6786,7 @@ in
       })
       sources."nan-2.14.2"
       sources."native-duplexpair-1.0.0"
-      (sources."needle-2.5.2" // {
+      (sources."needle-2.6.0" // {
         dependencies = [
           sources."debug-3.2.7"
         ];
@@ -6537,33 +6795,43 @@ in
       sources."next-tick-1.0.0"
       (sources."no-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."node-ensure-0.0.0"
       (sources."node-pre-gyp-0.11.0" // {
         dependencies = [
+          sources."mkdirp-0.5.5"
           sources."rimraf-2.7.1"
           sources."semver-5.7.1"
         ];
       })
       sources."nodeify-1.0.1"
-      sources."nodemailer-6.4.16"
+      sources."nodemailer-6.4.17"
       sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-packlist-1.4.8"
       sources."npmlog-4.1.2"
-      sources."nth-check-1.0.2"
+      sources."nth-check-2.0.0"
       sources."number-is-nan-1.0.1"
       sources."oauth-1.0a-2.2.6"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
+      (sources."ocsp-1.2.0" // {
+        dependencies = [
+          sources."asn1.js-4.10.1"
+          sources."asn1.js-rfc2560-4.0.6"
+          sources."asn1.js-rfc5280-2.0.1"
+          sources."async-1.5.2"
+        ];
+      })
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
+      sources."one-time-1.0.0"
       sources."onetime-5.1.2"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."openurl-1.1.1"
       sources."ordered-read-streams-1.0.1"
       sources."original-1.0.2"
@@ -6571,35 +6839,27 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."p-cancelable-2.0.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-3.0.0"
-      sources."p-try-2.2.0"
       sources."packet-reader-1.0.0"
       (sources."param-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."parent-require-1.0.0"
-      sources."parse5-3.0.3"
-      (sources."parse5-htmlparser2-tree-adapter-6.0.1" // {
-        dependencies = [
-          sources."parse5-6.0.1"
-        ];
-      })
+      sources."parse5-6.0.1"
+      sources."parse5-htmlparser2-tree-adapter-6.0.1"
       sources."parseurl-1.3.3"
       (sources."pascal-case-3.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."path-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."path-dirname-1.0.2"
-      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."path-type-4.0.0"
@@ -6608,14 +6868,14 @@ in
           sources."debug-3.2.7"
         ];
       })
-      sources."peek-readable-3.1.0"
+      sources."peek-readable-3.1.3"
       sources."performance-now-2.1.0"
       sources."pg-8.5.1"
       sources."pg-connection-string-2.4.0"
       sources."pg-int8-1.0.1"
-      sources."pg-minify-1.6.1"
+      sources."pg-minify-1.6.2"
       sources."pg-pool-3.2.2"
-      sources."pg-promise-10.8.1"
+      sources."pg-promise-10.9.1"
       sources."pg-protocol-1.4.0"
       sources."pg-types-2.2.0"
       sources."pgpass-1.0.4"
@@ -6624,7 +6884,7 @@ in
       sources."popsicle-content-encoding-1.0.0"
       sources."popsicle-cookie-jar-1.0.0"
       sources."popsicle-redirects-1.1.0"
-      sources."popsicle-transport-http-1.0.9"
+      sources."popsicle-transport-http-1.1.1"
       sources."popsicle-transport-xhr-2.0.0"
       sources."popsicle-user-agent-1.0.0"
       sources."postgres-array-2.0.0"
@@ -6634,7 +6894,11 @@ in
       sources."printj-1.1.2"
       sources."process-nextick-args-2.0.1"
       sources."promise-1.3.0"
-      sources."promise-ftp-1.3.5"
+      (sources."promise-ftp-1.3.5" // {
+        dependencies = [
+          sources."bluebird-2.11.0"
+        ];
+      })
       sources."promise-ftp-common-1.1.5"
       sources."proxy-addr-2.0.6"
       sources."pseudomap-1.0.2"
@@ -6674,8 +6938,8 @@ in
           sources."tough-cookie-2.5.0"
         ];
       })
+      sources."requestretry-4.1.2"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
       (sources."require_optional-1.0.1" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -6694,11 +6958,7 @@ in
       sources."rimraf-3.0.2"
       sources."riot-tmpl-3.0.8"
       sources."rndm-1.2.0"
-      (sources."rss-parser-3.9.0" // {
-        dependencies = [
-          sources."entities-2.1.0"
-        ];
-      })
+      sources."rss-parser-3.10.0"
       sources."run-async-2.4.1"
       sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
@@ -6719,7 +6979,7 @@ in
       })
       (sources."sentence-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."seq-queue-0.0.5"
@@ -6730,15 +6990,21 @@ in
       sources."setprototypeof-1.1.1"
       sources."sha.js-2.4.11"
       sources."signal-exit-3.0.3"
+      sources."simple-lru-cache-0.0.2"
       sources."simple-swizzle-0.2.2"
       sources."slash-3.0.0"
       (sources."snake-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
+        ];
+      })
+      (sources."snowflake-sdk-1.5.3" // {
+        dependencies = [
+          sources."debug-3.2.7"
         ];
       })
       sources."sparse-bitfield-3.0.3"
-      sources."spex-3.0.2"
+      sources."spex-3.2.0"
       (sources."split2-3.2.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -6758,6 +7024,7 @@ in
       })
       sources."ssh2-streams-0.4.10"
       sources."sshpk-1.16.1"
+      sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."stream-shift-1.0.1"
@@ -6766,17 +7033,18 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."strtok3-6.0.4"
+      sources."strtok3-6.0.8"
       sources."supports-color-5.5.0"
       (sources."tar-4.4.13" // {
         dependencies = [
+          sources."mkdirp-0.5.5"
           sources."yallist-3.1.1"
         ];
       })
       sources."tarn-1.1.5"
       (sources."tedious-6.7.0" // {
         dependencies = [
-          sources."@types/node-12.19.8"
+          sources."@types/node-12.19.15"
           sources."bl-3.0.1"
           sources."depd-2.0.0"
           sources."iconv-lite-0.5.2"
@@ -6800,8 +7068,9 @@ in
       sources."to-absolute-glob-2.0.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
-      sources."token-types-2.0.0"
+      sources."token-types-2.1.1"
       sources."tough-cookie-3.0.1"
+      sources."triple-beam-1.3.0"
       sources."ts-expect-1.1.0"
       sources."tslib-1.11.2"
       sources."tsscmp-1.0.6"
@@ -6813,21 +7082,15 @@ in
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
-      (sources."typeorm-0.2.29" // {
+      (sources."typeorm-0.2.30" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
-          sources."cliui-7.0.4"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
-          sources."mkdirp-1.0.4"
           sources."supports-color-7.2.0"
           sources."tslib-1.14.1"
-          sources."wrap-ansi-7.0.0"
-          sources."y18n-5.0.5"
-          sources."yargs-16.1.1"
-          sources."yargs-parser-20.2.4"
         ];
       })
       sources."uc.micro-1.0.6"
@@ -6839,15 +7102,15 @@ in
       sources."unpipe-1.0.0"
       (sources."upper-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."upper-case-first-2.0.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-parse-1.4.7"
       (sources."utf7-1.0.2" // {
         dependencies = [
@@ -6863,8 +7126,8 @@ in
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."vm2-3.9.2"
+      sources."when-3.7.8"
       sources."which-1.3.1"
-      sources."which-module-2.0.0"
       (sources."wide-align-1.1.3" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -6874,6 +7137,12 @@ in
         ];
       })
       sources."widest-line-3.1.0"
+      (sources."winston-3.3.3" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
+      sources."winston-transport-4.4.0"
       sources."wmf-1.0.2"
       sources."word-0.3.0"
       (sources."wrap-ansi-4.0.0" // {
@@ -6885,7 +7154,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-7.4.1"
+      sources."ws-7.4.2"
       sources."xlsx-0.16.9"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
@@ -6893,7 +7162,7 @@ in
       sources."xpath.js-1.1.0"
       sources."xregexp-2.0.0"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.1"
+      sources."y18n-5.0.5"
       sources."yallist-4.0.0"
       (sources."yargonaut-1.1.4" // {
         dependencies = [
@@ -6904,14 +7173,9 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."yargs-13.3.0" // {
+      (sources."yargs-16.2.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."emoji-regex-7.0.3"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-          sources."yargs-parser-13.1.2"
+          sources."yargs-parser-20.2.4"
         ];
       })
       sources."yargs-parser-13.0.0"
@@ -6919,7 +7183,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "n8n Workflow Automation Tool";
-      homepage = https://n8n.io/;
+      homepage = "https://n8n.io";
       license = "SEE LICENSE IN LICENSE.md";
     };
     production = true;
diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix
index 0769168a78f..64326c6b216 100644
--- a/pkgs/applications/version-management/commitizen/node-composition.nix
+++ b/pkgs/applications/version-management/commitizen/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix
index 262df27e464..c2b723195b7 100644
--- a/pkgs/applications/version-management/commitizen/node-env.nix
+++ b/pkgs/applications/version-management/commitizen/node-env.nix
@@ -1,8 +1,11 @@
 # This file originates from node2nix
 
-{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
+{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
 
 let
+  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
+  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
+
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -242,8 +245,8 @@ let
       if(fs.existsSync("./package-lock.json")) {
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-          if(packageLock.lockfileVersion !== 1) {
-             process.stderr.write("Sorry, I only understand lock file version 1!\n");
+          if(![1, 2].includes(packageLock.lockfileVersion)) {
+             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
              process.exit(1);
           }
 
@@ -396,7 +399,7 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ lib.optional (stdenv.isLinux) util-linux
+        ++ lib.optional (stdenv.isLinux) utillinux
         ++ lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
@@ -445,8 +448,8 @@ let
       '';
     } // extraArgs);
 
-  # Builds a development shell
-  buildNodeShell =
+  # Builds a node environment (a node_modules folder and a set of binaries)
+  buildNodeDependencies =
     { name
     , packageName
     , version
@@ -465,12 +468,12 @@ let
 
     let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-
-      nodeDependencies = stdenv.mkDerivation ({
+    in
+      stdenv.mkDerivation ({
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
-          ++ lib.optional (stdenv.isLinux) util-linux
+          ++ lib.optional (stdenv.isLinux) utillinux
           ++ lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
@@ -512,11 +515,32 @@ let
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
       } // extraArgs);
+
+  # Builds a development shell
+  buildNodeShell =
+    { name
+    , packageName
+    , version
+    , src
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , reconstructLock ? false
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
+    let
+      nodeDependencies = buildNodeDependencies args;
     in
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -538,5 +562,6 @@ in
 {
   buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
   buildNodePackage = lib.makeOverridable buildNodePackage;
+  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
   buildNodeShell = lib.makeOverridable buildNodeShell;
 }
diff --git a/pkgs/applications/version-management/commitizen/node-packages.nix b/pkgs/applications/version-management/commitizen/node-packages.nix
index 396dedf56fd..a6138b1788b 100644
--- a/pkgs/applications/version-management/commitizen/node-packages.nix
+++ b/pkgs/applications/version-management/commitizen/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -13,22 +13,22 @@ let
         sha512 = "+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg==";
       };
     };
-    "@babel/code-frame-7.10.4" = {
+    "@babel/code-frame-7.12.11" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";
-        sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
+        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
       };
     };
-    "@babel/compat-data-7.11.0" = {
+    "@babel/compat-data-7.12.7" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.11.0";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz";
-        sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz";
+        sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
       };
     };
     "@babel/core-7.11.6" = {
@@ -40,22 +40,22 @@ let
         sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==";
       };
     };
-    "@babel/generator-7.11.6" = {
+    "@babel/generator-7.12.11" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.11.6";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz";
-        sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
+        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
       };
     };
-    "@babel/helper-annotate-as-pure-7.10.4" = {
+    "@babel/helper-annotate-as-pure-7.12.10" = {
       name = "_at_babel_slash_helper-annotate-as-pure";
       packageName = "@babel/helper-annotate-as-pure";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz";
-        sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==";
+        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz";
+        sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==";
       };
     };
     "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = {
@@ -67,31 +67,31 @@ let
         sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==";
       };
     };
-    "@babel/helper-compilation-targets-7.10.4" = {
+    "@babel/helper-compilation-targets-7.12.5" = {
       name = "_at_babel_slash_helper-compilation-targets";
       packageName = "@babel/helper-compilation-targets";
-      version = "7.10.4";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz";
-        sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==";
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz";
+        sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.10.5" = {
+    "@babel/helper-create-class-features-plugin-7.12.1" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz";
-        sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==";
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz";
+        sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==";
       };
     };
-    "@babel/helper-create-regexp-features-plugin-7.10.4" = {
+    "@babel/helper-create-regexp-features-plugin-7.12.7" = {
       name = "_at_babel_slash_helper-create-regexp-features-plugin";
       packageName = "@babel/helper-create-regexp-features-plugin";
-      version = "7.10.4";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz";
-        sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==";
+        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz";
+        sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==";
       };
     };
     "@babel/helper-define-map-7.10.5" = {
@@ -103,31 +103,31 @@ let
         sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==";
       };
     };
-    "@babel/helper-explode-assignable-expression-7.11.4" = {
+    "@babel/helper-explode-assignable-expression-7.12.1" = {
       name = "_at_babel_slash_helper-explode-assignable-expression";
       packageName = "@babel/helper-explode-assignable-expression";
-      version = "7.11.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz";
-        sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==";
+        url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz";
+        sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==";
       };
     };
-    "@babel/helper-function-name-7.10.4" = {
+    "@babel/helper-function-name-7.12.11" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
-        sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
+        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
       };
     };
-    "@babel/helper-get-function-arity-7.10.4" = {
+    "@babel/helper-get-function-arity-7.12.10" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
-        sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
+        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
       };
     };
     "@babel/helper-hoist-variables-7.10.4" = {
@@ -139,40 +139,40 @@ let
         sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.11.0" = {
+    "@babel/helper-member-expression-to-functions-7.12.7" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.11.0";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz";
-        sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
+        sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
       };
     };
-    "@babel/helper-module-imports-7.10.4" = {
+    "@babel/helper-module-imports-7.12.5" = {
       name = "_at_babel_slash_helper-module-imports";
       packageName = "@babel/helper-module-imports";
-      version = "7.10.4";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz";
-        sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==";
+        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+        sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
       };
     };
-    "@babel/helper-module-transforms-7.11.0" = {
+    "@babel/helper-module-transforms-7.12.1" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz";
-        sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
+        sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.10.4" = {
+    "@babel/helper-optimise-call-expression-7.12.10" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
-        sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
+        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
       };
     };
     "@babel/helper-plugin-utils-7.10.4" = {
@@ -184,85 +184,85 @@ let
         sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
       };
     };
-    "@babel/helper-regex-7.10.5" = {
-      name = "_at_babel_slash_helper-regex";
-      packageName = "@babel/helper-regex";
-      version = "7.10.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz";
-        sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==";
-      };
-    };
-    "@babel/helper-remap-async-to-generator-7.11.4" = {
+    "@babel/helper-remap-async-to-generator-7.12.1" = {
       name = "_at_babel_slash_helper-remap-async-to-generator";
       packageName = "@babel/helper-remap-async-to-generator";
-      version = "7.11.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz";
-        sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==";
+        url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz";
+        sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
       };
     };
-    "@babel/helper-replace-supers-7.10.4" = {
+    "@babel/helper-replace-supers-7.12.11" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz";
-        sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
+        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
       };
     };
-    "@babel/helper-simple-access-7.10.4" = {
+    "@babel/helper-simple-access-7.12.1" = {
       name = "_at_babel_slash_helper-simple-access";
       packageName = "@babel/helper-simple-access";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz";
-        sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==";
+        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
+        sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
       };
     };
-    "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = {
+    "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = {
       name = "_at_babel_slash_helper-skip-transparent-expression-wrappers";
       packageName = "@babel/helper-skip-transparent-expression-wrappers";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz";
-        sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==";
+        url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz";
+        sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==";
       };
     };
-    "@babel/helper-split-export-declaration-7.11.0" = {
+    "@babel/helper-split-export-declaration-7.12.11" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.11.0";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
-        sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
+        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
       };
     };
-    "@babel/helper-validator-identifier-7.10.4" = {
+    "@babel/helper-validator-identifier-7.12.11" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
-        sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
+        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
       };
     };
-    "@babel/helper-wrap-function-7.10.4" = {
+    "@babel/helper-validator-option-7.12.11" = {
+      name = "_at_babel_slash_helper-validator-option";
+      packageName = "@babel/helper-validator-option";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz";
+        sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==";
+      };
+    };
+    "@babel/helper-wrap-function-7.12.3" = {
       name = "_at_babel_slash_helper-wrap-function";
       packageName = "@babel/helper-wrap-function";
-      version = "7.10.4";
+      version = "7.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz";
-        sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==";
+        url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz";
+        sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==";
       };
     };
-    "@babel/helpers-7.10.4" = {
+    "@babel/helpers-7.12.5" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.10.4";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz";
-        sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
+        sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
       };
     };
     "@babel/highlight-7.10.4" = {
@@ -274,85 +274,85 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.11.5" = {
+    "@babel/parser-7.12.11" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.11.5";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz";
-        sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
+        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
       };
     };
-    "@babel/plugin-proposal-async-generator-functions-7.10.5" = {
+    "@babel/plugin-proposal-async-generator-functions-7.12.12" = {
       name = "_at_babel_slash_plugin-proposal-async-generator-functions";
       packageName = "@babel/plugin-proposal-async-generator-functions";
-      version = "7.10.5";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz";
-        sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz";
+        sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==";
       };
     };
-    "@babel/plugin-proposal-class-properties-7.10.4" = {
+    "@babel/plugin-proposal-class-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-class-properties";
       packageName = "@babel/plugin-proposal-class-properties";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz";
-        sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz";
+        sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==";
       };
     };
-    "@babel/plugin-proposal-dynamic-import-7.10.4" = {
+    "@babel/plugin-proposal-dynamic-import-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-dynamic-import";
       packageName = "@babel/plugin-proposal-dynamic-import";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz";
-        sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz";
+        sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==";
       };
     };
-    "@babel/plugin-proposal-export-namespace-from-7.10.4" = {
+    "@babel/plugin-proposal-export-namespace-from-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-export-namespace-from";
       packageName = "@babel/plugin-proposal-export-namespace-from";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz";
-        sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz";
+        sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==";
       };
     };
-    "@babel/plugin-proposal-json-strings-7.10.4" = {
+    "@babel/plugin-proposal-json-strings-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-json-strings";
       packageName = "@babel/plugin-proposal-json-strings";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz";
-        sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz";
+        sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==";
       };
     };
-    "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = {
+    "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-logical-assignment-operators";
       packageName = "@babel/plugin-proposal-logical-assignment-operators";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz";
-        sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz";
+        sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==";
       };
     };
-    "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = {
+    "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator";
       packageName = "@babel/plugin-proposal-nullish-coalescing-operator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz";
-        sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz";
+        sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
       };
     };
-    "@babel/plugin-proposal-numeric-separator-7.10.4" = {
+    "@babel/plugin-proposal-numeric-separator-7.12.7" = {
       name = "_at_babel_slash_plugin-proposal-numeric-separator";
       packageName = "@babel/plugin-proposal-numeric-separator";
-      version = "7.10.4";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz";
-        sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz";
+        sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==";
       };
     };
     "@babel/plugin-proposal-object-rest-spread-7.11.0" = {
@@ -364,49 +364,40 @@ let
         sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==";
       };
     };
-    "@babel/plugin-proposal-object-rest-spread-7.9.0" = {
-      name = "_at_babel_slash_plugin-proposal-object-rest-spread";
-      packageName = "@babel/plugin-proposal-object-rest-spread";
-      version = "7.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz";
-        sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==";
-      };
-    };
-    "@babel/plugin-proposal-optional-catch-binding-7.10.4" = {
+    "@babel/plugin-proposal-optional-catch-binding-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-optional-catch-binding";
       packageName = "@babel/plugin-proposal-optional-catch-binding";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz";
-        sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz";
+        sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==";
       };
     };
-    "@babel/plugin-proposal-optional-chaining-7.11.0" = {
+    "@babel/plugin-proposal-optional-chaining-7.12.7" = {
       name = "_at_babel_slash_plugin-proposal-optional-chaining";
       packageName = "@babel/plugin-proposal-optional-chaining";
-      version = "7.11.0";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz";
-        sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz";
+        sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==";
       };
     };
-    "@babel/plugin-proposal-private-methods-7.10.4" = {
+    "@babel/plugin-proposal-private-methods-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-private-methods";
       packageName = "@babel/plugin-proposal-private-methods";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz";
-        sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz";
+        sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==";
       };
     };
-    "@babel/plugin-proposal-unicode-property-regex-7.10.4" = {
+    "@babel/plugin-proposal-unicode-property-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-unicode-property-regex";
       packageName = "@babel/plugin-proposal-unicode-property-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz";
-        sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz";
+        sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==";
       };
     };
     "@babel/plugin-syntax-async-generators-7.8.4" = {
@@ -418,13 +409,13 @@ let
         sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==";
       };
     };
-    "@babel/plugin-syntax-class-properties-7.10.4" = {
+    "@babel/plugin-syntax-class-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-syntax-class-properties";
       packageName = "@babel/plugin-syntax-class-properties";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz";
-        sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz";
+        sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==";
       };
     };
     "@babel/plugin-syntax-dynamic-import-7.8.3" = {
@@ -508,301 +499,301 @@ let
         sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==";
       };
     };
-    "@babel/plugin-syntax-top-level-await-7.10.4" = {
+    "@babel/plugin-syntax-top-level-await-7.12.1" = {
       name = "_at_babel_slash_plugin-syntax-top-level-await";
       packageName = "@babel/plugin-syntax-top-level-await";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz";
-        sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz";
+        sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==";
       };
     };
-    "@babel/plugin-transform-arrow-functions-7.10.4" = {
+    "@babel/plugin-transform-arrow-functions-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-arrow-functions";
       packageName = "@babel/plugin-transform-arrow-functions";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz";
-        sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz";
+        sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==";
       };
     };
-    "@babel/plugin-transform-async-to-generator-7.10.4" = {
+    "@babel/plugin-transform-async-to-generator-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-async-to-generator";
       packageName = "@babel/plugin-transform-async-to-generator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz";
-        sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz";
+        sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==";
       };
     };
-    "@babel/plugin-transform-block-scoped-functions-7.10.4" = {
+    "@babel/plugin-transform-block-scoped-functions-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-block-scoped-functions";
       packageName = "@babel/plugin-transform-block-scoped-functions";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz";
-        sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz";
+        sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.11.1" = {
+    "@babel/plugin-transform-block-scoping-7.12.12" = {
       name = "_at_babel_slash_plugin-transform-block-scoping";
       packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.11.1";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz";
-        sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz";
+        sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==";
       };
     };
-    "@babel/plugin-transform-classes-7.10.4" = {
+    "@babel/plugin-transform-classes-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz";
-        sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz";
+        sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==";
       };
     };
-    "@babel/plugin-transform-computed-properties-7.10.4" = {
+    "@babel/plugin-transform-computed-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-computed-properties";
       packageName = "@babel/plugin-transform-computed-properties";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz";
-        sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz";
+        sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==";
       };
     };
-    "@babel/plugin-transform-destructuring-7.10.4" = {
+    "@babel/plugin-transform-destructuring-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-destructuring";
       packageName = "@babel/plugin-transform-destructuring";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz";
-        sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz";
+        sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==";
       };
     };
-    "@babel/plugin-transform-dotall-regex-7.10.4" = {
+    "@babel/plugin-transform-dotall-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-dotall-regex";
       packageName = "@babel/plugin-transform-dotall-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz";
-        sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz";
+        sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==";
       };
     };
-    "@babel/plugin-transform-duplicate-keys-7.10.4" = {
+    "@babel/plugin-transform-duplicate-keys-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-duplicate-keys";
       packageName = "@babel/plugin-transform-duplicate-keys";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz";
-        sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz";
+        sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==";
       };
     };
-    "@babel/plugin-transform-exponentiation-operator-7.10.4" = {
+    "@babel/plugin-transform-exponentiation-operator-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-exponentiation-operator";
       packageName = "@babel/plugin-transform-exponentiation-operator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz";
-        sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz";
+        sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==";
       };
     };
-    "@babel/plugin-transform-for-of-7.10.4" = {
+    "@babel/plugin-transform-for-of-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-for-of";
       packageName = "@babel/plugin-transform-for-of";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz";
-        sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz";
+        sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==";
       };
     };
-    "@babel/plugin-transform-function-name-7.10.4" = {
+    "@babel/plugin-transform-function-name-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-function-name";
       packageName = "@babel/plugin-transform-function-name";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz";
-        sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz";
+        sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==";
       };
     };
-    "@babel/plugin-transform-literals-7.10.4" = {
+    "@babel/plugin-transform-literals-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-literals";
       packageName = "@babel/plugin-transform-literals";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz";
-        sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz";
+        sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==";
       };
     };
-    "@babel/plugin-transform-member-expression-literals-7.10.4" = {
+    "@babel/plugin-transform-member-expression-literals-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-member-expression-literals";
       packageName = "@babel/plugin-transform-member-expression-literals";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz";
-        sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz";
+        sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==";
       };
     };
-    "@babel/plugin-transform-modules-amd-7.10.5" = {
+    "@babel/plugin-transform-modules-amd-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-modules-amd";
       packageName = "@babel/plugin-transform-modules-amd";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz";
-        sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz";
+        sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.10.4" = {
+    "@babel/plugin-transform-modules-commonjs-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz";
-        sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz";
+        sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==";
       };
     };
-    "@babel/plugin-transform-modules-systemjs-7.10.5" = {
+    "@babel/plugin-transform-modules-systemjs-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-modules-systemjs";
       packageName = "@babel/plugin-transform-modules-systemjs";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz";
-        sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz";
+        sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==";
       };
     };
-    "@babel/plugin-transform-modules-umd-7.10.4" = {
+    "@babel/plugin-transform-modules-umd-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-modules-umd";
       packageName = "@babel/plugin-transform-modules-umd";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz";
-        sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz";
+        sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==";
       };
     };
-    "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = {
+    "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex";
       packageName = "@babel/plugin-transform-named-capturing-groups-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz";
-        sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz";
+        sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==";
       };
     };
-    "@babel/plugin-transform-new-target-7.10.4" = {
+    "@babel/plugin-transform-new-target-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-new-target";
       packageName = "@babel/plugin-transform-new-target";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz";
-        sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz";
+        sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==";
       };
     };
-    "@babel/plugin-transform-object-super-7.10.4" = {
+    "@babel/plugin-transform-object-super-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-object-super";
       packageName = "@babel/plugin-transform-object-super";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz";
-        sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz";
+        sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==";
       };
     };
-    "@babel/plugin-transform-parameters-7.10.5" = {
+    "@babel/plugin-transform-parameters-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-parameters";
       packageName = "@babel/plugin-transform-parameters";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz";
-        sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz";
+        sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==";
       };
     };
-    "@babel/plugin-transform-property-literals-7.10.4" = {
+    "@babel/plugin-transform-property-literals-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-property-literals";
       packageName = "@babel/plugin-transform-property-literals";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz";
-        sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz";
+        sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==";
       };
     };
-    "@babel/plugin-transform-regenerator-7.10.4" = {
+    "@babel/plugin-transform-regenerator-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-regenerator";
       packageName = "@babel/plugin-transform-regenerator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz";
-        sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz";
+        sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==";
       };
     };
-    "@babel/plugin-transform-reserved-words-7.10.4" = {
+    "@babel/plugin-transform-reserved-words-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-reserved-words";
       packageName = "@babel/plugin-transform-reserved-words";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz";
-        sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz";
+        sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==";
       };
     };
-    "@babel/plugin-transform-shorthand-properties-7.10.4" = {
+    "@babel/plugin-transform-shorthand-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-shorthand-properties";
       packageName = "@babel/plugin-transform-shorthand-properties";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz";
-        sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz";
+        sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==";
       };
     };
-    "@babel/plugin-transform-spread-7.11.0" = {
+    "@babel/plugin-transform-spread-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-spread";
       packageName = "@babel/plugin-transform-spread";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz";
-        sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz";
+        sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==";
       };
     };
-    "@babel/plugin-transform-sticky-regex-7.10.4" = {
+    "@babel/plugin-transform-sticky-regex-7.12.7" = {
       name = "_at_babel_slash_plugin-transform-sticky-regex";
       packageName = "@babel/plugin-transform-sticky-regex";
-      version = "7.10.4";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz";
-        sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz";
+        sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==";
       };
     };
-    "@babel/plugin-transform-template-literals-7.10.5" = {
+    "@babel/plugin-transform-template-literals-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-template-literals";
       packageName = "@babel/plugin-transform-template-literals";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz";
-        sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz";
+        sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==";
       };
     };
-    "@babel/plugin-transform-typeof-symbol-7.10.4" = {
+    "@babel/plugin-transform-typeof-symbol-7.12.10" = {
       name = "_at_babel_slash_plugin-transform-typeof-symbol";
       packageName = "@babel/plugin-transform-typeof-symbol";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz";
-        sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz";
+        sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==";
       };
     };
-    "@babel/plugin-transform-unicode-escapes-7.10.4" = {
+    "@babel/plugin-transform-unicode-escapes-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-unicode-escapes";
       packageName = "@babel/plugin-transform-unicode-escapes";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz";
-        sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz";
+        sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==";
       };
     };
-    "@babel/plugin-transform-unicode-regex-7.10.4" = {
+    "@babel/plugin-transform-unicode-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-unicode-regex";
       packageName = "@babel/plugin-transform-unicode-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz";
-        sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz";
+        sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
       };
     };
     "@babel/preset-env-7.11.5" = {
@@ -832,76 +823,76 @@ let
         sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w==";
       };
     };
-    "@babel/runtime-7.11.2" = {
+    "@babel/runtime-7.12.5" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.11.2";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz";
-        sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
+        sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
       };
     };
-    "@babel/template-7.10.4" = {
+    "@babel/template-7.12.7" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.10.4";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz";
-        sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
+        sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.11.5" = {
+    "@babel/traverse-7.12.12" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.11.5";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz";
-        sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
+        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
       };
     };
-    "@babel/types-7.11.5" = {
+    "@babel/types-7.12.12" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.11.5";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz";
-        sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
+        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
       };
     };
-    "@commitlint/execute-rule-11.0.0" = {
+    "@commitlint/execute-rule-12.0.0" = {
       name = "_at_commitlint_slash_execute-rule";
       packageName = "@commitlint/execute-rule";
-      version = "11.0.0";
+      version = "12.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-11.0.0.tgz";
-        sha512 = "g01p1g4BmYlZ2+tdotCavrMunnPFPhTzG1ZiLKTCYrooHRbmvqo42ZZn4QMStUEIcn+jfLb6BRZX3JzIwA1ezQ==";
+        url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-12.0.0.tgz";
+        sha512 = "X9vZDKdyOz8MNDZqJN39K9UbjQmMsyQ74d1lUaw0QuCE4jOesmynYkLc4Y4MWKqq9ElWdjswZyLMyOgm3kAMrg==";
       };
     };
-    "@commitlint/load-11.0.0" = {
+    "@commitlint/load-12.0.0" = {
       name = "_at_commitlint_slash_load";
       packageName = "@commitlint/load";
-      version = "11.0.0";
+      version = "12.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/load/-/load-11.0.0.tgz";
-        sha512 = "t5ZBrtgvgCwPfxmG811FCp39/o3SJ7L+SNsxFL92OR4WQxPcu6c8taD0CG2lzOHGuRyuMxZ7ps3EbngT2WpiCg==";
+        url = "https://registry.npmjs.org/@commitlint/load/-/load-12.0.0.tgz";
+        sha512 = "B7rwRGWE3j+4dWsLD4s82fIbIJP1xGOJYfAvKDWOa/FnAb8s8ZQOK8HHuDC8BD/MU3Ierl8KJMfzGiO63d1rlA==";
       };
     };
-    "@commitlint/resolve-extends-11.0.0" = {
+    "@commitlint/resolve-extends-12.0.0" = {
       name = "_at_commitlint_slash_resolve-extends";
       packageName = "@commitlint/resolve-extends";
-      version = "11.0.0";
+      version = "12.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-11.0.0.tgz";
-        sha512 = "WinU6Uv6L7HDGLqn/To13KM1CWvZ09VHZqryqxXa1OY+EvJkfU734CwnOEeNlSCK7FVLrB4kmodLJtL1dkEpXw==";
+        url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-12.0.0.tgz";
+        sha512 = "5i0ZieVFzXuRqyYxnoEJ7InYyXQC/K98nF75Ro6wVQqpmzi01/KHYwo8uCcy1Q+rPB48FSmCB84br0t5Ulr/KA==";
       };
     };
-    "@commitlint/types-11.0.0" = {
+    "@commitlint/types-12.0.0" = {
       name = "_at_commitlint_slash_types";
       packageName = "@commitlint/types";
-      version = "11.0.0";
+      version = "12.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/types/-/types-11.0.0.tgz";
-        sha512 = "VoNqai1vR5anRF5Tuh/+SWDFk7xi7oMwHrHrbm1BprYXjB2RJsWLhUrStMssDxEl5lW/z3EUdg8RvH/IUBccSQ==";
+        url = "https://registry.npmjs.org/@commitlint/types/-/types-12.0.0.tgz";
+        sha512 = "ADW/GEwDdgf7ppNq+S2T8J6XgATi2yndXddu+ZV8wlHFpL1DhjPbuPA9RYLnJcp44xQSe/cEV7a7Z43Ryy1S9Q==";
       };
     };
     "@istanbuljs/load-nyc-config-1.1.0" = {
@@ -931,49 +922,58 @@ let
         sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==";
       };
     };
-    "@nodelib/fs.scandir-2.1.3" = {
+    "@nodelib/fs.scandir-2.1.4" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
-        sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
+        sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
       };
     };
-    "@nodelib/fs.stat-2.0.3" = {
+    "@nodelib/fs.stat-2.0.4" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
-        sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
+        sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
       };
     };
-    "@nodelib/fs.walk-1.2.4" = {
+    "@nodelib/fs.walk-1.2.6" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.4";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
-        sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
+        sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
       };
     };
-    "@octokit/auth-token-2.4.2" = {
+    "@octokit/auth-token-2.4.4" = {
       name = "_at_octokit_slash_auth-token";
       packageName = "@octokit/auth-token";
-      version = "2.4.2";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz";
-        sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ==";
+        url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz";
+        sha512 = "LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==";
       };
     };
-    "@octokit/endpoint-6.0.6" = {
+    "@octokit/endpoint-6.0.10" = {
       name = "_at_octokit_slash_endpoint";
       packageName = "@octokit/endpoint";
-      version = "6.0.6";
+      version = "6.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.6.tgz";
-        sha512 = "7Cc8olaCoL/mtquB7j/HTbPM+sY6Ebr4k2X2y4JoXpVKQ7r5xB4iGQE0IoO58wIPsUk4AzoT65AMEpymSbWTgQ==";
+        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz";
+        sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==";
+      };
+    };
+    "@octokit/openapi-types-3.1.1" = {
+      name = "_at_octokit_slash_openapi-types";
+      packageName = "@octokit/openapi-types";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-3.1.1.tgz";
+        sha512 = "4BsrIf9/WLRbl0IVPEPLDTROduvYR57xCldy47YFQp/TZ9DbREQZbeCrJIe7a+Qjb3qk0KwZmxNYYW8mNQY/HQ==";
       };
     };
     "@octokit/plugin-paginate-rest-1.1.2" = {
@@ -985,13 +985,13 @@ let
         sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==";
       };
     };
-    "@octokit/plugin-request-log-1.0.0" = {
+    "@octokit/plugin-request-log-1.0.2" = {
       name = "_at_octokit_slash_plugin-request-log";
       packageName = "@octokit/plugin-request-log";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz";
-        sha512 = "ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==";
+        url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz";
+        sha512 = "oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==";
       };
     };
     "@octokit/plugin-rest-endpoint-methods-2.4.0" = {
@@ -1003,13 +1003,13 @@ let
         sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==";
       };
     };
-    "@octokit/request-5.4.8" = {
+    "@octokit/request-5.4.12" = {
       name = "_at_octokit_slash_request";
       packageName = "@octokit/request";
-      version = "5.4.8";
+      version = "5.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.8.tgz";
-        sha512 = "mWbxjsARJzAq5xp+ZrQfotc+MHFz3/Am2qATJwflv4PZ1TjhgIJnr60PCVdZT9Z/tl+uPXooaVgeviy1KkDlLQ==";
+        url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.12.tgz";
+        sha512 = "MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg==";
       };
     };
     "@octokit/request-error-1.2.1" = {
@@ -1021,13 +1021,13 @@ let
         sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==";
       };
     };
-    "@octokit/request-error-2.0.2" = {
+    "@octokit/request-error-2.0.4" = {
       name = "_at_octokit_slash_request-error";
       packageName = "@octokit/request-error";
-      version = "2.0.2";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz";
-        sha512 = "2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==";
+        url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz";
+        sha512 = "LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA==";
       };
     };
     "@octokit/rest-16.43.2" = {
@@ -1048,13 +1048,13 @@ let
         sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==";
       };
     };
-    "@octokit/types-5.4.1" = {
+    "@octokit/types-6.4.2" = {
       name = "_at_octokit_slash_types";
       packageName = "@octokit/types";
-      version = "5.4.1";
+      version = "6.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/types/-/types-5.4.1.tgz";
-        sha512 = "OlMlSySBJoJ6uozkr/i03nO5dlYQyE05vmQNZhAh9MyO4DPBP88QlwsDVLmVjIMFssvIZB6WO0ctIGMRG+xsJQ==";
+        url = "https://registry.npmjs.org/@octokit/types/-/types-6.4.2.tgz";
+        sha512 = "c3OswFOjp0MydgIxWcu/wIXK9sfoBL2gLjqMZA+KKdvvcwh6g2z0eMu219rFrZzi0KQunO9l/a9yHb9T/AlU1A==";
       };
     };
     "@semantic-release/commit-analyzer-6.3.3" = {
@@ -1102,13 +1102,13 @@ let
         sha512 = "LGjgPBGjjmjap/76O0Md3wc04Y7IlLnzZceLsAkcYRwGQdRPTTFUJKqDQTuieWTs7zfHzQoZqsqPfFxEN+g2+Q==";
       };
     };
-    "@sinonjs/commons-1.8.1" = {
+    "@sinonjs/commons-1.8.2" = {
       name = "_at_sinonjs_slash_commons";
       packageName = "@sinonjs/commons";
-      version = "1.8.1";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz";
-        sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==";
+        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz";
+        sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==";
       };
     };
     "@sinonjs/formatio-3.2.2" = {
@@ -1147,15 +1147,6 @@ let
         sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==";
       };
     };
-    "@types/color-name-1.1.1" = {
-      name = "_at_types_slash_color-name";
-      packageName = "@types/color-name";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz";
-        sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==";
-      };
-    };
     "@types/glob-7.1.3" = {
       name = "_at_types_slash_glob";
       packageName = "@types/glob";
@@ -1174,22 +1165,22 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/minimist-1.2.0" = {
+    "@types/minimist-1.2.1" = {
       name = "_at_types_slash_minimist";
       packageName = "@types/minimist";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6";
+        url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz";
+        sha512 = "fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==";
       };
     };
-    "@types/node-14.10.0" = {
+    "@types/node-14.14.22" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.10.0";
+      version = "14.14.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.10.0.tgz";
-        sha512 = "SOIyrdADB4cq6eY1F+9iU48iIomFAPltu11LCvA9PKcyEwHadjCFzNVPotAR+oEJA0bCP4Xvvgy+vwu1ZjVh8g==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
+        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
       };
     };
     "@types/normalize-package-data-2.4.0" = {
@@ -1327,13 +1318,13 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
-    "ansi-styles-4.2.1" = {
+    "ansi-styles-4.3.0" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
-      version = "4.2.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz";
-        sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
+        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
       };
     };
     "ansicolors-0.3.2" = {
@@ -1687,13 +1678,13 @@ let
         sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
       };
     };
-    "browserslist-4.14.2" = {
+    "browserslist-4.16.1" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.14.2";
+      version = "4.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz";
-        sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz";
+        sha512 = "UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==";
       };
     };
     "btoa-lite-1.0.0" = {
@@ -1741,31 +1732,13 @@ let
         sha512 = "kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==";
       };
     };
-    "caller-callsite-2.0.0" = {
-      name = "caller-callsite";
-      packageName = "caller-callsite";
-      version = "2.0.0";
+    "call-bind-1.0.2" = {
+      name = "call-bind";
+      packageName = "call-bind";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz";
-        sha1 = "847e0fce0a223750a9a027c54b33731ad3154134";
-      };
-    };
-    "caller-path-2.0.0" = {
-      name = "caller-path";
-      packageName = "caller-path";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz";
-        sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4";
-      };
-    };
-    "callsites-2.0.0" = {
-      name = "callsites";
-      packageName = "callsites";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz";
-        sha1 = "06eb84f00eea413da86affefacbffb36093b3c50";
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
+        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
       };
     };
     "callsites-3.1.0" = {
@@ -1804,13 +1777,13 @@ let
         sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==";
       };
     };
-    "caniuse-lite-1.0.30001125" = {
+    "caniuse-lite-1.0.30001179" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001125";
+      version = "1.0.30001179";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001125.tgz";
-        sha512 = "9f+r7BW8Qli917mU3j0fUaTweT3f3vnX/Lcs+1C73V+RADmFme+Ih0Br8vONQi3X0lseOe6ZHfsZLCA8MSjxUA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz";
+        sha512 = "blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==";
       };
     };
     "capture-stack-trace-1.0.1" = {
@@ -1840,13 +1813,13 @@ let
         sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
       };
     };
-    "chai-4.2.0" = {
+    "chai-4.1.2" = {
       name = "chai";
       packageName = "chai";
-      version = "4.2.0";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz";
-        sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==";
+        url = "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz";
+        sha1 = "0f64584ba642f0f2ace2806279f4f06ca23ad73c";
       };
     };
     "chalk-2.4.2" = {
@@ -1948,13 +1921,13 @@ let
         sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
       };
     };
-    "cli-table-0.3.1" = {
+    "cli-table-0.3.4" = {
       name = "cli-table";
       packageName = "cli-table";
-      version = "0.3.1";
+      version = "0.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
-        sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
+        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.4.tgz";
+        sha512 = "1vinpnX/ZERcmE443i3SZTmU5DF0rPO9DrL4I2iVAllhxzCM9SzPlHnz19fsZB78htkKZvYBvj6SZ6vXnaxmTA==";
       };
     };
     "cli-width-2.2.1" = {
@@ -2047,6 +2020,15 @@ let
         sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
       };
     };
+    "colorette-1.2.1" = {
+      name = "colorette";
+      packageName = "colorette";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz";
+        sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==";
+      };
+    };
     "colors-0.6.2" = {
       name = "colors";
       packageName = "colors";
@@ -2056,15 +2038,6 @@ let
         sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
       };
     };
-    "colors-1.0.3" = {
-      name = "colors";
-      packageName = "colors";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
-        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
-      };
-    };
     "combined-stream-0.0.7" = {
       name = "combined-stream";
       packageName = "combined-stream";
@@ -2101,13 +2074,13 @@ let
         sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==";
       };
     };
-    "commitizen-4.2.1" = {
+    "commitizen-4.2.3" = {
       name = "commitizen";
       packageName = "commitizen";
-      version = "4.2.1";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.1.tgz";
-        sha512 = "nZsp8IThkDu7C+93BFD/mLShb9Gd6Wsaf90tpKE3x/6u5y/Q52kzanIJpGr0qvIsJ5bCMpgKtr3Lbu3miEJfaA==";
+        url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.3.tgz";
+        sha512 = "pYlYEng7XMV2TW4xtjDKBGqeJ0Teq2zyRSx2S3Ml1XAplHSlJZK8vm1KdGclpMEZuGafbS5TeHXIVnHk8RWIzQ==";
       };
     };
     "commondir-1.0.1" = {
@@ -2155,22 +2128,22 @@ let
         sha512 = "nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA==";
       };
     };
-    "conventional-changelog-angular-5.0.11" = {
+    "conventional-changelog-angular-5.0.12" = {
       name = "conventional-changelog-angular";
       packageName = "conventional-changelog-angular";
-      version = "5.0.11";
+      version = "5.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz";
-        sha512 = "nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw==";
+        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz";
+        sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==";
       };
     };
-    "conventional-changelog-writer-4.0.17" = {
+    "conventional-changelog-writer-4.1.0" = {
       name = "conventional-changelog-writer";
       packageName = "conventional-changelog-writer";
-      version = "4.0.17";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz";
-        sha512 = "IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw==";
+        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz";
+        sha512 = "WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw==";
       };
     };
     "conventional-commit-types-2.3.0" = {
@@ -2191,22 +2164,22 @@ let
         sha512 = "SmmCYnOniSsAa9GqWOeLqc179lfr5TRu5b4QFDkbsrJ5TZjPJx85wtOr3zn+1dbeNiXDKGPbZ72IKbPhLXh/Lg==";
       };
     };
-    "conventional-commits-filter-2.0.6" = {
+    "conventional-commits-filter-2.0.7" = {
       name = "conventional-commits-filter";
       packageName = "conventional-commits-filter";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz";
-        sha512 = "4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==";
+        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz";
+        sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==";
       };
     };
-    "conventional-commits-parser-3.1.0" = {
+    "conventional-commits-parser-3.2.0" = {
       name = "conventional-commits-parser";
       packageName = "conventional-commits-parser";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz";
-        sha512 = "RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA==";
+        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz";
+        sha512 = "XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ==";
       };
     };
     "convert-source-map-1.7.0" = {
@@ -2227,13 +2200,13 @@ let
         sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
       };
     };
-    "core-js-compat-3.6.5" = {
+    "core-js-compat-3.8.3" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.6.5";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz";
-        sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz";
+        sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2245,13 +2218,13 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "cosmiconfig-5.2.1" = {
+    "cosmiconfig-6.0.0" = {
       name = "cosmiconfig";
       packageName = "cosmiconfig";
-      version = "5.2.1";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz";
-        sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==";
+        url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz";
+        sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==";
       };
     };
     "cosmiconfig-7.0.0" = {
@@ -2389,13 +2362,22 @@ let
         sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
       };
     };
-    "debug-4.2.0" = {
+    "debug-3.2.7" = {
       name = "debug";
       packageName = "debug";
-      version = "4.2.0";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz";
-        sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
+        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
+      };
+    };
+    "debug-4.3.2" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
+        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
       };
     };
     "decamelize-1.2.0" = {
@@ -2614,13 +2596,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "electron-to-chromium-1.3.565" = {
+    "electron-to-chromium-1.3.642" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.565";
+      version = "1.3.642";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.565.tgz";
-        sha512 = "me5dGlHFd8Q7mKhqbWRLIYnKjw4i0fO6hmW0JBxa7tM87fBfNEjWokRnDF7V+Qme/9IYpwhfMn+soWs40tXWqg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz";
+        sha512 = "cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -2668,13 +2650,13 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "es-abstract-1.17.6" = {
+    "es-abstract-1.18.0-next.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.17.6";
+      version = "1.18.0-next.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz";
-        sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
+        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -2695,13 +2677,13 @@ let
         sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==";
       };
     };
-    "escalade-3.0.2" = {
+    "escalade-3.1.1" = {
       name = "escalade";
       packageName = "escalade";
-      version = "3.0.2";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz";
-        sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==";
+        url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz";
+        sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -2812,22 +2794,22 @@ let
         sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
       };
     };
-    "fast-glob-3.2.4" = {
+    "fast-glob-3.2.5" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.4";
+      version = "3.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz";
-        sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
+        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
       };
     };
-    "fastq-1.8.0" = {
+    "fastq-1.10.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.8.0";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz";
-        sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
+        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
       };
     };
     "figures-2.0.0" = {
@@ -2974,13 +2956,13 @@ let
         sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==";
       };
     };
-    "flat-4.1.0" = {
+    "flat-4.1.1" = {
       name = "flat";
       packageName = "flat";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz";
-        sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==";
+        url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz";
+        sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==";
       };
     };
     "follow-redirects-1.5.10" = {
@@ -3046,13 +3028,13 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
-    "fromentries-1.2.1" = {
+    "fromentries-1.3.2" = {
       name = "fromentries";
       packageName = "fromentries";
-      version = "1.2.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.2.1.tgz";
-        sha512 = "Xu2Qh8yqYuDhQGOhD5iJGninErSfI9A3FrriD3tjUgV5VbJFeH8vfgZ9HnC6jWN80QDVNQK5vmxRAmEAp7Mevw==";
+        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz";
+        sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==";
       };
     };
     "fs-extra-8.1.0" = {
@@ -3100,13 +3082,13 @@ let
         sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
-    "gensync-1.0.0-beta.1" = {
+    "gensync-1.0.0-beta.2" = {
       name = "gensync";
       packageName = "gensync";
-      version = "1.0.0-beta.1";
+      version = "1.0.0-beta.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
-        sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==";
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
+        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
       };
     };
     "get-caller-file-1.0.3" = {
@@ -3136,6 +3118,15 @@ let
         sha1 = "ead774abee72e20409433a066366023dd6887a41";
       };
     };
+    "get-intrinsic-1.0.2" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
+        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
+      };
+    };
     "get-package-type-0.1.0" = {
       name = "get-package-type";
       packageName = "get-package-type";
@@ -3424,13 +3415,13 @@ let
         sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
       };
     };
-    "hasha-5.2.0" = {
+    "hasha-5.2.2" = {
       name = "hasha";
       packageName = "hasha";
-      version = "5.2.0";
+      version = "5.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz";
-        sha512 = "2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==";
+        url = "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz";
+        sha512 = "Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==";
       };
     };
     "hawk-1.1.1" = {
@@ -3487,6 +3478,15 @@ let
         sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
       };
     };
+    "hosted-git-info-3.0.7" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "3.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz";
+        sha512 = "fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==";
+      };
+    };
     "html-escaper-2.0.2" = {
       name = "html-escaper";
       packageName = "html-escaper";
@@ -3559,22 +3559,13 @@ let
         sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
       };
     };
-    "import-fresh-2.0.0" = {
+    "import-fresh-3.3.0" = {
       name = "import-fresh";
       packageName = "import-fresh";
-      version = "2.0.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz";
-        sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
-      };
-    };
-    "import-fresh-3.2.1" = {
-      name = "import-fresh";
-      packageName = "import-fresh";
-      version = "3.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz";
-        sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==";
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz";
+        sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
       };
     };
     "import-from-3.0.0" = {
@@ -3604,13 +3595,13 @@ let
         sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     };
-    "in-publish-2.0.1" = {
+    "in-publish-2.0.0" = {
       name = "in-publish";
       packageName = "in-publish";
-      version = "2.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz";
-        sha512 = "oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==";
+        url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz";
+        sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51";
       };
     };
     "indent-string-4.0.0" = {
@@ -3640,13 +3631,13 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.5" = {
+    "ini-1.3.8" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.5";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
+        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
     "inquirer-6.5.2" = {
@@ -3730,22 +3721,22 @@ let
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-buffer-2.0.4" = {
+    "is-buffer-2.0.5" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
-        sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz";
+        sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==";
       };
     };
-    "is-callable-1.2.1" = {
+    "is-callable-1.2.2" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz";
-        sha512 = "wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
+        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
       };
     };
     "is-ci-1.2.1" = {
@@ -3757,6 +3748,15 @@ let
         sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==";
       };
     };
+    "is-core-module-2.2.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
+        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
+      };
+    };
     "is-data-descriptor-0.1.4" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -3802,15 +3802,6 @@ let
         sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
       };
     };
-    "is-directory-0.3.1" = {
-      name = "is-directory";
-      packageName = "is-directory";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz";
-        sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1";
-      };
-    };
     "is-extendable-0.1.1" = {
       name = "is-extendable";
       packageName = "is-extendable";
@@ -3892,6 +3883,15 @@ let
         sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
       };
     };
+    "is-negative-zero-2.0.1" = {
+      name = "is-negative-zero";
+      packageName = "is-negative-zero";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
+        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
+      };
+    };
     "is-npm-1.0.0" = {
       name = "is-npm";
       packageName = "is-npm";
@@ -3937,13 +3937,13 @@ let
         sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==";
       };
     };
-    "is-object-1.0.1" = {
+    "is-object-1.0.2" = {
       name = "is-object";
       packageName = "is-object";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz";
-        sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
+        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz";
+        sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==";
       };
     };
     "is-path-inside-1.0.1" = {
@@ -4315,13 +4315,13 @@ let
         sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
       };
     };
-    "just-extend-4.1.0" = {
+    "just-extend-4.1.1" = {
       name = "just-extend";
       packageName = "just-extend";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz";
-        sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==";
+        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz";
+        sha512 = "aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==";
       };
     };
     "kind-of-3.2.2" = {
@@ -4657,6 +4657,15 @@ let
         sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
       };
     };
+    "lru-cache-6.0.0" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
+        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
+      };
+    };
     "macos-release-2.4.1" = {
       name = "macos-release";
       packageName = "macos-release";
@@ -4747,13 +4756,13 @@ let
         sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
       };
     };
-    "marked-0.6.3" = {
+    "marked-0.7.0" = {
       name = "marked";
       packageName = "marked";
-      version = "0.6.3";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz";
-        sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==";
+        url = "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz";
+        sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==";
       };
     };
     "marked-terminal-3.3.0" = {
@@ -4783,13 +4792,13 @@ let
         sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
       };
     };
-    "meow-7.1.1" = {
+    "meow-8.1.2" = {
       name = "meow";
       packageName = "meow";
-      version = "7.1.1";
+      version = "8.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz";
-        sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==";
+        url = "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz";
+        sha512 = "r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==";
       };
     };
     "merge-1.2.1" = {
@@ -4855,13 +4864,13 @@ let
         sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
       };
     };
-    "mime-2.4.6" = {
+    "mime-2.5.0" = {
       name = "mime";
       packageName = "mime";
-      version = "2.4.6";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz";
-        sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==";
+        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
+        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
       };
     };
     "mime-types-1.0.2" = {
@@ -4963,13 +4972,13 @@ let
         sha512 = "qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ==";
       };
     };
-    "mocha-junit-reporter-1.23.3" = {
+    "mocha-junit-reporter-1.18.0" = {
       name = "mocha-junit-reporter";
       packageName = "mocha-junit-reporter";
-      version = "1.23.3";
+      version = "1.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz";
-        sha512 = "ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==";
+        url = "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.18.0.tgz";
+        sha512 = "y3XuqKa2+HRYtg0wYyhW/XsLm2Ps+pqf9HaTAt7+MVUAKFJaNAHOrNseTZo9KCxjfIbxUWwckP5qCDDPUmjSWA==";
       };
     };
     "mocha-multi-reporters-1.1.7" = {
@@ -5026,6 +5035,15 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
+    "ms-2.1.3" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
+      };
+    };
     "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -5035,13 +5053,13 @@ let
         sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
-    "nan-2.14.1" = {
+    "nan-2.14.2" = {
       name = "nan";
       packageName = "nan";
-      version = "2.14.1";
+      version = "2.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz";
-        sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==";
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz";
+        sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -5134,13 +5152,13 @@ let
         sha512 = "RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==";
       };
     };
-    "node-releases-1.1.61" = {
+    "node-releases-1.1.70" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.61";
+      version = "1.1.70";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz";
-        sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz";
+        sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==";
       };
     };
     "node-uuid-1.4.8" = {
@@ -5179,6 +5197,15 @@ let
         sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
       };
     };
+    "normalize-package-data-3.0.0" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz";
+        sha512 = "6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==";
+      };
+    };
     "normalize-path-2.1.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
@@ -5206,13 +5233,13 @@ let
         sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==";
       };
     };
-    "npm-6.14.8" = {
+    "npm-6.14.11" = {
       name = "npm";
       packageName = "npm";
-      version = "6.14.8";
+      version = "6.14.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-6.14.8.tgz";
-        sha512 = "HBZVBMYs5blsj94GTeQZel7s9odVuuSUHy1+AlZh7rPVux1os2ashvEGLy/STNK7vUjbrCg5Kq9/GXisJgdf6A==";
+        url = "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz";
+        sha512 = "1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ==";
       };
     };
     "npm-run-path-2.0.2" = {
@@ -5269,13 +5296,13 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-inspect-1.8.0" = {
+    "object-inspect-1.9.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.8.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
-        sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
+        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -5305,13 +5332,22 @@ let
         sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.getownpropertydescriptors-2.1.0" = {
+    "object.assign-4.1.2" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
+      };
+    };
+    "object.getownpropertydescriptors-2.1.1" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
-        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz";
+        sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==";
       };
     };
     "object.pick-1.3.0" = {
@@ -5593,13 +5629,13 @@ let
         sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
       };
     };
-    "parse-json-5.1.0" = {
+    "parse-json-5.2.0" = {
       name = "parse-json";
       packageName = "parse-json";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz";
-        sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==";
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz";
+        sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -5827,13 +5863,13 @@ let
         sha512 = "1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==";
       };
     };
-    "proxyquire-2.1.3" = {
+    "proxyquire-2.1.0" = {
       name = "proxyquire";
       packageName = "proxyquire";
-      version = "2.1.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz";
-        sha512 = "BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==";
+        url = "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.0.tgz";
+        sha512 = "kptdFArCfGRtQFv3Qwjr10lwbEV0TBJYvfqzhwucyfEXqVgmnAkyEw/S3FYzR5HI9i5QOq4rcqQjZ6AlknlCDQ==";
       };
     };
     "pseudomap-1.0.2" = {
@@ -5944,15 +5980,6 @@ let
         sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
       };
     };
-    "read-pkg-up-6.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz";
-        sha512 = "odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw==";
-      };
-    };
     "read-pkg-up-7.0.1" = {
       name = "read-pkg-up";
       packageName = "read-pkg-up";
@@ -5980,6 +6007,15 @@ let
         sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
+    "readable-stream-3.6.0" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
+      };
+    };
     "readdirp-2.2.1" = {
       name = "readdirp";
       packageName = "readdirp";
@@ -6007,13 +6043,13 @@ let
         sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b";
       };
     };
-    "regenerate-1.4.1" = {
+    "regenerate-1.4.2" = {
       name = "regenerate";
       packageName = "regenerate";
-      version = "1.4.1";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz";
-        sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==";
+        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz";
+        sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
       };
     };
     "regenerate-unicode-properties-8.2.0" = {
@@ -6052,13 +6088,13 @@ let
         sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
-    "regexpu-core-4.7.0" = {
+    "regexpu-core-4.7.1" = {
       name = "regexpu-core";
       packageName = "regexpu-core";
-      version = "4.7.0";
+      version = "4.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz";
-        sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==";
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz";
+        sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==";
       };
     };
     "registry-auth-token-3.4.0" = {
@@ -6070,13 +6106,13 @@ let
         sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
       };
     };
-    "registry-auth-token-4.2.0" = {
+    "registry-auth-token-4.2.1" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz";
-        sha512 = "P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==";
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz";
+        sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==";
       };
     };
     "registry-url-3.1.0" = {
@@ -6097,13 +6133,13 @@ let
         sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
       };
     };
-    "regjsparser-0.6.4" = {
+    "regjsparser-0.6.6" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.6.4";
+      version = "0.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
-        sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz";
+        sha512 = "jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==";
       };
     };
     "release-zalgo-1.0.0" = {
@@ -6178,13 +6214,22 @@ let
         sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
       };
     };
-    "resolve-1.17.0" = {
+    "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.17.0";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz";
-        sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+      };
+    };
+    "resolve-1.8.1" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz";
+        sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==";
       };
     };
     "resolve-dir-1.0.1" = {
@@ -6196,15 +6241,6 @@ let
         sha1 = "79a40644c362be82f26effe739c9bb5382046f43";
       };
     };
-    "resolve-from-3.0.0" = {
-      name = "resolve-from";
-      packageName = "resolve-from";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz";
-        sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
-      };
-    };
     "resolve-from-4.0.0" = {
       name = "resolve-from";
       packageName = "resolve-from";
@@ -6313,13 +6349,13 @@ let
         sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==";
       };
     };
-    "run-parallel-1.1.9" = {
+    "run-parallel-1.1.10" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.9";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
-        sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz";
+        sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==";
       };
     };
     "rxjs-6.6.3" = {
@@ -6358,13 +6394,13 @@ let
         sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
-    "semantic-release-15.13.18" = {
+    "semantic-release-15.14.0" = {
       name = "semantic-release";
       packageName = "semantic-release";
-      version = "15.13.18";
+      version = "15.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semantic-release/-/semantic-release-15.13.18.tgz";
-        sha512 = "JtfdrhF1zRm91nJH/Rg3taftbWGwktJqqrJJdbmZGKYx63cfC4PoaS0jxRifGJUdmmgW/Kxz8f5bhtB+p1bu8A==";
+        url = "https://registry.npmjs.org/semantic-release/-/semantic-release-15.14.0.tgz";
+        sha512 = "Cn43W35AOLY0RMcDbtwhJODJmWg6YCs1+R5jRQsTmmkEGzkV4B2F/QXkjVZpl4UbH91r93GGH0xhoq9kh7I5PA==";
       };
     };
     "semver-5.7.1" = {
@@ -6394,6 +6430,15 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
+    "semver-7.3.4" = {
+      name = "semver";
+      packageName = "semver";
+      version = "7.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
+        sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
+      };
+    };
     "semver-diff-2.1.0" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -6484,13 +6529,13 @@ let
         sha512 = "iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w==";
       };
     };
-    "sinon-6.3.5" = {
+    "sinon-6.3.4" = {
       name = "sinon";
       packageName = "sinon";
-      version = "6.3.5";
+      version = "6.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sinon/-/sinon-6.3.5.tgz";
-        sha512 = "xgoZ2gKjyVRcF08RrIQc+srnSyY1JDJtxu3Nsz07j1ffjgXoY6uPLf/qja6nDBZgzYYEovVkFryw2+KiZz11xQ==";
+        url = "https://registry.npmjs.org/sinon/-/sinon-6.3.4.tgz";
+        sha512 = "NIaR56Z1mefuRBXYrf4otqBxkWiKveX+fvqs3HzFq2b07HcgpkMgIwmQM/owNjNFAHkx0kJXW+Q0mDthiuslXw==";
       };
     };
     "slash-2.0.0" = {
@@ -6655,13 +6700,13 @@ let
         sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.5" = {
+    "spdx-license-ids-3.0.7" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.5";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
+        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
       };
     };
     "split-0.2.10" = {
@@ -6781,22 +6826,22 @@ let
         sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
       };
     };
-    "string.prototype.trimend-1.0.1" = {
+    "string.prototype.trimend-1.0.3" = {
       name = "string.prototype.trimend";
       packageName = "string.prototype.trimend";
-      version = "1.0.1";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
-        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
       };
     };
-    "string.prototype.trimstart-1.0.1" = {
+    "string.prototype.trimstart-1.0.3" = {
       name = "string.prototype.trimstart";
       packageName = "string.prototype.trimstart";
-      version = "1.0.1";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
-        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
       };
     };
     "string_decoder-0.10.31" = {
@@ -7042,13 +7087,13 @@ let
         sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
       };
     };
-    "through2-3.0.2" = {
+    "through2-4.0.2" = {
       name = "through2";
       packageName = "through2";
-      version = "3.0.2";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz";
-        sha512 = "enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==";
+        url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz";
+        sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==";
       };
     };
     "timed-out-4.0.1" = {
@@ -7159,13 +7204,13 @@ let
         sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3";
       };
     };
-    "tslib-1.13.0" = {
+    "tslib-1.14.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz";
-        sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
+        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -7186,13 +7231,13 @@ let
         sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==";
       };
     };
-    "type-fest-0.13.1" = {
+    "type-fest-0.18.1" = {
       name = "type-fest";
       packageName = "type-fest";
-      version = "0.13.1";
+      version = "0.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz";
-        sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==";
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz";
+        sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==";
       };
     };
     "type-fest-0.3.1" = {
@@ -7204,15 +7249,6 @@ let
         sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==";
       };
     };
-    "type-fest-0.5.2" = {
-      name = "type-fest";
-      packageName = "type-fest";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz";
-        sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==";
-      };
-    };
     "type-fest-0.6.0" = {
       name = "type-fest";
       packageName = "type-fest";
@@ -7240,13 +7276,13 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "uglify-js-3.10.4" = {
+    "uglify-js-3.12.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.10.4";
+      version = "3.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz";
-        sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
+        sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
       };
     };
     "undefsafe-2.0.3" = {
@@ -7429,15 +7465,6 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "uuid-3.3.2" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
-      };
-    };
     "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
@@ -7600,13 +7627,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.0" = {
+    "y18n-4.0.1" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
+        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
       };
     };
     "yallist-2.1.2" = {
@@ -7618,6 +7645,15 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
+    "yallist-4.0.0" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
+        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
+      };
+    };
     "yaml-1.10.0" = {
       name = "yaml";
       packageName = "yaml";
@@ -7681,6 +7717,15 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
+    "yargs-parser-20.2.4" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "20.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz";
+        sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==";
+      };
+    };
     "yargs-unparser-1.5.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
@@ -7696,72 +7741,68 @@ in
   commitizen = nodeEnv.buildNodePackage {
     name = "commitizen";
     packageName = "commitizen";
-    version = "4.2.1";
+    version = "4.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.1.tgz";
-      sha512 = "nZsp8IThkDu7C+93BFD/mLShb9Gd6Wsaf90tpKE3x/6u5y/Q52kzanIJpGr0qvIsJ5bCMpgKtr3Lbu3miEJfaA==";
+      url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.3.tgz";
+      sha512 = "pYlYEng7XMV2TW4xtjDKBGqeJ0Teq2zyRSx2S3Ml1XAplHSlJZK8vm1KdGclpMEZuGafbS5TeHXIVnHk8RWIzQ==";
     };
     dependencies = [
       sources."@babel/cli-7.11.6"
-      sources."@babel/code-frame-7.10.4"
-      (sources."@babel/compat-data-7.11.0" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."@babel/code-frame-7.12.11"
+      sources."@babel/compat-data-7.12.7"
       (sources."@babel/core-7.11.6" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.2"
           sources."ms-2.1.2"
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/generator-7.11.6"
-      sources."@babel/helper-annotate-as-pure-7.10.4"
+      sources."@babel/generator-7.12.11"
+      sources."@babel/helper-annotate-as-pure-7.12.10"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
-      (sources."@babel/helper-compilation-targets-7.10.4" // {
+      (sources."@babel/helper-compilation-targets-7.12.5" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/helper-create-class-features-plugin-7.10.5"
-      sources."@babel/helper-create-regexp-features-plugin-7.10.4"
+      sources."@babel/helper-create-class-features-plugin-7.12.1"
+      sources."@babel/helper-create-regexp-features-plugin-7.12.7"
       sources."@babel/helper-define-map-7.10.5"
-      sources."@babel/helper-explode-assignable-expression-7.11.4"
-      sources."@babel/helper-function-name-7.10.4"
-      sources."@babel/helper-get-function-arity-7.10.4"
+      sources."@babel/helper-explode-assignable-expression-7.12.1"
+      sources."@babel/helper-function-name-7.12.11"
+      sources."@babel/helper-get-function-arity-7.12.10"
       sources."@babel/helper-hoist-variables-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.11.0"
-      sources."@babel/helper-module-imports-7.10.4"
-      sources."@babel/helper-module-transforms-7.11.0"
-      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
+      sources."@babel/helper-module-imports-7.12.5"
+      sources."@babel/helper-module-transforms-7.12.1"
+      sources."@babel/helper-optimise-call-expression-7.12.10"
       sources."@babel/helper-plugin-utils-7.10.4"
-      sources."@babel/helper-regex-7.10.5"
-      sources."@babel/helper-remap-async-to-generator-7.11.4"
-      sources."@babel/helper-replace-supers-7.10.4"
-      sources."@babel/helper-simple-access-7.10.4"
-      sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0"
-      sources."@babel/helper-split-export-declaration-7.11.0"
-      sources."@babel/helper-validator-identifier-7.10.4"
-      sources."@babel/helper-wrap-function-7.10.4"
-      sources."@babel/helpers-7.10.4"
+      sources."@babel/helper-remap-async-to-generator-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.11"
+      sources."@babel/helper-simple-access-7.12.1"
+      sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
+      sources."@babel/helper-split-export-declaration-7.12.11"
+      sources."@babel/helper-validator-identifier-7.12.11"
+      sources."@babel/helper-validator-option-7.12.11"
+      sources."@babel/helper-wrap-function-7.12.3"
+      sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.11.5"
-      sources."@babel/plugin-proposal-async-generator-functions-7.10.5"
-      sources."@babel/plugin-proposal-class-properties-7.10.4"
-      sources."@babel/plugin-proposal-dynamic-import-7.10.4"
-      sources."@babel/plugin-proposal-export-namespace-from-7.10.4"
-      sources."@babel/plugin-proposal-json-strings-7.10.4"
-      sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0"
-      sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4"
-      sources."@babel/plugin-proposal-numeric-separator-7.10.4"
-      sources."@babel/plugin-proposal-object-rest-spread-7.9.0"
-      sources."@babel/plugin-proposal-optional-catch-binding-7.10.4"
-      sources."@babel/plugin-proposal-optional-chaining-7.11.0"
-      sources."@babel/plugin-proposal-private-methods-7.10.4"
-      sources."@babel/plugin-proposal-unicode-property-regex-7.10.4"
+      sources."@babel/parser-7.12.11"
+      sources."@babel/plugin-proposal-async-generator-functions-7.12.12"
+      sources."@babel/plugin-proposal-class-properties-7.12.1"
+      sources."@babel/plugin-proposal-dynamic-import-7.12.1"
+      sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
+      sources."@babel/plugin-proposal-json-strings-7.12.1"
+      sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
+      sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.7"
+      sources."@babel/plugin-proposal-object-rest-spread-7.11.0"
+      sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
+      sources."@babel/plugin-proposal-optional-chaining-7.12.7"
+      sources."@babel/plugin-proposal-private-methods-7.12.1"
+      sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
-      sources."@babel/plugin-syntax-class-properties-7.10.4"
+      sources."@babel/plugin-syntax-class-properties-7.12.1"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
       sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
       sources."@babel/plugin-syntax-json-strings-7.8.3"
@@ -7771,60 +7812,70 @@ in
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
       sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
       sources."@babel/plugin-syntax-optional-chaining-7.8.3"
-      sources."@babel/plugin-syntax-top-level-await-7.10.4"
-      sources."@babel/plugin-transform-arrow-functions-7.10.4"
-      sources."@babel/plugin-transform-async-to-generator-7.10.4"
-      sources."@babel/plugin-transform-block-scoped-functions-7.10.4"
-      sources."@babel/plugin-transform-block-scoping-7.11.1"
-      sources."@babel/plugin-transform-classes-7.10.4"
-      sources."@babel/plugin-transform-computed-properties-7.10.4"
-      sources."@babel/plugin-transform-destructuring-7.10.4"
-      sources."@babel/plugin-transform-dotall-regex-7.10.4"
-      sources."@babel/plugin-transform-duplicate-keys-7.10.4"
-      sources."@babel/plugin-transform-exponentiation-operator-7.10.4"
-      sources."@babel/plugin-transform-for-of-7.10.4"
-      sources."@babel/plugin-transform-function-name-7.10.4"
-      sources."@babel/plugin-transform-literals-7.10.4"
-      sources."@babel/plugin-transform-member-expression-literals-7.10.4"
-      sources."@babel/plugin-transform-modules-amd-7.10.5"
-      sources."@babel/plugin-transform-modules-commonjs-7.10.4"
-      sources."@babel/plugin-transform-modules-systemjs-7.10.5"
-      sources."@babel/plugin-transform-modules-umd-7.10.4"
-      sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4"
-      sources."@babel/plugin-transform-new-target-7.10.4"
-      sources."@babel/plugin-transform-object-super-7.10.4"
-      sources."@babel/plugin-transform-parameters-7.10.5"
-      sources."@babel/plugin-transform-property-literals-7.10.4"
-      sources."@babel/plugin-transform-regenerator-7.10.4"
-      sources."@babel/plugin-transform-reserved-words-7.10.4"
-      sources."@babel/plugin-transform-shorthand-properties-7.10.4"
-      sources."@babel/plugin-transform-spread-7.11.0"
-      sources."@babel/plugin-transform-sticky-regex-7.10.4"
-      sources."@babel/plugin-transform-template-literals-7.10.5"
-      sources."@babel/plugin-transform-typeof-symbol-7.10.4"
-      sources."@babel/plugin-transform-unicode-escapes-7.10.4"
-      sources."@babel/plugin-transform-unicode-regex-7.10.4"
+      sources."@babel/plugin-syntax-top-level-await-7.12.1"
+      sources."@babel/plugin-transform-arrow-functions-7.12.1"
+      sources."@babel/plugin-transform-async-to-generator-7.12.1"
+      sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
+      sources."@babel/plugin-transform-block-scoping-7.12.12"
+      sources."@babel/plugin-transform-classes-7.12.1"
+      sources."@babel/plugin-transform-computed-properties-7.12.1"
+      sources."@babel/plugin-transform-destructuring-7.12.1"
+      sources."@babel/plugin-transform-dotall-regex-7.12.1"
+      sources."@babel/plugin-transform-duplicate-keys-7.12.1"
+      sources."@babel/plugin-transform-exponentiation-operator-7.12.1"
+      sources."@babel/plugin-transform-for-of-7.12.1"
+      sources."@babel/plugin-transform-function-name-7.12.1"
+      sources."@babel/plugin-transform-literals-7.12.1"
+      sources."@babel/plugin-transform-member-expression-literals-7.12.1"
+      sources."@babel/plugin-transform-modules-amd-7.12.1"
+      sources."@babel/plugin-transform-modules-commonjs-7.12.1"
+      sources."@babel/plugin-transform-modules-systemjs-7.12.1"
+      sources."@babel/plugin-transform-modules-umd-7.12.1"
+      sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1"
+      sources."@babel/plugin-transform-new-target-7.12.1"
+      sources."@babel/plugin-transform-object-super-7.12.1"
+      sources."@babel/plugin-transform-parameters-7.12.1"
+      sources."@babel/plugin-transform-property-literals-7.12.1"
+      sources."@babel/plugin-transform-regenerator-7.12.1"
+      sources."@babel/plugin-transform-reserved-words-7.12.1"
+      sources."@babel/plugin-transform-shorthand-properties-7.12.1"
+      sources."@babel/plugin-transform-spread-7.12.1"
+      sources."@babel/plugin-transform-sticky-regex-7.12.7"
+      sources."@babel/plugin-transform-template-literals-7.12.1"
+      sources."@babel/plugin-transform-typeof-symbol-7.12.10"
+      sources."@babel/plugin-transform-unicode-escapes-7.12.1"
+      sources."@babel/plugin-transform-unicode-regex-7.12.1"
       (sources."@babel/preset-env-7.11.5" // {
         dependencies = [
-          sources."@babel/plugin-proposal-object-rest-spread-7.11.0"
           sources."semver-5.7.1"
         ];
       })
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/register-7.11.5"
-      sources."@babel/runtime-7.11.2"
-      sources."@babel/template-7.10.4"
-      (sources."@babel/traverse-7.11.5" // {
+      sources."@babel/runtime-7.12.5"
+      sources."@babel/template-7.12.7"
+      (sources."@babel/traverse-7.12.12" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
-      sources."@babel/types-7.11.5"
-      sources."@commitlint/execute-rule-11.0.0"
-      (sources."@commitlint/load-11.0.0" // {
+      sources."@babel/types-7.12.12"
+      sources."@commitlint/execute-rule-12.0.0"
+      (sources."@commitlint/load-12.0.0" // {
         dependencies = [
-          sources."ansi-styles-4.2.1"
+          sources."ansi-styles-4.3.0"
+          sources."chalk-4.1.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
+        ];
+      })
+      sources."@commitlint/resolve-extends-12.0.0"
+      (sources."@commitlint/types-12.0.0" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
@@ -7832,8 +7883,6 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."@commitlint/resolve-extends-11.0.0"
-      sources."@commitlint/types-11.0.0"
       (sources."@istanbuljs/load-nyc-config-1.1.0" // {
         dependencies = [
           sources."find-up-4.1.0"
@@ -7844,30 +7893,31 @@ in
       })
       sources."@istanbuljs/nyc-config-babel-2.1.1"
       sources."@istanbuljs/schema-0.1.2"
-      sources."@nodelib/fs.scandir-2.1.3"
-      sources."@nodelib/fs.stat-2.0.3"
-      sources."@nodelib/fs.walk-1.2.4"
-      sources."@octokit/auth-token-2.4.2"
-      (sources."@octokit/endpoint-6.0.6" // {
+      sources."@nodelib/fs.scandir-2.1.4"
+      sources."@nodelib/fs.stat-2.0.4"
+      sources."@nodelib/fs.walk-1.2.6"
+      sources."@octokit/auth-token-2.4.4"
+      (sources."@octokit/endpoint-6.0.10" // {
         dependencies = [
           sources."is-plain-object-5.0.0"
           sources."universal-user-agent-6.0.0"
         ];
       })
+      sources."@octokit/openapi-types-3.1.1"
       (sources."@octokit/plugin-paginate-rest-1.1.2" // {
         dependencies = [
           sources."@octokit/types-2.16.2"
         ];
       })
-      sources."@octokit/plugin-request-log-1.0.0"
+      sources."@octokit/plugin-request-log-1.0.2"
       (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // {
         dependencies = [
           sources."@octokit/types-2.16.2"
         ];
       })
-      (sources."@octokit/request-5.4.8" // {
+      (sources."@octokit/request-5.4.12" // {
         dependencies = [
-          sources."@octokit/request-error-2.0.2"
+          sources."@octokit/request-error-2.0.4"
           sources."is-plain-object-5.0.0"
           sources."universal-user-agent-6.0.0"
         ];
@@ -7878,18 +7928,18 @@ in
         ];
       })
       sources."@octokit/rest-16.43.2"
-      sources."@octokit/types-5.4.1"
+      sources."@octokit/types-6.4.2"
       (sources."@semantic-release/commit-analyzer-6.3.3" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
       sources."@semantic-release/error-2.2.0"
       (sources."@semantic-release/github-5.5.8" // {
         dependencies = [
-          sources."debug-4.2.0"
-          sources."mime-2.4.6"
+          sources."debug-4.3.2"
+          sources."mime-2.5.0"
           sources."ms-2.1.2"
         ];
       })
@@ -7905,7 +7955,7 @@ in
           sources."p-finally-2.0.1"
           sources."path-key-3.1.1"
           sources."read-pkg-5.2.0"
-          sources."registry-auth-token-4.2.0"
+          sources."registry-auth-token-4.2.1"
           sources."shebang-command-2.0.0"
           sources."shebang-regex-3.0.0"
           sources."type-fest-0.6.0"
@@ -7914,7 +7964,7 @@ in
       })
       (sources."@semantic-release/release-notes-generator-7.3.5" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.2"
           sources."find-up-4.1.0"
           sources."get-stream-5.2.0"
           sources."locate-path-5.0.0"
@@ -7926,7 +7976,7 @@ in
           sources."type-fest-0.6.0"
         ];
       })
-      sources."@sinonjs/commons-1.8.1"
+      sources."@sinonjs/commons-1.8.2"
       (sources."@sinonjs/formatio-3.2.2" // {
         dependencies = [
           sources."@sinonjs/samsam-3.3.3"
@@ -7934,11 +7984,10 @@ in
       })
       sources."@sinonjs/samsam-2.1.3"
       sources."@sinonjs/text-encoding-0.7.1"
-      sources."@types/color-name-1.1.1"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/minimist-1.2.0"
-      sources."@types/node-14.10.0"
+      sources."@types/minimist-1.2.1"
+      sources."@types/node-14.14.22"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/retry-0.12.0"
@@ -7980,7 +8029,7 @@ in
       sources."aws-sign2-0.5.0"
       (sources."axios-0.19.0" // {
         dependencies = [
-          sources."is-buffer-2.0.4"
+          sources."is-buffer-2.0.5"
         ];
       })
       sources."babel-plugin-dynamic-import-node-2.3.3"
@@ -8015,7 +8064,7 @@ in
         ];
       })
       sources."browser-stdout-1.3.1"
-      sources."browserslist-4.14.2"
+      sources."browserslist-4.16.1"
       sources."btoa-lite-1.0.0"
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
@@ -8026,20 +8075,15 @@ in
           sources."write-file-atomic-3.0.3"
         ];
       })
-      (sources."caller-callsite-2.0.0" // {
-        dependencies = [
-          sources."callsites-2.0.0"
-        ];
-      })
-      sources."caller-path-2.0.0"
+      sources."call-bind-1.0.2"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001125"
+      sources."caniuse-lite-1.0.30001179"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
       sources."caseless-0.6.0"
-      sources."chai-4.2.0"
+      sources."chai-4.1.2"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."charenc-0.0.2"
@@ -8066,9 +8110,13 @@ in
       sources."clean-stack-2.2.0"
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
-      (sources."cli-table-0.3.1" // {
+      (sources."cli-table-0.3.4" // {
         dependencies = [
-          sources."colors-1.0.3"
+          sources."ansi-regex-5.0.0"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
       sources."cli-width-2.2.1"
@@ -8082,10 +8130,11 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
+      sources."colorette-1.2.1"
       sources."colors-0.6.2"
       sources."combined-stream-0.0.7"
       sources."commander-4.1.1"
-      sources."commitizen-4.2.1"
+      sources."commitizen-4.2.3"
       sources."commondir-1.0.1"
       (sources."compare-func-2.0.0" // {
         dependencies = [
@@ -8101,18 +8150,18 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."conventional-changelog-angular-5.0.11"
-      (sources."conventional-changelog-writer-4.0.17" // {
+      sources."conventional-changelog-angular-5.0.12"
+      (sources."conventional-changelog-writer-4.1.0" // {
         dependencies = [
           sources."split-1.0.1"
         ];
       })
       sources."conventional-commit-types-3.0.0"
-      sources."conventional-commits-filter-2.0.6"
-      sources."conventional-commits-parser-3.1.0"
+      sources."conventional-commits-filter-2.0.7"
+      sources."conventional-commits-parser-3.2.0"
       sources."convert-source-map-1.7.0"
       sources."copy-descriptor-0.1.1"
-      (sources."core-js-compat-3.6.5" // {
+      (sources."core-js-compat-3.8.3" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -8163,7 +8212,7 @@ in
       sources."duplexer-0.1.2"
       sources."duplexer2-0.1.4"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.565"
+      sources."electron-to-chromium-1.3.642"
       sources."emoji-regex-7.0.3"
       sources."end-of-stream-1.4.4"
       (sources."env-ci-4.5.2" // {
@@ -8183,10 +8232,10 @@ in
         ];
       })
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.6"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."es6-error-4.1.1"
-      sources."escalade-3.0.2"
+      sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."esutils-2.0.3"
@@ -8222,7 +8271,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      (sources."fast-glob-3.2.4" // {
+      (sources."fast-glob-3.2.5" // {
         dependencies = [
           sources."braces-3.0.2"
           sources."fill-range-7.0.1"
@@ -8232,7 +8281,7 @@ in
           sources."to-regex-range-5.0.1"
         ];
       })
-      sources."fastq-1.8.0"
+      sources."fastq-1.10.0"
       sources."figures-2.0.0"
       sources."file-uri-to-path-1.0.0"
       sources."fill-keys-1.0.2"
@@ -8252,9 +8301,9 @@ in
         ];
       })
       sources."findup-sync-3.0.0"
-      (sources."flat-4.1.0" // {
+      (sources."flat-4.1.1" // {
         dependencies = [
-          sources."is-buffer-2.0.4"
+          sources."is-buffer-2.0.5"
         ];
       })
       (sources."follow-redirects-1.5.10" // {
@@ -8276,15 +8325,16 @@ in
       sources."form-data-0.1.4"
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
-      sources."fromentries-1.2.1"
+      sources."fromentries-1.3.2"
       sources."fs-extra-8.1.0"
       sources."fs-readdir-recursive-1.1.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
       sources."get-func-name-2.0.0"
+      sources."get-intrinsic-1.0.2"
       sources."get-package-type-0.1.0"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
@@ -8333,7 +8383,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      (sources."hasha-5.2.0" // {
+      (sources."hasha-5.2.2" // {
         dependencies = [
           sources."is-stream-2.0.0"
         ];
@@ -8347,14 +8397,14 @@ in
       sources."html-escaper-2.0.2"
       (sources."http-proxy-agent-3.0.0" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
       sources."http-signature-0.10.1"
       (sources."https-proxy-agent-4.0.0" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
@@ -8362,7 +8412,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."ignore-5.1.8"
       sources."ignore-by-default-1.0.1"
-      (sources."import-fresh-3.2.1" // {
+      (sources."import-fresh-3.3.0" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -8370,11 +8420,11 @@ in
       sources."import-from-3.0.0"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
-      sources."in-publish-2.0.1"
+      sources."in-publish-2.0.0"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.5"
+      sources."ini-1.3.8"
       sources."inquirer-6.5.2"
       (sources."into-stream-5.1.1" // {
         dependencies = [
@@ -8387,17 +8437,18 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.1"
+      sources."is-callable-1.2.2"
       sources."is-ci-1.2.1"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
-      sources."is-directory-0.3.1"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-installed-globally-0.1.0"
+      sources."is-negative-zero-2.0.1"
       sources."is-npm-1.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
@@ -8405,7 +8456,7 @@ in
         ];
       })
       sources."is-obj-1.0.1"
-      sources."is-object-1.0.1"
+      sources."is-object-1.0.2"
       sources."is-path-inside-1.0.1"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
@@ -8433,7 +8484,6 @@ in
           sources."path-key-3.1.1"
           sources."shebang-command-2.0.0"
           sources."shebang-regex-3.0.0"
-          sources."uuid-3.4.0"
           sources."which-2.0.2"
         ];
       })
@@ -8447,7 +8497,7 @@ in
       })
       (sources."istanbul-lib-source-maps-4.0.0" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.2"
           sources."istanbul-lib-coverage-3.0.0"
           sources."ms-2.1.2"
           sources."source-map-0.6.1"
@@ -8465,7 +8515,7 @@ in
       sources."jsonfile-4.0.0"
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
-      sources."just-extend-4.1.0"
+      sources."just-extend-4.1.1"
       sources."kind-of-6.0.3"
       sources."latest-version-3.1.0"
       sources."lcid-2.0.0"
@@ -8512,7 +8562,7 @@ in
       sources."map-cache-0.2.2"
       sources."map-obj-4.1.0"
       sources."map-visit-1.0.0"
-      sources."marked-0.6.3"
+      sources."marked-0.7.0"
       sources."marked-terminal-3.3.0"
       sources."md5-2.3.0"
       (sources."mem-4.3.0" // {
@@ -8520,14 +8570,20 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      (sources."meow-7.1.1" // {
+      (sources."meow-8.1.2" // {
         dependencies = [
           sources."find-up-4.1.0"
+          sources."hosted-git-info-3.0.7"
           sources."locate-path-5.0.0"
+          sources."lru-cache-6.0.0"
+          sources."normalize-package-data-3.0.0"
           sources."p-locate-4.1.0"
           sources."path-exists-4.0.0"
           (sources."read-pkg-5.2.0" // {
             dependencies = [
+              sources."hosted-git-info-2.8.8"
+              sources."normalize-package-data-2.5.0"
+              sources."semver-5.7.1"
               sources."type-fest-0.6.0"
             ];
           })
@@ -8536,8 +8592,10 @@ in
               sources."type-fest-0.8.1"
             ];
           })
-          sources."type-fest-0.13.1"
-          sources."yargs-parser-18.1.3"
+          sources."semver-7.3.4"
+          sources."type-fest-0.18.1"
+          sources."yallist-4.0.0"
+          sources."yargs-parser-20.2.4"
         ];
       })
       sources."merge-1.2.1"
@@ -8567,26 +8625,27 @@ in
           sources."debug-3.2.6"
           sources."glob-7.1.3"
           sources."ms-2.1.1"
+          sources."object.assign-4.1.0"
           sources."strip-json-comments-2.0.1"
           sources."supports-color-6.0.0"
         ];
       })
-      (sources."mocha-junit-reporter-1.23.3" // {
+      (sources."mocha-junit-reporter-1.18.0" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
         ];
       })
       (sources."mocha-multi-reporters-1.1.7" // {
         dependencies = [
-          sources."debug-3.2.6"
-          sources."ms-2.1.2"
+          sources."debug-3.2.7"
+          sources."ms-2.1.3"
         ];
       })
       sources."modify-values-1.0.1"
       sources."module-not-found-error-1.0.1"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
-      sources."nan-2.14.1"
+      sources."nan-2.14.2"
       sources."nanomatch-1.2.13"
       sources."neo-async-2.6.2"
       sources."nerf-dart-1.0.0"
@@ -8605,12 +8664,12 @@ in
       sources."node-fetch-2.6.1"
       sources."node-modules-regexp-1.0.0"
       sources."node-preload-0.2.1"
-      sources."node-releases-1.1.61"
+      sources."node-releases-1.1.70"
       sources."node-uuid-1.4.8"
       (sources."nodemon-1.19.1" // {
         dependencies = [
-          sources."debug-3.2.6"
-          sources."ms-2.1.2"
+          sources."debug-3.2.7"
+          sources."ms-2.1.3"
           sources."semver-5.7.1"
         ];
       })
@@ -8622,13 +8681,13 @@ in
       })
       sources."normalize-path-3.0.0"
       sources."normalize-url-4.5.0"
-      sources."npm-6.14.8"
+      sources."npm-6.14.11"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
       (sources."nyc-15.1.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.2.1"
+          sources."ansi-styles-4.3.0"
           sources."cliui-6.0.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
@@ -8666,11 +8725,11 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.8.0"
+      sources."object-inspect-1.9.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.1.0"
+      sources."object.assign-4.1.2"
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."object.pick-1.3.0"
       sources."octokit-pagination-methods-1.1.0"
       sources."once-1.4.0"
@@ -8707,7 +8766,7 @@ in
       })
       sources."pad-right-0.2.2"
       sources."parent-module-1.0.1"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
@@ -8740,7 +8799,11 @@ in
       sources."prepend-http-1.0.4"
       sources."process-nextick-args-2.0.1"
       sources."process-on-spawn-1.0.0"
-      sources."proxyquire-2.1.3"
+      (sources."proxyquire-2.1.0" // {
+        dependencies = [
+          sources."resolve-1.8.1"
+        ];
+      })
       sources."pseudomap-1.0.2"
       sources."psl-1.8.0"
       sources."pstree.remy-1.1.8"
@@ -8765,16 +8828,16 @@ in
       sources."readdirp-2.2.1"
       sources."redent-3.0.0"
       sources."redeyed-2.1.1"
-      sources."regenerate-1.4.1"
+      sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
-      sources."regexpu-core-4.7.0"
+      sources."regexpu-core-4.7.1"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.4" // {
+      (sources."regjsparser-0.6.6" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -8786,7 +8849,7 @@ in
       sources."request-2.42.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.19.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-from-5.0.0"
       sources."resolve-global-1.0.0"
@@ -8799,36 +8862,51 @@ in
       sources."right-pad-1.0.1"
       sources."rimraf-3.0.2"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      (sources."semantic-release-15.13.18" // {
+      (sources."semantic-release-15.14.0" // {
         dependencies = [
-          sources."cosmiconfig-5.2.1"
-          sources."debug-4.2.0"
+          sources."ansi-regex-5.0.0"
+          sources."ansi-styles-4.3.0"
+          sources."cliui-6.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."cosmiconfig-6.0.0"
+          sources."cross-spawn-7.0.3"
+          sources."debug-4.3.2"
+          sources."emoji-regex-8.0.0"
+          sources."execa-3.4.0"
           sources."figures-3.2.0"
           sources."find-up-4.1.0"
           sources."get-stream-5.2.0"
-          (sources."import-fresh-2.0.0" // {
-            dependencies = [
-              sources."resolve-from-3.0.0"
-            ];
-          })
+          sources."hosted-git-info-3.0.7"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."is-stream-2.0.0"
           sources."locate-path-5.0.0"
+          sources."lru-cache-6.0.0"
+          sources."mimic-fn-2.1.0"
           sources."ms-2.1.2"
+          sources."npm-run-path-4.0.1"
+          sources."onetime-5.1.2"
+          sources."p-finally-2.0.1"
           sources."p-locate-4.1.0"
-          sources."parse-json-4.0.0"
           sources."path-exists-4.0.0"
-          (sources."read-pkg-5.2.0" // {
-            dependencies = [
-              sources."parse-json-5.1.0"
-              sources."type-fest-0.6.0"
-            ];
-          })
-          sources."read-pkg-up-6.0.0"
-          sources."type-fest-0.5.2"
+          sources."path-key-3.1.1"
+          sources."read-pkg-5.2.0"
+          sources."read-pkg-up-7.0.1"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
+          sources."type-fest-0.6.0"
+          sources."which-2.0.2"
+          sources."wrap-ansi-6.2.0"
+          sources."yallist-4.0.0"
+          sources."yargs-15.4.1"
+          sources."yargs-parser-18.1.3"
         ];
       })
       sources."semver-6.3.0"
@@ -8848,7 +8926,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.3"
       sources."signale-1.4.0"
-      sources."sinon-6.3.5"
+      sources."sinon-6.3.4"
       sources."slash-2.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -8898,7 +8976,7 @@ in
       sources."spdx-correct-3.1.1"
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.5"
+      sources."spdx-license-ids-3.0.7"
       sources."split-0.2.10"
       sources."split-string-3.1.0"
       (sources."split2-2.2.0" // {
@@ -8931,8 +9009,8 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       sources."stringstream-0.0.6"
       (sources."strip-ansi-5.2.0" // {
@@ -8968,7 +9046,11 @@ in
       sources."test-exclude-5.2.3"
       sources."text-extensions-1.9.0"
       sources."through-2.3.8"
-      sources."through2-3.0.2"
+      (sources."through2-4.0.2" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
       sources."to-fast-properties-2.0.0"
@@ -8984,12 +9066,12 @@ in
       sources."traverse-0.6.6"
       sources."trim-newlines-3.0.0"
       sources."trim-off-newlines-1.0.1"
-      sources."tslib-1.13.0"
+      sources."tslib-1.14.1"
       sources."tunnel-agent-0.4.3"
       sources."type-detect-4.0.8"
       sources."type-fest-0.8.1"
       sources."typedarray-to-buffer-3.1.5"
-      sources."uglify-js-3.10.4"
+      sources."uglify-js-3.12.5"
       sources."undefsafe-2.0.3"
       sources."unicode-canonical-property-names-ecmascript-1.0.4"
       sources."unicode-match-property-ecmascript-1.0.4"
@@ -9018,7 +9100,7 @@ in
       sources."urlgrey-0.4.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
       sources."which-1.3.1"
       sources."which-module-2.0.0"
@@ -9040,7 +9122,7 @@ in
       sources."xdg-basedir-3.0.0"
       sources."xml-1.0.1"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.0"
+      sources."y18n-4.0.1"
       sources."yallist-2.1.2"
       sources."yaml-1.10.0"
       (sources."yargs-13.2.2" // {
@@ -9061,7 +9143,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Git commit, but play nice with conventions.";
-      homepage = https://github.com/commitizen/cz-cli;
+      homepage = "https://github.com/commitizen/cz-cli";
       license = "MIT";
     };
     production = false;
diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
index d805fe3827d..0ffa56eae90 100755
--- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh
+++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
@@ -10,6 +10,4 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
     -i node-packages.json \
     -o node-packages.nix \
     -c node-composition.nix \
-    # TODO: Switch to the commented out version once nodejs package set gets updated to new node2nix
-    -e node-env.nix
-    # --no-copy-node-env -e ../../../node-packages/node-env.nix
+    --no-copy-node-env -e ../../../node-packages/node-env.nix
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index c43e7cc7f25..4b662bd072b 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -1,17 +1,17 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
 
 let
-  nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
-    inherit nodejs;
+  nodeEnv = import ../../../node-packages/node-env.nix {
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix
deleted file mode 100644
index e1abf530493..00000000000
--- a/pkgs/development/compilers/elm/packages/node-env.nix
+++ /dev/null
@@ -1,542 +0,0 @@
-# This file originates from node2nix
-
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
-
-let
-  python = if nodejs ? python then nodejs.python else python2;
-
-  # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
-  tarWrapper = runCommand "tarWrapper" {} ''
-    mkdir -p $out/bin
-
-    cat > $out/bin/tar <<EOF
-    #! ${stdenv.shell} -e
-    $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
-    EOF
-
-    chmod +x $out/bin/tar
-  '';
-
-  # Function that generates a TGZ file from a NPM project
-  buildNodeSourceDist =
-    { name, version, src, ... }:
-
-    stdenv.mkDerivation {
-      name = "node-tarball-${name}-${version}";
-      inherit src;
-      buildInputs = [ nodejs ];
-      buildPhase = ''
-        export HOME=$TMPDIR
-        tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
-      '';
-      installPhase = ''
-        mkdir -p $out/tarballs
-        mv $tgzFile $out/tarballs
-        mkdir -p $out/nix-support
-        echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
-      '';
-    };
-
-  includeDependencies = {dependencies}:
-    stdenv.lib.optionalString (dependencies != [])
-      (stdenv.lib.concatMapStrings (dependency:
-        ''
-          # Bundle the dependencies of the package
-          mkdir -p node_modules
-          cd node_modules
-
-          # Only include dependencies if they don't exist. They may also be bundled in the package.
-          if [ ! -e "${dependency.name}" ]
-          then
-              ${composePackage dependency}
-          fi
-
-          cd ..
-        ''
-      ) dependencies);
-
-  # Recursively composes the dependencies of a package
-  composePackage = { name, packageName, src, dependencies ? [], ... }@args:
-    builtins.addErrorContext "while evaluating node package '${packageName}'" ''
-      DIR=$(pwd)
-      cd $TMPDIR
-
-      unpackFile ${src}
-
-      # Make the base dir in which the target dependency resides first
-      mkdir -p "$(dirname "$DIR/${packageName}")"
-
-      if [ -f "${src}" ]
-      then
-          # Figure out what directory has been unpacked
-          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
-
-          # Restore write permissions to make building work
-          find "$packageDir" -type d -exec chmod u+x {} \;
-          chmod -R u+w "$packageDir"
-
-          # Move the extracted tarball into the output folder
-          mv "$packageDir" "$DIR/${packageName}"
-      elif [ -d "${src}" ]
-      then
-          # Get a stripped name (without hash) of the source directory.
-          # On old nixpkgs it's already set internally.
-          if [ -z "$strippedName" ]
-          then
-              strippedName="$(stripHash ${src})"
-          fi
-
-          # Restore write permissions to make building work
-          chmod -R u+w "$strippedName"
-
-          # Move the extracted directory into the output folder
-          mv "$strippedName" "$DIR/${packageName}"
-      fi
-
-      # Unset the stripped name to not confuse the next unpack step
-      unset strippedName
-
-      # Include the dependencies of the package
-      cd "$DIR/${packageName}"
-      ${includeDependencies { inherit dependencies; }}
-      cd ..
-      ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-    '';
-
-  pinpointDependencies = {dependencies, production}:
-    let
-      pinpointDependenciesFromPackageJSON = writeTextFile {
-        name = "pinpointDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var path = require('path');
-
-          function resolveDependencyVersion(location, name) {
-              if(location == process.env['NIX_STORE']) {
-                  return null;
-              } else {
-                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
-
-                  if(fs.existsSync(dependencyPackageJSON)) {
-                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
-
-                      if(dependencyPackageObj.name == name) {
-                          return dependencyPackageObj.version;
-                      }
-                  } else {
-                      return resolveDependencyVersion(path.resolve(location, ".."), name);
-                  }
-              }
-          }
-
-          function replaceDependencies(dependencies) {
-              if(typeof dependencies == "object" && dependencies !== null) {
-                  for(var dependency in dependencies) {
-                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
-
-                      if(resolvedVersion === null) {
-                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
-                      } else {
-                          dependencies[dependency] = resolvedVersion;
-                      }
-                  }
-              }
-          }
-
-          /* Read the package.json configuration */
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
-          /* Pinpoint all dependencies */
-          replaceDependencies(packageObj.dependencies);
-          if(process.argv[2] == "development") {
-              replaceDependencies(packageObj.devDependencies);
-          }
-          replaceDependencies(packageObj.optionalDependencies);
-
-          /* Write the fixed package.json file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
-        '';
-      };
-    in
-    ''
-      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
-
-      ${stdenv.lib.optionalString (dependencies != [])
-        ''
-          if [ -d node_modules ]
-          then
-              cd node_modules
-              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
-              cd ..
-          fi
-        ''}
-    '';
-
-  # Recursively traverses all dependencies of a package and pinpoints all
-  # dependencies in the package.json file to the versions that are actually
-  # being used.
-
-  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
-    ''
-      if [ -d "${packageName}" ]
-      then
-          cd "${packageName}"
-          ${pinpointDependencies { inherit dependencies production; }}
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-      fi
-    '';
-
-  # Extract the Node.js source code which is used to compile packages with
-  # native bindings
-  nodeSources = runCommand "node-sources" {} ''
-    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
-    mv node-* $out
-  '';
-
-  # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
-  addIntegrityFieldsScript = writeTextFile {
-    name = "addintegrityfields.js";
-    text = ''
-      var fs = require('fs');
-      var path = require('path');
-
-      function augmentDependencies(baseDir, dependencies) {
-          for(var dependencyName in dependencies) {
-              var dependency = dependencies[dependencyName];
-
-              // Open package.json and augment metadata fields
-              var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
-              var packageJSONPath = path.join(packageJSONDir, "package.json");
-
-              if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
-                  console.log("Adding metadata fields to: "+packageJSONPath);
-                  var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
-
-                  if(dependency.integrity) {
-                      packageObj["_integrity"] = dependency.integrity;
-                  } else {
-                      packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
-                  }
-
-                  if(dependency.resolved) {
-                      packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
-                  } else {
-                      packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
-                  }
-
-                  if(dependency.from !== undefined) { // Adopt from property if one has been provided
-                      packageObj["_from"] = dependency.from;
-                  }
-
-                  fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
-              }
-
-              // Augment transitive dependencies
-              if(dependency.dependencies !== undefined) {
-                  augmentDependencies(packageJSONDir, dependency.dependencies);
-              }
-          }
-      }
-
-      if(fs.existsSync("./package-lock.json")) {
-          var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
-
-          if(packageLock.lockfileVersion !== 1) {
-             process.stderr.write("Sorry, I only understand lock file version 1!\n");
-             process.exit(1);
-          }
-
-          if(packageLock.dependencies !== undefined) {
-              augmentDependencies(".", packageLock.dependencies);
-          }
-      }
-    '';
-  };
-
-  # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
-  reconstructPackageLock = writeTextFile {
-    name = "addintegrityfields.js";
-    text = ''
-      var fs = require('fs');
-      var path = require('path');
-
-      var packageObj = JSON.parse(fs.readFileSync("package.json"));
-
-      var lockObj = {
-          name: packageObj.name,
-          version: packageObj.version,
-          lockfileVersion: 1,
-          requires: true,
-          dependencies: {}
-      };
-
-      function augmentPackageJSON(filePath, dependencies) {
-          var packageJSON = path.join(filePath, "package.json");
-          if(fs.existsSync(packageJSON)) {
-              var packageObj = JSON.parse(fs.readFileSync(packageJSON));
-              dependencies[packageObj.name] = {
-                  version: packageObj.version,
-                  integrity: "sha1-000000000000000000000000000=",
-                  dependencies: {}
-              };
-              processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
-          }
-      }
-
-      function processDependencies(dir, dependencies) {
-          if(fs.existsSync(dir)) {
-              var files = fs.readdirSync(dir);
-
-              files.forEach(function(entry) {
-                  var filePath = path.join(dir, entry);
-                  var stats = fs.statSync(filePath);
-
-                  if(stats.isDirectory()) {
-                      if(entry.substr(0, 1) == "@") {
-                          // When we encounter a namespace folder, augment all packages belonging to the scope
-                          var pkgFiles = fs.readdirSync(filePath);
-
-                          pkgFiles.forEach(function(entry) {
-                              if(stats.isDirectory()) {
-                                  var pkgFilePath = path.join(filePath, entry);
-                                  augmentPackageJSON(pkgFilePath, dependencies);
-                              }
-                          });
-                      } else {
-                          augmentPackageJSON(filePath, dependencies);
-                      }
-                  }
-              });
-          }
-      }
-
-      processDependencies("node_modules", lockObj.dependencies);
-
-      fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
-    '';
-  };
-
-  prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
-    let
-      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
-    in
-    ''
-        # Pinpoint the versions of all dependencies to the ones that are actually being used
-        echo "pinpointing versions of dependencies..."
-        source $pinpointDependenciesScriptPath
-
-        # Patch the shebangs of the bundled modules to prevent them from
-        # calling executables outside the Nix store as much as possible
-        patchShebangs .
-
-        # Deploy the Node.js package by running npm install. Since the
-        # dependencies have been provided already by ourselves, it should not
-        # attempt to install them again, which is good, because we want to make
-        # it Nix's responsibility. If it needs to install any dependencies
-        # anyway (e.g. because the dependency parameters are
-        # incomplete/incorrect), it fails.
-        #
-        # The other responsibilities of NPM are kept -- version checks, build
-        # steps, postprocessing etc.
-
-        export HOME=$TMPDIR
-        cd "${packageName}"
-        runHook preRebuild
-
-        ${stdenv.lib.optionalString bypassCache ''
-          ${stdenv.lib.optionalString reconstructLock ''
-            if [ -f package-lock.json ]
-            then
-                echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
-                echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
-                rm package-lock.json
-            else
-                echo "No package-lock.json file found, reconstructing..."
-            fi
-
-            node ${reconstructPackageLock}
-          ''}
-
-          node ${addIntegrityFieldsScript}
-        ''}
-
-        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-
-        if [ "''${dontNpmInstall-}" != "1" ]
-        then
-            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
-            rm -f npm-shrinkwrap.json
-
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
-        fi
-    '';
-
-  # Builds and composes an NPM package including all its dependencies
-  buildNodePackage =
-    { name
-    , packageName
-    , version
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , preRebuild ? ""
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
-    in
-    stdenv.mkDerivation ({
-      name = "node_${name}-${version}";
-      buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
-        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-        ++ buildInputs;
-
-      inherit nodejs;
-
-      inherit dontStrip; # Stripping may fail a build for some package deployments
-      inherit dontNpmInstall preRebuild unpackPhase buildPhase;
-
-      compositionScript = composePackage args;
-      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
-
-      installPhase = ''
-        # Create and enter a root node_modules/ folder
-        mkdir -p $out/lib/node_modules
-        cd $out/lib/node_modules
-
-        # Compose the package and all its dependencies
-        source $compositionScriptPath
-
-        ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-        # Create symlink to the deployed executable folder, if applicable
-        if [ -d "$out/lib/node_modules/.bin" ]
-        then
-            ln -s $out/lib/node_modules/.bin $out/bin
-        fi
-
-        # Create symlinks to the deployed manual page folders, if applicable
-        if [ -d "$out/lib/node_modules/${packageName}/man" ]
-        then
-            mkdir -p $out/share
-            for dir in "$out/lib/node_modules/${packageName}/man/"*
-            do
-                mkdir -p $out/share/man/$(basename "$dir")
-                for page in "$dir"/*
-                do
-                    ln -s $page $out/share/man/$(basename "$dir")
-                done
-            done
-        fi
-
-        # Run post install hook, if provided
-        runHook postInstall
-      '';
-    } // extraArgs);
-
-  # Builds a development shell
-  buildNodeShell =
-    { name
-    , packageName
-    , version
-    , src
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-
-      nodeDependencies = stdenv.mkDerivation ({
-        name = "node-dependencies-${name}-${version}";
-
-        buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
-          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-          ++ buildInputs;
-
-        inherit dontStrip; # Stripping may fail a build for some package deployments
-        inherit dontNpmInstall unpackPhase buildPhase;
-
-        includeScript = includeDependencies { inherit dependencies; };
-        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
-
-        installPhase = ''
-          mkdir -p $out/${packageName}
-          cd $out/${packageName}
-
-          source $includeScriptPath
-
-          # Create fake package.json to make the npm commands work properly
-          cp ${src}/package.json .
-          chmod 644 package.json
-          ${stdenv.lib.optionalString bypassCache ''
-            if [ -f ${src}/package-lock.json ]
-            then
-                cp ${src}/package-lock.json .
-            fi
-          ''}
-
-          # Go to the parent folder to make sure that all packages are pinpointed
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-          # Expose the executables that were installed
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          mv ${packageName} lib
-          ln -s $out/lib/node_modules/.bin $out/bin
-        '';
-      } // extraArgs);
-    in
-    stdenv.mkDerivation {
-      name = "node-shell-${name}-${version}";
-
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
-      buildCommand = ''
-        mkdir -p $out/bin
-        cat > $out/bin/shell <<EOF
-        #! ${stdenv.shell} -e
-        $shellHook
-        exec ${stdenv.shell}
-        EOF
-        chmod +x $out/bin/shell
-      '';
-
-      # Provide the dependencies in a development shell through the NODE_PATH environment variable
-      inherit nodeDependencies;
-      shellHook = stdenv.lib.optionalString (dependencies != []) ''
-        export NODE_PATH=${nodeDependencies}/lib/node_modules
-        export PATH="${nodeDependencies}/bin:$PATH"
-      '';
-    };
-in
-{
-  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
-  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
-  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
-}
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 015958d1239..16414b3ee77 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/cli-7.12.8" = {
+    "@babel/cli-7.12.10" = {
       name = "_at_babel_slash_cli";
       packageName = "@babel/cli";
-      version = "7.12.8";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.8.tgz";
-        sha512 = "/6nQj11oaGhLmZiuRUfxsujiPDc9BBReemiXgIbxc+M5W+MIiFKYwvNDJvBfnGKNsJTKbUfEheKc9cwoPHAVQA==";
+        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.10.tgz";
+        sha512 = "+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==";
       };
     };
     "@babel/code-frame-7.0.0" = {
@@ -22,13 +22,13 @@ let
         sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==";
       };
     };
-    "@babel/code-frame-7.10.4" = {
+    "@babel/code-frame-7.12.11" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";
-        sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
+        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
       };
     };
     "@babel/compat-data-7.12.7" = {
@@ -40,31 +40,31 @@ let
         sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
       };
     };
-    "@babel/core-7.12.9" = {
+    "@babel/core-7.12.10" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.9";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz";
-        sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz";
+        sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
       };
     };
-    "@babel/generator-7.12.5" = {
+    "@babel/generator-7.12.11" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.12.5";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
-        sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
+        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
       };
     };
-    "@babel/helper-annotate-as-pure-7.10.4" = {
+    "@babel/helper-annotate-as-pure-7.12.10" = {
       name = "_at_babel_slash_helper-annotate-as-pure";
       packageName = "@babel/helper-annotate-as-pure";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz";
-        sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==";
+        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz";
+        sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==";
       };
     };
     "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = {
@@ -121,22 +121,22 @@ let
         sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==";
       };
     };
-    "@babel/helper-function-name-7.10.4" = {
+    "@babel/helper-function-name-7.12.11" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
-        sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
+        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
       };
     };
-    "@babel/helper-get-function-arity-7.10.4" = {
+    "@babel/helper-get-function-arity-7.12.10" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
-        sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
+        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
       };
     };
     "@babel/helper-hoist-variables-7.10.4" = {
@@ -175,13 +175,13 @@ let
         sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.12.7" = {
+    "@babel/helper-optimise-call-expression-7.12.10" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.12.7";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz";
-        sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
+        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
       };
     };
     "@babel/helper-plugin-utils-7.10.4" = {
@@ -202,13 +202,13 @@ let
         sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
       };
     };
-    "@babel/helper-replace-supers-7.12.5" = {
+    "@babel/helper-replace-supers-7.12.11" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.12.5";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
-        sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
+        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
       };
     };
     "@babel/helper-simple-access-7.12.1" = {
@@ -229,31 +229,31 @@ let
         sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==";
       };
     };
-    "@babel/helper-split-export-declaration-7.11.0" = {
+    "@babel/helper-split-export-declaration-7.12.11" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.11.0";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
-        sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
+        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
       };
     };
-    "@babel/helper-validator-identifier-7.10.4" = {
+    "@babel/helper-validator-identifier-7.12.11" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
-        sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
+        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
       };
     };
-    "@babel/helper-validator-option-7.12.1" = {
+    "@babel/helper-validator-option-7.12.11" = {
       name = "_at_babel_slash_helper-validator-option";
       packageName = "@babel/helper-validator-option";
-      version = "7.12.1";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz";
-        sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz";
+        sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==";
       };
     };
     "@babel/helper-wrap-function-7.12.3" = {
@@ -283,22 +283,22 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.7" = {
+    "@babel/parser-7.12.11" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.7";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz";
-        sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
+        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
       };
     };
-    "@babel/plugin-proposal-async-generator-functions-7.12.1" = {
+    "@babel/plugin-proposal-async-generator-functions-7.12.12" = {
       name = "_at_babel_slash_plugin-proposal-async-generator-functions";
       packageName = "@babel/plugin-proposal-async-generator-functions";
-      version = "7.12.1";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz";
-        sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz";
+        sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==";
       };
     };
     "@babel/plugin-proposal-class-properties-7.12.1" = {
@@ -544,13 +544,13 @@ let
         sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.12.1" = {
+    "@babel/plugin-transform-block-scoping-7.12.12" = {
       name = "_at_babel_slash_plugin-transform-block-scoping";
       packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.12.1";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz";
-        sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz";
+        sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==";
       };
     };
     "@babel/plugin-transform-classes-7.12.1" = {
@@ -742,13 +742,13 @@ let
         sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==";
       };
     };
-    "@babel/plugin-transform-runtime-7.12.1" = {
+    "@babel/plugin-transform-runtime-7.12.10" = {
       name = "_at_babel_slash_plugin-transform-runtime";
       packageName = "@babel/plugin-transform-runtime";
-      version = "7.12.1";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz";
-        sha512 = "Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz";
+        sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==";
       };
     };
     "@babel/plugin-transform-shorthand-properties-7.12.1" = {
@@ -787,13 +787,13 @@ let
         sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==";
       };
     };
-    "@babel/plugin-transform-typeof-symbol-7.12.1" = {
+    "@babel/plugin-transform-typeof-symbol-7.12.10" = {
       name = "_at_babel_slash_plugin-transform-typeof-symbol";
       packageName = "@babel/plugin-transform-typeof-symbol";
-      version = "7.12.1";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz";
-        sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz";
+        sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==";
       };
     };
     "@babel/plugin-transform-unicode-escapes-7.12.1" = {
@@ -814,13 +814,13 @@ let
         sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
       };
     };
-    "@babel/preset-env-7.12.7" = {
+    "@babel/preset-env-7.12.10" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.12.7";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz";
-        sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.10.tgz";
+        sha512 = "Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA==";
       };
     };
     "@babel/preset-modules-0.1.4" = {
@@ -850,22 +850,22 @@ let
         sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.12.9" = {
+    "@babel/traverse-7.12.12" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.9";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz";
-        sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
+        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
       };
     };
-    "@babel/types-7.12.7" = {
+    "@babel/types-7.12.12" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.7";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz";
-        sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
+        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
       };
     };
     "@hapi/address-2.1.4" = {
@@ -922,13 +922,13 @@ let
         sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==";
       };
     };
-    "@nodelib/fs.scandir-2.1.3" = {
+    "@nodelib/fs.scandir-2.1.4" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
-        sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
+        sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
       };
     };
     "@nodelib/fs.stat-1.1.3" = {
@@ -940,22 +940,22 @@ let
         sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==";
       };
     };
-    "@nodelib/fs.stat-2.0.3" = {
+    "@nodelib/fs.stat-2.0.4" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
-        sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
+        sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
       };
     };
-    "@nodelib/fs.walk-1.2.4" = {
+    "@nodelib/fs.walk-1.2.6" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.4";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
-        sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
+        sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -1039,22 +1039,22 @@ let
         sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==";
       };
     };
-    "@types/http-proxy-1.17.4" = {
+    "@types/http-proxy-1.17.5" = {
       name = "_at_types_slash_http-proxy";
       packageName = "@types/http-proxy";
-      version = "1.17.4";
+      version = "1.17.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz";
-        sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==";
+        url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz";
+        sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q==";
       };
     };
-    "@types/json-schema-7.0.6" = {
+    "@types/json-schema-7.0.7" = {
       name = "_at_types_slash_json-schema";
       packageName = "@types/json-schema";
-      version = "7.0.6";
+      version = "7.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz";
-        sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==";
+        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz";
+        sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==";
       };
     };
     "@types/keyv-3.1.1" = {
@@ -1075,13 +1075,13 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/node-14.14.10" = {
+    "@types/node-14.14.22" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.10";
+      version = "14.14.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz";
-        sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
+        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
       };
     };
     "@types/parse-json-4.0.0" = {
@@ -1138,22 +1138,22 @@ let
         sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==";
       };
     };
-    "@types/webpack-4.41.25" = {
+    "@types/webpack-4.41.26" = {
       name = "_at_types_slash_webpack";
       packageName = "@types/webpack";
-      version = "4.41.25";
+      version = "4.41.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz";
-        sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==";
+        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz";
+        sha512 = "7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==";
       };
     };
-    "@types/webpack-sources-2.0.0" = {
+    "@types/webpack-sources-2.1.0" = {
       name = "_at_types_slash_webpack-sources";
       packageName = "@types/webpack-sources";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz";
-        sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==";
+        url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz";
+        sha512 = "LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==";
       };
     };
     "@webassemblyjs/ast-1.9.0" = {
@@ -1795,13 +1795,13 @@ let
         sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
       };
     };
-    "autoprefixer-10.0.4" = {
+    "autoprefixer-10.1.0" = {
       name = "autoprefixer";
       packageName = "autoprefixer";
-      version = "10.0.4";
+      version = "10.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.4.tgz";
-        sha512 = "hmjYejN/WTyPP9cdNmiwtwqM8/ACVJPD5ExtwoOceQohNbgnFNiwpL2+U4bXS8aXozBL00WvH6WhqbuHf0Fgfg==";
+        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.1.0.tgz";
+        sha512 = "0/lBNwN+ZUnb5su18NZo5MBIjDaq6boQKZcxwy86Gip/CmXA2zZqUoFQLCNAGI5P25ZWSP2RWdhDJ8osfKEjoQ==";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -1975,13 +1975,13 @@ let
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
-    "binary-extensions-2.1.0" = {
+    "binary-extensions-2.2.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
-        sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
+        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
       };
     };
     "bindings-1.5.0" = {
@@ -2164,13 +2164,13 @@ let
         sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==";
       };
     };
-    "browserslist-4.14.7" = {
+    "browserslist-4.16.1" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.14.7";
+      version = "4.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz";
-        sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz";
+        sha512 = "UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==";
       };
     };
     "buffer-4.9.2" = {
@@ -2299,13 +2299,13 @@ let
         sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==";
       };
     };
-    "call-bind-1.0.0" = {
+    "call-bind-1.0.2" = {
       name = "call-bind";
       packageName = "call-bind";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
-        sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
+        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
       };
     };
     "call-me-maybe-1.0.1" = {
@@ -2353,13 +2353,13 @@ let
         sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
       };
     };
-    "camel-case-4.1.1" = {
+    "camel-case-4.1.2" = {
       name = "camel-case";
       packageName = "camel-case";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz";
-        sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==";
+        url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz";
+        sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==";
       };
     };
     "camelcase-3.0.0" = {
@@ -2398,13 +2398,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001161" = {
+    "caniuse-lite-1.0.30001179" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001161";
+      version = "1.0.30001179";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz";
-        sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz";
+        sha512 = "blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==";
       };
     };
     "case-sensitive-paths-webpack-plugin-2.3.0" = {
@@ -2533,13 +2533,13 @@ let
         sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==";
       };
     };
-    "chokidar-3.4.3" = {
+    "chokidar-3.5.1" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.4.3";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz";
-        sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz";
+        sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==";
       };
     };
     "chownr-1.1.4" = {
@@ -2614,13 +2614,13 @@ let
         sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==";
       };
     };
-    "cli-table-0.3.1" = {
+    "cli-table-0.3.4" = {
       name = "cli-table";
       packageName = "cli-table";
-      version = "0.3.1";
+      version = "0.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
-        sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
+        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.4.tgz";
+        sha512 = "1vinpnX/ZERcmE443i3SZTmU5DF0rPO9DrL4I2iVAllhxzCM9SzPlHnz19fsZB78htkKZvYBvj6SZ6vXnaxmTA==";
       };
     };
     "cli-width-2.2.1" = {
@@ -2839,13 +2839,13 @@ let
         sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
       };
     };
-    "commander-6.2.0" = {
+    "commander-6.2.1" = {
       name = "commander";
       packageName = "commander";
-      version = "6.2.0";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz";
-        sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
+        url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz";
+        sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
       };
     };
     "common-tags-1.8.0" = {
@@ -3064,13 +3064,13 @@ let
         sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
       };
     };
-    "core-js-compat-3.8.0" = {
+    "core-js-compat-3.8.3" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.8.0";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz";
-        sha512 = "o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz";
+        sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -3235,15 +3235,6 @@ let
         sha512 = "rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg==";
       };
     };
-    "css-select-1.2.0" = {
-      name = "css-select";
-      packageName = "css-select";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
-        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
-      };
-    };
     "css-select-2.1.0" = {
       name = "css-select";
       packageName = "css-select";
@@ -3280,15 +3271,6 @@ let
         sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==";
       };
     };
-    "css-what-2.1.3" = {
-      name = "css-what";
-      packageName = "css-what";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
-        sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
-      };
-    };
     "css-what-3.4.2" = {
       name = "css-what";
       packageName = "css-what";
@@ -3415,13 +3397,13 @@ let
         sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
-    "debug-4.3.1" = {
+    "debug-4.3.2" = {
       name = "debug";
       packageName = "debug";
-      version = "4.3.1";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
-        sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
+        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
       };
     };
     "decamelize-1.2.0" = {
@@ -3721,13 +3703,13 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domelementtype-2.0.2" = {
+    "domelementtype-2.1.0" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "2.0.2";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz";
-        sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
+        sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
       };
     };
     "domhandler-2.4.2" = {
@@ -3739,15 +3721,6 @@ let
         sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
       };
     };
-    "domutils-1.5.1" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
-        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
-      };
-    };
     "domutils-1.7.0" = {
       name = "domutils";
       packageName = "domutils";
@@ -3757,13 +3730,13 @@ let
         sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
       };
     };
-    "dot-case-3.0.3" = {
+    "dot-case-3.0.4" = {
       name = "dot-case";
       packageName = "dot-case";
-      version = "3.0.3";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz";
-        sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==";
+        url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz";
+        sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==";
       };
     };
     "dot-prop-5.3.0" = {
@@ -3829,13 +3802,13 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "electron-to-chromium-1.3.610" = {
+    "electron-to-chromium-1.3.643" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.610";
+      version = "1.3.643";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz";
-        sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.643.tgz";
+        sha512 = "TGomM4gj8adt/uqRgPbu9F0yhUVAR1deww5X0fvbQgpGr9suSMjLgc4IwQ9YKGkp1t03cDbZum20OfAkiTYjAg==";
       };
     };
     "elliptic-6.5.3" = {
@@ -3865,16 +3838,6 @@ let
         sha512 = "6y36ewCcVmTOx8lj7cKJs3bhI5qMfoVEigePZ9PhEUNKpwjjML/pU2u2YSpHVAznuCcojoF6KIsrS1Ci7GtVaQ==";
       };
     };
-    "elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf" = {
-      name = "elm-analyse";
-      packageName = "elm-analyse";
-      version = "0.16.6-alpha";
-      src = fetchgit {
-        url = "git://github.com/elm-tooling/elm-analyse";
-        rev = "7f4000cce5ef024fe5e82c7ee1725feef95a9daf";
-        sha256 = "270cb1adfdeb368dde2b780938f653e9aa46cc97afbe4de828813fef7c30e556";
-      };
-    };
     "elm-asset-webpack-loader-1.1.2" = {
       name = "elm-asset-webpack-loader";
       packageName = "elm-asset-webpack-loader";
@@ -3911,15 +3874,6 @@ let
         sha512 = "FcRN8UlTl52EigvGjTaG9rnfdUJYh88eWRrruUmZLNVb/71maM92l3HNDAcyztOj4pEYGhoo9DEHEquZm6B08A==";
       };
     };
-    "elm-json-0.2.8" = {
-      name = "elm-json";
-      packageName = "elm-json";
-      version = "0.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/elm-json/-/elm-json-0.2.8.tgz";
-        sha512 = "YfK39CNrHjB4LMnas6aAb2LP37YgqAnh69bWD7ojAs7lBNNkWIeBifeszAfmapylQt1MVuwj6zPPYwrqRQXEBA==";
-      };
-    };
     "elm-test-0.19.1" = {
       name = "elm-test";
       packageName = "elm-test";
@@ -3938,6 +3892,15 @@ let
         sha512 = "DUzKPNzJb/2ZsPbtHttT5JIKGY1KtT7d9cexSNQI7DppvoEHxZ4nCd5EObv5kjskmC0JkQ5PHmCkIruQsbOdkQ==";
       };
     };
+    "elm-tooling-1.0.2" = {
+      name = "elm-tooling";
+      packageName = "elm-tooling";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.0.2.tgz";
+        sha512 = "sE48Opzo1pIUtyHQafIqj6g+G1Kefk3mWOMAE8TgKujhJL2JqXxDKiYB0afJxzxJkn/YYVLmzWoM+VhHM5q+0A==";
+      };
+    };
     "elm-webpack-loader-6.0.1" = {
       name = "elm-webpack-loader";
       packageName = "elm-webpack-loader";
@@ -4019,13 +3982,13 @@ let
         sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
       };
     };
-    "enhanced-resolve-4.3.0" = {
+    "enhanced-resolve-4.5.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "4.3.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz";
-        sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz";
+        sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==";
       };
     };
     "entities-1.1.2" = {
@@ -4046,13 +4009,13 @@ let
         sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
       };
     };
-    "errno-0.1.7" = {
+    "errno-0.1.8" = {
       name = "errno";
       packageName = "errno";
-      version = "0.1.7";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
-        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz";
+        sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==";
       };
     };
     "error-ex-1.3.2" = {
@@ -4064,22 +4027,13 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "es-abstract-1.17.7" = {
+    "es-abstract-1.18.0-next.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.17.7";
+      version = "1.18.0-next.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz";
-        sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==";
-      };
-    };
-    "es-abstract-1.18.0-next.1" = {
-      name = "es-abstract";
-      packageName = "es-abstract";
-      version = "1.18.0-next.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz";
-        sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
+        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -4271,13 +4225,13 @@ let
         sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
       };
     };
-    "execa-4.1.0" = {
+    "execa-5.0.0" = {
       name = "execa";
       packageName = "execa";
-      version = "4.1.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz";
-        sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==";
+        url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz";
+        sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==";
       };
     };
     "expand-brackets-2.1.4" = {
@@ -4424,13 +4378,13 @@ let
         sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==";
       };
     };
-    "fast-glob-3.2.4" = {
+    "fast-glob-3.2.5" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.4";
+      version = "3.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz";
-        sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
+        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
       };
     };
     "fast-json-stable-stringify-2.1.0" = {
@@ -4442,13 +4396,13 @@ let
         sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
-    "fastq-1.9.0" = {
+    "fastq-1.10.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.9.0";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz";
-        sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
+        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
       };
     };
     "faye-websocket-0.10.0" = {
@@ -4703,13 +4657,13 @@ let
         sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A==";
       };
     };
-    "follow-redirects-1.13.0" = {
+    "follow-redirects-1.13.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.13.0";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz";
-        sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz";
+        sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==";
       };
     };
     "for-in-1.0.2" = {
@@ -4748,6 +4702,15 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
+    "fraction.js-4.0.13" = {
+      name = "fraction.js";
+      packageName = "fraction.js";
+      version = "4.0.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz";
+        sha512 = "E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA==";
+      };
+    };
     "fragment-cache-0.2.1" = {
       name = "fragment-cache";
       packageName = "fragment-cache";
@@ -4775,6 +4738,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "fromentries-1.3.2" = {
+      name = "fromentries";
+      packageName = "fromentries";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz";
+        sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==";
+      };
+    };
     "fs-extra-2.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -4829,13 +4801,13 @@ let
         sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==";
       };
     };
-    "fs-extra-9.0.1" = {
+    "fs-extra-9.1.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
-      version = "9.0.1";
+      version = "9.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz";
-        sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz";
+        sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==";
       };
     };
     "fs-minipass-1.2.7" = {
@@ -4892,13 +4864,13 @@ let
         sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
       };
     };
-    "fsevents-2.2.1" = {
+    "fsevents-2.3.1" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "2.2.1";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz";
-        sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz";
+        sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==";
       };
     };
     "function-bind-1.1.1" = {
@@ -4937,13 +4909,13 @@ let
         sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
-    "get-intrinsic-1.0.1" = {
+    "get-intrinsic-1.0.2" = {
       name = "get-intrinsic";
       packageName = "get-intrinsic";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
-        sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
+        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
       };
     };
     "get-own-enumerable-property-symbols-3.0.2" = {
@@ -4982,6 +4954,15 @@ let
         sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==";
       };
     };
+    "get-stream-6.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz";
+        sha512 = "A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==";
+      };
+    };
     "get-value-2.0.6" = {
       name = "get-value";
       packageName = "get-value";
@@ -5072,13 +5053,13 @@ let
         sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
       };
     };
-    "globby-11.0.1" = {
+    "globby-11.0.2" = {
       name = "globby";
       packageName = "globby";
-      version = "11.0.1";
+      version = "11.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz";
-        sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==";
+        url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz";
+        sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==";
       };
     };
     "globby-6.1.0" = {
@@ -5369,13 +5350,13 @@ let
         sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==";
       };
     };
-    "html-entities-1.3.1" = {
+    "html-entities-1.4.0" = {
       name = "html-entities";
       packageName = "html-entities";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz";
-        sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==";
+        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz";
+        sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==";
       };
     };
     "html-minifier-terser-5.1.1" = {
@@ -5459,13 +5440,13 @@ let
         sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==";
       };
     };
-    "http-parser-js-0.5.2" = {
+    "http-parser-js-0.5.3" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.5.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz";
-        sha512 = "opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz";
+        sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==";
       };
     };
     "http-proxy-1.17.0" = {
@@ -5522,13 +5503,13 @@ let
         sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     };
-    "human-signals-1.1.1" = {
+    "human-signals-2.1.0" = {
       name = "human-signals";
       packageName = "human-signals";
-      version = "1.1.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz";
-        sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==";
+        url = "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz";
+        sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==";
       };
     };
     "i-0.3.6" = {
@@ -5621,13 +5602,13 @@ let
         sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
       };
     };
-    "import-fresh-3.2.2" = {
+    "import-fresh-3.3.0" = {
       name = "import-fresh";
       packageName = "import-fresh";
-      version = "3.2.2";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
-        sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz";
+        sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
       };
     };
     "import-local-2.0.0" = {
@@ -5702,13 +5683,13 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.5" = {
+    "ini-1.3.8" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.5";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
+        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
     "inquirer-6.2.0" = {
@@ -5801,13 +5782,13 @@ let
         sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
       };
     };
-    "is-arguments-1.0.4" = {
+    "is-arguments-1.1.0" = {
       name = "is-arguments";
       packageName = "is-arguments";
-      version = "1.0.4";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz";
-        sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==";
+        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz";
+        sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -6026,13 +6007,13 @@ let
         sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==";
       };
     };
-    "is-negative-zero-2.0.0" = {
+    "is-negative-zero-2.0.1" = {
       name = "is-negative-zero";
       packageName = "is-negative-zero";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz";
-        sha1 = "9553b121b0fac28869da9ed459e20c7543788461";
+        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
+        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
       };
     };
     "is-number-3.0.0" = {
@@ -6071,13 +6052,13 @@ let
         sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==";
       };
     };
-    "is-object-1.0.1" = {
+    "is-object-1.0.2" = {
       name = "is-object";
       packageName = "is-object";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz";
-        sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
+        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz";
+        sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==";
       };
     };
     "is-path-cwd-2.2.0" = {
@@ -6305,13 +6286,13 @@ let
         sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
       };
     };
-    "js-yaml-3.14.0" = {
+    "js-yaml-3.14.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.0";
+      version = "3.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
-        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
+        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
       };
     };
     "jsbn-0.1.1" = {
@@ -6773,13 +6754,13 @@ let
         sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==";
       };
     };
-    "lower-case-2.0.1" = {
+    "lower-case-2.0.2" = {
       name = "lower-case";
       packageName = "lower-case";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz";
-        sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==";
+        url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz";
+        sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==";
       };
     };
     "lowercase-keys-1.0.1" = {
@@ -6818,6 +6799,15 @@ let
         sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
       };
     };
+    "lru-cache-6.0.0" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
+        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
+      };
+    };
     "make-dir-1.3.0" = {
       name = "make-dir";
       packageName = "make-dir";
@@ -7016,31 +7006,31 @@ let
         sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==";
       };
     };
-    "mime-2.4.6" = {
+    "mime-2.5.0" = {
       name = "mime";
       packageName = "mime";
-      version = "2.4.6";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz";
-        sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==";
+        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
+        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
       };
     };
-    "mime-db-1.44.0" = {
+    "mime-db-1.45.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.44.0";
+      version = "1.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
-        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
+        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
       };
     };
-    "mime-types-2.1.27" = {
+    "mime-types-2.1.28" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.27";
+      version = "2.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
-        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
+        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -7304,13 +7294,13 @@ let
         sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
       };
     };
-    "nanoid-3.1.18" = {
+    "nanoid-3.1.20" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "3.1.18";
+      version = "3.1.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz";
-        sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz";
+        sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -7358,13 +7348,13 @@ let
         sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
       };
     };
-    "no-case-3.0.3" = {
+    "no-case-3.0.4" = {
       name = "no-case";
       packageName = "no-case";
-      version = "3.0.3";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz";
-        sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==";
+        url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz";
+        sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==";
       };
     };
     "node-elm-compiler-5.0.4" = {
@@ -7403,13 +7393,13 @@ let
         sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==";
       };
     };
-    "node-releases-1.1.67" = {
+    "node-releases-1.1.70" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.67";
+      version = "1.1.70";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz";
-        sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz";
+        sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==";
       };
     };
     "node-watch-0.5.5" = {
@@ -7529,15 +7519,6 @@ let
         sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==";
       };
     };
-    "num2fraction-1.2.2" = {
-      name = "num2fraction";
-      packageName = "num2fraction";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz";
-        sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
-      };
-    };
     "number-is-nan-1.0.1" = {
       name = "number-is-nan";
       packageName = "number-is-nan";
@@ -7574,13 +7555,13 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-inspect-1.8.0" = {
+    "object-inspect-1.9.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.8.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
-        sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
+        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
       };
     };
     "object-is-1.1.4" = {
@@ -7718,13 +7699,13 @@ let
         sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==";
       };
     };
-    "open-7.3.0" = {
+    "open-7.3.1" = {
       name = "open";
       packageName = "open";
-      version = "7.3.0";
+      version = "7.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz";
-        sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==";
+        url = "https://registry.npmjs.org/open/-/open-7.3.1.tgz";
+        sha512 = "f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==";
       };
     };
     "opn-5.4.0" = {
@@ -7745,15 +7726,6 @@ let
         sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==";
       };
     };
-    "opn-6.0.0" = {
-      name = "opn";
-      packageName = "opn";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz";
-        sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==";
-      };
-    };
     "optimize-css-assets-webpack-plugin-5.0.3" = {
       name = "optimize-css-assets-webpack-plugin";
       packageName = "optimize-css-assets-webpack-plugin";
@@ -7979,13 +7951,13 @@ let
         sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==";
       };
     };
-    "param-case-3.0.3" = {
+    "param-case-3.0.4" = {
       name = "param-case";
       packageName = "param-case";
-      version = "3.0.3";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz";
-        sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==";
+        url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz";
+        sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==";
       };
     };
     "parent-module-1.0.1" = {
@@ -8024,13 +7996,13 @@ let
         sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
       };
     };
-    "parse-json-5.1.0" = {
+    "parse-json-5.2.0" = {
       name = "parse-json";
       packageName = "parse-json";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz";
-        sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==";
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz";
+        sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -8051,13 +8023,13 @@ let
         sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==";
       };
     };
-    "pascal-case-3.1.1" = {
+    "pascal-case-3.1.2" = {
       name = "pascal-case";
       packageName = "pascal-case";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz";
-        sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==";
+        url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz";
+        sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==";
       };
     };
     "pascalcase-0.1.1" = {
@@ -8366,13 +8338,13 @@ let
         sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
       };
     };
-    "postcss-8.1.10" = {
+    "postcss-8.2.4" = {
       name = "postcss";
       packageName = "postcss";
-      version = "8.1.10";
+      version = "8.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz";
-        sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz";
+        sha512 = "kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==";
       };
     };
     "postcss-calc-7.0.5" = {
@@ -8735,13 +8707,13 @@ let
         sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
       };
     };
-    "pretty-bytes-5.4.1" = {
+    "pretty-bytes-5.5.0" = {
       name = "pretty-bytes";
       packageName = "pretty-bytes";
-      version = "5.4.1";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz";
-        sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA==";
+        url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz";
+        sha512 = "p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==";
       };
     };
     "pretty-error-2.1.2" = {
@@ -9239,13 +9211,13 @@ let
         sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
-    "regexp.prototype.flags-1.3.0" = {
+    "regexp.prototype.flags-1.3.1" = {
       name = "regexp.prototype.flags";
       packageName = "regexp.prototype.flags";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz";
-        sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==";
+        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz";
+        sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==";
       };
     };
     "regexpu-core-4.7.1" = {
@@ -9284,13 +9256,13 @@ let
         sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
       };
     };
-    "regjsparser-0.6.4" = {
+    "regjsparser-0.6.6" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.6.4";
+      version = "0.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
-        sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz";
+        sha512 = "jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==";
       };
     };
     "relateurl-0.2.7" = {
@@ -9311,13 +9283,13 @@ let
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "renderkid-2.0.4" = {
+    "renderkid-2.0.5" = {
       name = "renderkid";
       packageName = "renderkid";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz";
-        sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==";
+        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz";
+        sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==";
       };
     };
     "repeat-element-1.1.3" = {
@@ -9761,13 +9733,13 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
-    "semver-7.3.2" = {
+    "semver-7.3.4" = {
       name = "semver";
       packageName = "semver";
-      version = "7.3.2";
+      version = "7.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz";
-        sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
+        sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
       };
     };
     "semver-regex-1.0.0" = {
@@ -10904,13 +10876,13 @@ let
         sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1";
       };
     };
-    "ts-debounce-2.1.0" = {
+    "ts-debounce-2.2.0" = {
       name = "ts-debounce";
       packageName = "ts-debounce";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-2.1.0.tgz";
-        sha512 = "jlrN8iK/Iif5pQd+pIsH8uEexj3vvUT+BwqNrJt5xgZB+ucwVfQVAUMC8Dnx0vlk7AktHxoD9ZDYYVYUtxd5wA==";
+        url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-2.2.0.tgz";
+        sha512 = "TsrY1lxPA1XIkF+75pd1XmAVAdjr+dGREi8GhIQvU+kL9Eyr0oCi7jrt11OGe4bLxebxXH5t9RYxbY+fufnfmQ==";
       };
     };
     "ts-union-2.3.0" = {
@@ -10931,6 +10903,15 @@ let
         sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
+    "tslib-2.1.0" = {
+      name = "tslib";
+      packageName = "tslib";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz";
+        sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==";
+      };
+    };
     "tsyringe-4.4.0" = {
       name = "tsyringe";
       packageName = "tsyringe";
@@ -11138,15 +11119,6 @@ let
         sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
-    "universalify-1.0.0" = {
-      name = "universalify";
-      packageName = "universalify";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz";
-        sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==";
-      };
-    };
     "universalify-2.0.0" = {
       name = "universalify";
       packageName = "universalify";
@@ -11210,13 +11182,13 @@ let
         sha1 = "4a50875ec5c715d19379799f0590a0e796958f61";
       };
     };
-    "uri-js-4.4.0" = {
+    "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
-        sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
+        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     };
     "urix-0.1.0" = {
@@ -11390,15 +11362,6 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vfile-location-3.2.0" = {
-      name = "vfile-location";
-      packageName = "vfile-location";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz";
-        sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==";
-      };
-    };
     "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
@@ -11408,31 +11371,31 @@ let
         sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
       };
     };
-    "vscode-jsonrpc-5.0.1" = {
+    "vscode-jsonrpc-6.0.0" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
-      version = "5.0.1";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz";
-        sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==";
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz";
+        sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==";
       };
     };
-    "vscode-languageserver-6.1.1" = {
+    "vscode-languageserver-7.0.0" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
-      version = "6.1.1";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz";
-        sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==";
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz";
+        sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==";
       };
     };
-    "vscode-languageserver-protocol-3.15.3" = {
+    "vscode-languageserver-protocol-3.16.0" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
-      version = "3.15.3";
+      version = "3.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz";
-        sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz";
+        sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==";
       };
     };
     "vscode-languageserver-textdocument-1.0.1" = {
@@ -11444,22 +11407,22 @@ let
         sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==";
       };
     };
-    "vscode-languageserver-types-3.15.1" = {
+    "vscode-languageserver-types-3.16.0" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.15.1";
+      version = "3.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz";
-        sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz";
+        sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==";
       };
     };
-    "vscode-uri-2.1.2" = {
+    "vscode-uri-3.0.2" = {
       name = "vscode-uri";
       packageName = "vscode-uri";
-      version = "2.1.2";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz";
-        sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==";
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz";
+        sha512 = "jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==";
       };
     };
     "watchpack-1.7.5" = {
@@ -11516,13 +11479,13 @@ let
         sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==";
       };
     };
-    "webpack-dev-middleware-3.7.2" = {
+    "webpack-dev-middleware-3.7.3" = {
       name = "webpack-dev-middleware";
       packageName = "webpack-dev-middleware";
-      version = "3.7.2";
+      version = "3.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz";
-        sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==";
+        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz";
+        sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==";
       };
     };
     "webpack-dev-server-3.11.0" = {
@@ -11885,13 +11848,13 @@ let
         sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==";
       };
     };
-    "ws-7.4.0" = {
+    "ws-7.4.2" = {
       name = "ws";
       packageName = "ws";
-      version = "7.4.0";
+      version = "7.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz";
-        sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==";
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz";
+        sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==";
       };
     };
     "xmlbuilder-13.0.2" = {
@@ -11921,22 +11884,22 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-3.2.1" = {
+    "y18n-3.2.2" = {
       name = "y18n";
       packageName = "y18n";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz";
+        sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==";
       };
     };
-    "y18n-4.0.0" = {
+    "y18n-4.0.1" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
+        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
       };
     };
     "yallist-2.1.2" = {
@@ -11957,6 +11920,15 @@ let
         sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
+    "yallist-4.0.0" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
+        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
+      };
+    };
     "yaml-1.10.0" = {
       name = "yaml";
       packageName = "yaml";
@@ -12136,8 +12108,8 @@ in
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.4.1"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."minimist-1.2.0"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
@@ -12196,7 +12168,7 @@ in
       sources."typedarray-0.0.6"
       sources."ultron-1.0.2"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -12241,7 +12213,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."binwrap-0.2.2"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -12346,8 +12318,8 @@ in
           sources."yallist-2.1.2"
         ];
       })
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
@@ -12421,7 +12393,7 @@ in
       sources."universalify-0.1.2"
       sources."unzip-stream-0.3.1"
       sources."upgrade-1.1.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."which-1.3.1"
@@ -12440,7 +12412,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."xmlbuilder-13.0.2"
-      sources."y18n-4.0.0"
+      sources."y18n-4.0.1"
       sources."yallist-3.1.1"
       (sources."yargs-15.4.1" // {
         dependencies = [
@@ -12466,10 +12438,10 @@ in
   elm-doc-preview = nodeEnv.buildNodePackage {
     name = "elm-doc-preview";
     packageName = "elm-doc-preview";
-    version = "5.0.3";
+    version = "5.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-5.0.3.tgz";
-      sha512 = "j9wli2wOHYiSMARDCRgAZGZ8JkcJqG4rh5+6rSgy5nVGqyXDEN6HCBX/8AhqtKMFKcuCp9ejx04heCaROlb/Eg==";
+      url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-5.0.5.tgz";
+      sha512 = "GlWnbw2Bl+pA7QzRlqSYNGEQ3r3oNxMr2Nu0uiCM6AWzQ6Sk3BwtqSiUZvXLLlzWBV9pAQnY9U8xpDpPuh5rOQ==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -12481,7 +12453,7 @@ in
       sources."async-limiter-1.0.1"
       sources."balanced-match-1.0.0"
       sources."batch-0.6.1"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -12493,7 +12465,7 @@ in
         ];
       })
       sources."chalk-3.0.0"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."clone-response-1.0.2"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
@@ -12527,7 +12499,7 @@ in
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."get-stream-4.1.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
@@ -12538,7 +12510,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."ini-1.3.5"
+      sources."ini-1.3.8"
       sources."ipaddr.js-1.9.1"
       sources."is-binary-path-2.1.0"
       sources."is-docker-2.1.1"
@@ -12555,8 +12527,8 @@ in
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
@@ -12566,7 +12538,7 @@ in
       sources."normalize-url-4.5.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."p-cancelable-1.1.0"
       sources."package-json-6.5.0"
       sources."parseurl-1.3.3"
@@ -12618,7 +12590,7 @@ in
       sources."vary-1.1.2"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
-      sources."ws-7.4.0"
+      sources."ws-7.4.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -12633,212 +12605,73 @@ in
   "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
     name = "_at_elm-tooling_slash_elm-language-server";
     packageName = "@elm-tooling/elm-language-server";
-    version = "1.13.2";
+    version = "2.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.13.2.tgz";
-      sha512 = "3bRD+Hut+XPLDY4r0t25tHhfWsXH2UPeruwDfsp/b991AjGpd3HlMNKVAnyu4DD2brUqo6xoHhpp3qTdHPJ2Pw==";
+      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.0.0.tgz";
+      sha512 = "1XnQnvuXoGQ6z1gt4VURNtjNzpZ1HBUrUbptMNKZDJS/COW1dVPsXNnXOKROLbMwcJ+UUdBe2onOiWt0hygLTw==";
     };
     dependencies = [
-      sources."@nodelib/fs.scandir-2.1.3"
-      sources."@nodelib/fs.stat-2.0.3"
-      sources."@nodelib/fs.walk-1.2.4"
-      sources."accepts-1.3.7"
-      sources."ajv-6.12.6"
-      sources."array-flatten-1.1.1"
+      sources."@nodelib/fs.scandir-2.1.4"
+      sources."@nodelib/fs.stat-2.0.4"
+      sources."@nodelib/fs.walk-1.2.6"
+      sources."anymatch-3.1.1"
       sources."array-union-2.1.0"
-      sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
-      sources."async-limiter-1.0.1"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.11.0"
-      sources."babel-runtime-6.18.0"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."body-parser-1.19.0"
+      sources."binary-extensions-2.2.0"
       sources."braces-3.0.2"
-      sources."bytes-3.1.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.8"
-      sources."concat-stream-1.5.2"
-      sources."content-disposition-0.5.3"
-      sources."content-type-1.0.4"
-      sources."cookie-0.4.0"
-      sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.12"
-      sources."core-util-is-1.0.2"
+      sources."chokidar-3.5.1"
       sources."cross-spawn-7.0.3"
-      sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
-      sources."delayed-stream-1.0.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
       sources."dir-glob-3.0.1"
-      sources."ecc-jsbn-0.1.2"
-      sources."ee-first-1.1.1"
-      sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf"
-      sources."encodeurl-1.0.2"
-      sources."end-of-stream-1.4.4"
-      sources."escape-html-1.0.3"
       sources."escape-string-regexp-4.0.0"
-      sources."etag-1.8.1"
-      (sources."execa-4.1.0" // {
-        dependencies = [
-          sources."is-stream-2.0.0"
-        ];
-      })
-      sources."express-4.17.1"
-      (sources."express-ws-2.0.0" // {
-        dependencies = [
-          sources."ws-1.1.5"
-        ];
-      })
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
+      sources."execa-5.0.0"
       sources."fast-diff-1.2.0"
-      sources."fast-glob-3.2.4"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fastq-1.9.0"
+      sources."fast-glob-3.2.5"
+      sources."fastq-1.10.0"
       sources."fill-range-7.0.1"
-      sources."finalhandler-1.1.2"
-      sources."find-0.2.7"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."forwarded-0.1.2"
-      sources."fresh-0.5.2"
-      sources."fs-extra-2.0.0"
-      sources."get-stream-5.2.0"
-      sources."getpass-0.1.7"
+      sources."fromentries-1.3.2"
+      sources."fsevents-2.3.1"
+      sources."get-stream-6.0.0"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.1"
-      sources."graceful-fs-4.2.4"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."http-errors-1.7.2"
-      sources."http-signature-1.2.0"
-      sources."human-signals-1.1.1"
-      sources."iconv-lite-0.4.24"
+      sources."globby-11.0.2"
+      sources."human-signals-2.1.0"
       sources."ignore-5.1.8"
-      sources."inherits-2.0.3"
-      sources."ipaddr.js-1.9.1"
+      sources."is-binary-path-2.1.0"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
-      sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-wsl-1.1.0"
-      sources."isarray-1.0.0"
+      sources."is-stream-2.0.0"
       sources."isexe-2.0.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-2.4.0"
-      sources."jsprim-1.4.1"
-      sources."lodash-4.17.20"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
       sources."merge2-1.4.1"
-      sources."methods-1.1.2"
       sources."micromatch-4.0.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
       sources."mimic-fn-2.1.0"
-      sources."minimist-1.2.5"
-      sources."ms-2.0.0"
-      sources."negotiator-0.6.2"
-      sources."node-watch-0.5.5"
+      sources."normalize-path-3.0.0"
       sources."npm-run-path-4.0.1"
-      sources."oauth-sign-0.9.0"
-      sources."on-finished-2.3.0"
-      sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."opn-6.0.0"
-      sources."options-0.0.6"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."parseurl-1.3.3"
       sources."path-key-3.1.1"
-      sources."path-to-regexp-0.1.7"
       sources."path-type-4.0.0"
-      sources."performance-now-2.1.0"
       sources."picomatch-2.2.2"
       sources."pjson-1.0.9"
-      sources."process-nextick-args-1.0.7"
-      sources."proxy-addr-2.0.6"
-      sources."psl-1.8.0"
-      sources."pump-3.0.0"
-      sources."punycode-2.1.1"
-      sources."qs-6.7.0"
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.4.0"
-      sources."readable-stream-2.0.6"
+      sources."readdirp-3.5.0"
       sources."reflect-metadata-0.1.13"
-      sources."regenerator-runtime-0.9.6"
-      (sources."request-2.88.2" // {
-        dependencies = [
-          sources."qs-6.5.2"
-        ];
-      })
       sources."reusify-1.0.4"
       sources."run-parallel-1.1.10"
-      sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      (sources."send-0.17.1" // {
-        dependencies = [
-          sources."ms-2.1.1"
-        ];
-      })
-      sources."serve-static-1.14.1"
-      sources."setprototypeof-1.1.1"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
       sources."slash-3.0.0"
-      sources."sshpk-1.16.1"
-      sources."statuses-1.5.0"
-      sources."string_decoder-0.10.31"
       sources."strip-final-newline-2.0.0"
-      sources."sums-0.2.4"
-      sources."through2-2.0.1"
-      sources."tmp-0.0.31"
       sources."to-regex-range-5.0.1"
-      sources."toidentifier-1.0.0"
-      sources."tough-cookie-2.5.0"
-      sources."traverse-chain-0.1.0"
-      sources."ts-debounce-2.1.0"
+      sources."ts-debounce-2.2.0"
       sources."tslib-1.14.1"
       sources."tsyringe-4.4.0"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-is-1.6.18"
-      sources."typedarray-0.0.6"
-      sources."ultron-1.0.2"
-      sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-3.4.0"
-      sources."vary-1.1.2"
-      sources."verror-1.10.0"
-      sources."vscode-jsonrpc-5.0.1"
-      sources."vscode-languageserver-6.1.1"
-      sources."vscode-languageserver-protocol-3.15.3"
+      sources."vscode-jsonrpc-6.0.0"
+      sources."vscode-languageserver-7.0.0"
+      sources."vscode-languageserver-protocol-3.16.0"
       sources."vscode-languageserver-textdocument-1.0.1"
-      sources."vscode-languageserver-types-3.15.1"
-      sources."vscode-uri-2.1.2"
+      sources."vscode-languageserver-types-3.16.0"
+      sources."vscode-uri-3.0.2"
       sources."web-tree-sitter-0.17.1"
       sources."which-2.0.2"
-      sources."wrappy-1.0.2"
-      (sources."ws-3.3.1" // {
-        dependencies = [
-          sources."ultron-1.1.1"
-        ];
-      })
-      sources."xtend-4.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -12863,7 +12696,7 @@ in
       sources."ansi-styles-2.2.1"
       sources."anymatch-3.1.1"
       sources."async-limiter-1.0.1"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."braces-3.0.2"
       sources."chalk-1.1.3"
       sources."charenc-0.0.2"
@@ -12892,9 +12725,9 @@ in
       })
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
-      sources."follow-redirects-1.13.0"
+      sources."follow-redirects-1.13.1"
       sources."fresh-0.5.2"
-      sources."fsevents-2.2.1"
+      sources."fsevents-2.3.1"
       sources."get-stream-4.1.0"
       sources."glob-parent-5.1.1"
       sources."has-ansi-2.0.0"
@@ -12987,7 +12820,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."binwrap-0.2.2"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -12996,7 +12829,7 @@ in
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
       sources."chalk-3.0.0"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."chownr-1.1.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
@@ -13018,7 +12851,7 @@ in
       sources."fs-extra-8.1.0"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
@@ -13043,8 +12876,8 @@ in
       sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
       sources."lodash-4.17.20"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
@@ -13085,7 +12918,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."universalify-0.1.2"
       sources."unzip-stream-0.3.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."which-2.0.2"
@@ -13117,7 +12950,7 @@ in
       sources."@types/cacheable-request-6.0.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.10"
+      sources."@types/node-14.14.22"
       sources."@types/responselike-1.0.0"
       sources."cacheable-lookup-2.0.1"
       sources."cacheable-request-7.0.1"
@@ -13140,14 +12973,15 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
       sources."http-cache-semantics-4.1.0"
-      sources."ini-1.3.5"
-      sources."is-object-1.0.1"
+      sources."ini-1.3.8"
+      sources."is-object-1.0.2"
       sources."isexe-2.0.0"
       sources."isurl-1.0.0"
       sources."json-buffer-3.0.1"
       sources."jsonfile-4.0.0"
       sources."keyv-4.0.3"
       sources."lowercase-keys-2.0.0"
+      sources."lru-cache-6.0.0"
       sources."mimic-response-2.1.0"
       sources."normalize-url-4.5.0"
       sources."npm-conf-1.1.3"
@@ -13162,7 +12996,7 @@ in
       sources."responselike-2.0.0"
       sources."safe-buffer-5.2.1"
       sources."safename-1.0.2"
-      sources."semver-7.3.2"
+      sources."semver-7.3.4"
       sources."to-readable-stream-2.1.0"
       sources."tunnel-agent-0.6.0"
       sources."type-fest-0.10.0"
@@ -13170,6 +13004,7 @@ in
       sources."url-to-options-1.0.1"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
+      sources."yallist-4.0.0"
       sources."yn-4.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -13203,7 +13038,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."binwrap-0.2.2"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -13286,8 +13121,8 @@ in
       sources."jsprim-1.4.1"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.15"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
@@ -13354,7 +13189,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."universalify-0.1.2"
       sources."unzip-stream-0.3.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."which-2.0.1"
@@ -13362,7 +13197,7 @@ in
       sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."xmlbuilder-13.0.2"
-      sources."y18n-4.0.0"
+      sources."y18n-4.0.1"
       sources."yallist-3.1.1"
       sources."yargs-13.3.2"
       sources."yargs-parser-13.1.2"
@@ -13424,44 +13259,44 @@ in
   create-elm-app = nodeEnv.buildNodePackage {
     name = "create-elm-app";
     packageName = "create-elm-app";
-    version = "5.21.0";
+    version = "5.22.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.21.0.tgz";
-      sha512 = "yW7kMk/WyIUZc+OksH+GH8lhOWl129RiJGclJtpnLlmW3IDZYh23bP/e65MxX7BB+7lwi3KSObdbPYfCJf7CuA==";
+      url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.22.0.tgz";
+      sha512 = "XmYWohoM/xHxFJBPA61MJMqlMcEycBO4gUdtp4mVA6KbIgEV7PTv1UXVFYjTntUNOr5DIxvE1RcqB84rR767Uw==";
     };
     dependencies = [
-      sources."@babel/cli-7.12.8"
-      sources."@babel/code-frame-7.10.4"
+      sources."@babel/cli-7.12.10"
+      sources."@babel/code-frame-7.12.11"
       sources."@babel/compat-data-7.12.7"
-      sources."@babel/core-7.12.9"
-      sources."@babel/generator-7.12.5"
-      sources."@babel/helper-annotate-as-pure-7.10.4"
+      sources."@babel/core-7.12.10"
+      sources."@babel/generator-7.12.11"
+      sources."@babel/helper-annotate-as-pure-7.12.10"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
       sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
       sources."@babel/helper-create-regexp-features-plugin-7.12.7"
       sources."@babel/helper-define-map-7.10.5"
       sources."@babel/helper-explode-assignable-expression-7.12.1"
-      sources."@babel/helper-function-name-7.10.4"
-      sources."@babel/helper-get-function-arity-7.10.4"
+      sources."@babel/helper-function-name-7.12.11"
+      sources."@babel/helper-get-function-arity-7.12.10"
       sources."@babel/helper-hoist-variables-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.12.7"
+      sources."@babel/helper-optimise-call-expression-7.12.10"
       sources."@babel/helper-plugin-utils-7.10.4"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
-      sources."@babel/helper-replace-supers-7.12.5"
+      sources."@babel/helper-replace-supers-7.12.11"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
-      sources."@babel/helper-split-export-declaration-7.11.0"
-      sources."@babel/helper-validator-identifier-7.10.4"
-      sources."@babel/helper-validator-option-7.12.1"
+      sources."@babel/helper-split-export-declaration-7.12.11"
+      sources."@babel/helper-validator-identifier-7.12.11"
+      sources."@babel/helper-validator-option-7.12.11"
       sources."@babel/helper-wrap-function-7.12.3"
       sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.7"
-      sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
+      sources."@babel/parser-7.12.11"
+      sources."@babel/plugin-proposal-async-generator-functions-7.12.12"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
       sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
@@ -13489,7 +13324,7 @@ in
       sources."@babel/plugin-transform-arrow-functions-7.12.1"
       sources."@babel/plugin-transform-async-to-generator-7.12.1"
       sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
-      sources."@babel/plugin-transform-block-scoping-7.12.1"
+      sources."@babel/plugin-transform-block-scoping-7.12.12"
       sources."@babel/plugin-transform-classes-7.12.1"
       sources."@babel/plugin-transform-computed-properties-7.12.1"
       sources."@babel/plugin-transform-destructuring-7.12.1"
@@ -13511,20 +13346,20 @@ in
       sources."@babel/plugin-transform-property-literals-7.12.1"
       sources."@babel/plugin-transform-regenerator-7.12.1"
       sources."@babel/plugin-transform-reserved-words-7.12.1"
-      sources."@babel/plugin-transform-runtime-7.12.1"
+      sources."@babel/plugin-transform-runtime-7.12.10"
       sources."@babel/plugin-transform-shorthand-properties-7.12.1"
       sources."@babel/plugin-transform-spread-7.12.1"
       sources."@babel/plugin-transform-sticky-regex-7.12.7"
       sources."@babel/plugin-transform-template-literals-7.12.1"
-      sources."@babel/plugin-transform-typeof-symbol-7.12.1"
+      sources."@babel/plugin-transform-typeof-symbol-7.12.10"
       sources."@babel/plugin-transform-unicode-escapes-7.12.1"
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
-      sources."@babel/preset-env-7.12.7"
+      sources."@babel/preset-env-7.12.10"
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.9"
-      sources."@babel/types-7.12.7"
+      sources."@babel/traverse-7.12.12"
+      sources."@babel/types-7.12.12"
       sources."@hapi/address-2.1.4"
       sources."@hapi/bourne-1.3.2"
       sources."@hapi/hoek-8.5.1"
@@ -13535,10 +13370,10 @@ in
       sources."@types/anymatch-1.3.1"
       sources."@types/glob-7.1.3"
       sources."@types/html-minifier-terser-5.1.1"
-      sources."@types/http-proxy-1.17.4"
-      sources."@types/json-schema-7.0.6"
+      sources."@types/http-proxy-1.17.5"
+      sources."@types/json-schema-7.0.7"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.10"
+      sources."@types/node-14.14.22"
       sources."@types/parse-json-4.0.0"
       sources."@types/q-1.5.4"
       sources."@types/source-list-map-0.1.2"
@@ -13548,12 +13383,12 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.25" // {
+      (sources."@types/webpack-4.41.26" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-sources-2.0.0" // {
+      (sources."@types/webpack-sources-2.1.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -13628,7 +13463,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      sources."autoprefixer-10.0.4"
+      sources."autoprefixer-10.1.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."babel-extract-comments-1.0.0"
@@ -13658,7 +13493,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bindings-1.5.0"
       sources."binwrap-0.2.2"
       sources."bluebird-3.7.2"
@@ -13691,7 +13526,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.14.7"
+      sources."browserslist-4.16.1"
       sources."buffer-4.9.2"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
@@ -13701,15 +13536,15 @@ in
       sources."bytes-3.0.0"
       sources."cacache-12.0.4"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
-      sources."camel-case-4.1.1"
+      sources."camel-case-4.1.2"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001161"
+      sources."caniuse-lite-1.0.30001179"
       sources."case-sensitive-paths-webpack-plugin-2.3.0"
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
@@ -13719,13 +13554,17 @@ in
         ];
       })
       sources."chardet-0.7.0"
-      (sources."chokidar-3.4.3" // {
+      (sources."chokidar-3.5.1" // {
         dependencies = [
           sources."glob-parent-5.1.1"
         ];
       })
       sources."chownr-1.1.4"
-      sources."chrome-trace-event-1.0.2"
+      (sources."chrome-trace-event-1.0.2" // {
+        dependencies = [
+          sources."tslib-1.14.1"
+        ];
+      })
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -13750,10 +13589,12 @@ in
         ];
       })
       sources."cli-cursor-2.1.0"
-      sources."cli-table-0.3.1"
+      sources."cli-table-0.3.4"
       sources."cli-width-2.2.1"
       (sources."cliui-3.2.0" // {
         dependencies = [
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
         ];
       })
@@ -13765,7 +13606,7 @@ in
       sources."color-name-1.1.3"
       sources."color-string-1.5.4"
       sources."colorette-1.2.1"
-      sources."colors-1.0.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."commander-4.1.1"
       sources."common-tags-1.8.0"
@@ -13802,7 +13643,7 @@ in
         ];
       })
       sources."core-js-2.6.12"
-      (sources."core-js-compat-3.8.0" // {
+      (sources."core-js-compat-3.8.3" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -13824,17 +13665,19 @@ in
         dependencies = [
           sources."camelcase-6.2.0"
           sources."loader-utils-2.0.0"
-          sources."semver-7.3.2"
+          sources."lru-cache-6.0.0"
+          sources."semver-7.3.4"
+          sources."yallist-4.0.0"
         ];
       })
-      sources."css-select-1.2.0"
+      sources."css-select-2.1.0"
       sources."css-select-base-adapter-0.1.1"
       (sources."css-tree-1.0.0-alpha.37" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      sources."css-what-2.1.3"
+      sources."css-what-3.4.2"
       sources."cssesc-3.0.0"
       sources."cssnano-4.1.10"
       sources."cssnano-preset-default-4.0.7"
@@ -13852,7 +13695,7 @@ in
       sources."cycle-1.0.3"
       sources."cyclist-1.0.1"
       sources."dashdash-1.14.1"
-      sources."debug-4.3.1"
+      sources."debug-4.3.2"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-0.2.2"
@@ -13891,21 +13734,21 @@ in
       sources."dom-converter-0.2.0"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.0.2"
+          sources."domelementtype-2.1.0"
         ];
       })
       sources."domain-browser-1.2.0"
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
-      sources."domutils-1.5.1"
-      sources."dot-case-3.0.3"
+      sources."domutils-1.7.0"
+      sources."dot-case-3.0.4"
       sources."dot-prop-5.3.0"
       sources."dotenv-8.2.0"
       sources."duplexer-0.1.2"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.610"
+      sources."electron-to-chromium-1.3.643"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -13928,19 +13771,19 @@ in
       })
       sources."elm-webpack-loader-6.0.1"
       sources."elmi-to-json-1.3.0"
-      sources."emoji-regex-7.0.3"
+      sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."enhanced-resolve-4.3.0" // {
+      (sources."enhanced-resolve-4.5.0" // {
         dependencies = [
           sources."memory-fs-0.5.0"
         ];
       })
       sources."entities-2.1.0"
-      sources."errno-0.1.7"
+      sources."errno-0.1.8"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
@@ -14067,11 +13910,12 @@ in
       sources."find-up-4.1.0"
       sources."firstline-1.3.1"
       sources."flush-write-stream-1.1.1"
-      sources."follow-redirects-1.13.0"
+      sources."follow-redirects-1.13.1"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
+      sources."fraction.js-4.0.13"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."from2-2.3.0"
@@ -14080,11 +13924,11 @@ in
       sources."fs-readdir-recursive-1.1.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-1.0.3"
-      sources."get-intrinsic-1.0.1"
+      sources."get-intrinsic-1.0.2"
       sources."get-own-enumerable-property-symbols-3.0.2"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
@@ -14148,7 +13992,7 @@ in
       sources."hsl-regex-1.0.0"
       sources."hsla-regex-1.0.0"
       sources."html-comment-regex-1.1.2"
-      sources."html-entities-1.3.1"
+      sources."html-entities-1.4.0"
       sources."html-minifier-terser-5.1.1"
       sources."html-webpack-plugin-4.5.0"
       (sources."htmlparser2-3.10.1" // {
@@ -14163,7 +14007,7 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      sources."http-parser-js-0.5.2"
+      sources."http-parser-js-0.5.3"
       sources."http-proxy-1.18.1"
       sources."http-proxy-middleware-0.21.0"
       sources."http-signature-1.2.0"
@@ -14190,7 +14034,7 @@ in
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.5"
+      sources."ini-1.3.8"
       (sources."inquirer-6.2.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -14207,7 +14051,7 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-absolute-url-2.1.0"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-arguments-1.0.4"
+      sources."is-arguments-1.1.0"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
@@ -14220,9 +14064,9 @@ in
       sources."is-directory-0.3.1"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
-      sources."is-negative-zero-2.0.0"
+      sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
       sources."is-obj-2.0.0"
       sources."is-path-cwd-2.2.0"
@@ -14246,7 +14090,7 @@ in
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.0"
+      sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
       sources."jsesc-2.5.2"
       sources."json-parse-better-errors-1.0.2"
@@ -14286,7 +14130,7 @@ in
       sources."lodash.templatesettings-4.2.0"
       sources."lodash.uniq-4.5.0"
       sources."loglevel-1.7.1"
-      sources."lower-case-2.0.1"
+      sources."lower-case-2.0.2"
       sources."lru-cache-5.1.1"
       sources."make-dir-2.1.0"
       sources."map-cache-0.2.2"
@@ -14305,8 +14149,8 @@ in
         ];
       })
       sources."mime-1.6.0"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."mimic-fn-1.2.0"
       (sources."mini-css-extract-plugin-0.12.0" // {
         dependencies = [
@@ -14334,13 +14178,13 @@ in
       sources."mustache-3.2.1"
       sources."mute-stream-0.0.8"
       sources."nan-2.14.2"
-      sources."nanoid-3.1.18"
+      sources."nanoid-3.1.20"
       sources."nanomatch-1.2.13"
       sources."ncp-1.0.1"
       sources."negotiator-0.6.2"
       sources."neo-async-2.6.2"
       sources."nice-try-1.0.5"
-      sources."no-case-3.0.3"
+      sources."no-case-3.0.4"
       (sources."node-elm-compiler-5.0.5" // {
         dependencies = [
           sources."cross-spawn-6.0.5"
@@ -14356,7 +14200,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.67"
+      sources."node-releases-1.1.70"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."normalize-range-0.1.2"
@@ -14367,7 +14211,6 @@ in
         ];
       })
       sources."nth-check-1.0.2"
-      sources."num2fraction-1.2.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
@@ -14384,7 +14227,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.8.0"
+      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
@@ -14412,7 +14255,7 @@ in
       sources."p-try-2.2.0"
       sources."pako-1.0.11"
       sources."parallel-transform-1.2.0"
-      sources."param-case-3.0.3"
+      sources."param-case-3.0.4"
       (sources."parent-module-1.0.1" // {
         dependencies = [
           sources."callsites-3.1.0"
@@ -14422,7 +14265,7 @@ in
       sources."parse-json-4.0.0"
       sources."parse-passwd-1.0.0"
       sources."parseurl-1.3.3"
-      sources."pascal-case-3.1.1"
+      sources."pascal-case-3.1.2"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
       sources."path-dirname-1.0.2"
@@ -14488,13 +14331,15 @@ in
       (sources."postcss-loader-4.1.0" // {
         dependencies = [
           sources."cosmiconfig-7.0.0"
-          sources."import-fresh-3.2.2"
+          sources."import-fresh-3.3.0"
           sources."loader-utils-2.0.0"
-          sources."parse-json-5.1.0"
+          sources."lru-cache-6.0.0"
+          sources."parse-json-5.2.0"
           sources."path-type-4.0.0"
           sources."resolve-from-4.0.0"
           sources."schema-utils-3.0.0"
-          sources."semver-7.3.2"
+          sources."semver-7.3.4"
+          sources."yallist-4.0.0"
         ];
       })
       (sources."postcss-merge-longhand-4.0.11" // {
@@ -14586,7 +14431,7 @@ in
       })
       (sources."postcss-safe-parser-5.0.2" // {
         dependencies = [
-          sources."postcss-8.1.10"
+          sources."postcss-8.2.4"
           sources."source-map-0.6.1"
         ];
       })
@@ -14599,17 +14444,13 @@ in
       sources."postcss-unique-selectors-4.0.1"
       sources."postcss-value-parser-4.1.0"
       sources."prepend-http-1.0.4"
-      sources."pretty-bytes-5.4.1"
+      sources."pretty-bytes-5.5.0"
       sources."pretty-error-2.1.2"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
       sources."promise-8.1.0"
       sources."promise-inflight-1.0.1"
-      (sources."prompt-1.0.0" // {
-        dependencies = [
-          sources."colors-1.4.0"
-        ];
-      })
+      sources."prompt-1.0.0"
       sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
@@ -14692,21 +14533,17 @@ in
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.1"
       sources."regexpu-core-4.7.1"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.4" // {
+      (sources."regjsparser-0.6.6" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
       })
       sources."relateurl-0.2.7"
       sources."remove-trailing-separator-1.1.0"
-      (sources."renderkid-2.0.4" // {
+      (sources."renderkid-2.0.5" // {
         dependencies = [
           sources."strip-ansi-3.0.1"
         ];
@@ -14734,7 +14571,11 @@ in
       sources."ripemd160-2.0.2"
       sources."run-async-2.4.1"
       sources."run-queue-1.0.3"
-      sources."rxjs-6.6.3"
+      (sources."rxjs-6.6.3" // {
+        dependencies = [
+          sources."tslib-1.14.1"
+        ];
+      })
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -14877,11 +14718,7 @@ in
       sources."stream-shift-1.0.1"
       sources."strict-uri-encode-1.1.0"
       sources."string-replace-loader-2.3.0"
-      (sources."string-width-1.0.2" // {
-        dependencies = [
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      sources."string-width-4.2.0"
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
@@ -14909,13 +14746,7 @@ in
         ];
       })
       sources."supports-color-5.5.0"
-      (sources."svgo-1.3.2" // {
-        dependencies = [
-          sources."css-select-2.1.0"
-          sources."css-what-3.4.2"
-          sources."domutils-1.7.0"
-        ];
-      })
+      sources."svgo-1.3.2"
       sources."tapable-1.1.3"
       sources."tar-4.4.13"
       (sources."temp-0.9.4" // {
@@ -14960,7 +14791,7 @@ in
       sources."toidentifier-1.0.0"
       sources."tough-cookie-2.5.0"
       sources."traverse-0.3.9"
-      sources."tslib-1.14.1"
+      sources."tslib-2.1.0"
       sources."tty-browserify-0.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -15019,7 +14850,7 @@ in
       })
       sources."unzip-stream-0.3.1"
       sources."upath-1.2.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -15049,7 +14880,6 @@ in
       sources."vary-1.1.2"
       sources."vendors-1.0.4"
       sources."verror-1.10.0"
-      sources."vfile-location-3.2.0"
       sources."vm-browserify-1.1.2"
       sources."watchpack-1.7.5"
       (sources."watchpack-chokidar2-2.0.1" // {
@@ -15083,9 +14913,9 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      (sources."webpack-dev-middleware-3.7.2" // {
+      (sources."webpack-dev-middleware-3.7.3" // {
         dependencies = [
-          sources."mime-2.4.6"
+          sources."mime-2.5.0"
         ];
       })
       (sources."webpack-dev-server-3.11.0" // {
@@ -15100,6 +14930,7 @@ in
               sources."strip-ansi-5.2.0"
             ];
           })
+          sources."emoji-regex-7.0.3"
           sources."extend-shallow-2.0.1"
           sources."fill-range-4.0.0"
           sources."find-up-3.0.0"
@@ -15158,6 +14989,7 @@ in
       (sources."winston-2.1.1" // {
         dependencies = [
           sources."async-1.0.0"
+          sources."colors-1.0.3"
           sources."pkginfo-0.3.1"
         ];
       })
@@ -15184,6 +15016,8 @@ in
       sources."worker-farm-1.7.0"
       (sources."wrap-ansi-2.1.0" // {
         dependencies = [
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
         ];
       })
@@ -15191,13 +15025,16 @@ in
       sources."ws-6.2.1"
       sources."xmlbuilder-15.1.1"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.0"
+      sources."y18n-4.0.1"
       sources."yallist-3.1.1"
       sources."yaml-1.10.0"
       (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
-          sources."y18n-3.2.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."y18n-3.2.2"
         ];
       })
       (sources."yargs-parser-4.2.1" // {
@@ -15231,7 +15068,7 @@ in
       sources."chalk-4.1.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."commander-6.2.0"
+      sources."commander-6.2.1"
       sources."concat-map-0.0.1"
       sources."cross-spawn-6.0.5"
       sources."find-elm-dependencies-2.0.4"
@@ -15275,10 +15112,10 @@ in
   elm-review = nodeEnv.buildNodePackage {
     name = "elm-review";
     packageName = "elm-review";
-    version = "2.3.3";
+    version = "2.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-review/-/elm-review-2.3.3.tgz";
-      sha512 = "1TiTnEXzpzACrc/JdB3tvmgNf5Qd0RyX8wbBqPPuc1aWvHHvPf6wi/ncz1gcILFAObr1zquCePkJkoW0uoZiBA==";
+      url = "https://registry.npmjs.org/elm-review/-/elm-review-2.4.0.tgz";
+      sha512 = "UXxXpmMi7/pbWGbUPB3WKEmylaANH53x/fsLj9YT742l2LBLsQxa6Y3k9RmOG+Sy6JP+njAnODi/irDBwYfh7g==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -15286,9 +15123,8 @@ in
       sources."@types/cacheable-request-6.0.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.10"
+      sources."@types/node-14.14.22"
       sources."@types/responselike-1.0.0"
-      sources."ajv-6.12.6"
       (sources."ansi-escapes-4.3.1" // {
         dependencies = [
           sources."type-fest-0.11.0"
@@ -15297,28 +15133,15 @@ in
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
-      sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
-      sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-0.3.0"
-      sources."binary-extensions-2.1.0"
-      sources."binwrap-0.2.2"
-      sources."bluebird-3.7.2"
+      sources."binary-extensions-2.2.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."buffers-0.1.1"
       sources."cacheable-lookup-2.0.1"
       sources."cacheable-request-7.0.1"
-      sources."caseless-0.12.0"
-      sources."chainsaw-0.1.0"
       sources."chalk-4.1.0"
-      sources."chokidar-3.4.3"
-      sources."chownr-1.1.4"
+      sources."chokidar-3.5.1"
       sources."cli-cursor-3.1.0"
       sources."cli-spinners-2.5.0"
       sources."clone-1.0.4"
@@ -15329,9 +15152,7 @@ in
       })
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
-      sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
       (sources."cross-spawn-promise-0.10.2" // {
         dependencies = [
@@ -15341,42 +15162,28 @@ in
           sources."which-1.3.1"
         ];
       })
-      sources."dashdash-1.14.1"
-      sources."debug-4.3.1"
+      sources."debug-4.3.2"
       sources."decompress-response-5.0.0"
       sources."defaults-1.0.3"
       sources."defer-to-connect-2.0.0"
-      sources."delayed-stream-1.0.0"
       sources."duplexer3-0.1.4"
-      sources."ecc-jsbn-0.1.2"
-      sources."elm-json-0.2.8"
+      sources."elm-tooling-1.0.2"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."escape-string-regexp-1.0.5"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."folder-hash-3.3.3"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs-extra-9.0.1"
-      sources."fs-minipass-1.2.7"
+      sources."fs-extra-9.1.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."get-stream-5.2.0"
-      sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."got-10.7.0"
       sources."graceful-fs-4.2.4"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
       sources."has-flag-4.0.0"
       sources."http-cache-semantics-4.1.0"
-      sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
@@ -15385,24 +15192,12 @@ in
       sources."is-glob-4.0.1"
       sources."is-interactive-1.0.0"
       sources."is-number-7.0.0"
-      sources."is-typedarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
       sources."json-buffer-3.0.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      (sources."jsonfile-6.1.0" // {
-        dependencies = [
-          sources."universalify-2.0.0"
-        ];
-      })
-      sources."jsprim-1.4.1"
+      sources."jsonfile-6.1.0"
       sources."keyv-4.0.3"
       sources."kleur-3.0.3"
       sources."locate-path-5.0.0"
-      sources."lodash-4.17.20"
       (sources."log-symbols-3.0.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
@@ -15415,25 +15210,15 @@ in
       })
       sources."lowercase-keys-2.0.0"
       sources."lru-cache-4.1.5"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
       sources."mimic-fn-2.1.0"
       sources."mimic-response-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      (sources."minipass-2.9.0" // {
-        dependencies = [
-          sources."yallist-3.1.1"
-        ];
-      })
-      sources."minizlib-1.3.3"
       sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
-      sources."mustache-3.2.1"
       sources."mute-stream-0.0.8"
       sources."normalize-path-3.0.0"
       sources."normalize-url-4.5.0"
-      sources."oauth-sign-0.9.0"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       (sources."ora-4.1.1" // {
@@ -15451,52 +15236,28 @@ in
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
-      sources."performance-now-2.1.0"
       sources."picomatch-2.2.2"
       sources."prompts-2.4.0"
       sources."pseudomap-1.0.2"
-      sources."psl-1.8.0"
       sources."pump-3.0.0"
-      sources."punycode-2.1.1"
-      sources."qs-6.5.2"
       sources."readdirp-3.5.0"
-      sources."request-2.88.2"
-      sources."request-promise-4.2.6"
-      sources."request-promise-core-1.1.4"
       sources."responselike-2.0.0"
       sources."restore-cursor-3.1.0"
       sources."rimraf-2.6.3"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
       sources."sisteransi-1.0.5"
-      sources."sshpk-1.16.1"
-      sources."stealthy-require-1.1.1"
       sources."string-width-4.2.0"
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
       sources."supports-hyperlinks-2.1.0"
-      (sources."tar-4.4.13" // {
-        dependencies = [
-          sources."yallist-3.1.1"
-        ];
-      })
       sources."temp-0.9.4"
       sources."terminal-link-2.1.1"
       sources."to-readable-stream-2.1.0"
       sources."to-regex-range-5.0.1"
-      sources."tough-cookie-2.5.0"
-      sources."traverse-0.3.9"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
       sources."type-fest-0.10.0"
-      sources."universalify-1.0.0"
-      sources."unzip-stream-0.3.1"
-      sources."uri-js-4.4.0"
-      sources."uuid-3.4.0"
-      sources."verror-1.10.0"
+      sources."universalify-2.0.0"
       sources."wcwidth-1.0.1"
       sources."which-2.0.2"
       sources."wrap-ansi-6.2.0"
diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix
index b565c6d2f5d..baacee29ff2 100644
--- a/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/development/misc/google-clasp/node-packages.nix b/pkgs/development/misc/google-clasp/node-packages.nix
index a58f58e05c6..d8d15d54a8b 100644
--- a/pkgs/development/misc/google-clasp/node-packages.nix
+++ b/pkgs/development/misc/google-clasp/node-packages.nix
@@ -1,34 +1,34 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@nodelib/fs.scandir-2.1.3" = {
+    "@nodelib/fs.scandir-2.1.4" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
-        sha512 = "07zn0jp8b7nrrpkxwx715n68ncr51xiyz46j8g1fdvy07cr3s60npwhds1difzwdgz762zwirirppmc5dwl5pdqmww1m0zp15hv0sbq";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
+        sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
       };
     };
-    "@nodelib/fs.stat-2.0.3" = {
+    "@nodelib/fs.stat-2.0.4" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
-        sha512 = "2n8008qx9kqgxsgsd22r2xrkm56nwsnwjfws9s4jjmbrk4gz8vfhdw7vp70kn59mqfihkdks6s0101javrpfi7hg8l0qk3nwjp4a03d";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
+        sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
       };
     };
-    "@nodelib/fs.walk-1.2.4" = {
+    "@nodelib/fs.walk-1.2.6" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.4";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
-        sha512 = "2nsw6dfpkrkm8pxp2d9jlva5mnwqfzssj9r3xlyvrybb26xvjjkw7c0jvfilz08xvvgaanjxvqz6ycqh35avnqwg8mns39biqwmfpym";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
+        sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -37,7 +37,7 @@ let
       version = "0.14.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz";
-        sha512 = "0nvckjkw0vk0vs1c689m143ml2ibm8cd3h8pc5ncq4lnm0k6c7vki57paf57s16k4wf7xi2mg7a1qw3vsrjq9q6kq7s4d83bpvi7lgl";
+        sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==";
       };
     };
     "@szmarczak/http-timer-1.1.2" = {
@@ -46,25 +46,16 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz";
-        sha512 = "148vnx878hajsqb1aimsqg8wz9kja37pmfrf7ac501q2rci4v3cwwar8z3425pnd6pwvsinymy5qmc6gp2j1pw8g2idwk67pifpd02w";
+        sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
       };
     };
-    "@types/events-3.0.0" = {
-      name = "_at_types_slash_events";
-      packageName = "@types/events";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
-        sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi";
-      };
-    };
-    "@types/glob-7.1.1" = {
+    "@types/glob-7.1.3" = {
       name = "_at_types_slash_glob";
       packageName = "@types/glob";
-      version = "7.1.1";
+      version = "7.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
-        sha512 = "3dhbgdkzpgx010hfgkhndrb094kbd3z6s4waicihnl0rp3jk0f0gs8vvzi84xzissrhml1dfgvbdhahzbh75nny1g6429fnqvlp866l";
+        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz";
+        sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -73,16 +64,16 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
-        sha512 = "2ff7lcgph45bp2v5zsaxcy00rbh5n5h4njbicwhqilz66pd1lw7xfrpfl4i4ppfcx78zg9cp582b5fjif0dg7r18m44vxfksslvlyml";
+        sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/node-13.9.1" = {
+    "@types/node-14.14.22" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.9.1";
+      version = "14.14.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz";
-        sha512 = "2linpd9l89509ib4fbfw2pwgybl5wb23w9cxfxw9vmpbqhklappmlhfg89znkpajqbpvjl40z0srmmwyivdw40zczighzz58qvkm8qk";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
+        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
       };
     };
     "abort-controller-3.0.0" = {
@@ -91,25 +82,25 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz";
-        sha512 = "1x70yq0brkpbwyss5m5z3q41f4w6wf2pp1xdy31q49kwshyvmxadwdzwb53vdhbx1sfkzrrf864xswgkc44wl7kvv8qjrcwsvr51jc7";
+        sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==";
       };
     };
-    "agent-base-6.0.0" = {
+    "agent-base-6.0.2" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "6.0.0";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz";
-        sha512 = "2mlsi3nqlanwznzfz3dgmwv412vs83liaiifwqkh671z6j5s1qc7giv90s6dya7dmv9rrxsj0v3zkd9w2fgmpb0mqqf0dxa41qknm4g";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz";
+        sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==";
       };
     };
-    "aggregate-error-3.0.1" = {
+    "aggregate-error-3.1.0" = {
       name = "aggregate-error";
       packageName = "aggregate-error";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz";
-        sha512 = "00ccx66xcda4wlic1naxckbz0vbzyp0wrcj1wd5dqlr08n264s7c00i4dbq41fnq9b6ip7w1j9n3qyg2kd8hwpfd76i5z3xqrg1msma";
+        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz";
+        sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==";
       };
     };
     "ansi-escapes-3.2.0" = {
@@ -118,7 +109,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
-        sha512 = "12pp3q4c44hrzr2xl9vqjigwjn2wr1j0lhvshl75z5m6a97hqkd047sdcma1inzjvxhpkzk1qkvag7cw3sya32s9wsfasr6xsnnj63h";
+        sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
       };
     };
     "ansi-regex-3.0.0" = {
@@ -136,7 +127,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm";
+        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
       };
     };
     "ansi-styles-3.2.1" = {
@@ -145,7 +136,7 @@ let
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
+        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
     "array-differ-3.0.0" = {
@@ -154,7 +145,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz";
-        sha512 = "0r28zgr6s5xc89py7m7slvhh08whrm0bg278byz4218hgw6gd11dc6hpirl0jgblv8n2h55vqixfpmsfqv2l8c0r0zw3d4a5rhmyysc";
+        sha512 = "THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==";
       };
     };
     "array-union-2.1.0" = {
@@ -163,7 +154,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz";
-        sha512 = "35whnhqnw23y121ilf8kl79pyqb9bjsg32gsazzlmww9zgk22c5jycf0vlkpsnp67rqw05hhw97hxw216hpnm6bxa620lyqwjhb2v0w";
+        sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==";
       };
     };
     "arrify-2.0.1" = {
@@ -172,7 +163,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz";
-        sha512 = "2xd8y87g4h0dfnifdci7lhbx35fjxaxrdmcb80kgxahcrqqpnykfkmxxgvpmrfjc7l4rxwk3k81l7n903gk1047idm4rwxwv3189nyx";
+        sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -184,22 +175,22 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base64-js-1.3.1" = {
+    "base64-js-1.5.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.3.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
-        sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
+        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
       };
     };
-    "bignumber.js-7.2.1" = {
+    "bignumber.js-9.0.1" = {
       name = "bignumber.js";
       packageName = "bignumber.js";
-      version = "7.2.1";
+      version = "9.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz";
-        sha512 = "1sxpshc5qga6sjamj8h1jlswqv7fh7ixr77hbg9x07cwkr19n7vn7a76189gh2003d0p07i2iappgjyfg53bjxzf68iyc3c9q3g71ab";
+        url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz";
+        sha512 = "IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==";
       };
     };
     "brace-expansion-1.1.11" = {
@@ -208,7 +199,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
     "braces-3.0.2" = {
@@ -217,7 +208,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
-        sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg";
+        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -235,7 +226,16 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz";
-        sha512 = "214hpw087zbwnf1naz9184bbz0gn773j70jjvfj0vd7lll2i62j58606l281sz3dngjlhb2v5j00rnqy94y3yhwxmbyda62cc0dqg9s";
+        sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==";
+      };
+    };
+    "call-bind-1.0.2" = {
+      name = "call-bind";
+      packageName = "call-bind";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
+        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
       };
     };
     "chalk-2.4.2" = {
@@ -244,7 +244,7 @@ let
       version = "2.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
-        sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j";
+        sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
     "chardet-0.7.0" = {
@@ -253,7 +253,7 @@ let
       version = "0.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz";
-        sha512 = "1qg04aw34n3l68g6s6li7pfdspkj3zmb7qsqf096h19jwc34mv8sbhik4xcx9aazys1ycb5k736f4lql46s0rhl361pmlz1r86j4gwr";
+        sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
       };
     };
     "clean-stack-2.2.0" = {
@@ -262,7 +262,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz";
-        sha512 = "3a11z08fhd0c5rib496gi10xdi7al80hqy8y4r3zpckaqwgmm9iaarm5arkjr1rwlfg6yk8kics0h1qqqd0x8f5028y44wkfvs85n71";
+        sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==";
       };
     };
     "cli-cursor-2.1.0" = {
@@ -280,16 +280,16 @@ let
       version = "0.2.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/cli-spinner/-/cli-spinner-0.2.10.tgz";
-        sha512 = "3ysg16xq4z00px0j02wqkmsj8znxkw3bs3vx8v56xz7gbxg31by6h7vh2g0hqnfrg2f3rpmr873q862ljfbh64hsvi25ga9w91i4jsk";
+        sha512 = "U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q==";
       };
     };
-    "cli-width-2.2.0" = {
+    "cli-width-2.2.1" = {
       name = "cli-width";
       packageName = "cli-width";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz";
-        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
+        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz";
+        sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==";
       };
     };
     "clone-response-1.0.2" = {
@@ -307,7 +307,7 @@ let
       version = "1.9.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
-        sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21";
+        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
       };
     };
     "color-name-1.1.3" = {
@@ -325,7 +325,7 @@ let
       version = "2.20.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
-        sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s";
+        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
     "concat-map-0.0.1" = {
@@ -337,13 +337,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "debug-4.1.1" = {
+    "debug-4.3.2" = {
       name = "debug";
       packageName = "debug";
-      version = "4.1.1";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
-        sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
+        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
       };
     };
     "decompress-response-3.3.0" = {
@@ -361,7 +361,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
-        sha512 = "1aidgab75g8sx8hi5491l2y5k4aag4j6f55kbmyapvyy4hmqdmvh0asr9p8bz2710awqak65jym8w00k6brb1a8v19zc7mcicv9v16h";
+        sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
       };
     };
     "define-properties-1.1.3" = {
@@ -370,7 +370,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
-        sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw";
+        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
       };
     };
     "del-5.1.0" = {
@@ -379,7 +379,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz";
-        sha512 = "2fc139fcwy724dim9b5m6b6880q0s716r00ycmd8j13fhwasfrghks9w6mwzyqgvq0c4sgiadqixdv906pmp26xihyklwz7a4wp2zy0";
+        sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==";
       };
     };
     "dir-glob-3.0.1" = {
@@ -388,7 +388,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz";
-        sha512 = "0h761rklv8qk0vhv6ms98gsvdiyk8455iqqh6wh8dfal5xjx87gmmpyg7773zdrxwvhnzw58pan4rdqjfwkhcv653gsbq4is6kxcjjs";
+        sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
       };
     };
     "dns-packet-5.2.1" = {
@@ -397,25 +397,25 @@ let
       version = "5.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.2.1.tgz";
-        sha512 = "3znyrkkjkq0kvh1ik1n597rflifrrmy83r8jkwf5mmivv3nx44l96xa6z5gbqq16ypic0xg723rz8g7bpfs967brmqsjflajz4gcy14";
+        sha512 = "JHj2yJeKOqlxzeuYpN1d56GfhzivAxavNwHj9co3qptECel27B1rLY5PifJAvubsInX5pGLDjAHuCfCUc2Zv/w==";
       };
     };
-    "dns-socket-4.2.0" = {
+    "dns-socket-4.2.1" = {
       name = "dns-socket";
       packageName = "dns-socket";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.0.tgz";
-        sha512 = "2nqakl6510w3f70ia79lms1y0njjggg2dpp2937qh04bjfkvh179fbizkhy9mxs1hg3d4jbds0aj23wpa4qmnziirvip3mw7pgq6yz1";
+        url = "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.1.tgz";
+        sha512 = "fNvDq86lS522+zMbh31X8cQzYQd6xumCNlxsuZF5TKxQThF/e+rJbVM6K8mmlsdcSm6yNjKJQq3Sf38viAJj8g==";
       };
     };
-    "dotf-1.5.0" = {
+    "dotf-1.5.3" = {
       name = "dotf";
       packageName = "dotf";
-      version = "1.5.0";
+      version = "1.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dotf/-/dotf-1.5.0.tgz";
-        sha512 = "3b4bpb8nr856zyfi210cp77js41mpq4mvks3qq1xrq8gyamzy41cxy12kis2qyxhbfl34vi3ycb8jhg3g3pn78m1xiwvbfj93776i5p";
+        url = "https://registry.npmjs.org/dotf/-/dotf-1.5.3.tgz";
+        sha512 = "hYztBLJ6AoY0GO5qNDy+MH8lNZavrAkVqrfvv9sQSImDo553JRLRjMre11EW4ZPRg8Y4Uha7qwqiMJQDVXxVqg==";
       };
     };
     "duplexer3-0.1.4" = {
@@ -433,7 +433,7 @@ let
       version = "1.0.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz";
-        sha512 = "1qianmi7icfcsfp04wpjqrf9fg9s0l3s8189a5s25494h9zvqf4mx72b7gwiynwpvv1yb3hrg5mklp8dn5287h9j7xdnv1b2vfjba4x";
+        sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==";
       };
     };
     "ellipsize-0.1.0" = {
@@ -451,16 +451,16 @@ let
       version = "1.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz";
-        sha512 = "3jyw0a0c7m1yxglwk7i5jh8zb3vvx7f9l4frbskxkgf9cyf4i8ww26p8bimnsryrh1dx7lwrxq64vbpjwfcv1svd4lg8m07fa53bv7s";
+        sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
       };
     };
-    "es-abstract-1.17.4" = {
+    "es-abstract-1.18.0-next.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.17.4";
+      version = "1.18.0-next.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
-        sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
+        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -469,7 +469,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0";
+        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -487,7 +487,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz";
-        sha512 = "1czwwj9g33wdi578wfrx6cfs8fmh6yvjrpk620d415f4fiajm084fylyqywq45rc4mf7vrnrr6879c097akbgjf158yrzmkfip9gzcb";
+        sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==";
       };
     };
     "exec-sh-0.2.2" = {
@@ -496,7 +496,7 @@ let
       version = "0.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz";
-        sha512 = "01xwgxaanmd0h0i1pvqy0fk6sqxmab59mjww1mzj3dc25zzrw4z7n7rcl5wd1y7s38lvgcg815qc700kw36ipd42jsf8vji7lkh518l";
+        sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==";
       };
     };
     "extend-3.0.2" = {
@@ -505,7 +505,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
-        sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
       };
     };
     "external-editor-3.1.0" = {
@@ -514,34 +514,34 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz";
-        sha512 = "1xm0arqcf7jp9kgq1g67ss2jvj8kblzbb7dd7sj2gm1g8cj4ilcwnn8vwspz3rh83yjphbl1lvqdyivrji6ccmnp3k2rmk9gl4kii44";
+        sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==";
       };
     };
-    "fast-glob-3.2.2" = {
+    "fast-glob-3.2.5" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.2";
+      version = "3.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz";
-        sha512 = "3n0a23s3nq6f339d9hw9mw4plbzcdmglhzm09w7azz5fb34xiw60rhhhsvcvqw8c86h3ryfvmk1k624jlf36w3wrrijjhrfivd7qdah";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
+        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
       };
     };
-    "fast-text-encoding-1.0.1" = {
+    "fast-text-encoding-1.0.3" = {
       name = "fast-text-encoding";
       packageName = "fast-text-encoding";
-      version = "1.0.1";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz";
-        sha512 = "04pv2mmlav6kal13gnqyh44v5ikdv2myqr9higzdiwcp2i0nlk9807hiwwgd59xksrxcmnp7c60q6avhycsiigj4mnx9k7pmj0l90f7";
+        url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz";
+        sha512 = "dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==";
       };
     };
-    "fastq-1.6.1" = {
+    "fastq-1.10.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.6.1";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz";
-        sha512 = "0vr0q4q5s3glb32wlf6a2c58iixn3mqi4l7bqly16v32krfhh2mj2d5mna93fmjanjdk0h25m30xjx3anmw5297cdvyifcqqbk0g4ls";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
+        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
       };
     };
     "figures-2.0.0" = {
@@ -559,7 +559,7 @@ let
       version = "7.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
-        sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8";
+        sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
       };
     };
     "find-up-4.1.0" = {
@@ -568,7 +568,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
-        sha512 = "2bi4wmj1qymhj4ap1nay5isn0w7x6ymxp30h5y1jv0hx7q0inmirmr09mn621h4alg0gpv2hjwl6ai2giw6pz7qvb85aqizsh0v14ry";
+        sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
       };
     };
     "fs-extra-8.1.0" = {
@@ -577,7 +577,7 @@ let
       version = "8.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz";
-        sha512 = "3i4dsx067a564yx62qy0gz15zvsihqybmmx56lqz4cbgh4fiv5ikrj53wa1rfcijlnkywx18az05m1541dm04gb51af57561s0506fa";
+        sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -595,7 +595,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
+        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
     "fuzzy-0.1.3" = {
@@ -607,13 +607,13 @@ let
         sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8";
       };
     };
-    "gaxios-2.3.2" = {
+    "gaxios-2.3.4" = {
       name = "gaxios";
       packageName = "gaxios";
-      version = "2.3.2";
+      version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.2.tgz";
-        sha512 = "23w1hwvfpjhg7rllvid6w45irrya9qhxaffx2xm0pzy822jrbnm40pmg375dyx1wqrw73n613xnpc9aj6w982h12gd10a9gnp5skzrb";
+        url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz";
+        sha512 = "US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA==";
       };
     };
     "gcp-metadata-2.0.4" = {
@@ -622,7 +622,16 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-2.0.4.tgz";
-        sha512 = "0p21f317hgbp2yvxfflhhdfvj07vg284pn1jnq8m5nkxzhxrs1npn2v7g6qxhky4hs906bcfk4n9bb5g13qc5zlb53z4anwkf25fnd7";
+        sha512 = "p1lXhJvcKvJHWfQXhkd4Za1kyXRsGZA0JH7Cjs07W9hrg84d/j5tqQhbGewlSLx9gNyuQUid69uLux48YbggLg==";
+      };
+    };
+    "get-intrinsic-1.0.2" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
+        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
       };
     };
     "get-stream-4.1.0" = {
@@ -631,16 +640,16 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
-        sha512 = "3pwlllj9naaqzlc5axbxz4jqg3v533xd9jz945mjd3zmca3hh3pr1dpwc7416kjszw6igk060v6x2dgwpr7m1rd4djavmvr8bhavihq";
+        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
       };
     };
-    "get-stream-5.1.0" = {
+    "get-stream-5.2.0" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz";
-        sha512 = "21v525x0f3qrc6f343xp3wjwwrjf1l3x0lmp34hivvvmdcz0a681s0b9wx4k5r3r8jyhc5kd6dqrwqjhpbl285xg333gkgbxhagayhi";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz";
+        sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==";
       };
     };
     "glob-7.1.6" = {
@@ -649,16 +658,16 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
-    "glob-parent-5.1.0" = {
+    "glob-parent-5.1.1" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
-        sha512 = "23qivv79xv6rvb8fsi8hj0ic91ijfkw6dynzp8716bzafazq27dqc9ibxxlkfs7wqnhyzzimaa3xn8i22838ds157kyg60mfa152fxa";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
+        sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
       };
     };
     "globby-10.0.2" = {
@@ -667,7 +676,7 @@ let
       version = "10.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz";
-        sha512 = "151032pigk461rknfg3y4n80dcxsl597vl4hqkz4ylb620zzbh45bn3zl4lc8brn0klvjpqs2lfi79p9gvs6zybdbqkz8f23gnj5mgd";
+        sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==";
       };
     };
     "google-auth-library-4.2.6" = {
@@ -676,7 +685,7 @@ let
       version = "4.2.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-4.2.6.tgz";
-        sha512 = "0bmmlc0lyr2qddknl3kwnpv2c2d5ag4dvydh3jgr557nfvb2qrna61a7x9aw26ni6x77pbkmf2vcxhlrz19jgjn44gccvkb1w4av7m0";
+        sha512 = "oJ6tCA9rbsYeIVY+mcLPFHa2hatz3XO6idYIrlI/KhhlMxZrO3tKyU8O2Pxu5KnSBBP7Wj4HtbM1LLKngNFaFw==";
       };
     };
     "google-p12-pem-2.0.4" = {
@@ -685,7 +694,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.4.tgz";
-        sha512 = "3706hz8l4jq8b7a99hckrmgw5jbm64d6lxz5ni6kbzlg2m9zg0p573yj3mzxnfhhipj81xa03wr3m9gscg723lfbg21jr8n2hffb1jb";
+        sha512 = "S4blHBQWZRnEW44OcR7TL9WR+QCqByRvhNDZ/uuQfpxywfupikf/miba8js1jZi6ZOGv5slgSuoshCWh6EMDzg==";
       };
     };
     "googleapis-40.0.1" = {
@@ -694,7 +703,7 @@ let
       version = "40.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/googleapis/-/googleapis-40.0.1.tgz";
-        sha512 = "1mqr5nfznqp27fm9i5z2axh5h8c4yf3fm650bmvfng6l0f7gywnnw2wy2jps54iw606q6b47gxhhppkk78vnss8ljnf7d5f4ra9kah7";
+        sha512 = "B6qZVCautOOspEhru9GZ814I+ztkGWyA4ZEUfaXwXHBruX/HAWqedbsuUEx1w3nCECywK/FLTNUdcbH9zpaMaw==";
       };
     };
     "googleapis-common-2.0.4" = {
@@ -703,7 +712,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-2.0.4.tgz";
-        sha512 = "3vsp91n82bbrz1l0zzi84jqwd2cbf3vyq88dkl08rnf5g3axvsxq8npswrg99cq8avrkrsm06gldi03arqs5d905345igxqpp36857i";
+        sha512 = "8RRkxr24v1jIKCC1onFWA8RGnwFV55m3Qpil9DLX1yLc9e5qvOJsRoDOhhD2e7jFRONYEhT/BzT8vJZANqSr9w==";
       };
     };
     "got-9.6.0" = {
@@ -712,16 +721,16 @@ let
       version = "9.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz";
-        sha512 = "3whcjwqag287wncrji9r9bi3jv8ynkn1hpwdqghqdf8fms01xrjfsaf3z27k14kfjy55aa8gmfbx3nymxgpjd1vi9q8q6gfsnk9dds7";
+        sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
       };
     };
-    "graceful-fs-4.2.3" = {
+    "graceful-fs-4.2.4" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.3";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
-        sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
+        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
       };
     };
     "gtoken-3.0.2" = {
@@ -730,7 +739,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/gtoken/-/gtoken-3.0.2.tgz";
-        sha512 = "2w9lx15w046817mg36fyrnfzzk3173v1c3v45n0mr2mqdzjbhzlrwfg60gpfiqjbds1vfzjwdn0ig3m0c969l91hpqrgm7pkkln5q04";
+        sha512 = "BOBi6Zz31JfxhSHRZBIDdbwIbOPyux10WxJHdx8wz/FMP1zyN1xFrsAWsgcLe5ww5v/OZu/MePUEZAjgJXSauA==";
       };
     };
     "has-1.0.3" = {
@@ -739,7 +748,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
-        sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz";
+        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
       };
     };
     "has-flag-3.0.0" = {
@@ -757,7 +766,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
-        sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw";
+        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
       };
     };
     "http-cache-semantics-4.1.0" = {
@@ -766,7 +775,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
-        sha512 = "1qvqr3inc283iggn9x9wwiv1zb634i5zmlh8dnl2c5n4czaf2yibs4dncrgxfg7zrdfkcali22mvys4pgyhmfqjb57b91qlay9czaki";
+        sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==";
       };
     };
     "https-proxy-agent-5.0.0" = {
@@ -775,7 +784,7 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz";
-        sha512 = "1n8bc76isd6i45f468ydmgdl77xp7k226d38ij8z6d79b5xjm0fq07bqbsgd914wdd4ld2n4cz3wjm655qvglhwpffnhl0a2zj2cihj";
+        sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==";
       };
     };
     "iconv-lite-0.4.24" = {
@@ -784,16 +793,16 @@ let
       version = "0.4.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
       };
     };
-    "ignore-5.1.4" = {
+    "ignore-5.1.8" = {
       name = "ignore";
       packageName = "ignore";
-      version = "5.1.4";
+      version = "5.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz";
-        sha512 = "3q41bskh27g3dd95nqaf3lg1ck1iv1dbb6hhzg1jqlkk6j80q5sxb4i3n4k6rfw5nmnvrflaxvi281c7cv2ljlsxip6skb4m14x8dik";
+        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz";
+        sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==";
       };
     };
     "indent-string-4.0.0" = {
@@ -802,7 +811,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz";
-        sha512 = "3172bpzypayzfssbv1vi2anfh58k8bib049cd8m3fy1cvc480k43jnfq45i24acki0kbm54pfcn63pvqrngzsxj5f4frn00xrkc7l0i";
+        sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==";
       };
     };
     "inflight-1.0.6" = {
@@ -829,7 +838,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
     "inquirer-6.5.2" = {
@@ -838,7 +847,7 @@ let
       version = "6.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz";
-        sha512 = "1qz47j4jjik343ic5fx92q3jv1mfspj9ka574l6jbxr0mh8w1as4945qnl70m5v6rrgxcw64lg0p27j4bx3mfgfp0i1vf11k03nayvj";
+        sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
       };
     };
     "inquirer-autocomplete-prompt-1.0.1" = {
@@ -847,7 +856,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.0.1.tgz";
-        sha512 = "3j8f2ryrwa0x1qhmmh7gx22158sw3cknqcv96a86lj08r5s8fn3qxl0jskl40zvwlkzbfd616pa2hk1pj5ba11p6rmv7x1fy24pm1b3";
+        sha512 = "Y4V6ifAu9LNrNjcEtYq8YUKhrgmmufUn5fsDQqeWgHY8rEO6ZAQkNUiZtBm2kw2uUQlC9HdgrRCHDhTPPguH5A==";
       };
     };
     "ip-1.1.5" = {
@@ -859,22 +868,22 @@ let
         sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
       };
     };
-    "ip-regex-4.1.0" = {
+    "ip-regex-4.3.0" = {
       name = "ip-regex";
       packageName = "ip-regex";
-      version = "4.1.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz";
-        sha512 = "0q6z0axsvzqxwaxmspfj4gv06ndlwybjvj5rm928fwh4bj9wwdbkh4kn4cz6a3lrw7662zk2mcpxx9zdvkr9j6jskzz2k82p2jxkad4";
+        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz";
+        sha512 = "B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==";
       };
     };
-    "is-callable-1.1.5" = {
+    "is-callable-1.2.2" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.5";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
-        sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
+        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
       };
     };
     "is-date-object-1.0.2" = {
@@ -883,7 +892,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai";
+        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
       };
     };
     "is-extglob-2.1.1" = {
@@ -910,7 +919,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
-        sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4";
+        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
       };
     };
     "is-ip-3.1.0" = {
@@ -919,7 +928,16 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz";
-        sha512 = "3shj9n4j2lm2ls8bzxgfcj28jad9ci5bdy3pmdvgqr7zrbgpaiw9i03qg3p9l4myp3y4vnn42gidb3s07v7gqsknhib4fwwfzkdv6yz";
+        sha512 = "35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==";
+      };
+    };
+    "is-negative-zero-2.0.1" = {
+      name = "is-negative-zero";
+      packageName = "is-negative-zero";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
+        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
       };
     };
     "is-number-7.0.0" = {
@@ -928,16 +946,16 @@ let
       version = "7.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
-        sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73";
+        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
       };
     };
-    "is-online-8.2.1" = {
+    "is-online-8.5.1" = {
       name = "is-online";
       packageName = "is-online";
-      version = "8.2.1";
+      version = "8.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-online/-/is-online-8.2.1.tgz";
-        sha512 = "1hmzlq6v9pq270smya3b58h7g47k6ib733nf6q2qw0b4pia3zz0680knvr5gqs449smlhja5mzzyizbwhbdbrsy1p2gyvrnjbiyk7gk";
+        url = "https://registry.npmjs.org/is-online/-/is-online-8.5.1.tgz";
+        sha512 = "RKyTQx/rJqw2QOXHwy7TmXdlkpe0Hhj7GBsr6TQJaj4ebNOfameZCMspU5vYbwBBzJ2brWArdSvNVox6T6oCTQ==";
       };
     };
     "is-path-cwd-2.2.0" = {
@@ -946,7 +964,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz";
-        sha512 = "0aws7clcb9cyvvb4430df9fhfnpg9bl1n07ymzp7jdzia0bvjg25gyd39xp2xhgkgpkqazw8csglblifdql0rpj4kfwg1r26xnkdpn3";
+        sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==";
       };
     };
     "is-path-inside-3.0.2" = {
@@ -955,25 +973,16 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz";
-        sha512 = "1b02q8dp20gbph14ccd8fd9cm9kmxvqncp92j49c7bfnraidy0m27ic454xrza7iyhfz147d5jz1qwfqz8g0wabsqlardi650yhcrgz";
+        sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==";
       };
     };
-    "is-promise-2.1.0" = {
-      name = "is-promise";
-      packageName = "is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
-        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
-      };
-    };
-    "is-regex-1.0.5" = {
+    "is-regex-1.1.1" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.5";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
-        sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
+        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
       };
     };
     "is-stream-2.0.0" = {
@@ -982,7 +991,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
-        sha512 = "09j5ybpil7bgiffzq9gw66svm3rrgx634aghkwyslbdx382iqpy991cf3kwfk2jh9bi8fjz5wa996wsjwmq21lzz5svgbsld7wk4ajw";
+        sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
       };
     };
     "is-symbol-1.0.3" = {
@@ -991,7 +1000,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v";
+        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
       };
     };
     "is-wsl-1.1.0" = {
@@ -1003,13 +1012,13 @@ let
         sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
       };
     };
-    "json-bigint-0.3.0" = {
+    "json-bigint-0.3.1" = {
       name = "json-bigint";
       packageName = "json-bigint";
-      version = "0.3.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz";
-        sha1 = "0ccd912c4b8270d05f056fbd13814b53d3825b1e";
+        url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.1.tgz";
+        sha512 = "DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ==";
       };
     };
     "json-buffer-3.0.0" = {
@@ -1030,13 +1039,13 @@ let
         sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
       };
     };
-    "jsonfile-6.0.1" = {
+    "jsonfile-6.1.0" = {
       name = "jsonfile";
       packageName = "jsonfile";
-      version = "6.0.1";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz";
-        sha512 = "038bg8hpg0xbzfcas7llqd4fn4mimcr0xfl7azcsi3kqrra3x0lbrn1dvq0nh082ik799mnj1z4i9hl5myc6znbp87g5nnxzvk9n7cd";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz";
+        sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==";
       };
     };
     "jwa-1.4.1" = {
@@ -1045,7 +1054,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz";
-        sha512 = "10ayxzbvjd8a52s9dzlxbvjqab1fchaq0vfvj7smqp0gyp0v4v731rdsapsbwvvxib4xjpk0ksg1kbs3c9qi1cy02a5442433zxf8ma";
+        sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==";
       };
     };
     "jws-3.2.2" = {
@@ -1054,7 +1063,7 @@ let
       version = "3.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz";
-        sha512 = "0fb9ijf27cljn3nlj1r7xvqjzz71pbrpavhxmvqapb219f31v7ikrdlphxbdxdbaw2fplmlqj5yqx35zxy3qlivb1jkjcd53q45jyb0";
+        sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==";
       };
     };
     "keyv-3.1.0" = {
@@ -1063,7 +1072,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz";
-        sha512 = "1a1q61z26z860lq8pvcbaz1fii1ipafnk7iab6zs7dqijwiq8mr83cnh1h30jird29s2q4345gszcs3fg48kv6g7i5gydwjivzhjagp";
+        sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
       };
     };
     "locate-path-5.0.0" = {
@@ -1072,16 +1081,16 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
-        sha512 = "3r6llra9imfvg31342986kfkzm34ficva43avn7cng5inb9f5xrnr64jm4pykjjjbjs9np0mhia370ysnf97w4m6jqgnniyjbv71f5p";
+        sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
       };
     };
-    "lodash-4.17.15" = {
+    "lodash-4.17.20" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.15";
+      version = "4.17.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
-        sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
+        sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
       };
     };
     "lowercase-keys-1.0.1" = {
@@ -1090,7 +1099,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
+        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
       };
     };
     "lowercase-keys-2.0.0" = {
@@ -1099,7 +1108,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz";
-        sha512 = "2c8fy71cr597nqfq7savid5rdk1msa2pcvxkn504w8bksci9vpm7x3a9yy87zc1lb5chzqnii12rd1h0jpc8k3kxy2c787w5snmg8xn";
+        sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==";
       };
     };
     "lru-cache-5.1.1" = {
@@ -1108,7 +1117,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
-        sha512 = "3vjhn04mjkxbkfb4fh7xnlghlgmqffqp5i1w2vg1ndgh5izv7nwvr8lq1n1hypfs5pm3bvbk7wf3fjm2pavld1hipz0n8rp012l14ra";
+        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
       };
     };
     "merge-1.2.1" = {
@@ -1117,16 +1126,16 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz";
-        sha512 = "2yh381iph3hr5c720br83iwv18hncwqhqgp9ilnl3dgblm2s7p36skfcqlbv6xqkf6lmlf9h638gb75ds0b3wy2pvwdi1jnzvh6hcan";
+        sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==";
       };
     };
-    "merge2-1.3.0" = {
+    "merge2-1.4.1" = {
       name = "merge2";
       packageName = "merge2";
-      version = "1.3.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz";
-        sha512 = "1inz1swib3crzbwlqrpy74dhmn520qgzg5lkfmm3k1334lpb98d0xjpa6ydpdgwnp013j1n5m2yqkac4r75w6lbcj94hfj1v40h6gns";
+        url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz";
+        sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==";
       };
     };
     "micromatch-4.0.2" = {
@@ -1135,16 +1144,16 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz";
-        sha512 = "3jiz9pr94hycvjgzxbxi0jfz7n142n3z5w14im7i0088lymjpvj8xrapr8s66xcp13ylh374hbpm9ixp8rln55n7lrcll6c4qfnkcfb";
+        sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==";
       };
     };
-    "mime-2.4.4" = {
+    "mime-2.5.0" = {
       name = "mime";
       packageName = "mime";
-      version = "2.4.4";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz";
-        sha512 = "0c4qs0w88nqz2v7441rw9bbsgrsh50cifwmqm2i7c96yz2ncdy35cb5g42zhr6z0wmqqcwq5la04nnf1n4y3zncvgyg8b721hvnc71d";
+        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
+        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -1153,7 +1162,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd";
+        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
       };
     };
     "mimic-response-1.0.1" = {
@@ -1162,7 +1171,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz";
-        sha512 = "32nwz24nh1f2nbpk8i638ff8hsg1ajmc6746abkssjr951z28362k5a92dd1cfr7bd1l9f507cn0pbam04ixfgsaygskv87g6v1r4cg";
+        sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
     "minimatch-3.0.4" = {
@@ -1171,16 +1180,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
     "minimist-1.2.5" = {
@@ -1189,16 +1189,16 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
-    "mkdirp-0.5.1" = {
+    "mkdirp-0.5.5" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.1";
+      version = "0.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
       };
     };
     "ms-2.1.2" = {
@@ -1207,7 +1207,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
     "multimatch-4.0.0" = {
@@ -1216,7 +1216,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz";
-        sha512 = "02j464lazavd58a1qw29i6lj1g4rkilw7clssc5dp3pmkac528qpi95aazwdqqypsdk4338lqkz6mmbixh68x6w8jxsikxmvkpv2fcl";
+        sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==";
       };
     };
     "mute-stream-0.0.7" = {
@@ -1228,22 +1228,22 @@ let
         sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
-    "node-fetch-2.6.0" = {
+    "node-fetch-2.6.1" = {
       name = "node-fetch";
       packageName = "node-fetch";
-      version = "2.6.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz";
-        sha512 = "0s2drvlvgsan0f7cs66kbxxhqj4c399kf35h0jaya2v5syck1afzsx0pbyrlvpncg6ch93r5m88gcz5s3bvp59rm1ig2zm3kcgvilgi";
+        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz";
+        sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==";
       };
     };
-    "node-forge-0.9.1" = {
+    "node-forge-0.9.2" = {
       name = "node-forge";
       packageName = "node-forge";
-      version = "0.9.1";
+      version = "0.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.1.tgz";
-        sha512 = "2yn7gwj5adkc0156lv28w32q7mj2ln5af006cvgs9qdf72qnzga4j4fknvbiislxp9xk1ikld3ylrhn3vwqbvrm0y682vsjvr16b90v";
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz";
+        sha512 = "naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw==";
       };
     };
     "normalize-url-4.5.0" = {
@@ -1252,16 +1252,16 @@ let
       version = "4.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz";
-        sha512 = "02k93b4vrh4rvz479dc5rjv43v54pzz5k5kn21cx6gl2b1c45s3sb29cy4cyifvfl9zqghs9m1f5kcv0hp4cwp8sigyqx9i6p5kpkns";
+        sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==";
       };
     };
-    "object-inspect-1.7.0" = {
+    "object-inspect-1.9.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.7.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
-        sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
+        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -1270,16 +1270,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
-        sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n";
+        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
       };
     };
-    "object.assign-4.1.0" = {
+    "object.assign-4.1.2" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.0";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
-        sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
       };
     };
     "once-1.4.0" = {
@@ -1306,7 +1306,7 @@ let
       version = "6.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz";
-        sha512 = "0da91ydfkavxd733v8b3bvcrp681xirng4nyrazinl5bc2y3aacjd2g1bnapmzpp7g85bk42qh064hclbflj7jrkg94gvq5z1aafmr0";
+        sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==";
       };
     };
     "os-tmpdir-1.0.2" = {
@@ -1324,7 +1324,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-any/-/p-any-2.1.0.tgz";
-        sha512 = "0p0ndn153xzq9szwxrshsvfl0g14jhj3rjn6svhrq2r3a0yhsbjc9a95q3a3xpbr8xzmyrv3s1467pvz86n7s7bmf684b81ldqi2094";
+        sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg==";
       };
     };
     "p-cancelable-1.1.0" = {
@@ -1333,7 +1333,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz";
-        sha512 = "2bmkd9ncr81p8w6jy9v676ajg9q27znbjk80r723ydvf8gxk000q13693dhbd22dcagrmhwyjxblmm8w4xnfn6ng5srpkkqwv2dggdk";
+        sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
       };
     };
     "p-cancelable-2.0.0" = {
@@ -1342,7 +1342,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz";
-        sha512 = "0va49l2crhr6kr1lgbrjc69hz9scdrarzbrzpvddkfdb9wdr16bv48qajb2m0n6fjammxhvj68d4r35wyfy209rnajfv6nccq7dgwy2";
+        sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==";
       };
     };
     "p-finally-1.0.0" = {
@@ -1354,13 +1354,13 @@ let
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-limit-2.2.2" = {
+    "p-limit-2.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.2";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
-        sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
       };
     };
     "p-locate-4.1.0" = {
@@ -1369,7 +1369,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
-        sha512 = "3n0ljmpk3p2j4aaz345w5gkqr128xkhflcb83k75fgns5ddd4bpx7l0q50w9kwy5792xb8d3dpf8bwgzif3463spf3140rhzmkmkgs7";
+        sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
       };
     };
     "p-map-3.0.0" = {
@@ -1378,7 +1378,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz";
-        sha512 = "32jjm4kiyqvq9n9z6x2zwd31ylcwil7qq1mzq7gcx7qf9n7jqs9b1zvh1c6rxhcjshqchchq2gpc1fbf1ph6yfj16zfbcvz65arfykp";
+        sha512 = "d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==";
       };
     };
     "p-some-4.1.0" = {
@@ -1387,7 +1387,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-some/-/p-some-4.1.0.tgz";
-        sha512 = "3baac22g5wchcsla36c7f1h69g658kvp05vb4vk0j04i714j8h09f7a18q9s81d2r05hz5a9wcy9g5ri69rgj5l9rmf06dsp8hwfprh";
+        sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g==";
       };
     };
     "p-timeout-3.2.0" = {
@@ -1396,7 +1396,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz";
-        sha512 = "03cbpzps5mxhlp6hywp92mnnrj4b6ag82f8vdqyz59xrxsrpn58qbh8nzrpiix2asj2d333i81aq0pw9bhki4yw7yf05hr04x9k04mf";
+        sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
       };
     };
     "p-try-2.2.0" = {
@@ -1405,7 +1405,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
       };
     };
     "path-0.12.7" = {
@@ -1423,7 +1423,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
-        sha512 = "3zvnv1dp30y10br2qy98z8760jssvps6g9swamdclgxsmhm14dyq0yacrj0d4mk915qhr1z0yh8l3dyd68wn7h7bgv8d39vjk5m0kva";
+        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
       };
     };
     "path-is-absolute-1.0.1" = {
@@ -1441,16 +1441,16 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";
-        sha512 = "2zw0czk4p8vimrxap6mlnw17lbjrhisby3z1m2j0qdhjcnxlv9lk5d8yxirrqy4ax6ar5qx14rpshmbpvzg9b4mnpzy03aclvqrncl0";
+        sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
       };
     };
-    "picomatch-2.2.1" = {
+    "picomatch-2.2.2" = {
       name = "picomatch";
       packageName = "picomatch";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz";
-        sha512 = "12a2jzmkj24c6k3x71z0knzflw9qqhqx0lk27nrryjs6m7gjmszvgz5pp29xx1h7h7xxaj8cl3i5h98hlx3mpif5h26qdjhrh1ml811";
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
+        sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
       };
     };
     "pluralize-8.0.0" = {
@@ -1459,7 +1459,7 @@ let
       version = "8.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz";
-        sha512 = "048n73397ya45yj4w1pkxy058nkpkzgqcfv89xb3nqs9fi2227kndyi2qhcqzs90zlmkq5jl86kp6iy09kskq5qgm9zkkc7ki7wik9m";
+        sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==";
       };
     };
     "prepend-http-2.0.0" = {
@@ -1480,13 +1480,13 @@ let
         sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
       };
     };
-    "public-ip-3.2.0" = {
+    "public-ip-4.0.3" = {
       name = "public-ip";
       packageName = "public-ip";
-      version = "3.2.0";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/public-ip/-/public-ip-3.2.0.tgz";
-        sha512 = "1prlx3m3fp1d3qh4wxmc9j54fvnq0svqjv5hw4kjiwl45wh0day6xnbv3wscz25ii7g4ksdiysndprcljhwzf1127himkkrvsivh6hc";
+        url = "https://registry.npmjs.org/public-ip/-/public-ip-4.0.3.tgz";
+        sha512 = "IofiJJWoZ8hZHBk25l4ozLvcET0pjZSxocbUfh4sGkjidMOm4iZNzzWxezGqGsVY7HuxiK7SkyJKHNeT0YQ7uw==";
       };
     };
     "pump-3.0.0" = {
@@ -1495,16 +1495,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
-        sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
+        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
       };
     };
-    "qs-6.9.1" = {
+    "qs-6.9.6" = {
       name = "qs";
       packageName = "qs";
-      version = "6.9.1";
+      version = "6.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz";
-        sha512 = "343mpmbfcwx584cqi6siamc4m9z7ljzikmkvgsjm1kncmi1ci4b9k7k9li1gm2l694zxh38l216m0clzivcb4km61vzdjxz4kyvn68b";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz";
+        sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==";
       };
     };
     "recursive-readdir-2.2.2" = {
@@ -1513,7 +1513,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz";
-        sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x";
+        sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==";
       };
     };
     "responselike-1.0.2" = {
@@ -1540,7 +1540,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz";
-        sha512 = "37z410bxpvfjlxmd0rfrzmvd4dl33kqqgi51xp8hbbxxwzdddy5q1b20x9msvqhxvhj93w85fr2hlizsi7rfx91j3gcyzdpqvrwgnak";
+        sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==";
       };
     };
     "rimraf-3.0.2" = {
@@ -1549,43 +1549,43 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz";
-        sha512 = "0h97b8bvn1w87brifdhlnq9qnjxm0pmw87igc4fvvcfzx3h83shp3fszy2k09ff5q44zk1i1c34rjbcryamsak67x7m2600k4qhk695";
+        sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==";
       };
     };
-    "run-async-2.4.0" = {
+    "run-async-2.4.1" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz";
-        sha512 = "2k7xr99g0l8qvqzd66mpwp3wylfay2i27dh5ca3bmr92l5yixlk0dh53z9ljvyrm3mi7jz89il8gq55sgdv8d8p0v96wbkvyy3xp564";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz";
+        sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==";
       };
     };
-    "run-parallel-1.1.9" = {
+    "run-parallel-1.1.10" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.9";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
-        sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz";
+        sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==";
       };
     };
-    "rxjs-6.5.4" = {
+    "rxjs-6.6.3" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.5.4";
+      version = "6.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz";
-        sha512 = "3nzzg67sr57cc5n1065xsxjgrwa405bgbgqm9l8w01lnr660cy8zdjk99hm2n0did4kd75nwiz3843mfbrw7bs100n7g8q4r1fi18wx";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz";
+        sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
       };
     };
-    "safe-buffer-5.2.0" = {
+    "safe-buffer-5.2.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
-        sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -1594,16 +1594,16 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
-    "signal-exit-3.0.2" = {
+    "signal-exit-3.0.3" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
+        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
     "slash-3.0.0" = {
@@ -1612,7 +1612,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz";
-        sha512 = "3cj4cvlh36f0h6f3dslbkwa3y9nnny8qmwbf4kw3xy8vfbg5mypknds3j2cdhf7xg82hm8smdl8cq88xn4nyw1b9677xjwvly2kbm43";
+        sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==";
       };
     };
     "split-lines-2.0.0" = {
@@ -1621,7 +1621,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz";
-        sha512 = "2cbq8cchi0fyxiqvfppd5nxc33zkv62my7cmhh82yfxf83w62bkxsz2ax6adanq2x7j9hhxz63k7wb6f315wkzramzix45ipa2iv8l1";
+        sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA==";
       };
     };
     "string-width-2.1.1" = {
@@ -1630,34 +1630,34 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
-    "string.prototype.padend-3.1.0" = {
+    "string.prototype.padend-3.1.1" = {
       name = "string.prototype.padend";
       packageName = "string.prototype.padend";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz";
-        sha512 = "1l02s91pznws3jzzip0dkcpj5vb41p716rcnw5msglxjyxg87ycmxjvj94bwiy0rklnmbgj4dk981m50q8w32y8iwcw39yxazq2z8nx";
+        url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz";
+        sha512 = "eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==";
       };
     };
-    "string.prototype.trimleft-2.1.1" = {
-      name = "string.prototype.trimleft";
-      packageName = "string.prototype.trimleft";
-      version = "2.1.1";
+    "string.prototype.trimend-1.0.3" = {
+      name = "string.prototype.trimend";
+      packageName = "string.prototype.trimend";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
-        sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
       };
     };
-    "string.prototype.trimright-2.1.1" = {
-      name = "string.prototype.trimright";
-      packageName = "string.prototype.trimright";
-      version = "2.1.1";
+    "string.prototype.trimstart-1.0.3" = {
+      name = "string.prototype.trimstart";
+      packageName = "string.prototype.trimstart";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
-        sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -1675,7 +1675,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
-        sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f";
+        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
       };
     };
     "strip-bom-4.0.0" = {
@@ -1684,7 +1684,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz";
-        sha512 = "39mszh7y7d23gk9n6hz9h26hj7f0yr4gdgl5804gflghmz6qi56gqkzv51x65jhw1vyixfih8h09777d6dz0qknvyi0h4kdzqban6yz";
+        sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==";
       };
     };
     "supports-color-5.5.0" = {
@@ -1693,7 +1693,7 @@ let
       version = "5.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
-        sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2";
+        sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
       };
     };
     "through-2.3.8" = {
@@ -1711,7 +1711,7 @@ let
       version = "0.0.33";
       src = fetchurl {
         url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
-        sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
+        sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
       };
     };
     "to-readable-stream-1.0.0" = {
@@ -1720,7 +1720,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz";
-        sha512 = "38v92prncngfq4yfdn3frpy3j9x6bslii3spk436f0fhs6ls7gydxp23lrwjkd3f21s7zkn4j1zzp8lqrajsrgqlikkxk3s3dfbkb92";
+        sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==";
       };
     };
     "to-regex-range-5.0.1" = {
@@ -1729,25 +1729,25 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
-        sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb";
+        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
       };
     };
-    "ts2gas-3.6.1" = {
+    "ts2gas-3.6.4" = {
       name = "ts2gas";
       packageName = "ts2gas";
-      version = "3.6.1";
+      version = "3.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.6.1.tgz";
-        sha512 = "2z54dgic26rzizkbw21p5w5icq508rqasvb4m1w2m17q90h824bgaizvn1hidfbk11k4pzjqy3p91ij6i216l8bljnhr5dcj9j0xzh7";
+        url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.6.4.tgz";
+        sha512 = "TJgFvXnoUSZ40pRH4FzqtTYhbJfaF6LmeXKWd813cRV31v55DZTyVatYUyhqF7GCAHhbkKRH7HuCFcFhxeZFag==";
       };
     };
-    "tslib-1.11.1" = {
+    "tslib-1.14.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.11.1";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
-        sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
+        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
     "type-fest-0.3.1" = {
@@ -1756,16 +1756,25 @@ let
       version = "0.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz";
-        sha512 = "1hy8c4b243psdw221rnqcsn8j4hd5ndyy8fw6mnhlaxyf98f61gxlfdf6wb0dcvhil0b45yjrx44lx5bg8si87hg3dj9qbb4yf8jhbi";
+        sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==";
       };
     };
-    "typescript-3.8.3" = {
+    "typescript-3.9.7" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.8.3";
+      version = "3.9.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
-        sha512 = "3rwcbg3l3w3l2zr5y9lszqs30s29jzvh1w594rbdljyr582yi6vajzs2fg04s9p79klh3iv0980b91mbr94sl77h9nb7b2mgrz4929i";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz";
+        sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==";
+      };
+    };
+    "typescript-4.1.3" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "4.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz";
+        sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==";
       };
     };
     "universalify-0.1.2" = {
@@ -1774,16 +1783,16 @@ let
       version = "0.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
-        sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc";
+        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
-    "universalify-1.0.0" = {
+    "universalify-2.0.0" = {
       name = "universalify";
       packageName = "universalify";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz";
-        sha512 = "2x2m7gasg0x9mp1grwg5r1bvsp5r32xn7dm3i1zp7n02saxc18hj6jj8kmn0l1j5nycwxm2z14xmqzj244ycq008plxxwbrdparggmd";
+        url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz";
+        sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==";
       };
     };
     "url-parse-lax-3.0.0" = {
@@ -1810,7 +1819,7 @@ let
       version = "0.10.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
-        sha512 = "3sbbgsya51i86ih8bn3nfwi3f9556xlnwh32z4k54dwcpi0jibhfa5dpbfmpzyla63yh2zlxs9chl6wkhc8bqjmjxjyxc9p6j2vvyfh";
+        sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
       };
     };
     "uuid-3.4.0" = {
@@ -1819,7 +1828,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
-        sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "watch-1.0.2" = {
@@ -1846,7 +1855,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
+        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
   };
@@ -1858,21 +1867,20 @@ in
     version = "2.2.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/@google/clasp/-/clasp-2.2.1.tgz";
-      sha512 = "20a3hyw676q12x4ac3knv45b88y6q10gy49clmnwrn40rdy959qw7qbrxkdn0zq3qpzrnkamqrv9bp1gvb9wdcsyxfjvf0fzh2l8ivm";
+      sha512 = "dUdEBfwOuC1d95o1ntZ+4a60M65q2vwvHvgD22bPCx+OU0m+ZUBs5rZSloh/IGDjEVqFbDsHU6SLgM0x3MOhgA==";
     };
     dependencies = [
-      sources."@nodelib/fs.scandir-2.1.3"
-      sources."@nodelib/fs.stat-2.0.3"
-      sources."@nodelib/fs.walk-1.2.4"
+      sources."@nodelib/fs.scandir-2.1.4"
+      sources."@nodelib/fs.stat-2.0.4"
+      sources."@nodelib/fs.walk-1.2.6"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/events-3.0.0"
-      sources."@types/glob-7.1.1"
+      sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-14.14.22"
       sources."abort-controller-3.0.0"
-      sources."agent-base-6.0.0"
-      sources."aggregate-error-3.0.1"
+      sources."agent-base-6.0.2"
+      sources."aggregate-error-3.1.0"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -1880,51 +1888,52 @@ in
       sources."array-union-2.1.0"
       sources."arrify-2.0.1"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
-      sources."bignumber.js-7.2.1"
+      sources."base64-js-1.5.1"
+      sources."bignumber.js-9.0.1"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."buffer-equal-constant-time-1.0.1"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
-          sources."get-stream-5.1.0"
+          sources."get-stream-5.2.0"
           sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."call-bind-1.0.2"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."clean-stack-2.2.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinner-0.2.10"
-      sources."cli-width-2.2.0"
+      sources."cli-width-2.2.1"
       sources."clone-response-1.0.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."commander-2.20.3"
       sources."concat-map-0.0.1"
-      sources."debug-4.1.1"
+      sources."debug-4.3.2"
       sources."decompress-response-3.3.0"
       sources."defer-to-connect-1.1.3"
       sources."define-properties-1.1.3"
       sources."del-5.1.0"
       sources."dir-glob-3.0.1"
       sources."dns-packet-5.2.1"
-      sources."dns-socket-4.2.0"
-      sources."dotf-1.5.0"
+      sources."dns-socket-4.2.1"
+      sources."dotf-1.5.3"
       sources."duplexer3-0.1.4"
       sources."ecdsa-sig-formatter-1.0.11"
       sources."ellipsize-0.1.0"
       sources."end-of-stream-1.4.4"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."event-target-shim-5.0.1"
       sources."exec-sh-0.2.2"
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
-      sources."fast-glob-3.2.2"
-      sources."fast-text-encoding-1.0.1"
-      sources."fastq-1.6.1"
+      sources."fast-glob-3.2.5"
+      sources."fast-text-encoding-1.0.3"
+      sources."fastq-1.10.0"
       sources."figures-2.0.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
@@ -1937,18 +1946,19 @@ in
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."fuzzy-0.1.3"
-      sources."gaxios-2.3.2"
+      sources."gaxios-2.3.4"
       sources."gcp-metadata-2.0.4"
+      sources."get-intrinsic-1.0.2"
       sources."get-stream-4.1.0"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.0"
+      sources."glob-parent-5.1.1"
       sources."globby-10.0.2"
       sources."google-auth-library-4.2.6"
       sources."google-p12-pem-2.0.4"
       sources."googleapis-40.0.1"
       sources."googleapis-common-2.0.4"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.3"
+      sources."graceful-fs-4.2.4"
       sources."gtoken-3.0.2"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -1956,57 +1966,57 @@ in
       sources."http-cache-semantics-4.1.0"
       sources."https-proxy-agent-5.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.1.4"
+      sources."ignore-5.1.8"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."inquirer-6.5.2"
       sources."inquirer-autocomplete-prompt-1.0.1"
       sources."ip-1.1.5"
-      sources."ip-regex-4.1.0"
-      sources."is-callable-1.1.5"
+      sources."ip-regex-4.3.0"
+      sources."is-callable-1.2.2"
       sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-ip-3.1.0"
+      sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-online-8.2.1"
+      sources."is-online-8.5.1"
       sources."is-path-cwd-2.2.0"
       sources."is-path-inside-3.0.2"
-      sources."is-promise-2.1.0"
-      sources."is-regex-1.0.5"
+      sources."is-regex-1.1.1"
       sources."is-stream-2.0.0"
       sources."is-symbol-1.0.3"
       sources."is-wsl-1.1.0"
-      sources."json-bigint-0.3.0"
+      sources."json-bigint-0.3.1"
       sources."json-buffer-3.0.0"
-      sources."jsonfile-6.0.1"
+      sources."jsonfile-6.1.0"
       sources."jwa-1.4.1"
       sources."jws-3.2.2"
       sources."keyv-3.1.0"
       sources."locate-path-5.0.0"
-      sources."lodash-4.17.15"
+      sources."lodash-4.17.20"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-5.1.1"
       sources."merge-1.2.1"
-      sources."merge2-1.3.0"
+      sources."merge2-1.4.1"
       sources."micromatch-4.0.2"
-      sources."mime-2.4.4"
+      sources."mime-2.5.0"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
       sources."multimatch-4.0.0"
       sources."mute-stream-0.0.7"
-      sources."node-fetch-2.6.0"
-      sources."node-forge-0.9.1"
+      sources."node-fetch-2.6.1"
+      sources."node-forge-0.9.2"
       sources."normalize-url-4.5.0"
-      sources."object-inspect-1.7.0"
+      sources."object-inspect-1.9.0"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.0"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-6.4.0"
@@ -2018,7 +2028,7 @@ in
       })
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-2.2.2"
+      sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-map-3.0.0"
       (sources."p-some-4.1.0" // {
@@ -2032,24 +2042,24 @@ in
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-4.0.0"
-      sources."picomatch-2.2.1"
+      sources."picomatch-2.2.2"
       sources."pluralize-8.0.0"
       sources."prepend-http-2.0.0"
       sources."process-0.11.10"
-      sources."public-ip-3.2.0"
+      sources."public-ip-4.0.3"
       sources."pump-3.0.0"
-      sources."qs-6.9.1"
+      sources."qs-6.9.6"
       sources."recursive-readdir-2.2.2"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."run-async-2.4.0"
-      sources."run-parallel-1.1.9"
-      sources."rxjs-6.5.4"
-      sources."safe-buffer-5.2.0"
+      sources."run-async-2.4.1"
+      sources."run-parallel-1.1.10"
+      sources."rxjs-6.6.3"
+      sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.3"
       sources."slash-3.0.0"
       sources."split-lines-2.0.0"
       (sources."string-width-2.1.1" // {
@@ -2057,9 +2067,9 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string.prototype.padend-3.1.0"
-      sources."string.prototype.trimleft-2.1.1"
-      sources."string.prototype.trimright-2.1.1"
+      sources."string.prototype.padend-3.1.1"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."strip-ansi-5.2.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -2071,11 +2081,15 @@ in
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
       sources."to-regex-range-5.0.1"
-      sources."ts2gas-3.6.1"
-      sources."tslib-1.11.1"
+      (sources."ts2gas-3.6.4" // {
+        dependencies = [
+          sources."typescript-4.1.3"
+        ];
+      })
+      sources."tslib-1.14.1"
       sources."type-fest-0.3.1"
-      sources."typescript-3.8.3"
-      sources."universalify-1.0.0"
+      sources."typescript-3.9.7"
+      sources."universalify-2.0.0"
       sources."url-parse-lax-3.0.0"
       sources."url-template-2.0.8"
       (sources."util-0.10.4" // {
@@ -2084,11 +2098,7 @@ in
         ];
       })
       sources."uuid-3.4.0"
-      (sources."watch-1.0.2" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."watch-1.0.2"
       sources."wrappy-1.0.2"
       sources."yallist-3.1.1"
     ];
diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix
index 027a981ea57..64326c6b216 100644
--- a/pkgs/development/node-packages/composition.nix
+++ b/pkgs/development/node-packages/composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index f65cb65cf8d..c2b723195b7 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -1,8 +1,11 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
+{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
 
 let
+  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
+  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
+
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -38,8 +41,8 @@ let
     };
 
   includeDependencies = {dependencies}:
-    stdenv.lib.optionalString (dependencies != [])
-      (stdenv.lib.concatMapStrings (dependency:
+    lib.optionalString (dependencies != [])
+      (lib.concatMapStrings (dependency:
         ''
           # Bundle the dependencies of the package
           mkdir -p node_modules
@@ -100,7 +103,7 @@ let
       cd "$DIR/${packageName}"
       ${includeDependencies { inherit dependencies; }}
       cd ..
-      ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
   pinpointDependencies = {dependencies, production}:
@@ -161,12 +164,12 @@ let
     ''
       node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
 
-      ${stdenv.lib.optionalString (dependencies != [])
+      ${lib.optionalString (dependencies != [])
         ''
           if [ -d node_modules ]
           then
               cd node_modules
-              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
               cd ..
           fi
         ''}
@@ -183,7 +186,7 @@ let
           cd "${packageName}"
           ${pinpointDependencies { inherit dependencies production; }}
           cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
       fi
     '';
 
@@ -242,8 +245,8 @@ let
       if(fs.existsSync("./package-lock.json")) {
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-          if(packageLock.lockfileVersion !== 1) {
-             process.stderr.write("Sorry, I only understand lock file version 1!\n");
+          if(![1, 2].includes(packageLock.lockfileVersion)) {
+             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
              process.exit(1);
           }
 
@@ -344,8 +347,8 @@ let
         cd "${packageName}"
         runHook preRebuild
 
-        ${stdenv.lib.optionalString bypassCache ''
-          ${stdenv.lib.optionalString reconstructLock ''
+        ${lib.optionalString bypassCache ''
+          ${lib.optionalString reconstructLock ''
             if [ -f package-lock.json ]
             then
                 echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
@@ -361,14 +364,14 @@ let
           node ${addIntegrityFieldsScript}
         ''}
 
-        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
 
         if [ "''${dontNpmInstall-}" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
 
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
         fi
     '';
 
@@ -388,17 +391,16 @@ let
     , dontStrip ? true
     , unpackPhase ? "true"
     , buildPhase ? "true"
-    , meta ? {}
     , ... }@args:
 
     let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
     in
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
-        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+        ++ lib.optional (stdenv.isLinux) utillinux
+        ++ lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
       inherit nodejs;
@@ -444,13 +446,76 @@ let
         # Run post install hook, if provided
         runHook postInstall
       '';
-
-      meta = {
-        # default to Node.js' platforms
-        platforms = nodejs.meta.platforms;
-      } // meta;
     } // extraArgs);
 
+  # Builds a node environment (a node_modules folder and a set of binaries)
+  buildNodeDependencies =
+    { name
+    , packageName
+    , version
+    , src
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , reconstructLock ? false
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
+    let
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+    in
+      stdenv.mkDerivation ({
+        name = "node-dependencies-${name}-${version}";
+
+        buildInputs = [ tarWrapper python nodejs ]
+          ++ lib.optional (stdenv.isLinux) utillinux
+          ++ lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
+
+        inherit dontStrip; # Stripping may fail a build for some package deployments
+        inherit dontNpmInstall unpackPhase buildPhase;
+
+        includeScript = includeDependencies { inherit dependencies; };
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+
+        installPhase = ''
+          mkdir -p $out/${packageName}
+          cd $out/${packageName}
+
+          source $includeScriptPath
+
+          # Create fake package.json to make the npm commands work properly
+          cp ${src}/package.json .
+          chmod 644 package.json
+          ${lib.optionalString bypassCache ''
+            if [ -f ${src}/package-lock.json ]
+            then
+                cp ${src}/package-lock.json .
+            fi
+          ''}
+
+          # Go to the parent folder to make sure that all packages are pinpointed
+          cd ..
+          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+          # Expose the executables that were installed
+          cd ..
+          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          mv ${packageName} lib
+          ln -s $out/lib/node_modules/.bin $out/bin
+        '';
+      } // extraArgs);
+
   # Builds a development shell
   buildNodeShell =
     { name
@@ -470,59 +535,12 @@ let
     , ... }@args:
 
     let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-
-      nodeDependencies = stdenv.mkDerivation ({
-        name = "node-dependencies-${name}-${version}";
-
-        buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
-          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-          ++ buildInputs;
-
-        inherit dontStrip; # Stripping may fail a build for some package deployments
-        inherit dontNpmInstall unpackPhase buildPhase;
-
-        includeScript = includeDependencies { inherit dependencies; };
-        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
-
-        installPhase = ''
-          mkdir -p $out/${packageName}
-          cd $out/${packageName}
-
-          source $includeScriptPath
-
-          # Create fake package.json to make the npm commands work properly
-          cp ${src}/package.json .
-          chmod 644 package.json
-          ${stdenv.lib.optionalString bypassCache ''
-            if [ -f ${src}/package-lock.json ]
-            then
-                cp ${src}/package-lock.json .
-            fi
-          ''}
-
-          # Go to the parent folder to make sure that all packages are pinpointed
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-          # Expose the executables that were installed
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          mv ${packageName} lib
-          ln -s $out/lib/node_modules/.bin $out/bin
-        '';
-      } // extraArgs);
+      nodeDependencies = buildNodeDependencies args;
     in
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -535,14 +553,15 @@ let
 
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
-      shellHook = stdenv.lib.optionalString (dependencies != []) ''
+      shellHook = lib.optionalString (dependencies != []) ''
         export NODE_PATH=${nodeDependencies}/lib/node_modules
         export PATH="${nodeDependencies}/bin:$PATH"
       '';
     };
 in
 {
-  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
-  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
-  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
+  buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = lib.makeOverridable buildNodePackage;
+  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
+  buildNodeShell = lib.makeOverridable buildNodeShell;
 }
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 94c0b38fc76..0743281c180 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -22,13 +22,13 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.1100.5" = {
+    "@angular-devkit/architect-0.1101.0" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.1100.5";
+      version = "0.1101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.5.tgz";
-        sha512 = "yOYfucNouc1doTbcGbCNMXGMSc36+j97XpdNoeGyzFQ7GwezLAro0a9gxc5PdOxndfelkND7J1JuOjxdW5O17A==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.0.tgz";
+        sha512 = "Lj1STrxPXvvZVIk9RSTOPEiJeE/PGbBSclz12u92F3DsmbhcCxpiZ8AU8bUvJJ8gsZhGRB0BjPN0gCSWr9Po7w==";
       };
     };
     "@angular-devkit/core-11.0.3" = {
@@ -49,6 +49,15 @@ let
         sha512 = "hwV8fjF8JNPJkiVWw8MNzeIfDo01aD/OAOlC4L5rQnVHn+i2EiU3brSDmFqyeHPPV3h/QjuBkS3tkN7gSnVWaQ==";
       };
     };
+    "@angular-devkit/core-11.1.0" = {
+      name = "_at_angular-devkit_slash_core";
+      packageName = "@angular-devkit/core";
+      version = "11.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.0.tgz";
+        sha512 = "O2oIcqpQKGvYJH88d/NCgLYZGc9laA1eo2d1s0FH1Udu4c2L+bAsviQqtTKNmzyaqODHrlkt+eKx7uakdwWtnQ==";
+      };
+    };
     "@angular-devkit/schematics-11.0.3" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
@@ -67,6 +76,15 @@ let
         sha512 = "0NKGC8Nf/4vvDpWKB7bwxIazvNnNHnZBX6XlyBXNl+fW8tpTef3PNMJMSErTz9LFnuv61vsKbc36u/Ek2YChWg==";
       };
     };
+    "@angular-devkit/schematics-11.1.0" = {
+      name = "_at_angular-devkit_slash_schematics";
+      packageName = "@angular-devkit/schematics";
+      version = "11.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.1.0.tgz";
+        sha512 = "6qfR5w1jyk8MC+5Tfimz+Czsq3WlsVoB57dpxSZfhGGsv1Vxc8Q41y5f3BrAyEqHYjcH7NtaoLQoJjtra5KaAg==";
+      };
+    };
     "@angular-devkit/schematics-cli-0.1100.3" = {
       name = "_at_angular-devkit_slash_schematics-cli";
       packageName = "@angular-devkit/schematics-cli";
@@ -184,13 +202,13 @@ let
         sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg==";
       };
     };
-    "@apidevtools/json-schema-ref-parser-9.0.6" = {
+    "@apidevtools/json-schema-ref-parser-9.0.7" = {
       name = "_at_apidevtools_slash_json-schema-ref-parser";
       packageName = "@apidevtools/json-schema-ref-parser";
-      version = "9.0.6";
+      version = "9.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz";
-        sha512 = "M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg==";
+        url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz";
+        sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg==";
       };
     };
     "@apollo/federation-0.20.7" = {
@@ -337,15 +355,6 @@ let
         sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==";
       };
     };
-    "@babel/generator-7.12.10" = {
-      name = "_at_babel_slash_generator";
-      packageName = "@babel/generator";
-      version = "7.12.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz";
-        sha512 = "6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==";
-      };
-    };
     "@babel/generator-7.12.11" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -1363,22 +1372,22 @@ let
         sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==";
       };
     };
-    "@bugsnag/browser-7.5.4" = {
+    "@bugsnag/browser-7.6.0" = {
       name = "_at_bugsnag_slash_browser";
       packageName = "@bugsnag/browser";
-      version = "7.5.4";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.4.tgz";
-        sha512 = "WyhDWeE2MXQTo9uJjpCOxqTWDlVgX/yKE/VZ0nVm4em2AxUmjAPM8jk9YOTYCKQfQFnIpgf62DjVlsszikUIBw==";
+        url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.6.0.tgz";
+        sha512 = "8sth20TM8BVfebkqxqJQOCM2P2L4foOgFH2QA3ruG0iknDKZDhE7XcoWgmUP9zVSNJqkCyiIzcBOuiwZW8JaSQ==";
       };
     };
-    "@bugsnag/core-7.5.4" = {
+    "@bugsnag/core-7.6.0" = {
       name = "_at_bugsnag_slash_core";
       packageName = "@bugsnag/core";
-      version = "7.5.4";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.5.4.tgz";
-        sha512 = "QOvtWzM0XJTk5QCpiDFTva6FJXCKuKQHJu7sjrZwYA/7fblypl+ClP7inz9At5ijkKGm2pLyvZ9vvT2rq9TXuw==";
+        url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.6.0.tgz";
+        sha512 = "hBYAZJw4ScqoyM1jA1x/m2e4iS2EqYEs0I2hdzBCZFv2ls17ILmU58eRSyVdUfyzbv0J7Hi6DwwBGC4Yb6ROZA==";
       };
     };
     "@bugsnag/cuid-3.0.0" = {
@@ -1390,22 +1399,22 @@ let
         sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg==";
       };
     };
-    "@bugsnag/js-7.5.4" = {
+    "@bugsnag/js-7.6.0" = {
       name = "_at_bugsnag_slash_js";
       packageName = "@bugsnag/js";
-      version = "7.5.4";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.4.tgz";
-        sha512 = "V1+482YPndAD0c0ju7Ik1dXunyKAssZWUIqOMs7Ff3PtZb1107sJ4Hw1E7ZusQvvI/IjA6FO3ZJkmzjIJjQ+UA==";
+        url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.6.0.tgz";
+        sha512 = "EcI3sTpyOs94/OOjwI7fOg1iZ800o3kkOAipAnULRoP62j1vmErH2l/2xubny7g0JTOL59iZEkt+5O5MhbQJ2A==";
       };
     };
-    "@bugsnag/node-7.5.4" = {
+    "@bugsnag/node-7.6.0" = {
       name = "_at_bugsnag_slash_node";
       packageName = "@bugsnag/node";
-      version = "7.5.4";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.5.4.tgz";
-        sha512 = "lfHEU2wsBO/hhHjsY6kqD/Ga6A3bzROeZEuE7/cT0xzDUvBnUsrw75/xZ5EyY3Xpyfe/Gw9t336semIqz46+cw==";
+        url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.6.0.tgz";
+        sha512 = "n3BVb04bq4z16nOM4gbWoXsi6k8R9bryWS/NAYi/jQg6tgyBkNYzmK0ojf3fYJ7uAgCjUJNMX6S9UHSJy/MMcQ==";
       };
     };
     "@bugsnag/safe-json-stringify-6.0.0" = {
@@ -1633,6 +1642,15 @@ let
         sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==";
       };
     };
+    "@eslint/eslintrc-0.3.0" = {
+      name = "_at_eslint_slash_eslintrc";
+      packageName = "@eslint/eslintrc";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz";
+        sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==";
+      };
+    };
     "@evocateur/libnpmaccess-3.1.2" = {
       name = "_at_evocateur_slash_libnpmaccess";
       packageName = "@evocateur/libnpmaccess";
@@ -2047,22 +2065,22 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.155.3" = {
+    "@fluentui/react-7.156.0" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.155.3";
+      version = "7.156.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.155.3.tgz";
-        sha512 = "bVK9qMUqjWQ68UPkQGHCMnCKeH8uSlCLF2QgR9ESMV/g0sHUvRqCO1Yuj9JyO4NDanqfX62NDgJzimHKj1/MQg==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.156.0.tgz";
+        sha512 = "+ZNi++L+s4sNEHnQfAeBBvr+HHE45psZNubRvsWRVsNRVMrv/vlGGDOS7Z324GrvaZppHfYi36fFssmhqE61vw==";
       };
     };
-    "@fluentui/react-focus-7.17.0" = {
+    "@fluentui/react-focus-7.17.1" = {
       name = "_at_fluentui_slash_react-focus";
       packageName = "@fluentui/react-focus";
-      version = "7.17.0";
+      version = "7.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.0.tgz";
-        sha512 = "xr5LExRnLW9CNyWDkcMmvOAgOXru/GBTIKcVqNahgRf7CIyHraY0m/0gFblwNtPYQOS9ltM3c+fbyYvCXBZvEw==";
+        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.1.tgz";
+        sha512 = "Nulq2pE4pX6Pf+tGZl8uLp8VfqUzx3elC5v7QvYSBdjnZK8ykitdsa+Sd3PKYWW2EMlzVRSptlzbuJ6JyEDQKQ==";
       };
     };
     "@fluentui/react-window-provider-1.0.1" = {
@@ -2074,13 +2092,13 @@ let
         sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w==";
       };
     };
-    "@fluentui/theme-1.7.0" = {
+    "@fluentui/theme-1.7.1" = {
       name = "_at_fluentui_slash_theme";
       packageName = "@fluentui/theme";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.0.tgz";
-        sha512 = "pzqDZC2bVD6/S45Bnve4wmrXi4cN7XiCr+OhzvgmoQfDkm5vyXsa82/cVtif/zy1OFU96S9zOTtt3e+QQuGUUg==";
+        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.1.tgz";
+        sha512 = "cwx8gJ0O9d+Z8g6Lq7BgDgH8XPfSloUSy0GN3fWHJGrDCBPcnmz6/GKbbvxw9PZ2t1iNcAzJEJNT6NyuOOobPA==";
       };
     };
     "@google-cloud/paginator-3.0.5" = {
@@ -2119,13 +2137,13 @@ let
         sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==";
       };
     };
-    "@google-cloud/pubsub-2.7.0" = {
+    "@google-cloud/pubsub-2.8.0" = {
       name = "_at_google-cloud_slash_pubsub";
       packageName = "@google-cloud/pubsub";
-      version = "2.7.0";
+      version = "2.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.7.0.tgz";
-        sha512 = "wc/XOo5Ibo3GWmuaLu80EBIhXSdu2vf99HUqBbdsSSkmRNIka2HqoIhLlOFnnncQn0lZnGL7wtKGIDLoH9LiBg==";
+        url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.8.0.tgz";
+        sha512 = "AoSKAbpHCoLq6jO9vMX+K6hJhkayafan24Rs2RKHU8Y0qF6IGSm1+ly0OG12TgziHWg818/6dljWWKgwDcp8KA==";
       };
     };
     "@graphql-cli/common-4.1.0" = {
@@ -2155,31 +2173,31 @@ let
         sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q==";
       };
     };
-    "@graphql-tools/delegate-7.0.8" = {
+    "@graphql-tools/delegate-7.0.9" = {
       name = "_at_graphql-tools_slash_delegate";
       packageName = "@graphql-tools/delegate";
-      version = "7.0.8";
+      version = "7.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.8.tgz";
-        sha512 = "pS1wci7ZxzdCITRrMI66UA+6/E0Z1Yczd3QxJBDb4Kp0nTGy1xy7enGa0+i55EmCvKvuwyx+tzXzwA1fNGRJzg==";
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.9.tgz";
+        sha512 = "nlelOb354cyweV+SpTXkoGZHKgJ1PwPkHWq/0RXM5LllQsR3OrSQKKWMrd1g9dyawEZbadCF3fDJJWSQ4HOg2g==";
       };
     };
-    "@graphql-tools/graphql-file-loader-6.2.6" = {
+    "@graphql-tools/graphql-file-loader-6.2.7" = {
       name = "_at_graphql-tools_slash_graphql-file-loader";
       packageName = "@graphql-tools/graphql-file-loader";
-      version = "6.2.6";
+      version = "6.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.6.tgz";
-        sha512 = "L+RdYl5C6+X0zdOTUotY0K5zwqvSGpqI/qcZpVvCDenoAcVTyaNLmnd/ViErwedhCaGqAAV0wI1nPtyKFPlMUg==";
+        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.7.tgz";
+        sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ==";
       };
     };
-    "@graphql-tools/import-6.2.5" = {
+    "@graphql-tools/import-6.2.6" = {
       name = "_at_graphql-tools_slash_import";
       packageName = "@graphql-tools/import";
-      version = "6.2.5";
+      version = "6.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.5.tgz";
-        sha512 = "ZGXT5tDod7m+LO38fc+o0JzR1LstL0RF35HKEWoUdxRIVaaeYH9VMuan9Gn+9M9RDME3RnzEa9aGzf9ATj8bTA==";
+        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.6.tgz";
+        sha512 = "/0H/bDjNK1MnKonk8fMbB7wIYU6QLCwbQOHtSHbFJ4j2qki5CqfAxpF+fGX6KovDtkdigcgRMvSKKi14oiuHPA==";
       };
     };
     "@graphql-tools/json-file-loader-6.2.6" = {
@@ -2200,13 +2218,13 @@ let
         sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
       };
     };
-    "@graphql-tools/merge-6.2.6" = {
+    "@graphql-tools/merge-6.2.7" = {
       name = "_at_graphql-tools_slash_merge";
       packageName = "@graphql-tools/merge";
-      version = "6.2.6";
+      version = "6.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.6.tgz";
-        sha512 = "G6x0QlIzFHoJ3dyF9a4gxmBtaEYJ+EoAAGqXHsE/drRr58K1jscQdfKZdF1wZWZgxkgakHqgt1+oFMeQg/O6ug==";
+        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.7.tgz";
+        sha512 = "9acgDkkYeAHpuqhOa3E63NZPCX/iWo819Q320sCCMkydF1xgx0qCRYz/V03xPdpQETKRqBG2i2N2csneeEYYig==";
       };
     };
     "@graphql-tools/schema-7.1.2" = {
@@ -2218,13 +2236,13 @@ let
         sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ==";
       };
     };
-    "@graphql-tools/url-loader-6.7.1" = {
+    "@graphql-tools/url-loader-6.8.0" = {
       name = "_at_graphql-tools_slash_url-loader";
       packageName = "@graphql-tools/url-loader";
-      version = "6.7.1";
+      version = "6.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.7.1.tgz";
-        sha512 = "7NJ1G5diJAuWYZszQf0mNwPipVMOjIIMteNkutdExBq4CgN0V1xa3/iC25CUrI7sZiq+D367zZNONmKf+3bA2Q==";
+        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.0.tgz";
+        sha512 = "x4f93UnH7kNr9iHFpJHL6kYWogRFlxMEnXybHS9xNCFd08+ftMO22bUb8esnFsyNrtMMlkLtshDSyNb3LbIMQg==";
       };
     };
     "@graphql-tools/utils-6.2.4" = {
@@ -2236,13 +2254,13 @@ let
         sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg==";
       };
     };
-    "@graphql-tools/utils-7.2.3" = {
+    "@graphql-tools/utils-7.2.4" = {
       name = "_at_graphql-tools_slash_utils";
       packageName = "@graphql-tools/utils";
-      version = "7.2.3";
+      version = "7.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.3.tgz";
-        sha512 = "9MvSKeo+8DM72706FvrUP8figQjRzSwBswWrXviyWyt3wSkk6MU2cURQKfMpc0I6nswZvkDSqYoQQ/6mazoXxA==";
+        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.4.tgz";
+        sha512 = "EDSb98dTWX8FngvayWejip1DutOl0wGtNbXC7a3CZf5fiJS7bGHQ/8cSlMhe9XaHwpLJCbAk/Ijnp/dYbXk33w==";
       };
     };
     "@graphql-tools/wrap-7.0.5" = {
@@ -2254,31 +2272,22 @@ let
         sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ==";
       };
     };
-    "@grpc/grpc-js-1.1.8" = {
+    "@grpc/grpc-js-1.2.4" = {
       name = "_at_grpc_slash_grpc-js";
       packageName = "@grpc/grpc-js";
-      version = "1.1.8";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.1.8.tgz";
-        sha512 = "64hg5rmEm6F/NvlWERhHmmgxbWU8nD2TMWE+9TvG7/WcOrFT3fzg/Uu631pXRFwmJ4aWO/kp9vVSlr8FUjBDLA==";
+        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.4.tgz";
+        sha512 = "z+EI20HYHLd3/uERtwOqP8Q4EPhGbz5RKUpiyo6xPWfR3pcjpf8sfNvY9XytDQ4xo1wNz7NqH1kh2UBonwzbfg==";
       };
     };
-    "@grpc/proto-loader-0.5.5" = {
+    "@grpc/proto-loader-0.5.6" = {
       name = "_at_grpc_slash_proto-loader";
       packageName = "@grpc/proto-loader";
-      version = "0.5.5";
+      version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.5.tgz";
-        sha512 = "WwN9jVNdHRQoOBo9FDH7qU+mgfjPc8GygPYms3M+y3fbQLfnCe/Kv/E01t7JRgnrsOHH8euvSbed3mIalXhwqQ==";
-      };
-    };
-    "@grpc/proto-loader-0.6.0-pre9" = {
-      name = "_at_grpc_slash_proto-loader";
-      packageName = "@grpc/proto-loader";
-      version = "0.6.0-pre9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.0-pre9.tgz";
-        sha512 = "oM+LjpEjNzW5pNJjt4/hq1HYayNeQT+eGrOPABJnYHv7TyNPDNzkQ76rDYZF86X5swJOa4EujEMzQ9iiTdPgww==";
+        url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.6.tgz";
+        sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ==";
       };
     };
     "@gulp-sourcemaps/identity-map-1.0.2" = {
@@ -2839,58 +2848,58 @@ let
         sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ==";
       };
     };
-    "@joplin/fork-htmlparser2-4.1.14" = {
+    "@joplin/fork-htmlparser2-4.1.20" = {
       name = "_at_joplin_slash_fork-htmlparser2";
       packageName = "@joplin/fork-htmlparser2";
-      version = "4.1.14";
+      version = "4.1.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.14.tgz";
-        sha512 = "uE5StVO3A6XcQLd5CxRU+XU7ecAKX8lmTFnHlnhBkgn8V8CHsHIUfZy1uw+fZ4gnC0kenq6uiZavhDPBAkibKA==";
+        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.20.tgz";
+        sha512 = "fao7WvJ6cHs4xLuR8sgitEeErIdepCSQx0Nv5ibHFjMMWlMMcBGa0e4GjEnKJLtY0rL5TCYevgn42HL3u3ISfg==";
       };
     };
-    "@joplin/fork-sax-1.2.18" = {
+    "@joplin/fork-sax-1.2.24" = {
       name = "_at_joplin_slash_fork-sax";
       packageName = "@joplin/fork-sax";
-      version = "1.2.18";
+      version = "1.2.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.18.tgz";
-        sha512 = "tlsBwoayPjEVjAsylCosflTtF4EgGrSP4b/2r5Ci640846YDPdg0nqKuOUs82Xmptc3QQcnjzRKW8+7Up9+lfQ==";
+        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.24.tgz";
+        sha512 = "bE+T6WaPeWSzWvrgZqTh2Iq4yTAeYt60lr7GgzlKFUZyuVWZDZ0y1yk63goKpZN6iVTd9R3grM1Rx+UaRNV/Ag==";
       };
     };
-    "@joplin/lib-1.0.15" = {
+    "@joplin/lib-1.0.18" = {
       name = "_at_joplin_slash_lib";
       packageName = "@joplin/lib";
-      version = "1.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.15.tgz";
-        sha512 = "wOA+fxi93b9qfuRV7Ynhc+uUmW2XDVMugHWzqDdiOPd394mYQSX21/Eqvxhd049SsHiqmsMo2scz7rNtFLMnuA==";
-      };
-    };
-    "@joplin/renderer-1.0.23" = {
-      name = "_at_joplin_slash_renderer";
-      packageName = "@joplin/renderer";
-      version = "1.0.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.23.tgz";
-        sha512 = "1gddYqDLxeyR96m1/9WQ7Ri2tbaIOEW+JmbZKst9HDsgj8LiNwtBha+y35KqRAS6pWimbcXh0RZDkA4DmQ2VOw==";
-      };
-    };
-    "@joplin/turndown-4.0.36" = {
-      name = "_at_joplin_slash_turndown";
-      packageName = "@joplin/turndown";
-      version = "4.0.36";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.36.tgz";
-        sha512 = "lks0n5HTAsg0O71L9kLoTaASAU4NILG3SyDcX/10K1g2wpoUadmXQmznaa3WqY4RgN0gzRKaZV51d7JtO9ZwXQ==";
-      };
-    };
-    "@joplin/turndown-plugin-gfm-1.0.18" = {
-      name = "_at_joplin_slash_turndown-plugin-gfm";
-      packageName = "@joplin/turndown-plugin-gfm";
       version = "1.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.18.tgz";
-        sha512 = "6uUXRU5PILzKAUP50t9FOyMrpGgfpw2ugrZ8hAfV+PhNZsjSgsc+cSBBdjn/HIEgNCr9m7TlHSzscxrHg496Iw==";
+        url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.18.tgz";
+        sha512 = "r0Z+bolszlPUsanaQIUk/tog3jHw0rGtUxXTHDMtycFWkWYVpjlT3bvxiYrV5MwLjyn/xnfUCIdHeUi/Lz3LPQ==";
+      };
+    };
+    "@joplin/renderer-1.0.26" = {
+      name = "_at_joplin_slash_renderer";
+      packageName = "@joplin/renderer";
+      version = "1.0.26";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.26.tgz";
+        sha512 = "RDRYjuPCn1ltematEZQhgvZbIGBQ+2F3jgAdXpqByg71pmxrMZyOLLbNVYJyKK4w2Ecvmbpwuo0h9RbMb/56Ow==";
+      };
+    };
+    "@joplin/turndown-4.0.42" = {
+      name = "_at_joplin_slash_turndown";
+      packageName = "@joplin/turndown";
+      version = "4.0.42";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.42.tgz";
+        sha512 = "rHSJgnsA0Xvpf6V5dDPO1rCBYt4wGdCCdG0VKovDSenf6BpTq0T6agHObE3GMgW8w108Ts4jJdEDJanGc5Phjw==";
+      };
+    };
+    "@joplin/turndown-plugin-gfm-1.0.24" = {
+      name = "_at_joplin_slash_turndown-plugin-gfm";
+      packageName = "@joplin/turndown-plugin-gfm";
+      version = "1.0.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.24.tgz";
+        sha512 = "3bIkDqPUJ7CORpkFGE95SRCBFpUzY4KDGPxJsZXWhy2qI/VRE0BXJsxPOls0cWSbHSUKTN7kNGub5iavhtRz2A==";
       };
     };
     "@jsdevtools/ono-7.1.3" = {
@@ -2902,13 +2911,13 @@ let
         sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==";
       };
     };
-    "@jsii/spec-1.16.0" = {
+    "@jsii/spec-1.17.1" = {
       name = "_at_jsii_slash_spec";
       packageName = "@jsii/spec";
-      version = "1.16.0";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.16.0.tgz";
-        sha512 = "DH3rDGa781UmRtg/ykFyxrfhjaz1SRz2BblNXDxwArhl0aUiN5HOdzi9icX8CFwdB9+ZxTtXuxap3BwvLa5xnA==";
+        url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.17.1.tgz";
+        sha512 = "9/bdS7MpIVwSgHfaZiYnpE56T2YNE2WAJbhZzQTsYZCYkB8icsP+hVCIWzeyGZmHR9KggaCETbmNlLG0v2QdSw==";
       };
     };
     "@kwsites/file-exists-1.1.1" = {
@@ -3496,13 +3505,13 @@ let
         sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.141" = {
+    "@microsoft/load-themed-styles-1.10.145" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.141";
+      version = "1.10.145";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.141.tgz";
-        sha512 = "IWqbTWhxpp10X2nZI14oqbPtzrRLvXtyX7sV/QDfVBtQQivLilZFynr/X69SAZtbSp/wi7WI8gKl2/6TuTNN1A==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.145.tgz";
+        sha512 = "KCwejs/xZMjUCW6XNv8aND0FZAloGvVYJG7QPMlSo7NKxj+dvP6Cvywy9oadKeGvU9Rv1EjbR7HK6yfA2hjnMw==";
       };
     };
     "@mozilla/readability-0.3.0" = {
@@ -3550,13 +3559,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-8.0.1" = {
+    "@netlify/build-8.1.0" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "8.0.1";
+      version = "8.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-8.0.1.tgz";
-        sha512 = "DOBUR4x0GEmi4hD8LagJfPCtxnaAtjRTJgZdTx9lFngC2OHY+xIwGZ3Ilct1b3vbAcl0SzHA+HZ4xrG2V/EWdw==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-8.1.0.tgz";
+        sha512 = "5/zJY+kL7423WQyBp2p/pdlGHoK6mx/kLHl4W3QoFe+OlWvf2SREi60wO4Ln0HteT+KgguQKsRxNnp0Ryf2kRA==";
       };
     };
     "@netlify/cache-utils-1.0.6" = {
@@ -3568,31 +3577,31 @@ let
         sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg==";
       };
     };
-    "@netlify/config-0.11.11" = {
+    "@netlify/config-3.0.1" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "0.11.11";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-0.11.11.tgz";
-        sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-3.0.1.tgz";
+        sha512 = "lW+HGiDOfkcAUO3MhXcoLA7n1XnHtupO03gjZlcankksTrBOlkIMw2RFanptg6LAPqlW47cS0DHvU1sSkKyJCg==";
       };
     };
-    "@netlify/config-2.4.3" = {
-      name = "_at_netlify_slash_config";
-      packageName = "@netlify/config";
-      version = "2.4.3";
+    "@netlify/framework-info-2.0.0" = {
+      name = "_at_netlify_slash_framework-info";
+      packageName = "@netlify/framework-info";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.3.tgz";
-        sha512 = "Uz7Oo3tJP2VTgNgsJtRlwAhO5jTozkpNMCKALb814ssJKx7nE/4QvNxJPCQNBDXY9BSeXVIPfy0vMfshxatL+g==";
+        url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-2.0.0.tgz";
+        sha512 = "2s0del0msTihWnWC5wyUvWoAI85UF8rAQLlCnKo2wih8eJsxem5KoqpiT0/tHpw7GKsgGSN4MQZlg2OKcbWc3g==";
       };
     };
-    "@netlify/functions-utils-1.3.4" = {
+    "@netlify/functions-utils-1.3.5" = {
       name = "_at_netlify_slash_functions-utils";
       packageName = "@netlify/functions-utils";
-      version = "1.3.4";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.4.tgz";
-        sha512 = "AkVd03D6K7Uwli+t5xTMm5c1jn1HRFY3YgslLV91huHI++3CjOsGpsnDfhoN2kj1aN8OLqliTOvs4PQHC2dKpw==";
+        url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.5.tgz";
+        sha512 = "zwH2BPWyscDSyLV/sM6LOCg6Lez8x+OTXXF6zdYvdPhWf9BrnD7xj9lpFH59tXPB77tKgyIATFb8rutTrahJqQ==";
       };
     };
     "@netlify/git-utils-1.0.6" = {
@@ -3604,31 +3613,22 @@ let
         sha512 = "JpuvzCTf9QXVEgVA4mSshH6fi9Dtg0Pqe5d19yaN2f1H9DNnWro3kJUaoR68Hfo0rBls6kYwWJuNZ/csb03VuQ==";
       };
     };
-    "@netlify/open-api-0.18.1" = {
+    "@netlify/open-api-1.3.0" = {
       name = "_at_netlify_slash_open-api";
       packageName = "@netlify/open-api";
-      version = "0.18.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.18.1.tgz";
-        sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw==";
+        url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.3.0.tgz";
+        sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg==";
       };
     };
-    "@netlify/open-api-1.0.0" = {
-      name = "_at_netlify_slash_open-api";
-      packageName = "@netlify/open-api";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.0.0.tgz";
-        sha512 = "LAicAlsAZXybGtKzaOTmIYelSe82vgZlc17IeNUQxab2IlUCH7VhTKCx9EyJEgiXhLvmYoOjuYE1Ee9ZsnrybA==";
-      };
-    };
-    "@netlify/plugin-edge-handlers-1.10.0" = {
+    "@netlify/plugin-edge-handlers-1.11.1" = {
       name = "_at_netlify_slash_plugin-edge-handlers";
       packageName = "@netlify/plugin-edge-handlers";
-      version = "1.10.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.10.0.tgz";
-        sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg==";
+        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.1.tgz";
+        sha512 = "zuEd804TH9PCwpboxCpqx/EiMUOpxkcGjTtxJjwMeMkQHAY5952x4UUts3ZyuG0MvvXqtJwM2hez7gmpEQMkqA==";
       };
     };
     "@netlify/plugins-list-2.2.0" = {
@@ -3649,112 +3649,103 @@ let
         sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q==";
       };
     };
-    "@netlify/traffic-mesh-agent-0.27.0" = {
+    "@netlify/traffic-mesh-agent-0.27.10" = {
       name = "_at_netlify_slash_traffic-mesh-agent";
       packageName = "@netlify/traffic-mesh-agent";
-      version = "0.27.0";
+      version = "0.27.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.0.tgz";
-        sha512 = "a+jXM75Ir9PavNTzDRkZWQT7jHc02wWF8mRYXWbvku+VLqmmkA61RyhAgSeo5dMWSdMofSRkoifnW7leyv7Obw==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.10.tgz";
+        sha512 = "HZXEdIXzg8CpysYRDVXkBpmjOj/C8Zb8Q/qkkt9x+npJ56HeX6sXAE4vK4SMCRLkkbQ2VyYTaDKg++GefeB2Gg==";
       };
     };
-    "@netlify/traffic-mesh-agent-darwin-x64-0.27.0" = {
+    "@netlify/traffic-mesh-agent-darwin-x64-0.27.10" = {
       name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64";
       packageName = "@netlify/traffic-mesh-agent-darwin-x64";
-      version = "0.27.0";
+      version = "0.27.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.0.tgz";
-        sha512 = "a0EDNrdLBjxp+GYj/WQSifuQZorFQkY6spO4wuOl3mQV3tKTkBmu09+FsfitYpgZHDMoPzfhvURJrUtJIHTgqQ==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.10.tgz";
+        sha512 = "j2blCh3TKNV35VPF9Zf/LM3v6pH/gz/Y7uu/78RLbgNvCW0vGN7b1GgFnXQKwrvbL6tRGumJS2P5PWUfEsKOBA==";
       };
     };
-    "@netlify/traffic-mesh-agent-linux-x64-0.27.0" = {
+    "@netlify/traffic-mesh-agent-linux-x64-0.27.10" = {
       name = "_at_netlify_slash_traffic-mesh-agent-linux-x64";
       packageName = "@netlify/traffic-mesh-agent-linux-x64";
-      version = "0.27.0";
+      version = "0.27.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.0.tgz";
-        sha512 = "m7p/0eTXKILxCpTqQOmBkYdIjYKwSC2KZbPpDJ4sYfnMIF3qa9uMp8qrK9At/oGPckeiTq4Id775veldhwt2lw==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.10.tgz";
+        sha512 = "JdeGT356TtqbxY6IjsS+wik68V0iNGdRsGV4cYOx/aAfclAyZ9DL29A4nzobyq5J+s5binrbKpix26/WKi+sqA==";
       };
     };
-    "@netlify/traffic-mesh-agent-win32-x64-0.27.0" = {
+    "@netlify/traffic-mesh-agent-win32-x64-0.27.10" = {
       name = "_at_netlify_slash_traffic-mesh-agent-win32-x64";
       packageName = "@netlify/traffic-mesh-agent-win32-x64";
-      version = "0.27.0";
+      version = "0.27.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.0.tgz";
-        sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.10.tgz";
+        sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g==";
       };
     };
-    "@netlify/zip-it-and-ship-it-1.7.0" = {
+    "@netlify/zip-it-and-ship-it-2.0.2" = {
       name = "_at_netlify_slash_zip-it-and-ship-it";
       packageName = "@netlify/zip-it-and-ship-it";
-      version = "1.7.0";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.7.0.tgz";
-        sha512 = "7Fatc5OoRZ7V2tusx1CBWIdk9hXrr0JWoW547wsmopCkCl5O4TaLxw12CgfW6EQsjaufSnuQddzvnx5y1b5gGQ==";
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.0.2.tgz";
+        sha512 = "jFUrHXs9b6VP52mey2jY0C6T37IbVPPKNRLGIlKxLJS+fg59MhjIr81kMLHlAw3TBKpOubCcTa91g4qzts/Y/w==";
       };
     };
-    "@netlify/zip-it-and-ship-it-2.0.0" = {
-      name = "_at_netlify_slash_zip-it-and-ship-it";
-      packageName = "@netlify/zip-it-and-ship-it";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.0.0.tgz";
-        sha512 = "DQQldFTRmEPHpvvKxAKLNk/RqVIfzZGsBcbmruy3zupPG2W+pGHnQUSMNXrUZmMkqekDh0nCHf8MfG0EakRqGg==";
-      };
-    };
-    "@node-red/editor-api-1.2.6" = {
+    "@node-red/editor-api-1.2.7" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.6.tgz";
-        sha512 = "RM243A8AgpoHEc8cu8STCYsJVx790clVxvRUCaLfbAyb+dKn+9b0TOKWsmLUW4fhrMqwwVlFOMulVHPhg0HhGg==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.7.tgz";
+        sha512 = "DY1rnKjX8ewkVwwCa6T+kjUHjCP+YMms8rPXFYZAi/r148jS7pKC21OgYe4FrJhM5EGREVJClG5Td6QAORR1vw==";
       };
     };
-    "@node-red/editor-client-1.2.6" = {
+    "@node-red/editor-client-1.2.7" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.6.tgz";
-        sha512 = "2hMnMVcqhR77mHqHzVj3hNJGZ8VcaO+lhggNYhORJXEqYCeAULj92hMCeoA4pjHDqGBn2F+gldli1WOs1/JgJg==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.7.tgz";
+        sha512 = "56NMyLL4iCuSaAYhWnsR3TTQidygoETRaG0GAYuU1iZgh+UZxvnLvIGa4gxgvMdtMgM0t4kS6tyMHhIIbX5Kvw==";
       };
     };
-    "@node-red/nodes-1.2.6" = {
+    "@node-red/nodes-1.2.7" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.6.tgz";
-        sha512 = "1LlECIzKKBHUOsWGLw31FT1mWL2mSecr9gBh2FqwnP7gNejebYjwP2zuHKOYs9sPRm3550zOJ5mlutXiiFKwYg==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.7.tgz";
+        sha512 = "GRUbM7HVPssjxbybMUkjEONi46eGabFYrY2OFZmzFF9L1ywTL9qMeEWsnHdV0Yibkr9Iq0VE4Ss/XZy+cCABAw==";
       };
     };
-    "@node-red/registry-1.2.6" = {
+    "@node-red/registry-1.2.7" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.6.tgz";
-        sha512 = "+zwHxnMr9Adve627dtw2jl/KSjTY+a5JrwJN10TSKMxVLwYeBLm/ugRTA9tkGiCjr2w9pgsnMUZRFFLfdyRZCQ==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.7.tgz";
+        sha512 = "FC14n/pEPiftsWGHQpLW9/4vstvtFpiczj/7CHp5p1Xmn2quSUzKBFOGtFr1FhglTJ3Nn59OOXL+59HMRF3Vcw==";
       };
     };
-    "@node-red/runtime-1.2.6" = {
+    "@node-red/runtime-1.2.7" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.6.tgz";
-        sha512 = "zfQGK4Hqssv5TV8S5WLZ77BHYmyylarZvEScVQpivhJHg6HeZL+MffqqtPIyTM1ulklPZvO6fPmq/f5T/CgAgw==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.7.tgz";
+        sha512 = "0QpolGMBL8ZMXKgzQRp9JFXYuoLaZZ4xkwFehMKH3KubDAYHHTl4tfTdY71hRxe8NbTZW9G9Gftt+e1vj0RGvg==";
       };
     };
-    "@node-red/util-1.2.6" = {
+    "@node-red/util-1.2.7" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.6.tgz";
-        sha512 = "CYUCS8iqcaZFBf0vwtVPqqNXX0XY0ajFW69smtDItbxslyZL3A0qRMiTTv0qMPA1uvOCEw4wQRSIQV7j/nd0yw==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.7.tgz";
+        sha512 = "+mftTJ1AtjqbO/5LjggXd36fcomKjlOy/IunjQULaMGO4MIIqPxZ/QUYTuSi2Z/rgHPMHRuwguwWnoca4GkBnw==";
       };
     };
     "@nodelib/fs.scandir-2.1.4" = {
@@ -3820,13 +3811,13 @@ let
         sha512 = "aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A==";
       };
     };
-    "@npmcli/move-file-1.0.1" = {
+    "@npmcli/move-file-1.1.0" = {
       name = "_at_npmcli_slash_move-file";
       packageName = "@npmcli/move-file";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz";
-        sha512 = "Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==";
+        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.0.tgz";
+        sha512 = "Iv2iq0JuyYjKeFkSR4LPaCdDZwlGK9X2cP/01nJcp3yMJ1FjNd9vpiEYvLUgzBxKPg2SFmaOhizoQsPc0LWeOQ==";
       };
     };
     "@npmcli/node-gyp-1.0.1" = {
@@ -3919,13 +3910,13 @@ let
         sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA==";
       };
     };
-    "@oclif/plugin-autocomplete-0.2.1" = {
+    "@oclif/plugin-autocomplete-0.3.0" = {
       name = "_at_oclif_slash_plugin-autocomplete";
       packageName = "@oclif/plugin-autocomplete";
-      version = "0.2.1";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.2.1.tgz";
-        sha512 = "EOcoh1x3auFg1a7NNVTT+hJ1PPih7Kg1it7WtG8oBgYKe+YD/bvHnX2QlXqi9S7H0XsQQMUb8hxbLP+XwQY/8Q==";
+        url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.3.0.tgz";
+        sha512 = "gCuIUCswvoU1BxDDvHSUGxW8rFagiacle8jHqE49+WnuniXD/N8NmJvnzmlNyc8qLE192CnKK+qYyAF+vaFQBg==";
       };
     };
     "@oclif/plugin-help-1.2.11" = {
@@ -3964,15 +3955,6 @@ let
         sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg==";
       };
     };
-    "@oclif/plugin-plugins-1.9.4" = {
-      name = "_at_oclif_slash_plugin-plugins";
-      packageName = "@oclif/plugin-plugins";
-      version = "1.9.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.4.tgz";
-        sha512 = "C5hEbX4zzTjzbym2RJUE4wxz2aL2ocb826HDs3suscsjMPA3mRHyu8/rWJW1Cgc2MeoIybNdrfyPU/zmpWkaWw==";
-      };
-    };
     "@oclif/plugin-plugins-1.9.5" = {
       name = "_at_oclif_slash_plugin-plugins";
       packageName = "@oclif/plugin-plugins";
@@ -4018,13 +4000,13 @@ let
         sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==";
       };
     };
-    "@octokit/openapi-types-2.0.1" = {
+    "@octokit/openapi-types-3.1.1" = {
       name = "_at_octokit_slash_openapi-types";
       packageName = "@octokit/openapi-types";
-      version = "2.0.1";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.1.tgz";
-        sha512 = "9AuC04PUnZrjoLiw3uPtwGh9FE4Q3rTqs51oNlQ0rkwgE8ftYsOC+lsrQyvCvWm85smBbSc0FNRKKumvGyb44Q==";
+        url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-3.1.1.tgz";
+        sha512 = "4BsrIf9/WLRbl0IVPEPLDTROduvYR57xCldy47YFQp/TZ9DbREQZbeCrJIe7a+Qjb3qk0KwZmxNYYW8mNQY/HQ==";
       };
     };
     "@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -4108,13 +4090,13 @@ let
         sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==";
       };
     };
-    "@octokit/types-6.1.2" = {
+    "@octokit/types-6.4.2" = {
       name = "_at_octokit_slash_types";
       packageName = "@octokit/types";
-      version = "6.1.2";
+      version = "6.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/types/-/types-6.1.2.tgz";
-        sha512 = "LPCpcLbcky7fWfHCTuc7tMiSHFpFlrThJqVdaHgowBTMS0ijlZFfonQC/C1PrZOjD4xRCYgBqH9yttEATGE/nw==";
+        url = "https://registry.npmjs.org/@octokit/types/-/types-6.4.2.tgz";
+        sha512 = "c3OswFOjp0MydgIxWcu/wIXK9sfoBL2gLjqMZA+KKdvvcwh6g2z0eMu219rFrZzi0KQunO9l/a9yHb9T/AlU1A==";
       };
     };
     "@opencensus/core-0.0.8" = {
@@ -4144,58 +4126,58 @@ let
         sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A==";
       };
     };
-    "@opentelemetry/api-0.11.0" = {
+    "@opentelemetry/api-0.12.0" = {
       name = "_at_opentelemetry_slash_api";
       packageName = "@opentelemetry/api";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.11.0.tgz";
-        sha512 = "K+1ADLMxduhsXoZ0GRfi9Pw162FvzBQLDQlHru1lg86rpIU+4XqdJkSGo6y3Kg+GmOWq1HNHOA/ydw/rzHQkRg==";
+        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.12.0.tgz";
+        sha512 = "Dn4vU5GlaBrIWzLpsM6xbJwKHdlpwBQ4Bd+cL9ofJP3hKT8jBXpBpribmyaqAzrajzzl2Yt8uTa9rFVLfjDAvw==";
       };
     };
-    "@opentelemetry/context-base-0.11.0" = {
+    "@opentelemetry/context-base-0.12.0" = {
       name = "_at_opentelemetry_slash_context-base";
       packageName = "@opentelemetry/context-base";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.11.0.tgz";
-        sha512 = "ESRk+572bftles7CVlugAj5Azrz61VO0MO0TS2pE9MLVL/zGmWuUBQryART6/nsrFqo+v9HPt37GPNcECTZR1w==";
+        url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.12.0.tgz";
+        sha512 = "UXwSsXo3F3yZ1dIBOG9ID8v2r9e+bqLWoizCtTb8rXtwF+N5TM7hzzvQz72o3nBU+zrI/D5e+OqAYK8ZgDd3DA==";
       };
     };
-    "@opentelemetry/core-0.11.0" = {
+    "@opentelemetry/core-0.12.0" = {
       name = "_at_opentelemetry_slash_core";
       packageName = "@opentelemetry/core";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.11.0.tgz";
-        sha512 = "ZEKjBXeDGBqzouz0uJmrbEKNExEsQOhsZ3tJDCLcz5dUNoVw642oIn2LYWdQK2YdIfZbEmltiF65/csGsaBtFA==";
+        url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.12.0.tgz";
+        sha512 = "oLZIkmTNWTJXzo1eA4dGu/S7wOVtylsgnEsCmhSJGhrJVDXm1eW/aGuNs3DVBeuxp0ZvQLAul3/PThsC3YrnzA==";
       };
     };
-    "@opentelemetry/resources-0.11.0" = {
+    "@opentelemetry/resources-0.12.0" = {
       name = "_at_opentelemetry_slash_resources";
       packageName = "@opentelemetry/resources";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.11.0.tgz";
-        sha512 = "o7DwV1TcezqBtS5YW2AWBcn01nVpPptIbTr966PLlVBcS//w8LkjeOShiSZxQ0lmV4b2en0FiSouSDoXk/5qIQ==";
+        url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.12.0.tgz";
+        sha512 = "8cYvIKB68cyupc7D6SWzkLtt13mbjgxMahL4JKCM6hWPyiGSJlPFEAey4XFXI5LLpPZRYTPHLVoLqI/xwCFZZA==";
       };
     };
-    "@opentelemetry/semantic-conventions-0.11.0" = {
+    "@opentelemetry/semantic-conventions-0.12.0" = {
       name = "_at_opentelemetry_slash_semantic-conventions";
       packageName = "@opentelemetry/semantic-conventions";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.11.0.tgz";
-        sha512 = "xsthnI/J+Cx0YVDGgUzvrH0ZTtfNtl866M454NarYwDrc0JvC24sYw+XS5PJyk2KDzAHtb0vlrumUc1OAut/Fw==";
+        url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.12.0.tgz";
+        sha512 = "BuCcDW0uLNYYTns0/LwXkJ8lp8aDm7kpS+WunEmPAPRSCe6ciOYRvzn5reqJfX93rf+6A3U2SgrBnCTH+0qoQQ==";
       };
     };
-    "@opentelemetry/tracing-0.11.0" = {
+    "@opentelemetry/tracing-0.12.0" = {
       name = "_at_opentelemetry_slash_tracing";
       packageName = "@opentelemetry/tracing";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.11.0.tgz";
-        sha512 = "QweFmxzl32BcyzwdWCNjVXZT1WeENNS/RWETq/ohqu+fAsTcMyGcr6cOq/yDdFmtBy+bm5WVVdeByEjNS+c4/w==";
+        url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.12.0.tgz";
+        sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg==";
       };
     };
     "@ot-builder/bin-composite-types-0.10.37" = {
@@ -4576,13 +4558,13 @@ let
         sha512 = "CY/a6Nw72vrlp/FPx38l4jfEHp4gNEbo8i+WlSJ2cnWO6VE6CKmnC1zb4yQLvdP8f3EuzzoOBZVq6aGN20M82Q==";
       };
     };
-    "@pm2/js-api-0.6.1" = {
+    "@pm2/js-api-0.6.7" = {
       name = "_at_pm2_slash_js-api";
       packageName = "@pm2/js-api";
-      version = "0.6.1";
+      version = "0.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.1.tgz";
-        sha512 = "LImZWHEzcpIrLZ7kt4z3Gllkoz+CChHk2waDretOWeinSItyTMrNpzcXcZd2QikP/57qPolLfHGFipHJmOKkwQ==";
+        url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.7.tgz";
+        sha512 = "jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw==";
       };
     };
     "@pm2/pm2-version-check-1.0.3" = {
@@ -4765,15 +4747,6 @@ let
         sha512 = "MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA==";
       };
     };
-    "@rollup/plugin-commonjs-15.1.0" = {
-      name = "_at_rollup_slash_plugin-commonjs";
-      packageName = "@rollup/plugin-commonjs";
-      version = "15.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz";
-        sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==";
-      };
-    };
     "@rollup/plugin-commonjs-17.0.0" = {
       name = "_at_rollup_slash_plugin-commonjs";
       packageName = "@rollup/plugin-commonjs";
@@ -4801,22 +4774,13 @@ let
         sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==";
       };
     };
-    "@rollup/plugin-node-resolve-11.0.1" = {
+    "@rollup/plugin-node-resolve-11.1.0" = {
       name = "_at_rollup_slash_plugin-node-resolve";
       packageName = "@rollup/plugin-node-resolve";
-      version = "11.0.1";
+      version = "11.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.1.tgz";
-        sha512 = "ltlsj/4Bhwwhb+Nb5xCz/6vieuEj2/BAkkqVIKmZwC7pIdl8srmgmglE4S0jFlZa32K4qvdQ6NHdmpRKD/LwoQ==";
-      };
-    };
-    "@rollup/plugin-node-resolve-9.0.0" = {
-      name = "_at_rollup_slash_plugin-node-resolve";
-      packageName = "@rollup/plugin-node-resolve";
-      version = "9.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz";
-        sha512 = "gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg==";
+        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.0.tgz";
+        sha512 = "ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog==";
       };
     };
     "@rollup/pluginutils-3.1.0" = {
@@ -4846,13 +4810,13 @@ let
         sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
       };
     };
-    "@schematics/angular-11.0.5" = {
+    "@schematics/angular-11.1.0" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "11.0.5";
+      version = "11.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.5.tgz";
-        sha512 = "7p2wweoJYhim8YUy3ih1SrPGqRsa6+aEFbYgo9v4zt7b3tOva8SvkbC2alayK74fclzQ7umqa6xAwvWhy8ORvg==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.1.0.tgz";
+        sha512 = "g04TcC1gLS1ptFYdIO7qZ+lJARBXoK9g+m5KzQoogdrDkCum+wN15bfYKc5hF8cDYQOOqYjRF5GBdS9Uvc4ulQ==";
       };
     };
     "@schematics/schematics-0.1100.3" = {
@@ -4864,13 +4828,13 @@ let
         sha512 = "tzjKnjD90FQ4LgRN9ALT2qCqgJYZrAKoy1embFJRuGKA8vv1hTG4JonVDqQEUoNwTc9r/Ok2Z1eenAI9TSUd1A==";
       };
     };
-    "@schematics/update-0.1100.5" = {
+    "@schematics/update-0.1101.0" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.1100.5";
+      version = "0.1101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.5.tgz";
-        sha512 = "BYtKKuiWsrlc4FMW3bRyl4tm6lWNMTi8oql/mtkSgH7V5eMmaLDJtM+zDl+qyC/KHPxbHTfoHDapfv1tITSWjA==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1101.0.tgz";
+        sha512 = "WcbiTcn+Rr1uYllTLMbYcMfiz5IRZ7OAapISA82DpDkBeYIUf86ANjkEK1qsuU3zoz5i3CbiWvPq/KTlrzh6dg==";
       };
     };
     "@segment/loosely-validate-event-2.0.0" = {
@@ -4900,13 +4864,13 @@ let
         sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
       };
     };
-    "@serverless/components-3.4.3" = {
+    "@serverless/components-3.5.1" = {
       name = "_at_serverless_slash_components";
       packageName = "@serverless/components";
-      version = "3.4.3";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/components/-/components-3.4.3.tgz";
-        sha512 = "buKvUPDeS54bUG9c56bmX5WcL3hBCHASKamHpUGmSa1ArSem8BE76LzPjiNcreOJGSFf9VGMgpsW1d1WKy2fAA==";
+        url = "https://registry.npmjs.org/@serverless/components/-/components-3.5.1.tgz";
+        sha512 = "GRXdO4e2gWwVQ+RNdbffaym92cIcUHzYfIK3mxWv2zIL/4rKXz5YaptRj6hd3EST12/iBsEOktomtuCfG1i9RA==";
       };
     };
     "@serverless/core-1.1.2" = {
@@ -4918,13 +4882,13 @@ let
         sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
       };
     };
-    "@serverless/enterprise-plugin-4.4.1" = {
+    "@serverless/enterprise-plugin-4.4.2" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "4.4.1";
+      version = "4.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.1.tgz";
-        sha512 = "MTjpIwpCA1gmldGuEozHNKIlce8BXMilvH2K0nm5vJ45PAUwK1bL9moaLwDadaTEw9B1jKbboa5/wpzJwwFdxA==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.2.tgz";
+        sha512 = "w5xD8R8tFK6B7QiLvWI5jqVHTtH1LdTyGp5eRcjkdJBa10/D2IZFpJimMAGsBxk9U1JGKO4j0miVnRHIW8ppeg==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -4936,22 +4900,22 @@ let
         sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==";
       };
     };
-    "@serverless/platform-client-3.1.4" = {
+    "@serverless/platform-client-3.8.1" = {
       name = "_at_serverless_slash_platform-client";
       packageName = "@serverless/platform-client";
-      version = "3.1.4";
+      version = "3.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.1.4.tgz";
-        sha512 = "oc65L9Dl1Xe+T5qv/fkmjYREtPzrQMdje0fC5ntvsfR3luxvSfQIinHYKbt30Qpyy2sJCBPG4IPEip7b3y0WwA==";
+        url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.8.1.tgz";
+        sha512 = "kdLKQPoiZedgYQ38v5s0Bpo+KpAl/2Cz4qL73oJxfqVI0ZQiINR7jxblT+fA2SwcyJdGzbZf/98Tx4bekwPs2g==";
       };
     };
-    "@serverless/platform-client-china-2.0.9" = {
+    "@serverless/platform-client-china-2.1.1" = {
       name = "_at_serverless_slash_platform-client-china";
       packageName = "@serverless/platform-client-china";
-      version = "2.0.9";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.9.tgz";
-        sha512 = "qec3a5lVaMH0nccgjVgvcEF8M+M95BXZbbYDGypVHEieJQxrKqj057+VVKsiHBeHYXzr4B3v6pIyQHst40vpIw==";
+        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.1.tgz";
+        sha512 = "mpJ4Pf8gWWcq8cvpix4obSSAUUKG9NqRiFXjBm6mmfiWgge88E/HwY5Nnvf9QWcvr7oxwtDnS+vXXA73s60NjA==";
       };
     };
     "@serverless/platform-sdk-2.3.2" = {
@@ -4990,13 +4954,13 @@ let
         sha512 = "0TqmLwH9r2GAewvz9mhZ+TSyQBoE9ANuB4nNhn6lJvVUgzlzji3aqeFbAuDt+Z60ZkaIDNipU/J5Vf2Lo/QTQQ==";
       };
     };
-    "@serverless/utils-china-1.0.12" = {
+    "@serverless/utils-china-1.0.14" = {
       name = "_at_serverless_slash_utils-china";
       packageName = "@serverless/utils-china";
-      version = "1.0.12";
+      version = "1.0.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.12.tgz";
-        sha512 = "PuVap97QTf3Fi5+ez3ZUewGPFHTpf3dwZ+c6YWEoaf+1u7cgXzYFuWx8Ypi+4ghbL93/bf+blqdm+7CQi+CMRg==";
+        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.14.tgz";
+        sha512 = "7ku9ePjb+bneFV1Akmz0t8pU8hhHfPJsBjG/Kf6IjyGAQrEjN/PcY2QUDm0emdCNyCsuido1wp0DWMGiwuhC8Q==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -5062,6 +5026,15 @@ let
         sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ==";
       };
     };
+    "@skorfmann/terraform-cloud-1.7.1" = {
+      name = "_at_skorfmann_slash_terraform-cloud";
+      packageName = "@skorfmann/terraform-cloud";
+      version = "1.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.7.1.tgz";
+        sha512 = "uwcalR9R5/9M+UcOeKR+XgCyIlipl5dxiAryuWT8D4erW6sPnTE/B97G6F3VzzrZfcaPmljX5NVG8Dkl79ki6A==";
+      };
+    };
     "@slack/client-3.16.0" = {
       name = "_at_slack_slash_client";
       packageName = "@slack/client";
@@ -5125,6 +5098,15 @@ let
         sha512 = "+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw==";
       };
     };
+    "@snyk/dep-graph-1.23.0" = {
+      name = "_at_snyk_slash_dep-graph";
+      packageName = "@snyk/dep-graph";
+      version = "1.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.23.0.tgz";
+        sha512 = "qR0ENrbcNWHYmSRZCxjrlFy2T7i+rJjL6Rnd2e+NByJgn8zBmX6Qf5FjqNbZAI0AYjOlzXMZjGrbAbe4QkWV+w==";
+      };
+    };
     "@snyk/docker-registry-v2-client-1.13.9" = {
       name = "_at_snyk_slash_docker-registry-v2-client";
       packageName = "@snyk/docker-registry-v2-client";
@@ -5152,13 +5134,13 @@ let
         sha512 = "uO1b6UtT6QGz7F5ZgNdOSyMXBvykUhOcuHBRc//xUnBWsyJwdlAFp/d646zIeaBCe87Fcn5hXuWUGjj+N8rBzA==";
       };
     };
-    "@snyk/java-call-graph-builder-1.18.0" = {
+    "@snyk/java-call-graph-builder-1.19.0" = {
       name = "_at_snyk_slash_java-call-graph-builder";
       packageName = "@snyk/java-call-graph-builder";
-      version = "1.18.0";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.18.0.tgz";
-        sha512 = "6Mt+Rs2N4HdHICCjxWRwtGXUrSktCsSGnn7HlL6wi+4JXjPWa+rDCzaF6furqRR3aphZAclgved0haFwwmqBxQ==";
+        url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.0.tgz";
+        sha512 = "in26UkFVEWvGyHmSmVUebvgyubANJB7rfrkE3PKjHDA80NwSLZDSNWOOC2lF2B+4ob4STWjQdMbv+bMqXl5Yew==";
       };
     };
     "@snyk/rpm-parser-2.2.1" = {
@@ -5485,6 +5467,15 @@ let
         sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==";
       };
     };
+    "@types/archiver-5.1.0" = {
+      name = "_at_types_slash_archiver";
+      packageName = "@types/archiver";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/archiver/-/archiver-5.1.0.tgz";
+        sha512 = "baFOhanb/hxmcOd1Uey2TfFg43kTSmM6py1Eo7Rjbv/ivcl7PXLhY0QgXGf50Hx/eskGCFqPfhs/7IZLb15C5g==";
+      };
+    };
     "@types/babel-types-7.0.9" = {
       name = "_at_types_slash_babel-types";
       packageName = "@types/babel-types";
@@ -5728,13 +5719,13 @@ let
         sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A==";
       };
     };
-    "@types/engine.io-3.1.4" = {
+    "@types/engine.io-3.1.5" = {
       name = "_at_types_slash_engine.io";
       packageName = "@types/engine.io";
-      version = "3.1.4";
+      version = "3.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.4.tgz";
-        sha512 = "98rXVukLD6/ozrQ2O80NAlWDGA4INg+tqsEReWJldqyi2fulC9V7Use/n28SWgROXKm6003ycWV4gZHoF8GA6w==";
+        url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.5.tgz";
+        sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg==";
       };
     };
     "@types/eslint-7.2.6" = {
@@ -5782,6 +5773,15 @@ let
         sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==";
       };
     };
+    "@types/estree-0.0.46" = {
+      name = "_at_types_slash_estree";
+      packageName = "@types/estree";
+      version = "0.0.46";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz";
+        sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==";
+      };
+    };
     "@types/events-3.0.0" = {
       name = "_at_types_slash_events";
       packageName = "@types/events";
@@ -5818,6 +5818,15 @@ let
         sha512 = "YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ==";
       };
     };
+    "@types/express-serve-static-core-4.17.18" = {
+      name = "_at_types_slash_express-serve-static-core";
+      packageName = "@types/express-serve-static-core";
+      version = "4.17.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
+        sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
+      };
+    };
     "@types/fancy-log-1.3.0" = {
       name = "_at_types_slash_fancy-log";
       packageName = "@types/fancy-log";
@@ -5971,13 +5980,13 @@ let
         sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA==";
       };
     };
-    "@types/http-proxy-1.17.4" = {
+    "@types/http-proxy-1.17.5" = {
       name = "_at_types_slash_http-proxy";
       packageName = "@types/http-proxy";
-      version = "1.17.4";
+      version = "1.17.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz";
-        sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==";
+        url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz";
+        sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q==";
       };
     };
     "@types/inquirer-6.5.0" = {
@@ -6034,6 +6043,15 @@ let
         sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww==";
       };
     };
+    "@types/js-yaml-3.12.6" = {
+      name = "_at_types_slash_js-yaml";
+      packageName = "@types/js-yaml";
+      version = "3.12.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.6.tgz";
+        sha512 = "cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ==";
+      };
+    };
     "@types/jscodeshift-0.7.2" = {
       name = "_at_types_slash_jscodeshift";
       packageName = "@types/jscodeshift";
@@ -6043,13 +6061,13 @@ let
         sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw==";
       };
     };
-    "@types/json-schema-7.0.6" = {
+    "@types/json-schema-7.0.7" = {
       name = "_at_types_slash_json-schema";
       packageName = "@types/json-schema";
-      version = "7.0.6";
+      version = "7.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz";
-        sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==";
+        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz";
+        sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==";
       };
     };
     "@types/json5-0.0.29" = {
@@ -6115,13 +6133,13 @@ let
         sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==";
       };
     };
-    "@types/lodash-4.14.167" = {
+    "@types/lodash-4.14.168" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.167";
+      version = "4.14.168";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.167.tgz";
-        sha512 = "w7tQPjARrvdeBkX/Rwg95S592JwxqOjmms3zWQ0XZgSyxSLdzWaYH3vErBhdVS/lRBX7F8aBYcYJYTr5TMGOzw==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz";
+        sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==";
       };
     };
     "@types/long-4.0.1" = {
@@ -6151,13 +6169,13 @@ let
         sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==";
       };
     };
-    "@types/mime-2.0.3" = {
+    "@types/mime-1.3.2" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
-      version = "2.0.3";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz";
-        sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==";
+        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
+        sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -6259,13 +6277,13 @@ let
         sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==";
       };
     };
-    "@types/node-10.17.50" = {
+    "@types/node-10.17.51" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.50";
+      version = "10.17.51";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.50.tgz";
-        sha512 = "vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.51.tgz";
+        sha512 = "KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg==";
       };
     };
     "@types/node-12.12.70" = {
@@ -6277,22 +6295,22 @@ let
         sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ==";
       };
     };
-    "@types/node-12.19.12" = {
+    "@types/node-12.19.15" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.19.12";
+      version = "12.19.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz";
-        sha512 = "UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz";
+        sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==";
       };
     };
-    "@types/node-13.13.39" = {
+    "@types/node-13.13.40" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.39";
+      version = "13.13.40";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.39.tgz";
-        sha512 = "wct+WgRTTkBm2R3vbrFOqyZM5w0g+D8KnhstG9463CJBVC3UVZHMToge7iMBR1vDl/I+NWFHUeK9X+JcF0rWKw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.40.tgz";
+        sha512 = "eKaRo87lu1yAXrzEJl0zcJxfUMDT5/mZalFyOkT44rnQps41eS2pfWzbaulSPpQLFNy29bFqn+Y5lOTL8ATlEQ==";
       };
     };
     "@types/node-14.11.1" = {
@@ -6304,13 +6322,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.14.20" = {
+    "@types/node-14.14.22" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.20";
+      version = "14.14.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz";
-        sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
+        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
       };
     };
     "@types/node-6.14.13" = {
@@ -6349,6 +6367,15 @@ let
         sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==";
       };
     };
+    "@types/node-fetch-2.5.8" = {
+      name = "_at_types_slash_node-fetch";
+      packageName = "@types/node-fetch";
+      version = "2.5.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz";
+        sha512 = "fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==";
+      };
+    };
     "@types/normalize-package-data-2.4.0" = {
       name = "_at_types_slash_normalize-package-data";
       packageName = "@types/normalize-package-data";
@@ -6385,13 +6412,13 @@ let
         sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg==";
       };
     };
-    "@types/pg-types-1.11.5" = {
+    "@types/pg-types-2.2.0" = {
       name = "_at_types_slash_pg-types";
       packageName = "@types/pg-types";
-      version = "1.11.5";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-1.11.5.tgz";
-        sha512 = "L8ogeT6vDzT1vxlW3KITTCt+BVXXVkLXfZ/XNm6UqbcJgxf+KPO7yjWx7dQQE8RW07KopL10x2gNMs41+IkMGQ==";
+        url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-2.2.0.tgz";
+        sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA==";
       };
     };
     "@types/q-1.5.4" = {
@@ -6502,13 +6529,13 @@ let
         sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==";
       };
     };
-    "@types/serve-static-1.13.8" = {
+    "@types/serve-static-1.13.9" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.8";
+      version = "1.13.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz";
-        sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
+        sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
       };
     };
     "@types/sizzle-2.3.2" = {
@@ -6556,6 +6583,15 @@ let
         sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA==";
       };
     };
+    "@types/stream-buffers-3.0.3" = {
+      name = "_at_types_slash_stream-buffers";
+      packageName = "@types/stream-buffers";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.3.tgz";
+        sha512 = "NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ==";
+      };
+    };
     "@types/superagent-3.8.2" = {
       name = "_at_types_slash_superagent";
       packageName = "@types/superagent";
@@ -6682,6 +6718,15 @@ let
         sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==";
       };
     };
+    "@types/webpack-4.41.26" = {
+      name = "_at_types_slash_webpack";
+      packageName = "@types/webpack";
+      version = "4.41.26";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz";
+        sha512 = "7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==";
+      };
+    };
     "@types/webpack-sources-2.1.0" = {
       name = "_at_types_slash_webpack-sources";
       packageName = "@types/webpack-sources";
@@ -6763,13 +6808,13 @@ let
         sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==";
       };
     };
-    "@typescript-eslint/eslint-plugin-4.12.0" = {
+    "@typescript-eslint/eslint-plugin-4.14.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.12.0";
+      version = "4.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz";
-        sha512 = "wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.0.tgz";
+        sha512 = "IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww==";
       };
     };
     "@typescript-eslint/experimental-utils-3.10.1" = {
@@ -6781,13 +6826,13 @@ let
         sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.12.0" = {
+    "@typescript-eslint/experimental-utils-4.14.0" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.12.0";
+      version = "4.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz";
-        sha512 = "MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.0.tgz";
+        sha512 = "6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ==";
       };
     };
     "@typescript-eslint/parser-3.10.1" = {
@@ -6799,22 +6844,22 @@ let
         sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
       };
     };
-    "@typescript-eslint/parser-4.12.0" = {
+    "@typescript-eslint/parser-4.14.0" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "4.12.0";
+      version = "4.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.12.0.tgz";
-        sha512 = "9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.14.0.tgz";
+        sha512 = "sUDeuCjBU+ZF3Lzw0hphTyScmDDJ5QVkyE21pRoBo8iDl7WBtVFS+WDN3blY1CH3SBt7EmYCw6wfmJjF0l/uYg==";
       };
     };
-    "@typescript-eslint/scope-manager-4.12.0" = {
+    "@typescript-eslint/scope-manager-4.14.0" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.12.0";
+      version = "4.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz";
-        sha512 = "QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.14.0.tgz";
+        sha512 = "/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q==";
       };
     };
     "@typescript-eslint/types-3.10.1" = {
@@ -6826,13 +6871,13 @@ let
         sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
       };
     };
-    "@typescript-eslint/types-4.12.0" = {
+    "@typescript-eslint/types-4.14.0" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.12.0";
+      version = "4.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.12.0.tgz";
-        sha512 = "N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.14.0.tgz";
+        sha512 = "VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A==";
       };
     };
     "@typescript-eslint/typescript-estree-2.34.0" = {
@@ -6853,13 +6898,13 @@ let
         sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.12.0" = {
+    "@typescript-eslint/typescript-estree-4.14.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.12.0";
+      version = "4.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz";
-        sha512 = "gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz";
+        sha512 = "wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag==";
       };
     };
     "@typescript-eslint/visitor-keys-3.10.1" = {
@@ -6871,31 +6916,31 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.12.0" = {
+    "@typescript-eslint/visitor-keys-4.14.0" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.12.0";
+      version = "4.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz";
-        sha512 = "hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz";
+        sha512 = "MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA==";
       };
     };
-    "@uifabric/foundation-7.9.20" = {
+    "@uifabric/foundation-7.9.21" = {
       name = "_at_uifabric_slash_foundation";
       packageName = "@uifabric/foundation";
-      version = "7.9.20";
+      version = "7.9.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.20.tgz";
-        sha512 = "AcOClWfs+rNK0XyPLKTK2Nqeom7zOESOfL3Tbwl5VuDlSrlGW9yNywuuo6gJSOyXCJQO5dJFVdGExmB0EM4vkw==";
+        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.21.tgz";
+        sha512 = "z58pcC0hJr6S0iYLxNFoqfrfLIMxbSxFHRirk5LDT2HXbiVIYbJwbK4O0InS+sz3chdx8GGSdIUz7muXeT/D+A==";
       };
     };
-    "@uifabric/icons-7.5.17" = {
+    "@uifabric/icons-7.5.18" = {
       name = "_at_uifabric_slash_icons";
       packageName = "@uifabric/icons";
-      version = "7.5.17";
+      version = "7.5.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.17.tgz";
-        sha512 = "2S1kse0gtseTuV2r59iWukLxxoOJ6GgP2Yhxt9oxzaP9QubpYdxCUepvJmfPQQvvy4GELdykDUWQ6/hbzliJyw==";
+        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.18.tgz";
+        sha512 = "gLPEccWlTER9NiXcOHZ+dSJ3tgLAQ4mTf3hTlKV7e7dKBTl95jzcemG5S2NJQ7xWPTH3+5K1Bpd+nqZo9EJw3w==";
       };
     };
     "@uifabric/merge-styles-7.19.1" = {
@@ -6925,13 +6970,13 @@ let
         sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA==";
       };
     };
-    "@uifabric/styling-7.16.18" = {
+    "@uifabric/styling-7.16.19" = {
       name = "_at_uifabric_slash_styling";
       packageName = "@uifabric/styling";
-      version = "7.16.18";
+      version = "7.16.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.18.tgz";
-        sha512 = "jINFRMWfSIOZ4H29YNBHtwZU4f8JFprnyBX2E0Wq9rjqRzgcmdYbN2yn88gym6aC3houSDcYM0rdfG4ETjRQSA==";
+        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.19.tgz";
+        sha512 = "T5fjUCx0LbzUC8Myw15YCaBjdGbSrihWSiPHtLVW77k59yWAW947XnH73QngE8xU7kyKPH3AhQrUEBMB2NjHag==";
       };
     };
     "@uifabric/utilities-7.33.2" = {
@@ -6979,40 +7024,40 @@ let
         sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084";
       };
     };
-    "@vue/cli-shared-utils-4.5.9" = {
+    "@vue/cli-shared-utils-4.5.10" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
-      version = "4.5.9";
+      version = "4.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.9.tgz";
-        sha512 = "anvsrv+rkQC+hgxaT2nQQxnSWSsIzyysZ36LO7qPjXvDRBvcvKLAAviFlUkYbZ+ntbV8puzJ3zw+gUhQw4SEVA==";
+        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.10.tgz";
+        sha512 = "Lid6FflDqcvo/JBIBjUriAQ1RkQaKbBpzXSLEK/JmoKkQRHW/rRhDLGI1dEVyOLYnDEiL1m8o1xPJaplUUiXpA==";
       };
     };
-    "@vue/cli-ui-4.5.9" = {
+    "@vue/cli-ui-4.5.10" = {
       name = "_at_vue_slash_cli-ui";
       packageName = "@vue/cli-ui";
-      version = "4.5.9";
+      version = "4.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.9.tgz";
-        sha512 = "JXQk29CLp7eBdO6uCr2s60xBoKjXPzr9ckpCicFMIWFLQOR0+DqWQpS1DIqETbgOmTYQj1LX+v1rkLeA74Lo2A==";
+        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.10.tgz";
+        sha512 = "nMB24EZcswLxYBudjlKu15l/q2uO2YAn3iag3k4oGBg4n6ZQNvuAFY842GmuccJO3CHKlBXdyVDKoQUWz8fSQg==";
       };
     };
-    "@vue/cli-ui-addon-webpack-4.5.9" = {
+    "@vue/cli-ui-addon-webpack-4.5.10" = {
       name = "_at_vue_slash_cli-ui-addon-webpack";
       packageName = "@vue/cli-ui-addon-webpack";
-      version = "4.5.9";
+      version = "4.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.9.tgz";
-        sha512 = "fh79OvbqvZ2YQ7JI7DnDKeS3W72HoEMVS8m969g/kjrqkFM+Rt2cL81LBx3IgX5l/rZP999kof569vYsOyjVnA==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.10.tgz";
+        sha512 = "+/l7m6f8bk++zv6mN4MzJnlBOGfl4M01Ir01n9UP2z2lX2ozpu4kU6bldrssaj/o2u2XazL3udXzbYA6sJFgOg==";
       };
     };
-    "@vue/cli-ui-addon-widgets-4.5.9" = {
+    "@vue/cli-ui-addon-widgets-4.5.10" = {
       name = "_at_vue_slash_cli-ui-addon-widgets";
       packageName = "@vue/cli-ui-addon-widgets";
-      version = "4.5.9";
+      version = "4.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.9.tgz";
-        sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.10.tgz";
+        sha512 = "Y89eMWLICYqoYRODJbMrr+4qporxo1gtRUAJltDKSgCZ8cn2Pt5A2/jwjxy9PueliKrvt19soF2/ckM3CLy/eA==";
       };
     };
     "@vue/compiler-core-3.0.5" = {
@@ -7087,6 +7132,15 @@ let
         sha512 = "gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw==";
       };
     };
+    "@webassemblyjs/ast-1.11.0" = {
+      name = "_at_webassemblyjs_slash_ast";
+      packageName = "@webassemblyjs/ast";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz";
+        sha512 = "kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==";
+      };
+    };
     "@webassemblyjs/ast-1.8.1" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
@@ -7105,13 +7159,13 @@ let
         sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==";
       };
     };
-    "@webassemblyjs/ast-1.9.1" = {
-      name = "_at_webassemblyjs_slash_ast";
-      packageName = "@webassemblyjs/ast";
-      version = "1.9.1";
+    "@webassemblyjs/floating-point-hex-parser-1.11.0" = {
+      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
+      packageName = "@webassemblyjs/floating-point-hex-parser";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.1.tgz";
-        sha512 = "uMu1nCWn2Wxyy126LlGqRVlhdTOsO/bsBRI4dNq3+6SiSuRKRQX6ejjKgh82LoGAPSq72lDUiQ4FWVaf0PecYw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz";
+        sha512 = "Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==";
       };
     };
     "@webassemblyjs/floating-point-hex-parser-1.8.1" = {
@@ -7132,13 +7186,13 @@ let
         sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.9.1" = {
-      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
-      packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.9.1";
+    "@webassemblyjs/helper-api-error-1.11.0" = {
+      name = "_at_webassemblyjs_slash_helper-api-error";
+      packageName = "@webassemblyjs/helper-api-error";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.1.tgz";
-        sha512 = "5VEKu024RySmLKTTBl9q1eO/2K5jk9ZS+2HXDBLA9s9p5IjkaXxWiDb/+b7wSQp6FRdLaH1IVGIfOex58Na2pg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz";
+        sha512 = "baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==";
       };
     };
     "@webassemblyjs/helper-api-error-1.8.1" = {
@@ -7159,13 +7213,13 @@ let
         sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==";
       };
     };
-    "@webassemblyjs/helper-api-error-1.9.1" = {
-      name = "_at_webassemblyjs_slash_helper-api-error";
-      packageName = "@webassemblyjs/helper-api-error";
-      version = "1.9.1";
+    "@webassemblyjs/helper-buffer-1.11.0" = {
+      name = "_at_webassemblyjs_slash_helper-buffer";
+      packageName = "@webassemblyjs/helper-buffer";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.1.tgz";
-        sha512 = "y1lGmfm38djrScwpeL37rRR9f1D6sM8RhMpvM7CYLzOlHVboouZokXK/G88BpzW0NQBSvCCOnW5BFhten4FPfA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz";
+        sha512 = "u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==";
       };
     };
     "@webassemblyjs/helper-buffer-1.8.1" = {
@@ -7186,13 +7240,13 @@ let
         sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.9.1" = {
-      name = "_at_webassemblyjs_slash_helper-buffer";
-      packageName = "@webassemblyjs/helper-buffer";
-      version = "1.9.1";
+    "@webassemblyjs/helper-code-frame-1.11.0" = {
+      name = "_at_webassemblyjs_slash_helper-code-frame";
+      packageName = "@webassemblyjs/helper-code-frame";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.1.tgz";
-        sha512 = "uS6VSgieHbk/m4GSkMU5cqe/5TekdCzQso4revCIEQ3vpGZgqSSExi4jWpTWwDpAHOIAb1Jfrs0gUB9AA4n71w==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.11.0.tgz";
+        sha512 = "crKJ80NppRzmKB9863Xq5ufVT6he+V4A2PoBfeblFGeeCb6zig34mW97tNBzGLcuOfSsq4ncmI4QOtqQBg047g==";
       };
     };
     "@webassemblyjs/helper-code-frame-1.8.1" = {
@@ -7213,31 +7267,31 @@ let
         sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==";
       };
     };
-    "@webassemblyjs/helper-code-frame-1.9.1" = {
-      name = "_at_webassemblyjs_slash_helper-code-frame";
-      packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.1.tgz";
-        sha512 = "ZQ2ZT6Evk4DPIfD+92AraGYaFIqGm4U20e7FpXwl7WUo2Pn1mZ1v8VGH8i+Y++IQpxPbQo/UyG0Khs7eInskzA==";
-      };
-    };
-    "@webassemblyjs/helper-compiler-1.9.1" = {
+    "@webassemblyjs/helper-compiler-1.11.0" = {
       name = "_at_webassemblyjs_slash_helper-compiler";
       packageName = "@webassemblyjs/helper-compiler";
-      version = "1.9.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.9.1.tgz";
-        sha512 = "Qad79JaN6Qgv+lWd3sLqt206o6WRne5AynNPuLQlTlvDh8P/QsqVzf6RAJnjn9snJczXxkdN3BhWg9jSgb1sUw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.11.0.tgz";
+        sha512 = "XEKiHYE951mCW3kjXXK3sHdJI+IOD8k/Vfzk55FeFRJbKxucXZEJ+H1dcDp9MK0wXLtaMSVU5RFXf7chrCjdAg==";
       };
     };
-    "@webassemblyjs/helper-flatten-ast-1.9.1" = {
+    "@webassemblyjs/helper-flatten-ast-1.11.0" = {
       name = "_at_webassemblyjs_slash_helper-flatten-ast";
       packageName = "@webassemblyjs/helper-flatten-ast";
-      version = "1.9.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.9.1.tgz";
-        sha512 = "wb7ZvGAzfMdgPYAR5zQwu9R/M+kmJDYXKPCJ9vCMfUn3qMoa69Tn5J+Y9u+HzX7nt3TgPvJFcVZKWxCMIhuP7w==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.11.0.tgz";
+        sha512 = "T5zOuVT4mOXuDu2elXT/0P+2hhsIj/SgUUIxGTmpak6j3XruH0hYOOcnT9ES+qQ4vN3eq63ivGnLaMmjMPcExA==";
+      };
+    };
+    "@webassemblyjs/helper-fsm-1.11.0" = {
+      name = "_at_webassemblyjs_slash_helper-fsm";
+      packageName = "@webassemblyjs/helper-fsm";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.11.0.tgz";
+        sha512 = "H0vRFj05zA2J1SVi+VdNbMwi7m0yZQhLqq7vkjYk44ilLzk0zEXaBNofKH5rQcchQUP2gdqoxLLHA9EcUdW9nw==";
       };
     };
     "@webassemblyjs/helper-fsm-1.8.1" = {
@@ -7258,15 +7312,6 @@ let
         sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==";
       };
     };
-    "@webassemblyjs/helper-fsm-1.9.1" = {
-      name = "_at_webassemblyjs_slash_helper-fsm";
-      packageName = "@webassemblyjs/helper-fsm";
-      version = "1.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.1.tgz";
-        sha512 = "J32HGpveEqqcKFS0YbgicB0zAlpfIxJa5MjxDxhu3i5ltPcVfY5EPvKQ1suRguFPehxiUs+/hfkwPEXom/l0lw==";
-      };
-    };
     "@webassemblyjs/helper-module-context-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-module-context";
       packageName = "@webassemblyjs/helper-module-context";
@@ -7285,13 +7330,22 @@ let
         sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==";
       };
     };
-    "@webassemblyjs/helper-module-context-1.9.1" = {
-      name = "_at_webassemblyjs_slash_helper-module-context";
-      packageName = "@webassemblyjs/helper-module-context";
-      version = "1.9.1";
+    "@webassemblyjs/helper-numbers-1.11.0" = {
+      name = "_at_webassemblyjs_slash_helper-numbers";
+      packageName = "@webassemblyjs/helper-numbers";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.1.tgz";
-        sha512 = "IEH2cMmEQKt7fqelLWB5e/cMdZXf2rST1JIrzWmf4XBt3QTxGdnnLvV4DYoN8pJjOx0VYXsWg+yF16MmJtolZg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz";
+        sha512 = "DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==";
+      };
+    };
+    "@webassemblyjs/helper-wasm-bytecode-1.11.0" = {
+      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
+      packageName = "@webassemblyjs/helper-wasm-bytecode";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz";
+        sha512 = "MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==";
       };
     };
     "@webassemblyjs/helper-wasm-bytecode-1.8.1" = {
@@ -7312,13 +7366,13 @@ let
         sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==";
       };
     };
-    "@webassemblyjs/helper-wasm-bytecode-1.9.1" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
-      packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.9.1";
+    "@webassemblyjs/helper-wasm-section-1.11.0" = {
+      name = "_at_webassemblyjs_slash_helper-wasm-section";
+      packageName = "@webassemblyjs/helper-wasm-section";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.1.tgz";
-        sha512 = "i2rGTBqFUcSXxyjt2K4vm/3kkHwyzG6o427iCjcIKjOqpWH8SEem+xe82jUk1iydJO250/CvE5o7hzNAMZf0dQ==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz";
+        sha512 = "3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==";
       };
     };
     "@webassemblyjs/helper-wasm-section-1.8.1" = {
@@ -7339,13 +7393,13 @@ let
         sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.9.1" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-section";
-      packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.9.1";
+    "@webassemblyjs/ieee754-1.11.0" = {
+      name = "_at_webassemblyjs_slash_ieee754";
+      packageName = "@webassemblyjs/ieee754";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.1.tgz";
-        sha512 = "FetqzjtXZr2d57IECK+aId3D0IcGweeM0CbAnJHkYJkcRTHP+YcMb7Wmc0j21h5UWBpwYGb9dSkK/93SRCTrGg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz";
+        sha512 = "KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==";
       };
     };
     "@webassemblyjs/ieee754-1.8.1" = {
@@ -7366,13 +7420,13 @@ let
         sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==";
       };
     };
-    "@webassemblyjs/ieee754-1.9.1" = {
-      name = "_at_webassemblyjs_slash_ieee754";
-      packageName = "@webassemblyjs/ieee754";
-      version = "1.9.1";
+    "@webassemblyjs/leb128-1.11.0" = {
+      name = "_at_webassemblyjs_slash_leb128";
+      packageName = "@webassemblyjs/leb128";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.1.tgz";
-        sha512 = "EvTG9M78zP1MmkBpUjGQHZc26DzPGZSLIPxYHCjQsBMo60Qy2W34qf8z0exRDtxBbRIoiKa5dFyWer/7r1aaSQ==";
+        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz";
+        sha512 = "aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==";
       };
     };
     "@webassemblyjs/leb128-1.8.1" = {
@@ -7393,13 +7447,13 @@ let
         sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==";
       };
     };
-    "@webassemblyjs/leb128-1.9.1" = {
-      name = "_at_webassemblyjs_slash_leb128";
-      packageName = "@webassemblyjs/leb128";
-      version = "1.9.1";
+    "@webassemblyjs/utf8-1.11.0" = {
+      name = "_at_webassemblyjs_slash_utf8";
+      packageName = "@webassemblyjs/utf8";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.1.tgz";
-        sha512 = "Oc04ub0vFfLnF+2/+ki3AE+anmW4sv9uNBqb+79fgTaPv6xJsOT0dhphNfL3FrME84CbX/D1T9XT8tjFo0IIiw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz";
+        sha512 = "A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==";
       };
     };
     "@webassemblyjs/utf8-1.8.1" = {
@@ -7420,22 +7474,22 @@ let
         sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==";
       };
     };
-    "@webassemblyjs/utf8-1.9.1" = {
-      name = "_at_webassemblyjs_slash_utf8";
-      packageName = "@webassemblyjs/utf8";
-      version = "1.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.1.tgz";
-        sha512 = "llkYtppagjCodFjo0alWOUhAkfOiQPQDIc5oA6C9sFAXz7vC9QhZf/f8ijQIX+A9ToM3c9Pq85X0EX7nx9gVhg==";
-      };
-    };
-    "@webassemblyjs/validation-1.9.1" = {
+    "@webassemblyjs/validation-1.11.0" = {
       name = "_at_webassemblyjs_slash_validation";
       packageName = "@webassemblyjs/validation";
-      version = "1.9.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.9.1.tgz";
-        sha512 = "a/Vh1fKuvuqff0KqA9TYATTyk/FihoVcc5vp4qhXHfKjS4J9BIW548gh5YZ81ZB39yg5TKiApRy8zMRa82Ij/A==";
+        url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.11.0.tgz";
+        sha512 = "0doaNEdjsurs3hUahxqoo3AJKvz+QnsIlkDnmd6nNmlFge3ixCrA7B8Xm6vmNoBPWWZgQ0VhvHV8Qs4768q1pw==";
+      };
+    };
+    "@webassemblyjs/wasm-edit-1.11.0" = {
+      name = "_at_webassemblyjs_slash_wasm-edit";
+      packageName = "@webassemblyjs/wasm-edit";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz";
+        sha512 = "JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==";
       };
     };
     "@webassemblyjs/wasm-edit-1.9.0" = {
@@ -7447,13 +7501,13 @@ let
         sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.9.1" = {
-      name = "_at_webassemblyjs_slash_wasm-edit";
-      packageName = "@webassemblyjs/wasm-edit";
-      version = "1.9.1";
+    "@webassemblyjs/wasm-gen-1.11.0" = {
+      name = "_at_webassemblyjs_slash_wasm-gen";
+      packageName = "@webassemblyjs/wasm-gen";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.1.tgz";
-        sha512 = "S2IaD6+x9B2Xi8BCT0eGsrXXd8UxAh2LVJpg1ZMtHXnrDcsTtIX2bDjHi40Hio6Lc62dWHmKdvksI+MClCYbbw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz";
+        sha512 = "BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==";
       };
     };
     "@webassemblyjs/wasm-gen-1.8.1" = {
@@ -7474,13 +7528,13 @@ let
         sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==";
       };
     };
-    "@webassemblyjs/wasm-gen-1.9.1" = {
-      name = "_at_webassemblyjs_slash_wasm-gen";
-      packageName = "@webassemblyjs/wasm-gen";
-      version = "1.9.1";
+    "@webassemblyjs/wasm-opt-1.11.0" = {
+      name = "_at_webassemblyjs_slash_wasm-opt";
+      packageName = "@webassemblyjs/wasm-opt";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.1.tgz";
-        sha512 = "bqWI0S4lBQsEN5FTZ35vYzfKUJvtjNnBobB1agCALH30xNk1LToZ7Z8eiaR/Z5iVECTlBndoRQV3F6mbEqE/fg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz";
+        sha512 = "tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==";
       };
     };
     "@webassemblyjs/wasm-opt-1.9.0" = {
@@ -7492,13 +7546,13 @@ let
         sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.9.1" = {
-      name = "_at_webassemblyjs_slash_wasm-opt";
-      packageName = "@webassemblyjs/wasm-opt";
-      version = "1.9.1";
+    "@webassemblyjs/wasm-parser-1.11.0" = {
+      name = "_at_webassemblyjs_slash_wasm-parser";
+      packageName = "@webassemblyjs/wasm-parser";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.1.tgz";
-        sha512 = "gSf7I7YWVXZ5c6XqTEqkZjVs8K1kc1k57vsB6KBQscSagDNbAdxt6MwuJoMjsE1yWY1tsuL+pga268A6u+Fdkg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz";
+        sha512 = "6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==";
       };
     };
     "@webassemblyjs/wasm-parser-1.8.1" = {
@@ -7519,13 +7573,13 @@ let
         sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.9.1" = {
-      name = "_at_webassemblyjs_slash_wasm-parser";
-      packageName = "@webassemblyjs/wasm-parser";
-      version = "1.9.1";
+    "@webassemblyjs/wast-parser-1.11.0" = {
+      name = "_at_webassemblyjs_slash_wast-parser";
+      packageName = "@webassemblyjs/wast-parser";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.1.tgz";
-        sha512 = "ImM4N2T1MEIond0MyE3rXvStVxEmivQrDKf/ggfh5pP6EHu3lL/YTAoSrR7shrbKNPpeKpGesW1LIK/L4kqduw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.11.0.tgz";
+        sha512 = "HKFbg+HvjITWuOOWehS2EUdNZ4fsfWislwDTrxuUL6FpzrjtsASd2c4hmqNSW6c7sv5iBx1puUWwNtVqLXxFqw==";
       };
     };
     "@webassemblyjs/wast-parser-1.8.1" = {
@@ -7546,13 +7600,13 @@ let
         sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==";
       };
     };
-    "@webassemblyjs/wast-parser-1.9.1" = {
-      name = "_at_webassemblyjs_slash_wast-parser";
-      packageName = "@webassemblyjs/wast-parser";
-      version = "1.9.1";
+    "@webassemblyjs/wast-printer-1.11.0" = {
+      name = "_at_webassemblyjs_slash_wast-printer";
+      packageName = "@webassemblyjs/wast-printer";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.1.tgz";
-        sha512 = "2xVxejXSvj3ls/o2TR/zI6p28qsGupjHhnHL6URULQRcXmryn3w7G83jQMcT7PHqUfyle65fZtWLukfdLdE7qw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz";
+        sha512 = "Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==";
       };
     };
     "@webassemblyjs/wast-printer-1.8.1" = {
@@ -7573,13 +7627,13 @@ let
         sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==";
       };
     };
-    "@webassemblyjs/wast-printer-1.9.1" = {
-      name = "_at_webassemblyjs_slash_wast-printer";
-      packageName = "@webassemblyjs/wast-printer";
-      version = "1.9.1";
+    "@webpack-cli/configtest-1.0.0" = {
+      name = "_at_webpack-cli_slash_configtest";
+      packageName = "@webpack-cli/configtest";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.1.tgz";
-        sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w==";
+        url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.0.tgz";
+        sha512 = "Un0SdBoN1h4ACnIO7EiCjWuyhNI0Jl96JC+63q6xi4HDUYRZn8Auluea9D+v9NWKc5J4sICVEltdBaVjLX39xw==";
       };
     };
     "@webpack-cli/info-1.2.1" = {
@@ -7591,13 +7645,13 @@ let
         sha512 = "fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ==";
       };
     };
-    "@webpack-cli/serve-1.2.1" = {
+    "@webpack-cli/serve-1.2.2" = {
       name = "_at_webpack-cli_slash_serve";
       packageName = "@webpack-cli/serve";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.1.tgz";
-        sha512 = "Zj1z6AyS+vqV6Hfi7ngCjFGdHV5EwZNIHo6QfFTNe9PyW+zBU1zJ9BiOW1pmUEq950RC4+Dym6flyA/61/vhyw==";
+        url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.2.tgz";
+        sha512 = "03GkWxcgFfm8+WIwcsqJb9agrSDNDDoxaNnexPnCCexP5SCE4IgFd9lNpSy+K2nFqVMpgTFw6SwbmVAVTndVew==";
       };
     };
     "@wry/context-0.4.4" = {
@@ -7780,15 +7834,6 @@ let
         sha1 = "c22822f87e1c939f579887504d9c109c4173829d";
       };
     };
-    "abstract-leveldown-0.12.4" = {
-      name = "abstract-leveldown";
-      packageName = "abstract-leveldown";
-      version = "0.12.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz";
-        sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
-      };
-    };
     "abstract-leveldown-6.0.3" = {
       name = "abstract-leveldown";
       packageName = "abstract-leveldown";
@@ -8086,6 +8131,15 @@ let
         sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==";
       };
     };
+    "adm-zip-0.5.1" = {
+      name = "adm-zip";
+      packageName = "adm-zip";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.1.tgz";
+        sha512 = "a5ABmIFUJ9OxHV5zrXM9Q41JzpRIflFtdgpL4UQM9DsTHHxQzPRaeyAdnMW7kxL0NRWm/NHafJdj6pO+ty7L2g==";
+      };
+    };
     "adverb-where-0.0.9" = {
       name = "adverb-where";
       packageName = "adverb-where";
@@ -8797,13 +8851,13 @@ let
         sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw==";
       };
     };
-    "apollo-2.32.0" = {
+    "apollo-2.32.1" = {
       name = "apollo";
       packageName = "apollo";
-      version = "2.32.0";
+      version = "2.32.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo/-/apollo-2.32.0.tgz";
-        sha512 = "6Wmt9OUYUET3JSQvAS6qgNP+vomf3P5zANARXDhqJ59c0/hAsXhdAvGaFFba+JhRRvyIVBOmaOpB880aNZeadg==";
+        url = "https://registry.npmjs.org/apollo/-/apollo-2.32.1.tgz";
+        sha512 = "aSjGnxxm+ZZ6uYTuGrBqtQ4e3boG408K16CbB5Zm/QHCRNHpPUz7r9VRDfAJWMFE1mBdWi+r0dyY+7FUkKeRrw==";
       };
     };
     "apollo-cache-1.3.5" = {
@@ -8815,13 +8869,13 @@ let
         sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA==";
       };
     };
-    "apollo-cache-control-0.11.5" = {
+    "apollo-cache-control-0.11.6" = {
       name = "apollo-cache-control";
       packageName = "apollo-cache-control";
-      version = "0.11.5";
+      version = "0.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.5.tgz";
-        sha512 = "jvarfQhwDRazpOsmkt5Pd7qGFrtbL70zMbUZGqDhJSYpfqI672f7bXXc7O3vtpbD3qnS3XTBvK2kspX/Bdo0IA==";
+        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.6.tgz";
+        sha512 = "YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw==";
       };
     };
     "apollo-cache-inmemory-1.6.6" = {
@@ -8842,58 +8896,58 @@ let
         sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA==";
       };
     };
-    "apollo-codegen-core-0.39.0" = {
+    "apollo-codegen-core-0.39.1" = {
       name = "apollo-codegen-core";
       packageName = "apollo-codegen-core";
-      version = "0.39.0";
+      version = "0.39.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.0.tgz";
-        sha512 = "b+RD8jerDMih2vf73hodOQAx4UODy1l053/Mdr4uIBlDbaF6OA4Q8TbTbH4k7tDzyAoL2pjH5v8AtlU8viIKwg==";
+        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.1.tgz";
+        sha512 = "8Sb9CN+lYR2BMeg7p3A4wjsQW7oxDTnKbueUHV/fmZU+hg2GNLXqVTdyWE2UWDEOyDTNpQMyysGEUZZBsOmBrw==";
       };
     };
-    "apollo-codegen-flow-0.37.0" = {
+    "apollo-codegen-flow-0.37.1" = {
       name = "apollo-codegen-flow";
       packageName = "apollo-codegen-flow";
-      version = "0.37.0";
+      version = "0.37.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.0.tgz";
-        sha512 = "VWB++9ObUQx+Y1JPdgrkdkjPichsgXhYfz5w5HSKvare7SlkxEZFOzSXi9/bUAC3gry3B/38do1srDHtXZ366g==";
+        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.1.tgz";
+        sha512 = "XhGUzlBxi3IHCBbIsnfk0c41mz30Ky1SPSYtJzrMdtMAdUAfMEGBLXzlLqgp1iAbUegQ10zbp2kgzLG0hkeYhg==";
       };
     };
-    "apollo-codegen-scala-0.38.0" = {
+    "apollo-codegen-scala-0.38.1" = {
       name = "apollo-codegen-scala";
       packageName = "apollo-codegen-scala";
-      version = "0.38.0";
+      version = "0.38.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.0.tgz";
-        sha512 = "oQAV65ZGaFGeNpxVVnZLh2kyBKfA6QzSeyosDp0HKxeXOGQ84dHJg1zGiN0oWXELBM2MqPtwWSGFYgnk3CNeHg==";
+        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.1.tgz";
+        sha512 = "WvIX6Gm7KHnh6FJzq/XVRyHMNwwbQEnMfRXpR9zFtaUuzZHfg9RNawtsUGMSQCnNw1sm5YLGIJvNFUp1hUEqGA==";
       };
     };
-    "apollo-codegen-swift-0.39.0" = {
+    "apollo-codegen-swift-0.39.1" = {
       name = "apollo-codegen-swift";
       packageName = "apollo-codegen-swift";
-      version = "0.39.0";
+      version = "0.39.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.0.tgz";
-        sha512 = "fFaR8g62jjYS6QFW354ONcMHJNesy5EtCvYKsR9Sb1eBoLTx/6NkeMiGO28PIIk7bEw7FKMrzQE2UVNSeZbMxQ==";
+        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.1.tgz";
+        sha512 = "dKqDd2w2YAOkyDbDkJ5etXLdn8foNnm55r5rsIssIxCdtdR5qsusrPHQvywVjHw8ZHBy4o229dVoSzmrIUygKg==";
       };
     };
-    "apollo-codegen-typescript-0.39.0" = {
+    "apollo-codegen-typescript-0.39.1" = {
       name = "apollo-codegen-typescript";
       packageName = "apollo-codegen-typescript";
-      version = "0.39.0";
+      version = "0.39.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.0.tgz";
-        sha512 = "/clemyhTd+s+b4HoMa72zjWir4QrDqjcN4tnSpQYXSsOFO4e4kWlxSj0zrtyYkcx/Gqod9UrPSSsx2CZHyB37A==";
+        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.1.tgz";
+        sha512 = "cSnMrAqyK2AMZRxTsBrZZhemfv87AU0OS1/aM45WQRyQurkEjf8GmWMfp2IRkJo9m+jgdo74X5ct3KZOXbYMXg==";
       };
     };
-    "apollo-datasource-0.7.2" = {
+    "apollo-datasource-0.7.3" = {
       name = "apollo-datasource";
       packageName = "apollo-datasource";
-      version = "0.7.2";
+      version = "0.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz";
-        sha512 = "ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw==";
+        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.3.tgz";
+        sha512 = "PE0ucdZYjHjUyXrFWRwT02yLcx2DACsZ0jm1Mp/0m/I9nZu/fEkvJxfsryXB6JndpmQO77gQHixf/xGCN976kA==";
       };
     };
     "apollo-env-0.6.5" = {
@@ -9013,22 +9067,22 @@ let
         sha512 = "WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw==";
       };
     };
-    "apollo-server-caching-0.5.2" = {
+    "apollo-server-caching-0.5.3" = {
       name = "apollo-server-caching";
       packageName = "apollo-server-caching";
-      version = "0.5.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz";
-        sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==";
+        url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz";
+        sha512 = "iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ==";
       };
     };
-    "apollo-server-core-2.19.1" = {
+    "apollo-server-core-2.19.2" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.19.1";
+      version = "2.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.1.tgz";
-        sha512 = "5EVmcY8Ij7Ywwu+Ze4VaUhZBcxl8t5ztcSatJrKMd4HYlEHyaNGBV2itfpyqAthxfdMbGKqlpeCHmTGSqDcNpA==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.2.tgz";
+        sha512 = "liLgLhTIGWZtdQbxuxo3/Yv8j+faKQcI60kOL+uwfByGhoKLZEQp5nqi2IdMK6JXt1VuyKwKu7lTzj02a9S3jA==";
       };
     };
     "apollo-server-env-2.4.5" = {
@@ -9040,6 +9094,15 @@ let
         sha512 = "nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==";
       };
     };
+    "apollo-server-env-3.0.0" = {
+      name = "apollo-server-env";
+      packageName = "apollo-server-env";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.0.0.tgz";
+        sha512 = "tPSN+VttnPsoQAl/SBVUpGbLA97MXG990XIwq6YUnJyAixrrsjW1xYG7RlaOqetxm80y5mBZKLrRDiiSsW/vog==";
+      };
+    };
     "apollo-server-errors-2.4.2" = {
       name = "apollo-server-errors";
       packageName = "apollo-server-errors";
@@ -9049,40 +9112,40 @@ let
         sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ==";
       };
     };
-    "apollo-server-express-2.19.1" = {
+    "apollo-server-express-2.19.2" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.19.1";
+      version = "2.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.1.tgz";
-        sha512 = "PJQmPtV3JD7RiV6cP7JcqAwVdUq6hWUtvDIoCOxPoeUWYf79nEF4WiYsPXVF0+meLLWKlL1fuSwEEt1CEHEG5w==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.2.tgz";
+        sha512 = "1v2H6BgDkS4QzRbJ9djn2o0yv5m/filbpiupxAsCG9f+sAoSlY3eYSj84Sbex2r5+4itAvT9y84WI7d9RBYs/Q==";
       };
     };
-    "apollo-server-plugin-base-0.10.3" = {
+    "apollo-server-plugin-base-0.10.4" = {
       name = "apollo-server-plugin-base";
       packageName = "apollo-server-plugin-base";
-      version = "0.10.3";
+      version = "0.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.3.tgz";
-        sha512 = "NCLOsk9Jsd8oLvefkQvROdMDQvnHnzbzz3MPCqEYjCOEv0YBM8T77D0wCwbcViDS2M5p0W6un2ub9s/vU71f7Q==";
+        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.4.tgz";
+        sha512 = "HRhbyHgHFTLP0ImubQObYhSgpmVH4Rk1BinnceZmwudIVLKrqayIVOELdyext/QnSmmzg5W7vF3NLGBcVGMqDg==";
       };
     };
-    "apollo-server-types-0.6.2" = {
+    "apollo-server-types-0.6.3" = {
       name = "apollo-server-types";
       packageName = "apollo-server-types";
-      version = "0.6.2";
+      version = "0.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.2.tgz";
-        sha512 = "LgSKgAStiDzpUSLYwJoAmy0W8nkxx/ExMmgEPgEYVi6dKPkUmtu561J970PhGdYH+D79ke3g87D+plkUkgfnlQ==";
+        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz";
+        sha512 = "aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==";
       };
     };
-    "apollo-tracing-0.12.1" = {
+    "apollo-tracing-0.12.2" = {
       name = "apollo-tracing";
       packageName = "apollo-tracing";
-      version = "0.12.1";
+      version = "0.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.1.tgz";
-        sha512 = "qdkUjW+pOaidGOSITypeYE288y28HkPmGNpUtyQSOeTxgqXHtQX3TDWiOJ2SmrLH08xdSwfvz9o5KrTq4PdISg==";
+        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.2.tgz";
+        sha512 = "SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w==";
       };
     };
     "apollo-upload-client-11.0.0" = {
@@ -9229,13 +9292,13 @@ let
         sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg==";
       };
     };
-    "archiver-5.1.0" = {
+    "archiver-5.2.0" = {
       name = "archiver";
       packageName = "archiver";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/archiver/-/archiver-5.1.0.tgz";
-        sha512 = "iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA==";
+        url = "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz";
+        sha512 = "QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ==";
       };
     };
     "archiver-utils-2.1.0" = {
@@ -10174,13 +10237,13 @@ let
         sha512 = "zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw==";
       };
     };
-    "async-mutex-0.2.4" = {
+    "async-mutex-0.2.6" = {
       name = "async-mutex";
       packageName = "async-mutex";
-      version = "0.2.4";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.4.tgz";
-        sha512 = "fcQKOXUKMQc57JlmjBCHtkKNrfGpHyR7vu18RfuLfeTAf4hK9PgOadPR5cDrBQ682zasrLUhJFe7EKAHJOduDg==";
+        url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.6.tgz";
+        sha512 = "Hs4R+4SPgamu6rSGW8C7cV9gaWUKEHykfzCCvIRuaVv636Ju10ZdeUbvb4TBEW0INuq2DHZqXbK4Nd3yG4RaRw==";
       };
     };
     "async-retry-1.3.1" = {
@@ -10399,13 +10462,13 @@ let
         sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
       };
     };
-    "aws-sdk-2.821.0" = {
+    "aws-sdk-2.830.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.821.0";
+      version = "2.830.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.821.0.tgz";
-        sha512 = "UtUlURMzmns1Wq8uAdJcyKsm/nW7iRYgTQEONQIpud0xwtjpPPR1pBFB0RSNZuYnZxcWboo807+jxq+LjaBEKA==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.830.0.tgz";
+        sha512 = "vFatoWkdJmRzpymWbqsuwVsAJdhdAvU2JcM9jKRENTNKJw90ljnLyeP1eKCp4O3/4Lg43PVBwY/KUqPy4wL+OA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -10444,15 +10507,6 @@ let
         sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d";
       };
     };
-    "axios-0.18.1" = {
-      name = "axios";
-      packageName = "axios";
-      version = "0.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz";
-        sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==";
-      };
-    };
     "axios-0.19.0" = {
       name = "axios";
       packageName = "axios";
@@ -10471,6 +10525,15 @@ let
         sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
       };
     };
+    "axios-0.21.1" = {
+      name = "axios";
+      packageName = "axios";
+      version = "0.21.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
+        sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
+      };
+    };
     "axios-retry-3.1.9" = {
       name = "axios-retry";
       packageName = "axios-retry";
@@ -11155,15 +11218,6 @@ let
         sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
       };
     };
-    "base64-js-1.3.1" = {
-      name = "base64-js";
-      packageName = "base64-js";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
-        sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
-      };
-    };
     "base64-js-1.5.1" = {
       name = "base64-js";
       packageName = "base64-js";
@@ -11587,13 +11641,13 @@ let
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
-    "binary-extensions-2.1.0" = {
+    "binary-extensions-2.2.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
-        sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
+        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
       };
     };
     "binary-search-1.3.6" = {
@@ -11803,15 +11857,6 @@ let
         sha512 = "5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg==";
       };
     };
-    "bl-0.8.2" = {
-      name = "bl";
-      packageName = "bl";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
-        sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
-      };
-    };
     "bl-1.2.3" = {
       name = "bl";
       packageName = "bl";
@@ -11884,13 +11929,13 @@ let
         sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
       };
     };
-    "blessed-contrib-4.8.20" = {
+    "blessed-contrib-4.8.21" = {
       name = "blessed-contrib";
       packageName = "blessed-contrib";
-      version = "4.8.20";
+      version = "4.8.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.20.tgz";
-        sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ==";
+        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.21.tgz";
+        sha512 = "zdQMO3UyfhdG0S+Zqn7YexI6BHlnO26qxBKc9jzgyZdIoq7nELiGM/V89CvrTPblZGQr3eMUqCy7pxlKm3vCYA==";
       };
     };
     "blgr-0.1.8" = {
@@ -12190,13 +12235,13 @@ let
         sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812";
       };
     };
-    "bower-1.8.8" = {
+    "bower-1.8.12" = {
       name = "bower";
       packageName = "bower";
-      version = "1.8.8";
+      version = "1.8.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz";
-        sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A==";
+        url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz";
+        sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q==";
       };
     };
     "bower-endpoint-parser-0.2.1" = {
@@ -12262,6 +12307,15 @@ let
         sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==";
       };
     };
+    "boxen-5.0.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-5.0.0.tgz";
+        sha512 = "5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA==";
+      };
+    };
     "bplist-creator-0.0.6" = {
       name = "bplist-creator";
       packageName = "bplist-creator";
@@ -12478,15 +12532,6 @@ let
         sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
       };
     };
-    "browserify-fs-1.0.0" = {
-      name = "browserify-fs";
-      packageName = "browserify-fs";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-fs/-/browserify-fs-1.0.0.tgz";
-        sha1 = "f075aa8a729d4d1716d066620e386fcc1311a96f";
-      };
-    };
     "browserify-incremental-3.1.1" = {
       name = "browserify-incremental";
       packageName = "browserify-incremental";
@@ -12559,13 +12604,13 @@ let
         sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
       };
     };
-    "browserslist-4.16.0" = {
+    "browserslist-4.16.1" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.16.0";
+      version = "4.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz";
-        sha512 = "/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz";
+        sha512 = "UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==";
       };
     };
     "brq-0.1.8" = {
@@ -13045,6 +13090,15 @@ let
         sha512 = "LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg==";
       };
     };
+    "bunyan-1.8.15" = {
+      name = "bunyan";
+      packageName = "bunyan";
+      version = "1.8.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz";
+        sha512 = "0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==";
+      };
+    };
     "bunyan-syslog-udp-0.2.0" = {
       name = "bunyan-syslog-udp";
       packageName = "bunyan-syslog-udp";
@@ -13279,13 +13333,13 @@ let
         sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==";
       };
     };
-    "call-bind-1.0.0" = {
+    "call-bind-1.0.2" = {
       name = "call-bind";
       packageName = "call-bind";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
-        sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
+        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
       };
     };
     "call-me-maybe-1.0.1" = {
@@ -13513,13 +13567,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001173" = {
+    "caniuse-lite-1.0.30001179" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001173";
+      version = "1.0.30001179";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz";
-        sha512 = "R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz";
+        sha512 = "blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==";
       };
     };
     "canvas-2.6.1" = {
@@ -13639,22 +13693,22 @@ let
         sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==";
       };
     };
-    "cdk8s-1.0.0-beta.5" = {
+    "cdk8s-1.0.0-beta.6" = {
       name = "cdk8s";
       packageName = "cdk8s";
-      version = "1.0.0-beta.5";
+      version = "1.0.0-beta.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.5.tgz";
-        sha512 = "E4l89rGnMI+OCdVojw0vV9xjkNgk9qMswkWc10hZLwwozhnx3ITMVgyjlRiZnCBIKMnKYY8ZhyMgEGgSVpR5fw==";
+        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.6.tgz";
+        sha512 = "L/J8c7/wSEY2POx5j9SnxxgEJ7V7mFYS3F9pGj2idUfj4GCHbMLCGXQ8bAPzaiWOFSEDVMOPBOangLEia+5RBw==";
       };
     };
-    "cdktf-0.0.19" = {
+    "cdktf-0.1.0" = {
       name = "cdktf";
       packageName = "cdktf";
-      version = "0.0.19";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdktf/-/cdktf-0.0.19.tgz";
-        sha512 = "fBOl+yqMdMNRGNvLwAxOpE38PxHJG5Tdi/3J/Ag+KJwaDEXa/v5+ogwPxNtZ0dUdvZq2ovti9zbhdIPr59BvYQ==";
+        url = "https://registry.npmjs.org/cdktf/-/cdktf-0.1.0.tgz";
+        sha512 = "6PKMz7dkou3qrHD+rnj7fa8U+XujkRUVHsWcVaH7faCxBCIGSxUz0TFb8KeY//o0MHg285Agt1NTCgFIpJ7Clg==";
       };
     };
     "center-align-0.1.3" = {
@@ -14080,6 +14134,15 @@ let
         sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
       };
     };
+    "chokidar-3.5.1" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "3.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz";
+        sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==";
+      };
+    };
     "chownr-0.0.2" = {
       name = "chownr";
       packageName = "chownr";
@@ -14773,15 +14836,6 @@ let
         sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
       };
     };
-    "clone-0.1.19" = {
-      name = "clone";
-      packageName = "clone";
-      version = "0.1.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz";
-        sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85";
-      };
-    };
     "clone-0.1.5" = {
       name = "clone";
       packageName = "clone";
@@ -15070,13 +15124,13 @@ let
         sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg==";
       };
     };
-    "codemaker-1.16.0" = {
+    "codemaker-1.17.1" = {
       name = "codemaker";
       packageName = "codemaker";
-      version = "1.16.0";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/codemaker/-/codemaker-1.16.0.tgz";
-        sha512 = "kC53r6ACRGYcSAKeOcbcUhWZYWynIuBIQ50oLOYUygShjrqF0NO303eSvOzT0Qxaz2TQWI2deUwJBMm3s8HoZg==";
+        url = "https://registry.npmjs.org/codemaker/-/codemaker-1.17.1.tgz";
+        sha512 = "V0oeZjQ0nZgpFErZPn66sVCHwrDvivS+M0xR1gesBNGDpE4ROja6IJXbPVVg/N3S4kYHAXcYuWHdfiEQE2PfwA==";
       };
     };
     "codepage-1.4.0" = {
@@ -15592,6 +15646,15 @@ let
         sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
       };
     };
+    "commander-7.0.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz";
+        sha512 = "ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==";
+      };
+    };
     "commandpost-1.4.0" = {
       name = "commandpost";
       packageName = "commandpost";
@@ -16096,13 +16159,13 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "constructs-3.2.94" = {
+    "constructs-3.2.112" = {
       name = "constructs";
       packageName = "constructs";
-      version = "3.2.94";
+      version = "3.2.112";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-3.2.94.tgz";
-        sha512 = "yK4FKT+hONiC0ebCM0Ln3xuLPF4WPyZSQ8Sl/ZOTTFUI+/csBBxGy7TkY2ZVTbOi7MCHUatZgW2ANsYRaaxoOQ==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-3.2.112.tgz";
+        sha512 = "FwhMxwCn5/fl3hig1go1BpVV3klkMCjhGjfjxb+qZe1/S82Nm5TRNsU3A+03+8kXFmt6Ldsao+yO3TPedSROwQ==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -16583,22 +16646,22 @@ let
         sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==";
       };
     };
-    "core-js-3.8.2" = {
+    "core-js-3.8.3" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.8.2";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz";
-        sha512 = "FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz";
+        sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==";
       };
     };
-    "core-js-compat-3.8.2" = {
+    "core-js-compat-3.8.3" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.8.2";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz";
-        sha512 = "LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz";
+        sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -18275,13 +18338,13 @@ let
         sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==";
       };
     };
-    "dayjs-1.10.1" = {
+    "dayjs-1.10.3" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.10.1";
+      version = "1.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.1.tgz";
-        sha512 = "2xg7JrHQeLBQFkvTumLoy62x1siyeocc98QwjtURgvRqOPYmAkMUdmSjrOA+MlmL6QMQn5MUhDf6rNZNuPc1LQ==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.3.tgz";
+        sha512 = "/2fdLN987N8Ki7Id8BUN2nhuiRyxTLumQnSQf9CNncFCyqFsSKb9TNhzRYcC8K8eJSJOKvbvkImo/MKKhNi4iw==";
       };
     };
     "dayjs-1.8.36" = {
@@ -18896,15 +18959,6 @@ let
         sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A==";
       };
     };
-    "deferred-leveldown-0.2.0" = {
-      name = "deferred-leveldown";
-      packageName = "deferred-leveldown";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz";
-        sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
-      };
-    };
     "deferred-leveldown-5.3.0" = {
       name = "deferred-leveldown";
       packageName = "deferred-leveldown";
@@ -19076,15 +19130,6 @@ let
         sha1 = "3a36287f5034e699e7577901052c2e6c94251631";
       };
     };
-    "denque-1.4.1" = {
-      name = "denque";
-      packageName = "denque";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
-        sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==";
-      };
-    };
     "denque-1.5.0" = {
       name = "denque";
       packageName = "denque";
@@ -19778,22 +19823,22 @@ let
         sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ==";
       };
     };
-    "dockerfile-language-service-0.1.1" = {
+    "dockerfile-language-service-0.2.0" = {
       name = "dockerfile-language-service";
       packageName = "dockerfile-language-service";
-      version = "0.1.1";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.1.1.tgz";
-        sha512 = "Lw4QlxJoy9F1559wxX+0xe5iSNK95Fbzx/YhdmAzfwgbPvdPzvFouIuuMyMPj/Q5JyFH1QAr7VeagOe24w0cqg==";
+        url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.2.0.tgz";
+        sha512 = "Y1JYIDF8F78kNDwyoQoeAPzptJRubIaMJ5q4mATmeDViGVV+mY4m6BjHqw5XtlkHEftljgqMNDvbUORUDIzTHg==";
       };
     };
-    "dockerfile-utils-0.1.1" = {
+    "dockerfile-utils-0.2.0" = {
       name = "dockerfile-utils";
       packageName = "dockerfile-utils";
-      version = "0.1.1";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.1.1.tgz";
-        sha512 = "ddAA8PCAcT4pBQ1AFRnPjetJ31/7BqNKLHQkZebNE0hBAiOr8SzrnIWvJUcBDHrVbASCVl1Ye37hbaTsUmYHsw==";
+        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.2.0.tgz";
+        sha512 = "B8tEGwLd3w0dWALshXS0gkAwDYdqFKAKm9zIyp/nCFkx8+BOhbz5CiAFlVU+WRvv6kd6AP/YtYVOzSL54MJlmQ==";
       };
     };
     "doctrine-2.1.0" = {
@@ -20498,13 +20543,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.634" = {
+    "electron-to-chromium-1.3.642" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.634";
+      version = "1.3.642";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.634.tgz";
-        sha512 = "QPrWNYeE/A0xRvl/QP3E0nkaEvYUvH3gM04ZWYtIa6QlSpEetRlRI1xvQ7hiMIySHHEV+mwDSX8Kj4YZY6ZQAw==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz";
+        sha512 = "cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -20586,7 +20631,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         name = "emitter-1.0.1.tar.gz";
-        url = https://codeload.github.com/component/emitter/tar.gz/1.0.1;
+        url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1";
         sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
       };
     };
@@ -20842,6 +20887,15 @@ let
         sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA==";
       };
     };
+    "engine.io-4.1.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.0.tgz";
+        sha512 = "vW7EAtn0HDQ4MtT5QbmCHF17TaYLONv2/JwdYsq9USPRZVM4zG7WB3k0Nc321z8EuSOlhGokrYlYx4176QhD0A==";
+      };
+    };
     "engine.io-client-1.3.1" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -20905,22 +20959,22 @@ let
         sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359";
       };
     };
-    "enhanced-resolve-4.3.0" = {
+    "enhanced-resolve-4.5.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "4.3.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz";
-        sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz";
+        sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==";
       };
     };
-    "enhanced-resolve-5.4.1" = {
+    "enhanced-resolve-5.7.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "5.4.1";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.4.1.tgz";
-        sha512 = "4GbyIMzYktTFoRSmkbgZ1LU+RXwf4AQ8Z+rSuuh1dC8plp0PPeaWvx6+G4hh4KnUJ48VoxKbNyA1QQQIUpXjYA==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz";
+        sha512 = "6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==";
       };
     };
     "enquirer-2.3.6" = {
@@ -21166,13 +21220,13 @@ let
         sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==";
       };
     };
-    "es-abstract-1.18.0-next.1" = {
+    "es-abstract-1.18.0-next.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.18.0-next.1";
+      version = "1.18.0-next.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz";
-        sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
+        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
       };
     };
     "es-get-iterator-1.1.1" = {
@@ -21184,6 +21238,15 @@ let
         sha512 = "qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw==";
       };
     };
+    "es-module-lexer-0.3.26" = {
+      name = "es-module-lexer";
+      packageName = "es-module-lexer";
+      version = "0.3.26";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.3.26.tgz";
+        sha512 = "Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA==";
+      };
+    };
     "es-to-primitive-1.2.1" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
@@ -21526,13 +21589,13 @@ let
         sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
       };
     };
-    "eslint-7.17.0" = {
+    "eslint-7.18.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.17.0";
+      version = "7.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz";
-        sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz";
+        sha512 = "fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==";
       };
     };
     "eslint-plugin-no-unsanitized-3.1.4" = {
@@ -22498,13 +22561,13 @@ let
         sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ==";
       };
     };
-    "express-openapi-7.2.0" = {
+    "express-openapi-7.2.3" = {
       name = "express-openapi";
       packageName = "express-openapi";
-      version = "7.2.0";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.2.0.tgz";
-        sha512 = "Zlz1qA5DA5vRj8UrWFNH5cA1js5g0VB5yRIR1cuxPGAclsU8q7Y6Dvx/BhQ10/OGYd8qwFk4mFvDYahSEQe7gw==";
+        url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.2.3.tgz";
+        sha512 = "j79aEXtTKJ6yp5XM+YPGn14GOaODGovDbvuCJzrG0KbaIB2v0liq9ezpvufqsb5ixXZ3jsu+B2FuJJOvUUjW2Q==";
       };
     };
     "express-session-1.17.1" = {
@@ -22885,13 +22948,13 @@ let
         sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==";
       };
     };
-    "fast-glob-3.2.4" = {
+    "fast-glob-3.2.5" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.4";
+      version = "3.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz";
-        sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
+        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
       };
     };
     "fast-json-parse-1.0.3" = {
@@ -23786,13 +23849,13 @@ let
         sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
       };
     };
-    "flatted-3.1.0" = {
+    "flatted-3.1.1" = {
       name = "flatted";
       packageName = "flatted";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz";
-        sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==";
+        url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz";
+        sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==";
       };
     };
     "flatten-0.0.1" = {
@@ -23822,13 +23885,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.141.0" = {
+    "flow-parser-0.143.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.141.0";
+      version = "0.143.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.141.0.tgz";
-        sha512 = "WKdBiR9sDfkgEyPGhIgldUrVM08D57CgHLgd0FOXbhcVYXNfw+eHSApQ8SdcdQQoqrOvhlcVRB8lsn9bD5GQOw==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.143.0.tgz";
+        sha512 = "PCKiRLALyu/L7b8vN63TCgvpV+vZJVAijPna2SAsSjzDDvQryZjiQMGUIEbbkpGpWVjEtQqyImBK7vSK49ufMg==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -23930,13 +23993,13 @@ let
         sha512 = "uPTT5I26ePMc6Xhjebu1aiaHAd7P3EqyE9SZB6B9ZIvXtMXhFYNk7iO1yzh1ZXp3aYzdYmrI9k8mSz9urZ9gNQ==";
       };
     };
-    "flumeview-reduce-1.3.17" = {
+    "flumeview-reduce-1.4.0" = {
       name = "flumeview-reduce";
       packageName = "flumeview-reduce";
-      version = "1.3.17";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.17.tgz";
-        sha512 = "Li09TntlRpN51GtFKllIh5nDdBcyDazvi5a/yvbdUCS9xAFb8OA6H6uu32W9gG+4GyvfUi9AsOyN8RQ8OcREQA==";
+        url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.4.0.tgz";
+        sha512 = "ShCMtY5YZl3icnUAWTfwzRXSGN1AUo4Isj1wTRLpMMNgM9p1T0gc6N+r1ajampf1GO19SkqrgZHdPPOaEitvhg==";
       };
     };
     "flush-write-stream-1.1.1" = {
@@ -24506,6 +24569,15 @@ let
         sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==";
       };
     };
+    "fs-extra-9.1.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "9.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz";
+        sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==";
+      };
+    };
     "fs-minipass-1.2.7" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
@@ -24713,13 +24785,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "fuse.js-6.4.5" = {
+    "fuse.js-6.4.6" = {
       name = "fuse.js";
       packageName = "fuse.js";
-      version = "6.4.5";
+      version = "6.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.5.tgz";
-        sha512 = "AIHjOhexWVqs/jWqun6jTUfdXB3Bm1uShoirHvTZImD2kHEQZ1zOmoDEqIPs8N1LnnwXJeG0T+r9ilEeJzlaoA==";
+        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.6.tgz";
+        sha512 = "/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw==";
       };
     };
     "fuzzy-0.1.3" = {
@@ -24749,15 +24821,6 @@ let
         sha1 = "979e22f9451b4b38f051f7937c919dbacc692958";
       };
     };
-    "fwd-stream-1.0.4" = {
-      name = "fwd-stream";
-      packageName = "fwd-stream";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz";
-        sha1 = "ed281cabed46feecf921ee32dc4c50b372ac7cfa";
-      };
-    };
     "fx-runner-1.0.13" = {
       name = "fx-runner";
       packageName = "fx-runner";
@@ -24893,13 +24956,13 @@ let
         sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
       };
     };
-    "geoip-country-4.0.49" = {
+    "geoip-country-4.0.52" = {
       name = "geoip-country";
       packageName = "geoip-country";
-      version = "4.0.49";
+      version = "4.0.52";
       src = fetchurl {
-        url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.49.tgz";
-        sha512 = "oeiRP6aiDBplorW2tl0Rm2k6iNlqrLI9Smn9lk4yBUSsMOqeUHqI7gXBKP59iMZqWq2emclX1IfJL665FX7btQ==";
+        url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.52.tgz";
+        sha512 = "sJQR7peegqkHNOVTk6IFiVDHNor48jdHA/RGvsCkV041TBZmImqV1ixf/0BohpgIIS+O5h/Iu6XatGBEpszigA==";
       };
     };
     "get-amd-module-type-3.0.0" = {
@@ -25343,15 +25406,6 @@ let
         sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ==";
       };
     };
-    "git-url-parse-11.4.0" = {
-      name = "git-url-parse";
-      packageName = "git-url-parse";
-      version = "11.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.0.tgz";
-        sha512 = "KlIa5jvMYLjXMQXkqpFzobsyD/V2K5DRHl5OAf+6oDFPlPLxrGDVQlIdI63c4/Kt6kai4kALENSALlzTGST3GQ==";
-      };
-    };
     "git-url-parse-11.4.3" = {
       name = "git-url-parse";
       packageName = "git-url-parse";
@@ -25637,7 +25691,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         name = "global-2.0.1.tar.gz";
-        url = https://codeload.github.com/component/global/tar.gz/v2.0.1;
+        url = "https://codeload.github.com/component/global/tar.gz/v2.0.1";
         sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785";
       };
     };
@@ -25776,6 +25830,15 @@ let
         sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==";
       };
     };
+    "globby-11.0.2" = {
+      name = "globby";
+      packageName = "globby";
+      version = "11.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz";
+        sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==";
+      };
+    };
     "globby-4.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -25884,13 +25947,13 @@ let
         sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
       };
     };
-    "google-auth-library-6.1.3" = {
+    "google-auth-library-6.1.4" = {
       name = "google-auth-library";
       packageName = "google-auth-library";
-      version = "6.1.3";
+      version = "6.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.3.tgz";
-        sha512 = "m9mwvY3GWbr7ZYEbl61isWmk+fvTmOt0YNUfPOUY2VH8K5pZlAIWJjxEi0PqR3OjMretyiQLI6GURMrPSwHQ2g==";
+        url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.4.tgz";
+        sha512 = "q0kYtGWnDd9XquwiQGAZeI2Jnglk7NDi0cChE4tWp6Kpo/kbqnt9scJb0HP+/xqt03Beqw/xQah1OPrci+pOxw==";
       };
     };
     "google-closure-compiler-js-20170910.0.1" = {
@@ -25902,13 +25965,13 @@ let
         sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew==";
       };
     };
-    "google-gax-2.9.2" = {
+    "google-gax-2.10.0" = {
       name = "google-gax";
       packageName = "google-gax";
-      version = "2.9.2";
+      version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/google-gax/-/google-gax-2.9.2.tgz";
-        sha512 = "Pve4osEzNKpBZqFXMfGKBbKCtgnHpUe5IQMh5Ou+Xtg8nLcba94L3gF0xgM5phMdGRRqJn0SMjcuEVmOYu7EBg==";
+        url = "https://registry.npmjs.org/google-gax/-/google-gax-2.10.0.tgz";
+        sha512 = "K+1JK5ofNl5k30LsI8UQb/DeLMEbhL/SWirCx0L9pnMcApSfAjRAO7yajXT5X1vicxDBnNSwKs+cu4elxpYraw==";
       };
     };
     "google-p12-pem-3.0.3" = {
@@ -26172,13 +26235,13 @@ let
         sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g==";
       };
     };
-    "graphql-extensions-0.12.7" = {
+    "graphql-extensions-0.12.8" = {
       name = "graphql-extensions";
       packageName = "graphql-extensions";
-      version = "0.12.7";
+      version = "0.12.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.7.tgz";
-        sha512 = "yc9qOmEmWVZNkux9m0eCiHdtYSwNZRHkFhgfKfDn4u/gpsJolft1iyMUADnG/eytiRW0CGZFBpZjHkJhpginuQ==";
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.8.tgz";
+        sha512 = "xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg==";
       };
     };
     "graphql-subscriptions-1.1.0" = {
@@ -26244,13 +26307,13 @@ let
         sha512 = "U2OiDI5VxYmzRKw0Z2dmfk0zkqMRaecH9Smh1U277gVgVe9Qn+18xqf4skwr4YJszGIh7iQDZ57+5ygOK9sM/Q==";
       };
     };
-    "graphql-ws-3.1.0" = {
+    "graphql-ws-4.1.0" = {
       name = "graphql-ws";
       packageName = "graphql-ws";
-      version = "3.1.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-3.1.0.tgz";
-        sha512 = "zbex3FSiFz0iRgfkzDNWpOY/sYWoX+iZ5XUhakaDwOh99HSuk8rPt5suuxdXUVzEg5TGQ9rwzNaz/+mTPtS0yg==";
+        url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.1.0.tgz";
+        sha512 = "DxJP1y2YzCqVLy7DrQN0iuR2l48vMOBWukX2d/J9aN2o5x9un5psIIq/2UFRh91UGARmfvPH86y1p4qbC1dITg==";
       };
     };
     "gray-matter-2.1.1" = {
@@ -26316,13 +26379,13 @@ let
         sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==";
       };
     };
-    "gtoken-5.1.0" = {
+    "gtoken-5.2.0" = {
       name = "gtoken";
       packageName = "gtoken";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gtoken/-/gtoken-5.1.0.tgz";
-        sha512 = "4d8N6Lk8TEAHl9vVoRVMh9BNOKWVgl2DdNtr3428O75r3QFrF/a5MMu851VmK0AA8+iSvbwRv69k5XnMLURGhg==";
+        url = "https://registry.npmjs.org/gtoken/-/gtoken-5.2.0.tgz";
+        sha512 = "qbf6JWEYFMj3WMAluvYXl8GAiji6w8d9OmAGCbBg0xF4xD/yu6ZaO6BhoXNddRjKcOUpZD81iea1H5B45gAo1g==";
       };
     };
     "gulp-4.0.2" = {
@@ -28009,15 +28072,6 @@ let
         sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA==";
       };
     };
-    "idb-wrapper-1.7.2" = {
-      name = "idb-wrapper";
-      packageName = "idb-wrapper";
-      version = "1.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/idb-wrapper/-/idb-wrapper-1.7.2.tgz";
-        sha512 = "zfNREywMuf0NzDo9mVsL0yegjsirJxHpKHvWcyRozIqQy89g0a3U+oBPOCN4cc0oCiOuYgZHimzaW/R46G1Mpg==";
-      };
-    };
     "idx-2.4.0" = {
       name = "idx";
       packageName = "idx";
@@ -28207,15 +28261,6 @@ let
         sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
       };
     };
-    "import-fresh-3.2.1" = {
-      name = "import-fresh";
-      packageName = "import-fresh";
-      version = "3.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz";
-        sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==";
-      };
-    };
     "import-fresh-3.3.0" = {
       name = "import-fresh";
       packageName = "import-fresh";
@@ -28450,15 +28495,6 @@ let
         sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
       };
     };
-    "ini-1.3.6" = {
-      name = "ini";
-      packageName = "ini";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.6.tgz";
-        sha512 = "IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg==";
-      };
-    };
     "ini-1.3.7" = {
       name = "ini";
       packageName = "ini";
@@ -29053,15 +29089,6 @@ let
         sha1 = "2ca9b033651111855412f16be5d77c62a458a766";
       };
     };
-    "is-0.2.7" = {
-      name = "is";
-      packageName = "is";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is/-/is-0.2.7.tgz";
-        sha1 = "3b34a2c48f359972f35042849193ae7264b63562";
-      };
-    };
     "is-3.3.0" = {
       name = "is";
       packageName = "is";
@@ -29827,15 +29854,6 @@ let
         sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==";
       };
     };
-    "is-object-0.1.2" = {
-      name = "is-object";
-      packageName = "is-object";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz";
-        sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7";
-      };
-    };
     "is-object-1.0.2" = {
       name = "is-object";
       packageName = "is-object";
@@ -30493,15 +30511,6 @@ let
         sha512 = "ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==";
       };
     };
-    "isbuffer-0.0.0" = {
-      name = "isbuffer";
-      packageName = "isbuffer";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isbuffer/-/isbuffer-0.0.0.tgz";
-        sha1 = "38c146d9df528b8bf9b0701c3d43cf12df3fc39b";
-      };
-    };
     "isemail-3.2.0" = {
       name = "isemail";
       packageName = "isemail";
@@ -30952,13 +30961,13 @@ let
         sha512 = "Apz3AqpJhToFlo70mwnlbVyqhJRagzhNKKp84ZMeTqe/Ay9oIno8unm7eFepdlR8m8wz/9JXJQxUjK/3Ku/cpg==";
       };
     };
-    "jpeg-js-0.4.2" = {
+    "jpeg-js-0.4.3" = {
       name = "jpeg-js";
       packageName = "jpeg-js";
-      version = "0.4.2";
+      version = "0.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz";
-        sha512 = "+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw==";
+        url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz";
+        sha512 = "ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==";
       };
     };
     "jpeg-turbo-0.4.0" = {
@@ -30988,13 +30997,13 @@ let
         sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
       };
     };
-    "jquery.terminal-2.20.1" = {
+    "jquery.terminal-2.20.2" = {
       name = "jquery.terminal";
       packageName = "jquery.terminal";
-      version = "2.20.1";
+      version = "2.20.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.1.tgz";
-        sha512 = "XDXH/psm0BquAmQEwomn1g9lYBGS/P6laRgWC/gADi6eJjEBWeyuiP9F5nzoEVhEa2VDnEYbvfm/MBA5DcrvdA==";
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.2.tgz";
+        sha512 = "f3heC+hG2NE9tuJmGI3g5fR/KoD1/G31rJlXjVYPU2oBqbPQXRiiYvW78mm4aK9+IClYhMoqXiKxdzWIxjAxxA==";
       };
     };
     "js-base64-2.6.4" = {
@@ -31006,13 +31015,13 @@ let
         sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==";
       };
     };
-    "js-beautify-1.13.0" = {
+    "js-beautify-1.13.4" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.13.0";
+      version = "1.13.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz";
-        sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA==";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.4.tgz";
+        sha512 = "M5yEWwonlEO3kPcCZ3K3KBSpFRZAEO3FAWC6wtbIGeyg7dusStxvF0WG+HRLBoMZqREXSRSxkkqClDE865x1sg==";
       };
     };
     "js-message-1.0.7" = {
@@ -31249,49 +31258,49 @@ let
         sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
       };
     };
-    "jsii-1.16.0" = {
+    "jsii-1.17.1" = {
       name = "jsii";
       packageName = "jsii";
-      version = "1.16.0";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii/-/jsii-1.16.0.tgz";
-        sha512 = "8cgroyD6LOlFUlXUMAmjtUhzgyF3oQpVVpIdDzqcn2dNgs7iDnZN/Wo27MfZj8usbIBLLK3DYv7DSf+0/H0yWA==";
+        url = "https://registry.npmjs.org/jsii/-/jsii-1.17.1.tgz";
+        sha512 = "Hx2oJjD7mXWD73A8yRkNzE9QDkfn+oDNUAwQgeMV5xteBvrzKFwiToucMTrPPVL/KO2mEXvWP2Or7MY03DFu7w==";
       };
     };
-    "jsii-pacmak-1.16.0" = {
+    "jsii-pacmak-1.17.1" = {
       name = "jsii-pacmak";
       packageName = "jsii-pacmak";
-      version = "1.16.0";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.16.0.tgz";
-        sha512 = "fjNiW8CliOO/GTzbhdA3kJGBvG1PDh2suQKfsUdh2sD0HSRmQPSpVydSmK0pfav7PD6OOfXsWvWI6WlKzNY0pg==";
+        url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.17.1.tgz";
+        sha512 = "9vxNObAkAqzRaU5qcFzJmi6gYQ6fllOqgGjqaEWdWlcMFx2XzgSOtALrksi/YRLwuZtPCZrUnSEV5SeralSkUg==";
       };
     };
-    "jsii-reflect-1.16.0" = {
+    "jsii-reflect-1.17.1" = {
       name = "jsii-reflect";
       packageName = "jsii-reflect";
-      version = "1.16.0";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.16.0.tgz";
-        sha512 = "1zxZwni5S9WUQrNJJA+fVVkd1s54u6fdxjuiHpkZUvxkcPUnsuurL8KWImMEvbdz5ykGHEmnjMOOiyRh/XEc2Q==";
+        url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.17.1.tgz";
+        sha512 = "u3Pn/iCZriV6fD77Ettc975XIcGTIz0fjGeStwGIVyb9pcoQiF+WXdg8H9iRr17Rx+m6DTvbRukrszPDX6nMSA==";
       };
     };
-    "jsii-rosetta-1.16.0" = {
+    "jsii-rosetta-1.17.1" = {
       name = "jsii-rosetta";
       packageName = "jsii-rosetta";
-      version = "1.16.0";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.16.0.tgz";
-        sha512 = "1FFGV+JmwyljCNjc9bkW40MIQXvPgNxq+V3zx8/0+FM51S/0O5EvTa/413LX8fzB8sWH0G42NqFa+8k3k9s2hw==";
+        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.17.1.tgz";
+        sha512 = "Nws1f4FE0qNTJLWoP6Q/jwWYcR2uHB0pQ5AsyR5oVwrJiXjZ06vUD9oJu7GuXb9BxKVf5gJVc6Hh478SwOwF6A==";
       };
     };
-    "jsii-srcmak-0.1.180" = {
+    "jsii-srcmak-0.1.204" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.180";
+      version = "0.1.204";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.180.tgz";
-        sha512 = "U9CmoEM6A7ZhIT66N8r9flPKUsNnkCu5iWkzH9k6sdNwbiEC5KT4MdJUfJ42L1AbX1BXwhmQtFyj7QvKdGI44g==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.204.tgz";
+        sha512 = "i+x6t4qf2mY/pd6ZRz9euKlZNcv2dGuKu4ZlDfR2Wl7kQwE6FFmPtPbq1dCMy/yCSAYjSVXAd2FQEHIXhkDhbw==";
       };
     };
     "json-bigint-0.2.3" = {
@@ -31573,13 +31582,13 @@ let
         sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ==";
       };
     };
-    "json2jsii-0.1.172" = {
+    "json2jsii-0.1.188" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.1.172";
+      version = "0.1.188";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.172.tgz";
-        sha512 = "X78nchCnnN0M3x6byBMhR9X5fz5BETDxFmAE149WUpMn0Dh6Dg3c7H9FbQkRV1MVaqC0sLJHGIeO++hfgYpa7w==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.188.tgz";
+        sha512 = "XeUcBQl0rngTFmiSIx0XNW+g0QgAJcqwsUYzvGcDPPSvPngIGmJ/X6d0UH/nDmSVyEilYyKnVP7iYh3y9by9fA==";
       };
     };
     "json3-3.2.6" = {
@@ -32204,13 +32213,13 @@ let
         sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==";
       };
     };
-    "khroma-1.1.1" = {
+    "khroma-1.2.0" = {
       name = "khroma";
       packageName = "khroma";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/khroma/-/khroma-1.1.1.tgz";
-        sha512 = "p7SYAiFisFFmLHHCqYBNwmfTrVIlWjUq+Pw81lDvnpaXOj2sR/xszTG4873AeaEO1kYQ50Z1c9CIrtQa6bdNdA==";
+        url = "https://registry.npmjs.org/khroma/-/khroma-1.2.0.tgz";
+        sha512 = "DlKk5y243dujy8fOH02aRnnewLfiHJV0s8aXaVrCohgBf3s7fEAn6gc6LLQ21agODlFZS8ufrn+juu70uCA9Tw==";
       };
     };
     "killable-1.0.1" = {
@@ -32627,15 +32636,6 @@ let
         sha512 = "psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw==";
       };
     };
-    "level-blobs-0.1.7" = {
-      name = "level-blobs";
-      packageName = "level-blobs";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/level-blobs/-/level-blobs-0.1.7.tgz";
-        sha1 = "9ab9b97bb99f1edbf9f78a3433e21ed56386bdaf";
-      };
-    };
     "level-codec-6.2.0" = {
       name = "level-codec";
       packageName = "level-codec";
@@ -32672,42 +32672,6 @@ let
         sha512 = "UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==";
       };
     };
-    "level-filesystem-1.2.0" = {
-      name = "level-filesystem";
-      packageName = "level-filesystem";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/level-filesystem/-/level-filesystem-1.2.0.tgz";
-        sha1 = "a00aca9919c4a4dfafdca6a8108d225aadff63b3";
-      };
-    };
-    "level-fix-range-1.0.2" = {
-      name = "level-fix-range";
-      packageName = "level-fix-range";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz";
-        sha1 = "bf15b915ae36d8470c821e883ddf79cd16420828";
-      };
-    };
-    "level-fix-range-2.0.0" = {
-      name = "level-fix-range";
-      packageName = "level-fix-range";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz";
-        sha1 = "c417d62159442151a19d9a2367868f1724c2d548";
-      };
-    };
-    "level-hooks-4.5.0" = {
-      name = "level-hooks";
-      packageName = "level-hooks";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz";
-        sha1 = "1b9ae61922930f3305d1a61fc4d83c8102c0dd93";
-      };
-    };
     "level-iterator-stream-4.0.2" = {
       name = "level-iterator-stream";
       packageName = "level-iterator-stream";
@@ -32717,15 +32681,6 @@ let
         sha512 = "ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==";
       };
     };
-    "level-js-2.2.4" = {
-      name = "level-js";
-      packageName = "level-js";
-      version = "2.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/level-js/-/level-js-2.2.4.tgz";
-        sha1 = "bc055f4180635d4489b561c9486fa370e8c11697";
-      };
-    };
     "level-js-4.0.2" = {
       name = "level-js";
       packageName = "level-js";
@@ -32753,15 +32708,6 @@ let
         sha512 = "HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==";
       };
     };
-    "level-peek-1.0.6" = {
-      name = "level-peek";
-      packageName = "level-peek";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz";
-        sha1 = "bec51c72a82ee464d336434c7c876c3fcbcce77f";
-      };
-    };
     "level-post-1.0.7" = {
       name = "level-post";
       packageName = "level-post";
@@ -32771,15 +32717,6 @@ let
         sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew==";
       };
     };
-    "level-sublevel-5.2.3" = {
-      name = "level-sublevel";
-      packageName = "level-sublevel";
-      version = "5.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz";
-        sha1 = "744c12c72d2e72be78dde3b9b5cd84d62191413a";
-      };
-    };
     "level-supports-1.0.1" = {
       name = "level-supports";
       packageName = "level-supports";
@@ -32798,15 +32735,6 @@ let
         sha512 = "iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==";
       };
     };
-    "levelup-0.18.6" = {
-      name = "levelup";
-      packageName = "levelup";
-      version = "0.18.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz";
-        sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb";
-      };
-    };
     "levelup-4.4.0" = {
       name = "levelup";
       packageName = "levelup";
@@ -33140,13 +33068,13 @@ let
         sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
       };
     };
-    "loader-runner-4.1.0" = {
+    "loader-runner-4.2.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
-      version = "4.1.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.1.0.tgz";
-        sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA==";
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz";
+        sha512 = "92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==";
       };
     };
     "loader-utils-1.4.0" = {
@@ -35147,13 +35075,13 @@ let
         sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==";
       };
     };
-    "make-fetch-happen-8.0.12" = {
+    "make-fetch-happen-8.0.13" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "8.0.12";
+      version = "8.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.12.tgz";
-        sha512 = "cBD7yM72ltWEV+xlLlbimnh5qHwr+thAb/cZLiaZhicVVPVN63BikBvL5OR68+8+z2fvBOgck628vGJ2ulgF6g==";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.13.tgz";
+        sha512 = "rQ5NijwwdU8tIaBrpTtSVrNCcAJfyDRcKBC76vOQlyJX588/88+TE+UpjWl4BgG7gCkp29wER7xcRqkeg+x64Q==";
       };
     };
     "make-iterator-1.0.1" = {
@@ -35957,6 +35885,15 @@ let
         sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q==";
       };
     };
+    "mem-8.0.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-8.0.0.tgz";
+        sha512 = "qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA==";
+      };
+    };
     "mem-fs-1.2.0" = {
       name = "mem-fs";
       packageName = "mem-fs";
@@ -36011,13 +35948,13 @@ let
         sha1 = "9d7028a6f266deb733510bb7dbba5f51878c561e";
       };
     };
-    "memoizee-0.4.14" = {
+    "memoizee-0.4.15" = {
       name = "memoizee";
       packageName = "memoizee";
-      version = "0.4.14";
+      version = "0.4.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz";
-        sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==";
+        url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz";
+        sha512 = "UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==";
       };
     };
     "memory-cache-0.2.0" = {
@@ -36155,13 +36092,22 @@ let
         sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==";
       };
     };
-    "meow-8.1.0" = {
+    "meow-8.1.2" = {
       name = "meow";
       packageName = "meow";
-      version = "8.1.0";
+      version = "8.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-8.1.0.tgz";
-        sha512 = "fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA==";
+        url = "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz";
+        sha512 = "r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==";
+      };
+    };
+    "meow-9.0.0" = {
+      name = "meow";
+      packageName = "meow";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz";
+        sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==";
       };
     };
     "merge-1.2.1" = {
@@ -36245,6 +36191,15 @@ let
         sha512 = "YPn35uEAIrOcsDPjCiKNXXBdO1Aoazsv2zTZjG4+oXa7+tTVUb5sI81NqaTYa47RnoH9Vl4waLlEEJfB8KM9VA==";
       };
     };
+    "mermaid-8.9.0" = {
+      name = "mermaid";
+      packageName = "mermaid";
+      version = "8.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.0.tgz";
+        sha512 = "J582tyE1vkdNu4BGgfwXnFo4Mu6jpuc4uK96mIenavaak9kr4T5gaMmYCo/7edwq/vTBkx/soZ5LcJo5WXZ1BQ==";
+      };
+    };
     "mersenne-0.0.4" = {
       name = "mersenne";
       packageName = "mersenne";
@@ -36515,15 +36470,6 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-2.4.6" = {
-      name = "mime";
-      packageName = "mime";
-      version = "2.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz";
-        sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==";
-      };
-    };
     "mime-2.4.7" = {
       name = "mime";
       packageName = "mime";
@@ -36533,6 +36479,15 @@ let
         sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==";
       };
     };
+    "mime-2.5.0" = {
+      name = "mime";
+      packageName = "mime";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
+        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
+      };
+    };
     "mime-db-1.33.0" = {
       name = "mime-db";
       packageName = "mime-db";
@@ -36839,13 +36794,13 @@ let
         sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==";
       };
     };
-    "minipass-fetch-1.3.2" = {
+    "minipass-fetch-1.3.3" = {
       name = "minipass-fetch";
       packageName = "minipass-fetch";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.2.tgz";
-        sha512 = "/i4fX1ss+Dtwyk++OsAI6SEV+eE1dvI6W+0hORdjfruQ7VD5uYTetJIHcEMjWiEiszWjn2aAtP1CB/Q4KfeoYA==";
+        url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.3.tgz";
+        sha512 = "akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==";
       };
     };
     "minipass-flush-1.0.5" = {
@@ -37613,15 +37568,6 @@ let
         sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==";
       };
     };
-    "mustache-4.0.1" = {
-      name = "mustache";
-      packageName = "mustache";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz";
-        sha512 = "yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==";
-      };
-    };
     "mustache-4.1.0" = {
       name = "mustache";
       packageName = "mustache";
@@ -37964,15 +37910,6 @@ let
         sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
       };
     };
-    "native-request-1.0.8" = {
-      name = "native-request";
-      packageName = "native-request";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz";
-        sha512 = "vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==";
-      };
-    };
     "native-url-0.2.6" = {
       name = "native-url";
       packageName = "native-url";
@@ -38189,13 +38126,13 @@ let
         sha512 = "o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==";
       };
     };
-    "needle-2.5.2" = {
+    "needle-2.6.0" = {
       name = "needle";
       packageName = "needle";
-      version = "2.5.2";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz";
-        sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
+        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
       };
     };
     "negotiator-0.3.0" = {
@@ -38271,22 +38208,13 @@ let
         sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==";
       };
     };
-    "netlify-4.9.0" = {
+    "netlify-6.0.12" = {
       name = "netlify";
       packageName = "netlify";
-      version = "4.9.0";
+      version = "6.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify/-/netlify-4.9.0.tgz";
-        sha512 = "x+VqJ+yop05OUpeaT4fhz/NAvJQFjtNhW1s+/i6oP/EZS6/+B0u+qCANF8uP9u3UJcmWvlJmrRoDhj62Xvtwug==";
-      };
-    };
-    "netlify-6.0.9" = {
-      name = "netlify";
-      packageName = "netlify";
-      version = "6.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/netlify/-/netlify-6.0.9.tgz";
-        sha512 = "izoELW+kE5ClHX85f5EExRo42H3hXESwSr69EJdCuDQlTP3JR09xQgZcWL5t7FNdkfBj7Kdhf62tk02TN4+YzA==";
+        url = "https://registry.npmjs.org/netlify/-/netlify-6.0.12.tgz";
+        sha512 = "WAOvHMmd4E/SF8wagbbg0/HV2CXNsmKHvqxJ1carJ6eX1xhqtvLs5xjNL6fFqajj8Qmyl02YmHIq3eb6yyFRWA==";
       };
     };
     "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = {
@@ -38298,13 +38226,13 @@ let
         sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA==";
       };
     };
-    "netlify-redirect-parser-2.5.0" = {
+    "netlify-redirect-parser-3.0.1" = {
       name = "netlify-redirect-parser";
       packageName = "netlify-redirect-parser";
-      version = "2.5.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-2.5.0.tgz";
-        sha512 = "pF8BiOr3Pa4kQLLiOu53I0d30EIUDM0DYqYvCQmKD96cMX2qLh/QsxT0Zh18IrL5a0IWQ236/o76lTe0yEEw6w==";
+        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.1.tgz";
+        sha512 = "UVcULtvR8KIq3cs1Np0dhh/2shOOEmkbkmynLaxliaCsrI7sS0FFDtf7wL253Yt+KUE1QyoiRwYWyh2FZVznig==";
       };
     };
     "netlify-redirector-0.2.1" = {
@@ -38821,15 +38749,6 @@ let
         sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==";
       };
     };
-    "node-notifier-8.0.0" = {
-      name = "node-notifier";
-      packageName = "node-notifier";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz";
-        sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==";
-      };
-    };
     "node-notifier-8.0.1" = {
       name = "node-notifier";
       packageName = "node-notifier";
@@ -38911,13 +38830,13 @@ let
         sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d";
       };
     };
-    "node-red-admin-0.2.6" = {
+    "node-red-admin-0.2.7" = {
       name = "node-red-admin";
       packageName = "node-red-admin";
-      version = "0.2.6";
+      version = "0.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.6.tgz";
-        sha512 = "s3TlPwl9VbhsCTg9w2nUCdyBwqyRGqnaohy9iPJPmHPnvT+YudVt9VCoJVol5lPlWbDC9QlBQMyHQDdXIxoLkw==";
+        url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.7.tgz";
+        sha512 = "bsFbC7KFfGY37+SuYfmM9Er00cM92anqp6xCj8x7Y+4qZHOXnLi9XDFoWtvvsC1uQyaMqas1ALCfqcOxLlWngw==";
       };
     };
     "node-red-node-rbe-0.2.9" = {
@@ -38938,13 +38857,13 @@ let
         sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
       };
     };
-    "node-releases-1.1.69" = {
+    "node-releases-1.1.70" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.69";
+      version = "1.1.70";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz";
-        sha512 = "DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz";
+        sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==";
       };
     };
     "node-source-walk-4.2.0" = {
@@ -39253,13 +39172,13 @@ let
         sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6";
       };
     };
-    "npm-api-1.0.0" = {
+    "npm-api-1.0.1" = {
       name = "npm-api";
       packageName = "npm-api";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.0.tgz";
-        sha512 = "gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ==";
+        url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.1.tgz";
+        sha512 = "4sITrrzEbPcr0aNV28QyOmgn6C9yKiF8k92jn4buYAK8wmA5xo1qL3II5/gT1r7wxbXBflSduZ2K3FbtOrtGkA==";
       };
     };
     "npm-bundled-1.1.1" = {
@@ -39424,15 +39343,6 @@ let
         sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==";
       };
     };
-    "npm-registry-fetch-4.0.7" = {
-      name = "npm-registry-fetch";
-      packageName = "npm-registry-fetch";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz";
-        sha512 = "cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==";
-      };
-    };
     "npm-registry-fetch-8.1.5" = {
       name = "npm-registry-fetch";
       packageName = "npm-registry-fetch";
@@ -39682,7 +39592,7 @@ let
       version = "0.9.15";
       src = fetchurl {
         name = "oauth-0.9.15.tar.gz";
-        url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
+        url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master";
         sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
       };
     };
@@ -39830,15 +39740,6 @@ let
         sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==";
       };
     };
-    "object-keys-0.2.0" = {
-      name = "object-keys";
-      packageName = "object-keys";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz";
-        sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67";
-      };
-    };
     "object-keys-0.4.0" = {
       name = "object-keys";
       packageName = "object-keys";
@@ -40037,22 +39938,13 @@ let
         sha1 = "cb236106341536f0dac4815e06708221cad7fb5e";
       };
     };
-    "obz-1.0.2" = {
+    "obz-1.0.3" = {
       name = "obz";
       packageName = "obz";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/obz/-/obz-1.0.2.tgz";
-        sha512 = "c+EtVwT2IpXz5we2mR40aPLJ1s0eNOsxYeaYbaHhmsY6kWKo3IRkpwpBU5ck0aHfqfKUUEiKabC6rzsrG/hSHw==";
-      };
-    };
-    "octal-1.0.0" = {
-      name = "octal";
-      packageName = "octal";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz";
-        sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b";
+        url = "https://registry.npmjs.org/obz/-/obz-1.0.3.tgz";
+        sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw==";
       };
     };
     "octokit-pagination-methods-1.1.0" = {
@@ -40064,13 +39956,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.155.3" = {
+    "office-ui-fabric-react-7.156.0" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.155.3";
+      version = "7.156.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.155.3.tgz";
-        sha512 = "MOGOEviHa5P580rANl9+vS4QTDt6SeyVlfhGLqZpSgA7VZ4JDCIU/mFyNbl5KG39wfg5JiKic+Lz8rXUrExQfw==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.156.0.tgz";
+        sha512 = "e9EwmkTGRjt+PJiRqB2ZU+8dTOUtDzNcOhiZmyI7Rvmz1XK3LhNDgoExbMQfAuDFEr2TcyvrOidwTAAkoRyWYw==";
       };
     };
     "omggif-1.0.10" = {
@@ -40244,13 +40136,13 @@ let
         sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==";
       };
     };
-    "oo-ascii-tree-1.16.0" = {
+    "oo-ascii-tree-1.17.1" = {
       name = "oo-ascii-tree";
       packageName = "oo-ascii-tree";
-      version = "1.16.0";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.16.0.tgz";
-        sha512 = "xIuc4hP3NKOhPaPJN1zkTXiGNpNe4vOaS0CUwyCuVv1kBzBhliZ71siaGXpHIL45CBmX6qGAjEiHt7ZS1nQWaA==";
+        url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.17.1.tgz";
+        sha512 = "+59dySSbsBOpRmrdBV6w4lkoxELA6reGNEsD/+HfRw8F+pQhGv5cROX0Y6jAXd1yWbUXY+AbbKVTq1ws/rfv+A==";
       };
     };
     "opal-runtime-1.0.11" = {
@@ -40307,6 +40199,15 @@ let
         sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==";
       };
     };
+    "open-7.3.1" = {
+      name = "open";
+      packageName = "open";
+      version = "7.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/open/-/open-7.3.1.tgz";
+        sha512 = "f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==";
+      };
+    };
     "openapi-default-setter-2.1.0" = {
       name = "openapi-default-setter";
       packageName = "openapi-default-setter";
@@ -40316,13 +40217,13 @@ let
         sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A==";
       };
     };
-    "openapi-default-setter-7.0.1" = {
+    "openapi-default-setter-7.2.3" = {
       name = "openapi-default-setter";
       packageName = "openapi-default-setter";
-      version = "7.0.1";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.0.1.tgz";
-        sha512 = "O9jhaZPEEJzI1HSG3Yw5rOIC0EpZ9PjRJgtksXKuSMyEoxUDnl7zQ27LuFRR1ykSMVhMt8vHMrQBQIwLW8S0yQ==";
+        url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.2.3.tgz";
+        sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw==";
       };
     };
     "openapi-framework-0.26.0" = {
@@ -40334,13 +40235,13 @@ let
         sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow==";
       };
     };
-    "openapi-framework-7.2.0" = {
+    "openapi-framework-7.2.3" = {
       name = "openapi-framework";
       packageName = "openapi-framework";
-      version = "7.2.0";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.0.tgz";
-        sha512 = "rC4U+SIBVxoTujSIrk84PMquBwkNJfhYC7KTTDUUc7yfIyMVKRat5TOuMDyc49Ovsv+7bdkx1stf7d0N9LbtLg==";
+        url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.3.tgz";
+        sha512 = "3UwZFIxcJzMpYQAiwynaWGGWW/OcIdYz+gr5bO0TDOxnZjaZNo5ejru/6T9Gb7zrv15THihc3EdASvB36L0rXg==";
       };
     };
     "openapi-jsonschema-parameters-1.2.0" = {
@@ -40352,13 +40253,13 @@ let
         sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ==";
       };
     };
-    "openapi-jsonschema-parameters-7.0.2" = {
+    "openapi-jsonschema-parameters-7.2.3" = {
       name = "openapi-jsonschema-parameters";
       packageName = "openapi-jsonschema-parameters";
-      version = "7.0.2";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.0.2.tgz";
-        sha512 = "hCC8wsWu9qU/pWCUClAYmUyXRhAeXSZUCRV7NVlj/8+3fWrtTBwk8GKI2dRa5Up0yZ3pstGi3Ewzzuixbmh8sw==";
+        url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.2.3.tgz";
+        sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ==";
       };
     };
     "openapi-request-coercer-2.4.0" = {
@@ -40370,13 +40271,13 @@ let
         sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ==";
       };
     };
-    "openapi-request-coercer-7.1.0" = {
+    "openapi-request-coercer-7.2.3" = {
       name = "openapi-request-coercer";
       packageName = "openapi-request-coercer";
-      version = "7.1.0";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.1.0.tgz";
-        sha512 = "6nvSgvOvLYMkUBu3NbHQU6Lcol1WxDr0DsOe3oYHb2tZhokrNEuOF20QYPV+CGZYyEzc0f+Hdas774n5B0euLg==";
+        url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.2.3.tgz";
+        sha512 = "w+CcKjQ/UWgtA5lgrCh7t/D2FGaKyQRXgMk8aWuT/y2a/pvdZbXdmdABWdafXB6iVlBr9CKXYHJUDlBcoKH2yQ==";
       };
     };
     "openapi-request-validator-4.2.0" = {
@@ -40388,13 +40289,13 @@ let
         sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg==";
       };
     };
-    "openapi-request-validator-7.2.0" = {
+    "openapi-request-validator-7.2.3" = {
       name = "openapi-request-validator";
       packageName = "openapi-request-validator";
-      version = "7.2.0";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.0.tgz";
-        sha512 = "LgXvKco6XR5SKr8QBaM6v0++QXY5MP2yvvKv0Ckutef3css9MAyIcokDsBj6DYYzNnjmFxPx4ntuY7CZTC2ZFA==";
+        url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.3.tgz";
+        sha512 = "bZWIOIc7eDnPzgk159Wzur1U9hLoFTgok3coWA8J/XlNnTgnWGH+dxc8eCAdPlOLJh2AsiSu/fEGKzWJRxzCAw==";
       };
     };
     "openapi-response-validator-4.0.0" = {
@@ -40406,13 +40307,13 @@ let
         sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg==";
       };
     };
-    "openapi-response-validator-7.0.1" = {
+    "openapi-response-validator-7.2.3" = {
       name = "openapi-response-validator";
       packageName = "openapi-response-validator";
-      version = "7.0.1";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.0.1.tgz";
-        sha512 = "Fxr9YdQ6s7/SIvvM888iWnc1GUn/fFxTaMFqHkUv0/eNCYoBfOwAKj9aptaRfL+BJXlsVdXWCJd3GWkwn8sIJA==";
+        url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.2.3.tgz";
+        sha512 = "j9OvLWO/6sWiR4fwdbzPbZuuj02abk+kt8Zd2aXS4mS8K7/sl7QiJGI/VmQpvq9CTlNG67eEKyqgmBzI1ovu/g==";
       };
     };
     "openapi-sampler-1.0.0-beta.18" = {
@@ -40433,13 +40334,13 @@ let
         sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA==";
       };
     };
-    "openapi-schema-validator-7.0.1" = {
+    "openapi-schema-validator-7.2.3" = {
       name = "openapi-schema-validator";
       packageName = "openapi-schema-validator";
-      version = "7.0.1";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.0.1.tgz";
-        sha512 = "P/dmF14xWbyaFVcoS1Fs2tUP4AhJO+eEnZV+jbApeo3569/Z2fiki6Mb6Rs7cfi0ewNnV4L4HiYH+HPZaKWnjQ==";
+        url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz";
+        sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA==";
       };
     };
     "openapi-security-handler-2.0.4" = {
@@ -40451,13 +40352,13 @@ let
         sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ==";
       };
     };
-    "openapi-security-handler-7.0.1" = {
+    "openapi-security-handler-7.2.3" = {
       name = "openapi-security-handler";
       packageName = "openapi-security-handler";
-      version = "7.0.1";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.0.1.tgz";
-        sha512 = "fiRJE2Z5F0tY9QBssBX9g8Txtr0oj1BOU0nOZ6QHHXQdCYxebszGgcXD63uy0UJQwzwVOMs/AlCnKNVS/yMSEg==";
+        url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.2.3.tgz";
+        sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg==";
       };
     };
     "openapi-to-graphql-2.2.5" = {
@@ -40496,6 +40397,15 @@ let
         sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A==";
       };
     };
+    "openapi-types-7.2.3" = {
+      name = "openapi-types";
+      packageName = "openapi-types";
+      version = "7.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz";
+        sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA==";
+      };
+    };
     "openapi3-ts-1.4.0" = {
       name = "openapi3-ts";
       packageName = "openapi3-ts";
@@ -40766,6 +40676,15 @@ let
         sha512 = "+wG2v8TUU8EgzPHun1k/n45pXquQ9fHnbXVetl9rRgO6kjZszGGbraF3XPTIdgeA+s1lbRjSEftAnyT0w8ZMvQ==";
       };
     };
+    "ora-5.3.0" = {
+      name = "ora";
+      packageName = "ora";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz";
+        sha512 = "zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==";
+      };
+    };
     "ordered-read-streams-1.0.1" = {
       name = "ordered-read-streams";
       packageName = "ordered-read-streams";
@@ -41468,22 +41387,22 @@ let
         sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA==";
       };
     };
-    "pacote-11.1.13" = {
+    "pacote-11.1.14" = {
       name = "pacote";
       packageName = "pacote";
-      version = "11.1.13";
+      version = "11.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.13.tgz";
-        sha512 = "oJ7Bg7p3izrIMhZPHCCHmMHQl+xb+pKBXL5ZYeM2oCZrw6sBRSx7f8l7F+95V2qA0BP3c1cNaaBmUNkbo6Hn9w==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.14.tgz";
+        sha512 = "6c5OhQelaJFDfiw/Zd8MfGCvvFHurSdeGzufZMPvRFImdbNOYFciOINf3DtUNUaU3h98eCb749UyHDsgvL19+A==";
       };
     };
-    "pacote-9.5.12" = {
+    "pacote-11.2.3" = {
       name = "pacote";
       packageName = "pacote";
-      version = "9.5.12";
+      version = "11.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz";
-        sha512 = "BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-11.2.3.tgz";
+        sha512 = "Jphxyk1EjGyLzNwa+MkbcQUQeTIqlKcIoPq0t9ekR9ZxsTGjzhRjz/cOoL9PTVkqAW1FH7qBoVbYL4FqQGNNJg==";
       };
     };
     "pad-0.0.5" = {
@@ -41504,13 +41423,13 @@ let
         sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
       };
     };
-    "paged-request-2.0.1" = {
+    "paged-request-2.0.2" = {
       name = "paged-request";
       packageName = "paged-request";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.1.tgz";
-        sha512 = "C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw==";
+        url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.2.tgz";
+        sha512 = "NWrGqneZImDdcMU/7vMcAOo1bIi5h/pmpJqe7/jdsy85BA/s5MSaU/KlpxwW/IVPmIwBcq2uKPrBWWhEWhtxag==";
       };
     };
     "pako-0.2.9" = {
@@ -41765,13 +41684,13 @@ let
         sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==";
       };
     };
-    "parse-json-5.1.0" = {
+    "parse-json-5.2.0" = {
       name = "parse-json";
       packageName = "parse-json";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz";
-        sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==";
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz";
+        sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==";
       };
     };
     "parse-latin-4.3.0" = {
@@ -41819,13 +41738,13 @@ let
         sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
-    "parse-path-4.0.2" = {
+    "parse-path-4.0.3" = {
       name = "parse-path";
       packageName = "parse-path";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.2.tgz";
-        sha512 = "HSqVz6iuXSiL8C1ku5Gl1Z5cwDd9Wo0q8CoffdAghP6bz8pJa1tcMC+m4N+z6VAS8QdksnIGq1TB6EgR4vPR6w==";
+        url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz";
+        sha512 = "9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA==";
       };
     };
     "parse-png-2.1.0" = {
@@ -42467,13 +42386,13 @@ let
         sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==";
       };
     };
-    "peek-readable-3.1.1" = {
+    "peek-readable-3.1.3" = {
       name = "peek-readable";
       packageName = "peek-readable";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.1.tgz";
-        sha512 = "QHJag0oYYPVkx6rVPEgCLEUMo6VRYbV3GUrqy00lxXJBEIw9LhPCP5MQI6mEfahJO9KYUP8W8qD8kC0V9RyZFQ==";
+        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz";
+        sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg==";
       };
     };
     "peek-stream-1.1.3" = {
@@ -44583,13 +44502,13 @@ let
         sha512 = "WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw==";
       };
     };
-    "proxy-agent-4.0.0" = {
+    "proxy-agent-4.0.1" = {
       name = "proxy-agent";
       packageName = "proxy-agent";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.0.tgz";
-        sha512 = "8P0Y2SkwvKjiGU1IkEfYuTteioMIDFxPL4/j49zzt5Mz3pG1KO+mIrDG1qH0PQUHTTczjwGcYl+EzfXiFj5vUQ==";
+        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz";
+        sha512 = "ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==";
       };
     };
     "proxy-from-env-1.1.0" = {
@@ -44610,15 +44529,6 @@ let
         sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56";
       };
     };
-    "prr-0.0.0" = {
-      name = "prr";
-      packageName = "prr";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
-        sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
-      };
-    };
     "prr-1.0.1" = {
       name = "prr";
       packageName = "prr";
@@ -45609,13 +45519,13 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
-    "qs-6.9.4" = {
+    "qs-6.9.6" = {
       name = "qs";
       packageName = "qs";
-      version = "6.9.4";
+      version = "6.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz";
-        sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz";
+        sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==";
       };
     };
     "query-string-1.0.1" = {
@@ -45834,13 +45744,13 @@ let
         sha512 = "WAcBP5iLhg1pbjZA40WyMenjK7c5gJUY6Pi5HJ3fLJCeVFNSZv3juf20yFMKxBdvcX5GKbX/HZSfFzlLBdGTdQ==";
       };
     };
-    "random-access-memory-3.1.1" = {
+    "random-access-memory-3.1.2" = {
       name = "random-access-memory";
       packageName = "random-access-memory";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.1.tgz";
-        sha512 = "Qy1MliJDozZ1A6Hx3UbEnm8PPCfkiG/8CArbnhrxXMx1YRJPWipgPTB9qyhn4Z7WlLvCEqPb6Bd98OayyVuwrA==";
+        url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.2.tgz";
+        sha512 = "wIfh4OZ9T+FRNf6rbXLvEb4FfSxyZpvGnC5kC7Xi39SyPkRYfeJyR9Xwa13iLbNyoNKNIkTFUE4g9lXFb1ZflA==";
       };
     };
     "random-access-storage-1.4.1" = {
@@ -46032,6 +45942,15 @@ let
         sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ==";
       };
     };
+    "rc-config-loader-4.0.0" = {
+      name = "rc-config-loader";
+      packageName = "rc-config-loader";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.0.0.tgz";
+        sha512 = "//LRTblJEcqbmmro1GCmZ39qZXD+JqzuD8Y5/IZU3Dhp3A1Yr0Xn68ks8MQ6qKfKvYCWDveUmRDKDA40c+sCXw==";
+      };
+    };
     "re-emitter-1.1.4" = {
       name = "re-emitter";
       packageName = "re-emitter";
@@ -46770,13 +46689,13 @@ let
         sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
-    "regexp.prototype.flags-1.3.0" = {
+    "regexp.prototype.flags-1.3.1" = {
       name = "regexp.prototype.flags";
       packageName = "regexp.prototype.flags";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz";
-        sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==";
+        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz";
+        sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==";
       };
     };
     "regexpp-1.1.0" = {
@@ -46869,13 +46788,13 @@ let
         sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
       };
     };
-    "regjsparser-0.6.4" = {
+    "regjsparser-0.6.6" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.6.4";
+      version = "0.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
-        sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz";
+        sha512 = "jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==";
       };
     };
     "rehype-parse-7.0.1" = {
@@ -47499,15 +47418,6 @@ let
         sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
       };
     };
-    "resolve-1.18.1" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz";
-        sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
-      };
-    };
     "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
@@ -47859,13 +47769,13 @@ let
         sha1 = "eeeb88342fadbe8027c0f36ada921a13e6f96206";
       };
     };
-    "rfdc-1.1.4" = {
+    "rfdc-1.2.0" = {
       name = "rfdc";
       packageName = "rfdc";
-      version = "1.1.4";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz";
-        sha512 = "5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==";
+        url = "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz";
+        sha512 = "ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==";
       };
     };
     "rgb-regex-1.0.1" = {
@@ -48012,13 +47922,13 @@ let
         sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
       };
     };
-    "rollup-2.36.0" = {
+    "rollup-2.37.1" = {
       name = "rollup";
       packageName = "rollup";
-      version = "2.36.0";
+      version = "2.37.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz";
-        sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==";
+        url = "https://registry.npmjs.org/rollup/-/rollup-2.37.1.tgz";
+        sha512 = "V3ojEeyGeSdrMSuhP3diBb06P+qV4gKQeanbDv+Qh/BZbhdZ7kHV0xAt8Yjk4GFshq/WjO7R4c7DFM20AwTFVQ==";
       };
     };
     "rollup-plugin-babel-4.4.0" = {
@@ -48048,13 +47958,22 @@ let
         sha512 = "jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==";
       };
     };
-    "rollup-plugin-node-builtins-2.1.2" = {
-      name = "rollup-plugin-node-builtins";
-      packageName = "rollup-plugin-node-builtins";
-      version = "2.1.2";
+    "rollup-plugin-inject-3.0.2" = {
+      name = "rollup-plugin-inject";
+      packageName = "rollup-plugin-inject";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz";
-        sha1 = "24a1fed4a43257b6b64371d8abc6ce1ab14597e9";
+        url = "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz";
+        sha512 = "ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==";
+      };
+    };
+    "rollup-plugin-node-polyfills-0.2.1" = {
+      name = "rollup-plugin-node-polyfills";
+      packageName = "rollup-plugin-node-polyfills";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz";
+        sha512 = "4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==";
       };
     };
     "rollup-plugin-node-resolve-5.2.0" = {
@@ -48480,13 +48399,13 @@ let
         sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==";
       };
     };
-    "sass-1.32.0" = {
+    "sass-1.32.5" = {
       name = "sass";
       packageName = "sass";
-      version = "1.32.0";
+      version = "1.32.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz";
-        sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng==";
+        url = "https://registry.npmjs.org/sass/-/sass-1.32.5.tgz";
+        sha512 = "kU1yJ5zUAmPxr7f3q0YXTAd1oZjSR1g3tYyv+xu0HZSl5JiNOaE987eiz7wCUvbm4I9fGWGU2TgApTtcP4GMNQ==";
       };
     };
     "sax-0.5.8" = {
@@ -48840,15 +48759,6 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
-    "semver-7.1.3" = {
-      name = "semver";
-      packageName = "semver";
-      version = "7.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz";
-        sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==";
-      };
-    };
     "semver-7.2.3" = {
       name = "semver";
       packageName = "semver";
@@ -50046,13 +49956,13 @@ let
         sha512 = "7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q==";
       };
     };
-    "snyk-gradle-plugin-3.11.0" = {
+    "snyk-gradle-plugin-3.12.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "3.11.0";
+      version = "3.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.11.0.tgz";
-        sha512 = "OXf1A+kcif+vslm/nsel3bDYWsGwum2PsZLETM28nG4JOgqBLYLWvCHPgH9r2aa0MKTq0nBpimvFkzDm/+2qQQ==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.0.tgz";
+        sha512 = "WAmViagNolXsqPO/xmArlnpmisw6j/4xN6FLJ/gl9cDSSrgTh013sZlynkZj0G1v4enkelIMuqfVKXzinthm/Q==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -50127,13 +50037,13 @@ let
         sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA==";
       };
     };
-    "snyk-poetry-lockfile-parser-1.1.1" = {
+    "snyk-poetry-lockfile-parser-1.1.2" = {
       name = "snyk-poetry-lockfile-parser";
       packageName = "snyk-poetry-lockfile-parser";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz";
-        sha512 = "G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA==";
+        url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.2.tgz";
+        sha512 = "qaLNhVw/og6LXRmSuPiXcwre07ybJWh8RASF3aumk5R0cmxCU3YLmJ7pfi/N+PMpwiHCfSZFOMIGIL9jXcX9zQ==";
       };
     };
     "snyk-policy-1.14.1" = {
@@ -50145,13 +50055,13 @@ let
         sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g==";
       };
     };
-    "snyk-python-plugin-1.19.1" = {
+    "snyk-python-plugin-1.19.2" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.19.1";
+      version = "1.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz";
-        sha512 = "JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g==";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.2.tgz";
+        sha512 = "n5Z7WiMTNtrBaDE9blnYVoX5fyXeMVhDNrQ/q21lHRAvDKDCY9tNNfduUjOVG6HbIH89mW8lLUdBNAMu/hpl+Q==";
       };
     };
     "snyk-resolve-1.0.1" = {
@@ -50217,13 +50127,13 @@ let
         sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
       };
     };
-    "socket.io-2.4.0" = {
+    "socket.io-2.4.1" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz";
-        sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz";
+        sha512 = "Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==";
       };
     };
     "socket.io-3.0.5" = {
@@ -50235,6 +50145,15 @@ let
         sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
       };
     };
+    "socket.io-3.1.0" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz";
+        sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww==";
+      };
+    };
     "socket.io-adapter-0.2.0" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
@@ -50262,6 +50181,15 @@ let
         sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ==";
       };
     };
+    "socket.io-adapter-2.1.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz";
+        sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==";
+      };
+    };
     "socket.io-client-1.0.6" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
@@ -50307,13 +50235,13 @@ let
         sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a";
       };
     };
-    "socket.io-parser-3.3.1" = {
+    "socket.io-parser-3.3.2" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "3.3.1";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz";
-        sha512 = "1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz";
+        sha512 = "FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==";
       };
     };
     "socket.io-parser-3.4.1" = {
@@ -50325,13 +50253,13 @@ let
         sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==";
       };
     };
-    "socket.io-parser-4.0.3" = {
+    "socket.io-parser-4.0.4" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz";
-        sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz";
+        sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==";
       };
     };
     "sockjs-0.3.20" = {
@@ -51081,6 +51009,15 @@ let
         sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw==";
       };
     };
+    "sqlite3-5.0.1" = {
+      name = "sqlite3";
+      packageName = "sqlite3";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.1.tgz";
+        sha512 = "kh2lTIcYNfmVcvhVJihsYuPj9U0xzBbh6bmqILO2hkryWSC9RRhzYmkIDtJkJ+d8Kg4wZRJ0T1reyHUEspICfg==";
+      };
+    };
     "sqlstring-2.3.1" = {
       name = "sqlstring";
       packageName = "sqlstring";
@@ -51828,6 +51765,15 @@ let
         sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4";
       };
     };
+    "stream-buffers-3.0.2" = {
+      name = "stream-buffers";
+      packageName = "stream-buffers";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz";
+        sha512 = "DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==";
+      };
+    };
     "stream-chain-2.2.4" = {
       name = "stream-chain";
       packageName = "stream-chain";
@@ -52125,13 +52071,13 @@ let
         sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b";
       };
     };
-    "string-kit-0.11.8" = {
+    "string-kit-0.11.10" = {
       name = "string-kit";
       packageName = "string-kit";
-      version = "0.11.8";
+      version = "0.11.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.8.tgz";
-        sha512 = "lJyXXoptFpgOXL9cWZXtf45jxdbP5qYtaGZsmtFm4CZy9q6wwzvRzQcJiFeLx8I/0RpzBao9WCOGpbyfW2CMWA==";
+        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.10.tgz";
+        sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag==";
       };
     };
     "string-length-1.0.1" = {
@@ -52170,15 +52116,6 @@ let
         sha1 = "3aaad855b3e9735c5e412dfe72198ccf99c7f48e";
       };
     };
-    "string-range-1.2.2" = {
-      name = "string-range";
-      packageName = "string-range";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz";
-        sha1 = "a893ed347e72299bc83befbbf2a692a8d239d5dd";
-      };
-    };
     "string-similarity-2.0.0" = {
       name = "string-similarity";
       packageName = "string-similarity";
@@ -52683,13 +52620,13 @@ let
         sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa";
       };
     };
-    "strtok3-6.0.6" = {
+    "strtok3-6.0.8" = {
       name = "strtok3";
       packageName = "strtok3";
-      version = "6.0.6";
+      version = "6.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.6.tgz";
-        sha512 = "fVxvAEKDwHFfbQO1yKxKBPfkWZyBr0Zf20UQ/mblbkAQe5h0Xdd2jDb3Mh7yRZd7LSItJ9JWgQWelpEmVoBe2g==";
+        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz";
+        sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw==";
       };
     };
     "structured-source-3.0.2" = {
@@ -52737,13 +52674,13 @@ let
         sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==";
       };
     };
-    "stylelint-13.8.0" = {
+    "stylelint-13.9.0" = {
       name = "stylelint";
       packageName = "stylelint";
-      version = "13.8.0";
+      version = "13.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz";
-        sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==";
+        url = "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz";
+        sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg==";
       };
     };
     "stylelint-8.4.0" = {
@@ -53142,13 +53079,13 @@ let
         sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
       };
     };
-    "swagger-ui-dist-3.38.0" = {
+    "swagger-ui-dist-3.40.0" = {
       name = "swagger-ui-dist";
       packageName = "swagger-ui-dist";
-      version = "3.38.0";
+      version = "3.40.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.38.0.tgz";
-        sha512 = "sselV8VY6f1BBauY9Sdmwz0jVaWTnGuHQWei7BaTpiUrLcoEUdmmK5bKefLXiwq+dx//es2S8mOvUS+tcXDsKg==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.40.0.tgz";
+        sha512 = "R0eaS61/cOE6wiFOY7AtmoTBV5lZqmyosuE14G9nAudp5MNsNfCTdI9MWJLs8iF28HXdtH8EACiFFtUbQomHog==";
       };
     };
     "swagger2openapi-6.2.3" = {
@@ -53268,13 +53205,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.34.2" = {
+    "systeminformation-4.34.7" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.34.2";
+      version = "4.34.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.2.tgz";
-        sha512 = "1LynQMla38gIjzyupKBnBLIo4B0TQf3vdhs2bjKPtN02EymuSWpoAM1KX/6+gtFLVmn91MfllE3wSVGQcVTHDw==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.7.tgz";
+        sha512 = "cS3FiSZasFgVNjO9CP3aZmTO2VHwXKG+JN6Z85nWRyOzxRMNbZe7Xzwrewp42hj+OPMC3hk7MrAFyu/qLM65Mw==";
       };
     };
     "table-3.8.3" = {
@@ -53377,13 +53314,13 @@ let
         sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268";
       };
     };
-    "tail-2.1.1" = {
+    "tail-2.2.0" = {
       name = "tail";
       packageName = "tail";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tail/-/tail-2.1.1.tgz";
-        sha512 = "TBGFzKYD5Af/ts7DBypAQNmPQlt5Uq0bqcf4eRwnfvQcLnSTqruA8h3ps7CKIEPcwX7z9YnP3B6bBHLWYN7+ag==";
+        url = "https://registry.npmjs.org/tail/-/tail-2.2.0.tgz";
+        sha512 = "QqUMtWlnzArTvGyjVnAE5fAiXEm2Psvk/BlE7vWx2/dIEWMsAhcNPz7iW6WTiSM8h1fjtCkRMsaWBS1j6rpGBg==";
       };
     };
     "taketalk-1.0.0" = {
@@ -53485,6 +53422,15 @@ let
         sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==";
       };
     };
+    "tar-6.1.0" = {
+      name = "tar";
+      packageName = "tar";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz";
+        sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==";
+      };
+    };
     "tar-fs-1.16.3" = {
       name = "tar-fs";
       packageName = "tar-fs";
@@ -53728,13 +53674,13 @@ let
         sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==";
       };
     };
-    "terminal-kit-1.44.3" = {
+    "terminal-kit-1.45.5" = {
       name = "terminal-kit";
       packageName = "terminal-kit";
-      version = "1.44.3";
+      version = "1.45.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.44.3.tgz";
-        sha512 = "G7V7l2pqJqa5llfn/ORDgKlUMGG27n1nxuxwWmZ4/1hCURz+yldKrknirIeu/kyK5M3UdtgPJ0wGAAXw+0aVfw==";
+        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.45.5.tgz";
+        sha512 = "QWujGLA6xY0gSokQKWNR7A2pMfq7ZvkoZ5k5AschrAGkF1pFQuYalwoDRGOT+QFbme55CxEkzlaxRpWZE0qcyg==";
       };
     };
     "terminal-link-2.1.1" = {
@@ -53800,13 +53746,13 @@ let
         sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ==";
       };
     };
-    "terser-webpack-plugin-5.0.3" = {
+    "terser-webpack-plugin-5.1.1" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
-      version = "5.0.3";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz";
-        sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ==";
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz";
+        sha512 = "5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==";
       };
     };
     "test-exclude-6.0.0" = {
@@ -54592,13 +54538,13 @@ let
         sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
       };
     };
-    "token-types-2.0.0" = {
+    "token-types-2.1.1" = {
       name = "token-types";
       packageName = "token-types";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz";
-        sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw==";
+        url = "https://registry.npmjs.org/token-types/-/token-types-2.1.1.tgz";
+        sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q==";
       };
     };
     "toml-2.3.6" = {
@@ -55150,6 +55096,15 @@ let
         sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==";
       };
     };
+    "tslib-2.1.0" = {
+      name = "tslib";
+      packageName = "tslib";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz";
+        sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==";
+      };
+    };
     "tslint-5.20.1" = {
       name = "tslint";
       packageName = "tslint";
@@ -55186,13 +55141,13 @@ let
         sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
       };
     };
-    "tsutils-3.18.0" = {
+    "tsutils-3.19.1" = {
       name = "tsutils";
       packageName = "tsutils";
-      version = "3.18.0";
+      version = "3.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tsutils/-/tsutils-3.18.0.tgz";
-        sha512 = "D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA==";
+        url = "https://registry.npmjs.org/tsutils/-/tsutils-3.19.1.tgz";
+        sha512 = "GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw==";
       };
     };
     "ttf2woff-2.0.2" = {
@@ -55564,15 +55519,6 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "typedarray-to-buffer-1.0.4" = {
-      name = "typedarray-to-buffer";
-      packageName = "typedarray-to-buffer";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz";
-        sha1 = "9bb8ba0e841fb3f4cf1fe7c245e9f3fa8a5fe99c";
-      };
-    };
     "typedarray-to-buffer-3.1.5" = {
       name = "typedarray-to-buffer";
       packageName = "typedarray-to-buffer";
@@ -55717,13 +55663,13 @@ let
         sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==";
       };
     };
-    "ua-parser-js-0.7.22" = {
+    "ua-parser-js-0.7.23" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
-      version = "0.7.22";
+      version = "0.7.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz";
-        sha512 = "YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==";
+        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.23.tgz";
+        sha512 = "m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==";
       };
     };
     "uc.micro-1.0.6" = {
@@ -55744,15 +55690,6 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.11.6" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.11.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz";
-        sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==";
-      };
-    };
     "uglify-js-3.12.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -55762,6 +55699,15 @@ let
         sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
       };
     };
+    "uglify-js-3.12.5" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "3.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
+        sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
+      };
+    };
     "uglify-js-3.4.10" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -56842,13 +56788,13 @@ let
         sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa";
       };
     };
-    "uri-js-4.4.0" = {
+    "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
-        sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
+        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     };
     "urijs-1.19.5" = {
@@ -57212,6 +57158,15 @@ let
         sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==";
       };
     };
+    "util.promisify-1.1.1" = {
+      name = "util.promisify";
+      packageName = "util.promisify";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz";
+        sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==";
+      };
+    };
     "utila-0.4.0" = {
       name = "utila";
       packageName = "utila";
@@ -57329,15 +57284,6 @@ let
         sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==";
       };
     };
-    "uuid-8.3.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "8.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz";
-        sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==";
-      };
-    };
     "uuid-8.3.2" = {
       name = "uuid";
       packageName = "uuid";
@@ -57599,13 +57545,13 @@ let
         sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b";
       };
     };
-    "vega-5.17.3" = {
+    "vega-5.19.1" = {
       name = "vega";
       packageName = "vega";
-      version = "5.17.3";
+      version = "5.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega/-/vega-5.17.3.tgz";
-        sha512 = "c8N2pNg9MMmC6shNpoxVw3aVp2XPFOgmWNX5BEOAdCaGHRnSgzNy44+gYdGRaIe6+ljTzZg99Mf+OLO50IP42A==";
+        url = "https://registry.npmjs.org/vega/-/vega-5.19.1.tgz";
+        sha512 = "UE6/c9q9kzuz4HULFuU9HscBASoZa+zcXqGKdbQP545Nwmhd078QpcH+wZsq9lYfiTxmFtzLK/a0OH0zhkghvA==";
       };
     };
     "vega-canvas-1.2.6" = {
@@ -57689,13 +57635,13 @@ let
         sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A==";
       };
     };
-    "vega-functions-5.10.0" = {
+    "vega-functions-5.12.0" = {
       name = "vega-functions";
       packageName = "vega-functions";
-      version = "5.10.0";
+      version = "5.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.10.0.tgz";
-        sha512 = "1l28OxUwOj8FEvRU62Oz2hiTuDECrvx1DPU1qLebBKhlgaKbcCk3XyHrn1kUzhMKpXq+SFv5VPxchZP47ASSvQ==";
+        url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.0.tgz";
+        sha512 = "3hljmGs+gR7TbO/yYuvAP9P5laKISf1GKk4yRHLNdM61fWgKm8pI3f6LY2Hvq9cHQFTiJ3/5/Bx2p1SX5R4quQ==";
       };
     };
     "vega-geo-4.3.8" = {
@@ -57734,13 +57680,13 @@ let
         sha512 = "e5enQECdau7rJob0NFB5pGumh3RaaSWWm90+boxMy3ay2b4Ki/3XIvo+C4F1Lx04qSxvQF7tO2LJcklRm6nqRA==";
       };
     };
-    "vega-parser-6.1.2" = {
+    "vega-parser-6.1.3" = {
       name = "vega-parser";
       packageName = "vega-parser";
-      version = "6.1.2";
+      version = "6.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.2.tgz";
-        sha512 = "aGyZrNzPrBruEb/WhemKDuDjQsIkMDGIgnSJci0b+9ZVxjyAzMl7UfGbiYorPiJlnIercjUJbMoFD6fCIf4gqQ==";
+        url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.3.tgz";
+        sha512 = "8oiVhhW26GQ4GZBvolId8FVFvhn3s1KGgPlD7Z+4P2wkV+xe5Nqu0TEJ20F/cn3b88fd0Vj48X3BH3dlSeKNFg==";
       };
     };
     "vega-projection-1.4.5" = {
@@ -57779,22 +57725,22 @@ let
         sha512 = "yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA==";
       };
     };
-    "vega-scenegraph-4.9.2" = {
+    "vega-scenegraph-4.9.3" = {
       name = "vega-scenegraph";
       packageName = "vega-scenegraph";
-      version = "4.9.2";
+      version = "4.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.2.tgz";
-        sha512 = "epm1CxcB8AucXQlSDeFnmzy0FCj+HV2k9R6ch2lfLRln5lPLEfgJWgFcFhVf5jyheY0FSeHH52Q5zQn1vYI1Ow==";
+        url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.3.tgz";
+        sha512 = "lBvqLbXqrqRCTGJmSgzZC/tLR/o+TXfakbdhDzNdpgTavTaQ65S/67Gpj5hPpi77DvsfZUIY9lCEeO37aJhy0Q==";
       };
     };
-    "vega-selections-5.1.5" = {
+    "vega-selections-5.3.0" = {
       name = "vega-selections";
       packageName = "vega-selections";
-      version = "5.1.5";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.5.tgz";
-        sha512 = "oRSsfkqYqA5xfEJqDpgnSDd+w0k6p6SGYisMD6rGXMxuPl0x0Uy6RvDr4nbEtB+dpWdoWEvgrsZVS6axyDNWvQ==";
+        url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.0.tgz";
+        sha512 = "vC4NPsuN+IffruFXfH0L3i2A51RgG4PqpLv85TvrEAIYnSkyKDE4bf+wVraR3aPdnLLkc3+tYuMi6le5FmThIA==";
       };
     };
     "vega-statistics-1.7.9" = {
@@ -58229,13 +58175,13 @@ let
         sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
       };
     };
-    "vsce-1.83.0" = {
+    "vsce-1.84.0" = {
       name = "vsce";
       packageName = "vsce";
-      version = "1.83.0";
+      version = "1.84.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vsce/-/vsce-1.83.0.tgz";
-        sha512 = "gyF/xtCOFcKO+EvC0FQu5jPECHz2XKMWcw62gqwJJ22lVvlj58t49sWe1IGl9S5NpxCek+QMm6V9i/cDwGWs/Q==";
+        url = "https://registry.npmjs.org/vsce/-/vsce-1.84.0.tgz";
+        sha512 = "mRJDTMC/1GO7byz6dleY28CZo97cM1p0nU3EEMT5bGMpi5Yga3dKdgTvmwgSQF5BYWozNSNSqN1zih5SYzMZjA==";
       };
     };
     "vscode-css-languageservice-3.0.13" = {
@@ -58769,13 +58715,13 @@ let
         sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA==";
       };
     };
-    "vue-eslint-parser-7.3.0" = {
+    "vue-eslint-parser-7.4.1" = {
       name = "vue-eslint-parser";
       packageName = "vue-eslint-parser";
-      version = "7.3.0";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz";
-        sha512 = "n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw==";
+        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz";
+        sha512 = "AFvhdxpFvliYq1xt/biNBslTHE/zbEvSnr1qfHA/KxRIpErmEDrQZlQnvEexednRHmLfDNOMuDYwZL5xkLzIXQ==";
       };
     };
     "vue-onsenui-helper-json-1.0.2" = {
@@ -58868,15 +58814,6 @@ let
         sha1 = "340a717bde765726fa0aa07d721e0147a551df0c";
       };
     };
-    "watchpack-1.7.4" = {
-      name = "watchpack";
-      packageName = "watchpack";
-      version = "1.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz";
-        sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==";
-      };
-    };
     "watchpack-1.7.5" = {
       name = "watchpack";
       packageName = "watchpack";
@@ -58967,13 +58904,13 @@ let
         sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A==";
       };
     };
-    "webassemblyjs-1.9.1" = {
+    "webassemblyjs-1.11.0" = {
       name = "webassemblyjs";
       packageName = "webassemblyjs";
-      version = "1.9.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.9.1.tgz";
-        sha512 = "x0YxqLnuk8PjeZf5NOkmdQ4FwIRa7NlX3WIRhbpzSaGCih6la55TaATY4BpS81lMyjZvpdfKAQlLVzvd5G57fg==";
+        url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.11.0.tgz";
+        sha512 = "zAwCqHShTm/OBhYzqXlumetrI5yAkMFbFjnv8qba4WtP+KZIchkAml6zPDZWnxQQH2rs9TTbcbXrMVQplleJQA==";
       };
     };
     "webidl-conversions-2.0.1" = {
@@ -59030,6 +58967,15 @@ let
         sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==";
       };
     };
+    "webpack-4.46.0" = {
+      name = "webpack";
+      packageName = "webpack";
+      version = "4.46.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz";
+        sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==";
+      };
+    };
     "webpack-5.9.0" = {
       name = "webpack";
       packageName = "webpack";
@@ -59102,13 +59048,13 @@ let
         sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ==";
       };
     };
-    "webpack-merge-4.2.2" = {
+    "webpack-merge-5.7.3" = {
       name = "webpack-merge";
       packageName = "webpack-merge";
-      version = "4.2.2";
+      version = "5.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz";
-        sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==";
+        url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz";
+        sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==";
       };
     };
     "webpack-node-externals-2.5.2" = {
@@ -59426,13 +59372,22 @@ let
         sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA==";
       };
     };
-    "wikipeg-2.0.3" = {
+    "wikipeg-2.0.5" = {
       name = "wikipeg";
       packageName = "wikipeg";
-      version = "2.0.3";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.3.tgz";
-        sha512 = "VMVqiZRIFqb5rQYhRqvzPy5yFwJyCkjEdNAsSnq6ZxYH+7EN7/U+R3LrIx1Lf16pq+DZuWY3wrkq6YFhU8c0lg==";
+        url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.5.tgz";
+        sha512 = "FMNznSW4Qjexmgqz23YLtXoS6+GKPnbkEsI14xdRxsWv8jQWJ94ffQZ4PpUSsZm7/XAjqrjFiUnbvOOxBhJY4g==";
+      };
+    };
+    "wildcard-2.0.0" = {
+      name = "wildcard";
+      packageName = "wildcard";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz";
+        sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==";
       };
     };
     "win-detect-browsers-1.0.2" = {
@@ -60056,24 +60011,6 @@ let
         sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==";
       };
     };
-    "ws-7.3.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "7.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz";
-        sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==";
-      };
-    };
-    "ws-7.4.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "7.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz";
-        sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==";
-      };
-    };
     "ws-7.4.2" = {
       name = "ws";
       packageName = "ws";
@@ -60458,7 +60395,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         name = "xmlhttprequest-1.5.0.tar.gz";
-        url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433;
+        url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433";
         sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f";
       };
     };
@@ -60552,15 +60489,6 @@ let
         sha512 = "1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==";
       };
     };
-    "xtend-2.0.6" = {
-      name = "xtend";
-      packageName = "xtend";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz";
-        sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee";
-      };
-    };
     "xtend-2.1.2" = {
       name = "xtend";
       packageName = "xtend";
@@ -60570,24 +60498,6 @@ let
         sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b";
       };
     };
-    "xtend-2.2.0" = {
-      name = "xtend";
-      packageName = "xtend";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz";
-        sha1 = "eef6b1f198c1c8deafad8b1765a04dad4a01c5a9";
-      };
-    };
-    "xtend-3.0.0" = {
-      name = "xtend";
-      packageName = "xtend";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
-        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
-      };
-    };
     "xtend-4.0.2" = {
       name = "xtend";
       packageName = "xtend";
@@ -60696,13 +60606,13 @@ let
         sha512 = "26QP9JhfcrroDTeMv2OsY4eoI+NKb6tZwy1Uz0MBWi1uGmOw0/6aR9Oa3guOsC96U27GAqT6glRFMjCGqLro7A==";
       };
     };
-    "yaml-language-server-parser-0.1.1" = {
+    "yaml-language-server-parser-0.1.2" = {
       name = "yaml-language-server-parser";
       packageName = "yaml-language-server-parser";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.1.tgz";
-        sha512 = "2PememGb1SrPqXAxXTpBD39rwYZap6CJVSvkfULNv9uwV3VHp1TfkgpsylBb+mpuuivH0JZ52lChXPvNa6yVxw==";
+        url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.2.tgz";
+        sha512 = "GQ2eRE5GcKBK8XVKBIcMyOfC8WMZmEs6gogtVc6knLKE6pG+e5L/lOMfBxZzAt2lqye5itMggQ9+6stXAVhMsw==";
       };
     };
     "yaml-language-server-parser-0.1.3-fa8245c.0" = {
@@ -61215,70 +61125,85 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "11.0.5";
+    version = "11.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.5.tgz";
-      sha512 = "k4j/2z7qkuigJ1shH0McW1wW63clhrbrg98FK4/KWhU/sce5AgVjuHDQFycAclTwHesf7Vs6Gzt7zGlqUmeKIg==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-11.1.0.tgz";
+      sha512 = "9QirgfU7+scdi2UASSlEdqkp1Jva3IiesIUIuxeF7scrFCnk/rZIJ9iSvPJ9qUXYpFYyxpX0aPEBvM/HDExeFQ==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.1100.5"
-      sources."@angular-devkit/core-11.0.5"
-      sources."@angular-devkit/schematics-11.0.5"
-      sources."@schematics/angular-11.0.5"
-      sources."@schematics/update-0.1100.5"
+      sources."@angular-devkit/architect-0.1101.0"
+      sources."@angular-devkit/core-11.1.0"
+      sources."@angular-devkit/schematics-11.1.0"
+      sources."@npmcli/ci-detect-1.3.0"
+      sources."@npmcli/git-2.0.4"
+      sources."@npmcli/installed-package-contents-1.0.5"
+      (sources."@npmcli/move-file-1.1.0" // {
+        dependencies = [
+          sources."rimraf-2.7.1"
+        ];
+      })
+      sources."@npmcli/node-gyp-1.0.1"
+      sources."@npmcli/promise-spawn-1.3.2"
+      sources."@npmcli/run-script-1.8.1"
+      sources."@schematics/angular-11.1.0"
+      sources."@schematics/update-0.1101.0"
+      sources."@tootallnate/once-1.1.2"
       sources."@yarnpkg/lockfile-1.1.0"
-      sources."JSONStream-1.3.5"
-      sources."agent-base-4.3.0"
-      sources."agentkeepalive-3.5.2"
+      sources."abbrev-1.1.1"
+      sources."agent-base-6.0.2"
+      sources."agentkeepalive-4.1.3"
+      sources."aggregate-error-3.1.0"
       sources."ajv-6.12.6"
       sources."ansi-colors-4.1.1"
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."aproba-1.2.0"
+      (sources."are-we-there-yet-1.1.5" // {
+        dependencies = [
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
+        ];
+      })
+      sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."bluebird-3.7.2"
+      sources."bl-4.0.3"
       sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.1.1"
+      sources."buffer-5.7.1"
       sources."builtins-1.0.3"
-      (sources."cacache-12.0.4" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."rimraf-2.7.1"
-          sources."yallist-3.1.1"
-        ];
-      })
+      sources."cacache-15.0.5"
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."chardet-0.7.0"
-      sources."chownr-1.1.4"
+      sources."chownr-2.0.0"
+      sources."clean-stack-2.2.0"
       sources."cli-cursor-3.1.0"
       sources."cli-spinners-2.5.0"
       sources."cli-width-3.0.0"
       sources."clone-1.0.4"
+      sources."code-point-at-1.1.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      (sources."copy-concurrently-1.0.5" // {
-        dependencies = [
-          sources."rimraf-2.7.1"
-        ];
-      })
+      sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."cyclist-1.0.1"
       sources."dashdash-1.14.1"
-      sources."debug-4.2.0"
+      sources."debug-4.3.1"
+      sources."debuglog-1.0.1"
       sources."defaults-1.0.3"
       sources."delayed-stream-1.0.0"
-      sources."duplexify-3.7.1"
+      sources."delegates-1.0.0"
+      sources."depd-1.1.2"
+      sources."dezalgo-1.0.3"
       sources."ecc-jsbn-0.1.2"
       sources."emoji-regex-8.0.0"
       (sources."encoding-0.1.13" // {
@@ -61286,28 +61211,28 @@ in
           sources."iconv-lite-0.6.2"
         ];
       })
-      sources."end-of-stream-1.4.4"
+      sources."env-paths-2.2.0"
       sources."err-code-1.1.2"
-      sources."es6-promise-4.2.8"
-      sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."figgy-pudding-3.5.2"
       sources."figures-3.2.0"
-      sources."flush-write-stream-1.1.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."from2-2.3.0"
-      sources."fs-minipass-1.2.7"
-      sources."fs-write-stream-atomic-1.0.10"
+      sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."genfun-5.0.0"
-      sources."get-stream-4.1.0"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
@@ -61315,202 +61240,136 @@ in
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
+      sources."has-unicode-2.0.1"
       sources."hosted-git-info-3.0.7"
-      sources."http-cache-semantics-3.8.1"
-      (sources."http-proxy-agent-2.1.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."http-cache-semantics-4.1.0"
+      sources."http-proxy-agent-4.0.1"
       sources."http-signature-1.2.0"
-      (sources."https-proxy-agent-2.2.4" // {
-        dependencies = [
-          sources."debug-3.2.7"
-        ];
-      })
+      sources."https-proxy-agent-5.0.0"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.4.24"
-      sources."iferr-0.1.5"
+      sources."ieee754-1.2.1"
       sources."ignore-walk-3.0.3"
       sources."imurmurhash-0.1.4"
+      sources."indent-string-4.0.0"
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.6"
+      sources."ini-2.0.0"
       sources."inquirer-7.3.3"
       sources."ip-1.1.5"
       sources."is-core-module-2.2.0"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-interactive-1.0.0"
+      sources."is-lambda-1.0.1"
       sources."is-typedarray-1.0.0"
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
-      sources."json-parse-better-errors-1.0.2"
+      sources."json-parse-even-better-errors-2.3.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonc-parser-2.3.1"
+      sources."jsonc-parser-3.0.0"
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
       sources."lodash-4.17.20"
       sources."log-symbols-4.0.0"
       sources."lru-cache-6.0.0"
       sources."magic-string-0.25.7"
-      (sources."make-fetch-happen-5.0.2" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.1.1"
-        ];
-      })
+      sources."make-fetch-happen-8.0.13"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
-      (sources."minipass-2.9.0" // {
-        dependencies = [
-          sources."yallist-3.1.1"
-        ];
-      })
-      sources."minizlib-1.3.3"
-      sources."mississippi-3.0.0"
-      sources."mkdirp-0.5.5"
-      (sources."move-concurrently-1.0.1" // {
-        dependencies = [
-          sources."rimraf-2.7.1"
-        ];
-      })
+      sources."minipass-3.1.3"
+      sources."minipass-collect-1.0.2"
+      sources."minipass-fetch-1.3.3"
+      sources."minipass-flush-1.0.5"
+      sources."minipass-json-stream-1.0.1"
+      sources."minipass-pipeline-1.2.4"
+      sources."minipass-sized-1.0.3"
+      sources."minizlib-2.1.2"
+      sources."mkdirp-1.0.4"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
-      sources."node-fetch-npm-2.0.4"
-      (sources."normalize-package-data-2.5.0" // {
-        dependencies = [
-          sources."hosted-git-info-2.8.8"
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."node-gyp-7.1.2"
+      sources."nopt-5.0.0"
       sources."npm-bundled-1.1.1"
       sources."npm-install-checks-4.0.0"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-package-arg-8.1.0"
-      sources."npm-packlist-1.4.8"
+      sources."npm-packlist-2.1.4"
       sources."npm-pick-manifest-6.1.0"
-      (sources."npm-registry-fetch-4.0.7" // {
-        dependencies = [
-          sources."hosted-git-info-2.8.8"
-          sources."lru-cache-5.1.1"
-          sources."npm-package-arg-6.1.1"
-          sources."semver-5.7.1"
-          sources."yallist-3.1.1"
-        ];
-      })
+      sources."npm-registry-fetch-9.0.0"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."open-7.3.0"
-      sources."ora-5.1.0"
-      sources."os-homedir-1.0.2"
+      sources."open-7.3.1"
+      sources."ora-5.2.0"
       sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      (sources."pacote-9.5.12" // {
-        dependencies = [
-          sources."hosted-git-info-2.8.8"
-          sources."lru-cache-5.1.1"
-          sources."npm-package-arg-6.1.1"
-          sources."npm-pick-manifest-3.0.2"
-          sources."rimraf-2.7.1"
-          sources."semver-5.7.1"
-          sources."yallist-3.1.1"
-        ];
-      })
-      sources."parallel-transform-1.2.0"
+      sources."p-map-4.0.0"
+      sources."pacote-11.1.14"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-1.1.1"
-      sources."protoduck-5.0.1"
       sources."psl-1.8.0"
-      sources."pump-3.0.0"
-      (sources."pumpify-1.5.1" // {
-        dependencies = [
-          sources."pump-2.0.1"
-        ];
-      })
+      sources."puka-1.0.1"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      (sources."readable-stream-2.3.7" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."read-package-json-fast-1.2.1"
+      sources."readable-stream-3.6.0"
+      sources."readdir-scoped-modules-1.1.0"
       (sources."request-2.88.2" // {
         dependencies = [
           sources."uuid-3.4.0"
         ];
       })
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."restore-cursor-3.1.0"
       sources."retry-0.10.1"
       sources."rimraf-3.0.2"
       sources."run-async-2.4.1"
-      sources."run-queue-1.0.3"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.2"
+      sources."semver-7.3.4"
       (sources."semver-intersect-1.4.0" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
+      sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.3"
       sources."smart-buffer-4.1.0"
-      sources."socks-2.3.3"
-      (sources."socks-proxy-agent-4.0.2" // {
-        dependencies = [
-          sources."agent-base-4.2.1"
-        ];
-      })
+      sources."socks-2.5.1"
+      sources."socks-proxy-agent-5.0.0"
       sources."source-map-0.7.3"
       sources."sourcemap-codec-1.4.8"
-      sources."spdx-correct-3.1.1"
-      sources."spdx-exceptions-2.3.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.7"
       sources."sshpk-1.16.1"
-      sources."ssri-6.0.1"
-      sources."stream-each-1.2.3"
-      sources."stream-shift-1.0.1"
+      sources."ssri-8.0.0"
       sources."string-width-4.2.0"
-      (sources."string_decoder-1.1.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."string_decoder-1.3.0"
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
-      sources."symbol-observable-2.0.3"
-      (sources."tar-4.4.13" // {
-        dependencies = [
-          sources."yallist-3.1.1"
-        ];
-      })
+      sources."symbol-observable-3.0.0"
+      sources."tar-6.1.0"
       sources."through-2.3.8"
-      sources."through2-2.0.5"
       sources."tmp-0.0.33"
       sources."tough-cookie-2.5.0"
       sources."tslib-1.14.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.11.0"
-      sources."typedarray-0.0.6"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
       (sources."universal-analytics-0.4.23" // {
@@ -61518,23 +61377,28 @@ in
           sources."uuid-3.4.0"
         ];
       })
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-8.3.1"
-      sources."validate-npm-package-license-3.0.4"
+      sources."uuid-8.3.2"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
-      sources."which-1.3.1"
+      sources."which-2.0.2"
+      (sources."wide-align-1.1.3" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."wrappy-1.0.2"
-      sources."xtend-4.0.2"
-      sources."y18n-4.0.1"
       sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "CLI tool for Angular";
-      homepage = https://github.com/angular/angular-cli;
+      homepage = "https://github.com/angular/angular-cli";
       license = "MIT";
     };
     production = true;
@@ -61571,7 +61435,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The command line interface for Antora.";
-      homepage = https://antora.org/;
+      homepage = "https://antora.org";
       license = "MPL-2.0";
     };
     production = true;
@@ -61627,7 +61491,7 @@ in
           sources."pump-3.0.0"
         ];
       })
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
       sources."clean-git-ref-2.0.1"
@@ -61857,7 +61721,7 @@ in
         ];
       })
       sources."to-utf8-0.0.1"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
@@ -61887,7 +61751,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The default site generator pipeline for producing and publishing static documentation sites with Antora.";
-      homepage = https://antora.org/;
+      homepage = "https://antora.org";
       license = "MPL-2.0";
     };
     production = true;
@@ -62035,7 +61899,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."w3c-hr-time-1.0.2"
@@ -62053,7 +61917,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A secure and free password manager for all of your devices.";
-      homepage = https://bitwarden.com/;
+      homepage = "https://bitwarden.com";
       license = "GPL-3.0";
     };
     production = true;
@@ -62095,9 +61959,9 @@ in
       sources."@types/eslint-7.2.6"
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
-      sources."@types/json-schema-7.0.6"
+      sources."@types/json-schema-7.0.7"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
@@ -62142,13 +62006,13 @@ in
       sources."anymatch-3.1.1"
       sources."at-least-node-1.0.0"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       sources."buffer-from-1.1.1"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."chokidar-3.4.3"
@@ -62169,10 +62033,10 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.3.0"
+      sources."enhanced-resolve-4.5.0"
       sources."errno-0.1.8"
       sources."error-ex-1.3.2"
       sources."escalade-3.1.1"
@@ -62247,7 +62111,7 @@ in
         ];
       })
       sources."lines-and-columns-1.1.6"
-      sources."loader-runner-4.1.0"
+      sources."loader-runner-4.2.0"
       sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lodash.toarray-4.4.0"
@@ -62270,7 +62134,7 @@ in
       sources."mute-stream-0.0.8"
       sources."neo-async-2.6.2"
       sources."node-emoji-1.10.0"
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-4.0.1"
       sources."object-assign-4.1.1"
@@ -62289,7 +62153,7 @@ in
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."parent-module-1.0.1"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
@@ -62342,7 +62206,7 @@ in
           sources."commander-2.20.3"
         ];
       })
-      (sources."terser-webpack-plugin-5.0.3" // {
+      (sources."terser-webpack-plugin-5.1.1" // {
         dependencies = [
           sources."p-limit-3.1.0"
           sources."schema-utils-3.0.0"
@@ -62368,13 +62232,13 @@ in
       sources."type-fest-0.11.0"
       sources."typescript-4.0.5"
       sources."universalify-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."watchpack-2.1.0"
       sources."wcwidth-1.0.1"
       (sources."webpack-5.9.0" // {
         dependencies = [
-          sources."enhanced-resolve-5.4.1"
+          sources."enhanced-resolve-5.7.0"
           sources."schema-utils-3.0.0"
           sources."tapable-2.2.0"
         ];
@@ -62405,17 +62269,21 @@ in
   "@vue/cli" = nodeEnv.buildNodePackage {
     name = "_at_vue_slash_cli";
     packageName = "@vue/cli";
-    version = "4.5.9";
+    version = "4.5.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.9.tgz";
-      sha512 = "R6fRau8+fqKI+94LrruKtJDaMQGVsJCNzrdefTJ+bn+ljtCS6j9H+XuU8zLa9+X0HBkX4VoBT7XjfwUAo1IIPA==";
+      url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.10.tgz";
+      sha512 = "+D54DdYcirXtV7f6G7WkDSt1nnzmgA17rRu3qhgOlwIaZ5xaJSroDzLgdgizvg4gJ2yJNCmoKrK1FXnjqTdIyQ==";
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
-      sources."@apollo/federation-0.20.7"
+      (sources."@apollo/federation-0.20.7" // {
+        dependencies = [
+          sources."apollo-server-env-2.4.5"
+        ];
+      })
       (sources."@apollo/protobufjs-1.0.5" // {
         dependencies = [
-          sources."@types/node-10.17.50"
+          sources."@types/node-10.17.51"
         ];
       })
       sources."@apollographql/apollo-tools-0.4.8"
@@ -62432,7 +62300,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      (sources."@babel/generator-7.12.10" // {
+      (sources."@babel/generator-7.12.11" // {
         dependencies = [
           sources."@babel/types-7.12.12"
         ];
@@ -62612,7 +62480,6 @@ in
       })
       (sources."@babel/traverse-7.12.12" // {
         dependencies = [
-          sources."@babel/generator-7.12.11"
           sources."@babel/types-7.12.12"
         ];
       })
@@ -62646,14 +62513,13 @@ in
           sources."@oclif/plugin-help-3.2.1"
           sources."lru-cache-6.0.0"
           sources."semver-7.3.4"
-          sources."yallist-4.0.0"
         ];
       })
       (sources."@oclif/config-1.17.0" // {
         dependencies = [
-          sources."globby-11.0.1"
+          sources."globby-11.0.2"
           sources."is-wsl-2.2.0"
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."@oclif/errors-1.3.4" // {
@@ -62669,15 +62535,17 @@ in
       })
       sources."@oclif/linewrap-1.0.0"
       sources."@oclif/parser-3.8.5"
-      (sources."@oclif/plugin-autocomplete-0.2.1" // {
+      (sources."@oclif/plugin-autocomplete-0.3.0" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
-          (sources."jsonfile-6.1.0" // {
-            dependencies = [
-              sources."universalify-2.0.0"
-            ];
-          })
-          sources."universalify-1.0.0"
+          sources."ansi-styles-4.3.0"
+          sources."chalk-4.1.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."fs-extra-9.1.0"
+          sources."has-flag-4.0.0"
+          sources."jsonfile-6.1.0"
+          sources."supports-color-7.2.0"
+          sources."universalify-2.0.0"
         ];
       })
       (sources."@oclif/plugin-help-2.2.3" // {
@@ -62703,15 +62571,22 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      (sources."@oclif/plugin-plugins-1.9.4" // {
+      (sources."@oclif/plugin-plugins-1.9.5" // {
         dependencies = [
-          sources."fs-extra-8.1.0"
+          sources."ansi-styles-4.3.0"
+          sources."chalk-4.1.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."fs-extra-9.1.0"
+          sources."has-flag-4.0.0"
+          sources."jsonfile-6.1.0"
           sources."lru-cache-6.0.0"
           sources."npm-run-path-4.0.1"
           sources."path-key-3.1.1"
           sources."semver-7.3.4"
-          sources."tslib-2.0.3"
-          sources."yallist-4.0.0"
+          sources."supports-color-7.2.0"
+          sources."tslib-2.1.0"
+          sources."universalify-2.0.0"
         ];
       })
       (sources."@oclif/plugin-warn-if-update-available-1.7.0" // {
@@ -62762,9 +62637,9 @@ in
       sources."@types/koa-2.11.6"
       sources."@types/koa-compose-3.2.5"
       sources."@types/long-4.0.1"
-      sources."@types/mime-2.0.3"
+      sources."@types/mime-1.3.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -62773,18 +62648,18 @@ in
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
-      sources."@types/serve-static-1.13.8"
+      sources."@types/serve-static-1.13.9"
       sources."@types/through-0.0.30"
       sources."@types/ws-7.4.0"
       sources."@types/zen-observable-0.8.2"
-      sources."@vue/cli-shared-utils-4.5.9"
-      (sources."@vue/cli-ui-4.5.9" // {
+      sources."@vue/cli-shared-utils-4.5.10"
+      (sources."@vue/cli-ui-4.5.10" // {
         dependencies = [
           sources."clone-2.1.2"
         ];
       })
-      sources."@vue/cli-ui-addon-webpack-4.5.9"
-      sources."@vue/cli-ui-addon-widgets-4.5.9"
+      sources."@vue/cli-ui-addon-webpack-4.5.10"
+      sources."@vue/cli-ui-addon-widgets-4.5.10"
       (sources."@vue/compiler-core-3.0.5" // {
         dependencies = [
           sources."@babel/types-7.12.12"
@@ -62846,28 +62721,28 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      (sources."apollo-2.32.0" // {
+      (sources."apollo-2.32.1" // {
         dependencies = [
           sources."mkdirp-1.0.4"
           sources."strip-ansi-5.2.0"
         ];
       })
       sources."apollo-cache-1.3.5"
-      sources."apollo-cache-control-0.11.5"
+      sources."apollo-cache-control-0.11.6"
       sources."apollo-cache-inmemory-1.6.6"
       sources."apollo-client-2.6.10"
-      (sources."apollo-codegen-core-0.39.0" // {
+      (sources."apollo-codegen-core-0.39.1" // {
         dependencies = [
           sources."recast-0.20.4"
           sources."source-map-0.6.1"
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
-      sources."apollo-codegen-flow-0.37.0"
-      sources."apollo-codegen-scala-0.38.0"
-      sources."apollo-codegen-swift-0.39.0"
-      sources."apollo-codegen-typescript-0.39.0"
-      sources."apollo-datasource-0.7.2"
+      sources."apollo-codegen-flow-0.37.1"
+      sources."apollo-codegen-scala-0.38.1"
+      sources."apollo-codegen-swift-0.39.1"
+      sources."apollo-codegen-typescript-0.39.1"
+      sources."apollo-datasource-0.7.3"
       sources."apollo-env-0.6.5"
       sources."apollo-graphql-0.6.0"
       sources."apollo-language-server-1.25.0"
@@ -62880,18 +62755,23 @@ in
       sources."apollo-link-state-0.4.2"
       sources."apollo-link-ws-1.0.20"
       sources."apollo-reporting-protobuf-0.6.2"
-      sources."apollo-server-caching-0.5.2"
-      (sources."apollo-server-core-2.19.1" // {
+      (sources."apollo-server-caching-0.5.3" // {
         dependencies = [
+          sources."lru-cache-6.0.0"
+        ];
+      })
+      (sources."apollo-server-core-2.19.2" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
           sources."uuid-8.3.2"
         ];
       })
-      sources."apollo-server-env-2.4.5"
+      sources."apollo-server-env-3.0.0"
       sources."apollo-server-errors-2.4.2"
-      sources."apollo-server-express-2.19.1"
-      sources."apollo-server-plugin-base-0.10.3"
-      sources."apollo-server-types-0.6.2"
-      sources."apollo-tracing-0.12.1"
+      sources."apollo-server-express-2.19.2"
+      sources."apollo-server-plugin-base-0.10.4"
+      sources."apollo-server-types-0.6.3"
+      sources."apollo-tracing-0.12.2"
       sources."apollo-upload-client-11.0.0"
       sources."apollo-utilities-1.3.4"
       (sources."archive-type-4.0.0" // {
@@ -62918,7 +62798,7 @@ in
       sources."assign-symbols-1.0.0"
       (sources."ast-types-0.14.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."astral-regex-1.0.0"
@@ -62982,7 +62862,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -63000,24 +62880,26 @@ in
           sources."lowercase-keys-1.0.0"
           sources."normalize-url-2.0.1"
           sources."prepend-http-2.0.0"
+          sources."query-string-5.1.1"
           sources."sort-keys-2.0.0"
+          sources."strict-uri-encode-1.1.0"
         ];
       })
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       (sources."camel-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       (sources."capital-case-1.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."capture-stack-trace-1.0.1"
@@ -63027,7 +62909,7 @@ in
       sources."chalk-2.4.2"
       (sources."change-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."chardet-0.7.0"
@@ -63093,9 +62975,8 @@ in
           sources."semver-7.3.4"
           sources."supports-color-7.2.0"
           sources."supports-hyperlinks-2.1.0"
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
           sources."type-fest-0.11.0"
-          sources."yallist-4.0.0"
         ];
       })
       sources."cli-width-3.0.0"
@@ -63128,7 +63009,7 @@ in
       sources."consolidate-0.16.0"
       (sources."constant-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."content-disposition-0.5.3" // {
@@ -63145,8 +63026,8 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.2"
-      (sources."core-js-compat-3.8.2" // {
+      sources."core-js-3.8.3"
+      (sources."core-js-compat-3.8.3" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -63222,7 +63103,7 @@ in
       sources."dir-glob-3.0.1"
       (sources."dot-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."dot-prop-4.2.1"
@@ -63242,7 +63123,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -63252,7 +63133,7 @@ in
       sources."env-ci-3.2.2"
       sources."envinfo-7.7.3"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."es6-error-4.1.1"
       sources."escalade-3.1.1"
@@ -63309,7 +63190,7 @@ in
       sources."extract-stack-1.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fastq-1.10.0"
@@ -63334,7 +63215,8 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.141.0"
+      sources."flow-parser-0.143.0"
+      sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -63363,14 +63245,19 @@ in
       sources."getpass-0.1.7"
       sources."git-clone-0.1.0"
       sources."git-config-path-1.0.1"
-      sources."git-parse-1.0.4"
+      (sources."git-parse-1.0.4" // {
+        dependencies = [
+          sources."es-abstract-1.17.7"
+          sources."util.promisify-1.0.1"
+        ];
+      })
       (sources."git-rev-sync-2.1.0" // {
         dependencies = [
           sources."graceful-fs-4.1.15"
         ];
       })
       sources."git-up-4.0.2"
-      sources."git-url-parse-11.4.0"
+      sources."git-url-parse-11.4.3"
       sources."glob-7.1.5"
       sources."glob-parent-5.1.1"
       sources."glob-to-regexp-0.3.0"
@@ -63378,7 +63265,6 @@ in
         dependencies = [
           sources."lru-cache-6.0.0"
           sources."semver-7.3.4"
-          sources."yallist-4.0.0"
         ];
       })
       sources."global-dirs-0.1.1"
@@ -63432,7 +63318,7 @@ in
           sources."ts-invariant-0.3.3"
         ];
       })
-      sources."graphql-extensions-0.12.7"
+      sources."graphql-extensions-0.12.8"
       sources."graphql-subscriptions-1.1.0"
       sources."graphql-tag-2.11.0"
       sources."graphql-tools-4.0.8"
@@ -63466,7 +63352,7 @@ in
       sources."hash.js-1.1.7"
       (sources."header-case-2.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."homedir-polyfill-1.0.3"
@@ -63665,7 +63551,7 @@ in
       sources."lowdb-1.0.0"
       (sources."lower-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."lowercase-keys-1.0.1"
@@ -63733,7 +63619,7 @@ in
       sources."nice-try-1.0.5"
       (sources."no-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."node-dir-0.1.17"
@@ -63745,7 +63631,7 @@ in
           sources."is-wsl-2.2.0"
         ];
       })
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -63785,11 +63671,7 @@ in
       sources."object-treeify-1.1.31"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      (sources."object.getownpropertydescriptors-2.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."object.pick-1.3.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
@@ -63818,25 +63700,29 @@ in
       })
       (sources."param-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."parse-git-config-2.0.3"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."parse-passwd-1.0.0"
-      sources."parse-path-4.0.2"
+      (sources."parse-path-4.0.3" // {
+        dependencies = [
+          sources."qs-6.9.6"
+        ];
+      })
       sources."parse-url-5.0.2"
       sources."parseurl-1.3.3"
       (sources."pascal-case-3.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."pascalcase-0.1.1"
       sources."password-prompt-1.1.2"
       (sources."path-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."path-dirname-1.0.2"
@@ -63856,6 +63742,7 @@ in
           sources."execa-0.9.0"
           sources."get-stream-3.0.0"
           sources."lru-cache-4.1.5"
+          sources."yallist-2.1.2"
         ];
       })
       sources."pify-3.0.0"
@@ -63898,7 +63785,7 @@ in
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."query-string-5.1.1"
+      sources."query-string-6.13.8"
       sources."range-parser-1.2.1"
       (sources."raw-body-2.4.0" // {
         dependencies = [
@@ -63956,7 +63843,7 @@ in
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.4" // {
+      (sources."regjsparser-0.6.6" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -64009,7 +63896,7 @@ in
       })
       (sources."sentence-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."serialize-error-7.0.1" // {
@@ -64033,7 +63920,7 @@ in
       sources."slice-ansi-0.0.4"
       (sources."snake-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."snapdragon-0.8.2" // {
@@ -64079,6 +63966,7 @@ in
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.7"
+      sources."split-on-first-1.1.0"
       (sources."split-string-3.1.0" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -64108,7 +63996,7 @@ in
       sources."statuses-1.5.0"
       sources."steno-0.4.4"
       sources."streamsearch-0.1.2"
-      sources."strict-uri-encode-1.1.0"
+      sources."strict-uri-encode-2.0.0"
       sources."string-hash-1.1.3"
       sources."string-width-4.2.0"
       sources."string.prototype.trimend-1.0.3"
@@ -64183,6 +64071,7 @@ in
           sources."execa-0.7.0"
           sources."get-stream-3.0.0"
           sources."lru-cache-4.1.5"
+          sources."yallist-2.1.2"
         ];
       })
       sources."through-2.3.8"
@@ -64257,21 +64146,21 @@ in
       })
       (sources."upper-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."upper-case-first-2.0.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       sources."url-to-options-1.0.1"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.0.1"
+      sources."util.promisify-1.1.1"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
@@ -64329,7 +64218,7 @@ in
       sources."xss-1.0.8"
       sources."xtend-4.0.2"
       sources."y18n-4.0.1"
-      sources."yallist-2.1.2"
+      sources."yallist-4.0.0"
       (sources."yaml-front-matter-3.4.1" // {
         dependencies = [
           sources."commander-1.0.0"
@@ -64357,7 +64246,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command line interface for rapid Vue.js development";
-      homepage = https://cli.vuejs.org/;
+      homepage = "https://cli.vuejs.org/";
       license = "MIT";
     };
     production = true;
@@ -64367,31 +64256,31 @@ in
   "@webassemblyjs/cli" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_cli";
     packageName = "@webassemblyjs/cli";
-    version = "1.9.1";
+    version = "1.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.9.1.tgz";
-      sha512 = "OMu4uSrLdv1bJRrV+zbl6DszJiYaSUwfeigoGMkZvVHzh686pmzka9Bbz85es9Az/dnantDDIokEPSx1FQYm4A==";
+      url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.11.0.tgz";
+      sha512 = "mQjMqOSOCu1lsA7cVvCKkK/IBED+qUtjrSuFhLBSEusHu5IqhzWFWnappMRpA424lNDMScsxry5jhbM+c9wyEg==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.9.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
-      sources."@webassemblyjs/helper-api-error-1.9.1"
-      sources."@webassemblyjs/helper-code-frame-1.9.1"
-      sources."@webassemblyjs/helper-compiler-1.9.1"
-      sources."@webassemblyjs/helper-flatten-ast-1.9.1"
-      sources."@webassemblyjs/helper-fsm-1.9.1"
-      sources."@webassemblyjs/helper-module-context-1.9.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
-      sources."@webassemblyjs/ieee754-1.9.1"
-      sources."@webassemblyjs/leb128-1.9.1"
-      sources."@webassemblyjs/utf8-1.9.1"
-      sources."@webassemblyjs/validation-1.9.1"
-      sources."@webassemblyjs/wasm-parser-1.9.1"
-      sources."@webassemblyjs/wast-parser-1.9.1"
-      sources."@webassemblyjs/wast-printer-1.9.1"
+      sources."@webassemblyjs/ast-1.11.0"
+      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
+      sources."@webassemblyjs/helper-api-error-1.11.0"
+      sources."@webassemblyjs/helper-code-frame-1.11.0"
+      sources."@webassemblyjs/helper-compiler-1.11.0"
+      sources."@webassemblyjs/helper-flatten-ast-1.11.0"
+      sources."@webassemblyjs/helper-fsm-1.11.0"
+      sources."@webassemblyjs/helper-numbers-1.11.0"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
+      sources."@webassemblyjs/ieee754-1.11.0"
+      sources."@webassemblyjs/leb128-1.11.0"
+      sources."@webassemblyjs/utf8-1.11.0"
+      sources."@webassemblyjs/validation-1.11.0"
+      sources."@webassemblyjs/wasm-parser-1.11.0"
+      sources."@webassemblyjs/wast-parser-1.11.0"
+      sources."@webassemblyjs/wast-printer-1.11.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."webassemblyjs-1.9.1"
+      sources."webassemblyjs-1.11.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64406,31 +64295,31 @@ in
   "@webassemblyjs/repl" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_repl";
     packageName = "@webassemblyjs/repl";
-    version = "1.9.1";
+    version = "1.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.9.1.tgz";
-      sha512 = "190S+kS/qWfwt/c/QSpRmZpZV57WEL4Cbz2KZu+z5HAg+e53LXxC4XfpxHdsw+1Lo8Z4QB7nI+5xIr2mH+2ZjQ==";
+      url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.11.0.tgz";
+      sha512 = "U+f6IHDVPOdj1C22AMb8+xEq5OpEhXKcTl+YyMEqRtUdAt6CVkoeHdaPVv4iDfBaxR15nds8DRq+gHjCncrA3Q==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.9.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
-      sources."@webassemblyjs/helper-api-error-1.9.1"
-      sources."@webassemblyjs/helper-code-frame-1.9.1"
-      sources."@webassemblyjs/helper-compiler-1.9.1"
-      sources."@webassemblyjs/helper-flatten-ast-1.9.1"
-      sources."@webassemblyjs/helper-fsm-1.9.1"
-      sources."@webassemblyjs/helper-module-context-1.9.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
-      sources."@webassemblyjs/ieee754-1.9.1"
-      sources."@webassemblyjs/leb128-1.9.1"
-      sources."@webassemblyjs/utf8-1.9.1"
-      sources."@webassemblyjs/validation-1.9.1"
-      sources."@webassemblyjs/wasm-parser-1.9.1"
-      sources."@webassemblyjs/wast-parser-1.9.1"
-      sources."@webassemblyjs/wast-printer-1.9.1"
+      sources."@webassemblyjs/ast-1.11.0"
+      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
+      sources."@webassemblyjs/helper-api-error-1.11.0"
+      sources."@webassemblyjs/helper-code-frame-1.11.0"
+      sources."@webassemblyjs/helper-compiler-1.11.0"
+      sources."@webassemblyjs/helper-flatten-ast-1.11.0"
+      sources."@webassemblyjs/helper-fsm-1.11.0"
+      sources."@webassemblyjs/helper-numbers-1.11.0"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
+      sources."@webassemblyjs/ieee754-1.11.0"
+      sources."@webassemblyjs/leb128-1.11.0"
+      sources."@webassemblyjs/utf8-1.11.0"
+      sources."@webassemblyjs/validation-1.11.0"
+      sources."@webassemblyjs/wasm-parser-1.11.0"
+      sources."@webassemblyjs/wast-parser-1.11.0"
+      sources."@webassemblyjs/wast-printer-1.11.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."webassemblyjs-1.9.1"
+      sources."webassemblyjs-1.11.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64482,10 +64371,10 @@ in
   "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_wasm-text-gen";
     packageName = "@webassemblyjs/wasm-text-gen";
-    version = "1.9.1";
+    version = "1.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.9.1.tgz";
-      sha512 = "RzgRzhCQJ/DBak+Yoy2bo4W6dUdqiswX8PN7qXsIZpNLYMcOOkcaq2o5gkiT/Y2HM3Rt08GxnBBlanXTrryTKQ==";
+      url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.11.0.tgz";
+      sha512 = "Q1OfB3hpa4TtM6x5a2gJmZncpQYx0hFt4ohdgv4Ms67kcAVwL29QQ2NDbNqfKr15IzlNAhLGueCzxG6dMjdnbQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -64495,19 +64384,15 @@ in
       sources."@babel/parser-7.12.11"
       sources."@babel/template-7.12.7"
       sources."@babel/types-7.12.12"
-      sources."@webassemblyjs/ast-1.9.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
-      sources."@webassemblyjs/helper-api-error-1.9.1"
-      sources."@webassemblyjs/helper-code-frame-1.9.1"
-      sources."@webassemblyjs/helper-fsm-1.9.1"
-      sources."@webassemblyjs/helper-module-context-1.9.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
-      sources."@webassemblyjs/ieee754-1.9.1"
-      sources."@webassemblyjs/leb128-1.9.1"
-      sources."@webassemblyjs/utf8-1.9.1"
-      sources."@webassemblyjs/wasm-parser-1.9.1"
-      sources."@webassemblyjs/wast-parser-1.9.1"
-      sources."@webassemblyjs/wast-printer-1.9.1"
+      sources."@webassemblyjs/ast-1.11.0"
+      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
+      sources."@webassemblyjs/helper-api-error-1.11.0"
+      sources."@webassemblyjs/helper-numbers-1.11.0"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
+      sources."@webassemblyjs/ieee754-1.11.0"
+      sources."@webassemblyjs/leb128-1.11.0"
+      sources."@webassemblyjs/utf8-1.11.0"
+      sources."@webassemblyjs/wasm-parser-1.11.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."ansi-styles-3.2.1"
@@ -64537,21 +64422,21 @@ in
   "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_wast-refmt";
     packageName = "@webassemblyjs/wast-refmt";
-    version = "1.9.1";
+    version = "1.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.9.1.tgz";
-      sha512 = "+JfTZZV25LhdJspgw5xznFr/2QiFnHrKvb8CXmEV/s3PNFRpNDUlRPw0ZUZk2cwooZdiWNpC+WKfRPQb8tMx8w==";
+      url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.11.0.tgz";
+      sha512 = "UVjojl3i1wzn2odausLskcFh7VaZqbp5HJ5od9pdsLvUZ06cSUo35yJ9Yetoc+yNj/IfdfisJtOcTQmILQ+RqQ==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.9.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
-      sources."@webassemblyjs/helper-api-error-1.9.1"
-      sources."@webassemblyjs/helper-code-frame-1.9.1"
-      sources."@webassemblyjs/helper-fsm-1.9.1"
-      sources."@webassemblyjs/helper-module-context-1.9.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
-      sources."@webassemblyjs/wast-parser-1.9.1"
-      sources."@webassemblyjs/wast-printer-1.9.1"
+      sources."@webassemblyjs/ast-1.11.0"
+      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
+      sources."@webassemblyjs/helper-api-error-1.11.0"
+      sources."@webassemblyjs/helper-code-frame-1.11.0"
+      sources."@webassemblyjs/helper-fsm-1.11.0"
+      sources."@webassemblyjs/helper-numbers-1.11.0"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
+      sources."@webassemblyjs/wast-parser-1.11.0"
+      sources."@webassemblyjs/wast-printer-1.11.0"
       sources."@xtuc/long-4.2.2"
     ];
     buildInputs = globalBuildInputs;
@@ -64706,7 +64591,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -64724,7 +64609,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Creating Electron app packages";
-      homepage = https://github.com/electron/asar;
+      homepage = "https://github.com/electron/asar";
       license = "MIT";
     };
     production = true;
@@ -64841,7 +64726,7 @@ in
       sources."turndown-4.0.2"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urijs-1.19.5"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -64874,15 +64759,15 @@ in
   bower = nodeEnv.buildNodePackage {
     name = "bower";
     packageName = "bower";
-    version = "1.8.8";
+    version = "1.8.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz";
-      sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A==";
+      url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz";
+      sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "The browser package manager";
-      homepage = http://bower.io/;
+      homepage = "http://bower.io";
       license = "MIT";
     };
     production = true;
@@ -64901,7 +64786,7 @@ in
       sources."argparse-1.0.4"
       sources."array-find-index-1.0.2"
       sources."balanced-match-1.0.0"
-      sources."bower-1.8.8"
+      sources."bower-1.8.12"
       sources."bower-endpoint-parser-0.2.1"
       sources."bower-json-0.6.0"
       sources."bower-logger-0.2.1"
@@ -65015,7 +64900,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Generate nix expressions to fetch bower dependencies";
-      homepage = https://github.com/rvl/bower2nix;
+      homepage = "https://github.com/rvl/bower2nix";
       license = "GPL-3.0";
     };
     production = true;
@@ -65070,7 +64955,7 @@ in
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.2"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."cipher-base-1.0.4"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
@@ -65105,7 +64990,7 @@ in
           sources."bn.js-4.11.9"
         ];
       })
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."events-3.2.0"
       sources."evp_bytestokey-1.0.3"
@@ -65318,7 +65203,7 @@ in
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
-      sources."bunyan-1.8.14"
+      sources."bunyan-1.8.15"
       sources."bytes-3.1.0"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
@@ -65670,7 +65555,7 @@ in
       sources."uglify-to-browserify-1.0.2"
       sources."uid-safe-2.1.5"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -65725,7 +65610,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.39"
+      sources."@types/node-13.13.40"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -65787,7 +65672,7 @@ in
       sources."co-3.1.0"
       sources."codepage-1.4.0"
       sources."combined-stream-1.0.8"
-      sources."commander-6.2.1"
+      sources."commander-7.0.0"
       sources."compact2string-1.4.1"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
@@ -66089,7 +65974,7 @@ in
       sources."ultron-1.1.1"
       sources."underscore-1.6.0"
       sources."uniq-1.0.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."utfx-1.0.1"
       sources."util-deprecate-1.0.2"
       sources."utp-0.0.7"
@@ -66130,35 +66015,35 @@ in
   cdk8s-cli = nodeEnv.buildNodePackage {
     name = "cdk8s-cli";
     packageName = "cdk8s-cli";
-    version = "1.0.0-beta.5";
+    version = "1.0.0-beta.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.5.tgz";
-      sha512 = "5jVubGjmRXlrXPDJIl2g2oWApFmN7V2EzonMWDd67TlaOwwS8Ypy4ej3VvwviXyZ7IO9zET4pDNFSInBQE+aJw==";
+      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.6.tgz";
+      sha512 = "x6sJTGaSPoyQbcKbxkKxmgdGXLpyO+qbgt6GgN9guIk28dgkoqZG9CcfmwjAs+OXoY4ZiyNKvNO4w9ljW/+XOQ==";
     };
     dependencies = [
-      sources."@jsii/spec-1.16.0"
-      sources."@types/node-10.17.50"
+      sources."@jsii/spec-1.17.1"
+      sources."@types/node-10.17.51"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."array-filter-1.0.0"
       sources."at-least-node-1.0.0"
       sources."available-typed-arrays-1.0.2"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-6.2.0"
       sources."case-1.6.3"
-      sources."cdk8s-1.0.0-beta.5"
+      sources."cdk8s-1.0.0-beta.6"
       sources."cliui-7.0.4"
       sources."clone-2.1.2"
-      (sources."codemaker-1.16.0" // {
+      (sources."codemaker-1.17.1" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
+          sources."fs-extra-9.1.0"
         ];
       })
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."constructs-3.2.94"
+      sources."constructs-3.2.112"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-4.0.0"
@@ -66169,7 +66054,7 @@ in
       sources."dot-case-3.0.4"
       sources."emoji-regex-8.0.0"
       sources."entities-2.0.3"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
@@ -66202,50 +66087,42 @@ in
       sources."is-set-2.0.2"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      (sources."is-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."is-typed-array-1.1.4"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."isarray-2.0.5"
-      (sources."jsii-1.16.0" // {
+      (sources."jsii-1.17.1" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
+          sources."fs-extra-9.1.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-pacmak-1.16.0" // {
+      (sources."jsii-pacmak-1.17.1" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
+          sources."fs-extra-9.1.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-reflect-1.16.0" // {
+      (sources."jsii-reflect-1.17.1" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
+          sources."fs-extra-9.1.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-rosetta-1.16.0" // {
+      (sources."jsii-rosetta-1.17.1" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
+          sources."fs-extra-9.1.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.180" // {
+      (sources."jsii-srcmak-0.1.204" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
+          sources."fs-extra-9.1.0"
         ];
       })
       sources."json-schema-0.2.5"
-      sources."json2jsii-0.1.172"
-      (sources."jsonfile-6.1.0" // {
-        dependencies = [
-          sources."universalify-2.0.0"
-        ];
-      })
+      sources."json2jsii-0.1.188"
+      sources."jsonfile-6.1.0"
       sources."jsonschema-1.4.0"
       sources."locate-path-5.0.0"
       sources."log4js-6.3.0"
@@ -66260,15 +66137,15 @@ in
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
-      sources."oo-ascii-tree-1.16.0"
+      sources."oo-ascii-tree-1.17.1"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."path-exists-4.0.0"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."rfdc-1.1.4"
+      sources."rfdc-1.2.0"
       sources."semver-7.3.4"
       (sources."semver-intersect-1.4.0" // {
         dependencies = [
@@ -66291,17 +66168,13 @@ in
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
       sources."strip-ansi-6.0.0"
-      sources."tslib-2.0.3"
+      sources."tslib-2.1.0"
       sources."typescript-3.9.7"
-      sources."universalify-1.0.0"
+      sources."universalify-2.0.0"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
       sources."which-module-2.0.0"
-      (sources."which-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."which-typed-array-1.1.4"
       sources."wrap-ansi-7.0.0"
       sources."xmlbuilder-15.1.1"
       sources."xmldom-0.4.0"
@@ -66333,32 +66206,52 @@ in
   cdktf-cli = nodeEnv.buildNodePackage {
     name = "cdktf-cli";
     packageName = "cdktf-cli";
-    version = "0.0.19";
+    version = "0.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.0.19.tgz";
-      sha512 = "JH2DyIQyhpI8lwO4HANha/HiVV2MXVG63iK+PZbEZKJDEr3fVB0WSKvzrp66CarceLiuNy7Z5cIR+81Q6eMx+w==";
+      url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.1.0.tgz";
+      sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA==";
     };
     dependencies = [
-      sources."@jsii/spec-1.16.0"
-      sources."@types/node-14.14.20"
+      sources."@jsii/spec-1.17.1"
+      sources."@skorfmann/terraform-cloud-1.7.1"
+      sources."@types/archiver-5.1.0"
+      sources."@types/glob-7.1.3"
+      sources."@types/minimatch-3.0.3"
+      sources."@types/node-14.14.22"
       sources."@types/readline-sync-1.4.3"
+      sources."@types/stream-buffers-3.0.3"
       sources."@types/uuid-8.3.0"
       sources."@types/yoga-layout-1.9.2"
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
+      sources."archiver-5.2.0"
+      (sources."archiver-utils-2.1.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.7"
+        ];
+      })
       sources."array-filter-1.0.0"
       sources."array-includes-3.1.2"
       sources."array.prototype.flatmap-1.2.4"
       sources."arrify-2.0.1"
       sources."astral-regex-2.0.0"
+      sources."async-3.2.0"
       sources."at-least-node-1.0.0"
       sources."auto-bind-4.0.0"
       sources."available-typed-arrays-1.0.2"
-      sources."call-bind-1.0.0"
+      sources."axios-0.21.1"
+      sources."balanced-match-1.0.0"
+      sources."base64-js-1.5.1"
+      sources."bl-4.0.3"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-5.7.1"
+      sources."buffer-crc32-0.2.13"
+      sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
+      sources."camelcase-keys-6.2.2"
       sources."case-1.6.3"
-      sources."cdktf-0.0.19"
+      sources."cdktf-0.1.0"
       sources."chalk-4.1.0"
       sources."ci-info-2.0.0"
       sources."cli-cursor-3.1.0"
@@ -66375,35 +66268,57 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."constructs-3.2.94"
+      sources."compress-commons-4.0.2"
+      sources."concat-map-0.0.1"
+      sources."constructs-3.2.112"
+      sources."core-util-is-1.0.2"
+      sources."crc-32-1.2.0"
+      sources."crc32-stream-4.0.1"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-1.2.0"
-      sources."deep-equal-2.0.5"
+      (sources."deep-equal-2.0.5" // {
+        dependencies = [
+          sources."isarray-2.0.5"
+        ];
+      })
       sources."define-properties-1.1.3"
       sources."detect-indent-5.0.0"
       sources."detect-newline-2.1.0"
       sources."doctrine-2.1.0"
       sources."emoji-regex-8.0.0"
+      sources."end-of-stream-1.4.4"
       sources."entities-2.0.3"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-get-iterator-1.1.1"
+      sources."es-abstract-1.18.0-next.2"
+      (sources."es-get-iterator-1.1.1" // {
+        dependencies = [
+          sources."isarray-2.0.5"
+        ];
+      })
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-4.0.0"
       sources."eslint-plugin-react-7.22.0"
       sources."esutils-2.0.3"
+      sources."exit-on-epipe-1.0.1"
       sources."find-up-4.1.0"
       sources."flatted-2.0.2"
+      sources."follow-redirects-1.13.1"
       sources."foreach-2.0.5"
+      sources."fs-constants-1.0.0"
       sources."fs-extra-8.1.0"
+      sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.0.2"
+      sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.1"
+      sources."ieee754-1.2.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
       (sources."ink-2.7.1" // {
         dependencies = [
           sources."chalk-3.0.0"
@@ -66441,75 +66356,65 @@ in
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."is-wsl-2.2.0"
-      sources."isarray-2.0.5"
+      sources."isarray-1.0.0"
       sources."js-tokens-4.0.0"
-      (sources."jsii-1.16.0" // {
+      (sources."jsii-1.17.1" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
-          (sources."jsonfile-6.1.0" // {
-            dependencies = [
-              sources."universalify-2.0.0"
-            ];
-          })
-          sources."universalify-1.0.0"
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."universalify-2.0.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-pacmak-1.16.0" // {
+      (sources."jsii-pacmak-1.17.1" // {
         dependencies = [
           sources."camelcase-6.2.0"
-          sources."codemaker-1.16.0"
+          sources."codemaker-1.17.1"
           sources."decamelize-4.0.0"
-          sources."fs-extra-9.0.1"
-          (sources."jsonfile-6.1.0" // {
-            dependencies = [
-              sources."universalify-2.0.0"
-            ];
-          })
-          sources."universalify-1.0.0"
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."universalify-2.0.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-reflect-1.16.0" // {
+      (sources."jsii-reflect-1.17.1" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
-          (sources."jsonfile-6.1.0" // {
-            dependencies = [
-              sources."universalify-2.0.0"
-            ];
-          })
-          sources."universalify-1.0.0"
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."universalify-2.0.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-rosetta-1.16.0" // {
+      (sources."jsii-rosetta-1.17.1" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
-          (sources."jsonfile-6.1.0" // {
-            dependencies = [
-              sources."universalify-2.0.0"
-            ];
-          })
-          sources."universalify-1.0.0"
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."universalify-2.0.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.180" // {
+      (sources."jsii-srcmak-0.1.204" // {
         dependencies = [
-          sources."fs-extra-9.0.1"
-          (sources."jsonfile-6.1.0" // {
-            dependencies = [
-              sources."universalify-2.0.0"
-            ];
-          })
-          sources."universalify-1.0.0"
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."universalify-2.0.0"
         ];
       })
       sources."jsonfile-4.0.0"
       sources."jsonschema-1.4.0"
       sources."jsx-ast-utils-3.2.0"
+      (sources."lazystream-1.0.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.7"
+        ];
+      })
       sources."locate-path-5.0.0"
+      sources."lodash.defaults-4.2.0"
+      sources."lodash.difference-4.5.0"
+      sources."lodash.flatten-4.4.0"
+      sources."lodash.isplainobject-4.0.6"
       sources."lodash.throttle-4.1.1"
+      sources."lodash.union-4.6.0"
       (sources."log-update-3.4.0" // {
         dependencies = [
           sources."ansi-escapes-3.2.0"
@@ -66531,11 +66436,14 @@ in
       sources."log4js-6.3.0"
       sources."loose-envify-1.4.0"
       sources."lru-cache-6.0.0"
+      sources."map-obj-4.1.0"
       sources."mdurl-1.0.1"
       sources."mimic-fn-2.1.0"
+      sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."ms-2.1.2"
       sources."ncp-2.0.0"
+      sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
       sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
@@ -66544,29 +66452,33 @@ in
       sources."object.entries-1.1.3"
       sources."object.fromentries-2.0.3"
       sources."object.values-1.1.2"
+      sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."oo-ascii-tree-1.16.0"
-      sources."open-7.3.0"
+      sources."oo-ascii-tree-1.17.1"
+      sources."open-7.3.1"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."path-exists-4.0.0"
+      sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
+      sources."printj-1.1.2"
+      sources."process-nextick-args-2.0.1"
       sources."prop-types-15.7.2"
+      sources."quick-lru-4.0.1"
       sources."react-16.14.0"
       sources."react-is-16.13.1"
       sources."react-reconciler-0.24.0"
+      sources."readable-stream-3.6.0"
+      sources."readdir-glob-1.1.1"
       sources."readline-sync-1.4.10"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.1"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."resolve-1.19.0"
       sources."restore-cursor-3.1.0"
-      sources."rfdc-1.1.4"
+      sources."rfdc-1.2.0"
+      sources."safe-buffer-5.1.2"
       sources."scheduler-0.18.0"
       sources."semver-7.3.4"
       (sources."semver-intersect-1.4.0" // {
@@ -66581,6 +66493,7 @@ in
       sources."sort-json-2.0.0"
       sources."spdx-license-list-6.3.0"
       sources."sscaff-1.2.0"
+      sources."stream-buffers-3.0.2"
       (sources."streamroller-2.2.4" // {
         dependencies = [
           sources."date-format-2.1.0"
@@ -66598,11 +66511,14 @@ in
       sources."string.prototype.repeat-0.2.0"
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
+      sources."string_decoder-1.1.1"
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
+      sources."tar-stream-2.2.0"
       sources."type-fest-0.11.0"
       sources."typescript-3.9.7"
       sources."universalify-0.1.2"
+      sources."util-deprecate-1.0.2"
       sources."uuid-8.3.2"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
@@ -66610,6 +66526,7 @@ in
       sources."which-typed-array-1.1.4"
       sources."widest-line-3.1.0"
       sources."wrap-ansi-6.2.0"
+      sources."wrappy-1.0.2"
       sources."xmlbuilder-15.1.1"
       sources."xmldom-0.4.0"
       sources."y18n-5.0.5"
@@ -66624,6 +66541,7 @@ in
       sources."yargs-parser-20.2.4"
       sources."yn-3.1.1"
       sources."yoga-layout-prebuilt-1.10.0"
+      sources."zip-stream-4.0.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -66773,10 +66691,10 @@ in
   coc-diagnostic = nodeEnv.buildNodePackage {
     name = "coc-diagnostic";
     packageName = "coc-diagnostic";
-    version = "0.14.0";
+    version = "0.18.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.14.0.tgz";
-      sha512 = "ccxtSRTqVIuIQrtS5SI0uevO2WC7cSA9dNtiZ/PveDKyxhqyQlfRs9n0bdOJdXteYt6BKUIiqFV8Q48Z71y89A==";
+      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.0.tgz";
+      sha512 = "6ghwTYVdJ/XMcoLb690DPcxVM3t2bCDKTFPqMfkamBhKRJNFJDSjxQiP3Njn5f7g4rYvIuBQdZ8wteB4dr/4HA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66814,10 +66732,10 @@ in
   coc-eslint = nodeEnv.buildNodePackage {
     name = "coc-eslint";
     packageName = "coc-eslint";
-    version = "1.4.1";
+    version = "1.4.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.1.tgz";
-      sha512 = "dqzn4vqmEqIlzwpFxG6AnhXUwDSTMLsg2d4RDwHDhh1yioukSFR+turQxsq9fssuWeV208y54kb/AzmOIji9jA==";
+      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.5.tgz";
+      sha512 = "+xt0bn1nG348Q2tERiL44a/20a+NeDJLtwh7Gnn5VjOQ64OYUGrbAbQphskdVZyLE5qRDTvyiLArN+IxDsmpQQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66832,10 +66750,10 @@ in
   coc-git = nodeEnv.buildNodePackage {
     name = "coc-git";
     packageName = "coc-git";
-    version = "2.0.5";
+    version = "2.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.5.tgz";
-      sha512 = "MwoSWGr8mco+/Bth/4zr0kNRuG9rXYgyAEI1mGOuRsMqy2G9LEr4azSP68V2EuIPzYVcYx6ZZk2o5e8b/ux0/w==";
+      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.0.tgz";
+      sha512 = "afm5SjyvQl21+4oGotX8mxjiwEBw8veRJun+sZQ5S4ZXMH6tQBZexE0Nyydcaoa5U0P1TBlI7Ywt+e/IZZxleA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66850,15 +66768,15 @@ in
   coc-go = nodeEnv.buildNodePackage {
     name = "coc-go";
     packageName = "coc-go";
-    version = "0.13.2";
+    version = "0.13.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.2.tgz";
-      sha512 = "E//SHaQlzmh4nBUJsA6oSZWBVFkEWJ/kjL19jIBbIrY8KWCjxfCm6H8+WDNMUULHS2HQNlUEQzVHS/ftE10iGg==";
+      url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.3.tgz";
+      sha512 = "JxAJD3z10ziO8CxgTUlguZp8uy1r6fo0pP+L4GeXKv+q12BHIxWXoAZdd158vAP/YCh0Yw4zBrij57Fg4wtVdg==";
     };
     dependencies = [
       sources."isexe-2.0.0"
       sources."node-fetch-2.6.1"
-      sources."tslib-2.0.3"
+      sources."tslib-2.1.0"
       sources."vscode-languageserver-textdocument-1.0.1"
       sources."vscode-uri-3.0.2"
       sources."which-2.0.2"
@@ -66892,10 +66810,10 @@ in
   coc-html = nodeEnv.buildNodePackage {
     name = "coc-html";
     packageName = "coc-html";
-    version = "1.3.2";
+    version = "1.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.3.2.tgz";
-      sha512 = "8upyERwR/7zZNDkATpKy1aIyflzwfsgercRsHm1OG/ECRG2FpUWYkHywHBDbWAdHsipbd2WoO0nr3Ct22JV4oA==";
+      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.4.1.tgz";
+      sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw==";
     };
     dependencies = [
       sources."typescript-4.1.3"
@@ -66966,10 +66884,10 @@ in
   coc-json = nodeEnv.buildNodePackage {
     name = "coc-json";
     packageName = "coc-json";
-    version = "1.3.2";
+    version = "1.3.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.2.tgz";
-      sha512 = "4wSADhO6oE2lxyYJw1cZqz6eYTrJWI4wHLETSTwhkkpZrPCNJA7mSmuB6oowxt7kJRmDVAIZP2mFyLTXU0jU6w==";
+      url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.3.tgz";
+      sha512 = "yMayIIMn/+JaSxHbAG2384sr1/1jvhDCuvRWXeWI+yLLVNCQ7pizGW8EeLC2bSkd01PORRWT4LBn7mNMs6dPRw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66983,10 +66901,10 @@ in
   coc-lists = nodeEnv.buildNodePackage {
     name = "coc-lists";
     packageName = "coc-lists";
-    version = "1.3.16";
+    version = "1.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.16.tgz";
-      sha512 = "6m/LCFHcnFdbJoFnrkzj8OhBvcFl491eYG0247Gti/u2iQCVj2X8RRxdxcGbDh4tR5OEPZdQPcd6YMDbtphPSg==";
+      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.0.tgz";
+      sha512 = "AKmM8/+BjncinB4MrS/e8hJ7MzvXL5GtAvusGZb3zsAj4tNO77oWiVzE8V09QEWAsorgHVgNv/OXr4EPJMZvpg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -67001,10 +66919,10 @@ in
   coc-markdownlint = nodeEnv.buildNodePackage {
     name = "coc-markdownlint";
     packageName = "coc-markdownlint";
-    version = "1.9.0";
+    version = "1.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.9.0.tgz";
-      sha512 = "cTIR4IXs6CC06iDwylxzS0Sq4HhiWofTBqgedtbAckkaoJYOZdM+uMKKdkSO2nt93bHtE4MsEoQ91sxHgKqNfg==";
+      url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.10.0.tgz";
+      sha512 = "tXSfE7JFm2xer0xIdpqlYsBfJiWr/tCU/CcOpvi7cybwfnF7kz9A/pE1Re0noUd9TE+OGp+qQ2IOXXOBuRz/tQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -67019,10 +66937,10 @@ in
   coc-metals = nodeEnv.buildNodePackage {
     name = "coc-metals";
     packageName = "coc-metals";
-    version = "0.9.9";
+    version = "1.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.9.tgz";
-      sha512 = "VCjIm+ytVrgqzAXMpweh3D8SfQg9oF0BVXSFeUIgsm3xU9BuZd1jU+CxtNNAIihxcJ1LUX1JGn1Sydu541hwzA==";
+      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.1.tgz";
+      sha512 = "1chc5qluoxF39fNKSoLNrPWrWsBQc+zHkXmleOka2HLYDQHmqgYqWZiPgJ03IqOoR3uJcS8sgdrCLyVdqWBwrg==";
     };
     dependencies = [
       sources."@chemzqm/neovim-5.2.13"
@@ -67040,7 +66958,7 @@ in
       sources."buffer-indexof-polyfill-1.0.2"
       sources."buffers-0.1.1"
       sources."bytes-3.1.0"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."chainsaw-0.1.0"
       sources."chownr-2.0.0"
       sources."clipboardy-2.3.0"
@@ -67148,7 +67066,7 @@ in
       sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."rfc-3986-1.0.1"
-      sources."rfdc-1.1.4"
+      sources."rfdc-1.2.0"
       sources."rimraf-3.0.2"
       sources."safe-buffer-5.1.2"
       sources."semver-7.3.4"
@@ -67167,9 +67085,9 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."tar-6.0.5"
+      sources."tar-6.1.0"
       sources."traverse-0.3.9"
-      sources."tslib-2.0.3"
+      sources."tslib-2.1.0"
       sources."universalify-0.1.2"
       sources."unzipper-0.10.11"
       sources."util-deprecate-1.0.2"
@@ -67199,10 +67117,10 @@ in
   coc-pairs = nodeEnv.buildNodePackage {
     name = "coc-pairs";
     packageName = "coc-pairs";
-    version = "1.2.21";
+    version = "1.2.22";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.21.tgz";
-      sha512 = "QTrzPCgk+zNVSnDjCbm3cvzb6c6rIwYMowrGhVb4XGnc8ooMXDBSfMoPYUtVgEJ+Qcu3++93OWr+m2VOHwHxag==";
+      url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.22.tgz";
+      sha512 = "AskNxINhyImxvFhlt0tvFJUS/Z4sUehgKPdy1jxVa+vu4CU903cNR6Dot4phrRRfgSCH3NT8SrYBhg4YvsxlkA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -67229,7 +67147,7 @@ in
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@types/eslint-visitor-keys-1.0.0"
-      sources."@types/json-schema-7.0.6"
+      sources."@types/json-schema-7.0.7"
       sources."@typescript-eslint/experimental-utils-3.10.1"
       sources."@typescript-eslint/parser-3.10.1"
       sources."@typescript-eslint/types-3.10.1"
@@ -67297,7 +67215,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       sources."capture-stack-trace-1.0.1"
       sources."ccount-1.1.0"
       sources."chalk-2.4.2"
@@ -67354,7 +67272,7 @@ in
         ];
       })
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.2"
+      sources."core-js-3.8.3"
       sources."cosmiconfig-3.1.0"
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-6.0.5" // {
@@ -67394,7 +67312,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -68083,7 +68001,7 @@ in
           sources."tsutils-2.29.0"
         ];
       })
-      sources."tsutils-3.18.0"
+      sources."tsutils-3.19.1"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."typescript-3.9.7"
@@ -68111,7 +68029,7 @@ in
       })
       sources."unzip-response-2.0.1"
       sources."update-notifier-2.5.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       sources."use-3.1.1"
@@ -68235,10 +68153,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.26.0";
+    version = "0.29.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.26.0.tgz";
-      sha512 = "Wn0m/IImB9BryAUhH5WTSqrkWh2tamuMVyMzxUmH1EW71TJKOavfV2DAmSNYSkGCD/H9icUbMIiSwyMI9JVYOw==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.29.0.tgz";
+      sha512 = "fEvA/RUDaEgIh3odV4sc+t6E2t96ip2Dn5CTaijqMwZcIy69jwVODw1pjR98kTViv3eJ4I419l1fT2iSF+tTtw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68271,10 +68189,10 @@ in
   coc-snippets = nodeEnv.buildNodePackage {
     name = "coc-snippets";
     packageName = "coc-snippets";
-    version = "2.3.1";
+    version = "2.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.3.1.tgz";
-      sha512 = "n11bVCYeDA0s1wYNAYsQdAHVv4C/k8QkvadSkzRWrNCP29fivGALp+wEYl8rtsqs0aeKY3FtPsI812581g6NPg==";
+      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.0.tgz";
+      sha512 = "XjL23iRnKCxeh/qG6FN1SJQQRHLunlxs6UlJua35A42tjztC6ZZYwuE4W9W8oU53iqGrSYrIrkT1+WFznBr/0g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68288,10 +68206,10 @@ in
   coc-solargraph = nodeEnv.buildNodePackage {
     name = "coc-solargraph";
     packageName = "coc-solargraph";
-    version = "1.1.8";
+    version = "1.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.8.tgz";
-      sha512 = "j0/S9ycyP4cdFhTu3FGaY4t0ZSn1K5EFWi6A90nppQYPwrzSGo3tn5XDO44vaWsYhEUlQfQrXVwtFScKCdc1vg==";
+      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.0.tgz";
+      sha512 = "0bvily8jnfmBx/WjNgZ/1TNVSV2BBSsaAflc4bhwtw1mN7XLAiXLpeK3Eps6qwOYMtTRngJFKxNXKoAM2bCY/A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68355,11 +68273,11 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -68397,7 +68315,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -68407,14 +68325,14 @@ in
       sources."extend-3.0.2"
       sources."fast-deep-equal-3.1.3"
       sources."fast-diff-1.2.0"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fastest-levenshtein-1.0.12"
       sources."fastq-1.10.0"
       sources."file-entry-cache-6.0.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.0"
+      sources."flatted-3.1.1"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
@@ -68424,7 +68342,7 @@ in
       sources."global-modules-2.0.0"
       sources."global-prefix-3.0.0"
       sources."globals-11.12.0"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       sources."globjoin-0.1.4"
       sources."gonzales-pe-4.3.0"
       sources."hard-rejection-2.1.0"
@@ -68479,7 +68397,7 @@ in
       sources."mdast-util-from-markdown-0.8.4"
       sources."mdast-util-to-markdown-0.6.2"
       sources."mdast-util-to-string-2.0.0"
-      sources."meow-8.1.0"
+      sources."meow-9.0.0"
       sources."merge2-1.4.1"
       sources."micromark-2.11.2"
       sources."micromatch-4.0.2"
@@ -68492,7 +68410,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       (sources."normalize-package-data-3.0.0" // {
         dependencies = [
           sources."semver-7.3.4"
@@ -68507,7 +68425,7 @@ in
       sources."p-try-2.2.0"
       sources."parent-module-1.0.1"
       sources."parse-entities-2.0.0"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
@@ -68587,7 +68505,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-indent-3.0.0"
       sources."style-search-0.1.0"
-      sources."stylelint-13.8.0"
+      sources."stylelint-13.9.0"
       sources."sugarss-2.0.0"
       sources."supports-color-5.5.0"
       sources."svg-tags-1.0.0"
@@ -68603,7 +68521,7 @@ in
       sources."unist-util-find-all-after-3.0.2"
       sources."unist-util-is-4.0.4"
       sources."unist-util-stringify-position-2.0.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
@@ -68639,10 +68557,10 @@ in
   coc-tabnine = nodeEnv.buildNodePackage {
     name = "coc-tabnine";
     packageName = "coc-tabnine";
-    version = "1.2.3";
+    version = "1.3.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.3.tgz";
-      sha512 = "1FVW4hj7eK8PAUS0fzeme/23iBBP9Q3nfoMVzpBGchJiziL2qOhXaFrU0QgliIhiRSMmLnagTx/lWuI8BuO96g==";
+      url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.3.tgz";
+      sha512 = "6CYtXKaEduGHLjiBdYRcWvl7gzvW92iGTxW7M3KVfn/tRFO+VF+3FuSX7Fg53ol4/USyNOTgXz3uyBjfsZOBXA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68750,10 +68668,10 @@ in
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";
-    version = "1.6.6";
+    version = "1.6.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.6.tgz";
-      sha512 = "Rij5moc30YSnhYkiSwilLYorbRkmYPn9uN5b4EMXrNo0wWGReFYRRCxq72BoDEIwbTE3MsuVb67irdMukJ95eA==";
+      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.7.tgz";
+      sha512 = "NVBl6AEbEax6GQdBlBy/SelJ5TXCkrnLN/dDqgDWwhIPX6UBFhFTFCLcqcHbfMjLM/MDvP/t85w+OYBGe2gXxg==";
     };
     dependencies = [
       sources."typescript-4.1.3"
@@ -68784,7 +68702,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.2.2"
+      sources."@eslint/eslintrc-0.3.0"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."ajv-6.12.6"
@@ -68818,7 +68736,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-7.17.0"
+      sources."eslint-7.18.0"
       sources."eslint-plugin-vue-7.4.1"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
@@ -68850,7 +68768,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."file-entry-cache-6.0.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.0"
+      sources."flatted-3.1.1"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
@@ -68929,10 +68847,10 @@ in
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
       sources."typescript-4.1.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."v8-compile-cache-2.2.0"
       sources."vls-0.5.10"
-      (sources."vue-eslint-parser-7.3.0" // {
+      (sources."vue-eslint-parser-7.4.1" // {
         dependencies = [
           sources."eslint-visitor-keys-1.3.0"
           sources."espree-6.2.1"
@@ -69095,7 +69013,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Unfancy JavaScript";
-      homepage = http://coffeescript.org/;
+      homepage = "http://coffeescript.org";
       license = "MIT";
     };
     production = true;
@@ -69371,7 +69289,7 @@ in
       })
       sources."extsprintf-1.4.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-parse-1.0.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.10.0"
@@ -69383,7 +69301,7 @@ in
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
-      sources."fs-extra-9.0.1"
+      sources."fs-extra-9.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-stream-5.2.0"
@@ -69391,7 +69309,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."global-dirs-2.1.0"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       (sources."got-9.6.0" // {
         dependencies = [
           sources."get-stream-4.1.0"
@@ -69474,11 +69392,7 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      (sources."jsonfile-6.1.0" // {
-        dependencies = [
-          sources."universalify-2.0.0"
-        ];
-      })
+      sources."jsonfile-6.1.0"
       (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."extsprintf-1.3.0"
@@ -69533,7 +69447,7 @@ in
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."os-homedir-1.0.2"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
@@ -69649,7 +69563,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.34.2"
+      sources."systeminformation-4.34.7"
       sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -69665,10 +69579,10 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."underscore-1.12.0"
       sources."unique-string-2.0.0"
-      sources."universalify-1.0.0"
+      sources."universalify-2.0.0"
       sources."unpipe-1.0.0"
       sources."update-notifier-4.1.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-parse-lax-3.0.0"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -69736,7 +69650,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -69958,7 +69872,7 @@ in
       sources."p-map-3.0.0"
       sources."p-timeout-3.2.0"
       sources."p-try-2.2.0"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
       sources."path-exists-4.0.0"
@@ -70107,7 +70021,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -70197,7 +70111,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.9.4"
+      sources."qs-6.9.6"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.7"
@@ -70357,7 +70271,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Create React Native apps with no build configuration.";
-      homepage = https://github.com/expo/create-react-native-app;
+      homepage = "https://github.com/expo/create-react-native-app";
       license = "BSD-3-Clause";
     };
     production = true;
@@ -70379,7 +70293,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "CSSLint";
-      homepage = http://csslint.net/;
+      homepage = "http://csslint.net/";
       license = "MIT";
     };
     production = true;
@@ -70734,7 +70648,7 @@ in
       sources."menu-string-1.3.0"
       sources."merkle-tree-stream-3.0.3"
       sources."micromatch-3.1.10"
-      sources."mime-2.4.7"
+      sources."mime-2.5.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-response-2.1.0"
@@ -70819,7 +70733,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."random-access-file-2.1.4"
-      sources."random-access-memory-3.1.1"
+      sources."random-access-memory-3.1.2"
       sources."random-access-storage-1.4.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
@@ -71001,7 +70915,7 @@ in
       sources."untildify-3.0.3"
       sources."unzip-response-2.0.1"
       sources."update-notifier-2.5.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       sources."use-3.1.1"
@@ -71036,7 +70950,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Dat is the package manager for data. Easily share and version control data.";
-      homepage = https://datproject.org/;
+      homepage = "https://datproject.org";
       license = "BSD-3-Clause";
     };
     production = true;
@@ -71057,7 +70971,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A DHCP server written in JavaScript";
-      homepage = https://github.com/infusion/node-dhcp;
+      homepage = "https://github.com/infusion/node-dhcp";
       license = "MIT OR GPL-2.0";
     };
     production = true;
@@ -71067,10 +70981,10 @@ in
   diagnostic-languageserver = nodeEnv.buildNodePackage {
     name = "diagnostic-languageserver";
     packageName = "diagnostic-languageserver";
-    version = "1.8.0";
+    version = "1.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.0.tgz";
-      sha512 = "UnQGWIszi+uXkZ/pYUDLKuftSOSIvc/ZBSp/W6OF/Qyr2SsEaSD6TuaIo7TiH1MGQX1b2EW9P1WlE+16Ft4MiA==";
+      url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.1.tgz";
+      sha512 = "W8lFslQXZ6HEjy9Ba7jLYDzqJZFkWVINWZjNDUZslozm2ZLMH7QWNIa74DKZXLA972ZgY8iJ0WIMxn0Y4+1POw==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.4"
@@ -71087,14 +71001,14 @@ in
       sources."crypto-random-string-2.0.0"
       sources."del-6.0.0"
       sources."dir-glob-3.0.1"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fastq-1.10.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       sources."graceful-fs-4.2.4"
       sources."ignore-5.1.8"
       sources."indent-string-4.0.0"
@@ -71152,15 +71066,15 @@ in
   dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
     name = "dockerfile-language-server-nodejs";
     packageName = "dockerfile-language-server-nodejs";
-    version = "0.2.0";
+    version = "0.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.2.0.tgz";
-      sha512 = "D6qT5w2y73pF02c+caAPYn/IG7T/231u8WD/qfyt3MBtnRe8x7ZIQK9+VAxFYvCtqbGuN7MiPVoRctkth/jcuA==";
+      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.3.0.tgz";
+      sha512 = "nW0l6S6YZlSGrGu6PBHoLmhwqwxgNTSis1hvjaxpnS3Ohalf/e87HC/pkjg3c+AixytqlXPR7nixzVPDJTkNZQ==";
     };
     dependencies = [
       sources."dockerfile-ast-0.1.0"
-      sources."dockerfile-language-service-0.1.1"
-      sources."dockerfile-utils-0.1.1"
+      sources."dockerfile-language-service-0.2.0"
+      sources."dockerfile-utils-0.2.0"
       sources."vscode-jsonrpc-6.0.0"
       sources."vscode-languageserver-7.0.0"
       sources."vscode-languageserver-protocol-3.16.0"
@@ -71187,7 +71101,7 @@ in
     dependencies = [
       sources."@fast-csv/format-4.3.5"
       sources."@fast-csv/parse-4.3.6"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."JSONStream-1.3.5"
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
@@ -71299,7 +71213,7 @@ in
       })
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      (sources."uri-js-4.4.0" // {
+      (sources."uri-js-4.4.1" // {
         dependencies = [
           sources."punycode-2.1.1"
         ];
@@ -71382,7 +71296,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -71562,7 +71476,7 @@ in
       sources."p-limit-2.3.0"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."patch-console-1.0.0"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
@@ -71647,7 +71561,7 @@ in
       sources."trim-newlines-3.0.0"
       sources."type-fest-0.12.0"
       sources."unicode-emoji-modifier-base-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."validate-npm-package-license-3.0.4"
       sources."which-1.3.1"
       sources."widest-line-3.1.0"
@@ -71685,7 +71599,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images.";
-      homepage = https://www.emojione.com/;
+      homepage = "https://www.emojione.com";
     };
     production = true;
     bypassCache = true;
@@ -71709,10 +71623,10 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.155.3"
-      sources."@fluentui/react-focus-7.17.0"
+      sources."@fluentui/react-7.156.0"
+      sources."@fluentui/react-focus-7.17.1"
       sources."@fluentui/react-window-provider-1.0.1"
-      sources."@fluentui/theme-1.7.0"
+      sources."@fluentui/theme-1.7.1"
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
         dependencies = [
           sources."normalize-path-2.1.1"
@@ -71723,11 +71637,11 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."@microsoft/load-themed-styles-1.10.141"
+      sources."@microsoft/load-themed-styles-1.10.145"
       sources."@nodelib/fs.scandir-2.1.4"
       sources."@nodelib/fs.stat-2.0.4"
       sources."@nodelib/fs.walk-1.2.6"
-      sources."@npmcli/move-file-1.0.1"
+      sources."@npmcli/move-file-1.1.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/basic-auth-1.1.3"
@@ -71735,17 +71649,17 @@ in
       sources."@types/caseless-0.12.2"
       sources."@types/chart.js-2.9.24"
       sources."@types/connect-3.4.34"
-      sources."@types/engine.io-3.1.4"
+      sources."@types/engine.io-3.1.5"
       sources."@types/express-4.17.8"
-      sources."@types/express-serve-static-core-4.17.17"
+      sources."@types/express-serve-static-core-4.17.18"
       sources."@types/fancy-log-1.3.0"
       sources."@types/glob-7.1.3"
       sources."@types/hls.js-0.13.1"
       sources."@types/js-yaml-3.12.5"
-      sources."@types/json-schema-7.0.6"
+      sources."@types/json-schema-7.0.7"
       sources."@types/lodash-4.14.161"
       sources."@types/material-design-lite-1.1.16"
-      sources."@types/mime-2.0.3"
+      sources."@types/mime-1.3.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
       sources."@types/mithril-2.0.3"
@@ -71754,7 +71668,7 @@ in
       sources."@types/mysql-2.15.15"
       sources."@types/node-14.11.1"
       sources."@types/pg-7.14.5"
-      sources."@types/pg-types-1.11.5"
+      sources."@types/pg-types-2.2.0"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
       (sources."@types/request-2.48.5" // {
@@ -71762,18 +71676,18 @@ in
           sources."form-data-2.5.1"
         ];
       })
-      sources."@types/serve-static-1.13.8"
+      sources."@types/serve-static-1.13.9"
       sources."@types/socket.io-2.1.11"
       sources."@types/socket.io-client-1.4.33"
       sources."@types/sqlite3-3.1.6"
       sources."@types/tough-cookie-4.0.0"
       sources."@types/url-join-4.0.0"
-      sources."@uifabric/foundation-7.9.20"
-      sources."@uifabric/icons-7.5.17"
+      sources."@uifabric/foundation-7.9.21"
+      sources."@uifabric/icons-7.5.18"
       sources."@uifabric/merge-styles-7.19.1"
       sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.18"
+      sources."@uifabric/styling-7.16.19"
       sources."@uifabric/utilities-7.33.2"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -71961,7 +71875,7 @@ in
           sources."minizlib-2.1.2"
           sources."p-map-4.0.0"
           sources."rimraf-3.0.2"
-          sources."tar-6.0.5"
+          sources."tar-6.1.0"
         ];
       })
       sources."cache-base-1.0.1"
@@ -71971,7 +71885,7 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."callsite-1.0.0"
       sources."camelcase-3.0.0"
       sources."caseless-0.12.0"
@@ -72181,7 +72095,7 @@ in
         ];
       })
       sources."engine.io-parser-2.2.1"
-      sources."enhanced-resolve-4.3.0"
+      sources."enhanced-resolve-4.5.0"
       sources."errno-0.1.8"
       sources."error-ex-1.3.2"
       sources."es5-ext-0.10.53"
@@ -72247,7 +72161,7 @@ in
       sources."extsprintf-1.3.0"
       sources."fancy-log-1.3.3"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-1.1.4"
       sources."fastq-1.10.0"
@@ -72552,7 +72466,11 @@ in
       sources."material-design-lite-1.3.0"
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
-      sources."memoizee-0.4.14"
+      (sources."memoizee-0.4.15" // {
+        dependencies = [
+          sources."next-tick-1.1.0"
+        ];
+      })
       (sources."memory-fs-0.5.0" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -72662,7 +72580,7 @@ in
       })
       sources."nan-2.14.2"
       sources."nanomatch-1.2.13"
-      (sources."needle-2.5.2" // {
+      (sources."needle-2.6.0" // {
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
@@ -72737,19 +72655,51 @@ in
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.155.3"
+      sources."office-ui-fabric-react-7.156.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."openapi-default-setter-7.0.1"
-      sources."openapi-framework-7.2.0"
-      sources."openapi-jsonschema-parameters-7.0.2"
-      sources."openapi-request-coercer-7.1.0"
-      sources."openapi-request-validator-7.2.0"
-      sources."openapi-response-validator-7.0.1"
-      sources."openapi-schema-validator-7.0.1"
-      sources."openapi-security-handler-7.0.1"
+      (sources."openapi-default-setter-7.2.3" // {
+        dependencies = [
+          sources."openapi-types-7.2.3"
+        ];
+      })
+      (sources."openapi-framework-7.2.3" // {
+        dependencies = [
+          sources."openapi-types-7.2.3"
+        ];
+      })
+      (sources."openapi-jsonschema-parameters-7.2.3" // {
+        dependencies = [
+          sources."openapi-types-7.2.3"
+        ];
+      })
+      (sources."openapi-request-coercer-7.2.3" // {
+        dependencies = [
+          sources."openapi-types-7.2.3"
+        ];
+      })
+      (sources."openapi-request-validator-7.2.3" // {
+        dependencies = [
+          sources."openapi-types-7.2.3"
+        ];
+      })
+      (sources."openapi-response-validator-7.2.3" // {
+        dependencies = [
+          sources."openapi-types-7.2.3"
+        ];
+      })
+      (sources."openapi-schema-validator-7.2.3" // {
+        dependencies = [
+          sources."openapi-types-7.2.3"
+        ];
+      })
+      (sources."openapi-security-handler-7.2.3" // {
+        dependencies = [
+          sources."openapi-types-7.2.3"
+        ];
+      })
       sources."openapi-types-7.0.1"
       (sources."opencollective-1.0.3" // {
         dependencies = [
@@ -72921,7 +72871,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."reusify-1.0.4"
-      sources."rfdc-1.1.4"
+      sources."rfdc-1.2.0"
       sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."run-async-2.4.1"
@@ -72931,7 +72881,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."sass-1.32.0"
+      sources."sass-1.32.5"
       sources."sax-1.2.4"
       sources."scheduler-0.19.1"
       sources."schema-utils-2.7.1"
@@ -72998,7 +72948,7 @@ in
           sources."debug-4.1.1"
           sources."isarray-2.0.1"
           sources."ms-2.1.3"
-          (sources."socket.io-parser-3.3.1" // {
+          (sources."socket.io-parser-3.3.2" // {
             dependencies = [
               sources."component-emitter-1.3.0"
               sources."debug-3.1.0"
@@ -73099,7 +73049,7 @@ in
       sources."sver-compat-1.5.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
       sources."swagger-ui-dist-3.34.0"
-      sources."tail-2.1.1"
+      sources."tail-2.2.0"
       sources."tapable-1.1.3"
       (sources."tar-4.4.13" // {
         dependencies = [
@@ -73188,7 +73138,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -73230,9 +73180,9 @@ in
       (sources."watchpack-1.7.5" // {
         dependencies = [
           sources."anymatch-3.1.1"
-          sources."binary-extensions-2.1.0"
-          sources."chokidar-3.4.3"
-          sources."fsevents-2.1.3"
+          sources."binary-extensions-2.2.0"
+          sources."chokidar-3.5.1"
+          sources."fsevents-2.3.1"
           sources."is-binary-path-2.1.0"
           sources."readdirp-3.5.0"
         ];
@@ -73338,10 +73288,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "7.17.0";
+    version = "7.18.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz";
-      sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz";
+      sha512 = "fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -73351,7 +73301,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.2.2"
+      sources."@eslint/eslintrc-0.3.0"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."ajv-6.12.6"
@@ -73412,7 +73362,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."file-entry-cache-6.0.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.0"
+      sources."flatted-3.1.1"
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
@@ -73474,7 +73424,7 @@ in
       sources."text-table-0.2.0"
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."v8-compile-cache-2.2.0"
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
@@ -73484,7 +73434,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "An AST-based pattern checker for JavaScript.";
-      homepage = https://eslint.org/;
+      homepage = "https://eslint.org";
       license = "MIT";
     };
     production = true;
@@ -73507,7 +73457,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.2.2"
+      sources."@eslint/eslintrc-0.3.0"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."ajv-6.12.6"
@@ -73539,7 +73489,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-7.17.0"
+      sources."eslint-7.18.0"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -73570,7 +73520,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."file-entry-cache-6.0.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.0"
+      sources."flatted-3.1.1"
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
@@ -73633,7 +73583,7 @@ in
       sources."text-table-0.2.0"
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."v8-compile-cache-2.2.0"
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
@@ -73643,7 +73593,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Makes eslint the fastest linter on the planet";
-      homepage = https://github.com/mantoni/eslint_d.js;
+      homepage = "https://github.com/mantoni/eslint_d.js";
       license = "MIT";
     };
     production = true;
@@ -73946,7 +73896,7 @@ in
                   sources."lru-cache-6.0.0"
                 ];
               })
-              (sources."tar-6.0.5" // {
+              (sources."tar-6.1.0" // {
                 dependencies = [
                   sources."chownr-2.0.0"
                 ];
@@ -74026,9 +73976,10 @@ in
         ];
       })
       sources."@npmcli/installed-package-contents-1.0.5"
-      (sources."@npmcli/move-file-1.0.1" // {
+      (sources."@npmcli/move-file-1.1.0" // {
         dependencies = [
           sources."mkdirp-1.0.4"
+          sources."rimraf-2.7.1"
         ];
       })
       sources."@npmcli/node-gyp-1.0.1"
@@ -74092,9 +74043,9 @@ in
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
-      sources."@types/json-schema-7.0.6"
+      sources."@types/json-schema-7.0.7"
       sources."@types/keyv-3.1.1"
-      sources."@types/lodash-4.14.167"
+      sources."@types/lodash-4.14.168"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
       sources."@types/node-9.6.61"
@@ -74111,7 +74062,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.25" // {
+      (sources."@types/webpack-4.41.26" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -74268,7 +74219,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."big-integer-1.6.48"
       sources."big.js-5.2.2"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bindings-1.5.0"
       sources."bluebird-3.7.2"
       sources."bmp-js-0.1.0"
@@ -74308,7 +74259,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       sources."buffer-5.7.1"
       sources."buffer-equal-0.0.1"
       sources."buffer-from-1.1.1"
@@ -74334,7 +74285,7 @@ in
           sources."normalize-url-4.5.0"
         ];
       })
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsite-1.0.0"
@@ -74342,12 +74293,12 @@ in
       (sources."camel-case-4.1.2" // {
         dependencies = [
           sources."pascal-case-3.1.2"
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.0" // {
@@ -74360,7 +74311,7 @@ in
         ];
       })
       sources."charenc-0.0.2"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."chownr-2.0.0"
       sources."chrome-trace-event-1.0.2"
       sources."ci-info-1.6.0"
@@ -74462,7 +74413,7 @@ in
           sources."array-union-2.1.0"
           sources."find-cache-dir-3.3.1"
           sources."find-up-4.1.0"
-          sources."globby-11.0.1"
+          sources."globby-11.0.2"
           sources."loader-utils-2.0.0"
           sources."locate-path-5.0.0"
           sources."make-dir-3.1.0"
@@ -74476,8 +74427,8 @@ in
           sources."slash-3.0.0"
         ];
       })
-      sources."core-js-3.8.2"
-      (sources."core-js-compat-3.8.2" // {
+      sources."core-js-3.8.3"
+      (sources."core-js-compat-3.8.3" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -74539,7 +74490,7 @@ in
       sources."dag-map-1.0.2"
       sources."dashdash-1.14.1"
       sources."dateformat-3.0.3"
-      sources."dayjs-1.10.1"
+      sources."dayjs-1.10.3"
       sources."debug-4.3.2"
       sources."debuglog-1.0.1"
       sources."decache-4.4.0"
@@ -74615,7 +74566,7 @@ in
       })
       (sources."dot-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."dot-prop-5.3.0"
@@ -74624,7 +74575,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -74639,7 +74590,7 @@ in
         ];
       })
       sources."end-of-stream-1.4.4"
-      (sources."enhanced-resolve-4.3.0" // {
+      (sources."enhanced-resolve-4.5.0" // {
         dependencies = [
           sources."memory-fs-0.5.0"
         ];
@@ -74658,7 +74609,7 @@ in
       })
       sources."error-stack-parser-2.0.6"
       sources."errorhandler-1.5.1"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
@@ -74726,7 +74677,7 @@ in
       })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.10.0"
       sources."faye-websocket-0.10.0"
@@ -74795,7 +74746,7 @@ in
       })
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."function-bind-1.1.1"
       (sources."gauge-2.7.4" // {
         dependencies = [
@@ -75019,11 +74970,7 @@ in
       sources."is-string-1.0.5"
       sources."is-svg-3.0.0"
       sources."is-symbol-1.0.3"
-      (sources."is-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."is-typed-array-1.1.4"
       sources."is-typedarray-1.0.0"
       sources."is-valid-path-0.1.1"
       sources."is-weakmap-2.0.1"
@@ -75046,7 +74993,7 @@ in
       sources."jimp-0.12.1"
       sources."joi-11.4.0"
       sources."join-component-1.1.0"
-      sources."jpeg-js-0.4.2"
+      sources."jpeg-js-0.4.3"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
@@ -75115,7 +75062,7 @@ in
       sources."loose-envify-1.4.0"
       (sources."lower-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."lowercase-keys-1.0.1"
@@ -75125,7 +75072,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      (sources."make-fetch-happen-8.0.12" // {
+      (sources."make-fetch-happen-8.0.13" // {
         dependencies = [
           sources."minipass-3.1.3"
         ];
@@ -75156,7 +75103,7 @@ in
           sources."bn.js-4.11.9"
         ];
       })
-      sources."mime-2.4.7"
+      sources."mime-2.5.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-fn-1.2.0"
@@ -75181,7 +75128,7 @@ in
           sources."minipass-3.1.3"
         ];
       })
-      (sources."minipass-fetch-1.3.2" // {
+      (sources."minipass-fetch-1.3.3" // {
         dependencies = [
           sources."minipass-3.1.3"
         ];
@@ -75238,7 +75185,7 @@ in
       sources."nice-try-1.0.5"
       (sources."no-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."node-fetch-2.6.1"
@@ -75258,7 +75205,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       sources."nopt-5.0.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
@@ -75313,22 +75260,10 @@ in
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      (sources."object.entries-1.1.3" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."object.getownpropertydescriptors-2.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.entries-1.1.3"
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."object.pick-1.3.0"
-      (sources."object.values-1.1.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.values-1.1.2"
       sources."obuf-1.1.2"
       sources."omggif-1.0.10"
       sources."on-finished-2.3.0"
@@ -75378,7 +75313,7 @@ in
           sources."url-parse-lax-3.0.0"
         ];
       })
-      (sources."pacote-11.1.13" // {
+      (sources."pacote-11.2.3" // {
         dependencies = [
           sources."minipass-3.1.3"
           sources."mkdirp-1.0.4"
@@ -75392,7 +75327,7 @@ in
       sources."parallel-transform-1.2.0"
       (sources."param-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."parse-asn1-5.1.6"
@@ -75664,7 +75599,7 @@ in
           sources."is-wsl-2.2.0"
           sources."loader-utils-2.0.0"
           sources."locate-path-5.0.0"
-          sources."open-7.3.0"
+          sources."open-7.3.1"
           sources."p-limit-2.3.0"
           sources."p-locate-4.1.0"
           sources."path-key-3.1.1"
@@ -75694,12 +75629,12 @@ in
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."regexpu-core-4.7.1"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.4" // {
+      (sources."regjsparser-0.6.6" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -75965,7 +75900,7 @@ in
       })
       sources."symbol-observable-1.2.0"
       sources."tapable-1.1.3"
-      (sources."tar-6.0.5" // {
+      (sources."tar-6.1.0" // {
         dependencies = [
           sources."minipass-3.1.3"
           sources."mkdirp-1.0.4"
@@ -75977,7 +75912,7 @@ in
           sources."array-union-2.1.0"
           sources."crypto-random-string-2.0.0"
           sources."del-6.0.0"
-          sources."globby-11.0.1"
+          sources."globby-11.0.2"
           sources."is-path-inside-3.0.2"
           sources."is-stream-2.0.0"
           sources."p-map-4.0.0"
@@ -76080,7 +76015,7 @@ in
       sources."update-check-1.5.3"
       sources."upper-case-1.1.3"
       sources."upper-case-first-1.1.2"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -76293,11 +76228,7 @@ in
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
       sources."which-module-2.0.0"
-      (sources."which-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."which-typed-array-1.1.4"
       (sources."wide-align-1.1.3" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -76553,7 +76484,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
@@ -76609,8 +76540,8 @@ in
       })
       (sources."@oclif/config-1.17.0" // {
         dependencies = [
-          sources."globby-11.0.1"
-          sources."tslib-2.0.3"
+          sources."globby-11.0.2"
+          sources."tslib-2.1.0"
         ];
       })
       sources."@oclif/errors-1.3.4"
@@ -76787,7 +76718,7 @@ in
       sources."extract-stack-1.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fastq-1.10.0"
@@ -77107,7 +77038,7 @@ in
           sources."has-values-0.1.4"
         ];
       })
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."url-parse-1.4.7"
       sources."url-parse-lax-3.0.0"
@@ -77126,7 +77057,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "faunadb shell";
-      homepage = https://github.com/fauna/fauna-shell;
+      homepage = "https://github.com/fauna/fauna-shell";
       license = "MPL-2.0";
     };
     production = true;
@@ -77136,38 +77067,37 @@ in
   firebase-tools = nodeEnv.buildNodePackage {
     name = "firebase-tools";
     packageName = "firebase-tools";
-    version = "9.1.0";
+    version = "9.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.1.0.tgz";
-      sha512 = "hTfxL2meJSl5WuwAS6bEJ5nay7tu3MNYb4ZL2KmPL7yLM3IeT+Qd2z1evHhW1VvbDXKR6RTwlBxzdWPs4l75kA==";
+      url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.2.1.tgz";
+      sha512 = "sD4wfB5hs/8IKXV6AJOmkpvXf/St7gVc9QeW4Qz21PG7CkirgRf6FqcYkPKtBcro4wfj48dihnYx/IO1+XPTGg==";
     };
     dependencies = [
-      sources."@apidevtools/json-schema-ref-parser-9.0.6"
+      sources."@apidevtools/json-schema-ref-parser-9.0.7"
       sources."@dabh/diagnostics-2.0.2"
       sources."@google-cloud/paginator-3.0.5"
       sources."@google-cloud/precise-date-2.0.3"
       sources."@google-cloud/projectify-2.0.1"
       sources."@google-cloud/promisify-2.0.3"
-      sources."@google-cloud/pubsub-2.7.0"
-      (sources."@grpc/grpc-js-1.1.8" // {
+      sources."@google-cloud/pubsub-2.8.0"
+      (sources."@grpc/grpc-js-1.2.4" // {
         dependencies = [
-          sources."@grpc/proto-loader-0.6.0-pre9"
-          sources."@types/node-12.19.12"
+          sources."@types/node-12.19.15"
           sources."semver-6.3.0"
         ];
       })
-      sources."@grpc/proto-loader-0.5.5"
+      sources."@grpc/proto-loader-0.5.6"
       sources."@jsdevtools/ono-7.1.3"
-      sources."@opentelemetry/api-0.11.0"
-      sources."@opentelemetry/context-base-0.11.0"
-      (sources."@opentelemetry/core-0.11.0" // {
+      sources."@opentelemetry/api-0.12.0"
+      sources."@opentelemetry/context-base-0.12.0"
+      (sources."@opentelemetry/core-0.12.0" // {
         dependencies = [
           sources."semver-7.3.4"
         ];
       })
-      sources."@opentelemetry/resources-0.11.0"
-      sources."@opentelemetry/semantic-conventions-0.11.0"
-      sources."@opentelemetry/tracing-0.11.0"
+      sources."@opentelemetry/resources-0.12.0"
+      sources."@opentelemetry/semantic-conventions-0.12.0"
+      sources."@opentelemetry/tracing-0.12.0"
       sources."@protobufjs/aspromise-1.1.2"
       sources."@protobufjs/base64-1.1.2"
       sources."@protobufjs/codegen-2.0.4"
@@ -77180,9 +77110,10 @@ in
       sources."@protobufjs/utf8-1.1.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
+      sources."@tootallnate/once-1.1.2"
       sources."@types/duplexify-3.6.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
       sources."abort-controller-3.0.0"
@@ -77199,8 +77130,8 @@ in
         ];
       })
       sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-5.0.0"
-      sources."ansi-styles-4.3.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-3.2.1"
       sources."ansicolors-0.3.2"
       sources."anymatch-3.1.1"
       sources."aproba-1.2.0"
@@ -77225,6 +77156,7 @@ in
       sources."as-array-2.0.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
+      sources."ast-types-0.13.4"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
@@ -77241,7 +77173,7 @@ in
       sources."big-integer-1.6.48"
       sources."bignumber.js-9.0.1"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bl-4.0.3"
       sources."blakejs-1.1.0"
       sources."bluebird-3.4.7"
@@ -77253,7 +77185,10 @@ in
       })
       (sources."boxen-4.2.0" // {
         dependencies = [
+          sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
         ];
@@ -77277,40 +77212,24 @@ in
       sources."cardinal-2.1.1"
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
-      (sources."chalk-2.4.2" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-        ];
-      })
+      sources."chalk-2.4.2"
       sources."chardet-0.7.0"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."chownr-2.0.0"
       sources."ci-info-2.0.0"
       sources."cjson-0.3.3"
       sources."cli-boxes-2.2.1"
-      (sources."cli-color-1.4.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      sources."cli-color-1.4.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-2.5.0"
       sources."cli-table-0.3.4"
       sources."cli-width-2.2.1"
-      sources."cliui-6.0.0"
       sources."clone-1.0.4"
       sources."clone-response-1.0.2"
       sources."code-point-at-1.1.0"
-      (sources."color-3.0.0" // {
-        dependencies = [
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-        ];
-      })
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
+      sources."color-3.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
       sources."color-string-1.5.4"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
@@ -77370,14 +77289,15 @@ in
       sources."csv-streamify-3.0.4"
       sources."d-1.0.1"
       sources."dashdash-1.14.1"
+      sources."data-uri-to-buffer-3.0.1"
       sources."debug-4.3.2"
-      sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
       sources."deep-freeze-0.0.1"
       sources."deep-is-0.1.3"
       sources."defaults-1.0.3"
       sources."defer-to-connect-1.1.3"
+      sources."degenerator-2.2.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -77408,7 +77328,10 @@ in
       sources."escape-goat-2.1.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.14.3"
       sources."esprima-4.0.1"
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
       sources."etag-1.8.1"
       sources."event-emitter-0.3.5"
       sources."event-target-shim-5.0.1"
@@ -77437,6 +77360,7 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
+      sources."fast-levenshtein-2.0.6"
       sources."fast-safe-stringify-2.0.7"
       sources."fast-text-encoding-1.0.3"
       (sources."fast-url-parser-1.1.3" // {
@@ -77446,6 +77370,7 @@ in
       })
       sources."fecha-4.2.0"
       sources."figures-2.0.0"
+      sources."file-uri-to-path-2.0.0"
       sources."filesize-3.6.1"
       sources."fill-range-7.0.1"
       (sources."finalhandler-1.1.2" // {
@@ -77454,7 +77379,6 @@ in
           sources."ms-2.0.0"
         ];
       })
-      sources."find-up-4.1.0"
       (sources."flat-arguments-1.0.2" // {
         dependencies = [
           (sources."as-array-1.0.0" // {
@@ -77479,15 +77403,21 @@ in
       })
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       (sources."fstream-1.0.12" // {
         dependencies = [
           sources."rimraf-2.7.1"
         ];
       })
+      (sources."ftp-0.3.10" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       (sources."gauge-2.7.4" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
           sources."is-fullwidth-code-point-1.0.0"
           sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
@@ -77495,31 +77425,32 @@ in
       })
       sources."gaxios-4.1.0"
       sources."gcp-metadata-4.2.1"
-      sources."get-caller-file-2.0.5"
       sources."get-stream-4.1.0"
+      (sources."get-uri-3.0.2" // {
+        dependencies = [
+          sources."fs-extra-8.1.0"
+          sources."jsonfile-4.0.0"
+        ];
+      })
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."glob-slash-1.0.0"
       sources."glob-slasher-1.0.1"
       sources."global-dirs-2.1.0"
-      sources."google-auth-library-6.1.3"
-      sources."google-gax-2.9.2"
+      sources."google-auth-library-6.1.4"
+      sources."google-gax-2.10.0"
       sources."google-p12-pem-3.0.3"
       sources."got-9.6.0"
       sources."graceful-fs-4.2.4"
-      (sources."gtoken-5.1.0" // {
+      (sources."gtoken-5.2.0" // {
         dependencies = [
-          sources."mime-2.4.7"
+          sources."mime-2.5.0"
         ];
       })
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
       sources."has-yarn-2.1.0"
@@ -77530,6 +77461,7 @@ in
           sources."inherits-2.0.3"
         ];
       })
+      sources."http-proxy-agent-4.0.1"
       sources."http-signature-1.2.0"
       sources."https-proxy-agent-5.0.0"
       sources."iconv-lite-0.4.24"
@@ -77556,6 +77488,7 @@ in
         ];
       })
       sources."install-artifact-from-github-1.2.0"
+      sources."ip-1.1.5"
       sources."ip-regex-4.2.0"
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.3.2"
@@ -77614,8 +77547,8 @@ in
         ];
       })
       sources."leven-3.1.0"
+      sources."levn-0.3.0"
       sources."listenercount-1.0.1"
-      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lodash._isnative-2.4.1"
       sources."lodash._objecttypes-2.4.1"
@@ -77652,7 +77585,11 @@ in
       sources."marked-0.7.0"
       sources."marked-terminal-3.3.0"
       sources."media-typer-0.3.0"
-      sources."memoizee-0.4.14"
+      (sources."memoizee-0.4.15" // {
+        dependencies = [
+          sources."next-tick-1.1.0"
+        ];
+      })
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
@@ -77681,6 +77618,7 @@ in
         ];
       })
       sources."negotiator-0.6.2"
+      sources."netmask-1.0.6"
       sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
       sources."node-emoji-1.10.0"
@@ -77690,7 +77628,7 @@ in
         dependencies = [
           sources."mkdirp-1.0.4"
           sources."semver-7.3.4"
-          sources."tar-6.0.5"
+          sources."tar-6.1.0"
           sources."which-2.0.2"
         ];
       })
@@ -77708,6 +77646,7 @@ in
       sources."onetime-2.0.1"
       sources."open-6.4.0"
       sources."openapi3-ts-1.4.0"
+      sources."optionator-0.8.3"
       (sources."ora-3.4.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -77717,16 +77656,14 @@ in
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-1.1.0"
       sources."p-defer-3.0.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
+      sources."pac-proxy-agent-4.1.0"
+      sources."pac-resolver-4.1.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
       sources."parseurl-1.3.3"
-      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."path-to-regexp-0.1.7"
@@ -77738,16 +77675,24 @@ in
           sources."debug-3.2.7"
         ];
       })
+      sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
       sources."promise-breaker-5.0.0"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.39"
+          sources."@types/node-13.13.40"
         ];
       })
       sources."proxy-addr-2.0.6"
+      (sources."proxy-agent-4.0.1" // {
+        dependencies = [
+          sources."lru-cache-5.1.1"
+          sources."yallist-3.1.1"
+        ];
+      })
+      sources."proxy-from-env-1.1.0"
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
@@ -77767,8 +77712,6 @@ in
           sources."qs-6.5.2"
         ];
       })
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."retry-request-4.1.3"
@@ -77814,6 +77757,10 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.3"
       sources."simple-swizzle-0.2.2"
+      sources."smart-buffer-4.1.0"
+      sources."socks-2.5.1"
+      sources."socks-proxy-agent-5.0.0"
+      sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."stack-trace-0.0.10"
@@ -77821,17 +77768,19 @@ in
       sources."stream-shift-1.0.1"
       (sources."string-length-1.0.1" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
           sources."strip-ansi-3.0.1"
         ];
       })
       sources."string-width-4.2.0"
       sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.0"
+      (sources."strip-ansi-6.0.0" // {
+        dependencies = [
+          sources."ansi-regex-5.0.0"
+        ];
+      })
       sources."strip-json-comments-2.0.1"
       (sources."superstatic-7.1.0" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
           sources."ansi-styles-2.2.1"
           sources."chalk-1.1.3"
           sources."fs-extra-8.1.0"
@@ -77882,7 +77831,7 @@ in
       sources."toxic-1.0.1"
       sources."traverse-0.3.9"
       sources."triple-beam-1.3.0"
-      sources."tslib-2.0.3"
+      sources."tslib-2.1.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       (sources."tweetsodium-0.0.5" // {
@@ -77891,6 +77840,7 @@ in
         ];
       })
       sources."type-1.2.0"
+      sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."type-is-1.6.18"
       sources."typedarray-to-buffer-3.1.5"
@@ -77907,12 +77857,15 @@ in
       })
       (sources."update-notifier-4.1.3" // {
         dependencies = [
+          sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
         ];
       })
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-join-0.0.1"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
@@ -77923,7 +77876,6 @@ in
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
       sources."which-1.3.1"
-      sources."which-module-2.0.0"
       (sources."wide-align-1.1.3" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -77945,24 +77897,22 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."wrap-ansi-6.2.0"
+      sources."word-wrap-1.2.3"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
       sources."ws-7.4.2"
       sources."xdg-basedir-4.0.0"
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.31"
+      sources."xregexp-2.0.0"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.1"
       sources."yallist-4.0.0"
-      sources."yargs-15.4.1"
-      sources."yargs-parser-18.1.3"
       sources."zip-stream-2.1.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command-Line Interface for Firebase";
-      homepage = https://github.com/firebase/firebase-tools;
+      homepage = "https://github.com/firebase/firebase-tools";
       license = "MIT";
     };
     production = true;
@@ -78099,7 +78049,7 @@ in
       sources."lodash-4.17.20"
       sources."lru-cache-6.0.0"
       sources."map-obj-4.1.0"
-      (sources."meow-8.1.0" // {
+      (sources."meow-8.1.2" // {
         dependencies = [
           sources."type-fest-0.18.1"
         ];
@@ -78123,7 +78073,7 @@ in
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."path-exists-4.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
@@ -78214,7 +78164,7 @@ in
       sources."concat-map-0.0.1"
       sources."fd-slicer-1.1.0"
       sources."fs.realpath-1.0.0"
-      sources."geoip-country-4.0.49"
+      sources."geoip-country-4.0.52"
       sources."glob-7.1.6"
       sources."iconv-lite-0.5.2"
       sources."inflight-1.0.6"
@@ -78296,7 +78246,7 @@ in
         ];
       })
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."caller-0.0.1"
       sources."camelcase-2.1.1"
       sources."chokidar-2.1.8"
@@ -78341,8 +78291,6 @@ in
       sources."defined-0.0.0"
       sources."director-1.2.7"
       sources."duplexer-0.1.2"
-      sources."es-abstract-1.17.7"
-      sources."es-to-primitive-1.2.1"
       sources."event-stream-3.3.4"
       sources."eventemitter2-6.4.3"
       (sources."expand-brackets-2.1.4" // {
@@ -78414,7 +78362,6 @@ in
       sources."is-arguments-1.1.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -78429,7 +78376,6 @@ in
       })
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.1"
-      sources."is-symbol-1.0.3"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isobject-3.0.1"
@@ -78477,11 +78423,9 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."optimist-0.6.0"
@@ -78505,7 +78449,7 @@ in
       sources."readable-stream-2.3.7"
       sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -78578,8 +78522,6 @@ in
       })
       sources."stream-combiner-0.0.4"
       sources."string-width-1.0.2"
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-0.1.3"
@@ -78669,7 +78611,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command-line JSON viewer";
-      homepage = https://fx.wtf/;
+      homepage = "https://fx.wtf";
       license = "MIT";
     };
     production = true;
@@ -78913,7 +78855,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "git hosting on secure-scuttlebutt (ssb)";
-      homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256;
+      homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256";
       license = "Fair";
     };
     production = true;
@@ -79036,7 +78978,7 @@ in
       sources."figures-3.2.0"
       sources."find-up-3.0.0"
       sources."function-bind-1.1.1"
-      sources."fuse.js-6.4.5"
+      sources."fuse.js-6.4.6"
       sources."get-stream-6.0.0"
       sources."global-dirs-2.1.0"
       (sources."got-9.6.0" // {
@@ -79099,7 +79041,7 @@ in
         ];
       })
       sources."map-obj-4.1.0"
-      (sources."meow-8.1.0" // {
+      (sources."meow-8.1.2" // {
         dependencies = [
           sources."type-fest-0.18.1"
         ];
@@ -79121,7 +79063,7 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      sources."ora-5.2.0"
+      sources."ora-5.3.0"
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-1.1.0"
       sources."p-limit-2.3.0"
@@ -79132,7 +79074,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."path-exists-4.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
@@ -79200,7 +79142,7 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."unique-string-2.0.0"
       sources."update-notifier-5.0.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-license-3.0.4"
@@ -79250,39 +79192,59 @@ in
       sources."@graphql-cli/init-4.1.0"
       (sources."@graphql-tools/batch-execute-7.0.0" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.3"
+          (sources."@graphql-tools/utils-7.2.4" // {
+            dependencies = [
+              sources."tslib-2.1.0"
+            ];
+          })
         ];
       })
-      (sources."@graphql-tools/delegate-7.0.8" // {
+      (sources."@graphql-tools/delegate-7.0.9" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.3"
+          sources."@graphql-tools/utils-7.2.4"
+          sources."tslib-2.1.0"
         ];
       })
-      (sources."@graphql-tools/graphql-file-loader-6.2.6" // {
+      (sources."@graphql-tools/graphql-file-loader-6.2.7" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.3"
+          sources."@graphql-tools/utils-7.2.4"
+          sources."tslib-2.1.0"
+        ];
+      })
+      (sources."@graphql-tools/import-6.2.6" // {
+        dependencies = [
+          sources."tslib-2.1.0"
         ];
       })
-      sources."@graphql-tools/import-6.2.5"
       (sources."@graphql-tools/json-file-loader-6.2.6" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.3"
+          (sources."@graphql-tools/utils-7.2.4" // {
+            dependencies = [
+              sources."tslib-2.1.0"
+            ];
+          })
         ];
       })
       sources."@graphql-tools/load-6.2.4"
-      (sources."@graphql-tools/merge-6.2.6" // {
+      (sources."@graphql-tools/merge-6.2.7" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.3"
+          sources."@graphql-tools/utils-7.2.4"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."@graphql-tools/schema-7.1.2" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.3"
+          (sources."@graphql-tools/utils-7.2.4" // {
+            dependencies = [
+              sources."tslib-2.1.0"
+            ];
+          })
         ];
       })
-      (sources."@graphql-tools/url-loader-6.7.1" // {
+      (sources."@graphql-tools/url-loader-6.8.0" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.3"
+          sources."@graphql-tools/utils-7.2.4"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."@graphql-tools/utils-6.2.4" // {
@@ -79296,7 +79258,11 @@ in
       })
       (sources."@graphql-tools/wrap-7.0.5" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.3"
+          (sources."@graphql-tools/utils-7.2.4" // {
+            dependencies = [
+              sources."tslib-2.1.0"
+            ];
+          })
         ];
       })
       sources."@kwsites/file-exists-1.1.1"
@@ -79306,7 +79272,7 @@ in
       sources."@nodelib/fs.walk-1.2.6"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -79341,12 +79307,12 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."call-me-maybe-1.0.1"
       sources."callsites-3.1.0"
       (sources."camel-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."caseless-0.12.0"
@@ -79402,7 +79368,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-3.3.1"
@@ -79420,7 +79386,7 @@ in
       sources."extract-files-9.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fastq-1.10.0"
@@ -79460,7 +79426,7 @@ in
       sources."graphql-subscriptions-1.1.0"
       sources."graphql-type-json-0.3.2"
       sources."graphql-upload-11.0.0"
-      sources."graphql-ws-3.1.0"
+      sources."graphql-ws-4.1.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -79514,11 +79480,7 @@ in
       sources."is-stream-1.1.0"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      (sources."is-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."is-typed-array-1.1.4"
       sources."is-typedarray-1.0.0"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
@@ -79563,7 +79525,7 @@ in
       })
       (sources."lower-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."lowercase-keys-1.0.1"
@@ -79589,7 +79551,7 @@ in
       sources."nice-try-1.0.5"
       (sources."no-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."node-emoji-1.10.0"
@@ -79646,10 +79608,10 @@ in
       })
       sources."parent-module-1.0.1"
       sources."parse-github-url-1.0.2"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       (sources."pascal-case-3.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."passwd-user-3.0.0"
@@ -79667,7 +79629,7 @@ in
       sources."querystringify-2.2.0"
       sources."rc-1.2.8"
       sources."reftools-1.1.7"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."remove-trailing-separator-1.1.0"
@@ -79739,7 +79701,7 @@ in
       sources."type-fest-0.3.1"
       sources."universalify-1.0.0"
       sources."unixify-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-parse-1.4.7"
       sources."url-parse-lax-3.0.0"
       sources."uuid-3.4.0"
@@ -79749,11 +79711,7 @@ in
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      (sources."which-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."which-typed-array-1.1.4"
       (sources."wrap-ansi-7.0.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
@@ -79761,7 +79719,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-7.4.1"
+      sources."ws-7.4.2"
       sources."y18n-5.0.5"
       sources."yallist-4.0.0"
       sources."yaml-1.10.0"
@@ -80058,7 +80016,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The Makam metalanguage -- a tool for rapid language prototyping";
-      homepage = http://astampoulis.github.io/makam/;
+      homepage = "http://astampoulis.github.io/makam/";
       license = "GPL-3.0";
     };
     production = true;
@@ -80125,7 +80083,7 @@ in
       sources."ansi-term-0.0.2"
       sources."ansicolors-0.3.2"
       sources."blessed-0.1.81"
-      sources."blessed-contrib-4.8.20"
+      sources."blessed-contrib-4.8.21"
       sources."bresenham-0.0.3"
       sources."buffers-0.1.1"
       sources."cardinal-2.1.1"
@@ -80197,7 +80155,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-4.34.2"
+      sources."systeminformation-4.34.7"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
@@ -80281,7 +80239,7 @@ in
       sources."buffer-equal-1.0.0"
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-3.0.0"
       sources."chokidar-2.1.8"
       (sources."class-utils-0.3.6" // {
@@ -80677,7 +80635,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The streaming build system.";
-      homepage = https://gulpjs.com/;
+      homepage = "https://gulpjs.com";
       license = "MIT";
     };
     production = true;
@@ -80719,7 +80677,7 @@ in
       })
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-3.0.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -81031,7 +80989,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command line interface for gulp";
-      homepage = https://gulpjs.com/;
+      homepage = "https://gulpjs.com";
       license = "MIT";
     };
     production = true;
@@ -81049,7 +81007,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A robust HTML entities encoder/decoder with full Unicode support.";
-      homepage = https://mths.be/he;
+      homepage = "https://mths.be/he";
       license = "MIT";
     };
     production = true;
@@ -81074,13 +81032,13 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.6.1"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       sources."upper-case-1.1.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Highly configurable, well-tested, JavaScript-based HTML minifier.";
-      homepage = https://kangax.github.io/html-minifier/;
+      homepage = "https://kangax.github.io/html-minifier/";
       license = "MIT";
     };
     production = true;
@@ -81165,7 +81123,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."wrappy-1.0.2"
@@ -81174,7 +81132,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The Static Code Analysis Tool for your HTML";
-      homepage = https://htmlhint.com/;
+      homepage = "https://htmlhint.com";
       license = "MIT";
     };
     production = true;
@@ -81207,7 +81165,7 @@ in
       sources."ms-2.1.3"
       sources."opener-1.5.2"
       sources."portfinder-1.0.28"
-      sources."qs-6.9.4"
+      sources."qs-6.9.6"
       sources."requires-port-1.0.0"
       sources."secure-compare-3.0.1"
       sources."union-0.5.0"
@@ -81270,7 +81228,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Cryptocurrency bike-shed";
-      homepage = https://github.com/handshake-org/hsd;
+      homepage = "https://github.com/handshake-org/hsd";
       license = "MIT";
     };
     production = true;
@@ -81297,7 +81255,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Handshake airdrop redemption";
-      homepage = https://github.com/handshake-org/hs-airdrop;
+      homepage = "https://github.com/handshake-org/hs-airdrop";
       license = "MIT";
     };
     production = true;
@@ -81322,7 +81280,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "HSD node and wallet client";
-      homepage = https://github.com/handshake-org/hs-client;
+      homepage = "https://github.com/handshake-org/hs-client";
       license = "MIT";
     };
     production = true;
@@ -81469,7 +81427,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "IJavascript is a Javascript kernel for the Jupyter notebook";
-      homepage = https://n-riesco.github.io/ijavascript;
+      homepage = "https://n-riesco.github.io/ijavascript";
       license = "BSD-3-Clause";
     };
     production = true;
@@ -81670,7 +81628,7 @@ in
       sources."uglify-js-2.8.29"
       sources."uglify-to-browserify-1.0.2"
       sources."update-notifier-0.5.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -81685,7 +81643,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites";
-      homepage = http://github.com/remy/inliner;
+      homepage = "http://github.com/remy/inliner";
       license = "MIT";
     };
     production = true;
@@ -81704,7 +81662,7 @@ in
       sources."async-0.2.10"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."bunyan-1.8.14"
+      sources."bunyan-1.8.15"
       sources."colors-0.6.2"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
@@ -81820,7 +81778,7 @@ in
       sources."is-wsl-2.2.0"
       sources."isexe-2.0.0"
       sources."jquery-3.5.1"
-      sources."jquery.terminal-2.20.1"
+      sources."jquery.terminal-2.20.2"
       sources."jsonfile-2.4.0"
       sources."keyboardevent-key-polyfill-1.1.0"
       sources."line-reader-0.4.0"
@@ -81850,7 +81808,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "High precision scientific calculator with support for physical units";
-      homepage = https://github.com/sharkdp/insect;
+      homepage = "https://github.com/sharkdp/insect";
       license = "MIT";
     };
     production = true;
@@ -81884,7 +81842,7 @@ in
       sources."ansi-styles-3.2.1"
       (sources."ast-types-0.13.4" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."astral-regex-2.0.0"
@@ -82022,7 +81980,7 @@ in
       sources."lru-cache-5.1.1"
       sources."macos-release-2.4.1"
       sources."methods-1.1.2"
-      sources."mime-2.4.7"
+      sources."mime-2.5.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-fn-1.2.0"
@@ -82042,7 +82000,7 @@ in
       })
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."optionator-0.8.3"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
@@ -82053,10 +82011,10 @@ in
       sources."path-key-3.1.1"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-agent-4.0.0"
+      sources."proxy-agent-4.0.1"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."qs-6.9.4"
+      sources."qs-6.9.6"
       sources."raw-body-2.4.1"
       sources."readable-stream-3.6.0"
       sources."restore-cursor-2.0.0"
@@ -82148,7 +82106,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A tool for creating and developing Ionic Framework mobile apps.";
-      homepage = https://ionicframework.com/;
+      homepage = "https://ionicframework.com";
       license = "MIT";
     };
     production = true;
@@ -82161,7 +82119,7 @@ in
     version = "3.7.1";
     src = fetchurl {
       name = "iosevka-3.7.1.tar.gz";
-      url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1;
+      url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1";
       sha256 = "ed7aee70af326ef22458f8f7603c599fd2f5164ae8062fbd6fb7d56864d98aca";
     };
     dependencies = [
@@ -82316,7 +82274,7 @@ in
       sources."find-up-1.1.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."fs-extra-9.0.1"
+      sources."fs-extra-9.1.0"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
@@ -82350,11 +82308,7 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      (sources."jsonfile-6.1.0" // {
-        dependencies = [
-          sources."universalify-2.0.0"
-        ];
-      })
+      sources."jsonfile-6.1.0"
       sources."jsprim-1.4.1"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
@@ -82496,7 +82450,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."traverse-0.3.9"
       sources."ts-process-promises-1.0.2"
-      sources."tslib-2.0.3"
+      sources."tslib-2.1.0"
       sources."ttf2woff-2.0.2"
       sources."ttf2woff2-3.0.0"
       sources."tunnel-agent-0.6.0"
@@ -82504,8 +82458,8 @@ in
       sources."type-check-0.3.2"
       sources."typo-geom-0.11.0"
       sources."unicoderegexp-0.4.1"
-      sources."universalify-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."universalify-2.0.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -82669,7 +82623,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Implementation of the Language Server Protocol for JavaScript and TypeScript";
-      homepage = https://github.com/sourcegraph/javascript-typescript-langserver;
+      homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
       license = "Apache-2.0";
     };
     production = true;
@@ -82679,26 +82633,26 @@ in
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "1.5.1";
+    version = "1.6.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-1.5.1.tgz";
-      sha512 = "V90a+QTDf5SSW8Il0BcWtdqdtDZYd/YFltqRzXGBRwO2nFggeUAuXcQxs5ZxEhQF3Jzvx3yGfrYioZR7B30D2A==";
+      url = "https://registry.npmjs.org/joplin/-/joplin-1.6.4.tgz";
+      sha512 = "jfiqk9aqN3mAZ+TIGqubTKGTBB5Q8KRmeXS2qr/2N80KFJHCqdCFhsyI/E2hfdd3CA4Gu5Ls9WTxXA3MW/XjwA==";
     };
     dependencies = [
       sources."@braintree/sanitize-url-3.1.0"
       sources."@cronvel/get-pixels-3.4.0"
-      sources."@joplin/fork-htmlparser2-4.1.14"
-      sources."@joplin/fork-sax-1.2.18"
-      sources."@joplin/lib-1.0.15"
-      (sources."@joplin/renderer-1.0.23" // {
+      sources."@joplin/fork-htmlparser2-4.1.20"
+      sources."@joplin/fork-sax-1.2.24"
+      sources."@joplin/lib-1.0.18"
+      (sources."@joplin/renderer-1.0.26" // {
         dependencies = [
           sources."fs-extra-8.1.0"
           sources."jsonfile-4.0.0"
           sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support"
         ];
       })
-      sources."@joplin/turndown-4.0.36"
-      sources."@joplin/turndown-plugin-gfm-1.0.18"
+      sources."@joplin/turndown-4.0.42"
+      sources."@joplin/turndown-plugin-gfm-1.0.24"
       sources."abab-2.0.5"
       sources."abbrev-1.1.1"
       sources."acorn-7.4.1"
@@ -82738,7 +82692,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.821.0" // {
+      (sources."aws-sdk-2.830.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -82753,7 +82707,7 @@ in
       sources."base64-js-1.5.1"
       sources."base64-stream-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       (sources."bl-4.0.3" // {
         dependencies = [
           sources."buffer-5.7.1"
@@ -82772,7 +82726,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."charenc-0.0.2"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."chownr-1.1.4"
       sources."chroma-js-2.1.0"
       sources."clean-css-4.2.3"
@@ -82914,7 +82868,7 @@ in
       })
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."fstream-1.0.12"
       (sources."gauge-2.7.4" // {
         dependencies = [
@@ -83023,7 +82977,7 @@ in
       sources."isobject-2.1.0"
       sources."isstream-0.1.2"
       sources."jmespath-0.15.0"
-      sources."jpeg-js-0.4.2"
+      sources."jpeg-js-0.4.3"
       sources."js-tokens-4.0.0"
       sources."jsbn-0.1.1"
       sources."jsdom-15.2.1"
@@ -83037,12 +82991,8 @@ in
           sources."commander-2.20.3"
         ];
       })
-      (sources."keytar-7.3.0" // {
-        dependencies = [
-          sources."node-addon-api-3.1.0"
-        ];
-      })
-      sources."khroma-1.1.1"
+      sources."keytar-7.3.0"
+      sources."khroma-1.2.0"
       sources."klaw-1.3.1"
       sources."lazyness-1.2.0"
       sources."levenshtein-1.0.5"
@@ -83090,7 +83040,7 @@ in
       sources."md5-2.3.0"
       sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
-      sources."mermaid-8.8.4"
+      sources."mermaid-8.9.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-response-2.1.0"
@@ -83100,7 +83050,7 @@ in
           sources."debug-4.3.2"
           sources."html-minifier-4.0.0"
           sources."ms-2.1.2"
-          sources."uglify-js-3.12.4"
+          sources."uglify-js-3.12.5"
         ];
       })
       sources."minimatch-3.0.4"
@@ -83122,7 +83072,7 @@ in
       sources."napi-build-utils-1.0.2"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
-      sources."needle-2.5.2"
+      sources."needle-2.6.0"
       sources."nextgen-events-1.3.4"
       sources."no-case-2.3.2"
       (sources."node-abi-2.19.3" // {
@@ -83130,7 +83080,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."node-addon-api-2.0.0"
+      sources."node-addon-api-3.1.0"
       sources."node-bitmap-0.0.1"
       sources."node-emoji-1.10.0"
       sources."node-fetch-1.7.3"
@@ -83172,7 +83122,7 @@ in
       })
       sources."omggif-1.0.10"
       sources."once-1.4.0"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."optionator-0.8.3"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -83251,7 +83201,6 @@ in
           sources."color-3.1.3"
           sources."decompress-response-6.0.0"
           sources."mimic-response-3.1.0"
-          sources."node-addon-api-3.1.0"
           sources."simple-get-4.0.0"
         ];
       })
@@ -83273,12 +83222,12 @@ in
       sources."source-map-url-0.4.0"
       sources."split-skip-0.0.2"
       sources."sprintf-js-1.1.2"
-      sources."sqlite3-5.0.0"
+      sources."sqlite3-5.0.1"
       sources."sshpk-1.16.1"
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."strict-uri-encode-1.1.0"
-      sources."string-kit-0.11.8"
+      sources."string-kit-0.11.10"
       sources."string-padding-1.0.2"
       sources."string-to-stream-1.1.1"
       (sources."string-width-1.0.2" // {
@@ -83324,7 +83273,7 @@ in
           sources."q-0.9.7"
         ];
       })
-      sources."terminal-kit-1.44.3"
+      sources."terminal-kit-1.45.5"
       (sources."terser-4.8.0" // {
         dependencies = [
           sources."commander-2.20.3"
@@ -83366,7 +83315,7 @@ in
       sources."unorm-1.6.0"
       sources."unpack-string-0.0.2"
       sources."upper-case-1.1.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       (sources."url-0.10.3" // {
         dependencies = [
@@ -83418,10 +83367,10 @@ in
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
-    version = "1.13.0";
+    version = "1.13.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz";
-      sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA==";
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.4.tgz";
+      sha512 = "M5yEWwonlEO3kPcCZ3K3KBSpFRZAEO3FAWC6wtbIGeyg7dusStxvF0WG+HRLBoMZqREXSRSxkkqClDE865x1sg==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -83452,7 +83401,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "beautifier.io for node";
-      homepage = https://beautifier.io/;
+      homepage = "https://beautifier.io/";
       license = "MIT";
     };
     production = true;
@@ -83569,7 +83518,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Static analysis tool for JavaScript";
-      homepage = http://jshint.com/;
+      homepage = "http://jshint.com/";
       license = "MIT";
     };
     production = true;
@@ -83612,7 +83561,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "JSON diff";
-      homepage = https://github.com/andreyvit/json-diff;
+      homepage = "https://github.com/andreyvit/json-diff";
     };
     production = true;
     bypassCache = true;
@@ -83654,20 +83603,20 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.9.4"
+      sources."qs-6.9.6"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
       sources."slash-3.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
       sources."superagent-3.8.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03).";
-      homepage = https://github.com/whitlockjc/json-refs;
+      homepage = "https://github.com/whitlockjc/json-refs";
       license = "MIT";
     };
     production = true;
@@ -83911,7 +83860,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Get a full fake REST API with zero coding in less than 30 seconds";
-      homepage = https://github.com/typicode/json-server;
+      homepage = "https://github.com/typicode/json-server";
       license = "MIT";
     };
     production = true;
@@ -83938,7 +83887,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Validate JSON";
-      homepage = http://zaach.github.com/jsonlint/;
+      homepage = "http://zaach.github.com/jsonlint/";
     };
     production = true;
     bypassCache = true;
@@ -83947,85 +83896,74 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "5.2.3";
+    version = "6.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-5.2.3.tgz";
-      sha512 = "tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==";
+      url = "https://registry.npmjs.org/karma/-/karma-6.0.1.tgz";
+      sha512 = "LHE8Ywfeji6Sk3jt072j7gUAYZrpw7tCzvQWpgJqwCC9inW4eA3g1yl6srTtC0xiOvZDqXIzx8tgBPm0qhfYkg==";
     };
     dependencies = [
+      sources."@types/component-emitter-1.2.10"
+      sources."@types/cookie-0.4.0"
+      sources."@types/cors-2.8.9"
+      sources."@types/node-14.14.22"
       sources."accepts-1.3.7"
-      sources."after-0.8.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
-      sources."arraybuffer.slice-0.0.7"
-      sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
-      sources."binary-extensions-2.1.0"
-      sources."blob-0.0.5"
+      sources."binary-extensions-2.2.0"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."bytes-3.1.0"
-      sources."camelcase-5.3.1"
-      sources."chokidar-3.4.3"
-      sources."cliui-6.0.0"
+      sources."chokidar-3.5.1"
+      sources."cliui-7.0.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
-      sources."component-bind-1.0.0"
       sources."component-emitter-1.3.0"
-      sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
       sources."connect-3.7.0"
       sources."content-type-1.0.4"
       sources."cookie-0.4.1"
+      sources."cors-2.8.5"
       sources."custom-event-1.0.1"
       sources."date-format-3.0.0"
       sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
       sources."depd-1.1.2"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
       sources."ee-first-1.1.1"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-3.5.0" // {
+      (sources."engine.io-4.1.0" // {
         dependencies = [
-          sources."debug-4.1.1"
-          sources."ms-2.1.3"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."engine.io-client-3.5.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
-      sources."engine.io-parser-2.2.1"
+      sources."engine.io-parser-4.0.2"
       sources."ent-2.2.0"
+      sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
       sources."eventemitter3-4.0.7"
       sources."extend-3.0.2"
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
-      sources."find-up-4.1.0"
       sources."flatted-2.0.2"
       sources."follow-redirects-1.13.1"
       sources."fs-extra-8.1.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."get-caller-file-2.0.5"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."graceful-fs-4.2.4"
-      sources."has-binary2-1.0.3"
-      sources."has-cors-1.1.0"
       sources."http-errors-1.7.2"
       sources."http-proxy-1.18.1"
       sources."iconv-lite-0.4.24"
-      sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."is-binary-path-2.1.0"
@@ -84033,10 +83971,8 @@ in
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
-      sources."isarray-2.0.1"
       sources."isbinaryfile-4.0.6"
       sources."jsonfile-4.0.0"
-      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       (sources."log4js-6.3.0" // {
         dependencies = [
@@ -84045,22 +83981,17 @@ in
         ];
       })
       sources."media-typer-0.3.0"
-      sources."mime-2.4.7"
+      sources."mime-2.5.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
       sources."normalize-path-3.0.0"
+      sources."object-assign-4.1.1"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."parseqs-0.0.6"
-      sources."parseuri-0.0.6"
       sources."parseurl-1.3.3"
-      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."picomatch-2.2.2"
       sources."qjobs-1.2.0"
@@ -84069,31 +84000,22 @@ in
       sources."raw-body-2.4.0"
       sources."readdirp-3.5.0"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
-      sources."rfdc-1.1.4"
+      sources."rfdc-1.2.0"
       sources."rimraf-3.0.2"
       sources."safer-buffer-2.1.2"
-      sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.1"
-      (sources."socket.io-2.4.0" // {
+      (sources."socket.io-3.1.0" // {
         dependencies = [
-          sources."debug-4.1.1"
-          sources."ms-2.1.3"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
-      sources."socket.io-adapter-1.1.2"
-      (sources."socket.io-client-2.4.0" // {
+      sources."socket.io-adapter-2.1.0"
+      (sources."socket.io-parser-4.0.4" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."socket.io-parser-3.3.1"
-        ];
-      })
-      (sources."socket.io-parser-3.4.1" // {
-        dependencies = [
-          sources."component-emitter-1.2.1"
-          sources."debug-4.1.1"
-          sources."ms-2.1.3"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
       sources."source-map-0.6.1"
@@ -84108,29 +84030,26 @@ in
       sources."string-width-4.2.0"
       sources."strip-ansi-6.0.0"
       sources."tmp-0.2.1"
-      sources."to-array-0.1.4"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
       sources."type-is-1.6.18"
-      sources."ua-parser-js-0.7.22"
+      sources."ua-parser-js-0.7.23"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
       sources."utils-merge-1.0.1"
+      sources."vary-1.1.2"
       sources."void-elements-2.0.1"
-      sources."which-module-2.0.0"
-      sources."wrap-ansi-6.2.0"
+      sources."wrap-ansi-7.0.0"
       sources."wrappy-1.0.2"
       sources."ws-7.4.2"
-      sources."xmlhttprequest-ssl-1.5.5"
-      sources."y18n-4.0.1"
-      sources."yargs-15.4.1"
-      sources."yargs-parser-18.1.3"
-      sources."yeast-0.1.2"
+      sources."y18n-5.0.5"
+      sources."yargs-16.2.0"
+      sources."yargs-parser-20.2.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Spectacular Test Runner for JavaScript.";
-      homepage = http://karma-runner.github.io/;
+      homepage = "http://karma-runner.github.io/";
       license = "MIT";
     };
     production = true;
@@ -84150,7 +84069,7 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."buffer-equal-1.0.0"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
       sources."clone-stats-1.0.0"
@@ -84227,7 +84146,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Merges multiple lcov results into one";
-      homepage = https://github.com/mweibel/lcov-result-merger;
+      homepage = "https://github.com/mweibel/lcov-result-merger";
       license = "MIT";
     };
     production = true;
@@ -84436,7 +84355,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."underscore-1.9.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       (sources."utile-0.3.0" // {
         dependencies = [
           sources."async-0.9.2"
@@ -84604,7 +84523,7 @@ in
           sources."universal-user-agent-6.0.0"
         ];
       })
-      sources."@octokit/openapi-types-2.0.1"
+      sources."@octokit/openapi-types-3.1.1"
       sources."@octokit/plugin-enterprise-rest-6.0.1"
       (sources."@octokit/plugin-paginate-rest-1.1.2" // {
         dependencies = [
@@ -84630,11 +84549,11 @@ in
         ];
       })
       sources."@octokit/rest-16.43.2"
-      sources."@octokit/types-6.1.2"
+      sources."@octokit/types-6.4.2"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -84690,7 +84609,7 @@ in
       sources."byte-size-5.0.1"
       sources."cacache-12.0.4"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
@@ -84831,7 +84750,7 @@ in
       sources."envinfo-7.7.3"
       sources."err-code-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
@@ -85112,7 +85031,7 @@ in
       sources."map-cache-0.2.2"
       sources."map-obj-4.1.0"
       sources."map-visit-1.0.0"
-      (sources."meow-8.1.0" // {
+      (sources."meow-8.1.2" // {
         dependencies = [
           sources."find-up-4.1.0"
           sources."hosted-git-info-3.0.7"
@@ -85120,7 +85039,7 @@ in
           sources."lru-cache-6.0.0"
           sources."normalize-package-data-3.0.0"
           sources."p-locate-4.1.0"
-          sources."parse-json-5.1.0"
+          sources."parse-json-5.2.0"
           sources."path-exists-4.0.0"
           (sources."read-pkg-5.2.0" // {
             dependencies = [
@@ -85241,7 +85160,11 @@ in
       sources."parallel-transform-1.2.0"
       sources."parse-github-repo-url-1.4.1"
       sources."parse-json-4.0.0"
-      sources."parse-path-4.0.2"
+      (sources."parse-path-4.0.3" // {
+        dependencies = [
+          sources."qs-6.9.6"
+        ];
+      })
       sources."parse-url-5.0.2"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
@@ -85273,6 +85196,7 @@ in
       sources."punycode-2.1.1"
       sources."q-1.5.1"
       sources."qs-6.5.2"
+      sources."query-string-6.13.8"
       sources."quick-lru-4.0.1"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.5"
@@ -85383,6 +85307,7 @@ in
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.7"
       sources."split-1.0.1"
+      sources."split-on-first-1.1.0"
       sources."split-string-3.1.0"
       sources."split2-2.2.0"
       sources."sprintf-js-1.0.3"
@@ -85407,6 +85332,7 @@ in
       })
       sources."stream-each-1.2.3"
       sources."stream-shift-1.0.1"
+      sources."strict-uri-encode-2.0.0"
       (sources."string-width-2.1.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -85451,7 +85377,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."union-value-1.0.1"
@@ -85470,7 +85396,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
@@ -85533,23 +85459,28 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "4.0.0";
+    version = "4.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-4.0.0.tgz";
-      sha512 = "av1eEa2D0xZfF7fjLJS/Dld7zAYSLU7EOEJvuOELeaNI3i6L/81AdjbK5/pytaRkBwi7ZEa0433IDvMLskKCOw==";
+      url = "https://registry.npmjs.org/less/-/less-4.1.0.tgz";
+      sha512 = "w1Ag/f34g7LwtQ/sMVSGWIyZx+gG9ZOAEtyxeX1fG75is6BMyC2lD5kG+1RueX7PkAvlQBm2Lf2aN2j0JbVr2A==";
     };
     dependencies = [
       sources."copy-anything-2.0.1"
+      sources."debug-3.2.7"
       sources."errno-0.1.8"
       sources."graceful-fs-4.2.4"
+      sources."iconv-lite-0.4.24"
       sources."image-size-0.5.5"
       sources."is-what-3.12.0"
       sources."make-dir-2.1.0"
       sources."mime-1.6.0"
-      sources."native-request-1.0.8"
+      sources."ms-2.1.3"
+      sources."needle-2.6.0"
       sources."parse-node-version-1.0.1"
       sources."pify-4.0.1"
       sources."prr-1.0.1"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
       sources."semver-5.7.1"
       sources."source-map-0.6.1"
       sources."tslib-1.14.1"
@@ -85557,7 +85488,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Leaner CSS";
-      homepage = http://lesscss.org/;
+      homepage = "http://lesscss.org";
       license = "Apache-2.0";
     };
     production = true;
@@ -85582,7 +85513,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "clean-css plugin for less.js";
-      homepage = http://lesscss.org/;
+      homepage = "http://lesscss.org";
     };
     production = true;
     bypassCache = true;
@@ -86320,7 +86251,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."socket.io-2.4.0" // {
+      (sources."socket.io-2.4.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
@@ -86331,7 +86262,7 @@ in
         dependencies = [
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
-          sources."socket.io-parser-3.3.1"
+          sources."socket.io-parser-3.3.2"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
@@ -86394,7 +86325,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
@@ -86409,7 +86340,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Live Markdown previews for your favourite editor.";
-      homepage = https://github.com/shime/livedown;
+      homepage = "https://github.com/shime/livedown";
       license = "MIT";
     };
     production = true;
@@ -86538,13 +86469,13 @@ in
       sources."@types/babel__generator-7.6.2"
       sources."@types/babel__template-7.4.0"
       sources."@types/babel__traverse-7.11.0"
-      sources."@types/estree-0.0.45"
+      sources."@types/estree-0.0.46"
       sources."@types/graceful-fs-4.1.4"
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
-      sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.20"
+      sources."@types/json-schema-7.0.7"
+      sources."@types/node-14.14.22"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.12"
@@ -86663,7 +86594,7 @@ in
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bindings-1.5.0"
       (sources."bl-4.0.3" // {
         dependencies = [
@@ -86698,7 +86629,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       sources."bser-2.1.1"
       sources."buffer-5.2.1"
       sources."buffer-from-1.1.1"
@@ -86712,9 +86643,9 @@ in
       })
       sources."cache-base-1.0.1"
       sources."cached-path-relative-1.0.2"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -86726,11 +86657,10 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."chokidar-3.4.3" // {
+      (sources."chokidar-3.5.1" // {
         dependencies = [
           sources."braces-3.0.2"
           sources."fill-range-7.0.1"
-          sources."fsevents-2.1.3"
           sources."is-number-7.0.0"
           sources."to-regex-range-5.0.1"
         ];
@@ -86787,7 +86717,7 @@ in
       })
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.12"
-      (sources."core-js-compat-3.8.2" // {
+      (sources."core-js-compat-3.8.3" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -86838,7 +86768,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -86847,7 +86777,7 @@ in
       sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
-      (sources."enhanced-resolve-4.3.0" // {
+      (sources."enhanced-resolve-4.5.0" // {
         dependencies = [
           sources."memory-fs-0.5.0"
         ];
@@ -87148,7 +87078,7 @@ in
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
@@ -87182,7 +87112,7 @@ in
       sources."paredit.js-0.3.6"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.6"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
@@ -87243,7 +87173,7 @@ in
       sources."regex-not-1.0.2"
       sources."regexpu-core-4.7.1"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.4" // {
+      (sources."regjsparser-0.6.6" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -87462,7 +87392,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -87498,7 +87428,7 @@ in
           sources."readdirp-2.2.1"
         ];
       })
-      (sources."webpack-4.44.2" // {
+      (sources."webpack-4.46.0" // {
         dependencies = [
           sources."acorn-6.4.2"
           sources."micromatch-3.1.10"
@@ -87587,7 +87517,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Madoko is a fast scholarly Markdown processor written in Koka";
-      homepage = http://madoko.codeplex.com/;
+      homepage = "http://madoko.codeplex.com";
     };
     production = true;
     bypassCache = true;
@@ -87596,10 +87526,10 @@ in
   markdown-link-check = nodeEnv.buildNodePackage {
     name = "markdown-link-check";
     packageName = "markdown-link-check";
-    version = "3.8.5";
+    version = "3.8.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.5.tgz";
-      sha512 = "raCr1YMrIqCUFrBTp90UHDsar/79TPgzlVHA7gSi1DnhM2/BC1lm49V+PGzBd1ZpIYwkmzQ6TYm0AfK7A82/Dw==";
+      url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.6.tgz";
+      sha512 = "GWzd54hNol2Zwf6fFEhUYqi9wbib1BMdcphvGCZqhinaAKhiILDaQkX7sn2u9GMoItmZ1jQK0f8wULOK/M+M4w==";
     };
     dependencies = [
       sources."ajv-6.12.6"
@@ -87663,7 +87593,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
     ];
@@ -87949,7 +87879,7 @@ in
       sources."type-1.2.0"
       sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -87965,7 +87895,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Bot to publish twitter, tumblr or rss posts to an mastodon account.";
-      homepage = https://github.com/yogthos/mastodon-bot;
+      homepage = "https://github.com/yogthos/mastodon-bot";
       license = "MIT";
     };
     production = true;
@@ -88021,7 +87951,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined.";
-      homepage = https://bitbucket.org/aahmed/meat;
+      homepage = "https://bitbucket.org/aahmed/meat";
     };
     production = true;
     bypassCache = true;
@@ -88037,7 +87967,7 @@ in
     };
     dependencies = [
       sources."@braintree/sanitize-url-3.1.0"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
@@ -88119,7 +88049,7 @@ in
       sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."khroma-1.1.1"
+      sources."khroma-1.2.0"
       sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lower-case-1.1.4"
@@ -88165,7 +88095,7 @@ in
       sources."through-2.3.8"
       sources."try-catch-2.0.1"
       sources."try-to-catch-1.1.1"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       sources."unbzip2-stream-1.4.3"
       sources."upper-case-1.1.3"
       sources."util-deprecate-1.0.2"
@@ -88186,28 +88116,28 @@ in
   mirakurun = nodeEnv.buildNodePackage {
     name = "mirakurun";
     packageName = "mirakurun";
-    version = "3.4.1";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.4.1.tgz";
-      sha512 = "ymTdhda+4t6njz8xY8ySZS4nDEDEb+zXhmn1JzzxlribUqELcKZ6FwC8JF8HhHg3tcKeFAwVLzL6kHcaqL+okQ==";
+      url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.5.0.tgz";
+      sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg==";
     };
     dependencies = [
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.155.3"
-      sources."@fluentui/react-focus-7.17.0"
+      sources."@fluentui/react-7.156.0"
+      sources."@fluentui/react-focus-7.17.1"
       sources."@fluentui/react-window-provider-1.0.1"
-      sources."@fluentui/theme-1.7.0"
-      sources."@microsoft/load-themed-styles-1.10.141"
+      sources."@fluentui/theme-1.7.1"
+      sources."@microsoft/load-themed-styles-1.10.145"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@uifabric/foundation-7.9.20"
-      sources."@uifabric/icons-7.5.17"
+      sources."@uifabric/foundation-7.9.21"
+      sources."@uifabric/icons-7.5.18"
       sources."@uifabric/merge-styles-7.19.1"
       sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.18"
+      sources."@uifabric/styling-7.16.19"
       sources."@uifabric/utilities-7.33.2"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
@@ -88275,7 +88205,7 @@ in
       sources."eventemitter3-4.0.7"
       sources."express-4.17.1"
       sources."express-normalize-query-params-middleware-0.5.1"
-      sources."express-openapi-7.2.0"
+      sources."express-openapi-7.2.3"
       sources."external-editor-2.2.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
@@ -88335,20 +88265,20 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.155.3"
+      sources."office-ui-fabric-react-7.156.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."openapi-default-setter-7.0.1"
-      sources."openapi-framework-7.2.0"
-      sources."openapi-jsonschema-parameters-7.0.2"
-      sources."openapi-request-coercer-7.1.0"
-      sources."openapi-request-validator-7.2.0"
-      sources."openapi-response-validator-7.0.1"
-      sources."openapi-schema-validator-7.0.1"
-      sources."openapi-security-handler-7.0.1"
-      sources."openapi-types-7.0.1"
+      sources."openapi-default-setter-7.2.3"
+      sources."openapi-framework-7.2.3"
+      sources."openapi-jsonschema-parameters-7.2.3"
+      sources."openapi-request-coercer-7.2.3"
+      sources."openapi-request-validator-7.2.3"
+      sources."openapi-response-validator-7.2.3"
+      sources."openapi-schema-validator-7.2.3"
+      sources."openapi-security-handler-7.2.3"
+      sources."openapi-types-7.2.3"
       (sources."opencollective-1.0.3" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -88426,8 +88356,8 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
-      sources."swagger-ui-dist-3.38.0"
-      sources."tail-2.1.1"
+      sources."swagger-ui-dist-3.40.0"
+      sources."tail-2.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
@@ -88436,7 +88366,7 @@ in
       sources."tslib-1.14.1"
       sources."type-is-1.6.18"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
@@ -88448,7 +88378,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Japanese DTV Tuner Server Service.";
-      homepage = https://github.com/Chinachu/Mirakurun;
+      homepage = "https://github.com/Chinachu/Mirakurun";
       license = "Apache-2.0";
     };
     production = true;
@@ -88471,7 +88401,7 @@ in
       sources."anymatch-3.1.1"
       sources."argparse-1.0.10"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-stdout-1.3.1"
@@ -88581,7 +88511,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "simple, flexible, fun test framework";
-      homepage = https://mochajs.org/;
+      homepage = "https://mochajs.org/";
       license = "MIT";
     };
     production = true;
@@ -88629,14 +88559,14 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.9.4"
+      sources."qs-6.9.6"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
       sources."slash-3.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
       sources."superagent-3.8.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -88707,7 +88637,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Neovim client API and neovim remote plugin provider";
-      homepage = https://github.com/neovim/node-client;
+      homepage = "https://github.com/neovim/node-client";
       license = "MIT";
     };
     production = true;
@@ -88717,10 +88647,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "2.70.0";
+    version = "3.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.70.0.tgz";
-      sha512 = "VET5LUeZP2TX+xBXYQdiKkVyQfeW+HkeL7pRE2fGOi14fLE3BYSjjdmnCHDX83hgYniHIxKJBH/52zkyQ+m+2Q==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.4.1.tgz";
+      sha512 = "g1urfn0WbQpYV0d+UFP3TjLlQxRP5hGv2tB0l/QInXM4CJr1uRyP/XuAOJf104bYamI+6wFcs4haYW+Qg7JVaQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -88828,55 +88758,67 @@ in
       sources."@babel/template-7.12.7"
       sources."@babel/traverse-7.12.12"
       sources."@babel/types-7.12.12"
-      sources."@bugsnag/browser-7.5.4"
-      sources."@bugsnag/core-7.5.4"
+      sources."@bugsnag/browser-7.6.0"
+      sources."@bugsnag/core-7.6.0"
       sources."@bugsnag/cuid-3.0.0"
-      sources."@bugsnag/js-7.5.4"
-      sources."@bugsnag/node-7.5.4"
+      sources."@bugsnag/js-7.6.0"
+      sources."@bugsnag/node-7.6.0"
       sources."@bugsnag/safe-json-stringify-6.0.0"
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-8.0.1" // {
-        dependencies = [
-          sources."@netlify/zip-it-and-ship-it-2.0.0"
-          sources."ansi-styles-4.3.0"
-          sources."chalk-3.0.0"
-          sources."resolve-2.0.0-next.2"
-        ];
-      })
-      sources."@netlify/cache-utils-1.0.6"
-      (sources."@netlify/config-2.4.3" // {
+      (sources."@netlify/build-8.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
-        ];
-      })
-      (sources."@netlify/functions-utils-1.3.4" // {
-        dependencies = [
-          sources."@netlify/zip-it-and-ship-it-2.0.0"
+          sources."execa-3.4.0"
+          sources."locate-path-5.0.0"
           sources."resolve-2.0.0-next.2"
         ];
       })
+      (sources."@netlify/cache-utils-1.0.6" // {
+        dependencies = [
+          sources."locate-path-5.0.0"
+        ];
+      })
+      (sources."@netlify/config-3.0.1" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."chalk-3.0.0"
+          sources."execa-3.4.0"
+        ];
+      })
+      (sources."@netlify/framework-info-2.0.0" // {
+        dependencies = [
+          sources."locate-path-5.0.0"
+        ];
+      })
+      sources."@netlify/functions-utils-1.3.5"
       (sources."@netlify/git-utils-1.0.6" // {
         dependencies = [
           sources."braces-3.0.2"
+          sources."execa-3.4.0"
           sources."fill-range-7.0.1"
           sources."is-number-7.0.0"
           sources."micromatch-4.0.2"
           sources."to-regex-range-5.0.1"
         ];
       })
-      sources."@netlify/open-api-1.0.0"
-      sources."@netlify/plugin-edge-handlers-1.10.0"
+      sources."@netlify/open-api-1.3.0"
+      sources."@netlify/plugin-edge-handlers-1.11.1"
       sources."@netlify/plugins-list-2.2.0"
-      sources."@netlify/run-utils-1.0.5"
-      sources."@netlify/traffic-mesh-agent-0.27.0"
-      sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0"
-      sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0"
-      sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0"
-      (sources."@netlify/zip-it-and-ship-it-1.7.0" // {
+      (sources."@netlify/run-utils-1.0.5" // {
         dependencies = [
+          sources."execa-3.4.0"
+        ];
+      })
+      sources."@netlify/traffic-mesh-agent-0.27.10"
+      sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10"
+      sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10"
+      sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10"
+      (sources."@netlify/zip-it-and-ship-it-2.0.2" // {
+        dependencies = [
+          sources."locate-path-5.0.0"
           sources."resolve-2.0.0-next.2"
         ];
       })
@@ -88900,13 +88842,9 @@ in
           })
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
-          sources."has-flag-4.0.0"
+          sources."has-flag-3.0.0"
           sources."strip-ansi-5.2.0"
-          (sources."supports-color-5.5.0" // {
-            dependencies = [
-              sources."has-flag-3.0.0"
-            ];
-          })
+          sources."supports-color-5.5.0"
         ];
       })
       (sources."@oclif/command-1.8.0" // {
@@ -88928,22 +88866,23 @@ in
           sources."array-union-2.1.0"
           sources."braces-3.0.2"
           sources."dir-glob-3.0.1"
-          sources."fast-glob-3.2.4"
+          sources."fast-glob-3.2.5"
           sources."fill-range-7.0.1"
           sources."glob-parent-5.1.1"
-          sources."globby-11.0.1"
+          sources."globby-11.0.2"
           sources."ignore-5.1.8"
           sources."is-number-7.0.0"
           sources."micromatch-4.0.2"
           sources."slash-3.0.0"
           sources."to-regex-range-5.0.1"
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."@oclif/errors-1.3.4" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."clean-stack-3.0.1"
+          sources."escape-string-regexp-4.0.0"
           sources."wrap-ansi-7.0.0"
         ];
       })
@@ -88980,6 +88919,7 @@ in
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
           sources."fs-extra-7.0.1"
+          sources."has-flag-3.0.0"
           sources."indent-string-3.2.0"
           sources."is-wsl-1.1.0"
           sources."semver-5.7.1"
@@ -88991,16 +88931,10 @@ in
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
-          sources."fs-extra-9.0.1"
-          (sources."jsonfile-6.1.0" // {
-            dependencies = [
-              sources."universalify-2.0.0"
-            ];
-          })
-          sources."npm-run-path-4.0.1"
-          sources."path-key-3.1.1"
-          sources."tslib-2.0.3"
-          sources."universalify-1.0.0"
+          sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."tslib-2.1.0"
+          sources."universalify-2.0.0"
         ];
       })
       sources."@oclif/screen-1.0.4"
@@ -89011,7 +88945,7 @@ in
           sources."universal-user-agent-6.0.0"
         ];
       })
-      sources."@octokit/openapi-types-2.0.1"
+      sources."@octokit/openapi-types-3.1.1"
       (sources."@octokit/plugin-paginate-rest-1.1.2" // {
         dependencies = [
           sources."@octokit/types-2.16.2"
@@ -89036,19 +88970,23 @@ in
         ];
       })
       sources."@octokit/rest-16.43.2"
-      sources."@octokit/types-6.1.2"
+      sources."@octokit/types-6.4.2"
       sources."@rollup/plugin-babel-5.2.2"
-      (sources."@rollup/plugin-commonjs-15.1.0" // {
+      (sources."@rollup/plugin-commonjs-17.0.0" // {
         dependencies = [
           sources."estree-walker-2.0.2"
         ];
       })
       sources."@rollup/plugin-inject-4.0.2"
       sources."@rollup/plugin-json-4.1.0"
-      sources."@rollup/plugin-node-resolve-9.0.0"
+      sources."@rollup/plugin-node-resolve-11.1.0"
       sources."@rollup/pluginutils-3.1.0"
       sources."@sindresorhus/is-0.14.0"
-      sources."@sindresorhus/slugify-1.1.0"
+      (sources."@sindresorhus/slugify-1.1.0" // {
+        dependencies = [
+          sources."escape-string-regexp-4.0.0"
+        ];
+      })
       (sources."@sindresorhus/transliterate-0.1.1" // {
         dependencies = [
           sources."escape-string-regexp-2.0.0"
@@ -89061,14 +88999,14 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/got-8.3.5"
       sources."@types/hast-2.3.1"
-      sources."@types/http-proxy-1.17.4"
+      sources."@types/http-proxy-1.17.5"
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.14.20"
-      sources."@types/node-fetch-2.5.7"
+      sources."@types/node-14.14.22"
+      sources."@types/node-fetch-2.5.8"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
       sources."@types/resolve-1.17.1"
@@ -89078,11 +89016,6 @@ in
       sources."@types/yargs-parser-20.2.0"
       sources."@typescript-eslint/typescript-estree-2.34.0"
       sources."@ungap/from-entries-0.2.1"
-      (sources."abstract-leveldown-0.12.4" // {
-        dependencies = [
-          sources."xtend-3.0.0"
-        ];
-      })
       sources."accepts-1.3.7"
       sources."agent-base-6.0.2"
       sources."aggregate-error-3.1.0"
@@ -89122,11 +89055,6 @@ in
       sources."array-unique-0.3.2"
       sources."arrify-2.0.1"
       sources."ascii-table-0.0.9"
-      (sources."asn1.js-5.4.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
       sources."assign-symbols-1.0.0"
       sources."ast-module-types-2.7.1"
       sources."async-3.2.0"
@@ -89134,7 +89062,7 @@ in
       sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.821.0" // {
+      (sources."aws-sdk-2.830.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -89152,9 +89080,8 @@ in
       })
       sources."base64-js-1.5.1"
       sources."before-after-hook-2.1.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bl-4.0.3"
-      sources."bn.js-5.1.3"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -89173,14 +89100,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."brorand-1.1.0"
-      sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.1"
-      sources."browserify-des-1.0.2"
-      sources."browserify-fs-1.0.0"
-      sources."browserify-rsa-4.1.0"
-      sources."browserify-sign-4.2.1"
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       sources."btoa-lite-1.0.0"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
@@ -89189,7 +89109,6 @@ in
       sources."buffer-es6-4.9.3"
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
-      sources."buffer-xor-1.0.3"
       sources."builtin-modules-3.2.0"
       sources."builtins-1.0.3"
       sources."byline-5.0.0"
@@ -89201,10 +89120,10 @@ in
         ];
       })
       sources."cachedir-2.3.0"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       sources."cardinal-2.1.1"
       sources."caw-2.0.1"
       sources."ccount-1.1.0"
@@ -89213,24 +89132,24 @@ in
           sources."ansi-styles-3.2.1"
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
+          sources."has-flag-3.0.0"
           sources."supports-color-5.5.0"
         ];
       })
       sources."character-entities-html4-1.1.4"
       sources."character-entities-legacy-1.1.4"
       sources."chardet-0.7.0"
-      (sources."chokidar-3.4.3" // {
+      (sources."chokidar-3.5.1" // {
         dependencies = [
           sources."braces-3.0.2"
           sources."fill-range-7.0.1"
+          sources."fsevents-2.3.1"
           sources."glob-parent-5.1.1"
           sources."is-number-7.0.0"
           sources."to-regex-range-5.0.1"
         ];
       })
       sources."ci-info-2.0.0"
-      sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -89261,17 +89180,17 @@ in
           sources."argparse-1.0.10"
           sources."chalk-4.1.0"
           sources."clean-stack-3.0.1"
+          sources."escape-string-regexp-4.0.0"
           sources."extract-stack-2.0.0"
-          sources."has-flag-4.0.0"
           sources."js-yaml-3.14.1"
           sources."supports-hyperlinks-2.1.0"
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
           sources."type-fest-0.11.0"
         ];
       })
       sources."cli-width-2.2.1"
       sources."cliui-6.0.0"
-      sources."clone-0.1.19"
+      sources."clone-1.0.4"
       sources."clone-response-1.0.2"
       sources."collection-visit-1.0.0"
       (sources."color-3.0.0" // {
@@ -89299,12 +89218,6 @@ in
         ];
       })
       sources."concat-map-0.0.1"
-      (sources."concat-stream-1.6.2" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-        ];
-      })
       (sources."concordance-4.0.0" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -89334,7 +89247,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      (sources."core-js-compat-3.8.2" // {
+      (sources."core-js-compat-3.8.3" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -89348,20 +89261,7 @@ in
       })
       sources."crc-3.8.0"
       sources."crc32-stream-3.0.1"
-      (sources."create-ecdh-4.0.4" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
-      sources."create-hash-1.2.0"
-      sources."create-hmac-1.1.7"
-      (sources."cross-spawn-6.0.5" // {
-        dependencies = [
-          sources."semver-5.7.1"
-          sources."which-1.3.1"
-        ];
-      })
-      sources."crypto-browserify-3.12.0"
+      sources."cross-spawn-7.0.3"
       sources."crypto-random-string-2.0.0"
       sources."cyclist-1.0.1"
       sources."date-time-2.1.0"
@@ -89387,6 +89287,7 @@ in
         dependencies = [
           sources."bl-1.2.3"
           sources."file-type-5.2.0"
+          sources."is-stream-1.1.0"
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."tar-stream-1.6.2"
@@ -89395,11 +89296,13 @@ in
       (sources."decompress-tarbz2-4.1.1" // {
         dependencies = [
           sources."file-type-6.2.0"
+          sources."is-stream-1.1.0"
         ];
       })
       (sources."decompress-targz-4.1.1" // {
         dependencies = [
           sources."file-type-5.2.0"
+          sources."is-stream-1.1.0"
         ];
       })
       (sources."decompress-unzip-4.0.1" // {
@@ -89412,13 +89315,8 @@ in
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepmerge-4.2.2"
-      (sources."defaults-1.0.3" // {
-        dependencies = [
-          sources."clone-1.0.4"
-        ];
-      })
+      sources."defaults-1.0.3"
       sources."defer-to-connect-1.1.3"
-      sources."deferred-leveldown-0.2.0"
       sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
       (sources."del-5.1.0" // {
@@ -89429,7 +89327,6 @@ in
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."deprecation-2.3.1"
-      sources."des.js-1.0.1"
       sources."destroy-1.0.4"
       sources."detective-amd-3.0.1"
       sources."detective-cjs-3.1.1"
@@ -89440,11 +89337,6 @@ in
       sources."detective-scss-2.0.1"
       sources."detective-stylus-1.0.0"
       sources."detective-typescript-5.8.0"
-      (sources."diffie-hellman-5.0.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
       (sources."dir-glob-2.2.2" // {
         dependencies = [
           sources."path-type-3.0.0"
@@ -89467,6 +89359,7 @@ in
           sources."normalize-url-2.0.1"
           sources."p-cancelable-0.4.1"
           sources."p-event-2.3.1"
+          sources."p-finally-1.0.0"
           sources."p-timeout-2.0.1"
           sources."pify-3.0.0"
           sources."sort-keys-2.0.0"
@@ -89474,25 +89367,20 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       sources."elf-cam-0.1.1"
-      (sources."elliptic-6.5.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
       sources."emoji-regex-8.0.0"
       sources."enabled-2.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
+      sources."env-paths-2.2.0"
       sources."envinfo-7.7.3"
-      sources."errno-0.1.8"
       sources."error-ex-1.3.2"
       sources."error-stack-parser-2.0.6"
       sources."escalade-3.1.1"
       sources."escape-goat-2.1.1"
       sources."escape-html-1.0.3"
-      sources."escape-string-regexp-4.0.0"
+      sources."escape-string-regexp-1.0.5"
       (sources."escodegen-1.14.3" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -89506,16 +89394,10 @@ in
       sources."etag-1.8.1"
       sources."eventemitter3-4.0.7"
       sources."events-1.1.1"
-      sources."evp_bytestokey-1.0.3"
-      (sources."execa-3.4.0" // {
+      (sources."execa-5.0.0" // {
         dependencies = [
-          sources."cross-spawn-7.0.3"
-          sources."is-stream-2.0.0"
-          sources."npm-run-path-4.0.1"
-          sources."p-finally-2.0.1"
-          sources."path-key-3.1.1"
-          sources."shebang-command-2.0.0"
-          sources."shebang-regex-3.0.0"
+          sources."get-stream-6.0.0"
+          sources."human-signals-2.1.0"
         ];
       })
       (sources."expand-brackets-2.1.4" // {
@@ -89574,11 +89456,7 @@ in
       sources."fastq-1.10.0"
       sources."fd-slicer-1.1.0"
       sources."fecha-4.2.0"
-      (sources."figures-3.2.0" // {
-        dependencies = [
-          sources."escape-string-regexp-1.0.5"
-        ];
-      })
+      sources."figures-3.2.0"
       sources."file-size-0.0.5"
       sources."file-type-8.1.0"
       sources."filename-reserved-regex-2.0.0"
@@ -89594,14 +89472,17 @@ in
           sources."debug-2.6.9"
         ];
       })
-      sources."find-up-4.1.0"
+      (sources."find-up-4.1.0" // {
+        dependencies = [
+          sources."locate-path-5.0.0"
+        ];
+      })
       sources."flatten-1.0.3"
       sources."flush-write-stream-2.0.0"
       sources."fn.name-1.1.0"
       sources."folder-walker-3.2.0"
       sources."follow-redirects-1.13.1"
       sources."for-in-1.0.2"
-      sources."foreach-2.0.5"
       sources."form-data-3.0.0"
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
@@ -89619,13 +89500,6 @@ in
       sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
       sources."fuzzy-0.1.3"
-      (sources."fwd-stream-1.0.4" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.0.34"
-          sources."string_decoder-0.10.31"
-        ];
-      })
       sources."gensync-1.0.0-beta.2"
       sources."get-amd-module-type-3.0.0"
       sources."get-caller-file-2.0.5"
@@ -89661,7 +89535,7 @@ in
           sources."array-union-2.1.0"
           sources."braces-3.0.2"
           sources."dir-glob-3.0.1"
-          sources."fast-glob-3.2.4"
+          sources."fast-glob-3.2.5"
           sources."fill-range-7.0.1"
           sources."glob-parent-5.1.1"
           sources."ignore-5.1.8"
@@ -89685,7 +89559,7 @@ in
           sources."ansi-regex-0.2.1"
         ];
       })
-      sources."has-flag-3.0.0"
+      sources."has-flag-4.0.0"
       (sources."has-glob-1.0.0" // {
         dependencies = [
           sources."is-glob-3.1.0"
@@ -89701,26 +89575,18 @@ in
         ];
       })
       sources."has-yarn-2.1.0"
-      sources."hash-base-3.1.0"
-      sources."hash.js-1.1.7"
-      (sources."hasha-5.2.2" // {
-        dependencies = [
-          sources."is-stream-2.0.0"
-        ];
-      })
+      sources."hasha-5.2.2"
       sources."hast-util-from-parse5-6.0.1"
       sources."hast-util-is-element-1.1.0"
       sources."hast-util-parse-selector-2.2.5"
       sources."hast-util-to-html-7.1.2"
       sources."hast-util-whitespace-1.0.4"
       sources."hastscript-6.0.0"
-      sources."hmac-drbg-1.0.1"
       sources."hosted-git-info-2.8.8"
       sources."html-void-elements-1.0.5"
       sources."http-cache-semantics-4.1.0"
       (sources."http-call-5.3.0" // {
         dependencies = [
-          sources."is-stream-2.0.0"
           sources."parse-json-4.0.0"
         ];
       })
@@ -89743,21 +89609,18 @@ in
       sources."human-signals-1.1.1"
       sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."idb-wrapper-1.7.2"
       sources."ieee754-1.2.1"
       sources."ignore-4.0.6"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
       sources."indexes-of-1.0.1"
-      sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.8"
       (sources."inquirer-6.5.2" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
-          sources."escape-string-regexp-1.0.5"
           sources."figures-2.0.0"
           sources."is-fullwidth-code-point-2.0.0"
           (sources."string-width-2.1.1" // {
@@ -89782,7 +89645,6 @@ in
       })
       sources."into-stream-3.1.0"
       sources."ipaddr.js-1.9.1"
-      sources."is-0.2.7"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
@@ -89807,29 +89669,24 @@ in
         ];
       })
       sources."is-obj-2.0.0"
-      sources."is-object-0.1.2"
+      sources."is-object-1.0.2"
       sources."is-path-cwd-2.2.0"
       sources."is-path-inside-3.0.2"
       sources."is-plain-obj-2.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-reference-1.2.1"
       sources."is-retry-allowed-1.2.0"
-      sources."is-stream-1.1.0"
+      sources."is-stream-2.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
       sources."is-windows-1.0.2"
       sources."is-wsl-2.2.0"
       sources."is-yarn-global-0.3.0"
       sources."isarray-1.0.0"
-      sources."isbuffer-0.0.0"
       sources."iserror-0.0.2"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
-      (sources."isurl-1.0.0" // {
-        dependencies = [
-          sources."is-object-1.0.2"
-        ];
-      })
+      sources."isurl-1.0.0"
       sources."jest-get-type-24.9.0"
       sources."jest-validate-24.9.0"
       sources."jest-worker-26.6.2"
@@ -89845,7 +89702,11 @@ in
       sources."jsonfile-4.0.0"
       sources."junk-3.1.0"
       sources."jwt-decode-3.1.2"
-      sources."keep-func-props-3.0.1"
+      (sources."keep-func-props-3.0.1" // {
+        dependencies = [
+          sources."mimic-fn-3.1.0"
+        ];
+      })
       sources."keyv-3.1.0"
       sources."kind-of-6.0.3"
       sources."kuler-2.0.0"
@@ -89861,48 +89722,6 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      (sources."level-blobs-0.1.7" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      (sources."level-filesystem-1.2.0" // {
-        dependencies = [
-          sources."xtend-2.2.0"
-        ];
-      })
-      sources."level-fix-range-2.0.0"
-      sources."level-hooks-4.5.0"
-      (sources."level-js-2.2.4" // {
-        dependencies = [
-          sources."object-keys-0.4.0"
-          sources."xtend-2.1.2"
-        ];
-      })
-      (sources."level-peek-1.0.6" // {
-        dependencies = [
-          sources."level-fix-range-1.0.2"
-        ];
-      })
-      (sources."level-sublevel-5.2.3" // {
-        dependencies = [
-          sources."object-keys-0.2.0"
-          sources."xtend-2.0.6"
-        ];
-      })
-      (sources."levelup-0.18.6" // {
-        dependencies = [
-          sources."bl-0.8.2"
-          sources."isarray-0.0.1"
-          sources."prr-0.0.0"
-          sources."readable-stream-1.0.34"
-          sources."semver-2.3.2"
-          sources."string_decoder-0.10.31"
-          sources."xtend-3.0.0"
-        ];
-      })
       sources."leven-3.1.0"
       sources."levn-0.3.0"
       sources."lines-and-columns-1.1.6"
@@ -89912,7 +89731,12 @@ in
           sources."type-fest-0.3.1"
         ];
       })
-      sources."locate-path-5.0.0"
+      (sources."locate-path-6.0.0" // {
+        dependencies = [
+          sources."p-limit-3.1.0"
+          sources."p-locate-5.0.0"
+        ];
+      })
       sources."lodash-4.17.20"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.camelcase-4.3.0"
@@ -89947,7 +89771,6 @@ in
       })
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-6.0.0"
-      sources."ltgt-2.2.1"
       sources."macos-release-2.4.1"
       sources."magic-string-0.25.7"
       (sources."make-dir-3.1.0" // {
@@ -89966,7 +89789,6 @@ in
       })
       sources."md5-hex-2.0.0"
       sources."md5-o-matic-0.1.1"
-      sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
       sources."memoize-one-5.1.1"
       sources."merge-descriptors-1.0.1"
@@ -89976,18 +89798,11 @@ in
       sources."micro-api-client-3.3.0"
       sources."micro-memoize-2.1.2"
       sources."micromatch-3.1.10"
-      (sources."miller-rabin-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
       sources."mime-1.6.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
-      sources."mimic-fn-3.1.0"
+      sources."mimic-fn-2.1.0"
       sources."mimic-response-1.0.1"
-      sources."minimalistic-assert-1.0.1"
-      sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
@@ -90021,30 +89836,17 @@ in
       sources."natural-orderby-2.0.3"
       sources."negotiator-0.6.2"
       sources."nested-error-stacks-2.1.0"
-      (sources."netlify-6.0.9" // {
+      (sources."netlify-6.0.12" // {
         dependencies = [
-          sources."@netlify/zip-it-and-ship-it-2.0.0"
-          sources."qs-6.9.4"
-          sources."resolve-2.0.0-next.2"
+          sources."qs-6.9.6"
         ];
       })
       sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16"
-      (sources."netlify-redirect-parser-2.5.0" // {
-        dependencies = [
-          sources."@netlify/config-0.11.11"
-          sources."@netlify/open-api-0.18.1"
-          sources."ansi-styles-4.3.0"
-          sources."argparse-1.0.10"
-          sources."chalk-3.0.0"
-          sources."js-yaml-3.14.1"
-          sources."netlify-4.9.0"
-          sources."qs-6.9.4"
-        ];
-      })
+      sources."netlify-redirect-parser-3.0.1"
       sources."netlify-redirector-0.2.1"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.1"
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       sources."node-source-walk-4.2.0"
       sources."noop2-2.0.0"
       (sources."normalize-package-data-2.5.0" // {
@@ -90059,7 +89861,7 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."npm-run-path-2.0.2"
+      sources."npm-run-path-4.0.1"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -90079,19 +89881,14 @@ in
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
-      sources."octal-1.0.0"
       sources."octokit-pagination-methods-1.1.0"
       sources."omit.js-2.0.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
-      (sources."onetime-5.1.2" // {
-        dependencies = [
-          sources."mimic-fn-2.1.0"
-        ];
-      })
-      sources."open-7.3.0"
+      sources."onetime-5.1.2"
+      sources."open-7.3.1"
       (sources."opn-5.5.0" // {
         dependencies = [
           sources."is-wsl-1.1.0"
@@ -90121,13 +89918,17 @@ in
           sources."p-map-2.1.0"
         ];
       })
-      sources."p-finally-1.0.0"
+      sources."p-finally-2.0.1"
       sources."p-is-promise-1.1.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-map-3.0.0"
       sources."p-reduce-2.1.0"
-      sources."p-timeout-3.2.0"
+      (sources."p-timeout-3.2.0" // {
+        dependencies = [
+          sources."p-finally-1.0.0"
+        ];
+      })
       sources."p-try-2.2.0"
       sources."p-wait-for-3.2.0"
       (sources."package-json-6.5.0" // {
@@ -90141,24 +89942,31 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."parse-asn1-5.1.6"
       sources."parse-github-repo-url-1.4.1"
       sources."parse-github-url-1.0.2"
       sources."parse-gitignore-1.0.1"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."parse-ms-2.1.0"
       sources."parse5-6.0.1"
       sources."parseurl-1.3.3"
       sources."pascalcase-0.1.1"
-      sources."password-prompt-1.1.2"
+      (sources."password-prompt-1.1.2" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."path-key-2.0.1"
+          sources."semver-5.7.1"
+          sources."shebang-command-1.2.0"
+          sources."shebang-regex-1.0.0"
+          sources."which-1.3.1"
+        ];
+      })
       sources."path-dirname-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
+      sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
       sources."path-to-regexp-0.1.7"
       sources."path-type-4.0.0"
-      sources."pbkdf2-3.1.1"
       sources."pend-1.2.0"
       sources."picomatch-2.2.2"
       sources."pify-4.0.1"
@@ -90168,6 +89976,7 @@ in
       sources."posix-character-classes-0.1.1"
       (sources."postcss-7.0.35" // {
         dependencies = [
+          sources."has-flag-3.0.0"
           sources."source-map-0.6.1"
           sources."supports-color-6.1.0"
         ];
@@ -90191,12 +90000,6 @@ in
       sources."property-information-5.6.0"
       sources."proto-list-1.2.4"
       sources."proxy-addr-2.0.6"
-      sources."prr-1.0.1"
-      (sources."public-encrypt-4.0.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
       sources."pump-3.0.0"
       sources."punycode-1.3.2"
       sources."pupa-2.1.1"
@@ -90206,7 +90009,6 @@ in
       sources."random-bytes-1.0.0"
       sources."random-item-3.1.0"
       sources."randombytes-2.1.0"
-      sources."randomfill-1.0.4"
       sources."range-parser-1.2.1"
       (sources."raw-body-2.4.1" // {
         dependencies = [
@@ -90233,7 +90035,7 @@ in
       sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.4" // {
+      (sources."regjsparser-0.6.6" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -90259,10 +90061,19 @@ in
       sources."ret-0.1.15"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."ripemd160-2.0.2"
-      sources."rollup-2.36.0"
-      sources."rollup-plugin-node-builtins-2.1.2"
+      sources."rollup-2.37.1"
+      (sources."rollup-plugin-inject-3.0.2" // {
+        dependencies = [
+          sources."estree-walker-0.6.1"
+        ];
+      })
+      sources."rollup-plugin-node-polyfills-0.2.1"
       sources."rollup-plugin-terser-7.0.2"
+      (sources."rollup-pluginutils-2.8.2" // {
+        dependencies = [
+          sources."estree-walker-0.6.1"
+        ];
+      })
       sources."run-async-2.4.1"
       sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
@@ -90298,9 +90109,8 @@ in
         ];
       })
       sources."setprototypeof-1.1.1"
-      sources."sha.js-2.4.11"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
+      sources."shebang-command-2.0.0"
+      sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
       (sources."simple-swizzle-0.2.2" // {
         dependencies = [
@@ -90385,7 +90195,6 @@ in
           sources."ansi-regex-0.2.1"
           sources."ansi-styles-1.1.0"
           sources."chalk-0.5.1"
-          sources."escape-string-regexp-1.0.5"
           sources."strip-ansi-0.3.0"
           sources."supports-color-0.2.0"
         ];
@@ -90393,7 +90202,6 @@ in
       sources."statsd-client-0.4.5"
       sources."statuses-1.5.0"
       sources."strict-uri-encode-1.1.0"
-      sources."string-range-1.2.2"
       sources."string-width-4.2.0"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
@@ -90412,16 +90220,8 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."strip-outer-1.0.1" // {
-        dependencies = [
-          sources."escape-string-regexp-1.0.5"
-        ];
-      })
-      (sources."supports-color-7.2.0" // {
-        dependencies = [
-          sources."has-flag-4.0.0"
-        ];
-      })
+      sources."strip-outer-1.0.1"
+      sources."supports-color-7.2.0"
       (sources."supports-hyperlinks-1.0.1" // {
         dependencies = [
           sources."has-flag-2.0.0"
@@ -90475,21 +90275,16 @@ in
       sources."toml-3.0.0"
       sources."tomlify-j0.4-3.0.0"
       sources."treeify-1.1.0"
-      (sources."trim-repeated-1.0.0" // {
-        dependencies = [
-          sources."escape-string-regexp-1.0.5"
-        ];
-      })
+      sources."trim-repeated-1.0.0"
       sources."triple-beam-1.3.0"
       sources."trough-1.0.5"
       sources."tslib-1.14.1"
-      sources."tsutils-3.18.0"
+      sources."tsutils-3.19.1"
       sources."tunnel-agent-0.6.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."type-is-1.6.18"
-      sources."typedarray-0.0.6"
-      sources."typedarray-to-buffer-1.0.4"
+      sources."typedarray-to-buffer-3.1.5"
       sources."typescript-3.9.7"
       sources."uid-safe-2.1.5"
       sources."unbzip2-stream-1.4.3"
@@ -90564,15 +90359,20 @@ in
       sources."widest-line-3.1.0"
       (sources."windows-release-3.3.3" // {
         dependencies = [
+          sources."cross-spawn-6.0.5"
           sources."execa-1.0.0"
           sources."get-stream-4.1.0"
+          sources."is-stream-1.1.0"
+          sources."npm-run-path-2.0.2"
+          sources."p-finally-1.0.0"
+          sources."path-key-2.0.1"
+          sources."semver-5.7.1"
+          sources."shebang-command-1.2.0"
+          sources."shebang-regex-1.0.0"
+          sources."which-1.3.1"
         ];
       })
-      (sources."winston-3.3.3" // {
-        dependencies = [
-          sources."is-stream-2.0.0"
-        ];
-      })
+      sources."winston-3.3.3"
       (sources."winston-transport-4.4.0" // {
         dependencies = [
           sources."readable-stream-2.3.7"
@@ -90586,11 +90386,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      (sources."write-file-atomic-3.0.3" // {
-        dependencies = [
-          sources."typedarray-to-buffer-3.1.5"
-        ];
-      })
+      sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
@@ -90601,12 +90397,13 @@ in
       sources."yargs-parser-18.1.3"
       sources."yarn-1.22.10"
       sources."yauzl-2.10.0"
+      sources."yocto-queue-0.1.0"
       sources."zip-stream-3.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Netlify command line tool";
-      homepage = https://github.com/netlify/cli;
+      homepage = "https://github.com/netlify/cli";
       license = "MIT";
     };
     production = true;
@@ -90728,11 +90525,11 @@ in
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
-      sources."tar-6.0.5"
+      sources."tar-6.1.0"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -90762,7 +90559,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Build tool and bindings loader for node-gyp that supports prebuilds";
-      homepage = https://github.com/prebuild/node-gyp-build;
+      homepage = "https://github.com/prebuild/node-gyp-build";
       license = "MIT";
     };
     production = true;
@@ -91061,7 +90858,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Web Inspector based nodeJS debugger";
-      homepage = http://github.com/node-inspector/node-inspector;
+      homepage = "http://github.com/node-inspector/node-inspector";
     };
     production = true;
     bypassCache = true;
@@ -91109,7 +90906,7 @@ in
       sources."minizlib-1.3.3"
       sources."mkdirp-0.5.5"
       sources."ms-2.1.3"
-      sources."needle-2.5.2"
+      sources."needle-2.6.0"
       sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
@@ -91155,16 +90952,16 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "1.2.6";
+    version = "1.2.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.6.tgz";
-      sha512 = "Sy6ZNRFxN4KwT/eGFBt9L6aMXK0XGRwBNlhoFMPObSujLJVMUKHxirHAMst5CvUYigijFXM6ILRC6p/XqYHZRg==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.7.tgz";
+      sha512 = "4ZE+Kh60pXQD/o7prg5Rdl6mlubP1wDZnKdV6TumKBdiqmDwkav5T125ZHYcs/zWMoXe/AUqHS4JDkIsg0OEIA==";
     };
     dependencies = [
       sources."@babel/runtime-7.12.5"
-      sources."@node-red/editor-api-1.2.6"
-      sources."@node-red/editor-client-1.2.6"
-      (sources."@node-red/nodes-1.2.6" // {
+      sources."@node-red/editor-api-1.2.7"
+      sources."@node-red/editor-client-1.2.7"
+      (sources."@node-red/nodes-1.2.7" // {
         dependencies = [
           sources."cookie-0.4.1"
           sources."http-errors-1.7.3"
@@ -91178,9 +90975,9 @@ in
           })
         ];
       })
-      sources."@node-red/registry-1.2.6"
-      sources."@node-red/runtime-1.2.6"
-      sources."@node-red/util-1.2.6"
+      sources."@node-red/registry-1.2.7"
+      sources."@node-red/runtime-1.2.7"
+      sources."@node-red/util-1.2.7"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       (sources."agent-base-6.0.2" // {
@@ -91208,11 +91005,11 @@ in
       sources."assert-plus-1.0.0"
       sources."async-0.1.22"
       sources."async-limiter-1.0.1"
-      sources."async-mutex-0.2.4"
+      sources."async-mutex-0.2.6"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
-      sources."axios-0.19.2"
+      sources."axios-0.21.1"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.5.1"
       (sources."basic-auth-2.0.1" // {
@@ -91291,7 +91088,7 @@ in
       sources."deep-extend-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."denque-1.4.1"
+      sources."denque-1.5.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."detect-libc-1.0.3"
@@ -91333,11 +91130,7 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."finalhandler-1.1.2"
-      (sources."follow-redirects-1.5.10" // {
-        dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
+      sources."follow-redirects-1.13.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
@@ -91439,7 +91232,7 @@ in
       })
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
-      sources."mime-2.4.6"
+      sources."mime-2.4.7"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
@@ -91475,10 +91268,10 @@ in
       })
       sources."ms-2.0.0"
       sources."multer-1.4.2"
-      sources."mustache-4.0.1"
+      sources."mustache-4.1.0"
       sources."mute-stream-0.0.8"
       sources."nan-2.14.0"
-      (sources."needle-2.5.2" // {
+      (sources."needle-2.6.0" // {
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
@@ -91497,7 +91290,7 @@ in
           sources."yallist-3.1.1"
         ];
       })
-      (sources."node-red-admin-0.2.6" // {
+      (sources."node-red-admin-0.2.7" // {
         dependencies = [
           sources."bcrypt-3.0.8"
         ];
@@ -91596,7 +91389,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."tail-2.1.1"
+      sources."tail-2.2.0"
       (sources."tar-6.0.5" // {
         dependencies = [
           sources."mkdirp-1.0.4"
@@ -91619,19 +91412,19 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."tslib-2.0.3"
+      sources."tslib-2.1.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.6"
+      sources."uglify-js-3.12.4"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -91656,7 +91449,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Low-code programming for event-driven applications";
-      homepage = http://nodered.org/;
+      homepage = "http://nodered.org";
       license = "Apache-2.0";
     };
     production = true;
@@ -91666,10 +91459,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.8.0";
+    version = "1.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.8.0.tgz";
-      sha512 = "v5QBcH6KxWVVRftbXdpGPIo3s0nPRcTJ56vLLbnmk0f1+32efqpI5t+fYekRys5yJPKFlXDRJCo6o8qnw581gQ==";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.9.0.tgz";
+      sha512 = "CZLF+Pu2g/eYhrIAznhKIg0i3McCXQuwd1meNb+ruiRTrNE2p5oc0RNQUKD3ZAId+JQdHKhFc+19G+wmS8g46w==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -91683,7 +91476,7 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
@@ -91747,6 +91540,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-1.0.1"
       sources."jsprim-1.4.1"
+      sources."lru-cache-6.0.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
@@ -91806,7 +91600,7 @@ in
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.1.3"
+      sources."semver-7.3.4"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.3"
       sources."slasp-0.0.4"
@@ -91824,7 +91618,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      (sources."tar-6.0.5" // {
+      (sources."tar-6.1.0" // {
         dependencies = [
           sources."mkdirp-1.0.4"
         ];
@@ -91835,7 +91629,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
       sources."uid-number-0.0.5"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
@@ -91849,7 +91643,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Generate Nix expressions to build NPM packages";
-      homepage = https://github.com/svanderburg/node2nix;
+      homepage = "https://github.com/svanderburg/node2nix";
       license = "MIT";
     };
     production = true;
@@ -91859,10 +91653,10 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "2.0.6";
+    version = "2.0.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.6.tgz";
-      sha512 = "4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ==";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz";
+      sha512 = "XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -91877,7 +91671,7 @@ in
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."boxen-4.2.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -91894,7 +91688,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."ci-info-2.0.0"
       sources."cli-boxes-2.2.1"
       sources."clone-response-1.0.2"
@@ -91913,7 +91707,7 @@ in
       sources."end-of-stream-1.4.4"
       sources."escape-goat-2.1.1"
       sources."fill-range-7.0.1"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."get-stream-4.1.0"
       sources."glob-parent-5.1.1"
       sources."global-dirs-2.1.0"
@@ -92012,7 +91806,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Simple monitor script for use during development of a node.js app.";
-      homepage = http://nodemon.io/;
+      homepage = "https://nodemon.io";
       license = "MIT";
     };
     production = true;
@@ -92055,7 +91849,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/responselike-1.0.0"
@@ -92149,7 +91943,7 @@ in
       sources."escape-string-regexp-4.0.0"
       sources."execa-5.0.0"
       sources."external-editor-3.1.0"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fastq-1.10.0"
       (sources."figures-3.2.0" // {
         dependencies = [
@@ -92165,7 +91959,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."global-dirs-2.1.0"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       (sources."got-10.7.0" // {
         dependencies = [
           sources."get-stream-5.2.0"
@@ -92331,7 +92125,7 @@ in
           sources."mimic-fn-3.1.0"
         ];
       })
-      (sources."meow-8.1.0" // {
+      (sources."meow-8.1.2" // {
         dependencies = [
           sources."type-fest-0.18.1"
         ];
@@ -92367,7 +92161,7 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."org-regex-1.0.0"
       sources."os-tmpdir-1.0.2"
       (sources."ow-0.21.0" // {
@@ -92419,7 +92213,7 @@ in
         ];
       })
       sources."parent-module-1.0.1"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
@@ -92546,15 +92340,15 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.14.10";
+    version = "6.14.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.14.10.tgz";
-      sha512 = "FT23Qy/JMA+qxEYReMOr1MY7642fKn8Onn+72LASPi872Owvmw0svm+/DXTHOC3yO9CheEO+EslyXEpdBdRtIA==";
+      url = "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz";
+      sha512 = "1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "a package manager for JavaScript";
-      homepage = https://docs.npmjs.com/;
+      homepage = "https://docs.npmjs.com/";
       license = "Artistic-2.0";
     };
     production = true;
@@ -92564,16 +92358,23 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "10.2.5";
+    version = "11.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.5.tgz";
-      sha512 = "R0BN+MqE6T12k0iGivF0WKfn3tuaeQuCai0haVvmsr7GcoPXU+yrlHxl9aFlO2XZ6z4m+pCd107YnbJDcRAf8Q==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.0.2.tgz";
+      sha512 = "Ck+9Yq6B/N50y6lmGN0bLX1/TEseb/0xTWSAbfia1NVDH2uAzcAhwAgJbkOTqQuM+O6KC80liXTk8tC1w2PKOA==";
     };
     dependencies = [
+      sources."@nodelib/fs.scandir-2.1.4"
+      sources."@nodelib/fs.stat-2.0.4"
+      sources."@nodelib/fs.walk-1.2.6"
       sources."@npmcli/ci-detect-1.3.0"
       sources."@npmcli/git-2.0.4"
       sources."@npmcli/installed-package-contents-1.0.5"
-      sources."@npmcli/move-file-1.0.1"
+      (sources."@npmcli/move-file-1.1.0" // {
+        dependencies = [
+          sources."rimraf-2.7.1"
+        ];
+      })
       sources."@npmcli/node-gyp-1.0.1"
       sources."@npmcli/promise-spawn-1.3.2"
       sources."@npmcli/run-script-1.8.1"
@@ -92598,7 +92399,8 @@ in
       sources."ansi-styles-4.3.0"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
-      sources."argparse-1.0.10"
+      sources."argparse-2.0.1"
+      sources."array-union-2.1.0"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
@@ -92613,6 +92415,7 @@ in
         ];
       })
       sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
       sources."builtins-1.0.3"
       sources."cacache-15.0.5"
       (sources."cacheable-request-6.1.0" // {
@@ -92660,6 +92463,7 @@ in
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
       sources."dezalgo-1.0.3"
+      sources."dir-glob-3.0.1"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
@@ -92670,12 +92474,14 @@ in
       sources."err-code-1.1.2"
       sources."escape-goat-2.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."esprima-4.0.1"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
+      sources."fastq-1.10.0"
       sources."figgy-pudding-3.5.2"
+      sources."fill-range-7.0.1"
       sources."find-up-5.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -92694,11 +92500,13 @@ in
       sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
+      sources."glob-parent-5.1.1"
       (sources."global-dirs-2.1.0" // {
         dependencies = [
           sources."ini-1.3.7"
         ];
       })
+      sources."globby-11.0.2"
       sources."got-9.6.0"
       sources."graceful-fs-4.2.4"
       sources."har-schema-2.0.0"
@@ -92713,6 +92521,7 @@ in
       sources."https-proxy-agent-5.0.0"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.6.2"
+      sources."ignore-5.1.8"
       sources."ignore-walk-3.0.3"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -92723,10 +92532,13 @@ in
       sources."ini-1.3.8"
       sources."ip-1.1.5"
       sources."is-ci-2.0.0"
+      sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
+      sources."is-glob-4.0.1"
       sources."is-installed-globally-0.3.2"
       sources."is-lambda-1.0.1"
       sources."is-npm-5.0.0"
+      sources."is-number-7.0.0"
       sources."is-obj-2.0.0"
       sources."is-path-inside-3.0.2"
       sources."is-typedarray-1.0.0"
@@ -92735,7 +92547,7 @@ in
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jju-1.4.0"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-4.0.0"
       sources."jsbn-0.1.1"
       sources."json-buffer-3.0.0"
       sources."json-parse-even-better-errors-2.3.1"
@@ -92768,15 +92580,20 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."make-fetch-happen-8.0.12"
+      sources."make-fetch-happen-8.0.13"
+      sources."map-age-cleaner-0.1.3"
+      sources."mem-8.0.0"
+      sources."merge2-1.4.1"
+      sources."micromatch-4.0.2"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
+      sources."mimic-fn-3.1.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-3.1.3"
       sources."minipass-collect-1.0.2"
-      sources."minipass-fetch-1.3.2"
+      sources."minipass-fetch-1.3.3"
       sources."minipass-flush-1.0.5"
       sources."minipass-json-stream-1.0.1"
       sources."minipass-pipeline-1.2.4"
@@ -92800,6 +92617,7 @@ in
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."p-cancelable-1.1.0"
+      sources."p-defer-1.0.0"
       sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."p-map-4.0.0"
@@ -92809,11 +92627,13 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."pacote-11.1.13"
+      sources."pacote-11.2.3"
       sources."parse-github-url-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
+      sources."path-type-4.0.0"
       sources."performance-now-2.1.0"
+      sources."picomatch-2.2.2"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
@@ -92827,7 +92647,7 @@ in
       sources."pupa-2.1.1"
       sources."qs-6.5.2"
       sources."rc-1.2.8"
-      sources."rc-config-loader-3.0.0"
+      sources."rc-config-loader-4.0.0"
       sources."read-package-json-fast-1.2.1"
       sources."readable-stream-2.3.7"
       sources."readdir-scoped-modules-1.1.0"
@@ -92838,7 +92658,9 @@ in
       sources."require-from-string-2.0.2"
       sources."responselike-1.0.2"
       sources."retry-0.10.1"
+      sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
+      sources."run-parallel-1.1.10"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-7.3.4"
@@ -92851,11 +92673,11 @@ in
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.3"
       sources."sisteransi-1.0.5"
+      sources."slash-3.0.0"
       sources."smart-buffer-4.1.0"
       sources."socks-2.5.1"
       sources."socks-proxy-agent-5.0.0"
       sources."spawn-please-1.0.0"
-      sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."ssri-8.0.0"
       sources."string-width-4.2.0"
@@ -92863,9 +92685,10 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."tar-6.0.5"
+      sources."tar-6.1.0"
       sources."term-size-2.2.1"
       sources."to-readable-stream-1.0.0"
+      sources."to-regex-range-5.0.1"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -92875,7 +92698,7 @@ in
       sources."unique-slug-2.0.2"
       sources."unique-string-2.0.0"
       sources."update-notifier-5.0.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -92900,7 +92723,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Find newer versions of dependencies than what your package.json allows";
-      homepage = https://github.com/raineorshine/npm-check-updates;
+      homepage = "https://github.com/raineorshine/npm-check-updates";
       license = "Apache-2.0";
     };
     production = true;
@@ -93063,7 +92886,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -93074,7 +92897,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Generate nix expressions to build npm packages";
-      homepage = https://github.com/NixOS/npm2nix;
+      homepage = "https://github.com/NixOS/npm2nix";
     };
     production = true;
     bypassCache = true;
@@ -93115,7 +92938,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "OCaml language server";
-      homepage = https://github.com/freebroccolo/ocaml-language-server;
+      homepage = "https://github.com/freebroccolo/ocaml-language-server";
       license = "Apache-2.0";
     };
     production = true;
@@ -93334,7 +93157,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -93345,13 +93168,13 @@ in
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -93378,7 +93201,7 @@ in
       sources."convert-source-map-1.7.0"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.12"
-      (sources."core-js-compat-3.8.2" // {
+      (sources."core-js-compat-3.8.3" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -93486,7 +93309,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -93496,7 +93319,7 @@ in
       sources."entities-1.1.2"
       sources."envinfo-7.7.3"
       sources."error-ex-1.3.2"
-      (sources."es-abstract-1.18.0-next.1" // {
+      (sources."es-abstract-1.18.0-next.2" // {
         dependencies = [
           sources."object-inspect-1.9.0"
         ];
@@ -93741,7 +93564,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
       sources."nth-check-1.0.2"
@@ -93891,7 +93714,7 @@ in
       })
       sources."regexpu-core-4.7.1"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.4" // {
+      (sources."regjsparser-0.6.6" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -94045,7 +93868,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -94136,11 +93959,11 @@ in
         ];
       })
       sources."brace-expansion-1.1.11"
-      sources."bunyan-1.8.14"
+      sources."bunyan-1.8.15"
       sources."bunyan-syslog-udp-0.2.0"
       sources."busboy-0.3.1"
       sources."bytes-3.0.0"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       sources."clarinet-0.11.0"
@@ -94347,10 +94170,10 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       sources."unix-dgram-2.0.4"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -94358,7 +94181,7 @@ in
       sources."verror-1.10.0"
       sources."which-module-2.0.0"
       sources."wikimedia-langconv-0.1.0"
-      sources."wikipeg-2.0.3"
+      sources."wikipeg-2.0.5"
       sources."wordwrap-1.0.0"
       sources."worker-farm-1.7.0"
       sources."wrap-ansi-5.1.0"
@@ -94702,7 +94525,7 @@ in
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."chalk-1.1.3"
@@ -94735,8 +94558,6 @@ in
       sources."dns-txt-2.0.2"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.7"
-      sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."external-editor-2.2.0"
       sources."fifo-0.1.4"
@@ -94786,13 +94607,11 @@ in
       sources."ipaddr.js-2.0.0"
       sources."is-arguments-1.1.0"
       sources."is-arrayish-0.2.1"
-      sources."is-callable-1.2.2"
       sources."is-core-module-2.2.0"
       sources."is-date-object-1.0.2"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-regex-1.1.1"
-      sources."is-symbol-1.0.3"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
       sources."k-bucket-0.6.0"
@@ -94810,7 +94629,7 @@ in
       sources."magnet-uri-5.4.0"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
-      sources."mime-2.4.7"
+      sources."mime-2.5.0"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
@@ -94827,10 +94646,8 @@ in
       sources."number-is-nan-1.0.1"
       sources."numeral-2.0.6"
       sources."object-assign-4.1.1"
-      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-0.0.5"
@@ -94882,7 +94699,7 @@ in
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.7"
       sources."redent-1.0.0"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."repeating-2.0.1"
       sources."resolve-1.19.0"
       sources."restore-cursor-2.0.0"
@@ -94916,8 +94733,6 @@ in
       sources."speedometer-0.1.4"
       sources."stream-buffers-2.2.0"
       sources."string-width-1.0.2"
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
       (sources."string2compact-1.3.0" // {
         dependencies = [
           sources."ipaddr.js-1.9.1"
@@ -94967,7 +94782,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Streaming torrent client for Node.js";
-      homepage = https://github.com/mafintosh/peerflix;
+      homepage = "https://github.com/mafintosh/peerflix";
       license = "MIT";
     };
     production = true;
@@ -95264,7 +95079,7 @@ in
           sources."ws-2.3.1"
         ];
       })
-      (sources."socket.io-2.4.0" // {
+      (sources."socket.io-2.4.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
@@ -95275,7 +95090,7 @@ in
         dependencies = [
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
-          sources."socket.io-parser-3.3.1"
+          sources."socket.io-parser-3.3.2"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
@@ -95313,7 +95128,7 @@ in
       sources."ultron-1.1.1"
       sources."uniq-1.0.1"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."utp-0.0.7"
@@ -95389,10 +95204,9 @@ in
           sources."tslib-1.9.3"
         ];
       })
-      (sources."@pm2/js-api-0.6.1" // {
+      (sources."@pm2/js-api-0.6.7" // {
         dependencies = [
           sources."async-2.6.3"
-          sources."debug-3.2.7"
           sources."eventemitter2-6.4.3"
         ];
       })
@@ -95416,9 +95230,9 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."axios-0.19.2"
+      sources."axios-0.21.1"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."blessed-0.1.81"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -95426,7 +95240,7 @@ in
       sources."bytes-3.1.0"
       sources."chalk-3.0.0"
       sources."charm-0.1.2"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."cli-tableau-2.0.1"
       sources."co-4.6.0"
       sources."color-convert-2.0.1"
@@ -95466,14 +95280,9 @@ in
       sources."fclone-1.0.11"
       sources."file-uri-to-path-1.0.0"
       sources."fill-range-7.0.1"
-      (sources."follow-redirects-1.5.10" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."follow-redirects-1.13.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       (sources."ftp-0.3.10" // {
         dependencies = [
           sources."readable-stream-1.1.14"
@@ -95599,11 +95408,11 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.34.2"
+      sources."systeminformation-4.34.7"
       sources."thunkify-2.1.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
-      sources."tslib-2.0.3"
+      sources."tslib-2.1.0"
       sources."tv4-1.3.0"
       sources."type-check-0.3.2"
       sources."unpipe-1.0.0"
@@ -95624,7 +95433,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Production process manager for Node.JS applications with a built-in load balancer.";
-      homepage = http://pm2.keymetrics.io/;
+      homepage = "http://pm2.keymetrics.io/";
       license = "AGPL-3.0";
     };
     production = true;
@@ -95634,15 +95443,15 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "5.14.3";
+    version = "5.15.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.14.3.tgz";
-      sha512 = "PFjHFWCsHgaNCpOwOAgN6H71PA8td8PnwSE1ArXz//OyfdfIwws1s23XLmokhHcnE3JsBSiIR3NOW8JZ5QcxlQ==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.15.2.tgz";
+      sha512 = "YIy5GMRUPDDkcI/g3zr+kuamoaYTgTntHFU5WAVyBmQoYIo03TA2XJq70ii6lhUm6LbQbU6WtUit1cQrwRqAng==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "Fast, disk space efficient package manager";
-      homepage = https://pnpm.js.org/;
+      homepage = "https://pnpm.js.org";
       license = "MIT";
     };
     production = true;
@@ -95707,11 +95516,11 @@ in
       sources."anymatch-3.1.1"
       sources."array-union-2.1.0"
       sources."at-least-node-1.0.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."braces-3.0.2"
       sources."callsites-3.1.0"
       sources."chalk-4.1.0"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."cliui-7.0.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
@@ -95723,15 +95532,15 @@ in
       sources."error-ex-1.3.2"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fastq-1.10.0"
       sources."fill-range-7.0.1"
-      sources."fs-extra-9.0.1"
-      sources."fsevents-2.1.3"
+      sources."fs-extra-9.1.0"
+      sources."fsevents-2.3.1"
       sources."get-caller-file-2.0.5"
       sources."get-stdin-8.0.0"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       sources."graceful-fs-4.2.4"
       sources."has-flag-4.0.0"
       sources."ignore-5.1.8"
@@ -95750,11 +95559,7 @@ in
       sources."is-number-7.0.0"
       sources."js-tokens-4.0.0"
       sources."json-parse-even-better-errors-2.3.1"
-      (sources."jsonfile-6.1.0" // {
-        dependencies = [
-          sources."universalify-2.0.0"
-        ];
-      })
+      sources."jsonfile-6.1.0"
       sources."lines-and-columns-1.1.6"
       sources."lodash.difference-4.5.0"
       sources."lodash.forown-4.4.0"
@@ -95765,7 +95570,7 @@ in
       sources."micromatch-4.0.2"
       sources."normalize-path-3.0.0"
       sources."parent-module-1.0.1"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."path-type-4.0.0"
       sources."picomatch-2.2.2"
       sources."pify-2.3.0"
@@ -95783,7 +95588,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
       sources."to-regex-range-5.0.1"
-      sources."universalify-1.0.0"
+      sources."universalify-2.0.0"
       sources."wrap-ansi-7.0.0"
       sources."y18n-5.0.5"
       sources."yaml-1.10.0"
@@ -95811,7 +95616,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Prettier is an opinionated code formatter";
-      homepage = https://prettier.io/;
+      homepage = "https://prettier.io";
       license = "MIT";
     };
     production = true;
@@ -96113,7 +95918,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A build system for PureScript projects";
-      homepage = https://github.com/purescript-contrib/pulp;
+      homepage = "https://github.com/purescript-contrib/pulp";
       license = "LGPL-3.0+";
     };
     production = true;
@@ -96143,7 +95948,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Language Server Protocol server for PureScript wrapping purs ide server functionality";
-      homepage = https://github.com/nwolverson/purescript-language-server;
+      homepage = "https://github.com/nwolverson/purescript-language-server";
       license = "MIT";
     };
     production = true;
@@ -96189,10 +95994,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.99";
+    version = "1.1.103";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.99.tgz";
-      sha512 = "DAfK8uVLGF1nuBeFvEXhvApCecuHEpe8ncjnFW/WsBBIQ5JOsjjpwlUDvTutNjkoH9QCTqvg72g6ip9PdWFL/w==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.103.tgz";
+      sha512 = "o4tgOmXf4maWGwuYRmzdDo7LNDtR2VlPBg7DAeh9kOb9GK53/2kGQieysh6viNbY7HFyZJn+mzQmx8yyeXqjjg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -96441,14 +96246,14 @@ in
       sources."available-typed-arrays-1.0.2"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."chalk-1.1.3"
       sources."colors-0.6.2"
       sources."concat-map-0.0.1"
       sources."cycle-1.0.3"
       sources."deep-equal-2.0.5"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -96476,11 +96281,7 @@ in
       sources."is-set-2.0.2"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      (sources."is-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."is-typed-array-1.1.4"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."isarray-2.0.5"
@@ -96499,7 +96300,7 @@ in
       sources."pkginfo-0.4.1"
       sources."prompt-0.2.14"
       sources."read-1.0.7"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."revalidator-0.1.8"
       sources."rimraf-2.7.1"
       sources."semver-5.7.1"
@@ -96512,11 +96313,7 @@ in
       sources."utile-0.2.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      (sources."which-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."which-typed-array-1.1.4"
       (sources."winston-0.8.3" // {
         dependencies = [
           sources."pkginfo-0.3.1"
@@ -96581,7 +96378,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A set of complementary tools to React, including the JSX transformer.";
-      homepage = https://facebook.github.io/react;
+      homepage = "https://facebook.github.io/react";
       license = "BSD-3-Clause";
     };
     production = true;
@@ -96695,7 +96492,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."w3c-hr-time-1.0.2"
@@ -96752,7 +96549,7 @@ in
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.3"
       sources."@redocly/react-dropdown-aria-2.0.11"
-      sources."@types/node-13.13.39"
+      sources."@types/node-13.13.40"
       sources."ajv-5.5.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -96772,7 +96569,7 @@ in
       sources."babel-plugin-syntax-jsx-6.18.0"
       sources."base64-js-1.5.1"
       sources."better-ajv-errors-0.6.7"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bn.js-5.1.3"
       sources."braces-3.0.2"
       sources."brorand-1.1.0"
@@ -96798,7 +96595,7 @@ in
       sources."camelcase-5.3.1"
       sources."camelize-1.0.0"
       sources."chalk-2.4.2"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."cipher-base-1.0.4"
       sources."classnames-2.2.6"
       sources."clipboard-2.0.6"
@@ -96810,7 +96607,7 @@ in
       sources."color-name-1.1.3"
       sources."console-browserify-1.2.0"
       sources."constants-browserify-1.0.0"
-      sources."core-js-3.8.2"
+      sources."core-js-3.8.3"
       sources."core-util-is-1.0.2"
       (sources."create-ecdh-4.0.4" // {
         dependencies = [
@@ -96854,7 +96651,7 @@ in
       sources."find-up-4.1.0"
       sources."foreach-2.0.5"
       sources."format-util-1.0.5"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."get-caller-file-2.0.5"
       sources."glob-parent-5.1.1"
       sources."globals-11.12.0"
@@ -97009,9 +96806,9 @@ in
       sources."to-arraybuffer-1.0.1"
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
-      sources."tslib-2.0.3"
+      sources."tslib-2.1.0"
       sources."tty-browserify-0.0.0"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
@@ -97071,7 +96868,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The HTML Presentation Framework";
-      homepage = https://revealjs.com/;
+      homepage = "https://revealjs.com";
       license = "MIT";
     };
     production = true;
@@ -97081,10 +96878,10 @@ in
   rollup = nodeEnv.buildNodePackage {
     name = "rollup";
     packageName = "rollup";
-    version = "2.36.0";
+    version = "2.37.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz";
-      sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==";
+      url = "https://registry.npmjs.org/rollup/-/rollup-2.37.1.tgz";
+      sha512 = "V3ojEeyGeSdrMSuhP3diBb06P+qV4gKQeanbDv+Qh/BZbhdZ7kHV0xAt8Yjk4GFshq/WjO7R4c7DFM20AwTFVQ==";
     };
     dependencies = [
       sources."fsevents-2.1.3"
@@ -97092,7 +96889,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Next-generation ES module bundler";
-      homepage = https://rollupjs.org/;
+      homepage = "https://rollupjs.org/";
       license = "MIT";
     };
     production = true;
@@ -97112,7 +96909,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      (sources."@eslint/eslintrc-0.2.2" // {
+      (sources."@eslint/eslintrc-0.3.0" // {
         dependencies = [
           sources."ignore-4.0.6"
         ];
@@ -97121,7 +96918,7 @@ in
       sources."@nodelib/fs.stat-2.0.4"
       sources."@nodelib/fs.walk-1.2.6"
       sources."@rollup/plugin-commonjs-17.0.0"
-      sources."@rollup/plugin-node-resolve-11.0.1"
+      sources."@rollup/plugin-node-resolve-11.1.0"
       (sources."@rollup/pluginutils-3.1.0" // {
         dependencies = [
           sources."estree-walker-1.0.1"
@@ -97129,20 +96926,20 @@ in
       })
       sources."@types/estree-0.0.39"
       sources."@types/glob-7.1.3"
-      sources."@types/json-schema-7.0.6"
+      sources."@types/json-schema-7.0.7"
       sources."@types/minimatch-3.0.3"
       sources."@types/mocha-8.2.0"
       sources."@types/node-12.12.70"
-      sources."@types/node-fetch-2.5.7"
+      sources."@types/node-fetch-2.5.8"
       sources."@types/resolve-1.17.1"
       sources."@types/vscode-1.52.0"
-      sources."@typescript-eslint/eslint-plugin-4.12.0"
-      sources."@typescript-eslint/experimental-utils-4.12.0"
-      sources."@typescript-eslint/parser-4.12.0"
-      sources."@typescript-eslint/scope-manager-4.12.0"
-      sources."@typescript-eslint/types-4.12.0"
-      sources."@typescript-eslint/typescript-estree-4.12.0"
-      sources."@typescript-eslint/visitor-keys-4.12.0"
+      sources."@typescript-eslint/eslint-plugin-4.14.0"
+      sources."@typescript-eslint/experimental-utils-4.14.0"
+      sources."@typescript-eslint/parser-4.14.0"
+      sources."@typescript-eslint/scope-manager-4.14.0"
+      sources."@typescript-eslint/types-4.14.0"
+      sources."@typescript-eslint/typescript-estree-4.14.0"
+      sources."@typescript-eslint/visitor-keys-4.14.0"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
@@ -97158,7 +96955,7 @@ in
       sources."asynckit-0.4.0"
       sources."azure-devops-node-api-7.2.0"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."boolbase-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -97224,7 +97021,7 @@ in
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.17.0" // {
+      (sources."eslint-7.18.0" // {
         dependencies = [
           sources."ignore-4.0.6"
         ];
@@ -97256,7 +97053,7 @@ in
       sources."estree-walker-2.0.2"
       sources."esutils-2.0.3"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fastq-1.10.0"
@@ -97266,7 +97063,7 @@ in
       sources."find-up-5.0.0"
       sources."flat-5.0.2"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.0"
+      sources."flatted-3.1.1"
       sources."form-data-3.0.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
@@ -97276,7 +97073,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."globals-12.4.0"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       sources."growl-1.10.5"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -97387,7 +97184,7 @@ in
       sources."resolve-from-4.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."rollup-2.36.0"
+      sources."rollup-2.37.1"
       sources."run-parallel-1.1.10"
       sources."safe-buffer-5.2.1"
       sources."semver-7.3.4"
@@ -97419,8 +97216,8 @@ in
       sources."text-table-0.2.0"
       sources."tmp-0.0.29"
       sources."to-regex-range-5.0.1"
-      sources."tslib-2.0.3"
-      (sources."tsutils-3.18.0" // {
+      sources."tslib-2.1.0"
+      (sources."tsutils-3.19.1" // {
         dependencies = [
           sources."tslib-1.14.1"
         ];
@@ -97433,10 +97230,10 @@ in
       sources."typescript-formatter-7.2.2"
       sources."uc.micro-1.0.6"
       sources."underscore-1.8.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-join-1.1.0"
       sources."v8-compile-cache-2.2.0"
-      (sources."vsce-1.83.0" // {
+      (sources."vsce-1.84.0" // {
         dependencies = [
           sources."chalk-2.4.2"
           sources."commander-6.2.1"
@@ -97626,7 +97423,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uid2-0.0.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-0.4.9"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -97643,18 +97440,18 @@ in
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";
-    version = "1.32.0";
+    version = "1.32.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz";
-      sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng==";
+      url = "https://registry.npmjs.org/sass/-/sass-1.32.5.tgz";
+      sha512 = "kU1yJ5zUAmPxr7f3q0YXTAd1oZjSR1g3tYyv+xu0HZSl5JiNOaE987eiz7wCUvbm4I9fGWGU2TgApTtcP4GMNQ==";
     };
     dependencies = [
       sources."anymatch-3.1.1"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."braces-3.0.2"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."fill-range-7.0.1"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."glob-parent-5.1.1"
       sources."is-binary-path-2.1.0"
       sources."is-extglob-2.1.1"
@@ -97668,7 +97465,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A pure JavaScript implementation of Sass.";
-      homepage = https://github.com/sass/dart-sass;
+      homepage = "https://github.com/sass/dart-sass";
       license = "MIT";
     };
     production = true;
@@ -97787,7 +97584,7 @@ in
       sources."supports-color-5.5.0"
       sources."term-size-1.2.0"
       sources."update-check-1.5.2"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."vary-1.1.2"
       sources."which-1.3.1"
       sources."widest-line-2.0.1"
@@ -97806,10 +97603,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.17.0";
+    version = "2.20.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.17.0.tgz";
-      sha512 = "OVlrvBESW0aQB3G/SrZQ3WFmALhHRU9qUJ/LLoyFlpddAY4hr0APOixWehiHvf4aI7Vuo04lP9zffttjhviOPA==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.20.0.tgz";
+      sha512 = "Uc+L9SBZCvV13WURF3UCOpzqW6QOoiPw02M6i3FAOBT7GHkcdLL5zztEKt7gedFQa/bIwk2MtnjMWonK/r59iw==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -97841,9 +97638,10 @@ in
         ];
       })
       sources."@serverless/component-metrics-1.0.8"
-      (sources."@serverless/components-3.4.3" // {
+      (sources."@serverless/components-3.5.1" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
+          sources."js-yaml-3.14.1"
           sources."ramda-0.27.1"
           sources."strip-ansi-6.0.0"
         ];
@@ -97851,13 +97649,27 @@ in
       (sources."@serverless/core-1.1.2" // {
         dependencies = [
           sources."fs-extra-7.0.1"
+          sources."js-yaml-3.14.1"
           sources."semver-6.3.0"
         ];
       })
-      sources."@serverless/enterprise-plugin-4.4.1"
+      (sources."@serverless/enterprise-plugin-4.4.2" // {
+        dependencies = [
+          sources."js-yaml-3.14.1"
+        ];
+      })
       sources."@serverless/event-mocks-1.1.1"
-      sources."@serverless/platform-client-3.1.4"
-      sources."@serverless/platform-client-china-2.0.9"
+      (sources."@serverless/platform-client-3.8.1" // {
+        dependencies = [
+          sources."js-yaml-3.14.1"
+        ];
+      })
+      (sources."@serverless/platform-client-china-2.1.1" // {
+        dependencies = [
+          sources."adm-zip-0.5.1"
+          sources."js-yaml-3.14.1"
+        ];
+      })
       (sources."@serverless/platform-sdk-2.3.2" // {
         dependencies = [
           sources."chalk-2.4.2"
@@ -97873,12 +97685,10 @@ in
       sources."@serverless/template-1.1.4"
       (sources."@serverless/utils-2.2.0" // {
         dependencies = [
-          sources."argparse-2.0.1"
-          sources."js-yaml-4.0.0"
           sources."write-file-atomic-3.0.3"
         ];
       })
-      sources."@serverless/utils-china-1.0.12"
+      sources."@serverless/utils-china-1.0.14"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tencent-sdk/capi-1.1.8"
@@ -97886,9 +97696,9 @@ in
       sources."@types/caseless-0.12.2"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/lodash-4.14.167"
+      sources."@types/lodash-4.14.168"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -97915,7 +97725,7 @@ in
           sources."file-type-4.4.0"
         ];
       })
-      (sources."archiver-5.1.0" // {
+      (sources."archiver-5.2.0" // {
         dependencies = [
           sources."async-3.2.0"
           sources."bl-4.0.3"
@@ -97945,7 +97755,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.821.0" // {
+      (sources."aws-sdk-2.830.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -97954,14 +97764,14 @@ in
       })
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
-      sources."axios-0.19.2"
+      sources."axios-0.21.1"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bindings-1.5.0"
       (sources."bl-2.2.1" // {
         dependencies = [
@@ -97979,19 +97789,13 @@ in
       })
       sources."blob-0.0.5"
       sources."bluebird-3.7.2"
-      (sources."boxen-4.2.0" // {
+      (sources."boxen-5.0.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.3.0"
-          sources."chalk-3.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."has-flag-4.0.0"
           sources."is-fullwidth-code-point-3.0.0"
           sources."string-width-4.2.0"
           sources."strip-ansi-6.0.0"
-          sources."supports-color-7.2.0"
-          sources."type-fest-0.8.1"
+          sources."type-fest-0.20.2"
         ];
       })
       sources."brace-expansion-1.1.11"
@@ -98013,7 +97817,7 @@ in
         ];
       })
       sources."cachedir-2.3.0"
-      sources."camelcase-5.3.1"
+      sources."camelcase-6.2.0"
       sources."caseless-0.12.0"
       (sources."chainsaw-0.1.0" // {
         dependencies = [
@@ -98031,7 +97835,7 @@ in
       })
       sources."chardet-0.7.0"
       sources."child-process-ext-2.1.1"
-      sources."chokidar-3.4.3"
+      sources."chokidar-3.5.1"
       sources."chownr-1.1.4"
       sources."cli-boxes-2.2.1"
       (sources."cli-color-2.0.0" // {
@@ -98078,8 +97882,8 @@ in
         ];
       })
       sources."dashdash-1.14.1"
-      sources."dayjs-1.10.1"
-      sources."debug-3.1.0"
+      sources."dayjs-1.10.3"
+      sources."debug-2.6.9"
       sources."decode-uri-component-0.2.0"
       sources."decompress-4.2.1"
       sources."decompress-response-3.3.0"
@@ -98141,7 +97945,11 @@ in
       sources."emoji-regex-8.0.0"
       sources."enabled-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."engine.io-client-3.5.0"
+      (sources."engine.io-client-3.5.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."engine.io-parser-2.2.1"
       sources."env-variable-0.0.6"
       sources."es5-ext-0.10.53"
@@ -98169,7 +97977,7 @@ in
       sources."external-editor-3.1.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fastest-levenshtein-1.0.12"
@@ -98185,7 +97993,7 @@ in
       sources."fill-range-7.0.1"
       sources."find-requires-1.0.0"
       sources."flat-5.0.2"
-      sources."follow-redirects-1.5.10"
+      sources."follow-redirects-1.13.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.5.1"
       sources."formidable-1.2.2"
@@ -98197,20 +98005,16 @@ in
         ];
       })
       sources."fs-constants-1.0.0"
-      (sources."fs-extra-9.0.1" // {
+      (sources."fs-extra-9.1.0" // {
         dependencies = [
-          (sources."jsonfile-6.1.0" // {
-            dependencies = [
-              sources."universalify-2.0.0"
-            ];
-          })
-          sources."universalify-1.0.0"
+          sources."jsonfile-6.1.0"
+          sources."universalify-2.0.0"
         ];
       })
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."fs2-0.3.9"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       (sources."gauge-2.7.4" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -98223,7 +98027,7 @@ in
       sources."github-from-package-0.0.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       (sources."got-11.8.1" // {
         dependencies = [
           sources."@sindresorhus/is-4.0.0"
@@ -98304,13 +98108,18 @@ in
       sources."isstream-0.1.2"
       sources."isurl-1.0.0"
       sources."jmespath-0.15.0"
-      sources."js-yaml-3.14.1"
+      (sources."js-yaml-4.0.0" // {
+        dependencies = [
+          sources."argparse-2.0.1"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."json-buffer-3.0.0"
       sources."json-cycle-1.3.0"
       (sources."json-refs-3.0.15" // {
         dependencies = [
           sources."commander-4.1.1"
+          sources."js-yaml-3.14.1"
         ];
       })
       sources."json-schema-0.2.3"
@@ -98328,7 +98137,6 @@ in
       sources."jwt-decode-2.2.0"
       (sources."kafka-node-5.0.0" // {
         dependencies = [
-          sources."debug-2.6.9"
           sources."uuid-3.4.0"
         ];
       })
@@ -98367,7 +98175,11 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."memoizee-0.4.14"
+      (sources."memoizee-0.4.15" // {
+        dependencies = [
+          sources."next-tick-1.1.0"
+        ];
+      })
       sources."merge2-1.4.1"
       sources."methods-1.1.2"
       sources."micromatch-4.0.2"
@@ -98410,7 +98222,7 @@ in
       sources."once-1.4.0"
       sources."one-time-0.0.4"
       sources."onetime-5.1.2"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       (sources."opn-5.5.0" // {
         dependencies = [
           sources."is-wsl-1.1.0"
@@ -98456,7 +98268,7 @@ in
       sources."promise-queue-2.2.5"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.39"
+          sources."@types/node-13.13.40"
           sources."long-4.0.0"
         ];
       })
@@ -98492,6 +98304,7 @@ in
       sources."reusify-1.0.4"
       sources."run-async-2.4.1"
       sources."run-parallel-1.1.10"
+      sources."run-parallel-limit-1.0.6"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
@@ -98515,9 +98328,14 @@ in
       sources."simple-swizzle-0.2.2"
       sources."slash-3.0.0"
       sources."snappy-6.3.5"
-      sources."socket.io-client-2.4.0"
-      (sources."socket.io-parser-3.3.1" // {
+      (sources."socket.io-client-2.4.0" // {
         dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."socket.io-parser-3.3.2" // {
+        dependencies = [
+          sources."debug-3.1.0"
           sources."isarray-2.0.1"
         ];
       })
@@ -98547,6 +98365,8 @@ in
       sources."strip-outer-1.0.1"
       (sources."superagent-3.8.3" // {
         dependencies = [
+          sources."debug-3.2.7"
+          sources."ms-2.1.3"
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
@@ -98574,7 +98394,7 @@ in
           sources."untildify-3.0.3"
         ];
       })
-      (sources."tar-6.0.5" // {
+      (sources."tar-6.1.0" // {
         dependencies = [
           sources."chownr-2.0.0"
           sources."mkdirp-1.0.4"
@@ -98593,7 +98413,6 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."term-size-2.2.1"
       sources."text-hex-1.0.0"
       sources."throat-5.0.0"
       sources."through-2.3.8"
@@ -98617,7 +98436,7 @@ in
       sources."unbzip2-stream-1.4.3"
       sources."universalify-0.1.2"
       sources."untildify-4.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       (sources."url-0.10.3" // {
         dependencies = [
           sources."punycode-1.3.2"
@@ -98648,6 +98467,17 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
+      (sources."wrap-ansi-7.0.0" // {
+        dependencies = [
+          sources."ansi-regex-5.0.0"
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
       sources."ws-7.4.2"
@@ -98667,7 +98497,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more";
-      homepage = https://serverless.com/framework/docs/;
+      homepage = "https://serverless.com/framework/docs/";
       license = "MIT";
     };
     production = true;
@@ -98883,7 +98713,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."utf8-2.0.0"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -99312,10 +99142,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.437.3";
+    version = "1.439.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.437.3.tgz";
-      sha512 = "DFcYz8Q8LT/XNCNxaeEoGahazvkEhWS//JWJTfr6W1d5jMnORQauPxxj4RR3WGjKewSDl2eElwK1jhi5RNOP9g==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.439.0.tgz";
+      sha512 = "VHai1FZxbQEH3CKBgJo76FBF5MuLnAVyg4lXxRCOBLOW2vCK8kCZnaMMwvlOCubYCAdnzUOE34qCwJi/zG5RWw==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -99329,7 +99159,7 @@ in
       sources."@snyk/dep-graph-1.21.0"
       sources."@snyk/docker-registry-v2-client-1.13.9"
       sources."@snyk/gemfile-1.2.0"
-      (sources."@snyk/java-call-graph-builder-1.18.0" // {
+      (sources."@snyk/java-call-graph-builder-1.19.0" // {
         dependencies = [
           sources."rimraf-3.0.2"
           sources."tmp-0.2.1"
@@ -99338,7 +99168,7 @@ in
       sources."@snyk/rpm-parser-2.2.1"
       (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."@snyk/snyk-docker-pull-3.2.3" // {
@@ -99352,9 +99182,9 @@ in
       sources."@types/graphlib-2.1.7"
       sources."@types/hosted-git-info-2.7.0"
       sources."@types/http-cache-semantics-4.0.0"
-      sources."@types/js-yaml-3.12.5"
+      sources."@types/js-yaml-3.12.6"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -99377,7 +99207,7 @@ in
       sources."asn1-0.2.4"
       (sources."ast-types-0.14.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."async-3.2.0"
@@ -99616,7 +99446,7 @@ in
       sources."object-hash-2.1.1"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."optionator-0.8.3"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
@@ -99656,6 +99486,7 @@ in
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
       sources."promise-7.3.1"
+      sources."promise-queue-2.2.5"
       sources."proxy-agent-3.1.1"
       sources."proxy-from-env-1.1.0"
       sources."pseudomap-1.0.2"
@@ -99703,7 +99534,7 @@ in
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       (sources."snyk-docker-plugin-4.13.1" // {
@@ -99720,7 +99551,7 @@ in
           sources."tmp-0.2.1"
         ];
       })
-      (sources."snyk-gradle-plugin-3.11.0" // {
+      (sources."snyk-gradle-plugin-3.12.0" // {
         dependencies = [
           (sources."@snyk/cli-interface-2.9.1" // {
             dependencies = [
@@ -99736,7 +99567,7 @@ in
           sources."rimraf-3.0.2"
           sources."supports-color-7.2.0"
           sources."tmp-0.2.1"
-          sources."tslib-2.0.3"
+          sources."tslib-2.1.0"
         ];
       })
       sources."snyk-module-3.1.0"
@@ -99779,9 +99610,14 @@ in
           sources."tslib-1.11.1"
         ];
       })
-      (sources."snyk-poetry-lockfile-parser-1.1.1" // {
+      (sources."snyk-poetry-lockfile-parser-1.1.2" // {
         dependencies = [
-          sources."tslib-2.0.3"
+          (sources."@snyk/dep-graph-1.23.0" // {
+            dependencies = [
+              sources."tslib-1.14.1"
+            ];
+          })
+          sources."tslib-2.1.0"
         ];
       })
       (sources."snyk-policy-1.14.1" // {
@@ -99795,7 +99631,7 @@ in
           })
         ];
       })
-      sources."snyk-python-plugin-1.19.1"
+      sources."snyk-python-plugin-1.19.2"
       (sources."snyk-resolve-1.0.1" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -99934,16 +99770,16 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "3.0.5";
+    version = "3.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz";
-      sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz";
+      sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww==";
     };
     dependencies = [
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."accepts-1.3.7"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
@@ -99951,15 +99787,15 @@ in
       sources."cookie-0.4.1"
       sources."cors-2.8.5"
       sources."debug-4.3.2"
-      sources."engine.io-4.0.6"
+      sources."engine.io-4.1.0"
       sources."engine.io-parser-4.0.2"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."ms-2.1.2"
       sources."negotiator-0.6.2"
       sources."object-assign-4.1.1"
-      sources."socket.io-adapter-2.0.3"
-      sources."socket.io-parser-4.0.3"
+      sources."socket.io-adapter-2.1.0"
+      sources."socket.io-parser-4.0.4"
       sources."vary-1.1.2"
       sources."ws-7.4.2"
     ];
@@ -100205,7 +100041,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-2.1.1"
       sources."ccount-1.1.0"
       sources."chalk-1.1.3"
@@ -100293,7 +100129,11 @@ in
       })
       sources."epidemic-broadcast-trees-7.0.0"
       sources."errno-0.1.8"
-      sources."es-abstract-1.17.7"
+      (sources."es-abstract-1.18.0-next.2" // {
+        dependencies = [
+          sources."object-inspect-1.9.0"
+        ];
+      })
       (sources."es-get-iterator-1.1.1" // {
         dependencies = [
           sources."isarray-2.0.5"
@@ -100342,7 +100182,7 @@ in
           sources."mkdirp-1.0.4"
         ];
       })
-      (sources."flumeview-reduce-1.3.17" // {
+      (sources."flumeview-reduce-1.4.0" // {
         dependencies = [
           (sources."atomic-file-2.1.1" // {
             dependencies = [
@@ -100449,11 +100289,7 @@ in
       sources."is-set-2.0.2"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      (sources."is-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."is-typed-array-1.1.4"
       sources."is-typedarray-1.0.0"
       sources."is-valid-domain-0.0.17"
       sources."is-weakmap-2.0.1"
@@ -100561,7 +100397,7 @@ in
           })
         ];
       })
-      sources."object-inspect-1.9.0"
+      sources."object-inspect-1.7.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       (sources."object-visit-1.0.1" // {
@@ -100579,7 +100415,7 @@ in
       sources."observ-0.2.0"
       sources."observ-debounce-1.1.1"
       sources."obv-0.0.1"
-      sources."obz-1.0.2"
+      sources."obz-1.0.3"
       sources."on-change-network-0.0.2"
       sources."on-wakeup-1.0.1"
       sources."once-1.4.0"
@@ -100728,7 +100564,7 @@ in
       })
       sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."relative-url-1.0.2"
       (sources."remark-3.2.3" // {
         dependencies = [
@@ -100768,7 +100604,11 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."shellsubstitute-1.2.0"
-      sources."side-channel-1.0.4"
+      (sources."side-channel-1.0.4" // {
+        dependencies = [
+          sources."object-inspect-1.9.0"
+        ];
+      })
       sources."smart-buffer-4.1.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -100873,11 +100713,7 @@ in
         ];
       })
       sources."string-width-1.0.2"
-      (sources."string.prototype.trim-1.2.3" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trim-1.2.3"
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
@@ -100889,7 +100725,6 @@ in
         dependencies = [
           sources."glob-7.1.6"
           sources."is-regex-1.0.5"
-          sources."object-inspect-1.7.0"
         ];
       })
       sources."text-table-0.2.0"
@@ -100946,11 +100781,7 @@ in
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      (sources."which-typed-array-1.1.4" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."which-typed-array-1.1.4"
       sources."word-wrap-1.2.3"
       sources."wrap-fn-0.1.5"
       sources."wrappy-1.0.2"
@@ -100961,7 +100792,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "network protocol layer for secure-scuttlebutt";
-      homepage = https://github.com/ssbc/ssb-server;
+      homepage = "https://github.com/ssbc/ssb-server";
       license = "MIT";
     };
     production = true;
@@ -100979,7 +100810,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Send metric data from statsd to Stackdriver";
-      homepage = https://www.stackdriver.com/;
+      homepage = "https://www.stackdriver.com";
       license = "MIT";
     };
     production = true;
@@ -101054,7 +100885,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.821.0" // {
+      (sources."aws-sdk-2.830.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -101094,7 +100925,7 @@ in
       sources."buffer-from-1.1.1"
       sources."bufferutil-1.3.0"
       sources."bufferview-1.0.1"
-      sources."bunyan-1.8.14"
+      sources."bunyan-1.8.15"
       sources."busboy-0.2.14"
       sources."bytebuffer-3.5.5"
       sources."bytes-3.1.0"
@@ -101580,7 +101411,7 @@ in
       sources."signal-exit-3.0.3"
       sources."slash-1.0.0"
       sources."sntp-1.0.9"
-      (sources."socket.io-2.4.0" // {
+      (sources."socket.io-2.4.1" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -101591,7 +101422,7 @@ in
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
           sources."ms-2.0.0"
-          sources."socket.io-parser-3.3.1"
+          sources."socket.io-parser-3.3.2"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
@@ -101642,7 +101473,7 @@ in
         dependencies = [
           sources."debug-3.2.7"
           sources."form-data-2.5.1"
-          sources."qs-6.9.4"
+          sources."qs-6.9.6"
           sources."readable-stream-2.3.7"
           sources."string_decoder-1.1.1"
         ];
@@ -101655,7 +101486,7 @@ in
           sources."esprima-4.0.1"
           sources."js-yaml-3.14.1"
           sources."lodash-3.10.1"
-          sources."qs-6.9.4"
+          sources."qs-6.9.6"
         ];
       })
       sources."swagger-schema-official-2.0.0-bab6bed"
@@ -101705,7 +101536,7 @@ in
       sources."uid2-0.0.3"
       sources."ultron-1.0.2"
       sources."unpipe-1.0.0"
-      (sources."uri-js-4.4.0" // {
+      (sources."uri-js-4.4.1" // {
         dependencies = [
           sources."punycode-2.1.1"
         ];
@@ -101820,10 +101651,10 @@ in
   stylelint = nodeEnv.buildNodePackage {
     name = "stylelint";
     packageName = "stylelint";
-    version = "13.8.0";
+    version = "13.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz";
-      sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==";
+      url = "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz";
+      sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -101870,11 +101701,11 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -101912,7 +101743,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.634"
+      sources."electron-to-chromium-1.3.642"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -101921,14 +101752,14 @@ in
       sources."execall-2.0.0"
       sources."extend-3.0.2"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fastest-levenshtein-1.0.12"
       sources."fastq-1.10.0"
       sources."file-entry-cache-6.0.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.0"
+      sources."flatted-3.1.1"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
@@ -101938,7 +101769,7 @@ in
       sources."global-modules-2.0.0"
       sources."global-prefix-3.0.0"
       sources."globals-11.12.0"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       sources."globjoin-0.1.4"
       sources."gonzales-pe-4.3.0"
       sources."hard-rejection-2.1.0"
@@ -101993,7 +101824,7 @@ in
       sources."mdast-util-from-markdown-0.8.4"
       sources."mdast-util-to-markdown-0.6.2"
       sources."mdast-util-to-string-2.0.0"
-      sources."meow-8.1.0"
+      sources."meow-9.0.0"
       sources."merge2-1.4.1"
       sources."micromark-2.11.2"
       sources."micromatch-4.0.2"
@@ -102006,7 +101837,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       (sources."normalize-package-data-3.0.0" // {
         dependencies = [
           sources."semver-7.3.4"
@@ -102021,7 +101852,7 @@ in
       sources."p-try-2.2.0"
       sources."parent-module-1.0.1"
       sources."parse-entities-2.0.0"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -102115,7 +101946,7 @@ in
       sources."unist-util-find-all-after-3.0.2"
       sources."unist-util-is-4.0.4"
       sources."unist-util-stringify-position-2.0.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
@@ -102132,7 +101963,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A mighty, modern CSS linter.";
-      homepage = https://stylelint.io/;
+      homepage = "https://stylelint.io";
       license = "MIT";
     };
     production = true;
@@ -102152,7 +101983,7 @@ in
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
       sources."boolbase-1.0.0"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."chalk-2.4.2"
       sources."coa-2.0.2"
       sources."color-convert-1.9.3"
@@ -102176,7 +102007,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domutils-1.7.0"
       sources."entities-2.1.0"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -102218,7 +102049,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Nodejs-based tool for optimizing SVG vector graphics files";
-      homepage = https://github.com/svg/svgo;
+      homepage = "https://github.com/svg/svgo";
       license = "MIT";
     };
     production = true;
@@ -102620,7 +102451,7 @@ in
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
-          sources."qs-6.9.4"
+          sources."qs-6.9.6"
           sources."superagent-3.8.3"
         ];
       })
@@ -102797,7 +102628,7 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       sources."undefsafe-2.0.3"
       (sources."union-value-1.0.1" // {
         dependencies = [
@@ -102917,7 +102748,7 @@ in
       sources."jsprim-1.4.1"
       sources."locate-path-3.0.0"
       sources."long-4.0.0"
-      sources."mime-2.4.7"
+      sources."mime-2.5.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."minimist-1.2.5"
@@ -102958,7 +102789,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-1.0.3"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."which-module-2.0.0"
@@ -103061,7 +102892,7 @@ in
       sources."boundary-1.0.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       (sources."chalk-1.1.3" // {
         dependencies = [
           sources."strip-ansi-3.0.1"
@@ -103084,8 +102915,6 @@ in
       sources."define-properties-1.1.3"
       sources."diff-4.0.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.7"
-      sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
@@ -103113,7 +102942,6 @@ in
       sources."is-arguments-1.1.0"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
       sources."is-core-module-2.2.0"
       sources."is-date-object-1.0.2"
       sources."is-decimal-1.0.4"
@@ -103122,7 +102950,6 @@ in
       sources."is-hexadecimal-1.0.4"
       sources."is-plain-obj-1.1.0"
       sources."is-regex-1.1.1"
-      sources."is-symbol-1.0.3"
       sources."is-utf8-0.2.1"
       sources."is-whitespace-character-1.0.4"
       sources."is-word-character-1.0.4"
@@ -103146,10 +102973,8 @@ in
       sources."ms-2.1.2"
       sources."normalize-package-data-2.5.0"
       sources."number-is-nan-1.0.1"
-      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."optionator-0.9.1"
       sources."p-limit-1.3.0"
@@ -103181,7 +103006,7 @@ in
         ];
       })
       sources."readable-stream-2.3.7"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."remark-frontmatter-1.3.3"
       sources."remark-parse-5.0.0"
       sources."repeat-string-1.6.1"
@@ -103203,8 +103028,6 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       (sources."strip-ansi-6.0.0" // {
         dependencies = [
@@ -103253,7 +103076,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The pluggable linting tool for text and markdown.";
-      homepage = https://github.com/textlint/textlint/;
+      homepage = "https://github.com/textlint/textlint/";
       license = "MIT";
     };
     production = true;
@@ -103275,7 +103098,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Latex plugin for [textlint](https://github.com/textlint/textlint &#34;textlint&#34;).";
-      homepage = https://github.com/elzup/textlint-plugin-latex;
+      homepage = "https://github.com/elzup/textlint-plugin-latex";
       license = "MIT";
     };
     production = true;
@@ -103291,30 +103114,20 @@ in
       sha1 = "8d49dd02b3a7a88d7e6b32817f9e202c5c6596b9";
     };
     dependencies = [
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.17.7"
-      sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.0.2"
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
-      sources."is-callable-1.2.2"
-      sources."is-date-object-1.0.2"
-      sources."is-regex-1.1.1"
-      sources."is-symbol-1.0.3"
       sources."match-index-1.0.3"
-      sources."object-inspect-1.9.0"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.2"
-      sources."regexp.prototype.flags-1.3.0"
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
+      sources."regexp.prototype.flags-1.3.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule check that abbreviations within parentheses.";
-      homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses;
+      homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses";
       license = "MIT";
     };
     production = true;
@@ -103553,7 +103366,7 @@ in
       })
       sources."parse-english-4.2.0"
       sources."parse-entities-2.0.0"
-      sources."parse-json-5.1.0"
+      sources."parse-json-5.2.0"
       sources."parse-latin-4.3.0"
       sources."parse5-6.0.1"
       sources."path-exists-4.0.0"
@@ -103729,7 +103542,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule for alex";
-      homepage = https://github.com/textlint-rule/textlint-rule-alex;
+      homepage = "https://github.com/textlint-rule/textlint-rule-alex";
       license = "MIT";
     };
     production = true;
@@ -103754,7 +103567,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule to check common misspellings";
-      homepage = https://github.com/io-monad/textlint-rule-common-misspellings;
+      homepage = "https://github.com/io-monad/textlint-rule-common-misspellings";
       license = "GPL-3.0";
     };
     production = true;
@@ -103776,7 +103589,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Textlint rule to check correct usage of diacritics";
-      homepage = https://github.com/sapegin/textlint-rule-diacritics;
+      homepage = "https://github.com/sapegin/textlint-rule-diacritics";
       license = "MIT";
     };
     production = true;
@@ -103813,7 +103626,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule that specify the maximum word count of a sentence.";
-      homepage = https://github.com/azu/textlint-rule-en-max-word-count;
+      homepage = "https://github.com/azu/textlint-rule-en-max-word-count";
       license = "MIT";
     };
     production = true;
@@ -103870,10 +103683,10 @@ in
       sources."@textlint/types-1.4.6"
       sources."boundary-1.0.1"
       sources."buffer-from-1.1.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."concat-stream-2.0.0"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.0.2"
@@ -103907,7 +103720,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule that check no start with duplicated conjunction.";
-      homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction;
+      homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction";
       license = "MIT";
     };
     production = true;
@@ -103924,7 +103737,7 @@ in
     };
     dependencies = [
       sources."array.prototype.find-2.1.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."check-ends-with-period-1.0.1"
       sources."define-properties-1.1.3"
       sources."emoji-regex-6.5.1"
@@ -103948,7 +103761,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule that check with or without period in list item.";
-      homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item;
+      homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item";
       license = "MIT";
     };
     production = true;
@@ -103958,10 +103771,10 @@ in
   textlint-rule-stop-words = nodeEnv.buildNodePackage {
     name = "textlint-rule-stop-words";
     packageName = "textlint-rule-stop-words";
-    version = "2.0.8";
+    version = "2.0.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.8.tgz";
-      sha512 = "D945uyFkeMo6KJhMJaFTEHudP+Jkl00rLOQKRibV1zl933muR6NXqz+uXAvitPAEWH20kwQA40E0Cd1t8nJQ1w==";
+      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.9.tgz";
+      sha512 = "UW7nWrqBUHfz/sRLTFo40BNjwXOiXSHg00TJuYY4GVDQtsWRLyAsOnXSBqClP4i6wl7ejMBeYmB5mfllYAYMgA==";
     };
     dependencies = [
       sources."@textlint/ast-node-types-4.3.5"
@@ -103978,7 +103791,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Textlint rule to find filler words, buzzwords and chiches";
-      homepage = https://github.com/sapegin/textlint-rule-stop-words;
+      homepage = "https://github.com/sapegin/textlint-rule-stop-words";
       license = "MIT";
     };
     production = true;
@@ -103988,10 +103801,10 @@ in
   textlint-rule-terminology = nodeEnv.buildNodePackage {
     name = "textlint-rule-terminology";
     packageName = "textlint-rule-terminology";
-    version = "2.1.4";
+    version = "2.1.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.4.tgz";
-      sha512 = "kLw4qL8RwY2lCNqgKveHc5sjCDlS5Tdw2TXWOrHvSvQxqaVOwsv3+51oMIQLGfJzQrhFSMlSlw5MvfaOerBvPQ==";
+      url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.5.tgz";
+      sha512 = "VW+ea4ByLPddSUqoFkVVJF8zWnO8kqKwvC681wGFAjI4CYz9WhjEQH1ikhoEHXnd5AFXNArcjyoa8hoihrXy0w==";
     };
     dependencies = [
       sources."@textlint/ast-node-types-4.3.5"
@@ -104008,7 +103821,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "TextLint rule to check correct terms spelling";
-      homepage = https://github.com/sapegin/textlint-rule-terminology;
+      homepage = "https://github.com/sapegin/textlint-rule-terminology";
       license = "MIT";
     };
     production = true;
@@ -104025,9 +103838,9 @@ in
     };
     dependencies = [
       sources."array-includes-3.1.2"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.18.0-next.2"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.0.2"
@@ -104049,7 +103862,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule that check unexpanded acronym word.";
-      homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym;
+      homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym";
       license = "MIT";
     };
     production = true;
@@ -104069,7 +103882,7 @@ in
       sources."@textlint/types-1.4.6"
       sources."adverb-where-0.0.9"
       sources."boundary-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."define-properties-1.1.3"
       sources."e-prime-0.10.4"
       sources."function-bind-1.1.1"
@@ -104092,7 +103905,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule to check your English style with write good";
-      homepage = https://github.com/textlint-rule/textlint-rule-write-good;
+      homepage = "https://github.com/textlint-rule/textlint-rule-write-good";
       license = "MIT";
     };
     production = true;
@@ -104115,7 +103928,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -104191,7 +104004,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-3.8.2"
+      sources."core-js-3.8.3"
       sources."core-util-is-1.0.2"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
@@ -104346,7 +104159,7 @@ in
       sources."mkdirp-0.5.5"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
-      (sources."needle-2.5.2" // {
+      (sources."needle-2.6.0" // {
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
@@ -104414,7 +104227,7 @@ in
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
-      sources."peek-readable-3.1.1"
+      sources."peek-readable-3.1.3"
       sources."performance-now-2.1.0"
       sources."pify-4.0.1"
       sources."precond-0.2.3"
@@ -104470,7 +104283,7 @@ in
           sources."base64-arraybuffer-0.1.5"
           sources."debug-4.1.1"
           sources."ms-2.1.3"
-          (sources."socket.io-parser-3.3.1" // {
+          (sources."socket.io-parser-3.3.2" // {
             dependencies = [
               sources."component-emitter-1.3.0"
               sources."debug-3.1.0"
@@ -104499,14 +104312,14 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
-      sources."strtok3-6.0.6"
+      sources."strtok3-6.0.8"
       sources."supports-color-7.2.0"
       sources."tar-4.4.13"
       sources."tlds-1.208.0"
       sources."to-array-0.1.4"
       sources."to-readable-stream-1.0.0"
       sources."toidentifier-1.0.0"
-      sources."token-types-2.0.0"
+      sources."token-types-2.1.1"
       sources."tough-cookie-2.5.0"
       sources."trim-repeated-1.0.0"
       sources."tunnel-agent-0.6.0"
@@ -104516,7 +104329,7 @@ in
       sources."ua-parser-js-0.7.21"
       sources."uc.micro-1.0.6"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-parse-lax-3.0.0"
       sources."urlsafe-base64-1.0.0"
       sources."util-deprecate-1.0.2"
@@ -104539,7 +104352,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The self-hosted Web IRC client";
-      homepage = https://thelounge.chat/;
+      homepage = "https://thelounge.chat/";
       license = "MIT";
     };
     production = true;
@@ -104557,7 +104370,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "JavaScript 3D library";
-      homepage = https://threejs.org/;
+      homepage = "https://threejs.org/";
       license = "MIT";
     };
     production = true;
@@ -104684,7 +104497,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."universalify-1.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."uuid-8.3.2"
       sources."verror-1.10.0"
       (sources."winston-2.4.5" // {
@@ -104899,7 +104712,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Joyent Triton CLI and client (https://www.joyent.com/triton)";
-      homepage = https://github.com/joyent/node-triton;
+      homepage = "https://github.com/joyent/node-triton";
       license = "MPL-2.0";
     };
     production = true;
@@ -104948,7 +104761,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "TSUN: a repl for TypeScript Upgraded Node";
-      homepage = https://github.com/HerringtonDarkholme/typescript-repl;
+      homepage = "https://github.com/HerringtonDarkholme/typescript-repl";
       license = "MIT";
     };
     production = true;
@@ -104989,7 +104802,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "TypeScript is a language for application scale JavaScript development";
-      homepage = https://www.typescriptlang.org/;
+      homepage = "https://www.typescriptlang.org/";
       license = "Apache-2.0";
     };
     production = true;
@@ -104999,10 +104812,10 @@ in
   typescript-language-server = nodeEnv.buildNodePackage {
     name = "typescript-language-server";
     packageName = "typescript-language-server";
-    version = "0.4.0";
+    version = "0.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.4.0.tgz";
-      sha512 = "K8jNOmDFn+QfrCh8ujby2pGDs5rpjYZQn+zvQnf42rxG4IHbfw5CHoMvbGkWPK/J5Gw8/l5K3i03kVZC2IBElg==";
+      url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.1.tgz";
+      sha512 = "60Kguhwk/R1BB4pEIb6B9C7Ix7JzLzYnsODlmorYMPjMeEV0rCBqTR6FGAj4wVw/eHrHcpwLENmmURKUd8aybA==";
     };
     dependencies = [
       sources."command-exists-1.2.6"
@@ -105026,6 +104839,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver";
+      homepage = "https://github.com/theia-ide/typescript-language-server#readme";
       license = "Apache-2.0";
     };
     production = true;
@@ -105035,10 +104849,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.12.4";
+    version = "3.12.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz";
-      sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
+      sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -105084,7 +104898,7 @@ in
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ansi-regex-5.0.0"
@@ -105240,7 +105054,7 @@ in
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."p-cancelable-1.1.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
@@ -105296,7 +105110,7 @@ in
         ];
       })
       sources."socket.io-adapter-2.0.3"
-      (sources."socket.io-parser-4.0.3" // {
+      (sources."socket.io-parser-4.0.4" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
@@ -105357,10 +105171,10 @@ in
   vega-cli = nodeEnv.buildNodePackage {
     name = "vega-cli";
     packageName = "vega-cli";
-    version = "5.17.3";
+    version = "5.19.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.17.3.tgz";
-      sha512 = "gxLAxIxFmq+36eB0ETCo4F29+/gWFfGftLxpCs8/fVKW9ILfJnEBd3M+7qdQKRHhVbImqsPetaKzwtIYH7/EPw==";
+      url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.19.1.tgz";
+      sha512 = "zUyyUYl2GgpAqdaQ3f/riNdaued3030hiJAjreX7/3XBiJ64vmF1l42x3KD8rq24ff9xLFwe0qyfnQOk4nK+fg==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -105437,7 +105251,7 @@ in
       sources."mkdirp-0.5.5"
       sources."ms-2.1.3"
       sources."nan-2.14.2"
-      sources."needle-2.5.2"
+      sources."needle-2.6.0"
       sources."node-fetch-2.6.1"
       sources."node-pre-gyp-0.11.0"
       sources."nopt-4.0.3"
@@ -105475,7 +105289,7 @@ in
       sources."tar-4.4.13"
       sources."topojson-client-3.1.0"
       sources."util-deprecate-1.0.2"
-      sources."vega-5.17.3"
+      sources."vega-5.19.1"
       sources."vega-canvas-1.2.6"
       sources."vega-crossfilter-4.0.5"
       sources."vega-dataflow-5.7.3"
@@ -105484,18 +105298,18 @@ in
       sources."vega-expression-4.0.1"
       sources."vega-force-4.0.7"
       sources."vega-format-1.0.4"
-      sources."vega-functions-5.10.0"
+      sources."vega-functions-5.12.0"
       sources."vega-geo-4.3.8"
       sources."vega-hierarchy-4.0.9"
       sources."vega-label-1.0.0"
       sources."vega-loader-4.4.0"
-      sources."vega-parser-6.1.2"
+      sources."vega-parser-6.1.3"
       sources."vega-projection-1.4.5"
       sources."vega-regression-1.0.9"
       sources."vega-runtime-6.1.3"
       sources."vega-scale-7.1.1"
-      sources."vega-scenegraph-4.9.2"
-      sources."vega-selections-5.1.5"
+      sources."vega-scenegraph-4.9.3"
+      sources."vega-selections-5.3.0"
       sources."vega-statistics-1.7.9"
       sources."vega-time-2.0.4"
       sources."vega-transforms-4.9.3"
@@ -105577,7 +105391,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Vega-Lite is a concise high-level language for interactive visualization.";
-      homepage = https://vega.github.io/vega-lite/;
+      homepage = "https://vega.github.io/vega-lite/";
       license = "BSD-3-Clause";
     };
     production = true;
@@ -105828,7 +105642,7 @@ in
       })
       sources."base64-js-1.5.1"
       sources."big.js-5.2.2"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bindings-1.5.0"
       sources."bluebird-3.7.2"
       sources."bn.js-5.1.3"
@@ -105864,7 +105678,7 @@ in
         ];
       })
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
       (sources."chalk-2.4.2" // {
         dependencies = [
@@ -105967,10 +105781,10 @@ in
       sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.3.0"
+      sources."enhanced-resolve-4.5.0"
       sources."entities-2.1.0"
       sources."errno-0.1.8"
-      (sources."es-abstract-1.18.0-next.1" // {
+      (sources."es-abstract-1.18.0-next.2" // {
         dependencies = [
           sources."object.assign-4.1.2"
         ];
@@ -106457,7 +106271,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -106474,12 +106288,13 @@ in
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.2.0"
       sources."vm-browserify-1.1.2"
-      sources."vsce-1.83.0"
+      sources."vsce-1.84.0"
       sources."vscode-debugadapter-testsupport-1.43.0"
       sources."vscode-debugprotocol-1.43.0"
       (sources."watchpack-1.7.5" // {
         dependencies = [
-          sources."chokidar-3.4.3"
+          sources."chokidar-3.5.1"
+          sources."fsevents-2.3.1"
           sources."readdirp-3.5.0"
         ];
       })
@@ -106507,7 +106322,7 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      (sources."webpack-4.44.2" // {
+      (sources."webpack-4.46.0" // {
         dependencies = [
           (sources."braces-2.3.2" // {
             dependencies = [
@@ -106826,12 +106641,12 @@ in
       sources."tslib-1.14.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       sources."uid-0.0.2"
       sources."unbzip2-stream-1.4.3"
       sources."unyield-0.0.1"
       sources."unzip-response-2.0.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."url-parse-lax-1.0.0"
       sources."url-to-options-1.0.1"
       sources."user-home-2.0.0"
@@ -106885,7 +106700,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -106937,7 +106752,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bootstrap-vue-helper-json-1.1.1"
       (sources."boxen-3.2.0" // {
         dependencies = [
@@ -107085,7 +106900,7 @@ in
           sources."eslint-scope-5.1.1"
           sources."espree-6.2.1"
           sources."ms-2.1.2"
-          sources."vue-eslint-parser-7.3.0"
+          sources."vue-eslint-parser-7.4.1"
         ];
       })
       sources."eslint-scope-4.0.3"
@@ -107268,7 +107083,7 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
-      (sources."js-beautify-1.13.0" // {
+      (sources."js-beautify-1.13.4" // {
         dependencies = [
           sources."mkdirp-1.0.4"
         ];
@@ -107710,7 +107525,7 @@ in
       })
       sources."untildify-2.1.0"
       sources."update-notifier-3.0.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
       sources."use-3.1.1"
@@ -107786,7 +107601,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "vue-language-server";
-      homepage = https://github.com/vuejs/vetur/tree/master/server;
+      homepage = "https://github.com/vuejs/vetur/tree/master/server";
       license = "MIT";
     };
     production = true;
@@ -107796,10 +107611,10 @@ in
   web-ext = nodeEnv.buildNodePackage {
     name = "web-ext";
     packageName = "web-ext";
-    version = "5.4.1";
+    version = "5.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/web-ext/-/web-ext-5.4.1.tgz";
-      sha512 = "AnTjSFtvidZfmVYzvceM/XixsigiWU3l66UzcxgXxXhOoEQU5ZHlXFGVJdHEYfkI5SnEyDG+WlhsdTUHNLOXJw==";
+      url = "https://registry.npmjs.org/web-ext/-/web-ext-5.5.0.tgz";
+      sha512 = "f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -107831,7 +107646,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/yauzl-2.9.1"
       sources."JSONSelect-0.2.1"
       sources."acorn-7.4.1"
@@ -107902,7 +107717,7 @@ in
       })
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       sources."bindings-1.5.0"
       sources."bl-4.0.3"
       sources."bluebird-2.9.34"
@@ -107926,15 +107741,15 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."callsites-3.1.0"
       sources."camelcase-6.0.0"
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."cheerio-1.0.0-rc.3"
-      (sources."chokidar-3.4.3" // {
+      (sources."chokidar-3.5.1" // {
         dependencies = [
-          sources."fsevents-2.1.3"
+          sources."fsevents-2.3.1"
         ];
       })
       (sources."chrome-launcher-0.13.4" // {
@@ -108036,8 +107851,6 @@ in
       sources."enquirer-2.3.6"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.7"
-      sources."es-to-primitive-1.2.1"
       sources."es6-error-4.1.1"
       sources."es6-promise-2.3.0"
       sources."es6-promisify-6.1.1"
@@ -108208,7 +108021,7 @@ in
       sources."human-signals-1.1.1"
       sources."ieee754-1.2.1"
       sources."ignore-4.0.6"
-      sources."import-fresh-3.2.1"
+      sources."import-fresh-3.3.0"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -108221,7 +108034,6 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
@@ -108241,7 +108053,6 @@ in
       sources."is-regex-1.1.1"
       sources."is-relative-0.1.3"
       sources."is-stream-2.0.0"
-      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
@@ -108368,7 +108179,7 @@ in
       sources."neo-async-2.6.2"
       sources."next-tick-1.1.0"
       sources."node-forge-0.10.0"
-      (sources."node-notifier-8.0.0" // {
+      (sources."node-notifier-8.0.1" // {
         dependencies = [
           sources."uuid-8.3.2"
         ];
@@ -108392,11 +108203,9 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
@@ -108453,7 +108262,7 @@ in
       sources."readdirp-3.5.0"
       sources."regenerator-runtime-0.13.7"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."regexpp-3.1.0"
       sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
@@ -108579,8 +108388,6 @@ in
           sources."strip-ansi-6.0.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-4.0.0"
@@ -108643,7 +108450,7 @@ in
       })
       sources."upath-2.0.1"
       sources."update-notifier-5.0.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
       sources."use-3.1.1"
@@ -108652,7 +108459,7 @@ in
       sources."v8-compile-cache-2.2.0"
       sources."verror-1.10.0"
       sources."vfile-location-3.2.0"
-      sources."watchpack-1.7.4"
+      sources."watchpack-1.7.5"
       (sources."watchpack-chokidar2-2.0.1" // {
         dependencies = [
           sources."anymatch-2.0.0"
@@ -108698,7 +108505,7 @@ in
         ];
       })
       sources."write-file-atomic-3.0.3"
-      sources."ws-7.3.1"
+      sources."ws-7.4.2"
       sources."xdg-basedir-4.0.0"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
@@ -108727,7 +108534,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A command line tool to help build, run, and test web extensions";
-      homepage = https://github.com/mozilla/web-ext;
+      homepage = "https://github.com/mozilla/web-ext";
       license = "MPL-2.0";
     };
     production = true;
@@ -108737,48 +108544,46 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.11.1";
+    version = "5.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.11.1.tgz";
-      sha512 = "tNUIdAmYJv+nupRs/U/gqmADm6fgrf5xE+rSlSsf2PgsGO7j2WG7ccU6AWNlOJlHFl+HnmXlBmHIkiLf+XA9mQ==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.16.0.tgz";
+      sha512 = "QOkctcjYfEGxcYg4AzPJafyAQ7ANc266/URkX881uFA7b2k31E0Dmpy1ExfppHOTp1kHDTsRh9sXojVUvgPF0g==";
     };
     dependencies = [
       sources."@types/eslint-7.2.6"
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
-      sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.20"
-      sources."@webassemblyjs/ast-1.9.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
-      sources."@webassemblyjs/helper-api-error-1.9.1"
-      sources."@webassemblyjs/helper-buffer-1.9.1"
-      sources."@webassemblyjs/helper-code-frame-1.9.1"
-      sources."@webassemblyjs/helper-fsm-1.9.1"
-      sources."@webassemblyjs/helper-module-context-1.9.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
-      sources."@webassemblyjs/helper-wasm-section-1.9.1"
-      sources."@webassemblyjs/ieee754-1.9.1"
-      sources."@webassemblyjs/leb128-1.9.1"
-      sources."@webassemblyjs/utf8-1.9.1"
-      sources."@webassemblyjs/wasm-edit-1.9.1"
-      sources."@webassemblyjs/wasm-gen-1.9.1"
-      sources."@webassemblyjs/wasm-opt-1.9.1"
-      sources."@webassemblyjs/wasm-parser-1.9.1"
-      sources."@webassemblyjs/wast-parser-1.9.1"
-      sources."@webassemblyjs/wast-printer-1.9.1"
+      sources."@types/json-schema-7.0.7"
+      sources."@types/node-14.14.22"
+      sources."@webassemblyjs/ast-1.11.0"
+      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
+      sources."@webassemblyjs/helper-api-error-1.11.0"
+      sources."@webassemblyjs/helper-buffer-1.11.0"
+      sources."@webassemblyjs/helper-numbers-1.11.0"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
+      sources."@webassemblyjs/helper-wasm-section-1.11.0"
+      sources."@webassemblyjs/ieee754-1.11.0"
+      sources."@webassemblyjs/leb128-1.11.0"
+      sources."@webassemblyjs/utf8-1.11.0"
+      sources."@webassemblyjs/wasm-edit-1.11.0"
+      sources."@webassemblyjs/wasm-gen-1.11.0"
+      sources."@webassemblyjs/wasm-opt-1.11.0"
+      sources."@webassemblyjs/wasm-parser-1.11.0"
+      sources."@webassemblyjs/wast-printer-1.11.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."acorn-8.0.4"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
-      sources."browserslist-4.16.0"
+      sources."browserslist-4.16.1"
       sources."buffer-from-1.1.1"
-      sources."caniuse-lite-1.0.30001173"
+      sources."caniuse-lite-1.0.30001179"
       sources."chrome-trace-event-1.0.2"
       sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.634"
-      sources."enhanced-resolve-5.4.1"
+      sources."electron-to-chromium-1.3.642"
+      sources."enhanced-resolve-5.7.0"
+      sources."es-module-lexer-0.3.26"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
@@ -108797,13 +108602,13 @@ in
       sources."jest-worker-26.6.2"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-traverse-0.4.1"
-      sources."loader-runner-4.1.0"
+      sources."loader-runner-4.2.0"
       sources."locate-path-6.0.0"
       sources."merge-stream-2.0.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."neo-async-2.6.2"
-      sources."node-releases-1.1.69"
+      sources."node-releases-1.1.70"
       sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."path-exists-4.0.0"
@@ -108823,9 +108628,9 @@ in
           sources."source-map-0.7.3"
         ];
       })
-      sources."terser-webpack-plugin-5.0.3"
+      sources."terser-webpack-plugin-5.1.1"
       sources."tslib-1.14.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."watchpack-2.1.0"
       sources."webpack-sources-2.2.0"
       sources."yocto-queue-0.1.0"
@@ -108833,7 +108638,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.";
-      homepage = https://github.com/webpack/webpack;
+      homepage = "https://github.com/webpack/webpack";
       license = "MIT";
     };
     production = true;
@@ -108843,16 +108648,18 @@ in
   webpack-cli = nodeEnv.buildNodePackage {
     name = "webpack-cli";
     packageName = "webpack-cli";
-    version = "4.3.1";
+    version = "4.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.3.1.tgz";
-      sha512 = "/F4+9QNZM/qKzzL9/06Am8NXIkGV+/NqQ62Dx7DSqudxxpAgBqYn6V7+zp+0Y7JuWksKUbczRY3wMTd+7Uj6OA==";
+      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.4.0.tgz";
+      sha512 = "/Qh07CXfXEkMu5S8wEpjuaw2Zj/CC0hf/qbTDp6N8N7JjdGuaOjZ7kttz+zhuJO/J5m7alQEhNk9lsc4rC6xgQ==";
     };
     dependencies = [
       sources."@discoveryjs/json-ext-0.5.2"
+      sources."@webpack-cli/configtest-1.0.0"
       sources."@webpack-cli/info-1.2.1"
-      sources."@webpack-cli/serve-1.2.1"
+      sources."@webpack-cli/serve-1.2.2"
       sources."ansi-colors-4.1.1"
+      sources."clone-deep-4.0.1"
       sources."colorette-1.2.1"
       sources."commander-6.2.1"
       sources."cross-spawn-7.0.3"
@@ -108868,10 +108675,12 @@ in
       sources."import-local-3.0.2"
       sources."interpret-2.2.0"
       sources."is-core-module-2.2.0"
+      sources."is-plain-object-2.0.4"
       sources."is-stream-2.0.0"
       sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      sources."kind-of-6.0.3"
       sources."locate-path-5.0.0"
-      sources."lodash-4.17.20"
       sources."merge-stream-2.0.0"
       sources."mimic-fn-2.1.0"
       sources."npm-run-path-4.0.1"
@@ -108887,13 +108696,15 @@ in
       sources."resolve-1.19.0"
       sources."resolve-cwd-3.0.0"
       sources."resolve-from-5.0.0"
+      sources."shallow-clone-3.0.1"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
       sources."strip-final-newline-2.0.0"
       sources."v8-compile-cache-2.2.0"
-      sources."webpack-merge-4.2.2"
+      sources."webpack-merge-5.7.3"
       sources."which-2.0.2"
+      sources."wildcard-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -108908,15 +108719,15 @@ in
   webpack-dev-server = nodeEnv.buildNodePackage {
     name = "webpack-dev-server";
     packageName = "webpack-dev-server";
-    version = "3.11.1";
+    version = "3.11.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz";
-      sha512 = "u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ==";
+      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz";
+      sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==";
     };
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -108968,7 +108779,7 @@ in
       sources."buffer-indexof-1.1.1"
       sources."bytes-3.0.0"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
       sources."chokidar-2.1.8"
       (sources."class-utils-0.3.6" // {
@@ -109045,8 +108856,6 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."errno-0.1.8"
-      sources."es-abstract-1.17.7"
-      sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."eventemitter3-4.0.7"
@@ -109161,7 +108970,6 @@ in
       sources."is-arguments-1.1.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -109180,7 +108988,6 @@ in
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.1"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.3"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
@@ -109232,11 +109039,9 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."obuf-1.1.2"
       sources."on-finished-2.3.0"
@@ -109290,7 +109095,7 @@ in
       })
       sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.0"
+      sources."regexp.prototype.flags-1.3.1"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -109411,8 +109216,6 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -109448,7 +109251,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -109464,7 +109267,7 @@ in
       sources."wbuf-1.7.3"
       (sources."webpack-dev-middleware-3.7.3" // {
         dependencies = [
-          sources."mime-2.4.7"
+          sources."mime-2.5.0"
         ];
       })
       sources."webpack-log-2.0.0"
@@ -109506,7 +109309,7 @@ in
       sources."@nodelib/fs.scandir-2.1.4"
       sources."@nodelib/fs.stat-2.0.4"
       sources."@nodelib/fs.walk-1.2.6"
-      sources."@types/json-schema-7.0.6"
+      sources."@types/json-schema-7.0.7"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
       sources."array-union-2.1.0"
@@ -109515,12 +109318,12 @@ in
       sources."dir-glob-3.0.1"
       sources."emojis-list-3.0.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.4"
+      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.10.0"
       sources."fill-range-7.0.1"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.1"
+      sources."globby-11.0.2"
       sources."ignore-5.1.8"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
@@ -109544,13 +109347,13 @@ in
       sources."serialize-javascript-5.0.1"
       sources."slash-3.0.0"
       sources."to-regex-range-5.0.1"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Copy files && directories with webpack";
-      homepage = https://github.com/webpack-contrib/copy-webpack-plugin;
+      homepage = "https://github.com/webpack-contrib/copy-webpack-plugin";
       license = "MIT";
     };
     production = true;
@@ -109577,7 +109380,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.39"
+      sources."@types/node-13.13.40"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -109718,7 +109521,7 @@ in
       sources."mdns-js-packet-0.2.0"
       sources."mediasource-2.4.0"
       sources."memory-chunk-store-1.3.0"
-      sources."mime-2.4.7"
+      sources."mime-2.5.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
@@ -109742,7 +109545,7 @@ in
       sources."nodebmc-0.0.7"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
-      sources."open-7.3.0"
+      sources."open-7.3.1"
       sources."package-json-versionify-1.0.4"
       (sources."parse-torrent-7.1.3" // {
         dependencies = [
@@ -109867,7 +109670,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "WebTorrent, the streaming torrent client. For the command line.";
-      homepage = https://webtorrent.io/;
+      homepage = "https://webtorrent.io";
       license = "MIT";
     };
     production = true;
@@ -109922,10 +109725,10 @@ in
   yaml-language-server = nodeEnv.buildNodePackage {
     name = "yaml-language-server";
     packageName = "yaml-language-server";
-    version = "0.13.0";
+    version = "0.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.0.tgz";
-      sha512 = "5FHW7dUAyIjEM3mRzIplE0pZut2K30cA+K7coaOxFxi82LTk/oiVLS4/AQFnOtGicSyoi4YOiRqpMZ04vgtuew==";
+      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.14.0.tgz";
+      sha512 = "aMNzS7YoMrgG0QdCMonlrFS/fPiag4zVs9cJ7RB0ZzwiALB2446UFXwy6SaTmKfJq353rjGJ+d7j1HHKSX/IqA==";
     };
     dependencies = [
       sources."agent-base-4.3.0"
@@ -109963,7 +109766,7 @@ in
       sources."vscode-languageserver-types-3.16.0"
       sources."vscode-nls-4.1.2"
       sources."vscode-uri-2.1.2"
-      sources."yaml-language-server-parser-0.1.1"
+      sources."yaml-language-server-parser-0.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -110010,7 +109813,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"
@@ -110039,11 +109842,7 @@ in
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
-      (sources."axios-0.18.1" // {
-        dependencies = [
-          sources."is-buffer-2.0.5"
-        ];
-      })
+      sources."axios-0.21.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -110136,7 +109935,7 @@ in
       sources."config-chain-1.1.12"
       sources."configstore-3.1.5"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.2"
+      sources."core-js-3.8.3"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-6.0.5"
@@ -110238,11 +110037,7 @@ in
       sources."find-up-2.1.0"
       sources."find-versions-2.0.0"
       sources."first-chunk-stream-2.0.0"
-      (sources."follow-redirects-1.5.10" // {
-        dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
+      sources."follow-redirects-1.13.1"
       sources."for-in-1.0.2"
       sources."foreachasync-3.0.0"
       sources."forever-agent-0.6.1"
@@ -110477,9 +110272,10 @@ in
       sources."mute-stream-0.0.7"
       sources."nanomatch-1.2.13"
       sources."nice-try-1.0.5"
+      sources."node-fetch-2.6.1"
       sources."normalize-package-data-2.5.0"
       sources."normalize-url-2.0.1"
-      sources."npm-api-1.0.0"
+      sources."npm-api-1.0.1"
       sources."npm-conf-1.1.3"
       (sources."npm-keyword-5.0.0" // {
         dependencies = [
@@ -110535,7 +110331,7 @@ in
       sources."p-try-1.0.0"
       sources."package-json-5.0.0"
       sources."pad-component-0.0.1"
-      sources."paged-request-2.0.1"
+      sources."paged-request-2.0.2"
       sources."parse-help-1.0.0"
       sources."parse-json-2.2.0"
       sources."pascalcase-0.1.1"
@@ -110815,7 +110611,7 @@ in
       sources."untildify-3.0.3"
       sources."unzip-response-2.0.1"
       sources."update-notifier-2.5.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
       sources."url-to-options-1.0.1"
@@ -110932,7 +110728,7 @@ in
           sources."p-limit-2.3.0"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
-          sources."parse-json-5.1.0"
+          sources."parse-json-5.2.0"
           (sources."path-type-3.0.0" // {
             dependencies = [
               sources."pify-3.0.0"
@@ -110962,7 +110758,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "CLI tool for running Yeoman generators";
-      homepage = http://yeoman.io/;
+      homepage = "http://yeoman.io";
       license = "BSD-2-Clause";
     };
     production = true;
diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix
index 027a981ea57..64326c6b216 100644
--- a/pkgs/development/web/newman/node-composition.nix
+++ b/pkgs/development/web/newman/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/development/web/newman/node-env.nix b/pkgs/development/web/newman/node-env.nix
index 04e3ee097fa..c2b723195b7 100644
--- a/pkgs/development/web/newman/node-env.nix
+++ b/pkgs/development/web/newman/node-env.nix
@@ -1,8 +1,11 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
+{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
 
 let
+  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
+  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
+
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -38,8 +41,8 @@ let
     };
 
   includeDependencies = {dependencies}:
-    stdenv.lib.optionalString (dependencies != [])
-      (stdenv.lib.concatMapStrings (dependency:
+    lib.optionalString (dependencies != [])
+      (lib.concatMapStrings (dependency:
         ''
           # Bundle the dependencies of the package
           mkdir -p node_modules
@@ -100,7 +103,7 @@ let
       cd "$DIR/${packageName}"
       ${includeDependencies { inherit dependencies; }}
       cd ..
-      ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
   pinpointDependencies = {dependencies, production}:
@@ -161,12 +164,12 @@ let
     ''
       node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
 
-      ${stdenv.lib.optionalString (dependencies != [])
+      ${lib.optionalString (dependencies != [])
         ''
           if [ -d node_modules ]
           then
               cd node_modules
-              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
               cd ..
           fi
         ''}
@@ -183,7 +186,7 @@ let
           cd "${packageName}"
           ${pinpointDependencies { inherit dependencies production; }}
           cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
       fi
     '';
 
@@ -242,8 +245,8 @@ let
       if(fs.existsSync("./package-lock.json")) {
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-          if(packageLock.lockfileVersion !== 1) {
-             process.stderr.write("Sorry, I only understand lock file version 1!\n");
+          if(![1, 2].includes(packageLock.lockfileVersion)) {
+             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
              process.exit(1);
           }
 
@@ -344,8 +347,8 @@ let
         cd "${packageName}"
         runHook preRebuild
 
-        ${stdenv.lib.optionalString bypassCache ''
-          ${stdenv.lib.optionalString reconstructLock ''
+        ${lib.optionalString bypassCache ''
+          ${lib.optionalString reconstructLock ''
             if [ -f package-lock.json ]
             then
                 echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
@@ -361,14 +364,14 @@ let
           node ${addIntegrityFieldsScript}
         ''}
 
-        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
 
         if [ "''${dontNpmInstall-}" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
 
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
         fi
     '';
 
@@ -396,8 +399,8 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
-        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+        ++ lib.optional (stdenv.isLinux) utillinux
+        ++ lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
       inherit nodejs;
@@ -445,8 +448,8 @@ let
       '';
     } // extraArgs);
 
-  # Builds a development shell
-  buildNodeShell =
+  # Builds a node environment (a node_modules folder and a set of binaries)
+  buildNodeDependencies =
     { name
     , packageName
     , version
@@ -465,13 +468,13 @@ let
 
     let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-
-      nodeDependencies = stdenv.mkDerivation ({
+    in
+      stdenv.mkDerivation ({
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
-          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+          ++ lib.optional (stdenv.isLinux) utillinux
+          ++ lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
         inherit dontStrip; # Stripping may fail a build for some package deployments
@@ -491,7 +494,7 @@ let
           # Create fake package.json to make the npm commands work properly
           cp ${src}/package.json .
           chmod 644 package.json
-          ${stdenv.lib.optionalString bypassCache ''
+          ${lib.optionalString bypassCache ''
             if [ -f ${src}/package-lock.json ]
             then
                 cp ${src}/package-lock.json .
@@ -500,23 +503,44 @@ let
 
           # Go to the parent folder to make sure that all packages are pinpointed
           cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
 
           ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
 
           # Expose the executables that were installed
           cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
 
           mv ${packageName} lib
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
       } // extraArgs);
+
+  # Builds a development shell
+  buildNodeShell =
+    { name
+    , packageName
+    , version
+    , src
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , reconstructLock ? false
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
+    let
+      nodeDependencies = buildNodeDependencies args;
     in
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -529,14 +553,15 @@ let
 
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
-      shellHook = stdenv.lib.optionalString (dependencies != []) ''
+      shellHook = lib.optionalString (dependencies != []) ''
         export NODE_PATH=${nodeDependencies}/lib/node_modules
         export PATH="${nodeDependencies}/bin:$PATH"
       '';
     };
 in
 {
-  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
-  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
-  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
+  buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = lib.makeOverridable buildNodePackage;
+  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
+  buildNodeShell = lib.makeOverridable buildNodeShell;
 }
diff --git a/pkgs/development/web/newman/node-packages.nix b/pkgs/development/web/newman/node-packages.nix
index 680be3d499c..d97e5cb7383 100644
--- a/pkgs/development/web/newman/node-packages.nix
+++ b/pkgs/development/web/newman/node-packages.nix
@@ -1,61 +1,61 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/code-frame-7.10.4" = {
+    "@babel/code-frame-7.12.11" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";
-        sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
+        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
       };
     };
-    "@babel/core-7.12.3" = {
+    "@babel/core-7.12.10" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.3";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz";
-        sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz";
+        sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
       };
     };
-    "@babel/generator-7.12.5" = {
+    "@babel/generator-7.12.11" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.12.5";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
-        sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
+        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
       };
     };
-    "@babel/helper-function-name-7.10.4" = {
+    "@babel/helper-function-name-7.12.11" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
-        sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
+        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
       };
     };
-    "@babel/helper-get-function-arity-7.10.4" = {
+    "@babel/helper-get-function-arity-7.12.10" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
-        sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
+        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.12.1" = {
+    "@babel/helper-member-expression-to-functions-7.12.7" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz";
-        sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
+        sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
       };
     };
     "@babel/helper-module-imports-7.12.5" = {
@@ -76,22 +76,22 @@ let
         sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.10.4" = {
+    "@babel/helper-optimise-call-expression-7.12.10" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
-        sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
+        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
       };
     };
-    "@babel/helper-replace-supers-7.12.5" = {
+    "@babel/helper-replace-supers-7.12.11" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.12.5";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
-        sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
+        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
       };
     };
     "@babel/helper-simple-access-7.12.1" = {
@@ -103,22 +103,22 @@ let
         sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
       };
     };
-    "@babel/helper-split-export-declaration-7.11.0" = {
+    "@babel/helper-split-export-declaration-7.12.11" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.11.0";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
-        sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
+        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
       };
     };
-    "@babel/helper-validator-identifier-7.10.4" = {
+    "@babel/helper-validator-identifier-7.12.11" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
-      version = "7.10.4";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
-        sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
+        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
       };
     };
     "@babel/helpers-7.12.5" = {
@@ -139,49 +139,49 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.5" = {
+    "@babel/parser-7.12.11" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.5";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz";
-        sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
+        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
       };
     };
-    "@babel/template-7.10.4" = {
+    "@babel/template-7.12.7" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.10.4";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz";
-        sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
+        sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.12.5" = {
+    "@babel/traverse-7.12.12" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.5";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz";
-        sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
+        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
       };
     };
-    "@babel/types-7.12.6" = {
+    "@babel/types-7.12.12" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.6";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz";
-        sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
+        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
       };
     };
-    "@eslint/eslintrc-0.2.1" = {
+    "@eslint/eslintrc-0.3.0" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
-      version = "0.2.1";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
-        sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz";
+        sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==";
       };
     };
     "@istanbuljs/load-nyc-config-1.1.0" = {
@@ -220,13 +220,13 @@ let
         sha512 = "k57fzmAZ2PJGxfOA4SGR05ejorHbVAa/84Hxh/2nAztjNXc4ZjOm9NUIk6/Z6LCrBvJZqjRZbN8e/nROVUPVdg==";
       };
     };
-    "@sinonjs/commons-1.8.1" = {
+    "@sinonjs/commons-1.8.2" = {
       name = "_at_sinonjs_slash_commons";
       packageName = "@sinonjs/commons";
-      version = "1.8.1";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz";
-        sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==";
+        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz";
+        sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==";
       };
     };
     "@sinonjs/fake-timers-6.0.1" = {
@@ -238,22 +238,13 @@ let
         sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==";
       };
     };
-    "@sinonjs/formatio-5.0.1" = {
-      name = "_at_sinonjs_slash_formatio";
-      packageName = "@sinonjs/formatio";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz";
-        sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==";
-      };
-    };
-    "@sinonjs/samsam-5.2.0" = {
+    "@sinonjs/samsam-5.3.1" = {
       name = "_at_sinonjs_slash_samsam";
       packageName = "@sinonjs/samsam";
-      version = "5.2.0";
+      version = "5.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.2.0.tgz";
-        sha512 = "CaIcyX5cDsjcW/ab7HposFWzV1kC++4HNsfnEdFJa7cP1QIuILAKV+BgfeqRXhcnSAc76r/Rh/O5C+300BwUIw==";
+        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz";
+        sha512 = "1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==";
       };
     };
     "@sinonjs/text-encoding-0.7.1" = {
@@ -319,6 +310,15 @@ let
         sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
+    "ajv-7.0.3" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "7.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz";
+        sha512 = "R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==";
+      };
+    };
     "ansi-colors-4.1.1" = {
       name = "ansi-colors";
       packageName = "ansi-colors";
@@ -472,6 +472,15 @@ let
         sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==";
       };
     };
+    "array-back-5.0.0" = {
+      name = "array-back";
+      packageName = "array-back";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-back/-/array-back-5.0.0.tgz";
+        sha512 = "kgVWwJReZWmVuWOQKEOohXKJX+nD02JAZ54D1RRWlv8L0NebauKAaFxACKzB74RTclt1+WNz5KHaLRDAPZbDEw==";
+      };
+    };
     "array-uniq-1.0.3" = {
       name = "array-uniq";
       packageName = "array-uniq";
@@ -508,13 +517,13 @@ let
         sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==";
       };
     };
-    "astral-regex-1.0.0" = {
+    "astral-regex-2.0.0" = {
       name = "astral-regex";
       packageName = "astral-regex";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
-        sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
+        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz";
+        sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==";
       };
     };
     "async-1.0.0" = {
@@ -571,15 +580,6 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.10.1" = {
-      name = "aws4";
-      packageName = "aws4";
-      version = "1.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz";
-        sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==";
-      };
-    };
     "aws4-1.11.0" = {
       name = "aws4";
       packageName = "aws4";
@@ -598,13 +598,13 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base64-js-1.3.1" = {
+    "base64-js-1.5.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.3.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
-        sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
+        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
       };
     };
     "bcrypt-pbkdf-1.0.2" = {
@@ -616,13 +616,13 @@ let
         sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     };
-    "binary-extensions-2.1.0" = {
+    "binary-extensions-2.2.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
-        sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
+        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
       };
     };
     "bl-1.2.3" = {
@@ -1030,15 +1030,6 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
-    "commander-5.1.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz";
-        sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
-      };
-    };
     "commander-6.2.0" = {
       name = "commander";
       packageName = "commander";
@@ -1048,6 +1039,15 @@ let
         sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
       };
     };
+    "commander-6.2.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "6.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz";
+        sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
+      };
+    };
     "comment-parser-0.7.6" = {
       name = "comment-parser";
       packageName = "comment-parser";
@@ -1129,13 +1129,13 @@ let
         sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==";
       };
     };
-    "csv-parse-4.12.0" = {
+    "csv-parse-4.14.2" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "4.12.0";
+      version = "4.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.12.0.tgz";
-        sha512 = "wPQl3H79vWLPI8cgKFcQXl0NBgYYEqVnT1i6/So7OjMpsI540oD7p93r3w6fDSyPvwkTepG05F69/7AViX2lXg==";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.14.2.tgz";
+        sha512 = "YE2xlTKtM035/94llhgsp9qFQxGi47EkQJ1pZ+mLT/98GpIsbjkMGAb7Rmu9hNxVfYFOLf10hP+rPVqnoccLgw==";
       };
     };
     "cycle-1.0.3" = {
@@ -1174,13 +1174,13 @@ let
         sha1 = "32b4b3105e8861043a6f9ac755d80e542d365b31";
       };
     };
-    "debug-3.2.6" = {
+    "debug-3.2.7" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.6";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
-        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
+        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
     "debug-4.2.0" = {
@@ -1192,13 +1192,13 @@ let
         sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
       };
     };
-    "debug-4.3.0" = {
+    "debug-4.3.2" = {
       name = "debug";
       packageName = "debug";
-      version = "4.3.0";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz";
-        sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
+        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
       };
     };
     "decamelize-1.2.0" = {
@@ -1336,13 +1336,13 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domelementtype-2.0.2" = {
+    "domelementtype-2.1.0" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "2.0.2";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz";
-        sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
+        sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
       };
     };
     "domhandler-2.4.2" = {
@@ -1489,22 +1489,22 @@ let
         sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
       };
     };
-    "eslint-7.12.1" = {
+    "eslint-7.18.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.12.1";
+      version = "7.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz";
-        sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz";
+        sha512 = "fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==";
       };
     };
-    "eslint-plugin-jsdoc-30.7.6" = {
+    "eslint-plugin-jsdoc-30.7.13" = {
       name = "eslint-plugin-jsdoc";
       packageName = "eslint-plugin-jsdoc";
-      version = "30.7.6";
+      version = "30.7.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.6.tgz";
-        sha512 = "w18IOiS/9ahKgRfQOuHbce+EQYx3fwIkZhUZDEK+augNlhJkzgTSZkrBkzaflSbFNZ9/Tk4xzUABEaTbsBSzew==";
+        url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz";
+        sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==";
       };
     };
     "eslint-plugin-lodash-7.1.0" = {
@@ -1570,13 +1570,13 @@ let
         sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==";
       };
     };
-    "espree-7.3.0" = {
+    "espree-7.3.1" = {
       name = "espree";
       packageName = "espree";
-      version = "7.3.0";
+      version = "7.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz";
-        sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==";
+        url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz";
+        sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==";
       };
     };
     "esprima-4.0.1" = {
@@ -1705,13 +1705,13 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "file-entry-cache-5.0.1" = {
+    "file-entry-cache-6.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
-      version = "5.0.1";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
-        sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
+        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz";
+        sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==";
       };
     };
     "file-set-4.0.1" = {
@@ -1804,22 +1804,13 @@ let
         sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==";
       };
     };
-    "flat-cache-2.0.1" = {
+    "flat-cache-3.0.4" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "2.0.1";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz";
-        sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
-      };
-    };
-    "flatted-2.0.2" = {
-      name = "flatted";
-      packageName = "flatted";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz";
-        sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz";
+        sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==";
       };
     };
     "flatted-3.1.0" = {
@@ -1849,13 +1840,13 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "fromentries-1.3.1" = {
+    "fromentries-1.3.2" = {
       name = "fromentries";
       packageName = "fromentries";
-      version = "1.3.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.1.tgz";
-        sha512 = "w4t/zm2J+uAcrpeKyW0VmYiIs3aqe/xKQ+2qwazVNZSCklQHhaVjk6XzKw5GtImq5thgL0IVRjGRAOastb08RQ==";
+        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz";
+        sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==";
       };
     };
     "fs-constants-1.0.0" = {
@@ -2173,13 +2164,13 @@ let
         sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
       };
     };
-    "import-fresh-3.2.2" = {
+    "import-fresh-3.3.0" = {
       name = "import-fresh";
       packageName = "import-fresh";
-      version = "3.2.2";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
-        sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz";
+        sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
       };
     };
     "imurmurhash-0.1.4" = {
@@ -2254,13 +2245,13 @@ let
         sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
       };
     };
-    "is-core-module-2.0.0" = {
+    "is-core-module-2.2.0" = {
       name = "is-core-module";
       packageName = "is-core-module";
-      version = "2.0.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz";
-        sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==";
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
+        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
       };
     };
     "is-extglob-2.1.1" = {
@@ -2479,6 +2470,15 @@ let
         sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
       };
     };
+    "js-yaml-3.14.1" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
+        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
+      };
+    };
     "js2xmlparser-4.0.1" = {
       name = "js2xmlparser";
       packageName = "js2xmlparser";
@@ -2569,6 +2569,15 @@ let
         sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
       };
     };
+    "json-schema-traverse-1.0.0" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz";
+        sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==";
+      };
+    };
     "json-stable-stringify-without-jsonify-1.0.1" = {
       name = "json-stable-stringify-without-jsonify";
       packageName = "json-stable-stringify-without-jsonify";
@@ -2713,15 +2722,6 @@ let
         sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
       };
     };
-    "lodash-4.17.19" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz";
-        sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==";
-      };
-    };
     "lodash-4.17.20" = {
       name = "lodash";
       packageName = "lodash";
@@ -2857,6 +2857,15 @@ let
         sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
       };
     };
+    "lru-cache-6.0.0" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
+        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
+      };
+    };
     "make-dir-1.3.0" = {
       name = "make-dir";
       packageName = "make-dir";
@@ -2902,13 +2911,13 @@ let
         sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==";
       };
     };
-    "marked-1.2.0" = {
+    "marked-1.2.7" = {
       name = "marked";
       packageName = "marked";
-      version = "1.2.0";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz";
-        sha512 = "tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz";
+        sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==";
       };
     };
     "mdurl-1.0.1" = {
@@ -2920,13 +2929,13 @@ let
         sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
       };
     };
-    "mime-db-1.44.0" = {
+    "mime-db-1.45.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.44.0";
+      version = "1.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
-        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
+        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
       };
     };
     "mime-format-2.0.0" = {
@@ -2938,13 +2947,13 @@ let
         sha1 = "e29f8891e284d78270246f0050d6834bdbbe1332";
       };
     };
-    "mime-types-2.1.27" = {
+    "mime-types-2.1.28" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.27";
+      version = "2.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
-        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
+        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
       };
     };
     "minimatch-3.0.4" = {
@@ -3010,6 +3019,15 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
+    "ms-2.1.3" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
+      };
+    };
     "nanoid-3.1.12" = {
       name = "nanoid";
       packageName = "nanoid";
@@ -3046,13 +3064,13 @@ let
         sha512 = "bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==";
       };
     };
-    "nock-13.0.4" = {
+    "nock-13.0.6" = {
       name = "nock";
       packageName = "nock";
-      version = "13.0.4";
+      version = "13.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nock/-/nock-13.0.4.tgz";
-        sha512 = "alqTV8Qt7TUbc74x1pKRLSENzfjp4nywovcJgi/1aXDiUxXdt7TkruSTF5MDWPP7UoPVgea4F9ghVdmX0xxnSA==";
+        url = "https://registry.npmjs.org/nock/-/nock-13.0.6.tgz";
+        sha512 = "W81UZ1Tv21SWDZcA8Lu9LXYVl2gO9ADY5GadC6gFV9690h4TXz0oCkEoMckN/sPMHkDA79Ka9dXga9Mt1+j+Sg==";
       };
     };
     "node-oauth1-1.3.0" = {
@@ -3172,13 +3190,13 @@ let
         sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
       };
     };
-    "p-limit-3.0.2" = {
+    "p-limit-3.1.0" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "3.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz";
-        sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz";
+        sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==";
       };
     };
     "p-locate-3.0.0" = {
@@ -3379,22 +3397,22 @@ let
         sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
       };
     };
-    "postman-collection-3.6.8" = {
+    "postman-collection-3.6.9" = {
       name = "postman-collection";
       packageName = "postman-collection";
-      version = "3.6.8";
+      version = "3.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.8.tgz";
-        sha512 = "TNPaK2dpVRhttUFo/WN0ReopXEtuSQMktwcvwJbQ0z8K+5hftvyx2ia40xgg9qFl/Ra78qoNTUmLL1s3lRqLMg==";
+        url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.9.tgz";
+        sha512 = "R3A4tM/Ll6ekkfsXqqefR2r/jSyubXc9Pa/DQSbocEUKzdT3QMMb0QR5SHNjDuR1qE+bywC5dyD2FO2+DFXJ6w==";
       };
     };
-    "postman-collection-transformer-3.3.3" = {
+    "postman-collection-transformer-4.0.0" = {
       name = "postman-collection-transformer";
       packageName = "postman-collection-transformer";
-      version = "3.3.3";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-collection-transformer/-/postman-collection-transformer-3.3.3.tgz";
-        sha512 = "Ra0hfljwB6xnGJ7a638K0TkXTf5BuwGNo1Ahpa9ECehOTOlUFisE8dqX5VZl04QGbpvN5nmr0rwrtLXtK53Abg==";
+        url = "https://registry.npmjs.org/postman-collection-transformer/-/postman-collection-transformer-4.0.0.tgz";
+        sha512 = "AGNGiSvMR7uJpuf2PpYbteYTsE/xsutyuUTaIRCcBhw8h0PS4vyQHua15uNB+PRaNsV8wKFm30T6z23yUg0rKg==";
       };
     };
     "postman-jsdoc-theme-0.0.3" = {
@@ -3406,40 +3424,40 @@ let
         sha1 = "60e4fbf3b2175f772520b3c978c07a8bd32b5829";
       };
     };
-    "postman-request-2.88.1-postman.27" = {
+    "postman-request-2.88.1-postman.28" = {
       name = "postman-request";
       packageName = "postman-request";
-      version = "2.88.1-postman.27";
+      version = "2.88.1-postman.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.27.tgz";
-        sha512 = "4Qc7p3/cbp5S4Q6LcOzJ+K5N7loWDKjW0S9hj8M2AMJDUVcFUbdgvQb6ZfTERz2+34xP9ByCy7VhdnNCATe/bA==";
+        url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.28.tgz";
+        sha512 = "QjhC9tIuHZTlYJafzCz7u+Nq57NgtOhJmt94RjcNyzpIts1QbihmAgYm0OhNoqcOIU91sNi2aYw2PCyAJR3kcQ==";
       };
     };
-    "postman-runtime-7.26.8" = {
+    "postman-runtime-7.26.10" = {
       name = "postman-runtime";
       packageName = "postman-runtime";
-      version = "7.26.8";
+      version = "7.26.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.8.tgz";
-        sha512 = "ZMUZ7mQ2SMOX/C/ntgx2SAfRt3VV6wOy+aLyWbAqpQPo5Jfodxwv9QhxGj3S2km+IYzO6BT1luzE8X8fr2UafA==";
+        url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.10.tgz";
+        sha512 = "rYrSF/G0FoWHvOfbEuKVAgKYU8Nl6ow4+iYfdpRfJuTNcrHmfsdumzzdRJ8n0ZY0awAyrrtcAUr/NvSfdof3qA==";
       };
     };
-    "postman-sandbox-4.0.0" = {
+    "postman-sandbox-4.0.1" = {
       name = "postman-sandbox";
       packageName = "postman-sandbox";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.0.tgz";
-        sha512 = "0j1VCDa5MHMTfZqv2XSYUyn+hgT9izoRdGFAvjtHCH+i+2TP1KxqXzjxXzOdx1pt26wpl9APdJ2hKKFpx9UlrQ==";
+        url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.1.tgz";
+        sha512 = "m0Jw95y5kzSdCY3yWf/hZlkqYxRyBG5sxqiI2D/48nKiHnYLkyMSHErRDJbMj7K4tjXBXn+BKWpWnRsf+iBdlw==";
       };
     };
-    "postman-url-encoder-3.0.0" = {
+    "postman-url-encoder-3.0.1" = {
       name = "postman-url-encoder";
       packageName = "postman-url-encoder";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.0.tgz";
-        sha512 = "bk5wus5/5Ei9pbh+sQXaAxS5n4ZwiNAaIA8VBvRcXP6QyKcue2yF6xk1HqdtaZoH1G8+6509SVeOBojoFQ7nrA==";
+        url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.1.tgz";
+        sha512 = "dMPqXnkDlstM2Eya+Gw4MIGWEan8TzldDcUKZIhZUsJ/G5JjubfQPhFhVWKzuATDMvwvrWbSjF+8VmAvbu6giw==";
       };
     };
     "prelude-ls-1.2.1" = {
@@ -3712,6 +3730,15 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
+    "require-from-string-2.0.2" = {
+      name = "require-from-string";
+      packageName = "require-from-string";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz";
+        sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==";
+      };
+    };
     "require-main-filename-2.0.0" = {
       name = "require-main-filename";
       packageName = "require-main-filename";
@@ -3730,13 +3757,13 @@ let
         sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==";
       };
     };
-    "resolve-1.18.1" = {
+    "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.18.1";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz";
-        sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
       };
     };
     "resolve-from-4.0.0" = {
@@ -3766,15 +3793,6 @@ let
         sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
       };
     };
-    "rimraf-2.6.3" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
-        sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
-      };
-    };
     "rimraf-3.0.2" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3856,13 +3874,13 @@ let
         sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
       };
     };
-    "semver-7.3.2" = {
+    "semver-7.3.4" = {
       name = "semver";
       packageName = "semver";
-      version = "7.3.2";
+      version = "7.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz";
-        sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
+        sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
       };
     };
     "serialised-error-1.1.3" = {
@@ -3946,31 +3964,31 @@ let
         sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
-    "sinon-9.2.1" = {
+    "sinon-9.2.3" = {
       name = "sinon";
       packageName = "sinon";
-      version = "9.2.1";
+      version = "9.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sinon/-/sinon-9.2.1.tgz";
-        sha512 = "naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w==";
+        url = "https://registry.npmjs.org/sinon/-/sinon-9.2.3.tgz";
+        sha512 = "m+DyAWvqVHZtjnjX/nuShasykFeiZ+nPuEfD4G3gpvKGkXRhkF/6NSt2qN2FjZhfrcHXFzUzI+NLnk+42fnLEw==";
       };
     };
-    "slice-ansi-2.1.0" = {
+    "slice-ansi-4.0.0" = {
       name = "slice-ansi";
       packageName = "slice-ansi";
-      version = "2.1.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz";
-        sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
+        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz";
+        sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==";
       };
     };
-    "sort-array-4.1.2" = {
+    "sort-array-4.1.3" = {
       name = "sort-array";
       packageName = "sort-array";
-      version = "4.1.2";
+      version = "4.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sort-array/-/sort-array-4.1.2.tgz";
-        sha512 = "G5IUpM+OcVnyaWHMv84Y/RQYiFQoSu6eUtJZu840iM6nR7zeY/eOGny2epkr5VKqCGDkOj3UBzOluDZ7hFpljA==";
+        url = "https://registry.npmjs.org/sort-array/-/sort-array-4.1.3.tgz";
+        sha512 = "6auiM0DNob/zF+7Ae/SM4BFL5D7DPK/HVcllhVu5V+FgoCPs0A6b6ZwJDuvJpXQgFpxqLZUOD2kdxqO4Z59dkg==";
       };
     };
     "source-map-0.5.7" = {
@@ -4018,13 +4036,13 @@ let
         sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.6" = {
+    "spdx-license-ids-3.0.7" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.6";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
-        sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
+        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
       };
     };
     "split-ca-1.0.1" = {
@@ -4270,13 +4288,13 @@ let
         sha1 = "b6f9a900d496a57f02408f22198c109dda063041";
       };
     };
-    "table-5.4.6" = {
+    "table-6.0.7" = {
       name = "table";
       packageName = "table";
-      version = "5.4.6";
+      version = "6.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz";
-        sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
+        url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz";
+        sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==";
       };
     };
     "table-layout-0.4.5" = {
@@ -4522,13 +4540,13 @@ let
         sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==";
       };
     };
-    "uglify-js-3.11.5" = {
+    "uglify-js-3.12.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.11.5";
+      version = "3.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz";
-        sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
+        sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
       };
     };
     "underscore-1.10.2" = {
@@ -4549,13 +4567,13 @@ let
         sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
       };
     };
-    "uri-js-4.4.0" = {
+    "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
-        sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
+        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     };
     "utcstring-0.1.0" = {
@@ -4729,15 +4747,6 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "write-1.0.3" = {
-      name = "write";
-      packageName = "write";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz";
-        sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==";
-      };
-    };
     "write-file-atomic-3.0.3" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -4801,13 +4810,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.0" = {
+    "y18n-4.0.1" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
+        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
       };
     };
     "yallist-2.1.2" = {
@@ -4819,6 +4828,15 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
+    "yallist-4.0.0" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
+        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
+      };
+    };
     "yargs-13.3.2" = {
       name = "yargs";
       packageName = "yargs";
@@ -4864,55 +4882,67 @@ let
         sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==";
       };
     };
+    "yocto-queue-0.1.0" = {
+      name = "yocto-queue";
+      packageName = "yocto-queue";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz";
+        sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==";
+      };
+    };
   };
 in
 {
   newman = nodeEnv.buildNodePackage {
     name = "newman";
     packageName = "newman";
-    version = "5.2.1";
+    version = "5.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/newman/-/newman-5.2.1.tgz";
-      sha512 = "kEuTMQCiORHZFx92sPVih8RHsJ40JxgxvlsrUe6MFXLQg2/UrO1KaUQCDabTy41tOu0a+dx6Mtg+x+uK1rCPcA==";
+      url = "https://registry.npmjs.org/newman/-/newman-5.2.2.tgz";
+      sha512 = "aRkh8eeRkKBlwxwBSdYQFZVLvSNMfRDmwPUfddlYR6PwZVKwukmoJmo9QTkRmo6vehgMmt2RTVkfwIIp73X1gg==";
     };
     dependencies = [
-      sources."@babel/code-frame-7.10.4"
-      (sources."@babel/core-7.12.3" // {
+      sources."@babel/code-frame-7.12.11"
+      (sources."@babel/core-7.12.10" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
           sources."semver-5.7.1"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.12.5" // {
+      (sources."@babel/generator-7.12.11" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
-      sources."@babel/helper-function-name-7.10.4"
-      sources."@babel/helper-get-function-arity-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-function-name-7.12.11"
+      sources."@babel/helper-get-function-arity-7.12.10"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.10.4"
-      sources."@babel/helper-replace-supers-7.12.5"
+      sources."@babel/helper-optimise-call-expression-7.12.10"
+      sources."@babel/helper-replace-supers-7.12.11"
       sources."@babel/helper-simple-access-7.12.1"
-      sources."@babel/helper-split-export-declaration-7.11.0"
-      sources."@babel/helper-validator-identifier-7.10.4"
+      sources."@babel/helper-split-export-declaration-7.12.11"
+      sources."@babel/helper-validator-identifier-7.12.11"
       sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.5"
-      sources."@babel/template-7.10.4"
-      (sources."@babel/traverse-7.12.5" // {
+      sources."@babel/parser-7.12.11"
+      sources."@babel/template-7.12.7"
+      (sources."@babel/traverse-7.12.12" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.2"
           sources."globals-11.12.0"
+          sources."ms-2.1.2"
         ];
       })
-      sources."@babel/types-7.12.6"
-      (sources."@eslint/eslintrc-0.2.1" // {
+      sources."@babel/types-7.12.12"
+      (sources."@eslint/eslintrc-0.3.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
       (sources."@istanbuljs/load-nyc-config-1.1.0" // {
@@ -4926,10 +4956,9 @@ in
       sources."@istanbuljs/schema-0.1.2"
       sources."@postman/form-data-3.1.1"
       sources."@postman/tunnel-agent-0.6.3"
-      sources."@sinonjs/commons-1.8.1"
+      sources."@sinonjs/commons-1.8.2"
       sources."@sinonjs/fake-timers-6.0.1"
-      sources."@sinonjs/formatio-5.0.1"
-      sources."@sinonjs/samsam-5.2.0"
+      sources."@sinonjs/samsam-5.3.1"
       sources."@sinonjs/text-encoding-0.7.1"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."JSONStream-1.3.2"
@@ -4954,15 +4983,15 @@ in
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."assertion-error-1.1.0"
-      sources."astral-regex-1.0.0"
+      sources."astral-regex-2.0.0"
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.1.0"
+      sources."binary-extensions-2.2.0"
       (sources."bl-1.2.3" // {
         dependencies = [
           (sources."readable-stream-2.3.7" // {
@@ -5037,7 +5066,7 @@ in
           sources."array-back-2.0.0"
         ];
       })
-      sources."commander-6.2.0"
+      sources."commander-6.2.1"
       sources."comment-parser-0.7.6"
       sources."common-sequence-2.0.0"
       sources."commondir-1.0.1"
@@ -5061,12 +5090,12 @@ in
       })
       sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
-      sources."csv-parse-4.12.0"
+      sources."csv-parse-4.14.2"
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
       sources."date-format-0.0.2"
       sources."dbug-0.4.2"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."decamelize-1.2.0"
       sources."deep-eql-3.0.1"
       sources."deep-extend-0.6.0"
@@ -5097,7 +5126,7 @@ in
       sources."doctrine-3.0.0"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.0.2"
+          sources."domelementtype-2.1.0"
           sources."entities-2.1.0"
         ];
       })
@@ -5108,7 +5137,9 @@ in
       (sources."editorconfig-0.15.3" // {
         dependencies = [
           sources."commander-2.20.3"
+          sources."lru-cache-4.1.5"
           sources."semver-5.7.1"
+          sources."yallist-2.1.2"
         ];
       })
       sources."emoji-regex-8.0.0"
@@ -5118,20 +5149,22 @@ in
       sources."es6-error-4.1.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.12.1" // {
+      (sources."eslint-7.18.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
-          sources."debug-4.3.0"
+          sources."debug-4.3.2"
           sources."has-flag-4.0.0"
+          sources."ms-2.1.2"
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."eslint-plugin-jsdoc-30.7.6" // {
+      (sources."eslint-plugin-jsdoc-30.7.13" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
       sources."eslint-plugin-lodash-7.1.0"
@@ -5144,7 +5177,7 @@ in
         ];
       })
       sources."eslint-visitor-keys-2.0.0"
-      (sources."espree-7.3.0" // {
+      (sources."espree-7.3.1" // {
         dependencies = [
           sources."eslint-visitor-keys-1.3.0"
         ];
@@ -5170,7 +5203,7 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."file-entry-cache-5.0.1"
+      sources."file-entry-cache-6.0.0"
       sources."file-set-4.0.1"
       sources."file-type-3.9.0"
       sources."filesize-6.1.0"
@@ -5188,15 +5221,11 @@ in
       })
       sources."find-up-5.0.0"
       sources."flat-5.0.2"
-      (sources."flat-cache-2.0.1" // {
-        dependencies = [
-          sources."flatted-2.0.2"
-        ];
-      })
+      sources."flat-cache-3.0.4"
       sources."flatted-3.1.0"
       sources."foreground-child-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."fromentries-1.3.1"
+      sources."fromentries-1.3.2"
       sources."fs-constants-1.0.0"
       sources."fs-then-native-2.0.0"
       sources."fs.realpath-1.0.0"
@@ -5234,7 +5263,7 @@ in
       sources."httpreq-0.4.24"
       sources."iconv-lite-0.6.2"
       sources."ignore-4.0.6"
-      (sources."import-fresh-3.2.2" // {
+      (sources."import-fresh-3.3.0" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -5255,7 +5284,7 @@ in
       sources."interpret-1.4.0"
       sources."ip-regex-2.1.0"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.2.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
@@ -5277,7 +5306,6 @@ in
       (sources."istanbul-lib-processinfo-2.0.2" // {
         dependencies = [
           sources."make-dir-3.1.0"
-          sources."rimraf-3.0.2"
           sources."semver-6.3.0"
         ];
       })
@@ -5291,13 +5319,14 @@ in
       })
       (sources."istanbul-lib-source-maps-4.0.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
       sources."istanbul-reports-3.0.2"
       sources."js-sha512-0.8.0"
       sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.0"
+      sources."js-yaml-3.14.1"
       sources."js2xmlparser-4.0.1"
       sources."jsbn-0.1.1"
       (sources."jsdoc-3.6.6" // {
@@ -5354,7 +5383,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."lru-cache-4.1.5"
+      sources."lru-cache-6.0.0"
       sources."make-dir-1.3.0"
       (sources."markdown-it-10.0.0" // {
         dependencies = [
@@ -5362,11 +5391,11 @@ in
         ];
       })
       sources."markdown-it-anchor-5.3.0"
-      sources."marked-1.2.0"
+      sources."marked-1.2.7"
       sources."mdurl-1.0.1"
-      sources."mime-db-1.44.0"
+      sources."mime-db-1.45.0"
       sources."mime-format-2.0.0"
-      sources."mime-types-2.1.27"
+      sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdirp-1.0.4"
@@ -5376,17 +5405,20 @@ in
           sources."debug-4.2.0"
           sources."escape-string-regexp-4.0.0"
           sources."has-flag-4.0.0"
+          sources."js-yaml-3.14.0"
+          sources."ms-2.1.2"
           sources."supports-color-7.2.0"
         ];
       })
-      sources."ms-2.1.2"
+      sources."ms-2.1.3"
       sources."nanoid-3.1.12"
       sources."natural-compare-1.4.0"
       sources."neo-async-2.6.2"
       sources."nise-4.0.4"
-      (sources."nock-13.0.4" // {
+      (sources."nock-13.0.6" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.2"
+          sources."ms-2.1.2"
         ];
       })
       sources."node-oauth1-1.3.0"
@@ -5404,7 +5436,6 @@ in
           sources."make-dir-3.1.0"
           sources."p-limit-2.3.0"
           sources."p-locate-4.1.0"
-          sources."rimraf-3.0.2"
           sources."semver-6.3.0"
           sources."wrap-ansi-6.2.0"
           sources."yargs-15.4.1"
@@ -5418,7 +5449,7 @@ in
       sources."object-to-spawn-args-2.0.0"
       sources."once-1.4.0"
       sources."optionator-0.9.1"
-      sources."p-limit-3.0.2"
+      sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."p-map-3.0.0"
       sources."p-try-2.2.0"
@@ -5460,27 +5491,25 @@ in
           sources."supports-color-6.1.0"
         ];
       })
-      sources."postman-collection-3.6.8"
-      (sources."postman-collection-transformer-3.3.3" // {
+      sources."postman-collection-3.6.9"
+      (sources."postman-collection-transformer-4.0.0" // {
         dependencies = [
-          sources."commander-5.1.0"
-          sources."lodash-4.17.19"
+          sources."commander-6.2.0"
         ];
       })
       sources."postman-jsdoc-theme-0.0.3"
-      (sources."postman-request-2.88.1-postman.27" // {
+      (sources."postman-request-2.88.1-postman.28" // {
         dependencies = [
           sources."tough-cookie-2.5.0"
         ];
       })
-      (sources."postman-runtime-7.26.8" // {
+      (sources."postman-runtime-7.26.10" // {
         dependencies = [
           sources."async-2.6.3"
-          sources."aws4-1.10.1"
         ];
       })
-      sources."postman-sandbox-4.0.0"
-      sources."postman-url-encoder-3.0.0"
+      sources."postman-sandbox-4.0.1"
+      sources."postman-url-encoder-3.0.1"
       sources."prelude-ls-1.2.1"
       sources."pretty-ms-7.0.1"
       sources."process-nextick-args-2.0.1"
@@ -5518,18 +5547,19 @@ in
       sources."regextras-0.7.1"
       sources."release-zalgo-1.0.0"
       sources."require-directory-2.1.1"
+      sources."require-from-string-2.0.2"
       sources."require-main-filename-2.0.0"
       sources."requizzle-0.2.3"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-5.0.0"
       sources."ret-0.1.15"
-      sources."rimraf-2.6.3"
+      sources."rimraf-3.0.2"
       sources."safe-buffer-5.2.1"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sanitize-html-1.20.1"
       sources."sax-1.2.4"
-      sources."semver-7.3.2"
+      sources."semver-7.3.4"
       (sources."serialised-error-1.1.3" // {
         dependencies = [
           sources."stack-trace-0.0.9"
@@ -5543,19 +5573,22 @@ in
       sources."shelljs-0.8.4"
       sources."sigmund-1.0.1"
       sources."signal-exit-3.0.3"
-      (sources."sinon-9.2.1" // {
+      (sources."sinon-9.2.3" // {
         dependencies = [
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."slice-ansi-2.1.0" // {
+      (sources."slice-ansi-4.0.0" // {
         dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
         ];
       })
-      (sources."sort-array-4.1.2" // {
+      (sources."sort-array-4.1.3" // {
         dependencies = [
+          sources."array-back-5.0.0"
           sources."typical-6.0.1"
         ];
       })
@@ -5563,13 +5596,12 @@ in
       (sources."spawn-wrap-2.0.0" // {
         dependencies = [
           sources."make-dir-3.1.0"
-          sources."rimraf-3.0.2"
           sources."semver-6.3.0"
         ];
       })
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.6"
+      sources."spdx-license-ids-3.0.7"
       sources."split-ca-1.0.1"
       sources."sprintf-js-1.0.3"
       sources."srcset-1.0.0"
@@ -5590,13 +5622,10 @@ in
       sources."strip-json-comments-3.1.1"
       sources."supports-color-5.5.0"
       sources."symbol-0.3.1"
-      (sources."table-5.4.6" // {
+      (sources."table-6.0.7" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."emoji-regex-7.0.3"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."ajv-7.0.3"
+          sources."json-schema-traverse-1.0.0"
         ];
       })
       (sources."table-layout-0.4.5" // {
@@ -5639,9 +5668,9 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."typical-2.6.1"
       sources."uc.micro-1.0.6"
-      sources."uglify-js-3.11.5"
+      sources."uglify-js-3.12.5"
       sources."underscore-1.7.0"
-      sources."uri-js-4.4.0"
+      sources."uri-js-4.4.1"
       sources."utcstring-0.1.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -5679,11 +5708,6 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      (sources."write-1.0.3" // {
-        dependencies = [
-          sources."mkdirp-0.5.5"
-        ];
-      })
       sources."write-file-atomic-3.0.3"
       (sources."xml2js-0.4.23" // {
         dependencies = [
@@ -5693,8 +5717,8 @@ in
       sources."xmlbuilder-15.1.1"
       sources."xmlcreate-2.0.3"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.0"
-      sources."yallist-2.1.2"
+      sources."y18n-4.0.1"
+      sources."yallist-4.0.0"
       (sources."yargs-13.3.2" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -5716,11 +5740,12 @@ in
           sources."decamelize-4.0.0"
         ];
       })
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command-line companion utility for Postman";
-      homepage = https://github.com/postmanlabs/newman;
+      homepage = "https://github.com/postmanlabs/newman";
       license = "Apache-2.0";
     };
     production = false;
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 4964056055e..4dbaae6c90d 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -1,43 +1,34 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@sinonjs/commons-1.7.1" = {
+    "@sinonjs/commons-1.8.2" = {
       name = "_at_sinonjs_slash_commons";
       packageName = "@sinonjs/commons";
-      version = "1.7.1";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz";
-        sha512 = "Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ==";
+        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz";
+        sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==";
       };
     };
-    "@sinonjs/fake-timers-6.0.0" = {
+    "@sinonjs/fake-timers-6.0.1" = {
       name = "_at_sinonjs_slash_fake-timers";
       packageName = "@sinonjs/fake-timers";
-      version = "6.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.0.tgz";
-        sha512 = "atR1J/jRXvQAb47gfzSK8zavXy7BcpnYq21ALon0U99etu99vsir0trzIO3wpeLtW+LLVY6X7EkfVTbjGSH8Ww==";
+        url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz";
+        sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==";
       };
     };
-    "@sinonjs/formatio-5.0.1" = {
-      name = "_at_sinonjs_slash_formatio";
-      packageName = "@sinonjs/formatio";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz";
-        sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==";
-      };
-    };
-    "@sinonjs/samsam-5.0.3" = {
+    "@sinonjs/samsam-5.3.1" = {
       name = "_at_sinonjs_slash_samsam";
       packageName = "@sinonjs/samsam";
-      version = "5.0.3";
+      version = "5.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.0.3.tgz";
-        sha512 = "QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==";
+        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz";
+        sha512 = "1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==";
       };
     };
     "@sinonjs/text-encoding-0.7.1" = {
@@ -49,13 +40,22 @@ let
         sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==";
       };
     };
+    "@ungap/promise-all-settled-1.1.2" = {
+      name = "_at_ungap_slash_promise-all-settled";
+      packageName = "@ungap/promise-all-settled";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz";
+        sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==";
+      };
+    };
     "JSONStream-1.3.5" = {
       name = "JSONStream";
       packageName = "JSONStream";
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz";
-        sha512 = "2lyrcp8yh09p0f000ng5q5r5xwm464cx60mnyjlaw9f0as75ifl27a22cyk61zpa7zilg9k5crblj9lbbnnsi42ndymbwcqsfwaps0k";
+        sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==";
       };
     };
     "abbrev-1.1.1" = {
@@ -64,16 +64,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
-    "acorn-7.1.1" = {
+    "acorn-7.4.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "7.1.1";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz";
-        sha512 = "29c8jlhwnfbnqa2s1v593lcpksv4hl56lywss4gy6w0mwmhx4ydf2n7var8bhcf39nm9asph0ybnf1hkw0s0j91qi7r99ir01v7pmv9";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
+        sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
       };
     };
     "acorn-node-1.8.2" = {
@@ -82,16 +82,16 @@ let
       version = "1.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz";
-        sha512 = "3ja2k5v6p53920jdprvx0p83ycv68fdphfdmr72xmvg2450i37chn1f7mlvfxv4q8i14ypbnsbbyirii033qa6jkvcg5fa3r5z7wszj";
+        sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==";
       };
     };
-    "acorn-walk-7.1.1" = {
+    "acorn-walk-7.2.0" = {
       name = "acorn-walk";
       packageName = "acorn-walk";
-      version = "7.1.1";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz";
-        sha512 = "10s7pz9c2jqw7sjmkkwfb6kyyfgb7qqpmz2gc0fq9phhmfknyw029x1jbw0cwi47wbacpwkw65601arnid2l95lmz0xbzv6ddilznf1";
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz";
+        sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==";
       };
     };
     "adm-zip-0.2.1" = {
@@ -103,22 +103,13 @@ let
         sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
       };
     };
-    "ajv-6.12.0" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "6.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
-        sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g";
-      };
-    };
-    "ansi-colors-3.2.3" = {
+    "ansi-colors-4.1.1" = {
       name = "ansi-colors";
       packageName = "ansi-colors";
-      version = "3.2.3";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz";
-        sha512 = "2gpv8bq9jq550ygnnm5srza0w0lfg8mr8z39702l0rgxhf35sxmdzxpppvwcp50rpk0dgjz516nbkygm0fk4675kb9qsgb5x35cfh9c";
+        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz";
+        sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==";
       };
     };
     "ansi-regex-3.0.0" = {
@@ -136,7 +127,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm";
+        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
       };
     };
     "ansi-styles-3.2.1" = {
@@ -145,7 +136,16 @@ let
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
+        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+      };
+    };
+    "ansi-styles-4.3.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
+        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
       };
     };
     "anymatch-3.1.1" = {
@@ -154,7 +154,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz";
-        sha512 = "2776jrfn8kh9r6qhz6s43znnwvqmbqrjsch99hdv21j53sj4njyjhrya67drxk8y7hvi28mjvdjj277jy4qd2zfayrjli3cdbdkkkwq";
+        sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==";
       };
     };
     "argparse-1.0.10" = {
@@ -163,16 +163,16 @@ let
       version = "1.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
       };
     };
-    "asap-2.0.6" = {
-      name = "asap";
-      packageName = "asap";
-      version = "2.0.6";
+    "array-filter-1.0.0" = {
+      name = "array-filter";
+      packageName = "array-filter";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
-        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+        url = "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz";
+        sha1 = "baf79e62e6ef4c2a4c0b831232daffec251f9d83";
       };
     };
     "asn1-0.1.11" = {
@@ -184,22 +184,13 @@ let
         sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
       };
     };
-    "asn1-0.2.4" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
-        sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g";
-      };
-    };
-    "asn1.js-4.10.1" = {
+    "asn1.js-5.4.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.10.1";
+      version = "5.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
-        sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz";
+        sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
       };
     };
     "assert-1.5.0" = {
@@ -208,7 +199,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz";
-        sha512 = "1n2xh5m359gm4my50j2206n32q2h044lqrl8h122gjn41fizlrh32j1lj7wqfix1iblyvi7zvdgvzbf97f840lr17vfk8ph1imj0fqh";
+        sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==";
       };
     };
     "assert-plus-0.1.5" = {
@@ -220,15 +211,6 @@ let
         sha1 = "ee74009413002d84cec7219c6ac811812e723160";
       };
     };
-    "assert-plus-1.0.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
-        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
-      };
-    };
     "async-0.9.2" = {
       name = "async";
       packageName = "async";
@@ -238,13 +220,13 @@ let
         sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
       };
     };
-    "asynckit-0.4.0" = {
-      name = "asynckit";
-      packageName = "asynckit";
-      version = "0.4.0";
+    "available-typed-arrays-1.0.2" = {
+      name = "available-typed-arrays";
+      packageName = "available-typed-arrays";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
-        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+        url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz";
+        sha512 = "XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==";
       };
     };
     "aws-sign2-0.5.0" = {
@@ -256,24 +238,6 @@ let
         sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
       };
     };
-    "aws-sign2-0.7.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
-        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
-      };
-    };
-    "aws4-1.9.1" = {
-      name = "aws4";
-      packageName = "aws4";
-      version = "1.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
-        sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0";
-      };
-    };
     "balanced-match-1.0.0" = {
       name = "balanced-match";
       packageName = "balanced-match";
@@ -283,40 +247,40 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base64-js-1.3.1" = {
+    "base64-js-1.5.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.3.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
-        sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
+        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
       };
     };
-    "bcrypt-pbkdf-1.0.2" = {
-      name = "bcrypt-pbkdf";
-      packageName = "bcrypt-pbkdf";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
-        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
-      };
-    };
-    "binary-extensions-2.0.0" = {
+    "binary-extensions-2.2.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.0.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz";
-        sha512 = "2izzpdg2m0av5pzbv1zyjfi15ddz5yk1d4h9cilzc8z6pzq5abcicnm2xx4b2jdrjk2l4h3zfawsxhnbzlgvlv4700q5930k796s69y";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
+        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
       };
     };
-    "bn.js-4.11.8" = {
+    "bn.js-4.11.9" = {
       name = "bn.js";
       packageName = "bn.js";
-      version = "4.11.8";
+      version = "4.11.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
-        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz";
+        sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==";
+      };
+    };
+    "bn.js-5.1.3" = {
+      name = "bn.js";
+      packageName = "bn.js";
+      version = "5.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz";
+        sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==";
       };
     };
     "boom-0.4.2" = {
@@ -334,7 +298,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
     "braces-3.0.2" = {
@@ -343,7 +307,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
-        sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg";
+        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
       };
     };
     "brorand-1.1.0" = {
@@ -361,16 +325,16 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz";
-        sha512 = "1cav0iv5irfvilx6x14zbxil5m012hxan16cgyp9yjs6fqfg6fny2cdjimfwgil9ma8n4w8g8wv4yn843sz257p44vkbaz8qn1jxdks";
+        sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==";
       };
     };
-    "browser-resolve-1.11.3" = {
+    "browser-resolve-2.0.0" = {
       name = "browser-resolve";
       packageName = "browser-resolve";
-      version = "1.11.3";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz";
-        sha512 = "1slq1pnm0b2903am1rl17iczlsl08sq4rckkr5fgkchgzfac13kiibwdk08yy2m62lgir8dmj9d61vil8q0vrm1d2mzw1qn2vaf443v";
+        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz";
+        sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==";
       };
     };
     "browser-stdout-1.3.1" = {
@@ -379,7 +343,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
-        sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
+        sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
       };
     };
     "browserify-aes-1.2.0" = {
@@ -388,7 +352,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
-        sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v";
+        sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==";
       };
     };
     "browserify-cipher-1.0.1" = {
@@ -397,7 +361,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
-        sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h";
+        sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==";
       };
     };
     "browserify-des-1.0.2" = {
@@ -406,25 +370,25 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz";
-        sha512 = "3j1gv3firnsbjppm47ldxbav9rmh3plq026zn728wvhgf19i4r7kxzyyj7hpibhjv61lcm9i4b869yy90c8hfj7w8rmr17p2zbhwah6";
+        sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
       };
     };
-    "browserify-rsa-4.0.1" = {
+    "browserify-rsa-4.1.0" = {
       name = "browserify-rsa";
       packageName = "browserify-rsa";
-      version = "4.0.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
-        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz";
+        sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==";
       };
     };
-    "browserify-sign-4.0.4" = {
+    "browserify-sign-4.2.1" = {
       name = "browserify-sign";
       packageName = "browserify-sign";
-      version = "4.0.4";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
-        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
+        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz";
+        sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==";
       };
     };
     "browserify-zlib-0.2.0" = {
@@ -433,16 +397,16 @@ let
       version = "0.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
-        sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
+        sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
-    "buffer-5.5.0" = {
+    "buffer-5.2.1" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.5.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz";
-        sha512 = "9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz";
+        sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
       };
     };
     "buffer-from-1.1.1" = {
@@ -451,7 +415,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
-        sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri";
+        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
       };
     };
     "buffer-xor-1.0.3" = {
@@ -478,7 +442,16 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz";
-        sha512 = "0icxxn530vx1cwkygvk52k2l9brpv2mdbyk0j4hyr224b23vxvh131l2m1gljpfvsikzib3x2zyiy2xngjjfz9k9n68lvq4ram8dgg6";
+        sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==";
+      };
+    };
+    "call-bind-1.0.2" = {
+      name = "call-bind";
+      packageName = "call-bind";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
+        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
       };
     };
     "camelcase-5.3.1" = {
@@ -487,34 +460,34 @@ let
       version = "5.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
-        sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg";
+        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
-    "caseless-0.12.0" = {
-      name = "caseless";
-      packageName = "caseless";
-      version = "0.12.0";
+    "camelcase-6.2.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
-        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz";
+        sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
       };
     };
-    "chalk-2.4.2" = {
+    "chalk-4.1.0" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.4.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
-        sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j";
+        url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz";
+        sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==";
       };
     };
-    "chokidar-3.3.0" = {
+    "chokidar-3.4.3" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.3.0";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz";
-        sha512 = "3hbyi14x38mvx936wbajln4g1l8fcyi8fwvcrhf2jqn0yzcyda1d20q67k445j9bvs5kr7jdhd2s07srb2pnm7hxmjngp2k6wn8lsbl";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz";
+        sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
       };
     };
     "cipher-base-1.0.4" = {
@@ -523,7 +496,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
+        sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==";
       };
     };
     "cli-1.0.1" = {
@@ -541,16 +514,7 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
-        sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx";
-      };
-    };
-    "clone-2.1.2" = {
-      name = "clone";
-      packageName = "clone";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz";
-        sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
+        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
       };
     };
     "color-convert-1.9.3" = {
@@ -559,7 +523,16 @@ let
       version = "1.9.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
-        sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21";
+        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+      };
+    };
+    "color-convert-2.0.1" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz";
+        sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
       };
     };
     "color-name-1.1.3" = {
@@ -571,6 +544,15 @@ let
         sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
       };
     };
+    "color-name-1.1.4" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz";
+        sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
+      };
+    };
     "combine-source-map-0.8.0" = {
       name = "combine-source-map";
       packageName = "combine-source-map";
@@ -589,22 +571,13 @@ let
         sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
       };
     };
-    "combined-stream-1.0.8" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
-        sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm";
-      };
-    };
     "commander-2.20.3" = {
       name = "commander";
       packageName = "commander";
       version = "2.20.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
-        sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s";
+        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
     "concat-map-0.0.1" = {
@@ -622,7 +595,7 @@ let
       version = "1.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
-        sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
       };
     };
     "config-chain-1.1.12" = {
@@ -631,7 +604,7 @@ let
       version = "1.1.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz";
-        sha512 = "2hg7rni4gx8l765i8qzkp9dv69c8r06i8rxxkkkrsklbd8iz6ingxnp10r4fqqrm9jxy3gp8yp0lzpybwdf27kq49abkyxwrchqwmvb";
+        sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
       };
     };
     "console-browserify-1.1.0" = {
@@ -649,7 +622,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz";
-        sha512 = "168x7bp4xr522yw92himv9xv14q336ps1kkg79qcmarg3q4yzpd52pa8x8zgq11b6996f8053799k6365437si3pk85w5z4y8xiijb4";
+        sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==";
       };
     };
     "constants-browserify-1.0.0" = {
@@ -670,6 +643,15 @@ let
         sha1 = "4829c877e9fe49b3161f3bf3673888e204699860";
       };
     };
+    "copy-anything-2.0.1" = {
+      name = "copy-anything";
+      packageName = "copy-anything";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz";
+        sha512 = "lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==";
+      };
+    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -679,13 +661,13 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "create-ecdh-4.0.3" = {
+    "create-ecdh-4.0.4" = {
       name = "create-ecdh";
       packageName = "create-ecdh";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
-        sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r";
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz";
+        sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==";
       };
     };
     "create-hash-1.2.0" = {
@@ -694,7 +676,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
-        sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg";
+        sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==";
       };
     };
     "create-hmac-1.1.7" = {
@@ -703,7 +685,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
-        sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h";
+        sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
     "cryptiles-0.2.2" = {
@@ -721,7 +703,7 @@ let
       version = "3.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
-        sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz";
+        sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==";
       };
     };
     "ctype-0.5.3" = {
@@ -739,16 +721,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz";
-        sha512 = "182hz56w7yx6vplmlvvlqz57ckfvxch0nh5sj54074r7k3ydd8wwwajcgkvg7732hwgksm5b30jfr9c30wq8zq4f663gf9ap33isbjp";
-      };
-    };
-    "dashdash-1.14.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+        sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==";
       };
     };
     "date-now-0.1.4" = {
@@ -760,13 +733,22 @@ let
         sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
       };
     };
-    "debug-3.2.6" = {
+    "debug-3.2.7" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.6";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
-        sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
+        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
+      };
+    };
+    "debug-4.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz";
+        sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
       };
     };
     "decamelize-1.2.0" = {
@@ -778,13 +760,22 @@ let
         sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     };
+    "decamelize-4.0.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz";
+        sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==";
+      };
+    };
     "define-properties-1.1.3" = {
       name = "define-properties";
       packageName = "define-properties";
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
-        sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw";
+        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
       };
     };
     "defined-1.0.0" = {
@@ -805,22 +796,13 @@ let
         sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
       };
     };
-    "delayed-stream-1.0.0" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-      };
-    };
     "deps-sort-2.0.1" = {
       name = "deps-sort";
       packageName = "deps-sort";
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz";
-        sha512 = "1zsk235mlp9j7mkhw08fqx4rgn4r45mk4j54zf137nlyw4gs4irwwxjn6nllyv7jw30ihn1ad7xffg282zl394f52vqz9pr19fym2nn";
+        sha512 = "1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==";
       };
     };
     "des.js-1.0.1" = {
@@ -829,7 +811,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz";
-        sha512 = "085ljc5q2yk3jabd61p91n821q4prv13qalbfni9ybcb900b4mmcdnndi5b5prfs9wybp13asd13shlxgrbsgvyfx7nbgvby6jkhhj3";
+        sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==";
       };
     };
     "detective-5.2.0" = {
@@ -838,16 +820,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz";
-        sha512 = "0z7r2wfccs5i4n1v5ln5p5dkqvy3w97pmnl8kybcw1r7z1c067xr72nqn48j65nk435cpc261m6gdyfyhxjlqabs25bnlflx73hhaz9";
-      };
-    };
-    "diff-3.5.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";
-        sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3";
+        sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==";
       };
     };
     "diff-4.0.2" = {
@@ -856,7 +829,7 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz";
-        sha512 = "3ndiq7a8qsn2j6vlq5c6d38ynlydlhvk6q01rj321lcarrh0z7721w6cbrdw7lkx6pyfms59y1jkqcl6g2ir1rz5xr17q40lk26djg7";
+        sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==";
       };
     };
     "diffie-hellman-5.0.3" = {
@@ -865,7 +838,7 @@ let
       version = "5.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
-        sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj";
+        sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
     "dom-serializer-0.2.2" = {
@@ -874,7 +847,7 @@ let
       version = "0.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz";
-        sha512 = "3v6s9yk4g6cw8chgrba79rbahiqw782013df898df7k7d81n69x2135qashgf23q59zr3w42qncyf4hszlll8knkhv0xccifdplzz6v";
+        sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
       };
     };
     "domain-browser-1.2.0" = {
@@ -883,7 +856,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
-        sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f";
+        sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
       };
     };
     "domelementtype-1.3.1" = {
@@ -892,16 +865,16 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz";
-        sha512 = "3gmb8frh13hzm986ggv14h63h5033jp045mvy1wrcj9j56j822a86arwq7x743i6glkv1bw6qwqriivypd0icbkzi492cm96kwq28h5";
+        sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domelementtype-2.0.1" = {
+    "domelementtype-2.1.0" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz";
-        sha512 = "00vkhxlz4gkgfqzkp7faclfand3fr36zi4lpr50rjwbx54nfpr2fy612p2ixzpysqi28nfyzznngx5gvgcd13b52iy6ar8q7d88fwz4";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
+        sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
       };
     };
     "domhandler-2.3.0" = {
@@ -931,22 +904,13 @@ let
         sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
       };
     };
-    "ecc-jsbn-0.1.2" = {
-      name = "ecc-jsbn";
-      packageName = "ecc-jsbn";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
-        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
-      };
-    };
-    "elliptic-6.5.2" = {
+    "elliptic-6.5.3" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.2";
+      version = "6.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz";
-        sha512 = "33kzl02iwbq3pl33ihcdq9nm48yzhfj96183zzra06hp3z6bacz3d99pl74jziwygys4npxbxwnvszz12wl8lpkjw8b4r9ki797p33z";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz";
+        sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -955,7 +919,7 @@ let
       version = "7.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
-        sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b";
+        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
       };
     };
     "entities-1.0.0" = {
@@ -967,31 +931,31 @@ let
         sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
       };
     };
-    "entities-2.0.0" = {
+    "entities-2.1.0" = {
       name = "entities";
       packageName = "entities";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz";
-        sha512 = "0pqz0h0aafqad2dm3qs73sqk6nhgr7icrfqwnxbzysbdkh11grcbssa7m1nkyzc22g9zwpi752fpw5r58rrldhjjlqh4isj89bzpmqg";
+        url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz";
+        sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
       };
     };
-    "errno-0.1.7" = {
+    "errno-0.1.8" = {
       name = "errno";
       packageName = "errno";
-      version = "0.1.7";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
-        sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii";
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz";
+        sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==";
       };
     };
-    "es-abstract-1.17.4" = {
+    "es-abstract-1.18.0-next.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.17.4";
+      version = "1.18.0-next.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
-        sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
+        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -1000,16 +964,16 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0";
+        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
-    "escape-string-regexp-1.0.5" = {
+    "escape-string-regexp-4.0.0" = {
       name = "escape-string-regexp";
       packageName = "escape-string-regexp";
-      version = "1.0.5";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz";
+        sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
       };
     };
     "esprima-4.0.1" = {
@@ -1018,16 +982,16 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
-        sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq";
+        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
       };
     };
-    "events-2.1.0" = {
+    "events-3.2.0" = {
       name = "events";
       packageName = "events";
-      version = "2.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-2.1.0.tgz";
-        sha512 = "059cw923gab3r2d2nk9nafd3h9skxvimn2k4qhnhss6j5vwwgvqaac3668299zdc634q9r8by6vidhjnkf052ir1vyw6xx7nyhs56fx";
+        url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz";
+        sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -1036,7 +1000,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
-        sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx";
+        sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
       };
     };
     "exit-0.1.2" = {
@@ -1048,49 +1012,13 @@ let
         sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
       };
     };
-    "extend-3.0.2" = {
-      name = "extend";
-      packageName = "extend";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
-        sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
-      };
-    };
-    "extsprintf-1.3.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
-        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
-      };
-    };
-    "fast-deep-equal-3.1.1" = {
-      name = "fast-deep-equal";
-      packageName = "fast-deep-equal";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
-        sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi";
-      };
-    };
-    "fast-json-stable-stringify-2.1.0" = {
-      name = "fast-json-stable-stringify";
-      packageName = "fast-json-stable-stringify";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
-        sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn";
-      };
-    };
     "fast-safe-stringify-2.0.7" = {
       name = "fast-safe-stringify";
       packageName = "fast-safe-stringify";
       version = "2.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz";
-        sha512 = "1ab0spv3wadhidsh9x8qar1ryn7ahv308yzc5cl32wssk99rr7vrkcs00vn2kggz6drps08vk24gi9gmqpg39jd1rnaryykvh4vmnaj";
+        sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
       };
     };
     "fill-range-7.0.1" = {
@@ -1099,7 +1027,7 @@ let
       version = "7.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
-        sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8";
+        sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
       };
     };
     "find-up-3.0.0" = {
@@ -1108,16 +1036,34 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
-        sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p";
+        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
       };
     };
-    "flat-4.1.0" = {
+    "find-up-5.0.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz";
+        sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==";
+      };
+    };
+    "flat-5.0.2" = {
       name = "flat";
       packageName = "flat";
-      version = "4.1.0";
+      version = "5.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz";
-        sha512 = "0bj2zrb5x98lffdcjsvaf2hns9ih2jzj4dz9yg9k8zqrak4x0i93dvf01qp458mr6d1x4dsqsxc3ag00g2mskrr23h7x71kna4d67rz";
+        url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz";
+        sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==";
+      };
+    };
+    "foreach-2.0.5" = {
+      name = "foreach";
+      packageName = "foreach";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz";
+        sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99";
       };
     };
     "forever-agent-0.5.2" = {
@@ -1129,15 +1075,6 @@ let
         sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
       };
     };
-    "forever-agent-0.6.1" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
-        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
-      };
-    };
     "form-data-0.1.4" = {
       name = "form-data";
       packageName = "form-data";
@@ -1147,15 +1084,6 @@ let
         sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
       };
     };
-    "form-data-2.3.3" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
-        sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn";
-      };
-    };
     "fs.realpath-1.0.0" = {
       name = "fs.realpath";
       packageName = "fs.realpath";
@@ -1165,13 +1093,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-2.1.2" = {
+    "fsevents-2.1.3" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "2.1.2";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz";
-        sha512 = "1j5ssfzy4xklkj74z7q64dpcld4zicsva1ihfys8dwa9l5apv7q350g4vg65nfp58c7aqkai1qmjlc3xshb97p5h3lsrl0r3j407327";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz";
+        sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
       };
     };
     "function-bind-1.1.1" = {
@@ -1180,7 +1108,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
+        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
     "get-assigned-identifiers-1.2.0" = {
@@ -1189,7 +1117,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz";
-        sha512 = "1snk8irwshrwijh05cwxsdvjc5p2aqr8mk6qdcwxaka3llypkyibdz2mdkzw67g9l2vzhidfqg0ahdrzyknjk4a7c613bwkw6cp044q";
+        sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==";
       };
     };
     "get-caller-file-2.0.5" = {
@@ -1198,25 +1126,16 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz";
-        sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g";
+        sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
-    "getpass-0.1.7" = {
-      name = "getpass";
-      packageName = "getpass";
-      version = "0.1.7";
+    "get-intrinsic-1.0.2" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
-        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
-      };
-    };
-    "glob-7.1.3" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
-        sha512 = "30h0j9f3xj7mwciwmi9q9ilhlc0l391jrvv0xws0yxgh389ynin3qqrw8xiyfy5w3f667bwn9p0i3f01s2ir0ai1rwbb038ij4fxixx";
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
+        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
       };
     };
     "glob-7.1.6" = {
@@ -1225,25 +1144,25 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
-    "glob-parent-5.1.0" = {
+    "glob-parent-5.1.1" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
-        sha512 = "23qivv79xv6rvb8fsi8hj0ic91ijfkw6dynzp8716bzafazq27dqc9ibxxlkfs7wqnhyzzimaa3xn8i22838ds157kyg60mfa152fxa";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
+        sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
       };
     };
-    "graceful-fs-4.2.3" = {
+    "graceful-fs-4.2.4" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.3";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
-        sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
+        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
       };
     };
     "growl-1.10.5" = {
@@ -1252,25 +1171,7 @@ let
       version = "1.10.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz";
-        sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8";
-      };
-    };
-    "har-schema-2.0.0" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
-        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
-      };
-    };
-    "har-validator-5.1.3" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "5.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
-        sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh";
+        sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==";
       };
     };
     "has-1.0.3" = {
@@ -1279,16 +1180,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
-        sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz";
-      };
-    };
-    "has-flag-3.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
-        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
       };
     };
     "has-flag-4.0.0" = {
@@ -1297,7 +1189,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz";
-        sha512 = "0ylry8j6wanggw1786jw36k056caw516fasjfz5jl945p7g0zl2aqxsjd5fxxfah3hlhrbflnsb88vx42080sfsfbb38aimyi7hja8k";
+        sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
       };
     };
     "has-symbols-1.0.1" = {
@@ -1306,16 +1198,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
-        sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw";
+        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
       };
     };
-    "hash-base-3.0.4" = {
+    "hash-base-3.1.0" = {
       name = "hash-base";
       packageName = "hash-base";
-      version = "3.0.4";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
-        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz";
+        sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==";
       };
     };
     "hash.js-1.1.7" = {
@@ -1324,7 +1216,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz";
-        sha512 = "1f5xc15zpy3b7hssv57xnd92ja5r073zvd2pczvncxmy1jnbjcx716riyr2syvah88qk7328a6fz049mziv2k837093xqxd86r9m8xm";
+        sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==";
       };
     };
     "hawk-1.0.0" = {
@@ -1342,7 +1234,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz";
-        sha512 = "0dwml2q9r97ga11qbbn5sb46v4g47lx174dz9g1jgxpycknhg1d5dlsij2vja905p8h243jj51hfa5cmzh8n9rdcs8r78lg86fl7z8p";
+        sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
       };
     };
     "hmac-drbg-1.0.1" = {
@@ -1390,15 +1282,6 @@ let
         sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
       };
     };
-    "http-signature-1.2.0" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
-        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
-      };
-    };
     "https-browserify-1.0.0" = {
       name = "https-browserify";
       packageName = "https-browserify";
@@ -1408,13 +1291,22 @@ let
         sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     };
-    "ieee754-1.1.13" = {
+    "iconv-lite-0.4.24" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+      };
+    };
+    "ieee754-1.2.1" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.13";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
-        sha512 = "179jm8fhl2advz4j63klrp57sm99wvyb5jcxwfr9rhi730ybcxkyfqrr0pmwvir12zjzpkwwvjjkjclwrss7lpab7dg2myqc8izpxz2";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz";
+        sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
       };
     };
     "image-size-0.5.5" = {
@@ -1453,22 +1345,13 @@ let
         sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
       };
     };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
     "inherits-2.0.4" = {
       name = "inherits";
       packageName = "inherits";
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
     "ini-1.1.0" = {
@@ -1480,13 +1363,13 @@ let
         sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
       };
     };
-    "ini-1.3.5" = {
+    "ini-1.3.8" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.5";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
+        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
     "inline-source-map-0.6.2" = {
@@ -1498,31 +1381,31 @@ let
         sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5";
       };
     };
-    "insert-module-globals-7.2.0" = {
+    "insert-module-globals-7.2.1" = {
       name = "insert-module-globals";
       packageName = "insert-module-globals";
-      version = "7.2.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz";
-        sha512 = "15ks7a4jsdgwd9cpql86xignkdz7wf7jxz7r8pyyqgfr3n51nc6y3m271cxzwm4ccaajb6y9sc5hw80ga7pg37306zps6lndyaqskjl";
+        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz";
+        sha512 = "ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==";
       };
     };
-    "interpret-1.2.0" = {
+    "interpret-1.4.0" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.2.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz";
-        sha512 = "1pibn9f6dn61lmilqiv8hb4aix4b78xf9sdws3rnl060vvv6l4qrw6gfmncq5n0f0rah2yj1ssfg80chaw9y5aa860wfdcccb4ghgcr";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz";
+        sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==";
       };
     };
-    "ip-regex-2.1.0" = {
-      name = "ip-regex";
-      packageName = "ip-regex";
-      version = "2.1.0";
+    "is-arguments-1.1.0" = {
+      name = "is-arguments";
+      packageName = "is-arguments";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz";
-        sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
+        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz";
+        sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==";
       };
     };
     "is-binary-path-2.1.0" = {
@@ -1531,7 +1414,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
-        sha512 = "1gldm4swvg3612pg55yjza8dvpv4daf374dijjg8kcmndlq55933pdd7gw4gq4c2aa5fn9vnasz3h9spg3pd8p1rafkr91sxdhi3hb4";
+        sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
       };
     };
     "is-buffer-1.1.6" = {
@@ -1540,25 +1423,25 @@ let
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
-        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
+        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-buffer-2.0.4" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
-        sha512 = "3c1f1cy2867lfdcfxpy91qxbjxizlwa2dhz3mgckg17xd4xcx284ylzvfk3v7l6mdynrk7xc2rg31avi6caj053p7bgaf4p8ni6pb9a";
-      };
-    };
-    "is-callable-1.1.5" = {
+    "is-callable-1.2.2" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.5";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
-        sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
+        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
+      };
+    };
+    "is-core-module-2.2.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
+        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
       };
     };
     "is-date-object-1.0.2" = {
@@ -1567,7 +1450,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai";
+        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
       };
     };
     "is-extglob-2.1.1" = {
@@ -1588,13 +1471,31 @@ let
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
+    "is-generator-function-1.0.8" = {
+      name = "is-generator-function";
+      packageName = "is-generator-function";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz";
+        sha512 = "2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==";
+      };
+    };
     "is-glob-4.0.1" = {
       name = "is-glob";
       packageName = "is-glob";
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
-        sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4";
+        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+      };
+    };
+    "is-negative-zero-2.0.1" = {
+      name = "is-negative-zero";
+      packageName = "is-negative-zero";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
+        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
       };
     };
     "is-number-7.0.0" = {
@@ -1603,16 +1504,25 @@ let
       version = "7.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
-        sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73";
+        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
       };
     };
-    "is-regex-1.0.5" = {
+    "is-plain-obj-2.1.0" = {
+      name = "is-plain-obj";
+      packageName = "is-plain-obj";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz";
+        sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==";
+      };
+    };
+    "is-regex-1.1.1" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.5";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
-        sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
+        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
       };
     };
     "is-symbol-1.0.3" = {
@@ -1621,16 +1531,25 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v";
+        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
       };
     };
-    "is-typedarray-1.0.0" = {
-      name = "is-typedarray";
-      packageName = "is-typedarray";
-      version = "1.0.0";
+    "is-typed-array-1.1.4" = {
+      name = "is-typed-array";
+      packageName = "is-typed-array";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
-        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+        url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.4.tgz";
+        sha512 = "ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA==";
+      };
+    };
+    "is-what-3.12.0" = {
+      name = "is-what";
+      packageName = "is-what";
+      version = "3.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz";
+        sha512 = "2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==";
       };
     };
     "isarray-0.0.1" = {
@@ -1660,58 +1579,13 @@ let
         sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
-    "isstream-0.1.2" = {
-      name = "isstream";
-      packageName = "isstream";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
-        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
-      };
-    };
-    "js-yaml-3.13.1" = {
+    "js-yaml-3.14.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.13.1";
+      version = "3.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
-        sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1";
-      };
-    };
-    "jsbn-0.1.1" = {
-      name = "jsbn";
-      packageName = "jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
-        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
-      };
-    };
-    "json-schema-0.2.3" = {
-      name = "json-schema";
-      packageName = "json-schema";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
-        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
-      };
-    };
-    "json-schema-traverse-0.4.1" = {
-      name = "json-schema-traverse";
-      packageName = "json-schema-traverse";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
-        sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5";
-      };
-    };
-    "json-stable-stringify-0.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
-        sha1 = "611c23e814db375527df851193db59dd2af27f45";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
+        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
       };
     };
     "json-stringify-safe-5.0.1" = {
@@ -1723,15 +1597,6 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "jsonify-0.0.0" = {
-      name = "jsonify";
-      packageName = "jsonify";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
-        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
-      };
-    };
     "jsonparse-1.3.1" = {
       name = "jsonparse";
       packageName = "jsonparse";
@@ -1741,22 +1606,13 @@ let
         sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
       };
     };
-    "jsprim-1.4.1" = {
-      name = "jsprim";
-      packageName = "jsprim";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
-        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
-      };
-    };
-    "just-extend-4.1.0" = {
+    "just-extend-4.1.1" = {
       name = "just-extend";
       packageName = "just-extend";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz";
-        sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==";
+        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz";
+        sha512 = "aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==";
       };
     };
     "kew-0.1.7" = {
@@ -1774,7 +1630,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz";
-        sha512 = "01ili1w037l9b1l99ljcygi8xwcirjndh89qb1ja448vpfv6b0ixcp05cj8z9c0646bwrjabb8q0xy60pkshnn4977lhra5f54hpbh9";
+        sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==";
       };
     };
     "locate-path-3.0.0" = {
@@ -1783,16 +1639,25 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
-        sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc";
+        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
-    "lodash-4.17.15" = {
+    "locate-path-6.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz";
+        sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==";
+      };
+    };
+    "lodash-4.17.20" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.15";
+      version = "4.17.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
-        sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
+        sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
       };
     };
     "lodash.get-4.4.2" = {
@@ -1813,13 +1678,22 @@ let
         sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
       };
     };
-    "log-symbols-3.0.0" = {
+    "log-symbols-4.0.0" = {
       name = "log-symbols";
       packageName = "log-symbols";
-      version = "3.0.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz";
-        sha512 = "2fmk82kxm1wkgm5kgxx84nsf7pvyspj47axslj3sfcyx69hx1vymrgbqj00jfnmrjc80wb87xs3kyfa37k55wzhgvk6v21vw8d0sabm";
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz";
+        sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==";
+      };
+    };
+    "make-dir-2.1.0" = {
+      name = "make-dir";
+      packageName = "make-dir";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
+        sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
       };
     };
     "md5.js-1.3.5" = {
@@ -1828,7 +1702,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz";
-        sha512 = "29ds70y468n42xivsz4vrgy8rp2x4nxz52z1vkd1k49556gvn74pq998s510g3jgz9972m9yxs6yk1kw752blq97b9w8gaddkwlyay6";
+        sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
       };
     };
     "miller-rabin-4.0.1" = {
@@ -1837,7 +1711,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
-        sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp";
+        sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
       };
     };
     "mime-1.2.11" = {
@@ -1855,25 +1729,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
-        sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
-      };
-    };
-    "mime-db-1.43.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.43.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
-        sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv";
-      };
-    };
-    "mime-types-2.1.26" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.26";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
-        sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
     "minimalistic-assert-1.0.1" = {
@@ -1882,7 +1738,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
-        sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj";
+        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -1900,16 +1756,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
     "minimist-1.2.5" = {
@@ -1918,7 +1765,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "mkdirp-0.3.5" = {
@@ -1930,13 +1777,13 @@ let
         sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
       };
     };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
+    "mkdirp-classic-0.5.3" = {
+      name = "mkdirp-classic";
+      packageName = "mkdirp-classic";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz";
+        sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==";
       };
     };
     "mocha-phantomjs-core-1.3.1" = {
@@ -1948,22 +1795,40 @@ let
         sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18";
       };
     };
-    "module-deps-6.2.2" = {
+    "module-deps-6.2.3" = {
       name = "module-deps";
       packageName = "module-deps";
-      version = "6.2.2";
+      version = "6.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.2.tgz";
-        sha512 = "3gkwqnfbsjlh9sswxyiqwv4hzvph69yfaj8c2kibsc9xs6nvys3s2yvjyb41p1qqprlzrr9pqm1l5qpx8wis3z20cw95fzr7g4bmp3b";
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz";
+        sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==";
       };
     };
-    "ms-2.1.1" = {
+    "ms-2.1.2" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
-        sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+      };
+    };
+    "ms-2.1.3" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
+      };
+    };
+    "nanoid-3.1.12" = {
+      name = "nanoid";
+      packageName = "nanoid";
+      version = "3.1.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz";
+        sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==";
       };
     };
     "ncp-0.4.2" = {
@@ -1975,22 +1840,22 @@ let
         sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
-    "nise-4.0.3" = {
-      name = "nise";
-      packageName = "nise";
-      version = "4.0.3";
+    "needle-2.6.0" = {
+      name = "needle";
+      packageName = "needle";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nise/-/nise-4.0.3.tgz";
-        sha512 = "EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
+        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
       };
     };
-    "node-environment-flags-1.0.6" = {
-      name = "node-environment-flags";
-      packageName = "node-environment-flags";
-      version = "1.0.6";
+    "nise-4.0.4" = {
+      name = "nise";
+      packageName = "nise";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz";
-        sha512 = "0gis4xp1wacn31j3p8vdd32ykzs2pskf8pgfjkm092zcx72v03dphpsayrls8bmmi91s6ic4718lgi28mm40hj96f9ywbvfxbcz4jz4";
+        url = "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz";
+        sha512 = "bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==";
       };
     };
     "node-uuid-1.4.8" = {
@@ -2017,7 +1882,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
-        sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9";
+        sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
     "npmconf-0.0.24" = {
@@ -2038,15 +1903,6 @@ let
         sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
       };
     };
-    "oauth-sign-0.9.0" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
-        sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x";
-      };
-    };
     "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -2056,13 +1912,13 @@ let
         sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
-    "object-inspect-1.7.0" = {
+    "object-inspect-1.9.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.7.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
-        sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
+        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -2071,25 +1927,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
-        sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n";
+        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
       };
     };
-    "object.assign-4.1.0" = {
+    "object.assign-4.1.2" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.0";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
-        sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv";
-      };
-    };
-    "object.getownpropertydescriptors-2.1.0" = {
-      name = "object.getownpropertydescriptors";
-      packageName = "object.getownpropertydescriptors";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
-        sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
       };
     };
     "once-1.1.1" = {
@@ -2128,13 +1975,22 @@ let
         sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
       };
     };
-    "p-limit-2.2.2" = {
+    "p-limit-2.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.2";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
-        sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
+      };
+    };
+    "p-limit-3.1.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz";
+        sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==";
       };
     };
     "p-locate-3.0.0" = {
@@ -2143,7 +1999,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
-        sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7";
+        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+      };
+    };
+    "p-locate-5.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz";
+        sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==";
       };
     };
     "p-try-2.2.0" = {
@@ -2152,7 +2017,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
       };
     };
     "pako-1.0.11" = {
@@ -2161,7 +2026,7 @@ let
       version = "1.0.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz";
-        sha512 = "1imm2ygnj1himskq6lblzdh3ngc6p9gkvhrbzivalqf3nwafzfglpmbh8wkaz0rsiaxh67jzxbb16m2ygapfcnfwqg9gkdqzkqc24p2";
+        sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
       };
     };
     "parents-1.0.1" = {
@@ -2173,22 +2038,31 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.5" = {
+    "parse-asn1-5.1.6" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.5";
+      version = "5.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
-        sha512 = "16n59f599pq8832a6c5wyxnqdf4vrqrdnclzs6vp9m2z2h9qmxamjk6xcrl1aal758jyba0pvyz1bkf7npm7achfxxa29jwaygihhwf";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz";
+        sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==";
       };
     };
-    "path-browserify-0.0.1" = {
+    "parse-node-version-1.0.1" = {
+      name = "parse-node-version";
+      packageName = "parse-node-version";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz";
+        sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==";
+      };
+    };
+    "path-browserify-1.0.1" = {
       name = "path-browserify";
       packageName = "path-browserify";
-      version = "0.0.1";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz";
-        sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5";
+        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz";
+        sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==";
       };
     };
     "path-exists-3.0.0" = {
@@ -2200,6 +2074,15 @@ let
         sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
       };
     };
+    "path-exists-4.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
+        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
+      };
+    };
     "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
@@ -2215,7 +2098,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
-        sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r";
+        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
       };
     };
     "path-platform-0.11.15" = {
@@ -2233,25 +2116,16 @@ let
       version = "1.8.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz";
-        sha512 = "1a1s16c1sx28yq8nh8sqkj9izaypszmxfk27x5hl1wid9611b5viffw9vbwqw6sik20ksgmh18dqndglbvq82dii4jl0aal353ck3cz";
+        sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==";
       };
     };
-    "pbkdf2-3.0.17" = {
+    "pbkdf2-3.1.1" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.17";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz";
-        sha512 = "2s4nd3yv3kkyywvh5rkrvbr6w2h6a4q786v548w895ralcq9cllqzyxr0jgxf911k3zpmzycimsg3ggww3lkrhd3bk9wribrgjaby2k";
-      };
-    };
-    "performance-now-2.1.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
-        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz";
+        sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==";
       };
     };
     "phantomjs-1.9.7-15" = {
@@ -2263,13 +2137,22 @@ let
         sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b";
       };
     };
-    "picomatch-2.2.1" = {
+    "picomatch-2.2.2" = {
       name = "picomatch";
       packageName = "picomatch";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz";
-        sha512 = "12a2jzmkj24c6k3x71z0knzflw9qqhqx0lk27nrryjs6m7gjmszvgz5pp29xx1h7h7xxaj8cl3i5h98hlx3mpif5h26qdjhrh1ml811";
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
+        sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
+      };
+    };
+    "pify-4.0.1" = {
+      name = "pify";
+      packageName = "pify";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz";
+        sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==";
       };
     };
     "process-0.11.10" = {
@@ -2287,7 +2170,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
+        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
     "progress-1.1.8" = {
@@ -2299,15 +2182,6 @@ let
         sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
       };
     };
-    "promise-7.3.1" = {
-      name = "promise";
-      packageName = "promise";
-      version = "7.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
-      };
-    };
     "proto-list-1.2.4" = {
       name = "proto-list";
       packageName = "proto-list";
@@ -2326,13 +2200,13 @@ let
         sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
       };
     };
-    "psl-1.7.0" = {
+    "psl-1.8.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
-        sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4";
+        url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
+        sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
       };
     };
     "public-encrypt-4.0.3" = {
@@ -2341,7 +2215,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz";
-        sha512 = "3qnsvs746b98ifyv12qj1g6hl6fq25vip5mswhvn3gnl7r32fids6mw3jb0gdcqrrl5x9ik475sf0vx6mbhmif49idkwjwrhbr5lnnd";
+        sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==";
       };
     };
     "punycode-1.3.2" = {
@@ -2368,7 +2242,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx";
+        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
     "qs-0.6.6" = {
@@ -2380,15 +2254,6 @@ let
         sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
       };
     };
-    "qs-6.5.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
-        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
-      };
-    };
     "querystring-0.2.0" = {
       name = "querystring";
       packageName = "querystring";
@@ -2413,7 +2278,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
-        sha512 = "2cimbs750ysa2wxsiw9mmc1xqjb8w0c4s22p2mv2n676s8hchvzcl1l5p78jnk62d2jzacpr9zbl9w64kaqnipcbaa25q7ywn47g2dx";
+        sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
       };
     };
     "randomfill-1.0.4" = {
@@ -2422,7 +2287,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz";
-        sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk";
+        sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==";
       };
     };
     "read-only-stream-2.0.0" = {
@@ -2449,7 +2314,7 @@ let
       version = "2.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
     "readable-stream-3.6.0" = {
@@ -2458,16 +2323,16 @@ let
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
-        sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05";
+        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
       };
     };
-    "readdirp-3.2.0" = {
+    "readdirp-3.5.0" = {
       name = "readdirp";
       packageName = "readdirp";
-      version = "3.2.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz";
-        sha512 = "0chzz12q3inpmwm6b4gi7g9n39jp24ah3mmjgss87hfsbx86vnxf49bx9wk2ng66037x2fh0cjf5rgx00c1m86lqlh7r6g9xm13ifbj";
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
+        sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
       };
     };
     "rechoir-0.6.2" = {
@@ -2488,15 +2353,6 @@ let
         sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
       };
     };
-    "request-2.88.2" = {
-      name = "request";
-      packageName = "request";
-      version = "2.88.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
-        sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj";
-      };
-    };
     "request-progress-0.3.1" = {
       name = "request-progress";
       packageName = "request-progress";
@@ -2521,25 +2377,16 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
-        sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl";
+        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
       };
     };
-    "resolve-1.1.7" = {
+    "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.1.7";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
-      };
-    };
-    "resolve-1.15.1" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.15.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
-        sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
       };
     };
     "rimraf-2.2.8" = {
@@ -2557,7 +2404,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
-        sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla";
+        sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -2566,16 +2413,16 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
-    "safe-buffer-5.2.0" = {
+    "safe-buffer-5.2.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
-        sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -2584,7 +2431,16 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+      };
+    };
+    "sax-1.2.4" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
       };
     };
     "semver-1.1.4" = {
@@ -2602,7 +2458,16 @@ let
       version = "5.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+      };
+    };
+    "serialize-javascript-5.0.1" = {
+      name = "serialize-javascript";
+      packageName = "serialize-javascript";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz";
+        sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -2620,16 +2485,7 @@ let
       version = "2.4.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
-        sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0";
-      };
-    };
-    "shasum-1.0.2" = {
-      name = "shasum";
-      packageName = "shasum";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz";
-        sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
+        sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
     "shasum-object-1.0.0" = {
@@ -2638,7 +2494,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz";
-        sha512 = "1bdc4kbk4jy4crxvf36kwbf91ya8xy2xap7mlrdxz44j51y77mhfgzp846w2bxwiw3rrj9lbcylc636ffm7j8c66fx5iigpkyp3kai2";
+        sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==";
       };
     };
     "shell-quote-1.7.2" = {
@@ -2647,7 +2503,7 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz";
-        sha512 = "11a56bai83fzl9zdqp594aypy7f31mkm2whi4ar94wf0w6lzmzfmbw4qd6bn1bibkmb9407wkff5k3d7xvsi3ycj2mw1camyadzy74r";
+        sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==";
       };
     };
     "shelljs-0.3.0" = {
@@ -2704,13 +2560,13 @@ let
         sha512 = "oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==";
       };
     };
-    "simple-concat-1.0.0" = {
+    "simple-concat-1.0.1" = {
       name = "simple-concat";
       packageName = "simple-concat";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz";
-        sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6";
+        url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz";
+        sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==";
       };
     };
     "sntp-0.2.4" = {
@@ -2737,7 +2593,7 @@ let
       version = "0.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
-        sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -2749,22 +2605,13 @@ let
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "sshpk-1.16.1" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.16.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
-        sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x";
-      };
-    };
-    "stream-browserify-2.0.2" = {
+    "stream-browserify-3.0.0" = {
       name = "stream-browserify";
       packageName = "stream-browserify";
-      version = "2.0.2";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz";
-        sha512 = "2mfvadpwj9mzxps4arl1frxlkz96hfp0sc5pvq76s0ijf8fgw26mm3a721zq3iz1f8155w3a41wkixbdlwn1cavv0mzics796da2zlx";
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz";
+        sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==";
       };
     };
     "stream-combiner2-1.1.1" = {
@@ -2776,13 +2623,13 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
-    "stream-http-3.1.0" = {
+    "stream-http-3.1.1" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.0.tgz";
-        sha512 = "cuB6RgO7BqC4FBYzmnvhob5Do3wIdIsXAgGycHJnW+981gHqoYcYz9lqjJrk8WXRddbwPuqPYRl+bag6mYv4lw==";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.1.tgz";
+        sha512 = "S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==";
       };
     };
     "stream-splicer-2.0.1" = {
@@ -2791,7 +2638,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz";
-        sha512 = "275m2xn6ygpp4iw0mjl0a2x39m333xxmr3qlk47mymsqxn8wg8czyv608nbg89w7vyn483ik8f7vlmx107yx4vw06r89fagygiy2b2y";
+        sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==";
       };
     };
     "string-width-2.1.1" = {
@@ -2800,7 +2647,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
     "string-width-3.1.0" = {
@@ -2809,25 +2656,25 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
-        sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx";
+        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
-    "string.prototype.trimleft-2.1.1" = {
-      name = "string.prototype.trimleft";
-      packageName = "string.prototype.trimleft";
-      version = "2.1.1";
+    "string.prototype.trimend-1.0.3" = {
+      name = "string.prototype.trimend";
+      packageName = "string.prototype.trimend";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
-        sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
       };
     };
-    "string.prototype.trimright-2.1.1" = {
-      name = "string.prototype.trimright";
-      packageName = "string.prototype.trimright";
-      version = "2.1.1";
+    "string.prototype.trimstart-1.0.3" = {
+      name = "string.prototype.trimstart";
+      packageName = "string.prototype.trimstart";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
-        sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
       };
     };
     "string_decoder-0.10.31" = {
@@ -2845,7 +2692,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
     "string_decoder-1.3.0" = {
@@ -2854,7 +2701,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
-        sha512 = "1w0mz57mvmqykm0jwma6lr4i9pip8p8c1ldaax7sxnrl6j0jbrkwggs037r1psmac0w04i9mb2rc1gzj1n2f0xvy1fr332n9pqmfi46";
+        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -2872,7 +2719,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
-        sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f";
+        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
       };
     };
     "strip-json-comments-1.0.4" = {
@@ -2884,13 +2731,13 @@ let
         sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
       };
     };
-    "strip-json-comments-2.0.1" = {
+    "strip-json-comments-3.1.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
-      version = "2.0.1";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz";
+        sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==";
       };
     };
     "subarg-1.0.0" = {
@@ -2902,31 +2749,13 @@ let
         sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
       };
     };
-    "supports-color-5.5.0" = {
+    "supports-color-7.2.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "5.5.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
-        sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2";
-      };
-    };
-    "supports-color-6.0.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz";
-        sha512 = "0p5l02lyminbqmcpm7257093sd8w5ca7q5xnnym2z71bwbhmisnyzn2jh5xma418sx29m8yinka6f7rphc7dl76lc88bm2w4z14lzx2";
-      };
-    };
-    "supports-color-7.1.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "7.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz";
-        sha512 = "3k12babask2rk5v9n9wdgng00rqac2w5wwvkawlx3brjpqvfpy4j70650ggw5pa7bm5hnn1ppsppsqrcwrvjsk1mxb3vi993yjqh551";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz";
+        sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
       };
     };
     "syntax-error-1.4.0" = {
@@ -2935,7 +2764,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz";
-        sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0";
+        sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
     "throttleit-0.0.2" = {
@@ -2962,7 +2791,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz";
-        sha512 = "14xi6lbly1f37015ny2pzcnf5kaksjmpnhm61gfhwn686w5ac519qb1icxdda974n84f342g0y15kysj1hci2vl40z91aiivyhx2spy";
+        sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -2980,34 +2809,25 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
-        sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb";
+        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
       };
     };
-    "tough-cookie-2.5.0" = {
+    "tough-cookie-4.0.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.5.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
-        sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz";
+        sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==";
       };
     };
-    "tough-cookie-3.0.1" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz";
-        sha512 = "2raf12jixrfcagphh9s0fagbfk5va7m0jpj9dbc5dk5b5rr8xbxz4j1af4ppvillqnbi39yiicwnj1qpppc89c71zywnri9xv98j369";
-      };
-    };
-    "tslib-1.11.1" = {
+    "tslib-1.14.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.11.1";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
-        sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
+        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
     "tty-browserify-0.0.1" = {
@@ -3016,7 +2836,7 @@ let
       version = "0.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz";
-        sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b";
+        sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -3028,31 +2848,13 @@ let
         sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
-    "tunnel-agent-0.6.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
-        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
-      };
-    };
-    "tweetnacl-0.14.5" = {
-      name = "tweetnacl";
-      packageName = "tweetnacl";
-      version = "0.14.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
-        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
-      };
-    };
     "type-detect-4.0.8" = {
       name = "type-detect";
       packageName = "type-detect";
       version = "4.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz";
-        sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni";
+        sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==";
       };
     };
     "typedarray-0.0.6" = {
@@ -3070,7 +2872,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz";
-        sha512 = "2iz3bypw716y5lgdg89d7jwnkqnla4sid3l5hr2259ypf8h6sbkw3n0xa51ckzkkayf0c39ksaiax2j6ighj36p5ipwh5p1wx50d1z0";
+        sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
       };
     };
     "undeclared-identifiers-1.1.3" = {
@@ -3079,16 +2881,16 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz";
-        sha512 = "0xp0ipldz5gsxzh6lm1gj69ab3y6pwn9yq68b8lqg4f3jsl8kr0wkn0kd3fqvs0i71kzhp6g3z0q9rdy4xy6i0a53q6g5k3gki9d4x4";
+        sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==";
       };
     };
-    "uri-js-4.2.2" = {
-      name = "uri-js";
-      packageName = "uri-js";
-      version = "4.2.2";
+    "universalify-0.1.2" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
-        sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9";
+        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
+        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
     "url-0.11.0" = {
@@ -3109,13 +2911,13 @@ let
         sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
       };
     };
-    "util-0.10.4" = {
+    "util-0.12.3" = {
       name = "util";
       packageName = "util";
-      version = "0.10.4";
+      version = "0.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
-        sha512 = "3sbbgsya51i86ih8bn3nfwi3f9556xlnwh32z4k54dwcpi0jibhfa5dpbfmpzyla63yh2zlxs9chl6wkhc8bqjmjxjyxc9p6j2vvyfh";
+        url = "https://registry.npmjs.org/util/-/util-0.12.3.tgz";
+        sha512 = "I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -3127,31 +2929,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "uuid-3.4.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
-        sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
-      };
-    };
-    "verror-1.10.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
-        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
-      };
-    };
     "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
-        sha512 = "00japcjqx1df1bgck837ds0xvg5dr7g4j30a38zhbmanqss2kyxs4p7pgmldlnxpa31js50gydy8x9qi89s4x74iidf6k6nfgqsc5ns";
+        sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
       };
     };
     "which-1.0.9" = {
@@ -3163,13 +2947,13 @@ let
         sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
       };
     };
-    "which-1.3.1" = {
+    "which-2.0.2" = {
       name = "which";
       packageName = "which";
-      version = "1.3.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
-        sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz";
+        url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz";
+        sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==";
       };
     };
     "which-module-2.0.0" = {
@@ -3181,13 +2965,31 @@ let
         sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
       };
     };
+    "which-typed-array-1.1.4" = {
+      name = "which-typed-array";
+      packageName = "which-typed-array";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz";
+        sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==";
+      };
+    };
     "wide-align-1.1.3" = {
       name = "wide-align";
       packageName = "wide-align";
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
-        sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+      };
+    };
+    "workerpool-6.0.2" = {
+      name = "workerpool";
+      packageName = "workerpool";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz";
+        sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==";
       };
     };
     "wrap-ansi-5.1.0" = {
@@ -3196,7 +2998,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
-        sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0";
+        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
       };
     };
     "wrappy-1.0.2" = {
@@ -3214,43 +3016,52 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz";
-        sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic";
+        sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.0" = {
+    "y18n-4.0.1" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
+        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
       };
     };
-    "yargs-13.3.0" = {
+    "yargs-13.3.2" = {
       name = "yargs";
       packageName = "yargs";
-      version = "13.3.0";
+      version = "13.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
-        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
+        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
       };
     };
-    "yargs-parser-13.1.1" = {
+    "yargs-parser-13.1.2" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "13.1.1";
+      version = "13.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
-        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
+        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
       };
     };
-    "yargs-unparser-1.6.0" = {
+    "yargs-unparser-2.0.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
-      version = "1.6.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz";
-        sha512 = "17qgbcv8wypl4qr620558qd8ff03nqqiq84mp200mizrbsfj4nyil345iny8zx4ia5hfpjmk2mnhqp7y54qpsypd993ml57cj14mnsv";
+        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz";
+        sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==";
+      };
+    };
+    "yocto-queue-0.1.0" = {
+      name = "yocto-queue";
+      packageName = "yocto-queue";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz";
+        sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==";
       };
     };
   };
@@ -3259,15 +3070,15 @@ in
   marked = nodeEnv.buildNodePackage {
     name = "marked";
     packageName = "marked";
-    version = "0.8.0";
+    version = "1.2.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/marked/-/marked-0.8.0.tgz";
-      sha512 = "MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ==";
+      url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz";
+      sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "A markdown parser built for speed";
-      homepage = "https://marked.js.org/";
+      homepage = "https://marked.js.org";
       license = "MIT";
     };
     production = true;
@@ -3277,45 +3088,52 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.5.0";
+    version = "17.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz";
-      sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw==";
+      url = "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz";
+      sha512 = "SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."acorn-7.1.1"
+      sources."acorn-7.4.1"
       sources."acorn-node-1.8.2"
-      sources."acorn-walk-7.1.1"
-      sources."asn1.js-4.10.1"
+      sources."acorn-walk-7.2.0"
+      sources."array-filter-1.0.0"
+      (sources."asn1.js-5.4.1" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       (sources."assert-1.5.0" // {
         dependencies = [
           sources."inherits-2.0.1"
           sources."util-0.10.3"
         ];
       })
+      sources."available-typed-arrays-1.0.2"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
-      sources."bn.js-4.11.8"
+      sources."base64-js-1.5.1"
+      sources."bn.js-5.1.3"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
       sources."browser-pack-6.1.0"
-      (sources."browser-resolve-1.11.3" // {
-        dependencies = [
-          sources."resolve-1.1.7"
-        ];
-      })
+      sources."browser-resolve-2.0.0"
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      sources."browserify-rsa-4.0.1"
-      sources."browserify-sign-4.0.4"
+      sources."browserify-rsa-4.1.0"
+      (sources."browserify-sign-4.2.1" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.5.0"
+      sources."buffer-5.2.1"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.2"
+      sources."call-bind-1.0.2"
       sources."cipher-base-1.0.4"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
@@ -3324,70 +3142,106 @@ in
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.3"
+      (sources."create-ecdh-4.0.4" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."dash-ast-1.0.0"
+      sources."define-properties-1.1.3"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.1"
       sources."des.js-1.0.1"
-      (sources."detective-5.2.0" // {
+      sources."detective-5.2.0"
+      (sources."diffie-hellman-5.0.3" // {
         dependencies = [
-          sources."minimist-1.2.5"
+          sources."bn.js-4.11.9"
         ];
       })
-      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
-      sources."elliptic-6.5.2"
-      sources."events-2.1.0"
+      (sources."elliptic-6.5.3" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
+      sources."es-abstract-1.18.0-next.2"
+      sources."es-to-primitive-1.2.1"
+      sources."events-3.2.0"
       sources."evp_bytestokey-1.0.3"
       sources."fast-safe-stringify-2.0.7"
+      sources."foreach-2.0.5"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-assigned-identifiers-1.2.0"
+      sources."get-intrinsic-1.0.2"
       sources."glob-7.1.6"
       sources."has-1.0.3"
-      sources."hash-base-3.0.4"
+      sources."has-symbols-1.0.1"
+      (sources."hash-base-3.1.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."inline-source-map-0.6.2"
-      sources."insert-module-globals-7.2.0"
+      sources."insert-module-globals-7.2.1"
+      sources."is-arguments-1.1.0"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.2.2"
+      sources."is-core-module-2.2.0"
+      sources."is-date-object-1.0.2"
+      sources."is-generator-function-1.0.8"
+      sources."is-negative-zero-2.0.1"
+      sources."is-regex-1.1.1"
+      sources."is-symbol-1.0.3"
+      sources."is-typed-array-1.1.4"
       sources."isarray-1.0.0"
-      sources."json-stable-stringify-0.0.1"
-      sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
       sources."labeled-stream-splicer-2.0.2"
       sources."lodash.memoize-3.0.4"
       sources."md5.js-1.3.5"
-      sources."miller-rabin-4.0.1"
+      (sources."miller-rabin-4.0.1" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."module-deps-6.2.2"
+      sources."minimist-1.2.5"
+      sources."mkdirp-classic-0.5.3"
+      sources."module-deps-6.2.3"
       sources."object-assign-4.1.1"
+      sources."object-inspect-1.9.0"
+      sources."object-keys-1.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
       sources."pako-1.0.11"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.5"
-      sources."path-browserify-0.0.1"
+      sources."parse-asn1-5.1.6"
+      sources."path-browserify-1.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.0.17"
+      sources."pbkdf2-3.1.1"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
-      sources."public-encrypt-4.0.3"
+      (sources."public-encrypt-4.0.3" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -3400,29 +3254,31 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.15.1"
+      sources."resolve-1.19.0"
       sources."ripemd160-2.0.2"
-      sources."safe-buffer-5.2.0"
+      sources."safe-buffer-5.2.1"
+      sources."safer-buffer-2.1.2"
       sources."sha.js-2.4.11"
-      sources."shasum-1.0.2"
       sources."shasum-object-1.0.0"
       sources."shell-quote-1.7.2"
-      sources."simple-concat-1.0.0"
+      sources."simple-concat-1.0.1"
       sources."source-map-0.5.7"
-      sources."stream-browserify-2.0.2"
+      (sources."stream-browserify-3.0.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."stream-combiner2-1.1.1"
-      (sources."stream-http-3.1.0" // {
+      (sources."stream-http-3.1.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
         ];
       })
       sources."stream-splicer-2.0.1"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.3.0"
-      (sources."subarg-1.0.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."subarg-1.0.0"
       sources."syntax-error-1.4.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
@@ -3436,13 +3292,10 @@ in
           sources."punycode-1.3.2"
         ];
       })
-      (sources."util-0.10.4" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
+      sources."util-0.12.3"
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-1.1.2"
+      sources."which-typed-array-1.1.4"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.2"
     ];
@@ -3459,19 +3312,15 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.8.0";
+    version = "3.12.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz";
-      sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
+      sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
     };
-    dependencies = [
-      sources."commander-2.20.3"
-      sources."source-map-0.6.1"
-    ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "JavaScript parser, mangler/compressor and beautifier toolkit";
-      homepage = "https://github.com/mishoo/UglifyJS2#readme";
+      homepage = "https://github.com/mishoo/UglifyJS#readme";
       license = "BSD-2-Clause";
     };
     production = true;
@@ -3481,76 +3330,36 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.11.1";
+    version = "4.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.11.1.tgz";
-      sha512 = "3p1iabzyyzdnvvqfmi17bs5i1mbwpbq4mh9ahz503jwjyarjqxzlq7yzbp0b499yzz6v1pn9s7hlyx98pxj40zs7a9jn42iipgrfmdn";
+      url = "https://registry.npmjs.org/less/-/less-4.1.0.tgz";
+      sha512 = "w1Ag/f34g7LwtQ/sMVSGWIyZx+gG9ZOAEtyxeX1fG75is6BMyC2lD5kG+1RueX7PkAvlQBm2Lf2aN2j0JbVr2A==";
     };
     dependencies = [
-      sources."ajv-6.12.0"
-      sources."asap-2.0.6"
-      sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.9.1"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."caseless-0.12.0"
-      sources."clone-2.1.2"
-      sources."combined-stream-1.0.8"
-      sources."core-util-is-1.0.2"
-      sources."dashdash-1.14.1"
-      sources."delayed-stream-1.0.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."errno-0.1.7"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.1"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.3"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
-      sources."http-signature-1.2.0"
+      sources."copy-anything-2.0.1"
+      sources."debug-3.2.7"
+      sources."errno-0.1.8"
+      sources."graceful-fs-4.2.4"
+      sources."iconv-lite-0.4.24"
       sources."image-size-0.5.5"
-      sources."is-typedarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.1"
+      sources."is-what-3.12.0"
+      sources."make-dir-2.1.0"
       sources."mime-1.6.0"
-      sources."mime-db-1.43.0"
-      sources."mime-types-2.1.26"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."oauth-sign-0.9.0"
-      sources."performance-now-2.1.0"
-      sources."promise-7.3.1"
+      sources."ms-2.1.3"
+      sources."needle-2.6.0"
+      sources."parse-node-version-1.0.1"
+      sources."pify-4.0.1"
       sources."prr-1.0.1"
-      sources."psl-1.7.0"
-      sources."punycode-2.1.1"
-      sources."qs-6.5.2"
-      sources."request-2.88.2"
-      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."semver-5.7.1"
       sources."source-map-0.6.1"
-      sources."sshpk-1.16.1"
-      sources."tough-cookie-2.5.0"
-      sources."tslib-1.11.1"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."uri-js-4.2.2"
-      sources."uuid-3.4.0"
-      sources."verror-1.10.0"
+      sources."tslib-1.14.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Leaner CSS";
-      homepage = "http://lesscss.org/";
+      homepage = "http://lesscss.org";
       license = "Apache-2.0";
     };
     production = true;
@@ -3560,29 +3369,26 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "7.1.0";
+    version = "8.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz";
-      sha512 = "MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ==";
+      url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz";
+      sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==";
     };
     dependencies = [
-      sources."ansi-colors-3.2.3"
+      sources."@ungap/promise-all-settled-1.1.2"
+      sources."ansi-colors-4.1.1"
       sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
       sources."argparse-1.0.10"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.0.0"
+      sources."binary-extensions-2.2.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-stdout-1.3.1"
       sources."camelcase-5.3.1"
-      (sources."chalk-2.4.2" // {
-        dependencies = [
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."chokidar-3.3.0"
+      sources."chalk-4.1.0"
+      sources."chokidar-3.4.3"
       (sources."cliui-5.0.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -3590,100 +3396,98 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."concat-map-0.0.1"
-      sources."debug-3.2.6"
+      sources."debug-4.2.0"
       sources."decamelize-1.2.0"
-      sources."define-properties-1.1.3"
-      sources."diff-3.5.0"
+      sources."diff-4.0.2"
       sources."emoji-regex-7.0.3"
-      sources."es-abstract-1.17.4"
-      sources."es-to-primitive-1.2.1"
-      sources."escape-string-regexp-1.0.5"
+      sources."escape-string-regexp-4.0.0"
       sources."esprima-4.0.1"
       sources."fill-range-7.0.1"
-      sources."find-up-3.0.0"
-      sources."flat-4.1.0"
+      sources."find-up-5.0.0"
+      sources."flat-5.0.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.2"
-      sources."function-bind-1.1.1"
+      sources."fsevents-2.1.3"
       sources."get-caller-file-2.0.5"
-      sources."glob-7.1.3"
-      sources."glob-parent-5.1.0"
+      sources."glob-7.1.6"
+      sources."glob-parent-5.1.1"
       sources."growl-1.10.5"
-      sources."has-1.0.3"
-      sources."has-flag-3.0.0"
-      sources."has-symbols-1.0.1"
+      sources."has-flag-4.0.0"
       sources."he-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
-      sources."is-buffer-2.0.4"
-      sources."is-callable-1.1.5"
-      sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
-      sources."is-regex-1.0.5"
-      sources."is-symbol-1.0.3"
+      sources."is-plain-obj-2.1.0"
       sources."isexe-2.0.0"
-      sources."js-yaml-3.13.1"
-      sources."locate-path-3.0.0"
-      sources."lodash-4.17.15"
-      sources."log-symbols-3.0.0"
+      sources."js-yaml-3.14.0"
+      sources."locate-path-6.0.0"
+      sources."log-symbols-4.0.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."ms-2.1.1"
-      sources."node-environment-flags-1.0.6"
+      sources."ms-2.1.2"
+      sources."nanoid-3.1.12"
       sources."normalize-path-3.0.0"
-      sources."object-inspect-1.7.0"
-      sources."object-keys-1.1.1"
-      sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.1.0"
       sources."once-1.4.0"
-      sources."p-limit-2.2.2"
-      sources."p-locate-3.0.0"
+      sources."p-limit-3.1.0"
+      sources."p-locate-5.0.0"
       sources."p-try-2.2.0"
-      sources."path-exists-3.0.0"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."picomatch-2.2.1"
-      sources."readdirp-3.2.0"
+      sources."picomatch-2.2.2"
+      sources."randombytes-2.1.0"
+      sources."readdirp-3.5.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."semver-5.7.1"
+      sources."safe-buffer-5.2.1"
+      sources."serialize-javascript-5.0.1"
       sources."set-blocking-2.0.0"
       sources."sprintf-js-1.0.3"
       sources."string-width-2.1.1"
-      sources."string.prototype.trimleft-2.1.1"
-      sources."string.prototype.trimright-2.1.1"
       sources."strip-ansi-4.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-6.0.0"
+      sources."strip-json-comments-3.1.1"
+      sources."supports-color-7.2.0"
       sources."to-regex-range-5.0.1"
-      sources."which-1.3.1"
+      sources."which-2.0.2"
       sources."which-module-2.0.0"
       sources."wide-align-1.1.3"
+      sources."workerpool-6.0.2"
       (sources."wrap-ansi-5.1.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
       sources."wrappy-1.0.2"
-      sources."y18n-4.0.0"
-      (sources."yargs-13.3.0" // {
+      sources."y18n-4.0.1"
+      (sources."yargs-13.3.2" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
+          sources."find-up-3.0.0"
+          sources."locate-path-3.0.0"
+          sources."p-limit-2.3.0"
+          sources."p-locate-3.0.0"
+          sources."path-exists-3.0.0"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."yargs-parser-13.1.1"
-      sources."yargs-unparser-1.6.0"
+      sources."yargs-parser-13.1.2"
+      (sources."yargs-unparser-2.0.0" // {
+        dependencies = [
+          sources."camelcase-6.2.0"
+          sources."decamelize-4.0.0"
+        ];
+      })
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3715,7 +3519,7 @@ in
       sources."commander-2.20.3"
       (sources."config-chain-1.1.12" // {
         dependencies = [
-          sources."ini-1.3.5"
+          sources."ini-1.3.8"
         ];
       })
       sources."cryptiles-0.2.2"
@@ -3728,7 +3532,6 @@ in
       sources."http-signature-0.10.1"
       sources."inherits-1.0.2"
       sources."ini-1.1.0"
-      sources."ip-regex-2.1.0"
       sources."json-stringify-safe-5.0.1"
       sources."kew-0.1.7"
       sources."mime-1.2.11"
@@ -3744,7 +3547,7 @@ in
       sources."phantomjs-1.9.7-15"
       sources."progress-1.1.8"
       sources."proto-list-1.2.4"
-      sources."psl-1.7.0"
+      sources."psl-1.8.0"
       sources."punycode-2.1.1"
       sources."qs-0.6.6"
       sources."request-2.36.0"
@@ -3753,8 +3556,9 @@ in
       sources."semver-1.1.4"
       sources."sntp-0.2.4"
       sources."throttleit-0.0.2"
-      sources."tough-cookie-3.0.1"
+      sources."tough-cookie-4.0.0"
       sources."tunnel-agent-0.4.3"
+      sources."universalify-0.1.2"
       sources."which-1.0.9"
     ];
     buildInputs = globalBuildInputs;
@@ -3794,25 +3598,24 @@ in
   sinon = nodeEnv.buildNodePackage {
     name = "sinon";
     packageName = "sinon";
-    version = "9.0.1";
+    version = "9.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sinon/-/sinon-9.0.1.tgz";
-      sha512 = "iTTyiQo5T94jrOx7X7QLBZyucUJ2WvL9J13+96HMfm2CGoJYbIPqRfl6wgNcqmzk0DI28jeGx5bUTXizkrqBmg==";
+      url = "https://registry.npmjs.org/sinon/-/sinon-9.2.3.tgz";
+      sha512 = "m+DyAWvqVHZtjnjX/nuShasykFeiZ+nPuEfD4G3gpvKGkXRhkF/6NSt2qN2FjZhfrcHXFzUzI+NLnk+42fnLEw==";
     };
     dependencies = [
-      sources."@sinonjs/commons-1.7.1"
-      sources."@sinonjs/fake-timers-6.0.0"
-      sources."@sinonjs/formatio-5.0.1"
-      sources."@sinonjs/samsam-5.0.3"
+      sources."@sinonjs/commons-1.8.2"
+      sources."@sinonjs/fake-timers-6.0.1"
+      sources."@sinonjs/samsam-5.3.1"
       sources."@sinonjs/text-encoding-0.7.1"
       sources."diff-4.0.2"
       sources."has-flag-4.0.0"
       sources."isarray-0.0.1"
-      sources."just-extend-4.1.0"
+      sources."just-extend-4.1.1"
       sources."lodash.get-4.4.2"
-      sources."nise-4.0.3"
+      sources."nise-4.0.4"
       sources."path-to-regexp-1.8.0"
-      sources."supports-color-7.1.0"
+      sources."supports-color-7.2.0"
       sources."type-detect-4.0.8"
     ];
     buildInputs = globalBuildInputs;
@@ -3828,10 +3631,10 @@ in
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
     packageName = "jshint";
-    version = "2.11.0";
+    version = "2.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz";
-      sha512 = "ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.12.0.tgz";
+      sha512 = "TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -3843,8 +3646,8 @@ in
       sources."date-now-0.1.4"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.0.1"
-          sources."entities-2.0.0"
+          sources."domelementtype-2.1.0"
+          sources."entities-2.1.0"
         ];
       })
       sources."domelementtype-1.3.1"
@@ -3858,7 +3661,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."isarray-0.0.1"
-      sources."lodash-4.17.15"
+      sources."lodash-4.17.20"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -3872,7 +3675,7 @@ in
     meta = {
       description = "Static analysis tool for JavaScript";
       homepage = "http://jshint.com/";
-      license = "(MIT AND JSON)";
+      license = "MIT";
     };
     production = true;
     bypassCache = true;
@@ -3881,26 +3684,29 @@ in
   shelljs = nodeEnv.buildNodePackage {
     name = "shelljs";
     packageName = "shelljs";
-    version = "0.8.3";
+    version = "0.8.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz";
-      sha512 = "3ndzzikwq0c0084xy1s0v9q2msc8wc7qrmi0bi1llshsmlhfz4dn1k9i2r666ls7xmq62idmify0ksc1vq3mrjqcrqbm20na0m03kbx";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz";
+      sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."glob-7.1.6"
+      sources."has-1.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."interpret-1.2.0"
+      sources."interpret-1.4.0"
+      sources."is-core-module-2.2.0"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."rechoir-0.6.2"
-      sources."resolve-1.15.1"
+      sources."resolve-1.19.0"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index b565c6d2f5d..baacee29ff2 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix
index 7ccb5cab835..3c03a5f0c08 100644
--- a/pkgs/misc/base16-builder/node-packages-generated.nix
+++ b/pkgs/misc/base16-builder/node-packages-generated.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -10,7 +10,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -46,7 +46,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
       };
     };
     "are-we-there-yet-1.1.5" = {
@@ -55,7 +55,7 @@ let
       version = "1.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
-        sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
       };
     };
     "argparse-1.0.10" = {
@@ -64,7 +64,7 @@ let
       version = "1.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
       };
     };
     "array-find-index-1.0.2" = {
@@ -100,7 +100,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
     "bulk-replace-0.0.1" = {
@@ -136,7 +136,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz";
-        sha512 = "2mv8dgq8fr86zs5mam6bkp0j241lpb5rbwpq8zc5gkj7f8zir1cd71m0yyy8zy46hvf86b9k7pbhvkz08ii4mhxh14xshkrgik0p14r";
+        sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
       };
     };
     "chalk-1.1.3" = {
@@ -154,7 +154,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
-        sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "code-point-at-1.1.0" = {
@@ -229,13 +229,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "debug-3.2.6" = {
+    "debug-3.2.7" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.6";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
-        sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
+        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
     "decamelize-1.2.0" = {
@@ -253,7 +253,7 @@ let
       version = "0.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
-        sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c";
+        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
     "delegates-1.0.0" = {
@@ -298,7 +298,7 @@ let
       version = "2.7.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
-        sha512 = "2ad39acbba96hqbgf714pacri515xjn8jd43bkfb1wwp04vflpjj0qhnnmsq074g7d1kycyj1bmf620s43qb3x74hrfb4ky3v5axygf";
+        sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
     "error-ex-1.3.2" = {
@@ -307,7 +307,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
-        sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd";
+        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -325,7 +325,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
-        sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq";
+        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
       };
     };
     "filled-array-1.1.0" = {
@@ -352,7 +352,7 @@ let
       version = "1.2.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
-        sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r";
+        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
       };
     };
     "fs-promise-0.3.1" = {
@@ -373,6 +373,15 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
+    "function-bind-1.1.1" = {
+      name = "function-bind";
+      packageName = "function-bind";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
+        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+      };
+    };
     "gauge-2.7.4" = {
       name = "gauge";
       packageName = "gauge";
@@ -397,7 +406,7 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
     "got-5.7.1" = {
@@ -409,13 +418,22 @@ let
         sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
       };
     };
-    "graceful-fs-4.2.3" = {
+    "graceful-fs-4.2.4" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.3";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
-        sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
+        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
+      };
+    };
+    "has-1.0.3" = {
+      name = "has";
+      packageName = "has";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
+        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
       };
     };
     "has-ansi-2.0.0" = {
@@ -436,13 +454,13 @@ let
         sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
       };
     };
-    "hepburn-1.1.1" = {
+    "hepburn-1.2.0" = {
       name = "hepburn";
       packageName = "hepburn";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz";
-        sha512 = "3vc0v8438m2a8yw40nfhqw4ldddxkzjsimpq24c9la9ik0mnr5g8wbhnxpvlf1j39m2x5fin2d82kzjdpzf22shb0wfkpadqacdjk9s";
+        url = "https://registry.npmjs.org/hepburn/-/hepburn-1.2.0.tgz";
+        sha512 = "xWjHb03dN/ivNcqG2vqA//sHQ0oapYGZ9QV/2TR7m2+cggxzoVpbDxZn9s/Zm1tF88/7a1IpdZyn00tNP5oABA==";
       };
     };
     "hosted-git-info-2.8.8" = {
@@ -451,7 +469,7 @@ let
       version = "2.8.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
-        sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z";
+        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
       };
     };
     "iconv-lite-0.4.24" = {
@@ -460,7 +478,7 @@ let
       version = "0.4.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
       };
     };
     "ignore-walk-3.0.3" = {
@@ -469,7 +487,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
-        sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv";
+        sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
       };
     };
     "imurmurhash-0.1.4" = {
@@ -505,16 +523,16 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.5" = {
+    "ini-1.3.8" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.5";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
+        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -526,13 +544,22 @@ let
         sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
       };
     };
+    "is-core-module-2.2.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
+        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
+      };
+    };
     "is-finite-1.1.0" = {
       name = "is-finite";
       packageName = "is-finite";
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
-        sha512 = "3gj0k3vlpbc7zg5xkl8yjnilqs2dmk3ks67shchrfmnzkj6r4aad994xwfczx99ccjx6cixdqg4sawk2m92lqhh6jmfl17zlnv8rp3i";
+        sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -577,7 +604,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
-        sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5";
+        sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
       };
     };
     "is-stream-1.1.0" = {
@@ -607,13 +634,13 @@ let
         sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
       };
     };
-    "js-yaml-3.13.1" = {
+    "js-yaml-3.14.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.13.1";
+      version = "3.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
-        sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
+        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
       };
     };
     "keypress-0.1.0" = {
@@ -640,7 +667,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz";
-        sha512 = "1y0l6pib2v3nrpa6n9axb2mmjd5s50a2kqbvm7jp2zhr7dpdz0ym73kvi7h1g9i9fw6jqaiwxkas7av1fn7qjk2rgmrnkwpag50ddw9";
+        sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA==";
       };
     };
     "load-json-file-1.1.0" = {
@@ -667,7 +694,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
+        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
       };
     };
     "map-obj-1.0.1" = {
@@ -694,16 +721,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
     "minimist-1.2.5" = {
@@ -712,7 +730,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "minipass-2.9.0" = {
@@ -721,7 +739,7 @@ let
       version = "2.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
-        sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3";
+        sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
       };
     };
     "minizlib-1.3.3" = {
@@ -730,43 +748,43 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
-        sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9";
+        sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
       };
     };
-    "mkdirp-0.5.1" = {
+    "mkdirp-0.5.5" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.1";
+      version = "0.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
       };
     };
-    "ms-2.1.2" = {
+    "ms-2.1.3" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.2";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
       };
     };
-    "nan-2.14.0" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
-        sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0";
-      };
-    };
-    "needle-2.4.0" = {
+    "needle-2.6.0" = {
       name = "needle";
       packageName = "needle";
-      version = "2.4.0";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
-        sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0";
+        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
+        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
+      };
+    };
+    "node-addon-api-3.1.0" = {
+      name = "node-addon-api";
+      packageName = "node-addon-api";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz";
+        sha512 = "flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==";
       };
     };
     "node-pre-gyp-0.14.0" = {
@@ -775,7 +793,7 @@ let
       version = "0.14.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
-        sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq";
+        sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==";
       };
     };
     "node-status-codes-1.0.0" = {
@@ -787,13 +805,13 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
-    "nodejieba-2.4.1" = {
+    "nodejieba-2.5.1" = {
       name = "nodejieba";
       packageName = "nodejieba";
-      version = "2.4.1";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.4.1.tgz";
-        sha512 = "2w90xh2sxyp6mkyr4jp6pp72q6vv95ly3a12fzyfv5rc0xinivplz98vnpb8fx92pdxf9aj7wavl9qcl1kl6rva0s1vdrcfhsb5a6bz";
+        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.5.1.tgz";
+        sha512 = "VnJBQSl2G8swDf3ZAXMbXrMCrGFO+kVKbkB93OaBthGbEG5BrxfD8I2m7auaRX8E5C1t+hlwo3HCmQOWKkiZ9A==";
       };
     };
     "nopt-4.0.3" = {
@@ -802,7 +820,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
-        sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
       };
     };
     "normalize-package-data-2.5.0" = {
@@ -811,7 +829,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
-        sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z";
+        sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
       };
     };
     "npm-bundled-1.1.1" = {
@@ -820,7 +838,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
-        sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2";
+        sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
       };
     };
     "npm-normalize-package-bin-1.0.1" = {
@@ -829,7 +847,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
-        sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh";
+        sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
       };
     };
     "npm-packlist-1.4.8" = {
@@ -838,7 +856,7 @@ let
       version = "1.4.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
-        sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77";
+        sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
       };
     };
     "npmlog-4.1.2" = {
@@ -847,7 +865,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -910,7 +928,7 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
     "package-json-2.4.0" = {
@@ -955,7 +973,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
-        sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r";
+        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
       };
     };
     "path-type-1.1.0" = {
@@ -994,13 +1012,13 @@ let
         sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "pinyin-2.9.0" = {
+    "pinyin-2.9.1" = {
       name = "pinyin";
       packageName = "pinyin";
-      version = "2.9.0";
+      version = "2.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz";
-        sha512 = "3fjgppnlcvcbx314q2q32amxyvda5xzj8bgi7s131n15r8wwi94w5bnb7q2lbgag0qc4d5fhg0a14ipwvh0j7si1fmndmw4dgxi15jd";
+        url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.1.tgz";
+        sha512 = "U7kHlVP6yUYl2DV2bX4brlYWdgaAlwtqJrdkboiyri9ixRDVqVO3LD98te3PT5deN5EA9W8ywuG9GaYZfiiIlw==";
       };
     };
     "prepend-http-1.0.4" = {
@@ -1018,7 +1036,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
+        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
     "rc-1.2.8" = {
@@ -1027,7 +1045,7 @@ let
       version = "1.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
-        sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb";
+        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
       };
     };
     "read-all-stream-3.1.0" = {
@@ -1063,7 +1081,7 @@ let
       version = "2.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
     "redent-1.0.0" = {
@@ -1081,7 +1099,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz";
-        sha512 = "3w8zjx5s044i7wr9bqqgjfkjawg0cajc9j9gmzkqs0i420algjvkd5k27j9pvhx1yq7nvdchsl96zcyjf64n14765q0f18y1wbkmcz0";
+        sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
       };
     };
     "registry-url-3.1.0" = {
@@ -1102,13 +1120,13 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
-    "resolve-1.15.1" = {
+    "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.15.1";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
-        sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
       };
     };
     "rimraf-2.7.1" = {
@@ -1117,7 +1135,7 @@ let
       version = "2.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
-        sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -1126,7 +1144,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -1135,7 +1153,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "sax-1.2.4" = {
@@ -1144,7 +1162,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
       };
     };
     "semver-5.7.1" = {
@@ -1153,7 +1171,7 @@ let
       version = "5.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
     "semver-diff-2.1.0" = {
@@ -1174,13 +1192,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "signal-exit-3.0.2" = {
+    "signal-exit-3.0.3" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
+        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
     "slide-1.1.6" = {
@@ -1192,40 +1210,40 @@ let
         sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
       };
     };
-    "spdx-correct-3.1.0" = {
+    "spdx-correct-3.1.1" = {
       name = "spdx-correct";
       packageName = "spdx-correct";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
-        sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn";
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz";
+        sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==";
       };
     };
-    "spdx-exceptions-2.2.0" = {
+    "spdx-exceptions-2.3.0" = {
       name = "spdx-exceptions";
       packageName = "spdx-exceptions";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
-        sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r";
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
+        sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
       };
     };
-    "spdx-expression-parse-3.0.0" = {
+    "spdx-expression-parse-3.0.1" = {
       name = "spdx-expression-parse";
       packageName = "spdx-expression-parse";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
-        sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2";
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
+        sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.5" = {
+    "spdx-license-ids-3.0.7" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.5";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
+        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
       };
     };
     "speakingurl-14.0.1" = {
@@ -1234,7 +1252,7 @@ let
       version = "14.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz";
-        sha512 = "2nmh1645i59b0ij75rjrps837iipz5m67bwbv5hfn34wjcvzwsrysvdwd1ykdbd1njwazh8prbqsm0dm4lh8sb1r3l0bnmgpfzriwyl";
+        sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -1261,7 +1279,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
     "strip-ansi-3.0.1" = {
@@ -1315,7 +1333,7 @@ let
       version = "4.4.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
-        sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3";
+        sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
       };
     };
     "timed-out-3.1.3" = {
@@ -1387,7 +1405,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
-        sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf";
+        sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
       };
     };
     "wide-align-1.1.3" = {
@@ -1396,7 +1414,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
-        sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
     "widest-line-1.0.0" = {
@@ -1441,7 +1459,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
+        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
   };
@@ -1481,7 +1499,7 @@ in
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."currently-unhandled-0.4.1"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."decamelize-1.2.0"
       sources."deep-extend-0.6.0"
       sources."delegates-1.0.0"
@@ -1497,14 +1515,16 @@ in
       sources."fs-minipass-1.2.7"
       sources."fs-promise-0.3.1"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
       sources."get-stdin-4.0.1"
       sources."glob-7.1.6"
       sources."got-5.7.1"
-      sources."graceful-fs-4.2.3"
+      sources."graceful-fs-4.2.4"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-unicode-2.0.1"
-      sources."hepburn-1.1.1"
+      sources."hepburn-1.2.0"
       sources."hosted-git-info-2.8.8"
       sources."iconv-lite-0.4.24"
       sources."ignore-walk-3.0.3"
@@ -1512,8 +1532,9 @@ in
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.5"
+      sources."ini-1.3.8"
       sources."is-arrayish-0.2.1"
+      sources."is-core-module-2.2.0"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-npm-1.0.0"
@@ -1523,7 +1544,7 @@ in
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
-      sources."js-yaml-3.13.1"
+      sources."js-yaml-3.14.1"
       sources."keypress-0.1.0"
       sources."latest-version-2.0.0"
       sources."limax-1.7.0"
@@ -1531,22 +1552,18 @@ in
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
       sources."map-obj-1.0.1"
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."meow-3.7.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.1"
-      sources."ms-2.1.2"
-      sources."nan-2.14.0"
-      sources."needle-2.4.0"
+      sources."mkdirp-0.5.5"
+      sources."ms-2.1.3"
+      sources."needle-2.6.0"
+      sources."node-addon-api-3.1.0"
       sources."node-pre-gyp-0.14.0"
       sources."node-status-codes-1.0.0"
-      sources."nodejieba-2.4.1"
+      sources."nodejieba-2.5.1"
       sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
       sources."npm-bundled-1.1.1"
@@ -1569,14 +1586,10 @@ in
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      sources."pinyin-2.9.0"
+      sources."pinyin-2.9.1"
       sources."prepend-http-1.0.4"
       sources."process-nextick-args-2.0.1"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."read-all-stream-3.1.0"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
@@ -1585,7 +1598,7 @@ in
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."repeating-2.0.1"
-      sources."resolve-1.15.1"
+      sources."resolve-1.19.0"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -1593,12 +1606,12 @@ in
       sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.3"
       sources."slide-1.1.6"
-      sources."spdx-correct-3.1.0"
-      sources."spdx-exceptions-2.2.0"
-      sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.5"
+      sources."spdx-correct-3.1.1"
+      sources."spdx-exceptions-2.3.0"
+      sources."spdx-expression-parse-3.0.1"
+      sources."spdx-license-ids-3.0.7"
       sources."speakingurl-14.0.1"
       sources."sprintf-js-1.0.3"
       sources."string-width-1.0.2"
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index 396f2b2657d..79748949ff7 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -7,15 +7,15 @@
 let
   globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
     inherit nodeEnv;
-    inherit (pkgs) fetchurl fetchgit;
+    inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit;
   });
   nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv globalBuildInputs;
 }
diff --git a/pkgs/misc/base16-builder/supplement.nix b/pkgs/misc/base16-builder/supplement.nix
index 3d4c43d5e70..104cda58dc0 100644
--- a/pkgs/misc/base16-builder/supplement.nix
+++ b/pkgs/misc/base16-builder/supplement.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -10,7 +10,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -28,7 +28,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
       };
     };
     "are-we-there-yet-1.1.5" = {
@@ -37,7 +37,7 @@ let
       version = "1.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
-        sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -55,7 +55,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
     "chownr-1.1.4" = {
@@ -64,7 +64,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
-        sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "code-point-at-1.1.0" = {
@@ -103,13 +103,13 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "debug-3.2.6" = {
+    "debug-3.2.7" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.6";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
-        sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
+        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
     "deep-extend-0.6.0" = {
@@ -118,7 +118,7 @@ let
       version = "0.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
-        sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c";
+        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
     "delegates-1.0.0" = {
@@ -145,7 +145,7 @@ let
       version = "1.2.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
-        sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r";
+        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -172,7 +172,7 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
     "has-unicode-2.0.1" = {
@@ -190,7 +190,7 @@ let
       version = "0.4.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
       };
     };
     "ignore-walk-3.0.3" = {
@@ -199,7 +199,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
-        sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv";
+        sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
       };
     };
     "inflight-1.0.6" = {
@@ -217,16 +217,16 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.5" = {
+    "ini-1.3.8" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.5";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
+        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -253,16 +253,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
     "minimist-1.2.5" = {
@@ -271,7 +262,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "minipass-2.9.0" = {
@@ -280,7 +271,7 @@ let
       version = "2.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
-        sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3";
+        sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
       };
     };
     "minizlib-1.3.3" = {
@@ -289,34 +280,34 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
-        sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9";
+        sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
       };
     };
-    "mkdirp-0.5.1" = {
+    "mkdirp-0.5.5" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.1";
+      version = "0.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
       };
     };
-    "ms-2.1.2" = {
+    "ms-2.1.3" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.2";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
       };
     };
-    "needle-2.4.0" = {
+    "needle-2.6.0" = {
       name = "needle";
       packageName = "needle";
-      version = "2.4.0";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
-        sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0";
+        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
+        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
       };
     };
     "nopt-4.0.3" = {
@@ -325,7 +316,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
-        sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
       };
     };
     "npm-bundled-1.1.1" = {
@@ -334,7 +325,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
-        sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2";
+        sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
       };
     };
     "npm-normalize-package-bin-1.0.1" = {
@@ -343,7 +334,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
-        sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh";
+        sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
       };
     };
     "npm-packlist-1.4.8" = {
@@ -352,7 +343,7 @@ let
       version = "1.4.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
-        sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77";
+        sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
       };
     };
     "npmlog-4.1.2" = {
@@ -361,7 +352,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -415,7 +406,7 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
     "path-is-absolute-1.0.1" = {
@@ -433,7 +424,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
+        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
     "rc-1.2.8" = {
@@ -442,7 +433,7 @@ let
       version = "1.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
-        sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb";
+        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
       };
     };
     "readable-stream-2.3.7" = {
@@ -451,7 +442,7 @@ let
       version = "2.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
     "rimraf-2.7.1" = {
@@ -460,7 +451,7 @@ let
       version = "2.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
-        sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -469,7 +460,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -478,7 +469,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "sax-1.2.4" = {
@@ -487,7 +478,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
       };
     };
     "semver-5.7.1" = {
@@ -496,7 +487,7 @@ let
       version = "5.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -508,13 +499,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "signal-exit-3.0.2" = {
+    "signal-exit-3.0.3" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
+        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
     "string-width-1.0.2" = {
@@ -532,7 +523,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
     "strip-ansi-3.0.1" = {
@@ -559,7 +550,7 @@ let
       version = "4.4.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
-        sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3";
+        sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -577,7 +568,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
-        sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
     "wrappy-1.0.2" = {
@@ -595,7 +586,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
+        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
   };
@@ -604,10 +595,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.14.0";
+    version = "0.17.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
-      sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz";
+      sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -621,7 +612,7 @@ in
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."deep-extend-0.6.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
@@ -634,16 +625,16 @@ in
       sources."ignore-walk-3.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.5"
+      sources."ini-1.3.8"
       sources."is-fullwidth-code-point-1.0.0"
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.1"
-      sources."ms-2.1.2"
-      sources."needle-2.4.0"
+      sources."mkdirp-0.5.5"
+      sources."ms-2.1.3"
+      sources."needle-2.6.0"
       sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
@@ -657,11 +648,7 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.1"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
@@ -669,7 +656,7 @@ in
       sources."sax-1.2.4"
       sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.3"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 693eeaeaec6..e0d21f7d44d 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
index a2045ee15f1..39a19f8498a 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
@@ -1,34 +1,43 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/code-frame-7.10.3" = {
+    "@babel/code-frame-7.12.11" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.10.3";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz";
-        sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
+        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
       };
     };
-    "@babel/helper-validator-identifier-7.10.3" = {
+    "@babel/helper-validator-identifier-7.12.11" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
-      version = "7.10.3";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz";
-        sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
+        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
       };
     };
-    "@babel/highlight-7.10.3" = {
+    "@babel/highlight-7.10.4" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.10.3";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz";
-        sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz";
+        sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
+      };
+    };
+    "@babel/runtime-7.12.5" = {
+      name = "_at_babel_slash_runtime";
+      packageName = "@babel/runtime";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
+        sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
       };
     };
     "@dabh/diagnostics-2.0.2" = {
@@ -58,22 +67,22 @@ let
         sha512 = "x2B4hyoxjg62cxf4M5QRomx+xYp2XoajPKdd24SM2Sl4m+IrzwKzmcrysQuYmF6BMsm3IoTKymW5BBGckHGTIw==";
       };
     };
-    "@slack/types-1.7.0" = {
+    "@slack/types-1.10.0" = {
       name = "_at_slack_slash_types";
       packageName = "@slack/types";
-      version = "1.7.0";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@slack/types/-/types-1.7.0.tgz";
-        sha512 = "aigLPmTO513JxeFyeII/74y+S5jU39tabDWPsZyMHJWCYqK3vCkRvV73NL+Ay+Tq5RC2NgSmkedk1wvQJ6oXLg==";
+        url = "https://registry.npmjs.org/@slack/types/-/types-1.10.0.tgz";
+        sha512 = "tA7GG7Tj479vojfV3AoxbckalA48aK6giGjNtgH6ihpLwTyHE3fIgRrvt8TWfLwW8X8dyu7vgmAsGLRG7hWWOg==";
       };
     };
-    "@slack/web-api-5.10.0" = {
+    "@slack/web-api-5.15.0" = {
       name = "_at_slack_slash_web-api";
       packageName = "@slack/web-api";
-      version = "5.10.0";
+      version = "5.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.10.0.tgz";
-        sha512 = "t8c2lcSrdX8LIUOS1RvslbBBKvuNaTtbEcrWai4yDGkiNIxzhk+dHPcJzd7A4A0DkAgiEwXeezR7RCELuG8WgQ==";
+        url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.15.0.tgz";
+        sha512 = "tjQ8Zqv/Fmj9SOL9yIEd7IpTiKfKHi9DKAkfRVeotoX0clMr3SqQtBqO+KZMX27gm7dmgJsQaDKlILyzdCO+IA==";
       };
     };
     "@types/body-parser-1.19.0" = {
@@ -94,40 +103,40 @@ let
         sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==";
       };
     };
-    "@types/chai-4.2.11" = {
+    "@types/chai-4.2.14" = {
       name = "_at_types_slash_chai";
       packageName = "@types/chai";
-      version = "4.2.11";
+      version = "4.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz";
-        sha512 = "t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==";
+        url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.14.tgz";
+        sha512 = "G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==";
       };
     };
-    "@types/connect-3.4.33" = {
+    "@types/connect-3.4.34" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.33";
+      version = "3.4.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz";
-        sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz";
+        sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==";
       };
     };
-    "@types/express-4.17.6" = {
+    "@types/express-4.17.11" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.6";
+      version = "4.17.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz";
-        sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz";
+        sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==";
       };
     };
-    "@types/express-serve-static-core-4.17.7" = {
+    "@types/express-serve-static-core-4.17.18" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.7";
+      version = "4.17.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz";
-        sha512 = "EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
+        sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
       };
     };
     "@types/is-stream-1.1.0" = {
@@ -139,13 +148,13 @@ let
         sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg==";
       };
     };
-    "@types/mime-2.0.2" = {
+    "@types/mime-1.3.2" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
-      version = "2.0.2";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.2.tgz";
-        sha512 = "4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q==";
+        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
+        sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
       };
     };
     "@types/mocha-7.0.2" = {
@@ -157,22 +166,22 @@ let
         sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==";
       };
     };
-    "@types/nedb-1.8.9" = {
+    "@types/nedb-1.8.11" = {
       name = "_at_types_slash_nedb";
       packageName = "@types/nedb";
-      version = "1.8.9";
+      version = "1.8.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.9.tgz";
-        sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ==";
+        url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz";
+        sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw==";
       };
     };
-    "@types/node-13.9.3" = {
+    "@types/node-13.13.40" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.9.3";
+      version = "13.13.40";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz";
-        sha512 = "28ci34pqk99zkrqa473xlzfms3j6nj4nl2i69ghpbjvw2mh68bd0nd2shb78i09gng4d0fj65l2njrqbdjzmhqix4fvqyiarrlkwnyk";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.40.tgz";
+        sha512 = "eKaRo87lu1yAXrzEJl0zcJxfUMDT5/mZalFyOkT44rnQps41eS2pfWzbaulSPpQLFNy29bFqn+Y5lOTL8ATlEQ==";
       };
     };
     "@types/node-emoji-1.8.1" = {
@@ -202,13 +211,13 @@ let
         sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ==";
       };
     };
-    "@types/qs-6.9.3" = {
+    "@types/qs-6.9.5" = {
       name = "_at_types_slash_qs";
       packageName = "@types/qs";
-      version = "6.9.3";
+      version = "6.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.3.tgz";
-        sha512 = "7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA==";
+        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz";
+        sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==";
       };
     };
     "@types/randomstring-1.1.6" = {
@@ -256,13 +265,13 @@ let
         sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==";
       };
     };
-    "@types/serve-static-1.13.4" = {
+    "@types/serve-static-1.13.9" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.4";
+      version = "1.13.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.4.tgz";
-        sha512 = "jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
+        sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
       };
     };
     "@types/tough-cookie-4.0.0" = {
@@ -283,22 +292,22 @@ let
         sha512 = "WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g==";
       };
     };
-    "@types/ws-7.2.5" = {
+    "@types/ws-7.4.0" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "7.2.5";
+      version = "7.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.5.tgz";
-        sha512 = "4UEih9BI1nBKii385G9id1oFrSkLcClbwtDfcYj8HJLQqZVAtb/42vXVrYvRWCcufNF/a+rZD3MxNwghA7UmCg==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.0.tgz";
+        sha512 = "Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw==";
       };
     };
-    "@types/yargs-13.0.9" = {
+    "@types/yargs-13.0.11" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "13.0.9";
+      version = "13.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz";
-        sha512 = "xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz";
+        sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==";
       };
     };
     "@types/yargs-parser-13.1.0" = {
@@ -347,13 +356,13 @@ let
         sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
       };
     };
-    "ajv-6.12.2" = {
+    "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.2";
+      version = "6.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz";
-        sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
+        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
     "another-json-0.2.0" = {
@@ -401,6 +410,15 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
+    "ansi-styles-4.3.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
+        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
+      };
+    };
     "anymatch-3.1.1" = {
       name = "anymatch";
       packageName = "anymatch";
@@ -464,13 +482,13 @@ let
         sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
       };
     };
-    "assert-options-0.6.2" = {
+    "assert-options-0.7.0" = {
       name = "assert-options";
       packageName = "assert-options";
-      version = "0.6.2";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz";
-        sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw==";
+        url = "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz";
+        sha512 = "7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ==";
       };
     };
     "assert-plus-1.0.0" = {
@@ -536,31 +554,22 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.10.0" = {
+    "aws4-1.11.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.10.0";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz";
-        sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
+        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
-    "axios-0.19.2" = {
+    "axios-0.21.1" = {
       name = "axios";
       packageName = "axios";
-      version = "0.19.2";
+      version = "0.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
-        sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
-      };
-    };
-    "babel-runtime-6.26.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
-        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+        url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
+        sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -599,13 +608,13 @@ let
         sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     };
-    "binary-extensions-2.0.0" = {
+    "binary-extensions-2.2.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.0.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz";
-        sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
+        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
       };
     };
     "binary-search-tree-0.2.5" = {
@@ -626,22 +635,13 @@ let
         sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524";
       };
     };
-    "bluebird-2.11.0" = {
+    "bluebird-3.7.2" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "2.11.0";
+      version = "3.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz";
-        sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
-      };
-    };
-    "bluebird-3.5.5" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.5.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
-        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
+        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
       };
     };
     "body-parser-1.19.0" = {
@@ -734,6 +734,15 @@ let
         sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
       };
     };
+    "call-bind-1.0.2" = {
+      name = "call-bind";
+      packageName = "call-bind";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
+        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
+      };
+    };
     "camelcase-5.3.1" = {
       name = "camelcase";
       packageName = "camelcase";
@@ -770,6 +779,15 @@ let
         sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
+    "chalk-4.1.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz";
+        sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==";
+      };
+    };
     "check-error-1.0.2" = {
       name = "check-error";
       packageName = "check-error";
@@ -788,13 +806,13 @@ let
         sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==";
       };
     };
-    "chokidar-3.4.0" = {
+    "chokidar-3.5.1" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.4.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz";
-        sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz";
+        sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==";
       };
     };
     "cliui-5.0.0" = {
@@ -824,6 +842,15 @@ let
         sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
       };
     };
+    "color-convert-2.0.1" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz";
+        sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
+      };
+    };
     "color-name-1.1.3" = {
       name = "color-name";
       packageName = "color-name";
@@ -833,13 +860,22 @@ let
         sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
       };
     };
-    "color-string-1.5.3" = {
+    "color-name-1.1.4" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz";
+        sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
+      };
+    };
+    "color-string-1.5.4" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.5.3";
+      version = "1.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz";
-        sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz";
+        sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==";
       };
     };
     "colors-1.4.0" = {
@@ -878,13 +914,13 @@ let
         sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
-    "commander-3.0.2" = {
+    "commander-5.1.0" = {
       name = "commander";
       packageName = "commander";
-      version = "3.0.2";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz";
-        sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==";
+        url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz";
+        sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
       };
     };
     "concat-map-0.0.1" = {
@@ -932,15 +968,6 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "core-js-2.6.11" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "2.6.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
-        sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
-      };
-    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -977,15 +1004,6 @@ let
         sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
-    "debug-3.1.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
-      };
-    };
     "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
@@ -1121,13 +1139,13 @@ let
         sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     };
-    "es-abstract-1.17.6" = {
+    "es-abstract-1.18.0-next.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.17.6";
+      version = "1.18.0-next.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz";
-        sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
+        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -1193,13 +1211,13 @@ let
         sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==";
       };
     };
-    "eventemitter3-4.0.4" = {
+    "eventemitter3-4.0.7" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "4.0.4";
+      version = "4.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz";
-        sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz";
+        sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==";
       };
     };
     "express-4.17.1" = {
@@ -1283,6 +1301,15 @@ let
         sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ==";
       };
     };
+    "file-stream-rotator-0.5.7" = {
+      name = "file-stream-rotator";
+      packageName = "file-stream-rotator";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.5.7.tgz";
+        sha512 = "VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ==";
+      };
+    };
     "fill-range-7.0.1" = {
       name = "fill-range";
       packageName = "fill-range";
@@ -1319,13 +1346,13 @@ let
         sha512 = "3l+5/1tuw616Lgb0QBimxfdd2TqaDGpfCBpfX6EqtFmqUV3FtQnVEX4Aa62DagYEqnsTIjZcTfbq9msDbXYgyA==";
       };
     };
-    "flat-4.1.0" = {
+    "flat-4.1.1" = {
       name = "flat";
       packageName = "flat";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz";
-        sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==";
+        url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz";
+        sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==";
       };
     };
     "fn.name-1.1.0" = {
@@ -1337,13 +1364,13 @@ let
         sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
       };
     };
-    "follow-redirects-1.5.10" = {
+    "follow-redirects-1.13.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.5.10";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
-        sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz";
+        sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==";
       };
     };
     "forever-agent-0.6.1" = {
@@ -1409,6 +1436,15 @@ let
         sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
       };
     };
+    "fsevents-2.3.1" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz";
+        sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==";
+      };
+    };
     "function-bind-1.1.1" = {
       name = "function-bind";
       packageName = "function-bind";
@@ -1454,6 +1490,15 @@ let
         sha1 = "ead774abee72e20409433a066366023dd6887a41";
       };
     };
+    "get-intrinsic-1.0.2" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
+        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
+      };
+    };
     "getpass-0.1.7" = {
       name = "getpass";
       packageName = "getpass";
@@ -1499,13 +1544,13 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-5.1.3" = {
+    "har-validator-5.1.5" = {
       name = "har-validator";
       packageName = "har-validator";
-      version = "5.1.3";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
-        sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz";
+        sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==";
       };
     };
     "has-1.0.3" = {
@@ -1526,6 +1571,15 @@ let
         sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
+    "has-flag-4.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz";
+        sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
+      };
+    };
     "has-symbols-1.0.1" = {
       name = "has-symbols";
       packageName = "has-symbols";
@@ -1625,22 +1679,31 @@ let
         sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
       };
     };
-    "is-buffer-2.0.4" = {
+    "is-buffer-2.0.5" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
-        sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz";
+        sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==";
       };
     };
-    "is-callable-1.2.0" = {
+    "is-callable-1.2.2" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.2.0";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz";
-        sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
+        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
+      };
+    };
+    "is-core-module-2.2.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
+        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
       };
     };
     "is-date-object-1.0.2" = {
@@ -1688,13 +1751,22 @@ let
         sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==";
       };
     };
-    "is-my-json-valid-2.20.0" = {
+    "is-my-json-valid-2.20.5" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.20.0";
+      version = "2.20.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz";
-        sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz";
+        sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A==";
+      };
+    };
+    "is-negative-zero-2.0.1" = {
+      name = "is-negative-zero";
+      packageName = "is-negative-zero";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
+        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
       };
     };
     "is-number-7.0.0" = {
@@ -1715,13 +1787,13 @@ let
         sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
       };
     };
-    "is-regex-1.1.0" = {
+    "is-regex-1.1.1" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz";
-        sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
+        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
       };
     };
     "is-stream-1.1.0" = {
@@ -1805,13 +1877,13 @@ let
         sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
       };
     };
-    "js-yaml-3.14.0" = {
+    "js-yaml-3.14.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.0";
+      version = "3.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
-        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
+        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
       };
     };
     "jsbn-0.1.1" = {
@@ -1850,13 +1922,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "jsonpointer-4.0.1" = {
+    "jsonpointer-4.1.0" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.0.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
-        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz";
+        sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==";
       };
     };
     "jsprim-1.4.1" = {
@@ -1886,13 +1958,13 @@ let
         sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e";
       };
     };
-    "localforage-1.7.4" = {
+    "localforage-1.9.0" = {
       name = "localforage";
       packageName = "localforage";
-      version = "1.7.4";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/localforage/-/localforage-1.7.4.tgz";
-        sha512 = "3EmVZatmNVeCo/t6Te7P06h2alGwbq8wXlSkcSXMvDE2/edPmsVqTPlzGnZaqwZZDBs6v+kxWpqjVsqsNJT8jA==";
+        url = "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz";
+        sha512 = "rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==";
       };
     };
     "locate-path-3.0.0" = {
@@ -1904,13 +1976,13 @@ let
         sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
-    "lodash-4.17.15" = {
+    "lodash-4.17.20" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.15";
+      version = "4.17.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
-        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
+        sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
       };
     };
     "lodash.toarray-4.4.0" = {
@@ -1949,13 +2021,13 @@ let
         sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";
       };
     };
-    "loglevel-1.6.8" = {
+    "loglevel-1.7.1" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.6.8";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz";
-        sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz";
+        sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==";
       };
     };
     "make-error-1.3.6" = {
@@ -1967,31 +2039,31 @@ let
         sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
-    "matrix-appservice-0.4.1" = {
+    "matrix-appservice-0.4.2" = {
       name = "matrix-appservice";
       packageName = "matrix-appservice";
-      version = "0.4.1";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.4.1.tgz";
-        sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA==";
+        url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.4.2.tgz";
+        sha512 = "YD2zFiPo9FedjA86gfWFN2UVDwDBhWL1Kas/txG0iwpT6jcJmOvpPqbfuFeYk3Q3G3c5BZ8k8tABMpzS9Bu39A==";
       };
     };
-    "matrix-appservice-bridge-1.12.2" = {
+    "matrix-appservice-bridge-1.13.2" = {
       name = "matrix-appservice-bridge";
       packageName = "matrix-appservice-bridge";
-      version = "1.12.2";
+      version = "1.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz";
-        sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ==";
+        url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.13.2.tgz";
+        sha512 = "9sVLKeZAKTVDgYPlsJwiShD1AAXHKbh5a85KUkU8gvD0zg7EZOiNjgelltZ1qrutmv4cyJO3sSUzvUVBCKOXuQ==";
       };
     };
-    "matrix-js-sdk-2.4.6" = {
+    "matrix-js-sdk-6.2.2" = {
       name = "matrix-js-sdk";
       packageName = "matrix-js-sdk";
-      version = "2.4.6";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-2.4.6.tgz";
-        sha512 = "ydU64WwAYFjaTJ7JTv/JM3HmSY7leHWm3x3j0J4KWVhDDxsLoQ/v8Tc6FwlVom9/B9VvGTk+AG3aY0zgNk8LQg==";
+        url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz";
+        sha512 = "uTXmKVzl7GXM3R70cl2E87H+mtwN3ILqPeB80Z/2ITN9Vaf9pMURCCAuHePEBXbhnD7DOZj7Cke42uP+ByR6Hw==";
       };
     };
     "media-typer-0.3.0" = {
@@ -2030,22 +2102,22 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.44.0" = {
+    "mime-db-1.45.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.44.0";
+      version = "1.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
-        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
+        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
       };
     };
-    "mime-types-2.1.27" = {
+    "mime-types-2.1.28" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.27";
+      version = "2.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
-        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
+        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
       };
     };
     "minimatch-3.0.4" = {
@@ -2084,13 +2156,13 @@ let
         sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==";
       };
     };
-    "moment-2.27.0" = {
+    "moment-2.29.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.27.0";
+      version = "2.29.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz";
-        sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==";
+        url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz";
+        sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==";
       };
     };
     "morgan-1.10.0" = {
@@ -2120,13 +2192,13 @@ let
         sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
       };
     };
-    "ms-2.1.2" = {
+    "ms-2.1.3" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.2";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
       };
     };
     "nedb-1.8.0" = {
@@ -2165,13 +2237,13 @@ let
         sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==";
       };
     };
-    "nopt-3.0.6" = {
+    "nopt-4.0.3" = {
       name = "nopt";
       packageName = "nopt";
-      version = "3.0.6";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
-        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
       };
     };
     "normalize-path-3.0.0" = {
@@ -2183,13 +2255,13 @@ let
         sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
-    "nunjucks-3.2.1" = {
+    "nunjucks-3.2.2" = {
       name = "nunjucks";
       packageName = "nunjucks";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.1.tgz";
-        sha512 = "LYlVuC1ZNSalQQkLNNPvcgPt2M9FTY9bs39mTCuFXtqh7jWbYzhDlmz2M6onPiXEhdZo+b9anRhc+uBGuJZ2bQ==";
+        url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.2.tgz";
+        sha512 = "KUi85OoF2NMygwODAy28Lh9qHmq5hO3rBlbkYoC8v377h4l8Pt5qFjILl0LWpMbOrZ18CzfVVUvIHUIrtED3sA==";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -2210,13 +2282,22 @@ let
         sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==";
       };
     };
-    "object-inspect-1.8.0" = {
+    "object-hash-2.1.1" = {
+      name = "object-hash";
+      packageName = "object-hash";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz";
+        sha512 = "VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==";
+      };
+    };
+    "object-inspect-1.9.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.8.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
-        sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
+        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -2237,13 +2318,22 @@ let
         sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.getownpropertydescriptors-2.1.0" = {
+    "object.assign-4.1.2" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
+      };
+    };
+    "object.getownpropertydescriptors-2.1.1" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
-        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz";
+        sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==";
       };
     };
     "on-finished-2.3.0" = {
@@ -2282,6 +2372,33 @@ let
         sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==";
       };
     };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+      };
+    };
     "p-cancelable-1.1.0" = {
       name = "p-cancelable";
       packageName = "p-cancelable";
@@ -2327,13 +2444,13 @@ let
         sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng==";
       };
     };
-    "p-queue-6.4.0" = {
+    "p-queue-6.6.2" = {
       name = "p-queue";
       packageName = "p-queue";
-      version = "6.4.0";
+      version = "6.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz";
-        sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw==";
+        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz";
+        sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==";
       };
     };
     "p-retry-4.2.0" = {
@@ -2435,22 +2552,22 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "pg-8.2.1" = {
+    "pg-8.5.1" = {
       name = "pg";
       packageName = "pg";
-      version = "8.2.1";
+      version = "8.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg/-/pg-8.2.1.tgz";
-        sha512 = "DKzffhpkWRr9jx7vKxA+ur79KG+SKw+PdjMb1IRhMiKI9zqYUGczwFprqy+5Veh/DCcFs1Y6V8lRLN5I1DlleQ==";
+        url = "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz";
+        sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==";
       };
     };
-    "pg-connection-string-2.2.3" = {
+    "pg-connection-string-2.4.0" = {
       name = "pg-connection-string";
       packageName = "pg-connection-string";
-      version = "2.2.3";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.3.tgz";
-        sha512 = "I/KCSQGmOrZx6sMHXkOs2MjddrYcqpza3Dtsy0AjIgBr/bZiPJRK9WhABXN1Uy1UDazRbi9gZEzO2sAhL5EqiQ==";
+        url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz";
+        sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ==";
       };
     };
     "pg-int8-1.0.1" = {
@@ -2462,40 +2579,40 @@ let
         sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==";
       };
     };
-    "pg-minify-1.6.1" = {
+    "pg-minify-1.6.2" = {
       name = "pg-minify";
       packageName = "pg-minify";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz";
-        sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g==";
+        url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz";
+        sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==";
       };
     };
-    "pg-pool-3.2.1" = {
+    "pg-pool-3.2.2" = {
       name = "pg-pool";
       packageName = "pg-pool";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz";
-        sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA==";
+        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz";
+        sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==";
       };
     };
-    "pg-promise-10.5.7" = {
+    "pg-promise-10.9.1" = {
       name = "pg-promise";
       packageName = "pg-promise";
-      version = "10.5.7";
+      version = "10.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.7.tgz";
-        sha512 = "feCpn4J4MsNnR5Ve3fpbIlmbohwRirvZEI1Dcy72zwKvIKKRHPk7TJZFQHP4YQhaZ3sT3VGgg0o1/I+uhht/1g==";
+        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.9.1.tgz";
+        sha512 = "Om5sYmsm2NWXP+D0Soappb4fuidER9qNLcnVo9nBPFqwPfpnBZZPzzLaVvwBXs//+kJ9L4bBTXm2iWNAp39e2A==";
       };
     };
-    "pg-protocol-1.2.4" = {
+    "pg-protocol-1.4.0" = {
       name = "pg-protocol";
       packageName = "pg-protocol";
-      version = "1.2.4";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.4.tgz";
-        sha512 = "/8L/G+vW/VhWjTGXpGh8XVkXOFx1ZDY+Yuz//Ab8CfjInzFkreI+fDG3WjCeSra7fIZwAFxzbGptNbm8xSXenw==";
+        url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz";
+        sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==";
       };
     };
     "pg-types-2.2.0" = {
@@ -2507,13 +2624,13 @@ let
         sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==";
       };
     };
-    "pgpass-1.0.2" = {
+    "pgpass-1.0.4" = {
       name = "pgpass";
       packageName = "pgpass";
-      version = "1.0.2";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz";
-        sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306";
+        url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz";
+        sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==";
       };
     };
     "picomatch-2.2.2" = {
@@ -2543,13 +2660,13 @@ let
         sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35";
       };
     };
-    "postgres-date-1.0.5" = {
+    "postgres-date-1.0.7" = {
       name = "postgres-date";
       packageName = "postgres-date";
-      version = "1.0.5";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz";
-        sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA==";
+        url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz";
+        sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==";
       };
     };
     "postgres-interval-1.2.0" = {
@@ -2570,13 +2687,13 @@ let
         sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
-    "prom-client-11.5.3" = {
+    "prom-client-12.0.0" = {
       name = "prom-client";
       packageName = "prom-client";
-      version = "11.5.3";
+      version = "12.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz";
-        sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==";
+        url = "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz";
+        sha512 = "JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ==";
       };
     };
     "proxy-addr-2.0.6" = {
@@ -2687,22 +2804,22 @@ let
         sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==";
       };
     };
-    "readdirp-3.4.0" = {
+    "readdirp-3.5.0" = {
       name = "readdirp";
       packageName = "readdirp";
-      version = "3.4.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz";
-        sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==";
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
+        sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
       };
     };
-    "regenerator-runtime-0.11.1" = {
+    "regenerator-runtime-0.13.7" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
-      version = "0.11.1";
+      version = "0.13.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
-        sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz";
+        sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==";
       };
     };
     "request-2.88.2" = {
@@ -2714,22 +2831,22 @@ let
         sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "request-promise-core-1.1.3" = {
+    "request-promise-core-1.1.4" = {
       name = "request-promise-core";
       packageName = "request-promise-core";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz";
-        sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==";
+        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz";
+        sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==";
       };
     };
-    "request-promise-native-1.0.8" = {
+    "request-promise-native-1.0.9" = {
       name = "request-promise-native";
       packageName = "request-promise-native";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz";
-        sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==";
+        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz";
+        sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
       };
     };
     "require-directory-2.1.1" = {
@@ -2750,13 +2867,13 @@ let
         sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
       };
     };
-    "resolve-1.17.0" = {
+    "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.17.0";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz";
-        sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
       };
     };
     "retry-0.12.0" = {
@@ -2777,15 +2894,6 @@ let
         sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
-    "safe-buffer-5.2.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
-        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
-      };
-    };
     "safer-buffer-2.1.2" = {
       name = "safer-buffer";
       packageName = "safer-buffer";
@@ -2795,15 +2903,6 @@ let
         sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
-    "semver-4.3.2" = {
-      name = "semver";
-      packageName = "semver";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz";
-        sha1 = "c7a07158a80bedd052355b770d82d6640f803be7";
-      };
-    };
     "semver-5.7.1" = {
       name = "semver";
       packageName = "semver";
@@ -2885,22 +2984,22 @@ let
         sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==";
       };
     };
-    "spex-3.0.1" = {
+    "spex-3.2.0" = {
       name = "spex";
       packageName = "spex";
-      version = "3.0.1";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz";
-        sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA==";
+        url = "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz";
+        sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg==";
       };
     };
-    "split-1.0.1" = {
-      name = "split";
-      packageName = "split";
-      version = "1.0.1";
+    "split2-3.2.2" = {
+      name = "split2";
+      packageName = "split2";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
-        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
+        url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz";
+        sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -2966,22 +3065,22 @@ let
         sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
-    "string.prototype.trimend-1.0.1" = {
+    "string.prototype.trimend-1.0.3" = {
       name = "string.prototype.trimend";
       packageName = "string.prototype.trimend";
-      version = "1.0.1";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
-        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
       };
     };
-    "string.prototype.trimstart-1.0.1" = {
+    "string.prototype.trimstart-1.0.3" = {
       name = "string.prototype.trimstart";
       packageName = "string.prototype.trimstart";
-      version = "1.0.1";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
-        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
       };
     };
     "string_decoder-1.1.1" = {
@@ -2993,15 +3092,6 @@ let
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
-    "string_decoder-1.3.0" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
-        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
-      };
-    };
     "strip-ansi-4.0.0" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
@@ -3047,6 +3137,15 @@ let
         sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==";
       };
     };
+    "supports-color-7.2.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "7.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz";
+        sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
+      };
+    };
     "tdigest-0.1.1" = {
       name = "tdigest";
       packageName = "tdigest";
@@ -3065,15 +3164,6 @@ let
         sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==";
       };
     };
-    "through-2.3.8" = {
-      name = "through";
-      packageName = "through";
-      version = "2.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
-        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
-      };
-    };
     "to-regex-range-5.0.1" = {
       name = "to-regex-range";
       packageName = "to-regex-range";
@@ -3119,22 +3209,22 @@ let
         sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==";
       };
     };
-    "tslib-1.13.0" = {
+    "tslib-1.14.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz";
-        sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
+        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
-    "tslint-6.1.2" = {
+    "tslint-6.1.3" = {
       name = "tslint";
       packageName = "tslint";
-      version = "6.1.2";
+      version = "6.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz";
-        sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA==";
+        url = "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz";
+        sha512 = "IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==";
       };
     };
     "tsutils-2.29.0" = {
@@ -3182,13 +3272,13 @@ let
         sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
-    "typescript-3.9.5" = {
+    "typescript-3.9.7" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.9.5";
+      version = "3.9.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz";
-        sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz";
+        sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==";
       };
     };
     "underscore-1.4.4" = {
@@ -3218,13 +3308,13 @@ let
         sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
       };
     };
-    "uri-js-4.2.2" = {
+    "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.2.2";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
-        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
+        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -3308,13 +3398,13 @@ let
         sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
-    "winston-3.3.2" = {
+    "winston-3.3.3" = {
       name = "winston";
       packageName = "winston";
-      version = "3.3.2";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-3.3.2.tgz";
-        sha512 = "vTOrUZlyQPS8VpCcQ1JT8BumDAUe4awCHZ9nmGgO7LqkV4atj0dKa5suA7Trf7QKtBszE2yUs9d8744Kz9j4jQ==";
+        url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz";
+        sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==";
       };
     };
     "winston-compat-0.1.5" = {
@@ -3335,6 +3425,15 @@ let
         sha512 = "KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA==";
       };
     };
+    "winston-daily-rotate-file-4.5.0" = {
+      name = "winston-daily-rotate-file";
+      packageName = "winston-daily-rotate-file";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.0.tgz";
+        sha512 = "/HqeWiU48dzGqcrABRlxYWVMdL6l3uKCtFSJyrqK+E2rLnSFNsgYpvwx15EgTitBLNzH69lQd/+z2ASryV2aqw==";
+      };
+    };
     "winston-transport-4.4.0" = {
       name = "winston-transport";
       packageName = "winston-transport";
@@ -3380,13 +3479,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.0" = {
+    "y18n-4.0.1" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
+        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
       };
     };
     "yargs-13.3.2" = {
@@ -3438,9 +3537,20 @@ in
       sha256 = "cddcff326688ceddfd37eae44d3947ea84cf1d8fd2062e3c203ffbf35e2ea7f6";
     };
     dependencies = [
-      sources."@babel/code-frame-7.10.3"
-      sources."@babel/helper-validator-identifier-7.10.3"
-      sources."@babel/highlight-7.10.3"
+      sources."@babel/code-frame-7.12.11"
+      sources."@babel/helper-validator-identifier-7.12.11"
+      (sources."@babel/highlight-7.10.4" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."escape-string-regexp-1.0.5"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
+        ];
+      })
+      sources."@babel/runtime-7.12.5"
       sources."@dabh/diagnostics-2.0.2"
       sources."@slack/logger-1.1.1"
       (sources."@slack/rtm-api-5.0.5" // {
@@ -3448,47 +3558,43 @@ in
           sources."p-queue-2.4.2"
         ];
       })
-      sources."@slack/types-1.7.0"
-      (sources."@slack/web-api-5.10.0" // {
-        dependencies = [
-          sources."p-queue-2.4.2"
-        ];
-      })
+      sources."@slack/types-1.10.0"
+      sources."@slack/web-api-5.15.0"
       sources."@types/body-parser-1.19.0"
       sources."@types/caseless-0.12.2"
-      sources."@types/chai-4.2.11"
-      sources."@types/connect-3.4.33"
-      sources."@types/express-4.17.6"
-      sources."@types/express-serve-static-core-4.17.7"
+      sources."@types/chai-4.2.14"
+      sources."@types/connect-3.4.34"
+      sources."@types/express-4.17.11"
+      sources."@types/express-serve-static-core-4.17.18"
       sources."@types/is-stream-1.1.0"
-      sources."@types/mime-2.0.2"
+      sources."@types/mime-1.3.2"
       sources."@types/mocha-7.0.2"
-      sources."@types/nedb-1.8.9"
-      sources."@types/node-13.9.3"
+      sources."@types/nedb-1.8.11"
+      sources."@types/node-13.13.40"
       sources."@types/node-emoji-1.8.1"
       sources."@types/nunjucks-3.1.3"
       sources."@types/p-queue-2.3.2"
-      sources."@types/qs-6.9.3"
+      sources."@types/qs-6.9.5"
       sources."@types/randomstring-1.1.6"
       sources."@types/range-parser-1.2.3"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/retry-0.12.0"
-      sources."@types/serve-static-1.13.4"
+      sources."@types/serve-static-1.13.9"
       sources."@types/tough-cookie-4.0.0"
       sources."@types/uuid-7.0.4"
-      sources."@types/ws-7.2.5"
-      sources."@types/yargs-13.0.9"
+      sources."@types/ws-7.4.0"
+      sources."@types/yargs-13.0.11"
       sources."@types/yargs-parser-13.1.0"
       sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4"
       sources."a-sync-waterfall-1.0.1"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
-      sources."ajv-6.12.2"
+      sources."ajv-6.12.6"
       sources."another-json-0.2.0"
       sources."ansi-colors-3.2.3"
       sources."ansi-regex-4.1.0"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
       sources."arg-4.1.3"
       sources."argparse-1.0.10"
@@ -3496,29 +3602,24 @@ in
       sources."array-uniq-1.0.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
-      sources."assert-options-0.6.2"
+      sources."assert-options-0.7.0"
       sources."assert-plus-1.0.0"
       sources."assertion-error-1.1.0"
       sources."async-0.2.10"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.0"
-      sources."axios-0.19.2"
-      sources."babel-runtime-6.26.0"
+      sources."aws4-1.11.0"
+      sources."axios-0.21.1"
       sources."balanced-match-1.0.0"
       sources."base-x-3.0.8"
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.0.0"
+      sources."binary-extensions-2.2.0"
       sources."binary-search-tree-0.2.5"
       sources."bintrees-1.0.1"
-      sources."bluebird-2.11.0"
-      (sources."body-parser-1.19.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."bluebird-3.7.2"
+      sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-request-0.3.3"
@@ -3528,35 +3629,36 @@ in
       sources."buffer-writer-2.0.0"
       sources."builtin-modules-1.1.1"
       sources."bytes-3.1.0"
+      sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       sources."chai-4.2.0"
-      (sources."chalk-2.4.2" // {
+      sources."chalk-4.1.0"
+      sources."check-error-1.0.2"
+      sources."chokidar-3.5.1"
+      sources."cliui-5.0.0"
+      (sources."color-3.0.0" // {
         dependencies = [
-          sources."escape-string-regexp-1.0.5"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
         ];
       })
-      sources."check-error-1.0.2"
-      sources."chokidar-3.4.0"
-      sources."cliui-5.0.0"
-      sources."color-3.0.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."color-string-1.5.3"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
+      sources."color-string-1.5.4"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."combined-stream-1.0.8"
-      sources."commander-3.0.2"
+      sources."commander-5.1.0"
       sources."concat-map-0.0.1"
       sources."content-disposition-0.5.3"
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
-      sources."debug-3.1.0"
+      sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."deep-eql-3.0.1"
       sources."define-properties-1.1.3"
@@ -3569,55 +3671,52 @@ in
       sources."emoji-regex-7.0.3"
       sources."enabled-2.0.0"
       sources."encodeurl-1.0.2"
-      sources."es-abstract-1.17.6"
+      (sources."es-abstract-1.18.0-next.2" // {
+        dependencies = [
+          sources."object.assign-4.1.2"
+        ];
+      })
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-2.0.0"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
       sources."eventemitter3-3.1.2"
-      (sources."express-4.17.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."express-4.17.1"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fecha-4.2.0"
-      sources."file-stream-rotator-0.4.1"
+      sources."file-stream-rotator-0.5.7"
       sources."fill-range-7.0.1"
-      (sources."finalhandler-1.1.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."finalhandler-1.1.2"
       sources."find-up-3.0.0"
       sources."finity-0.5.4"
-      sources."flat-4.1.0"
+      sources."flat-4.1.1"
       sources."fn.name-1.1.0"
-      sources."follow-redirects-1.5.10"
+      sources."follow-redirects-1.13.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.5.1"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.3.1"
       sources."function-bind-1.1.1"
       sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       sources."get-caller-file-2.0.5"
       sources."get-func-name-2.0.0"
+      sources."get-intrinsic-1.0.2"
       sources."getpass-0.1.7"
       sources."glob-7.1.3"
       sources."glob-parent-5.1.1"
       sources."growl-1.10.5"
       sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
+      sources."har-validator-5.1.5"
       sources."has-1.0.3"
-      sources."has-flag-3.0.0"
+      sources."has-flag-4.0.0"
       sources."has-symbols-1.0.1"
       sources."he-1.2.0"
       sources."http-errors-1.7.2"
@@ -3629,17 +3728,19 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.3.2"
       sources."is-binary-path-2.1.0"
-      sources."is-buffer-2.0.4"
-      sources."is-callable-1.2.0"
+      sources."is-buffer-2.0.5"
+      sources."is-callable-1.2.2"
+      sources."is-core-module-2.2.0"
       sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-my-ip-valid-1.0.0"
-      sources."is-my-json-valid-2.20.0"
+      sources."is-my-json-valid-2.20.5"
+      sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
       sources."is-property-1.0.2"
-      sources."is-regex-1.1.0"
+      sources."is-regex-1.1.1"
       sources."is-stream-1.1.0"
       sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
@@ -3647,40 +3748,50 @@ in
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.0"
+      sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.1.0"
       sources."jsprim-1.4.1"
       sources."kuler-2.0.0"
       sources."lie-3.1.1"
-      sources."localforage-1.7.4"
+      sources."localforage-1.9.0"
       sources."locate-path-3.0.0"
-      sources."lodash-4.17.15"
+      sources."lodash-4.17.20"
       sources."lodash.toarray-4.4.0"
-      sources."log-symbols-3.0.0"
+      (sources."log-symbols-3.0.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."escape-string-regexp-1.0.5"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
+        ];
+      })
       (sources."logform-2.2.0" // {
         dependencies = [
-          sources."ms-2.1.2"
+          sources."ms-2.1.3"
         ];
       })
-      sources."loglevel-1.6.8"
+      sources."loglevel-1.7.1"
       sources."make-error-1.3.6"
-      sources."matrix-appservice-0.4.1"
-      sources."matrix-appservice-bridge-1.12.2"
-      (sources."matrix-js-sdk-2.4.6" // {
+      sources."matrix-appservice-0.4.2"
+      (sources."matrix-appservice-bridge-1.13.2" // {
         dependencies = [
-          sources."bluebird-3.5.5"
+          sources."winston-daily-rotate-file-4.5.0"
         ];
       })
+      sources."matrix-js-sdk-6.2.2"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdirp-0.5.5"
@@ -3689,16 +3800,17 @@ in
           sources."chokidar-3.3.0"
           sources."debug-3.2.6"
           sources."escape-string-regexp-1.0.5"
+          sources."fsevents-2.1.3"
+          sources."has-flag-3.0.0"
           sources."js-yaml-3.13.1"
           sources."ms-2.1.1"
           sources."readdirp-3.2.0"
           sources."supports-color-6.0.0"
         ];
       })
-      sources."moment-2.27.0"
+      sources."moment-2.29.1"
       (sources."morgan-1.10.0" // {
         dependencies = [
-          sources."debug-2.6.9"
           sources."depd-2.0.0"
         ];
       })
@@ -3711,26 +3823,29 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.3"
       sources."normalize-path-3.0.0"
-      sources."nunjucks-3.2.1"
+      sources."nunjucks-3.2.2"
       sources."oauth-sign-0.9.0"
-      sources."object-hash-1.3.1"
-      sources."object-inspect-1.8.0"
+      sources."object-hash-2.1.1"
+      sources."object-inspect-1.9.0"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.1.0"
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
       sources."p-limit-2.3.0"
       sources."p-locate-3.0.0"
-      (sources."p-queue-6.4.0" // {
+      (sources."p-queue-6.6.2" // {
         dependencies = [
-          sources."eventemitter3-4.0.4"
+          sources."eventemitter3-4.0.7"
         ];
       })
       sources."p-retry-4.2.0"
@@ -3744,22 +3859,22 @@ in
       sources."path-to-regexp-0.1.7"
       sources."pathval-1.1.0"
       sources."performance-now-2.1.0"
-      sources."pg-8.2.1"
-      sources."pg-connection-string-2.2.3"
+      sources."pg-8.5.1"
+      sources."pg-connection-string-2.4.0"
       sources."pg-int8-1.0.1"
-      sources."pg-minify-1.6.1"
-      sources."pg-pool-3.2.1"
-      sources."pg-promise-10.5.7"
-      sources."pg-protocol-1.2.4"
+      sources."pg-minify-1.6.2"
+      sources."pg-pool-3.2.2"
+      sources."pg-promise-10.9.1"
+      sources."pg-protocol-1.4.0"
       sources."pg-types-2.2.0"
-      sources."pgpass-1.0.2"
+      sources."pgpass-1.0.4"
       sources."picomatch-2.2.2"
       sources."postgres-array-2.0.0"
       sources."postgres-bytea-1.0.0"
-      sources."postgres-date-1.0.5"
+      sources."postgres-date-1.0.7"
       sources."postgres-interval-1.2.0"
       sources."process-nextick-args-2.0.1"
-      sources."prom-client-11.5.3"
+      sources."prom-client-12.0.0"
       sources."proxy-addr-2.0.6"
       sources."psl-1.8.0"
       sources."punycode-2.1.1"
@@ -3768,9 +3883,9 @@ in
       sources."randomstring-1.1.5"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
-      sources."readable-stream-3.6.0"
-      sources."readdirp-3.4.0"
-      sources."regenerator-runtime-0.11.1"
+      sources."readable-stream-2.3.7"
+      sources."readdirp-3.5.0"
+      sources."regenerator-runtime-0.13.7"
       (sources."request-2.88.2" // {
         dependencies = [
           sources."form-data-2.3.3"
@@ -3778,22 +3893,17 @@ in
           sources."uuid-3.4.0"
         ];
       })
-      sources."request-promise-core-1.1.3"
-      sources."request-promise-native-1.0.8"
+      sources."request-promise-core-1.1.4"
+      sources."request-promise-native-1.0.9"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.19.0"
       sources."retry-0.12.0"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-4.3.2"
+      sources."semver-6.3.0"
       (sources."send-0.17.1" // {
         dependencies = [
-          (sources."debug-2.6.9" // {
-            dependencies = [
-              sources."ms-2.0.0"
-            ];
-          })
           sources."ms-2.1.1"
         ];
       })
@@ -3803,27 +3913,26 @@ in
       sources."simple-swizzle-0.2.2"
       sources."source-map-0.6.1"
       sources."source-map-support-0.5.19"
-      sources."spex-3.0.1"
-      sources."split-1.0.1"
+      sources."spex-3.2.0"
+      (sources."split2-3.2.2" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."string-width-3.1.0"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
-      (sources."string_decoder-1.3.0" // {
-        dependencies = [
-          sources."safe-buffer-5.2.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
+      sources."string_decoder-1.1.1"
       sources."strip-ansi-5.2.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.5.0"
+      sources."supports-color-7.2.0"
       sources."tdigest-0.1.1"
       sources."text-hex-1.0.0"
-      sources."through-2.3.8"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
       sources."tough-cookie-2.5.0"
@@ -3833,12 +3942,19 @@ in
           sources."diff-4.0.2"
         ];
       })
-      sources."tslib-1.13.0"
-      (sources."tslint-6.1.2" // {
+      sources."tslib-1.14.1"
+      (sources."tslint-6.1.3" // {
         dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
           sources."commander-2.20.3"
           sources."diff-4.0.2"
+          sources."escape-string-regexp-1.0.5"
+          sources."has-flag-3.0.0"
           sources."semver-5.7.1"
+          sources."supports-color-5.5.0"
         ];
       })
       sources."tsutils-2.29.0"
@@ -3846,11 +3962,11 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-detect-4.0.8"
       sources."type-is-1.6.18"
-      sources."typescript-3.9.5"
+      sources."typescript-3.9.7"
       sources."underscore-1.4.4"
       sources."unhomoglyph-1.0.6"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.2.2"
+      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-7.0.3"
@@ -3865,35 +3981,38 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      (sources."winston-3.3.2" // {
+      (sources."winston-3.3.3" // {
         dependencies = [
           sources."async-3.2.0"
           sources."is-stream-2.0.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       (sources."winston-compat-0.1.5" // {
         dependencies = [
           sources."fecha-2.3.3"
           sources."logform-1.10.0"
-          sources."ms-2.1.2"
+          sources."ms-2.1.3"
         ];
       })
       (sources."winston-daily-rotate-file-3.10.0" // {
         dependencies = [
-          sources."semver-6.3.0"
+          sources."file-stream-rotator-0.4.1"
+          sources."object-hash-1.3.1"
         ];
       })
-      (sources."winston-transport-4.4.0" // {
+      sources."winston-transport-4.4.0"
+      (sources."wrap-ansi-5.1.0" // {
         dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."string_decoder-1.1.1"
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
         ];
       })
-      sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."ws-5.2.2"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.0"
+      sources."y18n-4.0.1"
       sources."yargs-13.3.2"
       sources."yargs-parser-13.1.2"
       sources."yargs-unparser-1.6.0"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index c8186e1d02c..47e64e9d911 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -49,13 +49,13 @@ let
         sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
       };
     };
-    "chainpad-crypto-0.2.4" = {
+    "chainpad-crypto-0.2.5" = {
       name = "chainpad-crypto";
       packageName = "chainpad-crypto";
-      version = "0.2.4";
+      version = "0.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz";
-        sha512 = "fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg==";
+        url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.5.tgz";
+        sha512 = "K9vRsAspuX+uU1goXPz0CawpLIaOHq+1JP3WfDLqaz67LbCX/MLIUt9aMcSeIJcwZ9uMpqnbMGRktyVPoz6MCA==";
       };
     };
     "chainpad-server-4.0.9" = {
@@ -337,22 +337,22 @@ let
         sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
       };
     };
-    "mime-db-1.44.0" = {
+    "mime-db-1.45.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.44.0";
+      version = "1.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
-        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
+        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
       };
     };
-    "mime-types-2.1.27" = {
+    "mime-types-2.1.28" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.27";
+      version = "2.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
-        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
+        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
       };
     };
     "ms-2.0.0" = {
@@ -562,12 +562,12 @@ let
         sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb";
       };
     };
-    "tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2" = {
+    "tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
       version = "0.12.2";
       src = fetchgit {
-        url = "git://github.com/dchest/tweetnacl-js.git";
+        url = "https://github.com/dchest/tweetnacl-js.git";
         rev = "8a21381d696acdc4e99c9f706f1ad23285795f79";
         sha256 = "10f27b673944107995b3f6dcd65caecd705acdae9c37b7e79b810a8a72a40a31";
       };
@@ -662,9 +662,9 @@ in
       sources."async-limiter-1.0.1"
       sources."body-parser-1.18.3"
       sources."bytes-3.0.0"
-      (sources."chainpad-crypto-0.2.4" // {
+      (sources."chainpad-crypto-0.2.5" // {
         dependencies = [
-          sources."tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2"
+          sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2"
         ];
       })
       sources."chainpad-server-4.0.9"
@@ -698,8 +698,8 @@ in
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.4.1"
-      sources."mime-db-1.44.0"
-      sources."mime-types-2.1.27"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
       sources."netflux-websocket-0.1.20"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index d0273cfe1f9..76d5cf6a202 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
index af58cbf3f9b..7417a916595 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -22,31 +22,31 @@ let
         sha512 = "g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ==";
       };
     };
-    "@formatjs/ecma402-abstract-1.5.0" = {
+    "@formatjs/ecma402-abstract-1.5.1" = {
       name = "_at_formatjs_slash_ecma402-abstract";
       packageName = "@formatjs/ecma402-abstract";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz";
-        sha512 = "wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==";
+        url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.1.tgz";
+        sha512 = "io9XhgIpEbc6jSdn4QVnJeFaUzy6gS5fGiIRCUJ7QKqCNp69JS8EJPW8gCtvwz+JQtx2SJvhaMJbzz3rGkTXBA==";
       };
     };
-    "@formatjs/intl-datetimeformat-3.2.2" = {
+    "@formatjs/intl-datetimeformat-3.2.3" = {
       name = "_at_formatjs_slash_intl-datetimeformat";
       packageName = "@formatjs/intl-datetimeformat";
-      version = "3.2.2";
+      version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.2.tgz";
-        sha512 = "wIqe4dPzbYB6SrJWNPKBnXkPj1pR68qtGCzHkPo8JGRpWQcVpHh3Cigw1cQs2I9M1F9dOtFHQP6gi+xsb1kAiA==";
+        url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.3.tgz";
+        sha512 = "KnQUVuctlozQHULnBi+WLZDAGznFYviVU2HqgCYin2ZEz45IJ9dIZH9gqwsIgiLDgudptHfbj98I3JeKJhprcg==";
       };
     };
-    "@formatjs/intl-displaynames-4.0.3" = {
+    "@formatjs/intl-displaynames-4.0.4" = {
       name = "_at_formatjs_slash_intl-displaynames";
       packageName = "@formatjs/intl-displaynames";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.3.tgz";
-        sha512 = "wNJZzIzlA88oyHZAFdAnLKV/srtIrU//md9SU2Bo0LKXKIukz/g5LmJlyhq6uF1oYoJzVvvTxoVXscBJmKcJmg==";
+        url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.4.tgz";
+        sha512 = "oNeLM0vZDFNZSqrz70XhxbMGtjfQ7T/UUcA9K4DvjWX6vmgCbpw5rdwEddhTotY3EmTyUJueK+14e2gIwfCbBA==";
       };
     };
     "@formatjs/intl-getcanonicallocales-1.5.3" = {
@@ -58,49 +58,49 @@ let
         sha512 = "QVBnSPZ32Y80wkXbf36hP9VbyklbOb8edppxFcgO9Lbd47zagllw65Y81QOHEn/j11JcTn2OhW0vea95LHvQmA==";
       };
     };
-    "@formatjs/intl-listformat-5.0.3" = {
+    "@formatjs/intl-listformat-5.0.4" = {
       name = "_at_formatjs_slash_intl-listformat";
       packageName = "@formatjs/intl-listformat";
-      version = "5.0.3";
+      version = "5.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.3.tgz";
-        sha512 = "IaW428RI5RpwXr/+doYT1H4ZHL3mYLU3nzR7ZaTkk5dBi1PKKGk1sDwymEzVxyrELT0WHhqhqLKdLjXAqxCz9g==";
+        url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.4.tgz";
+        sha512 = "0DQ2NF1PmO3+mvZp4V/SPNk7kUaLDcZR3eWbN8cGvSafWOrcv1iEcTXOd8ow8u9OA0gBTWwgPDcQFn7W0mU8kw==";
       };
     };
-    "@formatjs/intl-locale-2.4.12" = {
+    "@formatjs/intl-locale-2.4.13" = {
       name = "_at_formatjs_slash_intl-locale";
       packageName = "@formatjs/intl-locale";
-      version = "2.4.12";
+      version = "2.4.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.12.tgz";
-        sha512 = "40khHPYtZRdqjQs1fItNj94eMoiGwJJOAKN//9qUhAsHrXvGxseFVBSg+mItV0Orwb3wqItUj3hu6evrouhstw==";
+        url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.13.tgz";
+        sha512 = "hrglCuFjRpMrutmuL+Ck84KBxeHhouk7d5B/G9kqHL4zmrW6AsBwU+0KeyvareiY3MWzYZhQj1Nm3JEGulQRUQ==";
       };
     };
-    "@formatjs/intl-numberformat-6.1.2" = {
+    "@formatjs/intl-numberformat-6.1.3" = {
       name = "_at_formatjs_slash_intl-numberformat";
       packageName = "@formatjs/intl-numberformat";
-      version = "6.1.2";
+      version = "6.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.2.tgz";
-        sha512 = "td0XggQKu8dlPUlP2f322NW0WY58zWLlOoiUVh4eolcWqOs4maKL8tjmFBPXSQt55JiKy14ZrDw1dljyNHLB0g==";
+        url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.3.tgz";
+        sha512 = "bLVEt4G7IfacLpiBKg2VfHKnPrzWOWX/jxEi+OIUk6M2bEfYj8Vi1nYGb8+D7ZHCbuj/L7+lnlL4bItPTXT8JA==";
       };
     };
-    "@formatjs/intl-pluralrules-4.0.2" = {
+    "@formatjs/intl-pluralrules-4.0.5" = {
       name = "_at_formatjs_slash_intl-pluralrules";
       packageName = "@formatjs/intl-pluralrules";
-      version = "4.0.2";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.2.tgz";
-        sha512 = "Oh4zmA3odkXBCPAGVhZuAnP3IfCPy8DyizA9s4QkYptVICX38RbUvXwzr2a9DVpKNiZ7i2TnV4Qkeo06N/6b7Q==";
+        url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.5.tgz";
+        sha512 = "mWsCpc/SZ6rk0Qb3zpv5bUz6uJysW6qap0qJJz6d0MJpszN3GNsk8CbP5q62oUaWvBmHoeXBvAG9VVEu1TUexw==";
       };
     };
-    "@formatjs/intl-relativetimeformat-8.0.2" = {
+    "@formatjs/intl-relativetimeformat-8.0.3" = {
       name = "_at_formatjs_slash_intl-relativetimeformat";
       packageName = "@formatjs/intl-relativetimeformat";
-      version = "8.0.2";
+      version = "8.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.2.tgz";
-        sha512 = "RBO+4zxJuIYtYGfxv1GuZJQDtrA+fZlgcHjSVoo5HwznWdfg5vVTe8qdbSDbdyFobbB2OYqwj4mcRO2M5P1oNw==";
+        url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.3.tgz";
+        sha512 = "OIobPtY5vtwe5IM0B0J3KmewYB/NTcbgiW9yRdWzMA1TeFSd8LfuficICYuzUZt25Kh/eIw4g37ArhS1WH/6Iw==";
       };
     };
     "@juggle/resize-observer-3.2.0" = {
@@ -139,13 +139,13 @@ let
         sha512 = "zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg==";
       };
     };
-    "@types/node-14.14.20" = {
+    "@types/node-14.14.22" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.20";
+      version = "14.14.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz";
-        sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
+        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
       };
     };
     "@webcomponents/template-1.4.4" = {
@@ -427,13 +427,13 @@ let
         sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     };
-    "engine.io-4.0.6" = {
+    "engine.io-4.1.0" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "4.0.6";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.6.tgz";
-        sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.0.tgz";
+        sha512 = "vW7EAtn0HDQ4MtT5QbmCHF17TaYLONv2/JwdYsq9USPRZVM4zG7WB3k0Nc321z8EuSOlhGokrYlYx4176QhD0A==";
       };
     };
     "engine.io-parser-4.0.2" = {
@@ -886,13 +886,13 @@ let
         sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==";
       };
     };
-    "polyfill-library-3.101.0" = {
+    "polyfill-library-3.103.0" = {
       name = "polyfill-library";
       packageName = "polyfill-library";
-      version = "3.101.0";
+      version = "3.103.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.101.0.tgz";
-        sha512 = "o/ln6GpYGf1Tn8wJiTkoZ3vEtf6oWrcqM9YC61CW4KaHawVm36R/wN+6ZAv7JoAsPFm0J7PsroukpJVlVxPRjQ==";
+        url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.103.0.tgz";
+        sha512 = "z6DMbqDGO87IeG/sjN/PGPgGLzhKftVj6OeRujxgQn+Kz7x+E8uzFvdB3X8dqoE4xaY6aX3ar0UzRxRlYPH9yg==";
       };
     };
     "process-nextick-args-2.0.1" = {
@@ -1012,31 +1012,31 @@ let
         sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
       };
     };
-    "socket.io-3.0.5" = {
+    "socket.io-3.1.0" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "3.0.5";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz";
-        sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz";
+        sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww==";
       };
     };
-    "socket.io-adapter-2.0.3" = {
+    "socket.io-adapter-2.1.0" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz";
-        sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ==";
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz";
+        sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==";
       };
     };
-    "socket.io-parser-4.0.3" = {
+    "socket.io-parser-4.0.4" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz";
-        sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz";
+        sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==";
       };
     };
     "source-map-0.5.7" = {
@@ -1147,13 +1147,13 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.12.4" = {
+    "uglify-js-3.12.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.12.4";
+      version = "3.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz";
-        sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
+        sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -1315,20 +1315,20 @@ in
     dependencies = [
       sources."@financial-times/polyfill-useragent-normaliser-1.9.0"
       sources."@financial-times/useragent_parser-1.5.1"
-      sources."@formatjs/ecma402-abstract-1.5.0"
-      sources."@formatjs/intl-datetimeformat-3.2.2"
-      sources."@formatjs/intl-displaynames-4.0.3"
+      sources."@formatjs/ecma402-abstract-1.5.1"
+      sources."@formatjs/intl-datetimeformat-3.2.3"
+      sources."@formatjs/intl-displaynames-4.0.4"
       sources."@formatjs/intl-getcanonicallocales-1.5.3"
-      sources."@formatjs/intl-listformat-5.0.3"
-      sources."@formatjs/intl-locale-2.4.12"
-      sources."@formatjs/intl-numberformat-6.1.2"
-      sources."@formatjs/intl-pluralrules-4.0.2"
-      sources."@formatjs/intl-relativetimeformat-8.0.2"
+      sources."@formatjs/intl-listformat-5.0.4"
+      sources."@formatjs/intl-locale-2.4.13"
+      sources."@formatjs/intl-numberformat-6.1.3"
+      sources."@formatjs/intl-pluralrules-4.0.5"
+      sources."@formatjs/intl-relativetimeformat-8.0.3"
       sources."@juggle/resize-observer-3.2.0"
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.20"
+      sources."@types/node-14.14.22"
       sources."@webcomponents/template-1.4.4"
       sources."Base64-1.1.0"
       sources."abort-controller-3.0.0"
@@ -1362,7 +1362,7 @@ in
       sources."diff-4.0.2"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-4.0.6" // {
+      (sources."engine.io-4.1.0" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
@@ -1415,7 +1415,7 @@ in
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."picturefill-3.0.3"
-      (sources."polyfill-library-3.101.0" // {
+      (sources."polyfill-library-3.103.0" // {
         dependencies = [
           sources."source-map-0.5.7"
           sources."uglify-js-2.8.29"
@@ -1443,14 +1443,14 @@ in
       })
       sources."serve-static-1.14.1"
       sources."setprototypeof-1.1.1"
-      (sources."socket.io-3.0.5" // {
+      (sources."socket.io-3.1.0" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
-      sources."socket.io-adapter-2.0.3"
-      (sources."socket.io-parser-4.0.3" // {
+      sources."socket.io-adapter-2.1.0"
+      (sources."socket.io-parser-4.0.4" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
@@ -1466,7 +1466,7 @@ in
       sources."toidentifier-1.0.0"
       sources."toposort-2.0.2"
       sources."tslib-2.1.0"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.12.5"
       sources."uglify-to-browserify-1.0.2"
       sources."unorm-1.6.0"
       sources."usertiming-0.1.8"
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix
index d0273cfe1f9..76d5cf6a202 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix
index a9da40e3fe4..3560081fefd 100644
--- a/pkgs/servers/zigbee2mqtt/node-packages.nix
+++ b/pkgs/servers/zigbee2mqtt/node-packages.nix
@@ -1,16 +1,25 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/cli-7.12.1" = {
+    "@babel/cli-7.12.10" = {
       name = "_at_babel_slash_cli";
       packageName = "@babel/cli";
-      version = "7.12.1";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.1.tgz";
-        sha512 = "eRJREyrfAJ2r42Iaxe8h3v6yyj1wu9OyosaUHW6UImjGf9ahGL9nsFNh7OCopvtcPL8WnEo7tp78wrZaZ6vG9g==";
+        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.10.tgz";
+        sha512 = "+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==";
+      };
+    };
+    "@babel/cli-7.12.8" = {
+      name = "_at_babel_slash_cli";
+      packageName = "@babel/cli";
+      version = "7.12.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.8.tgz";
+        sha512 = "/6nQj11oaGhLmZiuRUfxsujiPDc9BBReemiXgIbxc+M5W+MIiFKYwvNDJvBfnGKNsJTKbUfEheKc9cwoPHAVQA==";
       };
     };
     "@babel/code-frame-7.10.4" = {
@@ -22,22 +31,31 @@ let
         sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
-    "@babel/compat-data-7.12.5" = {
-      name = "_at_babel_slash_compat-data";
-      packageName = "@babel/compat-data";
-      version = "7.12.5";
+    "@babel/code-frame-7.12.11" = {
+      name = "_at_babel_slash_code-frame";
+      packageName = "@babel/code-frame";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz";
-        sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
+        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
       };
     };
-    "@babel/core-7.12.3" = {
+    "@babel/compat-data-7.12.7" = {
+      name = "_at_babel_slash_compat-data";
+      packageName = "@babel/compat-data";
+      version = "7.12.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz";
+        sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
+      };
+    };
+    "@babel/core-7.12.10" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.3";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz";
-        sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz";
+        sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
       };
     };
     "@babel/core-7.12.9" = {
@@ -49,6 +67,15 @@ let
         sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==";
       };
     };
+    "@babel/generator-7.12.11" = {
+      name = "_at_babel_slash_generator";
+      packageName = "@babel/generator";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
+        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
+      };
+    };
     "@babel/generator-7.12.5" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -67,6 +94,15 @@ let
         sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==";
       };
     };
+    "@babel/helper-annotate-as-pure-7.12.10" = {
+      name = "_at_babel_slash_helper-annotate-as-pure";
+      packageName = "@babel/helper-annotate-as-pure";
+      version = "7.12.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz";
+        sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==";
+      };
+    };
     "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = {
       name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor";
       packageName = "@babel/helper-builder-binary-assignment-operator-visitor";
@@ -94,13 +130,13 @@ let
         sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==";
       };
     };
-    "@babel/helper-create-regexp-features-plugin-7.12.1" = {
+    "@babel/helper-create-regexp-features-plugin-7.12.7" = {
       name = "_at_babel_slash_helper-create-regexp-features-plugin";
       packageName = "@babel/helper-create-regexp-features-plugin";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz";
-        sha512 = "rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==";
+        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz";
+        sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==";
       };
     };
     "@babel/helper-define-map-7.10.5" = {
@@ -130,6 +166,15 @@ let
         sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
       };
     };
+    "@babel/helper-function-name-7.12.11" = {
+      name = "_at_babel_slash_helper-function-name";
+      packageName = "@babel/helper-function-name";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
+        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
+      };
+    };
     "@babel/helper-get-function-arity-7.10.4" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
@@ -139,6 +184,15 @@ let
         sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
       };
     };
+    "@babel/helper-get-function-arity-7.12.10" = {
+      name = "_at_babel_slash_helper-get-function-arity";
+      packageName = "@babel/helper-get-function-arity";
+      version = "7.12.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
+        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
+      };
+    };
     "@babel/helper-hoist-variables-7.10.4" = {
       name = "_at_babel_slash_helper-hoist-variables";
       packageName = "@babel/helper-hoist-variables";
@@ -148,15 +202,6 @@ let
         sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.12.1" = {
-      name = "_at_babel_slash_helper-member-expression-to-functions";
-      packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz";
-        sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
-      };
-    };
     "@babel/helper-member-expression-to-functions-7.12.7" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
@@ -184,13 +229,13 @@ let
         sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.10.4" = {
+    "@babel/helper-optimise-call-expression-7.12.10" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.10.4";
+      version = "7.12.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
-        sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
+        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
       };
     };
     "@babel/helper-optimise-call-expression-7.12.7" = {
@@ -211,15 +256,6 @@ let
         sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
       };
     };
-    "@babel/helper-regex-7.10.5" = {
-      name = "_at_babel_slash_helper-regex";
-      packageName = "@babel/helper-regex";
-      version = "7.10.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz";
-        sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==";
-      };
-    };
     "@babel/helper-remap-async-to-generator-7.12.1" = {
       name = "_at_babel_slash_helper-remap-async-to-generator";
       packageName = "@babel/helper-remap-async-to-generator";
@@ -229,6 +265,15 @@ let
         sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
       };
     };
+    "@babel/helper-replace-supers-7.12.11" = {
+      name = "_at_babel_slash_helper-replace-supers";
+      packageName = "@babel/helper-replace-supers";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
+        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
+      };
+    };
     "@babel/helper-replace-supers-7.12.5" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
@@ -265,6 +310,15 @@ let
         sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
       };
     };
+    "@babel/helper-split-export-declaration-7.12.11" = {
+      name = "_at_babel_slash_helper-split-export-declaration";
+      packageName = "@babel/helper-split-export-declaration";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
+        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
+      };
+    };
     "@babel/helper-validator-identifier-7.10.4" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
@@ -274,6 +328,15 @@ let
         sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
       };
     };
+    "@babel/helper-validator-identifier-7.12.11" = {
+      name = "_at_babel_slash_helper-validator-identifier";
+      packageName = "@babel/helper-validator-identifier";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
+        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
+      };
+    };
     "@babel/helper-validator-option-7.12.1" = {
       name = "_at_babel_slash_helper-validator-option";
       packageName = "@babel/helper-validator-option";
@@ -283,6 +346,15 @@ let
         sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==";
       };
     };
+    "@babel/helper-validator-option-7.12.11" = {
+      name = "_at_babel_slash_helper-validator-option";
+      packageName = "@babel/helper-validator-option";
+      version = "7.12.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz";
+        sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==";
+      };
+    };
     "@babel/helper-wrap-function-7.12.3" = {
       name = "_at_babel_slash_helper-wrap-function";
       packageName = "@babel/helper-wrap-function";
@@ -310,13 +382,13 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.5" = {
+    "@babel/parser-7.12.11" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.5";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz";
-        sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
+        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
       };
     };
     "@babel/parser-7.12.7" = {
@@ -337,6 +409,15 @@ let
         sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==";
       };
     };
+    "@babel/plugin-proposal-async-generator-functions-7.12.12" = {
+      name = "_at_babel_slash_plugin-proposal-async-generator-functions";
+      packageName = "@babel/plugin-proposal-async-generator-functions";
+      version = "7.12.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz";
+        sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==";
+      };
+    };
     "@babel/plugin-proposal-class-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-class-properties";
       packageName = "@babel/plugin-proposal-class-properties";
@@ -391,13 +472,13 @@ let
         sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
       };
     };
-    "@babel/plugin-proposal-numeric-separator-7.12.5" = {
+    "@babel/plugin-proposal-numeric-separator-7.12.7" = {
       name = "_at_babel_slash_plugin-proposal-numeric-separator";
       packageName = "@babel/plugin-proposal-numeric-separator";
-      version = "7.12.5";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz";
-        sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz";
+        sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==";
       };
     };
     "@babel/plugin-proposal-object-rest-spread-7.12.1" = {
@@ -418,13 +499,13 @@ let
         sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==";
       };
     };
-    "@babel/plugin-proposal-optional-chaining-7.12.1" = {
+    "@babel/plugin-proposal-optional-chaining-7.12.7" = {
       name = "_at_babel_slash_plugin-proposal-optional-chaining";
       packageName = "@babel/plugin-proposal-optional-chaining";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz";
-        sha512 = "c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz";
+        sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==";
       };
     };
     "@babel/plugin-proposal-private-methods-7.12.1" = {
@@ -616,6 +697,15 @@ let
         sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==";
       };
     };
+    "@babel/plugin-transform-block-scoping-7.12.12" = {
+      name = "_at_babel_slash_plugin-transform-block-scoping";
+      packageName = "@babel/plugin-transform-block-scoping";
+      version = "7.12.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz";
+        sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==";
+      };
+    };
     "@babel/plugin-transform-classes-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
@@ -823,13 +913,13 @@ let
         sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==";
       };
     };
-    "@babel/plugin-transform-sticky-regex-7.12.1" = {
+    "@babel/plugin-transform-sticky-regex-7.12.7" = {
       name = "_at_babel_slash_plugin-transform-sticky-regex";
       packageName = "@babel/plugin-transform-sticky-regex";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz";
-        sha512 = "CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz";
+        sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==";
       };
     };
     "@babel/plugin-transform-template-literals-7.12.1" = {
@@ -850,6 +940,15 @@ let
         sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==";
       };
     };
+    "@babel/plugin-transform-typeof-symbol-7.12.10" = {
+      name = "_at_babel_slash_plugin-transform-typeof-symbol";
+      packageName = "@babel/plugin-transform-typeof-symbol";
+      version = "7.12.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz";
+        sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==";
+      };
+    };
     "@babel/plugin-transform-typescript-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
@@ -877,13 +976,22 @@ let
         sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
       };
     };
-    "@babel/preset-env-7.12.1" = {
+    "@babel/preset-env-7.12.11" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.12.1";
+      version = "7.12.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz";
-        sha512 = "H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz";
+        sha512 = "j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==";
+      };
+    };
+    "@babel/preset-env-7.12.7" = {
+      name = "_at_babel_slash_preset-env";
+      packageName = "@babel/preset-env";
+      version = "7.12.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz";
+        sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==";
       };
     };
     "@babel/preset-modules-0.1.4" = {
@@ -895,13 +1003,13 @@ let
         sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==";
       };
     };
-    "@babel/preset-typescript-7.12.1" = {
+    "@babel/preset-typescript-7.12.7" = {
       name = "_at_babel_slash_preset-typescript";
       packageName = "@babel/preset-typescript";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz";
-        sha512 = "hNK/DhmoJPsksdHuI/RVrcEws7GN5eamhi28JkO52MqIxU8Z0QpmiSOQxZHWOHV7I3P4UjHV97ay4TcamMA6Kw==";
+        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz";
+        sha512 = "nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw==";
       };
     };
     "@babel/runtime-7.12.5" = {
@@ -913,15 +1021,6 @@ let
         sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
       };
     };
-    "@babel/template-7.10.4" = {
-      name = "_at_babel_slash_template";
-      packageName = "@babel/template";
-      version = "7.10.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz";
-        sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
-      };
-    };
     "@babel/template-7.12.7" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
@@ -931,13 +1030,13 @@ let
         sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.12.5" = {
+    "@babel/traverse-7.12.12" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.5";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz";
-        sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
+        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
       };
     };
     "@babel/traverse-7.12.9" = {
@@ -949,13 +1048,13 @@ let
         sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==";
       };
     };
-    "@babel/types-7.12.6" = {
+    "@babel/types-7.12.12" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.6";
+      version = "7.12.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz";
-        sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
+        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
       };
     };
     "@babel/types-7.12.7" = {
@@ -994,13 +1093,13 @@ let
         sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
       };
     };
-    "@eslint/eslintrc-0.2.1" = {
+    "@eslint/eslintrc-0.2.2" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
-      version = "0.2.1";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
-        sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz";
+        sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==";
       };
     };
     "@istanbuljs/load-nyc-config-1.1.0" = {
@@ -1120,13 +1219,13 @@ let
         sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==";
       };
     };
-    "@nicolo-ribaudo/chokidar-2-2.1.8" = {
+    "@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents" = {
       name = "_at_nicolo-ribaudo_slash_chokidar-2";
       packageName = "@nicolo-ribaudo/chokidar-2";
-      version = "2.1.8";
+      version = "2.1.8-no-fsevents";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8.tgz";
-        sha512 = "FohwULwAebCUKi/akMFyGi7jfc7JXTeMHzKxuP3umRd9mK/2Y7/SMBSI2jX+YLopPXi+PF9l307NmpfxTdCegA==";
+        url = "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.tgz";
+        sha512 = "+nb9vWloHNNMFHjGofEam3wopE3m1yuambrrd/fnPc+lFOMB9ROTqQlche9ByFWNkdNqfSgR/kkQtQ8DzEWt2w==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -1174,13 +1273,22 @@ let
         sha512 = "HfrvJ/LXULHk8w63CGxwDNiDidFgDX8BnadY+cgVS6yHMHikbhLCLjCmUKsKBWaGKRqOznl0w+iUl7TMi1lkXQ==";
       };
     };
-    "@serialport/bindings-9.0.2" = {
+    "@serialport/bindings-9.0.3" = {
       name = "_at_serialport_slash_bindings";
       packageName = "@serialport/bindings";
-      version = "9.0.2";
+      version = "9.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.2.tgz";
-        sha512 = "kQ3co4aGwwbUqkRdJ7UfdlbLB5dUQwNfSglexC8iv65D5HXfjSBR1bE0XUH8PH/v/6Dh6CSnwf6OP0I3H5vMWQ==";
+        url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.3.tgz";
+        sha512 = "hnqVqEc4IqGCIjztGkd30V0KcTatQ1T/SS03MZ9KLn6e3y2PSXFqf0TqxB0qF7K9lGHWldMTiPOQaZnuV/oZLQ==";
+      };
+    };
+    "@serialport/bindings-9.0.4" = {
+      name = "_at_serialport_slash_bindings";
+      packageName = "@serialport/bindings";
+      version = "9.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.4.tgz";
+        sha512 = "6dlE1vm5c1xk667f1Zm7D+msbHJ9jdnUr9l8DResKpj2iCBzbCNsW+yCYq26WxzXWc1L2HUaS3/aL+k0wm5amg==";
       };
     };
     "@serialport/parser-byte-length-9.0.1" = {
@@ -1291,22 +1399,13 @@ let
         sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==";
       };
     };
-    "@types/babel__traverse-7.0.15" = {
+    "@types/babel__traverse-7.11.0" = {
       name = "_at_types_slash_babel__traverse";
       packageName = "@types/babel__traverse";
-      version = "7.0.15";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz";
-        sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==";
-      };
-    };
-    "@types/babel__traverse-7.0.16" = {
-      name = "_at_types_slash_babel__traverse";
-      packageName = "@types/babel__traverse";
-      version = "7.0.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.16.tgz";
-        sha512 = "S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w==";
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz";
+        sha512 = "kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==";
       };
     };
     "@types/debounce-1.2.0" = {
@@ -1363,13 +1462,22 @@ let
         sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==";
       };
     };
-    "@types/jest-26.0.15" = {
+    "@types/jest-26.0.18" = {
       name = "_at_types_slash_jest";
       packageName = "@types/jest";
-      version = "26.0.15";
+      version = "26.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.15.tgz";
-        sha512 = "s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==";
+        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.18.tgz";
+        sha512 = "scDPs+mELZgsFetTgBSsIxKGrlitn9t/d2ecP+S1QSIGD+31fkMBEftLfOAX5k3tU06/0PjreJIQ+gWEbbHqpw==";
+      };
+    };
+    "@types/jest-26.0.19" = {
+      name = "_at_types_slash_jest";
+      packageName = "@types/jest";
+      version = "26.0.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.19.tgz";
+        sha512 = "jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==";
       };
     };
     "@types/json-schema-7.0.6" = {
@@ -1390,22 +1498,22 @@ let
         sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw==";
       };
     };
-    "@types/node-14.14.10" = {
+    "@types/node-14.14.11" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.10";
+      version = "14.14.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz";
-        sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.11.tgz";
+        sha512 = "BJ97wAUuU3NUiUCp44xzUFquQEvnk1wu7q4CMEUYKJWjdkr0YWYDsm4RFtAvxYsNjLsKcrFt6RvK8r+mnzMbEQ==";
       };
     };
-    "@types/node-14.14.7" = {
+    "@types/node-14.14.16" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.7";
+      version = "14.14.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz";
-        sha512 = "Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.16.tgz";
+        sha512 = "naXYePhweTi+BMv11TgioE2/FXU4fSl29HAH1ffxVciNsH3rYXjNP2yM8wqmSm7jS20gM8TIklKiTen+1iVncw==";
       };
     };
     "@types/normalize-package-data-2.4.0" = {
@@ -1426,6 +1534,15 @@ let
         sha512 = "UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==";
       };
     };
+    "@types/prettier-2.1.6" = {
+      name = "_at_types_slash_prettier";
+      packageName = "@types/prettier";
+      version = "2.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.6.tgz";
+        sha512 = "6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA==";
+      };
+    };
     "@types/serialport-8.0.1" = {
       name = "_at_types_slash_serialport";
       packageName = "@types/serialport";
@@ -1444,22 +1561,22 @@ let
         sha512 = "RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==";
       };
     };
-    "@types/yargs-15.0.10" = {
+    "@types/yargs-15.0.11" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "15.0.10";
+      version = "15.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz";
-        sha512 = "z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.11.tgz";
+        sha512 = "jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA==";
       };
     };
-    "@types/yargs-15.0.9" = {
+    "@types/yargs-15.0.12" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "15.0.9";
+      version = "15.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz";
-        sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz";
+        sha512 = "f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==";
       };
     };
     "@types/yargs-parser-15.0.0" = {
@@ -1471,112 +1588,139 @@ let
         sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==";
       };
     };
-    "@typescript-eslint/eslint-plugin-4.7.0" = {
+    "@types/yargs-parser-20.2.0" = {
+      name = "_at_types_slash_yargs-parser";
+      packageName = "@types/yargs-parser";
+      version = "20.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz";
+        sha512 = "37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==";
+      };
+    };
+    "@typescript-eslint/eslint-plugin-4.11.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.7.0";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.7.0.tgz";
-        sha512 = "li9aiSVBBd7kU5VlQlT1AqP0uWGDK6JYKUQ9cVDnOg34VNnd9t4jr0Yqc/bKxJr/tDCPDaB4KzoSFN9fgVxe/Q==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.11.0.tgz";
+        sha512 = "x4arJMXBxyD6aBXLm3W7mSDZRiABzy+2PCLJbL7OPqlp53VXhaA1HKK7R2rTee5OlRhnUgnp8lZyVIqjnyPT6g==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.7.0" = {
+    "@typescript-eslint/eslint-plugin-4.9.1" = {
+      name = "_at_typescript-eslint_slash_eslint-plugin";
+      packageName = "@typescript-eslint/eslint-plugin";
+      version = "4.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.9.1.tgz";
+        sha512 = "QRLDSvIPeI1pz5tVuurD+cStNR4sle4avtHhxA+2uyixWGFjKzJ+EaFVRW6dA/jOgjV5DTAjOxboQkRDE8cRlQ==";
+      };
+    };
+    "@typescript-eslint/experimental-utils-4.11.0" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.7.0";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.7.0.tgz";
-        sha512 = "cymzovXAiD4EF+YoHAB5Oh02MpnXjvyaOb+v+BdpY7lsJXZQN34oIETeUwVT2XfV9rSNpXaIcknDLfupO/tUoA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.11.0.tgz";
+        sha512 = "1VC6mSbYwl1FguKt8OgPs8xxaJgtqFpjY/UzUYDBKq4pfQ5lBvN2WVeqYkzf7evW42axUHYl2jm9tNyFsb8oLg==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.8.2" = {
+    "@typescript-eslint/experimental-utils-4.9.1" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.8.2";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.2.tgz";
-        sha512 = "hpTw6o6IhBZEsQsjuw/4RWmceRyESfAiEzAEnXHKG1X7S5DXFaZ4IO1JO7CW1aQ604leQBzjZmuMI9QBCAJX8Q==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.9.1.tgz";
+        sha512 = "c3k/xJqk0exLFs+cWSJxIjqLYwdHCuLWhnpnikmPQD2+NGAx9KjLYlBDcSI81EArh9FDYSL6dslAUSwILeWOxg==";
       };
     };
-    "@typescript-eslint/parser-4.7.0" = {
+    "@typescript-eslint/parser-4.11.0" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "4.7.0";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.7.0.tgz";
-        sha512 = "+meGV8bMP1sJHBI2AFq1GeTwofcGiur8LoIr6v+rEmD9knyCqDlrQcFHR0KDDfldHIFDU/enZ53fla6ReF4wRw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.11.0.tgz";
+        sha512 = "NBTtKCC7ZtuxEV5CrHUO4Pg2s784pvavc3cnz6V+oJvVbK4tH9135f/RBP6eUA2KHiFKAollSrgSctQGmHbqJQ==";
       };
     };
-    "@typescript-eslint/scope-manager-4.7.0" = {
+    "@typescript-eslint/parser-4.9.1" = {
+      name = "_at_typescript-eslint_slash_parser";
+      packageName = "@typescript-eslint/parser";
+      version = "4.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.9.1.tgz";
+        sha512 = "Gv2VpqiomvQ2v4UL+dXlQcZ8zCX4eTkoIW+1aGVWT6yTO+6jbxsw7yQl2z2pPl/4B9qa5JXeIbhJpONKjXIy3g==";
+      };
+    };
+    "@typescript-eslint/scope-manager-4.11.0" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.7.0";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.7.0.tgz";
-        sha512 = "ILITvqwDJYbcDCROj6+Ob0oCKNg3SH46iWcNcTIT9B5aiVssoTYkhKjxOMNzR1F7WSJkik4zmuqve5MdnA0DyA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.11.0.tgz";
+        sha512 = "6VSTm/4vC2dHM3ySDW9Kl48en+yLNfVV6LECU8jodBHQOhO8adAVizaZ1fV0QGZnLQjQ/y0aBj5/KXPp2hBTjA==";
       };
     };
-    "@typescript-eslint/scope-manager-4.8.2" = {
+    "@typescript-eslint/scope-manager-4.9.1" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.8.2";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.8.2.tgz";
-        sha512 = "qHQ8ODi7mMin4Sq2eh/6eu03uVzsf5TX+J43xRmiq8ujng7ViQSHNPLOHGw/Wr5dFEoxq/ubKhzClIIdQy5q3g==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.9.1.tgz";
+        sha512 = "sa4L9yUfD/1sg9Kl8OxPxvpUcqxKXRjBeZxBuZSSV1v13hjfEJkn84n0An2hN8oLQ1PmEl2uA6FkI07idXeFgQ==";
       };
     };
-    "@typescript-eslint/types-4.7.0" = {
+    "@typescript-eslint/types-4.11.0" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.7.0";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.7.0.tgz";
-        sha512 = "uLszFe0wExJc+I7q0Z/+BnP7wao/kzX0hB5vJn4LIgrfrMLgnB2UXoReV19lkJQS1a1mHWGGODSxnBx6JQC3Sg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.11.0.tgz";
+        sha512 = "XXOdt/NPX++txOQHM1kUMgJUS43KSlXGdR/aDyEwuAEETwuPt02Nc7v+s57PzuSqMbNLclblQdv3YcWOdXhQ7g==";
       };
     };
-    "@typescript-eslint/types-4.8.2" = {
+    "@typescript-eslint/types-4.9.1" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.8.2";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.8.2.tgz";
-        sha512 = "z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.9.1.tgz";
+        sha512 = "fjkT+tXR13ks6Le7JiEdagnwEFc49IkOyys7ueWQ4O8k4quKPwPJudrwlVOJCUQhXo45PrfIvIarcrEjFTNwUA==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.7.0" = {
+    "@typescript-eslint/typescript-estree-4.11.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.7.0";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.7.0.tgz";
-        sha512 = "5XZRQznD1MfUmxu1t8/j2Af4OxbA7EFU2rbo0No7meb46eHgGkSieFdfV6omiC/DGIBhH9H9gXn7okBbVOm8jw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.0.tgz";
+        sha512 = "eA6sT5dE5RHAFhtcC+b5WDlUIGwnO9b0yrfGa1mIOIAjqwSQCpXbLiFmKTdRbQN/xH2EZkGqqLDrKUuYOZ0+Hg==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.8.2" = {
+    "@typescript-eslint/typescript-estree-4.9.1" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.8.2";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz";
-        sha512 = "HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.1.tgz";
+        sha512 = "bzP8vqwX6Vgmvs81bPtCkLtM/Skh36NE6unu6tsDeU/ZFoYthlTXbBmpIrvosgiDKlWTfb2ZpPELHH89aQjeQw==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.7.0" = {
+    "@typescript-eslint/visitor-keys-4.11.0" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.7.0";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.7.0.tgz";
-        sha512 = "aDJDWuCRsf1lXOtignlfiPODkzSxxop7D0rZ91L6ZuMlcMCSh0YyK+gAfo5zN/ih6WxMwhoXgJWC3cWQdaKC+A==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.0.tgz";
+        sha512 = "tRYKyY0i7cMk6v4UIOCjl1LhuepC/pc6adQqJk4Is3YcC6k46HvsV9Wl7vQoLbm9qADgeujiT7KdLrylvFIQ+A==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.8.2" = {
+    "@typescript-eslint/visitor-keys-4.9.1" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.8.2";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz";
-        sha512 = "Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.1.tgz";
+        sha512 = "9gspzc6UqLQHd7lXQS7oWs+hrYggspv/rk6zzEMhCbYwPE/sF7oxo7GAjkS35Tdlt7wguIG+ViWCPtVZHz/ybQ==";
       };
     };
     "abab-2.0.5" = {
@@ -1831,6 +1975,15 @@ let
         sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
       };
     };
+    "astral-regex-2.0.0" = {
+      name = "astral-regex";
+      packageName = "astral-regex";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz";
+        sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==";
+      };
+    };
     "async-3.2.0" = {
       name = "async";
       packageName = "async";
@@ -1894,13 +2047,13 @@ let
         sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
-    "axios-0.21.0" = {
+    "axios-0.21.1" = {
       name = "axios";
       packageName = "axios";
-      version = "0.21.0";
+      version = "0.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz";
-        sha512 = "fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==";
+        url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
+        sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
       };
     };
     "babel-jest-26.6.3" = {
@@ -1948,6 +2101,15 @@ let
         sha512 = "mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==";
       };
     };
+    "babel-preset-current-node-syntax-1.0.1" = {
+      name = "babel-preset-current-node-syntax";
+      packageName = "babel-preset-current-node-syntax";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz";
+        sha512 = "M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==";
+      };
+    };
     "babel-preset-jest-26.6.2" = {
       name = "babel-preset-jest";
       packageName = "babel-preset-jest";
@@ -2065,13 +2227,22 @@ let
         sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
       };
     };
-    "browserslist-4.14.7" = {
+    "browserslist-4.15.0" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.14.7";
+      version = "4.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz";
-        sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.15.0.tgz";
+        sha512 = "IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ==";
+      };
+    };
+    "browserslist-4.16.0" = {
+      name = "browserslist";
+      packageName = "browserslist";
+      version = "4.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz";
+        sha512 = "/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==";
       };
     };
     "bser-2.1.1" = {
@@ -2164,13 +2335,22 @@ let
         sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
       };
     };
-    "caniuse-lite-1.0.30001157" = {
+    "caniuse-lite-1.0.30001165" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001157";
+      version = "1.0.30001165";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz";
-        sha512 = "gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz";
+        sha512 = "8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==";
+      };
+    };
+    "caniuse-lite-1.0.30001170" = {
+      name = "caniuse-lite";
+      packageName = "caniuse-lite";
+      version = "1.0.30001170";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001170.tgz";
+        sha512 = "Dd4d/+0tsK0UNLrZs3CvNukqalnVTRrxb5mcQm8rHL49t7V5ZaTygwXkrq+FB+dVDf++4ri8eJnFEJAB8332PA==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -2218,15 +2398,6 @@ let
         sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==";
       };
     };
-    "chokidar-2.1.8" = {
-      name = "chokidar";
-      packageName = "chokidar";
-      version = "2.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz";
-        sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
-      };
-    };
     "chokidar-3.4.3" = {
       name = "chokidar";
       packageName = "chokidar";
@@ -2479,13 +2650,13 @@ let
         sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
       };
     };
-    "core-js-compat-3.7.0" = {
+    "core-js-compat-3.8.1" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.7.0";
+      version = "3.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz";
-        sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.1.tgz";
+        sha512 = "a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2587,15 +2758,6 @@ let
         sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
-    "debug-4.2.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz";
-        sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
-      };
-    };
     "debug-4.3.1" = {
       name = "debug";
       packageName = "debug";
@@ -2821,13 +2983,22 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "electron-to-chromium-1.3.596" = {
+    "electron-to-chromium-1.3.620" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.596";
+      version = "1.3.620";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz";
-        sha512 = "nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.620.tgz";
+        sha512 = "YbgWXUR2Mu+Fp6rm3GZ5YJdNo8SgZKLUTNSl2PNvdOcM8OIz07jRJnRkIaV9vdszFv9UUuGChh19w9qSuoLJgw==";
+      };
+    };
+    "electron-to-chromium-1.3.633" = {
+      name = "electron-to-chromium";
+      packageName = "electron-to-chromium";
+      version = "1.3.633";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.633.tgz";
+        sha512 = "bsVCsONiVX1abkWdH7KtpuDAhsQ3N3bjPYhROSAXE78roJKet0Y5wznA14JE9pzbwSZmSMAW6KiKYf1RvbTJkA==";
       };
     };
     "emittery-0.7.2" = {
@@ -3001,22 +3172,22 @@ let
         sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==";
       };
     };
-    "eslint-7.13.0" = {
+    "eslint-7.15.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.13.0";
+      version = "7.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz";
-        sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.15.0.tgz";
+        sha512 = "Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==";
       };
     };
-    "eslint-7.14.0" = {
+    "eslint-7.16.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.14.0";
+      version = "7.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz";
-        sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.16.0.tgz";
+        sha512 = "iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw==";
       };
     };
     "eslint-config-google-0.14.0" = {
@@ -3073,13 +3244,13 @@ let
         sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==";
       };
     };
-    "espree-7.3.0" = {
+    "espree-7.3.1" = {
       name = "espree";
       packageName = "espree";
-      version = "7.3.0";
+      version = "7.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz";
-        sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==";
+        url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz";
+        sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==";
       };
     };
     "esprima-4.0.1" = {
@@ -3316,6 +3487,15 @@ let
         sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
       };
     };
+    "fastq-1.10.0" = {
+      name = "fastq";
+      packageName = "fastq";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
+        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
+      };
+    };
     "fastq-1.9.0" = {
       name = "fastq";
       packageName = "fastq";
@@ -3343,13 +3523,13 @@ let
         sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==";
       };
     };
-    "file-entry-cache-5.0.1" = {
+    "file-entry-cache-6.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
-      version = "5.0.1";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
-        sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
+        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz";
+        sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==";
       };
     };
     "file-uri-to-path-1.0.0" = {
@@ -3397,22 +3577,22 @@ let
         sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
       };
     };
-    "flat-cache-2.0.1" = {
+    "flat-cache-3.0.4" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "2.0.1";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz";
-        sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz";
+        sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==";
       };
     };
-    "flatted-2.0.2" = {
+    "flatted-3.1.0" = {
       name = "flatted";
       packageName = "flatted";
-      version = "2.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz";
-        sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
+        url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz";
+        sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==";
       };
     };
     "fn.name-1.1.0" = {
@@ -3424,13 +3604,13 @@ let
         sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
       };
     };
-    "follow-redirects-1.13.0" = {
+    "follow-redirects-1.13.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.13.0";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz";
-        sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz";
+        sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==";
       };
     };
     "for-in-1.0.2" = {
@@ -3514,15 +3694,6 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.13" = {
-      name = "fsevents";
-      packageName = "fsevents";
-      version = "1.2.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz";
-        sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==";
-      };
-    };
     "fsevents-2.1.3" = {
       name = "fsevents";
       packageName = "fsevents";
@@ -3595,6 +3766,15 @@ let
         sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
       };
     };
+    "get-intrinsic-1.0.2" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
+        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
+      };
+    };
     "get-package-type-0.1.0" = {
       name = "get-package-type";
       packageName = "get-package-type";
@@ -3865,15 +4045,6 @@ let
         sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
-    "highlight.js-10.3.2" = {
-      name = "highlight.js";
-      packageName = "highlight.js";
-      version = "10.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz";
-        sha512 = "3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==";
-      };
-    };
     "hosted-git-info-2.8.8" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
@@ -3937,13 +4108,13 @@ let
         sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==";
       };
     };
-    "humanize-duration-3.24.0" = {
+    "humanize-duration-3.25.0" = {
       name = "humanize-duration";
       packageName = "humanize-duration";
-      version = "3.24.0";
+      version = "3.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.24.0.tgz";
-        sha512 = "B3udnqisaDeRsvUSb+5n2hjxhABI9jotB+i1IEhgHhguTeM5LxIUKoVIu7UpeyaPOygr/Fnv7UhOi45kYYG+tg==";
+        url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.25.0.tgz";
+        sha512 = "QXth17C/8J2QVO0urby5sANmgvwdOF4YZW3mO13ZTkJli4ltVphzMJVG+HkVuTN/bIq1W/O0jRYSyQACus/GVQ==";
       };
     };
     "iconv-lite-0.4.24" = {
@@ -3991,6 +4162,15 @@ let
         sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
       };
     };
+    "import-fresh-3.3.0" = {
+      name = "import-fresh";
+      packageName = "import-fresh";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz";
+        sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
+      };
+    };
     "import-local-3.0.2" = {
       name = "import-local";
       packageName = "import-local";
@@ -4027,13 +4207,22 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.5" = {
+    "ini-1.3.6" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.5";
+      version = "1.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.6.tgz";
+        sha512 = "IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg==";
+      };
+    };
+    "ini-1.3.8" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
+        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
       };
     };
     "interpret-1.4.0" = {
@@ -4135,15 +4324,6 @@ let
         sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
       };
     };
-    "is-core-module-2.1.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz";
-        sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==";
-      };
-    };
     "is-core-module-2.2.0" = {
       name = "is-core-module";
       packageName = "is-core-module";
@@ -4738,13 +4918,13 @@ let
         sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
       };
     };
-    "js-yaml-3.14.0" = {
+    "js-yaml-3.14.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.0";
+      version = "3.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
-        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
+        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
       };
     };
     "jsbn-0.1.1" = {
@@ -4990,6 +5170,24 @@ let
         sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";
       };
     };
+    "lru-cache-5.1.1" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
+        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
+      };
+    };
+    "lru-cache-6.0.0" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
+        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
+      };
+    };
     "lunr-2.3.9" = {
       name = "lunr";
       packageName = "lunr";
@@ -5044,13 +5242,22 @@ let
         sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
       };
     };
-    "marked-1.2.3" = {
+    "marked-1.2.5" = {
       name = "marked";
       packageName = "marked";
-      version = "1.2.3";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.3.tgz";
-        sha512 = "RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.5.tgz";
+        sha512 = "2AlqgYnVPOc9WDyWu7S5DJaEZsfk6dNh/neatQ3IHUW4QLutM/VPSH9lG7bif+XjFWc9K9XR3QvR+fXuECmfdA==";
+      };
+    };
+    "marked-1.2.7" = {
+      name = "marked";
+      packageName = "marked";
+      version = "1.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz";
+        sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==";
       };
     };
     "merge-stream-2.0.0" = {
@@ -5179,15 +5386,6 @@ let
         sha512 = "gbTtiEu8P/GSMh1lAa0YYNr8XIfDzFgnWtetw3Hfz9nw6YXySHNYOZF/uUTgyp8GHvFnNw/EG7VhOkD6zfVb6A==";
       };
     };
-    "mkdirp-0.5.5" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
-        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
-      };
-    };
     "mkdirp-classic-0.5.3" = {
       name = "mkdirp-classic";
       packageName = "mkdirp-classic";
@@ -5215,13 +5413,13 @@ let
         sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg==";
       };
     };
-    "mqtt-packet-6.6.0" = {
+    "mqtt-packet-6.7.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "6.6.0";
+      version = "6.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.6.0.tgz";
-        sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ==";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.7.0.tgz";
+        sha512 = "GzgeeCirQpB59FyhHvf8BLiIYgxctPSxuSyaF2vWnkt7paX7jtuQ8Gpl+DkHCxZmYuv7GQE6zcUAegpafd0MqQ==";
       };
     };
     "ms-2.0.0" = {
@@ -5251,6 +5449,15 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
+    "ms-2.1.3" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
+        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
+      };
+    };
     "nan-2.14.2" = {
       name = "nan";
       packageName = "nan";
@@ -5314,13 +5521,13 @@ let
         sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
       };
     };
-    "node-abi-2.19.1" = {
+    "node-abi-2.19.3" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.19.1";
+      version = "2.19.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz";
-        sha512 = "HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz";
+        sha512 = "9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==";
       };
     };
     "node-int64-0.4.0" = {
@@ -5350,13 +5557,22 @@ let
         sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==";
       };
     };
-    "node-releases-1.1.66" = {
+    "node-notifier-8.0.1" = {
+      name = "node-notifier";
+      packageName = "node-notifier";
+      version = "8.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz";
+        sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==";
+      };
+    };
+    "node-releases-1.1.67" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.66";
+      version = "1.1.67";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz";
-        sha512 = "JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz";
+        sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==";
       };
     };
     "noop-logger-0.1.1" = {
@@ -5548,6 +5764,15 @@ let
         sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
       };
     };
+    "onigasm-2.2.5" = {
+      name = "onigasm";
+      packageName = "onigasm";
+      version = "2.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz";
+        sha512 = "F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==";
+      };
+    };
     "optionator-0.8.3" = {
       name = "optionator";
       packageName = "optionator";
@@ -5575,15 +5800,6 @@ let
         sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
       };
     };
-    "p-each-series-2.1.0" = {
-      name = "p-each-series";
-      packageName = "p-each-series";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz";
-        sha512 = "ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==";
-      };
-    };
     "p-each-series-2.2.0" = {
       name = "p-each-series";
       packageName = "p-each-series";
@@ -5791,13 +6007,13 @@ let
         sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
       };
     };
-    "prebuild-install-5.3.6" = {
+    "prebuild-install-6.0.0" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "5.3.6";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz";
-        sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz";
+        sha512 = "h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -6223,15 +6439,6 @@ let
         sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==";
       };
     };
-    "rimraf-2.6.3" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
-        sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
-      };
-    };
     "rimraf-3.0.2" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -6340,13 +6547,13 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
-    "semver-7.3.2" = {
+    "semver-7.3.4" = {
       name = "semver";
       packageName = "semver";
-      version = "7.3.2";
+      version = "7.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz";
-        sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
+        sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
       };
     };
     "send-0.17.1" = {
@@ -6358,13 +6565,22 @@ let
         sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
       };
     };
-    "serialport-9.0.2" = {
+    "serialport-9.0.3" = {
       name = "serialport";
       packageName = "serialport";
-      version = "9.0.2";
+      version = "9.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-9.0.2.tgz";
-        sha512 = "N++EVrc2F3kUJ6aCE6BLxHwTrelFAZM3LFw4lo8TV0fDtfrwTc3+aoDpSsvfQg3DxrRf3shCtA6WYEH4g8kapw==";
+        url = "https://registry.npmjs.org/serialport/-/serialport-9.0.3.tgz";
+        sha512 = "1JjH9jtWZ5up2SQTeNPA4I3vhHCDYh1AjN3SybZYf5m9KF9tFVIOGLGIMncqnWKYx3ks/wqfCpmpYUHkFYC3wg==";
+      };
+    };
+    "serialport-9.0.4" = {
+      name = "serialport";
+      packageName = "serialport";
+      version = "9.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serialport/-/serialport-9.0.4.tgz";
+        sha512 = "Wtl6sxciHKNdJKW8jUZm+f5KRXt0J0UP25ksM8N31l08KTdAhZ5MmKNUFpoO/YYG6TvHFOu+07PUX35m+TUw7g==";
       };
     };
     "serve-static-1.14.1" = {
@@ -6457,6 +6673,33 @@ let
         sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
       };
     };
+    "shiki-0.2.7" = {
+      name = "shiki";
+      packageName = "shiki";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shiki/-/shiki-0.2.7.tgz";
+        sha512 = "bwVc7cdtYYHEO9O+XJ8aNOskKRfaQd5Y4ovLRfbQkmiLSUaR+bdlssbZUUhbQ0JAFMYcTcJ5tjG5KtnufttDHQ==";
+      };
+    };
+    "shiki-languages-0.2.7" = {
+      name = "shiki-languages";
+      packageName = "shiki-languages";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shiki-languages/-/shiki-languages-0.2.7.tgz";
+        sha512 = "REmakh7pn2jCn9GDMRSK36oDgqhh+rSvJPo77sdWTOmk44C5b0XlYPwJZcFOMJWUZJE0c7FCbKclw4FLwUKLRw==";
+      };
+    };
+    "shiki-themes-0.2.7" = {
+      name = "shiki-themes";
+      packageName = "shiki-themes";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shiki-themes/-/shiki-themes-0.2.7.tgz";
+        sha512 = "ZMmboDYw5+SEpugM8KGUq3tkZ0vXg+k60XX6NngDK7gc1Sv6YLUlanpvG3evm57uKJvfXsky/S5MzSOTtYKLjA==";
+      };
+    };
     "signal-exit-3.0.3" = {
       name = "signal-exit";
       packageName = "signal-exit";
@@ -6529,6 +6772,15 @@ let
         sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
       };
     };
+    "slice-ansi-4.0.0" = {
+      name = "slice-ansi";
+      packageName = "slice-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz";
+        sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==";
+      };
+    };
     "slip-1.0.2" = {
       name = "slip";
       packageName = "slip";
@@ -6646,13 +6898,13 @@ let
         sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.6" = {
+    "spdx-license-ids-3.0.7" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.6";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
-        sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
+        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
       };
     };
     "split-string-3.1.0" = {
@@ -6916,6 +7168,15 @@ let
         sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
       };
     };
+    "table-6.0.4" = {
+      name = "table";
+      packageName = "table";
+      version = "6.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-6.0.4.tgz";
+        sha512 = "sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw==";
+      };
+    };
     "tar-fs-2.1.1" = {
       name = "tar-fs";
       packageName = "tar-fs";
@@ -7231,31 +7492,49 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typedoc-0.19.2" = {
+    "typedoc-0.20.0-beta.27" = {
       name = "typedoc";
       packageName = "typedoc";
-      version = "0.19.2";
+      version = "0.20.0-beta.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc/-/typedoc-0.19.2.tgz";
-        sha512 = "oDEg1BLEzi1qvgdQXc658EYgJ5qJLVSeZ0hQ57Eq4JXy6Vj2VX4RVo18qYxRWz75ifAaYuYNBUCnbhjd37TfOg==";
+        url = "https://registry.npmjs.org/typedoc/-/typedoc-0.20.0-beta.27.tgz";
+        sha512 = "+TMTlYV7N6mIGEuNIaPEqss3jWOLX2v7rLVz5vT+PfjVgwX+1s+LdPe+plV1hm5Ha1HwFNuVlozXxxWvf95dwA==";
       };
     };
-    "typedoc-default-themes-0.11.4" = {
+    "typedoc-0.20.0-beta.30" = {
+      name = "typedoc";
+      packageName = "typedoc";
+      version = "0.20.0-beta.30";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedoc/-/typedoc-0.20.0-beta.30.tgz";
+        sha512 = "nAisQV1Wmu/a/AgZMJ4/H7Z0e+eR/XVaF7ilSM5b7YJ2HP7iuqFw4j/e6a88ZHYf1nNfjBB9XpaqP/JYwHo4sQ==";
+      };
+    };
+    "typedoc-default-themes-0.12.0-beta.10" = {
       name = "typedoc-default-themes";
       packageName = "typedoc-default-themes";
-      version = "0.11.4";
+      version = "0.12.0-beta.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.4.tgz";
-        sha512 = "Y4Lf+qIb9NTydrexlazAM46SSLrmrQRqWiD52593g53SsmUFioAsMWt8m834J6qsp+7wHRjxCXSZeiiW5cMUdw==";
+        url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.12.0-beta.10.tgz";
+        sha512 = "RqTLRQvzuLrNEZ1VcmYoQiFkixW0QvVUv0R35jlkhxAMGtoo/giUVtWrWY1+Yp7HBnfI/wZKvhZpQYswbDL7eQ==";
       };
     };
-    "typedoc-plugin-markdown-3.0.11" = {
+    "typedoc-plugin-markdown-3.1.0" = {
       name = "typedoc-plugin-markdown";
       packageName = "typedoc-plugin-markdown";
-      version = "3.0.11";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.0.11.tgz";
-        sha512 = "/BE/PqnIVbQJ525czM+T3CVaA1gVN9X1Le100z8TV/Lze8LZVkuAUiHRIgw9BKYFm9IQaB88W55k4EV6uUVwYQ==";
+        url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.1.0.tgz";
+        sha512 = "DhY2WbWfkLyU/MJV8a3TeJjY8e/IBzgG6SEFhtFp6GgmXXdsSHJre2ASFRH6T2ShIUZAPdvHkFcehpSVAfNgPA==";
+      };
+    };
+    "typedoc-plugin-markdown-3.1.1" = {
+      name = "typedoc-plugin-markdown";
+      packageName = "typedoc-plugin-markdown";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.1.1.tgz";
+        sha512 = "esrSaGw9NeGOR1fixubeSYCtQ9tw1iv7xa6bMvwznjs+jOUEdP0/OBe7l2bbk3PoqhNiFBozBJDo3CpcMJGHnw==";
       };
     };
     "typedoc-plugin-no-inherit-1.2.0" = {
@@ -7276,22 +7555,40 @@ let
         sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA==";
       };
     };
-    "typescript-4.0.5" = {
+    "typescript-4.1.2" = {
       name = "typescript";
       packageName = "typescript";
-      version = "4.0.5";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz";
-        sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz";
+        sha512 = "thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==";
       };
     };
-    "uglify-js-3.11.6" = {
+    "typescript-4.1.3" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "4.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz";
+        sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==";
+      };
+    };
+    "uglify-js-3.12.1" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.11.6";
+      version = "3.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz";
-        sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz";
+        sha512 = "o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ==";
+      };
+    };
+    "uglify-js-3.12.3" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "3.12.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.3.tgz";
+        sha512 = "feZzR+kIcSVuLi3s/0x0b2Tx4Iokwqt+8PJM7yRHKuldg4MLdam4TCFeICv+lgDtuYiCtdmrtIP+uN9LWvDasw==";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -7456,13 +7753,13 @@ let
         sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
-    "uuid-8.3.1" = {
+    "uuid-8.3.2" = {
       name = "uuid";
       packageName = "uuid";
-      version = "8.3.1";
+      version = "8.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz";
-        sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz";
+        sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==";
       };
     };
     "v8-compile-cache-2.2.0" = {
@@ -7483,6 +7780,15 @@ let
         sha512 = "fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==";
       };
     };
+    "v8-to-istanbul-7.1.0" = {
+      name = "v8-to-istanbul";
+      packageName = "v8-to-istanbul";
+      version = "7.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz";
+        sha512 = "uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==";
+      };
+    };
     "validate-npm-package-license-3.0.4" = {
       name = "validate-npm-package-license";
       packageName = "validate-npm-package-license";
@@ -7501,6 +7807,15 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
+    "vscode-textmate-5.2.0" = {
+      name = "vscode-textmate";
+      packageName = "vscode-textmate";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz";
+        sha512 = "Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==";
+      };
+    };
     "w3c-hr-time-1.0.2" = {
       name = "w3c-hr-time";
       packageName = "w3c-hr-time";
@@ -7681,15 +7996,6 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "write-1.0.3" = {
-      name = "write";
-      packageName = "write";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz";
-        sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==";
-      };
-    };
     "write-file-atomic-3.0.3" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -7699,13 +8005,13 @@ let
         sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==";
       };
     };
-    "ws-7.4.0" = {
+    "ws-7.4.1" = {
       name = "ws";
       packageName = "ws";
-      version = "7.4.0";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz";
-        sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==";
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz";
+        sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==";
       };
     };
     "xml-name-validator-3.0.0" = {
@@ -7735,13 +8041,31 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.0" = {
+    "y18n-4.0.1" = {
       name = "y18n";
       packageName = "y18n";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
+        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
+      };
+    };
+    "yallist-3.1.1" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
+        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+      };
+    };
+    "yallist-4.0.0" = {
+      name = "yallist";
+      packageName = "yallist";
       version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
+        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
       };
     };
     "yargs-15.4.1" = {
@@ -7762,38 +8086,47 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
-    "zigbee-herdsman-0.13.37" = {
+    "zigbee-herdsman-0.13.41" = {
       name = "zigbee-herdsman";
       packageName = "zigbee-herdsman";
-      version = "0.13.37";
+      version = "0.13.41";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.37.tgz";
-        sha512 = "eK2EK2mqT80ueHvEicKmXGyw+VezoK+7NcHX9WjjeQL6bdOpaLCuDGZY0sOh86Lmodyvdd0ZxY7MwA6z/Ko2PA==";
+        url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.41.tgz";
+        sha512 = "qHAvPHr8CrzD9pRiiqNmlwxh/KvIfvGpopGBl4Hl2LJln3ruzt1cpHA3jcvR/WUC4vQsTtdEk2911BNEb5APWw==";
       };
     };
-    "zigbee-herdsman-converters-13.0.7" = {
+    "zigbee-herdsman-0.13.46" = {
+      name = "zigbee-herdsman";
+      packageName = "zigbee-herdsman";
+      version = "0.13.46";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.46.tgz";
+        sha512 = "GH0JvIC0cd91cqLQpJ8Cd+o2+gKct2wsMGq8c6XTiGeJpcF47fIlMaHWEK/CuBcBJ6rnid8mGPdTHmOsPT1Bmw==";
+      };
+    };
+    "zigbee-herdsman-converters-14.0.3" = {
       name = "zigbee-herdsman-converters";
       packageName = "zigbee-herdsman-converters";
-      version = "13.0.7";
+      version = "14.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-13.0.7.tgz";
-        sha512 = "aHqcbkQmoSkBth4s94//wJm2UO+0YFQkIndRBbz1XAIdNeHDhUVA6ZT1B1DgJZEbF/HRW8ZZLC+biSF6h/1HvQ==";
+        url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.3.tgz";
+        sha512 = "ObZqRgK81C3BIbTXaGL/QEUXP1F1tmj8vjAWVtrlGWkYjCQp4GYKxQU1FHNn342V6/3WxBo122OWrFFRxH3Xfw==";
       };
     };
-    "zigbee2mqtt-frontend-0.2.100" = {
+    "zigbee2mqtt-frontend-0.2.129" = {
       name = "zigbee2mqtt-frontend";
       packageName = "zigbee2mqtt-frontend";
-      version = "0.2.100";
+      version = "0.2.129";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.100.tgz";
-        sha512 = "/WASdNtWYAqts8RvC3j6HkdnZifg2KEocGS1eIl1G7Gghoj/80TiF5TVYtU3YG9M40vgMIIMvIwrmc8UOmdJhg==";
+        url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.129.tgz";
+        sha512 = "gvzgYMtI7XF97HueC65MxwqB7Hcoc2HNRnyydqJuq11w0FrzFBg/VLhDpsW5Sor8oz/C8cjd8rtS1yC2jqI1Eg==";
       };
     };
   };
   args = {
     name = "zigbee2mqtt";
     packageName = "zigbee2mqtt";
-    version = "1.16.2";
+    version = "1.17.0";
     src = ./.;
     dependencies = [
       sources."@dabh/diagnostics-2.0.2"
@@ -7867,7 +8200,7 @@ let
       sources."glossy-0.1.7"
       sources."help-me-1.1.0"
       sources."http-errors-1.7.3"
-      sources."humanize-duration-3.24.0"
+      sources."humanize-duration-3.25.0"
       sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -7881,16 +8214,17 @@ let
       sources."is-unc-path-1.0.0"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
-      sources."js-yaml-3.14.0"
+      sources."js-yaml-3.14.1"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."kuler-2.0.0"
       sources."leven-2.1.0"
       (sources."logform-2.2.0" // {
         dependencies = [
-          sources."ms-2.1.2"
+          sources."ms-2.1.3"
         ];
       })
+      sources."lru-cache-6.0.0"
       sources."mime-1.6.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
@@ -7902,7 +8236,7 @@ let
           sources."ms-2.1.2"
         ];
       })
-      (sources."mqtt-packet-6.6.0" // {
+      (sources."mqtt-packet-6.7.0" // {
         dependencies = [
           sources."debug-4.3.1"
           sources."ms-2.1.2"
@@ -7933,7 +8267,7 @@ let
       sources."remove-trailing-separator-1.1.0"
       sources."rimraf-3.0.2"
       sources."safe-buffer-5.1.2"
-      sources."semver-7.3.2"
+      sources."semver-7.3.4"
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
@@ -7974,53 +8308,53 @@ let
       sources."winston-syslog-2.4.4"
       sources."winston-transport-4.4.0"
       sources."wrappy-1.0.2"
-      sources."ws-7.4.0"
+      sources."ws-7.4.1"
       sources."xtend-4.0.2"
-      (sources."zigbee-herdsman-0.13.37" // {
+      sources."yallist-4.0.0"
+      (sources."zigbee-herdsman-0.13.46" // {
         dependencies = [
-          sources."@babel/cli-7.12.1"
-          sources."@babel/code-frame-7.10.4"
-          sources."@babel/compat-data-7.12.5"
-          sources."@babel/core-7.12.3"
-          sources."@babel/generator-7.12.5"
-          sources."@babel/helper-annotate-as-pure-7.10.4"
+          sources."@babel/cli-7.12.10"
+          sources."@babel/code-frame-7.12.11"
+          sources."@babel/compat-data-7.12.7"
+          sources."@babel/core-7.12.10"
+          sources."@babel/generator-7.12.11"
+          sources."@babel/helper-annotate-as-pure-7.12.10"
           sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
           sources."@babel/helper-compilation-targets-7.12.5"
           sources."@babel/helper-create-class-features-plugin-7.12.1"
-          sources."@babel/helper-create-regexp-features-plugin-7.12.1"
+          sources."@babel/helper-create-regexp-features-plugin-7.12.7"
           sources."@babel/helper-define-map-7.10.5"
           sources."@babel/helper-explode-assignable-expression-7.12.1"
-          sources."@babel/helper-function-name-7.10.4"
-          sources."@babel/helper-get-function-arity-7.10.4"
+          sources."@babel/helper-function-name-7.12.11"
+          sources."@babel/helper-get-function-arity-7.12.10"
           sources."@babel/helper-hoist-variables-7.10.4"
-          sources."@babel/helper-member-expression-to-functions-7.12.1"
+          sources."@babel/helper-member-expression-to-functions-7.12.7"
           sources."@babel/helper-module-imports-7.12.5"
           sources."@babel/helper-module-transforms-7.12.1"
-          sources."@babel/helper-optimise-call-expression-7.10.4"
+          sources."@babel/helper-optimise-call-expression-7.12.10"
           sources."@babel/helper-plugin-utils-7.10.4"
-          sources."@babel/helper-regex-7.10.5"
           sources."@babel/helper-remap-async-to-generator-7.12.1"
-          sources."@babel/helper-replace-supers-7.12.5"
+          sources."@babel/helper-replace-supers-7.12.11"
           sources."@babel/helper-simple-access-7.12.1"
           sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
-          sources."@babel/helper-split-export-declaration-7.11.0"
-          sources."@babel/helper-validator-identifier-7.10.4"
-          sources."@babel/helper-validator-option-7.12.1"
+          sources."@babel/helper-split-export-declaration-7.12.11"
+          sources."@babel/helper-validator-identifier-7.12.11"
+          sources."@babel/helper-validator-option-7.12.11"
           sources."@babel/helper-wrap-function-7.12.3"
           sources."@babel/helpers-7.12.5"
           sources."@babel/highlight-7.10.4"
-          sources."@babel/parser-7.12.5"
-          sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
+          sources."@babel/parser-7.12.11"
+          sources."@babel/plugin-proposal-async-generator-functions-7.12.12"
           sources."@babel/plugin-proposal-class-properties-7.12.1"
           sources."@babel/plugin-proposal-dynamic-import-7.12.1"
           sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
           sources."@babel/plugin-proposal-json-strings-7.12.1"
           sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
           sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-          sources."@babel/plugin-proposal-numeric-separator-7.12.5"
+          sources."@babel/plugin-proposal-numeric-separator-7.12.7"
           sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
           sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-          sources."@babel/plugin-proposal-optional-chaining-7.12.1"
+          sources."@babel/plugin-proposal-optional-chaining-7.12.7"
           sources."@babel/plugin-proposal-private-methods-7.12.1"
           sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
           sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -8041,7 +8375,7 @@ let
           sources."@babel/plugin-transform-arrow-functions-7.12.1"
           sources."@babel/plugin-transform-async-to-generator-7.12.1"
           sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
-          sources."@babel/plugin-transform-block-scoping-7.12.1"
+          sources."@babel/plugin-transform-block-scoping-7.12.12"
           sources."@babel/plugin-transform-classes-7.12.1"
           sources."@babel/plugin-transform-computed-properties-7.12.1"
           sources."@babel/plugin-transform-destructuring-7.12.1"
@@ -8065,22 +8399,22 @@ let
           sources."@babel/plugin-transform-reserved-words-7.12.1"
           sources."@babel/plugin-transform-shorthand-properties-7.12.1"
           sources."@babel/plugin-transform-spread-7.12.1"
-          sources."@babel/plugin-transform-sticky-regex-7.12.1"
+          sources."@babel/plugin-transform-sticky-regex-7.12.7"
           sources."@babel/plugin-transform-template-literals-7.12.1"
-          sources."@babel/plugin-transform-typeof-symbol-7.12.1"
+          sources."@babel/plugin-transform-typeof-symbol-7.12.10"
           sources."@babel/plugin-transform-typescript-7.12.1"
           sources."@babel/plugin-transform-unicode-escapes-7.12.1"
           sources."@babel/plugin-transform-unicode-regex-7.12.1"
-          sources."@babel/preset-env-7.12.1"
+          sources."@babel/preset-env-7.12.11"
           sources."@babel/preset-modules-0.1.4"
-          sources."@babel/preset-typescript-7.12.1"
+          sources."@babel/preset-typescript-7.12.7"
           sources."@babel/runtime-7.12.5"
-          sources."@babel/template-7.10.4"
-          sources."@babel/traverse-7.12.5"
-          sources."@babel/types-7.12.6"
+          sources."@babel/template-7.12.7"
+          sources."@babel/traverse-7.12.12"
+          sources."@babel/types-7.12.12"
           sources."@bcoe/v8-coverage-0.2.3"
           sources."@cnakazawa/watch-1.0.4"
-          (sources."@eslint/eslintrc-0.2.1" // {
+          (sources."@eslint/eslintrc-0.2.2" // {
             dependencies = [
               sources."globals-12.4.0"
               sources."ignore-4.0.6"
@@ -8112,7 +8446,6 @@ let
               sources."has-flag-4.0.0"
               sources."is-number-7.0.0"
               sources."micromatch-4.0.2"
-              sources."rimraf-3.0.2"
               sources."slash-3.0.0"
               sources."strip-ansi-6.0.0"
               sources."supports-color-7.2.0"
@@ -8168,17 +8501,13 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."@nicolo-ribaudo/chokidar-2-2.1.8" // {
-            dependencies = [
-              sources."chokidar-2.1.8"
-            ];
-          })
+          sources."@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents"
           sources."@nodelib/fs.scandir-2.1.3"
           sources."@nodelib/fs.stat-2.0.3"
           sources."@nodelib/fs.walk-1.2.4"
           sources."@serialport/binding-abstract-9.0.2"
           sources."@serialport/binding-mock-9.0.2"
-          sources."@serialport/bindings-9.0.2"
+          sources."@serialport/bindings-9.0.4"
           sources."@serialport/parser-byte-length-9.0.1"
           sources."@serialport/parser-cctalk-9.0.1"
           sources."@serialport/parser-delimiter-9.0.1"
@@ -8191,38 +8520,38 @@ let
           sources."@types/babel__core-7.1.12"
           sources."@types/babel__generator-7.6.2"
           sources."@types/babel__template-7.4.0"
-          sources."@types/babel__traverse-7.0.15"
+          sources."@types/babel__traverse-7.11.0"
           sources."@types/debounce-1.2.0"
           sources."@types/debug-4.1.5"
           sources."@types/graceful-fs-4.1.4"
           sources."@types/istanbul-lib-coverage-2.0.3"
           sources."@types/istanbul-lib-report-3.0.0"
           sources."@types/istanbul-reports-3.0.0"
-          sources."@types/jest-26.0.15"
+          sources."@types/jest-26.0.19"
           sources."@types/json-schema-7.0.6"
           sources."@types/nedb-1.8.11"
-          sources."@types/node-14.14.7"
+          sources."@types/node-14.14.16"
           sources."@types/normalize-package-data-2.4.0"
-          sources."@types/prettier-2.1.5"
+          sources."@types/prettier-2.1.6"
           sources."@types/serialport-8.0.1"
           sources."@types/stack-utils-2.0.0"
-          sources."@types/yargs-15.0.9"
-          sources."@types/yargs-parser-15.0.0"
-          (sources."@typescript-eslint/eslint-plugin-4.7.0" // {
+          sources."@types/yargs-15.0.12"
+          sources."@types/yargs-parser-20.2.0"
+          (sources."@typescript-eslint/eslint-plugin-4.11.0" // {
             dependencies = [
-              sources."semver-7.3.2"
+              sources."semver-7.3.4"
             ];
           })
-          sources."@typescript-eslint/experimental-utils-4.7.0"
-          sources."@typescript-eslint/parser-4.7.0"
-          sources."@typescript-eslint/scope-manager-4.7.0"
-          sources."@typescript-eslint/types-4.7.0"
-          (sources."@typescript-eslint/typescript-estree-4.7.0" // {
+          sources."@typescript-eslint/experimental-utils-4.11.0"
+          sources."@typescript-eslint/parser-4.11.0"
+          sources."@typescript-eslint/scope-manager-4.11.0"
+          sources."@typescript-eslint/types-4.11.0"
+          (sources."@typescript-eslint/typescript-estree-4.11.0" // {
             dependencies = [
-              sources."semver-7.3.2"
+              sources."semver-7.3.4"
             ];
           })
-          sources."@typescript-eslint/visitor-keys-4.7.0"
+          sources."@typescript-eslint/visitor-keys-4.11.0"
           sources."abab-2.0.5"
           sources."acorn-7.4.1"
           sources."acorn-globals-6.0.0"
@@ -8253,7 +8582,7 @@ let
           sources."asn1-0.2.4"
           sources."assert-plus-1.0.0"
           sources."assign-symbols-1.0.0"
-          sources."astral-regex-1.0.0"
+          sources."astral-regex-2.0.0"
           sources."async-each-1.0.3"
           sources."asynckit-0.4.0"
           sources."at-least-node-1.0.0"
@@ -8274,7 +8603,7 @@ let
           sources."babel-plugin-dynamic-import-node-2.3.3"
           sources."babel-plugin-istanbul-6.0.0"
           sources."babel-plugin-jest-hoist-26.6.2"
-          sources."babel-preset-current-node-syntax-1.0.0"
+          sources."babel-preset-current-node-syntax-1.0.1"
           sources."babel-preset-jest-26.6.2"
           sources."balanced-match-1.0.0"
           (sources."base-0.11.2" // {
@@ -8303,7 +8632,7 @@ let
             ];
           })
           sources."browser-process-hrtime-1.0.0"
-          sources."browserslist-4.14.7"
+          sources."browserslist-4.16.0"
           sources."bser-2.1.1"
           sources."buffer-5.7.1"
           sources."buffer-from-1.1.1"
@@ -8311,7 +8640,7 @@ let
           sources."call-bind-1.0.0"
           sources."callsites-3.1.0"
           sources."camelcase-5.3.1"
-          sources."caniuse-lite-1.0.30001157"
+          sources."caniuse-lite-1.0.30001170"
           sources."capture-exit-2.0.0"
           sources."caseless-0.12.0"
           sources."chalk-2.4.2"
@@ -8322,7 +8651,6 @@ let
               sources."binary-extensions-2.1.0"
               sources."braces-3.0.2"
               sources."fill-range-7.0.1"
-              sources."fsevents-2.1.3"
               sources."glob-parent-5.1.1"
               sources."is-binary-path-2.1.0"
               sources."is-number-7.0.0"
@@ -8341,7 +8669,6 @@ let
           (sources."cliui-6.0.0" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
-              sources."emoji-regex-8.0.0"
               sources."is-fullwidth-code-point-3.0.0"
               sources."string-width-4.2.0"
               sources."strip-ansi-6.0.0"
@@ -8354,6 +8681,7 @@ let
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
           sources."colorette-1.2.1"
+          sources."colors-1.4.0"
           sources."combined-stream-1.0.8"
           sources."commander-4.1.1"
           sources."component-emitter-1.3.0"
@@ -8361,7 +8689,7 @@ let
           sources."console-control-strings-1.1.0"
           sources."convert-source-map-1.7.0"
           sources."copy-descriptor-0.1.1"
-          (sources."core-js-compat-3.7.0" // {
+          (sources."core-js-compat-3.8.1" // {
             dependencies = [
               sources."semver-7.0.0"
             ];
@@ -8377,7 +8705,7 @@ let
           sources."dashdash-1.14.1"
           sources."data-urls-2.0.0"
           sources."debounce-1.2.0"
-          sources."debug-4.2.0"
+          sources."debug-4.3.1"
           sources."decamelize-1.2.0"
           sources."decimal.js-10.2.1"
           sources."decode-uri-component-0.2.0"
@@ -8406,9 +8734,9 @@ let
             ];
           })
           sources."ecc-jsbn-0.1.2"
-          sources."electron-to-chromium-1.3.596"
+          sources."electron-to-chromium-1.3.633"
           sources."emittery-0.7.2"
-          sources."emoji-regex-7.0.3"
+          sources."emoji-regex-8.0.0"
           sources."end-of-stream-1.4.4"
           sources."enquirer-2.3.6"
           sources."error-ex-1.3.2"
@@ -8423,7 +8751,7 @@ let
               sources."type-check-0.3.2"
             ];
           })
-          (sources."eslint-7.13.0" // {
+          (sources."eslint-7.16.0" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
               sources."ansi-styles-4.3.0"
@@ -8436,7 +8764,7 @@ let
               sources."has-flag-4.0.0"
               sources."ignore-4.0.6"
               sources."path-key-3.1.1"
-              sources."semver-7.3.2"
+              sources."semver-7.3.4"
               sources."shebang-command-2.0.0"
               sources."shebang-regex-3.0.0"
               sources."strip-ansi-6.0.0"
@@ -8452,7 +8780,7 @@ let
             ];
           })
           sources."eslint-visitor-keys-2.0.0"
-          (sources."espree-7.3.0" // {
+          (sources."espree-7.3.1" // {
             dependencies = [
               sources."eslint-visitor-keys-1.3.0"
             ];
@@ -8518,9 +8846,9 @@ let
           })
           sources."fast-json-stable-stringify-2.1.0"
           sources."fast-levenshtein-2.0.6"
-          sources."fastq-1.9.0"
+          sources."fastq-1.10.0"
           sources."fb-watchman-2.0.1"
-          sources."file-entry-cache-5.0.1"
+          sources."file-entry-cache-6.0.0"
           sources."file-uri-to-path-1.0.0"
           (sources."fill-range-4.0.0" // {
             dependencies = [
@@ -8528,8 +8856,8 @@ let
             ];
           })
           sources."find-up-4.1.0"
-          sources."flat-cache-2.0.1"
-          sources."flatted-2.0.2"
+          sources."flat-cache-3.0.4"
+          sources."flatted-3.1.0"
           sources."for-in-1.0.2"
           sources."forever-agent-0.6.1"
           sources."form-data-2.3.3"
@@ -8538,13 +8866,13 @@ let
           sources."fs-extra-9.0.1"
           sources."fs-readdir-recursive-1.1.0"
           sources."fs.realpath-1.0.0"
-          sources."fsevents-1.2.13"
+          sources."fsevents-2.1.3"
           sources."function-bind-1.1.1"
           sources."functional-red-black-tree-1.0.1"
           sources."gauge-2.7.4"
           sources."gensync-1.0.0-beta.2"
           sources."get-caller-file-2.0.5"
-          sources."get-intrinsic-1.0.1"
+          sources."get-intrinsic-1.0.2"
           sources."get-package-type-0.1.0"
           sources."get-stream-4.1.0"
           sources."get-value-2.0.6"
@@ -8581,7 +8909,6 @@ let
               sources."kind-of-4.0.0"
             ];
           })
-          sources."highlight.js-10.3.2"
           sources."hosted-git-info-2.8.8"
           sources."html-encoding-sniffer-2.0.1"
           sources."html-escaper-2.0.2"
@@ -8590,7 +8917,7 @@ let
           sources."iconv-lite-0.4.24"
           sources."ieee754-1.2.1"
           sources."ignore-5.1.8"
-          (sources."import-fresh-3.2.2" // {
+          (sources."import-fresh-3.3.0" // {
             dependencies = [
               sources."resolve-from-4.0.0"
             ];
@@ -8599,7 +8926,7 @@ let
           sources."imurmurhash-0.1.4"
           sources."inflight-1.0.6"
           sources."inherits-2.0.4"
-          sources."ini-1.3.5"
+          sources."ini-1.3.8"
           sources."interpret-1.4.0"
           sources."ip-regex-2.1.0"
           (sources."is-accessor-descriptor-0.1.6" // {
@@ -8611,7 +8938,7 @@ let
           sources."is-binary-path-1.0.1"
           sources."is-buffer-1.1.6"
           sources."is-ci-2.0.0"
-          sources."is-core-module-2.1.0"
+          sources."is-core-module-2.2.0"
           (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -8731,7 +9058,6 @@ let
               sources."anymatch-3.1.1"
               sources."braces-3.0.2"
               sources."fill-range-7.0.1"
-              sources."fsevents-2.2.1"
               sources."is-number-7.0.0"
               sources."micromatch-4.0.2"
               sources."to-regex-range-5.0.1"
@@ -8818,7 +9144,7 @@ let
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."has-flag-4.0.0"
-              sources."semver-7.3.2"
+              sources."semver-7.3.4"
               sources."supports-color-7.2.0"
             ];
           })
@@ -8865,7 +9191,7 @@ let
             ];
           })
           sources."js-tokens-4.0.0"
-          sources."js-yaml-3.14.0"
+          sources."js-yaml-3.14.1"
           sources."jsbn-0.1.1"
           sources."jsdom-16.4.0"
           sources."jsesc-2.5.2"
@@ -8889,12 +9215,13 @@ let
           sources."locate-path-5.0.0"
           sources."lodash-4.17.20"
           sources."lodash.sortby-4.7.0"
+          sources."lru-cache-6.0.0"
           sources."lunr-2.3.9"
           sources."make-dir-2.1.0"
           sources."makeerror-1.0.11"
           sources."map-cache-0.2.2"
           sources."map-visit-1.0.0"
-          sources."marked-1.2.3"
+          sources."marked-1.2.7"
           sources."merge-stream-2.0.0"
           sources."merge2-1.4.1"
           sources."micromatch-3.1.10"
@@ -8905,7 +9232,6 @@ let
           sources."minimatch-3.0.4"
           sources."minimist-1.2.5"
           sources."mixin-deep-2.0.1"
-          sources."mkdirp-0.5.5"
           sources."mkdirp-classic-0.5.3"
           sources."ms-2.1.2"
           sources."nan-2.14.2"
@@ -8914,16 +9240,16 @@ let
           sources."natural-compare-1.4.0"
           sources."neo-async-2.6.2"
           sources."nice-try-1.0.5"
-          sources."node-abi-2.19.1"
+          sources."node-abi-2.19.3"
           sources."node-int64-0.4.0"
           sources."node-modules-regexp-1.0.0"
-          (sources."node-notifier-8.0.0" // {
+          (sources."node-notifier-8.0.1" // {
             dependencies = [
-              sources."semver-7.3.2"
+              sources."semver-7.3.4"
               sources."which-2.0.2"
             ];
           })
-          sources."node-releases-1.1.66"
+          sources."node-releases-1.1.67"
           sources."noop-logger-0.1.1"
           sources."normalize-package-data-2.5.0"
           sources."normalize-path-3.0.0"
@@ -8945,8 +9271,14 @@ let
           sources."object.pick-1.3.0"
           sources."once-1.4.0"
           sources."onetime-5.1.2"
+          (sources."onigasm-2.2.5" // {
+            dependencies = [
+              sources."lru-cache-5.1.1"
+              sources."yallist-3.1.1"
+            ];
+          })
           sources."optionator-0.9.1"
-          sources."p-each-series-2.1.0"
+          sources."p-each-series-2.2.0"
           sources."p-finally-1.0.0"
           sources."p-limit-2.3.0"
           sources."p-locate-4.1.0"
@@ -8967,7 +9299,7 @@ let
           sources."pirates-4.0.1"
           sources."pkg-dir-4.2.0"
           sources."posix-character-classes-0.1.1"
-          sources."prebuild-install-5.3.6"
+          sources."prebuild-install-6.0.0"
           sources."prelude-ls-1.2.1"
           (sources."pretty-format-26.6.2" // {
             dependencies = [
@@ -9031,7 +9363,7 @@ let
           sources."resolve-url-0.2.1"
           sources."ret-0.1.15"
           sources."reusify-1.0.4"
-          sources."rimraf-2.6.3"
+          sources."rimraf-3.0.2"
           sources."rsvp-4.8.5"
           sources."run-parallel-1.1.10"
           sources."safe-buffer-5.1.2"
@@ -9040,7 +9372,7 @@ let
           sources."sane-4.1.0"
           sources."saxes-5.0.1"
           sources."semver-5.7.1"
-          sources."serialport-9.0.2"
+          sources."serialport-9.0.4"
           sources."set-blocking-2.0.0"
           (sources."set-value-2.0.1" // {
             dependencies = [
@@ -9051,14 +9383,20 @@ let
           sources."shebang-regex-1.0.0"
           sources."shelljs-0.8.4"
           sources."shellwords-0.1.1"
+          sources."shiki-0.2.7"
+          sources."shiki-languages-0.2.7"
+          sources."shiki-themes-0.2.7"
           sources."signal-exit-3.0.3"
           sources."simple-concat-1.0.1"
           sources."simple-get-3.1.0"
           sources."sisteransi-1.0.5"
           sources."slash-2.0.0"
-          (sources."slice-ansi-2.1.0" // {
+          (sources."slice-ansi-4.0.0" // {
             dependencies = [
-              sources."is-fullwidth-code-point-2.0.0"
+              sources."ansi-styles-4.3.0"
+              sources."color-convert-2.0.1"
+              sources."color-name-1.1.4"
+              sources."is-fullwidth-code-point-3.0.0"
             ];
           })
           sources."slip-1.0.2"
@@ -9094,7 +9432,7 @@ let
           sources."spdx-correct-3.1.1"
           sources."spdx-exceptions-2.3.0"
           sources."spdx-expression-parse-3.0.1"
-          sources."spdx-license-ids-3.0.6"
+          sources."spdx-license-ids-3.0.7"
           sources."split-string-3.1.0"
           sources."sprintf-js-1.0.3"
           sources."sshpk-1.16.1"
@@ -9130,12 +9468,12 @@ let
             ];
           })
           sources."symbol-tree-3.2.4"
-          (sources."table-5.4.6" // {
+          (sources."table-6.0.4" // {
             dependencies = [
-              sources."ansi-regex-4.1.0"
-              sources."is-fullwidth-code-point-2.0.0"
-              sources."string-width-3.1.0"
-              sources."strip-ansi-5.2.0"
+              sources."ansi-regex-5.0.0"
+              sources."is-fullwidth-code-point-3.0.0"
+              sources."string-width-4.2.0"
+              sources."strip-ansi-6.0.0"
             ];
           })
           sources."tar-fs-2.1.1"
@@ -9167,17 +9505,13 @@ let
           sources."type-detect-4.0.8"
           sources."type-fest-0.8.1"
           sources."typedarray-to-buffer-3.1.5"
-          (sources."typedoc-0.19.2" // {
-            dependencies = [
-              sources."semver-7.3.2"
-            ];
-          })
-          sources."typedoc-default-themes-0.11.4"
-          sources."typedoc-plugin-markdown-3.0.11"
+          sources."typedoc-0.20.0-beta.30"
+          sources."typedoc-default-themes-0.12.0-beta.10"
+          sources."typedoc-plugin-markdown-3.1.1"
           sources."typedoc-plugin-no-inherit-1.2.0"
           sources."typedoc-plugin-sourcefile-url-1.0.6"
-          sources."typescript-4.0.5"
-          sources."uglify-js-3.11.6"
+          sources."typescript-4.1.3"
+          sources."uglify-js-3.12.3"
           sources."unicode-canonical-property-names-ecmascript-1.0.4"
           sources."unicode-match-property-ecmascript-1.0.4"
           sources."unicode-match-property-value-ecmascript-1.2.0"
@@ -9199,15 +9533,16 @@ let
           sources."urix-0.1.0"
           sources."use-3.1.1"
           sources."util-deprecate-1.0.2"
-          sources."uuid-8.3.1"
+          sources."uuid-8.3.2"
           sources."v8-compile-cache-2.2.0"
-          (sources."v8-to-istanbul-7.0.0" // {
+          (sources."v8-to-istanbul-7.1.0" // {
             dependencies = [
               sources."source-map-0.7.3"
             ];
           })
           sources."validate-npm-package-license-3.0.4"
           sources."verror-1.10.0"
+          sources."vscode-textmate-5.2.0"
           sources."w3c-hr-time-1.0.2"
           sources."w3c-xmlserializer-2.0.0"
           sources."walker-1.0.7"
@@ -9227,23 +9562,21 @@ let
               sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
-              sources."emoji-regex-8.0.0"
               sources."is-fullwidth-code-point-3.0.0"
               sources."string-width-4.2.0"
               sources."strip-ansi-6.0.0"
             ];
           })
           sources."wrappy-1.0.2"
-          sources."write-1.0.3"
           sources."write-file-atomic-3.0.3"
-          sources."ws-7.4.0"
+          sources."ws-7.4.1"
           sources."xml-name-validator-3.0.0"
           sources."xmlchars-2.2.0"
-          sources."y18n-4.0.0"
+          sources."y18n-4.0.1"
+          sources."yallist-4.0.0"
           (sources."yargs-15.4.1" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
-              sources."emoji-regex-8.0.0"
               sources."is-fullwidth-code-point-3.0.0"
               sources."string-width-4.2.0"
               sources."strip-ansi-6.0.0"
@@ -9252,38 +9585,38 @@ let
           sources."yargs-parser-18.1.3"
         ];
       })
-      (sources."zigbee-herdsman-converters-13.0.7" // {
+      (sources."zigbee-herdsman-converters-14.0.3" // {
         dependencies = [
-          sources."@babel/code-frame-7.10.4"
-          (sources."@babel/core-7.12.9" // {
+          sources."@babel/code-frame-7.12.11"
+          (sources."@babel/core-7.12.10" // {
             dependencies = [
               sources."semver-5.7.1"
               sources."source-map-0.5.7"
             ];
           })
-          (sources."@babel/generator-7.12.5" // {
+          (sources."@babel/generator-7.12.11" // {
             dependencies = [
               sources."source-map-0.5.7"
             ];
           })
-          sources."@babel/helper-function-name-7.10.4"
-          sources."@babel/helper-get-function-arity-7.10.4"
+          sources."@babel/helper-function-name-7.12.11"
+          sources."@babel/helper-get-function-arity-7.12.10"
           sources."@babel/helper-member-expression-to-functions-7.12.7"
           sources."@babel/helper-module-imports-7.12.5"
           sources."@babel/helper-module-transforms-7.12.1"
-          sources."@babel/helper-optimise-call-expression-7.12.7"
+          sources."@babel/helper-optimise-call-expression-7.12.10"
           sources."@babel/helper-plugin-utils-7.10.4"
-          sources."@babel/helper-replace-supers-7.12.5"
+          sources."@babel/helper-replace-supers-7.12.11"
           sources."@babel/helper-simple-access-7.12.1"
-          sources."@babel/helper-split-export-declaration-7.11.0"
-          sources."@babel/helper-validator-identifier-7.10.4"
+          sources."@babel/helper-split-export-declaration-7.12.11"
+          sources."@babel/helper-validator-identifier-7.12.11"
           sources."@babel/helpers-7.12.5"
           (sources."@babel/highlight-7.10.4" // {
             dependencies = [
               sources."chalk-2.4.2"
             ];
           })
-          sources."@babel/parser-7.12.7"
+          sources."@babel/parser-7.12.11"
           sources."@babel/plugin-syntax-async-generators-7.8.4"
           sources."@babel/plugin-syntax-bigint-7.8.3"
           sources."@babel/plugin-syntax-class-properties-7.12.1"
@@ -9297,15 +9630,15 @@ let
           sources."@babel/plugin-syntax-optional-chaining-7.8.3"
           sources."@babel/plugin-syntax-top-level-await-7.12.1"
           sources."@babel/template-7.12.7"
-          (sources."@babel/traverse-7.12.9" // {
+          (sources."@babel/traverse-7.12.12" // {
             dependencies = [
               sources."globals-11.12.0"
             ];
           })
-          sources."@babel/types-7.12.7"
+          sources."@babel/types-7.12.12"
           sources."@bcoe/v8-coverage-0.2.3"
           sources."@cnakazawa/watch-1.0.4"
-          sources."@eslint/eslintrc-0.2.1"
+          sources."@eslint/eslintrc-0.2.2"
           (sources."@istanbuljs/load-nyc-config-1.1.0" // {
             dependencies = [
               sources."resolve-from-5.0.0"
@@ -9313,11 +9646,7 @@ let
           })
           sources."@istanbuljs/schema-0.1.2"
           sources."@jest/console-26.6.2"
-          (sources."@jest/core-26.6.3" // {
-            dependencies = [
-              sources."rimraf-3.0.2"
-            ];
-          })
+          sources."@jest/core-26.6.3"
           sources."@jest/environment-26.6.2"
           sources."@jest/fake-timers-26.6.2"
           sources."@jest/globals-26.6.2"
@@ -9335,23 +9664,23 @@ let
           sources."@types/babel__core-7.1.12"
           sources."@types/babel__generator-7.6.2"
           sources."@types/babel__template-7.4.0"
-          sources."@types/babel__traverse-7.0.16"
+          sources."@types/babel__traverse-7.11.0"
           sources."@types/graceful-fs-4.1.4"
           sources."@types/istanbul-lib-coverage-2.0.3"
           sources."@types/istanbul-lib-report-3.0.0"
           sources."@types/istanbul-reports-3.0.0"
           sources."@types/json-schema-7.0.6"
-          sources."@types/node-14.14.10"
+          sources."@types/node-14.14.16"
           sources."@types/normalize-package-data-2.4.0"
-          sources."@types/prettier-2.1.5"
+          sources."@types/prettier-2.1.6"
           sources."@types/stack-utils-2.0.0"
-          sources."@types/yargs-15.0.10"
-          sources."@types/yargs-parser-15.0.0"
-          sources."@typescript-eslint/experimental-utils-4.8.2"
-          sources."@typescript-eslint/scope-manager-4.8.2"
-          sources."@typescript-eslint/types-4.8.2"
-          sources."@typescript-eslint/typescript-estree-4.8.2"
-          sources."@typescript-eslint/visitor-keys-4.8.2"
+          sources."@types/yargs-15.0.12"
+          sources."@types/yargs-parser-20.2.0"
+          sources."@typescript-eslint/experimental-utils-4.11.0"
+          sources."@typescript-eslint/scope-manager-4.11.0"
+          sources."@typescript-eslint/types-4.11.0"
+          sources."@typescript-eslint/typescript-estree-4.11.0"
+          sources."@typescript-eslint/visitor-keys-4.11.0"
           sources."abab-2.0.5"
           sources."acorn-7.4.1"
           sources."acorn-globals-6.0.0"
@@ -9377,16 +9706,16 @@ let
           sources."asn1-0.2.4"
           sources."assert-plus-1.0.0"
           sources."assign-symbols-1.0.0"
-          sources."astral-regex-1.0.0"
+          sources."astral-regex-2.0.0"
           sources."asynckit-0.4.0"
           sources."atob-2.1.2"
           sources."aws-sign2-0.7.0"
           sources."aws4-1.11.0"
-          sources."axios-0.21.0"
+          sources."axios-0.21.1"
           sources."babel-jest-26.6.3"
           sources."babel-plugin-istanbul-6.0.0"
           sources."babel-plugin-jest-hoist-26.6.2"
-          sources."babel-preset-current-node-syntax-1.0.0"
+          sources."babel-preset-current-node-syntax-1.0.1"
           sources."babel-preset-jest-26.6.2"
           sources."balanced-match-1.0.0"
           (sources."base-0.11.2" // {
@@ -9429,13 +9758,7 @@ let
               sources."define-property-0.2.5"
             ];
           })
-          (sources."cliui-6.0.0" // {
-            dependencies = [
-              sources."emoji-regex-8.0.0"
-              sources."is-fullwidth-code-point-3.0.0"
-              sources."string-width-4.2.0"
-            ];
-          })
+          sources."cliui-6.0.0"
           sources."co-4.6.0"
           sources."collect-v8-coverage-1.0.1"
           sources."collection-visit-1.0.0"
@@ -9485,7 +9808,7 @@ let
           })
           sources."ecc-jsbn-0.1.2"
           sources."emittery-0.7.2"
-          sources."emoji-regex-7.0.3"
+          sources."emoji-regex-8.0.0"
           sources."end-of-stream-1.4.4"
           sources."enquirer-2.3.6"
           sources."error-ex-1.3.2"
@@ -9498,7 +9821,7 @@ let
               sources."type-check-0.3.2"
             ];
           })
-          sources."eslint-7.14.0"
+          sources."eslint-7.16.0"
           sources."eslint-config-google-0.14.0"
           sources."eslint-plugin-jest-24.1.3"
           sources."eslint-scope-5.1.1"
@@ -9508,7 +9831,7 @@ let
             ];
           })
           sources."eslint-visitor-keys-2.0.0"
-          (sources."espree-7.3.0" // {
+          (sources."espree-7.3.1" // {
             dependencies = [
               sources."eslint-visitor-keys-1.3.0"
             ];
@@ -9573,14 +9896,14 @@ let
           sources."fast-glob-3.2.4"
           sources."fast-json-stable-stringify-2.1.0"
           sources."fast-levenshtein-2.0.6"
-          sources."fastq-1.9.0"
+          sources."fastq-1.10.0"
           sources."fb-watchman-2.0.1"
-          sources."file-entry-cache-5.0.1"
+          sources."file-entry-cache-6.0.0"
           sources."fill-range-7.0.1"
           sources."find-up-4.1.0"
-          sources."flat-cache-2.0.1"
-          sources."flatted-2.0.2"
-          sources."follow-redirects-1.13.0"
+          sources."flat-cache-3.0.4"
+          sources."flatted-3.1.0"
+          sources."follow-redirects-1.13.1"
           sources."for-in-1.0.2"
           sources."forever-agent-0.6.1"
           sources."form-data-2.3.3"
@@ -9630,7 +9953,7 @@ let
           sources."iconv-lite-0.4.24"
           sources."ieee754-1.2.1"
           sources."ignore-4.0.6"
-          sources."import-fresh-3.2.2"
+          sources."import-fresh-3.3.0"
           sources."import-local-3.0.2"
           sources."imurmurhash-0.1.4"
           sources."inflight-1.0.6"
@@ -9658,7 +9981,7 @@ let
           sources."is-docker-2.1.1"
           sources."is-extendable-0.1.1"
           sources."is-extglob-2.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
           sources."is-generator-fn-2.1.0"
           sources."is-glob-4.0.1"
           sources."is-number-7.0.0"
@@ -9734,7 +10057,7 @@ let
             ];
           })
           sources."js-tokens-4.0.0"
-          sources."js-yaml-3.14.0"
+          sources."js-yaml-3.14.1"
           sources."jsbn-0.1.1"
           sources."jsdom-16.4.0"
           sources."jsesc-2.5.2"
@@ -9753,6 +10076,7 @@ let
           sources."locate-path-5.0.0"
           sources."lodash-4.17.20"
           sources."lodash.sortby-4.7.0"
+          sources."lru-cache-6.0.0"
           (sources."make-dir-3.1.0" // {
             dependencies = [
               sources."semver-6.3.0"
@@ -9774,14 +10098,13 @@ let
               sources."is-extendable-1.0.1"
             ];
           })
-          sources."mkdirp-0.5.5"
           sources."ms-2.1.2"
           sources."nanomatch-1.2.13"
           sources."natural-compare-1.4.0"
           sources."nice-try-1.0.5"
           sources."node-int64-0.4.0"
           sources."node-modules-regexp-1.0.0"
-          sources."node-notifier-8.0.0"
+          sources."node-notifier-8.0.1"
           (sources."normalize-package-data-2.5.0" // {
             dependencies = [
               sources."semver-5.7.1"
@@ -9876,7 +10199,7 @@ let
           sources."resolve-url-0.2.1"
           sources."ret-0.1.15"
           sources."reusify-1.0.4"
-          sources."rimraf-2.6.3"
+          sources."rimraf-3.0.2"
           sources."rsvp-4.8.5"
           sources."run-parallel-1.1.10"
           sources."safe-buffer-5.2.1"
@@ -9906,7 +10229,7 @@ let
             ];
           })
           sources."saxes-5.0.1"
-          sources."semver-7.3.2"
+          sources."semver-7.3.4"
           sources."set-blocking-2.0.0"
           (sources."set-value-2.0.1" // {
             dependencies = [
@@ -9919,7 +10242,13 @@ let
           sources."signal-exit-3.0.3"
           sources."sisteransi-1.0.5"
           sources."slash-3.0.0"
-          sources."slice-ansi-2.1.0"
+          (sources."slice-ansi-4.0.0" // {
+            dependencies = [
+              sources."ansi-styles-4.3.0"
+              sources."color-convert-2.0.1"
+              sources."color-name-1.1.4"
+            ];
+          })
           (sources."snapdragon-0.8.2" // {
             dependencies = [
               sources."debug-2.6.9"
@@ -9949,7 +10278,7 @@ let
           sources."spdx-correct-3.1.1"
           sources."spdx-exceptions-2.3.0"
           sources."spdx-expression-parse-3.0.1"
-          sources."spdx-license-ids-3.0.6"
+          sources."spdx-license-ids-3.0.7"
           sources."split-string-3.1.0"
           sources."sprintf-js-1.0.3"
           sources."sshpk-1.16.1"
@@ -9965,12 +10294,7 @@ let
           })
           sources."stealthy-require-1.1.1"
           sources."string-length-4.0.1"
-          (sources."string-width-3.1.0" // {
-            dependencies = [
-              sources."ansi-regex-4.1.0"
-              sources."strip-ansi-5.2.0"
-            ];
-          })
+          sources."string-width-4.2.0"
           sources."string_decoder-1.3.0"
           sources."strip-ansi-6.0.0"
           sources."strip-bom-4.0.0"
@@ -9985,7 +10309,7 @@ let
             ];
           })
           sources."symbol-tree-3.2.4"
-          sources."table-5.4.6"
+          sources."table-6.0.4"
           sources."tar-stream-2.1.4"
           sources."terminal-link-2.1.1"
           sources."test-exclude-6.0.0"
@@ -10025,9 +10349,9 @@ let
           sources."urix-0.1.0"
           sources."use-3.1.1"
           sources."util-deprecate-1.0.2"
-          sources."uuid-8.3.1"
+          sources."uuid-8.3.2"
           sources."v8-compile-cache-2.2.0"
-          (sources."v8-to-istanbul-7.0.0" // {
+          (sources."v8-to-istanbul-7.1.0" // {
             dependencies = [
               sources."source-map-0.7.3"
             ];
@@ -10049,34 +10373,1299 @@ let
               sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
-              sources."emoji-regex-8.0.0"
-              sources."is-fullwidth-code-point-3.0.0"
-              sources."string-width-4.2.0"
             ];
           })
           sources."wrappy-1.0.2"
-          sources."write-1.0.3"
           sources."write-file-atomic-3.0.3"
-          sources."ws-7.4.0"
+          sources."ws-7.4.1"
           sources."xml-name-validator-3.0.0"
           sources."xmlchars-2.2.0"
-          sources."y18n-4.0.0"
-          (sources."yargs-15.4.1" // {
+          sources."y18n-4.0.1"
+          sources."yallist-4.0.0"
+          sources."yargs-15.4.1"
+          sources."yargs-parser-18.1.3"
+          (sources."zigbee-herdsman-0.13.41" // {
             dependencies = [
-              sources."emoji-regex-8.0.0"
-              sources."is-fullwidth-code-point-3.0.0"
-              sources."string-width-4.2.0"
+              sources."@babel/cli-7.12.8"
+              sources."@babel/code-frame-7.10.4"
+              sources."@babel/compat-data-7.12.7"
+              sources."@babel/core-7.12.9"
+              sources."@babel/generator-7.12.5"
+              sources."@babel/helper-annotate-as-pure-7.10.4"
+              sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
+              sources."@babel/helper-compilation-targets-7.12.5"
+              sources."@babel/helper-create-class-features-plugin-7.12.1"
+              sources."@babel/helper-create-regexp-features-plugin-7.12.7"
+              sources."@babel/helper-define-map-7.10.5"
+              sources."@babel/helper-explode-assignable-expression-7.12.1"
+              sources."@babel/helper-function-name-7.10.4"
+              sources."@babel/helper-get-function-arity-7.10.4"
+              sources."@babel/helper-hoist-variables-7.10.4"
+              sources."@babel/helper-member-expression-to-functions-7.12.7"
+              sources."@babel/helper-module-imports-7.12.5"
+              sources."@babel/helper-module-transforms-7.12.1"
+              sources."@babel/helper-optimise-call-expression-7.12.7"
+              sources."@babel/helper-plugin-utils-7.10.4"
+              sources."@babel/helper-remap-async-to-generator-7.12.1"
+              sources."@babel/helper-replace-supers-7.12.5"
+              sources."@babel/helper-simple-access-7.12.1"
+              sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
+              sources."@babel/helper-split-export-declaration-7.11.0"
+              sources."@babel/helper-validator-identifier-7.10.4"
+              sources."@babel/helper-validator-option-7.12.1"
+              sources."@babel/helper-wrap-function-7.12.3"
+              sources."@babel/helpers-7.12.5"
+              sources."@babel/highlight-7.10.4"
+              sources."@babel/parser-7.12.7"
+              sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
+              sources."@babel/plugin-proposal-class-properties-7.12.1"
+              sources."@babel/plugin-proposal-dynamic-import-7.12.1"
+              sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
+              sources."@babel/plugin-proposal-json-strings-7.12.1"
+              sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
+              sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
+              sources."@babel/plugin-proposal-numeric-separator-7.12.7"
+              sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
+              sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
+              sources."@babel/plugin-proposal-optional-chaining-7.12.7"
+              sources."@babel/plugin-proposal-private-methods-7.12.1"
+              sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
+              sources."@babel/plugin-syntax-async-generators-7.8.4"
+              sources."@babel/plugin-syntax-bigint-7.8.3"
+              sources."@babel/plugin-syntax-class-properties-7.12.1"
+              sources."@babel/plugin-syntax-dynamic-import-7.8.3"
+              sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
+              sources."@babel/plugin-syntax-import-meta-7.10.4"
+              sources."@babel/plugin-syntax-json-strings-7.8.3"
+              sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4"
+              sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
+              sources."@babel/plugin-syntax-numeric-separator-7.10.4"
+              sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
+              sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
+              sources."@babel/plugin-syntax-optional-chaining-7.8.3"
+              sources."@babel/plugin-syntax-top-level-await-7.12.1"
+              sources."@babel/plugin-syntax-typescript-7.12.1"
+              sources."@babel/plugin-transform-arrow-functions-7.12.1"
+              sources."@babel/plugin-transform-async-to-generator-7.12.1"
+              sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
+              sources."@babel/plugin-transform-block-scoping-7.12.1"
+              sources."@babel/plugin-transform-classes-7.12.1"
+              sources."@babel/plugin-transform-computed-properties-7.12.1"
+              sources."@babel/plugin-transform-destructuring-7.12.1"
+              sources."@babel/plugin-transform-dotall-regex-7.12.1"
+              sources."@babel/plugin-transform-duplicate-keys-7.12.1"
+              sources."@babel/plugin-transform-exponentiation-operator-7.12.1"
+              sources."@babel/plugin-transform-for-of-7.12.1"
+              sources."@babel/plugin-transform-function-name-7.12.1"
+              sources."@babel/plugin-transform-literals-7.12.1"
+              sources."@babel/plugin-transform-member-expression-literals-7.12.1"
+              sources."@babel/plugin-transform-modules-amd-7.12.1"
+              sources."@babel/plugin-transform-modules-commonjs-7.12.1"
+              sources."@babel/plugin-transform-modules-systemjs-7.12.1"
+              sources."@babel/plugin-transform-modules-umd-7.12.1"
+              sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1"
+              sources."@babel/plugin-transform-new-target-7.12.1"
+              sources."@babel/plugin-transform-object-super-7.12.1"
+              sources."@babel/plugin-transform-parameters-7.12.1"
+              sources."@babel/plugin-transform-property-literals-7.12.1"
+              sources."@babel/plugin-transform-regenerator-7.12.1"
+              sources."@babel/plugin-transform-reserved-words-7.12.1"
+              sources."@babel/plugin-transform-shorthand-properties-7.12.1"
+              sources."@babel/plugin-transform-spread-7.12.1"
+              sources."@babel/plugin-transform-sticky-regex-7.12.7"
+              sources."@babel/plugin-transform-template-literals-7.12.1"
+              sources."@babel/plugin-transform-typeof-symbol-7.12.1"
+              sources."@babel/plugin-transform-typescript-7.12.1"
+              sources."@babel/plugin-transform-unicode-escapes-7.12.1"
+              sources."@babel/plugin-transform-unicode-regex-7.12.1"
+              sources."@babel/preset-env-7.12.7"
+              sources."@babel/preset-modules-0.1.4"
+              sources."@babel/preset-typescript-7.12.7"
+              sources."@babel/runtime-7.12.5"
+              sources."@babel/template-7.12.7"
+              sources."@babel/traverse-7.12.9"
+              sources."@babel/types-7.12.7"
+              sources."@bcoe/v8-coverage-0.2.3"
+              sources."@cnakazawa/watch-1.0.4"
+              (sources."@eslint/eslintrc-0.2.2" // {
+                dependencies = [
+                  sources."globals-12.4.0"
+                  sources."ignore-4.0.6"
+                  sources."strip-json-comments-3.1.1"
+                ];
+              })
+              sources."@istanbuljs/load-nyc-config-1.1.0"
+              sources."@istanbuljs/schema-0.1.2"
+              (sources."@jest/console-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."slash-3.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."@jest/core-26.6.3" // {
+                dependencies = [
+                  sources."ansi-regex-5.0.0"
+                  sources."ansi-styles-4.3.0"
+                  sources."braces-3.0.2"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."fill-range-7.0.1"
+                  sources."has-flag-4.0.0"
+                  sources."is-number-7.0.0"
+                  sources."micromatch-4.0.2"
+                  sources."slash-3.0.0"
+                  sources."strip-ansi-6.0.0"
+                  sources."supports-color-7.2.0"
+                  sources."to-regex-range-5.0.1"
+                ];
+              })
+              sources."@jest/environment-26.6.2"
+              sources."@jest/fake-timers-26.6.2"
+              sources."@jest/globals-26.6.2"
+              (sources."@jest/reporters-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."slash-3.0.0"
+                  sources."source-map-0.6.1"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."@jest/source-map-26.6.2" // {
+                dependencies = [
+                  sources."source-map-0.6.1"
+                ];
+              })
+              sources."@jest/test-result-26.6.2"
+              sources."@jest/test-sequencer-26.6.3"
+              (sources."@jest/transform-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."braces-3.0.2"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."fill-range-7.0.1"
+                  sources."has-flag-4.0.0"
+                  sources."is-number-7.0.0"
+                  sources."micromatch-4.0.2"
+                  sources."slash-3.0.0"
+                  sources."source-map-0.6.1"
+                  sources."supports-color-7.2.0"
+                  sources."to-regex-range-5.0.1"
+                ];
+              })
+              (sources."@jest/types-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents"
+              sources."@nodelib/fs.scandir-2.1.3"
+              sources."@nodelib/fs.stat-2.0.3"
+              sources."@nodelib/fs.walk-1.2.4"
+              sources."@serialport/binding-abstract-9.0.2"
+              sources."@serialport/binding-mock-9.0.2"
+              sources."@serialport/bindings-9.0.3"
+              sources."@serialport/parser-byte-length-9.0.1"
+              sources."@serialport/parser-cctalk-9.0.1"
+              sources."@serialport/parser-delimiter-9.0.1"
+              sources."@serialport/parser-readline-9.0.1"
+              sources."@serialport/parser-ready-9.0.1"
+              sources."@serialport/parser-regex-9.0.1"
+              sources."@serialport/stream-9.0.2"
+              sources."@sinonjs/commons-1.8.1"
+              sources."@sinonjs/fake-timers-6.0.1"
+              sources."@types/babel__core-7.1.12"
+              sources."@types/babel__generator-7.6.2"
+              sources."@types/babel__template-7.4.0"
+              sources."@types/babel__traverse-7.11.0"
+              sources."@types/debounce-1.2.0"
+              sources."@types/debug-4.1.5"
+              sources."@types/graceful-fs-4.1.4"
+              sources."@types/istanbul-lib-coverage-2.0.3"
+              sources."@types/istanbul-lib-report-3.0.0"
+              sources."@types/istanbul-reports-3.0.0"
+              sources."@types/jest-26.0.18"
+              sources."@types/json-schema-7.0.6"
+              sources."@types/nedb-1.8.11"
+              sources."@types/node-14.14.11"
+              sources."@types/normalize-package-data-2.4.0"
+              sources."@types/prettier-2.1.5"
+              sources."@types/serialport-8.0.1"
+              sources."@types/stack-utils-2.0.0"
+              sources."@types/yargs-15.0.11"
+              sources."@types/yargs-parser-15.0.0"
+              (sources."@typescript-eslint/eslint-plugin-4.9.1" // {
+                dependencies = [
+                  sources."semver-7.3.4"
+                ];
+              })
+              sources."@typescript-eslint/experimental-utils-4.9.1"
+              sources."@typescript-eslint/parser-4.9.1"
+              sources."@typescript-eslint/scope-manager-4.9.1"
+              sources."@typescript-eslint/types-4.9.1"
+              (sources."@typescript-eslint/typescript-estree-4.9.1" // {
+                dependencies = [
+                  sources."semver-7.3.4"
+                ];
+              })
+              sources."@typescript-eslint/visitor-keys-4.9.1"
+              sources."abab-2.0.5"
+              sources."acorn-7.4.1"
+              sources."acorn-globals-6.0.0"
+              sources."acorn-jsx-5.3.1"
+              sources."acorn-walk-7.2.0"
+              sources."ajv-6.12.6"
+              sources."ansi-colors-4.1.1"
+              (sources."ansi-escapes-4.3.1" // {
+                dependencies = [
+                  sources."type-fest-0.11.0"
+                ];
+              })
+              sources."ansi-regex-2.1.1"
+              sources."ansi-styles-3.2.1"
+              (sources."anymatch-2.0.0" // {
+                dependencies = [
+                  sources."normalize-path-2.1.1"
+                ];
+              })
+              sources."aproba-1.2.0"
+              sources."are-we-there-yet-1.1.5"
+              sources."argparse-1.0.10"
+              sources."arr-diff-4.0.0"
+              sources."arr-flatten-1.1.0"
+              sources."arr-union-3.1.0"
+              sources."array-union-2.1.0"
+              sources."array-unique-0.3.2"
+              sources."asn1-0.2.4"
+              sources."assert-plus-1.0.0"
+              sources."assign-symbols-1.0.0"
+              sources."astral-regex-1.0.0"
+              sources."async-each-1.0.3"
+              sources."asynckit-0.4.0"
+              sources."at-least-node-1.0.0"
+              sources."atob-2.1.2"
+              sources."aws-sign2-0.7.0"
+              sources."aws4-1.11.0"
+              (sources."babel-jest-26.6.3" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."slash-3.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."babel-plugin-dynamic-import-node-2.3.3"
+              sources."babel-plugin-istanbul-6.0.0"
+              sources."babel-plugin-jest-hoist-26.6.2"
+              sources."babel-preset-current-node-syntax-1.0.0"
+              sources."babel-preset-jest-26.6.2"
+              sources."balanced-match-1.0.0"
+              (sources."base-0.11.2" // {
+                dependencies = [
+                  sources."define-property-1.0.0"
+                  sources."is-accessor-descriptor-1.0.0"
+                  sources."is-data-descriptor-1.0.0"
+                  sources."is-descriptor-1.0.2"
+                  sources."is-extendable-1.0.1"
+                  sources."mixin-deep-1.3.2"
+                ];
+              })
+              sources."base64-js-1.5.1"
+              sources."bcrypt-pbkdf-1.0.2"
+              sources."binary-extensions-1.13.1"
+              sources."bindings-1.5.0"
+              (sources."bl-4.0.3" // {
+                dependencies = [
+                  sources."readable-stream-3.6.0"
+                ];
+              })
+              sources."brace-expansion-1.1.11"
+              (sources."braces-2.3.2" // {
+                dependencies = [
+                  sources."extend-shallow-2.0.1"
+                ];
+              })
+              sources."browser-process-hrtime-1.0.0"
+              sources."browserslist-4.15.0"
+              sources."bser-2.1.1"
+              sources."buffer-5.7.1"
+              sources."buffer-from-1.1.1"
+              sources."cache-base-1.0.1"
+              sources."call-bind-1.0.0"
+              sources."callsites-3.1.0"
+              sources."camelcase-5.3.1"
+              sources."caniuse-lite-1.0.30001165"
+              sources."capture-exit-2.0.0"
+              sources."caseless-0.12.0"
+              sources."chalk-2.4.2"
+              sources."char-regex-1.0.2"
+              (sources."chokidar-3.4.3" // {
+                dependencies = [
+                  sources."anymatch-3.1.1"
+                  sources."binary-extensions-2.1.0"
+                  sources."braces-3.0.2"
+                  sources."fill-range-7.0.1"
+                  sources."glob-parent-5.1.1"
+                  sources."is-binary-path-2.1.0"
+                  sources."is-number-7.0.0"
+                  sources."readdirp-3.5.0"
+                  sources."to-regex-range-5.0.1"
+                ];
+              })
+              sources."chownr-1.1.4"
+              sources."ci-info-2.0.0"
+              sources."cjs-module-lexer-0.6.0"
+              (sources."class-utils-0.3.6" // {
+                dependencies = [
+                  sources."define-property-0.2.5"
+                ];
+              })
+              (sources."cliui-6.0.0" // {
+                dependencies = [
+                  sources."ansi-regex-5.0.0"
+                  sources."emoji-regex-8.0.0"
+                  sources."is-fullwidth-code-point-3.0.0"
+                  sources."string-width-4.2.0"
+                  sources."strip-ansi-6.0.0"
+                ];
+              })
+              sources."co-4.6.0"
+              sources."code-point-at-1.1.0"
+              sources."collect-v8-coverage-1.0.1"
+              sources."collection-visit-1.0.0"
+              sources."color-convert-1.9.3"
+              sources."color-name-1.1.3"
+              sources."colorette-1.2.1"
+              sources."colors-1.4.0"
+              sources."combined-stream-1.0.8"
+              sources."commander-4.1.1"
+              sources."component-emitter-1.3.0"
+              sources."concat-map-0.0.1"
+              sources."console-control-strings-1.1.0"
+              sources."convert-source-map-1.7.0"
+              sources."copy-descriptor-0.1.1"
+              (sources."core-js-compat-3.8.1" // {
+                dependencies = [
+                  sources."semver-7.0.0"
+                ];
+              })
+              sources."core-util-is-1.0.2"
+              sources."cross-spawn-6.0.5"
+              sources."cssom-0.4.4"
+              (sources."cssstyle-2.3.0" // {
+                dependencies = [
+                  sources."cssom-0.3.8"
+                ];
+              })
+              sources."dashdash-1.14.1"
+              sources."data-urls-2.0.0"
+              sources."debounce-1.2.0"
+              sources."debug-4.3.1"
+              sources."decamelize-1.2.0"
+              sources."decimal.js-10.2.1"
+              sources."decode-uri-component-0.2.0"
+              sources."decompress-response-4.2.1"
+              sources."deep-extend-0.6.0"
+              sources."deep-is-0.1.3"
+              sources."deepmerge-4.2.2"
+              sources."define-properties-1.1.3"
+              (sources."define-property-2.0.2" // {
+                dependencies = [
+                  sources."is-accessor-descriptor-1.0.0"
+                  sources."is-data-descriptor-1.0.0"
+                  sources."is-descriptor-1.0.2"
+                ];
+              })
+              sources."delayed-stream-1.0.0"
+              sources."delegates-1.0.0"
+              sources."detect-libc-1.0.3"
+              sources."detect-newline-3.1.0"
+              sources."diff-sequences-26.6.2"
+              sources."dir-glob-3.0.1"
+              sources."doctrine-3.0.0"
+              (sources."domexception-2.0.1" // {
+                dependencies = [
+                  sources."webidl-conversions-5.0.0"
+                ];
+              })
+              sources."ecc-jsbn-0.1.2"
+              sources."electron-to-chromium-1.3.620"
+              sources."emittery-0.7.2"
+              sources."emoji-regex-7.0.3"
+              sources."end-of-stream-1.4.4"
+              sources."enquirer-2.3.6"
+              sources."error-ex-1.3.2"
+              sources."escalade-3.1.1"
+              sources."escape-string-regexp-1.0.5"
+              (sources."escodegen-1.14.3" // {
+                dependencies = [
+                  sources."levn-0.3.0"
+                  sources."optionator-0.8.3"
+                  sources."prelude-ls-1.1.2"
+                  sources."source-map-0.6.1"
+                  sources."type-check-0.3.2"
+                ];
+              })
+              (sources."eslint-7.15.0" // {
+                dependencies = [
+                  sources."ansi-regex-5.0.0"
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."cross-spawn-7.0.3"
+                  sources."glob-parent-5.1.1"
+                  sources."globals-12.4.0"
+                  sources."has-flag-4.0.0"
+                  sources."ignore-4.0.6"
+                  sources."path-key-3.1.1"
+                  sources."semver-7.3.4"
+                  sources."shebang-command-2.0.0"
+                  sources."shebang-regex-3.0.0"
+                  sources."strip-ansi-6.0.0"
+                  sources."strip-json-comments-3.1.1"
+                  sources."supports-color-7.2.0"
+                  sources."which-2.0.2"
+                ];
+              })
+              sources."eslint-scope-5.1.1"
+              (sources."eslint-utils-2.1.0" // {
+                dependencies = [
+                  sources."eslint-visitor-keys-1.3.0"
+                ];
+              })
+              sources."eslint-visitor-keys-2.0.0"
+              (sources."espree-7.3.1" // {
+                dependencies = [
+                  sources."eslint-visitor-keys-1.3.0"
+                ];
+              })
+              sources."esprima-4.0.1"
+              (sources."esquery-1.3.1" // {
+                dependencies = [
+                  sources."estraverse-5.2.0"
+                ];
+              })
+              (sources."esrecurse-4.3.0" // {
+                dependencies = [
+                  sources."estraverse-5.2.0"
+                ];
+              })
+              sources."estraverse-4.3.0"
+              sources."esutils-2.0.3"
+              sources."exec-sh-0.3.4"
+              sources."execa-1.0.0"
+              sources."exit-0.1.2"
+              (sources."expand-brackets-2.1.4" // {
+                dependencies = [
+                  sources."debug-2.6.9"
+                  sources."define-property-0.2.5"
+                  sources."extend-shallow-2.0.1"
+                  sources."ms-2.0.0"
+                ];
+              })
+              sources."expand-template-2.0.3"
+              (sources."expect-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                ];
+              })
+              sources."extend-3.0.2"
+              (sources."extend-shallow-3.0.2" // {
+                dependencies = [
+                  sources."is-extendable-1.0.1"
+                ];
+              })
+              (sources."extglob-2.0.4" // {
+                dependencies = [
+                  sources."define-property-1.0.0"
+                  sources."extend-shallow-2.0.1"
+                  sources."is-accessor-descriptor-1.0.0"
+                  sources."is-data-descriptor-1.0.0"
+                  sources."is-descriptor-1.0.2"
+                ];
+              })
+              sources."extsprintf-1.3.0"
+              sources."fast-deep-equal-3.1.3"
+              (sources."fast-glob-3.2.4" // {
+                dependencies = [
+                  sources."braces-3.0.2"
+                  sources."fill-range-7.0.1"
+                  sources."glob-parent-5.1.1"
+                  sources."is-number-7.0.0"
+                  sources."micromatch-4.0.2"
+                  sources."to-regex-range-5.0.1"
+                ];
+              })
+              sources."fast-json-stable-stringify-2.1.0"
+              sources."fast-levenshtein-2.0.6"
+              sources."fastq-1.9.0"
+              sources."fb-watchman-2.0.1"
+              sources."file-entry-cache-6.0.0"
+              sources."file-uri-to-path-1.0.0"
+              (sources."fill-range-4.0.0" // {
+                dependencies = [
+                  sources."extend-shallow-2.0.1"
+                ];
+              })
+              sources."find-up-4.1.0"
+              sources."flat-cache-3.0.4"
+              sources."flatted-3.1.0"
+              sources."for-in-1.0.2"
+              sources."forever-agent-0.6.1"
+              sources."form-data-2.3.3"
+              sources."fragment-cache-0.2.1"
+              sources."fs-constants-1.0.0"
+              sources."fs-extra-9.0.1"
+              sources."fs-readdir-recursive-1.1.0"
+              sources."fs.realpath-1.0.0"
+              sources."fsevents-2.1.3"
+              sources."function-bind-1.1.1"
+              sources."functional-red-black-tree-1.0.1"
+              sources."gauge-2.7.4"
+              sources."gensync-1.0.0-beta.2"
+              sources."get-caller-file-2.0.5"
+              sources."get-intrinsic-1.0.1"
+              sources."get-package-type-0.1.0"
+              sources."get-stream-4.1.0"
+              sources."get-value-2.0.6"
+              sources."getpass-0.1.7"
+              sources."github-from-package-0.0.0"
+              sources."glob-7.1.6"
+              (sources."glob-parent-3.1.0" // {
+                dependencies = [
+                  sources."is-glob-3.1.0"
+                ];
+              })
+              sources."globals-11.12.0"
+              (sources."globby-11.0.1" // {
+                dependencies = [
+                  sources."slash-3.0.0"
+                ];
+              })
+              sources."graceful-fs-4.2.4"
+              sources."growly-1.3.0"
+              (sources."handlebars-4.7.6" // {
+                dependencies = [
+                  sources."source-map-0.6.1"
+                ];
+              })
+              sources."har-schema-2.0.0"
+              sources."har-validator-5.1.5"
+              sources."has-1.0.3"
+              sources."has-flag-3.0.0"
+              sources."has-symbols-1.0.1"
+              sources."has-unicode-2.0.1"
+              sources."has-value-1.0.0"
+              (sources."has-values-1.0.0" // {
+                dependencies = [
+                  sources."kind-of-4.0.0"
+                ];
+              })
+              sources."hosted-git-info-2.8.8"
+              sources."html-encoding-sniffer-2.0.1"
+              sources."html-escaper-2.0.2"
+              sources."http-signature-1.2.0"
+              sources."human-signals-1.1.1"
+              sources."iconv-lite-0.4.24"
+              sources."ieee754-1.2.1"
+              sources."ignore-5.1.8"
+              (sources."import-fresh-3.2.2" // {
+                dependencies = [
+                  sources."resolve-from-4.0.0"
+                ];
+              })
+              sources."import-local-3.0.2"
+              sources."imurmurhash-0.1.4"
+              sources."inflight-1.0.6"
+              sources."inherits-2.0.4"
+              sources."ini-1.3.6"
+              sources."interpret-1.4.0"
+              sources."ip-regex-2.1.0"
+              (sources."is-accessor-descriptor-0.1.6" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              })
+              sources."is-arrayish-0.2.1"
+              sources."is-binary-path-1.0.1"
+              sources."is-buffer-1.1.6"
+              sources."is-ci-2.0.0"
+              sources."is-core-module-2.2.0"
+              (sources."is-data-descriptor-0.1.4" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              })
+              (sources."is-descriptor-0.1.6" // {
+                dependencies = [
+                  sources."kind-of-5.1.0"
+                ];
+              })
+              sources."is-docker-2.1.1"
+              sources."is-extendable-0.1.1"
+              sources."is-extglob-2.1.1"
+              sources."is-fullwidth-code-point-1.0.0"
+              sources."is-generator-fn-2.1.0"
+              sources."is-glob-4.0.1"
+              (sources."is-number-3.0.0" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              })
+              sources."is-plain-object-2.0.4"
+              sources."is-potential-custom-element-name-1.0.0"
+              sources."is-stream-1.1.0"
+              sources."is-typedarray-1.0.0"
+              sources."is-windows-1.0.2"
+              sources."is-wsl-2.2.0"
+              sources."isarray-1.0.0"
+              sources."isexe-2.0.0"
+              sources."isobject-3.0.1"
+              sources."isstream-0.1.2"
+              sources."istanbul-lib-coverage-3.0.0"
+              (sources."istanbul-lib-instrument-4.0.3" // {
+                dependencies = [
+                  sources."semver-6.3.0"
+                ];
+              })
+              (sources."istanbul-lib-report-3.0.0" // {
+                dependencies = [
+                  sources."has-flag-4.0.0"
+                  sources."make-dir-3.1.0"
+                  sources."semver-6.3.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."istanbul-lib-source-maps-4.0.0" // {
+                dependencies = [
+                  sources."source-map-0.6.1"
+                ];
+              })
+              sources."istanbul-reports-3.0.2"
+              (sources."jest-26.6.3" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."jest-cli-26.6.3"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."jest-changed-files-26.6.2" // {
+                dependencies = [
+                  sources."cross-spawn-7.0.3"
+                  sources."execa-4.1.0"
+                  sources."get-stream-5.2.0"
+                  sources."is-stream-2.0.0"
+                  sources."npm-run-path-4.0.1"
+                  sources."path-key-3.1.1"
+                  sources."shebang-command-2.0.0"
+                  sources."shebang-regex-3.0.0"
+                  sources."which-2.0.2"
+                ];
+              })
+              (sources."jest-config-26.6.3" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."braces-3.0.2"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."fill-range-7.0.1"
+                  sources."has-flag-4.0.0"
+                  sources."is-number-7.0.0"
+                  sources."micromatch-4.0.2"
+                  sources."supports-color-7.2.0"
+                  sources."to-regex-range-5.0.1"
+                ];
+              })
+              (sources."jest-diff-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."jest-docblock-26.0.0"
+              (sources."jest-each-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."jest-environment-jsdom-26.6.2"
+              sources."jest-environment-node-26.6.2"
+              sources."jest-get-type-26.3.0"
+              (sources."jest-haste-map-26.6.2" // {
+                dependencies = [
+                  sources."anymatch-3.1.1"
+                  sources."braces-3.0.2"
+                  sources."fill-range-7.0.1"
+                  sources."is-number-7.0.0"
+                  sources."micromatch-4.0.2"
+                  sources."to-regex-range-5.0.1"
+                ];
+              })
+              (sources."jest-jasmine2-26.6.3" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."jest-leak-detector-26.6.2"
+              (sources."jest-matcher-utils-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."jest-message-util-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."braces-3.0.2"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."fill-range-7.0.1"
+                  sources."has-flag-4.0.0"
+                  sources."is-number-7.0.0"
+                  sources."micromatch-4.0.2"
+                  sources."slash-3.0.0"
+                  sources."supports-color-7.2.0"
+                  sources."to-regex-range-5.0.1"
+                ];
+              })
+              sources."jest-mock-26.6.2"
+              sources."jest-pnp-resolver-1.2.2"
+              sources."jest-regex-util-26.0.0"
+              (sources."jest-resolve-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."slash-3.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."jest-resolve-dependencies-26.6.3"
+              (sources."jest-runner-26.6.3" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."jest-runtime-26.6.3" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."slash-3.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."jest-serializer-26.6.2"
+              (sources."jest-snapshot-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."semver-7.3.4"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."jest-util-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."braces-3.0.2"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."fill-range-7.0.1"
+                  sources."has-flag-4.0.0"
+                  sources."is-number-7.0.0"
+                  sources."micromatch-4.0.2"
+                  sources."supports-color-7.2.0"
+                  sources."to-regex-range-5.0.1"
+                ];
+              })
+              (sources."jest-validate-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."camelcase-6.2.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."jest-watcher-26.6.2" // {
+                dependencies = [
+                  sources."ansi-styles-4.3.0"
+                  sources."chalk-4.1.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              (sources."jest-worker-26.6.2" // {
+                dependencies = [
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."js-tokens-4.0.0"
+              sources."js-yaml-3.14.1"
+              sources."jsbn-0.1.1"
+              sources."jsdom-16.4.0"
+              sources."jsesc-2.5.2"
+              sources."json-parse-even-better-errors-2.3.1"
+              sources."json-schema-0.2.3"
+              sources."json-schema-traverse-0.4.1"
+              sources."json-stable-stringify-without-jsonify-1.0.1"
+              sources."json-stringify-safe-5.0.1"
+              sources."json5-2.1.3"
+              (sources."jsonfile-6.1.0" // {
+                dependencies = [
+                  sources."universalify-2.0.0"
+                ];
+              })
+              sources."jsprim-1.4.1"
+              sources."kind-of-6.0.3"
+              sources."kleur-3.0.3"
+              sources."leven-3.1.0"
+              sources."levn-0.4.1"
+              sources."lines-and-columns-1.1.6"
+              sources."locate-path-5.0.0"
+              sources."lodash-4.17.20"
+              sources."lodash.sortby-4.7.0"
+              sources."lru-cache-6.0.0"
+              sources."lunr-2.3.9"
+              sources."make-dir-2.1.0"
+              sources."makeerror-1.0.11"
+              sources."map-cache-0.2.2"
+              sources."map-visit-1.0.0"
+              sources."marked-1.2.5"
+              sources."merge-stream-2.0.0"
+              sources."merge2-1.4.1"
+              sources."micromatch-3.1.10"
+              sources."mime-db-1.44.0"
+              sources."mime-types-2.1.27"
+              sources."mimic-fn-2.1.0"
+              sources."mimic-response-2.1.0"
+              sources."minimatch-3.0.4"
+              sources."minimist-1.2.5"
+              sources."mixin-deep-2.0.1"
+              sources."mkdirp-classic-0.5.3"
+              sources."ms-2.1.2"
+              sources."nan-2.14.2"
+              sources."nanomatch-1.2.13"
+              sources."napi-build-utils-1.0.2"
+              sources."natural-compare-1.4.0"
+              sources."neo-async-2.6.2"
+              sources."nice-try-1.0.5"
+              sources."node-abi-2.19.3"
+              sources."node-int64-0.4.0"
+              sources."node-modules-regexp-1.0.0"
+              (sources."node-notifier-8.0.0" // {
+                dependencies = [
+                  sources."semver-7.3.4"
+                  sources."which-2.0.2"
+                ];
+              })
+              sources."node-releases-1.1.67"
+              sources."noop-logger-0.1.1"
+              sources."normalize-package-data-2.5.0"
+              sources."normalize-path-3.0.0"
+              sources."npm-run-path-2.0.2"
+              sources."npmlog-4.1.2"
+              sources."number-is-nan-1.0.1"
+              sources."nwsapi-2.2.0"
+              sources."oauth-sign-0.9.0"
+              sources."object-assign-4.1.1"
+              (sources."object-copy-0.1.0" // {
+                dependencies = [
+                  sources."define-property-0.2.5"
+                  sources."kind-of-3.2.2"
+                ];
+              })
+              sources."object-keys-1.1.1"
+              sources."object-visit-1.0.1"
+              sources."object.assign-4.1.2"
+              sources."object.pick-1.3.0"
+              sources."once-1.4.0"
+              sources."onetime-5.1.2"
+              (sources."onigasm-2.2.5" // {
+                dependencies = [
+                  sources."lru-cache-5.1.1"
+                  sources."yallist-3.1.1"
+                ];
+              })
+              sources."optionator-0.9.1"
+              sources."p-each-series-2.2.0"
+              sources."p-finally-1.0.0"
+              sources."p-limit-2.3.0"
+              sources."p-locate-4.1.0"
+              sources."p-try-2.2.0"
+              sources."parent-module-1.0.1"
+              sources."parse-json-5.1.0"
+              sources."parse5-5.1.1"
+              sources."pascalcase-0.1.1"
+              sources."path-dirname-1.0.2"
+              sources."path-exists-4.0.0"
+              sources."path-is-absolute-1.0.1"
+              sources."path-key-2.0.1"
+              sources."path-parse-1.0.6"
+              sources."path-type-4.0.0"
+              sources."performance-now-2.1.0"
+              sources."picomatch-2.2.2"
+              sources."pify-4.0.1"
+              sources."pirates-4.0.1"
+              sources."pkg-dir-4.2.0"
+              sources."posix-character-classes-0.1.1"
+              sources."prebuild-install-6.0.0"
+              sources."prelude-ls-1.2.1"
+              (sources."pretty-format-26.6.2" // {
+                dependencies = [
+                  sources."ansi-regex-5.0.0"
+                  sources."ansi-styles-4.3.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                ];
+              })
+              sources."process-nextick-args-2.0.1"
+              sources."progress-2.0.3"
+              sources."prompts-2.4.0"
+              sources."psl-1.8.0"
+              sources."pump-3.0.0"
+              sources."punycode-2.1.1"
+              sources."qs-6.5.2"
+              sources."rc-1.2.8"
+              sources."react-is-17.0.1"
+              (sources."read-pkg-5.2.0" // {
+                dependencies = [
+                  sources."type-fest-0.6.0"
+                ];
+              })
+              sources."read-pkg-up-7.0.1"
+              sources."readable-stream-2.3.7"
+              sources."readdirp-2.2.1"
+              sources."rechoir-0.6.2"
+              sources."regenerate-1.4.2"
+              sources."regenerate-unicode-properties-8.2.0"
+              sources."regenerator-runtime-0.13.7"
+              sources."regenerator-transform-0.14.5"
+              sources."regex-not-1.0.2"
+              sources."regexpp-3.1.0"
+              sources."regexpu-core-4.7.1"
+              sources."regjsgen-0.5.2"
+              (sources."regjsparser-0.6.4" // {
+                dependencies = [
+                  sources."jsesc-0.5.0"
+                ];
+              })
+              sources."remove-trailing-separator-1.1.0"
+              sources."repeat-element-1.1.3"
+              sources."repeat-string-1.6.1"
+              (sources."request-2.88.2" // {
+                dependencies = [
+                  sources."tough-cookie-2.5.0"
+                  sources."uuid-3.4.0"
+                ];
+              })
+              sources."request-promise-core-1.1.4"
+              (sources."request-promise-native-1.0.9" // {
+                dependencies = [
+                  sources."tough-cookie-2.5.0"
+                ];
+              })
+              sources."require-directory-2.1.1"
+              sources."require-main-filename-2.0.0"
+              sources."resolve-1.19.0"
+              sources."resolve-cwd-3.0.0"
+              sources."resolve-from-5.0.0"
+              sources."resolve-url-0.2.1"
+              sources."ret-0.1.15"
+              sources."reusify-1.0.4"
+              sources."rimraf-3.0.2"
+              sources."rsvp-4.8.5"
+              sources."run-parallel-1.1.10"
+              sources."safe-buffer-5.1.2"
+              sources."safe-regex-1.1.0"
+              sources."safer-buffer-2.1.2"
+              sources."sane-4.1.0"
+              sources."saxes-5.0.1"
+              sources."semver-5.7.1"
+              sources."serialport-9.0.3"
+              sources."set-blocking-2.0.0"
+              (sources."set-value-2.0.1" // {
+                dependencies = [
+                  sources."extend-shallow-2.0.1"
+                ];
+              })
+              sources."shebang-command-1.2.0"
+              sources."shebang-regex-1.0.0"
+              sources."shelljs-0.8.4"
+              sources."shellwords-0.1.1"
+              sources."shiki-0.2.7"
+              sources."shiki-languages-0.2.7"
+              sources."shiki-themes-0.2.7"
+              sources."signal-exit-3.0.3"
+              sources."simple-concat-1.0.1"
+              sources."simple-get-3.1.0"
+              sources."sisteransi-1.0.5"
+              sources."slash-2.0.0"
+              (sources."slice-ansi-2.1.0" // {
+                dependencies = [
+                  sources."is-fullwidth-code-point-2.0.0"
+                ];
+              })
+              sources."slip-1.0.2"
+              (sources."snapdragon-0.8.2" // {
+                dependencies = [
+                  sources."debug-2.6.9"
+                  sources."define-property-0.2.5"
+                  sources."extend-shallow-2.0.1"
+                  sources."ms-2.0.0"
+                ];
+              })
+              (sources."snapdragon-node-2.1.1" // {
+                dependencies = [
+                  sources."define-property-1.0.0"
+                  sources."is-accessor-descriptor-1.0.0"
+                  sources."is-data-descriptor-1.0.0"
+                  sources."is-descriptor-1.0.2"
+                ];
+              })
+              (sources."snapdragon-util-3.0.1" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              })
+              sources."source-map-0.5.7"
+              sources."source-map-resolve-0.5.3"
+              (sources."source-map-support-0.5.19" // {
+                dependencies = [
+                  sources."source-map-0.6.1"
+                ];
+              })
+              sources."source-map-url-0.4.0"
+              sources."spdx-correct-3.1.1"
+              sources."spdx-exceptions-2.3.0"
+              sources."spdx-expression-parse-3.0.1"
+              sources."spdx-license-ids-3.0.7"
+              sources."split-string-3.1.0"
+              sources."sprintf-js-1.0.3"
+              sources."sshpk-1.16.1"
+              (sources."stack-utils-2.0.3" // {
+                dependencies = [
+                  sources."escape-string-regexp-2.0.0"
+                ];
+              })
+              (sources."static-extend-0.1.2" // {
+                dependencies = [
+                  sources."define-property-0.2.5"
+                ];
+              })
+              sources."stealthy-require-1.1.1"
+              (sources."string-length-4.0.1" // {
+                dependencies = [
+                  sources."ansi-regex-5.0.0"
+                  sources."strip-ansi-6.0.0"
+                ];
+              })
+              sources."string-width-1.0.2"
+              sources."string_decoder-1.1.1"
+              sources."strip-ansi-3.0.1"
+              sources."strip-bom-4.0.0"
+              sources."strip-eof-1.0.0"
+              sources."strip-final-newline-2.0.0"
+              sources."strip-json-comments-2.0.1"
+              sources."supports-color-5.5.0"
+              (sources."supports-hyperlinks-2.1.0" // {
+                dependencies = [
+                  sources."has-flag-4.0.0"
+                  sources."supports-color-7.2.0"
+                ];
+              })
+              sources."symbol-tree-3.2.4"
+              (sources."table-5.4.6" // {
+                dependencies = [
+                  sources."ansi-regex-4.1.0"
+                  sources."is-fullwidth-code-point-2.0.0"
+                  sources."string-width-3.1.0"
+                  sources."strip-ansi-5.2.0"
+                ];
+              })
+              sources."tar-fs-2.1.1"
+              (sources."tar-stream-2.1.4" // {
+                dependencies = [
+                  sources."readable-stream-3.6.0"
+                ];
+              })
+              sources."terminal-link-2.1.1"
+              sources."test-exclude-6.0.0"
+              sources."text-table-0.2.0"
+              sources."throat-5.0.0"
+              sources."tmpl-1.0.4"
+              sources."to-fast-properties-2.0.0"
+              (sources."to-object-path-0.3.0" // {
+                dependencies = [
+                  sources."kind-of-3.2.2"
+                ];
+              })
+              sources."to-regex-3.0.2"
+              sources."to-regex-range-2.1.1"
+              sources."tough-cookie-3.0.1"
+              sources."tr46-2.0.2"
+              sources."tslib-1.14.1"
+              sources."tsutils-3.17.1"
+              sources."tunnel-agent-0.6.0"
+              sources."tweetnacl-0.14.5"
+              sources."type-check-0.4.0"
+              sources."type-detect-4.0.8"
+              sources."type-fest-0.8.1"
+              sources."typedarray-to-buffer-3.1.5"
+              sources."typedoc-0.20.0-beta.27"
+              sources."typedoc-default-themes-0.12.0-beta.10"
+              sources."typedoc-plugin-markdown-3.1.0"
+              sources."typedoc-plugin-no-inherit-1.2.0"
+              sources."typedoc-plugin-sourcefile-url-1.0.6"
+              sources."typescript-4.1.2"
+              sources."uglify-js-3.12.1"
+              sources."unicode-canonical-property-names-ecmascript-1.0.4"
+              sources."unicode-match-property-ecmascript-1.0.4"
+              sources."unicode-match-property-value-ecmascript-1.2.0"
+              sources."unicode-property-aliases-ecmascript-1.1.0"
+              sources."union-value-1.0.1"
+              sources."universalify-1.0.0"
+              (sources."unset-value-1.0.0" // {
+                dependencies = [
+                  (sources."has-value-0.3.1" // {
+                    dependencies = [
+                      sources."isobject-2.1.0"
+                    ];
+                  })
+                  sources."has-values-0.1.4"
+                ];
+              })
+              sources."upath-1.2.0"
+              sources."uri-js-4.4.0"
+              sources."urix-0.1.0"
+              sources."use-3.1.1"
+              sources."util-deprecate-1.0.2"
+              sources."uuid-8.3.2"
+              sources."v8-compile-cache-2.2.0"
+              (sources."v8-to-istanbul-7.0.0" // {
+                dependencies = [
+                  sources."source-map-0.7.3"
+                ];
+              })
+              sources."validate-npm-package-license-3.0.4"
+              sources."verror-1.10.0"
+              sources."vscode-textmate-5.2.0"
+              sources."w3c-hr-time-1.0.2"
+              sources."w3c-xmlserializer-2.0.0"
+              sources."walker-1.0.7"
+              sources."webidl-conversions-6.1.0"
+              sources."whatwg-encoding-1.0.5"
+              sources."whatwg-mimetype-2.3.0"
+              sources."whatwg-url-8.4.0"
+              sources."which-1.3.1"
+              sources."which-module-2.0.0"
+              sources."which-pm-runs-1.0.0"
+              sources."wide-align-1.1.3"
+              sources."word-wrap-1.2.3"
+              sources."wordwrap-1.0.0"
+              (sources."wrap-ansi-6.2.0" // {
+                dependencies = [
+                  sources."ansi-regex-5.0.0"
+                  sources."ansi-styles-4.3.0"
+                  sources."color-convert-2.0.1"
+                  sources."color-name-1.1.4"
+                  sources."emoji-regex-8.0.0"
+                  sources."is-fullwidth-code-point-3.0.0"
+                  sources."string-width-4.2.0"
+                  sources."strip-ansi-6.0.0"
+                ];
+              })
+              sources."wrappy-1.0.2"
+              sources."write-file-atomic-3.0.3"
+              sources."ws-7.4.1"
+              sources."xml-name-validator-3.0.0"
+              sources."xmlchars-2.2.0"
+              sources."y18n-4.0.1"
+              sources."yallist-4.0.0"
+              (sources."yargs-15.4.1" // {
+                dependencies = [
+                  sources."ansi-regex-5.0.0"
+                  sources."emoji-regex-8.0.0"
+                  sources."is-fullwidth-code-point-3.0.0"
+                  sources."string-width-4.2.0"
+                  sources."strip-ansi-6.0.0"
+                ];
+              })
+              sources."yargs-parser-18.1.3"
             ];
           })
-          sources."yargs-parser-18.1.3"
         ];
       })
-      sources."zigbee2mqtt-frontend-0.2.100"
+      sources."zigbee2mqtt-frontend-0.2.129"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Zigbee to MQTT bridge using Zigbee-herdsman";
-      homepage = https://koenkk.github.io/zigbee2mqtt;
+      homepage = "https://koenkk.github.io/zigbee2mqtt";
       license = "GPL-3.0";
     };
     production = true;
@@ -10090,4 +11679,16 @@ in
   tarball = nodeEnv.buildNodeSourceDist args;
   package = nodeEnv.buildNodePackage args;
   shell = nodeEnv.buildNodeShell args;
+  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
+    src = stdenv.mkDerivation {
+      name = args.name + "-package-json";
+      src = nix-gitignore.gitignoreSourcePure [
+        "*"
+        "!package.json"
+        "!package-lock.json"
+      ] args.src;
+      dontBuild = true;
+      installPhase = "mkdir -p $out; cp -r ./* $out;";
+    };
+  });
 }
diff --git a/pkgs/servers/zigbee2mqtt/node.nix b/pkgs/servers/zigbee2mqtt/node.nix
index 2d0fadffa97..171f9e0c8d4 100644
--- a/pkgs/servers/zigbee2mqtt/node.nix
+++ b/pkgs/servers/zigbee2mqtt/node.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix
index 66e70162675..b43d2938009 100644
--- a/pkgs/tools/networking/airfield/node-packages.nix
+++ b/pkgs/tools/networking/airfield/node-packages.nix
@@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
-    "ajv-6.12.0" = {
+    "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.0";
+      version = "6.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
-        sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
+        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
     "asn1-0.2.4" = {
@@ -19,7 +19,7 @@ let
       version = "0.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
-        sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g";
+        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
       };
     };
     "assert-plus-1.0.0" = {
@@ -49,13 +49,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.9.1" = {
+    "aws4-1.11.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.9.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
-        sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
+        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
     "bcrypt-pbkdf-1.0.2" = {
@@ -100,7 +100,7 @@ let
       version = "1.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
-        sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm";
+        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
       };
     };
     "commander-0.6.1" = {
@@ -166,13 +166,13 @@ let
         sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
-    "debug-4.1.1" = {
+    "debug-4.3.2" = {
       name = "debug";
       packageName = "debug";
-      version = "4.1.1";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
-        sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
+        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -184,13 +184,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "denque-1.4.1" = {
+    "denque-1.5.0" = {
       name = "denque";
       packageName = "denque";
-      version = "1.4.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
-        sha512 = "2spb0s12jkarfiydj4sj4iw1yfjzaplakzw7bma0pwnbra23l1b85rsyzc25szlfdl3bm5bb42fmy4xhf1xdpxaywmwh6aa4swwzz1r";
+        url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz";
+        sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -208,7 +208,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
-        sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
       };
     };
     "extsprintf-1.3.0" = {
@@ -220,13 +220,13 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-3.1.1" = {
+    "fast-deep-equal-3.1.3" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
-        sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
+        sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
       };
     };
     "fast-json-stable-stringify-2.1.0" = {
@@ -235,7 +235,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
-        sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn";
+        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
     "forever-agent-0.6.1" = {
@@ -253,7 +253,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
-        sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn";
+        sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
       };
     };
     "formidable-1.0.11" = {
@@ -292,13 +292,13 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-5.1.3" = {
+    "har-validator-5.1.5" = {
       name = "har-validator";
       packageName = "har-validator";
-      version = "5.1.3";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
-        sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz";
+        sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==";
       };
     };
     "http-signature-1.2.0" = {
@@ -352,7 +352,7 @@ let
       version = "0.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
-        sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5";
+        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
       };
     };
     "json-stringify-safe-5.0.1" = {
@@ -391,22 +391,22 @@ let
         sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
       };
     };
-    "mime-db-1.43.0" = {
+    "mime-db-1.45.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.43.0";
+      version = "1.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
-        sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
+        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
       };
     };
-    "mime-types-2.1.26" = {
+    "mime-types-2.1.28" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.26";
+      version = "2.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
-        sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
+        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
       };
     };
     "mkdirp-0.3.3" = {
@@ -424,7 +424,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -433,7 +433,7 @@ let
       version = "0.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
-        sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x";
+        sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
       };
     };
     "pause-0.0.1" = {
@@ -454,13 +454,13 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "psl-1.7.0" = {
+    "psl-1.8.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
-        sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4";
+        url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
+        sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
       };
     };
     "punycode-2.1.1" = {
@@ -469,7 +469,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx";
+        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
     "qs-0.5.1" = {
@@ -487,7 +487,7 @@ let
       version = "6.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
-        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
     "range-parser-0.0.4" = {
@@ -499,13 +499,13 @@ let
         sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
       };
     };
-    "redis-commands-1.5.0" = {
+    "redis-commands-1.6.0" = {
       name = "redis-commands";
       packageName = "redis-commands";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz";
-        sha512 = "0kdmbh04hif6g8qr3zcwjkjg1v3rjgss0dq3sy144l5ja5vp4ndb5hdn2acrx57w01swbwpkskmy788lr2nxdq0g46azqsrmad5mb78";
+        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz";
+        sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ==";
       };
     };
     "redis-errors-1.2.0" = {
@@ -526,13 +526,13 @@ let
         sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4";
       };
     };
-    "safe-buffer-5.2.0" = {
+    "safe-buffer-5.2.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
-        sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -541,7 +541,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "send-0.1.0" = {
@@ -559,7 +559,7 @@ let
       version = "1.16.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
-        sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x";
+        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
     "tough-cookie-2.5.0" = {
@@ -568,7 +568,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
-        sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -589,22 +589,22 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "underscore-1.9.2" = {
+    "underscore-1.12.0" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.9.2";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
-        sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
+        sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
       };
     };
-    "uri-js-4.2.2" = {
+    "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.2.2";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
-        sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
+        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     };
     "uuid-3.4.0" = {
@@ -613,7 +613,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
-        sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "verror-1.10.0" = {
@@ -644,7 +644,7 @@ in
       sources."cookie-0.0.5"
       sources."cookie-signature-0.0.1"
       sources."crc-0.2.0"
-      sources."debug-4.1.1"
+      sources."debug-4.3.2"
       sources."formidable-1.0.11"
       sources."fresh-0.1.0"
       sources."methods-0.0.1"
@@ -673,7 +673,7 @@ in
       sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
     };
     dependencies = [
-      sources."underscore-1.9.2"
+      sources."underscore-1.12.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -706,11 +706,11 @@ in
     version = "3.0.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/redis/-/redis-3.0.2.tgz";
-      sha512 = "26lf40x7al63vywd96j6idqbn8fagv4jp6ar9cc80aili5d59sy14hvb3haw8xhjqxc3481dkmbvza8x3p1dcn3p2az5snlp054pn1w";
+      sha512 = "PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==";
     };
     dependencies = [
-      sources."denque-1.4.1"
-      sources."redis-commands-1.5.0"
+      sources."denque-1.5.0"
+      sources."redis-commands-1.6.0"
       sources."redis-errors-1.2.0"
       sources."redis-parser-3.0.0"
     ];
@@ -727,10 +727,10 @@ in
   connect-redis = nodeEnv.buildNodePackage {
     name = "connect-redis";
     packageName = "connect-redis";
-    version = "4.0.4";
+    version = "5.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.4.tgz";
-      sha512 = "014p1jjd7bzdsd81v0918ac5j4k1qs4qi2nzzndyn50rznd04hx85l23jpicznwc2j3nkz5bj15zbi98ld3akxb5rwl46r5sdp3nyb9";
+      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-5.0.0.tgz";
+      sha512 = "R4nTW5uXeG5s6zr/q4abmtcdloglZrL/A3cpa0JU0RLFJU4mTR553HUY8OZ0ngeySkGDclwQ5xmCcjjKkxdOSg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -748,7 +748,7 @@ in
     version = "3.2.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz";
-      sha512 = "1kwiqca4ql149ywfzbp1lpmqixnh1y9i5aizcd0fvndrq9sn31j0cr38wdgbr5xqvlxgjfs3jwryg7ddnwc8n1b5nlksfjmj48sc7ad";
+      sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -766,15 +766,15 @@ in
     version = "2.88.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
-      sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj";
+      sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
     };
     dependencies = [
-      sources."ajv-6.12.0"
+      sources."ajv-6.12.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.9.1"
+      sources."aws4-1.11.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.8"
@@ -784,13 +784,13 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.1"
+      sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."getpass-0.1.7"
       sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
+      sources."har-validator-5.1.5"
       sources."http-signature-1.2.0"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
@@ -799,20 +799,20 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
-      sources."mime-db-1.43.0"
-      sources."mime-types-2.1.26"
+      sources."mime-db-1.45.0"
+      sources."mime-types-2.1.28"
       sources."oauth-sign-0.9.0"
       sources."performance-now-2.1.0"
-      sources."psl-1.7.0"
+      sources."psl-1.8.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."safe-buffer-5.2.0"
+      sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."sshpk-1.16.1"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uri-js-4.2.2"
+      sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
     ];
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 6f3f95714a2..0bcd0eb4b85 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index 6f3f95714a2..0bcd0eb4b85 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index b5b42e9164a..0b6857cf716 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/pkgs/tools/package-management/nixui/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -49,6 +49,15 @@ let
         sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593";
       };
     };
+    "underscore-1.12.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
+        sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
+      };
+    };
     "underscore-1.4.4" = {
       name = "underscore";
       packageName = "underscore";
@@ -58,15 +67,6 @@ let
         sha1 = "61a6a32010622afa07963bf325203cf12239d604";
       };
     };
-    "underscore-1.9.2" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
-        sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg";
-      };
-    };
   };
 in
 {
@@ -93,7 +93,7 @@ in
           sources."underscore-1.4.4"
         ];
       })
-      sources."underscore-1.9.2"
+      sources."underscore-1.12.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {

From aea19f284a579022614fe04854b01dc2a2dad263 Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Fri, 22 Jan 2021 13:42:23 -0800
Subject: [PATCH 637/956] docker: correct substitution path with buildx enabled

Starting with Docker 20.10, the client repo moved and the path changed.
---
 pkgs/applications/virtualization/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 28075360f69..ed30c380a2c 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -169,7 +169,7 @@ rec {
       substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man"
       substituteInPlace ./man/md2man-all.sh            --replace md2man go-md2man
     '' + optionalString buildxSupport ''
-      substituteInPlace ./components/cli/cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
+      substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
           ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
     '';
 

From 3a77187c8a72fe0c9fcf566b853996d01220f1a9 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 19 Jan 2021 13:49:24 +0100
Subject: [PATCH 638/956] gnomeExtensions.unite-shell: rename to
 gnomeExtensions.unite

---
 .../gnome-3/extensions/{unite-shell => unite}/default.nix      | 2 +-
 pkgs/top-level/aliases.nix                                     | 3 +++
 pkgs/top-level/all-packages.nix                                | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename pkgs/desktops/gnome-3/extensions/{unite-shell => unite}/default.nix (95%)

diff --git a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix
similarity index 95%
rename from pkgs/desktops/gnome-3/extensions/unite-shell/default.nix
rename to pkgs/desktops/gnome-3/extensions/unite/default.nix
index 778743071d6..9d58a923740 100644
--- a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
 stdenv.mkDerivation rec {
-  pname = "gnome-shell-extension-unite-shell";
+  pname = "gnome-shell-extension-unite";
   version = "44";
 
   src = fetchFromGitHub {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d5374158a10..532f42ef5ef 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -730,6 +730,9 @@ mapAliases ({
   youtubeDL = youtube-dl;  # added 2014-10-26
   ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
   zdfmediathk = mediathekview; # added 2019-01-19
+  gnomeExtensions = gnomeExtensions // {
+    unite-shell = gnomeExtensions.unite; # added 2021-01-19
+  };
   gnome_user_docs = gnome-user-docs; # added 2019-11-20
   # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
   spidermonkey = spidermonkey_78; # added 2020-10-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 182c6f90454..73793ee675e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27283,7 +27283,7 @@ in
     tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { };
     timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
     topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
-    unite-shell = callPackage ../desktops/gnome-3/extensions/unite-shell { };
+    unite = callPackage ../desktops/gnome-3/extensions/unite { };
     window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { };
     window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { };
     workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { };

From 2db2a966eaff6fcddae8258e47399926c51a37aa Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Fri, 22 Jan 2021 01:04:12 +0100
Subject: [PATCH 639/956] luarocks-nix: update 20190907 -> 20210122

rebased on top of luarocks 3.5
---
 pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index 57f200fd0fc..30e02a3623f 100644
--- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
@@ -1,14 +1,11 @@
 { luarocks, fetchFromGitHub }:
 luarocks.overrideAttrs(old: {
   pname = "luarocks-nix";
-  version = "2019-09-07";
+  version = "2021-01-22";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "luarocks-nix";
-    rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde";
-    sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y";
+    rev = "v3.5.0_nix";
+    sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk=";
   };
-  patches = [
-    ./darwin-3.1.3.patch
-  ];
 })

From e964e6e35d8ecf954c1a0cdbc43fbcf91f32d377 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Fri, 22 Jan 2021 01:05:05 +0100
Subject: [PATCH 640/956] luaPackages.cassowary: add alerque as maintainer

it was added in the generated file, move it to the source of truth for
the generated files.
---
 maintainers/scripts/luarocks-packages.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index fb90e62769f..ac9f22d23fb 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -6,7 +6,7 @@ basexx,,,,,
 binaryheap,,,,,vcunat
 bit32,,,,lua5_1,lblasc
 busted,,,,,
-cassowary,,,,,marsam
+cassowary,,,,,marsam alerque
 cjson,lua-cjson,,,,
 compat53,,,,,vcunat
 cosmo,,,,,marsam

From 0bc275e63423456d6deb650e146120c39c1e0723 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 22 Jan 2021 14:07:06 -0800
Subject: [PATCH 641/956] Revert "lib: Clean up how linux and gcc config is
 specified"

This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614589ee3acd070a6409b2b9700c92d65.
---
 lib/systems/default.nix                       |  13 +-
 lib/systems/examples.nix                      |  48 +-
 lib/systems/platforms.nix                     | 642 +++++++++---------
 nixos/doc/manual/release-notes/rl-2103.xml    |  16 -
 nixos/modules/hardware/device-tree.nix        |   8 +-
 nixos/modules/installer/netboot/netboot.nix   |   2 +-
 nixos/modules/services/misc/nix-daemon.nix    |   8 +-
 nixos/modules/system/activation/top-level.nix |   2 +-
 .../generations-dir/generations-dir.nix       |   2 +-
 .../boot/loader/raspberrypi/raspberrypi.nix   |   2 +-
 nixos/release.nix                             |   4 +-
 .../audio/virtual-ans/default.nix             |   2 +-
 .../virtualization/crosvm/default.nix         |   2 +-
 .../virtualization/vpcs/default.nix           |   2 +-
 .../bintools-wrapper/default.nix              |   2 +-
 pkgs/build-support/cc-wrapper/default.nix     |  16 +-
 pkgs/build-support/kernel/make-initrd.nix     |   4 +-
 pkgs/build-support/vm/default.nix             |   2 +-
 .../compilers/gcc/common/platform-flags.nix   |   2 +-
 pkgs/development/compilers/julia/1.0.nix      |   2 +-
 pkgs/development/compilers/julia/1.3.nix      |   2 +-
 pkgs/development/compilers/julia/1.5.nix      |   2 +-
 pkgs/development/libraries/glibc/common.nix   |   2 +-
 .../libraries/qt-5/modules/qtwebengine.nix    |   2 +-
 .../tools/poetry2nix/poetry2nix/pep425.nix    |   6 +-
 .../tools/poetry2nix/poetry2nix/pep508.nix    |   2 +-
 pkgs/development/web/nodejs/nodejs.nix        |  11 +-
 pkgs/os-specific/linux/exfat/default.nix      |   2 +-
 .../linux/kernel-headers/default.nix          |   2 +-
 pkgs/os-specific/linux/kernel/generic.nix     |  18 +-
 .../linux/kernel/manual-config.nix            |  30 +-
 pkgs/os-specific/linux/klibc/default.nix      |   4 +-
 pkgs/os-specific/linux/rtl8723bs/default.nix  |   2 +-
 pkgs/os-specific/linux/rtl8812au/default.nix  |   2 +-
 pkgs/os-specific/linux/uclibc/default.nix     |   2 +-
 pkgs/stdenv/generic/make-derivation.nix       |   2 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 37 files changed, 434 insertions(+), 440 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 84d0b34805a..4edcbeb36f1 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -24,6 +24,8 @@ rec {
       # Either of these can be losslessly-extracted from `parsed` iff parsing succeeds.
       system = parse.doubleFromSystem final.parsed;
       config = parse.tripleFromSystem final.parsed;
+      # Just a guess, based on `system`
+      platform = platforms.select final;
       # Determine whether we are compatible with the provided CPU
       isCompatible = platform: parse.isCompatible final.parsed.cpu platform.parsed.cpu;
       # Derived meta-data
@@ -77,16 +79,7 @@ rec {
       };
       isStatic = final.isWasm || final.isRedox;
 
-      # Just a guess, based on `system`
-      inherit
-        ({
-          linux-kernel = args.linux-kernel or {};
-          gcc = args.gcc or {};
-          rustc = args.rust or {};
-        } // platforms.select final)
-        linux-kernel gcc rustc;
-
-      linuxArch =
+      kernelArch =
         if final.isAarch32 then "arm"
         else if final.isAarch64 then "arm64"
         else if final.isx86_32 then "x86"
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index de12e0b83c1..16002450f2d 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -7,6 +7,7 @@ let
 
   riscv = bits: {
     config = "riscv${bits}-unknown-linux-gnu";
+    platform = platforms.riscv-multiplatform;
   };
 in
 
@@ -16,68 +17,84 @@ rec {
   #
   powernv = {
     config = "powerpc64le-unknown-linux-gnu";
+    platform = platforms.powernv;
   };
   musl-power = {
     config = "powerpc64le-unknown-linux-musl";
+    platform = platforms.powernv;
   };
 
   sheevaplug = {
     config = "armv5tel-unknown-linux-gnueabi";
-  } // platforms.sheevaplug;
+    platform = platforms.sheevaplug;
+  };
 
   raspberryPi = {
     config = "armv6l-unknown-linux-gnueabihf";
-  } // platforms.raspberrypi;
+    platform = platforms.raspberrypi;
+  };
 
   remarkable1 = {
     config = "armv7l-unknown-linux-gnueabihf";
-  } // platforms.zero-gravitas;
+    platform = platforms.zero-gravitas;
+  };
 
   remarkable2 = {
     config = "armv7l-unknown-linux-gnueabihf";
-  } // platforms.zero-sugar;
+    platform = platforms.zero-sugar;
+  };
 
   armv7l-hf-multiplatform = {
     config = "armv7l-unknown-linux-gnueabihf";
+    platform = platforms.armv7l-hf-multiplatform;
   };
 
   aarch64-multiplatform = {
     config = "aarch64-unknown-linux-gnu";
+    platform = platforms.aarch64-multiplatform;
   };
 
   armv7a-android-prebuilt = {
     config = "armv7a-unknown-linux-androideabi";
     sdkVer = "29";
     ndkVer = "21";
+    platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
-  } // platforms.armv7a-android;
+  };
 
   aarch64-android-prebuilt = {
     config = "aarch64-unknown-linux-android";
     sdkVer = "29";
     ndkVer = "21";
+    platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
 
-  scaleway-c1 = armv7l-hf-multiplatform // platforms.scaleway-c1;
+  scaleway-c1 = armv7l-hf-multiplatform // rec {
+    platform = platforms.scaleway-c1;
+    inherit (platform.gcc) fpu;
+  };
 
   pogoplug4 = {
     config = "armv5tel-unknown-linux-gnueabi";
-  } // platforms.pogoplug4;
+    platform = platforms.pogoplug4;
+  };
 
   ben-nanonote = {
     config = "mipsel-unknown-linux-uclibc";
-  } // platforms.ben_nanonote;
+    platform = platforms.ben_nanonote;
+  };
 
   fuloongminipc = {
     config = "mipsel-unknown-linux-gnu";
-  } // platforms.fuloong2f_n32;
+    platform = platforms.fuloong2f_n32;
+  };
 
   muslpi = raspberryPi // {
     config = "armv6l-unknown-linux-musleabihf";
   };
 
-  aarch64-multiplatform-musl = {
+  aarch64-multiplatform-musl = aarch64-multiplatform // {
     config = "aarch64-unknown-linux-musl";
   };
 
@@ -93,11 +110,13 @@ rec {
   riscv64-embedded = {
     config = "riscv64-none-elf";
     libc = "newlib";
+    platform = platforms.riscv-multiplatform;
   };
 
   riscv32-embedded = {
     config = "riscv32-none-elf";
     libc = "newlib";
+    platform = platforms.riscv-multiplatform;
   };
 
   mmix = {
@@ -117,11 +136,13 @@ rec {
   vc4 = {
     config = "vc4-elf";
     libc = "newlib";
+    platform = {};
   };
 
   or1k = {
     config = "or1k-elf";
     libc = "newlib";
+    platform = {};
   };
 
   arm-embedded = {
@@ -183,6 +204,7 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
+    platform = {};
   };
 
   iphone32 = {
@@ -192,6 +214,7 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
+    platform = {};
   };
 
   iphone64-simulator = {
@@ -201,6 +224,7 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
+    platform = {};
   };
 
   iphone32-simulator = {
@@ -210,6 +234,7 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
+    platform = {};
   };
 
   #
@@ -220,6 +245,7 @@ rec {
   mingw32 = {
     config = "i686-w64-mingw32";
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
+    platform = {};
   };
 
   # 64 bit mingw-w64
@@ -227,6 +253,7 @@ rec {
     # That's the triplet they use in the mingw-w64 docs.
     config = "x86_64-w64-mingw32";
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
+    platform = {};
   };
 
   # BSDs
@@ -248,5 +275,6 @@ rec {
   # Ghcjs
   ghcjs = {
     config = "js-unknown-ghcjs";
+    platform = {};
   };
 }
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index f399c1873f5..e869de488c1 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -1,36 +1,39 @@
 { lib }:
 rec {
-  pc = {
-    linux-kernel = {
-      name = "pc";
-
-      baseConfig = "defconfig";
-      # Build whatever possible as a module, if not stated in the extra config.
-      autoModules = true;
-      target = "bzImage";
-    };
+  pcBase = {
+    name = "pc";
+    kernelBaseConfig = "defconfig";
+    # Build whatever possible as a module, if not stated in the extra config.
+    kernelAutoModules = true;
+    kernelTarget = "bzImage";
   };
 
-  pc_simplekernel = lib.recursiveUpdate pc {
-    linux-kernel.autoModules = false;
+  pc64 = pcBase // { kernelArch = "x86_64"; };
+
+  pc32 = pcBase // { kernelArch = "i386"; };
+
+  pc32_simplekernel = pc32 // {
+    kernelAutoModules = false;
+  };
+
+  pc64_simplekernel = pc64 // {
+    kernelAutoModules = false;
   };
 
   powernv = {
-    linux-kernel = {
-      name = "PowerNV";
-
-      baseConfig = "powernv_defconfig";
-      target = "zImage";
-      installTarget = "install";
-      file = "vmlinux";
-      autoModules = true;
-      # avoid driver/FS trouble arising from unusual page size
-      extraConfig = ''
-        PPC_64K_PAGES n
-        PPC_4K_PAGES y
-        IPV6 y
-      '';
-    };
+    name = "PowerNV";
+    kernelArch = "powerpc";
+    kernelBaseConfig = "powernv_defconfig";
+    kernelTarget = "zImage";
+    kernelInstallTarget = "install";
+    kernelFile = "vmlinux";
+    kernelAutoModules = true;
+    # avoid driver/FS trouble arising from unusual page size
+    kernelExtraConfig = ''
+      PPC_64K_PAGES n
+      PPC_4K_PAGES y
+      IPV6 y
+    '';
   };
 
   ##
@@ -38,121 +41,17 @@ rec {
   ##
 
   pogoplug4 = {
-    linux-kernel = {
-      name = "pogoplug4";
+    name = "pogoplug4";
 
-      baseConfig = "multi_v5_defconfig";
-      autoModules = false;
-      extraConfig = ''
-        # Ubi for the mtd
-        MTD_UBI y
-        UBIFS_FS y
-        UBIFS_FS_XATTR y
-        UBIFS_FS_ADVANCED_COMPR y
-        UBIFS_FS_LZO y
-        UBIFS_FS_ZLIB y
-        UBIFS_FS_DEBUG n
-      '';
-      makeFlags = [ "LOADADDR=0x8000" ];
-      target = "uImage";
-      # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
-      #DTB = true;
-    };
     gcc = {
       arch = "armv5te";
     };
-  };
-
-  sheevaplug = {
-    linux-kernel = {
-      name = "sheevaplug";
-
-      baseConfig = "multi_v5_defconfig";
-      autoModules = false;
-      extraConfig = ''
-        BLK_DEV_RAM y
-        BLK_DEV_INITRD y
-        BLK_DEV_CRYPTOLOOP m
-        BLK_DEV_DM m
-        DM_CRYPT m
-        MD y
-        REISERFS_FS m
-        BTRFS_FS m
-        XFS_FS m
-        JFS_FS m
-        EXT4_FS m
-        USB_STORAGE_CYPRESS_ATACB m
-
-        # mv cesa requires this sw fallback, for mv-sha1
-        CRYPTO_SHA1 y
-        # Fast crypto
-        CRYPTO_TWOFISH y
-        CRYPTO_TWOFISH_COMMON y
-        CRYPTO_BLOWFISH y
-        CRYPTO_BLOWFISH_COMMON y
-
-        IP_PNP y
-        IP_PNP_DHCP y
-        NFS_FS y
-        ROOT_NFS y
-        TUN m
-        NFS_V4 y
-        NFS_V4_1 y
-        NFS_FSCACHE y
-        NFSD m
-        NFSD_V2_ACL y
-        NFSD_V3 y
-        NFSD_V3_ACL y
-        NFSD_V4 y
-        NETFILTER y
-        IP_NF_IPTABLES y
-        IP_NF_FILTER y
-        IP_NF_MATCH_ADDRTYPE y
-        IP_NF_TARGET_LOG y
-        IP_NF_MANGLE y
-        IPV6 m
-        VLAN_8021Q m
-
-        CIFS y
-        CIFS_XATTR y
-        CIFS_POSIX y
-        CIFS_FSCACHE y
-        CIFS_ACL y
-
-        WATCHDOG y
-        WATCHDOG_CORE y
-        ORION_WATCHDOG m
-
-        ZRAM m
-        NETCONSOLE m
-
-        # Disable OABI to have seccomp_filter (required for systemd)
-        # https://github.com/raspberrypi/firmware/issues/651
-        OABI_COMPAT n
-
-        # Fail to build
-        DRM n
-        SCSI_ADVANSYS n
-        USB_ISP1362_HCD n
-        SND_SOC n
-        SND_ALI5451 n
-        FB_SAVAGE n
-        SCSI_NSP32 n
-        ATA_SFF n
-        SUNGEM n
-        IRDA n
-        ATM_HE n
-        SCSI_ACARD n
-        BLK_DEV_CMD640_ENHANCED n
-
-        FUSE_FS m
-
-        # systemd uses cgroups
-        CGROUPS y
-
-        # Latencytop
-        LATENCYTOP y
 
+    kernelBaseConfig = "multi_v5_defconfig";
+    kernelArch = "arm";
+    kernelAutoModules = false;
+    kernelExtraConfig =
+      ''
         # Ubi for the mtd
         MTD_UBI y
         UBIFS_FS y
@@ -161,36 +60,137 @@ rec {
         UBIFS_FS_LZO y
         UBIFS_FS_ZLIB y
         UBIFS_FS_DEBUG n
-
-        # Kdb, for kernel troubles
-        KGDB y
-        KGDB_SERIAL_CONSOLE y
-        KGDB_KDB y
       '';
-      makeFlags = [ "LOADADDR=0x0200000" ];
-      target = "uImage";
-      DTB = true; # Beyond 3.10
-    };
+    kernelMakeFlags = [ "LOADADDR=0x8000" ];
+    kernelTarget = "uImage";
+    # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
+    #kernelDTB = true;
+  };
+
+  sheevaplug = {
+    name = "sheevaplug";
+    kernelBaseConfig = "multi_v5_defconfig";
+    kernelArch = "arm";
+    kernelAutoModules = false;
+    kernelExtraConfig = ''
+      BLK_DEV_RAM y
+      BLK_DEV_INITRD y
+      BLK_DEV_CRYPTOLOOP m
+      BLK_DEV_DM m
+      DM_CRYPT m
+      MD y
+      REISERFS_FS m
+      BTRFS_FS m
+      XFS_FS m
+      JFS_FS m
+      EXT4_FS m
+      USB_STORAGE_CYPRESS_ATACB m
+
+      # mv cesa requires this sw fallback, for mv-sha1
+      CRYPTO_SHA1 y
+      # Fast crypto
+      CRYPTO_TWOFISH y
+      CRYPTO_TWOFISH_COMMON y
+      CRYPTO_BLOWFISH y
+      CRYPTO_BLOWFISH_COMMON y
+
+      IP_PNP y
+      IP_PNP_DHCP y
+      NFS_FS y
+      ROOT_NFS y
+      TUN m
+      NFS_V4 y
+      NFS_V4_1 y
+      NFS_FSCACHE y
+      NFSD m
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      NETFILTER y
+      IP_NF_IPTABLES y
+      IP_NF_FILTER y
+      IP_NF_MATCH_ADDRTYPE y
+      IP_NF_TARGET_LOG y
+      IP_NF_MANGLE y
+      IPV6 m
+      VLAN_8021Q m
+
+      CIFS y
+      CIFS_XATTR y
+      CIFS_POSIX y
+      CIFS_FSCACHE y
+      CIFS_ACL y
+
+      WATCHDOG y
+      WATCHDOG_CORE y
+      ORION_WATCHDOG m
+
+      ZRAM m
+      NETCONSOLE m
+
+      # Disable OABI to have seccomp_filter (required for systemd)
+      # https://github.com/raspberrypi/firmware/issues/651
+      OABI_COMPAT n
+
+      # Fail to build
+      DRM n
+      SCSI_ADVANSYS n
+      USB_ISP1362_HCD n
+      SND_SOC n
+      SND_ALI5451 n
+      FB_SAVAGE n
+      SCSI_NSP32 n
+      ATA_SFF n
+      SUNGEM n
+      IRDA n
+      ATM_HE n
+      SCSI_ACARD n
+      BLK_DEV_CMD640_ENHANCED n
+
+      FUSE_FS m
+
+      # systemd uses cgroups
+      CGROUPS y
+
+      # Latencytop
+      LATENCYTOP y
+
+      # Ubi for the mtd
+      MTD_UBI y
+      UBIFS_FS y
+      UBIFS_FS_XATTR y
+      UBIFS_FS_ADVANCED_COMPR y
+      UBIFS_FS_LZO y
+      UBIFS_FS_ZLIB y
+      UBIFS_FS_DEBUG n
+
+      # Kdb, for kernel troubles
+      KGDB y
+      KGDB_SERIAL_CONSOLE y
+      KGDB_KDB y
+    '';
+    kernelMakeFlags = [ "LOADADDR=0x0200000" ];
+    kernelTarget = "uImage";
+    kernelDTB = true; # Beyond 3.10
     gcc = {
       arch = "armv5te";
     };
   };
 
   raspberrypi = {
-    linux-kernel = {
-      name = "raspberrypi";
-
-      baseConfig = "bcm2835_defconfig";
-      DTB = true;
-      autoModules = true;
-      preferBuiltin = true;
-      extraConfig = ''
-        # Disable OABI to have seccomp_filter (required for systemd)
-        # https://github.com/raspberrypi/firmware/issues/651
-        OABI_COMPAT n
-      '';
-      target = "zImage";
-    };
+    name = "raspberrypi";
+    kernelBaseConfig = "bcm2835_defconfig";
+    kernelDTB = true;
+    kernelArch = "arm";
+    kernelAutoModules = true;
+    kernelPreferBuiltin = true;
+    kernelExtraConfig = ''
+      # Disable OABI to have seccomp_filter (required for systemd)
+      # https://github.com/raspberrypi/firmware/issues/651
+      OABI_COMPAT n
+    '';
+    kernelTarget = "zImage";
     gcc = {
       arch = "armv6";
       fpu = "vfp";
@@ -201,15 +201,13 @@ rec {
   raspberrypi2 = armv7l-hf-multiplatform;
 
   zero-gravitas = {
-    linux-kernel = {
-      name = "zero-gravitas";
-
-      baseConfig = "zero-gravitas_defconfig";
-      # Target verified by checking /boot on reMarkable 1 device
-      target = "zImage";
-      autoModules = false;
-      DTB = true;
-    };
+    name = "zero-gravitas";
+    kernelBaseConfig = "zero-gravitas_defconfig";
+    kernelArch = "arm";
+    # kernelTarget verified by checking /boot on reMarkable 1 device
+    kernelTarget = "zImage";
+    kernelAutoModules = false;
+    kernelDTB = true;
     gcc = {
       fpu = "neon";
       cpu = "cortex-a9";
@@ -217,15 +215,13 @@ rec {
   };
 
   zero-sugar = {
-    linux-kernel = {
-      name = "zero-sugar";
-
-      baseConfig = "zero-sugar_defconfig";
-      DTB = true;
-      autoModules = false;
-      preferBuiltin = true;
-      target = "zImage";
-    };
+    name = "zero-sugar";
+    kernelBaseConfig = "zero-sugar_defconfig";
+    kernelArch = "arm";
+    kernelDTB = true;
+    kernelAutoModules = false;
+    kernelPreferBuiltin = true;
+    kernelTarget = "zImage";
     gcc = {
       cpu = "cortex-a7";
       fpu = "neon-vfpv4";
@@ -233,7 +229,7 @@ rec {
     };
   };
 
-  scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform {
+  scaleway-c1 = armv7l-hf-multiplatform // {
     gcc = {
       cpu = "cortex-a9";
       fpu = "vfpv3";
@@ -241,11 +237,12 @@ rec {
   };
 
   utilite = {
-    linux-kernel = {
-      name = "utilite";
-      maseConfig = "multi_v7_defconfig";
-      autoModules = false;
-      extraConfig = ''
+    name = "utilite";
+    kernelBaseConfig = "multi_v7_defconfig";
+    kernelArch = "arm";
+    kernelAutoModules = false;
+    kernelExtraConfig =
+      ''
         # Ubi for the mtd
         MTD_UBI y
         UBIFS_FS y
@@ -255,37 +252,35 @@ rec {
         UBIFS_FS_ZLIB y
         UBIFS_FS_DEBUG n
       '';
-      makeFlags = [ "LOADADDR=0x10800000" ];
-      target = "uImage";
-      DTB = true;
-    };
+    kernelMakeFlags = [ "LOADADDR=0x10800000" ];
+    kernelTarget = "uImage";
+    kernelDTB = true;
     gcc = {
       cpu = "cortex-a9";
       fpu = "neon";
     };
   };
 
-  guruplug = lib.recursiveUpdate sheevaplug {
+  guruplug = sheevaplug // {
     # Define `CONFIG_MACH_GURUPLUG' (see
     # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>)
     # and other GuruPlug-specific things.  Requires the `guruplug-defconfig'
     # patch.
-    linux-kernel.baseConfig = "guruplug_defconfig";
+
+    kernelBaseConfig = "guruplug_defconfig";
   };
 
-  beaglebone = lib.recursiveUpdate armv7l-hf-multiplatform {
-    linux-kernel = {
-      name = "beaglebone";
-      baseConfig = "bb.org_defconfig";
-      autoModules = false;
-      extraConfig = ""; # TBD kernel config
-      target = "zImage";
-    };
+  beaglebone = armv7l-hf-multiplatform // {
+    name = "beaglebone";
+    kernelBaseConfig = "bb.org_defconfig";
+    kernelAutoModules = false;
+    kernelExtraConfig = ""; # TBD kernel config
+    kernelTarget = "zImage";
   };
 
   # https://developer.android.com/ndk/guides/abis#v7a
-  armv7a-android = {
-    linux-kernel.name = "armeabi-v7a";
+  armv7a-android =  {
+    name = "armeabi-v7a";
     gcc = {
       arch = "armv7-a";
       float-abi = "softfp";
@@ -294,31 +289,29 @@ rec {
   };
 
   armv7l-hf-multiplatform = {
-    linux-kernel = {
-      name = "armv7l-hf-multiplatform";
-      Major = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.
-      baseConfig = "multi_v7_defconfig";
-      DTB = true;
-      autoModules = true;
-      PreferBuiltin = true;
-      target = "zImage";
-      extraConfig = ''
-        # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
-        SERIAL_8250_BCM2835AUX y
-        SERIAL_8250_EXTENDED y
-        SERIAL_8250_SHARE_IRQ y
+    name = "armv7l-hf-multiplatform";
+    kernelBaseConfig = "multi_v7_defconfig";
+    kernelArch = "arm";
+    kernelDTB = true;
+    kernelAutoModules = true;
+    kernelPreferBuiltin = true;
+    kernelTarget = "zImage";
+    kernelExtraConfig = ''
+      # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
+      SERIAL_8250_BCM2835AUX y
+      SERIAL_8250_EXTENDED y
+      SERIAL_8250_SHARE_IRQ y
 
-        # Fix broken sunxi-sid nvmem driver.
-        TI_CPTS y
+      # Fix broken sunxi-sid nvmem driver.
+      TI_CPTS y
 
-        # Hangs ODROID-XU4
-        ARM_BIG_LITTLE_CPUIDLE n
+      # Hangs ODROID-XU4
+      ARM_BIG_LITTLE_CPUIDLE n
 
-        # Disable OABI to have seccomp_filter (required for systemd)
-        # https://github.com/raspberrypi/firmware/issues/651
-        OABI_COMPAT n
-      '';
-    };
+      # Disable OABI to have seccomp_filter (required for systemd)
+      # https://github.com/raspberrypi/firmware/issues/651
+      OABI_COMPAT n
+    '';
     gcc = {
       # Some table about fpu flags:
       # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png
@@ -343,35 +336,34 @@ rec {
   };
 
   aarch64-multiplatform = {
-    linux-kernel = {
-      name = "aarch64-multiplatform";
-      baseConfig = "defconfig";
-      DTB = true;
-      autoModules = true;
-      preferBuiltin = true;
-      extraConfig = ''
-        # Raspberry Pi 3 stuff. Not needed for   s >= 4.10.
-        ARCH_BCM2835 y
-        BCM2835_MBOX y
-        BCM2835_WDT y
-        RASPBERRYPI_FIRMWARE y
-        RASPBERRYPI_POWER y
-        SERIAL_8250_BCM2835AUX y
-        SERIAL_8250_EXTENDED y
-        SERIAL_8250_SHARE_IRQ y
+    name = "aarch64-multiplatform";
+    kernelBaseConfig = "defconfig";
+    kernelArch = "arm64";
+    kernelDTB = true;
+    kernelAutoModules = true;
+    kernelPreferBuiltin = true;
+    kernelExtraConfig = ''
+      # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10.
+      ARCH_BCM2835 y
+      BCM2835_MBOX y
+      BCM2835_WDT y
+      RASPBERRYPI_FIRMWARE y
+      RASPBERRYPI_POWER y
+      SERIAL_8250_BCM2835AUX y
+      SERIAL_8250_EXTENDED y
+      SERIAL_8250_SHARE_IRQ y
 
-        # Cavium ThunderX stuff.
-        PCI_HOST_THUNDER_ECAM y
+      # Cavium ThunderX stuff.
+      PCI_HOST_THUNDER_ECAM y
 
-        # Nvidia Tegra stuff.
-        PCI_TEGRA y
+      # Nvidia Tegra stuff.
+      PCI_TEGRA y
 
-        # The default (=y) forces us to have the XHCI firmware available in initrd,
-        # which our initrd builder can't currently do easily.
-        USB_XHCI_TEGRA m
-      '';
-      target = "Image";
-    };
+      # The default (=y) forces us to have the XHCI firmware available in initrd,
+      # which our initrd builder can't currently do easily.
+      USB_XHCI_TEGRA m
+    '';
+    kernelTarget = "Image";
     gcc = {
       arch = "armv8-a";
     };
@@ -382,9 +374,8 @@ rec {
   ##
 
   ben_nanonote = {
-    linux-kernel = {
-      name = "ben_nanonote";
-    };
+    name = "ben_nanonote";
+    kernelArch = "mips";
     gcc = {
       arch = "mips32";
       float = "soft";
@@ -392,76 +383,75 @@ rec {
   };
 
   fuloong2f_n32 = {
-    linux-kernel = {
-      name = "fuloong2f_n32";
-      baseConfig = "lemote2f_defconfig";
-      autoModules = false;
-      extraConfig = ''
-        MIGRATION n
-        COMPACTION n
+    name = "fuloong2f_n32";
+    kernelBaseConfig = "lemote2f_defconfig";
+    kernelArch = "mips";
+    kernelAutoModules = false;
+    kernelExtraConfig = ''
+      MIGRATION n
+      COMPACTION n
 
-        # nixos mounts some cgroup
-        CGROUPS y
+      # nixos mounts some cgroup
+      CGROUPS y
 
-        BLK_DEV_RAM y
-        BLK_DEV_INITRD y
-        BLK_DEV_CRYPTOLOOP m
-        BLK_DEV_DM m
-        DM_CRYPT m
-        MD y
-        REISERFS_FS m
-        EXT4_FS m
-        USB_STORAGE_CYPRESS_ATACB m
+      BLK_DEV_RAM y
+      BLK_DEV_INITRD y
+      BLK_DEV_CRYPTOLOOP m
+      BLK_DEV_DM m
+      DM_CRYPT m
+      MD y
+      REISERFS_FS m
+      EXT4_FS m
+      USB_STORAGE_CYPRESS_ATACB m
 
-        IP_PNP y
-        IP_PNP_DHCP y
-        IP_PNP_BOOTP y
-        NFS_FS y
-        ROOT_NFS y
-        TUN m
-        NFS_V4 y
-        NFS_V4_1 y
-        NFS_FSCACHE y
-        NFSD m
-        NFSD_V2_ACL y
-        NFSD_V3 y
-        NFSD_V3_ACL y
-        NFSD_V4 y
+      IP_PNP y
+      IP_PNP_DHCP y
+      IP_PNP_BOOTP y
+      NFS_FS y
+      ROOT_NFS y
+      TUN m
+      NFS_V4 y
+      NFS_V4_1 y
+      NFS_FSCACHE y
+      NFSD m
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
 
-        # Fail to build
-        DRM n
-        SCSI_ADVANSYS n
-        USB_ISP1362_HCD n
-        SND_SOC n
-        SND_ALI5451 n
-        FB_SAVAGE n
-        SCSI_NSP32 n
-        ATA_SFF n
-        SUNGEM n
-        IRDA n
-        ATM_HE n
-        SCSI_ACARD n
-        BLK_DEV_CMD640_ENHANCED n
+      # Fail to build
+      DRM n
+      SCSI_ADVANSYS n
+      USB_ISP1362_HCD n
+      SND_SOC n
+      SND_ALI5451 n
+      FB_SAVAGE n
+      SCSI_NSP32 n
+      ATA_SFF n
+      SUNGEM n
+      IRDA n
+      ATM_HE n
+      SCSI_ACARD n
+      BLK_DEV_CMD640_ENHANCED n
 
-        FUSE_FS m
+      FUSE_FS m
 
-        # Needed for udev >= 150
-        SYSFS_DEPRECATED_V2 n
+      # Needed for udev >= 150
+      SYSFS_DEPRECATED_V2 n
 
-        VGA_CONSOLE n
-        VT_HW_CONSOLE_BINDING y
-        SERIAL_8250_CONSOLE y
-        FRAMEBUFFER_CONSOLE y
-        EXT2_FS y
-        EXT3_FS y
-        REISERFS_FS y
-        MAGIC_SYSRQ y
+      VGA_CONSOLE n
+      VT_HW_CONSOLE_BINDING y
+      SERIAL_8250_CONSOLE y
+      FRAMEBUFFER_CONSOLE y
+      EXT2_FS y
+      EXT3_FS y
+      REISERFS_FS y
+      MAGIC_SYSRQ y
 
-        # The kernel doesn't boot at all, with FTRACE
-        FTRACE n
-      '';
-      target = "vmlinux";
-    };
+      # The kernel doesn't boot at all, with FTRACE
+      FTRACE n
+    '';
+    kernelTarget = "vmlinux";
     gcc = {
       arch = "loongson2f";
       float = "hard";
@@ -474,36 +464,34 @@ rec {
   ##
 
   riscv-multiplatform = {
-    linux-kernel = {
-      name = "riscv-multiplatform";
-      target = "vmlinux";
-      autoModules = true;
-      baseConfig = "defconfig";
-      extraConfig = ''
-        FTRACE n
-        SERIAL_OF_PLATFORM y
-      '';
-    };
+    name = "riscv-multiplatform";
+    kernelArch = "riscv";
+    kernelTarget = "vmlinux";
+    kernelAutoModules = true;
+    kernelBaseConfig = "defconfig";
+    kernelExtraConfig = ''
+      FTRACE n
+      SERIAL_OF_PLATFORM y
+    '';
   };
 
   select = platform:
     # x86
-    /**/ if platform.isx86 then pc
+    /**/ if platform.isx86_32 then pc32
+    else if platform.isx86_64 then pc64
 
     # ARM
     else if platform.isAarch32 then let
       version = platform.parsed.cpu.version or null;
-      in     if version == null then pc
+      in     if version == null then pcBase
         else if lib.versionOlder version "6" then sheevaplug
         else if lib.versionOlder version "7" then raspberrypi
         else armv7l-hf-multiplatform
     else if platform.isAarch64 then aarch64-multiplatform
 
-    else if platform.isRiscV then riscv-multiplatform
-
     else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then fuloong2f_n32
 
     else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
 
-    else pc;
+    else pcBase;
 }
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index c706cd30fce..94e42369b60 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -603,22 +603,6 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e
      <literal>/etc/netgroup</literal> defines network-wide groups and may affect to setups using NIS.
     </para>
    </listitem>
-   <listitem>
-    <para>
-     Platforms, like <varname>stdenv.hostPlatform</varname>, no longer have a <varname>platform</varname> attribute.
-     It has been (mostly) flattoned away:
-    </para>
-    <itemizedlist>
-     <listitem><para><varname>platform.gcc</varname> is now <varname>gcc</varname></para></listitem>
-     <listitem><para><literal>platform.kernel*</literal> is now <literal>linux-kernel.*</literal></para></listitem>
-    </itemizedlist>
-    <para>
-     Additionally, <varname>platform.kernelArch</varname> moved to the top level as <varname>linuxArch</varname> to match the other <literal>*Arch</literal> variables.
-    </para>
-    <para>
-     The <varname>platform</varname> grouping of these things never meant anything, and was just a historial/implementation artifact that was overdue removal.
-    </para>
-   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix
index 4aa1d6369d1..e0ab37bca63 100644
--- a/nixos/modules/hardware/device-tree.nix
+++ b/nixos/modules/hardware/device-tree.nix
@@ -68,11 +68,11 @@ let
       patchShebangs scripts/*
       substituteInPlace scripts/Makefile.lib \
         --replace 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget))' 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) -@'
-      make ${pkgs.stdenv.hostPlatform.linux-kernel.baseConfig} ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
-      make dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
+      make ${pkgs.stdenv.hostPlatform.platform.kernelBaseConfig} ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
+      make dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
     '';
     installPhase = ''
-      make dtbs_install INSTALL_DTBS_PATH=$out/dtbs  ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
+      make dtbs_install INSTALL_DTBS_PATH=$out/dtbs  ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
     '';
   };
 
@@ -115,7 +115,7 @@ in
   options = {
       hardware.deviceTree = {
         enable = mkOption {
-          default = pkgs.stdenv.hostPlatform.linux-kernel.DTB or false;
+          default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false;
           type = types.bool;
           description = ''
             Build device tree files. These are used to describe the
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index fa074fdfcc6..95eba86bcb6 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -88,7 +88,7 @@ with lib;
 
     system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
       #!ipxe
-      kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
+      kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
       initrd initrd
       boot
     '';
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 64bdbf159d5..0eeff31d6c4 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -587,10 +587,10 @@ in
 
     nix.systemFeatures = mkDefault (
       [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
-      optionals (pkgs.hostPlatform ? gcc.arch) (
-        # a builder can run code for `gcc.arch` and inferior architectures
-        [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++
-        map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch}
+      optionals (pkgs.hostPlatform.platform ? gcc.arch) (
+        # a builder can run code for `platform.gcc.arch` and inferior architectures
+        [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++
+        map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch}
       )
     );
 
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index b0f77ca3fb8..03d7e749323 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -190,7 +190,7 @@ in
 
     system.boot.loader.kernelFile = mkOption {
       internal = true;
-      default = pkgs.stdenv.hostPlatform.linux-kernel.target;
+      default = pkgs.stdenv.hostPlatform.platform.kernelTarget;
       type = types.str;
       description = ''
         Name of the kernel file to be passed to the bootloader.
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index fee567a510b..2d27611946e 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -59,7 +59,7 @@ in
 
     system.build.installBootLoader = generationsDirBuilder;
     system.boot.loader.id = "generationsDir";
-    system.boot.loader.kernelFile = linux-kernel.target;
+    system.boot.loader.kernelFile = platform.kernelTarget;
 
   };
 }
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index db22dd36cbe..ba936b26573 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -103,6 +103,6 @@ in
 
     system.build.installBootLoader = builder;
     system.boot.loader.id = "raspberrypi";
-    system.boot.loader.kernelFile = linux-kernel.target;
+    system.boot.loader.kernelFile = platform.kernelTarget;
   };
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index 109747945f7..1f5c1581269 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -79,7 +79,7 @@ let
     in
       tarball //
         { meta = {
-            description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.linux-kernel.name}";
+            description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.platform.name}";
             maintainers = map (x: lib.maintainers.${x}) maintainers;
           };
           inherit config;
@@ -105,7 +105,7 @@ let
         modules = makeModules module {};
       };
       build = configEvaled.config.system.build;
-      kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.linux-kernel.target;
+      kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget;
     in
       pkgs.symlinkJoin {
         name = "netboot";
diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix
index 1cb9c0f18bf..dd7e8b062da 100644
--- a/pkgs/applications/audio/virtual-ans/default.nix
+++ b/pkgs/applications/audio/virtual-ans/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   startScript = if stdenv.isx86_32 then "START_LINUX_X86"
     else        if stdenv.isx86_64 then "START_LINUX_X86_64"
     #else        if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin
-    else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}.";
+    else abort "Unsupported platform: ${stdenv.platform.kernelArch}.";
 
   linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86"
     else            if stdenv.isx86_64 then "pixilang_linux_x86_64"
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 848b93a5381..3ad540e5307 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -75,7 +75,7 @@ in
 
     CROSVM_CARGO_TEST_KERNEL_BINARY =
       lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform)
-        "${linux}/${stdenv.hostPlatform.linux-kernel.target}";
+        "${linux}/${stdenv.hostPlatform.platform.kernelTarget}";
 
     passthru = {
       inherit adhdSrc;
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index 8c41a1f4c27..33d707a5007 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''(
     cd src
-    ./mk.sh ${stdenv.buildPlatform.linuxArch}
+    ./mk.sh ${stdenv.buildPlatform.platform.kernelArch}
   )'';
 
   installPhase = ''
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index e0d43739668..bd3ebdf800e 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation {
       else if targetPlatform.isRiscV then "lriscv"
       else throw "unknown emulation for platform: ${targetPlatform.config}";
     in if targetPlatform.useLLVM or false then ""
-       else targetPlatform.bfdEmulation or (fmt + sep + arch);
+       else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
 
   strictDeps = true;
   depsTargetTargetPropagated = extraPackages;
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index faa62cb5b12..d1d5f8e6c86 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -403,31 +403,31 @@ stdenv.mkDerivation {
     # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
     # that case.
     + optionalString ((targetPlatform ? platform.gcc.arch) &&
-                      isGccArchSupported targetPlatform.gcc.arch) ''
-      echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
+                      isGccArchSupported targetPlatform.platform.gcc.arch) ''
+      echo "-march=${targetPlatform.platform.gcc.arch}" >> $out/nix-support/cc-cflags-before
     ''
 
     # -mcpu is not very useful. You should use mtune and march
     # instead. It’s provided here for backwards compatibility.
     + optionalString (targetPlatform ? platform.gcc.cpu) ''
-      echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
+      echo "-mcpu=${targetPlatform.platform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
     ''
 
     # -mfloat-abi only matters on arm32 but we set it here
     # unconditionally just in case. If the abi specifically sets hard
     # vs. soft floats we use it here.
     + optionalString (targetPlatform ? platform.gcc.float-abi) ''
-      echo "-mfloat-abi=${targetPlatform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
+      echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
     ''
     + optionalString (targetPlatform ? platform.gcc.fpu) ''
-      echo "-mfpu=${targetPlatform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
+      echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
     ''
     + optionalString (targetPlatform ? platform.gcc.mode) ''
-      echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before
+      echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before
     ''
     + optionalString (targetPlatform ? platform.gcc.tune &&
-                      isGccArchSupported targetPlatform.gcc.tune) ''
-      echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before
+                      isGccArchSupported targetPlatform.platform.gcc.tune) ''
+      echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before
     ''
 
     # TODO: categorize these and figure out a better place for them
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 9af40d33242..901eb311a88 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -56,13 +56,13 @@ in
 , prepend ? []
 
 # Whether to wrap the initramfs in a u-boot image.
-, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target == "uImage"
+, makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage"
 
 # If generating a u-boot image, the architecture to use. The default
 # guess may not align with u-boot's nomenclature correctly, so it can
 # be overridden.
 # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list.
-, uInitrdArch ? stdenvNoCC.hostPlatform.linuxArch
+, uInitrdArch ? stdenvNoCC.hostPlatform.kernelArch
 
 # The name of the compression, as recognised by u-boot.
 # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list.
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 215782368f6..5f3c7e1d621 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,6 +1,6 @@
 { pkgs
 , kernel ? pkgs.linux
-, img ? pkgs.stdenv.hostPlatform.linux-kernel.target
+, img ? pkgs.stdenv.hostPlatform.platform.kernelTarget
 , storeDir ? builtins.storeDir
 , rootModules ?
     [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index 66af8c4a4cc..f3cdce41193 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,7 +1,7 @@
 { lib, targetPlatform }:
 
 let
-  p =  targetPlatform.gcc or {}
+  p =  targetPlatform.platform.gcc or {}
     // targetPlatform.parsed.abi;
 in lib.concatLists [
   (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 78f7c2ef1b9..0325632ad0a 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
     let
       arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
index 2a270b7c72c..8096af0b320 100644
--- a/pkgs/development/compilers/julia/1.3.nix
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix
index 778a9c3a9d7..be3cfc39635 100644
--- a/pkgs/development/compilers/julia/1.5.nix
+++ b/pkgs/development/compilers/julia/1.5.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 6637a9bb2a3..6b17e463d76 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -158,7 +158,7 @@ stdenv.mkDerivation ({
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
     ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       (lib.flip lib.withFeature "fp"
-         (stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
+         (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
       "--with-__thread"
     ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [
       "--host=arm-linux-gnueabi"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 1a3f1948f84..e6ab23073b1 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -88,7 +88,7 @@ qtModule {
   NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
     # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
     "-Wno-class-memaccess"
-  ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
+  ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
     # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
     # TODO: investigate and fix properly
     "-march=westmere"
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index edf556377b3..e333bd49718 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -73,9 +73,9 @@ let
         if isLinux
         then
           (
-            x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}"
-              || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}"
-              || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}"
+            x: x.platform == "manylinux1_${stdenv.platform.kernelArch}"
+              || x.platform == "manylinux2010_${stdenv.platform.kernelArch}"
+              || x.platform == "manylinux2014_${stdenv.platform.kernelArch}"
               || x.platform == "any"
           )
         else (x: hasInfix "macosx" x.platform || x.platform == "any");
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index ea2f27b0e22..ba8145398f5 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -95,7 +95,7 @@ let
           else if stdenv.isDarwin then "darwin"
           else throw "Unsupported platform"
         );
-        platform_machine = stdenv.hostPlatform.linuxArch;
+        platform_machine = stdenv.platform.kernelArch;
         platform_python_implementation =
           let
             impl = python.passthru.implementation;
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index ccea8ee4553..5308149c26b 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -60,17 +60,18 @@ in
 
     configureFlags = let
       isCross = stdenv.hostPlatform != stdenv.buildPlatform;
-      inherit (stdenv.hostPlatform) gcc isArch32;
+      host = stdenv.hostPlatform.platform;
+      isAarch32 = stdenv.hostPlatform.isAarch32;
     in sharedConfigureFlags ++ [
       "--without-dtrace"
     ] ++ (optionals isCross [
       "--cross-compiling"
       "--without-intl"
       "--without-snapshot"
-    ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [
-      "--with-arm-fpu=${gcc.fpu}"
-    ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [
-      "--with-arm-float-abi=${gcc.float-abi}"
+    ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
+      "--with-arm-fpu=${host.gcc.fpu}"
+    ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
+      "--with-arm-float-abi=${host.gcc.float-abi}"
     ]) ++ (optionals (isCross && isAarch32) [
       "--dest-cpu=arm"
     ]) ++ extraConfigFlags;
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index 958bcdb9f16..88792346d70 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
   ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index d6ed7bccba3..cadf65a7220 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -7,7 +7,7 @@ let
     pname = "linux-headers";
     inherit version;
 
-    ARCH = stdenvNoCC.hostPlatform.linuxArch;
+    ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch;
 
     # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
     # We do this so we have a build->build, not build->host, C compiler.
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index ac9d6fbb2b5..31a90dc740f 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -42,7 +42,7 @@
   # symbolic name and `patch' is the actual patch.  The patch may
   # optionally be compressed with gzip or bzip2.
   kernelPatches ? []
-, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc" ||
+, ignoreConfigErrors ? stdenv.hostPlatform.platform.name != "pc" ||
                        stdenv.hostPlatform != stdenv.buildPlatform
 , extraMeta ? {}
 
@@ -51,10 +51,10 @@
 , isLibre    ? false
 , isHardened ? false
 
-# easy overrides to stdenv.hostPlatform.linux-kernel members
-, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules
-, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false
-, kernelArch ? stdenv.hostPlatform.linuxArch
+# easy overrides to stdenv.hostPlatform.platform members
+, autoModules ? stdenv.hostPlatform.platform.kernelAutoModules
+, preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false
+, kernelArch ? stdenv.hostPlatform.platform.kernelArch
 
 , ...
 }:
@@ -87,7 +87,7 @@ let
   intermediateNixConfig = configfile.moduleStructuredConfig.intermediateNixConfig
     # extra config in legacy string format
     + extraConfig
-    + stdenv.hostPlatform.linux-kernel.extraConfig or "";
+    + lib.optionalString (stdenv.hostPlatform.platform ? kernelExtraConfig) stdenv.hostPlatform.platform.kernelExtraConfig;
 
   structuredConfigFromPatches =
         map ({extraStructuredConfig ? {}, ...}: {settings=extraStructuredConfig;}) kernelPatches;
@@ -113,11 +113,11 @@ let
     nativeBuildInputs = [ perl gmp libmpc mpfr ]
       ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ];
 
-    platformName = stdenv.hostPlatform.linux-kernel.name;
+    platformName = stdenv.hostPlatform.platform.name;
     # e.g. "defconfig"
-    kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
+    kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.platform.kernelBaseConfig;
     # e.g. "bzImage"
-    kernelTarget = stdenv.hostPlatform.linux-kernel.target;
+    kernelTarget = stdenv.hostPlatform.platform.kernelTarget;
 
     prePatch = kernel.prePatch + ''
       # Patch kconfig to print "###" after every question so that
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 2fc63322f5b..67016b71918 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -64,10 +64,10 @@ let
 
   commonMakeFlags = [
     "O=$(buildRoot)"
-  ] ++ lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags)
-    stdenv.hostPlatform.linux-kernel.makeFlags;
+  ] ++ lib.optionals (stdenv.hostPlatform.platform ? kernelMakeFlags)
+    stdenv.hostPlatform.platform.kernelMakeFlags;
 
-  drvAttrs = config_: kernelConf: kernelPatches: configfile:
+  drvAttrs = config_: platform: kernelPatches: configfile:
     let
       config = let attrName = attr: "CONFIG_" + attr; in {
         isSet = attr: hasAttr (attrName attr) config;
@@ -171,7 +171,7 @@ let
 
       buildFlags = [
         "KBUILD_BUILD_VERSION=1-NixOS"
-        kernelConf.target
+        platform.kernelTarget
         "vmlinux"  # for "perf" and things like that
       ] ++ optional isModular "modules";
 
@@ -186,16 +186,16 @@ let
       '';
 
       # Some image types need special install targets (e.g. uImage is installed with make uinstall)
-      installTargets = [
-        (kernelConf.installTarget or (
-          /**/ if kernelConf.target == "uImage" then "uinstall"
-          else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall"
-          else "install"))
-      ];
+      installTargets = [ (
+        if platform ? kernelInstallTarget then platform.kernelInstallTarget
+        else if platform.kernelTarget == "uImage" then "uinstall"
+        else if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall"
+        else "install"
+      ) ];
 
       postInstall = (optionalString installsFirmware ''
         mkdir -p $out/lib/firmware
-      '') + (if (kernelConf.DTB or false) then ''
+      '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
         make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
       '' else "") + (if isModular then ''
         mkdir -p $dev
@@ -300,7 +300,7 @@ in
 assert (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") -> libelf != null;
 assert lib.versionAtLeast version "5.8" -> elfutils != null;
 
-stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // {
+stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
   pname = "linux";
   inherit version;
 
@@ -308,7 +308,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ]
-      ++ optional  (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools
+      ++ optional  (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
       ++ optional  (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf
       # Removed util-linuxMinimal since it should not be a dependency.
       ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
@@ -322,10 +322,10 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat
   makeFlags = commonMakeFlags ++ [
     "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
     "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
-    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
   ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
-  karch = stdenv.hostPlatform.linuxArch;
+  karch = stdenv.hostPlatform.platform.kernelArch;
 })
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index dc96f3b6a62..65ab71bd562 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" "stackprotector" ];
 
   makeFlags = commonMakeFlags ++ [
-    "KLIBCARCH=${stdenv.hostPlatform.linuxArch}"
+    "KLIBCARCH=${stdenv.hostPlatform.platform.kernelArch}"
     "KLIBCKERNELSRC=${linuxHeaders}"
   ] # TODO(@Ericson2314): We now can get the ABI from
     # `stdenv.hostPlatform.parsed.abi`, is this still a good idea?
-    ++ lib.optional (stdenv.hostPlatform.linuxArch == "arm") "CONFIG_AEABI=y"
+    ++ lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y"
     ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
 
   # Install static binaries as well.
diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index a862b351716..056fd40d252 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ nukeReferences ];
 
   makeFlags = [
-    "ARCH=${stdenv.hostPlatform.linuxArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
+    "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us.
   ];
 
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 68a88fb6778..aeed87d3c19 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "ARCH=${stdenv.hostPlatform.linuxArch}"
+    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))
     ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 7508e1faf15..7c95a98372d 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation {
     cat << EOF | parseconfig
     ${nixConfig}
     ${extraConfig}
-    ${stdenv.hostPlatform.uclibc.extraConfig or ""}
+    ${stdenv.hostPlatform.platform.uclibc.extraConfig or ""}
     EOF
     ( set +o pipefail; yes "" | make oldconfig )
   '';
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e8ccd02c041..0eb799e4525 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -279,7 +279,7 @@ in rec {
         } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
           NIX_HARDENING_ENABLE = enabledHardeningOptions;
         } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? platform.gcc.arch) {
-          requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ];
+          requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch}" ];
         } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
           inherit __darwinAllowLocalNetworking;
           # TODO: remove lib.unique once nix has a list canonicalization primitive
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed9f3047969..bd86fed4cb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19291,7 +19291,7 @@ in
     buildPhase = ''
       set -x
       make \
-        ARCH=${stdenv.hostPlatform.linuxArch} \
+        ARCH=${stdenv.hostPlatform.kernelArch} \
         HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \
         ${makeTarget}
     '';

From 8c1ce4ec70905e26c4961715d401994d4d71d2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 22 Jan 2021 19:33:58 +0100
Subject: [PATCH 642/956] pythonPackages.transitions: 0.8.5 -> 0.8.6

---
 .../python-modules/transitions/default.nix    | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix
index 82958029923..2dda33fd968 100644
--- a/pkgs/development/python-modules/transitions/default.nix
+++ b/pkgs/development/python-modules/transitions/default.nix
@@ -1,26 +1,21 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
-, six, nose, mock, dill, pycodestyle }:
+{ lib, buildPythonPackage, fetchFromGitHub
+, six, pytestCheckHook, mock, dill, pycodestyle }:
 
 buildPythonPackage rec {
   pname = "transitions";
-  version = "0.8.5";
+  version = "0.8.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e441c66a0c753d56c01c3e5e547f21dbe4a5569c939f12477475c5e81d79769b";
+  # test_codestyle.py fails in PyPI sdist
+  src = fetchFromGitHub {
+    owner = "pytransitions";
+    repo = "transitions";
+    rev = version;
+    sha256 = "1d913hzzyqhdhhbkbvjw65dqkajrw50a4sxhyxk0jlg8pcs7bs7v";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "dill<0.2.7" dill
-  '';
-
   propagatedBuildInputs = [ six ];
 
-  checkInputs = [ nose mock dill pycodestyle ];
-
-  checkPhase = ''
-    nosetests
-  '';
+  checkInputs = [ pytestCheckHook mock dill pycodestyle ];
 
   meta = with lib; {
     homepage = "https://github.com/pytransitions/transitions";

From c173f673edff5f3825f23e75ad75b7a2d1742ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 22 Jan 2021 19:56:12 +0100
Subject: [PATCH 643/956] pythonPackages.hbmqtt: disable on Python 3.9

See https://github.com/beerfactory/hbmqtt/issues/223.
---
 pkgs/development/python-modules/hbmqtt/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix
index 053e955ad80..003805f939c 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/pkgs/development/python-modules/hbmqtt/default.nix
@@ -1,11 +1,12 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools
 , transitions, websockets, passlib, docopt, pyyaml, nose }:
 
 buildPythonPackage rec {
   pname = "hbmqtt";
   version = "0.9.6";
 
-  disabled = !isPy3k;
+  # https://github.com/beerfactory/hbmqtt/issues/223
+  disabled = !isPy3k || pythonAtLeast "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 72e688c97315553ae9ef76385f403aeaebb97dff Mon Sep 17 00:00:00 2001
From: "Bryan A. S" <bryanasdev000@gmail.com>
Date: Fri, 22 Jan 2021 19:36:45 -0300
Subject: [PATCH 644/956] virtualbox: 6.1.16 -> 6.1.18

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
---
 pkgs/applications/virtualization/virtualbox/default.nix       | 4 ++--
 pkgs/applications/virtualization/virtualbox/extpack.nix       | 2 +-
 .../virtualization/virtualbox/guest-additions/default.nix     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index be9598293cc..360e6e36c1a 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -23,7 +23,7 @@ let
   buildType = "release";
   # Use maintainers/scripts/update.nix to update the version and all related hashes or
   # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  version = "6.1.16";
+  version = "6.1.18";
 
   iasl' = iasl.overrideAttrs (old: rec {
     inherit (old) pname;
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1";
+    sha256 = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40";
   };
 
   outputs = [ "out" "modsrc" ];
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 302f2b5945a..4aa3ed1fd49 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -12,7 +12,7 @@ fetchurl rec {
     # Manually sha256sum the extensionPack file, must be hex!
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
-    let value = "9802482b77b95a954cb5111793da10d009009a4e9a9c4eaa4bd1ae5dafe9db46";
+    let value = "d609e35accff5c0819ca9be47de302abf094dc1b6d4c54da8fdda639671f267e";
     in assert (builtins.stringLength value) == 64; value;
 
   meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 8e5adc83577..c35ebdb81d0 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "88db771a5efd7c048228e5c1e0b8fba56542e9d8c1b75f7af5b0c4cf334f0584";
+    sha256 = "904432eb331d7ae517afaa4e4304e6492b7947b46ecb8267de7ef792c4921b4c";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

From f0b1cdb1890df574d1d305e998eb7ae61b279d01 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Mon, 18 Jan 2021 01:58:34 -0800
Subject: [PATCH 645/956] libvirt: don't use iptables-nftables

Per a comment on the PR that made this change, it turns out to cause
issues in some cases: https://github.com/NixOS/nixpkgs/pull/109332#issuecomment-762005163

For now, let's revert back. Presumably the issues derive from the system
iptables not matching libvirt's iptables.

In the future, #81172 should move us back into the future, and I'm
perfectly fine waiting for that PR to handle this separately.
---
 .../development/libraries/libvirt/default.nix | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 60113d492a7..b162ab50810 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -2,7 +2,7 @@
 , makeWrapper, autoreconfHook, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
 , iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext
-, libtasn1, iptables-nftables-compat, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
+, libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
 , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin
 , meson, ninja, audit, cmake, bash-completion, pkg-config
@@ -16,6 +16,19 @@ with lib;
 # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
 let
   buildFromTarball = stdenv.isDarwin;
+  # libvirt hardcodes the binary name 'ebtables', but in nixpkgs the ebtables
+  # binary we want to use is named 'ebtables-legacy'.
+  # Create a derivation to alias the binary name so that libvirt can find the right one, and use that below.
+  ebtables-compat = stdenv.mkDerivation {
+    pname = "ebtables-compat";
+    version = ebtables.version;
+    src = null;
+    buildInputs = [ ebtables ];
+    buildCommand = ''
+      mkdir -p $out/bin
+      ln -sf ${ebtables}/bin/ebtables-legacy $out/bin/ebtables
+    '';
+  };
 in stdenv.mkDerivation rec {
   pname = "libvirt";
   version = "6.8.0";
@@ -72,7 +85,7 @@ in stdenv.mkDerivation rec {
       sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|"
     '';
   in ''
-    PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables-nftables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
+    PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
     substituteInPlace src/lxc/lxc_conf.c \
@@ -115,15 +128,15 @@ in stdenv.mkDerivation rec {
   ];
 
   postInstall = let
-    # iptables-nftables-compat for an 'ebtables' binary
-    binPath = [ iptables-nftables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
+    # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332)
+    binPath = [ iptables ebtables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
   in ''
     substituteInPlace $out/libexec/libvirt-guests.sh \
-      --replace 'ON_BOOT=start'       'ON_BOOT=''${ON_BOOT:-start}' \
-      --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
-      --replace "$out/bin"            '${gettext}/bin' \
-      --replace 'lock/subsys'         'lock' \
-      --replace 'gettext.sh'          'gettext.sh
+      --replace 'ON_BOOT="start"'       'ON_BOOT=''${ON_BOOT:-start}' \
+      --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
+      --replace "$out/bin"              '${gettext}/bin' \
+      --replace 'lock/subsys'           'lock' \
+      --replace 'gettext.sh'            'gettext.sh
   # Added in nixpkgs:
   gettext() { "${gettext}/bin/gettext" "$@"; }
   '

From 858eebe1f9bdb6c58bbd1b95055d03e97355d49c Mon Sep 17 00:00:00 2001
From: Peter Woodman <peter@shortbus.org>
Date: Thu, 21 Jan 2021 04:05:50 -0500
Subject: [PATCH 646/956] cpython: fix extensions when using a musl toolchain

---
 pkgs/development/interpreters/python/cpython/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 2e4e2f1f6db..347245f8a01 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -125,9 +125,15 @@ let
         if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb"
       else if isx86_32 then "i386"
       else parsed.cpu.name;
+    pythonAbiName =
+      # python's build doesn't differentiate between musl and glibc in its
+      # abi detection, our wrapper should match.
+      if stdenv.hostPlatform.isMusl then
+        replaceStrings [ "musl" ] [ "gnu" ] parsed.abi.name
+        else parsed.abi.name;
     multiarch =
       if isDarwin then "darwin"
-      else "${multiarchCpu}-${parsed.kernel.name}-${parsed.abi.name}";
+      else "${multiarchCpu}-${parsed.kernel.name}-${pythonAbiName}";
 
     abiFlags = optionalString (isPy36 || isPy37) "m";
 

From b20b9f98b83b342576a72664a4bf35aa5b6366d3 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Fri, 22 Jan 2021 12:16:11 +0100
Subject: [PATCH 647/956] luarocks-update-packages: pass "lib" in arguments

---
 maintainers/scripts/update-luarocks-packages        | 2 +-
 pkgs/development/lua-modules/generated-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages
index 5c42080745e..da4d224bd33 100755
--- a/maintainers/scripts/update-luarocks-packages
+++ b/maintainers/scripts/update-luarocks-packages
@@ -66,7 +66,7 @@ nixpkgs$ ${0} ${GENERATED_NIXFILE}
 
 These packages are manually refined in lua-overrides.nix
 */
-{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args:
+{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args:
 self: super:
 with self;
 {
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index fddb028b80a..8ec44d17016 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul
 
 These packages are manually refined in lua-overrides.nix
 */
-{ self, lib, stdenv, fetchurl, fetchgit, pkgs, ... } @ args:
+{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args:
 self: super:
 with self;
 {

From b91284626711400eb6f7d8a6600604b9879d8b38 Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Sat, 16 Jan 2021 23:15:52 +0100
Subject: [PATCH 648/956] nixos/tests/usbguard: init

---
 nixos/tests/all-tests.nix                   |  1 +
 nixos/tests/usbguard.nix                    | 62 +++++++++++++++++++++
 pkgs/os-specific/linux/usbguard/default.nix |  3 +
 3 files changed, 66 insertions(+)
 create mode 100644 nixos/tests/usbguard.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 902c3bbc65e..966c7844657 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -402,6 +402,7 @@ in
   unbound = handleTest ./unbound.nix {};
   unit-php = handleTest ./web-servers/unit-php.nix {};
   upnp = handleTest ./upnp.nix {};
+  usbguard = handleTest ./usbguard.nix {};
   uwsgi = handleTest ./uwsgi.nix {};
   v2ray = handleTest ./v2ray.nix {};
   vault = handleTest ./vault.nix {};
diff --git a/nixos/tests/usbguard.nix b/nixos/tests/usbguard.nix
new file mode 100644
index 00000000000..a5d78f316fb
--- /dev/null
+++ b/nixos/tests/usbguard.nix
@@ -0,0 +1,62 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+  name = "usbguard";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ tnias ];
+  };
+
+  machine =
+    { ... }:
+    {
+      services.usbguard = {
+        enable = true;
+        IPCAllowedUsers = [ "alice" "root" ];
+
+        # As virtual USB devices get attached to the "QEMU USB Hub" we need to
+        # allow Hubs. Otherwise we would have to explicitly allow them too.
+        rules = ''
+          allow with-interface equals { 09:00:00 }
+        '';
+      };
+      imports = [ ./common/user-account.nix ];
+    };
+
+  testScript = ''
+    # create a blank disk image for our fake USB stick
+    with open(machine.state_dir + "/usbstick.img", "wb") as stick:
+        stick.write(b"\x00" * (1024 * 1024))
+
+    # wait for machine to have started and the usbguard service to be up
+    machine.wait_for_unit("usbguard.service")
+
+    with subtest("IPC access control"):
+        # User "alice" is allowed to access the IPC interface
+        machine.succeed("su alice -c 'usbguard list-devices'")
+
+        # User "bob" is not allowed to access the IPC interface
+        machine.fail("su bob -c 'usbguard list-devices'")
+
+    with subtest("check basic functionality"):
+        # at this point we expect that no USB HDD is connected
+        machine.fail("usbguard list-devices | grep -E 'QEMU USB HARDDRIVE'")
+
+        # insert usb device
+        machine.send_monitor_command(
+            f"drive_add 0 id=stick,if=none,file={stick.name},format=raw"
+        )
+        machine.send_monitor_command("device_add usb-storage,id=stick,drive=stick")
+
+        # the attached USB HDD should show up after a short while
+        machine.wait_until_succeeds("usbguard list-devices | grep -E 'QEMU USB HARDDRIVE'")
+
+        # at this point there should be a **blocked** USB HDD
+        machine.succeed("usbguard list-devices | grep -E 'block.*QEMU USB HARDDRIVE'")
+        machine.fail("usbguard list-devices | grep -E ' allow .*QEMU USB HARDDRIVE'")
+
+        # allow storage devices
+        machine.succeed("usbguard allow-device 'with-interface { 08:*:* }'")
+
+        # at this point there should be an **allowed** USB HDD
+        machine.succeed("usbguard list-devices | grep -E ' allow .*QEMU USB HARDDRIVE'")
+        machine.fail("usbguard list-devices | grep -E ' block .*QEMU USB HARDDRIVE'")
+  '';
+})
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
index 55832dc7ade..7d4563baee4 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , autoreconfHook
 , installShellFiles
+, nixosTests
 , asciidoc
 , pkg-config
 , libxslt
@@ -73,6 +74,8 @@ stdenv.mkDerivation rec {
     installShellCompletion --zsh --name _usbguard scripts/usbguard-zsh-completion
   '';
 
+  passthru.tests = nixosTests.usbguard;
+
   meta = with lib; {
     description = "The USBGuard software framework helps to protect your computer against BadUSB";
     longDescription = ''

From 79ff3de8a54213b61f42507dbf736b90f309d324 Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Fri, 22 Jan 2021 14:02:29 +0800
Subject: [PATCH 649/956] perlPackages.IOAsync: 0.77 -> 0.78

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8a5b9bd6ae5..aded5f1c95e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10149,10 +10149,10 @@ let
 
   IOAsync = buildPerlModule {
     pname = "IO-Async";
-    version = "0.77";
+    version = "0.78";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz";
-      sha256 = "153rfnbs2xwvx559h0ilfr0g9pg30avjad3cad659is9bdmfipri";
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.78.tar.gz";
+      sha256 = "sha256-P7UYhZd7hiGKiepC84yvvOWCO/SPqqLRhaGGwqNYNmw=";
     };
     preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox
     propagatedBuildInputs = [ Future StructDumb ];

From fd72f6a8acd346bd017c8b6992771416e60d1d29 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 23 Jan 2021 01:51:28 +0100
Subject: [PATCH 650/956] vscode-extensions.rubymaniac.vscode-paste-and-indent:
 init at 0.0.8

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 64dce8223c9..8b3bf554404 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -473,6 +473,18 @@ let
         };
       };
 
+      rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-paste-and-indent";
+          publisher = "Rubymaniac";
+          version = "0.0.8";
+          sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl";
+        };
+        meta = with lib; {
+          license = licenses.mit;
+        };
+      };
+
       matklad.rust-analyzer = callPackage ./rust-analyzer {};
 
       ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {

From 8ff285d579677db505707318cb4525b4db3b4e75 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 23 Jan 2021 02:13:14 +0100
Subject: [PATCH 651/956] vscode-extensions.gruntfuggly.todo-tree: init at
 0.0.196

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 8b3bf554404..9dfbfe2e531 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -292,6 +292,18 @@ let
         };
       };
 
+      gruntfuggly.todo-tree = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "todo-tree";
+          publisher = "Gruntfuggly";
+          version = "0.0.196";
+          sha256 = "1l4f290018f2p76q6hn2b2injps6wz65as7dm537wrsvsivyg2qz";
+        };
+        meta = with lib; {
+          license = licenses.mit;
+        };
+      };
+
       haskell.haskell = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "haskell";

From 6773cbc50c0b27f0cac779bd504b455ea74c129a Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 23 Jan 2021 02:16:17 +0100
Subject: [PATCH 652/956] vscode-extensions.davidanson.vscode-markdownlint:
 init at 0.38.0

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 9dfbfe2e531..afb0de64792 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -128,6 +128,18 @@ let
         };
       };
 
+      davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-markdownlint";
+          publisher = "DavidAnson";
+          version = "0.38.0";
+          sha256 = "0d6hbsjrx1j8wrmfnvdwsa7sci1brplgxwkmy6sp74va7zxfjnqv";
+        };
+        meta = with lib; {
+          license = licenses.mit;
+        };
+      };
+
       dhall.dhall-lang = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "dhall-lang";

From a24832ae8cbe58e8f7a6520f6601fcf955e378fa Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 23 Jan 2021 02:18:16 +0100
Subject: [PATCH 653/956] vscode-extensions.jock.svg: init at 1.4.4

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index afb0de64792..8b4fa9e5567 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -369,6 +369,18 @@ let
         };
       };
 
+      jock.svg = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "svg";
+          publisher = "jock";
+          version = "1.4.4";
+          sha256 = "0kn2ic7pgbd4rbvzpsxfwyiwxa1iy92l0h3jsppxc8gk8xbqm2nc";
+        };
+        meta = with lib; {
+          license = licenses.mit;
+        };
+      };
+
       jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vscode-styled-components";

From d314c0141b416ca4f40844ea373148043e441bd3 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 23 Jan 2021 02:22:57 +0100
Subject: [PATCH 654/956] 
 vscode-extensions.streetsidesoftware.code-spell-checker: init at 1.10.2

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 8b4fa9e5567..613ce77106b 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -612,6 +612,18 @@ let
         };
       };
 
+      streetsidesoftware.code-spell-checker = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "code-spell-checker";
+          publisher = "streetsidesoftware";
+          version = "1.10.2";
+          sha256 = "1ll046rf5dyc7294nbxqk5ya56g2bzqnmxyciqpz2w5x7j75rjib";
+        };
+        meta = with lib; {
+          license = licenses.mit;
+        };
+      };
+
       tamasfe.even-better-toml = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "even-better-toml";

From 6cead806db912fa8b817510a63648ed47d693e85 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 23 Jan 2021 02:24:57 +0100
Subject: [PATCH 655/956] vscode-extensions.spywhere.guides: init at 0.9.3

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 613ce77106b..64958c799a1 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -612,6 +612,18 @@ let
         };
       };
 
+      spywhere.guides = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "guides";
+          publisher = "spywhere";
+          version = "0.9.3";
+          sha256 = "1kvsj085w1xax6fg0kvsj1cizqh86i0pkzpwi0sbfvmcq21i6ghn";
+        };
+        meta = with lib; {
+          license = licenses.mit;
+        };
+      };
+
       streetsidesoftware.code-spell-checker = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "code-spell-checker";

From 0a900a5c7539dd84eb2d83bfd669aa024e1f483b Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 23 Jan 2021 02:29:06 +0100
Subject: [PATCH 656/956] vscode-extensions.hookyqr.beautify: init at 1.5.0

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 64958c799a1..f561755fc4b 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -328,6 +328,18 @@ let
         };
       };
 
+      hookyqr.beautify = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "beautify";
+          publisher = "HookyQR";
+          version = "1.5.0";
+          sha256 = "1c0kfavdwgwham92xrh0gnyxkrl9qlkpv39l1yhrldn8vd10fj5i";
+        };
+        meta = with lib; {
+          license = licenses.mit;
+        };
+      };
+
       ibm.output-colorizer = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "output-colorizer";

From f8013960c6a3823685a175b7e8288b48e1921b6c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 23 Jan 2021 09:45:55 +1000
Subject: [PATCH 657/956] minikube: 1.16.0 -> 1.17.0

https://github.com/kubernetes/minikube/releases/tag/v1.17.0
---
 pkgs/applications/networking/cluster/minikube/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 9acb5f319ca..570cb57a357 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
 
 buildGoModule rec {
   pname = "minikube";
-  version = "1.16.0";
+  version = "1.17.0";
 
-  vendorSha256 = "0nc2f9h77h24f0nvai5wvgmf1gh09dqfwrb6d5qghmq03a459san";
+  vendorSha256 = "sha256-cA0sgH00XawwaOAGCDbabmBE/+5Y87kThXgPe5zwlro=";
 
   doCheck = false;
 
@@ -21,7 +21,7 @@ buildGoModule rec {
     owner = "kubernetes";
     repo = "minikube";
     rev = "v${version}";
-    sha256 = "00dn8yy7mna0j8rdcnxbgnd5vkjdkqij8akgqhvbd32kxpqss890";
+    sha256 = "sha256-IQ/AAr5b8ZOaQKkSrU8JsPxjqAwVmT4Kt3hf3e1dMeA=";
   };
 
   nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];

From acc5f7b18a60bc9b1024e5e1882bf7362e6492e6 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 22 Jan 2021 18:25:31 +0700
Subject: [PATCH 658/956] pkgs/development/compilers: stdenv.lib -> lib

---
 pkgs/development/compilers/4th/default.nix    |  4 +-
 pkgs/development/compilers/abcl/default.nix   |  8 +-
 pkgs/development/compilers/acme/default.nix   |  4 +-
 .../adoptopenjdk-bin/jdk-darwin-base.nix      |  6 +-
 .../adoptopenjdk-bin/jdk-linux-base.nix       |  2 +-
 .../adoptopenjdk-icedtea-web/default.nix      |  4 +-
 pkgs/development/compilers/aldor/default.nix  |  6 +-
 .../development/compilers/aliceml/default.nix |  6 +-
 .../compilers/apache-flex-sdk/default.nix     |  4 +-
 .../compilers/arachne-pnr/default.nix         |  8 +-
 pkgs/development/compilers/asn1c/default.nix  |  4 +-
 .../development/compilers/aspectj/default.nix |  6 +-
 pkgs/development/compilers/ats/default.nix    |  8 +-
 pkgs/development/compilers/ats2/default.nix   | 10 +--
 pkgs/development/compilers/avian/default.nix  | 10 +--
 pkgs/development/compilers/avra/default.nix   |  4 +-
 pkgs/development/compilers/bigloo/default.nix | 12 +--
 .../compilers/binaryen/default.nix            |  4 +-
 .../compilers/bluespec/default.nix            |  6 +-
 .../bs-platform/build-bs-platform.nix         |  4 +-
 .../compilers/bs-platform/default.nix         |  6 +-
 .../compilers/bs-platform/ocaml.nix           |  4 +-
 pkgs/development/compilers/bupc/default.nix   |  4 +-
 .../compilers/cakelisp/default.nix            |  6 +-
 pkgs/development/compilers/carp/default.nix   |  8 +-
 pkgs/development/compilers/cc65/default.nix   |  4 +-
 pkgs/development/compilers/ccl/default.nix    |  4 +-
 pkgs/development/compilers/chez/default.nix   | 12 +--
 .../compilers/chicken/4/chicken.nix           |  9 +--
 .../compilers/chicken/4/egg2nix.nix           |  6 +-
 .../compilers/chicken/4/eggDerivation.nix     |  8 +-
 .../compilers/chicken/5/chicken.nix           |  9 +--
 .../compilers/chicken/5/egg2nix.nix           |  8 +-
 .../compilers/chicken/5/eggDerivation.nix     |  8 +-
 pkgs/development/compilers/ciao/default.nix   |  4 +-
 pkgs/development/compilers/clasp/default.nix  | 12 +--
 pkgs/development/compilers/clean/default.nix  |  6 +-
 .../development/compilers/closure/default.nix |  4 +-
 .../development/compilers/cmdstan/default.nix |  6 +-
 pkgs/development/compilers/cmucl/binary.nix   |  8 +-
 pkgs/development/compilers/colm/default.nix   |  4 +-
 .../compilers/compcert/default.nix            |  6 +-
 .../compilers/computecpp/default.nix          |  4 +-
 pkgs/development/compilers/copper/default.nix |  4 +-
 .../development/compilers/coreclr/default.nix |  4 +-
 .../development/compilers/crystal/default.nix |  2 +-
 .../compilers/cudatoolkit/common.nix          |  4 +-
 pkgs/development/compilers/dale/default.nix   |  4 +-
 pkgs/development/compilers/dasm/default.nix   |  4 +-
 pkgs/development/compilers/dev86/default.nix  |  4 +-
 pkgs/development/compilers/dmd/default.nix    | 10 +--
 .../compilers/dotnet/build-dotnet.nix         |  8 +-
 pkgs/development/compilers/ecl/16.1.2.nix     | 12 +--
 pkgs/development/compilers/ecl/default.nix    | 12 +--
 pkgs/development/compilers/eli/default.nix    |  8 +-
 pkgs/development/compilers/elm/default.nix    | 14 ++--
 .../compilers/elm/packages/elm-format.nix     |  4 +-
 .../compilers/elm/packages/elm-instrument.nix |  4 +-
 .../compilers/elm/packages/elm.nix            |  4 +-
 .../compilers/elm/packages/elmi-to-json.nix   |  4 +-
 .../compilers/elm/packages/indents.nix        |  4 +-
 .../compilers/emscripten/default.nix          |  4 +-
 pkgs/development/compilers/eql/default.nix    |  4 +-
 .../compilers/factor-lang/default.nix         |  8 +-
 pkgs/development/compilers/fasmg/default.nix  |  4 +-
 pkgs/development/compilers/flasm/default.nix  |  4 +-
 .../development/compilers/flutter/flutter.nix |  4 +-
 pkgs/development/compilers/fpc/default.nix    |  4 +-
 pkgs/development/compilers/fpc/lazarus.nix    |  2 +-
 pkgs/development/compilers/fsharp/default.nix |  8 +-
 .../compilers/fsharp41/default.nix            |  8 +-
 pkgs/development/compilers/fstar/default.nix  |  4 +-
 .../development/compilers/gavrasm/default.nix |  6 +-
 .../compilers/gcc-arm-embedded/10/default.nix |  6 +-
 .../compilers/gcc-arm-embedded/6/default.nix  |  6 +-
 .../compilers/gcc-arm-embedded/7/default.nix  |  6 +-
 .../compilers/gcc-arm-embedded/8/default.nix  |  6 +-
 .../compilers/gcc-arm-embedded/9/default.nix  |  6 +-
 pkgs/development/compilers/gcc/10/default.nix | 31 ++++----
 .../development/compilers/gcc/4.8/default.nix | 21 +++---
 .../development/compilers/gcc/4.9/default.nix | 21 +++---
 pkgs/development/compilers/gcc/6/default.nix  | 27 +++----
 pkgs/development/compilers/gcc/7/default.nix  | 33 +++++----
 pkgs/development/compilers/gcc/8/default.nix  | 31 ++++----
 pkgs/development/compilers/gcc/9/default.nix  | 31 ++++----
 .../compilers/gcc/common/configure-flags.nix  |  8 +-
 .../gcc/common/extra-target-flags.nix         |  2 +-
 pkgs/development/compilers/gcl/2.6.13-pre.nix |  6 +-
 pkgs/development/compilers/gcl/default.nix    |  4 +-
 pkgs/development/compilers/gforth/default.nix |  8 +-
 pkgs/development/compilers/ghc/8.10.1.nix     | 66 ++++++++---------
 .../compilers/ghc/8.10.2-binary.nix           | 46 ++++++------
 pkgs/development/compilers/ghc/8.10.2.nix     | 66 ++++++++---------
 pkgs/development/compilers/ghc/8.10.3.nix     | 66 ++++++++---------
 .../compilers/ghc/8.2.2-binary.nix            | 36 ++++-----
 .../compilers/ghc/8.6.5-binary.nix            | 38 +++++-----
 pkgs/development/compilers/ghc/8.6.5.nix      | 64 ++++++++--------
 pkgs/development/compilers/ghc/8.8.2.nix      | 64 ++++++++--------
 pkgs/development/compilers/ghc/8.8.3.nix      | 66 ++++++++---------
 pkgs/development/compilers/ghc/8.8.4.nix      | 68 ++++++++---------
 pkgs/development/compilers/ghc/9.0.1.nix      | 66 ++++++++---------
 pkgs/development/compilers/ghc/head.nix       | 74 +++++++++----------
 .../compilers/ghcjs-ng/8.6/stage0.nix         | 14 ++--
 .../compilers/ghcjs-ng/ghcjs-base.nix         |  2 +-
 pkgs/development/compilers/gleam/default.nix  |  6 +-
 .../development/compilers/glslang/default.nix |  4 +-
 .../compilers/gnatboot/default.nix            |  4 +-
 .../compilers/gnu-cobol/default.nix           | 11 ++-
 .../compilers/gnu-smalltalk/default.nix       | 12 +--
 pkgs/development/compilers/go/1.14.nix        |  8 +-
 pkgs/development/compilers/go/1.15.nix        |  8 +-
 pkgs/development/compilers/go/1.4.nix         |  4 +-
 pkgs/development/compilers/go/2-dev.nix       |  8 +-
 .../development/compilers/gprolog/default.nix | 10 +--
 .../compilers/graalvm/community-edition.nix   |  8 +-
 .../development/compilers/graalvm/default.nix |  4 +-
 .../compilers/graalvm/enterprise-edition.nix  |  8 +-
 pkgs/development/compilers/gwt/2.4.0.nix      |  6 +-
 pkgs/development/compilers/haxe/default.nix   |  4 +-
 pkgs/development/compilers/hhvm/default.nix   |  4 +-
 pkgs/development/compilers/hop/default.nix    |  6 +-
 pkgs/development/compilers/iasl/default.nix   |  6 +-
 pkgs/development/compilers/idris2/default.nix |  8 +-
 .../development/compilers/inform6/default.nix |  6 +-
 .../development/compilers/inform7/default.nix |  4 +-
 .../intel-graphics-compiler/default.nix       |  6 +-
 .../compilers/intercal/default.nix            |  4 +-
 .../compilers/ios-cross-compile/9.2.nix       |  8 +-
 pkgs/development/compilers/ispc/default.nix   |  4 +-
 pkgs/development/compilers/jasmin/default.nix |  4 +-
 .../compilers/javacard-devkit/default.nix     |  6 +-
 .../compilers/jetbrains-jdk/default.nix       |  6 +-
 pkgs/development/compilers/julia/1.0.nix      | 12 +--
 pkgs/development/compilers/julia/1.3.nix      | 10 +--
 pkgs/development/compilers/julia/1.5.nix      | 10 +--
 pkgs/development/compilers/jwasm/default.nix  |  4 +-
 pkgs/development/compilers/kotlin/default.nix |  8 +-
 pkgs/development/compilers/ldc/generic.nix    | 18 ++---
 .../compilers/llvm/10/clang/default.nix       | 18 ++---
 .../compilers/llvm/10/compiler-rt.nix         | 28 +++----
 .../development/compilers/llvm/10/default.nix | 22 +++---
 .../compilers/llvm/10/libc++/default.nix      | 18 ++---
 .../compilers/llvm/10/libc++abi.nix           | 24 +++---
 .../compilers/llvm/10/libunwind.nix           |  4 +-
 pkgs/development/compilers/llvm/10/lld.nix    |  6 +-
 pkgs/development/compilers/llvm/10/lldb.nix   | 16 ++--
 pkgs/development/compilers/llvm/10/llvm.nix   | 14 ++--
 pkgs/development/compilers/llvm/10/openmp.nix |  4 +-
 .../compilers/llvm/11/clang/default.nix       | 18 ++---
 .../compilers/llvm/11/compiler-rt.nix         | 28 +++----
 .../development/compilers/llvm/11/default.nix | 24 +++---
 .../compilers/llvm/11/libc++/default.nix      | 14 ++--
 .../compilers/llvm/11/libc++abi.nix           | 24 +++---
 .../compilers/llvm/11/libunwind.nix           |  4 +-
 pkgs/development/compilers/llvm/11/lld.nix    |  6 +-
 pkgs/development/compilers/llvm/11/lldb.nix   | 16 ++--
 pkgs/development/compilers/llvm/11/llvm.nix   | 14 ++--
 pkgs/development/compilers/llvm/11/openmp.nix |  4 +-
 .../compilers/llvm/5/clang/default.nix        | 16 ++--
 .../compilers/llvm/5/compiler-rt.nix          | 28 +++----
 pkgs/development/compilers/llvm/5/default.nix |  8 +-
 .../compilers/llvm/5/libc++/default.nix       | 12 +--
 .../compilers/llvm/5/libc++abi.nix            | 14 ++--
 pkgs/development/compilers/llvm/5/lld.nix     |  6 +-
 pkgs/development/compilers/llvm/5/lldb.nix    |  6 +-
 pkgs/development/compilers/llvm/5/llvm.nix    | 38 +++++-----
 pkgs/development/compilers/llvm/5/openmp.nix  |  4 +-
 .../compilers/llvm/6/clang/default.nix        | 16 ++--
 .../compilers/llvm/6/compiler-rt.nix          | 28 +++----
 pkgs/development/compilers/llvm/6/default.nix |  8 +-
 .../compilers/llvm/6/libc++/default.nix       | 12 +--
 .../compilers/llvm/6/libc++abi.nix            | 14 ++--
 pkgs/development/compilers/llvm/6/lld.nix     |  6 +-
 pkgs/development/compilers/llvm/6/lldb.nix    |  6 +-
 pkgs/development/compilers/llvm/6/llvm.nix    | 16 ++--
 pkgs/development/compilers/llvm/6/openmp.nix  |  4 +-
 .../compilers/llvm/7/clang/default.nix        | 20 ++---
 .../compilers/llvm/7/compiler-rt.nix          | 30 ++++----
 pkgs/development/compilers/llvm/7/default.nix | 16 ++--
 .../compilers/llvm/7/libc++/default.nix       | 14 ++--
 .../compilers/llvm/7/libc++abi.nix            | 22 +++---
 pkgs/development/compilers/llvm/7/lld.nix     |  6 +-
 pkgs/development/compilers/llvm/7/lldb.nix    |  8 +-
 pkgs/development/compilers/llvm/7/llvm.nix    | 16 ++--
 pkgs/development/compilers/llvm/7/openmp.nix  |  6 +-
 .../compilers/llvm/8/clang/default.nix        | 20 ++---
 .../compilers/llvm/8/compiler-rt.nix          | 30 ++++----
 pkgs/development/compilers/llvm/8/default.nix | 22 +++---
 .../compilers/llvm/8/libc++/default.nix       | 18 ++---
 .../compilers/llvm/8/libc++abi.nix            | 24 +++---
 .../compilers/llvm/8/libunwind.nix            |  4 +-
 pkgs/development/compilers/llvm/8/lld.nix     |  6 +-
 pkgs/development/compilers/llvm/8/lldb.nix    |  6 +-
 pkgs/development/compilers/llvm/8/llvm.nix    | 14 ++--
 pkgs/development/compilers/llvm/8/openmp.nix  |  4 +-
 .../compilers/llvm/9/clang/default.nix        | 20 ++---
 .../compilers/llvm/9/compiler-rt.nix          | 28 +++----
 pkgs/development/compilers/llvm/9/default.nix | 22 +++---
 .../compilers/llvm/9/libc++/default.nix       | 18 ++---
 .../compilers/llvm/9/libc++abi.nix            | 24 +++---
 .../compilers/llvm/9/libunwind.nix            |  4 +-
 pkgs/development/compilers/llvm/9/lld.nix     |  6 +-
 pkgs/development/compilers/llvm/9/lldb.nix    |  6 +-
 pkgs/development/compilers/llvm/9/llvm.nix    | 14 ++--
 pkgs/development/compilers/llvm/9/openmp.nix  |  4 +-
 .../development/compilers/llvm/rocm/clang.nix |  6 +-
 .../compilers/llvm/rocm/default.nix           |  2 +-
 pkgs/development/compilers/llvm/rocm/lld.nix  |  4 +-
 pkgs/development/compilers/llvm/rocm/llvm.nix | 12 +--
 .../development/compilers/lobster/default.nix |  4 +-
 pkgs/development/compilers/mcpp/default.nix   |  4 +-
 .../development/compilers/mercury/default.nix |  6 +-
 .../meta-build-env/default.nix                |  4 +-
 pkgs/development/compilers/mezzo/default.nix  | 10 +--
 .../compilers/microscheme/default.nix         |  4 +-
 .../development/compilers/miranda/default.nix |  2 +-
 .../compilers/mit-scheme/default.nix          |  4 +-
 pkgs/development/compilers/mkcl/default.nix   |  4 +-
 pkgs/development/compilers/mlkit/default.nix  |  4 +-
 pkgs/development/compilers/mlton/20130715.nix | 12 +--
 .../compilers/mlton/20180207-binary.nix       |  8 +-
 pkgs/development/compilers/mono/generic.nix   | 10 +--
 pkgs/development/compilers/mono/llvm.nix      |  8 +-
 pkgs/development/compilers/mosml/default.nix  |  6 +-
 pkgs/development/compilers/mozart/binary.nix  | 10 +--
 pkgs/development/compilers/mruby/default.nix  |  4 +-
 pkgs/development/compilers/nasm/default.nix   |  4 +-
 pkgs/development/compilers/neko/default.nix   |  8 +-
 .../development/compilers/obliv-c/default.nix |  8 +-
 pkgs/development/compilers/ocaml/3.08.0.nix   |  2 +-
 pkgs/development/compilers/ocaml/3.10.0.nix   |  4 +-
 pkgs/development/compilers/ocaml/3.11.2.nix   |  4 +-
 pkgs/development/compilers/ocaml/3.12.1.nix   |  4 +-
 pkgs/development/compilers/ocaml/4.00.1.nix   |  6 +-
 .../compilers/ocaml/ber-metaocaml.nix         |  6 +-
 pkgs/development/compilers/ocaml/generic.nix  | 22 +++---
 .../compilers/ocaml/metaocaml-3.09.nix        |  4 +-
 pkgs/development/compilers/opa/default.nix    | 12 +--
 pkgs/development/compilers/opendylan/bin.nix  |  6 +-
 .../compilers/opendylan/default.nix           |  6 +-
 pkgs/development/compilers/openjdk/11.nix     |  2 +-
 pkgs/development/compilers/openjdk/12.nix     |  2 +-
 pkgs/development/compilers/openjdk/13.nix     |  2 +-
 pkgs/development/compilers/openjdk/14.nix     |  2 +-
 .../compilers/openjdk/darwin/11.nix           |  4 +-
 .../compilers/openjdk/darwin/8.nix            |  4 +-
 .../compilers/openjdk/darwin/default.nix      |  4 +-
 .../development/compilers/openjdk/default.nix |  2 +-
 .../compilers/openjdk/openjfx/11.nix          |  2 +-
 .../compilers/openjdk/openjfx/15.nix          |  2 +-
 .../compilers/openspin/default.nix            |  4 +-
 .../compilers/oraclejdk/jdk-linux-base.nix    | 10 +--
 .../compilers/oraclejdk/jdk11-linux.nix       |  6 +-
 .../compilers/oraclejdk/jdk14-linux.nix       |  6 +-
 pkgs/development/compilers/orc/default.nix    |  6 +-
 pkgs/development/compilers/osl/default.nix    |  4 +-
 .../compilers/owl-lisp/default.nix            |  4 +-
 .../compilers/pakcs/curry-base.nix            |  4 +-
 .../compilers/pakcs/curry-frontend.nix        |  4 +-
 pkgs/development/compilers/pakcs/default.nix  |  6 +-
 pkgs/development/compilers/pforth/default.nix |  8 +-
 pkgs/development/compilers/picat/default.nix  |  4 +-
 pkgs/development/compilers/polyml/5.6.nix     | 12 +--
 pkgs/development/compilers/polyml/5.7.nix     |  8 +-
 pkgs/development/compilers/polyml/default.nix |  8 +-
 pkgs/development/compilers/ponyc/default.nix  | 14 ++--
 .../compilers/ponyc/pony-corral.nix           |  4 +-
 .../compilers/ponyc/pony-stable.nix           |  8 +-
 .../purescript/purescript/default.nix         |  2 +-
 pkgs/development/compilers/qbe/default.nix    |  4 +-
 pkgs/development/compilers/rasm/default.nix   |  4 +-
 pkgs/development/compilers/reason/default.nix |  4 +-
 pkgs/development/compilers/rgbds/default.nix  |  4 +-
 pkgs/development/compilers/rust/binary.nix    | 14 ++--
 pkgs/development/compilers/rust/cargo.nix     |  6 +-
 pkgs/development/compilers/rust/clippy.nix    |  6 +-
 .../compilers/rust/rls/default.nix            |  6 +-
 pkgs/development/compilers/rust/rustc.nix     |  8 +-
 pkgs/development/compilers/rust/rustfmt.nix   |  6 +-
 .../compilers/sagittarius-scheme/default.nix  |  6 +-
 pkgs/development/compilers/sbcl/2.0.9.nix     | 12 +--
 pkgs/development/compilers/sbcl/bootstrap.nix |  6 +-
 pkgs/development/compilers/sbcl/default.nix   | 12 +--
 pkgs/development/compilers/scala/2.x.nix      |  2 +-
 .../compilers/scala/dotty-bare.nix            |  4 +-
 pkgs/development/compilers/sdcc/default.nix   |  4 +-
 pkgs/development/compilers/seexpr/default.nix |  4 +-
 .../development/compilers/serpent/default.nix |  4 +-
 .../development/compilers/shaderc/default.nix |  4 +-
 .../development/compilers/smlnj/bootstrap.nix |  8 +-
 pkgs/development/compilers/smlnj/default.nix  |  4 +-
 pkgs/development/compilers/solc/default.nix   | 19 +++--
 .../development/compilers/souffle/default.nix |  6 +-
 .../compilers/spasm-ng/default.nix            |  4 +-
 .../spirv-llvm-translator/default.nix         |  4 +-
 pkgs/development/compilers/squeak/default.nix |  6 +-
 pkgs/development/compilers/stalin/default.nix |  4 +-
 .../compilers/swi-prolog/default.nix          | 12 +--
 pkgs/development/compilers/swift/default.nix  |  8 +-
 pkgs/development/compilers/terra/default.nix  | 10 +--
 pkgs/development/compilers/teyjus/default.nix |  6 +-
 pkgs/development/compilers/tvm/default.nix    |  4 +-
 pkgs/development/compilers/unison/default.nix | 10 +--
 pkgs/development/compilers/urn/default.nix    |  6 +-
 pkgs/development/compilers/urweb/default.nix  |  8 +-
 pkgs/development/compilers/vala/default.nix   |  2 +-
 pkgs/development/compilers/vlang/default.nix  |  6 +-
 pkgs/development/compilers/vyper/default.nix  |  2 +-
 pkgs/development/compilers/wcc/default.nix    |  4 +-
 pkgs/development/compilers/wla-dx/default.nix |  4 +-
 .../compilers/x11basic/default.nix            |  4 +-
 pkgs/development/compilers/yap/default.nix    |  8 +-
 pkgs/development/compilers/yasm/default.nix   |  4 +-
 pkgs/development/compilers/z88dk/default.nix  |  4 +-
 pkgs/development/compilers/zasm/default.nix   |  4 +-
 pkgs/development/compilers/zig/default.nix    |  4 +-
 pkgs/development/compilers/zulu/8.nix         |  4 +-
 pkgs/development/compilers/zulu/default.nix   |  4 +-
 .../libraries/physics/geant4/datasets.nix     |  2 +-
 .../libraries/physics/geant4/default.nix      |  2 +-
 320 files changed, 1660 insertions(+), 1657 deletions(-)

diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix
index ee3050b8ba6..7205a979e27 100644
--- a/pkgs/development/compilers/4th/default.nix
+++ b/pkgs/development/compilers/4th/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "4th";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     "MANDIR=${placeholder "out"}/share/man"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A portable Forth compiler";
     homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
     license = licenses.lgpl3;
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index aa537169aaf..fff88eddd19 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ant, jre, jdk}:
+{lib, stdenv, fetchurl, ant, jre, jdk}:
 stdenv.mkDerivation rec {
   pname = "abcl";
   version = "1.8.0";
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A JVM-based Common Lisp implementation";
-    license = stdenv.lib.licenses.gpl3 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "https://common-lisp.net/project/armedbear/";
   };
 }
diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix
index f2f2c9cf8aa..f8731f55471 100644
--- a/pkgs/development/compilers/acme/default.nix
+++ b/pkgs/development/compilers/acme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn }:
+{ lib, stdenv, fetchsvn }:
 
 stdenv.mkDerivation rec {
   pname = "acme";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       --replace "= gcc" "?= gcc"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-platform cross assembler for 6502/6510/65816 CPUs";
     homepage = "https://sourceforge.net/projects/acme-crossass/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index 5e402b2d728..31a7346108e 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -1,7 +1,7 @@
 sourcePerArch:
 
 { swingSupport ? true # not used for now
-, stdenv
+, lib, stdenv
 , fetchurl
 }:
 
@@ -43,11 +43,11 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
 
   passthru.home = result;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2Classpath;
     description = "AdoptOpenJDK, prebuilt OpenJDK binary";
     platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
-    maintainers = with stdenv.lib.maintainers; [ taku0 ];
+    maintainers = with lib.maintainers; [ taku0 ];
   };
 
 }; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 00945e32535..0fcad6c333f 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -69,7 +69,7 @@ let result = stdenv.mkDerivation rec {
 
   passthru.home = result;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2Classpath;
     description = "AdoptOpenJDK, prebuilt OpenJDK binary";
     platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index 670f7f94193..e20983380a4 100644
--- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }:
+{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }:
 
 stdenv.mkDerivation rec {
   pname = "adoptopenjdk-icedtea-web";
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
       based on the NetX project.
     '';
     homepage = "https://github.com/adoptopenjdk/icedtea-web";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index 09ccf9510bb..2654cc467fe 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper
+{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper
 , autoconf, automake, libtool, jdk, perl }:
 
 stdenv.mkDerivation {
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     broken = true;
     homepage = "http://www.aldor.org/";
     description = "Programming language with an expressive type system";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
 
     longDescription = ''
       Aldor is a programming language with an expressive type system well-suited
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
       and powerful properties of functional, object-oriented and aspect-oriented styles.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
index d3208b12dd6..8f560ef6198 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
+{lib, stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
 
 stdenv.mkDerivation {
   name = "aliceml-1.4-7d44dc8e";
@@ -50,8 +50,8 @@ stdenv.mkDerivation {
       programming.
     '';
     homepage = "https://www.ps.uni-saarland.de/alice/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.doublec ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.doublec ];
     broken = true;
   };
 }
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix
index 337d5a4e26d..800b1ea55e3 100644
--- a/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
 
 let
   playerglobal_ver = "27.0";
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
 
   fixupPhase = ":";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flex SDK for Adobe Flash / ActionScript";
     homepage = "https://flex.apache.org/";
     license = with licenses; [ asl20 ];
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 613f3fa186a..030da03add8 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, icestorm }:
+{ lib, stdenv, fetchFromGitHub, icestorm }:
 
 with builtins;
 
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
       the IceStorm [2] icepack command.
     '';
     homepage = "https://github.com/cseed/arachne-pnr";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ shell thoughtpolice ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
index 230ed36fff5..a4e822eec6d 100644
--- a/pkgs/development/compilers/asn1c/default.nix
+++ b/pkgs/development/compilers/asn1c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "asn1c";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://lionet.info/asn1c/compiler.html";
     description = "Open Source ASN.1 Compiler";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix
index 8fd47e937c8..24ff50f558c 100644
--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/pkgs/development/compilers/aspectj/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jre}:
+{lib, stdenv, fetchurl, jre}:
 
 stdenv.mkDerivation rec {
   pname = "aspectj";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.eclipse.org/aspectj/";
     description = "A seamless aspect-oriented extension to the Java programming language";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.epl10;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.epl10;
   };
 }
diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix
index f086c36468d..35e1b1dd105 100644
--- a/pkgs/development/compilers/ats/default.nix
+++ b/pkgs/development/compilers/ats/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
   pname = "ats";
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Functional programming language with dependent types";
     homepage    = "http://www.ats-lang.org";
-    license     = stdenv.lib.licenses.gpl3Plus;
+    license     = lib.licenses.gpl3Plus;
     # TODO: it looks like ATS requires gcc specifically. Someone with more knowledge
     # will need to experiment.
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index bbfbcdbbeb0..c75600b5341 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp
+{ lib, stdenv, fetchurl, gmp
 , withEmacsSupport ? true
 , withContrib ? true }:
 
@@ -10,14 +10,14 @@ let
     sha256 = "184m4hz2xszhcfc6w9fw9qibhmcvgjmikwfwkb345xypr59jm93d";
   };
 
-  postInstallContrib = stdenv.lib.optionalString withContrib
+  postInstallContrib = lib.optionalString withContrib
   ''
     local contribDir=$out/lib/ats2-postiats-*/ ;
     mkdir -p $contribDir ;
     tar -xzf "${contrib}" --strip-components 1 -C $contribDir ;
   '';
 
-  postInstallEmacs = stdenv.lib.optionalString withEmacsSupport
+  postInstallEmacs = lib.optionalString withEmacsSupport
   ''
     local siteLispDir=$out/share/emacs/site-lisp/ats2 ;
     mkdir -p $siteLispDir ;
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
-  setupHook = with stdenv.lib;
+  setupHook = with lib;
     let
       hookFiles =
         [ ./setup-hook.sh ]
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   postInstall = postInstallContrib + postInstallEmacs;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Functional programming language with dependent types";
     homepage    = "http://www.ats-lang.org";
     license     = licenses.gpl3Plus;
diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
index 7c5db45f31b..d39aa2806a4 100644
--- a/pkgs/development/compilers/avian/default.nix
+++ b/pkgs/development/compilers/avian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
+{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
 
 stdenv.mkDerivation rec {
   pname = "avian";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ zlib jdk ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
       building self-contained applications.
     '';
     homepage = "https://readytalk.github.io/avian/";
-    license = stdenv.lib.licenses.isc;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.earldouglas ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.earldouglas ];
   };
 }
diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix
index 56bf3e657be..9d360780053 100644
--- a/pkgs/development/compilers/avra/default.nix
+++ b/pkgs/development/compilers/avra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake }:
+{ lib, stdenv, fetchurl, autoconf, automake }:
 stdenv.mkDerivation rec {
   name = "avra-1.3.0";
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     automake -a
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assembler for the Atmel AVR microcontroller family";
     homepage = "http://avra.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index ced7dd07a22..a4f4287523f 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autoconf, automake, libtool, gmp
+{ fetchurl, lib, stdenv, autoconf, automake, libtool, gmp
 , darwin
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoconf automake libtool ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin
+  buildInputs = lib.optional stdenv.isDarwin
     darwin.apple_sdk.frameworks.ApplicationServices
   ;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     # For libuv on darwin
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       export LIBTOOLIZE=libtoolize
     '' +
     # Help libgc's configure.
@@ -50,9 +50,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Efficient Scheme compiler";
     homepage    = "http://www-sop.inria.fr/indes/fp/Bigloo/";
-    license     = stdenv.lib.licenses.gpl2Plus;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+    license     = lib.licenses.gpl2Plus;
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ thoughtpolice ];
 
     longDescription = ''
       Bigloo is a Scheme implementation devoted to one goal: enabling
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 6de4e0fb304..d2d866a2804 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }:
+{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }:
 
 stdenv.mkDerivation rec {
   pname = "binaryen";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake python3 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/WebAssembly/binaryen";
     description = "Compiler infrastructure and toolchain library for WebAssembly, in C++";
     platforms = platforms.all;
diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix
index 1e9fd8505c5..defe78d7c31 100644
--- a/pkgs/development/compilers/bluespec/default.nix
+++ b/pkgs/development/compilers/bluespec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , autoconf
@@ -97,10 +97,10 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Toolchain for the Bluespec Hardware Definition Language";
     homepage    = "https://github.com/B-Lang-org/bsc";
-    license     = stdenv.lib.licenses.bsd3;
+    license     = lib.licenses.bsd3;
     platforms = [ "x86_64-linux" ];
     # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562
     # aarch64 fails, as GHC fails with "ghc: could not execute: opt"
-    maintainers = with stdenv.lib.maintainers; [ jcumming thoughtpolice ];
+    maintainers = with lib.maintainers; [ jcumming thoughtpolice ];
   };
 }
diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index 18c61d0d923..c73bb72b9d0 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -1,12 +1,12 @@
 # This file is based on https://github.com/turboMaCk/bs-platform.nix/blob/master/build-bs-platform.nix
 # to make potential future updates simpler
 
-{ stdenv, fetchFromGitHub, ninja, runCommand, nodejs, python3,
+{ lib, stdenv, fetchFromGitHub, ninja, runCommand, nodejs, python3,
   ocaml-version, version, src,
   patches ? [],
   ocaml ? (import ./ocaml.nix {
     version = ocaml-version;
-    inherit stdenv;
+    inherit lib stdenv;
     src = "${src}/ocaml";
   }),
   custom-ninja ? (ninja.overrideAttrs (attrs: {
diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix
index 6eb7d50bfc8..50274c9eca6 100644
--- a/pkgs/development/compilers/bs-platform/default.nix
+++ b/pkgs/development/compilers/bs-platform/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, runCommand, fetchFromGitHub, ninja, nodejs, python3, ... }:
+{ lib, stdenv, runCommand, fetchFromGitHub, ninja, nodejs, python3, ... }:
 let
   build-bs-platform = import ./build-bs-platform.nix;
 in
 (build-bs-platform rec {
-  inherit stdenv runCommand fetchFromGitHub ninja nodejs python3;
+  inherit lib stdenv runCommand fetchFromGitHub ninja nodejs python3;
   version = "8.2.0";
   ocaml-version = "4.06.1";
 
@@ -17,7 +17,7 @@ in
     fetchSubmodules = true;
   };
 }).overrideAttrs (attrs: {
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code";
     homepage = "https://bucklescript.github.io";
     license = licenses.lgpl3;
diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix
index 9aa34d02b36..d650d767a8d 100644
--- a/pkgs/development/compilers/bs-platform/ocaml.nix
+++ b/pkgs/development/compilers/bs-platform/ocaml.nix
@@ -1,4 +1,4 @@
-{ stdenv, src, version }:
+{ lib, stdenv, src, version }:
 stdenv.mkDerivation rec {
   inherit src version;
   name = "ocaml-${version}+bs";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     make -j9 world.opt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "4.06";
     platforms = platforms.all;
   };
diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix
index ecdfe8d461a..9b3a291a1a0 100644
--- a/pkgs/development/compilers/bupc/default.nix
+++ b/pkgs/development/compilers/bupc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, coreutils }:
+{ lib, stdenv, fetchurl, perl, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "berkeley_upc-2.22.0";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ coreutils ];
   buildInputs = [ perl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A compiler for the Berkely Unified Parallel C language";
     longDescription = ''
       Unified Parallel C (UPC) is an extension of the C programming language
diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix
index 500c15a2aaa..15afb9fc25e 100644
--- a/pkgs/development/compilers/cakelisp/default.nix
+++ b/pkgs/development/compilers/cakelisp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gcc }:
+{ lib, stdenv, fetchFromGitHub, gcc }:
 
 stdenv.mkDerivation rec {
   pname = "cakelisp";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
         --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
     substituteInPlace src/ModuleManager.cpp \
         --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic'
     substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic'
     substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic'
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     install -Dm755 bin/cakelisp -t $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A performance-oriented Lisp-like language";
     homepage = "https://github.com/makuto/cakelisp";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix
index f6c27436c76..0299c179775 100644
--- a/pkgs/development/compilers/carp/default.nix
+++ b/pkgs/development/compilers/carp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
 
 haskellPackages.mkDerivation rec {
 
@@ -39,10 +39,10 @@ haskellPackages.mkDerivation rec {
 
   description = "A statically typed lisp, without a GC, for real-time applications";
   homepage    = "https://github.com/carp-lang/Carp";
-  license     = stdenv.lib.licenses.asl20;
-  maintainers = with stdenv.lib.maintainers; [ jluttine ];
+  license     = lib.licenses.asl20;
+  maintainers = with lib.maintainers; [ jluttine ];
 
   # Windows not (yet) supported.
-  platforms   = with stdenv.lib.platforms; unix ++ darwin;
+  platforms   = with lib.platforms; unix ++ darwin;
 
 }
diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix
index 1b5011365cf..347382990d1 100644
--- a/pkgs/development/compilers/cc65/default.nix
+++ b/pkgs/development/compilers/cc65/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://cc65.github.io/";
     description = "C compiler for processors of 6502 family";
     longDescription = ''
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 8f292e358ae..79e7d324ec9 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
+{ lib, stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
 
 let
   options = rec {
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Clozure Common Lisp";
     homepage    = "https://ccl.clozure.com/";
     maintainers = with maintainers; [ raskin muflax tohl ];
diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index 550f754639e..c1c8eced83b 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , coreutils, cctools
 , ncurses, libiconv, libX11, libuuid
 }:
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
+  nativeBuildInputs = [ coreutils ] ++ lib.optional stdenv.isDarwin cctools;
   buildInputs = [ ncurses libiconv libX11 libuuid ];
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
 
   /*
   ** We patch out a very annoying 'feature' in ./configure, which
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
   meta = {
     description  = "A powerful and incredibly fast R6RS Scheme compiler";
     homepage     = "https://cisco.github.io/ChezScheme/";
-    license      = stdenv.lib.licenses.asl20;
-    maintainers  = with stdenv.lib.maintainers; [ thoughtpolice ];
-    platforms    = stdenv.lib.platforms.unix;
+    license      = lib.licenses.asl20;
+    maintainers  = with lib.maintainers; [ thoughtpolice ];
+    platforms    = lib.platforms.unix;
     badPlatforms = [ "aarch64-linux" ];
   };
 }
diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix
index 50126fdac92..8ea522a81a9 100644
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/pkgs/development/compilers/chicken/4/chicken.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
+{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
 
 let
   version = "4.13.0";
@@ -8,7 +8,6 @@ let
     else if (isFreeBSD || isOpenBSD) then "bsd"
     else if isSunOS then "solaris"
     else "linux"; # Should be a sane default
-  lib = stdenv.lib;
 in
 stdenv.mkDerivation {
   pname = "chicken";
@@ -70,9 +69,9 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.call-cc.org/";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ corngood ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin; # Maybe other Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.
diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix
index 977f34692f9..2775666f14c 100644
--- a/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/4/egg2nix.nix
@@ -20,8 +20,8 @@ eggDerivation {
   meta = {
     description = "Generate nix-expression from CHICKEN scheme eggs";
     homepage = "https://github.com/the-kenny/egg2nix";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ corngood ];
   };
 }
diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix
index cd340c22174..4c84ef8c42b 100644
--- a/pkgs/development/compilers/chicken/4/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, chicken, makeWrapper }:
+{ lib, stdenv, chicken, makeWrapper }:
 { name, src
 , buildInputs ? []
 , chickenInstallFlags ? []
@@ -8,7 +8,7 @@
 let
   libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/";
   overrides = import ./overrides.nix;
-  baseName = stdenv.lib.getName name;
+  baseName = lib.getName name;
   override = if builtins.hasAttr baseName overrides
    then
      builtins.getAttr baseName overrides
@@ -20,7 +20,7 @@ stdenv.mkDerivation ({
   propagatedBuildInputs = buildInputs;
   buildInputs = [ makeWrapper chicken ];
 
-  CSC_OPTIONS = stdenv.lib.concatStringsSep " " cscOptions;
+  CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
 
   CHICKEN_REPOSITORY = libPath;
   CHICKEN_INSTALL_PREFIX = "$out";
@@ -28,7 +28,7 @@ stdenv.mkDerivation ({
   installPhase = ''
     runHook preInstall
 
-    chicken-install -p $out ${stdenv.lib.concatStringsSep " " chickenInstallFlags}
+    chicken-install -p $out ${lib.concatStringsSep " " chickenInstallFlags}
 
     for f in $out/bin/*
     do
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 712012643f3..9f2554b7343 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
+{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
 
 let
   version = "5.2.0";
@@ -8,7 +8,6 @@ let
     else if (isFreeBSD || isOpenBSD) then "bsd"
     else if isSunOS then "solaris"
     else "linux"; # Should be a sane default
-  lib = stdenv.lib;
 in
 stdenv.mkDerivation {
   pname = "chicken";
@@ -51,9 +50,9 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.call-cc.org/";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ corngood ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin; # Maybe other Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.
diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix
index 0c18b8db2de..69e8d9e62c3 100644
--- a/pkgs/development/compilers/chicken/5/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/5/egg2nix.nix
@@ -1,4 +1,4 @@
-{ stdenv, eggDerivation, fetchFromGitHub, chickenEggs }:
+{ lib, stdenv, eggDerivation, fetchFromGitHub, chickenEggs }:
 
 # Note: This mostly reimplements the default.nix already contained in
 # the tarball. Is there a nicer way than duplicating code?
@@ -22,8 +22,8 @@ eggDerivation {
   meta = {
     description = "Generate nix-expression from CHICKEN scheme eggs";
     homepage = "https://github.com/the-kenny/egg2nix";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ corngood ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ corngood ];
   };
 }
diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix
index f5ed4b4b7f8..7102126206a 100644
--- a/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, chicken, makeWrapper }:
+{ lib, stdenv, chicken, makeWrapper }:
 { name, src
 , buildInputs ? []
 , chickenInstallFlags ? []
@@ -7,7 +7,7 @@
 
 let
   overrides = import ./overrides.nix;
-  baseName = stdenv.lib.getName name;
+  baseName = lib.getName name;
   override = if builtins.hasAttr baseName overrides
    then
      builtins.getAttr baseName overrides
@@ -19,14 +19,14 @@ stdenv.mkDerivation ({
   propagatedBuildInputs = buildInputs;
   buildInputs = [ makeWrapper chicken ];
 
-  CSC_OPTIONS = stdenv.lib.concatStringsSep " " cscOptions;
+  CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
 
   installPhase = ''
     runHook preInstall
 
     export CHICKEN_INSTALL_PREFIX=$out
     export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion}
-    chicken-install ${stdenv.lib.concatStringsSep " " chickenInstallFlags}
+    chicken-install ${lib.concatStringsSep " " chickenInstallFlags}
 
     for f in $out/bin/*
     do
diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix
index be39d81f558..de8e73374c5 100644
--- a/pkgs/development/compilers/ciao/default.nix
+++ b/pkgs/development/compilers/ciao/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "ciao";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ./ciao-boot.sh install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ciao-lang.org/";
     description = "A general purpose, multi-paradigm programming language in the Prolog family";
     license = licenses.lgpl21;
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index b7da76d38f9..31a669c313e 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchFromGitLab
+{ lib, stdenv, fetchFromGitHub, fetchFromGitLab
 , llvmPackages
 , cmake, boehmgc, gmp, zlib, ncurses, boost, libelf
 , python, git, sbcl
@@ -72,14 +72,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = with llvmPackages;
   (
-   builtins.map (x: stdenv.lib.overrideDerivation x
+   builtins.map (x: lib.overrideDerivation x
            (x: {NIX_CFLAGS_COMPILE= (x.NIX_CFLAGS_COMPILE or "") + " -frtti"; }))
    [ llvm clang clang-unwrapped clang ]) ++
   [
     gmp zlib ncurses
     boost boehmgc libelf
     (boost.override {enableStatic = true; enableShared = false;})
-    (stdenv.lib.overrideDerivation boehmgc
+    (lib.overrideDerivation boehmgc
       (x: {configureFlags = (x.configureFlags or []) ++ ["--enable-static"];}))
   ];
 
@@ -120,9 +120,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A Common Lisp implementation based on LLVM with C++ integration";
-    license = stdenv.lib.licenses.lgpl21Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     # Large, long to build, a private build of clang is needed, a prerelease.
     hydraPlatforms = [];
     homepage = "https://github.com/drmeister/clasp";
diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index 0dfd05030b9..f8121958e29 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "clean-3.0";
@@ -45,8 +45,8 @@ stdenv.mkDerivation {
     '';
 
     homepage = "http://wiki.clean.cs.ru.nl/Clean";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.kkallio ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.kkallio ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 7c0d42f1864..b5ac2e187d8 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "closure-compiler";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       --add-flags "-jar $out/share/java/closure-compiler-v${version}.jar"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for making JavaScript download and run faster";
     homepage = "https://developers.google.com/closure/compiler/";
     license = licenses.asl20;
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index 87d3f0ef00c..df674b67db8 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, runtimeShell }:
+{ lib, stdenv, fetchurl, python, runtimeShell }:
 
 stdenv.mkDerivation {
   name = "cmdstan-2.17.1";
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
       likelihood estimation with Optimization (L-BFGS).
     '';
     homepage = "https://mc-stan.org/interfaces/cmdstan.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix
index 480a7e522b5..b09f5f41b67 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 let
   inherit (stdenv.hostPlatform) system;
@@ -36,9 +36,9 @@ stdenv.mkDerivation {
       which runs on most major Unix platforms.  It mainly conforms to the
       ANSI Common Lisp standard.
     '';
-    license = stdenv.lib.licenses.free;		# public domain
+    license = lib.licenses.free;		# public domain
     homepage = "http://www.cons.org/cmucl/";
-    maintainers = [stdenv.lib.maintainers.tohl];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [lib.maintainers.tohl];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 06a56dc42ea..d7a0953a803 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
+{ lib, stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "colm";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ":" ${gcc}/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A programming language for the analysis and transformation of computer languages";
     homepage = "http://www.colm.net/open-source/colm";
     license = licenses.gpl2;
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 99bd09d8d9e..611efb11f44 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper
+{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper
 , coqPackages, ocamlPackages, coq2html
 , tools ? stdenv.cc
 , version ? "3.8"
@@ -8,7 +8,7 @@ let
   ocaml-pkgs      = with ocamlPackages; [ ocaml findlib menhir ];
   ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";
   inherit (coqPackages) coq flocq;
-  inherit (stdenv.lib) optional optionalString;
+  inherit (lib) optional optionalString;
 in
 
 let param = {
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "doc" "man" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Formally verified C compiler";
     homepage    = "https://compcert.org";
     license     = licenses.inria-compcert;
diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix
index acdcc2014f8..0f9e877201b 100644
--- a/pkgs/development/compilers/computecpp/default.nix
+++ b/pkgs/development/compilers/computecpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchzip
 , pkg-config
 , autoPatchelfHook
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     isClang = true;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards";
     homepage = "https://www.codeplay.com/products/computesuite/computecpp";
diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix
index 67bc786e669..dd6af73547a 100644
--- a/pkgs/development/compilers/copper/default.nix
+++ b/pkgs/development/compilers/copper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , libffi
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make BACKEND=elf64 install prefix=$out
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple imperative language, statically typed with type inference and genericity";
     homepage = "https://tibleiz.net/copper/";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 2a44279209c..f38a3805962 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv
+{ config, lib, stdenv
 , fetchFromGitHub
 , fetchpatch
 , which
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/dotnet/core/";
     description = ".NET is a general purpose development platform";
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index b449d66d3ba..489e9d28cbc 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -63,7 +63,7 @@ let
   commonBuildInputs = extraBuildInputs: [
     boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl
   ] ++ extraBuildInputs
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   generic = (
     { version
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix
index 92a684a6fbf..c18eb9d534a 100644
--- a/pkgs/development/compilers/cudatoolkit/common.nix
+++ b/pkgs/development/compilers/cudatoolkit/common.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     gtk2 glib fontconfig freetype unixODBC alsaLib
   ];
 
-  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
+  rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
 
   unpackPhase = ''
     sh $src --keep --noexec
@@ -232,7 +232,7 @@ stdenv.mkDerivation rec {
     majorVersion = lib.versions.majorMinor version;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A compiler for NVIDIA GPUs, math libraries, and tools";
     homepage = "https://developer.nvidia.com/cuda-toolkit";
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
index ef32b37ef99..addd7997d36 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   checkTarget = "tests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lisp-flavoured C";
     longDescription = ''
       Dale is a system (no GC) programming language that uses
diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix
index 627ac36329a..7f57f47f2ed 100644
--- a/pkgs/development/compilers/dasm/default.nix
+++ b/pkgs/development/compilers/dasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "dasm";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assembler for 6502 and other 8-bit microprocessors";
     homepage = "https://dasm-assembler.github.io";
     license = licenses.gpl2;
diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 88b46561241..cea9ea37b4e 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "dev86";
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Linux 8086 development environment";
     homepage = "http://v3.sk/~lkundrak/dev86/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 4bfd6298c8f..074646f5f41 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -16,7 +16,7 @@ let
       name = "dmd.conf";
       text = (lib.generators.toINI {} {
         Environment = {
-          DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
+          DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
         };
       });
   };
@@ -77,16 +77,16 @@ stdenv.mkDerivation rec {
   postPatch = ''
       substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
       substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
   '';
 
   nativeBuildInputs = [ makeWrapper unzip which gdb git ]
 
-  ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+  ++ lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
     Foundation
   ]);
 
@@ -163,7 +163,7 @@ stdenv.mkDerivation rec {
       substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Official reference compiler for the D language";
     homepage = "http://dlang.org/";
     # Everything is now Boost licensed, even the backend.
diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix
index 1162a75d0de..56880826a19 100644
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@@ -4,7 +4,7 @@
 }:
 
 assert builtins.elem type [ "aspnetcore" "netcore" "sdk"];
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , libunwind
 , openssl
@@ -41,7 +41,7 @@ let
 in stdenv.mkDerivation rec {
   inherit pname version;
 
-  rpath = stdenv.lib.makeLibraryPath [
+  rpath = lib.makeLibraryPath [
     curl
     icu
     libunwind
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet
     patchelf --set-rpath "${rpath}" $out/dotnet
     find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
     $out/bin/dotnet --info
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://dotnet.github.io/";
     description = builtins.getAttr type descriptions;
     platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index a7b2aa6be74..0789addb337 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , libtool, autoconf, automake
 , gmp, mpfr, libffi, makeWrapper
 , noUnicode ? false
@@ -23,7 +23,7 @@ let
   ];
   propagatedBuildInputs = [
     libffi gmp mpfr gcc
-  ] ++ stdenv.lib.optionals useBoehmgc [
+  ] ++ lib.optionals useBoehmgc [
     # replaces ecl's own gc which other packages can depend on, thus propagated
     boehmgc
   ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     "--with-libffi-prefix=${libffi.dev}"
     ]
     ++
-    (stdenv.lib.optional (! noUnicode)
+    (lib.optional (! noUnicode)
       "--enable-unicode")
     ;
 
@@ -77,8 +77,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Lisp implementation aiming to be small, fast and easy to embed";
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 40f3e38e506..0b4ea9b8389 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl
+{lib, stdenv, fetchurl
 , libtool, autoconf, automake
 , texinfo
 , gmp, mpfr, libffi, makeWrapper
@@ -22,7 +22,7 @@ let
   propagatedBuildInputs = [
     libffi gmp mpfr gcc
     # replaces ecl's own gc which other packages can depend on, thus propagated
-  ] ++ stdenv.lib.optionals useBoehmgc [
+  ] ++ lib.optionals useBoehmgc [
     # replaces ecl's own gc which other packages can depend on, thus propagated
     boehmgc
   ];
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     "--with-libffi-prefix=${libffi.dev}"
     ]
     ++
-    (stdenv.lib.optional (! noUnicode)
+    (lib.optional (! noUnicode)
       "--enable-unicode")
     ;
 
@@ -94,8 +94,8 @@ stdenv.mkDerivation {
     inherit (s) version;
     description = "Lisp implementation aiming to be small, fast and easy to embed";
     homepage = "https://common-lisp.net/project/ecl/";
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix
index 61e5fd70a7c..8920e34b6ee 100644
--- a/pkgs/development/compilers/eli/default.nix
+++ b/pkgs/development/compilers/eli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , symlinkJoin
 , makeWrapper
@@ -84,8 +84,8 @@ stdenv.mkDerivation rec {
       arbitrary special cases. Output is the C subset of C++.
     '';
     homepage = "http://eli-project.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ timokau ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ timokau ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 6c4b1bd2d30..459efde218a 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -118,7 +118,7 @@ let
 
       elm-test = patchBinwrap [elmi-to-json]
         nodePkgs.elm-test // {
-          meta = with stdenv.lib; {
+          meta = with lib; {
             description = "Runs elm-test suites from Node.js";
             homepage = "https://github.com/rtfeldman/node-test-runner";
             license = licenses.bsd3;
@@ -128,7 +128,7 @@ let
 
       elm-verify-examples = patchBinwrap [elmi-to-json]
         nodePkgs.elm-verify-examples // {
-          meta = with stdenv.lib; {
+          meta = with lib; {
             description = "Verify examples in your docs";
             homepage = "https://github.com/stoeffel/elm-verify-examples";
             license = licenses.bsd3;
@@ -153,7 +153,7 @@ let
             mkdir -p unpacked_bin
             ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
           '';
-          meta = with stdenv.lib; {
+          meta = with lib; {
             description = "Work in progress - Code coverage tooling for Elm";
             homepage = "https://github.com/zwilias/elm-coverage";
             license = licenses.bsd3;
@@ -163,7 +163,7 @@ let
 
       create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json]
         nodePkgs.create-elm-app) // {
-          meta = with stdenv.lib; {
+          meta = with lib; {
             description = "Create Elm apps with no build configuration";
             homepage = "https://github.com/halfzebra/create-elm-app";
             license = licenses.mit;
@@ -173,7 +173,7 @@ let
 
       elm-review = patchBinwrap [elmRustPackages.elm-json]
         nodePkgs.elm-review // {
-          meta = with stdenv.lib; {
+          meta = with lib; {
             description = "Analyzes Elm projects, to help find mistakes before your users find them";
             homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}";
             license = licenses.bsd3;
@@ -182,7 +182,7 @@ let
         };
 
       elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // {
-        meta = with stdenv.lib; {
+        meta = with lib; {
           description = "Language server implementation for Elm";
           homepage = "https://github.com/elm-tooling/elm-language-server";
           license = licenses.mit;
@@ -191,7 +191,7 @@ let
       };
 
       elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // {
-        meta = with stdenv.lib; {
+        meta = with lib; {
           description = "A second level of optimization for the Javascript that the Elm Compiler produces";
           homepage = "https://github.com/mdgriffith/elm-optimize-level-2";
           license = licenses.bsd3;
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index ff944cc4b64..71386e00ef1 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -1,7 +1,7 @@
 { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary
 , bytestring, cmark, containers, directory, filepath, free, HUnit
 , indents, json, mtl, optparse-applicative, parsec, process
-, QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden
+, QuickCheck, quickcheck-io, split, lib, stdenv, tasty, tasty-golden
 , tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
@@ -36,5 +36,5 @@ mkDerivation {
   doHaddock = false;
   homepage = "https://elm-lang.org";
   description = "A source code formatter for Elm";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix
index 4d7efcf1083..cd13eb4de4f 100644
--- a/pkgs/development/compilers/elm/packages/elm-instrument.nix
+++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix
@@ -2,7 +2,7 @@
 , bytestring, Cabal, cmark, containers, directory, elm-format
 , fetchgit, filepath, free, HUnit, indents, json, mtl
 , optparse-applicative, parsec, process, QuickCheck, quickcheck-io
-, split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+, split, lib, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
 , text
 }:
 mkDerivation {
@@ -30,5 +30,5 @@ mkDerivation {
   ];
   homepage = "https://elm-lang.org";
   description = "Instrumentation library for Elm";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix
index 644a53fd619..edb2ed6ed7a 100644
--- a/pkgs/development/compilers/elm/packages/elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm.nix
@@ -3,7 +3,7 @@
 , file-embed, filelock, filepath, ghc-prim, haskeline, HTTP
 , http-client, http-client-tls, http-types, language-glsl, mtl
 , network, parsec, process, raw-strings-qq, scientific, SHA
-, snap-core, snap-server, stdenv, template-haskell, time
+, snap-core, snap-server, lib, stdenv, template-haskell, time
 , unordered-containers, utf8-string, vector, zip-archive
 }:
 mkDerivation {
@@ -27,5 +27,5 @@ mkDerivation {
   ];
   homepage = "https://elm-lang.org";
   description = "The `elm` command line interface";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/pkgs/development/compilers/elm/packages/elmi-to-json.nix
index eaed18c5297..6788fce6a99 100644
--- a/pkgs/development/compilers/elm/packages/elmi-to-json.nix
+++ b/pkgs/development/compilers/elm/packages/elmi-to-json.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, binary, bytestring, containers
 , directory, fetchgit, filepath, ghc-prim, hpack
-, optparse-applicative, stdenv, text, unliftio
+, optparse-applicative, lib, stdenv, text, unliftio
 , unordered-containers
 }:
 mkDerivation {
@@ -23,5 +23,5 @@ mkDerivation {
   testHaskellDepends = [ base ];
   prePatch = "hpack";
   homepage = "https://github.com/stoeffel/elmi-to-json#readme";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/pkgs/development/compilers/elm/packages/indents.nix
index 6bf7fa7890e..80f3c08d9e3 100644
--- a/pkgs/development/compilers/elm/packages/indents.nix
+++ b/pkgs/development/compilers/elm/packages/indents.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, concatenative, mtl, parsec, stdenv }:
+{ mkDerivation, base, concatenative, mtl, parsec, lib, stdenv }:
 mkDerivation {
   pname = "indents";
   version = "0.3.3";
@@ -7,5 +7,5 @@ mkDerivation {
   doCheck = false;
   homepage = "http://patch-tag.com/r/salazar/indents";
   description = "indentation sensitive parser-combinators for parsec";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index ac13f955930..648ec156abe 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
+{ lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
 , jre, binaryen
 , llvmPackages_11
 , symlinkJoin, makeWrapper
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/emscripten-core/emscripten";
     description = "An LLVM-to-JavaScript Compiler";
     platforms = platforms.all;
diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix
index ce42c102115..a3fefbc1f48 100644
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }:
+{ lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   version = src.rev;
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Embedded Qt Lisp (ECL+Qt)";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index eba5b0f584c..fc5f478177c 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, git,
+{ lib, stdenv, fetchurl, glib, git,
   rlwrap, curl, pkg-config, perl, makeWrapper, tzdata, ncurses,
   pango, cairo, gtk2, gdk-pixbuf, gtkglext,
   mesa, xorg, openssl, unzip }:
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     # out of known libraries. The side effect is that find-lib
     # will work only on the known libraries. There does not seem
     # to be a generic solution here.
-    find $(echo ${stdenv.lib.makeLibraryPath (with xorg; [
+    find $(echo ${lib.makeLibraryPath (with xorg; [
         glib libX11 pango cairo gtk2 gdk-pixbuf gtkglext
         mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
     cp ./factor $out/bin
     wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
-      "${stdenv.lib.makeLibraryPath (with xorg; [ glib
+      "${lib.makeLibraryPath (with xorg; [ glib
         libX11 pango cairo gtk2 gdk-pixbuf gtkglext
         mesa libXmu libXt libICE libSM openssl])}"
 
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     cp misc/fuel/*.el $out/share/emacs/site-lisp/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://factorcode.org";
     license = licenses.bsd2;
     description = "A concatenative, stack-based programming language";
diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/development/compilers/fasmg/default.nix
index 5233e248c07..611a2bdb8f1 100644
--- a/pkgs/development/compilers/fasmg/default.nix
+++ b/pkgs/development/compilers/fasmg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchzip
 }:
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     cp docs/*.txt $doc/share/doc/fasmg
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF";
     homepage = "https://flatassembler.net";
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/development/compilers/flasm/default.nix
index 9393d4fc59f..4257feb87b9 100644
--- a/pkgs/development/compilers/flasm/default.nix
+++ b/pkgs/development/compilers/flasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, unzip, bison, flex, gperf, zlib }:
+{ lib, stdenv, fetchzip, unzip, bison, flex, gperf, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "flasm";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     install -Dm755 flasm -t $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assembler and disassembler for Flash (SWF) bytecode";
     homepage = "http://flasm.sourceforge.net/";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index b7769e88af3..a7ec8732250 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -13,7 +13,7 @@
 , coreutils
 , git
 , runCommand
-, stdenv
+, lib, stdenv
 , fetchurl
 , alsaLib
 , dbus
@@ -137,7 +137,7 @@ runCommand drvName
   preferLocalBuild = true;
   allowSubstitutes = false;
   passthru = { unwrapped = flutter; };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Flutter is Google's SDK for building mobile, web and desktop with Dart";
     longDescription = ''
       Flutter is Google’s UI toolkit for building beautiful,
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index 6e7ffefca21..5c829386651 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gawk }:
+{ lib, stdenv, fetchurl, gawk }:
 
 let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     bootstrap = startFPC;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free Pascal Compiler from a source distribution";
     homepage = "https://www.freepascal.org";
     maintainers = [ maintainers.raskin ];
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 71303305791..0b7ac647529 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ':' "${lib.makeBinPath [ fpc gdb gnumake binutils ]}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graphical IDE for the FreePascal language";
     homepage = "https://www.lazarus.freepascal.org";
     license = licenses.gpl2Plus ;
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 53c9aeea3e0..19b79989dc2 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -1,6 +1,6 @@
 # Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
 
-{ stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }:
+{ lib, stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }:
 
 stdenv.mkDerivation rec {
   pname = "fsharp";
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A functional CLI language";
     homepage = "https://fsharp.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thoughtpolice raskin ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index 7c1a2fd32ef..e9f9088df3a 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -1,6 +1,6 @@
 # Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
 
-{ stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
+{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
 
 stdenv.mkDerivation rec {
   pname = "fsharp";
@@ -119,8 +119,8 @@ EOF
   meta = {
     description = "A functional CLI language";
     homepage = "https://fsharp.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thoughtpolice raskin ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 548abeff78d..73bf001f752 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }:
 
 stdenv.mkDerivation rec {
   pname = "fstar";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ML-like functional programming language aimed at program verification";
     homepage = "https://www.fstar-lang.org";
     license = licenses.asl20;
diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/development/compilers/gavrasm/default.nix
index 58e8b45b61a..6bd813b56cf 100644
--- a/pkgs/development/compilers/gavrasm/default.nix
+++ b/pkgs/development/compilers/gavrasm/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchzip, fpc , lang ? "en" } :
-assert stdenv.lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"];
+{ lib, stdenv, fetchzip, fpc , lang ? "en" } :
+assert lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"];
 stdenv.mkDerivation rec {
   pname = "gavrasm";
   version = "4.5";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cp LiesMich.Txt $out/doc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.avr-asm-tutorial.net/gavrasm";
     description = "AVR Assembler for ATMEL AVR-Processors";
     license = licenses.unfree;
diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
index b300a190e1c..943ddd100a2 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
index 7d8a4b5b14d..266863d95b2 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
index 633ae054d05..4f2135446f6 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
index 99ec9d1b549..2d85113527c 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
index c4c1ebc1d8a..944d7c7b159 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , ncurses5
 , python27
@@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
     find $out -type f | while read f; do
       patchelf "$f" > /dev/null 2>&1 || continue
       patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
     homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
     license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix
index c31e7c426e0..cbc4e0e09e9 100644
--- a/pkgs/development/compilers/gcc/10/default.nix
+++ b/pkgs/development/compilers/gcc/10/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langAda ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
@@ -48,7 +48,7 @@ assert langAda -> gnatboot != null;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "10";
@@ -90,7 +90,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
+  outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
@@ -100,7 +100,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+  prePatch = lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -134,13 +134,13 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
     else "")
-      + stdenv.lib.optionalString targetPlatform.isAvr ''
+      + lib.optionalString targetPlatform.isAvr ''
             makeFlagsArray+=(
                'LIMITS_H_TEST=false'
             )
@@ -177,20 +177,21 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform gnatboot langAda langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -262,7 +263,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -275,13 +276,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ synthetica ];
+    maintainers = with lib.maintainers; [ synthetica ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 3d2c754c6a2..69fdeefe87a 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
 , langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -58,7 +58,7 @@ assert langGo -> langCC;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "4";
@@ -190,17 +190,18 @@ stdenv.mkDerivation ({
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform langJava langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -289,7 +290,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -302,13 +303,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ peti veprbl ];
+    maintainers = with lib.maintainers; [ peti veprbl ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
     badPlatforms = [ "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index b3192e44cfe..4c0a144f14d 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
 , langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -58,7 +58,7 @@ assert langGo -> langCC;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "4";
@@ -203,17 +203,18 @@ stdenv.mkDerivation ({
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform langJava langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -301,7 +302,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -314,13 +315,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ peti veprbl ];
+    maintainers = with lib.maintainers; [ peti veprbl ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
     badPlatforms = [ "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 908f7e0f699..7d4cc2a3ea1 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langAda ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
@@ -61,7 +61,7 @@ assert langAda -> gnatboot != null;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "6";
@@ -148,7 +148,7 @@ stdenv.mkDerivation ({
   prePatch =
     # This should kill all the stdinc frameworks that gcc and friends like to
     # insert into default search paths.
-    stdenv.lib.optionalString hostPlatform.isDarwin ''
+    lib.optionalString hostPlatform.isDarwin ''
       substituteInPlace gcc/config/darwin-c.c \
         --replace 'if (stdinc)' 'if (0)'
 
@@ -177,7 +177,7 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
@@ -219,20 +219,21 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform gnatboot langJava langAda langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -320,7 +321,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -333,13 +334,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ peti ];
+    maintainers = with lib.maintainers; [ peti ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index d950d6ac35b..051307e4842 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
 , langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -45,7 +45,7 @@ assert langGo -> langCC;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "7";
@@ -97,7 +97,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
+  outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
@@ -107,7 +107,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+  prePatch = lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -141,13 +141,13 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
     else "")
-      + stdenv.lib.optionalString targetPlatform.isAvr ''
+      + lib.optionalString targetPlatform.isAvr ''
         makeFlagsArray+=(
            'LIMITS_H_TEST=false'
         )
@@ -183,21 +183,22 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -272,7 +273,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -285,13 +286,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 683a9edfe09..6a072267019 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
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
 , langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -45,7 +45,7 @@ assert langGo -> langCC;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "8";
@@ -87,7 +87,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
+  outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
@@ -97,7 +97,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+  prePatch = lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -131,13 +131,13 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
     else "")
-      + stdenv.lib.optionalString targetPlatform.isAvr ''
+      + lib.optionalString targetPlatform.isAvr ''
             makeFlagsArray+=(
                'LIMITS_H_TEST=false'
             )
@@ -173,20 +173,21 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform langGo;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -257,7 +258,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -270,13 +271,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ synthetica ];
+    maintainers = with lib.maintainers; [ synthetica ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 7827cb98505..ea5172184cc 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langAda ? false
 , langObjC ? stdenv.targetPlatform.isDarwin
@@ -54,7 +54,7 @@ assert langAda -> gnatboot != null;
 # threadsCross is just for MinGW
 assert threadsCross != null -> stdenv.targetPlatform.isWindows;
 
-with stdenv.lib;
+with lib;
 with builtins;
 
 let majorVersion = "9";
@@ -103,7 +103,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
+  outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
@@ -113,7 +113,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+  prePatch = lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -147,13 +147,13 @@ stdenv.mkDerivation ({
                  -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
            done
         ''
-        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        + lib.optionalString (targetPlatform.libc == "musl")
         ''
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
     else "")
-      + stdenv.lib.optionalString targetPlatform.isAvr ''
+      + lib.optionalString targetPlatform.isAvr ''
           makeFlagsArray+=(
              'LIMITS_H_TEST=false'
           )
@@ -190,20 +190,21 @@ stdenv.mkDerivation ({
 
   depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = import ../common/pre-configure.nix {
-    inherit (stdenv) lib;
+    inherit lib;
     inherit version hostPlatform gnatboot langAda langGo langJit;
   };
 
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = import ../common/configure-flags.nix {
     inherit
+      lib
       stdenv
       targetPackages
       crossStageStatic libcCross
@@ -276,7 +277,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "https://gcc.gnu.org/";
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    license = lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
     description = "GNU Compiler Collection, version ${version}"
       + (if stripped then "" else " (with debugging info)");
 
@@ -289,13 +290,13 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ synthetica ];
+    maintainers = with lib.maintainers; [ synthetica ];
 
     platforms =
-      stdenv.lib.platforms.linux ++
-      stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      lib.platforms.linux ++
+      lib.platforms.freebsd ++
+      lib.platforms.illumos ++
+      lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 12d3f5d8987..3f1866713e6 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , targetPackages
 
 , crossStageStatic, libcCross
@@ -24,8 +24,8 @@
 , langJit
 }:
 
-assert cloog != null -> stdenv.lib.versionOlder version "5";
-assert langJava -> stdenv.lib.versionOlder version "7";
+assert cloog != null -> lib.versionOlder version "5";
+assert langJava -> lib.versionOlder version "7";
 
 # Note [Windows Exception Handling]
 # sjlj (short jump long jump) exception handling makes no sense on x86_64,
@@ -171,7 +171,7 @@ let
     ++ lib.optional javaAwtGtk "--enable-java-awt=gtk"
     ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
 
-    ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; })
+    ++ (import ../common/platform-flags.nix { inherit (stdenv)  targetPlatform; inherit lib; })
     ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags
     ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap"
 
diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix
index 0a5a7a1bc1c..6ced56cedc0 100644
--- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix
+++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix
@@ -11,7 +11,7 @@ in
   EXTRA_FLAGS_FOR_TARGET = let
       mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([
         "-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}"
-      ] ++ stdenv.lib.optionals (! crossStageStatic) [
+      ] ++ lib.optionals (! crossStageStatic) [
         "-B${lib.getLib dep}${dep.libdir or "/lib"}"
       ]);
     in mkFlags libcCross langD
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index f4f63bc9b19..50efbe5d3c5 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, emacs, zlib, which
+{ lib, stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which
 , texinfo, libX11, xorgproto, libXi, gmp, readline, strace
 , libXext, libXt, libXaw, libXmu } :
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "GNU Common Lisp compiler working via GCC";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index a8a1bf9fc1b..6d0471dacbb 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which
+{ lib, stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which
 , texinfo, libX11, xorgproto, libXi, gmp
 , libXext, libXt, libXaw, libXmu } :
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-fgnu89-inline";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNU Common Lisp compiler working via GCC";
     maintainers = [ maintainers.raskin ];
     license = licenses.gpl2;
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
index d2a2a7a85e3..bdf172cb9b9 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4 }:
+{ lib, stdenv, fetchurl, m4 }:
 
 let
   version = "0.7.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ m4 ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];
+  configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The Forth implementation of the GNU project";
     homepage = "https://www.gnu.org/software/gforth/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
index ce963e1c275..661dd5cb002 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -69,32 +69,32 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -128,7 +128,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -138,13 +138,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK dontStrip}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -164,29 +164,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -207,18 +207,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -228,7 +228,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -245,14 +245,14 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix
index 1a1a9ca0160..02373d00b10 100644
--- a/pkgs/development/compilers/ghc/8.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl, perl, gcc
 , ncurses6, gmp, glibc, libiconv, numactl
 , llvmPackages
@@ -16,12 +16,12 @@ assert stdenv.targetPlatform == stdenv.hostPlatform;
 let
   useLLVM = !stdenv.targetPlatform.isx86;
 
-  libPath = stdenv.lib.makeLibraryPath ([
+  libPath = lib.makeLibraryPath ([
     ncurses6 gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isAarch64) numactl);
+  ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv
+    ++ lib.optional (stdenv.hostPlatform.isAarch64) numactl);
 
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY"
     + "LD_LIBRARY_PATH";
 
   glibcDynLinker = assert stdenv.isLinux;
@@ -29,7 +29,7 @@ let
        # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
        ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
     else
-      "${stdenv.lib.getLib glibc}/lib/ld-linux*";
+      "${lib.getLib glibc}/lib/ld-linux*";
 
 in
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
+  propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
   postUnpack =
     # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
     # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       export NIX_LDFLAGS+=" -no_dtrace_dof"
       # not enough room in the object files for the full path to libiconv :(
       for exe in $(find . -type f -executable); do
@@ -92,20 +92,20 @@ stdenv.mkDerivation rec {
     ''
       find . -name integer-gmp.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
     '' +
     # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
     # FFI_LIB_DIR is a good indication of places it must be needed.
-    stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    lib.optionalString stdenv.hostPlatform.isAarch64 ''
       find . -name package.conf.in \
           -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
     '' +
     # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 -exec patchelf \
-          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \
+          --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \
           --interpreter ${glibcDynLinker} {} \;
 
       sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
@@ -117,21 +117,21 @@ stdenv.mkDerivation rec {
     # (`__strdup` is defined to be an alias of `strdup` anyway[1]).
     # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
     # Use objcopy magic to make the change:
-    stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    lib.optionalString stdenv.hostPlatform.isMusl ''
       find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
     '';
 
   # fix for `configure: error: Your linker is affected by binutils #16177`
-  preConfigure = stdenv.lib.optionalString
+  preConfigure = lib.optionalString
     stdenv.targetPlatform.isAarch32
     "LD=ld.gold";
 
   configurePlatforms = [ ];
   configureFlags = [
-    "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+    "--with-gmp-libraries=${lib.getLib gmp}/lib"
+    "--with-gmp-includes=${lib.getDev gmp}/include"
+  ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
 
   # On Linux, use patchelf to modify the executables so that they can
   # find editline/gmp.
-  postFixup = stdenv.lib.optionalString stdenv.isLinux
+  postFixup = lib.optionalString stdenv.isLinux
     (if stdenv.hostPlatform.isAarch64 then
       # Keep rpath as small as possible on aarch64 for patchelf#244.  All Elfs
       # are 2 directories deep from $out/lib, so pooling symlinks there makes
@@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
           patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
         fi
       done
-    '') + stdenv.lib.optionalString stdenv.isDarwin ''
+    '') + lib.optionalString stdenv.isDarwin ''
     # not enough room in the object files for the full path to libiconv :(
     for exe in $(find "$out" -type f -executable); do
       isScript $exe && continue
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
       substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
     done
   '' +
-  stdenv.lib.optionalString minimal ''
+  lib.optionalString minimal ''
     # Remove profiling files
     find $out -type f -name '*.p_o' -delete
     find $out -type f -name '*.p_hi' -delete
@@ -215,8 +215,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
-    maintainers = with stdenv.lib.maintainers; [ lostnet ];
+    maintainers = with lib.maintainers; [ lostnet ];
   };
 }
diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix
index fac12099d5d..6e194b68faa 100644
--- a/pkgs/development/compilers/ghc/8.10.2.nix
+++ b/pkgs/development/compilers/ghc/8.10.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -62,30 +62,30 @@ let
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
     INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -110,7 +110,7 @@ stdenv.mkDerivation (rec {
   # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
   patches = [
     ./issue-18549.patch
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     # Make Block.h compile with c++ compilers. Remove with the next release
     (fetchpatch {
       url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
@@ -130,7 +130,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -140,13 +140,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -166,29 +166,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -209,18 +209,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -230,7 +230,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -247,12 +247,12 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
   dontStrip = true;
   dontPatchELF = true;
   noAuditTmpdir = true;
diff --git a/pkgs/development/compilers/ghc/8.10.3.nix b/pkgs/development/compilers/ghc/8.10.3.nix
index c24b72fb43b..582817cca07 100644
--- a/pkgs/development/compilers/ghc/8.10.3.nix
+++ b/pkgs/development/compilers/ghc/8.10.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -62,30 +62,30 @@ let
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
     INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -107,7 +107,7 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "doc" ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     # Make Block.h compile with c++ compilers. Remove with the next release
     (fetchpatch {
       url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
@@ -127,7 +127,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -137,13 +137,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -163,29 +163,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -206,18 +206,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -227,7 +227,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -244,12 +244,12 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
   dontStrip = true;
   dontPatchELF = true;
   noAuditTmpdir = true;
diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix
index 9f546bcb541..5f83c2b2afc 100644
--- a/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll
+{ lib, stdenv, substituteAll
 , fetchurl, perl, gcc, llvm
 , ncurses5, gmp, glibc, libiconv
 , llvmPackages
@@ -10,11 +10,11 @@ assert stdenv.targetPlatform == stdenv.hostPlatform;
 let
   useLLVM = !stdenv.targetPlatform.isx86;
 
-  libPath = stdenv.lib.makeLibraryPath ([
+  libPath = lib.makeLibraryPath ([
     ncurses5 gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
+  ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
 
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY"
     + "LD_LIBRARY_PATH";
 
   glibcDynLinker = assert stdenv.isLinux;
@@ -22,7 +22,7 @@ let
        # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
        ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
     else
-      "${stdenv.lib.getLib glibc}/lib/ld-linux*";
+      "${lib.getLib glibc}/lib/ld-linux*";
 
 in
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
+  propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   postUnpack =
     # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
     # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       export NIX_LDFLAGS+=" -no_dtrace_dof"
       # not enough room in the object files for the full path to libiconv :(
       for exe in $(find . -type f -executable); do
@@ -97,14 +97,14 @@ stdenv.mkDerivation rec {
     ''
       find . -name integer-gmp.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
     '' +
     # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 -exec patchelf \
-          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
+          --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
           --replace-needed libtinfo.so libtinfo.so.5 \
           --interpreter ${glibcDynLinker} {} \;
 
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
     # (`__strdup` is defined to be an alias of `strdup` anyway[1]).
     # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
     # Use objcopy magic to make the change:
-    stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    lib.optionalString stdenv.hostPlatform.isMusl ''
       find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
     '';
 
@@ -130,10 +130,10 @@ stdenv.mkDerivation rec {
       src = ./gcc-clang-wrapper.sh;
     };
   in
-  [ "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin            "--with-gcc=${gcc-clang-wrapper}"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+  [ "--with-gmp-libraries=${lib.getLib gmp}/lib"
+    "--with-gmp-includes=${lib.getDev gmp}/include"
+  ] ++ lib.optional stdenv.isDarwin            "--with-gcc=${gcc-clang-wrapper}"
+    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # Stripping combined with patchelf breaks the executables (they die
   # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
@@ -145,14 +145,14 @@ stdenv.mkDerivation rec {
 
   # On Linux, use patchelf to modify the executables so that they can
   # find editline/gmp.
-  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  preFixup = lib.optionalString stdenv.isLinux ''
     for p in $(find "$out" -type f -executable); do
       if isELF "$p"; then
         echo "Patchelfing $p"
         patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
       fi
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # not enough room in the object files for the full path to libiconv :(
     for exe in $(find "$out" -type f -executable); do
       isScript $exe && continue
@@ -186,6 +186,6 @@ stdenv.mkDerivation rec {
     enableShared = true;
   };
 
-  meta.license = stdenv.lib.licenses.bsd3;
+  meta.license = lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix
index 9234e3b1457..ca984c36957 100644
--- a/pkgs/development/compilers/ghc/8.6.5-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl, perl, gcc
 , ncurses5, ncurses6, gmp, glibc, libiconv
 , llvmPackages
@@ -14,11 +14,11 @@ let
 
   ourNcurses = if useNcurses6 then ncurses6 else ncurses5;
 
-  libPath = stdenv.lib.makeLibraryPath ([
+  libPath = lib.makeLibraryPath ([
     ourNcurses gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
+  ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
 
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY"
     + "LD_LIBRARY_PATH";
 
   glibcDynLinker = assert stdenv.isLinux;
@@ -26,7 +26,7 @@ let
        # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
        ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
     else
-      "${stdenv.lib.getLib glibc}/lib/ld-linux*";
+      "${lib.getLib glibc}/lib/ld-linux*";
 
 in
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
+  propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   postUnpack =
     # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
     # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
+    lib.optionalString stdenv.isDarwin ''
       export NIX_LDFLAGS+=" -no_dtrace_dof"
       # not enough room in the object files for the full path to libiconv :(
       for exe in $(find . -type f -executable); do
@@ -90,17 +90,17 @@ stdenv.mkDerivation rec {
     ''
       find . -name integer-gmp.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
     '' +
     # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 \
           -exec patchelf \
-          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
+          --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
           ${ # This isn't required for x86_64-linux where we use ncurses6
-             stdenv.lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5"
+             lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5"
            } \
           --interpreter ${glibcDynLinker} {} \;
 
@@ -113,16 +113,16 @@ stdenv.mkDerivation rec {
     # (`__strdup` is defined to be an alias of `strdup` anyway[1]).
     # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html
     # Use objcopy magic to make the change:
-    stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    lib.optionalString stdenv.hostPlatform.isMusl ''
       find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \;
     '';
 
   configurePlatforms = [ ];
   configureFlags = [
-    "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+    "--with-gmp-libraries=${lib.getLib gmp}/lib"
+    "--with-gmp-includes=${lib.getDev gmp}/include"
+  ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
@@ -130,14 +130,14 @@ stdenv.mkDerivation rec {
 
   # On Linux, use patchelf to modify the executables so that they can
   # find editline/gmp.
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     for p in $(find "$out" -type f -executable); do
       if isELF "$p"; then
         echo "Patchelfing $p"
         patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
       fi
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # not enough room in the object files for the full path to libiconv :(
     for exe in $(find "$out" -type f -executable); do
       isScript $exe && continue
@@ -171,6 +171,6 @@ stdenv.mkDerivation rec {
     enableShared = true;
   };
 
-  meta.license = stdenv.lib.licenses.bsd3;
+  meta.license = lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
 }
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index 7adacff597c..219ace5a916 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -32,7 +32,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -48,7 +48,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -66,28 +66,28 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -136,7 +136,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -146,13 +146,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -172,23 +172,23 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -209,14 +209,14 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   # See #63511 - the only unstripped file is the debug rts which isn't meant to
   # be stripped.
@@ -224,7 +224,7 @@ stdenv.mkDerivation (rec {
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -234,11 +234,11 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   ''
   # Temporary work-around for https://github.com/NixOS/nixpkgs/issues/66277
-  + stdenv.lib.optionalString hostPlatform.isAarch64 ''
+  + lib.optionalString hostPlatform.isAarch64 ''
     rm -rf "$doc/share/doc/ghc/html/libraries"
   '';
 
@@ -255,12 +255,12 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
   dontStrip = true;
   dontPatchELF = true;
   noAuditTmpdir = true;
diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix
index 8663f16f023..94553e56a81 100644
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/pkgs/development/compilers/ghc/8.8.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -32,7 +32,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -48,7 +48,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -66,30 +66,30 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -123,7 +123,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -133,13 +133,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK dontStrip}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -159,29 +159,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -202,18 +202,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -223,7 +223,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -240,14 +240,14 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix
index deb19bb87b5..ca4dc35ccdc 100644
--- a/pkgs/development/compilers/ghc/8.8.3.nix
+++ b/pkgs/development/compilers/ghc/8.8.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -69,32 +69,32 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -128,7 +128,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -138,13 +138,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK dontStrip}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -164,29 +164,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -207,18 +207,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -228,7 +228,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -245,14 +245,14 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix
index c1b39a70e38..ab5f2c12e23 100644
--- a/pkgs/development/compilers/ghc/8.8.4.nix
+++ b/pkgs/development/compilers/ghc/8.8.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -18,7 +18,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -35,7 +35,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -51,7 +51,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -69,32 +69,32 @@ let
     # to actually link to our new Libc. The iOS simulator is a special
     # exception because we can’t actually run simulators binaries
     # ourselves.
-  + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -119,7 +119,7 @@ stdenv.mkDerivation (rec {
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.
-  preConfigure = stdenv.lib.optionalString stdenv.isAarch64 ''
+  preConfigure = lib.optionalString stdenv.isAarch64 ''
     # Aarch64 allow backward bootstrapping since earlier versions are unstable.
     find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \
       -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \;
@@ -132,7 +132,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -142,13 +142,13 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK dontStrip}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -168,29 +168,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -211,18 +211,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -232,7 +232,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -249,14 +249,14 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix
index d86cce9849c..39abe9c760e 100644
--- a/pkgs/development/compilers/ghc/9.0.1.nix
+++ b/pkgs/development/compilers/ghc/9.0.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -19,7 +19,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+  enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -36,7 +36,7 @@
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -52,7 +52,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -63,30 +63,30 @@ let
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
     INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ lib.optional (!enableIntegerSimple) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -123,7 +123,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -133,15 +133,15 @@ stdenv.mkDerivation (rec {
 
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (stdenv.isLinux) ''
+  '' + lib.optionalString (stdenv.isLinux) ''
     export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -161,29 +161,29 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+  ] ++ lib.optionals (disableLargeAddressSpace) [
     "--disable-large-address-space"
   ];
 
@@ -204,18 +204,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -225,7 +225,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -242,12 +242,12 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
   dontStrip = true;
   dontPatchELF = true;
   noAuditTmpdir = true;
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index c203f5cf19c..3ba88763117 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildTarget, targetPackages
+{ lib, stdenv, pkgsBuildTarget, targetPackages
 
 # build-tools
 , bootPkgs
@@ -22,7 +22,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slightly slower native
   # bignum backend instead of the faster but GPLed gmp backend.
-  enableNativeBignum ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms)
+  enableNativeBignum ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms)
 , gmp
 
 , # If enabled, use -fPIC when compiling static libs.
@@ -41,7 +41,7 @@
 , version ? "8.11.20200824"
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
     (if useLLVM then "perf-cross" else "perf-cross-ncg")
 
 , # Whether to disable the large address space allocator
@@ -57,7 +57,7 @@ let
   inherit (bootPkgs) ghc;
 
   # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
+  targetPrefix = lib.optionalString
     (targetPlatform != hostPlatform)
     "${targetPlatform.config}-";
 
@@ -68,33 +68,33 @@ let
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
     BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+  '' + lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString dontStrip ''
+  '' + lib.optionalString dontStrip ''
     STRIP_CMD = :
-  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+  '' + lib.optionalString (!enableProfiledLibs) ''
     GhcLibWays = "v dyn"
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+  '' + lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+  libDeps = platform: lib.optional enableTerminfo ncurses
     ++ [libffi]
-    ++ stdenv.lib.optional (!enableNativeBignum) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
-    ++ stdenv.lib.optional enableDwarf elfutils;
+    ++ lib.optional (!enableNativeBignum) gmp
+    ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
+    ++ lib.optional enableDwarf elfutils;
 
   toolsForTarget = [
     pkgsBuildTarget.targetPackages.stdenv.cc
-  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+  ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
 
   targetCC = builtins.head toolsForTarget;
 
@@ -131,7 +131,7 @@ stdenv.mkDerivation (rec {
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
     # and more generally have a faster linker.
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -144,13 +144,13 @@ stdenv.mkDerivation (rec {
     echo ${src.rev} > GIT_COMMIT_ID
     ./boot
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+  '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+  '' + lib.optionalString targetPlatform.isMusl ''
       echo "patching llvm-targets for musl targets..."
       echo "Cloning these existing '*-linux-gnu*' targets:"
       grep linux-gnu llvm-targets | sed 's/^/  /'
@@ -170,33 +170,33 @@ stdenv.mkDerivation (rec {
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+    ++ lib.optional (targetPlatform != hostPlatform) "target";
 
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) [
+  ] ++ lib.optionals (libffi != null) [
     "--with-system-libffi"
     "--with-ffi-includes=${targetPackages.libffi.dev}/include"
     "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
     "--with-gmp-includes=${targetPackages.gmp.dev}/include"
     "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include"
     "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+  ] ++ lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals useLdGold [
+  ] ++ lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optional disableLargeAddressSpace "--disable-large-address-space"
-    ++ stdenv.lib.optionals enableDwarf [
+  ] ++ lib.optional disableLargeAddressSpace "--disable-large-address-space"
+    ++ lib.optionals enableDwarf [
     "--enable-dwarf-unwind"
-    "--with-libdw-includes=${stdenv.lib.getDev elfutils}/include"
-    "--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib"
+    "--with-libdw-includes=${lib.getDev elfutils}/include"
+    "--with-libdw-libraries=${lib.getLib elfutils}/lib"
   ];
 
   # Make sure we never relax`$PATH` and hooks support for compatibility.
@@ -216,18 +216,18 @@ stdenv.mkDerivation (rec {
   buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+    ++ lib.optional useLLVM llvmPackages.llvm;
 
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+  depsTargetTarget = map lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+  stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
 
-  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+  hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie";
 
   postInstall = ''
     # Install the bash completion file.
@@ -237,7 +237,7 @@ stdenv.mkDerivation (rec {
     for i in "$out/bin/"*; do
       test ! -h $i || continue
       egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+      sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
     done
   '';
 
@@ -254,13 +254,13 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    maintainers = with lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
 
   dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
 
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
+} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
   dontPatchELF = true;
   noAuditTmpdir = true;
 })
diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
index b957a6aa9e1..88630f996a9 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
+++ b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
@@ -55,7 +55,7 @@
         websockets yaml
       ];
       description = "Haskell to JavaScript compiler";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
     }) {};
 
   ghc-api-ghcjs = callPackage
@@ -76,7 +76,7 @@
       libraryToolDepends = [ alex happy ];
       homepage = "http://www.haskell.org/ghc/";
       description = "The GHC API (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
   ghci-ghcjs = callPackage
@@ -93,7 +93,7 @@
         ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix
       ];
       description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
   ghcjs-th = callPackage
@@ -109,7 +109,7 @@
         template-haskell-ghcjs
       ];
       homepage = "http://github.com/ghcjs";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
     }) {};
 
   haddock-api-ghcjs = callPackage
@@ -136,7 +136,7 @@
       testToolDepends = [ hspec-discover ];
       homepage = "http://www.haskell.org/haddock/";
       description = "A documentation-generation tool for Haskell libraries";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
   haddock-library-ghcjs = callPackage
@@ -160,7 +160,7 @@
       testToolDepends = [ hspec-discover ];
       homepage = "http://www.haskell.org/haddock/";
       description = "Library exposing some functionality of Haddock";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
   template-haskell-ghcjs = callPackage
@@ -171,7 +171,7 @@
       src = configuredSrc + /lib/template-haskell-ghcjs;
       libraryHaskellDepends = [ base ghc-boot-th pretty ];
       description = "Support library for Template Haskell (customized for GHCJS)";
-      license = stdenv.lib.licenses.bsd3;
+      license = lib.licenses.bsd3;
     }) {};
 
 }
diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
index 7c10ce6572f..82c37bd8617 100644
--- a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
+++ b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
@@ -25,5 +25,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/ghcjs/ghcjs-base";
   description = "base library for GHCJS";
-  license = stdenv.lib.licenses.mit;
+  license = lib.licenses.mit;
 }
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index b2529986f6e..b9c7e7e1e3d 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
@@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ] ++
-    stdenv.lib.optionals stdenv.isDarwin [ Security ];
+    lib.optionals stdenv.isDarwin [ Security ];
 
   cargoSha256 = "sha256-/l54ezS68loljKNh7AdYMIuCiyIbsMI3jqD9ktjZLfc=";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A statically typed language for the Erlang VM";
     homepage = "https://gleam.run/";
     license = licenses.asl20;
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 3fb9e107356..0cfb2502a0d 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , bison
 , cmake
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Khronos reference front-end for GLSL and ESSL";
     license = licenses.asl20;
diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix
index cb643d6123a..d97298d0238 100644
--- a/pkgs/development/compilers/gnatboot/default.nix
+++ b/pkgs/development/compilers/gnatboot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "gentoo-gnatboot";
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     langAda = true;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gentoo.org";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.lucus16 ];
diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix
index 146af98093d..e208f262ebe 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchurl, gcc, makeWrapper
+{ lib, stdenv, fetchurl, gcc, makeWrapper
 , db, gmp, ncurses }:
 
 let
   version = "2.2";
-  lib = stdenv.lib;
 in
 stdenv.mkDerivation rec {
   pname = "gnu-cobol";
@@ -18,19 +17,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ db gmp ncurses ];
 
-  cflags  = stdenv.lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs;
-  ldflags = stdenv.lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs;
+  cflags  = lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs;
+  ldflags = lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs;
 
   cobolCCFlags = "-I$out/include ${ldflags} -L$out/lib ${cflags}";
 
-  postInstall = with stdenv.lib; ''
+  postInstall = with lib; ''
     wrapProgram "$out/bin/cobc" \
       --set COB_CC "${gcc}/bin/gcc" \
       --prefix COB_LDFLAGS " " "${cobolCCFlags}" \
       --prefix COB_CFLAGS " " "${cobolCCFlags}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open-source COBOL compiler";
     homepage = "https://sourceforge.net/projects/open-cobol/";
     license = licenses.gpl3;
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index e06c16058d1..cd33baad993 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, pkg-config, libtool
+{ config, lib, stdenv, fetchurl, pkg-config, libtool
 , zip, libffi, libsigsegv, readline, gmp
 , gnutls, gnome2, cairo, SDL, sqlite
 , emacsSupport ? config.emacsSupport or false, emacs ? null }:
@@ -11,7 +11,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library.
     # Adding --enable-static=libsigsegv to the gnu-smalltalk configuration flags
     # does not help, the error still occurs. The only solution is to build a
     # shared version of libsigsegv.
-    libsigsegv-shared = stdenv.lib.overrideDerivation libsigsegv (oldAttrs: {
+    libsigsegv-shared = lib.overrideDerivation libsigsegv (oldAttrs: {
       configureFlags = [ "--enable-shared" ];
     });
 
@@ -32,19 +32,19 @@ in stdenv.mkDerivation rec {
     libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
     cairo SDL sqlite
   ]
-  ++ stdenv.lib.optional emacsSupport emacs;
+  ++ lib.optional emacsSupport emacs;
 
-  configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs";
+  configureFlags = lib.optional (!emacsSupport) "--without-emacs";
 
   hardeningDisable = [ "format" ];
 
-  installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
+  installFlags = lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
 
   # For some reason the tests fail if executated with nix-build, but pass if
   # executed within nix-shell --pure.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free implementation of the Smalltalk-80 language";
     longDescription = ''
       GNU Smalltalk is a free implementation of the Smalltalk-80 language. It
diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix
index 4c5a276ec84..0811e4bc701 100644
--- a/pkgs/development/compilers/go/1.14.nix
+++ b/pkgs/development/compilers/go/1.14.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tzdata, iana-etc, runCommand
+{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand
 , perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
 , mailcap, runtimeShell
 , buildPackages
@@ -8,7 +8,7 @@
 
 let
 
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (lib) optionals optionalString;
 
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
     else
       null;
 
-  GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+  GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
   # Hopefully avoids test timeouts on Hydra
@@ -246,7 +246,7 @@ stdenv.mkDerivation rec {
 
   disallowedReferences = [ goBootstrap ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://golang.org/";
     description = "The Go Programming language";
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index 65e75ba6907..61ab1b02032 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tzdata, iana-etc, runCommand
+{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand
 , perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
 , mailcap, runtimeShell
 , buildPackages
@@ -8,7 +8,7 @@
 
 let
 
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (lib) optionals optionalString;
 
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
@@ -182,7 +182,7 @@ stdenv.mkDerivation rec {
     else
       null;
 
-  GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+  GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
   # Hopefully avoids test timeouts on Hydra
@@ -249,7 +249,7 @@ stdenv.mkDerivation rec {
 
   disallowedReferences = [ goBootstrap ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://golang.org/";
     description = "The Go Programming language";
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 032a8933db9..ec3fd97da9b 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
            else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
            else if stdenv.isAarch32 then "arm"
            else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
+  GOARM = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 0;
 
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     ./all.bash
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://golang.org/";
     description = "The Go Programming language";
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix
index c43b4d0175a..3e09f7c0fad 100644
--- a/pkgs/development/compilers/go/2-dev.nix
+++ b/pkgs/development/compilers/go/2-dev.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand
+{ pkgs, lib, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand
 , perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
 , mailcap, runtimeShell
 , buildPackages
@@ -8,7 +8,7 @@
 
 let
 
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (lib) optionals optionalString;
 
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
@@ -184,7 +184,7 @@ stdenv.mkDerivation rec {
     else
       null;
 
-  GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+  GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
   # Hopefully avoids test timeouts on Hydra
@@ -251,7 +251,7 @@ stdenv.mkDerivation rec {
 
   disallowedReferences = [ goBootstrap ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://golang.org/";
     description = "The Go Programming language";
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index 0a1cc512873..59f33db68cb 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "gprolog-1.4.5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z";
   };
 
-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
+  hardeningDisable = lib.optional stdenv.isi686 "pic";
 
   patchPhase = ''
     sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/gprolog/";
     description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
-    license = stdenv.lib.licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
 
     longDescription = ''
       GNU Prolog is a free Prolog compiler with constraint solving
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
       declarativity of logic programming.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.peti ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.peti ];
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix
index 71f3b1560c6..76245a44081 100644
--- a/pkgs/development/compilers/graalvm/community-edition.nix
+++ b/pkgs/development/compilers/graalvm/community-edition.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }:
+{ lib, stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }:
 
 let
   common = javaVersion:
@@ -111,7 +111,7 @@ let
                       "11" = "$out/lib/jli:$out/lib/server:$out/lib";
                     }.${javaVersion}
                  }:${
-            stdenv.lib.makeLibraryPath [
+            lib.makeLibraryPath [
               stdenv.cc.cc.lib # libstdc++.so.6
               zlib             # libz.so.1
             ]}"
@@ -128,7 +128,7 @@ let
 
         doInstallCheck = true;
         installCheckPhase = ''
-          echo ${stdenv.lib.escapeShellArg ''
+          echo ${lib.escapeShellArg ''
                    public class HelloWorld {
                      public static void main(String[] args) {
                        System.out.println("Hello World");
@@ -151,7 +151,7 @@ let
 
         passthru.home = graalvmXXX-ce;
 
-        meta = with stdenv.lib; {
+        meta = with lib; {
           homepage = "https://www.graalvm.org/";
           description = "High-Performance Polyglot VM";
           license = with licenses; [ upl gpl2Classpath bsd3 ];
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 337e0f735eb..fc30e37e4b7 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -270,7 +270,7 @@ in rec {
         --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
         --set    FINDBUGS_HOME ${findbugs}
     '';
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://github.com/graalvm/mx";
       description = "Command-line tool used for the development of Graal projects";
       license = licenses.gpl2;
@@ -527,7 +527,7 @@ in rec {
     enableParallelBuilding = true;
     passthru.home = graalvm8;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://github.com/oracle/graal";
       description = "High-Performance Polyglot VM";
       license = licenses.gpl2;
diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
index 690bfdb425c..c9c5206f6da 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
+{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
 
 let
   common = javaVersion:
@@ -124,7 +124,7 @@ let
                       "11" = "$out/lib/jli:$out/lib/server:$out/lib";
                     }.${javaVersion}
                  }:${
-            stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
+            lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
                                                  glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
 
           for f in $(find $out -type f -perm -0100); do
@@ -141,7 +141,7 @@ let
 
         doInstallCheck = true;
         installCheckPhase = ''
-          echo ${stdenv.lib.escapeShellArg ''
+          echo ${lib.escapeShellArg ''
                    public class HelloWorld {
                      public static void main(String[] args) {
                        System.out.println("Hello World");
@@ -167,7 +167,7 @@ let
 
         passthru.home = graalvmXXX-ee;
 
-        meta = with stdenv.lib; {
+        meta = with lib; {
           homepage = "https://www.graalvm.org/";
           description = "High-Performance Polyglot VM";
           license = licenses.unfree;
diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix
index 14bf940fadf..e10d1012034 100644
--- a/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/pkgs/development/compilers/gwt/2.4.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "gwt-java-2.4.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.gwtproject.org/";
     description = "A development toolkit for building and optimizing complex browser-based applications";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index a3110c0c1af..58451192396 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }:
+{ lib, stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }:
 
 let inherit (ocamlPackages) ocaml camlp4; in
 
@@ -74,7 +74,7 @@ let
         popd > /dev/null
       '';
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
         homepage = "https://haxe.org";
         license = with licenses; [ gpl2 bsd2 /*?*/ ];  # -> docs/license.txt
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index c06e94a038f..d8495977e78 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached
+{ lib, stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached
 , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     homepage    = "https://hhvm.com";
     license     = "PHP/Zend";
     platforms   = [ "x86_64-linux" ];
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    maintainers = [ lib.maintainers.thoughtpolice ];
     broken = true; # Since 2018-04-21, see https://hydra.nixos.org/build/73059373
   };
 }
diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix
index fd3ef137ae6..8e5bd6a7df0 100644
--- a/pkgs/development/compilers/hop/default.nix
+++ b/pkgs/development/compilers/hop/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, bigloo }:
+{ lib, stdenv, fetchurl, bigloo }:
 
 # Compute the “release” version of bigloo (before the first dash, if any)
 let bigloo-release =
-  let inherit (stdenv.lib) head splitString; in
+  let inherit (lib) head splitString; in
   head (splitString "-" (builtins.parseDrvName bigloo.name).version)
 ; in
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multi-tier programming language for the Web 2.0 and the so-called diffuse Web";
     homepage = "http://hop.inria.fr/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index d68fba1d624..fb6bd41344a 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch, bison, flex}:
+{lib, stdenv, fetchurl, fetchpatch, bison, flex}:
 
 stdenv.mkDerivation rec {
   pname = "iasl";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Intel ACPI Compiler";
     homepage = "http://www.acpica.org/";
-    license = stdenv.lib.licenses.iasl;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.iasl;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix
index dc124f56f6e..ec0d8fe5c72 100644
--- a/pkgs/development/compilers/idris2/default.nix
+++ b/pkgs/development/compilers/idris2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , clang, chez
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "OS=";
+    ++ lib.optional stdenv.isDarwin "OS=";
 
   # The name of the main executable of pkgs.chez is `scheme`
   buildFlags = [ "bootstrap-build" "SCHEME=scheme" ];
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A purely functional programming language with first class types";
     homepage = "https://github.com/idris-lang/Idris2";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ wchresta ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ wchresta ];
     inherit (chez.meta) platforms;
   };
 }
diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix
index 1d339a2b14b..f0c182f0207 100644
--- a/pkgs/development/compilers/inform6/default.nix
+++ b/pkgs/development/compilers/inform6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "inform6";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interactive fiction compiler and libraries";
     longDescription = ''
       Inform 6 is a C-like programming language for writing interactive fiction
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/DavidGriffith/inform6unix";
     changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${version}/NEWS";
     license = licenses.artistic2;
-    maintainers = with stdenv.lib.maintainers; [ ddelabru ];
+    maintainers = with lib.maintainers; [ ddelabru ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix
index 8e5f02e792d..80349b7e6da 100644
--- a/pkgs/development/compilers/inform7/default.nix
+++ b/pkgs/development/compilers/inform7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, coreutils, perl, gnutar, gzip }:
+{ lib, stdenv, fetchzip, coreutils, perl, gnutar, gzip }:
 let
   version = "6M62";
 in stdenv.mkDerivation {
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
       --replace "/usr/bin/perl" "${perl}/bin/perl"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A design system for interactive fiction";
     homepage = "http://inform7.com/";
     license = licenses.artistic2;
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix
index 7d0c67a1acb..ebba160fc95 100644
--- a/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -19,7 +19,7 @@ let
   };
   inherit (llvmPkgs) llvm;
   inherit (if buildWithPatches then opencl-clang else llvmPkgs) clang clang-unwrapped spirv-llvm-translator;
-  inherit (stdenv.lib) getVersion optional optionals versionOlder versions;
+  inherit (lib) getVersion optional optionals versionOlder versions;
 in
 
 stdenv.mkDerivation rec {
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/intel/intel-graphics-compiler";
     description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware";
     license     = licenses.mit;
diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix
index b20a0899f03..d696b6801ed 100644
--- a/pkgs/development/compilers/intercal/default.nix
+++ b/pkgs/development/compilers/intercal/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , pkg-config
 , bison, flex
 , makeWrapper }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "intercal";
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix
index e64c0c912d9..cabdbd9dcc0 100644
--- a/pkgs/development/compilers/ios-cross-compile/9.2.nix
+++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, git, clang,
+{ lib, stdenv, git, clang,
   fetchFromGitHub, requireFile,
   openssl, xz, gnutar,
   automake, autoconf, libtool, clangStdenv } :
@@ -57,9 +57,9 @@ clangStdenv.mkDerivation rec {
   meta = {
     description =
     "Provides an iOS cross compiler from 7.1 up to iOS-${version} and ldid";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
     hydraPlatforms = [];
-    maintainers = with stdenv.lib.maintainers; [ fxfactorial ];
-    license = stdenv.lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ fxfactorial ];
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 01e1eaca6e1..d1ac7bcd0ef 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, which, m4, python3, bison, flex, llvmPackages
 
   # the default test target is sse4, but that is not supported by all Hydra agents
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     "-DARM_ENABLED=FALSE"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://ispc.github.io/";
     description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language";
     license     = licenses.bsd3;
diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix
index 7defdc5c689..c61f267bf1a 100644
--- a/pkgs/development/compilers/jasmin/default.nix
+++ b/pkgs/development/compilers/jasmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , unzip
 , jdk8
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     minimal-module = callPackage ./test-assemble-hello-world {};
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An assembler for the Java Virtual Machine";
     homepage = "http://jasmin.sourceforge.net/";
     downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download";
diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix
index 5b691530d34..88371406387 100644
--- a/pkgs/development/compilers/javacard-devkit/default.nix
+++ b/pkgs/development/compilers/javacard-devkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook
+{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook
 , pcsclite
 }:
 
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
       For more details, please refer to the documentation by Oracle
     '';
     homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.ekleog ];
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.ekleog ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index fd3270fa0d0..2edf93b7fc0 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, openjdk11, fetchFromGitHub, jetbrains }:
+{ lib, stdenv, openjdk11, fetchFromGitHub, jetbrains }:
 
 openjdk11.overrideAttrs (oldAttrs: rec {
   pname = "jetbrains-jdk";
@@ -6,11 +6,11 @@ openjdk11.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "JetBrains";
     repo = "JetBrainsRuntime";
-    rev = "jb${stdenv.lib.replaceStrings ["."] ["_"] version}";
+    rev = "jb${lib.replaceStrings ["."] ["_"] version}";
     sha256 = "1gxqi6dkyriv9j29ppan638w1ns2g9m4q1sq7arf9kwqr05zim90";
   };
   patches = [];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenJDK fork to better support Jetbrains's products.";
     longDescription = ''
      JetBrains Runtime is a runtime environment for running IntelliJ Platform
diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 0325632ad0a..77683e28628 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, fetchzip
+{ lib, stdenv, fetchpatch, fetchurl, fetchzip
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , cmake
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     pcre2.dev blas lapack openlibm openspecfun readline utf8proc
     zlib
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+  ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
   ;
 
   patches = [
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
 
   makeFlags =
     let
-      arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
+      arch = lib.head (lib.splitString "-" stdenv.system);
       march = {
         x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
         i686 = "pentium4";
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_ZLIB=1"
     ];
 
-  LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (stdenv.lib.makeLibraryPath [
+  LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (lib.makeLibraryPath [
     arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm
     openspecfun pcre2
   ]);
@@ -204,8 +204,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "https://julialang.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ raskin rob garrison ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
   };
 }
diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
index 8096af0b320..4ee9be5df2d 100644
--- a/pkgs/development/compilers/julia/1.3.nix
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , cmake
@@ -14,7 +14,7 @@
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
-with stdenv.lib;
+with lib;
 
 let
   majorVersion = "1";
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     pcre2.dev blas lapack openlibm openspecfun readline utf8proc
     zlib
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+  ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
   ;
 
   nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
@@ -153,8 +153,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "https://julialang.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ raskin rob garrison ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     broken = stdenv.isi686;
   };
diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix
index be3cfc39635..c0cf86ca7ae 100644
--- a/pkgs/development/compilers/julia/1.5.nix
+++ b/pkgs/development/compilers/julia/1.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , cmake
@@ -14,7 +14,7 @@
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
-with stdenv.lib;
+with lib;
 
 let
   majorVersion = "1";
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     arpack fftw fftwSinglePrec libgit2 libunwind mpfr
     pcre2.dev blas lapack openlibm openspecfun readline utf8proc
     zlib
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices];
+  ] ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices];
 
   nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ];
 
@@ -150,8 +150,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "https://julialang.org/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ raskin rob garrison ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
     broken = stdenv.isi686;
   };
diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix
index 8ce55c75795..2f1727ae0de 100644
--- a/pkgs/development/compilers/jwasm/default.nix
+++ b/pkgs/development/compilers/jwasm/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "jwasm";
   version = "2.13";
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 934c9a848b9..cd613c1b33b 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, unzip }:
+{ lib, stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
   version = "1.4.21";
@@ -38,9 +38,9 @@ in stdenv.mkDerivation {
       and has external contributors.
     '';
     homepage = "https://kotlinlang.org/";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers;
       [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix
index 19dc140a7e1..4261c2b6533 100644
--- a/pkgs/development/compilers/ldc/generic.nix
+++ b/pkgs/development/compilers/ldc/generic.nix
@@ -1,5 +1,5 @@
 { version, ldcSha256 }:
-{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata
+{ lib, stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata
 , libconfig, lit, gdb, unzip, darwin, bash
 , callPackage, makeWrapper, runCommand, targetPackages
 , ldcBootstrap ? callPackage ./bootstrap.nix { }
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       # test depends on current year
       rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # https://github.com/NixOS/nixpkgs/issues/34817
       rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
   '';
@@ -46,20 +46,20 @@ stdenv.mkDerivation rec {
     # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow
     substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
       substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
   ''
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
   '';
 
   nativeBuildInputs = [
     cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip
   ]
-  ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Foundation
   ]
-  ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
     gdb
   ];
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DMD=$DMD" ];
 
-  fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin  ''
+  fixNames = lib.optionalString stdenv.hostPlatform.isDarwin  ''
     fixDarwinDylibNames() {
       local flags=()
 
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
   '';
 
   # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746
-  additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin
+  additionalExceptions = lib.optionalString stdenv.hostPlatform.isDarwin
     "|druntime-test-shared";
 
   checkPhase = ''
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
         --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
    '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The LLVM-based D compiler";
     homepage = "https://github.com/ldc-developers/ldc";
     # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
index d01d1a2a53d..35b7ab313d8 100644
--- a/pkgs/development/compilers/llvm/10/clang/default.nix
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,8 +19,8 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 lld ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm ];
 
@@ -28,7 +28,7 @@ let
       "-DCMAKE_CXX_FLAGS=-std=c++14"
       "-DCLANGD_BUILD_XPC=OFF"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
@@ -49,9 +49,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -90,10 +90,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
index 568bdff67c0..37515b5039d 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetch pname "1yjqjri753w0fzmxcyz687nvd97sbc9rsqrxzpq720na47hwh3fr";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation rec {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
@@ -62,13 +62,13 @@ stdenv.mkDerivation rec {
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -78,9 +78,9 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index 3d2cb3544b9..f939eb52122 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -26,7 +26,7 @@ let
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
       echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
@@ -101,15 +101,15 @@ let
       extraPackages = [
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -161,12 +161,12 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
 
@@ -175,12 +175,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
@@ -188,7 +188,7 @@ let
     openmp = callPackage ./openmp.nix {};
 
     libunwind = callPackage ./libunwind.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
index 9b501aff1ab..a3fb0927345 100644
--- a/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   preConfigure = ''
     # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -31,13 +31,13 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ lib.optional stdenv.hostPlatform.isWasm [
       "-DLIBCXX_ENABLE_THREADS=OFF"
       "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
-    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+    ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
   passthru = {
     isLLVM = true;
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix
index 7335d06e4fe..61f778fbc55 100644
--- a/pkgs/development/compilers/llvm/10/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/10/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -9,15 +9,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ stdenv.lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared) [
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation {
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+  '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
   '';
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
       install -m 644 ../include/cxxabi.h $out/include
-    '' + stdenv.lib.optionalString enableShared ''
+    '' + lib.optionalString enableShared ''
       install -m 644 lib/libc++abi.so.1.0 $out/lib
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
@@ -61,8 +61,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix
index 8088ae97303..f0f45780a22 100644
--- a/pkgs/development/compilers/llvm/10/libunwind.nix
+++ b/pkgs/development/compilers/llvm/10/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, fetchpatch
+{ lib, stdenv, version, fetch, cmake, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -10,5 +10,5 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
 }
diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix
index a0cb9c117a8..a94c1b5b0dd 100644
--- a/pkgs/development/compilers/llvm/10/lld.nix
+++ b/pkgs/development/compilers/llvm/10/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix
index fc5edadd0a4..e7dd48a23ce 100644
--- a/pkgs/development/compilers/llvm/10/lldb.nix
+++ b/pkgs/development/compilers/llvm/10/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
   patches = [ ./lldb-procfs.patch ];
 
   nativeBuildInputs = [ cmake python3 which swig lit ]
-    ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
+    ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
 
   buildInputs = [
     ncurses
@@ -34,7 +34,7 @@ stdenv.mkDerivation (rec {
     libxml2
     llvm
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     darwin.libobjc
     darwin.apple_sdk.libs.xpc
     darwin.apple_sdk.frameworks.Foundation
@@ -49,11 +49,11 @@ stdenv.mkDerivation (rec {
     "-DLLVM_ENABLE_RTTI=OFF"
     "-DClang_DIR=${clang-unwrapped}/lib/cmake"
     "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
-  ] ++ stdenv.lib.optionals enableManpages [
+  ] ++ lib.optionals enableManpages [
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
     "-DSPHINX_OUTPUT_HTML=OFF"
@@ -67,13 +67,13 @@ stdenv.mkDerivation (rec {
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage = "https://lldb.llvm.org";
     license = licenses.ncsa;
     platforms = platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "lldb-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix
index 7e6c7c02526..e951375a833 100644
--- a/pkgs/development/compilers/llvm/10/llvm.nix
+++ b/pkgs/development/compilers/llvm/10/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , python3
@@ -22,10 +22,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
-  shortVersion = with stdenv.lib;
+  shortVersion = with lib;
     concatStringsSep "." (take 1 (splitString "." release_version));
 
 in stdenv.mkDerivation (rec {
@@ -158,11 +158,11 @@ in stdenv.mkDerivation (rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix
index e3c1e66376a..2fa695d2d51 100644
--- a/pkgs/development/compilers/llvm/10/openmp.nix
+++ b/pkgs/development/compilers/llvm/10/openmp.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix
index 24d6da97bf1..3a3e384ad98 100644
--- a/pkgs/development/compilers/llvm/11/clang/default.nix
+++ b/pkgs/development/compilers/llvm/11/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -20,15 +20,15 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 lld ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++14"
       "-DCLANGD_BUILD_XPC=OFF"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
@@ -48,9 +48,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -89,10 +89,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix
index 3f8c092fce2..091f327550b 100644
--- a/pkgs/development/compilers/llvm/11/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetch pname "1z470r8c5aahdwkmflglx998n0i77j8b1c69d7cir1kf27qy6yq8";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation rec {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [
+  ] ++ lib.optionals (stdenv.isDarwin) [
     "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
   ];
 
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     ./compiler-rt-X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
@@ -59,15 +59,15 @@ stdenv.mkDerivation rec {
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -77,9 +77,9 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix
index b354bd6b44a..2ebde3d107a 100644
--- a/pkgs/development/compilers/llvm/11/default.nix
+++ b/pkgs/development/compilers/llvm/11/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -8,7 +8,7 @@
 let
   release_version = "11.0.1";
   candidate = ""; # empty or "rcN"
-  dash-candidate = stdenv.lib.optionalString (candidate != "") "-${candidate}";
+  dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
   version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
   targetConfig = stdenv.targetPlatform.config;
 
@@ -19,7 +19,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "1j8n6n4l54k2lrdxh266y1fl4z8vy5dc76wsf0csk5n3ikfi38ic";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -28,7 +28,7 @@ let
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
       echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
@@ -103,15 +103,15 @@ let
       extraPackages = [
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -163,12 +163,12 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
 
@@ -177,12 +177,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
@@ -190,7 +190,7 @@ let
     openmp = callPackage ./openmp.nix {};
 
     libunwind = callPackage ./libunwind.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix
index d0b581c0460..7a34977afe2 100644
--- a/pkgs/development/compilers/llvm/11/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/11/libc++/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     mv llvm-* llvm
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
     patchShebangs utils/cat_files.py
@@ -28,13 +28,13 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ lib.optional stdenv.hostPlatform.isWasm [
       "-DLIBCXX_ENABLE_THREADS=OFF"
       "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
-    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+    ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
   passthru = {
     isLLVM = true;
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix
index e87622b23b2..22e4ac4abe4 100644
--- a/pkgs/development/compilers/llvm/11/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/11/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -9,15 +9,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "0gv8pxq95gvsybldj21hdfkmm0r5cn1z7jhd72l231n0lmb70saa";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ stdenv.lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared) [
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -28,11 +28,11 @@ stdenv.mkDerivation {
     mv libcxx-* libcxx
     unpackFile ${llvm.src}
     mv llvm-* llvm
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+  '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d llvm -i ${./libcxxabi-wasm.patch}
   '';
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
       install -m 644 ../include/cxxabi.h $out/include
-    '' + stdenv.lib.optionalString enableShared ''
+    '' + lib.optionalString enableShared ''
       install -m 644 lib/libc++abi.so.1.0 $out/lib
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
@@ -62,8 +62,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix
index 5708b00c08a..1b5fe0f5788 100644
--- a/pkgs/development/compilers/llvm/11/libunwind.nix
+++ b/pkgs/development/compilers/llvm/11/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, fetchpatch
+{ lib, stdenv, version, fetch, cmake, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -10,5 +10,5 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
 }
diff --git a/pkgs/development/compilers/llvm/11/lld.nix b/pkgs/development/compilers/llvm/11/lld.nix
index af02a5d4750..cead886f49b 100644
--- a/pkgs/development/compilers/llvm/11/lld.nix
+++ b/pkgs/development/compilers/llvm/11/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix
index 28bb75470a9..fcc73cfdeb6 100644
--- a/pkgs/development/compilers/llvm/11/lldb.nix
+++ b/pkgs/development/compilers/llvm/11/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
   patches = [ ./lldb-procfs.patch ];
 
   nativeBuildInputs = [ cmake python3 which swig lit ]
-    ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
+    ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
 
   buildInputs = [
     ncurses
@@ -34,7 +34,7 @@ stdenv.mkDerivation (rec {
     libxml2
     llvm
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     darwin.libobjc
     darwin.apple_sdk.libs.xpc
     darwin.apple_sdk.frameworks.Foundation
@@ -49,11 +49,11 @@ stdenv.mkDerivation (rec {
     "-DLLVM_ENABLE_RTTI=OFF"
     "-DClang_DIR=${clang-unwrapped}/lib/cmake"
     "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
-  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!stdenv.isDarwin) [
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
-  ] ++ stdenv.lib.optionals enableManpages [
+  ] ++ lib.optionals enableManpages [
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
     "-DSPHINX_OUTPUT_HTML=OFF"
@@ -67,13 +67,13 @@ stdenv.mkDerivation (rec {
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage = "https://lldb.llvm.org";
     license = licenses.ncsa;
     platforms = platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "lldb-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix
index 442e1ee3a6d..002d6f82a8e 100644
--- a/pkgs/development/compilers/llvm/11/llvm.nix
+++ b/pkgs/development/compilers/llvm/11/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , python3
@@ -22,10 +22,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
-  shortVersion = with stdenv.lib;
+  shortVersion = with lib;
     concatStringsSep "." (take 1 (splitString "." release_version));
 
 in stdenv.mkDerivation (rec {
@@ -160,11 +160,11 @@ in stdenv.mkDerivation (rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix
index 55a4ceb7e6e..b19d369a42e 100644
--- a/pkgs/development/compilers/llvm/11/openmp.nix
+++ b/pkgs/development/compilers/llvm/11/openmp.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index a097e9167cd..21961f4f041 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, clang-tools-extra_src, python3
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,15 +19,15 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
@@ -44,7 +44,7 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
     '';
 
@@ -80,10 +80,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index e973be0a087..909c6b19053 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,19 +53,19 @@ stdenv.mkDerivation {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     ../7/compiler-rt-glibc.patch
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -75,9 +75,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 36495249d16..80bb3af2786 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,7 +25,7 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
       echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
@@ -75,7 +75,7 @@ let
     lldb = callPackage ./lldb.nix {};
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 687a613e074..164836e1a4c 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
     ../../libcxx-0001-musl-hacks.patch
   ];
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isMusl python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
 
   passthru = {
     isLLVM = true;
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix
index 96d6e78e01e..8fc9ef9fded 100644
--- a/pkgs/development/compilers/llvm/5/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/5/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
   pname = "libc++abi";
@@ -7,15 +7,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
   '';
 
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix
index 5f43f8235e1..244960cf41b 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/pkgs/development/compilers/llvm/5/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , llvm
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
     badPlatforms = [ "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix
index 258535a7566..61a9e60391c 100644
--- a/pkgs/development/compilers/llvm/5/lldb.nix
+++ b/pkgs/development/compilers/llvm/5/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake python3 which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     cp ../docs/lldb.1 $out/share/man/man1/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage    = "https://llvm.org/";
     license     = licenses.ncsa;
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 2c2867c9937..c91e9420435 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -17,7 +17,7 @@
 
 let
   # Used when creating a versioned symlinks of libLLVM.dylib
-  versionSuffixes = with stdenv.lib;
+  versionSuffixes = with lib;
     let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 in
@@ -35,10 +35,10 @@ stdenv.mkDerivation ({
   '';
 
   outputs = [ "out" "python" ]
-    ++ stdenv.lib.optional enableSharedLibraries "lib";
+    ++ lib.optional enableSharedLibraries "lib";
 
   nativeBuildInputs = [ cmake python3 ]
-    ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+    ++ lib.optional enableManpages python3.pkgs.sphinx;
 
   buildInputs = [ libxml2 libffi ];
 
@@ -58,13 +58,13 @@ stdenv.mkDerivation ({
     #  stripLen = 1;
     #})
   ];
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/modules/AddLLVM.cmake \
       --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
       --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
   ''
   # Patch llvm-config to return correct library path based on --link-{shared,static}.
-  + stdenv.lib.optionalString (enableSharedLibraries) ''
+  + lib.optionalString (enableSharedLibraries) ''
     substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
     patch -p1 < ./llvm-outputs.patch
   '' + ''
@@ -72,9 +72,9 @@ stdenv.mkDerivation ({
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "Path.cpp" ""
     rm unittests/Support/Path.cpp
-  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
+  '' + lib.optionalString stdenv.isAarch64 ''
     patch -p0 < ${../aarch64.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -i ${../TLI-musl.patch}
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
@@ -98,18 +98,18 @@ stdenv.mkDerivation ({
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
     "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
   ]
-  ++ stdenv.lib.optional enableSharedLibraries
+  ++ lib.optional enableSharedLibraries
     "-DLLVM_LINK_LLVM_DYLIB=ON"
-  ++ stdenv.lib.optionals enableManpages [
+  ++ lib.optionals enableManpages [
     "-DLLVM_BUILD_DOCS=ON"
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
     "-DSPHINX_OUTPUT_HTML=OFF"
     "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
   ]
-  ++ stdenv.lib.optional (!isDarwin)
+  ++ lib.optional (!isDarwin)
     "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
-  ++ stdenv.lib.optionals (isDarwin) [
+  ++ lib.optionals (isDarwin) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DCAN_TARGET_i386=false"
   ];
@@ -126,18 +126,18 @@ stdenv.mkDerivation ({
     mkdir -p $python/share
     mv $out/share/opt-viewer $python/share/opt-viewer
   ''
-  + stdenv.lib.optionalString enableSharedLibraries ''
+  + lib.optionalString enableSharedLibraries ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
   ''
-  + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+  + lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"
-    ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+    ${lib.concatMapStringsSep "\n" (v: ''
       ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
     '') versionSuffixes}
   '';
@@ -150,11 +150,11 @@ stdenv.mkDerivation ({
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix
index 452f5a3cfe5..1af40922996 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/pkgs/development/compilers/llvm/5/openmp.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 63a79ffba8a..41202dd3f5d 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, clang-tools-extra_src, python3
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,15 +19,15 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
@@ -44,7 +44,7 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
     '';
 
@@ -80,10 +80,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index df61824e908..6e47ffe8aca 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,21 +53,21 @@ stdenv.mkDerivation {
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     ../7/compiler-rt-glibc.patch
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -77,9 +77,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 4c2e87ec5e1..f39fb9b60da 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,7 +25,7 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
       echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
@@ -75,7 +75,7 @@ let
     lldb = callPackage ./lldb.nix {};
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 129d06fe515..ac489db54fc 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
     ../../libcxx-0001-musl-hacks.patch
   ];
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isMusl python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
 
   passthru = {
     isLLVM = true;
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index 246bc6153e5..6e99f2d287a 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
   pname = "libc++abi";
@@ -7,15 +7,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
   '';
 
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index da1acf3f5f3..b8038524805 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
index 0a138618574..7c6f8b1bd97 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake python3 which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     cp ../docs/lldb.1 $out/share/man/man1/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage    = "https://llvm.org/";
     license     = licenses.ncsa;
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 07aaf1e9218..7d429e3ecf3 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , python3
@@ -17,10 +17,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a versioned symlinks of libLLVM.dylib
-  versionSuffixes = with stdenv.lib;
+  versionSuffixes = with lib;
     let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 in
@@ -136,7 +136,7 @@ stdenv.mkDerivation ({
   + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
-    ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+    ${lib.concatMapStringsSep "\n" (v: ''
       ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
     '') versionSuffixes}
   '';
@@ -149,11 +149,11 @@ stdenv.mkDerivation ({
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index d6b00bb01ae..420bfe8c3bb 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index 0b1fdd53de9..4ab13441e36 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -20,21 +20,21 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm lld ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ] ++ stdenv.lib.optionals enablePolly [
+    ] ++ lib.optionals enablePolly [
       "-DWITH_POLLY=ON"
       "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
@@ -52,9 +52,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -91,10 +91,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index bae9cf5fa0e..6320a3405d2 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -55,22 +55,22 @@ stdenv.mkDerivation {
     ./compiler-rt-glibc.patch
 
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
+    ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -80,9 +80,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 3dd067ae607..393a1f59472 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,7 +25,7 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
       echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
@@ -103,9 +103,9 @@ let
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -157,7 +157,7 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
@@ -172,12 +172,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index 27315672607..fb50c4e24d7 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isMusl python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ] ;
 
@@ -36,8 +36,8 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"
-  ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"
+  ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ;
 
   passthru = {
     isLLVM = true;
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index 4c46aeaa191..61879be91da 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, llvm, version
 , standalone ? false
   # on musl the shared objects don't build
 , enableShared ? !stdenv.hostPlatform.isStatic
@@ -16,15 +16,15 @@ stdenv.mkDerivation {
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*) )
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
   '';
 
   cmakeFlags =
-     stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
-     stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
+     lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
+     lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
 
   installPhase = if stdenv.isDarwin
     then ''
@@ -42,17 +42,17 @@ stdenv.mkDerivation {
     else ''
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
-      ${stdenv.lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"}
+      ${lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"}
       install -m 644 ../include/cxxabi.h $out/include
-      ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"}
-      ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"}
+      ${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"}
+      ${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"}
     '';
 
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.unix;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix
index 5e0568b6a09..f4c58abef8a 100644
--- a/pkgs/development/compilers/llvm/7/lld.nix
+++ b/pkgs/development/compilers/llvm/7/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix
index d1508c46d0c..3fa5b411f63 100644
--- a/pkgs/development/compilers/llvm/7/lldb.nix
+++ b/pkgs/development/compilers/llvm/7/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake perl python3 which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
 
   postPatch = ''
@@ -50,14 +50,14 @@ stdenv.mkDerivation {
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2";
 
   postInstall = ''
     mkdir -p $out/share/man/man1
     cp ../docs/lldb.1 $out/share/man/man1/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage    = "https://llvm.org/";
     license     = licenses.ncsa;
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index 69114c7ca23..2d6f0d18722 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -23,10 +23,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a versioned symlinks of libLLVM.dylib
-  versionSuffixes = with stdenv.lib;
+  versionSuffixes = with lib;
     let parts = splitVersion release_version; in
     imap (i: _: concatStringsSep "." (take i parts)) parts;
 
@@ -158,7 +158,7 @@ in stdenv.mkDerivation ({
   + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
-    ${stdenv.lib.concatMapStringsSep "\n" (v: ''
+    ${lib.concatMapStringsSep "\n" (v: ''
       ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
     '') versionSuffixes}
   '';
@@ -171,11 +171,11 @@ in stdenv.mkDerivation ({
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
index e36b236fd02..9977ed3dd41 100644
--- a/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , llvm
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix
index 0c00ce62715..8f44ffc0615 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -20,8 +20,8 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm lld ];
 
@@ -29,13 +29,13 @@ let
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DCLANGD_BUILD_XPC=OFF"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ] ++ stdenv.lib.optionals enablePolly [
+    ] ++ lib.optionals enablePolly [
       "-DWITH_POLLY=ON"
       "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
@@ -62,9 +62,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -101,10 +101,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 280204c6e35..2e49ef17346 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,22 +53,22 @@ stdenv.mkDerivation {
   patches = [
     ../7/compiler-rt-glibc.patch
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -78,9 +78,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index 6e80737f32a..4dc0b8dd3c4 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,7 +25,7 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
       echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
@@ -100,15 +100,15 @@ let
       extraPackages = [
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -160,12 +160,12 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
 
@@ -174,12 +174,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
@@ -187,7 +187,7 @@ let
     openmp = callPackage ./openmp.nix {};
 
     libunwind = callPackage ./libunwind.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix
index 7a3a33bfd7d..70e4d9e1a65 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -35,13 +35,13 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ lib.optional stdenv.hostPlatform.isWasm [
       "-DLIBCXX_ENABLE_THREADS=OFF"
       "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
-    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+    ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
   passthru = {
     isLLVM = true;
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix
index 50a38dfa967..5a74981eba8 100644
--- a/pkgs/development/compilers/llvm/8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/8/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -9,15 +9,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ stdenv.lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared) [
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation {
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+  '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
   '';
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
       install -m 644 ../include/cxxabi.h $out/include
-    '' + stdenv.lib.optionalString enableShared ''
+    '' + lib.optionalString enableShared ''
       install -m 644 lib/libc++abi.so.1.0 $out/lib
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
@@ -61,8 +61,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix
index 6e765865282..d1bd54fbd34 100644
--- a/pkgs/development/compilers/llvm/8/libunwind.nix
+++ b/pkgs/development/compilers/llvm/8/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, fetchpatch
+{ lib, stdenv, version, fetch, cmake, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -21,5 +21,5 @@ stdenv.mkDerivation {
     })
   ];
 
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
 }
diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix
index f890591b377..8009beb7bc1 100644
--- a/pkgs/development/compilers/llvm/8/lld.nix
+++ b/pkgs/development/compilers/llvm/8/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix
index a22d27f9b29..83c171d2a57 100644
--- a/pkgs/development/compilers/llvm/8/lldb.nix
+++ b/pkgs/development/compilers/llvm/8/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake python3 which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage    = "https://llvm.org/";
     license     = licenses.ncsa;
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index e3ca31313ce..9c2c3416aea 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , fetchpatch
 , cmake
@@ -23,10 +23,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
-  shortVersion = with stdenv.lib;
+  shortVersion = with lib;
     concatStringsSep "." (take 1 (splitVersion release_version));
 
 in stdenv.mkDerivation ({
@@ -155,11 +155,11 @@ in stdenv.mkDerivation ({
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix
index 4eb43600dd6..ad2cd93fdb6 100644
--- a/pkgs/development/compilers/llvm/8/openmp.nix
+++ b/pkgs/development/compilers/llvm/8/openmp.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
index b880d843d59..87b29163f43 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
 , enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -20,8 +20,8 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
-      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+      ++ lib.optional enableManpages python3.pkgs.sphinx
+      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     buildInputs = [ libxml2 llvm lld ];
 
@@ -29,13 +29,13 @@ let
       "-DCMAKE_CXX_FLAGS=-std=c++11"
       "-DCLANGD_BUILD_XPC=OFF"
       "-DLLVM_ENABLE_RTTI=ON"
-    ] ++ stdenv.lib.optionals enableManpages [
+    ] ++ lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ] ++ stdenv.lib.optionals enablePolly [
+    ] ++ lib.optionals enablePolly [
       "-DWITH_POLLY=ON"
       "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
@@ -55,9 +55,9 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    '' + lib.optionalString stdenv.hostPlatform.isMusl ''
       sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
-    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace tools/extra/clangd/CMakeLists.txt \
         --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
     '';
@@ -96,10 +96,10 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = "https://llvm.org/";
-      license     = stdenv.lib.licenses.ncsa;
-      platforms   = stdenv.lib.platforms.all;
+      license     = lib.licenses.ncsa;
+      platforms   = lib.platforms.all;
     };
-  } // stdenv.lib.optionalAttrs enableManpages {
+  } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
     buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 709d0c13477..2ab9dc8ffa2 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
 
 let
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2";
 
   nativeBuildInputs = [ cmake python3 llvm ];
-  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   NIX_CFLAGS_COMPILE = [
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -24,24 +24,24 @@ stdenv.mkDerivation rec {
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [
+  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ stdenv.lib.optionals (useLLVM) [
+  ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
     #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
-  ] ++ stdenv.lib.optionals (bareMetal) [
+  ] ++ lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # The compiler-rt build infrastructure sniffs supported platforms on Darwin
     # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
     # when it tries to use libc++ and libc++api for i386.
@@ -53,21 +53,21 @@ stdenv.mkDerivation rec {
   patches = [
     ../7/compiler-rt-glibc.patch
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
-    ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
+  ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
   # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
   # a flag and turn the flag off during the stdenv build.
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
     substituteInPlace lib/builtins/clear_cache.c \
@@ -77,9 +77,9 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
     ln -s "$out/lib"/*/* "$out/lib"
-  '' + stdenv.lib.optionalString (useLLVM) ''
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index 6f5bdb8e8cc..e381b192766 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gccForLibs
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
 , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildPackages
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -17,7 +17,7 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj";
 
-  tools = stdenv.lib.makeExtensible (tools: let
+  tools = lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
@@ -25,7 +25,7 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
       echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
@@ -100,15 +100,15 @@ let
       extraPackages = [
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
-      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
         targetLlvmLibraries.libunwind
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
         echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
         echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+      '' + lib.optionalString stdenv.targetPlatform.isWasm ''
         echo "-fno-exceptions" >> $out/nix-support/cc-cflags
       '' + mkExtraBuildCommands cc;
     };
@@ -160,12 +160,12 @@ let
 
   });
 
-  libraries = stdenv.lib.makeExtensible (libraries: let
+  libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
 
@@ -174,12 +174,12 @@ let
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
     libcxxabi = callPackage ./libc++abi.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
       }));
@@ -187,7 +187,7 @@ let
     openmp = callPackage ./openmp.nix {};
 
     libunwind = callPackage ./libunwind.nix ({} //
-      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix
index c70130d36a4..6ea1e28e7b4 100644
--- a/pkgs/development/compilers/llvm/9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/9/libc++/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   preConfigure = ''
     # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libcxxabi ];
 
@@ -31,13 +31,13 @@ stdenv.mkDerivation {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ lib.optional stdenv.hostPlatform.isWasm [
       "-DLIBCXX_ENABLE_THREADS=OFF"
       "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
-    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+    ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
   passthru = {
     isLLVM = true;
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxx.llvm.org/";
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix
index 13f033091be..e8e08f84801 100644
--- a/pkgs/development/compilers/llvm/9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/9/libc++abi.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -9,15 +9,15 @@ stdenv.mkDerivation {
   src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+  buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
 
-  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"
     "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
-  ] ++ stdenv.lib.optionals (!enableShared) [
+  ] ++ lib.optionals (!enableShared) [
     "-DLIBCXXABI_ENABLE_SHARED=OFF"
   ];
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation {
     unpackFile ${libcxx.src}
     unpackFile ${llvm.src}
     cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+  '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
   '';
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
       install -d -m 755 $out/include $out/lib
       install -m 644 lib/libc++abi.a $out/lib
       install -m 644 ../include/cxxabi.h $out/include
-    '' + stdenv.lib.optionalString enableShared ''
+    '' + lib.optionalString enableShared ''
       install -m 644 lib/libc++abi.so.1.0 $out/lib
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
       ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
@@ -61,8 +61,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://libcxxabi.llvm.org/";
     description = "A new implementation of low level support for a standard C++ library";
-    license = with stdenv.lib.licenses; [ ncsa mit ];
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.all;
+    license = with lib.licenses; [ ncsa mit ];
+    maintainers = with lib.maintainers; [ vlstill ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix
index 86756c53829..4c4c85512e3 100644
--- a/pkgs/development/compilers/llvm/9/libunwind.nix
+++ b/pkgs/development/compilers/llvm/9/libunwind.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, fetchpatch
+{ lib, stdenv, version, fetch, cmake, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -10,5 +10,5 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
 }
diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix
index a2b17a97cdc..8b12642d2a7 100644
--- a/pkgs/development/compilers/llvm/9/lld.nix
+++ b/pkgs/development/compilers/llvm/9/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , libxml2
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The LLVM Linker";
     homepage    = "https://lld.llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix
index 9c43287b166..8da5c0bef68 100644
--- a/pkgs/development/compilers/llvm/9/lldb.nix
+++ b/pkgs/development/compilers/llvm/9/lldb.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , zlib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     libxml2
     llvm
   ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     darwin.libobjc
     darwin.apple_sdk.libs.xpc
     darwin.apple_sdk.frameworks.Foundation
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A next-generation high-performance debugger";
     homepage = "https://llvm.org/";
     license = licenses.ncsa;
diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix
index c46e54debe9..207dc242b91 100644
--- a/pkgs/development/compilers/llvm/9/llvm.nix
+++ b/pkgs/development/compilers/llvm/9/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetch
 , cmake
 , python3
@@ -22,10 +22,10 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
-  shortVersion = with stdenv.lib;
+  shortVersion = with lib;
     concatStringsSep "." (take 1 (splitString "." release_version));
 
 in stdenv.mkDerivation (rec {
@@ -163,11 +163,11 @@ in stdenv.mkDerivation (rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
-    license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs enableManpages {
+} // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix
index 9fdcf9e6cff..35997c9dda4 100644
--- a/pkgs/development/compilers/llvm/9/openmp.nix
+++ b/pkgs/development/compilers/llvm/9/openmp.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Components required to build an executable OpenMP program";
     homepage    = "https://openmp.llvm.org/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/rocm/clang.nix b/pkgs/development/compilers/llvm/rocm/clang.nix
index 6bb23b77543..789d4c055eb 100644
--- a/pkgs/development/compilers/llvm/rocm/clang.nix
+++ b/pkgs/development/compilers/llvm/rocm/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , python
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     #undef CLANG_REPOSITORY
   '';
 
-  postUnpack = stdenv.lib.optionalString (!(isNull clang-tools-extra_src)) ''
+  postUnpack = lib.optionalString (!(isNull clang-tools-extra_src)) ''
     ln -s ${clang-tools-extra_src} $sourceRoot/tools/extra
   '';
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     echo "$VCSVersion" > lib/Basic/VCSVersion.inc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend";
     homepage = "https://llvm.org/";
     license = with licenses; [ ncsa ];
diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix
index 36b42cef392..ffa1aff9537 100644
--- a/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
+{ lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
 
 let
   version = "4.0.0";
diff --git a/pkgs/development/compilers/llvm/rocm/lld.nix b/pkgs/development/compilers/llvm/rocm/lld.nix
index 34a094bf379..2a05331f7a0 100644
--- a/pkgs/development/compilers/llvm/rocm/lld.nix
+++ b/pkgs/development/compilers/llvm/rocm/lld.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , cmake
 , libxml2
 , llvm
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       --replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ROCm fork of the LLVM Linker";
     homepage = "https://github.com/RadeonOpenCompute/llvm-project";
     license = licenses.ncsa;
diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix
index 909284a3e91..d6fe211c475 100644
--- a/pkgs/development/compilers/llvm/rocm/llvm.nix
+++ b/pkgs/development/compilers/llvm/rocm/llvm.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , python3
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   pname = "rocm-llvm";
 
   outputs = [ "out" "python" ]
-    ++ stdenv.lib.optional enableSharedLibraries "lib";
+    ++ lib.optional enableSharedLibraries "lib";
 
   nativeBuildInputs = [ cmake python3 ];
 
@@ -44,10 +44,10 @@ in stdenv.mkDerivation rec {
     "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
   ]
   ++
-  stdenv.lib.optional
+  lib.optional
     enableSharedLibraries
     "-DLLVM_LINK_LLVM_DYLIB=ON"
-  ++ stdenv.lib.optionals enableManpages [
+  ++ lib.optionals enableManpages [
     "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
     "-DLLVM_BUILD_DOCS=ON"
     "-DLLVM_ENABLE_SPHINX=ON"
@@ -78,7 +78,7 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     moveToOutput share/opt-viewer "$python"
   ''
-  + stdenv.lib.optionalString enableSharedLibraries ''
+  + lib.optionalString enableSharedLibraries ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
@@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
 
   passthru.src = src;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ROCm fork of the LLVM compiler infrastructure";
     homepage = "https://github.com/RadeonOpenCompute/llvm-project";
     license = with licenses; [ ncsa ];
diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix
index 728049448e6..b65d640b475 100644
--- a/pkgs/development/compilers/lobster/default.nix
+++ b/pkgs/development/compilers/lobster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , unstableGitUpdater
 , cmake
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     updateScript = unstableGitUpdater { };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://strlen.com/lobster";
     description = "The Lobster programming language";
     longDescription = ''
diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix
index 023bae48b3e..efb5972e542 100644
--- a/pkgs/development/compilers/mcpp/default.nix
+++ b/pkgs/development/compilers/mcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "mcpp";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://mcpp.sourceforge.net/";
     description = "A portable c preprocessor";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
index d7029733381..e063c4c0921 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper
+{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper
 , readline }:
 
 stdenv.mkDerivation rec {
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
       trade-offs.
     '';
     homepage    = "http://mercurylang.org";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license     = lib.licenses.gpl2;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
index a5c7054c3a6..34d8f98970e 100644
--- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
+++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{lib, stdenv, fetchurl}: stdenv.mkDerivation {
   name = "meta-build-env-0.1";
   src = fetchurl {
     url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz";
@@ -6,6 +6,6 @@
   };
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
index a90076c9ecc..4c535be4d49 100644
--- a/pkgs/development/compilers/mezzo/default.nix
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "mezzo is not available for OCaml ${ocaml.version}"
 else
 
 let
-  check-ocaml-version = with stdenv.lib; versionAtLeast (getVersion ocaml);
+  check-ocaml-version = with lib; versionAtLeast (getVersion ocaml);
 in
 
 assert check-ocaml-version "4";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   buildInputs = [ ocaml findlib ocamlbuild yojson menhir ulex pprint fix functory ];
 
   # Sets warning 3 as non-fatal
-  prePatch = stdenv.lib.optionalString (check-ocaml-version "4.02") ''
+  prePatch = lib.optionalString (check-ocaml-version "4.02") ''
     substituteInPlace myocamlbuild.pre.ml \
     --replace '@1..3' '@1..2+3'
   '';
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     cp mezzo $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://protz.github.io/mezzo/";
     description = "A programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";
     license = licenses.gpl2;
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix
index ba3e388c399..ee2de8518f3 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/pkgs/development/compilers/microscheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, vim, makeWrapper }:
+{ lib, stdenv, fetchzip, vim, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "microscheme";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://microscheme.org";
     description = "A Scheme subset for Atmel microcontrollers";
     longDescription = ''
diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix
index 55d3976858b..298cb5e21ea 100644
--- a/pkgs/development/compilers/miranda/default.nix
+++ b/pkgs/development/compilers/miranda/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     patchShebangs quotehostinfo
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for Miranda -- a pure, non-strict, polymorphic, higher order functional programming language";
     homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix
index a3b320c384f..8cf709c10ae 100644
--- a/pkgs/development/compilers/mit-scheme/default.nix
+++ b/pkgs/development/compilers/mit-scheme/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake,
+{ fetchurl, lib, stdenv, makeWrapper, gnum4, texinfo, texLive, automake,
   enableX11 ? false, xlibsWrapper ? null }:
 
 let
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
   # XXX: The `check' target doesn't exist.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "MIT/GNU Scheme, a native code Scheme compiler";
 
     longDescription =
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index baaf978d298..3656f1e0dd8 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
 
-with stdenv.lib; stdenv.mkDerivation rec {
+with lib; stdenv.mkDerivation rec {
   pname = "mkcl";
   version = "1.1.11";
 
diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix
index 45cb09d5a2a..6341ec8b17e 100644
--- a/pkgs/development/compilers/mlkit/default.nix
+++ b/pkgs/development/compilers/mlkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, mlton }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, mlton }:
 
 stdenv.mkDerivation rec {
   pname = "mlkit";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildFlags = ["mlkit" "mlkit_libs"];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standard ML Compiler and Toolkit";
     homepage = "https://elsman.com/mlkit/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
index 52bb0a0775c..98b4aeda551 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, gmp }:
+{ lib, stdenv, fetchurl, patchelf, gmp }:
 
 let
   version = "20130715";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "${pname}-${version}";
 
   buildInputs = [ gmp ];
-  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
+  nativeBuildInputs = lib.optional stdenv.isLinux patchelf;
 
   makeFlags = [ "all-no-docs" ];
 
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
     done
 
     substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
   '';
 
@@ -79,13 +79,13 @@ stdenv.mkDerivation rec {
     # So the builder runs the binary compiler with gmp.
     export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
 
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     # Patch ELF interpreter.
     patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
     for e in mllex mlyacc ; do
       patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # Patch libgmp linking
     install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
     install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix
index 2b4998f91c9..4846b58bf26 100644
--- a/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, gmp }:
+{ lib, stdenv, fetchurl, patchelf, gmp }:
 let
   dynamic-linker = stdenv.cc.bintools.dynamicLinker;
 in
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     throw "Architecture not supported";
 
   buildInputs = [ gmp ];
-  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
+  nativeBuildInputs = lib.optional stdenv.isLinux patchelf;
 
   buildPhase = ''
     make update \
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
     patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
       patchelf --set-rpath ${gmp}/lib $out/bin/$e
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -change \
       /opt/local/lib/libgmp.10.dylib \
       ${gmp}/lib/libgmp.10.dylib \
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 40d85be5a24..901848c693a 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which
+{ lib, stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which
 , gnumake42
 , enableParallelBuilding ? true
 , srcArchiveSuffix ? "tar.bz2"
@@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool
     ]
-    ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
+    ++ (lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
 
   configureFlags = [
     "--x-includes=${libX11.dev}/include"
     "--x-libraries=${libX11.out}/lib"
     "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"
   ]
-  ++ stdenv.lib.optionals withLLVM [
+  ++ lib.optionals withLLVM [
     "--enable-llvm"
     "--with-llvm=${llvm}"
   ];
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     makeFlagsArray=(INSTALL=`type -tp install`)
     substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share"
-  '' + stdenv.lib.optionalString withLLVM ''
+  '' + lib.optionalString withLLVM ''
     substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
   '';
 
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   inherit enableParallelBuilding;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://mono-project.com/";
     description = "Cross platform, open source .NET development framework";
     platforms = with platforms; darwin ++ linux;
diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix
index 0a0f232227d..c69a4021677 100644
--- a/pkgs/development/compilers/mono/llvm.nix
+++ b/pkgs/development/compilers/mono/llvm.nix
@@ -39,13 +39,13 @@ stdenv.mkDerivation {
   cmakeFlags = with stdenv; [
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
-  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
+  ] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
 
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies - Mono build";
     homepage    = "http://llvm.org/";
-    license     = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ thoughtpolice ];
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix
index 3d94303cbaa..ec8fa793cfd 100644
--- a/pkgs/development/compilers/mosml/default.nix
+++ b/pkgs/development/compilers/mosml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, perl }:
+{ lib, stdenv, fetchurl, gmp, perl }:
 
 stdenv.mkDerivation rec {
   pname = "mosml";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp perl ];
 
-  makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
+  makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=cc" ];
 
   src = fetchurl {
     url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   setSourceRoot = ''export sourceRoot="$(echo */src)"'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A light-weight implementation of Standard ML";
     longDescription = ''
       Moscow ML is a light-weight implementation of Standard ML (SML), a strict
diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index 66d642dbbbd..8366fd77a47 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
+{ lib, stdenv, fetchurl, makeWrapper
 , boost, gmp
 , tcl-8_5, tk-8_5
 , emacs
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   src = binaries.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
-  libPath = stdenv.lib.makeLibraryPath
+  libPath = lib.makeLibraryPath
     [ stdenv.cc.cc
       boost
       gmp
@@ -51,8 +51,8 @@ stdenv.mkDerivation {
 
     wrapProgram $out/bin/ozemulator --set OZHOME $out
 
-    ${stdenv.lib.optionalString (emacs != null) ''
-      wrapProgram $out/bin/oz --suffix PATH ":" ${stdenv.lib.makeBinPath [ emacs ]}
+    ${lib.optionalString (emacs != null) ''
+      wrapProgram $out/bin/oz --suffix PATH ":" ${lib.makeBinPath [ emacs ]}
     ''}
 
     sed -i $out/share/applications/oz.desktop \
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     patchShebangs $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.mozart-oz.org/";
     description = "Multiplatform implementation of the Oz programming language";
     longDescription = ''
diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix
index eee4f2c64eb..25d35adff94 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/pkgs/development/compilers/mruby/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ruby, bison, rake, fetchFromGitHub }:
+{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "mruby";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An embeddable implementation of the Ruby language";
     homepage = "https://mruby.org";
     maintainers = [ maintainers.nicknovitski ];
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 89217db6818..ce053e87130 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "nasm";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     make test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.nasm.us/";
     description = "An 80x86 and x86-64 assembler designed for portability and modularity";
     platforms = platforms.unix;
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index b31a2daa1f8..8b157fb4ca0 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
+{ lib, stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
 , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
 }:
 
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
       libmysqlclient mbedtls openssl libpthreadstubs ]
-      ++ stdenv.lib.optional stdenv.isLinux gtk2
-      ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
+      ++ lib.optional stdenv.isLinux gtk2
+      ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
                                                 pkgs.darwin.apple_sdk.frameworks.Carbon];
   cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A high-level dynamically typed programming language";
     homepage = "https://nekovm.org";
     license = licenses.lgpl21;
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index cdd0cf375bc..8a647a31c7c 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
+{ lib, stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
 stdenv.mkDerivation rec {
   pname = "obliv-c";
   version = "0.0pre20180624";
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
index cd621c131ff..5762bed41a4 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   checkTarget = ["opt.opt"];
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 8f26790020c..e3778457fd3 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -26,9 +26,9 @@ stdenv.mkDerivation (rec {
 
   meta = {
     homepage = "http://caml.inria.fr/ocaml";
-    license = with stdenv.lib.licenses; [ qpl lgpl2 ];
+    license = with lib.licenses; [ qpl lgpl2 ];
     description = "Most popular variant of the Caml language";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 
 })
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index 8c9a6ef07fa..642b0d91b7f 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -3,7 +3,7 @@
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
    useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
-   inherit (stdenv.lib) optionals optionalString;
+   inherit (lib) optionals optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://caml.inria.fr/ocaml";
     license = with licenses; [
       qpl /* compiler */
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index f90d61744f5..781b5be0982 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -3,7 +3,7 @@
 let
    useX11 = !stdenv.isAarch32 && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
-   inherit (stdenv.lib) optionals optionalString;
+   inherit (lib) optionals optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://caml.inria.fr/ocaml";
     branch = "3.12";
     license = with licenses; [
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 81a8e0034fe..93e08740ddd 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, ncurses, xlibsWrapper }:
+{ lib, stdenv, fetchurl, ncurses, xlibsWrapper }:
 
 let
    useX11 = !stdenv.isAarch32 && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
-   inherit (stdenv.lib) optional optionals optionalString;
+   inherit (lib) optional optionals optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://caml.inria.fr/ocaml";
     branch = "4.00";
     license = with licenses; [
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index a6ddcd8ce8f..d3ab0d6e1c6 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , ncurses
 , libX11, xorgproto, buildEnv
 }:
@@ -6,7 +6,7 @@
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
    x11deps = [ libX11 xorgproto ];
-   inherit (stdenv.lib) optionals;
+   inherit (lib) optionals;
 
    baseOcamlBranch  = "4.07";
    baseOcamlVersion = "${baseOcamlBranch}.1";
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     nativeCompilers = true;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description     = "Multi-Stage Programming extension for OCaml";
     homepage        = "http://okmij.org/ftp/ML/MetaOCaml.html";
     license         = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ];
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 79aab1ffe83..d4a6b6250b5 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -6,17 +6,17 @@ let
   safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
 in
 
-{ stdenv, fetchurl, ncurses, buildEnv, libunwind
-, libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09"
+{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind
+, libX11, xorgproto, useX11 ? safeX11 stdenv && !lib.versionAtLeast version "4.09"
 , aflSupport ? false
 , flambdaSupport ? false
 , spaceTimeSupport ? false
 }:
 
 assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
-assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
-assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
-assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04";
+assert aflSupport -> lib.versionAtLeast version "4.05";
+assert flambdaSupport -> lib.versionAtLeast version "4.03";
+assert spaceTimeSupport -> lib.versionAtLeast version "4.04";
 
 let
   src = args.src or (fetchurl {
@@ -27,7 +27,7 @@ in
 
 let
    useNativeCompilers = !stdenv.isMips;
-   inherit (stdenv.lib) optional optionals optionalString;
+   inherit (lib) optional optionals optionalString;
    name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}";
 in
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (args // {
   prefixKey = "-prefix ";
   configureFlags =
     let flags = new: old:
-      if stdenv.lib.versionAtLeast version "4.08"
+      if lib.versionAtLeast version "4.08"
       then new else old
     ; in
     optionals useX11 (flags
@@ -59,11 +59,11 @@ stdenv.mkDerivation (args // {
   ;
 
   buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
-  buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
+  buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses
     ++ optionals useX11 [ libX11 xorgproto ];
   propagatedBuildInputs = optional spaceTimeSupport libunwind;
   installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
-  preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
+  preConfigure = optionalString (!lib.versionAtLeast version "4.04") ''
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
@@ -76,7 +76,7 @@ stdenv.mkDerivation (args // {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://caml.inria.fr/ocaml";
     branch = versionNoPatch;
     license = with licenses; [
@@ -105,7 +105,7 @@ stdenv.mkDerivation (args // {
       '';
 
     platforms = with platforms; linux ++ darwin;
-    broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06";
+    broken = stdenv.isAarch64 && !lib.versionAtLeast version "4.06";
   };
 
 })
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index 8459f26367e..e13f3006be5 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, ncurses }:
+{ lib, stdenv, fetchurl, xlibsWrapper, ncurses }:
 
 stdenv.mkDerivation ({
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = "http://www.metaocaml.org/";
-    license = with stdenv.lib.licenses; [ qpl lgpl2 ];
+    license = with lib.licenses; [ qpl lgpl2 ];
     description = "A compiled, type-safe, multi-stage programming language";
     broken = true;
   };
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 864bb8e1b26..5e648c9de4a 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, perl, jdk
+{ lib, stdenv, fetchFromGitHub, which, perl, jdk
 , ocamlPackages, openssl
 , coreutils, zlib, ncurses, makeWrapper
 , gcc, binutils, gnumake, nodejs
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   # Paths so the opa compiler code generation will use the same programs as were
   # used to build opa.
-  codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
+  codeGeneratorPaths = lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
 
   preConfigure = ''
     patchShebangs .
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4
   ]);
 
-  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
   postInstall = ''
     # Have compiler use same tools for code generation as used to build it.
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
       Opa is concise, simple, concurrent, dynamically distributed, and secure.
     '';
     homepage = "http://opalang.org/";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.kkallio ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.kkallio ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index 7636b251e62..9687f1b1a66 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -1,6 +1,6 @@
 # Binaries provided by Open Dylan to be used to bootstrap from source.
 # The binaries can also be used as is.
-{stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:
+{lib, stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:
 
 stdenv.mkDerivation {
   name = "opendylan-2013.2";
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://opendylan.org";
     description = "A multi-paradigm functional and object-oriented programming language";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix
index 5abc40cc3bb..45b2454259f 100644
--- a/pkgs/development/compilers/opendylan/default.nix
+++ b/pkgs/development/compilers/opendylan/default.nix
@@ -1,5 +1,5 @@
 # Build Open Dylan from source using the binary builds to bootstrap.
-{stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
+{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
 
 stdenv.mkDerivation {
   name = "opendylan-2016.1pre";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://opendylan.org";
     description = "A multi-paradigm functional and object-oriented programming language";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index fc896f43d28..18440a718d1 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -136,7 +136,7 @@ let
 
     disallowedReferences = [ openjdk11-bootstrap ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index 75f114e9fbf..0b3a4db6c48 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -140,7 +140,7 @@ let
 
     disallowedReferences = [ openjdk11 ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index ee99cb93a1a..7c6fe633c49 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -140,7 +140,7 @@ let
 
     disallowedReferences = [ openjdk13-bootstrap ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
index 6faff92c508..bda6444a8f9 100644
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -141,7 +141,7 @@ let
 
     disallowedReferences = [ openjdk14-bootstrap ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
index 0b659b95aa8..64654351886 100644
--- a/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
+{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
   jce-policies = fetchurl {
     # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
@@ -52,7 +52,7 @@ let
       home = jdk;
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       license = licenses.gpl2;
       platforms = platforms.darwin;
     };
diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index 8afaf90f943..4df180c1f5a 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
+{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
   jce-policies = fetchurl {
     # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
@@ -56,7 +56,7 @@ let
       home = jdk;
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       license = licenses.gpl2;
       platforms = platforms.darwin;
     };
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index f10ede2506a..8885db4115e 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
+{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
   jce-policies = fetchurl {
     # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
@@ -52,7 +52,7 @@ let
       home = jdk;
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       license = licenses.gpl2;
       platforms = platforms.darwin;
     };
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 3888d6d6982..ddd523ad787 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -141,7 +141,7 @@ let
 
     disallowedReferences = [ openjdk15-bootstrap ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://openjdk.java.net/";
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 30762d7811a..8688831cdaa 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -103,7 +103,7 @@ in makePackage {
 
   passthru.deps = deps;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://openjdk.java.net/projects/openjfx/";
     license = licenses.gpl2;
     description = "The next-generation Java client toolkit";
diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix
index d491250bd93..21801b8ba3a 100644
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -107,7 +107,7 @@ in makePackage {
 
   passthru.deps = deps;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://openjdk.java.net/projects/openjfx/";
     license = licenses.gpl2;
     description = "The next-generation Java client toolkit";
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix
index fe10f43abd5..abf5623b582 100644
--- a/pkgs/development/compilers/openspin/default.nix
+++ b/pkgs/development/compilers/openspin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "openspin";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     mv build/openspin $out/bin/openspin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU";
     homepage = "https://github.com/parallaxinc/OpenSpin";
     license = licenses.mit;
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 17030cf5bf1..c44d7fc116f 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -6,7 +6,7 @@
 }:
 
 { swingSupport ? true
-, stdenv
+, lib, stdenv
 , requireFile
 , makeWrapper
 , unzip
@@ -85,7 +85,7 @@ let result = stdenv.mkDerivation rec {
     };
 
   nativeBuildInputs = [ file ]
-    ++ stdenv.lib.optional installjce unzip;
+    ++ lib.optional installjce unzip;
 
   buildInputs = [ makeWrapper ];
 
@@ -149,7 +149,7 @@ let result = stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
+    rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
 
     # set all the dynamic linkers
     find $out -type f -perm -0100 \
@@ -174,7 +174,7 @@ let result = stdenv.mkDerivation rec {
     [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
     (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
 
-  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+  rpath = lib.strings.makeLibraryPath libraries;
 
   passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
 
@@ -184,7 +184,7 @@ let result = stdenv.mkDerivation rec {
 
   passthru.architecture = architecture;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.unfree;
     platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
   };
diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
index b73270e8dd8..7e0e5cae7ca 100644
--- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , requireFile
 , xorg
 , zlib
@@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    rpath="$out/lib/jli:$out/lib/server:$out/lib:${stdenv.lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
+    rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
 
     for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
@@ -47,7 +47,7 @@ let result = stdenv.mkDerivation rec {
 
   dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
index 427c7cedad1..b1655cd8b8f 100644
--- a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , requireFile
 , xorg
 , zlib
@@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    rpath="$out/lib/jli:$out/lib/server:$out/lib:${stdenv.lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
+    rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
 
     for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
@@ -47,7 +47,7 @@ let result = stdenv.mkDerivation rec {
 
   dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 210aa786cdd..40c89d0cc59 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, meson, ninja
+{ lib, stdenv, fetchurl, meson, ninja
 , gtk-doc ? null, file, docbook_xsl
 , buildDevDoc ? gtk-doc != null
 }: let
-  inherit (stdenv.lib) optional optionals;
+  inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "orc";
   version = "0.4.32";
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Oil Runtime Compiler";
     homepage = "https://gstreamer.freedesktop.org/projects/orc.html";
     # The source code implementing the Marsenne Twister algorithm is licensed
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index b1f9dae4fcd..a4111f71998 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr,
+{ clangStdenv, lib, stdenv, fetchFromGitHub, cmake, zlib, openexr,
 openimageio, llvm, boost165, flex, bison, partio, pugixml,
 util-linux, python
 }:
@@ -29,7 +29,7 @@ in clangStdenv.mkDerivation rec {
      python # CMake doesn't check this?
   ];
   # TODO: How important is partio? CMake doesn't seem to find it
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Advanced shading language for production GI renderers";
     homepage = "http://opensource.imageworks.com/?p=osl";
     maintainers = with maintainers; [ hodapp ];
diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix
index 93713af99b4..1d8ba03e72f 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, coreutils, which }:
+{ lib, stdenv, fetchFromGitLab, coreutils, which }:
 
 stdenv.mkDerivation rec {
   pname = "owl-lisp";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # tests are run as part of the compilation process
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A functional Scheme for world domination";
     homepage    = "https://gitlab.com/owl-lisp/owl";
     license     = licenses.mit;
diff --git a/pkgs/development/compilers/pakcs/curry-base.nix b/pkgs/development/compilers/pakcs/curry-base.nix
index b34a2146383..660a4f2de40 100644
--- a/pkgs/development/compilers/pakcs/curry-base.nix
+++ b/pkgs/development/compilers/pakcs/curry-base.nix
@@ -1,5 +1,5 @@
 { mkDerivation, base, Cabal, containers, directory, extra, filepath
-, mtl, parsec, pretty, stdenv, time, transformers
+, mtl, parsec, pretty, lib, stdenv, time, transformers
 }:
 mkDerivation {
   pname = "curry-base";
@@ -12,5 +12,5 @@ mkDerivation {
   testHaskellDepends = [ base Cabal filepath mtl ];
   homepage = "http://curry-language.org";
   description = "Functions for manipulating Curry programs";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/pakcs/curry-frontend.nix b/pkgs/development/compilers/pakcs/curry-frontend.nix
index b169578c7c3..8fd1645ee70 100644
--- a/pkgs/development/compilers/pakcs/curry-frontend.nix
+++ b/pkgs/development/compilers/pakcs/curry-frontend.nix
@@ -1,6 +1,6 @@
 { mkDerivation, base, bytestring, Cabal, containers, curry-base
 , directory, extra, file-embed, filepath, mtl, network-uri, pretty
-, process, set-extra, stdenv, template-haskell, transformers
+, process, set-extra, lib, stdenv, template-haskell, transformers
 }:
 mkDerivation {
   pname = "curry-frontend";
@@ -22,5 +22,5 @@ mkDerivation {
   testHaskellDepends = [ base Cabal curry-base filepath ];
   homepage = "http://curry-language.org";
   description = "Compile the functional logic language Curry to several intermediate formats";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 9f876ea914a..98fab9eb210 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
+{ lib, stdenv, fetchurl, makeWrapper
 , haskellPackages, haskell
 , which, swiProlog, rlwrap, tk
 , curl, git, unzip, gnutar, coreutils, sqlite }:
@@ -74,10 +74,10 @@ in stdenv.mkDerivation {
 
     # List of dependencies from currytools/cpm/src/CPM/Main.curry
     wrapProgram $out/pakcs/bin/cypm \
-      --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl git unzip gnutar coreutils sqlite ]}"
+      --prefix PATH ":" "${lib.makeBinPath [ curl git unzip gnutar coreutils sqlite ]}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.informatik.uni-kiel.de/~pakcs/";
     description = "An implementation of the multi-paradigm declarative language Curry";
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix
index ce228c2f1cb..44c6ea0a16a 100644
--- a/pkgs/development/compilers/pforth/default.nix
+++ b/pkgs/development/compilers/pforth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation {
   version = "28";
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Portable ANSI style Forth written in ANSI C";
     homepage = "http://www.softsynth.com/pforth/";
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ yrashk ];
+    license = lib.licenses.publicDomain;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ yrashk ];
   };
 }
diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix
index 960b5ce1c2c..159dec05e29 100644
--- a/pkgs/development/compilers/picat/default.nix
+++ b/pkgs/development/compilers/picat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib }:
+{ lib, stdenv, fetchurl, zlib }:
 
 let
   ARCH = {
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH";
   installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Logic-based programming langage";
     homepage    = "http://picat-lang.org/";
     license     = licenses.mpl20;
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 714adfb0e4c..7858e3f6dc1 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, autoreconfHook}:
+{lib, stdenv, fetchurl, autoreconfHook}:
 
 let
   version = "5.6";
@@ -8,11 +8,11 @@ stdenv.mkDerivation {
   pname = "polyml";
   inherit version;
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  buildInputs = lib.optional stdenv.isDarwin autoreconfHook;
 
   src = fetchurl {
     url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
       Poly/ML is a full implementation of Standard ML.
     '';
     homepage = "https://www.polyml.org/";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.lgpl21;
+    platforms = with lib.platforms; linux;
     maintainers = [ #Add your name here!
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index ce8c033e4be..5ac6990383c 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
   pname = "polyml";
   version = "5.7.1";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libffi gmp ];
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
 
   configureFlags = [
     "--enable-shared"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standard ML compiler and interpreter";
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 7b15a988e38..d2a15033422 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
   pname = "polyml";
   version = "5.8.1";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
   buildInputs = [ libffi gmp ];
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
 
   configureFlags = [
     "--enable-shared"
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gcx2fjiwsiazlyfhm7zlrd563blc4fy9w2mspib9divbavaxin6";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standard ML compiler and interpreter";
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index df80fe2fdb6..e34ed4b157d 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll,
+{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll,
   cc ? stdenv.cc, lto ? !stdenv.isDarwin }:
 
 stdenv.mkDerivation (rec {
@@ -80,8 +80,8 @@ stdenv.mkDerivation (rec {
     "PONYC_VERSION=${version}"
     "prefix=${placeholder "out"}"
   ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ]
-    ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ];
+    ++ lib.optionals stdenv.isDarwin [ "bits=64" ]
+    ++ lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ];
 
   doCheck = true;
 
@@ -89,20 +89,20 @@ stdenv.mkDerivation (rec {
 
   installPhase = ''
     make config=release prefix=$out ''
-    + stdenv.lib.optionalString stdenv.isDarwin '' bits=64 ''
-    + stdenv.lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no ''
+    + lib.optionalString stdenv.isDarwin '' bits=64 ''
+    + lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no ''
     + '' install
 
     wrapProgram $out/bin/ponyc \
       --prefix PATH ":" "${stdenv.cc}/bin" \
       --set-default CC "$CC" \
-      --prefix PONYPATH : "${stdenv.lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}"
+      --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}"
   '';
 
   # Stripping breaks linking for ponyc
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
     homepage = "https://www.ponylang.org";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix
index 7cf3000e9db..5da1ec77016 100644
--- a/pkgs/development/compilers/ponyc/pony-corral.nix
+++ b/pkgs/development/compilers/ponyc/pony-corral.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ponyc }:
+{ lib, stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation ( rec {
   pname = "corral";
@@ -15,7 +15,7 @@ stdenv.mkDerivation ( rec {
 
   installFlags = [ "prefix=${placeholder "out"}" "install" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Corral is a dependency management tool for ponylang (ponyc)";
     homepage = "https://www.ponylang.io";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 3c1b2a0f91b..8e581050897 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, ponyc }:
+{lib, stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation rec {
   pname = "pony-stable";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple dependency manager for the Pony language";
     homepage = "https://www.ponylang.org";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ dipinhora kamilchm patternspandemic ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 8dd19ecf858..741d0ec7d1c 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
     minimal-module = pkgs.callPackage ./test-minimal-module {};
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A strongly-typed functional programming language that compiles to JavaScript";
     homepage = "https://www.purescript.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix
index 436b03e499c..9ebcb2242dd 100644
--- a/pkgs/development/compilers/qbe/default.nix
+++ b/pkgs/development/compilers/qbe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 , unstableGitUpdater
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://c9x.me/compile/";
     description = "A small compiler backend written in C";
     maintainers = with maintainers; [ fgaz ];
diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix
index 37e07a230ae..c2415899f6b 100644
--- a/pkgs/development/compilers/rasm/default.nix
+++ b/pkgs/development/compilers/rasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "rasm";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     install -Dt $out/bin rasm
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.roudoudou.com/rasm/";
     description = "Z80 assembler";
     # use -n option to display all licenses
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 435813ee5e7..2807ddb6b5f 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2
+{ lib, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2
 , fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://reasonml.github.io/";
     description = "Facebook's friendly syntax to OCaml";
     license = licenses.mit;
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index 4c8a4cfd4ef..6bc74971c4e 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}:
+{lib, stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}:
 
 # TODO: byacc is the recommended parser generator but due to https://github.com/rednex/rgbds/issues/333
 # it does not work for the moment. We should switch back to byacc as soon as the fix is integrated
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ bison flex pkg-config libpng ];
   installFlags = [ "PREFIX=\${out}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://rednex.github.io/rgbds/";
     description = "A free assembler/linker package for the Game Boy and Game Boy Color";
     license = licenses.mit;
diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index b84e390e0b0..770cc3415f2 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, bash, curl, darwin, zlib
+{ lib, stdenv, makeWrapper, bash, curl, darwin, zlib
 , version
 , src
 , platform
@@ -6,7 +6,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optionalString;
+  inherit (lib) optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
   bootstrapping = versionType == "bootstrap";
@@ -24,7 +24,7 @@ rec {
     inherit version;
     inherit src;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://www.rust-lang.org/";
       description = "A safe, concurrent, practical language";
       maintainers = with maintainers; [ qknight ];
@@ -32,7 +32,7 @@ rec {
     };
 
     buildInputs = [ bash ]
-      ++ stdenv.lib.optional stdenv.isDarwin Security;
+      ++ lib.optional stdenv.isDarwin Security;
 
     postPatch = ''
       patchShebangs .
@@ -46,7 +46,7 @@ rec {
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/rustc"
-        '' + optionalString (stdenv.lib.versionAtLeast version "1.46")
+        '' + optionalString (lib.versionAtLeast version "1.46")
         # rustc bootstrap needs libz starting from 1.46
         ''
           ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1
@@ -76,7 +76,7 @@ rec {
     inherit version;
     inherit src;
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "http://www.rust-lang.org/";
       description = "A safe, concurrent, practical language";
       maintainers = with maintainers; [ qknight ];
@@ -84,7 +84,7 @@ rec {
     };
 
     buildInputs = [ makeWrapper bash ]
-      ++ stdenv.lib.optional stdenv.isDarwin Security;
+      ++ lib.optional stdenv.isDarwin Security;
 
     postPatch = ''
       patchShebangs .
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 40acb925d10..3a7f29e3229 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,4 +1,4 @@
-{ stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib
+{ lib, stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib
 , installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc
 , CoreFoundation, Security
 }:
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ];
   buildInputs = [ cacert file curl python3 openssl zlib ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
+    ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
 
   # cargo uses git-rs which is made for a version of libgit2 from recent master that
   # is not compatible with the current version in nixpkgs.
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage {
   # Disable check phase as there are failures (4 tests fail)
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://crates.io";
     description = "Downloads your Rust project's dependencies and builds your project";
     maintainers = with maintainers; [ retrry ];
diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix
index 0546ad9bac1..a3597e9febf 100644
--- a/pkgs/development/compilers/rust/clippy.nix
+++ b/pkgs/development/compilers/rust/clippy.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage {
   # changes hash of vendor directory otherwise
   dontUpdateAutotoolsGnuConfigScripts = true;
 
-  buildInputs = [ rustc rustc.llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ rustc rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ];
 
   # fixes: error: the option `Z` is only accepted on the nightly compiler
   RUSTC_BOOTSTRAP = 1;
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage {
   #   (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm)
   doCheck = false;
 
-  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  preFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://rust-lang.github.io/rust-clippy/";
     description = "A bunch of lints to catch common mistakes and improve your Rust code";
     maintainers = with maintainers; [ basvandijk ];
diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix
index c57b28aee51..ee860d78258 100644
--- a/pkgs/development/compilers/rust/rls/default.nix
+++ b/pkgs/development/compilers/rust/rls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchFromGitHub, rustPlatform
+{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform
 , openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
 , CoreFoundation, Security }:
 
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ]
-    ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
+    ++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
 
   doCheck = true;
 
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
     wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
     homepage = "https://github.com/rust-lang/rls/";
     license = with licenses; [ asl20 /* or */ mit ];
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a5c24a5fc69..e27c190acd7 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,4 +1,4 @@
-{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
+{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
 , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget
 , fetchurl, file, python3
 , darwin, cmake, rust, rustPlatform
@@ -12,7 +12,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optionals optional optionalString concatStringsSep;
+  inherit (lib) optionals optional optionalString concatStringsSep;
   inherit (darwin.apple_sdk.frameworks) Security;
 in stdenv.mkDerivation rec {
   pname = "rustc";
@@ -143,7 +143,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "man" "doc" ];
   setOutputFlags = false;
 
-  postInstall = stdenv.lib.optionalString enableRustcDev ''
+  postInstall = lib.optionalString enableRustcDev ''
     # install rustc-dev components. Necessary to build rls, clippy...
     python x.py dist rustc-dev
     tar xf build/dist/rustc-dev*tar.gz
@@ -172,7 +172,7 @@ in stdenv.mkDerivation rec {
 
   passthru.llvm = llvmShared;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.rust-lang.org/";
     description = "A safe, concurrent, practical language";
     maintainers = with maintainers; [ madjar cstrahan globin havvy ];
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index 6215c936c6d..b3191c242fe 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, Security }:
+{ lib, stdenv, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rustfmt";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   # changes hash of vendor directory otherwise
   dontUpdateAutotoolsGnuConfigScripts = true;
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler
   RUSTC_BOOTSTRAP = 1;
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly";
   CFG_RELEASE_CHANNEL = "nightly";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for formatting Rust code according to style guidelines";
     homepage = "https://github.com/rust-lang-nursery/rustfmt";
     license = with licenses; [ mit asl20 ];
diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix
index ff40c622f1e..b421fe5d2ef 100644
--- a/pkgs/development/compilers/sagittarius-scheme/default.nix
+++ b/pkgs/development/compilers/sagittarius-scheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , cmake
 , pkg-config
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
            '';
   nativeBuildInputs = [ pkg-config cmake ];
 
-  buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc;
+  buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An R6RS/R7RS Scheme system";
     longDescription = ''
       Sagittarius Scheme is a free Scheme implementation supporting
diff --git a/pkgs/development/compilers/sbcl/2.0.9.nix b/pkgs/development/compilers/sbcl/2.0.9.nix
index 148ecccf131..ada098ec182 100644
--- a/pkgs/development/compilers/sbcl/2.0.9.nix
+++ b/pkgs/development/compilers/sbcl/2.0.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, sbclBootstrap
+{ lib, stdenv, fetchurl, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system)
 , disableImmobileSpace ? false
@@ -70,17 +70,17 @@ stdenv.mkDerivation rec {
     export HOME=$PWD/test-home
   '';
 
-  enableFeatures = with stdenv.lib;
+  enableFeatures = with lib;
     optional threadSupport "sb-thread" ++
     optional stdenv.isAarch32 "arm";
 
-  disableFeatures = with stdenv.lib;
+  disableFeatures = with lib;
     optional (!threadSupport) "sb-thread" ++
     optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ];
 
   buildPhase = ''
     sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${
-                  stdenv.lib.concatStringsSep " "
+                  lib.concatStringsSep " "
                     (builtins.map (x: "--with-${x}") enableFeatures ++
                      builtins.map (x: "--without-${x}") disableFeatures)
                 }
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     INSTALL_ROOT=$out sh install.sh
   ''
-  + stdenv.lib.optionalString (!purgeNixReferences) ''
+  + lib.optionalString (!purgeNixReferences) ''
     cp -r src $out/lib/sbcl
     cp -r contrib $out/lib/sbcl
     cat >$out/lib/sbcl/sbclrc <<EOF
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" ''
+  setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" ''
     addEnvHooks "$targetOffset" _setSbclHome
     _setSbclHome() {
       export SBCL_HOME='@out@/lib/sbcl/'
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 81afe64ed53..cb42235bc8e 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper }:
+{ lib, stdenv, fetchurl, makeWrapper }:
 
 let
   options = rec {
@@ -65,11 +65,11 @@ stdenv.mkDerivation rec {
       --add-flags "--core $out/share/sbcl/sbcl.core"
   '';
 
-  postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) ''
+  postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) ''
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lisp compiler";
     homepage = "http://www.sbcl.org";
     license = licenses.publicDomain; # and FreeBSD
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 3c7fca3c4b0..df80bb8af1d 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, sbclBootstrap
+{ lib, stdenv, fetchurl, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system)
 , disableImmobileSpace ? false
@@ -70,17 +70,17 @@ stdenv.mkDerivation rec {
     export HOME=$PWD/test-home
   '';
 
-  enableFeatures = with stdenv.lib;
+  enableFeatures = with lib;
     optional threadSupport "sb-thread" ++
     optional stdenv.isAarch32 "arm";
 
-  disableFeatures = with stdenv.lib;
+  disableFeatures = with lib;
     optional (!threadSupport) "sb-thread" ++
     optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ];
 
   buildPhase = ''
     sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${
-                  stdenv.lib.concatStringsSep " "
+                  lib.concatStringsSep " "
                     (builtins.map (x: "--with-${x}") enableFeatures ++
                      builtins.map (x: "--without-${x}") disableFeatures)
                 }
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     INSTALL_ROOT=$out sh install.sh
   ''
-  + stdenv.lib.optionalString (!purgeNixReferences) ''
+  + lib.optionalString (!purgeNixReferences) ''
     cp -r src $out/lib/sbcl
     cp -r contrib $out/lib/sbcl
     cat >$out/lib/sbcl/sbclrc <<EOF
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" ''
+  setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" ''
     addEnvHooks "$targetOffset" _setSbclHome
     _setSbclHome() {
       export SBCL_HOME='@out@/lib/sbcl/'
diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix
index 5b4c3a610f1..a747206dff8 100644
--- a/pkgs/development/compilers/scala/2.x.nix
+++ b/pkgs/development/compilers/scala/2.x.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       #!${stdenv.shell}
       set -o errexit
       PATH=${
-        stdenv.lib.makeBinPath [
+        lib.makeBinPath [
           common-updater-scripts
           coreutils
           git
diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix
index cefa4537c36..b173de58049 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/pkgs/development/compilers/scala/dotty-bare.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, ncurses }:
+{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "0.26.0-RC1";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
         done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Research platform for new language concepts and compiler technologies for Scala";
     longDescription = ''
        Dotty is a platform to try out new language concepts and compiler technologies for Scala.
diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 3d3d43a55e5..500c0b4d395 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null
+{ lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null
 , excludePorts ? [] }:
 
-with stdenv.lib;
+with lib;
 
 let
   # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix
index 4bf89973d7e..7fc1fc7b1b6 100644
--- a/pkgs/development/compilers/seexpr/default.nix
+++ b/pkgs/development/compilers/seexpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
+{ lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
 bison, flex, libGLU, pythonPackages
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Embeddable expression evaluation engine from Disney Animation";
     homepage = "https://www.disneyanimation.com/technology/seexpr.html";
     maintainers = with maintainers; [ hodapp ];
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix
index 2459127f425..775a78a9734 100644
--- a/pkgs/development/compilers/serpent/default.nix
+++ b/pkgs/development/compilers/serpent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ... }:
+{ lib, stdenv, fetchFromGitHub, ... }:
 
 stdenv.mkDerivation {
   pname = "serpent";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     mv serpent $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for the Serpent language for Ethereum";
     longDescription = ''
       Serpent is one of the high-level programming languages used to
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 23532cc8446..678ab3adb06 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python3 }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3 }:
 # Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use
 # the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from
 # https://github.com/google/shaderc/blob/known-good/known_good.json
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "A collection of tools, libraries and tests for shader compilation";
     license = [ licenses.asl20 ];
diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix
index 55d96266ac9..113b22768d9 100644
--- a/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
+{ lib, stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "smlnj-bootstrap";
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Compiler for the Standard ML '97 programming language";
     homepage    = "http://www.smlnj.org";
-    license     = stdenv.lib.licenses.free;
-    platforms   = stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.jwiegley ];
+    license     = lib.licenses.free;
+    platforms   = lib.platforms.darwin;
+    maintainers = [ lib.maintainers.jwiegley ];
   };
 }
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 18562bc487a..3e987e8ccda 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 let
   version = "110.95";
   baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
@@ -79,7 +79,7 @@ in stdenv.mkDerivation {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Standard ML of New Jersey, a compiler";
     homepage    = "http://smlnj.org";
     license     = licenses.bsd3;
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 0f0af33e700..546697d8efe 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,13 +1,12 @@
-{ gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
+{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
 , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
 , cln ? null, gmp ? null
 }:
 
 # compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
 # general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS
-let stdenv = gccStdenv; in
 
-assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0";
+assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
 assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
 
 let
@@ -18,7 +17,7 @@ let
     sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
   };
 in
-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation rec {
 
   pname = "solc";
   version = "0.7.4";
@@ -36,20 +35,20 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBoost_USE_STATIC_LIBS=OFF"
-  ] ++ stdenv.lib.optionals (!z3Support) [
+  ] ++ lib.optionals (!z3Support) [
     "-DUSE_Z3=OFF"
-  ] ++ stdenv.lib.optionals (!cvc4Support) [
+  ] ++ lib.optionals (!cvc4Support) [
     "-DUSE_CVC4=OFF"
   ];
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost ]
-    ++ stdenv.lib.optionals z3Support [ z3 ]
-    ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ];
+    ++ lib.optionals z3Support [ z3 ]
+    ++ lib.optionals cvc4Support [ cvc4 cln gmp ];
   checkInputs = [ ncurses python3 ];
 
   # Test fails on darwin for unclear reason
-  doCheck = stdenv.hostPlatform.isLinux;
+  doCheck = gccStdenv.hostPlatform.isLinux;
 
   checkPhase = ''
     while IFS= read -r -d ''' dir
@@ -68,7 +67,7 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for Ethereum smart contract language Solidity";
     homepage = "https://github.com/ethereum/solidity";
     license = licenses.gpl3;
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index ba13cd7b4b2..e57062642ba 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , perl, ncurses, zlib, sqlite, libffi
 , autoreconfHook, mcpp, bison, flex, doxygen, graphviz
 , makeWrapper
@@ -6,7 +6,7 @@
 
 
 let
-  toolsPath = stdenv.lib.makeBinPath [ mcpp ];
+  toolsPath = lib.makeBinPath [ mcpp ];
 in
 stdenv.mkDerivation rec {
   pname = "souffle";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A translator of declarative Datalog programs into the C++ language";
     homepage    = "https://souffle-lang.github.io/";
     platforms   = platforms.unix;
diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/development/compilers/spasm-ng/default.nix
index 8eb0ddb59ef..bd31719731e 100644
--- a/pkgs/development/compilers/spasm-ng/default.nix
+++ b/pkgs/development/compilers/spasm-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }:
+{ lib, stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "spasm-ng";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     install -Dm755 spasm -t $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/alberthdev/spasm-ng";
     description = "Z80 assembler with extra features to support development for TI calculators";
     license     = licenses.gpl2Plus;
diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix
index 73af5f0c985..324e0b07ad8 100644
--- a/pkgs/development/compilers/spirv-llvm-translator/default.nix
+++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator";
     description = "A tool and a library for bi-directional translation between SPIR-V and LLVM IR";
     license     = licenses.ncsa;
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index f62e86461f9..7d531181d1d 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
+{ lib, stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
 , libpthreadstubs, pango, pkg-config, libpulseaudio, which }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     for i in squeak.in squeak.sh.in; do
       substituteInPlace unix/cmake/$i --replace "PATH=" \
-        "PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #"
+        "PATH=${lib.makeBinPath [ coreutils gnused which ]} #"
     done
   '';
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Smalltalk programming language and environment";
     longDescription = ''
       Squeak is a full-featured implementation of the Smalltalk programming
diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix
index e37b207b4f2..40ab4abf885 100644
--- a/pkgs/development/compilers/stalin/default.nix
+++ b/pkgs/development/compilers/stalin/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncompress, libX11 }:
+{ fetchurl, lib, stdenv, ncompress, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "stalin-0.11";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.ece.purdue.edu/~qobi/software.html";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     description = "An optimizing Scheme compiler";
 
     maintainers = [ ];
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 66d2add98b1..ce666852e38 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
+{ lib, stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
 , libarchive, db, pcre, libedit, libossp_uuid, libXpm
 , libSM, libXt, freetype, pkg-config, fontconfig
 , cmake, libyaml, Security
@@ -31,9 +31,9 @@ stdenv.mkDerivation {
   buildInputs = [ gmp readline openssl
     libarchive libyaml db pcre libedit libossp_uuid
     zlib ]
-  ++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
+  ++ lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
   ++ extraLibraries
-  ++ stdenv.lib.optional stdenv.isDarwin Security;
+  ++ lib.optional stdenv.isDarwin Security;
 
   hardeningDisable = [ "format" ];
 
@@ -46,9 +46,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.swi-prolog.org";
     description = "A Prolog compiler and interpreter";
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.optionals (!withGui) stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.meditans ];
+    platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin;
+    maintainers = [ lib.maintainers.meditans ];
   };
 }
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 6b873810764..bf181d07f28 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , cmake
 , coreutils
 , glibc
@@ -121,7 +121,7 @@ let
 
   cmakeFlags = [
     "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include"
-    "-DC_INCLUDE_DIRS=${stdenv.lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2"
+    "-DC_INCLUDE_DIRS=${lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2"
     "-DGCC_INSTALL_PREFIX=${gccForLibs}"
   ];
 
@@ -282,7 +282,7 @@ stdenv.mkDerivation {
       installable_package=$INSTALLABLE_PACKAGE \
       install_prefix=$out \
       install_destdir=$SWIFT_INSTALL_DIR \
-      extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"
+      extra_cmake_options="${lib.concatStringsSep "," cmakeFlags}"
   '';
 
   doCheck = true;
@@ -323,7 +323,7 @@ stdenv.mkDerivation {
   # Hack to avoid build and install directories in RPATHs.
   preFixup = ''rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Swift Programming Language";
     homepage = "https://github.com/apple/swift";
     maintainers = with maintainers; [ dtzWill ];
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index e8478828c1b..bd50ea9caaa 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchFromGitHub
 , llvmPackages, ncurses, lua
 }:
 
@@ -34,13 +34,13 @@ stdenv.mkDerivation rec {
       --replace '-lcurses' '-lncurses'
 
     substituteInPlace src/terralib.lua \
-      --subst-var-by NIX_LIBC_INCLUDE ${stdenv.lib.getDev stdenv.cc.libc}/include
+      --subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include
   '';
 
   preBuild = ''
     cat >Makefile.inc<<EOF
-    CLANG = ${stdenv.lib.getBin llvmPackages.clang-unwrapped}/bin/clang
-    LLVM_CONFIG = ${stdenv.lib.getBin llvmPackages.llvm}/bin/llvm-config
+    CLANG = ${lib.getBin llvmPackages.clang-unwrapped}/bin/clang
+    LLVM_CONFIG = ${lib.getBin llvmPackages.llvm}/bin/llvm-config
     EOF
 
     mkdir -p build
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     cp -rv release/include/terra $dev/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A low-level counterpart to Lua";
     homepage    = "http://terralang.org/";
     platforms   = platforms.x86_64;
diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 6768d0c1cbe..74ba1866b55 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, omake, ocaml, flex, bison }:
+{ lib, stdenv, fetchurl, omake, ocaml, flex, bison }:
 
 let
   version = "2.1";
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
 
   installPhase = "mkdir -p $out/bin && cp tj* $out/bin";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An efficient implementation of the Lambda Prolog language";
     homepage = "https://github.com/teyjus/teyjus";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
     maintainers = [ maintainers.bcdarwin ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix
index 01c44718f11..2bb8b9d5be3 100644
--- a/pkgs/development/compilers/tvm/default.nix
+++ b/pkgs/development/compilers/tvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "tvm";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # not mangle the legitimate use of the opt/ folder.
   dontFixCmake = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://tvm.apache.org/";
     description = "An End to End Deep Learning Compiler Stack for CPUs, GPUs and accelerators";
     license = licenses.asl20;
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index 7ae16a77a26..433e07c68b0 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoPatchelfHook
+{ lib, stdenv, fetchurl, autoPatchelfHook
 , ncurses5, zlib, gmp
 , makeWrapper
 , less
@@ -25,16 +25,16 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontConfigure = true;
 
-  nativeBuildInputs = [ makeWrapper ] ++ (stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook);
-  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ];
+  nativeBuildInputs = [ makeWrapper ] ++ (lib.optional (!stdenv.isDarwin) autoPatchelfHook);
+  buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ];
 
   installPhase = ''
     mkdir -p $out/bin
     mv ucm $out/bin
-    wrapProgram $out/bin/ucm --prefix PATH ":" "${stdenv.lib.makeBinPath [ less ]}";
+    wrapProgram $out/bin/ucm --prefix PATH ":" "${lib.makeBinPath [ less ]}";
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Modern, statically-typed purely functional language";
     homepage = "https://unisonweb.org/";
     license = with licenses; [ mit bsd3 ];
diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix
index 812792a125e..f7e338cf43f 100644
--- a/pkgs/development/compilers/urn/default.nix
+++ b/pkgs/development/compilers/urn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline
+{ lib, stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline
 , useLuaJit ? false
 , extraLibraries ? []
 }:
@@ -17,7 +17,7 @@ let
               [ lua ];
   };
 
-  inherit (stdenv.lib) optionalString concatMapStringsSep;
+  inherit (lib) optionalString concatMapStringsSep;
 in
 
 stdenv.mkDerivation {
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
       --prefix LD_LIBRARY_PATH : ${urn-rt}/lib/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://urn-lang.com";
     description = "Yet another Lisp variant which compiles to Lua";
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index ac324167f97..e2d9d1f226e 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, openssl, mlton
+{ lib, stdenv, fetchurl, file, openssl, mlton
 , libmysqlclient, postgresql, sqlite, gcc, icu
 }:
 
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Advanced purely-functional web programming language";
     homepage    = "http://www.impredicative.com/ur/";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.sheganinans ];
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = [ lib.maintainers.thoughtpolice lib.maintainers.sheganinans ];
   };
 }
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 47a11489917..222ad903ec1 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -92,7 +92,7 @@ let
     #  };
     # };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Compiler for GObject type system";
       homepage = "https://wiki.gnome.org/Projects/Vala";
       license = licenses.lgpl21Plus;
diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix
index fba11a06a6e..f53d6d4c382 100644
--- a/pkgs/development/compilers/vlang/default.nix
+++ b/pkgs/development/compilers/vlang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }:
+{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, upx ? null }:
 
 assert stdenv.hostPlatform.isUnix -> upx != null;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   propagatedBuildInputs = [ glfw freetype openssl ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isUnix upx;
+    ++ lib.optional stdenv.hostPlatform.isUnix upx;
 
   buildPhase = ''
     runHook preBuild
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://vlang.io/";
     description = "Simple, fast, safe, compiled language for developing maintainable software";
     license = licenses.mit;
diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix
index 3a584ab2018..79702c01bee 100644
--- a/pkgs/development/compilers/vyper/default.nix
+++ b/pkgs/development/compilers/vyper/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     $out/bin/vyper "${sample-contract}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Pythonic Smart Contract Language for the EVM";
     homepage = "https://github.com/vyperlang/vyper";
     license = licenses.asl20;
diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix
index b6030da49d3..644e9ad646a 100644
--- a/pkgs/development/compilers/wcc/default.nix
+++ b/pkgs/development/compilers/wcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
+{ lib, stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
 
 stdenv.mkDerivation {
   pname = "wcc-unstable";
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/endrazine/wcc";
     description = "Witchcraft compiler collection: tools to convert and script ELF files";
     license = licenses.mit;
diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix
index 0cebbfa520f..b80b460d4de 100644
--- a/pkgs/development/compilers/wla-dx/default.nix
+++ b/pkgs/development/compilers/wla-dx/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, cmake}:
+{lib, stdenv, fetchFromGitHub, cmake}:
 
 stdenv.mkDerivation rec {
   pname = "wla-dx";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.villehelin.com/wla.html";
     description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package";
     license = licenses.gpl2;
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index 9bf6b3d2874..e48bbc90d61 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , automake, autoconf, readline
 , libX11, bluez, SDL2
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     cp -r ../examples $out/share/.
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://x11-basic.sourceforge.net/";
     description = "A Basic interpreter and compiler with graphics capabilities";
     license = licenses.gpl2;
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 100fb236c83..da10125c243 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, gmp, zlib }:
+{ lib, stdenv, fetchurl, readline, gmp, zlib }:
 
 stdenv.mkDerivation rec {
   version = "6.3.3";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
     description = "A ISO-compatible high-performance Prolog compiler";
-    license = stdenv.lib.licenses.artistic2;
+    license = lib.licenses.artistic2;
 
-    maintainers = [ stdenv.lib.maintainers.peti ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.peti ];
+    platforms = lib.platforms.linux;
     broken = !stdenv.is64bit;   # the linux 32 bit build fails.
   };
 }
diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix
index 923a11c1466..48c251d828a 100644
--- a/pkgs/development/compilers/yasm/default.nix
+++ b/pkgs/development/compilers/yasm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "yasm-1.3.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.tortall.net/projects/yasm/";
     description = "Complete rewrite of the NASM assembler";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix
index 0fb73d42b7e..026a205cd26 100644
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/pkgs/development/compilers/z88dk/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }:
+{ fetchFromGitHub, lib, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }:
 
 stdenv.mkDerivation rec {
   pname = "z88dk";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "libs" "install" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.z88dk.org";
     description = "z80 Development Kit";
     license = licenses.clArtistic;
diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/development/compilers/zasm/default.nix
index 174092496ba..97c7aa3c2ac 100644
--- a/pkgs/development/compilers/zasm/default.nix
+++ b/pkgs/development/compilers/zasm/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, zlib, stdenv }:
+{ fetchFromGitHub, zlib, lib, stdenv }:
 let
   libs-src = fetchFromGitHub {
     owner = "megatokio";
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     mv zasm $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Z80 / 8080 assembler (for unix-style OS)";
     homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/";
     license = licenses.bsd2;
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 1a5cba37d47..bd96010e8bf 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }:
 
 llvmPackages.stdenv.mkDerivation rec {
   version = "0.7.1";
@@ -32,7 +32,7 @@ llvmPackages.stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
     homepage = "https://ziglang.org/";
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index bea32475f9a..e81cc412428 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -62,13 +62,13 @@ in stdenv.mkDerivation {
     EOF
   '';
 
-  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+  rpath = lib.strings.makeLibraryPath libraries;
 
   passthru = {
     home = zulu;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.azul.com/products/zulu/";
     license = licenses.gpl2;
     description = "Certified builds of OpenJDK";
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 73e7bd7d338..63b95465c27 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -59,13 +59,13 @@ in stdenv.mkDerivation {
     EOF
   '';
 
-  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+  rpath = lib.strings.makeLibraryPath libraries;
 
   passthru = {
     home = zulu;
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.azul.com/products/zulu/";
     license = licenses.gpl2;
     description = "Certified builds of OpenJDK";
diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
index e51a5937ddb..5646f4e02ba 100644
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, geant_version }:
+{ lib, stdenv, fetchurl, geant_version }:
 
 let
   mkDataset = { name, version, sha256, envvar }:
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 27d67d9af0c..159c746fecd 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     data = import ./datasets.nix {
-          inherit stdenv fetchurl;
+          inherit lib stdenv fetchurl;
           geant_version = version;
       };
 

From bd680be13202fcf171f0e40e9b44383065861ee4 Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Fri, 22 Jan 2021 22:47:58 -0500
Subject: [PATCH 659/956] kind: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index 55f0a0e9f30..6b18102b89b 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -4,16 +4,16 @@ with stdenv.lib;
 
 buildGoModule rec {
   pname = "kind";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     rev    = "v${version}";
     owner  = "kubernetes-sigs";
     repo   = "kind";
-    sha256 = "1kyjmlp1kmr3lwylnya6w392j1qpqgbvcacwpnz3ifyh3pbv32qr";
+    sha256 = "1pp2x4bfqsd15siahyv9xkdyswsipmp9n86iwavrd0xhliqxlsa7";
   };
 
-  vendorSha256 = "04fmqh6lhvvzpvf1l2xk1r8687k5jx2lb5199rgmjbfnjgsa0q2d";
+  vendorSha256 = "0c0j4s8kfzk2b3hy0d2g5bp1zr60l6vnwnpynsg6ksv8spwnpl5m";
 
   doCheck = false;
 

From bdb60d7fa94bb33a3b224f58e7c1b63903c79c21 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 21 Jan 2021 19:17:44 -0300
Subject: [PATCH 660/956] pyspread: init at 1.99.5

---
 pkgs/applications/office/pyspread/default.nix | 68 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/office/pyspread/default.nix

diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix
new file mode 100644
index 00000000000..5b7a80747d0
--- /dev/null
+++ b/pkgs/applications/office/pyspread/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, makePythonPath
+, dateutil
+, matplotlib
+, numpy
+, pyenchant
+, pyqt5
+, pytest
+, python
+, qtsvg
+, runtimeShell
+, wrapQtAppsHook
+}:
+
+buildPythonApplication rec {
+  pname = "pyspread";
+  version = "1.99.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-05bC+Uvx72FAh3qxkgXm8jdb/gHRv1D/M7tjOEdE3Xg=";
+  };
+
+  pythonLibs = [
+    dateutil
+    matplotlib
+    numpy
+    pyenchant
+    pyqt5
+  ];
+
+  nativeBuildInputs = [ wrapQtAppsHook ];
+  buildInputs = pythonLibs ++ [
+    qtsvg
+  ];
+
+  doCheck = false; # it fails miserably with a core dump
+
+  fixupPhase = ''
+    runHook preFixup
+    sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" $out/bin/pyspread
+    wrapProgram $out/bin/pyspread \
+      --prefix PYTHONPATH ':' $(toPythonPath $out):${makePythonPath pythonLibs} \
+      --prefix PATH ':' ${python}/bin/ \
+      ''${qtWrapperArgs[@]}
+    runHook postFixup
+  '';
+
+  meta = with lib; {
+    homepage = "https://pyspread.gitlab.io/";
+    description = "A Python-oriented spreadsheet application";
+    longDescription = ''
+      pyspread is a non-traditional spreadsheet application that is based on and
+      written in the programming language Python. The goal of pyspread is to be
+      the most pythonic spreadsheet.
+
+      pyspread expects Python expressions in its grid cells, which makes a
+      spreadsheet specific language obsolete. Each cell returns a Python object
+      that can be accessed from other cells. These objects can represent
+      anything including lists or matrices.
+    '';
+    license = with licenses; gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd86fed4cb2..c24b95ccc67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7184,6 +7184,10 @@ in
 
   pympress = callPackage ../applications/office/pympress { };
 
+  pyspread = python3Packages.callPackage ../applications/office/pyspread {
+    inherit (qt5) qtsvg wrapQtAppsHook;
+  };
+
   pythonIRClib = pythonPackages.pythonIRClib;
 
   pyditz = callPackage ../applications/misc/pyditz {

From 0bdc35a2ed302d275709be8db46b77ce6078cb95 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Sat, 23 Jan 2021 00:27:25 -0500
Subject: [PATCH 661/956] crawl: 0.25.1 -> 0.26.0

FORCE_PKGCONFIG was added upstream in crawl/crawl@61de54256c8, so we
can drop our patch to the Makefile which does the same thing - nice!
Still need the other patches since crawl/crawl#1367 isn't yet fully
merged.
---
 pkgs/games/crawl/crawl_purify.patch | 20 +++-----------------
 pkgs/games/crawl/default.nix        |  5 +++--
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch
index dda55b09f32..8650141744d 100644
--- a/pkgs/games/crawl/crawl_purify.patch
+++ b/pkgs/games/crawl/crawl_purify.patch
@@ -1,20 +1,5 @@
-diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
---- a/crawl-ref/source/Makefile
-+++ b/crawl-ref/source/Makefile
-@@ -248,9 +248,9 @@ ifeq ($(uname_S),Darwin)
- 	STRIP := strip -x
- 	NEED_APPKIT = YesPlease
- 	LIBNCURSES_IS_UNICODE = Yes
--	NO_PKGCONFIG = Yes
--	BUILD_SQLITE = YesPlease
--	BUILD_ZLIB = YesPlease
-+	#NO_PKGCONFIG = Yes
-+	#BUILD_SQLITE = YesPlease
-+	#BUILD_ZLIB = YesPlease
- 	ifdef TILES
- 		EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -framework AudioToolbox -framework CoreVideo contrib/install/$(ARCH)/lib/libSDL2main.a
- 		BUILD_FREETYPE = YesPlease
 diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
+index f8b576fd63..b95c21c0a1 100755
 --- a/crawl-ref/source/util/find_font
 +++ b/crawl-ref/source/util/find_font
 @@ -1,6 +1,6 @@
@@ -25,7 +10,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
  
  name=$1
  [ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; }
-@@ -11,6 +11,6 @@
+@@ -11,6 +11,6 @@ name=$1
          for dir in $FONTDIRS; do
              [ -d "$dir" ] && echo "$dir"
          done
@@ -34,6 +19,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
        | head -n1
  } 2>/dev/null
 diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
+index e29ccff507..9bf01e040a 100644
 --- a/crawl-ref/source/windowmanager-sdl.cc
 +++ b/crawl-ref/source/windowmanager-sdl.cc
 @@ -20,7 +20,7 @@
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index ec8845b7869..8d16b2fe59c 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
-  version = "0.25.1";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "crawl";
     repo = "crawl";
     rev = version;
-    sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b";
+    sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi";
   };
 
   # Patch hard-coded paths and remove force library builds
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
   fontsPath = lib.optionalString tileMode dejavu_fonts;
 
   makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
+                "FORCE_PKGCONFIG=y"
                 "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
                 "DATADIR=${placeholder "out"}"
               ] ++ lib.optional tileMode "TILES=y"

From 7ccc4fd222bffa425e74ca867bdfb625ea975f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Sat, 23 Jan 2021 07:54:58 +0100
Subject: [PATCH 662/956] alertmanager-bot: 0.4.0 -> 0.4.3

---
 .../monitoring/alertmanager-bot/default.nix   |  20 +-
 .../monitoring/alertmanager-bot/deps.nix      | 948 ------------------
 2 files changed, 13 insertions(+), 955 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/alertmanager-bot/deps.nix

diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix
index 562bd1ea815..7f4959e58eb 100644
--- a/pkgs/servers/monitoring/alertmanager-bot/default.nix
+++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix
@@ -1,19 +1,25 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "alertmanager-bot";
-  version = "0.4.0";
-
-  goPackagePath = "github.com/metalmatze/alertmanager-bot";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "metalmatze";
     repo = pname;
     rev = version;
-    sha256 = "10v0fxxcs5s6zmqindr30plyw7p2yg0a64rdw1b2cj2mc1m3byx3";
+    sha256 = "1hjfkksqb675gabzjc221b33h2m4s6qsanmkm382d3fyzqj71dh9";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "1v0fgin8dn81b559zz4lqmrl7hikr46g4gb18sci4riql5qs1isj";
+
+  postPatch = ''
+    sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go
+  '';
+
+  postInstall = ''
+    install -Dm644 -t $out/share/templates $src/default.tmpl
+  '';
 
   meta = with lib; {
     description = "Bot for Prometheus' Alertmanager";
diff --git a/pkgs/servers/monitoring/alertmanager-bot/deps.nix b/pkgs/servers/monitoring/alertmanager-bot/deps.nix
deleted file mode 100644
index 51e98ccbc93..00000000000
--- a/pkgs/servers/monitoring/alertmanager-bot/deps.nix
+++ /dev/null
@@ -1,948 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-  {
-    goPackagePath = "github.com/DataDog/datadog-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/DataDog/datadog-go";
-      rev = "0ddda6bee211";
-      sha256 = "07ap1qhz8vwdypmlny5gxnc191c0qbm6acacs30m1d4p22x6wxip";
-    };
-  }
-  {
-    goPackagePath = "github.com/OneOfOne/xxhash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/OneOfOne/xxhash";
-      rev = "v1.2.5";
-      sha256 = "15ai4nzm8cv8nqs4xm5h6ghnms19c2sp8z0zpkc46rld6y7k0xky";
-    };
-  }
-  {
-    goPackagePath = "github.com/alecthomas/template";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/template";
-      rev = "a0175ee3bccc";
-      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
-    };
-  }
-  {
-    goPackagePath = "github.com/alecthomas/units";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/units";
-      rev = "2efee857e7cf";
-      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
-    };
-  }
-  {
-    goPackagePath = "github.com/armon/circbuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/armon/circbuf";
-      rev = "bbbad097214e";
-      sha256 = "1idpr0lzb2px2p3wgfq2276yl7jpaz43df6n91kf790404s4zmk3";
-    };
-  }
-  {
-    goPackagePath = "github.com/armon/go-metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/armon/go-metrics";
-      rev = "f0300d1749da";
-      sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv";
-    };
-  }
-  {
-    goPackagePath = "github.com/armon/go-radix";
-    fetch = {
-      type = "git";
-      url = "https://github.com/armon/go-radix";
-      rev = "7fddfc383310";
-      sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4";
-    };
-  }
-  {
-    goPackagePath = "github.com/beorn7/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev = "v1.0.1";
-      sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7";
-    };
-  }
-  {
-    goPackagePath = "github.com/bgentry/speakeasy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bgentry/speakeasy";
-      rev = "v0.1.0";
-      sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
-    };
-  }
-  {
-    goPackagePath = "github.com/boltdb/bolt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/boltdb/bolt";
-      rev = "v1.3.1";
-      sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
-    };
-  }
-  {
-    goPackagePath = "github.com/cenkalti/backoff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cenkalti/backoff";
-      rev = "v2.1.1";
-      sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8";
-    };
-  }
-  {
-    goPackagePath = "github.com/cespare/xxhash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cespare/xxhash";
-      rev = "v1.0.0";
-      sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
-    };
-  }
-  {
-    goPackagePath = "github.com/circonus-labs/circonus-gometrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/circonus-labs/circonus-gometrics";
-      rev = "v2.0.0";
-      sha256 = "0d6cnswq28mjak7092vf89f9l0ga2ziwyamq9kdgfc7aavpwr6l9";
-    };
-  }
-  {
-    goPackagePath = "github.com/circonus-labs/circonusllhist";
-    fetch = {
-      type = "git";
-      url = "https://github.com/circonus-labs/circonusllhist";
-      rev = "6e85b9352cf0";
-      sha256 = "182gry1clk12m34574qif7bx74qpxib2zv0mr5kv2j9hfq7f9m01";
-    };
-  }
-  {
-    goPackagePath = "github.com/creack/pty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/creack/pty";
-      rev = "v1.1.7";
-      sha256 = "1plwwlk1i9b80zv8zdplvv81shfyc9gf0flydnydsh5sr3ib5vrc";
-    };
-  }
-  {
-    goPackagePath = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev = "v1.1.1";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/libkv";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/libkv";
-      rev = "v0.2.1";
-      sha256 = "0blq7kxjy1bvm3j5q4i6csnc4i88c1wvj4gjvxbqfk3sny73gjkr";
-    };
-  }
-  {
-    goPackagePath = "github.com/fatih/color";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fatih/color";
-      rev = "v1.7.0";
-      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
-    };
-  }
-  {
-    goPackagePath = "github.com/fsnotify/fsnotify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev = "v1.4.7";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-kit/kit";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-kit/kit";
-      rev = "v0.8.0";
-      sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-logfmt/logfmt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-logfmt/logfmt";
-      rev = "v0.3.0";
-      sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-stack/stack";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-stack/stack";
-      rev = "v1.8.0";
-      sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev = "v1.1.1";
-      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "v1.3.2";
-      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/btree";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/btree";
-      rev = "4030bb1f1f0c";
-      sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/go-cmp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-cmp";
-      rev = "v0.3.1";
-      sha256 = "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/gofuzz";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/gofuzz";
-      rev = "v1.0.0";
-      sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36";
-    };
-  }
-  {
-    goPackagePath = "github.com/hako/durafmt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hako/durafmt";
-      rev = "ea3ab126a649";
-      sha256 = "1niq0v6av5vsn4rizfda4zq922jvavig5b0qg9g0gyz6cj62rjzs";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/consul";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/consul";
-      rev = "v1.4.5";
-      sha256 = "0gpg3cbpsmzcaab3scqhpzz57892s95hwq5z0l9bq7qqm6iqfr9d";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/errwrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/errwrap";
-      rev = "v1.0.0";
-      sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-cleanhttp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-cleanhttp";
-      rev = "3573b8b52aa7";
-      sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-immutable-radix";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-immutable-radix";
-      rev = "v1.0.0";
-      sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-msgpack";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-msgpack";
-      rev = "v0.5.5";
-      sha256 = "0fqmfx3dxnvb0d23cpn2xpd067pibwlchdc58ln8w6lznzrbzaan";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-multierror";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-multierror";
-      rev = "v1.0.0";
-      sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-retryablehttp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-retryablehttp";
-      rev = "794af36148bf";
-      sha256 = "1686d4qav0ayj3f5881w3kd9pz4fxsmknfqwccbj9yklxm3khvp4";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-rootcerts";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-rootcerts";
-      rev = "v1.0.1";
-      sha256 = "0ca5h7vlvrghf24dzh8l6w5px293n173qxfkjxb9kgsl6hsrsl3y";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-sockaddr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-sockaddr";
-      rev = "v1.0.2";
-      sha256 = "0y106nhd3s63lj7h7k21iq0br97h0z9qjrvx028zqcsq9407k9is";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-syslog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-syslog";
-      rev = "v1.0.0";
-      sha256 = "09vccqggz212cg0jir6vv708d6mx0f9w5bxrcdah3h6chgmal6v1";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-uuid";
-      rev = "v1.0.1";
-      sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/golang-lru";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/golang-lru";
-      rev = "v0.5.3";
-      sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/logutils";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/logutils";
-      rev = "v1.0.0";
-      sha256 = "076wf4sh5p3f953ndqk1cc0x7jhmlqrxak9953rz79rcdw77rjvv";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/mdns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/mdns";
-      rev = "v1.0.1";
-      sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/memberlist";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/memberlist";
-      rev = "v0.1.4";
-      sha256 = "0l9qx8j7mm00ia6m41zbn39z7p77jjf95zph2nw8j2vihm56q9ql";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/serf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/serf";
-      rev = "v0.8.3";
-      sha256 = "0isaq2m08rpwvlzd72gvy3caapkrzgr9cwizl99ainsjgj2nkds9";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/uuid";
-      rev = "ebb0a03e909c";
-      sha256 = "0bzqr8y81h96cw299lhc5nxi9203a7xpd7csjsm6rh4k1bx4hdlf";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/yamux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/yamux";
-      rev = "f5742cb6b856";
-      sha256 = "1k9b399ljsp443s1v69c1m5jqdiw1998ryz4b4lh86nkz775ws5s";
-    };
-  }
-  {
-    goPackagePath = "github.com/hpcloud/tail";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hpcloud/tail";
-      rev = "v1.0.0";
-      sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
-    };
-  }
-  {
-    goPackagePath = "github.com/joho/godotenv";
-    fetch = {
-      type = "git";
-      url = "https://github.com/joho/godotenv";
-      rev = "v1.3.0";
-      sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
-    };
-  }
-  {
-    goPackagePath = "github.com/json-iterator/go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/json-iterator/go";
-      rev = "v1.1.7";
-      sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz";
-    };
-  }
-  {
-    goPackagePath = "github.com/julienschmidt/httprouter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/julienschmidt/httprouter";
-      rev = "v1.2.0";
-      sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
-    };
-  }
-  {
-    goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
-    fetch = {
-      type = "git";
-      url = "https://github.com/konsorten/go-windows-terminal-sequences";
-      rev = "v1.0.2";
-      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/logfmt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/logfmt";
-      rev = "b84e30acd515";
-      sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/pretty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/pretty";
-      rev = "v0.1.0";
-      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/pty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/pty";
-      rev = "v1.1.8";
-      sha256 = "1vcl6f90n0f8s8b4fyh0832ilybjqcypqyj233lqj1hx62fvgdbk";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/text";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/text";
-      rev = "v0.1.0";
-      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
-    };
-  }
-  {
-    goPackagePath = "github.com/kylelemons/godebug";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kylelemons/godebug";
-      rev = "v1.1.0";
-      sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-colorable";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-colorable";
-      rev = "v0.0.9";
-      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev = "v0.0.9";
-      sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
-    };
-  }
-  {
-    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev = "v1.0.1";
-      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
-    };
-  }
-  {
-    goPackagePath = "github.com/miekg/dns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/miekg/dns";
-      rev = "v1.0.15";
-      sha256 = "051f51fyrsnj69j9ni9j72acqnrvvzqda4l831ijffy5h5jdl8f2";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/cli";
-      rev = "v1.0.0";
-      sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev = "v1.1.0";
-      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-testing-interface";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-testing-interface";
-      rev = "v1.0.0";
-      sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-wordwrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-wordwrap";
-      rev = "v1.0.0";
-      sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/hashstructure";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/hashstructure";
-      rev = "2bca23e0e452";
-      sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/mapstructure";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/mapstructure";
-      rev = "d0303fe80992";
-      sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
-    };
-  }
-  {
-    goPackagePath = "github.com/modern-go/concurrent";
-    fetch = {
-      type = "git";
-      url = "https://github.com/modern-go/concurrent";
-      rev = "bacd9c7ef1dd";
-      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
-    };
-  }
-  {
-    goPackagePath = "github.com/modern-go/reflect2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/modern-go/reflect2";
-      rev = "v1.0.1";
-      sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
-    };
-  }
-  {
-    goPackagePath = "github.com/mwitkow/go-conntrack";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mwitkow/go-conntrack";
-      rev = "cc309e4a2223";
-      sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
-    };
-  }
-  {
-    goPackagePath = "github.com/oklog/run";
-    fetch = {
-      type = "git";
-      url = "https://github.com/oklog/run";
-      rev = "v1.0.0";
-      sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw";
-    };
-  }
-  {
-    goPackagePath = "github.com/onsi/ginkgo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/onsi/ginkgo";
-      rev = "v1.6.0";
-      sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
-    };
-  }
-  {
-    goPackagePath = "github.com/onsi/gomega";
-    fetch = {
-      type = "git";
-      url = "https://github.com/onsi/gomega";
-      rev = "v1.4.3";
-      sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
-    };
-  }
-  {
-    goPackagePath = "github.com/pascaldekloe/goe";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pascaldekloe/goe";
-      rev = "v0.1.0";
-      sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "v0.8.1";
-      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
-    };
-  }
-  {
-    goPackagePath = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev = "v1.0.0";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath = "github.com/posener/complete";
-    fetch = {
-      type = "git";
-      url = "https://github.com/posener/complete";
-      rev = "v1.1.2";
-      sha256 = "02xrnfkk9r2jarna8jqfkksrn469jdap716037zq84waq3d5xk3l";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/alertmanager";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/alertmanager";
-      rev = "v0.9.1";
-      sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev = "v0.9.4";
-      sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev = "fd36f4220a90";
-      sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev = "v0.4.1";
-      sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev = "v0.0.3";
-      sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y";
-    };
-  }
-  {
-    goPackagePath = "github.com/ryanuber/columnize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ryanuber/columnize";
-      rev = "v2.1.0";
-      sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
-    };
-  }
-  {
-    goPackagePath = "github.com/satori/go.uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      rev = "v1.1.0";
-      sha256 = "1nbydsmjr60904kz5d46nib0zid5kcv4gk9wayi44gn5wlzz80zp";
-    };
-  }
-  {
-    goPackagePath = "github.com/sean-/seed";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sean-/seed";
-      rev = "e2103e2c3529";
-      sha256 = "0glir8jxi1w7aga2jwdb63pp1h8q4whknili7xixsqzwyy716125";
-    };
-  }
-  {
-    goPackagePath = "github.com/sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sirupsen/logrus";
-      rev = "v1.2.0";
-      sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
-    };
-  }
-  {
-    goPackagePath = "github.com/spaolacci/murmur3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spaolacci/murmur3";
-      rev = "v1.1.0";
-      sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/objx";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/objx";
-      rev = "v0.1.1";
-      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev = "v1.3.0";
-      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
-    };
-  }
-  {
-    goPackagePath = "github.com/tucnak/telebot";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tucnak/telebot";
-      rev = "00cebf376d79";
-      sha256 = "0yay3h7gp6yag8jbapbq10vhmszad7svn68nnq5yp6pl1hmykzd6";
-    };
-  }
-  {
-    goPackagePath = "github.com/weaveworks/mesh";
-    fetch = {
-      type = "git";
-      url = "https://github.com/weaveworks/mesh";
-      rev = "f74318fb713b";
-      sha256 = "093j5i7wrkq1g92xaprd0rlfv9i74381wns4941bhbp6x6ahdcz7";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "45a5f77698d3";
-      sha256 = "0636jjj89wkzqchajwwzgcn4aafc334p70nawh9jzavg2mkx0ch4";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "891ebc4b82d6";
-      sha256 = "1rgw5gl2lc6bkmsx0fak84s6zdc1bhzfxgqg4mg4yh5hlnhpwrki";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev = "37e7f081c4d4";
-      sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "fde4db37ae7a";
-      sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "v0.3.2";
-      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "90fa682c2a6e";
-      sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
-    };
-  }
-  {
-    goPackagePath = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev = "v1.1.0";
-      sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/airbrake/gobrake.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/airbrake/gobrake.v2";
-      rev = "v2.0.9";
-      sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/alecthomas/kingpin.v2";
-      rev = "v2.2.6";
-      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/check.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/check.v1";
-      rev = "788fd7840127";
-      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/fsnotify.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/fsnotify.v1";
-      rev = "v1.4.7";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
-      rev = "v2.1.2";
-      sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/tomb.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/tomb.v1";
-      rev = "dd632973f1e7";
-      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/vmihailenco/msgpack.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/vmihailenco/msgpack.v2";
-      rev = "v2.9.1";
-      sha256 = "0ah9j7i97ifyqhiscq8d43gcrhksb3bx83s2p1nyfi1bxw78jwfi";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.2";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
-    };
-  }
-]

From 4affc40a50dbabf2216176307a507b9225e01be7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2021 08:34:59 +0100
Subject: [PATCH 663/956] sqlite: test sqlalchemy when updating

This is an important Python package that should keep functioning on an
upgrade.
---
 pkgs/development/libraries/sqlite/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index fe10e0fc7ae..2b7a472d1e7 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
+{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null
+, python3Packages
+}:
 
 assert interactive -> readline != null && ncurses != null;
 
@@ -73,6 +75,10 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails to link against tcl
 
+  passthru.tests = {
+    inherit (python3Packages) sqlalchemy;
+  };
+
   meta = {
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
     downloadPage = "https://sqlite.org/download.html";

From f9c6e07c67e9196ed1f134b604c5683167a829e0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 23 Jan 2021 10:47:37 +0200
Subject: [PATCH 664/956] treewide: Remove usages of stdenv.lib by @doronbehar

Per: https://github.com/NixOS/nixpkgs/issues/108938
---
 .../misc/syncthingtray/default.nix            |  1 -
 .../networking/gmailctl/default.nix           |  2 +-
 .../mailreaders/mailnag/goa-plugin.nix        |  2 +-
 .../interpreters/octave/default.nix           | 45 ++++++++++---------
 .../libraries/comedilib/default.nix           |  3 +-
 .../libraries/cpp-utilities/default.nix       |  3 +-
 .../development/libraries/liberio/default.nix |  3 +-
 .../libraries/qrupdate/default.nix            |  3 +-
 .../libraries/qtutilities/default.nix         | 10 ++++-
 pkgs/development/libraries/tweeny/default.nix |  3 +-
 .../tools/misc/sccache/default.nix            | 16 +++++--
 pkgs/servers/gotify/default.nix               |  3 +-
 pkgs/tools/audio/bpm-tools/default.nix        | 18 ++++----
 13 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index bbe629ecb14..f5c5faf4d96 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -1,5 +1,4 @@
 { mkDerivation
-, stdenv
 , lib
 , fetchFromGitHub
 , qtbase
diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix
index 1dfd1f62fb0..0042e5417df 100644
--- a/pkgs/applications/networking/gmailctl/default.nix
+++ b/pkgs/applications/networking/gmailctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 }:
diff --git a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
index 4f60135cca1..1def97bd62d 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , python3Packages
 , gobject-introspection
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 7dedf79c340..6ad25d24eae 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 # Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation
 # with wrapQtAppsHook (comes from libsForQt5.callPackage)
 , mkDerivation
@@ -124,21 +125,21 @@ in mkDerivation rec {
     libwebp
     gl2ps
   ]
-  ++ stdenv.lib.optionals enableQt [
+  ++ lib.optionals enableQt [
     qtbase
     qtsvg
     qscintilla
   ]
-  ++ stdenv.lib.optionals (ghostscript != null) [ ghostscript ]
-  ++ stdenv.lib.optionals (hdf5 != null) [ hdf5 ]
-  ++ stdenv.lib.optionals (glpk != null) [ glpk ]
-  ++ stdenv.lib.optionals (suitesparse != null) [ suitesparse' ]
-  ++ stdenv.lib.optionals (enableJava) [ jdk ]
-  ++ stdenv.lib.optionals (sundials != null) [ sundials ]
-  ++ stdenv.lib.optionals (gnuplot != null) [ gnuplot ]
-  ++ stdenv.lib.optionals (python != null) [ python ]
-  ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals (ghostscript != null) [ ghostscript ]
+  ++ lib.optionals (hdf5 != null) [ hdf5 ]
+  ++ lib.optionals (glpk != null) [ glpk ]
+  ++ lib.optionals (suitesparse != null) [ suitesparse' ]
+  ++ lib.optionals (enableJava) [ jdk ]
+  ++ lib.optionals (sundials != null) [ sundials ]
+  ++ lib.optionals (gnuplot != null) [ gnuplot ]
+  ++ lib.optionals (python != null) [ python ]
+  ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]
+  ++ lib.optionals stdenv.isDarwin [
     libiconv
     darwin.apple_sdk.frameworks.Accelerate
     darwin.apple_sdk.frameworks.Cocoa
@@ -152,9 +153,9 @@ in mkDerivation rec {
     fftwSinglePrec
     texinfo
   ]
-  ++ stdenv.lib.optionals (sundials != null) [ sundials ]
-  ++ stdenv.lib.optionals enableJIT [ llvm ]
-  ++ stdenv.lib.optionals enableQt [
+  ++ lib.optionals (sundials != null) [ sundials ]
+  ++ lib.optionals enableJIT [ llvm ]
+  ++ lib.optionals enableQt [
     qtscript
     qttools
   ]
@@ -172,11 +173,11 @@ in mkDerivation rec {
     "--with-lapack=lapack"
     (if use64BitIdx then "--enable-64" else "--disable-64")
   ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ]
-    ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ]
-    ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ]
-    ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ]
+    ++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ]
+    ++ lib.optionals enableReadline [ "--enable-readline" ]
+    ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ]
+    ++ lib.optionals enableQt [ "--with-qt=5" ]
+    ++ lib.optionals enableJIT [ "--enable-jit" ]
   ;
 
   # Keep a copy of the octave tests detailed results in the output
@@ -198,13 +199,13 @@ in mkDerivation rec {
 
   meta = {
     homepage = "https://www.gnu.org/software/octave/";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ raskin doronbehar ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ raskin doronbehar ];
     description = "Scientific Pragramming Language";
     # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
     broken = enableJIT;
     platforms = if overridePlatforms == null then
-      (with stdenv.lib; platforms.linux ++ platforms.darwin)
+      (lib.platforms.linux ++ lib.platforms.darwin)
     else overridePlatforms;
   };
 }
diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix
index e42f02407d4..fef22dea06a 100644
--- a/pkgs/development/libraries/comedilib/default.nix
+++ b/pkgs/development/libraries/comedilib/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchFromGitHub
 , autoreconfHook
 , flex
diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index 38879342f7a..cec6feded13 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchFromGitHub
 , fetchpatch
 , cmake
diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix
index 7a40c1a83da..743455b836d 100644
--- a/pkgs/development/libraries/liberio/default.nix
+++ b/pkgs/development/libraries/liberio/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchFromGitHub
 , autoreconfHook
 , systemd
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index 3e4109b1bf0..ad7e88d4647 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
 , gfortran
 , blas
diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index c44e8f4fd87..831c51fa234 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, cpp-utilities
+, qttools
+, qtbase
+, cmake
+, pkg-config
+}:
 
 stdenv.mkDerivation rec {
   pname = "qtutilities";
diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix
index c1737f6f017..8340e47fbf9 100644
--- a/pkgs/development/libraries/tweeny/default.nix
+++ b/pkgs/development/libraries/tweeny/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchFromGitHub
 , cmake
 }:
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 9c4fa708910..c68a1c1547c 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -1,4 +1,14 @@
-{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkg-config, glib, openssl, darwin }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, cargo
+, rustc
+, rustPlatform
+, pkg-config
+, glib
+, openssl
+, darwin
+}:
 
 rustPlatform.buildRustPackage rec {
   version = "0.2.14";
@@ -18,12 +28,12 @@ rustPlatform.buildRustPackage rec {
   ];
   buildInputs = [
     openssl
-  ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+  ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
   # Tests fail because of client server setup which is not possible inside the pure environment,
   # see https://github.com/mozilla/sccache/issues/460
   checkPhase = null;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ccache with Cloud Storage";
     homepage = "https://github.com/mozilla/sccache";
     maintainers = with maintainers; [ doronbehar ];
diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix
index 7b9b8124366..d0a3d9c10a2 100644
--- a/pkgs/servers/gotify/default.nix
+++ b/pkgs/servers/gotify/default.nix
@@ -1,6 +1,5 @@
-{ stdenv
+{ lib
 , buildGoPackage
-, lib
 , fetchFromGitHub
 , buildGoModule
 , sqlite
diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/tools/audio/bpm-tools/default.nix
index 7967577dda5..6e7236b1008 100644
--- a/pkgs/tools/audio/bpm-tools/default.nix
+++ b/pkgs/tools/audio/bpm-tools/default.nix
@@ -1,12 +1,12 @@
-{
-  lib, stdenv,
-  fetchurl,
-  gnuplot,
-  sox,
-  flac,
-  id3v2,
-  vorbis-tools,
-  makeWrapper
+{ stdenv
+, lib
+, fetchurl
+, gnuplot
+, sox
+, flac
+, id3v2
+, vorbis-tools
+, makeWrapper
 }:
 
 let

From 002b6599da97f4c004a416f774c473c6a6cac9d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Jan 2021 09:52:45 +0100
Subject: [PATCH 665/956] python3Packages.amcrest: init at 1.7.2

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

diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix
new file mode 100644
index 00000000000..772b8fbaa04
--- /dev/null
+++ b/pkgs/development/python-modules/amcrest/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, argcomplete
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytestCheckHook
+, requests
+, responses
+, urllib3
+}:
+
+buildPythonPackage rec {
+  pname = "amcrest";
+  version = "1.7.2";
+
+  src = fetchFromGitHub {
+    owner = "tchellomello";
+    repo = "python-amcrest";
+    rev = version;
+    sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy";
+  };
+
+  propagatedBuildInputs = [
+    argcomplete
+    requests
+    urllib3
+  ];
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+    responses
+  ];
+
+  pythonImportsCheck = [ "amcrest" ];
+
+  meta = with lib; {
+    description = "Python module for Amcrest and Dahua Cameras";
+    homepage = "https://github.com/tchellomello/python-amcrest";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84c11b5cd0f..4f0c63410de 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -318,6 +318,8 @@ in {
 
   ambiclimate = callPackage ../development/python-modules/ambiclimate { };
 
+  amcrest = callPackage ../development/python-modules/amcrest { };
+
   amply = callPackage ../development/python-modules/amply { };
 
   amqp = callPackage ../development/python-modules/amqp { };

From bfa62ed53cc86293134005fd538a468acd9b8fbe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Jan 2021 09:54:56 +0100
Subject: [PATCH 666/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8ba845dc431..be86ce46ab2 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -27,7 +27,7 @@
     "amazon_polly" = ps: with ps; [ boto3 ];
     "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ];
     "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient
-    "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest
+    "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
     "ampio" = ps: with ps; [ ]; # missing inputs: asmog
     "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam
     "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ];

From 923adfe5ca704fb884591a82d23c55e92c2d733d Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Sat, 23 Jan 2021 10:41:34 +0100
Subject: [PATCH 667/956] krita: 4.4.1 -> 4.4.2

We can re-enable parallel building, since the bug causing intermittent
build issues is now fixed. See
https://bugs.kde.org/show_bug.cgi?id=431226 for more information.

Closes #35359.
---
 pkgs/applications/graphics/krita/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 9bb78d19996..4700b1dfbbf 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,16 +10,13 @@
 
 mkDerivation rec {
   pname = "krita";
-  version = "4.4.1";
+  version = "4.4.2";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1bmmfvmawnlihbqkksdrwxfkaip4nfsi97w83fmvkyxl4jk715vr";
+    sha256 = "121fjdv5phx1aqk21vx9k9vsc5k1w8s86gp6pamy2y31r2ph7r8y";
   };
 
-  # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359
-  enableParallelBuilding = false;
-
   nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
 
   buildInputs = [

From cca0b0117b1935959d844d40eefd3522a9d1c331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 16 Jan 2021 15:07:33 +0100
Subject: [PATCH 668/956] python3Packages.tokenizers: 0.9.4 -> 0.10.0

Changelog:
https://github.com/huggingface/tokenizers/releases/tag/python-v0.10.0
---
 .../python-modules/tokenizers/default.nix       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix
index d5d92b19061..ec435a0ac35 100644
--- a/pkgs/development/python-modules/tokenizers/default.nix
+++ b/pkgs/development/python-modules/tokenizers/default.nix
@@ -7,6 +7,7 @@
 , wheel
 , numpy
 , python
+, datasets
 , pytestCheckHook
 , requests
 }:
@@ -50,16 +51,16 @@ let
   };
 in rustPlatform.buildRustPackage rec {
   pname = "tokenizers";
-  version = "0.9.4";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = "python-v${version}";
-    hash = "sha256-JXoH9yfhMIFg5qDY5zrF6iWb7XKugjMfk1NxSizfaWg=";
+    hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw=";
   };
 
-  cargoSha256 = "sha256-u9qitrOxJSABs0VjwHUZgmw7VTQXNbp6l8fKKE/RQ7M=";
+  cargoSha256 = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0=";
 
   sourceRoot = "source/bindings/python";
 
@@ -75,6 +76,7 @@ in rustPlatform.buildRustPackage rec {
   ];
 
   installCheckInputs = [
+    datasets
     pytestCheckHook
     requests
   ];
@@ -105,6 +107,15 @@ in rustPlatform.buildRustPackage rec {
     pipInstallPhase
   '';
 
+  preCheck = ''
+    HOME=$TMPDIR
+  '';
+
+  disabledTests = [
+    # Downloads data using the datasets module.
+    "TestTrainFromIterators"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/huggingface/tokenizers";
     description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";

From c81247f2047030cb839294bbaa08fd6ba6013714 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Sat, 23 Jan 2021 10:46:09 +0000
Subject: [PATCH 669/956] electron_11: 11.2.0 -> 11.2.1

https://github.com/electron/electron/releases/tag/v11.2.1
---
 pkgs/development/tools/electron/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 966f307e0da..6b704f57fcf 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -94,12 +94,12 @@ rec {
     headers = "1k97pfzxqrgw4y76js2chq13avgp9czin9q9mlh1zdf13bih96hj";
   };
 
-  electron_11 = mkElectron "11.2.0" {
-    x86_64-linux = "a2ed11a5ec9ad10302053e5e2bdf2abf0f9bac521e4f80a377308bffe8c24c00";
-    x86_64-darwin = "c8485cc6cb754bccfb1a01db93f5f0f1ee1ed3017551f3d25a1191c7c7aea654";
-    i686-linux = "508b9276f97c66418e530cbfa584701d4b0a42825fb2519b21ff161db1dc121f";
-    armv7l-linux = "edf1ad6606eab5efc1c9a33ce16489dae1df21ce6e69166f4c8da27ca6fde2ca";
-    aarch64-linux = "ed8e318ce0ba92058efdc667790bcbfce1c7f888f9d94038c1c76ed8678158fc";
-    headers = "0mwv9vm2km6sawyds87fzy7m4pcmmwl9c2qihs1nc7cwmdz388lv";
+  electron_11 = mkElectron "11.2.1" {
+    x86_64-linux = "607d9d58c9a3b5c36461acc6bbe473bc604eee42a55c2c617ac46d095cf98abb";
+    x86_64-darwin = "39d95668a3ea04bdc652ff9e2889c7a88f638534420e8e256679cbf4b7658a65";
+    i686-linux = "59f226133d01fb6acf86fe98907964f79dcf2902054e5c4c9c4ff84a3ea88f4a";
+    armv7l-linux = "85051d8eacf04aeec3dd74e46e7888d01bd4e6caf7ec2001122a1f3e11db44ee";
+    aarch64-linux = "8aa9be5d6c139386390bad64f78b95756206a40fe4982fc9f199b67a7d06bec5";
+    headers = "12sy8zzb0z654b85c5l1j8762nhwmkim1pbz1y3qzgbzvpbd5arq";
   };
 }

From fac05ac69522b1ae2fed1933c4dc0154734de927 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 22 Jan 2021 12:19:27 +0100
Subject: [PATCH 670/956] chromium: Don't set "channel" in the environment

The "channel" variable shouldn't be part of the final derivation. This
also makes it possible to avoid unnecessary rebuilds for identical
channels (e.g. major updates are tested via the "beta" channel first and
usually neither the source-code archive nor the dependencies change when
the update makes it into the "stable" channel - this means we could
better use chromiumBeta to test major updates in advance).
---
 pkgs/applications/networking/browsers/chromium/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7442d600085..2b7cdb9b4b7 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -117,7 +117,7 @@ let
   base = rec {
     name = "${packageName}-unwrapped-${version}";
     inherit (upstream-info) version;
-    inherit channel packageName buildType buildPath;
+    inherit packageName buildType buildPath;
 
     src = fetchurl {
       url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";

From 6dba41fbcb4239a628ac5bdf0035882a679b8648 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 10 Jan 2021 13:40:19 +0100
Subject: [PATCH 671/956] mpi: use mpi attribute consistently as the default
 MPI implementations

Use the attribute mpi to provide a system wide default MPI
implementation. The default is openmpi (as before).
This now allows for overriding the MPI implentation by using
the overlay mechanism. Build all packages with mpich instead
of the default openmpi can now be achived like this:
self: super:
 {
   mpi = super.mpich;
 }

All derivations that have been using "mpi ? null" to provide optional
building with MPI have been change in the following way to allow for
optional builds with MPI:
{ ...
, mpi
, useMpi ? false
}
---
 .../graphics/paraview/default.nix             |  4 +-
 .../science/biology/migrate/default.nix       |  4 +-
 .../science/biology/neuron/default.nix        |  9 +++--
 .../science/biology/raxml/default.nix         | 10 ++---
 .../science/chemistry/openmolcas/default.nix  |  4 +-
 .../chemistry/quantum-espresso/default.nix    |  7 ++--
 .../science/chemistry/siesta/default.nix      |  9 +++--
 .../science/electronics/openems/default.nix   |  5 +--
 .../science/math/cntk/default.nix             |  6 +--
 .../science/math/getdp/default.nix            |  4 +-
 .../science/math/scotch/default.nix           |  4 +-
 .../molecular-dynamics/gromacs/default.nix    |  4 +-
 .../molecular-dynamics/lammps/default.nix     |  4 +-
 .../science/physics/elmerfem/default.nix      |  4 +-
 pkgs/development/libraries/boost/generic.nix  |  7 ++--
 .../libraries/globalarrays/default.nix        |  4 +-
 .../development/libraries/precice/default.nix |  4 +-
 .../python-modules/cntk/default.nix           |  8 ++--
 .../python-modules/pytorch/default.nix        |  8 ++--
 .../python-modules/tensorflow/default.nix     |  4 +-
 pkgs/development/r-modules/default.nix        | 10 ++---
 .../tools/poetry2nix/poetry2nix/overrides.nix |  6 +--
 pkgs/tools/misc/hdf5/default.nix              | 11 +++---
 pkgs/tools/misc/hpcg/default.nix              |  4 +-
 pkgs/tools/system/ior/default.nix             |  4 +-
 pkgs/top-level/all-packages.nix               | 39 +++++++------------
 pkgs/top-level/python-packages.nix            |  5 +--
 27 files changed, 90 insertions(+), 102 deletions(-)

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 6e4738dd07c..7bbff5499f6 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -1,6 +1,6 @@
 { boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras,
   qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper,
-  mkDerivation, ninja, openmpi, python3, lib, stdenv, tbb, libGLU, libGL }:
+  mkDerivation, ninja, mpi, python3, lib, stdenv, tbb, libGLU, libGL }:
 
 mkDerivation rec {
   pname = "paraview";
@@ -65,7 +65,7 @@ mkDerivation rec {
   buildInputs = [
     libGLU libGL
     libXt
-    openmpi
+    mpi
     tbb
     boost
     ffmpeg
diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix
index 0e2aa1c1a79..ba55898e4f9 100644
--- a/pkgs/applications/science/biology/migrate/default.nix
+++ b/pkgs/applications/science/biology/migrate/default.nix
@@ -1,4 +1,4 @@
-{ gccStdenv, fetchurl, zlib, openmpi }:
+{ gccStdenv, fetchurl, zlib, mpi }:
 
 gccStdenv.mkDerivation rec {
   version = "3.7.2";
@@ -9,7 +9,7 @@ gccStdenv.mkDerivation rec {
     sha256 = "1p2364ffjc56i82snzvjpy6pkf6wvqwvlvlqxliscx2c303fxs8v";
   };
 
-  buildInputs = [ zlib openmpi ];
+  buildInputs = [ zlib mpi ];
   setSourceRoot = ''sourceRoot=$(echo */src)'';
   buildFlags = [ "thread" "mpis" ];
   preInstall = "mkdir -p $out/man/man1";
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 154965b1521..7bfef3a82fe 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -8,7 +8,8 @@
 , readline
 , which
 , python ? null
-, mpi ? null
+, useMpi ? false
+, mpi
 , iv
 }:
 
@@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
   version = "7.5";
 
   nativeBuildInputs = [ which pkg-config automake autoconf libtool ];
-  buildInputs = [ ncurses readline python mpi iv ];
+  buildInputs = [ ncurses readline python iv ]
+    ++ lib.optional useMpi mpi;
 
   src = fetchurl {
     url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz";
@@ -54,7 +56,7 @@ stdenv.mkDerivation rec {
   configureFlags = with lib;
                     [ "--with-readline=${readline}" "--with-iv=${iv}" ]
                     ++  optionals (python != null)  [ "--with-nrnpython=${python.interpreter}" ]
-                    ++ (if mpi != null then ["--with-mpi" "--with-paranrn"]
+                    ++ (if useMpi then ["--with-mpi" "--with-paranrn"]
                         else ["--without-mpi"]);
 
 
@@ -84,4 +86,3 @@ stdenv.mkDerivation rec {
     platforms   = platforms.x86_64 ++ platforms.i686;
   };
 }
-
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
index 4f9b5aca1b2..6e747e318f5 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub
-, pkgs
-, mpi ? false
+, useMpi ? false
+, mpi
 }:
 
 stdenv.mkDerivation rec {
@@ -15,16 +15,16 @@ stdenv.mkDerivation rec {
     sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh";
   };
 
-  buildInputs = lib.optionals mpi [ pkgs.openmpi ];
+  buildInputs = lib.optionals useMpi [ mpi ];
 
   # TODO darwin, AVX and AVX2 makefile targets
-  buildPhase = if mpi then ''
+  buildPhase = if useMpi then ''
       make -f Makefile.MPI.gcc
     '' else ''
       make -f Makefile.SSE3.PTHREADS.gcc
     '';
 
-  installPhase = if mpi then ''
+  installPhase = if useMpi then ''
     mkdir -p $out/bin && cp raxmlHPC-MPI $out/bin
   '' else ''
     mkdir -p $out/bin && cp raxmlHPC-PTHREADS-SSE3 $out/bin
diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index 1297e595b9a..4bd88456b8f 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl
 , openblas, hdf5-cpp, python3, texlive
-, armadillo, openmpi, globalarrays, openssh
+, armadillo, mpi, globalarrays, openssh
 , makeWrapper, fetchpatch
 } :
 
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
     hdf5-cpp
     python
     armadillo
-    openmpi
+    mpi
     globalarrays
     openssh
   ];
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index c7b1f901046..6d70e9f984f 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl
 , gfortran, fftw, blas, lapack
-, mpi ? null
+, useMpi ? false
+, mpi
 }:
 
 stdenv.mkDerivation rec {
@@ -21,9 +22,9 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ fftw blas lapack gfortran ]
-    ++ (lib.optionals (mpi != null) [ mpi ]);
+    ++ (lib.optionals useMpi [ mpi ]);
 
-configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ];
+configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ];
 
   makeFlags = [ "all" ];
 
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
index 0df953f7106..02ff4c1ca44 100644
--- a/pkgs/applications/science/chemistry/siesta/default.nix
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl
-, gfortran, blas, lapack
-, mpi ? null, scalapack
+, gfortran, blas, lapack, scalapack
+, useMpi ? false
+, mpi
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ blas lapack gfortran ]
-    ++ (lib.optionals (mpi != null) [ mpi scalapack ]);
+    ++ lib.optionals useMpi [ mpi scalapack ];
 
   enableParallelBuilding = true;
 
@@ -29,7 +30,7 @@ stdenv.mkDerivation {
     cp gfortran.make arch.make
   '';
 
-  preBuild = if (mpi != null) then ''
+  preBuild = if useMpi then ''
     makeFlagsArray=(
         CC="mpicc" FC="mpifort"
         FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="."
diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix
index e1063f8e26c..64afe3222c2 100644
--- a/pkgs/applications/science/electronics/openems/default.nix
+++ b/pkgs/applications/science/electronics/openems/default.nix
@@ -11,16 +11,15 @@
 , cmake
 , octave
 , gl2ps
+, mpi
 , withQcsxcad ? true
 , withMPI ? false
 , withHyp2mat ? true
 , qcsxcad ? null
-, openmpi ? null
 , hyp2mat ? null
 }:
 
 assert withQcsxcad -> qcsxcad != null;
-assert withMPI -> openmpi != null;
 assert withHyp2mat -> hyp2mat != null;
 
 stdenv.mkDerivation {
@@ -50,7 +49,7 @@ stdenv.mkDerivation {
     csxcad
     (octave.override { inherit hdf5; }) ]
     ++ lib.optionals withQcsxcad [ qcsxcad ]
-    ++ lib.optionals withMPI [ openmpi ]
+    ++ lib.optionals withMPI [ mpi ]
     ++ lib.optionals withHyp2mat [ hyp2mat ];
 
   postFixup = ''
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index a348210179e..e15e2a43d77 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchgit, fetchFromGitHub, cmake
-, openblas, blas, lapack, opencv3, libzip, boost, protobuf, openmpi
+, openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi
 , onebitSGDSupport ? false
 , cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11
 , cudnnSupport ? cudaSupport, cudnn
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
   # Force OpenMPI to use g++ in PATH.
   OMPI_CXX = "g++";
 
-  buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ]
+  buildInputs = [ openblas opencv3 libzip boost protobuf mpi ]
              ++ lib.optional cudaSupport cudatoolkit
              ++ lib.optional cudnnSupport cudnn;
 
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
     "--with-openblas=${openblas}"
     "--with-boost=${boost.dev}"
     "--with-protobuf=${protobuf}"
-    "--with-mpi=${openmpi}"
+    "--with-mpi=${mpi}"
     "--cuda=${if cudaSupport then "yes" else "no"}"
     # FIXME
     "--asgd=no"
diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix
index 915c7e1147f..39d9c866cae 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/pkgs/applications/science/math/getdp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, openmpi, petsc, python3 }:
+{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, mpi, petsc, python3 }:
 
 stdenv.mkDerivation rec {
   name = "getdp-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake gfortran ];
-  buildInputs = [ blas lapack openmpi petsc python3 ];
+  buildInputs = [ blas lapack mpi petsc python3 ];
 
   meta = with lib; {
     description = "A General Environment for the Treatment of Discrete Problems";
diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix
index 6f8753ff38a..b6613f25cbc 100644
--- a/pkgs/applications/science/math/scotch/default.nix
+++ b/pkgs/applications/science/math/scotch/default.nix
@@ -1,11 +1,11 @@
-{ lib, stdenv, fetchurl, bison, openmpi, flex, zlib}:
+{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}:
 
 stdenv.mkDerivation rec {
   version = "6.0.4";
   pname = "scotch";
   src_name = "scotch_${version}";
 
-  buildInputs = [ bison openmpi flex zlib ];
+  buildInputs = [ bison mpi flex zlib ];
 
   src = fetchurl {
     url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz";
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index c40faddbbf9..bdec2ccc669 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -3,10 +3,10 @@
 , cmake
 , hwloc
 , fftw
-, openmpi
 , perl
 , singlePrec ? true
 , mpiEnabled ? false
+, mpi
 , cpuAcceleration ? null
 }:
 
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ fftw perl hwloc ]
-  ++ (lib.optionals mpiEnabled [ openmpi ]);
+  ++ (lib.optionals mpiEnabled [ mpi ]);
 
   cmakeFlags = [
     "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}"
diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
index 123afef03e8..51ce64115ea 100644
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchFromGitHub
 , libpng, gzip, fftw, blas, lapack
-, mpi ? null
+, withMPI ? false
+, mpi
 }:
 let packages = [
      "asphere" "body" "class2" "colloid" "compress" "coreshell"
@@ -8,7 +9,6 @@ let packages = [
      "opt" "peri" "qeq" "replica" "rigid" "shock" "snap" "srd" "user-reaxc"
     ];
     lammps_includes = "-DLAMMPS_EXCEPTIONS -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64";
-    withMPI = (mpi != null);
 in
 stdenv.mkDerivation rec {
   # LAMMPS has weird versioning converted to ISO 8601 format
diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix
index 6fa25ce66ae..5033b28bd3b 100644
--- a/pkgs/applications/science/physics/elmerfem/default.nix
+++ b/pkgs/applications/science/physics/elmerfem/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, openmpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "elmerfem";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ cmake pkg-config git ];
-  buildInputs = [ gfortran openmpi blas liblapack qt4 qwt6_qt4 ];
+  buildInputs = [ gfortran mpi blas liblapack qt4 qwt6_qt4 ];
 
   preConfigure = ''
     patchShebangs ./
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 5a2b437d41d..abff1268bfa 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -14,7 +14,8 @@
 , enableNumpy ? false
 , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
 , patches ? []
-, mpi ? null
+, useMpi ? false
+, mpi
 , extraB2Args ? []
 
 # Attributes inherit from specific versions
@@ -94,7 +95,7 @@ let
     ++ optional (variant == "release") "debug-symbols=off"
     ++ optional (toolset != null) "toolset=${toolset}"
     ++ optional (!enablePython) "--without-python"
-    ++ optional (mpi != null || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam"
+    ++ optional (useMpi || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam"
     ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "threadapi=win32"
   ] ++ extraB2Args
@@ -140,7 +141,7 @@ stdenv.mkDerivation {
         substituteInPlace tools/build/src/tools/clang-darwin.jam \
           --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)";
     fi;
-  '' + optionalString (mpi != null) ''
+  '' + optionalString useMpi ''
     cat << EOF >> user-config.jam
     using mpi : ${mpi}/bin/mpiCC ;
     EOF
diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix
index 049e262bb17..1f70946cbce 100644
--- a/pkgs/development/libraries/globalarrays/default.nix
+++ b/pkgs/development/libraries/globalarrays/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook
-, blas, gfortran, openssh, openmpi
+, blas, gfortran, openssh, mpi
 } :
 
 let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ openmpi blas gfortran openssh ];
+  buildInputs = [ mpi blas gfortran openssh ];
 
   preConfigure = ''
     configureFlagsArray+=( "--enable-i8" \
diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix
index e9e67737d32..10a80ebb91e 100644
--- a/pkgs/development/libraries/precice/default.nix
+++ b/pkgs/development/libraries/precice/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, petsc }:
+{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, mpi, python3, petsc }:
 
 stdenv.mkDerivation rec {
   pname = "precice";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ];
 
   nativeBuildInputs = [ cmake gcc ];
-  buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ];
+  buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ];
 
   meta = {
     description = "preCICE stands for Precise Code Interaction Coupling Environment";
diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix
index ce388bb1d5d..b1bba8cf1e0 100644
--- a/pkgs/development/python-modules/cntk/default.nix
+++ b/pkgs/development/python-modules/cntk/default.nix
@@ -3,7 +3,7 @@
 , pkgs
 , numpy
 , scipy
-, openmpi
+, mpi
 , enum34
 , protobuf
 , pip
@@ -17,8 +17,8 @@ in
 buildPythonPackage {
   inherit (cntk) name version src;
 
-  nativeBuildInputs = [ swig openmpi ];
-  buildInputs = [ cntk openmpi ];
+  nativeBuildInputs = [ swig mpi ];
+  buildInputs = [ cntk mpi ];
   propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ];
 
   CNTK_LIB_PATH = "${cntk}/lib";
@@ -28,7 +28,7 @@ buildPythonPackage {
 
   postPatch = ''
     cd bindings/python
-    sed -i 's,"libmpi.so.12","${openmpi}/lib/libmpi.so",g' cntk/train/distributed.py
+    sed -i 's,"libmpi.so.12","${mpi}/lib/libmpi.so",g' cntk/train/distributed.py
 
     # Remove distro and libs checks; they aren't compatible with NixOS and besides we guarantee
     # compatibility by providing a package.
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index f072972937a..822586bf190 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null,
   mklDnnSupport ? true, useSystemNccl ? true,
-  openMPISupport ? false, openmpi ? null,
+  MPISupport ? false, mpi,
   buildDocs ? false,
   cudaArchList ? null,
 
@@ -29,8 +29,6 @@
 
   isPy3k, pythonOlder }:
 
-assert !openMPISupport || openmpi != null;
-
 # assert that everything needed for cuda is present and that the correct cuda versions are used
 assert !cudaSupport || cudatoolkit != null;
 assert cudnn == null || cudatoolkit != null;
@@ -38,7 +36,7 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
                         in majorIs == "9" || majorIs == "10" || majorIs == "11");
 
 # confirm that cudatoolkits are sync'd across dependencies
-assert !(openMPISupport && cudaSupport) || openmpi.cudatoolkit == cudatoolkit;
+assert !(MPISupport && cudaSupport) || mpi.cudatoolkit == cudatoolkit;
 assert !cudaSupport || magma.cudatoolkit == cudatoolkit;
 
 let
@@ -224,7 +222,7 @@ in buildPythonPackage rec {
     typing-extensions
     # the following are required for tensorboard support
     pillow six future tensorflow-tensorboard protobuf
-  ] ++ lib.optionals openMPISupport [ openmpi ]
+  ] ++ lib.optionals MPISupport [ mpi ]
     ++ lib.optionals (pythonOlder "3.7") [ dataclasses ];
 
   checkInputs = [ hypothesis ninja psutil ];
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 342a87a6e8d..9f64a689e2b 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -11,7 +11,7 @@
 # Common deps
 , git, pybind11, which, binutils, glibcLocales, cython, perl
 # Common libraries
-, jemalloc, openmpi, gast, grpc, sqlite, boringssl, jsoncpp
+, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp
 , curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib
 # Upsteam by default includes cuda support since tensorflow 1.15. We could do
 # that in nix as well. It would make some things easier and less confusing, but
@@ -129,7 +129,7 @@ let
 
     buildInputs = [
       jemalloc
-      openmpi
+      mpi
       glibcLocales
       git
 
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index e79504bdaab..e827c9b807f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -237,7 +237,7 @@ let
     BayesSAE = [ pkgs.gsl_1 ];
     BayesVarSel = [ pkgs.gsl_1 ];
     BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ];
-    bigGP = [ pkgs.openmpi ];
+    bigGP = [ pkgs.mpi ];
     bio3d = [ pkgs.zlib ];
     BiocCheck = [ pkgs.which ];
     Biostrings = [ pkgs.zlib ];
@@ -284,8 +284,8 @@ let
     n1qn1 = [ pkgs.gfortran ];
     odbc = [ pkgs.unixODBC ];
     pander = [ pkgs.pandoc pkgs.which ];
-    pbdMPI = [ pkgs.openmpi ];
-    pbdPROF = [ pkgs.openmpi ];
+    pbdMPI = [ pkgs.mpi ];
+    pbdPROF = [ pkgs.mpi ];
     pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ];
     pdftools = [ pkgs.poppler.dev ];
     phytools = [ pkgs.which ];
@@ -309,14 +309,14 @@ let
     RGtk2 = [ pkgs.gtk2.dev ];
     rhdf5 = [ pkgs.zlib ];
     Rhdf5lib = [ pkgs.zlib ];
-    Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ];
+    Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.mpi pkgs.pcre.dev ];
     Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.lzma.dev pkgs.curl.dev ];
     rjags = [ pkgs.jags ];
     rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ];
     Rlibeemd = [ pkgs.gsl_1 ];
     rmatio = [ pkgs.zlib.dev ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
-    Rmpi = [ pkgs.openmpi ];
+    Rmpi = [ pkgs.mpi ];
     RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
     RNetCDF = [ pkgs.netcdf pkgs.udunits ];
     RODBC = [ pkgs.libiodbc ];
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 31065758914..c3cea53189b 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -245,7 +245,7 @@ self: super:
 
   horovod = super.horovod.overridePythonAttrs (
     old: {
-      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
+      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ];
     }
   );
 
@@ -528,14 +528,14 @@ self: super:
             { }
             {
               mpi = {
-                mpicc = "${pkgs.openmpi.outPath}/bin/mpicc";
+                mpicc = "${pkgs.mpi.outPath}/bin/mpicc";
               };
             }
         );
       };
     in
     {
-      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
+      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.mpi ];
       enableParallelBuilding = true;
       preBuild = ''
         ln -sf ${cfg} mpi.cfg
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 0a5032074c1..fc7bb635040 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -5,13 +5,14 @@
 , gfortran ? null
 , zlib ? null
 , szip ? null
-, mpi ? null
+, mpiSupport ? false
+, mpi
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
 
 # cpp and mpi options are mutually exclusive
 # (--enable-unsupported could be used to force the build)
-assert !cpp || mpi == null;
+assert !cpp || !mpiSupport;
 
 let inherit (lib) optional optionals; in
 
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    mpiSupport = (mpi != null);
+    inherit mpiSupport;
     inherit mpi;
   };
 
@@ -38,13 +39,13 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = []
     ++ optional (zlib != null) zlib
-    ++ optional (mpi != null) mpi;
+    ++ optional mpiSupport mpi;
 
   configureFlags = []
     ++ optional cpp "--enable-cxx"
     ++ optional (gfortran != null) "--enable-fortran"
     ++ optional (szip != null) "--with-szlib=${szip}"
-    ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"]
+    ++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"]
     ++ optional enableShared "--enable-shared";
 
   patches = [
diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix
index 29799641880..d6896527ad2 100644
--- a/pkgs/tools/misc/hpcg/default.nix
+++ b/pkgs/tools/misc/hpcg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openmpi } :
+{ lib, stdenv, fetchurl, mpi } :
 
 stdenv.mkDerivation rec {
   pname = "hpcg";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ openmpi ];
+  buildInputs = [ mpi ];
 
   makeFlags = [ "arch=Linux_MPI" ];
 
diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix
index 326602e3d4d..c2616797da3 100644
--- a/pkgs/tools/system/ior/default.nix
+++ b/pkgs/tools/system/ior/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, openmpi, perl, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, mpi, perl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "ior";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ openmpi perl ];
+  buildInputs = [ mpi perl ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd86fed4cb2..360d963fed8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4975,12 +4975,11 @@ in
   hdf5 = callPackage ../tools/misc/hdf5 {
     gfortran = null;
     szip = null;
-    mpi = null;
   };
 
   hdf5-mpi = appendToName "mpi" (hdf5.override {
     szip = null;
-    mpi = pkgs.openmpi;
+    mpiSupport = true;
   });
 
   hdf5-cpp = appendToName "cpp" (hdf5.override {
@@ -7216,6 +7215,8 @@ in
 
   openmpi = callPackage ../development/libraries/openmpi { };
 
+  mpi = openmpi; # this attribute should used to build MPI applications
+
   ucx = callPackage ../development/libraries/ucx {};
 
   openmodelica = callPackage ../applications/science/misc/openmodelica {
@@ -22092,9 +22093,7 @@ in
 
   fractal = callPackage ../applications/networking/instant-messengers/fractal { };
 
-  freecad = libsForQt5.callPackage ../applications/graphics/freecad {
-    mpi = openmpi;
-  };
+  freecad = libsForQt5.callPackage ../applications/graphics/freecad { };
 
   freemind = callPackage ../applications/misc/freemind {
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -22480,7 +22479,7 @@ in
 
   hpcg = callPackage ../tools/misc/hpcg/default.nix { };
 
-  hpl = callPackage ../tools/misc/hpl { mpi = openmpi; };
+  hpl = callPackage ../tools/misc/hpl { };
 
   hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { };
 
@@ -27254,15 +27253,11 @@ in
 
   quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { };
 
-  quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso {
-     mpi = openmpi;
-  };
+  quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso { useMpi = true; };
 
   siesta = callPackage ../applications/science/chemistry/siesta { };
 
-  siesta-mpi = callPackage ../applications/science/chemistry/siesta {
-     mpi = openmpi;
-  };
+  siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; };
 
   ### SCIENCE/GEOMETRY
 
@@ -27393,7 +27388,7 @@ in
   };
 
   neuron-mpi = appendToName "mpi" (neuron.override {
-    mpi = pkgs.openmpi;
+    useMpi = true;
   });
 
   neuron-full = neuron-mpi.override { inherit python; };
@@ -27445,7 +27440,7 @@ in
   raxml = callPackage ../applications/science/biology/raxml { };
 
   raxml-mpi = appendToName "mpi" (raxml.override {
-    mpi = true;
+    useMpi = true;
   });
 
   sambamba = callPackage ../applications/science/biology/sambamba { };
@@ -27567,9 +27562,7 @@ in
 
   planarity = callPackage ../development/libraries/science/math/planarity { };
 
-  scalapack = callPackage ../development/libraries/science/math/scalapack {
-    mpi = openmpi;
-  };
+  scalapack = callPackage ../development/libraries/science/math/scalapack { };
 
   rankwidth = callPackage ../development/libraries/science/math/rankwidth { };
 
@@ -27599,9 +27592,7 @@ in
 
   petsc = callPackage ../development/libraries/science/math/petsc { };
 
-  parmetis = callPackage ../development/libraries/science/math/parmetis {
-    mpi = openmpi;
-  };
+  parmetis = callPackage ../development/libraries/science/math/parmetis { };
 
   QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { };
 
@@ -27631,17 +27622,13 @@ in
 
   ### SCIENCE/MOLECULAR-DYNAMICS
 
-  dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic {
-    mpi = openmpi;
-  };
+  dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { };
 
   lammps = callPackage ../applications/science/molecular-dynamics/lammps {
     fftw = fftw;
   };
 
-  lammps-mpi = lowPrio (lammps.override {
-    mpi = openmpi;
-  });
+  lammps-mpi = lowPrio (lammps.override { withMPI = true; });
 
   gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
     singlePrec = true;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84c11b5cd0f..c5c17744266 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2184,7 +2184,6 @@ in {
 
   fenics = callPackage ../development/libraries/science/math/fenics {
     inherit (pkgs) pkg-config;
-    mpi = pkgs.openmpi;
     pytest = self.pytest_4;
   };
 
@@ -3486,7 +3485,7 @@ in {
 
   labelbox = callPackage ../development/python-modules/labelbox { };
 
-  lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; };
+  lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.mpi; };
 
   langcodes = callPackage ../development/python-modules/langcodes { };
 
@@ -4120,7 +4119,7 @@ in {
 
   mpd = callPackage ../development/python-modules/mpd { };
 
-  mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; };
+  mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.mpi; };
 
   mplleaflet = callPackage ../development/python-modules/mplleaflet { };
 

From b6a09f88874ea6ca3c8792b3e867e5d3071594bd Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 10 Jan 2021 15:08:59 +0100
Subject: [PATCH 672/956] scalapack: fix building with mpich

---
 pkgs/development/libraries/science/math/scalapack/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index 4ef10439cc5..3b84a9d99cb 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
     # make sure the test starts even if we have less than 4 cores
     export OMPI_MCA_rmaps_base_oversubscribe=1
 
+    # Fix to make mpich run in a sandbox
+    export HYDRA_IFACE=lo
+
     # Run single threaded
     export OMP_NUM_THREADS=1
 

From 68fa960f6a79bb60d0ab0a700c443117382a95e2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 10 Jan 2021 22:44:04 +0100
Subject: [PATCH 673/956] nixos/release-notes: add comment about generic mpi
 attribute

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

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 94e42369b60..cabc60a157a 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -418,6 +418,26 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e
        SDK licenses if your project requires it. See the androidenv documentation for more details.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       The attribute <varname>mpi</varname> is now consistently used to
+       provide a default, system-wide MPI implementation.
+       The default implementation is openmpi, which has been used before by
+       all derivations affects by this change.
+       Note that all packages that have used <varname>mpi ? null</varname> in the input
+       for optional MPI builds, have been changed to the boolean input paramater
+       <varname>useMpi</varname> to enable building with MPI.
+
+       Building all packages with <varname>mpich</varname> instead
+       of the default <varname>openmpi</varname> can now be achived like this:
+       <programlisting>
+self: super:
+{
+ mpi = super.mpich;
+}
+       </programlisting>
+     </para>
+   </listitem>
    <listitem>
      <para>
       The Searx module has been updated with the ability to configure the

From 72f96278f73dba04bb73fd3dea0943d21e225cf1 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 10 Jan 2021 22:44:50 +0100
Subject: [PATCH 674/956] nixpkgs/manual: add a paragraph about MPI switching
 mechanism

---
 doc/using/overlays.xml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml
index caacb0a0462..9ffbb4edd98 100644
--- a/doc/using/overlays.xml
+++ b/doc/using/overlays.xml
@@ -291,5 +291,40 @@ stdenv.mkDerivation {
 }
 </programlisting>
    </section>
+   <section xml:id="sec-overlays-alternatives-mpi">
+     <title>Switching the MPI implementation</title>
+     <para>
+       All programs that are built with
+       <link xlink:href="https://en.wikipedia.org/wiki/Message_Passing_Interface">MPI</link>
+       support use the generic attribute <varname>mpi</varname>
+       as an input. At the moment Nixpkgs natively provides two different
+       MPI implementations:
+       <itemizedlist>
+         <listitem>
+           <para>
+             <link xlink:href="https://www.open-mpi.org/">Open MPI</link>
+             (default), attribute name <varname>openmpi</varname>
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             <link xlink:href="https://www.mpich.org/">MPICH</link>,
+             attribute name <varname>mpich</varname>
+           </para>
+         </listitem>
+       </itemizedlist>
+     </para>
+     <para>
+       To provide MPI enabled applications that use <literal>MPICH</literal>, instead
+       of the default <literal>Open MPI</literal>, simply use the following overlay:
+     </para>
+     <programlisting>
+self: super:
+
+{
+  mpi = self.mpich;
+}
+     </programlisting>
+   </section>
  </section>
 </chapter>

From 86897c8f633f38c9169e130e35fd9322aec6b329 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Jan 2021 12:06:09 +0100
Subject: [PATCH 675/956] nixos/tests/chromium: Fix another potential race
 condition

The create_new_win() function could open multiple windows when used
incorrectly. This change makes sure that a new window will only be
created if the main window could be selected successfully.

This also ignores the out return values as they're never used.
---
 nixos/tests/chromium.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 4d6b726d9e4..43a99fda5c5 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -77,7 +77,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
 
     def create_new_win():
         with machine.nested("Creating a new Chromium window"):
-            machine.execute(
+            status, _ = machine.execute(
                 ru(
                     "${xdo "new-window" ''
                       search --onlyvisible --name "startup done"
@@ -86,13 +86,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
                     ''}"
                 )
             )
-            machine.execute(
-                ru(
-                    "${xdo "new-window" ''
-                      key Ctrl+n
-                    ''}"
+            if status == 0:
+                machine.execute(
+                    ru(
+                        "${xdo "new-window" ''
+                          key Ctrl+n
+                        ''}"
+                    )
                 )
-            )
 
 
     def close_win():
@@ -115,7 +116,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
                     )
                 )
             for _ in range(1, 20):
-                status, out = machine.execute(
+                status, _ = machine.execute(
                     ru(
                         "${xdo "wait-for-close" ''
                           search --onlyvisible --name "new tab"
@@ -134,7 +135,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
         ret = False
         with machine.nested("Waiting for new Chromium window to appear"):
             for _ in range(1, 20):
-                status, out = machine.execute(
+                status, _ = machine.execute(
                     ru(
                         "${xdo "wait-for-window" ''
                           search --onlyvisible --name "new tab"

From 9af95960e2ba56fa80352c0a9e876cb26debe0f0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 21 Jan 2021 19:54:13 +0100
Subject: [PATCH 676/956] skawarePackages: 2021-01 release

Maintainer notes
-----
The execline exec function interface changed quite drastically, and
backwards-compatibility to the old functions was dropped in-between
the last release and this one. Thus, downstream code might break.
At the end of this commit message is a compatibility interface.

-----
Release notes
-----

 Hello,

 Happy New Year to everyone!
 New versions of the skarnet.org packages are available.

 This is a major release. The skalibs major version number has been
bumped, which means that compatibility with previous versions is not
ensured. Other packages have been updated to build against the new
skalibs. If they only had their patch number increased, that's all
the modifications they had (save for possible bugfixes); but some
packages also received significant changes and underwent either a major
(compatibility not ensured) or minor (simple additions) release.

 Support for the 2.9.* branch of skalibs, and associated versions of
the other packages, is still ensured for a while, but users are always
strongly encouraged to upgrade.

 * General
   -------

 - Some rarely-triggered build bugs have been fixed.
 - -fno-stack-protector is not part of the default CFLAGS anymore;
stack protector policy now defaults to the compiler's settings.

* skalibs-2.10.0.0
  ----------------

 - Bugfixes.
 - Significant code cleanup.
 - New sysdep: chroot.
 - Lots of new functions, mostly to optimize the number of needed
fcntl() calls at open() time. Traces should generally be marginally
shorter than they were before.
 - Removal of the DJBUNIX_FLAG_NB and DJBUNIX_FLAG_COE macros, replaced
by the POSIX O_NONBLOCK and O_CLOEXEC macros wherever they were used.
 - Removal of the skalibs/webipc.h header, and better header separation.
 - Complete revamping of the pathexec functions, now separated into
exec_* (simple execution) and mexec_* (execution with merging of the
environment first). In true skalibs fashion, there is a little code,
and 3 pages of convenience macros (the exec.h header).
 - Complete rewrite of the locking functions, with a change of
underlying mechanisms. The skalibs locking primitives are now named
fd_lock(), fd_unlock() and fd_islocked().
 The Unix locks primitive space is a horror show. flock() is not
POSIX and does not have a way to test for a lock without taking it.
The POSIX lockf() only has exclusive locks, not shared ones. The least
bad option is fcntl(), which has shared and exclusive locks *and* a way
to check for a lock without taking it, but does not allow taking a
shared lock via a O_WRONLY file descriptor. Of all inconveniences this
is the most minor one, so now skalibs uses fcntl().

 https://skarnet.org/software/skalibs/
 git://git.skarnet.org/skalibs

 * nsss-0.1.0.0
   ------------

 - New --enable-libc-includes configure option. Without this option,
the pwd.h, grp.h and shadow.h headers are not installed anymore, so
by default installing nsss on a FHS system does not overwrite the
libc headers.

 https://skarnet.org/software/nsss/
 git://git.skarnet.org/nsss

 * utmps-0.1.0.0
   -------------

 - New --enable-libc-includes configure option. Without this option,
the utmpx.h header is not installed anymore, so by default installing
utmps on a FHS system does not overwrite the libc headers.

 https://skarnet.org/software/utmps/
 git://git.skarnet.org/utmps

 * execline-2.7.0.0
   ----------------

 - Bugfixes.
 - The trap program has changed. The "timeout" directive has been
removed; a "default" directive has been added, to handle all signals
for which a specific directive has not been given. Subprograms are
now run with the SIGNAL environment variable set to the signal number
(in addition to ! always being set to the application's pid).
 - The forstdin program has changed. It now exits 0 if it has read at
least one line, and 1 otherwise.
 - The default list of delimiters for backtick, withstdinas, forstdin
and forbacktickx has been set to "\n", so by default those programs
will read and/or split on lines and only lines.
 - The backtick, withstdinas, forstdin, forbacktickx, forx, getpid
and getcwd programs now have a -E option to activate autoimport.
(This saves the user from manually adding "importas var var" after
every use of these programs.)

 https://skarnet.org/software/execline/
 git://git.skarnet.org/execline

 * s6-2.10.0.0
   -----------

 It is imperative to restart your supervision trees, by rebooting if
necessary, after upgrading s6 to the new version. Otherwise, new s6
binaries interacting with service directories maintained by old
s6-supervise binaries may not work.
 If you are using s6-linux-init, it is necessary to upgrade to the
latest version of s6-linux-init at the same time as s6.

 - Bugfixes.
 - Significant code refactoring.
 - The internal locking system of service directories has changed,
allowing for a cleaner permissions model and official support of
relaxed permissions.
 - New binary to implement those relaxed permissions: s6-svperms.
 - The "nosetsid" file is not supported anymore in service directories.
Services are now always started in a new session.
 - s6-supervise now traps SIGINT: before dying, it sends a SIGINT to its
service's process group. This allows correct transmission of ^C when a
supervision tree is running in a terminal, even though every service
runs in its own session.
 - s6-svc -X doesn't exist anymore. s6-supervise now always closes stdin
and stdout on the last execution of the service.
 - The semantics of SIGHUP and SIGQUIT have changed for s6-supervise.
 - The set of commands sent by s6-svscanctl and received by s6-svscan
has been cleaned up and made more logical.
 - When told to exit normally (typically via s6-svscanctl -t), s6-svscan
now first waits for the whole supervision tree to die. The
.s6-svscan/finish script can now assume that all services are completely
down. (s6-svscanctl -b is an exception; it should not be used in normal
circumstances.)
 - The -s and -S options to s6-svscan are not supported anymore. Signal
management in s6-svscan has been streamlined: signals have a default
handler that can be overridden by a corresponding executable
.s6-svscan/SIGfoo file.
 - Default signal handlers for s6-svscan have more intuitive semantics.
 - New binary to help with management of user-owned supervision trees:
s6-usertree-maker.

 https://skarnet.org/software/s6/
 git://git.skarnet.org/s6

s6 now has man pages! Thanks to flexibeast for performing the conversion

work. Please allow some time for the man pages to be updated to reflect
the current HTML documentation. The repository can be found here:

 https://github.com/flexibeast/s6-man-pages

 * s6-linux-init-1.0.6.0
   ---------------------

 It *is necessary* to upgrade s6-linux-init at the same time as s6.
 It *is recommended*, although not strictly necessary, to create your
run-image directory again via a s6-linux-init-maker invocation. Old
images will still boot, as long as you are using an upgraded version
of s6-linux-init; but they may incorrectly handle signals sent to init,
so for instance Ctrl-Alt-Del may not work anymore, until you run
s6-linux-init-maker again.

 - New internal binary: s6-linux-init-nuke. This program is not meant
to be invoked by users directly: it simply removes a dependency to the
'kill' program in a rare case involving containers.

 https://skarnet.org/software/s6-linux-init/
 git://git.skarnet.org/s6-linux-init

 * s6-dns-2.3.4.0
   --------------

 - New library function: s6dns_message_parse_question().

 https://skarnet.org/software/s6-dns/
 git://git.skarnet.org/s6-dns

 * s6-networking-2.4.0.0
   ---------------------

 - Important refactoring of the tls code. The crypto tunnel now runs
as a child of the application, instead of the other way around. It is
now isolated in a s6-tls[cd]-io binary; s6-tlsc is now a simple wrapper
around s6-tlsc-io, and s6-tlsd is a simple wrapper around s6-tlsd-io.
 - New binaries: s6-ucspitlsc and s6-ucspitlsd. Those implement
opportunistic TLS via the UCSPI-TLS protocol.
 - The -K option to the tls binaries has changed semantics: it now
enforces a timeout for the handshake instead of dropping the connection
after some inactivity. Note that this option is only useful with the
bearssl backend: the libtls backend always performs a synchronous
handshake, with no way of interrupting it after a timeout expires.
 - The execline dependency is now optional. Disabling execline, however,
changes the behaviour of s6-tcpserver-access (which cannot support
exec files without it).

 https://skarnet.org/software/s6-networking/
 git://git.skarnet.org/s6-networking

 It is now possible to build the s6-networking package against OpenSSL
instead of LibreSSL, thanks to the libretls project:
 https://git.causal.agency/libretls/about/

 * mdevd-0.1.3.0
   -------------

 - New -C option to the mdevd program. This option makes mdevd
automatically spawn a mdevd-coldplug program when it's ready, allowing
mdevd to be used as a drop-in mdev -d replacement. (Note that the
coldplug is also performed if mdevd restarts after being killed, so
this feature should not be used in place of a proper service startup
sequence with a mdevd-coldplug oneshot depending on the mdevd longrun.
It has only been added for convenience.)

 https://skarnet.org/software/mdevd/
 git://git.skarnet.org/mdevd

 * Other packages
   --------------

 The following packages have received an update so they build with the

latest version of skalibs and other dependencies, but nothing has changed

except possibly some bugfixes, and hopefully not too many bug additions.

 - s6-rc-0.5.2.1. (It is not necessary to recompile your service
database. However, it is necessary to upgrade s6-rc along with s6, and
to reboot the system ASAP after upgrading.)
 - s6-portable-utils-2.2.3.1
 - s6-linux-utils-2.5.1.4
 - bcnm-0.0.1.2

 Enjoy,
 Bug-reports welcome.

--
 Laurent

-----
execline compat interface
-----

    /* Compatibility */

    #define pathexec_run(file, argv, envp) exec_ae(file, argv, envp)
    #define pathexec0_run(file, argv, envp) exec0_ae(file, argv, envp)
    #define xpathexec_run(file, argv, envp) xexec_ae(file, argv, envp)
    #define xpathexec0_run(file, argv, envp) xexec0_ae(file, argv, envp)

    #define pathexec_env(key, value) env_mexec(key, value)
    #define pathexec_fromenv(argv, envp, envlen) mexec_f(argv, envp, envlen)
    #define pathexec(argv) mexec(argv)
    #define pathexec0(argv) mexec0(argv)
    #define xpathexec_fromenv(argv, envp, envlen) xmexec_f(argv, envp, envlen)
    #define xpathexec(argv) xmexec(argv)
    #define xpathexec0(argv) xmexec0(argv)

    #define pathexec_r_name(file, argv, envp, envlen, modif, modiflen) mexec_afm(file, argv, envp, envlen, modif, modiflen)
    #define pathexec_r(argv, envp, envlen, modif, modiflen) mexec_fm(argv, envp, envlen, modif, modiflen)
    #define xpathexec_r_name(file, argv, envp, envlen, modif, modiflen) xmexec_afm(file, argv, envp, envlen, modif, modiflen)
    #define xpathexec_r(argv, envp, envlen, modif, modiflen) xmexec_fm(argv, envp, envlen, modif, modiflen)

    #endif

copied from https://github.com/skarnet/skalibs/commit/18e43565574b700befc832ed4d25d25e40951f68#diff-69efbe5d997280a1430a6af2fa38e3f5105e706076a26fc751885c505ca598c6R140
---
 pkgs/development/libraries/nsss/default.nix   |   4 +-
 .../development/libraries/skalibs/default.nix |   4 +-
 pkgs/development/libraries/utmps/default.nix  |   4 +-
 .../linux/s6-linux-utils/default.nix          |   4 +-
 .../linux/sdnotify-wrapper/sdnotify-wrapper.c |  22 +-
 pkgs/tools/misc/execline/default.nix          |   4 +-
 pkgs/tools/misc/execline/execlineb-wrapper.c  |   5 +-
 pkgs/tools/misc/fdtools/default.nix           |   1 +
 pkgs/tools/misc/fdtools/new-skalibs.patch     | 223 ++++++++++++++++++
 pkgs/tools/misc/s6-portable-utils/default.nix |   4 +-
 pkgs/tools/networking/s6-dns/default.nix      |   4 +-
 .../networking/s6-networking/default.nix      |   6 +-
 pkgs/tools/system/s6-rc/default.nix           |   4 +-
 pkgs/tools/system/s6/default.nix              |   4 +-
 14 files changed, 261 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/tools/misc/fdtools/new-skalibs.patch

diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix
index 3e3530215bf..4e71c4d65e6 100644
--- a/pkgs/development/libraries/nsss/default.nix
+++ b/pkgs/development/libraries/nsss/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "nsss";
-  version = "0.0.2.2";
-  sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k";
+  version = "0.1.0.0";
+  sha256 = "15rxbwf16wm1la079yr2xn4bccjgd7m8dh6r7bpr6s57cj93i2mq";
 
   description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
 
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index a691107f9a1..1efac7fc5e4 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "skalibs";
-  version = "2.9.3.0";
-  sha256 = "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph";
+  version = "2.10.0.1";
+  sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg";
 
   description = "A set of general-purpose C programming libraries";
 
diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix
index 16b4cd563b2..107c23dcb59 100644
--- a/pkgs/development/libraries/utmps/default.nix
+++ b/pkgs/development/libraries/utmps/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "utmps";
-  version = "0.0.3.2";
-  sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh";
+  version = "0.1.0.0";
+  sha256 = "09p0k2sgxr7jlsbrn66fzvzf9zxvpjp85y79xk10hxjglypszyml";
 
   description = "A secure utmpx and wtmp implementation";
 
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 42ffea0029a..209f596d273 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6-linux-utils";
-  version = "2.5.1.3";
-  sha256 = "0wbv02zxaami88xbj2zg63kspz05bbplswg0c6ncb5g9khf52wa4";
+  version = "2.5.1.4";
+  sha256 = "02gxzc9igid2kf2rvm3v6kc9806mpjmdq7cpanv4cml0ip68vbfq";
 
   description = "A set of minimalistic Linux-specific system utilities";
   platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c
index 0d1ae96068a..bb71a732bf9 100644
--- a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c
+++ b/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c
@@ -1,5 +1,5 @@
 /*
-   Copyright: (C)2015-2017 Laurent Bercot.  http://skarnet.org/
+   Copyright: (C)2015-2020 Laurent Bercot.  http://skarnet.org/
    ISC license. See http://opensource.org/licenses/ISC
 
    Build-time requirements: skalibs.  http://skarnet.org/software/skalibs/
@@ -53,20 +53,24 @@
 #include <sys/types.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+
 #include <skalibs/uint64.h>
 #include <skalibs/types.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/env.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 #include <skalibs/djbunix.h>
-#include <skalibs/webipc.h>
+//#include <skalibs/webipc.h>
+// svanderburg: This header no longer exists, but socket.h provides the functions this module needs
+#include <skalibs/socket.h>
+#include <skalibs/exec.h>
 
 #define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..."
 #define dieusage() strerr_dieusage(100, USAGE)
@@ -123,9 +127,9 @@ static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const
   return 0 ;
 }
 
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
 {
-  char const *s = env_get2(envp, VAR) ;
+  char const *s = getenv(VAR) ;
   unsigned int fd = 1 ;
   unsigned int timeout = 0 ;
   int df = 1, keep = 0 ;
@@ -134,7 +138,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
     subgetopt_t l = SUBGETOPT_ZERO ;
     for (;;)
     {
-      register int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
+      int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
       if (opt == -1) break ;
       switch (opt)
       {
@@ -149,7 +153,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   }
   if (!argc) dieusage() ;
 
-  if (!s) xpathexec_run(argv[0], argv, envp) ;
+  if (!s) xexec(argv) ;
   else
   {
     pid_t parent = getpid() ;
@@ -166,7 +170,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
     }
     close(p[0]) ;
     if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ;
-    if (keep) xpathexec_run(argv[0], argv, envp) ;
-    else xpathexec_r(argv, envp, env_len(envp), VAR, sizeof(VAR)) ;
+    if (keep) xexec(argv) ;
+    else xmexec_m(argv, VAR, sizeof(VAR)) ;
   }
 }
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index bf7853c1173..887671b4899 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "execline";
-  version = "2.6.1.1";
-  sha256 = "0mmsnai3bkyhng0cxdz6bf7d6b7kbsxs4p39m63215lz6kq0hhrr";
+  version = "2.7.0.0";
+  sha256 = "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd";
 
   description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
 
diff --git a/pkgs/tools/misc/execline/execlineb-wrapper.c b/pkgs/tools/misc/execline/execlineb-wrapper.c
index d31a76ca26e..c8e91813b77 100644
--- a/pkgs/tools/misc/execline/execlineb-wrapper.c
+++ b/pkgs/tools/misc/execline/execlineb-wrapper.c
@@ -12,6 +12,7 @@
 #include <skalibs/djbunix.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/env.h>
+#include <skalibs/exec.h>
 
 #define dienomem() strerr_diefu1sys(111, "stralloc_catb")
 
@@ -41,10 +42,10 @@ int main(int argc, char const* argv[], char const *const *envp)
   }
 
   // exec into execlineb and append path_modif to the environment
-  xpathexec_r_name(
+  xmexec_aem(
     EXECLINEB_PATH(),
     argv,
-    envp, env_len(envp),
+    envp,
     path_modif.s, path_modif.len
   );
 }
diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix
index 6e0cb66749f..d096f903bd1 100644
--- a/pkgs/tools/misc/fdtools/default.nix
+++ b/pkgs/tools/misc/fdtools/default.nix
@@ -13,6 +13,7 @@ in stdenv.mkDerivation {
     inherit sha256;
   };
 
+  patches = [ ./new-skalibs.patch ];
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
 
   buildInputs = [ skawarePackages.skalibs ];
diff --git a/pkgs/tools/misc/fdtools/new-skalibs.patch b/pkgs/tools/misc/fdtools/new-skalibs.patch
new file mode 100644
index 00000000000..76c5396f8a8
--- /dev/null
+++ b/pkgs/tools/misc/fdtools/new-skalibs.patch
@@ -0,0 +1,223 @@
+diff -Naur misc/fdtools-2020.05.04/src/check_exit_exec.c misc-new/fdtools-2020.05.04/src/check_exit_exec.c
+--- misc/fdtools-2020.05.04/src/check_exit_exec.c	2015-03-16 04:55:56.000000000 +0100
++++ misc-new/fdtools-2020.05.04/src/check_exit_exec.c	2021-01-22 10:50:25.529955213 +0100
+@@ -2,6 +2,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ 
++#include <skalibs/exec.h>
+ #include <skalibs/stddjb.h>
+ #include "prjlibs-c/constants.h"
+ #include "prjlibs-c/diewarn.h"
+@@ -14,7 +15,7 @@
+ 
+   if (str_equal(arg, ":")) {
+     ++argv;
+-    pathexec0((char const**)argv);
++    mexec0((char const**)argv);
+     DIE1(exec, argv[0]);
+   }
+ }
+diff -Naur misc/fdtools-2020.05.04/src/grabconsole.c misc-new/fdtools-2020.05.04/src/grabconsole.c
+--- misc/fdtools-2020.05.04/src/grabconsole.c	2020-04-24 06:01:22.000000000 +0200
++++ misc-new/fdtools-2020.05.04/src/grabconsole.c	2021-01-22 10:43:27.887754936 +0100
+@@ -4,6 +4,7 @@
+ #include <errno.h>
+ 
+ #include <skalibs/stddjb.h>
++#include <skalibs/exec.h>
+ #include "prjlibs-c/constants.h"
+ #include "prjlibs-c/diewarn.h"
+ #include "prjlibs-c/types.h"
+@@ -26,6 +27,6 @@
+   if (fd_grabconsole(fd)!=0) DIE0(tioccons);
+ 
+   argv+=2;
+-  pathexec0((char const**)argv);
++  mexec0((char const**)argv);
+   DIE1(exec, argv[0]);
+ }
+diff -Naur misc/fdtools-2020.05.04/src/pipecycle.c misc-new/fdtools-2020.05.04/src/pipecycle.c
+--- misc/fdtools-2020.05.04/src/pipecycle.c	2015-03-16 04:55:56.000000000 +0100
++++ misc-new/fdtools-2020.05.04/src/pipecycle.c	2021-01-22 10:47:58.033220790 +0100
+@@ -4,6 +4,7 @@
+ #include <unistd.h>
+ #include <signal.h>
+ 
++#include <skalibs/exec.h>
+ #include <skalibs/stddjb.h>
+ #include "prjlibs-c/diewarn.h"
+ #include "prjlibs-c/types.h"
+@@ -56,7 +57,7 @@
+       if (fd_shuffle(2, current, wanted)!=0) DIE0(dup);
+     }
+     read(start[0], &j, 1);
+-    pathexec(args);
++    mexec(args);
+     DIE1(exec, args[0]);
+   }
+ 
+diff -Naur misc/fdtools-2020.05.04/src/recvfd.c misc-new/fdtools-2020.05.04/src/recvfd.c
+--- misc/fdtools-2020.05.04/src/recvfd.c	2020-04-28 09:35:05.000000000 +0200
++++ misc-new/fdtools-2020.05.04/src/recvfd.c	2021-01-22 10:47:14.180994779 +0100
+@@ -7,6 +7,7 @@
+ #include <limits.h>
+ 
+ #include <skalibs/stddjb.h>
++#include <skalibs/exec.h>
+ #include "prjlibs-c/diewarn.h"
+ #include "prjlibs-c/types.h"
+ #include "fdtools.h"
+@@ -69,9 +70,9 @@
+       named_fd=duped;
+     }
+     buf[int_fmt(buf, named_fd)]='\0';
+-    if (pathexec_env(argv[i]+1, buf)==0) DIE0(alloc);
++    if (env_mexec(argv[i]+1, buf)==0) DIE0(alloc);
+   }
+   argv+=nfds+1;
+-  pathexec0((char const**)argv);
++  mexec0((char const**)argv);
+   DIE1(exec, argv[0]);
+ }
+diff -Naur misc/fdtools-2020.05.04/src/sendfd.c misc-new/fdtools-2020.05.04/src/sendfd.c
+--- misc/fdtools-2020.05.04/src/sendfd.c	2015-03-16 06:48:39.000000000 +0100
++++ misc-new/fdtools-2020.05.04/src/sendfd.c	2021-01-22 10:43:07.207634214 +0100
+@@ -7,6 +7,7 @@
+ #include <limits.h>
+ 
+ #include <skalibs/stddjb.h>
++#include <skalibs/exec.h>
+ #include "prjlibs-c/diewarn.h"
+ #include "prjlibs-c/types.h"
+ #include "fdtools.h"
+@@ -40,6 +41,6 @@
+   argv+=nfds;
+   if (*argv==NULL) _exit(0);
+   ++argv;
+-  pathexec0((char const**)argv);
++  mexec0((char const**)argv);
+   DIE1(exec, argv[0]);
+ }
+diff -Naur misc/fdtools-2020.05.04/src/setstate.c misc-new/fdtools-2020.05.04/src/setstate.c
+--- misc/fdtools-2020.05.04/src/setstate.c	2020-05-04 10:04:21.000000000 +0200
++++ misc-new/fdtools-2020.05.04/src/setstate.c	2021-01-22 10:45:05.084304318 +0100
+@@ -8,6 +8,7 @@
+ #include <errno.h>
+ 
+ #include <skalibs/stddjb.h>
++#include <skalibs/exec.h>
+ #include "prjlibs-c/constants.h"
+ #include "prjlibs-c/intattr.h"
+ #include "prjlibs-c/diewarn.h"
+@@ -167,6 +168,6 @@
+   }
+ 
+   argv+=2;
+-  pathexec_run(argv[0], (char const**)argv, (char const**)environ);
++  mexec_ae(argv[0], (char const**)argv, (char const**)environ);
+   DIE1(exec, argv[0]);
+ }
+diff -Naur misc/fdtools-2020.05.04/src/statfile.c misc-new/fdtools-2020.05.04/src/statfile.c
+--- misc/fdtools-2020.05.04/src/statfile.c	2015-03-22 00:33:44.000000000 +0100
++++ misc-new/fdtools-2020.05.04/src/statfile.c	2021-01-22 10:48:23.673351183 +0100
+@@ -6,6 +6,7 @@
+ #include <errno.h>
+ 
+ #include <skalibs/stddjb.h>
++#include <skalibs/exec.h>
+ #include "prjlibs-c/constants.h"
+ #include "prjlibs-c/diewarn.h"
+ #include "prjlibs-c/warn.h"
+@@ -15,7 +16,7 @@
+ char const* PROG="statfile";
+ 
+ static void set(char const* const var, char const* const val) {
+-  if (pathexec_env(var, val)==0) DIE0(alloc);
++  if (env_mexec(var, val)==0) DIE0(alloc);
+ }
+ 
+ static void set64n(char const* const var, time_t t, unsigned int nsec) {
+@@ -178,6 +179,6 @@
+   }
+ 
+   argv+=3;
+-  pathexec((char const**)argv);
++  mexec((char const**)argv);
+   DIE1(exec, argv[0]);
+ }
+diff -Naur misc/fdtools-2020.05.04/src/vc-get-linux.c misc-new/fdtools-2020.05.04/src/vc-get-linux.c
+--- misc/fdtools-2020.05.04/src/vc-get-linux.c	2020-04-28 07:04:49.000000000 +0200
++++ misc-new/fdtools-2020.05.04/src/vc-get-linux.c	2021-01-22 10:47:34.649100757 +0100
+@@ -10,6 +10,7 @@
+ #include <sys/sysmacros.h>
+ 
+ #include <skalibs/stddjb.h>
++#include <skalibs/exec.h>
+ #include "prjlibs-c/constants.h"
+ #include "prjlibs-c/diewarn.h"
+ #include "prjlibs-c/types.h"
+@@ -38,7 +39,7 @@
+       errno=0;
+       if (ioctl(fd, VT_OPENQRY, &vtnum)<0 || vtnum==-1) DIE0(vt_qry);
+       bufnum[ulong_fmt(bufnum, vtnum)]='\0';
+-      if (pathexec_env("TTY", buf)==0) DIE0(alloc);
++      if (env_mexec("TTY", buf)==0) DIE0(alloc);
+     }
+     fd_close(fd);
+ 
+@@ -50,12 +51,12 @@
+       if (fstat(fd, &statbuf)!=0) DIE1(stat, buf);
+       buf[ulong_fmt(buf, minor(statbuf.st_rdev))]='\0';
+     }
+-    if (pathexec_env("VCNUM", buf)==0) DIE0(alloc);
++    if (env_mexec("VCNUM", buf)==0) DIE0(alloc);
+ 
+     buf[ulong_fmt(buf, fd)]='\0';
+-    if (pathexec_env("VCFD", buf)==0) DIE0(alloc);
++    if (env_mexec("VCFD", buf)==0) DIE0(alloc);
+   }
+ 
+-  pathexec((char const**)argv+2);
++  mexec((char const**)argv+2);
+   DIE1(exec, argv[2]);
+ }
+diff -Naur misc/fdtools-2020.05.04/src/vc-lock-linux.c misc-new/fdtools-2020.05.04/src/vc-lock-linux.c
+--- misc/fdtools-2020.05.04/src/vc-lock-linux.c	2015-03-20 05:59:42.000000000 +0100
++++ misc-new/fdtools-2020.05.04/src/vc-lock-linux.c	2021-01-22 10:48:36.857417751 +0100
+@@ -8,6 +8,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/vt.h>
+ 
++#include <skalibs/exec.h>
+ #include <skalibs/stddjb.h>
+ #include "prjlibs-c/constants.h"
+ #include "prjlibs-c/diewarn.h"
+@@ -79,7 +80,7 @@
+       WARN0(fork);
+     } else if (pid==0) {
+       sigprocmask(SIG_SETMASK, &old_set, NULLP);
+-      pathexec((char const**)argv);
++      mexec((char const**)argv);
+       DIE1(exec, *argv);
+     } else {
+       int status;
+diff -Naur misc/fdtools-2020.05.04/src/vc-switch-linux.c misc-new/fdtools-2020.05.04/src/vc-switch-linux.c
+--- misc/fdtools-2020.05.04/src/vc-switch-linux.c	2020-04-28 07:14:04.000000000 +0200
++++ misc-new/fdtools-2020.05.04/src/vc-switch-linux.c	2021-01-22 10:42:41.259480648 +0100
+@@ -10,6 +10,7 @@
+ #include <sys/sysmacros.h>
+ 
+ #include <skalibs/stddjb.h>
++#include <skalibs/exec.h>
+ #include "prjlibs-c/constants.h"
+ #include "prjlibs-c/diewarn.h"
+ #include "prjlibs-c/types.h"
+@@ -36,6 +37,6 @@
+   if (ioctl(fd, VT_ACTIVATE, ttyno)<0) DIE0(vt_act);
+   if (!scan) fd_close(fd);
+ 
+-  pathexec0((char const**)argv+3);
++  mexec0((char const**)argv+3);
+   DIE1(exec, argv[3]);
+ }
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index fee6ae14bbd..731f6c48785 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -7,8 +7,8 @@ let
 
 in buildPackage {
   pname = pname;
-  version = "2.2.3.0";
-  sha256 = "063zwifigg2b3wsixdcz4h9yvr6fkqssvx0iyfsprjfmm1yapfi9";
+  version = "2.2.3.1";
+  sha256 = "1ks1ch5v3p2z8y8wp5fmzzgjrqn2l5sj1sgfp8vv6wy8psd8mrj3";
 
   description = "A set of tiny general Unix utilities optimized for simplicity and small size";
 
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 739fdc2e2fc..5036b1a87ea 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6-dns";
-  version = "2.3.2.0";
-  sha256 = "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7";
+  version = "2.3.5.0";
+  sha256 = "0h5p5dbkkdadahrp4pqhc3x9ds758i6djy49k5zrn7mm5k4722wz";
 
   description = "A suite of DNS client programs and libraries for Unix systems";
 
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index f8c479d5ce2..3f10b850ca7 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
 
 buildPackage {
   pname = "s6-networking";
-  version = "2.3.1.2";
-  sha256 = "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr";
+  version = "2.4.0.0";
+  sha256 = "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq";
 
   description = "A suite of small networking utilities for Unix systems";
 
@@ -59,7 +59,7 @@ buildPackage {
     # remove all s6 executables from build directory
     rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
     rm minidentd
-    rm libs6net.* libstls.*
+    rm libs6net.* libstls.* libs6tls.*
 
     mv doc $doc/share/doc/s6-networking/html
   '';
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 8b17ea583f2..30467926f5d 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6-rc";
-  version = "0.5.2.0";
-  sha256 = "1qpygkajalaziszhwfv5rr6hc27q05z8dayyv7im06z6vndimchs";
+  version = "0.5.2.1";
+  sha256 = "02pszbi440wagx2qp8aqj9mv5wm2qisw9lkq7mbnbnxxw9azlhi8";
 
   description = "A service manager for s6-based systems";
   platforms = lib.platforms.linux;
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index a0419c2d2ad..75aadbeda8d 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6";
-  version = "2.9.2.0";
-  sha256 = "1pfxx50shncg2s47ic4kp02jh1cxfjq75j3mnxjagyzzz0mbfg9n";
+  version = "2.10.0.0";
+  sha256 = "0xzqrd0m3wjklmw1w3gjw5dcdxnhgvxv2r5wd6m2ismw2jprr9k0";
 
   description = "skarnet.org's small & secure supervision software suite";
 

From 01ea0b5722f2d211c9268df9448c9106604052b0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 21 Jan 2021 20:00:43 +0100
Subject: [PATCH 677/956] s6-linux-init: init at 1.0.6.0

---
 .../linux/s6-linux-init/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/linux/s6-linux-init/default.nix

diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix
new file mode 100644
index 00000000000..2fb6c9441ed
--- /dev/null
+++ b/pkgs/os-specific/linux/s6-linux-init/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, skawarePackages }:
+
+with skawarePackages;
+
+buildPackage {
+  pname = "s6-linux-init";
+  version = "1.0.6.0";
+  sha256 = "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w";
+
+  description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
+  platforms = lib.platforms.linux;
+
+  outputs = [ "bin" "dev" "doc" "out" ];
+
+  configureFlags = [
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-include=${execline.dev}/include"
+    "--with-include=${s6.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-lib=${s6.out}/lib"
+    "--with-lib=${execline.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
+    "--with-dynlib=${execline.lib}/lib"
+    "--with-dynlib=${s6.out}/lib"
+  ];
+
+  postInstall = ''
+    # remove all s6 executables from build directory
+    rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
+    rm libs6_linux_init.* libhpr.*
+    rm -rf skel
+
+    mv doc $doc/share/doc/s6-linux-init/html
+  '';
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd86fed4cb2..b892150a23c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7542,6 +7542,8 @@ in
 
   s6-dns = skawarePackages.s6-dns;
 
+  s6-linux-init = skawarePackages.s6-linux-init;
+
   s6-linux-utils = skawarePackages.s6-linux-utils;
 
   s6-networking = skawarePackages.s6-networking;
@@ -16463,6 +16465,7 @@ in
 
     s6 = callPackage ../tools/system/s6 { };
     s6-dns = callPackage ../tools/networking/s6-dns { };
+    s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { };
     s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { };
     s6-networking = callPackage ../tools/networking/s6-networking { };
     s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };

From a8bc079d6accaedbe123b932059d755cee4dfc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 23 Jan 2021 12:16:16 +0100
Subject: [PATCH 678/956] phonetisaurus: 2020-07-31 -> 0.9.1

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

diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix
index abacfdc1cce..9ba00833d62 100644
--- a/pkgs/development/libraries/phonetisaurus/default.nix
+++ b/pkgs/development/libraries/phonetisaurus/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   pname = "phonetisaurus";
-  version = "2020-07-31";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "AdolfVonKleist";
     repo = pname;
-    rev = "2831870697de5b4fbcb56a6e1b975e0e1ea10deb";
+    rev = version;
     sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv";
   };
 

From 491667c51a77281b7973c04d23a892bb7df7c63e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 23 Jan 2021 12:30:55 +0100
Subject: [PATCH 679/956] python3Packages.wasmer: make cargoHash invariant to
 the Python version

The package name used the Python version. Since the name is used in
the Cargo vendor directory, the Cargo vendor hash depended on the
Python version. Remove the Python version from the name.
---
 pkgs/development/python-modules/wasmer/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix
index e8307365574..0bb60d6b9e3 100644
--- a/pkgs/development/python-modules/wasmer/default.nix
+++ b/pkgs/development/python-modules/wasmer/default.nix
@@ -11,7 +11,7 @@ let
   version = "1.0.0-beta1";
 
   wheel = rustPlatform.buildRustPackage rec {
-    name = "${pname}-${version}-py${python.version}";
+    inherit pname version;
 
     src = fetchFromGitHub {
       owner = "wasmerio";
@@ -20,7 +20,7 @@ let
       sha256 = "0302lcfjlw7nz18nf86z6swhhpp1qnpwcsm2fj4avl22rsv0h78j";
     };
 
-    cargoSha256 = "0d83dniijjq8rc4fcwj6ja5x4hxh187afnqfd8c9fzb8nx909a0v";
+    cargoHash = "sha256-Rq5m9Lu6kePvohfhODLMOpGPFtCh0woTsQY2TufoiNQ=";
 
     nativeBuildInputs = [ maturin python ];
 
@@ -50,8 +50,6 @@ let
 in
 buildPythonPackage rec {
   inherit pname version;
-  # we can only support one python version because the cargo hash changes with the python version
-  disabled = !isPy38;
 
   format = "wheel";
   src = wheel;

From f5db4578bacb33e4836017300d45dd670b18cb90 Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Sat, 23 Jan 2021 08:28:30 +0800
Subject: [PATCH 680/956] perlPackages.NetAsyncPing: skip ping socket tests

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aded5f1c95e..7fff5fac0aa 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14876,6 +14876,7 @@ let
     };
     propagatedBuildInputs = [ IOAsync Moo NetFrameLayerIPv6 namespaceclean ];
     buildInputs = [ TestFatal ];
+    preCheck = "rm t/icmp_ps.t t/icmpv6_ps.t"; # ping socket tests fail
     meta = {
       description = "asyncronously check remote host for reachability";
       license = with lib.licenses; [ artistic1 gpl1Plus ];

From 1b7583ee8f4dc8dd3a4e5f781eeeb4e1c126d144 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 23 Jan 2021 13:10:18 +0100
Subject: [PATCH 681/956] simdjson: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix
index 3a7734b1d51..14636e7d18a 100644
--- a/pkgs/development/libraries/simdjson/default.nix
+++ b/pkgs/development/libraries/simdjson/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "simdjson";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
     rev = "v${version}";
-    sha256 = "14gi2zq430nfjy424q6r57imc2gnz30nhx4r0wbajzp9qvna819w";
+    sha256 = "0lpb8la74xwd78d5mgwnzx4fy632jbmh0ip19v0dydwm0kagm0a3";
   };
 
   nativeBuildInputs = [ cmake ];

From 67c0d5b95c33b3eacdc320234eb32ee635f26d31 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 23 Jan 2021 13:28:36 +0100
Subject: [PATCH 682/956] spdlog_1: add support for pkgsStatic

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

diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index 1bd73990443..ac74b74ccf1 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -17,7 +17,8 @@ let
       buildInputs = [ fmt ];
 
       cmakeFlags = [
-        "-DSPDLOG_BUILD_SHARED=ON"
+        "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+        "-DSPDLOG_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
         "-DSPDLOG_BUILD_EXAMPLE=OFF"
         "-DSPDLOG_BUILD_BENCH=OFF"
         "-DSPDLOG_BUILD_TESTS=ON"

From f7989948f9ca83469e6bc2535bcd15ecfb3869a9 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 22 Jan 2021 23:59:22 +0100
Subject: [PATCH 683/956] libpgf: 6.14.12 -> 7.21.2

Fixes CVE-2015-6673.
---
 pkgs/development/libraries/libpgf/default.nix | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix
index 280059fbab3..682ff485d65 100644
--- a/pkgs/development/libraries/libpgf/default.nix
+++ b/pkgs/development/libraries/libpgf/default.nix
@@ -1,24 +1,20 @@
-{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix }:
+{ lib, stdenv, fetchzip, autoreconfHook }:
 
-with lib;
-
-let
-  version = "6.14.12";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libpgf";
-  inherit version;
+  version = "7.21.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz";
-    sha256 = "1ssqjbh6l5jc04f67n47m9bqcigl46c6lgyabyi6cabnh1frk9dx";
+  src = fetchzip {
+    url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}.zip";
+    sha256 = "0l1j5b1d02jn27miggihlppx656i0pc70cn6x89j1rpj33zn0g9r";
   };
 
-  buildInputs = [ autoconf automake libtool dos2unix ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  preConfigure = "dos2unix configure.ac; sh autogen.sh";
-
-# configureFlags = optional static "--enable-static --disable-shared";
+  autoreconfPhase = ''
+    mv README.txt README
+    sh autogen.sh
+  '';
 
   meta = {
     homepage = "https://www.libpgf.org/";

From bd627037b1285901b158656002b4ba3c20979963 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 23 Jan 2021 13:11:14 +0100
Subject: [PATCH 684/956] simdjson: add support for pkgsStatic

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

diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix
index 14636e7d18a..e41d08c7cd3 100644
--- a/pkgs/development/libraries/simdjson/default.nix
+++ b/pkgs/development/libraries/simdjson/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DSIMDJSON_JUST_LIBRARY=ON"
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isStatic "-DSIMDJSON_BUILD_STATIC=ON";
 
   meta = with lib; {
     homepage = "https://simdjson.org/";

From f12f79cb9f5c7a4d07a6413f2ff0cb07488ece03 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sat, 23 Jan 2021 19:33:39 +0700
Subject: [PATCH 685/956] hdf5-blosc: move cmake to nativeBuildInputs

---
 pkgs/development/libraries/hdf5-blosc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/development/libraries/hdf5-blosc/default.nix
index 0879bb9ee9d..985660ff907 100644
--- a/pkgs/development/libraries/hdf5-blosc/default.nix
+++ b/pkgs/development/libraries/hdf5-blosc/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "plugin" ];
 
-  buildInputs = [ c-blosc cmake hdf5 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ c-blosc hdf5 ];
 
   preConfigure = ''
     substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'

From 171406507dfedb0791dee815370f5cc63a02d287 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Jan 2021 02:23:22 +0100
Subject: [PATCH 686/956] libgadu: 1.11.2 -> 1.12.2

Fixes CVE-2013-4488 and CVE-2014-3775.
---
 .../development/libraries/libgadu/default.nix | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix
index 10705a2c164..72bf067b2db 100644
--- a/pkgs/development/libraries/libgadu/default.nix
+++ b/pkgs/development/libraries/libgadu/default.nix
@@ -1,19 +1,23 @@
-{lib, stdenv, fetchurl, zlib}:
+{ lib, stdenv, fetchFromGitHub, zlib, protobufc, autoreconfHook }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  pname = "libgadu";
+  version = "1.12.2";
 
-  name = "libgadu-1.11.2";
-
-  src = fetchurl {
-    url = "http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz";
-    sha256 = "0kifi9blhbimihqw4kaf6wyqhlx8fpp8nq4s6y280ar9p0il2n3z";
+  src = fetchFromGitHub {
+    owner = "wojtekka";
+    repo = pname;
+    rev = version;
+    sha256 = "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h";
   };
 
   propagatedBuildInputs = [ zlib ];
+  buildInputs = [ protobufc ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   meta = {
     description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)";
-    homepage = "http://toxygen.net/libgadu/";
+    homepage = "https://libgadu.net/index.en.html";
     platforms = lib.platforms.linux;
     license = lib.licenses.lgpl21;
   };

From 50855dacc07ea960c558530d6c72fb85b6ef04db Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sat, 23 Jan 2021 19:47:34 +0700
Subject: [PATCH 687/956] falcon: move cmake to nativeBuildInputs

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

diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 9ff81553550..de7cc10d756 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
     sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ cmake pcre zlib sqlite ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ pcre zlib sqlite ];
 
   meta = with stdenv.lib; {
     description = "Programming language with macros and syntax at once";

From 87fb5d381f13f2e7cce281d8f494cd1fb44ba5b5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 17 Jan 2021 20:42:20 +0100
Subject: [PATCH 688/956] nixos/smokeping: Add a PoC for using networking.fqdn

---
 nixos/modules/services/networking/smokeping.nix | 4 +++-
 nixos/tests/smokeping.nix                       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 37ee2a80389..35506e0395a 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -124,7 +124,8 @@ in
       };
       hostName = mkOption {
         type = types.str;
-        default = config.networking.hostName;
+        default = config.networking.fqdn;
+        defaultText = "\${config.networking.fqdn}";
         example = "somewhere.example.com";
         description = "DNS name for the urls generated in the cgi.";
       };
@@ -156,6 +157,7 @@ in
       ownerEmail = mkOption {
         type = types.str;
         default = "no-reply@${cfg.hostName}";
+        defaultText = "no-reply@\${hostName}";
         example = "no-reply@yourdomain.com";
         description = "Email contact for owner";
       };
diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix
index 4f8f0fcc9fe..77a980153ad 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixos/tests/smokeping.nix
@@ -8,6 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     sm =
       { ... }:
       {
+        networking.domain = "example.com"; # FQDN: sm.example.com
         services.smokeping = {
           enable = true;
           port = 8081;

From 237c20ac61d0e65df7cbbe7957499895b3f82c23 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Jan 2021 12:26:34 +0100
Subject: [PATCH 689/956] nixos/smokeping: Replace the tabs in cfg.targetConfig

This was inconsistent with the rest of the module.
---
 .../modules/services/networking/smokeping.nix | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 35506e0395a..d32f96f500b 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -241,18 +241,18 @@ in
       targetConfig = mkOption {
         type = types.lines;
         default = ''
-					probe = FPing
-					menu = Top
-					title = Network Latency Grapher
-					remark = Welcome to the SmokePing website of xxx Company. \
-									 Here you will learn all about the latency of our network.
-					+ Local
-					menu = Local
-					title = Local Network
-					++ LocalMachine
-					menu = Local Machine
-					title = This host
-					host = localhost
+          probe = FPing
+          menu = Top
+          title = Network Latency Grapher
+          remark = Welcome to the SmokePing website of xxx Company. \
+                   Here you will learn all about the latency of our network.
+          + Local
+          menu = Local
+          title = Local Network
+          ++ LocalMachine
+          menu = Local Machine
+          title = This host
+          host = localhost
         '';
         description = "Target configuration";
       };

From ca100334dfcfe87f00826351a267bb6b809dcf3d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Jan 2021 14:10:15 +0100
Subject: [PATCH 690/956] python3Packages.pycfdns: init at 1.2.1

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

diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix
new file mode 100644
index 00000000000..ca0b0fe5ecf
--- /dev/null
+++ b/pkgs/development/python-modules/pycfdns/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, aiohttp
+, async-timeout
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "pycfdns";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "ludeeus";
+    repo = pname;
+    rev = version;
+    sha256 = "0df4695cb0h6f2lnn6dx4h5al2ra93zp1hzfaz07nj2gvirswp83";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+  ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pycfdns" ];
+
+  meta = with lib; {
+    description = "Python module for updating Cloudflare DNS A records";
+    homepage = "https://github.com/ludeeus/pycfdns";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84c11b5cd0f..14f8da228d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5205,6 +5205,8 @@ in {
 
   pycdio = callPackage ../development/python-modules/pycdio { };
 
+  pycfdns = callPackage ../development/python-modules/pycfdns { };
+
   pychart = callPackage ../development/python-modules/pychart { };
 
   pychef = callPackage ../development/python-modules/pychef { };

From 3e6bc9edeb098d6436165a18902bd39823e6ad16 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Jan 2021 14:11:41 +0100
Subject: [PATCH 691/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8ba845dc431..48112c34572 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -121,7 +121,7 @@
     "clicksend_tts" = ps: with ps; [ ];
     "climate" = ps: with ps; [ ];
     "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ];
-    "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns
+    "cloudflare" = ps: with ps; [ pycfdns ];
     "cmus" = ps: with ps; [ ]; # missing inputs: pycmus
     "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
     "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase

From a57e182ed6d699d3bd1989cced4fe875b8fee08a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Jan 2021 14:15:42 +0100
Subject: [PATCH 692/956] glances: 3.1.5 -> 3.1.6

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

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index b0bd5cc8b15..0def36f0444 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "3.1.5";
+  version = "3.1.6";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "0l91nvlwyabxlsy5p533dqnc68mmvykfsrcsnxylcpjjl1nzy931";
+    sha256 = "sha256-uPqHXRwQQQZsttiLuqgr+dcAna+BVZtym4YEmTPLkXk=";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

From 07a6732bf5bc2a6328eeb89bf18a68f7c0e1b4cf Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Sat, 23 Jan 2021 14:28:08 +0100
Subject: [PATCH 693/956] Fix elm-json build on Darwin

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

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 459efde218a..7ee9e6e5d61 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -2,7 +2,8 @@
 , haskell, nodejs
 , fetchurl, fetchpatch, makeWrapper, writeScriptBin
   # Rust dependecies
-, rustPlatform, openssl, pkg-config }:
+, rustPlatform, openssl, pkg-config, Security
+}:
 let
   fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
 
@@ -96,7 +97,7 @@ let
 
   elmRustPackages =  {
     elm-json = import ./packages/elm-json.nix {
-      inherit rustPlatform fetchurl openssl stdenv pkg-config;
+      inherit lib rustPlatform fetchurl openssl stdenv pkg-config Security;
     } // {
       meta = with lib; {
         description = "Install, upgrade and uninstall Elm dependencies";
diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix
index 7a8143174f9..810c1a91a00 100644
--- a/pkgs/development/compilers/elm/packages/elm-json.nix
+++ b/pkgs/development/compilers/elm/packages/elm-json.nix
@@ -1,4 +1,4 @@
-{ rustPlatform, fetchurl, openssl, stdenv, pkg-config }:
+{ lib, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "elm-json";
   version = "0.2.7";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
 
   cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b892150a23c..afa2227a7dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9523,7 +9523,9 @@ in
 
   elm2nix = haskell.lib.justStaticExecutables haskellPackages.elm2nix;
 
-  elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });
+  elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  });
 
   apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { };
 

From 001c0cbe54228f88d5634f431fcaf460b8ff4590 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sat, 23 Jan 2021 20:15:07 +0700
Subject: [PATCH 694/956] pkgs/development/interpreters: stdenv.lib -> lib

---
 .../development/interpreters/acl2/default.nix | 10 ++--
 .../acl2/libipasirglucose4/default.nix        |  4 +-
 .../development/interpreters/alda/default.nix |  4 +-
 .../interpreters/angelscript/2.22.nix         |  8 ++--
 .../interpreters/angelscript/default.nix      |  8 ++--
 .../interpreters/ceptre/default.nix           |  4 +-
 .../interpreters/chibi/default.nix            |  8 ++--
 .../interpreters/cling/default.nix            |  6 +--
 .../interpreters/clips/default.nix            |  4 +-
 .../interpreters/clisp/default.nix            | 46 +++++++++----------
 pkgs/development/interpreters/clisp/hg.nix    | 44 +++++++++---------
 .../interpreters/clojure/babashka.nix         |  6 +--
 .../interpreters/clojure/clooj.nix            |  4 +-
 .../interpreters/clojure/default.nix          |  6 +--
 .../clojurescript/lumo/default.nix            |  6 +--
 .../interpreters/cyclone/default.nix          |  8 ++--
 .../development/interpreters/dart/default.nix |  4 +-
 .../interpreters/duktape/default.nix          |  4 +-
 pkgs/development/interpreters/eff/default.nix |  4 +-
 .../interpreters/elixir/generic-builder.nix   |  8 ++--
 .../interpreters/erlang/generic-builder.nix   |  8 ++--
 .../interpreters/evcxr/default.nix            |  8 ++--
 .../interpreters/falcon/default.nix           |  4 +-
 .../interpreters/gnu-apl/default.nix          |  8 ++--
 .../interpreters/groovy/default.nix           |  4 +-
 .../interpreters/gtk-server/default.nix       |  4 +-
 pkgs/development/interpreters/guile/1.8.nix   | 12 ++---
 pkgs/development/interpreters/guile/2.0.nix   | 20 ++++----
 .../interpreters/guile/default.nix            | 18 ++++----
 .../development/interpreters/hugs/default.nix |  4 +-
 pkgs/development/interpreters/hy/default.nix  |  4 +-
 .../interpreters/icon-lang/default.nix        |  6 +--
 pkgs/development/interpreters/io/default.nix  |  4 +-
 pkgs/development/interpreters/j/default.nix   |  6 +--
 .../interpreters/janet/default.nix            |  4 +-
 .../interpreters/jimtcl/default.nix           | 10 ++--
 .../interpreters/joker/default.nix            |  4 +-
 .../interpreters/jruby/default.nix            |  4 +-
 .../interpreters/jython/default.nix           |  4 +-
 .../development/interpreters/kona/default.nix |  4 +-
 .../interpreters/lfe/generic-builder.nix      |  6 +--
 .../interpreters/lolcode/default.nix          |  6 +--
 pkgs/development/interpreters/love/0.10.nix   |  8 ++--
 pkgs/development/interpreters/love/0.7.nix    |  8 ++--
 pkgs/development/interpreters/love/0.8.nix    |  8 ++--
 pkgs/development/interpreters/love/0.9.nix    |  8 ++--
 pkgs/development/interpreters/love/11.1.nix   |  8 ++--
 .../interpreters/lua-5/default.nix            |  2 +-
 .../interpreters/lua-5/filesystem.nix         |  2 +-
 .../interpreters/lua-5/interpreter.nix        |  8 ++--
 .../interpreters/lua-5/sockets.nix            |  2 +-
 .../interpreters/lua-5/wrapper.nix            |  6 +--
 .../interpreters/luajit/default.nix           | 12 ++---
 .../development/interpreters/lush/default.nix |  8 ++--
 .../interpreters/maude/default.nix            | 10 ++--
 .../interpreters/metamath/default.nix         |  4 +-
 .../development/interpreters/mujs/default.nix |  4 +-
 .../interpreters/nix-exec/default.nix         |  4 +-
 .../development/interpreters/perl/wrapper.nix |  4 +-
 pkgs/development/interpreters/php/generic.nix |  2 +-
 .../interpreters/picoc/default.nix            |  4 +-
 .../interpreters/picolisp/default.nix         |  4 +-
 .../interpreters/pixie/default.nix            | 12 ++---
 pkgs/development/interpreters/pixie/dust.nix  |  6 +--
 .../interpreters/proglodyte-wasm/default.nix  |  4 +-
 pkgs/development/interpreters/pyrex/0.9.5.nix |  4 +-
 pkgs/development/interpreters/pyrex/0.9.6.nix |  4 +-
 .../python/cpython/2.7/default.nix            | 14 +++---
 .../interpreters/python/cpython/default.nix   | 14 +++---
 .../interpreters/python/pypy/default.nix      | 10 ++--
 .../interpreters/python/pypy/prebuilt.nix     |  6 +--
 .../development/interpreters/python/tests.nix |  2 +-
 .../interpreters/python/wrapper.nix           |  6 +--
 .../interpreters/qnial/default.nix            |  8 ++--
 .../interpreters/quickjs/default.nix          |  4 +-
 .../interpreters/racket/default.nix           | 20 ++++----
 .../interpreters/rakudo/default.nix           |  2 +-
 .../interpreters/rakudo/moarvm.nix            |  6 +--
 pkgs/development/interpreters/rakudo/nqp.nix  |  2 +-
 pkgs/development/interpreters/rakudo/zef.nix  |  4 +-
 .../interpreters/rascal/default.nix           |  8 ++--
 .../interpreters/rebol/default.nix            |  2 +-
 pkgs/development/interpreters/red/default.nix |  4 +-
 .../interpreters/regina/default.nix           |  4 +-
 .../interpreters/renpy/default.nix            |  6 +--
 .../development/interpreters/ruby/default.nix |  4 +-
 .../interpreters/scheme48/default.nix         |  6 +--
 .../development/interpreters/scsh/default.nix |  4 +-
 .../development/interpreters/self/default.nix |  4 +-
 .../interpreters/shen-sbcl/default.nix        |  4 +-
 .../interpreters/shen-sources/default.nix     |  4 +-
 .../interpreters/spidermonkey/1.8.5.nix       |  6 +--
 .../interpreters/spidermonkey/38.nix          |  8 ++--
 .../interpreters/spidermonkey/60.nix          |  6 +--
 .../interpreters/spidermonkey/68.nix          |  6 +--
 .../interpreters/spidermonkey/78.nix          |  6 +--
 .../interpreters/supercollider/default.nix    |  6 +--
 pkgs/development/interpreters/tcl/generic.nix |  6 +--
 .../interpreters/tclreadline/default.nix      |  6 +--
 .../interpreters/tinyscheme/default.nix       |  4 +-
 .../interpreters/unicon-lang/default.nix      |  4 +-
 101 files changed, 350 insertions(+), 350 deletions(-)

diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 83b54e442aa..c089916158b 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
+{ lib, stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
 , sbcl, bash, which, perl, nettools
 , openssl, glucose, minisat, abc-verifier, z3, python2
 , certifyBooks ? true
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     # ACL2 itself only needs a Common Lisp compiler/interpreter:
     sbcl
-  ] ++ stdenv.lib.optionals certifyBooks [
+  ] ++ lib.optionals certifyBooks [
     # To build community books, we need Perl and a couple of utilities:
     which perl nettools
     # Some of the books require one or more of these external tools:
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
   preConfigure = ''
     # When certifying books, ACL2 doesn't like $HOME not existing.
     export HOME=$(pwd)/fake-home
-  '' + stdenv.lib.optionalString certifyBooks ''
+  '' + lib.optionalString certifyBooks ''
     # Some books also care about $USER being nonempty.
     export USER=nobody
   '';
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     ln -s $out/share/${pname}/saved_acl2           $out/bin/${pname}
-  '' + stdenv.lib.optionalString certifyBooks ''
+  '' + lib.optionalString certifyBooks ''
     ln -s $out/share/${pname}/books/build/cert.pl  $out/bin/${pname}-cert
     ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean
   '';
@@ -100,7 +100,7 @@ in stdenv.mkDerivation rec {
     rm -rf $out/share/${pname}/books
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interpreter and a prover for a Lisp dialect";
     longDescription = ''
       ACL2 is a logic and programming language in which you can model computer
diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix
index 5186cd69584..b9a61b88a30 100644
--- a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix
+++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, unzip }:
+{ lib, stdenv, fetchurl, zlib, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "libipasirglucose4";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     install -D libipasirglucose4.so $out/lib/libipasirglucose4.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Shared library providing IPASIR interface to the Glucose SAT solver";
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix
index b82b0b978f9..19e90a00e6c 100644
--- a/pkgs/development/interpreters/alda/default.nix
+++ b/pkgs/development/interpreters/alda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre }:
+{ lib, stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
   pname = "alda";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A music programming language for musicians";
     homepage = "https://alda.io";
     license = licenses.epl10;
diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix
index 15e7f4dd5c1..922d964e8ab 100644
--- a/pkgs/development/interpreters/angelscript/2.22.nix
+++ b/pkgs/development/interpreters/angelscript/2.22.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 let
   s = # Generated upstream information
   rec {
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Light-weight scripting library";
-    license = stdenv.lib.licenses.zlib ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.zlib ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     badPlatforms = [ "aarch64-linux" ];
     downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
     homepage="http://www.angelcode.com/angelscript/";
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index f4139a37eea..fb8c6b2844d 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 let
   s = # Generated upstream information
   rec {
@@ -29,9 +29,9 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Light-weight scripting library";
-    license = stdenv.lib.licenses.zlib ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.zlib ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
     homepage="http://www.angelcode.com/angelscript/";
   };
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index de12185b96f..a9b8f54ab87 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, mlton }:
+{ lib, stdenv, fetchgit, mlton }:
 
 stdenv.mkDerivation {
   name = "ceptre-2016-11-27";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     cp ceptre $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A linear logic programming language for modeling generative interactive systems";
     homepage = "https://github.com/chrisamaphone/interactive-lp";
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
index 7bf4c0fd52d..96c884ab602 100644
--- a/pkgs/development/interpreters/chibi/default.nix
+++ b/pkgs/development/interpreters/chibi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper }:
 let
   version = "0.9.1";
   name = "chibi-scheme-${version}";
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/ashinn/chibi-scheme";
     description = "Small Footprint Scheme for use as a C Extension Language";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.DerGuteMoritz ];
   };
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix
index c22ad3f4cb0..8f80d2f4ee6 100644
--- a/pkgs/development/interpreters/cling/default.nix
+++ b/pkgs/development/interpreters/cling/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python
 , libffi
 , git
@@ -50,7 +50,7 @@ let
       "-DCLING_INCLUDE_TESTS=ON"
     ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "The Interactive C++ Interpreter";
       homepage = "https://root.cern/cling/";
       license = with licenses; [ lgpl21 ncsa ];
@@ -73,7 +73,7 @@ let
   flags = [
     "-nostdinc"
     "-nostdinc++"
-    "-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include"
+    "-isystem" "${lib.getDev stdenv.cc.libc}/include"
     "-I" "${unwrapped}/include"
     "-I" "${unwrapped}/lib/clang/5.0.2/include"
   ];
diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index cf0710f36a1..d38fb8279f0 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   version = "6.30";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   installPhase = ''
     install -D -t $out/bin core/clips
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Tool for Building Expert Systems";
     homepage = "http://www.clipsrules.net/";
     longDescription = ''
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 1b7ff2c8cba..566d16179b5 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -3,7 +3,7 @@
 # - base (default): contains readline and i18n, regexp and syscalls modules
 #   by default
 # - full: contains base plus modules in withModules
-{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
+{ lib, stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
 , libffi
 , libffcall
@@ -16,8 +16,8 @@
     "pcre"
     "rawsock"
   ]
-  ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
-  ++ stdenv.lib.optional x11Support "clx/new-clx"
+  ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
+  ++ lib.optional x11Support "clx/new-clx"
 }:
 
 assert x11Support -> (libX11 != null && libXau != null && libXt != null
@@ -37,14 +37,14 @@ stdenv.mkDerivation rec {
   ffcallAvailable = stdenv.isLinux && (libffcall != null);
 
   buildInputs = [libsigsegv]
-  ++ stdenv.lib.optional (gettext != null) gettext
-  ++ stdenv.lib.optional (ncurses != null) ncurses
-  ++ stdenv.lib.optional (pcre != null) pcre
-  ++ stdenv.lib.optional (zlib != null) zlib
-  ++ stdenv.lib.optional (readline != null) readline
-  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
-  ++ stdenv.lib.optional ffcallAvailable libffcall
-  ++ stdenv.lib.optionals x11Support [
+  ++ lib.optional (gettext != null) gettext
+  ++ lib.optional (ncurses != null) ncurses
+  ++ lib.optional (pcre != null) pcre
+  ++ lib.optional (zlib != null) zlib
+  ++ lib.optional (readline != null) readline
+  ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
+  ++ lib.optional ffcallAvailable libffcall
+  ++ lib.optionals x11Support [
     libX11 libXau libXt libXpm xorgproto libXext
   ];
 
@@ -68,14 +68,14 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "builddir" ]
-  ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
-  ++ stdenv.lib.optional (readline != null) "--with-readline"
+  ++ lib.optional (!dllSupport) "--without-dynamic-modules"
+  ++ lib.optional (readline != null) "--with-readline"
   # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
-  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
-  ++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
-  ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
+  ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
+  ++ lib.optional ffcallAvailable "--with-ffcall"
+  ++ lib.optional (!ffcallAvailable) "--without-ffcall"
   ++ builtins.map (x: "--with-module=" + x) withModules
-  ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
+  ++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -83,11 +83,11 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall =
-    stdenv.lib.optionalString (withModules != [])
+    lib.optionalString (withModules != [])
       (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
-      + stdenv.lib.concatMapStrings (x: " " + x) withModules);
+      + lib.concatMapStrings (x: " " + x) withModules);
 
-  NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
+  NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
 
   # TODO : make mod-check fails
   doCheck = false;
@@ -95,10 +95,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ANSI Common Lisp Implementation";
     homepage = "http://clisp.cons.org";
-    maintainers = with stdenv.lib.maintainers; [raskin tohl];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [raskin tohl];
+    platforms = lib.platforms.unix;
     # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
     broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix
index 6898f84669f..83a1870d182 100644
--- a/pkgs/development/interpreters/clisp/hg.nix
+++ b/pkgs/development/interpreters/clisp/hg.nix
@@ -3,7 +3,7 @@
 # - base (default): contains readline and i18n, regexp and syscalls modules
 #   by default
 # - full: contains base plus modules in withModules
-{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
+{ lib, stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
 , libffi, libffcall, automake
 , coreutils
@@ -15,8 +15,8 @@
     "pcre"
     "rawsock"
   ]
-  ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
-  ++ stdenv.lib.optional x11Support "clx/new-clx"
+  ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
+  ++ lib.optional x11Support "clx/new-clx"
 }:
 
 assert x11Support -> (libX11 != null && libXau != null && libXt != null
@@ -38,14 +38,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ automake ]; # sometimes fails otherwise
   buildInputs = [libsigsegv]
-  ++ stdenv.lib.optional (gettext != null) gettext
-  ++ stdenv.lib.optional (ncurses != null) ncurses
-  ++ stdenv.lib.optional (pcre != null) pcre
-  ++ stdenv.lib.optional (zlib != null) zlib
-  ++ stdenv.lib.optional (readline != null) readline
-  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
-  ++ stdenv.lib.optional ffcallAvailable libffcall
-  ++ stdenv.lib.optionals x11Support [
+  ++ lib.optional (gettext != null) gettext
+  ++ lib.optional (ncurses != null) ncurses
+  ++ lib.optional (pcre != null) pcre
+  ++ lib.optional (zlib != null) zlib
+  ++ lib.optional (readline != null) readline
+  ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
+  ++ lib.optional ffcallAvailable libffcall
+  ++ lib.optionals x11Support [
     libX11 libXau libXt libXpm xorgproto libXext
   ];
 
@@ -63,14 +63,14 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "builddir" ]
-  ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
-  ++ stdenv.lib.optional (readline != null) "--with-readline"
+  ++ lib.optional (!dllSupport) "--without-dynamic-modules"
+  ++ lib.optional (readline != null) "--with-readline"
   # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
-  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
-  ++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
-  ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
+  ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
+  ++ lib.optional ffcallAvailable "--with-ffcall"
+  ++ lib.optional (!ffcallAvailable) "--without-ffcall"
   ++ builtins.map (x: " --with-module=" + x) withModules
-  ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
+  ++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -79,11 +79,11 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall =
-    stdenv.lib.optionalString (withModules != [])
+    lib.optionalString (withModules != [])
       (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
-      + stdenv.lib.concatMapStrings (x: " " + x) withModules);
+      + lib.concatMapStrings (x: " " + x) withModules);
 
-  NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
+  NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
 
   # TODO : make mod-check fails
   doCheck = false;
@@ -91,8 +91,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ANSI Common Lisp Implementation";
     homepage = "http://clisp.cons.org";
-    maintainers = with stdenv.lib.maintainers; [raskin tohl];
+    maintainers = with lib.maintainers; [raskin tohl];
     # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index a6beaf1a576..e10236fe1ee 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, graalvm11-ce, glibcLocales }:
+{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "babashka";
   version = "0.2.3";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     cp bb $out/bin/bb
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Clojure babushka for the grey areas of Bash";
     longDescription = ''
       The main idea behind babashka is to leverage Clojure in places where you
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index d51fa76003b..57da5e862e9 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper }:
 
 let version = "0.4.4"; in
 
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A lightweight IDE for Clojure";
     homepage = "https://github.com/arthuredelstein/clooj";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 06e18c96ac3..ab542237859 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
+{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "clojure";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # See https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh
   installPhase =
     let
-      binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
+      binPath = lib.makeBinPath [ rlwrap jdk ];
     in
     ''
       clojure_lib_dir=$out
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       -Sverbose \
       -Scp $out/libexec/clojure-tools-${version}.jar
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Lisp dialect for the JVM";
     homepage = "https://clojure.org/";
     license = licenses.epl10;
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 61fd94c09bf..a269d0b158e 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -280,8 +280,8 @@ stdenv.mkDerivation {
       making it the fastest Clojure REPL in existence.
     '';
     homepage = "https://github.com/anmonteiro/lumo";
-    license = stdenv.lib.licenses.epl10;
-    maintainers = [ stdenv.lib.maintainers.hlolli ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.epl10;
+    maintainers = [ lib.maintainers.hlolli ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix
index 60a5fd9e65f..c0a11cf9f02 100644
--- a/pkgs/development/interpreters/cyclone/default.nix
+++ b/pkgs/development/interpreters/cyclone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libck, darwin }:
+{ lib, stdenv, fetchFromGitHub, libck, darwin }:
 
 let
   version = "0.21";
@@ -15,7 +15,7 @@ let
 
     enableParallelBuilding = true;
 
-    nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
 
     buildInputs = [ libck ];
 
@@ -36,13 +36,13 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ bootstrap ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
 
   buildInputs = [ libck ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://justinethier.github.io/cyclone/";
     description = "A brand-new compiler that allows practical application development using R7RS Scheme";
     license = licenses.mit;
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 99e6d966283..7fa59a18c5f 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, version ? "2.7.2" }:
+{ lib, stdenv, fetchurl, unzip, version ? "2.7.2" }:
 
 let
 
@@ -80,7 +80,7 @@ let
 
 in
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
 
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index 8dbfee20641..f864f5bf6f9 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "duktape";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An embeddable Javascript engine, with a focus on portability and compact footprint";
     homepage = "https://duktape.org/";
     downloadPage = "https://duktape.org/download.html";
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index cfd3bbbda4c..8dba500c15b 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/pkgs/development/interpreters/eff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, ocamlPackages }:
+{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }:
 
 let version = "5.0"; in
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   doCheck = true;
   checkTarget = "test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.eff-lang.org";
     description = "A functional programming language based on algebraic effects and their handlers";
     longDescription = ''
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 8dddd5befd4..358fff039c6 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper,
+{ pkgs, lib, stdenv, fetchFromGitHub, erlang, makeWrapper,
   coreutils, curl, bash, debugInfo ? false }:
 
 { baseName ? "elixir"
@@ -10,7 +10,7 @@
 } @ args:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast optional;
+  inherit (lib) getVersion versionAtLeast optional;
 
 in
   assert versionAtLeast (getVersion erlang) minimumOTPVersion;
@@ -46,7 +46,7 @@ in
        b=$(basename $f)
         if [ "$b" = mix ]; then continue; fi
         wrapProgram $f \
-          --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
+          --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \
           --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
       done
 
@@ -55,7 +55,7 @@ in
     '';
 
     pos = builtins.unsafeGetAttrPos "sha256" args;
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = "https://elixir-lang.org/";
       description = "A functional, meta-programming aware language built on top of the Erlang VM";
 
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 91ea2fe57ab..4429dc1eaf3 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
+{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
 , libxml2, libxslt, ncurses, openssl, perl, autoconf
 # TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
 , openjdk8 ? null # javacSupport
@@ -41,7 +41,7 @@ assert odbcSupport -> unixODBC != null;
 assert javacSupport -> openjdk8 != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalAttrs optionalString;
+  inherit (lib) optional optionals optionalAttrs optionalString;
   wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
 
 in stdenv.mkDerivation ({
@@ -106,12 +106,12 @@ in stdenv.mkDerivation ({
   # Some erlang bin/ scripts run sed and awk
   postFixup = ''
     wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
+    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${lib.makeBinPath [ gnused gawk ]}"
   '';
 
   setupHook = ./setup-hook.sh;
 
-  meta = with stdenv.lib; ({
+  meta = with lib; ({
     homepage = "https://www.erlang.org/";
     downloadPage = "https://www.erlang.org/download.html";
     description = "Programming language used for massively scalable soft real-time systems";
diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 60a284de3f1..fa428b98335 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -1,4 +1,4 @@
-{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, stdenv, gcc, Security, cmake }:
+{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }:
 
 rustPlatform.buildRustPackage rec {
   pname = "evcxr";
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage rec {
   RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
 
   nativeBuildInputs = [ pkg-config makeWrapper cmake ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
   postInstall = let
     wrap = exe: ''
       wrapProgram $out/bin/${exe} \
-        --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \
+        --prefix PATH : ${lib.makeBinPath [ cargo gcc ]} \
         --set-default RUST_SRC_PATH "$RUST_SRC_PATH"
     '';
   in ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
     rm $out/bin/testing_runtime
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An evaluation context for Rust";
     homepage = "https://github.com/google/evcxr";
     license = licenses.asl20;
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 9ff81553550..541e7b6f324 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
 
 stdenv.mkDerivation {
   pname = "falcon";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ cmake pcre zlib sqlite ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Programming language with macros and syntax at once";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index f01cfc2444b..9ae373ff7a8 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, gettext, ncurses }:
+{ lib, stdenv, fetchurl, readline, gettext, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "gnu-apl";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline gettext ncurses ];
 
   # Needed with GCC 8
-  NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [
+  NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [
     "-Wno-error=int-in-bool-context"
     "-Wno-error=class-memaccess"
     "-Wno-error=restrict"
     "-Wno-error=format-truncation"
    ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference");
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
   '';
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     find $out/share/doc/support-files -name 'Makefile*' -delete
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free interpreter for the APL programming language";
     homepage    = "https://www.gnu.org/software/apl/";
     license     = licenses.gpl3Plus;
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index dd9cac84ddd..0e3a0a46afd 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
+{ lib, stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
 
 # at runtime, need jdk
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An agile dynamic language for the Java Platform";
     homepage = "http://groovy-lang.org/";
     license = licenses.asl20;
diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix
index 7203ba31993..3841785e8ac 100644
--- a/pkgs/development/interpreters/gtk-server/default.nix
+++ b/pkgs/development/interpreters/gtk-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , glib
 , gtk3
 , libffcall
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   configureOptions = [ "--with-gtk3" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "gtk-server for interpreted GUI programming";
     homepage = "http://www.gtk-server.org/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index b1c80b13af9..93eca9a73f1 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildBuild, buildPackages
+{ lib, stdenv, pkgsBuildBuild, buildPackages
 , fetchurl, makeWrapper, gawk, pkg-config
 , libtool, readline, gmp
 }:
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-error-on-warning" ]
     # Guile needs patching to preset results for the configure tests about
     # pthreads, which work only in native builds.
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
                           "--with-threads=no";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
                            pkgsBuildBuild.guile_1_8;
   nativeBuildInputs = [ makeWrapper gawk pkg-config ];
   buildInputs = [ readline libtool ];
@@ -67,9 +67,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = "https://www.gnu.org/software/guile/";
-    license     = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms   = stdenv.lib.platforms.unix;
+    license     = lib.licenses.lgpl2Plus;
+    maintainers = [ lib.maintainers.ludo ];
+    platforms   = lib.platforms.unix;
 
     longDescription = ''
       GNU Guile is an interpreter for the Scheme programming language,
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 1db5676a8c7..b93ec556cd4 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildBuild, buildPackages
+{ lib, stdenv, pkgsBuildBuild, buildPackages
 , fetchpatch, fetchurl, makeWrapper, gawk, pkg-config
 , libffi, libtool, readline, gmp, boehmgc, libunistring
 , coverageAnalysis ? null
@@ -21,7 +21,7 @@
   setOutputFlags = false; # $dev gets into the library otherwise
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
                            pkgsBuildBuild.guile_2_0;
   nativeBuildInputs = [ makeWrapper gawk pkg-config ];
   buildInputs = [ readline libtool libunistring libffi ];
@@ -46,8 +46,8 @@
     })
     ./riscv.patch
   ] ++
-    (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
-    ++ stdenv.lib.optionals stdenv.isDarwin [
+    (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
+    ++ lib.optionals stdenv.isDarwin [
       (fetchpatch {
         url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
         sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
@@ -59,10 +59,10 @@
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
 
   # don't have "libgcc_s.so.1" on darwin
-  LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
+  LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
 
   configureFlags = [ "--with-libreadline-prefix" ]
-    ++ stdenv.lib.optionals stdenv.isSunOS [
+    ++ lib.optionals stdenv.isSunOS [
       # Make sure the right <gmp.h> is found, and not the incompatible
       # /usr/include/mp.h from OpenSolaris.  See
       # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
@@ -102,9 +102,9 @@
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = "https://www.gnu.org/software/guile/";
-    license     = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ ludo lovek323 ];
+    platforms   = lib.platforms.all;
 
     longDescription = ''
       GNU Guile is an implementation of the Scheme programming language, with
@@ -120,7 +120,7 @@
 
 //
 
-(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
+(lib.optionalAttrs (!stdenv.isLinux) {
   # Work around <https://bugs.gnu.org/14201>.
   SHELL = stdenv.shell;
   CONFIG_SHELL = stdenv.shell;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 77483b2256a..ed685682db6 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgsBuildBuild, buildPackages
+{ lib, stdenv, pkgsBuildBuild, buildPackages
 , fetchurl, makeWrapper, gawk, pkg-config
 , libffi, libtool, readline, gmp, boehmgc, libunistring
 , coverageAnalysis ? null
@@ -23,7 +23,7 @@
   setOutputFlags = false; # $dev gets into the library otherwise
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
                            pkgsBuildBuild.guile;
   nativeBuildInputs = [ makeWrapper gawk pkg-config ];
   buildInputs = [ readline libtool libunistring libffi ];
@@ -48,8 +48,8 @@
 
   patches = [
     ./eai_system.patch
-  ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
-    ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+  ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
+    ++ lib.optional stdenv.isDarwin (fetchpatch {
       url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
       sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
     });
@@ -58,11 +58,11 @@
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
 
   # don't have "libgcc_s.so.1" on darwin
-  LDFLAGS = stdenv.lib.optionalString
+  LDFLAGS = lib.optionalString
     (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s";
 
   configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]
-    ++ stdenv.lib.optionals stdenv.isSunOS [
+    ++ lib.optionals stdenv.isSunOS [
       # Make sure the right <gmp.h> is found, and not the incompatible
       # /usr/include/mp.h from OpenSolaris.  See
       # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
@@ -101,9 +101,9 @@
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = "https://www.gnu.org/software/guile/";
-    license     = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ ludo lovek323 vrthra ];
+    platforms   = lib.platforms.all;
 
     longDescription = ''
       GNU Guile is an implementation of the Scheme programming language, with
diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix
index 35463b16157..6af489473c9 100644
--- a/pkgs/development/interpreters/hugs/default.nix
+++ b/pkgs/development/interpreters/hugs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison }:
+{ lib, stdenv, fetchurl, bison }:
 
 stdenv.mkDerivation {
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     "--enable-pthreads"                 # build Hugs using POSIX threads C library
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.haskell.org/hugs";
     description = "Haskell interpreter";
     maintainers = with maintainers; [ joachifm ];
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index a8890b048fb..6bfef26b4dd 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "hy";
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     $out/bin/hy --help > /dev/null
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A LISP dialect embedded in Python";
     homepage = "http://hylang.org/";
     license = licenses.mit;
diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix
index 30e260eee46..5481f7825c9 100644
--- a/pkgs/development/interpreters/icon-lang/default.nix
+++ b/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , libX11
 , libXt
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2";
   };
 
-  buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];
+  buildInputs = lib.optionals withGraphics [ libX11 libXt ];
 
   configurePhase =
     let
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     mv $out/doc $out/share/doc/icon
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A very high level general-purpose programming language";
     maintainers = with maintainers; [ vrthra yurrriq ];
     platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos;
diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix
index a87b3ef8678..d0a3b20e503 100644
--- a/pkgs/development/interpreters/io/default.nix
+++ b/pkgs/development/interpreters/io/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
+{ lib, stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
   ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
   libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
   python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   # for gcc5; c11 inline semantics breaks the build
   NIX_CFLAGS_COMPILE = "-fgnu89-inline";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Io programming language";
     homepage = "http://iolanguage.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index b7f8b63d54a..ab64505e091 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, readline, libedit, bc
+{ lib, stdenv, fetchFromGitHub, readline, libedit, bc
 , avxSupport ? stdenv.hostPlatform.avxSupport
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Causes build failure due to warning
-  hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow";
+  hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
 
   buildPhase = ''
     export SOURCE_DIR=$(pwd)
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     cp -r $JLIB/bin "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "J programming language, an ASCII-based APL successor";
     maintainers = with maintainers; [ raskin synthetica ];
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index fe0d3073acb..aefc158b000 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "janet";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Janet programming language";
     homepage = "https://janet-lang.org/";
     license = licenses.mit;
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
index d803fe43fd7..78b9e40b647 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
+{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
 
 let
-  makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
+  makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
 
 in stdenv.mkDerivation rec {
   pname = "jimtcl";
@@ -52,8 +52,8 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "An open source small-footprint implementation of the Tcl programming language";
     homepage = "http://jim.tcl.tk/";
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ dbohdan vrthra ];
   };
 }
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 2eb01b37644..3d36dde8e0f 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "joker";
@@ -21,7 +21,7 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/candid82/joker";
     description = "A small Clojure interpreter and linter written in Go";
     license = licenses.epl10;
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 9159f026e1f..f792471c061 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }:
 
 let
 # The version number here is whatever is reported by the RUBY_VERSION string
@@ -50,7 +50,7 @@ jruby = stdenv.mkDerivation rec {
     libPath = "lib/${rubyEngine}/${rubyVersion.libDir}";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ruby interpreter written in Java";
     homepage = "http://jruby.org/";
     license = with licenses; [ cpl10 gpl2 lgpl21 ];
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index 35af365c1f7..61cc8f9cd0f 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   pname = "jython";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Python interpreter written in Java";
     homepage = "https://jython.org/";
-    license = stdenv.lib.licenses.psfl;
+    license = lib.licenses.psfl;
     platforms = jre.meta.platforms;
   };
 }
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 041616cc1f6..15ce9321a8d 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "kona";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
   preInstall = ''mkdir -p "$out/bin"'';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interpreter of K, APL-like programming language";
     homepage = "https://github.com/kevinlawler/kona/";
     maintainers = with maintainers; [ raskin ];
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index ba42c2d59d5..d6090152d15 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
+{ lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
 
 { baseName ? "lfe"
 , version
@@ -10,7 +10,7 @@
 }:
 
 let
-  inherit (stdenv.lib)
+  inherit (lib)
     assertMsg makeBinPath optionalString
     getVersion versionAtLeast versionOlder versions;
 
@@ -75,7 +75,7 @@ buildRebar3 {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description     = "The best of Erlang and of Lisp; at the same time!";
     longDescription = ''
       LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang
diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix
index 180ce28c9ae..65653701b80 100644
--- a/pkgs/development/interpreters/lolcode/default.nix
+++ b/pkgs/development/interpreters/lolcode/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
+{ lib, stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
 
   pname = "lolcode";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
 }
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index 9319fa12406..ed002d99fbb 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
+{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
   libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
   libtheora, which, autoconf, automake, libtool
 }:
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    license = lib.licenses.zlib;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
   };
 }
diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix
index 2198ff962a1..6cba19bff0f 100644
--- a/pkgs/development/interpreters/love/0.7.nix
+++ b/pkgs/development/interpreters/love/0.7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config
+{ lib, stdenv, fetchurl, pkg-config
 , SDL, libGLU, libGL, openal, lua
 , libdevil, freetype, physfs
 , libmodplug, mpg123, libvorbis, libogg
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
   };
 }
diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix
index 866ce83adf1..8bad501170d 100644
--- a/pkgs/development/interpreters/love/0.8.nix
+++ b/pkgs/development/interpreters/love/0.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config
+{ lib, stdenv, fetchurl, pkg-config
 , SDL, libGLU, libGL, openal, lua
 , libdevil, freetype, physfs
 , libmodplug, mpg123, libvorbis, libogg
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
   };
 }
diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix
index 315a07bd9ca..b7e20498a39 100644
--- a/pkgs/development/interpreters/love/0.9.nix
+++ b/pkgs/development/interpreters/love/0.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config
+{ lib, stdenv, fetchurl, pkg-config
 , SDL2, libGLU, libGL, openal, luajit
 , libdevil, freetype, physfs
 , libmodplug, mpg123, libvorbis, libogg
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
+    license = lib.licenses.zlib;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
     broken = true;
   };
 }
diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
index 48ac142934b..bf76547a07a 100644
--- a/pkgs/development/interpreters/love/11.1.nix
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
+{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
   libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
   libtheora, which, autoconf, automake, libtool
 }:
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://love2d.org";
     description = "A Lua-based 2D game engine/scripting language";
-    license = stdenv.lib.licenses.zlib;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    license = lib.licenses.zlib;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.raskin ];
   };
 }
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index d78d5ba0c2d..3a52d58ffab 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -40,7 +40,7 @@ in rec {
       sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
     '';
 
-    postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    postBuild = lib.optionalString (!stdenv.isDarwin) ''
       ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so )
     '';
   };
diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix
index a3e633bbab1..d4e68b5cb76 100644
--- a/pkgs/development/interpreters/lua-5/filesystem.nix
+++ b/pkgs/development/interpreters/lua-5/filesystem.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://github.com/keplerproject/luafilesystem";
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix
index 98e4684e092..7e4283838a0 100644
--- a/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline
+{ lib, stdenv, fetchurl, readline
 , compat ? false
 , callPackage
 , packageOverrides ? (self: super: {})
@@ -50,7 +50,7 @@ self = stdenv.mkDerivation rec {
     runHook preConfigure
 
     makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" )
-    makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"})
+    makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"})
 
     installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \
       TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" )
@@ -107,8 +107,8 @@ self = stdenv.mkDerivation rec {
       management with incremental garbage collection, making it ideal
       for configuration, scripting, and rapid prototyping.
     '';
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 };
 in self
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix
index 73fbbc3e66a..d16f068883a 100644
--- a/pkgs/development/interpreters/lua-5/sockets.nix
+++ b/pkgs/development/interpreters/lua-5/sockets.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://w3.impa.br/~diego/software/luasocket/";
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix
index 53ec2baeb5e..0459b67534d 100644
--- a/pkgs/development/interpreters/lua-5/wrapper.nix
+++ b/pkgs/development/interpreters/lua-5/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lua, buildEnv, makeWrapper
+{ lib, stdenv, lua, buildEnv, makeWrapper
 , extraLibs ? []
 , extraOutputsToInstall ? []
 , postBuild ? ""
@@ -28,7 +28,7 @@ let
       addToLuaPath "$out"
 
       # take every binary from lua packages and put them into the env
-      for path in ${stdenv.lib.concatStringsSep " " paths}; do
+      for path in ${lib.concatStringsSep " " paths}; do
         nix_debug "looking for binaries in path = $path"
         if [ -d "$path/bin" ]; then
           cd "$path/bin"
@@ -37,7 +37,7 @@ let
               rm -f "$out/bin/$prg"
               if [ -x "$prg" ]; then
                 nix_debug "Making wrapper $prg"
-                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH"   --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
+                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH"   --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs}
               fi
             fi
           done
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index e0e15ca3275..860642b0fd2 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPackages
+{ lib, stdenv, fetchFromGitHub, buildPackages
 , name ? "luajit-${version}"
 , isStable
 , sha256
@@ -26,7 +26,7 @@ assert enableValgrindSupport -> valgrind != null;
 let
   luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
 
-  XCFLAGS = with stdenv.lib;
+  XCFLAGS = with lib;
      optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
   ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
   ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = false;
 
-  buildInputs = stdenv.lib.optional enableValgrindSupport valgrind;
+  buildInputs = lib.optional enableValgrindSupport valgrind;
 
   buildFlags = [
     "amalg" # Build highly optimized version
@@ -70,14 +70,14 @@ stdenv.mkDerivation rec {
     "CROSS=${stdenv.cc.targetPrefix}"
     # TODO: when pointer size differs, we would need e.g. -m32
     "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
-  ] ++ stdenv.lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
+  ] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
   enableParallelBuilding = true;
   NIX_CFLAGS_COMPILE = XCFLAGS;
 
   postInstall = ''
     ( cd "$out/include"; ln -s luajit-*/* . )
     ln -s "$out"/bin/luajit-* "$out"/bin/lua
-  '' + stdenv.lib.optionalString (!isStable) ''
+  '' + lib.optionalString (!isStable) ''
     ln -s "$out"/bin/luajit-* "$out"/bin/luajit
   '';
 
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     interpreter = "${self}/bin/lua";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance JIT compiler for Lua 5.1";
     homepage    = "http://luajit.org";
     license     = licenses.mit;
diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix
index a8db08e87a2..fe51d154956 100644
--- a/pkgs/development/interpreters/lush/default.nix
+++ b/pkgs/development/interpreters/lush/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
+{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
 , blas, libbfd, intltool, gettext, zlib, libSM}:
 
 stdenv.mkDerivation rec {
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lisp Universal SHell";
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index d824d29c35c..6dcb697d763 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
+{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
 , libsigsegv, gmpxx, cln, yices
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   ];
 
   hardeningDisable = [ "stackprotector" ] ++
-    stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ];
+    lib.optionals stdenv.isi686 [ "pic" "fortify" ];
 
   preConfigure = ''
     configureFlagsArray=(
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://maude.cs.illinois.edu/";
     description = "High-level specification language";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     longDescription = ''
       Maude is a high-performance reflective language and system
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
       rewriting logic computation.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.peti ];
   };
 }
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index cccb7434797..4612142c782 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation {
   pname = "metamath";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interpreter for the metamath proof language";
     longDescription = ''
       The metamath program is an ASCII-based ANSI C program with a command-line
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index 692aed3e4ee..5e600a92fb7 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline }:
+{ lib, stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
   pname = "mujs";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://mujs.com/";
     description = "A lightweight, embeddable Javascript interpreter";
     platforms = platforms.unix;
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index de829c14c98..c2a3fa2c774 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, nix, git }: let
+{ lib, stdenv, fetchurl, pkg-config, nix, git }: let
   version = "4.1.6";
 in stdenv.mkDerivation {
   pname = "nix-exec";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
   meta = {
     description = "Run programs defined in nix expressions";
     homepage = "https://github.com/shlevy/nix-exec";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = nix.meta.platforms;
     broken = true;
   };
diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix
index 2e3d394f851..865d8fde9ea 100644
--- a/pkgs/development/interpreters/perl/wrapper.nix
+++ b/pkgs/development/interpreters/perl/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, buildEnv, makeWrapper
+{ lib, stdenv, perl, buildEnv, makeWrapper
 , extraLibs ? []
 , extraOutputsToInstall ? []
 , postBuild ? ""
@@ -28,7 +28,7 @@ let
       mkdir -p "$out/bin"
 
       # take every binary from perl packages and put them into the env
-      for path in ${stdenv.lib.concatStringsSep " " paths}; do
+      for path in ${lib.concatStringsSep " " paths}; do
         if [ -d "$path/bin" ]; then
           cd "$path/bin"
           for prg in *; do
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 2389b56bd6f..191d589aa90 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -269,7 +269,7 @@ let
             inherit ztsSupport;
           };
 
-          meta = with stdenv.lib; {
+          meta = with lib; {
             description = "An HTML-embedded scripting language";
             homepage = "https://www.php.net/";
             license = licenses.php301;
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index f7343f6e4d6..2c674754935 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, readline }:
+{ lib, stdenv, fetchFromGitHub, readline }:
 
 stdenv.mkDerivation rec {
   pname = "picoc";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     install -m644 *.h $out/include
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Very small C interpreter for scripting";
     longDescription = ''
       PicoC is a very small C interpreter for scripting. It was originally
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 1511698c921..341797fa3f4 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
-with stdenv.lib;
+{ lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "picoLisp";
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index 02f561c004e..ca55eceaedb 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
+{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
   pypy, libffi, libedit, libuv, boost, zlib,
   variant ? "jit", buildWithPypy ? false }:
 
@@ -23,11 +23,11 @@ let
     sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";
   };
   libs = [ libffi libedit libuv boost.dev boost.out zlib ];
-  include-path = stdenv.lib.concatStringsSep ":"
+  include-path = lib.concatStringsSep ":"
                    (map (p: "${p}/include") libs);
-  library-path = stdenv.lib.concatStringsSep ":"
+  library-path = lib.concatStringsSep ":"
                    (map (p: "${p}/lib") libs);
-  bin-path = stdenv.lib.concatStringsSep ":"
+  bin-path = lib.concatStringsSep ":"
                (map (p: "${p}/bin") [ gcc ]);
   build = {flags, target}: stdenv.mkDerivation rec {
     pname = "pixie";
@@ -85,9 +85,9 @@ let
     meta = {
       description = "A clojure-like lisp, built with the pypy vm toolkit";
       homepage = "https://github.com/pixie-lang/pixie";
-      license = stdenv.lib.licenses.lgpl3;
+      license = lib.licenses.lgpl3;
       platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
-      maintainers = with stdenv.lib.maintainers; [ bendlas ];
+      maintainers = with lib.maintainers; [ bendlas ];
     };
   };
 in build (builtins.getAttr variant variants)
diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix
index 4a7f3423def..e6818cb03ed 100644
--- a/pkgs/development/interpreters/pixie/dust.nix
+++ b/pkgs/development/interpreters/pixie/dust.nix
@@ -1,4 +1,4 @@
-{ stdenv, pixie, fetchFromGitHub }:
+{ lib, stdenv, pixie, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "dust-0-91";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
     homepage = src.meta.homepage;
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix
index 3569f66aed0..2d4acbd398e 100644
--- a/pkgs/development/interpreters/proglodyte-wasm/default.nix
+++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
+{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
 
 let
   sexpr_wasm_prototype = stdenv.mkDerivation {
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     make install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "wasm runs WebAssembly from the command line";
     maintainers = with maintainers; [ proglodyte ];
     platforms = platforms.linux;
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 40eb1daf49c..668adf2c44a 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 }:
+{ lib, stdenv, fetchurl, python2Packages }:
 
 let version = "0.9.5.1.1"; in
 
@@ -16,6 +16,6 @@ python2Packages.buildPythonPackage {
   meta = {
     homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/";
     description = "A language for writing Python extension modules";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index e518edba1b3..2c4c74baecf 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 }:
+{ lib, stdenv, fetchurl, python2Packages }:
 
 let version = "0.9.6.4"; in
 
@@ -16,6 +16,6 @@ python2Packages.buildPythonPackage {
   meta = {
     homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/";
     description = "A language for writing Python extension modules";
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 4c0501aebcd..85af394e3f6 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , bzip2
 , expat
 , libffi
@@ -36,7 +36,7 @@ assert x11Support -> tcl != null
                   && xlibsWrapper != null
                   && libX11 != null;
 
-with stdenv.lib;
+with lib;
 
 let
   buildPackages = pkgsBuildHost;
@@ -215,7 +215,7 @@ let
   };
 
   # Python 2.7 needs this
-  crossCompileEnv = stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
+  crossCompileEnv = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
                       { _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; };
 
   # Build the basic Python interpreter without modules that have
@@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation ({
 
     inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags;
 
-    LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+    LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
     inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
 
     NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"
@@ -298,9 +298,9 @@ in with passthru; stdenv.mkDerivation ({
         hierarchical packages; exception-based error handling; and very
         high level dynamic data types.
       '';
-      license = stdenv.lib.licenses.psfl;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ fridh ];
+      license = lib.licenses.psfl;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers; [ fridh ];
       # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2`
       # in case both 2 and 3 are installed.
       priority = -100;
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 347245f8a01..7bc6084f61d 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch
 , bzip2
 , expat
 , libffi
@@ -54,7 +54,7 @@ assert x11Support -> tcl != null
 
 assert bluezSupport -> bluez != null;
 
-with stdenv.lib;
+with lib;
 
 let
   buildPackages = pkgsBuildHost;
@@ -369,14 +369,14 @@ in with passthru; stdenv.mkDerivation {
     find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}"
   '';
 
-  preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     # Ensure patch-shebangs uses shebangs of host interpreter.
-    export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH
+    export PATH=${lib.makeBinPath [ "$out" bash ]}:$PATH
   '';
 
   # Add CPython specific setup-hook that configures distutils.sysconfig to
   # always load sysconfigdata from host Python.
-  postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+  postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     cat << "EOF" >> "$out/nix-support/setup-hook"
     ${sysconfigdataHook}
     EOF
@@ -385,8 +385,8 @@ in with passthru; stdenv.mkDerivation {
   # Enforce that we don't have references to the OpenSSL -dev package, which we
   # explicitly specify in our configure flags above.
   disallowedReferences =
-    stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ]
-    ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    lib.optionals (openssl != null && !static) [ openssl.dev ]
+    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # Ensure we don't have references to build-time packages.
     # These typically end up in shebangs.
     pythonForBuild buildPackages.bash
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 9c6457d22aa..cfa1ac71891 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchurl
+{ lib, stdenv, substituteAll, fetchurl
 , zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security
 , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
 , self, gdbm, db, lzma
@@ -14,12 +14,12 @@
 , pythonVersion
 , sha256
 , passthruFun
-, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}"
+, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}"
 }:
 
 assert zlibSupport -> zlib != null;
 
-with stdenv.lib;
+with lib;
 
 let
   isPy3k = substring 0 1 pythonVersion == "3";
@@ -144,7 +144,7 @@ in with passthru; stdenv.mkDerivation rec {
     ln -s $out/${executable}-c/include $out/include/${libPrefix}
     ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
 
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable}
     ''}
 
@@ -158,7 +158,7 @@ in with passthru; stdenv.mkDerivation rec {
   inherit passthru;
   enableParallelBuilding = true;  # almost no parallelization without STM
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     license = licenses.mit;
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index 1522047a380..6fd0ee2e925 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -22,7 +22,7 @@
 # This version of PyPy is primarily added to speed-up translation of
 # our PyPy source build when developing that expression.
 
-with stdenv.lib;
+with lib;
 
 let
   isPy3k = majorVersion == "3";
@@ -78,7 +78,7 @@ in with passthru; stdenv.mkDerivation {
 
     pushd $out
     find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \;
-    find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \;
+    find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \;
 
     echo "Removing bytecode"
     find . -name "__pycache__" -type d -depth -exec rm -rf {} \;
@@ -115,7 +115,7 @@ in with passthru; stdenv.mkDerivation {
 
   inherit passthru;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     license = licenses.mit;
diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
index a291919b327..61fc497024b 100644
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -93,4 +93,4 @@ let
 
 
 
-in stdenv.lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests)
+in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests)
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index dffad6b98f5..61ad4a8a6ad 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, buildEnv, makeWrapper
+{ lib, stdenv, python, buildEnv, makeWrapper
 , extraLibs ? []
 , extraOutputsToInstall ? []
 , postBuild ? ""
@@ -30,14 +30,14 @@ let
       fi
       mkdir -p "$out/bin"
 
-      for path in ${stdenv.lib.concatStringsSep " " paths}; do
+      for path in ${lib.concatStringsSep " " paths}; do
         if [ -d "$path/bin" ]; then
           cd "$path/bin"
           for prg in *; do
             if [ -f "$prg" ]; then
               rm -f "$out/bin/$prg"
               if [ -x "$prg" ]; then
-                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
+                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs}
               fi
             fi
           done
diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix
index 4ce4db5aca1..ba46989c94a 100644
--- a/pkgs/development/interpreters/qnial/default.nix
+++ b/pkgs/development/interpreters/qnial/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
+{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
 
 stdenv.mkDerivation {
   pname = "qnial";
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
   meta = {
     description = "An array language from Nial Systems";
     homepage = "https://github.com/vrthra/qnial";
-    license = stdenv.lib.licenses.artistic1;
-    maintainers = [ stdenv.lib.maintainers.vrthra ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.artistic1;
+    maintainers = [ lib.maintainers.vrthra ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix
index b1d03252d7e..b9d2b9deb79 100644
--- a/pkgs/development/interpreters/quickjs/default.nix
+++ b/pkgs/development/interpreters/quickjs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "quickjs";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small and embeddable Javascript engine";
     homepage = "https://bellard.org/quickjs/";
     maintainers = with maintainers; [ stesie ];
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 2c51c691a8b..8d33962f914 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeFontsConf
+{ lib, stdenv, fetchurl, makeFontsConf
 , cacert
 , cairo, coreutils, fontconfig, freefont_ttf
 , glib, gmp
@@ -22,7 +22,7 @@ let
     fontDirectories = [ freefont_ttf ];
   };
 
-  libPath = stdenv.lib.makeLibraryPath [
+  libPath = lib.makeLibraryPath [
     cairo
     fontconfig
     glib
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   pname = "racket";
   version = "7.9"; # always change at once with ./minimal.nix
 
-  src = (stdenv.lib.makeOverridable ({ name, sha256 }:
+  src = (lib.makeOverridable ({ name, sha256 }:
     fetchurl {
       url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
       inherit sha256;
@@ -60,15 +60,15 @@ stdenv.mkDerivation rec {
 
   FONTCONFIG_FILE = fontsConf;
   LD_LIBRARY_PATH = libPath;
-  NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [
-    (stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
-    (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
+  NIX_LDFLAGS = lib.concatStringsSep " " [
+    (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
+    (lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
   ];
 
   nativeBuildInputs = [ cacert wrapGAppsHook ];
 
   buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
 
   preConfigure = ''
     unset AR
@@ -83,15 +83,15 @@ stdenv.mkDerivation rec {
 
   shared = if stdenv.isDarwin then "dylib" else "shared";
   configureFlags = [ "--enable-${shared}"  "--enable-lt=${libtool}/bin/libtool" ]
-                   ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
-                   ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];
+                   ++ lib.optional disableDocs [ "--disable-docs" ]
+                   ++ lib.optional stdenv.isDarwin [ "--enable-xonx" ];
 
   configureScript = "../configure";
 
   enableParallelBuilding = false;
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A programmable programming language";
     longDescription = ''
       Racket is a full-spectrum programming language. It goes beyond
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index c645fae0d84..99a812905d4 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   # Some tests fail on Darwin
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Raku implementation on top of Moar virtual machine";
     homepage    = "https://www.rakudo.org";
     license     = licenses.artistic2;
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 54b487c2595..f833c153b96 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl
+{ lib, stdenv, fetchurl, perl
 , CoreServices, ApplicationServices }:
 
 stdenv.mkDerivation rec {
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
    };
 
-  buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
+  buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
   doCheck = false; # MoarVM does not come with its own test suite
 
   configureScript = "${perl}/bin/perl ./Configure.pl";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
     homepage    = "https://www.moarvm.org/";
     license     = licenses.artistic2;
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 04b628bc9da..b4b41fa8804 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
     homepage    = "https://github.com/perl6/nqp";
     license     = licenses.artistic2;
diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
index b2cea4ad473..860ffc0aea0 100644
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rakudo, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "zef";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Raku / Perl6 Module Management";
     homepage    = "https://github.com/ugexe/zef";
     license     = licenses.artistic2;
diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix
index 8b802043fe3..cd2b74db052 100644
--- a/pkgs/development/interpreters/rascal/default.nix
+++ b/pkgs/development/interpreters/rascal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jdk }:
+{ lib, stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
   name = "rascal-0.6.2";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.rascal-mpl.org/";
     description = "Command-line REPL for the Rascal metaprogramming language";
-    license = stdenv.lib.licenses.epl10;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.epl10;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix
index 4206e1e1604..39a4108e041 100644
--- a/pkgs/development/interpreters/rebol/default.nix
+++ b/pkgs/development/interpreters/rebol/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     cp r3 $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Relative expression based object language, a language where code is data";
     maintainers = with maintainers; [ vrthra ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix
index 554dc81bffb..6689f7eb5c3 100644
--- a/pkgs/development/interpreters/red/default.nix
+++ b/pkgs/development/interpreters/red/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
+{ lib, stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "red";
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       New programming language strongly inspired by Rebol, but with a
       broader field of usage thanks to its native-code compiler, from system
diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index ec19b0679f4..79258d2cc0f 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "Regina-REXX";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     "--libdir=$(out)/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "REXX interpreter";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 3768751efdc..ae5227fb198 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, pkg-config, SDL2
+{ lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2
 , libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib
 , glib
 }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "renpy";
   version = "7.3.5";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ren'Py Visual Novel Engine";
     homepage = "https://renpy.org/";
     license = licenses.mit;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   pythonPath = [ pygame_sdl2 tkinter ];
 
-  RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [
+  RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [
     SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib
   ]);
 
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 87aa5aca1e1..2678188e8cf 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -159,7 +159,7 @@ let
           export GEM_HOME="$out/${passthru.gemPath}"
         '';
 
-        installFlags = stdenv.lib.optional docSupport "install-doc";
+        installFlags = lib.optional docSupport "install-doc";
         # Bundler tries to create this directory
         postInstall = ''
           # Remove unnecessary groff reference from runtime closure, since it's big
@@ -208,7 +208,7 @@ let
 
         disallowedRequisites = op (!jitSupport) stdenv.cc.cc;
 
-        meta = with stdenv.lib; {
+        meta = with lib; {
           description = "The Ruby language";
           homepage    = "http://www.ruby-lang.org/en/";
           license     = licenses.ruby;
diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix
index 5a1e3f265b2..ca34d5055c5 100644
--- a/pkgs/development/interpreters/scheme48/default.nix
+++ b/pkgs/development/interpreters/scheme48/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "scheme48-1.9.2";
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://s48.org/";
     description = "Scheme 48";
-    platforms = with stdenv.lib.platforms; unix;
-    license = stdenv.lib.licenses.bsd3;
+    platforms = with lib.platforms; unix;
+    license = lib.licenses.bsd3;
   };
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix
index bb4f418f502..6dcb8bd27c5 100644
--- a/pkgs/development/interpreters/scsh/default.nix
+++ b/pkgs/development/interpreters/scsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, scheme48 }:
+{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
 
 stdenv.mkDerivation {
   name = "scsh-0.7pre";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ scheme48 ];
   configureFlags = [ "--with-scheme48=${scheme48}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Scheme shell";
     homepage = "http://www.scsh.net/";
     license = licenses.bsd3;
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index 0d5cc061f59..58cac6bbe9b 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
+{ lib, stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
 
 stdenv.mkDerivation rec {
   # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       --set SELF_ROOT "$out"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
     homepage = "https://selflanguage.org/";
     license = licenses.bsd3;
diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix
index 6d10669d20d..f93e0ae5d95 100644
--- a/pkgs/development/interpreters/shen-sbcl/default.nix
+++ b/pkgs/development/interpreters/shen-sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , shen-sources
 , sbcl
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out
     install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://shenlanguage.org;
     description = "Port of Shen running on Steel Bank Common Lisp";
     platforms = sbcl.meta.platforms;
diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix
index f35631daa28..84839cf42de 100644
--- a/pkgs/development/interpreters/shen-sources/default.nix
+++ b/pkgs/development/interpreters/shen-sources/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp . $out -R
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://shenlanguage.org;
     description = "Source code for the Shen Language";
     platforms = platforms.all;
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 0588d564b1c..4892e0b8abe 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
       url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch";
       sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
     })
-  ] ++ stdenv.lib.optionals stdenv.isAarch32 [
+  ] ++ lib.optionals stdenv.isAarch32 [
     # Explained below in configureFlags for ARM
     ./1.8.5-findvanilla.patch
     # Fix for hard float flags.
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   # of polkit, which is what matters most, it does not override the allocator
   # so the failure of that test does not matter much.
   configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++
-    stdenv.lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [
+    lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [
         "--with-cpu-arch=armv5t"
         "--disable-tracejit" ];
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
     rm jit-test/tests/sunspider/check-date-format-tofte.js    # https://bugzil.la/600522
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     # TODO: MPL/GPL/LGPL tri-license.
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index 2a527eb8640..482561a901e 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
+{ lib, stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
 , libobjc }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "38.8.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libffi readline icu zlib ]
-               ++ stdenv.lib.optional stdenv.isDarwin libobjc;
+               ++ lib.optional stdenv.isDarwin libobjc;
   nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     # TODO: MPL/GPL/LGPL tri-license.
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
index 4bb6c815b2d..d75e5e8b285 100644
--- a/pkgs/development/interpreters/spidermonkey/60.nix
+++ b/pkgs/development/interpreters/spidermonkey/60.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
+{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
 , which, readline, zlib, icu }:
 
-with stdenv.lib;
+with lib;
 
 let
   version = "60.9.0";
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix
index bb577be4cd7..0ac005b07de 100644
--- a/pkgs/development/interpreters/spidermonkey/68.nix
+++ b/pkgs/development/interpreters/spidermonkey/68.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
+{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
 , which, readline, zlib, icu, cargo, rustc, llvmPackages }:
 
-with stdenv.lib;
+with lib;
 
 let
   python3Env = buildPackages.python3.withPackages (p: [p.six]);
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix
index e7f63870181..81ebcedf7bc 100644
--- a/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/pkgs/development/interpreters/spidermonkey/78.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , fetchpatch
 , autoconf213
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
     "--enable-optimize"
     "--enable-release"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # Spidermonkey seems to use different host/build terminology for cross
     # compilation here.
     "--host=${stdenv.buildPlatform.config}"
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index df873937b4f..f80e18c7bb9 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, cmake, pkg-config, alsaLib
+{ lib, stdenv, fetchurl, cmake, pkg-config, alsaLib
 , libjack2, libsndfile, fftw, curl, gcc
 , libXt, qtbase, qttools, qtwebengine
 , readline, qtwebsockets, useSCEL ? false, emacs
 }:
 
-let optional = stdenv.lib.optional;
+let optional = lib.optional;
 in
 
 stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       ++ optional (!stdenv.isDarwin) alsaLib
       ++ optional useSCEL emacs;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Programming language for real time audio synthesis";
     homepage = "https://supercollider.github.io";
     maintainers = with maintainers; [ mrmebelman ];
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 9aaf8223837..e665e8cfb1e 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 
 # Version specific stuff
 , release, version, src
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     # Don't install tzdata because NixOS already has a more up-to-date copy.
     "--with-tzdata=no"
     "tcl_cv_strtod_unbroken=ok"
-  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
+  ] ++ lib.optional stdenv.is64bit "--enable-64bit";
 
   enableParallelBuilding = true;
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The Tcl scripting language";
     homepage = "https://www.tcl.tk/";
     license = licenses.tcltk;
diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/development/interpreters/tclreadline/default.nix
index bbd34f71d22..44d2745dac8 100644
--- a/pkgs/development/interpreters/tclreadline/default.nix
+++ b/pkgs/development/interpreters/tclreadline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , automake
 , autoconf
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   # The provided makefile leaves a wrong reference to /build/ in RPATH,
   # so we fix it after checking that everything is also present in $out
-  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+  preFixup = lib.optionalString stdenv.isLinux ''
     needed_libraries=$(ls .libs | grep '\.\(so\|la\)$')
     for lib in $needed_libraries; do
       if ! ls $out/lib | grep "$lib"; then
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNU readline for interactive tcl shells";
     homepage = "https://github.com/flightaware/tclreadline";
     license = licenses.bsd3;
diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix
index b49a37a7285..8dd27b3f000 100644
--- a/pkgs/development/interpreters/tinyscheme/default.nix
+++ b/pkgs/development/interpreters/tinyscheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "tinyscheme";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     cp scheme $out/bin/tinyscheme
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight Scheme implementation";
     longDescription = ''
       TinyScheme is a lightweight Scheme interpreter that implements as large a
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index 4889a21ddfd..ac0a944f210 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
+{ lib, stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
 
 stdenv.mkDerivation {
   pname = "unicon-lang";
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     cp -r bin $out/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A very high level, goal-directed, object-oriented, general purpose applications language";
     maintainers = with maintainers; [ vrthra ];
     platforms = platforms.linux;

From c522fec2743ffb95f2bc296f249232d73ae57dd1 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sat, 23 Jan 2021 19:26:19 +0700
Subject: [PATCH 695/956] pkgs/development/tools: stdenv.lib -> lib

---
 pkgs/development/tools/alloy/default.nix      |  4 ++--
 pkgs/development/tools/ammonite/default.nix   |  6 ++---
 .../tools/analysis/autoflake/default.nix      |  4 ++--
 .../tools/analysis/bingrep/default.nix        |  4 ++--
 .../tools/analysis/cccc/default.nix           |  8 +++----
 .../tools/analysis/checkstyle/default.nix     |  4 ++--
 .../tools/analysis/clang-analyzer/default.nix |  8 +++----
 .../tools/analysis/coan/default.nix           |  4 ++--
 .../tools/analysis/codeql/default.nix         |  4 ++--
 .../tools/analysis/cov-build/default.nix      |  8 +++----
 .../tools/analysis/coz/default.nix            |  6 ++---
 .../tools/analysis/cppcheck/default.nix       |  8 +++----
 .../tools/analysis/egypt/default.nix          |  4 ++--
 .../tools/analysis/emma/default.nix           |  6 ++---
 .../tools/analysis/evmdis/default.nix         |  4 ++--
 .../tools/analysis/findbugs/default.nix       |  4 ++--
 .../tools/analysis/flow/default.nix           |  6 ++---
 .../tools/analysis/frama-c/default.nix        |  6 ++---
 .../garcosim/tracefilegen/default.nix         |  4 ++--
 .../garcosim/tracefilesim/default.nix         |  4 ++--
 .../tools/analysis/hopper/default.nix         |  2 +-
 .../tools/analysis/hotspot/default.nix        |  8 +++----
 .../analysis/include-what-you-use/default.nix |  4 ++--
 .../tools/analysis/jdepend/default.nix        |  4 ++--
 .../tools/analysis/kcov/default.nix           |  4 ++--
 .../tools/analysis/lcov/default.nix           |  6 ++---
 .../tools/analysis/makefile2graph/default.nix |  6 ++---
 .../tools/analysis/oclgrind/default.nix       |  4 ++--
 .../tools/analysis/panopticon/default.nix     |  4 ++--
 .../tools/analysis/pev/default.nix            |  4 ++--
 .../tools/analysis/pmd/default.nix            |  4 ++--
 .../tools/analysis/qcachegrind/default.nix    |  6 ++---
 .../tools/analysis/radare2/default.nix        | 10 ++++-----
 .../tools/analysis/randoop/default.nix        |  4 ++--
 .../development/tools/analysis/rr/default.nix |  8 +++----
 .../tools/analysis/smatch/default.nix         | 10 ++++-----
 .../tools/analysis/snowman/default.nix        |  4 ++--
 .../tools/analysis/sparse/default.nix         |  8 +++----
 .../tools/analysis/spin/default.nix           |  8 +++----
 .../tools/analysis/splint/default.nix         |  6 ++---
 .../tools/analysis/swarm/default.nix          |  4 ++--
 .../analysis/uefi-firmware-parser/default.nix |  4 ++--
 .../tools/analysis/valgrind/default.nix       | 16 +++++++-------
 .../tools/analysis/valkyrie/default.nix       |  4 ++--
 pkgs/development/tools/apktool/default.nix    |  4 ++--
 .../tools/asn2quickder/default.nix            |  4 ++--
 pkgs/development/tools/avro-tools/default.nix |  2 +-
 pkgs/development/tools/azcopy/default.nix     |  4 ++--
 .../tools/bazel-watcher/default.nix           |  4 ++--
 pkgs/development/tools/bazelisk/default.nix   |  4 ++--
 pkgs/development/tools/bloaty/default.nix     |  4 ++--
 .../development/tools/boost-build/default.nix |  6 ++---
 .../tools/build-managers/apache-ant/1.9.nix   |  8 +++----
 .../build-managers/apache-ant/default.nix     |  8 +++----
 .../build-managers/apache-maven/default.nix   |  4 ++--
 .../tools/build-managers/arpa2cm/default.nix  |  4 ++--
 .../tools/build-managers/bam/default.nix      |  4 ++--
 .../bazel/bazel-remote/default.nix            |  4 ++--
 .../bazel/buildtools/default.nix              |  4 ++--
 .../tools/build-managers/bear/default.nix     |  4 ++--
 .../tools/build-managers/bloop/default.nix    |  2 +-
 .../tools/build-managers/bmake/default.nix    |  4 ++--
 .../tools/build-managers/boot/default.nix     |  4 ++--
 .../tools/build-managers/buck/default.nix     |  6 ++---
 .../tools/build-managers/cmake/2.8.nix        | 14 ++++++------
 .../build-managers/colormake/default.nix      |  4 ++--
 .../tools/build-managers/doit/default.nix     |  8 +++----
 .../tools/build-managers/dub/default.nix      |  4 ++--
 .../tools/build-managers/fac/default.nix      |  4 ++--
 .../build-managers/gnumake/4.2/default.nix    | 12 +++++-----
 .../tools/build-managers/gnumake/default.nix  | 12 +++++-----
 .../tools/build-managers/gradle/default.nix   |  6 ++---
 .../tools/build-managers/gup/default.nix      |  6 ++---
 .../tools/build-managers/icmake/default.nix   |  4 ++--
 .../tools/build-managers/jam/default.nix      |  4 ++--
 .../tools/build-managers/kati/default.nix     |  4 ++--
 .../build-managers/leiningen/default.nix      | 10 ++++-----
 .../tools/build-managers/mill/default.nix     |  6 ++---
 .../tools/build-managers/mk/default.nix       |  4 ++--
 .../tools/build-managers/msbuild/default.nix  |  6 ++---
 .../tools/build-managers/ninja/default.nix    |  4 ++--
 .../tools/build-managers/pants/default.nix    |  4 ++--
 .../tools/build-managers/qbs/default.nix      |  4 ++--
 .../tools/build-managers/rebar/default.nix    |  6 ++---
 .../tools/build-managers/rebar3/default.nix   |  8 +++----
 .../build-managers/redo-apenwarr/default.nix  |  2 +-
 .../tools/build-managers/redo-c/default.nix   |  4 ++--
 .../tools/build-managers/redo-sh/default.nix  |  4 ++--
 .../tools/build-managers/redo/default.nix     |  8 +++----
 .../tools/build-managers/remake/default.nix   |  8 +++----
 .../build-managers/rocm-cmake/default.nix     |  4 ++--
 .../tools/build-managers/samurai/default.nix  |  4 ++--
 .../build-managers/sbt-extras/default.nix     | 12 +++++-----
 .../tools/build-managers/sbt/default.nix      | 10 ++++-----
 .../tools/build-managers/scons/common.nix     |  2 +-
 .../tools/build-managers/shards/default.nix   |  4 ++--
 .../tools/build-managers/tup/default.nix      |  4 ++--
 .../tools/build-managers/waf/default.nix      |  6 ++---
 pkgs/development/tools/buildkit/default.nix   |  6 ++---
 pkgs/development/tools/cargo-web/default.nix  |  6 ++---
 pkgs/development/tools/cask/default.nix       |  4 ++--
 pkgs/development/tools/castxml/default.nix    |  4 ++--
 pkgs/development/tools/cdecl/default.nix      |  8 +++----
 pkgs/development/tools/chit/default.nix       | 10 ++++-----
 .../development/tools/clang-tools/default.nix |  8 +++----
 pkgs/development/tools/clog-cli/default.nix   |  8 +++----
 .../tools/cloudfoundry-cli/default.nix        |  4 ++--
 pkgs/development/tools/clpm/default.nix       |  4 ++--
 .../tools/cmake-language-server/default.nix   |  2 +-
 .../tools/compile-daemon/default.nix          |  4 ++--
 .../buildkite-agent/default.nix               |  6 ++---
 .../buildkite-agent/generic.nix               |  8 +++----
 .../drone-cli/default.nix                     |  4 ++--
 .../continuous-integration/drone/default.nix  |  4 ++--
 .../gocd-agent/default.nix                    |  4 ++--
 .../gocd-server/default.nix                   |  4 ++--
 .../jenkins/default.nix                       |  6 ++---
 .../laminar/default.nix                       |  2 +-
 pkgs/development/tools/corgi/default.nix      |  4 ++--
 pkgs/development/tools/coursier/default.nix   |  6 ++---
 pkgs/development/tools/cppclean/default.nix   |  4 ++--
 pkgs/development/tools/cue/default.nix        |  6 ++---
 .../tools/database/dbmate/default.nix         |  4 ++--
 .../tools/database/ephemeralpg/default.nix    |  6 ++---
 .../tools/database/pg_checksums/default.nix   |  4 ++--
 .../tools/database/pgcli/default.nix          |  6 ++---
 .../tools/database/pyrseas/default.nix        |  6 ++---
 .../tools/database/shmig/default.nix          |  2 +-
 .../tools/database/sqlcheck/default.nix       |  4 ++--
 .../tools/database/sqldeveloper/default.nix   |  4 ++--
 .../tools/database/squirrel-sql/default.nix   |  4 ++--
 .../timescaledb-parallel-copy/default.nix     |  4 ++--
 .../database/timescaledb-tune/default.nix     |  4 ++--
 .../tools/database/webdis/default.nix         |  4 ++--
 pkgs/development/tools/dcadec/default.nix     |  4 ++--
 pkgs/development/tools/deis/default.nix       |  4 ++--
 pkgs/development/tools/deisctl/default.nix    |  4 ++--
 pkgs/development/tools/delve/default.nix      |  4 ++--
 pkgs/development/tools/dep/default.nix        |  4 ++--
 pkgs/development/tools/devd/default.nix       |  4 ++--
 .../tools/devpi-client/default.nix            |  4 ++--
 .../tools/devpi-server/default.nix            |  6 ++---
 pkgs/development/tools/devtodo/default.nix    |  4 ++--
 pkgs/development/tools/diesel-cli/default.nix |  2 +-
 pkgs/development/tools/dive/default.nix       |  6 ++---
 .../tools/documentation/antora/default.nix    | 10 ++++-----
 .../tools/documentation/doxygen/default.nix   | 18 +++++++--------
 .../documentation/gnome-doc-utils/default.nix |  6 ++---
 .../tools/documentation/gtk-doc/default.nix   |  6 ++---
 .../tools/documentation/mdsh/default.nix      |  4 ++--
 .../tools/documentation/mkdocs/default.nix    |  2 +-
 pkgs/development/tools/dot-http/default.nix   |  2 +-
 pkgs/development/tools/drip/default.nix       |  4 ++--
 pkgs/development/tools/drm_info/default.nix   |  4 ++--
 pkgs/development/tools/dtools/default.nix     |  4 ++--
 pkgs/development/tools/easyjson/default.nix   |  4 ++--
 .../development/tools/eclipse-mat/default.nix |  4 ++--
 pkgs/development/tools/electron/default.nix   |  2 +-
 pkgs/development/tools/electron/generic.nix   |  8 +++----
 .../tools/erlang/cuter/default.nix            |  8 +++----
 pkgs/development/tools/fac/default.nix        |  4 ++--
 pkgs/development/tools/fedpkg/default.nix     |  4 ++--
 pkgs/development/tools/flamegraph/default.nix |  4 ++--
 .../tools/flatpak-builder/default.nix         |  4 ++--
 pkgs/development/tools/flootty/default.nix    |  4 ++--
 pkgs/development/tools/flyway/default.nix     |  4 ++--
 pkgs/development/tools/fmbt/default.nix       |  6 ++---
 .../tools/fusee-launcher/default.nix          |  4 ++--
 pkgs/development/tools/galen/default.nix      |  4 ++--
 .../tools/gamecube-tools/default.nix          |  4 ++--
 pkgs/development/tools/gauge/default.nix      |  4 ++--
 pkgs/development/tools/gdm/default.nix        |  4 ++--
 pkgs/development/tools/git-ftp/default.nix    |  4 ++--
 .../tools/git-quick-stats/default.nix         |  6 ++---
 pkgs/development/tools/git-series/default.nix |  4 ++--
 .../tools/github/cligh/default.nix            |  4 ++--
 .../tools/github/github-release/default.nix   |  4 ++--
 pkgs/development/tools/glade/default.nix      |  2 +-
 pkgs/development/tools/glide/default.nix      |  4 ++--
 pkgs/development/tools/gllvm/default.nix      |  4 ++--
 pkgs/development/tools/glock/default.nix      |  6 ++---
 pkgs/development/tools/glslviewer/default.nix |  6 ++---
 .../tools/gnome-desktop-testing/default.nix   |  4 ++--
 pkgs/development/tools/gnulib/default.nix     |  6 ++---
 .../tools/go-bindata-assetfs/default.nix      |  4 ++--
 pkgs/development/tools/go-bindata/default.nix |  4 ++--
 .../tools/go-langserver/default.nix           |  4 ++--
 pkgs/development/tools/go-outline/default.nix |  6 ++---
 .../development/tools/go-protobuf/default.nix |  4 ++--
 .../tools/go-repo-root/default.nix            |  4 ++--
 pkgs/development/tools/go-symbols/default.nix |  6 ++---
 pkgs/development/tools/go2nix/default.nix     |  4 ++--
 pkgs/development/tools/goa/default.nix        |  4 ++--
 .../tools/gocode-gomod/default.nix            |  4 ++--
 pkgs/development/tools/gocode/default.nix     |  4 ++--
 pkgs/development/tools/goconvey/default.nix   |  6 ++---
 pkgs/development/tools/godef/default.nix      |  6 ++---
 pkgs/development/tools/godot/default.nix      |  4 ++--
 pkgs/development/tools/godot/headless.nix     |  4 ++--
 pkgs/development/tools/godot/server.nix       |  4 ++--
 pkgs/development/tools/golint/default.nix     |  6 ++---
 .../tools/gomodifytags/default.nix            |  6 ++---
 .../google-app-engine-go-sdk/default.nix      |  4 ++--
 pkgs/development/tools/gopkgs/default.nix     |  6 ++---
 pkgs/development/tools/gosec/default.nix      |  4 ++--
 pkgs/development/tools/gotags/default.nix     |  4 ++--
 pkgs/development/tools/gotests/default.nix    |  6 ++---
 pkgs/development/tools/gotools/default.nix    |  4 ++--
 pkgs/development/tools/govendor/default.nix   |  4 ++--
 pkgs/development/tools/govers/default.nix     |  4 ++--
 pkgs/development/tools/gox/default.nix        |  4 ++--
 pkgs/development/tools/gpp/default.nix        |  4 ++--
 pkgs/development/tools/gron/default.nix       |  4 ++--
 .../tools/guile/g-wrap/default.nix            |  4 ++--
 .../tools/guile/guile-lint/default.nix        |  4 ++--
 .../tools/haskell/dconf2nix/dconf2nix.nix     |  4 ++--
 .../haskell-language-server/default.nix       |  4 ++--
 .../hls-class-plugin.nix                      |  4 ++--
 .../hls-eval-plugin.nix                       |  4 ++--
 .../hls-explicit-imports-plugin.nix           |  4 ++--
 .../hls-hlint-plugin.nix                      |  4 ++--
 .../hls-retrie-plugin.nix                     |  4 ++--
 .../hls-tactics-plugin.nix                    |  4 ++--
 .../tools/haskell/hyper-haskell/default.nix   |  6 ++---
 .../tools/haskell/ihaskell/wrapper.nix        |  4 ++--
 .../tools/haskell/vaultenv/default.nix        |  6 ++---
 pkgs/development/tools/hcloud/default.nix     |  6 ++---
 pkgs/development/tools/hexio/default.nix      |  6 ++---
 pkgs/development/tools/iaca/2.1.nix           |  4 ++--
 pkgs/development/tools/iaca/3.0.nix           |  4 ++--
 pkgs/development/tools/icestorm/default.nix   |  8 +++----
 pkgs/development/tools/icr/default.nix        |  2 +-
 pkgs/development/tools/imatix_gsl/default.nix |  4 ++--
 .../tools/irony-server/default.nix            |  4 ++--
 pkgs/development/tools/java/cfr/default.nix   |  4 ++--
 .../tools/java/dex2jar/default.nix            |  2 +-
 .../tools/java/fastjar/default.nix            |  6 ++---
 .../tools/java/jhiccup/default.nix            |  8 +++----
 .../tools/java/visualvm/default.nix           |  2 +-
 pkgs/development/tools/jbake/default.nix      |  4 ++--
 pkgs/development/tools/jbang/default.nix      |  2 +-
 pkgs/development/tools/jd/default.nix         |  4 ++--
 pkgs/development/tools/jid/default.nix        |  6 ++---
 pkgs/development/tools/jira_cli/default.nix   |  4 ++--
 pkgs/development/tools/jl/default.nix         |  6 ++---
 pkgs/development/tools/jmespath/default.nix   |  4 ++--
 pkgs/development/tools/jo/default.nix         |  4 ++--
 pkgs/development/tools/jp/default.nix         |  4 ++--
 pkgs/development/tools/jq/default.nix         |  6 ++---
 pkgs/development/tools/just/default.nix       |  4 ++--
 pkgs/development/tools/k6/default.nix         |  4 ++--
 pkgs/development/tools/kafkacat/default.nix   |  4 ++--
 pkgs/development/tools/kind/default.nix       |  6 ++---
 pkgs/development/tools/krew/default.nix       |  2 +-
 pkgs/development/tools/ktlint/default.nix     |  4 ++--
 pkgs/development/tools/kubectx/default.nix    |  4 ++--
 pkgs/development/tools/kubicorn/default.nix   | 10 ++++-----
 pkgs/development/tools/kubie/default.nix      |  2 +-
 pkgs/development/tools/kythe/default.nix      |  6 ++---
 .../tools/lattice-diamond/default.nix         |  8 +++----
 pkgs/development/tools/lazygit/default.nix    |  4 ++--
 pkgs/development/tools/leaps/default.nix      |  6 ++---
 pkgs/development/tools/libsigrok/default.nix  |  4 ++--
 .../tools/libsigrokdecode/default.nix         |  4 ++--
 .../literate-programming/Literate/default.nix |  4 ++--
 .../literate-programming/eweb/default.nix     |  4 ++--
 .../funnelweb/default.nix                     |  4 ++--
 .../literate-programming/noweb/default.nix    | 10 ++++-----
 .../literate-programming/nuweb/default.nix    |  4 ++--
 pkgs/development/tools/makerpm/default.nix    |  4 ++--
 pkgs/development/tools/manul/default.nix      |  4 ++--
 pkgs/development/tools/mdk/default.nix        |  6 ++---
 pkgs/development/tools/minizinc/default.nix   |  4 ++--
 pkgs/development/tools/minizinc/ide.nix       |  6 ++---
 .../misc/abi-compliance-checker/default.nix   |  4 ++--
 .../tools/misc/abi-dumper/default.nix         |  4 ++--
 .../tools/misc/arcanist/default.nix           | 10 ++++-----
 .../tools/misc/argbash/default.nix            |  4 ++--
 pkgs/development/tools/misc/asls/default.nix  |  4 ++--
 .../tools/misc/autobuild/default.nix          |  4 ++--
 .../tools/misc/autoconf-archive/default.nix   |  4 ++--
 pkgs/development/tools/misc/autoconf/2.13.nix |  6 ++---
 pkgs/development/tools/misc/autoconf/2.64.nix |  6 ++---
 pkgs/development/tools/misc/autoconf/2.69.nix |  6 ++---
 .../tools/misc/autoconf/default.nix           |  6 ++---
 .../tools/misc/autogen/default.nix            | 10 ++++-----
 .../tools/misc/automake/automake-1.11.x.nix   |  6 ++---
 .../tools/misc/automake/automake-1.15.x.nix   |  6 ++---
 .../tools/misc/automake/automake-1.16.x.nix   |  6 ++---
 .../tools/misc/automoc4/default.nix           |  4 ++--
 .../tools/misc/avrdude/default.nix            |  8 +++----
 pkgs/development/tools/misc/awf/default.nix   |  4 ++--
 .../tools/misc/babeltrace/default.nix         |  4 ++--
 .../development/tools/misc/bashdb/default.nix |  6 ++---
 .../tools/misc/bin_replace_string/default.nix |  4 ++--
 pkgs/development/tools/misc/bossa/default.nix |  4 ++--
 .../tools/misc/bsdbuild/default.nix           |  6 ++---
 .../tools/misc/cbrowser/default.nix           |  8 +++----
 .../tools/misc/cc-tool/default.nix            |  4 ++--
 .../development/tools/misc/ccache/default.nix |  4 ++--
 pkgs/development/tools/misc/ccls/default.nix  |  6 ++---
 pkgs/development/tools/misc/cflow/default.nix |  8 +++----
 pkgs/development/tools/misc/cgdb/default.nix  |  4 ++--
 .../tools/misc/checkbashisms/default.nix      |  6 ++---
 .../tools/misc/chrpath/default.nix            |  4 ++--
 .../tools/misc/circleci-cli/default.nix       |  4 ++--
 .../tools/misc/cl-launch/default.nix          |  8 +++----
 pkgs/development/tools/misc/cli11/default.nix |  4 ++--
 .../tools/misc/clojure-lsp/default.nix        |  4 ++--
 .../tools/misc/coccinelle/default.nix         |  8 +++----
 .../tools/misc/complexity/default.nix         |  6 ++---
 pkgs/development/tools/misc/cppi/default.nix  |  6 ++---
 .../development/tools/misc/cproto/default.nix |  4 ++--
 .../tools/misc/creduce/default.nix            |  6 ++---
 .../development/tools/misc/cscope/default.nix | 10 ++++-----
 .../development/tools/misc/csmith/default.nix |  4 ++--
 pkgs/development/tools/misc/ctags/default.nix |  4 ++--
 .../tools/misc/cwebbin/default.nix            |  4 ++--
 .../development/tools/misc/d-feet/default.nix |  6 ++---
 .../development/tools/misc/dbench/default.nix |  4 ++--
 pkgs/development/tools/misc/ddd/default.nix   |  6 ++---
 .../tools/misc/dejagnu/default.nix            |  4 ++--
 .../tools/misc/dfu-programmer/default.nix     |  4 ++--
 .../tools/misc/dfu-util/default.nix           |  4 ++--
 .../development/tools/misc/dialog/default.nix | 12 +++++-----
 .../tools/misc/direvent/default.nix           |  4 ++--
 .../development/tools/misc/distcc/default.nix |  6 ++---
 pkgs/development/tools/misc/distcc/masq.nix   |  4 ++--
 .../tools/misc/doclifter/default.nix          |  4 ++--
 .../tools/misc/docopts/default.nix            |  4 ++--
 pkgs/development/tools/misc/drush/default.nix |  6 ++---
 .../misc/editorconfig-core-c/default.nix      |  4 ++--
 .../tools/misc/eggdbus/default.nix            |  4 ++--
 .../tools/misc/elfinfo/default.nix            |  4 ++--
 .../tools/misc/elfkickers/default.nix         |  4 ++--
 pkgs/development/tools/misc/epm/default.nix   |  4 ++--
 .../tools/misc/findnewest/default.nix         |  4 ++--
 .../tools/misc/fsatrace/default.nix           |  4 ++--
 .../tools/misc/fswatch/default.nix            |  6 ++---
 .../tools/misc/fujprog/default.nix            |  6 ++---
 pkgs/development/tools/misc/gdb/default.nix   | 22 +++++++++----------
 .../development/tools/misc/gdbgui/default.nix |  6 ++---
 .../tools/misc/gengetopt/default.nix          |  6 ++---
 .../development/tools/misc/global/default.nix |  4 ++--
 pkgs/development/tools/misc/gnum4/default.nix |  8 +++----
 pkgs/development/tools/misc/gob2/default.nix  |  8 +++----
 pkgs/development/tools/misc/gperf/3.0.x.nix   |  6 ++---
 pkgs/development/tools/misc/gperf/default.nix |  6 ++---
 .../tools/misc/gpshell/default.nix            |  4 ++--
 .../tools/misc/gputils/default.nix            |  4 ++--
 .../tools/misc/gtkdialog/default.nix          |  6 ++---
 .../tools/misc/gtkperf/default.nix            |  4 ++--
 .../tools/misc/help2man/default.nix           |  6 ++---
 pkgs/development/tools/misc/hound/default.nix |  8 +++----
 .../tools/misc/hydra-cli/default.nix          |  2 +-
 pkgs/development/tools/misc/hydra/common.nix  |  2 +-
 .../tools/misc/icon-naming-utils/default.nix  |  4 ++--
 .../development/tools/misc/igprof/default.nix |  8 +++----
 .../development/tools/misc/indent/default.nix | 10 ++++-----
 .../tools/misc/inotify-tools/default.nix      |  4 ++--
 .../tools/misc/intel-gpu-tools/default.nix    |  4 ++--
 .../tools/misc/intltool/default.nix           |  6 ++---
 .../development/tools/misc/iozone/default.nix |  4 ++--
 .../tools/misc/itm-tools/default.nix          |  4 ++--
 .../tools/misc/itstool/default.nix            |  4 ++--
 .../tools/misc/jscoverage/default.nix         |  6 ++---
 .../tools/misc/kconfig-frontends/default.nix  |  6 ++---
 pkgs/development/tools/misc/kdbg/default.nix  |  4 ++--
 pkgs/development/tools/misc/kibana/6.x.nix    |  6 ++---
 pkgs/development/tools/misc/kibana/7.x.nix    |  6 ++---
 .../tools/misc/libtool/default.nix            |  6 ++---
 .../tools/misc/libtool/libtool2.nix           |  4 ++--
 .../tools/misc/libwhich/default.nix           |  4 ++--
 .../tools/misc/loccount/default.nix           |  4 ++--
 pkgs/development/tools/misc/lsof/default.nix  | 12 +++++-----
 .../development/tools/misc/ltrace/default.nix |  4 ++--
 .../tools/misc/lttng-tools/default.nix        |  4 ++--
 .../tools/misc/lttng-ust/default.nix          |  4 ++--
 pkgs/development/tools/misc/lttv/default.nix  |  4 ++--
 .../tools/misc/luarocks/default.nix           |  4 ++--
 .../tools/misc/macdylibbundler/default.nix    |  4 ++--
 .../tools/misc/micronucleus/default.nix       |  2 +-
 .../tools/misc/msitools/default.nix           |  6 ++---
 .../development/tools/misc/nimlsp/default.nix |  4 ++--
 pkgs/development/tools/misc/ninka/default.nix |  4 ++--
 .../tools/misc/nrfutil/default.nix            |  4 ++--
 .../tools/misc/nxpmicro-mfgtools/default.nix  |  4 ++--
 .../tools/misc/objconv/default.nix            |  4 ++--
 .../tools/misc/opengrok/default.nix           |  6 ++---
 .../development/tools/misc/pahole/default.nix |  4 ++--
 .../tools/misc/patchelf/default.nix           |  4 ++--
 .../tools/misc/patchelf/unstable.nix          |  6 ++---
 .../tools/misc/perfect-hash/default.nix       |  4 ++--
 .../tools/misc/pkg-config/default.nix         |  4 ++--
 .../tools/misc/pkgconf/default.nix            |  4 ++--
 .../tools/misc/pmccabe/default.nix            |  4 ++--
 .../tools/misc/prelink/default.nix            |  6 ++---
 pkgs/development/tools/misc/premake/3.nix     |  6 ++---
 pkgs/development/tools/misc/premake/5.nix     |  6 ++---
 .../tools/misc/premake/default.nix            |  6 ++---
 pkgs/development/tools/misc/ptags/default.nix |  2 +-
 .../development/tools/misc/pwndbg/default.nix |  4 ++--
 .../remarkable-toolchain/default.nix          |  4 ++--
 .../remarkable2-toolchain/default.nix         |  4 ++--
 pkgs/development/tools/misc/rman/default.nix  |  4 ++--
 .../tools/misc/rolespec/default.nix           |  4 ++--
 .../tools/misc/saleae-logic/default.nix       |  6 ++---
 pkgs/development/tools/misc/scc/default.nix   |  4 ++--
 pkgs/development/tools/misc/sipp/default.nix  |  4 ++--
 .../tools/misc/sloccount/default.nix          |  6 ++---
 .../tools/misc/srecord/default.nix            |  8 +++----
 .../development/tools/misc/stlink/default.nix |  4 ++--
 .../tools/misc/stm32cubemx/default.nix        |  4 ++--
 .../tools/misc/stm32flash/default.nix         |  6 ++---
 .../development/tools/misc/strace/default.nix |  6 ++---
 pkgs/development/tools/misc/swig/2.x.nix      |  4 ++--
 pkgs/development/tools/misc/swig/3.x.nix      |  4 ++--
 pkgs/development/tools/misc/swig/4.nix        |  4 ++--
 pkgs/development/tools/misc/swig/default.nix  |  6 ++---
 .../tools/misc/sysbench/default.nix           |  6 ++---
 .../tools/misc/tcptrack/default.nix           |  4 ++--
 .../tools/misc/teensy-loader-cli/default.nix  |  4 ++--
 pkgs/development/tools/misc/tet/default.nix   |  6 ++---
 .../tools/misc/texi2html/default.nix          |  6 ++---
 .../development/tools/misc/texinfo/common.nix |  6 ++---
 pkgs/development/tools/misc/tie/default.nix   |  4 ++--
 pkgs/development/tools/misc/tokei/default.nix |  6 ++---
 pkgs/development/tools/misc/uisp/default.nix  |  6 ++---
 .../tools/misc/uncrustify/default.nix         |  4 ++--
 .../tools/misc/unifdef/default.nix            |  4 ++--
 .../tools/misc/universal-ctags/default.nix    |  6 ++---
 .../development/tools/misc/unused/default.nix |  4 ++--
 .../tools/misc/usb-modeswitch/data.nix        |  4 ++--
 .../tools/misc/usb-modeswitch/default.nix     |  2 +-
 .../tools/misc/vtable-dumper/default.nix      |  4 ++--
 .../tools/misc/watson-ruby/default.nix        |  4 ++--
 .../tools/misc/whatstyle/default.nix          |  4 ++--
 .../tools/misc/xc3sprog/default.nix           |  4 ++--
 pkgs/development/tools/misc/ycmd/default.nix  |  6 ++---
 pkgs/development/tools/misc/yodl/default.nix  |  4 ++--
 pkgs/development/tools/modd/default.nix       |  4 ++--
 .../development/tools/mustache-go/default.nix |  4 ++--
 pkgs/development/tools/nemiver/default.nix    |  2 +-
 pkgs/development/tools/neoload/default.nix    |  6 ++---
 pkgs/development/tools/node-webkit/nw12.nix   |  4 ++--
 pkgs/development/tools/nrpl/default.nix       |  2 +-
 pkgs/development/tools/nwjs/default.nix       |  4 ++--
 .../tools/ocaml/camlidl/default.nix           |  4 ++--
 .../tools/ocaml/camlp4/default.nix            |  6 ++---
 .../tools/ocaml/camlp5/default.nix            |  6 ++---
 pkgs/development/tools/ocaml/cppo/default.nix |  6 ++---
 pkgs/development/tools/ocaml/dune/2.nix       |  8 +++----
 .../tools/ocaml/findlib/default.nix           |  8 +++----
 .../development/tools/ocaml/oasis/default.nix |  4 ++--
 .../tools/ocaml/obuild/default.nix            |  6 ++---
 .../tools/ocaml/ocamlbuild/default.nix        |  4 ++--
 .../tools/ocaml/ocamlify/default.nix          |  6 ++---
 .../tools/ocaml/ocamlmod/default.nix          |  4 ++--
 .../tools/ocaml/ocp-build/default.nix         |  4 ++--
 .../tools/ocaml/ocsigen-i18n/default.nix      |  6 ++---
 .../tools/ocaml/omake/0.9.8.6-rc1.nix         |  4 ++--
 .../development/tools/ocaml/omake/default.nix |  4 ++--
 .../tools/ocaml/opaline/default.nix           |  6 ++---
 pkgs/development/tools/ocaml/opam/1.2.2.nix   |  2 +-
 pkgs/development/tools/ocaml/opam/default.nix |  2 +-
 pkgs/development/tools/ocaml/utop/default.nix | 10 ++++-----
 pkgs/development/tools/omniorb/default.nix    |  4 ++--
 .../tools/omnisharp-roslyn/default.nix        |  4 ++--
 .../development/tools/out-of-tree/default.nix |  2 +-
 pkgs/development/tools/packet/default.nix     |  8 +++----
 pkgs/development/tools/parsing/antlr/3.5.nix  |  2 +-
 pkgs/development/tools/parsing/antlr/4.8.nix  |  4 ++--
 .../tools/parsing/bison/default.nix           |  8 +++----
 .../development/tools/parsing/flex/2.5.35.nix |  2 +-
 pkgs/development/tools/parsing/flex/2.6.1.nix |  6 ++---
 .../tools/parsing/flex/default.nix            |  6 ++---
 .../tools/parsing/ragel/default.nix           | 10 ++++-----
 .../development/tools/pgformatter/default.nix |  4 ++--
 pkgs/development/tools/pgloader/default.nix   |  2 +-
 pkgs/development/tools/phantomjs/default.nix  |  2 +-
 pkgs/development/tools/phantomjs2/default.nix |  8 +++----
 .../tools/poetry2nix/poetry2nix/overrides.nix | 10 ++++-----
 .../tools/profiling/EZTrace/default.nix       |  6 ++---
 .../tools/profiling/oprofile/default.nix      | 10 ++++-----
 .../tools/profiling/sysprof/capture.nix       |  4 ++--
 .../tools/profiling/sysprof/default.nix       |  2 +-
 .../tools/purescript/spago/spago.nix          |  4 ++--
 pkgs/development/tools/py-spy/default.nix     |  2 +-
 pkgs/development/tools/pydb/default.nix       |  6 ++---
 pkgs/development/tools/quilt/default.nix      |  6 ++---
 pkgs/development/tools/rdocker/default.nix    |  4 ++--
 .../tools/react-native-debugger/default.nix   |  2 +-
 .../repository-managers/nexus/default.nix     |  2 +-
 pkgs/development/tools/rtags/default.nix      |  4 ++--
 pkgs/development/tools/rund/default.nix       |  2 +-
 .../tools/rust/cargo-asm/default.nix          |  2 +-
 .../tools/rust/cargo-c/default.nix            |  2 +-
 .../tools/rust/cargo-cache/default.nix        |  2 +-
 .../tools/rust/cargo-crev/default.nix         |  2 +-
 .../tools/rust/cargo-deny/default.nix         |  2 +-
 .../tools/rust/cargo-fund/default.nix         |  2 +-
 .../tools/rust/cargo-geiger/default.nix       |  2 +-
 .../tools/rust/cargo-generate/default.nix     |  2 +-
 .../tools/rust/cargo-inspect/default.nix      |  2 +-
 .../tools/rust/cargo-make/default.nix         |  2 +-
 .../tools/rust/cargo-raze/default.nix         |  2 +-
 .../tools/rust/cargo-udeps/default.nix        |  2 +-
 .../tools/rust/cbindgen/default.nix           |  2 +-
 .../tools/rust/maturin/default.nix            |  4 ++--
 pkgs/development/tools/rust/racer/default.nix |  2 +-
 .../development/tools/rust/racerd/default.nix |  2 +-
 .../development/tools/rust/rustup/default.nix |  2 +-
 .../tools/sauce-connect/default.nix           |  2 +-
 .../tools/selenium/chromedriver/default.nix   |  6 ++---
 .../selenium/htmlunit-driver/default.nix      |  4 ++--
 .../tools/selenium/selendroid/default.nix     |  4 ++--
 .../tools/selenium/server/default.nix         |  4 ++--
 pkgs/development/tools/simavr/default.nix     |  2 +-
 pkgs/development/tools/slimerjs/default.nix   |  8 +++----
 pkgs/development/tools/so/default.nix         |  2 +-
 .../development/tools/sourcetrail/default.nix | 12 +++++-----
 pkgs/development/tools/sqsh/default.nix       |  2 +-
 pkgs/development/tools/summon/default.nix     |  2 +-
 .../sumneko-lua-language-server/default.nix   |  4 ++--
 pkgs/development/tools/the-way/default.nix    |  4 ++--
 pkgs/development/tools/trellis/default.nix    |  6 ++---
 pkgs/development/tools/tychus/default.nix     |  6 ++---
 pkgs/development/tools/uftrace/default.nix    |  8 +++----
 pkgs/development/tools/vcstool/default.nix    |  2 +-
 pkgs/development/tools/vultr/default.nix      |  6 ++---
 pkgs/development/tools/wasm-pack/default.nix  |  2 +-
 pkgs/development/tools/wiggle/default.nix     |  6 ++---
 pkgs/development/tools/wrangler/default.nix   |  6 ++---
 pkgs/development/tools/xcbuild/default.nix    |  6 ++---
 534 files changed, 1314 insertions(+), 1314 deletions(-)

diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index 44a6d7329ba..1dade32ac64 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }:
+{ lib, stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }:
 
 let generic = { major, version, src }:
 
@@ -30,7 +30,7 @@ let generic = { major, version, src }:
       cp -r ${desktopItem}/share/applications $out/share
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Language & tool for relational models";
       longDescription = ''
         Alloy is a language for describing structures and a tool for exploring
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 20b26437e75..eb827882b75 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git
+{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git
 , nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }:
 
-with stdenv.lib;
+with lib;
 
 let
   repo = "git@github.com:lihaoyi/Ammonite.git";
@@ -34,7 +34,7 @@ let
           #!${stdenv.shell}
           set -o errexit
           PATH=${
-            stdenv.lib.makeBinPath [
+            lib.makeBinPath [
               common-updater-scripts
               coreutils
               git
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index 396a5817c67..884b511b8af 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 with python3Packages;
 buildPythonApplication rec {
@@ -14,7 +14,7 @@ buildPythonApplication rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/myint/autoflake";
     description = "A simple program which removes unused imports and unused variables as reported by pyflakes";
     license = licenses.mit;
diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix
index d1b0c3a6656..ae54723dda3 100644
--- a/pkgs/development/tools/analysis/bingrep/default.nix
+++ b/pkgs/development/tools/analysis/bingrep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "bingrep";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-3eGYU5O7HSpawIL/8OVmROCzXfdnoMAnIujjrIp00xg=";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Greps through binaries from various OSs and architectures, and colors them";
     homepage = "https://github.com/m4b/bingrep";
     license = licenses.mit;
diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix
index 374331f3ac8..bcbda8ad7e6 100644
--- a/pkgs/development/tools/analysis/cccc/default.nix
+++ b/pkgs/development/tools/analysis/cccc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 let
   name = "cccc";
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
       complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura.
     '';
     homepage = "http://cccc.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.linquize ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.linquize ];
   };
 }
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index e38645e84c5..e5325f7da8c 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   version = "8.39";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Checks Java source against a coding standard";
     longDescription = ''
       checkstyle is a development tool to help programmers write Java code that
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 43b32052bf3..4752b31649d 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }:
+{ lib, stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "clang-analyzer";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Clang Static Analyzer";
     homepage    = "http://clang-analyzer.llvm.org";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.unix;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index 4c6e9f1a078..1e0b79e0daa 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   version = "6.0.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     mv -v $out/share/man/man1/coan.1.{1,gz}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The C preprocessor chainsaw";
     longDescription = ''
       A software engineering tool for analysing preprocessor-based
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index f9bd749f014..f3ad1d81e57 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchzip
 , zlib
 , xorg
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     ln -s $out/codeql/codeql $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Semantic code analysis engine";
     homepage = "https://semmle.com/codeql";
     maintainers = [ maintainers.dump_stack ];
diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix
index bd8c5c37c86..93a4ffab388 100644
--- a/pkgs/development/tools/analysis/cov-build/default.nix
+++ b/pkgs/development/tools/analysis/cov-build/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile }:
+{ lib, stdenv, requireFile }:
 
 let
   message = ''
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Coverity Scan build tools";
     homepage    = "https://scan.coverity.com";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.unfreeRedistributable;
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/development/tools/analysis/coz/default.nix
index 42b47a9a8fd..17968a466bf 100644
--- a/pkgs/development/tools/analysis/coz/default.nix
+++ b/pkgs/development/tools/analysis/coz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , libelfin
 , ncurses
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/plasma-umass/coz";
     description = "Profiler based on casual profiling";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ zimbatm ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ zimbatm ];
   };
 }
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 91bcecbb43d..30c0614446e 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }:
+{ lib, stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }:
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3";
   };
 
-  buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ];
+  buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ];
   nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
 
   makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ]
-   ++ stdenv.lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ];
+   ++ lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ];
 
   outputs = [ "out" "man" ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cp cppcheck.1 $man/share/man/man1/cppcheck.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A static analysis tool for C/C++ code";
     longDescription = ''
       Check C/C++ code for memory leaks, mismatching allocation-deallocation,
diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix
index 080b19bf163..cfb974c86dd 100644
--- a/pkgs/development/tools/analysis/egypt/default.nix
+++ b/pkgs/development/tools/analysis/egypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages }:
+{ lib, stdenv, fetchurl, perlPackages }:
 
 perlPackages.buildPerlPackage rec {
   pname = "egypt";
@@ -15,7 +15,7 @@ perlPackages.buildPerlPackage rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for making call graphs of C programmes";
     longDescription = ''
       Egypt is a simple tool for creating call graphs of C programs. It neither
diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix
index 56d3554bf75..97f93722a18 100644
--- a/pkgs/development/tools/analysis/emma/default.nix
+++ b/pkgs/development/tools/analysis/emma/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
   name = "emma-2.0.5312";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://emma.sourceforge.net/";
     description = "A code coverage tool for Java";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.cpl10;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.cpl10;
   };
 }
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix
index 64a1c317393..b8f3aa0ac1f 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/pkgs/development/tools/analysis/evmdis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "evmdis-unstable";
@@ -12,7 +12,7 @@ buildGoPackage {
     sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Arachnid/evmdis";
     description = "Ethereum EVM disassembler";
     license = [ licenses.asl20 ];
diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index d522b2b9422..265f6290453 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "findbugs-3.0.1";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A static analysis tool to find bugs in Java programs automatically";
     homepage = "http://findbugs.sourceforge.net/";
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 948df14957a..fc39e86007d 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }:
+{ lib, stdenv, fetchFromGitHub, ocamlPackages, CoreServices }:
 
 stdenv.mkDerivation rec {
   pname = "flow";
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ])
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A static type checker for JavaScript";
     homepage = "https://flow.org/";
     changelog = "https://github.com/facebook/flow/releases/tag/v${version}";
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 94012ce7ff6..394bd6558fb 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An extensible and collaborative platform dedicated to source-code analysis of C software";
     homepage    = "http://frama-c.com/";
-    license     = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ];
-    platforms   = stdenv.lib.platforms.unix;
+    license     = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ thoughtpolice amiddelk ];
+    platforms   = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
index d0221e80b9b..8984a395818 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     cp -ar $src/Documentation/html $out/share/doc/${name}/.
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatically generate all types of basic memory management operations and write into trace files";
     homepage = "https://github.com/GarCoSim";
     maintainers = [ maintainers.cmcdragonkai ];
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
index 10f0d74c0dc..3f97485cbfa 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     cp ./traceFileSim "$out/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques";
     homepage = "https://github.com/GarCoSim";
     maintainers = [ maintainers.cmcdragonkai ];
diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index 68f12dac70f..b169877f5c1 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
       --replace "Exec=/opt/hopper-${rev}/bin/Hopper" "Exec=$out/bin/hopper"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.hopperapp.com/index.html";
     description = "A macOS and Linux Disassembler";
     license = licenses.unfree;
diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix
index de29b29df31..6ea079e3ec1 100644
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv,
+{ lib, stdenv,
   mkDerivation,
   cmake,
   elfutils,
@@ -58,8 +58,8 @@ mkDerivation rec {
       then displays the result in a graphical way.
     '';
     homepage = "https://github.com/KDAB/hotspot";
-    license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ nh2 ];
+    license = with lib.licenses; [ gpl2 gpl3 ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nh2 ];
   };
 }
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 67157218154..db1cf9c6ead 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, llvmPackages, python2 }:
+{ lib, stdenv, fetchurl, cmake, llvmPackages, python2 }:
 
 stdenv.mkDerivation rec {
   pname = "include-what-you-use";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Analyze #includes in C/C++ source files with clang";
     longDescription = ''
       For every symbol (type, function variable, or macro) that you use in
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index c903833a731..faa68dadc3b 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }:
+{ lib, stdenv, fetchFromGitHub, ant, jdk, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "jdepend";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     chmod a+x $out/bin/jdepend
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Traverses Java class file directories and generates design quality metrics for each Java package";
     homepage = "http://www.clarkware.com/software/JDepend.html";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index b8e456b1c1e..15891e74044 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}:
+{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}:
 
 stdenv.mkDerivation rec {
   pname = "kcov";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
 
     longDescription = ''
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index c6faeaa72f2..35c75d67da5 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -1,4 +1,4 @@
- {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }:
+ {lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "lcov";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Code coverage tool that enhances GNU gcov";
 
     longDescription =
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = "http://ltp.sourceforge.net/coverage/lcov.php";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     maintainers = with maintainers; [ dezgeg ];
     platforms = platforms.all;
diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix
index 20fe74ecb74..66f767f4702 100644
--- a/pkgs/development/tools/analysis/makefile2graph/default.nix
+++ b/pkgs/development/tools/analysis/makefile2graph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }:
 
 stdenv.mkDerivation {
   name = "makefile2graph-2018-01-03";
@@ -19,10 +19,10 @@ stdenv.mkDerivation {
       --replace '/bin/sh' ${bash}/bin/bash \
       --replace 'make2graph' "$out/bin/make2graph"
     wrapProgram $out/bin/makefile2graph \
-      --set PATH ${stdenv.lib.makeBinPath [ gnumake ]}
+      --set PATH ${lib.makeBinPath [ gnumake ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lindenb/makefile2graph";
     description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file";
     maintainers = with maintainers; [ cmcdragonkai ];
diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix
index 8cc0477ca59..72154e909b6 100644
--- a/pkgs/development/tools/analysis/oclgrind/default.nix
+++ b/pkgs/development/tools/analysis/oclgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }:
 
 stdenv.mkDerivation rec {
   pname = "oclgrind";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An OpenCL device simulator and debugger";
     homepage = "https://github.com/jrprice/oclgrind";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix
index 4cd16a80a94..ff5014bd46a 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/pkgs/development/tools/analysis/panopticon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake
+{ lib, stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake
 , pkg-config, makeWrapper }:
 
 rustPlatform.buildRustPackage rec {
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     makeWrapper $out/share/${pname}/${pname} $out/bin/${pname}
      '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A libre cross-platform disassembler";
     longDescription = ''
       Panopticon is a cross platform disassembler for reverse
diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix
index 42e382c8bca..a46bc067f11 100644
--- a/pkgs/development/tools/analysis/pev/default.nix
+++ b/pkgs/development/tools/analysis/pev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, openssl, fetchFromGitHub }:
+{ lib, stdenv, openssl, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "pev";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   installFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries";
     homepage = "https://pev.sourceforge.net/";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 497a244f68b..a75445c363b 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, makeWrapper, openjdk }:
+{ lib, stdenv, fetchurl, unzip, makeWrapper, openjdk }:
 
 stdenv.mkDerivation rec {
   pname = "pmd";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An extensible cross-language static code analyzer";
     homepage = "https://pmd.github.io/";
     changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html";
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index d9f39667cef..0145e51ee26 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }:
+{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind }:
 
 let
-  name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
+  name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
 
 in stdenv.mkDerivation {
   inherit name;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
     install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
   '');
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Qt GUI to visualize profiling data";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index c6cc555e050..3623893ea63 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub
+{lib, stdenv, fetchFromGitHub
 , buildPackages
 , pkg-config
 , libusb-compat-0_1, readline, libewf, perl, zlib, openssl
@@ -19,7 +19,7 @@ assert pythonBindings -> python3 != null;
 
 
 let
-  inherit (stdenv.lib) optional;
+  inherit (lib) optional;
 
   generic = {
     version_commit, # unused
@@ -95,9 +95,9 @@ let
       meta = {
         description = "unix-like reverse engineering framework and commandline tools";
         homepage = "http://radare.org/";
-        license = stdenv.lib.licenses.gpl2Plus;
-        maintainers = with stdenv.lib.maintainers; [ raskin makefu mic92 ];
-        platforms = with stdenv.lib.platforms; linux;
+        license = lib.licenses.gpl2Plus;
+        maintainers = with lib.maintainers; [ raskin makefu mic92 ];
+        platforms = with lib.platforms; linux;
         inherit version;
       };
   };
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix
index b51b26eab17..0d10d6d6b27 100644
--- a/pkgs/development/tools/analysis/randoop/default.nix
+++ b/pkgs/development/tools/analysis/randoop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   version = "4.2.5";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp README.txt $out/doc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatic test generation for Java";
     homepage = "https://randoop.github.io/randoop/";
     license = licenses.mit;
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 92f2494dbe2..b63713f0007 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }:
+{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }:
 
 stdenv.mkDerivation rec {
   version = "5.4.0";
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
       time the same execution is replayed.
     '';
 
-    license = with stdenv.lib.licenses; [ mit bsd2 ];
-    maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ];
-    platforms = stdenv.lib.platforms.x86;
+    license = with lib.licenses; [ mit bsd2 ];
+    maintainers = with lib.maintainers; [ pierron thoughtpolice ];
+    platforms = lib.platforms.x86;
   };
 }
diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index e29f06fca8e..4330ec3d742 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, sqlite, pkg-config, perl
+{ lib, stdenv, fetchgit, sqlite, pkg-config, perl
 , buildllvmsparse ? true
 , buildc2xml ? true
 , llvm ? null, libxml2 ? null
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [sqlite perl]
-   ++ stdenv.lib.optional buildllvmsparse llvm
-   ++ stdenv.lib.optional buildc2xml libxml2;
+   ++ lib.optional buildllvmsparse llvm
+   ++ lib.optional buildc2xml libxml2;
 
   preBuild =
     '' sed -i Makefile \
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A semantic analysis tool for C";
     homepage = "http://smatch.sourceforge.net/";
-    license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.free; /* OSL, see http://www.opensource.org */
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index 82eb58879f1..261645c062d 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }:
 
 mkDerivation rec {
   pname = "snowman";
@@ -19,7 +19,7 @@ mkDerivation rec {
     export sourceRoot=$sourceRoot/src
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Native code to C/C++ decompiler";
     homepage = "http://derevenets.com/";
 
diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix
index 29ee980b487..e0d9840472b 100644
--- a/pkgs/development/tools/analysis/sparse/default.nix
+++ b/pkgs/development/tools/analysis/sparse/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkg-config, libxml2, llvm }:
+{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm }:
 
 stdenv.mkDerivation rec {
   name = "sparse-0.5.0";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Semantic parser for C";
     homepage    = "https://git.kernel.org/cgit/devel/sparse/sparse.git/";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index 73e88f9811c..49e31f53a84 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -2,13 +2,13 @@
 , withISpin ? true, tk, swarm, graphviz }:
 
 let
-  binPath = stdenv.lib.makeBinPath [ gcc ];
-  ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ];
+  binPath = lib.makeBinPath [ gcc ];
+  ibinPath = lib.makeBinPath [ gcc tk swarm graphviz tk ];
 
 in stdenv.mkDerivation rec {
   pname = "spin";
   version = "6.4.9";
-  url-version = stdenv.lib.replaceChars ["."] [""] version;
+  url-version = lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
     # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL.
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
       --prefix PATH ':' "$out/bin:${ibinPath}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Formal verification tool for distributed software systems";
     homepage = "http://spinroot.com/";
     license = licenses.free;
diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix
index 4dc93897e86..581ff56bb61 100644
--- a/pkgs/development/tools/analysis/splint/default.nix
+++ b/pkgs/development/tools/analysis/splint/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, flex }:
+{ fetchurl, lib, stdenv, flex }:
 
 stdenv.mkDerivation rec {
   name = "splint-3.1.2";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7";
   };
 
-  patches = [ ./tmpdir.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
+  patches = [ ./tmpdir.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
 
   buildInputs = [ flex ];
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.splint.org/";
     description = "Annotation-assisted lightweight static analyzer for C";
 
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix
index 03f218546eb..894d9a2357e 100644
--- a/pkgs/development/tools/analysis/swarm/default.nix
+++ b/pkgs/development/tools/analysis/swarm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   name = "swarm-2019-03-11";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     install -Dm644 Doc/swarm.1 $out/share/man/man1/swarm.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Verification script generator for Spin";
     homepage = "http://spinroot.com/";
     license = licenses.free;
diff --git a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
index 0ad042d74de..17f39071462 100644
--- a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
+++ b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, fetchFromGitHub }:
+{ lib, stdenv, python3, fetchFromGitHub }:
 
 with python3.pkgs;
 
@@ -14,7 +14,7 @@ buildPythonApplication rec {
     sha256 = "1yn9vi91j1yxkn0icdnjhgl0qrqqkzyhccj39af4f19q1gdw995l";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/theopolis/uefi-firmware-parser/";
     description = "Parse BIOS/Intel ME/UEFI firmware related structures: Volumes, FileSystems, Files, etc";
     # MIT + license headers in some files
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 60d3a7c5ebc..d99bbe1cae4 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }:
+{ lib, stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }:
 
 stdenv.mkDerivation rec {
   name = "valgrind-3.16.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   # GDB is needed to provide a sane default for `--db-command'.
   # Perl is needed for `callgrind_{annotate,control}'.
-  buildInputs = [ gdb perl ]  ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
+  buildInputs = [ gdb perl ]  ++ lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
 
   # Perl is also a native build input.
   nativeBuildInputs = [ perl ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   separateDebugInfo = stdenv.isLinux;
 
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin (
+  preConfigure = lib.optionalString stdenv.isDarwin (
     let OSRELEASE = ''
       $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \
       <${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)'';
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
   postPatch = "";
 
   configureFlags =
-    stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include";
+    lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"
+    ++ lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include";
 
   doCheck = false; # fails
 
@@ -76,10 +76,10 @@ stdenv.mkDerivation rec {
       Valgrind to build new tools.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.unix;
     badPlatforms = [
       "armv5tel-linux" "armv6l-linux" "armv6m-linux"
       "sparc-linux" "sparc64-linux"
diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix
index 1c571fe6be0..10b9f7291a2 100644
--- a/pkgs/development/tools/analysis/valkyrie/default.nix
+++ b/pkgs/development/tools/analysis/valkyrie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ lib, stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   name = "valkyrie-2.0.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ qmake4Hook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.valgrind.org/";
     description = "Qt4-based GUI for the Valgrind 3.6.x series";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 2ff9c58fb33..33721e60b0e 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, build-tools }:
+{ lib, stdenv, fetchurl, makeWrapper, jre, build-tools }:
 
 stdenv.mkDerivation rec {
   pname = "apktool";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
         --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for reverse engineering Android apk files";
     homepage    = "https://ibotpeaches.github.io/Apktool/";
     license     = licenses.asl20;
diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix
index 68a0c0f6073..b2432f7fefc 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/pkgs/development/tools/asn2quickder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake
+{ lib, stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake
 , pytestrunner, pytest, six, pyparsing, asn1ate }:
 
 buildPythonApplication rec {
@@ -23,7 +23,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ pyparsing asn1ate six ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An ASN.1 compiler with a backend for Quick DER";
     homepage = "https://github.com/vanrein/asn2quickder";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix
index 5327ab354e9..5dd058614c1 100644
--- a/pkgs/development/tools/avro-tools/default.nix
+++ b/pkgs/development/tools/avro-tools/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     --add-flags "-jar $out/libexec/avro-tools/${pname}.jar"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://avro.apache.org/";
     description = "Avro command-line tools and utilities";
     license     = lib.licenses.asl20;
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index bae6dd73829..822480b1d3f 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
@@ -21,7 +21,7 @@ buildGoModule rec {
     ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ colemickens ];
     license = licenses.mit;
     description = "The new Azure Storage data transfer utility - AzCopy v10";
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index e0a7febb875..94efcc9be06 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -3,7 +3,7 @@
 , git
 , go
 , python
-, stdenv
+, lib, stdenv
 }:
 
 let
@@ -73,7 +73,7 @@ buildBazelPackage rec {
     '';
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel-watcher";
     description = "Tools for building Bazel targets when source files change";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index 2a20888426d..e4a6b3c2869 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "bazelisk";
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A user-friendly launcher for Bazel";
     longDescription = ''
       BEWARE: This package does not work on NixOS.
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index fcab0fb198e..ff24e7b7c1c 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, zlib, fetchFromGitHub }:
+{ lib, stdenv, cmake, zlib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "1.1";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     install -Dm755 {.,$out/bin}/bloaty
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "a size profiler for binaries";
     homepage = "https://github.com/google/bloaty";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 8ce475c893d..8566edd2315 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "boost-build";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
     ./b2 install --prefix=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.boost.org/boost-build2/";
-    license = stdenv.lib.licenses.boost;
+    license = lib.licenses.boost;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ivan-tkatchev ];
   };
diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
index 49f8435b377..182b8633aa0 100644
--- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, coreutils, makeWrapper }:
+{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
 
 let version = "1.9.15"; in
 
@@ -105,8 +105,8 @@ stdenv.mkDerivation {
       by an object that implements a particular Task interface.
     '';
 
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index caa9bc3b9eb..d88068c1c3e 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, coreutils, makeWrapper }:
+{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
 
 let version = "1.10.9"; in
 
@@ -105,8 +105,8 @@ stdenv.mkDerivation {
       by an object that implements a particular Task interface.
     '';
 
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index 83260cbc186..4658703f8b1 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, makeWrapper }:
+{ lib, stdenv, fetchurl, jdk, makeWrapper }:
 
 assert jdk != null;
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   inherit jdk;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Build automation tool (used primarily for Java projects)";
     homepage = "http://maven.apache.org/";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix
index 9ed9da0d268..0af9e77acf5 100644
--- a/pkgs/development/tools/build-managers/arpa2cm/default.nix
+++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "arpa2cm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CMake Module library for the ARPA2 project";
     license = licenses.bsd2;
     maintainers = with maintainers; [ leenaars ];
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index 969cd987974..8eb197151a3 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lua5_3, python }:
+{ lib, stdenv, fetchFromGitHub, lua5_3, python }:
 
 stdenv.mkDerivation rec {
   pname = "bam";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     cp bam "$out/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Yet another build manager";
     maintainers = with maintainers;
     [
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 0c9f4d7c50a..ac03288f148 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , git
 , go
-, stdenv
+, lib, stdenv
 }:
 
 buildBazelPackage rec {
@@ -80,7 +80,7 @@ buildBazelPackage rec {
     '';
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/buchgr/bazel-remote";
     description = "A remote HTTP/1.1 cache for Bazel";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index 66560e768d2..436b681e005 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "bazel-buildtools";
@@ -19,7 +19,7 @@ buildGoPackage rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps";
     homepage = "https://github.com/bazelbuild/buildtools";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index 756e68b5678..74b1f704020 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     ./no-double-relative.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool that generates a compilation database for clang tooling";
     longDescription = ''
       Note: the bear command is very useful to generate compilation commands
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index c1b3a7aa156..12fd01e5e4e 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     installShellCompletion --name bloop.fish --fish ${bloop-fish}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://scalacenter.github.io/bloop/";
     license = licenses.asl20;
     description = "A Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index 9bda4cde044..e1e9b348503 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , getopt
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     ./fix-unexport-env-test.patch
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Portable version of NetBSD 'make'";
     homepage    = "http://www.crufty.net/help/sjg/bmake.html";
     license     = licenses.bsd3;
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index 09c1eada54b..68a4d5f44ea 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk }:
+{ lib, stdenv, fetchurl, jdk }:
 
 stdenv.mkDerivation rec {
   version = "2.7.2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ jdk ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Build tooling for Clojure";
     homepage = "https://boot-clj.com/";
     license = licenses.epl10;
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 41fc0940b9d..0fbcb95704b 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, bash, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "buck";
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec {
     install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck
     wrapProgram $out/bin/buck \
       --prefix PYTHONPATH : $PYTHONPATH \
-      --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
+      --prefix PATH : "${lib.makeBinPath [jdk watchman]}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://buck.build/";
     description = "A high-performance build tool";
     maintainers = [ maintainers.jgertm maintainers.marsam ];
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index 804bdd76f67..9dabd7b3556 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
+{ lib, stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps
 }:
 
-with stdenv.lib;
+with lib;
 
 assert stdenv ? cc;
 assert stdenv.cc ? libc;
 
 let
-  os = stdenv.lib.optionalString;
+  os = lib.optionalString;
   majorVersion = "2.8";
   minorVersion = "12.2";
   version = "${majorVersion}.${minorVersion}";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     "--mandir=/share/man"
     "--system-libs"
     "--no-system-libarchive"
-   ] ++ stdenv.lib.optional useQt4 "--qt-gui";
+   ] ++ lib.optional useQt4 "--qt-gui";
 
   setupHook = ./setup-hook.sh;
 
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://cmake.org";
     description = "Cross-Platform Makefile Generator";
-    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ xfix ];
-    license = stdenv.lib.licenses.bsd3;
+    platforms = if useQt4 then qt4.meta.platforms else lib.platforms.unix;
+    maintainers = with lib.maintainers; [ xfix ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
index 7eed8806955..251268a449d 100644
--- a/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation {
   pname = "colormake";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple wrapper around make to colorize the output";
     homepage = "https://bre.klaki.net/programs/colormake/";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix
index b906d64f0af..d48f0d4d56b 100644
--- a/pkgs/development/tools/build-managers/doit/default.nix
+++ b/pkgs/development/tools/build-managers/doit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages }:
+{ lib, stdenv, fetchurl, python3Packages }:
 
 let
 
@@ -16,15 +16,15 @@ in python3Packages.buildPythonApplication {
   buildInputs = with python3Packages; [ mock pytest ];
 
   propagatedBuildInputs = with python3Packages; [ cloudpickle ]
-    ++ stdenv.lib.optional stdenv.isLinux pyinotify
-    ++ stdenv.lib.optional stdenv.isDarwin macfsevents;
+    ++ lib.optional stdenv.isLinux pyinotify
+    ++ lib.optional stdenv.isDarwin macfsevents;
 
   # Tests fail due to mysterious gdbm.open() resource temporarily
   # unavailable errors.
   doCheck = false;
   checkPhase = "py.test";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://pydoit.org/";
     description = "A task management & automation tool";
     license = licenses.mit;
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 2668eca4569..2df829a0229 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, curl, dmd, libevent, rsync }:
+{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
 
 stdenv.mkDerivation rec {
   pname = "dub";
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     cp bin/dub $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Package and build manager for D applications and libraries";
     homepage = "https://code.dlang.org/";
     license = licenses.mit;
diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix
index 8c41eb3ac51..25450ceb6d9 100644
--- a/pkgs/development/tools/build-managers/fac/default.nix
+++ b/pkgs/development/tools/build-managers/fac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, git, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, git, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "fac-build";
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
         'std::process::Command::new("${git}/bin/git")'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       A build system that uses ptrace to handle dependencies automatically
     '';
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index c2ce00eee21..387650e85ab 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
+{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
 
 assert guileSupport -> ( pkg-config != null && guile != null );
 
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
     ./glibc-2.27-glob.patch
   ];
 
-  nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
-  buildInputs = stdenv.lib.optionals guileSupport [ guile ];
+  nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
+  buildInputs = lib.optionals guileSupport [ guile ];
 
-  configureFlags = stdenv.lib.optional guileSupport "--with-guile"
+  configureFlags = lib.optional guileSupport "--with-guile"
 
     # Make uses this test to decide whether it should keep track of
     # subseconds. Apple made this possible with APFS and macOS 10.13.
@@ -37,11 +37,11 @@ stdenv.mkDerivation {
     # a second. So, tell Make to ignore nanoseconds in mtime here by
     # overriding the autoconf test for the struct.
     # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
-    ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
+    ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
 
   outputs = [ "out" "man" "info" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/make/";
     description = "A tool to control the generation of non-source files from sources";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 213d43c735c..fb9dab54049 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
+{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
 
 assert guileSupport -> ( pkg-config != null && guile != null );
 
@@ -21,10 +21,10 @@ stdenv.mkDerivation {
     ./impure-dirs.patch
   ];
 
-  nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
-  buildInputs = stdenv.lib.optionals guileSupport [ guile ];
+  nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
+  buildInputs = lib.optionals guileSupport [ guile ];
 
-  configureFlags = stdenv.lib.optional guileSupport "--with-guile"
+  configureFlags = lib.optional guileSupport "--with-guile"
 
     # Make uses this test to decide whether it should keep track of
     # subseconds. Apple made this possible with APFS and macOS 10.13.
@@ -33,11 +33,11 @@ stdenv.mkDerivation {
     # a second. So, tell Make to ignore nanoseconds in mtime here by
     # overriding the autoconf test for the struct.
     # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
-    ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
+    ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
 
   outputs = [ "out" "man" "info" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/make/";
     description = "A tool to control the generation of non-source files from sources";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index d06282739af..638be6b02d8 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
+{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
 
 rec {
   gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation {
@@ -46,8 +46,8 @@ rec {
         build-by-convention behavior.
       '';
       homepage = "http://www.gradle.org/";
-      license = stdenv.lib.licenses.asl20;
-      platforms = stdenv.lib.platforms.unix;
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.unix;
     };
   };
 
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index 30c4d4ec4de..dcc0c3aef90 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit (src.meta) homepage;
     description = "A better make, inspired by djb's redo";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.timbertson ];
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.lgpl2Plus;
+    maintainers = [ lib.maintainers.timbertson ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 89e2b8d0cc6..6320646974a 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:
+{ lib, stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "icmake";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
      --prefix PATH : ${ncurses}/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A program maintenance (make) utility using a C-like grammar";
     homepage = "https://fbb-git.gitlab.io/icmake/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index 7d7502fad4b..6f5ecde8f88 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, yacc }:
+{ lib, stdenv, fetchurl, yacc }:
 
 stdenv.mkDerivation rec {
   name = "jam-2.6.1";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.perforce.com/resources/documentation/jam";
     license = licenses.free;
     description = "Just Another Make";
diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix
index a7fced4482b..ed5923e74d0 100644
--- a/pkgs/development/tools/build-managers/kati/default.nix
+++ b/pkgs/development/tools/build-managers/kati/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   pname = "kati-unstable";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     install -D ckati $out/bin/ckati
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An experimental GNU make clone";
     homepage = "https://github.com/google/kati";
     platforms = platforms.all;
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index f1445970f6a..488697033d9 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
+{ lib, stdenv, fetchurl, makeWrapper
 , coreutils, jdk, rlwrap, gnupg }:
 
 stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/lein \
       --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
     wrapProgram $out/bin/lein \
-      --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \
+      --prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \
       --set LEIN_GPG ${gnupg}/bin/gpg \
       --set JAVA_CMD ${jdk}/bin/java
   '';
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://leiningen.org/";
     description = "Project automation for Clojure";
-    license = stdenv.lib.licenses.epl10;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ thiagokokada ];
+    license = lib.licenses.epl10;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ thiagokokada ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index a3865e2c52c..5942e20ec92 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "mill";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.lihaoyi.com/mill";
     license = licenses.mit;
     description = "A build tool for Scala, Java and more";
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
       modules (written in Java or Scala) or through an external subprocesses.
     '';
     maintainers = with maintainers; [ scalavision ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix
index 09028789daa..1eaa51a5de0 100644
--- a/pkgs/development/tools/build-managers/mk/default.nix
+++ b/pkgs/development/tools/build-managers/mk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "mk-2006-01-31";
@@ -9,6 +9,6 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix
index 1b805df95a0..ce08986b3e1 100644
--- a/pkgs/development/tools/build-managers/msbuild/default.nix
+++ b/pkgs/development/tools/build-managers/msbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }:
+{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }:
 
 let
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   # https://github.com/NixOS/nixpkgs/issues/38991
   # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
-  LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
+  LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux
       "${glibcLocales}/lib/locale/locale-archive";
 
   buildPhase = ''
@@ -122,7 +122,7 @@ EOF
     ${mono}/bin/mono Helloworld.exe | grep "Hello, world!"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio";
     homepage = "https://github.com/mono/msbuild";
     license = licenses.mit;
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 8fc81a1a979..ddc61ca86d9 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "ninja";
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 9757d8cda8d..03eac2db5e3 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, pythonPackages }:
+{ lib, stdenv, pythonPackages }:
 
-with stdenv.lib;
+with lib;
 with pythonPackages;
 
 buildPythonApplication rec {
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index 359c942d189..3bf7623ed04 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:
+{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:
 
 stdenv.mkDerivation rec {
   pname = "qbs";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool that helps simplify the build process for developing projects across multiple platforms";
     homepage = "https://wiki.qt.io/Qbs";
     license = licenses.lgpl3;
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index 1c5996c6b1c..d3926beb321 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, erlang }:
+{ lib, stdenv, fetchurl, erlang }:
 
 
 let
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       variety of locations (git, hg, etc).
       '';
 
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index bf28868d0e7..aa3af12c934 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub,
+{ lib, stdenv, fetchFromGitHub,
   fetchHex, erlang,
   tree }:
 
@@ -135,8 +135,8 @@ stdenv.mkDerivation rec {
       variety of locations (hex.pm, git, hg, and so on).
       '';
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ gleber tazjin ];
-    license = stdenv.lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ gleber tazjin ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index c62fb0f2515..638f10f0187 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -30,7 +30,7 @@
       --replace "/bin/ls" "ls"
 
     substituteInPlace t/110-compile/hello.o.do \
-      --replace "/usr/include" "${stdenv.lib.getDev stdenv.cc.libc}/include"
+      --replace "/usr/include" "${lib.getDev stdenv.cc.libc}/include"
 
     substituteInPlace t/200-shell/nonshelltest.do \
       --replace "/usr/bin/env perl" "${perl}/bin/perl"
diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix
index 1480f32a50f..40708b7877a 100644
--- a/pkgs/development/tools/build-managers/redo-c/default.nix
+++ b/pkgs/development/tools/build-managers/redo-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "redo-c";
   version = "0.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     cp '${./Makefile}' Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An implementation of the redo build system in portable C with zero dependencies";
     homepage = "https://github.com/leahneukirchen/redo-c";
     license = licenses.cc0;
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
index 71e5a54320a..d22f4bc487f 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, coreutils }:
+{ lib, stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation {
   version = "4.0.4";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Redo implementation in Bourne Shell";
     homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html";
     license  = licenses.agpl3;
diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix
index a735a05dc5b..48fbffc3940 100644
--- a/pkgs/development/tools/build-managers/redo/default.nix
+++ b/pkgs/development/tools/build-managers/redo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl }:
+{lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   name = "redo-1.4";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://jdebp.eu./Softwares/redo/";
     description = "A system for building target files from source files";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ stdenv.lib.maintainers.vrthra ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vrthra ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix
index 7d44bc74df8..f61a7e77458 100644
--- a/pkgs/development/tools/build-managers/remake/default.nix
+++ b/pkgs/development/tools/build-managers/remake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline }:
+{ lib, stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
   pname = "remake";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://bashdb.sourceforge.net/remake/";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
     description = "GNU Make with comprehensible tracing and a debugger";
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ bjornfor ];
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ bjornfor ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index 1dd931981da..5b9a456ce75 100644
--- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix
+++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "rocm-cmake";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CMake modules for common build tasks for the ROCm stack";
     homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
     license = licenses.mit;
diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix
index f8b649e0409..4360a3f3a30 100644
--- a/pkgs/development/tools/build-managers/samurai/default.nix
+++ b/pkgs/development/tools/build-managers/samurai/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "samurai";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ninja-compatible build tool written in C";
     homepage = "https://github.com/michaelforney/samurai";
     license = with licenses; [ mit asl20 ]; # see LICENSE
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 24c2bdd2af3..f80d278c86d 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript
+{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript
 , common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused
 , nixosTests }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     install bin/sbt $out/bin
 
     wrapProgram $out/bin/sbt --prefix PATH : ${
-      stdenv.lib.makeBinPath [ which curl ]
+      lib.makeBinPath [ which curl ]
     }
   '';
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       #!${stdenv.shell}
       set -xo errexit
       PATH=${
-        stdenv.lib.makeBinPath [
+        lib.makeBinPath [
           common-updater-scripts
           curl
           cacert
@@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
     description =
       "A more featureful runner for sbt, the simple/scala/standard build tool";
     homepage = "https://github.com/paulp/sbt-extras";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ nequissimus puffnfresh ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ nequissimus puffnfresh ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index a9314cef0cc..6bd0b83cec1 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript
+{ lib, stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript
 , common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }:
 
 stdenv.mkDerivation rec {
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
     echo -java-home ${jre.home} >>conf/sbtopts
   '';
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ];
+  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ zlib ];
+  buildInputs = lib.optionals stdenv.isLinux [ zlib ];
 
   installPhase = ''
     mkdir -p $out/share/sbt $out/bin
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     } $out/bin/sbtn
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.scala-sbt.org/";
     license = licenses.bsd3;
     description = "A build tool for Scala, Java and more";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       #!${stdenv.shell}
       set -o errexit
       PATH=${
-        stdenv.lib.makeBinPath [
+        lib.makeBinPath [
           common-updater-scripts
           git
           nixfmt
diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix
index 7a15c193423..1de2ecbbc8b 100644
--- a/pkgs/development/tools/build-managers/scons/common.nix
+++ b/pkgs/development/tools/build-managers/scons/common.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   # The release tarballs don't contain any tests (runtest.py and test/*):
   doCheck = lib.versionOlder version "4.0.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An improved, cross-platform substitute for Make";
     longDescription = ''
       SCons is an Open Source software construction tool. Think of
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index cf422fc2e07..868ea265f6f 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , crystal_0_34
 , crystal_0_35
@@ -26,7 +26,7 @@ let
       # tries to execute git which fails spectacularly
       doCheck = false;
 
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Dependency manager for the Crystal language";
         license = licenses.asl20;
         maintainers = with maintainers; [ peterhoeg ];
diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix
index ebdad7be8fa..f0e6efdca3e 100644
--- a/pkgs/development/tools/build-managers/tup/default.nix
+++ b/pkgs/development/tools/build-managers/tup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }:
+{ lib, stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "tup";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast, file-based build system";
     longDescription = ''
       Tup is a file-based build system for Linux, OSX, and Windows. It inputs a list
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index 49aae7c3014..ae62ce539ba 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook
+{ lib, stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook
 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]`
 , withTools ? null
 }:
 let
-  wafToolsArg = with stdenv.lib.strings;
+  wafToolsArg = with lib.strings;
     optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\"";
 in
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     install -D waf $out/bin/waf
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Meta build system";
     homepage    = "https://waf.io";
     license     = licenses.bsd3;
diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix
index 30a013dac11..55894058794 100644
--- a/pkgs/development/tools/buildkit/default.nix
+++ b/pkgs/development/tools/buildkit/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   pname = "buildkit";
   version = "0.8.1";
 
   goPackagePath = "github.com/moby/buildkit";
-  subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
+  subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
 
   src = fetchFromGitHub {
     owner = "moby";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
     homepage = "https://github.com/moby/buildkit";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix
index cf2e565fe45..c85ef52564a 100644
--- a/pkgs/development/tools/cargo-web/default.nix
+++ b/pkgs/development/tools/cargo-web/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform
+{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform
 , CoreServices, Security
 }:
 
@@ -16,9 +16,9 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm";
 
   nativeBuildInputs = [ openssl perl pkg-config ];
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Cargo subcommand for the client-side Web";
     homepage = "https://github.com/koute/cargo-web";
     license = with licenses; [ asl20 /* or */ mit ];
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index ab7a7c0fdff..886d435b811 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, emacs }:
+{ lib, stdenv, fetchurl, python, emacs }:
 
 stdenv.mkDerivation rec {
   pname = "cask";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Project management for Emacs";
     longDescription = ''
       Cask is a project management tool for Emacs that helps automate the
diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index 90be513bd50..ff47bd0e9f3 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4";
   };
 
-  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ python3Packages.sphinx ];
+  nativeBuildInputs = [ cmake ] ++ lib.optionals withMan [ python3Packages.sphinx ];
 
   clangVersion = lib.getVersion llvmPackages.clang;
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/CastXML/CastXML";
     license = licenses.asl20;
     description = "Abstract syntax tree XML output tool";
diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix
index 7981681a641..7e0a07ad834 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/pkgs/development/tools/cdecl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}:
+{lib, stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}:
 
 stdenv.mkDerivation {
   name = "cdecl-2.5";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Translator English -- C/C++ declarations";
-    license = stdenv.lib.licenses.publicDomain;
-    maintainers = with stdenv.lib.maintainers; [joelteon];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [joelteon];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix
index f7c806c89a3..ac8f15a4158 100644
--- a/pkgs/development/tools/chit/default.nix
+++ b/pkgs/development/tools/chit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl
 , darwin
 }:
 
@@ -17,13 +17,13 @@ buildRustPackage rec {
 
   cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m";
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
   buildInputs = []
-  ++ stdenv.lib.optionals stdenv.isLinux [ openssl ]
-  ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ])
+  ++ lib.optionals stdenv.isLinux [ openssl ]
+  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ])
   ;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Crate help in terminal: A tool for looking up details about rust crates without going to crates.io";
     longDescription = ''
       Chit helps answer these questions:
diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix
index 2e8f48901ab..498310d4324 100644
--- a/pkgs/development/tools/clang-tools/default.nix
+++ b/pkgs/development/tools/clang-tools/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, llvmPackages }:
+{ lib, stdenv, llvmPackages }:
 
 let
   clang = llvmPackages.clang-unwrapped;
 
 in stdenv.mkDerivation {
   pname = "clang-tools";
-  version = stdenv.lib.getVersion clang;
+  version = lib.getVersion clang;
 
   dontUnpack = true;
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     runHook preInstall
 
     mkdir -p $out/bin
-    export libc_includes="${stdenv.lib.getDev stdenv.cc.libc}/include"
+    export libc_includes="${lib.getDev stdenv.cc.libc}/include"
     export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1"
 
     export clang=${clang}
@@ -34,6 +34,6 @@ in stdenv.mkDerivation {
 
   meta = clang.meta // {
     description = "Standalone command line tools for C++ development";
-    maintainers = with stdenv.lib.maintainers; [ aherrmann ];
+    maintainers = with lib.maintainers; [ aherrmann ];
   };
 }
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 6d843ead24e..182a7f98c4c 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, rustPlatform, stdenv }:
+{ fetchFromGitHub, rustPlatform, lib, stdenv }:
 
 with rustPlatform;
 
@@ -18,8 +18,8 @@ buildRustPackage rec {
   meta = {
     description = "Generate changelogs from local git metadata";
     homepage = "https://github.com/clog-tool/clog-cli";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [stdenv.lib.maintainers.nthorne];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = [lib.maintainers.nthorne];
   };
 }
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index 642c42108aa..4d7e226463f 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }:
 
 buildGoPackage rec {
   pname = "cloudfoundry-cli";
@@ -45,7 +45,7 @@ buildGoPackage rec {
     installShellCompletion --bash $bashCompletionScript
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The official command line client for Cloud Foundry";
     homepage = "https://github.com/cloudfoundry/cli";
     maintainers = with maintainers; [ ris ];
diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix
index e051dfef19b..03174d6c4fc 100644
--- a/pkgs/development/tools/clpm/default.nix
+++ b/pkgs/development/tools/clpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchgit
 , wrapLisp
 , sbcl
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core`
   dontFixup = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Common Lisp Package Manager";
     homepage = "https://www.clpm.dev/";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix
index c5398f695d2..2c85890e70b 100644
--- a/pkgs/development/tools/cmake-language-server/default.nix
+++ b/pkgs/development/tools/cmake-language-server/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   };
 
   # can be removed after v0.1.2
-  patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+  patches = lib.optional stdenv.isDarwin (fetchpatch {
     url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch";
     sha256 = "1xbmarvsvzd61fnlap4qscnijli2rw2iqr7cyyvar2jd87z6sfp0";
   });
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix
index 24aca0dada7..ef08b2d5813 100644
--- a/pkgs/development/tools/compile-daemon/default.nix
+++ b/pkgs/development/tools/compile-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "compile-daemon-unstable";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Very simple compile daemon for Go";
     license = licenses.bsd2;
     maintainers = with maintainers; [ ];
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 82ac1556574..bd8608a9119 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, buildGoModule,
+{ fetchFromGitHub, lib, stdenv, buildGoModule,
   makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
 buildGoModule rec {
   name = "buildkite-agent-${version}";
@@ -27,10 +27,10 @@ buildGoModule rec {
 
     # These are runtime dependencies
     wrapProgram $out/bin/buildkite-agent \
-      --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
+      --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Build runner for buildkite.com";
     longDescription = ''
       The buildkite-agent is a small, reliable, and cross-platform build runner
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index 39178201456..232efe32a1a 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -13,7 +13,7 @@ buildGoPackage {
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
-    ${stdenv.lib.optionalString hasBootstrapScript ''
+    ${lib.optionalString hasBootstrapScript ''
     # Install bootstrap.sh
     mkdir -p $out/libexec/buildkite-agent
     cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent
@@ -25,11 +25,11 @@ buildGoPackage {
 
     # These are runtime dependencies
     wrapProgram $out/bin/buildkite-agent \
-      ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \
-      --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
+      ${lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \
+      --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Build runner for buildkite.com";
     longDescription = ''
       The buildkite-agent is a small, reliable, and cross-platform build runner
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index 2a8e10008c2..b1ee5349a5c 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 let version = "1.2.4";
 in buildGoModule rec {
@@ -21,7 +21,7 @@ in buildGoModule rec {
     sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ bricewge ];
     license = licenses.asl20;
     description = "Command line client for the Drone continuous integration server";
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 7a7f0d023d8..ffdf588895a 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   name = "drone.io-${version}";
@@ -15,7 +15,7 @@ buildGoModule rec {
     sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ elohmeier vdemeester ];
     license = licenses.asl20;
     description = "Continuous Integration platform built on container technology";
diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
index 7cefd896f48..6e58b74654d 100644
--- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "gocd-agent-${version}-${rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip";
     sha256 = "1nirdv82i8x4s1dyb0rmxldh8avappd4g3mbbl6xp7r7s0drcprp";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
     homepage = "http://www.go.cd";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
index d23bc9d8d8e..90eb61dbff8 100644
--- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix
+++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "gocd-server-${version}-${rev}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0c30qzd6awlw0zx91rk6na0mmgykqkgrw9ychx18ivjwma0hr0sc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
     homepage = "http://www.go.cd";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index f54ef1acbb0..adfc6a2580a 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt
+{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt
 , writeScript, nixosTests, jq, cacert, curl }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       #!${stdenv.shell}
       set -o errexit
       PATH=${
-        stdenv.lib.makeBinPath [
+        lib.makeBinPath [
           cacert
           common-updater-scripts
           coreutils
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An extendable open source continuous integration server";
     homepage = "https://jenkins-ci.org";
     license = licenses.mit;
diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix
index 5a326e94a54..f64cbd5e85f 100644
--- a/pkgs/development/tools/continuous-integration/laminar/default.nix
+++ b/pkgs/development/tools/continuous-integration/laminar/default.nix
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
     rm -r $out/lib # it contains only systemd unit file
   '');
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightweight and modular continuous integration service";
     homepage = "https://laminar.ohwg.net";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix
index a1549de1843..a7698ef4fb8 100644
--- a/pkgs/development/tools/corgi/default.nix
+++ b/pkgs/development/tools/corgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "corgi-${rev}";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CLI workflow manager";
     longDescription = ''
       Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet.
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 54836216c54..e016f0ef7c9 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts
+{ lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts
 , coreutils, git, gnused, nix, nixfmt }:
 
 let
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     #!${stdenv.shell}
     set -o errexit
     PATH=${
-      stdenv.lib.makeBinPath [
+      lib.makeBinPath [
         common-updater-scripts
         coreutils
         git
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://get-coursier.io/";
     description =
       "A Scala library to fetch dependencies from Maven / Ivy repositories";
diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix
index 283d9845dfa..4e00eb903eb 100644
--- a/pkgs/development/tools/cppclean/default.nix
+++ b/pkgs/development/tools/cppclean/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ lib, stdenv, fetchFromGitHub, python3Packages }:
 
 with python3Packages;
 
@@ -21,7 +21,7 @@ buildPythonApplication rec {
     ./test.bash
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Finds problems in C++ source that slow development of large code bases";
     homepage    = "https://github.com/myint/cppclean";
     license     = licenses.asl20;
diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
index cdd0f2ae105..243be958b07 100644
--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchgit, stdenv }:
+{ buildGoModule, fetchgit, lib, stdenv }:
 
 buildGoModule rec {
   pname = "cue";
@@ -23,7 +23,7 @@ buildGoModule rec {
   meta = {
     description = "A data constraint language which aims to simplify tasks involving defining and using data";
     homepage = "https://cuelang.org/";
-    maintainers = with stdenv.lib.maintainers; [ solson ];
-    license = stdenv.lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ solson ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index fe7721f5ed4..9c01c1e9d2d 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dbmate";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Database migration tool";
     homepage = "https://github.com/amacneil/dbmate";
     license = licenses.mit;
diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix
index b2599cce430..ae10c402945 100644
--- a/pkgs/development/tools/database/ephemeralpg/default.nix
+++ b/pkgs/development/tools/database/ephemeralpg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, postgresql, getopt, makeWrapper }:
+{ lib, stdenv, fetchurl, postgresql, getopt, makeWrapper }:
 stdenv.mkDerivation rec {
   pname = "ephemeralpg";
   version = "3.1";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     PREFIX=$out make install
-    wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]}
+    wrapProgram $out/bin/pg_tmp --prefix PATH : ${lib.makeBinPath [ postgresql getopt ]}
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Run tests on an isolated, temporary PostgreSQL database";
     license = licenses.isc;
     homepage = "http://ephemeralpg.org/";
diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/development/tools/database/pg_checksums/default.nix
index f440e550a89..65e7c06b140 100644
--- a/pkgs/development/tools/database/pg_checksums/default.nix
+++ b/pkgs/development/tools/database/pg_checksums/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }:
+{ lib, stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }:
 
 stdenv.mkDerivation rec {
   pname = "pg_checksums";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     install -Dm644 -t $out/share/man/man1 doc/man1/pg_checksums.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Activate/deactivate/verify checksums in offline PostgreSQL clusters";
     homepage = "https://github.com/credativ/pg_checksums";
     maintainers = [ maintainers.marsam ];
diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index b4c26d6fb5c..cc7524e3a43 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonApplication
 , fetchPypi
 , isPy3k
@@ -46,9 +46,9 @@ buildPythonApplication rec {
 
   checkInputs = [ pytestCheckHook mock ];
 
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ];
+  disabledTests = lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line interface for PostgreSQL";
     longDescription = ''
       Rich command-line interface for PostgreSQL with auto-completion and
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix
index c86a0f6df8b..119aa2eb8f8 100644
--- a/pkgs/development/tools/database/pyrseas/default.nix
+++ b/pkgs/development/tools/database/pyrseas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ lib, stdenv, pythonPackages, fetchFromGitHub }:
 
 let
   pgdbconn = pythonPackages.buildPythonPackage {
@@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication {
   meta = {
     description = "A declarative language to describe PostgreSQL databases";
     homepage = "https://perseas.github.io/";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ pmeunier ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pmeunier ];
   };
 }
diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix
index ca07a056940..447dbc23fdf 100644
--- a/pkgs/development/tools/database/shmig/default.nix
+++ b/pkgs/development/tools/database/shmig/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimalistic database migration tool with MySQL, PostgreSQL and SQLite support";
     homepage = "https://github.com/mbucc/shmig";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix
index 33b2abce277..2afd004f4d7 100644
--- a/pkgs/development/tools/database/sqlcheck/default.nix
+++ b/pkgs/development/tools/database/sqlcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "sqlcheck";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Automatically identify anti-patterns in SQL queries";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 49cc7b42b3d..6017d704fc1 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
+{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
 
 let
   version = "20.2.0.175.1842";
@@ -65,7 +65,7 @@ in
       --run "cd $out/libexec/sqldeveloper/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Oracle's Oracle DB GUI client";
     longDescription = ''
       Oracle SQL Developer is a free integrated development environment that
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index c773db7509f..5aca6d55bc8 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -1,6 +1,6 @@
 # To enable specific database drivers, override this derivation and pass the
 # driver packages in the drivers argument (e.g. mysql_jdbc, postgresql_jdbc).
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip
+{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip
 , jre
 , drivers ? []
 }:
@@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
     icon = "squirrel-sql";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Universal SQL Client";
     homepage = "http://squirrel-sql.sourceforge.net/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
index a0e05bf4ae5..2b8a6f7cca0 100644
--- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
+++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "timescaledb-parallel-copy";
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bulk, parallel insert of CSV records into PostgreSQL";
     homepage = "https://github.com/timescale/timescaledb-parallel-copy";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix
index 787c7c3131b..cec374ccb3a 100644
--- a/pkgs/development/tools/database/timescaledb-tune/default.nix
+++ b/pkgs/development/tools/database/timescaledb-tune/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "timescaledb-tune";
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for tuning your TimescaleDB for better performance";
     homepage = "https://github.com/timescale/timescaledb-tune";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix
index ec22252cbe0..5de8296299f 100644
--- a/pkgs/development/tools/database/webdis/default.nix
+++ b/pkgs/development/tools/database/webdis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "webdis";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "CONFDIR=${placeholder "out"}/share/webdis"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Redis HTTP interface with JSON output";
     homepage = "https://webd.is/";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index 55f888056cf..9f5f4f0a3b5 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "dcadec";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first."
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DTS Coherent Acoustics decoder with support for HD extensions";
     maintainers = with maintainers; [ edwtjo ];
     homepage = "https://github.com/foo86/dcadec";
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 4a07a05a636..c8e20d42063 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "deis";
@@ -25,7 +25,7 @@ buildGoPackage rec {
     export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://deis.io";
     description = "A command line utility used to interact with the Deis open source PaaS";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix
index a245a06afe1..0f5df40d92c 100644
--- a/pkgs/development/tools/deisctl/default.nix
+++ b/pkgs/development/tools/deisctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "deis";
@@ -19,7 +19,7 @@ buildGoPackage rec {
     export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://deis.io";
     description = "A command-line utility used to provision and operate a Deis cluster";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index e81a1273af8..62fb32c8516 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "delve";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "debugger for the Go programming language";
     homepage = "https://github.com/derekparker/delve";
     maintainers = with maintainers; [ vdemeester ];
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index 8b7c54832e2..ff7f370b0d4 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "dep";
@@ -17,7 +17,7 @@ buildGoPackage rec {
 
   buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/golang/dep";
     description = "Go dependency management tool";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix
index 2d5a38458d3..32f29f7e128 100644
--- a/pkgs/development/tools/devd/default.nix
+++ b/pkgs/development/tools/devd/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, stdenv }:
+{ buildGoPackage, fetchFromGitHub, lib, stdenv }:
 
 buildGoPackage rec {
   pname = "devd";
@@ -11,7 +11,7 @@ buildGoPackage rec {
   };
   goPackagePath = "github.com/cortesi/devd";
   subPackages = [ "cmd/devd" ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A local webserver for developers";
     homepage = "https://github.com/cortesi/devd";
     license = licenses.mit;
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index f881f5c610d..766f3f2b729 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonApplication
 , fetchPypi
 # buildInputs
@@ -49,7 +49,7 @@ buildPythonApplication rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://doc.devpi.net";
     description = "Client for devpi, a pypi index server and packaging meta tool";
     license = licenses.mit;
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 7ddff92402c..3d8cb16bb47 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages, nginx }:
+{ lib, stdenv, fetchFromGitHub, python3Packages, nginx }:
 
 python3Packages.buildPythonApplication rec {
   pname = "devpi-server";
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
     pytestCheckHook
     pytest-flake8
     webtest
-  ] ++ stdenv.lib.optionals isPy27 [ mock ];
+  ] ++ lib.optionals isPy27 [ mock ];
 
   # root_passwd_hash tries to write to store
   # TestMirrorIndexThings tries to write to /var through ngnix
@@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec {
     "TestMirrorIndexThings"
   ];
 
-  meta = with stdenv.lib;{
+  meta = with lib;{
     homepage = "http://doc.devpi.net";
     description = "Github-style pypi index server and packaging meta tool";
     license = licenses.mit;
diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix
index f4a974da347..34fdd2c794e 100644
--- a/pkgs/development/tools/devtodo/default.nix
+++ b/pkgs/development/tools/devtodo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, ncurses }:
+{ lib, stdenv, fetchurl, readline, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "devtodo";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://swapoff.org/devtodo1.html";
     description = "A hierarchical command-line task manager";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix
index a1ae7cfc86e..bd8e71090c5 100644
--- a/pkgs/development/tools/diesel-cli/default.nix
+++ b/pkgs/development/tools/diesel-cli/default.nix
@@ -8,7 +8,7 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq
   "support for at least one database must be enabled";
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString;
   features = ''
     ${optionalString sqliteSupport "sqlite"} \
     ${optionalString postgresqlSupport "postgres"} \
diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index 3cb050df036..07ca12cc9cc 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }:
 
 buildGoModule rec {
   pname = "dive";
@@ -17,11 +17,11 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
+  buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for exploring each layer in a docker image";
     homepage = "https://github.com/wagoodman/dive";
     license = licenses.mit;
diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix
index 781fee2bb26..d553df59446 100644
--- a/pkgs/development/tools/documentation/antora/default.nix
+++ b/pkgs/development/tools/documentation/antora/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, nodePackages }:
+{ lib, stdenv, nodePackages }:
 
 let
   linkNodeDeps = ({ pkg, deps, name ? "" }:
     let
-      targetModule = if name != "" then name else stdenv.lib.getName pkg;
+      targetModule = if name != "" then name else lib.getName pkg;
     in nodePackages.${pkg}.override (oldAttrs: {
       postInstall = ''
         mkdir -p $out/lib/node_modules/${targetModule}/node_modules
-        ${stdenv.lib.concatStringsSep "\n" (map (dep: ''
-          ln -s ${nodePackages.${dep}}/lib/node_modules/${stdenv.lib.getName dep} \
-            $out/lib/node_modules/${targetModule}/node_modules/${stdenv.lib.getName dep}
+        ${lib.concatStringsSep "\n" (map (dep: ''
+          ln -s ${nodePackages.${dep}}/lib/node_modules/${lib.getName dep} \
+            $out/lib/node_modules/${targetModule}/node_modules/${lib.getName dep}
         '') deps
         )}
       '';
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 613dec86d7c..a4a70dabd69 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }:
+{ lib, stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "doxygen";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "doxygen";
     repo = "doxygen";
-    rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
+    rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}";
     sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh";
   };
 
@@ -19,21 +19,21 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-       stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
-    ++ stdenv.lib.optional stdenv.isSunOS libiconv
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
+       lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
+    ++ lib.optional stdenv.isSunOS libiconv
+    ++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
 
   cmakeFlags =
     [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++
-    stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES";
+    lib.optional (qt5 != null) "-Dbuild_wizard=YES";
 
   NIX_CFLAGS_COMPILE =
-    stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
+    lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
 
   enableParallelBuilding = false;
 
   meta = {
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     homepage = "http://doxygen.nl/";
     description = "Source code documentation generator tool";
 
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
       manual (in LaTeX) from a set of documented source files.
     '';
 
-    platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
+    platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index a5bbfbc9088..2e04d3dd365 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
+{ lib, stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
 , python2Packages }:
 
 python2Packages.buildPythonApplication rec {
@@ -8,7 +8,7 @@ python2Packages.buildPythonApplication rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
   };
 
@@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec {
     rm $out/nix-support/propagated-build-inputs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of documentation utilities for the GNOME project";
     homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils";
     license = with licenses; [ gpl2Plus lgpl2Plus ];
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 10b48d51191..b1ea6a0634b 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitLab
 , meson
 , ninja
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec {
     docbook_xml_dtd_43
     docbook_xsl
     libxslt
-  ] ++ stdenv.lib.optionals withDblatex [
+  ] ++ lib.optionals withDblatex [
     dblatex
   ];
 
@@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools to extract documentation embedded in GTK and GNOME source code";
     homepage = "https://www.gtk.org/gtk-doc";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index 5ab74a4b95f..d2e555a4550 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "mdsh";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Markdown shell pre-processor";
     homepage = "https://github.com/zimbatm/mdsh";
     license = with licenses; [ mit ];
diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index f3b66394207..bee22856eb1 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -35,7 +35,7 @@ buildPythonApplication rec {
     backports_tempfile
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Project documentation with Markdown / static website generator";
     longDescription = ''
       MkDocs is a fast, simple and downright gorgeous static site generator that's
diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix
index 9ff3001882c..b156847870d 100644
--- a/pkgs/development/tools/dot-http/default.nix
+++ b/pkgs/development/tools/dot-http/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
     libiconv Security
   ];
 
diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix
index b4edf8ec081..2724e41e8e6 100644
--- a/pkgs/development/tools/drip/default.nix
+++ b/pkgs/development/tools/drip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, jdk8, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "drip";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";
     license = licenses.epl10;
     homepage = "https://github.com/ninjudd/drip";
diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix
index c64ab8534da..86d55ab0780 100644
--- a/pkgs/development/tools/drm_info/default.nix
+++ b/pkgs/development/tools/drm_info/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , libdrm, json_c, pciutils
 , meson, ninja, pkg-config
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ libdrm json_c pciutils ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small utility to dump info about DRM devices";
     homepage = "https://github.com/ascent12/drm_info";
     license = licenses.mit;
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index fabd2b2f775..1c1604db654 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
       $makeCmd INSTALL_DIR=$out install
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Ancillary tools for the D programming language compiler";
     homepage = "https://github.com/dlang/tools";
     license = lib.licenses.boost;
     maintainers = with maintainers; [ ThomasMader ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index ef99bbd01c3..a458f0dbfce 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "easyjson";
@@ -12,7 +12,7 @@ buildGoPackage {
     sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mailru/easyjson";
     description = "Fast JSON serializer for golang";
     license = licenses.mit;
diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix
index 025b7413ceb..633e13d25f7 100644
--- a/pkgs/development/tools/eclipse-mat/default.nix
+++ b/pkgs/development/tools/eclipse-mat/default.nix
@@ -62,13 +62,13 @@ stdenv.mkDerivation rec {
     libCairo=$out/eclipse/libcairo-swt.so
     patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer
     [ -f $libCairo ] && patchelf --set-rpath ${
-      stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]
+      lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]
     } $libCairo
 
     # Create wrapper script.  Pass -configuration to store settings in ~/.eclipse-mat/<version>
     makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \
       --prefix PATH : ${jdk}/bin \
-      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
       --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration"
 
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 966f307e0da..282705094f2 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , libXScrnSaver
 , makeWrapper
 , fetchurl
diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix
index 6d0dbc8cace..e29064e673a 100644
--- a/pkgs/development/tools/electron/generic.nix
+++ b/pkgs/development/tools/electron/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , libXScrnSaver
 , makeWrapper
 , fetchurl
@@ -20,7 +20,7 @@ version: hashes:
 let
   name = "electron-${version}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cross platform desktop application shell";
     homepage = "https://github.com/electron/electron";
     license = licenses.mit;
@@ -56,7 +56,7 @@ let
     passthru.headers = headersFetcher version hashes.headers;
   };
 
-  electronLibPath = with stdenv.lib; makeLibraryPath (
+  electronLibPath = with lib; makeLibraryPath (
     [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
     ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
     ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
@@ -89,7 +89,7 @@ let
         $out/lib/electron/electron
 
       wrapProgram $out/lib/electron/electron \
-        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
+        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
         "''${gappsWrapperArgs[@]}"
     '';
   };
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index f9d63cc86d8..44ed61ac1d5 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang
+{ lib, stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang
 , z3, python }:
 
 stdenv.mkDerivation rec {
@@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A concolic testing tool for the Erlang functional programming language";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
     homepage = "https://github.com/aggelgian/cuter";
-    maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with lib.maintainers; [ ericbmerritt ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index 6a23f84f236..ef3298c5478 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
 
 buildGoPackage rec {
   pname = "fac";
@@ -25,7 +25,7 @@ buildGoPackage rec {
     install -D go/src/${goPackagePath}/assets/doc/fac.1 $out/share/man/man1/fac.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "CUI for fixing git conflicts";
     inherit (src.meta) homepage;
     license = licenses.mit;
diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
index 4fbecc2d58d..285e71707fd 100644
--- a/pkgs/development/tools/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
+{ lib, stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
 
 let
   fedora_cert = buildPythonPackage rec {
@@ -26,7 +26,7 @@ in buildPythonApplication rec {
   patches = [ ./fix-paths.patch ];
   propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Subclass of the rpkg project for dealing with rpm packaging";
     homepage = "https://pagure.io/fedpkg";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix
index 23ada99eac0..3a64d741de5 100644
--- a/pkgs/development/tools/flamegraph/default.nix
+++ b/pkgs/development/tools/flamegraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
   pname = "FlameGraph";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = with licenses; [ asl20 cddl gpl2Plus ];
     homepage = "http://www.brendangregg.com/flamegraphs.html";
     description = "Visualization for profiled code";
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index beafe0654db..dd9282c6896 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , substituteAll
 , nixosTests
@@ -145,7 +145,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to build flatpaks from source";
     homepage = "https://github.com/flatpak/flatpak-builder";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix
index 2b8f174f763..4867b9c2cb9 100644
--- a/pkgs/development/tools/flootty/default.nix
+++ b/pkgs/development/tools/flootty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages }:
+{ lib, stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "Flootty";
@@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session";
     homepage = "https://floobits.com/help/flootty";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index af58da17510..bcad4ffb4e9 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre_headless, makeWrapper }:
+{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
   let
     version = "7.3.1";
   in
@@ -22,7 +22,7 @@
           --add-flags "org.flywaydb.commandline.Main" \
           --add-flags "-jarDirs='$out/share/flyway/jars'"
       '';
-      meta = with stdenv.lib; {
+      meta = with lib; {
         description = "Evolve your Database Schema easily and reliably across all your instances";
         longDescription = ''
           The Flyway command-line tool is a standalone Flyway distribution.
diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix
index 46a13238961..e6bb2032741 100644
--- a/pkgs/development/tools/fmbt/default.nix
+++ b/pkgs/development/tools/fmbt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
+{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
 , flex
 , gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz
 , tesseract, gts, libXtst
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages"
     export PATH="$PATH:$out/bin"
-    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [libXtst]}"
+    export LD_LIBRARY_PATH="${lib.makeLibraryPath [libXtst]}"
   '';
 
   postInstall = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Free Model-Based Testing tool";
     homepage = "https://github.com/intel/fMBT";
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix
index 077dc8b87f9..08cf6caae3e 100644
--- a/pkgs/development/tools/fusee-launcher/default.nix
+++ b/pkgs/development/tools/fusee-launcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python3Packages
 , python3
 , fetchFromGitHub
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   buildInputs = [ python3 python3Packages.pyusb ];
   pythonPath = with python3Packages; [ pyusb ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/Cease-and-DeSwitch/fusee-launcher";
     description = "Work-in-progress launcher for one of the Tegra X1 bootROM exploits";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
index 89d6b700018..00831c05691 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/pkgs/development/tools/galen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre8, unzip }:
+{ lib, stdenv, fetchurl, jre8, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "galen";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   cp galen.jar $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://galenframework.com";
     description = "Automated layout testing for websites";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix
index 7c31f691b4e..2f7c088cd48 100644
--- a/pkgs/development/tools/gamecube-tools/default.nix
+++ b/pkgs/development/tools/gamecube-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
 , freeimage, libGL }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for gamecube/wii projects";
     homepage = "https://github.com/devkitPro/gamecube-tools/";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index dd48998c741..a0eb7370bee 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gauge";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "02yrk4d5mm4j2grlhqkf4grxawx91kd2vhdn7k5wd2dl6wsnlgcl";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Light weight cross-platform test automation";
    homepage    = "https://gauge.org";
    license     = licenses.gpl3;
diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix
index 2f26a1c35f8..7c7f73af1e0 100644
--- a/pkgs/development/tools/gdm/default.nix
+++ b/pkgs/development/tools/gdm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gdm";
@@ -15,7 +15,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimalist dependency manager for Go written in Go";
     homepage = "https://github.com/sparrc/gdm";
     license = licenses.unlicense;
diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index 0c107ecc503..25295ad0062 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pandoc, man }:
+{ lib, stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
   pname = "git-ftp";
   version = "1.6.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [pandoc man];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Git powered FTP client written as shell script";
     homepage = "https://git-ftp.github.io/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index 2b775de4e43..ed9205ee251 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , makeWrapper
 , coreutils
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     let
-      path = stdenv.lib.makeBinPath [
+      path = lib.makeBinPath [
         coreutils
         gawk
         git
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       wrapProgram $out/bin/git-quick-stats --suffix PATH : ${path}
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/arzzen/git-quick-stats";
     description = "A simple and efficient way to access various statistics in git repository";
     platforms = platforms.all;
diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 004125adead..4f13c3de40b 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform
+{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform
 , openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2
 }:
 
@@ -43,7 +43,7 @@ buildRustPackage rec {
     install -D "$src/git-series.1" "$out/man/man1/git-series.1"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to help with formatting git patches for review on mailing lists";
     longDescription = ''
           git series tracks changes to a patch series over time. git
diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index 5eb65dc4fbd..dfe66c789ca 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
+{ lib, stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
 
 buildPythonApplication rec {
   pname = "cligh";
@@ -15,7 +15,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ pyxdg PyGithub ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://the-brannons.com/software/cligh.html";
     description = "A simple command-line interface to the facilities of Github";
     longDescription = ''
diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix
index 8b68426d4b5..81b125ac058 100644
--- a/pkgs/development/tools/github/github-release/default.nix
+++ b/pkgs/development/tools/github/github-release/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, system, fetchurl }:
+{ lib, stdenv, system, fetchurl }:
 
 let
   linuxPredicate = system == "x86_64-linux";
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
     cp "${metadata.archiveBinaryPath}/github-release" "$out/bin/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Commandline app to create and edit releases on Github (and upload artifacts)";
     longDescription = ''
       A small commandline app written in Go that allows you to easily create and
diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix
index 0e3cdf4bda1..d77772c32db 100644
--- a/pkgs/development/tools/glade/default.nix
+++ b/pkgs/development/tools/glade/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   version = "3.38.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q";
   };
 
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index 4f511813ad0..f8abde7e00a 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "glide";
@@ -18,7 +18,7 @@ buildGoPackage rec {
     sha256 = "1wskg1cxqy9sp0738qiiagdw09dbs3swxsk4z6w5hsfiq2h44a54";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://glide.sh";
     description = "Package management for Go";
     license = licenses.mit;
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index efa7ae21c3a..f2c552252fb 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gllvm";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/SRI-CSL/gllvm";
     description = "Whole Program LLVM: wllvm ported to go";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix
index 0ffa521f38f..c00478c9fb6 100644
--- a/pkgs/development/tools/glock/default.nix
+++ b/pkgs/development/tools/glock/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "glock";
-  version = "20160816-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20160816-${lib.strings.substring 0 7 rev}";
   rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276";
 
   goPackagePath = "github.com/robfig/glock";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/robfig/glock";
     description = "A command-line tool to lock Go dependencies to specific revisions";
     license = licenses.mit;
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index 76c75af2d5f..3f83e1fcb02 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage
+{ lib, stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage
 , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
 , libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook
 , Cocoa
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     libXext libXrender libXinerama libXcursor libXxf86vm
     libXi libX11
   ] ++ (with python3Packages; [ python setuptools wrapPython ])
-    ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+    ++ lib.optional stdenv.isDarwin Cocoa;
   pythonPath = with python3Packages; [ pyyaml requests ];
 
   # Makefile has /usr/local/bin hard-coded for 'make install'
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Live GLSL coding renderer";
     homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix
index f63a46793a3..5f01881958f 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , glib
 , autoreconfHook
 , pkg-config
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNOME test runner for installed tests";
     homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index 81e4d879375..2a2ce1b190f 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   pname = "gnulib";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.gnu.org/software/gnulib/";
     description = "Central location for code to be shared among GNU packages";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix
index 30344a52e06..57d0e93a9b0 100644
--- a/pkgs/development/tools/go-bindata-assetfs/default.nix
+++ b/pkgs/development/tools/go-bindata-assetfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-bindata-assetfs";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Serve embedded files from jteeuwen/go-bindata";
     license = licenses.bsd2;
     maintainers = with maintainers; [ avnik ];
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index 9256fab43bf..5d257bbf998 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "go-bindata";
@@ -15,7 +15,7 @@ buildGoPackage {
 
   excludedPackages = "testdata";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jteeuwen/go-bindata";
     description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program";
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix
index c6a0dcc0d9d..fdefd6b0178 100644
--- a/pkgs/development/tools/go-langserver/default.nix
+++ b/pkgs/development/tools/go-langserver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-langserver";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Go language server protocol server";
     homepage = "https://github.com/sourcegraph/go-langserver";
     license = licenses.mit;
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix
index f10ee426c08..d30d5c30f3a 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-outline";
@@ -18,7 +18,7 @@ buildGoPackage rec {
   meta = {
     description = "Utility to extract JSON representation of declarations from a Go source file";
     homepage = "https://github.com/ramya-rao-a/go-outline";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index c5e9af3e7bb..0187552d844 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "go-protobuf";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "https://github.com/golang/protobuf";
     description = " Go bindings for protocol buffer";
     maintainers = with maintainers; [ lewo ];
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index 3392a19b636..25fc87f8985 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "go-repo-root";
-  version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20140911-${lib.strings.substring 0 7 rev}";
   rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
 
   goPackagePath = "github.com/cstrahan/go-repo-root";
diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix
index 1e2b63ba154..3f41007716e 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-symbols";
@@ -17,7 +17,7 @@ buildGoPackage rec {
   meta = {
     description = "A utility for extracting a JSON representation of the package symbols from a go source tree";
     homepage = "https://github.com/acroca/go-symbols";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 300f82ee548..618ddc7d450 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
+{ lib, stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
   fetchFromGitHub }:
 
 buildGoPackage rec {
@@ -36,7 +36,7 @@ buildGoPackage rec {
 
   doCheck = false; # tries to access the net
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Go apps packaging for Nix";
     homepage = "https://github.com/kamilchm/go2nix";
     license = licenses.mit;
diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index 6a373099a01..63322b6d363 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "goa";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://goa.design";
     description = "A framework for building microservices in Go using a unique design-first approach";
     license = licenses.mit;
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index 01ee2931c99..59f17e8acfd 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gocode-gomod";
@@ -24,7 +24,7 @@ buildGoModule rec {
     mv $out/bin/gocode $out/bin/gocode-gomod
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An autocompletion daemon for the Go programming language";
     longDescription = ''
       Gocode is a helper tool which is intended to be integrated with your
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index f38d06b34c6..a50c5969167 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gocode-unstable";
@@ -23,7 +23,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An autocompletion daemon for the Go programming language";
     longDescription = ''
       Gocode is a helper tool which is intended to be integrated with your
diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix
index 173da3ff29d..dcec045e5eb 100644
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/pkgs/development/tools/goconvey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "goconvey";
@@ -19,7 +19,7 @@ buildGoPackage rec {
   meta = {
     description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go";
     homepage = "https://github.com/smartystreets/goconvey";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index c8149ecc82d..6d4f40ba6bc 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "godef";
@@ -21,7 +21,7 @@ buildGoModule rec {
   meta = {
     description = "Print where symbols are defined in Go source code";
     homepage = "https://github.com/rogpeppe/godef/";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ];
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vdemeester rvolosatovs ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 303040768c7..217717d3e7d 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -61,8 +61,8 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage    = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
-    license     = stdenv.lib.licenses.mit;
+    license     = lib.licenses.mit;
     platforms   = [ "i686-linux" "x86_64-linux" ];
-    maintainers = [ stdenv.lib.maintainers.twey ];
+    maintainers = [ lib.maintainers.twey ];
   };
 }
diff --git a/pkgs/development/tools/godot/headless.nix b/pkgs/development/tools/godot/headless.nix
index 0ae28b774fb..20d3b48f2fd 100644
--- a/pkgs/development/tools/godot/headless.nix
+++ b/pkgs/development/tools/godot/headless.nix
@@ -1,4 +1,4 @@
-{ godot, stdenv }:
+{ godot, lib, stdenv }:
 godot.overrideAttrs (oldAttrs: rec {
   pname = "godot-headless";
   sconsFlags = "target=release_debug platform=server tools=yes";
@@ -14,5 +14,5 @@ godot.overrideAttrs (oldAttrs: rec {
   '';
   meta.description =
     "Free and Open Source 2D and 3D game engine (headless build)";
-  meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ];
+  meta.maintainers = with lib.maintainers; [ twey yusdacra ];
 })
diff --git a/pkgs/development/tools/godot/server.nix b/pkgs/development/tools/godot/server.nix
index 48f21b796c3..6ce347355e3 100644
--- a/pkgs/development/tools/godot/server.nix
+++ b/pkgs/development/tools/godot/server.nix
@@ -1,4 +1,4 @@
-{ godot, stdenv }:
+{ godot, lib, stdenv }:
 godot.overrideAttrs (oldAttrs: rec {
   pname = "godot-server";
   sconsFlags = "target=release platform=server tools=no";
@@ -14,5 +14,5 @@ godot.overrideAttrs (oldAttrs: rec {
   '';
   meta.description =
     "Free and Open Source 2D and 3D game engine (server build)";
-  meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ];
+  meta.maintainers = with lib.maintainers; [ twey yusdacra ];
 })
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 284bb32f89e..1f75384f338 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "lint";
-  version = "20181026-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20181026-${lib.strings.substring 0 7 rev}";
   rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
 
   goPackagePath = "golang.org/x/lint";
@@ -20,7 +20,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://golang.org";
     description = "Linter for Go source code";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index 70bbc635cc1..650f1b89f30 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gomodifytags";
@@ -18,7 +18,7 @@ buildGoModule rec {
   meta = {
     description = "Go tool to modify struct field tags";
     homepage = "https://github.com/fatih/gomodifytags";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index 485b2c3625f..4d572e070e7 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, python3Packages, makeWrapper }:
+{ lib, stdenv, fetchzip, python3Packages, makeWrapper }:
 
 with python3Packages;
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Google App Engine SDK for Go";
     version = version;
     homepage = "https://cloud.google.com/appengine/docs/go/";
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index 8d26ca7eb44..e4a72cb27a1 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gopkgs";
@@ -20,7 +20,7 @@ buildGoModule rec {
   meta = {
     description = "Tool to get list available Go packages";
     homepage = "https://github.com/uudashr/gopkgs";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index 44862bb3311..69d74496e61 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gosec";
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/securego/gosec";
     description = "Golang security checker";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index 5499a22ec01..ea40bd0e6fe 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "gotags";
-  version = "20150803-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20150803-${lib.strings.substring 0 7 rev}";
   rev = "be986a34e20634775ac73e11a5b55916085c48e7";
 
   goPackagePath = "github.com/jstemmer/gotags";
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index 43f221bd324..87a93abee8e 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gotests";
@@ -19,7 +19,7 @@ buildGoPackage rec {
   meta = {
     description = "Generate Go tests from your source code";
     homepage = "https://github.com/cweill/gotests";
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ vdemeester ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index eabf41f8663..7ca3486a503 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchgit }:
+{ lib, stdenv, buildGoModule, fetchgit }:
 
 buildGoModule rec {
   pname = "gotools-unstable";
@@ -40,7 +40,7 @@ buildGoModule rec {
   '';
 
   excludedPackages = "\\("
-    + stdenv.lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ])
+    + lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ])
     + "\\)";
 
   # Set GOTOOLDIR for derivations adding this to buildInputs
diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix
index 804a9bf043e..edd9b577be4 100644
--- a/pkgs/development/tools/govendor/default.nix
+++ b/pkgs/development/tools/govendor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "govendor";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kardianos/govendor";
     description = "Go vendor tool that works with the standard vendor file";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index ebce368ea9f..cac76daa6fc 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "govers";
-  version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20160623-${lib.strings.substring 0 7 rev}";
   rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
 
   goPackagePath = "github.com/rogpeppe/govers";
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 34e7d338318..3deb73acb44 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gox";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mitchellh/gox";
     description = "A dead simple, no frills Go cross compile tool";
     license = licenses.mpl20;
diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix
index ee15df1a9f6..9e49b0c0284 100644
--- a/pkgs/development/tools/gpp/default.nix
+++ b/pkgs/development/tools/gpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation {
   pname = "gpp";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   installCheckPhase = "$out/bin/gpp --help";
   doInstallCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "General-purpose preprocessor with customizable syntax";
     homepage = "https://logological.org/gpp";
     license = licenses.lgpl3;
diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix
index e0d2d3d1498..6d182b0b5f5 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/pkgs/development/tools/gron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gron";
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Make JSON greppable!";
     longDescription = ''
       gron transforms JSON into discrete assignments to make it easier to grep
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index 33572c70b13..6bb80306e68 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, guile-lib, libffi, pkg-config, glib }:
+{ fetchurl, lib, stdenv, guile, guile-lib, libffi, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
   pname = "g-wrap";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A wrapper generator for Guile";
     longDescription = ''
       G-Wrap is a tool (and Guile library) for generating function wrappers for
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index b8efb30f5f1..6de9e48ae66 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guile }:
+{ lib, stdenv, fetchurl, guile }:
 
 stdenv.mkDerivation rec {
   pname = "guile-lint";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Checks syntax and semantics in a Guile program or module";
     homepage = "https://user42.tuxfamily.org/guile-lint/index.html";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
index 4d7dca12f8f..02c4c96bd8e 100644
--- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
+++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
@@ -1,5 +1,5 @@
 { mkDerivation, base, containers, fetchgit, hedgehog
-, optparse-applicative, parsec, stdenv, template-haskell, text
+, optparse-applicative, parsec, lib, stdenv, template-haskell, text
 }:
 mkDerivation {
   pname = "dconf2nix";
@@ -20,5 +20,5 @@ mkDerivation {
     base containers hedgehog parsec template-haskell text
   ];
   description = "Convert dconf files to Nix, as expected by Home Manager";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix
index 44cd234da72..512aec84eea 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix
@@ -7,7 +7,7 @@
 , hls-tactics-plugin, hslogger, hspec, hspec-core
 , hspec-expectations, lens, lsp-test, mtl, optparse-applicative
 , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
-, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
+, shake, lib, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
 , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
 , temporary, text, transformers, unordered-containers, with-utf8
 , yaml
@@ -49,5 +49,5 @@ mkDerivation {
   testToolDepends = [ ghcide ];
   homepage = "https://github.com/haskell/haskell-language-server#readme";
   description = "LSP server for GHC";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
index 86c29c7be39..c5168934390 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, containers, fetchgit, ghc
 , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake
-, stdenv, text, transformers, unordered-containers
+, lib, stdenv, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-class-plugin";
@@ -17,5 +17,5 @@ mkDerivation {
     hls-plugin-api lens shake text transformers unordered-containers
   ];
   description = "Explicit imports plugin for Haskell Language Server";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
index 20ebc5f5e89..b5774ddcbfd 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
@@ -2,7 +2,7 @@
 , extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
 , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api
 , parser-combinators, pretty-simple, QuickCheck, safe-exceptions
-, shake, stdenv, temporary, text, time, transformers
+, shake, lib, stdenv, temporary, text, time, transformers
 , unordered-containers
 }:
 mkDerivation {
@@ -23,5 +23,5 @@ mkDerivation {
     unordered-containers
   ];
   description = "Eval plugin for Haskell Language Server";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
index bad0e82194c..1c7d31004b6 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc
-, ghcide, haskell-lsp-types, hls-plugin-api, shake, stdenv, text
+, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, stdenv, text
 , unordered-containers
 }:
 mkDerivation {
@@ -17,5 +17,5 @@ mkDerivation {
     hls-plugin-api shake text unordered-containers
   ];
   description = "Explicit imports plugin for Haskell Language Server";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
index ecbe141fd72..4a90933d1e7 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
@@ -2,7 +2,7 @@
 , containers, data-default, deepseq, Diff, directory, extra
 , fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide
 , hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens
-, regex-tdfa, shake, stdenv, temporary, text, transformers
+, regex-tdfa, shake, lib, stdenv, temporary, text, transformers
 , unordered-containers
 }:
 mkDerivation {
@@ -22,5 +22,5 @@ mkDerivation {
     regex-tdfa shake temporary text transformers unordered-containers
   ];
   description = "Hlint integration plugin with Haskell Language Server";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
index 5a769e7a719..311a26633a5 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, containers, deepseq, directory, extra
 , fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
-, hls-plugin-api, retrie, safe-exceptions, shake, stdenv, text
+, hls-plugin-api, retrie, safe-exceptions, shake, lib, stdenv, text
 , transformers, unordered-containers
 }:
 mkDerivation {
@@ -19,5 +19,5 @@ mkDerivation {
     shake text transformers unordered-containers
   ];
   description = "Retrie integration plugin for Haskell Language Server";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
index b5819b705b6..4f476431d9b 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
@@ -2,7 +2,7 @@
 , directory, extra, fetchgit, filepath, fingertree, generic-lens
 , ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
 , haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover
-, lens, mtl, QuickCheck, refinery, retrie, shake, stdenv, syb, text
+, lens, mtl, QuickCheck, refinery, retrie, shake, lib, stdenv, syb, text
 , transformers
 }:
 mkDerivation {
@@ -28,5 +28,5 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   description = "Tactics plugin for Haskell Language Server";
   license = "unknown";
-  hydraPlatforms = stdenv.lib.platforms.none;
+  hydraPlatforms = lib.platforms.none;
 }
diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
index df889d43d46..6b139904616 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, jshon, electron_3
+{ lib, stdenv, fetchFromGitHub, jshon, electron_3
 , runtimeShell, hyper-haskell-server, extra-packages ? [] }:
 
 let
-  binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
+  binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
   electron = electron_3;
 in stdenv.mkDerivation rec {
   pname = "hyper-haskell";
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     chmod 755 $out/bin/hyper-haskell
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The strongly hyped graphical interpreter for the Haskell programming language";
     homepage = "https://github.com/HeinrichApfelmus/hyper-haskell";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 60f8c2ecb25..875d5a8a4a8 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }:
+{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }:
 let
   ihaskellEnv = ghcWithPackages (self: [
     self.ihaskell
@@ -9,7 +9,7 @@ let
   ihaskellSh = writeScriptBin "ihaskell-notebook" ''
     #! ${stdenv.shell}
     export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
-    export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH"
+    export PATH="${lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH"
     ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
   '';
 in
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index 1d901cb723c..42cf3322420 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, async, base, bytestring, connection, containers
 , directory, hpack, hspec, hspec-discover, hspec-expectations
 , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl
-, optparse-applicative, parser-combinators, retry, stdenv, text
+, optparse-applicative, parser-combinators, retry, lib, stdenv, text
 , unix, unordered-containers, utf8-string, fetchzip, dotenv
 }:
 mkDerivation rec {
@@ -37,6 +37,6 @@ mkDerivation rec {
   preConfigure = "hpack";
   homepage = "https://github.com/channable/vaultenv#readme";
   description = "Runs processes with secrets from HashiCorp Vault";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ lnl7 manveru ];
+  license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ lnl7 manveru ];
 }
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index edaaa9c3a68..5c4fe48f60f 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "hcloud";
@@ -29,7 +29,7 @@ buildGoModule rec {
   meta = {
     description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
     homepage = "https://github.com/hetznercloud/cli";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.zauberpony ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.zauberpony ];
   };
 }
diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix
index 116e7c3a5ce..5b3fca815e6 100644
--- a/pkgs/development/tools/hexio/default.nix
+++ b/pkgs/development/tools/hexio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, pcsclite, pth }:
+{ lib, stdenv, fetchFromGitHub, python, pcsclite, pth }:
 
 stdenv.mkDerivation rec {
   pname = "hexio";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace Makefile \
-      --replace '-I/usr/local/include/PCSC/' '-I${stdenv.lib.getDev pcsclite}/include/PCSC/' \
+      --replace '-I/usr/local/include/PCSC/' '-I${lib.getDev pcsclite}/include/PCSC/' \
       --replace '-L/usr/local/lib/pth' '-I${pth}/lib/'
     '';
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     make DESTDIR=$out PREFIX=/ install
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on";
     homepage = "https://github.com/vanrein/hexio";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix
index f36e2e48fdf..0fc1dcfbae0 100644
--- a/pkgs/development/tools/iaca/2.1.nix
+++ b/pkgs/development/tools/iaca/2.1.nix
@@ -1,5 +1,5 @@
-{ stdenv, makeWrapper, requireFile, gcc, unzip }:
-with stdenv.lib;
+{ lib, stdenv, makeWrapper, requireFile, gcc, unzip }:
+with lib;
 
 # v2.1: last version with NHM/WSM arch support
 stdenv.mkDerivation {
diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix
index f03f5354422..731b6431717 100644
--- a/pkgs/development/tools/iaca/3.0.nix
+++ b/pkgs/development/tools/iaca/3.0.nix
@@ -1,5 +1,5 @@
-{ stdenv, requireFile, unzip }:
-with stdenv.lib;
+{ lib, stdenv, requireFile, unzip }:
+with lib;
 
 stdenv.mkDerivation {
   name = "iaca-3.0";
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 5b07f982aac..2644821529b 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , pkg-config, libftdi1
 , python3, pypy3
 
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
       creating bitstream files.
     '';
     homepage    = "http://www.clifford.at/icestorm/";
-    license     = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ];
-    platforms   = stdenv.lib.platforms.all;
+    license     = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ shell thoughtpolice emily ];
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix
index 8e549b54f1f..13c4cbe37db 100644
--- a/pkgs/development/tools/icr/default.nix
+++ b/pkgs/development/tools/icr/default.nix
@@ -26,7 +26,7 @@ crystal.buildCrystalPackage rec {
       --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interactive console for the Crystal programming language";
     homepage = "https://github.com/crystal-community/icr";
     license = licenses.mit;
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index edba0d686db..ad729923d67 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pcre } :
+{ lib, stdenv, fetchFromGitHub, pcre } :
 
 stdenv.mkDerivation {
   pname = "imatix_gsl";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   preBuild = "cd src";
   installFlags = [ "DESTDIR=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl3Plus;
     homepage = "https://github.com/imatix/gsl/";
     description = "A universal code generator";
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index cc56b27ca2d..2f8afb176e6 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, llvmPackages, irony }:
+{ lib, stdenv, cmake, llvmPackages, irony }:
 
 stdenv.mkDerivation {
   pname = "irony-server";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The server part of irony";
     homepage = "https://melpa.org/#/irony";
     maintainers = [ maintainers.deepfire ];
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index ce1501fa4dd..35ac0dbc6a5 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchurl, jre }:
+{ lib, stdenv, makeWrapper, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
   pname = "cfr";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Another java decompiler";
     longDescription = ''
       CFR will decompile modern Java features - Java 8 lambdas (pre and post
diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/development/tools/java/dex2jar/default.nix
index c1f7f132985..b20a80355a0 100644
--- a/pkgs/development/tools/java/dex2jar/default.nix
+++ b/pkgs/development/tools/java/dex2jar/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://sourceforge.net/projects/dex2jar/;
     description = "Tools to work with android .dex and java .class files";
     maintainers = with maintainers; [ makefu ];
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix
index 04fe7c2f46d..52211e302dd 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/pkgs/development/tools/java/fastjar/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib }:
+{ fetchurl, lib, stdenv, zlib }:
 
 let version = "0.98"; in
   stdenv.mkDerivation {
@@ -25,8 +25,8 @@ let version = "0.98"; in
 
       homepage = "https://savannah.nongnu.org/projects/fastjar/";
 
-      license = stdenv.lib.licenses.gpl2Plus;
-      platforms = stdenv.lib.platforms.linux;
+      license = lib.licenses.gpl2Plus;
+      platforms = lib.platforms.linux;
       maintainers = [ ];
     };
   }
diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
index 1b235e35485..c2d1a33a49d 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
   pname = "jhiccup";
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Measure JVM application stalls and GC pauses";
     homepage    = "https://www.azul.com/jhiccup/";
-    license     = stdenv.lib.licenses.cc0;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+    license     = lib.licenses.cc0;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 4c0ec3bc29d..52ccc3d9150 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     cp -r . $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A visual interface for viewing information about Java applications";
     longDescription = ''
       VisualVM is a visual tool integrating several commandline JDK
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 44d537f9762..97d1c753682 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, makeWrapper, jre }:
+{ lib, stdenv, fetchzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   version = "2.6.5";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Java based, open source, static site/blog generator for developers & designers";
     homepage = "https://jbake.org/";
     license = licenses.mit;
diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix
index 11f22fbef3f..b161b1d137c 100644
--- a/pkgs/development/tools/jbang/default.nix
+++ b/pkgs/development/tools/jbang/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     $out/bin/jbang --version 2>&1 | grep -q "${version}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Run java as scripts anywhere";
     longDescription = ''
       jbang uses the java language to build scripts similar to groovy scripts. Dependencies are automatically
diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix
index b03fd7a0028..772e2802ff5 100644
--- a/pkgs/development/tools/jd/default.nix
+++ b/pkgs/development/tools/jd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "jd";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interactive JSON Editor";
     license = licenses.mit;
     maintainers = [ maintainers.np ];
diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix
index e6eef68ec6c..5e4e3df6942 100644
--- a/pkgs/development/tools/jid/default.nix
+++ b/pkgs/development/tools/jid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jid";
@@ -18,7 +18,7 @@ buildGoPackage rec {
   meta = {
     description = "A command-line tool to incrementally drill down JSON";
     homepage = "https://github.com/simeji/jid";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ stesie ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ stesie ];
   };
 }
diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix
index 4040debf15e..7b7647da033 100644
--- a/pkgs/development/tools/jira_cli/default.nix
+++ b/pkgs/development/tools/jira_cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, libffi, openssl, python3Packages }:
+{ lib, stdenv, libffi, openssl, python3Packages }:
 let
   inherit (python3Packages) fetchPypi buildPythonApplication vcrpy mock hiro;
 in
@@ -23,7 +23,7 @@ in
       jira  keyrings-alt
     ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "A command line interface to Jira";
       homepage = "https://github.com/alisaifee/jira-cli";
       maintainers = with maintainers; [ nyarly ];
diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix
index 9a1314a6083..e0bf896c149 100644
--- a/pkgs/development/tools/jl/default.nix
+++ b/pkgs/development/tools/jl/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, fetchFromGitHub, fetchpatch
 , aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra
-, containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv
+, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib, stdenv
 , text, unordered-containers, vector
 }:
 mkDerivation rec {
@@ -30,8 +30,8 @@ mkDerivation rec {
     aeson aeson-pretty base bytestring conduit conduit-extra containers
     mtl optparse-simple text vector
   ];
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
   description = "Functional sed for JSON";
-  maintainers = with stdenv.lib.maintainers; [ fgaz ];
+  maintainers = with lib.maintainers; [ fgaz ];
   homepage = "https://github.com/chrisdone/jl";
 }
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
index 5414c51a00c..f5a7092e60f 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jmespath";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     repo = "go-jmespath";
     sha256 = "0f4j0m44limnjd6q5fk152g6jq2a5cshcdms4p3a1br8pl9wp5fb";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A JMESPath implementation in Go";
     homepage = "https://github.com/jmespath/go-jmespath";
     maintainers = with maintainers; [ cransom ];
diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix
index c3553a5b501..653867956ff 100644
--- a/pkgs/development/tools/jo/default.nix
+++ b/pkgs/development/tools/jo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}:
+{lib, stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}:
 
 stdenv.mkDerivation rec {
   pname = "jo";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pandoc pkg-config ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A small utility to create JSON objects";
     homepage = "https://github.com/jpmens/jo";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index f05c788dabe..d8d703feed3 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jp";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     repo = "jp";
     sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi";
   };
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A command line interface to the JMESPath expression language for JSON";
     homepage = "https://github.com/jmespath/jp";
     maintainers = with maintainers; [ cransom ];
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index 63c7e01a4b8..e8fe27aae09 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, nixosTests, fetchurl, oniguruma }:
+{ lib, stdenv, nixosTests, fetchurl, oniguruma }:
 
 stdenv.mkDerivation rec {
   pname = "jq";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "--mandir=\${man}/share/man"
   ]
   # jq is linked to libjq:
-    ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
+    ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
 
   doInstallCheck = true;
   installCheckTarget = "check";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) jq; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A lightweight and flexible command-line JSON processor";
     license = licenses.mit;
     maintainers = with maintainers; [ raskin globin ];
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index 05b2b50f26f..bbdd1bd016d 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "just";
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
   # Skip "choose" when running "cargo test", since this test case needs "fzf".
   checkFlags = [ "--skip=choose" "--skip=edit" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A handy way to save and run project-specific commands";
     homepage = "https://github.com/casey/just";
     license = licenses.cc0;
diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix
index 35972f9cce5..6eb99291f8f 100644
--- a/pkgs/development/tools/k6/default.nix
+++ b/pkgs/development/tools/k6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "k6";
@@ -15,7 +15,7 @@ buildGoPackage rec {
 
   subPackages = [ "./" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A modern load testing tool, using Go and JavaScript";
     homepage = "https://k6.io/";
     changelog = "https://github.com/loadimpact/k6/releases/tag/v${version}";
diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix
index 01323281dfe..e297de7a0db 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/pkgs/development/tools/kafkacat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }:
 
 stdenv.mkDerivation rec {
   pname = "kafkacat";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     patchShebangs ./configure
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A generic non-JVM producer and consumer for Apache Kafka";
     homepage = "https://github.com/edenhill/kafkacat";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index 55f0a0e9f30..edde4131a0d 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
 
-with stdenv.lib;
+with lib;
 
 buildGoModule rec {
   pname = "kind";
@@ -31,7 +31,7 @@ buildGoModule rec {
     description = "Kubernetes IN Docker - local clusters for testing Kubernetes";
     homepage    = "https://github.com/kubernetes-sigs/kind";
     maintainers = with maintainers; [ offline rawkode ];
-    license     = stdenv.lib.licenses.asl20;
+    license     = lib.licenses.asl20;
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix
index 8e5d9d76fc4..7449d6df38e 100644
--- a/pkgs/development/tools/krew/default.nix
+++ b/pkgs/development/tools/krew/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     description = "Package manager for kubectl plugins";
     homepage = "https://github.com/kubernetes-sigs/krew";
     maintainers = with maintainers; [ vdemeester ];
-    license = stdenv.lib.licenses.asl20;
+    license = lib.licenses.asl20;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index 7e71c08ec4b..4abe6b6d17f 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre_headless }:
+{ lib, stdenv, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
   pname = "ktlint";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An anti-bikeshedding Kotlin linter with built-in formatter";
     homepage = "https://ktlint.github.io/";
     license = licenses.mit;
diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index 59a7c8300e2..f2186709e83 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "kubectx";
@@ -21,7 +21,7 @@ buildGoModule rec {
     installShellCompletion completion/*
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast way to switch between clusters and namespaces in kubectl!";
     license = licenses.asl20;
     homepage = "https://github.com/ahmetb/kubectx";
diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix
index 67e170f6e25..f0985277a25 100644
--- a/pkgs/development/tools/kubicorn/default.nix
+++ b/pkgs/development/tools/kubicorn/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
-with stdenv.lib;
+with lib;
 
 buildGoPackage rec {
   pname = "kubicorn";
-  version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "2018-10-13-${lib.strings.substring 0 7 rev}";
   rev = "4c7f3623e9188fba43778271afe161a4facfb657";
 
   src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildGoPackage rec {
   meta = {
     description = "Simple, cloud native infrastructure for Kubernetes";
     homepage = "http://kubicorn.io/";
-    maintainers = with stdenv.lib.maintainers; [ offline ];
-    license = stdenv.lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ offline ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix
index 33d4ea0df1d..8a199f9191c 100644
--- a/pkgs/development/tools/kubie/default.nix
+++ b/pkgs/development/tools/kubie/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
   postInstall = ''
     installShellCompletion completion/kubie.bash
diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix
index 601634b3184..f6a4c2e6c1e 100644
--- a/pkgs/development/tools/kythe/default.nix
+++ b/pkgs/development/tools/kythe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, binutils , fetchurl, ncurses5 }:
+{ lib, stdenv, binutils , fetchurl, ncurses5 }:
 
 stdenv.mkDerivation rec {
   version = "0.0.30";
@@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
                 write_entries write_tables entrystream; do
       echo "Patching:" $exe
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
-      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe
+      patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe
     done
     cd ../
     cp -R ./ $out
     ln -s $out/tools $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code";
     longDescription = ''
     The Kythe project was founded to provide and support tools and standards
diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix
index 6720603b2e5..4c94ff1e6e2 100644
--- a/pkgs/development/tools/lattice-diamond/default.nix
+++ b/pkgs/development/tools/lattice-diamond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, 
+{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, 
     freetype, fontconfig, xorg, libusb-compat-0_1 }:
 
 stdenv.mkDerivation {
@@ -95,7 +95,7 @@ stdenv.mkDerivation {
     done
   '';
 
-  libPath = stdenv.lib.makeLibraryPath [
+  libPath = lib.makeLibraryPath [
     glib zlib freetype fontconfig
     xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt
     libusb-compat-0_1
@@ -109,8 +109,8 @@ stdenv.mkDerivation {
       next-generation replacement for ispLEVER.
     '';
     homepage = "http://www.latticesemi.com/latticediamond";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ q3k ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ q3k ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 1ede21609b4..1e8ebb0d087 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "lazygit";
@@ -16,7 +16,7 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple terminal UI for git commands";
     homepage = "https://github.com/jesseduffield/lazygit";
     changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}";
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index bb8673d4d56..e68542e584f 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "leaps";
@@ -19,7 +19,7 @@ buildGoPackage rec {
     description = "A pair programming tool and library written in Golang";
     homepage = "https://github.com/jeffail/leaps/";
     license = "MIT";
-    maintainers = with stdenv.lib.maintainers; [ qknight ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [ qknight ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix
index 0846cc9d87a..7f32b0bd716 100644
--- a/pkgs/development/tools/libsigrok/default.nix
+++ b/pkgs/development/tools/libsigrok/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
+{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
 , libserialport, librevisa, doxygen, glibmm, python
 , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Core library of the sigrok signal analysis software suite";
     homepage = "https://sigrok.org/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix
index d97afa5604f..cb3b3040596 100644
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }:
+{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }:
 
 stdenv.mkDerivation rec {
   name = "libsigrokdecode-0.5.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib python3 libsigrok check ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Protocol decoding library for the sigrok signal analysis software suite";
     homepage = "https://sigrok.org/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix
index 428e6e444a2..87213b911a9 100644
--- a/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/pkgs/development/tools/literate-programming/Literate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, dmd, dub }:
+{ lib, stdenv, fetchgit, dmd, dub }:
 
 stdenv.mkDerivation {
   pname = "Literate";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   installPhase = "install -D bin/lit $out/bin/lit";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A literate programming tool for any language";
     homepage    = "http://literate.zbyedidia.webfactional.com/";
     license = licenses.mit;
diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix
index 82805af5804..caacc04903e 100644
--- a/pkgs/development/tools/literate-programming/eweb/default.nix
+++ b/pkgs/development/tools/literate-programming/eweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, asciidoc }:
+{ lib, stdenv, fetchurl, python3, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "eweb";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     cp etangle.w etangle.html $out/share/doc/${pname}-${version}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://eweb.sourceforge.net/";
     description = "An Asciidoc-based literate programming tool, written in Python";
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/development/tools/literate-programming/funnelweb/default.nix
index 9d27351f15d..53b7f208e81 100644
--- a/pkgs/development/tools/literate-programming/funnelweb/default.nix
+++ b/pkgs/development/tools/literate-programming/funnelweb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     install fw $out/bin/fw
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     version = "3.20";
     description = "A simple, reliable literate-programming macro preprocessor";
     homepage = "http://www.ross.net/funnelweb/";
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index 52586939c1d..5d4441ecfbb 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }:
+{ lib, stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }:
 
 let noweb = stdenv.mkDerivation rec {
   pname = "noweb";
@@ -13,17 +13,17 @@ let noweb = stdenv.mkDerivation rec {
 
   patches = [ ./no-FAQ.patch ];
 
-  nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ];
+  nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ];
 
   preBuild = ''
     mkdir -p "$out/lib/noweb"
     cd src
   '';
 
-  makeFlags = stdenv.lib.optionals (!isNull icon-lang) [
+  makeFlags = lib.optionals (!isNull icon-lang) [
     "LIBSRC=icon"
     "ICONC=icont"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "CC=clang"
   ];
 
@@ -70,7 +70,7 @@ let noweb = stdenv.mkDerivation rec {
   tlType = "run";
   passthru.pkgs = [ noweb.tex ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple, extensible literate-programming tool";
     homepage = "https://www.cs.tufts.edu/~nr/noweb";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix
index 1f4fba681c3..37deaacb216 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, tex}:
+{lib, stdenv, fetchurl, tex}:
 
 stdenv.mkDerivation rec {
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple literate programming tool";
     homepage = "http://nuweb.sourceforge.net";
     license = licenses.free;
diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix
index 1577392c8bc..5b7fc83df40 100644
--- a/pkgs/development/tools/makerpm/default.nix
+++ b/pkgs/development/tools/makerpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }:
+{ lib, stdenv, fetchFromGitHub, zlib, libarchive, openssl }:
 
 stdenv.mkDerivation rec {
   version = "1.0";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ivan-tkatchev/makerpm/";
     description = "A clean, simple RPM packager reimplemented completely from scratch";
     license = licenses.free;
diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix
index 71010149a92..4265c2a7450 100644
--- a/pkgs/development/tools/manul/default.nix
+++ b/pkgs/development/tools/manul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   name = "manul-unstable-2016-09-30";
@@ -16,7 +16,7 @@ buildGoPackage {
   deleteVendor = true;
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The madness vendoring utility for Golang programs";
     homepage = "https://github.com/kovetskiy/manul";
     license = licenses.mit;
diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix
index d6f34a0a9d2..6db4395a14f 100644
--- a/pkgs/development/tools/mdk/default.nix
+++ b/pkgs/development/tools/mdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkg-config, glib }:
+{ lib, stdenv, fetchurl, intltool, pkg-config, glib }:
 
 stdenv.mkDerivation {
   name = "gnu-mdk-1.3.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   meta = {
     description = "GNU MIX Development Kit (MDK)";
     homepage = "https://www.gnu.org/software/mdk/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index bcaa3e56507..4e5f3947262 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }:
 let
   version = "2.4.3";
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.minizinc.org/";
     description = "A medium-level constraint modelling language";
 
diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index aedf2ab881d..7709423e676 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }:
+{ lib, stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }:
 let
   version = "2.4.3";
 in
@@ -21,10 +21,10 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   postInstall = ''
-    wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${stdenv.lib.makeBinPath [ minizinc ]}
+    wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.minizinc.org/";
     description = "IDE for MiniZinc, a medium-level constraint modelling language";
 
diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
index c95a340181c..c4dda95a7f2 100644
--- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix
+++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }:
+{ lib, stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }:
 
 stdenv.mkDerivation rec {
   pname = "abi-compliance-checker";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://lvc.github.io/abi-compliance-checker";
     description = "A tool for checking backward API/ABI compatibility of a C/C++ library";
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix
index dc2a6d00b5f..6dd2bf41ba6 100644
--- a/pkgs/development/tools/misc/abi-dumper/default.nix
+++ b/pkgs/development/tools/misc/abi-dumper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }:
+{ lib, stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }:
 
 stdenv.mkDerivation rec {
   pname = "abi-dumper";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   preBuild = "mkdir -p $out";
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lvc/abi-dumper";
     description = "Dump ABI of an ELF object containing DWARF debug info";
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 14ef09ee7ed..a5a9d724a79 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , flex
 , php
-, stdenv
+, lib, stdenv
 }:
 
 # Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   };
   buildInputs = [ bison flex php ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+  postPatch = lib.optionalString stdenv.isAarch64 ''
     substituteInPlace support/xhpast/Makefile \
       --replace "-minline-all-stringops" ""
   '';
@@ -60,8 +60,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Command line interface to Phabricator";
     homepage = "http://phabricator.org";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix
index 3efff500943..57105050814 100644
--- a/pkgs/development/tools/misc/argbash/default.nix
+++ b/pkgs/development/tools/misc/argbash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "argbash";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       --prefix PATH : '${autoconf}/bin'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Bash argument parsing code generator";
     homepage = "https://argbash.io/";
     license = licenses.free; # custom license.  See LICENSE in source repo.
diff --git a/pkgs/development/tools/misc/asls/default.nix b/pkgs/development/tools/misc/asls/default.nix
index 0e08acdeb45..bccda018503 100644
--- a/pkgs/development/tools/misc/asls/default.nix
+++ b/pkgs/development/tools/misc/asls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , erlangR22
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ erlangR22 ];
   installPhase = "install -Dm755 -t $out/bin asls";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "AssemblyScript Language Server";
     homepage = "https://github.com/saulecabrera/asls";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix
index 05afa379f99..da387105cef 100644
--- a/pkgs/development/tools/misc/autobuild/default.nix
+++ b/pkgs/development/tools/misc/autobuild/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeWrapper, perl, openssh, rsync }:
+{ fetchurl, lib, stdenv, makeWrapper, perl, openssh, rsync }:
 
 stdenv.mkDerivation rec {
   name = "autobuild-5.3";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "https://josefsson.org/autobuild/";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index f002346c994..e0d558b1880 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz }:
+{ lib, stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
   pname = "autoconf-archive";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ xz ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Archive of autoconf m4 macros";
     homepage = "https://www.gnu.org/software/autoconf-archive/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix
index 424dff8541b..e5280d46b59 100644
--- a/pkgs/development/tools/misc/autoconf/2.13.nix
+++ b/pkgs/development/tools/misc/autoconf/2.13.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, m4, perl, lzma}:
+{lib, stdenv, fetchurl, m4, perl, lzma}:
 
 stdenv.mkDerivation rec {
   name = "autoconf-2.13";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       can use, in the form of M4 macro calls.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix
index 1fd18bcb12a..6976a291ae7 100644
--- a/pkgs/development/tools/misc/autoconf/2.64.nix
+++ b/pkgs/development/tools/misc/autoconf/2.64.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ lib, stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
   name = "autoconf-2.64";
@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
       can use, in the form of M4 macro calls.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/development/tools/misc/autoconf/2.69.nix
index 500d80d4bb8..f2f8ca0a858 100644
--- a/pkgs/development/tools/misc/autoconf/2.69.nix
+++ b/pkgs/development/tools/misc/autoconf/2.69.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ lib, stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
   name = "autoconf-2.69";
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
       can use, in the form of M4 macro calls.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 57a92cee737..ae8fc2d9061 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ lib, stdenv, fetchurl, m4, perl }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
       can use, in the form of M4 macro calls.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 1bf3a0c2832..c6eb6916d1e 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
+{ lib, stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
 
 stdenv.mkDerivation rec {
   pname = "autogen";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     which pkg-config perl autoreconfHook/*patches applied*/
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # autogen needs a build autogen when cross-compiling
     buildPackages.buildPackages.autogen buildPackages.texinfo
   ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21
       "--enable-timeout=78"
     ]
-    ++ (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       "--with-libxml2=${libxml2.dev}"
       "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2"
       # the configure check for regcomp wants to run a host program
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
       sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f
     done
 
-  '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+  '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     # remove /build/** from RPATHs
     for f in "$bin"/bin/*; do
       local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')"
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automated text and program generation tool";
     license = with licenses; [ gpl3Plus lgpl3Plus ];
     homepage = "https://www.gnu.org/software/autogen/";
diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index b79f3047889..5e3167d182d 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, autoconf }:
+{ lib, stdenv, fetchurl, perl, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "automake-1.11.6";
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
index bf0967e9ddb..0088eb74cc4 100644
--- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, autoconf }:
+{ lib, stdenv, fetchurl, perl, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "automake-1.15.1";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     branch = "1.15";
     homepage = "https://www.gnu.org/software/automake/";
     description = "GNU standard-compliant makefile generator";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     longDescription = ''
       GNU Automake is a tool for automatically generating
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
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 58c559fcc56..48f01f8d0f6 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 }:
+{ lib, stdenv, fetchurl, perl, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "automake-1.16.3";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     branch = "1.16";
     homepage = "https://www.gnu.org/software/automake/";
     description = "GNU standard-compliant makefile generator";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     longDescription = ''
       GNU Automake is a tool for automatically generating
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix
index 22942e2a658..ac027ec4530 100644
--- a/pkgs/development/tools/misc/automoc4/default.nix
+++ b/pkgs/development/tools/misc/automoc4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4 }:
+{ lib, stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
   pname = "automoc4";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ qt4 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://techbase.kde.org/Development/Tools/Automoc4";
     description = "KDE Meta Object Compiler";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index bb0520cf28e..4d95310c342 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline
+{ lib, stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline
 # docSupport is a big dependency, disabled by default
 , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
 }:
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg";
   };
 
-  configureFlags = stdenv.lib.optionals docSupport "--enable-doc";
+  configureFlags = lib.optionals docSupport "--enable-doc";
 
   buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ]
-    ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ];
+    ++ lib.optionals docSupport [ texLive texinfo texi2html ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line tool for programming Atmel AVR microcontrollers";
     longDescription = ''
       AVRDUDE (AVR Downloader/UploaDEr) is an utility to
diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix
index 24a04550428..b73f1dc0450 100644
--- a/pkgs/development/tools/misc/awf/default.nix
+++ b/pkgs/development/tools/misc/awf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Widget Factory";
     longDescription = ''
       A widget factory is a theme preview application for gtk2 and
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
index e768bdde146..26c484017d2 100644
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }:
 
 stdenv.mkDerivation rec {
   name = "babeltrace-1.5.8";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib libuuid popt elfutils ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line tool and library to read and convert LTTng tracefiles";
     homepage = "https://www.efficios.com/babeltrace";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix
index 0897960f6aa..72ec8c96be3 100644
--- a/pkgs/development/tools/misc/bashdb/default.nix
+++ b/pkgs/development/tools/misc/bashdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, python3Packages }:
+{ lib, stdenv, fetchurl, makeWrapper, python3Packages }:
 
 stdenv.mkDerivation rec {
   pname = "bashdb";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Bash script debugger";
     homepage = "http://bashdb.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
index 8fc809f0f0c..a732d6e732c 100644
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libelf, txt2man }:
+{ lib, stdenv, fetchurl, libelf, txt2man }:
 
 stdenv.mkDerivation {
   pname = "bin_replace_string";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Edit precompiled binaries";
     longDescription = ''
       bin_replace_string edits C-style strings in precompiled binaries. This is
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index 38cc2867650..bb14e26bfd9 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, wxGTK, libX11, readline }:
+{ lib, stdenv, fetchgit, wxGTK, libX11, readline }:
 
 let
   # BOSSA needs a "bin2c" program to embed images.
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     cp bin/bossa{c,sh,} $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers";
     longDescription = ''
       BOSSA is a flash programming utility for Atmel's SAM family of
diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix
index 6491ff83ec7..e3bfc958437 100644
--- a/pkgs/development/tools/misc/bsdbuild/default.nix
+++ b/pkgs/development/tools/misc/bsdbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }:
+{ lib, stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }:
 
 stdenv.mkDerivation rec {
   pname = "bsdbuild";
@@ -62,7 +62,7 @@ EOF
       directory, BSDBuild will produce the required Makefiles in place).
     '';
 
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index f3ba4b3a70d..0f7edeea812 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, tk, makeWrapper }:
+{ fetchurl, lib, stdenv, tk, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "cbrowser-0.8";
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Tcl/Tk GUI front-end to cscope";
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     homepage = "https://sourceforge.net/projects/cbrowser/";
 
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with lib.maintainers; [viric];
 
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/tools/misc/cc-tool/default.nix b/pkgs/development/tools/misc/cc-tool/default.nix
index 6be0ab2acb5..e2a511a0e32 100644
--- a/pkgs/development/tools/misc/cc-tool/default.nix
+++ b/pkgs/development/tools/misc/cc-tool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     install -D udev/90-cc-debugger.rules $out/lib/udev/rules.d/90-cc-debugger.rules
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line tool for the Texas Instruments CC Debugger";
     longDescription = ''
       cc-tool provides support for Texas Instruments CC Debugger
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index f9254b2cf15..655807d9506 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -60,7 +60,7 @@ let ccache = stdenv.mkDerivation rec {
           local cname="$1"
           if [ -x "${unwrappedCC}/bin/$cname" ]; then
             makeWrapper ${ccache}/bin/ccache $out/bin/$cname \
-              --run ${stdenv.lib.escapeShellArg extraConfig} \
+              --run ${lib.escapeShellArg extraConfig} \
               --add-flags ${unwrappedCC}/bin/$cname
           fi
         }
@@ -84,7 +84,7 @@ let ccache = stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = "https://ccache.dev";
     downloadPage = "https://ccache.dev/download.html";
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix
index 16365a462a9..40b53ca6934 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/pkgs/development/tools/misc/ccls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , cmake, llvmPackages, rapidjson, runtimeShell }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # We need to tell ccls where to find the standard library headers.
 
-    standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\""
+    standard_library_includes="\\\"-isystem\\\", \\\"${lib.getDev stdenv.cc.libc}/include\\\""
     standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\""
     export standard_library_includes
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     chmod --reference=$out/bin/$wrapped $out/bin/ccls
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A c/c++ language server powered by clang";
     homepage    = "https://github.com/MaskRay/ccls";
     license     = licenses.asl20;
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index 8c271bd7673..b9e75d7cb2a 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, emacs }:
+{ lib, stdenv, fetchurl, gettext, emacs }:
 
 stdenv.mkDerivation rec {
   name = "cflow-1.6";
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gettext ] ++
     # We don't have Emacs/GTK/etc. on {Dar,Cyg}win.
-    stdenv.lib.optional
-      (! (stdenv.lib.lists.any (x: stdenv.hostPlatform.system == x)
+    lib.optional
+      (! (lib.lists.any (x: stdenv.hostPlatform.system == x)
               [ "i686-cygwin" ]))
       emacs;
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to analyze the control flow of C programs";
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index a863cec1d4c..0e92d373c0b 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, readline, flex, texinfo }:
+{ lib, stdenv, fetchurl, ncurses, readline, flex, texinfo }:
 
 stdenv.mkDerivation rec {
   pname = "cgdb";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses readline flex texinfo ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A curses interface to gdb";
 
     homepage = "https://cgdb.github.io/";
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 86ac37ee491..524abbfdc90 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl }:
 stdenv.mkDerivation rec {
   version = "2.0.0.2";
   pname = "checkbashisms";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://sourceforge.net/projects/checkbaskisms/";
     description = "Check shell scripts for non-portable syntax";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix
index 7e08157d7bd..ff804f897d1 100644
--- a/pkgs/development/tools/misc/chrpath/default.nix
+++ b/pkgs/development/tools/misc/chrpath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "chrpath-0.16";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries";
     longDescription = ''
       chrpath changes, lists or removes the rpath or runpath setting in a
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 441aae58269..73ea64f1d62 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "circleci-cli";
@@ -26,7 +26,7 @@ buildGoModule rec {
     install -Dm644 -t $out/share/circleci-cli _data/data.yml
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     # Box blurb edited from the AUR package circleci-cli
     description = ''
       Command to enable you to reproduce the CircleCI environment locally and
diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index c245a32a06d..1d3a36c5773 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 let
   s = # Generated upstream information
   rec {
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''Common Lisp launcher script'';
-    license = stdenv.lib.licenses.llgpl21 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.llgpl21 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix
index de01ab93090..03c3e51cb89 100644
--- a/pkgs/development/tools/misc/cli11/default.nix
+++ b/pkgs/development/tools/misc/cli11/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  lib, stdenv,
   fetchFromGitHub,
   cmake,
   gtest,
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     sed -i '/TrueFalseTest/d' tests/CMakeLists.txt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line parser for C++11";
     homepage = "https://github.com/CLIUtils/CLI11";
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 16f5c4063be..af435d417ce 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "clojure-lsp";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       --add-flags "-jar $out/share/java/${pname}.jar"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Language Server Protocol (LSP) for Clojure";
     homepage = "https://github.com/snoe/clojure-lsp";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 43392b2a89c..40a22f18203 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkg-config }:
+{ fetchurl, lib, stdenv, python, ncurses, ocamlPackages, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "coccinelle";
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://coccinelle.lip6.fr/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix
index 71ed762df04..6e70fbcfcde 100644
--- a/pkgs/development/tools/misc/complexity/default.nix
+++ b/pkgs/development/tools/misc/complexity/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autogen }:
+{ fetchurl, lib, stdenv, autogen }:
 
 stdenv.mkDerivation rec {
   pname = "complexity";
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
          addresses several issues not considered in that scoring scheme.
       '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     homepage = "https://www.gnu.org/software/complexity/";
 
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix
index 8de7391b9ec..9fe5ed96672 100644
--- a/pkgs/development/tools/misc/cppi/default.nix
+++ b/pkgs/development/tools/misc/cppi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "cppi-1.18";
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
          to the level of nesting of that directive.
       '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index e18196fe595..5ee1a64f2c2 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison }:
+{ lib, stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
   pname = "cproto";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     [ "$("$out/bin/cproto" -V 2>&1)" = '${version}' ]
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool to generate C function prototypes from C source code";
     homepage = "https://invisible-island.net/cproto/";
     license = licenses.publicDomain;
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index 7bc4aca3d9d..75234fde6ca 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, makeWrapper
+{ lib, stdenv, fetchurl, cmake, makeWrapper
 , llvm, clang-unwrapped
 , flex
 , zlib
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   # On Linux, c-reduce's preferred way to reason about
   # the cpu architecture/topology is to use 'lscpu',
   # so let's make sure it knows where to find it:
-  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
+  postPatch = lib.optionalString stdenv.isLinux ''
     substituteInPlace creduce/creduce_utils.pm --replace \
       lscpu ${util-linux}/bin/lscpu
   '';
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A C program reducer";
     homepage = "https://embed.cs.utah.edu/creduce";
     # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index 31d4e83663b..7eb38e385e8 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ncurses
+{ fetchurl, lib, stdenv, ncurses
 , emacsSupport ? true, emacs
 }:
 
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-ncurses=${ncurses.dev}" ];
 
   buildInputs = [ ncurses ];
-  nativeBuildInputs = stdenv.lib.optional emacsSupport emacs;
+  nativeBuildInputs = lib.optional emacsSupport emacs;
 
-  postInstall = stdenv.lib.optionalString emacsSupport ''
+  postInstall = lib.optionalString emacsSupport ''
     cd "contrib/xcscope"
 
     sed -i "cscope-indexer" \
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
 
     homepage = "http://cscope.sourceforge.net/";
 
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with lib.maintainers; [viric];
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index 253dd4065e4..0643e81edf9 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }:
+{ lib, stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }:
 
 stdenv.mkDerivation rec {
   pname = "csmith";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A random generator of C programs";
     homepage = "https://embed.cs.utah.edu/csmith";
     # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING
diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix
index 3adca34a5bb..90825db2a54 100644
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/pkgs/development/tools/misc/ctags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, autoreconfHook }:
+{ lib, stdenv, fetchsvn, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "ctags-${revision}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # don't use $T(E)MP which is set to the build directory
   configureFlags= [ "--enable-tmpdir=/tmp" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool for fast source code browsing (exuberant ctags)";
     longDescription = ''
       Ctags generates an index (or tag) file of language objects found
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index 0b89156d71a..3ab8800f3c4 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, tie }:
+{ lib, stdenv, fetchFromGitHub, fetchurl, tie }:
 
 stdenv.mkDerivation rec {
   pname = "cwebbin";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     make -f Makefile.unix install $makeFlags
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Literate Programming in C/C++";
     platforms = with platforms; unix;
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index 6ee366ae2c6..60d3c5c4539 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , pkg-config
 , fetchurl
 , meson
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/d-feet/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1cgxgpj546jgpyns6z9nkm5k48lid8s36mvzj8ydkjqws2d19zqz";
   };
 
@@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "D-Feet is an easy to use D-Bus debugger";
     longDescription = ''
       D-Feet can be used to inspect D-Bus interfaces of running programs
diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix
index 49fb1efbd4a..9565eaa3626 100644
--- a/pkgs/development/tools/misc/dbench/default.nix
+++ b/pkgs/development/tools/misc/dbench/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }:
+{ lib, stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }:
 
 stdenv.mkDerivation {
   name = "dbench-2013-01-01";
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Filesystem benchmark tool based on load patterns";
     homepage = "https://dbench.samba.org/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix
index 174168b7db7..74eb9fcb293 100644
--- a/pkgs/development/tools/misc/ddd/default.nix
+++ b/pkgs/development/tools/misc/ddd/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, motif, ncurses, libX11, libXt}:
+{lib, stdenv, fetchurl, motif, ncurses, libX11, libXt}:
 
 stdenv.mkDerivation rec {
   name = "ddd-3.3.12";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/ddd";
     description = "Graphical front-end for command-line debuggers";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 73e2ab8ef92..285805ccb02 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, expect, makeWrapper }:
+{ fetchurl, lib, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "dejagnu-1.6.2";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ":" "${expect}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Framework for testing other programs";
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix
index 1aaf113d0b9..f0a3a9b7600 100644
--- a/pkgs/development/tools/misc/dfu-programmer/default.nix
+++ b/pkgs/development/tools/misc/dfu-programmer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb-compat-0_1 }:
+{ lib, stdenv, fetchurl, libusb-compat-0_1 }:
 let
   version = "0.7.2";
 in
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-libusb_1_0" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.gpl2;
     description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
     homepage = "http://dfu-programmer.sourceforge.net/";
diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix
index c570b1a7997..85917a114c0 100644
--- a/pkgs/development/tools/misc/dfu-util/default.nix
+++ b/pkgs/development/tools/misc/dfu-util/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libusb1 }:
+{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
 
 stdenv.mkDerivation rec {
   pname = "dfu-util";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Device firmware update (DFU) USB programmer";
     longDescription = ''
       dfu-util is a program that implements the host (PC) side of the USB
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index c56620e3105..97db1b5b7e8 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , ncurses
 , withLibrary ? false, libtool
 , unicodeSupport ? true
@@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-rpath-hacks"
-    (stdenv.lib.withFeature withLibrary "libtool")
-    "--with-ncurses${stdenv.lib.optionalString unicodeSupport "w"}"
-    "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}"
+    (lib.withFeature withLibrary "libtool")
+    "--with-ncurses${lib.optionalString unicodeSupport "w"}"
+    "--with-libtool-opts=${lib.optionalString enableShared "-shared"}"
   ];
 
-  installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ];
+  installTargets = [ "install${lib.optionalString withLibrary "-full"}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://invisible-island.net/dialog/dialog.html";
     description = "Display dialog boxes from shell";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix
index 0ae1884646d..3477d60b784 100644
--- a/pkgs/development/tools/misc/direvent/default.nix
+++ b/pkgs/development/tools/misc/direvent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Directory event monitoring daemon";
     homepage = "https://www.gnu.org.ua/software/direvent/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index 8a315a61e98..cad9fe0960b 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
+{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
 , gcc, autoconf, automake, which, procps, libiberty_static
 , runtimeShell
 , sysconfDir ? ""   # set this parameter to override the default value $out/etc
@@ -76,8 +76,8 @@ let
       homepage = "http://distcc.org";
       license = "GPL";
 
-      platforms = stdenv.lib.platforms.linux;
-      maintainers = with stdenv.lib.maintainers; [ anderspapitto ];
+      platforms = lib.platforms.linux;
+      maintainers = with lib.maintainers; [ anderspapitto ];
     };
   };
 in
diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix
index f3bccde8160..2387ab1bd41 100644
--- a/pkgs/development/tools/misc/distcc/masq.nix
+++ b/pkgs/development/tools/misc/distcc/masq.nix
@@ -1,4 +1,4 @@
-{ stdenv, gccRaw, binutils }:
+{ lib, stdenv, gccRaw, binutils }:
 
 stdenv.mkDerivation {
   name = "distcc-masq-${gccRaw.name}";
@@ -39,6 +39,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix
index a1528cfca3e..8b771788111 100644
--- a/pkgs/development/tools/misc/doclifter/default.nix
+++ b/pkgs/development/tools/misc/doclifter/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python}:
+{lib, stdenv, fetchurl, python}:
 
 stdenv.mkDerivation {
   name = "doclifter-2.19";
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     description = "Lift documents in nroff markups to XML-DocBook";
     homepage = "http://www.catb.org/esr/doclifter";
     license = "BSD";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix
index 98a24ca5ebe..3614270574e 100644
--- a/pkgs/development/tools/misc/docopts/default.nix
+++ b/pkgs/development/tools/misc/docopts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "docopts";
@@ -21,7 +21,7 @@ buildGoPackage rec {
     install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/docopt/${pname}";
     description = "docopt CLI tool for shell scripting";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index d5c345d9d22..32d9975e332 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }:
+{ lib, stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "drush-6.1.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line shell and Unix scripting interface for Drupal";
     homepage    = "https://github.com/drush-ops/drush";
     license     = licenses.gpl2;
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"
     cp -r . "$out/src"
     mkdir "$out/bin"
-    wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php73 bash coreutils ncurses ]}"
+    wrapProgram "$out/src/drush" --prefix PATH : "${lib.makeBinPath [ which php73 bash coreutils ncurses ]}"
     ln -s "$out/src/drush" "$out/bin/drush"
   '';
 }
diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index e563ff203a2..de5c1e070fd 100644
--- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, pcre, doxygen }:
+{ lib, stdenv, fetchgit, cmake, pcre, doxygen }:
 
 stdenv.mkDerivation rec {
   name = "editorconfig-core-c-${meta.version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   # parallel: https://bugzilla.gnome.org/show_bug.cgi?id=791153
   enableParallelBuilding = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://editorconfig.org/";
     description = "EditorConfig core library written in C";
     longDescription = ''
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index 198bbabb19f..5a5267510d7 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }:
+{ lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }:
 
 stdenv.mkDerivation rec {
   name = "eggdbus-0.6";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib dbus dbus-glib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://hal.freedesktop.org/releases/";
     description = "D-Bus bindings for GObject";
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index 3778793b71c..cd19e263f0a 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "elfinfo";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     sha256 = "1n8bg0rcq9fqa6rdnk6x9ngvm59hcayblkpjv9j5myn2vmm6fv8m";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small utility for showing information about ELF files";
     homepage = "https://elfinfo.roboticoverlords.org/";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
index e8992b62665..e60b40c7fd4 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "elfkickers";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html";
     description = "A collection of programs that access and manipulate ELF files";
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix
index 8caa33c20d1..8f5921783e2 100644
--- a/pkgs/development/tools/misc/epm/default.nix
+++ b/pkgs/development/tools/misc/epm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, rpm}:
+{lib, stdenv, fetchFromGitHub, rpm}:
 
 stdenv.mkDerivation rec {
   pname = "epm";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i 's/README/README.md/' Makefile
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The ESP Package Manager generates distribution archives for a variety of platforms";
     homepage = "https://www.msweet.org/projects.php?Z2";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/development/tools/misc/findnewest/default.nix
index b289c16b7a6..6773e9bc0bd 100644
--- a/pkgs/development/tools/misc/findnewest/default.nix
+++ b/pkgs/development/tools/misc/findnewest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "findnewest";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/0-wiz-0/findnewest";
     description = "Recursively find newest file in a hierarchy and print its timestamp";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix
index 69d7c6b3919..132ddf2eacf 100644
--- a/pkgs/development/tools/misc/fsatrace/default.nix
+++ b/pkgs/development/tools/misc/fsatrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "fsatrace";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ln -s $out/$installDir/fsatrace $out/bin/fsatrace
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jacereda/fsatrace";
     description = "filesystem access tracer";
     license = licenses.isc;
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index e32da3e67b7..6f9f5e113c0 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
                      # for xargs
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk";
   };
 
-  nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+  nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
   buildInputs = [ gettext libtool makeWrapper texinfo ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A cross-platform file change monitor with multiple backends";
     homepage = "https://github.com/emcrisostomo/fswatch";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix
index 3ec4d0f8efb..db1f42e3a26 100644
--- a/pkgs/development/tools/misc/fujprog/default.nix
+++ b/pkgs/development/tools/misc/fujprog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libftdi1
     libusb-compat-0_1
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
+  ] ++ lib.optionals stdenv.isDarwin [ IOKit ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards";
     homepage = "https://github.com/kost/fujprog";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index f77ab03b810..2ce779be568 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages
+{ lib, stdenv, targetPackages
 
 # Build time
 , fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
@@ -18,7 +18,7 @@
 
 let
   basename = "gdb";
-  targetPrefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+  targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
                  "${stdenv.targetPlatform.config}-";
 in
 
@@ -40,15 +40,15 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./debug-info-from-env.patch
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     ./darwin-target-match.patch
   ];
 
   nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ];
 
   buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ]
-    ++ stdenv.lib.optional pythonSupport python3
-    ++ stdenv.lib.optional doCheck dejagnu;
+    ++ lib.optional pythonSupport python3
+    ++ lib.optional doCheck dejagnu;
 
   propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
 
@@ -57,12 +57,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # darwin build fails with format hardening since v7.12
-  hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ];
+  hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ];
 
   NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
 
   # GDB have to be built out of tree.
   preConfigure = ''
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   '';
   configureScript = "../configure";
 
-  configureFlags = with stdenv.lib; [
+  configureFlags = with lib; [
     "--enable-targets=all" "--enable-64-bit-bfd"
     "--disable-install-libbfd"
     "--disable-shared" "--enable-static"
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     "--with-mpfr=${mpfr.dev}"
     "--with-expat" "--with-libexpat-prefix=${expat.dev}"
     "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"
-  ] ++ stdenv.lib.optional (!pythonSupport) "--without-python";
+  ] ++ lib.optional (!pythonSupport) "--without-python";
 
   postInstall =
     '' # Remove Info files already provided by Binutils and other packages.
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
   # TODO: Investigate & fix the test failures.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GNU Project debugger";
 
     longDescription = ''
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://www.gnu.org/software/gdb/";
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     platforms = with platforms; linux ++ cygwin ++ darwin;
     maintainers = with maintainers; [ pierron globin lsix ];
diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index ecbfc2ae756..c01bb61f4f6 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildPythonApplication
 , fetchPypi
 , gdb
@@ -41,13 +41,13 @@ buildPythonApplication rec {
 
   postInstall = ''
     wrapProgram $out/bin/gdbgui \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]}
+      --prefix PATH : ${lib.makeBinPath [ gdb ]}
   '';
 
   # tests do not work without stdout/stdin
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A browser-based frontend for GDB";
     homepage = "https://www.gdbgui.com/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix
index 0a3b0b1c750..2c09f925d3d 100644
--- a/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/pkgs/development/tools/misc/gengetopt/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, texinfo, help2man }:
+{ fetchurl, lib, stdenv, texinfo, help2man }:
 
 stdenv.mkDerivation rec {
   pname = "gengetopt";
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
 
     homepage = "https://www.gnu.org/software/gengetopt/";
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 36798fe4fc1..fb3ddfcb29b 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libtool, makeWrapper
+{ fetchurl, lib, stdenv, libtool, makeWrapper
 , coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags
 }:
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Source code tag system";
     longDescription = ''
       GNU GLOBAL is a source code tagging system that works the same way
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 2e3e4acfdc1..512989a1446 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
         sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk";
       })
     ]
-    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch;
+    ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch;
 
   meta = {
     homepage = "https://www.gnu.org/software/m4/";
@@ -49,8 +49,8 @@ stdenv.mkDerivation {
       compiler or as a macro processor in its own right.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix ++ stdenv.lib.platforms.windows;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
 
 }
diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix
index e34b5733b22..b78c111ccbf 100644
--- a/pkgs/development/tools/misc/gob2/default.nix
+++ b/pkgs/development/tools/misc/gob2/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gob2";
   version = "2.0.20";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Preprocessor for making GObjects with inline C code";
     homepage = "https://www.jirka.org/gob.html";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix
index e013428a6f7..339511f2cc0 100644
--- a/pkgs/development/tools/misc/gperf/3.0.x.nix
+++ b/pkgs/development/tools/misc/gperf/3.0.x.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, autoreconfHook }:
+{lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "gperf-3.0.4";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
       employed by gperf.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     homepage = "https://www.gnu.org/software/gperf/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index bf85cd91380..e998f09683a 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "gperf-3.1";
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
       employed by gperf.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     homepage = "https://www.gnu.org/software/gperf/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix
index 5a3cdad8040..13437b71953 100644
--- a/pkgs/development/tools/misc/gpshell/default.nix
+++ b/pkgs/development/tools/misc/gpshell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
+{ lib, stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
 , makeWrapper
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
     description = "Smartcard management application";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix
index 2ad496bfb88..c07949e8096 100644
--- a/pkgs/development/tools/misc/gputils/default.nix
+++ b/pkgs/development/tools/misc/gputils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "gputils";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://gputils.sourceforge.io";
     description = "A collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix
index 2b2a8318947..6651bbb0384 100644
--- a/pkgs/development/tools/misc/gtkdialog/default.nix
+++ b/pkgs/development/tools/misc/gtkdialog/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk2, pkg-config }:
+{lib, stdenv, fetchurl, gtk2, pkg-config }:
 
 stdenv.mkDerivation {
   name = "gtkdialog-0.8.3";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     homepage = "https://code.google.com/archive/p/gtkdialog/";
     # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog
     description = "Small utility for fast and easy GUI building from many scripted and compiled languages";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix
index feda9faf59a..4b7f7985a67 100644
--- a/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/pkgs/development/tools/misc/gtkperf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, pkg-config, libintl }:
+{ lib, stdenv, fetchurl, gtk2, pkg-config, libintl }:
 
 stdenv.mkDerivation {
   name = "gtkperf-0.40.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db
   patches = [ ./bench.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Application designed to test GTK performance";
     homepage = "http://gtkperf.sourceforge.net/";
     license = with licenses; [ gpl2 ];
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index f23b5a9c8fd..6afc4415e11 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages, gettext }:
+{ lib, stdenv, fetchurl, perlPackages, gettext }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
     cat > $out/bin/help2man <<EOF
     #! $SHELL -e
     export PERL5LIB=\''${PERL5LIB:+:}${perlPackages.LocaleGettext}/${perlPackages.perl.libPrefix}
-    ${stdenv.lib.optionalString stdenv.hostPlatform.isCygwin
+    ${lib.optionalString stdenv.hostPlatform.isCygwin
         ''export PATH=\''${PATH:+:}${gettext}/bin''}
     exec -a \$0 $out/bin/.help2man-wrapped "\$@"
     EOF
     chmod +x $out/bin/help2man
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate man pages from `--help' output";
 
     longDescription =
diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
index 4e817251bff..476179ac8e7 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildGoPackage
 , fetchFromGitHub
 , makeWrapper
@@ -32,8 +32,8 @@ buildGoPackage rec {
     inherit (src.meta) homepage;
 
     description = "Lightning fast code searching made easy";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ grahamc ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ grahamc ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix
index 837128e2977..9160a336681 100644
--- a/pkgs/development/tools/misc/hydra-cli/default.nix
+++ b/pkgs/development/tools/misc/hydra-cli/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A client for the Hydra CI";
     homepage = "https://github.com/nlewo/hydra-cli";
     license = with licenses; [ mit ];
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index 7aaee31b504..cf56e6c1a9c 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -128,7 +128,7 @@ in stdenv.mkDerivation rec {
 
   passthru = { inherit perlDeps migration tests; };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Nix-based continuous build system";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix
index 0905ce48463..8fdc448ee91 100644
--- a/pkgs/development/tools/misc/icon-naming-utils/default.nix
+++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perlPackages, librsvg}:
+{lib, stdenv, fetchurl, perlPackages, librsvg}:
 
 stdenv.mkDerivation rec {
   name = "icon-naming-utils-0.8.90";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
           --replace '/bin/perl' '/bin/perl -I${perlPackages.XMLSimple}/${perlPackages.perl.libPrefix}'
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://tango.freedesktop.org/Standard_Icon_Naming_Specification";
     platforms = with platforms; linux ++ darwin;
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix
index 0780672cc02..47f41f130be 100644
--- a/pkgs/development/tools/misc/igprof/default.nix
+++ b/pkgs/development/tools/misc/igprof/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}:
+{lib, stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}:
 
 stdenv.mkDerivation rec {
   version = "5.9.16";
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
       details and see the big picture from combined workloads.
     '';
 
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
 
     homepage = "https://igprof.org/";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ ktf ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ktf ];
   };
 }
diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix
index c4b5fecca74..8c5ec6af1c7 100644
--- a/pkgs/development/tools/misc/indent/default.nix
+++ b/pkgs/development/tools/misc/indent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo }:
+{ lib, stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "indent-2.2.12";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ texinfo ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
     "-Wno-implicit-function-declaration";
 
   hardeningDisable = [ "format" ];
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/indent/";
     description = "A source code reformatter";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.mmahut ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.mmahut ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index a9d642f48f0..e085d3dd259 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
+{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "inotify-tools";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rvoicilas/inotify-tools/wiki";
     license = licenses.gpl2;
     maintainers = with maintainers; [ marcweber pSub ];
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 9f442cfee14..62d350593b1 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev
+{ lib, stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
 , procps, utilmacros, gtk-doc, openssl, peg, elfutils
 }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://01.org/linuxgraphics/";
     description = "Tools for development and testing of the Intel DRM driver";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index 20f880938c6..7a3379d5921 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }:
+{ lib, stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "intltool";
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = with perlPackages; [ perl XMLParser ];
   propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]);
 
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     for f in $out/bin/*; do
       substituteInPlace $f --replace "${buildPackages.perl}" "${perlPackages.perl}"
     done
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Translation helper tool";
     homepage = "https://launchpad.net/intltool/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix
index 93e2673be63..ad62d104873 100644
--- a/pkgs/development/tools/misc/iozone/default.nix
+++ b/pkgs/development/tools/misc/iozone/default.nix
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "IOzone Filesystem Benchmark";
     homepage    = "http://www.iozone.org/";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
+    license     = lib.licenses.unfreeRedistributable;
     platforms   = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
-    maintainers = with stdenv.lib.maintainers; [ Baughn makefu ];
+    maintainers = with lib.maintainers; [ Baughn makefu ];
   };
 }
diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix
index a121cc67099..992b76bd62d 100644
--- a/pkgs/development/tools/misc/itm-tools/default.nix
+++ b/pkgs/development/tools/misc/itm-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config }:
 
 rustPlatform.buildRustPackage rec {
   pname = "itm-tools";
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools for analyzing ITM traces";
     homepage = "https://github.com/japaric/itm-tools";
     license = with licenses; [ asl20 mit ];
diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index d46256f039a..55e62a2dcae 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://itstool.org/";
     description = "XML to PO and back again";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix
index 6ed66c8d3cc..a978c31c34d 100644
--- a/pkgs/development/tools/misc/jscoverage/default.nix
+++ b/pkgs/development/tools/misc/jscoverage/default.nix
@@ -1,4 +1,4 @@
-{ autoconf, fetchurl, makedepend, perl, python, stdenv, unzip, zip }:
+{ autoconf, fetchurl, makedepend, perl, python, lib, stdenv, unzip, zip }:
 
 stdenv.mkDerivation rec {
   name = "jscoverage-0.5.1";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://siliconforks.com/jscoverage/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix
index ea82b0a4e6e..3b355b6218a 100644
--- a/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
+{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
 
 stdenv.mkDerivation rec {
   basename = "kconfig-frontends";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Out of Linux tree packaging of the kconfig infrastructure";
     longDescription = ''
       Configuration language and system for the Linux kernel and other
diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix
index 78acf8e17a7..dad7d41c1f6 100644
--- a/pkgs/development/tools/misc/kdbg/default.nix
+++ b/pkgs/development/tools/misc/kdbg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, qt5,
+{ lib, stdenv, fetchurl, cmake, extra-cmake-modules, qt5,
   ki18n, kconfig, kiconthemes, kxmlgui, kwindowsystem,
   qtbase, makeWrapper,
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.kdbg.org/";
     description = ''
       A graphical user interface to gdb, the GNU debugger. It provides an
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix
index 354f77d0fb9..3fa2d219fe3 100644
--- a/pkgs/development/tools/misc/kibana/6.x.nix
+++ b/pkgs/development/tools/misc/kibana/6.x.nix
@@ -1,6 +1,6 @@
 { elk6Version
 , enableUnfree ? true
-, stdenv
+, lib, stdenv
 , makeWrapper
 , fetchurl
 , nodejs-10_x
@@ -8,7 +8,7 @@
 , which
 }:
 
-with stdenv.lib;
+with lib;
 let
   nodejs = nodejs-10_x;
   inherit (builtins) elemAt;
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     mv * $out/libexec/kibana/
     rm -r $out/libexec/kibana/node
     makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
+      --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}"
     sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
   '';
 
diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix
index dc3beb9866c..7f46d6f6512 100644
--- a/pkgs/development/tools/misc/kibana/7.x.nix
+++ b/pkgs/development/tools/misc/kibana/7.x.nix
@@ -1,6 +1,6 @@
 { elk7Version
 , enableUnfree ? true
-, stdenv
+, lib, stdenv
 , makeWrapper
 , fetchurl
 , nodejs-10_x
@@ -8,7 +8,7 @@
 , which
 }:
 
-with stdenv.lib;
+with lib;
 let
   nodejs = nodejs-10_x;
   inherit (builtins) elemAt;
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     mv * $out/libexec/kibana/
     rm -r $out/libexec/kibana/node
     makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
+      --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}"
     sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
   '';
 
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 199c6504f39..2b0089e89f6 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, m4, perl}:
+{lib, stdenv, fetchurl, m4, perl}:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://www.gnu.org/software/libtool/";
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index fbe49dc68b2..6d7c4a9087f 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl, help2man
+{ lib, stdenv, fetchurl, m4, perl, help2man
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GNU Libtool, a generic library support script";
     longDescription = ''
       GNU libtool is a generic library support script.  Libtool hides
diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix
index 59bbb99bd46..aeda5271142 100644
--- a/pkgs/development/tools/misc/libwhich/default.nix
+++ b/pkgs/development/tools/misc/libwhich/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libwhich";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     install -Dm755 -t $out/bin libwhich
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Like `which`, for dynamic libraries";
     homepage = "https://github.com/vtjnash/libwhich";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
index ace34f35059..59bab3742a2 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitLab }:
+{ lib, stdenv, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
   pname = "loccount";
   version = "1.2";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "18z7ai7wy2k9yd3w65d37apfqs3h9bc2c15y7v1bydppi44zfsdk";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Re-implementation of sloccount in Go";
     longDescription = ''
       loccount is a re-implementation of David A. Wheeler's sloccount tool
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index e5988b1d5a9..94e3722598b 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildPackages, ncurses }:
+{ lib, stdenv, fetchFromGitHub, buildPackages, ncurses }:
 
-let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in
+let dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); in
 
 stdenv.mkDerivation rec {
   pname = "lsof";
@@ -18,14 +18,14 @@ stdenv.mkDerivation rec {
 
   patches = [ ./no-build-info.patch ];
 
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's|lcurses|lncurses|g' Configure
   '';
 
   # Stop build scripts from searching global include paths
-  LSOF_INCLUDE = "${stdenv.lib.getDev stdenv.cc.libc}/include";
+  LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include";
   configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}";
   preBuild = ''
     for filepath in $(find dialects/${dialect} -type f); do
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     cp lsof $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lsof-org/lsof";
     description = "A tool to list open files";
     longDescription = ''
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index d88d9d7a7be..e1d9ae6b551 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, elfutils, libunwind }:
+{ lib, stdenv, fetchurl, elfutils, libunwind }:
 
 stdenv.mkDerivation {
   name = "ltrace-0.7.3";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
       patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
     '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Library call tracer";
     homepage = "https://www.ltrace.org/";
     platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 87cf20c0cb8..223e10d04ab 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
+{ lib, stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
 
 stdenv.mkDerivation rec {
   pname = "lttng-tools";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tracing tools (kernel + user space) for Linux";
     homepage = "https://lttng.org/";
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index ba3930642b1..94d2e4a33f2 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, liburcu, python3 }:
+{ lib, stdenv, fetchurl, liburcu, python3 }:
 
 # NOTE:
 #   ./configure ...
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ liburcu ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "LTTng Userspace Tracer libraries";
     homepage = "https://lttng.org/";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix
index ab5fa418dc7..a196c5f4528 100644
--- a/pkgs/development/tools/misc/lttv/default.nix
+++ b/pkgs/development/tools/misc/lttv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }:
+{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }:
 
 stdenv.mkDerivation rec {
   name = "lttv-1.5";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib gtk2 popt babeltrace ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Graphical trace viewer for LTTng trace files";
     homepage = "https://lttng.org/";
     # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index fa19b249407..9f83ca5565f 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub
+{lib, stdenv, fetchFromGitHub
 , curl, makeWrapper, which, unzip
 , lua
 # for 'luarocks pack'
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     export LUA_PATH="src/?.lua;''${LUA_PATH:-}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit version;
     description = ''A package manager for Lua'';
     license = licenses.mit ;
diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix
index 5008175363c..c92d7b07798 100644
--- a/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/pkgs/development/tools/misc/macdylibbundler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchFromGitHub, cctools }:
+{ lib, stdenv, makeWrapper, fetchFromGitHub, cctools }:
 
 stdenv.mkDerivation {
   pname = "macdylibbundler";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
       --prefix PATH ":" "${cctools}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility to ease bundling libraries into executables for OSX";
     longDescription = ''
       dylibbundler is a small command-line programs that aims to make bundling
diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix
index 890439adc6e..2999b741888 100644
--- a/pkgs/development/tools/misc/micronucleus/default.nix
+++ b/pkgs/development/tools/misc/micronucleus/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    };
 
    buildInputs = [ libusb-compat-0_1 ];
-   makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
+   makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
 
    installPhase = ''
      mkdir -p $out/bin
diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix
index 0990b8d9733..f444f86dbfb 100644
--- a/pkgs/development/tools/misc/msitools/default.nix
+++ b/pkgs/development/tools/misc/msitools/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
+{ lib, stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "msitools";
   version = "0.98";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of programs to inspect and build Windows Installer (.MSI) files";
     homepage = "https://wiki.gnome.org/msitools";
     license = [ licenses.gpl2 licenses.lgpl21 ];
diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix
index 5795fca457d..1919e26ddec 100644
--- a/pkgs/development/tools/misc/nimlsp/default.nix
+++ b/pkgs/development/tools/misc/nimlsp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, srcOnly, nim }:
+{ lib, stdenv, fetchFromGitHub, srcOnly, nim }:
 let
   astpatternmatching = fetchFromGitHub {
     owner = "krux02";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     install -Dt $out/bin src/nimlsp
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Language Server Protocol implementation for Nim";
     homepage = "https://github.com/PMunch/nimlsp";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix
index e683bef7b06..8e8fb6bb597 100644
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/pkgs/development/tools/misc/ninka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, perlPackages }:
+{ lib, stdenv, fetchFromGitHub, perl, perlPackages }:
 
 assert stdenv ? glibc;
 
@@ -26,7 +26,7 @@ perlPackages.buildPerlPackage {
     perl Makefile.PL
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A sentence based license detector";
     homepage = "http://ninka.turingmachine.org/";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix
index eeb9100a4c8..a8a18b254b9 100644
--- a/pkgs/development/tools/misc/nrfutil/default.nix
+++ b/pkgs/development/tools/misc/nrfutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python37Packages, fetchFromGitHub }:
+{ lib, stdenv, python37Packages, fetchFromGitHub }:
 
 with python37Packages; buildPythonApplication rec {
   pname = "nrfutil";
@@ -20,7 +20,7 @@ with python37Packages; buildPythonApplication rec {
     mkdir test-reports
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Device Firmware Update tool for nRF chips";
     homepage = "https://github.com/NordicSemiconductor/pc-nrfutil";
     license = licenses.unfreeRedistributable;
diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
index e9259b7156b..74309a33f22 100644
--- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
+++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchFromGitHub
 , cmake
 , pkg-config
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "echo ${version} > .tarball-version";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Freescale/NXP I.MX chip image deploy tools";
     longDescription = ''
       UUU (Universal Update Utility) is a command line tool, evolved out of
diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix
index 52cc1b2d5c5..55147e9a16d 100644
--- a/pkgs/development/tools/misc/objconv/default.nix
+++ b/pkgs/development/tools/misc/objconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "objconv";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     mv objconv-instructions.pdf $out/doc/objconv
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Object and executable file converter, modifier and disassembler";
     homepage = "https://www.agner.org/optimize/";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index 79fa383300e..01f2ced1f4b 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }:
+{ lib, stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "opengrok";
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname"
     substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}"
     wrapProgram $out/bin/OpenGrok \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \
+      --prefix PATH : "${lib.makeBinPath [ ctags git ]}" \
       --set JAVA_HOME "${jre}" \
       --set OPENGROK_TOMCAT_BASE "/var/tomcat"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Source code search and cross reference engine";
     homepage = "https://opengrok.github.io/OpenGrok/";
     license = licenses.cddl;
diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
index bb88862a8e8..c39ef5e0051 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, elfutils, zlib }:
+{ lib, stdenv, fetchgit, cmake, elfutils, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "pahole";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # Put libraries in "lib" subdirectory, not top level of $out
   cmakeFlags = [ "-D__LIB=lib" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/";
     description = "Pahole and other DWARF utils";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 1d31709ccf0..a0c002d8a8c 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   # fails 8 out of 24 tests, problems when loading libc.so.6
   doCheck = stdenv.name == "stdenv-linux";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/NixOS/patchelf/blob/master/README";
     license = licenses.gpl3;
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 0d9eeb84bfb..1d790740e69 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
+{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "patchelf-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   # Drop test that fails on musl (?)
-  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace tests/Makefile.am \
       --replace "set-rpath-library.sh" ""
   '';
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/NixOS/patchelf/blob/master/README";
     license = licenses.gpl3;
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
diff --git a/pkgs/development/tools/misc/perfect-hash/default.nix b/pkgs/development/tools/misc/perfect-hash/default.nix
index 4e405413e3a..7447bf66022 100644
--- a/pkgs/development/tools/misc/perfect-hash/default.nix
+++ b/pkgs/development/tools/misc/perfect-hash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, fetchFromGitHub }:
+{ lib, stdenv, python3, fetchFromGitHub }:
 python3.pkgs.buildPythonApplication rec {
   pname = "perfect-hash";
   version = "0.4.1";
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
     cp -r examples $out/share/doc/perfect-hash
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minimal perfect hash function generator";
     longDescription = ''
       Generate a minimal perfect hash function for a given set of keys.
diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix
index 9b8f01b24e7..b0b3115700f 100644
--- a/pkgs/development/tools/misc/pkg-config/default.nix
+++ b/pkgs/development/tools/misc/pkg-config/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, libiconv, vanilla ? false }:
+{ lib, stdenv, fetchurl, libiconv, vanilla ? false }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "pkg-config";
diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix
index 6fca02ad788..c6c984f9699 100644
--- a/pkgs/development/tools/misc/pkgconf/default.nix
+++ b/pkgs/development/tools/misc/pkgconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, removeReferencesTo }:
+{ lib, stdenv, fetchurl, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
   pname = "pkgconf";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     mv ${placeholder "dev"}/share ${placeholder "out"}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Package compiler and linker metadata toolkit";
     homepage = "https://git.dereferenced.org/pkgconf/pkgconf";
     platforms = platforms.all;
diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix
index 81a88f20ad2..1fd58fd14a2 100644
--- a/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/pkgs/development/tools/misc/pmccabe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "pmccabe";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "McCabe-style function complexity and line counting for C and C++";
     homepage = "https://people.debian.org/~bame/pmccabe/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix
index 5d7ca75de32..63fc7c8e64a 100644
--- a/pkgs/development/tools/misc/prelink/default.nix
+++ b/pkgs/development/tools/misc/prelink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libelf }:
+{ lib, stdenv, fetchurl, libelf }:
 
 let
   version = "20130503";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   inherit version;
 
   buildInputs = [
-    libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc)
+    libelf stdenv.cc.libc (lib.getOutput "static" stdenv.cc.libc)
   ];
 
   src = fetchurl {
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
     homepage = "https://people.redhat.com/jakub/prelink/";
     license = "GPL";
     description = "ELF prelinking utility to speed up dynamic linking";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
index a630c0ced9e..9176842d75d 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{lib, stdenv, fetchurl, unzip}:
 
 let baseName = "premake";
   version  = "3.7";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://industriousone.com/premake";
     description = "A simple build configuration and project generation tool using lua";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index 5e8606833d3..bb0269d0cc3 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, Foundation, readline }:
+{ lib, stdenv, fetchFromGitHub, Foundation, readline }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "premake5";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://premake.github.io";
     description = "A simple build configuration and project generation tool using lua";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = platforms.darwin ++ platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix
index 92445abbba9..ccd8a4574a1 100644
--- a/pkgs/development/tools/misc/premake/default.nix
+++ b/pkgs/development/tools/misc/premake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 let baseName = "premake";
   version  = "4.3";
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
   premake_cmd = "premake4";
   setupHook = ./setup-hook.sh;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://industriousone.com/premake";
     description = "A simple build configuration and project generation tool using lua";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix
index 93014af3f62..0ef7a2aa73a 100644
--- a/pkgs/development/tools/misc/ptags/default.nix
+++ b/pkgs/development/tools/misc/ptags/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     $releaseDir/ptags --help > /dev/null
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A parallel universal-ctags wrapper for git repository";
     homepage = "https://github.com/dalance/ptags";
     maintainers = with maintainers; [ pamplemousse ];
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index f9d792d185f..69ed17ab4b9 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python3
 , fetchFromGitHub
 , makeWrapper
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
       --set NIX_PYTHONPATH ${pythonPath}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Exploit Development and Reverse Engineering with GDB Made Easy";
     homepage = "https://github.com/pwndbg/pwndbg";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
index d259721353b..643e28e82b2 100644
--- a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
+++ b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libarchive, python, file, which }:
+{ lib, stdenv, fetchurl, libarchive, python, file, which }:
 
 stdenv.mkDerivation rec {
   pname = "remarkable-toolchain";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     ENVCLEANED=1 $src -y -d $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A toolchain for cross-compiling to reMarkable tablets";
     homepage = "https://remarkable.engineering/";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
index f4f83f21840..7b4df5df164 100644
--- a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
+++ b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libarchive, python3, file }:
+{ lib, stdenv, fetchurl, libarchive, python3, file }:
 
 stdenv.mkDerivation rec {
   pname = "remarkable2-toolchain";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     ./install-toolchain.sh -D -y -d $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A toolchain for cross-compiling to reMarkable 2 tablets";
     homepage = "https://remarkable.engineering/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix
index 09769d5c591..1f7de915c97 100644
--- a/pkgs/development/tools/misc/rman/default.nix
+++ b/pkgs/development/tools/misc/rman/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "rman-3.2";
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats";
     license = "artistic";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix
index 6eb13bb242d..d86277993ca 100644
--- a/pkgs/development/tools/misc/rolespec/default.nix
+++ b/pkgs/development/tools/misc/rolespec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper }:
 
 stdenv.mkDerivation rec {
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/nickjj/rolespec";
     description = "A test library for testing Ansible roles";
     longDescription = ''
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index b9f84edc964..c26e834ee0f 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -6,7 +6,7 @@
 #
 # In NixOS, simply add this package to services.udev.packages.
 
-{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft
+{ lib, stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft
 , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor
 , freetype, libXinerama, libxcb, zlib, pciutils
 , makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL
@@ -14,7 +14,7 @@
 
 let
 
-  libPath = stdenv.lib.makeLibraryPath [
+  libPath = lib.makeLibraryPath [
     glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11
     libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib
     dbus libGL
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Software for Saleae logic analyzers";
     homepage = "https://www.saleae.com/";
     license = licenses.unfree;
diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix
index 5fc23547615..49052c141a1 100644
--- a/pkgs/development/tools/misc/scc/default.nix
+++ b/pkgs/development/tools/misc/scc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "scc";
@@ -16,7 +16,7 @@ buildGoModule rec {
   # scc has a scripts/ sub-package that's for testing.
   excludedPackages = [ "scripts" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/boyter/scc";
     description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go";
     maintainers = with maintainers; [ sigma Br1ght0ne ];
diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix
index 610e66a2b9c..22bf244662b 100644
--- a/pkgs/development/tools/misc/sipp/default.nix
+++ b/pkgs/development/tools/misc/sipp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, libpcap }:
+{lib, stdenv, fetchurl, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
   version = "3.6.0";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses libpcap];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://sipp.sf.net";
     description = "The SIPp testing tool";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix
index b2b83aa79b1..fc041f2ee8d 100644
--- a/pkgs/development/tools/misc/sloccount/default.nix
+++ b/pkgs/development/tools/misc/sloccount/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, perl, makeWrapper }:
+{ fetchurl, lib, stdenv, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "sloccount-2.26";
@@ -62,11 +62,11 @@ stdenv.mkDerivation rec {
       the Perl CPAN library using this tool suite.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
     homepage = "https://www.dwheeler.com/sloccount/";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix
index f978d4d4e12..a18dcd85255 100644
--- a/pkgs/development/tools/misc/srecord/default.nix
+++ b/pkgs/development/tools/misc/srecord/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }:
+{ lib, stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }:
 
 stdenv.mkDerivation rec {
   name = "srecord-1.64";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost libtool groff ghostscript libgcrypt ];
 
-  configureFlags = stdenv.lib.optional (libgcrypt == null) "--without-gcrypt";
+  configureFlags = lib.optional (libgcrypt == null) "--without-gcrypt";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of powerful tools for manipulating EPROM load files";
     homepage = "http://srecord.sourceforge.net/";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.bjornfor ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index 7595b84721c..e67fd9ca7a8 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libusb1 }:
+{ lib, stdenv, fetchFromGitHub, cmake, libusb1 }:
 
 let
   # The Darwin build of stlink explicitly refers to static libusb.
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/etc/modprobe.d
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "In-circuit debug and programming for ST-Link devices";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/tools/misc/stm32cubemx/default.nix
index 9fe34aecade..3b754e4c91b 100644
--- a/pkgs/development/tools/misc/stm32cubemx/default.nix
+++ b/pkgs/development/tools/misc/stm32cubemx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }:
+{ lib, stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }:
 
 let
   version = "6.0.1";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     ln -s ${desktopItem}/share/applications/* $out/share/applications
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A graphical tool for configuring STM32 microcontrollers and microprocessors";
     longDescription = ''
       A graphical tool that allows a very easy configuration of STM32
diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix
index 0c2cb96a9d6..bc7d4b1b3dc 100644
--- a/pkgs/development/tools/misc/stm32flash/default.nix
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "stm32flash-0.5";
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     cp stm32flash $out/bin/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source flash program for the STM32 ARM processors using the ST bootloader";
     homepage = "https://sourceforge.net/projects/stm32flash/";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     platforms = platforms.all; # Should work on all platforms
     maintainers = with maintainers; [ elitak ];
   };
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 877aedc4e49..004e1527d35 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libunwind, buildPackages }:
+{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "strace";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl ];
 
-  buildInputs = [ perl.out ] ++ stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
+  buildInputs = [ perl.out ] ++ lib.optional libunwind.supportsHost libunwind; # support -k
 
   postPatch = "patchShebangs --host strace-graph";
 
   configureFlags = [ "--enable-mpers=check" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://strace.io/";
     description = "A system call tracer for Linux";
     license =  with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix
index 745cc9a2e78..1068b3e2ad9 100644
--- a/pkgs/development/tools/misc/swig/2.x.nix
+++ b/pkgs/development/tools/misc/swig/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "swig";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
     homepage = "http://swig.org/";
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 853a240ffc3..109243b54ba 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "swig";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interface compiler that connects C/C++ code to higher-level languages";
     homepage = "http://swig.org/";
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix
index 4096b7353fa..56106143027 100644
--- a/pkgs/development/tools/misc/swig/4.nix
+++ b/pkgs/development/tools/misc/swig/4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "swig";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
     homepage = "http://swig.org/";
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index cf0880855db..3c1a5b82dc2 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, tcl }:
+{ lib, stdenv, fetchurl, boost, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "swig";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isCygwin;
   # 'make check' uses boost and tcl
-  buildInputs = stdenv.lib.optionals doCheck [ boost tcl ];
+  buildInputs = lib.optionals doCheck [ boost tcl ];
 
   configureFlags = [ "--disable-ccache" ];
 
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
     homepage = "http://swig.org/";
     # Different types of licenses available: http://www.swig.org/Release/LICENSE .
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index fb9b1966015..2cf8c91d3bf 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , libmysqlclient, libaio
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Modular, cross-platform and multi-threaded benchmark tool";
     homepage = "https://github.com/akopytov/sysbench";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix
index 9872c91ac4b..5b1fd72a7f5 100644
--- a/pkgs/development/tools/misc/tcptrack/default.nix
+++ b/pkgs/development/tools/misc/tcptrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, libpcap }:
+{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
   pname = "tcptrack";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "libpcap based program for live TCP connection monitoring";
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 40f3921ec70..156e3f7f895 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, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }:
+{ lib, stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }:
 
 stdenv.mkDerivation rec {
   pname = "teensy-loader-cli";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     installManPage *.1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Firmware uploader for the Teensy microcontroller boards";
     homepage = "https://www.pjrc.com/teensy/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix
index acc42d61423..5e66b974337 100644
--- a/pkgs/development/tools/misc/tet/default.nix
+++ b/pkgs/development/tools/misc/tet/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation ({
   version = "3.8";
@@ -22,8 +22,8 @@ stdenv.mkDerivation ({
   meta = {
     description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program";
     homepage = "http://tetworks.opengroup.org/Products/tet.htm";
-    license = stdenv.lib.licenses.artistic1;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.artistic1;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix
index 0c3736ff2f3..98f846b7c2f 100644
--- a/pkgs/development/tools/misc/texi2html/default.nix
+++ b/pkgs/development/tools/misc/texi2html/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gettext, buildPackages }:
+{ lib, stdenv, fetchurl, perl, gettext, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "texi2html";
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
     patchShebangs separated_to_hash.pl
   '';
 
-  postInstall = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+  postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
     for f in $out/bin/*; do
       substituteInPlace $f --replace "${buildPackages.perl}" "${perl}"
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Perl script which converts Texinfo source files to HTML output";
     homepage = "https://www.nongnu.org/texi2html/";
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 057e52615ac..1c5de083bc0 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -1,6 +1,6 @@
 { version, sha256 }:
 
-{ stdenv, buildPackages, fetchurl, perl, xz, gettext
+{ lib, stdenv, buildPackages, fetchurl, perl, xz, gettext
 
 # we are a dependency of gcc, this simplifies bootstraping
 , interactive ? false, ncurses, procps
@@ -15,7 +15,7 @@ let
   crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
 in
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "texinfo-${optionalString interactive "interactive-"}${version}";
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     ++ optional interactive ncurses;
 
   configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
-    ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
+    ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
 
   installFlags = [ "TEXMF=$(out)/texmf-dist" ];
   installTargets = [ "install" "install-tex" ];
diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix
index 074523309b6..e75248aa867 100644
--- a/pkgs/development/tools/misc/tie/default.nix
+++ b/pkgs/development/tools/misc/tie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "tie";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp tie $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.ctan.org/tex-archive/web/tie";
     description = "Allow multiple web change files";
     platforms = with platforms; unix;
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 32094d9303b..47966dcc133 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tokei";
@@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994=";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isDarwin [
     libiconv darwin.apple_sdk.frameworks.Security
   ];
 
   # enable all output formats
   cargoBuildFlags = [ "--features" "all" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A program that allows you to count your code, quickly";
     longDescription = ''
       Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language.
diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix
index ca51e089733..1fb255073ed 100644
--- a/pkgs/development/tools/misc/uisp/default.nix
+++ b/pkgs/development/tools/misc/uisp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "uisp-20050207";
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     homepage = "https://savannah.nongnu.org/projects/uisp";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index 526e71515ae..f6b51a969b2 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, python }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake python ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
     homepage = "http://uncrustify.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix
index 19dd907b73b..53e2b2762d3 100644
--- a/pkgs/development/tools/misc/unifdef/default.nix
+++ b/pkgs/development/tools/misc/unifdef/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "unifdef-2.6";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     export DESTDIR=$out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://dotat.at/prog/unifdef/";
     description = "Selectively remove C preprocessor conditionals";
     license = licenses.bsd2;
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index b086b3cdc48..bd362e8d1a4 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }:
 
 stdenv.mkDerivation {
   pname = "universal-ctags";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ];
-  buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv;
 
   # to generate makefile.in
   autoreconfPhase = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   checkFlags = [ "units" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A maintained ctags implementation";
     homepage = "https://ctags.io/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix
index 3e5f9c319ef..6487c3fc2c0 100644
--- a/pkgs/development/tools/misc/unused/default.nix
+++ b/pkgs/development/tools/misc/unused/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cmake }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake }:
 rustPlatform.buildRustPackage rec {
   pname = "unused";
   version = "0.2.1";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1c0gj2wp0nydv0binxj3ikm5sm6y5z3pklp5b06dgvq02licz57a";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to identify potentially unused code";
     homepage = "https://unused.codes";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 6280b103ab6..7bb9fc69c58 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, usb-modeswitch }:
+{ lib, stdenv, fetchurl, tcl, usb-modeswitch }:
 
 stdenv.mkDerivation rec {
   pname = "usb-modeswitch-data";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   # the usb_modeswitch.d directory
   nativeBuildInputs = [ tcl ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Device database and the rules file for 'multi-mode' USB devices";
     inherit (usb-modeswitch.meta) license maintainers platforms;
   };
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index 5cbe627b553..4f9dbe92d2b 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libusb1 tcl ];
   nativeBuildInputs = [ pkg-config makeWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A mode switching tool for controlling 'multi-mode' USB devices";
     license = licenses.gpl2;
     maintainers = with maintainers; [ marcweber peterhoeg ];
diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix
index a44140c1445..1bd59aa9944 100644
--- a/pkgs/development/tools/misc/vtable-dumper/default.nix
+++ b/pkgs/development/tools/misc/vtable-dumper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libelf }:
+{ lib, stdenv, fetchFromGitHub, libelf }:
 
 stdenv.mkDerivation rec {
   pname = "vtable-dumper";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libelf ];
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/lvc/vtable-dumper";
     description = "A tool to list content of virtual tables in a C++ shared library";
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix
index 81f5430371a..23ec0643d77 100644
--- a/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
+{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "watson-ruby";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = bundlerUpdateScript "watson-ruby";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An inline issue manager";
     homepage    = "https://goosecode.com/watson/";
     license     = with licenses; mit;
diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index c882d6243fa..6afcfe871a4 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, fetchFromGitHub, clang-unwrapped }:
+{ lib, stdenv, python3, fetchFromGitHub, clang-unwrapped }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "whatstyle";
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
 
   doCheck = false; # 3 or 4 failures depending on version, haven't investigated.
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Find a code format style that fits given source files";
     homepage = "https://github.com/mikr/whatstyle";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix
index e54dc7844e7..b9785bac7c5 100644
--- a/pkgs/development/tools/misc/xc3sprog/default.nix
+++ b/pkgs/development/tools/misc/xc3sprog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }:
+{ lib, stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }:
 
 # The xc3sprog project doesn't seem to make proper releases, they only put out
 # prebuilt binary subversion snapshots on sourceforge.
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libusb-compat-0_1 libftdi ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG";
     homepage = "http://xc3sprog.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 4bbff3ca33f..cf4fe39754f 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ boost llvmPackages.libclang ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa;
+    ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
                 "'$out/lib/ycmd/ycmd/__main__.py'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A code-completion and comprehension server";
     homepage = "https://github.com/Valloric/ycmd";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 6bb7e1377af..a8b48e9fa53 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, perl, icmake, util-linux }:
+{ lib, stdenv, fetchFromGitLab, perl, icmake, util-linux }:
 
 stdenv.mkDerivation rec {
   pname = "yodl";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     ./build install man
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package that implements a pre-document language and tools to process it";
     homepage = "https://fbb-git.gitlab.io/yodl/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix
index 5c63447fdc5..efe4c960566 100644
--- a/pkgs/development/tools/modd/default.nix
+++ b/pkgs/development/tools/modd/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, stdenv }:
+{ buildGoPackage, fetchFromGitHub, lib, stdenv }:
 
 buildGoPackage rec {
   pname = "modd";
@@ -11,7 +11,7 @@ buildGoPackage rec {
   };
   goPackagePath = "github.com/cortesi/modd";
   subPackages = [ "cmd/modd" ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A flexible developer tool that runs processes and responds to filesystem changes";
     homepage = "https://github.com/cortesi/modd";
     license = licenses.mit;
diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix
index 7bcf72df55c..99e4eb62156 100644
--- a/pkgs/development/tools/mustache-go/default.nix
+++ b/pkgs/development/tools/mustache-go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "mustache-go";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "0mnh5zbpfwymddm1dppg9i9d1r8jqyg03z2gl6c5a8fgbrnxpjvc";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/cbroglie/mustache";
     description = "The mustache template language in Go";
     license = [ licenses.mit ];
diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix
index 2f51f0d9338..58c0f2ed28b 100644
--- a/pkgs/development/tools/nemiver/default.nix
+++ b/pkgs/development/tools/nemiver/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   version = "0.9.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/nemiver/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
   };
 
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index be772f60492..fb85aa80dc3 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }:
+{ lib, stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }:
 
 # If you happen to use this software on the XMonad window manager, you will have issues with
 # grey windows, no resizing, menus not showing and other glitches.
@@ -87,9 +87,9 @@ in stdenv.mkDerivation {
     homepage = "https://www.neotys.com/product/overview-neoload.html";
 
     # https://www.neotys.com/documents/legal/eula/neoload/eula_en.html
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
 
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    maintainers = [ lib.maintainers.bluescreen303 ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index ffd2a78f509..31358129821 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
 
     ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0
 
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
 
     mkdir -p $out/bin
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An app runtime based on Chromium and node.js";
     homepage = "https://nwjs.io/";
     platforms = ["i686-linux" "x86_64-linux"];
diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix
index a1c9bfd53e3..72177582919 100644
--- a/pkgs/development/tools/nrpl/default.nix
+++ b/pkgs/development/tools/nrpl/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       --prefix PATH : ${lib.makeBinPath [ nim tinycc ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "REPL for the Nim programming language";
     homepage = "https://github.com/wheineman/nrpl";
     license = licenses.mit;
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 4eedc003272..d3490b2b9c9 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   installPhase =
-    let ccPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
+    let ccPath = lib.makeLibraryPath [ stdenv.cc.cc ];
     in ''
       mkdir -p $out/share/nwjs
       cp -R * $out/share/nwjs
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An app runtime based on Chromium and node.js";
     homepage = "https://nwjs.io/";
     platforms = ["i686-linux" "x86_64-linux"];
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 309c44d6d46..a464996ff38 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, writeText }:
+{ lib, stdenv, fetchurl, ocaml, writeText }:
 
 let
   pname = "camlidl";
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     description = "A stub code generator and COM binding for Objective Caml";
     homepage = webpage;
     license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    maintainers = [ lib.maintainers.roconnor ];
   };
 }
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index 73228655cca..fffa426ba4c 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, which, ocaml, ocamlbuild }:
+{ lib, stdenv, fetchzip, which, ocaml, ocamlbuild }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.09"
+if lib.versionAtLeast ocaml.version "4.09"
 then throw "camlp4 is not available for OCaml ${ocaml.version}"
 else
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A software system for writing extensible parsers for programming languages";
     homepage = "https://github.com/ocaml/camlp4";
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 6d68a320a91..fc79cafdc42 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, ocaml, perl }:
+{ lib, stdenv, fetchzip, ocaml, perl }:
 
-if stdenv.lib.versionOlder ocaml.version "4.02"
+if lib.versionOlder ocaml.version "4.02"
 then throw "camlp5 is not available for OCaml ${ocaml.version}"
 else
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Preprocessor-pretty-printer for OCaml";
     longDescription = ''
       Camlp5 is a preprocessor and pretty-printer for OCaml programs.
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index a0215fa8147..032f346bf9c 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild
+{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, ocamlbuild
 , buildDunePackage
 }:
 
 let
   pname = "cppo";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The C preprocessor for OCaml";
     longDescription = ''
       Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants.
@@ -17,7 +17,7 @@ let
 
 in
 
-if stdenv.lib.versionAtLeast ocaml.version "4.02" then
+if lib.versionAtLeast ocaml.version "4.02" then
 
 buildDunePackage rec {
   inherit pname;
diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index 8183e106aa7..00cf1da522a 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ocaml, findlib }:
+{ lib, stdenv, fetchurl, ocaml, findlib }:
 
-if stdenv.lib.versionOlder ocaml.version "4.08"
+if lib.versionOlder ocaml.version "4.08"
 then throw "dune is not available for OCaml ${ocaml.version}"
 else
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
     homepage = "https://dune.build/";
     description = "A composable build system";
     changelog = "https://github.com/ocaml/dune/releases/tag/${version}";
-    maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ];
+    license = lib.licenses.mit;
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 1354e158a8e..8752b2edb66 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
+{ lib, stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
 
 stdenv.mkDerivation rec {
   pname = "ocaml-findlib";
@@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://projects.camlcity.org/projects/findlib.html";
     description = "O'Caml library manager";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.maggesi
-      stdenv.lib.maintainers.vbmithr
+      lib.maintainers.maggesi
+      lib.maintainers.vbmithr
     ];
   };
 }
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index a0932d919c0..6854c7c20ca 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }:
 
 stdenv.mkDerivation {
   version = "0.4.10";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   buildPhase     = "ocaml setup.ml -build";
   installPhase   = "ocaml setup.ml -install";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://oasis.forge.ocamlcore.org/";
     description = "Configure, build and install system for OCaml projects";
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix
index 5e851a93205..e31334000da 100644
--- a/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/pkgs/development/tools/ocaml/obuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml }:
+{ lib, stdenv, fetchzip, ocaml }:
 
 let version = "0.1.10"; in
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/ocaml-obuild/obuild";
     platforms = ocaml.meta.platforms or [];
     description = "Simple package build system for OCaml";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ volth ];
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ volth ];
   };
 }
diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index 7270386972d..c74794b35c9 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
 let
   version = "0.14.0";
 in
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ocaml/ocamlbuild/";
     description = "A build system with builtin rules to easily build most OCaml projects";
     license = licenses.lgpl2;
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index 9b06a55f07d..a43903c34d3 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation {
   name = "ocamlify-0.0.2";
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
     homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
     description = "Generate OCaml modules from source files";
     platforms = ocaml.meta.platforms or [];
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [
       maggesi
     ];
   };
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 49342d7b848..77d39029551 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
 
 stdenv.mkDerivation {
   pname = "ocamlmod";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
     description = "Generate OCaml modules from source files";
     platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [
+    maintainers = with lib.maintainers; [
       maggesi
     ];
   };
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 57db5161224..655f7b4d4c2 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }:
 let
   version = "1.99.21";
 in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   export configureFlags="$configureFlags --with-metadir=$OCAMLFIND_DESTDIR"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.typerex.org/ocp-build.html";
     description = "A build tool for OCaml";
     longDescription = ''
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index 476c98ce5bc..b12aa2e6d6d 100644
--- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocamlPackages }:
+{ lib, stdenv, fetchzip, ocamlPackages }:
 
 stdenv.mkDerivation rec
 {
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec
   meta = {
     homepage = "https://github.com/besport/ocsigen-i18n";
     description = "I18n made easy for web sites written with eliom";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.gal_bolle ];
   };
 
 }
diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
index b840cb7736b..047246cd0a0 100644
--- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
+{lib, stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
 let
   pname = "omake";
   version = "0.9.8.6-0.rc1";
   webpage = "http://omake.metaprl.org";
 in
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if lib.versionAtLeast ocaml.version "4.06"
 then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
 else
 
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 2afe0d1e9f5..bcfd86a2d4d 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, ncurses }:
+{ lib, stdenv, fetchurl, ocaml, ncurses }:
 
 stdenv.mkDerivation rec {
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A build system designed for scalability and portability";
     homepage = "http://projects.camlcity.org/projects/omake.html";
-    license = with stdenv.lib.licenses; [
+    license = with lib.licenses; [
       mit /* scripts */
       gpl2 /* program */
     ];
diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix
index a49749ad716..9cdacd289d4 100644
--- a/pkgs/development/tools/ocaml/opaline/default.nix
+++ b/pkgs/development/tools/ocaml/opaline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocamlPackages }:
+{ lib, stdenv, fetchFromGitHub, ocamlPackages }:
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OPAm Light INstaller Engine";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
     inherit (ocamlPackages.ocaml.meta) platforms;
   };
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
index e6c08b97aca..a128f2144e9 100644
--- a/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -82,7 +82,7 @@ in stdenv.mkDerivation {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package manager for OCaml";
     homepage = "http://opam.ocamlpro.com/";
     maintainers = [ maintainers.henrytill ];
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 9e95db79dd0..4fe408fb77f 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -110,7 +110,7 @@ in stdenv.mkDerivation {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A package manager for OCaml";
     homepage = "https://opam.ocaml.org/";
     maintainers = [ maintainers.henrytill maintainers.marsam ];
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 2c4c330b286..622ac80306f 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ocaml, findlib
+{ lib, stdenv, fetchurl, ocaml, findlib
 , lambdaTerm, cppo, makeWrapper, buildDunePackage
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !lib.versionAtLeast ocaml.version "4.03"
 then throw "utop is not available for OCaml ${ocaml.version}"
 else
 
@@ -58,7 +58,7 @@ buildDunePackage rec {
       --prefix CAML_LD_LIBRARY_PATH ":" "${get "CAML_LD_LIBRARY_PATH"}" \
       --prefix OCAMLPATH ":" "${get "OCAMLPATH"}" \
       --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH") \
-      --add-flags "-I ${findlib}/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib"
+      --add-flags "-I ${findlib}/lib/ocaml/${lib.getVersion ocaml}/site-lib"
    done
    '';
 
@@ -70,10 +70,10 @@ buildDunePackage rec {
     It integrates with the tuareg mode in Emacs.
     '';
     homepage = "https://github.com/diml/utop";
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = ocaml.meta.platforms or [];
     maintainers = [
-      stdenv.lib.maintainers.gal_bolle
+      lib.maintainers.gal_bolle
     ];
   };
 }
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 2ab8fa23dde..74341c0a7b4 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2 }:
+{ lib, stdenv, fetchurl, python2 }:
 stdenv.mkDerivation rec {
 
   pname = "omniorb";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant";
     homepage    = "http://omniorb.sourceforge.net/";
     license     = licenses.gpl2Plus;
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 9dd085b421f..ac5ab022ef1 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , mono5
 , makeWrapper
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     --add-flags "$out/src/OmniSharp.exe"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OmniSharp based on roslyn workspaces";
     homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix
index 75737764219..9ab69d1d5d8 100644
--- a/pkgs/development/tools/out-of-tree/default.nix
+++ b/pkgs/development/tools/out-of-tree/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
 
   postFixup = ''
     wrapProgram $out/bin/out-of-tree \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}"
+      --prefix PATH : "${lib.makeBinPath [ qemu docker which ]}"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix
index 9bca1ec75b6..31ccf19bb05 100644
--- a/pkgs/development/tools/packet/default.nix
+++ b/pkgs/development/tools/packet/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit }:
+{ lib, stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "packet";
@@ -18,8 +18,8 @@ buildGoPackage rec {
   meta = {
     description = "a CLI tool to manage packet.net services";
     homepage = "https://github.com/ebsarr/packet";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.grahamc ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.grahamc ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix
index 39c022604d8..2efe752c363 100644
--- a/pkgs/development/tools/parsing/antlr/3.5.nix
+++ b/pkgs/development/tools/parsing/antlr/3.5.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.antlr.org/";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.farlion ];
+    maintainers = [ lib.maintainers.farlion ];
   };
 }
diff --git a/pkgs/development/tools/parsing/antlr/4.8.nix b/pkgs/development/tools/parsing/antlr/4.8.nix
index acf46a4401f..0708ba754b2 100644
--- a/pkgs/development/tools/parsing/antlr/4.8.nix
+++ b/pkgs/development/tools/parsing/antlr/4.8.nix
@@ -19,8 +19,8 @@ let
       outputs = [ "out" "dev" "doc" ];
 
       nativeBuildInputs = [ cmake ninja pkg-config ];
-      buildInputs = stdenv.lib.optional stdenv.isLinux libuuid
-        ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation;
+      buildInputs = lib.optional stdenv.isLinux libuuid
+        ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation;
 
       postUnpack = ''
         export sourceRoot=$sourceRoot/runtime/Cpp
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index aa8d8df2c1d..662961ae46a 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl, help2man }:
+{ lib, stdenv, fetchurl, m4, perl, help2man }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv";
   };
 
-  nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
+  nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 
   doCheck = false; # fails
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.gnu.org/software/bison/";
     description = "Yacc-compatible parser generator";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     longDescription = ''
       Bison is a general-purpose parser generator that converts an
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       to use Bison.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
   passthru = { glrSupport = true; };
diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
index c352b5a3837..b2245ff9c9b 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ m4 ];
 
-  preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix
index 3a032e60c32..cc0ecb148c4 100644
--- a/pkgs/development/tools/parsing/flex/2.6.1.nix
+++ b/pkgs/development/tools/parsing/flex/2.6.1.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   postPatch = ''
     patchShebangs tests
-  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     substituteInPlace Makefile.in --replace "tests" " ";
   '';
 
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ m4 ];
 
-  preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
+  postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
     sed -i Makefile -e 's/-no-undefined//;'
   '';
 
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index c77c1f73c69..42b007300a9 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs tests
-  '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+  '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
     substituteInPlace Makefile.in --replace "tests" " "
 
     substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: '
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ bison ];
   propagatedBuildInputs = [ m4 ];
 
-  preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
+  postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
     sed -i Makefile -e 's/-no-undefined//;'
   '';
 
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index fd730809711..6bbcf36cd2c 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -13,15 +13,15 @@ let
         inherit sha256;
       };
 
-      buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
+      buildInputs = lib.optional build-manual [ transfig ghostscript tex ];
 
-      preConfigure = stdenv.lib.optional build-manual ''
+      preConfigure = lib.optional build-manual ''
         sed -i "s/build_manual=no/build_manual=yes/g" DIST
       '';
 
       configureFlags = [ "--with-colm=${colm}" ];
 
-      NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=gnu++98";
+      NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu++98";
 
       doCheck = true;
 
@@ -40,12 +40,12 @@ in
   ragelStable = generic {
     version = "6.10";
     sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
   };
 
   ragelDev = generic {
     version = "7.0.0.12";
     sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix
index 0e3e1b7e9ca..d5c6872cd7d 100644
--- a/pkgs/development/tools/pgformatter/default.nix
+++ b/pkgs/development/tools/pgformatter/default.nix
@@ -24,8 +24,8 @@ perlPackages.buildPerlPackage rec {
       --replace "'INSTALLDIRS'  => \$INSTALLDIRS," "'INSTALLDIRS'  => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3',"
   '';
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
+  postInstall = lib.optionalString stdenv.isDarwin ''
     shortenPerlShebang $out/bin/pg_format
   '';
 
diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix
index 0e16726bb80..94217a765e2 100644
--- a/pkgs/development/tools/pgloader/default.nix
+++ b/pkgs/development/tools/pgloader/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ git makeWrapper ];
   buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ];
 
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
 
   buildPhase = ''
     export PATH=$PATH:$out/bin
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index f042aa35b6f..66cdb09cf15 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   buildPhase = lib.optionalString (!stdenv.isDarwin) ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \
+      --set-rpath "${lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \
       bin/phantomjs
   '';
 
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 9fc2f416b76..594deeb1c73 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
     bison flex fontconfig freetype gperf icu openssl
     libjpeg libpng perl python ruby sqlite qtwebkit qtbase
     makeWrapper
-  ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     AGL ApplicationServices AppKit Cocoa OpenGL
     darwin.libobjc fakeClang cups
   ]);
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
   # invalid suffix on literal; C++11 requires a space between litend identifier
   NIX_CFLAGS_COMPILE = "-Wno-reserved-user-defined-literal";
 
-  __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
+  __impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
 
   enableParallelBuilding = true;
 
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/share/doc/phantomjs
     cp -a bin $out
     cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -change \
         ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \
         /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \
@@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
   '' + ''
     wrapProgram $out/bin/phantomjs \
     --set QT_QPA_PLATFORM offscreen \
-    --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]}
+    --prefix PATH : ${lib.makeBinPath [ qtbase ]}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 31065758914..21e43cdd8c9 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -127,7 +127,7 @@ self: super:
   cryptography = super.cryptography.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs or [ ]
-        ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
+        ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
       buildInputs = old.buildInputs ++ [ pkgs.openssl ];
     }
   );
@@ -443,7 +443,7 @@ self: super:
       inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
     in
     {
-      NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
+      NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
 
       XDG_RUNTIME_DIR = "/tmp";
 
@@ -466,9 +466,9 @@ self: super:
         pkgs.libpng
         pkgs.freetype
       ]
-        ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ]
-        ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ]
-        ++ stdenv.lib.optionals enableQt [ self.pyqt5 ]
+        ++ lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ]
+        ++ lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ]
+        ++ lib.optionals enableQt [ self.pyqt5 ]
       ;
 
       inherit (super.matplotlib) patches;
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index e856c1f718a..e057fc8ebe1 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl, autoconf, gfortran
 , libelf, libiberty, zlib, libbfd, libopcodes
 , buildPackages
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tool that aims at generating automatically execution trace from HPC programs";
-    license = stdenv.lib.licenses.cecill-b;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = lib.licenses.cecill-b;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index 335b9bef4cd..6cd3ea80027 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages
+{ lib, stdenv, buildPackages
 , fetchurl, pkg-config
 , libbfd, popt, zlib, linuxHeaders, libiberty_static
 , withGUI ? false, qt4 ? null
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ]
-    ++ stdenv.lib.optionals withGUI [ qt4 ];
+    ++ lib.optionals withGUI [ qt4 ];
 
   configureFlags = [
       "--with-kernel=${linuxHeaders}"
       "--disable-shared"   # needed because only the static libbfd is available
     ]
-    ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
+    ++ lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
 
   meta = {
     description = "System-wide profiler for Linux";
@@ -45,10 +45,10 @@ stdenv.mkDerivation rec {
       is profiled: hardware and software interrupt handlers, kernel
       modules, the kernel, shared libraries, and applications.
     '';
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     homepage = "http://oprofile.sourceforge.net/";
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix
index a1f5d00332c..a9443eeadf6 100644
--- a/pkgs/development/tools/profiling/sysprof/capture.nix
+++ b/pkgs/development/tools/profiling/sysprof/capture.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , meson
 , ninja
 , sysprof
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
 
   meta = sysprof.meta // {
     description = "Static library for Sysprof capture data generation";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 8144bae48c8..9e749adea20 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0";
   };
 
diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix
index ed0ce05843b..3f54a4f9c0e 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@@ -6,7 +6,7 @@
 , http-conduit, http-types, lens-family-core, megaparsec, mtl
 , network-uri, open-browser, optparse-applicative, prettyprinter
 , process, QuickCheck, retry, rio, rio-orphans, safe, semver-range
-, stdenv, stm, stringsearch, tar, template-haskell, temporary, text
+, lib, stdenv, stm, stringsearch, tar, template-haskell, temporary, text
 , time, transformers, turtle, unliftio, unordered-containers
 , utf8-string, vector, versions, with-utf8, zlib
 }:
@@ -41,5 +41,5 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   prePatch = "hpack";
   homepage = "https://github.com/purescript/spago#readme";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix
index a8973cd5084..a9634ec53c7 100644
--- a/pkgs/development/tools/py-spy/default.nix
+++ b/pkgs/development/tools/py-spy/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   NIX_CFLAGS_COMPILE = "-L${libunwind}/lib";
 
   # error: linker `arm-linux-gnueabihf-gcc` not found
-  preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+  preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
     export RUSTFLAGS="-Clinker=$CC"
   '';
 
diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix
index 67e7a879d88..eaaa057dc0a 100644
--- a/pkgs/development/tools/pydb/default.nix
+++ b/pkgs/development/tools/pydb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2, emacs }:
+{ lib, stdenv, fetchurl, python2, emacs }:
 
 stdenv.mkDerivation {
   name = "pydb-1.26";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Python debugger with GDB-like commands and Emacs bindings";
     homepage = "http://bashdb.sourceforge.net/pydb/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
index dece0a7b44b..71cf10e63b9 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/pkgs/development/tools/quilt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }:
+{ lib, stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }:
 
 stdenv.mkDerivation rec {
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
       and more.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
 
 }
diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix
index 16e832a99b8..098d7a59314 100644
--- a/pkgs/development/tools/rdocker/default.nix
+++ b/pkgs/development/tools/rdocker/default.nix
@@ -19,13 +19,13 @@ stdenv.mkDerivation {
 
   postInstall = ''
     wrapProgram $out/bin/rdocker \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ openssh ]}
+      --prefix PATH : ${lib.makeBinPath [ openssh ]}
   '';
 
   meta = with lib; {
     description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed";
     homepage = "https://github.com/dvddarias/rdocker";
-    maintainers = [ stdenv.lib.maintainers.pneumaticat ];
+    maintainers = [ lib.maintainers.pneumaticat ];
     license = licenses.mit;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index f5174da13a1..06b5dd79401 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  rpath = stdenv.lib.makeLibraryPath [
+  rpath = lib.makeLibraryPath [
     cairo
     stdenv.cc.cc
     gdk-pixbuf
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index 62b9df74127..828b8e5b1cd 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/nexus \
       --set JAVA_HOME ${jre_headless} \
       --set ALTERNATIVE_NAME "nexus" \
-      --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}"
+      --prefix PATH "${lib.makeBinPath [ gawk ]}"
 
     runHook postInstall
   '';
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index ec3fcf9cd39..e5da0ddf59a 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C/C++ client-server indexer based on clang";
     homepage = "https://github.com/andersbakken/rtags";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = with stdenv.lib.platforms; x86_64 ++ aarch64;
+    license = lib.licenses.gpl3;
+    platforms = with lib.platforms; x86_64 ++ aarch64;
   };
 }
diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix
index 0752f803c3c..186e044318e 100644
--- a/pkgs/development/tools/rund/default.nix
+++ b/pkgs/development/tools/rund/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/dragon-lang/rund";
     license = lib.licenses.boost;
     maintainers = with maintainers; [ jonathanmarler ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 490fa9e09c3..f453955a5c7 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j";
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   # Test checks against machine code output, which fails with some
   # LLVM/compiler versions.
diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index e28f9165ebb..7b9aa5cf610 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
+  ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
 
   meta = with lib; {
     description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries";
diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix
index 882f0408cec..021e19b9cd9 100644
--- a/pkgs/development/tools/rust/cargo-cache/default.nix
+++ b/pkgs/development/tools/rust/cargo-cache/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-sZxkEQBZ2PJXSvwcA+IL7uW/gcnzuzRcDklNW5vpzWg=";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 
   checkFlagsArray = [ "offline_tests" ];
 
diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix
index f2c8d72ec18..e3c16b09ef3 100644
--- a/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ perl pkg-config ];
 
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
 
   meta = with lib; {
     description = "A cryptographically verifiable code review system for the cargo (Rust) package manager";
diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix
index 4c2ee35bdf7..ba126e57a14 100644
--- a/pkgs/development/tools/rust/cargo-deny/default.nix
+++ b/pkgs/development/tools/rust/cargo-deny/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ perl pkg-config ];
 
   buildInputs = [ openssl  ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+    ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
 
   meta = with lib; {
     description = "Cargo plugin to generate list of all licenses for a crate";
diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix
index 4e30ea48272..70a2e6feca6 100644
--- a/pkgs/development/tools/rust/cargo-fund/default.nix
+++ b/pkgs/development/tools/rust/cargo-fund/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
 
   meta = with lib; {
     description = "Discover funding links for your project's dependencies";
diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix
index 9daa3b251e8..3b2702c66f6 100644
--- a/pkgs/development/tools/rust/cargo-geiger/default.nix
+++ b/pkgs/development/tools/rust/cargo-geiger/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   # FIXME: Use impure version of CoreFoundation because of missing symbols.
   # CFURLSetResourcePropertyForKey is defined in the headers but there's no
   # corresponding implementation in the sources from opensource.apple.com.
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE"
   '';
 
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 3a4c4c44ae7..635f36ee834 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl  ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
+    ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
 
   preCheck = ''
     export HOME=$(mktemp -d) USER=nixbld
diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix
index 5a8c9150279..9339660388b 100644
--- a/pkgs/development/tools/rust/cargo-inspect/default.nix
+++ b/pkgs/development/tools/rust/cargo-inspect/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
   cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw";
 
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index c90761309e6..e393184aebd 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
+    ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
 
   cargoSha256 = "sha256-Qh14lks72bsetwyv0ALF7nZo3m3FDEmVxzFkHJoEuzE=";
 
diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix
index 56e38f78ca0..11a52e6ea08 100644
--- a/pkgs/development/tools/rust/cargo-raze/default.nix
+++ b/pkgs/development/tools/rust/cargo-raze/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ curl libgit2 openssl ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+    ++ lib.optional stdenv.isDarwin Security;
 
   doCheck = true;
 
diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index 9da28921ea7..dcbf539c1c1 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ];
 
   # Requires network access
   doCheck = false;
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index db2a1c4c660..50809055337 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx";
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   checkFlags = [
     # https://github.com/eqrion/cbindgen/issues/338
diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index b2340b21689..ff52824ef9a 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -19,8 +19,8 @@ in rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ gmp openssl ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security
-    ++ stdenv.lib.optional stdenv.isLinux dbus;
+    ++ lib.optional stdenv.isDarwin Security
+    ++ lib.optional stdenv.isLinux dbus;
 
   # Requires network access, fails in sandbox.
   doCheck = false;
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index d5482d58457..3ad4b54b47a 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE=";
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   # a nightly compiler is required unless we use this cheat code.
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index 19cc3fdf580..33d6721610e 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   RUST_SRC_PATH = rustPlatform.rustcSrc;
 
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index fa9b39e84a7..56097f9b98c 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     curl zlib
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
+  ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
   cargoBuildFlags = [ "--features no-self-update" ];
 
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 9560d45d681..12082de9842 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  patchPhase = lib.optionalString stdenv.isLinux ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 5f01b98e8d1..d777d788aec 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  upstream-info = (stdenv.lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver;
+  upstream-info = (lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver;
   allSpecs = {
     x86_64-linux = {
       system = "linux64";
@@ -21,7 +21,7 @@ let
   spec = allSpecs.${stdenv.hostPlatform.system}
     or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
 
-  libs = stdenv.lib.makeLibraryPath [
+  libs = lib.makeLibraryPath [
     stdenv.cc.cc.lib
     cairo fontconfig freetype
     gdk-pixbuf glib gtk2 gconf
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     install -m755 -D chromedriver $out/bin/chromedriver
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
     wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH"
   '';
diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
index 400cf24012a..be3048cca25 100644
--- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix
+++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   pname = "htmlunit-driver-standalone";
diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix
index bf9eabec53c..c25190cab74 100644
--- a/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/pkgs/development/tools/selenium/selendroid/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }:
+{ lib, stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }:
 
-with stdenv.lib;
+with lib;
 let
     name = "selendroid-standalone-${version}";
     pluginName = "selendroid-grid-plugin-${version}";
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index a6d60e33ee3..10893a9d170 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, makeWrapper, jre
+{ lib, stdenv, fetchurl, makeWrapper, jre
 , htmlunit-driver, chromedriver, chromeSupport ? true }:
 
-with stdenv.lib;
+with lib;
 
 let
   minorVersion = "3.141";
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 987765a3217..1d47b325101 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which pkg-config avrgcc ];
   buildInputs = [ libelf freeglut libGLU libGL ]
-    ++ stdenv.lib.optional stdenv.isDarwin GLUT;
+    ++ lib.optional stdenv.isDarwin GLUT;
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 49eea7213bd..b64776bac3c 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}:
+{lib, stdenv, fetchFromGitHub, zip, unzip, firefox, bash}:
 let
   s = # Generated upstream information
   rec {
@@ -43,8 +43,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''Gecko-based programmatically-driven browser'';
-    license = stdenv.lib.licenses.mpl20 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mpl20 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix
index 08481169dcd..99f9cdcd936 100644
--- a/pkgs/development/tools/so/default.nix
+++ b/pkgs/development/tools/so/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq";
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
     libiconv Security
   ];
 
diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
index d1e26662f0c..46f097e5b60 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     imagemagick
     javaIndexer # the resulting jar file is copied by our install script
-  ] ++ stdenv.lib.optionals doCheck testBinPath;
+  ] ++ lib.optionals doCheck testBinPath;
   buildInputs = [
     boost pythonIndexer shared-mime-info
   ] ++ (with qt5; [ qtbase qtsvg ])
@@ -86,9 +86,9 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = let
-    major = stdenv.lib.versions.major version;
-    minor = stdenv.lib.versions.minor version;
-    patch = stdenv.lib.versions.patch version;
+    major = lib.versions.major version;
+    minor = lib.versions.minor version;
+    patch = lib.versions.patch version;
   in ''
     # Upstream script obtains it's version from git:
     # https://github.com/CoatiSoftware/Sourcetrail/blob/master/cmake/version.cmake
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/bin
     makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \
-      --prefix PATH : ${stdenv.lib.makeBinPath binPath}
+      --prefix PATH : ${lib.makeBinPath binPath}
   '';
 
   checkPhase = ''
@@ -188,7 +188,7 @@ stdenv.mkDerivation rec {
     # shorten PATH to prevent build failures
     wrapQtApp ./Sourcetrail_test \
       --set PATH "" \
-      --prefix PATH : ${stdenv.lib.makeBinPath testBinPath} \
+      --prefix PATH : ${lib.makeBinPath testBinPath} \
       --set MAVEN_OPTS "-Dmaven.repo.local=$TMPDIR/m2repo"
     ./Sourcetrail_test
     popd
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index 6b408592a0d..9c56efcb59f 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace src/cmd_connect.c \
       --replace CS_TDS_80 CS_TDS_73
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace "libct.so" "libct.dylib"
   '';
 
diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix
index e01c60e3a89..5d851adc5ab 100644
--- a/pkgs/development/tools/summon/default.nix
+++ b/pkgs/development/tools/summon/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }:
 
-with stdenv.lib;
+with lib;
 
 buildGoModule rec {
   pname = "summon";
diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix
index 05281f1bb83..d63493ba7a1 100644
--- a/pkgs/development/tools/sumneko-lua-language-server/default.nix
+++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ninja, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "sumneko-lua-language-server";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       --metapath='~/.cache/sumneko_lua/meta'"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lua Language Server coded by Lua ";
     homepage = "https://github.com/sumneko/lua-language-server";
     license = licenses.mit;
diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix
index 7eec364c47b..1e88cfcdcc1 100644
--- a/pkgs/development/tools/the-way/default.nix
+++ b/pkgs/development/tools/the-way/default.nix
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin  [ AppKit Security ];
+  buildInputs = lib.optionals stdenv.isDarwin  [ AppKit Security ];
 
   cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr";
-  checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ];
+  checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ];
   cargoParallelTestThreads = false;
 
   postInstall = ''
diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 003e3cec9ce..6ce1ad9a38a 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2021.01.02";
 
   # git describe --tags
-  realVersion = with stdenv.lib; with builtins;
+  realVersion = with lib; with builtins;
     "1.0-482-g${substring 0 7 (elemAt srcs 0).rev}";
 
   srcs = [
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
       open Verilog to bitstream toolchain for these devices.
     '';
     homepage    = "https://github.com/SymbiFlow/prjtrellis";
-    license     = stdenv.lib.licenses.isc;
+    license     = lib.licenses.isc;
     maintainers = with maintainers; [ q3k thoughtpolice emily ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms   = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix
index edd428480a0..8b330b36ea9 100644
--- a/pkgs/development/tools/tychus/default.nix
+++ b/pkgs/development/tools/tychus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
+{ lib, stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
 
 buildGoPackage rec {
   pname = "tychus";
@@ -15,13 +15,13 @@ buildGoPackage rec {
     sha256 = "02ybxjsfga89gpg0k21zmykhhnpx1vy3ny8fcwj0qsg73i11alvw";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ];
 
   buildFlags = [ "--tags" "release" ];
 
   meta = {
     description = "Command line utility to live-reload your application";
     homepage = "https://github.com/devlocker/tychus";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
index 2fbf7366538..03ee7228901 100644
--- a/pkgs/development/tools/uftrace/default.nix
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub}:
+{lib, stdenv, fetchFromGitHub}:
 
 stdenv.mkDerivation rec {
   pname = "uftrace";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Function (graph) tracer for user-space";
     homepage = "https://github.com/namhyung/uftrace";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [stdenv.lib.maintainers.nthorne];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [lib.maintainers.nthorne];
   };
 }
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index 95ebfcf64b4..65f91b3324f 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ pyyaml setuptools ];
 
-  makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])];
+  makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ git breezy subversion ])];
 
   doCheck = false; # requires network
 
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
index 7c396f69f25..b9ca0febf97 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/pkgs/development/tools/vultr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "vultr";
@@ -15,7 +15,7 @@ buildGoPackage rec {
   meta = {
     description = "A command line tool for Vultr services, a provider for cloud virtual private servers";
     homepage = "https://github.com/JamesClonk/vultr";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.zauberpony ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.zauberpony ];
   };
 }
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
index c2a70f2de29..94ee6d3a1ba 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/pkgs/development/tools/wasm-pack/default.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     # gracefully exit while doing work.
     # See: https://github.com/rustwasm/wasm-pack/issues/650
     libressl
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
+  ] ++ lib.optionals stdenv.isDarwin [ curl Security ];
 
   # Most tests rely on external resources and build artifacts.
   # Disabling check here to work with build sandboxing.
diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
index b89d36273f8..e861f20a919 100644
--- a/pkgs/development/tools/wiggle/default.nix
+++ b/pkgs/development/tools/wiggle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, groff }:
+{ lib, stdenv, fetchurl, ncurses, groff }:
 
 stdenv.mkDerivation {
 
@@ -37,8 +37,8 @@ stdenv.mkDerivation {
        already been applied, and will ignore them.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
 
 }
diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index b7a37f8b8d7..c7b1c0329f3 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
 
-  nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = [ perl ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isLinux [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [
       curl
       darwin.apple_sdk.frameworks.Security
       darwin.apple_sdk.frameworks.CoreServices
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index abc48b41446..1f38e49daee 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -36,11 +36,11 @@ in stdenv.mkDerivation {
     cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
   '';
 
-  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.isDarwin) ''
     # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
     sed 1i'#include <sys/sysmacros.h>' \
       -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # Apple Open Sourced LZFSE, but not libcompression, and it isn't
     # part of an impure framework we can add
     substituteInPlace Libraries/libcar/Sources/Rendition.cpp \
@@ -59,7 +59,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ninja ];
   buildInputs = [ zlib libxml2 libpng ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
 
   meta = with lib; {
     description = "Xcode-compatible build tool";

From 8d7b41b43d3a2aa3012266345c24b0dd5d9adf11 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Jan 2021 14:41:52 +0100
Subject: [PATCH 696/956] python3Packages.aioeafm: init at 1.0.0

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

diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix
new file mode 100644
index 00000000000..be91e0e9557
--- /dev/null
+++ b/pkgs/development/python-modules/aioeafm/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, aiohttp
+, async-timeout
+, buildPythonPackage
+, fetchFromGitHub
+, poetry
+, pytest-aiohttp
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "aioeafm";
+  version = "1.0.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "Jc2k";
+    repo = pname;
+    rev = version;
+    sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  checkInputs = [
+    pytest-aiohttp
+    pytest-asyncio
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aioeafm" ];
+
+  meta = with lib; {
+    description = "Python client for access the Real Time flood monitoring API";
+    homepage = "https://github.com/Jc2k/aioeafm";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84c11b5cd0f..8797bb3a9b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -206,6 +206,8 @@ in {
 
   aiodns = callPackage ../development/python-modules/aiodns { };
 
+  aioeafm = callPackage ../development/python-modules/aioeafm { };
+
   aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
 
   aioeventlet = callPackage ../development/python-modules/aioeventlet { };

From 34e7765a84f529f1547a9e58058fc878060cda9b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Jan 2021 14:43:54 +0100
Subject: [PATCH 697/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8ba845dc431..122966b1b42 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -194,7 +194,7 @@
     "dweet" = ps: with ps; [ ]; # missing inputs: dweepy
     "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
     "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool
-    "eafm" = ps: with ps; [ ]; # missing inputs: aioeafm
+    "eafm" = ps: with ps; [ aioeafm ];
     "ebox" = ps: with ps; [ ]; # missing inputs: pyebox
     "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
     "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface

From 6a6867342ffa51389f822d0351e75e08f5cfc0e3 Mon Sep 17 00:00:00 2001
From: nyanotech <nyanotechnology@gmail.com>
Date: Sat, 23 Jan 2021 13:57:42 +0000
Subject: [PATCH 698/956] maintainers: Add nyanotech

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 11162af66d8..08d083f9e6a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6705,6 +6705,12 @@
     githubId = 7677321;
     name = "Paul Trehiou";
   };
+  nyanotech = {
+    name = "nyanotech";
+    email = "nyanotechnology@gmail.com";
+    github = "nyanotech";
+    githubId = 33802077;
+  };
   nyarly = {
     email = "nyarly@gmail.com";
     github = "nyarly";

From 74358114aa5cc2d49e2818bb107dc9984052748e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Jan 2021 14:59:50 +0100
Subject: [PATCH 699/956] intel-gmmlib: 20.3.3 -> 20.4.1 (#110596)

And add myself as maintainer because we need a new one since 76bab4e9a7d
(and I already maintain intel-media-driver which depends on gmmlib).
---
 pkgs/development/libraries/intel-gmmlib/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index f050a9c7b3b..28138f103b9 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "20.3.3";
+  version = "20.4.1";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
     rev    = "${pname}-${version}";
-    sha256 = "1diq1gqpfv5bawvag6bzwnd3ilhacwmwx3bl67abjvbb0m3jw4lk";
+    sha256 = "0qb0wpinfv8lg1pq1pxkl6v0kd8ax86m8zxzm6zjx91alsch1mi6";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/intel/gmmlib";
     license = licenses.mit;
     description = "Intel Graphics Memory Management Library";
+    longDescription = ''
+      The Intel(R) Graphics Memory Management Library provides device specific
+      and buffer management for the Intel(R) Graphics Compute Runtime for
+      OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
+    '';
     platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ primeos ];
   };
 }

From b0871b2067aa1b5439b61b29721ad60dca86c466 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 22 Jan 2021 19:07:05 +0100
Subject: [PATCH 700/956] intel-media-driver: 20.4.5 -> 21.1.0

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

diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index 75175bde4b3..6e62484ac68 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-media-driver";
-  version = "20.4.5";
+  version = "21.1.0";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "media-driver";
     rev    = "intel-media-${version}";
-    sha256 = "149xkhhp8q06c1jzxjs24lnbfrlvf19m0hcwld593vv4arfpbpmf";
+    sha256 = "17cgs52f42jdvfb6q3wpkxaz2b41z59jdribpgb9qmcvizsnglxc";
   };
 
   cmakeFlags = [

From 26642f208bc713619f12d9b363331bfb27ea66db Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 23 Jan 2021 15:15:24 +0100
Subject: [PATCH 701/956] ldgallery: update generation script and regenerate
 Nix expressions

---
 .../graphics/ldgallery/viewer/generate.sh      |  8 ++------
 .../ldgallery/viewer/node-composition.nix      |  8 ++++----
 .../ldgallery/viewer/node-packages.nix         | 18 +++++++++++++++---
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/graphics/ldgallery/viewer/generate.sh b/pkgs/tools/graphics/ldgallery/viewer/generate.sh
index 0874051b676..f115fb11d9b 100755
--- a/pkgs/tools/graphics/ldgallery/viewer/generate.sh
+++ b/pkgs/tools/graphics/ldgallery/viewer/generate.sh
@@ -24,11 +24,7 @@ node2nix \
   --input ./package.json \
   --lock ./package-lock.json \
   --output node-packages.nix \
-  --composition node-composition.nix
+  --composition node-composition.nix \
+  --no-copy-node-env
 
 rm package.json package-lock.json
-
-# Temporary quickfix to accomodate for the util-linux package rename.
-# See https://github.com/svanderburg/node2nix/issues/213
-git restore :/pkgs/development/node-packages/node-env.nix
-sed -i 's/utillinux/util-linux/g' node-composition.nix
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
index 55566aafc58..aaf54a05c88 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
-    inherit nodejs;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
index 9946ce0e63c..ce00bdfd097 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -13252,7 +13252,7 @@ let
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      homepage = https://ldgallery.pacien.org/;
+      homepage = "https://ldgallery.pacien.org/";
       license = "AGPL-3";
     };
     production = false;
@@ -13266,4 +13266,16 @@ in
   tarball = nodeEnv.buildNodeSourceDist args;
   package = nodeEnv.buildNodePackage args;
   shell = nodeEnv.buildNodeShell args;
+  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
+    src = stdenv.mkDerivation {
+      name = args.name + "-package-json";
+      src = nix-gitignore.gitignoreSourcePure [
+        "*"
+        "!package.json"
+        "!package-lock.json"
+      ] args.src;
+      dontBuild = true;
+      installPhase = "mkdir -p $out; cp -r ./* $out;";
+    };
+  });
 }

From 04fce1988815010ce0274a4a4e83f270b5e2cf0c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 23 Jan 2021 15:27:11 +0100
Subject: [PATCH 702/956] gtk3: Clean up

- Reorder the expression according to https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/attribute-ordering.md
- Do not use `with lib;` at top-level.
- Use lib.optionals instead of lib.optional for cleaner style.
- Replace docbook_xsl alias with docbook-xsl-nons.

This will make it more in line with the incoming GTK 4 package.
---
 pkgs/development/libraries/gtk/3.x.nix | 138 +++++++++++++------------
 1 file changed, 72 insertions(+), 66 deletions(-)

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index 21a87de4a16..0e5c6edc964 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -3,7 +3,7 @@
 , fetchpatch
 , pkg-config
 , gettext
-, docbook_xsl
+, docbook-xsl-nons
 , docbook_xml_dtd_43
 , gtk-doc
 , meson
@@ -48,13 +48,11 @@
 
 assert cupsSupport -> cups != null;
 
-with lib;
-
 stdenv.mkDerivation rec {
   pname = "gtk+3";
   version = "3.24.24";
 
-  outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
+  outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
   outputBin = "dev";
 
   setupHooks = [
@@ -69,12 +67,13 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./patches/3.0-immodules.cache.patch
+
     (fetchpatch {
       name = "Xft-setting-fallback-compute-DPI-properly.patch";
       url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
       sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
     })
-  ] ++ optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
     # let’s drop that dependency in similar way to how other parts of the library do it
     # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
@@ -82,15 +81,76 @@ stdenv.mkDerivation rec {
     ./patches/3.0-darwin-x11.patch
   ];
 
-  separateDebugInfo = stdenv.isLinux;
+  nativeBuildInputs = [
+    gettext
+    gobject-introspection
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+    python3
+    sassc
+  ] ++ setupHooks ++ lib.optionals withGtkDoc [
+    docbook_xml_dtd_43
+    docbook-xsl-nons
+    gtk-doc
+    # For xmllint
+    libxml2
+  ];
+
+  buildInputs = [
+    libxkbcommon
+    epoxy
+    json-glib
+    isocodes
+  ] ++ lib.optionals stdenv.isDarwin [
+    AppKit
+  ] ++ lib.optionals trackerSupport [
+    tracker
+  ];
+  #TODO: colord?
+
+  propagatedBuildInputs = with xorg; [
+    at-spi2-atk
+    atk
+    cairo
+    expat
+    fribidi
+    gdk-pixbuf
+    glib
+    gsettings-desktop-schemas
+    libICE
+    libSM
+    libXcomposite
+    libXcursor
+    libXi
+    libXrandr
+    libXrender
+    pango
+  ] ++ lib.optionals stdenv.isDarwin [
+    # explicitly propagated, always needed
+    Cocoa
+  ] ++ lib.optionals waylandSupport [
+    mesa
+    wayland
+    wayland-protocols
+  ] ++ lib.optionals xineramaSupport [
+    libXinerama
+  ] ++ lib.optionals cupsSupport [
+    cups
+  ];
 
   mesonFlags = [
-    "-Dgtk_doc=${boolToString withGtkDoc}"
+    "-Dgtk_doc=${lib.boolToString withGtkDoc}"
     "-Dtests=false"
-    "-Dtracker3=${boolToString trackerSupport}"
-    "-Dbroadway_backend=${boolToString broadwaySupport}"
+    "-Dtracker3=${lib.boolToString trackerSupport}"
+    "-Dbroadway_backend=${lib.boolToString broadwaySupport}"
   ];
 
+  doCheck = false; # needs X11
+
+  separateDebugInfo = stdenv.isLinux;
+
   # These are the defines that'd you'd get with --enable-debug=minimum (default).
   # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
   NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
@@ -111,61 +171,7 @@ stdenv.mkDerivation rec {
     patchShebangs ''${files[@]}
   '';
 
-  nativeBuildInputs = [
-    gettext
-    gobject-introspection
-    makeWrapper
-    meson
-    ninja
-    pkg-config
-    python3
-    sassc
-  ] ++ setupHooks ++ optionals withGtkDoc [
-    docbook_xml_dtd_43
-    docbook_xsl
-    gtk-doc
-    # For xmllint
-    libxml2
-  ];
-
-  buildInputs = [
-    libxkbcommon
-    epoxy
-    json-glib
-    isocodes
-  ]
-  ++ optional stdenv.isDarwin AppKit
-  ++ optional trackerSupport tracker
-  ;
-
-  propagatedBuildInputs = with xorg; [
-    at-spi2-atk
-    atk
-    cairo
-    expat
-    fribidi
-    gdk-pixbuf
-    glib
-    gsettings-desktop-schemas
-    libICE
-    libSM
-    libXcomposite
-    libXcursor
-    libXi
-    libXrandr
-    libXrender
-    pango
-  ]
-  ++ optional stdenv.isDarwin Cocoa  # explicitly propagated, always needed
-  ++ optionals waylandSupport [ mesa wayland wayland-protocols ]
-  ++ optional xineramaSupport libXinerama
-  ++ optional cupsSupport cups
-  ;
-  #TODO: colord?
-
-  doCheck = false; # needs X11
-
-  postInstall = optionalString (!stdenv.isDarwin) ''
+  postInstall = lib.optionalString (!stdenv.isDarwin) ''
     # The updater is needed for nixos env and it's tiny.
     moveToOutput bin/gtk-update-icon-cache "$out"
     # Launcher
@@ -178,7 +184,7 @@ stdenv.mkDerivation rec {
   '';
 
   # Wrap demos
-  postFixup =  optionalString (!stdenv.isDarwin) ''
+  postFixup =  lib.optionalString (!stdenv.isDarwin) ''
     demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory)
 
     for program in ''${demos[@]}; do
@@ -194,7 +200,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = {
+  meta = with lib; {
     description = "A multi-platform toolkit for creating graphical user interfaces";
     longDescription = ''
       GTK is a highly usable, feature rich toolkit for creating

From 4070fb501b1c7a5fa2432f85081f02ec07fec5ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 23 Jan 2021 15:35:19 +0100
Subject: [PATCH 703/956] abcmidi: 2020.12.10 -> 2021.01.21

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

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index b3d250dfc78..cb856ab72d0 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "abcMIDI";
-  version = "2020.12.10";
+  version = "2021.01.21";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
-    sha256 = "0r9jwjwmdyyfq882mq7gkc2hjrv4ljnidxzlyycjipzndb1gv1ls";
+    sha256 = "184d59pc60dax60j3nzcsr5kflaygbjpbrwg6r4bky0q0sg17z5i";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

From d2a975169a73215e58ffb1fa6c7c8270775382f8 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Wed, 16 Sep 2020 22:04:04 +0200
Subject: [PATCH 704/956] atom, atom-beta: fix not working file deletion

Through deprecation of gvfs-trash, gio has to be in PATH. Atom
automagically detects gio and uses it.
---
 pkgs/applications/editors/atom/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 7a6d5b5cd91..e7a9a26f066 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, gvfs, gtk3, atomEnv }:
+{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }:
 
 let
   versions = {
@@ -54,7 +54,8 @@ let
 
     preFixup = ''
       gappsWrapperArgs+=(
-        --prefix "PATH" : "${gvfs}/bin"
+        # needed for gio executable to be able to delete files
+        --prefix "PATH" : "${glib.bin}/bin"
       )
     '';
 

From 9c213398b312e0f0bb9cdf05090fd20223a82ad0 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 22 Jan 2021 20:33:55 -0500
Subject: [PATCH 705/956] lib: Clean up how linux and gcc config is specified

Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e63423456d6deb650e146120c39c1e0723.
---
 lib/systems/architectures.nix                 |   2 +-
 lib/systems/default.nix                       |  19 +-
 lib/systems/examples.nix                      |  48 +-
 lib/systems/platforms.nix                     | 620 +++++++++---------
 nixos/doc/manual/release-notes/rl-2103.xml    |  16 +
 nixos/modules/hardware/device-tree.nix        |   8 +-
 nixos/modules/installer/netboot/netboot.nix   |   2 +-
 nixos/modules/services/misc/nix-daemon.nix    |   8 +-
 nixos/modules/system/activation/top-level.nix |   2 +-
 .../generations-dir/generations-dir.nix       |   2 +-
 .../boot/loader/raspberrypi/raspberrypi.nix   |   2 +-
 nixos/release.nix                             |   4 +-
 .../audio/virtual-ans/default.nix             |   2 +-
 .../virtualization/crosvm/default.nix         |   2 +-
 .../virtualization/vpcs/default.nix           |   2 +-
 .../bintools-wrapper/default.nix              |   2 +-
 pkgs/build-support/cc-wrapper/default.nix     |  28 +-
 pkgs/build-support/kernel/make-initrd.nix     |   4 +-
 pkgs/build-support/vm/default.nix             |   2 +-
 .../compilers/gcc/common/platform-flags.nix   |   2 +-
 pkgs/development/compilers/julia/1.0.nix      |   2 +-
 pkgs/development/compilers/julia/1.3.nix      |   2 +-
 pkgs/development/compilers/julia/1.5.nix      |   2 +-
 pkgs/development/libraries/glibc/common.nix   |   2 +-
 .../libraries/qt-5/modules/qtwebengine.nix    |   2 +-
 .../tools/poetry2nix/poetry2nix/pep425.nix    |   6 +-
 .../tools/poetry2nix/poetry2nix/pep508.nix    |   2 +-
 pkgs/development/web/nodejs/nodejs.nix        |  11 +-
 pkgs/os-specific/linux/exfat/default.nix      |   2 +-
 .../linux/kernel-headers/default.nix          |   2 +-
 pkgs/os-specific/linux/kernel/generic.nix     |  18 +-
 .../linux/kernel/manual-config.nix            |  30 +-
 pkgs/os-specific/linux/klibc/default.nix      |   4 +-
 pkgs/os-specific/linux/rtl8723bs/default.nix  |   2 +-
 pkgs/os-specific/linux/rtl8812au/default.nix  |   2 +-
 pkgs/os-specific/linux/uclibc/default.nix     |   2 +-
 pkgs/stdenv/generic/make-derivation.nix       |   4 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 38 files changed, 440 insertions(+), 434 deletions(-)

diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix
index 8e3a56b0d7c..ddc320d24e0 100644
--- a/lib/systems/architectures.nix
+++ b/lib/systems/architectures.nix
@@ -1,7 +1,7 @@
 { lib }:
 
 rec {
-  # platform.gcc.arch to its features (as in /proc/cpuinfo)
+  # gcc.arch to its features (as in /proc/cpuinfo)
   features = {
     default        = [ ];
     # x86_64 Intel
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 4edcbeb36f1..1a89120e2bf 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -24,8 +24,6 @@ rec {
       # Either of these can be losslessly-extracted from `parsed` iff parsing succeeds.
       system = parse.doubleFromSystem final.parsed;
       config = parse.tripleFromSystem final.parsed;
-      # Just a guess, based on `system`
-      platform = platforms.select final;
       # Determine whether we are compatible with the provided CPU
       isCompatible = platform: parse.isCompatible final.parsed.cpu platform.parsed.cpu;
       # Derived meta-data
@@ -79,11 +77,20 @@ rec {
       };
       isStatic = final.isWasm || final.isRedox;
 
-      kernelArch =
+      # Just a guess, based on `system`
+      inherit
+        ({
+          linux-kernel = args.linux-kernel or {};
+          gcc = args.gcc or {};
+          rustc = args.rust or {};
+        } // platforms.select final)
+        linux-kernel gcc rustc;
+
+      linuxArch =
         if final.isAarch32 then "arm"
         else if final.isAarch64 then "arm64"
-        else if final.isx86_32 then "x86"
-        else if final.isx86_64 then "x86"
+        else if final.isx86_32 then "i386"
+        else if final.isx86_64 then "x86_64"
         else if final.isMips then "mips"
         else final.parsed.cpu.name;
 
@@ -129,7 +136,7 @@ rec {
         else throw "Don't know how to run ${final.config} executables.";
 
     } // mapAttrs (n: v: v final.parsed) inspect.predicates
-      // mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates
+      // mapAttrs (n: v: v final.gcc.arch or "default") architectures.predicates
       // args;
   in assert final.useAndroidPrebuilt -> final.isAndroid;
      assert lib.foldl
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 16002450f2d..de12e0b83c1 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -7,7 +7,6 @@ let
 
   riscv = bits: {
     config = "riscv${bits}-unknown-linux-gnu";
-    platform = platforms.riscv-multiplatform;
   };
 in
 
@@ -17,84 +16,68 @@ rec {
   #
   powernv = {
     config = "powerpc64le-unknown-linux-gnu";
-    platform = platforms.powernv;
   };
   musl-power = {
     config = "powerpc64le-unknown-linux-musl";
-    platform = platforms.powernv;
   };
 
   sheevaplug = {
     config = "armv5tel-unknown-linux-gnueabi";
-    platform = platforms.sheevaplug;
-  };
+  } // platforms.sheevaplug;
 
   raspberryPi = {
     config = "armv6l-unknown-linux-gnueabihf";
-    platform = platforms.raspberrypi;
-  };
+  } // platforms.raspberrypi;
 
   remarkable1 = {
     config = "armv7l-unknown-linux-gnueabihf";
-    platform = platforms.zero-gravitas;
-  };
+  } // platforms.zero-gravitas;
 
   remarkable2 = {
     config = "armv7l-unknown-linux-gnueabihf";
-    platform = platforms.zero-sugar;
-  };
+  } // platforms.zero-sugar;
 
   armv7l-hf-multiplatform = {
     config = "armv7l-unknown-linux-gnueabihf";
-    platform = platforms.armv7l-hf-multiplatform;
   };
 
   aarch64-multiplatform = {
     config = "aarch64-unknown-linux-gnu";
-    platform = platforms.aarch64-multiplatform;
   };
 
   armv7a-android-prebuilt = {
     config = "armv7a-unknown-linux-androideabi";
     sdkVer = "29";
     ndkVer = "21";
-    platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
-  };
+  } // platforms.armv7a-android;
 
   aarch64-android-prebuilt = {
     config = "aarch64-unknown-linux-android";
     sdkVer = "29";
     ndkVer = "21";
-    platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
 
-  scaleway-c1 = armv7l-hf-multiplatform // rec {
-    platform = platforms.scaleway-c1;
-    inherit (platform.gcc) fpu;
-  };
+  scaleway-c1 = armv7l-hf-multiplatform // platforms.scaleway-c1;
 
   pogoplug4 = {
     config = "armv5tel-unknown-linux-gnueabi";
-    platform = platforms.pogoplug4;
-  };
+  } // platforms.pogoplug4;
 
   ben-nanonote = {
     config = "mipsel-unknown-linux-uclibc";
-    platform = platforms.ben_nanonote;
-  };
+  } // platforms.ben_nanonote;
 
   fuloongminipc = {
     config = "mipsel-unknown-linux-gnu";
-    platform = platforms.fuloong2f_n32;
-  };
+  } // platforms.fuloong2f_n32;
 
   muslpi = raspberryPi // {
     config = "armv6l-unknown-linux-musleabihf";
   };
 
-  aarch64-multiplatform-musl = aarch64-multiplatform // {
+  aarch64-multiplatform-musl = {
     config = "aarch64-unknown-linux-musl";
   };
 
@@ -110,13 +93,11 @@ rec {
   riscv64-embedded = {
     config = "riscv64-none-elf";
     libc = "newlib";
-    platform = platforms.riscv-multiplatform;
   };
 
   riscv32-embedded = {
     config = "riscv32-none-elf";
     libc = "newlib";
-    platform = platforms.riscv-multiplatform;
   };
 
   mmix = {
@@ -136,13 +117,11 @@ rec {
   vc4 = {
     config = "vc4-elf";
     libc = "newlib";
-    platform = {};
   };
 
   or1k = {
     config = "or1k-elf";
     libc = "newlib";
-    platform = {};
   };
 
   arm-embedded = {
@@ -204,7 +183,6 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
-    platform = {};
   };
 
   iphone32 = {
@@ -214,7 +192,6 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
-    platform = {};
   };
 
   iphone64-simulator = {
@@ -224,7 +201,6 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
-    platform = {};
   };
 
   iphone32-simulator = {
@@ -234,7 +210,6 @@ rec {
     xcodeVer = "11.3.1";
     xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
-    platform = {};
   };
 
   #
@@ -245,7 +220,6 @@ rec {
   mingw32 = {
     config = "i686-w64-mingw32";
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
-    platform = {};
   };
 
   # 64 bit mingw-w64
@@ -253,7 +227,6 @@ rec {
     # That's the triplet they use in the mingw-w64 docs.
     config = "x86_64-w64-mingw32";
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
-    platform = {};
   };
 
   # BSDs
@@ -275,6 +248,5 @@ rec {
   # Ghcjs
   ghcjs = {
     config = "js-unknown-ghcjs";
-    platform = {};
   };
 }
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index e869de488c1..f399c1873f5 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -1,39 +1,36 @@
 { lib }:
 rec {
-  pcBase = {
-    name = "pc";
-    kernelBaseConfig = "defconfig";
-    # Build whatever possible as a module, if not stated in the extra config.
-    kernelAutoModules = true;
-    kernelTarget = "bzImage";
+  pc = {
+    linux-kernel = {
+      name = "pc";
+
+      baseConfig = "defconfig";
+      # Build whatever possible as a module, if not stated in the extra config.
+      autoModules = true;
+      target = "bzImage";
+    };
   };
 
-  pc64 = pcBase // { kernelArch = "x86_64"; };
-
-  pc32 = pcBase // { kernelArch = "i386"; };
-
-  pc32_simplekernel = pc32 // {
-    kernelAutoModules = false;
-  };
-
-  pc64_simplekernel = pc64 // {
-    kernelAutoModules = false;
+  pc_simplekernel = lib.recursiveUpdate pc {
+    linux-kernel.autoModules = false;
   };
 
   powernv = {
-    name = "PowerNV";
-    kernelArch = "powerpc";
-    kernelBaseConfig = "powernv_defconfig";
-    kernelTarget = "zImage";
-    kernelInstallTarget = "install";
-    kernelFile = "vmlinux";
-    kernelAutoModules = true;
-    # avoid driver/FS trouble arising from unusual page size
-    kernelExtraConfig = ''
-      PPC_64K_PAGES n
-      PPC_4K_PAGES y
-      IPV6 y
-    '';
+    linux-kernel = {
+      name = "PowerNV";
+
+      baseConfig = "powernv_defconfig";
+      target = "zImage";
+      installTarget = "install";
+      file = "vmlinux";
+      autoModules = true;
+      # avoid driver/FS trouble arising from unusual page size
+      extraConfig = ''
+        PPC_64K_PAGES n
+        PPC_4K_PAGES y
+        IPV6 y
+      '';
+    };
   };
 
   ##
@@ -41,17 +38,12 @@ rec {
   ##
 
   pogoplug4 = {
-    name = "pogoplug4";
+    linux-kernel = {
+      name = "pogoplug4";
 
-    gcc = {
-      arch = "armv5te";
-    };
-
-    kernelBaseConfig = "multi_v5_defconfig";
-    kernelArch = "arm";
-    kernelAutoModules = false;
-    kernelExtraConfig =
-      ''
+      baseConfig = "multi_v5_defconfig";
+      autoModules = false;
+      extraConfig = ''
         # Ubi for the mtd
         MTD_UBI y
         UBIFS_FS y
@@ -61,136 +53,144 @@ rec {
         UBIFS_FS_ZLIB y
         UBIFS_FS_DEBUG n
       '';
-    kernelMakeFlags = [ "LOADADDR=0x8000" ];
-    kernelTarget = "uImage";
-    # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
-    #kernelDTB = true;
+      makeFlags = [ "LOADADDR=0x8000" ];
+      target = "uImage";
+      # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working
+      #DTB = true;
+    };
+    gcc = {
+      arch = "armv5te";
+    };
   };
 
   sheevaplug = {
-    name = "sheevaplug";
-    kernelBaseConfig = "multi_v5_defconfig";
-    kernelArch = "arm";
-    kernelAutoModules = false;
-    kernelExtraConfig = ''
-      BLK_DEV_RAM y
-      BLK_DEV_INITRD y
-      BLK_DEV_CRYPTOLOOP m
-      BLK_DEV_DM m
-      DM_CRYPT m
-      MD y
-      REISERFS_FS m
-      BTRFS_FS m
-      XFS_FS m
-      JFS_FS m
-      EXT4_FS m
-      USB_STORAGE_CYPRESS_ATACB m
+    linux-kernel = {
+      name = "sheevaplug";
 
-      # mv cesa requires this sw fallback, for mv-sha1
-      CRYPTO_SHA1 y
-      # Fast crypto
-      CRYPTO_TWOFISH y
-      CRYPTO_TWOFISH_COMMON y
-      CRYPTO_BLOWFISH y
-      CRYPTO_BLOWFISH_COMMON y
+      baseConfig = "multi_v5_defconfig";
+      autoModules = false;
+      extraConfig = ''
+        BLK_DEV_RAM y
+        BLK_DEV_INITRD y
+        BLK_DEV_CRYPTOLOOP m
+        BLK_DEV_DM m
+        DM_CRYPT m
+        MD y
+        REISERFS_FS m
+        BTRFS_FS m
+        XFS_FS m
+        JFS_FS m
+        EXT4_FS m
+        USB_STORAGE_CYPRESS_ATACB m
 
-      IP_PNP y
-      IP_PNP_DHCP y
-      NFS_FS y
-      ROOT_NFS y
-      TUN m
-      NFS_V4 y
-      NFS_V4_1 y
-      NFS_FSCACHE y
-      NFSD m
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-      NETFILTER y
-      IP_NF_IPTABLES y
-      IP_NF_FILTER y
-      IP_NF_MATCH_ADDRTYPE y
-      IP_NF_TARGET_LOG y
-      IP_NF_MANGLE y
-      IPV6 m
-      VLAN_8021Q m
+        # mv cesa requires this sw fallback, for mv-sha1
+        CRYPTO_SHA1 y
+        # Fast crypto
+        CRYPTO_TWOFISH y
+        CRYPTO_TWOFISH_COMMON y
+        CRYPTO_BLOWFISH y
+        CRYPTO_BLOWFISH_COMMON y
 
-      CIFS y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE y
-      CIFS_ACL y
+        IP_PNP y
+        IP_PNP_DHCP y
+        NFS_FS y
+        ROOT_NFS y
+        TUN m
+        NFS_V4 y
+        NFS_V4_1 y
+        NFS_FSCACHE y
+        NFSD m
+        NFSD_V2_ACL y
+        NFSD_V3 y
+        NFSD_V3_ACL y
+        NFSD_V4 y
+        NETFILTER y
+        IP_NF_IPTABLES y
+        IP_NF_FILTER y
+        IP_NF_MATCH_ADDRTYPE y
+        IP_NF_TARGET_LOG y
+        IP_NF_MANGLE y
+        IPV6 m
+        VLAN_8021Q m
 
-      WATCHDOG y
-      WATCHDOG_CORE y
-      ORION_WATCHDOG m
+        CIFS y
+        CIFS_XATTR y
+        CIFS_POSIX y
+        CIFS_FSCACHE y
+        CIFS_ACL y
 
-      ZRAM m
-      NETCONSOLE m
+        WATCHDOG y
+        WATCHDOG_CORE y
+        ORION_WATCHDOG m
 
-      # Disable OABI to have seccomp_filter (required for systemd)
-      # https://github.com/raspberrypi/firmware/issues/651
-      OABI_COMPAT n
+        ZRAM m
+        NETCONSOLE m
 
-      # Fail to build
-      DRM n
-      SCSI_ADVANSYS n
-      USB_ISP1362_HCD n
-      SND_SOC n
-      SND_ALI5451 n
-      FB_SAVAGE n
-      SCSI_NSP32 n
-      ATA_SFF n
-      SUNGEM n
-      IRDA n
-      ATM_HE n
-      SCSI_ACARD n
-      BLK_DEV_CMD640_ENHANCED n
+        # Disable OABI to have seccomp_filter (required for systemd)
+        # https://github.com/raspberrypi/firmware/issues/651
+        OABI_COMPAT n
 
-      FUSE_FS m
+        # Fail to build
+        DRM n
+        SCSI_ADVANSYS n
+        USB_ISP1362_HCD n
+        SND_SOC n
+        SND_ALI5451 n
+        FB_SAVAGE n
+        SCSI_NSP32 n
+        ATA_SFF n
+        SUNGEM n
+        IRDA n
+        ATM_HE n
+        SCSI_ACARD n
+        BLK_DEV_CMD640_ENHANCED n
 
-      # systemd uses cgroups
-      CGROUPS y
+        FUSE_FS m
 
-      # Latencytop
-      LATENCYTOP y
+        # systemd uses cgroups
+        CGROUPS y
 
-      # Ubi for the mtd
-      MTD_UBI y
-      UBIFS_FS y
-      UBIFS_FS_XATTR y
-      UBIFS_FS_ADVANCED_COMPR y
-      UBIFS_FS_LZO y
-      UBIFS_FS_ZLIB y
-      UBIFS_FS_DEBUG n
+        # Latencytop
+        LATENCYTOP y
 
-      # Kdb, for kernel troubles
-      KGDB y
-      KGDB_SERIAL_CONSOLE y
-      KGDB_KDB y
-    '';
-    kernelMakeFlags = [ "LOADADDR=0x0200000" ];
-    kernelTarget = "uImage";
-    kernelDTB = true; # Beyond 3.10
+        # Ubi for the mtd
+        MTD_UBI y
+        UBIFS_FS y
+        UBIFS_FS_XATTR y
+        UBIFS_FS_ADVANCED_COMPR y
+        UBIFS_FS_LZO y
+        UBIFS_FS_ZLIB y
+        UBIFS_FS_DEBUG n
+
+        # Kdb, for kernel troubles
+        KGDB y
+        KGDB_SERIAL_CONSOLE y
+        KGDB_KDB y
+      '';
+      makeFlags = [ "LOADADDR=0x0200000" ];
+      target = "uImage";
+      DTB = true; # Beyond 3.10
+    };
     gcc = {
       arch = "armv5te";
     };
   };
 
   raspberrypi = {
-    name = "raspberrypi";
-    kernelBaseConfig = "bcm2835_defconfig";
-    kernelDTB = true;
-    kernelArch = "arm";
-    kernelAutoModules = true;
-    kernelPreferBuiltin = true;
-    kernelExtraConfig = ''
-      # Disable OABI to have seccomp_filter (required for systemd)
-      # https://github.com/raspberrypi/firmware/issues/651
-      OABI_COMPAT n
-    '';
-    kernelTarget = "zImage";
+    linux-kernel = {
+      name = "raspberrypi";
+
+      baseConfig = "bcm2835_defconfig";
+      DTB = true;
+      autoModules = true;
+      preferBuiltin = true;
+      extraConfig = ''
+        # Disable OABI to have seccomp_filter (required for systemd)
+        # https://github.com/raspberrypi/firmware/issues/651
+        OABI_COMPAT n
+      '';
+      target = "zImage";
+    };
     gcc = {
       arch = "armv6";
       fpu = "vfp";
@@ -201,13 +201,15 @@ rec {
   raspberrypi2 = armv7l-hf-multiplatform;
 
   zero-gravitas = {
-    name = "zero-gravitas";
-    kernelBaseConfig = "zero-gravitas_defconfig";
-    kernelArch = "arm";
-    # kernelTarget verified by checking /boot on reMarkable 1 device
-    kernelTarget = "zImage";
-    kernelAutoModules = false;
-    kernelDTB = true;
+    linux-kernel = {
+      name = "zero-gravitas";
+
+      baseConfig = "zero-gravitas_defconfig";
+      # Target verified by checking /boot on reMarkable 1 device
+      target = "zImage";
+      autoModules = false;
+      DTB = true;
+    };
     gcc = {
       fpu = "neon";
       cpu = "cortex-a9";
@@ -215,13 +217,15 @@ rec {
   };
 
   zero-sugar = {
-    name = "zero-sugar";
-    kernelBaseConfig = "zero-sugar_defconfig";
-    kernelArch = "arm";
-    kernelDTB = true;
-    kernelAutoModules = false;
-    kernelPreferBuiltin = true;
-    kernelTarget = "zImage";
+    linux-kernel = {
+      name = "zero-sugar";
+
+      baseConfig = "zero-sugar_defconfig";
+      DTB = true;
+      autoModules = false;
+      preferBuiltin = true;
+      target = "zImage";
+    };
     gcc = {
       cpu = "cortex-a7";
       fpu = "neon-vfpv4";
@@ -229,7 +233,7 @@ rec {
     };
   };
 
-  scaleway-c1 = armv7l-hf-multiplatform // {
+  scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform {
     gcc = {
       cpu = "cortex-a9";
       fpu = "vfpv3";
@@ -237,12 +241,11 @@ rec {
   };
 
   utilite = {
-    name = "utilite";
-    kernelBaseConfig = "multi_v7_defconfig";
-    kernelArch = "arm";
-    kernelAutoModules = false;
-    kernelExtraConfig =
-      ''
+    linux-kernel = {
+      name = "utilite";
+      maseConfig = "multi_v7_defconfig";
+      autoModules = false;
+      extraConfig = ''
         # Ubi for the mtd
         MTD_UBI y
         UBIFS_FS y
@@ -252,35 +255,37 @@ rec {
         UBIFS_FS_ZLIB y
         UBIFS_FS_DEBUG n
       '';
-    kernelMakeFlags = [ "LOADADDR=0x10800000" ];
-    kernelTarget = "uImage";
-    kernelDTB = true;
+      makeFlags = [ "LOADADDR=0x10800000" ];
+      target = "uImage";
+      DTB = true;
+    };
     gcc = {
       cpu = "cortex-a9";
       fpu = "neon";
     };
   };
 
-  guruplug = sheevaplug // {
+  guruplug = lib.recursiveUpdate sheevaplug {
     # Define `CONFIG_MACH_GURUPLUG' (see
     # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>)
     # and other GuruPlug-specific things.  Requires the `guruplug-defconfig'
     # patch.
-
-    kernelBaseConfig = "guruplug_defconfig";
+    linux-kernel.baseConfig = "guruplug_defconfig";
   };
 
-  beaglebone = armv7l-hf-multiplatform // {
-    name = "beaglebone";
-    kernelBaseConfig = "bb.org_defconfig";
-    kernelAutoModules = false;
-    kernelExtraConfig = ""; # TBD kernel config
-    kernelTarget = "zImage";
+  beaglebone = lib.recursiveUpdate armv7l-hf-multiplatform {
+    linux-kernel = {
+      name = "beaglebone";
+      baseConfig = "bb.org_defconfig";
+      autoModules = false;
+      extraConfig = ""; # TBD kernel config
+      target = "zImage";
+    };
   };
 
   # https://developer.android.com/ndk/guides/abis#v7a
-  armv7a-android =  {
-    name = "armeabi-v7a";
+  armv7a-android = {
+    linux-kernel.name = "armeabi-v7a";
     gcc = {
       arch = "armv7-a";
       float-abi = "softfp";
@@ -289,29 +294,31 @@ rec {
   };
 
   armv7l-hf-multiplatform = {
-    name = "armv7l-hf-multiplatform";
-    kernelBaseConfig = "multi_v7_defconfig";
-    kernelArch = "arm";
-    kernelDTB = true;
-    kernelAutoModules = true;
-    kernelPreferBuiltin = true;
-    kernelTarget = "zImage";
-    kernelExtraConfig = ''
-      # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
-      SERIAL_8250_BCM2835AUX y
-      SERIAL_8250_EXTENDED y
-      SERIAL_8250_SHARE_IRQ y
+    linux-kernel = {
+      name = "armv7l-hf-multiplatform";
+      Major = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.
+      baseConfig = "multi_v7_defconfig";
+      DTB = true;
+      autoModules = true;
+      PreferBuiltin = true;
+      target = "zImage";
+      extraConfig = ''
+        # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
+        SERIAL_8250_BCM2835AUX y
+        SERIAL_8250_EXTENDED y
+        SERIAL_8250_SHARE_IRQ y
 
-      # Fix broken sunxi-sid nvmem driver.
-      TI_CPTS y
+        # Fix broken sunxi-sid nvmem driver.
+        TI_CPTS y
 
-      # Hangs ODROID-XU4
-      ARM_BIG_LITTLE_CPUIDLE n
+        # Hangs ODROID-XU4
+        ARM_BIG_LITTLE_CPUIDLE n
 
-      # Disable OABI to have seccomp_filter (required for systemd)
-      # https://github.com/raspberrypi/firmware/issues/651
-      OABI_COMPAT n
-    '';
+        # Disable OABI to have seccomp_filter (required for systemd)
+        # https://github.com/raspberrypi/firmware/issues/651
+        OABI_COMPAT n
+      '';
+    };
     gcc = {
       # Some table about fpu flags:
       # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png
@@ -336,34 +343,35 @@ rec {
   };
 
   aarch64-multiplatform = {
-    name = "aarch64-multiplatform";
-    kernelBaseConfig = "defconfig";
-    kernelArch = "arm64";
-    kernelDTB = true;
-    kernelAutoModules = true;
-    kernelPreferBuiltin = true;
-    kernelExtraConfig = ''
-      # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10.
-      ARCH_BCM2835 y
-      BCM2835_MBOX y
-      BCM2835_WDT y
-      RASPBERRYPI_FIRMWARE y
-      RASPBERRYPI_POWER y
-      SERIAL_8250_BCM2835AUX y
-      SERIAL_8250_EXTENDED y
-      SERIAL_8250_SHARE_IRQ y
+    linux-kernel = {
+      name = "aarch64-multiplatform";
+      baseConfig = "defconfig";
+      DTB = true;
+      autoModules = true;
+      preferBuiltin = true;
+      extraConfig = ''
+        # Raspberry Pi 3 stuff. Not needed for   s >= 4.10.
+        ARCH_BCM2835 y
+        BCM2835_MBOX y
+        BCM2835_WDT y
+        RASPBERRYPI_FIRMWARE y
+        RASPBERRYPI_POWER y
+        SERIAL_8250_BCM2835AUX y
+        SERIAL_8250_EXTENDED y
+        SERIAL_8250_SHARE_IRQ y
 
-      # Cavium ThunderX stuff.
-      PCI_HOST_THUNDER_ECAM y
+        # Cavium ThunderX stuff.
+        PCI_HOST_THUNDER_ECAM y
 
-      # Nvidia Tegra stuff.
-      PCI_TEGRA y
+        # Nvidia Tegra stuff.
+        PCI_TEGRA y
 
-      # The default (=y) forces us to have the XHCI firmware available in initrd,
-      # which our initrd builder can't currently do easily.
-      USB_XHCI_TEGRA m
-    '';
-    kernelTarget = "Image";
+        # The default (=y) forces us to have the XHCI firmware available in initrd,
+        # which our initrd builder can't currently do easily.
+        USB_XHCI_TEGRA m
+      '';
+      target = "Image";
+    };
     gcc = {
       arch = "armv8-a";
     };
@@ -374,8 +382,9 @@ rec {
   ##
 
   ben_nanonote = {
-    name = "ben_nanonote";
-    kernelArch = "mips";
+    linux-kernel = {
+      name = "ben_nanonote";
+    };
     gcc = {
       arch = "mips32";
       float = "soft";
@@ -383,75 +392,76 @@ rec {
   };
 
   fuloong2f_n32 = {
-    name = "fuloong2f_n32";
-    kernelBaseConfig = "lemote2f_defconfig";
-    kernelArch = "mips";
-    kernelAutoModules = false;
-    kernelExtraConfig = ''
-      MIGRATION n
-      COMPACTION n
+    linux-kernel = {
+      name = "fuloong2f_n32";
+      baseConfig = "lemote2f_defconfig";
+      autoModules = false;
+      extraConfig = ''
+        MIGRATION n
+        COMPACTION n
 
-      # nixos mounts some cgroup
-      CGROUPS y
+        # nixos mounts some cgroup
+        CGROUPS y
 
-      BLK_DEV_RAM y
-      BLK_DEV_INITRD y
-      BLK_DEV_CRYPTOLOOP m
-      BLK_DEV_DM m
-      DM_CRYPT m
-      MD y
-      REISERFS_FS m
-      EXT4_FS m
-      USB_STORAGE_CYPRESS_ATACB m
+        BLK_DEV_RAM y
+        BLK_DEV_INITRD y
+        BLK_DEV_CRYPTOLOOP m
+        BLK_DEV_DM m
+        DM_CRYPT m
+        MD y
+        REISERFS_FS m
+        EXT4_FS m
+        USB_STORAGE_CYPRESS_ATACB m
 
-      IP_PNP y
-      IP_PNP_DHCP y
-      IP_PNP_BOOTP y
-      NFS_FS y
-      ROOT_NFS y
-      TUN m
-      NFS_V4 y
-      NFS_V4_1 y
-      NFS_FSCACHE y
-      NFSD m
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
+        IP_PNP y
+        IP_PNP_DHCP y
+        IP_PNP_BOOTP y
+        NFS_FS y
+        ROOT_NFS y
+        TUN m
+        NFS_V4 y
+        NFS_V4_1 y
+        NFS_FSCACHE y
+        NFSD m
+        NFSD_V2_ACL y
+        NFSD_V3 y
+        NFSD_V3_ACL y
+        NFSD_V4 y
 
-      # Fail to build
-      DRM n
-      SCSI_ADVANSYS n
-      USB_ISP1362_HCD n
-      SND_SOC n
-      SND_ALI5451 n
-      FB_SAVAGE n
-      SCSI_NSP32 n
-      ATA_SFF n
-      SUNGEM n
-      IRDA n
-      ATM_HE n
-      SCSI_ACARD n
-      BLK_DEV_CMD640_ENHANCED n
+        # Fail to build
+        DRM n
+        SCSI_ADVANSYS n
+        USB_ISP1362_HCD n
+        SND_SOC n
+        SND_ALI5451 n
+        FB_SAVAGE n
+        SCSI_NSP32 n
+        ATA_SFF n
+        SUNGEM n
+        IRDA n
+        ATM_HE n
+        SCSI_ACARD n
+        BLK_DEV_CMD640_ENHANCED n
 
-      FUSE_FS m
+        FUSE_FS m
 
-      # Needed for udev >= 150
-      SYSFS_DEPRECATED_V2 n
+        # Needed for udev >= 150
+        SYSFS_DEPRECATED_V2 n
 
-      VGA_CONSOLE n
-      VT_HW_CONSOLE_BINDING y
-      SERIAL_8250_CONSOLE y
-      FRAMEBUFFER_CONSOLE y
-      EXT2_FS y
-      EXT3_FS y
-      REISERFS_FS y
-      MAGIC_SYSRQ y
+        VGA_CONSOLE n
+        VT_HW_CONSOLE_BINDING y
+        SERIAL_8250_CONSOLE y
+        FRAMEBUFFER_CONSOLE y
+        EXT2_FS y
+        EXT3_FS y
+        REISERFS_FS y
+        MAGIC_SYSRQ y
 
-      # The kernel doesn't boot at all, with FTRACE
-      FTRACE n
-    '';
-    kernelTarget = "vmlinux";
+        # The kernel doesn't boot at all, with FTRACE
+        FTRACE n
+      '';
+      target = "vmlinux";
+    };
     gcc = {
       arch = "loongson2f";
       float = "hard";
@@ -464,34 +474,36 @@ rec {
   ##
 
   riscv-multiplatform = {
-    name = "riscv-multiplatform";
-    kernelArch = "riscv";
-    kernelTarget = "vmlinux";
-    kernelAutoModules = true;
-    kernelBaseConfig = "defconfig";
-    kernelExtraConfig = ''
-      FTRACE n
-      SERIAL_OF_PLATFORM y
-    '';
+    linux-kernel = {
+      name = "riscv-multiplatform";
+      target = "vmlinux";
+      autoModules = true;
+      baseConfig = "defconfig";
+      extraConfig = ''
+        FTRACE n
+        SERIAL_OF_PLATFORM y
+      '';
+    };
   };
 
   select = platform:
     # x86
-    /**/ if platform.isx86_32 then pc32
-    else if platform.isx86_64 then pc64
+    /**/ if platform.isx86 then pc
 
     # ARM
     else if platform.isAarch32 then let
       version = platform.parsed.cpu.version or null;
-      in     if version == null then pcBase
+      in     if version == null then pc
         else if lib.versionOlder version "6" then sheevaplug
         else if lib.versionOlder version "7" then raspberrypi
         else armv7l-hf-multiplatform
     else if platform.isAarch64 then aarch64-multiplatform
 
+    else if platform.isRiscV then riscv-multiplatform
+
     else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then fuloong2f_n32
 
     else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
 
-    else pcBase;
+    else pc;
 }
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 94e42369b60..c706cd30fce 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -603,6 +603,22 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e
      <literal>/etc/netgroup</literal> defines network-wide groups and may affect to setups using NIS.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Platforms, like <varname>stdenv.hostPlatform</varname>, no longer have a <varname>platform</varname> attribute.
+     It has been (mostly) flattoned away:
+    </para>
+    <itemizedlist>
+     <listitem><para><varname>platform.gcc</varname> is now <varname>gcc</varname></para></listitem>
+     <listitem><para><literal>platform.kernel*</literal> is now <literal>linux-kernel.*</literal></para></listitem>
+    </itemizedlist>
+    <para>
+     Additionally, <varname>platform.kernelArch</varname> moved to the top level as <varname>linuxArch</varname> to match the other <literal>*Arch</literal> variables.
+    </para>
+    <para>
+     The <varname>platform</varname> grouping of these things never meant anything, and was just a historial/implementation artifact that was overdue removal.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix
index e0ab37bca63..4aa1d6369d1 100644
--- a/nixos/modules/hardware/device-tree.nix
+++ b/nixos/modules/hardware/device-tree.nix
@@ -68,11 +68,11 @@ let
       patchShebangs scripts/*
       substituteInPlace scripts/Makefile.lib \
         --replace 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget))' 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) -@'
-      make ${pkgs.stdenv.hostPlatform.platform.kernelBaseConfig} ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
-      make dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
+      make ${pkgs.stdenv.hostPlatform.linux-kernel.baseConfig} ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
+      make dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
     '';
     installPhase = ''
-      make dtbs_install INSTALL_DTBS_PATH=$out/dtbs  ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}"
+      make dtbs_install INSTALL_DTBS_PATH=$out/dtbs  ARCH="${pkgs.stdenv.hostPlatform.linuxArch}"
     '';
   };
 
@@ -115,7 +115,7 @@ in
   options = {
       hardware.deviceTree = {
         enable = mkOption {
-          default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false;
+          default = pkgs.stdenv.hostPlatform.linux-kernel.DTB or false;
           type = types.bool;
           description = ''
             Build device tree files. These are used to describe the
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 95eba86bcb6..fa074fdfcc6 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -88,7 +88,7 @@ with lib;
 
     system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
       #!ipxe
-      kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
+      kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
       initrd initrd
       boot
     '';
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 0eeff31d6c4..64bdbf159d5 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -587,10 +587,10 @@ in
 
     nix.systemFeatures = mkDefault (
       [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
-      optionals (pkgs.hostPlatform.platform ? gcc.arch) (
-        # a builder can run code for `platform.gcc.arch` and inferior architectures
-        [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++
-        map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch}
+      optionals (pkgs.hostPlatform ? gcc.arch) (
+        # a builder can run code for `gcc.arch` and inferior architectures
+        [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++
+        map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch}
       )
     );
 
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 03d7e749323..b0f77ca3fb8 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -190,7 +190,7 @@ in
 
     system.boot.loader.kernelFile = mkOption {
       internal = true;
-      default = pkgs.stdenv.hostPlatform.platform.kernelTarget;
+      default = pkgs.stdenv.hostPlatform.linux-kernel.target;
       type = types.str;
       description = ''
         Name of the kernel file to be passed to the bootloader.
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index 2d27611946e..fee567a510b 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -59,7 +59,7 @@ in
 
     system.build.installBootLoader = generationsDirBuilder;
     system.boot.loader.id = "generationsDir";
-    system.boot.loader.kernelFile = platform.kernelTarget;
+    system.boot.loader.kernelFile = linux-kernel.target;
 
   };
 }
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index ba936b26573..db22dd36cbe 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -103,6 +103,6 @@ in
 
     system.build.installBootLoader = builder;
     system.boot.loader.id = "raspberrypi";
-    system.boot.loader.kernelFile = platform.kernelTarget;
+    system.boot.loader.kernelFile = linux-kernel.target;
   };
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index 1f5c1581269..109747945f7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -79,7 +79,7 @@ let
     in
       tarball //
         { meta = {
-            description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.platform.name}";
+            description = "NixOS system tarball for ${system} - ${stdenv.hostPlatform.linux-kernel.name}";
             maintainers = map (x: lib.maintainers.${x}) maintainers;
           };
           inherit config;
@@ -105,7 +105,7 @@ let
         modules = makeModules module {};
       };
       build = configEvaled.config.system.build;
-      kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget;
+      kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.linux-kernel.target;
     in
       pkgs.symlinkJoin {
         name = "netboot";
diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix
index dd7e8b062da..1cb9c0f18bf 100644
--- a/pkgs/applications/audio/virtual-ans/default.nix
+++ b/pkgs/applications/audio/virtual-ans/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   startScript = if stdenv.isx86_32 then "START_LINUX_X86"
     else        if stdenv.isx86_64 then "START_LINUX_X86_64"
     #else        if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin
-    else abort "Unsupported platform: ${stdenv.platform.kernelArch}.";
+    else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}.";
 
   linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86"
     else            if stdenv.isx86_64 then "pixilang_linux_x86_64"
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 3ad540e5307..848b93a5381 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -75,7 +75,7 @@ in
 
     CROSVM_CARGO_TEST_KERNEL_BINARY =
       lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform)
-        "${linux}/${stdenv.hostPlatform.platform.kernelTarget}";
+        "${linux}/${stdenv.hostPlatform.linux-kernel.target}";
 
     passthru = {
       inherit adhdSrc;
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index 33d707a5007..8c41a1f4c27 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''(
     cd src
-    ./mk.sh ${stdenv.buildPlatform.platform.kernelArch}
+    ./mk.sh ${stdenv.buildPlatform.linuxArch}
   )'';
 
   installPhase = ''
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index bd3ebdf800e..e0d43739668 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation {
       else if targetPlatform.isRiscV then "lriscv"
       else throw "unknown emulation for platform: ${targetPlatform.config}";
     in if targetPlatform.useLLVM or false then ""
-       else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
+       else targetPlatform.bfdEmulation or (fmt + sep + arch);
 
   strictDeps = true;
   depsTargetTargetPropagated = extraPackages;
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d1d5f8e6c86..e0153ffc17f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -402,32 +402,32 @@ stdenv.mkDerivation {
     # Always add -march based on cpu in triple. Sometimes there is a
     # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
     # that case.
-    + optionalString ((targetPlatform ? platform.gcc.arch) &&
-                      isGccArchSupported targetPlatform.platform.gcc.arch) ''
-      echo "-march=${targetPlatform.platform.gcc.arch}" >> $out/nix-support/cc-cflags-before
+    + optionalString ((targetPlatform ? gcc.arch) &&
+                      isGccArchSupported targetPlatform.gcc.arch) ''
+      echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
     ''
 
     # -mcpu is not very useful. You should use mtune and march
     # instead. It’s provided here for backwards compatibility.
-    + optionalString (targetPlatform ? platform.gcc.cpu) ''
-      echo "-mcpu=${targetPlatform.platform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
+    + optionalString (targetPlatform ? gcc.cpu) ''
+      echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
     ''
 
     # -mfloat-abi only matters on arm32 but we set it here
     # unconditionally just in case. If the abi specifically sets hard
     # vs. soft floats we use it here.
-    + optionalString (targetPlatform ? platform.gcc.float-abi) ''
-      echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
+    + optionalString (targetPlatform ? gcc.float-abi) ''
+      echo "-mfloat-abi=${targetPlatform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
     ''
-    + optionalString (targetPlatform ? platform.gcc.fpu) ''
-      echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
+    + optionalString (targetPlatform ? gcc.fpu) ''
+      echo "-mfpu=${targetPlatform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
     ''
-    + optionalString (targetPlatform ? platform.gcc.mode) ''
-      echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before
+    + optionalString (targetPlatform ? gcc.mode) ''
+      echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before
     ''
-    + optionalString (targetPlatform ? platform.gcc.tune &&
-                      isGccArchSupported targetPlatform.platform.gcc.tune) ''
-      echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before
+    + optionalString (targetPlatform ? gcc.tune &&
+                      isGccArchSupported targetPlatform.gcc.tune) ''
+      echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before
     ''
 
     # TODO: categorize these and figure out a better place for them
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 901eb311a88..9af40d33242 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -56,13 +56,13 @@ in
 , prepend ? []
 
 # Whether to wrap the initramfs in a u-boot image.
-, makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage"
+, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target == "uImage"
 
 # If generating a u-boot image, the architecture to use. The default
 # guess may not align with u-boot's nomenclature correctly, so it can
 # be overridden.
 # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list.
-, uInitrdArch ? stdenvNoCC.hostPlatform.kernelArch
+, uInitrdArch ? stdenvNoCC.hostPlatform.linuxArch
 
 # The name of the compression, as recognised by u-boot.
 # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list.
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 5f3c7e1d621..215782368f6 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,6 +1,6 @@
 { pkgs
 , kernel ? pkgs.linux
-, img ? pkgs.stdenv.hostPlatform.platform.kernelTarget
+, img ? pkgs.stdenv.hostPlatform.linux-kernel.target
 , storeDir ? builtins.storeDir
 , rootModules ?
     [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index f3cdce41193..66af8c4a4cc 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,7 +1,7 @@
 { lib, targetPlatform }:
 
 let
-  p =  targetPlatform.platform.gcc or {}
+  p =  targetPlatform.gcc or {}
     // targetPlatform.parsed.abi;
 in lib.concatLists [
   (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 0325632ad0a..78f7c2ef1b9 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
     let
       arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
index 8096af0b320..2a270b7c72c 100644
--- a/pkgs/development/compilers/julia/1.3.nix
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix
index be3cfc39635..778a9c3a9d7 100644
--- a/pkgs/development/compilers/julia/1.5.nix
+++ b/pkgs/development/compilers/julia/1.5.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     let
       arch = head (splitString "-" stdenv.system);
       march = {
-        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64";
         i686 = "pentium4";
         aarch64 = "armv8-a";
       }.${arch}
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 6b17e463d76..6637a9bb2a3 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -158,7 +158,7 @@ stdenv.mkDerivation ({
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
     ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       (lib.flip lib.withFeature "fp"
-         (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
+         (stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft"))
       "--with-__thread"
     ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [
       "--host=arm-linux-gnueabi"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index e6ab23073b1..1a3f1948f84 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -88,7 +88,7 @@ qtModule {
   NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
     # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
     "-Wno-class-memaccess"
-  ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
+  ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
     # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
     # TODO: investigate and fix properly
     "-march=westmere"
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index e333bd49718..edf556377b3 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -73,9 +73,9 @@ let
         if isLinux
         then
           (
-            x: x.platform == "manylinux1_${stdenv.platform.kernelArch}"
-              || x.platform == "manylinux2010_${stdenv.platform.kernelArch}"
-              || x.platform == "manylinux2014_${stdenv.platform.kernelArch}"
+            x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}"
+              || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}"
+              || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}"
               || x.platform == "any"
           )
         else (x: hasInfix "macosx" x.platform || x.platform == "any");
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index ba8145398f5..ea2f27b0e22 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -95,7 +95,7 @@ let
           else if stdenv.isDarwin then "darwin"
           else throw "Unsupported platform"
         );
-        platform_machine = stdenv.platform.kernelArch;
+        platform_machine = stdenv.hostPlatform.linuxArch;
         platform_python_implementation =
           let
             impl = python.passthru.implementation;
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 5308149c26b..ccea8ee4553 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -60,18 +60,17 @@ in
 
     configureFlags = let
       isCross = stdenv.hostPlatform != stdenv.buildPlatform;
-      host = stdenv.hostPlatform.platform;
-      isAarch32 = stdenv.hostPlatform.isAarch32;
+      inherit (stdenv.hostPlatform) gcc isArch32;
     in sharedConfigureFlags ++ [
       "--without-dtrace"
     ] ++ (optionals isCross [
       "--cross-compiling"
       "--without-intl"
       "--without-snapshot"
-    ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
-      "--with-arm-fpu=${host.gcc.fpu}"
-    ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
-      "--with-arm-float-abi=${host.gcc.float-abi}"
+    ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [
+      "--with-arm-fpu=${gcc.fpu}"
+    ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [
+      "--with-arm-float-abi=${gcc.float-abi}"
     ]) ++ (optionals (isCross && isAarch32) [
       "--dest-cpu=arm"
     ]) ++ extraConfigFlags;
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index 88792346d70..958bcdb9f16 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
   ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index cadf65a7220..d6ed7bccba3 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -7,7 +7,7 @@ let
     pname = "linux-headers";
     inherit version;
 
-    ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch;
+    ARCH = stdenvNoCC.hostPlatform.linuxArch;
 
     # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
     # We do this so we have a build->build, not build->host, C compiler.
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 31a90dc740f..ac9d6fbb2b5 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -42,7 +42,7 @@
   # symbolic name and `patch' is the actual patch.  The patch may
   # optionally be compressed with gzip or bzip2.
   kernelPatches ? []
-, ignoreConfigErrors ? stdenv.hostPlatform.platform.name != "pc" ||
+, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc" ||
                        stdenv.hostPlatform != stdenv.buildPlatform
 , extraMeta ? {}
 
@@ -51,10 +51,10 @@
 , isLibre    ? false
 , isHardened ? false
 
-# easy overrides to stdenv.hostPlatform.platform members
-, autoModules ? stdenv.hostPlatform.platform.kernelAutoModules
-, preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false
-, kernelArch ? stdenv.hostPlatform.platform.kernelArch
+# easy overrides to stdenv.hostPlatform.linux-kernel members
+, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules
+, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false
+, kernelArch ? stdenv.hostPlatform.linuxArch
 
 , ...
 }:
@@ -87,7 +87,7 @@ let
   intermediateNixConfig = configfile.moduleStructuredConfig.intermediateNixConfig
     # extra config in legacy string format
     + extraConfig
-    + lib.optionalString (stdenv.hostPlatform.platform ? kernelExtraConfig) stdenv.hostPlatform.platform.kernelExtraConfig;
+    + stdenv.hostPlatform.linux-kernel.extraConfig or "";
 
   structuredConfigFromPatches =
         map ({extraStructuredConfig ? {}, ...}: {settings=extraStructuredConfig;}) kernelPatches;
@@ -113,11 +113,11 @@ let
     nativeBuildInputs = [ perl gmp libmpc mpfr ]
       ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ];
 
-    platformName = stdenv.hostPlatform.platform.name;
+    platformName = stdenv.hostPlatform.linux-kernel.name;
     # e.g. "defconfig"
-    kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.platform.kernelBaseConfig;
+    kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
     # e.g. "bzImage"
-    kernelTarget = stdenv.hostPlatform.platform.kernelTarget;
+    kernelTarget = stdenv.hostPlatform.linux-kernel.target;
 
     prePatch = kernel.prePatch + ''
       # Patch kconfig to print "###" after every question so that
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 67016b71918..2fc63322f5b 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -64,10 +64,10 @@ let
 
   commonMakeFlags = [
     "O=$(buildRoot)"
-  ] ++ lib.optionals (stdenv.hostPlatform.platform ? kernelMakeFlags)
-    stdenv.hostPlatform.platform.kernelMakeFlags;
+  ] ++ lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags)
+    stdenv.hostPlatform.linux-kernel.makeFlags;
 
-  drvAttrs = config_: platform: kernelPatches: configfile:
+  drvAttrs = config_: kernelConf: kernelPatches: configfile:
     let
       config = let attrName = attr: "CONFIG_" + attr; in {
         isSet = attr: hasAttr (attrName attr) config;
@@ -171,7 +171,7 @@ let
 
       buildFlags = [
         "KBUILD_BUILD_VERSION=1-NixOS"
-        platform.kernelTarget
+        kernelConf.target
         "vmlinux"  # for "perf" and things like that
       ] ++ optional isModular "modules";
 
@@ -186,16 +186,16 @@ let
       '';
 
       # Some image types need special install targets (e.g. uImage is installed with make uinstall)
-      installTargets = [ (
-        if platform ? kernelInstallTarget then platform.kernelInstallTarget
-        else if platform.kernelTarget == "uImage" then "uinstall"
-        else if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall"
-        else "install"
-      ) ];
+      installTargets = [
+        (kernelConf.installTarget or (
+          /**/ if kernelConf.target == "uImage" then "uinstall"
+          else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall"
+          else "install"))
+      ];
 
       postInstall = (optionalString installsFirmware ''
         mkdir -p $out/lib/firmware
-      '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
+      '') + (if (kernelConf.DTB or false) then ''
         make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
       '' else "") + (if isModular then ''
         mkdir -p $dev
@@ -300,7 +300,7 @@ in
 assert (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") -> libelf != null;
 assert lib.versionAtLeast version "5.8" -> elfutils != null;
 
-stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
+stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // {
   pname = "linux";
   inherit version;
 
@@ -308,7 +308,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ]
-      ++ optional  (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
+      ++ optional  (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools
       ++ optional  (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf
       # Removed util-linuxMinimal since it should not be a dependency.
       ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
@@ -322,10 +322,10 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
   makeFlags = commonMakeFlags ++ [
     "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
     "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
-    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
   ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
-  karch = stdenv.hostPlatform.platform.kernelArch;
+  karch = stdenv.hostPlatform.linuxArch;
 })
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 65ab71bd562..dc96f3b6a62 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" "stackprotector" ];
 
   makeFlags = commonMakeFlags ++ [
-    "KLIBCARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "KLIBCARCH=${stdenv.hostPlatform.linuxArch}"
     "KLIBCKERNELSRC=${linuxHeaders}"
   ] # TODO(@Ericson2314): We now can get the ABI from
     # `stdenv.hostPlatform.parsed.abi`, is this still a good idea?
-    ++ lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y"
+    ++ lib.optional (stdenv.hostPlatform.linuxArch == "arm") "CONFIG_AEABI=y"
     ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
 
   # Install static binaries as well.
diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index 056fd40d252..a862b351716 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ nukeReferences ];
 
   makeFlags = [
-    "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
+    "ARCH=${stdenv.hostPlatform.linuxArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us.
   ];
 
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index aeed87d3c19..68a88fb6778 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))
     ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 7c95a98372d..7508e1faf15 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation {
     cat << EOF | parseconfig
     ${nixConfig}
     ${extraConfig}
-    ${stdenv.hostPlatform.platform.uclibc.extraConfig or ""}
+    ${stdenv.hostPlatform.uclibc.extraConfig or ""}
     EOF
     ( set +o pipefail; yes "" | make oldconfig )
   '';
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 0eb799e4525..28d22a4bb47 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -278,8 +278,8 @@ in rec {
           enableParallelChecking = attrs.enableParallelChecking or true;
         } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
           NIX_HARDENING_ENABLE = enabledHardeningOptions;
-        } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? platform.gcc.arch) {
-          requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch}" ];
+        } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) {
+          requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ];
         } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
           inherit __darwinAllowLocalNetworking;
           # TODO: remove lib.unique once nix has a list canonicalization primitive
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd86fed4cb2..ed9f3047969 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19291,7 +19291,7 @@ in
     buildPhase = ''
       set -x
       make \
-        ARCH=${stdenv.hostPlatform.kernelArch} \
+        ARCH=${stdenv.hostPlatform.linuxArch} \
         HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \
         ${makeTarget}
     '';

From 2dde58903e0f2f490088c3b0cedadc9b479da085 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 22 Jan 2021 16:36:06 -0500
Subject: [PATCH 706/956] top-level: Simplify impure and pure fallback

This is now possible, since the `platform` attribute has been removed in
PR #107214. I've been waiting to do a cleanup like this for a long time!
---
 pkgs/top-level/default.nix | 24 ++++++++++--------------
 pkgs/top-level/impure.nix  | 34 ++++++++++++++--------------------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index dfa68ba31b8..10cf36d4d13 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -1,9 +1,8 @@
 /* This function composes the Nix Packages collection. It:
 
-     1. Applies the final stage to the given `config` if it is a function
+     1. Elaborates `localSystem` and `crossSystem` with defaults as needed.
 
-     2. Infers an appropriate `platform` based on the `system` if none is
-        provided
+     2. Applies the final stage to the given `config` if it is a function
 
      3. Defaults to no non-standard config and no cross-compilation target
 
@@ -50,6 +49,14 @@ let # Rename the function arguments
 in let
   lib = import ../../lib;
 
+  localSystem = lib.systems.elaborate args.localSystem;
+
+  # Condition preserves sharing which in turn affects equality.
+  crossSystem =
+    if crossSystem0 == null || crossSystem0 == args.localSystem
+    then localSystem
+    else lib.systems.elaborate crossSystem0;
+
   # Allow both:
   # { /* the config */ } and
   # { pkgs, ... } : { /* the config */ }
@@ -58,17 +65,6 @@ in let
     then config0 { inherit pkgs; }
     else config0;
 
-  # From a minimum of `system` or `config` (actually a target triple, *not*
-  # nixpkgs configuration), infer the other one and platform as needed.
-  localSystem = lib.systems.elaborate (if builtins.isAttrs args.localSystem then (
-    # Allow setting the platform in the config file. This take precedence over
-    # the inferred platform, but not over an explicitly passed-in one.
-    builtins.intersectAttrs { platform = null; } config1
-    // args.localSystem) else args.localSystem);
-
-  crossSystem = if crossSystem0 == null then localSystem
-                else lib.systems.elaborate crossSystem0;
-
   configEval = lib.evalModules {
     modules = [
       ./config.nix
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 3ba6c08a140..6f7383c8e7a 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -12,17 +12,15 @@ let
 
 in
 
-{ # We combine legacy `system` and `platform` into `localSystem`, if
-  # `localSystem` was not passed. Strictly speaking, this is pure desugar, but
-  # it is most convient to do so before the impure `localSystem.system` default,
-  # so we do it now.
-  localSystem ? builtins.intersectAttrs { system = null; platform = null; } args
+{ # We put legacy `system` into `localSystem`, if `localSystem` was not passed.
+  # If neither is passed, assume we are building packages on the current
+  # (build, in GNU Autotools parlance) platform.
+  localSystem ? { system = args.system or builtins.currentSystem; }
 
-, # These are needed only because nix's `--arg` command-line logic doesn't work
-  # with unnamed parameters allowed by ...
-  system ? localSystem.system
-, platform ? localSystem.platform
-, crossSystem ? null
+# These are needed only because nix's `--arg` command-line logic doesn't work
+# with unnamed parameters allowed by ...
+, system ? localSystem.system
+, crossSystem ? localSystem
 
 , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
   # $HOME/.config/nixpkgs/config.nix.
@@ -77,15 +75,11 @@ in
 , ...
 } @ args:
 
-# If `localSystem` was explicitly passed, legacy `system` and `platform` should
-# not be passed.
-assert args ? localSystem -> !(args ? system || args ? platform);
+# If `localSystem` was explicitly passed, legacy `system` should
+# not be passed, and vice-versa.
+assert args ? localSystem -> !(args ? system);
+assert args ? system -> !(args ? localSystem);
 
-import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
-  inherit config overlays crossSystem crossOverlays;
-  # Fallback: Assume we are building packages on the current (build, in GNU
-  # Autotools parlance) system.
-  localSystem = if builtins.isString localSystem then localSystem
-                else (if args ? localSystem then {}
-                      else { system = builtins.currentSystem; }) // localSystem;
+import ./. (builtins.removeAttrs args [ "system" ] // {
+  inherit config overlays localSystem;
 })

From 9d6fd2ba135c5b5c85c3332604d39b43e93b8298 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:20:00 +0000
Subject: [PATCH 707/956] dune_2: 2.8.0 -> 2.8.2

https://github.com/ocaml/dune/releases/tag/2.8.1
https://github.com/ocaml/dune/releases/tag/2.8.2
---
 pkgs/development/tools/ocaml/dune/2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index 8183e106aa7..c15e04bf37e 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -6,11 +6,11 @@ else
 
 stdenv.mkDerivation rec {
   pname = "dune";
-  version = "2.8.0";
+  version = "2.8.2";
 
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "12yly2lp93ijhy7b72p6y2q3cr3yy3hk7rlmrh072py8a6d4s407";
+    sha256 = "07mf6pnmv1a6wh4la45zf6cn6qy2vcmz4xgx0djj75kw1wiyii72";
   };
 
   buildInputs = [ ocaml findlib ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://dune.build/";
     description = "A composable build system";
-    changelog = "https://github.com/ocaml/dune/releases/tag/${version}";
+    changelog = "https://github.com/ocaml/dune/blob/${version}/CHANGES.md";
     maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ];
     license = stdenv.lib.licenses.mit;
     inherit (ocaml.meta) platforms;

From 861aade89835c415266e1a2d7c3fced300ac2910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 23 Jan 2021 16:18:51 +0100
Subject: [PATCH 708/956] python3Packages.transformers: 4.2.1 -> 4.2.2

Changelog:
https://github.com/huggingface/transformers/releases/tag/v4.2.2
---
 pkgs/development/python-modules/transformers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index e2409c155c9..2eaf4176fea 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yf5s878i6v298wxm4cwkb33qyxz5bdr75jmsnldpdw4ml31c3nn";
+    hash = "sha256-sBMCzEgYX6HQbzoEIYnmMdpYecCCsQjTdl2mO1Veu9M=";
   };
 
   propagatedBuildInputs = [

From 7f840a1acf260ba7637eb0603fb4aaff16b5d2d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 23 Jan 2021 16:22:56 +0100
Subject: [PATCH 709/956] python3Packages.transformers: re-relax tokenizer
 bound

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

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 2eaf4176fea..ee288f7626b 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -41,8 +41,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "tokenizers == 0.9.4" "tokenizers"
+    sed -ri 's/tokenizers==[0-9.]+/tokenizers/g' setup.py
   '';
 
   pythonImportsCheck = [ "transformers" ];

From ad4acd0bcc21ac835df0e564bd97b9f495654c28 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Thu, 21 Jan 2021 13:08:05 -0500
Subject: [PATCH 710/956] pulumi-bin: 2.17.2 -> 2.18.2

---
 pkgs/tools/admin/pulumi/data.nix  | 82 +++++++++++++++----------------
 pkgs/tools/admin/pulumi/update.sh | 20 ++++----
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index 12e8845e011..135f6dcca4f 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -1,60 +1,60 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "2.17.2";
+  version = "2.18.2";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.2-linux-x64.tar.gz";
-        sha256 = "0hz4m0h9k1ma8zig5mhmianvrw0bwsv9qsz7q80bsjj7m1vy59jq";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v2.18.2-linux-x64.tar.gz";
+        sha256 = "0ya8b77qjda5z6bkik2yxq30wi1753mgkbcshd3x8f4wkb7kvj3w";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz";
         sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-linux-amd64.tar.gz";
-        sha256 = "125jqdjn9iipnjj3xgwvcfhcq0xi8xvn8mgs17g79xwbbxpvrjiv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.0-linux-amd64.tar.gz";
+        sha256 = "1q9jz3p784x8k56an6hg9nazz44hlhdg9fawx6n0zrp6mh34kpsp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz";
         sha256 = "18gyan0dszfvx8fhvi8r2msbf8n9lbh10pnvcaqvdk8cr79lnzl9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.3-linux-amd64.tar.gz";
-        sha256 = "064003d7frnj16njp7pdgbvq42hv7xwwbrnnxm3pk85h1xkpa1x8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-linux-amd64.tar.gz";
+        sha256 = "05nmdjgwhm1pi5zljq33812wgkz1rpisjrvdn8lcsapwz3fchbjd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.1-linux-amd64.tar.gz";
-        sha256 = "0cpvxqm6bv2085ndn4b39v53s2050rhbnk3g0d6a2s32b70m4hay";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-linux-amd64.tar.gz";
+        sha256 = "12wjh0w7i1f6rd5r4pqc98ix4mkrkqwnvpv7hkcsn90rsxrlfysk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.1-linux-amd64.tar.gz";
-        sha256 = "0ish124033nagqrb60kc0ybwkmijfq2y7x4kdcrxhkhn2n5wzqzh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-linux-amd64.tar.gz";
+        sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-linux-amd64.tar.gz";
         sha256 = "1582h37z0971pd7xp6ss7r7742068pkbh2k5q8jj6ii3d7rwbbp1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.7.0-linux-amd64.tar.gz";
-        sha256 = "0a9xz13h905r8m9h3v7zl04sjyic031zra9bsz3n3lr3x8ihhz6z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.8.0-linux-amd64.tar.gz";
+        sha256 = "1an0i997bpnkf19zbgfjyl2h7sm21xsc564x6zwcg67sxcjaal0w";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.2-linux-amd64.tar.gz";
-        sha256 = "0i7mbvf5azxxlxj0b3divqxvsq3q1346d4bbwx983zbn66j13iml";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.0-linux-amd64.tar.gz";
+        sha256 = "0sglafpi7fjcrgky0a7xfra28ps55bb88mdi695i905ic8y071wa";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.1-linux-amd64.tar.gz";
-        sha256 = "01m6gpyrvirr1b447g47zrnwf03z3x7msyhd0waf4knm22d9ym0l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz";
+        sha256 = "10d5gmhax02906jpr9nmb80xfxvy2ym8vjyj31sz2mcl9jnadk4z";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-linux-amd64.tar.gz";
         sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.6-linux-amd64.tar.gz";
-        sha256 = "1w1ygmh8w1cyfc1cca9zpfix2bakdlhms4clp5xcwrlr9hc33w5d";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.7-linux-amd64.tar.gz";
+        sha256 = "1x0j93y65687qh2k62ks61q2rjdlr06kkhas07w82x36xl6r30h1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz";
@@ -65,8 +65,8 @@
         sha256 = "0c2aypx8y6s892y2gygc8116rlarlcw1s2m39gkcdjjbfkmf8za0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.2-linux-amd64.tar.gz";
-        sha256 = "0hhj4y96c9nwbvzpaq7ilyal0s3vsf2ks0y6pqbiyh6ji0ch6xlb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-linux-amd64.tar.gz";
+        sha256 = "0iqimhqh853jx6zd53z1r98ky0qhxfby9w519xpdlvxxq5aqb6kb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz";
@@ -91,56 +91,56 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.2-darwin-x64.tar.gz";
-        sha256 = "1a9gy1767aizajkgl0qds9q4fkapyf9xip0hz67sj6861w6r6p6i";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v2.18.2-darwin-x64.tar.gz";
+        sha256 = "0rrmiplwml864s6rsxmb0zprd8qnf6ss92hgay9xnr6bxs6gl8w2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz";
         sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-darwin-amd64.tar.gz";
-        sha256 = "0h4g49zr6gxvyavd9pzvlmnzxjqnnzh27dhz6007c10rgn894yba";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.0-darwin-amd64.tar.gz";
+        sha256 = "0jxsh5af08sjj21ff484n1a9dylhmf02gzagw6r8x6lh247l5qp2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz";
         sha256 = "0dqyd8aywmxrsvipndwrwq5pxv7avzf8kpk6rdyip4j8hp156lbz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.3-darwin-amd64.tar.gz";
-        sha256 = "18q6f3qlw7yk6ri1mq6fvl69ss7rxnivzv2aag8rxds06xrl6klq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-darwin-amd64.tar.gz";
+        sha256 = "0xbbaphd0lypyzq262rapr42lmyz3wr14xab09qc156rjasr8w64";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.1-darwin-amd64.tar.gz";
-        sha256 = "0jbz0d551347vp1b4chjkv03rq9l7061ijwyi2mx0spx7q847zs4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-darwin-amd64.tar.gz";
+        sha256 = "10izly9m7847rsb533ch3n8rkhbfb3q6lcx80dk5ia8bfdlvc3cn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.1-darwin-amd64.tar.gz";
-        sha256 = "0blrl421zwn7ga0skr49lqc1c1z98qy03p2ivyjygwz2pppdv9p9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-darwin-amd64.tar.gz";
+        sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-darwin-amd64.tar.gz";
         sha256 = "06q9pysql611p24padz6cz2fhf14bqkw7li504479sbnsxqk3g0s";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.7.0-darwin-amd64.tar.gz";
-        sha256 = "1ys5s3asmwwsy3hv4mrcdsqyc579wqaihlhdc6bqvnyfn5wbbwk8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.8.0-darwin-amd64.tar.gz";
+        sha256 = "1x59xfzfgk02fmddbpvjk4cy8pnbgc65qwz9w70q59pyzyxl050s";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.2-darwin-amd64.tar.gz";
-        sha256 = "1azgic0mgzqmdcq61is2fny9q9w2aslrpbp2zsclc60prqsi47nd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.0-darwin-amd64.tar.gz";
+        sha256 = "0c9m036s690vrspklg1dxa6rnyqbfpspjn6lm64wj1w75qk9z746";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.1-darwin-amd64.tar.gz";
-        sha256 = "0nziryb7d66l0pca77g7w6z92jsfhvqgi53bw5hkkr2ca1k9mkxl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz";
+        sha256 = "0xfkdmnax10zkgpipxaxfi0lgfgijnvssbwmfsaxxisdxscw2ig9";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-darwin-amd64.tar.gz";
         sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.6-darwin-amd64.tar.gz";
-        sha256 = "15dvr92v490i7b415x80rxyjp2r0hp51xwha87yjpxp1knwfbbg4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.7-darwin-amd64.tar.gz";
+        sha256 = "1nvgvk2awimllmy0yj69250w06hy64zcml5mhn5i9i2zyhmnwb6q";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz";
@@ -151,8 +151,8 @@
         sha256 = "15w72087frbx6wyngi20bsssnr7si1bk1h94jav3d4cgm6nhpnwk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.2-darwin-amd64.tar.gz";
-        sha256 = "0x6rjn3kg935chcwd90qj1knlrc5xz5any7s4sc3a8fh2n78f0vd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-darwin-amd64.tar.gz";
+        sha256 = "05hap76yzss5bsgr20rm8sxb6r3iiwvq75lhf11laaxq2hnb7qdp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz";
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh
index 1cc62745cc4..e3422214abe 100755
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@@ -3,26 +3,26 @@
 
 # Version of Pulumi from
 # https://www.pulumi.com/docs/get-started/install/versions/
-VERSION="2.17.2"
+VERSION="2.18.2"
 
 # Grab latest release ${VERSION} from
 # https://github.com/pulumi/pulumi-${NAME}/releases
 plugins=(
     "auth0=1.5.2"
-    "aws=3.23.0"
+    "aws=3.25.0"
     "cloudflare=2.11.1"
-    "consul=2.6.3"
-    "datadog=2.14.1"
-    "digitalocean=3.2.1"
+    "consul=2.7.0"
+    "datadog=2.15.0"
+    "digitalocean=3.3.0"
     "docker=2.6.1"
-    "gcp=4.7.0"
-    "github=2.4.2"
-    "gitlab=3.4.1"
+    "gcp=4.8.0"
+    "github=2.5.0"
+    "gitlab=3.5.0"
     "hcloud=0.5.1"
-    "kubernetes=2.7.6"
+    "kubernetes=2.7.7"
     "mailgun=2.3.2"
     "mysql=2.3.3"
-    "openstack=2.10.2"
+    "openstack=2.11.0"
     "packet=3.2.2"
     "postgresql=2.5.3"
     "random=3.0.1"

From 09640efc3d64daf5fceda1aaf4df2fa115779161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 23 Jan 2021 16:36:35 +0100
Subject: [PATCH 711/956] setzer: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix
index 5c62dc06a7d..334f8b79c4b 100644
--- a/pkgs/applications/editors/setzer/default.nix
+++ b/pkgs/applications/editors/setzer/default.nix
@@ -18,13 +18,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "setzer";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "cvfosammmm";
     repo = "Setzer";
     rev = "v${version}";
-    sha256 = "036xbg65h255zlvz9l86sw6w9l4qfyf13x8p8ml7dj52hcdfvyb9";
+    sha256 = "1rcx2c07jg1ij81pnvg3px49hfbjmkagn68d3gp79z3gcajbp2av";
   };
 
   format = "other";
@@ -55,6 +55,10 @@ python3.pkgs.buildPythonApplication rec {
     pycairo
   ];
 
+  checkPhase = ''
+    meson test --print-errorlogs
+  '';
+
   meta = with lib; {
     description = "LaTeX editor written in Python with Gtk";
     homepage = src.meta.homepage;

From b816ee9a0f762e6cb4261bb01cf3baf2cfcc5f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 23 Jan 2021 17:08:05 +0100
Subject: [PATCH 712/956] eschalot: 2018-01-19 -> 1.2.0.20191006

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

diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix
index 04675061615..0c984c5d35e 100644
--- a/pkgs/tools/security/eschalot/default.nix
+++ b/pkgs/tools/security/eschalot/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eschalot";
-  version = "2018-01-19";
+  version = "1.2.0.20191006";
 
   src = fetchFromGitHub {
     owner = "ReclaimYourPrivacy";
     repo = pname;
-    rev = "56a967b62631cfd3c7ef68541263dbd54cbbc2c4";
-    sha256 = "1iw1jrydasm9dmgpcdimd8dy9n281ys9krvf3fd3dlymkgsj604d";
+    rev = "a45bad5b9a3e4939340ddd8a751ceffa3c0db76a";
+    sha256 = "1wbi0azc2b57nmmx6c1wmvng70d9ph1s83yhnl5lxaaqaj85h22g";
   };
 
   buildInputs = [ openssl ];

From 48c7cd563b78103b6e757ddd92db454bef030ada Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Sat, 23 Jan 2021 16:12:57 +0000
Subject: [PATCH 713/956] androidStudioPackages.stable: 4.1.1.0 -> 4.1.2.0

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index d1eb7e58ef8..58cdfbd3ab2 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -9,9 +9,9 @@ let
     inherit buildFHSUserEnv;
   };
   stableVersion = {
-    version = "4.1.1.0"; # "Android Studio 4.1.1"
-    build = "201.6953283";
-    sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os=";
+    version = "4.1.2.0"; # "Android Studio 4.1.2"
+    build = "201.7042882";
+    sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9";
   };
   betaVersion = {
     version = "4.2.0.18"; # "Android Studio 4.2 Beta 2"

From 12c075bab5145224615fb8823b0d1e993de93173 Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Sat, 23 Jan 2021 16:43:11 +0000
Subject: [PATCH 714/956] androidStudioPackages.beta: 4.2.0.18 -> 4.2.0.19

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 58cdfbd3ab2..531b93ff197 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,9 +14,9 @@ let
     sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9";
   };
   betaVersion = {
-    version = "4.2.0.18"; # "Android Studio 4.2 Beta 2"
-    build = "202.7008469";
-    sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh";
+    version = "4.2.0.19"; # "Android Studio 4.2 Beta 3"
+    build = "202.7033425";
+    sha256Hash = "037r99hn16y0fy6z6k90qf6yx5a4vvx6bl9rdyagdm16ry4bpiw4";
   };
   latestVersion = { # canary & dev
     version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3"

From b51eb306a3f769d46f4fcbbf3a072a6f917ed1a0 Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Sat, 23 Jan 2021 16:53:50 +0000
Subject: [PATCH 715/956] androidStudioPackages.{canary,dev}: 2020.3.1.3 ->
 2020.3.1.4

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 531b93ff197..cbc5198f2f3 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -19,8 +19,8 @@ let
     sha256Hash = "037r99hn16y0fy6z6k90qf6yx5a4vvx6bl9rdyagdm16ry4bpiw4";
   };
   latestVersion = { # canary & dev
-    version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3"
-    sha256Hash = "1nx78j3pqr8qgwprnzfy17w9jmkgiqnlbsw91jnslr9p9fd0ixcx";
+    version = "2020.3.1.4"; # "Android Studio Arctic Fox Canary 4"
+    sha256Hash = "05drh4grq0b37qg5nspf2c6vmvcc9x71al3xwc2ddjhmyj0f9sk4";
   };
 in {
   # Attributes are named by their corresponding release channels

From 8150fd8d0d028ac54cfbe03943db05e1cf0a342c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 23 Jan 2021 17:56:39 +0100
Subject: [PATCH 716/956] spacegun: add missing node-gyp-build global
 dependency

---
 pkgs/applications/networking/cluster/spacegun/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix
index 64623f88dda..135d762f006 100644
--- a/pkgs/applications/networking/cluster/spacegun/default.nix
+++ b/pkgs/applications/networking/cluster/spacegun/default.nix
@@ -10,7 +10,7 @@ let
   };
 in
 nodePackages."${packageName}".override {
-  nativeBuildInputs = [ pkgs.makeWrapper ];
+  nativeBuildInputs = [ pkgs.makeWrapper pkgs.nodePackages.node-gyp-build ];
 
   postInstall = ''
     # Patch shebangs in node_modules, otherwise the webpack build fails with interpreter problems

From 266f20d8869f0401217e53e5e50cb879dff9c470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 23 Jan 2021 18:03:24 +0100
Subject: [PATCH 717/956] llvmPackages_11: Fix cross compilation

---
 pkgs/development/compilers/llvm/11/llvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix
index 002d6f82a8e..868da1a5b20 100644
--- a/pkgs/development/compilers/llvm/11/llvm.nix
+++ b/pkgs/development/compilers/llvm/11/llvm.nix
@@ -122,7 +122,7 @@ in stdenv.mkDerivation (rec {
     "-DCAN_TARGET_i386=false"
   ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DCMAKE_CROSSCOMPILING=True"
-    "-DLLVM_TABLEGEN=${buildPackages.llvm_10}/bin/llvm-tblgen"
+    "-DLLVM_TABLEGEN=${buildPackages.llvm_11}/bin/llvm-tblgen"
   ];
 
   postBuild = ''

From 52c7a4f54c8cd584061834c441dd45b4eb546b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 23 Jan 2021 18:14:15 +0100
Subject: [PATCH 718/956] genxword: 2.0.1 -> 2.1.0

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

diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix
index 215542003ad..f443618c685 100644
--- a/pkgs/applications/misc/genxword/default.nix
+++ b/pkgs/applications/misc/genxword/default.nix
@@ -10,13 +10,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "genxword";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "riverrun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "00czdvyb5wnrk3x0g529afisl8v4frfys9ih0nzf1fs4jkzjcijg";
+    sha256 = "17h8saja45bv612yk0pra9ncbp2mjnx5n10q25nqhl765ks4bmb5";
   };
 
   nativeBuildInputs = [

From 2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 24 Jan 2021 00:15:07 +0700
Subject: [PATCH 719/956] pkgs/development: stdenv.lib -> lib

---
 .../androidndk-pkgs/androidndk-pkgs.nix       |  4 +-
 pkgs/development/androidndk-pkgs/default.nix  |  4 +-
 .../beam-modules/build-erlang-mk.nix          |  2 +-
 pkgs/development/beam-modules/build-hex.nix   |  4 +-
 pkgs/development/beam-modules/build-mix.nix   |  2 +-
 .../development/beam-modules/build-rebar3.nix |  2 +-
 pkgs/development/beam-modules/default.nix     | 22 +++++-----
 pkgs/development/beam-modules/fetch-hex.nix   |  4 +-
 .../beam-modules/fetch-rebar-deps.nix         |  6 +--
 pkgs/development/beam-modules/hex/default.nix |  6 +--
 pkgs/development/beam-modules/lib.nix         |  4 +-
 pkgs/development/beam-modules/pc/default.nix  |  2 +-
 .../beam-modules/pgsql/default.nix            |  6 +--
 .../beam-modules/rebar3-release.nix           |  2 +-
 .../beam-modules/webdriver/default.nix        |  6 +--
 .../haskell-modules/configuration-nix.nix     |  4 +-
 .../haskell-modules/generic-builder.nix       | 40 +++++++++----------
 pkgs/development/haskell-modules/hoogle.nix   |  4 +-
 .../haskell-modules/make-package-set.nix      |  8 ++--
 .../java-modules/build-maven-package.nix      |  6 +--
 .../java-modules/junit/default.nix            |  8 ++--
 .../java-modules/maven-hello/default.nix      |  8 ++--
 .../java-modules/maven-minimal.nix            |  4 +-
 pkgs/development/libraries/SDL/default.nix    |  2 +-
 pkgs/development/libraries/SDL2/default.nix   |  2 +-
 pkgs/development/libraries/aravis/default.nix |  2 +-
 pkgs/development/libraries/atk/default.nix    |  2 +-
 pkgs/development/libraries/cairo/default.nix  |  4 +-
 .../libraries/clutter-gst/default.nix         |  2 +-
 .../libraries/clutter-gtk/default.nix         |  2 +-
 pkgs/development/libraries/gts/default.nix    |  2 +-
 .../libraries/irrlicht/default.nix            |  2 +-
 .../libraries/java/hsqldb/default.nix         |  2 +-
 .../libraries/java/junixsocket/default.nix    |  2 +-
 .../development/libraries/libgpod/default.nix |  2 +-
 pkgs/development/libraries/libre/default.nix  |  2 +-
 pkgs/development/libraries/librem/default.nix |  4 +-
 .../libraries/libsmartcols/default.nix        |  2 +-
 pkgs/development/libraries/libsmi/default.nix |  2 +-
 .../libraries/libsnark/default.nix            |  2 +-
 .../development/libraries/libvirt/default.nix |  2 +-
 pkgs/development/libraries/libxmi/default.nix |  2 +-
 .../libraries/muparser/default.nix            |  2 +-
 pkgs/development/libraries/qt-3/default.nix   |  4 +-
 .../libraries/qt-4.x/4.8/default.nix          |  2 +-
 .../libraries/qt-5/5.12/default.nix           |  8 ++--
 .../libraries/qt-5/5.14/default.nix           |  4 +-
 .../libraries/qt-5/5.15/default.nix           |  4 +-
 .../libraries/qt-5/modules/qtconnectivity.nix |  4 +-
 .../libraries/qt-5/modules/qtlocation.nix     |  4 +-
 .../libraries/qt-5/modules/qtmacextras.nix    |  4 +-
 .../libraries/qt-5/modules/qtmultimedia.nix   |  4 +-
 .../libraries/qt-5/modules/qtwebengine.nix    |  2 +-
 .../libraries/qt-5/modules/qtwebkit.nix       |  4 +-
 .../libraries/qt-5/modules/qtwebview.nix      |  4 +-
 .../libraries/tokyo-tyrant/default.nix        |  2 +-
 .../libraries/wiredtiger/default.nix          |  2 +-
 .../libraries/wxwidgets/2.8/default.nix       |  4 +-
 .../libraries/wxwidgets/2.9/default.nix       |  4 +-
 .../libraries/wxwidgets/3.0/default.nix       |  2 +-
 .../libraries/wxwidgets/3.1/default.nix       |  2 +-
 pkgs/development/libraries/xalanc/default.nix |  2 +-
 .../development/libraries/xercesc/default.nix |  2 +-
 .../misc/avr8-burn-omat/default.nix           |  2 +-
 .../development/misc/google-clasp/default.nix |  6 +--
 .../misc/haskell/hasura/ci-info/default.nix   |  4 +-
 .../haskell/hasura/graphql-engine/default.nix |  6 +--
 .../haskell/hasura/graphql-parser/default.nix |  4 +-
 .../misc/haskell/hasura/pg-client/default.nix |  4 +-
 pkgs/development/misc/loc/default.nix         |  4 +-
 pkgs/development/misc/msp430/mspdebug.nix     | 18 ++++-----
 pkgs/development/misc/resholve/deps.nix       |  6 +--
 pkgs/development/misc/yelp-tools/default.nix  |  2 +-
 pkgs/development/pharo/vm/build-vm-legacy.nix | 10 ++---
 pkgs/development/pharo/vm/build-vm.nix        |  4 +-
 pkgs/development/pharo/vm/share.nix           |  4 +-
 pkgs/development/pharo/wrapper/default.nix    | 12 +++---
 .../pure-modules/audio/default.nix            |  8 ++--
 .../pure-modules/avahi/default.nix            |  8 ++--
 pkgs/development/pure-modules/csv/default.nix |  8 ++--
 pkgs/development/pure-modules/doc/default.nix |  8 ++--
 .../pure-modules/fastcgi/default.nix          |  8 ++--
 .../pure-modules/faust/default.nix            |  8 ++--
 pkgs/development/pure-modules/ffi/default.nix |  8 ++--
 pkgs/development/pure-modules/gen/default.nix |  8 ++--
 pkgs/development/pure-modules/gl/default.nix  |  8 ++--
 .../development/pure-modules/glpk/default.nix |  6 +--
 .../pure-modules/gplot/default.nix            |  8 ++--
 pkgs/development/pure-modules/gsl/default.nix |  8 ++--
 pkgs/development/pure-modules/gtk/default.nix |  8 ++--
 .../pure-modules/liblo/default.nix            |  8 ++--
 .../development/pure-modules/lilv/default.nix |  8 ++--
 pkgs/development/pure-modules/lv2/default.nix |  8 ++--
 .../development/pure-modules/midi/default.nix |  8 ++--
 .../development/pure-modules/mpfr/default.nix |  8 ++--
 .../pure-modules/octave/default.nix           |  8 ++--
 .../development/pure-modules/odbc/default.nix |  8 ++--
 .../pure-modules/pandoc/default.nix           |  8 ++--
 .../pure-modules/rational/default.nix         |  8 ++--
 .../pure-modules/readline/default.nix         |  8 ++--
 .../pure-modules/sockets/default.nix          |  8 ++--
 .../development/pure-modules/sql3/default.nix |  8 ++--
 .../pure-modules/stldict/default.nix          |  8 ++--
 .../pure-modules/stllib/default.nix           |  8 ++--
 pkgs/development/pure-modules/tk/default.nix  |  8 ++--
 pkgs/development/pure-modules/xml/default.nix |  8 ++--
 pkgs/development/web/deno/default.nix         |  2 +-
 pkgs/development/web/grails/default.nix       |  6 +--
 pkgs/development/web/insomnia/default.nix     |  2 +-
 pkgs/development/web/kcgi/default.nix         |  4 +-
 pkgs/development/web/kore/default.nix         |  4 +-
 pkgs/development/web/nodejs/nodejs.nix        |  4 +-
 pkgs/development/web/nodejs/v10.nix           |  4 +-
 pkgs/development/web/nodejs/v12.nix           |  4 +-
 pkgs/development/web/nodejs/v14.nix           |  4 +-
 pkgs/development/web/postman/default.nix      |  2 +-
 pkgs/development/web/remarkjs/default.nix     |  4 +-
 .../web/twitter-bootstrap/default.nix         |  4 +-
 pkgs/development/web/woff2/default.nix        |  4 +-
 pkgs/development/web/xmlindent/default.nix    |  6 +--
 pkgs/top-level/all-packages.nix               |  6 +--
 121 files changed, 324 insertions(+), 322 deletions(-)

diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 995789b8c1b..04dfbcbedf0 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , makeWrapper
 , runCommand, wrapBintoolsWith, wrapCCWith
 , buildAndroidndk, androidndk, targetAndroidndkPkgs
@@ -48,7 +48,7 @@ let
   hostInfo = ndkInfoFun stdenv.hostPlatform;
   targetInfo = ndkInfoFun stdenv.targetPlatform;
 
-  prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
+  prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
 in
 
 rec {
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix
index 10819d49ed3..5f71304d385 100644
--- a/pkgs/development/androidndk-pkgs/default.nix
+++ b/pkgs/development/androidndk-pkgs/default.nix
@@ -1,4 +1,4 @@
-{ androidenv, buildPackages, pkgs, targetPackages
+{ lib, androidenv, buildPackages, pkgs, targetPackages
 }:
 
 {
@@ -17,6 +17,7 @@
       };
     in
     import ./androidndk-pkgs.nix {
+      inherit lib;
       inherit (buildPackages)
         makeWrapper;
       inherit (pkgs)
@@ -46,6 +47,7 @@
       };
     in
     import ./androidndk-pkgs.nix {
+      inherit lib;
       inherit (buildPackages)
         makeWrapper;
       inherit (pkgs)
diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix
index c2d1ebabae2..a94524276b2 100644
--- a/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -15,7 +15,7 @@
 , buildFlags ? []
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
   debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";
diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix
index 27ce64582f3..e0d9dfc4288 100644
--- a/pkgs/development/beam-modules/build-hex.nix
+++ b/pkgs/development/beam-modules/build-hex.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildRebar3, fetchHex }:
+{ lib, stdenv, buildRebar3, fetchHex }:
 
 { name, version, sha256
 , builder ? buildRebar3
 , hexPkg ? name
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
   pkg = self: builder (attrs // {
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
index 9aebad2dabf..45f5e367442 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -15,7 +15,7 @@
 , enableDebugInfo ? false
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
 
diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
index 224d111026a..63832dc91ac 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -14,7 +14,7 @@
 , enableDebugInfo ? false
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
   debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index a5de4dfb3bb..4c25522635e 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, pkgs, erlang }:
+{ lib, stdenv, pkgs, erlang }:
 
 let
-  inherit (stdenv.lib) makeExtensible;
+  inherit (lib) makeExtensible;
 
-  lib = pkgs.callPackage ./lib.nix {};
+  lib' = pkgs.callPackage ./lib.nix {};
 
   # FIXME: add support for overrideScope
-  callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args;
+  callPackageWithScope = scope: drv: args: lib'.callPackageWith scope drv args;
   mkScope = scope: pkgs // scope;
 
   packages = self:
@@ -38,27 +38,27 @@ let
         # BEAM-based languages.
         elixir = elixir_1_11;
 
-        elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix {
+        elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix {
           inherit erlang;
           debugInfo = true;
         };
 
-        elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
+        elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix {
           inherit erlang;
           debugInfo = true;
         };
 
-        elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
+        elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix {
           inherit erlang;
           debugInfo = true;
         };
 
-        elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
+        elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix {
           inherit erlang;
           debugInfo = true;
         };
 
-        elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
+        elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix {
           inherit erlang;
           debugInfo = true;
         };
@@ -67,8 +67,8 @@ let
         # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
 
         lfe = lfe_1_3;
-        lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
-        lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; };
+        lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
+        lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; };
 
         # Non hex packages. Examples how to build Rebar/Mix packages with and
         # without helper functions buildRebar3 and buildMix.
diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix
index c55a7a80ff3..7f84e236070 100644
--- a/pkgs/development/beam-modules/fetch-hex.nix
+++ b/pkgs/development/beam-modules/fetch-hex.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 { pkg, version, sha256
 , meta ? {}
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation ({
   name = "hex-source-${pkg}-${version}";
diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix
index 389e07beca6..d858b3d81af 100644
--- a/pkgs/development/beam-modules/fetch-rebar-deps.nix
+++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix
@@ -1,10 +1,10 @@
-{ stdenv, rebar3 }:
+{ lib, stdenv, rebar3 }:
 
 { name, version, sha256, src
 , meta ? {}
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation ({
   name = "rebar-deps-${name}-${version}";
@@ -28,6 +28,6 @@ stdenv.mkDerivation ({
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
+  impureEnvVars = lib.fetchers.proxyImpureEnvVars;
   inherit meta;
 })
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 26070ce73bf..e12f0ba4b74 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -45,13 +45,13 @@ let
 
     meta = {
       description = "Package manager for the Erlang VM https://hex.pm";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
       homepage = "https://github.com/hexpm/hex";
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+      maintainers = with lib.maintainers; [ ericbmerritt ];
     };
 
     passthru = {
       env = shell self;
     };
 };
-in stdenv.lib.fix pkg
+in lib.fix pkg
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index db40c47794f..7ae2e0e2606 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs, lib, stdenv }:
 
 rec {
 
@@ -7,7 +7,7 @@ rec {
   callPackageWith = autoArgs: fn: args:
     let
       f = if pkgs.lib.isFunction fn then fn else import fn;
-      auto = builtins.intersectAttrs (stdenv.lib.functionArgs f) autoArgs;
+      auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
     in f (auto // args);
 
   callPackage = callPackageWith pkgs;
diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix
index fac3b298835..8b5836f4c62 100644
--- a/pkgs/development/beam-modules/pc/default.nix
+++ b/pkgs/development/beam-modules/pc/default.nix
@@ -7,7 +7,7 @@ buildHex {
 
   meta = {
     description = "a rebar3 port compiler for native code";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/blt/port_compiler";
   };
 }
diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix
index c7e7aee1001..e64476212dd 100644
--- a/pkgs/development/beam-modules/pgsql/default.nix
+++ b/pkgs/development/beam-modules/pgsql/default.nix
@@ -21,9 +21,9 @@ let
 
     meta = {
       description = "Erlang PostgreSQL Driver";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
       homepage = "https://github.com/semiocast/pgsql";
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+      maintainers = with lib.maintainers; [ ericbmerritt ];
     };
 
     passthru = {
@@ -31,4 +31,4 @@ let
     };
 
 };
-in stdenv.lib.fix pkg
+in lib.fix pkg
diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix
index 1ec9f244d6c..bbc130725c0 100644
--- a/pkgs/development/beam-modules/rebar3-release.nix
+++ b/pkgs/development/beam-modules/rebar3-release.nix
@@ -15,7 +15,7 @@
 , enableDebugInfo ? false
 , ... }@attrs:
 
-with stdenv.lib;
+with lib;
 
 let
   shell = drv: stdenv.mkDerivation {
diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
index 8f06f8ed7a8..da6cb127342 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/pkgs/development/beam-modules/webdriver/default.nix
@@ -27,9 +27,9 @@ let
 
     meta = {
       description = "WebDriver implementation in Erlang";
-      license = stdenv.lib.licenses.mit;
+      license = lib.licenses.mit;
       homepage = "https://github.com/Quviq/webdrv";
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+      maintainers = with lib.maintainers; [ ericbmerritt ];
     };
 
     passthru = {
@@ -37,4 +37,4 @@ let
     };
 
 };
-in stdenv.lib.fix pkg
+in lib.fix pkg
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a4674e356cc..06578f56535 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -610,12 +610,12 @@ self: super: builtins.intersectAttrs super {
 
   git-annex = with pkgs;
     if (!stdenv.isLinux) then
-      let path = stdenv.lib.makeBinPath [ coreutils ];
+      let path = lib.makeBinPath [ coreutils ];
       in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: {
         # This is an instance of https://github.com/NixOS/nix/pull/1085
         # Fails with:
         #   gpg: can't connect to the agent: File name too long
-        postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+        postPatch = lib.optionalString stdenv.isDarwin ''
           substituteInPlace Test.hs \
             --replace ', testCase "crypto" test_crypto' ""
         '';
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index bf4f7bd3bbf..582cf6df010 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, buildHaskellPackages, ghc
+{ lib, stdenv, buildPackages, buildHaskellPackages, ghc
 , jailbreak-cabal, hscolour, cpphs, nodejs
 , ghcWithHoogle, ghcWithPackages
 }:
@@ -22,10 +22,10 @@ in
 , buildFlags ? []
 , haddockFlags ? []
 , description ? null
-, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
+, doCheck ? !isCross && lib.versionOlder "7.4" ghc.version
 , doBenchmark ? false
 , doHoogle ? true
-, doHaddockQuickjump ? doHoogle && stdenv.lib.versionAtLeast ghc.version "8.6"
+, doHaddockQuickjump ? doHoogle && lib.versionAtLeast ghc.version "8.6"
 , editedCabalFile ? null
 # aarch64 outputs otherwise exceed 2GB limit
 , enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.targetPlatform.isAarch64 or false)
@@ -36,14 +36,14 @@ in
 , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
 , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm)
-, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
+, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 # On macOS, statically linking against system frameworks is not supported;
 # see https://developer.apple.com/library/content/qa/qa1118/_index.html
 # They must be propagated to the environment of any executable linking with the library
 , libraryFrameworkDepends ? [], executableFrameworkDepends ? []
 , homepage ? "https://hackage.haskell.org/package/${pname}"
-, platforms ? with stdenv.lib.platforms; all # GHC can cross-compile
+, platforms ? with lib.platforms; all # GHC can cross-compile
 , hydraPlatforms ? null
 , hyperlinkSource ? true
 , isExecutable ? false, isLibrary ? !isExecutable
@@ -71,7 +71,7 @@ in
 , shellHook ? ""
 , coreSetup ? false # Use only core packages to build Setup.hs.
 , useCpphs ? false
-, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all"
+, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
 , enableSeparateBinOutput ? false
 , enableSeparateDataOutput ? false
 , enableSeparateDocOutput ? doHaddock
@@ -95,7 +95,7 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false;
 
 let
 
-  inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast
+  inherit (lib) optional optionals optionalString versionOlder versionAtLeast
                        concatStringsSep enableFeature optionalAttrs;
 
   isGhcjs = ghc.isGhcjs or false;
@@ -182,7 +182,7 @@ let
   parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS";
 
   crossCabalFlagsString =
-    stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
+    lib.optionalString isCross (" " + lib.concatStringsSep " " crossCabalFlags);
 
   buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
 
@@ -213,7 +213,7 @@ let
     (enableFeature doBenchmark "benchmarks")
     "--enable-library-vanilla"  # TODO: Should this be configurable?
     (enableFeature enableLibraryForGhci "library-for-ghci")
-  ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
+  ] ++ optionals (enableDeadCodeElimination && (lib.versionOlder "8.0.1" ghc.version)) [
      "--ghc-option=-split-sections"
   ] ++ optionals dontStrip [
     "--disable-library-stripping"
@@ -283,7 +283,7 @@ let
       continue
     fi
   '';
-in stdenv.lib.fix (drv:
+in lib.fix (drv:
 
 assert allPkgconfigDepends != [] -> pkg-config != null;
 
@@ -423,7 +423,7 @@ stdenv.mkDerivation ({
 
     echo configureFlags: $configureFlags
     ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
-    ${stdenv.lib.optionalString (!allowInconsistentDependencies) ''
+    ${lib.optionalString (!allowInconsistentDependencies) ''
       if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
         echo >&2 "*** abort because of serious configure-time warning from Cabal"
         exit 1
@@ -455,7 +455,7 @@ stdenv.mkDerivation ({
         ${optionalString doHoogle "--hoogle"} \
         ${optionalString doHaddockQuickjump "--quickjump"} \
         ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \
-        ${stdenv.lib.concatStringsSep " " haddockFlags}
+        ${lib.concatStringsSep " " haddockFlags}
     ''}
     runHook postHaddock
   '';
@@ -492,7 +492,7 @@ stdenv.mkDerivation ({
       done
     ''}
     ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
-    ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
+    ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") ''
       for exe in "${binDir}/"* ; do
         install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
       done
@@ -535,7 +535,7 @@ stdenv.mkDerivation ({
         pkg-configDepends
         setupHaskellDepends
         ;
-    } // stdenv.lib.optionalAttrs doCheck {
+    } // lib.optionalAttrs doCheck {
       inherit
         testDepends
         testFrameworkDepends
@@ -544,7 +544,7 @@ stdenv.mkDerivation ({
         testSystemDepends
         testToolDepends
         ;
-    } // stdenv.lib.optionalAttrs doBenchmark {
+    } // lib.optionalAttrs doBenchmark {
       inherit
         benchmarkDepends
         benchmarkFrameworkDepends
@@ -561,7 +561,7 @@ stdenv.mkDerivation ({
       inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends;
       haskellBuildInputs = isHaskellPartition.right;
       systemBuildInputs = isHaskellPartition.wrong;
-      isHaskellPartition = stdenv.lib.partition
+      isHaskellPartition = lib.partition
         isHaskellPkg
         (propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs);
     };
@@ -608,13 +608,13 @@ stdenv.mkDerivation ({
         ghcEnv = withPackages (_:
           otherBuildInputsHaskell ++
           propagatedBuildInputs ++
-          stdenv.lib.optionals (!isCross) setupHaskellDepends);
+          lib.optionals (!isCross) setupHaskellDepends);
 
-        ghcCommandCaps = stdenv.lib.toUpper ghcCommand';
+        ghcCommandCaps = lib.toUpper ghcCommand';
       in stdenv.mkDerivation ({
         inherit name shellHook;
 
-        depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild;
+        depsBuildBuild = lib.optional isCross ghcEnvForBuild;
         nativeBuildInputs =
           [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++
           collectedToolDepends;
@@ -623,7 +623,7 @@ stdenv.mkDerivation ({
         phases = ["installPhase"];
         installPhase = "echo $nativeBuildInputs $buildInputs > $out";
         LANG = "en_US.UTF-8";
-        LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+        LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
         "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
         "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
         # TODO: is this still valid?
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 0f620d46ccc..f47ac076f13 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -120,7 +120,7 @@ buildPackages.stdenv.mkDerivation {
   meta = {
     description = "A local Hoogle database";
     platforms = ghc.meta.platforms;
-    hydraPlatforms = with stdenv.lib.platforms; none;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    hydraPlatforms = with lib.platforms; none;
+    maintainers = with lib.maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 91937b88eaf..28b48bfcbc4 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -41,7 +41,7 @@ self:
 let
   inherit (stdenv) buildPlatform hostPlatform;
 
-  inherit (stdenv.lib) fix' extends makeOverridable;
+  inherit (lib) fix' extends makeOverridable;
   inherit (haskellLib) overrideCabal;
 
   mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
@@ -84,8 +84,8 @@ let
       # lost on `.override`) but determine the auto-args based on `drv` (the problem here
       # is that nix has no way to "passthrough" args while preserving the reflection
       # info that callPackage uses to determine the arguments).
-      drv = if stdenv.lib.isFunction fn then fn else import fn;
-      auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope;
+      drv = if lib.isFunction fn then fn else import fn;
+      auto = builtins.intersectAttrs (lib.functionArgs drv) scope;
 
       # this wraps the `drv` function to add a `overrideScope` function to the result.
       drvScope = allArgs: drv allArgs // {
@@ -98,7 +98,7 @@ let
           # nothing.
           in callPackageWithScope newScope drv manualArgs;
       };
-    in stdenv.lib.makeOverridable drvScope (auto // manualArgs);
+    in lib.makeOverridable drvScope (auto // manualArgs);
 
   mkScope = scope: let
       ps = pkgs.__splicedPackages;
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index a7196c6e031..cb895d9c672 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -1,11 +1,11 @@
-{ stdenv, maven, pkgs }:
+{ lib, stdenv, maven, pkgs }:
 { mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
 
 with builtins;
-with stdenv.lib;
+with lib;
 
 let
-  mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; };
+  mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; };
 in stdenv.mkDerivation rec {
   inherit mavenDeps src name meta m2Path;
 
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index dbbce6b6262..c4b02071ec0 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, mavenbuild, fetchMaven }:
+{ lib, stdenv, pkgs, mavenbuild, fetchMaven }:
 
 with pkgs.javaPackages;
 
@@ -21,9 +21,9 @@ in rec {
     meta = {
       homepage = "https://junit.org/junit4/";
       description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
-      license = stdenv.lib.licenses.epl10;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers;
+      license = lib.licenses.epl10;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers;
         [ nequissimus ];
     };
   };
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index b4639d9ee1d..e0087e857a4 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, mavenbuild }:
+{ lib, stdenv, pkgs, mavenbuild }:
 
 with pkgs.javaPackages;
 
@@ -20,9 +20,9 @@ in rec {
     meta = {
       homepage = "https://github.com/NeQuissimus/maven-hello/";
       description = "Maven Hello World";
-      license = stdenv.lib.licenses.unlicense;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers;
+      license = lib.licenses.unlicense;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers;
         [ nequissimus ];
     };
   };
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index 52edcd2104f..9019e3ba28e 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -1,6 +1,6 @@
-{ stdenv, pkgs }:
+{ lib, stdenv, pkgs }:
 
-with stdenv.lib;
+with lib;
 with pkgs.javaPackages;
 
 let
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 252d38d1192..b51bc3f7cdd 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , openglSupport ? libGLSupported, libGL, libGLU
 , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
 , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index ddde76cac64..5212421a7b8 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, config, fetchurl, pkg-config
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , openglSupport ? libGLSupported, libGL
 , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
 , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
index 62a5c54e676..e2371292e12 100644
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -20,7 +20,7 @@
 let
   gstreamerAtLeastVersion1 =
     lib.all
-      (pkg: pkg != null && lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0")
+      (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0")
       [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
 in
   assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 4cb2d6b2aec..53eb4459770 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl2Plus;
 
     maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 
 }
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 26e37738d55..839b7e9f40b 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -3,7 +3,7 @@
 , x11Support? !stdenv.isDarwin, libXext, libXrender
 , gobjectSupport ? true, glib
 , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux)
 , libGL ? null # libGLU libGL is no longer a big dependency
 , pdfSupport ? true
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchurl {
-    url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
+    url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
     sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
   };
 
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 264c382338c..166d4e12c25 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl2Plus;
 
     maintainers = with lib.maintainers; [ lethalman ];
-    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 902a2af62bd..0dfb8c7b9df 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.clutter-project.org/";
     license = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [ lethalman ];
-    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix
index 3204811ec6b..815dfb634c9 100644
--- a/pkgs/development/libraries/gts/default.nix
+++ b/pkgs/development/libraries/gts/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     '';
 
     maintainers = [ lib.maintainers.viric ];
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 5214fa9e149..e283a290947 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = "http://irrlicht.sourceforge.net/";
     license = lib.licenses.zlib;
     description = "Open source high performance realtime 3D engine written in C++";
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix
index 433cf75ad5a..32b00062239 100644
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   pname = "hsqldb";
   version = "2.5.1";
-  underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version);
+  underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);
 
   src = fetchurl {
     url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix
index b9b00223186..7a7d6a933bc 100644
--- a/pkgs/development/libraries/java/junixsocket/default.nix
+++ b/pkgs/development/libraries/java/junixsocket/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     description = "A Java/JNI library for using Unix Domain Sockets from Java";
     homepage = "https://github.com/kohlschutter/junixsocket";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index c7c9de67592..49dcec3ee78 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gtkpod.sourceforge.net/";
     description = "Library used by gtkpod to access the contents of an ipod";
     license = "LGPL";
-    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index d2f6e31596f..e960fe8f4b2 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib openssl ];
   makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
   ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
-  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
   ;
   meta = {
     description = "A library for real-time communications with async IO support and a complete SIP stack";
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 4e8d6fca616..6dd44a0f202 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     "LIBRE_INC=${libre}/include/re"
     ''PREFIX=$(out)''
   ]
-  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}"
-  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
+  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
+  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
   ;
   meta = {
     description = " A library for real-time audio and video processing";
diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix
index a3a19522f69..3ef1f314899 100644
--- a/pkgs/development/libraries/libsmartcols/default.nix
+++ b/pkgs/development/libraries/libsmartcols/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "smart column output alignment library";
     homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols;
     license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [ rb2k ];
   };
 }
diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix
index ab9d7d85c86..9b71a91efed 100644
--- a/pkgs/development/libraries/libsmi/default.nix
+++ b/pkgs/development/libraries/libsmi/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
     description = "A Library to Access SMI MIB Information";
     homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html";
     license = licenses.free;
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix
index fc3e15f688d..3864a99f5e9 100644
--- a/pkgs/development/libraries/libsnark/default.nix
+++ b/pkgs/development/libraries/libsnark/default.nix
@@ -24,6 +24,6 @@ in stdenv.mkDerivation rec {
     description = "C++ library for zkSNARKs";
     homepage = "https://github.com/scipr-lab/libsnark";
     license = licenses.mit;
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index b162ab50810..f3f48cec770 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
       --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
     patchShebangs . # fixes /usr/bin/python references
   ''
-  + (lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides));
+  + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
 
   mesonAutoFeatures = "auto";
 
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
index cc1ae013a0e..037e7036f49 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     description = "Library for rasterizing 2-D vector graphics";
     homepage = "https://www.gnu.org/software/libxmi/";
     license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index b1951bdb226..85c9f781cc6 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage = "http://muparser.sourceforge.net";
     description = "An extensible high performance math expression parser library written in C++";
     license = lib.licenses.mit;
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 0bc7d938be6..b2d818a2972 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -6,8 +6,8 @@
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
 , mysqlSupport ? false, libmysqlclient ? null
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, openglSupport ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , libGL ? null, libGLU ? null, libXmu ? null
 , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
 }:
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 9ddb2cc5bac..7dddd2bc67d 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -4,7 +4,7 @@
 , libmng, which, libGLU, openssl, dbus, cups, pkg-config
 , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
 , alsaLib
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , flashplayerFix ? false, gdk-pixbuf
 , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 87a88ddf9b0..cf5a0de11ad 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
+  lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
   llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
   debug ? false,
 }:
 
-with stdenv.lib;
+with lib;
 
 let
 
@@ -119,7 +119,7 @@ let
     import ../qtModule.nix
     {
       inherit perl;
-      inherit (stdenv) lib;
+      inherit lib;
       # Use a variant of mkDerivation that does not include wrapQtApplications
       # to avoid cyclic dependencies between Qt modules.
       mkDerivation =
@@ -136,7 +136,7 @@ let
 
       mkDerivationWith =
         import ../mkDerivation.nix
-        { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
+        { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
 
       mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
 
diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix
index 926510293b5..7139a3b7354 100644
--- a/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
+  lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
   llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
   debug ? false,
 }:
 
-with stdenv.lib;
+with lib;
 
 let
 
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 08fd3a9720c..a3a0496f160 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
+  lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
   llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
   debug ? false,
 }:
 
-with stdenv.lib;
+with lib;
 
 let
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
index 36a736d03dc..f6aeb23fb7b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
@@ -1,8 +1,8 @@
-{ qtModule, stdenv, qtbase, qtdeclarative, bluez }:
+{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
 
 qtModule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
-  buildInputs = stdenv.lib.optional stdenv.isLinux bluez;
+  buildInputs = lib.optional stdenv.isLinux bluez;
   outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
index a80785d8099..182b5f5bc33 100644
--- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
@@ -1,10 +1,10 @@
-{ stdenv, qtModule, qtbase, qtmultimedia }:
+{ lib, stdenv, qtModule, qtbase, qtmultimedia }:
 
 qtModule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
   outputs = [ "bin" "out" "dev" ];
-  qmakeFlags = stdenv.lib.optional stdenv.isDarwin [
+  qmakeFlags = lib.optional stdenv.isDarwin [
      # boost uses std::auto_ptr which has been disabled in clang with libcxx
      # This flag re-enables this feature
      # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros
diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
index 11964caf17b..6639e4c8d69 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
@@ -1,9 +1,9 @@
-{ stdenv, qtModule, qtbase }:
+{ lib, stdenv, qtModule, qtbase }:
 
 qtModule {
   name = "qtmacextras";
   qtInputs = [ qtbase ];
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ periklis ];
     platforms = platforms.darwin;
   };
diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
index b9e757833b3..eb2c3bc7431 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
@@ -1,8 +1,8 @@
-{ qtModule, stdenv, qtbase, qtdeclarative, pkg-config
+{ qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config
 , alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland
 }:
 
-with stdenv.lib;
+with lib;
 
 qtModule {
   name = "qtmultimedia";
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index e6ab23073b1..1ad254ffcd0 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -18,7 +18,7 @@
 , lib, stdenv, fetchpatch
 }:
 
-with stdenv.lib;
+with lib;
 
 qtModule {
   name = "qtwebengine";
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index d8d53690b24..ed41a4ac9bc 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -43,7 +43,7 @@ qtModule {
 
   # QtWebKit overrides qmake's default_pre and default_post features,
   # so its custom qmake files must be found first at the front of QMAKEPATH.
-  preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) ''
+  preConfigure = lib.optionalString (!usingAnnulenWebkitFork) ''
     QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
     fixQtBuiltinPaths . '*.pr?'
     # Fix hydra's "Log limit exceeded"
@@ -72,6 +72,6 @@ qtModule {
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
 
   meta = {
-    maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
+    maintainers = with lib.maintainers; [ abbradar periklis ];
   };
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix
index 906d750c5d3..4034dce49f5 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix
@@ -1,6 +1,6 @@
-{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }:
+{ darwin, lib, stdenv, qtModule, qtdeclarative, qtwebengine }:
 
-with stdenv.lib;
+with lib;
 
 qtModule {
   name = "qtwebview";
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix
index e5aeae6aae0..6431e6a1a7a 100644
--- a/pkgs/development/libraries/tokyo-tyrant/default.nix
+++ b/pkgs/development/libraries/tokyo-tyrant/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     license = lib.licenses.lgpl21Plus;
 
-    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;         # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;         # arbitrary choice
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 7b636e984de..469da2523d9 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -14,7 +14,7 @@ let
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
 
-  shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
 
   optLz4 = shouldUsePkg lz4;
   optSnappy = shouldUsePkg snappy;
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index 93529ef430f..8029477708d 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
 , libX11, cairo
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true,
 }:
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 358b45fbf0c..77e0e20eaf5 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
 , setfile
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index c97a9778d5d..a1c2820a5fd 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -2,7 +2,7 @@
 , libXinerama, libSM, libXxf86vm
 , gtk2, gtk3
 , xorgproto, gst_all_1, setfile
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , withMesa ? libGLSupported
 , libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index cbacf4ec762..cab0197c939 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -12,7 +12,7 @@
 , xorgproto
 , gst_all_1
 , setfile
-, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , withMesa ? libGLSupported
 , libGLU ? null
 , libGL ? null
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index 242788723fb..b757b737f97 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
     homepage = "http://xalan.apache.org/";
     description = "A XSLT processor for transforming XML documents";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = [ lib.maintainers.jagajaga ];
   };
 }
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index dec42c0243e..f5109a1ebd6 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = "https://xerces.apache.org/xerces-c/";
     description = "Validating XML parser written in a portable subset of C++";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix
index 1f504ac280e..0a9d666f8b7 100644
--- a/pkgs/development/misc/avr8-burn-omat/default.nix
+++ b/pkgs/development/misc/avr8-burn-omat/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "GUI tool for avrdude";
     homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html";
-    license = stdenv.lib.licenses.gpl3;
+    license = lib.licenses.gpl3;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix
index 1e138aaa8f7..12598e9fd86 100644
--- a/pkgs/development/misc/google-clasp/default.nix
+++ b/pkgs/development/misc/google-clasp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs }:
+{ lib, stdenv, pkgs }:
 let
   version = "2.2.1";
 in
@@ -12,8 +12,8 @@ in
   meta = {
     description = "Command Line tool for Google Apps Script Projects";
     homepage = "https://developers.google.com/apps-script/guides/clasp";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.michojel ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.michojel ];
     priority = 100;
   };
 }
diff --git a/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/pkgs/development/misc/haskell/hasura/ci-info/default.nix
index 53c85a2e5ba..55b070a9f77 100644
--- a/pkgs/development/misc/haskell/hasura/ci-info/default.nix
+++ b/pkgs/development/misc/haskell/hasura/ci-info/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
-, hpack, stdenv, template-haskell, text, th-lift-instances
+, hpack, lib, stdenv, template-haskell, text, th-lift-instances
 , unordered-containers
 }:
 mkDerivation {
@@ -18,5 +18,5 @@ mkDerivation {
   libraryToolDepends = [ hpack ];
   prePatch = "hpack";
   homepage = "https://github.com/hasura/ci-info-hs#readme";
-  license = stdenv.lib.licenses.mit;
+  license = lib.licenses.mit;
 }
diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
index 055459514e4..3cf840c15e1 100644
--- a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
@@ -13,7 +13,7 @@
 , optparse-applicative, pem, pg-client, postgresql-binary
 , postgresql-libpq, process, profunctors, psqueues, QuickCheck
 , regex-tdfa, safe, scientific, semver, shakespeare, split
-, Spock-core, stdenv, stm, stm-containers, template-haskell, text
+, Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text
 , text-builder, text-conversions, th-lift-instances, these, time
 , transformers, transformers-base, unix, unordered-containers
 , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
@@ -68,8 +68,8 @@ mkDerivation {
   doCheck = false;
   homepage = "https://www.hasura.io";
   description = "GraphQL API over Postgres";
-  license = stdenv.lib.licenses.asl20;
-  maintainers = with stdenv.lib.maintainers; [ offline ];
+  license = lib.licenses.asl20;
+  maintainers = with lib.maintainers; [ offline ];
   hydraPlatforms = [];
   broken = true;
 }
diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
index 991b5384d5c..82314a7485b 100644
--- a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, attoparsec, base, bytestring, containers
 , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
-, protolude, regex-tdfa, scientific, stdenv, template-haskell, text
+, protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text
 , text-builder, th-lift-instances, unordered-containers, vector
 }:
 mkDerivation {
@@ -32,5 +32,5 @@ mkDerivation {
   doCheck = false;
   prePatch = "hpack";
   homepage = "https://github.com/hasura/graphql-parser-hs#readme";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix
index 725e5e7f640..aa780abd8e9 100644
--- a/pkgs/development/misc/haskell/hasura/pg-client/default.nix
+++ b/pkgs/development/misc/haskell/hasura/pg-client/default.nix
@@ -2,7 +2,7 @@
 , criterion, fetchgit, file-embed, hashable, hashtables, hasql
 , hasql-pool, hasql-transaction, monad-control, mtl
 , postgresql-binary, postgresql-libpq, resource-pool, retry
-, scientific, stdenv, template-haskell, text, text-builder, th-lift
+, scientific, lib, stdenv, template-haskell, text, text-builder, th-lift
 , th-lift-instances, time, transformers-base, uuid, vector
 }:
 mkDerivation {
@@ -26,5 +26,5 @@ mkDerivation {
     hasql-transaction mtl postgresql-libpq text text-builder
   ];
   homepage = "https://github.com/hasura/platform";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index 33de722baa2..74b5ca09d2a 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -18,8 +18,8 @@ buildRustPackage rec {
   meta = with lib; {
     homepage = "https://github.com/cgag/loc";
     description = "Count lines of code quickly";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
index f8616ff0bc4..122b3cec4b7 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/pkgs/development/misc/msp430/mspdebug.nix
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config
-  ++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
+  nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config
+  ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
   buildInputs = [ libusb-compat-0_1 ]
-  ++ stdenv.lib.optional stdenv.isDarwin hidapi
-  ++ stdenv.lib.optional enableReadline readline;
+  ++ lib.optional stdenv.isDarwin hidapi
+  ++ lib.optional enableReadline readline;
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     # TODO: remove once a new 0.26+ release is made
     substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary}
 
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
   '';
 
   # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+
-  runtimeDependencies = stdenv.lib.optional enableMspds mspds;
-  postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) ''
+  runtimeDependencies = lib.optional enableMspds mspds;
+  postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) ''
     # autoPatchelfHook only works on linux so...
     for dep in $runtimeDependencies; do
       install_name_tool -add_rpath $dep/lib $out/bin/$pname
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "PREFIX=$(out)" "INSTALL=install" ];
   makeFlags = [ "UNAME_S=$(unameS)" ] ++
-    stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1";
-  unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin";
+    lib.optional (!enableReadline) "WITHOUT_READLINE=1";
+  unameS = lib.optionalString stdenv.isDarwin "Darwin";
 
   meta = with lib; {
     description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs";
diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix
index 9be283e4933..86bcba57075 100644
--- a/pkgs/development/misc/resholve/deps.nix
+++ b/pkgs/development/misc/resholve/deps.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , python27Packages
 , fetchFromGitHub
 , makeWrapper
@@ -106,12 +106,12 @@ rec {
     _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}";
 
     # See earlier note on glibcLocales
-    LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
+    LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
 
     meta = {
       description = "A new unix shell";
       homepage = "https://www.oilshell.org/";
-      license = with stdenv.lib.licenses; [
+      license = with lib.licenses; [
         psfl # Includes a portion of the python interpreter and standard library
         asl20 # Licence for Oil itself
       ];
diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix
index fae1c1731ae..9d5eb2af496 100644
--- a/pkgs/development/misc/yelp-tools/default.nix
+++ b/pkgs/development/misc/yelp-tools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30";
   };
 
diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix
index d85dab861e7..bd5d1e91602 100644
--- a/pkgs/development/pharo/vm/build-vm-legacy.nix
+++ b/pkgs/development/pharo/vm/build-vm-legacy.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   inherit name src;
 
-  pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
+  pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; };
 
   hardeningDisable = [ "format" "pic" ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash glibc openssl libGLU libGL freetype
                   xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
 
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath
+  LD_LIBRARY_PATH = lib.makeLibraryPath
     [ cairo libGLU libGL freetype openssl libuuid alsaLib
       xorg.libICE xorg.libSM ];
 
@@ -89,9 +89,9 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = [ maintainers.lukego ];
     # Pharo VM sources are packaged separately for darwin (OS X)
-    platforms = stdenv.lib.filter
-      (system: with stdenv.lib.systems.elaborate { inherit system; };
+    platforms = lib.filter
+      (system: with lib.systems.elaborate { inherit system; };
          isUnix && !isDarwin)
-      stdenv.lib.platforms.mesaPlatforms;
+      lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 28525ac475e..5427e36746c 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported.";
 
   # Shared data (for the sources file)
-  pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
+  pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; };
 
   # Note: -fPIC causes the VM to segfault.
   hardeningDisable = [ "format" "pic"
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
 
     # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc.
-    libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs}
+    libs=$out:$(patchelf --print-rpath "$out/pharo"):${lib.makeLibraryPath libs}
 
     # Create the script
     cat > "$out/bin/${cmd}" <<EOF
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index 2c8c376b7c1..720f2e39a7d 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   version = "1.0";
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Shared files for Pharo";
     homepage = "https://pharo.org";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix
index b9b147bf418..1f089295072 100644
--- a/pkgs/development/pharo/wrapper/default.nix
+++ b/pkgs/development/pharo/wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
+{ lib, stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
 
 stdenv.mkDerivation rec {
   name = "pharo";
@@ -50,13 +50,13 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = "http://pharo.org";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.lukego ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.lukego ];
     # Pharo VM sources are packaged separately for darwin (OS X)
-    platforms = stdenv.lib.filter
-      (system: with stdenv.lib.systems.elaborate { inherit system; };
+    platforms = lib.filter
+      (system: with lib.systems.elaborate { inherit system; };
          isUnix && !isDarwin)
-      stdenv.lib.platforms.mesaPlatforms;
+      lib.platforms.mesaPlatforms;
   };
 }
 
diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix
index 7f5d6412fbb..34d405d6a39 100644
--- a/pkgs/development/pure-modules/audio/default.nix
+++ b/pkgs/development/pure-modules/audio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
+{ lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
 
 stdenv.mkDerivation rec {
   baseName = "audio";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A digital audio interface for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-audio.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix
index 2bcc7407266..7b8cc1b00ac 100644
--- a/pkgs/development/pure-modules/avahi/default.nix
+++ b/pkgs/development/pure-modules/avahi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, avahi }:
+{ lib, stdenv, fetchurl, pkg-config, pure, avahi }:
 
 stdenv.mkDerivation rec {
   baseName = "avahi";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A digital audio interface for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-avahi.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix
index 2518424649b..f51739f0339 100644
--- a/pkgs/development/pure-modules/csv/default.nix
+++ b/pkgs/development/pure-modules/csv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "csv";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Comma Separated Value Interface for the Pure Programming Language";
     homepage = "http://puredocs.bitbucket.org/pure-csv.html";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.free;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix
index b25cf7c6572..aa678cb21a4 100644
--- a/pkgs/development/pure-modules/doc/default.nix
+++ b/pkgs/development/pure-modules/doc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "doc";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple utility for literate programming and documenting source code written in the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-doc.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix
index 18d42aecf05..04ea1dde589 100644
--- a/pkgs/development/pure-modules/fastcgi/default.nix
+++ b/pkgs/development/pure-modules/fastcgi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, fcgi }:
+{ lib, stdenv, fetchurl, pkg-config, pure, fcgi }:
 
 stdenv.mkDerivation rec {
   baseName = "fastcgi";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache";
     homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix
index e513ecc567d..4a3b12ea7fa 100644
--- a/pkgs/development/pure-modules/faust/default.nix
+++ b/pkgs/development/pure-modules/faust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, faust, libtool }:
+{ lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }:
 
 stdenv.mkDerivation rec {
   baseName = "faust";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lets you load and run Faust-generated signal processing modules in Pure";
     homepage = "http://puredocs.bitbucket.org/pure-faust.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix
index 7a42cde6558..3b076a4f38c 100644
--- a/pkgs/development/pure-modules/ffi/default.nix
+++ b/pkgs/development/pure-modules/ffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, libffi }:
+{ lib, stdenv, fetchurl, pkg-config, pure, libffi }:
 
 stdenv.mkDerivation rec {
   baseName = "ffi";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa";
     homepage = "http://puredocs.bitbucket.org/pure-ffi.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix
index 3fcf8118a84..278c782da32 100644
--- a/pkgs/development/pure-modules/gen/default.nix
+++ b/pkgs/development/pure-modules/gen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl,
+{ lib, stdenv, fetchurl,
   pkg-config, pure, haskellPackages }:
 
 stdenv.mkDerivation rec {
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Pure interface generator";
     homepage = "http://puredocs.bitbucket.org/pure-gen.html";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.free;
+    platforms = lib.platforms.linux;
     hydraPlatforms = [];
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix
index 20dd048e945..369dc1bc39b 100644
--- a/pkgs/development/pure-modules/gl/default.nix
+++ b/pkgs/development/pure-modules/gl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
+{ lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   baseName = "gl";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure";
     homepage = "http://puredocs.bitbucket.org/pure-gl.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
index 6cb620a4525..7b8c46ef47f 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GLPK interface for the Pure Programming Language";
     homepage = "http://puredocs.bitbucket.org/pure-glpk.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix
index ed919e94eea..ddae95c43f0 100644
--- a/pkgs/development/pure-modules/gplot/default.nix
+++ b/pkgs/development/pure-modules/gplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, gnuplot }:
+{ lib, stdenv, fetchurl, pkg-config, pure, gnuplot }:
 
 stdenv.mkDerivation rec {
   baseName = "gplot";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A pure binding to gnuplot";
     homepage = "http://puredocs.bitbucket.org/pure-gplot.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix
index 3d11f29fed3..204aeb6bb74 100644
--- a/pkgs/development/pure-modules/gsl/default.nix
+++ b/pkgs/development/pure-modules/gsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pure, pkg-config, gsl }:
+{ lib, stdenv, fetchurl, pure, pkg-config, gsl }:
 
 stdenv.mkDerivation rec {
   baseName = "gsl";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GNU Scientific Library interface for Pure";
     homepage = "http://puredocs.bitbucket.org/pure-gsl.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix
index 55281957df6..8cc3781e825 100644
--- a/pkgs/development/pure-modules/gtk/default.nix
+++ b/pkgs/development/pure-modules/gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
 
 stdenv.mkDerivation rec {
   baseName = "gtk";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure";
     homepage = "http://puredocs.bitbucket.org/pure-gtk.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix
index 864578ae007..40502bbc140 100644
--- a/pkgs/development/pure-modules/liblo/default.nix
+++ b/pkgs/development/pure-modules/liblo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, liblo }:
+{ lib, stdenv, fetchurl, pkg-config, pure, liblo }:
 
 stdenv.mkDerivation rec {
   baseName = "liblo";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol";
     homepage = "http://puredocs.bitbucket.org/pure-liblo.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix
index 12a15b41a08..577170118bb 100644
--- a/pkgs/development/pure-modules/lilv/default.nix
+++ b/pkgs/development/pure-modules/lilv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
+{ lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
 
 stdenv.mkDerivation rec {
   baseName = "lilv";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers";
     homepage = "http://puredocs.bitbucket.org/pure-lilv.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix
index 590179516b5..800c3968431 100644
--- a/pkgs/development/pure-modules/lv2/default.nix
+++ b/pkgs/development/pure-modules/lv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, lv2 }:
+{ lib, stdenv, fetchurl, pkg-config, pure, lv2 }:
 
 stdenv.mkDerivation rec {
   baseName = "lv2";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules";
     homepage = "http://puredocs.bitbucket.org/pure-lv2.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix
index 86303c057d3..bbca0b08089 100644
--- a/pkgs/development/pure-modules/midi/default.nix
+++ b/pkgs/development/pure-modules/midi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, portmidi }:
+{ lib, stdenv, fetchurl, pkg-config, pure, portmidi }:
 
 stdenv.mkDerivation rec {
   baseName = "midi";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A MIDI interface for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-midi.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix
index a6496617558..8afb74027d7 100644
--- a/pkgs/development/pure-modules/mpfr/default.nix
+++ b/pkgs/development/pure-modules/mpfr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "mpfr";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "This module makes the MPFR multiprecision floats available in Pure";
     homepage = "http://puredocs.bitbucket.org/pure-mpfr.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix
index 20f87fb9fc6..591555f39c8 100644
--- a/pkgs/development/pure-modules/octave/default.nix
+++ b/pkgs/development/pure-modules/octave/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, octave }:
+{ lib, stdenv, fetchurl, pkg-config, pure, octave }:
 
 stdenv.mkDerivation rec {
   baseName = "octave";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An Octave module for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-octave.html";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     # This is set to none for now because it does not work with the
     # current stable version of Octave.
-    platforms = stdenv.lib.platforms.none;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    platforms = lib.platforms.none;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix
index 8b69c3a28dc..272c88a697c 100644
--- a/pkgs/development/pure-modules/odbc/default.nix
+++ b/pkgs/development/pure-modules/odbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, libiodbc }:
+{ lib, stdenv, fetchurl, pkg-config, pure, libiodbc }:
 
 stdenv.mkDerivation rec {
   baseName = "odbc";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple ODBC interface for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-odbc.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix
index beef19d7c5e..bbf22e9c6fb 100644
--- a/pkgs/development/pure-modules/pandoc/default.nix
+++ b/pkgs/development/pure-modules/pandoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
+{ lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
 
 stdenv.mkDerivation rec {
   baseName = "pandoc";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc";
     homepage = "http://puredocs.bitbucket.org/pure-pandoc.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix
index cfc11b7b0ee..99cefc9682a 100644
--- a/pkgs/development/pure-modules/rational/default.nix
+++ b/pkgs/development/pure-modules/rational/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "rational";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure";
     homepage = "http://puredocs.bitbucket.org/pure-rational.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix
index e112b3e3893..f3015e27535 100644
--- a/pkgs/development/pure-modules/readline/default.nix
+++ b/pkgs/development/pure-modules/readline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, readline }:
+{ lib, stdenv, fetchurl, pkg-config, pure, readline }:
 
 stdenv.mkDerivation rec {
   baseName = "readline";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface";
     homepage = "http://puredocs.bitbucket.org/pure-readline.html";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.free;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix
index 75165be0447..5e1a01bc624 100644
--- a/pkgs/development/pure-modules/sockets/default.nix
+++ b/pkgs/development/pure-modules/sockets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "sockets";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Pure interface to the Berkeley socket functions";
     homepage = "http://puredocs.bitbucket.org/pure-sockets.html";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix
index 8c917c6285c..009b367c691 100644
--- a/pkgs/development/pure-modules/sql3/default.nix
+++ b/pkgs/development/pure-modules/sql3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, sqlite }:
+{ lib, stdenv, fetchurl, pkg-config, pure, sqlite }:
 
 stdenv.mkDerivation rec {
   baseName = "sql3";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A SQLite module for the Pure programming language";
     homepage = "http://puredocs.bitbucket.org/pure-sql3.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix
index fba4a2de444..46b711d9fa6 100644
--- a/pkgs/development/pure-modules/stldict/default.nix
+++ b/pkgs/development/pure-modules/stldict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "stldict";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Pure interface to the C++ dictionary containers map and unordered_map";
     homepage = "http://puredocs.bitbucket.org/pure-stldict.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix
index 6a7475a6913..009543ee71c 100644
--- a/pkgs/development/pure-modules/stllib/default.nix
+++ b/pkgs/development/pure-modules/stllib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure }:
+{ lib, stdenv, fetchurl, pkg-config, pure }:
 
 stdenv.mkDerivation rec {
   baseName = "stllib";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap";
     homepage = "http://puredocs.bitbucket.org/pure-stllib.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix
index 843c617c95f..4a2c86783c1 100644
--- a/pkgs/development/pure-modules/tk/default.nix
+++ b/pkgs/development/pure-modules/tk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }:
+{ lib, stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   baseName = "tk";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A basic interface between Pure and Tcl/Tk";
     homepage = "http://puredocs.bitbucket.org/pure-tk.html";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix
index 62b41d28806..e9d35c4d1fb 100644
--- a/pkgs/development/pure-modules/xml/default.nix
+++ b/pkgs/development/pure-modules/xml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }:
+{ lib, stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
   baseName = "xml";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure";
     homepage = "http://puredocs.bitbucket.org/pure-xml.html";
-    license = stdenv.lib.licenses.lgpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ asppsa ];
   };
 }
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index b669d34739e..013b365bce8 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   # Install completions post-install
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ];
 
   # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
   # To avoid this we pre-download the file and place it in the locations it will require it in advance
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 0668c5107b4..944520b47e2 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -6,8 +6,8 @@
 }:
 
 let
-  binpath = stdenv.lib.makeBinPath
-    ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
+  binpath = lib.makeBinPath
+    ([ coreutils ncurses gnused gnugrep ] ++ lib.optional (jdk != null) jdk);
 in
 stdenv.mkDerivation rec {
   pname = "grails";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     rm -f "$out"/bin/*.bat
     # Improve purity
     sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails
-  '' + stdenv.lib.optionalString (jdk != null) ''
+  '' + lib.optionalString (jdk != null) ''
     # Inject JDK path into grails
     sed -i -e '2iJAVA_HOME=${jdk.home}' "$out"/bin/grails
   '';
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 3311253e202..b3a9ac0ce71 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -6,7 +6,7 @@
 , libudev0-shim, glibc, curl, openssl, autoPatchelfHook }:
 
 let
-  runtimeLibs = stdenv.lib.makeLibraryPath [
+  runtimeLibs = lib.makeLibraryPath [
     curl
     glibc
     libudev0-shim
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
index cd4b70624f5..95765be46fd 100644
--- a/pkgs/development/web/kcgi/default.nix
+++ b/pkgs/development/web/kcgi/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   pname = "kcgi";
   version = "0.10.8";
-  underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
+  underscoreVersion = lib.replaceChars ["."] ["_"] version;
 
   src = fetchFromGitHub {
     owner = "kristapsdz";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
+  buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libbsd ] ;
 
   dontAddPrefix = true;
 
diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix
index d3efdc53ca4..bc8113fc6a1 100644
--- a/pkgs/development/web/kore/default.nix
+++ b/pkgs/development/web/kore/default.nix
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
   '';
 
   # added to fix build w/gcc7 and clang5
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
-    + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
+    + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 5308149c26b..9cd21b0cb34 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
+{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
 , pkg-config, which
 # Updater dependencies
 , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
@@ -7,7 +7,7 @@
 , procps, icu
 }:
 
-with stdenv.lib;
+with lib;
 
 { enableNpm ? true, version, sha256, patches ? [] } @args:
 
diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index fa383e8f0c3..fd1127028bc 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -1,4 +1,4 @@
-{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }:
+{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -10,5 +10,5 @@ in
     inherit enableNpm;
     version = "10.23.1";
     sha256 = "1ypddif8jc8qrw9n1f8zbpknjcbnjc9xhpm57hc5nqbrmzsidal8";
-    patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
+    patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
   }
diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index ab082612c9d..7afa3bfb6b5 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -1,4 +1,4 @@
-{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }:
+{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -10,5 +10,5 @@ in
     inherit enableNpm;
     version = "12.20.1";
     sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0";
-    patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
+    patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
   }
diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index 64439688c16..410be6a2495 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -1,4 +1,4 @@
-{ callPackage, openssl, python3, stdenv, enableNpm ? true }:
+{ callPackage, openssl, python3, lib, stdenv, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -10,5 +10,5 @@ in
     inherit enableNpm;
     version = "14.15.4";
     sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd";
-    patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
+    patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
   }
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index f05218a4cd5..02376c0bfe7 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" _Postman
     for file in $(find . -type f \( -name \*.node -o -name _Postman -o -name \*.so\* \) ); do
       ORIGIN=$(patchelf --print-rpath $file); \
-      patchelf --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$ORIGIN" $file
+      patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file
     done
     popd
   '';
diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix
index ff4cd324b5d..e3dea600b43 100644
--- a/pkgs/development/web/remarkjs/default.nix
+++ b/pkgs/development/web/remarkjs/default.nix
@@ -63,8 +63,8 @@ in stdenv.mkDerivation rec {
     homepage = "https://remarkjs.com";
     description = "A simple, in-browser, markdown-driven slideshow tool";
     maintainers = [];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
     broken = true;
   };
 }
diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix
index 14fd9a219ec..915cc16d2eb 100644
--- a/pkgs/development/web/twitter-bootstrap/default.nix
+++ b/pkgs/development/web/twitter-bootstrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "bootstrap";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Front-end framework for faster and easier web development";
     homepage = "https://getbootstrap.com/";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
   };
 
 }
diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index b264b216298..2f186344498 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "lib" ];
 
   # Need to explicitly link to brotlicommon
-  patches = stdenv.lib.optional static ./brotli-static.patch;
+  patches = lib.optional static ./brotli-static.patch;
 
   nativeBuildInputs = [ cmake pkg-config ];
 
   cmakeFlags = [
     "-DCANONICAL_PREFIXES=ON"
     "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
-  ] ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
+  ] ++ lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
 
   propagatedBuildInputs = [ brotli ];
 
diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix
index b093a8008da..f6df21d5766 100644
--- a/pkgs/development/web/xmlindent/default.nix
+++ b/pkgs/development/web/xmlindent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex }:
+{ lib, stdenv, fetchurl, flex }:
 
 stdenv.mkDerivation rec {
   pname = "xmlindent";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "XML stream reformatter";
     homepage = "http://xmlindent.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c012242c38..fa9d86f9802 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16152,7 +16152,7 @@ in
   qt512 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.12) {
       inherit newScope;
-      inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
+      inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
       inherit bison;
       inherit cups;
       inherit dconf;
@@ -16167,7 +16167,7 @@ in
   qt514 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.14) {
       inherit newScope;
-      inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
+      inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
       inherit bison;
       inherit cups;
       inherit dconf;
@@ -16182,7 +16182,7 @@ in
   qt515 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.15) {
       inherit newScope;
-      inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
+      inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
       inherit bison;
       inherit cups;
       inherit dconf;

From 0bbed1c273e4bbb71e438768f532464db7d7a4c5 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sat, 23 Jan 2021 12:43:43 -0500
Subject: [PATCH 720/956] nixos/nomad: add newline

---
 nixos/modules/services/networking/nomad.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index e6bbb607aaa..a0520d4c998 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -114,6 +114,7 @@ in
       } // (optionalAttrs cfg.enableDocker {
         SupplementaryGroups = "docker"; # space-separated string
       });
+
       unitConfig = {
         StartLimitIntervalSec = 10;
         StartLimitBurst = 3;

From 2861d26df5e9aeb5bc385b921a1aaac46011708e Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sat, 23 Jan 2021 12:44:23 -0500
Subject: [PATCH 721/956] nixos/nomad: move data_dir default setting to allow
 propagation of default

---
 nixos/modules/services/networking/nomad.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index a0520d4c998..6c151175e5b 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -51,10 +51,7 @@ in
 
       settings = mkOption {
         type = format.type;
-        default = {
-          # Agrees with `StateDirectory = "nomad"` set below.
-          data_dir = "/var/lib/nomad";
-        };
+        default = {};
         description = ''
           Configuration for Nomad. See the <link xlink:href="https://www.nomadproject.io/docs/configuration">documentation</link>
           for supported values.
@@ -77,6 +74,11 @@ in
 
   ##### implementation
   config = mkIf cfg.enable {
+    services.nomad.settings = {
+      # Agrees with `StateDirectory = "nomad"` set below.
+      data_dir = mkDefault "/var/lib/nomad";
+    };
+
     environment = {
       etc."nomad.json".source = format.generate "nomad.json" cfg.settings;
       systemPackages = [ cfg.package ];

From ad2b6d98bfd85700d3e7f699a8d90fe401826c41 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sun, 24 Jan 2021 00:27:09 +0530
Subject: [PATCH 722/956] kak-vertical-selection: add missing `lib` argument

---
 .../editors/kakoune/plugins/kak-vertical-selection.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
index ccc80ac8d81..2ef9d44854f 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, lib }:
 stdenv.mkDerivation {
   name = "kak-vertical-selection";
   version = "2019-04-11";

From 601080d7c553881305af1b34ba0c16cbdcea9e42 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sun, 24 Jan 2021 00:27:39 +0530
Subject: [PATCH 723/956] kak-buffers: add missing `lib` argument

---
 pkgs/applications/editors/kakoune/plugins/kak-buffers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
index 9db9d4fab73..7075ae3ef0a 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, lib }:
 stdenv.mkDerivation {
   name = "kak-buffers";
   version = "2019-04-03";

From f3817932c9f8b5f98e9405c9085495bdbf0724dc Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sun, 24 Jan 2021 00:28:07 +0530
Subject: [PATCH 724/956] kak-powerline: add missing `lib` argument

---
 pkgs/applications/editors/kakoune/plugins/kak-powerline.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
index 731bb9e46d1..318ae2958b6 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
@@ -1,4 +1,4 @@
-{ stdenv, git, fetchFromGitHub }:
+{ stdenv, git, fetchFromGitHub, lib }:
 stdenv.mkDerivation {
   name = "kak-powerline";
   version = "2020-08-22";

From fcef64cc39816a38a0c617a7e49076fc1ab080cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 23 Jan 2021 20:18:58 +0100
Subject: [PATCH 725/956] esphome: 1.15.2 -> 1.15.3 (#110609)

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

diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 74eccc029ac..de06a60fbf2 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -11,11 +11,11 @@ let
 
 in python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "1.15.2";
+  version = "1.15.3";
 
   src = python.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1wnmgn0q4n2vp2cdwsc36acsy7c7w5vyxdglii3432mr5drrgcsx";
+    sha256 = "a75b53e76fb8b4b394eca18fe74f622ca740bc13b7cbc02e6af5f50126b7aa0b";
   };
 
   ESPHOME_USE_SUBPROCESS = "";

From 3c73686b21f022071a520caac67d8f9d9c8f3442 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Jan 2021 21:27:17 +0100
Subject: [PATCH 726/956] python3Packages.pytile: 5.1.0 -> 5.1.1

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

diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix
index 52b3d828ded..771ae4d1328 100644
--- a/pkgs/development/python-modules/pytile/default.nix
+++ b/pkgs/development/python-modules/pytile/default.nix
@@ -4,28 +4,29 @@
 , aresponses
 , buildPythonPackage
 , fetchFromGitHub
-, poetry
+, poetry-core
 , pylint
 , pytest-aiohttp
 , pytest-asyncio
 , pytestCheckHook
 , pythonAtLeast
 }:
+
 buildPythonPackage rec {
   pname = "pytile";
-  version = "5.1.0";
+  version = "5.1.1";
   disabled = pythonAtLeast "3.9";
 
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
     rev = version;
-    sha256 = "0hdyb8ca4ihqf7yfkr3hbpkwz7g182ycra151y5dxn0319fillc3";
+    sha256 = "sha256-bVoFTaK/Alemtc5I+Z/M9y/FWczvJ+P86R0DMD89/BM=";
   };
 
   format = "pyproject";
 
-  nativeBuildInputs = [ poetry ];
+  nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [
     aiohttp

From d935afe655831c56321d48a22b037ecaabaf5d06 Mon Sep 17 00:00:00 2001
From: nyanotech <nyanotechnology@gmail.com>
Date: Sat, 23 Jan 2021 13:58:20 +0000
Subject: [PATCH 727/956] proxmark3-rrg: Initial commit

The rfidresearchgroup fork is a significant fork from the upstream, and
the build steps are more than a bit different, which is why I did this
in a new file.

Also, add myself to the maintainers list
---
 .../security/proxmark3/proxmark3-rrg.nix      | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/security/proxmark3/proxmark3-rrg.nix

diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix
new file mode 100644
index 00000000000..bf1bcd67d11
--- /dev/null
+++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix
@@ -0,0 +1,38 @@
+{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
+, readline
+
+, hardwarePlatform ? "PM3RDV4"
+
+, hardwarePlatformExtras ? "" }:
+
+mkDerivation rec {
+  pname = "proxmark3-rrg";
+  version = "4.9237";
+
+  src = fetchFromGitHub {
+    owner = "RfidResearchGroup";
+    repo = "proxmark3";
+    rev = "v${version}";
+    sha256 = "13xrhvrsm73rfgqpgca6a37c3jixdkxvfggmacnnx5fdfb393bfx";
+  };
+
+  nativeBuildInputs = [ pkg-config gcc-arm-embedded ];
+  buildInputs = [ bluez5 readline ];
+
+  makeFlags = [
+    "PLATFORM=${hardwarePlatform}"
+    "PLATFORM_EXTRAS=${hardwarePlatformExtras}"
+  ];
+
+  installPhase = ''
+    install -Dt $out/bin client/proxmark3
+    install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client for proxmark3, powerful general purpose RFID tool";
+    homepage = "https://rfidresearchgroup.com/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nyanotech ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd86fed4cb2..a1d12f6f810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7120,6 +7120,8 @@ in
   inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; })
     proxmark3 proxmark3-unstable;
 
+  proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { };
+
   proxychains = callPackage ../tools/networking/proxychains { };
 
   proxify = callPackage ../tools/networking/proxify { };

From f2aa6f79cd320d748804708219edd42a7e604b2a Mon Sep 17 00:00:00 2001
From: Nikita Ursol <nikita20001116@gmail.com>
Date: Sat, 23 Jan 2021 18:21:32 +0200
Subject: [PATCH 728/956] sord: 0.16.4 -> unstable-2021-01-12

---
 pkgs/development/libraries/sord/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index befe6a34cd1..820c577908a 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,12 +1,16 @@
-{ lib, stdenv, fetchurl, pkg-config, python3, serd, pcre, wafHook }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, python3, serd, pcre, wafHook }:
 
 stdenv.mkDerivation rec {
   pname = "sord";
-  version = "0.16.4";
+  version = "unstable-2021-01-12";
 
-  src = fetchurl {
-    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi";
+  # Commit picked in mitigation of #109729
+  src = fetchFromGitHub {
+    owner = "drobilla";
+    repo = pname;
+    rev = "d2efdb2d026216449599350b55c2c85c0d3efb89";
+    sha256 = "hHTwK+K6cj9MGO77a1IXiUZtEbXZ08cLGkYZ5eMOIVA=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ pkg-config python3 wafHook ];

From 87dc37562b67103a56ea4bea27f9e1a7b43ecbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 23 Jan 2021 22:16:41 +0100
Subject: [PATCH 729/956] home-assistant: don't mark home-assistant-frontend as
 missing

---
 .../home-assistant/component-packages.nix      | 18 +++++++++---------
 .../home-assistant/parse-requirements.py       |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index b642ffc8cde..caf8a27973e 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -153,7 +153,7 @@
     "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz
     "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
     "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
-    "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend
+    "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow sqlalchemy zeroconf ];
     "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
     "deluge" = ps: with ps; [ deluge-client ];
     "demo" = ps: with ps; [ aiohttp-cors ];
@@ -281,7 +281,7 @@
     "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
     "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
     "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius
-    "frontend" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
+    "frontend" = ps: with ps; [ aiohttp-cors pillow ];
     "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi
     "futurenow" = ps: with ps; [ pyfnip ];
     "garadget" = ps: with ps; [ ];
@@ -333,7 +333,7 @@
     "hangouts" = ps: with ps; [ ]; # missing inputs: hangups
     "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
     "harmony" = ps: with ps; [ aioharmony ];
-    "hassio" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
+    "hassio" = ps: with ps; [ aiohttp-cors pillow ];
     "haveibeenpwned" = ps: with ps; [ ];
     "hddtemp" = ps: with ps; [ ];
     "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC
@@ -448,7 +448,7 @@
     "local_ip" = ps: with ps; [ ];
     "locative" = ps: with ps; [ aiohttp-cors ];
     "lock" = ps: with ps; [ ];
-    "logbook" = ps: with ps; [ aiohttp-cors pillow sqlalchemy ]; # missing inputs: home-assistant-frontend
+    "logbook" = ps: with ps; [ aiohttp-cors pillow sqlalchemy ];
     "logentries" = ps: with ps; [ ];
     "logger" = ps: with ps; [ ];
     "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle
@@ -468,7 +468,7 @@
     "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner
     "manual" = ps: with ps; [ ];
     "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
-    "map" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
+    "map" = ps: with ps; [ aiohttp-cors pillow ];
     "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary
     "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py
     "matrix" = ps: with ps; [ matrix-client ];
@@ -572,7 +572,7 @@
     "ohmconnect" = ps: with ps; [ defusedxml ];
     "ombi" = ps: with ps; [ ]; # missing inputs: pyombi
     "omnilogic" = ps: with ps; [ ]; # missing inputs: omnilogic
-    "onboarding" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
+    "onboarding" = ps: with ps; [ aiohttp-cors pillow ];
     "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet
     "onkyo" = ps: with ps; [ onkyo-eiscp ];
     "onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async
@@ -603,8 +603,8 @@
     "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
     "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
     "pandora" = ps: with ps; [ pexpect ];
-    "panel_custom" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
-    "panel_iframe" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
+    "panel_custom" = ps: with ps; [ aiohttp-cors pillow ];
+    "panel_iframe" = ps: with ps; [ aiohttp-cors pillow ];
     "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a
     "pencom" = ps: with ps; [ ]; # missing inputs: pencompy
     "persistent_notification" = ps: with ps; [ ];
@@ -698,7 +698,7 @@
     "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
     "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
     "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd
-    "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; # missing inputs: home-assistant-frontend
+    "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ];
     "saj" = ps: with ps; [ ]; # missing inputs: pysaj
     "samsungtv" = ps: with ps; [ samsungctl samsungtvws ];
     "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index fc0e790bd6f..55e58d7a017 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -161,7 +161,8 @@ def main() -> None:
             if attr_path is not None:
                 # Add attribute path without "python3Packages." prefix
                 attr_paths.append(attr_path[len(PKG_SET + ".") :])
-            else:
+            # home-assistant-frontend is always in propagatedBuildInputs
+            elif name != 'home-assistant-frontend':
                 missing_reqs.append(name)
         else:
             build_inputs[component] = (attr_paths, missing_reqs)

From 0ceadf99f221cf461efa9edb34424ff6ad375119 Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Thu, 3 Sep 2020 22:47:42 -0400
Subject: [PATCH 730/956] lowdown: Split out "lib" and "man" outputs

Also fix to not always static link
---
 pkgs/tools/package-management/nix/default.nix |  4 +-
 pkgs/tools/typesetting/lowdown/default.nix    |  7 +++-
 pkgs/tools/typesetting/lowdown/shared.patch   | 41 +++++++++++++++++++
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/typesetting/lowdown/shared.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 495d0aae018..2437613755d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -45,7 +45,7 @@ common =
           [ autoreconfHook
             autoconf-archive
             bison flex
-            lowdown mdbook
+            (lib.getBin lowdown) mdbook
             jq
            ];
 
@@ -55,7 +55,7 @@ common =
         ]
         ++ lib.optionals stdenv.isDarwin [ Security ]
         ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-        ++ lib.optionals is24 [ libarchive gmock ]
+        ++ lib.optionals is24 [ libarchive gmock lowdown ]
         ++ lib.optional withLibseccomp libseccomp
         ++ lib.optional withAWS
             ((aws-sdk-cpp.override {
diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix
index 522c3438d90..668e54c1730 100644
--- a/pkgs/tools/typesetting/lowdown/default.nix
+++ b/pkgs/tools/typesetting/lowdown/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "lowdown";
   version = "0.7.9";
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "lib" "dev" "man" ];
 
   src = fetchurl {
     url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
@@ -16,9 +16,12 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     ./configure PREFIX=''${!outputDev} \
                 BINDIR=''${!outputBin}/bin \
-                MANDIR=''${!outputBin}/share/man
+                LIBDIR=''${!outputLib}/lib \
+                MANDIR=''${!outputMan}/share/man
   '';
 
+  patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;
+
   meta = with lib; {
     homepage = "https://kristaps.bsd.lv/lowdown/";
     description = "Simple markdown translator";
diff --git a/pkgs/tools/typesetting/lowdown/shared.patch b/pkgs/tools/typesetting/lowdown/shared.patch
new file mode 100644
index 00000000000..ed9f266b3f9
--- /dev/null
+++ b/pkgs/tools/typesetting/lowdown/shared.patch
@@ -0,0 +1,41 @@
+diff --git a/Makefile b/Makefile
+index 955f737..2c9532c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,7 +80,7 @@ REGRESS_ARGS	+= "--parse-no-autolink"
+ REGRESS_ARGS	+= "--parse-no-cmark"
+ REGRESS_ARGS	+= "--parse-no-deflists"
+ 
+-all: lowdown lowdown-diff lowdown.pc
++all: lowdown lowdown-diff liblowdown.so lowdown.pc
+ 
+ www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
+ 
+@@ -101,6 +101,9 @@ lowdown-diff: lowdown
+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ 	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+ 
++liblowdown.so: $(OBJS) $(COMPAT_OBJS)
++	$(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
++
+ install: all
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+@@ -111,7 +114,7 @@ install: all
+ 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+ 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+-	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ 	for f in $(MANS) ; do \
+ 		name=`basename $$f .html` ; \
+@@ -199,7 +202,7 @@ main.o: lowdown.h
+ 
+ clean:
+ 	rm -f $(OBJS) $(COMPAT_OBJS) main.o
+-	rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
++	rm -f lowdown lowdown-diff liblowdown.so lowdown.pc
+ 	rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
+ 	rm -f $(PDFS) $(HTMLS) $(THUMBS)
+ 

From a7f0bf791608cd5674adf69fe4ea35f42b9a96fc Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Sat, 23 Jan 2021 14:19:29 -0800
Subject: [PATCH 731/956] mc: move dependency pruning from post to pre fixup

See: https://github.com/NixOS/nixpkgs/pull/105026#issuecomment-751163086
---
 pkgs/tools/misc/mc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 674b39c51af..99944c7f824 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
       --replace /bin/rm ${coreutils}/bin/rm
   '';
 
-  postFixup = ''
+  preFixup = ''
     # remove unwanted build-dependency references
     sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc
   '';

From f1778cd90eea2c3d5dbca3aa55b6351697dad683 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sat, 23 Jan 2021 17:52:19 -0500
Subject: [PATCH 732/956] nixos/nomad: add extraSettingsFiles option to nomad
 service (#109761)

---
 nixos/modules/services/networking/nomad.nix | 14 +++++-
 nixos/tests/all-tests.nix                   |  1 +
 nixos/tests/nomad.nix                       | 53 +++++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/nomad.nix

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 6c151175e5b..dafdae0c327 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -49,6 +49,17 @@ in
         '';
       };
 
+      extraSettingsPaths = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = ''
+          Additional settings paths used to configure nomad. These can be files or directories.
+        '';
+        example = literalExample ''
+          [ "/etc/nomad-mutable.json" "/run/keys/nomad-with-secrets.json" "/etc/nomad/config.d" ]
+        '';
+      };
+
       settings = mkOption {
         type = format.type;
         default = {};
@@ -101,7 +112,8 @@ in
       serviceConfig = {
         DynamicUser = cfg.dropPrivileges;
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-        ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json";
+        ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" +
+          concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths;
         KillMode = "process";
         KillSignal = "SIGINT";
         LimitNOFILE = 65536;
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 966c7844657..523d3c051e0 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -272,6 +272,7 @@ in
   nginx-variants = handleTest ./nginx-variants.nix {};
   nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};
   nixos-generate-config = handleTest ./nixos-generate-config.nix {};
+  nomad = handleTest ./nomad.nix {};
   novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
   nsd = handleTest ./nsd.nix {};
   nzbget = handleTest ./nzbget.nix {};
diff --git a/nixos/tests/nomad.nix b/nixos/tests/nomad.nix
new file mode 100644
index 00000000000..bd052152bd6
--- /dev/null
+++ b/nixos/tests/nomad.nix
@@ -0,0 +1,53 @@
+import ./make-test-python.nix (
+  { lib, ... }: {
+    name = "nomad";
+    nodes = {
+      server = { pkgs, lib, ... }: {
+        networking = {
+          interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [{
+            address = "192.168.1.1";
+            prefixLength = 16;
+          }];
+        };
+
+        environment.etc."nomad.custom.json".source =
+          (pkgs.formats.json { }).generate "nomad.custom.json" {
+            region = "universe";
+            datacenter = "earth";
+          };
+
+        services.nomad = {
+          enable = true;
+
+          settings = {
+            server = {
+              enabled = true;
+              bootstrap_expect = 1;
+            };
+          };
+
+          extraSettingsPaths = [ "/etc/nomad.custom.json" ];
+          enableDocker = false;
+        };
+      };
+    };
+
+    testScript = ''
+      server.wait_for_unit("nomad.service")
+
+      # wait for healthy server
+      server.wait_until_succeeds(
+          "[ $(nomad operator raft list-peers | grep true | wc -l) == 1 ]"
+      )
+
+      # wait for server liveness
+      server.succeed("[ $(nomad server members | grep -o alive | wc -l) == 1 ]")
+
+      # check the region
+      server.succeed("nomad server members | grep -o universe")
+
+      # check the datacenter
+      server.succeed("[ $(nomad server members | grep -o earth | wc -l) == 1 ]")
+    '';
+  }
+)

From 26017cf53660833e6c7124f60a17be44ca295294 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 23 Jan 2021 20:09:53 -0300
Subject: [PATCH 733/956] pyspread: add desktop item

Also, remove "spurious" pyspread package.
---
 pkgs/applications/office/pyspread/default.nix | 18 ++++++
 .../python-modules/pyspread/default.nix       | 56 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 18 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyspread/default.nix

diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix
index 5b7a80747d0..0b657e38f7f 100644
--- a/pkgs/applications/office/pyspread/default.nix
+++ b/pkgs/applications/office/pyspread/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonApplication
 , fetchPypi
+, makeDesktopItem
 , makePythonPath
 , dateutil
 , matplotlib
@@ -38,6 +39,23 @@ buildPythonApplication rec {
 
   doCheck = false; # it fails miserably with a core dump
 
+  desktopItem = makeDesktopItem rec {
+    name = pname;
+    exec = name;
+    icon = name;
+    desktopName = "Pyspread";
+    genericName = "Spreadsheet";
+    comment = meta.description;
+    categories = "Office;Development;Spreadsheet;";
+  };
+
+  postInstall = ''
+    runHook preInstall
+    install -D $out/share/applications
+    install -m 644 $desktopItem/share/applications/* $out/share/applications
+    runHook postInstall
+  '';
+
   fixupPhase = ''
     runHook preFixup
     sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" $out/bin/pyspread
diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix
deleted file mode 100644
index a14911b7a3e..00000000000
--- a/pkgs/development/python-modules/pyspread/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ buildPythonPackage
-, fetchPypi
-, isPy3k
-, lib, stdenv
-, numpy
-, wxPython
-, matplotlib
-, pycairo
-, python-gnupg
-, xlrd
-, xlwt
-, jedi
-, pyenchant
-, basemap
-, pygtk
-, makeDesktopItem
-}:
-
-buildPythonPackage rec {
-  pname = "pyspread";
-  version = "1.99.5";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d396c2f94bf1ef6140877ab19205e6f2375bfe01d1bf50ff33bb63384744dd78";
-  };
-
-  propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
-  # Could also (optionally) add pyrsvg and python bindings for libvlc
-
-  # Tests try to access X Display
-  doCheck = false;
-
-  disabled = isPy3k;
-
-  desktopItem = makeDesktopItem rec {
-    name = pname;
-    exec = name;
-    icon = name;
-    desktopName = "Pyspread";
-    genericName = "Spreadsheet";
-    comment = meta.description;
-    categories = "Development;Spreadsheet;";
-  };
-
-  postInstall = ''
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications
-  '';
-
-  meta = with lib; {
-    description = "Pyspread is a non-traditional spreadsheet application that is based on and written in the programming language Python";
-    homepage = "https://manns.github.io/pyspread/";
-    license = licenses.gpl3;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d37d837e4e1..d69502ace2c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5906,8 +5906,6 @@ in {
 
   pyspotify = callPackage ../development/python-modules/pyspotify { };
 
-  pyspread = callPackage ../development/python-modules/pyspread { };
-
   pysptk = callPackage ../development/python-modules/pysptk { };
 
   pysqlcipher3 = callPackage ../development/python-modules/pysqlcipher3 {

From 5f35338b1897de95b1862a64ff8226a046cfc254 Mon Sep 17 00:00:00 2001
From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com">
Date: Sun, 24 Jan 2021 00:20:53 +0100
Subject: [PATCH 734/956] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 144 ++++++++++++++--------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e6ccbe2ef06..4aa08e4f3be 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2021-01-20";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "7e3d2930d8defbcb233b0bc21822cb8e8377bec2";
-      sha256 = "10ddyvbcy1m00sbcxnba3ijwxjcymqzxlk3hs2gb7z5ng85cryyb";
+      rev = "9fd9435cd525b1d3c4470db0d514f72ed31cfece";
+      sha256 = "0nbnq3wmwm5m4g2b8jknjvallq1pq7qdxmbz81nnjkdmf6sw75ji";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -377,12 +377,12 @@ let
 
   chadtree = buildVimPluginFrom2Nix {
     pname = "chadtree";
-    version = "2021-01-21";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "4b1d61cc00baf7b5f77efb75d1973d453248153f";
-      sha256 = "1w166j4syxwv1qhm0s813rixgc83j6ba5m4db1n2a8bnqwgcc9i6";
+      rev = "614af72a9b0afaac26e3e7fe2e1f30eb416bb96b";
+      sha256 = "04mnhwk1sn174nrvr9jfvcfq4dff1c595y9i2r94xy6yag5cv61l";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -846,12 +846,12 @@ let
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2021-01-08";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "a9259687391457c71fa8bcbf609ca83742b6d277";
-      sha256 = "0smlfvxdily3vz9i3vr0b5r3410zp5asf13cbjxxv219fqa3z22a";
+      rev = "09c8f1bff43b0cc607f7aeab872f04fcf26b150b";
+      sha256 = "1sapg0az9vfd33vhxxi68hd23c01p8fy5yvx8fy0mvj5ak2gzbnn";
     };
     meta.homepage = "https://github.com/Shougo/defx.nvim/";
   };
@@ -894,12 +894,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2021-01-21";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "18f8a297d1f8ddb3f9fea8941888d57194b7e1e9";
-      sha256 = "0a6vlmzpi7i7wpsc49jrh6bk3m7nq562k6k1lb33vfc41dvyz3am";
+      rev = "9637bc88220c0117e0bc20b730348aaa744a78d6";
+      sha256 = "1gwx6x584h98w31g1ynyqbjs6vypx121wcbsq1bq4npn71a9yvxv";
     };
     meta.homepage = "https://github.com/Shougo/denite.nvim/";
   };
@@ -1136,12 +1136,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2021-01-15";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "5fb8291d5f5238bdd52025e02470c7602d66f7c4";
-      sha256 = "08fidhbqxhzxabww0zb5lxfignl3qmjn8ffl1g81acl2v62bz3hn";
+      rev = "e149cc4b581721c434986b2681db30d9ff4cb372";
+      sha256 = "0cfizq9zbbfqypqjkph7np1mn4vakfim7qylblmzc6s24kx9kyf7";
     };
     meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
   };
@@ -1220,12 +1220,12 @@ let
 
   echodoc-vim = buildVimPluginFrom2Nix {
     pname = "echodoc-vim";
-    version = "2020-10-13";
+    version = "2021-01-21";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "2a6d6bd6255fbfe152da6bb7f2404afa29479941";
-      sha256 = "18nm20ivkcjlh0rgf3c1wdxf1wsc4r95znm2dhgmw1ym4wmh0v4s";
+      rev = "1b657bccd69c0498a865b930959a36279e7213e0";
+      sha256 = "1n9wa4p9ng04ckklca32xz9c8zlkmzlhmwva7sf8l217bcr3zb9y";
     };
     meta.homepage = "https://github.com/Shougo/echodoc.vim/";
   };
@@ -1835,12 +1835,12 @@ let
 
   indent-blankline-nvim = buildVimPluginFrom2Nix {
     pname = "indent-blankline-nvim";
-    version = "2020-12-18";
+    version = "2021-01-22";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "3e4eb10fd57dec3ca11ecb4afa6b3a76558c4182";
-      sha256 = "1qgnrdflw8c7afh060xk5fl5yw7jbap5fp8a4mbhdhgrfr7gv6ll";
+      rev = "207e001be64b39b72f8661e4a723d5bab698b5cd";
+      sha256 = "0vnnfm319y3n0vvwbwls40fb6s73rqc8yyi31g0f0hdwd6ahsafm";
     };
     meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
   };
@@ -1956,12 +1956,12 @@ let
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
     pname = "Jenkinsfile-vim-syntax";
-    version = "2020-06-05";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "martinda";
       repo = "Jenkinsfile-vim-syntax";
-      rev = "a701341879c6db93f5dffa37f4589eef3c4ded85";
-      sha256 = "0nm3lf37l1g8lpa4yz1va0s6vw0vw99zghy3dzq933j0kqmspgvp";
+      rev = "7760006fc591e5a109432a0de0a705c92f7ffcd7";
+      sha256 = "1cqqk25x7km4qy0qxhjnqn77911a9nzjdif5905b99n1n6yn36q0";
     };
     meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/";
   };
@@ -2844,24 +2844,24 @@ let
 
   nvim-dap = buildVimPluginFrom2Nix {
     pname = "nvim-dap";
-    version = "2021-01-20";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "0e4ddd517bce79dbc351b89710becf4c711afd84";
-      sha256 = "0dr2cdfwd8dirwqqwwp4iay24p9ssrynq2801mrk5wd7rnv20x7b";
+      rev = "55833f58a65ab703bb1f34860f60a98ce601fc08";
+      sha256 = "0sljqwm48p3i2ps3p5rh0vr7lxbzwd67npkqd9scbmgcmci6blvj";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
 
   nvim-dap-virtual-text = buildVimPluginFrom2Nix {
     pname = "nvim-dap-virtual-text";
-    version = "2020-12-06";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "nvim-dap-virtual-text";
-      rev = "5257a5a7b759ba5d4fe695b02569526cdd32ad43";
-      sha256 = "0ghf6g5wdxdzja9i2d1r4s4p828safw6vx8636yx798lqqlvp8i7";
+      rev = "ce5223283753f1583ebe547c197f2c52975d545f";
+      sha256 = "1nrzkyfdy01rw52mlr1xpf01yf8kqdmv8z9wrkl27q9240hklq9y";
     };
     meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
   };
@@ -2916,12 +2916,12 @@ let
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2021-01-21";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "86b316140a5fdc902e89ff585ce429357ce4d5df";
-      sha256 = "1d0qb4kpdk677m53wl4lpbkmz283b27x34d78bsq7q078l642sg4";
+      rev = "6a33e9ba757245a300531e370c6b2ebe6e5a7097";
+      sha256 = "1grsh5186in83n0j28n8r0vw64kx8h1c5z8pm19adwdan0pcbs1r";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -2964,24 +2964,24 @@ let
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree-lua";
-    version = "2021-01-20";
+    version = "2021-01-22";
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-tree.lua";
-      rev = "91bd2b53ba605dd66712178454c3ae9800885c0e";
-      sha256 = "16wwfhly3ii855kq7kdrcyvvcdf1zfrsj24yb5r15dzjp104ahrx";
+      rev = "b2852578769b53430af678ae7a99482f2a4be0da";
+      sha256 = "057w9nqn0xc207s7y7fcl84xi14251yhyjd6xsajv9hlh4zcgarv";
     };
     meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2021-01-21";
+    version = "2021-01-22";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "f84c93c484ec3f5fb2a7ca461bf5b93994662fda";
-      sha256 = "0wh2rv1awlvm1d4fgvcgl0cg9sw20x5axmnq2ch0q18qca37v5i5";
+      rev = "6d2b1fc56679038fb839b7f7707b65808ff5d9e4";
+      sha256 = "0jw5igzargbhxrim7256535n6z18ffbzng2qaxsz0mkzp1mr9kik";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3024,12 +3024,12 @@ let
 
   nvim-ts-rainbow = buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow";
-    version = "2021-01-21";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "p00f";
       repo = "nvim-ts-rainbow";
-      rev = "18c879acbcf9349b131c6d78eba41c489796ec74";
-      sha256 = "1nqw98yhqbm4afr60x6njdfgm0gk2sqv91dcvrvw2jjwa1dzzcc5";
+      rev = "955f6d08e2e829f819d5f838e742761b43a263f5";
+      sha256 = "19yy39sv1xv36aa9chrlkpf9xfw5l556s5sljcspynn66sdz8n5y";
     };
     meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
   };
@@ -3939,12 +3939,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2021-01-20";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "a81f316712b26a04ec35eda9c46a641ece635881";
-      sha256 = "0cvh5c86cv5jir0ibf1gn5kwkrmrshapi8al8lqavgsh7ryib4nw";
+      rev = "099910dcd922723b2634c74c0958ef4d169721dd";
+      sha256 = "0nyd6ym87xmhd8zr5fl4h2hdnd9f0sc42ra5s0a8z8s52rd651x2";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -4036,12 +4036,12 @@ let
 
   traces-vim = buildVimPluginFrom2Nix {
     pname = "traces-vim";
-    version = "2021-01-14";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
-      rev = "2b54b52badf9e052cbb78f5c21d9dc994110ff52";
-      sha256 = "0p5xkyyrdr3gph4q4p0n517g6rv1vzqfjqzzmrjclf4zpqqiarc5";
+      rev = "0f29f8e53503b8ce0bb43467064b2401cf34acd1";
+      sha256 = "1xx2b59wcnbh5662j7b68maz5ccxj5xpfpnjn2r669aiv0a5snhw";
     };
     meta.homepage = "https://github.com/markonm/traces.vim/";
   };
@@ -4672,12 +4672,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2021-01-19";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "7442976f0c5dea79f8cfb342e7abb25cea9a8daa";
-      sha256 = "1gzc800i4zsxav4h7smqgapnrallarbgrq9arfhydrq41hy2h6wr";
+      rev = "890aaca21af5ce9569d4393f72240283c198a246";
+      sha256 = "1n11vb609v6fxrv5vxzf9z1hkzlzky0lx9sf5hjzmf54kny77f3r";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -5476,12 +5476,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2021-01-20";
+    version = "2021-01-22";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "cf7ff75a3f5f6600474dc1912819fd0ce12e97ee";
-      sha256 = "01i2cffnivj9p8fz5l49z4g0cja5hk8klim7wbn38zm7xmq0cn8f";
+      rev = "007d9bc7786d703dc778de7b69895b8c1907dde7";
+      sha256 = "1r7jv3cbawh9n2d6nd3iwga6bgj8z0nx94c3dhn5286si1s3857c";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -5741,12 +5741,12 @@ let
 
   vim-illuminate = buildVimPluginFrom2Nix {
     pname = "vim-illuminate";
-    version = "2021-01-17";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "85103ff4ab0c5c8017af106ba1af9949aa28793e";
-      sha256 = "1aixb0rbjdmask0miry1b9xi0f8bcg8z6w58bphxa7f9ndfgbppw";
+      rev = "d69a2787524a6973a187e67c978e1a92529fd910";
+      sha256 = "013xnvxrma4jdv9a5i33qzjw65c0rrlvidsgdg4snrmwhdqw744q";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
   };
@@ -6114,24 +6114,24 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2021-01-19";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "3012f39ce120ffdc5b89a85f074fc66d6f4905bf";
-      sha256 = "157jm2wwvp4dp7rzilhrb4040paldjx7qkp116v4q5kj699w42i7";
+      rev = "ec4818d6fc7bd6705972ef138a71293678e8abed";
+      sha256 = "0v54bmwr9cxqp2dnb7f413i1lnyk6vaf9vgprmyj3yzrycwgpqam";
     };
     meta.homepage = "https://github.com/natebosch/vim-lsc/";
   };
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2021-01-18";
+    version = "2021-01-23";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "7380d31c4f49d76ce3895c386e2a7a40b2b2df08";
-      sha256 = "082il6bk7rnqvxqqy1070y3182kqk34i1bgcczj4k43llnghskx9";
+      rev = "7d5cd2763cbede18728e1254ed8d5e89fd500fd2";
+      sha256 = "0hymc1ni3wrbwbn8iql4qy4gb1xvcx2qsxqzna0f861c8kc9v4y4";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -6775,12 +6775,12 @@ let
 
   vim-projectionist = buildVimPluginFrom2Nix {
     pname = "vim-projectionist";
-    version = "2020-10-31";
+    version = "2021-01-22";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "0c6967d3a8c3bd3d3b42013531c3f12c843aff80";
-      sha256 = "1s6yxnlwxlblj5m9gxlc8699g2a1d7cbjacp4fk4fa9mrkga7bv8";
+      rev = "348e070867d02bd471df486bfbe25e2e2ce13061";
+      sha256 = "0fyp1zikw16kzjcs7a6g3kjk74xr46bdhwrwfi9ppfqlhb936kgr";
     };
     meta.homepage = "https://github.com/tpope/vim-projectionist/";
   };
@@ -7123,12 +7123,12 @@ let
 
   vim-signify = buildVimPluginFrom2Nix {
     pname = "vim-signify";
-    version = "2020-08-13";
+    version = "2021-01-22";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "98c693f7a1a91b73d9232d868765b4d20af892fe";
-      sha256 = "05ppj7sqp8i7qhaf6vz427nnwsnkgf9nlq3lhyhbl14cjkrhqny9";
+      rev = "26e8c8d9cf27838cd13b45cb54118d74af34087d";
+      sha256 = "11aahxvpxv6h2yl3dlcdfb2715d6m2m6f53xw13sir25hmwlj8k8";
     };
     meta.homepage = "https://github.com/mhinz/vim-signify/";
   };
@@ -7219,12 +7219,12 @@ let
 
   vim-snipmate = buildVimPluginFrom2Nix {
     pname = "vim-snipmate";
-    version = "2021-01-21";
+    version = "2021-01-22";
     src = fetchFromGitHub {
       owner = "garbas";
       repo = "vim-snipmate";
-      rev = "d4554cd646c3c015d85bd44487a0e019f88c959a";
-      sha256 = "1jmyrlbwrljc6jnn44yqz5s090srykn3dp7w08iaq10vpxav987g";
+      rev = "cbec960ab558b20281c0634b9b1a45fb16aaf638";
+      sha256 = "1k35rh5gq8lv67qx3l31xvl4iz7rlpybls7pwhsbmz4m598w03bm";
     };
     meta.homepage = "https://github.com/garbas/vim-snipmate/";
   };

From 1b848b95bdcbc3f2261d249b542a013bbc85ff8a Mon Sep 17 00:00:00 2001
From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com">
Date: Sun, 24 Jan 2021 00:21:18 +0100
Subject: [PATCH 735/956] vimPlugins.sql-nvim: init at 2021-01-22

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/overrides.nix    |  5 +++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 18 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4aa08e4f3be..13d9de70448 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3744,6 +3744,18 @@ let
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
   };
 
+  sql-nvim = buildVimPluginFrom2Nix {
+    pname = "sql-nvim";
+    version = "2021-01-22";
+    src = fetchFromGitHub {
+      owner = "tami5";
+      repo = "sql.nvim";
+      rev = "af875daf178fe38c2186b14d55a6bbdb6fbb2e15";
+      sha256 = "00qa9m6bij9y39xyf73a3gz0xx0l0mqc1byrk6xl3kdbcngig5il";
+    };
+    meta.homepage = "https://github.com/tami5/sql.nvim/";
+  };
+
   srcery-vim = buildVimPluginFrom2Nix {
     pname = "srcery-vim";
     version = "2020-12-22";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index e4130554ad4..dcb8c0600e1 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -14,6 +14,7 @@
 , buildVimPluginFrom2Nix
 , nodePackages
 , dasht
+, sqlite
 
 # deoplete-khard dependency
 , khard
@@ -285,6 +286,10 @@ self: super: {
     dependencies = [ self.skim ];
   });
 
+  sql-nvim = super.sql-nvim.overrideAttrs(old: {
+    buildInputs = [ sqlite ];
+  });
+
   sved = let
     # we put the script in its own derivation to benefit the magic of wrapGAppsHook
     svedbackend = stdenv.mkDerivation {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 438027ba5ef..d97fd16a34e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -537,6 +537,7 @@ svermeulen/vim-subversive
 t9md/vim-choosewin
 t9md/vim-smalls
 takac/vim-hardtime
+tami5/sql.nvim
 tbodt/deoplete-tabnine
 ternjs/tern_for_vim
 terryma/vim-expand-region

From eba7b3848d65160b1d91c0b9bafd57dfd46df7f8 Mon Sep 17 00:00:00 2001
From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com">
Date: Sun, 24 Jan 2021 00:21:40 +0100
Subject: [PATCH 736/956] vimPlugins.telescope-frecency-nvim: init at
 2021-01-20

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 13d9de70448..aee3796b837 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3924,6 +3924,18 @@ let
     meta.homepage = "https://github.com/tomtom/tcomment_vim/";
   };
 
+  telescope-frecency-nvim = buildVimPluginFrom2Nix {
+    pname = "telescope-frecency-nvim";
+    version = "2021-01-20";
+    src = fetchFromGitHub {
+      owner = "nvim-telescope";
+      repo = "telescope-frecency.nvim";
+      rev = "a770d59b925ff4ff87036afff06c87d620cd6861";
+      sha256 = "04kla2nyz1rh0b9iyi5nynyzpmyjiql2wvs2gdf964a79m86493l";
+    };
+    meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
+  };
+
   telescope-fzf-writer-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-fzf-writer-nvim";
     version = "2021-01-10";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index d97fd16a34e..6d1dd017a0f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -408,6 +408,7 @@ nvim-lua/lsp-status.nvim
 nvim-lua/lsp_extensions.nvim
 nvim-lua/plenary.nvim
 nvim-lua/popup.nvim
+nvim-telescope/telescope-frecency.nvim
 nvim-telescope/telescope-fzf-writer.nvim
 nvim-telescope/telescope-fzy-native.nvim
 nvim-telescope/telescope.nvim

From 69113ace45c94ad47cbc133e3366a935cbafa70e Mon Sep 17 00:00:00 2001
From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com">
Date: Sun, 24 Jan 2021 00:22:04 +0100
Subject: [PATCH 737/956] vimPlugins.packer-nvim: init at 2021-01-22

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index aee3796b837..71cfd70356f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3130,6 +3130,18 @@ let
     meta.homepage = "https://github.com/tyru/open-browser.vim/";
   };
 
+  packer-nvim = buildVimPluginFrom2Nix {
+    pname = "packer-nvim";
+    version = "2021-01-22";
+    src = fetchFromGitHub {
+      owner = "wbthomason";
+      repo = "packer.nvim";
+      rev = "3567ab93c60540407df7ce4faced7c454f89b941";
+      sha256 = "14k6iajrari85cl3bi8vn193khhchxn62mq0j2f49gn47pl47f4k";
+    };
+    meta.homepage = "https://github.com/wbthomason/packer.nvim/";
+  };
+
   palenight-vim = buildVimPluginFrom2Nix {
     pname = "palenight-vim";
     version = "2020-10-20";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 6d1dd017a0f..a7e3ea1a3a7 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -667,6 +667,7 @@ VundleVim/Vundle.vim
 w0ng/vim-hybrid
 wakatime/vim-wakatime
 wannesm/wmgraphviz.vim
+wbthomason/packer.nvim
 weirongxu/coc-explorer
 wellle/targets.vim
 wellle/tmux-complete.vim

From 43697057562d750004e9b9d12cd8bd772f5ee249 Mon Sep 17 00:00:00 2001
From: tobim <tobim@fastmail.fm>
Date: Sun, 24 Jan 2021 00:54:44 +0100
Subject: [PATCH 738/956] re2: fix for pkgsStatic (#110581)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/re2/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index faa576faa0d..2d8d0059764 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -17,10 +17,14 @@ stdenv.mkDerivation {
     substituteInPlace Makefile  --replace "SED_INPLACE=sed -i '''" "SED_INPLACE=sed -i"
   '';
 
+  buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ];
+
   preCheck = "patchShebangs runtests";
   doCheck = true;
   checkTarget = "test";
 
+  installTargets = lib.optionals stdenv.hostPlatform.isStatic [ "static-install" ];
+
   doInstallCheck = true;
   installCheckTarget = "testinstall";
 

From 95f8678091d82ab653e5c7a4407af5c1124715ba Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <rhoriguchi@users.noreply.github.com>
Date: Sun, 24 Jan 2021 01:11:22 +0100
Subject: [PATCH 739/956] gitkraken: 7.4.1 -> 7.5.0 (#110561)

---
 .../version-management/gitkraken/default.nix          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 7618b3f3ff1..7dd8ff43974 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gitkraken";
-  version = "7.4.1";
+  version = "7.5.0";
 
   src = fetchzip {
     url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-    sha256 = "1c9cyxx5sqvnilf6xp3ildq3lwl6mj8v1vl0wzyjpaiqky99lj9p";
+    sha256 = "1v89aza7iwph7k5phyld5m5856c5wbh8ncgg6lh7558v4xna0x57";
   };
 
   dontBuild = true;
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   ];
 
   desktopItem = makeDesktopItem {
-    name = "gitkraken";
+    name = pname;
     exec = "gitkraken";
     icon = "gitkraken";
     desktopName = "GitKraken";
@@ -88,10 +88,7 @@ stdenv.mkDerivation rec {
     ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
 
     mkdir -p $out/share/applications
-    cp ${desktopItem}/share/applications/* $out/share/applications/
-
-    substituteInPlace $out/share/applications/gitkraken.desktop \
-      --replace $out/usr/share/gitkraken $out/bin
+    ln -s ${desktopItem}/share/applications/* $out/share/applications
 
     mkdir -p $out/share/pixmaps
     cp gitkraken.png $out/share/pixmaps/gitkraken.png

From a4bbfba80dbdccf7c3d3ac64fc7afa2494cf743a Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 24 Jan 2021 01:29:22 +0100
Subject: [PATCH 740/956] pkgs/development/python-modules: stdenv.lib -> lib

---
 .../python-modules/Cython/default.nix         |  8 +++---
 .../python-modules/HTSeq/default.nix          |  4 +--
 .../python-modules/Theano/default.nix         |  8 +++---
 .../python-modules/aenum/default.nix          |  8 +++---
 .../python-modules/aiodns/default.nix         |  6 ++---
 .../python-modules/aioredis/default.nix       |  2 +-
 .../python-modules/altair/default.nix         |  2 +-
 .../python-modules/aniso8601/default.nix      |  2 +-
 .../python-modules/apipkg/default.nix         |  6 ++---
 .../python-modules/avro/default.nix           |  2 +-
 .../python-modules/bcrypt/default.nix         | 12 ++++-----
 .../python-modules/beancount/default.nix      |  8 +++---
 .../python-modules/beanstalkc/default.nix     |  8 +++---
 .../python-modules/bedup/default.nix          |  2 +-
 .../python-modules/behave/default.nix         |  2 +-
 .../python-modules/binwalk/default.nix        |  2 +-
 .../bootstrapped-pip/default.nix              |  6 ++---
 .../python-modules/buildout-nix/default.nix   |  8 +++---
 .../python-modules/cadquery/default.nix       |  2 +-
 .../python-modules/capstone/default.nix       |  2 +-
 .../python-modules/cddb/default.nix           |  2 +-
 .../python-modules/cdecimal/default.nix       |  4 +--
 .../python-modules/cffi/default.nix           |  6 ++---
 .../python-modules/cheetah3/default.nix       |  8 +++---
 .../python-modules/cherrypy/17.nix            |  2 +-
 .../python-modules/cherrypy/default.nix       |  2 +-
 .../python-modules/cld2-cffi/default.nix      |  2 +-
 .../python-modules/cmd2/default.nix           |  6 ++---
 .../python-modules/codecov/default.nix        |  6 ++---
 .../python-modules/colorlover/default.nix     | 10 ++++---
 .../python-modules/construct/default.nix      |  2 +-
 .../python-modules/cot/default.nix            |  2 +-
 .../python-modules/cryptography/3.3.nix       |  8 +++---
 .../python-modules/cryptography/default.nix   |  8 +++---
 .../python-modules/csscompressor/default.nix  |  7 ++---
 .../python-modules/curtsies/default.nix       |  2 +-
 .../python-modules/dbf/default.nix            |  2 +-
 .../python-modules/demjson/default.nix        |  2 +-
 .../django-polymorphic/default.nix            |  6 ++---
 .../python-modules/django-raster/default.nix  |  2 +-
 pkgs/development/python-modules/django/2.nix  |  2 +-
 pkgs/development/python-modules/django/3.nix  |  2 +-
 .../python-modules/dufte/default.nix          |  2 +-
 .../python-modules/easydict/default.nix       |  6 ++---
 .../elasticsearch-dsl/default.nix             |  2 +-
 .../python-modules/enzyme/default.nix         |  6 ++---
 .../python-modules/etebase/default.nix        |  2 +-
 .../python-modules/fasteners/default.nix      |  2 +-
 .../python-modules/fire/default.nix           |  2 +-
 .../python-modules/flake8/default.nix         |  8 +++---
 .../python-modules/flask-migrate/default.nix  | 10 +++----
 .../python-modules/flask-testing/default.nix  |  2 +-
 .../python-modules/flatbuffers/default.nix    |  4 +--
 .../python-modules/funcsigs/default.nix       |  2 +-
 .../python-modules/gevent/default.nix         |  2 +-
 .../python-modules/glymur/default.nix         |  2 +-
 .../python-modules/goocalendar/default.nix    |  4 +--
 .../python-modules/grpcio/default.nix         |  6 ++---
 .../python-modules/gst-python/default.nix     |  9 +++----
 .../python-modules/gumath/default.nix         |  5 ++--
 .../python-modules/gyp/default.nix            |  2 +-
 .../python-modules/h5py/default.nix           | 21 +++++++--------
 .../python-modules/hg-evolve/default.nix      |  4 +--
 .../python-modules/hg-git/default.nix         |  4 +--
 .../python-modules/hidapi/default.nix         |  8 +++---
 .../python-modules/hoomd-blue/default.nix     |  4 +--
 .../python-modules/htmlmin/default.nix        |  7 ++---
 .../python-modules/httpretty/0.nix            |  6 ++---
 .../python-modules/httpretty/default.nix      |  6 ++---
 .../python-modules/hupper/default.nix         |  4 +--
 .../python-modules/imageio/default.nix        |  2 +-
 .../python-modules/influxgraph/default.nix    |  2 +-
 pkgs/development/python-modules/ipython/5.nix |  2 +-
 .../johnnycanencrypt/default.nix              |  7 ++---
 .../json-schema-for-humans/default.nix        |  4 +--
 .../python-modules/jsonpointer/default.nix    |  4 +--
 pkgs/development/python-modules/keyring/2.nix |  2 +-
 .../python-modules/keyrings-alt/default.nix   |  2 +-
 .../python-modules/kiwisolver/1_1.nix         |  2 +-
 .../python-modules/kiwisolver/default.nix     |  2 +-
 .../python-modules/koji/default.nix           |  8 +++---
 .../python-modules/latexcodec/default.nix     |  6 ++---
 .../python-modules/ledgerwallet/default.nix   |  2 +-
 .../python-modules/libevdev/default.nix       |  4 +--
 .../python-modules/libgpuarray/default.nix    |  2 +-
 .../python-modules/lightgbm/default.nix       |  4 +--
 .../python-modules/linode-api/default.nix     |  4 +--
 .../python-modules/livestreamer/default.nix   |  2 +-
 .../python-modules/llfuse/default.nix         | 14 +++++-----
 .../python-modules/llvmlite/default.nix       | 13 ++++-----
 .../python-modules/loguru/default.nix         |  4 +--
 .../python-modules/maestral/default.nix       |  8 +++---
 .../python-modules/magic-wormhole/default.nix |  2 +-
 .../python-modules/mailman-rss/default.nix    |  2 +-
 .../markdownsuperscript/default.nix           |  6 ++---
 .../python-modules/matplotlib/2.nix           | 19 +++++++------
 .../python-modules/matplotlib/default.nix     | 15 +++++------
 .../python-modules/mezzanine/default.nix      |  4 +--
 .../python-modules/mockito/default.nix        |  2 +-
 .../python-modules/modestmaps/default.nix     |  2 +-
 .../python-modules/monotonic/default.nix      |  4 +--
 .../python-modules/moviepy/default.nix        |  2 +-
 .../python-modules/mpi4py/default.nix         |  9 +++----
 .../python-modules/mxnet/default.nix          |  4 +--
 .../python-modules/ndtypes/default.nix        |  5 ++--
 .../python-modules/netaddr/default.nix        |  2 +-
 .../python-modules/nipy/default.nix           |  2 +-
 .../python-modules/notify/default.nix         |  2 +-
 .../python-modules/nuitka/default.nix         |  2 +-
 .../python-modules/numba/default.nix          | 13 ++++-----
 .../python-modules/omegaconf/default.nix      |  2 +-
 .../orderedmultidict/default.nix              |  2 +-
 .../python-modules/oset/default.nix           |  6 ++---
 .../python-modules/pamela/default.nix         |  4 +--
 pkgs/development/python-modules/pandas/2.nix  | 27 +++++++++----------
 .../python-modules/pandas/default.nix         | 18 +++++--------
 .../python-modules/parse-type/default.nix     |  2 +-
 .../python-modules/pbr/default.nix            |  6 ++---
 .../python-modules/pecan/default.nix          |  2 +-
 .../python-modules/peewee/default.nix         |  6 +++--
 .../python-modules/pgsanity/default.nix       |  4 +--
 .../python-modules/phonenumbers/default.nix   |  8 +++---
 .../python-modules/pickleshare/default.nix    |  2 +-
 pkgs/development/python-modules/pillow/6.nix  |  6 ++---
 .../python-modules/pillow/default.nix         |  6 ++---
 .../python-modules/pip-tools/default.nix      |  4 +--
 .../python-modules/plyvel/default.nix         |  2 +-
 .../python-modules/protobuf/default.nix       | 23 ++++++++--------
 .../python-modules/pulp/default.nix           |  2 +-
 .../python-modules/pwntools/default.nix       |  2 +-
 .../python-modules/py3exiv2/default.nix       | 12 ++++-----
 .../python-modules/pyannotate/default.nix     |  2 +-
 .../python-modules/pyatspi/default.nix        |  4 +--
 .../pybtex-docutils/default.nix               |  6 ++---
 .../python-modules/pybtex/default.nix         |  6 ++---
 .../python-modules/pycassa/default.nix        |  6 ++---
 .../python-modules/pycdio/default.nix         |  2 +-
 .../python-modules/pycryptodome/default.nix   |  6 ++---
 .../python-modules/pycuda/default.nix         |  4 +--
 .../python-modules/pydub/default.nix          |  2 +-
 .../python-modules/pyee/default.nix           |  2 +-
 .../python-modules/pyexiv2/default.nix        |  6 ++---
 .../python-modules/pyface/default.nix         |  4 +--
 .../python-modules/pyfakefs/default.nix       |  2 +-
 .../python-modules/pyfribidi/default.nix      |  7 ++---
 .../python-modules/pygal/default.nix          |  2 +-
 .../python-modules/pygobject/3.36.nix         |  4 +--
 .../python-modules/pygobject/3.nix            |  4 +--
 .../python-modules/pygobject/default.nix      | 10 +++----
 .../python-modules/pygtk/default.nix          |  8 +++---
 .../python-modules/pync/default.nix           |  2 +-
 .../python-modules/pynput/default.nix         |  2 +-
 .../python-modules/pyobjc/default.nix         |  8 +++---
 .../python-modules/pyopenssl/default.nix      | 17 +++++-------
 .../python-modules/pyparted/default.nix       |  2 +-
 .../python-modules/pypass/default.nix         | 16 +++++------
 pkgs/development/python-modules/pyqt/4.x.nix  | 14 +++++-----
 .../python-modules/pyscard/default.nix        | 17 +++++-------
 .../python-modules/pyscss/default.nix         |  4 +--
 .../python-modules/pyside/apiextractor.nix    |  8 +++---
 .../python-modules/pyside/generatorrunner.nix |  8 +++---
 .../python-modules/pyspotify/default.nix      |  2 +-
 .../python-modules/pysqlite/default.nix       |  2 +-
 .../python-modules/pytest-asyncio/default.nix |  2 +-
 pkgs/development/python-modules/pytest/4.nix  |  4 +--
 pkgs/development/python-modules/pytest/5.nix  |  2 +-
 .../python-modules/pytest/default.nix         |  2 +-
 .../python-engineio/default.nix               |  2 +-
 .../python-jsonrpc-server/default.nix         |  2 +-
 .../python-language-server/default.nix        | 22 +++++++--------
 .../python-modules/python-mapnik/default.nix  |  2 +-
 .../python-redis-lock/default.nix             |  2 +-
 .../python-xmp-toolkit/default.nix            |  2 +-
 .../python-modules/pythonocc-core/default.nix |  2 +-
 .../python-modules/pytorch/bin.nix            |  2 +-
 .../python-modules/pytorch/default.nix        |  2 +-
 .../python-modules/pyutil/default.nix         |  2 +-
 .../python-modules/rbtools/default.nix        |  4 +--
 .../python-modules/reikna/default.nix         | 12 ++++-----
 .../python-modules/rfc6555/default.nix        |  8 +++---
 .../python-modules/rich/default.nix           |  2 +-
 pkgs/development/python-modules/rsa/4_0.nix   |  2 +-
 .../python-modules/rsa/default.nix            |  2 +-
 .../python-modules/s3transfer/default.nix     |  8 +++---
 .../python-modules/scrapy/default.nix         |  2 +-
 .../python-modules/screeninfo/default.nix     |  2 +-
 .../python-modules/selenium/default.nix       |  2 +-
 .../python-modules/sentry-sdk/default.nix     |  2 +-
 .../python-modules/shapely/default.nix        |  2 +-
 .../python-modules/simplebayes/default.nix    |  2 +-
 .../python-modules/spacy/models.nix           |  6 ++---
 .../python-modules/stringtemplate/default.nix |  6 ++---
 .../development/python-modules/tables/3.5.nix | 16 +++++------
 .../python-modules/tables/default.nix         | 16 +++++------
 .../python-modules/tatsu/default.nix          |  4 +--
 .../python-modules/tensorflow/bin.nix         |  2 +-
 .../python-modules/tkinter/default.nix        |  5 ++--
 .../python-modules/todoist/default.nix        | 10 +++----
 .../python-modules/trackpy/default.nix        |  2 +-
 .../python-modules/transformers/default.nix   |  2 +-
 .../python-modules/trytond/default.nix        |  8 +++---
 .../python-modules/tumpa/default.nix          |  4 +--
 .../python-modules/twisted/default.nix        |  2 +-
 .../python-modules/unicorn/default.nix        |  2 +-
 .../python-modules/urllib3/default.nix        |  4 +--
 .../python-modules/watchdog/default.nix       |  2 +-
 .../python-modules/werkzeug/default.nix       |  2 +-
 .../python-modules/xcffib/default.nix         |  2 +-
 .../python-modules/xnd/default.nix            |  5 ++--
 .../python-modules/zconfig/default.nix        |  2 +-
 .../zope_lifecycleevent/default.nix           |  2 +-
 211 files changed, 525 insertions(+), 546 deletions(-)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 84f54fd7af6..64f5bb3ab65 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -16,12 +16,12 @@ let
     ++ [ "reimport_from_subinterpreter" ]
     # cython's testsuite is not working very well with libc++
     # We are however optimistic about things outside of testsuite still working
-    ++ stdenv.lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ]
+    ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ]
     # Some tests in the test suite isn't working on aarch64. Disable them for
     # now until upstream finds a workaround.
     # Upstream issue here: https://github.com/cython/cython/issues/2308
-    ++ stdenv.lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ]
-    ++ stdenv.lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ]
+    ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ]
+    ++ lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ]
   ;
 
 in buildPythonPackage rec {
@@ -55,7 +55,7 @@ in buildPythonPackage rec {
     export HOME="$NIX_BUILD_TOP"
     ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \
       --no-code-style \
-      ${stdenv.lib.optionalString (builtins.length excludedTests != 0)
+      ${lib.optionalString (builtins.length excludedTests != 0)
         ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
   '';
 
diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix
index 178b6a7b85c..be4bb9e31d3 100644
--- a/pkgs/development/python-modules/HTSeq/default.nix
+++ b/pkgs/development/python-modules/HTSeq/default.nix
@@ -13,9 +13,9 @@ buildPythonPackage rec {
   nativeBuildInputs = [ cython ];
   propagatedBuildInputs = [ numpy pysam matplotlib ];
 
-  checkPhase = stdenv.lib.optionalString isPy27 ''
+  checkPhase = lib.optionalString isPy27 ''
     ${python.interpreter} python2/test/test_general.py
-  '' + stdenv.lib.optionalString isPy3k ''
+  '' + lib.optionalString isPy3k ''
     ${python.interpreter} python3/test/test_general.py
   '';
 
diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index c2dd7460b13..e279100e9cc 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -40,8 +40,8 @@ let
     if stdenv.cc.isClang then "clang++" else
     throw "Unknown C++ compiler";
   cxx_compiler = wrapped cxx_compiler_name "\\$HOME/.theano"
-    (    stdenv.lib.optional cudaSupport libgpuarray_
-      ++ stdenv.lib.optional cudnnSupport cudnn );
+    (    lib.optional cudaSupport libgpuarray_
+      ++ lib.optional cudnnSupport cudnn );
 
   libgpuarray_ = libgpuarray.override { inherit cudaSupport cudatoolkit; };
 
@@ -60,10 +60,10 @@ in buildPythonPackage rec {
     substituteInPlace theano/configdefaults.py \
       --replace 'StrParam(param, is_valid=warn_cxx)' 'StrParam('\'''${cxx_compiler}'\''', is_valid=warn_cxx)' \
       --replace 'rc == 0 and config.cxx != ""' 'config.cxx != ""'
-  '' + stdenv.lib.optionalString cudaSupport ''
+  '' + lib.optionalString cudaSupport ''
     substituteInPlace theano/configdefaults.py \
       --replace 'StrParam(get_cuda_root)' 'StrParam('\'''${cudatoolkit}'\''')'
-  '' + stdenv.lib.optionalString cudnnSupport ''
+  '' + lib.optionalString cudnnSupport ''
     substituteInPlace theano/configdefaults.py \
       --replace 'StrParam(default_dnn_base_path)' 'StrParam('\'''${cudnn}'\''')'
   '';
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index 32b26a5e035..f21d8f4195a 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "aenum";
@@ -22,10 +22,10 @@ buildPythonPackage rec {
   runHook postCheck
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
-    maintainers = with stdenv.lib.maintainers; [ vrthra ];
-    license = with stdenv.lib.licenses; [ bsd3 ];
+    maintainers = with maintainers; [ vrthra ];
+    license = licenses.bsd3;
     homepage = "https://github.com/ethanfurman/aenum";
   };
 }
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index e1130331365..4ba4bd59af2 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -10,9 +10,9 @@ buildPythonPackage rec {
     sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d";
   };
 
-  propagatedBuildInputs = with stdenv.lib; [ pycares ]
-    ++ optional (pythonOlder "3.7") typing
-    ++ optional (isPy27 || isPyPy) trollius;
+  propagatedBuildInputs = [ pycares ]
+    ++ lib.optional (pythonOlder "3.7") typing
+    ++ lib.optional (isPy27 || isPyPy) trollius;
 
   checkPhase = ''
     ${python.interpreter} tests.py
diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix
index 2e59168157b..94f503fe2cc 100644
--- a/pkgs/development/python-modules/aioredis/default.nix
+++ b/pkgs/development/python-modules/aioredis/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     async-timeout
-  ] ++ stdenv.lib.optional (!isPyPy) hiredis;
+  ] ++ lib.optional (!isPyPy) hiredis;
 
   # Wants to run redis-server, hardcoded FHS paths, too much trouble.
   doCheck = false;
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 018ac7ddf50..a3b515ebeca 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     pandas
     six
     toolz
-  ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+  ] ++ lib.optionals (pythonOlder "3.5") [ typing ];
 
   checkInputs = [
     glibcLocales
diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
index c6c05283f28..804402a4ca6 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ dateutil ];
 
-  checkInputs = stdenv.lib.optional (!isPy3k) mock;
+  checkInputs = lib.optional (!isPy3k) mock;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index 88535bb7cf1..604c37b42ba 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -22,13 +22,13 @@ buildPythonPackage rec {
   # Failing tests on Python 3
   # https://github.com/pytest-dev/apipkg/issues/17
   checkPhase = let
-    disabledTests = stdenv.lib.optionals isPy3k [
+    disabledTests = lib.optionals isPy3k [
       "test_error_loading_one_element"
       "test_aliasmodule_proxy_methods"
       "test_eagerload_on_bython"
     ];
-    testExpression = stdenv.lib.optionalString (disabledTests != [])
-    "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'";
+    testExpression = lib.optionalString (disabledTests != [])
+    "-k 'not ${lib.concatStringsSep " and not " disabledTests}'";
   in ''
     py.test ${testExpression}
   '';
diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix
index 6f7b8b9c6c1..35cab724a86 100644
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   patchPhase = ''
     # this test requires network access
     sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py
-  '' + (stdenv.lib.optionalString isPy3k ''
+  '' + (lib.optionalString isPy3k ''
     # these files require twisted, which is not python3 compatible
     rm avro/txipc.py
     rm avro/test/txsample*
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index dc50c56018e..e74b0934b30 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder
+{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder
 , cffi, pycparser, mock, pytest, py, six }:
 
-with stdenv.lib;
-
 buildPythonPackage rec {
   version = "3.2.0";
   pname = "bcrypt";
@@ -12,10 +10,12 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29";
   };
-  buildInputs = [ pycparser mock pytest py ];
-  propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;
 
-  meta = {
+  buildInputs = [ pycparser mock pytest py ];
+
+  propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi;
+
+  meta = with lib; {
     maintainers = with maintainers; [ domenkozar ];
     description = "Modern password hashing for your software and your servers";
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index f1dc7a5349d..fa97c7c97a9 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
 , beautifulsoup4, bottle, chardet, dateutil
 , google_api_python_client, lxml, oauth2client
 , ply, python_magic, pytest, requests }:
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     pytest
   ];
 
-  meta = {
+  meta = with lib; {
     homepage = "http://furius.ca/beancount/";
     description = "Double-entry bookkeeping computer language";
     longDescription = ''
@@ -41,8 +41,8 @@ buildPythonPackage rec {
         financial transaction records in a text file, read them in memory,
         generate a variety of reports from them, and provides a web interface.
     '';
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ];
   };
 }
 
diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix
index c24e9a03d15..a74f6c6f8f2 100644
--- a/pkgs/development/python-modules/beanstalkc/default.nix
+++ b/pkgs/development/python-modules/beanstalkc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "beanstalkc";
@@ -13,10 +13,10 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "A simple beanstalkd client library for Python";
-    maintainers = with stdenv.lib.maintainers; [ aanderse ];
-    license = with stdenv.lib.licenses; [ asl20 ];
+    maintainers = with maintainers; [ aanderse ];
+    license = licenses.asl20;
     homepage = "https://github.com/earl/beanstalkc";
   };
 }
diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix
index 0e339dca097..f38d4263c24 100644
--- a/pkgs/development/python-modules/bedup/default.nix
+++ b/pkgs/development/python-modules/bedup/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   buildInputs = [ btrfs-progs ];
   propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ]
-    ++ stdenv.lib.optionals (!isPyPy) [ cffi ];
+    ++ lib.optionals (!isPyPy) [ cffi ];
 
   meta = with lib; {
     description = "Deduplication for Btrfs";
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 56217dca617..43c74fc9571 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -26,7 +26,7 @@ buildPythonApplication rec {
 
   # timing-based test flaky on Darwin
   # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ];
+  disabledTests = lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ];
 
   postCheck = ''
     export LANG="en_US.UTF-8"
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index 3d1b9c0a90c..c2f059dd93d 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage {
   };
 
   propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ]
-  ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
+  ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
 
   # setup.py only installs version.py during install, not test
   postPatch = ''
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 690c88b83f4..5a6333d656a 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, makeWrapper, unzip, makeSetupHook
+{ lib, stdenv, python, fetchPypi, makeWrapper, unzip, makeSetupHook
 , pipInstallHook
 , setuptoolsBuildHook
 , wheel, pip, setuptools
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ":";
 
-  installPhase = stdenv.lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
+  installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
     export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
   '' + ''
     # Give folders a known name
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Version of pip used for bootstrapping";
-    license = stdenv.lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license);
+    license = lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license);
     homepage = pip.meta.homepage;
   };
 }
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index cf8b1382301..7f7afd67e7e 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -1,4 +1,4 @@
-{ fetchPypi, stdenv, buildPythonPackage }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "zc.buildout";
@@ -13,10 +13,10 @@ buildPythonPackage rec {
 
   postInstall = "mv $out/bin/buildout{,-nix}";
 
-  meta = {
+  meta = with lib; {
     homepage = "http://www.buildout.org";
     description = "A software build and configuration system";
-    license = stdenv.lib.licenses.zpl21;
-    maintainers = [ stdenv.lib.maintainers.goibhniu ];
+    license = licenses.zpl21;
+    maintainers = [ maintainers.goibhniu ];
   };
 }
diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix
index e1566baff6b..72334390bc3 100644
--- a/pkgs/development/python-modules/cadquery/default.nix
+++ b/pkgs/development/python-modules/cadquery/default.nix
@@ -48,7 +48,7 @@ let
       libGL
       libGLU
       libX11
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+    ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
     propagatedBuildInputs = [
       six
diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix
index 7d5e416a9c5..d7df0bee5ca 100644
--- a/pkgs/development/python-modules/capstone/default.nix
+++ b/pkgs/development/python-modules/capstone/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "capstone";
-  version = stdenv.lib.getVersion capstone;
+  version = lib.getVersion capstone;
 
   src = capstone.src;
   sourceRoot = "${capstone.name}/bindings/python";
diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix
index 0956a971ebd..55d659376c6 100644
--- a/pkgs/development/python-modules/cddb/default.nix
+++ b/pkgs/development/python-modules/cddb/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
   version = "1.4";
   disabled = isPy3k;
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
+  buildInputs = lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
 
   src = pkgs.fetchurl {
     url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz";
diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix
index f788d32520e..cf889050590 100644
--- a/pkgs/development/python-modules/cdecimal/default.nix
+++ b/pkgs/development/python-modules/cdecimal/default.nix
@@ -1,6 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k }:
-
-with stdenv.lib;
+{ lib, buildPythonPackage, fetchurl, isPy3k }:
 
 buildPythonPackage rec {
   pname = "cdecimal";
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 55390ea5ff9..3dcd6a996cb 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -17,7 +17,7 @@ if isPyPy then null else buildPythonPackage rec {
   # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global
   # impure search path. It's obnoxious how much repetition there is, and how difficult
   # it is to get it to search somewhere else (since we do actually have a libm symlink in libSystem)
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace testing/cffi0/test_parsing.py \
       --replace 'lib_m = "m"' 'lib_m = "System"' \
       --replace '"libm" in name' '"libSystem" in name'
@@ -29,7 +29,7 @@ if isPyPy then null else buildPythonPackage rec {
   '';
 
   # The tests use -Werror but with python3.6 clang detects some unreachable code.
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
     "-Wno-unused-command-line-argument -Wno-unreachable-code";
 
   doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate
@@ -40,7 +40,7 @@ if isPyPy then null else buildPythonPackage rec {
   meta = with lib; {
     maintainers = with maintainers; [ domenkozar lnl7 ];
     homepage = "https://cffi.readthedocs.org/";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     description = "Foreign Function Interface for Python calling C code";
   };
 }
diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index e4fd549445a..a705bffa810 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, stdenv }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "Cheetah3";
@@ -11,10 +11,10 @@ buildPythonPackage rec {
 
   doCheck = false; # Circular dependency
 
-  meta = {
+  meta = with lib; {
     homepage = "http://www.cheetahtemplate.org/";
     description = "A template engine and code generation tool";
-    license = lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ pjjw ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ pjjw ];
   };
 }
diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix
index 9982db19f38..2ee8eb3bd0c 100644
--- a/pkgs/development/python-modules/cherrypy/17.nix
+++ b/pkgs/development/python-modules/cherrypy/17.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"}
+    pytest ${lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 76fd780e523..8a915d520e5 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
       -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \
       --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
       --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
-      ${stdenv.lib.optionalString stdenv.isDarwin
+      ${lib.optionalString stdenv.isDarwin
         "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"}
   '';
 
diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix
index df28bcdf3aa..fc5a6b0e54b 100644
--- a/pkgs/development/python-modules/cld2-cffi/default.nix
+++ b/pkgs/development/python-modules/cld2-cffi/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
 
   # gcc doesn't approve of this code, so disable -Werror
-  NIX_CFLAGS_COMPILE = "-w" + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing";
+  NIX_CFLAGS_COMPILE = "-w" + lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing";
 
   checkPhase = "nosetests -v";
 
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index be4e64f760e..bafdb9cb95d 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   LC_ALL="en_US.UTF-8";
 
-  postPatch = stdenv.lib.optional stdenv.isDarwin ''
+  postPatch = lib.optional stdenv.isDarwin ''
     # Fake the impure dependencies pbpaste and pbcopy
     mkdir bin
     echo '#!${stdenv.shell}' > bin/pbpaste
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     wcwidth
     attrs
   ]
-  ++ stdenv.lib.optionals (pythonOlder "3.5") [contextlib2 typing]
+  ++ lib.optionals (pythonOlder "3.5") [contextlib2 typing]
   ;
 
 
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   # pytest-cov
   # argcomplete  will generate errors
   checkInputs= [ pytest mock which vim glibcLocales pytest-mock ]
-        ++ stdenv.lib.optional (pythonOlder "3.6") [ mock ];
+        ++ lib.optional (pythonOlder "3.6") [ mock ];
   checkPhase = ''
     # test_path_completion_user_expansion might be fixed in the next release
     py.test -k 'not test_path_completion_user_expansion'
diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix
index 455888c447d..924422bf7d4 100644
--- a/pkgs/development/python-modules/codecov/default.nix
+++ b/pkgs/development/python-modules/codecov/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }:
+{ lib, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }:
 
 buildPythonPackage rec {
   pname = "codecov";
@@ -20,9 +20,9 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Python report uploader for Codecov";
     homepage = "https://codecov.io/";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix
index 6aea26e8936..70dd66e8f81 100644
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/pkgs/development/python-modules/colorlover/default.nix
@@ -1,4 +1,6 @@
-{ buildPythonPackage, fetchPypi, stdenv
+{ lib
+, buildPythonPackage
+, fetchPypi
 }:
 
 buildPythonPackage rec {
@@ -13,10 +15,10 @@ buildPythonPackage rec {
   # no tests included in distributed archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/jackparmer/colorlover";
     description = "Color scales in Python for humans";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ globin ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ globin ];
   };
 }
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index bb334f11c75..8d0c83ca9e8 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ];
 
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
+  disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
 
   pytestFlagsArray = [ "--benchmark-disable" ];
 
diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix
index 0c2bb961290..a6de8321dc0 100644
--- a/pkgs/development/python-modules/cot/default.nix
+++ b/pkgs/development/python-modules/cot/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ]
-  ++ stdenv.lib.optional (pythonOlder "3.3") psutil;
+  ++ lib.optional (pythonOlder "3.3") psutil;
 
   checkInputs = [ mock pytestCheckHook pytest-mock qemu ];
 
diff --git a/pkgs/development/python-modules/cryptography/3.3.nix b/pkgs/development/python-modules/cryptography/3.3.nix
index a9531824158..b6972e6d56b 100644
--- a/pkgs/development/python-modules/cryptography/3.3.nix
+++ b/pkgs/development/python-modules/cryptography/3.3.nix
@@ -33,18 +33,18 @@ buildPythonPackage rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [
+  nativeBuildInputs = lib.optionals (!isPyPy) [
     cffi
   ];
 
   buildInputs = [ openssl ]
-             ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+             ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
   propagatedBuildInputs = [
     packaging
     six
-  ] ++ stdenv.lib.optionals (!isPyPy) [
+  ] ++ lib.optionals (!isPyPy) [
     cffi
-  ] ++ stdenv.lib.optionals isPy27 [
+  ] ++ lib.optionals isPy27 [
     ipaddress enum34
   ];
 
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index bae494989c7..ad402efd759 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -31,18 +31,18 @@ buildPythonPackage rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [
+  nativeBuildInputs = lib.optionals (!isPyPy) [
     cffi
   ];
 
   buildInputs = [ openssl ]
-             ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+             ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
   propagatedBuildInputs = [
     packaging
     six
-  ] ++ stdenv.lib.optionals (!isPyPy) [
+  ] ++ lib.optionals (!isPyPy) [
     cffi
-  ] ++ stdenv.lib.optionals isPy27 [
+  ] ++ lib.optionals isPy27 [
     ipaddress enum34
   ];
 
diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix
index a7256a54e3b..b3d08c12e62 100644
--- a/pkgs/development/python-modules/csscompressor/default.nix
+++ b/pkgs/development/python-modules/csscompressor/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
+
 buildPythonPackage rec {
   pname = "csscompressor";
   version = "0.9.5";
@@ -10,10 +11,10 @@ buildPythonPackage rec {
 
   doCheck = false; # No tests
 
-  meta = {
+  meta = with lib; {
     description = "A python port of YUI CSS Compressor";
     homepage = "https://pypi.python.org/pypi/csscompressor";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     maintainers = [];
   };
 }
diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix
index f860f2ae5eb..4c4c7dbe231 100644
--- a/pkgs/development/python-modules/curtsies/default.nix
+++ b/pkgs/development/python-modules/curtsies/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [ blessings wcwidth ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+    ++ lib.optionals (pythonOlder "3.5") [ typing ];
 
   checkInputs = [ mock pyte nose ];
 
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index 348f91ea683..b9c264a2015 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
       sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a";
     };
 
-    propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+    propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34;
 
     doCheck = !isPy3k;
     # tests are not yet ported.
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index 988c2815da8..fc70562938e 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
   };
 
-  checkPhase = stdenv.lib.optionalString isPy3k ''
+  checkPhase = lib.optionalString isPy3k ''
     ${python.interpreter} -m lib2to3 -w test/test_demjson.py
   '' + ''
     ${python.interpreter} test/test_demjson.py
diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index c08facd3650..b3b71231b75 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }:
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
@@ -19,9 +19,9 @@ buildPythonPackage rec {
     ${python.interpreter} runtests.py
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/django-polymorphic/django-polymorphic";
     description = "Improved Django model inheritance with automatic downcasting";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index a3aed647a33..173452ebe48 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -2,7 +2,7 @@
   numpy, django_colorful, pillow, psycopg2,
   pyparsing, django, celery, boto3, importlib-metadata
 }:
-if stdenv.lib.versionOlder django.version "2.0"
+if lib.versionOlder django.version "2.0"
 then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2."
 else
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix
index 641ec02aae0..eac48593de2 100644
--- a/pkgs/development/python-modules/django/2.nix
+++ b/pkgs/development/python-modules/django/2.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861";
   };
 
-  patches = stdenv.lib.optional withGdal
+  patches = lib.optional withGdal
     (substituteAll {
       src = ./1.10-gis-libs.template.patch;
       geos = geos;
diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix
index 2ea5b5a006c..2444146e837 100644
--- a/pkgs/development/python-modules/django/3.nix
+++ b/pkgs/development/python-modules/django/3.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     sha256 = "2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7";
   };
 
-  patches = stdenv.lib.optional withGdal
+  patches = lib.optional withGdal
     (substituteAll {
       src = ./django_3_set_geos_gdal_lib.patch;
       geos = geos;
diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index 7836c8aa60a..d8435afa3f9 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     matplotlib
     numpy
-  ] ++ stdenv.lib.optionals (pythonOlder "3.8") [
+  ] ++ lib.optionals (pythonOlder "3.8") [
     importlib-metadata
   ];
 
diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix
index d8dbb045ddc..e1898d3fc9e 100644
--- a/pkgs/development/python-modules/easydict/default.nix
+++ b/pkgs/development/python-modules/easydict/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "easydict";
@@ -11,9 +11,9 @@ buildPythonPackage rec {
 
   docheck = false; # No tests in archive
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/makinacorpus/easydict";
-    license = with stdenv.lib; licenses.lgpl3;
+    license = licenses.lgpl3;
     description = "Access dict values as attributes (works recursively)";
   };
 }
diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index 44188902591..67e277b57ac 100644
--- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ elasticsearch python-dateutil six ]
-                          ++ stdenv.lib.optional (!isPy3k) ipaddress;
+                          ++ lib.optional (!isPy3k) ipaddress;
 
   # ImportError: No module named test_elasticsearch_dsl
   # Tests require a local instance of elasticsearch
diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix
index 110575464cb..ee547ad9b7b 100644
--- a/pkgs/development/python-modules/enzyme/default.nix
+++ b/pkgs/development/python-modules/enzyme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "enzyme";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
     sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/Diaoul/enzyme";
-    license = with stdenv.lib; licenses.asl20;
+    license = licenses.asl20;
     description = "Python video metadata parser";
   };
 }
diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index c0f9125a8d7..7832f6b4787 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     wheel
   ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
   propagatedBuildInputs = [
     python
diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix
index b81ebb4faa0..57ad69c0be4 100644
--- a/pkgs/development/python-modules/fasteners/default.nix
+++ b/pkgs/development/python-modules/fasteners/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six monotonic ];
 
-  checkInputs = [ testtools nose ] ++ stdenv.lib.optionals (!isPy3k) [ futures ];
+  checkInputs = [ testtools nose ] ++ lib.optionals (!isPy3k) [ futures ];
 
   checkPhase = ''
     nosetests
diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix
index 5a14f772546..6a2cc594360 100644
--- a/pkgs/development/python-modules/fire/default.nix
+++ b/pkgs/development/python-modules/fire/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0s5r6l39ck2scks54hmwwdf4lcihqqnqzjfx9lz2b67vxkajpwmc";
   };
 
-  propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34;
+  propagatedBuildInputs = [ six termcolor ] ++ lib.optional isPy27 enum34;
 
   checkInputs = [ hypothesis mock python-Levenshtein pytest ];
 
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index 33459b7c66b..9e53ed28ff3 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -14,10 +14,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest mock pytestrunner ];
   propagatedBuildInputs = [ pyflakes pycodestyle mccabe ]
-    ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ]
-    ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]
-    ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+    ++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ]
+    ++ lib.optionals (pythonOlder "3.4") [ enum34 ]
+    ++ lib.optionals (pythonOlder "3.5") [ typing ]
+    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   # fixtures fail to initialize correctly
   checkPhase = ''
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index 24ed04437a0..4d50ade30e1 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }:
-
-with stdenv.lib;
+{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }:
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
@@ -11,15 +9,15 @@ buildPythonPackage rec {
     sha256 = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee";
   };
 
-  checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales;
+  checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales;
   propagatedBuildInputs = [ flask flask_sqlalchemy alembic ];
 
   # tests invoke the flask cli which uses click and therefore has py3k encoding troubles
-  preCheck = optionalString isPy3k ''
+  preCheck = lib.optionalString isPy3k ''
     export LANG="en_US.UTF-8"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "SQLAlchemy database migrations for Flask applications using Alembic";
     license = licenses.mit;
     homepage = "https://github.com/miguelgrinberg/Flask-Migrate";
diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix
index 9f4d66335de..6cfcffdb7be 100644
--- a/pkgs/development/python-modules/flask-testing/default.nix
+++ b/pkgs/development/python-modules/flask-testing/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ flask ];
 
-  checkInputs = [ blinker ] ++ stdenv.lib.optionals (!isPy3k) [ twill ];
+  checkInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ twill ];
 
   # twill integration is outdated in Python 2, hence it the tests fails.
   # Some of the tests use localhost networking on darwin.
diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix
index d06ea28b334..f697f7b8ae0 100644
--- a/pkgs/development/python-modules/flatbuffers/default.nix
+++ b/pkgs/development/python-modules/flatbuffers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , flatbuffers
 }:
@@ -16,6 +16,6 @@ buildPythonPackage rec {
 
   meta = flatbuffers.meta // {
     description = "Python runtime library for use with the Flatbuffers serialization format";
-    maintainers = with stdenv.lib.maintainers; [ wulfsta ];
+    maintainers = with lib.maintainers; [ wulfsta ];
   };
 }
diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
index aaa49254ecc..1464baa57df 100644
--- a/pkgs/development/python-modules/funcsigs/default.nix
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   buildInputs = [ unittest2 ];
 
   # https://github.com/testing-cabal/funcsigs/issues/10
-  patches = stdenv.lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ];
+  patches = lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ];
 
   meta = with lib; {
     description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index ba80a928f25..0fcf6cdfaaa 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   buildInputs = [ libev ];
   propagatedBuildInputs = [
     zope_interface
-  ] ++ stdenv.lib.optionals (!isPyPy) [ greenlet ];
+  ] ++ lib.optionals (!isPyPy) [ greenlet ];
 
   checkPhase = ''
     cd greentest
diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix
index f8a0e463238..50ed257f57e 100644
--- a/pkgs/development/python-modules/glymur/default.nix
+++ b/pkgs/development/python-modules/glymur/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     numpy
-  ] ++ stdenv.lib.optional isPy27 [ contextlib2 mock importlib-resources ];
+  ] ++ lib.optional isPy27 [ contextlib2 mock importlib-resources ];
 
   checkInputs = [
     scikitimage
diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix
index 85744d29593..b0eea600384 100644
--- a/pkgs/development/python-modules/goocalendar/default.nix
+++ b/pkgs/development/python-modules/goocalendar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , pkg-config
@@ -10,8 +10,6 @@
 , isPy3k
  }:
 
-with stdenv.lib;
-
 buildPythonPackage rec {
   pname = "GooCalendar";
   version = "0.7.1";
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 6288828cd1b..1b1ffb975fb 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -21,13 +21,13 @@ buildPythonPackage rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ cython pkg-config ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
+    ++ lib.optional stdenv.isDarwin darwin.cctools;
 
   buildInputs = [ c-ares openssl zlib ];
   propagatedBuildInputs = [ six protobuf ]
-    ++ stdenv.lib.optionals (isPy27) [ enum34 futures ];
+    ++ lib.optionals (isPy27) [ enum34 futures ];
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR";
+  preBuild = lib.optionalString stdenv.isDarwin "unset AR";
 
   GRPC_BUILD_WITH_BORING_SSL_ASM = "";
   GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1;
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 30c26b19c08..9ff8434cc9a 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -1,4 +1,5 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchurl
 , meson
 , ninja
@@ -51,11 +52,9 @@ buildPythonPackage rec {
   # https://github.com/NixOS/nixpkgs/issues/47390
   installCheckPhase = "meson test --print-errorlogs";
 
-  meta = {
+  meta = with lib; {
     homepage = "https://gstreamer.freedesktop.org";
-
     description = "Python bindings for GStreamer";
-
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
   };
 }
diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix
index ccf1627d7f3..601aecdf331 100644
--- a/pkgs/development/python-modules/gumath/default.nix
+++ b/pkgs/development/python-modules/gumath/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , python
 , numba
@@ -28,7 +29,7 @@ buildPythonPackage {
                 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]'
   '';
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so
   '';
 
diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix
index b08814d4bd1..5be56c81257 100644
--- a/pkgs/development/python-modules/gyp/default.nix
+++ b/pkgs/development/python-modules/gyp/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage {
     sha256 = "0r9phq5yrmj968vdvy9vivli35wn1j9a6iwshp69wl7q4p0x8q2b";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     ./no-darwin-cflags.patch
     ./no-xcode.patch
   ];
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index a9ebdc5dfe8..c167e2115c6 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder
+{ lib, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder
 , numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch
 , mpi4py ? null, openssh, pytestCheckHook, cached-property }:
 
 assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
 
-with stdenv.lib;
-
 let
   mpi = hdf5.mpi;
   mpiSupport = hdf5.mpiSupport;
@@ -31,27 +29,26 @@ in buildPythonPackage rec {
   postConfigure = ''
     # Needed to run the tests reliably. See:
     # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30
-    ${optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"}
+    ${lib.optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"}
   '';
 
   preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
 
   # tests now require pytest-mpi, which isn't available and difficult to package
   doCheck = false;
-  checkInputs = optional isPy27 unittest2 ++ [ pytestCheckHook openssh ];
+  checkInputs = lib.optional isPy27 unittest2 ++ [ pytestCheckHook openssh ];
   nativeBuildInputs = [ pkgconfig cython ];
   buildInputs = [ hdf5 ]
-    ++ optional mpiSupport mpi;
+    ++ lib.optional mpiSupport mpi;
   propagatedBuildInputs = [ numpy six]
-    ++ optionals mpiSupport [ mpi4py openssh ]
-    ++ optionals (pythonOlder "3.8") [ cached-property ];
+    ++ lib.optionals mpiSupport [ mpi4py openssh ]
+    ++ lib.optionals (pythonOlder "3.8") [ cached-property ];
 
   pythonImportsCheck = [ "h5py" ];
 
-  meta = {
-    description =
-      "Pythonic interface to the HDF5 binary data format";
+  meta = with lib; {
+    description = "Pythonic interface to the HDF5 binary data format";
     homepage = "http://www.h5py.org/";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
   };
 }
diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix
index bcc93ba10cb..38a770e879f 100644
--- a/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/pkgs/development/python-modules/hg-evolve/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -19,6 +19,6 @@ buildPythonPackage rec {
     description = "Enables the “changeset evolution” feature of Mercurial core";
     homepage = "https://www.mercurial-scm.org/doc/evolution/";
     maintainers = with maintainers; [ xavierzwirtz ];
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix
index fd321493b09..1d8e1ec1e29 100644
--- a/pkgs/development/python-modules/hg-git/default.nix
+++ b/pkgs/development/python-modules/hg-git/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , dulwich
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Push and pull from a Git server using Mercurial";
     homepage = "http://hg-git.github.com/";
     maintainers = with maintainers; [ koral ];
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
   };
 
 }
diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index c5ee1c20839..790e7aa08fc 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -10,16 +10,16 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs =
-    stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++
-    stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++
+    lib.optionals stdenv.isLinux [ libusb1 udev ] ++
+    lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++
     [ cython ];
 
   # Fix the USB backend library lookup
-  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
+  postPatch = lib.optionalString stdenv.isLinux ''
     libusb=${libusb1.dev}/include/libusb-1.0
     test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
     sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py --replace 'macos_sdk_path =' 'macos_sdk_path = "" #'
   '';
 
diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix
index edb647a3fc6..f726340b7c8 100644
--- a/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/pkgs/development/python-modules/hoomd-blue/default.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = stdenv.lib.optionals withMPI [ mpi ];
+  buildInputs = lib.optionals withMPI [ mpi ];
   propagatedBuildInputs = [ python.pkgs.numpy ]
-   ++ stdenv.lib.optionals withMPI [ python.pkgs.mpi4py ];
+   ++ lib.optionals withMPI [ python.pkgs.mpi4py ];
 
   dontAddPrefix = true;
   cmakeFlags = [
diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix
index ccbc157837c..e91aedc6cdb 100644
--- a/pkgs/development/python-modules/htmlmin/default.nix
+++ b/pkgs/development/python-modules/htmlmin/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
+
 buildPythonPackage rec {
   pname = "htmlmin";
   version = "0.1.12";
@@ -10,10 +11,10 @@ buildPythonPackage rec {
   # Tests run fine in a normal source checkout, but not when being built by nix.
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "A configurable HTML Minifier with safety features";
     homepage = "https://pypi.python.org/pypi/htmlmin";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     maintainers = [];
   };
 }
diff --git a/pkgs/development/python-modules/httpretty/0.nix b/pkgs/development/python-modules/httpretty/0.nix
index 436bbd97fd2..92ed5c6616e 100644
--- a/pkgs/development/python-modules/httpretty/0.nix
+++ b/pkgs/development/python-modules/httpretty/0.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , tornado
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   # drop this for version > 0.9.7
   # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
-  doCheck = stdenv.lib.versionAtLeast version "0.9.8";
+  doCheck = lib.versionAtLeast version "0.9.8";
 
   src = fetchPypi {
     inherit pname version;
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   # Those flaky tests are failing intermittently on all platforms
-  NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
+  NOSE_EXCLUDE = lib.concatStringsSep "," [
     "tests.functional.test_httplib2.test_callback_response"
     "tests.functional.test_requests.test_streaming_responses"
     "tests.functional.test_httplib2.test_callback_response"
diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index 93cf6a0927f..8974672d0a9 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , tornado
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   # drop this for version > 0.9.7
   # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
-  doCheck = stdenv.lib.versionAtLeast version "0.9.8";
+  doCheck = lib.versionAtLeast version "0.9.8";
 
   src = fetchPypi {
     inherit pname version;
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   # Those flaky tests are failing intermittently on all platforms
-  NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
+  NOSE_EXCLUDE = lib.concatStringsSep "," [
     "tests.functional.test_httplib2.test_callback_response"
     "tests.functional.test_requests.test_streaming_responses"
     "tests.functional.test_httplib2.test_callback_response"
diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index b70202138d4..1fe5ab7153d 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, watchdog, mock
 }:
 
@@ -17,5 +17,5 @@ buildPythonPackage rec {
 
   # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent
   # segfaults in the testsuite that end up failing the tests in a background thread (in myapp)
-  checkInputs = [ pytest pytestcov mock ] ++ stdenv.lib.optional (!stdenv.isDarwin) watchdog;
+  checkInputs = [ pytest pytestcov mock ] ++ lib.optional (!stdenv.isDarwin) watchdog;
 }
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index e63678a524a..71f7eae9c32 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     inherit pname version;
   };
 
-  checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
+  checkInputs = [ pytest psutil ] ++ lib.optionals isPy3k [
     imageio-ffmpeg ffmpeg_3
     ];
   propagatedBuildInputs = [ numpy pillow ];
diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix
index 982b3fb8db5..32374453375 100644
--- a/pkgs/development/python-modules/influxgraph/default.nix
+++ b/pkgs/development/python-modules/influxgraph/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy";
   };
 
-  patchPhase = stdenv.lib.optionalString isPy3k ''
+  patchPhase = lib.optionalString isPy3k ''
     sed 's/python-memcached/python3-memcached/' \
       -i ./influxgraph.egg-info/requires.txt    \
       -i ./setup.py
diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
index 598e890bb1c..a75ceaa0b76 100644
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906";
   };
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py --replace "'gnureadline'" " "
   '';
 
diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix
index 407bb44d8b2..f0ee4a6bd99 100644
--- a/pkgs/development/python-modules/johnnycanencrypt/default.nix
+++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , rustPlatform
 , fetchFromGitHub
 , pipInstallHook
@@ -49,7 +50,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     pcsclite
     nettle
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ PCSC ];
+  ] ++ lib.optionals stdenv.isDarwin [ PCSC ];
 
   # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
   doCheck = false;
@@ -83,7 +84,7 @@ rustPlatform.buildRustPackage rec {
 
   pythonImportsCheck = [ "johnnycanencrypt" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kushaldas/johnnycanencrypt";
     description = "Python module for OpenPGP written in Rust";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix
index 2ab2b2f1874..4e762e456ce 100644
--- a/pkgs/development/python-modules/json-schema-for-humans/default.nix
+++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , pbr, click, dataclasses-json, htmlmin, jinja2, markdown2, pygments, pytz, pyyaml, requests, pytestCheckHook, beautifulsoup4, tox
 }:
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   checkInputs = [ pytestCheckHook beautifulsoup4 ];
   pytestFlagsArray = [ "--ignore tests/generate_test.py" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Quickly generate HTML documentation from a JSON schema";
     homepage    = "https://github.com/coveooss/json-schema-for-humans";
     license     = licenses.asl20;
diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix
index e2f22ec8638..e1eaaed6c17 100644
--- a/pkgs/development/python-modules/jsonpointer/default.nix
+++ b/pkgs/development/python-modules/jsonpointer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Resolve JSON Pointers in Python";
     homepage = "https://github.com/stefankoegl/python-json-pointer";
-    license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi"
+    license = licenses.bsd2; # "Modified BSD license, says pypi"
   };
 
 }
diff --git a/pkgs/development/python-modules/keyring/2.nix b/pkgs/development/python-modules/keyring/2.nix
index 1dc7eb0a8f9..ee3b42b9bb8 100644
--- a/pkgs/development/python-modules/keyring/2.nix
+++ b/pkgs/development/python-modules/keyring/2.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytest-flake8 ];
 
-  propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
+  propagatedBuildInputs = [ dbus-python entrypoints ] ++ lib.optional stdenv.isLinux secretstorage;
 
   doCheck = !stdenv.isDarwin;
 
diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index 0b642d0d4f1..bc20ff4e374 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools_scm toml ];
   propagatedBuildInputs = [ six ];
 
-  checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock;
+  checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock;
 
   # heavily relies on importing tests from keyring package
   doCheck = false;
diff --git a/pkgs/development/python-modules/kiwisolver/1_1.nix b/pkgs/development/python-modules/kiwisolver/1_1.nix
index f4621c9c54d..0702e3518e0 100644
--- a/pkgs/development/python-modules/kiwisolver/1_1.nix
+++ b/pkgs/development/python-modules/kiwisolver/1_1.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   # Does not include tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix
index a24e7300538..d4d62787092 100644
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   nativeBuildInputs = [
     cppy
diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
index eac2ab59643..5f560be4e88 100644
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }:
+{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }:
 
 buildPythonPackage rec {
   pname = "koji";
@@ -23,10 +23,10 @@ buildPythonPackage rec {
     rm -rf $out/nix
   '';
 
-  meta = {
+  meta = with lib; {
     description = "An RPM-based build system";
     homepage = "https://pagure.io/koji";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix
index 77b75193ca4..37ffe23b806 100644
--- a/pkgs/development/python-modules/latexcodec/default.nix
+++ b/pkgs/development/python-modules/latexcodec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, pytest }:
+{ lib, buildPythonPackage, fetchPypi, six, pytest }:
 
 buildPythonPackage rec {
   pname = "latexcodec";
@@ -17,10 +17,10 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/mcmtroffaes/latexcodec";
     description = "Lexer and codec to work with LaTeX code in Python";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 
 }
diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix
index a95d8140e11..42bc0c39129 100644
--- a/pkgs/development/python-modules/ledgerwallet/default.nix
+++ b/pkgs/development/python-modules/ledgerwallet/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     sha256 = "0fb93h2wxm9as9rsywlgz2ng4wrlbjphn6mgbhj6nls2i86rrdxk";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit ];
+  buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
   propagatedBuildInputs = [
     cryptography click construct ecdsa hidapi intelhex pillow protobuf requests tabulate
   ];
diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix
index 227cabe0099..4a4ba489e0a 100644
--- a/pkgs/development/python-modules/libevdev/default.nix
+++ b/pkgs/development/python-modules/libevdev/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy27
 , fetchPypi
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      libevdev = stdenv.lib.getLib pkgs.libevdev;
+      libevdev = lib.getLib pkgs.libevdev;
     })
   ];
 
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 80e560e4cce..567ad2cf489 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
 
   postFixup = ''
     rm $out/lib/libgpuarray-static.a
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     function fixRunPath {
       p=$(patchelf --print-rpath $1)
       patchelf --set-rpath "$p:$libraryPath" $1
diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index d7157244b6a..62686234b6e 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # we never actually explicitly call the install command so this is the only way
   # to inject these options to it - however, openmp-library doesn't appear to have
   # any effect, so we have to inject it into NIX_LDFLAGS manually below
-  postPatch = stdenv.lib.optionalString stdenv.cc.isClang ''
+  postPatch = lib.optionalString stdenv.cc.isClang ''
     cat >> setup.cfg <<EOF
 
     [install]
@@ -44,7 +44,7 @@ buildPythonPackage rec {
 
   postConfigure = ''
     export HOME=$(mktemp -d)
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -L${llvmPackages.openmp}/lib -lomp"
   '';
 
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index 4689050ba6c..61624a64d66 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -15,9 +15,9 @@ buildPythonPackage rec {
   disabled = (pythonOlder "2.7");
 
   propagatedBuildInputs = [ requests future ]
-                             ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
+                             ++ lib.optionals (pythonOlder "3.4") [ enum34 ];
 
-  postPatch = (stdenv.lib.optionalString (!pythonOlder "3.4") ''
+  postPatch = (lib.optionalString (!pythonOlder "3.4") ''
     sed -i -e '/"enum34",/d' setup.py
   '');
 
diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix
index 3583d469434..7ae9124bb82 100644
--- a/pkgs/development/python-modules/livestreamer/default.nix
+++ b/pkgs/development/python-modules/livestreamer/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   buildInputs = [ pkgs.makeWrapper ];
 
   propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ]
-    ++ stdenv.lib.optionals isPy27 [ singledispatch futures ];
+    ++ lib.optionals isPy27 [ singledispatch futures ];
 
   postInstall = ''
     wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index 77ec8322d68..e615582a282 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -2,10 +2,6 @@
 , contextlib2, osxfuse
 }:
 
-let
-  inherit (stdenv.lib) optionals optionalString;
-in
-
 buildPythonPackage rec {
   pname = "llfuse";
   version = "1.3.8";
@@ -24,16 +20,18 @@ buildPythonPackage rec {
   ];
 
   nativeBuildInputs = [ pkg-config ];
+
   buildInputs =
-    optionals stdenv.isLinux [ fuse ]
-    ++ optionals stdenv.isDarwin [ osxfuse ];
+    lib.optionals stdenv.isLinux [ fuse ]
+    ++ lib.optionals stdenv.isDarwin [ osxfuse ];
+
   checkInputs = [ pytest which ] ++
-    optionals stdenv.isLinux [ attr ];
+    lib.optionals stdenv.isLinux [ attr ];
 
   propagatedBuildInputs = [ contextlib2 ];
 
   checkPhase = ''
-    py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''}
+    py.test -k "not test_listdir" ${lib.optionalString stdenv.isDarwin ''-m "not uses_fuse"''}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 7a7106a5eaa..02ee088782a 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetchPypi
 , buildPythonPackage
 , python
@@ -21,7 +22,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ llvm ];
-  propagatedBuildInputs = [ ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+  propagatedBuildInputs = [ ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   # Disable static linking
   # https://github.com/numba/llvmlite/issues/93
@@ -38,14 +39,14 @@ buildPythonPackage rec {
     ${python.executable} runtests.py
   '';
 
-  __impureHostDeps = stdenv.lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
+  __impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
 
   passthru.llvm = llvm;
 
-  meta = {
+  meta = with lib; {
     description = "A lightweight LLVM python binding for writing JIT compilers";
     homepage = "http://llvmlite.pydata.org/";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ fridh ];
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fridh ];
   };
 }
diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index da91d9eeddd..458d2ca5032 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -12,10 +12,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook colorama ];
 
-  pytestFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ];
+  pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ];
 
   disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ];
+    ++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ];
 
   meta = with lib; {
     homepage = "https://github.com/Delgan/loguru";
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index b24ebbcc9eb..990545e4173 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -38,17 +38,17 @@ buildPythonPackage rec {
     sqlalchemy
     survey
     watchdog
-  ] ++ stdenv.lib.optionals (pythonOlder "3.8") [
+  ] ++ lib.optionals (pythonOlder "3.8") [
     importlib-metadata
-  ] ++ stdenv.lib.optionals (pythonOlder "3.9") [
+  ] ++ lib.optionals (pythonOlder "3.9") [
     importlib-resources
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ lib.optionals stdenv.isLinux [
     dbus-next
   ];
 
   makeWrapperArgs = [
     # Add the installed directories to the python path so the daemon can find them
-    "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}"
+    "--prefix" "PYTHONPATH" ":" "${lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}"
     "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages"
   ];
 
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index c85c7e2307f..0d8b3a1ec07 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ];
   checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
+  postPatch = lib.optionalString stdenv.isLinux ''
     sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
   '';
 
diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix
index c47d300d850..84c97eb16e2 100644
--- a/pkgs/development/python-modules/mailman-rss/default.nix
+++ b/pkgs/development/python-modules/mailman-rss/default.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   };
 
   propagatedBuildInputs = with python3Packages; [ dateutil future requests beautifulsoup4 ]
-    ++ stdenv.lib.optional withTwitter python3Packages.twitter
+    ++ lib.optional withTwitter python3Packages.twitter
   ;
 
   # No tests in Pypi Tarball
diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix
index 6c2e6ab1b63..94cfb637a15 100644
--- a/pkgs/development/python-modules/markdownsuperscript/default.nix
+++ b/pkgs/development/python-modules/markdownsuperscript/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, markdown,
+{ lib, buildPythonPackage, fetchPypi, markdown,
   pytest, pytestrunner, pytestcov, coverage }:
 
 buildPythonPackage rec {
@@ -22,10 +22,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytestrunner pytestcov coverage ];
 
-  meta = {
+  meta = with lib; {
     description = "An extension to the Python Markdown package enabling superscript text";
     homepage = "https://github.com/jambonrose/markdown_superscript_extension";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
     broken = true; # unmaintained in nixpkgs, barely maintained in pypi, added 2020-11-29
   };
 }
diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix
index ed6ebb1af49..2c929d9a694 100644
--- a/pkgs/development/python-modules/matplotlib/2.nix
+++ b/pkgs/development/python-modules/matplotlib/2.nix
@@ -42,17 +42,17 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ which sphinx ]
-    ++ stdenv.lib.optional enableGhostscript ghostscript
-    ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
+    ++ lib.optional enableGhostscript ghostscript
+    ++ lib.optional stdenv.isDarwin [ Cocoa ];
 
   propagatedBuildInputs =
     [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
       libpng mock pytz ]
-    ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
-    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
-    ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
-    ++ stdenv.lib.optionals enableQt [ pyqt4 ]
-    ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ];
+    ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache
+    ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
+    ++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
+    ++ lib.optionals enableQt [ pyqt4 ]
+    ++ lib.optionals python.isPy2 [ functools32 subprocess32 ];
 
   setup_cfg = ./setup.cfg;
   preBuild = ''
@@ -67,10 +67,9 @@ buildPythonPackage rec {
   # script.
   postPatch =
     let
-      inherit (stdenv.lib.strings) substring;
-      tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"'';
+      tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
     in
-    stdenv.lib.optionalString enableTk
+    lib.optionalString enableTk
       "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
 
   # Matplotlib needs to be built against a specific version of freetype in
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 11ea3251e0a..bf21422b772 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -35,15 +35,15 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ which sphinx ]
-    ++ stdenv.lib.optional enableGhostscript ghostscript
-    ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
+    ++ lib.optional enableGhostscript ghostscript
+    ++ lib.optional stdenv.isDarwin [ Cocoa ];
 
   propagatedBuildInputs =
     [ cycler dateutil numpy pyparsing tornado freetype kiwisolver
       certifi libpng mock pytz pillow ]
-    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
-    ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
-    ++ stdenv.lib.optionals enableQt [ pyqt5 ];
+    ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
+    ++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
+    ++ lib.optionals enableQt [ pyqt5 ];
 
   setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg;
   preBuild = ''
@@ -58,10 +58,9 @@ buildPythonPackage rec {
   # script.
   postPatch =
     let
-      inherit (stdenv.lib.strings) substring;
-      tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"'';
+      tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
     in
-    stdenv.lib.optionalString enableTk
+    lib.optionalString enableTk
       "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
 
   # Matplotlib needs to be built against a specific version of freetype in
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index d27fd862045..86deecb5d4f 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -28,8 +28,8 @@ buildPythonPackage rec {
     sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3";
   };
 
-  disabled = isPyPy || stdenv.lib.versionOlder django.version "1.11"
-    || stdenv.lib.versionAtLeast django.version "2.0";
+  disabled = isPyPy || lib.versionOlder django.version "1.11"
+    || lib.versionAtLeast django.version "2.0";
 
   buildInputs = [ pyflakes pep8 ];
   propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ];
diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix
index 534d6674a8d..d7ca86b8ea3 100644
--- a/pkgs/development/python-modules/mockito/default.nix
+++ b/pkgs/development/python-modules/mockito/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "d6b3aca6cdb92bbd47e19ebdb1a0b84ef23ab874eae5c6d505323c8657257c06";
   };
 
-  propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ];
+  propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ];
   checkInputs = [ pytest numpy ];
 
   # tests are no longer packaged in pypi tarball
diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix
index 19316c26802..a7862ef5c67 100644
--- a/pkgs/development/python-modules/modestmaps/default.nix
+++ b/pkgs/development/python-modules/modestmaps/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A library for building interactive maps";
     homepage = "http://modestmaps.com";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 
 }
diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix
index 7dffd328442..e93bf206eda 100644
--- a/pkgs/development/python-modules/monotonic/default.nix
+++ b/pkgs/development/python-modules/monotonic/default.nix
@@ -12,9 +12,9 @@ buildPythonPackage rec {
     sha256 = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0";
   };
 
-  __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";
+  __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";
 
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  patchPhase = lib.optionalString stdenv.isLinux ''
     substituteInPlace monotonic.py --replace \
       "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
   '';
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 13f8d5884cf..8bc984a5287 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     numpy decorator imageio imageio-ffmpeg tqdm requests proglog
-  ] ++ (stdenv.lib.optionals advancedProcessing [
+  ] ++ (lib.optionals advancedProcessing [
     opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl
   ]);
 
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index c16c4719a34..058133665f4 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }:
+{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }:
 
 buildPythonPackage rec {
   pname = "mpi4py";
@@ -43,10 +43,9 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ mpi openssh ];
 
-  meta = {
-    description =
-      "Python bindings for the Message Passing Interface standard";
+  meta = with lib; {
+    description = "Python bindings for the Message Passing Interface standard";
     homepage = "https://bitbucket.org/mpi4py/mpi4py/";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index d32905e7e61..2ad3b9fd6df 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , pkgs
 , requests
@@ -14,7 +14,7 @@ buildPythonPackage {
   buildInputs = [ pkgs.mxnet ];
   propagatedBuildInputs = [ requests numpy graphviz ];
 
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ pkgs.mxnet ];
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.mxnet ];
 
   doCheck = !isPy3k;
 
diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix
index 0a6e5635a4f..75fc5373b4c 100644
--- a/pkgs/development/python-modules/ndtypes/default.nix
+++ b/pkgs/development/python-modules/ndtypes/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , python
 , numpy
@@ -26,7 +27,7 @@ buildPythonPackage {
   postInstall = ''
     mkdir $out/include
     cp python/ndtypes/*.h $out/include
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so
   '';
 
diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix
index d92673104a9..7f4aab9c371 100644
--- a/pkgs/development/python-modules/netaddr/default.nix
+++ b/pkgs/development/python-modules/netaddr/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ];
+  propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ];
 
   checkInputs = [ glibcLocales pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix
index 719e07b617b..cb7871aed61 100644
--- a/pkgs/development/python-modules/nipy/default.nix
+++ b/pkgs/development/python-modules/nipy/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "1pn731nsczrx198i2gadffqmfbhviglrclv6xxwhnbv6w5hfs2yk";
   };
 
-  buildInputs = stdenv.lib.optional doCheck [ nose ];
+  buildInputs = lib.optional doCheck [ nose ];
   propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ];
 
   checkPhase = ''    # wants to be run in a different directory
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
index 5621f0b24af..1a60cf70d2d 100644
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
   };
 
-  patches = stdenv.lib.singleton (fetchurl {
+  patches = lib.singleton (fetchurl {
     name = "libnotify07.patch";
     url = "https://src.fedoraproject.org/cgit/notify-python.git/plain/"
         + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c";
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index 4056c8a440e..7c2125c7b77 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -26,7 +26,7 @@ in buildPythonPackage rec {
 
   postPatch = ''
     patchShebangs tests/run-tests
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.isLinux ''
     substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.util-linux.out}/lib/libuuid.so"'
   '';
 
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index ad31b8e960c..aa08ead2d97 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , pythonOlder
 , fetchPypi
 , python
@@ -23,10 +24,10 @@ buildPythonPackage rec {
     sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   propagatedBuildInputs = [numpy llvmlite]
-    ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch];
+    ++ lib.optionals isPy27 [ funcsigs singledispatch];
 
   # Copy test script into $out and run the test suite.
   checkPhase = ''
@@ -35,10 +36,10 @@ buildPythonPackage rec {
   # ImportError: cannot import name '_typeconv'
   doCheck = false;
 
-  meta =  {
+  meta =  with lib; {
     homepage = "http://numba.pydata.org/";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
     description = "Compiling Python code using LLVM";
-    maintainers = with stdenv.lib.maintainers; [ fridh ];
+    maintainers = with maintainers; [ fridh ];
   };
 }
diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index 930a0367824..99b9cccc7de 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
   buildInputs = [ pytestrunner ];
-  propagatedBuildInputs = [ pyyaml six ] ++ stdenv.lib.optional isPy27 pathlib2;
+  propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2;
 
   meta = with lib; {
     description = "A framework for configuring complex applications";
diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix
index 7cb4871031b..1cd0f648bd3 100644
--- a/pkgs/development/python-modules/orderedmultidict/default.nix
+++ b/pkgs/development/python-modules/orderedmultidict/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   checkInputs = [ flake8 ];
 
   propagatedBuildInputs = [ six ]
-    ++ stdenv.lib.optionals (pythonOlder "3.8") [
+    ++ lib.optionals (pythonOlder "3.8") [
       importlib-metadata
     ];
 
diff --git a/pkgs/development/python-modules/oset/default.nix b/pkgs/development/python-modules/oset/default.nix
index aa435b403e8..5d8a5f741bd 100644
--- a/pkgs/development/python-modules/oset/default.nix
+++ b/pkgs/development/python-modules/oset/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "oset";
@@ -11,9 +11,9 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Ordered set";
-    license = stdenv.lib.licenses.psfl;
+    license = licenses.psfl;
   };
 
 }
diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix
index 40597c36b58..7fd62dae2cd 100644
--- a/pkgs/development/python-modules/pamela/default.nix
+++ b/pkgs/development/python-modules/pamela/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   postUnpack = ''
     substituteInPlace $sourceRoot/pamela.py --replace \
       'find_library("pam")' \
-      '"${stdenv.lib.getLib pkgs.pam}/lib/libpam.so"'
+      '"${lib.getLib pkgs.pam}/lib/libpam.so"'
   '';
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix
index e4f65a94dc5..936a3db296e 100644
--- a/pkgs/development/python-modules/pandas/2.nix
+++ b/pkgs/development/python-modules/pandas/2.nix
@@ -1,6 +1,7 @@
 # Python 2 expression
 
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
 , python
 , stdenv
@@ -26,11 +27,7 @@
 , libcxx ? null
 }:
 
-let
-  inherit (stdenv.lib) optional optionals optionalString;
-  inherit (stdenv) isDarwin;
-
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "pandas";
   version = "0.24.2";
 
@@ -42,7 +39,7 @@ in buildPythonPackage rec {
   checkInputs = [ pytest glibcLocales moto hypothesis ];
 
   nativeBuildInputs = [ cython ];
-  buildInputs = optional isDarwin libcxx;
+  buildInputs = lib.optional stdenv.isDarwin libcxx;
   propagatedBuildInputs = [
     dateutil
     scipy
@@ -61,7 +58,7 @@ in buildPythonPackage rec {
 
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
-  postPatch = optionalString isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     cpp_sdk="${libcxx}/include/c++/v1";
     echo "Adding $cpp_sdk to the setup.py common_include variable"
     substituteInPlace setup.py \
@@ -70,7 +67,7 @@ in buildPythonPackage rec {
   '';
 
 
-  disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
+  disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([
     # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
     # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
     "test_fallback_plural"
@@ -86,7 +83,7 @@ in buildPythonPackage rec {
     "io"
     # KeyError Timestamp
     "test_to_excel"
-  ] ++ optionals isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "test_locale"
     "test_clipboard"
   ]);
@@ -98,7 +95,7 @@ in buildPythonPackage rec {
   ''
   # TODO: Get locale and clipboard support working on darwin.
   #       Until then we disable the tests.
-  + optionalString isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     # Fake the impure dependencies pbpaste and pbcopy
     echo "#!${runtimeShell}" > pbcopy
     echo "#!${runtimeShell}" > pbpaste
@@ -109,14 +106,14 @@ in buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = {
+  meta = with lib; {
     # https://github.com/pandas-dev/pandas/issues/14866
     # pandas devs are no longer testing i686 so safer to assume it's broken
     broken = stdenv.isi686;
     homepage = "https://pandas.pydata.org/";
     description = "Python Data Analysis Library";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ raskin knedlsepp ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ raskin knedlsepp ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index b9865fe628b..ab70a7782ad 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -27,11 +27,7 @@
 , libcxx ? null
 }:
 
-let
-  inherit (stdenv.lib) optional optionals optionalString;
-  inherit (stdenv) isDarwin;
-
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "pandas";
   version = "1.1.5";
 
@@ -41,7 +37,7 @@ in buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ cython ];
-  buildInputs = optional isDarwin libcxx;
+  buildInputs = lib.optional stdenv.isDarwin libcxx;
   propagatedBuildInputs = [
     beautifulsoup4
     bottleneck
@@ -62,11 +58,11 @@ in buildPythonPackage rec {
 
   # doesn't work with -Werror,-Wunused-command-line-argument
   # https://github.com/NixOS/nixpkgs/issues/39687
-  hardeningDisable = optional stdenv.cc.isClang "strictoverflow";
+  hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
 
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
-  postPatch = optionalString isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     cpp_sdk="${libcxx}/include/c++/v1";
     echo "Adding $cpp_sdk to the setup.py common_include variable"
     substituteInPlace setup.py \
@@ -76,7 +72,7 @@ in buildPythonPackage rec {
 
   # Parallel Cythonization is broken in Python 3.8 on Darwin. Fixed in the next
   # release. https://github.com/pandas-dev/pandas/pull/30862
-  setupPyBuildFlags = optionals (!(isPy38 && isDarwin)) [
+  setupPyBuildFlags = lib.optionals (!(isPy38 && stdenv.isDarwin)) [
     # As suggested by
     # https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#creating-a-python-environment
     "--parallel=$NIX_BUILD_CORES"
@@ -114,7 +110,7 @@ in buildPythonPackage rec {
     "test_constructor_with_embedded_frames"
     # tries to import compiled C extension locally
     "test_missing_required_dependency"
-  ] ++ optionals isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "test_locale"
     "test_clipboard"
   ];
@@ -128,7 +124,7 @@ in buildPythonPackage rec {
   ''
   # TODO: Get locale and clipboard support working on darwin.
   #       Until then we disable the tests.
-  + optionalString isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     # Fake the impure dependencies pbpaste and pbcopy
     echo "#!${runtimeShell}" > pbcopy
     echo "#!${runtimeShell}" > pbpaste
diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
index e787c65fc11..d338a351e54 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest pytestrunner ];
-  propagatedBuildInputs = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+  propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   checkPhase = ''
     py.test tests
diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index bc7c6399473..6b204a946b3 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pbr";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
   # circular dependencies with fixtures
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "http://docs.openstack.org/developer/pbr/";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     description = "Python Build Reasonableness";
   };
 }
diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index 7303a9b1504..ed0c89b7802 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     mock
     sqlalchemy
     virtualenv
-  ] ++ stdenv.lib.optionals isPy27 [ Kajiki ];
+  ] ++ lib.optionals isPy27 [ Kajiki ];
 
   pytestFlagsArray = [
     "--pyargs pecan "
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index ee3d08a173c..6f5d8e26227 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
 , sqlite
 , cython
 , apsw
@@ -40,7 +42,7 @@ buildPythonPackage rec {
 
   doCheck = withPostgres;
 
-  meta = with stdenv.lib;{
+  meta = with lib; {
     description = "a small, expressive orm";
     homepage    = "http://peewee-orm.com";
     license     = licenses.mit;
diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix
index b95f461aa37..26e5eb2bd6a 100644
--- a/pkgs/development/python-modules/pgsanity/default.nix
+++ b/pkgs/development/python-modules/pgsanity/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python
 , fetchPypi
 , buildPythonPackage
@@ -30,7 +30,7 @@ buildPythonPackage rec {
       run it through ecpg and
       let ecpg report on the syntax errors of the SQL.
     '';
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     maintainers = with maintainers; [ nalbyuites ];
   };
 }
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 62149a78866..354ca2796e1 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "phonenumbers";
@@ -9,10 +9,10 @@ buildPythonPackage rec {
     sha256 = "96d02120a3481e22d8a8eb5e4595ceec1930855749f6e4a06ef931881f59f562";
   };
 
-  meta = {
+  meta = with lib; {
     description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
     homepage    = "https://github.com/daviddrysdale/python-phonenumbers";
-    license     = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ fadenb ];
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ fadenb ];
   };
 }
diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix
index 0171adc6bfc..2151e13b960 100644
--- a/pkgs/development/python-modules/pickleshare/default.nix
+++ b/pkgs/development/python-modules/pickleshare/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ pathpy ]
-    ++ stdenv.lib.optional (pythonOlder "3.4") pathlib2;
+    ++ lib.optional (pythonOlder "3.4") pathlib2;
 
   # No proper test suite
   doCheck = false;
diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix
index ce28b19a013..0e3fabf1fbc 100644
--- a/pkgs/development/python-modules/pillow/6.nix
+++ b/pkgs/development/python-modules/pillow/6.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
-    python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"}
+    python -m pytest -v -x -W always${lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"}
     runHook postCheck
   '';
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   buildInputs = [
     freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
-    ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
+    ++ lib.optionals (isPyPy) [ tk libX11 ];
 
   # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
   # NOTE: The Pillow install script will, by default, add paths like /usr/lib
@@ -61,7 +61,7 @@ buildPythonPackage rec {
     export CFLAGS="-I${libwebp}/include"
   ''
   # Remove impurities
-  + stdenv.lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py \
       --replace '"/Library/Frameworks",' "" \
       --replace '"/System/Library/Frameworks"' ""
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 1122d21b534..4084df19404 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   '';
 
   # Disable darwin tests which require executables: `iconutil` and `screencapture`
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ];
+  disabledTests = lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ];
 
   propagatedBuildInputs = [ olefile ];
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   buildInputs = [
     freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
-    ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
+    ++ lib.optionals (isPyPy) [ tk libX11 ];
 
   # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
   # NOTE: The Pillow install script will, by default, add paths like /usr/lib
@@ -61,7 +61,7 @@ buildPythonPackage rec {
     export CFLAGS="-I${libwebp}/include"
   ''
   # Remove impurities
-  + stdenv.lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py \
       --replace '"/Library/Frameworks",' "" \
       --replace '"/System/Library/Frameworks"' ""
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 398ab8cd29b..4ea6f75932c 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six
+{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six
 , setuptools_scm, git, glibcLocales, mock }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest git glibcLocales mock ];
   propagatedBuildInputs = [ pip click six setuptools_scm ];
 
-  disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [
+  disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [
     # Depend on network tests:
     "test_allow_unsafe_option" #paramaterized, but all fail
     "test_annotate_option" #paramaterized, but all fail
diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix
index 0872a534760..d8537d68158 100644
--- a/pkgs/development/python-modules/plyvel/default.nix
+++ b/pkgs/development/python-modules/plyvel/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "a7a09033a0fd33ca47094e8bbe01714abfcf644f4b7a337d3970e91a2599e2c4";
   };
 
-  buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest;
+  buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest;
 
   # no tests for python2
   doCheck = isPy3k;
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index 4925c3dfd02..e7bbdd6ccdf 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -1,4 +1,5 @@
 { buildPackages
+, lib
 , stdenv
 , fetchpatch
 , python
@@ -14,8 +15,6 @@
 , doCheck ? true
 }:
 
-with stdenv.lib;
-
 buildPythonPackage {
   inherit (protobuf) pname src version;
   inherit disabled;
@@ -23,18 +22,18 @@ buildPythonPackage {
 
   NIX_CFLAGS_COMPILE = toString (
     # work around python distutils compiling C++ with $CC
-    optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
-    ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"
+    lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
+    ++ lib.optional (lib.versionOlder protobuf.version "2.7.0") "-std=c++98"
   );
 
   outputs = [ "out" "dev" ];
 
-  propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google-apputils ];
+  propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ];
   propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.
-  nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google-apputils ];
+  nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ];
   buildInputs = [ protobuf ];
 
-  patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2"))
+  patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2"))
     # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2)
     (fetchpatch {
       url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
@@ -50,7 +49,7 @@ buildPythonPackage {
     cd python
   '';
 
-  preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+  preConfigure = lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
     export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
     export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
   '';
@@ -58,21 +57,21 @@ buildPythonPackage {
   preBuild = ''
     # Workaround for https://github.com/google/protobuf/issues/2895
     ${python.pythonForBuild.interpreter} setup.py build
-  '' + optionalString (versionAtLeast protobuf.version "2.6.0") ''
+  '' + lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
     ${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation
   '';
 
-  installFlags = optional (versionAtLeast protobuf.version "2.6.0")
+  installFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0")
     "--install-option='--cpp_implementation'";
 
   # the _message.so isn't installed, so we'll do that manually.
   # if someone can figure out a less hacky way to get the _message.so to
   # install, please do replace this.
-  postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+  postInstall = lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
     cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Protocol Buffers are Google's data interchange format";
     homepage = "https://developers.google.com/protocol-buffers/";
     license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix
index 480714e9e28..3e4c4b4b663 100644
--- a/pkgs/development/python-modules/pulp/default.nix
+++ b/pkgs/development/python-modules/pulp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , pyparsing
diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix
index 8f559edf41f..77f7859c6d4 100644
--- a/pkgs/development/python-modules/pwntools/default.nix
+++ b/pkgs/development/python-modules/pwntools/default.nix
@@ -62,7 +62,7 @@ buildPythonPackage rec {
 
   postFixup = ''
     mkdir -p "$out/bin"
-    makeWrapper "${debugger}/bin/${stdenv.lib.strings.getName debugger}" "$out/bin/pwntools-gdb"
+    makeWrapper "${debugger}/bin/${lib.strings.getName debugger}" "$out/bin/pwntools-gdb"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index f9ed9acd0c8..0c2ae128827 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
 
 buildPythonPackage rec {
   pname = "py3exiv2";
@@ -13,13 +13,13 @@ buildPythonPackage rec {
   buildInputs = [ exiv2 boost ];
 
   # work around python distutils compiling C++ with $CC (see issue #26709)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
-  meta = {
+  meta = with lib; {
     homepage = "https://launchpad.net/py3exiv2";
     description = "A Python3 binding to the library exiv2";
-    license = with stdenv.lib.licenses; [ gpl3 ];
-    maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ vinymeuh ];
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix
index 4442d90ae71..9c9c18a886e 100644
--- a/pkgs/development/python-modules/pyannotate/default.nix
+++ b/pkgs/development/python-modules/pyannotate/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ six mypy-extensions ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+    ++ lib.optionals (pythonOlder "3.5") [ typing ];
 
   checkPhase = ''
     py.test
diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 5e96f642c28..5ae00417b6c 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:
+{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:
 
 buildPythonPackage rec {
   pname = "pyatspi";
@@ -6,7 +6,7 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0=";
   };
 
diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix
index 8f3f32b20ac..2dbd4e8cff5 100644
--- a/pkgs/development/python-modules/pybtex-docutils/default.nix
+++ b/pkgs/development/python-modules/pybtex-docutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, docutils, pybtex, six }:
+{ lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }:
 
 buildPythonPackage rec {
   version = "1.0.0";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
     sha256 = "cead6554b4af99c287dd29f38b1fa152c9542f56a51cb6cbc3997c95b2725b2e";
   };
 
-  meta = {
+  meta = with lib; {
     description = "A docutils backend for pybtex";
     homepage = "https://github.com/mcmtroffaes/pybtex-docutils";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix
index a62e7e27f9c..fb6fbf8dd38 100644
--- a/pkgs/development/python-modules/pybtex/default.nix
+++ b/pkgs/development/python-modules/pybtex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
+{ lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
 
 buildPythonPackage rec {
   version = "0.23.0";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
     sha256 = "b92be18ccd5e9a37895949dcf359a1f6890246b73646dddf1129178ee12e4bef";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "https://pybtex.org/";
     description = "A BibTeX-compatible bibliography processor written in Python";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix
index d366486c8f8..0e07d8d436f 100644
--- a/pkgs/development/python-modules/pycassa/default.nix
+++ b/pkgs/development/python-modules/pycassa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, thrift, isPy3k }:
 
 let
 
@@ -30,9 +30,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ thrift' ];
 
-  meta = {
+  meta = with lib; {
     description = "A python client library for Apache Cassandra";
     homepage = "https://github.com/pycassa/pycassa";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix
index b290d9ea959..712029b692c 100644
--- a/pkgs/development/python-modules/pycdio/default.nix
+++ b/pkgs/development/python-modules/pycdio/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ];
   buildInputs = [ setuptools pkgs.libcdio ]
-    ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv;
+    ++ lib.optional stdenv.isDarwin pkgs.libiconv;
 
   # Run tests using nosetests but first need to install the binaries
   # to the root source directory where they can be found.
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index 40084c2885e..e88b8529a35 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   version = "3.9.9";
@@ -9,9 +9,9 @@ buildPythonPackage rec {
     sha256 = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "https://www.pycryptodome.org/";
     description = "Python Cryptography Toolkit";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 368894228af..1db5df28e32 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -12,7 +12,7 @@
 , cudatoolkit
 , python
 , mkDerivation
-, lib, stdenv
+, lib
 }:
 let
   compyte = import ./compyte.nix {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     sha256 = "effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5";
   };
 
-  preConfigure = with stdenv.lib.versions; ''
+  preConfigure = with lib.versions; ''
     ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \
                           --boost-lib-dir=${boost}/lib \
                           --no-use-shipped-boost \
diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 13b99983198..884df63ce03 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
 
   # disable a test that fails on aarch64 due to rounding errors
-  postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+  postPatch = lib.optionalString stdenv.isAarch64 ''
     substituteInPlace test/test.py \
       --replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change"
   '';
diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix
index 3c92dee783a..712db3e8712 100644
--- a/pkgs/development/python-modules/pyee/default.nix
+++ b/pkgs/development/python-modules/pyee/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     pytest-trio
     pytestrunner
     twisted
-  ] ++ stdenv.lib.optional isPy27 [
+  ] ++ lib.optional isPy27 [
     attrs
     futures
     pyparsing
diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix
index cca8b552de1..bf7afdf79e2 100644
--- a/pkgs/development/python-modules/pyexiv2/default.nix
+++ b/pkgs/development/python-modules/pyexiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, python, exiv2, scons, boost }:
+{ lib, buildPythonPackage, fetchurl, python, exiv2, scons, boost }:
 
 buildPythonPackage rec {
   pname = "pyexiv2";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
 
   buildInputs = [ python exiv2 scons boost ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with lib; {
+    platforms = platforms.linux;
     # Likely needs an older boost which does not have `boost_pythonXY` but `boost_python`.
     broken = true; # 2018-06-23
   };
diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix
index db118fbbd8c..d317ebdf21b 100644
--- a/pkgs/development/python-modules/pyface/default.nix
+++ b/pkgs/development/python-modules/pyface/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , setuptools, six, traits
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Traits-capable windowing framework";
     homepage = "https://github.com/enthought/pyface";
-    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    maintainers = with maintainers; [ knedlsepp ];
     license = licenses.bsdOriginal;
   };
 }
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index 4deaa3eb268..64ec58487c4 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
       --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows"
     substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \
       --replace "test_copy_real_file" "notest_copy_real_file"
-  '' + (stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + (lib.optionalString stdenv.isDarwin ''
     # this test fails on darwin due to case-insensitive file system
     substituteInPlace pyfakefs/tests/fake_os_test.py \
       --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir"
diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix
index 17905b2bb39..dfe5449b282 100644
--- a/pkgs/development/python-modules/pyfribidi/default.nix
+++ b/pkgs/development/python-modules/pyfribidi/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -16,14 +17,14 @@ buildPythonPackage rec {
     sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c";
   };
 
-  patches = stdenv.lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch;
+  patches = lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch;
 
   propagatedBuildInputs = [ six ];
 
   meta = with lib; {
     description = "A simple wrapper around fribidi";
     homepage = "https://github.com/pediapress/pyfribidi";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
   };
 
 }
diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index 733bfa15a4c..6855c9e4f02 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [ cairosvg tinycss cssselect ]
-    ++ stdenv.lib.optionals (!isPyPy) [ lxml ];
+    ++ lib.optionals (!isPyPy) [ lxml ];
 
   meta = with lib; {
     description = "Sexy and simple python charting";
diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix
index 1cbf264d1e2..ccad57eba1e 100644
--- a/pkgs/development/python-modules/pygobject/3.36.nix
+++ b/pkgs/development/python-modules/pygobject/3.36.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
   };
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
   buildInputs = [ glib gobject-introspection ]
-                 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
+                 ++ lib.optionals stdenv.isDarwin [ which ncurses ];
   propagatedBuildInputs = [ pycairo cairo ];
 
   passthru = {
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index b42a772ed73..8c26ec6174b 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU=";
   };
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
   buildInputs = [ glib gobject-introspection ]
-                 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
+                 ++ lib.optionals stdenv.isDarwin [ which ncurses ];
   propagatedBuildInputs = [ pycairo cairo ];
 
   passthru = {
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index cf4f9d5cfbb..bf42d17b4de 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:
+{ lib, stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:
 
 buildPythonPackage rec {
   pname = "pygobject";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   outputs = [ "out" "devdoc" ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     ./pygobject-2.0-fix-darwin.patch
   ];
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # same site-packages: we need a pth file for both. pygtk.py would be
   # used to select a specific version, in our setup it should have no
   # effect, but we leave it in case somebody expects and calls it.
-  postInstall = stdenv.lib.optionalString (!isPy3k) ''
+  postInstall = lib.optionalString (!isPy3k) ''
     mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth}
 
     # Prevent wrapping of codegen files as these are meant to be
@@ -34,9 +34,9 @@ buildPythonPackage rec {
     chmod a-x $out/share/pygobject/*/codegen/*.py
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://pygobject.readthedocs.io/";
     description = "Python bindings for GLib";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index b3d84c21387..938b55630c0 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
     sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d";
   };
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     pango
-  ] ++ stdenv.lib.optional (libglade != null) libglade;
+  ] ++ lib.optional (libglade != null) libglade;
 
   propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
 
@@ -35,11 +35,11 @@ buildPythonPackage rec {
 
   buildPhase = "buildPhase";
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-ObjC";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC";
 
   installPhase = "installPhase";
 
-  checkPhase = stdenv.lib.optionalString (libglade == null)
+  checkPhase = lib.optionalString (libglade == null)
     ''
       sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
              tests/common.py
diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix
index 20811f2df9d..9506b8bae95 100644
--- a/pkgs/development/python-modules/pync/default.nix
+++ b/pkgs/development/python-modules/pync/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   buildInputs = [ pkgs.coreutils ];
   propagatedBuildInputs = [ dateutil ];
 
-  preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  preInstall = lib.optionalString stdenv.isDarwin ''
     sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py
   '';
 
diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix
index 5f193a8ab35..49da01f8e71 100644
--- a/pkgs/development/python-modules/pynput/default.nix
+++ b/pkgs/development/python-modules/pynput/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ sphinx ];
 
   propagatedBuildInputs = [ setuptools-lint xlib ]
-  ++ stdenv.lib.optionals stdenv.isLinux [
+  ++ lib.optionals stdenv.isLinux [
     evdev
   ];
 
diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix
index 9799cbaf0e8..4b27bea10bc 100644
--- a/pkgs/development/python-modules/pyobjc/default.nix
+++ b/pkgs/development/python-modules/pyobjc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, isPy3k, buildPythonPackage }:
+{ lib, fetchPypi, isPy3k, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "pyobjc";
@@ -13,10 +13,10 @@ buildPythonPackage rec {
     sha256 = "2b6c3e98f1408564ace1df36927154d7827c8e2f382386ab5d2db95c891e35a0";
   };
 
-  meta = {
+  meta = with lib; {
     description = "A bridge between the Python and Objective-C programming languages";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
     homepage = "https://pythonhosted.org/pyobjc/";
   };
 }
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 023e5f12fd4..c8b3bd4158c 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , openssl
@@ -13,9 +14,6 @@
 , fetchpatch
 }:
 
-with stdenv.lib;
-
-
 let
   # https://github.com/pyca/pyopenssl/issues/791
   # These tests, we disable in the case that libressl is passed in as openssl.
@@ -51,21 +49,20 @@ let
     # https://github.com/pyca/pyopenssl/issues/768
     "test_wantWriteError"
   ] ++ (
-    optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
+    lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests
   ) ++ (
-    optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
+    lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
   ) ++ (
     # https://github.com/pyca/pyopenssl/issues/974
-    optionals stdenv.is32bit [ "test_verify_with_time" ]
+    lib.optionals stdenv.is32bit [ "test_verify_with_time" ]
   );
 
   # Compose the final string expression, including the "-k" and the single quotes.
-  testExpression = optionalString (disabledTests != [])
-    "-k 'not ${concatStringsSep " and not " disabledTests}'";
+  testExpression = lib.optionalString (disabledTests != [])
+    "-k 'not ${lib.concatStringsSep " and not " disabledTests}'";
 
 in
 
-
 buildPythonPackage rec {
   pname = "pyOpenSSL";
   version = "20.0.0";
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index b6768ad992d..f46a5d2db82 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     sed -i -e '
       s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
     ' tests/test__ped_ped.py
-  '' + stdenv.lib.optionalString stdenv.isi686 ''
+  '' + lib.optionalString stdenv.isi686 ''
     # remove some integers in this test case which overflow on 32bit systems
     sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \
       tests/test__ped_ped.py
diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix
index 2458a29ac31..f3e49452c89 100644
--- a/pkgs/development/python-modules/pypass/default.nix
+++ b/pkgs/development/python-modules/pypass/default.nix
@@ -1,4 +1,5 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , click
 , colorama
 , enum34
@@ -11,7 +12,6 @@
 , pexpect
 , pythonAtLeast
 , pythonOlder
-, stdenv
 , substituteAll
 , tree
 , xclip
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   ];
 
   # Remove enum34 requirement if Python >= 3.4
-  postPatch = stdenv.lib.optionalString (pythonAtLeast "3.4") ''
+  postPatch = lib.optionalString (pythonAtLeast "3.4") ''
     substituteInPlace requirements.txt --replace "enum34" ""
   '';
 
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     click
     colorama
     pexpect
-  ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+  ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   checkInputs = [ nose ];
 
@@ -74,11 +74,11 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Password manager pass in Python";
     homepage = "https://github.com/aviau/python-pass";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ jluttine ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
   };
 }
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 54abcddd5d8..3427438b8a2 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }:
+{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }:
 
 buildPythonPackage rec {
   pname = "PyQt-x11-gpl";
@@ -16,13 +16,13 @@ buildPythonPackage rec {
     rm -rf "$out/nix-support"
 
     export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \
     ''}
 
     substituteInPlace configure.py \
       --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.isDarwin ''
       --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \
     ''}
 
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     "--destdir=${placeholder "out"}/${python.sitePackages}"
     "--plugin-destdir=${placeholder "out"}/lib/qt4/plugins"
     "--sipdir=${placeholder "out"}/share/sip/PyQt4"
-    "--dbus=${stdenv.lib.getDev dbus-python}/include/dbus-1.0"
+    "--dbus=${lib.getDev dbus-python}/include/dbus-1.0"
     "--verbose"
   ];
 
@@ -59,11 +59,11 @@ buildPythonPackage rec {
     qt = qt4;
   };
 
-  meta = {
+  meta = with lib; {
     description = "Python bindings for Qt";
     license = "GPL";
     homepage = "http://www.riverbankcomputing.co.uk";
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = [ maintainers.sander ];
+    platforms = platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 9798d94900b..28c40e5ec5f 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,11 +1,8 @@
-{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
 
 let
   # Package does not support configuring the pcsc library.
   withApplePCSC = stdenv.isDarwin;
-
-  inherit (stdenv.lib) getLib getDev optionalString optionals;
-  inherit (stdenv.hostPlatform.extensions) sharedLibrary;
 in
 
 buildPythonPackage rec {
@@ -24,19 +21,19 @@ buildPythonPackage rec {
   '' else ''
     substituteInPlace smartcard/scard/winscarddll.c \
       --replace "libpcsclite.so.1" \
-                "${getLib pcsclite}/lib/libpcsclite${sharedLibrary}"
+                "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
   '';
 
-  NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
-    "-I ${getDev pcsclite}/include/PCSC";
+  NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC)
+    "-I ${lib.getDev pcsclite}/include/PCSC";
 
   propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
   nativeBuildInputs = [ swig ];
 
-  meta = {
+  meta = with lib; {
     homepage = "https://pyscard.sourceforge.io/";
     description = "Smartcard library for python";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [ layus ];
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ layus ];
   };
 }
diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix
index 87f23b8edf7..6da19bc48ab 100644
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
 
   propagatedBuildInputs = [ six ]
-    ++ (stdenv.lib.optionals (pythonOlder "3.4") [ enum34 pathlib ])
-    ++ (stdenv.lib.optionals (pythonOlder "2.7") [ ordereddict ]);
+    ++ (lib.optionals (pythonOlder "3.4") [ enum34 pathlib ])
+    ++ (lib.optionals (pythonOlder "2.7") [ ordereddict ]);
 
   checkPhase = ''
     py.test
diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix
index 10f030b13f6..9398a62997b 100644
--- a/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:
+{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:
 
 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
@@ -20,11 +20,11 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pythonEnv ];
   buildInputs = [ qt4 libxml2 libxslt ];
 
-  meta = {
+  meta = with lib; {
     description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = "http://www.pyside.org/docs/apiextractor/";
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index cbc586f4734..532ee6b2b24 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:
+{ lib, stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:
 
 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
@@ -22,11 +22,11 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pythonEnv ];
   buildInputs = [ pysideApiextractor qt4 ];
 
-  meta = {
+  meta = with lib; {
     description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = "http://www.pyside.org/docs/generatorrunner/";
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix
index a6bf14cdca0..302eb12de5a 100644
--- a/pkgs/development/python-modules/pyspotify/default.nix
+++ b/pkgs/development/python-modules/pyspotify/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     find -print0 | xargs -0 touch
   '';
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     find "$out" -name _spotify.so -exec \
         install_name_tool -change \
         @loader_path/../Frameworks/libspotify.framework/libspotify \
diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix
index fec1bbd0bed..09cc312223a 100644
--- a/pkgs/development/python-modules/pysqlite/default.nix
+++ b/pkgs/development/python-modules/pysqlite/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     substituteInPlace "setup.cfg"                                     \
             --replace "/usr/local/include" "${pkgs.sqlite.dev}/include"   \
             --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib"
-    ${stdenv.lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}
+    ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 961845a28e1..c621d9a4785 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ pytest ]
-    ++ stdenv.lib.optionals isPy35 [ async_generator ];
+    ++ lib.optionals isPy35 [ async_generator ];
 
   # No tests in archive
   doCheck = false;
diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix
index 88963537c9d..63e57a7f769 100644
--- a/pkgs/development/python-modules/pytest/4.nix
+++ b/pkgs/development/python-modules/pytest/4.nix
@@ -14,8 +14,8 @@ buildPythonPackage rec {
   checkInputs = [ hypothesis mock ];
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
-    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
-    ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+    ++ lib.optionals (!isPy3k) [ funcsigs ]
+    ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
   checkPhase = ''
diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix
index ade36f4aa0b..1293cc94b0f 100644
--- a/pkgs/development/python-modules/pytest/5.nix
+++ b/pkgs/development/python-modules/pytest/5.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     six
     toml
     wcwidth
-  ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+  ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
 
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 3c8e00f1af8..6f5c99a99b1 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     six
     toml
     wcwidth
-  ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+  ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
 
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index 19c8941d2fc..ed03d966307 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   doCheck = !stdenv.isDarwin;
 
-  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
+  preCheck = lib.optionalString stdenv.isLinux ''
     echo "nameserver 127.0.0.1" > resolv.conf
     export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \
       LD_PRELOAD=${libredirect}/lib/libredirect.so
diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 9879a441b3e..3a0ab33363e 100644
--- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [ future ujson ]
-    ++ stdenv.lib.optional (pythonOlder "3.2") futures;
+    ++ lib.optional (pythonOlder "3.2") futures;
 
   meta = with lib; {
     homepage = "https://github.com/palantir/python-jsonrpc-server";
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index dc3b33a6f53..f22652d0f73 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -31,16 +31,16 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ]
-    ++ stdenv.lib.optional (withProvider "autopep8") autopep8
-    ++ stdenv.lib.optional (withProvider "mccabe") mccabe
-    ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
-    ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle
-    ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes
-    ++ stdenv.lib.optional (withProvider "pylint") pylint
-    ++ stdenv.lib.optional (withProvider "rope") rope
-    ++ stdenv.lib.optional (withProvider "yapf") yapf
-    ++ stdenv.lib.optional isPy27 configparser
-    ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ];
+    ++ lib.optional (withProvider "autopep8") autopep8
+    ++ lib.optional (withProvider "mccabe") mccabe
+    ++ lib.optional (withProvider "pycodestyle") pycodestyle
+    ++ lib.optional (withProvider "pydocstyle") pydocstyle
+    ++ lib.optional (withProvider "pyflakes") pyflakes
+    ++ lib.optional (withProvider "pylint") pylint
+    ++ lib.optional (withProvider "rope") rope
+    ++ lib.optional (withProvider "yapf") yapf
+    ++ lib.optional isPy27 configparser
+    ++ lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ];
 
 
   # The tests require all the providers, disable otherwise.
@@ -68,7 +68,7 @@ buildPythonPackage rec {
     "test_snippet_parsing"
     "test_numpy_hover"
     "test_symbols"
-  ] ++ stdenv.lib.optional isPy27 "test_flake8_lint";
+  ] ++ lib.optional isPy27 "test_flake8_lint";
 
   meta = with lib; {
     homepage = "https://github.com/palantir/python-language-server";
diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index e129bf45219..fe68ed60e37 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -30,7 +30,7 @@ in buildPythonPackage rec {
   disabled = isPyPy;
   doCheck = false; # doesn't find needed test data files
   preBuild = let
-    pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
+    pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
   in ''
     export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
     export BOOST_THREAD_LIB="boost_thread"
diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix
index 7cf2affc417..235d085fffd 100644
--- a/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [ redis ]
-  ++ stdenv.lib.optional withDjango django_redis;
+  ++ lib.optional withDjango django_redis;
 
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix
index ff4942abef5..3e6d7284568 100644
--- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix
+++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage {
 
   buildInputs = [ exempi ];
 
-  checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ];
+  checkInputs = lib.optionals (pythonOlder "3.3") [ mock ];
 
   propagatedBuildInputs = [ pytz ];
 
diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix
index cbcf4ab9d02..d1d06d22c64 100644
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python opencascade smesh
     freetype libGL libGLU libX11
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   cmakeFlags = [
     "-Wno-dev"
diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix
index a25f2013adf..1ffda5c86b0 100644
--- a/pkgs/development/python-modules/pytorch/bin.nix
+++ b/pkgs/development/python-modules/pytorch/bin.nix
@@ -52,7 +52,7 @@ in buildPythonPackage {
   '';
 
   postFixup = let
-    rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ];
+    rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ];
   in ''
     find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
       echo "setting rpath for $lib..."
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 822586bf190..db1914f4ee7 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -265,7 +265,7 @@ in buildPythonPackage rec {
     cp -r $out/${python.sitePackages}/torch/lib     $lib/lib
   '';
 
-  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     for f in $(ls $lib/lib/*.dylib); do
         install_name_tool -id $lib/lib/$(basename $f) $f || true
     done
diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix
index effb9f7b7e6..f1c0d3be8cc 100644
--- a/pkgs/development/python-modules/pyutil/default.nix
+++ b/pkgs/development/python-modules/pyutil/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # package, apparently some kind of plugin.
   doCheck = false;
 
-  prePatch = stdenv.lib.optionalString isPyPy ''
+  prePatch = lib.optionalString isPyPy ''
     grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g"
   '';
 
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index f1c9685d5cc..1c99ee0fc8d 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPy3k
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   disabled = !isPy3k;
 
   src = fetchurl {
-    url = "https://downloads.reviewboard.org/releases/RBTools/${stdenv.lib.versions.majorMinor version}/RBTools-${version}.tar.gz";
+    url = "https://downloads.reviewboard.org/releases/RBTools/${lib.versions.majorMinor version}/RBTools-${version}.tar.gz";
     sha256 = "577c2f8bbf88f77bda84ee95af0310b59111c156f48a5aab56ca481e2f77eaf4";
   };
 
diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index ebe3dc772d7..896bc8e02f0 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , sphinx
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   checkInputs = [ sphinx pytestcov pytest ];
 
   propagatedBuildInputs = [ Mako numpy funcsigs ]
-    ++ stdenv.lib.optional withCuda pycuda
-    ++ stdenv.lib.optional withOpenCL pyopencl;
+    ++ lib.optional withCuda pycuda
+    ++ lib.optional withOpenCL pyopencl;
 
   checkPhase = ''
     py.test
@@ -33,11 +33,11 @@ buildPythonPackage rec {
   # Requires device
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "GPGPU algorithms for PyCUDA and PyOpenCL";
     homepage = "https://github.com/fjarri/reikna";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.fridh ];
+    license = licenses.mit;
+    maintainers = [ maintainers.fridh ];
 
   };
 
diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix
index 0bd7b0ca686..4e47915bdf7 100644
--- a/pkgs/development/python-modules/rfc6555/default.nix
+++ b/pkgs/development/python-modules/rfc6555/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonPackages }:
+{ lib, buildPythonPackage, fetchPypi, pythonPackages }:
 
 buildPythonPackage rec {
   pname = "rfc6555";
@@ -19,10 +19,10 @@ buildPythonPackage rec {
     py.test tests/
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Python implementation of the Happy Eyeballs Algorithm";
     homepage = "https://pypi.org/project/rfc6555";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ endocrimes ];
+    license = licenses.asl20;
+    maintainers = with maintainers; [ endocrimes ];
   };
 }
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 1e667f1f3de..d19f47281cd 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     ipywidgets
     pygments
     typing-extensions
-  ] ++ stdenv.lib.optional (pythonOlder "3.7") dataclasses;
+  ] ++ lib.optional (pythonOlder "3.7") dataclasses;
 
   checkInputs = [ pytestCheckHook ];
   pythonImportsCheck = [ "rich" ];
diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix
index a6aa89b2ea1..8400647aaad 100644
--- a/pkgs/development/python-modules/rsa/4_0.nix
+++ b/pkgs/development/python-modules/rsa/4_0.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   checkInputs = [ unittest2 mock ];
   propagatedBuildInputs = [ pyasn1 ];
 
-  preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") ''
+  preConfigure = lib.optionalString (isPy3k && pythonOlder "3.7") ''
     substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
   '';
 
diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix
index 1f26350fc36..b688369beb5 100644
--- a/pkgs/development/python-modules/rsa/default.nix
+++ b/pkgs/development/python-modules/rsa/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   checkInputs = [ unittest2 mock ];
   propagatedBuildInputs = [ pyasn1 ];
 
-  preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") ''
+  preConfigure = lib.optionalString (isPy3k && pythonOlder "3.7") ''
     substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
   '';
 
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index 27551a798d7..6f816fc9bb8 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , fetchPypi
 , pythonOlder
 , buildPythonPackage
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [ botocore
-    ] ++ stdenv.lib.optional (pythonOlder "3") futures;
+    ] ++ lib.optional (pythonOlder "3") futures;
 
   buildInputs = [
     docutils
@@ -43,9 +43,9 @@ buildPythonPackage rec {
   # version on pypi has no tests/ dir
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/boto/s3transfer";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     description = "A library for managing Amazon S3 transfers";
   };
 }
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 48bafa41dff..6887eded3bf 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -80,7 +80,7 @@ buildPythonPackage rec {
     "test_retry_dns_error"
     "test_custom_asyncio_loop_enabled_true"
     "test_custom_loop_asyncio"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     "test_xmliter_encoding"
     "test_download"
   ];
diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index f53a7053ff5..f71f8d0c263 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -23,7 +23,7 @@ buildPythonApplication rec {
       --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")"
   '';
 
-  propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses;
+  propagatedBuildInputs = lib.optional isPy36 dataclasses;
 
   buildInputs = [ libX11 libXinerama libXrandr];
 
diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix
index b32dfe2653e..664f84933ed 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/pkgs/development/python-modules/selenium/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     geckodriver urllib3
   ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  patchPhase = lib.optionalString stdenv.isLinux ''
     cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
     substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6"
     cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index b846c0bc743..ea9bbc1f0c3 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond
     executing pure-eval asttokens ]
-  ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ];
+  ++ lib.optionals isPy3k [ celery pyramid sanic aiohttp ];
 
   propagatedBuildInputs = [ urllib3 certifi ];
 
diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index f852f77bcfd..b5dd0be5445 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     (substituteAll {
       src = ./library-paths.patch;
       libgeos_c = GEOS_LIBRARY_PATH;
-      libc = stdenv.lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
+      libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
     })
   ];
 
diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix
index b7dd0310a08..ed86b48fc07 100644
--- a/pkgs/development/python-modules/simplebayes/default.nix
+++ b/pkgs/development/python-modules/simplebayes/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage {
 
   checkInputs = [ nose mock ];
 
-  postPatch = stdenv.lib.optionalString isPy3k ''
+  postPatch = lib.optionalString isPy3k ''
     sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py
   '';
 
diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix
index 4279383ae6b..8c57d2e0d26 100644
--- a/pkgs/development/python-modules/spacy/models.nix
+++ b/pkgs/development/python-modules/spacy/models.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }:
+{ lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }:
 let
   buildModelPackage = { pname, version, sha256, license }:
   let
@@ -24,8 +24,8 @@ let
     };
   };
 
-  makeModelSet = models: with stdenv.lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models);
+  makeModelSet = models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models);
 
-in makeModelSet (stdenv.lib.importJSON ./models.json)
+in makeModelSet (lib.importJSON ./models.json)
 
 # cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
index c70cac59920..8bdb69a3074 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}:
+{ lib, fetchurl, buildPythonPackage, antlr, isPy3k }:
 
 buildPythonPackage rec {
   pname = "PyStringTemplate";
@@ -16,9 +16,9 @@ buildPythonPackage rec {
   # No tests included in archive
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     homepage = "https://www.stringtemplate.org/";
     description = "Text Templating Library";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix
index bf0eb51c851..efc47a1ad3f 100644
--- a/pkgs/development/python-modules/tables/3.5.nix
+++ b/pkgs/development/python-modules/tables/3.5.nix
@@ -1,8 +1,6 @@
-{ stdenv, lib, fetchPypi, python, buildPythonPackage
+{ lib, fetchPypi, python, buildPythonPackage
 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }:
 
-with stdenv.lib;
-
 buildPythonPackage rec {
   version = "3.5.2";
   pname = "tables";
@@ -18,10 +16,10 @@ buildPythonPackage rec {
   # The setup script complains about missing run-paths, but they are
   # actually set.
   setupPyBuildFlags = [
-    "--hdf5=${getDev hdf5}"
-    "--lzo=${getDev lzo}"
-    "--bzip2=${getDev bzip2}"
-    "--blosc=${getDev c-blosc}"
+    "--hdf5=${lib.getDev hdf5}"
+    "--lzo=${lib.getDev lzo}"
+    "--bzip2=${lib.getDev bzip2}"
+    "--blosc=${lib.getDev c-blosc}"
   ];
   # Run the test suite.
   # It requires the build path to be in the python search path.
@@ -50,9 +48,9 @@ buildPythonPackage rec {
   # Disable tests until the failure described above is fixed.
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Hierarchical datasets for Python";
     homepage = "http://www.pytables.org/";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
   };
 }
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index cd2af0dc28d..fe49ab4d9ed 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPy38
+{ lib, fetchPypi, python, buildPythonPackage, isPy38
 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }:
 
-with stdenv.lib;
-
 buildPythonPackage rec {
   version = "3.6.1";
   pname = "tables";
@@ -30,10 +28,10 @@ buildPythonPackage rec {
   # The setup script complains about missing run-paths, but they are
   # actually set.
   setupPyBuildFlags = [
-    "--hdf5=${getDev hdf5}"
-    "--lzo=${getDev lzo}"
-    "--bzip2=${getDev bzip2}"
-    "--blosc=${getDev c-blosc}"
+    "--hdf5=${lib.getDev hdf5}"
+    "--lzo=${lib.getDev lzo}"
+    "--bzip2=${lib.getDev bzip2}"
+    "--blosc=${lib.getDev c-blosc}"
   ];
   # Run the test suite.
   # It requires the build path to be in the python search path.
@@ -62,9 +60,9 @@ buildPythonPackage rec {
   # Disable tests until the failure described above is fixed.
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Hierarchical datasets for Python";
     homepage = "http://www.pytables.org/";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
   };
 }
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index 0469fc30e75..cba34a95a7b 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -25,8 +25,8 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ pytestrunner ];
   propagatedBuildInputs = [ colorama mypy pyyaml regex ]
-    ++ stdenv.lib.optionals (pythonOlder "3.7") [ dataclasses ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+    ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]
+    ++ lib.optionals (pythonOlder "3.5") [ typing ];
   checkInputs = [ pytest-mypy ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index c0a9d5eadaf..ef6d4f45ef9 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -125,7 +125,7 @@ in buildPythonPackage {
         zlib
       ];
 
-      rpath = stdenv.lib.makeLibraryPath (libpaths ++ cudapaths);
+      rpath = lib.makeLibraryPath (libpaths ++ cudapaths);
     in
     lib.optionalString stdenv.isLinux ''
       # This is an array containing all the directories in the tensorflow2
diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index 1efebed9872..9f82dee45ef 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , python
 , py
@@ -17,7 +18,7 @@ buildPythonPackage {
     # Move the tkinter module
     mkdir -p $out/${py.sitePackages}
     mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     # Update the rpath to point to python without x11Support
     old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
     new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix
index ac781796230..62749d3b02f 100644
--- a/pkgs/development/python-modules/todoist/default.nix
+++ b/pkgs/development/python-modules/todoist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , requests, fetchpatch, pythonOlder, typing
 }:
 
@@ -23,12 +23,12 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ requests ] ++ stdenv.lib.optional (pythonOlder "3.5") typing;
+  propagatedBuildInputs = [ requests ] ++ lib.optional (pythonOlder "3.5") typing;
 
-  meta = {
+  meta = with lib; {
     description = "The official Todoist Python API library";
     homepage = "https://todoist-python.readthedocs.io/en/latest/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ma27 ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
   };
 }
diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix
index 6132a30c414..ff4c4a76758 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/pkgs/development/python-modules/trackpy/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    ${stdenv.lib.optionalString (stdenv.isDarwin) ''
+    ${lib.optionalString (stdenv.isDarwin) ''
     # specifically needed for darwin
     export HOME=$(mktemp -d)
     mkdir -p $HOME/.matplotlib
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index ee288f7626b..59420475440 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     sacremoses
     tokenizers
     tqdm
-  ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   # Many tests require internet access.
   doCheck = false;
diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 7db53969402..68254d8601e 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonApplication
 , fetchPypi
 , pythonOlder
@@ -21,8 +21,6 @@
 , withPostgresql ? true
 }:
 
-with stdenv.lib;
-
 buildPythonApplication rec {
   pname = "trytond";
   version = "5.8.2";
@@ -56,14 +54,14 @@ buildPythonApplication rec {
     python-Levenshtein
     simplejson
     html2text
-  ] ++ stdenv.lib.optional withPostgresql psycopg2;
+  ] ++ lib.optional withPostgresql psycopg2;
 
   # If unset, trytond will try to mkdir /homeless-shelter
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
 
-  meta = {
+  meta = with lib; {
     description = "The server of the Tryton application platform";
     longDescription = ''
       The server for Tryton, a three-tier high-level general purpose
diff --git a/pkgs/development/python-modules/tumpa/default.nix b/pkgs/development/python-modules/tumpa/default.nix
index 28560feb04f..6d953740eb8 100644
--- a/pkgs/development/python-modules/tumpa/default.nix
+++ b/pkgs/development/python-modules/tumpa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , setuptools
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenPGP key creation and smartcard access";
     homepage = "https://github.com/kushaldas/tumpa";
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index efec0b737bc..421565725b1 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   # Patch t.p._inotify to point to libc. Without this,
   # twisted.python.runtime.platform.supportsINotify() == False
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  patchPhase = lib.optionalString stdenv.isLinux ''
     substituteInPlace src/twisted/python/_inotify.py --replace \
       "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
   '';
diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix
index 215a32e3b60..484f422adf3 100644
--- a/pkgs/development/python-modules/unicorn/default.nix
+++ b/pkgs/development/python-modules/unicorn/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "unicorn";
-  version = stdenv.lib.getVersion unicorn-emu;
+  version = lib.getVersion unicorn-emu;
 
   src = unicorn-emu.src;
   sourceRoot = "source/bindings/python";
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 4bf36439174..6cf7ce34d38 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, mock, tornado, pyopenssl, cryptography
 , idna, certifi, ipaddress, pysocks }:
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
   };
 
-  NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
+  NOSE_EXCLUDE = lib.concatStringsSep "," [
     "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
     "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
   ];
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index 893cdd7e99b..5cb8929b9db 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin
+  buildInputs = lib.optionals stdenv.isDarwin
     [ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
   propagatedBuildInputs = [ argh pathtools pyyaml ];
 
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index 858130b805f..7f35dd124d8 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ itsdangerous ];
   checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ];
 
-  disabledTests = stdenv.lib.optionals stdenv.isDarwin [
+  disabledTests = lib.optionals stdenv.isDarwin [
     "test_get_machine_id"
   ];
 
diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix
index 33431684708..8f51ec1e77f 100644
--- a/pkgs/development/python-modules/xcffib/default.nix
+++ b/pkgs/development/python-modules/xcffib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , xorg
diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix
index 3178e171f84..3657997f5a7 100644
--- a/pkgs/development/python-modules/xnd/default.nix
+++ b/pkgs/development/python-modules/xnd/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , python
 , ndtypes
@@ -27,7 +28,7 @@ buildPythonPackage {
   postInstall = ''
     mkdir $out/include
     cp python/xnd/*.h $out/include
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so
   '';
 
diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index 4882f92b047..a6a00ad821b 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
       url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch";
       sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij";
     })
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
+  ] ++ lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
 
   buildInputs = [ manuel docutils ];
   propagatedBuildInputs = [ zope_testrunner ];
diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix
index 28070ea67e7..390624b50de 100644
--- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix
+++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   # zope uses pep 420 namespaces for python3, doesn't work with nix + python2
-  pythonImportsCheck = stdenv.lib.optionals isPy3k [
+  pythonImportsCheck = lib.optionals isPy3k [
     "zope.lifecycleevent"
     "zope.interface"
   ];

From 5105bf4b2eb842a07856a5230f21fb635cf7bc00 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Sun, 24 Jan 2021 01:31:45 +0100
Subject: [PATCH 741/956] llvm_{5,6,8..11}: fix missing lib from stdenv.lib ->
 lib (#110643)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/compilers/llvm/10/openmp.nix | 3 ++-
 pkgs/development/compilers/llvm/11/openmp.nix | 3 ++-
 pkgs/development/compilers/llvm/5/openmp.nix  | 3 ++-
 pkgs/development/compilers/llvm/6/openmp.nix  | 3 ++-
 pkgs/development/compilers/llvm/7/openmp.nix  | 3 ++-
 pkgs/development/compilers/llvm/8/openmp.nix  | 3 ++-
 pkgs/development/compilers/llvm/9/openmp.nix  | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix
index 2fa695d2d51..2946c51fafe 100644
--- a/pkgs/development/compilers/llvm/10/openmp.nix
+++ b/pkgs/development/compilers/llvm/10/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix
index b19d369a42e..5503a98ae5f 100644
--- a/pkgs/development/compilers/llvm/11/openmp.nix
+++ b/pkgs/development/compilers/llvm/11/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix
index 1af40922996..169c9c50324 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/pkgs/development/compilers/llvm/5/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index 420bfe8c3bb..9de18065918 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
index 9977ed3dd41..53f52c326c5 100644
--- a/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix
index ad2cd93fdb6..b5d75d9c872 100644
--- a/pkgs/development/compilers/llvm/8/openmp.nix
+++ b/pkgs/development/compilers/llvm/8/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm
diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix
index 35997c9dda4..416916f57ff 100644
--- a/pkgs/development/compilers/llvm/9/openmp.nix
+++ b/pkgs/development/compilers/llvm/9/openmp.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetch
 , cmake
 , llvm

From 3e00482ba879e3b061d0dcf3f37d3263c48bfa34 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Mon, 18 Jan 2021 09:02:05 -0500
Subject: [PATCH 742/956] nixos/nomad: add assertion for the value of
 dropPrivileges and its relation to data_dir

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

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index dafdae0c327..04f15fe1366 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -135,6 +135,13 @@ in
       };
     };
 
+    assertions = [
+      {
+        assertion = cfg.dropPrivileges -> cfg.settings.data_dir == "/var/lib/nomad";
+        message = "settings.data_dir must be equal to \"/var/lib/nomad\" if dropPrivileges is true";
+      }
+    ];
+
     # Docker support requires the Docker daemon to be running.
     virtualisation.docker.enable = mkIf cfg.enableDocker true;
   };

From f3aa71b7ec19f380192e9e31c6f208988777e341 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Mon, 18 Jan 2021 09:03:52 -0500
Subject: [PATCH 743/956] nixos/nomad: describe the nomad cluster manager
 responsibilities

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

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 04f15fe1366..b58b5c9182c 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -66,6 +66,19 @@ in
         description = ''
           Configuration for Nomad. See the <link xlink:href="https://www.nomadproject.io/docs/configuration">documentation</link>
           for supported values.
+
+          Notes about `data_dir`:
+
+          If `data_dir` is set to a value other than the default value of
+          `"/var/lib/nomad"` it is the Nomad cluster manager's responsibility
+          to make sure that this directory exist and has the appropriate
+          permissions. One way to do this is with the `ExecStartPre` feature of
+          systemd.
+
+          Additionally, if `dropPrivileges` is `true` then `data_dir`
+          **cannot** be customized.  Setting `dropPrivileges` to `true` enables
+          the `DynamicUser` feature of systemd which directly manages and
+          operates on `StateDirectory`.
         '';
         example = literalExample ''
           {

From 58fe45936e89afef1e3ac35f80d07eb6b0a7ab20 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Mon, 18 Jan 2021 09:05:59 -0500
Subject: [PATCH 744/956] nixos/nomad: move serviceConfig into mkMerge and mkIf
 for docker SupplementaryGroups

---
 nixos/modules/services/networking/nomad.nix | 39 +++++++++++----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index b58b5c9182c..10fe63f8425 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -122,25 +122,26 @@ in
         iptables
       ]);
 
-      serviceConfig = {
-        DynamicUser = cfg.dropPrivileges;
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-        ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" +
-          concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths;
-        KillMode = "process";
-        KillSignal = "SIGINT";
-        LimitNOFILE = 65536;
-        LimitNPROC = "infinity";
-        OOMScoreAdjust = -1000;
-        Restart = "on-failure";
-        RestartSec = 2;
-        # Agrees with the default `data_dir = "/var/lib/nomad"` in `settings` above.
-        StateDirectory = "nomad";
-        TasksMax = "infinity";
-        User = optionalString cfg.dropPrivileges "nomad";
-      } // (optionalAttrs cfg.enableDocker {
-        SupplementaryGroups = "docker"; # space-separated string
-      });
+      serviceConfig = mkMerge [
+        {
+          DynamicUser = cfg.dropPrivileges;
+          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          ExecStart = "${cfg.package}/bin/nomad agent -config=/etc/nomad.json" +
+            concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths;
+          KillMode = "process";
+          KillSignal = "SIGINT";
+          LimitNOFILE = 65536;
+          LimitNPROC = "infinity";
+          OOMScoreAdjust = -1000;
+          Restart = "on-failure";
+          RestartSec = 2;
+          # Agrees with the default `data_dir = "/var/lib/nomad"` in `settings` above.
+          StateDirectory = "nomad";
+          TasksMax = "infinity";
+          User = optionalString cfg.dropPrivileges "nomad";
+        }
+        (mkIf cfg.enableDocker { SupplementaryGroups = "docker"; }) # space-separated string
+      ];
 
       unitConfig = {
         StartLimitIntervalSec = 10;

From b80c4544592fe8cf665c4e76b91f912c50877c51 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Mon, 18 Jan 2021 09:07:09 -0500
Subject: [PATCH 745/956] nixos/nomad: add mkIf for StateDirectory

---
 nixos/modules/services/networking/nomad.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 10fe63f8425..0845b4f97b8 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -135,12 +135,11 @@ in
           OOMScoreAdjust = -1000;
           Restart = "on-failure";
           RestartSec = 2;
-          # Agrees with the default `data_dir = "/var/lib/nomad"` in `settings` above.
-          StateDirectory = "nomad";
           TasksMax = "infinity";
           User = optionalString cfg.dropPrivileges "nomad";
         }
         (mkIf cfg.enableDocker { SupplementaryGroups = "docker"; }) # space-separated string
+        (mkIf (cfg.settings.data_dir == "/var/lib/nomad") { StateDirectory = "nomad"; })
       ];
 
       unitConfig = {

From b72a46713f12a311a9e5455a8fc446cd981850bb Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Mon, 18 Jan 2021 09:07:56 -0500
Subject: [PATCH 746/956] nixos/nomad: reformat SupplementaryGroups expression

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

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 0845b4f97b8..3f06490faa7 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -138,7 +138,9 @@ in
           TasksMax = "infinity";
           User = optionalString cfg.dropPrivileges "nomad";
         }
-        (mkIf cfg.enableDocker { SupplementaryGroups = "docker"; }) # space-separated string
+        (mkIf cfg.enableDocker {
+          SupplementaryGroups = "docker"; # space-separated string
+        })
         (mkIf (cfg.settings.data_dir == "/var/lib/nomad") { StateDirectory = "nomad"; })
       ];
 

From bddb7ac4066574c868091a5bbd10f770bdae0c32 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Mon, 18 Jan 2021 09:17:32 -0500
Subject: [PATCH 747/956] nixos/nomad: fix typo and spell out ExecStartPre
 usage

---
 nixos/modules/services/networking/nomad.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 3f06490faa7..80dcbe16f12 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -71,9 +71,10 @@ in
 
           If `data_dir` is set to a value other than the default value of
           `"/var/lib/nomad"` it is the Nomad cluster manager's responsibility
-          to make sure that this directory exist and has the appropriate
-          permissions. One way to do this is with the `ExecStartPre` feature of
-          systemd.
+          to make sure that this directory exists and has the appropriate
+          permissions. One way to ensure this is the case to create the
+          directory and adjust its permissions as needed using the
+          `ExecStartPre` feature of systemd.
 
           Additionally, if `dropPrivileges` is `true` then `data_dir`
           **cannot** be customized.  Setting `dropPrivileges` to `true` enables

From 5d0b3b7228b6a89033adb7df07db82efb7951b6f Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Tue, 19 Jan 2021 07:21:31 -0500
Subject: [PATCH 748/956] nixos/nomad: fix markup and remove suggestion

---
 nixos/modules/services/networking/nomad.nix | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 80dcbe16f12..7951930c3a1 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -67,19 +67,19 @@ in
           Configuration for Nomad. See the <link xlink:href="https://www.nomadproject.io/docs/configuration">documentation</link>
           for supported values.
 
-          Notes about `data_dir`:
+          Notes about <literal>data_dir</literal>:
 
-          If `data_dir` is set to a value other than the default value of
-          `"/var/lib/nomad"` it is the Nomad cluster manager's responsibility
-          to make sure that this directory exists and has the appropriate
-          permissions. One way to ensure this is the case to create the
-          directory and adjust its permissions as needed using the
-          `ExecStartPre` feature of systemd.
+          If <literal>data_dir</literal> is set to a value other than the
+          default value of <literal>"/var/lib/nomad"</literal> it is the Nomad
+          cluster manager's responsibility to make sure that this directory
+          exists and has the appropriate permissions.
 
-          Additionally, if `dropPrivileges` is `true` then `data_dir`
-          **cannot** be customized.  Setting `dropPrivileges` to `true` enables
-          the `DynamicUser` feature of systemd which directly manages and
-          operates on `StateDirectory`.
+          Additionally, if <literal>dropPrivileges</literal> is
+          <literal>true</literal> then <literal>data_dir</literal>
+          <emphasis>cannot</emphasis> be customized. Setting
+          <literal>dropPrivileges</literal> to <literal>true</literal> enables
+          the <literal>DynamicUser</literal> feature of systemd which directly
+          manages and operates on <literal>StateDirectory</literal>.
         '';
         example = literalExample ''
           {

From 12b9249cf3cf4024b9ac4956e577126163110755 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Tue, 19 Jan 2021 07:24:04 -0500
Subject: [PATCH 749/956] nixos/nomad: unconditionally set user to nomad

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

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 7951930c3a1..571baf67154 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -137,7 +137,7 @@ in
           Restart = "on-failure";
           RestartSec = 2;
           TasksMax = "infinity";
-          User = optionalString cfg.dropPrivileges "nomad";
+          User = "nomad";
         }
         (mkIf cfg.enableDocker {
           SupplementaryGroups = "docker"; # space-separated string

From 5ce4ce61746c19f09ae1504a49f3216de6770055 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sat, 23 Jan 2021 18:04:26 -0500
Subject: [PATCH 750/956] nixos/nomad: make formatting consistent in mkMerge
 call

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

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 571baf67154..87b4ff18818 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -142,7 +142,9 @@ in
         (mkIf cfg.enableDocker {
           SupplementaryGroups = "docker"; # space-separated string
         })
-        (mkIf (cfg.settings.data_dir == "/var/lib/nomad") { StateDirectory = "nomad"; })
+        (mkIf (cfg.settings.data_dir == "/var/lib/nomad") {
+          StateDirectory = "nomad";
+        })
       ];
 
       unitConfig = {

From de71f5b50670908026842672aebe2565d239cda0 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sat, 23 Jan 2021 18:19:50 -0500
Subject: [PATCH 751/956] nixos/tests: add test for custom nomad state
 directory

---
 nixos/tests/nomad.nix | 68 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/nomad.nix b/nixos/tests/nomad.nix
index bd052152bd6..51b11a8fef9 100644
--- a/nixos/tests/nomad.nix
+++ b/nixos/tests/nomad.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { lib, ... }: {
     name = "nomad";
     nodes = {
-      server = { pkgs, lib, ... }: {
+      default_server = { pkgs, lib, ... }: {
         networking = {
           interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [{
             address = "192.168.1.1";
@@ -30,24 +30,68 @@ import ./make-test-python.nix (
           enableDocker = false;
         };
       };
+
+      custom_state_dir_server = { pkgs, lib, ... }: {
+        networking = {
+          interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [{
+            address = "192.168.1.1";
+            prefixLength = 16;
+          }];
+        };
+
+        environment.etc."nomad.custom.json".source =
+          (pkgs.formats.json { }).generate "nomad.custom.json" {
+            region = "universe";
+            datacenter = "earth";
+          };
+
+        services.nomad = {
+          enable = true;
+          dropPrivileges = false;
+
+          settings = {
+            data_dir = "/nomad/data/dir";
+            server = {
+              enabled = true;
+              bootstrap_expect = 1;
+            };
+          };
+
+          extraSettingsPaths = [ "/etc/nomad.custom.json" ];
+          enableDocker = false;
+        };
+
+        systemd.services.nomad.serviceConfig.ExecStartPre = "${pkgs.writeShellScript "mk_data_dir" ''
+          set -euxo pipefail
+
+          ${pkgs.coreutils}/bin/mkdir -p /nomad/data/dir
+        ''}";
+      };
     };
 
     testScript = ''
-      server.wait_for_unit("nomad.service")
+      def test_nomad_server(server):
+          server.wait_for_unit("nomad.service")
 
-      # wait for healthy server
-      server.wait_until_succeeds(
-          "[ $(nomad operator raft list-peers | grep true | wc -l) == 1 ]"
-      )
+          # wait for healthy server
+          server.wait_until_succeeds(
+              "[ $(nomad operator raft list-peers | grep true | wc -l) == 1 ]"
+          )
 
-      # wait for server liveness
-      server.succeed("[ $(nomad server members | grep -o alive | wc -l) == 1 ]")
+          # wait for server liveness
+          server.succeed("[ $(nomad server members | grep -o alive | wc -l) == 1 ]")
 
-      # check the region
-      server.succeed("nomad server members | grep -o universe")
+          # check the region
+          server.succeed("nomad server members | grep -o universe")
 
-      # check the datacenter
-      server.succeed("[ $(nomad server members | grep -o earth | wc -l) == 1 ]")
+          # check the datacenter
+          server.succeed("[ $(nomad server members | grep -o earth | wc -l) == 1 ]")
+
+
+      servers = [default_server, custom_state_dir_server]
+
+      for server in servers:
+          test_nomad_server(server)
     '';
   }
 )

From 2a3cb407b04d322fd72bedc74b2751c40c36b4f1 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sat, 23 Jan 2021 18:20:17 -0500
Subject: [PATCH 752/956] nixos/nomad: only set User if privileges are dropped

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

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 87b4ff18818..60fefa2a1da 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -137,7 +137,7 @@ in
           Restart = "on-failure";
           RestartSec = 2;
           TasksMax = "infinity";
-          User = "nomad";
+          User = optionalString cfg.dropPrivileges "nomad";
         }
         (mkIf cfg.enableDocker {
           SupplementaryGroups = "docker"; # space-separated string

From c7c3b9e4ae1396ee7c8291794a69141ff40508e3 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sat, 23 Jan 2021 19:44:28 -0500
Subject: [PATCH 753/956] nixos/nomad: remove User setting entirely

---
 nixos/modules/services/networking/nomad.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/nomad.nix b/nixos/modules/services/networking/nomad.nix
index 60fefa2a1da..9f1b443b89b 100644
--- a/nixos/modules/services/networking/nomad.nix
+++ b/nixos/modules/services/networking/nomad.nix
@@ -137,7 +137,6 @@ in
           Restart = "on-failure";
           RestartSec = 2;
           TasksMax = "infinity";
-          User = optionalString cfg.dropPrivileges "nomad";
         }
         (mkIf cfg.enableDocker {
           SupplementaryGroups = "docker"; # space-separated string

From 90f73381120f7ae9e0d5f0f6dc16cb141c658494 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 24 Jan 2021 01:40:18 +0100
Subject: [PATCH 754/956] treewide: stdenv.lib -> lib

---
 .github/CONTRIBUTING.md                       |  2 +-
 nixos/tests/usbguard.nix                      |  2 +-
 .../graphics/hdr-plus/default.nix             |  4 +--
 pkgs/applications/misc/rescuetime/default.nix |  4 +--
 pkgs/applications/radio/klog/default.nix      |  4 +--
 .../science/biology/migrate/default.nix       |  4 +--
 .../alternatives/blas/default.nix             |  2 +-
 .../alternatives/lapack/default.nix           |  2 +-
 pkgs/build-support/appimage/default.nix       |  5 ++--
 pkgs/build-support/docker/default.nix         |  2 +-
 .../docker/nix-prefetch-docker.nix            |  8 +++---
 .../dotnetenv/build-solution.nix              |  4 +--
 pkgs/build-support/dotnetenv/default.nix      |  4 +--
 .../fetchmavenartifact/default.nix            | 17 ++++++------
 .../build-support/icon-conv-tools/default.nix |  8 +++---
 pkgs/build-support/libredirect/default.nix    |  4 +--
 pkgs/build-support/ocaml/default.nix          |  4 +--
 pkgs/build-support/ocaml/dune.nix             |  4 +--
 pkgs/build-support/ocaml/oasis.nix            |  4 +--
 .../pkg-config-wrapper/default.nix            |  5 ++--
 pkgs/build-support/plugins.nix                |  4 +--
 pkgs/build-support/release/debian-build.nix   |  7 +++--
 pkgs/build-support/release/default.nix        |  8 +++---
 pkgs/build-support/release/nix-build.nix      | 12 ++++-----
 .../rust/default-crate-overrides.nix          |  6 ++---
 pkgs/build-support/rust/default.nix           | 27 ++++++++++---------
 pkgs/build-support/rust/fetchCargoTarball.nix |  4 +--
 .../singularity-tools/default.nix             |  3 ++-
 .../skaware/build-skaware-package.nix         |  7 +++--
 .../build-support/skaware/clean-packaging.nix |  4 +--
 .../substitute-files/substitute-all-files.nix |  6 ++---
 pkgs/build-support/templaterpm/default.nix    |  2 +-
 pkgs/build-support/vm/default.nix             |  5 ++--
 pkgs/build-support/writers/test.nix           |  2 +-
 pkgs/common-updater/scripts.nix               |  4 +--
 .../games/shattered-pixel-dungeon/default.nix |  4 +--
 pkgs/os-specific/linux/statifier/default.nix  |  4 +--
 pkgs/servers/fiche/default.nix                |  4 +--
 pkgs/servers/foundationdb/vsmake.nix          |  2 +-
 pkgs/servers/http/envoy/default.nix           |  5 ++--
 pkgs/test/cc-wrapper/default.nix              | 20 +++++++-------
 pkgs/test/cc-wrapper/multilib.nix             |  4 +--
 pkgs/test/install-shell-files/default.nix     |  4 +--
 pkgs/test/ld-library-path/default.nix         |  4 +--
 pkgs/test/patch-shebangs/default.nix          |  4 +--
 pkgs/test/stdenv-inputs/default.nix           |  8 +++---
 pkgs/tools/graphics/metapixel/default.nix     |  4 +--
 pkgs/tools/networking/lxi-tools/default.nix   |  4 +--
 pkgs/tools/text/source-highlight/default.nix  |  2 +-
 49 files changed, 134 insertions(+), 133 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 31060040c1a..bc43f80a060 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -37,7 +37,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
   * Not start with the package name.
   * Not have a period at the end.
 * `meta.license` must be set and fit the upstream license.
-  * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
+  * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
 * `meta.maintainers` must be set.
 
 See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
diff --git a/nixos/tests/usbguard.nix b/nixos/tests/usbguard.nix
index a5d78f316fb..cba905db44f 100644
--- a/nixos/tests/usbguard.nix
+++ b/nixos/tests/usbguard.nix
@@ -1,6 +1,6 @@
 import ./make-test-python.nix ({ pkgs, ... }: {
   name = "usbguard";
-  meta = with pkgs.stdenv.lib.maintainers; {
+  meta = with pkgs.lib.maintainers; {
     maintainers = [ tnias ];
   };
 
diff --git a/pkgs/applications/graphics/hdr-plus/default.nix b/pkgs/applications/graphics/hdr-plus/default.nix
index 107694b2fcd..15042e6877f 100644
--- a/pkgs/applications/graphics/hdr-plus/default.nix
+++ b/pkgs/applications/graphics/hdr-plus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ lib, stdenv, fetchFromGitHub, fetchpatch
 , cmake, halide
 , libpng, libjpeg, libtiff, libraw
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Burst photography pipeline based on Google's HDR+";
     homepage = "https://www.timothybrooks.com/tech/hdr-plus/";
     license = licenses.mit;
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index ddb99c35d05..476a441ae05 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -38,10 +38,10 @@ in mkDerivation rec {
   passthru.updateScript = writeScript "${pname}-updater" ''
     #!${stdenv.shell}
     set -eu -o pipefail
-    PATH=${stdenv.lib.makeBinPath [curl pup common-updater-scripts]}:$PATH
+    PATH=${lib.makeBinPath [curl pup common-updater-scripts]}:$PATH
     latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')"
 
-    for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do
+    for platform in ${lib.concatStringsSep " " meta.platforms}; do
       # The script will not perform an update when the version attribute is up to date from previous platform run
       # We need to clear it before each run
       update-source-version ${pname} 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform
diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix
index cb8ac9fe5dd..080011e167e 100644
--- a/pkgs/applications/radio/klog/default.nix
+++ b/pkgs/applications/radio/klog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
+{ lib, stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "klog";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   qmakeFlags = [ "KLog.pro" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A multiplatform free hamradio logger";
     longDescription = ''
       KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management,
diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix
index ba55898e4f9..41a2e89f02c 100644
--- a/pkgs/applications/science/biology/migrate/default.nix
+++ b/pkgs/applications/science/biology/migrate/default.nix
@@ -1,4 +1,4 @@
-{ gccStdenv, fetchurl, zlib, mpi }:
+{ lib, gccStdenv, fetchurl, zlib, mpi }:
 
 gccStdenv.mkDerivation rec {
   version = "3.7.2";
@@ -14,7 +14,7 @@ gccStdenv.mkDerivation rec {
   buildFlags = [ "thread" "mpis" ];
   preInstall = "mkdir -p $out/man/man1";
 
-  meta = with gccStdenv.lib; {
+  meta = with lib; {
     description = "Estimates population size, migration, population splitting parameters using genetic/genomic data";
     homepage = "https://peterbeerli.com/migrate-html5/index.html";
     license = licenses.mit;
diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix
index 5ebbc737e11..cf880677fdd 100644
--- a/pkgs/build-support/alternatives/blas/default.nix
+++ b/pkgs/build-support/alternatives/blas/default.nix
@@ -132,7 +132,7 @@ Description: BLAS C implementation
 Cflags: -I$dev/include
 Libs: -L$out/lib -lcblas
 EOF
-'' + stdenv.lib.optionalString (blasImplementation == "mkl") ''
+'' + lib.optionalString (blasImplementation == "mkl") ''
   mkdir -p $out/nix-support
   echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook
   ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary}
diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix
index 98b458b778a..7e74eb96b74 100644
--- a/pkgs/build-support/alternatives/lapack/default.nix
+++ b/pkgs/build-support/alternatives/lapack/default.nix
@@ -98,7 +98,7 @@ Description: LAPACK C implementation
 Cflags: -I$dev/include
 Libs: -L$out/lib -llapacke
 EOF
-'' + stdenv.lib.optionalString (lapackImplementation == "mkl") ''
+'' + lib.optionalString (lapackImplementation == "mkl") ''
   mkdir -p $out/nix-support
   echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook
   ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary}
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index e6014e35aef..170c25dffe2 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , bash
 , binutils-unwrapped
 , coreutils
@@ -15,7 +16,7 @@ rec {
     src = ./appimage-exec.sh;
     isExecutable = true;
     dir = "bin";
-    path = with pkgs; stdenv.lib.makeBinPath [
+    path = lib.makeBinPath [
       bash
       binutils-unwrapped
       coreutils
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 916d3cd003e..0c9d4f110ad 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -94,7 +94,7 @@ rec {
       inherit imageDigest;
       imageName = finalImageName;
       imageTag = finalImageTag;
-      impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
+      impureEnvVars = lib.fetchers.proxyImpureEnvVars;
       outputHashMode = "flat";
       outputHashAlgo = "sha256";
       outputHash = sha256;
diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix
index 6341eb0154b..61e917461ed 100644
--- a/pkgs/build-support/docker/nix-prefetch-docker.nix
+++ b/pkgs/build-support/docker/nix-prefetch-docker.nix
@@ -1,6 +1,4 @@
-{ stdenv, makeWrapper, nix, skopeo, jq }:
-
-with stdenv.lib;
+{ lib, stdenv, makeWrapper, nix, skopeo, jq }:
 
 stdenv.mkDerivation {
   name = "nix-prefetch-docker";
@@ -12,13 +10,13 @@ stdenv.mkDerivation {
   installPhase = ''
     install -vD ${./nix-prefetch-docker} $out/bin/$name;
     wrapProgram $out/bin/$name \
-      --prefix PATH : ${makeBinPath [ nix skopeo jq ]} \
+      --prefix PATH : ${lib.makeBinPath [ nix skopeo jq ]} \
       --set HOME /homeless-shelter
   '';
 
   preferLocalBuild = true;
 
-  meta = {
+  meta = with lib; {
     description = "Script used to obtain source hashes for dockerTools.pullImage";
     maintainers = with maintainers; [ offline ];
     platforms = platforms.unix;
diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix
index 57af1fe9bd4..b3372b94217 100644
--- a/pkgs/build-support/dotnetenv/build-solution.nix
+++ b/pkgs/build-support/dotnetenv/build-solution.nix
@@ -1,4 +1,4 @@
-{stdenv, dotnetfx}:
+{ lib, stdenv, dotnetfx }:
 { name
 , src
 , baseDir ? "."
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   '';
 
   preBuild = ''
-    ${stdenv.lib.optionalString modifyPublicMain ''
+    ${lib.optionalString modifyPublicMain ''
       sed -i -e "s|static void Main|public static void Main|" ${mainClassFile}
     ''}
     ${preBuild}
diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix
index c7145504eb7..3015db42b07 100644
--- a/pkgs/build-support/dotnetenv/default.nix
+++ b/pkgs/build-support/dotnetenv/default.nix
@@ -1,9 +1,9 @@
-{stdenv, dotnetfx}:
+{ lib, stdenv, dotnetfx }:
 
 let dotnetenv =
 {
   buildSolution = import ./build-solution.nix {
-    inherit stdenv;
+    inherit lib stdenv;
     dotnetfx = dotnetfx.pkg;
   };
 
diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix
index 42162638e72..4274b4b52bf 100644
--- a/pkgs/build-support/fetchmavenartifact/default.nix
+++ b/pkgs/build-support/fetchmavenartifact/default.nix
@@ -1,6 +1,6 @@
 # Adaptation of the MIT-licensed work on `sbt2nix` done by Charles O'Farrell
 
-{ fetchurl, stdenv }:
+{ lib, fetchurl, stdenv }:
 let
   defaultRepos = [
     "https://repo1.maven.org/maven2"
@@ -36,21 +36,20 @@ assert (url == "") || (urls == []);
 # if repos is empty, then url or urls must be specified.
 assert (repos != []) || (url != "") || (urls != []);
 
-
 let
   name_ =
-    with stdenv.lib; concatStrings [
-      (replaceChars ["."] ["_"] groupId) "_"
-      (replaceChars ["."] ["_"] artifactId) "-"
+    lib.concatStrings [
+      (lib.replaceChars ["."] ["_"] groupId) "_"
+      (lib.replaceChars ["."] ["_"] artifactId) "-"
       version
     ];
   mkJarUrl = repoUrl:
-    with stdenv.lib; concatStringsSep "/" [
-      (removeSuffix "/" repoUrl)
-      (replaceChars ["."] ["/"] groupId)
+    lib.concatStringsSep "/" [
+      (lib.removeSuffix "/" repoUrl)
+      (lib.replaceChars ["."] ["/"] groupId)
       artifactId
       version
-      "${artifactId}-${version}${optionalString (!isNull classifier) "-${classifier}"}.jar"
+      "${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar"
     ];
   urls_ =
     if url != "" then [url]
diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix
index 0ea18d8768a..79d3838e688 100644
--- a/pkgs/build-support/icon-conv-tools/default.nix
+++ b/pkgs/build-support/icon-conv-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, icoutils }:
+{ lib, stdenv, icoutils }:
 
 stdenv.mkDerivation {
   name = "icon-conv-tools-0.0.0";
@@ -23,9 +23,9 @@ stdenv.mkDerivation {
   dontPatchELF = true;
   dontStrip = true;
 
-  meta = {
+  meta = with lib; {
     description = "Tools for icon conversion specific to nix package manager";
-    maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with maintainers; [ jraygauthier ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix
index 6e54e2a696c..70da5bf5b5f 100644
--- a/pkgs/build-support/libredirect/default.nix
+++ b/pkgs/build-support/libredirect/default.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
     )
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with lib; {
+    platforms = platforms.unix;
     description = "An LD_PRELOAD library to intercept and rewrite the paths in glibc calls";
     longDescription = ''
       libredirect is an LD_PRELOAD library to intercept and rewrite the paths in
diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix
index 3957b955a2c..88ed3dfc2c2 100644
--- a/pkgs/build-support/ocaml/default.nix
+++ b/pkgs/build-support/ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }:
+{ lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }:
 
 { name, version, buildInputs ? [],
   createFindlibDestdir ?  true,
@@ -14,7 +14,7 @@ let
   };
 in
   assert minimumSupportedOcamlVersion != null ->
-          stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
+          lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
 
 stdenv.mkDerivation (args // {
   name = "ocaml-${name}-${version}";
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix
index fce0096c83d..f9f59b21510 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@@ -1,11 +1,11 @@
-{ stdenv, ocaml, findlib, dune, dune_2 }:
+{ lib, stdenv, ocaml, findlib, dune, dune_2 }:
 
 { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args:
 
 let Dune = if args.useDune2 or false then dune_2 else dune; in
 
 if args ? minimumOCamlVersion &&
-   ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
+   ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion
 then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
 else
 
diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index c1d1d699765..ee231a6e258 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }:
+{ lib, stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }:
 
 { pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
   minimumOCamlVersion ? null,
@@ -8,7 +8,7 @@
 }@args:
 
 if args ? minimumOCamlVersion &&
-   ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
+   ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion
 then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
 else
 
diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix
index e01df107dd1..b61936c50a8 100644
--- a/pkgs/build-support/pkg-config-wrapper/default.nix
+++ b/pkgs/build-support/pkg-config-wrapper/default.nix
@@ -2,6 +2,7 @@
 # PKG_CONFIG_PATH_FOR_BUILD work properly.
 
 { stdenvNoCC
+, lib
 , buildPackages
 , pkg-config
 , baseBinName ? "pkg-config"
@@ -19,7 +20,7 @@ let
   #
   # TODO(@Ericson2314) Make unconditional, or optional but always true by
   # default.
-  targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
+  targetPrefix = lib.optionalString (targetPlatform != hostPlatform)
                                         (targetPlatform.config + "-");
 
   # See description in cc-wrapper.
@@ -119,7 +120,7 @@ stdenv.mkDerivation {
     let pkg-config_ = if pkg-config != null then pkg-config else {}; in
     (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) //
     { description =
-        stdenv.lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_
+        lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_
         + " (wrapper script)";
       priority = 10;
   };
diff --git a/pkgs/build-support/plugins.nix b/pkgs/build-support/plugins.nix
index bf8a982a88f..1ed74851597 100644
--- a/pkgs/build-support/plugins.nix
+++ b/pkgs/build-support/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv }:
+{ lib, stdenv }:
 # helper functions for packaging programs with plugin systems
 {
 
@@ -13,7 +13,7 @@
   diffPlugins = expectedPlugins: foundPluginsFilePath: ''
      # sort both lists first
      plugins_expected=$(mktemp)
-     (${stdenv.lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \
+     (${lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \
        | sort -u > "$plugins_expected"
      plugins_found=$(mktemp)
      sort -u "${foundPluginsFilePath}" > "$plugins_found"
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index dfa896a86a6..9ac335d288a 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -2,6 +2,7 @@
 # that contains a Debian-like (i.e. dpkg-based) OS.
 
 { name ? "debian-build"
+, lib
 , diskImage
 , src, stdenv, vmTools, checkinstall
 , fsTranslation ? false
@@ -11,8 +12,6 @@
   debRequires ? []
 , ... } @ args:
 
-with stdenv.lib;
-
 vmTools.runInLinuxImage (stdenv.mkDerivation (
 
   {
@@ -59,8 +58,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
       export PAGER=cat
       ${checkinstall}/sbin/checkinstall --nodoc -y -D \
         --fstrans=${if fsTranslation then "yes" else "no"} \
-        --requires="${concatStringsSep "," debRequires}" \
-        --provides="${concatStringsSep "," debProvides}" \
+        --requires="${lib.concatStringsSep "," debRequires}" \
+        --provides="${lib.concatStringsSep "," debProvides}" \
         ${if (src ? version) then "--pkgversion=$(echo ${src.version} | tr _ -)"
                              else "--pkgversion=0.0.0"} \
         ''${debMaintainer:+--maintainer="'$debMaintainer'"} \
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index 6aaa0338f0c..0276fa1be61 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ lib, pkgs }:
 
 with pkgs;
 
@@ -23,7 +23,7 @@ rec {
     } // args);
 
   nixBuild = args: import ./nix-build.nix (
-    { inherit stdenv;
+    { inherit lib stdenv;
     } // args);
 
   coverageAnalysis = args: nixBuild (
@@ -46,7 +46,7 @@ rec {
     } // args);
 
   debBuild = args: import ./debian-build.nix (
-    { inherit stdenv vmTools checkinstall;
+    { inherit lib stdenv vmTools checkinstall;
     } // args);
 
   aggregate =
@@ -94,7 +94,7 @@ rec {
 
       phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 
-      patchPhase = stdenv.lib.optionalString isNixOS ''
+      patchPhase = lib.optionalString isNixOS ''
         touch .update-on-nixos-rebuild
       '';
 
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index feda54de46f..97df52eaced 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -12,7 +12,7 @@
 , doCoverityAnalysis ? false
 , lcovFilter ? []
 , lcovExtraTraceFiles ? []
-, src, stdenv
+, src, lib, stdenv
 , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
 , failureHook ? null
 , prePhases ? []
@@ -69,7 +69,7 @@ stdenv.mkDerivation (
         fi
       '';
 
-    failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) +
+    failureHook = (lib.optionalString (failureHook != null) failureHook) +
     ''
       if test -n "$succeedOnFailure"; then
           if test -n "$keepBuildDirectory"; then
@@ -136,10 +136,10 @@ stdenv.mkDerivation (
 
     buildInputs =
       buildInputs ++
-      (stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport) ++
-      (stdenv.lib.optional doClangAnalysis args.clang-analyzer) ++
-      (stdenv.lib.optional doCoverityAnalysis args.cov-build) ++
-      (stdenv.lib.optional doCoverityAnalysis args.xz);
+      (lib.optional doCoverageAnalysis args.makeGCOVReport) ++
+      (lib.optional doClangAnalysis args.clang-analyzer) ++
+      (lib.optional doCoverityAnalysis args.cov-build) ++
+      (lib.optional doCoverityAnalysis args.xz);
 
     lcovFilter = ["/nix/store/*"] ++ lcovFilter;
 
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 4ff8640c2ff..3d2dc3733c2 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2,
+{ lib, stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2,
   openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3,
   libsodium, postgresql, gmp, foundationdb, capnproto, nettle, clang,
   llvmPackages, ... }:
@@ -17,7 +17,7 @@ in
 
   cargo = attrs: {
     buildInputs = [ openssl zlib curl ]
-      ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
+      ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
   };
 
   libz-sys = attrs: {
@@ -149,7 +149,7 @@ in
   };
 
   serde_derive = attrs: {
-    buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+    buildInputs = lib.optional stdenv.isDarwin Security;
   };
 
   thrussh-libsodium = attrs: {
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 9e8e32035d0..dc86a7dc581 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , buildPackages
 , cacert
 , cargo
@@ -83,13 +84,13 @@ let
       cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
     '';
 
-  targetIsJSON = stdenv.lib.hasSuffix ".json" target;
+  targetIsJSON = lib.hasSuffix ".json" target;
   useSysroot = targetIsJSON && !__internal_dontAddSysroot;
 
   # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168
   # the "${}" is needed to transform the path into a /nix/store path before baseNameOf
   shortTarget = if targetIsJSON then
-      (stdenv.lib.removeSuffix ".json" (builtins.baseNameOf "${target}"))
+      (lib.removeSuffix ".json" (builtins.baseNameOf "${target}"))
     else target;
 
   sysroot = (callPackage ./sysroot {}) {
@@ -116,7 +117,7 @@ in
 # See https://os.phil-opp.com/testing/ for more information.
 assert useSysroot -> !(args.doCheck or true);
 
-stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optionalAttrs useSysroot {
+stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs useSysroot {
   RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
 } // {
   inherit cargoDeps;
@@ -124,7 +125,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional
   patchRegistryDeps = ./patch-registry-deps;
 
   nativeBuildInputs = nativeBuildInputs ++ [ cacert git cargo rustc ];
-  buildInputs = buildInputs ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
+  buildInputs = buildInputs ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
 
   patches = cargoPatches ++ patches;
 
@@ -147,11 +148,11 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional
     cat >> .cargo/config <<'EOF'
     [target."${rust.toRustTarget stdenv.buildPlatform}"]
     "linker" = "${ccForBuild}"
-    ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
+    ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
     [target."${shortTarget}"]
     "linker" = "${ccForHost}"
     ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633
-      stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) ''
+      lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) ''
     "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
     ''}
     ''}
@@ -163,7 +164,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional
   # After unpacking and applying patches, check that the Cargo.lock matches our
   # src package. Note that we do this after the patchPhase, because the
   # patchPhase may create the Cargo.lock if upstream has not shipped one.
-  postPatch = (args.postPatch or "") + stdenv.lib.optionalString validateCargoDeps ''
+  postPatch = (args.postPatch or "") + lib.optionalString validateCargoDeps ''
     cargoDepsLockfile=$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock
     srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock
 
@@ -206,7 +207,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional
   '';
 
   buildPhase = with builtins; args.buildPhase or ''
-    ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
+    ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
     runHook preBuild
 
     (
@@ -217,14 +218,14 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional
       "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \
       "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \
       cargo build -j $NIX_BUILD_CORES \
-        ${stdenv.lib.optionalString (buildType == "release") "--release"} \
+        ${lib.optionalString (buildType == "release") "--release"} \
         --target ${target} \
         --frozen ${concatStringsSep " " cargoBuildFlags}
     )
 
     runHook postBuild
 
-    ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"}
+    ${lib.optionalString (buildAndTestSubdir != null) "popd"}
 
     # This needs to be done after postBuild: packages like `cargo` do a pushd/popd in
     # the pre/postBuild-hooks that need to be taken into account before gathering
@@ -238,15 +239,15 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional
   '';
 
   checkPhase = args.checkPhase or (let
-    argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen";
+    argstr = "${lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen";
     threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1";
   in ''
-    ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
+    ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
     runHook preCheck
     echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
     cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
     runHook postCheck
-    ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"}
+    ${lib.optionalString (buildAndTestSubdir != null) "popd"}
   '');
 
   doCheck = args.doCheck or true;
diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix
index 0726e5cfa5a..c30e88d99b8 100644
--- a/pkgs/build-support/rust/fetchCargoTarball.nix
+++ b/pkgs/build-support/rust/fetchCargoTarball.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, cargo, python3 }:
+{ lib, stdenv, cacert, git, cargo, python3 }:
 let cargo-vendor-normalise = stdenv.mkDerivation {
   name = "cargo-vendor-normalise";
   src = ./cargo-vendor-normalise.py;
@@ -80,7 +80,7 @@ in stdenv.mkDerivation ({
 
   inherit (hash_) outputHashAlgo outputHash;
 
-  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
+  impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 } // (builtins.removeAttrs args [
   "name" "sha256" "cargoUpdateHook"
 ]))
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 4a54498d117..318f5b430fe 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -1,4 +1,5 @@
 { runCommand
+, lib
 , stdenv
 , storeDir ? builtins.storeDir
 , writeScript
@@ -64,7 +65,7 @@ rec {
             mkdir proc sys dev
 
             # Run root script
-            ${stdenv.lib.optionalString (runAsRoot != null) ''
+            ${lib.optionalString (runAsRoot != null) ''
               mkdir -p ./${storeDir}
               mount --rbind ${storeDir} ./${storeDir}
               unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile}
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index e6e2e35789b..7a5db942b2c 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -1,6 +1,5 @@
-{ stdenv, cleanPackaging, fetchurl }:
-let lib = stdenv.lib;
-in {
+{ lib, stdenv, cleanPackaging, fetchurl }:
+{
   # : string
   pname
   # : string
@@ -98,7 +97,7 @@ in stdenv.mkDerivation {
   meta = {
     homepage = "https://skarnet.org/software/${pname}/";
     inherit description platforms;
-    license = stdenv.lib.licenses.isc;
+    license = lib.licenses.isc;
     maintainers = with lib.maintainers;
       [ pmahoney Profpatsch ] ++ maintainers;
   };
diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix
index 762fe25c0ac..421d00ad24a 100644
--- a/pkgs/build-support/skaware/clean-packaging.nix
+++ b/pkgs/build-support/skaware/clean-packaging.nix
@@ -3,10 +3,10 @@
 # files were either discarded or moved to outputs.
 # This ensures nothing is forgotten and new files
 # are correctly handled on update.
-{ stdenv, file, writeScript }:
+{ lib, stdenv, file, writeScript }:
 
 let
-  globWith = stdenv.lib.concatMapStringsSep "\n";
+  globWith = lib.concatMapStringsSep "\n";
   rmNoise = noiseGlobs: globWith (f:
     ''rm -rf ${f}'') noiseGlobs;
   mvDoc = docGlobs: globWith
diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix
index 66feb695c41..682e976dcfe 100644
--- a/pkgs/build-support/substitute-files/substitute-all-files.nix
+++ b/pkgs/build-support/substitute-files/substitute-all-files.nix
@@ -1,10 +1,10 @@
-{ stdenv }:
+{ lib, stdenv }:
 
 args:
 
 stdenv.mkDerivation ({
   name = if args ? name then args.name else baseNameOf (toString args.src);
-  builder = with stdenv.lib; builtins.toFile "builder.sh" ''
+  builder = builtins.toFile "builder.sh" ''
     source $stdenv/setup
     set -o pipefail
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation ({
     args=
 
     pushd "$src"
-    echo -ne "${concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do
+    echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do
       mkdir -p "$out/$(dirname "$line")"
       substituteAll "$line" "$out/$line"
     done
diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix
index 0f7acc13277..ffe5b0b4581 100644
--- a/pkgs/build-support/templaterpm/default.nix
+++ b/pkgs/build-support/templaterpm/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Create templates of nix expressions from RPM .spec files";
     maintainers = with maintainers; [ tstrobel ];
-    platforms = with stdenv.lib.platforms; unix;
+    platforms = platforms.unix;
     hydraPlatforms = [];
   };
 }
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 215782368f6..759245aed1a 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,4 +1,5 @@
-{ pkgs
+{ lib
+, pkgs
 , kernel ? pkgs.linux
 , img ? pkgs.stdenv.hostPlatform.linux-kernel.target
 , storeDir ? builtins.storeDir
@@ -572,7 +573,7 @@ rec {
       buildCommand = ''
         ${createRootFS}
 
-        PATH=$PATH:${stdenv.lib.makeBinPath [ dpkg dpkg glibc lzma ]}
+        PATH=$PATH:${lib.makeBinPath [ dpkg dpkg glibc lzma ]}
 
         # Unpack the .debs.  We do this to prevent pre-install scripts
         # (which have lots of circular dependencies) from barfing.
diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix
index 0febad2929a..7b7a698376a 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/pkgs/build-support/writers/test.nix
@@ -196,7 +196,7 @@ let
 
 in runCommand "test-writers" {
   passthru = { inherit writeTest bin simple; };
-  meta.platforms = stdenv.lib.platforms.all;
+  meta.platforms = lib.platforms.all;
 } ''
   ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)}
   ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)}
diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix
index 739f44387b3..351db619884 100644
--- a/pkgs/common-updater/scripts.nix
+++ b/pkgs/common-updater/scripts.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }:
+{ lib, stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }:
 
 stdenv.mkDerivation {
   name = "common-updater-scripts";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     cp ${./scripts}/* $out/bin
 
     for f in $out/bin/*; do
-      wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]}
+      wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]}
     done
   '';
 }
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index e9186fbf5b7..eea8d5650be 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -35,7 +35,7 @@ let
     buildPhase = ''
       export GRADLE_USER_HOME=$(mktemp -d)
       # https://github.com/gradle/gradle/issues/4426
-      ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"}
+      ${lib.optionalString stdenv.isDarwin "export TERM=dumb"}
       gradle --no-daemon desktop:release
     '';
     # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
   buildPhase = ''
     export GRADLE_USER_HOME=$(mktemp -d)
     # https://github.com/gradle/gradle/issues/4426
-    ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"}
+    ${lib.optionalString stdenv.isDarwin "export TERM=dumb"}
     # point to offline repo
     sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle
     gradle --offline --no-daemon desktop:release
diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index 376ae47ffbe..5afb399fc16 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -1,4 +1,4 @@
-{ multiStdenv, fetchurl }:
+{ lib, multiStdenv, fetchurl }:
 
 let version = "1.7.4"; in
 multiStdenv.mkDerivation {
@@ -16,7 +16,7 @@ multiStdenv.mkDerivation {
     sed -e s@/bin/bash@"${multiStdenv.shell}"@g -i src/*.sh
   '';
 
-  meta = with multiStdenv.lib; {
+  meta = with lib; {
     description = "Tool for creating static Linux binaries";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/servers/fiche/default.nix b/pkgs/servers/fiche/default.nix
index 10ce1c30a0c..2875f274dc0 100644
--- a/pkgs/servers/fiche/default.nix
+++ b/pkgs/servers/fiche/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "fiche";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line pastebin for sharing terminal output";
     longDescription = ''
       Fiche is a command line pastebin server for sharing terminal output.
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix
index 262ea39ca5b..aac9ab07c0f 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/pkgs/servers/foundationdb/vsmake.nix
@@ -139,7 +139,7 @@ let
 
         outputs = [ "out" "lib" "dev" "pythonsrc" ];
 
-        meta = with gcc6Stdenv.lib; {
+        meta = with lib; {
           description = "Open source, distributed, transactional key-value store";
           homepage    = "https://www.foundationdb.org";
           license     = licenses.asl20;
diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix
index 0da0cb23d76..c297ea38245 100644
--- a/pkgs/servers/http/envoy/default.nix
+++ b/pkgs/servers/http/envoy/default.nix
@@ -1,4 +1,5 @@
-{ buildBazelPackage
+{ lib
+, buildBazelPackage
 , fetchFromGitHub
 , stdenv
 , cmake
@@ -109,7 +110,7 @@ buildBazelPackage rec {
     "--cxxopt=-Wno-uninitialized"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://envoyproxy.io";
     description = "Cloud-native edge and service proxy";
     license = licenses.asl20;
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index fae3448c44c..d82ba296e2f 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, glibc }:
-with stdenv.lib;
+{ lib, stdenv, glibc }:
+
 let
   # Sanitizers are not supported on Darwin.
   # Sanitizer headers aren't available in older libc++ stdenvs due to a bug
   sanitizersWorking = !stdenv.hostPlatform.isMusl && (
-    (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0")
+    (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "5.0.0")
     || (stdenv.cc.isGNU && stdenv.isLinux)
   );
-  staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";
+  staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";
 in stdenv.mkDerivation {
   name = "cc-wrapper-test";
 
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
     $CXX -o cxx-check ${./cxx-main.cc}
     ./cxx-check
 
-    ${optionalString (stdenv.isDarwin && stdenv.cc.isClang) ''
+    ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) ''
       printf "checking whether compiler can build with CoreFoundation.framework... " >&2
       mkdir -p foo/lib
       $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c}
@@ -31,12 +31,12 @@ in stdenv.mkDerivation {
     ''}
 
 
-    ${optionalString (!stdenv.isDarwin) ''
+    ${lib.optionalString (!stdenv.isDarwin) ''
       printf "checking whether compiler builds valid static C binaries... " >&2
       $CC ${staticLibc} -static -o cc-static ${./cc-main.c}
       ./cc-static
       # our glibc does not have pie enabled yet.
-      ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) ''
+      ${lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) ''
         printf "checking whether compiler builds valid static pie C binaries... " >&2
         $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c}
         ./cc-static-pie
@@ -52,7 +52,7 @@ in stdenv.mkDerivation {
     printf "checking whether compiler uses NIX_LDFLAGS... " >&2
     mkdir -p foo/lib
     $CC -shared \
-      ${optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \
+      ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \
       -DVALUE=42 \
       -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \
       ${./foo.c}
@@ -68,7 +68,7 @@ in stdenv.mkDerivation {
     $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c}
     ./nostdinc-main++
 
-    ${optionalString sanitizersWorking ''
+    ${lib.optionalString sanitizersWorking ''
       printf "checking whether sanitizers are fully functional... ">&2
       $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
       ./sanitizers
@@ -77,5 +77,5 @@ in stdenv.mkDerivation {
     touch $out
   '';
 
-  meta.platforms = platforms.all;
+  meta.platforms = lib.platforms.all;
 }
diff --git a/pkgs/test/cc-wrapper/multilib.nix b/pkgs/test/cc-wrapper/multilib.nix
index 5ea50b5eb26..828ad67f6c8 100644
--- a/pkgs/test/cc-wrapper/multilib.nix
+++ b/pkgs/test/cc-wrapper/multilib.nix
@@ -1,4 +1,4 @@
-{ stdenv }:
+{ lib, stdenv }:
 
 stdenv.mkDerivation {
   name = "cc-multilib-test";
@@ -33,5 +33,5 @@ stdenv.mkDerivation {
     touch $out
   '';
 
-  meta.platforms = stdenv.lib.platforms.x86_64;
+  meta.platforms = lib.platforms.x86_64;
 }
diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix
index e3729c7d250..e9d32e4ccf6 100644
--- a/pkgs/test/install-shell-files/default.nix
+++ b/pkgs/test/install-shell-files/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }:
+{ lib, stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }:
 
 let
   runTest = name: env: buildCommand:
     runCommandLocal "install-shell-files--${name}" ({
       nativeBuildInputs = [ installShellFiles ];
-      meta.platforms = stdenv.lib.platforms.all;
+      meta.platforms = lib.platforms.all;
     } // env) buildCommand;
 in
 
diff --git a/pkgs/test/ld-library-path/default.nix b/pkgs/test/ld-library-path/default.nix
index bda3f0be84a..74c52cef253 100644
--- a/pkgs/test/ld-library-path/default.nix
+++ b/pkgs/test/ld-library-path/default.nix
@@ -1,4 +1,4 @@
-{ stdenv }:
+{ lib, stdenv }:
 
 # This tests that libraries listed in LD_LIBRARY_PATH take precedence over those listed in RPATH.
 
@@ -84,5 +84,5 @@ in stdenv.mkDerivation {
     touch $out
   '';
 
-  meta.platforms = stdenv.lib.platforms.linux;
+  meta.platforms = lib.platforms.linux;
 }
diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix
index 3e68d96004f..5e1d859c138 100644
--- a/pkgs/test/patch-shebangs/default.nix
+++ b/pkgs/test/patch-shebangs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand }:
+{ lib, stdenv, runCommand }:
 
 let
   bad-shebang = stdenv.mkDerivation {
@@ -13,7 +13,7 @@ let
   };
 in runCommand "patch-shebangs-test" {
   passthru = { inherit bad-shebang; };
-  meta.platforms = stdenv.lib.platforms.all;
+  meta.platforms = lib.platforms.all;
 } ''
   printf "checking whether patchShebangs works properly... ">&2
   if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then
diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix
index 4db10e75086..6a2e441d019 100644
--- a/pkgs/test/stdenv-inputs/default.nix
+++ b/pkgs/test/stdenv-inputs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv }:
+{ lib, stdenv }:
 
 let
   foo = stdenv.mkDerivation {
@@ -12,7 +12,7 @@ let
       chmod +x $out/bin/foo
       cp ${./foo.c} $out/include/foo.h
       $CC -shared \
-        ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \
+        ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \
         -o $out/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \
         ${./foo.c}
     '';
@@ -30,7 +30,7 @@ let
       chmod +x $out/bin/bar
       cp ${./bar.c} $dev/include/bar.h
       $CC -shared \
-        ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \
+        ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \
         -o $dev/lib/libbar${stdenv.hostPlatform.extensions.sharedLibrary} \
         ${./bar.c}
     '';
@@ -64,5 +64,5 @@ stdenv.mkDerivation {
     touch $out
   '';
 
-  meta.platforms = stdenv.lib.platforms.all;
+  meta.platforms = lib.platforms.all;
 }
diff --git a/pkgs/tools/graphics/metapixel/default.nix b/pkgs/tools/graphics/metapixel/default.nix
index a97be7f809c..8c9fef0cd48 100644
--- a/pkgs/tools/graphics/metapixel/default.nix
+++ b/pkgs/tools/graphics/metapixel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "metapixel";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     cp metapixel-sizesort $out/bin/metapixel-sizesort
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/schani/metapixel";
     description = "Tool for generating photomosaics";
     license = licenses.gpl2Only;
diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix
index 3f3e62fb807..92ef7f688a5 100644
--- a/pkgs/tools/networking/lxi-tools/default.nix
+++ b/pkgs/tools/networking/lxi-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook, pkg-config
 , liblxi, readline, lua
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ liblxi readline lua ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for communicating with LXI compatible instruments";
     longDescription = ''
       lxi-tools is a collection of open source software tools
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index 3d3a0f8c50a..2e60d2a31c0 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   # source-highlight uses it's own binary to generate documentation.
   # During cross-compilation, that binary was built for the target
   # platform architecture, so it can't run on the build host.
-  patchPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     substituteInPlace Makefile.in --replace "src doc tests" "src tests"
   '';
 

From 448484345d3aeb5a2d9d076f4f92061dae34d3b0 Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 19:56:07 +0800
Subject: [PATCH 755/956] maintainers: add berberman

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 11162af66d8..134805b386f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1084,6 +1084,12 @@
     githubId = 75972;
     name = "Ben Booth";
   };
+  berberman = {
+    email = "berberman@yandex.com";
+    github = "berberman";
+    githubId = 26041945;
+    name = "Potato Hatsue";
+  };
   berce = {
     email = "bert.moens@gmail.com";
     github = "berce";

From d3b7a30e15132fccfb2ba4d55b47ae1ebf8c1b4f Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Thu, 21 Jan 2021 14:37:38 +0800
Subject: [PATCH 756/956] breakpad: init at unstable-3b3469e

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

diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/development/misc/breakpad/default.nix
new file mode 100644
index 00000000000..eab8d082131
--- /dev/null
+++ b/pkgs/development/misc/breakpad/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchgit }:
+let
+  lss = fetchgit {
+    url = "https://chromium.googlesource.com/linux-syscall-support";
+    rev = "d9ad2969b369a9f1c455fef92d04c7628f7f9eb8";
+    sha256 = "952dv+ZE1ge/WF5RyHmEqht+AofoRHKAeFmGasVF9BA=";
+  };
+in stdenv.mkDerivation {
+  pname = "breakpad";
+
+  version = "unstable-3b3469e";
+
+  src = fetchgit {
+    url = "https://chromium.googlesource.com/breakpad/breakpad";
+    rev = "3b3469e9ed0de3d02e4450b9b95014a4266cf2ff";
+    sha256 = "bRGOBrGPK+Zxp+KK+E5MFkYlDUNVhVeInVSwq+eCAF0=";
+  };
+
+  postUnpack = ''
+    ln -s ${lss} $sourceRoot/src/third_party/lss
+  '';
+
+  meta = with lib; {
+    description = "An open-source multi-platform crash reporting system";
+    homepage = "https://chromium.googlesource.com/breakpad";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ berberman ];
+    platforms = with platforms; linux ++ darwin ++ windows;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e64ab977473..52059df2c14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -156,6 +156,8 @@ in
 
   bacnet-stack = callPackage ../tools/networking/bacnet-stack {};
 
+  breakpad = callPackage ../development/misc/breakpad {};
+
   # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with:
   # ValueError: ZIP does not support timestamps before 1980
   ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; };

From 596e02c655520f06ce13bc7b847d80189f2ab2cb Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 18:54:03 +0800
Subject: [PATCH 757/956] fcitx5-mozc: init at 2.26.4220.102

---
 pkgs/development/misc/breakpad/default.nix    |   2 +-
 .../tools/inputmethods/fcitx5/fcitx5-mozc.nix | 117 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +-
 3 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix

diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/development/misc/breakpad/default.nix
index eab8d082131..7fb2b329667 100644
--- a/pkgs/development/misc/breakpad/default.nix
+++ b/pkgs/development/misc/breakpad/default.nix
@@ -25,6 +25,6 @@ in stdenv.mkDerivation {
     homepage = "https://chromium.googlesource.com/breakpad";
     license = licenses.bsd3;
     maintainers = with maintainers; [ berberman ];
-    platforms = with platforms; linux ++ darwin ++ windows;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix
new file mode 100644
index 00000000000..08f43b87cfe
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix
@@ -0,0 +1,117 @@
+{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit
+, python3Packages, mesa, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5
+, jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad }:
+let
+  inherit (python3Packages) python gyp six;
+  japanese_usage_dictionary = fetchFromGitHub {
+    owner = "hiroyuki-komatsu";
+    repo = "japanese-usage-dictionary";
+    rev = "e5b3425575734c323e1d947009dd74709437b684";
+    sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
+  };
+  # abseil-cpp in nixpkgs is too old
+  abseil-cpp_2020923 = abseil-cpp.overrideAttrs (old: rec {
+    version = "20200923.2";
+    src = fetchFromGitHub {
+      owner = "abseil";
+      repo = "abseil-cpp";
+      rev = version;
+      sha256 = "G+wkaC4IPtyc/xCUyVFJOcHppPFU7KkhIHjv6uhVKGU=";
+    };
+    cmakeFlags = [ "-DCMAKE_CXX_STANDARD=17" "-DBUILD_SHARED_LIBS=ON" ];
+  });
+  zipcode_rel = "202011";
+  jigyosyo = fetchurl {
+    url = "https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${zipcode_rel}.zip";
+    sha256 = "j7MkNtd4+QTi91EreVig4/OV0o5y1+KIjEJBEmLK/mY=";
+  };
+  x-ken-all = fetchurl {
+    url =
+      "https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-${zipcode_rel}.zip";
+    sha256 = "ExS0Cg3rs0I9IOVbZHLt8UEfk8/LmY9oAHPVVlYuTPw=";
+  };
+
+in clangStdenv.mkDerivation rec {
+  pname = "fcitx5-mozc";
+  version = "2.26.4220.102";
+
+  src = fetchFromGitHub {
+    owner = "fcitx";
+    repo = "mozc";
+    rev = "1882e33b61673b66d63277f82b4c80ae4e506c10";
+    sha256 = "R+w0slVFpqtt7PIr1pyupJjRoQsABVZiMdZ9fKGKAqw=";
+  };
+
+  nativeBuildInputs = [ gyp ninja mesa python pkg-config qt5.wrapQtAppsHook six which unzip ];
+
+  buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp_2020923 jsoncpp gtest gtk2 ];
+
+  patches = [
+    # Support linking system abseil-cpp
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/mozc/-/raw/debian/sid/debian/patches/0007-Update-src-base-absl.gyp.patch";
+      sha256 = "UiS0UScDKyAusXOhc7Bg8dF8ARQQiVTylEhAOxqaZt8=";
+    })
+
+  ];
+
+  postUnpack = ''
+    unzip ${x-ken-all} -d $sourceRoot/src/
+    unzip ${jigyosyo} -d $sourceRoot/src/
+
+    rmdir $sourceRoot/src/third_party/breakpad/
+    ln -s ${breakpad} $sourceRoot/src/third_party/breakpad
+    rmdir $sourceRoot/src/third_party/gtest/
+    ln -s ${gtest} $sourceRoot/src/third_party/gtest
+    rmdir $sourceRoot/src/third_party/gyp/
+    ln -s ${gyp} $sourceRoot/src/third_party/gyp
+    rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
+    ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
+  '';
+
+  # Copied from https://github.com/archlinux/svntogit-community/blob/packages/fcitx5-mozc/trunk/PKGBUILD
+  configurePhase = ''
+    cd src
+    export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_libabseil=1"
+
+    # disable fcitx4
+    rm unix/fcitx/fcitx.gyp
+
+    # gen zip code seed
+    PYTHONPATH="$PWD:$PYTHONPATH" python dictionary/gen_zip_code_seed.py --zip_code="x-ken-all.csv" --jigyosyo="JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
+
+    # use libstdc++ instead of libc++
+    sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi
+
+    # run gyp
+    python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc
+  '';
+
+  buildPhase = ''
+    python build_mozc.py build -c Release \
+      server/server.gyp:mozc_server \
+      gui/gui.gyp:mozc_tool \
+      unix/fcitx5/fcitx5.gyp:fcitx5-mozc
+  '';
+
+  installPhase = ''
+    export PREFIX=$out
+    export _bldtype=Release
+    ../scripts/install_server
+    install -d $out/share/licenses/fcitx5-mozc
+    head -n 29 server/mozc_server.cc > $out/share/licenses/fcitx5-mozc/LICENSE
+    install -m644 data/installer/*.html $out/share/licenses/fcitx5-mozc/
+    install -d $out/share/fcitx5/addon
+    install -d $out/share/fcitx5/inputmethod
+    install -d $out/lib/fcitx5
+    ../scripts/install_fcitx5
+  '';
+
+  meta = with lib; {
+    description = "Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)";
+    homepage = "https://github.com/fcitx/mozc";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ berberman ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52059df2c14..a957421d530 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -156,7 +156,7 @@ in
 
   bacnet-stack = callPackage ../tools/networking/bacnet-stack {};
 
-  breakpad = callPackage ../development/misc/breakpad {};
+  breakpad = callPackage ../development/misc/breakpad { };
 
   # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with:
   # ValueError: ZIP does not support timestamps before 1980
@@ -4017,6 +4017,8 @@ in
 
   fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };
 
+  fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { };
+
   fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };
 
   fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { };

From e8ffe04c79792b94cec06c58b90659aa4e3bf6ea Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 18:58:25 +0800
Subject: [PATCH 758/956] fcitx5: update doc

---
 nixos/modules/i18n/input-method/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix
index 2e7cfaab7b7..4649f9b862a 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
@@ -42,6 +42,7 @@ in
           <itemizedlist>
           <listitem><para>ibus: The intelligent input bus, extra input engines can be added using <literal>i18n.inputMethod.ibus.engines</literal>.</para></listitem>
           <listitem><para>fcitx: A customizable lightweight input method, extra input engines can be added using <literal>i18n.inputMethod.fcitx.engines</literal>.</para></listitem>
+          <listitem><para>fcitx5: The next generation of fcitx, addons (including engines, dictionaries, skins) can be added using <literal>i18n.inputMethod.fcitx5.addons</literal>.</para></listitem>
           <listitem><para>nabi: A Korean input method based on XIM. Nabi doesn't support Qt 5.</para></listitem>
           <listitem><para>uim: The universal input method, is a library with a XIM bridge. uim mainly support Chinese, Japanese and Korean.</para></listitem>
           <listitem><para>hime: An extremely easy-to-use input method framework.</para></listitem>

From 26994cd38489be95bead08a43ee56e8c680fe5c2 Mon Sep 17 00:00:00 2001
From: Sage Raflik <neonfuz@gmail.com>
Date: Sat, 23 Jan 2021 19:16:45 -0600
Subject: [PATCH 759/956] koreader 2020.12 -> 2021.01

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

diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix
index 5bd91f89f91..fd00cefdf39 100644
--- a/pkgs/applications/misc/koreader/default.nix
+++ b/pkgs/applications/misc/koreader/default.nix
@@ -11,12 +11,12 @@
 let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
 in stdenv.mkDerivation rec {
   pname = "koreader";
-  version = "2020.12";
+  version = "2021.01";
 
   src = fetchurl {
     url =
       "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
-    sha256 = "0x97mm7h8kr1jps0hzdgl9irakma85ikrhzr18wc1plmffgv6kwm";
+    sha256 = "0cc7pk27wlvziihggzlrb3wsjmndafa13cy1snqr5x71bb81fv6r";
   };
 
   sourceRoot = ".";

From e3a86d5577e51cb85c44bbe08d0d7ff7409fe5f3 Mon Sep 17 00:00:00 2001
From: Tristan <starcraft66@gmail.com>
Date: Sat, 23 Jan 2021 20:47:06 -0500
Subject: [PATCH 760/956] multimc: Update to latest development build (#110439)

---
 pkgs/games/multimc/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 7a723e0347e..81fc1b98f36 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }:
 
 let
   jdk = jdk8;
-  libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
+  libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
 in mkDerivation rec {
   pname = "multimc";
-  version = "0.6.11";
+  version = "unstable-2021-01-17";
   src = fetchFromGitHub {
     owner = "MultiMC";
     repo = "MultiMC5";
-    rev = version;
-    sha256 = "1jkbmb4sgfk8d93f5l1vd9pkpvhq9sxacc61w0rvf5xmz0wnszmz";
+    rev = "02887536f773643313f15442fc82cebf616da54a";
+    sha256 = "1aykvavcv415lq488hx4ig2a79g5a561jg92gw14fb964r43782i";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [ cmake file makeWrapper ];
@@ -34,6 +34,6 @@ in mkDerivation rec {
     '';
     platforms = platforms.linux;
     license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.cleverca22 ];
+    maintainers = with maintainers; [ cleverca22 starcraft66 ];
   };
 }

From 4702290465abc438e8f8e4ee6a5fa5be8d530741 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 Jan 2021 02:19:52 +0100
Subject: [PATCH 761/956] home-assistant: 2021.1.4 -> 2021.1.5

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 7f1df3049b4..22aafbb86a6 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2021.1.4";
+  version = "2021.1.5";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index a54eca3952f..3a6b5d35320 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -57,7 +57,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2021.1.4";
+  hassVersion = "2021.1.5";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "03aa7kd216rnp8h80nv002ahafiy0031lxk1bkwcirrznphcw7sj";
+    sha256 = "sha256-xi5rHZlhwgEHll3TFlRu7D963tdcQNMmWcoXVjEFLXo=";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling

From fb1c27f9e9fe4e999b608c05438e40d3fe9dc2d6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 Jan 2021 02:37:01 +0100
Subject: [PATCH 762/956] python3Packages.pybotvac: 0.0.18 -> 0.0.20

---
 .../python-modules/pybotvac/default.nix       | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix
index 06ebf85ffe8..ca093ba8e8b 100644
--- a/pkgs/development/python-modules/pybotvac/default.nix
+++ b/pkgs/development/python-modules/pybotvac/default.nix
@@ -1,18 +1,33 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, requests_oauthlib
+, voluptuous
+}:
 
 buildPythonPackage rec {
   pname = "pybotvac";
-  version = "0.0.18";
+  version = "0.0.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f";
+    sha256 = "sha256-1NnTSO4vO3Ryt4vYD5ZTQGr241GqA2KsGRBVowSTCzM=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [
+    requests
+    requests_oauthlib
+    voluptuous
+  ];
+
+  # no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "pybotvac" ];
 
   meta = with lib; {
-    description = "Python package for controlling Neato pybotvac Connected vacuum robot";
+    description = "Python module for interacting with Neato Botvac Connected vacuum robots";
     homepage = "https://github.com/stianaske/pybotvac";
     license = licenses.mit;
     maintainers = with maintainers; [ elseym ];

From c984bc100d6d64c638c075057f66eb6cbe96cf40 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 Jan 2021 02:50:04 +0100
Subject: [PATCH 763/956] python3Packages.pyatmo: 4.2.1 -> 4.2.2

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

diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix
index 22acf872526..6bea15df386 100644
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/pkgs/development/python-modules/pyatmo/default.nix
@@ -12,20 +12,20 @@
 
 buildPythonPackage rec {
   pname = "pyatmo";
-  version = "4.2.1";
+  version = "4.2.2";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jabesq";
-    repo = "netatmo-api-python";
+    repo = "pyatmo";
     rev = "v${version}";
-    sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m";
+    sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I=";
   };
 
   postPatch = ''
     substituteInPlace setup.cfg \
-      --replace "oauthlib~=3.1.0" "oauthlib" \
-      --replace "requests~=2.23.0" "requests"
+      --replace "oauthlib~=3.1" "oauthlib" \
+      --replace "requests~=2.24" "requests"
   '';
 
   propagatedBuildInputs = [

From bbc23a42dbd04e7ea1a17554cc7266ec408d82c2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 Jan 2021 03:34:45 +0100
Subject: [PATCH 764/956] python3Packages.asgi-csrf: 0.7.1 -> 0.8

---
 .../python-modules/asgi-csrf/default.nix      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix
index eabb3d525ca..4988a04e8e4 100644
--- a/pkgs/development/python-modules/asgi-csrf/default.nix
+++ b/pkgs/development/python-modules/asgi-csrf/default.nix
@@ -1,8 +1,17 @@
-{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart
-, pytestCheckHook, starlette, httpx, pytest-asyncio }:
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchFromGitHub
+, itsdangerous
+, python-multipart
+, pytestCheckHook
+, starlette
+, httpx
+, pytest-asyncio
+}:
 
 buildPythonPackage rec {
-  version = "0.7.1";
+  version = "0.8";
   pname = "asgi-csrf";
   disabled = isPy27;
 
@@ -11,7 +20,7 @@ buildPythonPackage rec {
     owner = "simonw";
     repo = pname;
     rev = version;
-    sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf";
+    sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw=";
   };
 
   propagatedBuildInputs = [
@@ -26,10 +35,7 @@ buildPythonPackage rec {
     starlette
   ];
 
-  # tests fail while importing a private module from httpx
-  #  E   ModuleNotFoundError: No module named 'httpx._content_streams'
-  # https://github.com/simonw/asgi-csrf/issues/18
-  doCheck = false;
+  doCheck = false; # asgi-lifespan missing
 
   pythonImportsCheck = [ "asgi_csrf" ];
 

From 21c56fc3cf127e12dfd2a2f469d81a853ecc4a33 Mon Sep 17 00:00:00 2001
From: Attila Lendvai <attila@lendvai.name>
Date: Mon, 28 Dec 2020 11:41:33 +0100
Subject: [PATCH 765/956] nixos/doc/manual: In the preface, add link to
 #chap-contributing

Turned the freetext suggestion about opening the build output
into a copy-pastable xdg-open line.

Renamed title to 'Contributing to this manual'.
---
 nixos/doc/manual/contributing-to-this-manual.xml | 2 +-
 nixos/doc/manual/preface.xml                     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/contributing-to-this-manual.xml b/nixos/doc/manual/contributing-to-this-manual.xml
index 935dd66bc14..137e04bb313 100644
--- a/nixos/doc/manual/contributing-to-this-manual.xml
+++ b/nixos/doc/manual/contributing-to-this-manual.xml
@@ -1,7 +1,7 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-contributing">
- <title>Contributing to this documentation</title>
+ <title>Contributing to this manual</title>
  <para>
   The DocBook sources of NixOS' manual are in the <filename
 xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual">
diff --git a/nixos/doc/manual/preface.xml b/nixos/doc/manual/preface.xml
index 6ac9ae7e786..0f7db6ef1a8 100644
--- a/nixos/doc/manual/preface.xml
+++ b/nixos/doc/manual/preface.xml
@@ -21,7 +21,11 @@
    xlink:href="https://discourse.nixos.org">Discourse</literal> or
   on the <link
    xlink:href="irc://irc.freenode.net/#nixos">
-  <literal>#nixos</literal> channel on Freenode</link>. Bugs should be
+  <literal>#nixos</literal> channel on Freenode</link>, or
+  consider
+  <link
+   xlink:href="#chap-contributing">
+   contributing to this manual</link>. Bugs should be
   reported in
   <link
    xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’

From 04eab02b16a1d4631113e8de9c4b22a1f36ae446 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Jan 2021 22:51:37 +0100
Subject: [PATCH 766/956] python3Packages.pyahocorasick: init at 1.4.0

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

diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix
new file mode 100644
index 00000000000..9ef89c6e920
--- /dev/null
+++ b/pkgs/development/python-modules/pyahocorasick/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pyahocorasick";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "WojciechMula";
+    repo = pname;
+    rev = version;
+    sha256 = "0plm9x2gziayjsl7flsgn1z8qx88c9vqm4fs1wq7dv7fr188liik";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "unittests.py" ];
+  pythonImportsCheck = [ "ahocorasick" ];
+
+  meta = with lib; {
+    description = "Python module implementing Aho-Corasick algorithm";
+    longDescription = ''
+      This Python module is a fast and memory efficient library for exact or
+      approximate multi-pattern string search meaning that you can find multiple
+      key strings occurrences at once in some input text.
+    '';
+    homepage = "https://github.com/WojciechMula/pyahocorasick";
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d69502ace2c..070e855b0c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5124,6 +5124,8 @@ in {
 
   pyaftership = callPackage ../development/python-modules/pyaftership { };
 
+  pyahocorasick = callPackage ../development/python-modules/pyahocorasick { };
+
   pyairvisual = callPackage ../development/python-modules/pyairvisual { };
 
   pyalgotrade = callPackage ../development/python-modules/pyalgotrade { };

From 3117287a11484e876af07213fd4e90981f0daa22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 00:19:12 +0100
Subject: [PATCH 767/956] detect-secrets: 0.12.4 -> 0.14.3

---
 .../tools/detect-secrets/default.nix          | 52 ++++++++++++++-----
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/detect-secrets/default.nix b/pkgs/development/tools/detect-secrets/default.nix
index 1e42a32f7ca..f0dddf66ff4 100644
--- a/pkgs/development/tools/detect-secrets/default.nix
+++ b/pkgs/development/tools/detect-secrets/default.nix
@@ -1,29 +1,53 @@
-{ lib, buildPythonApplication, fetchFromGitHub, isPy27, pyyaml, unidiff, configparser, enum34, future, functools32, mock, pytest }:
+{ lib
+, buildPythonApplication
+, configparser
+, enum34
+, fetchFromGitHub
+, functools32
+, future
+, isPy27
+, mock
+, pyahocorasick
+, pytestCheckHook
+, pyyaml
+, requests
+, responses
+, unidiff
+}:
 
 buildPythonApplication rec {
   pname = "detect-secrets";
-  version = "0.12.4";
+  version = "0.14.3";
+  disabled = isPy27;
 
   # PyPI tarball doesn't ship tests
   src = fetchFromGitHub {
     owner = "Yelp";
-    repo = "detect-secrets";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "01y5xd0irxxib4wnf5834gwa7ibb81h5y4dl8b26gyzgvm5zfpk1";
+    sha256 = "0c4hxih9ljmv0d3izq5idyspk5zci26gdb6lv9klwcshwrfkvxj0";
   };
 
-  propagatedBuildInputs = [ pyyaml ]
-    ++ lib.optionals isPy27 [ configparser enum34 future functools32 ];
+  propagatedBuildInputs = [
+    pyyaml
+    requests
+  ];
 
-  checkInputs = [ mock pytest unidiff ];
+  checkInputs = [
+    mock
+    pyahocorasick
+    pytestCheckHook
+    responses
+    unidiff
+  ];
 
-  # deselect tests which require git setup
-  checkPhase = ''
-    PYTHONPATH=$PWD:$PYTHONPATH pytest \
-      --deselect tests/main_test.py::TestMain \
-      --deselect tests/pre_commit_hook_test.py::TestPreCommitHook \
-      --deselect tests/core/baseline_test.py::TestInitializeBaseline
-  '';
+  disabledTests = [
+    "TestMain"
+    "TestPreCommitHook"
+    "TestInitializeBaseline"
+  ];
+
+  pythonImportsCheck = [ "detect_secrets" ];
 
   meta = with lib; {
     description = "An enterprise friendly way of detecting and preventing secrets in code";

From 2048734cb4c204770c0980389b8d997ced98755b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 23 Dec 2020 09:25:06 +0100
Subject: [PATCH 768/956] python3Packages.dulwich: 0.20.14 -> 0.20.15

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

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index dd067514ccc..55d1f61b826 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -4,12 +4,12 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.20.14";
+  version = "0.20.15";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "21d6ee82708f7c67ce3fdcaf1f1407e524f7f4f7411a410a972faa2176baec0d";
+    sha256 = "1248942fr12av2rkzpm2fq0qn6rajvv2lcgq65h8kby27qvp65zv";
   };
 
   LC_ALL = "en_US.UTF-8";

From 16206d0a203111a28e10cb5f289e57184bacaac7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 23 Dec 2020 09:33:55 +0100
Subject: [PATCH 769/956] python3Packages.dulwich: adjust meta

---
 pkgs/development/python-modules/dulwich/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 55d1f61b826..eb645453a3a 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -23,7 +23,12 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Simple Python implementation of the Git file formats and protocols";
-    homepage = "https://samba.org/~jelmer/dulwich/";
+    longDescription = ''
+      Dulwich is a Python implementation of the Git file formats and protocols, which
+      does not depend on Git itself. All functionality is available in pure Python.
+    '';
+    homepage = "https://www.dulwich.io/";
+    changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ koral ];
   };

From 445a3f548bd7fdba7ca9521a30f6eb15b6e4ac88 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 23 Dec 2020 09:37:29 +0100
Subject: [PATCH 770/956] python3Packages.dulwich: update licensing (GPLv2+ and
 ASL 2.0)

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

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index eb645453a3a..5d4ac94f7fa 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://www.dulwich.io/";
     changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS";
-    license = licenses.gpl2Plus;
+    license = with licenses; [ asl20 gpl2Plus];
     maintainers = with maintainers; [ koral ];
   };
 }

From 5adc098c1ddd160d6669dd8abcba9d4cccdf87f4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Dec 2020 21:01:33 +0100
Subject: [PATCH 771/956] python3Packages.build: adjust meta

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

diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index 3433dad0e77..b7ae09d1f49 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -39,8 +39,14 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
 
-  meta = {
-    description = "A simple, correct PEP517 package builder";
-    license = lib.licenses.mit;
+  meta = with lib; {
+    description = "Simple, correct PEP517 package builder";
+    longDescription = ''
+      build will invoke the PEP 517 hooks to build a distribution package. It
+      is a simple build tool and does not perform any dependency management.
+    '';
+    homepage = "https://github.com/pypa/build";
+    maintainers = with maintainers; [ fab ];
+    license = licenses.mit;
   };
 }

From c846241bac6a7e37fc89cb503bb75a971b00632b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 4 Jan 2021 12:33:10 +0100
Subject: [PATCH 772/956] python3Packages.build: 0.0.3.1 -> 0.1.0

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

diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index b7ae09d1f49..46c3bea0b8c 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-CLK1gJj/YX0RVAVsefinC+7Rj3z6cQvKI6ByGWkQ1bQ=";
+    sha256 = "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8";
   };
 
   nativeBuildInputs = [

From f38a63c10bb31b1febfd79cb317080181822a3aa Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 24 Jan 2021 10:55:21 +0700
Subject: [PATCH 773/956] vim-plugins/overrides.nix: stdenv.lib -> lib

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

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index dcb8c0600e1..fd77676949c 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -698,7 +698,7 @@ self: super: {
         ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static
         ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua
       '';
-    meta.platforms = stdenv.lib.platforms.all;
+    meta.platforms = lib.platforms.all;
   });
 
 } // (

From f90209acd16abcac0350e2d0ea44da870cae3509 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 24 Jan 2021 04:20:00 +0000
Subject: [PATCH 774/956] gitAndTools.lab: 0.18.0 -> 0.19.0

https://github.com/zaquestion/lab/releases/tag/v0.19.0
---
 .../version-management/git-and-tools/lab/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index 437529cd73a..284cbe75839 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "lab";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "zaquestion";
     repo = "lab";
     rev = "v${version}";
-    sha256 = "1vl5ylix4h6z1vrdslv9qphgb6yqpqd4r54jzk5kd6zgrnf9c2zc";
+    sha256 = "1l6xsikd1113qd4y0mvjsl64gbi4327m9v4d593f27fxink39j8s";
   };
 
   subPackages = [ "." ];

From 2a9f33600cd8aa3c72fdcdbcc74bdd8096b81ab3 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 10 Jan 2021 11:40:21 +0100
Subject: [PATCH 775/956] hpack: add a statically built executable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

hpack is a little tool to convert a yaml spec to a cabal file, but its
runtime closure depends on ghc if it’s not built statically.
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80f893ac8ec..71ec34213a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22492,6 +22492,8 @@ in
 
   hdl-dump = callPackage ../tools/misc/hdl-dump { };
 
+  hpack = haskell.lib.justStaticExecutables haskellPackages.hpack;
+
   hpcg = callPackage ../tools/misc/hpcg/default.nix { };
 
   hpl = callPackage ../tools/misc/hpl { };

From ba5dedbbd037834b12d3ed8fbaf27add812d35b2 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Sun, 24 Jan 2021 07:33:12 +0000
Subject: [PATCH 776/956] xorg.xf86videonouveau: 1.0.16 -> 1.0.17

https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 065216da3cc..e8b29f9bbac 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2029,11 +2029,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation {
-    name = "xf86-video-nouveau-1.0.16";
+    name = "xf86-video-nouveau-1.0.17";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2";
-      sha256 = "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h";
+      url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2";
+      sha256 = "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 1544af4742d..3ee31e4c2a7 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -105,7 +105,7 @@ mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2
 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2

From f66f47dd8c5fbbad28f7e336cb121ff3689cada6 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sun, 24 Jan 2021 13:04:30 +0530
Subject: [PATCH 777/956] getmail6: init at 6.14

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

diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix
new file mode 100644
index 00000000000..40be3d2944a
--- /dev/null
+++ b/pkgs/tools/networking/getmail6/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python3Packages, lib }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "getmail6";
+  version = "6.14";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1a3bw4wwdapd9n051dgwqldd8gwiipb5shaz08qwp1jndpvylm7d";
+  };
+
+  doCheck = false;
+
+  pythonImportsCheck = [ "getmailcore" ];
+
+  postPatch = ''
+    # getmail spends a lot of effort to build an absolute path for
+    # documentation installation; too bad it is counterproductive now
+    sed -e '/datadir or prefix,/d' -i setup.py
+  '';
+
+  meta = with lib; {
+    description = "A program for retrieving mail";
+    homepage = "https://getmail6.org";
+    updateWalker = true;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ abbe ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc49b02cc7a..3177388f7d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4335,6 +4335,8 @@ in
 
   getmail = callPackage ../tools/networking/getmail { };
 
+  getmail6 = callPackage ../tools/networking/getmail6 { };
+
   getopt = callPackage ../tools/misc/getopt { };
 
   gexiv2 = callPackage ../development/libraries/gexiv2 { };

From c784a01944c2ca134f8c49f21d1b57188adaab2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 08:36:35 +0100
Subject: [PATCH 778/956] ike-scan: init at 1.9.4

---
 pkgs/tools/security/ike-scan/default.nix | 54 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/tools/security/ike-scan/default.nix

diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/tools/security/ike-scan/default.nix
new file mode 100644
index 00000000000..5d54e36585d
--- /dev/null
+++ b/pkgs/tools/security/ike-scan/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, autoconf
+, automake
+, autoreconfHook
+, fetchFromGitHub
+, fetchpatch
+, openssl
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ike-scan";
+  version = "1.9.4";
+
+  src = fetchFromGitHub {
+    owner = "royhills";
+    repo = pname;
+    rev = version;
+    sha256 = "01a39bk9ma2lm59q320m9g11909if5gc3qynd8pzn6slqiq5r8kw";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    openssl
+  ];
+
+  configureFlags = [ "--with-openssl=${openssl.dev}" ];
+
+  patches = [
+    # Using the same patches as for the Fedora RPM
+    (fetchpatch {
+      # Memory leaks, https://github.com/royhills/ike-scan/pull/15
+      url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch";
+      sha256 = "0wbrq89dl8js7cdivd0c45hckmflan33cpgc3qm5s3az6r4mjljm";
+    })
+    (fetchpatch {
+      # Unknown vendor IDs,  https://github.com/royhills/ike-scan/pull/18, was merged but not released
+      url = "https://github.com/royhills/ike-scan/pull/18/commits/e065ddbe471880275dc7975e7da235e7a2097c22.patch";
+      sha256 = "13ly01c96nnd5yh7rxrhv636csm264m5xf2a1inprrzxkkri5sls";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Tool to discover, fingerprint and test IPsec VPN servers";
+    longDescription = ''
+      ike-scan is a command-line tool that uses the IKE protocol to discover,
+      fingerprint and test IPsec VPN servers.
+    '';
+    homepage = "https://github.com/royhills/ike-scan";
+    license = with licenses; [ gpl3Plus ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25adca6946e..9bdfc0846e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4820,6 +4820,8 @@ in
 
   iruby = callPackage ../applications/editors/jupyter-kernels/iruby { };
 
+  ike-scan = callPackage ../tools/security/ike-scan { };
+
   imapproxy = callPackage ../tools/networking/imapproxy {
     openssl = openssl_1_0_2;
   };

From dc8231950cc8d539e68296dea77c91bdf0a2aac7 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 23 Jan 2021 21:33:21 +0100
Subject: [PATCH 779/956] gitea: add passthru.tests

Reference nixos tests to execute on package upgrades.
---
 pkgs/applications/version-management/gitea/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 20c2e5c9ce8..68b3a3e9099 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -2,6 +2,7 @@
 , git, bash, gzip, openssh, pam
 , sqliteSupport ? true
 , pamSupport ? true
+, nixosTests
 }:
 
 with lib;
@@ -60,6 +61,8 @@ buildGoPackage rec {
 
   goPackagePath = "code.gitea.io/gitea";
 
+  passthru.tests.gitea = nixosTests.gitea;
+
   meta = {
     description = "Git with a cup of tea";
     homepage = "https://gitea.io";

From 6a12c0b99ea021cd1c697dbb77ce46c65ca17ae5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 09:25:38 +0100
Subject: [PATCH 780/956] python3Packages.glances-api: fix description

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

diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix
index 23e152c300f..2f5a1416e41 100644
--- a/pkgs/development/python-modules/glances-api/default.nix
+++ b/pkgs/development/python-modules/glances-api/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "glances_api" ];
 
   meta = with lib; {
-    description = "Python Wrapper for interacting with the Volkszahler API";
+    description = "Python API for interacting with Glances";
     homepage = "https://github.com/home-assistant-ecosystem/python-glances-api";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];

From d2f86643e329af58ed03957159dcb35815b74d2b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 09:35:46 +0100
Subject: [PATCH 781/956] python3Packages.adafruit-platformdetect: init at
 2.27.1

---
 .../adafruit-platformdetect/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/adafruit-platformdetect/default.nix

diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
new file mode 100644
index 00000000000..f03d3fd64e7
--- /dev/null
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "Adafruit-PlatformDetect";
+  version = "2.27.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rnmy74rjjcyni5sr8h1djffpj7wngn2wqckl5vknp2smaihp34l";
+  };
+
+  nativeBuildInputs = [ setuptools-scm ];
+
+  # Project has not published tests yet
+  doCheck = false;
+  pythonImportsCheck = [ "adafruit_platformdetect" ];
+
+  meta = with lib; {
+    description = "Platform detection for use by Adafruit libraries";
+    homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e69d1080ac3..f909ed34b9e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -162,6 +162,8 @@ in {
 
   actdiag = callPackage ../development/python-modules/actdiag { };
 
+  adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { };
+
   adal = callPackage ../development/python-modules/adal { };
 
   adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { };

From a2f253dec0b924d20dfe18c58f9d2b7482e386fc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 09:36:47 +0100
Subject: [PATCH 782/956] python3Packages.adafruit-pureio: init at 1.1.8

---
 .../adafruit-pureio/default.nix               | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/adafruit-pureio/default.nix

diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix
new file mode 100644
index 00000000000..36bafb0f7a0
--- /dev/null
+++ b/pkgs/development/python-modules/adafruit-pureio/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "Adafruit-PureIO";
+  version = "1.1.8";
+
+  src = fetchPypi {
+    pname = "Adafruit_PureIO";
+    inherit version;
+    sha256 = "1mfa6sfz7qwgajz3lqw0s69ivvwbwvblwkjzbrwdrxjbma4jaw66";
+  };
+
+  nativeBuildInputs = [ setuptools-scm ];
+
+  # Physical SMBus is not present
+  doCheck = false;
+  pythonImportsCheck = [ "Adafruit_PureIO" ];
+
+  meta = with lib; {
+    description = "Python interface to Linux IO including I2C and SPI";
+    homepage = "https://github.com/adafruit/Adafruit_Python_PureIO";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f909ed34b9e..15f83f3ea05 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -164,6 +164,8 @@ in {
 
   adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { };
 
+  adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { };
+
   adal = callPackage ../development/python-modules/adal { };
 
   adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { };

From 76054e38cd7431fe3a119f3a7c833ab3791a35ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Tue, 19 Jan 2021 11:05:35 +0100
Subject: [PATCH 783/956] pythonPackages.piexif: fix tests

apply https://github.com/hMatoba/Piexif/pull/109
---
 .../python-modules/piexif/default.nix         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix
index c08ee8338b0..440df36384c 100644
--- a/pkgs/development/python-modules/piexif/default.nix
+++ b/pkgs/development/python-modules/piexif/default.nix
@@ -1,18 +1,28 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pillow }:
 
 buildPythonPackage rec {
   pname = "piexif";
   version = "1.1.3";
 
+  # patch does not apply to PyPI sdist due to different line endings
+  src = fetchFromGitHub {
+    owner = "hMatoba";
+    repo = "Piexif";
+    rev = version;
+    sha256 = "1akmaxq1cjr8wghwaaql1bd3sajl8psshl58lprgfsigrvnklp8b";
+  };
+
+  patches = [
+    # Fix tests with Pillow >= 7.2.0: https://github.com/hMatoba/Piexif/pull/109
+    (fetchpatch {
+      url = "https://github.com/hMatoba/Piexif/commit/5209b53e9689ce28dcd045f384633378d619718f.patch";
+      sha256 = "0ak571jf76r1vszp2g3cd5c16fz2zkbi43scayy933m5qdrhd8g1";
+    })
+  ];
+
   # Pillow needed for unit tests
   checkInputs = [ pillow ];
 
-  src = fetchPypi {
-    inherit pname version;
-    extension = "zip";
-    sha256 = "06sz58q4mrw472p8fbnq7wsj8zpi5js5r8phm2hiwfmz0v33bjw3";
-  };
-
   meta = with lib; {
     description = "Simplify Exif manipulations with Python";
     homepage = "https://github.com/hMatoba/Piexif";

From 98e624eb7d13912435e20cabe8ebaad9fe995a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Tue, 19 Jan 2021 11:47:13 +0100
Subject: [PATCH 784/956] doit: move to pythonPackages

---
 .../doit/default.nix                          | 41 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 28 insertions(+), 17 deletions(-)
 rename pkgs/development/{tools/build-managers => python-modules}/doit/default.nix (57%)

diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/python-modules/doit/default.nix
similarity index 57%
rename from pkgs/development/tools/build-managers/doit/default.nix
rename to pkgs/development/python-modules/doit/default.nix
index d48f0d4d56b..4c27dc7e34c 100644
--- a/pkgs/development/tools/build-managers/doit/default.nix
+++ b/pkgs/development/python-modules/doit/default.nix
@@ -1,28 +1,38 @@
-{ lib, stdenv, fetchurl, python3Packages }:
+{ lib
+, stdenv
+, fetchPypi
+, buildPythonPackage
+, isPy3k
+, mock
+, pytestCheckHook
+, cloudpickle
+, pyinotify
+, macfsevents
+}:
 
-let
-
-  name = "doit";
+buildPythonPackage rec {
+  pname = "doit";
   version = "0.32.0";
 
-in python3Packages.buildPythonApplication {
-  name = "${name}-${version}";
+  disabled = !isPy3k;
 
-  src = fetchurl {
-    url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "033m6y9763l81kgqd07rm62bngv3dsm3k9p28nwsn2qawl8h8g9j";
   };
 
-  buildInputs = with python3Packages; [ mock pytest ];
-
-  propagatedBuildInputs = with python3Packages; [ cloudpickle ]
+  propagatedBuildInputs = [ cloudpickle ]
     ++ lib.optional stdenv.isLinux pyinotify
     ++ lib.optional stdenv.isDarwin macfsevents;
 
-  # Tests fail due to mysterious gdbm.open() resource temporarily
-  # unavailable errors.
-  doCheck = false;
-  checkPhase = "py.test";
+  checkInputs = [ mock pytestCheckHook ];
+
+  disabledTests = [
+    # depends on doit-py, which has a circular dependency on doit
+    "test___main__.py"
+    # https://github.com/pydoit/doit/issues/341
+    "test_not_picklable_raises_InvalidTask"
+  ];
 
   meta = with lib; {
     homepage = "https://pydoit.org/";
@@ -36,6 +46,5 @@ in python3Packages.buildPythonApplication {
       available.
     '';
     maintainers = with maintainers; [ pSub ];
-    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ec34213a3..3f8bf9f1718 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11969,7 +11969,7 @@ in
 
   doctl = callPackage ../development/tools/doctl { };
 
-  doit = callPackage ../development/tools/build-managers/doit { };
+  doit = with python3Packages; toPythonApplication doit;
 
   dolt = callPackage ../servers/sql/dolt { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 070e855b0c4..f217c1a92ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1933,6 +1933,8 @@ in {
 
   dogtail = callPackage ../development/python-modules/dogtail { };
 
+  doit = callPackage ../development/python-modules/doit { };
+
   dominate = callPackage ../development/python-modules/dominate { };
 
   dopy = callPackage ../development/python-modules/dopy { };

From 45a2edbe4a9d6cfc286a947cd9fc5ffc592431a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Tue, 19 Jan 2021 11:50:42 +0100
Subject: [PATCH 785/956] python3Packages.doit: 0.32.0 -> 0.33.1

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

diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix
index 4c27dc7e34c..36cd0b0ee18 100644
--- a/pkgs/development/python-modules/doit/default.nix
+++ b/pkgs/development/python-modules/doit/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "doit";
-  version = "0.32.0";
+  version = "0.33.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "033m6y9763l81kgqd07rm62bngv3dsm3k9p28nwsn2qawl8h8g9j";
+    sha256 = "37c3b35c2151647b968b2af24481112b2f813c30f695366db0639d529190a143";
   };
 
   propagatedBuildInputs = [ cloudpickle ]
@@ -30,8 +30,6 @@ buildPythonPackage rec {
   disabledTests = [
     # depends on doit-py, which has a circular dependency on doit
     "test___main__.py"
-    # https://github.com/pydoit/doit/issues/341
-    "test_not_picklable_raises_InvalidTask"
   ];
 
   meta = with lib; {

From 02380d7d7c89f3577ebb26b95af8dff0ed93d577 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 06:31:48 +0000
Subject: [PATCH 786/956] maturin: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index ff52824ef9a..d40145f163b 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -5,16 +5,16 @@ let
   inherit (darwin.apple_sdk.frameworks) Security;
 in rustPlatform.buildRustPackage rec {
   name = "maturin-${version}";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z";
+    sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs=";
   };
 
-  cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n";
+  cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI=";
 
   nativeBuildInputs = [ pkg-config ];
 

From e645c169568b892da6633b6930697492d295e812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 23 Jan 2021 12:03:32 +0100
Subject: [PATCH 787/956] python3Packages.johnnycanencrypt: maturin 0.9.0
 compatibility fix

---
 .../development/python-modules/johnnycanencrypt/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix
index f0ee4a6bd99..77789fa44db 100644
--- a/pkgs/development/python-modules/johnnycanencrypt/default.nix
+++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix
@@ -61,6 +61,12 @@ rustPlatform.buildRustPackage rec {
     numpy
   ];
 
+  # Remove with the next release after 0.5.0. This change is required
+  # for compatibility with maturin 0.9.0.
+  postPatch = ''
+    sed '/project-url = /d' -i Cargo.toml
+  '';
+
   buildPhase = ''
     runHook preBuild
     maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen"

From c81a5d9abbe2b1ba3c5c192b8727763dafed454d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 24 Jan 2021 10:32:28 +0100
Subject: [PATCH 788/956] python3Packages.wasmer: 1.0.0-beta1 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix
index 0bb60d6b9e3..62c8a2a06b7 100644
--- a/pkgs/development/python-modules/wasmer/default.nix
+++ b/pkgs/development/python-modules/wasmer/default.nix
@@ -8,7 +8,7 @@
 }:
 let
   pname = "wasmer";
-  version = "1.0.0-beta1";
+  version = "1.0.0";
 
   wheel = rustPlatform.buildRustPackage rec {
     inherit pname version;
@@ -17,10 +17,10 @@ let
       owner = "wasmerio";
       repo = "wasmer-python";
       rev = version;
-      sha256 = "0302lcfjlw7nz18nf86z6swhhpp1qnpwcsm2fj4avl22rsv0h78j";
+      hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY=";
     };
 
-    cargoHash = "sha256-Rq5m9Lu6kePvohfhODLMOpGPFtCh0woTsQY2TufoiNQ=";
+    cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc=";
 
     nativeBuildInputs = [ maturin python ];
 

From 7b358c6e7a6c6d319e61602be101840c060ba000 Mon Sep 17 00:00:00 2001
From: Ning Zhang <n.zhang.hp.au@gmail.com>
Date: Sun, 24 Jan 2021 15:52:45 +1100
Subject: [PATCH 789/956] grpc-tools: init at 1.10.0

---
 .../tools/misc/grpc-tools/default.nix         | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/tools/misc/grpc-tools/default.nix

diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/development/tools/misc/grpc-tools/default.nix
new file mode 100644
index 00000000000..3e06f10cbf1
--- /dev/null
+++ b/pkgs/development/tools/misc/grpc-tools/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, cmake
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "grpc-tools";
+  version = "1.10.0";
+
+  src = fetchFromGitHub {
+    owner = "grpc";
+    repo = "grpc-node";
+    rev = "3a094f01711942f79abd8a536c45a91b574d626f"; # version 1.10.0 was not tagged
+    sha256 = "1a7l91kxc3g7mqfqvhc3nb7zy0n21ifs5ck0qqg09qh3f44q04xm";
+    fetchSubmodules = true;
+  };
+
+  sourceRoot = "source/packages/grpc-tools";
+
+  nativeBuildInputs = [ cmake ];
+
+  installPhase = ''
+    install -Dm755 -t $out/bin grpc_node_plugin
+    install -Dm755 -t $out/bin deps/protobuf/protoc
+  '';
+
+  meta = with lib; {
+    description = "Distribution of protoc and the gRPC Node protoc plugin for ease of installation with npm";
+    longDescription = ''
+      This package distributes the Protocol Buffers compiler protoc along with
+      the plugin for generating client and service objects for use with the Node
+      gRPC libraries.
+    '';
+    homepage = "https://github.com/grpc/grpc-node/tree/master/packages/grpc-tools";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = [ maintainers.nzhang-zh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80f893ac8ec..45010836c37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4789,6 +4789,8 @@ in
 
   grpcui = callPackage ../tools/networking/grpcui { };
 
+  grpc-tools = callPackage ../development/tools/misc/grpc-tools { };
+
   grub = pkgsi686Linux.callPackage ../tools/misc/grub ({
     stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;
   } // (config.grub or {}));

From ad91c491faafc1101568d84aae8bdf40f0139e77 Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Sun, 24 Jan 2021 15:30:52 +0530
Subject: [PATCH 790/956] rescuetime: 2.16.4.2 -> 2.16.5.1

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

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 476a441ae05..69f0b26b9ec 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -1,16 +1,16 @@
 { stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }:
 
 let
-  version = "2.16.4.2";
+  version = "2.16.5.1";
   src =
     if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb";
-      sha256 = "0zyal9n3rfj8i13v1q25inq6qyil7897483cdhqvwpb8wskrij4c";
+      sha256 = "1xrvyy0higc1fbc8ascpaszvg2bl6x0a35bzmdq6dkay48hnrd8b";
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb";
-      sha256 = "03bmnkxhip1wilnfqs8akmy1hppahxrmnm8gasnmw5s922vn06cv";
+      sha256 = "09ng0yal66d533vzfv27k9l2va03rqbqmsni43qi3hgx7w9wx5ii";
     };
 in mkDerivation rec {
   # https://www.rescuetime.com/updates/linux_release_notes.html

From 460b9f53b2f5192837d7a5d59bbd1e69d0b802f9 Mon Sep 17 00:00:00 2001
From: jakobrs <jakobrs100@gmail.com>
Date: Sat, 23 Jan 2021 19:38:54 +0100
Subject: [PATCH 791/956] lua: Add more symlinks to lua.pc

This creates a symlink to lua.pc for every name of the file used by Arch:

For a version of Lua (for example, 5.4) we now have:
- lib/pkgconfig/lua.pc
- lib/pkgconfig/lua-5.4.pc
- lib/pkgconfig/lua5.4.pc
- lib/pkgconfig/lua54.pc
---
 pkgs/development/interpreters/lua-5/interpreter.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix
index 7e4283838a0..35a074add09 100644
--- a/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -83,7 +83,9 @@ self = stdenv.mkDerivation rec {
     Libs: -L$out/lib -llua -lm
     Cflags: -I$out/include
     EOF
+    ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc"
     ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc"
+    ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc"
   '';
 
   passthru = rec {

From e63d0738a7e81c463342003810046c483c2ef745 Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Sun, 24 Jan 2021 12:22:36 +0100
Subject: [PATCH 792/956] lsyncd: build on darwin (#109981)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/applications/networking/sync/lsyncd/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index 2723f15dd65..4c95a35ab85 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
       --replace "/usr/bin/rsync" "${rsync}/bin/rsync"
   '';
 
+  # Special flags needed on Darwin:
+  # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51
+  cmakeFlags = lib.optional stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" ];
+
   dontUseCmakeBuildDir = true;
 
   buildInputs = [
@@ -36,8 +40,8 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/axkibe/lsyncd";
     description = "A utility that synchronizes local directories with remote targets";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
     maintainers = with maintainers; [ bobvanderlinden ];
   };
 }

From 91311fcb462d7ff4365ccb96898efe7c1cf211b8 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Sun, 24 Jan 2021 13:17:07 +0100
Subject: [PATCH 793/956] nixos/autofs: add timeout type

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

diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index 5e7c1e66828..541f0d2db19 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -52,6 +52,7 @@ in
       };
 
       timeout = mkOption {
+        type = types.int;
         default = 600;
         description = "Set the global minimum timeout, in seconds, until directories are unmounted";
       };

From 72691e14ec2616aa359c6395265464d7a57cd918 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Sun, 24 Jan 2021 13:20:35 +0100
Subject: [PATCH 794/956] nixos/buildbot: add pythonPackages type

---
 .../modules/services/continuous-integration/buildbot/master.nix  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index e1950b91382..d30d94c53cc 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -223,6 +223,7 @@ in {
       };
 
       pythonPackages = mkOption {
+        type = types.listOf types.package;
         default = pythonPackages: with pythonPackages; [ ];
         defaultText = "pythonPackages: with pythonPackages; [ ]";
         description = "Packages to add the to the PYTHONPATH of the buildbot process.";

From 6054aa2bc1fe0af0d2bf8dfac3a61ef6b8b0bb4a Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Sun, 24 Jan 2021 13:14:21 +0100
Subject: [PATCH 795/956] nixos/amuled: add types

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

diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
index 1128ee2c3e6..c843d892193 100644
--- a/nixos/modules/services/networking/amuled.nix
+++ b/nixos/modules/services/networking/amuled.nix
@@ -24,6 +24,7 @@ in
       };
 
       dataDir = mkOption {
+        type = types.str;
         default = ''/home/${user}/'';
         description = ''
           The directory holding configuration, incoming and temporary files.
@@ -31,6 +32,7 @@ in
       };
 
       user = mkOption {
+        type = types.nullOr types.str;
         default = null;
         description = ''
           The user the AMule daemon should run as.

From 5cdf493674130d80d221d5cbdf01abbf04577fae Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 24 Jan 2021 21:24:39 +1000
Subject: [PATCH 796/956] youtube-dl: 2021.01.16 -> 2021.01.24.1

https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.24.1
---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 43228ea3f42..fea9de8caca 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2021.01.16";
+  version = "2021.01.24.1";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1q8pvw5j45k8nvr3d9rvnhi6xaj1mdqlkrg7q7qq6zciq5r54fhi";
+    sha256 = "001hs73fpm4nxcgn60n9wlsdmiv40f4b1k6hkl4g4wyywv9ic9fy";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From 6230ff7dd8ef1b2489befbd30493cc77c3e40420 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Sun, 24 Jan 2021 13:41:37 +0100
Subject: [PATCH 797/956] nixos/fish: Fix foreign-env function path

---
 nixos/modules/programs/fish.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index d3f7d3eb1af..392f06eb933 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -24,7 +24,7 @@ let
     "source /etc/fish/${file}.fish"
   else
     ''
-      set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish-foreign-env/functions $fish_function_path
+      set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $fish_function_path
       fenv source /etc/fish/foreign-env/${file} > /dev/null
       set -e fish_function_path[1]
     '';

From 31345193f0383e9979363f219136ead24ce075c3 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Sun, 24 Jan 2021 13:50:35 +0100
Subject: [PATCH 798/956] nixos/chrony: add types

---
 nixos/modules/services/networking/ntp/chrony.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index 5e05a327a3f..96c6444c23a 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -82,6 +82,7 @@ in
       };
 
       initstepslew = mkOption {
+        type = types.attrsOf (types.either types.bool types.int);
         default = {
           enabled = true;
           threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s)

From bc0d605cf19cef46ad2c82b4d2bb931a96b7c275 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 24 Jan 2021 09:19:10 +0000
Subject: [PATCH 799/956] treewide: fix double quoted strings in
 meta.description

Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
---
 lib/licenses.nix                              |  4 +--
 nixos/modules/config/console.nix              |  2 +-
 nixos/modules/config/fonts/fontconfig.nix     |  2 +-
 nixos/modules/config/i18n.nix                 |  2 +-
 nixos/modules/config/networking.nix           |  3 +-
 nixos/modules/config/pulseaudio.nix           |  2 +-
 nixos/modules/config/users-groups.nix         |  4 +--
 nixos/modules/hardware/video/bumblebee.nix    |  2 +-
 nixos/modules/misc/locate.nix                 |  2 +-
 nixos/modules/misc/nixpkgs.nix                |  2 +-
 nixos/modules/programs/captive-browser.nix    | 14 ++++----
 nixos/modules/programs/ssh.nix                |  2 +-
 nixos/modules/programs/xss-lock.nix           |  2 +-
 nixos/modules/services/audio/mpd.nix          |  6 ++--
 nixos/modules/services/backup/bacula.nix      |  3 +-
 nixos/modules/services/backup/tarsnap.nix     |  2 +-
 .../services/cluster/hadoop/default.nix       |  3 +-
 .../services/computing/slurm/slurm.nix        |  6 ++--
 nixos/modules/services/databases/couchdb.nix  |  3 +-
 nixos/modules/services/databases/firebird.nix |  2 +-
 nixos/modules/services/databases/neo4j.nix    |  8 ++---
 nixos/modules/services/development/bloop.nix  |  2 +-
 nixos/modules/services/editors/infinoted.nix  |  8 ++---
 nixos/modules/services/games/openarena.nix    |  2 +-
 nixos/modules/services/logging/logstash.nix   |  4 +--
 nixos/modules/services/mail/postgrey.nix      |  2 +-
 nixos/modules/services/misc/cgminer.nix       |  2 +-
 nixos/modules/services/misc/dictd.nix         |  2 +-
 nixos/modules/services/misc/exhibitor.nix     |  2 +-
 nixos/modules/services/misc/gitea.nix         |  3 +-
 .../modules/services/misc/matrix-synapse.nix  |  3 +-
 nixos/modules/services/monitoring/apcupsd.nix |  2 +-
 .../modules/services/monitoring/graphite.nix  |  6 ++--
 nixos/modules/services/monitoring/incron.nix  |  2 +-
 .../prometheus/exporters/collectd.nix         |  2 +-
 .../modules/services/monitoring/telegraf.nix  |  2 +-
 nixos/modules/services/monitoring/thanos.nix  |  4 +--
 nixos/modules/services/monitoring/ups.nix     |  2 +-
 .../services/network-filesystems/ceph.nix     |  4 +--
 nixos/modules/services/networking/amuled.nix  |  2 +-
 nixos/modules/services/networking/cntlm.nix   |  4 +--
 nixos/modules/services/networking/connman.nix |  3 +-
 nixos/modules/services/networking/dnsdist.nix |  3 +-
 nixos/modules/services/networking/gateone.nix |  4 +--
 nixos/modules/services/networking/hostapd.nix |  4 +--
 .../networking/hylafax/modem-default.nix      |  6 ++--
 .../services/networking/hylafax/options.nix   | 20 +++++------
 .../services/networking/hylafax/systemd.nix   | 28 +++++++--------
 nixos/modules/services/networking/kippo.nix   | 14 ++++----
 nixos/modules/services/networking/owamp.nix   |  2 +-
 nixos/modules/services/networking/quassel.nix |  2 +-
 .../modules/services/networking/smokeping.nix |  2 +-
 .../modules/services/networking/ssh/lshd.nix  | 12 +++----
 .../strongswan-swanctl/swanctl-params.nix     |  2 +-
 nixos/modules/services/networking/supybot.nix |  2 +-
 .../services/networking/wpa_supplicant.nix    |  4 +--
 nixos/modules/services/security/usbguard.nix  |  2 +-
 nixos/modules/services/system/cloud-init.nix  |  2 +-
 nixos/modules/services/web-apps/dokuwiki.nix  |  2 +-
 nixos/modules/services/web-apps/keycloak.nix  |  2 +-
 nixos/modules/services/web-apps/moodle.nix    |  2 +-
 .../services/web-servers/lighttpd/default.nix |  2 +-
 .../boot/loader/raspberrypi/raspberrypi.nix   |  3 +-
 nixos/modules/tasks/filesystems/zfs.nix       |  2 +-
 .../virtualisation/nixos-containers.nix       |  4 +--
 nixos/modules/virtualisation/qemu-vm.nix      |  9 ++---
 nixos/modules/virtualisation/railcar.nix      |  2 +-
 .../audio/lsp-plugins/default.nix             |  2 +-
 .../audio/zam-plugins/default.nix             |  2 +-
 .../editors/manuskript/default.nix            |  2 +-
 pkgs/applications/editors/rstudio/default.nix |  2 +-
 .../applications/editors/vim/configurable.nix |  3 +-
 .../graphics/ahoviewer/default.nix            |  2 +-
 pkgs/applications/graphics/ipe/default.nix    |  2 +-
 .../graphics/mandelbulber/default.nix         |  2 +-
 pkgs/applications/graphics/pinta/default.nix  |  6 ++--
 pkgs/applications/misc/bleachbit/default.nix  |  2 +-
 .../misc/digitalbitbox/default.nix            |  2 +-
 pkgs/applications/misc/dupeguru/default.nix   |  2 +-
 pkgs/applications/misc/ikiwiki/default.nix    | 14 ++++----
 pkgs/applications/misc/lutris/default.nix     |  2 +-
 pkgs/applications/misc/osm2xmap/default.nix   |  6 ++--
 .../plasma-applet-volumewin7mixer/default.nix |  2 +-
 .../instant-messengers/baresip/default.nix    |  2 +-
 .../instant-messengers/jitsi/default.nix      |  2 +-
 .../applications/networking/owamp/default.nix |  2 +-
 .../networking/remote/x2goclient/default.nix  |  2 +-
 pkgs/applications/office/docear/default.nix   |  2 +-
 pkgs/applications/office/planner/default.nix  |  2 +-
 pkgs/applications/radio/gnuradio/3.7.nix      |  3 +-
 pkgs/applications/radio/gnuradio/default.nix  |  3 +-
 pkgs/applications/radio/gnuradio/shared.nix   |  3 +-
 .../science/biology/migrate/default.nix       |  2 +-
 .../science/biology/ncbi-tools/default.nix    |  4 +--
 .../science/biology/paml/default.nix          |  2 +-
 .../science/logic/iprover/default.nix         |  2 +-
 .../science/logic/lci/default.nix             |  2 +-
 .../science/logic/satallax/default.nix        |  2 +-
 .../science/logic/yices/default.nix           |  2 +-
 pkgs/applications/science/logic/z3/tptp.nix   |  2 +-
 .../science/math/gfan/default.nix             |  4 +--
 .../science/math/nauty/default.nix            |  2 +-
 .../science/math/ratpoints/default.nix        |  2 +-
 .../science/math/symmetrica/default.nix       |  2 +-
 .../terminal-emulators/guake/default.nix      |  2 +-
 .../terminal-emulators/wezterm/default.nix    |  3 +-
 .../version-management/cvsps/default.nix      |  2 +-
 .../version-management/cvsq/default.nix       |  2 +-
 .../monotone-viz/default.nix                  |  2 +-
 pkgs/applications/video/makemkv/default.nix   |  2 +-
 pkgs/applications/video/mythtv/default.nix    |  2 +-
 pkgs/applications/video/xawtv/default.nix     |  2 +-
 .../virtualization/docker/default.nix         |  3 +-
 .../virtualization/xen/generic.nix            |  2 +-
 .../build-support/skaware/clean-packaging.nix |  2 +-
 pkgs/data/fonts/orbitron/default.nix          |  3 +-
 .../fonts/twitter-color-emoji/default.nix     | 14 ++++----
 .../gnome-3/extensions/gsconnect/default.nix  |  2 +-
 .../development/beam-modules/build-rebar3.nix |  2 +-
 .../beam-modules/rebar3-release.nix           | 12 +++----
 .../compilers/crystal/build-package.nix       | 10 +++---
 pkgs/development/compilers/osl/default.nix    |  2 +-
 pkgs/development/compilers/ponyc/default.nix  |  7 ++--
 pkgs/development/compilers/rust/rustc.nix     |  2 +-
 pkgs/development/compilers/stalin/default.nix |  2 +-
 pkgs/development/compilers/swift/default.nix  |  2 +-
 .../haskell-modules/hackage-packages.nix      |  2 +-
 pkgs/development/haskell-modules/hoogle.nix   |  4 +--
 .../interpreters/lua-5/build-lua-package.nix  |  2 +-
 .../python/mk-python-derivation.nix           |  2 +-
 .../interpreters/quickjs/default.nix          |  2 +-
 pkgs/development/libraries/aravis/default.nix |  2 +-
 .../libraries/aws-sdk-cpp/default.nix         |  2 +-
 .../libraries/capstone/default.nix            |  2 +-
 pkgs/development/libraries/dbus/default.nix   | 10 +++---
 pkgs/development/libraries/ffmpeg/generic.nix |  2 +-
 pkgs/development/libraries/gaia/default.nix   |  6 ++--
 pkgs/development/libraries/gcab/default.nix   |  2 +-
 pkgs/development/libraries/glib/default.nix   |  2 +-
 pkgs/development/libraries/glui/default.nix   |  2 +-
 .../libraries/gtdialog/default.nix            |  2 +-
 pkgs/development/libraries/hspell/default.nix |  2 +-
 pkgs/development/libraries/iml/default.nix    |  2 +-
 .../libraries/java/dbus-java/default.nix      |  2 +-
 .../java/libmatthew-java/default.nix          |  2 +-
 .../libraries/libatomic_ops/default.nix       |  2 +-
 .../libraries/libe-book/default.nix           |  2 +-
 .../libraries/liblangtag/default.nix          |  2 +-
 .../development/libraries/libmwaw/default.nix |  2 +-
 .../libraries/libodfgen/default.nix           |  2 +-
 pkgs/development/libraries/librem/default.nix |  2 +-
 .../libraries/librevenge/default.nix          |  2 +-
 pkgs/development/libraries/libvpx/1_8.nix     |  2 +-
 .../development/libraries/libxml2/default.nix |  2 +-
 pkgs/development/libraries/libzmf/default.nix |  2 +-
 pkgs/development/libraries/mpfi/default.nix   |  2 +-
 pkgs/development/libraries/mpir/default.nix   |  2 +-
 .../development/libraries/msgpuck/default.nix |  2 +-
 pkgs/development/libraries/openpa/default.nix |  2 +-
 .../development/libraries/qca-qt5/default.nix |  2 +-
 .../libraries/science/math/caffe2/default.nix | 36 +++++++++----------
 .../development/libraries/speechd/default.nix |  2 +-
 .../lisp-modules/lisp-packages.nix            |  8 ++---
 .../_3bmd-ext-code-blocks.nix                 | 10 +++---
 .../quicklisp-to-nix-output/_3bmd.nix         | 10 +++---
 .../quicklisp-to-nix-output/access.nix        |  8 ++---
 .../quicklisp-to-nix-output/acclimation.nix   | 10 +++---
 .../quicklisp-to-nix-output/alexandria.nix    | 10 +++---
 .../quicklisp-to-nix-output/anaphora.nix      | 10 +++---
 .../quicklisp-to-nix-output/arnesi.nix        | 10 +++---
 .../quicklisp-to-nix-output/array-utils.nix   | 10 +++---
 .../asdf-package-system.nix                   | 10 +++---
 .../asdf-system-connections.nix               | 10 +++---
 .../quicklisp-to-nix-output/babel.nix         | 10 +++---
 .../quicklisp-to-nix-output/blackbird.nix     | 10 +++---
 .../bordeaux-threads.nix                      | 10 +++---
 .../buildnode-xhtml.nix                       | 10 +++---
 .../quicklisp-to-nix-output/buildnode.nix     | 10 +++---
 .../quicklisp-to-nix-output/caveman.nix       | 10 +++---
 .../quicklisp-to-nix-output/cffi-grovel.nix   | 10 +++---
 .../cffi-toolchain.nix                        | 10 +++---
 .../quicklisp-to-nix-output/cffi.nix          | 10 +++---
 .../quicklisp-to-nix-output/chanl.nix         | 10 +++---
 .../quicklisp-to-nix-output/chipz.nix         | 10 +++---
 .../quicklisp-to-nix-output/chunga.nix        | 10 +++---
 .../circular-streams.nix                      | 10 +++---
 .../quicklisp-to-nix-output/cl-aa.nix         | 10 +++---
 .../quicklisp-to-nix-output/cl-annot.nix      | 10 +++---
 .../quicklisp-to-nix-output/cl-anonfun.nix    | 10 +++---
 .../quicklisp-to-nix-output/cl-ansi-text.nix  | 10 +++---
 .../quicklisp-to-nix-output/cl-async-repl.nix | 10 +++---
 .../quicklisp-to-nix-output/cl-async-ssl.nix  | 10 +++---
 .../quicklisp-to-nix-output/cl-async.nix      | 10 +++---
 .../quicklisp-to-nix-output/cl-base64.nix     | 10 +++---
 .../cl-cffi-gtk-cairo.nix                     | 10 +++---
 .../cl-cffi-gtk-gdk-pixbuf.nix                | 10 +++---
 .../cl-cffi-gtk-gdk.nix                       | 10 +++---
 .../cl-cffi-gtk-gio.nix                       | 10 +++---
 .../cl-cffi-gtk-glib.nix                      | 10 +++---
 .../cl-cffi-gtk-gobject.nix                   | 10 +++---
 .../cl-cffi-gtk-pango.nix                     | 10 +++---
 .../quicklisp-to-nix-output/cl-cffi-gtk.nix   | 10 +++---
 .../cl-change-case.nix                        | 10 +++---
 .../quicklisp-to-nix-output/cl-cli.nix        | 10 +++---
 .../quicklisp-to-nix-output/cl-colors.nix     | 10 +++---
 .../quicklisp-to-nix-output/cl-colors2.nix    | 10 +++---
 .../quicklisp-to-nix-output/cl-containers.nix | 10 +++---
 .../quicklisp-to-nix-output/cl-cookie.nix     | 10 +++---
 .../quicklisp-to-nix-output/cl-css.nix        | 10 +++---
 .../quicklisp-to-nix-output/cl-csv.nix        | 10 +++---
 .../quicklisp-to-nix-output/cl-dbi.nix        | 10 +++---
 .../quicklisp-to-nix-output/cl-dot.nix        | 10 +++---
 .../quicklisp-to-nix-output/cl-emb.nix        | 10 +++---
 .../quicklisp-to-nix-output/cl-fad.nix        | 10 +++---
 .../cl-fuse-meta-fs.nix                       | 10 +++---
 .../quicklisp-to-nix-output/cl-fuse.nix       | 10 +++---
 .../quicklisp-to-nix-output/cl-hooks.nix      |  8 ++---
 .../quicklisp-to-nix-output/cl-html-parse.nix | 10 +++---
 .../cl-html5-parser.nix                       | 10 +++---
 .../quicklisp-to-nix-output/cl-interpol.nix   | 10 +++---
 .../quicklisp-to-nix-output/cl-jpeg.nix       | 10 +++---
 .../quicklisp-to-nix-output/cl-json.nix       | 10 +++---
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  | 10 +++---
 .../quicklisp-to-nix-output/cl-l10n.nix       | 10 +++---
 .../quicklisp-to-nix-output/cl-libuv.nix      | 10 +++---
 .../quicklisp-to-nix-output/cl-locale.nix     | 10 +++---
 .../quicklisp-to-nix-output/cl-markup.nix     | 10 +++---
 .../quicklisp-to-nix-output/cl-mysql.nix      | 10 +++---
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  | 10 +++---
 .../quicklisp-to-nix-output/cl-paths.nix      | 10 +++---
 .../quicklisp-to-nix-output/cl-pdf.nix        | 10 +++---
 .../quicklisp-to-nix-output/cl-postgres.nix   | 10 +++---
 .../cl-ppcre-template.nix                     |  8 ++---
 .../cl-ppcre-unicode.nix                      | 10 +++---
 .../quicklisp-to-nix-output/cl-ppcre.nix      | 10 +++---
 .../quicklisp-to-nix-output/cl-prevalence.nix | 10 +++---
 .../quicklisp-to-nix-output/cl-project.nix    | 10 +++---
 .../quicklisp-to-nix-output/cl-protobufs.nix  | 10 +++---
 .../quicklisp-to-nix-output/cl-qprint.nix     | 10 +++---
 .../quicklisp-to-nix-output/cl-reexport.nix   | 10 +++---
 .../quicklisp-to-nix-output/cl-slice.nix      | 10 +++---
 .../quicklisp-to-nix-output/cl-smtp.nix       | 10 +++---
 .../quicklisp-to-nix-output/cl-store.nix      | 10 +++---
 .../cl-syntax-annot.nix                       | 10 +++---
 .../cl-syntax-anonfun.nix                     | 10 +++---
 .../cl-syntax-markup.nix                      | 10 +++---
 .../quicklisp-to-nix-output/cl-syntax.nix     | 10 +++---
 .../quicklisp-to-nix-output/cl-test-more.nix  | 10 +++---
 .../cl-typesetting.nix                        | 10 +++---
 .../quicklisp-to-nix-output/cl-unicode.nix    | 10 +++---
 .../cl-unification.nix                        |  8 ++---
 .../quicklisp-to-nix-output/cl-utilities.nix  | 10 +++---
 .../quicklisp-to-nix-output/cl-vectors.nix    | 10 +++---
 .../quicklisp-to-nix-output/cl-webkit2.nix    | 10 +++---
 .../quicklisp-to-nix-output/cl-who.nix        | 10 +++---
 .../quicklisp-to-nix-output/cl-xmlspam.nix    | 10 +++---
 .../quicklisp-to-nix-output/cl_plus_ssl.nix   | 10 +++---
 .../clack-handler-hunchentoot.nix             | 10 +++---
 .../quicklisp-to-nix-output/clack-socket.nix  | 10 +++---
 .../quicklisp-to-nix-output/clack-test.nix    | 10 +++---
 .../clack-v1-compat.nix                       | 10 +++---
 .../quicklisp-to-nix-output/clack.nix         | 10 +++---
 .../quicklisp-to-nix-output/clfswm.nix        | 10 +++---
 .../quicklisp-to-nix-output/closer-mop.nix    | 10 +++---
 .../closure-common.nix                        | 10 +++---
 .../quicklisp-to-nix-output/closure-html.nix  | 10 +++---
 .../clsql-postgresql-socket.nix               | 10 +++---
 .../clsql-postgresql.nix                      | 10 +++---
 .../quicklisp-to-nix-output/clsql-sqlite3.nix | 10 +++---
 .../quicklisp-to-nix-output/clsql-uffi.nix    | 10 +++---
 .../quicklisp-to-nix-output/clsql.nix         | 10 +++---
 .../quicklisp-to-nix-output/clss.nix          | 10 +++---
 .../clump-2-3-tree.nix                        | 10 +++---
 .../clump-binary-tree.nix                     | 10 +++---
 .../quicklisp-to-nix-output/clump.nix         | 10 +++---
 .../quicklisp-to-nix-output/clunit.nix        | 10 +++---
 .../quicklisp-to-nix-output/clunit2.nix       | 10 +++---
 .../quicklisp-to-nix-output/clx.nix           | 10 +++---
 .../quicklisp-to-nix-output/collectors.nix    |  8 ++---
 .../quicklisp-to-nix-output/colorize.nix      | 10 +++---
 .../command-line-arguments.nix                | 10 +++---
 .../quicklisp-to-nix-output/css-lite.nix      | 10 +++---
 .../css-selectors-simple-tree.nix             | 10 +++---
 .../css-selectors-stp.nix                     | 10 +++---
 .../quicklisp-to-nix-output/css-selectors.nix | 10 +++---
 .../quicklisp-to-nix-output/cxml-stp.nix      | 10 +++---
 .../quicklisp-to-nix-output/cxml.nix          | 10 +++---
 .../quicklisp-to-nix-output/dbd-mysql.nix     | 10 +++---
 .../quicklisp-to-nix-output/dbd-postgres.nix  | 10 +++---
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   | 10 +++---
 .../quicklisp-to-nix-output/dbi-test.nix      | 10 +++---
 .../quicklisp-to-nix-output/dbi.nix           | 10 +++---
 .../quicklisp-to-nix-output/dbus.nix          | 10 +++---
 .../quicklisp-to-nix-output/dexador.nix       | 10 +++---
 .../quicklisp-to-nix-output/dissect.nix       | 10 +++---
 .../quicklisp-to-nix-output/djula.nix         | 10 +++---
 .../quicklisp-to-nix-output/do-urlencode.nix  | 10 +++---
 .../documentation-utils.nix                   | 10 +++---
 .../quicklisp-to-nix-output/drakma.nix        | 10 +++---
 .../quicklisp-to-nix-output/enchant.nix       | 10 +++---
 .../quicklisp-to-nix-output/esrap-peg.nix     | 10 +++---
 .../quicklisp-to-nix-output/esrap.nix         | 10 +++---
 .../external-program.nix                      | 10 +++---
 .../quicklisp-to-nix-output/fare-csv.nix      | 10 +++---
 .../quicklisp-to-nix-output/fare-mop.nix      | 10 +++---
 .../fare-quasiquote-extras.nix                | 10 +++---
 .../fare-quasiquote-optima.nix                | 10 +++---
 .../fare-quasiquote-readtable.nix             | 10 +++---
 .../fare-quasiquote.nix                       | 10 +++---
 .../quicklisp-to-nix-output/fare-utils.nix    | 10 +++---
 .../quicklisp-to-nix-output/fast-http.nix     | 10 +++---
 .../quicklisp-to-nix-output/fast-io.nix       | 10 +++---
 .../quicklisp-to-nix-output/fiasco.nix        | 10 +++---
 .../quicklisp-to-nix-output/fiveam.nix        | 10 +++---
 .../quicklisp-to-nix-output/flexi-streams.nix | 10 +++---
 .../quicklisp-to-nix-output/form-fiddle.nix   | 10 +++---
 .../quicklisp-to-nix-output/fset.nix          |  8 ++---
 .../quicklisp-to-nix-output/gettext.nix       | 10 +++---
 .../quicklisp-to-nix-output/global-vars.nix   | 10 +++---
 .../quicklisp-to-nix-output/html-encode.nix   | 10 +++---
 .../quicklisp-to-nix-output/http-body.nix     | 10 +++---
 .../hu_dot_dwim_dot_asdf.nix                  | 10 +++---
 .../hu_dot_dwim_dot_defclass-star.nix         | 10 +++---
 .../hu_dot_dwim_dot_stefil.nix                | 10 +++---
 .../quicklisp-to-nix-output/hunchentoot.nix   |  8 ++---
 .../quicklisp-to-nix-output/idna.nix          | 10 +++---
 .../quicklisp-to-nix-output/ieee-floats.nix   | 10 +++---
 .../inferior-shell.nix                        | 10 +++---
 .../introspect-environment.nix                | 10 +++---
 .../quicklisp-to-nix-output/iolib.nix         | 10 +++---
 .../iolib_dot_asdf.nix                        | 10 +++---
 .../iolib_dot_base.nix                        | 10 +++---
 .../iolib_dot_common-lisp.nix                 | 10 +++---
 .../iolib_dot_conf.nix                        | 10 +++---
 .../iolib_dot_grovel.nix                      | 10 +++---
 .../quicklisp-to-nix-output/ironclad.nix      | 10 +++---
 .../quicklisp-to-nix-output/iterate.nix       | 10 +++---
 .../quicklisp-to-nix-output/jonathan.nix      | 10 +++---
 .../quicklisp-to-nix-output/kmrcl.nix         | 10 +++---
 .../lack-component.nix                        | 10 +++---
 .../lack-middleware-backtrace.nix             | 10 +++---
 .../quicklisp-to-nix-output/lack-util.nix     | 10 +++---
 .../quicklisp-to-nix-output/lack.nix          | 10 +++---
 .../quicklisp-to-nix-output/let-plus.nix      | 10 +++---
 .../quicklisp-to-nix-output/lev.nix           | 10 +++---
 .../quicklisp-to-nix-output/lfarm-client.nix  | 10 +++---
 .../quicklisp-to-nix-output/lfarm-common.nix  |  8 ++---
 .../quicklisp-to-nix-output/lfarm-server.nix  | 10 +++---
 .../quicklisp-to-nix-output/lfarm-ssl.nix     | 10 +++---
 .../quicklisp-to-nix-output/lift.nix          | 10 +++---
 .../lisp-namespace.nix                        | 10 +++---
 .../quicklisp-to-nix-output/lisp-unit2.nix    | 10 +++---
 .../quicklisp-to-nix-output/local-time.nix    | 10 +++---
 .../quicklisp-to-nix-output/log4cl.nix        | 10 +++---
 .../quicklisp-to-nix-output/lparallel.nix     | 10 +++---
 .../quicklisp-to-nix-output/lquery.nix        | 10 +++---
 .../quicklisp-to-nix-output/map-set.nix       | 10 +++---
 .../quicklisp-to-nix-output/marshal.nix       | 10 +++---
 .../quicklisp-to-nix-output/md5.nix           | 10 +++---
 .../quicklisp-to-nix-output/metabang-bind.nix | 10 +++---
 .../metatilities-base.nix                     | 10 +++---
 .../quicklisp-to-nix-output/mgl-pax.nix       |  8 ++---
 .../misc-extensions.nix                       | 10 +++---
 .../mk-string-metrics.nix                     | 10 +++---
 .../quicklisp-to-nix-output/moptilities.nix   | 10 +++---
 .../more-conditions.nix                       |  8 ++---
 .../quicklisp-to-nix-output/mt19937.nix       | 10 +++---
 .../quicklisp-to-nix-output/myway.nix         | 10 +++---
 .../named-readtables.nix                      |  8 ++---
 .../net-telent-date.nix                       | 10 +++---
 .../net_dot_didierverna_dot_asdf-flv.nix      | 10 +++---
 .../quicklisp-to-nix-output/nibbles.nix       | 10 +++---
 .../quicklisp-to-nix-output/optima.nix        | 10 +++---
 .../quicklisp-to-nix-output/osicat.nix        | 10 +++---
 .../quicklisp-to-nix-output/parenscript.nix   | 10 +++---
 .../parse-declarations-1_dot_0.nix            | 10 +++---
 .../quicklisp-to-nix-output/parse-number.nix  | 10 +++---
 .../parser-combinators.nix                    | 10 +++---
 .../parser_dot_common-rules.nix               | 10 +++---
 .../quicklisp-to-nix-output/pcall-queue.nix   | 10 +++---
 .../quicklisp-to-nix-output/pcall.nix         | 10 +++---
 .../quicklisp-to-nix-output/plump.nix         | 10 +++---
 .../quicklisp-to-nix-output/postmodern.nix    | 10 +++---
 .../quicklisp-to-nix-output/proc-parse.nix    | 10 +++---
 .../quicklisp-to-nix-output/prove-asdf.nix    | 10 +++---
 .../quicklisp-to-nix-output/prove.nix         | 10 +++---
 .../quicklisp-to-nix-output/ptester.nix       | 10 +++---
 .../quicklisp-to-nix-output/puri.nix          | 10 +++---
 .../pythonic-string-reader.nix                |  8 ++---
 .../quicklisp-to-nix-output/query-fs.nix      | 10 +++---
 .../quicklisp-to-nix-output/quri.nix          | 10 +++---
 .../quicklisp-to-nix-output/rfc2388.nix       | 10 +++---
 .../quicklisp-to-nix-output/rove.nix          | 10 +++---
 .../quicklisp-to-nix-output/rt.nix            | 10 +++---
 .../quicklisp-to-nix-output/s-sql.nix         | 10 +++---
 .../quicklisp-to-nix-output/s-sysdeps.nix     | 10 +++---
 .../quicklisp-to-nix-output/s-xml.nix         | 10 +++---
 .../quicklisp-to-nix-output/salza2.nix        |  8 ++---
 .../quicklisp-to-nix-output/serapeum.nix      | 10 +++---
 .../simple-date-time.nix                      | 10 +++---
 .../quicklisp-to-nix-output/simple-date.nix   | 10 +++---
 .../quicklisp-to-nix-output/simple-tasks.nix  | 10 +++---
 .../quicklisp-to-nix-output/smart-buffer.nix  | 10 +++---
 .../split-sequence.nix                        |  8 ++---
 .../quicklisp-to-nix-output/sqlite.nix        | 10 +++---
 .../static-vectors.nix                        | 10 +++---
 .../quicklisp-to-nix-output/stefil.nix        | 10 +++---
 .../quicklisp-to-nix-output/str.nix           | 10 +++---
 .../quicklisp-to-nix-output/string-case.nix   | 10 +++---
 .../quicklisp-to-nix-output/stumpwm.nix       | 10 +++---
 .../quicklisp-to-nix-output/swank.nix         | 10 +++---
 .../quicklisp-to-nix-output/swap-bytes.nix    | 10 +++---
 .../quicklisp-to-nix-output/symbol-munger.nix |  8 ++---
 .../quicklisp-to-nix-output/trivia.nix        | 10 +++---
 .../trivia_dot_balland2006.nix                | 10 +++---
 .../trivia_dot_level0.nix                     | 10 +++---
 .../trivia_dot_level1.nix                     | 10 +++---
 .../trivia_dot_level2.nix                     | 10 +++---
 .../trivia_dot_quasiquote.nix                 | 10 +++---
 .../trivia_dot_trivial.nix                    |  8 ++---
 .../trivial-backtrace.nix                     | 10 +++---
 .../trivial-clipboard.nix                     | 10 +++---
 .../quicklisp-to-nix-output/trivial-cltl2.nix | 10 +++---
 .../trivial-features.nix                      | 10 +++---
 .../trivial-file-size.nix                     | 10 +++---
 .../trivial-garbage.nix                       | 10 +++---
 .../trivial-gray-streams.nix                  | 10 +++---
 .../trivial-indent.nix                        | 10 +++---
 .../trivial-macroexpand-all.nix               | 10 +++---
 .../trivial-main-thread.nix                   | 10 +++---
 .../quicklisp-to-nix-output/trivial-mimes.nix | 10 +++---
 .../trivial-package-local-nicknames.nix       | 10 +++---
 .../quicklisp-to-nix-output/trivial-types.nix | 10 +++---
 .../quicklisp-to-nix-output/trivial-utf-8.nix | 10 +++---
 .../quicklisp-to-nix-output/type-i.nix        | 10 +++---
 .../quicklisp-to-nix-output/uax-15.nix        | 10 +++---
 .../quicklisp-to-nix-output/uffi.nix          | 10 +++---
 .../quicklisp-to-nix-output/uiop.nix          | 10 +++---
 .../quicklisp-to-nix-output/unit-test.nix     | 10 +++---
 .../quicklisp-to-nix-output/unix-options.nix  | 10 +++---
 .../quicklisp-to-nix-output/unix-opts.nix     | 10 +++---
 .../usocket-server.nix                        | 10 +++---
 .../quicklisp-to-nix-output/usocket.nix       | 10 +++---
 .../utilities_dot_print-items.nix             | 10 +++---
 .../utilities_dot_print-tree.nix              | 10 +++---
 .../quicklisp-to-nix-output/uuid.nix          | 10 +++---
 .../quicklisp-to-nix-output/vom.nix           | 10 +++---
 .../quicklisp-to-nix-output/woo.nix           | 10 +++---
 .../quicklisp-to-nix-output/wookie.nix        | 10 +++---
 .../quicklisp-to-nix-output/xembed.nix        | 10 +++---
 .../quicklisp-to-nix-output/xkeyboard.nix     | 10 +++---
 .../xml_dot_location.nix                      |  8 ++---
 .../quicklisp-to-nix-output/xmls.nix          | 10 +++---
 .../quicklisp-to-nix-output/xpath.nix         | 10 +++---
 .../quicklisp-to-nix-output/xsubseq.nix       |  8 ++---
 .../quicklisp-to-nix-output/yacc.nix          | 10 +++---
 .../quicklisp-to-nix-output/yason.nix         | 10 +++---
 .../quicklisp-to-nix-output/zpb-ttf.nix       | 10 +++---
 .../ocaml-modules/torch/default.nix           |  2 +-
 pkgs/development/pure-modules/gl/default.nix  |  4 +--
 .../python-modules/apptools/default.nix       |  2 +-
 .../python-modules/betacode/default.nix       |  2 +-
 .../python-modules/bravado-core/default.nix   |  2 +-
 .../python-modules/emoji/default.nix          |  2 +-
 .../python-modules/ftputil/default.nix        |  2 +-
 .../python-modules/inflection/default.nix     |  2 +-
 .../jenkins-job-builder/default.nix           |  2 +-
 .../python-modules/nuitka/default.nix         |  2 +-
 .../pytest-virtualenv/default.nix             |  2 +-
 .../python-modules/rarfile/default.nix        |  3 +-
 .../tools/build-managers/bam/default.nix      |  4 +--
 pkgs/development/tools/go-motion/default.nix  |  2 +-
 pkgs/development/tools/go2nix/default.nix     |  2 +-
 .../tools/gocode-gomod/default.nix            |  2 +-
 pkgs/development/tools/gocode/default.nix     |  2 +-
 pkgs/development/tools/iaca/2.1.nix           |  2 +-
 .../development/tools/ineffassign/default.nix |  2 +-
 pkgs/development/tools/interfacer/default.nix |  2 +-
 pkgs/development/tools/misc/bossa/default.nix |  4 +--
 .../tools/misc/cl-launch/default.nix          |  2 +-
 .../tools/misc/luarocks/default.nix           |  2 +-
 pkgs/development/tools/misc/tet/default.nix   |  8 ++---
 .../tools/poetry2nix/poetry2nix/pep508.nix    |  2 +-
 pkgs/development/tools/setupcfg2nix/info.nix  |  6 ++--
 pkgs/development/tools/slimerjs/default.nix   |  2 +-
 pkgs/development/tools/yj/default.nix         |  2 +-
 pkgs/games/blobby/default.nix                 |  2 +-
 pkgs/games/fairymax/default.nix               |  2 +-
 pkgs/games/fish-fillets-ng/default.nix        |  2 +-
 pkgs/games/liquidwar/5.nix                    |  2 +-
 pkgs/games/moon-buggy/default.nix             |  2 +-
 pkgs/games/n2048/default.nix                  |  4 +--
 pkgs/games/pingus/default.nix                 |  2 +-
 pkgs/games/quantumminigolf/default.nix        |  2 +-
 pkgs/games/xboard/default.nix                 |  2 +-
 pkgs/games/xbomb/default.nix                  |  2 +-
 pkgs/games/xpilot/bloodspilot-client.nix      |  2 +-
 pkgs/games/xskat/default.nix                  |  4 +--
 pkgs/misc/drivers/xow/default.nix             | 10 +++---
 pkgs/misc/emulators/termtekst/default.nix     |  2 +-
 .../misc/vscode-extensions/vscodeExts2nix.nix |  4 +--
 .../vscodeWithConfiguration.nix               | 12 +++----
 pkgs/os-specific/darwin/trash/default.nix     |  2 +-
 pkgs/os-specific/linux/apparmor/default.nix   |  2 +-
 pkgs/os-specific/linux/atop/default.nix       |  2 +-
 pkgs/os-specific/linux/eudev/default.nix      |  6 ++--
 pkgs/os-specific/linux/firejail/default.nix   |  2 +-
 pkgs/os-specific/linux/forktty/default.nix    |  2 +-
 pkgs/os-specific/linux/gfxtablet/default.nix  |  4 +--
 pkgs/os-specific/linux/gradm/default.nix      |  2 +-
 pkgs/os-specific/linux/libaio/default.nix     |  2 +-
 .../os-specific/linux/pcmciautils/default.nix |  3 +-
 pkgs/servers/computing/storm/default.nix      |  2 +-
 pkgs/servers/fingerd/bsd-fingerd/default.nix  |  2 +-
 pkgs/servers/firebird/default.nix             |  2 +-
 .../http/apache-modules/mod_ca/default.nix    |  4 +--
 pkgs/servers/hylafaxplus/default.nix          |  6 ++--
 pkgs/servers/x11/xorg/overrides.nix           | 18 +++++-----
 pkgs/shells/mksh/default.nix                  |  2 +-
 pkgs/stdenv/freebsd/default.nix               |  2 +-
 pkgs/tools/X11/xmagnify/default.nix           |  2 +-
 pkgs/tools/X11/xprintidle-ng/default.nix      |  2 +-
 pkgs/tools/X11/xwinmosaic/default.nix         |  2 +-
 pkgs/tools/archivers/unzip/default.nix        |  2 +-
 pkgs/tools/archivers/zip/default.nix          |  2 +-
 pkgs/tools/audio/pa-applet/default.nix        |  3 +-
 pkgs/tools/backup/mydumper/default.nix        |  2 +-
 .../tools/compression/advancecomp/default.nix |  2 +-
 pkgs/tools/compression/pixz/default.nix       |  2 +-
 pkgs/tools/filesystems/catcli/default.nix     |  2 +-
 pkgs/tools/filesystems/glusterfs/default.nix  |  2 +-
 pkgs/tools/filesystems/irods/default.nix      |  6 ++--
 pkgs/tools/graphics/argyllcms/default.nix     |  2 +-
 .../graphics/cfdg/src-info-for-default.nix    |  2 +-
 pkgs/tools/graphics/convchain/default.nix     |  2 +-
 pkgs/tools/graphics/gmic-qt/default.nix       |  2 +-
 pkgs/tools/graphics/qrcode/default.nix        |  2 +-
 pkgs/tools/graphics/quirc/default.nix         |  2 +-
 pkgs/tools/graphics/syntex/default.nix        |  2 +-
 .../graphics/wavefunctioncollapse/default.nix |  2 +-
 pkgs/tools/graphics/zxing/default.nix         |  2 +-
 .../ibus-engines/ibus-uniemoji/default.nix    |  4 +--
 pkgs/tools/inputmethods/ibus/default.nix      |  4 +--
 pkgs/tools/misc/ccze/default.nix              |  2 +-
 pkgs/tools/misc/debian-devscripts/default.nix |  2 +-
 pkgs/tools/networking/badvpn/default.nix      |  2 +-
 pkgs/tools/networking/bgpdump/default.nix     |  2 +-
 pkgs/tools/networking/bsd-finger/default.nix  |  2 +-
 pkgs/tools/networking/jnettop/default.nix     |  2 +-
 pkgs/tools/networking/mailsend/default.nix    |  2 +-
 pkgs/tools/networking/persepolis/default.nix  |  2 +-
 .../disnix/DisnixWebService/default.nix       |  2 +-
 pkgs/tools/package-management/nix/default.nix |  2 +-
 pkgs/tools/security/gencfsm/default.nix       |  2 +-
 pkgs/tools/security/pbis/default.nix          |  2 +-
 pkgs/tools/security/tcpcrypt/default.nix      |  2 +-
 pkgs/tools/system/at/default.nix              |  2 +-
 pkgs/tools/system/ipmitool/default.nix        |  2 +-
 pkgs/tools/system/socklog/default.nix         |  4 +--
 pkgs/tools/system/throttled/default.nix       |  2 +-
 pkgs/tools/video/rtmpdump/default.nix         |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/perl-packages.nix              |  4 +--
 563 files changed, 1884 insertions(+), 1911 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index ebeb1377339..190eeefc1bf 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -87,7 +87,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
 
   beerware = spdx {
     spdxId = "Beerware";
-    fullName = ''Beerware License'';
+    fullName = "Beerware License";
   };
 
   blueOak100 = spdx {
@@ -107,7 +107,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
 
   bsd2Patent = spdx {
     spdxId = "BSD-2-Clause-Patent";
-    fullName = ''BSD-2-Clause Plus Patent License'';
+    fullName = "BSD-2-Clause Plus Patent License";
   };
 
   bsd3 = spdx {
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index ab166760517..1339227f1e0 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -83,7 +83,7 @@ in
     packages = mkOption {
       type = types.listOf types.package;
       default = with pkgs.kbdKeymaps; [ dvp neo ];
-      defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]'';
+      defaultText = "with pkgs.kbdKeymaps; [ dvp neo ]";
       description = ''
         List of additional packages that provide console fonts, keymaps and
         other resources for virtual consoles use.
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 5b681ca5946..6e7b8c4b88a 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -436,7 +436,7 @@ in
         useEmbeddedBitmaps = mkOption {
           type = types.bool;
           default = false;
-          description = ''Use embedded bitmaps in fonts like Calibri.'';
+          description = "Use embedded bitmaps in fonts like Calibri.";
         };
 
       };
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index feb76581a72..991b449d80b 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -84,7 +84,7 @@ with lib;
     environment.etc."locale.conf".source = pkgs.writeText "locale.conf"
       ''
         LANG=${config.i18n.defaultLocale}
-        ${concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}=${v}'') config.i18n.extraLocaleSettings)}
+        ${concatStringsSep "\n" (mapAttrsToList (n: v: "${n}=${v}") config.i18n.extraLocaleSettings)}
       '';
 
   };
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index ef747774b25..dba8977e482 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -195,8 +195,7 @@ in
         '';
 
         # /etc/netgroup: Network-wide groups.
-        netgroup.text = mkDefault ''
-        '';
+        netgroup.text = mkDefault "";
 
         # /etc/host.conf: resolver configuration file
         "host.conf".text = ''
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index a77524d75d8..c0e90a8c26e 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -183,7 +183,7 @@ in {
         config = mkOption {
           type = types.attrsOf types.unspecified;
           default = {};
-          description = ''Config of the pulse daemon. See <literal>man pulse-daemon.conf</literal>.'';
+          description = "Config of the pulse daemon. See <literal>man pulse-daemon.conf</literal>.";
           example = literalExample ''{ realtime-scheduling = "yes"; }'';
         };
       };
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index e90a7d567d4..5b3e9a8ceb7 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -364,7 +364,7 @@ let
       count = mkOption {
         type = types.int;
         default = 1;
-        description = ''Count of subordinate user ids'';
+        description = "Count of subordinate user ids";
       };
     };
   };
@@ -381,7 +381,7 @@ let
       count = mkOption {
         type = types.int;
         default = 1;
-        description = ''Count of subordinate group ids'';
+        description = "Count of subordinate group ids";
       };
     };
   };
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index 2278c7b4061..b6af4f80445 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -40,7 +40,7 @@ in
         default = "wheel";
         example = "video";
         type = types.str;
-        description = ''Group for bumblebee socket'';
+        description = "Group for bumblebee socket";
       };
 
       connectDisplay = mkOption {
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 426281c9412..1d2bc8c7281 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -215,7 +215,7 @@ in {
           ''
           else ''
             exec ${cfg.locate}/bin/updatedb \
-              ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \
+              ${optionalString (cfg.localuser != null && ! isMLocate) "--localuser=${cfg.localuser}"} \
               --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
           '';
         environment = optionalAttrs (!isMLocate) {
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 25ac94b8e0f..8160bfef4a3 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -73,7 +73,7 @@ in
           }
         '';
       type = pkgsType;
-      example = literalExample ''import <nixpkgs> {}'';
+      example = literalExample "import <nixpkgs> {}";
       description = ''
         If set, the pkgs argument to all NixOS modules is the value of
         this option, extended with <code>nixpkgs.overlays</code>, if
diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix
index 26db1675072..4d59ea8d0fd 100644
--- a/nixos/modules/programs/captive-browser.nix
+++ b/nixos/modules/programs/captive-browser.nix
@@ -27,14 +27,14 @@ in
       # the options below are the same as in "captive-browser.toml"
       browser = mkOption {
         type = types.str;
-        default = concatStringsSep " " [ ''${pkgs.chromium}/bin/chromium''
-                                         ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
+        default = concatStringsSep " " [ "${pkgs.chromium}/bin/chromium"
+                                         "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive"
                                          ''--proxy-server="socks5://$PROXY"''
                                          ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"''
-                                         ''--no-first-run''
-                                         ''--new-window''
-                                         ''--incognito''
-                                         ''http://cache.nixos.org/''
+                                         "--no-first-run"
+                                         "--new-window"
+                                         "--incognito"
+                                         "http://cache.nixos.org/"
                                        ];
         description = ''
           The shell (/bin/sh) command executed once the proxy starts.
@@ -62,7 +62,7 @@ in
       socks5-addr = mkOption {
         type = types.str;
         default = "localhost:1666";
-        description = ''the listen address for the SOCKS5 proxy server'';
+        description = "the listen address for the SOCKS5 proxy server";
       };
 
       bindInterface = mkOption {
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 40af4d0ff5a..d4a7769bbd6 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -36,7 +36,7 @@ in
       askPassword = mkOption {
         type = types.str;
         default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
-        description = ''Program used by SSH to ask for passwords.'';
+        description = "Program used by SSH to ask for passwords.";
       };
 
       forwardX11 = mkOption {
diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix
index 83ed7138640..ceb7259b3d7 100644
--- a/nixos/modules/programs/xss-lock.nix
+++ b/nixos/modules/programs/xss-lock.nix
@@ -11,7 +11,7 @@ in
 
     lockerCommand = mkOption {
       default = "${pkgs.i3lock}/bin/i3lock";
-      example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
+      example = literalExample "\${pkgs.i3lock-fancy}/bin/i3lock-fancy";
       type = types.separatedString " ";
       description = "Locker to be used with xsslock";
     };
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 2e5953dc6f4..9f01e29dd0e 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -74,7 +74,7 @@ in {
       musicDirectory = mkOption {
         type = with types; either path (strMatching "(http|https|nfs|smb)://.+");
         default = "${cfg.dataDir}/music";
-        defaultText = ''''${dataDir}/music'';
+        defaultText = "\${dataDir}/music";
         description = ''
           The directory or NFS/SMB network share where MPD reads music from. If left
           as the default value this directory will automatically be created before
@@ -86,7 +86,7 @@ in {
       playlistDirectory = mkOption {
         type = types.path;
         default = "${cfg.dataDir}/playlists";
-        defaultText = ''''${dataDir}/playlists'';
+        defaultText = "\${dataDir}/playlists";
         description = ''
           The directory where MPD stores playlists. If left as the default value
           this directory will automatically be created before the MPD server starts,
@@ -155,7 +155,7 @@ in {
       dbFile = mkOption {
         type = types.nullOr types.str;
         default = "${cfg.dataDir}/tag_cache";
-        defaultText = ''''${dataDir}/tag_cache'';
+        defaultText = "\${dataDir}/tag_cache";
         description = ''
           The path to MPD's database. If set to <literal>null</literal> the
           parameter is omitted from the configuration.
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 3d69a69038a..b485602aab8 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -190,8 +190,7 @@ let
       };
 
       devices = mkOption {
-        description = ''
-        '';
+        description = "";
       };
 
       extraAutochangerConfig = mkOption {
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index d31b92abde0..8187042b4b8 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -354,7 +354,7 @@ in
 
         script = let
           tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
-          lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)'';
+          lastArchive = "$(${tarsnap} --list-archives | sort | tail -1)";
           run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}'';
 
         in if (cfg.cachedir != null) then ''
diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix
index bfb73f68371..171d4aced65 100644
--- a/nixos/modules/services/cluster/hadoop/default.nix
+++ b/nixos/modules/services/cluster/hadoop/default.nix
@@ -50,8 +50,7 @@ with lib;
       default = pkgs.hadoop;
       defaultText = "pkgs.hadoop";
       example = literalExample "pkgs.hadoop";
-      description = ''
-      '';
+      description = "";
     };
   };
 
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 302f058926c..7363441e538 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -14,8 +14,8 @@ let
       ClusterName=${cfg.clusterName}
       StateSaveLocation=${cfg.stateSaveLocation}
       SlurmUser=${cfg.user}
-      ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
-      ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
+      ${optionalString (cfg.controlMachine != null) "controlMachine=${cfg.controlMachine}"}
+      ${optionalString (cfg.controlAddr != null) "controlAddr=${cfg.controlAddr}"}
       ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)}
       ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)}
       PlugStackConfig=${plugStackConfig}/plugstack.conf
@@ -25,7 +25,7 @@ let
 
   plugStackConfig = pkgs.writeTextDir "plugstack.conf"
     ''
-      ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''}
+      ${optionalString cfg.enableSrunX11 "optional ${pkgs.slurm-spank-x11}/lib/x11.so"}
       ${cfg.extraPlugstackConfig}
     '';
 
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index f385331e878..c99a7529213 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -16,8 +16,7 @@ let
       [admins]
       ${cfg.adminUser} = ${cfg.adminPass}
     '' else
-    ''
-    '') + (if useVersion2 then
+    "") + (if useVersion2 then
     ''
       [chttpd]
     '' else
diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
index 36dbb87f730..ed47f647edd 100644
--- a/nixos/modules/services/databases/firebird.nix
+++ b/nixos/modules/services/databases/firebird.nix
@@ -117,7 +117,7 @@ in
         serviceConfig.User = cfg.user;
         serviceConfig.LogsDirectory = "firebird";
         serviceConfig.LogsDirectoryMode = "0700";
-        serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d'';
+        serviceConfig.ExecStart = "${firebird}/bin/fbserver -d";
 
         # TODO think about shutdown
       };
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 09b453e7584..53760bb24c4 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -16,14 +16,14 @@ let
       ''}
       dbms.ssl.policy.${name}.client_auth=${conf.clientAuth}
       ${if length (splitString "/" conf.privateKey) > 1 then
-        ''dbms.ssl.policy.${name}.private_key=${conf.privateKey}''
+        "dbms.ssl.policy.${name}.private_key=${conf.privateKey}"
       else
-        ''dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}''
+        "dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}"
       }
       ${if length (splitString "/" conf.privateKey) > 1 then
-        ''dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}''
+        "dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}"
       else
-        ''dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}''
+        "dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}"
       }
       dbms.ssl.policy.${name}.revoked_dir=${conf.revokedDir}
       dbms.ssl.policy.${name}.tls_versions=${concatStringsSep "," conf.tlsVersions}
diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix
index 226718a9e80..c1180a8bbdd 100644
--- a/nixos/modules/services/development/bloop.nix
+++ b/nixos/modules/services/development/bloop.nix
@@ -44,7 +44,7 @@ in {
       };
       serviceConfig = {
         Type        = "simple";
-        ExecStart   = ''${pkgs.bloop}/bin/bloop server'';
+        ExecStart   = "${pkgs.bloop}/bin/bloop server";
         Restart     = "always";
       };
     };
diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix
index 8b997ccbf66..10d868b7f16 100644
--- a/nixos/modules/services/editors/infinoted.nix
+++ b/nixos/modules/services/editors/infinoted.nix
@@ -141,14 +141,14 @@ in {
           install -o ${cfg.user} -g ${cfg.group} -m 0600 /dev/null /var/lib/infinoted/infinoted.conf
           cat >>/var/lib/infinoted/infinoted.conf <<EOF
           [infinoted]
-          ${optionalString (cfg.keyFile != null) ''key-file=${cfg.keyFile}''}
-          ${optionalString (cfg.certificateFile != null) ''certificate-file=${cfg.certificateFile}''}
-          ${optionalString (cfg.certificateChain != null) ''certificate-chain=${cfg.certificateChain}''}
+          ${optionalString (cfg.keyFile != null) "key-file=${cfg.keyFile}"}
+          ${optionalString (cfg.certificateFile != null) "certificate-file=${cfg.certificateFile}"}
+          ${optionalString (cfg.certificateChain != null) "certificate-chain=${cfg.certificateChain}"}
           port=${toString cfg.port}
           security-policy=${cfg.securityPolicy}
           root-directory=${cfg.rootDirectory}
           plugins=${concatStringsSep ";" cfg.plugins}
-          ${optionalString (cfg.passwordFile != null) ''password=$(head -n 1 ${cfg.passwordFile})''}
+          ${optionalString (cfg.passwordFile != null) "password=$(head -n 1 ${cfg.passwordFile})"}
 
           ${cfg.extraConfig}
           EOF
diff --git a/nixos/modules/services/games/openarena.nix b/nixos/modules/services/games/openarena.nix
index 8c014d78809..9c441e98b20 100644
--- a/nixos/modules/services/games/openarena.nix
+++ b/nixos/modules/services/games/openarena.nix
@@ -19,7 +19,7 @@ in
       extraFlags = mkOption {
         type = types.listOf types.str;
         default = [];
-        description = ''Extra flags to pass to <command>oa_ded</command>'';
+        description = "Extra flags to pass to <command>oa_ded</command>";
         example = [
           "+set dedicated 2"
           "+set sv_hostname 'My NixOS OpenArena Server'"
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index bf92425f998..a4fc315d080 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -100,7 +100,7 @@ in
 
       inputConfig = mkOption {
         type = types.lines;
-        default = ''generator { }'';
+        default = "generator { }";
         description = "Logstash input configuration.";
         example = ''
           # Read from journal
@@ -131,7 +131,7 @@ in
 
       outputConfig = mkOption {
         type = types.lines;
-        default = ''stdout { codec => rubydebug }'';
+        default = "stdout { codec => rubydebug }";
         description = "Logstash output configuration.";
         example = ''
           redis { host => ["localhost"] data_type => "list" key => "logstash" codec => json }
diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 709f6b21aa0..7c206e3725e 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -163,7 +163,7 @@ in {
 
     systemd.services.postgrey = let
       bind-flag = if cfg.socket ? path then
-        ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}''
+        "--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}"
       else
         ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}'';
     in {
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index fa9c8c54509..b80a4746fd1 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -120,7 +120,7 @@ in
       wantedBy = [ "multi-user.target" ];
 
       environment = {
-        LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib'';
+        LD_LIBRARY_PATH = "/run/opengl-driver/lib:/run/opengl-driver-32/lib";
         DISPLAY = ":${toString config.services.xserver.display}";
         GPU_MAX_ALLOC_PERCENT = "100";
         GPU_USE_SYNC_OBJECTS = "1";
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index d175854d2d1..6e796a3a1fc 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -27,7 +27,7 @@ in
         default = with pkgs.dictdDBs; [ wiktionary wordnet ];
         defaultText = "with pkgs.dictdDBs; [ wiktionary wordnet ]";
         example = literalExample "[ pkgs.dictdDBs.nld2eng ]";
-        description = ''List of databases to make available.'';
+        description = "List of databases to make available.";
       };
 
     };
diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
index f8c79f892da..28c98edf47a 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -185,7 +185,7 @@ in
       };
       zkExtraCfg = mkOption {
         type = types.str;
-        default = ''initLimit=5&syncLimit=2&tickTime=2000'';
+        default = "initLimit=5&syncLimit=2&tickTime=2000";
         description = ''
           Extra options to pass into Zookeeper
         '';
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 2735185ec88..434e2d2429b 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -597,8 +597,7 @@ in
     users.groups.gitea = {};
 
     warnings =
-      optional (cfg.database.password != "") ''
-        config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead.'' ++
+      optional (cfg.database.password != "") "config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead." ++
       optional (cfg.extraConfig != null) ''
         services.gitea.`extraConfig` is deprecated, please use services.gitea.`settings`.
       '';
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 3abb9b7d69c..8e3fa60206c 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -504,8 +504,7 @@ in {
       report_stats = mkOption {
         type = types.bool;
         default = false;
-        description = ''
-        '';
+        description = "";
       };
       servers = mkOption {
         type = types.attrsOf (types.attrsOf types.str);
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 75218aa1d46..1dccbc93edf 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -104,7 +104,7 @@ in
       hooks = mkOption {
         default = {};
         example = {
-          doshutdown = ''# shell commands to notify that the computer is shutting down'';
+          doshutdown = "# shell commands to notify that the computer is shutting down";
         };
         type = types.attrsOf types.lines;
         description = ''
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 64d9d61950d..9213748d3c9 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -25,10 +25,10 @@ let
 
   graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
     search_index: ${dataDir}/index
-    ${optionalString (config.time.timeZone != null) ''time_zone: ${config.time.timeZone}''}
-    ${optionalString (cfg.api.finders != []) ''finders:''}
+    ${optionalString (config.time.timeZone != null) "time_zone: ${config.time.timeZone}"}
+    ${optionalString (cfg.api.finders != []) "finders:"}
     ${concatMapStringsSep "\n" (f: "  - " + f.moduleName) cfg.api.finders}
-    ${optionalString (cfg.api.functions != []) ''functions:''}
+    ${optionalString (cfg.api.functions != []) "functions:"}
     ${concatMapStringsSep "\n" (f: "  - " + f) cfg.api.functions}
     ${cfg.api.extraConfig}
   '';
diff --git a/nixos/modules/services/monitoring/incron.nix b/nixos/modules/services/monitoring/incron.nix
index 1789fd9f205..dc97af58562 100644
--- a/nixos/modules/services/monitoring/incron.nix
+++ b/nixos/modules/services/monitoring/incron.nix
@@ -67,7 +67,7 @@ in
   config = mkIf cfg.enable {
 
     warnings = optional (cfg.allow != null && cfg.deny != null)
-      ''If `services.incron.allow` is set then `services.incron.deny` will be ignored.'';
+      "If `services.incron.allow` is set then `services.incron.deny` will be ignored.";
 
     environment.systemPackages = [ pkgs.incron ];
 
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
index 97210463027..a3b2b92bc34 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
@@ -20,7 +20,7 @@ in
       port = mkOption {
         type = types.int;
         default = 25826;
-        description = ''Network address on which to accept collectd binary network packets.'';
+        description = "Network address on which to accept collectd binary network packets.";
       };
 
       listenAddress = mkOption {
diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index b341a9005c2..bc30ca3b77c 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -69,7 +69,7 @@ in {
             umask 077
             ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /var/run/telegraf/config.toml
           '');
-        ExecStart=''${cfg.package}/bin/telegraf -config ${finalConfigFile}'';
+        ExecStart="${cfg.package}/bin/telegraf -config ${finalConfigFile}";
         ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         RuntimeDirectory = "telegraf";
         User = "telegraf";
diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix
index 52dab28cf72..474ea4b2505 100644
--- a/nixos/modules/services/monitoring/thanos.nix
+++ b/nixos/modules/services/monitoring/thanos.nix
@@ -12,7 +12,7 @@ let
   };
 
   optionToArgs = opt: v  : optional (v != null)  ''--${opt}="${toString v}"'';
-  flagToArgs   = opt: v  : optional v            ''--${opt}'';
+  flagToArgs   = opt: v  : optional v            "--${opt}";
   listToArgs   = opt: vs : map               (v: ''--${opt}="${v}"'') vs;
   attrsToArgs  = opt: kvs: mapAttrsToList (k: v: ''--${opt}=${k}=\"${v}\"'') kvs;
 
@@ -67,7 +67,7 @@ let
     preferLocalBuild = true;
     json = builtins.toFile "${name}.json" (builtins.toJSON attrs);
     nativeBuildInputs = [ pkgs.remarshal ];
-  } ''json2yaml -i $json -o $out'';
+  } "json2yaml -i $json -o $out";
 
   thanos = cmd: "${cfg.package}/bin/thanos ${cmd}" +
     (let args = cfg.${cmd}.arguments;
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index a45e806d4ad..ae5097c5442 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -205,7 +205,7 @@ in
       after = [ "upsd.service" ];
       wantedBy = [ "multi-user.target" ];
       # TODO: replace 'root' by another username.
-      script = ''${pkgs.nut}/bin/upsdrvctl -u root start'';
+      script = "${pkgs.nut}/bin/upsdrvctl -u root start";
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index f2dc740fd88..632c3fb1059 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -48,7 +48,7 @@ let
       ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
                     -f --cluster ${clusterName} --id ${daemonId}'';
     } // optionalAttrs (daemonType == "osd") {
-      ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}'';
+      ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}";
       RestartSec = "20s";
       PrivateDevices = "no"; # osd needs disk access
     } // optionalAttrs ( daemonType == "mon") {
@@ -353,7 +353,7 @@ in
     ];
 
     warnings = optional (cfg.global.monInitialMembers == null)
-      ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function'';
+      "Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function";
 
     environment.etc."ceph/ceph.conf".text = let
       # Merge the extraConfig set for mgr daemons, as mgr don't have their own section
diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
index c843d892193..39320643dd5 100644
--- a/nixos/modules/services/networking/amuled.nix
+++ b/nixos/modules/services/networking/amuled.nix
@@ -25,7 +25,7 @@ in
 
       dataDir = mkOption {
         type = types.str;
-        default = ''/home/${user}/'';
+        default = "/home/${user}/";
         description = ''
           The directory holding configuration, incoming and temporary files.
         '';
diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix
index 5b5068e43d7..c8e08fdefaa 100644
--- a/nixos/modules/services/networking/cntlm.nix
+++ b/nixos/modules/services/networking/cntlm.nix
@@ -42,13 +42,13 @@ in
     };
 
     domain = mkOption {
-      description = ''Proxy account domain/workgroup name.'';
+      description = "Proxy account domain/workgroup name.";
     };
 
     password = mkOption {
       default = "/etc/cntlm.password";
       type = types.str;
-      description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.'';
+      description = "Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.";
     };
 
     netbios_hostname = mkOption {
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 6ccc2dffb26..11f66b05df1 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -42,8 +42,7 @@ in {
 
       extraConfig = mkOption {
         type = types.lines;
-        default = ''
-        '';
+        default = "";
         description = ''
           Configuration lines appended to the generated connman configuration file.
         '';
diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix
index 05c2bdef83e..3584915d0aa 100644
--- a/nixos/modules/services/networking/dnsdist.nix
+++ b/nixos/modules/services/networking/dnsdist.nix
@@ -26,8 +26,7 @@ in {
 
       extraConfig = mkOption {
         type = types.lines;
-        default = ''
-        '';
+        default = "";
         description = ''
           Extra lines to be added verbatim to dnsdist.conf.
         '';
diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix
index 56f2ba21a12..3e3a3c1aa94 100644
--- a/nixos/modules/services/networking/gateone.nix
+++ b/nixos/modules/services/networking/gateone.nix
@@ -10,12 +10,12 @@ options = {
       pidDir = mkOption {
         default = "/run/gateone";
         type = types.path;
-        description = ''Path of pid files for GateOne.'';
+        description = "Path of pid files for GateOne.";
       };
       settingsDir = mkOption {
         default = "/var/lib/gateone";
         type = types.path;
-        description = ''Path of configuration files for GateOne.'';
+        description = "Path of configuration files for GateOne.";
       };
     };
 };
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 5d73038363a..e9569b2ba6b 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -20,8 +20,8 @@ let
     ssid=${cfg.ssid}
     hw_mode=${cfg.hwMode}
     channel=${toString cfg.channel}
-    ${optionalString (cfg.countryCode != null) ''country_code=${cfg.countryCode}''}
-    ${optionalString (cfg.countryCode != null) ''ieee80211d=1''}
+    ${optionalString (cfg.countryCode != null) "country_code=${cfg.countryCode}"}
+    ${optionalString (cfg.countryCode != null) "ieee80211d=1"}
 
     # logging (debug level)
     logger_syslog=-1
diff --git a/nixos/modules/services/networking/hylafax/modem-default.nix b/nixos/modules/services/networking/hylafax/modem-default.nix
index 7529b5b0aaf..707b8209282 100644
--- a/nixos/modules/services/networking/hylafax/modem-default.nix
+++ b/nixos/modules/services/networking/hylafax/modem-default.nix
@@ -5,7 +5,7 @@
 {
 
   TagLineFont = "etc/LiberationSans-25.pcf";
-  TagLineLocale = ''en_US.UTF-8'';
+  TagLineLocale = "en_US.UTF-8";
 
   AdminGroup = "root";  # groups that can change server config
   AnswerRotary = "fax";  # don't accept anything else but faxes
@@ -16,7 +16,7 @@
   SessionTracing = "0x78701";
   UUCPLockDir = "/var/lock";
 
-  SendPageCmd = ''${pkgs.coreutils}/bin/false'';  # prevent pager transmit
-  SendUUCPCmd = ''${pkgs.coreutils}/bin/false'';  # prevent UUCP transmit
+  SendPageCmd = "${pkgs.coreutils}/bin/false";  # prevent pager transmit
+  SendUUCPCmd = "${pkgs.coreutils}/bin/false";  # prevent UUCP transmit
 
 }
diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix
index 9e28d09dffc..7f18c0d39ab 100644
--- a/nixos/modules/services/networking/hylafax/options.nix
+++ b/nixos/modules/services/networking/hylafax/options.nix
@@ -85,8 +85,8 @@ let
       # Otherwise, we use `false` to provoke
       # an error if hylafax tries to use it.
       c.sendmailPath = mkMerge [
-        (mkIfDefault noWrapper ''${pkgs.coreutils}/bin/false'')
-        (mkIfDefault (!noWrapper) ''${wrapperDir}/${program}'')
+        (mkIfDefault noWrapper "${pkgs.coreutils}/bin/false")
+        (mkIfDefault (!noWrapper) "${wrapperDir}/${program}")
       ];
       importDefaultConfig = file:
         lib.attrsets.mapAttrs
@@ -121,7 +121,7 @@ in
 
   options.services.hylafax = {
 
-    enable = mkEnableOption ''HylaFAX server'';
+    enable = mkEnableOption "HylaFAX server";
 
     autostart = mkOption {
       type = bool;
@@ -139,28 +139,28 @@ in
       type = nullOr str1;
       default = null;
       example = "49";
-      description = ''Country code for server and all modems.'';
+      description = "Country code for server and all modems.";
     };
 
     areaCode = mkOption {
       type = nullOr str1;
       default = null;
       example = "30";
-      description = ''Area code for server and all modems.'';
+      description = "Area code for server and all modems.";
     };
 
     longDistancePrefix = mkOption {
       type = nullOr str;
       default = null;
       example = "0";
-      description = ''Long distance prefix for server and all modems.'';
+      description = "Long distance prefix for server and all modems.";
     };
 
     internationalPrefix = mkOption {
       type = nullOr str;
       default = null;
       example = "00";
-      description = ''International prefix for server and all modems.'';
+      description = "International prefix for server and all modems.";
     };
 
     spoolAreaPath = mkOption {
@@ -267,7 +267,7 @@ in
     spoolExtraInit = mkOption {
       type = lines;
       default = "";
-      example = ''chmod 0755 .  # everyone may read my faxes'';
+      example = "chmod 0755 .  # everyone may read my faxes";
       description = ''
         Additional shell code that is executed within the
         spooling area directory right after its setup.
@@ -345,7 +345,7 @@ in
     faxqclean.doneqMinutes = mkOption {
       type = int1;
       default = 15;
-      example = literalExample ''24*60'';
+      example = literalExample "24*60";
       description = ''
         Set the job
         age threshold (in minutes) that controls how long
@@ -355,7 +355,7 @@ in
     faxqclean.docqMinutes = mkOption {
       type = int1;
       default = 60;
-      example = literalExample ''24*60'';
+      example = literalExample "24*60";
       description = ''
         Set the document
         age threshold (in minutes) that controls how long
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix
index b9b9b9dca4f..f63f7c97ad1 100644
--- a/nixos/modules/services/networking/hylafax/systemd.nix
+++ b/nixos/modules/services/networking/hylafax/systemd.nix
@@ -16,12 +16,12 @@ let
       mkLines = conf:
         (lib.concatLists
         (lib.flip lib.mapAttrsToList conf
-        (k: map (v: ''${k}: ${v}'')
+        (k: map (v: "${k}: ${v}")
       )));
       include = mkLines { Include = conf.Include or []; };
       other = mkLines ( conf // { Include = []; } );
     in
-      pkgs.writeText ''hylafax-config${name}''
+      pkgs.writeText "hylafax-config${name}"
       (concatStringsSep "\n" (include ++ other));
 
   globalConfigPath = mkConfigFile "" cfg.faxqConfig;
@@ -29,7 +29,7 @@ let
   modemConfigPath =
     let
       mkModemConfigFile = { config, name, ... }:
-        mkConfigFile ''.${name}''
+        mkConfigFile ".${name}"
         (cfg.commonModemConfig // config);
       mkLine = { name, type, ... }@modem: ''
         # check if modem config file exists:
@@ -81,7 +81,7 @@ let
     description = "HylaFAX queue manager sendq watch";
     documentation = [ "man:faxq(8)" "man:sendq(5)" ];
     wantedBy = [ "multi-user.target" ];
-    pathConfig.PathExistsGlob = [ ''${cfg.spoolAreaPath}/sendq/q*'' ];
+    pathConfig.PathExistsGlob = [ "${cfg.spoolAreaPath}/sendq/q*" ];
   };
 
   timers = mkMerge [
@@ -134,7 +134,7 @@ let
         exit 1
       fi
     '';
-    serviceConfig.ExecStop = ''${setupSpoolScript}'';
+    serviceConfig.ExecStop = "${setupSpoolScript}";
     serviceConfig.RemainAfterExit = true;
     serviceConfig.Type = "oneshot";
     unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ];
@@ -145,7 +145,7 @@ let
     documentation = [ "man:faxq(8)" ];
     requires = [ "hylafax-spool.service" ];
     after = [ "hylafax-spool.service" ];
-    wants = mapModems ( { name, ... }: ''hylafax-faxgetty@${name}.service'' );
+    wants = mapModems ( { name, ... }: "hylafax-faxgetty@${name}.service" );
     wantedBy = mkIf cfg.autostart [ "multi-user.target" ];
     serviceConfig.Type = "forking";
     serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/faxq -q "${cfg.spoolAreaPath}"'';
@@ -155,7 +155,7 @@ let
     # stopped will always yield a failed send attempt:
     # The fax service is started when the job is created with
     # `sendfax`, but modems need some time to initialize.
-    serviceConfig.ExecStartPost = [ ''${waitFaxqScript}'' ];
+    serviceConfig.ExecStartPost = [ "${waitFaxqScript}" ];
     # faxquit fails if the pipe is already gone
     # (e.g. the service is already stopping)
     serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}"'';
@@ -186,7 +186,7 @@ let
     wantedBy = mkIf cfg.faxcron.enable.spoolInit requires;
     startAt = mkIf (cfg.faxcron.enable.frequency!=null) cfg.faxcron.enable.frequency;
     serviceConfig.ExecStart = concatStringsSep " " [
-      ''${pkgs.hylafaxplus}/spool/bin/faxcron''
+      "${pkgs.hylafaxplus}/spool/bin/faxcron"
       ''-q "${cfg.spoolAreaPath}"''
       ''-info ${toString cfg.faxcron.infoDays}''
       ''-log  ${toString cfg.faxcron.logDays}''
@@ -202,18 +202,18 @@ let
     wantedBy = mkIf cfg.faxqclean.enable.spoolInit requires;
     startAt = mkIf (cfg.faxqclean.enable.frequency!=null) cfg.faxqclean.enable.frequency;
     serviceConfig.ExecStart = concatStringsSep " " [
-      ''${pkgs.hylafaxplus}/spool/bin/faxqclean''
+      "${pkgs.hylafaxplus}/spool/bin/faxqclean"
       ''-q "${cfg.spoolAreaPath}"''
-      ''-v''
-      (optionalString (cfg.faxqclean.archiving!="never") ''-a'')
-      (optionalString (cfg.faxqclean.archiving=="always")  ''-A'')
+      "-v"
+      (optionalString (cfg.faxqclean.archiving!="never") "-a")
+      (optionalString (cfg.faxqclean.archiving=="always")  "-A")
       ''-j ${toString (cfg.faxqclean.doneqMinutes*60)}''
       ''-d ${toString (cfg.faxqclean.docqMinutes*60)}''
     ];
   };
 
   mkFaxgettyService = { name, ... }:
-    lib.nameValuePair ''hylafax-faxgetty@${name}'' rec {
+    lib.nameValuePair "hylafax-faxgetty@${name}" rec {
       description = "HylaFAX faxgetty for %I";
       documentation = [ "man:faxgetty(8)" ];
       bindsTo = [ "dev-%i.device" ];
@@ -221,7 +221,7 @@ let
       after = bindsTo ++ requires;
       before = [ "hylafax-faxq.service" "getty.target" ];
       unitConfig.StopWhenUnneeded = true;
-      unitConfig.AssertFileNotEmpty = ''${cfg.spoolAreaPath}/etc/config.%I'';
+      unitConfig.AssertFileNotEmpty = "${cfg.spoolAreaPath}/etc/config.%I";
       serviceConfig.UtmpIdentifier = "%I";
       serviceConfig.TTYPath = "/dev/%I";
       serviceConfig.Restart = "always";
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 553415a2f32..6fedb0a270f 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -17,37 +17,37 @@ in
       enable = mkOption {
         default = false;
         type = types.bool;
-        description = ''Enable the kippo honeypot ssh server.'';
+        description = "Enable the kippo honeypot ssh server.";
       };
       port = mkOption {
         default = 2222;
         type = types.int;
-        description = ''TCP port number for kippo to bind to.'';
+        description = "TCP port number for kippo to bind to.";
       };
       hostname = mkOption {
         default = "nas3";
         type = types.str;
-        description = ''Hostname for kippo to present to SSH login'';
+        description = "Hostname for kippo to present to SSH login";
       };
       varPath = mkOption {
         default = "/var/lib/kippo";
         type = types.path;
-        description = ''Path of read/write files needed for operation and configuration.'';
+        description = "Path of read/write files needed for operation and configuration.";
       };
       logPath = mkOption {
         default = "/var/log/kippo";
         type = types.path;
-        description = ''Path of log files needed for operation and configuration.'';
+        description = "Path of log files needed for operation and configuration.";
       };
       pidPath = mkOption {
         default = "/run/kippo";
         type = types.path;
-        description = ''Path of pid files needed for operation.'';
+        description = "Path of pid files needed for operation.";
       };
       extraConfig = mkOption {
         default = "";
         type = types.lines;
-        description = ''Extra verbatim configuration added to the end of kippo.cfg.'';
+        description = "Extra verbatim configuration added to the end of kippo.cfg.";
       };
     };
 
diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix
index 637ed618b89..baf64347b09 100644
--- a/nixos/modules/services/networking/owamp.nix
+++ b/nixos/modules/services/networking/owamp.nix
@@ -10,7 +10,7 @@ in
   ###### interface
 
   options = {
-    services.owamp.enable = mkEnableOption ''Enable OWAMP server'';
+    services.owamp.enable = mkEnableOption "Enable OWAMP server";
   };
 
 
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index da723ec86ad..2958fb9a8b3 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -61,7 +61,7 @@ in
       };
 
       dataDir = mkOption {
-        default = ''/home/${user}/.config/quassel-irc.org'';
+        default = "/home/${user}/.config/quassel-irc.org";
         description = ''
           The directory holding configuration files, the SQlite database and the SSL Cert.
         '';
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 37ee2a80389..0747ff6dd5a 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -303,7 +303,7 @@ in
         ${cfg.package}/bin/smokeping --check --config=${configPath}
         ${cfg.package}/bin/smokeping --static --config=${configPath}
       '';
-      script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon'';
+      script = "${cfg.package}/bin/smokeping --config=${configPath} --nodaemon";
     };
     systemd.services.thttpd = mkIf cfg.webService {
       wantedBy = [ "multi-user.target"];
diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix
index 41d0584080e..e46d62bf1e8 100644
--- a/nixos/modules/services/networking/ssh/lshd.nix
+++ b/nixos/modules/services/networking/ssh/lshd.nix
@@ -56,25 +56,25 @@ in
       syslog = mkOption {
         type = types.bool;
         default = true;
-        description = ''Whether to enable syslog output.'';
+        description = "Whether to enable syslog output.";
       };
 
       passwordAuthentication = mkOption {
         type = types.bool;
         default = true;
-        description = ''Whether to enable password authentication.'';
+        description = "Whether to enable password authentication.";
       };
 
       publicKeyAuthentication = mkOption {
         type = types.bool;
         default = true;
-        description = ''Whether to enable public key authentication.'';
+        description = "Whether to enable public key authentication.";
       };
 
       rootLogin = mkOption {
         type = types.bool;
         default = false;
-        description = ''Whether to enable remote root login.'';
+        description = "Whether to enable remote root login.";
       };
 
       loginShell = mkOption {
@@ -96,13 +96,13 @@ in
       tcpForwarding = mkOption {
         type = types.bool;
         default = true;
-        description = ''Whether to enable TCP/IP forwarding.'';
+        description = "Whether to enable TCP/IP forwarding.";
       };
 
       x11Forwarding = mkOption {
         type = types.bool;
         default = true;
-        description = ''Whether to enable X11 forwarding.'';
+        description = "Whether to enable X11 forwarding.";
       };
 
       subsystems = mkOption {
diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
index 1d1e0bd1ca1..8ae62931a8f 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
@@ -1273,7 +1273,7 @@ in {
         provided the user is prompted during an interactive
         <literal>--load-creds</literal> call.
       '';
-    } ''Definition for a private key that's stored on a token/smartcard/TPM.'';
+    } "Definition for a private key that's stored on a token/smartcard/TPM.";
 
   };
 
diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index 7a62e04ec7c..864c3319c54 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -70,7 +70,7 @@ in
           value must be a function which receives the attrset defined
           in <varname>python3Packages</varname> as the sole argument.
         '';
-        example = literalExample ''p: [ p.lxml p.requests ]'';
+        example = literalExample "p: [ p.lxml p.requests ]";
       };
 
     };
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 39513987903..61482596763 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -14,8 +14,8 @@ let
         then ''"${psk}"''
         else pskRaw;
       baseAuth = if key != null
-        then ''psk=${key}''
-        else ''key_mgmt=NONE'';
+        then "psk=${key}"
+        else "key_mgmt=NONE";
     in ''
       network={
         ssid="${ssid}"
diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
index 71fd71a2cab..4cdb3a041b5 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixos/modules/services/security/usbguard.nix
@@ -173,7 +173,7 @@ in
 
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}'';
+        ExecStart = "${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}";
         Restart = "on-failure";
 
         StateDirectory = [
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 3518e0ee9dc..f83db30c1f0 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -98,7 +98,7 @@ in
            - final-message
            - power-state-change
           '';
-        description = ''cloud-init configuration.'';
+        description = "cloud-init configuration.";
       };
 
     };
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
index d9ebb3a9880..9567223ebc7 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -336,7 +336,7 @@ in
         locations."/" = {
           priority = 1;
           index = "doku.php";
-          extraConfig = ''try_files $uri $uri/ @dokuwiki;'';
+          extraConfig = "try_files $uri $uri/ @dokuwiki;";
         };
 
         locations."@dokuwiki" = {
diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
index bbb0c8d0483..a93e9327933 100644
--- a/nixos/modules/services/web-apps/keycloak.nix
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -565,7 +565,7 @@ in
         assertions = [
           {
             assertion = (cfg.databaseUseSSL && cfg.databaseType == "postgresql") -> (cfg.databaseCaCert != null);
-            message = ''A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL'';
+            message = "A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL";
           }
         ];
 
diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix
index 8887136ea5e..ad1e55d62d1 100644
--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -84,7 +84,7 @@ in
       type = mkOption {
         type = types.enum [ "mysql" "pgsql" ];
         default = "mysql";
-        description = ''Database engine to use.'';
+        description = "Database engine to use.";
       };
 
       host = mkOption {
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 7a3df26e47a..d1cb8a8dc25 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -193,7 +193,7 @@ in
       configText = mkOption {
         default = "";
         type = types.lines;
-        example = ''...verbatim config file contents...'';
+        example = "...verbatim config file contents...";
         description = ''
           Overridable config file contents to use for lighttpd. By default, use
           the contents automatically generated by NixOS.
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index db22dd36cbe..061f2967350 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -60,8 +60,7 @@ in
       version = mkOption {
         default = 2;
         type = types.enum [ 0 1 2 3 4 ];
-        description = ''
-        '';
+        description = "";
       };
 
       uboot = {
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 9638a7cb3e5..16ba0b74678 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -662,7 +662,7 @@ in
         # - HDDs are mixed with SSDs
         # - There is a SSDs in a pool that is currently trimmed.
         # - There are only HDDs and we would set the system in a degraded state
-        serviceConfig.ExecStart = ''${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool;  done || true' '';
+        serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool;  done || true' ";
       };
 
       systemd.timers.zpool-trim.timerConfig.Persistent = "yes";
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index 757d73421b8..7bec1b1ff26 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -170,7 +170,7 @@ let
 
       ${concatStringsSep "\n" (
         mapAttrsToList (name: cfg:
-          ''ip link del dev ${name} 2> /dev/null || true ''
+          "ip link del dev ${name} 2> /dev/null || true "
         ) cfg.extraVeths
       )}
    '';
@@ -185,7 +185,7 @@ let
             fi
           ''
         else
-          ''${ipcmd} add ${cfg.${attribute}} dev $ifaceHost'';
+          "${ipcmd} add ${cfg.${attribute}} dev $ifaceHost";
       renderExtraVeth = name: cfg:
         if cfg.hostBridge != null then
           ''
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 447d1f091c8..bf3615f2fe7 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -136,10 +136,8 @@ let
             cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS" || exit 1
             chmod 0644 "$NIX_EFI_VARS" || exit 1
           fi
-        '' else ''
-        ''}
-      '' else ''
-      ''}
+        '' else ""}
+      '' else ""}
 
       cd $TMPDIR
       idx=0
@@ -187,8 +185,7 @@ let
                 efiVars=$out/efi-vars.fd
                 cp ${efiVarsDefault} $efiVars
                 chmod 0644 $efiVars
-              '' else ''
-              ''}
+              '' else ""}
             '';
           buildInputs = [ pkgs.util-linux ];
           QEMU_OPTS = "-nographic -serial stdio -monitor none"
diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix
index 10464f62898..b603effef6e 100644
--- a/nixos/modules/virtualisation/railcar.nix
+++ b/nixos/modules/virtualisation/railcar.nix
@@ -105,7 +105,7 @@ in
 
     stateDir = mkOption {
       type = types.path;
-      default = ''/var/railcar'';
+      default = "/var/railcar";
       description = "Railcar persistent state directory";
     };
 
diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix
index 6dc57cae0d6..a25c522e12f 100644
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ];
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
     "ETC_PATH=$(out)/etc"
   ];
 
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index 233961ad111..777ac79a22d 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix
index 2dd9174d6dd..cc39da90c23 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/applications/editors/manuskript/default.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
       --replace sample-projects $out/share/${pname}/sample-projects
    '';
 
-  buildPhase = '''';
+  buildPhase = "";
 
   installPhase = ''
     mkdir -p $out/share/${pname}
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 97e8378d94e..00d0259a7a9 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -122,7 +122,7 @@ mkDerivation rec {
     mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";
   };
 
-  qtWrapperArgs = [ ''--suffix PATH : ${gnumake}/bin'' ];
+  qtWrapperArgs = [ "--suffix PATH : ${gnumake}/bin" ];
 
   postInstall = ''
       mkdir $out/share
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index e611e486288..734b189d1e4 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -137,8 +137,7 @@ in stdenv.mkDerivation rec {
     ++ lib.optional tclSupport tcl
     ++ lib.optional rubySupport ruby;
 
-  preConfigure = ''
-    '' + lib.optionalString ftNixSupport ''
+  preConfigure = "" + lib.optionalString ftNixSupport ''
       cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
       cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
       cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 0a611515b0d..0459d1d04ac 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lpthread";
 
-  postPatch = ''patchShebangs version.sh'';
+  postPatch = "patchShebangs version.sh";
 
   postInstall = ''
     wrapProgram $out/bin/ahoviewer \
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 2c9430ded73..1ea21506e31 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin''  ];
+  qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin"  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index 384ddac5b4c..0800ee0c437 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -47,7 +47,7 @@ mkDerivation rec {
   sourceRoot = "${src.name}/mandelbulber2";
 
   qmakeFlags = [
-    "SHARED_PATH=${placeholder ''out''}"
+    "SHARED_PATH=${placeholder "out"}"
     (if withOpenCL
       then "qmake/mandelbulber-opencl.pro"
       else "qmake/mandelbulber.pro")
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index c3dd9f548d2..8b6e581ae0b 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -56,9 +56,9 @@ buildDotnetPackage rec {
     '';
 
   makeWrapperArgs = [
-    ''--prefix MONO_GAC_PREFIX : ${gtksharp}''
-    ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib''
-    ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib''
+    "--prefix MONO_GAC_PREFIX : ${gtksharp}"
+    "--prefix LD_LIBRARY_PATH : ${gtksharp}/lib"
+    "--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib"
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 31da1e8d495..89686e50d17 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
   # prevent double wrapping from wrapGApps and wrapPythonProgram
   dontWrapGApps = true;
   makeWrapperArgs = [
-    ''''${gappsWrapperArgs[@]}''
+    "\${gappsWrapperArgs[@]}"
   ];
 
   strictDeps = false;
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index ea78924574f..4771cebc341 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -94,7 +94,7 @@ in mkDerivation rec {
     "format"
   ];
 
-  qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ];
+  qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : $out/lib" ];
 
   postInstall = ''
     mkdir -p "$out/lib"
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
index 7a9e2939640..418658fec22 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
     "NO_VENV=1"
   ];
 
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 161005d1280..8865435339c 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -60,13 +60,13 @@ stdenv.mkDerivation {
   postInstall = ''
     for a in "$out/bin/"*; do
       wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \
-      ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \
-      ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \
-      ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \
-      ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \
-      ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \
-      ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \
-      ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \
+      ${lib.optionalString gitSupport "--prefix PATH : ${git}/bin "} \
+      ${lib.optionalString monotoneSupport "--prefix PATH : ${monotone}/bin "} \
+      ${lib.optionalString bazaarSupport "--prefix PATH : ${breezy}/bin "} \
+      ${lib.optionalString cvsSupport "--prefix PATH : ${cvs}/bin "} \
+      ${lib.optionalString cvsSupport "--prefix PATH : ${cvsps}/bin "} \
+      ${lib.optionalString subversionSupport "--prefix PATH : ${subversion.out}/bin "} \
+      ${lib.optionalString mercurialSupport "--prefix PATH : ${mercurial}/bin "} \
       ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \
       ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
     done
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index b3a68cffeff..cb8494e1c48 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -101,7 +101,7 @@ in buildPythonApplication rec {
   dontWrapGApps = true;
   makeWrapperArgs = [
     "--prefix PATH : ${binPath}"
-    ''''${gappsWrapperArgs[@]}''
+    "\${gappsWrapperArgs[@]}"
   ];
   # needed for glib-schemas to work correctly (will crash on dialogues otherwise)
   # see https://github.com/NixOS/nixpkgs/issues/56943
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
index 858a8fa1475..4f2af99ab14 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "GIT_VERSION=${version}"
     "GIT_TIMESTAMP="
-    "SHAREDIR=${placeholder ''out''}/share/osm2xmap"
-    "INSTALL_BINDIR=${placeholder ''out''}/bin"
-    "INSTALL_MANDIR=${placeholder ''out''}/share/man/man1"
+    "SHAREDIR=${placeholder "out"}/share/osm2xmap"
+    "INSTALL_BINDIR=${placeholder "out"}/bin"
+    "INSTALL_MANDIR=${placeholder "out"}/share/man/man1"
   ];
 
   NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
index d9feb28c037..57ec820a090 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./cmake.patch ];
-  postPatch = '' rm build '';
+  postPatch = "rm build ";
   nativeBuildInputs = [ cmake extra-cmake-modules ];
   buildInputs = [ plasma-framework kwindowsystem plasma-pa ];
 
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 77a7dcca747..e3a8e682577 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "LIBRE_INC=${libre}/include/re"
     "LIBRE_SO=${libre}/lib"
     "LIBREM_PATH=${librem}"
-    ''PREFIX=$(out)''
+    "PREFIX=$(out)"
     "USE_VIDEO=1"
     "CCACHE_DISABLE=1"
 
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 137ad4d49b0..5fa5c2a2864 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ unzip ];
   buildInputs = [ ant jdk ];
 
-  buildPhase = ''ant make'';
+  buildPhase = "ant make";
 
   installPhase = ''
     mkdir -p $out
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix
index 24369bfc8d5..c357e78ccf2 100644
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/pkgs/applications/networking/owamp/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://software.internet2.edu/owamp/";
-    description = ''A tool for performing one-way active measurements'';
+    description = "A tool for performing one-way active measurements";
     platforms = platforms.linux;
     maintainers = [maintainers.teto];
     license = licenses.asl20;
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index dc828b58825..7441cdf4eef 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -28,7 +28,7 @@ mkDerivation {
 
   installTargets = [ "install_client" "install_man" ];
 
-  qtWrapperArgs = [ ''--suffix PATH : ${nx-libs}/bin:${openssh}/libexec'' ];
+  qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];
 
   meta = with lib; {
     description = "Graphical NoMachine NX3 remote desktop client";
diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix
index cedc85d53f6..683e6681573 100644
--- a/pkgs/applications/office/docear/default.nix
+++ b/pkgs/applications/office/docear/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
     # The wrapper ensures oraclejre is used
     makeWrapper ${runtimeShell} $out/bin/docear \
-      --set _JAVA_OPTIONS "${lib.optionalString antialiasFont ''-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on''}" \
+      --set _JAVA_OPTIONS "${lib.optionalString antialiasFont "-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on"}" \
       --set JAVA_HOME ${oraclejre.home} \
       --add-flags "$out/share/docear.sh"
 
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index 0df6070319d..f0237c4cecf 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
   # glib-2.62 deprecations
   NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
 
-  preConfigure = ''./autogen.sh'';
+  preConfigure = "./autogen.sh";
   configureFlags = [
     "--enable-python"
     "--enable-python-plugin"
diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix
index a8f96fac44a..a48efb9aa6d 100644
--- a/pkgs/applications/radio/gnuradio/3.7.nix
+++ b/pkgs/applications/radio/gnuradio/3.7.nix
@@ -241,8 +241,7 @@ let
     # gr-fcd feature was dropped in 3.8
     ++ lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ]
   ;
-  preConfigure = ''
-  ''
+  preConfigure = ""
     # wxgui and pygtk are not looked up properly, so we force them to be
     # detected as found, if they are requested by the `features` attrset.
     + lib.optionalString (hasFeature "gr-wxgui" features) ''
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index e99a1bfd7a1..9223f160db3 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -240,8 +240,7 @@ let
       ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
     ''
   ;
-  preConfigure = ''
-  ''
+  preConfigure = ""
     # If python-support is disabled, don't install volk's (git submodule)
     # volk_modtool - it references python.
     #
diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix
index e30831f87ee..1d5d84f4649 100644
--- a/pkgs/applications/radio/gnuradio/shared.nix
+++ b/pkgs/applications/radio/gnuradio/shared.nix
@@ -83,8 +83,7 @@ rec {
     ++ lib.optionals (hasFeature "gr-uhd" features) [ "share/gnuradio/examples/uhd" ]
     ++ lib.optionals (hasFeature "gr-qtgui" features) [ "share/gnuradio/examples/qt-gui" ]
   ;
-  postInstall = ''
-  ''
+  postInstall = ""
     # Gcc references
     + lib.optionalString (hasFeature "volk" features) ''
       ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix
index 41a2e89f02c..36790b22b22 100644
--- a/pkgs/applications/science/biology/migrate/default.nix
+++ b/pkgs/applications/science/biology/migrate/default.nix
@@ -10,7 +10,7 @@ gccStdenv.mkDerivation rec {
   };
 
   buildInputs = [ zlib mpi ];
-  setSourceRoot = ''sourceRoot=$(echo */src)'';
+  setSourceRoot = "sourceRoot=$(echo */src)";
   buildFlags = [ "thread" "mpis" ];
   preInstall = "mkdir -p $out/man/man1";
 
diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix
index c5220ebc83b..0e273dbefaa 100644
--- a/pkgs/applications/science/biology/ncbi-tools/default.nix
+++ b/pkgs/applications/science/biology/ncbi-tools/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ cpio ];
 
   meta = {
-    description = ''NCBI Bioinformatics toolbox (incl. BLAST)'';
-    longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support'';
+    description = "NCBI Bioinformatics toolbox (incl. BLAST)";
+    longDescription = "The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support";
     homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/";
     license = "GPL";
     priority = 5;   # zlib.so gives a conflict with zlib
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index 7a2dc2782ab..d288edca933 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description     = "Phylogenetic Analysis by Maximum Likelihood (PAML)";
-    longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.'';
+    longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.";
     license     = "non-commercial";
     homepage    = "http://abacus.gene.ucl.ac.uk/software/paml.html";
   };
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index 1f02d30cf25..ff88586e035 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ocaml eprover zlib ];
 
-  preConfigure = ''patchShebangs .'';
+  preConfigure = "patchShebangs .";
 
   installPhase = ''
     mkdir -p "$out/bin"
diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix
index a0897135fbb..593b2c54c5c 100644
--- a/pkgs/applications/science/logic/lci/default.nix
+++ b/pkgs/applications/science/logic/lci/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [readline];
   meta = {
-    description = ''Lambda calculus interpreter'';
+    description = "Lambda calculus interpreter";
     maintainers = with lib.maintainers; [raskin];
     platforms = with lib.platforms; linux;
     license = lib.licenses.gpl3;
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index 02d9408383a..dffb66b2fcf 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''Automated theorem prover for higher-order logic'';
+    description = "Automated theorem prover for higher-order logic";
     license = lib.licenses.mit ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 67009657363..c26504bf7bd 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Usual shenanigans
-  patchPhase = ''patchShebangs tests/regress/check.sh'';
+  patchPhase = "patchShebangs tests/regress/check.sh";
 
   # Includes a fix for the embedded soname being libyices.so.2.5, but
   # only installing the libyices.so.2.5.x file.
diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix
index c63fad93f07..bb912742b7c 100644
--- a/pkgs/applications/science/logic/z3/tptp.nix
+++ b/pkgs/applications/science/logic/z3/tptp.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     inherit (z3.meta) license homepage platforms;
-    description = ''TPTP wrapper for Z3 prover'';
+    description = "TPTP wrapper for Z3 prover";
     maintainers = [lib.maintainers.raskin];
   };
 }
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index fd657963c39..587568f8c29 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
   '';
 
   buildFlags = [ "CC=cc" "CXX=c++" ];
-  installFlags = [ ''PREFIX=$(out)'' ];
+  installFlags = [ "PREFIX=$(out)" ];
   buildInputs = [ gmp mpir cddlib ];
 
   meta = {
     inherit version;
-    description = ''A software package for computing Gröbner fans and tropical varieties'';
+    description = "A software package for computing Gröbner fans and tropical varieties";
     license = lib.licenses.gpl2 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 94b7ad266c4..05a7d874d91 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   checkTarget = "checks";
   meta = with lib; {
     inherit version;
-    description = ''Programs for computing automorphism groups of graphs and digraphs'';
+    description = "Programs for computing automorphism groups of graphs and digraphs";
     license = licenses.asl20;
     maintainers = teams.sage.members;
     platforms = platforms.unix;
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix
index 823c8abf529..eed1c8e3fd4 100644
--- a/pkgs/applications/science/math/ratpoints/default.nix
+++ b/pkgs/applications/science/math/ratpoints/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''A program to find rational points on hyperelliptic curves'';
+    description = "A program to find rational points on hyperelliptic curves";
     license = lib.licenses.gpl2Plus;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index ca752259797..ed9e64347a8 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    description = ''A collection of routines for representation theory and combinatorics'';
+    description = "A collection of routines for representation theory and combinatorics";
     license = licenses.isc;
     maintainers = teams.sage.members;
     platforms = platforms.unix;
diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix
index f90be38ebd1..77a052a4f1d 100644
--- a/pkgs/applications/terminal-emulators/guake/default.nix
+++ b/pkgs/applications/terminal-emulators/guake/default.nix
@@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec {
   PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var
 
   makeFlags = [
-    "prefix=${placeholder ''out''}"
+    "prefix=${placeholder "out"}"
   ];
 
   preFixup = ''
diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix
index 8fce22089e9..12abd98beb4 100644
--- a/pkgs/applications/terminal-emulators/wezterm/default.nix
+++ b/pkgs/applications/terminal-emulators/wezterm/default.nix
@@ -77,8 +77,7 @@ rustPlatform.buildRustPackage {
 
   buildInputs = runtimeDeps;
 
-  installPhase = ''
-  '' + lib.optionalString stdenv.isLinux ''
+  installPhase = "" + lib.optionalString stdenv.isLinux ''
     for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
       patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact
       install -D $releaseDir/$artifact -t $out/bin
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix
index f87e3f7cdaf..7423726ac3b 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/pkgs/applications/version-management/cvsps/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "prefix=$(out)" ];
 
   meta = {
-    description = ''A tool to generate CVS patch set information'';
+    description = "A tool to generate CVS patch set information";
     longDescription = ''
       CVSps is a program for generating `patchset' information from a
       CVS repository.  A patchset in this case is defined as a set of
diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix
index dfffdb08238..89fe6e89f48 100644
--- a/pkgs/applications/version-management/cvsq/default.nix
+++ b/pkgs/applications/version-management/cvsq/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''A collection of tools to work locally with CVS'';
+    description = "A collection of tools to work locally with CVS";
     longDescription = ''
       cvsq is a collection of tools to work locally with CVS.
 
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 5c260cc8e6c..d6d55eaa4eb 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''Monotone ancestry visualiser'';
+    description = "Monotone ancestry visualiser";
     license = lib.licenses.gpl2Plus ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index a2aa45a6e06..29676abb755 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -45,7 +45,7 @@ in mkDerivation {
     let
       binPath = lib.makeBinPath [ jre_headless ];
     in lib.optionals withJava [
-      ''--prefix PATH : ${binPath}''
+      "--prefix PATH : ${binPath}"
     ];
 
   installPhase = ''
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index bd8eb26895c..a58c32dc563 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
     ./disable-os-detection.patch
   ];
 
-  setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
+  setSourceRoot = "sourceRoot=$(echo */mythtv)";
 
   buildInputs = [
     freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index e891d4ab5ac..0945c5b3f3f 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "SUID_ROOT=" # do not try to setuid
-    "resdir=${placeholder ''out''}/share/X11"
+    "resdir=${placeholder "out"}/share/X11"
   ];
 
   meta = {
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index ed30c380a2c..e9496247f06 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -55,8 +55,7 @@ rec {
       };
 
       # Do not remove static from make files as we want a static binary
-      patchPhase = ''
-      '';
+      patchPhase = "";
 
       NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
     });
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 3fdda810789..5019ce23282 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -250,7 +250,7 @@ stdenv.mkDerivation (rec {
                                  " (${args.meta.description})";
     longDescription = (args.meta.longDescription or "")
                     + "\nIncludes:\n"
-                    + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.'');
+                    + withXenfiles (name: x: "* ${name}: ${x.meta.description or "(No description)"}.");
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ eelco tstrobel oxij ];
     license = lib.licenses.gpl2;
diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix
index 421d00ad24a..d51cbec8aeb 100644
--- a/pkgs/build-support/skaware/clean-packaging.nix
+++ b/pkgs/build-support/skaware/clean-packaging.nix
@@ -8,7 +8,7 @@
 let
   globWith = lib.concatMapStringsSep "\n";
   rmNoise = noiseGlobs: globWith (f:
-    ''rm -rf ${f}'') noiseGlobs;
+    "rm -rf ${f}") noiseGlobs;
   mvDoc = docGlobs: globWith
     (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'')
     docGlobs;
diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix
index 4c00b086e10..f4a0a9600a1 100644
--- a/pkgs/data/fonts/orbitron/default.nix
+++ b/pkgs/data/fonts/orbitron/default.nix
@@ -20,8 +20,7 @@ in fetchFromGitHub {
   meta = with lib; {
     homepage = "https://www.theleagueofmoveabletype.com/orbitron";
     downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download";
-    description = ''
-     Geometric sans-serif for display purposes by Matt McInerney'';
+    description = "Geometric sans-serif for display purposes by Matt McInerney";
     longDescription = ''
      Orbitron is a geometric sans-serif typeface intended for display
      purposes. It features four weights (light, medium, bold, and
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix
index f86c4799492..e74e51a95dc 100644
--- a/pkgs/data/fonts/twitter-color-emoji/default.nix
+++ b/pkgs/data/fonts/twitter-color-emoji/default.nix
@@ -56,15 +56,15 @@ stdenv.mkDerivation rec {
 
   postPatch = let
     templateSubstitutions = lib.concatStringsSep "; " [
-      ''s#Noto Color Emoji#Twitter Color Emoji#''
-      ''s#NotoColorEmoji#TwitterColorEmoji#''
+      "s#Noto Color Emoji#Twitter Color Emoji#"
+      "s#NotoColorEmoji#TwitterColorEmoji#"
       ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#''
-      ''s# Version .*# ${version}#''
-      ''s#.*is a trademark.*##''
+      "s# Version .*# ${version}#"
+      "s#.*is a trademark.*##"
       ''s#Google, Inc\.#Twitter, Inc and other contributors#''
-      ''s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#''
-      ''s#.*is licensed under.*#      Creative Commons Attribution 4.0 International#''
-      ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#''
+      "s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#"
+      "s#.*is licensed under.*#      Creative Commons Attribution 4.0 International#"
+      "s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#"
     ];
   in ''
     ${noto-fonts-emoji.postPatch}
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index abb9d9d1bb3..0bdc3974d97 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     "-Dsshkeygen_path=${openssh}/bin/ssh-keygen"
     "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services"
     "-Dpost_install=true"
-    "-Dinstalled_test_prefix=${placeholder ''installedTests''}"
+    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
   ];
 
   postPatch = ''
diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
index 63832dc91ac..2e2f0a50b31 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -64,7 +64,7 @@ let
       HOME=. rebar3 compile
       ${if compilePorts then ''
         HOME=. rebar3 pc compile
-      '' else ''''}
+      '' else ""}
       runHook postBuild
     '';
 
diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix
index bbc130725c0..1b0e27891d8 100644
--- a/pkgs/development/beam-modules/rebar3-release.nix
+++ b/pkgs/development/beam-modules/rebar3-release.nix
@@ -46,25 +46,25 @@ let
     configurePhase = ''
       runHook preConfigure
       ${if checkouts != null then
-          ''cp --no-preserve=all -R ${checkouts}/_checkouts .''
+          "cp --no-preserve=all -R ${checkouts}/_checkouts ."
         else
-          ''''}
+          ""}
       runHook postConfigure
     '';
 
     buildPhase = ''
       runHook preBuild
       HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript"
-                                            then '' escriptize''
-                                            else '' release''}
+                                            then "escriptize"
+                                            else "release"}
       runHook postBuild
     '';
 
     installPhase = ''
       runHook preInstall
       dir=${if releaseType == "escript"
-            then ''bin''
-            else ''rel''}
+            then "bin"
+            else "rel"}
       mkdir -p "$out/$dir"
       cp -R --preserve=mode "_build/${profile}/$dir" "$out"
       runHook postInstall
diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix
index 1d8b0137eb0..67c8128f6b5 100644
--- a/pkgs/development/compilers/crystal/build-package.nix
+++ b/pkgs/development/compilers/crystal/build-package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (mkDerivationArgs // {
   buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([
     "runHook preBuild"
   ] ++ lib.optional (format == "make")
-    ''make ''${buildTargets:-build} $makeFlags''
+    "make \${buildTargets:-build} $makeFlags"
   ++ lib.optionals (format == "crystal") (lib.mapAttrsToList
     (bin: attrs: ''
       crystal ${lib.escapeShellArgs ([
@@ -84,14 +84,14 @@ stdenv.mkDerivation (mkDerivationArgs // {
   installPhase = args.installPhase or (lib.concatStringsSep "\n" ([
     "runHook preInstall"
   ] ++ lib.optional (format == "make")
-    ''make ''${installTargets:-install} $installFlags''
+    "make \${installTargets:-install} $installFlags"
   ++ lib.optionals (format == "crystal") (map
     (bin: ''
       install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]}
     '')
     (lib.attrNames crystalBinaries))
   ++ lib.optional (format == "shards")
-    ''install -Dm555 bin/* -t $out/bin''
+    "install -Dm555 bin/* -t $out/bin"
   ++ [
     ''
       for f in README* *.md LICENSE; do
@@ -111,9 +111,9 @@ stdenv.mkDerivation (mkDerivationArgs // {
   checkPhase = args.checkPhase or (lib.concatStringsSep "\n" ([
     "runHook preCheck"
   ] ++ lib.optional (format == "make")
-    ''make ''${checkTarget:-test} $checkFlags''
+    "make \${checkTarget:-test} $checkFlags"
   ++ lib.optional (format != "make")
-    ''crystal ''${checkTarget:-spec} $checkFlags''
+    "crystal \${checkTarget:-spec} $checkFlags"
   ++ [ "runHook postCheck" ]));
 
   doInstallCheck = args.doInstallCheck or true;
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index a4111f71998..d3de5cad2f6 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -19,7 +19,7 @@ in clangStdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
 
-  preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash '';
+  preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash ";
 
   nativeBuildInputs = [ cmake boost_static flex bison];
   buildInputs = [
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index e34ed4b157d..3a2e3c4b944 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -87,10 +87,9 @@ stdenv.mkDerivation (rec {
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ];
 
-  installPhase = ''
-    make config=release prefix=$out ''
-    + lib.optionalString stdenv.isDarwin '' bits=64 ''
-    + lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no ''
+  installPhase = "make config=release prefix=$out "
+    + lib.optionalString stdenv.isDarwin "bits=64 "
+    + lib.optionalString (stdenv.isDarwin && (!lto)) "lto=no "
     + '' install
 
     wrapProgram $out/bin/ponyc \
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index e27c190acd7..315fe7c0c6d 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -117,7 +117,7 @@ in stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs src/etc
 
-    ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''}
+    ${optionalString (!withBundledLLVM) "rm -rf src/llvm"}
 
     # Fix the configure script to not require curl as we won't use it
     sed -i configure \
diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix
index 40ab4abf885..f47086b1ca2 100644
--- a/pkgs/development/compilers/stalin/default.nix
+++ b/pkgs/development/compilers/stalin/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncompress libX11 ];
 
-  buildPhase = '' ./build '';
+  buildPhase = "./build ";
 
   installPhase = ''
     mkdir -p "$out/bin"
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index bf181d07f28..26e9f2b87e1 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -321,7 +321,7 @@ stdenv.mkDerivation {
   '';
 
   # Hack to avoid build and install directories in RPATHs.
-  preFixup = ''rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR'';
+  preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR";
 
   meta = with lib; {
     description = "The Swift Programming Language";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 17d5c8968e6..1c760b056e0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -99684,7 +99684,7 @@ self: {
          sed -i "s|\"-s\"|\"\"|" ./Setup.hs
          sed -i "s|numJobs (bf bi)++||" ./Setup.hs
        '';
-       preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';
+       preBuild = "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH";
        description = "Grammatical Framework";
        license = "unknown";
        hydraPlatforms = lib.platforms.none;
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index f47ac076f13..cfa06b045de 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -38,8 +38,8 @@ let
     else "haddock-ghcjs";
   ghcDocLibDir =
     if !isGhcjs
-    then ghc.doc + ''/share/doc/ghc*/html/libraries''
-    else ghc     + ''/doc/lib'';
+    then ghc.doc + "/share/doc/ghc*/html/libraries"
+    else ghc     + "/doc/lib";
   # On GHCJS, use a stripped down version of GHC's prologue.txt
   prologue =
     if !isGhcjs
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index 98a98c0dd34..74f5b2b7b39 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -207,7 +207,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
 
   postFixup = lib.optionalString (!dontWrapLuaPrograms) ''
     wrapLuaPrograms
-  '' + attrs.postFixup or '''';
+  '' + attrs.postFixup or "";
 
   installPhase = attrs.installPhase or ''
     runHook preInstall
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 670c870f107..175454ea055 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -162,7 +162,7 @@ let
 
     postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
       wrapPythonPrograms
-    '' + attrs.postFixup or '''';
+    '' + attrs.postFixup or "";
 
     # Python packages built through cross-compilation are always for the host platform.
     disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];
diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix
index b9d2b9deb79..23fe1dc7800 100644
--- a/pkgs/development/interpreters/quickjs/default.nix
+++ b/pkgs/development/interpreters/quickjs/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "13hlx6qwrrxmlvvqcr3irxba6zmf05cf54l32vj50wc66s1qd41p";
   };
 
-  makeFlags = [ "prefix=${placeholder ''out''}" ];
+  makeFlags = [ "prefix=${placeholder "out"}" ];
   enableParallelBuilding = true;
 
   doInstallCheck = true;
diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
index e2371292e12..a915723e2ca 100644
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -58,7 +58,7 @@ in
       ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
       ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
 
-    preAutoreconf = ''./autogen.sh'';
+    preAutoreconf = "./autogen.sh";
 
     configureFlags =
       lib.optional enableUsb "--enable-usb"
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 215fbeb7071..7b10fc463dd 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   postFixupHooks = [
     # This bodge is necessary so that the file that the generated -config.cmake file
     # points to an existing directory.
-    ''mkdir -p $out/include''
+    "mkdir -p $out/include"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 623021f1dda..cce14951c8b 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile
   '';
 
-  configurePhase = '' patchShebangs make.sh '';
+  configurePhase = "patchShebangs make.sh ";
   buildPhase = "PREFIX=$out ./make.sh";
 
   doCheck = true;
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 14b6f1fb4cd..1f1eff18959 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-user-session"
     "--enable-xml-docs"
-    "--libexecdir=${placeholder ''out''}/libexec"
+    "--libexecdir=${placeholder "out"}/libexec"
     "--datadir=/etc"
     "--localstatedir=/var"
     "--runstatedir=/run"
@@ -87,8 +87,8 @@ stdenv.mkDerivation rec {
     "--with-session-socket-dir=/tmp"
     "--with-system-pid-file=/run/dbus/pid"
     "--with-system-socket=/run/dbus/system_bus_socket"
-    "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
-    "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+    "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
   ] ++ lib.optional (!x11Support) "--without-x"
   ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ];
 
@@ -103,8 +103,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   installFlags = [
-    "sysconfdir=${placeholder ''out''}/etc"
-    "datadir=${placeholder ''out''}/share"
+    "sysconfdir=${placeholder "out"}/etc"
+    "datadir=${placeholder "out"}/share"
   ];
 
   # it's executed from $lib by absolute path
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 0dfa639c338..99a08470396 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  postPatch = ''patchShebangs .'';
+  postPatch = "patchShebangs .";
   inherit patches;
 
   outputs = [ "bin" "dev" "out" "man" ]
diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix
index 701ee355667..088354aecb2 100644
--- a/pkgs/development/libraries/gaia/default.nix
+++ b/pkgs/development/libraries/gaia/default.nix
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   # Fix installation error when waf tries to put files in /etc/
-  prePatch = ''
-  '' + lib.optionalString cyclopsSupport ''
+  prePatch = "" + lib.optionalString cyclopsSupport ''
     substituteInPlace src/wscript \
       --replace "/etc/cyclops" "$out/etc/cyclops" \
       --replace "/etc/init.d" "$out/etc/init.d"
@@ -72,8 +71,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (cyclopsSupport) [ "--with-cyclops" ]
   ;
 
-  postFixup = ''
-  ''
+  postFixup = ""
     + lib.optionalString pythonSupport ''
       wrapPythonPrograms
     ''
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index 8f62483d3b7..0ad9f607dfe 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dinstalled_tests=true"
-    "-Dinstalled_test_prefix=${placeholder ''installedTests''}"
+    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
   ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index a67ea503776..0e8ed605a2d 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
     # Instead we just copy them over from the native output.
     "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}"
     "-Dnls=enabled"
-    "-Ddevbindir=${placeholder ''dev''}/bin"
+    "-Ddevbindir=${placeholder "dev"}/bin"
   ];
 
   NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix
index 5eead23b825..511ec60db2f 100644
--- a/pkgs/development/libraries/glui/default.nix
+++ b/pkgs/development/libraries/glui/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = ''A user interface library using OpenGL'';
+    description = "A user interface library using OpenGL";
     license = licenses.zlib ;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix
index 1dbcd37cf4b..0e467b29433 100644
--- a/pkgs/development/libraries/gtdialog/default.nix
+++ b/pkgs/development/libraries/gtdialog/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   makeFlags = ["PREFIX=$(out)"];
   meta = {
     inherit (s) version;
-    description = ''Cross-platform helper for creating interactive dialogs'';
+    description = "Cross-platform helper for creating interactive dialogs";
     license = lib.licenses.mit ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index 137ccfeaf84..9cf98bbbdc5 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6";
   };
 
-  patchPhase = ''patchShebangs .'';
+  patchPhase = "patchShebangs .";
   buildInputs = [ perl zlib ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index c666a15b63b..09ae213eb5d 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
   meta = {
     inherit version;
-    description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers'';
+    description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers";
     license = lib.licenses.gpl2Plus;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix
index 505d60e2c8d..9fbcf8b020c 100644
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/pkgs/development/libraries/java/dbus-java/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
   JAVA_HOME=jdk;
   JAVA="${jdk}/bin/java";
-  PREFIX=''''${out}'';
+  PREFIX="\${out}";
   JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni";
   JAVAUNIXJARDIR="${libmatthew_java}/share/java";
   buildInputs = [ gettext jdk ];
diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix
index b0173cbdb84..a3cdaa37ed0 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85";
   };
   JAVA_HOME=jdk;
-  PREFIX=''''${out}'';
+  PREFIX="\${out}";
   buildInputs = [ jdk ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 995d3809e4e..f9e850f91ff 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
+    description = "A library for semi-portable access to hardware-provided atomic memory update operations";
     license = lib.licenses.gpl2Plus ;
     maintainers = [lib.maintainers.raskin];
     platforms = with lib.platforms; unix ++ windows;
diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix
index 5575d8b2c5e..f467a01ea7a 100644
--- a/pkgs/development/libraries/libe-book/default.nix
+++ b/pkgs/development/libraries/libe-book/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
   meta = {
     inherit (s) version;
-    description = ''Library for import of reflowable e-book formats'';
+    description = "Library for import of reflowable e-book formats";
     license = lib.licenses.lgpl21Plus ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 0198888f2b5..5a7f2fe4b36 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias''
+    "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"
   ];
 
   buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common
diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index 0c56964bfed..17e20e3d399 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   };
   meta = {
     inherit (s) version;
-    description = ''Import library for some old mac text documents'';
+    description = "Import library for some old mac text documents";
     license = lib.licenses.mpl20 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix
index e93bafe2b56..b891c320e86 100644
--- a/pkgs/development/libraries/libodfgen/default.nix
+++ b/pkgs/development/libraries/libodfgen/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   };
   meta = {
     inherit (s) version;
-    description = ''A base library for generating ODF documents'';
+    description = "A base library for generating ODF documents";
     license = lib.licenses.mpl20 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 6dd44a0f202..349384b4674 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
     "LIBRE_INC=${libre}/include/re"
-    ''PREFIX=$(out)''
+    "PREFIX=$(out)"
   ]
   ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
   ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix
index 32628695966..1d7754bfcae 100644
--- a/pkgs/development/libraries/librevenge/default.nix
+++ b/pkgs/development/libraries/librevenge/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   meta = {
     inherit (s) version;
-    description = ''A base library for writing document import filters'';
+    description = "A base library for writing document import filters";
     license = lib.licenses.mpl20 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix
index e78a96784d9..f1a2bf377cc 100644
--- a/pkgs/development/libraries/libvpx/1_8.nix
+++ b/pkgs/development/libraries/libvpx/1_8.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 #    ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
   ];
 
-  postPatch = ''patchShebangs .'';
+  postPatch = "patchShebangs .";
 
   outputs = [ "bin" "dev" "out" ];
   setOutputFlags = false;
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 10ad110d24e..30a65e3a0a3 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   preInstall = lib.optionalString pythonSupport
     ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
   installFlags = lib.optional pythonSupport
-    "pythondir=\"${placeholder ''py''}/lib/${python.libPrefix}/site-packages\"";
+    "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\"";
 
   postFixup = ''
     moveToOutput bin/xml2-config "$dev"
diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix
index ee19734a0c0..f71b6d0c0b9 100644
--- a/pkgs/development/libraries/libzmf/default.nix
+++ b/pkgs/development/libraries/libzmf/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''A library that parses the file format of Zoner Callisto/Draw documents'';
+    description = "A library that parses the file format of Zoner Callisto/Draw documents";
     license = lib.licenses.mpl20;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index eaaa3d9e215..399c5416d78 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [mpfr];
   meta = {
     inherit version;
-    description = ''A multiple precision interval arithmetic library based on MPFR'';
+    description = "A multiple precision interval arithmetic library based on MPFR";
     homepage = "https://gforge.inria.fr/projects/mpfi/";
     license = lib.licenses.lgpl21Plus;
     maintainers = [lib.maintainers.raskin];
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index 7f1374df280..7f7df407e4e 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''A highly optimised library for bignum arithmetic forked from GMP'';
+    description = "A highly optimised library for bignum arithmetic forked from GMP";
     license = lib.licenses.lgpl3Plus;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix
index e65b7453dc3..53fb3bec908 100644
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/pkgs/development/libraries/msgpuck/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
 
   meta = with lib; {
-     description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file'';
+     description = "A simple and efficient MsgPack binary serialization library in a self-contained header file";
      homepage = "https://github.com/rtsisyk/msgpuck";
      license = licenses.bsd2;
      platforms = platforms.linux;
diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix
index 3a6416122bf..bc8efdc857e 100644
--- a/pkgs/development/libraries/openpa/default.nix
+++ b/pkgs/development/libraries/openpa/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy";
   };
 
-  prePatch = ''substituteInPlace configure --replace /usr/bin/file ${file}/bin/file'';
+  prePatch = "substituteInPlace configure --replace /usr/bin/file ${file}/bin/file";
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index 2b16f0f09b0..d1b545884b5 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   patches = lib.optional stdenv.isDarwin ./move-project.patch ;
 
   # tells CMake to use this CA bundle file if it is accessible
-  preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';
+  preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt";
 
   # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
   cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index 56c2b70eeac..fe9a8b67145 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -90,26 +90,26 @@ stdenv.mkDerivation rec {
     ./fix_compilation_on_gcc7.patch
   ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];
 
-  cmakeFlags = [ ''-DBUILD_TEST=OFF''
-                 ''-DBUILD_PYTHON=ON''
-                 ''-DUSE_CUDA=${if useCuda then ''ON''else ''OFF''}''
-                 ''-DUSE_OPENMP=${if useOpenmp then ''ON''else ''OFF''}''
-                 ''-DUSE_OPENCV=${if useOpencv3 then ''ON''else ''OFF''}''
-                 ''-DUSE_MPI=${if useMpi then ''ON''else ''OFF''}''
-                 ''-DUSE_LEVELDB=${if useLeveldb then ''ON''else ''OFF''}''
-                 ''-DUSE_LMDB=${if useLmdb then ''ON''else ''OFF''}''
-                 ''-DUSE_ROCKSDB=${if useRocksdb then ''ON''else ''OFF''}''
-                 ''-DUSE_ZMQ=${if useZeromq  then ''ON''else ''OFF''}''
-                 ''-DUSE_GLOO=OFF''
-                 ''-DUSE_NNPACK=OFF''
-                 ''-DUSE_NCCL=OFF''
-                 ''-DUSE_REDIS=OFF''
-                 ''-DUSE_FFMPEG=OFF''
+  cmakeFlags = [ "-DBUILD_TEST=OFF"
+                 "-DBUILD_PYTHON=ON"
+                 ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}''
+                 ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}''
+                 ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}''
+                 ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}''
+                 ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}''
+                 ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}''
+                 ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}''
+                 ''-DUSE_ZMQ=${if useZeromq  then "ON"else "OFF"}''
+                 "-DUSE_GLOO=OFF"
+                 "-DUSE_NNPACK=OFF"
+                 "-DUSE_NCCL=OFF"
+                 "-DUSE_REDIS=OFF"
+                 "-DUSE_FFMPEG=OFF"
                ]
                ++ lib.optional useCuda [
-                 ''-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}''
-                 ''-DCUDA_FAST_MATH=ON''
-                 ''-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc''
+                 "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}"
+                 "-DCUDA_FAST_MATH=ON"
+                 "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc"
                ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index 6e8e6948af0..e85b6d4cbf4 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     # Audio method falls back from left to right.
     "--with-default-audio-method=\"libao,pulse,alsa,oss\""
-    "--with-systemdsystemunitdir=${placeholder ''out''}/lib/systemd/system"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
   ] ++ optional withPulse "--with-pulse"
     ++ optional withAlsa "--with-alsa"
     ++ optional withLibao "--with-libao"
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 491597d760d..63b9540522e 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -27,7 +27,7 @@ let lispPackages = rec {
         url = "https://beta.quicklisp.org/dist/quicklisp/2020-10-16/distinfo.txt";
         sha256 = "sha256:090xjcnyqcv8az9n1a7m0f6vzz2nwcncy95ha7ixb7fnd2rj1n65";
       };
-      buildPhase = '' true; '';
+      buildPhase = "true; ";
       postInstall = ''
         substituteAll ${./quicklisp.sh} "$out"/bin/quicklisp
         chmod a+x "$out"/bin/quicklisp
@@ -80,7 +80,7 @@ let lispPackages = rec {
 
   clx-truetype = buildLispPackage rec {
           baseName = "clx-truetype";
-          version = ''20160825-git'';
+          version = "20160825-git";
 
           buildSystems = [ "clx-truetype" ];
           parasites = [ "clx-truetype-test" ];
@@ -91,8 +91,8 @@ let lispPackages = rec {
                           cl-vectors clx trivial-features zpb-ttf
           ];
           src = pkgs.fetchurl {
-                  url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
-                  sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
+                  url = "http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz";
+                  sha256 = "0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67";
           };
 
           packageName = "clx-truetype";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix
index 6c08e0e1c95..70de895a586 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''_3bmd-ext-code-blocks'';
-  version = ''3bmd-20200925-git'';
+  baseName = "_3bmd-ext-code-blocks";
+  version = "3bmd-20200925-git";
 
-  description = ''extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma'';
+  description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma";
 
   deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz'';
-    sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw'';
+    url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz";
+    sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw";
   };
 
   packageName = "3bmd-ext-code-blocks";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index dd1959893fd..b49b183b24c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''_3bmd'';
-  version = ''20200925-git'';
+  baseName = "_3bmd";
+  version = "20200925-git";
 
-  description = ''markdown processor in CL using esrap parser.'';
+  description = "markdown processor in CL using esrap parser.";
 
   deps = [ args."alexandria" args."esrap" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz'';
-    sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw'';
+    url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz";
+    sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw";
   };
 
   packageName = "3bmd";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
index deb0c7f89cb..d4f68526f18 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''access'';
-  version = ''20151218-git'';
+  baseName = "access";
+  version = "20151218-git";
 
   parasites = [ "access-test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."alexandria" args."anaphora" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz'';
-    sha256 = ''0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl'';
+    url = "http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz";
+    sha256 = "0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl";
   };
 
   packageName = "access";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix
index f93506505a1..69d28a65c14 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''acclimation'';
-  version = ''20200925-git'';
+  baseName = "acclimation";
+  version = "20200925-git";
 
-  description = ''Library supporting internationalization'';
+  description = "Library supporting internationalization";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz'';
-    sha256 = ''11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw'';
+    url = "http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz";
+    sha256 = "11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw";
   };
 
   packageName = "acclimation";
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 7f257bc4baf..f1eaf587426 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''alexandria'';
-  version = ''20200925-git'';
+  baseName = "alexandria";
+  version = "20200925-git";
 
-  description = ''Alexandria is a collection of portable public domain utilities.'';
+  description = "Alexandria is a collection of portable public domain utilities.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz'';
-    sha256 = ''1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl'';
+    url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz";
+    sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl";
   };
 
   packageName = "alexandria";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 9af6ed36980..1d5e3a5997a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''anaphora'';
-  version = ''20191007-git'';
+  baseName = "anaphora";
+  version = "20191007-git";
 
   parasites = [ "anaphora/test" ];
 
-  description = ''The Anaphoric Macro Package from Hell'';
+  description = "The Anaphoric Macro Package from Hell";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz'';
-    sha256 = ''0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv'';
+    url = "http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz";
+    sha256 = "0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv";
   };
 
   packageName = "anaphora";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
index 97ae196c0f5..5ac59f713e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''arnesi'';
-  version = ''20170403-git'';
+  baseName = "arnesi";
+  version = "20170403-git";
 
   parasites = [ "arnesi/cl-ppcre-extras" "arnesi/slime-extras" ];
 
-  description = ''A bag-of-tools utilities library used to aid in implementing the bese.it toolkit'';
+  description = "A bag-of-tools utilities library used to aid in implementing the bese.it toolkit";
 
   deps = [ args."alexandria" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."swank" args."symbol-munger" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz'';
-    sha256 = ''01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4'';
+    url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz";
+    sha256 = "01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4";
   };
 
   packageName = "arnesi";
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 efa5dc6e769..07aca0eb9df 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''array-utils'';
-  version = ''20190710-git'';
+  baseName = "array-utils";
+  version = "20190710-git";
 
-  description = ''A few utilities for working with arrays.'';
+  description = "A few utilities for working with arrays.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz'';
-    sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh'';
+    url = "http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz";
+    sha256 = "1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh";
   };
 
   packageName = "array-utils";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
index 1a56676f036..b0fa6289936 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''asdf-package-system'';
-  version = ''20150608-git'';
+  baseName = "asdf-package-system";
+  version = "20150608-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz'';
-    sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29'';
+    url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz";
+    sha256 = "17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29";
   };
 
   packageName = "asdf-package-system";
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..7133bf25770 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''asdf-system-connections'';
-  version = ''20170124-git'';
+  baseName = "asdf-system-connections";
+  version = "20170124-git";
 
-  description = ''Allows for ASDF system to be connected so that auto-loading may occur.'';
+  description = "Allows for ASDF system to be connected so that auto-loading may occur.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz'';
-    sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq'';
+    url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz";
+    sha256 = "0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq";
   };
 
   packageName = "asdf-system-connections";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index 5a362fc1f03..1c99fc6944e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''babel'';
-  version = ''20200925-git'';
+  baseName = "babel";
+  version = "20200925-git";
 
-  description = ''Babel, a charset conversion library.'';
+  description = "Babel, a charset conversion library.";
 
   deps = [ args."alexandria" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz'';
-    sha256 = ''1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi'';
+    url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz";
+    sha256 = "1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi";
   };
 
   packageName = "babel";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index a660882f36b..15100222894 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''blackbird'';
-  version = ''20160531-git'';
+  baseName = "blackbird";
+  version = "20160531-git";
 
-  description = ''A promise implementation for Common Lisp.'';
+  description = "A promise implementation for Common Lisp.";
 
   deps = [ args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz'';
-    sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9'';
+    url = "http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz";
+    sha256 = "0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9";
   };
 
   packageName = "blackbird";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index cef514715e0..b8c225174a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''bordeaux-threads'';
-  version = ''v0.8.8'';
+  baseName = "bordeaux-threads";
+  version = "v0.8.8";
 
   parasites = [ "bordeaux-threads/test" ];
 
-  description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.'';
+  description = "Bordeaux Threads makes writing portable multi-threaded apps simple.";
 
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz'';
-    sha256 = ''1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp'';
+    url = "http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz";
+    sha256 = "1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp";
   };
 
   packageName = "bordeaux-threads";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 5d7f3f2dd10..18d22d1cf32 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''buildnode-xhtml'';
-  version = ''buildnode-20170403-git'';
+  baseName = "buildnode-xhtml";
+  version = "buildnode-20170403-git";
 
-  description = ''Tool for building up an xml dom of an excel spreadsheet nicely.'';
+  description = "Tool for building up an xml dom of an excel spreadsheet nicely.";
 
   deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
-    sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6'';
+    url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+    sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6";
   };
 
   packageName = "buildnode-xhtml";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index 0a2e56a9c9b..b3a281ed3a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''buildnode'';
-  version = ''20170403-git'';
+  baseName = "buildnode";
+  version = "20170403-git";
 
   parasites = [ "buildnode-test" ];
 
-  description = ''Tool for building up an xml dom nicely.'';
+  description = "Tool for building up an xml dom nicely.";
 
   deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
-    sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6'';
+    url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
+    sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6";
   };
 
   packageName = "buildnode";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index c90021bbeec..3b44cbbb971 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''caveman'';
-  version = ''20200325-git'';
+  baseName = "caveman";
+  version = "20200325-git";
 
-  description = ''Web Application Framework for Common Lisp'';
+  description = "Web Application Framework for Common Lisp";
 
   deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-colors2" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz'';
-    sha256 = ''0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py'';
+    url = "http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz";
+    sha256 = "0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py";
   };
 
   packageName = "caveman";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index e4d6546e901..97328db2543 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cffi-grovel'';
-  version = ''cffi_0.23.0'';
+  baseName = "cffi-grovel";
+  version = "cffi_0.23.0";
 
-  description = ''The CFFI Groveller'';
+  description = "The CFFI Groveller";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
-    sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
+    url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
+    sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
   };
 
   packageName = "cffi-grovel";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index ad5ecb7acc8..51fe6a00f1f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cffi-toolchain'';
-  version = ''cffi_0.23.0'';
+  baseName = "cffi-toolchain";
+  version = "cffi_0.23.0";
 
-  description = ''The CFFI toolchain'';
+  description = "The CFFI toolchain";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
-    sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
+    url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
+    sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
   };
 
   packageName = "cffi-toolchain";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index e234301f1fe..a56fbf6b265 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cffi'';
-  version = ''cffi_0.23.0'';
+  baseName = "cffi";
+  version = "cffi_0.23.0";
 
   parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ];
 
-  description = ''The Common Foreign Function Interface'';
+  description = "The Common Foreign Function Interface";
 
   deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
-    sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
+    url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
+    sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
   };
 
   packageName = "cffi";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix
index b0dea4fbd22..3b9e089b313 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''chanl'';
-  version = ''20201016-git'';
+  baseName = "chanl";
+  version = "20201016-git";
 
   parasites = [ "chanl/examples" "chanl/tests" ];
 
-  description = ''Communicating Sequential Process support for Common Lisp'';
+  description = "Communicating Sequential Process support for Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz'';
-    sha256 = ''13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1'';
+    url = "http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz";
+    sha256 = "13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1";
   };
 
   packageName = "chanl";
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 c30c68e53c8..3c05684de53 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''chipz'';
-  version = ''20190202-git'';
+  baseName = "chipz";
+  version = "20190202-git";
 
-  description = ''A library for decompressing deflate, zlib, and gzip data'';
+  description = "A library for decompressing deflate, zlib, and gzip data";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz'';
-    sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a'';
+    url = "http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz";
+    sha256 = "1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a";
   };
 
   packageName = "chipz";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 644daa8af92..e08a2efe96e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''chunga'';
-  version = ''20200427-git'';
+  baseName = "chunga";
+  version = "20200427-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz'';
-    sha256 = ''0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk'';
+    url = "http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz";
+    sha256 = "0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk";
   };
 
   packageName = "chunga";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 2e387d29833..f0b211d27d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''circular-streams'';
-  version = ''20161204-git'';
+  baseName = "circular-streams";
+  version = "20161204-git";
 
-  description = ''Circularly readable streams for Common Lisp'';
+  description = "Circularly readable streams for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
-    sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128'';
+    url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz";
+    sha256 = "1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128";
   };
 
   packageName = "circular-streams";
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..8f1448e436b 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-aa'';
-  version = ''cl-vectors-20180228-git'';
+  baseName = "cl-aa";
+  version = "cl-vectors-20180228-git";
 
-  description = ''cl-aa: polygon rasterizer'';
+  description = "cl-aa: polygon rasterizer";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
-    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
+    url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
+    sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
   };
 
   packageName = "cl-aa";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index 5f93167a114..c85c60a0f1d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-annot'';
-  version = ''20150608-git'';
+  baseName = "cl-annot";
+  version = "20150608-git";
 
-  description = ''Python-like Annotation Syntax for Common Lisp'';
+  description = "Python-like Annotation Syntax for Common Lisp";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz'';
-    sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3'';
+    url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz";
+    sha256 = "0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3";
   };
 
   packageName = "cl-annot";
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..2ae0f7d36de 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-anonfun'';
-  version = ''20111203-git'';
+  baseName = "cl-anonfun";
+  version = "20111203-git";
 
-  description = ''Anonymous function helpers for Common Lisp'';
+  description = "Anonymous function helpers for Common Lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz'';
-    sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m'';
+    url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz";
+    sha256 = "16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m";
   };
 
   packageName = "cl-anonfun";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 33f696f3616..dd6eeba98af 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-ansi-text'';
-  version = ''20200218-git'';
+  baseName = "cl-ansi-text";
+  version = "20200218-git";
 
-  description = ''ANSI control string characters, focused on color'';
+  description = "ANSI control string characters, focused on color";
 
   deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz'';
-    sha256 = ''1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r'';
+    url = "http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz";
+    sha256 = "1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r";
   };
 
   packageName = "cl-ansi-text";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index 83d32317b5b..5a5a8b362fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-async-repl'';
-  version = ''cl-async-20200610-git'';
+  baseName = "cl-async-repl";
+  version = "cl-async-20200610-git";
 
-  description = ''REPL integration for CL-ASYNC.'';
+  description = "REPL integration for CL-ASYNC.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz'';
-    sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h'';
+    url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz";
+    sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
   };
 
   packageName = "cl-async-repl";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 606a4ffc213..93de96b5ea6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-async-ssl'';
-  version = ''cl-async-20200610-git'';
+  baseName = "cl-async-ssl";
+  version = "cl-async-20200610-git";
 
-  description = ''SSL Wrapper around cl-async socket implementation.'';
+  description = "SSL Wrapper around cl-async socket implementation.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz'';
-    sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h'';
+    url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz";
+    sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
   };
 
   packageName = "cl-async-ssl";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index f2ad6b509d0..ce188aeee1a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-async'';
-  version = ''20200610-git'';
+  baseName = "cl-async";
+  version = "20200610-git";
 
   parasites = [ "cl-async-base" "cl-async-util" ];
 
-  description = ''Asynchronous operations for Common Lisp.'';
+  description = "Asynchronous operations for Common Lisp.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz'';
-    sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h'';
+    url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz";
+    sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
   };
 
   packageName = "cl-async";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index 15843d1c2fe..37a0fa0c32f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-base64'';
-  version = ''20201016-git'';
+  baseName = "cl-base64";
+  version = "20201016-git";
 
   parasites = [ "cl-base64/test" ];
 
-  description = ''Base64 encoding and decoding with URI support.'';
+  description = "Base64 encoding and decoding with URI support.";
 
   deps = [ args."kmrcl" args."ptester" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz'';
-    sha256 = ''1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z'';
+    url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz";
+    sha256 = "1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z";
   };
 
   packageName = "cl-base64";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix
index d240e3e842d..be751aa0e12 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-cairo'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-cairo";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to Cairo'';
+  description = "A Lisp binding to Cairo";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."iterate" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-cairo";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix
index 0c2d3abc282..a331c048fdb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-gdk-pixbuf'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-gdk-pixbuf";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to GDK Pixbuf 2'';
+  description = "A Lisp binding to GDK Pixbuf 2";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-gdk-pixbuf";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix
index 748cc9a0d6c..02140a47a33 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-gdk'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-gdk";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to GDK 3'';
+  description = "A Lisp binding to GDK 3";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-gdk";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix
index af53a594587..920fc4edecc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-gio'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-gio";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to GIO 2'';
+  description = "A Lisp binding to GIO 2";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-gio";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix
index 4ad75bf507a..429dfb7889b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-glib'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-glib";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to GLib 2'';
+  description = "A Lisp binding to GLib 2";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."iterate" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-glib";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix
index c2e2deef003..d2f7f2e164f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-gobject'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-gobject";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding GObject 2'';
+  description = "A Lisp binding GObject 2";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-gobject";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix
index 896528cf166..72b3ad647c7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk-pango'';
-  version = ''cl-cffi-gtk-20201016-git'';
+  baseName = "cl-cffi-gtk-pango";
+  version = "cl-cffi-gtk-20201016-git";
 
-  description = ''A Lisp binding to Pango'';
+  description = "A Lisp binding to Pango";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk-pango";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix
index 7055aec5121..98256cc740d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cffi-gtk'';
-  version = ''20201016-git'';
+  baseName = "cl-cffi-gtk";
+  version = "20201016-git";
 
-  description = ''A Lisp binding to GTK 3'';
+  description = "A Lisp binding to GTK 3";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz'';
-    sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55'';
+    url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz";
+    sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55";
   };
 
   packageName = "cl-cffi-gtk";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
index 158158fefad..ce74ce967e2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-change-case'';
-  version = ''20191007-git'';
+  baseName = "cl-change-case";
+  version = "20191007-git";
 
-  description = ''Convert strings between camelCase, param-case, PascalCase and more'';
+  description = "Convert strings between camelCase, param-case, PascalCase and more";
 
   deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz'';
-    sha256 = ''097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1'';
+    url = "http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz";
+    sha256 = "097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1";
   };
 
   packageName = "cl-change-case";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
index 36641b73b75..cbc4deba6b5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cli'';
-  version = ''20151218-git'';
+  baseName = "cl-cli";
+  version = "20151218-git";
 
-  description = ''Command line parser'';
+  description = "Command line parser";
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz'';
-    sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay'';
+    url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz";
+    sha256 = "0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay";
   };
 
   packageName = "cl-cli";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 0d0337a65ce..8882b1473c2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-colors'';
-  version = ''20180328-git'';
+  baseName = "cl-colors";
+  version = "20180328-git";
 
   parasites = [ "cl-colors-tests" ];
 
-  description = ''Simple color library for Common Lisp'';
+  description = "Simple color library for Common Lisp";
 
   deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz'';
-    sha256 = ''0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a'';
+    url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz";
+    sha256 = "0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a";
   };
 
   packageName = "cl-colors";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
index 519f43ff324..3432660cffd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-colors2'';
-  version = ''20200218-git'';
+  baseName = "cl-colors2";
+  version = "20200218-git";
 
   parasites = [ "cl-colors2/tests" ];
 
-  description = ''Simple color library for Common Lisp'';
+  description = "Simple color library for Common Lisp";
 
   deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz'';
-    sha256 = ''0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29'';
+    url = "http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz";
+    sha256 = "0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29";
   };
 
   packageName = "cl-colors2";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
index bd0483b4524..c8dc5ca9a99 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-containers'';
-  version = ''20200427-git'';
+  baseName = "cl-containers";
+  version = "20200427-git";
 
   parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ];
 
-  description = ''A generic container library for Common Lisp'';
+  description = "A generic container library for Common Lisp";
 
   deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz'';
-    sha256 = ''0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy'';
+    url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz";
+    sha256 = "0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy";
   };
 
   packageName = "cl-containers";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index ddc3611d50d..f35d40fb41c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-cookie'';
-  version = ''20191007-git'';
+  baseName = "cl-cookie";
+  version = "20191007-git";
 
-  description = ''HTTP cookie manager'';
+  description = "HTTP cookie manager";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz'';
-    sha256 = ''1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh'';
+    url = "http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz";
+    sha256 = "1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh";
   };
 
   packageName = "cl-cookie";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
index ba295b6e43a..0d0b2aa1dcf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-css'';
-  version = ''20140914-git'';
+  baseName = "cl-css";
+  version = "20140914-git";
 
-  description = ''Simple inline CSS generator'';
+  description = "Simple inline CSS generator";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz'';
-    sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n'';
+    url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz";
+    sha256 = "16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n";
   };
 
   packageName = "cl-css";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index 051ffabfc56..c9badad400e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-csv'';
-  version = ''20201016-git'';
+  baseName = "cl-csv";
+  version = "20201016-git";
 
   parasites = [ "cl-csv/speed-test" "cl-csv/test" ];
 
-  description = ''Facilities for reading and writing CSV format files'';
+  description = "Facilities for reading and writing CSV format files";
 
   deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz'';
-    sha256 = ''1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf'';
+    url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz";
+    sha256 = "1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf";
   };
 
   packageName = "cl-csv";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index c5d0f114e10..8dc68dc36fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-dbi'';
-  version = ''20200610-git'';
+  baseName = "cl-dbi";
+  version = "20200610-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "cl-dbi";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
index 53cf2214ed2..a01f8be3536 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-dot'';
-  version = ''20200925-git'';
+  baseName = "cl-dot";
+  version = "20200925-git";
 
-  description = ''Generate Dot Output from Arbitrary Lisp Data'';
+  description = "Generate Dot Output from Arbitrary Lisp Data";
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz'';
-    sha256 = ''01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla'';
+    url = "http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz";
+    sha256 = "01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla";
   };
 
   packageName = "cl-dot";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 1510495a4cb..b78dd2339b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-emb'';
-  version = ''20190521-git'';
+  baseName = "cl-emb";
+  version = "20190521-git";
 
-  description = ''A templating system for Common Lisp'';
+  description = "A templating system for Common Lisp";
 
   deps = [ args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz'';
-    sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d'';
+    url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz";
+    sha256 = "1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d";
   };
 
   packageName = "cl-emb";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 12d7a7ae273..28cf369206c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-fad'';
-  version = ''20200610-git'';
+  baseName = "cl-fad";
+  version = "20200610-git";
 
   parasites = [ "cl-fad-test" ];
 
-  description = ''Portable pathname library'';
+  description = "Portable pathname library";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz'';
-    sha256 = ''08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x'';
+    url = "http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz";
+    sha256 = "08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x";
   };
 
   packageName = "cl-fad";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 6a40d0fa8c9..bf3c36d62b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-fuse-meta-fs'';
-  version = ''20190710-git'';
+  baseName = "cl-fuse-meta-fs";
+  version = "20190710-git";
 
-  description = ''CFFI bindings to FUSE (Filesystem in user space)'';
+  description = "CFFI bindings to FUSE (Filesystem in user space)";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz'';
-    sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7'';
+    url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz";
+    sha256 = "1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7";
   };
 
   packageName = "cl-fuse-meta-fs";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index b0a549096b2..a2384c0ffaa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-fuse'';
-  version = ''20200925-git'';
+  baseName = "cl-fuse";
+  version = "20200925-git";
 
-  description = ''CFFI bindings to FUSE (Filesystem in user space)'';
+  description = "CFFI bindings to FUSE (Filesystem in user space)";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz'';
-    sha256 = ''1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp'';
+    url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz";
+    sha256 = "1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp";
   };
 
   packageName = "cl-fuse";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
index 72eafacb190..f7b78782791 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-hooks'';
-  version = ''architecture.hooks-20181210-git'';
+  baseName = "cl-hooks";
+  version = "architecture.hooks-20181210-git";
 
   parasites = [ "cl-hooks/test" ];
 
@@ -11,8 +11,8 @@ mechanism (as known, e.g., from GNU Emacs).'';
   deps = [ args."alexandria" args."anaphora" args."closer-mop" args."fiveam" args."let-plus" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz'';
-    sha256 = ''04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns'';
+    url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz";
+    sha256 = "04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns";
   };
 
   packageName = "cl-hooks";
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 6cd859c2cad..60cb467f9a0 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-html-parse'';
-  version = ''20200925-git'';
+  baseName = "cl-html-parse";
+  version = "20200925-git";
 
-  description = ''HTML Parser'';
+  description = "HTML Parser";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz'';
-    sha256 = ''14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f'';
+    url = "http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz";
+    sha256 = "14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f";
   };
 
   packageName = "cl-html-parse";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
index dde2cc31dd0..64a87763810 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-html5-parser'';
-  version = ''20190521-git'';
+  baseName = "cl-html5-parser";
+  version = "20190521-git";
 
-  description = ''A HTML5 parser for Common Lisp'';
+  description = "A HTML5 parser for Common Lisp";
 
   deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz'';
-    sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p'';
+    url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
+    sha256 = "055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p";
   };
 
   packageName = "cl-html5-parser";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index 50ad66faa23..8719adf631c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-interpol'';
-  version = ''20200715-git'';
+  baseName = "cl-interpol";
+  version = "20200715-git";
 
   parasites = [ "cl-interpol-test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz'';
-    sha256 = ''0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw'';
+    url = "http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz";
+    sha256 = "0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw";
   };
 
   packageName = "cl-interpol";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
index 713aff0ea40..1f9fdc420fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-jpeg'';
-  version = ''20170630-git'';
+  baseName = "cl-jpeg";
+  version = "20170630-git";
 
-  description = ''A self-contained baseline JPEG codec implementation'';
+  description = "A self-contained baseline JPEG codec implementation";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz'';
-    sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0'';
+    url = "http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz";
+    sha256 = "1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0";
   };
 
   packageName = "cl-jpeg";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index d8bc535f355..00f8b90e485 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-json'';
-  version = ''20141217-git'';
+  baseName = "cl-json";
+  version = "20141217-git";
 
   parasites = [ "cl-json.test" ];
 
-  description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.'';
+  description = "JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.";
 
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz'';
-    sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g'';
+    url = "http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz";
+    sha256 = "00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g";
   };
 
   packageName = "cl-json";
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..3162edc3862 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-l10n-cldr'';
-  version = ''20120909-darcs'';
+  baseName = "cl-l10n-cldr";
+  version = "20120909-darcs";
 
-  description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.'';
+  description = "The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz'';
-    sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv'';
+    url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz";
+    sha256 = "03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv";
   };
 
   packageName = "cl-l10n-cldr";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index f37e653bc56..61c37acb829 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-l10n'';
-  version = ''20161204-darcs'';
+  baseName = "cl-l10n";
+  version = "20161204-darcs";
 
   parasites = [ "cl-l10n/test" ];
 
-  description = ''Portable CL Locale Support'';
+  description = "Portable CL Locale Support";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
-    sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl'';
+    url = "http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz";
+    sha256 = "1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl";
   };
 
   packageName = "cl-l10n";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index ad4780cebe0..7c3f1b7c069 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-libuv'';
-  version = ''20200610-git'';
+  baseName = "cl-libuv";
+  version = "20200610-git";
 
-  description = ''Low-level libuv bindings for Common Lisp.'';
+  description = "Low-level libuv bindings for Common Lisp.";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz'';
-    sha256 = ''1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19'';
+    url = "http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz";
+    sha256 = "1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19";
   };
 
   packageName = "cl-libuv";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
index f0d727a633f..656cb704634 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-locale'';
-  version = ''20151031-git'';
+  baseName = "cl-locale";
+  version = "20151031-git";
 
-  description = ''Simple i18n library for Common Lisp'';
+  description = "Simple i18n library for Common Lisp";
 
   deps = [ args."alexandria" args."anaphora" args."arnesi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."collectors" args."iterate" args."named-readtables" args."symbol-munger" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz'';
-    sha256 = ''14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg'';
+    url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz";
+    sha256 = "14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg";
   };
 
   packageName = "cl-locale";
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 b1916c27bfd..56853f0dfcd 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-markup'';
-  version = ''20131003-git'';
+  baseName = "cl-markup";
+  version = "20131003-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz'';
-    sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r'';
+    url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz";
+    sha256 = "1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r";
   };
 
   packageName = "cl-markup";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index 97b714d8b64..c2ede1ee6ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-mysql'';
-  version = ''20200610-git'';
+  baseName = "cl-mysql";
+  version = "20200610-git";
 
-  description = ''Common Lisp MySQL library bindings'';
+  description = "Common Lisp MySQL library bindings";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz'';
-    sha256 = ''0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w'';
+    url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz";
+    sha256 = "0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w";
   };
 
   packageName = "cl-mysql";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index cfca59e3b50..249a54ed0fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-paths-ttf'';
-  version = ''cl-vectors-20180228-git'';
+  baseName = "cl-paths-ttf";
+  version = "cl-vectors-20180228-git";
 
-  description = ''cl-paths-ttf: vectorial paths manipulation'';
+  description = "cl-paths-ttf: vectorial paths manipulation";
 
   deps = [ args."cl-paths" args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
-    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
+    url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
+    sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
   };
 
   packageName = "cl-paths-ttf";
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..9f7fc95a919 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-paths'';
-  version = ''cl-vectors-20180228-git'';
+  baseName = "cl-paths";
+  version = "cl-vectors-20180228-git";
 
-  description = ''cl-paths: vectorial paths manipulation'';
+  description = "cl-paths: vectorial paths manipulation";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
-    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
+    url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
+    sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
   };
 
   packageName = "cl-paths";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
index 16bf7d3a638..35deef0c2a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-pdf'';
-  version = ''20191007-git'';
+  baseName = "cl-pdf";
+  version = "20191007-git";
 
-  description = ''Common Lisp PDF Generation Library'';
+  description = "Common Lisp PDF Generation Library";
 
   deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz'';
-    sha256 = ''0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd'';
+    url = "http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz";
+    sha256 = "0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd";
   };
 
   packageName = "cl-pdf";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 85212e61328..f26326f307e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-postgres'';
-  version = ''postmodern-20201016-git'';
+  baseName = "cl-postgres";
+  version = "postmodern-20201016-git";
 
   parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
 
-  description = ''Low-level client library for PostgreSQL'';
+  description = "Low-level client library for PostgreSQL";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
-    sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+    url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
+    sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
   };
 
   packageName = "cl-postgres";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 3856d777c56..f681b384b54 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-ppcre-template'';
-  version = ''cl-unification-20200925-git'';
+  baseName = "cl-ppcre-template";
+  version = "cl-unification-20200925-git";
 
   description = ''A system used to conditionally load the CL-PPCRE Template.
 
@@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.'';
   deps = [ args."cl-ppcre" args."cl-unification" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz'';
-    sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais'';
+    url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz";
+    sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais";
   };
 
   packageName = "cl-ppcre-template";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 27887f12497..8002137e77b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-ppcre-unicode'';
-  version = ''cl-ppcre-20190521-git'';
+  baseName = "cl-ppcre-unicode";
+  version = "cl-ppcre-20190521-git";
 
   parasites = [ "cl-ppcre-unicode-test" ];
 
-  description = ''Perl-compatible regular expression library (Unicode)'';
+  description = "Perl-compatible regular expression library (Unicode)";
 
   deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
-    sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
+    url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz";
+    sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx";
   };
 
   packageName = "cl-ppcre-unicode";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 8bb8fb2478d..3d038b19dce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-ppcre'';
-  version = ''20190521-git'';
+  baseName = "cl-ppcre";
+  version = "20190521-git";
 
   parasites = [ "cl-ppcre-test" ];
 
-  description = ''Perl-compatible regular expression library'';
+  description = "Perl-compatible regular expression library";
 
   deps = [ args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
-    sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
+    url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz";
+    sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx";
   };
 
   packageName = "cl-ppcre";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
index ddfc92b2cb3..3fa35243c2f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-prevalence'';
-  version = ''20200715-git'';
+  baseName = "cl-prevalence";
+  version = "20200715-git";
 
-  description = ''Common Lisp Prevalence Package'';
+  description = "Common Lisp Prevalence Package";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."s-sysdeps" args."s-xml" args."split-sequence" args."usocket" args."usocket-server" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz'';
-    sha256 = ''1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd'';
+    url = "http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz";
+    sha256 = "1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd";
   };
 
   packageName = "cl-prevalence";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index e88b9efe366..55edc3cf121 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-project'';
-  version = ''20200715-git'';
+  baseName = "cl-project";
+  version = "20200715-git";
 
-  description = ''Generate a skeleton for modern project'';
+  description = "Generate a skeleton for modern project";
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-emb" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz'';
-    sha256 = ''044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306'';
+    url = "http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz";
+    sha256 = "044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306";
   };
 
   packageName = "cl-project";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
index 7339fcdffeb..fdbb48c3754 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-protobufs'';
-  version = ''20200325-git'';
+  baseName = "cl-protobufs";
+  version = "20200325-git";
 
-  description = ''Protobufs for Common Lisp'';
+  description = "Protobufs for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz'';
-    sha256 = ''1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin'';
+    url = "http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz";
+    sha256 = "1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin";
   };
 
   packageName = "cl-protobufs";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
index 1ccf6af5cba..72f7d85bc2c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-qprint'';
-  version = ''20150804-git'';
+  baseName = "cl-qprint";
+  version = "20150804-git";
 
-  description = ''Encode and decode quoted-printable encoded strings.'';
+  description = "Encode and decode quoted-printable encoded strings.";
 
   deps = [ args."flexi-streams" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz'';
-    sha256 = ''042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28'';
+    url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz";
+    sha256 = "042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28";
   };
 
   packageName = "cl-qprint";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index 916af5b2972..a4ada8ee9e5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-reexport'';
-  version = ''20150709-git'';
+  baseName = "cl-reexport";
+  version = "20150709-git";
 
-  description = ''Reexport external symbols in other packages.'';
+  description = "Reexport external symbols in other packages.";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz'';
-    sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi'';
+    url = "http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz";
+    sha256 = "1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi";
   };
 
   packageName = "cl-reexport";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
index 2c4fd03f94d..464cddbd5f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-slice'';
-  version = ''20171130-git'';
+  baseName = "cl-slice";
+  version = "20171130-git";
 
   parasites = [ "cl-slice-tests" ];
 
-  description = ''DSL for array slices in Common Lisp.'';
+  description = "DSL for array slices in Common Lisp.";
 
   deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz'';
-    sha256 = ''0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn'';
+    url = "http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz";
+    sha256 = "0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn";
   };
 
   packageName = "cl-slice";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index accb8a014c8..58957c7826a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-smtp'';
-  version = ''20191130-git'';
+  baseName = "cl-smtp";
+  version = "20191130-git";
 
-  description = ''Common Lisp smtp client.'';
+  description = "Common Lisp smtp client.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz'';
-    sha256 = ''04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq'';
+    url = "http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz";
+    sha256 = "04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq";
   };
 
   packageName = "cl-smtp";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index d97bd34f275..f7571c4bfcc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-store'';
-  version = ''20200925-git'';
+  baseName = "cl-store";
+  version = "20200925-git";
 
   parasites = [ "cl-store-tests" ];
 
-  description = ''Serialization package'';
+  description = "Serialization package";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz'';
-    sha256 = ''0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3'';
+    url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz";
+    sha256 = "0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3";
   };
 
   packageName = "cl-store";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index add200b09a1..6cedd33973d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-syntax-annot'';
-  version = ''cl-syntax-20150407-git'';
+  baseName = "cl-syntax-annot";
+  version = "cl-syntax-20150407-git";
 
-  description = ''CL-Syntax Reader Syntax for cl-annot'';
+  description = "CL-Syntax Reader Syntax for cl-annot";
 
   deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
-    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+    url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+    sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
   };
 
   packageName = "cl-syntax-annot";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index c19a47df6c2..c862b137b02 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-syntax-anonfun'';
-  version = ''cl-syntax-20150407-git'';
+  baseName = "cl-syntax-anonfun";
+  version = "cl-syntax-20150407-git";
 
-  description = ''CL-Syntax Reader Syntax for cl-anonfun'';
+  description = "CL-Syntax Reader Syntax for cl-anonfun";
 
   deps = [ args."cl-anonfun" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
-    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+    url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+    sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
   };
 
   packageName = "cl-syntax-anonfun";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index cded8dc2d06..ed1158f0998 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-syntax-markup'';
-  version = ''cl-syntax-20150407-git'';
+  baseName = "cl-syntax-markup";
+  version = "cl-syntax-20150407-git";
 
-  description = ''CL-Syntax Reader Syntax for CL-Markup'';
+  description = "CL-Syntax Reader Syntax for CL-Markup";
 
   deps = [ args."cl-markup" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
-    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+    url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+    sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
   };
 
   packageName = "cl-syntax-markup";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 353c8210885..195071e88ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-syntax'';
-  version = ''20150407-git'';
+  baseName = "cl-syntax";
+  version = "20150407-git";
 
-  description = ''Reader Syntax Coventions for Common Lisp and SLIME'';
+  description = "Reader Syntax Coventions for Common Lisp and SLIME";
 
   deps = [ args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
-    sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
+    url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
+    sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
   };
 
   packageName = "cl-syntax";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index 419994fb248..8b5bff40c60 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-test-more'';
-  version = ''prove-20200218-git'';
+  baseName = "cl-test-more";
+  version = "prove-20200218-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."prove" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
-    sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
+    url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+    sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
   };
 
   packageName = "cl-test-more";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
index 358666877a6..2e43b2c37ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-typesetting'';
-  version = ''20170830-git'';
+  baseName = "cl-typesetting";
+  version = "20170830-git";
 
-  description = ''Common Lisp Typesetting system'';
+  description = "Common Lisp Typesetting system";
 
   deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz'';
-    sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3'';
+    url = "http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz";
+    sha256 = "1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3";
   };
 
   packageName = "cl-typesetting";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index 7849acb57c0..f7ad7a8592c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-unicode'';
-  version = ''20190521-git'';
+  baseName = "cl-unicode";
+  version = "20190521-git";
 
   parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ];
 
-  description = ''Portable Unicode Library'';
+  description = "Portable Unicode Library";
 
   deps = [ args."cl-ppcre" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz'';
-    sha256 = ''0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc'';
+    url = "http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz";
+    sha256 = "0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc";
   };
 
   packageName = "cl-unicode";
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 38903abe98b..d4328b7319e 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,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-unification'';
-  version = ''20200925-git'';
+  baseName = "cl-unification";
+  version = "20200925-git";
 
   description = ''The CL-UNIFICATION system.
 
@@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.'';
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz'';
-    sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais'';
+    url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz";
+    sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais";
   };
 
   packageName = "cl-unification";
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 ba8be7927f0..1304b11990a 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-utilities'';
-  version = ''1.2.4'';
+  baseName = "cl-utilities";
+  version = "1.2.4";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
-    sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
+    url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz";
+    sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87";
   };
 
   packageName = "cl-utilities";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index f44bd0f22e0..14cee317612 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-vectors'';
-  version = ''20180228-git'';
+  baseName = "cl-vectors";
+  version = "20180228-git";
 
-  description = ''cl-paths: vectorial paths manipulation'';
+  description = "cl-paths: vectorial paths manipulation";
 
   deps = [ args."cl-aa" args."cl-paths" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
-    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
+    url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
+    sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
   };
 
   packageName = "cl-vectors";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
index 01a2732a7ec..9c547943317 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-webkit2'';
-  version = ''cl-webkit-20201016-git'';
+  baseName = "cl-webkit2";
+  version = "cl-webkit-20201016-git";
 
-  description = ''An FFI binding to WebKit2GTK+'';
+  description = "An FFI binding to WebKit2GTK+";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz'';
-    sha256 = ''15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh'';
+    url = "http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz";
+    sha256 = "15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh";
   };
 
   packageName = "cl-webkit2";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 3be45384d41..4b4f4314251 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-who'';
-  version = ''20190710-git'';
+  baseName = "cl-who";
+  version = "20190710-git";
 
   parasites = [ "cl-who-test" ];
 
-  description = ''(X)HTML generation macros'';
+  description = "(X)HTML generation macros";
 
   deps = [ args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz'';
-    sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir'';
+    url = "http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz";
+    sha256 = "0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir";
   };
 
   packageName = "cl-who";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
index 223c50f4716..86c9f0c594a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl-xmlspam'';
-  version = ''20101006-http'';
+  baseName = "cl-xmlspam";
+  version = "20101006-http";
 
-  description = ''Streaming pattern matching for XML'';
+  description = "Streaming pattern matching for XML";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz'';
-    sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h'';
+    url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz";
+    sha256 = "1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h";
   };
 
   packageName = "cl-xmlspam";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index 5a1ae8550aa..1826e79f5a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cl_plus_ssl'';
-  version = ''cl+ssl-20200610-git'';
+  baseName = "cl_plus_ssl";
+  version = "cl+ssl-20200610-git";
 
-  description = ''Common Lisp interface to OpenSSL.'';
+  description = "Common Lisp interface to OpenSSL.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz'';
-    sha256 = ''1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql'';
+    url = "http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz";
+    sha256 = "1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql";
   };
 
   packageName = "cl+ssl";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 5a831da39b8..75a30decba4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack-handler-hunchentoot'';
-  version = ''clack-20191007-git'';
+  baseName = "clack-handler-hunchentoot";
+  version = "clack-20191007-git";
 
-  description = ''Clack handler for Hunchentoot.'';
+  description = "Clack handler for Hunchentoot.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack-handler-hunchentoot";
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 a9294b293cc..5b39ac9e5a3 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack-socket'';
-  version = ''clack-20191007-git'';
+  baseName = "clack-socket";
+  version = "clack-20191007-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack-socket";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index 64e6a694628..b990af44397 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack-test'';
-  version = ''clack-20191007-git'';
+  baseName = "clack-test";
+  version = "clack-20191007-git";
 
-  description = ''Testing Clack Applications.'';
+  description = "Testing Clack Applications.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack-test";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index d52c21e7c00..5c0a5864314 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack-v1-compat'';
-  version = ''clack-20191007-git'';
+  baseName = "clack-v1-compat";
+  version = "clack-20191007-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack-v1-compat";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 1453232cb66..878b037cb3e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clack'';
-  version = ''20191007-git'';
+  baseName = "clack";
+  version = "20191007-git";
 
-  description = ''Web application environment for Common Lisp'';
+  description = "Web application environment for Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
-    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
+    url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
+    sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
   };
 
   packageName = "clack";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix
index 81b335520b0..b7073858601 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clfswm'';
-  version = ''20161204-git'';
+  baseName = "clfswm";
+  version = "20161204-git";
 
-  description = ''CLFSWM: Fullscreen Window Manager'';
+  description = "CLFSWM: Fullscreen Window Manager";
 
   deps = [ args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz'';
-    sha256 = ''1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73'';
+    url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz";
+    sha256 = "1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73";
   };
 
   packageName = "clfswm";
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 a942542e336..5c7f91ac88c 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''closer-mop'';
-  version = ''20201016-git'';
+  baseName = "closer-mop";
+  version = "20201016-git";
 
-  description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
+  description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz'';
-    sha256 = ''1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd'';
+    url = "http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz";
+    sha256 = "1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd";
   };
 
   packageName = "closer-mop";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index c1b36b6b653..86e19bc347f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''closure-common'';
-  version = ''20181018-git'';
+  baseName = "closure-common";
+  version = "20181018-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz'';
-    sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn'';
+    url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz";
+    sha256 = "18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn";
   };
 
   packageName = "closure-common";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 7d9d8730f29..d1d07573809 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''closure-html'';
-  version = ''20180711-git'';
+  baseName = "closure-html";
+  version = "20180711-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz'';
-    sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq'';
+    url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz";
+    sha256 = "0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq";
   };
 
   packageName = "closure-html";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
index cbe9caf93ce..a01522b032f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql-postgresql-socket'';
-  version = ''clsql-20201016-git'';
+  baseName = "clsql-postgresql-socket";
+  version = "clsql-20201016-git";
 
-  description = ''Common Lisp SQL PostgreSQL Socket Driver'';
+  description = "Common Lisp SQL PostgreSQL Socket Driver";
 
   deps = [ args."clsql" args."md5" args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql-postgresql-socket";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
index 9e449d55553..1c5ee972844 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql-postgresql'';
-  version = ''clsql-20201016-git'';
+  baseName = "clsql-postgresql";
+  version = "clsql-20201016-git";
 
-  description = ''Common Lisp PostgreSQL API Driver'';
+  description = "Common Lisp PostgreSQL API Driver";
 
   deps = [ args."clsql" args."clsql-uffi" args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql-postgresql";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
index 1756cea10bb..500eddc5c50 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql-sqlite3'';
-  version = ''clsql-20201016-git'';
+  baseName = "clsql-sqlite3";
+  version = "clsql-20201016-git";
 
-  description = ''Common Lisp Sqlite3 Driver'';
+  description = "Common Lisp Sqlite3 Driver";
 
   deps = [ args."clsql" args."clsql-uffi" args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql-sqlite3";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
index 41399891206..898df293193 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql-uffi'';
-  version = ''clsql-20201016-git'';
+  baseName = "clsql-uffi";
+  version = "clsql-20201016-git";
 
-  description = ''Common UFFI Helper functions for Common Lisp SQL Interface Library'';
+  description = "Common UFFI Helper functions for Common Lisp SQL Interface Library";
 
   deps = [ args."clsql" args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql-uffi";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index 6a202f7efa2..3ec38263224 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clsql'';
-  version = ''20201016-git'';
+  baseName = "clsql";
+  version = "20201016-git";
 
-  description = ''Common Lisp SQL Interface library'';
+  description = "Common Lisp SQL Interface library";
 
   deps = [ args."uffi" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz'';
-    sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8'';
+    url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
+    sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
   };
 
   packageName = "clsql";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index aa89d5e45cc..19a1e5ebb16 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clss'';
-  version = ''20191130-git'';
+  baseName = "clss";
+  version = "20191130-git";
 
-  description = ''A DOM tree searching engine based on CSS selectors.'';
+  description = "A DOM tree searching engine based on CSS selectors.";
 
   deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz'';
-    sha256 = ''0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka'';
+    url = "http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz";
+    sha256 = "0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka";
   };
 
   packageName = "clss";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix
index 10ab18a8caf..bc9a8beb66a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clump-2-3-tree'';
-  version = ''clump-20160825-git'';
+  baseName = "clump-2-3-tree";
+  version = "clump-20160825-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."acclimation" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
-    sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
+    url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+    sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl";
   };
 
   packageName = "clump-2-3-tree";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix
index ad284471540..96543b9ba80 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clump-binary-tree'';
-  version = ''clump-20160825-git'';
+  baseName = "clump-binary-tree";
+  version = "clump-20160825-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."acclimation" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
-    sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
+    url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+    sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl";
   };
 
   packageName = "clump-binary-tree";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix
index 476cacb6f32..8c6c9e02200 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clump'';
-  version = ''20160825-git'';
+  baseName = "clump";
+  version = "20160825-git";
 
-  description = ''Library for operations on different kinds of trees'';
+  description = "Library for operations on different kinds of trees";
 
   deps = [ args."acclimation" args."clump-2-3-tree" args."clump-binary-tree" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
-    sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
+    url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz";
+    sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl";
   };
 
   packageName = "clump";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
index 7ab00c03446..7ef0b4a52dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clunit'';
-  version = ''20171019-git'';
+  baseName = "clunit";
+  version = "20171019-git";
 
-  description = ''CLUnit is a Common Lisp unit testing framework.'';
+  description = "CLUnit is a Common Lisp unit testing framework.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz'';
-    sha256 = ''1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5'';
+    url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz";
+    sha256 = "1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5";
   };
 
   packageName = "clunit";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
index 6a143073b5c..c62d20e6e2b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clunit2'';
-  version = ''20201016-git'';
+  baseName = "clunit2";
+  version = "20201016-git";
 
-  description = ''CLUnit is a Common Lisp unit testing framework.'';
+  description = "CLUnit is a Common Lisp unit testing framework.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz'';
-    sha256 = ''1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp'';
+    url = "http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz";
+    sha256 = "1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp";
   };
 
   packageName = "clunit2";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 856d5411557..9592921de1d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''clx'';
-  version = ''20200715-git'';
+  baseName = "clx";
+  version = "20200715-git";
 
   parasites = [ "clx/test" ];
 
-  description = ''An implementation of the X Window System protocol in Lisp.'';
+  description = "An implementation of the X Window System protocol in Lisp.";
 
   deps = [ args."fiasco" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz'';
-    sha256 = ''1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra'';
+    url = "http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz";
+    sha256 = "1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra";
   };
 
   packageName = "clx";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
index 7375b8dd709..20b0435fafa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''collectors'';
-  version = ''20161204-git'';
+  baseName = "collectors";
+  version = "20161204-git";
 
   parasites = [ "collectors-test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz'';
-    sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf'';
+    url = "http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz";
+    sha256 = "0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf";
   };
 
   packageName = "collectors";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix
index 9084d6a309b..2abbb956551 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''colorize'';
-  version = ''20180228-git'';
+  baseName = "colorize";
+  version = "20180228-git";
 
-  description = ''A Syntax highlighting library'';
+  description = "A Syntax highlighting library";
 
   deps = [ args."alexandria" args."html-encode" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz'';
-    sha256 = ''1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h'';
+    url = "http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz";
+    sha256 = "1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h";
   };
 
   packageName = "colorize";
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 ed4e48cd83b..1beb758a79f 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''command-line-arguments'';
-  version = ''20200325-git'';
+  baseName = "command-line-arguments";
+  version = "20200325-git";
 
-  description = ''small library to deal with command-line arguments'';
+  description = "small library to deal with command-line arguments";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz'';
-    sha256 = ''0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz'';
+    url = "http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz";
+    sha256 = "0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz";
   };
 
   packageName = "command-line-arguments";
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 38ea5aa106c..41ac2a90aae 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''css-lite'';
-  version = ''20120407-git'';
+  baseName = "css-lite";
+  version = "20120407-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz'';
-    sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg'';
+    url = "http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz";
+    sha256 = "1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg";
   };
 
   packageName = "css-lite";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index 98c565648dc..5fc683cdc95 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''css-selectors-simple-tree'';
-  version = ''css-selectors-20160628-git'';
+  baseName = "css-selectors-simple-tree";
+  version = "css-selectors-20160628-git";
 
-  description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree'';
+  description = "An implementation of css selectors that interacts with cl-html5-parser's simple-tree";
 
   deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
-    sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
+    url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+    sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
   };
 
   packageName = "css-selectors-simple-tree";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index fcdb69f3c35..9d03244efa1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''css-selectors-stp'';
-  version = ''css-selectors-20160628-git'';
+  baseName = "css-selectors-stp";
+  version = "css-selectors-20160628-git";
 
-  description = ''An implementation of css selectors that interacts with cxml-stp'';
+  description = "An implementation of css selectors that interacts with cxml-stp";
 
   deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
-    sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
+    url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+    sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
   };
 
   packageName = "css-selectors-stp";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index aa523d6f838..b18d3a03b63 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''css-selectors'';
-  version = ''20160628-git'';
+  baseName = "css-selectors";
+  version = "20160628-git";
 
   parasites = [ "css-selectors-test" ];
 
-  description = ''An implementation of css selectors'';
+  description = "An implementation of css selectors";
 
   deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
-    sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
+    url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
+    sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
   };
 
   packageName = "css-selectors";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
index 2816b451087..4491687d612 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cxml-stp'';
-  version = ''20200325-git'';
+  baseName = "cxml-stp";
+  version = "20200325-git";
 
   parasites = [ "cxml-stp/test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml_slash_test" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz'';
-    sha256 = ''1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n'';
+    url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz";
+    sha256 = "1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n";
   };
 
   packageName = "cxml-stp";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 8f5e05048c6..cd7ac83f2e5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''cxml'';
-  version = ''20200610-git'';
+  baseName = "cxml";
+  version = "20200610-git";
 
   parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ];
 
-  description = ''Closure XML - a Common Lisp XML parser'';
+  description = "Closure XML - a Common Lisp XML parser";
 
   deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz'';
-    sha256 = ''0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq'';
+    url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz";
+    sha256 = "0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq";
   };
 
   packageName = "cxml";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 9dcea72f391..1b84a8c038e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20200610-git'';
+  baseName = "dbd-mysql";
+  version = "cl-dbi-20200610-git";
 
-  description = ''Database driver for MySQL.'';
+  description = "Database driver for MySQL.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-mysql" args."closer-mop" args."dbi" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbd-mysql";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 5a7b261f724..7590319fbc2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbd-postgres'';
-  version = ''cl-dbi-20200610-git'';
+  baseName = "dbd-postgres";
+  version = "cl-dbi-20200610-git";
 
-  description = ''Database driver for PostgreSQL.'';
+  description = "Database driver for PostgreSQL.";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."closer-mop" args."dbi" args."ironclad" args."md5" args."split-sequence" args."trivial-garbage" args."uax-15" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbd-postgres";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 5566e807549..b2a26415917 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbd-sqlite3'';
-  version = ''cl-dbi-20200610-git'';
+  baseName = "dbd-sqlite3";
+  version = "cl-dbi-20200610-git";
 
-  description = ''Database driver for SQLite3.'';
+  description = "Database driver for SQLite3.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."closer-mop" args."dbi" args."iterate" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbd-sqlite3";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
index 889afc1231d..f24003e87cf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbi-test'';
-  version = ''cl-dbi-20200610-git'';
+  baseName = "dbi-test";
+  version = "cl-dbi-20200610-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."dissect" args."rove" args."split-sequence" args."trivial-gray-streams" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbi-test";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 75fab11cf44..b4f9fc45de0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbi'';
-  version = ''cl-20200610-git'';
+  baseName = "dbi";
+  version = "cl-20200610-git";
 
   parasites = [ "dbi/test" ];
 
-  description = ''Database independent interface for Common Lisp'';
+  description = "Database independent interface for Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-mysql" args."cl-postgres" args."closer-mop" args."dbd-mysql" args."dbd-postgres" args."dbd-sqlite3" args."dbi-test" args."rove" args."split-sequence" args."sqlite" args."trivial-garbage" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz'';
-    sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas'';
+    url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
+    sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
   };
 
   packageName = "dbi";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
index 1ea512d0ab7..b5ebe86a190 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dbus'';
-  version = ''20200610-git'';
+  baseName = "dbus";
+  version = "20200610-git";
 
-  description = ''A D-BUS client library for Common Lisp'';
+  description = "A D-BUS client library for Common Lisp";
 
   deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz'';
-    sha256 = ''1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79'';
+    url = "http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz";
+    sha256 = "1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79";
   };
 
   packageName = "dbus";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 1fb2381ffc2..d5af479b22c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dexador'';
-  version = ''20200427-git'';
+  baseName = "dexador";
+  version = "20200427-git";
 
-  description = ''Yet another HTTP client for Common Lisp'';
+  description = "Yet another HTTP client for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz'';
-    sha256 = ''0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld'';
+    url = "http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz";
+    sha256 = "0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld";
   };
 
   packageName = "dexador";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
index 2df2c14c129..54f55a4d3ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''dissect'';
-  version = ''20200427-git'';
+  baseName = "dissect";
+  version = "20200427-git";
 
-  description = ''A lib for introspecting the call stack and active restarts.'';
+  description = "A lib for introspecting the call stack and active restarts.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz'';
-    sha256 = ''1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a'';
+    url = "http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz";
+    sha256 = "1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a";
   };
 
   packageName = "dissect";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
index 1b919e63a5f..7010a186bfc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''djula'';
-  version = ''20201016-git'';
+  baseName = "djula";
+  version = "20201016-git";
 
-  description = ''An implementation of Django templates for Common Lisp.'';
+  description = "An implementation of Django templates for Common Lisp.";
 
   deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz'';
-    sha256 = ''09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy'';
+    url = "http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz";
+    sha256 = "09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy";
   };
 
   packageName = "djula";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 3dbacdf0f81..09a27df91e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''do-urlencode'';
-  version = ''20181018-git'';
+  baseName = "do-urlencode";
+  version = "20181018-git";
 
-  description = ''Percent Encoding (aka URL Encoding) library'';
+  description = "Percent Encoding (aka URL Encoding) library";
 
   deps = [ args."alexandria" args."babel" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz'';
-    sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2'';
+    url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz";
+    sha256 = "1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2";
   };
 
   packageName = "do-urlencode";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 7c25ed9a037..27e05af70be 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''documentation-utils'';
-  version = ''20190710-git'';
+  baseName = "documentation-utils";
+  version = "20190710-git";
 
-  description = ''A few simple tools to help you with documenting your library.'';
+  description = "A few simple tools to help you with documenting your library.";
 
   deps = [ args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz'';
-    sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3'';
+    url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz";
+    sha256 = "1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3";
   };
 
   packageName = "documentation-utils";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index e880d94f433..7ba2b4f9a37 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''drakma'';
-  version = ''v2.0.7'';
+  baseName = "drakma";
+  version = "v2.0.7";
 
-  description = ''Full-featured http/https client based on usocket'';
+  description = "Full-featured http/https client based on usocket";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz'';
-    sha256 = ''1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw'';
+    url = "http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz";
+    sha256 = "1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw";
   };
 
   packageName = "drakma";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix
index a5e44cefa4b..f0bdf6d0376 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''enchant'';
-  version = ''cl-20190521-git'';
+  baseName = "enchant";
+  version = "cl-20190521-git";
 
-  description = ''Programming interface for Enchant spell-checker library'';
+  description = "Programming interface for Enchant spell-checker library";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz'';
-    sha256 = ''16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14'';
+    url = "http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz";
+    sha256 = "16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14";
   };
 
   packageName = "enchant";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
index d8258ea57df..367e268f344 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''esrap-peg'';
-  version = ''20191007-git'';
+  baseName = "esrap-peg";
+  version = "20191007-git";
 
-  description = ''A wrapper around Esrap to allow generating Esrap grammars from PEG definitions'';
+  description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
 
   deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz'';
-    sha256 = ''0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis'';
+    url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz";
+    sha256 = "0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis";
   };
 
   packageName = "esrap-peg";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 946c71a2f5b..7eca78ca53e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''esrap'';
-  version = ''20200325-git'';
+  baseName = "esrap";
+  version = "20200325-git";
 
   parasites = [ "esrap/tests" ];
 
-  description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
+  description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp.";
 
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz'';
-    sha256 = ''1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68'';
+    url = "http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz";
+    sha256 = "1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68";
   };
 
   packageName = "esrap";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 4fd75234253..f0936fe5c4b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''external-program'';
-  version = ''20190307-git'';
+  baseName = "external-program";
+  version = "20190307-git";
 
   parasites = [ "external-program-test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz'';
-    sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz'';
+    url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz";
+    sha256 = "1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz";
   };
 
   packageName = "external-program";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
index 67d75b89dbd..8c088a149f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-csv'';
-  version = ''20171227-git'';
+  baseName = "fare-csv";
+  version = "20171227-git";
 
-  description = ''Robust CSV parser and printer'';
+  description = "Robust CSV parser and printer";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz'';
-    sha256 = ''1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x'';
+    url = "http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz";
+    sha256 = "1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x";
   };
 
   packageName = "fare-csv";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
index a5cec39c15f..929f0f820bd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-mop'';
-  version = ''20151218-git'';
+  baseName = "fare-mop";
+  version = "20151218-git";
 
-  description = ''Utilities using the MOP; notably make informative pretty-printing trivial'';
+  description = "Utilities using the MOP; notably make informative pretty-printing trivial";
 
   deps = [ args."closer-mop" args."fare-utils" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz'';
-    sha256 = ''0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9'';
+    url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz";
+    sha256 = "0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9";
   };
 
   packageName = "fare-mop";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
index ff03567a1a6..1b9be4dea1a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-quasiquote-extras'';
-  version = ''fare-quasiquote-20200925-git'';
+  baseName = "fare-quasiquote-extras";
+  version = "fare-quasiquote-20200925-git";
 
-  description = ''fare-quasiquote plus extras'';
+  description = "fare-quasiquote plus extras";
 
   deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
-    sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
+    url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+    sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
   };
 
   packageName = "fare-quasiquote-extras";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
index 2f1ef3e5b12..2f1c97bbb6b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-quasiquote-optima'';
-  version = ''fare-quasiquote-20200925-git'';
+  baseName = "fare-quasiquote-optima";
+  version = "fare-quasiquote-20200925-git";
 
-  description = ''fare-quasiquote extension for optima'';
+  description = "fare-quasiquote extension for optima";
 
   deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
-    sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
+    url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+    sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
   };
 
   packageName = "fare-quasiquote-optima";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
index 7d332085e20..47c7c3851bd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-quasiquote-readtable'';
-  version = ''fare-quasiquote-20200925-git'';
+  baseName = "fare-quasiquote-readtable";
+  version = "fare-quasiquote-20200925-git";
 
-  description = ''Using fare-quasiquote with named-readtable'';
+  description = "Using fare-quasiquote with named-readtable";
 
   deps = [ args."fare-quasiquote" args."fare-utils" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
-    sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
+    url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+    sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
   };
 
   packageName = "fare-quasiquote-readtable";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
index d5b282e289a..3560c48fee3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-quasiquote'';
-  version = ''20200925-git'';
+  baseName = "fare-quasiquote";
+  version = "20200925-git";
 
-  description = ''Portable, matchable implementation of quasiquote'';
+  description = "Portable, matchable implementation of quasiquote";
 
   deps = [ args."fare-utils" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
-    sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
+    url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
+    sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
   };
 
   packageName = "fare-quasiquote";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
index d7af897eafb..b4e77dad912 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fare-utils'';
-  version = ''20170124-git'';
+  baseName = "fare-utils";
+  version = "20170124-git";
 
-  description = ''Basic functions and macros, interfaces, pure and stateful datastructures'';
+  description = "Basic functions and macros, interfaces, pure and stateful datastructures";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz'';
-    sha256 = ''0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq'';
+    url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz";
+    sha256 = "0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq";
   };
 
   packageName = "fare-utils";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index cea5d251d72..345b94124d9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fast-http'';
-  version = ''20191007-git'';
+  baseName = "fast-http";
+  version = "20191007-git";
 
-  description = ''A fast HTTP protocol parser in Common Lisp'';
+  description = "A fast HTTP protocol parser in Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz'';
-    sha256 = ''00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32'';
+    url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz";
+    sha256 = "00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32";
   };
 
   packageName = "fast-http";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 9d7999b750c..22ccfd78de9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fast-io'';
-  version = ''20200925-git'';
+  baseName = "fast-io";
+  version = "20200925-git";
 
-  description = ''Alternative I/O mechanism to a stream or vector'';
+  description = "Alternative I/O mechanism to a stream or vector";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz'';
-    sha256 = ''1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975'';
+    url = "http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz";
+    sha256 = "1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975";
   };
 
   packageName = "fast-io";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 68e5e00085c..ab8118deac5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fiasco'';
-  version = ''20200610-git'';
+  baseName = "fiasco";
+  version = "20200610-git";
 
   parasites = [ "fiasco-self-tests" ];
 
-  description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.'';
+  description = "A Common Lisp test framework that treasures your failures, logical continuation of Stefil.";
 
   deps = [ args."alexandria" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz'';
-    sha256 = ''1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4'';
+    url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz";
+    sha256 = "1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4";
   };
 
   packageName = "fiasco";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
index 45af1934223..d02f9de5b0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fiveam'';
-  version = ''20200925-git'';
+  baseName = "fiveam";
+  version = "20200925-git";
 
   parasites = [ "fiveam/test" ];
 
-  description = ''A simple regression testing framework'';
+  description = "A simple regression testing framework";
 
   deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz'';
-    sha256 = ''0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d'';
+    url = "http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz";
+    sha256 = "0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d";
   };
 
   packageName = "fiveam";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index a1828981c07..328c91cd2bd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''flexi-streams'';
-  version = ''20200925-git'';
+  baseName = "flexi-streams";
+  version = "20200925-git";
 
   parasites = [ "flexi-streams-test" ];
 
-  description = ''Flexible bivalent streams for Common Lisp'';
+  description = "Flexible bivalent streams for Common Lisp";
 
   deps = [ args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz'';
-    sha256 = ''1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2'';
+    url = "http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz";
+    sha256 = "1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2";
   };
 
   packageName = "flexi-streams";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 90ce8b83dde..56de0edc9c9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''form-fiddle'';
-  version = ''20190710-git'';
+  baseName = "form-fiddle";
+  version = "20190710-git";
 
-  description = ''A collection of utilities to destructure lambda forms.'';
+  description = "A collection of utilities to destructure lambda forms.";
 
   deps = [ args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz'';
-    sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl'';
+    url = "http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz";
+    sha256 = "12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl";
   };
 
   packageName = "form-fiddle";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
index 12e168e44f6..20f41296a8e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''fset'';
-  version = ''20200925-git'';
+  baseName = "fset";
+  version = "20200925-git";
 
   parasites = [ "fset/test" ];
 
@@ -12,8 +12,8 @@ See: http://www.ergy.com/FSet.html
   deps = [ args."misc-extensions" args."mt19937" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz'';
-    sha256 = ''19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv'';
+    url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz";
+    sha256 = "19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv";
   };
 
   packageName = "fset";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
index ffc517973d5..0a9d812d5fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''gettext'';
-  version = ''20171130-git'';
+  baseName = "gettext";
+  version = "20171130-git";
 
-  description = ''An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.'';
+  description = "An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.";
 
   deps = [ args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz'';
-    sha256 = ''0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd'';
+    url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz";
+    sha256 = "0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd";
   };
 
   packageName = "gettext";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
index 42cdca06d90..a4d135188fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''global-vars'';
-  version = ''20141106-git'';
+  baseName = "global-vars";
+  version = "20141106-git";
 
-  description = ''Define efficient global variables.'';
+  description = "Define efficient global variables.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz'';
-    sha256 = ''0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j'';
+    url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz";
+    sha256 = "0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j";
   };
 
   packageName = "global-vars";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix
index 9f4672644fa..646bcff4720 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''html-encode'';
-  version = ''1.2'';
+  baseName = "html-encode";
+  version = "1.2";
 
-  description = ''A library for encoding text in various web-savvy encodings.'';
+  description = "A library for encoding text in various web-savvy encodings.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz'';
-    sha256 = ''06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf'';
+    url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz";
+    sha256 = "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf";
   };
 
   packageName = "html-encode";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 4242d959046..09ba474e5a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''http-body'';
-  version = ''20190813-git'';
+  baseName = "http-body";
+  version = "20190813-git";
 
-  description = ''HTTP POST data parser for Common Lisp'';
+  description = "HTTP POST data parser for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz'';
-    sha256 = ''1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8'';
+    url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz";
+    sha256 = "1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8";
   };
 
   packageName = "http-body";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index 074e2ac9671..ed8b80752d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''hu_dot_dwim_dot_asdf'';
-  version = ''20200925-darcs'';
+  baseName = "hu_dot_dwim_dot_asdf";
+  version = "20200925-darcs";
 
-  description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
+  description = "Various ASDF extensions such as attached test and documentation system, explicit development support, etc.";
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz'';
-    sha256 = ''1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h'';
+    url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz";
+    sha256 = "1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h";
   };
 
   packageName = "hu.dwim.asdf";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix
index a554ef8d680..13f4d11fb56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''hu_dot_dwim_dot_defclass-star'';
-  version = ''20150709-darcs'';
+  baseName = "hu_dot_dwim_dot_defclass-star";
+  version = "20150709-darcs";
 
-  description = ''Simplify class like definitions with defclass* and friends.'';
+  description = "Simplify class like definitions with defclass* and friends.";
 
   deps = [ args."hu_dot_dwim_dot_asdf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz'';
-    sha256 = ''032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs'';
+    url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz";
+    sha256 = "032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs";
   };
 
   packageName = "hu.dwim.defclass-star";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
index d49a382a3a3..af6529582a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''hu_dot_dwim_dot_stefil'';
-  version = ''20200218-darcs'';
+  baseName = "hu_dot_dwim_dot_stefil";
+  version = "20200218-darcs";
 
   parasites = [ "hu.dwim.stefil/test" ];
 
-  description = ''A Simple Test Framework In Lisp.'';
+  description = "A Simple Test Framework In Lisp.";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz'';
-    sha256 = ''16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf'';
+    url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz";
+    sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf";
   };
 
   packageName = "hu.dwim.stefil";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index d874120e7d8..883d7554900 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''hunchentoot'';
-  version = ''v1.3.0'';
+  baseName = "hunchentoot";
+  version = "v1.3.0";
 
   parasites = [ "hunchentoot-test" ];
 
@@ -13,8 +13,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz'';
-    sha256 = ''08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8'';
+    url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz";
+    sha256 = "08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8";
   };
 
   packageName = "hunchentoot";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index 1b948bcf325..8c3ffe879c4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''idna'';
-  version = ''20120107-git'';
+  baseName = "idna";
+  version = "20120107-git";
 
-  description = ''IDNA (international domain names) string encoding and decoding routines'';
+  description = "IDNA (international domain names) string encoding and decoding routines";
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
-    sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
+    url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz";
+    sha256 = "0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c";
   };
 
   packageName = "idna";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
index 4211dfbc919..2544cd99dff 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''ieee-floats'';
-  version = ''20170830-git'';
+  baseName = "ieee-floats";
+  version = "20170830-git";
 
   parasites = [ "ieee-floats-tests" ];
 
-  description = ''Convert floating point values to IEEE 754 binary representation'';
+  description = "Convert floating point values to IEEE 754 binary representation";
 
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz'';
-    sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk'';
+    url = "http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz";
+    sha256 = "15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk";
   };
 
   packageName = "ieee-floats";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
index 2072945f264..5aa30e92cdc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''inferior-shell'';
-  version = ''20200925-git'';
+  baseName = "inferior-shell";
+  version = "20200925-git";
 
   parasites = [ "inferior-shell/test" ];
 
-  description = ''spawn local or remote processes and shell pipes'';
+  description = "spawn local or remote processes and shell pipes";
 
   deps = [ args."alexandria" args."closer-mop" args."fare-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."hu_dot_dwim_dot_stefil" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz'';
-    sha256 = ''1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80'';
+    url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz";
+    sha256 = "1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80";
   };
 
   packageName = "inferior-shell";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
index 68024ad2a5a..4590e55ffd6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''introspect-environment'';
-  version = ''20200715-git'';
+  baseName = "introspect-environment";
+  version = "20200715-git";
 
-  description = ''Small interface to portable but nonstandard introspection of CL environments.'';
+  description = "Small interface to portable but nonstandard introspection of CL environments.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz'';
-    sha256 = ''1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns'';
+    url = "http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz";
+    sha256 = "1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns";
   };
 
   packageName = "introspect-environment";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index c4ae44cd676..8d547d93b59 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib'';
-  version = ''v0.8.3'';
+  baseName = "iolib";
+  version = "v0.8.3";
 
   parasites = [ "iolib/multiplex" "iolib/os" "iolib/pathnames" "iolib/sockets" "iolib/streams" "iolib/syscalls" "iolib/trivial-sockets" "iolib/zstreams" ];
 
-  description = ''I/O library.'';
+  description = "I/O library.";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
index 195b52c08c4..b4136a5dc86 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_asdf'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_asdf";
+  version = "iolib-v0.8.3";
 
-  description = ''A few ASDF component classes.'';
+  description = "A few ASDF component classes.";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.asdf";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
index aa650edde02..97763556c1a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_base'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_base";
+  version = "iolib-v0.8.3";
 
-  description = ''Base IOlib package, used instead of CL.'';
+  description = "Base IOlib package, used instead of CL.";
 
   deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.base";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
index c0ec72d4869..2482a76453b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_common-lisp'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_common-lisp";
+  version = "iolib-v0.8.3";
 
-  description = ''Slightly modified Common Lisp.'';
+  description = "Slightly modified Common Lisp.";
 
   deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.common-lisp";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
index 4ba0cfa1ce2..d9d055fab06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_conf'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_conf";
+  version = "iolib-v0.8.3";
 
-  description = ''Compile-time configuration for IOLib.'';
+  description = "Compile-time configuration for IOLib.";
 
   deps = [ args."alexandria" args."iolib_dot_asdf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.conf";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
index 7a1a12243fe..5e7df7a5c76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iolib_dot_grovel'';
-  version = ''iolib-v0.8.3'';
+  baseName = "iolib_dot_grovel";
+  version = "iolib-v0.8.3";
 
-  description = ''The CFFI Groveller'';
+  description = "The CFFI Groveller";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+    url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
+    sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
   };
 
   packageName = "iolib.grovel";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 84298e81820..48e7595f3e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''ironclad'';
-  version = ''v0.51'';
+  baseName = "ironclad";
+  version = "v0.51";
 
   parasites = [ "ironclad/tests" ];
 
-  description = ''A cryptographic toolkit written in pure Common Lisp'';
+  description = "A cryptographic toolkit written in pure Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz'';
-    sha256 = ''0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn'';
+    url = "http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz";
+    sha256 = "0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn";
   };
 
   packageName = "ironclad";
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 e3e1fa689a0..d82d371ca0c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''iterate'';
-  version = ''20200610-git'';
+  baseName = "iterate";
+  version = "20200610-git";
 
   parasites = [ "iterate/tests" ];
 
-  description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility'';
+  description = "Jonathan Amsterdam's iterator/gatherer/accumulator facility";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz'';
-    sha256 = ''0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb'';
+    url = "http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz";
+    sha256 = "0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb";
   };
 
   packageName = "iterate";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index a29a02c5e61..547a909c067 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''jonathan'';
-  version = ''20200925-git'';
+  baseName = "jonathan";
+  version = "20200925-git";
 
-  description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
+  description = "High performance JSON encoder and decoder. Currently support: SBCL, CCL.";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz'';
-    sha256 = ''1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx'';
+    url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz";
+    sha256 = "1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx";
   };
 
   packageName = "jonathan";
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 49bc7d4cab5..d785fbd2257 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''kmrcl'';
-  version = ''20201016-git'';
+  baseName = "kmrcl";
+  version = "20201016-git";
 
   parasites = [ "kmrcl/test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz'';
-    sha256 = ''0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf'';
+    url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz";
+    sha256 = "0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf";
   };
 
   packageName = "kmrcl";
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 0260d37f0bb..2af6575754a 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lack-component'';
-  version = ''lack-20201016-git'';
+  baseName = "lack-component";
+  version = "lack-20201016-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
-    sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
+    url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
+    sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
   };
 
   packageName = "lack-component";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 610950054fa..edadaa07c14 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20201016-git'';
+  baseName = "lack-middleware-backtrace";
+  version = "lack-20201016-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
-    sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
+    url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
+    sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
   };
 
   packageName = "lack-middleware-backtrace";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 1af4ec3f430..ad8bdc84b59 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lack-util'';
-  version = ''lack-20201016-git'';
+  baseName = "lack-util";
+  version = "lack-20201016-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
-    sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
+    url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
+    sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
   };
 
   packageName = "lack-util";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index a85fab15c42..06f596509a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lack'';
-  version = ''20201016-git'';
+  baseName = "lack";
+  version = "20201016-git";
 
-  description = ''A minimal Clack'';
+  description = "A minimal Clack";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
-    sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
+    url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
+    sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
   };
 
   packageName = "lack";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 9d130c2b053..791c7f0a2d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''let-plus'';
-  version = ''20191130-git'';
+  baseName = "let-plus";
+  version = "20191130-git";
 
   parasites = [ "let-plus/tests" ];
 
-  description = ''Destructuring extension of LET*.'';
+  description = "Destructuring extension of LET*.";
 
   deps = [ args."alexandria" args."anaphora" args."lift" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz'';
-    sha256 = ''0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p'';
+    url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz";
+    sha256 = "0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p";
   };
 
   packageName = "let-plus";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9dd6baad1bd..e4bbb44a468 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lev'';
-  version = ''20150505-git'';
+  baseName = "lev";
+  version = "20150505-git";
 
-  description = ''libev bindings for Common Lisp'';
+  description = "libev bindings for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz'';
-    sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl'';
+    url = "http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz";
+    sha256 = "0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl";
   };
 
   packageName = "lev";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
index 10977c16f83..448f41e5b51 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lfarm-client'';
-  version = ''lfarm-20150608-git'';
+  baseName = "lfarm-client";
+  version = "lfarm-20150608-git";
 
-  description = ''Client component of lfarm, a library for distributing work across machines.'';
+  description = "Client component of lfarm, a library for distributing work across machines.";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."lparallel" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
-    sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
+    url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+    sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
   };
 
   packageName = "lfarm-client";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
index 4a5fe87982a..fc92bbe89b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lfarm-common'';
-  version = ''lfarm-20150608-git'';
+  baseName = "lfarm-common";
+  version = "lfarm-20150608-git";
 
   description = ''(private) Common components of lfarm, a library for distributing
 work across machines.'';
@@ -9,8 +9,8 @@ work across machines.'';
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
-    sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
+    url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+    sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
   };
 
   packageName = "lfarm-common";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
index 354d6c31507..5cc5cc1e9da 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lfarm-server'';
-  version = ''lfarm-20150608-git'';
+  baseName = "lfarm-server";
+  version = "lfarm-20150608-git";
 
-  description = ''Server component of lfarm, a library for distributing work across machines.'';
+  description = "Server component of lfarm, a library for distributing work across machines.";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
-    sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
+    url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+    sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
   };
 
   packageName = "lfarm-server";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
index 348c71fe966..0ba638611c1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lfarm-ssl'';
-  version = ''lfarm-20150608-git'';
+  baseName = "lfarm-ssl";
+  version = "lfarm-20150608-git";
 
-  description = ''SSL support for lfarm'';
+  description = "SSL support for lfarm";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
-    sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
+    url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
+    sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
   };
 
   packageName = "lfarm-ssl";
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 1edb65596a6..c0e4f0caee3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lift'';
-  version = ''20190521-git'';
+  baseName = "lift";
+  version = "20190521-git";
 
-  description = ''LIsp Framework for Testing'';
+  description = "LIsp Framework for Testing";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz'';
-    sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9'';
+    url = "http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz";
+    sha256 = "0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9";
   };
 
   packageName = "lift";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
index 7f88beb974b..80b0431799b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lisp-namespace'';
-  version = ''20171130-git'';
+  baseName = "lisp-namespace";
+  version = "20171130-git";
 
-  description = ''Provides LISP-N --- extensible namespaces in Common Lisp.'';
+  description = "Provides LISP-N --- extensible namespaces in Common Lisp.";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz'';
-    sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j'';
+    url = "http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz";
+    sha256 = "0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j";
   };
 
   packageName = "lisp-namespace";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 8d21f88cbf8..12d82701e08 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lisp-unit2'';
-  version = ''20180131-git'';
+  baseName = "lisp-unit2";
+  version = "20180131-git";
 
   parasites = [ "lisp-unit2-test" ];
 
-  description = ''Common Lisp library that supports unit testing.'';
+  description = "Common Lisp library that supports unit testing.";
 
   deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz'';
-    sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7'';
+    url = "http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz";
+    sha256 = "04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7";
   };
 
   packageName = "lisp-unit2";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index c7d2f061f4b..9bf7ea7fa14 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''local-time'';
-  version = ''20200925-git'';
+  baseName = "local-time";
+  version = "20200925-git";
 
   parasites = [ "local-time/test" ];
 
-  description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
+  description = "A library for manipulating dates and times, based on a paper by Erik Naggum";
 
   deps = [ args."stefil" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz'';
-    sha256 = ''0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f'';
+    url = "http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz";
+    sha256 = "0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f";
   };
 
   packageName = "local-time";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
index 222178b1556..e4b4795fe0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''log4cl'';
-  version = ''20200925-git'';
+  baseName = "log4cl";
+  version = "20200925-git";
 
   parasites = [ "log4cl/syslog" "log4cl/test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz'';
-    sha256 = ''1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf'';
+    url = "http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz";
+    sha256 = "1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf";
   };
 
   packageName = "log4cl";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
index 1a6f217a2f9..73b42c3fc9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lparallel'';
-  version = ''20160825-git'';
+  baseName = "lparallel";
+  version = "20160825-git";
 
-  description = ''Parallelism for Common Lisp'';
+  description = "Parallelism for Common Lisp";
 
   deps = [ args."alexandria" args."bordeaux-threads" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz'';
-    sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1'';
+    url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
+    sha256 = "0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1";
   };
 
   packageName = "lparallel";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index cf27f8ceaa3..e287b7519a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''lquery'';
-  version = ''20200715-git'';
+  baseName = "lquery";
+  version = "20200715-git";
 
-  description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
+  description = "A library to allow jQuery-like HTML/DOM manipulation.";
 
   deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz'';
-    sha256 = ''1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd'';
+    url = "http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz";
+    sha256 = "1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd";
   };
 
   packageName = "lquery";
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 8187c99f94a..fd6213f3076 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''map-set'';
-  version = ''20190307-hg'';
+  baseName = "map-set";
+  version = "20190307-hg";
 
-  description = ''Set-like data structure.'';
+  description = "Set-like data structure.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz'';
-    sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9'';
+    url = "http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz";
+    sha256 = "1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9";
   };
 
   packageName = "map-set";
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 414dee98b71..94b8e64bfb4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''marshal'';
-  version = ''cl-20201016-git'';
+  baseName = "marshal";
+  version = "cl-20201016-git";
 
-  description = ''marshal: Simple (de)serialization of Lisp datastructures.'';
+  description = "marshal: Simple (de)serialization of Lisp datastructures.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz'';
-    sha256 = ''03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz'';
+    url = "http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz";
+    sha256 = "03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz";
   };
 
   packageName = "marshal";
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..845c235d49d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''md5'';
-  version = ''20180228-git'';
+  baseName = "md5";
+  version = "20180228-git";
 
-  description = ''The MD5 Message-Digest Algorithm RFC 1321'';
+  description = "The MD5 Message-Digest Algorithm RFC 1321";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz'';
-    sha256 = ''1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4'';
+    url = "http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz";
+    sha256 = "1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4";
   };
 
   packageName = "md5";
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 6e0339bf9f9..993f3639203 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''metabang-bind'';
-  version = ''20200218-git'';
+  baseName = "metabang-bind";
+  version = "20200218-git";
 
-  description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.'';
+  description = "Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz'';
-    sha256 = ''0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq'';
+    url = "http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz";
+    sha256 = "0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq";
   };
 
   packageName = "metabang-bind";
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 1cac2408837..bf553ddf370 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''metatilities-base'';
-  version = ''20191227-git'';
+  baseName = "metatilities-base";
+  version = "20191227-git";
 
-  description = ''These are metabang.com's Common Lisp basic utilities.'';
+  description = "These are metabang.com's Common Lisp basic utilities.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz'';
-    sha256 = ''1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil'';
+    url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz";
+    sha256 = "1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil";
   };
 
   packageName = "metatilities-base";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
index 0271bf98cf7..33cc8bc90bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''mgl-pax'';
-  version = ''20201016-git'';
+  baseName = "mgl-pax";
+  version = "20201016-git";
 
   parasites = [ "mgl-pax/test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz'';
-    sha256 = ''0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li'';
+    url = "http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz";
+    sha256 = "0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li";
   };
 
   packageName = "mgl-pax";
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 16609db5c22..163f85182e5 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''misc-extensions'';
-  version = ''20150608-git'';
+  baseName = "misc-extensions";
+  version = "20150608-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz'';
-    sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj'';
+    url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz";
+    sha256 = "0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj";
   };
 
   packageName = "misc-extensions";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
index dc63474679a..3bd71c00d94 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''mk-string-metrics'';
-  version = ''20180131-git'';
+  baseName = "mk-string-metrics";
+  version = "20180131-git";
 
-  description = ''efficient implementations of various string metric algorithms'';
+  description = "efficient implementations of various string metric algorithms";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz'';
-    sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4'';
+    url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz";
+    sha256 = "10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4";
   };
 
   packageName = "mk-string-metrics";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
index 1f2dd20ee4b..458acc6e94e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''moptilities'';
-  version = ''20170403-git'';
+  baseName = "moptilities";
+  version = "20170403-git";
 
-  description = ''Common Lisp MOP utilities'';
+  description = "Common Lisp MOP utilities";
 
   deps = [ args."closer-mop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz'';
-    sha256 = ''0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8'';
+    url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz";
+    sha256 = "0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8";
   };
 
   packageName = "moptilities";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
index 9a014c41603..40460f6d71c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''more-conditions'';
-  version = ''20180831-git'';
+  baseName = "more-conditions";
+  version = "20180831-git";
 
   parasites = [ "more-conditions/test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."alexandria" args."closer-mop" args."fiveam" args."let-plus" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz'';
-    sha256 = ''0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x'';
+    url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz";
+    sha256 = "0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x";
   };
 
   packageName = "more-conditions";
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..a5628dddeca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''mt19937'';
-  version = ''1.1.1'';
+  baseName = "mt19937";
+  version = "1.1.1";
 
-  description = ''Portable MT19937 Mersenne Twister random number generator'';
+  description = "Portable MT19937 Mersenne Twister random number generator";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz'';
-    sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv'';
+    url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz";
+    sha256 = "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv";
   };
 
   packageName = "mt19937";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 415b508713c..cb35cd2c4ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''myway'';
-  version = ''20200325-git'';
+  baseName = "myway";
+  version = "20200325-git";
 
-  description = ''Sinatra-compatible routing library.'';
+  description = "Sinatra-compatible routing library.";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz'';
-    sha256 = ''07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15'';
+    url = "http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz";
+    sha256 = "07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15";
   };
 
   packageName = "myway";
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 3504443d453..9479bf85d01 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,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''named-readtables'';
-  version = ''20200925-git'';
+  baseName = "named-readtables";
+  version = "20200925-git";
 
   parasites = [ "named-readtables/test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz'';
-    sha256 = ''0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl'';
+    url = "http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz";
+    sha256 = "0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl";
   };
 
   packageName = "named-readtables";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
index a9c49279563..0bb4d755d62 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''net-telent-date'';
-  version = ''net-telent-date_0.42'';
+  baseName = "net-telent-date";
+  version = "net-telent-date_0.42";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz'';
-    sha256 = ''06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1'';
+    url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz";
+    sha256 = "06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1";
   };
 
   packageName = "net-telent-date";
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..039277bcc0e 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''net_dot_didierverna_dot_asdf-flv'';
-  version = ''asdf-flv-version-2.1'';
+  baseName = "net_dot_didierverna_dot_asdf-flv";
+  version = "asdf-flv-version-2.1";
 
-  description = ''ASDF extension to provide support for file-local variables.'';
+  description = "ASDF extension to provide support for file-local variables.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz'';
-    sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc'';
+    url = "http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz";
+    sha256 = "12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc";
   };
 
   packageName = "net.didierverna.asdf-flv";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index 75ea9b55220..f6fbd1e1b63 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''nibbles'';
-  version = ''20200925-git'';
+  baseName = "nibbles";
+  version = "20200925-git";
 
   parasites = [ "nibbles/tests" ];
 
-  description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders'';
+  description = "A library for accessing octet-addressed blocks of data in big- and little-endian orders";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz'';
-    sha256 = ''14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4'';
+    url = "http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz";
+    sha256 = "14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4";
   };
 
   packageName = "nibbles";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 07b86f58fe7..487fd2c50aa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''optima'';
-  version = ''20150709-git'';
+  baseName = "optima";
+  version = "20150709-git";
 
-  description = ''Optimized Pattern Matching Library'';
+  description = "Optimized Pattern Matching Library";
 
   deps = [ args."alexandria" args."closer-mop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
-    sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc'';
+    url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
+    sha256 = "0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc";
   };
 
   packageName = "optima";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
index cb05bef0a1c..bc7f59d5fb7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''osicat'';
-  version = ''20200925-git'';
+  baseName = "osicat";
+  version = "20200925-git";
 
   parasites = [ "osicat/tests" ];
 
-  description = ''A lightweight operating system interface'';
+  description = "A lightweight operating system interface";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."rt" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz'';
-    sha256 = ''191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk'';
+    url = "http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz";
+    sha256 = "191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk";
   };
 
   packageName = "osicat";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index bf6216dcadd..952b9cbdf0d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parenscript'';
-  version = ''Parenscript-2.7.1'';
+  baseName = "parenscript";
+  version = "Parenscript-2.7.1";
 
-  description = ''Lisp to JavaScript transpiler'';
+  description = "Lisp to JavaScript transpiler";
 
   deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz'';
-    sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f'';
+    url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz";
+    sha256 = "1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f";
   };
 
   packageName = "parenscript";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
index ea153987c0b..3e59fcfa5f2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parse-declarations-1_dot_0'';
-  version = ''parse-declarations-20101006-darcs'';
+  baseName = "parse-declarations-1_dot_0";
+  version = "parse-declarations-20101006-darcs";
 
-  description = ''Library to parse and rebuild declarations.'';
+  description = "Library to parse and rebuild declarations.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz'';
-    sha256 = ''0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd'';
+    url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz";
+    sha256 = "0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd";
   };
 
   packageName = "parse-declarations-1.0";
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..a4b9488a34a 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,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parse-number'';
-  version = ''v1.7'';
+  baseName = "parse-number";
+  version = "v1.7";
 
   parasites = [ "parse-number/tests" ];
 
-  description = ''Number parsing library'';
+  description = "Number parsing library";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz'';
-    sha256 = ''11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha'';
+    url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz";
+    sha256 = "11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha";
   };
 
   packageName = "parse-number";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
index 5105ec99235..391f04bd767 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parser-combinators'';
-  version = ''cl-20131111-git'';
+  baseName = "parser-combinators";
+  version = "cl-20131111-git";
 
-  description = ''An implementation of parser combinators for Common Lisp'';
+  description = "An implementation of parser combinators for Common Lisp";
 
   deps = [ args."alexandria" args."iterate" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz'';
-    sha256 = ''0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds'';
+    url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz";
+    sha256 = "0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds";
   };
 
   packageName = "parser-combinators";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
index ee6532261c0..d438d4b157b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''parser_dot_common-rules'';
-  version = ''20200715-git'';
+  baseName = "parser_dot_common-rules";
+  version = "20200715-git";
 
   parasites = [ "parser.common-rules/test" ];
 
-  description = ''Provides common parsing rules that are useful in many grammars.'';
+  description = "Provides common parsing rules that are useful in many grammars.";
 
   deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz'';
-    sha256 = ''17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy'';
+    url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz";
+    sha256 = "17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy";
   };
 
   packageName = "parser.common-rules";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index fe9ccae2886..a60f3f377b5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''pcall-queue'';
-  version = ''pcall-0.3'';
+  baseName = "pcall-queue";
+  version = "pcall-0.3";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
-    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+    url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
+    sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y";
   };
 
   packageName = "pcall-queue";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 99e9517e50e..6b3ef96ca1c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''pcall'';
-  version = ''0.3'';
+  baseName = "pcall";
+  version = "0.3";
 
   parasites = [ "pcall-tests" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
-    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+    url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
+    sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y";
   };
 
   packageName = "pcall";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 5490b882c81..a82c9c54c63 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''plump'';
-  version = ''20200427-git'';
+  baseName = "plump";
+  version = "20200427-git";
 
-  description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
+  description = "An XML / XHTML / HTML parser that aims to be as lenient as possible.";
 
   deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz'';
-    sha256 = ''0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic'';
+    url = "http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz";
+    sha256 = "0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic";
   };
 
   packageName = "plump";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
index 7dc27566bca..32345ee367a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''postmodern'';
-  version = ''20201016-git'';
+  baseName = "postmodern";
+  version = "20201016-git";
 
   parasites = [ "postmodern/tests" ];
 
-  description = ''PostgreSQL programming API'';
+  description = "PostgreSQL programming API";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
-    sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+    url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
+    sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
   };
 
   packageName = "postmodern";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index d9146cede10..8cb24f674fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''proc-parse'';
-  version = ''20190813-git'';
+  baseName = "proc-parse";
+  version = "20190813-git";
 
-  description = ''Procedural vector parser'';
+  description = "Procedural vector parser";
 
   deps = [ args."alexandria" args."babel" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz'';
-    sha256 = ''126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j'';
+    url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz";
+    sha256 = "126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j";
   };
 
   packageName = "proc-parse";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
index 21babe8f015..379fbbbe9ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''prove-asdf'';
-  version = ''prove-20200218-git'';
+  baseName = "prove-asdf";
+  version = "prove-20200218-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
-    sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
+    url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+    sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
   };
 
   packageName = "prove-asdf";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index c3aa1dcaafe..9bb12d3e3c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''prove'';
-  version = ''20200218-git'';
+  baseName = "prove";
+  version = "20200218-git";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
-    sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
+    url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
+    sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
   };
 
   packageName = "prove";
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..fef37625dd0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''ptester'';
-  version = ''20160929-git'';
+  baseName = "ptester";
+  version = "20160929-git";
 
-  description = ''Portable test harness package'';
+  description = "Portable test harness package";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz'';
-    sha256 = ''04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz'';
+    url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz";
+    sha256 = "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz";
   };
 
   packageName = "ptester";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index e45802c194d..b349fccd6d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''puri'';
-  version = ''20201016-git'';
+  baseName = "puri";
+  version = "20201016-git";
 
   parasites = [ "puri/test" ];
 
-  description = ''Portable Universal Resource Indentifier Library'';
+  description = "Portable Universal Resource Indentifier Library";
 
   deps = [ args."ptester" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz'';
-    sha256 = ''16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx'';
+    url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz";
+    sha256 = "16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx";
   };
 
   packageName = "puri";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix
index ae810d34790..ff6cdb460e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''pythonic-string-reader'';
-  version = ''20180711-git'';
+  baseName = "pythonic-string-reader";
+  version = "20180711-git";
 
   description = ''A simple and unintrusive read table modification that allows for
 simple string literal definition that doesn't require escaping characters.'';
@@ -9,8 +9,8 @@ simple string literal definition that doesn't require escaping characters.'';
   deps = [ args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz'';
-    sha256 = ''0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx'';
+    url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz";
+    sha256 = "0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx";
   };
 
   packageName = "pythonic-string-reader";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 06957e45f81..1cac12f8600 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''query-fs'';
-  version = ''20200610-git'';
+  baseName = "query-fs";
+  version = "20200610-git";
 
-  description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
+  description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz'';
-    sha256 = ''1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413'';
+    url = "http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz";
+    sha256 = "1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413";
   };
 
   packageName = "query-fs";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 1972f6b8d4a..a38d024ea88 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''quri'';
-  version = ''20200610-git'';
+  baseName = "quri";
+  version = "20200610-git";
 
-  description = ''Yet another URI library for Common Lisp'';
+  description = "Yet another URI library for Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz'';
-    sha256 = ''1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6'';
+    url = "http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz";
+    sha256 = "1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6";
   };
 
   packageName = "quri";
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 25d535176a6..bc94b7fe3de 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''rfc2388'';
-  version = ''20180831-git'';
+  baseName = "rfc2388";
+  version = "20180831-git";
 
-  description = ''Implementation of RFC 2388'';
+  description = "Implementation of RFC 2388";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz'';
-    sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33'';
+    url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz";
+    sha256 = "1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33";
   };
 
   packageName = "rfc2388";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
index b3fc3b0cd2d..91e94b2cc73 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''rove'';
-  version = ''20200325-git'';
+  baseName = "rove";
+  version = "20200325-git";
 
-  description = ''Yet another testing framework intended to be a successor of Prove'';
+  description = "Yet another testing framework intended to be a successor of Prove";
 
   deps = [ args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz'';
-    sha256 = ''0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5'';
+    url = "http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz";
+    sha256 = "0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5";
   };
 
   packageName = "rove";
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..7a53315daf6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''rt'';
-  version = ''20101006-git'';
+  baseName = "rt";
+  version = "20101006-git";
 
-  description = ''MIT Regression Tester'';
+  description = "MIT Regression Tester";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz'';
-    sha256 = ''1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v'';
+    url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz";
+    sha256 = "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v";
   };
 
   packageName = "rt";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
index 1f896dc4158..d4397b82217 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''s-sql'';
-  version = ''postmodern-20201016-git'';
+  baseName = "s-sql";
+  version = "postmodern-20201016-git";
 
   parasites = [ "s-sql/tests" ];
 
-  description = ''Lispy DSL for SQL'';
+  description = "Lispy DSL for SQL";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
-    sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+    url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
+    sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
   };
 
   packageName = "s-sql";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
index b35f44067d3..3d9e001dde4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''s-sysdeps'';
-  version = ''20200427-git'';
+  baseName = "s-sysdeps";
+  version = "20200427-git";
 
-  description = ''An abstraction layer over platform dependent functionality'';
+  description = "An abstraction layer over platform dependent functionality";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" args."usocket-server" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz'';
-    sha256 = ''04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy'';
+    url = "http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz";
+    sha256 = "04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy";
   };
 
   packageName = "s-sysdeps";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
index ec12dde5223..08bd208a89f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''s-xml'';
-  version = ''20150608-git'';
+  baseName = "s-xml";
+  version = "20150608-git";
 
   parasites = [ "s-xml.examples" "s-xml.test" ];
 
-  description = ''Simple Common Lisp XML Parser'';
+  description = "Simple Common Lisp XML Parser";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz'';
-    sha256 = ''0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq'';
+    url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
+    sha256 = "0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq";
   };
 
   packageName = "s-xml";
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..f5f294cfdbb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''salza2'';
-  version = ''2.0.9'';
+  baseName = "salza2";
+  version = "2.0.9";
 
   description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP
   data formats'';
@@ -9,8 +9,8 @@ rec {
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz'';
-    sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va'';
+    url = "http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz";
+    sha256 = "1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va";
   };
 
   packageName = "salza2";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
index 85d85463c3d..143a8fad1df 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''serapeum'';
-  version = ''20201016-git'';
+  baseName = "serapeum";
+  version = "20201016-git";
 
-  description = ''Utilities beyond Alexandria.'';
+  description = "Utilities beyond Alexandria.";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz'';
-    sha256 = ''0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq'';
+    url = "http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz";
+    sha256 = "0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq";
   };
 
   packageName = "serapeum";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
index 1f2759cf388..31f818a8e69 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''simple-date-time'';
-  version = ''20160421-git'';
+  baseName = "simple-date-time";
+  version = "20160421-git";
 
-  description = ''date and time library for common lisp'';
+  description = "date and time library for common lisp";
 
   deps = [ args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz'';
-    sha256 = ''1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h'';
+    url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz";
+    sha256 = "1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h";
   };
 
   packageName = "simple-date-time";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 55671ce1336..c4bae5608ae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''simple-date'';
-  version = ''postmodern-20201016-git'';
+  baseName = "simple-date";
+  version = "postmodern-20201016-git";
 
   parasites = [ "simple-date/tests" ];
 
-  description = ''Simple date library that can be used with postmodern'';
+  description = "Simple date library that can be used with postmodern";
 
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
-    sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+    url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
+    sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
   };
 
   packageName = "simple-date";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix
index 55d35ba8c0f..596e509608a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''simple-tasks'';
-  version = ''20190710-git'';
+  baseName = "simple-tasks";
+  version = "20190710-git";
 
-  description = ''A very simple task scheduling framework.'';
+  description = "A very simple task scheduling framework.";
 
   deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz'';
-    sha256 = ''12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3'';
+    url = "http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz";
+    sha256 = "12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3";
   };
 
   packageName = "simple-tasks";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 63adab55741..18d669225a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''smart-buffer'';
-  version = ''20160628-git'';
+  baseName = "smart-buffer";
+  version = "20160628-git";
 
-  description = ''Smart octets buffer'';
+  description = "Smart octets buffer";
 
   deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
-    sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s'';
+    url = "http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz";
+    sha256 = "1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s";
   };
 
   packageName = "smart-buffer";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index a22076facd3..3971d410441 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''split-sequence'';
-  version = ''v2.0.0'';
+  baseName = "split-sequence";
+  version = "v2.0.0";
 
   parasites = [ "split-sequence/tests" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz'';
-    sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba'';
+    url = "http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz";
+    sha256 = "09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba";
   };
 
   packageName = "split-sequence";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index ac04ba80a0d..145156be45d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''sqlite'';
-  version = ''cl-20190813-git'';
+  baseName = "sqlite";
+  version = "cl-20190813-git";
 
-  description = ''CL-SQLITE package is an interface to the SQLite embedded relational database engine.'';
+  description = "CL-SQLITE package is an interface to the SQLite embedded relational database engine.";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz'';
-    sha256 = ''07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk'';
+    url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz";
+    sha256 = "07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk";
   };
 
   packageName = "sqlite";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 7a84f077711..cf1f1655a36 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''static-vectors'';
-  version = ''v1.8.6'';
+  baseName = "static-vectors";
+  version = "v1.8.6";
 
   parasites = [ "static-vectors/test" ];
 
-  description = ''Create vectors allocated in static memory.'';
+  description = "Create vectors allocated in static memory.";
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz'';
-    sha256 = ''0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc'';
+    url = "http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz";
+    sha256 = "0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc";
   };
 
   packageName = "static-vectors";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
index df63a5c9836..a4a688e1243 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''stefil'';
-  version = ''20181210-git'';
+  baseName = "stefil";
+  version = "20181210-git";
 
   parasites = [ "stefil-test" ];
 
-  description = ''Stefil - Simple Test Framework In Lisp'';
+  description = "Stefil - Simple Test Framework In Lisp";
 
   deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz'';
-    sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g'';
+    url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz";
+    sha256 = "10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g";
   };
 
   packageName = "stefil";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
index 1109c9da04c..5fff3b8c568 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''str'';
-  version = ''cl-20200925-git'';
+  baseName = "str";
+  version = "cl-20200925-git";
 
-  description = ''Modern, consistent and terse Common Lisp string manipulation library.'';
+  description = "Modern, consistent and terse Common Lisp string manipulation library.";
 
   deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz'';
-    sha256 = ''06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn'';
+    url = "http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz";
+    sha256 = "06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn";
   };
 
   packageName = "str";
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 17a56c09b7e..616d3aa88b6 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''string-case'';
-  version = ''20180711-git'';
+  baseName = "string-case";
+  version = "20180711-git";
 
-  description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality'';
+  description = "string-case is a macro that generates specialised decision trees to dispatch on string equality";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz'';
-    sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z'';
+    url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz";
+    sha256 = "1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z";
   };
 
   packageName = "string-case";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 2ad15d1bd13..fe13a7d8c17 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''stumpwm'';
-  version = ''20201016-git'';
+  baseName = "stumpwm";
+  version = "20201016-git";
 
-  description = ''A tiling, keyboard driven window manager'';
+  description = "A tiling, keyboard driven window manager";
 
   deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz'';
-    sha256 = ''06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2'';
+    url = "http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz";
+    sha256 = "06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2";
   };
 
   packageName = "stumpwm";
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 69deb9044c3..e2f1ba6bd26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''swank'';
-  version = ''slime-v2.26'';
+  baseName = "swank";
+  version = "slime-v2.26";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz'';
-    sha256 = ''0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc'';
+    url = "http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz";
+    sha256 = "0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc";
   };
 
   packageName = "swank";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index de11d48c934..7c19a271354 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''swap-bytes'';
-  version = ''v1.2'';
+  baseName = "swap-bytes";
+  version = "v1.2";
 
   parasites = [ "swap-bytes/test" ];
 
-  description = ''Optimized byte-swapping primitives.'';
+  description = "Optimized byte-swapping primitives.";
 
   deps = [ args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz'';
-    sha256 = ''05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8'';
+    url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz";
+    sha256 = "05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8";
   };
 
   packageName = "swap-bytes";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
index 4bae3cc1cee..30a4a0bcbb0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''symbol-munger'';
-  version = ''20150407-git'';
+  baseName = "symbol-munger";
+  version = "20150407-git";
 
   description = ''Functions to convert between the spacing and
   capitalization conventions of various environments'';
@@ -9,8 +9,8 @@ rec {
   deps = [ args."alexandria" args."iterate" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz'';
-    sha256 = ''0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6'';
+    url = "http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz";
+    sha256 = "0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6";
   };
 
   packageName = "symbol-munger";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
index 141937219cd..bd318dcad1f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia'';
-  version = ''20200925-git'';
+  baseName = "trivia";
+  version = "20200925-git";
 
-  description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+  description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase";
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
index 6b5e161a214..3f66d67eac3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_balland2006'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_balland2006";
+  version = "trivia-20200925-git";
 
-  description = ''Optimizer for Trivia based on (Balland 2006)'';
+  description = "Optimizer for Trivia based on (Balland 2006)";
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.balland2006";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
index 1c883c07ab0..d6885e3f500 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_level0'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_level0";
+  version = "trivia-20200925-git";
 
-  description = ''Bootstrapping Pattern Matching Library for implementing Trivia'';
+  description = "Bootstrapping Pattern Matching Library for implementing Trivia";
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.level0";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
index 1e9394d6447..d208c06e8b2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_level1'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_level1";
+  version = "trivia-20200925-git";
 
-  description = ''Core patterns of Trivia'';
+  description = "Core patterns of Trivia";
 
   deps = [ args."alexandria" args."trivia_dot_level0" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.level1";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
index 75ee2bd8ee7..c6ce58bceb7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_level2'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_level2";
+  version = "trivia-20200925-git";
 
-  description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+  description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase";
 
   deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.level2";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
index 07ad7a56c2e..1dd17765257 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_quasiquote'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_quasiquote";
+  version = "trivia-20200925-git";
 
-  description = ''fare-quasiquote extension for trivia'';
+  description = "fare-quasiquote extension for trivia";
 
   deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.quasiquote";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
index e2b8add6dfc..ef84229d7a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivia_dot_trivial'';
-  version = ''trivia-20200925-git'';
+  baseName = "trivia_dot_trivial";
+  version = "trivia-20200925-git";
 
   description = ''Base level system of Trivia with a trivial optimizer.
  Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz'';
-    sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z'';
+    url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
+    sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
   };
 
   packageName = "trivia.trivial";
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 2d2bc4110dc..f095ecc223b 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-backtrace'';
-  version = ''20200610-git'';
+  baseName = "trivial-backtrace";
+  version = "20200610-git";
 
-  description = ''trivial-backtrace'';
+  description = "trivial-backtrace";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz'';
-    sha256 = ''0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks'';
+    url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz";
+    sha256 = "0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks";
   };
 
   packageName = "trivial-backtrace";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
index 3e21ceab87d..c72e79dac51 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-clipboard'';
-  version = ''20200925-git'';
+  baseName = "trivial-clipboard";
+  version = "20200925-git";
 
-  description = ''trivial-clipboard let access system clipboard.'';
+  description = "trivial-clipboard let access system clipboard.";
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz'';
-    sha256 = ''1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc'';
+    url = "http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz";
+    sha256 = "1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc";
   };
 
   packageName = "trivial-clipboard";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
index 278ad5b0ac4..a73c24e9f5e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-cltl2'';
-  version = ''20200325-git'';
+  baseName = "trivial-cltl2";
+  version = "20200325-git";
 
-  description = ''Compatibility package exporting CLtL2 functionality'';
+  description = "Compatibility package exporting CLtL2 functionality";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz'';
-    sha256 = ''0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys'';
+    url = "http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz";
+    sha256 = "0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys";
   };
 
   packageName = "trivial-cltl2";
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 53669a4675b..5988055841c 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-features'';
-  version = ''20200715-git'';
+  baseName = "trivial-features";
+  version = "20200715-git";
 
-  description = ''Ensures consistent *FEATURES* across multiple CLs.'';
+  description = "Ensures consistent *FEATURES* across multiple CLs.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz'';
-    sha256 = ''0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2'';
+    url = "http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz";
+    sha256 = "0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2";
   };
 
   packageName = "trivial-features";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
index 892e1d49d50..a06eda6ff18 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-file-size'';
-  version = ''20200427-git'';
+  baseName = "trivial-file-size";
+  version = "20200427-git";
 
   parasites = [ "trivial-file-size/tests" ];
 
-  description = ''Stat a file's size.'';
+  description = "Stat a file's size.";
 
   deps = [ args."fiveam" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz'';
-    sha256 = ''1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa'';
+    url = "http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz";
+    sha256 = "1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa";
   };
 
   packageName = "trivial-file-size";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index ce1f75522aa..7804dc8b9ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-garbage'';
-  version = ''20200925-git'';
+  baseName = "trivial-garbage";
+  version = "20200925-git";
 
   parasites = [ "trivial-garbage/tests" ];
 
-  description = ''Portable finalizers, weak hash-tables and weak pointers.'';
+  description = "Portable finalizers, weak hash-tables and weak pointers.";
 
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz'';
-    sha256 = ''00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83'';
+    url = "http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz";
+    sha256 = "00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83";
   };
 
   packageName = "trivial-garbage";
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 acefb692184..2b763b0480d 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-gray-streams'';
-  version = ''20200925-git'';
+  baseName = "trivial-gray-streams";
+  version = "20200925-git";
 
-  description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
+  description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz'';
-    sha256 = ''1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b'';
+    url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz";
+    sha256 = "1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b";
   };
 
   packageName = "trivial-gray-streams";
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 de16d810824..42e09023af3 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-indent'';
-  version = ''20191007-git'';
+  baseName = "trivial-indent";
+  version = "20191007-git";
 
-  description = ''A very simple library to allow indentation hints for SWANK.'';
+  description = "A very simple library to allow indentation hints for SWANK.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz'';
-    sha256 = ''0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv'';
+    url = "http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz";
+    sha256 = "0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv";
   };
 
   packageName = "trivial-indent";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
index 473a41063e7..b4164949203 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-macroexpand-all'';
-  version = ''20171023-git'';
+  baseName = "trivial-macroexpand-all";
+  version = "20171023-git";
 
-  description = ''Call each implementation's macroexpand-all equivalent'';
+  description = "Call each implementation's macroexpand-all equivalent";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz'';
-    sha256 = ''0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm'';
+    url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz";
+    sha256 = "0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm";
   };
 
   packageName = "trivial-macroexpand-all";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix
index dc0de9da624..de53bf5bd05 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-main-thread'';
-  version = ''20190710-git'';
+  baseName = "trivial-main-thread";
+  version = "20190710-git";
 
-  description = ''Compatibility library to run things in the main thread.'';
+  description = "Compatibility library to run things in the main thread.";
 
   deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" args."simple-tasks" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz'';
-    sha256 = ''1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h'';
+    url = "http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz";
+    sha256 = "1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h";
   };
 
   packageName = "trivial-main-thread";
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 2e2888444e5..36c6e31cc8d 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-mimes'';
-  version = ''20200715-git'';
+  baseName = "trivial-mimes";
+  version = "20200715-git";
 
-  description = ''Tiny library to detect mime types in files.'';
+  description = "Tiny library to detect mime types in files.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz'';
-    sha256 = ''10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1'';
+    url = "http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz";
+    sha256 = "10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1";
   };
 
   packageName = "trivial-mimes";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix
index 9cd37f80723..78dcc5163b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-package-local-nicknames'';
-  version = ''20200610-git'';
+  baseName = "trivial-package-local-nicknames";
+  version = "20200610-git";
 
-  description = ''Portability library for package-local nicknames'';
+  description = "Portability library for package-local nicknames";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz'';
-    sha256 = ''1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5'';
+    url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz";
+    sha256 = "1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5";
   };
 
   packageName = "trivial-package-local-nicknames";
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..83785140dbd 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-types'';
-  version = ''20120407-git'';
+  baseName = "trivial-types";
+  version = "20120407-git";
 
-  description = ''Trivial type definitions'';
+  description = "Trivial type definitions";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz'';
-    sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx'';
+    url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz";
+    sha256 = "0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx";
   };
 
   packageName = "trivial-types";
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 e01eac48a2d..c38ca16d2ff 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,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''trivial-utf-8'';
-  version = ''20200925-git'';
+  baseName = "trivial-utf-8";
+  version = "20200925-git";
 
   parasites = [ "trivial-utf-8/doc" "trivial-utf-8/tests" ];
 
-  description = ''A small library for doing UTF-8-based input and output.'';
+  description = "A small library for doing UTF-8-based input and output.";
 
   deps = [ args."mgl-pax" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz'';
-    sha256 = ''06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b'';
+    url = "http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz";
+    sha256 = "06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b";
   };
 
   packageName = "trivial-utf-8";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
index e76be59540b..bc08f1683de 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''type-i'';
-  version = ''20191227-git'';
+  baseName = "type-i";
+  version = "20191227-git";
 
-  description = ''Type Inference Utility on Fundamentally 1-arg Predicates'';
+  description = "Type Inference Utility on Fundamentally 1-arg Predicates";
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz'';
-    sha256 = ''0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5'';
+    url = "http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz";
+    sha256 = "0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5";
   };
 
   packageName = "type-i";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
index a2980a9d40e..35754246347 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''uax-15'';
-  version = ''20200325-git'';
+  baseName = "uax-15";
+  version = "20200325-git";
 
   parasites = [ "uax-15/tests" ];
 
-  description = ''Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)'';
+  description = "Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)";
 
   deps = [ args."cl-ppcre" args."fiveam" args."split-sequence" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz'';
-    sha256 = ''0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc'';
+    url = "http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz";
+    sha256 = "0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc";
   };
 
   packageName = "uax-15";
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..2c36113658a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''uffi'';
-  version = ''20180228-git'';
+  baseName = "uffi";
+  version = "20180228-git";
 
-  description = ''Universal Foreign Function Library for Common Lisp'';
+  description = "Universal Foreign Function Library for Common Lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz'';
-    sha256 = ''1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479'';
+    url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz";
+    sha256 = "1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479";
   };
 
   packageName = "uffi";
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 ab96b032257..b5a77d6ea34 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''uiop'';
-  version = ''3.3.4'';
+  baseName = "uiop";
+  version = "3.3.4";
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz'';
-    sha256 = ''0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav'';
+    url = "http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz";
+    sha256 = "0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav";
   };
 
   packageName = "uiop";
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..8f54a89416e 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''unit-test'';
-  version = ''20120520-git'';
+  baseName = "unit-test";
+  version = "20120520-git";
 
-  description = ''unit-testing framework for common lisp'';
+  description = "unit-testing framework for common lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz'';
-    sha256 = ''1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l'';
+    url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz";
+    sha256 = "1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l";
   };
 
   packageName = "unit-test";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
index 7243d5a17ed..250ef24f9ad 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''unix-options'';
-  version = ''20151031-git'';
+  baseName = "unix-options";
+  version = "20151031-git";
 
-  description = ''Easy to use command line option parser'';
+  description = "Easy to use command line option parser";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz'';
-    sha256 = ''0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5'';
+    url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz";
+    sha256 = "0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5";
   };
 
   packageName = "unix-options";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
index 8475b8e4ffd..b7af624f7a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''unix-opts'';
-  version = ''20200925-git'';
+  baseName = "unix-opts";
+  version = "20200925-git";
 
   parasites = [ "unix-opts/tests" ];
 
-  description = ''minimalistic parser of command line arguments'';
+  description = "minimalistic parser of command line arguments";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz'';
-    sha256 = ''0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35'';
+    url = "http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz";
+    sha256 = "0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35";
   };
 
   packageName = "unix-opts";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix
index 04a09a8ab40..977ee934c90 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''usocket-server'';
-  version = ''usocket-0.8.3'';
+  baseName = "usocket-server";
+  version = "usocket-0.8.3";
 
-  description = ''Universal socket library for Common Lisp (server side)'';
+  description = "Universal socket library for Common Lisp (server side)";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz'';
-    sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7'';
+    url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz";
+    sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7";
   };
 
   packageName = "usocket-server";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 6b75384ea10..4dbf781f968 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''usocket'';
-  version = ''0.8.3'';
+  baseName = "usocket";
+  version = "0.8.3";
 
-  description = ''Universal socket library for Common Lisp'';
+  description = "Universal socket library for Common Lisp";
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz'';
-    sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7'';
+    url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz";
+    sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7";
   };
 
   packageName = "usocket";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
index b672d0c2ec5..5b992620ecd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''utilities_dot_print-items'';
-  version = ''20190813-git'';
+  baseName = "utilities_dot_print-items";
+  version = "20190813-git";
 
   parasites = [ "utilities.print-items/test" ];
 
-  description = ''A protocol for flexible and composable printing.'';
+  description = "A protocol for flexible and composable printing.";
 
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz'';
-    sha256 = ''12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2'';
+    url = "http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz";
+    sha256 = "12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2";
   };
 
   packageName = "utilities.print-items";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
index 80ff6d9ff76..2f2345fe0be 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''utilities_dot_print-tree'';
-  version = ''20200325-git'';
+  baseName = "utilities_dot_print-tree";
+  version = "20200325-git";
 
   parasites = [ "utilities.print-tree/test" ];
 
-  description = ''This system provides simple facilities for printing tree structures.'';
+  description = "This system provides simple facilities for printing tree structures.";
 
   deps = [ args."alexandria" args."fiveam" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz'';
-    sha256 = ''1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww'';
+    url = "http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz";
+    sha256 = "1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww";
   };
 
   packageName = "utilities.print-tree";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
index 43ae799961d..a64d913d1d9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''uuid'';
-  version = ''20200715-git'';
+  baseName = "uuid";
+  version = "20200715-git";
 
-  description = ''UUID Generation'';
+  description = "UUID Generation";
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz'';
-    sha256 = ''1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0'';
+    url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz";
+    sha256 = "1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0";
   };
 
   packageName = "uuid";
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..401466e8a59 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''vom'';
-  version = ''20160825-git'';
+  baseName = "vom";
+  version = "20160825-git";
 
-  description = ''A tiny logging utility.'';
+  description = "A tiny logging utility.";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz'';
-    sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93'';
+    url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz";
+    sha256 = "0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93";
   };
 
   packageName = "vom";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 78c2e30d7ee..e4ddb59c398 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''woo'';
-  version = ''20200427-git'';
+  baseName = "woo";
+  version = "20200427-git";
 
-  description = ''An asynchronous HTTP server written in Common Lisp'';
+  description = "An asynchronous HTTP server written in Common Lisp";
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz'';
-    sha256 = ''1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29'';
+    url = "http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz";
+    sha256 = "1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29";
   };
 
   packageName = "woo";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 257ed57df4e..b28c751fdd4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''wookie'';
-  version = ''20191130-git'';
+  baseName = "wookie";
+  version = "20191130-git";
 
-  description = ''An evented webserver for Common Lisp.'';
+  description = "An evented webserver for Common Lisp.";
 
   deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz'';
-    sha256 = ''13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2'';
+    url = "http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz";
+    sha256 = "13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2";
   };
 
   packageName = "wookie";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 5a1b9039425..5130b81c91a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xembed'';
-  version = ''clx-20191130-git'';
+  baseName = "xembed";
+  version = "clx-20191130-git";
 
-  description = ''An implementation of the XEMBED protocol that integrates with CLX.'';
+  description = "An implementation of the XEMBED protocol that integrates with CLX.";
 
   deps = [ args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz'';
-    sha256 = ''1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd'';
+    url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz";
+    sha256 = "1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd";
   };
 
   packageName = "xembed";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
index 4bfc0678f0f..f46bff1f58f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xkeyboard'';
-  version = ''clx-20120811-git'';
+  baseName = "xkeyboard";
+  version = "clx-20120811-git";
 
   parasites = [ "xkeyboard-test" ];
 
-  description = ''XKeyboard is X11 extension for clx of the same name.'';
+  description = "XKeyboard is X11 extension for clx of the same name.";
 
   deps = [ args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz'';
-    sha256 = ''11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n'';
+    url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz";
+    sha256 = "11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n";
   };
 
   packageName = "xkeyboard";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
index 35854cd6b96..730b1287ba2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xml_dot_location'';
-  version = ''20200325-git'';
+  baseName = "xml_dot_location";
+  version = "20200325-git";
 
   parasites = [ "xml.location/test" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."alexandria" args."anaphora" args."babel" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-stp" args."iterate" args."let-plus" args."lift" args."more-conditions" args."parse-number" args."puri" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz'';
-    sha256 = ''0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx'';
+    url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz";
+    sha256 = "0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx";
   };
 
   packageName = "xml.location";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index c02e6e24818..e1da47fe37a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xmls'';
-  version = ''3.0.2'';
+  baseName = "xmls";
+  version = "3.0.2";
 
   parasites = [ "xmls/test" "xmls/unit-test" ];
 
-  description = ''System lacks description'';
+  description = "System lacks description";
 
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz'';
-    sha256 = ''1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi'';
+    url = "http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz";
+    sha256 = "1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi";
   };
 
   packageName = "xmls";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index 3e14a5ba9f0..1f062549a0a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xpath'';
-  version = ''plexippus-20190521-git'';
+  baseName = "xpath";
+  version = "plexippus-20190521-git";
 
   parasites = [ "xpath/test" ];
 
-  description = ''An implementation of the XML Path Language (XPath) Version 1.0'';
+  description = "An implementation of the XML Path Language (XPath) Version 1.0";
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz'';
-    sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa'';
+    url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz";
+    sha256 = "15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa";
   };
 
   packageName = "xpath";
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..7d0c52d28a7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''xsubseq'';
-  version = ''20170830-git'';
+  baseName = "xsubseq";
+  version = "20170830-git";
 
   description = ''Efficient way to manage "subseq"s in Common Lisp'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz'';
-    sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml'';
+    url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz";
+    sha256 = "1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml";
   };
 
   packageName = "xsubseq";
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..5ec84290c4d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''yacc'';
-  version = ''cl-20101006-darcs'';
+  baseName = "yacc";
+  version = "cl-20101006-darcs";
 
-  description = ''A LALR(1) parser generator for Common Lisp'';
+  description = "A LALR(1) parser generator for Common Lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz'';
-    sha256 = ''0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7'';
+    url = "http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz";
+    sha256 = "0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7";
   };
 
   packageName = "yacc";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index 9f6ac0a84ca..727bb74e57b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''yason'';
-  version = ''v0.7.8'';
+  baseName = "yason";
+  version = "v0.7.8";
 
-  description = ''JSON parser/encoder'';
+  description = "JSON parser/encoder";
 
   deps = [ args."alexandria" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz'';
-    sha256 = ''11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1'';
+    url = "http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz";
+    sha256 = "11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1";
   };
 
   packageName = "yason";
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..bed825c24b2 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,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''zpb-ttf'';
-  version = ''1.0.3'';
+  baseName = "zpb-ttf";
+  version = "1.0.3";
 
-  description = ''Access TrueType font metrics and outlines from Common Lisp'';
+  description = "Access TrueType font metrics and outlines from Common Lisp";
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz'';
-    sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6'';
+    url = "http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz";
+    sha256 = "1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6";
   };
 
   packageName = "zpb-ttf";
diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix
index ebb5b9b9c25..d90a80c5648 100644
--- a/pkgs/development/ocaml-modules/torch/default.nix
+++ b/pkgs/development/ocaml-modules/torch/default.nix
@@ -46,7 +46,7 @@ buildDunePackage rec {
     stdio
   ];
 
-  preBuild = ''export LIBTORCH=${pytorch.dev}/'';
+  preBuild = "export LIBTORCH=${pytorch.dev}/";
 
   doCheck = !stdenv.isAarch64;
   checkPhase = "dune runtest";
diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix
index 369dc1bc39b..952d583bfd8 100644
--- a/pkgs/development/pure-modules/gl/default.nix
+++ b/pkgs/development/pure-modules/gl/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ];
   makeFlags = [
-    "libdir=${placeholder ''out''}/lib"
-    "prefix=${placeholder ''out''}/"
+    "libdir=${placeholder "out"}/lib"
+    "prefix=${placeholder "out"}/"
   ];
   setupHook = ../generic-setup-hook.sh;
 
diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index 47144fc07aa..a03b051b11d 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   ];
 
   doCheck = true;
-  checkPhase = ''HOME=$TMP nosetests'';
+  checkPhase = "HOME=$TMP nosetests";
 
   meta = with lib; {
     description = "Set of packages that Enthought has found useful in creating a number of applications.";
diff --git a/pkgs/development/python-modules/betacode/default.nix b/pkgs/development/python-modules/betacode/default.nix
index 8bd78fb49d2..79136e479d2 100644
--- a/pkgs/development/python-modules/betacode/default.nix
+++ b/pkgs/development/python-modules/betacode/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "0s84kd9vblbjz61q7zchx64a6hmdqb4lillna5ryh0g9ij76g6r5";
   };
-  preBuild = ''echo > README.rst'';
+  preBuild = "echo > README.rst";
   # setup.py uses a python3 os.path.join
   disabled = !isPy3k;
   propagatedBuildInputs = [ pygtrie ];
diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index 55a12009a15..8c65cca07b2 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     pytest-benchmark
   ];
 
-  checkPhase = ''pytest --benchmark-skip'';
+  checkPhase = "pytest --benchmark-skip";
 
   propagatedBuildInputs = [
     python-dateutil
diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index aabebe1c521..d15185e1447 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
 
-  checkPhase = ''nosetests'';
+  checkPhase = "nosetests";
 
   meta = with lib; {
     description = "Emoji for Python";
diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix
index f38f5d74097..883ff69c6d6 100644
--- a/pkgs/development/python-modules/ftputil/default.nix
+++ b/pkgs/development/python-modules/ftputil/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
           and not test_conditional_upload and not test_conditional_download_with_older_target \
   ''
   # need until https://ftputil.sschwarzer.net/trac/ticket/140#ticket is fixed
-  + lib.optionalString stdenv.isDarwin ''and not test_error_message_reuse''
+  + lib.optionalString stdenv.isDarwin "and not test_error_message_reuse"
   + ''"'';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix
index 6f439f0f69a..f6d327d229d 100644
--- a/pkgs/development/python-modules/inflection/default.nix
+++ b/pkgs/development/python-modules/inflection/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
   # Suppress overly verbose output if tests run successfully
-  checkPhase = ''pytest >/dev/null || pytest'';
+  checkPhase = "pytest >/dev/null || pytest";
 
   meta = {
    homepage = "https://github.com/jpvanhal/inflection";
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 371fd4b8830..7d4f6dd9363 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ];
 
   # Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs
-  checkPhase = ''$out/bin/jenkins-jobs --help'';
+  checkPhase = "$out/bin/jenkins-jobs --help";
 
   meta = with lib; {
     description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index 7c2125c7b77..44ee4597dbe 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -31,7 +31,7 @@ in buildPythonPackage rec {
   '';
 
   # We do not want any wrappers here.
-  postFixup = '''';
+  postFixup = "";
 
   checkPhase = ''
     tests/run-tests
diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix
index 5234723a536..a910bf3245f 100644
--- a/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytestcov mock cmdline ];
   propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ];
-  checkPhase = '' py.test tests/unit '';
+  checkPhase = "py.test tests/unit ";
 
   nativeBuildInputs = [ pytest ];
 
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index 6b875528d1d..22c34b82a5f 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -28,8 +28,7 @@ buildPythonPackage rec {
        else
         ''--replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\""
         '')
-     + ''
-   '';
+     + "";
   # the tests only work with the standard unrar package
   doCheck = useUnrar;
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index 8eb197151a3..a828c57b8c0 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ lua5_3 python ];
 
-  buildPhase = ''${stdenv.shell} make_unix.sh'';
+  buildPhase = "${stdenv.shell} make_unix.sh";
 
-  checkPhase = ''${python.interpreter} scripts/test.py'';
+  checkPhase = "${python.interpreter} scripts/test.py";
 
   installPhase = ''
     mkdir -p "$out/share/bam"
diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix
index 824668055b1..9ece650f0cb 100644
--- a/pkgs/development/tools/go-motion/default.nix
+++ b/pkgs/development/tools/go-motion/default.nix
@@ -9,7 +9,7 @@ buildGoPackage rec {
   rev = "218875ebe23806e7af82f3b5b14bb3355534f679";
 
   goPackagePath = "github.com/fatih/motion";
-  excludedPackages = ''testdata'';
+  excludedPackages = "testdata";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 618ddc7d450..bcd1f56f525 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -21,7 +21,7 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ go-bindata gotools makeWrapper ];
 
-  preBuild = ''go generate ./...'';
+  preBuild = "go generate ./...";
 
   postInstall = ''
     wrapProgram $out/bin/go2nix \
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index 59f17e8acfd..995bd3102cc 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   # standard packages.
   allowGoReference = true;
 
-  excludedPackages = ''internal/suggest/testdata'';
+  excludedPackages = "internal/suggest/testdata";
 
   src = fetchFromGitHub {
     owner = "stamblerre";
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index a50c5969167..9bed4073b2b 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -6,7 +6,7 @@ buildGoPackage rec {
   rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c";
 
   goPackagePath = "github.com/mdempsky/gocode";
-  excludedPackages = ''internal/suggest/testdata'';
+  excludedPackages = "internal/suggest/testdata";
 
   # we must allow references to the original `go` package,
   # because `gocode` needs to dig into $GOROOT to provide completions for the
diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix
index 0fc1dcfbae0..6170cbb4318 100644
--- a/pkgs/development/tools/iaca/2.1.nix
+++ b/pkgs/development/tools/iaca/2.1.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
         --set-rpath $out/lib:"${libPath}" \
         $out/bin/iaca
   '';
-  postFixup = ''wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib'';
+  postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib";
   meta = {
     description = "Intel Architecture Code Analyzer";
     homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/";
diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix
index 0d0f6824ce7..21580957752 100644
--- a/pkgs/development/tools/ineffassign/default.nix
+++ b/pkgs/development/tools/ineffassign/default.nix
@@ -9,7 +9,7 @@ buildGoPackage rec {
   rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
 
   goPackagePath = "github.com/gordonklaus/ineffassign";
-  excludedPackages = ''testdata'';
+  excludedPackages = "testdata";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix
index b7f568f4d2b..4358ee24489 100644
--- a/pkgs/development/tools/interfacer/default.nix
+++ b/pkgs/development/tools/interfacer/default.nix
@@ -9,7 +9,7 @@ buildGoPackage rec {
   rev = "c20040233aedb03da82d460eca6130fcd91c629a";
 
   goPackagePath = "mvdan.cc/interfacer";
-  excludedPackages = ''check/testdata'';
+  excludedPackages = "check/testdata";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index bb14e26bfd9..74073722857 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -8,8 +8,8 @@ let
     name = "bossa-bin2c";
     src = ./bin2c.c;
     dontUnpack = true;
-    buildPhase = ''cc $src -o bin2c'';
-    installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/'';
+    buildPhase = "cc $src -o bin2c";
+    installPhase = "mkdir -p $out/bin; cp bin2c $out/bin/";
   };
 
 in
diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index 1d3a36c5773..4fe93694ab7 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   meta = {
     inherit (s) version;
-    description = ''Common Lisp launcher script'';
+    description = "Common Lisp launcher script";
     license = lib.licenses.llgpl21 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 9f83ca5565f..77f34cca7de 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     inherit version;
-    description = ''A package manager for Lua'';
+    description = "A package manager for Lua";
     license = licenses.mit ;
     maintainers = with maintainers; [raskin teto];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix
index 5e66b974337..6bfcb312923 100644
--- a/pkgs/development/tools/misc/tet/default.nix
+++ b/pkgs/development/tools/misc/tet/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation ({
 
   buildInputs = [ ];
 
-  patchPhase = ''chmod +x configure'';
+  patchPhase = "chmod +x configure";
 
-  configurePhase = ''./configure -t lite'';
+  configurePhase = "./configure -t lite";
 
-  buildPhase = ''cd src; make; cd -'';
+  buildPhase = "cd src; make; cd -";
 
-  installPhase = ''cd src; make install; cd -; cp -vr $PWD $out'';
+  installPhase = "cd src; make install; cd -; cp -vr $PWD $out";
 
   meta = {
     description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program";
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index ea2f27b0e22..e8d4159deee 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -132,7 +132,7 @@ let
               mVal = ''[a-zA-Z0-9\'"_\. ]+'';
               mOp = "in|[!=<>]+";
               e = stripStr exprs.value;
-              m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
+              m = builtins.map stripStr (builtins.match "^(${mVal}) *(${mOp}) *(${mVal})$" e);
               m0 = processVar (builtins.elemAt m 0);
               m2 = processVar (builtins.elemAt m 2);
             in
diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix
index 6b65632bf7d..17e888fee41 100644
--- a/pkgs/development/tools/setupcfg2nix/info.nix
+++ b/pkgs/development/tools/setupcfg2nix/info.nix
@@ -1,7 +1,7 @@
 {
-  pname = ''setupcfg2nix'';
-  version = ''2.0.1'';
+  pname = "setupcfg2nix";
+  version = "2.0.1";
   install_requires = [
-    ''setuptools''
+    "setuptools"
   ];
 }
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index b64776bac3c..76728c5f2d8 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   '';
   meta = {
     inherit (s) version;
-    description = ''Gecko-based programmatically-driven browser'';
+    description = "Gecko-based programmatically-driven browser";
     license = lib.licenses.mpl20 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix
index 3244d7a0c84..68ecaf6479e 100644
--- a/pkgs/development/tools/yj/default.nix
+++ b/pkgs/development/tools/yj/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
 
   meta = with lib; {
-    description = ''Convert YAML <=> TOML <=> JSON <=> HCL'';
+    description = "Convert YAML <=> TOML <=> JSON <=> HCL";
     license = licenses.asl20;
     maintainers = with maintainers; [ Profpatsch ];
     homepage = "https://github.com/sclevine/yj";
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index afa0a22722a..9dad0b84d1e 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = ''A blobby volleyball game'';
+    description = "A blobby volleyball game";
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ raskin ];
diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix
index e0d2fdd8252..5c7cad879d1 100644
--- a/pkgs/games/fairymax/default.nix
+++ b/pkgs/games/fairymax/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     inherit version;
-    description = ''A small chess engine supporting fairy pieces'';
+    description = "A small chess engine supporting fairy pieces";
     longDescription = ''
        A version of micro-Max that reads the piece description
        from a file fmax.ini, so that arbitrary fairy pieces can be
diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix
index 8870fe21ab9..aa93633906f 100644
--- a/pkgs/games/fish-fillets-ng/default.nix
+++ b/pkgs/games/fish-fillets-ng/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     inherit version;
-    description = ''A puzzle game'';
+    description = "A puzzle game";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
index db0c7a61ddb..e95371ec5ea 100644
--- a/pkgs/games/liquidwar/5.nix
+++ b/pkgs/games/liquidwar/5.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-lm" ];
 
   meta = with lib; {
-    description = ''The classic version of a quick tactics game LiquidWar'';
+    description = "The classic version of a quick tactics game LiquidWar";
     maintainers = [ maintainers.raskin ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix
index 6f099a88b2c..b623d7bd539 100644
--- a/pkgs/games/moon-buggy/default.nix
+++ b/pkgs/games/moon-buggy/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = ''A simple character graphics game where you drive some kind of car across the moon's surface'';
+    description = "A simple character graphics game where you drive some kind of car across the moon's surface";
     license = lib.licenses.gpl2;
     maintainers = [lib.maintainers.rybern];
     platforms = lib.platforms.linux;
diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix
index 42424fe9ef4..b3d06a51fd3 100644
--- a/pkgs/games/n2048/default.nix
+++ b/pkgs/games/n2048/default.nix
@@ -19,14 +19,14 @@ stdenv.mkDerivation {
     inherit (s) url sha256;
   };
   makeFlags = [
-    ''DESTDIR=$(out)''
+    "DESTDIR=$(out)"
   ];
   preInstall = ''
     mkdir -p "$out"/{share/man,bin}
   '';
   meta = {
     inherit (s) version;
-    description = ''Console implementation of 2048 game'';
+    description = "Console implementation of 2048 game";
     license = lib.licenses.bsd2;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix
index 60609759559..fd0ebddfc32 100644
--- a/pkgs/games/pingus/default.nix
+++ b/pkgs/games/pingus/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = ''A puzzle game with mechanics similar to Lemmings'';
+    description = "A puzzle game with mechanics similar to Lemmings";
     platforms = lib.platforms.linux;
     maintainers = [lib.maintainers.raskin];
     license = lib.licenses.gpl3;
diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix
index 524559bc6f7..61e2e1c4eb3 100644
--- a/pkgs/games/quantumminigolf/default.nix
+++ b/pkgs/games/quantumminigolf/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   '';
   meta = {
     inherit (s) version;
-    description = ''Quantum mechanics-based minigolf-like game'';
+    description = "Quantum mechanics-based minigolf-like game";
     license = lib.licenses.gpl2 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 23cfa69fce6..90c0f3707cd 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   };
   meta = {
     inherit (s) version;
-    description = ''GUI for chess engines'';
+    description = "GUI for chess engines";
     homepage = "https://www.gnu.org/software/xboard/";
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix
index 8ec625a0b6b..2d9f57d1e73 100644
--- a/pkgs/games/xbomb/default.nix
+++ b/pkgs/games/xbomb/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 libXaw ];
 
   makeFlags = [
-    "INSTDIR=${placeholder ''out''}"
+    "INSTDIR=${placeholder "out"}"
   ];
 
   meta = with lib; {
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix
index 66f329ed0b9..8e603ef53f7 100644
--- a/pkgs/games/xpilot/bloodspilot-client.nix
+++ b/pkgs/games/xpilot/bloodspilot-client.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lX11";
 
   meta = {
-    description = ''A multiplayer space combat game (client part)'';
+    description = "A multiplayer space combat game (client part)";
     homepage = "http://bloodspilot.sf.net/";
     license = lib.licenses.gpl2Plus ;
     maintainers = [lib.maintainers.raskin];
diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix
index c84f5222e68..74c2be586ce 100644
--- a/pkgs/games/xskat/default.nix
+++ b/pkgs/games/xskat/default.nix
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
   installTargets = [ "install" "install.man" ];
 
   meta = with lib; {
-    description = ''Famous german card game'';
+    description = "Famous german card game";
     platforms = platforms.unix;
     license = licenses.free;
-    longDescription = ''Play the german card game Skat against the AI or over IRC.'';
+    longDescription = "Play the german card game Skat against the AI or over IRC.";
     homepage = "http://www.xskat.de/";
   };
 }
diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix
index 309db8908c7..b095d61d987 100644
--- a/pkgs/misc/drivers/xow/default.nix
+++ b/pkgs/misc/drivers/xow/default.nix
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "BUILD=RELEASE"
     "VERSION=${version}"
-    "BINDIR=${placeholder ''out''}/bin"
-    "UDEVDIR=${placeholder ''out''}/lib/udev/rules.d"
-    "MODLDIR=${placeholder ''out''}/lib/modules-load.d"
-    "MODPDIR=${placeholder ''out''}/lib/modprobe.d"
-    "SYSDDIR=${placeholder ''out''}/lib/systemd/system"
+    "BINDIR=${placeholder "out"}/bin"
+    "UDEVDIR=${placeholder "out"}/lib/udev/rules.d"
+    "MODLDIR=${placeholder "out"}/lib/modules-load.d"
+    "MODPDIR=${placeholder "out"}/lib/modprobe.d"
+    "SYSDDIR=${placeholder "out"}/lib/systemd/system"
   ];
 
   postUnpack = ''
diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/misc/emulators/termtekst/default.nix
index 8186aba1ee5..56f56cffad9 100644
--- a/pkgs/misc/emulators/termtekst/default.nix
+++ b/pkgs/misc/emulators/termtekst/default.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     '';
 
   meta = with lib; {
-    description = ''Console NOS Teletekst viewer in Python'';
+    description = "Console NOS Teletekst viewer in Python";
     longDescription = ''
       Small Python app using curses to display Dutch NOS Teletekst on
       the Linux console. The original Teletekst font includes 2x6
diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
index 58ad5866c93..58cbe663c90 100644
--- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
+++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
@@ -18,7 +18,7 @@ writeShellScriptBin "vscodeExts2nix" ''
 
   for line in $(${vscode}/bin/code --list-extensions --show-versions \
     ${lib.optionalString (extensionsToIgnore != []) ''
-      | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)'
+      | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : "${e.publisher}.${e.name}") extensionsToIgnore}\)'
     ''}
   ) ; do
     [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]]
@@ -26,7 +26,7 @@ writeShellScriptBin "vscodeExts2nix" ''
     publisher=''${BASH_REMATCH[1]}
     version=''${BASH_REMATCH[3]}
 
-    extensions="${lib.concatMapStringsSep "." (e : ''${e.publisher}${e.name}@${e.sha256}'') extensions}"
+    extensions="${lib.concatMapStringsSep "." (e : "${e.publisher}${e.name}@${e.sha256}") extensions}"
     reCurrentExt=$publisher$name"@([^.]*)"
     if [[ $extensions =~ $reCurrentExt ]]; then
       sha256=''${BASH_REMATCH[1]}
diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
index e20c631f8c0..39479d7c2f2 100644
--- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
+++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
@@ -18,22 +18,22 @@ let
   mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions;
   mutableExtsPaths = lib.forEach mutExtsDrvs ( e:
   {
-    origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}'';
-    target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}'';
+    origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}";
+    target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}'';
   }
   );
 
   #removed not defined extensions
   rmExtensions =  lib.optionalString (nixExtensions++mutableExtensions != []) ''
     find ${vscodeExtsFolderName} -mindepth 1 -maxdepth 1 ${
-        lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name} '') nixExtensions
+        lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name} ") nixExtensions
         +
-        lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name}-${e.version} '') mutableExtensions
+        lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name}-${e.version} ") mutableExtensions
       } -exec rm -rf {} \;
   '';
   #copy mutable extension out of the nix store
   cpExtensions = ''
-    ${lib.concatMapStringsSep "\n" (e : ''ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/'') nixExtsDrvs}
+    ${lib.concatMapStringsSep "\n" (e : "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/") nixExtsDrvs}
     ${lib.concatMapStringsSep "\n" (ePath : ''
       if [ ! -d ${ePath.target} ]; then
         cp -a ${ePath.origin} ${ePath.target}
@@ -49,6 +49,6 @@ in
       ${cpExtensions}
     fi
     ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${
-      lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }''
+      lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}"
       } "$@"
   ''
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
index ea5786f6a56..a239f6607b1 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./trash.diff ];
 
-  buildPhase = ''make all docs'';
+  buildPhase = "make all docs";
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index ee167b31c96..935b5e65b1f 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -237,7 +237,7 @@ let
     name = "apparmor-kernel-patches-${apparmor-version}";
     src = apparmor-sources;
 
-    phases = ''unpackPhase installPhase'';
+    phases = "unpackPhase installPhase";
 
     installPhase = ''
       mkdir "$out"
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index f3df61c1510..e1b64c0a4b5 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     platforms = platforms.linux;
     maintainers = with maintainers; [ raskin ];
-    description = ''Console system performance monitor'';
+    description = "Console system performance monitor";
 
     longDescription = ''
       Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code.
diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 30f33262bc9..3d26fc3b005 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -49,12 +49,12 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
   meta = {
     inherit (s) version;
-    description = ''An udev fork by Gentoo'';
+    description = "An udev fork by Gentoo";
     license = lib.licenses.gpl2Plus ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
-    homepage = ''https://www.gentoo.org/proj/en/eudev/'';
-    downloadPage = ''http://dev.gentoo.org/~blueness/eudev/'';
+    homepage = "https://www.gentoo.org/proj/en/eudev/";
+    downloadPage = "http://dev.gentoo.org/~blueness/eudev/";
     updateWalker = true;
   };
 }
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index ce3d99b0409..6c0b5117e9d 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
 
   meta = {
     inherit (s) version;
-    description = ''Namespace-based sandboxing tool for Linux'';
+    description = "Namespace-based sandboxing tool for Linux";
     license = lib.licenses.gpl2Plus ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix
index 88b5a308ee7..c2e49399582 100644
--- a/pkgs/os-specific/linux/forktty/default.nix
+++ b/pkgs/os-specific/linux/forktty/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   makeFlags = [ "prefix=$(out)" "manprefix=$(out)/share/" ];
   meta = {
     inherit (s) version;
-    description = ''Tool to detach from controlling TTY and attach to another'';
+    description = "Tool to detach from controlling TTY and attach to another";
     license = lib.licenses.gpl2 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix
index 5bb6a85438d..608ca8e58cc 100644
--- a/pkgs/os-specific/linux/gfxtablet/default.nix
+++ b/pkgs/os-specific/linux/gfxtablet/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1i2m98yypfa9phshlmvjlgw7axfisxmldzrvnbzm5spvv5s4kvvb";
   };
 
-  preBuild = ''cd driver-uinput'';
+  preBuild = "cd driver-uinput";
 
   installPhase = ''
     mkdir -p "$out/bin"
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''Uinput driver for Android GfxTablet tablet-as-input-device app'';
+    description = "Uinput driver for Android GfxTablet tablet-as-input-device app";
     license = lib.licenses.mit ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 90f8df63e3b..cdfc91a6837 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/etc/udev/rules.d"
   '';
 
-  postInstall = ''rmdir $out/dev'';
+  postInstall = "rmdir $out/dev";
 
   meta = with lib; {
     description = "grsecurity RBAC administration and policy analysis utility";
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index 83e06bbe6f3..8cbc8466a91 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "prefix=${placeholder ''out''}"
+    "prefix=${placeholder "out"}"
   ];
 
   hardeningDisable = lib.optional (stdenv.isi686) "stackprotector";
diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix
index 15bd499650c..ff3100cbb22 100644
--- a/pkgs/os-specific/linux/pcmciautils/default.nix
+++ b/pkgs/os-specific/linux/pcmciautils/default.nix
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
     " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */
   ''
   + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "")
-  + (if configOpts == null then "" else ''
-    ln -sf ${configOpts} ./config/config.opts'')
+  + (if configOpts == null then "" else "ln -sf ${configOpts} ./config/config.opts")
   ;
 
   makeFlags = [ "LEX=flex" ];
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index e961e1cf2c9..daebf174faf 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
        -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \
        -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \
       defaults.yaml
-    ${if confFile != "" then ''cat ${confFile} >> defaults.yaml'' else ""}
+    ${if confFile != "" then "cat ${confFile} >> defaults.yaml" else ""}
     mv defaults.yaml $out/conf;
 
     # Link to extra jars
diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix
index eac51beadcb..d03cd1c915a 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/default.nix
+++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   preBuild = "cd fingerd";
 
-  preInstall = '' mkdir -p $out/man/man8 $out/sbin '';
+  preInstall = "mkdir -p $out/man/man8 $out/sbin ";
 
   meta = with lib; {
     platforms = platforms.linux;
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index eb45cb3bfc5..2d4e22ba244 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   # dosen't work. Copying the files manually which can be found
   # in ubuntu -dev -classic, -example packages:
   # maybe some of those files can be removed again
-  installPhase = ''cp -r gen/firebird $out'';
+  installPhase = "cp -r gen/firebird $out";
 
   meta = {
     description = "SQL relational database management system";
diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix
index 3f2792f6498..a357f0291ce 100644
--- a/pkgs/servers/http/apache-modules/mod_ca/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   ];
 
   installFlags = [
-    "INCLUDEDIR=${placeholder ''out''}/include"
-    "LIBEXECDIR=${placeholder ''out''}/modules"
+    "INCLUDEDIR=${placeholder "out"}/include"
+    "LIBEXECDIR=${placeholder "out"}/modules"
   ];
 
   meta = with lib; {
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix
index 1bbaacd5844..fc75003f392 100644
--- a/pkgs/servers/hylafaxplus/default.nix
+++ b/pkgs/servers/hylafaxplus/default.nix
@@ -83,10 +83,10 @@ stdenv.mkDerivation {
     openldap  # optional
     pam  # optional
   ];
-  postPatch = ''. ${postPatch}'';
+  postPatch = ". ${postPatch}";
   dontAddPrefix = true;
-  postInstall = ''. ${postInstall}'';
-  postInstallCheck = ''. ${./post-install-check.sh}'';
+  postInstall = ". ${postInstall}";
+  postInstallCheck = ". ${./post-install-check.sh}";
   meta = {
     description = "enterprise-class system for sending and receiving facsimiles";
     downloadPage = "https://hylafax.sourceforge.io/download.php";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 458bc7ea845..ddd05150806 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -364,42 +364,42 @@ self: super:
     outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny
     preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
     installFlags = [
-      "sdkdir=${placeholder ''out''}/include/xorg"
+      "sdkdir=${placeholder "out"}/include/xorg"
     ];
   });
 
   xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
     installFlags = [
-      "sdkdir=${placeholder ''out''}/include/xorg"
+      "sdkdir=${placeholder "out"}/include/xorg"
     ];
   });
 
   xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: {
     installFlags = [
-      "sdkdir=${placeholder ''out''}/include/xorg"
+      "sdkdir=${placeholder "out"}/include/xorg"
     ];
   });
 
   xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: {
     outputs = [ "out" "dev" ];
     installFlags = [
-      "sdkdir=${placeholder ''dev''}/include/xorg"
+      "sdkdir=${placeholder "dev"}/include/xorg"
     ];
   });
 
   xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
     outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev
     installFlags = [
-      "sdkdir=${placeholder ''out''}/include/xorg"
-      "configdir=${placeholder ''out''}/share/X11/xorg.conf.d"
+      "sdkdir=${placeholder "out"}/include/xorg"
+      "configdir=${placeholder "out"}/share/X11/xorg.conf.d"
     ];
   });
 
   xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: {
     configureFlags = [
-      "--sysconfdir=${placeholder ''out''}/etc"
-      "--with-xorg-conf-dir=${placeholder ''out''}/share/X11/xorg.conf.d"
-      "--with-udev-rules-dir=${placeholder ''out''}/lib/udev/rules.d"
+      "--sysconfdir=${placeholder "out"}/etc"
+      "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
+      "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d"
     ];
 
     meta = attrs.meta // {
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 7022f6b37e3..c10537959d7 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   dontConfigure = true;
 
-  buildPhase = ''sh ./Build.sh -r'';
+  buildPhase = "sh ./Build.sh -r";
 
   installPhase = ''
     install -D -m 755 mksh $out/bin/mksh
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index dbb4a056455..38b168c0e72 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -87,7 +87,7 @@ let inherit (localSystem) system; in
         isClang      = true;
       };
 
-      preHook = ''export NIX_NO_SELF_RPATH=1'';
+      preHook = "export NIX_NO_SELF_RPATH=1";
     };
   })
 
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix
index 797d624323b..b4df0f00342 100644
--- a/pkgs/tools/X11/xmagnify/default.nix
+++ b/pkgs/tools/X11/xmagnify/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh";
   };
 
-  prePatch = ''substituteInPlace ./Makefile --replace /usr $out'';
+  prePatch = "substituteInPlace ./Makefile --replace /usr $out";
 
   buildInputs = [ libX11 xorgproto ];
 
diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix
index 9e7b85f6ef9..758450d3654 100644
--- a/pkgs/tools/X11/xprintidle-ng/default.nix
+++ b/pkgs/tools/X11/xprintidle-ng/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit  version;
-    description = ''A command-line tool to print idle time from libXss'';
+    description = "A command-line tool to print idle time from libXss";
     homepage = "http://taktoa.me/xprintidle-ng/";
     license = lib.licenses.gpl2;
     maintainers = [lib.maintainers.raskin];
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix
index 81cefb01c7f..311f1e42901 100644
--- a/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/pkgs/tools/X11/xwinmosaic/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''X window switcher drawing a colourful grid'';
+    description = "X window switcher drawing a colourful grid";
     license = lib.licenses.bsd2 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index cfd764aa11e..e74637ca25e 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
   '';
 
   installFlags = [
-    "prefix=${placeholder ''out''}"
+    "prefix=${placeholder "out"}"
   ];
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index f8131046df1..58c748fe4e8 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   makefile = "unix/Makefile";
   buildFlags = if stdenv.isCygwin then [ "cygwin" ] else [ "generic" ];
   installFlags = [
-    "prefix=${placeholder ''out''}"
+    "prefix=${placeholder "out"}"
     "INSTALL=cp"
   ];
 
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix
index c5083bbb05a..358e662ca1e 100644
--- a/pkgs/tools/audio/pa-applet/default.nix
+++ b/pkgs/tools/audio/pa-applet/default.nix
@@ -21,8 +21,7 @@ stdenv.mkDerivation {
   # work around a problem related to gtk3 updates
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
-  postInstall = ''
-  '';
+  postInstall = "";
 
   meta = with lib; {
     description = "";
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index 0804b5132c5..a923724419d 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DMYSQL_INCLUDE_DIR=${getDev libmysqlclient}/include/mysql" ];
 
   meta = with lib; {
-    description = ''High-perfomance MySQL backup tool'';
+    description = "High-perfomance MySQL backup tool";
     homepage = "https://github.com/maxbube/mydumper";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index b0e7f9e8f6b..7f8733b9b4e 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = ''A set of tools to optimize deflate-compressed files'';
+    description = "A set of tools to optimize deflate-compressed files";
     license = licenses.gpl3 ;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix
index b55c1a887ff..833dcae8850 100644
--- a/pkgs/tools/compression/pixz/default.nix
+++ b/pkgs/tools/compression/pixz/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    description = ''A parallel compressor/decompressor for xz format'';
+    description = "A parallel compressor/decompressor for xz format";
     license = lib.licenses.bsd2;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix
index f5dbabaf583..8f4e9941029 100644
--- a/pkgs/tools/filesystems/catcli/default.nix
+++ b/pkgs/tools/filesystems/catcli/default.nix
@@ -18,7 +18,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ docopt anytree ];
 
-  postPatch = '' patchShebangs . '';
+  postPatch = "patchShebangs . ";
 
   meta = with lib; {
     description = "The command line catalog tool for your offline data";
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 5145889407e..a1e9fad4540 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
     '';
 
   configureFlags = [
-    ''--localstatedir=/var''
+    "--localstatedir=/var"
     ];
 
   nativeBuildInputs = [ rpcsvc-proto ];
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 8dfdd96dbeb..0dce22b8bbb 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -57,8 +57,7 @@ in rec {
     '';
 
     meta = common.meta // {
-      longDescription = common.meta.longDescription + ''
-        This package provides the servers and libraries.'';
+      longDescription = common.meta.longDescription + "This package provides the servers and libraries.";
     };
   });
 
@@ -93,8 +92,7 @@ in rec {
 
      meta = common.meta // {
        description = common.meta.description + " CLI clients";
-       longDescription = common.meta.longDescription + ''
-         This package provides the CLI clients, called 'icommands'.'';
+       longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'.";
      };
   });
 }
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 727aa1dc56e..9dc2ad4d5f5 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
   buildFlags = [ "all" ];
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   # Install udev rules, but remove lines that set up the udev-acl
diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/tools/graphics/cfdg/src-info-for-default.nix
index 0e2018b6bfd..b84376e9882 100644
--- a/pkgs/tools/graphics/cfdg/src-info-for-default.nix
+++ b/pkgs/tools/graphics/cfdg/src-info-for-default.nix
@@ -1,6 +1,6 @@
 {
   downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page";
   baseName = "cfdg";
-  sourceRegexp = ''.*[.]tgz'';
+  sourceRegexp = ".*[.]tgz";
   versionExtractorSedScript = ''s/[^0-9]*([0-9.]*)[.]tgz/\1/'';
 }
diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix
index 4a4920ec6b9..714cdd656df 100644
--- a/pkgs/tools/graphics/convchain/default.nix
+++ b/pkgs/tools/graphics/convchain/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   buildInputs = [mono];
   meta = {
     inherit version;
-    description = ''Bitmap generation from a single example with convolutions and MCMC'';
+    description = "Bitmap generation from a single example with convolutions and MCMC";
     license = lib.licenses.mit;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index c8e3e8012b1..1d26379c396 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -51,7 +51,7 @@ assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${v
 assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies.";
 
 mkDerivation rec {
-  pname = "gmic-qt${lib.optionalString (variant != "standalone") ''-${variant}''}";
+  pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
   version = "2.7.1";
 
   gmic-community = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix
index 82c0332689b..4f1770be17e 100644
--- a/pkgs/tools/graphics/qrcode/default.nix
+++ b/pkgs/tools/graphics/qrcode/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = ''A small QR-code tool'';
+    description = "A small QR-code tool";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ raskin ];
     platforms = with platforms; linux;
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix
index bfa9bb36ce7..8ca8ecf2c89 100644
--- a/pkgs/tools/graphics/quirc/default.nix
+++ b/pkgs/tools/graphics/quirc/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   makeFlags = [ "PREFIX=$(out)" ];
   meta = {
     inherit (s) version;
-    description = ''A small QR code decoding library'';
+    description = "A small QR code decoding library";
     license = lib.licenses.isc;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix
index e39742d76d0..a076e97d056 100644
--- a/pkgs/tools/graphics/syntex/default.nix
+++ b/pkgs/tools/graphics/syntex/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [mono];
   meta = {
     inherit version;
-    description = ''Texture synthesis from examples'';
+    description = "Texture synthesis from examples";
     license = lib.licenses.mit;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
index 4e84380f959..f761e2bbde6 100644
--- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix
+++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [mono];
   meta = {
     inherit version;
-    description = ''A generator of bitmaps that are locally similar to the input bitmap'';
+    description = "A generator of bitmaps that are locally similar to the input bitmap";
     license = lib.licenses.mit;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix
index c3f03da8bc5..f4eeb50fc03 100644
--- a/pkgs/tools/graphics/zxing/default.nix
+++ b/pkgs/tools/graphics/zxing/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     inherit version;
-    description = ''1D and 2D code reading library'';
+    description = "1D and 2D code reading library";
     license = lib.licenses.asl20;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index 38f746e3cee..f78d52f5b67 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -42,8 +42,8 @@ in stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
-    "SYSCONFDIR=${placeholder ''out''}/etc"
+    "PREFIX=${placeholder "out"}"
+    "SYSCONFDIR=${placeholder "out"}/etc"
     "PYTHON=${python.interpreter}"
   ];
 
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 7374733f542..c555c507d7b 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -101,8 +101,8 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "test_execsdir=${placeholder ''installedTests''}/libexec/installed-tests/ibus"
-    "test_sourcesdir=${placeholder ''installedTests''}/share/installed-tests/ibus"
+    "test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus"
+    "test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus"
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix
index 140e09c010a..af37d7a33c1 100644
--- a/pkgs/tools/misc/ccze/default.nix
+++ b/pkgs/tools/misc/ccze/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoconf ncurses pcre ];
 
-  preConfigure = '' autoheader && autoconf '';
+  preConfigure = "autoheader && autoconf ";
 
   meta = with lib; {
     description = "Fast, modular log colorizer";
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 9b97886682f..8de7cc99336 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = ''Debian package maintenance scripts'';
+    description = "Debian package maintenance scripts";
     license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
     maintainers = with maintainers; [raskin];
     platforms = with platforms; linux;
diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix
index 0445a424a40..fd7c3b23adf 100644
--- a/pkgs/tools/networking/badvpn/default.nix
+++ b/pkgs/tools/networking/badvpn/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   meta = {
     inherit (s) version;
-    description = ''A set of network-related (mostly VPN-related) tools'';
+    description = "A set of network-related (mostly VPN-related) tools";
     license = lib.licenses.bsd3 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix
index e5159fef101..18d72daa009 100644
--- a/pkgs/tools/networking/bgpdump/default.nix
+++ b/pkgs/tools/networking/bgpdump/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://bitbucket.org/ripencc/bgpdump/";
-    description = ''Analyze dump files produced by Zebra/Quagga or MRT'';
+    description = "Analyze dump files produced by Zebra/Quagga or MRT";
     license = lib.licenses.hpnd;
     maintainers = with lib.maintainers; [ lewo ];
     platforms = with lib.platforms; linux;
diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix
index f3ecf7a9702..189f636cd1f 100644
--- a/pkgs/tools/networking/bsd-finger/default.nix
+++ b/pkgs/tools/networking/bsd-finger/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   preBuild = "cd finger";
 
-  preInstall = '' mkdir -p $out/man/man1 $out/bin '';
+  preInstall = "mkdir -p $out/man/man1 $out/bin ";
 
   meta = with lib; {
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix
index e311fef339f..bd31235b6f9 100644
--- a/pkgs/tools/networking/jnettop/default.nix
+++ b/pkgs/tools/networking/jnettop/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  preConfigure = '' autoconf '';
+  preConfigure = "autoconf ";
 
   meta = {
     description = "Network traffic visualizer";
diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix
index dd09d91a203..9856634116e 100644
--- a/pkgs/tools/networking/mailsend/default.nix
+++ b/pkgs/tools/networking/mailsend/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   ];
   meta = {
     inherit (s) version;
-    description = ''CLI email sending tool'';
+    description = "CLI email sending tool";
     license = lib.licenses.bsd3 ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix
index fd36680c992..2ebec34b219 100644
--- a/pkgs/tools/networking/persepolis/default.nix
+++ b/pkgs/tools/networking/persepolis/default.nix
@@ -47,7 +47,7 @@ buildPythonApplication rec {
   # feed args to wrapPythonApp
   makeWrapperArgs = [
     "--prefix PATH : ${lib.makeBinPath [aria libnotify ]}"
-    ''''${qtWrapperArgs[@]}''
+    "\${qtWrapperArgs[@]}"
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 1d2f3ab0fee..ba3c51822e9 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114";
   };
   buildInputs = [ apacheAnt jdk ];
-  PREFIX = ''''${env.out}'';
+  PREFIX = "\${env.out}";
   AXIS2_LIB = "${axis2}/lib";
   AXIS2_WEBAPP = "${axis2}/webapps/axis2";
   DBUS_JAVA_LIB = "${dbus_java}/share/java";
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2437613755d..c980fda3c86 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -126,7 +126,7 @@ common =
         ]
         ++ lib.optional (
             stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system
-        ) ''--with-system=${stdenv.hostPlatform.nix.system}''
+        ) "--with-system=${stdenv.hostPlatform.nix.system}"
            # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
         ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing";
 
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index d19f07595e8..53127173f79 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-appindicator" ];
 
-  preFixup = ''gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)'';
+  preFixup = "gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix
index a2533c1c6a0..7561b1fae98 100644
--- a/pkgs/tools/security/pbis/default.nix
+++ b/pkgs/tools/security/pbis/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     fi
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable"
   '';
-  configureScript = ''../configure'';
+  configureScript = "../configure";
   configureFlags = [
     "CFLAGS=-O"
     "--docdir=${placeholder "prefix"}/share/doc"
diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix
index 23b79af73cd..eb889cfef16 100644
--- a/pkgs/tools/security/tcpcrypt/default.nix
+++ b/pkgs/tools/security/tcpcrypt/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w";
   };
 
-  postUnpack = ''mkdir -vp $sourceRoot/m4'';
+  postUnpack = "mkdir -vp $sourceRoot/m4";
 
   outputs = [ "bin" "dev" "out" ];
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index db3c066c0ba..11a45fbe391 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''The classical Unix `at' job scheduling command'';
+    description = "The classical Unix `at' job scheduling command";
     license = lib.licenses.gpl2Plus;
     homepage = "https://packages.qa.debian.org/at";
     platforms = lib.platforms.linux;
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index 1d315004018..2f0e2c600d0 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   dontDisableStatic = static;
 
   meta = with lib; {
-    description = ''Command-line interface to IPMI-enabled devices'';
+    description = "Command-line interface to IPMI-enabled devices";
     license = licenses.bsd3;
     homepage = "https://sourceforge.net/projects/ipmitool/";
     platforms = platforms.unix;
diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix
index a235ea09d35..a87beb14a84 100644
--- a/pkgs/tools/system/socklog/default.nix
+++ b/pkgs/tools/system/socklog/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     echo "$NIX_CC/bin/cc -s"                    >src/conf-ld
   '';
 
-  buildPhase = ''package/compile'';
+  buildPhase = "package/compile";
 
   installPhase = ''
     mkdir -p $out/bin
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     mv doc/*.html $doc/share/doc/socklog/html/
   '';
 
-  checkPhase = ''package/check'';
+  checkPhase = "package/check";
 
   doCheck = true;
 
diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix
index d0458660c20..9b92635d1d7 100644
--- a/pkgs/tools/system/throttled/default.nix
+++ b/pkgs/tools/system/throttled/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postFixup = ''wrapPythonPrograms'';
+  postFixup = "wrapPythonPrograms";
 
   meta = with lib; {
     description = "Fix for Intel CPU throttling issues";
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index d0fa04aa83f..3f71f8abc5a 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  makeFlags = [ ''prefix=$(out)'' ]
+  makeFlags = [ "prefix=$(out)" ]
     ++ optional gnutlsSupport "CRYPTO=GNUTLS"
     ++ optional opensslSupport "CRYPTO=OPENSSL"
     ++ optional stdenv.isDarwin "SYS=darwin"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ec34213a3..78c500f8897 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23874,7 +23874,7 @@ in
 
   octoprint = callPackage ../applications/misc/octoprint { };
 
-  octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.'';
+  octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set.";
 
   ocrad = callPackage ../applications/graphics/ocrad { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 186eb13a2b7..b87e528d4af 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17986,7 +17986,7 @@ let
       sha256 = "0wfdixpm3p94mnng474l0nh9mjiy8q8hbrbh2af4vwn2hmazr91f";
     };
     buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ];
-    preBuild = ''ls'';
+    preBuild = "ls";
     meta = {
       homepage = "https://github.com/Sereal/Sereal";
       description = "Fast, compact, powerful binary deserialization";
@@ -22930,7 +22930,7 @@ let
     };
     buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ];
     propagatedBuildInputs = [ InlineC ];
-    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
+    patchPhase = "sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm";
     meta = {
       description = "Get the idle time of X11";
     };

From 3e51cd164d21da438c782eaf0c3cd41c5a3898df Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Mon, 26 Oct 2020 22:38:28 +0100
Subject: [PATCH 800/956] libticonv: init at 1.1.5

---
 .../libraries/libticonv/default.nix           | 38 +++++++++++++++++++
 pkgs/misc/emulators/tilem/default.nix         | 15 ++------
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/libraries/libticonv/default.nix

diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/development/libraries/libticonv/default.nix
new file mode 100644
index 00000000000..0c075406dee
--- /dev/null
+++ b/pkgs/development/libraries/libticonv/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, autoreconfHook
+, glib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libticonv";
+  version = "1.1.5";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+  ];
+
+  configureFlags = [
+    "--enable-iconv"
+  ];
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "This library is part of the TiLP framework";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix
index 2e96dc03d14..4948944191b 100644
--- a/pkgs/misc/emulators/tilem/default.nix
+++ b/pkgs/misc/emulators/tilem/default.nix
@@ -11,19 +11,9 @@
 , lzma
 , bzip2
 , gnome2
+, libticonv
 }:
 let
-  libticonv = stdenv.mkDerivation rec {
-    pname = "libticonv";
-    version = "1.1.5";
-    src = fetchurl {
-      url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
-      sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i";
-    };
-    nativeBuildInputs = [ autoreconfHook pkg-config ];
-    buildInputs = [ glib ];
-    configureFlags = [ "--enable-iconv" ];
-  };
   libticables2 = stdenv.mkDerivation rec {
     pname = "libticables2";
     version = "1.3.5";
@@ -58,6 +48,7 @@ let
     buildInputs = [ glib libticonv libarchive lzma bzip2 ];
   };
 in
+
 stdenv.mkDerivation rec {
   pname = "tilem";
   version = "2.0";
@@ -72,7 +63,7 @@ stdenv.mkDerivation rec {
     homepage = "http://lpg.ticalc.org/prj_tilem/";
     description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ siraben ];
+    maintainers = with maintainers; [ siraben luc65r ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c012242c38..a0619bef6df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15270,6 +15270,8 @@ in
 
   libthreadar = callPackage ../development/libraries/libthreadar { };
 
+  libticonv = callPackage ../development/libraries/libticonv { };
+
   libtiff = callPackage ../development/libraries/libtiff { };
 
   libtiger = callPackage ../development/libraries/libtiger { };

From eadb35d09891b6bd01f93d59e801a76c8b21007e Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Mon, 26 Oct 2020 22:42:34 +0100
Subject: [PATCH 801/956] libtifiles2: init at 1.1.7

---
 .../libraries/libtifiles2/default.nix         | 38 +++++++++++++++++++
 pkgs/misc/emulators/tilem/default.nix         | 14 +------
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/libraries/libtifiles2/default.nix

diff --git a/pkgs/development/libraries/libtifiles2/default.nix b/pkgs/development/libraries/libtifiles2/default.nix
new file mode 100644
index 00000000000..874cbc87c87
--- /dev/null
+++ b/pkgs/development/libraries/libtifiles2/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, autoreconfHook
+, glib
+, libarchive
+, libticonv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libtifiles2";
+  version = "1.1.7";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    libarchive
+    libticonv
+  ];
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "This library is part of the TiLP framework";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix
index 4948944191b..678919a0867 100644
--- a/pkgs/misc/emulators/tilem/default.nix
+++ b/pkgs/misc/emulators/tilem/default.nix
@@ -1,17 +1,15 @@
 { stdenv
 , fetchurl
 , lib
-, libarchive
 , autoreconfHook
 , pkg-config
 , glib
 , libusb1
 , darwin
 , acl
-, lzma
-, bzip2
 , gnome2
 , libticonv
+, libtifiles2
 }:
 let
   libticables2 = stdenv.mkDerivation rec {
@@ -37,16 +35,6 @@ let
       ++ lib.optionals stdenv.isLinux [ acl ]
       ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ];
   };
-  libtifiles2 = stdenv.mkDerivation rec {
-    pname = "libtifiles2";
-    version = "1.1.7";
-    src = fetchurl {
-      url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
-      sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils";
-    };
-    nativeBuildInputs = [ autoreconfHook pkg-config ];
-    buildInputs = [ glib libticonv libarchive lzma bzip2 ];
-  };
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0619bef6df..f21e7810eaf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15272,6 +15272,8 @@ in
 
   libticonv = callPackage ../development/libraries/libticonv { };
 
+  libtifiles2 = callPackage ../development/libraries/libtifiles2 { };
+
   libtiff = callPackage ../development/libraries/libtiff { };
 
   libtiger = callPackage ../development/libraries/libtiger { };

From 015414235082f6232794cf42581fdfe9e28d7ec7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 14:00:07 +0100
Subject: [PATCH 802/956] metasploit: 6.0.26 -> 6.0.27

---
 pkgs/tools/security/metasploit/Gemfile      |  2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 12 ++++++------
 pkgs/tools/security/metasploit/default.nix  |  4 ++--
 pkgs/tools/security/metasploit/gemset.nix   | 18 +++++++++---------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 83db469db6e..b7be0d586f0 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.26"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.27"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 8660d72e5d9..3195fbfd430 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48
-  ref: refs/tags/6.0.26
+  revision: 025cd522b2ab698130cf964c8e7ca91b0729e07a
+  ref: refs/tags/6.0.27
   specs:
-    metasploit-framework (6.0.26)
+    metasploit-framework (6.0.27)
       actionpack (~> 5.2.2)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -124,13 +124,13 @@ GEM
     arel-helpers (2.12.0)
       activerecord (>= 3.1.0, < 7)
     aws-eventstream (1.1.0)
-    aws-partitions (1.417.0)
+    aws-partitions (1.418.0)
     aws-sdk-core (3.111.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.220.0)
+    aws-sdk-ec2 (1.221.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iam (1.46.0)
@@ -361,7 +361,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
     ttfunk (1.7.0)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 0d9475ddfa0..bf9d8628cf1 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.0.26";
+  version = "6.0.27";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "sha256-ayW0MsV3TQnta+bP9kNL6m3hFPrn6lbsiAbXw7WOmBA=";
+    sha256 = "sha256-G+Ki0YyuY7XxLegmQhDkR9XQurSWG8K40n+8pwJnvZU=";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index a4ea5ec8c4f..d1dbb26ec28 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -114,10 +114,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1difs2ynpizrq0jdww075camiagkkxncyfb1qi4s19hfsn8xp3j0";
+      sha256 = "0p4w1sxxrpvngw54q2z8dm3plljzc7pysvd2716fd3sf7g8907zr";
       type = "gem";
     };
-    version = "1.417.0";
+    version = "1.418.0";
   };
   aws-sdk-core = {
     groups = ["default"];
@@ -134,10 +134,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x3hw3ld27gxj0mmbaj4dw6aw90kr06mkjfx5wxxb807krp5giza";
+      sha256 = "0mwd98gmnakz9bkn5kqn5wbk5q2iz7hsbd1xi8256f6ppw07wzi3";
       type = "gem";
     };
-    version = "1.220.0";
+    version = "1.221.0";
   };
   aws-sdk-iam = {
     groups = ["default"];
@@ -524,12 +524,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48";
-      sha256 = "044qissw7mq6i3n5dsp7z8af2vga9d1zdkz6dgnhjkbpqlrb89bb";
+      rev = "025cd522b2ab698130cf964c8e7ca91b0729e07a";
+      sha256 = "15dxcw1agg3zsawc46wnnjxd1ma7wh8449p85pqvaqxfik8s5qhv";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.0.26";
+    version = "6.0.27";
   };
   metasploit-model = {
     groups = ["default"];
@@ -1256,10 +1256,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
+      sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   thread_safe = {
     groups = ["default"];

From 87d7a060c29638fdeb229c69091eb52ae3de9d43 Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Mon, 26 Oct 2020 22:45:19 +0100
Subject: [PATCH 803/956] libticables2: init at 1.3.5

---
 .../libraries/libticables2/default.nix        | 64 +++++++++++++++++++
 pkgs/misc/emulators/tilem/default.nix         | 13 +---
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 67 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/libraries/libticables2/default.nix

diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/development/libraries/libticables2/default.nix
new file mode 100644
index 00000000000..f22d7b796e1
--- /dev/null
+++ b/pkgs/development/libraries/libticables2/default.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, autoreconfHook
+, glib
+, libusb1
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libticables2";
+  version = "1.3.5";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libusb1
+    glib
+  ];
+
+  configureFlags = [
+    "--enable-libusb10"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/etc/udev/rules.d
+    cat > $out/etc/udev/rules.d/69-libsane.rules << EOF
+      ACTION!="add", GOTO="libticables_end"
+
+      # serial device (assume TI calculator)
+      KERNEL=="ttyS[0-3]", ENV{ID_PDA}="1"
+      # parallel device (assume TI calculator)
+      SUBSYSTEM=="ppdev", ENV{ID_PDA}="1"
+      # SilverLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e001", ENV{ID_PDA}="1"
+      # TI-84+ DirectLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e003", ENV{ID_PDA}="1"
+      # TI-89 Titanium DirectLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e004", ENV{ID_PDA}="1"
+      # TI-84+ SE DirectLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e008", ENV{ID_PDA}="1"
+      # TI-Nspire DirectLink
+      SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e012", ENV{ID_PDA}="1"
+
+      LABEL="libticables_end"
+    EOF
+  '';
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "This library is part of the TiLP framework";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix
index 678919a0867..fcd37ab24e3 100644
--- a/pkgs/misc/emulators/tilem/default.nix
+++ b/pkgs/misc/emulators/tilem/default.nix
@@ -4,25 +4,14 @@
 , autoreconfHook
 , pkg-config
 , glib
-, libusb1
 , darwin
 , acl
 , gnome2
 , libticonv
 , libtifiles2
+, libticables2
 }:
 let
-  libticables2 = stdenv.mkDerivation rec {
-    pname = "libticables2";
-    version = "1.3.5";
-    src = fetchurl {
-      url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
-      sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
-    };
-    nativeBuildInputs = [ autoreconfHook pkg-config ];
-    buildInputs = [ glib libusb1 ];
-    configureFlags = [ "--enable-libusb10" ];
-  };
   libticalcs2 = stdenv.mkDerivation rec {
     pname = "libticalcs2";
     version = "1.1.9";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f21e7810eaf..259bfd33284 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15270,6 +15270,8 @@ in
 
   libthreadar = callPackage ../development/libraries/libthreadar { };
 
+  libticables2 = callPackage ../development/libraries/libticables2 { };
+
   libticonv = callPackage ../development/libraries/libticonv { };
 
   libtifiles2 = callPackage ../development/libraries/libtifiles2 { };

From e69bd781e4a93255f164127a71e8238853881ca9 Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Mon, 26 Oct 2020 22:46:21 +0100
Subject: [PATCH 804/956] libticalcs2: init at 1.1.9

---
 .../libraries/libticalcs2/default.nix         | 50 +++++++++++++++++++
 pkgs/misc/emulators/tilem/default.nix         | 18 +------
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/libticalcs2/default.nix

diff --git a/pkgs/development/libraries/libticalcs2/default.nix b/pkgs/development/libraries/libticalcs2/default.nix
new file mode 100644
index 00000000000..6eb013a7ffd
--- /dev/null
+++ b/pkgs/development/libraries/libticalcs2/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, autoreconfHook
+, glib
+, libticonv
+, libtifiles2
+, libticables2
+, lzma
+, bzip2
+, acl
+, libobjc
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libticalcs2";
+  version = "1.1.9";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    libticonv
+    libtifiles2
+    libticables2
+    lzma
+    bzip2
+  ] ++ lib.optionals stdenv.isLinux [
+    acl
+  ] ++ lib.optionals stdenv.isDarwin [
+    libobjc
+  ];
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "This library is part of the TiLP framework";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix
index fcd37ab24e3..d2252563d0a 100644
--- a/pkgs/misc/emulators/tilem/default.nix
+++ b/pkgs/misc/emulators/tilem/default.nix
@@ -1,30 +1,14 @@
 { stdenv
 , fetchurl
 , lib
-, autoreconfHook
 , pkg-config
 , glib
-, darwin
-, acl
 , gnome2
 , libticonv
 , libtifiles2
 , libticables2
+, libticalcs2
 }:
-let
-  libticalcs2 = stdenv.mkDerivation rec {
-    pname = "libticalcs2";
-    version = "1.1.9";
-    src = fetchurl {
-      url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
-      sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n";
-    };
-    nativeBuildInputs = [ autoreconfHook pkg-config ];
-    buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ]
-      ++ lib.optionals stdenv.isLinux [ acl ]
-      ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ];
-  };
-in
 
 stdenv.mkDerivation rec {
   pname = "tilem";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 259bfd33284..fa622e4f7cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15272,6 +15272,10 @@ in
 
   libticables2 = callPackage ../development/libraries/libticables2 { };
 
+  libticalcs2 = callPackage ../development/libraries/libticalcs2 {
+    inherit (darwin) libobjc;
+  };
+
   libticonv = callPackage ../development/libraries/libticonv { };
 
   libtifiles2 = callPackage ../development/libraries/libtifiles2 { };

From 99d0610e03f03dfa9ec9798078da351de694565c Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Mon, 26 Oct 2020 22:47:06 +0100
Subject: [PATCH 805/956] gfm: init at 1.08

---
 .../applications/science/math/gfm/default.nix | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/science/math/gfm/default.nix

diff --git a/pkgs/applications/science/math/gfm/default.nix b/pkgs/applications/science/math/gfm/default.nix
new file mode 100644
index 00000000000..a8031b3e8a3
--- /dev/null
+++ b/pkgs/applications/science/math/gfm/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, lib
+, fetchurl
+, fetchpatch
+, pkg-config
+, autoreconfHook
+, gnome2
+, glib
+, libtifiles2
+, libticables2
+, libticalcs2
+, libticonv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gfm";
+  version = "1.08";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "0zq1a9mm54zr18dz2mqh79w1a126xwqz6dcrpjlbd1pnmg01l0q9";
+  };
+
+  patches = fetchpatch {
+    name = "remove-broken-kde-support.patch";
+    url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=gfm";
+    sha256 = "03yc8s2avicmv04f2ygg3r3q8l7kpsc94mhp6clp584kmjpjqag5";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    gnome2.gtk
+    gnome2.libglade
+    glib
+    libtifiles2
+    libticables2
+    libticalcs2
+    libticonv
+  ];
+
+  NIX_CFLAGS_COMPILE = "-I${libticables2}/include/tilp2";
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "Group File Manager (GFM) allows manipulation of single/group/tigroup files";
+    homepage = "http://lpg.ticalc.org/prj_gfm/index.html";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa622e4f7cd..b774958397a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13791,6 +13791,8 @@ in
 
   gflags = callPackage ../development/libraries/gflags { };
 
+  gfm = callPackage ../applications/science/math/gfm { };
+
   gperftools = callPackage ../development/libraries/gperftools { };
 
   grab-site = callPackage ../tools/backup/grab-site { };

From 3c5f402e6e639dbce2cbff114782d2ea5335b7d4 Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Mon, 26 Oct 2020 22:47:53 +0100
Subject: [PATCH 806/956] tilp2: init at 1.18

---
 .../science/math/tilp2/default.nix            | 56 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/science/math/tilp2/default.nix

diff --git a/pkgs/applications/science/math/tilp2/default.nix b/pkgs/applications/science/math/tilp2/default.nix
new file mode 100644
index 00000000000..1b46f982b41
--- /dev/null
+++ b/pkgs/applications/science/math/tilp2/default.nix
@@ -0,0 +1,56 @@
+{ stdenv
+, lib
+, fetchurl
+, fetchpatch
+, autoreconfHook
+, pkg-config
+, intltool
+, glib
+, gnome2
+, gfm
+, libticables2
+, libticalcs2
+, libticonv
+, libtifiles2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tilp2";
+  version = "1.18";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv";
+  };
+
+  patches = fetchpatch {
+    name = "remove-broken-kde-support.patch";
+    url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp";
+    sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    glib
+    gnome2.gtk
+    gnome2.libglade
+    gfm
+    libticables2
+    libticalcs2
+    libticonv
+    libtifiles2
+  ];
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "Transfer data between Texas Instruments graphing calculators and a computer";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b774958397a..87fd7025991 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8192,6 +8192,8 @@ in
 
   tilem = callPackage ../misc/emulators/tilem { };
 
+  tilp2 = callPackage ../applications/science/math/tilp2 { };
+
   timemachine = callPackage ../applications/audio/timemachine { };
 
   timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };

From 1900b6e2d70545cd7f86254e486e2063e2b5644c Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Mon, 2 Nov 2020 21:18:09 +0100
Subject: [PATCH 807/956] nixos/tilp2: init

---
 nixos/modules/module-list.nix    |  1 +
 nixos/modules/programs/tilp2.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/modules/programs/tilp2.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1ccfba68453..0f8a7ba7904 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -169,6 +169,7 @@
   ./programs/sway.nix
   ./programs/system-config-printer.nix
   ./programs/thefuck.nix
+  ./programs/tilp2.nix
   ./programs/tmux.nix
   ./programs/traceroute.nix
   ./programs/tsm-client.nix
diff --git a/nixos/modules/programs/tilp2.nix b/nixos/modules/programs/tilp2.nix
new file mode 100644
index 00000000000..da9e32e3e6c
--- /dev/null
+++ b/nixos/modules/programs/tilp2.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.tilp2;
+
+in {
+  options.programs.tilp2 = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable tilp2 and udev rules for supported calculators.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.udev.packages = [
+      pkgs.libticables2
+    ];
+
+    environment.systemPackages = [
+      pkgs.tilp2
+    ];
+  };
+}

From 6f94d834a17b5fae9368e047b16e4fc373c1247c Mon Sep 17 00:00:00 2001
From: Monson Shao <holymonson@gmail.com>
Date: Sat, 23 Jan 2021 21:29:37 +0800
Subject: [PATCH 808/956] zsh-prezto: update to unstable

---
 pkgs/shells/zsh/zsh-prezto/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix
index 138de38786b..866552ec0d1 100644
--- a/pkgs/shells/zsh/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
@@ -1,15 +1,17 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, unstableGitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "zsh-prezto";
-  version = "2020-05-20";
+  version = "unstable-2021-01-19";
+
   src = fetchFromGitHub {
     owner = "sorin-ionescu";
     repo = "prezto";
-    rev = "793f239a5e38ef2c4b76a4955bb734520303e8c4";
-    sha256 = "0xhdl1g0rvlikq6qxh6cwp6wsrgmw4l1rmmq5xpc7wl6dyh35yri";
+    rev = "704fc46c3f83ca1055becce65fb513a533f48982";
+    sha256 = "0rkbx6hllf6w6x64mggbhvm1fvbq5sr5kvf06sarfkpz5l0a5wh3";
     fetchSubmodules = true;
   };
+
   buildPhase = ''
     sed -i '/\''${ZDOTDIR:\-\$HOME}\/.zpreztorc" ]]/i\
     if [[ -s "/etc/zpreztorc" ]]; then\
@@ -20,15 +22,18 @@ stdenv.mkDerivation rec {
       sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i
     done
   '';
+
   installPhase = ''
     mkdir -p $out
     cp ./* $out/ -R
   '';
+
+  passthru.updateScript = unstableGitUpdater {};
+
   meta = with lib; {
     description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes";
     homepage = "https://github.com/sorin-ionescu/prezto";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

From 99b3d904e73b8221345bde349a098e29898c66ce Mon Sep 17 00:00:00 2001
From: Monson Shao <holymonson@gmail.com>
Date: Sat, 23 Jan 2021 21:29:37 +0800
Subject: [PATCH 809/956] maintainers: add holymonson

---
 maintainers/maintainer-list.nix        | 6 ++++++
 pkgs/shells/zsh/zsh-prezto/default.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 134805b386f..ed8ecc6cd27 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3699,6 +3699,12 @@
     githubId = 896431;
     name = "Chris Hodapp";
   };
+  holymonson = {
+    email = "holymonson@gmail.com";
+    github = "holymonson";
+    githubId = 902012;
+    name = "Monson Shao";
+  };
   hongchangwu = {
     email = "wuhc85@gmail.com";
     github = "hongchangwu";
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix
index 866552ec0d1..9ff78975b75 100644
--- a/pkgs/shells/zsh/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes";
     homepage = "https://github.com/sorin-ionescu/prezto";
     license = licenses.mit;
+    maintainers = with maintainers; [ holymonson ];
     platforms = platforms.unix;
   };
 }

From 27c6e5dd9f2b8b9b64c9bbf8d32f22a37eec70af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sun, 24 Jan 2021 14:35:52 +0100
Subject: [PATCH 810/956] krita: use openjpeg_2

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ec34213a3..442a97aa6f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22964,9 +22964,7 @@ in
 
   kpt = callPackage ../applications/networking/cluster/kpt { };
 
-  krita = libsForQt5.callPackage ../applications/graphics/krita {
-    openjpeg = openjpeg_1;
-  };
+  krita = libsForQt5.callPackage ../applications/graphics/krita { };
 
   krusader = libsForQt5.callPackage ../applications/misc/krusader { };
 

From 0948e93ef0089fa4e81b88fdf3f398383e579b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sun, 24 Jan 2021 14:36:21 +0100
Subject: [PATCH 811/956] calligra: use openjpeg_2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 442a97aa6f3..3741b957f66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21168,7 +21168,6 @@ in
   calibre = calibre-py3;
 
   calligra = libsForQt5.callPackage ../applications/office/calligra {
-    openjpeg = openjpeg_1;
     # Must use the same Qt version as Calligra itself:
     poppler = libsForQt5.poppler_0_61;
   };

From 8ef056ba72657af59426ecb278ace792366146c5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 24 Jan 2021 14:58:41 +0100
Subject: [PATCH 812/956] glances: 3.1.6 -> 3.1.6.1

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

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 0def36f0444..10a6eb9c6bb 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "3.1.6";
+  version = "3.1.6.1";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "sha256-uPqHXRwQQQZsttiLuqgr+dcAna+BVZtym4YEmTPLkXk=";
+    sha256 = "sha256-lYvFNeCuvLIV//fEQDZIj+nLGZmrKHfAQyNpe4vMmfU=";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

From 32fa8449ef849e11a947b346740971cb7133f32e Mon Sep 17 00:00:00 2001
From: Aamaruvi Yogamani <38222826+Technical27@users.noreply.github.com>
Date: Sun, 24 Jan 2021 08:47:01 -0500
Subject: [PATCH 813/956] auto-cpufreq: 1.5.1 -> 1.5.3

The attribute is also changed from autocpu-freq to autocpu-freq
---
 .../default.nix                               |  13 +-
 .../prevent-install-and-copy.patch            | 252 ++++++++----------
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 128 insertions(+), 139 deletions(-)
 rename pkgs/tools/system/{autocpu-freq => auto-cpufreq}/default.nix (64%)
 rename pkgs/tools/system/{autocpu-freq => auto-cpufreq}/prevent-install-and-copy.patch (69%)

diff --git a/pkgs/tools/system/autocpu-freq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix
similarity index 64%
rename from pkgs/tools/system/autocpu-freq/default.nix
rename to pkgs/tools/system/auto-cpufreq/default.nix
index 7e23b8b5b0f..5a94cff19e1 100644
--- a/pkgs/tools/system/autocpu-freq/default.nix
+++ b/pkgs/tools/system/auto-cpufreq/default.nix
@@ -2,26 +2,31 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "auto-cpufreq";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "AdnanHodzic";
     repo = pname;
     rev = "v${version}";
-    sha256 = "uVhftO6AqFnZ0uaEYRAPvVskkouNOXPtNVYXx7WJKyw=";
+    sha256 = "sha256-NDIdQ4gUN2jG+VWXsv3fdUogZxOOiNtnbekD30+jx6M=";
   };
 
   propagatedBuildInputs = with python3Packages; [ click distro psutil ];
 
   doCheck = false;
-  pythonImportsCheck = [ "source" ];
+  pythonImportsCheck = [ "auto_cpufreq" ];
 
   # patch to prevent script copying and to disable install
   patches = [ ./prevent-install-and-copy.patch ];
 
   postInstall = ''
     # copy script manually
-    cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl
+    cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq
+
+    # systemd service
+    mkdir -p $out/lib/systemd/system
+    cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system
+    substituteInPlace $out/lib/systemd/system/auto-cpufreq.service --replace "/usr/local" $out
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch
similarity index 69%
rename from pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch
rename to pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch
index 28c524e1497..232ac780341 100644
--- a/pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch
+++ b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch
@@ -1,3 +1,121 @@
+diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
+index 482a544..d142013 100644
+--- a/auto_cpufreq/core.py
++++ b/auto_cpufreq/core.py
+@@ -163,31 +163,13 @@ def get_current_gov():
+     return print("Currently using:", getoutput("cpufreqctl.auto-cpufreq --governor").strip().split(" ")[0], "governor")
+ 
+ def cpufreqctl():
+-    """
+-    deploy cpufreqctl script
+-    """
+-
+-    # detect if running on a SNAP
+-    if os.getenv('PKG_MARKER') == "SNAP":
+-        pass
+-    else:
+-        # deploy cpufreqctl.auto-cpufreq script
+-        if os.path.isfile("/usr/bin/cpufreqctl"):
+-            shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq")
+-        else:
+-            shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq")
++    # scripts are already in the correct place
++    pass
+ 
+ 
+ def cpufreqctl_restore():
+-    """
+-    remove cpufreqctl.auto-cpufreq script
+-    """
+-    # detect if running on a SNAP
+-    if os.getenv('PKG_MARKER') == "SNAP":
+-        pass
+-    else:
+-        if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq"):
+-            os.remove("/usr/bin/cpufreqctl.auto-cpufreq")
++    # no need to restore
++    pass
+ 
+ def footer(l=79):
+     print("\n" + "-" * l + "\n")
+@@ -212,74 +194,12 @@ def remove_complete_msg():
+ 
+ 
+ def deploy_daemon():
+-    print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
+-
+-    # deploy cpufreqctl script func call
+-    cpufreqctl()
+-
+-    print("* Turn off bluetooth on boot")
+-    btconf = Path("/etc/bluetooth/main.conf")
+-    try:
+-        orig_set = "AutoEnable=true"
+-        change_set = "AutoEnable=false"
+-        with btconf.open(mode="r+") as f:
+-            content = f.read()
+-            f.seek(0)
+-            f.truncate()
+-            f.write(content.replace(orig_set, change_set))
+-    except:
+-        print("\nERROR:\nWas unable to turn off bluetooth on boot")
+-
+-    auto_cpufreq_log_path.touch(exist_ok=True)
+-
+-    print("\n* Deploy auto-cpufreq install script")
+-    shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install")
+-
+-    print("\n* Deploy auto-cpufreq remove script")
+-    shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove")
+-
+-    call("/usr/bin/auto-cpufreq-install", shell=True)
+-
++    # prevent needless copying and system changes
++    pass
+ 
+ # remove auto-cpufreq daemon
+ def remove():
+-
+-    # check if auto-cpufreq is installed
+-    if not os.path.exists("/usr/bin/auto-cpufreq-remove"):
+-        print("\nauto-cpufreq daemon is not installed.\n")
+-        sys.exit(1)
+-
+-    print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
+-
+-    print("* Turn on bluetooth on boot")
+-    btconf = "/etc/bluetooth/main.conf"
+-    try:
+-        orig_set = "AutoEnable=true"
+-        change_set = "AutoEnable=false"
+-        with open(btconf, "r+") as f:
+-            content = f.read()
+-            f.seek(0)
+-            f.truncate()
+-            f.write(content.replace(change_set, orig_set))
+-    except:
+-        print("\nERROR:\nWas unable to turn on bluetooth on boot")
+-
+-    # run auto-cpufreq daemon install script
+-    call("/usr/bin/auto-cpufreq-remove", shell=True)
+-
+-    # remove auto-cpufreq-remove
+-    os.remove("/usr/bin/auto-cpufreq-remove")
+-
+-    # delete log file
+-    if auto_cpufreq_log_path.exists():
+-        if auto_cpufreq_log_file is not None:
+-            auto_cpufreq_log_file.close()
+-
+-        auto_cpufreq_log_path.unlink()
+-
+-    # restore original cpufrectl script
+-    cpufreqctl_restore()
+-
++    pass
+ 
+ def gov_check():
+     for gov in get_avail_gov():
 diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh
 index 63a2b5b..e157efe 100755
 --- a/scripts/cpufreqctl.sh
@@ -42,137 +160,3 @@ index 63a2b5b..e157efe 100755
 +  echo "reset is disabled in the nix package"
    exit
  fi
-diff --git a/source/core.py b/source/core.py
-index 531c0c4..2e27e65 100644
---- a/source/core.py
-+++ b/source/core.py
-@@ -24,8 +24,6 @@ warnings.filterwarnings("ignore")
- # - re-enable CPU fan speed display and make more generic and not only for thinkpad
- # - replace get system/CPU load from: psutil.getloadavg() | available in 5.6.2)
- 
--SCRIPTS_DIR = Path("/usr/local/share/auto-cpufreq/scripts/")
--
- # from the highest performance to the lowest
- ALL_GOVERNORS = ("performance", "ondemand", "conservative", "schedutil", "userspace", "powersave")
- CPUS = os.cpu_count()
-@@ -156,34 +154,16 @@ def cpufreqctl():
-     """
-     deploy cpufreqctl script
-     """
--
--    # detect if running on a SNAP
--    if os.getenv('PKG_MARKER') == "SNAP":
--        pass
--    else:
--        # deploy cpufreqctl script (if missing)
--        if os.path.isfile("/usr/bin/cpufreqctl"):
--            shutil.copy("/usr/bin/cpufreqctl", "/usr/bin/cpufreqctl.auto-cpufreq.bak")
--            shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl")
--        else:
--            shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl")
-+    # scripts are already in the correct place
-+    pass
- 
- 
- def cpufreqctl_restore():
-     """
-     restore original cpufreqctl script
-     """
--    # detect if running on a SNAP
--    if os.getenv('PKG_MARKER') == "SNAP":
--        pass
--    else:
--        # restore original cpufreqctl script
--        if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq.bak"):
--            os.system("cp /usr/bin/cpufreqctl.auto-cpufreq.bak /usr/bin/cpufreqctl")
--            os.remove("/usr/bin/cpufreqctl.auto-cpufreq.bak")
--        # ToDo: implement mechanism to make sure cpufreqctl (auto-cpufreq) file is
--        # restored if overwritten by system. But during tool removal to also remove it
--        # in def cpufreqctl
-+    # no need to restore
-+    pass
- 
- 
- def footer(l=79):
-@@ -209,71 +189,13 @@ def remove_complete_msg():
- 
- 
- def deploy_daemon():
--    print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
--
--    # deploy cpufreqctl script func call
--    cpufreqctl()
--
--    print("* Turn off bluetooth on boot")
--    btconf = Path("/etc/bluetooth/main.conf")
--    try:
--        orig_set = "AutoEnable=true"
--        change_set = "AutoEnable=false"
--        with btconf.open(mode="r+") as f:
--            content = f.read()
--            f.seek(0)
--            f.truncate()
--            f.write(content.replace(orig_set, change_set))
--    except:
--        print("\nERROR:\nWas unable to turn off bluetooth on boot")
--
--    auto_cpufreq_log_file.touch(exist_ok=True)
--
--    print("\n* Deploy auto-cpufreq install script")
--    shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install")
--
--    print("\n* Deploy auto-cpufreq remove script")
--    shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove")
--
--    call("/usr/bin/auto-cpufreq-install", shell=True)
-+    # prevent needless copying and system changes
-+    pass
- 
- 
- # remove auto-cpufreq daemon
- def remove():
--
--    # check if auto-cpufreq is installed
--    if not os.path.exists("/usr/bin/auto-cpufreq-remove"):
--        print("\nauto-cpufreq daemon is not installed.\n")
--        sys.exit(1)
--        
--    print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
--
--    print("* Turn on bluetooth on boot")
--    btconf = "/etc/bluetooth/main.conf"
--    try:
--        orig_set = "AutoEnable=true"
--        change_set = "AutoEnable=false"
--        with open(btconf, "r+") as f:
--            content = f.read()
--            f.seek(0)
--            f.truncate()
--            f.write(content.replace(change_set, orig_set))
--    except:
--        print("\nERROR:\nWas unable to turn on bluetooth on boot")
--
--    # run auto-cpufreq daemon install script
--    call("/usr/bin/auto-cpufreq-remove", shell=True)
--
--    # remove auto-cpufreq-remove
--    os.remove("/usr/bin/auto-cpufreq-remove")
--
--    # delete log file
--    if auto_cpufreq_log_file.exists():
--        auto_cpufreq_log_file.unlink()
--
--    # restore original cpufrectl script
--    cpufreqctl_restore()
--
-+    pass
- 
- def gov_check():
-     for gov in get_avail_gov():
-@@ -798,4 +720,4 @@ def running_daemon():
-         exit(1)
-     elif os.getenv("PKG_MARKER") == "SNAP" and dcheck == "enabled":
-         deploy_complete_msg()
--        exit(1)
-\ No newline at end of file
-+        exit(1)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ec34213a3..3dbb9e26bd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29143,7 +29143,7 @@ in
 
   ssh-audit = callPackage ../tools/security/ssh-audit { };
 
-  autocpu-freq = callPackage ../tools/system/autocpu-freq {  };
+  auto-cpufreq = callPackage ../tools/system/auto-cpufreq {  };
 
   thermald = callPackage ../tools/system/thermald { };
 

From 9e9e240a275f0a4753c8a591b9225fe77db5f114 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 24 Jan 2021 14:57:44 +0100
Subject: [PATCH 814/956] Revert "release-combined.tested: Temporarily remove
 the Chromium test"

This reverts commit 2dbd08dcbd5fa78d6716aa1fbdfb04be175e4162.

I've fixed the regression in 8a7a8442c17 and the rest of my
refactorings/improvements shouldn't affect the stability of the test.
---
 nixos/release-combined.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 5c436592f64..ea82adf09ad 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -60,8 +60,7 @@ in rec {
         (onFullSupported "nixos.tests.boot-stage1")
         (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiCdrom")
         (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiUsb")
-        # TODO (@primeos): Fix the test failure since https://github.com/NixOS/nixpkgs/pull/110010:
-        #(onSystems ["x86_64-linux"] "nixos.tests.chromium")
+        (onSystems ["x86_64-linux"] "nixos.tests.chromium")
         (onFullSupported "nixos.tests.containers-imperative")
         (onFullSupported "nixos.tests.containers-ip")
         (onSystems ["x86_64-linux"] "nixos.tests.docker")

From 2f30e32121691fa924dc13e6f09f569911723402 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 24 Jan 2021 15:35:12 +0100
Subject: [PATCH 815/956] uqm: Fix evaluation of 3DO video package

Regression introduced by 2e34288f0d8cf01eea228c7dbc50af9589b885f3.

The commit in question just used the "lib" attribute, but it wasn't in
scope. In addition to bringeng the lib attribute into scope, I also
removed the "with lib;", which should make sure that we get an error
when just parsing (nix-instantiate --parse) the Nix expression.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/games/uqm/3dovideo.nix | 8 +++-----
 pkgs/games/uqm/default.nix  | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix
index 0773b651152..4ebbc9c4992 100644
--- a/pkgs/games/uqm/3dovideo.nix
+++ b/pkgs/games/uqm/3dovideo.nix
@@ -1,10 +1,8 @@
-{ stdenv, requireFile, writeText, fetchurl, haskellPackages }:
-
-with lib;
+{ stdenv, lib, requireFile, writeText, fetchurl, haskellPackages }:
 
 let
   makeSpin = num: let
-    padded = (optionalString (lessThan num 10) "0") + toString num;
+    padded = (lib.optionalString (lib.lessThan num 10) "0") + toString num;
   in "slides.spins.${padded} = 3DOVID:" +
      "addons/3dovideo/spins/ship${padded}.duk:" +
      "addons/3dovideo/spins/spin.aif:" +
@@ -13,7 +11,7 @@ let
   videoRMP = writeText "3dovideo.rmp" (''
     slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk
     slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk
-  '' + concatMapStrings makeSpin (range 0 24));
+  '' + lib.concatMapStrings makeSpin (lib.range 0 24));
 
   helper = with haskellPackages; mkDerivation {
     pname = "uqm3donix";
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
index f1ac122ccc4..a06c1b3b665 100644
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@@ -12,7 +12,7 @@ assert use3DOVideos -> requireFile != null && writeText != null
 
 let
   videos = import ./3dovideo.nix {
-    inherit stdenv requireFile writeText fetchurl haskellPackages;
+    inherit stdenv lib requireFile writeText fetchurl haskellPackages;
   };
 
   remixPacks = lib.imap1 (num: sha256: fetchurl rec {

From 32989d49ce2ce70c6f8247bbfe28981d7845a9f6 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 24 Jan 2021 16:05:40 +0100
Subject: [PATCH 816/956] mediaelch: 2.8.4 -> 2.8.6

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

diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix
index d437cfda44f..f19cbee8b79 100644
--- a/pkgs/applications/misc/mediaelch/default.nix
+++ b/pkgs/applications/misc/mediaelch/default.nix
@@ -13,13 +13,13 @@
 
 mkDerivation rec {
   pname = "mediaelch";
-  version = "2.8.4";
+  version = "2.8.6";
 
   src = fetchFromGitHub {
     owner = "Komet";
     repo = "MediaElch";
     rev = "v${version}";
-    sha256 = "00jwmpdwbn6rgaha0iimcbwg9pwb8ilpjgxhv0p13j2c6dcisjzh";
+    sha256 = "1134vw7hr0mpqcsxjq4bqmg5760dngz17bzj97ypfc5cvzcxjh43";
     fetchSubmodules = true;
   };
 

From 2dd93a5c136a6d68f4aa73020ccbe174cb2bfc67 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 24 Jan 2021 12:17:26 +0100
Subject: [PATCH 817/956] solo5: add missing test dependencies

---
 pkgs/os-specific/solo5/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix
index 828b55fbba2..2dbeca98051 100644
--- a/pkgs/os-specific/solo5/default.nix
+++ b/pkgs/os-specific/solo5/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, libseccomp }:
+{ lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }:
 
 let version = "0.6.7";
 in stdenv.mkDerivation {
@@ -36,6 +36,7 @@ in stdenv.mkDerivation {
   '';
 
   doCheck = true;
+  checkInputs = [ util-linux qemu ];
   checkPhase = if stdenv.hostPlatform.isLinux then
     ''
     patchShebangs tests

From 5c7e19604efa1e325a34a04a410897bb5dde2efe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 16:27:17 +0100
Subject: [PATCH 818/956] swego: init at 0.7 (#108106)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/servers/swego/default.nix  | 37 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/servers/swego/default.nix

diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix
new file mode 100644
index 00000000000..4c7c9d76450
--- /dev/null
+++ b/pkgs/servers/swego/default.nix
@@ -0,0 +1,37 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, stdenv
+}:
+
+buildGoModule rec {
+  pname = "swego";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "nodauf";
+    repo = "Swego";
+    rev = "v${version}";
+    sha256 = "14qww4ndvrxmrgkggr8hyvfpz2v7fw0vq6s8715mxa28f8pfi78b";
+  };
+
+  vendorSha256 = "068drahh0aysrm8cr5pgik27jqyk28bsx5130mc2v3xd0xmk8yp1";
+
+  postInstall = ''
+    mv $out/bin/src $out/bin/$pname
+  '';
+
+  meta = with lib; {
+    description = "Simple Webserver in Golang";
+    longDescription = ''
+      Swiss army knife Webserver in Golang. Similar to the Python
+      SimpleHTTPServer but with many features.
+    '';
+    homepage = "https://github.com/nodauf/Swego";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+    # darwin crashes with:
+    # src/controllers/parsingArgs.go:130:4: undefined: PrintEmbeddedFiles
+    broken = stdenv.isDarwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aed59f0ca80..165192fe0ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2726,6 +2726,8 @@ in
 
   sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { };
 
+  swego = callPackage ../servers/swego { };
+
   syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};
 
   syslogng = callPackage ../tools/system/syslog-ng { };

From af18ee1f2616d11e8df33d1d95ed4c6070ace030 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sun, 24 Jan 2021 10:32:13 -0500
Subject: [PATCH 819/956] nomad-driver-podman: init at 0.2.0

---
 .../cluster/nomad-driver-podman/default.nix   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/nomad-driver-podman/default.nix

diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
new file mode 100644
index 00000000000..fad83bb3dbf
--- /dev/null
+++ b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
@@ -0,0 +1,28 @@
+{ lib , buildGoModule , fetchFromGitHub, procps, podman }:
+
+buildGoModule rec {
+  pname = "nomad-driver-podman";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "hashicorp";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1a2alapqm7wnkjm9cg0gvi63pkaila9lhsa5razv0vprhg1k84gy";
+  };
+
+  vendorSha256 = "1zs5y0zfi8dd9w371hpmah4iwxahgvaf70biqqdw3c9yp6yw2rwq";
+
+  subPackages = [ "." ];
+
+  # some tests require a running podman service
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://www.github.com/hashicorp/nomad-driver-podman";
+    description = "Podman task driver for Nomad";
+    platforms = platforms.unix;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ cpcloud ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aed59f0ca80..34c348ee575 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6448,6 +6448,8 @@ in
     nvidiaGpuSupport = config.cudaSupport or false;
   };
 
+  nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { };
+
   notable = callPackage ../applications/misc/notable { };
 
   nvchecker = with python3Packages; toPythonApplication nvchecker;

From 79a6a2cbc0b20973391dc2c86e646e7328f25bd2 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Sun, 24 Jan 2021 10:33:57 -0500
Subject: [PATCH 820/956] nomad-driver-podman: remove unused inputs

---
 .../networking/cluster/nomad-driver-podman/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
index fad83bb3dbf..cfa8d6fc674 100644
--- a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
+++ b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
@@ -1,4 +1,4 @@
-{ lib , buildGoModule , fetchFromGitHub, procps, podman }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "nomad-driver-podman";

From a098b61e119f01cb00fdd163dcbde074ae85c0eb Mon Sep 17 00:00:00 2001
From: ilian <ilian@tuta.io>
Date: Sun, 24 Jan 2021 17:04:26 +0100
Subject: [PATCH 821/956] reaper: 6.20 -> 6.21

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

diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 8f3a17bf1b6..4d3ac1d1f2d 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "reaper";
-  version = "6.20";
+  version = "6.21";
 
   src = fetchurl {
     url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
-    sha256 = "194xglhk74ks534r3d00v84s26s4yybxkhb4h8k5rqp76g0jv635";
+    sha256 = "11nvfjfrri9y0k7n7psz3yk1l7mxp9f6yi69pq7hvn9d4n26p5vd";
   };
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

From 33532c4756b107438e7c6031ba695d3bacf11c69 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 17 Apr 2020 19:14:37 +0300
Subject: [PATCH 822/956] picom: apply nixpkgs-fmt

---
 .../window-managers/picom/default.nix         | 69 ++++++++++++++-----
 1 file changed, 53 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix
index 4287dd2db02..ce0673aab7f 100644
--- a/pkgs/applications/window-managers/picom/default.nix
+++ b/pkgs/applications/window-managers/picom/default.nix
@@ -1,38 +1,75 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, uthash, asciidoc, docbook_xml_dtd_45
-, docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja
-, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
-, dbus, libconfig, libdrm, libGL, pcre, libX11
-, libXinerama, libXext, xwininfo, libxdg_basedir }:
+{ asciidoc
+, dbus
+, docbook_xml_dtd_45
+, docbook_xsl
+, fetchFromGitHub
+, lib
+, libconfig
+, libdrm
+, libev
+, libGL
+, libX11
+, libxcb
+, libxdg_basedir
+, libXext
+, libXinerama
+, libxml2
+, libxslt
+, makeWrapper
+, meson
+, ninja
+, pcre
+, pixman
+, pkg-config
+, stdenv
+, uthash
+, xcbutilimage
+, xcbutilrenderutil
+, xorgproto
+, xwininfo
+}:
 
 stdenv.mkDerivation rec {
   pname = "picom";
   version = "8.2";
 
   src = fetchFromGitHub {
-    owner  = "yshui";
-    repo   = "picom";
-    rev    = "v${version}";
+    owner = "yshui";
+    repo = "picom";
+    rev = "v${version}";
     sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
-    meson ninja
-    pkg-config
-    uthash
     asciidoc
     docbook_xml_dtd_45
     docbook_xsl
     makeWrapper
+    meson
+    ninja
+    pkg-config
+    uthash
   ];
 
   buildInputs = [
-    dbus libX11 libXext
-    xorgproto
-    libXinerama libdrm pcre libxml2 libxslt libconfig libGL
-    libxcb xcbutilrenderutil xcbutilimage
-    pixman libev
+    dbus
+    libconfig
+    libdrm
+    libev
+    libGL
+    libX11
+    libxcb
     libxdg_basedir
+    libXext
+    libXinerama
+    libxml2
+    libxslt
+    pcre
+    pixman
+    xcbutilimage
+    xcbutilrenderutil
+    xorgproto
   ];
 
   mesonBuildType = "release";

From e788a4a22ce6c7d29c4c9bf3d5595287cdab7e59 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 17 Apr 2020 19:16:19 +0300
Subject: [PATCH 823/956] picom: add withDebug option

---
 .../window-managers/picom/default.nix           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix
index ce0673aab7f..32eee9df0d8 100644
--- a/pkgs/applications/window-managers/picom/default.nix
+++ b/pkgs/applications/window-managers/picom/default.nix
@@ -27,6 +27,7 @@
 , xcbutilrenderutil
 , xorgproto
 , xwininfo
+, withDebug ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -72,7 +73,10 @@ stdenv.mkDerivation rec {
     xorgproto
   ];
 
-  mesonBuildType = "release";
+  # Use "debugoptimized" instead of "debug" so perhaps picom works better in
+  # normal usage too, not just temporary debugging.
+  mesonBuildType = if withDebug then "debugoptimized" else "release";
+  dontStrip = withDebug;
 
   mesonFlags = [
     "-Dwith_docs=true"
@@ -80,9 +84,13 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "PREFIX=$(out)" ];
 
+  # In debug mode, also copy src directory to store. If you then run `gdb picom`
+  # in the bin directory of picom store path, gdb finds the source files.
   postInstall = ''
     wrapProgram $out/bin/picom-trans \
       --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
+  '' + lib.optionalString withDebug ''
+    cp -r ../src $out/
   '';
 
   meta = with lib; {
@@ -93,6 +101,13 @@ stdenv.mkDerivation rec {
       extensions. It enables basic eye-candy effects. This fork adds
       additional features, such as additional effects, and a fork at a
       well-defined and proper place.
+
+      The package can be installed in debug mode as:
+
+        picom.override { withDebug = true; }
+
+      For gdb to find the source files, you need to run gdb in the bin directory
+      of picom package in the nix store.
     '';
     license = licenses.mit;
     homepage = "https://github.com/yshui/picom";

From 520203fe3044b136119f80d58b6807fe90ec6873 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 24 Jan 2021 17:36:37 +0100
Subject: [PATCH 824/956] spacegun: use workaround to deploy the project as a
 remote development project using the package-lock.json configuration

---
 .../networking/cluster/spacegun/default.nix   |   13 +-
 .../cluster/spacegun/generate-dependencies.sh |    7 +
 .../cluster/spacegun/node-packages.nix        | 4553 +++++++----------
 .../networking/cluster/spacegun/package.json  |    3 -
 4 files changed, 1926 insertions(+), 2650 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/spacegun/package.json

diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix
index 135d762f006..684e9f65a5b 100644
--- a/pkgs/applications/networking/cluster/spacegun/default.nix
+++ b/pkgs/applications/networking/cluster/spacegun/default.nix
@@ -1,15 +1,20 @@
-{ pkgs, nodejs, stdenv, lib, ... }:
+{ pkgs, fetchFromGitHub, nodejs, stdenv, lib, ... }:
 
 let
-
-  packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json));
+  src = fetchFromGitHub {
+    owner = "dvallin";
+    repo = "spacegun";
+    rev = "v0.3.3";
+    sha256 = "0cd9yzms44dj9ix8lrhbkby5zsyb8wambs24j6c3ibr67sggr6sq";
+  };
 
   nodePackages = import ./node-composition.nix {
     inherit pkgs nodejs;
     inherit (stdenv.hostPlatform) system;
   };
 in
-nodePackages."${packageName}".override {
+nodePackages.package.override {
+  inherit src;
   nativeBuildInputs = [ pkgs.makeWrapper pkgs.nodePackages.node-gyp-build ];
 
   postInstall = ''
diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
index 293a72a1623..bda3d1727c4 100644
--- a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
+++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
@@ -1,10 +1,17 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
 
+# Download package.json and package-lock.json from the v0.3.3 release
+curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package.json -o package.json
+curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json
+
 node2nix \
   --nodejs-10 \
   --node-env ../../../../development/node-packages/node-env.nix \
   --development \
   --input package.json \
+  --lock package-lock.json \
   --output node-packages.nix \
   --composition node-composition.nix
+
+rm -f package.json package-lock.json
diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
index 611b0c73db0..9203d8f60c5 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-packages.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
@@ -4,202 +4,139 @@
 
 let
   sources = {
-    "@babel/code-frame-7.12.11" = {
+    "@babel/code-frame-7.5.5" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.12.11";
+      version = "7.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
-        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz";
+        sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==";
       };
     };
-    "@babel/core-7.12.10" = {
+    "@babel/core-7.6.2" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.10";
+      version = "7.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz";
-        sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.6.2.tgz";
+        sha512 = "l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==";
       };
     };
-    "@babel/generator-7.12.11" = {
+    "@babel/generator-7.6.2" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.12.11";
+      version = "7.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
-        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz";
+        sha512 = "j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==";
       };
     };
-    "@babel/helper-function-name-7.12.11" = {
+    "@babel/helper-function-name-7.1.0" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.12.11";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
-        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz";
+        sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==";
       };
     };
-    "@babel/helper-get-function-arity-7.12.10" = {
+    "@babel/helper-get-function-arity-7.0.0" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.12.10";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
-        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz";
+        sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.12.7" = {
-      name = "_at_babel_slash_helper-member-expression-to-functions";
-      packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.12.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
-        sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
-      };
-    };
-    "@babel/helper-module-imports-7.12.5" = {
-      name = "_at_babel_slash_helper-module-imports";
-      packageName = "@babel/helper-module-imports";
-      version = "7.12.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
-        sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
-      };
-    };
-    "@babel/helper-module-transforms-7.12.1" = {
-      name = "_at_babel_slash_helper-module-transforms";
-      packageName = "@babel/helper-module-transforms";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
-        sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
-      };
-    };
-    "@babel/helper-optimise-call-expression-7.12.10" = {
-      name = "_at_babel_slash_helper-optimise-call-expression";
-      packageName = "@babel/helper-optimise-call-expression";
-      version = "7.12.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
-        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
-      };
-    };
-    "@babel/helper-plugin-utils-7.10.4" = {
+    "@babel/helper-plugin-utils-7.0.0" = {
       name = "_at_babel_slash_helper-plugin-utils";
       packageName = "@babel/helper-plugin-utils";
-      version = "7.10.4";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz";
-        sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
+        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz";
+        sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==";
       };
     };
-    "@babel/helper-replace-supers-7.12.11" = {
-      name = "_at_babel_slash_helper-replace-supers";
-      packageName = "@babel/helper-replace-supers";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
-        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
-      };
-    };
-    "@babel/helper-simple-access-7.12.1" = {
-      name = "_at_babel_slash_helper-simple-access";
-      packageName = "@babel/helper-simple-access";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
-        sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
-      };
-    };
-    "@babel/helper-split-export-declaration-7.12.11" = {
+    "@babel/helper-split-export-declaration-7.4.4" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.12.11";
+      version = "7.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
-        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz";
+        sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==";
       };
     };
-    "@babel/helper-validator-identifier-7.12.11" = {
-      name = "_at_babel_slash_helper-validator-identifier";
-      packageName = "@babel/helper-validator-identifier";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
-        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
-      };
-    };
-    "@babel/helpers-7.12.5" = {
+    "@babel/helpers-7.6.2" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.12.5";
+      version = "7.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
-        sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz";
+        sha512 = "3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==";
       };
     };
-    "@babel/highlight-7.10.4" = {
+    "@babel/highlight-7.5.0" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.10.4";
+      version = "7.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz";
-        sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz";
+        sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==";
       };
     };
-    "@babel/parser-7.12.11" = {
+    "@babel/parser-7.6.2" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.11";
+      version = "7.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
-        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz";
+        sha512 = "mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==";
       };
     };
-    "@babel/plugin-syntax-object-rest-spread-7.8.3" = {
+    "@babel/plugin-syntax-object-rest-spread-7.2.0" = {
       name = "_at_babel_slash_plugin-syntax-object-rest-spread";
       packageName = "@babel/plugin-syntax-object-rest-spread";
-      version = "7.8.3";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz";
-        sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz";
+        sha512 = "t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==";
       };
     };
-    "@babel/template-7.12.7" = {
+    "@babel/template-7.6.0" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.12.7";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
-        sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz";
+        sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==";
       };
     };
-    "@babel/traverse-7.12.12" = {
+    "@babel/traverse-7.6.2" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.12";
+      version = "7.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
-        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz";
+        sha512 = "8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==";
       };
     };
-    "@babel/types-7.12.12" = {
+    "@babel/types-7.6.1" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.12";
+      version = "7.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
-        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz";
+        sha512 = "X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==";
       };
     };
-    "@cnakazawa/watch-1.0.4" = {
+    "@cnakazawa/watch-1.0.3" = {
       name = "_at_cnakazawa_slash_watch";
       packageName = "@cnakazawa/watch";
-      version = "1.0.4";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz";
-        sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==";
+        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz";
+        sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==";
       };
     };
     "@jest/console-24.9.0" = {
@@ -292,22 +229,13 @@ let
         sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==";
       };
     };
-    "@kubernetes/client-node-0.10.3" = {
+    "@kubernetes/client-node-0.10.1" = {
       name = "_at_kubernetes_slash_client-node";
       packageName = "@kubernetes/client-node";
-      version = "0.10.3";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.3.tgz";
-        sha512 = "mw+1zdKfMW4QN2ns82SKFhAvqC4SVUAiItto4oFg3Me+a510h3h9N5O7ad6m4efAmlQBlMc6Y5FHz70dAwuiMg==";
-      };
-    };
-    "@sindresorhus/is-0.7.0" = {
-      name = "_at_sindresorhus_slash_is";
-      packageName = "@sindresorhus/is";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz";
-        sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
+        url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.1.tgz";
+        sha512 = "AOfrCPa5oqdk/7lzIVU+4yYPlphc8cGW+kbiJAS5+GTbUpo62f5jPbWSPv83jTjQwfhWucj3t+3VHxQGdNexsw==";
       };
     };
     "@types/accepts-1.3.5" = {
@@ -328,49 +256,49 @@ let
         sha1 = "ec2300fbe7d7dddd7eb9d3abf87999964cafce46";
       };
     };
-    "@types/babel-types-7.0.9" = {
+    "@types/babel-types-7.0.7" = {
       name = "_at_types_slash_babel-types";
       packageName = "@types/babel-types";
-      version = "7.0.9";
+      version = "7.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz";
-        sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA==";
+        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz";
+        sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
       };
     };
-    "@types/babel__core-7.1.12" = {
+    "@types/babel__core-7.1.3" = {
       name = "_at_types_slash_babel__core";
       packageName = "@types/babel__core";
-      version = "7.1.12";
+      version = "7.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz";
-        sha512 = "wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==";
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz";
+        sha512 = "8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==";
       };
     };
-    "@types/babel__generator-7.6.2" = {
+    "@types/babel__generator-7.6.0" = {
       name = "_at_types_slash_babel__generator";
       packageName = "@types/babel__generator";
-      version = "7.6.2";
+      version = "7.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz";
-        sha512 = "MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==";
+        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.0.tgz";
+        sha512 = "c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw==";
       };
     };
-    "@types/babel__template-7.4.0" = {
+    "@types/babel__template-7.0.2" = {
       name = "_at_types_slash_babel__template";
       packageName = "@types/babel__template";
-      version = "7.4.0";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz";
-        sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==";
+        url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz";
+        sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==";
       };
     };
-    "@types/babel__traverse-7.11.0" = {
+    "@types/babel__traverse-7.0.7" = {
       name = "_at_types_slash_babel__traverse";
       packageName = "@types/babel__traverse";
-      version = "7.11.0";
+      version = "7.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz";
-        sha512 = "kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==";
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz";
+        sha512 = "CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==";
       };
     };
     "@types/babylon-6.16.5" = {
@@ -382,13 +310,13 @@ let
         sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==";
       };
     };
-    "@types/body-parser-1.19.0" = {
+    "@types/body-parser-1.17.1" = {
       name = "_at_types_slash_body-parser";
       packageName = "@types/body-parser";
-      version = "1.19.0";
+      version = "1.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz";
-        sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
+        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz";
+        sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==";
       };
     };
     "@types/caseless-0.12.2" = {
@@ -409,40 +337,31 @@ let
         sha512 = "4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg==";
       };
     };
-    "@types/connect-3.4.34" = {
+    "@types/connect-3.4.32" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.34";
+      version = "3.4.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz";
-        sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz";
+        sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==";
       };
     };
-    "@types/content-disposition-0.5.3" = {
-      name = "_at_types_slash_content-disposition";
-      packageName = "@types/content-disposition";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.3.tgz";
-        sha512 = "P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg==";
-      };
-    };
-    "@types/cookies-0.7.6" = {
+    "@types/cookies-0.7.3" = {
       name = "_at_types_slash_cookies";
       packageName = "@types/cookies";
-      version = "0.7.6";
+      version = "0.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.6.tgz";
-        sha512 = "FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w==";
+        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.3.tgz";
+        sha512 = "NEkYn8pNsYZIxf3ZrjdPoeyueiPc0RbQClUpTwmdHkpmQQ8iDAlQYKpabuegHy7BJcqTteSTkhURMEs9ZxyEWg==";
       };
     };
-    "@types/cron-1.7.2" = {
+    "@types/cron-1.7.1" = {
       name = "_at_types_slash_cron";
       packageName = "@types/cron";
-      version = "1.7.2";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.2.tgz";
-        sha512 = "AEpNLRcsVSc5AdseJKNHpz0d4e8+ow+abTaC0fKDbAU86rF1evoFF0oC2fV9FdqtfVXkG2LKshpLTJCFOpyvTg==";
+        url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.1.tgz";
+        sha512 = "48brwgU18DqA0mQX1As5OcJEo1yNjaXMM6Mk4r8K1dOzLJRQ37FE/kCivKx7ClKEHfhX2FdcxKzJ1B744a+V3A==";
       };
     };
     "@types/events-3.0.0" = {
@@ -454,40 +373,49 @@ let
         sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
       };
     };
-    "@types/express-4.17.11" = {
+    "@types/express-4.17.1" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.11";
+      version = "4.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz";
-        sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz";
+        sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==";
       };
     };
-    "@types/express-serve-static-core-4.17.18" = {
+    "@types/express-serve-static-core-4.16.9" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.18";
+      version = "4.16.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
-        sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz";
+        sha512 = "GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==";
       };
     };
-    "@types/formidable-1.0.32" = {
+    "@types/form-data-2.5.0" = {
+      name = "_at_types_slash_form-data";
+      packageName = "@types/form-data";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.5.0.tgz";
+        sha512 = "23/wYiuckYYtFpL+4RPWiWmRQH2BjFuqCUi2+N3amB1a1Drv+i/byTrGvlLwRVLFNAZbwpbQ7JvTK+VCAPMbcg==";
+      };
+    };
+    "@types/formidable-1.0.31" = {
       name = "_at_types_slash_formidable";
       packageName = "@types/formidable";
-      version = "1.0.32";
+      version = "1.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/formidable/-/formidable-1.0.32.tgz";
-        sha512 = "jOAB5+GFW+C+2xdvUcpd/CnYg2rD5xCyagJLBJU+9PB4a/DKmsAqS9yZI3j/Q9zwvM7ztPHaAIH1ijzp4cezdQ==";
+        url = "https://registry.npmjs.org/@types/formidable/-/formidable-1.0.31.tgz";
+        sha512 = "dIhM5t8lRP0oWe2HF8MuPvdd1TpPTjhDMAqemcq6oIZQCBQTovhBAdTQ5L5veJB4pdQChadmHuxtB0YzqvfU3Q==";
       };
     };
-    "@types/glob-7.1.3" = {
+    "@types/glob-7.1.1" = {
       name = "_at_types_slash_glob";
       packageName = "@types/glob";
-      version = "7.1.3";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz";
-        sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==";
+        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
+        sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
       };
     };
     "@types/http-assert-1.5.1" = {
@@ -499,94 +427,94 @@ let
         sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==";
       };
     };
-    "@types/http-errors-1.8.0" = {
-      name = "_at_types_slash_http-errors";
-      packageName = "@types/http-errors";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.8.0.tgz";
-        sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA==";
-      };
-    };
-    "@types/istanbul-lib-coverage-2.0.3" = {
+    "@types/istanbul-lib-coverage-2.0.1" = {
       name = "_at_types_slash_istanbul-lib-coverage";
       packageName = "@types/istanbul-lib-coverage";
-      version = "2.0.3";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz";
-        sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==";
+        url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
+        sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==";
       };
     };
-    "@types/istanbul-lib-report-3.0.0" = {
+    "@types/istanbul-lib-report-1.1.1" = {
       name = "_at_types_slash_istanbul-lib-report";
       packageName = "@types/istanbul-lib-report";
-      version = "3.0.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
-        sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==";
+        url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz";
+        sha512 = "3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==";
       };
     };
-    "@types/istanbul-reports-1.1.2" = {
+    "@types/istanbul-reports-1.1.1" = {
       name = "_at_types_slash_istanbul-reports";
       packageName = "@types/istanbul-reports";
-      version = "1.1.2";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz";
-        sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==";
+        url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
+        sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
       };
     };
-    "@types/jest-24.9.1" = {
+    "@types/jest-24.0.15" = {
       name = "_at_types_slash_jest";
       packageName = "@types/jest";
-      version = "24.9.1";
+      version = "24.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz";
-        sha512 = "Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==";
+        url = "https://registry.npmjs.org/@types/jest/-/jest-24.0.15.tgz";
+        sha512 = "MU1HIvWUme74stAoc3mgAi+aMlgKOudgEvQDIm1v4RkrDudBh1T+NFp5sftpBAdXdx1J0PbdpJ+M2EsSOi1djA==";
       };
     };
-    "@types/js-yaml-3.12.6" = {
+    "@types/jest-diff-20.0.1" = {
+      name = "_at_types_slash_jest-diff";
+      packageName = "@types/jest-diff";
+      version = "20.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/jest-diff/-/jest-diff-20.0.1.tgz";
+        sha512 = "yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==";
+      };
+    };
+    "@types/js-yaml-3.12.1" = {
       name = "_at_types_slash_js-yaml";
       packageName = "@types/js-yaml";
-      version = "3.12.6";
+      version = "3.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.6.tgz";
-        sha512 = "cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ==";
+        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.1.tgz";
+        sha512 = "SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==";
       };
     };
-    "@types/keygrip-1.0.2" = {
+    "@types/keygrip-1.0.1" = {
       name = "_at_types_slash_keygrip";
       packageName = "@types/keygrip";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz";
-        sha512 = "GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==";
+        url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.1.tgz";
+        sha1 = "ff540462d2fb4d0a88441ceaf27d287b01c3d878";
       };
     };
-    "@types/koa-2.11.6" = {
+    "@types/koa-2.0.48" = {
       name = "_at_types_slash_koa";
       packageName = "@types/koa";
-      version = "2.11.6";
+      version = "2.0.48";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.6.tgz";
-        sha512 = "BhyrMj06eQkk04C97fovEDQMpLpd2IxCB4ecitaXwOKGq78Wi2tooaDOWOFGajPk8IkQOAtMppApgSVkYe1F/A==";
+        url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.48.tgz";
+        sha512 = "CiIUYhHlOFJhSCTmsFoFkV2t9ij1JwW26nt0W9XZoWTvmAw6zTE0+k3IAoGICtjzIfhZpZcO323NHmI1LGmdDw==";
       };
     };
-    "@types/koa-compose-3.2.5" = {
+    "@types/koa-compose-3.2.4" = {
       name = "_at_types_slash_koa-compose";
       packageName = "@types/koa-compose";
-      version = "3.2.5";
+      version = "3.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz";
-        sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==";
+        url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.4.tgz";
+        sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA==";
       };
     };
-    "@types/koa-router-7.4.1" = {
+    "@types/koa-router-7.0.41" = {
       name = "_at_types_slash_koa-router";
       packageName = "@types/koa-router";
-      version = "7.4.1";
+      version = "7.0.41";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.1.tgz";
-        sha512 = "Hg78TXz78QYfEgdq3nTeRmQFEwJKZljsXb/DhtexmyrpRDRnl59oMglh9uPj3/WgKor0woANrYTnxA8gaWGK2A==";
+        url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.0.41.tgz";
+        sha512 = "WZwdCzMOvx2zA4MTinmrzqn66I87mE8S5lFgVY05/BVKULDi2Yup2Q2AOnw9vvaLME4IVJhWAeXpZjdZpKZDtg==";
       };
     };
     "@types/koa-send-4.1.2" = {
@@ -607,22 +535,22 @@ let
         sha512 = "SSpct5fEcAeRkBHa3RiwCIRfDHcD1cZRhwRF///ZfvRt8KhoqRrhK6wpDlYPk/vWHVFE9hPGqh68bhzsHkir4w==";
       };
     };
-    "@types/koa-views-2.0.4" = {
+    "@types/koa-views-2.0.3" = {
       name = "_at_types_slash_koa-views";
       packageName = "@types/koa-views";
-      version = "2.0.4";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.4.tgz";
-        sha512 = "aGFBVLiPC7FkXTqHLhnmjKhx3COV+GeJHO9OkLX/p/iAQTgDB5bbnsddx3XgrS6aACWyxR3BpQJVDdSqCNY1lw==";
+        url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.3.tgz";
+        sha512 = "XLn//7qUUz2U9ZKXyHPwVIcQbZcW3phYTFXHGa1eW5BN88bi8n2fegvwJ+TokL2jRmRqBWwMB5p7Aab9iq1sZw==";
       };
     };
-    "@types/lodash-4.14.168" = {
+    "@types/lodash-4.14.140" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.168";
+      version = "4.14.140";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz";
-        sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.140.tgz";
+        sha512 = "OU57uYCUUv9s8lgQTYuQlL6xkttWtz8VLCJSnt8ikla9+UXqMGJ8adCprSw7egJHSHwGvFpGhfpQDtHm/NQ3Cw==";
       };
     };
     "@types/lodash.clonedeep-4.5.6" = {
@@ -634,13 +562,13 @@ let
         sha512 = "cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA==";
       };
     };
-    "@types/mime-1.3.2" = {
+    "@types/mime-2.0.1" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
-      version = "1.3.2";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
-        sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
+        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz";
+        sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -661,22 +589,22 @@ let
         sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==";
       };
     };
-    "@types/node-10.17.51" = {
+    "@types/node-10.14.19" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.51";
+      version = "10.14.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.51.tgz";
-        sha512 = "KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.14.19.tgz";
+        sha512 = "j6Sqt38ssdMKutXBUuAcmWF8QtHW1Fwz/mz4Y+Wd9mzpBiVFirjpNQf363hG5itkG+yGaD+oiLyb50HxJ36l9Q==";
       };
     };
-    "@types/node-12.19.15" = {
+    "@types/node-12.0.8" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.19.15";
+      version = "12.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz";
-        sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.0.8.tgz";
+        sha512 = "b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg==";
       };
     };
     "@types/ora-3.2.0" = {
@@ -688,15 +616,6 @@ let
         sha512 = "jll99xUKpiFbIFZSQcxm4numfsLaOWBzWNaRk3PvTSE7BPqTzzOCFmS0mQ7m8qkTfmYhuYbehTGsxkvRLPC++w==";
       };
     };
-    "@types/qs-6.9.5" = {
-      name = "_at_types_slash_qs";
-      packageName = "@types/qs";
-      version = "6.9.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz";
-        sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==";
-      };
-    };
     "@types/range-parser-1.2.3" = {
       name = "_at_types_slash_range-parser";
       packageName = "@types/range-parser";
@@ -706,22 +625,22 @@ let
         sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
       };
     };
-    "@types/request-2.48.5" = {
+    "@types/request-2.48.1" = {
       name = "_at_types_slash_request";
       packageName = "@types/request";
-      version = "2.48.5";
+      version = "2.48.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz";
-        sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==";
+        url = "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz";
+        sha512 = "ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==";
       };
     };
-    "@types/serve-static-1.13.9" = {
+    "@types/serve-static-1.13.3" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.9";
+      version = "1.13.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
-        sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz";
+        sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==";
       };
     };
     "@types/stack-utils-1.0.1" = {
@@ -733,22 +652,22 @@ let
         sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==";
       };
     };
-    "@types/tough-cookie-4.0.0" = {
+    "@types/tough-cookie-2.3.5" = {
       name = "_at_types_slash_tough-cookie";
       packageName = "@types/tough-cookie";
-      version = "4.0.0";
+      version = "2.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz";
-        sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==";
+        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz";
+        sha512 = "SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==";
       };
     };
-    "@types/underscore-1.10.24" = {
+    "@types/underscore-1.9.3" = {
       name = "_at_types_slash_underscore";
       packageName = "@types/underscore";
-      version = "1.10.24";
+      version = "1.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.24.tgz";
-        sha512 = "T3NQD8hXNW2sRsSbLNjF/aBo18MyJlbw0lSpQHB/eZZtScPdexN4HSa8cByYwTw9Wy7KuOFr81mlDQcQQaZ79w==";
+        url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.3.tgz";
+        sha512 = "SwbHKB2DPIDlvYqtK5O+0LFtZAyrUSw4c0q+HWwmH1Ve3KMQ0/5PlV3RX97+3dP7yMrnNQ8/bCWWvQpPl03Mug==";
       };
     };
     "@types/websocket-0.0.40" = {
@@ -760,193 +679,193 @@ let
         sha512 = "ldteZwWIgl9cOy7FyvYn+39Ah4+PfpVE72eYKw75iy2L0zTbhbcwvzeJ5IOu6DQP93bjfXq0NGHY6FYtmYoqFQ==";
       };
     };
-    "@types/ws-6.0.4" = {
+    "@types/ws-6.0.3" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "6.0.4";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz";
-        sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz";
+        sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==";
       };
     };
-    "@types/yargs-13.0.11" = {
+    "@types/yargs-13.0.3" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "13.0.11";
+      version = "13.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz";
-        sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz";
+        sha512 = "K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==";
       };
     };
-    "@types/yargs-parser-20.2.0" = {
+    "@types/yargs-parser-13.1.0" = {
       name = "_at_types_slash_yargs-parser";
       packageName = "@types/yargs-parser";
-      version = "20.2.0";
+      version = "13.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz";
-        sha512 = "37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==";
+        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz";
+        sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==";
       };
     };
-    "@webassemblyjs/ast-1.9.0" = {
+    "@webassemblyjs/ast-1.8.5" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz";
-        sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz";
+        sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.9.0" = {
+    "@webassemblyjs/floating-point-hex-parser-1.8.5" = {
       name = "_at_webassemblyjs_slash_floating-point-hex-parser";
       packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz";
-        sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz";
+        sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==";
       };
     };
-    "@webassemblyjs/helper-api-error-1.9.0" = {
+    "@webassemblyjs/helper-api-error-1.8.5" = {
       name = "_at_webassemblyjs_slash_helper-api-error";
       packageName = "@webassemblyjs/helper-api-error";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz";
-        sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz";
+        sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.9.0" = {
+    "@webassemblyjs/helper-buffer-1.8.5" = {
       name = "_at_webassemblyjs_slash_helper-buffer";
       packageName = "@webassemblyjs/helper-buffer";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz";
-        sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz";
+        sha512 = "Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==";
       };
     };
-    "@webassemblyjs/helper-code-frame-1.9.0" = {
+    "@webassemblyjs/helper-code-frame-1.8.5" = {
       name = "_at_webassemblyjs_slash_helper-code-frame";
       packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz";
-        sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz";
+        sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==";
       };
     };
-    "@webassemblyjs/helper-fsm-1.9.0" = {
+    "@webassemblyjs/helper-fsm-1.8.5" = {
       name = "_at_webassemblyjs_slash_helper-fsm";
       packageName = "@webassemblyjs/helper-fsm";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz";
-        sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz";
+        sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==";
       };
     };
-    "@webassemblyjs/helper-module-context-1.9.0" = {
+    "@webassemblyjs/helper-module-context-1.8.5" = {
       name = "_at_webassemblyjs_slash_helper-module-context";
       packageName = "@webassemblyjs/helper-module-context";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz";
-        sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz";
+        sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==";
       };
     };
-    "@webassemblyjs/helper-wasm-bytecode-1.9.0" = {
+    "@webassemblyjs/helper-wasm-bytecode-1.8.5" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz";
-        sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz";
+        sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.9.0" = {
+    "@webassemblyjs/helper-wasm-section-1.8.5" = {
       name = "_at_webassemblyjs_slash_helper-wasm-section";
       packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz";
-        sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz";
+        sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==";
       };
     };
-    "@webassemblyjs/ieee754-1.9.0" = {
+    "@webassemblyjs/ieee754-1.8.5" = {
       name = "_at_webassemblyjs_slash_ieee754";
       packageName = "@webassemblyjs/ieee754";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz";
-        sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz";
+        sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==";
       };
     };
-    "@webassemblyjs/leb128-1.9.0" = {
+    "@webassemblyjs/leb128-1.8.5" = {
       name = "_at_webassemblyjs_slash_leb128";
       packageName = "@webassemblyjs/leb128";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz";
-        sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz";
+        sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==";
       };
     };
-    "@webassemblyjs/utf8-1.9.0" = {
+    "@webassemblyjs/utf8-1.8.5" = {
       name = "_at_webassemblyjs_slash_utf8";
       packageName = "@webassemblyjs/utf8";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz";
-        sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==";
+        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz";
+        sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.9.0" = {
+    "@webassemblyjs/wasm-edit-1.8.5" = {
       name = "_at_webassemblyjs_slash_wasm-edit";
       packageName = "@webassemblyjs/wasm-edit";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz";
-        sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz";
+        sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==";
       };
     };
-    "@webassemblyjs/wasm-gen-1.9.0" = {
+    "@webassemblyjs/wasm-gen-1.8.5" = {
       name = "_at_webassemblyjs_slash_wasm-gen";
       packageName = "@webassemblyjs/wasm-gen";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz";
-        sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz";
+        sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.9.0" = {
+    "@webassemblyjs/wasm-opt-1.8.5" = {
       name = "_at_webassemblyjs_slash_wasm-opt";
       packageName = "@webassemblyjs/wasm-opt";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz";
-        sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz";
+        sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.9.0" = {
+    "@webassemblyjs/wasm-parser-1.8.5" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz";
-        sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz";
+        sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==";
       };
     };
-    "@webassemblyjs/wast-parser-1.9.0" = {
+    "@webassemblyjs/wast-parser-1.8.5" = {
       name = "_at_webassemblyjs_slash_wast-parser";
       packageName = "@webassemblyjs/wast-parser";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz";
-        sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz";
+        sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==";
       };
     };
-    "@webassemblyjs/wast-printer-1.9.0" = {
+    "@webassemblyjs/wast-printer-1.8.5" = {
       name = "_at_webassemblyjs_slash_wast-printer";
       packageName = "@webassemblyjs/wast-printer";
-      version = "1.9.0";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz";
-        sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz";
+        sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -967,13 +886,13 @@ let
         sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==";
       };
     };
-    "abab-2.0.5" = {
+    "abab-2.0.2" = {
       name = "abab";
       packageName = "abab";
-      version = "2.0.5";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz";
-        sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==";
+        url = "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz";
+        sha512 = "2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==";
       };
     };
     "abbrev-1.1.1" = {
@@ -1012,31 +931,31 @@ let
         sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
-    "acorn-5.7.4" = {
+    "acorn-5.7.3" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.7.4";
+      version = "5.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz";
-        sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz";
+        sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
       };
     };
-    "acorn-6.4.2" = {
+    "acorn-6.3.0" = {
       name = "acorn";
       packageName = "acorn";
-      version = "6.4.2";
+      version = "6.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz";
-        sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz";
+        sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==";
       };
     };
-    "acorn-7.4.1" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "7.4.1";
+    "acorn-dynamic-import-4.0.0" = {
+      name = "acorn-dynamic-import";
+      packageName = "acorn-dynamic-import";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
-        sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
+        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz";
+        sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==";
       };
     };
     "acorn-globals-3.1.0" = {
@@ -1066,31 +985,13 @@ let
         sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
       };
     };
-    "acorn-walk-7.2.0" = {
-      name = "acorn-walk";
-      packageName = "acorn-walk";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz";
-        sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==";
-      };
-    };
-    "aggregate-error-1.0.0" = {
-      name = "aggregate-error";
-      packageName = "aggregate-error";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz";
-        sha1 = "888344dad0220a72e3af50906117f48771925fac";
-      };
-    };
-    "ajv-6.12.6" = {
+    "ajv-6.10.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.6";
+      version = "6.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
-        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz";
+        sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==";
       };
     };
     "ajv-errors-1.0.1" = {
@@ -1102,13 +1003,13 @@ let
         sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==";
       };
     };
-    "ajv-keywords-3.5.2" = {
+    "ajv-keywords-3.4.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "3.5.2";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz";
-        sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz";
+        sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==";
       };
     };
     "align-text-0.1.4" = {
@@ -1210,15 +1111,6 @@ let
         sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
       };
     };
-    "anymatch-3.1.1" = {
-      name = "anymatch";
-      packageName = "anymatch";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz";
-        sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==";
-      };
-    };
     "aproba-1.2.0" = {
       name = "aproba";
       packageName = "aproba";
@@ -1345,13 +1237,13 @@ let
         sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
       };
     };
-    "asn1.js-5.4.1" = {
+    "asn1.js-4.10.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "5.4.1";
+      version = "4.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz";
-        sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
+        sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
       };
     };
     "assert-1.5.0" = {
@@ -1390,13 +1282,13 @@ let
         sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
       };
     };
-    "async-2.6.3" = {
+    "async-1.5.2" = {
       name = "async";
       packageName = "async";
-      version = "2.6.3";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz";
-        sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==";
+        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
       };
     };
     "async-each-1.0.3" = {
@@ -1408,13 +1300,13 @@ let
         sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==";
       };
     };
-    "async-limiter-1.0.1" = {
+    "async-limiter-1.0.0" = {
       name = "async-limiter";
       packageName = "async-limiter";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
-        sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==";
+        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
+        sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
       };
     };
     "asynckit-0.4.0" = {
@@ -1453,22 +1345,22 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.11.0" = {
+    "aws4-1.8.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.11.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
-        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
+        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
       };
     };
-    "axios-0.19.2" = {
+    "axios-0.19.0" = {
       name = "axios";
       packageName = "axios";
-      version = "0.19.2";
+      version = "0.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
-        sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
+        url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz";
+        sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==";
       };
     };
     "babel-6.23.0" = {
@@ -1615,6 +1507,15 @@ let
         sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
       };
     };
+    "babel-jest-24.8.0" = {
+      name = "babel-jest";
+      packageName = "babel-jest";
+      version = "24.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz";
+        sha512 = "+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==";
+      };
+    };
     "babel-jest-24.9.0" = {
       name = "babel-jest";
       packageName = "babel-jest";
@@ -2011,22 +1912,13 @@ let
         sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
       };
     };
-    "base64-js-1.5.1" = {
+    "base64-js-1.3.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.5.1";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
-        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
-      };
-    };
-    "base64url-3.0.1" = {
-      name = "base64url";
-      packageName = "base64url";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz";
-        sha512 = "ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+        sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
       };
     };
     "batch-0.6.1" = {
@@ -2074,49 +1966,22 @@ let
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
-    "binary-extensions-2.2.0" = {
-      name = "binary-extensions";
-      packageName = "binary-extensions";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
-        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
-      };
-    };
-    "bindings-1.5.0" = {
-      name = "bindings";
-      packageName = "bindings";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz";
-        sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
-      };
-    };
-    "bluebird-3.7.2" = {
+    "bluebird-3.5.5" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.7.2";
+      version = "3.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
-        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
+        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
       };
     };
-    "bn.js-4.11.9" = {
+    "bn.js-4.11.8" = {
       name = "bn.js";
       packageName = "bn.js";
-      version = "4.11.9";
+      version = "4.11.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz";
-        sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==";
-      };
-    };
-    "bn.js-5.1.3" = {
-      name = "bn.js";
-      packageName = "bn.js";
-      version = "5.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz";
-        sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==";
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
+        sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==";
       };
     };
     "body-parser-1.19.0" = {
@@ -2155,15 +2020,6 @@ let
         sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
       };
     };
-    "braces-3.0.2" = {
-      name = "braces";
-      packageName = "braces";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
-        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
-      };
-    };
     "brorand-1.1.0" = {
       name = "brorand";
       packageName = "brorand";
@@ -2173,13 +2029,13 @@ let
         sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
-    "browser-process-hrtime-1.0.0" = {
+    "browser-process-hrtime-0.1.3" = {
       name = "browser-process-hrtime";
       packageName = "browser-process-hrtime";
-      version = "1.0.0";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
-        sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
+        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
+        sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==";
       };
     };
     "browser-resolve-1.11.3" = {
@@ -2218,22 +2074,22 @@ let
         sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
       };
     };
-    "browserify-rsa-4.1.0" = {
+    "browserify-rsa-4.0.1" = {
       name = "browserify-rsa";
       packageName = "browserify-rsa";
-      version = "4.1.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz";
-        sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==";
+        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "browserify-sign-4.2.1" = {
+    "browserify-sign-4.0.4" = {
       name = "browserify-sign";
       packageName = "browserify-sign";
-      version = "4.2.1";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz";
-        sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==";
+        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
+        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
       };
     };
     "browserify-zlib-0.2.0" = {
@@ -2263,31 +2119,22 @@ let
         sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==";
       };
     };
-    "bser-2.1.1" = {
+    "bser-2.1.0" = {
       name = "bser";
       packageName = "bser";
-      version = "2.1.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz";
-        sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==";
+        url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz";
+        sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==";
       };
     };
-    "buffer-4.9.2" = {
+    "buffer-4.9.1" = {
       name = "buffer";
       packageName = "buffer";
-      version = "4.9.2";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz";
-        sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==";
-      };
-    };
-    "buffer-5.7.1" = {
-      name = "buffer";
-      packageName = "buffer";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz";
-        sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
+        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
     "buffer-from-1.1.1" = {
@@ -2317,15 +2164,6 @@ let
         sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
       };
     };
-    "bufferutil-4.0.3" = {
-      name = "bufferutil";
-      packageName = "bufferutil";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.3.tgz";
-        sha512 = "yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw==";
-      };
-    };
     "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
@@ -2335,15 +2173,6 @@ let
         sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
       };
     };
-    "byline-5.0.0" = {
-      name = "byline";
-      packageName = "byline";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz";
-        sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1";
-      };
-    };
     "bytes-3.0.0" = {
       name = "bytes";
       packageName = "bytes";
@@ -2371,13 +2200,13 @@ let
         sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==";
       };
     };
-    "cacache-12.0.4" = {
+    "cacache-12.0.3" = {
       name = "cacache";
       packageName = "cacache";
-      version = "12.0.4";
+      version = "12.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz";
-        sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==";
+        url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz";
+        sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==";
       };
     };
     "cache-base-1.0.1" = {
@@ -2398,24 +2227,6 @@ let
         sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==";
       };
     };
-    "cacheable-request-2.1.4" = {
-      name = "cacheable-request";
-      packageName = "cacheable-request";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz";
-        sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d";
-      };
-    };
-    "call-bind-1.0.2" = {
-      name = "call-bind";
-      packageName = "call-bind";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
-        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
-      };
-    };
     "callsites-3.1.0" = {
       name = "callsites";
       packageName = "callsites";
@@ -2452,13 +2263,13 @@ let
         sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
-    "caniuse-lite-1.0.30001179" = {
+    "caniuse-lite-1.0.30000997" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001179";
+      version = "1.0.30000997";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz";
-        sha512 = "blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000997.tgz";
+        sha512 = "BQLFPIdj2ntgBNWp9Q64LGUIEmvhKkzzHhUHR3CD5A9Lb7ZKF20/+sgadhFap69lk5XmK1fTUleDclaRFvgVUA==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -2533,22 +2344,13 @@ let
         sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
       };
     };
-    "chokidar-3.5.1" = {
-      name = "chokidar";
-      packageName = "chokidar";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz";
-        sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==";
-      };
-    };
-    "chownr-1.1.4" = {
+    "chownr-1.1.3" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.1.4";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
-        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
+        sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
       };
     };
     "chrome-trace-event-1.0.2" = {
@@ -2587,22 +2389,13 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "clean-css-4.2.3" = {
+    "clean-css-4.2.1" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "4.2.3";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz";
-        sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==";
-      };
-    };
-    "clean-stack-1.3.0" = {
-      name = "clean-stack";
-      packageName = "clean-stack";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz";
-        sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz";
+        sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==";
       };
     };
     "cli-cursor-2.1.0" = {
@@ -2614,13 +2407,13 @@ let
         sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
       };
     };
-    "cli-spinners-2.5.0" = {
+    "cli-spinners-2.2.0" = {
       name = "cli-spinners";
       packageName = "cli-spinners";
-      version = "2.5.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz";
-        sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==";
+        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz";
+        sha512 = "tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==";
       };
     };
     "cliui-2.1.0" = {
@@ -2632,6 +2425,15 @@ let
         sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
       };
     };
+    "cliui-4.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
+        sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
+      };
+    };
     "cliui-5.0.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -2650,15 +2452,6 @@ let
         sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
       };
     };
-    "clone-response-1.0.2" = {
-      name = "clone-response";
-      packageName = "clone-response";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz";
-        sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b";
-      };
-    };
     "co-4.6.0" = {
       name = "co";
       packageName = "co";
@@ -2677,6 +2470,15 @@ let
         sha512 = "sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ==";
       };
     };
+    "code-point-at-1.1.0" = {
+      name = "code-point-at";
+      packageName = "code-point-at";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    };
     "collection-visit-1.0.0" = {
       name = "collection-visit";
       packageName = "collection-visit";
@@ -2722,13 +2524,13 @@ let
         sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==";
       };
     };
-    "commander-2.20.3" = {
+    "commander-2.20.0" = {
       name = "commander";
       packageName = "commander";
-      version = "2.20.3";
+      version = "2.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
-        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
+        url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz";
+        sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==";
       };
     };
     "commondir-1.0.1" = {
@@ -2749,13 +2551,13 @@ let
         sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
       };
     };
-    "compressible-2.0.18" = {
+    "compressible-2.0.17" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.18";
+      version = "2.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz";
-        sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz";
+        sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==";
       };
     };
     "compression-1.7.4" = {
@@ -2812,13 +2614,13 @@ let
         sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==";
       };
     };
-    "console-browserify-1.2.0" = {
+    "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
-      version = "1.2.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz";
-        sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==";
+        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
       };
     };
     "consolidate-0.15.1" = {
@@ -2866,13 +2668,13 @@ let
         sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
       };
     };
-    "convert-source-map-1.7.0" = {
+    "convert-source-map-1.6.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.7.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz";
-        sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz";
+        sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==";
       };
     };
     "cookie-0.4.0" = {
@@ -2893,13 +2695,13 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "cookies-0.8.0" = {
+    "cookies-0.7.3" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.8.0";
+      version = "0.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz";
-        sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz";
+        sha512 = "+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==";
       };
     };
     "copy-concurrently-1.0.5" = {
@@ -2929,13 +2731,13 @@ let
         sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
       };
     };
-    "core-js-2.6.12" = {
+    "core-js-2.6.9" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.12";
+      version = "2.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz";
-        sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz";
+        sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2947,13 +2749,13 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "create-ecdh-4.0.4" = {
+    "create-ecdh-4.0.3" = {
       name = "create-ecdh";
       packageName = "create-ecdh";
-      version = "4.0.4";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz";
-        sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==";
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
+        sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==";
       };
     };
     "create-hash-1.2.0" = {
@@ -2974,13 +2776,13 @@ let
         sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
-    "cron-1.8.2" = {
+    "cron-1.7.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.8.2";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz";
-        sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==";
+        url = "https://registry.npmjs.org/cron/-/cron-1.7.1.tgz";
+        sha512 = "gmMB/pJcqUVs/NklR1sCGlNYM7TizEw+1gebz20BMc/8bTm/r7QUp3ZPSPlG8Z5XRlvb7qhjEjq/+bdIfUCL2A==";
       };
     };
     "cross-spawn-6.0.5" = {
@@ -3055,6 +2857,15 @@ let
         sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==";
       };
     };
+    "date-now-0.1.4" = {
+      name = "date-now";
+      packageName = "date-now";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+      };
+    };
     "debug-2.6.9" = {
       name = "debug";
       packageName = "debug";
@@ -3073,22 +2884,22 @@ let
         sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
-    "debug-3.2.7" = {
+    "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.7";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
       };
     };
-    "debug-4.3.2" = {
+    "debug-4.1.1" = {
       name = "debug";
       packageName = "debug";
-      version = "4.3.2";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
+        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
       };
     };
     "decamelize-1.2.0" = {
@@ -3109,15 +2920,6 @@ let
         sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
       };
     };
-    "decompress-response-3.3.0" = {
-      name = "decompress-response";
-      packageName = "decompress-response";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz";
-        sha1 = "80a4dd323748384bfa248083622aedec982adff3";
-      };
-    };
     "deep-equal-1.0.1" = {
       name = "deep-equal";
       packageName = "deep-equal";
@@ -3226,22 +3028,13 @@ let
         sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
       };
     };
-    "depd-2.0.0" = {
-      name = "depd";
-      packageName = "depd";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz";
-        sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==";
-      };
-    };
-    "des.js-1.0.1" = {
+    "des.js-1.0.0" = {
       name = "des.js";
       packageName = "des.js";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz";
-        sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==";
+        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
+        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
       };
     };
     "destroy-1.0.4" = {
@@ -3370,22 +3163,13 @@ let
         sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==";
       };
     };
-    "duplexer-0.1.2" = {
+    "duplexer-0.1.1" = {
       name = "duplexer";
       packageName = "duplexer";
-      version = "0.1.2";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz";
-        sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==";
-      };
-    };
-    "duplexer3-0.1.4" = {
-      name = "duplexer3";
-      packageName = "duplexer3";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz";
-        sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
+        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
       };
     };
     "duplexify-3.7.1" = {
@@ -3424,31 +3208,31 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "ejs-2.7.4" = {
+    "ejs-2.7.1" = {
       name = "ejs";
       packageName = "ejs";
-      version = "2.7.4";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
-        sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
+        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz";
+        sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
       };
     };
-    "electron-to-chromium-1.3.642" = {
+    "electron-to-chromium-1.3.267" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.642";
+      version = "1.3.267";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz";
-        sha512 = "cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.267.tgz";
+        sha512 = "9Q2ixAJC+oHjWNtJV0MQ4vJMCWSowIrC6V6vcr+bwPddTDHj2ddv9xxXCzf4jT/fy6HP7maPoW0gifXkRxCttQ==";
       };
     };
-    "elliptic-6.5.3" = {
+    "elliptic-6.5.1" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.3";
+      version = "6.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz";
-        sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz";
+        sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -3460,13 +3244,13 @@ let
         sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
       };
     };
-    "emojis-list-3.0.0" = {
+    "emojis-list-2.1.0" = {
       name = "emojis-list";
       packageName = "emojis-list";
-      version = "3.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
-        sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==";
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
+        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
     "encodeurl-1.0.2" = {
@@ -3487,22 +3271,22 @@ let
         sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
       };
     };
-    "enhanced-resolve-4.5.0" = {
+    "enhanced-resolve-4.1.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "4.5.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz";
-        sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
+        sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==";
       };
     };
-    "errno-0.1.8" = {
+    "errno-0.1.7" = {
       name = "errno";
       packageName = "errno";
-      version = "0.1.8";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz";
-        sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==";
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
+        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
       };
     };
     "error-ex-1.3.2" = {
@@ -3514,31 +3298,40 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "es-abstract-1.18.0-next.2" = {
+    "error-inject-1.0.0" = {
+      name = "error-inject";
+      packageName = "error-inject";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz";
+        sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
+      };
+    };
+    "es-abstract-1.14.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.18.0-next.2";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
-        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz";
+        sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==";
       };
     };
-    "es-to-primitive-1.2.1" = {
+    "es-to-primitive-1.2.0" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
-      version = "1.2.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
+        sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
       };
     };
-    "es5-ext-0.10.53" = {
+    "es5-ext-0.10.51" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.53";
+      version = "0.10.51";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz";
-        sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz";
+        sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==";
       };
     };
     "es6-iterator-2.0.3" = {
@@ -3550,22 +3343,13 @@ let
         sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
       };
     };
-    "es6-promise-4.2.8" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
-        sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
-      };
-    };
-    "es6-symbol-3.1.3" = {
+    "es6-symbol-3.1.2" = {
       name = "es6-symbol";
       packageName = "es6-symbol";
-      version = "3.1.3";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz";
-        sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==";
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz";
+        sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==";
       };
     };
     "escape-html-1.0.3" = {
@@ -3586,22 +3370,13 @@ let
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "escape-string-regexp-2.0.0" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz";
-        sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==";
-      };
-    };
-    "escodegen-1.14.3" = {
+    "escodegen-1.12.0" = {
       name = "escodegen";
       packageName = "escodegen";
-      version = "1.14.3";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz";
-        sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==";
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz";
+        sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
       };
     };
     "eslint-scope-4.0.3" = {
@@ -3613,6 +3388,15 @@ let
         sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
       };
     };
+    "esprima-3.1.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    };
     "esprima-4.0.1" = {
       name = "esprima";
       packageName = "esprima";
@@ -3622,13 +3406,13 @@ let
         sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
       };
     };
-    "esrecurse-4.3.0" = {
+    "esrecurse-4.2.1" = {
       name = "esrecurse";
       packageName = "esrecurse";
-      version = "4.3.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz";
-        sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==";
+        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz";
+        sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
       };
     };
     "estraverse-4.3.0" = {
@@ -3640,22 +3424,13 @@ let
         sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
       };
     };
-    "estraverse-5.2.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz";
-        sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==";
-      };
-    };
-    "esutils-2.0.3" = {
+    "esutils-2.0.2" = {
       name = "esutils";
       packageName = "esutils";
-      version = "2.0.3";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
-        sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
       };
     };
     "etag-1.8.1" = {
@@ -3667,22 +3442,22 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
-    "eventemitter3-4.0.7" = {
+    "eventemitter3-4.0.0" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "4.0.7";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz";
-        sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz";
+        sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==";
       };
     };
-    "events-3.2.0" = {
+    "events-3.0.0" = {
       name = "events";
       packageName = "events";
-      version = "3.2.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz";
-        sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==";
+        url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz";
+        sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==";
       };
     };
     "eventsource-1.0.7" = {
@@ -3703,13 +3478,13 @@ let
         sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
       };
     };
-    "exec-sh-0.3.4" = {
+    "exec-sh-0.3.2" = {
       name = "exec-sh";
       packageName = "exec-sh";
-      version = "0.3.4";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz";
-        sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==";
+        url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz";
+        sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==";
       };
     };
     "execa-1.0.0" = {
@@ -3766,15 +3541,6 @@ let
         sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
       };
     };
-    "ext-1.4.0" = {
-      name = "ext";
-      packageName = "ext";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz";
-        sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==";
-      };
-    };
     "extend-3.0.2" = {
       name = "extend";
       packageName = "extend";
@@ -3820,22 +3586,22 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-3.1.3" = {
+    "fast-deep-equal-2.0.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "3.1.3";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
-        sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
       };
     };
-    "fast-json-stable-stringify-2.1.0" = {
+    "fast-json-stable-stringify-2.0.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
-      version = "2.1.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
-        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
       };
     };
     "fast-levenshtein-2.0.6" = {
@@ -3847,6 +3613,15 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
+    "faye-websocket-0.10.0" = {
+      name = "faye-websocket";
+      packageName = "faye-websocket";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz";
+        sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
+      };
+    };
     "faye-websocket-0.11.3" = {
       name = "faye-websocket";
       packageName = "faye-websocket";
@@ -3856,31 +3631,22 @@ let
         sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==";
       };
     };
-    "fb-watchman-2.0.1" = {
+    "fb-watchman-2.0.0" = {
       name = "fb-watchman";
       packageName = "fb-watchman";
-      version = "2.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz";
-        sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==";
+        url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz";
+        sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58";
       };
     };
-    "figgy-pudding-3.5.2" = {
+    "figgy-pudding-3.5.1" = {
       name = "figgy-pudding";
       packageName = "figgy-pudding";
-      version = "3.5.2";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz";
-        sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==";
-      };
-    };
-    "file-uri-to-path-1.0.0" = {
-      name = "file-uri-to-path";
-      packageName = "file-uri-to-path";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
-        sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
+        url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
+        sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==";
       };
     };
     "filesize-3.6.1" = {
@@ -3901,15 +3667,6 @@ let
         sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
       };
     };
-    "fill-range-7.0.1" = {
-      name = "fill-range";
-      packageName = "fill-range";
-      version = "7.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
-        sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
-      };
-    };
     "finalhandler-1.1.2" = {
       name = "finalhandler";
       packageName = "finalhandler";
@@ -3964,13 +3721,13 @@ let
         sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
       };
     };
-    "findup-sync-3.0.0" = {
+    "findup-sync-2.0.0" = {
       name = "findup-sync";
       packageName = "findup-sync";
-      version = "3.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz";
-        sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==";
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz";
+        sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
       };
     };
     "flush-write-stream-1.1.1" = {
@@ -3991,15 +3748,6 @@ let
         sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
       };
     };
-    "for-each-0.3.3" = {
-      name = "for-each";
-      packageName = "for-each";
-      version = "0.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz";
-        sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==";
-      };
-    };
     "for-in-1.0.2" = {
       name = "for-in";
       packageName = "for-in";
@@ -4036,13 +3784,13 @@ let
         sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==";
       };
     };
-    "formidable-1.2.2" = {
+    "formidable-1.2.1" = {
       name = "formidable";
       packageName = "formidable";
-      version = "1.2.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz";
-        sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==";
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
+        sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
       };
     };
     "forwarded-0.1.2" = {
@@ -4081,6 +3829,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "fs-extra-4.0.3" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz";
+        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
+      };
+    };
     "fs-write-stream-atomic-1.0.10" = {
       name = "fs-write-stream-atomic";
       packageName = "fs-write-stream-atomic";
@@ -4099,22 +3856,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.13" = {
+    "fsevents-1.2.9" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.13";
+      version = "1.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz";
-        sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==";
-      };
-    };
-    "fsevents-2.3.1" = {
-      name = "fsevents";
-      packageName = "fsevents";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz";
-        sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz";
+        sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==";
       };
     };
     "function-bind-1.1.1" = {
@@ -4126,13 +3874,13 @@ let
         sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
-    "gensync-1.0.0-beta.2" = {
-      name = "gensync";
-      packageName = "gensync";
-      version = "1.0.0-beta.2";
+    "get-caller-file-1.0.3" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
-        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
+        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
       };
     };
     "get-caller-file-2.0.5" = {
@@ -4144,31 +3892,13 @@ let
         sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
-    "get-intrinsic-1.0.2" = {
-      name = "get-intrinsic";
-      packageName = "get-intrinsic";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
-        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
-      };
-    };
-    "get-paths-0.0.7" = {
+    "get-paths-0.0.4" = {
       name = "get-paths";
       packageName = "get-paths";
-      version = "0.0.7";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.7.tgz";
-        sha512 = "0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA==";
-      };
-    };
-    "get-stream-3.0.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+        url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.4.tgz";
+        sha512 = "+AxlfMGN7FuJr2zhT6aErH08HMKkRwynTTHtWCenIWkIZgx2OlkZKgt7SM4+rh8Dfi32lo6HcvqeTLxph3kjQw==";
       };
     };
     "get-stream-4.1.0" = {
@@ -4198,13 +3928,13 @@ let
         sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
       };
     };
-    "glob-7.1.6" = {
+    "glob-7.1.4" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.6";
+      version = "7.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
+        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
       };
     };
     "glob-parent-3.1.0" = {
@@ -4216,15 +3946,6 @@ let
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
-    "glob-parent-5.1.1" = {
-      name = "glob-parent";
-      packageName = "glob-parent";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
-        sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
-      };
-    };
     "global-modules-1.0.0" = {
       name = "global-modules";
       packageName = "global-modules";
@@ -4234,15 +3955,6 @@ let
         sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==";
       };
     };
-    "global-modules-2.0.0" = {
-      name = "global-modules";
-      packageName = "global-modules";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz";
-        sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==";
-      };
-    };
     "global-prefix-1.0.2" = {
       name = "global-prefix";
       packageName = "global-prefix";
@@ -4252,15 +3964,6 @@ let
         sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
       };
     };
-    "global-prefix-3.0.0" = {
-      name = "global-prefix";
-      packageName = "global-prefix";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz";
-        sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==";
-      };
-    };
     "globals-11.12.0" = {
       name = "globals";
       packageName = "globals";
@@ -4297,22 +4000,13 @@ let
         sha1 = "fb2ccff9401f8600945dfada97440cca972b8680";
       };
     };
-    "got-8.3.2" = {
-      name = "got";
-      packageName = "got";
-      version = "8.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz";
-        sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==";
-      };
-    };
-    "graceful-fs-4.2.4" = {
+    "graceful-fs-4.1.15" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.4";
+      version = "4.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
-        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
+        sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
       };
     };
     "growly-1.3.0" = {
@@ -4333,13 +4027,22 @@ let
         sha512 = "FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==";
       };
     };
-    "handle-thing-2.0.1" = {
+    "handle-thing-2.0.0" = {
       name = "handle-thing";
       packageName = "handle-thing";
-      version = "2.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz";
-        sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==";
+        url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz";
+        sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==";
+      };
+    };
+    "handlebars-4.3.3" = {
+      name = "handlebars";
+      packageName = "handlebars";
+      version = "4.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.3.3.tgz";
+        sha512 = "VupOxR91xcGojfINrzMqrvlyYbBs39sXIrWa7YdaQWeBudOlvKEGvCczMfJPgnuwHE/zyH1M6J+IUP6cgDVyxg==";
       };
     };
     "har-schema-2.0.0" = {
@@ -4351,13 +4054,13 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-5.1.5" = {
+    "har-validator-5.1.3" = {
       name = "har-validator";
       packageName = "har-validator";
-      version = "5.1.5";
+      version = "5.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz";
-        sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
+        sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
       };
     };
     "has-1.0.3" = {
@@ -4387,31 +4090,13 @@ let
         sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
-    "has-symbol-support-x-1.4.2" = {
-      name = "has-symbol-support-x";
-      packageName = "has-symbol-support-x";
-      version = "1.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz";
-        sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
-      };
-    };
-    "has-symbols-1.0.1" = {
+    "has-symbols-1.0.0" = {
       name = "has-symbols";
       packageName = "has-symbols";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
-        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
-      };
-    };
-    "has-to-string-tag-x-1.4.1" = {
-      name = "has-to-string-tag-x";
-      packageName = "has-to-string-tag-x";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz";
-        sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==";
+        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz";
+        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
       };
     };
     "has-value-0.3.1" = {
@@ -4450,13 +4135,13 @@ let
         sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
       };
     };
-    "hash-base-3.1.0" = {
+    "hash-base-3.0.4" = {
       name = "hash-base";
       packageName = "hash-base";
-      version = "3.1.0";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz";
-        sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==";
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
+        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
       };
     };
     "hash.js-1.1.7" = {
@@ -4504,13 +4189,13 @@ let
         sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==";
       };
     };
-    "hosted-git-info-2.8.8" = {
+    "hosted-git-info-2.8.4" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.8";
+      version = "2.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
-        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz";
+        sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==";
       };
     };
     "hpack.js-2.1.6" = {
@@ -4531,22 +4216,13 @@ let
         sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==";
       };
     };
-    "html-entities-1.4.0" = {
+    "html-entities-1.2.1" = {
       name = "html-entities";
       packageName = "html-entities";
-      version = "1.4.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz";
-        sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==";
-      };
-    };
-    "html-escaper-2.0.2" = {
-      name = "html-escaper";
-      packageName = "html-escaper";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz";
-        sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==";
+        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz";
+        sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
       };
     };
     "http-assert-1.4.1" = {
@@ -4558,15 +4234,6 @@ let
         sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw==";
       };
     };
-    "http-cache-semantics-3.8.1" = {
-      name = "http-cache-semantics";
-      packageName = "http-cache-semantics";
-      version = "3.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz";
-        sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
-      };
-    };
     "http-deceiver-1.2.7" = {
       name = "http-deceiver";
       packageName = "http-deceiver";
@@ -4594,40 +4261,22 @@ let
         sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
       };
     };
-    "http-errors-1.7.3" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz";
-        sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==";
-      };
-    };
-    "http-errors-1.8.0" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz";
-        sha512 = "4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==";
-      };
-    };
-    "http-parser-js-0.5.3" = {
+    "http-parser-js-0.4.10" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.5.3";
+      version = "0.4.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz";
-        sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz";
+        sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
       };
     };
-    "http-proxy-1.18.1" = {
+    "http-proxy-1.18.0" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.18.1";
+      version = "1.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz";
-        sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz";
+        sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==";
       };
     };
     "http-proxy-middleware-0.19.1" = {
@@ -4666,13 +4315,13 @@ let
         sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
       };
     };
-    "ieee754-1.2.1" = {
+    "ieee754-1.1.13" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.2.1";
+      version = "1.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz";
-        sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
+        sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
     "iferr-0.1.5" = {
@@ -4711,15 +4360,6 @@ let
         sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     };
-    "indent-string-3.2.0" = {
-      name = "indent-string";
-      packageName = "indent-string";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz";
-        sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289";
-      };
-    };
     "infer-owner-1.0.4" = {
       name = "infer-owner";
       packageName = "infer-owner";
@@ -4765,22 +4405,13 @@ let
         sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
-    "inherits-2.0.4" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
-      };
-    };
-    "ini-1.3.8" = {
+    "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.8";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
     "internal-ip-4.3.0" = {
@@ -4792,22 +4423,13 @@ let
         sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
       };
     };
-    "interpret-1.4.0" = {
+    "interpret-1.2.0" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.4.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz";
-        sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==";
-      };
-    };
-    "into-stream-3.1.0" = {
-      name = "into-stream";
-      packageName = "into-stream";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz";
-        sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz";
+        sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==";
       };
     };
     "invariant-2.2.4" = {
@@ -4819,6 +4441,15 @@ let
         sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==";
       };
     };
+    "invert-kv-2.0.0" = {
+      name = "invert-kv";
+      packageName = "invert-kv";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
+        sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
+      };
+    };
     "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
@@ -4837,22 +4468,13 @@ let
         sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
       };
     };
-    "ipaddr.js-1.9.1" = {
+    "ipaddr.js-1.9.0" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.9.1";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
-        sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
-      };
-    };
-    "is-absolute-url-3.0.3" = {
-      name = "is-absolute-url";
-      packageName = "is-absolute-url";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz";
-        sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
+        sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
       };
     };
     "is-accessor-descriptor-0.1.6" = {
@@ -4891,15 +4513,6 @@ let
         sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
       };
     };
-    "is-binary-path-2.1.0" = {
-      name = "is-binary-path";
-      packageName = "is-binary-path";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
-        sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
-      };
-    };
     "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
@@ -4909,13 +4522,22 @@ let
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-callable-1.2.2" = {
+    "is-buffer-2.0.3" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz";
+        sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==";
+      };
+    };
+    "is-callable-1.1.4" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.2.2";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
-        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
+        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
       };
     };
     "is-ci-2.0.0" = {
@@ -4927,15 +4549,6 @@ let
         sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
       };
     };
-    "is-core-module-2.2.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
-        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
-      };
-    };
     "is-data-descriptor-0.1.4" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -4954,13 +4567,13 @@ let
         sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
-    "is-date-object-1.0.2" = {
+    "is-date-object-1.0.1" = {
       name = "is-date-object";
       packageName = "is-date-object";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
+        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -5017,13 +4630,22 @@ let
         sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
-    "is-finite-1.1.0" = {
+    "is-finite-1.0.2" = {
       name = "is-finite";
       packageName = "is-finite";
-      version = "1.1.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
-        sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+      };
+    };
+    "is-fullwidth-code-point-1.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
       };
     };
     "is-fullwidth-code-point-2.0.0" = {
@@ -5044,13 +4666,13 @@ let
         sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==";
       };
     };
-    "is-generator-function-1.0.8" = {
+    "is-generator-function-1.0.7" = {
       name = "is-generator-function";
       packageName = "is-generator-function";
-      version = "1.0.8";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz";
-        sha512 = "2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==";
+        url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz";
+        sha512 = "YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==";
       };
     };
     "is-glob-3.1.0" = {
@@ -5071,15 +4693,6 @@ let
         sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
       };
     };
-    "is-negative-zero-2.0.1" = {
-      name = "is-negative-zero";
-      packageName = "is-negative-zero";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
-        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
-      };
-    };
     "is-number-3.0.0" = {
       name = "is-number";
       packageName = "is-number";
@@ -5089,24 +4702,6 @@ let
         sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
       };
     };
-    "is-number-7.0.0" = {
-      name = "is-number";
-      packageName = "is-number";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
-        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
-      };
-    };
-    "is-object-1.0.2" = {
-      name = "is-object";
-      packageName = "is-object";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz";
-        sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==";
-      };
-    };
     "is-path-cwd-2.2.0" = {
       name = "is-path-cwd";
       packageName = "is-path-cwd";
@@ -5134,15 +4729,6 @@ let
         sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==";
       };
     };
-    "is-plain-obj-1.1.0" = {
-      name = "is-plain-obj";
-      packageName = "is-plain-obj";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
-        sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
-      };
-    };
     "is-plain-object-2.0.4" = {
       name = "is-plain-object";
       packageName = "is-plain-object";
@@ -5152,31 +4738,22 @@ let
         sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
       };
     };
-    "is-promise-2.2.2" = {
+    "is-promise-2.1.0" = {
       name = "is-promise";
       packageName = "is-promise";
-      version = "2.2.2";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz";
-        sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==";
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
       };
     };
-    "is-regex-1.1.1" = {
+    "is-regex-1.0.4" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.1.1";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
-        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
-      };
-    };
-    "is-retry-allowed-1.2.0" = {
-      name = "is-retry-allowed";
-      packageName = "is-retry-allowed";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
-        sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
+        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
       };
     };
     "is-stream-1.1.0" = {
@@ -5188,13 +4765,13 @@ let
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
-    "is-symbol-1.0.3" = {
+    "is-symbol-1.0.2" = {
       name = "is-symbol";
       packageName = "is-symbol";
-      version = "1.0.3";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
+        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -5332,31 +4909,22 @@ let
         sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==";
       };
     };
-    "istanbul-reports-2.2.7" = {
+    "istanbul-reports-2.2.6" = {
       name = "istanbul-reports";
       packageName = "istanbul-reports";
-      version = "2.2.7";
+      version = "2.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz";
-        sha512 = "uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==";
+        url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz";
+        sha512 = "SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==";
       };
     };
-    "isurl-1.0.0" = {
-      name = "isurl";
-      packageName = "isurl";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
-        sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==";
-      };
-    };
-    "jest-24.9.0" = {
+    "jest-24.8.0" = {
       name = "jest";
       packageName = "jest";
-      version = "24.9.0";
+      version = "24.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz";
-        sha512 = "YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==";
+        url = "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz";
+        sha512 = "o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==";
       };
     };
     "jest-changed-files-24.9.0" = {
@@ -5494,13 +5062,13 @@ let
         sha512 = "3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==";
       };
     };
-    "jest-pnp-resolver-1.2.2" = {
+    "jest-pnp-resolver-1.2.1" = {
       name = "jest-pnp-resolver";
       packageName = "jest-pnp-resolver";
-      version = "1.2.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz";
-        sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==";
+        url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz";
+        sha512 = "pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==";
       };
     };
     "jest-regex-util-24.9.0" = {
@@ -5602,13 +5170,13 @@ let
         sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==";
       };
     };
-    "js-beautify-1.13.4" = {
+    "js-beautify-1.10.2" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.13.4";
+      version = "1.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.4.tgz";
-        sha512 = "M5yEWwonlEO3kPcCZ3K3KBSpFRZAEO3FAWC6wtbIGeyg7dusStxvF0WG+HRLBoMZqREXSRSxkkqClDE865x1sg==";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz";
+        sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==";
       };
     };
     "js-stringify-1.0.2" = {
@@ -5638,13 +5206,13 @@ let
         sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
       };
     };
-    "js-yaml-3.14.1" = {
+    "js-yaml-3.13.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.1";
+      version = "3.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
+        sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
       };
     };
     "jsbn-0.1.1" = {
@@ -5692,15 +5260,6 @@ let
         sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
       };
     };
-    "json-buffer-3.0.0" = {
-      name = "json-buffer";
-      packageName = "json-buffer";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz";
-        sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
-      };
-    };
     "json-parse-better-errors-1.0.2" = {
       name = "json-parse-better-errors";
       packageName = "json-parse-better-errors";
@@ -5728,6 +5287,15 @@ let
         sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
       };
     };
+    "json-stream-1.0.0" = {
+      name = "json-stream";
+      packageName = "json-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stream/-/json-stream-1.0.0.tgz";
+        sha1 = "1a3854e28d2bbeeab31cc7ddf683d2ddc5652708";
+      };
+    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -5764,13 +5332,22 @@ let
         sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
       };
     };
-    "json5-2.1.3" = {
+    "json5-2.1.0" = {
       name = "json5";
       packageName = "json5";
-      version = "2.1.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz";
-        sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==";
+        url = "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz";
+        sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==";
+      };
+    };
+    "jsonfile-4.0.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz";
+        sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
       };
     };
     "jsonpath-plus-0.19.0" = {
@@ -5800,22 +5377,13 @@ let
         sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3";
       };
     };
-    "keygrip-1.1.0" = {
+    "keygrip-1.0.3" = {
       name = "keygrip";
       packageName = "keygrip";
-      version = "1.1.0";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz";
-        sha512 = "iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==";
-      };
-    };
-    "keyv-3.0.0" = {
-      name = "keyv";
-      packageName = "keyv";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz";
-        sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==";
+        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz";
+        sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g==";
       };
     };
     "killable-1.0.1" = {
@@ -5854,13 +5422,13 @@ let
         sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
       };
     };
-    "kind-of-6.0.3" = {
+    "kind-of-6.0.2" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "6.0.3";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz";
-        sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
+        sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
       };
     };
     "kleur-3.0.3" = {
@@ -5872,22 +5440,22 @@ let
         sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==";
       };
     };
-    "koa-2.13.1" = {
+    "koa-2.7.0" = {
       name = "koa";
       packageName = "koa";
-      version = "2.13.1";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa/-/koa-2.13.1.tgz";
-        sha512 = "Lb2Dloc72auj5vK4X4qqL7B5jyDPQaZucc9sR/71byg7ryoD1NCaCm63CShk9ID9quQvDEi1bGR/iGjCG7As3w==";
+        url = "https://registry.npmjs.org/koa/-/koa-2.7.0.tgz";
+        sha512 = "7ojD05s2Q+hFudF8tDLZ1CpCdVZw8JQELWSkcfG9bdtoTDzMmkRF6BQBU7JzIzCCOY3xd3tftiy/loHBUYaY2Q==";
       };
     };
-    "koa-body-4.2.0" = {
+    "koa-body-4.1.0" = {
       name = "koa-body";
       packageName = "koa-body";
-      version = "4.2.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-body/-/koa-body-4.2.0.tgz";
-        sha512 = "wdGu7b9amk4Fnk/ytH8GuWwfs4fsB5iNkY8kZPpgQVb04QZSv85T0M8reb+cJmvLE8cjPYvBzRikD3s6qz8OoA==";
+        url = "https://registry.npmjs.org/koa-body/-/koa-body-4.1.0.tgz";
+        sha512 = "rWkMfMaCjFmIAMohtjlrg4BqDzcotK5BdZhiwJu1ONuR1ceoFUjnH3wp0hEV39HuBlc9tI3eUUFMK4Cp6ccFtA==";
       };
     };
     "koa-compose-3.2.1" = {
@@ -5899,13 +5467,13 @@ let
         sha1 = "a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7";
       };
     };
-    "koa-compose-4.2.0" = {
+    "koa-compose-4.1.0" = {
       name = "koa-compose";
       packageName = "koa-compose";
-      version = "4.2.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.2.0.tgz";
-        sha512 = "/Io2dpt3uU/wWkn2pkRBj3vudzsi6hMssGkREZCxLIczAIvLWy5Jw9PW7ctTxvcfXKCisbgsMLsgE1BvSZB6Kw==";
+        url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz";
+        sha512 = "8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==";
       };
     };
     "koa-convert-1.2.0" = {
@@ -5917,6 +5485,15 @@ let
         sha1 = "da40875df49de0539098d1700b50820cebcd21d0";
       };
     };
+    "koa-is-json-1.0.0" = {
+      name = "koa-is-json";
+      packageName = "koa-is-json";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz";
+        sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14";
+      };
+    };
     "koa-router-7.4.0" = {
       name = "koa-router";
       packageName = "koa-router";
@@ -5926,13 +5503,13 @@ let
         sha512 = "IWhaDXeAnfDBEpWS6hkGdZ1ablgr6Q6pGdXCyK38RbzuH4LkUOpPqPw+3f8l8aTDrQmBQ7xJc0bs2yV4dzcO+g==";
       };
     };
-    "koa-send-5.0.1" = {
+    "koa-send-5.0.0" = {
       name = "koa-send";
       packageName = "koa-send";
-      version = "5.0.1";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.1.tgz";
-        sha512 = "tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==";
+        url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.0.tgz";
+        sha512 = "90ZotV7t0p3uN9sRwW2D484rAaKIsD8tAVtypw/aBU+ryfV+fR2xrcAwhI8Wl6WRkojLUs/cB9SBSCuIb+IanQ==";
       };
     };
     "koa-static-5.0.0" = {
@@ -5944,13 +5521,13 @@ let
         sha512 = "UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==";
       };
     };
-    "koa-views-6.3.1" = {
+    "koa-views-6.2.0" = {
       name = "koa-views";
       packageName = "koa-views";
-      version = "6.3.1";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-views/-/koa-views-6.3.1.tgz";
-        sha512 = "weIaPs2cCHWT2qK8qHRmwlZ29xRCvUVy1v/z12AGavVV5j4QIU0W/Y7OVBBu1sTkcO9dDJ25ajGYHGZ/aY43IQ==";
+        url = "https://registry.npmjs.org/koa-views/-/koa-views-6.2.0.tgz";
+        sha512 = "Y1rCFd4I5uSjZg0r4Zzs4hDjYTSGHhdBM5DuEhccWzknWikwOfc2ph/DkrocKhtQfFbLPHkkz/Ox38AL+p99BA==";
       };
     };
     "lazy-cache-1.0.4" = {
@@ -5962,6 +5539,15 @@ let
         sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
       };
     };
+    "lcid-2.0.0" = {
+      name = "lcid";
+      packageName = "lcid";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
+        sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
+      };
+    };
     "left-pad-1.3.0" = {
       name = "left-pad";
       packageName = "left-pad";
@@ -6007,13 +5593,13 @@ let
         sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
       };
     };
-    "loader-utils-1.4.0" = {
+    "loader-utils-1.2.3" = {
       name = "loader-utils";
       packageName = "loader-utils";
-      version = "1.4.0";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
-        sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz";
+        sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==";
       };
     };
     "locate-path-2.0.0" = {
@@ -6034,13 +5620,13 @@ let
         sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
-    "lodash-4.17.20" = {
+    "lodash-4.17.15" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.20";
+      version = "4.17.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
-        sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
       };
     };
     "lodash.camelcase-4.3.0" = {
@@ -6061,15 +5647,6 @@ let
         sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
       };
     };
-    "lodash.memoize-4.1.2" = {
-      name = "lodash.memoize";
-      packageName = "lodash.memoize";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz";
-        sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe";
-      };
-    };
     "lodash.sortby-4.7.0" = {
       name = "lodash.sortby";
       packageName = "lodash.sortby";
@@ -6088,13 +5665,13 @@ let
         sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
       };
     };
-    "loglevel-1.7.1" = {
+    "loglevel-1.6.4" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.7.1";
+      version = "1.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz";
-        sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz";
+        sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==";
       };
     };
     "loglevelnext-1.0.5" = {
@@ -6106,15 +5683,6 @@ let
         sha512 = "V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==";
       };
     };
-    "long-4.0.0" = {
-      name = "long";
-      packageName = "long";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz";
-        sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==";
-      };
-    };
     "longest-1.0.1" = {
       name = "longest";
       packageName = "longest";
@@ -6133,24 +5701,6 @@ let
         sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==";
       };
     };
-    "lowercase-keys-1.0.0" = {
-      name = "lowercase-keys";
-      packageName = "lowercase-keys";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
-        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
-      };
-    };
-    "lowercase-keys-1.0.1" = {
-      name = "lowercase-keys";
-      packageName = "lowercase-keys";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
-      };
-    };
     "lru-cache-4.1.5" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -6187,13 +5737,13 @@ let
         sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
       };
     };
-    "make-error-1.3.6" = {
+    "make-error-1.3.5" = {
       name = "make-error";
       packageName = "make-error";
-      version = "1.3.6";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
-        sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
+        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
+        sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
       };
     };
     "makeerror-1.0.11" = {
@@ -6205,6 +5755,24 @@ let
         sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
       };
     };
+    "mamacro-0.0.3" = {
+      name = "mamacro";
+      packageName = "mamacro";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz";
+        sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==";
+      };
+    };
+    "map-age-cleaner-0.1.3" = {
+      name = "map-age-cleaner";
+      packageName = "map-age-cleaner";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
+        sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==";
+      };
+    };
     "map-cache-0.2.2" = {
       name = "map-cache";
       packageName = "map-cache";
@@ -6241,6 +5809,15 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
+    "mem-4.3.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
+        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
+      };
+    };
     "memory-fs-0.4.1" = {
       name = "memory-fs";
       packageName = "memory-fs";
@@ -6250,15 +5827,6 @@ let
         sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
       };
     };
-    "memory-fs-0.5.0" = {
-      name = "memory-fs";
-      packageName = "memory-fs";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz";
-        sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==";
-      };
-    };
     "merge-descriptors-1.0.1" = {
       name = "merge-descriptors";
       packageName = "merge-descriptors";
@@ -6313,31 +5881,31 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-2.5.0" = {
+    "mime-2.4.4" = {
       name = "mime";
       packageName = "mime";
-      version = "2.5.0";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
-        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
+        url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz";
+        sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==";
       };
     };
-    "mime-db-1.45.0" = {
+    "mime-db-1.40.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.45.0";
+      version = "1.40.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
-        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
+        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
       };
     };
-    "mime-types-2.1.28" = {
+    "mime-types-2.1.24" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.28";
+      version = "2.1.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
-        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
+        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -6349,13 +5917,13 @@ let
         sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
       };
     };
-    "mimic-response-1.0.1" = {
-      name = "mimic-response";
-      packageName = "mimic-response";
-      version = "1.0.1";
+    "mimic-fn-2.1.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz";
-        sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
       };
     };
     "minimalistic-assert-1.0.1" = {
@@ -6385,13 +5953,31 @@ let
         sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
-    "minimist-1.2.5" = {
+    "minimist-0.0.10" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.5";
+      version = "0.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "minimist-1.2.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
     "mississippi-2.0.0" = {
@@ -6421,40 +6007,31 @@ let
         sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==";
       };
     };
-    "mkdirp-0.5.5" = {
+    "mkdirp-0.5.1" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.5";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
-        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "mkdirp-1.0.4" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz";
-        sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
-      };
-    };
-    "moment-2.29.1" = {
+    "moment-2.24.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.29.1";
+      version = "2.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz";
-        sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==";
+        url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
+        sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
       };
     };
-    "moment-timezone-0.5.32" = {
+    "moment-timezone-0.5.26" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.32";
+      version = "0.5.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.32.tgz";
-        sha512 = "Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA==";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz";
+        sha512 = "sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==";
       };
     };
     "move-concurrently-1.0.1" = {
@@ -6493,15 +6070,6 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
-    "ms-2.1.3" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
-      };
-    };
     "multicast-dns-6.2.3" = {
       name = "multicast-dns";
       packageName = "multicast-dns";
@@ -6529,13 +6097,13 @@ let
         sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
-    "nan-2.14.2" = {
+    "nan-2.14.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.14.2";
+      version = "2.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz";
-        sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
+        sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -6565,13 +6133,13 @@ let
         sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
       };
     };
-    "neo-async-2.6.2" = {
+    "neo-async-2.6.1" = {
       name = "neo-async";
       packageName = "neo-async";
-      version = "2.6.2";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz";
-        sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==";
+        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz";
+        sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==";
       };
     };
     "next-tick-1.0.0" = {
@@ -6592,31 +6160,13 @@ let
         sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
       };
     };
-    "node-forge-0.10.0" = {
+    "node-forge-0.8.2" = {
       name = "node-forge";
       packageName = "node-forge";
-      version = "0.10.0";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz";
-        sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==";
-      };
-    };
-    "node-forge-0.8.5" = {
-      name = "node-forge";
-      packageName = "node-forge";
-      version = "0.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz";
-        sha512 = "vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q==";
-      };
-    };
-    "node-gyp-build-4.2.3" = {
-      name = "node-gyp-build";
-      packageName = "node-gyp-build";
-      version = "4.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz";
-        sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==";
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.2.tgz";
+        sha512 = "mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg==";
       };
     };
     "node-int64-0.4.0" = {
@@ -6628,15 +6178,6 @@ let
         sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
       };
     };
-    "node-jose-1.1.4" = {
-      name = "node-jose";
-      packageName = "node-jose";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-jose/-/node-jose-1.1.4.tgz";
-        sha512 = "L31IFwL3pWWcMHxxidCY51ezqrDXMkvlT/5pLTfNw5sXmmOLJuN6ug7txzF/iuZN55cRpyOmoJrotwBQIoo5Lw==";
-      };
-    };
     "node-libs-browser-2.2.1" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
@@ -6664,13 +6205,13 @@ let
         sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==";
       };
     };
-    "nopt-5.0.0" = {
+    "nopt-4.0.1" = {
       name = "nopt";
       packageName = "nopt";
-      version = "5.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz";
-        sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==";
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
       };
     };
     "normalize-package-data-2.5.0" = {
@@ -6700,15 +6241,6 @@ let
         sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
-    "normalize-url-2.0.1" = {
-      name = "normalize-url";
-      packageName = "normalize-url";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz";
-        sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==";
-      };
-    };
     "npm-run-path-2.0.2" = {
       name = "npm-run-path";
       packageName = "npm-run-path";
@@ -6718,13 +6250,22 @@ let
         sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
       };
     };
-    "nwsapi-2.2.0" = {
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "nwsapi-2.1.4" = {
       name = "nwsapi";
       packageName = "nwsapi";
-      version = "2.2.0";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz";
-        sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==";
+        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz";
+        sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -6754,22 +6295,13 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-hash-1.3.1" = {
-      name = "object-hash";
-      packageName = "object-hash";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz";
-        sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==";
-      };
-    };
-    "object-inspect-1.9.0" = {
+    "object-inspect-1.6.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.9.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
-        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
+        sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
       };
     };
     "object-keys-1.1.1" = {
@@ -6790,22 +6322,22 @@ let
         sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
       };
     };
-    "object.assign-4.1.2" = {
+    "object.assign-4.1.0" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
-        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
+        sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.getownpropertydescriptors-2.1.1" = {
+    "object.getownpropertydescriptors-2.0.3" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.1.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz";
-        sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
+        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
       };
     };
     "object.pick-1.3.0" = {
@@ -6826,15 +6358,6 @@ let
         sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==";
       };
     };
-    "oidc-token-hash-3.0.2" = {
-      name = "oidc-token-hash";
-      packageName = "oidc-token-hash";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-3.0.2.tgz";
-        sha512 = "dTzp80/y/da+um+i+sOucNqiPpwRL7M/xPwj7pH1TFA2/bqQ+OK2sJahSXbemEoLtPkHcFLyhLhLWZa9yW5+RA==";
-      };
-    };
     "on-finished-2.3.0" = {
       name = "on-finished";
       packageName = "on-finished";
@@ -6880,22 +6403,13 @@ let
         sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4";
       };
     };
-    "opener-1.5.2" = {
+    "opener-1.5.1" = {
       name = "opener";
       packageName = "opener";
-      version = "1.5.2";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz";
-        sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==";
-      };
-    };
-    "openid-client-2.5.0" = {
-      name = "openid-client";
-      packageName = "openid-client";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openid-client/-/openid-client-2.5.0.tgz";
-        sha512 = "t3hFD7xEoW1U25RyBcRFaL19fGGs6hNVTysq9pgmiltH0IVUPzH/bQV9w24pM5Q7MunnGv2/5XjIru6BQcWdxg==";
+        url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz";
+        sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==";
       };
     };
     "opn-5.5.0" = {
@@ -6907,13 +6421,22 @@ let
         sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==";
       };
     };
-    "optionator-0.8.3" = {
+    "optimist-0.6.1" = {
+      name = "optimist";
+      packageName = "optimist";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+      };
+    };
+    "optionator-0.8.2" = {
       name = "optionator";
       packageName = "optionator";
-      version = "0.8.3";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz";
-        sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==";
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
+        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
       };
     };
     "ora-3.4.0" = {
@@ -6952,6 +6475,15 @@ let
         sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
       };
     };
+    "os-locale-3.1.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz";
+        sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==";
+      };
+    };
     "os-tmpdir-1.0.2" = {
       name = "os-tmpdir";
       packageName = "os-tmpdir";
@@ -6961,22 +6493,22 @@ let
         sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
-    "p-any-1.1.0" = {
-      name = "p-any";
-      packageName = "p-any";
-      version = "1.1.0";
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
-        sha512 = "Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g==";
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "p-cancelable-0.4.1" = {
-      name = "p-cancelable";
-      packageName = "p-cancelable";
-      version = "0.4.1";
+    "p-defer-1.0.0" = {
+      name = "p-defer";
+      packageName = "p-defer";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
-        sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==";
+        url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz";
+        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
       };
     };
     "p-each-series-1.0.0" = {
@@ -6997,13 +6529,13 @@ let
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-is-promise-1.1.0" = {
+    "p-is-promise-2.1.0" = {
       name = "p-is-promise";
       packageName = "p-is-promise";
-      version = "1.1.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
-        sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
+        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
+        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
       };
     };
     "p-limit-1.3.0" = {
@@ -7015,13 +6547,13 @@ let
         sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
       };
     };
-    "p-limit-2.3.0" = {
+    "p-limit-2.2.1" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.3.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
-        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
+        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
       };
     };
     "p-locate-2.0.0" = {
@@ -7069,24 +6601,6 @@ let
         sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==";
       };
     };
-    "p-some-2.0.1" = {
-      name = "p-some";
-      packageName = "p-some";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz";
-        sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06";
-      };
-    };
-    "p-timeout-2.0.1" = {
-      name = "p-timeout";
-      packageName = "p-timeout";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz";
-        sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
-      };
-    };
     "p-try-1.0.0" = {
       name = "p-try";
       packageName = "p-try";
@@ -7105,13 +6619,13 @@ let
         sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
       };
     };
-    "pako-1.0.11" = {
+    "pako-1.0.10" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.11";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz";
-        sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
+        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
       };
     };
     "parallel-transform-1.2.0" = {
@@ -7123,13 +6637,13 @@ let
         sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==";
       };
     };
-    "parse-asn1-5.1.6" = {
+    "parse-asn1-5.1.5" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.6";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz";
-        sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
+        sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==";
       };
     };
     "parse-json-4.0.0" = {
@@ -7249,13 +6763,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "path-to-regexp-1.8.0" = {
+    "path-to-regexp-1.7.0" = {
       name = "path-to-regexp";
       packageName = "path-to-regexp";
-      version = "1.8.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz";
-        sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==";
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
+        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
       };
     };
     "path-type-3.0.0" = {
@@ -7267,13 +6781,13 @@ let
         sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==";
       };
     };
-    "pbkdf2-3.1.1" = {
+    "pbkdf2-3.0.17" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.1.1";
+      version = "3.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz";
-        sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz";
+        sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==";
       };
     };
     "performance-now-2.1.0" = {
@@ -7285,15 +6799,6 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "picomatch-2.2.2" = {
-      name = "picomatch";
-      packageName = "picomatch";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
-        sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
-      };
-    };
     "pify-2.3.0" = {
       name = "pify";
       packageName = "pify";
@@ -7375,13 +6880,13 @@ let
         sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==";
       };
     };
-    "portfinder-1.0.28" = {
+    "portfinder-1.0.24" = {
       name = "portfinder";
       packageName = "portfinder";
-      version = "1.0.28";
+      version = "1.0.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz";
-        sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==";
+        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz";
+        sha512 = "ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==";
       };
     };
     "posix-character-classes-0.1.1" = {
@@ -7402,22 +6907,13 @@ let
         sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
       };
     };
-    "prepend-http-2.0.0" = {
-      name = "prepend-http";
-      packageName = "prepend-http";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz";
-        sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
-      };
-    };
-    "prettier-1.19.1" = {
+    "prettier-1.18.2" = {
       name = "prettier";
       packageName = "prettier";
-      version = "1.19.1";
+      version = "1.18.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz";
-        sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==";
+        url = "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz";
+        sha512 = "OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==";
       };
     };
     "pretty-2.0.0" = {
@@ -7483,13 +6979,13 @@ let
         sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
       };
     };
-    "prompts-2.4.0" = {
+    "prompts-2.2.1" = {
       name = "prompts";
       packageName = "prompts";
-      version = "2.4.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz";
-        sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==";
+        url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz";
+        sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==";
       };
     };
     "proto-list-1.2.4" = {
@@ -7501,13 +6997,13 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "proxy-addr-2.0.6" = {
+    "proxy-addr-2.0.5" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "2.0.6";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
-        sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
+        sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
       };
     };
     "prr-1.0.1" = {
@@ -7528,13 +7024,13 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "psl-1.8.0" = {
+    "psl-1.1.32" = {
       name = "psl";
       packageName = "psl";
-      version = "1.8.0";
+      version = "1.1.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
-        sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz";
+        sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==";
       };
     };
     "public-encrypt-4.0.3" = {
@@ -7726,15 +7222,6 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
-    "query-string-5.1.1" = {
-      name = "query-string";
-      packageName = "query-string";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
-        sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
-      };
-    };
     "querystring-0.2.0" = {
       name = "querystring";
       packageName = "querystring";
@@ -7753,13 +7240,13 @@ let
         sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
       };
     };
-    "querystringify-2.2.0" = {
+    "querystringify-2.1.1" = {
       name = "querystringify";
       packageName = "querystringify";
-      version = "2.2.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz";
-        sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==";
+        url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz";
+        sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==";
       };
     };
     "randombytes-2.1.0" = {
@@ -7798,31 +7285,13 @@ let
         sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==";
       };
     };
-    "raw-body-2.4.1" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz";
-        sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==";
-      };
-    };
-    "react-is-16.13.1" = {
+    "react-is-16.9.0" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.13.1";
+      version = "16.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz";
-        sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==";
-      };
-    };
-    "react-zlib-js-1.0.5" = {
-      name = "react-zlib-js";
-      packageName = "react-zlib-js";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/react-zlib-js/-/react-zlib-js-1.0.5.tgz";
-        sha512 = "TLcPdmqhIl+ylwOwlfm1WUuI7NVvhAv3L74d1AabhjyaAbmLOROTA/Q4EQ/UMCFCOjIkVim9fT3UZOQSFk/mlA==";
+        url = "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz";
+        sha512 = "tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==";
       };
     };
     "read-pkg-3.0.0" = {
@@ -7843,22 +7312,22 @@ let
         sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
       };
     };
-    "readable-stream-2.3.7" = {
+    "readable-stream-2.3.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.7";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
-    "readable-stream-3.6.0" = {
+    "readable-stream-3.4.0" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "3.6.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
-        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz";
+        sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==";
       };
     };
     "readdirp-2.2.1" = {
@@ -7870,15 +7339,6 @@ let
         sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
       };
     };
-    "readdirp-3.5.0" = {
-      name = "readdirp";
-      packageName = "readdirp";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
-        sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
-      };
-    };
     "realpath-native-1.1.0" = {
       name = "realpath-native";
       packageName = "realpath-native";
@@ -7897,13 +7357,13 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "regenerate-1.4.2" = {
+    "regenerate-1.4.0" = {
       name = "regenerate";
       packageName = "regenerate";
-      version = "1.4.2";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz";
-        sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
+        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz";
+        sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==";
       };
     };
     "regenerator-runtime-0.11.1" = {
@@ -7996,31 +7456,31 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
-    "request-2.88.2" = {
+    "request-2.88.0" = {
       name = "request";
       packageName = "request";
-      version = "2.88.2";
+      version = "2.88.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
-        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
+        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
+        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
       };
     };
-    "request-promise-core-1.1.4" = {
+    "request-promise-core-1.1.2" = {
       name = "request-promise-core";
       packageName = "request-promise-core";
-      version = "1.1.4";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz";
-        sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==";
+        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz";
+        sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==";
       };
     };
-    "request-promise-native-1.0.9" = {
+    "request-promise-native-1.0.7" = {
       name = "request-promise-native";
       packageName = "request-promise-native";
-      version = "1.0.9";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz";
-        sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
+        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz";
+        sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==";
       };
     };
     "require-directory-2.1.1" = {
@@ -8032,6 +7492,15 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
     "require-main-filename-2.0.0" = {
       name = "require-main-filename";
       packageName = "require-main-filename";
@@ -8059,13 +7528,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.19.0" = {
+    "resolve-1.11.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.19.0";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
-        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz";
+        sha512 = "WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -8113,15 +7582,6 @@ let
         sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
       };
     };
-    "responselike-1.0.2" = {
-      name = "responselike";
-      packageName = "responselike";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz";
-        sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
-      };
-    };
     "restore-cursor-2.0.0" = {
       name = "restore-cursor";
       packageName = "restore-cursor";
@@ -8194,13 +7654,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "rxjs-6.6.3" = {
+    "rxjs-6.5.2" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.6.3";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz";
-        sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz";
+        sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -8212,15 +7672,6 @@ let
         sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
-    "safe-buffer-5.2.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
-        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
-      };
-    };
     "safe-regex-1.1.0" = {
       name = "safe-regex";
       packageName = "safe-regex";
@@ -8275,22 +7726,22 @@ let
         sha1 = "625d8658f865af43ec962bfc376a37359a4994ca";
       };
     };
-    "selfsigned-1.10.8" = {
+    "selfsigned-1.10.6" = {
       name = "selfsigned";
       packageName = "selfsigned";
-      version = "1.10.8";
+      version = "1.10.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz";
-        sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==";
+        url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.6.tgz";
+        sha512 = "i3+CeqxL7DpAazgVpAGdKMwHuL63B5nhJMh9NQ7xmChGkA3jNFflq6Jyo1LLJYcr3idWiNOPWHCrm4zMayLG4w==";
       };
     };
-    "semver-5.7.1" = {
+    "semver-5.7.0" = {
       name = "semver";
       packageName = "semver";
-      version = "5.7.1";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
+        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
       };
     };
     "semver-6.3.0" = {
@@ -8320,15 +7771,6 @@ let
         sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==";
       };
     };
-    "serialize-javascript-4.0.0" = {
-      name = "serialize-javascript";
-      packageName = "serialize-javascript";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz";
-        sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==";
-      };
-    };
     "serve-index-1.9.1" = {
       name = "serve-index";
       packageName = "serve-index";
@@ -8392,15 +7834,6 @@ let
         sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
       };
     };
-    "setprototypeof-1.2.0" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz";
-        sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
-      };
-    };
     "sha.js-2.4.11" = {
       name = "sha.js";
       packageName = "sha.js";
@@ -8428,13 +7861,13 @@ let
         sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
       };
     };
-    "shelljs-0.8.4" = {
+    "shelljs-0.8.3" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.8.4";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz";
-        sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz";
+        sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==";
       };
     };
     "shellwords-0.1.1" = {
@@ -8455,13 +7888,13 @@ let
         sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
       };
     };
-    "signal-exit-3.0.3" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.3";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
-        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "simple-git-1.96.0" = {
@@ -8473,13 +7906,13 @@ let
         sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ==";
       };
     };
-    "sisteransi-1.0.5" = {
+    "sisteransi-1.0.3" = {
       name = "sisteransi";
       packageName = "sisteransi";
-      version = "1.0.5";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz";
-        sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==";
+        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz";
+        sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==";
       };
     };
     "slash-1.0.0" = {
@@ -8527,31 +7960,22 @@ let
         sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
       };
     };
-    "sockjs-0.3.21" = {
+    "sockjs-0.3.19" = {
       name = "sockjs";
       packageName = "sockjs";
-      version = "0.3.21";
+      version = "0.3.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz";
-        sha512 = "DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==";
+        url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz";
+        sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==";
       };
     };
-    "sockjs-client-1.5.0" = {
+    "sockjs-client-1.3.0" = {
       name = "sockjs-client";
       packageName = "sockjs-client";
-      version = "1.5.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz";
-        sha512 = "8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==";
-      };
-    };
-    "sort-keys-2.0.0" = {
-      name = "sort-keys";
-      packageName = "sort-keys";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz";
-        sha1 = "658535584861ec97d730d6cf41822e1f56684128";
+        url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz";
+        sha512 = "R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==";
       };
     };
     "source-list-map-2.0.1" = {
@@ -8581,13 +8005,13 @@ let
         sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
       };
     };
-    "source-map-resolve-0.5.3" = {
+    "source-map-resolve-0.5.2" = {
       name = "source-map-resolve";
       packageName = "source-map-resolve";
-      version = "0.5.3";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
-        sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==";
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
+        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
       };
     };
     "source-map-support-0.4.18" = {
@@ -8599,13 +8023,13 @@ let
         sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
       };
     };
-    "source-map-support-0.5.19" = {
+    "source-map-support-0.5.13" = {
       name = "source-map-support";
       packageName = "source-map-support";
-      version = "0.5.19";
+      version = "0.5.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz";
-        sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==";
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz";
+        sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==";
       };
     };
     "source-map-url-0.4.0" = {
@@ -8617,49 +8041,49 @@ let
         sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
       };
     };
-    "spdx-correct-3.1.1" = {
+    "spdx-correct-3.1.0" = {
       name = "spdx-correct";
       packageName = "spdx-correct";
-      version = "3.1.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz";
-        sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==";
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
+        sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
       };
     };
-    "spdx-exceptions-2.3.0" = {
+    "spdx-exceptions-2.2.0" = {
       name = "spdx-exceptions";
       packageName = "spdx-exceptions";
-      version = "2.3.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
-        sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
+        sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
       };
     };
-    "spdx-expression-parse-3.0.1" = {
+    "spdx-expression-parse-3.0.0" = {
       name = "spdx-expression-parse";
       packageName = "spdx-expression-parse";
-      version = "3.0.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
-        sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
       };
     };
-    "spdx-license-ids-3.0.7" = {
+    "spdx-license-ids-3.0.5" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.7";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
-        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
+        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
       };
     };
-    "spdy-4.0.2" = {
+    "spdy-4.0.1" = {
       name = "spdy";
       packageName = "spdy";
-      version = "4.0.2";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz";
-        sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==";
+        url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz";
+        sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==";
       };
     };
     "spdy-transport-3.0.0" = {
@@ -8716,13 +8140,13 @@ let
         sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==";
       };
     };
-    "stack-utils-1.0.4" = {
+    "stack-utils-1.0.2" = {
       name = "stack-utils";
       packageName = "stack-utils";
-      version = "1.0.4";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.4.tgz";
-        sha512 = "IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==";
+        url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz";
+        sha512 = "MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==";
       };
     };
     "static-extend-0.1.2" = {
@@ -8779,22 +8203,13 @@ let
         sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
       };
     };
-    "stream-shift-1.0.1" = {
+    "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz";
-        sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==";
-      };
-    };
-    "strict-uri-encode-1.1.0" = {
-      name = "strict-uri-encode";
-      packageName = "strict-uri-encode";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
-        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
+        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
+        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
       };
     };
     "string-length-2.0.0" = {
@@ -8806,6 +8221,24 @@ let
         sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
       };
     };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
+    "string-width-2.1.1" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+      };
+    };
     "string-width-3.1.0" = {
       name = "string-width";
       packageName = "string-width";
@@ -8815,22 +8248,22 @@ let
         sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
-    "string.prototype.trimend-1.0.3" = {
-      name = "string.prototype.trimend";
-      packageName = "string.prototype.trimend";
-      version = "1.0.3";
+    "string.prototype.trimleft-2.1.0" = {
+      name = "string.prototype.trimleft";
+      packageName = "string.prototype.trimleft";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
-        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
+        sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
       };
     };
-    "string.prototype.trimstart-1.0.3" = {
-      name = "string.prototype.trimstart";
-      packageName = "string.prototype.trimstart";
-      version = "1.0.3";
+    "string.prototype.trimright-2.1.0" = {
+      name = "string.prototype.trimright";
+      packageName = "string.prototype.trimright";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
-        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
+        sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
       };
     };
     "string_decoder-1.1.1" = {
@@ -8932,22 +8365,22 @@ let
         sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
       };
     };
-    "terser-4.8.0" = {
+    "terser-4.3.3" = {
       name = "terser";
       packageName = "terser";
-      version = "4.8.0";
+      version = "4.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz";
-        sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
+        url = "https://registry.npmjs.org/terser/-/terser-4.3.3.tgz";
+        sha512 = "Nzr7dpRjSzMEUS+z2UYQBtzE0LDm5k0Yy8RgLRPy85QUo1TjU5lIOBwzS5/FVAMaVyHZ3WTTU2BuQcMn8KXnNQ==";
       };
     };
-    "terser-webpack-plugin-1.4.5" = {
+    "terser-webpack-plugin-1.4.1" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
-      version = "1.4.5";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz";
-        sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==";
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz";
+        sha512 = "ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==";
       };
     };
     "test-exclude-5.2.3" = {
@@ -8959,13 +8392,13 @@ let
         sha512 = "M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==";
       };
     };
-    "thenify-3.3.1" = {
+    "thenify-3.3.0" = {
       name = "thenify";
       packageName = "thenify";
-      version = "3.3.1";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz";
-        sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==";
+        url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz";
+        sha1 = "e69e38a1babe969b0108207978b9f62b88604839";
       };
     };
     "thenify-all-1.6.0" = {
@@ -8995,31 +8428,22 @@ let
         sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
       };
     };
-    "thunky-1.1.0" = {
+    "thunky-1.0.3" = {
       name = "thunky";
       packageName = "thunky";
-      version = "1.1.0";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz";
-        sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==";
+        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz";
+        sha512 = "YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==";
       };
     };
-    "timed-out-4.0.1" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz";
-        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
-      };
-    };
-    "timers-browserify-2.0.12" = {
+    "timers-browserify-2.0.11" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.12";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz";
-        sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz";
+        sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==";
       };
     };
     "tmpl-1.0.4" = {
@@ -9085,15 +8509,6 @@ let
         sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
       };
     };
-    "to-regex-range-5.0.1" = {
-      name = "to-regex-range";
-      packageName = "to-regex-range";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
-        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
-      };
-    };
     "toidentifier-1.0.0" = {
       name = "toidentifier";
       packageName = "toidentifier";
@@ -9112,6 +8527,15 @@ let
         sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
       };
     };
+    "tough-cookie-2.4.3" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+      };
+    };
     "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -9148,31 +8572,22 @@ let
         sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==";
       };
     };
-    "ts-jest-24.3.0" = {
+    "ts-jest-24.0.2" = {
       name = "ts-jest";
       packageName = "ts-jest";
-      version = "24.3.0";
+      version = "24.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz";
-        sha512 = "Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ==";
+        url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.0.2.tgz";
+        sha512 = "h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==";
       };
     };
-    "tslib-1.14.1" = {
+    "tslib-1.10.0" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.14.1";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
-        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
-      };
-    };
-    "tsscmp-1.0.6" = {
-      name = "tsscmp";
-      packageName = "tsscmp";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz";
-        sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
+        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
       };
     };
     "tty-browserify-0.0.0" = {
@@ -9211,15 +8626,6 @@ let
         sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
       };
     };
-    "type-2.1.0" = {
-      name = "type";
-      packageName = "type";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz";
-        sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==";
-      };
-    };
     "type-check-0.3.2" = {
       name = "type-check";
       packageName = "type-check";
@@ -9256,13 +8662,13 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typescript-3.9.7" = {
+    "typescript-3.5.2" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.9.7";
+      version = "3.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz";
-        sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz";
+        sha512 = "7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==";
       };
     };
     "typical-4.0.0" = {
@@ -9283,6 +8689,15 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
+    "uglify-js-3.6.0" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz";
+        sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==";
+      };
+    };
     "uglify-to-browserify-1.0.2" = {
       name = "uglify-to-browserify";
       packageName = "uglify-to-browserify";
@@ -9292,13 +8707,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "underscore-1.12.0" = {
+    "underscore-1.9.1" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.12.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
-        sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
+        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
       };
     };
     "union-value-1.0.1" = {
@@ -9328,6 +8743,15 @@ let
         sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==";
       };
     };
+    "universalify-0.1.2" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
+        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
+      };
+    };
     "unpipe-1.0.0" = {
       name = "unpipe";
       packageName = "unpipe";
@@ -9355,22 +8779,22 @@ let
         sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
       };
     };
-    "uri-js-4.4.1" = {
+    "uri-js-4.2.2" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
-        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
       };
     };
-    "urijs-1.19.5" = {
+    "urijs-1.19.1" = {
       name = "urijs";
       packageName = "urijs";
-      version = "1.19.5";
+      version = "1.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.5.tgz";
-        sha512 = "48z9VGWwdCV5KfizHsE05DWS5fhK6gFlx5MjO7xu0Krc5FGPWzjlXEVV0nPMrdVuP7xmMHiPZ2HoYZwKOFTZOg==";
+        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz";
+        sha512 = "xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==";
       };
     };
     "urix-0.1.0" = {
@@ -9400,24 +8824,6 @@ let
         sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==";
       };
     };
-    "url-parse-lax-3.0.0" = {
-      name = "url-parse-lax";
-      packageName = "url-parse-lax";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz";
-        sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c";
-      };
-    };
-    "url-to-options-1.0.1" = {
-      name = "url-to-options";
-      packageName = "url-to-options";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz";
-        sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9";
-      };
-    };
     "use-3.1.1" = {
       name = "use";
       packageName = "use";
@@ -9427,15 +8833,6 @@ let
         sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==";
       };
     };
-    "utf-8-validate-5.0.4" = {
-      name = "utf-8-validate";
-      packageName = "utf-8-validate";
-      version = "5.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.4.tgz";
-        sha512 = "MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q==";
-      };
-    };
     "util-0.10.3" = {
       name = "util";
       packageName = "util";
@@ -9463,13 +8860,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "util.promisify-1.1.1" = {
+    "util.promisify-1.0.0" = {
       name = "util.promisify";
       packageName = "util.promisify";
-      version = "1.1.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz";
-        sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==";
+        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
+        sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
       };
     };
     "utils-merge-1.0.1" = {
@@ -9481,22 +8878,22 @@ let
         sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
       };
     };
-    "uuid-3.4.0" = {
+    "uuid-3.3.2" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.4.0";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
-        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
       };
     };
-    "v8-compile-cache-2.2.0" = {
+    "v8-compile-cache-2.1.0" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
-      version = "2.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
-        sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==";
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz";
+        sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==";
       };
     };
     "validate-npm-package-license-3.0.4" = {
@@ -9526,13 +8923,13 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vm-browserify-1.1.2" = {
+    "vm-browserify-1.1.0" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
-      version = "1.1.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
-        sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
+        sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
       };
     };
     "void-elements-2.0.1" = {
@@ -9544,13 +8941,13 @@ let
         sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
       };
     };
-    "w3c-hr-time-1.0.2" = {
+    "w3c-hr-time-1.0.1" = {
       name = "w3c-hr-time";
       packageName = "w3c-hr-time";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
-        sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==";
+        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
+        sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
       };
     };
     "walker-1.0.7" = {
@@ -9562,22 +8959,13 @@ let
         sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
       };
     };
-    "watchpack-1.7.5" = {
+    "watchpack-1.6.0" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "1.7.5";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz";
-        sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==";
-      };
-    };
-    "watchpack-chokidar2-2.0.1" = {
-      name = "watchpack-chokidar2";
-      packageName = "watchpack-chokidar2";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz";
-        sha512 = "nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz";
+        sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==";
       };
     };
     "wbuf-1.7.3" = {
@@ -9607,49 +8995,49 @@ let
         sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
-    "webpack-4.46.0" = {
+    "webpack-4.35.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "4.46.0";
+      version = "4.35.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz";
-        sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.35.0.tgz";
+        sha512 = "M5hL3qpVvtr8d4YaJANbAQBc4uT01G33eDpl/psRTBCfjxFTihdhin1NtAKB1ruDwzeVdcsHHV3NX+QsAgOosw==";
       };
     };
-    "webpack-bundle-analyzer-3.9.0" = {
+    "webpack-bundle-analyzer-3.3.2" = {
       name = "webpack-bundle-analyzer";
       packageName = "webpack-bundle-analyzer";
-      version = "3.9.0";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz";
-        sha512 = "Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==";
+        url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz";
+        sha512 = "7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==";
       };
     };
-    "webpack-cli-3.3.12" = {
+    "webpack-cli-3.3.4" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.12";
+      version = "3.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz";
-        sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.4.tgz";
+        sha512 = "ubJGQEKMtBSpT+LiL5hXvn2GIOWiRWItR1DGUqJRhwRBeGhpRXjvF5f0erqdRJLErkfqS5/Ldkkedh4AL5Q1ZQ==";
       };
     };
-    "webpack-dev-middleware-3.7.3" = {
+    "webpack-dev-middleware-3.7.1" = {
       name = "webpack-dev-middleware";
       packageName = "webpack-dev-middleware";
-      version = "3.7.3";
+      version = "3.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz";
-        sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==";
+        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz";
+        sha512 = "5MWu9SH1z3hY7oHOV6Kbkz5x7hXbxK56mGHNqHTe6d+ewxOwKUxoUJBs7QIaJb33lPjl9bJZ3X0vCoooUzC36A==";
       };
     };
-    "webpack-dev-server-3.11.2" = {
+    "webpack-dev-server-3.7.2" = {
       name = "webpack-dev-server";
       packageName = "webpack-dev-server";
-      version = "3.11.2";
+      version = "3.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz";
-        sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==";
+        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz";
+        sha512 = "mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==";
       };
     };
     "webpack-log-1.2.0" = {
@@ -9679,31 +9067,31 @@ let
         sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
       };
     };
-    "websocket-1.0.33" = {
+    "websocket-1.0.28" = {
       name = "websocket";
       packageName = "websocket";
-      version = "1.0.33";
+      version = "1.0.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket/-/websocket-1.0.33.tgz";
-        sha512 = "XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA==";
+        url = "https://registry.npmjs.org/websocket/-/websocket-1.0.28.tgz";
+        sha512 = "00y/20/80P7H4bCYkzuuvvfDvh+dgtXi5kzDf3UcZwN6boTYaKvsrtZ5lIYm1Gsg48siMErd9M4zjSYfYFHTrA==";
       };
     };
-    "websocket-driver-0.7.4" = {
+    "websocket-driver-0.7.3" = {
       name = "websocket-driver";
       packageName = "websocket-driver";
-      version = "0.7.4";
+      version = "0.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz";
-        sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==";
+        url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz";
+        sha512 = "bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==";
       };
     };
-    "websocket-extensions-0.1.4" = {
+    "websocket-extensions-0.1.3" = {
       name = "websocket-extensions";
       packageName = "websocket-extensions";
-      version = "0.1.4";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz";
-        sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
+        url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz";
+        sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==";
       };
     };
     "whatwg-encoding-1.0.5" = {
@@ -9733,13 +9121,13 @@ let
         sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==";
       };
     };
-    "whatwg-url-7.1.0" = {
+    "whatwg-url-7.0.0" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
-      version = "7.1.0";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz";
-        sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==";
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz";
+        sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==";
       };
     };
     "which-1.3.1" = {
@@ -9778,15 +9166,6 @@ let
         sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
       };
     };
-    "word-wrap-1.2.3" = {
-      name = "word-wrap";
-      packageName = "word-wrap";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";
-        sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
-      };
-    };
     "wordwrap-0.0.2" = {
       name = "wordwrap";
       packageName = "wordwrap";
@@ -9796,6 +9175,15 @@ let
         sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
       };
     };
+    "wordwrap-1.0.0" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+      };
+    };
     "worker-farm-1.7.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
@@ -9805,6 +9193,15 @@ let
         sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==";
       };
     };
+    "wrap-ansi-2.1.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+      };
+    };
     "wrap-ansi-5.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -9868,13 +9265,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.1" = {
+    "y18n-4.0.0" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
-        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
     "yaeti-0.0.6" = {
@@ -9895,22 +9292,31 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "yallist-3.1.1" = {
+    "yallist-3.1.0" = {
       name = "yallist";
       packageName = "yallist";
-      version = "3.1.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.0.tgz";
+        sha512 = "6gpP93MR+VOOehKbCPchro3wFZNSNmek8A2kbkOAZLIZAYx1KP/zAqwO0sOHi3xJEb+UBz8NaYt/17UNit1Q9w==";
       };
     };
-    "yargs-13.3.2" = {
+    "yargs-12.0.5" = {
       name = "yargs";
       packageName = "yargs";
-      version = "13.3.2";
+      version = "12.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
-        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
+        sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
+      };
+    };
+    "yargs-13.3.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "13.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
+        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
       };
     };
     "yargs-3.10.0" = {
@@ -9931,13 +9337,31 @@ let
         sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==";
       };
     };
-    "yargs-parser-13.1.2" = {
+    "yargs-parser-11.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "13.1.2";
+      version = "11.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
-        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
+        sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
+      };
+    };
+    "yargs-parser-13.1.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "13.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
+        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
+      };
+    };
+    "yarn-1.16.0" = {
+      name = "yarn";
+      packageName = "yarn";
+      version = "1.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz";
+        sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g==";
       };
     };
     "ylru-1.2.1" = {
@@ -9950,66 +9374,57 @@ let
       };
     };
   };
-in
-{
-  "spacegun-git+https://github.com/dvallin/spacegun.git#v0.3.3" = nodeEnv.buildNodePackage {
+  args = {
     name = "spacegun";
     packageName = "spacegun";
     version = "0.3.3";
-    src = fetchgit {
-      url = "https://github.com/dvallin/spacegun.git";
-      rev = "d32d2df34362f6744e8cff34c2d2bf6ce8b4662a";
-      sha256 = "589bfc9e3e26af38989144e8551547cbeb5ffc9a0b668a7a4cb211a2ebf7a931";
-    };
+    src = ./.;
     dependencies = [
-      sources."@babel/code-frame-7.12.11"
-      (sources."@babel/core-7.12.10" // {
+      sources."@babel/code-frame-7.5.5"
+      (sources."@babel/core-7.6.2" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."json5-2.1.3"
+          sources."debug-4.1.1"
+          sources."json5-2.1.0"
+          sources."lodash-4.17.15"
           sources."ms-2.1.2"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.12.11" // {
+      (sources."@babel/generator-7.6.2" // {
         dependencies = [
           sources."jsesc-2.5.2"
+          sources."lodash-4.17.15"
           sources."source-map-0.5.7"
         ];
       })
-      sources."@babel/helper-function-name-7.12.11"
-      sources."@babel/helper-get-function-arity-7.12.10"
-      sources."@babel/helper-member-expression-to-functions-7.12.7"
-      sources."@babel/helper-module-imports-7.12.5"
-      sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.12.10"
-      sources."@babel/helper-plugin-utils-7.10.4"
-      sources."@babel/helper-replace-supers-7.12.11"
-      sources."@babel/helper-simple-access-7.12.1"
-      sources."@babel/helper-split-export-declaration-7.12.11"
-      sources."@babel/helper-validator-identifier-7.12.11"
-      sources."@babel/helpers-7.12.5"
-      (sources."@babel/highlight-7.10.4" // {
+      sources."@babel/helper-function-name-7.1.0"
+      sources."@babel/helper-get-function-arity-7.0.0"
+      sources."@babel/helper-plugin-utils-7.0.0"
+      sources."@babel/helper-split-export-declaration-7.4.4"
+      sources."@babel/helpers-7.6.2"
+      (sources."@babel/highlight-7.5.0" // {
         dependencies = [
           sources."js-tokens-4.0.0"
         ];
       })
-      sources."@babel/parser-7.12.11"
-      sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
-      sources."@babel/template-7.12.7"
-      (sources."@babel/traverse-7.12.12" // {
+      sources."@babel/parser-7.6.2"
+      sources."@babel/plugin-syntax-object-rest-spread-7.2.0"
+      sources."@babel/template-7.6.0"
+      (sources."@babel/traverse-7.6.2" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.1.1"
           sources."globals-11.12.0"
+          sources."lodash-4.17.15"
           sources."ms-2.1.2"
         ];
       })
-      (sources."@babel/types-7.12.12" // {
+      (sources."@babel/types-7.6.1" // {
         dependencies = [
+          sources."lodash-4.17.15"
           sources."to-fast-properties-2.0.0"
         ];
       })
-      sources."@cnakazawa/watch-1.0.4"
+      sources."@cnakazawa/watch-1.0.3"
       (sources."@jest/console-24.9.0" // {
         dependencies = [
           sources."slash-2.0.0"
@@ -10017,7 +9432,9 @@ in
       })
       (sources."@jest/core-24.9.0" // {
         dependencies = [
+          sources."ansi-regex-4.1.0"
           sources."slash-2.0.0"
+          sources."strip-ansi-5.2.0"
         ];
       })
       sources."@jest/environment-24.9.0"
@@ -10036,107 +9453,101 @@ in
         ];
       })
       sources."@jest/types-24.9.0"
-      (sources."@kubernetes/client-node-0.10.3" // {
+      (sources."@kubernetes/client-node-0.10.1" // {
         dependencies = [
-          sources."@types/node-10.17.51"
+          sources."@types/node-10.14.19"
         ];
       })
-      sources."@sindresorhus/is-0.7.0"
       sources."@types/accepts-1.3.5"
       sources."@types/axios-0.14.0"
-      sources."@types/babel-types-7.0.9"
-      sources."@types/babel__core-7.1.12"
-      sources."@types/babel__generator-7.6.2"
-      sources."@types/babel__template-7.4.0"
-      sources."@types/babel__traverse-7.11.0"
+      sources."@types/babel-types-7.0.7"
+      sources."@types/babel__core-7.1.3"
+      sources."@types/babel__generator-7.6.0"
+      sources."@types/babel__template-7.0.2"
+      sources."@types/babel__traverse-7.0.7"
       sources."@types/babylon-6.16.5"
-      sources."@types/body-parser-1.19.0"
+      sources."@types/body-parser-1.17.1"
       sources."@types/caseless-0.12.2"
       sources."@types/command-line-args-5.0.0"
-      sources."@types/connect-3.4.34"
-      sources."@types/content-disposition-0.5.3"
-      sources."@types/cookies-0.7.6"
-      sources."@types/cron-1.7.2"
+      sources."@types/connect-3.4.32"
+      sources."@types/cookies-0.7.3"
+      sources."@types/cron-1.7.1"
       sources."@types/events-3.0.0"
-      sources."@types/express-4.17.11"
-      sources."@types/express-serve-static-core-4.17.18"
-      sources."@types/formidable-1.0.32"
-      sources."@types/glob-7.1.3"
+      sources."@types/express-4.17.1"
+      sources."@types/express-serve-static-core-4.16.9"
+      sources."@types/form-data-2.5.0"
+      sources."@types/formidable-1.0.31"
+      sources."@types/glob-7.1.1"
       sources."@types/http-assert-1.5.1"
-      sources."@types/http-errors-1.8.0"
-      sources."@types/istanbul-lib-coverage-2.0.3"
-      sources."@types/istanbul-lib-report-3.0.0"
-      sources."@types/istanbul-reports-1.1.2"
-      sources."@types/jest-24.9.1"
-      sources."@types/js-yaml-3.12.6"
-      sources."@types/keygrip-1.0.2"
-      sources."@types/koa-2.11.6"
-      sources."@types/koa-compose-3.2.5"
-      sources."@types/koa-router-7.4.1"
+      sources."@types/istanbul-lib-coverage-2.0.1"
+      sources."@types/istanbul-lib-report-1.1.1"
+      sources."@types/istanbul-reports-1.1.1"
+      sources."@types/jest-24.0.15"
+      sources."@types/jest-diff-20.0.1"
+      sources."@types/js-yaml-3.12.1"
+      sources."@types/keygrip-1.0.1"
+      sources."@types/koa-2.0.48"
+      sources."@types/koa-compose-3.2.4"
+      sources."@types/koa-router-7.0.41"
       sources."@types/koa-send-4.1.2"
       sources."@types/koa-static-4.0.1"
-      sources."@types/koa-views-2.0.4"
-      sources."@types/lodash-4.14.168"
+      sources."@types/koa-views-2.0.3"
+      sources."@types/lodash-4.14.140"
       sources."@types/lodash.clonedeep-4.5.6"
-      sources."@types/mime-1.3.2"
+      sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-12.19.15"
+      sources."@types/node-12.0.8"
       sources."@types/ora-3.2.0"
-      sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
-      (sources."@types/request-2.48.5" // {
-        dependencies = [
-          sources."form-data-2.5.1"
-        ];
-      })
-      sources."@types/serve-static-1.13.9"
+      sources."@types/request-2.48.1"
+      sources."@types/serve-static-1.13.3"
       sources."@types/stack-utils-1.0.1"
-      sources."@types/tough-cookie-4.0.0"
-      sources."@types/underscore-1.10.24"
+      sources."@types/tough-cookie-2.3.5"
+      sources."@types/underscore-1.9.3"
       sources."@types/websocket-0.0.40"
-      sources."@types/ws-6.0.4"
-      sources."@types/yargs-13.0.11"
-      sources."@types/yargs-parser-20.2.0"
-      sources."@webassemblyjs/ast-1.9.0"
-      sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
-      sources."@webassemblyjs/helper-api-error-1.9.0"
-      sources."@webassemblyjs/helper-buffer-1.9.0"
-      sources."@webassemblyjs/helper-code-frame-1.9.0"
-      sources."@webassemblyjs/helper-fsm-1.9.0"
-      sources."@webassemblyjs/helper-module-context-1.9.0"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.9.0"
-      sources."@webassemblyjs/helper-wasm-section-1.9.0"
-      sources."@webassemblyjs/ieee754-1.9.0"
-      sources."@webassemblyjs/leb128-1.9.0"
-      sources."@webassemblyjs/utf8-1.9.0"
-      sources."@webassemblyjs/wasm-edit-1.9.0"
-      sources."@webassemblyjs/wasm-gen-1.9.0"
-      sources."@webassemblyjs/wasm-opt-1.9.0"
-      sources."@webassemblyjs/wasm-parser-1.9.0"
-      sources."@webassemblyjs/wast-parser-1.9.0"
-      sources."@webassemblyjs/wast-printer-1.9.0"
+      sources."@types/ws-6.0.3"
+      sources."@types/yargs-13.0.3"
+      sources."@types/yargs-parser-13.1.0"
+      sources."@webassemblyjs/ast-1.8.5"
+      sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
+      sources."@webassemblyjs/helper-api-error-1.8.5"
+      sources."@webassemblyjs/helper-buffer-1.8.5"
+      sources."@webassemblyjs/helper-code-frame-1.8.5"
+      sources."@webassemblyjs/helper-fsm-1.8.5"
+      sources."@webassemblyjs/helper-module-context-1.8.5"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.8.5"
+      sources."@webassemblyjs/helper-wasm-section-1.8.5"
+      sources."@webassemblyjs/ieee754-1.8.5"
+      sources."@webassemblyjs/leb128-1.8.5"
+      sources."@webassemblyjs/utf8-1.8.5"
+      sources."@webassemblyjs/wasm-edit-1.8.5"
+      sources."@webassemblyjs/wasm-gen-1.8.5"
+      sources."@webassemblyjs/wasm-opt-1.8.5"
+      sources."@webassemblyjs/wasm-parser-1.8.5"
+      sources."@webassemblyjs/wast-parser-1.8.5"
+      sources."@webassemblyjs/wast-printer-1.8.5"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."abab-2.0.5"
+      sources."abab-2.0.2"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
-      sources."acorn-3.3.0"
+      sources."acorn-5.7.3"
+      sources."acorn-dynamic-import-4.0.0"
       (sources."acorn-globals-3.1.0" // {
         dependencies = [
           sources."acorn-4.0.13"
         ];
       })
       sources."acorn-walk-6.2.0"
-      sources."aggregate-error-1.0.0"
-      sources."ajv-6.12.6"
+      sources."ajv-6.10.0"
       sources."ajv-errors-1.0.1"
-      sources."ajv-keywords-3.5.2"
+      sources."ajv-keywords-3.4.1"
       sources."align-text-0.1.4"
       sources."ansi-colors-3.2.4"
       sources."ansi-escapes-3.2.0"
       sources."ansi-html-0.0.7"
-      sources."ansi-regex-4.1.0"
+      sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
       sources."any-promise-1.3.0"
       sources."anymatch-2.0.0"
@@ -10153,11 +9564,7 @@ in
       sources."array-unique-0.3.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
-      (sources."asn1.js-5.4.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
           sources."inherits-2.0.1"
@@ -10167,28 +9574,28 @@ in
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
       sources."astral-regex-1.0.0"
-      sources."async-2.6.3"
+      sources."async-1.5.2"
       sources."async-each-1.0.3"
-      sources."async-limiter-1.0.1"
+      sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."awesome-typescript-loader-5.2.1"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.11.0"
-      sources."axios-0.19.2"
+      sources."aws4-1.8.0"
+      (sources."axios-0.19.0" // {
+        dependencies = [
+          sources."is-buffer-2.0.3"
+        ];
+      })
       sources."babel-6.23.0"
       (sources."babel-code-frame-6.26.0" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
           sources."ansi-styles-2.2.1"
           sources."chalk-1.1.3"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
         ];
       })
       (sources."babel-core-6.26.3" // {
         dependencies = [
-          sources."debug-2.6.9"
           sources."json5-0.5.1"
           sources."source-map-0.5.7"
         ];
@@ -10210,7 +9617,7 @@ in
       sources."babel-helper-remap-async-to-generator-6.24.1"
       sources."babel-helper-replace-supers-6.24.1"
       sources."babel-helpers-6.24.1"
-      (sources."babel-jest-24.9.0" // {
+      (sources."babel-jest-24.8.0" // {
         dependencies = [
           sources."slash-2.0.0"
         ];
@@ -10258,39 +9665,28 @@ in
       })
       sources."babel-runtime-6.26.0"
       sources."babel-template-6.26.0"
-      (sources."babel-traverse-6.26.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."babel-traverse-6.26.0"
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
           sources."define-property-1.0.0"
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."kind-of-6.0.2"
         ];
       })
-      sources."base64-js-1.5.1"
-      sources."base64url-3.0.1"
+      sources."base64-js-1.3.1"
       sources."batch-0.6.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bfj-6.1.2"
       sources."big.js-5.2.2"
-      sources."binary-extensions-2.2.0"
-      sources."bindings-1.5.0"
-      sources."bluebird-3.7.2"
-      sources."bn.js-5.1.3"
-      (sources."body-parser-1.19.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."depd-1.1.2"
-          sources."http-errors-1.7.2"
-          sources."inherits-2.0.3"
-          sources."qs-6.7.0"
-          sources."raw-body-2.4.0"
-        ];
-      })
+      sources."binary-extensions-1.13.1"
+      sources."bluebird-3.5.5"
+      sources."bn.js-4.11.8"
+      sources."body-parser-1.19.0"
       (sources."bonjour-3.5.0" // {
         dependencies = [
           sources."array-flatten-2.1.2"
@@ -10299,7 +9695,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
       sources."brorand-1.1.0"
-      sources."browser-process-hrtime-1.0.0"
+      sources."browser-process-hrtime-0.1.3"
       (sources."browser-resolve-1.11.3" // {
         dependencies = [
           sources."resolve-1.1.7"
@@ -10308,103 +9704,73 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      sources."browserify-rsa-4.1.0"
-      (sources."browserify-sign-4.2.1" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      sources."browserify-rsa-4.0.1"
+      sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
       sources."browserslist-3.2.8"
       sources."bs-logger-0.2.6"
-      sources."bser-2.1.1"
-      sources."buffer-5.7.1"
+      sources."bser-2.1.0"
+      sources."buffer-4.9.1"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
       sources."buffer-xor-1.0.3"
-      sources."bufferutil-4.0.3"
       sources."builtin-status-codes-3.0.0"
-      sources."byline-5.0.0"
       sources."bytes-3.1.0"
-      (sources."cacache-10.0.4" // {
-        dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
-        ];
-      })
+      sources."cacache-10.0.4"
       sources."cache-base-1.0.1"
       sources."cache-content-type-1.0.1"
-      (sources."cacheable-request-2.1.4" // {
-        dependencies = [
-          sources."get-stream-3.0.0"
-          sources."lowercase-keys-1.0.0"
-        ];
-      })
-      sources."call-bind-1.0.2"
       sources."callsites-3.1.0"
-      sources."camelcase-1.2.1"
-      sources."caniuse-lite-1.0.30001179"
+      sources."camelcase-5.3.1"
+      sources."caniuse-lite-1.0.30000997"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
-      sources."chalk-2.4.2"
-      sources."character-parser-2.2.0"
-      sources."check-types-8.0.3"
-      (sources."chokidar-3.5.1" // {
+      (sources."chalk-2.4.2" // {
         dependencies = [
-          sources."anymatch-3.1.1"
-          sources."braces-3.0.2"
-          sources."fill-range-7.0.1"
-          sources."fsevents-2.3.1"
-          sources."is-number-7.0.0"
-          sources."normalize-path-3.0.0"
-          sources."to-regex-range-5.0.1"
+          sources."supports-color-5.5.0"
         ];
       })
-      sources."chownr-1.1.4"
+      sources."character-parser-2.2.0"
+      sources."check-types-8.0.3"
+      (sources."chokidar-2.1.8" // {
+        dependencies = [
+          sources."normalize-path-3.0.0"
+        ];
+      })
+      sources."chownr-1.1.3"
       sources."chrome-trace-event-1.0.2"
       sources."ci-info-2.0.0"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
         ];
       })
-      sources."clean-css-4.2.3"
-      sources."clean-stack-1.3.0"
+      sources."clean-css-4.2.1"
       sources."cli-cursor-2.1.0"
-      sources."cli-spinners-2.5.0"
-      sources."cliui-2.1.0"
+      sources."cli-spinners-2.2.0"
+      (sources."cliui-5.0.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
       sources."clone-1.0.4"
-      sources."clone-response-1.0.2"
       sources."co-4.6.0"
       sources."co-body-5.2.0"
+      sources."code-point-at-1.1.0"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.8"
       sources."command-line-args-5.1.1"
-      sources."commander-2.20.3"
+      sources."commander-2.20.0"
       sources."commondir-1.0.1"
       sources."component-emitter-1.3.0"
-      sources."compressible-2.0.18"
+      sources."compressible-2.0.17"
       (sources."compression-1.7.4" // {
         dependencies = [
           sources."bytes-3.0.0"
-          sources."debug-2.6.9"
-          sources."safe-buffer-5.1.2"
         ];
       })
       sources."concat-map-0.0.1"
@@ -10412,24 +9778,16 @@ in
       sources."condense-newlines-0.2.1"
       sources."config-chain-1.1.12"
       sources."connect-history-api-fallback-1.6.0"
-      sources."console-browserify-1.2.0"
+      sources."console-browserify-1.1.0"
       sources."consolidate-0.15.1"
       sources."constantinople-3.1.2"
       sources."constants-browserify-1.0.0"
-      (sources."content-disposition-0.5.3" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."content-disposition-0.5.3"
       sources."content-type-1.0.4"
-      (sources."convert-source-map-1.7.0" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."convert-source-map-1.6.0"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."cookies-0.8.0"
+      sources."cookies-0.7.3"
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       (sources."copy-webpack-plugin-4.6.0" // {
@@ -10438,16 +9796,12 @@ in
           sources."p-try-1.0.0"
         ];
       })
-      sources."core-js-2.6.12"
+      sources."core-js-2.6.9"
       sources."core-util-is-1.0.2"
-      (sources."create-ecdh-4.0.4" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
-      sources."cron-1.8.2"
+      sources."cron-1.7.1"
       sources."cross-spawn-6.0.5"
       sources."crypto-browserify-3.12.0"
       sources."cssom-0.3.8"
@@ -10457,19 +9811,26 @@ in
       sources."dashdash-1.14.1"
       (sources."data-urls-1.1.0" // {
         dependencies = [
-          sources."whatwg-url-7.1.0"
+          sources."whatwg-url-7.0.0"
         ];
       })
-      sources."debug-3.1.0"
+      sources."date-now-0.1.4"
+      sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
-      sources."decompress-response-3.3.0"
       sources."deep-equal-1.0.1"
       sources."deep-is-0.1.3"
       sources."default-gateway-4.2.0"
       sources."defaults-1.0.3"
       sources."define-properties-1.1.3"
-      sources."define-property-2.0.2"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."kind-of-6.0.2"
+        ];
+      })
       (sources."del-4.1.1" // {
         dependencies = [
           (sources."globby-6.1.0" // {
@@ -10482,19 +9843,15 @@ in
       })
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."depd-2.0.0"
-      sources."des.js-1.0.1"
+      sources."depd-1.1.2"
+      sources."des.js-1.0.0"
       sources."destroy-1.0.4"
       sources."detect-file-1.0.0"
       sources."detect-indent-4.0.0"
       sources."detect-newline-2.1.0"
       sources."detect-node-2.0.4"
       sources."diff-sequences-24.9.0"
-      (sources."diffie-hellman-5.0.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."diffie-hellman-5.0.3"
       sources."dir-glob-2.2.2"
       sources."dns-equal-1.0.0"
       sources."dns-packet-1.3.1"
@@ -10502,89 +9859,57 @@ in
       sources."doctypes-1.1.0"
       sources."domain-browser-1.2.0"
       sources."domexception-1.0.1"
-      sources."duplexer-0.1.2"
-      sources."duplexer3-0.1.4"
+      sources."duplexer-0.1.1"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      (sources."editorconfig-0.15.3" // {
-        dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
-        ];
-      })
+      sources."editorconfig-0.15.3"
       sources."ee-first-1.1.1"
-      sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.642"
-      (sources."elliptic-6.5.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."ejs-2.7.1"
+      sources."electron-to-chromium-1.3.267"
+      sources."elliptic-6.5.1"
       sources."emoji-regex-7.0.3"
-      sources."emojis-list-3.0.0"
+      sources."emojis-list-2.1.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.5.0"
-      sources."errno-0.1.8"
+      sources."enhanced-resolve-4.1.0"
+      sources."errno-0.1.7"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.2"
-      sources."es-to-primitive-1.2.1"
-      sources."es5-ext-0.10.53"
+      sources."error-inject-1.0.0"
+      sources."es-abstract-1.14.2"
+      sources."es-to-primitive-1.2.0"
+      sources."es5-ext-0.10.51"
       sources."es6-iterator-2.0.3"
-      sources."es6-promise-4.2.8"
-      sources."es6-symbol-3.1.3"
+      sources."es6-symbol-3.1.2"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.14.3"
-      sources."eslint-scope-4.0.3"
-      sources."esprima-4.0.1"
-      (sources."esrecurse-4.3.0" // {
+      (sources."escodegen-1.12.0" // {
         dependencies = [
-          sources."estraverse-5.2.0"
+          sources."esprima-3.1.3"
         ];
       })
+      sources."eslint-scope-4.0.3"
+      sources."esprima-4.0.1"
+      sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
+      sources."esutils-2.0.2"
       sources."etag-1.8.1"
-      sources."eventemitter3-4.0.7"
-      sources."events-3.2.0"
+      sources."eventemitter3-4.0.0"
+      sources."events-3.0.0"
       sources."eventsource-1.0.7"
       sources."evp_bytestokey-1.0.3"
-      sources."exec-sh-0.3.4"
+      sources."exec-sh-0.3.2"
       sources."execa-1.0.0"
       sources."exit-0.1.2"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
-          sources."debug-2.6.9"
           sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
         ];
       })
       sources."expand-tilde-2.0.2"
       sources."expect-24.9.0"
       (sources."express-4.17.1" // {
         dependencies = [
-          sources."debug-2.6.9"
-          sources."depd-1.1.2"
           sources."path-to-regexp-0.1.7"
-          sources."qs-6.7.0"
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      (sources."ext-1.4.0" // {
-        dependencies = [
-          sources."type-2.1.0"
         ];
       })
       sources."extend-3.0.2"
@@ -10592,131 +9917,109 @@ in
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
-      sources."faye-websocket-0.11.3"
-      sources."fb-watchman-2.0.1"
-      sources."figgy-pudding-3.5.2"
-      sources."file-uri-to-path-1.0.0"
+      sources."faye-websocket-0.10.0"
+      sources."fb-watchman-2.0.0"
+      sources."figgy-pudding-3.5.1"
       sources."filesize-3.6.1"
       sources."fill-range-4.0.0"
-      (sources."finalhandler-1.1.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."finalhandler-1.1.2"
       sources."find-cache-dir-1.0.0"
       sources."find-replace-3.0.0"
       sources."find-up-3.0.0"
-      sources."findup-sync-3.0.0"
+      (sources."findup-sync-2.0.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
       sources."flush-write-stream-1.1.1"
-      sources."follow-redirects-1.5.10"
-      sources."for-each-0.3.3"
+      (sources."follow-redirects-1.5.10" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."formidable-1.2.2"
+      sources."form-data-2.5.1"
+      sources."formidable-1.2.1"
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."from2-2.3.0"
+      sources."fs-extra-4.0.3"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.13"
+      sources."fsevents-1.2.9"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.0.2"
-      (sources."get-paths-0.0.7" // {
-        dependencies = [
-          sources."pify-4.0.1"
-        ];
-      })
+      sources."get-paths-0.0.4"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
-      sources."glob-7.1.6"
-      sources."glob-parent-5.1.1"
-      (sources."global-modules-2.0.0" // {
+      sources."glob-7.1.4"
+      (sources."glob-parent-3.1.0" // {
         dependencies = [
-          sources."global-prefix-3.0.0"
-          sources."kind-of-6.0.3"
+          sources."is-glob-3.1.0"
         ];
       })
+      sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."globals-9.18.0"
       sources."globby-7.1.1"
-      (sources."got-8.3.2" // {
-        dependencies = [
-          sources."get-stream-3.0.0"
-        ];
-      })
-      sources."graceful-fs-4.2.4"
+      sources."graceful-fs-4.1.15"
       sources."growly-1.3.0"
       (sources."gzip-size-5.1.1" // {
         dependencies = [
           sources."pify-4.0.1"
         ];
       })
-      sources."handle-thing-2.0.1"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-1.0.3"
-      (sources."has-ansi-2.0.0" // {
+      sources."handle-thing-2.0.0"
+      (sources."handlebars-4.3.3" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
+          sources."uglify-js-3.6.0"
         ];
       })
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-1.0.3"
+      sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."has-symbol-support-x-1.4.2"
-      sources."has-symbols-1.0.1"
-      sources."has-to-string-tag-x-1.4.1"
+      sources."has-symbols-1.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
           sources."kind-of-4.0.0"
         ];
       })
-      (sources."hash-base-3.1.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      sources."hash-base-3.0.4"
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."home-or-tmp-2.0.0"
       sources."homedir-polyfill-1.0.3"
       sources."hoopy-0.1.4"
-      sources."hosted-git-info-2.8.8"
+      sources."hosted-git-info-2.8.4"
       sources."hpack.js-2.1.6"
       sources."html-encoding-sniffer-1.0.2"
-      sources."html-entities-1.4.0"
-      sources."html-escaper-2.0.2"
-      (sources."http-assert-1.4.1" // {
-        dependencies = [
-          sources."depd-1.1.2"
-          sources."http-errors-1.7.3"
-        ];
-      })
-      sources."http-cache-semantics-3.8.1"
+      sources."html-entities-1.2.1"
+      sources."http-assert-1.4.1"
       sources."http-deceiver-1.2.7"
-      (sources."http-errors-1.8.0" // {
-        dependencies = [
-          sources."depd-1.1.2"
-          sources."setprototypeof-1.2.0"
-        ];
-      })
-      sources."http-parser-js-0.5.3"
-      sources."http-proxy-1.18.1"
+      sources."http-errors-1.7.2"
+      sources."http-parser-js-0.4.10"
+      sources."http-proxy-1.18.0"
       sources."http-proxy-middleware-0.19.1"
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
+      sources."ieee754-1.1.13"
       sources."iferr-0.1.5"
       sources."ignore-3.3.10"
       (sources."import-local-2.0.0" // {
@@ -10725,40 +10028,29 @@ in
         ];
       })
       sources."imurmurhash-0.1.4"
-      sources."indent-string-3.2.0"
       sources."infer-owner-1.0.4"
       sources."inflation-2.0.0"
       sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
       sources."internal-ip-4.3.0"
-      sources."interpret-1.4.0"
-      sources."into-stream-3.1.0"
+      sources."interpret-1.2.0"
       sources."invariant-2.2.4"
+      sources."invert-kv-2.0.0"
       sources."ip-1.1.5"
       sources."ip-regex-2.1.0"
-      sources."ipaddr.js-1.9.1"
-      sources."is-absolute-url-3.0.3"
-      (sources."is-accessor-descriptor-1.0.0" // {
-        dependencies = [
-          sources."kind-of-6.0.3"
-        ];
-      })
+      sources."ipaddr.js-1.9.0"
+      sources."is-accessor-descriptor-0.1.6"
       sources."is-arrayish-0.2.1"
-      sources."is-binary-path-2.1.0"
+      sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
+      sources."is-callable-1.1.4"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.2.0"
-      (sources."is-data-descriptor-1.0.0" // {
+      sources."is-data-descriptor-0.1.4"
+      sources."is-date-object-1.0.1"
+      (sources."is-descriptor-0.1.6" // {
         dependencies = [
-          sources."kind-of-6.0.3"
-        ];
-      })
-      sources."is-date-object-1.0.2"
-      (sources."is-descriptor-1.0.2" // {
-        dependencies = [
-          sources."kind-of-6.0.3"
+          sources."kind-of-5.1.0"
         ];
       })
       (sources."is-expression-3.0.0" // {
@@ -10768,24 +10060,20 @@ in
       })
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-finite-1.1.0"
+      sources."is-finite-1.0.2"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-generator-fn-2.1.0"
-      sources."is-generator-function-1.0.8"
+      sources."is-generator-function-1.0.7"
       sources."is-glob-4.0.1"
-      sources."is-negative-zero-2.0.1"
       sources."is-number-3.0.0"
-      sources."is-object-1.0.2"
       sources."is-path-cwd-2.2.0"
       sources."is-path-in-cwd-2.1.0"
       sources."is-path-inside-2.1.0"
-      sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
-      sources."is-promise-2.2.2"
-      sources."is-regex-1.1.1"
-      sources."is-retry-allowed-1.2.0"
+      sources."is-promise-2.1.0"
+      sources."is-regex-1.0.4"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.3"
+      sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
       sources."is-whitespace-0.3.0"
       sources."is-windows-1.0.2"
@@ -10810,23 +10098,25 @@ in
       })
       (sources."istanbul-lib-source-maps-3.0.6" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.1.1"
           sources."make-dir-2.1.0"
           sources."ms-2.1.2"
           sources."pify-4.0.1"
         ];
       })
-      sources."istanbul-reports-2.2.7"
-      sources."isurl-1.0.0"
-      sources."jest-24.9.0"
-      sources."jest-changed-files-24.9.0"
-      (sources."jest-cli-24.9.0" // {
+      sources."istanbul-reports-2.2.6"
+      (sources."jest-24.8.0" // {
         dependencies = [
-          sources."cliui-5.0.0"
-          sources."yargs-13.3.2"
+          sources."jest-cli-24.9.0"
+        ];
+      })
+      sources."jest-changed-files-24.9.0"
+      (sources."jest-config-24.9.0" // {
+        dependencies = [
+          sources."babel-jest-24.9.0"
+          sources."slash-2.0.0"
         ];
       })
-      sources."jest-config-24.9.0"
       sources."jest-diff-24.9.0"
       sources."jest-docblock-24.9.0"
       sources."jest-each-24.9.0"
@@ -10843,16 +10133,14 @@ in
         ];
       })
       sources."jest-mock-24.9.0"
-      sources."jest-pnp-resolver-1.2.2"
+      sources."jest-pnp-resolver-1.2.1"
       sources."jest-regex-util-24.9.0"
       sources."jest-resolve-24.9.0"
       sources."jest-resolve-dependencies-24.9.0"
       sources."jest-runner-24.9.0"
       (sources."jest-runtime-24.9.0" // {
         dependencies = [
-          sources."cliui-5.0.0"
           sources."slash-2.0.0"
-          sources."yargs-13.3.2"
         ];
       })
       sources."jest-serializer-24.9.0"
@@ -10866,108 +10154,116 @@ in
           sources."slash-2.0.0"
         ];
       })
-      (sources."jest-validate-24.9.0" // {
-        dependencies = [
-          sources."camelcase-5.3.1"
-        ];
-      })
+      sources."jest-validate-24.9.0"
       sources."jest-watcher-24.9.0"
       (sources."jest-worker-24.9.0" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
       })
-      (sources."js-beautify-1.13.4" // {
-        dependencies = [
-          sources."mkdirp-1.0.4"
-        ];
-      })
+      sources."js-beautify-1.10.2"
       sources."js-stringify-1.0.2"
       sources."js-tokens-3.0.2"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-3.13.1"
       sources."jsbn-0.1.1"
       (sources."jsdom-11.12.0" // {
         dependencies = [
-          sources."acorn-5.7.4"
           (sources."acorn-globals-4.3.4" // {
             dependencies = [
-              sources."acorn-6.4.2"
+              sources."acorn-6.3.0"
             ];
           })
           sources."ws-5.2.2"
         ];
       })
       sources."jsesc-1.3.0"
-      sources."json-buffer-3.0.0"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
+      sources."json-stream-1.0.0"
       sources."json-stringify-safe-5.0.1"
       sources."json3-3.3.3"
       sources."json5-1.0.1"
+      sources."jsonfile-4.0.0"
       sources."jsonpath-plus-0.19.0"
       sources."jsprim-1.4.1"
       sources."jstransformer-1.0.0"
-      sources."keygrip-1.1.0"
-      sources."keyv-3.0.0"
+      sources."keygrip-1.0.3"
       sources."killable-1.0.1"
       sources."kind-of-3.2.2"
       sources."kleur-3.0.3"
-      sources."koa-2.13.1"
-      sources."koa-body-4.2.0"
-      sources."koa-compose-4.2.0"
+      (sources."koa-2.7.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."koa-body-4.1.0"
+      sources."koa-compose-4.1.0"
       (sources."koa-convert-1.2.0" // {
         dependencies = [
           sources."koa-compose-3.2.1"
         ];
       })
+      sources."koa-is-json-1.0.0"
       (sources."koa-router-7.4.0" // {
         dependencies = [
+          sources."debug-3.2.6"
           sources."koa-compose-3.2.1"
-        ];
-      })
-      (sources."koa-send-5.0.1" // {
-        dependencies = [
-          sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
-      sources."koa-static-5.0.0"
-      (sources."koa-views-6.3.1" // {
+      (sources."koa-send-5.0.0" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      (sources."koa-static-5.0.0" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      (sources."koa-views-6.2.0" // {
+        dependencies = [
+          sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."lazy-cache-1.0.4"
+      sources."lcid-2.0.0"
       sources."left-pad-1.3.0"
       sources."leven-3.1.0"
       sources."levn-0.3.0"
       sources."load-json-file-4.0.0"
       sources."loader-runner-2.4.0"
-      sources."loader-utils-1.4.0"
+      sources."loader-utils-1.2.3"
       sources."locate-path-3.0.0"
-      sources."lodash-4.17.20"
+      sources."lodash-4.17.15"
       sources."lodash.camelcase-4.3.0"
       sources."lodash.clonedeep-4.5.0"
-      sources."lodash.memoize-4.1.2"
       sources."lodash.sortby-4.7.0"
       sources."log-symbols-2.2.0"
-      sources."loglevel-1.7.1"
+      sources."loglevel-1.6.4"
       sources."loglevelnext-1.0.5"
-      sources."long-4.0.0"
       sources."longest-1.0.1"
       sources."loose-envify-1.4.0"
-      sources."lowercase-keys-1.0.1"
-      sources."lru-cache-5.1.1"
+      (sources."lru-cache-4.1.5" // {
+        dependencies = [
+          sources."yallist-2.1.2"
+        ];
+      })
       sources."make-dir-1.3.0"
-      sources."make-error-1.3.6"
+      sources."make-error-1.3.5"
       sources."makeerror-1.0.11"
+      sources."mamacro-0.0.3"
+      sources."map-age-cleaner-0.1.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
-      sources."memory-fs-0.5.0"
+      sources."mem-4.3.0"
+      sources."memory-fs-0.4.1"
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
       sources."methods-1.1.2"
@@ -10975,23 +10271,18 @@ in
         dependencies = [
           sources."extend-shallow-3.0.2"
           sources."is-extendable-1.0.1"
-          sources."kind-of-6.0.3"
-        ];
-      })
-      (sources."miller-rabin-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
+          sources."kind-of-6.0.2"
         ];
       })
+      sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
-      sources."mimic-fn-1.2.0"
-      sources."mimic-response-1.0.1"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."mimic-fn-2.1.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
+      sources."minimist-1.2.0"
       (sources."mississippi-2.0.0" // {
         dependencies = [
           sources."pump-2.0.1"
@@ -11002,98 +10293,106 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."mkdirp-0.5.5"
-      sources."moment-2.29.1"
-      sources."moment-timezone-0.5.32"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.24.0"
+      sources."moment-timezone-0.5.26"
       sources."move-concurrently-1.0.1"
       sources."ms-2.0.0"
       sources."multicast-dns-6.2.3"
       sources."multicast-dns-service-types-1.1.0"
       sources."mz-2.7.0"
-      sources."nan-2.14.2"
+      sources."nan-2.14.0"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
           sources."is-extendable-1.0.1"
-          sources."kind-of-6.0.3"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."natural-compare-1.4.0"
       sources."negotiator-0.6.2"
-      sources."neo-async-2.6.2"
+      sources."neo-async-2.6.1"
       sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
-      sources."node-forge-0.8.5"
-      sources."node-gyp-build-4.2.3"
+      sources."node-forge-0.8.2"
       sources."node-int64-0.4.0"
-      sources."node-jose-1.1.4"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
-          sources."buffer-4.9.2"
           sources."punycode-1.4.1"
         ];
       })
       sources."node-modules-regexp-1.0.0"
       sources."node-notifier-5.4.3"
-      sources."nopt-5.0.0"
+      sources."nopt-4.0.1"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-2.1.1"
-      sources."normalize-url-2.0.1"
       sources."npm-run-path-2.0.2"
-      sources."nwsapi-2.2.0"
+      sources."number-is-nan-1.0.1"
+      sources."nwsapi-2.1.4"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
           sources."define-property-0.2.5"
-          sources."is-accessor-descriptor-0.1.6"
-          sources."is-data-descriptor-0.1.4"
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
         ];
       })
-      sources."object-hash-1.3.1"
-      sources."object-inspect-1.9.0"
+      sources."object-inspect-1.6.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.1"
+      sources."object.assign-4.1.0"
+      sources."object.getownpropertydescriptors-2.0.3"
       sources."object.pick-1.3.0"
       sources."obuf-1.1.2"
-      sources."oidc-token-hash-3.0.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
-      sources."onetime-2.0.1"
+      (sources."onetime-2.0.1" // {
+        dependencies = [
+          sources."mimic-fn-1.2.0"
+        ];
+      })
       sources."only-0.0.2"
-      sources."opener-1.5.2"
-      sources."openid-client-2.5.0"
+      sources."opener-1.5.1"
       sources."opn-5.5.0"
-      sources."optionator-0.8.3"
-      sources."ora-3.4.0"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+        ];
+      })
+      (sources."optionator-0.8.2" // {
+        dependencies = [
+          sources."wordwrap-1.0.0"
+        ];
+      })
+      (sources."ora-3.4.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
       sources."original-1.0.2"
       sources."os-browserify-0.3.0"
       sources."os-homedir-1.0.2"
+      sources."os-locale-3.1.0"
       sources."os-tmpdir-1.0.2"
-      sources."p-any-1.1.0"
-      sources."p-cancelable-0.4.1"
+      sources."osenv-0.1.5"
+      sources."p-defer-1.0.0"
       sources."p-each-series-1.0.0"
       sources."p-finally-1.0.0"
-      sources."p-is-promise-1.1.0"
-      sources."p-limit-2.3.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-2.2.1"
       sources."p-locate-3.0.0"
       sources."p-map-2.1.0"
       sources."p-reduce-1.0.0"
       sources."p-retry-3.0.1"
-      sources."p-some-2.0.1"
-      sources."p-timeout-2.0.1"
       sources."p-try-2.2.0"
-      sources."pako-1.0.11"
+      sources."pako-1.0.10"
       sources."parallel-transform-1.2.0"
-      sources."parse-asn1-5.1.6"
+      sources."parse-asn1-5.1.5"
       sources."parse-json-4.0.0"
       sources."parse-passwd-1.0.0"
       sources."parse5-4.0.0"
@@ -11106,15 +10405,14 @@ in
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
-      (sources."path-to-regexp-1.8.0" // {
+      (sources."path-to-regexp-1.7.0" // {
         dependencies = [
           sources."isarray-0.0.1"
         ];
       })
       sources."path-type-3.0.0"
-      sources."pbkdf2-3.1.1"
+      sources."pbkdf2-3.0.17"
       sources."performance-now-2.1.0"
-      sources."picomatch-2.2.2"
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
@@ -11129,34 +10427,28 @@ in
         ];
       })
       sources."pn-1.1.0"
-      (sources."portfinder-1.0.28" // {
-        dependencies = [
-          sources."debug-3.2.7"
-          sources."ms-2.1.3"
-        ];
-      })
+      sources."portfinder-1.0.24"
       sources."posix-character-classes-0.1.1"
       sources."prelude-ls-1.1.2"
-      sources."prepend-http-2.0.0"
-      sources."prettier-1.19.1"
+      sources."prettier-1.18.2"
       sources."pretty-2.0.0"
-      sources."pretty-format-24.9.0"
+      (sources."pretty-format-24.9.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+        ];
+      })
       sources."private-0.1.8"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
       sources."promise-7.3.1"
       sources."promise-inflight-1.0.1"
-      sources."prompts-2.4.0"
+      sources."prompts-2.2.1"
       sources."proto-list-1.2.4"
-      sources."proxy-addr-2.0.6"
+      sources."proxy-addr-2.0.5"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.8.0"
-      (sources."public-encrypt-4.0.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."psl-1.1.32"
+      sources."public-encrypt-4.0.3"
       sources."pug-2.0.4"
       sources."pug-attrs-2.0.4"
       sources."pug-code-gen-2.0.2"
@@ -11176,33 +10468,22 @@ in
         ];
       })
       sources."punycode-2.1.1"
-      sources."qs-6.5.2"
-      sources."query-string-5.1.1"
+      sources."qs-6.7.0"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
-      sources."querystringify-2.2.0"
+      sources."querystringify-2.1.1"
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
       sources."range-parser-1.2.1"
-      (sources."raw-body-2.4.1" // {
-        dependencies = [
-          sources."depd-1.1.2"
-          sources."http-errors-1.7.3"
-        ];
-      })
-      sources."react-is-16.13.1"
-      sources."react-zlib-js-1.0.5"
+      sources."raw-body-2.4.0"
+      sources."react-is-16.9.0"
       sources."read-pkg-3.0.0"
       sources."read-pkg-up-4.0.0"
-      (sources."readable-stream-2.3.7" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      sources."readdirp-3.5.0"
+      sources."readable-stream-2.3.6"
+      sources."readdirp-2.2.1"
       sources."realpath-native-1.1.0"
       sources."rechoir-0.6.2"
-      sources."regenerate-1.4.2"
+      sources."regenerate-1.4.0"
       sources."regenerator-runtime-0.11.1"
       sources."regenerator-transform-0.10.1"
       (sources."regex-not-1.0.2" // {
@@ -11222,30 +10503,30 @@ in
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
-      sources."request-2.88.2"
-      sources."request-promise-core-1.1.4"
-      sources."request-promise-native-1.0.9"
+      (sources."request-2.88.0" // {
+        dependencies = [
+          sources."form-data-2.3.3"
+          sources."punycode-1.4.1"
+          sources."qs-6.5.2"
+          sources."tough-cookie-2.4.3"
+        ];
+      })
+      sources."request-promise-core-1.1.2"
+      sources."request-promise-native-1.0.7"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
-      sources."resolve-1.19.0"
+      sources."resolve-1.11.0"
       sources."resolve-cwd-2.0.0"
-      (sources."resolve-dir-1.0.1" // {
-        dependencies = [
-          sources."global-modules-1.0.0"
-        ];
-      })
+      sources."resolve-dir-1.0.1"
       sources."resolve-from-3.0.0"
       (sources."resolve-path-1.4.0" // {
         dependencies = [
-          sources."depd-1.1.2"
           sources."http-errors-1.6.3"
-          sources."inherits-2.0.3"
           sources."setprototypeof-1.1.0"
         ];
       })
       sources."resolve-url-0.2.1"
-      sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."retry-0.12.0"
@@ -11254,39 +10535,25 @@ in
       sources."ripemd160-2.0.2"
       sources."rsvp-4.8.5"
       sources."run-queue-1.0.3"
-      sources."rxjs-6.6.3"
-      sources."safe-buffer-5.2.1"
+      sources."rxjs-6.5.2"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sane-4.1.0"
       sources."sax-1.2.4"
       sources."schema-utils-1.0.0"
       sources."select-hose-2.0.0"
-      (sources."selfsigned-1.10.8" // {
-        dependencies = [
-          sources."node-forge-0.10.0"
-        ];
-      })
-      sources."semver-5.7.1"
+      sources."selfsigned-1.10.6"
+      sources."semver-5.7.0"
       (sources."send-0.17.1" // {
         dependencies = [
-          (sources."debug-2.6.9" // {
-            dependencies = [
-              sources."ms-2.0.0"
-            ];
-          })
-          sources."depd-1.1.2"
-          sources."http-errors-1.7.3"
           sources."ms-2.1.1"
         ];
       })
       sources."serialize-javascript-1.9.1"
       (sources."serve-index-1.9.1" // {
         dependencies = [
-          sources."debug-2.6.9"
-          sources."depd-1.1.2"
           sources."http-errors-1.6.3"
-          sources."inherits-2.0.3"
           sources."setprototypeof-1.1.0"
         ];
       })
@@ -11298,66 +10565,62 @@ in
       sources."sha.js-2.4.11"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
-      sources."shelljs-0.8.4"
+      sources."shelljs-0.8.3"
       sources."shellwords-0.1.1"
       sources."sigmund-1.0.1"
-      sources."signal-exit-3.0.3"
-      sources."simple-git-1.96.0"
-      sources."sisteransi-1.0.5"
+      sources."signal-exit-3.0.2"
+      (sources."simple-git-1.96.0" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."sisteransi-1.0.3"
       sources."slash-1.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          sources."debug-2.6.9"
           sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
           sources."source-map-0.5.7"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
           sources."define-property-1.0.0"
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."snapdragon-util-3.0.1"
-      sources."sockjs-0.3.21"
-      (sources."sockjs-client-1.5.0" // {
+      sources."sockjs-0.3.19"
+      (sources."sockjs-client-1.3.0" // {
         dependencies = [
-          sources."debug-3.2.7"
-          sources."ms-2.1.3"
+          sources."debug-3.2.6"
+          sources."faye-websocket-0.11.3"
+          sources."ms-2.1.2"
         ];
       })
-      sources."sort-keys-2.0.0"
       sources."source-list-map-2.0.1"
       sources."source-map-0.6.1"
-      sources."source-map-resolve-0.5.3"
-      sources."source-map-support-0.5.19"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-support-0.5.13"
       sources."source-map-url-0.4.0"
-      sources."spdx-correct-3.1.1"
-      sources."spdx-exceptions-2.3.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.7"
-      (sources."spdy-4.0.2" // {
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      (sources."spdy-4.0.1" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       (sources."spdy-transport-3.0.0" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.1.1"
           sources."ms-2.1.2"
-          sources."readable-stream-3.6.0"
+          sources."readable-stream-3.4.0"
         ];
       })
       (sources."split-string-3.1.0" // {
@@ -11369,26 +10632,10 @@ in
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."ssri-5.3.0"
-      (sources."stack-utils-1.0.4" // {
-        dependencies = [
-          sources."escape-string-regexp-2.0.0"
-        ];
-      })
+      sources."stack-utils-1.0.2"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
         ];
       })
       sources."statuses-1.5.0"
@@ -11396,49 +10643,48 @@ in
       sources."stream-browserify-2.0.2"
       sources."stream-each-1.2.3"
       sources."stream-http-2.8.3"
-      sources."stream-shift-1.0.1"
-      sources."strict-uri-encode-1.1.0"
+      sources."stream-shift-1.0.0"
       (sources."string-length-2.0.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string-width-3.1.0"
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
-      (sources."string_decoder-1.1.1" // {
+      (sources."string-width-3.1.0" // {
         dependencies = [
-          sources."safe-buffer-5.1.2"
+          sources."ansi-regex-4.1.0"
+          sources."strip-ansi-5.2.0"
         ];
       })
-      sources."strip-ansi-5.2.0"
+      sources."string.prototype.trimleft-2.1.0"
+      sources."string.prototype.trimright-2.1.0"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
-      sources."supports-color-5.5.0"
+      sources."supports-color-2.0.0"
       sources."symbol-tree-3.2.4"
       sources."tapable-1.1.3"
-      sources."terser-4.8.0"
-      (sources."terser-webpack-plugin-1.4.5" // {
+      sources."terser-4.3.3"
+      (sources."terser-webpack-plugin-1.4.1" // {
         dependencies = [
-          sources."cacache-12.0.4"
+          sources."cacache-12.0.3"
           sources."find-cache-dir-2.1.0"
+          sources."lru-cache-5.1.1"
           sources."make-dir-2.1.0"
           sources."mississippi-3.0.0"
           sources."pify-4.0.1"
           sources."pkg-dir-3.0.0"
-          sources."serialize-javascript-4.0.0"
           sources."ssri-6.0.1"
         ];
       })
       sources."test-exclude-5.2.3"
-      sources."thenify-3.3.1"
+      sources."thenify-3.3.0"
       sources."thenify-all-1.6.0"
       sources."throat-4.1.0"
       sources."through2-2.0.5"
-      sources."thunky-1.1.0"
-      sources."timed-out-4.0.1"
-      sources."timers-browserify-2.0.12"
+      sources."thunky-1.0.3"
+      sources."timers-browserify-2.0.11"
       sources."tmpl-1.0.4"
       sources."to-arraybuffer-1.0.1"
       sources."to-fast-properties-1.0.3"
@@ -11456,15 +10702,14 @@ in
       sources."tr46-1.0.1"
       sources."trim-right-1.0.1"
       sources."tryer-1.0.1"
-      (sources."ts-jest-24.3.0" // {
+      (sources."ts-jest-24.0.2" // {
         dependencies = [
           sources."camelcase-4.1.0"
-          sources."json5-2.1.3"
+          sources."json5-2.1.0"
           sources."yargs-parser-10.1.0"
         ];
       })
-      sources."tslib-1.14.1"
-      sources."tsscmp-1.0.6"
+      sources."tslib-1.10.0"
       sources."tty-browserify-0.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -11473,18 +10718,22 @@ in
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
-      sources."typescript-3.9.7"
+      sources."typescript-3.5.2"
       sources."typical-4.0.0"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
+          sources."camelcase-1.2.1"
+          sources."cliui-2.1.0"
           sources."source-map-0.5.7"
+          sources."yargs-3.10.0"
         ];
       })
       sources."uglify-to-browserify-1.0.2"
-      sources."underscore-1.12.0"
+      sources."underscore-1.9.1"
       sources."union-value-1.0.1"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
+      sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
       (sources."unset-value-1.0.0" // {
         dependencies = [
@@ -11497,8 +10746,8 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.1"
-      sources."urijs-1.19.5"
+      sources."uri-js-4.2.2"
+      sources."urijs-1.19.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -11506,127 +10755,126 @@ in
         ];
       })
       sources."url-parse-1.4.7"
-      sources."url-parse-lax-3.0.0"
-      sources."url-to-options-1.0.1"
       sources."use-3.1.1"
-      sources."utf-8-validate-5.0.4"
-      (sources."util-0.11.1" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
+      sources."util-0.11.1"
       sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.1.1"
+      sources."util.promisify-1.0.0"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.4.0"
-      sources."v8-compile-cache-2.2.0"
+      sources."uuid-3.3.2"
+      sources."v8-compile-cache-2.1.0"
       sources."validate-npm-package-license-3.0.4"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."vm-browserify-1.1.2"
+      sources."vm-browserify-1.1.0"
       sources."void-elements-2.0.1"
-      sources."w3c-hr-time-1.0.2"
+      sources."w3c-hr-time-1.0.1"
       sources."walker-1.0.7"
-      sources."watchpack-1.7.5"
-      (sources."watchpack-chokidar2-2.0.1" // {
-        dependencies = [
-          sources."binary-extensions-1.13.1"
-          sources."chokidar-2.1.8"
-          sources."glob-parent-3.1.0"
-          sources."is-binary-path-1.0.1"
-          sources."is-glob-3.1.0"
-          sources."normalize-path-3.0.0"
-          sources."readdirp-2.2.1"
-        ];
-      })
+      sources."watchpack-1.6.0"
       sources."wbuf-1.7.3"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
-      (sources."webpack-4.46.0" // {
+      (sources."webpack-4.35.0" // {
         dependencies = [
-          sources."acorn-6.4.2"
-          sources."memory-fs-0.4.1"
+          sources."acorn-6.3.0"
         ];
       })
-      (sources."webpack-bundle-analyzer-3.9.0" // {
+      (sources."webpack-bundle-analyzer-3.3.2" // {
         dependencies = [
-          sources."acorn-7.4.1"
-          sources."acorn-walk-7.2.0"
+          sources."acorn-6.3.0"
         ];
       })
-      (sources."webpack-cli-3.3.12" // {
+      (sources."webpack-cli-3.3.4" // {
         dependencies = [
-          sources."cliui-5.0.0"
-          sources."supports-color-6.1.0"
-          sources."yargs-13.3.2"
-        ];
-      })
-      (sources."webpack-dev-middleware-3.7.3" // {
-        dependencies = [
-          sources."memory-fs-0.4.1"
-          sources."mime-2.5.0"
-          sources."webpack-log-2.0.0"
-        ];
-      })
-      (sources."webpack-dev-server-3.11.2" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."binary-extensions-1.13.1"
-          sources."chokidar-2.1.8"
-          (sources."cliui-5.0.0" // {
+          sources."ansi-regex-3.0.0"
+          sources."cliui-4.1.0"
+          sources."get-caller-file-1.0.3"
+          sources."require-main-filename-1.0.1"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
+          sources."supports-color-5.5.0"
+          (sources."wrap-ansi-2.1.0" // {
             dependencies = [
-              sources."ansi-regex-4.1.0"
-              sources."strip-ansi-5.2.0"
+              sources."ansi-regex-2.1.1"
+              sources."is-fullwidth-code-point-1.0.0"
+              sources."string-width-1.0.2"
+              sources."strip-ansi-3.0.1"
             ];
           })
-          sources."debug-4.3.2"
-          sources."glob-parent-3.1.0"
-          sources."is-binary-path-1.0.1"
-          sources."is-glob-3.1.0"
+          sources."yargs-12.0.5"
+          sources."yargs-parser-11.1.1"
+        ];
+      })
+      (sources."webpack-dev-middleware-3.7.1" // {
+        dependencies = [
+          sources."mime-2.4.4"
+          sources."webpack-log-2.0.0"
+        ];
+      })
+      (sources."webpack-dev-server-3.7.2" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          (sources."cliui-4.1.0" // {
+            dependencies = [
+              sources."strip-ansi-4.0.0"
+            ];
+          })
+          sources."debug-4.1.1"
+          sources."get-caller-file-1.0.3"
           sources."ms-2.1.2"
-          sources."normalize-path-3.0.0"
-          sources."readdirp-2.2.1"
+          sources."require-main-filename-1.0.1"
           sources."semver-6.3.0"
-          sources."strip-ansi-3.0.1"
+          (sources."string-width-2.1.1" // {
+            dependencies = [
+              sources."strip-ansi-4.0.0"
+            ];
+          })
           sources."supports-color-6.1.0"
           sources."webpack-log-2.0.0"
-          sources."yargs-13.3.2"
+          (sources."wrap-ansi-2.1.0" // {
+            dependencies = [
+              sources."is-fullwidth-code-point-1.0.0"
+              sources."string-width-1.0.2"
+            ];
+          })
+          sources."yargs-12.0.5"
+          sources."yargs-parser-11.1.1"
         ];
       })
       sources."webpack-log-1.2.0"
       sources."webpack-sources-1.4.3"
-      (sources."websocket-1.0.33" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."websocket-driver-0.7.4"
-      sources."websocket-extensions-0.1.4"
+      sources."websocket-1.0.28"
+      sources."websocket-driver-0.7.3"
+      sources."websocket-extensions-0.1.3"
       sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
       sources."whatwg-url-6.5.0"
       sources."which-1.3.1"
       sources."which-module-2.0.0"
       sources."window-size-0.1.0"
-      sources."with-5.1.1"
-      sources."word-wrap-1.2.3"
+      (sources."with-5.1.1" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
       sources."wordwrap-0.0.2"
       sources."worker-farm-1.7.0"
-      sources."wrap-ansi-5.1.0"
+      (sources."wrap-ansi-5.1.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.1"
       sources."ws-6.2.1"
       sources."xml-name-validator-3.0.0"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.1"
+      sources."y18n-4.0.0"
       sources."yaeti-0.0.6"
-      sources."yallist-3.1.1"
-      sources."yargs-3.10.0"
-      (sources."yargs-parser-13.1.2" // {
-        dependencies = [
-          sources."camelcase-5.3.1"
-        ];
-      })
+      sources."yallist-3.1.0"
+      sources."yargs-13.3.0"
+      sources."yargs-parser-13.1.1"
+      sources."yarn-1.16.0"
       sources."ylru-1.2.1"
     ];
     buildInputs = globalBuildInputs;
@@ -11635,6 +10883,25 @@ in
     };
     production = false;
     bypassCache = true;
-    reconstructLock = true;
+    reconstructLock = false;
   };
+in
+{
+  args = args;
+  sources = sources;
+  tarball = nodeEnv.buildNodeSourceDist args;
+  package = nodeEnv.buildNodePackage args;
+  shell = nodeEnv.buildNodeShell args;
+  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
+    src = stdenv.mkDerivation {
+      name = args.name + "-package-json";
+      src = nix-gitignore.gitignoreSourcePure [
+        "*"
+        "!package.json"
+        "!package-lock.json"
+      ] args.src;
+      dontBuild = true;
+      installPhase = "mkdir -p $out; cp -r ./* $out;";
+    };
+  });
 }
diff --git a/pkgs/applications/networking/cluster/spacegun/package.json b/pkgs/applications/networking/cluster/spacegun/package.json
deleted file mode 100644
index 7d419edb74a..00000000000
--- a/pkgs/applications/networking/cluster/spacegun/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-  { "spacegun": "git+https://github.com/dvallin/spacegun.git#v0.3.3" }
-]

From 148ca8c904ff703ab7a4a22c92cd6907692543b1 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 17 Jan 2021 12:44:21 +0100
Subject: [PATCH 825/956] ocamlPackages.xenstore: init at 2.1.1

---
 .../ocaml-modules/xenstore/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/xenstore/default.nix

diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix
new file mode 100644
index 00000000000..666106fdb17
--- /dev/null
+++ b/pkgs/development/ocaml-modules/xenstore/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildDunePackage, fetchurl
+, cstruct, ppx_cstruct, lwt, ounit
+}:
+
+buildDunePackage rec {
+  pname = "xenstore";
+  version = "2.1.1";
+
+  minimumOCamlVersion = "4.04";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-xenstore/releases/download/${version}/xenstore-${version}.tbz";
+    sha256 = "283814ea21adc345c4d59cfcb17b2f7c1185004ecaecc3871557c961874c84f5";
+  };
+
+  nativeBuildInputs = [ ppx_cstruct ];
+  propagatedBuildInputs = [ cstruct lwt ];
+
+  doCheck = true;
+  checkInputs = [ ounit ];
+
+  meta = with lib; {
+    description = "Xenstore protocol in pure OCaml";
+    license = licenses.lgpl21Only;
+    maintainers = [ maintainers.sternenseemann ];
+    homepage = "https://github.com/mirage/ocaml-xenstore";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e0812b7c29c..de345c515ad 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1091,6 +1091,8 @@ let
 
     x509 = callPackage ../development/ocaml-modules/x509 { };
 
+    xenstore = callPackage ../development/ocaml-modules/xenstore { };
+
     xmlm = callPackage ../development/ocaml-modules/xmlm { };
 
     xml-light = callPackage ../development/ocaml-modules/xml-light { };

From 34457e2fc6659adc875d132e19ff71c95d05b016 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 17 Jan 2021 12:45:06 +0100
Subject: [PATCH 826/956] ocamlPackages.xenstore_transport: init at 1.3.0

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

diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix
new file mode 100644
index 00000000000..f0bb908e5db
--- /dev/null
+++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildDunePackage, fetchFromGitHub, xenstore, lwt }:
+
+buildDunePackage rec {
+  pname = "xenstore_transport";
+  version = "1.3.0";
+
+  minimumOCamlVersion = "4.04";
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "xapi-project";
+    repo = "ocaml-xenstore-clients";
+    rev = "v${version}";
+    sha256 = "1kxxd9i4qiq98r7sgvl59iq2ni7y6drnv48qj580q5cyiyyc85q3";
+  };
+
+  propagatedBuildInputs = [ xenstore lwt ];
+
+  # requires a mounted xenfs and xen server
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Low-level libraries for connecting to a xenstore service on a xen host";
+    license = licenses.lgpl21Only;
+    homepage = "http://github.com/xapi-project/ocaml-xenstore-clients";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index de345c515ad..580d76e4958 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1093,6 +1093,8 @@ let
 
     xenstore = callPackage ../development/ocaml-modules/xenstore { };
 
+    xenstore_transport = callPackage ../development/ocaml-modules/xenstore_transport { };
+
     xmlm = callPackage ../development/ocaml-modules/xmlm { };
 
     xml-light = callPackage ../development/ocaml-modules/xml-light { };

From 25ab7218c8078a722ebba7aa031051f0044a33ce Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 17 Jan 2021 12:45:33 +0100
Subject: [PATCH 827/956] ocamlPackages.xenstore-tool: init at 1.3.0

---
 .../ocaml-modules/xenstore-tool/default.nix         | 13 +++++++++++++
 pkgs/top-level/ocaml-packages.nix                   |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/xenstore-tool/default.nix

diff --git a/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix
new file mode 100644
index 00000000000..34f32e4f117
--- /dev/null
+++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix
@@ -0,0 +1,13 @@
+{ buildDunePackage, xenstore_transport, xenstore, lwt }:
+
+buildDunePackage {
+  pname = "xenstore-tool";
+
+  inherit (xenstore_transport) src version useDune2 minimumOCamlVersion;
+
+  buildInputs = [ xenstore_transport xenstore lwt ];
+
+  meta = xenstore_transport.meta // {
+    description = "Command line tool for interfacing with xenstore";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 580d76e4958..308240737ab 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1095,6 +1095,8 @@ let
 
     xenstore_transport = callPackage ../development/ocaml-modules/xenstore_transport { };
 
+    xenstore-tool = callPackage ../development/ocaml-modules/xenstore-tool { };
+
     xmlm = callPackage ../development/ocaml-modules/xmlm { };
 
     xml-light = callPackage ../development/ocaml-modules/xml-light { };

From 6aef21c314eb35325023eacd8b79c2babfaab1d9 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 17 Jan 2021 12:57:14 +0100
Subject: [PATCH 828/956] ocamlPackages.tls-mirage: init at 0.12.8

---
 pkgs/development/ocaml-modules/tls/mirage.nix | 29 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/tls/mirage.nix

diff --git a/pkgs/development/ocaml-modules/tls/mirage.nix b/pkgs/development/ocaml-modules/tls/mirage.nix
new file mode 100644
index 00000000000..ad81c03c35d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tls/mirage.nix
@@ -0,0 +1,29 @@
+{ buildDunePackage, tls
+, x509, lwt, fmt, mirage-flow, mirage-kv, mirage-clock, ptime
+, mirage-crypto, mirage-crypto-pk, hacl_x25519, fiat-p256
+}:
+
+buildDunePackage {
+  pname = "tls-mirage";
+
+  inherit (tls) version src useDune2 minimumOCamlVersion;
+
+  propagatedBuildInputs = [
+    tls
+    x509
+    lwt
+    fmt
+    mirage-flow
+    mirage-kv
+    mirage-clock
+    ptime
+    mirage-crypto
+    mirage-crypto-pk
+    hacl_x25519
+    fiat-p256
+  ];
+
+  meta = tls.meta // {
+    description = "Transport Layer Security purely in OCaml, MirageOS layer";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 308240737ab..f91baae0b6e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -903,6 +903,8 @@ let
 
     tls = callPackage ../development/ocaml-modules/tls { };
 
+    tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { };
+
     torch = callPackage ../development/ocaml-modules/torch {
       inherit (pkgs.python3Packages) pytorch;
     };

From 3b363283a53e279b027027b8101f43f1671a2000 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 17 Jan 2021 12:57:41 +0100
Subject: [PATCH 829/956] ocamlPackages.vchan: init at 6.0.0

---
 .../ocaml-modules/vchan/default.nix           | 47 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/vchan/default.nix

diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix
new file mode 100644
index 00000000000..54bf4e65004
--- /dev/null
+++ b/pkgs/development/ocaml-modules/vchan/default.nix
@@ -0,0 +1,47 @@
+{ lib, buildDunePackage, fetchurl
+, ppx_cstruct, ppx_sexp_conv, ounit, io-page-unix
+, lwt, cstruct, io-page, mirage-flow, xenstore, xenstore_transport
+, sexplib, cmdliner
+}:
+
+buildDunePackage rec {
+  pname = "vchan";
+  version = "6.0.0";
+
+  useDune2 = true;
+  minimumOCamlVersion = "4.08";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-v${version}.tbz";
+    sha256 = "7a6cc89ff8ba7144d6cef3f36722f40deedb3cefff0f7be1b2f3b7b2a2b41747";
+  };
+
+  nativeBuildInputs = [
+    ppx_cstruct
+  ];
+
+  propagatedBuildInputs = [
+    ppx_sexp_conv
+    lwt
+    cstruct
+    io-page
+    mirage-flow
+    xenstore
+    xenstore_transport
+    sexplib
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    cmdliner
+    io-page-unix
+    ounit
+  ];
+
+  meta = with lib; {
+    description = "Xen Vchan implementation";
+    homepage = "https://github.com/mirage/ocaml-vchan";
+    license = licenses.isc;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f91baae0b6e..af9f5a671c3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1073,6 +1073,8 @@ let
 
     variantslib_p4 = callPackage ../development/ocaml-modules/variantslib { };
 
+    vchan = callPackage ../development/ocaml-modules/vchan { };
+
     vg = callPackage ../development/ocaml-modules/vg { };
 
     visitors = callPackage ../development/ocaml-modules/visitors { };

From 0378fedc17a8e359650d6dce5d9839621b09f102 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 17 Jan 2021 12:58:09 +0100
Subject: [PATCH 830/956] ocamlPackages.conduit-mirage: init at 2.2.2

---
 .../ocaml-modules/conduit/mirage.nix          | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/conduit/mirage.nix

diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix
new file mode 100644
index 00000000000..6100908f785
--- /dev/null
+++ b/pkgs/development/ocaml-modules/conduit/mirage.nix
@@ -0,0 +1,24 @@
+{ buildDunePackage, conduit-lwt
+, ppx_sexp_conv, sexplib, cstruct, mirage-stack, mirage-flow
+, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
+, dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
+}:
+
+buildDunePackage {
+  pname = "conduit-mirage";
+
+  inherit (conduit-lwt) version src minimumOCamlVersion useDune2;
+
+  nativeBuildInputs = [ ppx_sexp_conv ];
+
+  propagatedBuildInputs = [
+    sexplib cstruct mirage-stack mirage-clock mirage-flow
+    mirage-flow-combinators mirage-random mirage-time
+    dns-client conduit-lwt vchan xenstore tls tls-mirage
+    ipaddr ipaddr-sexp
+  ];
+
+  meta = conduit-lwt.meta // {
+    description = "A network connection establishment library for MirageOS";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index af9f5a671c3..c3dbb3be257 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -154,6 +154,8 @@ let
 
     conduit-lwt-unix = callPackage ../development/ocaml-modules/conduit/lwt-unix.nix { };
 
+    conduit-mirage = callPackage ../development/ocaml-modules/conduit/mirage.nix { };
+
     config-file = callPackage ../development/ocaml-modules/config-file { };
 
     containers = callPackage ../development/ocaml-modules/containers { };

From 2483ca4c6277e217f845bc3a76681122745dbc2e Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 17 Jan 2021 12:58:24 +0100
Subject: [PATCH 831/956] ocamlPackages.cohttp-mirage: init at 2.5.4

---
 .../ocaml-modules/cohttp/mirage.nix           | 20 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/cohttp/mirage.nix

diff --git a/pkgs/development/ocaml-modules/cohttp/mirage.nix b/pkgs/development/ocaml-modules/cohttp/mirage.nix
new file mode 100644
index 00000000000..e7b172349cb
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cohttp/mirage.nix
@@ -0,0 +1,20 @@
+{ buildDunePackage, cohttp, cohttp-lwt
+, mirage-flow, mirage-channel, mirage-kv
+, conduit, conduit-mirage, lwt
+, astring, magic-mime
+}:
+
+buildDunePackage {
+  pname = "cohttp-mirage";
+
+  inherit (cohttp) version src minimumOCamlVersion useDune2;
+
+  propagatedBuildInputs = [
+    mirage-flow mirage-channel conduit conduit-mirage mirage-kv
+    lwt cohttp cohttp-lwt astring magic-mime
+  ];
+
+  meta = cohttp.meta // {
+    description = "CoHTTP implementation for the MirageOS unikernel";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index c3dbb3be257..84a651e891e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -146,6 +146,8 @@ let
 
     cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { };
 
+    cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { };
+
     conduit = callPackage ../development/ocaml-modules/conduit { };
 
     conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { };

From e4fb0f324c5f3573dfc1040a20cec423d9acc950 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 27 Nov 2019 19:15:58 +0200
Subject: [PATCH 832/956] pythonPackages.testing-postgresql: init at
 unstable-2017-10-31

---
 .../testing-postgresql/default.nix            | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/testing-postgresql/default.nix

diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix
new file mode 100644
index 00000000000..7ebff6ccc36
--- /dev/null
+++ b/pkgs/development/python-modules/testing-postgresql/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchFromGitHub, postgresql, testing-common-database
+, pg8000, pytestCheckHook, psycopg2, sqlalchemy }:
+
+buildPythonPackage rec {
+  pname = "testing.postgresql";
+  # Version 1.3.0 isn't working so let's use the latest commit from GitHub
+  version = "unstable-2017-10-31";
+
+  src = fetchFromGitHub {
+    owner = "tk0miya";
+    repo = pname;
+    rev = "c81ded434d00ec8424de0f9e1f4063c778c6aaa8";
+    sha256 = "1asqsi38di768i1sc1qm1k068dj0906ds6lnx7xcbxws0s25m2q3";
+  };
+
+  # Add PostgreSQL to search path
+  prePatch = ''
+    substituteInPlace src/testing/postgresql.py \
+      --replace "/usr/local/pgsql" "${postgresql}"
+  '';
+
+  propagatedBuildInputs = [ testing-common-database pg8000 ];
+
+  # Fix tests for Darwin build. See:
+  # https://github.com/NixOS/nixpkgs/pull/74716#issuecomment-598546916
+  __darwinAllowLocalNetworking = true;
+
+  checkInputs = [ pytestCheckHook psycopg2 sqlalchemy ];
+
+  meta = with lib; {
+    description = "Use temporary postgresql instance in testing";
+    homepage = "https://github.com/tk0miya/testing.postgresql";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2926eb9d817..cc67b532237 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7122,6 +7122,8 @@ in {
 
   testing-common-database = callPackage ../development/python-modules/testing-common-database { };
 
+  testing-postgresql = callPackage ../development/python-modules/testing-postgresql { };
+
   testpath = callPackage ../development/python-modules/testpath { };
 
   testrepository = callPackage ../development/python-modules/testrepository { };

From 50ec7073abe981ba604a9f4f0de575c8c575bc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Jan 2021 13:49:18 -0300
Subject: [PATCH 833/956] theme-jade1: 1.10 -> 1.11

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

diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix
index 7b850c9049e..122d0a4a656 100644
--- a/pkgs/data/themes/jade1/default.nix
+++ b/pkgs/data/themes/jade1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "theme-jade1";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz";
-    sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2";
+    sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs";
   };
 
   sourceRoot = ".";

From 829d84d05720514bf7ba603430ea1eb2fbfe6a13 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 22 Aug 2020 23:36:40 +0200
Subject: [PATCH 834/956] python38Packages.coloredlogs: disable tests on darwin

---
 .../python-modules/coloredlogs/default.nix            | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix
index 3005429658b..48d13ab49dd 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/pkgs/development/python-modules/coloredlogs/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , humanfriendly
@@ -7,6 +8,7 @@
 , pytest
 , mock
 , util-linux
+, isPy38
 }:
 
 buildPythonPackage rec {
@@ -20,13 +22,18 @@ buildPythonPackage rec {
     sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x";
   };
 
+  # capturer is broken on darwin / py38, so we skip the test until a fix for
+  # https://github.com/xolox/python-capturer/issues/10 is released.
+  doCheck = !(isPy38 && stdenv.isDarwin);
   checkPhase = ''
     PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
                                      and not test_auto_install"
   '';
-  checkInputs = [ pytest mock util-linux ];
+  checkInputs = [ pytest mock util-linux verboselogs capturer ];
 
-  propagatedBuildInputs = [ humanfriendly verboselogs capturer ];
+  pythonImportsCheck = [ "coloredlogs" ];
+
+  propagatedBuildInputs = [ humanfriendly ];
 
   meta = with lib; {
     description = "Colored stream handler for Python's logging module";

From 65ea0f1482dc5c9bb95b6aa91f9a3e10fafc003b Mon Sep 17 00:00:00 2001
From: Ana Hobden <operator@hoverbear.org>
Date: Thu, 21 Jan 2021 10:54:01 -0800
Subject: [PATCH 835/956] convco: init at 0.3.2

Signed-off-by: Ana Hobden <operator@hoverbear.org>
---
 pkgs/development/tools/convco/default.nix | 26 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 ++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/convco/default.nix

diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix
new file mode 100644
index 00000000000..d6be170bb8f
--- /dev/null
+++ b/pkgs/development/tools/convco/default.nix
@@ -0,0 +1,26 @@
+{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "convco";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "convco";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4";
+  };
+
+  cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z";
+
+  nativeBuildInputs = [ openssl perl pkg-config ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+
+  meta = with lib; {
+    description = "A Conventional commit cli";
+    homepage = "https://github.com/convco/convco";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ hoverbear ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd61a9eb7bf..7756ce2f915 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10692,6 +10692,10 @@ in
 
   crate2nix = callPackage ../development/tools/rust/crate2nix { };
 
+  convco = callPackage ../development/tools/convco {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   maturin = callPackage ../development/tools/rust/maturin { };
   inherit (rustPackages) rls;
   rustfmt = rustPackages.rustfmt;

From d2b51fd032d0b6b510994e9e6a4e14ef64efbc09 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 24 Jan 2021 14:47:31 -0300
Subject: [PATCH 836/956] vimPlugins.vim-autoswap: init at 2019-01-09

---
 pkgs/misc/vim-plugins/generated.nix    | 78 +++++++++++++++-----------
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 71cfd70356f..192a1b92f71 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2021-01-23";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "9fd9435cd525b1d3c4470db0d514f72ed31cfece";
-      sha256 = "0nbnq3wmwm5m4g2b8jknjvallq1pq7qdxmbz81nnjkdmf6sw75ji";
+      rev = "471e20ed2bfb373068ccd54db5603bd3f4dcbae0";
+      sha256 = "0gzl8vbbqpjr1pw328p2lq7xsp85wrg0sfa1hsj62vay4gw3m84q";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -377,12 +377,12 @@ let
 
   chadtree = buildVimPluginFrom2Nix {
     pname = "chadtree";
-    version = "2021-01-23";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "614af72a9b0afaac26e3e7fe2e1f30eb416bb96b";
-      sha256 = "04mnhwk1sn174nrvr9jfvcfq4dff1c595y9i2r94xy6yag5cv61l";
+      rev = "64e54cc9f39dc2084555522bec017cc35ccb8d9d";
+      sha256 = "04fm2m2iiclbcijdmqa20a72af2vizx6bid8q348bsw2ppdh3r1a";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -473,12 +473,12 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2021-01-18";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "272d783f338107426cf75fa48b6f0a30860a8ac4";
-      sha256 = "07dyy8v0j07w6gi89p08l0vcc0ba6d3qnz4wpsfj4hzf6cgifsw4";
+      rev = "9b0687cdbe4b64c790f6022c605f1078430916d9";
+      sha256 = "0n74sab6i8bq21zjrdd3vcv97bra9dg06dn6zpdc81n7pi13z6a5";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -1487,12 +1487,12 @@ let
 
   galaxyline-nvim = buildVimPluginFrom2Nix {
     pname = "galaxyline-nvim";
-    version = "2021-01-17";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "galaxyline.nvim";
-      rev = "64d6b8e31459057ba4f9b03a977fce0d2cc3d748";
-      sha256 = "1w5cggvxvmnm3zparnsgb3iz1pkw7d8bwvflcxaxg4pilgsniqsa";
+      rev = "22791e9aadfc2a24ccc22d21b4c50f6b52e12980";
+      sha256 = "1dw9k5ql7h8mgj7ag34pxa2jr9b2k788csc2a0jmyp6qp0d0x5ad";
     };
     meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
   };
@@ -2868,12 +2868,12 @@ let
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2021-01-20";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "50b578efc1514f6ba45e23cdc89d656a51929208";
-      sha256 = "0qcnchf1mnq0bwgkg7las62i4l4hwyisycymcrs0ki9skqdw5swh";
+      rev = "531a575d1768be4531246950e55a784739b5d0a7";
+      sha256 = "03hd7bq09gz23619b19cz29hafhia5r28xm8bqnj03d2m6b2xlyh";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
   };
@@ -2916,12 +2916,12 @@ let
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2021-01-23";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "6a33e9ba757245a300531e370c6b2ebe6e5a7097";
-      sha256 = "1grsh5186in83n0j28n8r0vw64kx8h1c5z8pm19adwdan0pcbs1r";
+      rev = "9f91a07b38b6f66a56ca15161ffec83a5468b95a";
+      sha256 = "01da135ffng6praixsnwgas0nm26ik9y8hm06jy394p2b2mk1g1g";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -3024,12 +3024,12 @@ let
 
   nvim-ts-rainbow = buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow";
-    version = "2021-01-23";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "p00f";
       repo = "nvim-ts-rainbow";
-      rev = "955f6d08e2e829f819d5f838e742761b43a263f5";
-      sha256 = "19yy39sv1xv36aa9chrlkpf9xfw5l556s5sljcspynn66sdz8n5y";
+      rev = "aca42922425e80582f7e3bb77c87f914119fb664";
+      sha256 = "0d7h5fc5kyd4i17s0xjfq7ifg7h2xbrsnspilbraxppyfj0xhdrs";
     };
     meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
   };
@@ -3758,12 +3758,12 @@ let
 
   sql-nvim = buildVimPluginFrom2Nix {
     pname = "sql-nvim";
-    version = "2021-01-22";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "tami5";
       repo = "sql.nvim";
-      rev = "af875daf178fe38c2186b14d55a6bbdb6fbb2e15";
-      sha256 = "00qa9m6bij9y39xyf73a3gz0xx0l0mqc1byrk6xl3kdbcngig5il";
+      rev = "f0958180a5648ed1fc1fbedb89b94d81a45216a6";
+      sha256 = "1bi2j4j9vkjw8dnb73jb7la4s4b71wr2q5mwhc1iyd15gxaya7xw";
     };
     meta.homepage = "https://github.com/tami5/sql.nvim/";
   };
@@ -4574,6 +4574,18 @@ let
     meta.homepage = "https://github.com/benizi/vim-automkdir/";
   };
 
+  vim-autoswap = buildVimPluginFrom2Nix {
+    pname = "vim-autoswap";
+    version = "2019-01-09";
+    src = fetchFromGitHub {
+      owner = "gioele";
+      repo = "vim-autoswap";
+      rev = "e587e4b14a605d8921942ba65a37583813289272";
+      sha256 = "0l0ijbdl2s9p5i3cxfkq8jncncz38qprp51whbjcda485d1knk9n";
+    };
+    meta.homepage = "https://github.com/gioele/vim-autoswap/";
+  };
+
   vim-bazel = buildVimPluginFrom2Nix {
     pname = "vim-bazel";
     version = "2020-08-22";
@@ -5777,12 +5789,12 @@ let
 
   vim-illuminate = buildVimPluginFrom2Nix {
     pname = "vim-illuminate";
-    version = "2021-01-23";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "d69a2787524a6973a187e67c978e1a92529fd910";
-      sha256 = "013xnvxrma4jdv9a5i33qzjw65c0rrlvidsgdg4snrmwhdqw744q";
+      rev = "a500e9fae73e433757c5d8a44da74e66373eb21e";
+      sha256 = "1mxl0aziakvialk0qgm0mnpqdk9iwqnss9wqj7584nfxvz9zck20";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
   };
@@ -6006,12 +6018,12 @@ let
 
   vim-LanguageTool = buildVimPluginFrom2Nix {
     pname = "vim-LanguageTool";
-    version = "2020-10-29";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "dpelle";
       repo = "vim-LanguageTool";
-      rev = "d1f94ef917dddfd8c82589957b7aa6a55f382964";
-      sha256 = "1y2y3rkhnj6xhzkm0snfkb08h6jmyjiicmk4j8lw2vhszsfgz6ns";
+      rev = "f92e2577ab937f437c06d91639100952b540365b";
+      sha256 = "09jw26mmbyvjlz5fw1gj9q0dwmv0aqwbl288h4hcliyx56snijhl";
     };
     meta.homepage = "https://github.com/dpelle/vim-LanguageTool/";
   };
@@ -8049,12 +8061,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2021-01-19";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "5d3d96dcdf0f87273978c482e9c1b39201f4516f";
-      sha256 = "04rn9w17mmf2ka4wqdl8x4nzwg5imnb0q1mnsm1hx8bvlr8zs0h6";
+      rev = "fb6ed9883ea48c93e419736777d5f2e86fa4009b";
+      sha256 = "0zrf3l7rckidrhlx6jdndabdiwgdyjfnax0ax20g4ynzmzlbj24l";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a7e3ea1a3a7..e0babda2945 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -133,6 +133,7 @@ gentoo/gentoo-syntax
 GEverding/vim-hocon
 gfanto/fzf-lsp.nvim@main
 gibiansky/vim-textobj-haskell
+gioele/vim-autoswap
 glepnir/galaxyline.nvim@main
 glts/vim-textobj-comment
 godlygeek/csapprox

From 4f272164059cb1dc1bb2452c4b8d1030511f8a16 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 19:18:42 +0100
Subject: [PATCH 837/956] python3Packages.fortiosapi: init at 1.0.5

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

diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix
new file mode 100644
index 00000000000..8b0425c3881
--- /dev/null
+++ b/pkgs/development/python-modules/fortiosapi/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, oyaml
+, packaging
+, paramiko
+, pexpect
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "fortiosapi";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "fortinet-solutions-cse";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k";
+  };
+
+  propagatedBuildInputs = [
+    pexpect
+    requests
+    paramiko
+    packaging
+    oyaml
+  ];
+
+  # Tests require a local VM
+  doCheck = false;
+  pythonImportsCheck = [ "fortiosapi" ];
+
+  meta = with lib; {
+    description = "Python module to work with Fortigate/Fortios devices";
+    homepage = "https://github.com/fortinet-solutions-cse/fortiosapi";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d37d837e4e1..c41eeb01e55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2382,6 +2382,8 @@ in {
 
   forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { };
 
+  fortiosapi = callPackage ../development/python-modules/fortiosapi { };
+
   FormEncode = callPackage ../development/python-modules/FormEncode { };
 
   foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; };

From 56673903f29b94d5065eaed35fe2a0755a515b85 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 19:19:50 +0100
Subject: [PATCH 838/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 0f0737595af..b480943894e 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -270,7 +270,7 @@
     "folder_watcher" = ps: with ps; [ watchdog ];
     "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async
     "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java
-    "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi
+    "fortios" = ps: with ps; [ fortiosapi ];
     "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
     "foursquare" = ps: with ps; [ aiohttp-cors ];
     "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms

From 9a7efb242219af31c1e6cd67278f0238347292f1 Mon Sep 17 00:00:00 2001
From: Marc Seeger <mseeger@fb.com>
Date: Sun, 24 Jan 2021 10:23:16 -0800
Subject: [PATCH 839/956] rpm: add zstd support

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

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 18477e987a5..5c72dc07152 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchpatch
 , pkg-config, autoreconfHook
 , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
-, sqlite
+, sqlite, zstd
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "man" ];
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
-  buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
+  buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
                 ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     "--enable-python"
     "--enable-ndb"
     "--enable-sqlite"
+    "--enable-zstd"
     "--localstatedir=/var"
     "--sharedstatedir=/com"
   ];

From 833371ffa710ba787dc7013a46c52f90f155e8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Jan 2021 15:37:20 -0300
Subject: [PATCH 840/956] theme-obsidian2: 2.17 -> 2.18

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

diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix
index 3eb056e183e..a965af53d42 100644
--- a/pkgs/data/themes/obsidian2/default.nix
+++ b/pkgs/data/themes/obsidian2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "theme-obsidian2";
-  version = "2.17";
+  version = "2.18";
 
   src = fetchurl {
     url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
-    sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4";
+    sha256 = "1w3grlkws4ih7333hys33z4bgm33jbc78bq2pyp8nzw4q9d2hz2r";
   };
 
   sourceRoot = ".";

From fd3d62bcdfa66e505f805ed2757f21020dee7148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Jan 2021 10:27:57 -0300
Subject: [PATCH 841/956] lxqt: fix oxygen-icons5 attribute path

kdeFrameworks.oxygen-icons5 does not exist anymore
---
 pkgs/desktops/lxqt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 088b4e335ea..9e302ebbbd6 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -107,7 +107,7 @@ let
       qlipper
 
       ### Default icon theme
-      pkgs.kdeFrameworks.oxygen-icons5
+      libsForQt5.oxygen-icons5
 
       ### Screen saver
       pkgs.xscreensaver

From 52fc21b10f7c0a26c71734c41d7c1103fbdf8c40 Mon Sep 17 00:00:00 2001
From: Sheena Artrip <sheena.artrip@gmail.com>
Date: Sun, 24 Jan 2021 03:23:59 -0800
Subject: [PATCH 842/956] command-not-found: fix zsh exit code

---
 nixos/modules/programs/command-not-found/command-not-found.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index 656c255fcb1..d8394bf73a2 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -80,6 +80,8 @@ in
             # Retry the command if we just installed it.
             if [ $? = 126 ]; then
               "$@"
+            else
+              return 127
             fi
           else
             # Indicate than there was an error so ZSH falls back to its default handler

From aa2c0b210563b3d8b61ec81a5cd9b9f02d8d593e Mon Sep 17 00:00:00 2001
From: Joseph Crail <jbcrail@gmail.com>
Date: Sat, 23 Jan 2021 19:46:30 -0800
Subject: [PATCH 843/956] maintainers: add jbcrail

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ed8ecc6cd27..c2995557485 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10496,4 +10496,10 @@
     github = "zupo";
     githubId = 311580;
   };
+  jbcrail = {
+    name = "Joseph Crail";
+    email = "jbcrail@gmail.com";
+    github = "jbcrail";
+    githubId = 6038;
+  };
 }

From 27955d37e97b5a35c83222345f057b322334c7ac Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 24 Jan 2021 20:35:29 +0100
Subject: [PATCH 844/956] nixos/tests/chromium: Simplify the logic (#110715)

- Improve the documentation (Python docstrings for functions and more
  meaningful xdotool script names).
- Make more use of the existing methods (e.g. wait_until_succeeds(), and
  send_key())
  - Note: This increases timeouts from 60 seconds to (currently)
    15 minutes but the defaults from test-driver.py should be fine.

This should make it simpler to read the code, understand the test
output, and drop the custom xdotool scripts in the future.
---
 nixos/tests/chromium.nix | 115 ++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 75 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 43a99fda5c5..8429d932ae6 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -51,7 +51,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
   testScript = let
     xdo = name: text: let
       xdoScript = pkgs.writeText "${name}.xdo" text;
-    in "${pkgs.xdotool}/bin/xdotool '${xdoScript}'";
+    in "${pkgs.xdotool}/bin/xdotool ${xdoScript}";
   in ''
     import shlex
     from contextlib import contextmanager, _GeneratorContextManager
@@ -76,96 +76,59 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
 
 
     def create_new_win():
+        """Creates a new Chromium window."""
         with machine.nested("Creating a new Chromium window"):
-            status, _ = machine.execute(
+            machine.wait_until_succeeds(
                 ru(
-                    "${xdo "new-window" ''
+                    "${xdo "create_new_win-select_main_window" ''
                       search --onlyvisible --name "startup done"
                       windowfocus --sync
                       windowactivate --sync
                     ''}"
                 )
             )
-            if status == 0:
-                machine.execute(
-                    ru(
-                        "${xdo "new-window" ''
-                          key Ctrl+n
-                        ''}"
-                    )
-                )
-
-
-    def close_win():
-        def try_close(_):
-            status, _ = machine.execute(
+            machine.send_key("ctrl-n")
+            # Wait until the new window appears:
+            machine.wait_until_succeeds(
                 ru(
-                    "${xdo "close-window" ''
-                      search --onlyvisible --name "new tab"
+                    "${xdo "create_new_win-wait_for_window" ''
+                      search --onlyvisible --name "New Tab"
                       windowfocus --sync
                       windowactivate --sync
                     ''}"
                 )
             )
-            if status == 0:
-                machine.execute(
-                    ru(
-                        "${xdo "close-window" ''
-                          key Ctrl+w
-                        ''}"
-                    )
-                )
-            for _ in range(1, 20):
-                status, _ = machine.execute(
-                    ru(
-                        "${xdo "wait-for-close" ''
-                          search --onlyvisible --name "new tab"
-                        ''}"
-                    )
-                )
-                if status != 0:
-                    return True
-                machine.sleep(1)
-                return False
-
-        retry(try_close)
 
 
-    def wait_for_new_win():
-        ret = False
-        with machine.nested("Waiting for new Chromium window to appear"):
-            for _ in range(1, 20):
-                status, _ = machine.execute(
-                    ru(
-                        "${xdo "wait-for-window" ''
-                          search --onlyvisible --name "new tab"
-                          windowfocus --sync
-                          windowactivate --sync
-                        ''}"
-                    )
-                )
-                if status == 0:
-                    ret = True
-                    machine.sleep(10)
-                    break
-                machine.sleep(1)
-        return ret
-
-
-    def create_and_wait_for_new_win():
-        for _ in range(1, 3):
-            create_new_win()
-            if wait_for_new_win():
-                return True
-        assert False, "new window did not appear within 60 seconds"
+    def close_new_tab_win():
+        """Closes the Chromium window with the title "New Tab"."""
+        machine.wait_until_succeeds(
+            ru(
+                "${xdo "close_new_tab_win-select_main_window" ''
+                  search --onlyvisible --name "New Tab"
+                  windowfocus --sync
+                  windowactivate --sync
+                ''}"
+            )
+        )
+        machine.send_key("ctrl-w")
+        # Wait until the closed window disappears:
+        machine.wait_until_fails(
+            ru(
+                "${xdo "close_new_tab_win-wait_for_close" ''
+                  search --onlyvisible --name "New Tab"
+                ''}"
+            )
+        )
 
 
     @contextmanager
     def test_new_win(description):
-        create_and_wait_for_new_win()
+        create_new_win()
         with machine.nested(description):
             yield
-        close_win()
+        # Close the newly created window:
+        machine.send_key("ctrl-w")
 
 
     machine.wait_for_x()
@@ -192,9 +155,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
         )
     )
 
-    create_and_wait_for_new_win()
+    create_new_win()
+    # Optional: Wait for the new tab page to fully load before taking the screenshot:
+    machine.wait_for_text("Web Store")
     machine.screenshot("empty_windows")
-    close_win()
+    close_new_tab_win()
 
     machine.screenshot("startup_done")
 
@@ -202,7 +167,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
         machine.succeed(
             ru(
                 "${xdo "type-url" ''
-                  search --sync --onlyvisible --name "new tab"
+                  search --sync --onlyvisible --name "New Tab"
                   windowfocus --sync
                   type --delay 1000 "chrome://sandbox"
                 ''}"
@@ -212,7 +177,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
         machine.succeed(
             ru(
                 "${xdo "submit-url" ''
-                  search --sync --onlyvisible --name "new tab"
+                  search --sync --onlyvisible --name "New Tab"
                   windowfocus --sync
                   key --delay 1000 Return
                 ''}"
@@ -224,7 +189,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
         machine.succeed(
             ru(
                 "${xdo "find-window" ''
-                  search --sync --onlyvisible --name "sandbox status"
+                  search --sync --onlyvisible --name "Sandbox Status"
                   windowfocus --sync
                 ''}"
             )
@@ -258,7 +223,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
         machine.succeed(
             ru(
                 "${xdo "find-window-after-copy" ''
-                  search --onlyvisible --name "sandbox status"
+                  search --onlyvisible --name "Sandbox Status"
                 ''}"
             )
         )

From ab757a382c3fb1461186ddf55d87923451a964ed Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 24 Jan 2021 20:44:51 +0100
Subject: [PATCH 845/956] lf: 18 -> 19

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

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index c3cb3200e06..0dde65e1081 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "lf";
-  version = "18";
+  version = "19";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
     rev = "r${version}";
-    sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6";
+    sha256 = "096lb0kbiqchw8mfp1vbgn9p1bqnp3h5wn172s9q4jl55l5l0kn1";
   };
 
   vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg";

From 6a30c02ac3856f75be7c03721fe3cc950dc8f71d Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 24 Jan 2021 21:00:19 +0100
Subject: [PATCH 846/956] beamPackages: add missing lib where needed (#110708)

changes in 2f78ee7 missed some places where lib had to be added
---
 pkgs/development/beam-modules/hex/default.nix       | 2 +-
 pkgs/development/beam-modules/pc/default.nix        | 2 +-
 pkgs/development/beam-modules/pgsql/default.nix     | 2 +-
 pkgs/development/beam-modules/webdriver/default.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index e12f0ba4b74..794b9e5cf22 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeText, elixir }:
+{ lib, stdenv, fetchFromGitHub, writeText, elixir }:
 
 let
   shell = drv: stdenv.mkDerivation {
diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix
index 8b5836f4c62..a6d7c1c44de 100644
--- a/pkgs/development/beam-modules/pc/default.nix
+++ b/pkgs/development/beam-modules/pc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildHex }:
+{ lib, buildHex }:
 
 buildHex {
   name = "pc";
diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix
index e64476212dd..df6561b7cf1 100644
--- a/pkgs/development/beam-modules/pgsql/default.nix
+++ b/pkgs/development/beam-modules/pgsql/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, buildRebar3 }:
+{ lib, stdenv, fetchFromGitHub, buildRebar3 }:
 
 let
   shell = drv: stdenv.mkDerivation {
diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
index da6cb127342..1255ec59c3a 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/pkgs/development/beam-modules/webdriver/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, writeText, erlang }:
+{ lib, stdenv, fetchFromGitHub, writeText, erlang }:
 
 let
   shell = drv: stdenv.mkDerivation {

From 89cb93aefed79d51ed05d42a2caaadf2a18148e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sun, 24 Jan 2021 18:20:34 +0100
Subject: [PATCH 847/956] brackets: drop

Hasn't been updated since 2017 and suffers from CVE-2019-8255.
---
 .../applications/editors/brackets/default.nix | 58 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 pkgs/applications/editors/brackets/default.nix

diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
deleted file mode 100644
index 95bf6f6d7aa..00000000000
--- a/pkgs/applications/editors/brackets/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
-, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
-with lib;
-
-let
-  bracketsLibs = makeLibraryPath [
-    gtk2 glib gdk-pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat
-  ];
-in
-stdenv.mkDerivation rec {
-  pname = "brackets";
-  version = "1.9";
-
-  src = fetchurl {
-    url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
-    sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp";
-    name = "${pname}-${version}.deb";
-  };
-
-  phases = [ "installPhase" "fixupPhase" ];
-
-  installPhase = ''
-    mkdir -p $out
-    ar p $src data.tar.xz | tar -C $out -xJ
-
-    mv $out/usr/* $out/
-    rmdir $out/usr
-    ln -sf $out/opt/brackets/brackets $out/bin/brackets
-
-    ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
-
-    substituteInPlace $out/opt/brackets/brackets.desktop \
-      --replace "Exec=/opt/brackets/brackets" "Exec=brackets"
-    mkdir -p $out/share/applications
-    ln -s $out/opt/brackets/brackets.desktop $out/share/applications/
-  '';
-
-  postFixup = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \
-      $out/opt/brackets/Brackets
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${bracketsLibs}" \
-      $out/opt/brackets/Brackets-node
-
-    patchelf --set-rpath "${bracketsLibs}" \
-      $out/opt/brackets/lib/libcef.so
-  '';
-
-  meta = {
-    description = "An open source code editor for the web, written in JavaScript, HTML and CSS";
-    homepage = "http://brackets.io/";
-    license = licenses.mit;
-    maintainers = [ maintainers.matejc ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7d3332c3a7c..43bf489b0e5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -70,6 +70,7 @@ mapAliases ({
   bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
   beegfs = throw "beegfs has been removed."; # added 2019-11-24
   bluezFull = bluez; # Added 2019-12-03
+  brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24
   bridge_utils = bridge-utils;  # added 2015-02-20
   bro = zeek; # added 2019-09-29
   bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ec34213a3..d1734467d56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21119,8 +21119,6 @@ in
 
   bonzomatic = callPackage ../applications/editors/bonzomatic { };
 
-  brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; };
-
   brave = callPackage ../applications/networking/browsers/brave { };
 
   break-time = callPackage ../applications/misc/break-time { };

From fe111fc67937c22ffc84e4466f494366583124b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 24 Jan 2021 20:47:14 +0100
Subject: [PATCH 848/956] nixosTests.zfs.installer: fixup test after d44c6219b8

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

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 7eaa1c3fbd9..5fa4704d02b 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -326,8 +326,8 @@ let
           ]
           ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
           ++ optionals (bootLoader == "grub" && grubVersion == 2) [
-            pkgs.grub2
-            pkgs.grub2_efi
+            (pkgs.grub2.override { zfsSupport = true; })
+            (pkgs.grub2_efi.override { zfsSupport = true; })
           ];
 
           nix.binaryCaches = mkForce [ ];

From 7fee56ec59fd460fe0e4cff2f072a1457f23ba41 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 19 Jan 2021 10:27:15 +0100
Subject: [PATCH 849/956] ocamlPackages.either: init at 1.0.0

---
 .../ocaml-modules/either/default.nix          | 20 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/either/default.nix

diff --git a/pkgs/development/ocaml-modules/either/default.nix b/pkgs/development/ocaml-modules/either/default.nix
new file mode 100644
index 00000000000..71d16c9674c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/either/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildDunePackage, fetchurl }:
+
+buildDunePackage rec {
+  pname = "either";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/either/releases/download/${version}/either-${version}.tbz";
+    sha256 = "bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884";
+  };
+
+  useDune2 = true;
+
+  meta = with lib; {
+    description = "Compatibility Either module";
+    license = licenses.mit;
+    homepage = "https://github.com/mirage/either";
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 84a651e891e..22c1dba5ae2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -281,6 +281,8 @@ let
 
     eigen = callPackage ../development/ocaml-modules/eigen { };
 
+    either = callPackage ../development/ocaml-modules/either { };
+
     elina = callPackage ../development/ocaml-modules/elina { };
 
     eliom = callPackage ../development/ocaml-modules/eliom { };

From a7a61998e9a5da33c7540486cc0616271f5e5f73 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 12 Jan 2021 19:49:44 +0100
Subject: [PATCH 850/956] ocamlPackages.{repr,ppx_repr}: init at 0.2.1

---
 .../ocaml-modules/repr/default.nix            | 30 +++++++++++++++++++
 pkgs/development/ocaml-modules/repr/ppx.nix   | 23 ++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +++
 3 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/repr/default.nix
 create mode 100644 pkgs/development/ocaml-modules/repr/ppx.nix

diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix
new file mode 100644
index 00000000000..de6877ddd68
--- /dev/null
+++ b/pkgs/development/ocaml-modules/repr/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildDunePackage, fetchurl, fmt, uutf, jsonm, base64, either }:
+
+buildDunePackage rec {
+  pname = "repr";
+  version = "0.2.1";
+
+  minimumOCamlVersion = "4.08";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz";
+    sha256 = "1cbzbawbn71mmpw8y84s1p2pbhc055w1znz64jvr00c7fdr9p8hc";
+  };
+
+  useDune2 = true;
+
+  propagatedBuildInputs = [
+    fmt
+    uutf
+    jsonm
+    base64
+    either
+  ];
+
+  meta = with lib; {
+    description = "Dynamic type representations. Provides no stability guarantee";
+    homepage = "https://github.com/mirage/repr";
+    license = licenses.isc;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix
new file mode 100644
index 00000000000..a1112ef9ac7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/repr/ppx.nix
@@ -0,0 +1,23 @@
+{ buildDunePackage, repr, ppxlib, ppx_deriving, alcotest, hex }:
+
+buildDunePackage {
+  pname = "ppx_repr";
+
+  inherit (repr) src version useDune2;
+
+  propagatedBuildInputs = [
+    repr
+    ppxlib
+    ppx_deriving
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    alcotest
+    hex
+  ];
+
+  meta = repr.meta // {
+    description = "PPX deriver for type representations";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 22c1dba5ae2..e1fd3ccc8fc 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -885,6 +885,8 @@ let
 
     resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { };
 
+    repr = callPackage ../development/ocaml-modules/repr { };
+
     result = callPackage ../development/ocaml-modules/ocaml-result { };
 
     secp256k1 = callPackage ../development/ocaml-modules/secp256k1 {
@@ -969,6 +971,8 @@ let
     ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix {
     };
 
+    ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { };
+
     ppx_tools =
       if lib.versionAtLeast ocaml.version "4.02"
       then callPackage ../development/ocaml-modules/ppx_tools {}

From a35934f5d3d11ef0ee87f1ae62d7db2b27c5ad6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Sun, 24 Jan 2021 21:15:18 +0100
Subject: [PATCH 851/956] beamPackages: use callPackagesWith from nixpkgs lib

2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 accidentally changed this from
(nixpkgs) stdenv.lib to (beam-modules) lib', which broke things.
This changes it back to (nixpkgs) lib.
---
 pkgs/development/beam-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 4c25522635e..4f312129b38 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -6,7 +6,7 @@ let
   lib' = pkgs.callPackage ./lib.nix {};
 
   # FIXME: add support for overrideScope
-  callPackageWithScope = scope: drv: args: lib'.callPackageWith scope drv args;
+  callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args;
   mkScope = scope: pkgs // scope;
 
   packages = self:

From 071030840252273acf05c9902458d4db5bdd71ab Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 20 Jan 2021 18:45:52 -0500
Subject: [PATCH 852/956] clang, cc-wrapper: Move `--gcc-toolchain` logic into
 CC wrapper

Take 2, after #94582 had to be reverted.

This reverts commit ac03cfa3c57027e82073ea7db71248d4ab78af66.
---
 pkgs/build-support/cc-wrapper/default.nix        | 11 +++++++++++
 pkgs/development/compilers/llvm/10/default.nix   |  2 --
 pkgs/development/compilers/llvm/11/default.nix   |  2 --
 pkgs/development/compilers/llvm/5/default.nix    |  2 --
 pkgs/development/compilers/llvm/6/default.nix    |  2 --
 pkgs/development/compilers/llvm/7/default.nix    |  2 --
 pkgs/development/compilers/llvm/8/default.nix    |  2 --
 pkgs/development/compilers/llvm/9/default.nix    |  2 --
 pkgs/development/compilers/llvm/multi.nix        | 16 ++++++++++------
 pkgs/development/compilers/llvm/rocm/default.nix |  1 -
 pkgs/top-level/all-packages.nix                  |  2 --
 11 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index e0153ffc17f..212fd6b570a 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -290,6 +290,17 @@ stdenv.mkDerivation {
       echo "-L${gccForLibs.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags
     ''
 
+    # TODO We would like to connect this to `useGccForLibs`, but we cannot yet
+    # because `libcxxStdenv` on linux still needs this. Maybe someday we'll
+    # always set `useLLVM` on Darwin, and maybe also break down `useLLVM` into
+    # fine-grained use flags (libgcc vs compiler-rt, ld.lld vs legacy, libc++
+    # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See
+    # https://clang.llvm.org/docs/Toolchain.html for all the axes one might
+    # break `useLLVM` into.)
+    + optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
+    ''
+
     ##
     ## General libc support
     ##
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index f939eb52122..978f2895666 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -26,8 +26,6 @@ let
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix
index 2ebde3d107a..ca9ef4382b4 100644
--- a/pkgs/development/compilers/llvm/11/default.nix
+++ b/pkgs/development/compilers/llvm/11/default.nix
@@ -28,8 +28,6 @@ let
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 80bb3af2786..f03325cd427 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index f39fb9b60da..a98314d1181 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 393a1f59472..111ccbb9a38 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index 4dc0b8dd3c4..313b97455e5 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index e381b192766..dfb4981a5b7 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -25,8 +25,6 @@ let
       ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   in {
 
diff --git a/pkgs/development/compilers/llvm/multi.nix b/pkgs/development/compilers/llvm/multi.nix
index b4f2f8f9d6f..60db622a73a 100644
--- a/pkgs/development/compilers/llvm/multi.nix
+++ b/pkgs/development/compilers/llvm/multi.nix
@@ -13,7 +13,12 @@ let
     chmod u+rw -R $out/lib
     cp -r ${basegcc.libc}/lib/* $(ls -d $out/lib/gcc/*/*)
   '';
-  gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {} ''
+  gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {
+    passthru = {
+      inherit (gcc64) version;
+      lib = gcc_multi_sysroot;
+    };
+  } ''
     mkdir -p $out/lib/gcc
 
     ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/
@@ -32,17 +37,16 @@ let
   '';
 
   clangMulti = clang.override {
-    # Only used for providing expected structure re:dynamic linkers, AFAIK
-    # Most of the magic is done by setting the --gcc-toolchain option below
+    # Only used for providing expected structure re:dynamic linkers, AFAIK Most
+    # of the magic is done by setting the --gcc-toolchain option via
+    # `gccForLibs`.
     libc = gcc_multi_sysroot;
 
     bintools = clang.bintools.override {
       libc = gcc_multi_sysroot;
     };
 
-    extraBuildCommands = ''
-      sed -e '$a --gcc-toolchain=${gcc_multi_sysroot}' -i $out/nix-support/libc-cflags
-    '';
+    gccForLibs = gcc_multi_sysroot;
   };
 
 in clangMulti
diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix
index ffa1aff9537..94b6ee71032 100644
--- a/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/default.nix
@@ -17,7 +17,6 @@ in rec {
       mkdir "$rsrc"
       ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-      echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags
       echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
       rm $out/nix-support/add-hardening.sh
       touch $out/nix-support/add-hardening.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 343531f71f2..8e1c1873193 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9498,8 +9498,6 @@ in
       mkdir -p "$rsrc/lib"
       ln -s "${cc}/lib" "$rsrc/include"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
     '';
   };
 

From 480f0263caaaabd75211befd2e9c4b175cb191ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 21:54:49 +0100
Subject: [PATCH 853/956] python3Packages.haversine: init at 2.3.0

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

diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix
new file mode 100644
index 00000000000..7f5e462d1b3
--- /dev/null
+++ b/pkgs/development/python-modules/haversine/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "haversine";
+  version = "2.3.0";
+
+  src = fetchFromGitHub {
+    owner = "mapado";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1c3yf9162b2b7l1lsw3ffd1linnc542qvljpgwxp6y5arrmljqnv";
+  };
+
+  checkInputs = [
+    numpy
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "haversine" ];
+
+  meta = with lib; {
+    description = "Python module the distance between 2 points on earth";
+    homepage = "https://github.com/mapado/haversine";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d37d837e4e1..1cee8907aab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2859,6 +2859,8 @@ in {
 
   hatasmota = callPackage ../development/python-modules/hatasmota { };
 
+  haversine = callPackage ../development/python-modules/haversine { };
+
   hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };
 
   hbmqtt = callPackage ../development/python-modules/hbmqtt { };

From ce1dcb5a5098d6a81b8496d60133fb48ef144746 Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Sun, 24 Jan 2021 14:59:28 -0600
Subject: [PATCH 854/956] resholve: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix
index a03c604e330..e8b4ed2cfb2 100644
--- a/pkgs/development/misc/resholve/resholve.nix
+++ b/pkgs/development/misc/resholve/resholve.nix
@@ -11,12 +11,12 @@
 , doCheck ? true
 }:
 let
-  version = "0.4.1";
+  version = "0.4.2";
   rSrc = fetchFromGitHub {
     owner = "abathur";
     repo = "resholve";
     rev = "v${version}";
-    hash = "sha256-VK7r+kdtWvS9d4B90Hq7fhLfWT/B/Y9zppvOX9tPt5g=";
+    hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0=";
   };
   deps = callPackage ./deps.nix {
     /*

From c4081a163c5d5e329e710b8b0635af29349e7996 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 22:07:38 +0100
Subject: [PATCH 855/956] go-audit: init at 1.0.0

---
 pkgs/tools/system/go-audit/default.nix | 29 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/system/go-audit/default.nix

diff --git a/pkgs/tools/system/go-audit/default.nix b/pkgs/tools/system/go-audit/default.nix
new file mode 100644
index 00000000000..9670a4d0684
--- /dev/null
+++ b/pkgs/tools/system/go-audit/default.nix
@@ -0,0 +1,29 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "go-audit";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "slackhq";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "02iwjzaz2ks0zmwijaijwzc3gn9mhn7xpx369ylgaz68arlapfjg";
+  };
+
+  vendorSha256 = "11kb7xm82s0d8d06b2jknwn3dfh4i0a1dv0740y47vk62sf6f05i";
+
+  # Tests need network access
+  doCheck = false;
+
+  meta = with lib; {
+    description = "An alternative to the auditd daemon";
+    homepage = "https://github.com/slackhq/go-audit";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e037089848f..5431ff3f820 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1347,6 +1347,8 @@ in
 
   asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { };
 
+  go-audit = callPackage ../tools/system/go-audit { };
+
   gopass = callPackage ../tools/security/gopass { };
 
   gospider = callPackage ../tools/security/gospider { };

From 55f568bf56b90b27e5d3abfe859e065b18851428 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 22:29:05 +0100
Subject: [PATCH 856/956] python3Packages.geojson-client: init at 0.5

---
 .../python-modules/geojson-client/default.nix | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/geojson-client/default.nix

diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix
new file mode 100644
index 00000000000..7e683e20483
--- /dev/null
+++ b/pkgs/development/python-modules/geojson-client/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, geojson
+, haversine
+, pytz
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "geojson-client";
+  version = "0.5";
+
+  src = fetchFromGitHub {
+    owner = "exxamalte";
+    repo = "python-geojson-client";
+    rev = "v${version}";
+    sha256 = "1cc6ymbn45dv7xdl1r8bbizlmsdbxjmsfza442yxmmm19nxnnqjv";
+  };
+
+  propagatedBuildInputs = [
+    geojson
+    haversine
+    pytz
+    requests
+  ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "geojson_client" ];
+
+  meta = with lib; {
+    description = "Python module for convenient access to GeoJSON feeds";
+    homepage = "https://github.com/exxamalte/python-geojson-client";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1cee8907aab..ad4be313e8f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2502,6 +2502,8 @@ in {
 
   geojson = callPackage ../development/python-modules/geojson { };
 
+  geojson-client = callPackage ../development/python-modules/geojson-client { };
+
   geopandas = callPackage ../development/python-modules/geopandas { };
 
   geopy = if isPy3k then

From 39011226480bf7018feca534ff5e04205c7953c0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Jan 2021 22:29:23 +0100
Subject: [PATCH 857/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 0f0737595af..4527394a120 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -292,7 +292,7 @@
     "generic" = ps: with ps; [ ];
     "generic_thermostat" = ps: with ps; [ ];
     "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client
-    "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client
+    "geo_json_events" = ps: with ps; [ geojson-client ];
     "geo_location" = ps: with ps; [ ];
     "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client
     "geofency" = ps: with ps; [ aiohttp-cors ];
@@ -885,7 +885,7 @@
     "uptime" = ps: with ps; [ ];
     "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot
     "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus
-    "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client
+    "usgs_earthquakes_feed" = ps: with ps; [ geojson-client ];
     "utility_meter" = ps: with ps; [ ];
     "uvc" = ps: with ps; [ uvcclient ];
     "vacuum" = ps: with ps; [ ];

From fa204a97d8e0b1256483528350b743fddcedb207 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 24 Jan 2021 22:51:12 +0000
Subject: [PATCH 858/956] stdenv: Remove stdenv.platform

This was not working after #110544 as caught by @r-burns in
https://github.com/NixOS/nixpkgs/pull/110544#issuecomment-766444647.
Thankfully it isn't used anymore and I believe wasn't documented either.
(I at least did not remember it existed.)
---
 pkgs/stdenv/darwin/default.nix | 6 +++---
 pkgs/stdenv/linux/default.nix  | 9 ++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 30c38168fd1..6e1967281b3 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -20,7 +20,7 @@
 assert crossSystem == localSystem;
 
 let
-  inherit (localSystem) system platform;
+  inherit (localSystem) system;
 
   bootstrapClangVersion = "7.1.0";
 
@@ -148,7 +148,7 @@ in rec {
         __extraImpureHostDeps = commonImpureHostDeps;
 
         extraAttrs = {
-          inherit macosVersionMin platform;
+          inherit macosVersionMin;
         };
         overrides  = self: super: (overrides self super) // {
           inherit ccNoLibcxx;
@@ -522,7 +522,7 @@ in rec {
     extraAttrs = {
       libc = pkgs.darwin.Libsystem;
       shellPackage = pkgs.bash;
-      inherit macosVersionMin platform bootstrapTools;
+      inherit macosVersionMin bootstrapTools;
     };
 
     allowedRequisites = (with pkgs; [
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 6d6bca870bf..b36eb1b5742 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -42,7 +42,7 @@
 assert crossSystem == localSystem;
 
 let
-  inherit (localSystem) system platform;
+  inherit (localSystem) system;
 
   commonPreHook =
     ''
@@ -111,11 +111,6 @@ let
           stdenvNoCC = prevStage.ccWrapperStdenv;
         };
 
-        extraAttrs = {
-          # Having the proper 'platform' in all the stdenvs allows getting proper
-          # linuxHeaders for example.
-          inherit platform;
-        };
         overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
 
@@ -369,7 +364,7 @@ in
         # TODO: remove this!
         inherit (prevStage) glibc;
 
-        inherit platform bootstrapTools;
+        inherit bootstrapTools;
         shellPackage = prevStage.bash;
       };
 

From 31e833ede5d4b45f142cb35810978f4117750abf Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 24 Jan 2021 14:58:22 -0800
Subject: [PATCH 859/956] gnomeExtensions.unite: move aliases from aliases.nix
 to set

aliases.nix does not allow for nested attrs to exist,
as it checks if the top-level attr exists before
the alias overlay is applied
---
 pkgs/top-level/aliases.nix      | 3 ---
 pkgs/top-level/all-packages.nix | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8b79ea0f1c8..43bf489b0e5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -737,9 +737,6 @@ mapAliases ({
   youtubeDL = youtube-dl;  # added 2014-10-26
   ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
   zdfmediathk = mediathekview; # added 2019-01-19
-  gnomeExtensions = gnomeExtensions // {
-    unite-shell = gnomeExtensions.unite; # added 2021-01-19
-  };
   gnome_user_docs = gnome-user-docs; # added 2019-11-20
   # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
   spidermonkey = spidermonkey_78; # added 2020-10-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33dcaf37baf..38663fbe95b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27202,6 +27202,8 @@ in
 
     nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks.";
     mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
+  } // lib.optionalAttrs (config.allowAliases or false) {
+    unite-shell = gnomeExtensions.unite; # added 2021-01-19
   };
 
   gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };

From dece3e543e6292d962cae72692f822194b0c75b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 24 Jan 2021 20:43:27 +0000
Subject: [PATCH 860/956] python37Packages.bitbox02: 5.1.0 -> 5.2.0

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

diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix
index e9cf4b36a49..ce62fd6dce0 100644
--- a/pkgs/development/python-modules/bitbox02/default.nix
+++ b/pkgs/development/python-modules/bitbox02/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitbox02";
-  version = "5.1.0";
+  version = "5.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hnjjjarr4q22wh03zyyqfhsizzsvg46030kks3qkzbsv29vqqh5";
+    sha256 = "52b0b617660601939b30c8b588c28910946448b1b6d69ca231d5e3e47a322b71";
   };
 
   propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ];

From e6292e372161852c453ea9859507a38cb35481d3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 12:21:57 -0500
Subject: [PATCH 861/956] linux: 4.14.216 -> 4.14.217

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index c8b90b69d37..d1d9e94e2a6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.14.216";
+  version = "4.14.217";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "19dvxmqvs1ysl127zqdcqq2pyf7370jj66fd73zdx6ya2pplz1mp";
+    sha256 = "04adj8x7p1has4mh8ygxhqgwb1i08fz9izqw1y6xj5hh8cjnm8v2";
   };
 } // (args.argsOverride or {}))

From 7001b6fd0c333b75d92ffcc7b57e4dd3c20ea4da Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 12:22:56 -0500
Subject: [PATCH 862/956] linux: 4.19.169 -> 4.19.170

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index bf072e47864..2bc5321ea7f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.19.169";
+  version = "4.19.170";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "156y4ly7qyy5z7sbp2vccrs7za72k3zi2hfjpskqqd6civdlvln7";
+    sha256 = "0jjvwbxpfvmzj4z6gkd2mh3kz9vh8hsgsm0013866hzgz1j043fx";
   };
 } // (args.argsOverride or {}))

From 59bd2632d0af64de7a6ee99f1307485f78923db7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 12:23:38 -0500
Subject: [PATCH 863/956] linux: 4.4.252 -> 4.4.253

---
 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 1e3b353650a..9c04ee72238 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.252";
+  version = "4.4.253";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0lchvfvn0kvqh1yixwscz4wrzd965zsxjkpc7nqiw9rhmvma3paf";
+    sha256 = "0nlqnfhrkaj2s582kc0wxqi0881hgp6l9z85qx4ckflc8jwrh7k6";
   };
 } // (args.argsOverride or {}))

From 2bc54a5ab7695b0f5a2aca14362e2a891ff5996b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 12:24:37 -0500
Subject: [PATCH 864/956] linux: 4.9.252 -> 4.9.253

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 5e67d55dab0..df298ade084 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.252";
+  version = "4.9.253";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1shllgrmxi6darnyzwkzazzjhpwxhm19z1swv40hnm0pbvgxm7hw";
+    sha256 = "065w35vb0qp4fvnwmcx7f92inmx64f9r04zzwcwbs0826nl52nws";
   };
 } // (args.argsOverride or {}))

From 92a6788df30482c71210f51ec3c942dbc60d06be Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 12:26:03 -0500
Subject: [PATCH 865/956] linux: 5.10.9 -> 5.10.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index ca6f1eeaf49..0eaa148a49c 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.10.9";
+  version = "5.10.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz";
+    sha256 = "06fvgkrn9127xw9kly6l4ws3yv80q8xfqdzaam92lljim5pqdvb0";
   };
 } // (args.argsOverride or {}))

From d3cf0f85c532e1bf4159e0031da0e48ce6a16764 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 12:27:20 -0500
Subject: [PATCH 866/956] linux: 5.4.91 -> 5.4.92

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 28a481b2f8a..0469b731b89 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.4.91";
+  version = "5.4.92";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "05swzh4gb0mk6wzza0k6b0283cygkvj8a2d2b2gab6sb0fxn208f";
+    sha256 = "1zcl4dadyfrgmx6rh0ncy403rsqb1qs092m6zr6b3i14i3wpz4y0";
   };
 } // (args.argsOverride or {}))

From e80850fe42c61d915162403a32cf20601ba61034 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 13:02:00 -0500
Subject: [PATCH 867/956] linux-hardened: Fix update script

---
 pkgs/os-specific/linux/kernel/hardened/update.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py
index b831c649109..e96ac9ca855 100755
--- a/pkgs/os-specific/linux/kernel/hardened/update.py
+++ b/pkgs/os-specific/linux/kernel/hardened/update.py
@@ -101,7 +101,7 @@ def verify_openpgp_signature(
 
 def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]:
     release = release_info.release
-    extra = f'.{release_info.version[-1]}'
+    extra = f'-{release_info.version[-1]}'
 
     def find_asset(filename: str) -> str:
         try:
@@ -138,7 +138,7 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]:
 
 def parse_version(version_str: str) -> Version:
     version: Version = []
-    for component in version_str.split("."):
+    for component in re.split('\.|\-', version_str):
         try:
             version.append(int(component))
         except ValueError:
@@ -208,7 +208,7 @@ failures = False
 releases = {}
 for release in repo.get_releases():
     version = parse_version(release.tag_name)
-    # needs to look like e.g. 5.6.3.a
+    # needs to look like e.g. 5.6.3-hardened1
     if len(version) < 4:
         continue
 

From 071750d412c5ccbbbc84606c2f871881d97f067e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 13:03:31 -0500
Subject: [PATCH 868/956] linux-hardened: Remove tag patch

---
 pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch | 7 -------
 pkgs/os-specific/linux/kernel/patches.nix                 | 5 -----
 pkgs/top-level/all-packages.nix                           | 3 +--
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch

diff --git a/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch b/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch
deleted file mode 100644
index ff8a3a12797..00000000000
--- a/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/localversion-hardened b/localversion-hardened
-new file mode 100644
-index 0000000000..e578045860
---- /dev/null
-+++ b/localversion-hardened
-@@ -0,0 +1 @@
-+-hardened
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 6b1568013b9..e7667bf1bc2 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -33,11 +33,6 @@
 
   cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
 
-  tag_hardened = {
-    name = "tag-hardened";
-    patch = ./hardened/tag-hardened.patch;
-  };
-
   hardened = let
     mkPatch = kernelVersion: src: {
       name = lib.removeSuffix ".patch" src.name;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38663fbe95b..19f6c27b1e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19265,10 +19265,9 @@ in
         inherit (kernel) version;
       };
       kernelPatches = kernel.kernelPatches ++ [
-        kernelPatches.tag_hardened
         kernelPatches.hardened.${kernel.meta.branch}
       ];
-      modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra + "-hardened";
+      modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra;
       isHardened = true;
   });
 

From 5772d38d690103927966ab01875ed6cb86e5be40 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 13:03:55 -0500
Subject: [PATCH 869/956] linux/hardened/patches/4.14: 4.14.216.a ->
 4.14.217-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index c75117769d1..436965967de 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,9 +1,9 @@
 {
     "4.14": {
-        "extra": ".a",
-        "name": "linux-hardened-4.14.216.a.patch",
-        "sha256": "1pv0akd1dmhm10r9b7xambn3ipl1niypsmb3ibfmxdj4zln0g7aq",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.216.a/linux-hardened-4.14.216.a.patch"
+        "extra": "-hardened1",
+        "name": "linux-hardened-4.14.217-hardened1.patch",
+        "sha256": "1hb5fa06xw9rn0f77lklrlhb6vajr1hjv64qxv5y03l7zqfsi7lx",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch"
     },
     "4.19": {
         "extra": ".a",

From 93f2a3f1a5da9d1709caa7b72789d3bc873ab0a6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 13:03:58 -0500
Subject: [PATCH 870/956] linux/hardened/patches/4.19: 4.19.169.a ->
 4.19.170-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 436965967de..a28c5cf0282 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -6,10 +6,10 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch"
     },
     "4.19": {
-        "extra": ".a",
-        "name": "linux-hardened-4.19.169.a.patch",
-        "sha256": "0l3n1yjsa777pdxh4ib7phpfrw7c8vr1xwzgs8khnffllj9f16iq",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.169.a/linux-hardened-4.19.169.a.patch"
+        "extra": "-hardened1",
+        "name": "linux-hardened-4.19.170-hardened1.patch",
+        "sha256": "0wx1bhkxyiqk6r51922dhv29jfkx6kfwk4w3z2rc8shpm6krdngv",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.170-hardened1/linux-hardened-4.19.170-hardened1.patch"
     },
     "5.10": {
         "extra": ".a",

From a7221d3c6c3ae5f25b789d60ff6a3abd345f5339 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 13:04:01 -0500
Subject: [PATCH 871/956] linux/hardened/patches/5.10: 5.10.9.a ->
 5.10.10-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index a28c5cf0282..cdb1f8ac1ee 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -12,10 +12,10 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.170-hardened1/linux-hardened-4.19.170-hardened1.patch"
     },
     "5.10": {
-        "extra": ".a",
-        "name": "linux-hardened-5.10.9.a.patch",
-        "sha256": "0mkwyknafdbc2hqv4j7jjc6wsrrx6a76d69hxh7x90gi0s3f5rfw",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.9.a/linux-hardened-5.10.9.a.patch"
+        "extra": "-hardened1",
+        "name": "linux-hardened-5.10.10-hardened1.patch",
+        "sha256": "0hm8ng073lzqcj5khgpxvr775z0jns9y00qj8b0n63yq0klm2pqh",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.10-hardened1/linux-hardened-5.10.10-hardened1.patch"
     },
     "5.4": {
         "extra": ".a",

From 944b6ea6e4aed16267f716fef55b2eaa6b90161e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 13:04:04 -0500
Subject: [PATCH 872/956] linux/hardened/patches/5.4: 5.4.91.a ->
 5.4.92-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index cdb1f8ac1ee..6994dd48615 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -18,10 +18,10 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.10-hardened1/linux-hardened-5.10.10-hardened1.patch"
     },
     "5.4": {
-        "extra": ".a",
-        "name": "linux-hardened-5.4.91.a.patch",
-        "sha256": "0kqn9g6wh4rp9riwkjmzapmnwk0fd5z18z26j2rqfgq7x4r8d7rm",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.91.a/linux-hardened-5.4.91.a.patch"
+        "extra": "-hardened1",
+        "name": "linux-hardened-5.4.92-hardened1.patch",
+        "sha256": "0qklpyrd20xsyrvw6ij8y337vjfnxlkyyvalzk96ngkvlfv5b7qh",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.92-hardened1/linux-hardened-5.4.92-hardened1.patch"
     },
     "5.9": {
         "extra": "",

From 85879ac1e274bab3d696856733cef0dbde9d3aa9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 13:04:28 -0500
Subject: [PATCH 873/956] linux-hardened: Remove 5.9

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 6994dd48615..695477417aa 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -22,11 +22,5 @@
         "name": "linux-hardened-5.4.92-hardened1.patch",
         "sha256": "0qklpyrd20xsyrvw6ij8y337vjfnxlkyyvalzk96ngkvlfv5b7qh",
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.92-hardened1/linux-hardened-5.4.92-hardened1.patch"
-    },
-    "5.9": {
-        "extra": "",
-        "name": "linux-hardened-5.9.16.a.patch",
-        "sha256": "024wdzc9bwgr4nd4z0l6bazcl35jczhsmdl2lb26bvffjwg207rw",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.16.a/linux-hardened-5.9.16.a.patch"
     }
 }

From c81f92751c6d7af89fb3fbe5282f1d1ef8b9b1d9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 24 Jan 2021 13:12:41 -0500
Subject: [PATCH 874/956] linux: Remove 5.9

---
 pkgs/os-specific/linux/kernel/linux-5.9.nix | 18 ------------------
 pkgs/top-level/aliases.nix                  |  1 -
 pkgs/top-level/all-packages.nix             |  9 ---------
 3 files changed, 28 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.9.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
deleted file mode 100644
index 5f7db41c9a9..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
-
-with lib;
-
-buildLinux (args // rec {
-  version = "5.9.16";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = versions.majorMinor version;
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "11mbnjvb5d5gwbrwlkqvzpg1ij4m19l5wr3wca9iiyg5i2papmxh";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 43bf489b0e5..4179ccd39f4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -322,7 +322,6 @@ mapAliases ({
   libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
   libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
   links = links2; # added 2016-01-31
-  linux_mptcp_5_9 = linux_5_9; # added 2020-01-07
   linux_rpi0 = linux_rpi1;
   linuxPackages_rpi0 = linuxPackages_rpi1;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19f6c27b1e0..eae36ef2a49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18918,14 +18918,6 @@ in
     ];
   };
 
-  linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix {
-    kernelPatches = [
-      kernelPatches.bridge_stp_helper
-      kernelPatches.request_key_helper
-      kernelPatches.export_kernel_fpu_functions."5.3"
-    ];
-  };
-
   linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -19218,7 +19210,6 @@ in
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
   linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
-  linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_9);
   linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
 
   # When adding to the list above:

From 057017ee8673a217da3b7530b298fbd0b974000f Mon Sep 17 00:00:00 2001
From: Vonfry <3413119+Vonfry@users.noreply.github.com>
Date: Mon, 25 Jan 2021 08:17:21 +0800
Subject: [PATCH 875/956] zsh-fzf-tab: init at 2021-01-24 (#110694)

* zsh-fzf-tab: init at 2021-01-24

* Update pkgs/shells/zsh/zsh-fzf-tab/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/shells/zsh/zsh-fzf-tab/default.nix | 45 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/shells/zsh/zsh-fzf-tab/default.nix

diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix
new file mode 100644
index 00000000000..b48eda0a728
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchFromGitHub, ncurses }:
+
+let
+  INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
+in stdenv.mkDerivation rec {
+  pname = "zsh-fzf-tab";
+  version = "unstable-2021-01-24";
+
+  src = fetchFromGitHub {
+    owner = "Aloxaf";
+    repo = "fzf-tab";
+    rev = "78b4cefb27dc2bef5e4c9ac3bf2bd28413620fcd";
+    sha256 = "1f5m7vf7wxzczis2nzvhgqaqnphhp3a0wv8b612m7g4fnvk3lnkn";
+  };
+
+  buildInputs = [ ncurses ];
+
+  postConfigure = ''
+    pushd modules
+    ./configure --disable-gdbm --without-tcsetpgrp
+    popd
+  '';
+
+  postBuild = ''
+    pushd modules
+    make -j$NIX_BUILD_CORES
+    popd
+  '';
+
+  installPhase = ''
+     mkdir -p ${INSTALL_PATH}
+     cp -r lib ${INSTALL_PATH}/lib
+     install -D fzf-tab.zsh ${INSTALL_PATH}/fzf-tab.zsh
+     install -D fzf-tab.plugin.zsh ${INSTALL_PATH}/fzf-tab.plugin.zsh
+     install -D modules/Src/aloxaf/fzftab.so ${INSTALL_PATH}/modules/Src/aloxaf/fzftab.so
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/Aloxaf/fzf-tab";
+    description = "Replace zsh's default completion selection menu with fzf!";
+    license = licenses.mit;
+    maintainers = with maintainers; [ vonfry ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 270d6e80eb3..5e8c8c6ee4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9161,6 +9161,8 @@ in
 
   zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
 
+  zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { };
+
   zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };
 
   zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { };

From 8a7d28b9945526c0c090614598589ae5c025d4fd Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 24 Jan 2021 15:21:57 +0100
Subject: [PATCH 876/956] ipfs-cluster: unstable-2020-10 -> 0.13.1

https://github.com/ipfs/ipfs-cluster/releases/tag/v0.13.1
---
 pkgs/applications/networking/ipfs-cluster/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 69b2d9ef309..dcb25c73657 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -2,9 +2,9 @@
 
 buildGoModule rec {
   pname = "ipfs-cluster";
-  version = "unstable-2020-10-20";
+  version = "0.13.1";
 
-  vendorSha256 = "0abfhl4v4yqy89aqn13ymj4rw5zhr92a9fh1abgpkr19adnyrs3d";
+  vendorSha256 = "0ls6d5ijl8bbh48w0i30mwd4a4na93iw9xqpbw23lnb8pvskaggh";
 
   patches = [
       ./test.patch
@@ -13,8 +13,8 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipfs-cluster";
-    rev = "c78f7839a2d5645806e01bfbf7af862600f8fbc4";
-    sha256 = "0fschpysma2piy2bfas56yapxm2cl6nj986ww3sp7ysldjzadmkk";
+    rev = "v${version}";
+    sha256 = "0kmsa7cnk88wrplsjysrpg6n0gd0risnhw0kh33jqx0fcg12b7h8";
   };
 
   meta = with lib; {

From f0b378026ddbb60ad46947e5dbbf52a12b245f0e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 25 Jan 2021 01:29:37 +0000
Subject: [PATCH 877/956] python37Packages.azure-mgmt-compute: 18.0.0 -> 18.1.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 2aca8fdbd7d..e8a45ebf5aa 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -8,13 +8,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "18.0.0";
+  version = "18.1.0";
   pname = "azure-mgmt-compute";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e";
+    sha256 = "02de691c5ce7237993e65b0ae6154b3bf8ec32bcb15f13ade72bc7f3cb3183d4";
   };
 
   propagatedBuildInputs = [

From d81e79af15c43a00f70fdac968dba5d4ffbc3850 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Mon, 25 Jan 2021 13:02:29 +1100
Subject: [PATCH 878/956] bedtools: 2.29.2 -> 2.30.0

---
 pkgs/applications/science/biology/bedtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
index cfa22ae5ac8..d0553bb0649 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bedtools";
-  version = "2.29.2";
+  version = "2.30.0";
 
   src = fetchFromGitHub {
     owner = "arq5x";
     repo = "bedtools2";
     rev = "v${version}";
-    sha256 = "015qq3pwrwgnyxyi959niijjlswl231b3wxlsm3l8msv6fdhmkz8";
+    sha256 = "sha256-NqKldF7ePJn3pT+AkESIQghBKSFFOEBBsTaKEbU+oaQ=";
   };
 
   buildInputs = [ zlib python bzip2 lzma ];

From aa8868c7cca8d30706a68a876d048968c83e1cf1 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 24 Jan 2021 10:02:59 +0700
Subject: [PATCH 879/956] pkgs/build-support: stdenv.lib -> lib

---
 pkgs/build-support/bintools-wrapper/default.nix | 15 ++++++++-------
 pkgs/build-support/cc-wrapper/default.nix       | 17 +++++++++--------
 .../pkg-config-wrapper/default.nix              |  2 +-
 pkgs/build-support/release/ant-build.nix        | 16 ++++++++--------
 pkgs/build-support/release/debian-build.nix     |  2 +-
 pkgs/build-support/release/default.nix          |  2 +-
 pkgs/stdenv/darwin/default.nix                  |  3 ++-
 pkgs/stdenv/linux/default.nix                   |  3 +++
 8 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index e0d43739668..e960a245528 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -6,6 +6,7 @@
 # compiler and the linker just "work".
 
 { name ? ""
+, lib
 , stdenvNoCC
 , bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
 , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
@@ -15,7 +16,7 @@
 , useMacosReexportHack ? false
 }:
 
-with stdenvNoCC.lib;
+with lib;
 
 assert nativeTools -> !propagateDoc && nativePrefix != "";
 assert !nativeTools ->
@@ -31,11 +32,11 @@ let
   #
   # TODO(@Ericson2314) Make unconditional, or optional but always true by
   # default.
-  targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
+  targetPrefix = lib.optionalString (targetPlatform != hostPlatform)
                                         (targetPlatform.config + "-");
 
-  bintoolsVersion = stdenv.lib.getVersion bintools;
-  bintoolsName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName bintools);
+  bintoolsVersion = lib.getVersion bintools;
+  bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools);
 
   libc_bin = if libc == null then null else getBin libc;
   libc_dev = if libc == null then null else getDev libc;
@@ -62,7 +63,7 @@ let
     else if targetPlatform.system == "powerpc-linux"  then "${libc_lib}/lib/ld.so.1"
     else if targetPlatform.isMips                     then "${libc_lib}/lib/ld.so.1"
     else if targetPlatform.isDarwin                   then "/usr/lib/dyld"
-    else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
+    else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
     else null;
 
   expand-response-params =
@@ -326,10 +327,10 @@ stdenv.mkDerivation {
     let bintools_ = if bintools != null then bintools else {}; in
     (if bintools_ ? meta then removeAttrs bintools.meta ["priority"] else {}) //
     { description =
-        stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
+        lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
         + " (wrapper script)";
       priority = 10;
   } // optionalAttrs useMacosReexportHack {
-    platforms = stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.darwin;
   };
 }
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 212fd6b570a..341e2850437 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -6,6 +6,7 @@
 # compiler and the linker just "work".
 
 { name ? ""
+, lib
 , stdenvNoCC
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
 , gccForLibs ? null
@@ -18,7 +19,7 @@
 , libcxx ? null
 }:
 
-with stdenvNoCC.lib;
+with lib;
 
 assert nativeTools -> !propagateDoc && nativePrefix != "";
 assert !nativeTools ->
@@ -34,11 +35,11 @@ let
   #
   # TODO(@Ericson2314) Make unconditional, or optional but always true by
   # default.
-  targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
+  targetPrefix = lib.optionalString (targetPlatform != hostPlatform)
                                            (targetPlatform.config + "-");
 
-  ccVersion = stdenv.lib.getVersion cc;
-  ccName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName cc);
+  ccVersion = lib.getVersion cc;
+  ccName = lib.removePrefix targetPrefix (lib.getName cc);
 
   libc_bin = if libc == null then null else getBin libc;
   libc_dev = if libc == null then null else getDev libc;
@@ -247,8 +248,8 @@ stdenv.mkDerivation {
 
   setupHooks = [
     ../setup-hooks/role.bash
-  ] ++ stdenv.lib.optional (cc.langC or true) ./setup-hook.sh
-    ++ stdenv.lib.optional (cc.langFortran or false) ./fortran-hook.sh;
+  ] ++ lib.optional (cc.langC or true) ./setup-hook.sh
+    ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh;
 
   postFixup =
     # Ensure flags files exists, as some other programs cat them. (That these
@@ -353,7 +354,7 @@ stdenv.mkDerivation {
     + optionalString (libcxx.isLLVM or false) (''
       echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
       echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags
-    '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+    '' + lib.optionalString stdenv.targetPlatform.isLinux ''
       echo "-lc++abi" >> $out/nix-support/libcxx-ldflags
     '')
 
@@ -492,7 +493,7 @@ stdenv.mkDerivation {
     let cc_ = if cc != null then cc else {}; in
     (if cc_ ? meta then removeAttrs cc.meta ["priority"] else {}) //
     { description =
-        stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_
+        lib.attrByPath ["meta" "description"] "System C compiler" cc_
         + " (wrapper script)";
       priority = 10;
   };
diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix
index b61936c50a8..bbc49d6728c 100644
--- a/pkgs/build-support/pkg-config-wrapper/default.nix
+++ b/pkgs/build-support/pkg-config-wrapper/default.nix
@@ -10,7 +10,7 @@
 , extraPackages ? [], extraBuildCommands ? ""
 }:
 
-with stdenvNoCC.lib;
+with lib;
 
 let
   stdenv = stdenvNoCC;
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index 2d24d5bd704..996f4f45d07 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -1,5 +1,6 @@
 { src
 , pkgs
+, lib
 , stdenv ? pkgs.stdenv
 , name
 , antTargets ? []
@@ -16,8 +17,7 @@
 , ... } @ args:
 
 let
-  antFlags = "-f ${buildfile} " + stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;
-  lib = stdenv.lib;
+  antFlags = "-f ${buildfile} " + lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;
 in
 stdenv.mkDerivation (
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation (
     prePhases =
       ["antSetupPhase"];
 
-    antSetupPhase = with stdenv.lib; ''
+    antSetupPhase = with lib; ''
       if test "$hydraAntLogger" != "" ; then
         export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`"
       fi
@@ -46,7 +46,7 @@ stdenv.mkDerivation (
       mkdir -p $out/share/java
       ${ if jars == [] then ''
            find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java
-         '' else stdenv.lib.concatMapStrings (j: ''
+         '' else lib.concatMapStrings (j: ''
            cp -v ${j} $out/share/java
          '') jars }
 
@@ -65,7 +65,7 @@ stdenv.mkDerivation (
       in
       ''
       header "Generating jar wrappers"
-    '' + (stdenv.lib.concatMapStrings (w: ''
+    '' + (lib.concatMapStrings (w: ''
 
       mkdir -p $out/bin
       cat >> $out/bin/${w.name} <<EOF
@@ -85,7 +85,7 @@ stdenv.mkDerivation (
       header "Building default ant target"
       ant ${antFlags}
       closeNest
-    '' else stdenv.lib.concatMapStrings (t: ''
+    '' else lib.concatMapStrings (t: ''
       header "Building '${t}' target"
       ant ${antFlags} ${t}
       closeNest
@@ -103,12 +103,12 @@ stdenv.mkDerivation (
       '';
   }
 
-  // removeAttrs args ["antProperties" "buildInputs" "pkgs" "jarWrappers"] //
+  // removeAttrs args ["antProperties" "buildInputs" "pkgs" "lib" "jarWrappers"] //
 
   {
     name = name + (if src ? version then "-" + src.version else "");
 
-    buildInputs = [ant jre zip unzip] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ;
+    buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
 
     postHook = ''
       mkdir -p $out/nix-support
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 9ac335d288a..2544d5c740c 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -4,7 +4,7 @@
 { name ? "debian-build"
 , lib
 , diskImage
-, src, stdenv, vmTools, checkinstall
+, src, lib, stdenv, vmTools, checkinstall
 , fsTranslation ? false
 , # Features provided by this package.
   debProvides ? []
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index 0276fa1be61..83f755b2bec 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -15,7 +15,7 @@ rec {
     } // args);
 
   antBuild = args: import ./ant-build.nix (
-    { inherit pkgs;
+    { inherit lib pkgs;
     } // args);
 
   mvnBuild = args: import ./maven-build.nix (
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 6e1967281b3..3e5c46709ac 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -80,7 +80,7 @@ in rec {
 
       mkCC = overrides: import ../../build-support/cc-wrapper (
         let args = {
-          inherit shell;
+          inherit lib shell;
           inherit (last) stdenvNoCC;
 
           nativeTools  = false;
@@ -217,6 +217,7 @@ in rec {
 
         binutils = lib.makeOverridable (import ../../build-support/bintools-wrapper) {
           shell = "${bootstrapTools}/bin/bash";
+          inherit lib;
           inherit (self) stdenvNoCC;
 
           nativeTools  = false;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index b36eb1b5742..f753af49926 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -107,6 +107,7 @@ let
           bintools = prevStage.binutils;
           isGNU = true;
           libc = getLibc prevStage;
+          inherit lib;
           inherit (prevStage) coreutils gnugrep;
           stdenvNoCC = prevStage.ccWrapperStdenv;
         };
@@ -166,6 +167,7 @@ in
         nativeLibc = false;
         buildPackages = { };
         libc = getLibc self;
+        inherit lib;
         inherit (self) stdenvNoCC coreutils gnugrep;
         bintools = bootstrapTools;
       };
@@ -312,6 +314,7 @@ in
         cc = prevStage.gcc-unwrapped;
         bintools = self.binutils;
         libc = getLibc self;
+        inherit lib;
         inherit (self) stdenvNoCC coreutils gnugrep;
         shell = self.bash + "/bin/bash";
       };

From c0d053ea0ee2a1ff35f3251376fbca44e33a37c3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 24 Jan 2021 22:21:40 -0600
Subject: [PATCH 880/956] Revert "webkitgtk: enable WPE_RENDERER"

This reverts commit 132f7e6cfed4eaefe2aac9c867e5549b8e37591c.
---
 pkgs/development/libraries/webkitgtk/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 1abfd3a9194..9bf91da6cd9 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -51,8 +51,6 @@
 , xdg-dbus-proxy
 , substituteAll
 , glib
-, libwpe
-, libwpe-fdo
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
@@ -122,8 +120,6 @@ stdenv.mkDerivation rec {
     libsecret
     libtasn1
     libwebp
-    libwpe
-    libwpe-fdo
     libxkbcommon
     libxml2
     libxslt
@@ -158,6 +154,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_INTROSPECTION=ON"
     "-DPORT=GTK"
     "-DUSE_LIBHYPHEN=OFF"
+    "-DUSE_WPE_RENDERER=OFF"
   ] ++ optionals stdenv.isDarwin [
     "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
     "-DENABLE_GTKDOC=OFF"

From 35bd8f11535536d14d0dbc9b30c50601370af049 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 24 Jan 2021 22:47:59 -0600
Subject: [PATCH 881/956] nixos/binfmt: add bash to sandboxPaths

bash is needed to run the new binfmt shell script.

Fixes #110540
---
 nixos/modules/system/boot/binfmt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index 5bcc95be324..cbdf581d73a 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -23,7 +23,7 @@ let
   activationSnippet = name: { interpreter, ... }: ''
     rm -f /run/binfmt/${name}
     cat > /run/binfmt/${name} << 'EOF'
-    #!/usr/bin/env sh
+    #!${pkgs.bash}/bin/sh
     exec -- ${interpreter} "$@"
     EOF
     chmod +x /run/binfmt/${name}
@@ -266,7 +266,7 @@ in {
       extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")}
     '';
     nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != [])
-      ([ "/run/binfmt" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems));
+      ([ "/run/binfmt" "${pkgs.bash}" ] ++ (map (system: dirOf (dirOf (getEmulator system))) cfg.emulatedSystems));
 
     environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
       (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));

From c455bcb27b80879ba32f44b85cb4f8420f53a1d2 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sun, 24 Jan 2021 21:37:45 -0800
Subject: [PATCH 882/956] lowdown: fix dylib on darwin

---
 pkgs/tools/typesetting/lowdown/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix
index 668e54c1730..40606199b83 100644
--- a/pkgs/tools/typesetting/lowdown/default.nix
+++ b/pkgs/tools/typesetting/lowdown/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, which }:
+{ lib, stdenv, fetchurl, fixDarwinDylibNames, which }:
 
 stdenv.mkDerivation rec {
   pname = "lowdown";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c";
   };
 
-  nativeBuildInputs = [ which ];
+  nativeBuildInputs = [ which ]
+    ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
 
   configurePhase = ''
     ./configure PREFIX=''${!outputDev} \
@@ -20,6 +21,11 @@ stdenv.mkDerivation rec {
                 MANDIR=''${!outputMan}/share/man
   '';
 
+  # Fix lib extension so that fixDarwinDylibNames detects it
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    mv $lib/lib/liblowdown.{so,dylib}
+  '';
+
   patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;
 
   meta = with lib; {

From b91e555720e2ed83674a2450e4cbf57a1d4aa0f9 Mon Sep 17 00:00:00 2001
From: Tristan Gosselin-Hane <starcraft66@gmail.com>
Date: Mon, 25 Jan 2021 02:04:11 -0500
Subject: [PATCH 883/956] obs-move-transition: 2.0.2 -> 2.3.0

---
 pkgs/applications/video/obs-studio/obs-move-transition.nix  | 5 +++--
 .../video/obs-studio/rename-obs-move-transition-cmake.patch | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/obs-move-transition.nix b/pkgs/applications/video/obs-studio/obs-move-transition.nix
index 70985b438c6..9a896c7320a 100644
--- a/pkgs/applications/video/obs-studio/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/obs-move-transition.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-move-transition";
-  version = "2.0.2";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-move-transition";
     rev = version;
-    sha256 = "0kr868lxlanq0y98f2hb70y92ac2nla8khsj879kjf3z6dqdpd66";
+    sha256 = "0cl6z3cvdjmbisvfcy281pcg6rhxmyfs31rwv7q4x39352rcs1nw";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
     substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
     substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
     substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
+    substituteInPlace audio-move.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
   '';
 
   # obs-studio expects the shared object to be located in bin/32bit or bin/64bit
diff --git a/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch
index 24c1848c10b..ed6df1d565d 100644
--- a/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch
+++ b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch
@@ -7,7 +7,7 @@ index d116619..a1366ce 100644
 +	cmake_policy(SET CMP0048 NEW)
 +endif (POLICY CMP0048)
 +
- project(move-transition VERSION 2.0.2)
+ project(move-transition VERSION 2.3.0)
  set(PROJECT_FULL_NAME "Move Transition")
  
 +include(FindLibobs.cmake)
@@ -17,9 +17,9 @@ index d116619..a1366ce 100644
 +	"${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions"
 +	"${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api")
 +
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
+
  set(move-transition_HEADERS
- 	move-transition.h
- 	easing.h)
 @@ -34,4 +45,10 @@ target_link_libraries(move-transition
  	libobs)
  

From ae82038d5f5dee37756e57fc477ef549a4fff31f Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 12 Jan 2021 19:49:15 +0100
Subject: [PATCH 884/956] ocamlPackages.bheap: init at 2.0.0

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

diff --git a/pkgs/development/ocaml-modules/bheap/default.nix b/pkgs/development/ocaml-modules/bheap/default.nix
new file mode 100644
index 00000000000..49e5c336d90
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bheap/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, fetchurl, stdlib-shims }:
+
+buildDunePackage rec {
+  pname = "bheap";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/backtracking/${pname}/releases/download/${version}/${pname}-${version}.tbz";
+    sha256 = "0dpnpla20lgiicrxl2432m2fcr6y68msw3pnjxqb11xw6yrdfhsz";
+  };
+
+  useDune2 = true;
+
+  doCheck = true;
+  checkInputs = [
+    stdlib-shims
+  ];
+
+  meta = with lib; {
+    description = "OCaml binary heap implementation by Jean-Christophe Filliatre";
+    license = licenses.lgpl21Only;
+    maintainers = [ maintainers.sternenseemann ];
+    homepage = "https://github.com/backtracking/bheap";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e1fd3ccc8fc..d65c90fe773 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -58,6 +58,8 @@ let
 
     batteries = callPackage ../development/ocaml-modules/batteries { };
 
+    bheap = callPackage ../development/ocaml-modules/bheap { };
+
     bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { };
 
     bigarray-overlap = callPackage ../development/ocaml-modules/bigarray-overlap { };

From fa676b0e1761ffae48474dde316419dea8ca5fb0 Mon Sep 17 00:00:00 2001
From: Ruby Iris Juric <ruby@srxl.me>
Date: Mon, 25 Jan 2021 19:32:30 +1100
Subject: [PATCH 885/956] py-sonic: 0.7.7 -> 0.7.8

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

diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix
index ebaf5f7f64f..c35e650e18b 100644
--- a/pkgs/development/python-modules/py-sonic/default.nix
+++ b/pkgs/development/python-modules/py-sonic/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "py-sonic";
-  version = "0.7.7";
+  version = "0.7.8";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4cea42a2b0dc2ed0fd8568d6bf0509cfa2675a8b1c347ce9364a00881ebc0272";
+    sha256 = "1nfpiry1jlgcyxcs5zamyfxwdvdiwg4yw0v8jysfc74hm362rg7d";
   };
 
   # package has no tests

From d846bfaa4d9543758a5a27384e34c0ae2aa84de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sun, 24 Jan 2021 14:38:23 +0100
Subject: [PATCH 886/956] openjpeg_1: drop

---
 pkgs/development/libraries/openjpeg/1.x.nix | 9 ---------
 pkgs/top-level/aliases.nix                  | 1 +
 pkgs/top-level/all-packages.nix             | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 pkgs/development/libraries/openjpeg/1.x.nix

diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix
deleted file mode 100644
index beb151f0d2d..00000000000
--- a/pkgs/development/libraries/openjpeg/1.x.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "1.5.2";
-  branch = "1.5";
-  revision = "version.1.5.2";
-  sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp";
-  testsSupport = false;
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7d3332c3a7c..26238945bdc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -401,6 +401,7 @@ mapAliases ({
   oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
   opencl-icd = ocl-icd; # added 2017-01-20
   openexr_ctl = ctl; # added 2018-04-25
+  openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24
   openjpeg_2_1 = openjpeg_2; # added 2018-10-25
   opensans-ttf = open-sans; # added 2018-12-04
   openssh_with_kerberos = openssh; # added 2018-01-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3741b957f66..c16e8e03351 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15912,7 +15912,6 @@ in
 
   openh264 = callPackage ../development/libraries/openh264 { };
 
-  openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
   openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { };
   openjpeg = openjpeg_2;
 

From 8c9a72e55fed6e711a25030ad5d78300d47d9956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 25 Jan 2021 10:13:24 +0100
Subject: [PATCH 887/956] openjpeg: clean-up

Merge generic.nix and 2.x.nix into default.nix.
openjpeg_2 is now an alias
---
 pkgs/development/libraries/openjpeg/2.x.nix   | 21 ---------------
 .../openjpeg/{generic.nix => default.nix}     | 26 ++++++++++++-------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  3 +--
 4 files changed, 18 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/libraries/openjpeg/2.x.nix
 rename pkgs/development/libraries/openjpeg/{generic.nix => default.nix} (77%)

diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
deleted file mode 100644
index edb9c9bf8c9..00000000000
--- a/pkgs/development/libraries/openjpeg/2.x.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ callPackage, fetchpatch, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2.4.0";
-  branch = "2.4";
-  revision = "v${version}";
-  sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf";
-
-  extraFlags = [
-    "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}"
-    "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/openjpeg-${branch}"
-  ];
-
-  patches = [
-    ./fix-cmake-config-includedir.patch
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch";
-      sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8";
-    })
-  ];
-})
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/default.nix
similarity index 77%
rename from pkgs/development/libraries/openjpeg/generic.nix
rename to pkgs/development/libraries/openjpeg/default.nix
index 8c1f18b987d..32bfa6f2458 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config
 , libpng, libtiff, lcms2, jpylyzer
 , mj2Support ? true # MJ2 executables
 , jpwlLibSupport ? true # JPWL library & executables
@@ -10,8 +10,6 @@
 , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build
 , testsSupport ? true
 , jdk ? null
-# Inherit generics
-, branch, version, revision, sha256, patches ? [], extraFlags ? [], ...
 }:
 
 assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
@@ -23,18 +21,24 @@ let
   mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
 in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "openjpeg";
-  inherit version;
+  version = "2.4.0"; # don't forget to change passthru.incDir
 
   src = fetchFromGitHub {
     owner = "uclouvain";
     repo = "openjpeg";
-    rev = revision;
-    inherit sha256;
+    rev = "v${version}";
+    sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf";
   };
 
-  inherit patches;
+  patches = [
+    ./fix-cmake-config-includedir.patch
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch";
+      sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8";
+    })
+  ];
 
   outputs = [ "out" "dev" ];
 
@@ -52,7 +56,9 @@ stdenv.mkDerivation {
     (mkFlag jp3dSupport "BUILD_JP3D")
     (mkFlag thirdPartySupport "BUILD_THIRDPARTY")
     (mkFlag testsSupport "BUILD_TESTING")
-  ] ++ extraFlags;
+    "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/${passthru.incDir}"
+    "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/${passthru.incDir}"
+  ];
 
   nativeBuildInputs = [ cmake pkg-config ];
 
@@ -71,7 +77,7 @@ stdenv.mkDerivation {
   '';
 
   passthru = {
-    incDir = "openjpeg-${branch}";
+    incDir = "openjpeg-2.4";
   };
 
   meta = with lib; {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 26238945bdc..a0c5989fb6d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -402,6 +402,7 @@ mapAliases ({
   opencl-icd = ocl-icd; # added 2017-01-20
   openexr_ctl = ctl; # added 2018-04-25
   openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24
+  openjpeg_2 = openjpeg; # added 2021-01-25
   openjpeg_2_1 = openjpeg_2; # added 2018-10-25
   opensans-ttf = open-sans; # added 2018-12-04
   openssh_with_kerberos = openssh; # added 2018-01-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c16e8e03351..64be1b6c7e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15912,8 +15912,7 @@ in
 
   openh264 = callPackage ../development/libraries/openh264 { };
 
-  openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { };
-  openjpeg = openjpeg_2;
+  openjpeg = callPackage ../development/libraries/openjpeg { };
 
   openpa = callPackage ../development/libraries/openpa { };
 

From e0dd8c61668883d093cba7231ebadff06bc3fd95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 25 Jan 2021 11:00:33 +0100
Subject: [PATCH 888/956] openjpeg_2_1: remove alias

It is actually referring to version 2.4.
---
 pkgs/top-level/aliases.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a0c5989fb6d..5c645a68e4e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -403,7 +403,6 @@ mapAliases ({
   openexr_ctl = ctl; # added 2018-04-25
   openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24
   openjpeg_2 = openjpeg; # added 2021-01-25
-  openjpeg_2_1 = openjpeg_2; # added 2018-10-25
   opensans-ttf = open-sans; # added 2018-12-04
   openssh_with_kerberos = openssh; # added 2018-01-28
   onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04

From bacfa2d9200e08bf8f4b77607e9d90222638cff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 25 Jan 2021 11:06:27 +0100
Subject: [PATCH 889/956] python3Packages.eth-utils: 1.8.4 -> 1.9.5 (#110318)

---
 .../python-modules/eth-utils/default.nix        | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
index 25f2ebd5541..9c67f0816e3 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -1,9 +1,9 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pytest, eth-hash, eth-typing,
+{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, eth-hash, eth-typing,
   cytoolz, hypothesis }:
 
 buildPythonPackage rec {
   pname = "eth-utils";
-  version = "1.8.4";
+  version = "1.9.5";
 
   # Tests are missing from the PyPI source tarball so let's use GitHub
   # https://github.com/ethereum/eth-utils/issues/130
@@ -11,20 +11,13 @@ buildPythonPackage rec {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1hfzb3xz3j50dgp51nx2jssh9j07np24fqmpnyr2ycsll90g1j6q";
+    sha256 = "1h3xlw74zdf6cfvqf9193lx05bpdm05pmy9ap1g7q2kx0j2b6352";
   };
 
-  checkInputs = [ pytest hypothesis ];
+  checkInputs = [ pytestCheckHook hypothesis ];
   propagatedBuildInputs = [ eth-hash eth-typing cytoolz ];
 
-  # setuptools-markdown uses pypandoc which is broken at the moment
-  preConfigure = ''
-    substituteInPlace setup.py --replace \'setuptools-markdown\' ""
-  '';
-
-  checkPhase = ''
-    pytest .
-  '';
+  pythonImportsCheck = [ "eth_utils" ];
 
   meta = {
     description = "Common utility functions for codebases which interact with ethereum";

From 3cd31450a13501ebb2c6851a59e81a60fdc38cab Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Mon, 25 Jan 2021 11:31:27 +0100
Subject: [PATCH 890/956] Revert "nodePackages: regenerate with node2nix 1.9.0"

---
 .../networking/cluster/spacegun/default.nix   |   15 +-
 .../cluster/spacegun/generate-dependencies.sh |    7 -
 .../cluster/spacegun/node-composition.nix     |    8 +-
 .../cluster/spacegun/node-packages.nix        | 3996 +++++-----
 .../networking/cluster/spacegun/package.json  |    3 +
 .../networking/n8n/node-composition.nix       |    8 +-
 pkgs/applications/networking/n8n/node-env.nix |   39 +-
 .../networking/n8n/node-packages.nix          | 1490 ++--
 .../commitizen/node-composition.nix           |    8 +-
 .../commitizen/node-env.nix                   |   45 +-
 .../commitizen/node-packages.nix              | 1868 +++--
 .../elm/packages/generate-node-packages.sh    |    4 +-
 .../elm/packages/node-composition.nix         |   10 +-
 .../compilers/elm/packages/node-env.nix       |  542 ++
 .../compilers/elm/packages/node-packages.nix  | 1475 ++--
 .../misc/google-clasp/google-clasp.nix        |    8 +-
 .../misc/google-clasp/node-packages.nix       |  834 ++-
 .../development/node-packages/composition.nix |    8 +-
 pkgs/development/node-packages/node-env.nix   |  169 +-
 .../node-packages/node-packages.nix           | 6476 +++++++++--------
 .../web/newman/node-composition.nix           |    8 +-
 pkgs/development/web/newman/node-env.nix      |  161 +-
 pkgs/development/web/newman/node-packages.nix |  761 +-
 .../web/remarkjs/node-packages.nix            | 2058 +++---
 pkgs/development/web/remarkjs/nodepkgs.nix    |    8 +-
 .../node-packages-generated.nix               |  335 +-
 pkgs/misc/base16-builder/node-packages.nix    |   10 +-
 pkgs/misc/base16-builder/supplement.nix       |  153 +-
 .../node-composition.nix                      |    8 +-
 .../matrix-appservice-slack/node-packages.nix | 1135 ++-
 .../cryptpad/node-packages-generated.nix      |   40 +-
 .../web-apps/cryptpad/node-packages.nix       |    8 +-
 .../whitebophir/node-packages-generated.nix   |  154 +-
 .../web-apps/whitebophir/node-packages.nix    |    8 +-
 pkgs/servers/zigbee2mqtt/node-packages.nix    | 2775 ++-----
 pkgs/servers/zigbee2mqtt/node.nix             |    8 +-
 .../graphics/ldgallery/viewer/generate.sh     |    8 +-
 .../ldgallery/viewer/node-composition.nix     |    8 +-
 .../ldgallery/viewer/node-packages.nix        |   18 +-
 .../networking/airfield/node-packages.nix     |  174 +-
 pkgs/tools/networking/airfield/node.nix       |    8 +-
 pkgs/tools/package-management/nixui/nixui.nix |    8 +-
 .../nixui/node-packages.nix                   |   24 +-
 43 files changed, 12215 insertions(+), 12676 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/spacegun/package.json
 create mode 100644 pkgs/development/compilers/elm/packages/node-env.nix

diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix
index 684e9f65a5b..64623f88dda 100644
--- a/pkgs/applications/networking/cluster/spacegun/default.nix
+++ b/pkgs/applications/networking/cluster/spacegun/default.nix
@@ -1,21 +1,16 @@
-{ pkgs, fetchFromGitHub, nodejs, stdenv, lib, ... }:
+{ pkgs, nodejs, stdenv, lib, ... }:
 
 let
-  src = fetchFromGitHub {
-    owner = "dvallin";
-    repo = "spacegun";
-    rev = "v0.3.3";
-    sha256 = "0cd9yzms44dj9ix8lrhbkby5zsyb8wambs24j6c3ibr67sggr6sq";
-  };
+
+  packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json));
 
   nodePackages = import ./node-composition.nix {
     inherit pkgs nodejs;
     inherit (stdenv.hostPlatform) system;
   };
 in
-nodePackages.package.override {
-  inherit src;
-  nativeBuildInputs = [ pkgs.makeWrapper pkgs.nodePackages.node-gyp-build ];
+nodePackages."${packageName}".override {
+  nativeBuildInputs = [ pkgs.makeWrapper ];
 
   postInstall = ''
     # Patch shebangs in node_modules, otherwise the webpack build fails with interpreter problems
diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
index bda3d1727c4..293a72a1623 100644
--- a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
+++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
@@ -1,17 +1,10 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
 
-# Download package.json and package-lock.json from the v0.3.3 release
-curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package.json -o package.json
-curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json
-
 node2nix \
   --nodejs-10 \
   --node-env ../../../../development/node-packages/node-env.nix \
   --development \
   --input package.json \
-  --lock package-lock.json \
   --output node-packages.nix \
   --composition node-composition.nix
-
-rm -f package.json package-lock.json
diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
index 7cbb2328ae7..89b805fc153 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
index 9203d8f60c5..423e34f10df 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-packages.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
@@ -1,142 +1,142 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/code-frame-7.5.5" = {
+    "@babel/code-frame-7.8.3" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.5.5";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz";
-        sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz";
+        sha512 = "3d85pd9lfbm8yrlpn6wj9g56snbnpr9fx0w1b9x26jbirc2xfrvnifwzprp0f6bhqijshgm0q35axic8d11v4j0kq493dapcyk33n3b";
       };
     };
-    "@babel/core-7.6.2" = {
+    "@babel/core-7.8.7" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.6.2";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.6.2.tgz";
-        sha512 = "l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz";
+        sha512 = "34gjbasmqp8z2rbwlc5b9sfnvs7fw1hm3i5bcdk0ddymr9b280fbcgfx6mgiwhkv3gzgawjvzcg1bzqp9f0hhifkhrdg8r4fqbnl6dc";
       };
     };
-    "@babel/generator-7.6.2" = {
+    "@babel/generator-7.8.8" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.6.2";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz";
-        sha512 = "j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz";
+        sha512 = "0k5w5pcsv2m6992nh49qjil2b1aqzdbdrcxzcp89v7wq9wx7llnx5ijyzl9w895iry3hnp8mk3srgp52kgz4swvjqf9lwdxxrb99b0w";
       };
     };
-    "@babel/helper-function-name-7.1.0" = {
+    "@babel/helper-function-name-7.8.3" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.1.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz";
-        sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz";
+        sha512 = "0w35m1kq2dmsgdgjxvpmg6gxm1rzl1jqf23h3k7pwh9nmwsmqbgv0rzy7fs6dq31dqq6j17bwyww0091r41aj0rl3zi1nj2a1gn0b04";
       };
     };
-    "@babel/helper-get-function-arity-7.0.0" = {
+    "@babel/helper-get-function-arity-7.8.3" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.0.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz";
-        sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz";
+        sha512 = "12g2gjipd8svg02d12iqbf0rz4m99g36qccn3f81xij3ac4f7kqzx0407xma49h11j88iz8jil2whj7j96wqpwd67abi23xczwd2l0m";
       };
     };
-    "@babel/helper-plugin-utils-7.0.0" = {
+    "@babel/helper-plugin-utils-7.8.3" = {
       name = "_at_babel_slash_helper-plugin-utils";
       packageName = "@babel/helper-plugin-utils";
-      version = "7.0.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz";
-        sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==";
+        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz";
+        sha512 = "1jj9ibj72hqv1qm4hvdnk728fi9mihrwhq0xcs2qlxbs8iz9d2zb4a23sm7ny0s42asrdyy2s98shgnqm0rhn2314k6pcyxspiymrwg";
       };
     };
-    "@babel/helper-split-export-declaration-7.4.4" = {
+    "@babel/helper-split-export-declaration-7.8.3" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.4.4";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz";
-        sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz";
+        sha512 = "1sgm6wd88kmizvig5m0ims97vmlylfii72xcw4k01h2wsw3cpc312s1asnjrq5y472hcqfh2mwn8dwpqkpcvs0ssqwnz1c1xhwz47fz";
       };
     };
-    "@babel/helpers-7.6.2" = {
+    "@babel/helpers-7.8.4" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.6.2";
+      version = "7.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz";
-        sha512 = "3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz";
+        sha512 = "3rr2xlnr2hmpbrgysgs0jyrz4bjyg80cxij1wn899v53zqj4i1bcm3ajpnr03v1swlczkzapn7nvzmzhwlqxl1hw5pciq8h0zpxxxjl";
       };
     };
-    "@babel/highlight-7.5.0" = {
+    "@babel/highlight-7.8.3" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.5.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz";
-        sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz";
+        sha512 = "09353nlk7ng0h135l14dhwk4jahsdrapvd0185wra8l73wjbnkb11jl42znj1rxypb38jlzcraxf4xdka1ssis5khgjvgql2kkk4zix";
       };
     };
-    "@babel/parser-7.6.2" = {
+    "@babel/parser-7.8.8" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.6.2";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz";
-        sha512 = "mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz";
+        sha512 = "1q85si9966ra57f43dccjanxnyy65c66lykxgv5z231wpi4w023nk8l7s8m54bp9fv4yd3pl682yh0krny22qmfygxggc2g61dldvlq";
       };
     };
-    "@babel/plugin-syntax-object-rest-spread-7.2.0" = {
+    "@babel/plugin-syntax-object-rest-spread-7.8.3" = {
       name = "_at_babel_slash_plugin-syntax-object-rest-spread";
       packageName = "@babel/plugin-syntax-object-rest-spread";
-      version = "7.2.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz";
-        sha512 = "t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz";
+        sha512 = "2a9vg6b6p2rfhcflic2w6rbrbiqrdgj4ra2q20g1qv6ncwmvja2jq8snygwfw1ll1k94rqnbj4hc1fpizgr1v35rfvxqvwr6658r2jy";
       };
     };
-    "@babel/template-7.6.0" = {
+    "@babel/template-7.8.6" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.6.0";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz";
-        sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz";
+        sha512 = "0z8kzrpis50nr4vsyqr77cpqad0xfsacw45jdhwsl89mdzpvy8wcvc0kdy938kb0ll069plxhgy3a3fpag408ci2pb47gxzrhy2rcyd";
       };
     };
-    "@babel/traverse-7.6.2" = {
+    "@babel/traverse-7.8.6" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.6.2";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz";
-        sha512 = "8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz";
+        sha512 = "3s53fzm55c14accqfxhvdck1vkj87489w0rhcl7zj8phf9iz21qs0garpghgs0h1cj4s4n2fb7czipdm2mlrj19iaygh37zsv8ja7yq";
       };
     };
-    "@babel/types-7.6.1" = {
+    "@babel/types-7.8.7" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.6.1";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz";
-        sha512 = "X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz";
+        sha512 = "0kj404kqcscn0qdpis6kha2263fb0njap0qqcjbwf38jv9qvpxw39f84iiyjspgwz7v1bqcdpjpfb274dkgh2v9ih10w57i85wfnr4k";
       };
     };
-    "@cnakazawa/watch-1.0.3" = {
+    "@cnakazawa/watch-1.0.4" = {
       name = "_at_cnakazawa_slash_watch";
       packageName = "@cnakazawa/watch";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz";
-        sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==";
+        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz";
+        sha512 = "2hl7iz90jal2f27hgyb5rbmcp96p182xkmflyj5rsyqqffng8vkzz3fcjvbvcpdykij40ax4yirdc6p68yrmjvai7hr8y93mj20indz";
       };
     };
     "@jest/console-24.9.0" = {
@@ -145,7 +145,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz";
-        sha512 = "Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==";
+        sha512 = "0nwvmyk8p01b6331xizblr7h9kkgp8rybjpfj1pa57h9w47lsnpyzzhh9vsji9q361bg17fmxwkgxs10k7nk9lcmfvphag7qipzms36";
       };
     };
     "@jest/core-24.9.0" = {
@@ -154,7 +154,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz";
-        sha512 = "Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==";
+        sha512 = "3c0jsaq55pcz4gx9sg9dccqpakbdfplm0w715lw904p8lvvz6p9899j47ndfcpnb5pba3vdzr96f5gmanwgmskyapshm51hrvg2120n";
       };
     };
     "@jest/environment-24.9.0" = {
@@ -163,7 +163,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz";
-        sha512 = "5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==";
+        sha512 = "1lpii90h62jy8h2awivnqdjarsicik5g1npmsyjm8yq24iv3n6d0ilgajw3v95qrw5m2gcpsy82cyqb35xkn9sn7i4gg1ngwjb503g4";
       };
     };
     "@jest/fake-timers-24.9.0" = {
@@ -172,7 +172,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz";
-        sha512 = "eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==";
+        sha512 = "3s57a5043fphl08b2gb8frph1gm1x47lb7za0n0iqspr4p0iwibvm7wmzgal27b8h2v93i229cyh786kymy80l3b3bhqjwqmlsiqr3r";
       };
     };
     "@jest/reporters-24.9.0" = {
@@ -181,7 +181,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz";
-        sha512 = "mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==";
+        sha512 = "0dkr3yy0x1n8b1226aczwz75785nl21hh913sadyqj48j0fq4sr9n2q2b2v23gqg6p63p4hcjcsdadlway599n57bgvf7ns539igvls";
       };
     };
     "@jest/source-map-24.9.0" = {
@@ -190,7 +190,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz";
-        sha512 = "/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==";
+        sha512 = "038h2qlv880agd1b1mqxmkxbqv76ikcvdas4gjzkppg77yzd61ww2nwvliwgymc860niaa9xsi2p5svrwg80hrk4w6bwrbcd723nz7x";
       };
     };
     "@jest/test-result-24.9.0" = {
@@ -199,7 +199,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz";
-        sha512 = "XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==";
+        sha512 = "2464cq11b9d51nrx8j5vi5m2572rrhi001l2lxz84wg5r6bkpskkszrk3s47w51h1rgm668ix0fgzwhgihjcxkafiy15738n0fnnhaw";
       };
     };
     "@jest/test-sequencer-24.9.0" = {
@@ -208,7 +208,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz";
-        sha512 = "6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==";
+        sha512 = "3h61jyz33sya4wglmvp4f1m5lhxagwv76gdbjafdxfc1nag58vdv4b65yiggsry5xx9ixjd8j1grjw3d3rsjy8gpifnv49li99srapa";
       };
     };
     "@jest/transform-24.9.0" = {
@@ -217,7 +217,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz";
-        sha512 = "TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==";
+        sha512 = "2cwna8zadqd9ahyf32pyg0hgrnn8qwwg55cdyw5imfbvj9g9kljwsbagx87074kzp3rdai22glvwkwpv7lk0aa49dw5ziai4fdi9i2d";
       };
     };
     "@jest/types-24.9.0" = {
@@ -226,16 +226,25 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz";
-        sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==";
+        sha512 = "03hdscpch75yk366szkrfi63n6mqd5hscqslcpxklq5j99n05qg1p54zj51jhcld1dvkc4hgw0vmzjcr0qncphfb54yx9jsxp6vp8jw";
       };
     };
-    "@kubernetes/client-node-0.10.1" = {
+    "@kubernetes/client-node-0.10.3" = {
       name = "_at_kubernetes_slash_client-node";
       packageName = "@kubernetes/client-node";
-      version = "0.10.1";
+      version = "0.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.1.tgz";
-        sha512 = "AOfrCPa5oqdk/7lzIVU+4yYPlphc8cGW+kbiJAS5+GTbUpo62f5jPbWSPv83jTjQwfhWucj3t+3VHxQGdNexsw==";
+        url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.3.tgz";
+        sha512 = "0ra42q33nywyiwiccxcg501ajdc1rz1lvg6kfwk6xypi1vlkmmvxiywc20y4s6v48i40m8j5sl2y40ni9jg7v396w86wcczsb6va3wv";
+      };
+    };
+    "@sindresorhus/is-0.7.0" = {
+      name = "_at_sindresorhus_slash_is";
+      packageName = "@sindresorhus/is";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz";
+        sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q";
       };
     };
     "@types/accepts-1.3.5" = {
@@ -244,7 +253,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz";
-        sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==";
+        sha512 = "30y19l2wp8plrlgcj6fn0qc7wdy72rcn69zvmn8463738bx4mz7pxwl8dml92gi7y1ry2hqzaq0ljvk8wfp6f9k0v092kpazlingrwc";
       };
     };
     "@types/axios-0.14.0" = {
@@ -262,25 +271,25 @@ let
       version = "7.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz";
-        sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
+        sha512 = "18iifcb27svl3qmsh5vvpidyw3cj6hhif0il25xsg76vq9gb4h8gmfqs5hv3is2dab09a6nwbinf6f1q641spv7spr33a9ynxp426vl";
       };
     };
-    "@types/babel__core-7.1.3" = {
+    "@types/babel__core-7.1.6" = {
       name = "_at_types_slash_babel__core";
       packageName = "@types/babel__core";
-      version = "7.1.3";
+      version = "7.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz";
-        sha512 = "8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==";
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz";
+        sha512 = "17ggrqy35zds8rkpa2kglnk8f5dc43sgbkbjcfjbaygi53jxwm9ji6vr1xqanhs2yn4spla51fjdypl2hsfdrkfhpkzban0ridf2fdm";
       };
     };
-    "@types/babel__generator-7.6.0" = {
+    "@types/babel__generator-7.6.1" = {
       name = "_at_types_slash_babel__generator";
       packageName = "@types/babel__generator";
-      version = "7.6.0";
+      version = "7.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.0.tgz";
-        sha512 = "c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw==";
+        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz";
+        sha512 = "1xw1hijlii2sxf25d5pcqlgqsb6vpzw7c3z9s0s20f1cdyyb768cajmxxk3l1c9g8md3h797v6pzvjvpjmw8q83aw8w69agcpxsc4kc";
       };
     };
     "@types/babel__template-7.0.2" = {
@@ -289,16 +298,16 @@ let
       version = "7.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz";
-        sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==";
+        sha512 = "199fw9pirw68kdc47d80sy6gg5g6m8raxawnxwpcs0nc6bmxrv19qmv1212lfyw67a2l5b5abxz9g0i1fwnrxm6h6rqkv4njw5b7bpw";
       };
     };
-    "@types/babel__traverse-7.0.7" = {
+    "@types/babel__traverse-7.0.9" = {
       name = "_at_types_slash_babel__traverse";
       packageName = "@types/babel__traverse";
-      version = "7.0.7";
+      version = "7.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz";
-        sha512 = "CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==";
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz";
+        sha512 = "2vza0zha9nrlal5hgfdbaavx6xqxq195whl8274barqkyw26vrvvi9d7jkwp4harbx158wsxwjh4ypgkyb9w9cg73iz7fkdppq50hcc";
       };
     };
     "@types/babylon-6.16.5" = {
@@ -307,16 +316,16 @@ let
       version = "6.16.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.5.tgz";
-        sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==";
+        sha512 = "3pvh96p07fz7ib5j5519lk4xm59i6yv2dyy4xsmjv853fi61lziwz0q03y3bih2nvvskcy82jqsaxaadagjmrr9wdbkv9m5qzkrwzf4";
       };
     };
-    "@types/body-parser-1.17.1" = {
+    "@types/body-parser-1.19.0" = {
       name = "_at_types_slash_body-parser";
       packageName = "@types/body-parser";
-      version = "1.17.1";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz";
-        sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==";
+        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz";
+        sha512 = "0av4v9bdhgbq0jils3jajym9gcfddyx63g2xx8fh6vqafqb5vdcm98p1kfl70ydih9m393zp13krslmii5bmf05ngyaxn139nn0kpsv";
       };
     };
     "@types/caseless-0.12.2" = {
@@ -325,7 +334,7 @@ let
       version = "0.12.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz";
-        sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==";
+        sha512 = "39jv2a7v9mi41wxbv242icriy5asbzyk95iy25ay3gwa1d6yi40cd6gclbzn81hig9xvvi5z7j2gq4ybirjfyihpq8wa3s160r33jg9";
       };
     };
     "@types/command-line-args-5.0.0" = {
@@ -334,34 +343,34 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.0.0.tgz";
-        sha512 = "4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg==";
+        sha512 = "0vcqbwg68hir26fcyaqqn0w6i70cas8zn2ibhk9j0vl5mnwd2j448fvl6lqx5cny62szngdbjz6bxqfiz3ig360w3x663pr55gqzqz1";
       };
     };
-    "@types/connect-3.4.32" = {
+    "@types/connect-3.4.33" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.32";
+      version = "3.4.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz";
-        sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz";
+        sha512 = "3n5gxr7z1jn60gvcnzls1c3fgzbv171acdp4shbn095wnbb8hdba3cjq1sac8aina3bg957ww5hg89swcgbdjfp9irmkkiqfs8npqfv";
       };
     };
-    "@types/cookies-0.7.3" = {
+    "@types/cookies-0.7.4" = {
       name = "_at_types_slash_cookies";
       packageName = "@types/cookies";
-      version = "0.7.3";
+      version = "0.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.3.tgz";
-        sha512 = "NEkYn8pNsYZIxf3ZrjdPoeyueiPc0RbQClUpTwmdHkpmQQ8iDAlQYKpabuegHy7BJcqTteSTkhURMEs9ZxyEWg==";
+        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz";
+        sha512 = "2pzkddkjlxs4h8rpkh6xd381f0m6hwhxsmfx7f4vkzjxv55hyvdx7km3ks4wckd7jz0rfzzr45nphaggj48q0iwin25n0ar6qrsscd1";
       };
     };
-    "@types/cron-1.7.1" = {
+    "@types/cron-1.7.2" = {
       name = "_at_types_slash_cron";
       packageName = "@types/cron";
-      version = "1.7.1";
+      version = "1.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.1.tgz";
-        sha512 = "48brwgU18DqA0mQX1As5OcJEo1yNjaXMM6Mk4r8K1dOzLJRQ37FE/kCivKx7ClKEHfhX2FdcxKzJ1B744a+V3A==";
+        url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.2.tgz";
+        sha512 = "17az71shn84qjqsnb5646z4amysvnhmgpsxj0ja2w2zlykmn7m3q1bchgrd30indnd0z8ryxzhisgd78yij87nv04wjfm9c2wnlsjh0";
       };
     };
     "@types/events-3.0.0" = {
@@ -370,34 +379,25 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
-        sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
+        sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi";
       };
     };
-    "@types/express-4.17.1" = {
+    "@types/express-4.17.3" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.1";
+      version = "4.17.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz";
-        sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz";
+        sha512 = "1vd6aidhc6l28s5r9hjg2bzmmbmqp0dspsdp2h6affggfb9g8rzzxnbjxdan9n1b1n0d44n3amcx6yvzs1pdrzinf5j79zpk120dir3";
       };
     };
-    "@types/express-serve-static-core-4.16.9" = {
+    "@types/express-serve-static-core-4.17.2" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.16.9";
+      version = "4.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz";
-        sha512 = "GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==";
-      };
-    };
-    "@types/form-data-2.5.0" = {
-      name = "_at_types_slash_form-data";
-      packageName = "@types/form-data";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.5.0.tgz";
-        sha512 = "23/wYiuckYYtFpL+4RPWiWmRQH2BjFuqCUi2+N3amB1a1Drv+i/byTrGvlLwRVLFNAZbwpbQ7JvTK+VCAPMbcg==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz";
+        sha512 = "1pa7rrhwf6wzp8lnbk2zjgvc2sxks36bw23p060kz1mm4kwyipddhn9zg4n2wnmym7a9ahw6fhk3ircal30f8ih8i7ancrdjwr74pqj";
       };
     };
     "@types/formidable-1.0.31" = {
@@ -406,7 +406,7 @@ let
       version = "1.0.31";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/formidable/-/formidable-1.0.31.tgz";
-        sha512 = "dIhM5t8lRP0oWe2HF8MuPvdd1TpPTjhDMAqemcq6oIZQCBQTovhBAdTQ5L5veJB4pdQChadmHuxtB0YzqvfU3Q==";
+        sha512 = "3fx9xxa6d30fvgc3rkag182sjjpi43qdyzf9l6l050zi8hk2h4511m0pb59k7ha611khkjg7bamvxry5v1ig1zdb4lgsi15vzk4r23l";
       };
     };
     "@types/glob-7.1.1" = {
@@ -415,7 +415,7 @@ let
       version = "7.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
-        sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
+        sha512 = "3dhbgdkzpgx010hfgkhndrb094kbd3z6s4waicihnl0rp3jk0f0gs8vvzi84xzissrhml1dfgvbdhahzbh75nny1g6429fnqvlp866l";
       };
     };
     "@types/http-assert-1.5.1" = {
@@ -424,7 +424,7 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz";
-        sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==";
+        sha512 = "1cn6djbpsp6rky1sllzs6s311xz0zhzkwb38s68w83ij8whsygjr87ymzbp0x3gbxxnvhfa1xh1c5vxfan6q3dz2gbjgiv9kzphlq1w";
       };
     };
     "@types/istanbul-lib-coverage-2.0.1" = {
@@ -433,16 +433,16 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
-        sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==";
+        sha512 = "2b0br9w70brjpzw8ck05lr79v6hc4sdk1q2jq6qs55nw869ylsfwng48ghj0yjcm9skkn76g8ry8rdf2b35i2iynbh957k7m3cl64l5";
       };
     };
-    "@types/istanbul-lib-report-1.1.1" = {
+    "@types/istanbul-lib-report-3.0.0" = {
       name = "_at_types_slash_istanbul-lib-report";
       packageName = "@types/istanbul-lib-report";
-      version = "1.1.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz";
-        sha512 = "3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==";
+        url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
+        sha512 = "2parlinb7jrj152li79c6fs089y970f0s7yvzpkid8m4r8cgr9rn54bhg5ak7hsw6yvs9isx0diwjq20fb3dggnc5la2m6z0dfa0ld6";
       };
     };
     "@types/istanbul-reports-1.1.1" = {
@@ -451,70 +451,61 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
-        sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
+        sha512 = "0s1jhax5h82lqchx13zj07h3zpyhqzckbnc76yl3a864xy91x11s06q3b2nds5pi89059xxa2b57p45ja90da60hr1gay9i5w3275jj";
       };
     };
-    "@types/jest-24.0.15" = {
+    "@types/jest-24.9.1" = {
       name = "_at_types_slash_jest";
       packageName = "@types/jest";
-      version = "24.0.15";
+      version = "24.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest/-/jest-24.0.15.tgz";
-        sha512 = "MU1HIvWUme74stAoc3mgAi+aMlgKOudgEvQDIm1v4RkrDudBh1T+NFp5sftpBAdXdx1J0PbdpJ+M2EsSOi1djA==";
+        url = "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz";
+        sha512 = "3hkz9dl54is1hmjiscs6sdvmafpv192bb3qz6sq6yq862dhvl4i5qwqbikbkmcn1576jiccpvrc35kvlng132piy45hwm6j8lggrg8m";
       };
     };
-    "@types/jest-diff-20.0.1" = {
-      name = "_at_types_slash_jest-diff";
-      packageName = "@types/jest-diff";
-      version = "20.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest-diff/-/jest-diff-20.0.1.tgz";
-        sha512 = "yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==";
-      };
-    };
-    "@types/js-yaml-3.12.1" = {
+    "@types/js-yaml-3.12.2" = {
       name = "_at_types_slash_js-yaml";
       packageName = "@types/js-yaml";
-      version = "3.12.1";
+      version = "3.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.1.tgz";
-        sha512 = "SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==";
+        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz";
+        sha512 = "2x03h69ivbpj4lsrpq698phn44jbq45jq31zdr7k30phrfv8r0gxr35qi98qbqa6rb599k8nhgj7gwnvll5lw6ml5j263961vz6w8fh";
       };
     };
-    "@types/keygrip-1.0.1" = {
+    "@types/keygrip-1.0.2" = {
       name = "_at_types_slash_keygrip";
       packageName = "@types/keygrip";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.1.tgz";
-        sha1 = "ff540462d2fb4d0a88441ceaf27d287b01c3d878";
+        url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz";
+        sha512 = "0mqq8pzrfh058ha153xmyrbvcwpqq02z0ap89pw2rgfw9ll8c78dnxa0161i3pjhz7q0n7kizh73841637s4spc35qygnkkx96nk60q";
       };
     };
-    "@types/koa-2.0.48" = {
+    "@types/koa-2.11.2" = {
       name = "_at_types_slash_koa";
       packageName = "@types/koa";
-      version = "2.0.48";
+      version = "2.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.48.tgz";
-        sha512 = "CiIUYhHlOFJhSCTmsFoFkV2t9ij1JwW26nt0W9XZoWTvmAw6zTE0+k3IAoGICtjzIfhZpZcO323NHmI1LGmdDw==";
+        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.2.tgz";
+        sha512 = "2b2i4xy8zwfig5p744i5n32krsyvgbdjg1nzr2dawwykr9m6zp37l4g8m0mr7936yzd80yiwn2rmq4n6d1fcj6dkndnwd8dm2axwhyr";
       };
     };
-    "@types/koa-compose-3.2.4" = {
+    "@types/koa-compose-3.2.5" = {
       name = "_at_types_slash_koa-compose";
       packageName = "@types/koa-compose";
-      version = "3.2.4";
+      version = "3.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.4.tgz";
-        sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA==";
+        url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz";
+        sha512 = "02hhnlq6kz27g5y2vlnj3pk1rnm16gh2qb7hf3gpxrarxrz35pc40y0aiz34ncaiggpk8306yz9q0pwm75mc099m1cy9m04xbycdj87";
       };
     };
-    "@types/koa-router-7.0.41" = {
+    "@types/koa-router-7.4.0" = {
       name = "_at_types_slash_koa-router";
       packageName = "@types/koa-router";
-      version = "7.0.41";
+      version = "7.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.0.41.tgz";
-        sha512 = "WZwdCzMOvx2zA4MTinmrzqn66I87mE8S5lFgVY05/BVKULDi2Yup2Q2AOnw9vvaLME4IVJhWAeXpZjdZpKZDtg==";
+        url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.0.tgz";
+        sha512 = "1m9sk2skfl0vrggx53s3d3aw2ijphxkig9mjiw90016ljmz7hryyi3z74qxwmfvwg265k0cvhffq0c7j1aaxd210klsl9w2cf274hqa";
       };
     };
     "@types/koa-send-4.1.2" = {
@@ -523,7 +514,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/koa-send/-/koa-send-4.1.2.tgz";
-        sha512 = "rfqKIv9bFds39Jxvsp8o3YJLnEQVPVriYA14AuO2OY65IHh/4UX4U/iMs5L0wATpcRmm1bbe0BNk23TRwx3VQQ==";
+        sha512 = "10xa7f3s5sdnr0ks3gbdmd635qyj160yj9b737qagw4bqbzg0hbk3irnvih4y0dc3i5lg8m8jf4p0nx52gv4vwwyhvxn5avzwi8mymd";
       };
     };
     "@types/koa-static-4.0.1" = {
@@ -532,25 +523,25 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/koa-static/-/koa-static-4.0.1.tgz";
-        sha512 = "SSpct5fEcAeRkBHa3RiwCIRfDHcD1cZRhwRF///ZfvRt8KhoqRrhK6wpDlYPk/vWHVFE9hPGqh68bhzsHkir4w==";
+        sha512 = "3isnj0yxhf6xg0ymb317xj4a4fxdywk1xb0wadc5ghimab8m3q6vx3yv7zzyi84hx8wdm83fw65z108n0cdvnhij28hfw64jyvmqaj9";
       };
     };
-    "@types/koa-views-2.0.3" = {
+    "@types/koa-views-2.0.4" = {
       name = "_at_types_slash_koa-views";
       packageName = "@types/koa-views";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.3.tgz";
-        sha512 = "XLn//7qUUz2U9ZKXyHPwVIcQbZcW3phYTFXHGa1eW5BN88bi8n2fegvwJ+TokL2jRmRqBWwMB5p7Aab9iq1sZw==";
+        url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.4.tgz";
+        sha512 = "2bkbmh8mba0sm82lp0ividj4l09lbmdw1swfpf7kvdrc1q3710q1y57zysr0kpg3j4ngy4m4gf73a4cwqcjx1rsbmjb22wgp1a42qb8";
       };
     };
-    "@types/lodash-4.14.140" = {
+    "@types/lodash-4.14.149" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.140";
+      version = "4.14.149";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.140.tgz";
-        sha512 = "OU57uYCUUv9s8lgQTYuQlL6xkttWtz8VLCJSnt8ikla9+UXqMGJ8adCprSw7egJHSHwGvFpGhfpQDtHm/NQ3Cw==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz";
+        sha512 = "0jnvvzg602jxgjxl0fvi7iws4msvxvkff6mqvinyy0fcmxfxrpf46k30r6s0z7cb12r17sg0j6nbhg8s8xbvgf2rmgv0vvzkg6slcca";
       };
     };
     "@types/lodash.clonedeep-4.5.6" = {
@@ -559,7 +550,7 @@ let
       version = "4.5.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz";
-        sha512 = "cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA==";
+        sha512 = "2010qs0qh6d3vd77rhbwid7xvq511bgzp9vj4s3k2mlzqj78jwgb60dc84mdl4c38fz3bgx5shl6k57dm9mxbw90iq0s4lxpmi66kbh";
       };
     };
     "@types/mime-2.0.1" = {
@@ -568,7 +559,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz";
-        sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==";
+        sha512 = "35iimmp0d3zg4774qavnq9wh54dgnxfks59fks65f8q8d1008x00a1fmkdnxcs27znlc69mzbxp1frzpxx85c5w4x0ha5prgs0ks0hp";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -577,7 +568,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
-        sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
+        sha512 = "2ff7lcgph45bp2v5zsaxcy00rbh5n5h4njbicwhqilz66pd1lw7xfrpfl4i4ppfcx78zg9cp582b5fjif0dg7r18m44vxfksslvlyml";
       };
     };
     "@types/mkdirp-0.5.2" = {
@@ -586,25 +577,25 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz";
-        sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==";
+        sha512 = "177ihvl818zn0w93xipz417pm2cj2jzwnqs2khkj0k2dd7gs6ssv460affznfiii54a5l8qffigcq6xl74zsy6339c7cqpvkdd9r62k";
       };
     };
-    "@types/node-10.14.19" = {
+    "@types/node-10.17.17" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.14.19";
+      version = "10.17.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.14.19.tgz";
-        sha512 = "j6Sqt38ssdMKutXBUuAcmWF8QtHW1Fwz/mz4Y+Wd9mzpBiVFirjpNQf363hG5itkG+yGaD+oiLyb50HxJ36l9Q==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz";
+        sha512 = "3qw8j56g9078d7lahi73ifnpbk2x385diqgq1qgr62drcxbqgjnkbncy25nhdas05hwkfgzf69r2bj4x6mdwr1yrsrmbpagfr36g4w2";
       };
     };
-    "@types/node-12.0.8" = {
+    "@types/node-12.12.30" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.0.8";
+      version = "12.12.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.0.8.tgz";
-        sha512 = "b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz";
+        sha512 = "0rdl54cn0jbb3g2mlp09fywwf8d6plyspmiggr5rja9z93z4n606kj8srbgjk9f83wjxd9qmq20ixj2a90369whvrmsbsp4zhblqgxk";
       };
     };
     "@types/ora-3.2.0" = {
@@ -613,7 +604,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/ora/-/ora-3.2.0.tgz";
-        sha512 = "jll99xUKpiFbIFZSQcxm4numfsLaOWBzWNaRk3PvTSE7BPqTzzOCFmS0mQ7m8qkTfmYhuYbehTGsxkvRLPC++w==";
+        sha512 = "3xvxw1cs55wdb1ihpg8df91crz17agjwq79kd342s137kwkz823n8adxxrr74fnb1rn0ffsq9zacyz2cv642ljn41dj39ha2pvpsncf";
       };
     };
     "@types/range-parser-1.2.3" = {
@@ -622,16 +613,16 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz";
-        sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
+        sha512 = "0w59kqlbrl9ich2pv2xqanzmg9f51404zqsba9l8aimqd77zbrdxcyq9q13xfnhr0d1dz4mx6z7n976ryc2nk2gfch5p507njm5f0bv";
       };
     };
-    "@types/request-2.48.1" = {
+    "@types/request-2.48.4" = {
       name = "_at_types_slash_request";
       packageName = "@types/request";
-      version = "2.48.1";
+      version = "2.48.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz";
-        sha512 = "ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==";
+        url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz";
+        sha512 = "21mnsvbrykpzp1f1rd2ibk3nsgr8kyqikk5rdmq4qlkpf10gnpxp414hnvnbwjp27l5hvpc5l0fx0qhw20h7zi143qw6iwq68qpansv";
       };
     };
     "@types/serve-static-1.13.3" = {
@@ -640,7 +631,7 @@ let
       version = "1.13.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz";
-        sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==";
+        sha512 = "39fm32fi9qpb1bz4q399y9rzv02ywml2m1qmclyr1ckrmy4vdn8nv5f9986ckn19yapxif0ljs0gc717xd7dmssjnh37qrxkp1d56m2";
       };
     };
     "@types/stack-utils-1.0.1" = {
@@ -649,25 +640,25 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz";
-        sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==";
+        sha512 = "29j551rin7d7ygf7pd95db51b4jf48vsjnl03l4djdi6sh5jsk2f4kxwf21ixzj92mwq8y4cfhbcihwppxfkm4pkb5sqiv91a1833cp";
       };
     };
-    "@types/tough-cookie-2.3.5" = {
+    "@types/tough-cookie-2.3.6" = {
       name = "_at_types_slash_tough-cookie";
       packageName = "@types/tough-cookie";
-      version = "2.3.5";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz";
-        sha512 = "SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==";
+        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz";
+        sha512 = "0yla1v86agvz3wlkdjcn7i4hpgb02nwjsafg0xkdkclbiil08fkxjj9c4q4yj785ps3gdc5p3sqx2y0rajg1v6x068ih418g4r42wy0";
       };
     };
-    "@types/underscore-1.9.3" = {
+    "@types/underscore-1.9.4" = {
       name = "_at_types_slash_underscore";
       packageName = "@types/underscore";
-      version = "1.9.3";
+      version = "1.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.3.tgz";
-        sha512 = "SwbHKB2DPIDlvYqtK5O+0LFtZAyrUSw4c0q+HWwmH1Ve3KMQ0/5PlV3RX97+3dP7yMrnNQ8/bCWWvQpPl03Mug==";
+        url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.4.tgz";
+        sha512 = "1czi6sv1hf482wlzsl9an3s18r033aiy54airz2558f1g32ppkz3jy44mnhzwyi9g87miwggp4l8yfgc95d4qg6qka6ywq2q48dcc8a";
       };
     };
     "@types/websocket-0.0.40" = {
@@ -676,34 +667,34 @@ let
       version = "0.0.40";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/websocket/-/websocket-0.0.40.tgz";
-        sha512 = "ldteZwWIgl9cOy7FyvYn+39Ah4+PfpVE72eYKw75iy2L0zTbhbcwvzeJ5IOu6DQP93bjfXq0NGHY6FYtmYoqFQ==";
+        sha512 = "0ajm2lr5mbfin316js7lzg3fvvhyd78ms1y929ppwqbg1fv6k9qnbcbz472p637xx29azlgiy3l0zzv4zvcmi9f7df5z0l80mkmxnwm";
       };
     };
-    "@types/ws-6.0.3" = {
+    "@types/ws-6.0.4" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "6.0.3";
+      version = "6.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz";
-        sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz";
+        sha512 = "318vy2l4c8cw6nm061l15pp3ss2llblyy2y7a8w92vp6da3n7s3iiha5shpxrmc5c3gv0ap0vq9x10vv64g5np1xggdlnwrnigyp4ry";
       };
     };
-    "@types/yargs-13.0.3" = {
+    "@types/yargs-13.0.8" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "13.0.3";
+      version = "13.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz";
-        sha512 = "K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz";
+        sha512 = "36csm2rf0wi6cj680qswwvyl3lvh88ayl578165z8d1hxh6saswzn2g2zl5v20c08jg9rdjhqwwi336yj0jh6l76fy0yldv04pwf2sw";
       };
     };
-    "@types/yargs-parser-13.1.0" = {
+    "@types/yargs-parser-15.0.0" = {
       name = "_at_types_slash_yargs-parser";
       packageName = "@types/yargs-parser";
-      version = "13.1.0";
+      version = "15.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz";
-        sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==";
+        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
+        sha512 = "35k8bcpm51w11xbny2a8gqgz12pdn3pw8w0jf36jzlkcmpkrqlqnqf9gbrwj9sah0pv05clzlgk2a7kvnr9q3h1za4rbw9dzxdc23ql";
       };
     };
     "@webassemblyjs/ast-1.8.5" = {
@@ -712,7 +703,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz";
-        sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==";
+        sha512 = "00rj3q9igpw0cihw48xx7qpmmv64yy821bvy52dqxqc7w8kq2hga2f2v2g5j83is5kdz4hfdla4a3h6q5lwpdshxynrzsqr0ag1z4v8";
       };
     };
     "@webassemblyjs/floating-point-hex-parser-1.8.5" = {
@@ -721,7 +712,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz";
-        sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==";
+        sha512 = "2shwdw16zcsl2rkvyc8jlgcs5564si8m64b0v9f8ssmrxmrd84c82brnwbyblhynqldvyr8f3fl9pjvfgzw0phz0qm5mfzbc7svp7zn";
       };
     };
     "@webassemblyjs/helper-api-error-1.8.5" = {
@@ -730,7 +721,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz";
-        sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==";
+        sha512 = "363avw28ls7abwqcy7wvhdr853pccnzd9b58i1k7l1aax5cads499b494i1lwj4nlb8ksypy3nchr97i9y5r57k91dag7ig7fgyvbv5";
       };
     };
     "@webassemblyjs/helper-buffer-1.8.5" = {
@@ -739,7 +730,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz";
-        sha512 = "Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==";
+        sha512 = "3yxqbq2lizijhxxr5ics6i0c5hc6c00fw4dqlqiq669mr1b0zalzs0670psbddmd4sq3yks567n1wr00l5flg6lwf34xlcjfgr92ba6";
       };
     };
     "@webassemblyjs/helper-code-frame-1.8.5" = {
@@ -748,7 +739,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz";
-        sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==";
+        sha512 = "0ljgrac16148nv6nbzk5jisalyjx3pgm4vdcbzympzn143367w1k82lvpr7iwrslildvi6ck1jj9vjqy8fj2fkyli6qhr4v5dsil02m";
       };
     };
     "@webassemblyjs/helper-fsm-1.8.5" = {
@@ -757,7 +748,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz";
-        sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==";
+        sha512 = "2imw7y018r4hyvyaaw2cpvrv3qp9bv4vg816l2yvl79xwd2dnplmsmmwsv3vmy2b8mvdjzq0dknkd2i6sjbgpzgn4ychicfqvz9f6wi";
       };
     };
     "@webassemblyjs/helper-module-context-1.8.5" = {
@@ -766,7 +757,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz";
-        sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==";
+        sha512 = "3gfr1zif7fxlfbpfkcqncq8vmrimncn6pmvh0x7av1pb82a9vhhahpy2mkrgdrc3w62gw0lbbhj4zwgrxzgabaf246vadx6gvdl3vgw";
       };
     };
     "@webassemblyjs/helper-wasm-bytecode-1.8.5" = {
@@ -775,7 +766,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz";
-        sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==";
+        sha512 = "10klm32913whkdnjk7jgf262lgl6wqv9qkw6ssjg1lmlzwa0qbn159l962j6pfx3idzaf4w014gmcy17wssdri6v1xxj3dph4qiivha";
       };
     };
     "@webassemblyjs/helper-wasm-section-1.8.5" = {
@@ -784,7 +775,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz";
-        sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==";
+        sha512 = "2s3d3bh4wrizs5y2p480qnxs5m1hx9pfkppa38f7mk9w49cfq6h0gq5c0q79aqrl4jpyzqzmrsdbyx9562q1bb547mm9y8i7kgkqpam";
       };
     };
     "@webassemblyjs/ieee754-1.8.5" = {
@@ -793,7 +784,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz";
-        sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==";
+        sha512 = "3g8bqb43s1n4nrzn5f7vrhdpi88mnr49xpwcq5jb0ql7baslh3cxni2rijp0hng7daai5d0n7dnn0llyazis2mckwzvcaggi90sz839";
       };
     };
     "@webassemblyjs/leb128-1.8.5" = {
@@ -802,7 +793,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz";
-        sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==";
+        sha512 = "3ncjzk3d9pjnjd0vfagpbaa02jpmgapq2hyamzpfpaidshgcyqbz6rfhfp3arvjcdxpws4d9bi0wf552pzr9vs9i8rv4y159jwi8mm6";
       };
     };
     "@webassemblyjs/utf8-1.8.5" = {
@@ -811,7 +802,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz";
-        sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==";
+        sha512 = "27hlgvdfxw9arxzrdrnfd7zmzp953439jyjh8acb3g2nm0ysr9il2xl3v0dklr9yvv6jkmj7s9yi29l2izgghypxqvjrblhv5zf1g2k";
       };
     };
     "@webassemblyjs/wasm-edit-1.8.5" = {
@@ -820,7 +811,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz";
-        sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==";
+        sha512 = "3lzdvq0vwmp3civ70pdrr3970i7viiywnwry8ysmvmfbd4zhkffs4d5vyy5ibvxmmass9nlmvs3cd8fwh633yx8prr0wnqc5wrl9383";
       };
     };
     "@webassemblyjs/wasm-gen-1.8.5" = {
@@ -829,7 +820,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz";
-        sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==";
+        sha512 = "1d2nc7b2zjdyaxyrvxm5mck8aj0p95dznknn8j8wi5d3ah55zpf2kp18kk79l55fbb7k9vhri74yqbks9ay9qrwbh12si6l897l29h4";
       };
     };
     "@webassemblyjs/wasm-opt-1.8.5" = {
@@ -838,7 +829,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz";
-        sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==";
+        sha512 = "3npgmsia24ap1yhdpdn1c9bwdq71glsxdyn7kyphz5x4gnxl97v04iwgcsaj2k1di5vgq1m8mlqfrllxk4fvviwl8xd11ylxyc3dahw";
       };
     };
     "@webassemblyjs/wasm-parser-1.8.5" = {
@@ -847,7 +838,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz";
-        sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==";
+        sha512 = "2bprpybs2qm4m1fbdd877aqj8s153j4gg32bf8qnmigqnjcfwl6mxmbzb90xq7qx6zvwqniv4rirgd40b4c2qab6bfdgsjk9xh14bd6";
       };
     };
     "@webassemblyjs/wast-parser-1.8.5" = {
@@ -856,7 +847,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz";
-        sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==";
+        sha512 = "2r6vw7gg4ij9mjl2f564mwnjsrn7nzsvr1gcrpch0f87xayvjky82f4cn6sh0d8714fpqqqrfq6a1797jnnqs2xidsp2n4abkac59bm";
       };
     };
     "@webassemblyjs/wast-printer-1.8.5" = {
@@ -865,7 +856,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz";
-        sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==";
+        sha512 = "0r5hhrrqk2ww81xjvbxjglp0sh6igz55pjy45ly4786kq3b723vlhqsydr7j87sb3zyww9zvjil08jmk8dcr2978zpmk1h47sj38if3";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -874,7 +865,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
-        sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==";
+        sha512 = "1wczr2c331gq4q6w6nsiylqs6q6dp0j2lvc231826gfrdhr3lcimmyhswp4g0b5p7k7k525gq6gh0wpg65sjlp2s4f0n6ww18m2fzqd";
       };
     };
     "@xtuc/long-4.2.2" = {
@@ -883,16 +874,16 @@ let
       version = "4.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz";
-        sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==";
+        sha512 = "00n8akj5s578b8r7vcdz817cnmga21vznz895kygvb0j780968szj171f91b0bgvz880ff7zq025q4087cgxb2fqpyg01sgil2ymq9n";
       };
     };
-    "abab-2.0.2" = {
+    "abab-2.0.3" = {
       name = "abab";
       packageName = "abab";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz";
-        sha512 = "2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==";
+        url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz";
+        sha512 = "192f58ba6nxqhzyxlp9dlj156ry71s8mlfvgbg37kj2slffixrwj2s3zwpnyyhy4mh5m7sy3idir119mk518hjhii6skd9djwz77hdn";
       };
     };
     "abbrev-1.1.1" = {
@@ -901,7 +892,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
       };
     };
     "accepts-1.3.7" = {
@@ -910,7 +901,7 @@ let
       version = "1.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
-        sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
+        sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2";
       };
     };
     "acorn-3.3.0" = {
@@ -931,31 +922,31 @@ let
         sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
-    "acorn-5.7.3" = {
+    "acorn-5.7.4" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.7.3";
+      version = "5.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz";
-        sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz";
+        sha512 = "0k4pivh1yagdalb26khf36wscaxi3kbv6w48zg5jsll2scl2wq4f4gxcq9ggnzf37l4y446n4a3bmr85wx0fnwk89pvp1n1drabwgyl";
       };
     };
-    "acorn-6.3.0" = {
+    "acorn-6.4.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "6.3.0";
+      version = "6.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz";
-        sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz";
+        sha512 = "1s65pswzbh0155lsrdln08lifgs34zb53vkfl8fvxwnfmrc84vj01m9b31w4n846k7vk8lr5ns6wqf0fxc8xz98vkihldxsgn9ksl35";
       };
     };
-    "acorn-dynamic-import-4.0.0" = {
-      name = "acorn-dynamic-import";
-      packageName = "acorn-dynamic-import";
-      version = "4.0.0";
+    "acorn-7.1.1" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz";
-        sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz";
+        sha512 = "29c8jlhwnfbnqa2s1v593lcpksv4hl56lywss4gy6w0mwmhx4ydf2n7var8bhcf39nm9asph0ybnf1hkw0s0j91qi7r99ir01v7pmv9";
       };
     };
     "acorn-globals-3.1.0" = {
@@ -973,7 +964,7 @@ let
       version = "4.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz";
-        sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==";
+        sha512 = "38gm4qa9sr1znbnlv4w33f1zrqsvldv66yqlflsc7r5ifxwsnpizsa93yxd3d1a8wy08j424smizrywkzam36z4jpsf0ixm3l9d0mvj";
       };
     };
     "acorn-walk-6.2.0" = {
@@ -982,16 +973,34 @@ let
       version = "6.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz";
-        sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
+        sha512 = "1q392w8cii4phm8maghmlfjzgzmwhd2n0xadah315lqflygnaf5g7gn6lhbdfszf1sdqx5j4bik89qa6zg03n8cfj1b6w7my74yrszd";
       };
     };
-    "ajv-6.10.0" = {
+    "acorn-walk-7.1.1" = {
+      name = "acorn-walk";
+      packageName = "acorn-walk";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz";
+        sha512 = "10s7pz9c2jqw7sjmkkwfb6kyyfgb7qqpmz2gc0fq9phhmfknyw029x1jbw0cwi47wbacpwkw65601arnid2l95lmz0xbzv6ddilznf1";
+      };
+    };
+    "aggregate-error-1.0.0" = {
+      name = "aggregate-error";
+      packageName = "aggregate-error";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz";
+        sha1 = "888344dad0220a72e3af50906117f48771925fac";
+      };
+    };
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.10.0";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz";
-        sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g";
       };
     };
     "ajv-errors-1.0.1" = {
@@ -1000,7 +1009,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz";
-        sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==";
+        sha512 = "24kqslzd256yc0dckqcg8n1rngyfzdflfznp55hnhkv3rhyzirjhpj31rgiiryyjlw8a64x9ba7hdqkpiwf6jpllwyyyhr7zqxmy90c";
       };
     };
     "ajv-keywords-3.4.1" = {
@@ -1009,7 +1018,7 @@ let
       version = "3.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz";
-        sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==";
+        sha512 = "1lyjmfg70gijr3gjs63qmawfazm5mz8vb1bknyy1vzdif6a30vi3dpwkrlv4j4i5dg56jd3fliqgfq0rxbm98a42jxbgnyxmdn65va4";
       };
     };
     "align-text-0.1.4" = {
@@ -1027,7 +1036,7 @@ let
       version = "3.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz";
-        sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==";
+        sha512 = "2n6gl8300ihln724832pvvzrii5c4qjli9xc16s632ywnyrfbv1kmcqg133v25583hqhflpsfi2yhkjy6nhzj0si5v36zhym0cifxc4";
       };
     };
     "ansi-escapes-3.2.0" = {
@@ -1036,7 +1045,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
-        sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
+        sha512 = "12pp3q4c44hrzr2xl9vqjigwjn2wr1j0lhvshl75z5m6a97hqkd047sdcma1inzjvxhpkzk1qkvag7cw3sya32s9wsfasr6xsnnj63h";
       };
     };
     "ansi-html-0.0.7" = {
@@ -1072,7 +1081,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+        sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm";
       };
     };
     "ansi-styles-2.2.1" = {
@@ -1090,7 +1099,7 @@ let
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
       };
     };
     "any-promise-1.3.0" = {
@@ -1108,7 +1117,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz";
-        sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
+        sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6";
       };
     };
     "aproba-1.2.0" = {
@@ -1117,7 +1126,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
       };
     };
     "argparse-1.0.10" = {
@@ -1126,7 +1135,7 @@ let
       version = "1.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
       };
     };
     "arr-diff-4.0.0" = {
@@ -1144,7 +1153,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==";
+        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
       };
     };
     "arr-union-3.1.0" = {
@@ -1162,7 +1171,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz";
-        sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==";
+        sha512 = "3aqfm29ppm74q3q0xlxldmf1a3vbkl9a6fbljf211cfgc7asjbkdglbpr6a5a04r0rvnk7y709k6nvaqa2nb3df1ipgqfh2hl1v2jsf";
       };
     };
     "array-equal-1.0.0" = {
@@ -1189,7 +1198,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz";
-        sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==";
+        sha512 = "2swmvaw9xcvzv29i247057pq4khyss7gnc0p244v1l2g2p2xpsr47m0dfaf54yscd3fc9njh3kvwly99w8shvd9p5fq6nvwwmqg7mw4";
       };
     };
     "array-union-1.0.2" = {
@@ -1234,7 +1243,7 @@ let
       version = "0.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
-        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
+        sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g";
       };
     };
     "asn1.js-4.10.1" = {
@@ -1243,7 +1252,7 @@ let
       version = "4.10.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
-        sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
+        sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7";
       };
     };
     "assert-1.5.0" = {
@@ -1252,7 +1261,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz";
-        sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==";
+        sha512 = "1n2xh5m359gm4my50j2206n32q2h044lqrl8h122gjn41fizlrh32j1lj7wqfix1iblyvi7zvdgvzbf97f840lr17vfk8ph1imj0fqh";
       };
     };
     "assert-plus-1.0.0" = {
@@ -1279,16 +1288,16 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
-        sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
+        sha512 = "0ga6b0jymkw4jrfvjilhfrddml29l1nrvj7r57d140p7rn31mmbni4j9z343v2zzz2zcnlsr2s17kmlgjkyvs9pxrf88an11pm9y77r";
       };
     };
-    "async-1.5.2" = {
+    "async-2.6.3" = {
       name = "async";
       packageName = "async";
-      version = "1.5.2";
+      version = "2.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
-        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+        url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz";
+        sha512 = "1g679kw2qqpqx1yd4s778r8rw3cv9qwmib5x3klk64kcl5ndw71bljcpav5jkk6grizlpvrqszsbs6fkmnlvcq5fnz2q33mrnb6zyfd";
       };
     };
     "async-each-1.0.3" = {
@@ -1297,16 +1306,16 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz";
-        sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==";
+        sha512 = "00vbg0zvq40mmvzz9q3klkk5ly5jh75kc8s3bf7j2ff9zivla3wlc8d622gajjq4w66mln5570dc936my6wh08ippfj5jagj51s3xfg";
       };
     };
-    "async-limiter-1.0.0" = {
+    "async-limiter-1.0.1" = {
       name = "async-limiter";
       packageName = "async-limiter";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
-        sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
+        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
+        sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj";
       };
     };
     "asynckit-0.4.0" = {
@@ -1324,7 +1333,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz";
-        sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
+        sha512 = "1rbq2rl2ry0y3nkqs3013vgjrnzf03609rg58092r8zkvzzn6v15grhv2yhzb48sz74zmjcj8ix7f5whrfp4zvsxyzrh64fhs9awvjs";
       };
     };
     "awesome-typescript-loader-5.2.1" = {
@@ -1333,7 +1342,7 @@ let
       version = "5.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz";
-        sha512 = "slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g==";
+        sha512 = "3b9ng7k3l7342hb2qqggp8y84ifzgb7ncjwjjn770gy7fda0c9aq897i7c4gn4w8l02xg88pji4pad46wr6j5755wmwl1q9w3lglnxj";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -1345,22 +1354,22 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.8.0" = {
+    "aws4-1.9.1" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.8.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
-        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0";
       };
     };
-    "axios-0.19.0" = {
+    "axios-0.19.2" = {
       name = "axios";
       packageName = "axios";
-      version = "0.19.0";
+      version = "0.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz";
-        sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==";
+        url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
+        sha512 = "0fa6ngb4rkbyp5r4ccjgs2ykdbz8i2hcr41av59jicgq6mfva739kcd6n5dqzj3hsx7d4qi201g93li3qddn14bz9qvh76irgj2cf3y";
       };
     };
     "babel-6.23.0" = {
@@ -1387,7 +1396,7 @@ let
       version = "6.26.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
-        sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==";
+        sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a";
       };
     };
     "babel-generator-6.26.1" = {
@@ -1396,7 +1405,7 @@ let
       version = "6.26.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz";
-        sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==";
+        sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz";
       };
     };
     "babel-helper-builder-binary-assignment-operator-visitor-6.24.1" = {
@@ -1507,22 +1516,13 @@ let
         sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
       };
     };
-    "babel-jest-24.8.0" = {
-      name = "babel-jest";
-      packageName = "babel-jest";
-      version = "24.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz";
-        sha512 = "+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==";
-      };
-    };
     "babel-jest-24.9.0" = {
       name = "babel-jest";
       packageName = "babel-jest";
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz";
-        sha512 = "ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==";
+        sha512 = "0iziajgh09ldyj02pmxdkxhzy1wj6n84az4l30p7pllaxlbz9g678q59b0309wfihbj82n4v85pi66n9crksz0f6chy2dx2zisrvnwy";
       };
     };
     "babel-messages-6.23.0" = {
@@ -1549,7 +1549,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz";
-        sha512 = "5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==";
+        sha512 = "1kj4z39mavs3h7wmb3nwrvhjddb1r138q61nisldfzcb52aikgi0hgg7yvql7xlvy7pxygx7wka7gimvcvbdhjwidwcn0qj8l5n3fp4";
       };
     };
     "babel-plugin-jest-hoist-24.9.0" = {
@@ -1558,7 +1558,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz";
-        sha512 = "2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==";
+        sha512 = "1gvgnf01laddy7cnxb2ggd1qg1zlsj3s72azdvib6vi9sqmbc7snzhxy6xw4dsmpypb64ncqxlk1mmasy0sycqhs53bk9qmzzc00hyq";
       };
     };
     "babel-plugin-syntax-async-functions-6.13.0" = {
@@ -1702,7 +1702,7 @@ let
       version = "6.26.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz";
-        sha512 = "CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==";
+        sha512 = "3sy41x9jlzyzy6wzsj60asahzm6hg9gmr6r1cckdqhzmvckl7jbfb5zwr0nslndnhqgjwdmvxsah41h8v8286hjqbfbhxn4w4w52pq9";
       };
     };
     "babel-plugin-transform-es2015-modules-systemjs-6.24.1" = {
@@ -1828,7 +1828,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz";
-        sha512 = "9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==";
+        sha512 = "0g45grnsjds9va8zwb68gpm4ngzmnb351bbvphnmis7bifsh2ny2c00bwah57fn1yv87fs69hriimbysbm15dpsvfbpf3lazdlpdr7l";
       };
     };
     "babel-preset-jest-24.9.0" = {
@@ -1837,7 +1837,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz";
-        sha512 = "izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==";
+        sha512 = "01858ghqwnl2b16rmrwwf6w6z3awwvxm22ld8vnfghf6lil3pkxdjjpfn70iib4plm4ynwrfrsiyr0gf3qxjzgi8k9wfk1q26xd8d4b";
       };
     };
     "babel-register-6.26.0" = {
@@ -1891,7 +1891,7 @@ let
       version = "6.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz";
-        sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==";
+        sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb";
       };
     };
     "balanced-match-1.0.0" = {
@@ -1909,7 +1909,7 @@ let
       version = "0.11.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz";
-        sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
+        sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5";
       };
     };
     "base64-js-1.3.1" = {
@@ -1918,7 +1918,16 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
-        sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
+        sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q";
+      };
+    };
+    "base64url-3.0.1" = {
+      name = "base64url";
+      packageName = "base64url";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz";
+        sha512 = "3hb3l768r5h0x6z47fw1kn6v50cx9xncmm6yzbhvrvgja0j26fwvhpyh8ppwnf1c2j8g62c912l7cq5h755fpdiafqhg4yxplz59gca";
       };
     };
     "batch-0.6.1" = {
@@ -1945,7 +1954,7 @@ let
       version = "6.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz";
-        sha512 = "BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==";
+        sha512 = "0dhyz488lykv8avkn9y738mnlkgkffxwsp5xmh9sffsh1xxdnigsd9a6l01vj0bdzqdmzqq0pbw31qh9x06fll38i7s19z2h9mljq06";
       };
     };
     "big.js-5.2.2" = {
@@ -1954,7 +1963,7 @@ let
       version = "5.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz";
-        sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
+        sha512 = "2cin34lhbrlligarblnrqnl6f419mkpqd4abjms0y1fk1mxzb6rqvh1sg0zif7bgskirhh6shxnqa444syk4cf87fmndil954xzc8mz";
       };
     };
     "binary-extensions-1.13.1" = {
@@ -1963,16 +1972,25 @@ let
       version = "1.13.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz";
-        sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
+        sha512 = "0drjfs8xmgc4rfi8nbbx7adsinnc5m0nc96dw3r3gars8zvg1kzay5a7a5s3islf13wmw7q9v15i7d2gdghs1lp6rh2wl6x80hcqzjj";
       };
     };
-    "bluebird-3.5.5" = {
+    "bindings-1.5.0" = {
+      name = "bindings";
+      packageName = "bindings";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz";
+        sha512 = "24xpa35sym31k1x9hs78jbmsh58yx7ldkn03d4g5qhmvm0bi5cwqvpn2s6r8hkwhks5mhm81gz878gbp5g9b2s7zniy7gm1z6vvysm7";
+      };
+    };
+    "bluebird-3.7.2" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.5.5";
+      version = "3.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
-        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
+        sha512 = "2v12rs2wvv94hrlyv0nadxn9x11796k9mk7a8vg0bqsry8m2pbyy9dribalwikh34qkk3rp6gnis849y5z9x5mxzbbdgkfhc3l674sy";
       };
     };
     "bn.js-4.11.8" = {
@@ -1981,7 +1999,7 @@ let
       version = "4.11.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
-        sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==";
+        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
       };
     };
     "body-parser-1.19.0" = {
@@ -1990,7 +2008,7 @@ let
       version = "1.19.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz";
-        sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==";
+        sha512 = "2rl5ww96fwgmxdqhqmnknsaafw44vsr2xz7vf7nax8qz9jy8bmmdyawcy6yfny0wm7pi8m2jssakzjc1nin8z8207kv0gclpnrhy4bn";
       };
     };
     "bonjour-3.5.0" = {
@@ -2008,7 +2026,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
       };
     };
     "braces-2.3.2" = {
@@ -2017,7 +2035,7 @@ let
       version = "2.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz";
-        sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
+        sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8";
       };
     };
     "brorand-1.1.0" = {
@@ -2029,13 +2047,13 @@ let
         sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
-    "browser-process-hrtime-0.1.3" = {
+    "browser-process-hrtime-1.0.0" = {
       name = "browser-process-hrtime";
       packageName = "browser-process-hrtime";
-      version = "0.1.3";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
-        sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==";
+        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
+        sha512 = "2ijqy6cba233jd04p2sd4a372z807f9rsykxzbf3sn50102h7nv57bid0bldh9is9c4yajgdjwlif9xpnz5xsx06clij6ipq9wm93pn";
       };
     };
     "browser-resolve-1.11.3" = {
@@ -2044,7 +2062,7 @@ let
       version = "1.11.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz";
-        sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==";
+        sha512 = "1slq1pnm0b2903am1rl17iczlsl08sq4rckkr5fgkchgzfac13kiibwdk08yy2m62lgir8dmj9d61vil8q0vrm1d2mzw1qn2vaf443v";
       };
     };
     "browserify-aes-1.2.0" = {
@@ -2053,7 +2071,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
-        sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==";
+        sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v";
       };
     };
     "browserify-cipher-1.0.1" = {
@@ -2062,7 +2080,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
-        sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==";
+        sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h";
       };
     };
     "browserify-des-1.0.2" = {
@@ -2071,7 +2089,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz";
-        sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
+        sha512 = "3j1gv3firnsbjppm47ldxbav9rmh3plq026zn728wvhgf19i4r7kxzyyj7hpibhjv61lcm9i4b869yy90c8hfj7w8rmr17p2zbhwah6";
       };
     };
     "browserify-rsa-4.0.1" = {
@@ -2098,7 +2116,7 @@ let
       version = "0.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
-        sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
+        sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
       };
     };
     "browserslist-3.2.8" = {
@@ -2107,7 +2125,7 @@ let
       version = "3.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz";
-        sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==";
+        sha512 = "00i65frm5jkbv8pzc13i02fzd39q0ahh653zzjzhq35pz6p0idajfjqg1b7mnnlvxymihcpmd1cfhwaj51hnqjmh4alrg8sjrq6hxaq";
       };
     };
     "bs-logger-0.2.6" = {
@@ -2116,25 +2134,25 @@ let
       version = "0.2.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz";
-        sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==";
+        sha512 = "2i44nrigqkrnr7acqqppsmv9y97b55vma5fwg30jdhy9m4pc13rb3bpfxm8r560fp81605chdi27mx8dpy3mji3hwxhfvk6ih507px5";
       };
     };
-    "bser-2.1.0" = {
+    "bser-2.1.1" = {
       name = "bser";
       packageName = "bser";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz";
-        sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==";
+        url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz";
+        sha512 = "30jby01rqjgx78xnzyysjav12c0cj8dcwd40wprcfh1jn3768cdkb834q1zyf3wivhifi47xqa7jai7x16m1jv1mq4g40f69ws56341";
       };
     };
-    "buffer-4.9.1" = {
+    "buffer-4.9.2" = {
       name = "buffer";
       packageName = "buffer";
-      version = "4.9.1";
+      version = "4.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
-        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz";
+        sha512 = "1d85syv6ashl8f3a6h553d185cg3vq6nhjqnc80vr2z3bak0c9xbm1jawfk9zs43xz34yih6h6j3bhb3njkahdqpji12fsc4kfsmby6";
       };
     };
     "buffer-from-1.1.1" = {
@@ -2143,7 +2161,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
-        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+        sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri";
       };
     };
     "buffer-indexof-1.1.1" = {
@@ -2152,7 +2170,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz";
-        sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==";
+        sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3";
       };
     };
     "buffer-xor-1.0.3" = {
@@ -2173,6 +2191,15 @@ let
         sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
       };
     };
+    "byline-5.0.0" = {
+      name = "byline";
+      packageName = "byline";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz";
+        sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1";
+      };
+    };
     "bytes-3.0.0" = {
       name = "bytes";
       packageName = "bytes";
@@ -2188,7 +2215,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz";
-        sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
+        sha512 = "073ccjmvxf726gcgzy0pksvi8x8r51dq6hyv69sc75ynrin7anwk9q3sqhbbbjhqjjrmq42s5f5gdbcgj2jxai6ldpyq6y2ny78payd";
       };
     };
     "cacache-10.0.4" = {
@@ -2197,7 +2224,7 @@ let
       version = "10.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz";
-        sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==";
+        sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f";
       };
     };
     "cacache-12.0.3" = {
@@ -2206,7 +2233,7 @@ let
       version = "12.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz";
-        sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==";
+        sha512 = "0zsyrn5azk0hm2mhfsa2wwz1g66wis9f7ifxl2sphms1i91z75mfmky892g7c538slj94fgd8nlbjnw5irki49vn5gfl586f5ynd9wj";
       };
     };
     "cache-base-1.0.1" = {
@@ -2215,7 +2242,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz";
-        sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
+        sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0";
       };
     };
     "cache-content-type-1.0.1" = {
@@ -2224,7 +2251,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz";
-        sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==";
+        sha512 = "209nv86cqszi98b5mij2w84m5ixnnwxh211nv0zjgfi46l52fp437hqznnc0ckm5nlgr4labfn16wxa7s7lmnaac4vdwliqb9krzar0";
+      };
+    };
+    "cacheable-request-2.1.4" = {
+      name = "cacheable-request";
+      packageName = "cacheable-request";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz";
+        sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d";
       };
     };
     "callsites-3.1.0" = {
@@ -2233,7 +2269,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz";
-        sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
+        sha512 = "1ljrfqkxsjdvl02qlx1xdsw8csg4az6dkwvlk0zmcz7x3b6q3kbggd8i3ai8jcjicabdsqkhvpjy0898xcdf21m42ajyrggql167h1z";
       };
     };
     "camelcase-1.2.1" = {
@@ -2260,16 +2296,16 @@ let
       version = "5.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
-        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
+        sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg";
       };
     };
-    "caniuse-lite-1.0.30000997" = {
+    "caniuse-lite-1.0.30001035" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30000997";
+      version = "1.0.30001035";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000997.tgz";
-        sha512 = "BQLFPIdj2ntgBNWp9Q64LGUIEmvhKkzzHhUHR3CD5A9Lb7ZKF20/+sgadhFap69lk5XmK1fTUleDclaRFvgVUA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz";
+        sha512 = "0nv07k5fhwwhak7xbp0kf2z0v2bpjicyrs11c9d14cipzzgcx6has5910iwc7yhh3mja5h52d93x3hrmfam66yk27agdqw09f172mhb";
       };
     };
     "capture-exit-2.0.0" = {
@@ -2278,7 +2314,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz";
-        sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==";
+        sha512 = "3m6md2j1rsn26hijf0yfbbfnx6w2jrrqhr2b2xwjc9lyzvypidyz5krczc9wb04z1vq4mgb759ljwn7iggiiigijzhp38lk162zy91y";
       };
     };
     "caseless-0.12.0" = {
@@ -2314,7 +2350,7 @@ let
       version = "2.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
-        sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
+        sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j";
       };
     };
     "character-parser-2.2.0" = {
@@ -2332,7 +2368,7 @@ let
       version = "8.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz";
-        sha512 = "YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==";
+        sha512 = "30ql79azwkvqg2pfwvc0zp51fbwpijfbxdrnw5v5vsd3j2k6bzi5d78p78b877fzrji6clkw284pdakba5jg7dvmjwnx60lg1k8m5v2";
       };
     };
     "chokidar-2.1.8" = {
@@ -2341,16 +2377,16 @@ let
       version = "2.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz";
-        sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
+        sha512 = "21d2yf3364v025ivy6ak1bh61qvvq9llryh8c1rhvrif1kalx0j996x8m0qs717cgl97q5c40awyv8gi8hbmpgfpl6zvkff6xmm8rk6";
       };
     };
-    "chownr-1.1.3" = {
+    "chownr-1.1.4" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
-        sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc";
       };
     };
     "chrome-trace-event-1.0.2" = {
@@ -2359,7 +2395,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz";
-        sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==";
+        sha512 = "06mh145f12ppkxn7xdzrvh7rrjg9c770rqai08m8r5i31br1ihc96i63dyn0c4arfl1hl0za33kzy5i09x4agz77c11xv7hb33z7vzm";
       };
     };
     "ci-info-2.0.0" = {
@@ -2368,7 +2404,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz";
-        sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==";
+        sha512 = "04yh5kqsx5akwc3rlcwqrvz3lrb8mak15ysxan17hw9pp00kmf20m8d9dpbnkq612wc1wwvjzcci1wgivd8cbak5j7dzl6rv89bplp6";
       };
     };
     "cipher-base-1.0.4" = {
@@ -2377,7 +2413,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==";
+        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
       };
     };
     "class-utils-0.3.6" = {
@@ -2386,16 +2422,25 @@ let
       version = "0.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
-        sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
+        sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58";
       };
     };
-    "clean-css-4.2.1" = {
+    "clean-css-4.2.3" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "4.2.1";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz";
-        sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz";
+        sha512 = "0ad50l577m99sgpcdd49zspq8h9n9i3hhngapg9y5q76s7zwdz3hmaw2kc2jg30lk4z3wlyp9kgiyg71dvg0fg89g1xyr3qvq61dhsm";
+      };
+    };
+    "clean-stack-1.3.0" = {
+      name = "clean-stack";
+      packageName = "clean-stack";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz";
+        sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
       };
     };
     "cli-cursor-2.1.0" = {
@@ -2413,7 +2458,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz";
-        sha512 = "tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==";
+        sha512 = "0lj50waj40l4a51whihhvrjb838jqjkp1znn7dqgw6bsb1z7qwfyaxfggwmy3122rvnz4gxa8fn7qmp94zk03q8265khqikmiy3f1dn";
       };
     };
     "cliui-2.1.0" = {
@@ -2431,7 +2476,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
-        sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
+        sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0";
       };
     };
     "cliui-5.0.0" = {
@@ -2440,7 +2485,7 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
-        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
+        sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx";
       };
     };
     "clone-1.0.4" = {
@@ -2452,6 +2497,15 @@ let
         sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
       };
     };
+    "clone-response-1.0.2" = {
+      name = "clone-response";
+      packageName = "clone-response";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz";
+        sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b";
+      };
+    };
     "co-4.6.0" = {
       name = "co";
       packageName = "co";
@@ -2467,7 +2521,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/co-body/-/co-body-5.2.0.tgz";
-        sha512 = "sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ==";
+        sha512 = "36nr6zz2qri7lg37azg3n5lq5cwgfi3pf7j35l908qlc0shbbi353k47ama8q7p8c4gb9czdjpr7xy05ar7pnqwdcr1hlpan91wnzxi";
       };
     };
     "code-point-at-1.1.0" = {
@@ -2494,7 +2548,7 @@ let
       version = "1.9.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
-        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+        sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21";
       };
     };
     "color-name-1.1.3" = {
@@ -2512,7 +2566,7 @@ let
       version = "1.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
-        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
+        sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm";
       };
     };
     "command-line-args-5.1.1" = {
@@ -2521,16 +2575,16 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz";
-        sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==";
+        sha512 = "1dffdcll80c4cs7d9026187ild861bw26qph26frx8hx2dv23wwsw5g68kykqs8g2da57f62s56psxplx3bxcsprd85v5kbr4dxxgw4";
       };
     };
-    "commander-2.20.0" = {
+    "commander-2.20.3" = {
       name = "commander";
       packageName = "commander";
-      version = "2.20.0";
+      version = "2.20.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz";
-        sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==";
+        url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
+        sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s";
       };
     };
     "commondir-1.0.1" = {
@@ -2548,16 +2602,16 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz";
-        sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
+        sha512 = "136ravx3m3gf0ca84sf21hj47wmpqyjzmx6yvhj0b14mga7xcxfcgdc7yj9z8klcbr4yfqzy88fksmf233qx68a9ysw7yh1lixyrpa5";
       };
     };
-    "compressible-2.0.17" = {
+    "compressible-2.0.18" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.17";
+      version = "2.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz";
-        sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz";
+        sha512 = "13341lfj8d36v6gha16xmv92w4875z8irqdbns3jxlkc3a63aswys5sajq97y1sd42l08inw1l0s51r4l9lv20w6gy14nsxzvnfnp80";
       };
     };
     "compression-1.7.4" = {
@@ -2566,7 +2620,7 @@ let
       version = "1.7.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz";
-        sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==";
+        sha512 = "24kqcbwm455isy2yiyfrdrsh011qi09pbgylw1jws2yfmiwmwp2j8pmax52c41z3x1n84v1j5va29dnxwygkl4pw599b9gx6c7qi94d";
       };
     };
     "concat-map-0.0.1" = {
@@ -2584,7 +2638,7 @@ let
       version = "1.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
-        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+        sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv";
       };
     };
     "condense-newlines-0.2.1" = {
@@ -2602,7 +2656,7 @@ let
       version = "1.1.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz";
-        sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
+        sha512 = "2hg7rni4gx8l765i8qzkp9dv69c8r06i8rxxkkkrsklbd8iz6ingxnp10r4fqqrm9jxy3gp8yp0lzpybwdf27kq49abkyxwrchqwmvb";
       };
     };
     "connect-history-api-fallback-1.6.0" = {
@@ -2611,16 +2665,16 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz";
-        sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==";
+        sha512 = "0p9s5aqb76hamj9z64zd53ndh5r1jv76iw97hwrylmwwjprjn1246hrr5nvp5vs1xwwipq6dv7zj4qwywbn3n4cxc3llfdzvbvh37kv";
       };
     };
-    "console-browserify-1.1.0" = {
+    "console-browserify-1.2.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz";
+        sha512 = "168x7bp4xr522yw92himv9xv14q336ps1kkg79qcmarg3q4yzpd52pa8x8zgq11b6996f8053799k6365437si3pk85w5z4y8xiijb4";
       };
     };
     "consolidate-0.15.1" = {
@@ -2629,7 +2683,7 @@ let
       version = "0.15.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz";
-        sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==";
+        sha512 = "0rx5m8ygvw7y8rfs0fgpl6ppwk6gm7299qsnm005x88ws9yzb9fcj143f2irjsb94k8x9kdw7pap819dgg3w6x0jayhq9hcpfg3lvhd";
       };
     };
     "constantinople-3.1.2" = {
@@ -2638,7 +2692,7 @@ let
       version = "3.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz";
-        sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==";
+        sha512 = "2xnhrmlbkfpcvckxxrl0hjp6qhhqv1p7c6pwxgqp1g0sa5q5cc514xn48g9x8kqj7g1imzciwgb2msbhvhn0w0v92mb7105l43drqy9";
       };
     };
     "constants-browserify-1.0.0" = {
@@ -2656,7 +2710,7 @@ let
       version = "0.5.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz";
-        sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==";
+        sha512 = "3976ggkw1lp21a6m3s19blb9a74kq7a0spw47v0m3vvi1k5wiamrsn20slcr9byx80x2la2sppkwjp7x10gc58142dl7412pvpv84qk";
       };
     };
     "content-type-1.0.4" = {
@@ -2665,16 +2719,16 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
-        sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
+        sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4";
       };
     };
-    "convert-source-map-1.6.0" = {
+    "convert-source-map-1.7.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz";
-        sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz";
+        sha512 = "2hgf7brri4yaflx3y24d2cvznsk0km17mq8mp7sb2hhskf45hcamlgf8vzzbimw36lw128bjbf442p2rx96d1bhn9sk044p69gn8lp0";
       };
     };
     "cookie-0.4.0" = {
@@ -2683,7 +2737,7 @@ let
       version = "0.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz";
-        sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==";
+        sha512 = "1g7bscknfpc6zgznz77hvll6cy5m9jv7zg9nkpdqzmgi0vhv75kh8iyqf6rdslkml47l3jihsz7hy0i8x5n6bfx9ba0kvvrp9y7qypq";
       };
     };
     "cookie-signature-1.0.6" = {
@@ -2695,13 +2749,13 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "cookies-0.7.3" = {
+    "cookies-0.8.0" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.7.3";
+      version = "0.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz";
-        sha512 = "+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz";
+        sha512 = "2iqv33i76hmss097a18gkv8v1kawzs5zkgkri3nnrql9160y2vpkasv8dqj7l4c9hh6y6ki6nv072y13jrxzfcgp3kvay8zjh1fr8zi";
       };
     };
     "copy-concurrently-1.0.5" = {
@@ -2710,7 +2764,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
-        sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==";
+        sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz";
       };
     };
     "copy-descriptor-0.1.1" = {
@@ -2728,16 +2782,16 @@ let
       version = "4.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz";
-        sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
+        sha512 = "1j7l2xm5blz3ylmq1c0mwlkfbx9faqm09zid0czbyyfr05236pkgvzjzfr7syqb95mgzkzxdag697p4wwsxpcr7my88admlbw491r33";
       };
     };
-    "core-js-2.6.9" = {
+    "core-js-2.6.11" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.9";
+      version = "2.6.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz";
-        sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
+        sha512 = "1db6yjq48a8kkrfrxd0miblcf7nk2b4afgpr8dfgjl3jvz3xclvrqmz590hx2h59jh79lgl35r101lw5jqs46qybizdbpgzljjyf277";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2755,7 +2809,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
-        sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==";
+        sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r";
       };
     };
     "create-hash-1.2.0" = {
@@ -2764,7 +2818,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
-        sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==";
+        sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg";
       };
     };
     "create-hmac-1.1.7" = {
@@ -2773,16 +2827,16 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
-        sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
+        sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h";
       };
     };
-    "cron-1.7.1" = {
+    "cron-1.8.2" = {
       name = "cron";
       packageName = "cron";
-      version = "1.7.1";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.7.1.tgz";
-        sha512 = "gmMB/pJcqUVs/NklR1sCGlNYM7TizEw+1gebz20BMc/8bTm/r7QUp3ZPSPlG8Z5XRlvb7qhjEjq/+bdIfUCL2A==";
+        url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz";
+        sha512 = "35a9lj0cl50q669jhxl1f68myxinkmbdbl2yn4z3d93swlckjjiganjcn8iphg2867jil7ahkpapx5md94lw5102ny46a5i5virqk8s";
       };
     };
     "cross-spawn-6.0.5" = {
@@ -2791,7 +2845,7 @@ let
       version = "6.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
-        sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
+        sha512 = "1csj16gwq9riz0pm73dlxhbnsl1r3ldc5v0aincwj71ambi6xf3kc1kgsbwaakd8rj16k4mrli2syrjd57g6cr81zdzivdd2jn4ndbr";
       };
     };
     "crypto-browserify-3.12.0" = {
@@ -2800,7 +2854,7 @@ let
       version = "3.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
-        sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==";
+        sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz";
       };
     };
     "cssom-0.3.8" = {
@@ -2809,7 +2863,7 @@ let
       version = "0.3.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz";
-        sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==";
+        sha512 = "1i0h2rg4hb1j2430jc46n2zjc5gqg26brpl2ypjank206vjwdbk4n1svfk7nrbdsx7czd1a025a9h6ssh9qhscw4r7vi0fynwflcjvg";
       };
     };
     "cssstyle-1.4.0" = {
@@ -2818,7 +2872,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz";
-        sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==";
+        sha512 = "1460djxnz2dn84cx1wln5l004dy95pgik0h5bij3f7gw1i45p3mnsylwdps4r37gckfzqv5zvyh3gx95dr0ca01zmx8qpvqhrjwn6hq";
       };
     };
     "cyclist-1.0.1" = {
@@ -2836,7 +2890,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz";
-        sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
+        sha512 = "0abwyrfpd8rm9bwzgcaxcwd92d07c31cxw1fgs7h51ri2igw4vib1a5x69cg14wqisjad1d0fhglca6218qm9dngr17yhwv8f295bcv";
       };
     };
     "dashdash-1.14.1" = {
@@ -2854,16 +2908,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz";
-        sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==";
-      };
-    };
-    "date-now-0.1.4" = {
-      name = "date-now";
-      packageName = "date-now";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
-        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+        sha512 = "1wvgs0ccidbr67x52w8wx58knvvy7ir6j05z1sa3f4rdnpr3dvdlf6rwapfb09z0mi9w129llzvhxa0lj8jy84zpdwzxm0yvcirhdb1";
       };
     };
     "debug-2.6.9" = {
@@ -2872,7 +2917,7 @@ let
       version = "2.6.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
-        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+        sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc";
       };
     };
     "debug-3.1.0" = {
@@ -2881,7 +2926,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
+        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
       };
     };
     "debug-3.2.6" = {
@@ -2890,7 +2935,7 @@ let
       version = "3.2.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
-        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+        sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
       };
     };
     "debug-4.1.1" = {
@@ -2899,7 +2944,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
-        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
+        sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055";
       };
     };
     "decamelize-1.2.0" = {
@@ -2920,6 +2965,15 @@ let
         sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
       };
     };
+    "decompress-response-3.3.0" = {
+      name = "decompress-response";
+      packageName = "decompress-response";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz";
+        sha1 = "80a4dd323748384bfa248083622aedec982adff3";
+      };
+    };
     "deep-equal-1.0.1" = {
       name = "deep-equal";
       packageName = "deep-equal";
@@ -2944,7 +2998,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz";
-        sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
+        sha512 = "2067xswfnhdrq76l5wqibx50y8r46q0sdbkax2nxq6gq0ljjrrmmq95k99vnkgcz5xc7r1hhv0w7bw978krjxvdmnawam3ma2nhraw7";
       };
     };
     "defaults-1.0.3" = {
@@ -2962,7 +3016,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
-        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
+        sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw";
       };
     };
     "define-property-0.2.5" = {
@@ -2989,7 +3043,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz";
-        sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==";
+        sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg";
       };
     };
     "del-4.1.1" = {
@@ -2998,7 +3052,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz";
-        sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==";
+        sha512 = "1fkk8r4abk9009whl0yqapv13rjzj6mr01ghkxpbjkrvr6a6n6hg492mdr72wf3dc13zp3dmzq6z4bzm31h59q7q4anjgrf988sw0a3";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -3028,13 +3082,22 @@ let
         sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
       };
     };
-    "des.js-1.0.0" = {
+    "depd-2.0.0" = {
+      name = "depd";
+      packageName = "depd";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz";
+        sha512 = "2phijq20j255bs4jjs11j5pa0x7y1084k6ch9xa8wgzp71zzgbpm23wyzbcs0mszvj971l9i5aav40sddm000484sl3ij4xzvlcgfc3";
+      };
+    };
+    "des.js-1.0.1" = {
       name = "des.js";
       packageName = "des.js";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
-        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz";
+        sha512 = "085ljc5q2yk3jabd61p91n821q4prv13qalbfni9ybcb900b4mmcdnndi5b5prfs9wybp13asd13shlxgrbsgvyfx7nbgvby6jkhhj3";
       };
     };
     "destroy-1.0.4" = {
@@ -3079,7 +3142,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz";
-        sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==";
+        sha512 = "0mncqs8asq6722qr5jcv5bwi1653nd4s61s9mb9iyk3jkv83w9iynwjfd6ynp1jwsmr7qaspk6yd1x8c05qi9pxikikwfkbnajd3334";
       };
     };
     "diff-sequences-24.9.0" = {
@@ -3088,7 +3151,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz";
-        sha512 = "Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==";
+        sha512 = "1xvcq6cya1qr0slk88xxgibba4win89nmmy6945vzi0cqs3f4h72inwbk7wb05v55c23sx69grj872yyk5mnswd2qz33jangf9rcghf";
       };
     };
     "diffie-hellman-5.0.3" = {
@@ -3097,7 +3160,7 @@ let
       version = "5.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
-        sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
+        sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj";
       };
     };
     "dir-glob-2.2.2" = {
@@ -3106,7 +3169,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz";
-        sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==";
+        sha512 = "2rlgbmwy8bl5xqrwifdqhggx21ac4c8k6vgq7ia2h6cxmaiprrlm1p99cn4hb4dmax9wwk4vx96bc50b7ngxgx74fvqbk0njj5w3lkz";
       };
     };
     "dns-equal-1.0.0" = {
@@ -3124,7 +3187,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz";
-        sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==";
+        sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i";
       };
     };
     "dns-txt-2.0.2" = {
@@ -3151,7 +3214,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
-        sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
+        sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f";
       };
     };
     "domexception-1.0.1" = {
@@ -3160,7 +3223,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz";
-        sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==";
+        sha512 = "2x8mi3fy0wghky9i6bmz1d26yz1bbd4zmaqyc45fhrqhw8kdg6a4k4zz6jn9bisnxr8bff7fypz0vncby6sw8d2ld6r627v94ra1a5d";
       };
     };
     "duplexer-0.1.1" = {
@@ -3172,13 +3235,22 @@ let
         sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
       };
     };
+    "duplexer3-0.1.4" = {
+      name = "duplexer3";
+      packageName = "duplexer3";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz";
+        sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
+      };
+    };
     "duplexify-3.7.1" = {
       name = "duplexify";
       packageName = "duplexify";
       version = "3.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz";
-        sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==";
+        sha512 = "3k23dn0v8n7r3ds3v137vmw1vg3ngd6fw3bb4hasa6bm40qasvdaidjwx0wb4gakp8xvdrsckjn0wkmmi90z8a2sswj8cxhznxgrg6k";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -3196,7 +3268,7 @@ let
       version = "0.15.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz";
-        sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==";
+        sha512 = "3ggssjvjbrq0q12nr33bfbd8qdmmyapkiivxczlp66gi9y14s7dhaqxdmvbmg6lkzzli17w6v3rx3fyb0d82zl18ysgmskxbhq0ip1k";
       };
     };
     "ee-first-1.1.1" = {
@@ -3208,31 +3280,31 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "ejs-2.7.1" = {
+    "ejs-2.7.4" = {
       name = "ejs";
       packageName = "ejs";
-      version = "2.7.1";
+      version = "2.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz";
-        sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
+        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
+        sha512 = "2ad39acbba96hqbgf714pacri515xjn8jd43bkfb1wwp04vflpjj0qhnnmsq074g7d1kycyj1bmf620s43qb3x74hrfb4ky3v5axygf";
       };
     };
-    "electron-to-chromium-1.3.267" = {
+    "electron-to-chromium-1.3.376" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.267";
+      version = "1.3.376";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.267.tgz";
-        sha512 = "9Q2ixAJC+oHjWNtJV0MQ4vJMCWSowIrC6V6vcr+bwPddTDHj2ddv9xxXCzf4jT/fy6HP7maPoW0gifXkRxCttQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz";
+        sha512 = "27ngh0x7siic0nydq0xics24lnqfqjb2d6ja2fdfp1z979lisiy52m8cbbvrxp2ksr3nlk4s4yg5v4rll49wxjzry63gczrbihwzzvj";
       };
     };
-    "elliptic-6.5.1" = {
+    "elliptic-6.5.2" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.1";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz";
-        sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz";
+        sha512 = "33kzl02iwbq3pl33ihcdq9nm48yzhfj96183zzra06hp3z6bacz3d99pl74jziwygys4npxbxwnvszz12wl8lpkjw8b4r9ki797p33z";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -3241,7 +3313,7 @@ let
       version = "7.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
-        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
+        sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b";
       };
     };
     "emojis-list-2.1.0" = {
@@ -3253,6 +3325,15 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
+    "emojis-list-3.0.0" = {
+      name = "emojis-list";
+      packageName = "emojis-list";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
+        sha512 = "3cib7aw0206bfcb324aqh3fsda46mjxghd08gaasxagv6jfc74r2jvcv78rb8h10m879w42nbrn3q8rjifg9s5rclbpr2hzq7bqqk7y";
+      };
+    };
     "encodeurl-1.0.2" = {
       name = "encodeurl";
       packageName = "encodeurl";
@@ -3268,7 +3349,7 @@ let
       version = "1.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz";
-        sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
+        sha512 = "3jyw0a0c7m1yxglwk7i5jh8zb3vvx7f9l4frbskxkgf9cyf4i8ww26p8bimnsryrh1dx7lwrxq64vbpjwfcv1svd4lg8m07fa53bv7s";
       };
     };
     "enhanced-resolve-4.1.0" = {
@@ -3277,7 +3358,16 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
-        sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==";
+        sha512 = "2g5bp8yrd5ixqfg81db9ifalcqdyjxmrc4va86ljng9vnhkk2v0gxc7w28q00wnlp0j6sjilzj7dh4mkj2z49z2jkjwzjgd4j9yzzhp";
+      };
+    };
+    "enhanced-resolve-4.1.1" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz";
+        sha512 = "2w4dww5r1bxbycbb3kq0pdl9v56942678c53j9rwikxf05xd2n5h0b3a6914wxcmzr9wx4m0w56adp3qp21rk1wzkhbybxb9z67djpp";
       };
     };
     "errno-0.1.7" = {
@@ -3286,7 +3376,7 @@ let
       version = "0.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
-        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
+        sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii";
       };
     };
     "error-ex-1.3.2" = {
@@ -3295,7 +3385,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
-        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+        sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd";
       };
     };
     "error-inject-1.0.0" = {
@@ -3307,31 +3397,31 @@ let
         sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
       };
     };
-    "es-abstract-1.14.2" = {
+    "es-abstract-1.17.4" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.14.2";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz";
-        sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81";
       };
     };
-    "es-to-primitive-1.2.0" = {
+    "es-to-primitive-1.2.1" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
-        sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+        sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0";
       };
     };
-    "es5-ext-0.10.51" = {
+    "es5-ext-0.10.53" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.51";
+      version = "0.10.53";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz";
-        sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz";
+        sha512 = "3wl9jgj276xsjcf4gvc9w7gg403rg02s1i24r7scvhwg0mmgbqwsszjk94xnzfd3wj4y2khk6wbz8dm9j6lvlcwrbbd324d1svr5kay";
       };
     };
     "es6-iterator-2.0.3" = {
@@ -3343,13 +3433,22 @@ let
         sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
       };
     };
-    "es6-symbol-3.1.2" = {
+    "es6-promise-4.2.8" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
+        sha512 = "3zz892nih7z36hb24sqg3wgzgzp81zjq7h8bbrpdh80yxp46r9rk2ddhr65zqg9ygi4s8ph9fs3in3gkinvqwfhqlpy5iasjz3wd40w";
+      };
+    };
+    "es6-symbol-3.1.3" = {
       name = "es6-symbol";
       packageName = "es6-symbol";
-      version = "3.1.2";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz";
-        sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==";
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz";
+        sha512 = "0sgbv9jpq91di424qar8xiw36az4msxqhgpk1ixq5hv4wdbgaxs45q8i671icpg085bh1j7hj93iyszp7x9fmhld30jj3kff6gri7il";
       };
     };
     "escape-html-1.0.3" = {
@@ -3370,13 +3469,13 @@ let
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "escodegen-1.12.0" = {
+    "escodegen-1.14.1" = {
       name = "escodegen";
       packageName = "escodegen";
-      version = "1.12.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz";
-        sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz";
+        sha512 = "14kvh9zgpdp6ci9l9nqwwlhjz8gidkhgsv1yj8i7jbh087fchwwn62440spqk09f3qz13jrdyqdgfhf2yddkm7p6hgx4jbjqhspnsq6";
       };
     };
     "eslint-scope-4.0.3" = {
@@ -3385,16 +3484,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz";
-        sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
-      };
-    };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        sha512 = "2p4myi99y1nk5dy7fvmbspjdynigw3dzkhcm7zaiwfyw2wp6j61y0i8mba18ksv9qi2s1wp6w6xhn7471qs631bqwmz8fzmvas6xdd7";
       };
     };
     "esprima-4.0.1" = {
@@ -3403,7 +3493,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
-        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
+        sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq";
       };
     };
     "esrecurse-4.2.1" = {
@@ -3412,7 +3502,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz";
-        sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
+        sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b";
       };
     };
     "estraverse-4.3.0" = {
@@ -3421,16 +3511,16 @@ let
       version = "4.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
-        sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
+        sha512 = "2kh3lczc7smb84ryllqrdvrknxl3h47khh7li6n9m76mj9jfh1ahz2jm8ffpcaac7i4k8zkf3sc3nczzp7djgqmsi6wrkynywlygnfz";
       };
     };
-    "esutils-2.0.2" = {
+    "esutils-2.0.3" = {
       name = "esutils";
       packageName = "esutils";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
+        sha512 = "3m321j8gmjllmmi1zyvbz0lsmkkjq26bvfr8niwr5b8saxh6icixmpxixyspjb40l54vpx3r3zvln190i47cx16y5x2lf1qg6liqnwi";
       };
     };
     "etag-1.8.1" = {
@@ -3448,16 +3538,16 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz";
-        sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==";
+        sha512 = "05cdww9h7f3kjfmv478p0rcq2ia3lcrvqmsh155hd6wm895i2jn6j68w0ly09c3gjn8hshfdvnh99qchipbclycnb241y993m2d5sm9";
       };
     };
-    "events-3.0.0" = {
+    "events-3.1.0" = {
       name = "events";
       packageName = "events";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz";
-        sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==";
+        url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz";
+        sha512 = "1d21craxji58ccc5l8c39mw7pgk0is7gj1sixm8v1va1zc81hrw8426b9rhrv7z2kwqvix5l7cyfc8awwypj19him6ffd67qbqaxzs6";
       };
     };
     "eventsource-1.0.7" = {
@@ -3466,7 +3556,7 @@ let
       version = "1.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz";
-        sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==";
+        sha512 = "02zyvvhbzxhb7q9pzn867l80whipj03h4nkzjw1r8kppkmgaw0fcgvnkkv11fkfnlcdhkr9f55xrap5qpvbggkad4y4jkymxgpzbfg0";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -3475,16 +3565,16 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
-        sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
+        sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx";
       };
     };
-    "exec-sh-0.3.2" = {
+    "exec-sh-0.3.4" = {
       name = "exec-sh";
       packageName = "exec-sh";
-      version = "0.3.2";
+      version = "0.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz";
-        sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==";
+        url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz";
+        sha512 = "3a56in0wklcqf6hk0n22z22yg9kzb7y4xj7yfmj2sahbnkjbr5s0sngpzrr60r5rq9b3f0f1m13da5fn9mfz7p3b5nbxgxmrs8lhhdh";
       };
     };
     "execa-1.0.0" = {
@@ -3493,7 +3583,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
-        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
+        sha512 = "0nbazkdhh5zqw7l7y4ml860h6pbn72x5kp2iaknqbdk0ygcrp3yh6bnq0brzzsyk3f72ard3ss3kp9a2ffsglib3yiamqwm4mrz3mk9";
       };
     };
     "exit-0.1.2" = {
@@ -3529,7 +3619,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz";
-        sha512 = "wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==";
+        sha512 = "38r26vw1qwvgj86dijd5hps0b5ijk4qq0zy9dcgc2dpafq6jjx1x4k9lpaqs1mbkg4d9a29qkx914y9waavswvgwvcmv8n8qp3l1xf2";
       };
     };
     "express-4.17.1" = {
@@ -3538,7 +3628,16 @@ let
       version = "4.17.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz";
-        sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
+        sha512 = "3i2sxjf2x1r9wbfdyh5ll8ybbnqq6n4xfxdlc4dsqhssljrlih18csqg142lf16lcfcdgsmvf9pff0rzxjw7p0shnlmpajipwxpswlq";
+      };
+    };
+    "ext-1.4.0" = {
+      name = "ext";
+      packageName = "ext";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz";
+        sha512 = "3n50kbfjicn887f19ragi6k288srkjidzvcnphnb2f8bqw4vn10y73p3ryjyqq0xgrdxnwhy2j9favm7pfb3j3vhf5dmi8licsbkv19";
       };
     };
     "extend-3.0.2" = {
@@ -3547,7 +3646,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
-        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+        sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -3574,7 +3673,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
-        sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
+        sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin";
       };
     };
     "extsprintf-1.3.0" = {
@@ -3586,22 +3685,22 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-2.0.1" = {
+    "fast-deep-equal-3.1.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "2.0.1";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi";
       };
     };
-    "fast-json-stable-stringify-2.0.0" = {
+    "fast-json-stable-stringify-2.1.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn";
       };
     };
     "fast-levenshtein-2.0.6" = {
@@ -3628,16 +3727,16 @@ let
       version = "0.11.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz";
-        sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==";
+        sha512 = "0wgmgai5pj0yjcc4gs5b6r94gr8ycsbv1xyjw055cxfy4vm6yrpqp0mpr89ychmzgr5y0mggqrljf9jhb8n5iq63bi3r9yqidpbhv0g";
       };
     };
-    "fb-watchman-2.0.0" = {
+    "fb-watchman-2.0.1" = {
       name = "fb-watchman";
       packageName = "fb-watchman";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz";
-        sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58";
+        url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz";
+        sha512 = "1b67x7n9c1irns63lipsffgi0zm9kfms6k87mznvhak81dijqvfy26nqr3j5mw41mqb3vbbhxbbmcdgc787laz3kaq45slq0wlwjhqf";
       };
     };
     "figgy-pudding-3.5.1" = {
@@ -3646,7 +3745,16 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
-        sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==";
+        sha512 = "39n5js2y984px4bvwavskv70pazpjnrvy5lnyqif5pdh6pgfinnl3b5zknfkqvlws7gnylmlwryzfpdvh0jgpgsiphx8a64fhjb3lmw";
+      };
+    };
+    "file-uri-to-path-1.0.0" = {
+      name = "file-uri-to-path";
+      packageName = "file-uri-to-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi";
       };
     };
     "filesize-3.6.1" = {
@@ -3655,7 +3763,7 @@ let
       version = "3.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz";
-        sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==";
+        sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c";
       };
     };
     "fill-range-4.0.0" = {
@@ -3673,7 +3781,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz";
-        sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
+        sha512 = "1cfqk6g78cb12b1cki4pbcspsy40d0yny513myqji716njyhc5hrj7ll539kz96m6vn27168hhyqvd52cr5x1cs85mm7igfkrdrq1b8";
       };
     };
     "find-cache-dir-1.0.0" = {
@@ -3691,7 +3799,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
-        sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==";
+        sha512 = "0wjlwmvadzac6hwmxv6hsc16z3285i2y0nkwpg4366flza0rx30s3ncx93xn8hkkpxr493zi5b0h94jczinr87h2m6gbhrl265qzbjf";
       };
     };
     "find-replace-3.0.0" = {
@@ -3700,7 +3808,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz";
-        sha512 = "6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==";
+        sha512 = "04qvcapazb6cj527naq4ycrydqph63gpsq9ly76cvnxy7cm9xwdn2q62rlyvn7iynvm59akggz5jiiygzzbq7wrpwh218124fdzcdp9";
       };
     };
     "find-up-2.1.0" = {
@@ -3718,16 +3826,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
-        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+        sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p";
       };
     };
-    "findup-sync-2.0.0" = {
+    "findup-sync-3.0.0" = {
       name = "findup-sync";
       packageName = "findup-sync";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz";
-        sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz";
+        sha512 = "1i4px24rzp6x5wczj63r720lxw2rl1yvsk8w36bcmmdsyji2yx59p1nxy3v0hqjfr5s9vzrxh55v83ly3d0mf5r78hw32awp1mdzdv1";
       };
     };
     "flush-write-stream-1.1.1" = {
@@ -3736,7 +3844,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz";
-        sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==";
+        sha512 = "3pkp1ymgv73zg0d94la628nagxyngq7zm1jmngx6vjc6vi5d4jkmvfygvgac6w6x929hqljwygaidq2znk3l5xd4apdvxvpas21g7nx";
       };
     };
     "follow-redirects-1.5.10" = {
@@ -3745,7 +3853,7 @@ let
       version = "1.5.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
-        sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
+        sha512 = "1alfnscb0lnmf1ka8d5jrp48bizkbqrdz616r7q9yv4afqadlli1xmmf7lsvany1kmmnmwpvhbgx70mvcsnjf1ywjnzmkmk53h6apni";
       };
     };
     "for-in-1.0.2" = {
@@ -3772,7 +3880,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
-        sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
+        sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn";
       };
     };
     "form-data-2.5.1" = {
@@ -3781,16 +3889,16 @@ let
       version = "2.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz";
-        sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==";
+        sha512 = "1aa6m5c13kybvcycjdyhr0qbb7097qs7kah89bbhynjs9r5fl6ibbhscpin31nshzhw5nszw5c6x10krrig90afh88la456cgflsvcv";
       };
     };
-    "formidable-1.2.1" = {
+    "formidable-1.2.2" = {
       name = "formidable";
       packageName = "formidable";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
-        sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz";
+        sha512 = "3jm9bdwpbsvpf9f7v9gh2dc01p5pg77g1q6g6jwxyaqykr6q6ljp3gvkbxrxa6wkhlnw52qd130f4nx8f6zwf74h8jgy8rmxsdhpj2p";
       };
     };
     "forwarded-0.1.2" = {
@@ -3829,15 +3937,6 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
-    "fs-extra-4.0.3" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz";
-        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
-      };
-    };
     "fs-write-stream-atomic-1.0.10" = {
       name = "fs-write-stream-atomic";
       packageName = "fs-write-stream-atomic";
@@ -3856,13 +3955,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.9" = {
+    "fsevents-1.2.11" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.9";
+      version = "1.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz";
-        sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz";
+        sha512 = "0gh6646md6jag20cv3p6c36gf1k2h417lp8a7pwfdbvnbz9khs69hgs344jf2lk7pfqr8gyh13j56n9qvk2ad7nlq0isym93sbpgv7s";
       };
     };
     "function-bind-1.1.1" = {
@@ -3871,7 +3970,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
+      };
+    };
+    "gensync-1.0.0-beta.1" = {
+      name = "gensync";
+      packageName = "gensync";
+      version = "1.0.0-beta.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
+        sha512 = "1r0jph65fg2w5p612lr79rb1k2xyvr3cymg0cbsk8nrncdm82l4k1k8sflk3q32zahpdjfsfs15rdqcj7wgahrpzw3picmmsgl05hdg";
       };
     };
     "get-caller-file-1.0.3" = {
@@ -3880,7 +3988,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
-        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
+        sha512 = "3mw8nv3r73b3lp2pzj116p27flkrv1vq6v0ika46w3xqfinm6gxn38glryibvy834mja8ib4j9cjq27qn164z3793c9g88y79asppny";
       };
     };
     "get-caller-file-2.0.5" = {
@@ -3889,16 +3997,25 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz";
-        sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
+        sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g";
       };
     };
-    "get-paths-0.0.4" = {
+    "get-paths-0.0.7" = {
       name = "get-paths";
       packageName = "get-paths";
-      version = "0.0.4";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.4.tgz";
-        sha512 = "+AxlfMGN7FuJr2zhT6aErH08HMKkRwynTTHtWCenIWkIZgx2OlkZKgt7SM4+rh8Dfi32lo6HcvqeTLxph3kjQw==";
+        url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.7.tgz";
+        sha512 = "2sbm9wgxb9lh20hl3rj1zrpvgq14kxvd16hq6p9drh7z26f6nmy4jp0irbaqk1gjal152shl7kwkwk6gskvla18p0qs8p5mn2vlj1yk";
+      };
+    };
+    "get-stream-3.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
     "get-stream-4.1.0" = {
@@ -3907,7 +4024,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
-        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
+        sha512 = "3pwlllj9naaqzlc5axbxz4jqg3v533xd9jz945mjd3zmca3hh3pr1dpwc7416kjszw6igk060v6x2dgwpr7m1rd4djavmvr8bhavihq";
       };
     };
     "get-value-2.0.6" = {
@@ -3928,13 +4045,13 @@ let
         sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
       };
     };
-    "glob-7.1.4" = {
+    "glob-7.1.6" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.4";
+      version = "7.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
-        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
       };
     };
     "glob-parent-3.1.0" = {
@@ -3952,7 +4069,16 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz";
-        sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==";
+        sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h";
+      };
+    };
+    "global-modules-2.0.0" = {
+      name = "global-modules";
+      packageName = "global-modules";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz";
+        sha512 = "3q8nyi4i93sc7kfx7mmzmkr3656h7f27f5dkwx0908mz2m4bdih9024qmbss87anjf9d817zbr0mmm2zr9pfli2qw41zxv9j2cdyril";
       };
     };
     "global-prefix-1.0.2" = {
@@ -3964,13 +4090,22 @@ let
         sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
       };
     };
+    "global-prefix-3.0.0" = {
+      name = "global-prefix";
+      packageName = "global-prefix";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz";
+        sha512 = "1dda0wwyqq1k8qa0cy6ifchm9zfbq0bsrvq68gccp4haqp0hgqs5ax1hrpxkcl9k9j3g1nb0nzi19v8ikcxxc9y6i37a24mjjfah03b";
+      };
+    };
     "globals-11.12.0" = {
       name = "globals";
       packageName = "globals";
       version = "11.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz";
-        sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
+        sha512 = "1ab6f0n8yjl3zkl6dwhvxpxh63b4acc7nj7i21z3dx1fz1jv1c3673qpkwiavmcbbf8jlkxapx0x8ybzz5w2yra4ln24lh687y6kq2q";
       };
     };
     "globals-9.18.0" = {
@@ -3979,7 +4114,7 @@ let
       version = "9.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
+        sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab";
       };
     };
     "globby-6.1.0" = {
@@ -4000,13 +4135,22 @@ let
         sha1 = "fb2ccff9401f8600945dfada97440cca972b8680";
       };
     };
-    "graceful-fs-4.1.15" = {
+    "got-8.3.2" = {
+      name = "got";
+      packageName = "got";
+      version = "8.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz";
+        sha512 = "05i0zb81f4c0z48y9mjckyajm586ygznh8y8di5g0qrg3vi9hpbw2q3cf548as8zx9b4g1q5zf2cab43yx21wnan1l0qsz19zjhjdda";
+      };
+    };
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.15";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
-        sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
       };
     };
     "growly-1.3.0" = {
@@ -4024,7 +4168,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz";
-        sha512 = "FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==";
+        sha512 = "0y1sp7474a0w8329a3d69dgqdbaj7azkx415kcdrkri95c6gyvpj6c3mp5v0jdwjasq01xw07lr5l551z77ch0nkcszn7m8d7mf5l8l";
       };
     };
     "handle-thing-2.0.0" = {
@@ -4033,16 +4177,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz";
-        sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==";
-      };
-    };
-    "handlebars-4.3.3" = {
-      name = "handlebars";
-      packageName = "handlebars";
-      version = "4.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.3.3.tgz";
-        sha512 = "VupOxR91xcGojfINrzMqrvlyYbBs39sXIrWa7YdaQWeBudOlvKEGvCczMfJPgnuwHE/zyH1M6J+IUP6cgDVyxg==";
+        sha512 = "28zz3rsr08yf5sib0pnnwyk99023ll7bp73z28r1pb6j722bfdhxmzww91cyh713b3a6bqvfxlglancn95pwdnsb5w8w2sda9xk72vp";
       };
     };
     "har-schema-2.0.0" = {
@@ -4060,7 +4195,7 @@ let
       version = "5.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
-        sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
+        sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh";
       };
     };
     "has-1.0.3" = {
@@ -4069,7 +4204,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
-        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+        sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz";
       };
     };
     "has-ansi-2.0.0" = {
@@ -4090,13 +4225,31 @@ let
         sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
-    "has-symbols-1.0.0" = {
+    "has-symbol-support-x-1.4.2" = {
+      name = "has-symbol-support-x";
+      packageName = "has-symbol-support-x";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz";
+        sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx";
+      };
+    };
+    "has-symbols-1.0.1" = {
       name = "has-symbols";
       packageName = "has-symbols";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz";
-        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
+        sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw";
+      };
+    };
+    "has-to-string-tag-x-1.4.1" = {
+      name = "has-to-string-tag-x";
+      packageName = "has-to-string-tag-x";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz";
+        sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx";
       };
     };
     "has-value-0.3.1" = {
@@ -4150,7 +4303,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz";
-        sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==";
+        sha512 = "1f5xc15zpy3b7hssv57xnd92ja5r073zvd2pczvncxmy1jnbjcx716riyr2syvah88qk7328a6fz049mziv2k837093xqxd86r9m8xm";
       };
     };
     "hmac-drbg-1.0.1" = {
@@ -4177,7 +4330,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz";
-        sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
+        sha512 = "1qc7ngn9k1w5lcqx2ygqb2x9f03knfbsym25l6qsp6q9qdcxa4fzwwjsh9d9lm5l1569v19rjp7sdnz11087f4b6sv34rav9rcacabr";
       };
     };
     "hoopy-0.1.4" = {
@@ -4186,16 +4339,16 @@ let
       version = "0.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz";
-        sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==";
+        sha512 = "1yx4ynb45w5hn214j6xm2357i3hcbhyh21d7040ikmi9ywaqsjycbzp390wp1qixpyjnc8aaacwzqyf1cvlfz7c5fs6brxbd7xjq5qx";
       };
     };
-    "hosted-git-info-2.8.4" = {
+    "hosted-git-info-2.8.8" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.4";
+      version = "2.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz";
-        sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+        sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z";
       };
     };
     "hpack.js-2.1.6" = {
@@ -4213,7 +4366,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz";
-        sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==";
+        sha512 = "1ir4rhs26z0x26nr1bca94rbgyginfyrdza1a550ish1ssv5cf9j94dgl2j47n65yvjsnmhx8m749bljr3qjn7pdndcp7l35375jngg";
       };
     };
     "html-entities-1.2.1" = {
@@ -4225,13 +4378,31 @@ let
         sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
       };
     };
+    "html-escaper-2.0.0" = {
+      name = "html-escaper";
+      packageName = "html-escaper";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz";
+        sha512 = "0i7fxa00a4a7qdgxkiafdbpwvm5x80fivcnhmwbd8qdyxf18zdxzmriqq48k5a7yr7vn0hhzvvf1nki2105hqn29fznnn0iw42vv2vb";
+      };
+    };
     "http-assert-1.4.1" = {
       name = "http-assert";
       packageName = "http-assert";
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz";
-        sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw==";
+        sha512 = "21ixj6v0igbmy7zx5g4kpqp9fr495ki1jm8qszg1gbwmwcbji51n4zcpm6ll8a927m626rw4vkdamvsi90azmsnapm2d5lkl6mkpp5d";
+      };
+    };
+    "http-cache-semantics-3.8.1" = {
+      name = "http-cache-semantics";
+      packageName = "http-cache-semantics";
+      version = "3.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz";
+        sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75";
       };
     };
     "http-deceiver-1.2.7" = {
@@ -4258,7 +4429,16 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz";
-        sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
+        sha512 = "13c4825kzqlxdqfjrlrwh15ira0bjm9m3b8qcrfzaysiky1m3gb6dv6gcjgpnap9mbl0fajqiibzp1w5r8qnyn8glaj4wgzf6vh2i5r";
+      };
+    };
+    "http-errors-1.7.3" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz";
+        sha512 = "1zx0vws4k6lcw8j8pgc2yrwfw56s6n2z4dvhd9lcj9l1ywnl9ssianilmrlzr6ravkqxv0xbdqg4cn0q3l72d8h0achvcdbqp8dfd35";
       };
     };
     "http-parser-js-0.4.10" = {
@@ -4276,7 +4456,7 @@ let
       version = "1.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz";
-        sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==";
+        sha512 = "2jhzdgr7gcgj58mf798ak1a638wm4mnp45pk48im1rf03dpw39alpyabd7rqwqgjrilaggnmh6nd3m9pqnyn76q3mw5g7rzjf43d0pk";
       };
     };
     "http-proxy-middleware-0.19.1" = {
@@ -4285,7 +4465,7 @@ let
       version = "0.19.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz";
-        sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==";
+        sha512 = "3fl42r9rpdqm0jrrd2wqws6syv02r8cqgy0j6ddrjvn5p3by8shm0mmbych1g5k9i5agc70x6z2904nrgidkdnlq1pwafqhcf0i6xn8";
       };
     };
     "http-signature-1.2.0" = {
@@ -4312,7 +4492,7 @@ let
       version = "0.4.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+        sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
       };
     };
     "ieee754-1.1.13" = {
@@ -4321,7 +4501,7 @@ let
       version = "1.1.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
-        sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
+        sha512 = "179jm8fhl2advz4j63klrp57sm99wvyb5jcxwfr9rhi730ybcxkyfqrr0pmwvir12zjzpkwwvjjkjclwrss7lpab7dg2myqc8izpxz2";
       };
     };
     "iferr-0.1.5" = {
@@ -4339,7 +4519,7 @@ let
       version = "3.3.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz";
-        sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==";
+        sha512 = "2x7za00gs7ipwcq29bslxcdv7j47m28jx14n9ybs5h2icr4024jn5ppmbs6953g2qb3amhs1gg5x0s48ky3mk7ybi36wchsb7kks2ry";
       };
     };
     "import-local-2.0.0" = {
@@ -4348,7 +4528,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz";
-        sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==";
+        sha512 = "04jd526svpmpgya7i580qcb13s9b6bw4s9hng2fsni2gxsz6h8vqxl8gbm5k575yxm5aqhy001rl7p1iy60rsi6371cvynfdpi39avg";
       };
     };
     "imurmurhash-0.1.4" = {
@@ -4360,13 +4540,22 @@ let
         sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     };
+    "indent-string-3.2.0" = {
+      name = "indent-string";
+      packageName = "indent-string";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz";
+        sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289";
+      };
+    };
     "infer-owner-1.0.4" = {
       name = "infer-owner";
       packageName = "infer-owner";
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz";
-        sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==";
+        sha512 = "3s364ysa3q0sxc852a6rlbx0y8spayvg5csradd7s9vn2fr0ky3xpfhy5kkv6afgji3df7kyiswx296kwfakydii9xygqzxgkwn6a90";
       };
     };
     "inflation-2.0.0" = {
@@ -4405,13 +4594,22 @@ let
         sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
+    "inherits-2.0.4" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
+        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
+      };
+    };
     "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
       };
     };
     "internal-ip-4.3.0" = {
@@ -4420,7 +4618,7 @@ let
       version = "4.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz";
-        sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
+        sha512 = "05c6ydjyg8633b07vn5g168r5lxwvl5k1mjm55brfx35c1z18195bh67f7cfk4bjvyapxfhh8q5i7pv75k353rfp0rcpkgsa2iw2p2b";
       };
     };
     "interpret-1.2.0" = {
@@ -4429,7 +4627,16 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz";
-        sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==";
+        sha512 = "1pibn9f6dn61lmilqiv8hb4aix4b78xf9sdws3rnl060vvv6l4qrw6gfmncq5n0f0rah2yj1ssfg80chaw9y5aa860wfdcccb4ghgcr";
+      };
+    };
+    "into-stream-3.1.0" = {
+      name = "into-stream";
+      packageName = "into-stream";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz";
+        sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6";
       };
     };
     "invariant-2.2.4" = {
@@ -4438,7 +4645,7 @@ let
       version = "2.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz";
-        sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==";
+        sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6";
       };
     };
     "invert-kv-2.0.0" = {
@@ -4447,7 +4654,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
-        sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
+        sha512 = "0lamd4l8hybnh42bg1nav09fj3h7k31vnvsqbqk3mhbhml32042k8hpixhiapqfssi1jyhnw31mdv9zx0fvxzxqi8igahyh5zznzxf0";
       };
     };
     "ip-1.1.5" = {
@@ -4468,13 +4675,22 @@ let
         sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
       };
     };
-    "ipaddr.js-1.9.0" = {
+    "ipaddr.js-1.9.1" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
-        sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+        sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh";
+      };
+    };
+    "is-absolute-url-3.0.3" = {
+      name = "is-absolute-url";
+      packageName = "is-absolute-url";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz";
+        sha512 = "3ssxj0ds0anzx5qcgn5lcawrsv3br0zbi1qcfpi9sslp4iwzb0hr9aqy3y72rf9c0bwb0h5svy7l341j0arlkyvx2yp85pfgqhqv6d2";
       };
     };
     "is-accessor-descriptor-0.1.6" = {
@@ -4492,7 +4708,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
-        sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
+        sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -4519,25 +4735,16 @@ let
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
-        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
+        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
       };
     };
-    "is-buffer-2.0.3" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz";
-        sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==";
-      };
-    };
-    "is-callable-1.1.4" = {
+    "is-callable-1.1.5" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
-        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
+        sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi";
       };
     };
     "is-ci-2.0.0" = {
@@ -4546,7 +4753,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz";
-        sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
+        sha512 = "3inmiidgnyxsaypy9cq2pxcc0n7xcfsy3dlkjhk22y97vwz45b0hg972wj27kc0q5dd7k0zywjl3y5fjsqiq7fvllp1sh19p7p57wk1";
       };
     };
     "is-data-descriptor-0.1.4" = {
@@ -4564,16 +4771,16 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
-        sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
+        sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d";
       };
     };
-    "is-date-object-1.0.1" = {
+    "is-date-object-1.0.2" = {
       name = "is-date-object";
       packageName = "is-date-object";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
+        sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -4582,7 +4789,7 @@ let
       version = "0.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz";
-        sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==";
+        sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a";
       };
     };
     "is-descriptor-1.0.2" = {
@@ -4591,7 +4798,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz";
-        sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
+        sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r";
       };
     };
     "is-expression-3.0.0" = {
@@ -4618,7 +4825,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz";
-        sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==";
+        sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba";
       };
     };
     "is-extglob-2.1.1" = {
@@ -4630,13 +4837,13 @@ let
         sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
-    "is-finite-1.0.2" = {
+    "is-finite-1.1.0" = {
       name = "is-finite";
       packageName = "is-finite";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
+        sha512 = "3gj0k3vlpbc7zg5xkl8yjnilqs2dmk3ks67shchrfmnzkj6r4aad994xwfczx99ccjx6cixdqg4sawk2m92lqhh6jmfl17zlnv8rp3i";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -4663,7 +4870,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz";
-        sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==";
+        sha512 = "14qphsynlkivbpi3hhf3wmcjh8f5s9d2z6nr1h98ijygyj2jql330h1w52a4z33plgjma305w3rn3nf28q4n6j1qfmz2byq4gih2cki";
       };
     };
     "is-generator-function-1.0.7" = {
@@ -4672,7 +4879,7 @@ let
       version = "1.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz";
-        sha512 = "YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==";
+        sha512 = "2vr3bz9zc2d62mnsg16ppb5h2v5h9yfyjbijysi34b10vsly1fn1g4hmqwi40fng3i9pmbkc7vapr3yl23yxc96b2jgvqcf1h9kk5v1";
       };
     };
     "is-glob-3.1.0" = {
@@ -4690,7 +4897,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
-        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+        sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4";
       };
     };
     "is-number-3.0.0" = {
@@ -4702,13 +4909,22 @@ let
         sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
       };
     };
+    "is-object-1.0.1" = {
+      name = "is-object";
+      packageName = "is-object";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz";
+        sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
+      };
+    };
     "is-path-cwd-2.2.0" = {
       name = "is-path-cwd";
       packageName = "is-path-cwd";
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz";
-        sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==";
+        sha512 = "0aws7clcb9cyvvb4430df9fhfnpg9bl1n07ymzp7jdzia0bvjg25gyd39xp2xhgkgpkqazw8csglblifdql0rpj4kfwg1r26xnkdpn3";
       };
     };
     "is-path-in-cwd-2.1.0" = {
@@ -4717,7 +4933,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz";
-        sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==";
+        sha512 = "12yyg4jlg5mmiy2g0r91hz29v3jh5g2wyhdgs1qrfswx2sp7bfsn5g4632yfxmhrpjcy03bxfj12v93yd6pdykkpsmyz912g1f1rnmc";
       };
     };
     "is-path-inside-2.1.0" = {
@@ -4726,7 +4942,16 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz";
-        sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==";
+        sha512 = "0b5h3ls9n24ma1wqpfsv7n034ryz86rfn1vkz5g0sih2abi9wrs0vx6w583s6qhcgqa6rx5w5layfz7hlakhxvf07qcnnn36x7s2b62";
+      };
+    };
+    "is-plain-obj-1.1.0" = {
+      name = "is-plain-obj";
+      packageName = "is-plain-obj";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
+        sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
       };
     };
     "is-plain-object-2.0.4" = {
@@ -4735,7 +4960,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
+        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
       };
     };
     "is-promise-2.1.0" = {
@@ -4747,13 +4972,22 @@ let
         sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
       };
     };
-    "is-regex-1.0.4" = {
+    "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
+        sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy";
+      };
+    };
+    "is-retry-allowed-1.2.0" = {
+      name = "is-retry-allowed";
+      packageName = "is-retry-allowed";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
+        sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5";
       };
     };
     "is-stream-1.1.0" = {
@@ -4765,13 +4999,13 @@ let
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
-    "is-symbol-1.0.2" = {
+    "is-symbol-1.0.3" = {
       name = "is-symbol";
       packageName = "is-symbol";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
-        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
+        sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -4798,7 +5032,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz";
-        sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==";
+        sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr";
       };
     };
     "is-wsl-1.1.0" = {
@@ -4861,7 +5095,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz";
-        sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==";
+        sha512 = "3bk7frapznyd2q46p7kbk6w1wby8dfjj14p06j485n3s08nc398ah9d3wlr1q59sj5hv1cycvalkmn1vfzlamkp93d69981ccvny406";
       };
     };
     "isstream-0.1.2" = {
@@ -4879,7 +5113,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz";
-        sha512 = "8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==";
+        sha512 = "2cgkn8swx4450c0m0alr4lb4fvqjyh3v9mg6ivx2sa9vq0hkb7r0yz87srf8263j089kpjmpnsl6d3l5vg7x4f4kk39n20gw6gg79gi";
       };
     };
     "istanbul-lib-instrument-3.3.0" = {
@@ -4888,7 +5122,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz";
-        sha512 = "5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==";
+        sha512 = "1j5bcfrd9sgjpm1mpgxv847jwwcjfpzfkynjcidpf4mwxbn0p6gz622rcrmbliphcbnw0nxipw0d7aw0gva7rym3lci9rz8icvwhyg6";
       };
     };
     "istanbul-lib-report-2.0.8" = {
@@ -4897,7 +5131,7 @@ let
       version = "2.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz";
-        sha512 = "fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==";
+        sha512 = "2qm8v7vck1yv85lkx7n060wdvrr547mfrc83xyr6sl4p4av7r6c5jh6mdbvxiqz2m6d5spj6v8fksa9dc6c5r86hjhqh47pkqdmww3w";
       };
     };
     "istanbul-lib-source-maps-3.0.6" = {
@@ -4906,25 +5140,34 @@ let
       version = "3.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz";
-        sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==";
+        sha512 = "1gm71m2lqpb1p2lrwmf9f9g2maz48s133zvk0zzlblgwnjgnn6dx129cbsx8znklhanwwgck6fwnfpsy5sga5pnwfbpw923rg6cm3j7";
       };
     };
-    "istanbul-reports-2.2.6" = {
+    "istanbul-reports-2.2.7" = {
       name = "istanbul-reports";
       packageName = "istanbul-reports";
-      version = "2.2.6";
+      version = "2.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz";
-        sha512 = "SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==";
+        url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz";
+        sha512 = "0m8fjnnvxyyd03g22xna4jnypd01jbvdsz5k9jnqlb1v678zikdzidq7p1x4pdlg1dfzfa9g8lzz01srnamalpmrj5qxrb8ppy4bvds";
       };
     };
-    "jest-24.8.0" = {
+    "isurl-1.0.0" = {
+      name = "isurl";
+      packageName = "isurl";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
+        sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl";
+      };
+    };
+    "jest-24.9.0" = {
       name = "jest";
       packageName = "jest";
-      version = "24.8.0";
+      version = "24.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz";
-        sha512 = "o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==";
+        url = "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz";
+        sha512 = "0dz2j03p5zng926y4l7d5ivp918xscx0rmpavzyh02wy397hc3qr7m8w90zyfizy0gkwcq6xcdw4a3p1rqpqyg8sy0xvvb6aqph3yb2";
       };
     };
     "jest-changed-files-24.9.0" = {
@@ -4933,7 +5176,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz";
-        sha512 = "6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==";
+        sha512 = "2m70h82g3b9fhgyvzvg189inyc1zq20jz8nv763k4zcqg05pswzg92kjwkk26ry257qpk1p7cdg5hivchvmmg5xhh1ms756xnjxd979";
       };
     };
     "jest-cli-24.9.0" = {
@@ -4942,7 +5185,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz";
-        sha512 = "+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==";
+        sha512 = "0d2yrlapfahrl57m7nwz7lw04gvx72f61sq0w8mga9c1ly2jqm1jfb7jx4xjwqy4rshz0xxrj1zcpy5s60m14n7l1b70kxd50mx2lpr";
       };
     };
     "jest-config-24.9.0" = {
@@ -4951,7 +5194,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz";
-        sha512 = "RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==";
+        sha512 = "1yjki6v7vm537dmjkfkdbmb9gqw90j3sz1815j1ckx21rb2pshsdpk7qccjn6hfbcn7zy287wb48ynbz6kq7mpvxplhlqamkd0fs124";
       };
     };
     "jest-diff-24.9.0" = {
@@ -4960,7 +5203,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz";
-        sha512 = "qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==";
+        sha512 = "02sb3bshly5aqlan0hxxw54d15jm33d68zhyl9mr86lwy736g3gdvcs18d3jv9zr82vnnnhcdvi7fc7fd4aglxai8v92x00rx7fpix8";
       };
     };
     "jest-docblock-24.9.0" = {
@@ -4969,7 +5212,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz";
-        sha512 = "F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==";
+        sha512 = "009kyd5sgsjr8fa7ayc30pggfywigyh6a49rwk6fs1lcn5r61iy7ffza0zssbbra98yp64qgjinbmk09m0pp1yyf0sw096cj1vf6l0p";
       };
     };
     "jest-each-24.9.0" = {
@@ -4978,7 +5221,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz";
-        sha512 = "ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==";
+        sha512 = "2i6r417rcfrcfm30qy6ahwx0bgnwmj43d9l43vj1fkzj22dp6aygkx8qb6v09iw43q0y2b8pmfdw1k2gjy2wdnbqdf8wnvgh13v9n1q";
       };
     };
     "jest-environment-jsdom-24.9.0" = {
@@ -4987,7 +5230,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz";
-        sha512 = "Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==";
+        sha512 = "2s9xjipxcg6j92q67l7c9xcc6dy8d5nhjw722j501cxha0fabdp0ld1vzdw9y4hnqbvcy2h6kagjv9vlccbvqxm03p34is1sdblbzv6";
       };
     };
     "jest-environment-node-24.9.0" = {
@@ -4996,7 +5239,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz";
-        sha512 = "6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==";
+        sha512 = "2wbp9q6p3l2n5zd9s9788rpbyy4xgf07fgf1q8vgnndzgk87jiillyhsjliznj924bssn8pwadqaimgsdpa7pg9q4rk5ir7zvcibpp9";
       };
     };
     "jest-get-type-24.9.0" = {
@@ -5005,7 +5248,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz";
-        sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==";
+        sha512 = "3qs6d7i3xgiwb787y3d4ymij99fqgrcn6bg0bz27ic0nr58cw49njbhnrb7jpmkq3823mqs1snx7rvz97zlhac7hh5jwyr560riwjwm";
       };
     };
     "jest-haste-map-24.9.0" = {
@@ -5014,7 +5257,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz";
-        sha512 = "kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==";
+        sha512 = "26w4jc0ic0x8j1vza10vnf1aqahg1wknvq9q40kbsv5i9j5h3krvjb8akjgkkpv9gjh9frq04kyml8gg01d8saliy92vflnrfd4bxci";
       };
     };
     "jest-jasmine2-24.9.0" = {
@@ -5023,7 +5266,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz";
-        sha512 = "Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==";
+        sha512 = "37r7lh1ni9sizsffg7zcymwr8v30jhnz5kxmpq06i4c5d2b62nmpnci0w2kfmx0nq21ndp6829ypajdbgrdpzn57rzalq0s128fzbha";
       };
     };
     "jest-leak-detector-24.9.0" = {
@@ -5032,7 +5275,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz";
-        sha512 = "tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==";
+        sha512 = "2n6cx7niz5q8aryz2gahj0kz5s7vvj4xjn5py635kmmrhr7xa0immgd7h6id9zxccrxz8pn8rlp9maz447xfik1dyq32a927ch0b2dm";
       };
     };
     "jest-matcher-utils-24.9.0" = {
@@ -5041,7 +5284,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz";
-        sha512 = "OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==";
+        sha512 = "0fa7wakjy0cpr8scy7i55r1bp13r42n334abwv6p2zfkxa1dgkv0s00qm31437ixxv0rjah1d86vvjg6nvyn7hc62ifds9fgchzd71r";
       };
     };
     "jest-message-util-24.9.0" = {
@@ -5050,7 +5293,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz";
-        sha512 = "oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==";
+        sha512 = "2bq0saksr0nf5i1vj8lkrgwpb1ssyasmmxj0bwhn6ckf921bx3lapbg7wwzp96aa0qd81pv5n6gi0iz7cpvm4l67x9lhlvp4qbgqa50";
       };
     };
     "jest-mock-24.9.0" = {
@@ -5059,7 +5302,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz";
-        sha512 = "3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==";
+        sha512 = "3byaz1py3zmdifhw4743mrj6vq5mkqmkr83ps0w20i3dw2f46sqspx2prn9gyvcqa0i7za0gy6ff0gc28qjrcp4fxqayjlvjlvih4fw";
       };
     };
     "jest-pnp-resolver-1.2.1" = {
@@ -5068,7 +5311,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz";
-        sha512 = "pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==";
+        sha512 = "2fsj6wsh0r9hbal035dfnly528jk85b00z1rnikavh6zprlhwspq8rqjlv4ds0qkr2l62frwq803h6awxx3hgzpcbhgrqdrv7d700d6";
       };
     };
     "jest-regex-util-24.9.0" = {
@@ -5077,7 +5320,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz";
-        sha512 = "05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==";
+        sha512 = "101f428mjhbpli5q63y48lr2j3010x571y5km5mfk2zxx9vrqwnwvprsib89f5nv2lysfr6cin7gxc6ryyqx7yfc8za1idfl1psd46k";
       };
     };
     "jest-resolve-24.9.0" = {
@@ -5086,7 +5329,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz";
-        sha512 = "TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==";
+        sha512 = "0qkydcrqaqslxls0wgkxipas27szpigp62bw03ab640ilj8ym1zfm9x9w0x1ghp14x218dq5jzraf5niwvdybch2lc4z5zma8nxx8jd";
       };
     };
     "jest-resolve-dependencies-24.9.0" = {
@@ -5095,7 +5338,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz";
-        sha512 = "Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==";
+        sha512 = "3xflqrzhsd48ckwqzd4cc5b2qxng8f9946lws7dam37gwd4dxb5spjsswqa624bh36ymv8il4i4gjv9x4ay5whms19qi7an17ldnvhn";
       };
     };
     "jest-runner-24.9.0" = {
@@ -5104,7 +5347,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz";
-        sha512 = "KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==";
+        sha512 = "1d1djjic2c29yjm7lccjh8vpa7imjmr3b4y87v255dvg7cn9p7v78298hzjvl00xkaqn4vrnwd9w6rq8hf9yagvf6hlkzrp491hjjra";
       };
     };
     "jest-runtime-24.9.0" = {
@@ -5113,7 +5356,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz";
-        sha512 = "8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==";
+        sha512 = "2gwrn1nf3fc73wdc0a4gjipld6ahf9iq9k37rdzp5wxish6691xnb4b72j31k2hksr6caijgdgjhgxsbxi36lgmx24zvpl5g616m0zj";
       };
     };
     "jest-serializer-24.9.0" = {
@@ -5122,7 +5365,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz";
-        sha512 = "DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==";
+        sha512 = "1nkvvhcv9qvpdxj7p66qpi46yy4yqvdw6kfdfpq3b00x4i4ypxa1c8m9s7xh672svcibgv3ghwzfh3limg7mjkx53mzffpw7aj245hg";
       };
     };
     "jest-snapshot-24.9.0" = {
@@ -5131,7 +5374,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz";
-        sha512 = "uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==";
+        sha512 = "1xq7ysip1hh99xijwdhk5xmax44mkf7r0ggqdfzdmfnj7h75myfzr39nwi3ljvgwgj7lwkliz9bidivggmgl9fd13qvvcwj66ryp3xq";
       };
     };
     "jest-util-24.9.0" = {
@@ -5140,7 +5383,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz";
-        sha512 = "x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==";
+        sha512 = "0xcvxjx6b045jaki9zg2qjf7j10fv9wmlq2173553l6z11g73id4xgv591r7wdjd81x088fmmv2c53pq60fcjhddiqy562iqm9ikry7";
       };
     };
     "jest-validate-24.9.0" = {
@@ -5149,7 +5392,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz";
-        sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==";
+        sha512 = "12y3aryz98ppjhkz6zs9pix68d6ng43dq40wyvjhdzlf1cyyfs27qk9ra1zir84g2y42smvq7rclxj8sbkzh8ic9am0h2s05vl2vwhw";
       };
     };
     "jest-watcher-24.9.0" = {
@@ -5158,7 +5401,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz";
-        sha512 = "+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==";
+        sha512 = "1kqdbclywg8vhhvh6dhrmzmdfj1ivkwdl639qxam38nxvvv869b7j9shaag8zg7cmc5nlw67yhhc7p1pynv6r491l4pcpcgy8wwpxzv";
       };
     };
     "jest-worker-24.9.0" = {
@@ -5167,16 +5410,16 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz";
-        sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==";
+        sha512 = "1bj47m96z8b7jibrl7ybpmk88l2ic0yzwanlsimc1ca2gz8rhj0zaxaix9baxmyms63lq8dj2yxpafr739k3lhrl83pfjcc2vic8lz7";
       };
     };
-    "js-beautify-1.10.2" = {
+    "js-beautify-1.10.3" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.10.2";
+      version = "1.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz";
-        sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.3.tgz";
+        sha512 = "2yvdw134756wahvr97k7b7s5d10h3wf454j0vjmwhgbdsmqidlyccrqvjhlm82vdwc3m0074ad79wp4qwmpclhagi9ksvx80lh3zyf1";
       };
     };
     "js-stringify-1.0.2" = {
@@ -5203,7 +5446,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz";
-        sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
+        sha512 = "0lwyvximqkf1q5w94x2747nj2v035is66vzalrbl3f2gdh9k1m3m29p8zw6r65ps5784x2lxwz8akmv085l4ai358rwbp84axz59lj5";
       };
     };
     "js-yaml-3.13.1" = {
@@ -5212,7 +5455,7 @@ let
       version = "3.13.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
-        sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
+        sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1";
       };
     };
     "jsbn-0.1.1" = {
@@ -5230,7 +5473,7 @@ let
       version = "11.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz";
-        sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==";
+        sha512 = "27wagw1v4qv7snvz46q94kvwfzs4p86izsab5rm1bjh4dj18k527msjszrcnvb924sbwk4pj0ncvdqn6jzwydcpvlsi721jgbiz3hyb";
       };
     };
     "jsesc-0.5.0" = {
@@ -5257,7 +5500,16 @@ let
       version = "2.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz";
-        sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
+        sha512 = "20bfkjw0zjachan7rfv75dn5ky7l12xhyz919mdhh9fjn395ss454ykknjza7fwyx09dj89makcs1xi341dvv4k1cvj94739ifbp2rr";
+      };
+    };
+    "json-buffer-3.0.0" = {
+      name = "json-buffer";
+      packageName = "json-buffer";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz";
+        sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
       };
     };
     "json-parse-better-errors-1.0.2" = {
@@ -5266,7 +5518,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
-        sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==";
+        sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls";
       };
     };
     "json-schema-0.2.3" = {
@@ -5284,16 +5536,7 @@ let
       version = "0.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
-        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
-      };
-    };
-    "json-stream-1.0.0" = {
-      name = "json-stream";
-      packageName = "json-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stream/-/json-stream-1.0.0.tgz";
-        sha1 = "1a3854e28d2bbeeab31cc7ddf683d2ddc5652708";
+        sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5";
       };
     };
     "json-stringify-safe-5.0.1" = {
@@ -5311,7 +5554,7 @@ let
       version = "3.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz";
-        sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==";
+        sha512 = "049m3dzsr3mcgk3g8hw79w9lr296zxs0qmmn45ngfzinyxsvqh6k52i49690bfjlhsv16yrs87vh4nh6lfy80xrdh02haicnnczrgvk";
       };
     };
     "json5-0.5.1" = {
@@ -5329,25 +5572,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz";
-        sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
+        sha512 = "0xzlb8ipv7y4s06gdr1j09fgp9a8xcjrwy5qq739vgadwzfyslk6xph4f9d8zv7rrc0fg3qn6fpwg3y1mrzf0hbi5qp8yng11cvi938";
       };
     };
-    "json5-2.1.0" = {
+    "json5-2.1.1" = {
       name = "json5";
       packageName = "json5";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz";
-        sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==";
-      };
-    };
-    "jsonfile-4.0.0" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz";
-        sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
+        url = "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz";
+        sha512 = "22wbapqjyyia17kracx58ch53wppglmma2r3k2wzfjixnljynv3s7sscdxffl5v70j77j89wvq0ldmpm8xrxdbap3hqs4067mfcgvcp";
       };
     };
     "jsonpath-plus-0.19.0" = {
@@ -5356,7 +5590,7 @@ let
       version = "0.19.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-0.19.0.tgz";
-        sha512 = "GSVwsrzW9LsA5lzsqe4CkuZ9wp+kxBb2GwNniaWzI2YFn5Ig42rSW8ZxVpWXaAfakXNrx5pgY5AbQq7kzX29kg==";
+        sha512 = "29bszfdwjp446whcdh9mivbff8xl1v8jyamcwf6bg96mqr0jaghari3nfjqjrq33gv1di54kz17vrlj0bpakv2wwq0bpx6npjr7098r";
       };
     };
     "jsprim-1.4.1" = {
@@ -5377,13 +5611,22 @@ let
         sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3";
       };
     };
-    "keygrip-1.0.3" = {
+    "keygrip-1.1.0" = {
       name = "keygrip";
       packageName = "keygrip";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz";
-        sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g==";
+        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz";
+        sha512 = "00x227di73g3xvz8pmdhf4ykssibdigbhqw7kr6a22s8w54r7raw71apsc3r2bwda290y3wzsmay0xi59j27lh6icy295ky6a29r149";
+      };
+    };
+    "keyv-3.0.0" = {
+      name = "keyv";
+      packageName = "keyv";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz";
+        sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs";
       };
     };
     "killable-1.0.1" = {
@@ -5392,7 +5635,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz";
-        sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==";
+        sha512 = "272kk46rkfh4wq4mispvvy174y6fj8rlnf1m5z8pszpa2igz586k5f8vzz3q3nckxwvkcyqzf48sndd48krwzr9ag22mhjlm4nasfig";
       };
     };
     "kind-of-3.2.2" = {
@@ -5419,16 +5662,16 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz";
-        sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
+        sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l";
       };
     };
-    "kind-of-6.0.2" = {
+    "kind-of-6.0.3" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "6.0.2";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
-        sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz";
+        sha512 = "23pm3j7jjxhl5igjj2mg91b2w2x6j39axjy2y7b1z0dp9jgnhxl885znwwvglzhnb5ssdc4v5vy04ks7xpwgzllyy1ngdmxbyxbbi3m";
       };
     };
     "kleur-3.0.3" = {
@@ -5437,25 +5680,25 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz";
-        sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==";
+        sha512 = "3rh87j32f450qslsmms0br15jzkv6b71n08xsms6wv6qfvdxv1b5cridqb7bmkwmvzffx9asikjs4vh328pmifhqn4iylcjafak6ckr";
       };
     };
-    "koa-2.7.0" = {
+    "koa-2.11.0" = {
       name = "koa";
       packageName = "koa";
-      version = "2.7.0";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa/-/koa-2.7.0.tgz";
-        sha512 = "7ojD05s2Q+hFudF8tDLZ1CpCdVZw8JQELWSkcfG9bdtoTDzMmkRF6BQBU7JzIzCCOY3xd3tftiy/loHBUYaY2Q==";
+        url = "https://registry.npmjs.org/koa/-/koa-2.11.0.tgz";
+        sha512 = "0q4rl38fvrdnml9ix2ka3nav9zd8ilxh6738b27nvx4r05y0lb17pjw7la9nqgq0q401alrkv1cyyliig40r88c1rd3jk2195s7v50j";
       };
     };
-    "koa-body-4.1.0" = {
+    "koa-body-4.1.1" = {
       name = "koa-body";
       packageName = "koa-body";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-body/-/koa-body-4.1.0.tgz";
-        sha512 = "rWkMfMaCjFmIAMohtjlrg4BqDzcotK5BdZhiwJu1ONuR1ceoFUjnH3wp0hEV39HuBlc9tI3eUUFMK4Cp6ccFtA==";
+        url = "https://registry.npmjs.org/koa-body/-/koa-body-4.1.1.tgz";
+        sha512 = "1wfnjmilqj9fhv5dhmhpr5vx38ja1x8599nnqwx2977mhz15ig66fpcyk2rim80l8b77ir6g6w3wz71hppb445gf129kapwa0lzzdmc";
       };
     };
     "koa-compose-3.2.1" = {
@@ -5473,7 +5716,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz";
-        sha512 = "8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==";
+        sha512 = "1grd8vfvlnkpwjj8da79mig7p54842wpxzf2dhkj4dmsjm3yh5afh7kq83pig53xbfg6fbds2iwkypgl7r6naqwblpwdf637bqxdq7h";
       };
     };
     "koa-convert-1.2.0" = {
@@ -5485,22 +5728,13 @@ let
         sha1 = "da40875df49de0539098d1700b50820cebcd21d0";
       };
     };
-    "koa-is-json-1.0.0" = {
-      name = "koa-is-json";
-      packageName = "koa-is-json";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz";
-        sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14";
-      };
-    };
     "koa-router-7.4.0" = {
       name = "koa-router";
       packageName = "koa-router";
       version = "7.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/koa-router/-/koa-router-7.4.0.tgz";
-        sha512 = "IWhaDXeAnfDBEpWS6hkGdZ1ablgr6Q6pGdXCyK38RbzuH4LkUOpPqPw+3f8l8aTDrQmBQ7xJc0bs2yV4dzcO+g==";
+        sha512 = "3x0wdvpg0jxpv26fd4vqhw116nw797i4pzxsgpwm17yll74h8gyxg25zjnwihnm36lhxs9bb1p5m7bm0qcym4lm2b0z17c0fw6mls11";
       };
     };
     "koa-send-5.0.0" = {
@@ -5509,7 +5743,7 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.0.tgz";
-        sha512 = "90ZotV7t0p3uN9sRwW2D484rAaKIsD8tAVtypw/aBU+ryfV+fR2xrcAwhI8Wl6WRkojLUs/cB9SBSCuIb+IanQ==";
+        sha512 = "2fimqkgi0mli0fl0zfcylnbi29939cp2s7q8c60mnqiszbyyp4snkq5v87sfwjv04nkzc48l80jpkp3hdnw24fv6zp9vlpdbssnhipp";
       };
     };
     "koa-static-5.0.0" = {
@@ -5518,16 +5752,16 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz";
-        sha512 = "UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==";
+        sha512 = "1llav1xa767y46f8dhhapgqyyhc4hg7np4d34lbf0r0gg5fa9gi5lypzmn3q346rmym41g4jm0lb0hsnx6z0lpzmn4pc4aqgv49ib2j";
       };
     };
-    "koa-views-6.2.0" = {
+    "koa-views-6.2.1" = {
       name = "koa-views";
       packageName = "koa-views";
-      version = "6.2.0";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa-views/-/koa-views-6.2.0.tgz";
-        sha512 = "Y1rCFd4I5uSjZg0r4Zzs4hDjYTSGHhdBM5DuEhccWzknWikwOfc2ph/DkrocKhtQfFbLPHkkz/Ox38AL+p99BA==";
+        url = "https://registry.npmjs.org/koa-views/-/koa-views-6.2.1.tgz";
+        sha512 = "1xzbplyv8h0gli3blaz4k8s148m29iq39mqk1jpdh6qs14x1y5ayimfscy1rvl1wy0ix6hmd1cd9g8bcsbd8c8d4qdckfhaiz1yskf1";
       };
     };
     "lazy-cache-1.0.4" = {
@@ -5545,7 +5779,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
-        sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
+        sha512 = "1wcm03j1xmwayngclsgc7xk3rfsn8d3lcas6yfxszjpjwa37nwiia213cxkagdfc56anijwb679bg42ak1w59d0bkq6j47wqdpw9wva";
       };
     };
     "left-pad-1.3.0" = {
@@ -5554,7 +5788,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz";
-        sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==";
+        sha512 = "08aih5wmcyaw8f8nxlcf6lhr8synqf7jpvcp0ah2vdkshckvhvw2a8sj2bqkf5dr3fq43rilnq8lj86zhasccqlrb09h0jd6lzlr3jw";
       };
     };
     "leven-3.1.0" = {
@@ -5563,7 +5797,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz";
-        sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==";
+        sha512 = "3acc4jl6xib9wx3gqgq9wqab262mwjyc8d6aa7igfiyfyami7w4g59b62if7hd8w0zh8k1q3kqkwdxgnqsvyygw6wdaak93gzw5mixa";
       };
     };
     "levn-0.3.0" = {
@@ -5590,7 +5824,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz";
-        sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
+        sha512 = "13mmy8rws80fp5mw0b7qwq5zvvlwq8v20hykp1npzsc5i5sw426j6sgi77js3lrqzbc8b7gjxhsrf26bi8xnn7ii8q64p2wskrspj96";
       };
     };
     "loader-utils-1.2.3" = {
@@ -5599,7 +5833,16 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz";
-        sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==";
+        sha512 = "1j5jpk2rz5n0365vhmgknl49zq4sav613jn87b6khghcfsj3xvm2y0zil8zai7rr7wx0fvx1w78297fyiic1yydvq34776xx3qp6jky";
+      };
+    };
+    "loader-utils-1.4.0" = {
+      name = "loader-utils";
+      packageName = "loader-utils";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
+        sha512 = "1sdj0mw1y0adq9fpaafpv91yz2ijx06s6fpzjfs0db47cry0q2xjcahr5aksf6vlxp7ripisvjz21hjkkdzrwh8pc3zm7vdq141czd8";
       };
     };
     "locate-path-2.0.0" = {
@@ -5617,7 +5860,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
-        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+        sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc";
       };
     };
     "lodash-4.17.15" = {
@@ -5626,7 +5869,7 @@ let
       version = "4.17.15";
       src = fetchurl {
         url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
-        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
+        sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk";
       };
     };
     "lodash.camelcase-4.3.0" = {
@@ -5647,6 +5890,15 @@ let
         sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
       };
     };
+    "lodash.memoize-4.1.2" = {
+      name = "lodash.memoize";
+      packageName = "lodash.memoize";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz";
+        sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe";
+      };
+    };
     "lodash.sortby-4.7.0" = {
       name = "lodash.sortby";
       packageName = "lodash.sortby";
@@ -5662,16 +5914,16 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz";
-        sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
+        sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm";
       };
     };
-    "loglevel-1.6.4" = {
+    "loglevel-1.6.7" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.6.4";
+      version = "1.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz";
-        sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz";
+        sha512 = "3y57kcbhh98x86dpx7apanxgnkqf5chybr4jnwhzljd3k2n9knm5h7fp9aiv6bzpyvq1xg0qssgg3i47ddiz80h7vahfj6hb8n9x3bi";
       };
     };
     "loglevelnext-1.0.5" = {
@@ -5680,7 +5932,16 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz";
-        sha512 = "V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==";
+        sha512 = "3l63lnbnnsg2dgy8c89m5fxgdnl56a04hyiabic65zj4p9dsbh4jykr9jblvn8v7c7wx1a12mjv9gq69zfdfif00mw6q9pf8fmggzjp";
+      };
+    };
+    "long-4.0.0" = {
+      name = "long";
+      packageName = "long";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz";
+        sha512 = "0q7w59j4asw2i6n4hwbdrcigmaz042y2hsm31brmjfp3fg465mgqjmia2giil8kxbdh5ijdx00lv4a8n8lbj6srbziqczr22hmgxhsy";
       };
     };
     "longest-1.0.1" = {
@@ -5698,7 +5959,25 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz";
-        sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==";
+        sha512 = "3fhlaj5f55z0d4f45a5vsyz1r5k40qy6mfbxphjgnz8x4jx4d1g4pz4v2793viw0hk04a1a6zbiqxbjsjzhidp9jmmzhngzd8yb2awp";
+      };
+    };
+    "lowercase-keys-1.0.0" = {
+      name = "lowercase-keys";
+      packageName = "lowercase-keys";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
+        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
+      };
+    };
+    "lowercase-keys-1.0.1" = {
+      name = "lowercase-keys";
+      packageName = "lowercase-keys";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
+        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
       };
     };
     "lru-cache-4.1.5" = {
@@ -5707,7 +5986,7 @@ let
       version = "4.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
-        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
+        sha512 = "3k64s8pgffvqc84ar3r2jjvxnrll916m1q6s4m2k8pq2gqvlrzy11hdhvx2662fa4x7h1hcpn9wmy4kk28rgk3sj76w2fpn8dn6armi";
       };
     };
     "lru-cache-5.1.1" = {
@@ -5716,7 +5995,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
-        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
+        sha512 = "3vjhn04mjkxbkfb4fh7xnlghlgmqffqp5i1w2vg1ndgh5izv7nwvr8lq1n1hypfs5pm3bvbk7wf3fjm2pavld1hipz0n8rp012l14ra";
       };
     };
     "make-dir-1.3.0" = {
@@ -5725,7 +6004,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz";
-        sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
+        sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv";
       };
     };
     "make-dir-2.1.0" = {
@@ -5734,16 +6013,16 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
-        sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
+        sha512 = "12asfdw6jlwcqjli9xywj755wznjxadmh7q6abrhldss26wdsik8w39dqww20i3ilr9mjam1r80ickwzlp9w7dz15bvqa1wszwmfbrd";
       };
     };
-    "make-error-1.3.5" = {
+    "make-error-1.3.6" = {
       name = "make-error";
       packageName = "make-error";
-      version = "1.3.5";
+      version = "1.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
-        sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
+        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
+        sha512 = "2glh9fqac2bycfy6gmvv1r03pr484iglvv5ry3pjm6iz43h6qnkkw2l4sz9ydyadq6hip4wyjpj9jllbshxchh8k6lg5g5vsya23idk";
       };
     };
     "makeerror-1.0.11" = {
@@ -5761,7 +6040,7 @@ let
       version = "0.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz";
-        sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==";
+        sha512 = "1670fzjdl58zpljl3vblrzfz0805w0d99kdhf9rz4cgr1f2g01ibb5s5b1n7w7dqfv8lyig9zcqw2f0gsjlzxxwj4zc939fwn3k1hd8";
       };
     };
     "map-age-cleaner-0.1.3" = {
@@ -5770,7 +6049,7 @@ let
       version = "0.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
-        sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==";
+        sha512 = "3gk1kdfw4z4pjghrxyn53gyb40gbk71ycv5mi2mbidwxg76mbfgkxcn88zkcrjw38mq6vn5kcarw4n5zq79ligh5k1s6gr8fgmg373c";
       };
     };
     "map-cache-0.2.2" = {
@@ -5797,7 +6076,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz";
-        sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
+        sha512 = "29ds70y468n42xivsz4vrgy8rp2x4nxz52z1vkd1k49556gvn74pq998s510g3jgz9972m9yxs6yk1kw752blq97b9w8gaddkwlyay6";
       };
     };
     "media-typer-0.3.0" = {
@@ -5815,7 +6094,7 @@ let
       version = "4.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
-        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
+        sha512 = "3znrz98ggx92y1crm2y017k8lriwz4m9y4w451wm0h1jzsq7jgpafymdvgpznvx07l3xw8inznd78zzwyxdzhb0aq8scki9iwdrnzd9";
       };
     };
     "memory-fs-0.4.1" = {
@@ -5827,6 +6106,15 @@ let
         sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
       };
     };
+    "memory-fs-0.5.0" = {
+      name = "memory-fs";
+      packageName = "memory-fs";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz";
+        sha512 = "0cgni6pl3js3s6ylnj3j9sydf6z5sbnpyi42xdh4437rd6c7xgbapzdq84wn8dzxrcf7sva66z7m6mna61sdagfs41078aa9rsjn3cc";
+      };
+    };
     "merge-descriptors-1.0.1" = {
       name = "merge-descriptors";
       packageName = "merge-descriptors";
@@ -5842,7 +6130,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz";
-        sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==";
+        sha512 = "3gyvijjr3va5jwglqgv7sqxm4a6nhzhj32sl68ffjf8axkzi5z25g0nl2r2mvw1kjs3z49wxjdclljkk4whzpqka4vzjg9fwylgzfv9";
       };
     };
     "methods-1.1.2" = {
@@ -5860,7 +6148,7 @@ let
       version = "3.1.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz";
-        sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
+        sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i";
       };
     };
     "miller-rabin-4.0.1" = {
@@ -5869,7 +6157,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
-        sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
+        sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp";
       };
     };
     "mime-1.6.0" = {
@@ -5878,7 +6166,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
-        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
+        sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
       };
     };
     "mime-2.4.4" = {
@@ -5887,25 +6175,25 @@ let
       version = "2.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz";
-        sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==";
+        sha512 = "0c4qs0w88nqz2v7441rw9bbsgrsh50cifwmqm2i7c96yz2ncdy35cb5g42zhr6z0wmqqcwq5la04nnf1n4y3zncvgyg8b721hvnc71d";
       };
     };
-    "mime-db-1.40.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.40.0";
+      version = "1.43.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
-        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv";
       };
     };
-    "mime-types-2.1.24" = {
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.24";
+      version = "2.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
-        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -5914,7 +6202,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
+        sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd";
       };
     };
     "mimic-fn-2.1.0" = {
@@ -5923,7 +6211,16 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
-        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+        sha512 = "1r8csnc32c6rrvy8d5d1g33gba52m1863wdwl7qbancmzn795726im9mrwp20k3d8pl4x4msp7n6wpldvcwkmk5y4cy0h84ka9wx9is";
+      };
+    };
+    "mimic-response-1.0.1" = {
+      name = "mimic-response";
+      packageName = "mimic-response";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz";
+        sha512 = "32nwz24nh1f2nbpk8i638ff8hsg1ajmc6746abkssjr951z28362k5a92dd1cfr7bd1l9f507cn0pbam04ixfgsaygskv87g6v1r4cg";
       };
     };
     "minimalistic-assert-1.0.1" = {
@@ -5932,7 +6229,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
-        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
+        sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -5950,16 +6247,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
-      };
-    };
-    "minimist-0.0.10" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
-        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
       };
     };
     "minimist-0.0.8" = {
@@ -5971,13 +6259,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-1.2.0" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.0";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
       };
     };
     "mississippi-2.0.0" = {
@@ -5986,7 +6274,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz";
-        sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==";
+        sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync";
       };
     };
     "mississippi-3.0.0" = {
@@ -5995,7 +6283,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz";
-        sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==";
+        sha512 = "2895y9fw0xa9bmwbbkv3ziz5gnvr2b9k6kgh1b815ppwhgpcnbzsmn3bjvd2c1852hfakgnxw5hbn8kr8ff1pfbnm8x0lk3qm5gb3n7";
       };
     };
     "mixin-deep-1.3.2" = {
@@ -6004,7 +6292,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz";
-        sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==";
+        sha512 = "08fzp03g97vcq1dm4qs3kfjbazfs8h2m99bzdhn9caddpi4xr9bw9n9adlrv24qwfdw2jphwfhjszdwnykawd3ysj4ihp76zygh66jr";
       };
     };
     "mkdirp-0.5.1" = {
@@ -6022,16 +6310,16 @@ let
       version = "2.24.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
-        sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
+        sha512 = "111s7ki890wwh47hr44ps1q5vsh23jpp56dlgvyzz7hg71np9xkrc7k683qvfs7zyijb9fdcwzvinjcnbz36lhn0hg2hhknm7xxypkd";
       };
     };
-    "moment-timezone-0.5.26" = {
+    "moment-timezone-0.5.28" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.26";
+      version = "0.5.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz";
-        sha512 = "sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz";
+        sha512 = "0zr752vsxhfbfh884hzz8xbqkvs2l5778qwrkl7gxihdasi2ni80w61hvp858xclvgmcqgl2v8z1pjkffj5cbcihdb8aa1jy1k68cjc";
       };
     };
     "move-concurrently-1.0.1" = {
@@ -6058,7 +6346,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
-        sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
+        sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn";
       };
     };
     "ms-2.1.2" = {
@@ -6067,7 +6355,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
       };
     };
     "multicast-dns-6.2.3" = {
@@ -6076,7 +6364,7 @@ let
       version = "6.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz";
-        sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==";
+        sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf";
       };
     };
     "multicast-dns-service-types-1.1.0" = {
@@ -6094,7 +6382,7 @@ let
       version = "2.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz";
-        sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
+        sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg";
       };
     };
     "nan-2.14.0" = {
@@ -6103,7 +6391,7 @@ let
       version = "2.14.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
-        sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
+        sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0";
       };
     };
     "nanomatch-1.2.13" = {
@@ -6112,7 +6400,7 @@ let
       version = "1.2.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz";
-        sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
+        sha512 = "04al0wvh9hw1p9bblk847c5nbi3lcjz2pg5yzpqdzgllk57firrqinn4yk169iddaagdf9s5l987xh43z87w3hm9h0pqv0i7pcix6ky";
       };
     };
     "natural-compare-1.4.0" = {
@@ -6130,7 +6418,7 @@ let
       version = "0.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
-        sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
+        sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5";
       };
     };
     "neo-async-2.6.1" = {
@@ -6139,7 +6427,7 @@ let
       version = "2.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz";
-        sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==";
+        sha512 = "1kvffl97cs76iidch6z424p50m0wdryx6h6b1jdgr71bfg035szlxcdl6dz9jy71aj8msvprdq2ilbs9jisbim3g1b4l2bfy3qsc9lb";
       };
     };
     "next-tick-1.0.0" = {
@@ -6157,16 +6445,25 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz";
-        sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
+        sha512 = "0swp764n5mcgqfjbm3hsw9iayqy46490y4lvqyk6www0a02bw130mji8lvsvlr34sc29rai5i4vpwwhh76mzplf6ljrlvwyszjphy6n";
       };
     };
-    "node-forge-0.8.2" = {
+    "node-forge-0.8.5" = {
       name = "node-forge";
       packageName = "node-forge";
-      version = "0.8.2";
+      version = "0.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.2.tgz";
-        sha512 = "mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg==";
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz";
+        sha512 = "3nzl12m7r7d345xjm7a1kq3yjdwfa9x892djy3444h7jaav25zmzh0bcg2f24ympwh7qmyihgpx7b2dgpka52nw5k2zw9vydchi0lxw";
+      };
+    };
+    "node-forge-0.9.0" = {
+      name = "node-forge";
+      packageName = "node-forge";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz";
+        sha512 = "0lhlm8x38i28zwmjycgdcyzcqlb0x3z8scjx7vm3s4ypj99bfj7pmv18yxjsnz532z7g9li2aa1x54hbv61dmvbvm4yj3z9ml6rl17c";
       };
     };
     "node-int64-0.4.0" = {
@@ -6178,13 +6475,22 @@ let
         sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
       };
     };
+    "node-jose-1.1.3" = {
+      name = "node-jose";
+      packageName = "node-jose";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-jose/-/node-jose-1.1.3.tgz";
+        sha512 = "3qb1g8mkwn2vfqj84a62sp2dfg52334f3dj7ab240w51qrf2wl2s62qjvjz46jid9r3dmasxs0hp1zbjgnqkbg9kiii8nl6if5mzslj";
+      };
+    };
     "node-libs-browser-2.2.1" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz";
-        sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==";
+        sha512 = "3jhlmpgvcnjkg1bh3qp6rqp4a4plsih4bcfqkg0by0acj58r2m1x1jlsgw1k114920vlsvwl563lfjh844mpm02ykcs14gxq47xrz47";
       };
     };
     "node-modules-regexp-1.0.0" = {
@@ -6202,16 +6508,16 @@ let
       version = "5.4.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz";
-        sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==";
+        sha512 = "3qq3cn12n130r2k8aldr2fn3afv21m8ichf87yj7nfp251ypmb5kv9vxs70k93g9nr6164l7crvyzmw4j6b3lr8yj5f739qrcch319k";
       };
     };
-    "nopt-4.0.1" = {
+    "nopt-4.0.3" = {
       name = "nopt";
       packageName = "nopt";
-      version = "4.0.1";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
+        sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha";
       };
     };
     "normalize-package-data-2.5.0" = {
@@ -6220,7 +6526,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
-        sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
+        sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z";
       };
     };
     "normalize-path-2.1.1" = {
@@ -6238,7 +6544,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
-        sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+        sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9";
+      };
+    };
+    "normalize-url-2.0.1" = {
+      name = "normalize-url";
+      packageName = "normalize-url";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz";
+        sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg";
       };
     };
     "npm-run-path-2.0.2" = {
@@ -6259,13 +6574,13 @@ let
         sha1 = "097b602b53422a522c1afb8790318336941a011d";
       };
     };
-    "nwsapi-2.1.4" = {
+    "nwsapi-2.2.0" = {
       name = "nwsapi";
       packageName = "nwsapi";
-      version = "2.1.4";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz";
-        sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==";
+        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz";
+        sha512 = "22vnwmwzxgzp9flhivwzrsa2jr754ysi133p4wdqdfgvg1mvhbjh1hv7ahbl7i2m7zv4vs6higga9c1gydywvwsi53y47qqvjsilq47";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -6274,7 +6589,7 @@ let
       version = "0.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
-        sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
+        sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x";
       };
     };
     "object-assign-4.1.1" = {
@@ -6295,13 +6610,22 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-inspect-1.6.0" = {
+    "object-hash-1.3.1" = {
+      name = "object-hash";
+      packageName = "object-hash";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz";
+        sha512 = "06crm6ynp4rxakk4frrb4kjmi758r38fs5h0f6b7giyxhj0dghb6mdx7sbp0nhnk2w8cyb1bli07d9nbm086i34j8yx641qjpzawarr";
+      };
+    };
+    "object-inspect-1.7.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
-        sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb";
       };
     };
     "object-keys-1.1.1" = {
@@ -6310,7 +6634,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
-        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
+        sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n";
       };
     };
     "object-visit-1.0.1" = {
@@ -6328,16 +6652,16 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
-        sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
+        sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv";
       };
     };
-    "object.getownpropertydescriptors-2.0.3" = {
+    "object.getownpropertydescriptors-2.1.0" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
-        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7";
       };
     };
     "object.pick-1.3.0" = {
@@ -6355,7 +6679,16 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz";
-        sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==";
+        sha512 = "0vcjqppr8sr1in2haifxl9q8v6kgn8pddc4ffkjbx5n2fasb3kdrx7mybkfxqdaqfch2hqrwa87rrwllqd5lrmx73md609682xp0z9x";
+      };
+    };
+    "oidc-token-hash-3.0.2" = {
+      name = "oidc-token-hash";
+      packageName = "oidc-token-hash";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-3.0.2.tgz";
+        sha512 = "127wvn9pnb5jjxqhkr54w07z6s0njlqvrv4k8cnn2vf5y4hpbykcl2cyn8yw8zwqhzv6bqikhza5nkhmv1zm8kgpazddzgj9zryjg3m";
       };
     };
     "on-finished-2.3.0" = {
@@ -6373,7 +6706,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz";
-        sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==";
+        sha512 = "2n6994y8y4b146a5wpzzgw779yc227cqkmwsifc3fbn2kc9dzypjigqf72bpgsqrk7gs93l6fk4iqdk752jnsnpr89j58sbabw09455";
       };
     };
     "once-1.4.0" = {
@@ -6409,7 +6742,16 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz";
-        sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==";
+        sha512 = "2yg0r89kjihas5gr319kw75b6bjalmhpy6yfabd8g7vnldsddnnwsdbzb3942c9c9zrbz8pwa17an3rkcb8nwdd8lw72l9njz5i51l2";
+      };
+    };
+    "openid-client-2.5.0" = {
+      name = "openid-client";
+      packageName = "openid-client";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/openid-client/-/openid-client-2.5.0.tgz";
+        sha512 = "339via1h7paxj3qwnzzs6p7x4r3p51k55pc6z85dpzk2gslhp84fnwa4scgcaib9xai7smcc5y7vgb88p20awllvda6v8a4ph7lay5p";
       };
     };
     "opn-5.5.0" = {
@@ -6418,25 +6760,16 @@ let
       version = "5.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz";
-        sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==";
+        sha512 = "2qa90jg1bw4yx1an6vbx2cp7lpk6xwa94yrbr6mkpl2h95wl4iinlmlzzy2z5ihm79d4ypkjkf3w5m7cjl79775amsbav5x021fk89y";
       };
     };
-    "optimist-0.6.1" = {
-      name = "optimist";
-      packageName = "optimist";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
-        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
-      };
-    };
-    "optionator-0.8.2" = {
+    "optionator-0.8.3" = {
       name = "optionator";
       packageName = "optionator";
-      version = "0.8.2";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
-        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz";
+        sha512 = "1n905a6d9xvmaqhy1xvpk4m7amkpx4wmky0w9764biihzkgachffm975qq5yqy4qjri2pbrrck994dsnz4ipmv4kbb7b4wx02jbv1gq";
       };
     };
     "ora-3.4.0" = {
@@ -6445,7 +6778,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz";
-        sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==";
+        sha512 = "1i331n8qj60jz6f51yfczwaspwsj57sykmgj34cwzhvlp761l2rx1iwqd247xys1749hhddfp6mmzznfp32dxqkjkl5ffsvsfwhgp3q";
       };
     };
     "original-1.0.2" = {
@@ -6454,7 +6787,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz";
-        sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==";
+        sha512 = "038qn5613vi5gjik4pmng7zf2ib4w81hjyzy9dhflj7kw1p1ll09nq63x9rnkyyflkv33lq8bx0fbw1gzlpp4asy24l7adam2bma847";
       };
     };
     "os-browserify-0.3.0" = {
@@ -6481,7 +6814,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz";
-        sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==";
+        sha512 = "3frcfnhc4914snsnfqyqrz253i5dd31202gbx4dzkp6bvc8f7wnqhfyc89zp662v016gdqa7wb1z2g6p8nzk6cxzwscwn0qii3pgjb7";
       };
     };
     "os-tmpdir-1.0.2" = {
@@ -6499,7 +6832,25 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+        sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
+      };
+    };
+    "p-any-1.1.0" = {
+      name = "p-any";
+      packageName = "p-any";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
+        sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i";
+      };
+    };
+    "p-cancelable-0.4.1" = {
+      name = "p-cancelable";
+      packageName = "p-cancelable";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
+        sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw";
       };
     };
     "p-defer-1.0.0" = {
@@ -6529,13 +6880,22 @@ let
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
+    "p-is-promise-1.1.0" = {
+      name = "p-is-promise";
+      packageName = "p-is-promise";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
+        sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
+      };
+    };
     "p-is-promise-2.1.0" = {
       name = "p-is-promise";
       packageName = "p-is-promise";
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
-        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
+        sha512 = "0z3jpi001p4scg2h40kyy7mjvscz8l9mpdp79lhk9b19lyiz140gbwi8963dr5nrysmkrl0hy52v6ikg2wzfsmk8m6ccasgak1b8xb3";
       };
     };
     "p-limit-1.3.0" = {
@@ -6544,16 +6904,16 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
-        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+        sha512 = "3sh18calqxbww99pxc84hldflmj0i915g8npihlmazw8wjqabihi9475v0ll3fhx44sxn35j014j1k5d2xr73q3mpwkmx09n2q1gxxy";
       };
     };
-    "p-limit-2.2.1" = {
+    "p-limit-2.2.2" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
-        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
+        sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q";
       };
     };
     "p-locate-2.0.0" = {
@@ -6571,7 +6931,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
-        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+        sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7";
       };
     };
     "p-map-2.1.0" = {
@@ -6580,7 +6940,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz";
-        sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==";
+        sha512 = "0bx813aqd3627xffp035h9nimfd19i0l6may47yd0k7x2bngiyp8z31im58ac1nnxy3gdb3yiilagbyqlb7qwc8wdw06f3wjwmgqxnb";
       };
     };
     "p-reduce-1.0.0" = {
@@ -6598,7 +6958,25 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz";
-        sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==";
+        sha512 = "3gknqxqyn23vmgcqsvnvspzynkbkfn74f3plq72wj54kcyy5f3mbq3lw8pj2gwpmbkqcv7w0wvk3vv54dlny5j5dgv48khkwviqckjw";
+      };
+    };
+    "p-some-2.0.1" = {
+      name = "p-some";
+      packageName = "p-some";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz";
+        sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06";
+      };
+    };
+    "p-timeout-2.0.1" = {
+      name = "p-timeout";
+      packageName = "p-timeout";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz";
+        sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk";
       };
     };
     "p-try-1.0.0" = {
@@ -6616,16 +6994,16 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+        sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7";
       };
     };
-    "pako-1.0.10" = {
+    "pako-1.0.11" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.10";
+      version = "1.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
-        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz";
+        sha512 = "1imm2ygnj1himskq6lblzdh3ngc6p9gkvhrbzivalqf3nwafzfglpmbh8wkaz0rsiaxh67jzxbb16m2ygapfcnfwqg9gkdqzkqc24p2";
       };
     };
     "parallel-transform-1.2.0" = {
@@ -6634,7 +7012,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz";
-        sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==";
+        sha512 = "35gr4098wc5ibbrpckgva8l9v50z6mcii4y3kv6wc1ymz3aj2i444y3m2qm2ngf0k02ylqkg3gn7g6awkqfs56ppljy5wmpifcd4srz";
       };
     };
     "parse-asn1-5.1.5" = {
@@ -6643,7 +7021,7 @@ let
       version = "5.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
-        sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==";
+        sha512 = "16n59f599pq8832a6c5wyxnqdf4vrqrdnclzs6vp9m2z2h9qmxamjk6xcrl1aal758jyba0pvyz1bkf7npm7achfxxa29jwaygihhwf";
       };
     };
     "parse-json-4.0.0" = {
@@ -6670,7 +7048,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz";
-        sha512 = "VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==";
+        sha512 = "0a10cnny1cy9csxrw2736fjbhqp0jqv8hnghr7gz9jrlkclw91f8rzg1173b43b3dbc1qq68g7vy4hq4b45r3bmw5j52kvpwxw7pdjn";
       };
     };
     "parseurl-1.3.3" = {
@@ -6679,7 +7057,7 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz";
-        sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==";
+        sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a";
       };
     };
     "pascalcase-0.1.1" = {
@@ -6697,7 +7075,7 @@ let
       version = "0.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz";
-        sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==";
+        sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5";
       };
     };
     "path-dirname-1.0.2" = {
@@ -6751,7 +7129,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
-        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+        sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r";
       };
     };
     "path-to-regexp-0.1.7" = {
@@ -6763,13 +7141,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "path-to-regexp-1.7.0" = {
+    "path-to-regexp-1.8.0" = {
       name = "path-to-regexp";
       packageName = "path-to-regexp";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
-        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz";
+        sha512 = "1a1s16c1sx28yq8nh8sqkj9izaypszmxfk27x5hl1wid9611b5viffw9vbwqw6sik20ksgmh18dqndglbvq82dii4jl0aal353ck3cz";
       };
     };
     "path-type-3.0.0" = {
@@ -6778,7 +7156,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz";
-        sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==";
+        sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg";
       };
     };
     "pbkdf2-3.0.17" = {
@@ -6787,7 +7165,7 @@ let
       version = "3.0.17";
       src = fetchurl {
         url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz";
-        sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==";
+        sha512 = "2s4nd3yv3kkyywvh5rkrvbr6w2h6a4q786v548w895ralcq9cllqzyxr0jgxf911k3zpmzycimsg3ggww3lkrhd3bk9wribrgjaby2k";
       };
     };
     "performance-now-2.1.0" = {
@@ -6823,7 +7201,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz";
-        sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==";
+        sha512 = "3d9a1zsv7ca8ffpp7ffl67vp0ahiq78ix1jl21b4nfklinh2ilwh6c45f93syclab0b49p3cfq8d4agpphrbmf6xgfxgzjv268387xq";
       };
     };
     "pinkie-2.0.4" = {
@@ -6850,7 +7228,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz";
-        sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==";
+        sha512 = "0caxkzsq2j5ypg50bxyjcbyz66cpicl6gay0pzaskr5gwjf6m239v6qmydj5kwr15n1j5mdf8n24q22cnn4rxp7gmk7n8yc6qnnmqss";
       };
     };
     "pkg-dir-2.0.0" = {
@@ -6868,7 +7246,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz";
-        sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==";
+        sha512 = "2znan90js3xrk8a8cvzv7vrjma5dgr9hkk4kpcgciyawbjz404a4rpdj6gngx1dc7f1xzmfm3q0an1rq69qyk2cmawhsy98i40pnkpw";
       };
     };
     "pn-1.1.0" = {
@@ -6877,16 +7255,16 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz";
-        sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==";
+        sha512 = "2fgy9i99qaapk6lrqsf0i396i0hw5prvpn2wwsccs7j9jz8960r59vjz98kjhfiif2pyf4fiizrwpminc29rdhpld2v8m7n18hxm8fs";
       };
     };
-    "portfinder-1.0.24" = {
+    "portfinder-1.0.25" = {
       name = "portfinder";
       packageName = "portfinder";
-      version = "1.0.24";
+      version = "1.0.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz";
-        sha512 = "ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==";
+        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz";
+        sha512 = "0388smj2gw4cwp6pddy75jr5x6sha60s4w055dpxpag7fi9ql9vxrkidnzc1v5h2zp6ra350y8q4n6lqsg0dq12blsm1iavf2f4jjg8";
       };
     };
     "posix-character-classes-0.1.1" = {
@@ -6907,13 +7285,22 @@ let
         sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
       };
     };
-    "prettier-1.18.2" = {
+    "prepend-http-2.0.0" = {
+      name = "prepend-http";
+      packageName = "prepend-http";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz";
+        sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
+      };
+    };
+    "prettier-1.19.1" = {
       name = "prettier";
       packageName = "prettier";
-      version = "1.18.2";
+      version = "1.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz";
-        sha512 = "OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==";
+        url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz";
+        sha512 = "1xv5n13ms7da26nl80isb703rvq4nwrpqsz4xh8z4bakjh79c631x9pnjrqfhyc77bcjr818yclpxzlq4k9qbh4dr78s87z7g4ficxk";
       };
     };
     "pretty-2.0.0" = {
@@ -6931,7 +7318,7 @@ let
       version = "24.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz";
-        sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==";
+        sha512 = "2f2qn4f43m108j6kw127wvywyyci2c5jdrnfb093ql7f626hwz0qh5z4nwllgpzs4gvdc7l5ljxy2xamzk85xsdgv6rls4791jlqink";
       };
     };
     "private-0.1.8" = {
@@ -6940,7 +7327,7 @@ let
       version = "0.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz";
-        sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
+        sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n";
       };
     };
     "process-0.11.10" = {
@@ -6958,7 +7345,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
+        sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
       };
     };
     "promise-7.3.1" = {
@@ -6967,7 +7354,7 @@ let
       version = "7.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
+        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -6979,13 +7366,13 @@ let
         sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
       };
     };
-    "prompts-2.2.1" = {
+    "prompts-2.3.1" = {
       name = "prompts";
       packageName = "prompts";
-      version = "2.2.1";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz";
-        sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==";
+        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz";
+        sha512 = "0sdg37c3assj1gk6ybvyhzvkp891zqq7xqj34gcl41dnqgxyl5skijyf75pz5mhfi7cz8315id6430wnr4231yarpfqdhc21jazd0x8";
       };
     };
     "proto-list-1.2.4" = {
@@ -6997,13 +7384,13 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "proxy-addr-2.0.5" = {
+    "proxy-addr-2.0.6" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
-        sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
+        sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn";
       };
     };
     "prr-1.0.1" = {
@@ -7024,13 +7411,13 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "psl-1.1.32" = {
+    "psl-1.7.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.1.32";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz";
-        sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
+        sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4";
       };
     };
     "public-encrypt-4.0.3" = {
@@ -7039,7 +7426,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz";
-        sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==";
+        sha512 = "3qnsvs746b98ifyv12qj1g6hl6fq25vip5mswhvn3gnl7r32fids6mw3jb0gdcqrrl5x9ik475sf0vx6mbhmif49idkwjwrhbr5lnnd";
       };
     };
     "pug-2.0.4" = {
@@ -7048,7 +7435,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug/-/pug-2.0.4.tgz";
-        sha512 = "XhoaDlvi6NIzL49nu094R2NA6P37ijtgMDuWE+ofekDChvfKnzFal60bhSdiy8y2PBO6fmz3oMEIcfpBVRUdvw==";
+        sha512 = "2zis5am87x72261l3vnqzms2cybdk6bc8kqa6xdjxd337yayy3c4h3s3zm175iv61h3p2pvzpl40qs7g17vnrwg5wrx5s72bc71l6jy";
       };
     };
     "pug-attrs-2.0.4" = {
@@ -7057,7 +7444,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.4.tgz";
-        sha512 = "TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ==";
+        sha512 = "08vr4ngaa625x9jh03hs5alwzwlbw9wpgsxppr9r1vl28y3f8kyr4xis9li3dxpinrqacz4vnnwqidms56qvw2xf74z0l6ncikpi9jd";
       };
     };
     "pug-code-gen-2.0.2" = {
@@ -7066,7 +7453,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.2.tgz";
-        sha512 = "kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw==";
+        sha512 = "05xmnv15k0jm1wyvk92ih7wlf6w3l17qja8f59gjl101lk1lp5hw34bqb2rzi1l8wlvi1cwnncbhvsaj6biha0q17yiy7y0zxd8a4wi";
       };
     };
     "pug-error-1.3.3" = {
@@ -7075,7 +7462,7 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.3.tgz";
-        sha512 = "qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ==";
+        sha512 = "24id0x6g1wh6gq1b72ibrp653d0knzzlg0aqsfap9m7cqsx49vvn1ma5ghs67q98wbjfig18irgp42gdnkq0jf1b1069nlg8j2dhkd8";
       };
     };
     "pug-filters-3.1.1" = {
@@ -7084,7 +7471,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.1.tgz";
-        sha512 = "lFfjNyGEyVWC4BwX0WyvkoWLapI5xHSM3xZJFUhx4JM4XyyRdO8Aucc6pCygnqV2uSgJFaJWW3Ft1wCWSoQkQg==";
+        sha512 = "112912ajq0dfvbibdba458952wpd9cyl0na8fn7p40fyx4i5igki4z0f541aj8nvy679i1rj9m8p1cjmxnd25qww215bjc444vy6mwl";
       };
     };
     "pug-lexer-4.1.0" = {
@@ -7093,7 +7480,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.1.0.tgz";
-        sha512 = "i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA==";
+        sha512 = "0y1ljrsfpv6jacmhcghkn6s9n46vm0ziwrf55fyqb0g0afwhsx0bbmh5xhq9lz2xg1df3905zfy9bin02xf0mlrjqk6v3kd836757lb";
       };
     };
     "pug-linker-3.0.6" = {
@@ -7102,7 +7489,7 @@ let
       version = "3.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.6.tgz";
-        sha512 = "bagfuHttfQOpANGy1Y6NJ+0mNb7dD2MswFG2ZKj22s8g0wVsojpRlqveEQHmgXXcfROB2RT6oqbPYr9EN2ZWzg==";
+        sha512 = "375crip8jzn5kx6lbx19nc12dyxqxc1wq0i3pmbjr8km8kc0p9j1kysysl69djiq0n663yxpqsjdv97in7dbcni02lh6zbdgfw1za3d";
       };
     };
     "pug-load-2.0.12" = {
@@ -7111,7 +7498,7 @@ let
       version = "2.0.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.12.tgz";
-        sha512 = "UqpgGpyyXRYgJs/X60sE6SIf8UBsmcHYKNaOccyVLEuT6OPBIMo6xMPhoJnqtB3Q3BbO4Z3Bjz5qDsUWh4rXsg==";
+        sha512 = "2rdg2l72v2hwsiyiz0rvqff2vfd07dlxacs1qf3qhxcl861wgl96jrcjp6733nn53cc36bc83qiy8p90i5ypmyg4qh1cpdjkhd61ajj";
       };
     };
     "pug-parser-5.0.1" = {
@@ -7120,7 +7507,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.1.tgz";
-        sha512 = "nGHqK+w07p5/PsPIyzkTQfzlYfuqoiGjaoqHv1LjOv2ZLXmGX1O+4Vcvps+P4LhxZ3drYSljjq4b+Naid126wA==";
+        sha512 = "30blpbplbbgh6xfirijjqbbfxkp3f70iz7scbspw6z56pw6g4nrkz9swd9bz1wadaij38mazdhybz212cwwpj637rzrxvilxhmylqcw";
       };
     };
     "pug-runtime-2.0.5" = {
@@ -7129,7 +7516,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.5.tgz";
-        sha512 = "P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw==";
+        sha512 = "2vnj0qdc3rhxbi060mkcss7mwn6avl864vj16shbf9fwf97a2lblkd9g1g6pivqgxszzvrh3ilcaaqp5sbvdw5ycg88g7vfgwmdgsiz";
       };
     };
     "pug-strip-comments-1.0.4" = {
@@ -7138,7 +7525,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.4.tgz";
-        sha512 = "i5j/9CS4yFhSxHp5iKPHwigaig/VV9g+FgReLJWWHEHbvKsbqL0oP/K5ubuLco6Wu3Kan5p7u7qk8A4oLLh6vw==";
+        sha512 = "2zpmf1c507g195spdxrm7wsfaxrd3kjifxvkfgj7wlbva0vmfydnh8wjsajqph42qzdhmym1y51la62qyiqhybsqi95ij5q4ksgz64b";
       };
     };
     "pug-walk-1.1.8" = {
@@ -7147,7 +7534,7 @@ let
       version = "1.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.8.tgz";
-        sha512 = "GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA==";
+        sha512 = "1a288y26wmpn6f09g6z69xqmqazcvqn36fgrzwjm7wh9ik5pgqn44qvg06ibq2lvp9svz6nly5wni9v35y83plgpgipfbylk4rvgjqq";
       };
     };
     "pump-2.0.1" = {
@@ -7156,7 +7543,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz";
-        sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==";
+        sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf";
       };
     };
     "pump-3.0.0" = {
@@ -7165,7 +7552,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
-        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
+        sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
       };
     };
     "pumpify-1.5.1" = {
@@ -7174,7 +7561,7 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz";
-        sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==";
+        sha512 = "1sxm2mh7jmxhjqdrpdqrhc61ipk2cjyyyvsn9hmxlxnlpsasyzjdicl98pm63zv30012qhrxl57vdpdnnq2m2hl4w4ybgn7gqimjad0";
       };
     };
     "punycode-1.3.2" = {
@@ -7201,7 +7588,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+        sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx";
       };
     };
     "qs-6.5.2" = {
@@ -7210,7 +7597,7 @@ let
       version = "6.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
-        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
+        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
       };
     };
     "qs-6.7.0" = {
@@ -7219,7 +7606,16 @@ let
       version = "6.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz";
-        sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
+        sha512 = "34x6fm4dnq8m0kps5ann831k8fvx7jzlrcw8vvri0ki2g2ywdrjr8j5y14bvj9c0fd01ndsyx43y6ji51bfhnxk2gr5fpsks52429sl";
+      };
+    };
+    "query-string-5.1.1" = {
+      name = "query-string";
+      packageName = "query-string";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
+        sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2";
       };
     };
     "querystring-0.2.0" = {
@@ -7246,7 +7642,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz";
-        sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==";
+        sha512 = "1yd3j6k7rr39qm5zsh0k86znfksfcz9rbj48vv2dbsicnvvgzvw1vwl17vk2jlxszwqjiqsj9hy88r74wsdxf8by7a3wia2hk2cpdy3";
       };
     };
     "randombytes-2.1.0" = {
@@ -7255,7 +7651,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
-        sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
+        sha512 = "2cimbs750ysa2wxsiw9mmc1xqjb8w0c4s22p2mv2n676s8hchvzcl1l5p78jnk62d2jzacpr9zbl9w64kaqnipcbaa25q7ywn47g2dx";
       };
     };
     "randomfill-1.0.4" = {
@@ -7264,7 +7660,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz";
-        sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==";
+        sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk";
       };
     };
     "range-parser-1.2.1" = {
@@ -7273,7 +7669,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz";
-        sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
+        sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y";
       };
     };
     "raw-body-2.4.0" = {
@@ -7282,16 +7678,25 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz";
-        sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==";
+        sha512 = "3flyhj96ayiy8is22lwh9sp1yqq9ksym43x22yri2ikzladqqzxj6z657bc0xb5f2wl7qr2ja4byf57c9f7l2d3wqdglxih886zrv70";
       };
     };
-    "react-is-16.9.0" = {
+    "raw-body-2.4.1" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz";
+        sha512 = "1ngfzkci4v3yg989xbriv2giv775w4z9l34hyzfjhyh5ap8wdvc1sggkmqnkz19hgm5r3xyszrs7sppwslxi05r90sg14m6bql8hsgm";
+      };
+    };
+    "react-is-16.13.0" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.9.0";
+      version = "16.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz";
-        sha512 = "tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==";
+        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz";
+        sha512 = "00g57i5q020lc9cdswy1ba9bqds0a5wbpy88abfcbnjf0v54fmv4qcch3ad3336sdkxy4mjq3zaf142agbc0vkryipj14n79cpjslqq";
       };
     };
     "read-pkg-3.0.0" = {
@@ -7309,25 +7714,25 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz";
-        sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
+        sha512 = "28400v5dwid6mc9x40s2mwfbkn22vj0dzx0ix8n2bffjx4p2ivb9b60bh743c74kdp0v391rdmladhgvrjgzihns456n977gr451sz9";
       };
     };
-    "readable-stream-2.3.6" = {
+    "readable-stream-2.3.7" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
       };
     };
-    "readable-stream-3.4.0" = {
+    "readable-stream-3.6.0" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "3.4.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz";
-        sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05";
       };
     };
     "readdirp-2.2.1" = {
@@ -7336,7 +7741,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz";
-        sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
+        sha512 = "2yzl88bp25ig1xnrzqmqiwpfxyqkmdw27h3p90a4a58q0964xcijcx4i948msnlvin9f6hn5hmpxj1s90jzkj8aqxr5d04mmzr3z5fl";
       };
     };
     "realpath-native-1.1.0" = {
@@ -7345,7 +7750,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz";
-        sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==";
+        sha512 = "26fzz602hwidkkqwv7nk72xq07nlymik92psrcs5pifzqypr63pgz0sy8dzda0bpzl7abkz4kiy2z4f1w07xx5ch0yqh802lw1hyn62";
       };
     };
     "rechoir-0.6.2" = {
@@ -7363,7 +7768,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz";
-        sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==";
+        sha512 = "0m5jil0f2yz4js80jxvwilkhq6im5h6h0pa4disk3fsv9lm23lz8ly5219518j47v4fn0h248s9jf5pqhxhcr6z5cmxvbnna0js6vnl";
       };
     };
     "regenerator-runtime-0.11.1" = {
@@ -7372,7 +7777,7 @@ let
       version = "0.11.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
-        sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
+        sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj";
       };
     };
     "regenerator-transform-0.10.1" = {
@@ -7381,7 +7786,7 @@ let
       version = "0.10.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz";
-        sha512 = "PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==";
+        sha512 = "3lxj64s9v2jksipiz0pphfy6m12cf7j96w64bqlzjwnasbpqhc5ws5bjzv3x9ld625v1z4f15l30izpv3p6l9w8h1qsvf6vy1pak5rw";
       };
     };
     "regex-not-1.0.2" = {
@@ -7390,7 +7795,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz";
-        sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
+        sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917";
       };
     };
     "regexpu-core-2.0.0" = {
@@ -7435,7 +7840,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz";
-        sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==";
+        sha512 = "3dbpfrs4yh7dd9572m6dc8cxcgqacnvd24xm9licnw1hygqv51a18a84gm04sjssajbm437rq01raggrzmnzk4jnmbnxrnmk78sl4ba";
       };
     };
     "repeat-string-1.6.1" = {
@@ -7456,31 +7861,31 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
-    "request-2.88.0" = {
+    "request-2.88.2" = {
       name = "request";
       packageName = "request";
-      version = "2.88.0";
+      version = "2.88.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj";
       };
     };
-    "request-promise-core-1.1.2" = {
+    "request-promise-core-1.1.3" = {
       name = "request-promise-core";
       packageName = "request-promise-core";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz";
-        sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==";
+        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz";
+        sha512 = "00riv5nw32j70g67b1ll1h599bvdbnkgasnwl1m26pfdgdmgr6zaq500mprx5n77yrnhza27vs3c9icb4z5h6wnwmlha6f81bw3d2s0";
       };
     };
-    "request-promise-native-1.0.7" = {
+    "request-promise-native-1.0.8" = {
       name = "request-promise-native";
       packageName = "request-promise-native";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz";
-        sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==";
+        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz";
+        sha512 = "0qx1n06bjj430fidkma2dr90dmrixiza4ymk561v1xxpd5yp7r36lwirgsdn0nvra7s4xs9gs1xhd6fxvlps6q1wh5xq7m4d8n71akm";
       };
     };
     "require-directory-2.1.1" = {
@@ -7507,7 +7912,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
-        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
+        sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl";
       };
     };
     "requires-port-1.0.0" = {
@@ -7528,13 +7933,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.11.0" = {
+    "resolve-1.15.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.11.0";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz";
-        sha512 = "WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
+        sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -7582,6 +7987,15 @@ let
         sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
       };
     };
+    "responselike-1.0.2" = {
+      name = "responselike";
+      packageName = "responselike";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz";
+        sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
+      };
+    };
     "restore-cursor-2.0.0" = {
       name = "restore-cursor";
       packageName = "restore-cursor";
@@ -7597,7 +8011,7 @@ let
       version = "0.1.15";
       src = fetchurl {
         url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz";
-        sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
+        sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad";
       };
     };
     "retry-0.12.0" = {
@@ -7624,7 +8038,7 @@ let
       version = "2.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
-        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+        sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r";
       };
     };
     "ripemd160-2.0.2" = {
@@ -7633,7 +8047,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
-        sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
+        sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla";
       };
     };
     "rsvp-4.8.5" = {
@@ -7642,7 +8056,7 @@ let
       version = "4.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz";
-        sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==";
+        sha512 = "2wdl1qh3bdrji9q0whkrhj7gzryfipskamagkg5dq54phmg5c7ifp8va0b8saxs4xmi6c5mlvkh6gbk6r4nqrld4v8ykx5f0ja0xwwx";
       };
     };
     "run-queue-1.0.3" = {
@@ -7654,13 +8068,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "rxjs-6.5.2" = {
+    "rxjs-6.5.4" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.5.2";
+      version = "6.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz";
-        sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz";
+        sha512 = "3nzzg67sr57cc5n1065xsxjgrwa405bgbgqm9l8w01lnr660cy8zdjk99hm2n0did4kd75nwiz3843mfbrw7bs100n7g8q4r1fi18wx";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -7669,7 +8083,16 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+      };
+    };
+    "safe-buffer-5.2.0" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
+        sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
       };
     };
     "safe-regex-1.1.0" = {
@@ -7687,7 +8110,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
       };
     };
     "sane-4.1.0" = {
@@ -7696,7 +8119,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz";
-        sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==";
+        sha512 = "1jdy0h2kdi5d2lnxafnbxnqssf306v0pffvw10jspi9v899n7rxknzs78k7nnrgy1mgyfragq91y4ci7z7xksbp92xw6py80h1g65l6";
       };
     };
     "sax-1.2.4" = {
@@ -7705,7 +8128,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
       };
     };
     "schema-utils-1.0.0" = {
@@ -7714,7 +8137,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz";
-        sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==";
+        sha512 = "3kgnvyq6cxrlx9xwba75z4wp364mf4y4d66d92zwhjdw8nqg5jxzp1bfl6n5srl0aircw32nmry28a4476cpb3ijqzz78hars4wqvlb";
       };
     };
     "select-hose-2.0.0" = {
@@ -7726,22 +8149,22 @@ let
         sha1 = "625d8658f865af43ec962bfc376a37359a4994ca";
       };
     };
-    "selfsigned-1.10.6" = {
+    "selfsigned-1.10.7" = {
       name = "selfsigned";
       packageName = "selfsigned";
-      version = "1.10.6";
+      version = "1.10.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.6.tgz";
-        sha512 = "i3+CeqxL7DpAazgVpAGdKMwHuL63B5nhJMh9NQ7xmChGkA3jNFflq6Jyo1LLJYcr3idWiNOPWHCrm4zMayLG4w==";
+        url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz";
+        sha512 = "165gijv79k6g333d52fwfnna4z0myalk0cywvf9b6pysjfwlib4cvldycwx6yiiy099v9s0yhgvhq1sn21dqy7r85kq4n6y5h2g1kgh";
       };
     };
-    "semver-5.7.0" = {
+    "semver-5.7.1" = {
       name = "semver";
       packageName = "semver";
-      version = "5.7.0";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
-        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
       };
     };
     "semver-6.3.0" = {
@@ -7750,7 +8173,7 @@ let
       version = "6.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz";
-        sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
+        sha512 = "17wg4dv63jhss5hwqd135zz67r5c30b7a1xz33kfa7knxr0wfypyb8mj2xmc3l71qkxrz569n89xwp5d77m7adn0sr5wzfjlh2m6zvg";
       };
     };
     "send-0.17.1" = {
@@ -7759,7 +8182,7 @@ let
       version = "0.17.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz";
-        sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
+        sha512 = "016qgvxg1si6vn34p7piyc8mhvmav1zscm294wkcjf221y1l9zk5kwk5z6yn1ixspj12df25bpazb2h3fdclcf59xqc2h4w46r4mi86";
       };
     };
     "serialize-javascript-1.9.1" = {
@@ -7768,7 +8191,16 @@ let
       version = "1.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz";
-        sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==";
+        sha512 = "3a0kvzr1rq0l6v4l587sv58i0xgajs9863srkhxxlzq3dk5mj8r5sag4yyxfidzsbwcbygbg7wdm2nja97kg5n4y9plxsl9hpkzymni";
+      };
+    };
+    "serialize-javascript-2.1.2" = {
+      name = "serialize-javascript";
+      packageName = "serialize-javascript";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz";
+        sha512 = "26vhlfjji0jk84cvbcpna4h1nfvdwj19g7rjmvz9mzlm277cpgz7xw9q61yrp3x4amas66fxrz0p2rrndv737j4imw4a5ql0614xkxf";
       };
     };
     "serve-index-1.9.1" = {
@@ -7786,7 +8218,7 @@ let
       version = "1.14.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz";
-        sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==";
+        sha512 = "0551vv6s1vgk5krzdn9cwnybsv6g4cyqpkk1dlkyv1pd8n7m8r7pi12r16bw12dzwl6ghj4qwizjsxc8vl26lv9c61fkq9r059yzji4";
       };
     };
     "set-blocking-2.0.0" = {
@@ -7804,7 +8236,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz";
-        sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==";
+        sha512 = "15idn47lw67wfq0qfva85xnphqxkzz5apix6gwcnylmqw4ch7bqhq4vzdh53f327agpcg6pdzkbj8m72wm887wd8lqaydw20zbxq497";
       };
     };
     "setimmediate-1.0.5" = {
@@ -7822,7 +8254,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
-        sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==";
+        sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86";
       };
     };
     "setprototypeof-1.1.1" = {
@@ -7831,7 +8263,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz";
-        sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
+        sha512 = "01qxzb0a6jrcxa6qh776v04ihqrmcy3qfbp9drfsjhfcsmaqd21mppr3ndj970ixfh6bpm8ai45jyqyzjfjw26pcyd82y6pyrcl1xr6";
       };
     };
     "sha.js-2.4.11" = {
@@ -7840,7 +8272,7 @@ let
       version = "2.4.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
-        sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
+        sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0";
       };
     };
     "shebang-command-1.2.0" = {
@@ -7867,7 +8299,7 @@ let
       version = "0.8.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz";
-        sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==";
+        sha512 = "3ndzzikwq0c0084xy1s0v9q2msc8wc7qrmi0bi1llshsmlhfz4dn1k9i2r666ls7xmq62idmify0ksc1vq3mrjqcrqbm20na0m03kbx";
       };
     };
     "shellwords-0.1.1" = {
@@ -7876,7 +8308,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz";
-        sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
+        sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w";
       };
     };
     "sigmund-1.0.1" = {
@@ -7903,16 +8335,16 @@ let
       version = "1.96.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz";
-        sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ==";
+        sha512 = "0ywlgw61ydavyi2sw2yvzlha4yaxcasrzzkfkvwhv51qm1pciagcmchampclwjrs40wnn0ydhbh1krn1krsrfr6rjyx46k9j76fw1gs";
       };
     };
-    "sisteransi-1.0.3" = {
+    "sisteransi-1.0.4" = {
       name = "sisteransi";
       packageName = "sisteransi";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz";
-        sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==";
+        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz";
+        sha512 = "25g5in0cfm4qpjw7rw3pnqyln8svln98bh34hiwmmk51wkfyb93sg52x9xc2nahx1lhvg4np6v5dq8vbsm2k7v4pii9y9qdrsh0rsgx";
       };
     };
     "slash-1.0.0" = {
@@ -7930,7 +8362,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz";
-        sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==";
+        sha512 = "3sbrc1b1qf9m7lhlljmnc51k9bl7jbc9zfmdc4z55iafsck65d9ll77bifknvgvgbc0f0a7cvm1b785ab5d1avm27lm7kvnd3fs30k5";
       };
     };
     "snapdragon-0.8.2" = {
@@ -7939,7 +8371,7 @@ let
       version = "0.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
-        sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==";
+        sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n";
       };
     };
     "snapdragon-node-2.1.1" = {
@@ -7948,7 +8380,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
-        sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==";
+        sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv";
       };
     };
     "snapdragon-util-3.0.1" = {
@@ -7957,7 +8389,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
-        sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
+        sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr";
       };
     };
     "sockjs-0.3.19" = {
@@ -7966,16 +8398,25 @@ let
       version = "0.3.19";
       src = fetchurl {
         url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz";
-        sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==";
+        sha512 = "0pn77r3rgi2blxla6ilhf4madx8n0cprzb295mw5knx2hyhiwn60z8n8n8clsb1l0wddcrjj5x4rn24ydf2wnxbrn63xwb5lsa293sp";
       };
     };
-    "sockjs-client-1.3.0" = {
+    "sockjs-client-1.4.0" = {
       name = "sockjs-client";
       packageName = "sockjs-client";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz";
-        sha512 = "R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==";
+        url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz";
+        sha512 = "3pa683q7x6az2iwmd2bh0d2zwdkgklkfi4vpkwnxw4b49mgfdjkal83i9lzxlz6f6sqybyvb0mlyw0mmg9mdd76fawvi7izxz48ndp7";
+      };
+    };
+    "sort-keys-2.0.0" = {
+      name = "sort-keys";
+      packageName = "sort-keys";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz";
+        sha1 = "658535584861ec97d730d6cf41822e1f56684128";
       };
     };
     "source-list-map-2.0.1" = {
@@ -7984,7 +8425,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz";
-        sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==";
+        sha512 = "0izwdwncwz4s14qn5ahkb2mpcdpxq2arn5185dlhljns4nylsw2xfm425zi115ik4kz1vfa97qyix3vf3i149dyi1ndq61iaf0knx5a";
       };
     };
     "source-map-0.5.7" = {
@@ -8002,16 +8443,16 @@ let
       version = "0.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
-        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+        sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
       };
     };
-    "source-map-resolve-0.5.2" = {
+    "source-map-resolve-0.5.3" = {
       name = "source-map-resolve";
       packageName = "source-map-resolve";
-      version = "0.5.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
+        sha512 = "2gq1flmkac2lzw8rs6vpch0sanmv8r9gv6bggwkgxzj3n7gw33lbqzk7nk9vvsckdjjkm132jzbl3nxc69cf9bb7xz4wnhpgd3gxp0y";
       };
     };
     "source-map-support-0.4.18" = {
@@ -8020,16 +8461,16 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz";
-        sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
+        sha512 = "1n37icn5xpsxs2x8szv6ifajjf066fskm04xn6agr79sid57n0yws4n0cis7m9q5hr0hxzr8dv2fnmmpgb4mvz8kiyv2g5ikbyb9g5n";
       };
     };
-    "source-map-support-0.5.13" = {
+    "source-map-support-0.5.16" = {
       name = "source-map-support";
       packageName = "source-map-support";
-      version = "0.5.13";
+      version = "0.5.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz";
-        sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==";
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz";
+        sha512 = "1ayqxcigra517ylxbrvri7jlw55cv0m6a8j9j6060c5xsh519ip69jjp4jk6bqcj5ra5y318k6la6lfhpsj0k8hhkyw1szbj128pz3r";
       };
     };
     "source-map-url-0.4.0" = {
@@ -8047,7 +8488,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
-        sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
+        sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn";
       };
     };
     "spdx-exceptions-2.2.0" = {
@@ -8056,7 +8497,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
-        sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
+        sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r";
       };
     };
     "spdx-expression-parse-3.0.0" = {
@@ -8065,7 +8506,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
-        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
+        sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2";
       };
     };
     "spdx-license-ids-3.0.5" = {
@@ -8074,7 +8515,7 @@ let
       version = "3.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
+        sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97";
       };
     };
     "spdy-4.0.1" = {
@@ -8083,7 +8524,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz";
-        sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==";
+        sha512 = "2h245q80im9phjaghcl16kb4sv4n7igk0ch8dsqkq32dsfhcqysjx19blvd45whyaqh9r6309wc6pf6885apd1bcnn0yc2xy3f55rhx";
       };
     };
     "spdy-transport-3.0.0" = {
@@ -8092,7 +8533,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz";
-        sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==";
+        sha512 = "1rha3zyhardm434kr4h4y44wxpd49hqzzxqk1d9lqg91bkzfbp6qkh9nahdkkmpgbkc5021x8c8cy1aqnaph5ib1a9hx32j9qadbhl6";
       };
     };
     "split-string-3.1.0" = {
@@ -8101,7 +8542,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz";
-        sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
+        sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -8119,7 +8560,7 @@ let
       version = "1.16.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
-        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
+        sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x";
       };
     };
     "ssri-5.3.0" = {
@@ -8128,7 +8569,7 @@ let
       version = "5.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz";
-        sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==";
+        sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x";
       };
     };
     "ssri-6.0.1" = {
@@ -8137,7 +8578,7 @@ let
       version = "6.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz";
-        sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==";
+        sha512 = "107yg08ib4232ppannc6fw8ml8p1fssnvcf88cpq3s5ybq3r5ppxnmc32rp40i0ppbgxcw9q04d5rc90if0q3xyp953swad93biws6x";
       };
     };
     "stack-utils-1.0.2" = {
@@ -8146,7 +8587,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz";
-        sha512 = "MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==";
+        sha512 = "300alvgq7a9y0fyilyifhirpj9k0qvs6lx7g8msrs6lilcs8wjgl3jzckcs3mvp5v6bi2g7q6k1ml18zpgqvr5cf5wdylxrw4qzwd9i";
       };
     };
     "static-extend-0.1.2" = {
@@ -8182,7 +8623,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz";
-        sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==";
+        sha512 = "2mfvadpwj9mzxps4arl1frxlkz96hfp0sc5pvq76s0ijf8fgw26mm3a721zq3iz1f8155w3a41wkixbdlwn1cavv0mzics796da2zlx";
       };
     };
     "stream-each-1.2.3" = {
@@ -8191,7 +8632,7 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz";
-        sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==";
+        sha512 = "0pxki70s41jg18b738qvcwxlcakp6658ksicxkcgg8wp9q97fwp3mv13c5k38k47vxkyyk951k7gzavs3r7b93ackdyznh8zzch4lxy";
       };
     };
     "stream-http-2.8.3" = {
@@ -8200,16 +8641,25 @@ let
       version = "2.8.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz";
-        sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
+        sha512 = "19y2xbs1xzzpjwfdczl21d0d76ahd7013cr3mhfa6a8nbwwv9jpncng8idf0g8hnmnq2mcl3xh912rjlasl06wsz44qw3j7hdya8d7r";
       };
     };
-    "stream-shift-1.0.0" = {
+    "stream-shift-1.0.1" = {
       name = "stream-shift";
       packageName = "stream-shift";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
-        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz";
+        sha512 = "1ai59bc5x8d6a1c37fp2d2gi6q7x6fhza2jsf1sblrdvbza8j14a4xnp20lg65b8lzm0s95m3pqizblbj6ks44qf73gdllhbahaqa02";
+      };
+    };
+    "strict-uri-encode-1.1.0" = {
+      name = "strict-uri-encode";
+      packageName = "strict-uri-encode";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
+        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
       };
     };
     "string-length-2.0.0" = {
@@ -8236,7 +8686,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
     "string-width-3.1.0" = {
@@ -8245,25 +8695,25 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
-        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
+        sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx";
       };
     };
-    "string.prototype.trimleft-2.1.0" = {
+    "string.prototype.trimleft-2.1.1" = {
       name = "string.prototype.trimleft";
       packageName = "string.prototype.trimleft";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
-        sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca";
       };
     };
-    "string.prototype.trimright-2.1.0" = {
+    "string.prototype.trimright-2.1.1" = {
       name = "string.prototype.trimright";
       packageName = "string.prototype.trimright";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
-        sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8";
       };
     };
     "string_decoder-1.1.1" = {
@@ -8272,7 +8722,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
       };
     };
     "strip-ansi-3.0.1" = {
@@ -8299,7 +8749,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
-        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
+        sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f";
       };
     };
     "strip-bom-3.0.0" = {
@@ -8335,7 +8785,7 @@ let
       version = "5.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
-        sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
+        sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2";
       };
     };
     "supports-color-6.1.0" = {
@@ -8344,7 +8794,7 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz";
-        sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==";
+        sha512 = "30pwyjmww4d54bf2m6lpw20ly4blhb88sy3gn6qcjih2rfq1s5zsl1nszzwgj2j1gqn3c8mw52df0z26rqyk8flzimb70scdmz67vd9";
       };
     };
     "symbol-tree-3.2.4" = {
@@ -8353,7 +8803,7 @@ let
       version = "3.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz";
-        sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==";
+        sha512 = "17zjr1mhbpxi4zhrmghix8hw1pi9svlwzjxz51mj2hxx9qpjwn1z9rlyrmdn55hbdiqnl8m9gkci2294swkkwp3rxpy05q3mkj680zm";
       };
     };
     "tapable-1.1.3" = {
@@ -8362,25 +8812,25 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz";
-        sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
+        sha512 = "283f6rp3hhj0lvi5smcvh4mq56mifjchgv6qlnr4qb1xs2fsyb2vy71b308h1285nngcz8q7cbmjp8qqzh0im71mx5wr3v6hrnvyqp1";
       };
     };
-    "terser-4.3.3" = {
+    "terser-4.6.6" = {
       name = "terser";
       packageName = "terser";
-      version = "4.3.3";
+      version = "4.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-4.3.3.tgz";
-        sha512 = "Nzr7dpRjSzMEUS+z2UYQBtzE0LDm5k0Yy8RgLRPy85QUo1TjU5lIOBwzS5/FVAMaVyHZ3WTTU2BuQcMn8KXnNQ==";
+        url = "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz";
+        sha512 = "3b8jz65d3105j7jw1b5jv6ww4z89nr3zjvwzsv7sk6n6sn469bnwxf1x04n7cixyz2xrnlz24yx8sw30wmzzas4434dick6wg4hymp2";
       };
     };
-    "terser-webpack-plugin-1.4.1" = {
+    "terser-webpack-plugin-1.4.3" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
-      version = "1.4.1";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz";
-        sha512 = "ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==";
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz";
+        sha512 = "2n44cgqgz070skn207m3l6zg3q444p1db54g0j87fcjxwyhmlfvgg3kak5v1ffhg765cdxah1l99kjdcy74mc75nlq7907zbiq5xk20";
       };
     };
     "test-exclude-5.2.3" = {
@@ -8389,7 +8839,7 @@ let
       version = "5.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz";
-        sha512 = "M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==";
+        sha512 = "3dgwbvh6yz24lh2kbdigw3j3kpxmmvlrqdhlc4innvrmyj0wvhs5ayckl00161sdx6a2pik344ggs49w9z1h6nh1v2fs542qyv33sik";
       };
     };
     "thenify-3.3.0" = {
@@ -8425,16 +8875,25 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz";
-        sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
+        sha512 = "14xi6lbly1f37015ny2pzcnf5kaksjmpnhm61gfhwn686w5ac519qb1icxdda974n84f342g0y15kysj1hci2vl40z91aiivyhx2spy";
       };
     };
-    "thunky-1.0.3" = {
+    "thunky-1.1.0" = {
       name = "thunky";
       packageName = "thunky";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz";
-        sha512 = "YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==";
+        url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz";
+        sha512 = "2n8ys98dmv1625inb52cdr421ry82ri2sninmss1njzy9hxrlblw3fkvgr3na4d69glygww3g80bj4pgr9ik1zcm10ki0gd2yf3nxkq";
+      };
+    };
+    "timed-out-4.0.1" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz";
+        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
     "timers-browserify-2.0.11" = {
@@ -8443,7 +8902,7 @@ let
       version = "2.0.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz";
-        sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==";
+        sha512 = "0lrwqck7qvpvxswx5kmydj9nmn2rwckzzfpdf5mf869fqrs9girj45i80hdv99b81m4g8fgwqx2lqk04k7zars7rldq3r89r3m9aipb";
       };
     };
     "tmpl-1.0.4" = {
@@ -8497,7 +8956,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz";
-        sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==";
+        sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm";
       };
     };
     "to-regex-range-2.1.1" = {
@@ -8515,7 +8974,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz";
-        sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
+        sha512 = "1bip1yxcfy4c0yl2kwmj9jyzfg1ixyj564wd1aaf46rabdiasx62yznb8bwn9cki886f353axgca42zma7q9rb4b50lhm1zz7y8g8y9";
       };
     };
     "token-stream-0.0.1" = {
@@ -8527,22 +8986,13 @@ let
         sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
       };
     };
-    "tough-cookie-2.4.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
-      };
-    };
     "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
-        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
+        sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly";
       };
     };
     "tr46-1.0.1" = {
@@ -8569,25 +9019,34 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz";
-        sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==";
+        sha512 = "0092ym5f8nqn9kwk6wczdd9g9cmyakl54rqrmrmhj1ncm4c5p8iy2sjxkxybnqp4y4bxsabar5kalggrz787665r6lnb49zpz4xlz3k";
       };
     };
-    "ts-jest-24.0.2" = {
+    "ts-jest-24.3.0" = {
       name = "ts-jest";
       packageName = "ts-jest";
-      version = "24.0.2";
+      version = "24.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.0.2.tgz";
-        sha512 = "h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==";
+        url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz";
+        sha512 = "1arvrclb8plyklschblbipqilv7gih7yh7my5flmpa6y50x0908x7viisbb5wj93v4r2d12xcbi9rm2n0jwljcraliqhi4hzw5pigqx";
       };
     };
-    "tslib-1.10.0" = {
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.10.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
-        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9";
+      };
+    };
+    "tsscmp-1.0.6" = {
+      name = "tsscmp";
+      packageName = "tsscmp";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz";
+        sha512 = "104f0vccp42fba9r2ij7ww4r7mazkmvqgj8is4ipg0jfx190n967qq5b1g0n77kcmm4d2m3l3q3cmh5kqgdmv886514akn38c16s61g";
       };
     };
     "tty-browserify-0.0.0" = {
@@ -8623,7 +9082,16 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
-        sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
+        sha512 = "1z2f06mzr855vwxwr0wkndnkn3fnjcwisd3iajkh6dmzz0dn1a5amq7m798j1ass4kiymz4gn3q0c573l21377dkq1ap2i703jfv6gv";
+      };
+    };
+    "type-2.0.0" = {
+      name = "type";
+      packageName = "type";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type/-/type-2.0.0.tgz";
+        sha512 = "2iyk1bl159vr7i0r24jawi0lwrgns8xvsw72962lvzw6qshm5blls6p7spkpcqpgwb0p7liwdix0ph0j22dip1rg812xbw723rpj6r8";
       };
     };
     "type-check-0.3.2" = {
@@ -8641,7 +9109,7 @@ let
       version = "1.6.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz";
-        sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
+        sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f";
       };
     };
     "typedarray-0.0.6" = {
@@ -8659,16 +9127,16 @@ let
       version = "3.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz";
-        sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
+        sha512 = "3cvrfgjsyvnh9fdyixjzx9mwkfcjfyhgsjizzxzmrsvb1pwch0y58crjh7p6b0ml9nl7jr55nx5dyslq3jn15qz555fl3a4qdfbrnyd";
       };
     };
-    "typescript-3.5.2" = {
+    "typescript-3.8.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.5.2";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz";
-        sha512 = "7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
+        sha512 = "3rwcbg3l3w3l2zr5y9lszqs30s29jzvh1w594rbdljyr582yi6vajzs2fg04s9p79klh3iv0980b91mbr94sl77h9nb7b2mgrz4929i";
       };
     };
     "typical-4.0.0" = {
@@ -8677,7 +9145,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz";
-        sha512 = "VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==";
+        sha512 = "13n01mbvkc5ikjpc69q3ixakq46pp2nbagrwz2a40ff7as9sandwzp51nhh6hy42l9yxq2pjv2y1whds49yq7akh9c3211vyhigh0al";
       };
     };
     "uglify-js-2.8.29" = {
@@ -8689,15 +9157,6 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.6.0" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz";
-        sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==";
-      };
-    };
     "uglify-to-browserify-1.0.2" = {
       name = "uglify-to-browserify";
       packageName = "uglify-to-browserify";
@@ -8707,13 +9166,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "underscore-1.9.1" = {
+    "underscore-1.9.2" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.9.1";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
-        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
+        sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg";
       };
     };
     "union-value-1.0.1" = {
@@ -8722,7 +9181,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz";
-        sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==";
+        sha512 = "1g7i0bs3sa35zpsrr2l3wsz4j6bqpxgm77kg2fdz89irzw6nrk6j93j61wr134mg9rbf039xa4pp1dw0iqfsv15rkf8jn8y2fdxg5xl";
       };
     };
     "unique-filename-1.1.1" = {
@@ -8731,7 +9190,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz";
-        sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==";
+        sha512 = "0sp2fs9gsv3l6mc9kdk09z835d54gw04x02dlz9q208mda3f6bmqd4vix4634kv9njvvxcz3iswcj6fwcmszvima7wpv5knia678sjn";
       };
     };
     "unique-slug-2.0.2" = {
@@ -8740,16 +9199,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz";
-        sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==";
-      };
-    };
-    "universalify-0.1.2" = {
-      name = "universalify";
-      packageName = "universalify";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
-        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
+        sha512 = "3dz3f3rqwqssr86c072j9m8m7l98l20b3i75diqrq5l871d647jmdf7pjjml7l83iqvjnb2frz7h6xbs8rpx3rkvk1h5i6swvsap1ff";
       };
     };
     "unpipe-1.0.0" = {
@@ -8776,7 +9226,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz";
-        sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
+        sha512 = "230pbhzxv0jr9n43qhghbsdbsp1rwalc3rclaqscwjaazi35s6vzw9p66s3ypk6yn3jgpmqflda2yh8j2rlypz9vihasfw5m6jhd739";
       };
     };
     "uri-js-4.2.2" = {
@@ -8785,16 +9235,16 @@ let
       version = "4.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
-        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
+        sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9";
       };
     };
-    "urijs-1.19.1" = {
+    "urijs-1.19.2" = {
       name = "urijs";
       packageName = "urijs";
-      version = "1.19.1";
+      version = "1.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz";
-        sha512 = "xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==";
+        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz";
+        sha512 = "3mmrbgqk7ihxy43py896gl9cv3q8bapnwfg5vcsd82b5mlkd3qa4i7vfdihpk5c2jxkhz5anm8qxxm31fahfi3xxkcr7q59ssmhixdk";
       };
     };
     "urix-0.1.0" = {
@@ -8821,7 +9271,25 @@ let
       version = "1.4.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz";
-        sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==";
+        sha512 = "2bdb8rqxq8xd530jx6q8awb1y9idrvd8cfznrlyc1h8j4ra1icxcssfg7qldhssj6dxvibkvx6rnn1ljkjbxi95l58dn1y35ibrlyvp";
+      };
+    };
+    "url-parse-lax-3.0.0" = {
+      name = "url-parse-lax";
+      packageName = "url-parse-lax";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz";
+        sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c";
+      };
+    };
+    "url-to-options-1.0.1" = {
+      name = "url-to-options";
+      packageName = "url-to-options";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz";
+        sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9";
       };
     };
     "use-3.1.1" = {
@@ -8830,7 +9298,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz";
-        sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==";
+        sha512 = "2hzzynss1cv7kn1lf40hqk16qmbf38g7a28m27pcg05mg6vpf7sj0gy175fdscz534fxdi14622rmq3sdpib9c5ypjympjfg5ai40bk";
       };
     };
     "util-0.10.3" = {
@@ -8848,7 +9316,7 @@ let
       version = "0.11.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz";
-        sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==";
+        sha512 = "0fpzl6qczbzr5jniy99vgfxz1k4gdfl13lwwhlfysj22rm18ikfici89wpgv34v67ckays1d500fgk2dlzw95zncn9jvkdygjr40a0x";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -8860,13 +9328,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "util.promisify-1.0.0" = {
+    "util.promisify-1.0.1" = {
       name = "util.promisify";
       packageName = "util.promisify";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
-        sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
+        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz";
+        sha512 = "2n8sxd1qdzc7pn348ayx8jm13kvi9wyjkshzwy1fam3aiy8phv8lbikbli433qvnq3ndnqj8yhcf9dgavm2xv6cvzk7cyy7zl5nkll3";
       };
     };
     "utils-merge-1.0.1" = {
@@ -8878,22 +9346,22 @@ let
         sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
       };
     };
-    "uuid-3.3.2" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.2";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
       };
     };
-    "v8-compile-cache-2.1.0" = {
+    "v8-compile-cache-2.0.3" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
-      version = "2.1.0";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz";
-        sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==";
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz";
+        sha512 = "3givf3csckgfmf3aahy2cdnn1wanqnyjhxq52s8mi349v658g9izi20prr2y5m8gxrv69idkvvwp5njwqds49kbyhmkq1hc0iprvn88";
       };
     };
     "validate-npm-package-license-3.0.4" = {
@@ -8902,7 +9370,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
-        sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
+        sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf";
       };
     };
     "vary-1.1.2" = {
@@ -8923,13 +9391,13 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vm-browserify-1.1.0" = {
+    "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
-        sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
+        sha512 = "00japcjqx1df1bgck837ds0xvg5dr7g4j30a38zhbmanqss2kyxs4p7pgmldlnxpa31js50gydy8x9qi89s4x74iidf6k6nfgqsc5ns";
       };
     };
     "void-elements-2.0.1" = {
@@ -8941,13 +9409,13 @@ let
         sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
       };
     };
-    "w3c-hr-time-1.0.1" = {
+    "w3c-hr-time-1.0.2" = {
       name = "w3c-hr-time";
       packageName = "w3c-hr-time";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
-        sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
+        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
+        sha512 = "1ykk57cjg94sdr82b43a5q815xrd4yhvpqzdwlpvfi50zv5zw4cincppdbkmizdc4zkmym57s8rqmpj5fpyxjl12kla136dy07gkhyg";
       };
     };
     "walker-1.0.7" = {
@@ -8965,7 +9433,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz";
-        sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==";
+        sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb";
       };
     };
     "wbuf-1.7.3" = {
@@ -8974,7 +9442,7 @@ let
       version = "1.7.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz";
-        sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==";
+        sha512 = "066j9njgvk6mkjalv1zf1p8w9m2hrl97vz1iw8q6g9zlplhphz54j5j0ma0x9053zhczbyi3k1nr493vgnx1lk22hdwp2glg8x11kiv";
       };
     };
     "wcwidth-1.0.1" = {
@@ -8992,52 +9460,52 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
-        sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
+        sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1";
       };
     };
-    "webpack-4.35.0" = {
+    "webpack-4.42.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "4.35.0";
+      version = "4.42.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.35.0.tgz";
-        sha512 = "M5hL3qpVvtr8d4YaJANbAQBc4uT01G33eDpl/psRTBCfjxFTihdhin1NtAKB1ruDwzeVdcsHHV3NX+QsAgOosw==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz";
+        sha512 = "3my3qykp4laavc26aad536i8n5h6isv7rnrsv092i7nbyy7dkpi59w3jsxrz7yhbrzwvyiqs78kv8q2plswm8camnc1ij0hzhg52chk";
       };
     };
-    "webpack-bundle-analyzer-3.3.2" = {
+    "webpack-bundle-analyzer-3.6.1" = {
       name = "webpack-bundle-analyzer";
       packageName = "webpack-bundle-analyzer";
-      version = "3.3.2";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz";
-        sha512 = "7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==";
+        url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz";
+        sha512 = "13z3rjpds6nclkfxhf6pdnmp78a485psglljlmzibrlx4anhldzw2rvdwi9hzzjpfpi8d7ihhwc1w8s1k23zgh00xqisjqz7hf7rxrm";
       };
     };
-    "webpack-cli-3.3.4" = {
+    "webpack-cli-3.3.11" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.4";
+      version = "3.3.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.4.tgz";
-        sha512 = "ubJGQEKMtBSpT+LiL5hXvn2GIOWiRWItR1DGUqJRhwRBeGhpRXjvF5f0erqdRJLErkfqS5/Ldkkedh4AL5Q1ZQ==";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz";
+        sha512 = "3i5vq7c9hpjb8z9x68dq56cjmv5hs584vgci6zbc7n0m8y1fk4y1kv4pyrq4q9crlkwirwy6gh5w3q0a2xv43w5q42z1ikvd6x5yybm";
       };
     };
-    "webpack-dev-middleware-3.7.1" = {
+    "webpack-dev-middleware-3.7.2" = {
       name = "webpack-dev-middleware";
       packageName = "webpack-dev-middleware";
-      version = "3.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz";
-        sha512 = "5MWu9SH1z3hY7oHOV6Kbkz5x7hXbxK56mGHNqHTe6d+ewxOwKUxoUJBs7QIaJb33lPjl9bJZ3X0vCoooUzC36A==";
-      };
-    };
-    "webpack-dev-server-3.7.2" = {
-      name = "webpack-dev-server";
-      packageName = "webpack-dev-server";
       version = "3.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz";
-        sha512 = "mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==";
+        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz";
+        sha512 = "27qjisacr2wrfj7r3z5hh2x7nrhadc27vg4kcalrdc7rrn8gnnlk64zf1pqmlkffy8klh8r0dr259v1sf6fjm886j5qlqjvpkcbh46p";
+      };
+    };
+    "webpack-dev-server-3.10.3" = {
+      name = "webpack-dev-server";
+      packageName = "webpack-dev-server";
+      version = "3.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz";
+        sha512 = "1wl6ahwwfvm7620d70by2abmqgvw54mdhr8bxhdnnsvjzincy83rg80vffb1vwm2cvxwdc9qpp7ipq8bqrkf773fi6lbk0qzxxdd2bv";
       };
     };
     "webpack-log-1.2.0" = {
@@ -9046,7 +9514,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz";
-        sha512 = "U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==";
+        sha512 = "0f0lcci53li31zhx7vhwaq4di0xvhd0n02rgy54kb4bcq6fzki0lz34s6ldzwf1ppaqw1n6jc3hp64blldhz8ianvbl3rzf54h2gl2k";
       };
     };
     "webpack-log-2.0.0" = {
@@ -9055,7 +9523,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz";
-        sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==";
+        sha512 = "191qr8nb4rszy53q0ydqfxr1pirimc3k3bi7mhgin5f15cd7vd28maxanyb248kdivmajhji580fv3a1i584icz3cc9bwvzykd0czvi";
       };
     };
     "webpack-sources-1.4.3" = {
@@ -9064,16 +9532,16 @@ let
       version = "1.4.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz";
-        sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
+        sha512 = "1wn7ixcv4b15kj3jn4c08n3pgrrd2kgzm2llh9viqx6a6k3j6rqzd5iksxdkalzaz6iic1q4fjj6wr9wfa07llf5a751mkgg3fx414n";
       };
     };
-    "websocket-1.0.28" = {
+    "websocket-1.0.31" = {
       name = "websocket";
       packageName = "websocket";
-      version = "1.0.28";
+      version = "1.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket/-/websocket-1.0.28.tgz";
-        sha512 = "00y/20/80P7H4bCYkzuuvvfDvh+dgtXi5kzDf3UcZwN6boTYaKvsrtZ5lIYm1Gsg48siMErd9M4zjSYfYFHTrA==";
+        url = "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz";
+        sha512 = "22yr8a52nsijkqybp8fgzvh69wxrhmcqmcmjvmdwl6m9qix0lxdyakbvznj0wr90nl3mw5j4srhgxp6p8ihipil2j5gha66bfk2w2jl";
       };
     };
     "websocket-driver-0.7.3" = {
@@ -9082,7 +9550,7 @@ let
       version = "0.7.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz";
-        sha512 = "bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==";
+        sha512 = "0b5m603phj37lw5vb70ijc77g29cz7vn1w1bs7rhkx1ax3gil0wys841m14gnm3p95lc630hs370dngh68p7aaq69yqw1yvysb5d73f";
       };
     };
     "websocket-extensions-0.1.3" = {
@@ -9091,7 +9559,7 @@ let
       version = "0.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz";
-        sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==";
+        sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy";
       };
     };
     "whatwg-encoding-1.0.5" = {
@@ -9100,7 +9568,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";
-        sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==";
+        sha512 = "09x9fa2rb8a6lmwy9hs7z4qn2bsyqw8l2hmfy50z3fa496x3p2xadmlccm8ad17nam5fz77z9mndw2yqp8jpvyw3ryz6f09ksdn56bg";
       };
     };
     "whatwg-mimetype-2.3.0" = {
@@ -9109,7 +9577,7 @@ let
       version = "2.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz";
-        sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==";
+        sha512 = "3zaycdfc1hh0i4r1c42vgkzwmlfv8j68d90f6i577735i40hk9p9m790g2z2dlmdkchn2z73yj0zs73fmpjdnx4xwrp80m6pv18r31k";
       };
     };
     "whatwg-url-6.5.0" = {
@@ -9118,16 +9586,16 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz";
-        sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==";
+        sha512 = "36rzky2jm48j68kfvdhvr0cmbnvr2liaagpnnypc59mlvq4bbcwx9qbdb93hbi4vwx0w287zphiardpmfwyjl2ab58b4k3zmi35j55f";
       };
     };
-    "whatwg-url-7.0.0" = {
+    "whatwg-url-7.1.0" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
-      version = "7.0.0";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz";
-        sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==";
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz";
+        sha512 = "1xa656b9abn0fnwqaybjm3h5gs9x26cc3zj7jkk5n3865l9d1wqpp461s4l3i2mgbwf90q6psgvbb80lbrmkihbl4xq7bj31m3bnjsr";
       };
     };
     "which-1.3.1" = {
@@ -9136,7 +9604,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
-        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
+        sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz";
       };
     };
     "which-module-2.0.0" = {
@@ -9166,6 +9634,15 @@ let
         sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
       };
     };
+    "word-wrap-1.2.3" = {
+      name = "word-wrap";
+      packageName = "word-wrap";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";
+        sha512 = "2ykkqcs7vmimn8dsvs7xl55j0lbbrfj0nij9i7yqnxg9g759vqyrdis8w5n82k6xvas03x0xhgmbzjgsp7v803mzihx9d12vjnfcgqz";
+      };
+    };
     "wordwrap-0.0.2" = {
       name = "wordwrap";
       packageName = "wordwrap";
@@ -9175,22 +9652,13 @@ let
         sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
       };
     };
-    "wordwrap-1.0.0" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
-      };
-    };
     "worker-farm-1.7.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz";
-        sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==";
+        sha512 = "37m9wq9rvylb71n9kw3qghinwa3x4sggz82k29aall83izni78ijnh8rd6nhas8advw0lbnhby8z74vjlhp3sjsr4qm1wjw6r0kgz5f";
       };
     };
     "wrap-ansi-2.1.0" = {
@@ -9208,7 +9676,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
-        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
+        sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0";
       };
     };
     "wrappy-1.0.2" = {
@@ -9226,7 +9694,7 @@ let
       version = "2.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz";
-        sha512 = "TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==";
+        sha512 = "2zcd4w8bmjv2qg25v2ysnj63r717jb6zmrh2f4c92r0dh0zwj3ybyzg5h619b4adxksn67cg8y5pgn43hq7wl8ih3z7nchrj5wwaqac";
       };
     };
     "ws-5.2.2" = {
@@ -9235,7 +9703,7 @@ let
       version = "5.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz";
-        sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==";
+        sha512 = "0f6ay7yn6xslzh3h66d5krqnp48d9g3ikwk0ijiyyxfkwaqxxf3b0qdswy6ych79mj44315qd16snlnk6m6npc5l0habgy5lc7wb8cd";
       };
     };
     "ws-6.2.1" = {
@@ -9244,7 +9712,7 @@ let
       version = "6.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz";
-        sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==";
+        sha512 = "2l27cfiaw6syjvy6vbpqf5c2swd37bqviizzck6842xlankppm9j1sg79x3m8jpda8v6khcpnm5ssab1b8vf34qpviv41ww5mf8130q";
       };
     };
     "xml-name-validator-3.0.0" = {
@@ -9253,7 +9721,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz";
-        sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==";
+        sha512 = "0zzh3xf5vk49fghwrf83qvq6v98qin1brnwd7yyh7qs05gc1w3xni0w17sj33534jrkm2za7wkm4q5rhgpchds54i5grcj3vjk99403";
       };
     };
     "xtend-4.0.2" = {
@@ -9262,7 +9730,7 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz";
-        sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
+        sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic";
       };
     };
     "y18n-4.0.0" = {
@@ -9271,7 +9739,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+        sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g";
       };
     };
     "yaeti-0.0.6" = {
@@ -9292,13 +9760,13 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "yallist-3.1.0" = {
+    "yallist-3.1.1" = {
       name = "yallist";
       packageName = "yallist";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.0.tgz";
-        sha512 = "6gpP93MR+VOOehKbCPchro3wFZNSNmek8A2kbkOAZLIZAYx1KP/zAqwO0sOHi3xJEb+UBz8NaYt/17UNit1Q9w==";
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
+        sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
       };
     };
     "yargs-12.0.5" = {
@@ -9307,16 +9775,25 @@ let
       version = "12.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
-        sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
+        sha512 = "1kjmh68p4rb4c04s0gk4ra20crfr32h6v9zhj4clrz61xanslza9g3drbf6471mmvqq3vmxk04grmgillx1rsp6v2zim7wqnr6gq71f";
       };
     };
-    "yargs-13.3.0" = {
+    "yargs-13.2.4" = {
       name = "yargs";
       packageName = "yargs";
-      version = "13.3.0";
+      version = "13.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
-        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz";
+        sha512 = "2ba88a0fmf5k7dddcbkyhlmh7pijzczza486f2vq9pyw739r7q4yy2xmv4hk8w4ibrj4sjgf6zw01phb89h4j9z3lkz1m2s09cc6vqw";
+      };
+    };
+    "yargs-13.3.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "13.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
+        sha512 = "19rg5b2rhj2kg44as5vv9jxmpr39lw250885w6nlfwyhvwd5nxnnx7fc35v7h615i65cik7k3wi7ac20c91kcgfi5wy7blgk31xjz81";
       };
     };
     "yargs-3.10.0" = {
@@ -9334,7 +9811,7 @@ let
       version = "10.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz";
-        sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==";
+        sha512 = "1nj7f7y3kyrc1ijsgnaf4mdkxhxy38lnckavl6inh9wwzhx12xfmgq0n45x4fbj0y6rd1zhjv57l49qm07kqfd9a9cl1809bi3k48jl";
       };
     };
     "yargs-parser-11.1.1" = {
@@ -9343,25 +9820,16 @@ let
       version = "11.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
-        sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
+        sha512 = "14iaywclwncdp3p7878q12cqgdc5rbkl0f6ghi9g7k7f4f1bbqi41dc5ki6hnqmy6jbfk0kx88m47vk3igrql5j6i7ar2a3cbyh3a8b";
       };
     };
-    "yargs-parser-13.1.1" = {
+    "yargs-parser-13.1.2" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "13.1.1";
+      version = "13.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
-        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
-      };
-    };
-    "yarn-1.16.0" = {
-      name = "yarn";
-      packageName = "yarn";
-      version = "1.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz";
-        sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
+        sha512 = "375nan6m28q81h8q9a8vmcxgiq7s81yn1ql7zdikac0c4j2kmxdjzmbq14fcp9jm4ilcfzkd9ym4x7c80s7r6g488wf13zz2wsyqmny";
       };
     };
     "ylru-1.2.1" = {
@@ -9370,61 +9838,68 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz";
-        sha512 = "faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==";
+        sha512 = "2yw1b7v991krvw6f597i39x9sqp12qxlfnqz8zd75x00m7jp2a08b2zivbx59b5ih7ka14swqmpfk9ni2inkdjh363z0w1ksfl2p93x";
       };
     };
   };
-  args = {
+in
+{
+  "spacegun-git+https://github.com/dvallin/spacegun.git#v0.3.3" = nodeEnv.buildNodePackage {
     name = "spacegun";
     packageName = "spacegun";
     version = "0.3.3";
-    src = ./.;
+    src = fetchgit {
+      url = "https://github.com/dvallin/spacegun.git";
+      rev = "d32d2df34362f6744e8cff34c2d2bf6ce8b4662a";
+      sha256 = "589bfc9e3e26af38989144e8551547cbeb5ffc9a0b668a7a4cb211a2ebf7a931";
+    };
     dependencies = [
-      sources."@babel/code-frame-7.5.5"
-      (sources."@babel/core-7.6.2" // {
+      sources."@babel/code-frame-7.8.3"
+      (sources."@babel/core-7.8.7" // {
         dependencies = [
           sources."debug-4.1.1"
-          sources."json5-2.1.0"
-          sources."lodash-4.17.15"
+          sources."json5-2.1.1"
+          sources."minimist-1.2.5"
           sources."ms-2.1.2"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.6.2" // {
+      (sources."@babel/generator-7.8.8" // {
         dependencies = [
           sources."jsesc-2.5.2"
-          sources."lodash-4.17.15"
           sources."source-map-0.5.7"
         ];
       })
-      sources."@babel/helper-function-name-7.1.0"
-      sources."@babel/helper-get-function-arity-7.0.0"
-      sources."@babel/helper-plugin-utils-7.0.0"
-      sources."@babel/helper-split-export-declaration-7.4.4"
-      sources."@babel/helpers-7.6.2"
-      (sources."@babel/highlight-7.5.0" // {
+      sources."@babel/helper-function-name-7.8.3"
+      sources."@babel/helper-get-function-arity-7.8.3"
+      sources."@babel/helper-plugin-utils-7.8.3"
+      sources."@babel/helper-split-export-declaration-7.8.3"
+      sources."@babel/helpers-7.8.4"
+      (sources."@babel/highlight-7.8.3" // {
         dependencies = [
           sources."js-tokens-4.0.0"
         ];
       })
-      sources."@babel/parser-7.6.2"
-      sources."@babel/plugin-syntax-object-rest-spread-7.2.0"
-      sources."@babel/template-7.6.0"
-      (sources."@babel/traverse-7.6.2" // {
+      sources."@babel/parser-7.8.8"
+      sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
+      sources."@babel/template-7.8.6"
+      (sources."@babel/traverse-7.8.6" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."globals-11.12.0"
-          sources."lodash-4.17.15"
           sources."ms-2.1.2"
         ];
       })
-      (sources."@babel/types-7.6.1" // {
+      (sources."@babel/types-7.8.7" // {
         dependencies = [
-          sources."lodash-4.17.15"
           sources."to-fast-properties-2.0.0"
         ];
       })
-      sources."@cnakazawa/watch-1.0.3"
+      (sources."@cnakazawa/watch-1.0.4" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       (sources."@jest/console-24.9.0" // {
         dependencies = [
           sources."slash-2.0.0"
@@ -9432,9 +9907,7 @@ let
       })
       (sources."@jest/core-24.9.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
           sources."slash-2.0.0"
-          sources."strip-ansi-5.2.0"
         ];
       })
       sources."@jest/environment-24.9.0"
@@ -9453,62 +9926,65 @@ let
         ];
       })
       sources."@jest/types-24.9.0"
-      (sources."@kubernetes/client-node-0.10.1" // {
+      (sources."@kubernetes/client-node-0.10.3" // {
         dependencies = [
-          sources."@types/node-10.14.19"
+          sources."@types/node-10.17.17"
         ];
       })
+      sources."@sindresorhus/is-0.7.0"
       sources."@types/accepts-1.3.5"
       sources."@types/axios-0.14.0"
       sources."@types/babel-types-7.0.7"
-      sources."@types/babel__core-7.1.3"
-      sources."@types/babel__generator-7.6.0"
+      sources."@types/babel__core-7.1.6"
+      sources."@types/babel__generator-7.6.1"
       sources."@types/babel__template-7.0.2"
-      sources."@types/babel__traverse-7.0.7"
+      sources."@types/babel__traverse-7.0.9"
       sources."@types/babylon-6.16.5"
-      sources."@types/body-parser-1.17.1"
+      sources."@types/body-parser-1.19.0"
       sources."@types/caseless-0.12.2"
       sources."@types/command-line-args-5.0.0"
-      sources."@types/connect-3.4.32"
-      sources."@types/cookies-0.7.3"
-      sources."@types/cron-1.7.1"
+      sources."@types/connect-3.4.33"
+      sources."@types/cookies-0.7.4"
+      sources."@types/cron-1.7.2"
       sources."@types/events-3.0.0"
-      sources."@types/express-4.17.1"
-      sources."@types/express-serve-static-core-4.16.9"
-      sources."@types/form-data-2.5.0"
+      sources."@types/express-4.17.3"
+      sources."@types/express-serve-static-core-4.17.2"
       sources."@types/formidable-1.0.31"
       sources."@types/glob-7.1.1"
       sources."@types/http-assert-1.5.1"
       sources."@types/istanbul-lib-coverage-2.0.1"
-      sources."@types/istanbul-lib-report-1.1.1"
+      sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.1"
-      sources."@types/jest-24.0.15"
-      sources."@types/jest-diff-20.0.1"
-      sources."@types/js-yaml-3.12.1"
-      sources."@types/keygrip-1.0.1"
-      sources."@types/koa-2.0.48"
-      sources."@types/koa-compose-3.2.4"
-      sources."@types/koa-router-7.0.41"
+      sources."@types/jest-24.9.1"
+      sources."@types/js-yaml-3.12.2"
+      sources."@types/keygrip-1.0.2"
+      sources."@types/koa-2.11.2"
+      sources."@types/koa-compose-3.2.5"
+      sources."@types/koa-router-7.4.0"
       sources."@types/koa-send-4.1.2"
       sources."@types/koa-static-4.0.1"
-      sources."@types/koa-views-2.0.3"
-      sources."@types/lodash-4.14.140"
+      sources."@types/koa-views-2.0.4"
+      sources."@types/lodash-4.14.149"
       sources."@types/lodash.clonedeep-4.5.6"
       sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-12.0.8"
+      sources."@types/node-12.12.30"
       sources."@types/ora-3.2.0"
       sources."@types/range-parser-1.2.3"
-      sources."@types/request-2.48.1"
+      (sources."@types/request-2.48.4" // {
+        dependencies = [
+          sources."form-data-2.5.1"
+        ];
+      })
       sources."@types/serve-static-1.13.3"
       sources."@types/stack-utils-1.0.1"
-      sources."@types/tough-cookie-2.3.5"
-      sources."@types/underscore-1.9.3"
+      sources."@types/tough-cookie-2.3.6"
+      sources."@types/underscore-1.9.4"
       sources."@types/websocket-0.0.40"
-      sources."@types/ws-6.0.3"
-      sources."@types/yargs-13.0.3"
-      sources."@types/yargs-parser-13.1.0"
+      sources."@types/ws-6.0.4"
+      sources."@types/yargs-13.0.8"
+      sources."@types/yargs-parser-15.0.0"
       sources."@webassemblyjs/ast-1.8.5"
       sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
       sources."@webassemblyjs/helper-api-error-1.8.5"
@@ -9529,25 +10005,25 @@ let
       sources."@webassemblyjs/wast-printer-1.8.5"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."abab-2.0.2"
+      sources."abab-2.0.3"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
-      sources."acorn-5.7.3"
-      sources."acorn-dynamic-import-4.0.0"
+      sources."acorn-3.3.0"
       (sources."acorn-globals-3.1.0" // {
         dependencies = [
           sources."acorn-4.0.13"
         ];
       })
       sources."acorn-walk-6.2.0"
-      sources."ajv-6.10.0"
+      sources."aggregate-error-1.0.0"
+      sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
       sources."align-text-0.1.4"
       sources."ansi-colors-3.2.4"
       sources."ansi-escapes-3.2.0"
       sources."ansi-html-0.0.7"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."any-promise-1.3.0"
       sources."anymatch-2.0.0"
@@ -9574,28 +10050,28 @@ let
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
       sources."astral-regex-1.0.0"
-      sources."async-1.5.2"
+      sources."async-2.6.3"
       sources."async-each-1.0.3"
-      sources."async-limiter-1.0.0"
+      sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."awesome-typescript-loader-5.2.1"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.8.0"
-      (sources."axios-0.19.0" // {
-        dependencies = [
-          sources."is-buffer-2.0.3"
-        ];
-      })
+      sources."aws4-1.9.1"
+      sources."axios-0.19.2"
       sources."babel-6.23.0"
       (sources."babel-code-frame-6.26.0" // {
         dependencies = [
+          sources."ansi-regex-2.1.1"
           sources."ansi-styles-2.2.1"
           sources."chalk-1.1.3"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
         ];
       })
       (sources."babel-core-6.26.3" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."json5-0.5.1"
           sources."source-map-0.5.7"
         ];
@@ -9617,7 +10093,7 @@ let
       sources."babel-helper-remap-async-to-generator-6.24.1"
       sources."babel-helper-replace-supers-6.24.1"
       sources."babel-helpers-6.24.1"
-      (sources."babel-jest-24.8.0" // {
+      (sources."babel-jest-24.9.0" // {
         dependencies = [
           sources."slash-2.0.0"
         ];
@@ -9665,28 +10141,38 @@ let
       })
       sources."babel-runtime-6.26.0"
       sources."babel-template-6.26.0"
-      sources."babel-traverse-6.26.0"
+      (sources."babel-traverse-6.26.0" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."kind-of-6.0.2"
         ];
       })
       sources."base64-js-1.3.1"
+      sources."base64url-3.0.1"
       sources."batch-0.6.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bfj-6.1.2"
       sources."big.js-5.2.2"
       sources."binary-extensions-1.13.1"
-      sources."bluebird-3.5.5"
+      sources."bindings-1.5.0"
+      sources."bluebird-3.7.2"
       sources."bn.js-4.11.8"
-      sources."body-parser-1.19.0"
+      (sources."body-parser-1.19.0" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."http-errors-1.7.2"
+          sources."inherits-2.0.3"
+          sources."qs-6.7.0"
+          sources."raw-body-2.4.0"
+        ];
+      })
       (sources."bonjour-3.5.0" // {
         dependencies = [
           sources."array-flatten-2.1.2"
@@ -9695,7 +10181,7 @@ let
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
       sources."brorand-1.1.0"
-      sources."browser-process-hrtime-0.1.3"
+      sources."browser-process-hrtime-1.0.0"
       (sources."browser-resolve-1.11.3" // {
         dependencies = [
           sources."resolve-1.1.7"
@@ -9709,27 +10195,35 @@ let
       sources."browserify-zlib-0.2.0"
       sources."browserslist-3.2.8"
       sources."bs-logger-0.2.6"
-      sources."bser-2.1.0"
-      sources."buffer-4.9.1"
+      sources."bser-2.1.1"
+      sources."buffer-4.9.2"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
+      sources."byline-5.0.0"
       sources."bytes-3.1.0"
-      sources."cacache-10.0.4"
+      (sources."cacache-10.0.4" // {
+        dependencies = [
+          sources."lru-cache-4.1.5"
+          sources."yallist-2.1.2"
+        ];
+      })
       sources."cache-base-1.0.1"
       sources."cache-content-type-1.0.1"
+      (sources."cacheable-request-2.1.4" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+          sources."lowercase-keys-1.0.0"
+        ];
+      })
       sources."callsites-3.1.0"
-      sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30000997"
+      sources."camelcase-1.2.1"
+      sources."caniuse-lite-1.0.30001035"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
-      (sources."chalk-2.4.2" // {
-        dependencies = [
-          sources."supports-color-5.5.0"
-        ];
-      })
+      sources."chalk-2.4.2"
       sources."character-parser-2.2.0"
       sources."check-types-8.0.3"
       (sources."chokidar-2.1.8" // {
@@ -9737,25 +10231,34 @@ let
           sources."normalize-path-3.0.0"
         ];
       })
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."chrome-trace-event-1.0.2"
       sources."ci-info-2.0.0"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."clean-css-4.2.1"
+      sources."clean-css-4.2.3"
+      sources."clean-stack-1.3.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-2.2.0"
-      (sources."cliui-5.0.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      sources."cliui-2.1.0"
       sources."clone-1.0.4"
+      sources."clone-response-1.0.2"
       sources."co-4.6.0"
       sources."co-body-5.2.0"
       sources."code-point-at-1.1.0"
@@ -9764,13 +10267,15 @@ let
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.8"
       sources."command-line-args-5.1.1"
-      sources."commander-2.20.0"
+      sources."commander-2.20.3"
       sources."commondir-1.0.1"
       sources."component-emitter-1.3.0"
-      sources."compressible-2.0.17"
+      sources."compressible-2.0.18"
       (sources."compression-1.7.4" // {
         dependencies = [
           sources."bytes-3.0.0"
+          sources."debug-2.6.9"
+          sources."safe-buffer-5.1.2"
         ];
       })
       sources."concat-map-0.0.1"
@@ -9778,16 +10283,28 @@ let
       sources."condense-newlines-0.2.1"
       sources."config-chain-1.1.12"
       sources."connect-history-api-fallback-1.6.0"
-      sources."console-browserify-1.1.0"
+      sources."console-browserify-1.2.0"
       sources."consolidate-0.15.1"
       sources."constantinople-3.1.2"
       sources."constants-browserify-1.0.0"
-      sources."content-disposition-0.5.3"
+      (sources."content-disposition-0.5.3" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."content-type-1.0.4"
-      sources."convert-source-map-1.6.0"
+      (sources."convert-source-map-1.7.0" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."cookies-0.7.3"
+      (sources."cookies-0.8.0" // {
+        dependencies = [
+          sources."depd-2.0.0"
+        ];
+      })
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       (sources."copy-webpack-plugin-4.6.0" // {
@@ -9796,12 +10313,12 @@ let
           sources."p-try-1.0.0"
         ];
       })
-      sources."core-js-2.6.9"
+      sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
-      sources."cron-1.7.1"
+      sources."cron-1.8.2"
       sources."cross-spawn-6.0.5"
       sources."crypto-browserify-3.12.0"
       sources."cssom-0.3.8"
@@ -9811,26 +10328,19 @@ let
       sources."dashdash-1.14.1"
       (sources."data-urls-1.1.0" // {
         dependencies = [
-          sources."whatwg-url-7.0.0"
+          sources."whatwg-url-7.1.0"
         ];
       })
-      sources."date-now-0.1.4"
-      sources."debug-2.6.9"
+      sources."debug-3.1.0"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
+      sources."decompress-response-3.3.0"
       sources."deep-equal-1.0.1"
       sources."deep-is-0.1.3"
       sources."default-gateway-4.2.0"
       sources."defaults-1.0.3"
       sources."define-properties-1.1.3"
-      (sources."define-property-2.0.2" // {
-        dependencies = [
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."define-property-2.0.2"
       (sources."del-4.1.1" // {
         dependencies = [
           (sources."globby-6.1.0" // {
@@ -9844,7 +10354,7 @@ let
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
-      sources."des.js-1.0.0"
+      sources."des.js-1.0.1"
       sources."destroy-1.0.4"
       sources."detect-file-1.0.0"
       sources."detect-indent-4.0.0"
@@ -9860,56 +10370,80 @@ let
       sources."domain-browser-1.2.0"
       sources."domexception-1.0.1"
       sources."duplexer-0.1.1"
+      sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."editorconfig-0.15.3"
+      (sources."editorconfig-0.15.3" // {
+        dependencies = [
+          sources."lru-cache-4.1.5"
+          sources."yallist-2.1.2"
+        ];
+      })
       sources."ee-first-1.1.1"
-      sources."ejs-2.7.1"
-      sources."electron-to-chromium-1.3.267"
-      sources."elliptic-6.5.1"
+      sources."ejs-2.7.4"
+      sources."electron-to-chromium-1.3.376"
+      sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
-      sources."emojis-list-2.1.0"
+      sources."emojis-list-3.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.1.0"
+      sources."enhanced-resolve-4.1.1"
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
       sources."error-inject-1.0.0"
-      sources."es-abstract-1.14.2"
-      sources."es-to-primitive-1.2.0"
-      sources."es5-ext-0.10.51"
+      sources."es-abstract-1.17.4"
+      sources."es-to-primitive-1.2.1"
+      sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
-      sources."es6-symbol-3.1.2"
+      sources."es6-promise-4.2.8"
+      sources."es6-symbol-3.1.3"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      (sources."escodegen-1.12.0" // {
-        dependencies = [
-          sources."esprima-3.1.3"
-        ];
-      })
+      sources."escodegen-1.14.1"
       sources."eslint-scope-4.0.3"
       sources."esprima-4.0.1"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
-      sources."esutils-2.0.2"
+      sources."esutils-2.0.3"
       sources."etag-1.8.1"
       sources."eventemitter3-4.0.0"
-      sources."events-3.0.0"
+      sources."events-3.1.0"
       sources."eventsource-1.0.7"
       sources."evp_bytestokey-1.0.3"
-      sources."exec-sh-0.3.2"
+      sources."exec-sh-0.3.4"
       sources."execa-1.0.0"
       sources."exit-0.1.2"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."expand-tilde-2.0.2"
       sources."expect-24.9.0"
       (sources."express-4.17.1" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."path-to-regexp-0.1.7"
+          sources."qs-6.7.0"
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      (sources."ext-1.4.0" // {
+        dependencies = [
+          sources."type-2.0.0"
         ];
       })
       sources."extend-3.0.2"
@@ -9917,65 +10451,72 @@ let
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."kind-of-6.0.2"
         ];
       })
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."faye-websocket-0.10.0"
-      sources."fb-watchman-2.0.0"
+      sources."fb-watchman-2.0.1"
       sources."figgy-pudding-3.5.1"
+      sources."file-uri-to-path-1.0.0"
       sources."filesize-3.6.1"
       sources."fill-range-4.0.0"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."find-cache-dir-1.0.0"
       sources."find-replace-3.0.0"
       sources."find-up-3.0.0"
-      (sources."findup-sync-2.0.0" // {
-        dependencies = [
-          sources."is-glob-3.1.0"
-        ];
-      })
+      sources."findup-sync-3.0.0"
       sources."flush-write-stream-1.1.1"
-      (sources."follow-redirects-1.5.10" // {
-        dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
+      sources."follow-redirects-1.5.10"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.5.1"
-      sources."formidable-1.2.1"
+      sources."form-data-2.3.3"
+      sources."formidable-1.2.2"
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."from2-2.3.0"
-      sources."fs-extra-4.0.3"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.9"
+      sources."fsevents-1.2.11"
       sources."function-bind-1.1.1"
+      sources."gensync-1.0.0-beta.1"
       sources."get-caller-file-2.0.5"
-      sources."get-paths-0.0.4"
+      (sources."get-paths-0.0.7" // {
+        dependencies = [
+          sources."pify-4.0.1"
+        ];
+      })
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
-      sources."glob-7.1.4"
+      sources."glob-7.1.6"
       (sources."glob-parent-3.1.0" // {
         dependencies = [
           sources."is-glob-3.1.0"
         ];
       })
-      sources."global-modules-1.0.0"
+      (sources."global-modules-2.0.0" // {
+        dependencies = [
+          sources."global-prefix-3.0.0"
+          sources."kind-of-6.0.3"
+        ];
+      })
       sources."global-prefix-1.0.2"
       sources."globals-9.18.0"
       sources."globby-7.1.1"
-      sources."graceful-fs-4.1.15"
+      (sources."got-8.3.2" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+        ];
+      })
+      sources."graceful-fs-4.2.3"
       sources."growly-1.3.0"
       (sources."gzip-size-5.1.1" // {
         dependencies = [
@@ -9983,17 +10524,18 @@ let
         ];
       })
       sources."handle-thing-2.0.0"
-      (sources."handlebars-4.3.3" // {
-        dependencies = [
-          sources."uglify-js-3.6.0"
-        ];
-      })
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-1.0.3"
-      sources."has-ansi-2.0.0"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."has-flag-3.0.0"
-      sources."has-symbols-1.0.0"
+      sources."has-symbol-support-x-1.4.2"
+      sources."has-symbols-1.0.1"
+      sources."has-to-string-tag-x-1.4.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -10006,13 +10548,15 @@ let
       sources."home-or-tmp-2.0.0"
       sources."homedir-polyfill-1.0.3"
       sources."hoopy-0.1.4"
-      sources."hosted-git-info-2.8.4"
+      sources."hosted-git-info-2.8.8"
       sources."hpack.js-2.1.6"
       sources."html-encoding-sniffer-1.0.2"
       sources."html-entities-1.2.1"
+      sources."html-escaper-2.0.0"
       sources."http-assert-1.4.1"
+      sources."http-cache-semantics-3.8.1"
       sources."http-deceiver-1.2.7"
-      sources."http-errors-1.7.2"
+      sources."http-errors-1.7.3"
       sources."http-parser-js-0.4.10"
       sources."http-proxy-1.18.0"
       sources."http-proxy-middleware-0.19.1"
@@ -10028,29 +10572,40 @@ let
         ];
       })
       sources."imurmurhash-0.1.4"
+      sources."indent-string-3.2.0"
       sources."infer-owner-1.0.4"
       sources."inflation-2.0.0"
       sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
+      sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."internal-ip-4.3.0"
       sources."interpret-1.2.0"
+      sources."into-stream-3.1.0"
       sources."invariant-2.2.4"
       sources."invert-kv-2.0.0"
       sources."ip-1.1.5"
       sources."ip-regex-2.1.0"
-      sources."ipaddr.js-1.9.0"
-      sources."is-accessor-descriptor-0.1.6"
+      sources."ipaddr.js-1.9.1"
+      sources."is-absolute-url-3.0.3"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.3"
+        ];
+      })
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.1.4"
+      sources."is-callable-1.1.5"
       sources."is-ci-2.0.0"
-      sources."is-data-descriptor-0.1.4"
-      sources."is-date-object-1.0.1"
-      (sources."is-descriptor-0.1.6" // {
+      (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
-          sources."kind-of-5.1.0"
+          sources."kind-of-6.0.3"
+        ];
+      })
+      sources."is-date-object-1.0.2"
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.3"
         ];
       })
       (sources."is-expression-3.0.0" // {
@@ -10060,20 +10615,23 @@ let
       })
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-finite-1.0.2"
+      sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-generator-fn-2.1.0"
       sources."is-generator-function-1.0.7"
       sources."is-glob-4.0.1"
       sources."is-number-3.0.0"
+      sources."is-object-1.0.1"
       sources."is-path-cwd-2.2.0"
       sources."is-path-in-cwd-2.1.0"
       sources."is-path-inside-2.1.0"
+      sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
-      sources."is-regex-1.0.4"
+      sources."is-regex-1.0.5"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.2"
+      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-whitespace-0.3.0"
       sources."is-windows-1.0.2"
@@ -10104,19 +10662,17 @@ let
           sources."pify-4.0.1"
         ];
       })
-      sources."istanbul-reports-2.2.6"
-      (sources."jest-24.8.0" // {
-        dependencies = [
-          sources."jest-cli-24.9.0"
-        ];
-      })
+      sources."istanbul-reports-2.2.7"
+      sources."isurl-1.0.0"
+      sources."jest-24.9.0"
       sources."jest-changed-files-24.9.0"
-      (sources."jest-config-24.9.0" // {
+      (sources."jest-cli-24.9.0" // {
         dependencies = [
-          sources."babel-jest-24.9.0"
-          sources."slash-2.0.0"
+          sources."cliui-5.0.0"
+          sources."yargs-13.3.2"
         ];
       })
+      sources."jest-config-24.9.0"
       sources."jest-diff-24.9.0"
       sources."jest-docblock-24.9.0"
       sources."jest-each-24.9.0"
@@ -10140,7 +10696,9 @@ let
       sources."jest-runner-24.9.0"
       (sources."jest-runtime-24.9.0" // {
         dependencies = [
+          sources."cliui-5.0.0"
           sources."slash-2.0.0"
+          sources."yargs-13.3.2"
         ];
       })
       sources."jest-serializer-24.9.0"
@@ -10154,77 +10712,69 @@ let
           sources."slash-2.0.0"
         ];
       })
-      sources."jest-validate-24.9.0"
+      (sources."jest-validate-24.9.0" // {
+        dependencies = [
+          sources."camelcase-5.3.1"
+        ];
+      })
       sources."jest-watcher-24.9.0"
       (sources."jest-worker-24.9.0" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
       })
-      sources."js-beautify-1.10.2"
+      sources."js-beautify-1.10.3"
       sources."js-stringify-1.0.2"
       sources."js-tokens-3.0.2"
       sources."js-yaml-3.13.1"
       sources."jsbn-0.1.1"
       (sources."jsdom-11.12.0" // {
         dependencies = [
+          sources."acorn-5.7.4"
           (sources."acorn-globals-4.3.4" // {
             dependencies = [
-              sources."acorn-6.3.0"
+              sources."acorn-6.4.1"
             ];
           })
           sources."ws-5.2.2"
         ];
       })
       sources."jsesc-1.3.0"
+      sources."json-buffer-3.0.0"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
-      sources."json-stream-1.0.0"
       sources."json-stringify-safe-5.0.1"
       sources."json3-3.3.3"
-      sources."json5-1.0.1"
-      sources."jsonfile-4.0.0"
+      (sources."json5-1.0.1" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       sources."jsonpath-plus-0.19.0"
       sources."jsprim-1.4.1"
       sources."jstransformer-1.0.0"
-      sources."keygrip-1.0.3"
+      sources."keygrip-1.1.0"
+      sources."keyv-3.0.0"
       sources."killable-1.0.1"
       sources."kind-of-3.2.2"
       sources."kleur-3.0.3"
-      (sources."koa-2.7.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
-      sources."koa-body-4.1.0"
+      sources."koa-2.11.0"
+      sources."koa-body-4.1.1"
       sources."koa-compose-4.1.0"
       (sources."koa-convert-1.2.0" // {
         dependencies = [
           sources."koa-compose-3.2.1"
         ];
       })
-      sources."koa-is-json-1.0.0"
       (sources."koa-router-7.4.0" // {
         dependencies = [
-          sources."debug-3.2.6"
           sources."koa-compose-3.2.1"
-          sources."ms-2.1.2"
         ];
       })
-      (sources."koa-send-5.0.0" // {
-        dependencies = [
-          sources."debug-3.2.6"
-          sources."ms-2.1.2"
-        ];
-      })
-      (sources."koa-static-5.0.0" // {
-        dependencies = [
-          sources."debug-3.2.6"
-          sources."ms-2.1.2"
-        ];
-      })
-      (sources."koa-views-6.2.0" // {
+      sources."koa-send-5.0.0"
+      sources."koa-static-5.0.0"
+      (sources."koa-views-6.2.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -10237,24 +10787,23 @@ let
       sources."levn-0.3.0"
       sources."load-json-file-4.0.0"
       sources."loader-runner-2.4.0"
-      sources."loader-utils-1.2.3"
+      sources."loader-utils-1.4.0"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.15"
       sources."lodash.camelcase-4.3.0"
       sources."lodash.clonedeep-4.5.0"
+      sources."lodash.memoize-4.1.2"
       sources."lodash.sortby-4.7.0"
       sources."log-symbols-2.2.0"
-      sources."loglevel-1.6.4"
+      sources."loglevel-1.6.7"
       sources."loglevelnext-1.0.5"
+      sources."long-4.0.0"
       sources."longest-1.0.1"
       sources."loose-envify-1.4.0"
-      (sources."lru-cache-4.1.5" // {
-        dependencies = [
-          sources."yallist-2.1.2"
-        ];
-      })
+      sources."lowercase-keys-1.0.1"
+      sources."lru-cache-5.1.1"
       sources."make-dir-1.3.0"
-      sources."make-error-1.3.5"
+      sources."make-error-1.3.6"
       sources."makeerror-1.0.11"
       sources."mamacro-0.0.3"
       sources."map-age-cleaner-0.1.3"
@@ -10262,8 +10811,13 @@ let
       sources."map-visit-1.0.0"
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
-      sources."mem-4.3.0"
-      sources."memory-fs-0.4.1"
+      (sources."mem-4.3.0" // {
+        dependencies = [
+          sources."mimic-fn-2.1.0"
+          sources."p-is-promise-2.1.0"
+        ];
+      })
+      sources."memory-fs-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
       sources."methods-1.1.2"
@@ -10271,18 +10825,19 @@ let
         dependencies = [
           sources."extend-shallow-3.0.2"
           sources."is-extendable-1.0.1"
-          sources."kind-of-6.0.2"
+          sources."kind-of-6.0.3"
         ];
       })
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.24"
-      sources."mimic-fn-2.1.0"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
+      sources."mimic-fn-1.2.0"
+      sources."mimic-response-1.0.1"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-0.0.8"
       (sources."mississippi-2.0.0" // {
         dependencies = [
           sources."pump-2.0.1"
@@ -10293,13 +10848,9 @@ let
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
       sources."moment-2.24.0"
-      sources."moment-timezone-0.5.26"
+      sources."moment-timezone-0.5.28"
       sources."move-concurrently-1.0.1"
       sources."ms-2.0.0"
       sources."multicast-dns-6.2.3"
@@ -10310,7 +10861,7 @@ let
         dependencies = [
           sources."extend-shallow-3.0.2"
           sources."is-extendable-1.0.1"
-          sources."kind-of-6.0.2"
+          sources."kind-of-6.0.3"
         ];
       })
       sources."natural-compare-1.4.0"
@@ -10318,8 +10869,9 @@ let
       sources."neo-async-2.6.1"
       sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
-      sources."node-forge-0.8.2"
+      sources."node-forge-0.8.5"
       sources."node-int64-0.4.0"
+      sources."node-jose-1.1.3"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
           sources."punycode-1.4.1"
@@ -10327,70 +10879,67 @@ let
       })
       sources."node-modules-regexp-1.0.0"
       sources."node-notifier-5.4.3"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-2.1.1"
+      sources."normalize-url-2.0.1"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
-      sources."nwsapi-2.1.4"
+      sources."nwsapi-2.2.0"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
           sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
         ];
       })
-      sources."object-inspect-1.6.0"
+      sources."object-hash-1.3.1"
+      sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.0.3"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."object.pick-1.3.0"
       sources."obuf-1.1.2"
+      sources."oidc-token-hash-3.0.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
-      (sources."onetime-2.0.1" // {
-        dependencies = [
-          sources."mimic-fn-1.2.0"
-        ];
-      })
+      sources."onetime-2.0.1"
       sources."only-0.0.2"
       sources."opener-1.5.1"
+      sources."openid-client-2.5.0"
       sources."opn-5.5.0"
-      (sources."optimist-0.6.1" // {
-        dependencies = [
-          sources."minimist-0.0.10"
-        ];
-      })
-      (sources."optionator-0.8.2" // {
-        dependencies = [
-          sources."wordwrap-1.0.0"
-        ];
-      })
-      (sources."ora-3.4.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      sources."optionator-0.8.3"
+      sources."ora-3.4.0"
       sources."original-1.0.2"
       sources."os-browserify-0.3.0"
       sources."os-homedir-1.0.2"
       sources."os-locale-3.1.0"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
+      sources."p-any-1.1.0"
+      sources."p-cancelable-0.4.1"
       sources."p-defer-1.0.0"
       sources."p-each-series-1.0.0"
       sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.1"
+      sources."p-is-promise-1.1.0"
+      sources."p-limit-2.2.2"
       sources."p-locate-3.0.0"
       sources."p-map-2.1.0"
       sources."p-reduce-1.0.0"
       sources."p-retry-3.0.1"
+      sources."p-some-2.0.1"
+      sources."p-timeout-2.0.1"
       sources."p-try-2.2.0"
-      sources."pako-1.0.10"
+      sources."pako-1.0.11"
       sources."parallel-transform-1.2.0"
       sources."parse-asn1-5.1.5"
       sources."parse-json-4.0.0"
@@ -10405,7 +10954,7 @@ let
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
-      (sources."path-to-regexp-1.7.0" // {
+      (sources."path-to-regexp-1.8.0" // {
         dependencies = [
           sources."isarray-0.0.1"
         ];
@@ -10427,27 +10976,29 @@ let
         ];
       })
       sources."pn-1.1.0"
-      sources."portfinder-1.0.24"
-      sources."posix-character-classes-0.1.1"
-      sources."prelude-ls-1.1.2"
-      sources."prettier-1.18.2"
-      sources."pretty-2.0.0"
-      (sources."pretty-format-24.9.0" // {
+      (sources."portfinder-1.0.25" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
         ];
       })
+      sources."posix-character-classes-0.1.1"
+      sources."prelude-ls-1.1.2"
+      sources."prepend-http-2.0.0"
+      sources."prettier-1.19.1"
+      sources."pretty-2.0.0"
+      sources."pretty-format-24.9.0"
       sources."private-0.1.8"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
       sources."promise-7.3.1"
       sources."promise-inflight-1.0.1"
-      sources."prompts-2.2.1"
+      sources."prompts-2.3.1"
       sources."proto-list-1.2.4"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.1.32"
+      sources."psl-1.7.0"
       sources."public-encrypt-4.0.3"
       sources."pug-2.0.4"
       sources."pug-attrs-2.0.4"
@@ -10468,18 +11019,23 @@ let
         ];
       })
       sources."punycode-2.1.1"
-      sources."qs-6.7.0"
+      sources."qs-6.5.2"
+      sources."query-string-5.1.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
       sources."querystringify-2.1.1"
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.0"
-      sources."react-is-16.9.0"
+      sources."raw-body-2.4.1"
+      sources."react-is-16.13.0"
       sources."read-pkg-3.0.0"
       sources."read-pkg-up-4.0.0"
-      sources."readable-stream-2.3.6"
+      (sources."readable-stream-2.3.7" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."readdirp-2.2.1"
       sources."realpath-native-1.1.0"
       sources."rechoir-0.6.2"
@@ -10503,30 +11059,29 @@ let
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."form-data-2.3.3"
-          sources."punycode-1.4.1"
-          sources."qs-6.5.2"
-          sources."tough-cookie-2.4.3"
-        ];
-      })
-      sources."request-promise-core-1.1.2"
-      sources."request-promise-native-1.0.7"
+      sources."request-2.88.2"
+      sources."request-promise-core-1.1.3"
+      sources."request-promise-native-1.0.8"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
-      sources."resolve-1.11.0"
+      sources."resolve-1.15.1"
       sources."resolve-cwd-2.0.0"
-      sources."resolve-dir-1.0.1"
+      (sources."resolve-dir-1.0.1" // {
+        dependencies = [
+          sources."global-modules-1.0.0"
+        ];
+      })
       sources."resolve-from-3.0.0"
       (sources."resolve-path-1.4.0" // {
         dependencies = [
           sources."http-errors-1.6.3"
+          sources."inherits-2.0.3"
           sources."setprototypeof-1.1.0"
         ];
       })
       sources."resolve-url-0.2.1"
+      sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."retry-0.12.0"
@@ -10535,25 +11090,40 @@ let
       sources."ripemd160-2.0.2"
       sources."rsvp-4.8.5"
       sources."run-queue-1.0.3"
-      sources."rxjs-6.5.2"
-      sources."safe-buffer-5.1.2"
+      sources."rxjs-6.5.4"
+      sources."safe-buffer-5.2.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."sane-4.1.0"
+      (sources."sane-4.1.0" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       sources."sax-1.2.4"
       sources."schema-utils-1.0.0"
       sources."select-hose-2.0.0"
-      sources."selfsigned-1.10.6"
-      sources."semver-5.7.0"
+      (sources."selfsigned-1.10.7" // {
+        dependencies = [
+          sources."node-forge-0.9.0"
+        ];
+      })
+      sources."semver-5.7.1"
       (sources."send-0.17.1" // {
         dependencies = [
+          (sources."debug-2.6.9" // {
+            dependencies = [
+              sources."ms-2.0.0"
+            ];
+          })
           sources."ms-2.1.1"
         ];
       })
       sources."serialize-javascript-1.9.1"
       (sources."serve-index-1.9.1" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."http-errors-1.6.3"
+          sources."inherits-2.0.3"
           sources."setprototypeof-1.1.0"
         ];
       })
@@ -10569,42 +11139,47 @@ let
       sources."shellwords-0.1.1"
       sources."sigmund-1.0.1"
       sources."signal-exit-3.0.2"
-      (sources."simple-git-1.96.0" // {
-        dependencies = [
-          sources."debug-3.2.6"
-          sources."ms-2.1.2"
-        ];
-      })
-      sources."sisteransi-1.0.3"
+      sources."simple-git-1.96.0"
+      sources."sisteransi-1.0.4"
       sources."slash-1.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
           sources."source-map-0.5.7"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."kind-of-6.0.2"
         ];
       })
       sources."snapdragon-util-3.0.1"
       sources."sockjs-0.3.19"
-      (sources."sockjs-client-1.3.0" // {
+      (sources."sockjs-client-1.4.0" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."faye-websocket-0.11.3"
           sources."ms-2.1.2"
         ];
       })
+      sources."sort-keys-2.0.0"
       sources."source-list-map-2.0.1"
       sources."source-map-0.6.1"
-      sources."source-map-resolve-0.5.2"
-      sources."source-map-support-0.5.13"
+      sources."source-map-resolve-0.5.3"
+      sources."source-map-support-0.5.16"
       sources."source-map-url-0.4.0"
       sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
@@ -10620,7 +11195,7 @@ let
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
-          sources."readable-stream-3.4.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       (sources."split-string-3.1.0" // {
@@ -10636,6 +11211,18 @@ let
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."statuses-1.5.0"
@@ -10643,38 +11230,38 @@ let
       sources."stream-browserify-2.0.2"
       sources."stream-each-1.2.3"
       sources."stream-http-2.8.3"
-      sources."stream-shift-1.0.0"
+      sources."stream-shift-1.0.1"
+      sources."strict-uri-encode-1.1.0"
       (sources."string-length-2.0.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."strip-ansi-4.0.0"
         ];
       })
-      (sources."string-width-3.1.0" // {
+      sources."string-width-3.1.0"
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
+      (sources."string_decoder-1.1.1" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."safe-buffer-5.1.2"
         ];
       })
-      sources."string.prototype.trimleft-2.1.0"
-      sources."string.prototype.trimright-2.1.0"
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
+      sources."strip-ansi-5.2.0"
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
-      sources."supports-color-2.0.0"
+      sources."supports-color-5.5.0"
       sources."symbol-tree-3.2.4"
       sources."tapable-1.1.3"
-      sources."terser-4.3.3"
-      (sources."terser-webpack-plugin-1.4.1" // {
+      sources."terser-4.6.6"
+      (sources."terser-webpack-plugin-1.4.3" // {
         dependencies = [
           sources."cacache-12.0.3"
           sources."find-cache-dir-2.1.0"
-          sources."lru-cache-5.1.1"
           sources."make-dir-2.1.0"
           sources."mississippi-3.0.0"
           sources."pify-4.0.1"
           sources."pkg-dir-3.0.0"
+          sources."serialize-javascript-2.1.2"
           sources."ssri-6.0.1"
         ];
       })
@@ -10683,7 +11270,8 @@ let
       sources."thenify-all-1.6.0"
       sources."throat-4.1.0"
       sources."through2-2.0.5"
-      sources."thunky-1.0.3"
+      sources."thunky-1.1.0"
+      sources."timed-out-4.0.1"
       sources."timers-browserify-2.0.11"
       sources."tmpl-1.0.4"
       sources."to-arraybuffer-1.0.1"
@@ -10702,14 +11290,16 @@ let
       sources."tr46-1.0.1"
       sources."trim-right-1.0.1"
       sources."tryer-1.0.1"
-      (sources."ts-jest-24.0.2" // {
+      (sources."ts-jest-24.3.0" // {
         dependencies = [
           sources."camelcase-4.1.0"
-          sources."json5-2.1.0"
+          sources."json5-2.1.1"
+          sources."minimist-1.2.5"
           sources."yargs-parser-10.1.0"
         ];
       })
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.1"
+      sources."tsscmp-1.0.6"
       sources."tty-browserify-0.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -10718,22 +11308,18 @@ let
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
-      sources."typescript-3.5.2"
+      sources."typescript-3.8.3"
       sources."typical-4.0.0"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
-          sources."camelcase-1.2.1"
-          sources."cliui-2.1.0"
           sources."source-map-0.5.7"
-          sources."yargs-3.10.0"
         ];
       })
       sources."uglify-to-browserify-1.0.2"
-      sources."underscore-1.9.1"
+      sources."underscore-1.9.2"
       sources."union-value-1.0.1"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
-      sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
       (sources."unset-value-1.0.0" // {
         dependencies = [
@@ -10747,7 +11333,7 @@ let
       })
       sources."upath-1.2.0"
       sources."uri-js-4.2.2"
-      sources."urijs-1.19.1"
+      sources."urijs-1.19.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -10755,84 +11341,88 @@ let
         ];
       })
       sources."url-parse-1.4.7"
+      sources."url-parse-lax-3.0.0"
+      sources."url-to-options-1.0.1"
       sources."use-3.1.1"
-      sources."util-0.11.1"
+      (sources."util-0.11.1" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+        ];
+      })
       sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.0.0"
+      sources."util.promisify-1.0.1"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.2"
-      sources."v8-compile-cache-2.1.0"
+      sources."uuid-3.4.0"
+      sources."v8-compile-cache-2.0.3"
       sources."validate-npm-package-license-3.0.4"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."vm-browserify-1.1.0"
+      sources."vm-browserify-1.1.2"
       sources."void-elements-2.0.1"
-      sources."w3c-hr-time-1.0.1"
+      sources."w3c-hr-time-1.0.2"
       sources."walker-1.0.7"
       sources."watchpack-1.6.0"
       sources."wbuf-1.7.3"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
-      (sources."webpack-4.35.0" // {
+      (sources."webpack-4.42.0" // {
         dependencies = [
-          sources."acorn-6.3.0"
+          sources."acorn-6.4.1"
+          sources."memory-fs-0.4.1"
         ];
       })
-      (sources."webpack-bundle-analyzer-3.3.2" // {
+      (sources."webpack-bundle-analyzer-3.6.1" // {
         dependencies = [
-          sources."acorn-6.3.0"
+          sources."acorn-7.1.1"
+          sources."acorn-walk-7.1.1"
         ];
       })
-      (sources."webpack-cli-3.3.4" // {
+      (sources."webpack-cli-3.3.11" // {
         dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."cliui-4.1.0"
-          sources."get-caller-file-1.0.3"
-          sources."require-main-filename-1.0.1"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-          sources."supports-color-5.5.0"
-          (sources."wrap-ansi-2.1.0" // {
-            dependencies = [
-              sources."ansi-regex-2.1.1"
-              sources."is-fullwidth-code-point-1.0.0"
-              sources."string-width-1.0.2"
-              sources."strip-ansi-3.0.1"
-            ];
-          })
-          sources."yargs-12.0.5"
-          sources."yargs-parser-11.1.1"
+          sources."cliui-5.0.0"
+          sources."emojis-list-2.1.0"
+          sources."enhanced-resolve-4.1.0"
+          sources."loader-utils-1.2.3"
+          sources."memory-fs-0.4.1"
+          sources."supports-color-6.1.0"
+          sources."yargs-13.2.4"
         ];
       })
-      (sources."webpack-dev-middleware-3.7.1" // {
+      (sources."webpack-dev-middleware-3.7.2" // {
         dependencies = [
+          sources."memory-fs-0.4.1"
           sources."mime-2.4.4"
           sources."webpack-log-2.0.0"
         ];
       })
-      (sources."webpack-dev-server-3.7.2" // {
+      (sources."webpack-dev-server-3.10.3" // {
         dependencies = [
-          sources."ansi-regex-3.0.0"
+          sources."ansi-regex-2.1.1"
+          sources."camelcase-5.3.1"
           (sources."cliui-4.1.0" // {
             dependencies = [
+              sources."ansi-regex-3.0.0"
               sources."strip-ansi-4.0.0"
             ];
           })
           sources."debug-4.1.1"
           sources."get-caller-file-1.0.3"
+          sources."is-fullwidth-code-point-1.0.0"
           sources."ms-2.1.2"
           sources."require-main-filename-1.0.1"
           sources."semver-6.3.0"
           (sources."string-width-2.1.1" // {
             dependencies = [
+              sources."ansi-regex-3.0.0"
+              sources."is-fullwidth-code-point-2.0.0"
               sources."strip-ansi-4.0.0"
             ];
           })
+          sources."strip-ansi-3.0.1"
           sources."supports-color-6.1.0"
           sources."webpack-log-2.0.0"
           (sources."wrap-ansi-2.1.0" // {
             dependencies = [
-              sources."is-fullwidth-code-point-1.0.0"
               sources."string-width-1.0.2"
             ];
           })
@@ -10842,7 +11432,11 @@ let
       })
       sources."webpack-log-1.2.0"
       sources."webpack-sources-1.4.3"
-      sources."websocket-1.0.28"
+      (sources."websocket-1.0.31" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."websocket-driver-0.7.3"
       sources."websocket-extensions-0.1.3"
       sources."whatwg-encoding-1.0.5"
@@ -10851,19 +11445,11 @@ let
       sources."which-1.3.1"
       sources."which-module-2.0.0"
       sources."window-size-0.1.0"
-      (sources."with-5.1.1" // {
-        dependencies = [
-          sources."acorn-3.3.0"
-        ];
-      })
+      sources."with-5.1.1"
+      sources."word-wrap-1.2.3"
       sources."wordwrap-0.0.2"
       sources."worker-farm-1.7.0"
-      (sources."wrap-ansi-5.1.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.1"
       sources."ws-6.2.1"
@@ -10871,10 +11457,13 @@ let
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
       sources."yaeti-0.0.6"
-      sources."yallist-3.1.0"
-      sources."yargs-13.3.0"
-      sources."yargs-parser-13.1.1"
-      sources."yarn-1.16.0"
+      sources."yallist-3.1.1"
+      sources."yargs-3.10.0"
+      (sources."yargs-parser-13.1.2" // {
+        dependencies = [
+          sources."camelcase-5.3.1"
+        ];
+      })
       sources."ylru-1.2.1"
     ];
     buildInputs = globalBuildInputs;
@@ -10883,25 +11472,6 @@ let
     };
     production = false;
     bypassCache = true;
-    reconstructLock = false;
+    reconstructLock = true;
   };
-in
-{
-  args = args;
-  sources = sources;
-  tarball = nodeEnv.buildNodeSourceDist args;
-  package = nodeEnv.buildNodePackage args;
-  shell = nodeEnv.buildNodeShell args;
-  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
-    src = stdenv.mkDerivation {
-      name = args.name + "-package-json";
-      src = nix-gitignore.gitignoreSourcePure [
-        "*"
-        "!package.json"
-        "!package-lock.json"
-      ] args.src;
-      dontBuild = true;
-      installPhase = "mkdir -p $out; cp -r ./* $out;";
-    };
-  });
 }
diff --git a/pkgs/applications/networking/cluster/spacegun/package.json b/pkgs/applications/networking/cluster/spacegun/package.json
new file mode 100644
index 00000000000..7d419edb74a
--- /dev/null
+++ b/pkgs/applications/networking/cluster/spacegun/package.json
@@ -0,0 +1,3 @@
+[
+  { "spacegun": "git+https://github.com/dvallin/spacegun.git#v0.3.3" }
+]
diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix
index 64326c6b216..f6cfb2cd2e4 100644
--- a/pkgs/applications/networking/n8n/node-composition.nix
+++ b/pkgs/applications/networking/n8n/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix
index c2b723195b7..759fa71c5aa 100644
--- a/pkgs/applications/networking/n8n/node-env.nix
+++ b/pkgs/applications/networking/n8n/node-env.nix
@@ -1,11 +1,8 @@
 # This file originates from node2nix
 
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
+{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
 
 let
-  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
-  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
-
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -245,8 +242,8 @@ let
       if(fs.existsSync("./package-lock.json")) {
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-          if(![1, 2].includes(packageLock.lockfileVersion)) {
-             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+          if(packageLock.lockfileVersion !== 1) {
+             process.stderr.write("Sorry, I only understand lock file version 1!\n");
              process.exit(1);
           }
 
@@ -448,8 +445,8 @@ let
       '';
     } // extraArgs);
 
-  # Builds a node environment (a node_modules folder and a set of binaries)
-  buildNodeDependencies =
+  # Builds a development shell
+  buildNodeShell =
     { name
     , packageName
     , version
@@ -468,8 +465,8 @@ let
 
     let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-    in
-      stdenv.mkDerivation ({
+
+      nodeDependencies = stdenv.mkDerivation ({
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
@@ -515,27 +512,6 @@ let
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
       } // extraArgs);
-
-  # Builds a development shell
-  buildNodeShell =
-    { name
-    , packageName
-    , version
-    , src
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      nodeDependencies = buildNodeDependencies args;
     in
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
@@ -562,6 +538,5 @@ in
 {
   buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
   buildNodePackage = lib.makeOverridable buildNodePackage;
-  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
   buildNodeShell = lib.makeOverridable buildNodeShell;
 }
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index 6ed97952ff5..09d2fc5ccdf 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -13,13 +13,13 @@ let
         sha512 = "l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA==";
       };
     };
-    "@azure/ms-rest-js-1.9.1" = {
+    "@azure/ms-rest-js-1.9.0" = {
       name = "_at_azure_slash_ms-rest-js";
       packageName = "@azure/ms-rest-js";
-      version = "1.9.1";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.1.tgz";
-        sha512 = "F1crHKhmsvFLM9fsnDyCGFd2E2KR9GEZm5oBVV5D5k2EBQ7u7idtSJlSF6RDLDIrGWtc4NnFdYwsoiW8NLlBQg==";
+        url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz";
+        sha512 = "cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA==";
       };
     };
     "@azure/ms-rest-nodeauth-2.0.2" = {
@@ -31,15 +31,6 @@ let
         sha512 = "KmNNICOxt3EwViAJI3iu2VH8t8BQg5J2rSAyO4IUYLF9ZwlyYsP419pdvl4NBUhluAP2cgN7dfD2V6E6NOMZlQ==";
       };
     };
-    "@dabh/diagnostics-2.0.2" = {
-      name = "_at_dabh_slash_diagnostics";
-      packageName = "@dabh/diagnostics";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz";
-        sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
-      };
-    };
     "@icetee/ftp-0.3.15" = {
       name = "_at_icetee_slash_ftp";
       packageName = "@icetee/ftp";
@@ -49,31 +40,31 @@ let
         sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg==";
       };
     };
-    "@nodelib/fs.scandir-2.1.4" = {
+    "@nodelib/fs.scandir-2.1.3" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.4";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
-        sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
+        sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
       };
     };
-    "@nodelib/fs.stat-2.0.4" = {
+    "@nodelib/fs.stat-2.0.3" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.4";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
-        sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
+        sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==";
       };
     };
-    "@nodelib/fs.walk-1.2.6" = {
+    "@nodelib/fs.walk-1.2.4" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.6";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
-        sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
+        sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
       };
     };
     "@oclif/command-1.8.0" = {
@@ -121,13 +112,13 @@ let
         sha512 = "yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg==";
       };
     };
-    "@oclif/plugin-help-3.2.1" = {
+    "@oclif/plugin-help-3.2.0" = {
       name = "_at_oclif_slash_plugin-help";
       packageName = "@oclif/plugin-help";
-      version = "3.2.1";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.1.tgz";
-        sha512 = "vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ==";
+        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.0.tgz";
+        sha512 = "7jxtpwVWAVbp1r46ZnTK/uF+FeZc6y4p1XcGaIUuPAp7wx6NJhIRN/iMT9UfNFX/Cz7mq+OyJz+E+i0zrik86g==";
       };
     };
     "@servie/events-1.0.0" = {
@@ -175,13 +166,13 @@ let
         sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
       };
     };
-    "@types/connect-3.4.34" = {
+    "@types/connect-3.4.33" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.34";
+      version = "3.4.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz";
-        sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz";
+        sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==";
       };
     };
     "@types/debug-4.1.5" = {
@@ -193,13 +184,13 @@ let
         sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==";
       };
     };
-    "@types/express-4.17.11" = {
+    "@types/express-4.17.9" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.11";
+      version = "4.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz";
-        sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.9.tgz";
+        sha512 = "SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==";
       };
     };
     "@types/express-jwt-0.0.42" = {
@@ -211,13 +202,13 @@ let
         sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==";
       };
     };
-    "@types/express-serve-static-core-4.17.18" = {
+    "@types/express-serve-static-core-4.17.14" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.18";
+      version = "4.17.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
-        sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz";
+        sha512 = "uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA==";
       };
     };
     "@types/express-unless-0.5.1" = {
@@ -256,13 +247,13 @@ let
         sha512 = "9bVao7LvyorRGZCw0VmH/dr7Og+NdjYSsKAxB43OQoComFbBgsEpoR9JW6+qSq/ogwVBg8GI2MfAlk4SYI4OLg==";
       };
     };
-    "@types/mime-1.3.2" = {
+    "@types/mime-2.0.3" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
-      version = "1.3.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
-        sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
+        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz";
+        sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -274,22 +265,22 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/node-12.19.15" = {
+    "@types/node-12.19.8" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.19.15";
+      version = "12.19.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz";
-        sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.19.8.tgz";
+        sha512 = "D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg==";
       };
     };
-    "@types/node-14.14.22" = {
+    "@types/node-14.14.10" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.22";
+      version = "14.14.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
-        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz";
+        sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==";
       };
     };
     "@types/node-8.10.66" = {
@@ -346,22 +337,13 @@ let
         sha512 = "sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw==";
       };
     };
-    "@types/serve-static-1.13.9" = {
+    "@types/serve-static-1.13.8" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.9";
+      version = "1.13.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
-        sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
-      };
-    };
-    "@types/snowflake-sdk-1.5.1" = {
-      name = "_at_types_slash_snowflake-sdk";
-      packageName = "@types/snowflake-sdk";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.5.1.tgz";
-        sha512 = "0RPrY9NZZn3botFzmW+Yo7Qx8J0KbIRfrWOzVFqG9iN6qo9WfpZwoqApC8Y6y9htZBdpfAweeVQdyMOm6B8Z9w==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz";
+        sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA==";
       };
     };
     "@types/tough-cookie-2.3.7" = {
@@ -427,24 +409,6 @@ let
         sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
       };
     };
-    "agent-base-2.1.1" = {
-      name = "agent-base";
-      packageName = "agent-base";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz";
-        sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7";
-      };
-    };
-    "agent-base-4.3.0" = {
-      name = "agent-base";
-      packageName = "agent-base";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz";
-        sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==";
-      };
-    };
     "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
@@ -454,15 +418,6 @@ let
         sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
-    "amqplib-0.6.0" = {
-      name = "amqplib";
-      packageName = "amqplib";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/amqplib/-/amqplib-0.6.0.tgz";
-        sha512 = "zXCh4jQ77TBZe1YtvZ1n7sUxnTjnNagpy8MVi2yc1ive239pS3iLwm4e4d5o4XZGx1BdTKQ/U0ZmaDU3c8MxYQ==";
-      };
-    };
     "ansi-escapes-4.3.1" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
@@ -490,6 +445,15 @@ let
         sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
       };
     };
+    "ansi-regex-4.1.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
+        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+      };
+    };
     "ansi-regex-5.0.0" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
@@ -625,67 +589,13 @@ let
         sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
       };
     };
-    "asn1.js-4.10.1" = {
-      name = "asn1.js";
-      packageName = "asn1.js";
-      version = "4.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
-        sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
-      };
-    };
-    "asn1.js-5.4.1" = {
-      name = "asn1.js";
-      packageName = "asn1.js";
-      version = "5.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz";
-        sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
-      };
-    };
-    "asn1.js-rfc2560-4.0.6" = {
-      name = "asn1.js-rfc2560";
-      packageName = "asn1.js-rfc2560";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-4.0.6.tgz";
-        sha512 = "ysf48ni+f/efNPilq4+ApbifUPcSW/xbDeQAh055I+grr2gXgNRQqHew7kkO70WSMQ2tEOURVwsK+dJqUNjIIg==";
-      };
-    };
-    "asn1.js-rfc2560-5.0.1" = {
-      name = "asn1.js-rfc2560";
-      packageName = "asn1.js-rfc2560";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-5.0.1.tgz";
-        sha512 = "1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA==";
-      };
-    };
-    "asn1.js-rfc5280-2.0.1" = {
-      name = "asn1.js-rfc5280";
-      packageName = "asn1.js-rfc5280";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-2.0.1.tgz";
-        sha512 = "1e2ypnvTbYD/GdxWK77tdLBahvo1fZUHlQJqAVUuZWdYj0rdjGcf2CWYUtbsyRYpYUMwMWLZFUtLxog8ZXTrcg==";
-      };
-    };
-    "asn1.js-rfc5280-3.0.0" = {
-      name = "asn1.js-rfc5280";
-      packageName = "asn1.js-rfc5280";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-3.0.0.tgz";
-        sha512 = "Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg==";
-      };
-    };
-    "assert-options-0.7.0" = {
+    "assert-options-0.6.2" = {
       name = "assert-options";
       packageName = "assert-options";
-      version = "0.7.0";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz";
-        sha512 = "7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ==";
+        url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz";
+        sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw==";
       };
     };
     "assert-plus-1.0.0" = {
@@ -697,15 +607,6 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "async-1.5.2" = {
-      name = "async";
-      packageName = "async";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
-        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
-      };
-    };
     "async-3.2.0" = {
       name = "async";
       packageName = "async";
@@ -742,6 +643,15 @@ let
         sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
+    "axios-0.19.0" = {
+      name = "axios";
+      packageName = "axios";
+      version = "0.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz";
+        sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==";
+      };
+    };
     "axios-0.19.2" = {
       name = "axios";
       packageName = "axios";
@@ -751,15 +661,6 @@ let
         sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
       };
     };
-    "axios-0.21.1" = {
-      name = "axios";
-      packageName = "axios";
-      version = "0.21.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
-        sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
-      };
-    };
     "balanced-match-1.0.0" = {
       name = "balanced-match";
       packageName = "balanced-match";
@@ -805,33 +706,6 @@ let
         sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb";
       };
     };
-    "big-integer-1.6.48" = {
-      name = "big-integer";
-      packageName = "big-integer";
-      version = "1.6.48";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz";
-        sha512 = "j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==";
-      };
-    };
-    "bignumber.js-2.4.0" = {
-      name = "bignumber.js";
-      packageName = "bignumber.js";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz";
-        sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8";
-      };
-    };
-    "bitsyntax-0.1.0" = {
-      name = "bitsyntax";
-      packageName = "bitsyntax";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz";
-        sha512 = "ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q==";
-      };
-    };
     "bl-2.2.1" = {
       name = "bl";
       packageName = "bl";
@@ -868,24 +742,6 @@ let
         sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
       };
     };
-    "bluebird-3.7.2" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
-        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
-      };
-    };
-    "bn.js-4.11.9" = {
-      name = "bn.js";
-      packageName = "bn.js";
-      version = "4.11.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz";
-        sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==";
-      };
-    };
     "body-parser-1.19.0" = {
       name = "body-parser";
       packageName = "body-parser";
@@ -931,15 +787,6 @@ let
         sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
       };
     };
-    "browser-request-0.3.3" = {
-      name = "browser-request";
-      packageName = "browser-request";
-      version = "0.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
-        sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17";
-      };
-    };
     "bson-1.1.5" = {
       name = "bson";
       packageName = "bson";
@@ -976,15 +823,6 @@ let
         sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
       };
     };
-    "buffer-more-ints-1.0.0" = {
-      name = "buffer-more-ints";
-      packageName = "buffer-more-ints";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz";
-        sha512 = "EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==";
-      };
-    };
     "buffer-writer-2.0.0" = {
       name = "buffer-writer";
       packageName = "buffer-writer";
@@ -1021,15 +859,6 @@ let
         sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
       };
     };
-    "cacheable-lookup-5.0.4" = {
-      name = "cacheable-lookup";
-      packageName = "cacheable-lookup";
-      version = "5.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz";
-        sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==";
-      };
-    };
     "callback-stream-1.1.0" = {
       name = "callback-stream";
       packageName = "callback-stream";
@@ -1138,22 +967,13 @@ let
         sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
       };
     };
-    "cheerio-1.0.0-rc.5" = {
+    "cheerio-1.0.0-rc.3" = {
       name = "cheerio";
       packageName = "cheerio";
-      version = "1.0.0-rc.5";
+      version = "1.0.0-rc.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz";
-        sha512 = "yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==";
-      };
-    };
-    "cheerio-select-tmp-0.1.1" = {
-      name = "cheerio-select-tmp";
-      packageName = "cheerio-select-tmp";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz";
-        sha512 = "YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ==";
+        url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz";
+        sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==";
       };
     };
     "chownr-1.1.4" = {
@@ -1183,13 +1003,13 @@ let
         sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==";
       };
     };
-    "cli-highlight-2.1.10" = {
+    "cli-highlight-2.1.9" = {
       name = "cli-highlight";
       packageName = "cli-highlight";
-      version = "2.1.10";
+      version = "2.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.10.tgz";
-        sha512 = "CcPFD3JwdQ2oSzy+AMG6j3LRTkNjM82kzcSKzoVw6cLanDCJNlsLjeqVTOTfOfucnWv5F0rmBemVf1m9JiIasw==";
+        url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.9.tgz";
+        sha512 = "t8RNIZgiI24i/mslZ8XT8o660RUj5ZbUJpEZrZa/BNekTzdC2LfMRAnt0Y7sgzNM4FGW5tmWg/YnbTH8o1eIOQ==";
       };
     };
     "cli-width-3.0.0" = {
@@ -1210,6 +1030,24 @@ let
         sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q==";
       };
     };
+    "cliui-5.0.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
+        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
+      };
+    };
+    "cliui-6.0.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz";
+        sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==";
+      };
+    };
     "cliui-7.0.4" = {
       name = "cliui";
       packageName = "cliui";
@@ -1300,15 +1138,6 @@ let
         sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96";
       };
     };
-    "colors-1.4.0" = {
-      name = "colors";
-      packageName = "colors";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz";
-        sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==";
-      };
-    };
     "colorspace-1.1.2" = {
       name = "colorspace";
       packageName = "colorspace";
@@ -1525,22 +1354,22 @@ let
         sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w==";
       };
     };
-    "css-select-3.1.2" = {
+    "css-select-1.2.0" = {
       name = "css-select";
       packageName = "css-select";
-      version = "3.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz";
-        sha512 = "qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==";
+        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
+        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
       };
     };
-    "css-what-4.0.0" = {
+    "css-what-2.1.3" = {
       name = "css-what";
       packageName = "css-what";
-      version = "4.0.0";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz";
-        sha512 = "teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==";
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
+        sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
       };
     };
     "d-1.0.1" = {
@@ -1597,6 +1426,15 @@ let
         sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
+    "debug-4.1.1" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
+        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
+      };
+    };
     "debug-4.3.1" = {
       name = "debug";
       packageName = "debug";
@@ -1606,15 +1444,6 @@ let
         sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
       };
     };
-    "debug-4.3.2" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
-      };
-    };
     "decamelize-1.2.0" = {
       name = "decamelize";
       packageName = "decamelize";
@@ -1651,13 +1480,13 @@ let
         sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
       };
     };
-    "denque-1.5.0" = {
+    "denque-1.4.1" = {
       name = "denque";
       packageName = "denque";
-      version = "1.5.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz";
-        sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==";
+        url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
+        sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==";
       };
     };
     "depd-1.1.2" = {
@@ -1714,22 +1543,13 @@ let
         sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
       };
     };
-    "dom-serializer-0.2.2" = {
+    "dom-serializer-0.1.1" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
-      version = "0.2.2";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz";
-        sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
-      };
-    };
-    "dom-serializer-1.2.0" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz";
-        sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==";
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz";
+        sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==";
       };
     };
     "domelementtype-1.3.1" = {
@@ -1741,15 +1561,6 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domelementtype-2.1.0" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
-        sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
-      };
-    };
     "domhandler-2.4.2" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -1759,31 +1570,13 @@ let
         sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
       };
     };
-    "domhandler-4.0.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz";
-        sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==";
-      };
-    };
-    "domutils-1.7.0" = {
+    "domutils-1.5.1" = {
       name = "domutils";
       packageName = "domutils";
-      version = "1.7.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz";
-        sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
-      };
-    };
-    "domutils-2.4.4" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "2.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz";
-        sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==";
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
       };
     };
     "dot-case-3.0.4" = {
@@ -1849,6 +1642,15 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
+    "emoji-regex-7.0.3" = {
+      name = "emoji-regex";
+      packageName = "emoji-regex";
+      version = "7.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
+        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
+      };
+    };
     "emoji-regex-8.0.0" = {
       name = "emoji-regex";
       packageName = "emoji-regex";
@@ -1867,15 +1669,6 @@ let
         sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93";
       };
     };
-    "enabled-2.0.0" = {
-      name = "enabled";
-      packageName = "enabled";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz";
-        sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==";
-      };
-    };
     "encodeurl-1.0.2" = {
       name = "encodeurl";
       packageName = "encodeurl";
@@ -1957,24 +1750,6 @@ let
         sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
       };
     };
-    "es6-promise-4.2.8" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
-        sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
-      };
-    };
-    "es6-promisify-5.0.0" = {
-      name = "es6-promisify";
-      packageName = "es6-promisify";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
-        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
-      };
-    };
     "es6-set-0.1.5" = {
       name = "es6-set";
       packageName = "es6-set";
@@ -2146,13 +1921,13 @@ let
         sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
       };
     };
-    "fast-glob-3.2.5" = {
+    "fast-glob-3.2.4" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.5";
+      version = "3.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
-        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz";
+        sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==";
       };
     };
     "fast-json-stable-stringify-2.1.0" = {
@@ -2164,31 +1939,13 @@ let
         sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
-    "fast-safe-stringify-2.0.7" = {
-      name = "fast-safe-stringify";
-      packageName = "fast-safe-stringify";
-      version = "2.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz";
-        sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
-      };
-    };
-    "fastq-1.10.0" = {
+    "fastq-1.9.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.10.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
-        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
-      };
-    };
-    "fecha-4.2.0" = {
-      name = "fecha";
-      packageName = "fecha";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz";
-        sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz";
+        sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==";
       };
     };
     "fflate-0.3.11" = {
@@ -2245,6 +2002,24 @@ let
         sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
       };
     };
+    "find-up-3.0.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
+        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+      };
+    };
+    "find-up-4.1.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
+        sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
+      };
+    };
     "flatted-2.0.2" = {
       name = "flatted";
       packageName = "flatted";
@@ -2254,24 +2029,6 @@ let
         sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
       };
     };
-    "fn.name-1.1.0" = {
-      name = "fn.name";
-      packageName = "fn.name";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz";
-        sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
-      };
-    };
-    "follow-redirects-1.13.1" = {
-      name = "follow-redirects";
-      packageName = "follow-redirects";
-      version = "1.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz";
-        sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==";
-      };
-    };
     "follow-redirects-1.5.10" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -2452,13 +2209,13 @@ let
         sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
       };
     };
-    "globby-11.0.2" = {
+    "globby-11.0.1" = {
       name = "globby";
       packageName = "globby";
-      version = "11.0.2";
+      version = "11.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz";
-        sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==";
+        url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz";
+        sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==";
       };
     };
     "gm-1.23.1" = {
@@ -2569,13 +2326,13 @@ let
         sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
-    "highlight.js-10.5.0" = {
+    "highlight.js-10.4.1" = {
       name = "highlight.js";
       packageName = "highlight.js";
-      version = "10.5.0";
+      version = "10.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.5.0.tgz";
-        sha512 = "xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw==";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz";
+        sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==";
       };
     };
     "html-to-text-5.1.1" = {
@@ -2596,15 +2353,6 @@ let
         sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==";
       };
     };
-    "htmlparser2-6.0.0" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz";
-        sha512 = "numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw==";
-      };
-    };
     "http-errors-1.7.2" = {
       name = "http-errors";
       packageName = "http-errors";
@@ -2623,15 +2371,6 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "https-proxy-agent-3.0.1" = {
-      name = "https-proxy-agent";
-      packageName = "https-proxy-agent";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz";
-        sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==";
-      };
-    };
     "iconv-lite-0.4.24" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
@@ -2749,13 +2488,13 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.8" = {
+    "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.8";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
     "inquirer-7.3.3" = {
@@ -2803,6 +2542,15 @@ let
         sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==";
       };
     };
+    "is-buffer-2.0.5" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz";
+        sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==";
+      };
+    };
     "is-docker-2.1.1" = {
       name = "is-docker";
       packageName = "is-docker";
@@ -2911,15 +2659,6 @@ let
         sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==";
       };
     };
-    "is-stream-2.0.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
-        sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
-      };
-    };
     "is-typedarray-1.0.0" = {
       name = "is-typedarray";
       packageName = "is-typedarray";
@@ -2983,13 +2722,13 @@ let
         sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
-    "iso-639-1-2.1.7" = {
+    "iso-639-1-2.1.4" = {
       name = "iso-639-1";
       packageName = "iso-639-1";
-      version = "2.1.7";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.7.tgz";
-        sha512 = "vPBh9Exxv0c430dRYiKtRt6TgErlsKy22Nkz473HFkzRkWTZeM7RLfX2raDoD7g74kA7HB4S2giwu6ZwiisQtg==";
+        url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.4.tgz";
+        sha512 = "pwJRHnpz1sCR5saQ+Hm1E2YESw2eLGKP5TzsYKXuQ7SIfvKWMRb9CHhptqunYpCIcRCpq3LgLuhYG5hiLPRbFQ==";
       };
     };
     "isstream-0.1.2" = {
@@ -3001,13 +2740,13 @@ let
         sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     };
-    "js-yaml-3.14.1" = {
+    "js-yaml-3.14.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.1";
+      version = "3.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
+        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
       };
     };
     "jsbi-3.1.4" = {
@@ -3145,15 +2884,6 @@ let
         sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==";
       };
     };
-    "kuler-2.0.0" = {
-      name = "kuler";
-      packageName = "kuler";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz";
-        sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==";
-      };
-    };
     "leven-2.1.0" = {
       name = "leven";
       packageName = "leven";
@@ -3217,13 +2947,31 @@ let
         sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==";
       };
     };
-    "localtunnel-2.0.1" = {
+    "localtunnel-2.0.0" = {
       name = "localtunnel";
       packageName = "localtunnel";
-      version = "2.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.1.tgz";
-        sha512 = "LiaI5wZdz0xFkIQpXbNI62ZnNn8IMsVhwxHmhA+h4vj8R9JG/07bQHWwQlyy7b95/5fVOCHJfIHv+a5XnkvaJA==";
+        url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.0.tgz";
+        sha512 = "g6E0aLgYYDvQDxIjIXkgJo2+pHj3sGg4Wz/XP3h2KtZnRsWPbOQY+hw1H8Z91jep998fkcVE9l+kghO+97vllg==";
+      };
+    };
+    "locate-path-3.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
+        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+      };
+    };
+    "locate-path-5.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
+        sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
       };
     };
     "lodash-4.17.20" = {
@@ -3361,15 +3109,6 @@ let
         sha1 = "370d1d3e85b72a7e1b0cdf2d272121306f23e4ed";
       };
     };
-    "logform-2.2.0" = {
-      name = "logform";
-      packageName = "logform";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz";
-        sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";
-      };
-    };
     "long-4.0.0" = {
       name = "long";
       packageName = "long";
@@ -3424,13 +3163,13 @@ let
         sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
       };
     };
-    "lru-memoizer-2.1.4" = {
+    "lru-memoizer-2.1.2" = {
       name = "lru-memoizer";
       packageName = "lru-memoizer";
-      version = "2.1.4";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz";
-        sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==";
+        url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.2.tgz";
+        sha512 = "N5L5xlnVcbIinNn/TJ17vHBZwBMt9t7aJDz2n97moWubjNl6VO9Ao2XuAGBBddkYdjrwR9HfzXbT6NfMZXAZ/A==";
       };
     };
     "mailparser-2.8.1" = {
@@ -3541,22 +3280,22 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.45.0" = {
+    "mime-db-1.44.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.45.0";
+      version = "1.44.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
-        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
       };
     };
-    "mime-types-2.1.28" = {
+    "mime-types-2.1.27" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.28";
+      version = "2.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
-        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
       };
     };
     "mimic-fn-2.1.0" = {
@@ -3568,15 +3307,6 @@ let
         sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
       };
     };
-    "minimalistic-assert-1.0.1" = {
-      name = "minimalistic-assert";
-      packageName = "minimalistic-assert";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
-        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
-      };
-    };
     "minimatch-3.0.4" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -3676,13 +3406,13 @@ let
         sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg==";
       };
     };
-    "mqtt-packet-6.7.0" = {
+    "mqtt-packet-6.6.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "6.7.0";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.7.0.tgz";
-        sha512 = "GzgeeCirQpB59FyhHvf8BLiIYgxctPSxuSyaF2vWnkt7paX7jtuQ8Gpl+DkHCxZmYuv7GQE6zcUAegpafd0MqQ==";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.6.0.tgz";
+        sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ==";
       };
     };
     "ms-2.0.0" = {
@@ -3712,13 +3442,13 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
-    "mssql-6.3.1" = {
+    "mssql-6.2.3" = {
       name = "mssql";
       packageName = "mssql";
-      version = "6.3.1";
+      version = "6.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mssql/-/mssql-6.3.1.tgz";
-        sha512 = "ammxrhbdDpcBWhiZLiy6miiU7ELt9qFbGvwmPbiufn+tBHAYUFR/AgwE4/v4jzPzbatowscmhFx1U61L91uVzQ==";
+        url = "https://registry.npmjs.org/mssql/-/mssql-6.2.3.tgz";
+        sha512 = "4TW/fA9UgzmVTNgjl65r6ISr6aL5QHnlptEt1A3jIpdzkNbFPIkRbUNz90324HIdE+5pKc3VqikOImcTrhd4og==";
       };
     };
     "mute-stream-0.0.8" = {
@@ -3748,40 +3478,40 @@ let
         sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
-    "n8n-core-0.59.0" = {
+    "n8n-core-0.54.0" = {
       name = "n8n-core";
       packageName = "n8n-core";
-      version = "0.59.0";
+      version = "0.54.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.59.0.tgz";
-        sha512 = "fpAyG7bHHp1cdnVguLEu6AJ/UjKDzFH84PYxXnj9k18nDJoI0sMBRCXQCB5W2lNdnfp8Hq1fKpAuFrn2PARz9Q==";
+        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.54.0.tgz";
+        sha512 = "07Fts2MSm5acbsFPEVU7RXx38K5ryGVy6OE1g+Nbr8B0LuQiTEhCzC7x+AIfFDQlt/cQQEiPejaBGDZZm0kdpA==";
       };
     };
-    "n8n-editor-ui-0.72.0" = {
+    "n8n-editor-ui-0.66.0" = {
       name = "n8n-editor-ui";
       packageName = "n8n-editor-ui";
-      version = "0.72.0";
+      version = "0.66.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.72.0.tgz";
-        sha512 = "O3ZdlQtOvR9HXYwiXGpiD6rxIQL89gTwluOiTwY5G/9BoqrWnmt3U1mNjmVkKrA4CzSDlRYe7gyVfRri7E6n9w==";
+        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.66.0.tgz";
+        sha512 = "BZTaiYffZ2+dbPOp0JjV+pZ4S7iD7r2oYTylwFbNRpEbIc4a0l8JbU0HRqHESdPR3yYDdUTmVXqk1fWfc8IgYw==";
       };
     };
-    "n8n-nodes-base-0.98.1" = {
+    "n8n-nodes-base-0.91.0" = {
       name = "n8n-nodes-base";
       packageName = "n8n-nodes-base";
-      version = "0.98.1";
+      version = "0.91.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.98.1.tgz";
-        sha512 = "NmKjzGypIR63AjnYA9tI+2mNvJes1ONPRrAaE9r9EYLE91Zzw58GKNRUh1UcSR754y3ha//9TAtkL2j9MTXiKA==";
+        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.91.0.tgz";
+        sha512 = "75DVfQS/AkZBB6lIAAWHhM4wRkhHXCNf/30Fi0Cc+cihw7GW3O4bdXNhZKFwDTf70DYNATM0kBBEbSHvQusuCw==";
       };
     };
-    "n8n-workflow-0.48.0" = {
+    "n8n-workflow-0.47.0" = {
       name = "n8n-workflow";
       packageName = "n8n-workflow";
-      version = "0.48.0";
+      version = "0.47.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.48.0.tgz";
-        sha512 = "3L1PM30NR3tpUNhUGI+eNI8smNEmxo+V5Vy+twqwM2d9hLA08ur1lwIqEQRzPnEMwLUtFohKuT5zN2bi1CNg+w==";
+        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.47.0.tgz";
+        sha512 = "1CbSOvVSf1KNM5izOEVsuMMEkuwiqezVH4hWS1Ts7pSdgSi8TrFCi4CE1J8qA0KBmWq5APh3vEJGFyvkLX6BOg==";
       };
     };
     "named-placeholders-1.1.2" = {
@@ -3811,13 +3541,13 @@ let
         sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0";
       };
     };
-    "needle-2.6.0" = {
+    "needle-2.5.2" = {
       name = "needle";
       packageName = "needle";
-      version = "2.6.0";
+      version = "2.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
-        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz";
+        sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==";
       };
     };
     "negotiator-0.6.2" = {
@@ -3883,13 +3613,13 @@ let
         sha512 = "BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ==";
       };
     };
-    "nodemailer-6.4.17" = {
+    "nodemailer-6.4.16" = {
       name = "nodemailer";
       packageName = "nodemailer";
-      version = "6.4.17";
+      version = "6.4.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.17.tgz";
-        sha512 = "89ps+SBGpo0D4Bi5ZrxcrCiRFaMmkCt+gItMXQGzEtZVR3uAD3QAQIDoxTWnx3ky0Dwwy/dhFrQ+6NNGXpw/qQ==";
+        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.16.tgz";
+        sha512 = "68K0LgZ6hmZ7PVmwL78gzNdjpj5viqBdFqKrTtr9bZbJYj6BRj5W6WGkxXrEnUl3Co3CBXi3CZBUlpV/foGnOQ==";
       };
     };
     "nopt-4.0.3" = {
@@ -3937,13 +3667,13 @@ let
         sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
       };
     };
-    "nth-check-2.0.0" = {
+    "nth-check-1.0.2" = {
       name = "nth-check";
       packageName = "nth-check";
-      version = "2.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz";
-        sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==";
+        url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz";
+        sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -3982,15 +3712,6 @@ let
         sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
-    "ocsp-1.2.0" = {
-      name = "ocsp";
-      packageName = "ocsp";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ocsp/-/ocsp-1.2.0.tgz";
-        sha1 = "469a1776b457dee67eb0201408c1946bac4076cc";
-      };
-    };
     "on-finished-2.3.0" = {
       name = "on-finished";
       packageName = "on-finished";
@@ -4018,15 +3739,6 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
-    "one-time-1.0.0" = {
-      name = "one-time";
-      packageName = "one-time";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz";
-        sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==";
-      };
-    };
     "onetime-5.1.2" = {
       name = "onetime";
       packageName = "onetime";
@@ -4036,13 +3748,13 @@ let
         sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
       };
     };
-    "open-7.3.1" = {
+    "open-7.3.0" = {
       name = "open";
       packageName = "open";
-      version = "7.3.1";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.3.1.tgz";
-        sha512 = "f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==";
+        url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz";
+        sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==";
       };
     };
     "openurl-1.1.1" = {
@@ -4108,6 +3820,42 @@ let
         sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==";
       };
     };
+    "p-limit-2.3.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
+      };
+    };
+    "p-locate-3.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
+        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+      };
+    };
+    "p-locate-4.1.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
+        sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
+      };
+    };
+    "p-try-2.2.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+      };
+    };
     "packet-reader-1.0.0" = {
       name = "packet-reader";
       packageName = "packet-reader";
@@ -4135,6 +3883,15 @@ let
         sha1 = "746a167638083a860b0eef6732cb27ed46c32977";
       };
     };
+    "parse5-3.0.3" = {
+      name = "parse5";
+      packageName = "parse5";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz";
+        sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==";
+      };
+    };
     "parse5-5.1.1" = {
       name = "parse5";
       packageName = "parse5";
@@ -4198,6 +3955,24 @@ let
         sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
+    "path-exists-3.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+      };
+    };
+    "path-exists-4.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
+        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
+      };
+    };
     "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
@@ -4234,13 +4009,13 @@ let
         sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A==";
       };
     };
-    "peek-readable-3.1.3" = {
+    "peek-readable-3.1.0" = {
       name = "peek-readable";
       packageName = "peek-readable";
-      version = "3.1.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz";
-        sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg==";
+        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.0.tgz";
+        sha512 = "KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA==";
       };
     };
     "performance-now-2.1.0" = {
@@ -4279,13 +4054,13 @@ let
         sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==";
       };
     };
-    "pg-minify-1.6.2" = {
+    "pg-minify-1.6.1" = {
       name = "pg-minify";
       packageName = "pg-minify";
-      version = "1.6.2";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz";
-        sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==";
+        url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz";
+        sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g==";
       };
     };
     "pg-pool-3.2.2" = {
@@ -4297,13 +4072,13 @@ let
         sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==";
       };
     };
-    "pg-promise-10.9.1" = {
+    "pg-promise-10.8.1" = {
       name = "pg-promise";
       packageName = "pg-promise";
-      version = "10.9.1";
+      version = "10.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.9.1.tgz";
-        sha512 = "Om5sYmsm2NWXP+D0Soappb4fuidER9qNLcnVo9nBPFqwPfpnBZZPzzLaVvwBXs//+kJ9L4bBTXm2iWNAp39e2A==";
+        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.8.1.tgz";
+        sha512 = "xRW3PBopAAPlSmOutfpxwrd0i1wfiVoJjkRC2xYzwk0PwWGLEOVKoDEHX4VoqjfIJ+SEEiILy5B5nUVvXpFFVA==";
       };
     };
     "pg-protocol-1.4.0" = {
@@ -4378,13 +4153,13 @@ let
         sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA==";
       };
     };
-    "popsicle-transport-http-1.1.1" = {
+    "popsicle-transport-http-1.0.9" = {
       name = "popsicle-transport-http";
       packageName = "popsicle-transport-http";
-      version = "1.1.1";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.1.1.tgz";
-        sha512 = "RNbifrl5ckXLk1X6YGhjDb0gL5yAH1nvultmboiVGLTnWDbwaoxhEP8He9epMFOPuSDuNJ//TMRoN+XfpN0KCw==";
+        url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.0.9.tgz";
+        sha512 = "55Os0JdCs35FI8cAsgMoKG6XXKR4Wh8qZIbL3rY5+IZqqjMIo3/3q3wSE98mUhHyLgjg9HQ6ep5wNfhbYCI7GQ==";
       };
     };
     "popsicle-transport-xhr-2.0.0" = {
@@ -4747,15 +4522,6 @@ let
         sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
       };
     };
-    "requestretry-4.1.2" = {
-      name = "requestretry";
-      packageName = "requestretry";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz";
-        sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA==";
-      };
-    };
     "require-directory-2.1.1" = {
       name = "require-directory";
       packageName = "require-directory";
@@ -4765,6 +4531,15 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
+    "require-main-filename-2.0.0" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
+        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
+      };
+    };
     "require_optional-1.0.1" = {
       name = "require_optional";
       packageName = "require_optional";
@@ -4864,13 +4639,13 @@ let
         sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c";
       };
     };
-    "rss-parser-3.10.0" = {
+    "rss-parser-3.9.0" = {
       name = "rss-parser";
       packageName = "rss-parser";
-      version = "3.10.0";
+      version = "3.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.10.0.tgz";
-        sha512 = "TC6FNvEmdFeaW6r/60MSJT7cp4d95X4M9As+mvNtxRx7YXHxpV95syMnWZthZSeD1BRN7SEKdq6c3nxMLQRopw==";
+        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.9.0.tgz";
+        sha512 = "wlRSfGrotOXuWo19Dtl2KmQt7o9i5zzCExUrxpechE0O54BAx7JD+xhWyGumPPqiJj771ndflV3sE3bTHen0HQ==";
       };
     };
     "run-async-2.4.1" = {
@@ -4945,15 +4720,6 @@ let
         sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
       };
     };
-    "semver-5.0.3" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
-        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
-      };
-    };
     "semver-5.3.0" = {
       name = "semver";
       packageName = "semver";
@@ -5071,15 +4837,6 @@ let
         sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
-    "simple-lru-cache-0.0.2" = {
-      name = "simple-lru-cache";
-      packageName = "simple-lru-cache";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
-        sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
-      };
-    };
     "simple-swizzle-0.2.2" = {
       name = "simple-swizzle";
       packageName = "simple-swizzle";
@@ -5107,15 +4864,6 @@ let
         sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==";
       };
     };
-    "snowflake-sdk-1.5.3" = {
-      name = "snowflake-sdk";
-      packageName = "snowflake-sdk";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.5.3.tgz";
-        sha512 = "Env7ebuWyaPWLIsGbFf/AH8IdeSCshAfHg9cH6F9AHAG0uwtJEO4XPdNeOkxyV/xjykx69s1L4mHWwPksgj8VA==";
-      };
-    };
     "sparse-bitfield-3.0.3" = {
       name = "sparse-bitfield";
       packageName = "sparse-bitfield";
@@ -5125,13 +4873,13 @@ let
         sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11";
       };
     };
-    "spex-3.2.0" = {
+    "spex-3.0.2" = {
       name = "spex";
       packageName = "spex";
-      version = "3.2.0";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz";
-        sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg==";
+        url = "https://registry.npmjs.org/spex/-/spex-3.0.2.tgz";
+        sha512 = "ZNCrOso+oNv5P01HCO4wuxV9Og5rS6ms7gGAqugfBPjx1QwfNXJI3T02ldfaap1O0dlT1sB0Rk+mhDqxt3Z27w==";
       };
     };
     "split2-3.2.2" = {
@@ -5233,15 +4981,6 @@ let
         sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
-    "stack-trace-0.0.10" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
-        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
-      };
-    };
     "statuses-1.5.0" = {
       name = "statuses";
       packageName = "statuses";
@@ -5296,6 +5035,15 @@ let
         sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
+    "string-width-3.1.0" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
+        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
+      };
+    };
     "string-width-4.2.0" = {
       name = "string-width";
       packageName = "string-width";
@@ -5341,6 +5089,15 @@ let
         sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
       };
     };
+    "strip-ansi-5.2.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
+        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
+      };
+    };
     "strip-ansi-6.0.0" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
@@ -5359,13 +5116,13 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "strtok3-6.0.8" = {
+    "strtok3-6.0.4" = {
       name = "strtok3";
       packageName = "strtok3";
-      version = "6.0.8";
+      version = "6.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz";
-        sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw==";
+        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.4.tgz";
+        sha512 = "rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ==";
       };
     };
     "supports-color-2.0.0" = {
@@ -5548,13 +5305,13 @@ let
         sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
       };
     };
-    "token-types-2.1.1" = {
+    "token-types-2.0.0" = {
       name = "token-types";
       packageName = "token-types";
-      version = "2.1.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/token-types/-/token-types-2.1.1.tgz";
-        sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q==";
+        url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz";
+        sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw==";
       };
     };
     "tough-cookie-2.5.0" = {
@@ -5575,15 +5332,6 @@ let
         sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==";
       };
     };
-    "triple-beam-1.3.0" = {
-      name = "triple-beam";
-      packageName = "triple-beam";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz";
-        sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==";
-      };
-    };
     "ts-expect-1.1.0" = {
       name = "ts-expect";
       packageName = "ts-expect";
@@ -5611,13 +5359,13 @@ let
         sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
-    "tslib-2.1.0" = {
+    "tslib-2.0.3" = {
       name = "tslib";
       packageName = "tslib";
-      version = "2.1.0";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz";
-        sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz";
+        sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==";
       };
     };
     "tsscmp-1.0.6" = {
@@ -5710,13 +5458,13 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typeorm-0.2.30" = {
+    "typeorm-0.2.29" = {
       name = "typeorm";
       packageName = "typeorm";
-      version = "0.2.30";
+      version = "0.2.29";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.30.tgz";
-        sha512 = "qpr8AO3Phi6ZF7qMHOrRdNisVt8jE1KfmW0ooLFcXscA87aJ12aBPyB9cJfxGNjNwd7B3WIK9ZlBveWiqd74QA==";
+        url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.29.tgz";
+        sha512 = "ih1vrTe3gEAGKRcWlcsTRxTL7gNjacQE498wVGuJ3ZRujtMqPZlbAWuC7xDzWCRjQnkZYNwZQeG9UgKfxSHB5g==";
       };
     };
     "uc.micro-1.0.6" = {
@@ -5800,13 +5548,13 @@ let
         sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==";
       };
     };
-    "uri-js-4.4.1" = {
+    "uri-js-4.4.0" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.1";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
-        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
+        sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
       };
     };
     "url-parse-1.4.7" = {
@@ -5908,15 +5656,6 @@ let
         sha512 = "nzyFmHdy2FMg7mYraRytc2jr4QBaUY3TEGe3q3bK8EgS9WC98wxn2jrPxS/ruWm+JGzrEIIeufKweQzVoQEd+Q==";
       };
     };
-    "when-3.7.8" = {
-      name = "when";
-      packageName = "when";
-      version = "3.7.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz";
-        sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82";
-      };
-    };
     "which-1.3.1" = {
       name = "which";
       packageName = "which";
@@ -5926,6 +5665,15 @@ let
         sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
       };
     };
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    };
     "wide-align-1.1.3" = {
       name = "wide-align";
       packageName = "wide-align";
@@ -5944,24 +5692,6 @@ let
         sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==";
       };
     };
-    "winston-3.3.3" = {
-      name = "winston";
-      packageName = "winston";
-      version = "3.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz";
-        sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==";
-      };
-    };
-    "winston-transport-4.4.0" = {
-      name = "winston-transport";
-      packageName = "winston-transport";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz";
-        sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==";
-      };
-    };
     "wmf-1.0.2" = {
       name = "wmf";
       packageName = "wmf";
@@ -5989,6 +5719,24 @@ let
         sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==";
       };
     };
+    "wrap-ansi-5.1.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
+        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
+      };
+    };
+    "wrap-ansi-6.2.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz";
+        sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==";
+      };
+    };
     "wrap-ansi-7.0.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -6007,13 +5755,13 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "ws-7.4.2" = {
+    "ws-7.4.1" = {
       name = "ws";
       packageName = "ws";
-      version = "7.4.2";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz";
-        sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==";
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz";
+        sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==";
       };
     };
     "xlsx-0.16.9" = {
@@ -6079,6 +5827,15 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
+    "y18n-4.0.1" = {
+      name = "y18n";
+      packageName = "y18n";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
+        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
+      };
+    };
     "y18n-5.0.5" = {
       name = "y18n";
       packageName = "y18n";
@@ -6124,13 +5881,31 @@ let
         sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==";
       };
     };
-    "yargs-16.2.0" = {
+    "yargs-13.3.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "16.2.0";
+      version = "13.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz";
-        sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
+        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
+      };
+    };
+    "yargs-15.4.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "15.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz";
+        sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==";
+      };
+    };
+    "yargs-16.1.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "16.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz";
+        sha512 = "hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w==";
       };
     };
     "yargs-parser-13.0.0" = {
@@ -6142,6 +5917,24 @@ let
         sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==";
       };
     };
+    "yargs-parser-13.1.2" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "13.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
+        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
+      };
+    };
+    "yargs-parser-18.1.3" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "18.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz";
+        sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
+      };
+    };
     "yargs-parser-20.2.4" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -6157,22 +5950,19 @@ in
   n8n = nodeEnv.buildNodePackage {
     name = "n8n";
     packageName = "n8n";
-    version = "0.103.1";
+    version = "0.96.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/n8n/-/n8n-0.103.1.tgz";
-      sha512 = "5iEVB2AyWp/fj9/0oxJY/x/A2SaJ5zpmn9KdAgTOjLerxPFzaDD2MBjr5wPt69GpuanEkA2htt2wNw3xwSGWgQ==";
+      url = "https://registry.npmjs.org/n8n/-/n8n-0.96.0.tgz";
+      sha512 = "HllfTHaD5g98YeGRsGQEeOg1WUUxQr5jnYEWD1qjIWkTVYqVrtEWaEdOxDxnko3Fw7sh2XqtWk1HZHNCRSTQuA==";
     };
     dependencies = [
       sources."@azure/ms-rest-azure-env-1.1.2"
-      (sources."@azure/ms-rest-js-1.9.1" // {
+      (sources."@azure/ms-rest-js-1.9.0" // {
         dependencies = [
-          sources."axios-0.21.1"
-          sources."follow-redirects-1.13.1"
           sources."tough-cookie-2.5.0"
         ];
       })
       sources."@azure/ms-rest-nodeauth-2.0.2"
-      sources."@dabh/diagnostics-2.0.2"
       (sources."@icetee/ftp-0.3.15" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -6180,13 +5970,13 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."@nodelib/fs.scandir-2.1.4"
-      sources."@nodelib/fs.stat-2.0.4"
-      sources."@nodelib/fs.walk-1.2.6"
+      sources."@nodelib/fs.scandir-2.1.3"
+      sources."@nodelib/fs.stat-2.0.3"
+      sources."@nodelib/fs.walk-1.2.4"
       sources."@oclif/command-1.8.0"
       (sources."@oclif/config-1.17.0" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."@oclif/errors-1.3.4" // {
@@ -6199,31 +5989,30 @@ in
       })
       sources."@oclif/linewrap-1.0.0"
       sources."@oclif/parser-3.8.5"
-      sources."@oclif/plugin-help-3.2.1"
+      sources."@oclif/plugin-help-3.2.0"
       sources."@servie/events-1.0.0"
       sources."@sqltools/formatter-1.2.2"
       sources."@tokenizer/token-0.1.1"
       sources."@types/bluebird-3.5.33"
       sources."@types/body-parser-1.19.0"
-      sources."@types/connect-3.4.34"
+      sources."@types/connect-3.4.33"
       sources."@types/debug-4.1.5"
-      sources."@types/express-4.17.11"
+      sources."@types/express-4.17.9"
       sources."@types/express-jwt-0.0.42"
-      sources."@types/express-serve-static-core-4.17.18"
+      sources."@types/express-serve-static-core-4.17.14"
       sources."@types/express-unless-0.5.1"
       sources."@types/ftp-0.3.31"
       sources."@types/glob-7.1.3"
       sources."@types/jsonwebtoken-8.5.0"
-      sources."@types/mime-1.3.2"
+      sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.10"
       sources."@types/promise-ftp-1.3.4"
       sources."@types/promise-ftp-common-1.1.0"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
       sources."@types/readable-stream-2.3.9"
-      sources."@types/serve-static-1.13.9"
-      sources."@types/snowflake-sdk-1.5.1"
+      sources."@types/serve-static-1.13.8"
       sources."@types/tough-cookie-2.3.7"
       sources."@types/tunnel-0.0.0"
       sources."abbrev-1.1.1"
@@ -6235,19 +6024,7 @@ in
         ];
       })
       sources."adler-32-1.2.0"
-      (sources."agent-base-2.1.1" // {
-        dependencies = [
-          sources."semver-5.0.3"
-        ];
-      })
       sources."ajv-6.12.6"
-      (sources."amqplib-0.6.0" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
-        ];
-      })
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -6266,10 +6043,7 @@ in
       sources."array-series-0.1.5"
       sources."array-union-2.1.0"
       sources."asn1-0.2.4"
-      sources."asn1.js-5.4.1"
-      sources."asn1.js-rfc2560-5.0.1"
-      sources."asn1.js-rfc5280-3.0.0"
-      sources."assert-options-0.7.0"
+      sources."assert-options-0.6.2"
       sources."assert-plus-1.0.0"
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
@@ -6281,17 +6055,8 @@ in
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bcryptjs-2.4.3"
-      sources."big-integer-1.6.48"
-      sources."bignumber.js-2.4.0"
-      (sources."bitsyntax-0.1.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
       sources."bl-2.2.1"
-      sources."bluebird-3.7.2"
-      sources."bn.js-4.11.9"
+      sources."bluebird-2.11.0"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -6302,26 +6067,23 @@ in
       sources."boolbase-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browser-request-0.3.3"
       sources."bson-1.1.5"
       sources."buffer-5.7.1"
       sources."buffer-equal-constant-time-1.0.1"
       sources."buffer-from-1.1.1"
-      sources."buffer-more-ints-1.0.0"
       sources."buffer-writer-2.0.0"
       sources."byte-length-1.0.2"
       sources."bytes-3.1.0"
-      sources."cacheable-lookup-5.0.4"
       sources."callback-stream-1.1.0"
       (sources."camel-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."camelcase-5.3.1"
       (sources."capital-case-1.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."cardinal-2.1.1"
@@ -6330,12 +6092,11 @@ in
       sources."chalk-2.4.2"
       (sources."change-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."chardet-0.7.0"
-      sources."cheerio-1.0.0-rc.5"
-      sources."cheerio-select-tmp-0.1.1"
+      sources."cheerio-1.0.0-rc.3"
       sources."chownr-1.1.4"
       (sources."clean-stack-3.0.1" // {
         dependencies = [
@@ -6343,15 +6104,23 @@ in
         ];
       })
       sources."cli-cursor-3.1.0"
-      (sources."cli-highlight-2.1.10" // {
+      (sources."cli-highlight-2.1.9" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
+          sources."cliui-6.0.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
+          sources."find-up-4.1.0"
           sources."has-flag-4.0.0"
+          sources."locate-path-5.0.0"
+          sources."p-locate-4.1.0"
           sources."parse5-5.1.1"
+          sources."path-exists-4.0.0"
           sources."supports-color-7.2.0"
+          sources."wrap-ansi-6.2.0"
+          sources."yargs-15.4.1"
+          sources."yargs-parser-18.1.3"
         ];
       })
       sources."cli-width-3.0.0"
@@ -6360,12 +6129,14 @@ in
           sources."safe-buffer-5.2.1"
         ];
       })
-      (sources."cliui-7.0.4" // {
+      (sources."cliui-5.0.0" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."wrap-ansi-7.0.0"
+          sources."ansi-regex-4.1.0"
+          sources."emoji-regex-7.0.3"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+          sources."wrap-ansi-5.1.0"
         ];
       })
       sources."code-point-at-1.1.0"
@@ -6379,7 +6150,6 @@ in
       sources."color-name-1.1.3"
       sources."color-string-1.5.4"
       sources."colornames-1.1.1"
-      sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."combined-stream-1.0.8"
       sources."commander-2.17.1"
@@ -6398,7 +6168,7 @@ in
       sources."console-control-strings-1.1.0"
       (sources."constant-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."content-disposition-0.5.3"
@@ -6417,34 +6187,29 @@ in
       })
       sources."crypto-js-4.0.0"
       sources."csrf-3.1.0"
-      sources."css-select-3.1.2"
-      sources."css-what-4.0.0"
+      sources."css-select-1.2.0"
+      sources."css-what-2.1.3"
       sources."d-1.0.1"
       sources."dashdash-1.14.1"
       sources."date-utils-1.2.21"
-      sources."debug-4.3.2"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       sources."deep-extend-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."denque-1.5.0"
+      sources."denque-1.4.1"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."detect-libc-1.0.3"
-      (sources."diagnostics-1.1.1" // {
-        dependencies = [
-          sources."enabled-1.0.2"
-          sources."kuler-1.0.1"
-        ];
-      })
+      sources."diagnostics-1.1.1"
       sources."dir-glob-3.0.1"
-      sources."dom-serializer-1.2.0"
-      sources."domelementtype-2.1.0"
-      sources."domhandler-4.0.0"
-      sources."domutils-2.4.4"
+      sources."dom-serializer-0.1.1"
+      sources."domelementtype-1.3.1"
+      sources."domhandler-2.4.2"
+      sources."domutils-1.5.1"
       (sources."dot-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."dotenv-8.2.0"
@@ -6454,17 +6219,15 @@ in
       sources."ecdsa-sig-formatter-1.0.11"
       sources."ee-first-1.1.1"
       sources."emoji-regex-8.0.0"
-      sources."enabled-2.0.0"
+      sources."enabled-1.0.2"
       sources."encodeurl-1.0.2"
       sources."encoding-japanese-1.0.30"
       sources."end-of-stream-1.4.4"
-      sources."entities-2.1.0"
+      sources."entities-1.1.2"
       sources."env-variable-0.0.6"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
-      sources."es6-promise-4.2.8"
-      sources."es6-promisify-5.0.0"
       (sources."es6-set-0.1.5" // {
         dependencies = [
           sources."es6-symbol-3.1.1"
@@ -6495,11 +6258,9 @@ in
       sources."external-editor-3.1.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-safe-stringify-2.0.7"
-      sources."fastq-1.10.0"
-      sources."fecha-4.2.0"
+      sources."fastq-1.9.0"
       sources."fflate-0.3.11"
       sources."figlet-1.5.0"
       sources."figures-3.2.0"
@@ -6511,8 +6272,8 @@ in
           sources."ms-2.0.0"
         ];
       })
+      sources."find-up-3.0.0"
       sources."flatted-2.0.2"
-      sources."fn.name-1.1.0"
       (sources."follow-redirects-1.5.10" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -6549,7 +6310,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       (sources."gm-1.23.1" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -6569,36 +6330,19 @@ in
       sources."he-1.2.0"
       (sources."header-case-2.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."help-me-1.1.0"
-      sources."highlight.js-10.5.0"
-      (sources."html-to-text-5.1.1" // {
+      sources."highlight.js-10.4.1"
+      sources."html-to-text-5.1.1"
+      (sources."htmlparser2-3.10.1" // {
         dependencies = [
-          (sources."dom-serializer-0.2.2" // {
-            dependencies = [
-              sources."domelementtype-2.1.0"
-              sources."entities-2.1.0"
-            ];
-          })
-          sources."domelementtype-1.3.1"
-          sources."domhandler-2.4.2"
-          sources."domutils-1.7.0"
-          sources."entities-1.1.2"
-          sources."htmlparser2-3.10.1"
           sources."readable-stream-3.6.0"
         ];
       })
-      sources."htmlparser2-6.0.0"
       sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
-      (sources."https-proxy-agent-3.0.1" // {
-        dependencies = [
-          sources."agent-base-4.3.0"
-          sources."debug-3.2.7"
-        ];
-      })
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."ignore-5.1.8"
@@ -6614,7 +6358,7 @@ in
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."ini-1.3.8"
+      sources."ini-1.3.5"
       (sources."inquirer-7.3.3" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -6629,6 +6373,7 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-absolute-1.0.0"
       sources."is-arrayish-0.3.2"
+      sources."is-buffer-2.0.5"
       sources."is-docker-2.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -6638,16 +6383,15 @@ in
       sources."is-promise-1.0.1"
       sources."is-property-1.0.2"
       sources."is-relative-1.0.0"
-      sources."is-stream-2.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-unc-path-1.0.0"
       sources."is-windows-1.0.2"
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."iso-639-1-2.1.7"
+      sources."iso-639-1-2.1.4"
       sources."isstream-0.1.2"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-3.14.0"
       sources."jsbi-3.1.4"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
@@ -6666,7 +6410,7 @@ in
       sources."jwks-rsa-1.9.0"
       sources."jws-3.2.2"
       sources."kafkajs-1.15.0"
-      sources."kuler-2.0.0"
+      sources."kuler-1.0.1"
       sources."leven-2.1.0"
       sources."libbase64-1.2.1"
       (sources."libmime-5.0.0" // {
@@ -6677,13 +6421,13 @@ in
       sources."libqp-1.1.0"
       sources."limiter-1.1.5"
       sources."linkify-it-3.0.2"
-      (sources."localtunnel-2.0.1" // {
+      (sources."localtunnel-2.0.0" // {
         dependencies = [
-          sources."axios-0.21.1"
-          sources."debug-4.3.1"
-          sources."follow-redirects-1.13.1"
+          sources."axios-0.19.0"
+          sources."debug-4.1.1"
         ];
       })
+      sources."locate-path-3.0.0"
       sources."lodash-4.17.20"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.clonedeep-4.5.0"
@@ -6699,15 +6443,14 @@ in
       sources."lodash.template-4.5.0"
       sources."lodash.templatesettings-4.2.0"
       sources."lodash.unset-4.5.2"
-      sources."logform-2.2.0"
       sources."long-4.0.0"
       (sources."lower-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."lru-cache-6.0.0"
-      (sources."lru-memoizer-2.1.4" // {
+      (sources."lru-memoizer-2.1.2" // {
         dependencies = [
           sources."lru-cache-4.0.2"
           sources."yallist-2.1.2"
@@ -6735,10 +6478,9 @@ in
       sources."micromatch-4.0.2"
       sources."millisecond-0.1.2"
       sources."mime-1.6.0"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."mimic-fn-2.1.0"
-      sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       (sources."minipass-2.9.0" // {
@@ -6747,12 +6489,12 @@ in
         ];
       })
       sources."minizlib-1.3.3"
-      sources."mkdirp-1.0.4"
+      sources."mkdirp-0.5.5"
       sources."moment-2.24.0"
       sources."moment-timezone-0.5.32"
       sources."mongodb-3.6.3"
       sources."mqtt-4.2.1"
-      (sources."mqtt-packet-6.7.0" // {
+      (sources."mqtt-packet-6.6.0" // {
         dependencies = [
           sources."bl-4.0.3"
           sources."inherits-2.0.4"
@@ -6760,7 +6502,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."mssql-6.3.1"
+      sources."mssql-6.2.3"
       sources."mute-stream-0.0.8"
       (sources."mysql2-2.1.0" // {
         dependencies = [
@@ -6770,14 +6512,14 @@ in
         ];
       })
       sources."mz-2.7.0"
-      sources."n8n-core-0.59.0"
-      sources."n8n-editor-ui-0.72.0"
-      (sources."n8n-nodes-base-0.98.1" // {
+      sources."n8n-core-0.54.0"
+      sources."n8n-editor-ui-0.66.0"
+      (sources."n8n-nodes-base-0.91.0" // {
         dependencies = [
           sources."moment-2.28.0"
         ];
       })
-      sources."n8n-workflow-0.48.0"
+      sources."n8n-workflow-0.47.0"
       (sources."named-placeholders-1.1.2" // {
         dependencies = [
           sources."lru-cache-4.1.5"
@@ -6786,7 +6528,7 @@ in
       })
       sources."nan-2.14.2"
       sources."native-duplexpair-1.0.0"
-      (sources."needle-2.6.0" // {
+      (sources."needle-2.5.2" // {
         dependencies = [
           sources."debug-3.2.7"
         ];
@@ -6795,43 +6537,33 @@ in
       sources."next-tick-1.0.0"
       (sources."no-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."node-ensure-0.0.0"
       (sources."node-pre-gyp-0.11.0" // {
         dependencies = [
-          sources."mkdirp-0.5.5"
           sources."rimraf-2.7.1"
           sources."semver-5.7.1"
         ];
       })
       sources."nodeify-1.0.1"
-      sources."nodemailer-6.4.17"
+      sources."nodemailer-6.4.16"
       sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-packlist-1.4.8"
       sources."npmlog-4.1.2"
-      sources."nth-check-2.0.0"
+      sources."nth-check-1.0.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-1.0a-2.2.6"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
-      (sources."ocsp-1.2.0" // {
-        dependencies = [
-          sources."asn1.js-4.10.1"
-          sources."asn1.js-rfc2560-4.0.6"
-          sources."asn1.js-rfc5280-2.0.1"
-          sources."async-1.5.2"
-        ];
-      })
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
-      sources."one-time-1.0.0"
       sources."onetime-5.1.2"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."openurl-1.1.1"
       sources."ordered-read-streams-1.0.1"
       sources."original-1.0.2"
@@ -6839,27 +6571,35 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."p-cancelable-2.0.0"
+      sources."p-limit-2.3.0"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
       sources."packet-reader-1.0.0"
       (sources."param-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."parent-require-1.0.0"
-      sources."parse5-6.0.1"
-      sources."parse5-htmlparser2-tree-adapter-6.0.1"
+      sources."parse5-3.0.3"
+      (sources."parse5-htmlparser2-tree-adapter-6.0.1" // {
+        dependencies = [
+          sources."parse5-6.0.1"
+        ];
+      })
       sources."parseurl-1.3.3"
       (sources."pascal-case-3.1.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."path-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."path-dirname-1.0.2"
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."path-type-4.0.0"
@@ -6868,14 +6608,14 @@ in
           sources."debug-3.2.7"
         ];
       })
-      sources."peek-readable-3.1.3"
+      sources."peek-readable-3.1.0"
       sources."performance-now-2.1.0"
       sources."pg-8.5.1"
       sources."pg-connection-string-2.4.0"
       sources."pg-int8-1.0.1"
-      sources."pg-minify-1.6.2"
+      sources."pg-minify-1.6.1"
       sources."pg-pool-3.2.2"
-      sources."pg-promise-10.9.1"
+      sources."pg-promise-10.8.1"
       sources."pg-protocol-1.4.0"
       sources."pg-types-2.2.0"
       sources."pgpass-1.0.4"
@@ -6884,7 +6624,7 @@ in
       sources."popsicle-content-encoding-1.0.0"
       sources."popsicle-cookie-jar-1.0.0"
       sources."popsicle-redirects-1.1.0"
-      sources."popsicle-transport-http-1.1.1"
+      sources."popsicle-transport-http-1.0.9"
       sources."popsicle-transport-xhr-2.0.0"
       sources."popsicle-user-agent-1.0.0"
       sources."postgres-array-2.0.0"
@@ -6894,11 +6634,7 @@ in
       sources."printj-1.1.2"
       sources."process-nextick-args-2.0.1"
       sources."promise-1.3.0"
-      (sources."promise-ftp-1.3.5" // {
-        dependencies = [
-          sources."bluebird-2.11.0"
-        ];
-      })
+      sources."promise-ftp-1.3.5"
       sources."promise-ftp-common-1.1.5"
       sources."proxy-addr-2.0.6"
       sources."pseudomap-1.0.2"
@@ -6938,8 +6674,8 @@ in
           sources."tough-cookie-2.5.0"
         ];
       })
-      sources."requestretry-4.1.2"
       sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
       (sources."require_optional-1.0.1" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -6958,7 +6694,11 @@ in
       sources."rimraf-3.0.2"
       sources."riot-tmpl-3.0.8"
       sources."rndm-1.2.0"
-      sources."rss-parser-3.10.0"
+      (sources."rss-parser-3.9.0" // {
+        dependencies = [
+          sources."entities-2.1.0"
+        ];
+      })
       sources."run-async-2.4.1"
       sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
@@ -6979,7 +6719,7 @@ in
       })
       (sources."sentence-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."seq-queue-0.0.5"
@@ -6990,21 +6730,15 @@ in
       sources."setprototypeof-1.1.1"
       sources."sha.js-2.4.11"
       sources."signal-exit-3.0.3"
-      sources."simple-lru-cache-0.0.2"
       sources."simple-swizzle-0.2.2"
       sources."slash-3.0.0"
       (sources."snake-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
-        ];
-      })
-      (sources."snowflake-sdk-1.5.3" // {
-        dependencies = [
-          sources."debug-3.2.7"
+          sources."tslib-2.0.3"
         ];
       })
       sources."sparse-bitfield-3.0.3"
-      sources."spex-3.2.0"
+      sources."spex-3.0.2"
       (sources."split2-3.2.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -7024,7 +6758,6 @@ in
       })
       sources."ssh2-streams-0.4.10"
       sources."sshpk-1.16.1"
-      sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."stream-shift-1.0.1"
@@ -7033,18 +6766,17 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."strtok3-6.0.8"
+      sources."strtok3-6.0.4"
       sources."supports-color-5.5.0"
       (sources."tar-4.4.13" // {
         dependencies = [
-          sources."mkdirp-0.5.5"
           sources."yallist-3.1.1"
         ];
       })
       sources."tarn-1.1.5"
       (sources."tedious-6.7.0" // {
         dependencies = [
-          sources."@types/node-12.19.15"
+          sources."@types/node-12.19.8"
           sources."bl-3.0.1"
           sources."depd-2.0.0"
           sources."iconv-lite-0.5.2"
@@ -7068,9 +6800,8 @@ in
       sources."to-absolute-glob-2.0.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
-      sources."token-types-2.1.1"
+      sources."token-types-2.0.0"
       sources."tough-cookie-3.0.1"
-      sources."triple-beam-1.3.0"
       sources."ts-expect-1.1.0"
       sources."tslib-1.11.2"
       sources."tsscmp-1.0.6"
@@ -7082,15 +6813,21 @@ in
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
-      (sources."typeorm-0.2.30" // {
+      (sources."typeorm-0.2.29" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
+          sources."cliui-7.0.4"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
+          sources."mkdirp-1.0.4"
           sources."supports-color-7.2.0"
           sources."tslib-1.14.1"
+          sources."wrap-ansi-7.0.0"
+          sources."y18n-5.0.5"
+          sources."yargs-16.1.1"
+          sources."yargs-parser-20.2.4"
         ];
       })
       sources."uc.micro-1.0.6"
@@ -7102,15 +6839,15 @@ in
       sources."unpipe-1.0.0"
       (sources."upper-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."upper-case-first-2.0.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-parse-1.4.7"
       (sources."utf7-1.0.2" // {
         dependencies = [
@@ -7126,8 +6863,8 @@ in
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."vm2-3.9.2"
-      sources."when-3.7.8"
       sources."which-1.3.1"
+      sources."which-module-2.0.0"
       (sources."wide-align-1.1.3" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -7137,12 +6874,6 @@ in
         ];
       })
       sources."widest-line-3.1.0"
-      (sources."winston-3.3.3" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
-      sources."winston-transport-4.4.0"
       sources."wmf-1.0.2"
       sources."word-0.3.0"
       (sources."wrap-ansi-4.0.0" // {
@@ -7154,7 +6885,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-7.4.2"
+      sources."ws-7.4.1"
       sources."xlsx-0.16.9"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
@@ -7162,7 +6893,7 @@ in
       sources."xpath.js-1.1.0"
       sources."xregexp-2.0.0"
       sources."xtend-4.0.2"
-      sources."y18n-5.0.5"
+      sources."y18n-4.0.1"
       sources."yallist-4.0.0"
       (sources."yargonaut-1.1.4" // {
         dependencies = [
@@ -7173,9 +6904,14 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."yargs-16.2.0" // {
+      (sources."yargs-13.3.0" // {
         dependencies = [
-          sources."yargs-parser-20.2.4"
+          sources."ansi-regex-4.1.0"
+          sources."emoji-regex-7.0.3"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+          sources."yargs-parser-13.1.2"
         ];
       })
       sources."yargs-parser-13.0.0"
@@ -7183,7 +6919,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "n8n Workflow Automation Tool";
-      homepage = "https://n8n.io";
+      homepage = https://n8n.io/;
       license = "SEE LICENSE IN LICENSE.md";
     };
     production = true;
diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix
index 64326c6b216..0769168a78f 100644
--- a/pkgs/applications/version-management/commitizen/node-composition.nix
+++ b/pkgs/applications/version-management/commitizen/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix
index c2b723195b7..262df27e464 100644
--- a/pkgs/applications/version-management/commitizen/node-env.nix
+++ b/pkgs/applications/version-management/commitizen/node-env.nix
@@ -1,11 +1,8 @@
 # This file originates from node2nix
 
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
+{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
 
 let
-  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
-  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
-
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -245,8 +242,8 @@ let
       if(fs.existsSync("./package-lock.json")) {
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-          if(![1, 2].includes(packageLock.lockfileVersion)) {
-             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+          if(packageLock.lockfileVersion !== 1) {
+             process.stderr.write("Sorry, I only understand lock file version 1!\n");
              process.exit(1);
           }
 
@@ -399,7 +396,7 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ lib.optional (stdenv.isLinux) utillinux
+        ++ lib.optional (stdenv.isLinux) util-linux
         ++ lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
@@ -448,8 +445,8 @@ let
       '';
     } // extraArgs);
 
-  # Builds a node environment (a node_modules folder and a set of binaries)
-  buildNodeDependencies =
+  # Builds a development shell
+  buildNodeShell =
     { name
     , packageName
     , version
@@ -468,12 +465,12 @@ let
 
     let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-    in
-      stdenv.mkDerivation ({
+
+      nodeDependencies = stdenv.mkDerivation ({
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
-          ++ lib.optional (stdenv.isLinux) utillinux
+          ++ lib.optional (stdenv.isLinux) util-linux
           ++ lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
@@ -515,32 +512,11 @@ let
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
       } // extraArgs);
-
-  # Builds a development shell
-  buildNodeShell =
-    { name
-    , packageName
-    , version
-    , src
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      nodeDependencies = buildNodeDependencies args;
     in
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -562,6 +538,5 @@ in
 {
   buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
   buildNodePackage = lib.makeOverridable buildNodePackage;
-  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
   buildNodeShell = lib.makeOverridable buildNodeShell;
 }
diff --git a/pkgs/applications/version-management/commitizen/node-packages.nix b/pkgs/applications/version-management/commitizen/node-packages.nix
index a6138b1788b..396dedf56fd 100644
--- a/pkgs/applications/version-management/commitizen/node-packages.nix
+++ b/pkgs/applications/version-management/commitizen/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -13,22 +13,22 @@ let
         sha512 = "+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg==";
       };
     };
-    "@babel/code-frame-7.12.11" = {
+    "@babel/code-frame-7.10.4" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
-        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";
+        sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
-    "@babel/compat-data-7.12.7" = {
+    "@babel/compat-data-7.11.0" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.12.7";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz";
-        sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz";
+        sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==";
       };
     };
     "@babel/core-7.11.6" = {
@@ -40,22 +40,22 @@ let
         sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==";
       };
     };
-    "@babel/generator-7.12.11" = {
+    "@babel/generator-7.11.6" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.12.11";
+      version = "7.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
-        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz";
+        sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==";
       };
     };
-    "@babel/helper-annotate-as-pure-7.12.10" = {
+    "@babel/helper-annotate-as-pure-7.10.4" = {
       name = "_at_babel_slash_helper-annotate-as-pure";
       packageName = "@babel/helper-annotate-as-pure";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz";
-        sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==";
+        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz";
+        sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==";
       };
     };
     "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = {
@@ -67,31 +67,31 @@ let
         sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==";
       };
     };
-    "@babel/helper-compilation-targets-7.12.5" = {
+    "@babel/helper-compilation-targets-7.10.4" = {
       name = "_at_babel_slash_helper-compilation-targets";
       packageName = "@babel/helper-compilation-targets";
-      version = "7.12.5";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz";
-        sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==";
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz";
+        sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.12.1" = {
+    "@babel/helper-create-class-features-plugin-7.10.5" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.12.1";
+      version = "7.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz";
-        sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==";
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz";
+        sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==";
       };
     };
-    "@babel/helper-create-regexp-features-plugin-7.12.7" = {
+    "@babel/helper-create-regexp-features-plugin-7.10.4" = {
       name = "_at_babel_slash_helper-create-regexp-features-plugin";
       packageName = "@babel/helper-create-regexp-features-plugin";
-      version = "7.12.7";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz";
-        sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==";
+        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz";
+        sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==";
       };
     };
     "@babel/helper-define-map-7.10.5" = {
@@ -103,31 +103,31 @@ let
         sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==";
       };
     };
-    "@babel/helper-explode-assignable-expression-7.12.1" = {
+    "@babel/helper-explode-assignable-expression-7.11.4" = {
       name = "_at_babel_slash_helper-explode-assignable-expression";
       packageName = "@babel/helper-explode-assignable-expression";
-      version = "7.12.1";
+      version = "7.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz";
-        sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==";
+        url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz";
+        sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==";
       };
     };
-    "@babel/helper-function-name-7.12.11" = {
+    "@babel/helper-function-name-7.10.4" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
-        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
+        sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
       };
     };
-    "@babel/helper-get-function-arity-7.12.10" = {
+    "@babel/helper-get-function-arity-7.10.4" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
-        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
+        sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
       };
     };
     "@babel/helper-hoist-variables-7.10.4" = {
@@ -139,40 +139,40 @@ let
         sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.12.7" = {
+    "@babel/helper-member-expression-to-functions-7.11.0" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.12.7";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
-        sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz";
+        sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==";
       };
     };
-    "@babel/helper-module-imports-7.12.5" = {
+    "@babel/helper-module-imports-7.10.4" = {
       name = "_at_babel_slash_helper-module-imports";
       packageName = "@babel/helper-module-imports";
-      version = "7.12.5";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
-        sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
+        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz";
+        sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==";
       };
     };
-    "@babel/helper-module-transforms-7.12.1" = {
+    "@babel/helper-module-transforms-7.11.0" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
-      version = "7.12.1";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
-        sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz";
+        sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.12.10" = {
+    "@babel/helper-optimise-call-expression-7.10.4" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
-        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
+        sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==";
       };
     };
     "@babel/helper-plugin-utils-7.10.4" = {
@@ -184,85 +184,85 @@ let
         sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
       };
     };
-    "@babel/helper-remap-async-to-generator-7.12.1" = {
+    "@babel/helper-regex-7.10.5" = {
+      name = "_at_babel_slash_helper-regex";
+      packageName = "@babel/helper-regex";
+      version = "7.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz";
+        sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==";
+      };
+    };
+    "@babel/helper-remap-async-to-generator-7.11.4" = {
       name = "_at_babel_slash_helper-remap-async-to-generator";
       packageName = "@babel/helper-remap-async-to-generator";
-      version = "7.12.1";
+      version = "7.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz";
-        sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
+        url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz";
+        sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==";
       };
     };
-    "@babel/helper-replace-supers-7.12.11" = {
+    "@babel/helper-replace-supers-7.10.4" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
-        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz";
+        sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==";
       };
     };
-    "@babel/helper-simple-access-7.12.1" = {
+    "@babel/helper-simple-access-7.10.4" = {
       name = "_at_babel_slash_helper-simple-access";
       packageName = "@babel/helper-simple-access";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
-        sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
+        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz";
+        sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==";
       };
     };
-    "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = {
+    "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = {
       name = "_at_babel_slash_helper-skip-transparent-expression-wrappers";
       packageName = "@babel/helper-skip-transparent-expression-wrappers";
-      version = "7.12.1";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz";
-        sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==";
+        url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz";
+        sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==";
       };
     };
-    "@babel/helper-split-export-declaration-7.12.11" = {
+    "@babel/helper-split-export-declaration-7.11.0" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.12.11";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
-        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
+        sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
       };
     };
-    "@babel/helper-validator-identifier-7.12.11" = {
+    "@babel/helper-validator-identifier-7.10.4" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
-        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
+        sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
       };
     };
-    "@babel/helper-validator-option-7.12.11" = {
-      name = "_at_babel_slash_helper-validator-option";
-      packageName = "@babel/helper-validator-option";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz";
-        sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==";
-      };
-    };
-    "@babel/helper-wrap-function-7.12.3" = {
+    "@babel/helper-wrap-function-7.10.4" = {
       name = "_at_babel_slash_helper-wrap-function";
       packageName = "@babel/helper-wrap-function";
-      version = "7.12.3";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz";
-        sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==";
+        url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz";
+        sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==";
       };
     };
-    "@babel/helpers-7.12.5" = {
+    "@babel/helpers-7.10.4" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.12.5";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
-        sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz";
+        sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==";
       };
     };
     "@babel/highlight-7.10.4" = {
@@ -274,85 +274,85 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.11" = {
+    "@babel/parser-7.11.5" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.11";
+      version = "7.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
-        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz";
+        sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==";
       };
     };
-    "@babel/plugin-proposal-async-generator-functions-7.12.12" = {
+    "@babel/plugin-proposal-async-generator-functions-7.10.5" = {
       name = "_at_babel_slash_plugin-proposal-async-generator-functions";
       packageName = "@babel/plugin-proposal-async-generator-functions";
-      version = "7.12.12";
+      version = "7.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz";
-        sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz";
+        sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==";
       };
     };
-    "@babel/plugin-proposal-class-properties-7.12.1" = {
+    "@babel/plugin-proposal-class-properties-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-class-properties";
       packageName = "@babel/plugin-proposal-class-properties";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz";
-        sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz";
+        sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==";
       };
     };
-    "@babel/plugin-proposal-dynamic-import-7.12.1" = {
+    "@babel/plugin-proposal-dynamic-import-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-dynamic-import";
       packageName = "@babel/plugin-proposal-dynamic-import";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz";
-        sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz";
+        sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==";
       };
     };
-    "@babel/plugin-proposal-export-namespace-from-7.12.1" = {
+    "@babel/plugin-proposal-export-namespace-from-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-export-namespace-from";
       packageName = "@babel/plugin-proposal-export-namespace-from";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz";
-        sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz";
+        sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==";
       };
     };
-    "@babel/plugin-proposal-json-strings-7.12.1" = {
+    "@babel/plugin-proposal-json-strings-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-json-strings";
       packageName = "@babel/plugin-proposal-json-strings";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz";
-        sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz";
+        sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==";
       };
     };
-    "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = {
+    "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = {
       name = "_at_babel_slash_plugin-proposal-logical-assignment-operators";
       packageName = "@babel/plugin-proposal-logical-assignment-operators";
-      version = "7.12.1";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz";
-        sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz";
+        sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==";
       };
     };
-    "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = {
+    "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator";
       packageName = "@babel/plugin-proposal-nullish-coalescing-operator";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz";
-        sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz";
+        sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==";
       };
     };
-    "@babel/plugin-proposal-numeric-separator-7.12.7" = {
+    "@babel/plugin-proposal-numeric-separator-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-numeric-separator";
       packageName = "@babel/plugin-proposal-numeric-separator";
-      version = "7.12.7";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz";
-        sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz";
+        sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==";
       };
     };
     "@babel/plugin-proposal-object-rest-spread-7.11.0" = {
@@ -364,40 +364,49 @@ let
         sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==";
       };
     };
-    "@babel/plugin-proposal-optional-catch-binding-7.12.1" = {
+    "@babel/plugin-proposal-object-rest-spread-7.9.0" = {
+      name = "_at_babel_slash_plugin-proposal-object-rest-spread";
+      packageName = "@babel/plugin-proposal-object-rest-spread";
+      version = "7.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz";
+        sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==";
+      };
+    };
+    "@babel/plugin-proposal-optional-catch-binding-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-optional-catch-binding";
       packageName = "@babel/plugin-proposal-optional-catch-binding";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz";
-        sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz";
+        sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==";
       };
     };
-    "@babel/plugin-proposal-optional-chaining-7.12.7" = {
+    "@babel/plugin-proposal-optional-chaining-7.11.0" = {
       name = "_at_babel_slash_plugin-proposal-optional-chaining";
       packageName = "@babel/plugin-proposal-optional-chaining";
-      version = "7.12.7";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz";
-        sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz";
+        sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==";
       };
     };
-    "@babel/plugin-proposal-private-methods-7.12.1" = {
+    "@babel/plugin-proposal-private-methods-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-private-methods";
       packageName = "@babel/plugin-proposal-private-methods";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz";
-        sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz";
+        sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==";
       };
     };
-    "@babel/plugin-proposal-unicode-property-regex-7.12.1" = {
+    "@babel/plugin-proposal-unicode-property-regex-7.10.4" = {
       name = "_at_babel_slash_plugin-proposal-unicode-property-regex";
       packageName = "@babel/plugin-proposal-unicode-property-regex";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz";
-        sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz";
+        sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==";
       };
     };
     "@babel/plugin-syntax-async-generators-7.8.4" = {
@@ -409,13 +418,13 @@ let
         sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==";
       };
     };
-    "@babel/plugin-syntax-class-properties-7.12.1" = {
+    "@babel/plugin-syntax-class-properties-7.10.4" = {
       name = "_at_babel_slash_plugin-syntax-class-properties";
       packageName = "@babel/plugin-syntax-class-properties";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz";
-        sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz";
+        sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==";
       };
     };
     "@babel/plugin-syntax-dynamic-import-7.8.3" = {
@@ -499,301 +508,301 @@ let
         sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==";
       };
     };
-    "@babel/plugin-syntax-top-level-await-7.12.1" = {
+    "@babel/plugin-syntax-top-level-await-7.10.4" = {
       name = "_at_babel_slash_plugin-syntax-top-level-await";
       packageName = "@babel/plugin-syntax-top-level-await";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz";
-        sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz";
+        sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==";
       };
     };
-    "@babel/plugin-transform-arrow-functions-7.12.1" = {
+    "@babel/plugin-transform-arrow-functions-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-arrow-functions";
       packageName = "@babel/plugin-transform-arrow-functions";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz";
-        sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz";
+        sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==";
       };
     };
-    "@babel/plugin-transform-async-to-generator-7.12.1" = {
+    "@babel/plugin-transform-async-to-generator-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-async-to-generator";
       packageName = "@babel/plugin-transform-async-to-generator";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz";
-        sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz";
+        sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==";
       };
     };
-    "@babel/plugin-transform-block-scoped-functions-7.12.1" = {
+    "@babel/plugin-transform-block-scoped-functions-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-block-scoped-functions";
       packageName = "@babel/plugin-transform-block-scoped-functions";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz";
-        sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz";
+        sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.12.12" = {
+    "@babel/plugin-transform-block-scoping-7.11.1" = {
       name = "_at_babel_slash_plugin-transform-block-scoping";
       packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.12.12";
+      version = "7.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz";
-        sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz";
+        sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==";
       };
     };
-    "@babel/plugin-transform-classes-7.12.1" = {
+    "@babel/plugin-transform-classes-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz";
-        sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz";
+        sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==";
       };
     };
-    "@babel/plugin-transform-computed-properties-7.12.1" = {
+    "@babel/plugin-transform-computed-properties-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-computed-properties";
       packageName = "@babel/plugin-transform-computed-properties";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz";
-        sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz";
+        sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==";
       };
     };
-    "@babel/plugin-transform-destructuring-7.12.1" = {
+    "@babel/plugin-transform-destructuring-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-destructuring";
       packageName = "@babel/plugin-transform-destructuring";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz";
-        sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz";
+        sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==";
       };
     };
-    "@babel/plugin-transform-dotall-regex-7.12.1" = {
+    "@babel/plugin-transform-dotall-regex-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-dotall-regex";
       packageName = "@babel/plugin-transform-dotall-regex";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz";
-        sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz";
+        sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==";
       };
     };
-    "@babel/plugin-transform-duplicate-keys-7.12.1" = {
+    "@babel/plugin-transform-duplicate-keys-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-duplicate-keys";
       packageName = "@babel/plugin-transform-duplicate-keys";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz";
-        sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz";
+        sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==";
       };
     };
-    "@babel/plugin-transform-exponentiation-operator-7.12.1" = {
+    "@babel/plugin-transform-exponentiation-operator-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-exponentiation-operator";
       packageName = "@babel/plugin-transform-exponentiation-operator";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz";
-        sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz";
+        sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==";
       };
     };
-    "@babel/plugin-transform-for-of-7.12.1" = {
+    "@babel/plugin-transform-for-of-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-for-of";
       packageName = "@babel/plugin-transform-for-of";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz";
-        sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz";
+        sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==";
       };
     };
-    "@babel/plugin-transform-function-name-7.12.1" = {
+    "@babel/plugin-transform-function-name-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-function-name";
       packageName = "@babel/plugin-transform-function-name";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz";
-        sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz";
+        sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==";
       };
     };
-    "@babel/plugin-transform-literals-7.12.1" = {
+    "@babel/plugin-transform-literals-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-literals";
       packageName = "@babel/plugin-transform-literals";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz";
-        sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz";
+        sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==";
       };
     };
-    "@babel/plugin-transform-member-expression-literals-7.12.1" = {
+    "@babel/plugin-transform-member-expression-literals-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-member-expression-literals";
       packageName = "@babel/plugin-transform-member-expression-literals";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz";
-        sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz";
+        sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==";
       };
     };
-    "@babel/plugin-transform-modules-amd-7.12.1" = {
+    "@babel/plugin-transform-modules-amd-7.10.5" = {
       name = "_at_babel_slash_plugin-transform-modules-amd";
       packageName = "@babel/plugin-transform-modules-amd";
-      version = "7.12.1";
+      version = "7.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz";
-        sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz";
+        sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.12.1" = {
+    "@babel/plugin-transform-modules-commonjs-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz";
-        sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz";
+        sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==";
       };
     };
-    "@babel/plugin-transform-modules-systemjs-7.12.1" = {
+    "@babel/plugin-transform-modules-systemjs-7.10.5" = {
       name = "_at_babel_slash_plugin-transform-modules-systemjs";
       packageName = "@babel/plugin-transform-modules-systemjs";
-      version = "7.12.1";
+      version = "7.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz";
-        sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz";
+        sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==";
       };
     };
-    "@babel/plugin-transform-modules-umd-7.12.1" = {
+    "@babel/plugin-transform-modules-umd-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-modules-umd";
       packageName = "@babel/plugin-transform-modules-umd";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz";
-        sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz";
+        sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==";
       };
     };
-    "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = {
+    "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex";
       packageName = "@babel/plugin-transform-named-capturing-groups-regex";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz";
-        sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz";
+        sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==";
       };
     };
-    "@babel/plugin-transform-new-target-7.12.1" = {
+    "@babel/plugin-transform-new-target-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-new-target";
       packageName = "@babel/plugin-transform-new-target";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz";
-        sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz";
+        sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==";
       };
     };
-    "@babel/plugin-transform-object-super-7.12.1" = {
+    "@babel/plugin-transform-object-super-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-object-super";
       packageName = "@babel/plugin-transform-object-super";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz";
-        sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz";
+        sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==";
       };
     };
-    "@babel/plugin-transform-parameters-7.12.1" = {
+    "@babel/plugin-transform-parameters-7.10.5" = {
       name = "_at_babel_slash_plugin-transform-parameters";
       packageName = "@babel/plugin-transform-parameters";
-      version = "7.12.1";
+      version = "7.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz";
-        sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz";
+        sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==";
       };
     };
-    "@babel/plugin-transform-property-literals-7.12.1" = {
+    "@babel/plugin-transform-property-literals-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-property-literals";
       packageName = "@babel/plugin-transform-property-literals";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz";
-        sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz";
+        sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==";
       };
     };
-    "@babel/plugin-transform-regenerator-7.12.1" = {
+    "@babel/plugin-transform-regenerator-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-regenerator";
       packageName = "@babel/plugin-transform-regenerator";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz";
-        sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz";
+        sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==";
       };
     };
-    "@babel/plugin-transform-reserved-words-7.12.1" = {
+    "@babel/plugin-transform-reserved-words-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-reserved-words";
       packageName = "@babel/plugin-transform-reserved-words";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz";
-        sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz";
+        sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==";
       };
     };
-    "@babel/plugin-transform-shorthand-properties-7.12.1" = {
+    "@babel/plugin-transform-shorthand-properties-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-shorthand-properties";
       packageName = "@babel/plugin-transform-shorthand-properties";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz";
-        sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz";
+        sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==";
       };
     };
-    "@babel/plugin-transform-spread-7.12.1" = {
+    "@babel/plugin-transform-spread-7.11.0" = {
       name = "_at_babel_slash_plugin-transform-spread";
       packageName = "@babel/plugin-transform-spread";
-      version = "7.12.1";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz";
-        sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz";
+        sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==";
       };
     };
-    "@babel/plugin-transform-sticky-regex-7.12.7" = {
+    "@babel/plugin-transform-sticky-regex-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-sticky-regex";
       packageName = "@babel/plugin-transform-sticky-regex";
-      version = "7.12.7";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz";
-        sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz";
+        sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==";
       };
     };
-    "@babel/plugin-transform-template-literals-7.12.1" = {
+    "@babel/plugin-transform-template-literals-7.10.5" = {
       name = "_at_babel_slash_plugin-transform-template-literals";
       packageName = "@babel/plugin-transform-template-literals";
-      version = "7.12.1";
+      version = "7.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz";
-        sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz";
+        sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==";
       };
     };
-    "@babel/plugin-transform-typeof-symbol-7.12.10" = {
+    "@babel/plugin-transform-typeof-symbol-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-typeof-symbol";
       packageName = "@babel/plugin-transform-typeof-symbol";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz";
-        sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz";
+        sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==";
       };
     };
-    "@babel/plugin-transform-unicode-escapes-7.12.1" = {
+    "@babel/plugin-transform-unicode-escapes-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-unicode-escapes";
       packageName = "@babel/plugin-transform-unicode-escapes";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz";
-        sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz";
+        sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==";
       };
     };
-    "@babel/plugin-transform-unicode-regex-7.12.1" = {
+    "@babel/plugin-transform-unicode-regex-7.10.4" = {
       name = "_at_babel_slash_plugin-transform-unicode-regex";
       packageName = "@babel/plugin-transform-unicode-regex";
-      version = "7.12.1";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz";
-        sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz";
+        sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==";
       };
     };
     "@babel/preset-env-7.11.5" = {
@@ -823,76 +832,76 @@ let
         sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w==";
       };
     };
-    "@babel/runtime-7.12.5" = {
+    "@babel/runtime-7.11.2" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.12.5";
+      version = "7.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
-        sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz";
+        sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==";
       };
     };
-    "@babel/template-7.12.7" = {
+    "@babel/template-7.10.4" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.12.7";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
-        sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz";
+        sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
       };
     };
-    "@babel/traverse-7.12.12" = {
+    "@babel/traverse-7.11.5" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.12";
+      version = "7.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
-        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz";
+        sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==";
       };
     };
-    "@babel/types-7.12.12" = {
+    "@babel/types-7.11.5" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.12";
+      version = "7.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
-        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz";
+        sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==";
       };
     };
-    "@commitlint/execute-rule-12.0.0" = {
+    "@commitlint/execute-rule-11.0.0" = {
       name = "_at_commitlint_slash_execute-rule";
       packageName = "@commitlint/execute-rule";
-      version = "12.0.0";
+      version = "11.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-12.0.0.tgz";
-        sha512 = "X9vZDKdyOz8MNDZqJN39K9UbjQmMsyQ74d1lUaw0QuCE4jOesmynYkLc4Y4MWKqq9ElWdjswZyLMyOgm3kAMrg==";
+        url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-11.0.0.tgz";
+        sha512 = "g01p1g4BmYlZ2+tdotCavrMunnPFPhTzG1ZiLKTCYrooHRbmvqo42ZZn4QMStUEIcn+jfLb6BRZX3JzIwA1ezQ==";
       };
     };
-    "@commitlint/load-12.0.0" = {
+    "@commitlint/load-11.0.0" = {
       name = "_at_commitlint_slash_load";
       packageName = "@commitlint/load";
-      version = "12.0.0";
+      version = "11.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/load/-/load-12.0.0.tgz";
-        sha512 = "B7rwRGWE3j+4dWsLD4s82fIbIJP1xGOJYfAvKDWOa/FnAb8s8ZQOK8HHuDC8BD/MU3Ierl8KJMfzGiO63d1rlA==";
+        url = "https://registry.npmjs.org/@commitlint/load/-/load-11.0.0.tgz";
+        sha512 = "t5ZBrtgvgCwPfxmG811FCp39/o3SJ7L+SNsxFL92OR4WQxPcu6c8taD0CG2lzOHGuRyuMxZ7ps3EbngT2WpiCg==";
       };
     };
-    "@commitlint/resolve-extends-12.0.0" = {
+    "@commitlint/resolve-extends-11.0.0" = {
       name = "_at_commitlint_slash_resolve-extends";
       packageName = "@commitlint/resolve-extends";
-      version = "12.0.0";
+      version = "11.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-12.0.0.tgz";
-        sha512 = "5i0ZieVFzXuRqyYxnoEJ7InYyXQC/K98nF75Ro6wVQqpmzi01/KHYwo8uCcy1Q+rPB48FSmCB84br0t5Ulr/KA==";
+        url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-11.0.0.tgz";
+        sha512 = "WinU6Uv6L7HDGLqn/To13KM1CWvZ09VHZqryqxXa1OY+EvJkfU734CwnOEeNlSCK7FVLrB4kmodLJtL1dkEpXw==";
       };
     };
-    "@commitlint/types-12.0.0" = {
+    "@commitlint/types-11.0.0" = {
       name = "_at_commitlint_slash_types";
       packageName = "@commitlint/types";
-      version = "12.0.0";
+      version = "11.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/types/-/types-12.0.0.tgz";
-        sha512 = "ADW/GEwDdgf7ppNq+S2T8J6XgATi2yndXddu+ZV8wlHFpL1DhjPbuPA9RYLnJcp44xQSe/cEV7a7Z43Ryy1S9Q==";
+        url = "https://registry.npmjs.org/@commitlint/types/-/types-11.0.0.tgz";
+        sha512 = "VoNqai1vR5anRF5Tuh/+SWDFk7xi7oMwHrHrbm1BprYXjB2RJsWLhUrStMssDxEl5lW/z3EUdg8RvH/IUBccSQ==";
       };
     };
     "@istanbuljs/load-nyc-config-1.1.0" = {
@@ -922,58 +931,49 @@ let
         sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==";
       };
     };
-    "@nodelib/fs.scandir-2.1.4" = {
+    "@nodelib/fs.scandir-2.1.3" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.4";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
-        sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
+        sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
       };
     };
-    "@nodelib/fs.stat-2.0.4" = {
+    "@nodelib/fs.stat-2.0.3" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.4";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
-        sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
+        sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==";
       };
     };
-    "@nodelib/fs.walk-1.2.6" = {
+    "@nodelib/fs.walk-1.2.4" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.6";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
-        sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
+        sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
       };
     };
-    "@octokit/auth-token-2.4.4" = {
+    "@octokit/auth-token-2.4.2" = {
       name = "_at_octokit_slash_auth-token";
       packageName = "@octokit/auth-token";
-      version = "2.4.4";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz";
-        sha512 = "LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==";
+        url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz";
+        sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ==";
       };
     };
-    "@octokit/endpoint-6.0.10" = {
+    "@octokit/endpoint-6.0.6" = {
       name = "_at_octokit_slash_endpoint";
       packageName = "@octokit/endpoint";
-      version = "6.0.10";
+      version = "6.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz";
-        sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==";
-      };
-    };
-    "@octokit/openapi-types-3.1.1" = {
-      name = "_at_octokit_slash_openapi-types";
-      packageName = "@octokit/openapi-types";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-3.1.1.tgz";
-        sha512 = "4BsrIf9/WLRbl0IVPEPLDTROduvYR57xCldy47YFQp/TZ9DbREQZbeCrJIe7a+Qjb3qk0KwZmxNYYW8mNQY/HQ==";
+        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.6.tgz";
+        sha512 = "7Cc8olaCoL/mtquB7j/HTbPM+sY6Ebr4k2X2y4JoXpVKQ7r5xB4iGQE0IoO58wIPsUk4AzoT65AMEpymSbWTgQ==";
       };
     };
     "@octokit/plugin-paginate-rest-1.1.2" = {
@@ -985,13 +985,13 @@ let
         sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==";
       };
     };
-    "@octokit/plugin-request-log-1.0.2" = {
+    "@octokit/plugin-request-log-1.0.0" = {
       name = "_at_octokit_slash_plugin-request-log";
       packageName = "@octokit/plugin-request-log";
-      version = "1.0.2";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz";
-        sha512 = "oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==";
+        url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz";
+        sha512 = "ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==";
       };
     };
     "@octokit/plugin-rest-endpoint-methods-2.4.0" = {
@@ -1003,13 +1003,13 @@ let
         sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==";
       };
     };
-    "@octokit/request-5.4.12" = {
+    "@octokit/request-5.4.8" = {
       name = "_at_octokit_slash_request";
       packageName = "@octokit/request";
-      version = "5.4.12";
+      version = "5.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.12.tgz";
-        sha512 = "MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg==";
+        url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.8.tgz";
+        sha512 = "mWbxjsARJzAq5xp+ZrQfotc+MHFz3/Am2qATJwflv4PZ1TjhgIJnr60PCVdZT9Z/tl+uPXooaVgeviy1KkDlLQ==";
       };
     };
     "@octokit/request-error-1.2.1" = {
@@ -1021,13 +1021,13 @@ let
         sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==";
       };
     };
-    "@octokit/request-error-2.0.4" = {
+    "@octokit/request-error-2.0.2" = {
       name = "_at_octokit_slash_request-error";
       packageName = "@octokit/request-error";
-      version = "2.0.4";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz";
-        sha512 = "LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA==";
+        url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz";
+        sha512 = "2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==";
       };
     };
     "@octokit/rest-16.43.2" = {
@@ -1048,13 +1048,13 @@ let
         sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==";
       };
     };
-    "@octokit/types-6.4.2" = {
+    "@octokit/types-5.4.1" = {
       name = "_at_octokit_slash_types";
       packageName = "@octokit/types";
-      version = "6.4.2";
+      version = "5.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/types/-/types-6.4.2.tgz";
-        sha512 = "c3OswFOjp0MydgIxWcu/wIXK9sfoBL2gLjqMZA+KKdvvcwh6g2z0eMu219rFrZzi0KQunO9l/a9yHb9T/AlU1A==";
+        url = "https://registry.npmjs.org/@octokit/types/-/types-5.4.1.tgz";
+        sha512 = "OlMlSySBJoJ6uozkr/i03nO5dlYQyE05vmQNZhAh9MyO4DPBP88QlwsDVLmVjIMFssvIZB6WO0ctIGMRG+xsJQ==";
       };
     };
     "@semantic-release/commit-analyzer-6.3.3" = {
@@ -1102,13 +1102,13 @@ let
         sha512 = "LGjgPBGjjmjap/76O0Md3wc04Y7IlLnzZceLsAkcYRwGQdRPTTFUJKqDQTuieWTs7zfHzQoZqsqPfFxEN+g2+Q==";
       };
     };
-    "@sinonjs/commons-1.8.2" = {
+    "@sinonjs/commons-1.8.1" = {
       name = "_at_sinonjs_slash_commons";
       packageName = "@sinonjs/commons";
-      version = "1.8.2";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz";
-        sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==";
+        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz";
+        sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==";
       };
     };
     "@sinonjs/formatio-3.2.2" = {
@@ -1147,6 +1147,15 @@ let
         sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==";
       };
     };
+    "@types/color-name-1.1.1" = {
+      name = "_at_types_slash_color-name";
+      packageName = "@types/color-name";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz";
+        sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==";
+      };
+    };
     "@types/glob-7.1.3" = {
       name = "_at_types_slash_glob";
       packageName = "@types/glob";
@@ -1165,22 +1174,22 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/minimist-1.2.1" = {
+    "@types/minimist-1.2.0" = {
       name = "_at_types_slash_minimist";
       packageName = "@types/minimist";
-      version = "1.2.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz";
-        sha512 = "fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==";
+        url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6";
       };
     };
-    "@types/node-14.14.22" = {
+    "@types/node-14.10.0" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.22";
+      version = "14.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
-        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.10.0.tgz";
+        sha512 = "SOIyrdADB4cq6eY1F+9iU48iIomFAPltu11LCvA9PKcyEwHadjCFzNVPotAR+oEJA0bCP4Xvvgy+vwu1ZjVh8g==";
       };
     };
     "@types/normalize-package-data-2.4.0" = {
@@ -1318,13 +1327,13 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
-    "ansi-styles-4.3.0" = {
+    "ansi-styles-4.2.1" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
-      version = "4.3.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
-        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz";
+        sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==";
       };
     };
     "ansicolors-0.3.2" = {
@@ -1678,13 +1687,13 @@ let
         sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
       };
     };
-    "browserslist-4.16.1" = {
+    "browserslist-4.14.2" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.16.1";
+      version = "4.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz";
-        sha512 = "UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz";
+        sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
       };
     };
     "btoa-lite-1.0.0" = {
@@ -1732,13 +1741,31 @@ let
         sha512 = "kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==";
       };
     };
-    "call-bind-1.0.2" = {
-      name = "call-bind";
-      packageName = "call-bind";
-      version = "1.0.2";
+    "caller-callsite-2.0.0" = {
+      name = "caller-callsite";
+      packageName = "caller-callsite";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
-        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
+        url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz";
+        sha1 = "847e0fce0a223750a9a027c54b33731ad3154134";
+      };
+    };
+    "caller-path-2.0.0" = {
+      name = "caller-path";
+      packageName = "caller-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz";
+        sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4";
+      };
+    };
+    "callsites-2.0.0" = {
+      name = "callsites";
+      packageName = "callsites";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz";
+        sha1 = "06eb84f00eea413da86affefacbffb36093b3c50";
       };
     };
     "callsites-3.1.0" = {
@@ -1777,13 +1804,13 @@ let
         sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==";
       };
     };
-    "caniuse-lite-1.0.30001179" = {
+    "caniuse-lite-1.0.30001125" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001179";
+      version = "1.0.30001125";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz";
-        sha512 = "blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001125.tgz";
+        sha512 = "9f+r7BW8Qli917mU3j0fUaTweT3f3vnX/Lcs+1C73V+RADmFme+Ih0Br8vONQi3X0lseOe6ZHfsZLCA8MSjxUA==";
       };
     };
     "capture-stack-trace-1.0.1" = {
@@ -1813,13 +1840,13 @@ let
         sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
       };
     };
-    "chai-4.1.2" = {
+    "chai-4.2.0" = {
       name = "chai";
       packageName = "chai";
-      version = "4.1.2";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz";
-        sha1 = "0f64584ba642f0f2ace2806279f4f06ca23ad73c";
+        url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz";
+        sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==";
       };
     };
     "chalk-2.4.2" = {
@@ -1921,13 +1948,13 @@ let
         sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
       };
     };
-    "cli-table-0.3.4" = {
+    "cli-table-0.3.1" = {
       name = "cli-table";
       packageName = "cli-table";
-      version = "0.3.4";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.4.tgz";
-        sha512 = "1vinpnX/ZERcmE443i3SZTmU5DF0rPO9DrL4I2iVAllhxzCM9SzPlHnz19fsZB78htkKZvYBvj6SZ6vXnaxmTA==";
+        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
+        sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
       };
     };
     "cli-width-2.2.1" = {
@@ -2020,15 +2047,6 @@ let
         sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
       };
     };
-    "colorette-1.2.1" = {
-      name = "colorette";
-      packageName = "colorette";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz";
-        sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==";
-      };
-    };
     "colors-0.6.2" = {
       name = "colors";
       packageName = "colors";
@@ -2038,6 +2056,15 @@ let
         sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
       };
     };
+    "colors-1.0.3" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
+      };
+    };
     "combined-stream-0.0.7" = {
       name = "combined-stream";
       packageName = "combined-stream";
@@ -2074,13 +2101,13 @@ let
         sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==";
       };
     };
-    "commitizen-4.2.3" = {
+    "commitizen-4.2.1" = {
       name = "commitizen";
       packageName = "commitizen";
-      version = "4.2.3";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.3.tgz";
-        sha512 = "pYlYEng7XMV2TW4xtjDKBGqeJ0Teq2zyRSx2S3Ml1XAplHSlJZK8vm1KdGclpMEZuGafbS5TeHXIVnHk8RWIzQ==";
+        url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.1.tgz";
+        sha512 = "nZsp8IThkDu7C+93BFD/mLShb9Gd6Wsaf90tpKE3x/6u5y/Q52kzanIJpGr0qvIsJ5bCMpgKtr3Lbu3miEJfaA==";
       };
     };
     "commondir-1.0.1" = {
@@ -2128,22 +2155,22 @@ let
         sha512 = "nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA==";
       };
     };
-    "conventional-changelog-angular-5.0.12" = {
+    "conventional-changelog-angular-5.0.11" = {
       name = "conventional-changelog-angular";
       packageName = "conventional-changelog-angular";
-      version = "5.0.12";
+      version = "5.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz";
-        sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==";
+        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz";
+        sha512 = "nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw==";
       };
     };
-    "conventional-changelog-writer-4.1.0" = {
+    "conventional-changelog-writer-4.0.17" = {
       name = "conventional-changelog-writer";
       packageName = "conventional-changelog-writer";
-      version = "4.1.0";
+      version = "4.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz";
-        sha512 = "WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw==";
+        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz";
+        sha512 = "IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw==";
       };
     };
     "conventional-commit-types-2.3.0" = {
@@ -2164,22 +2191,22 @@ let
         sha512 = "SmmCYnOniSsAa9GqWOeLqc179lfr5TRu5b4QFDkbsrJ5TZjPJx85wtOr3zn+1dbeNiXDKGPbZ72IKbPhLXh/Lg==";
       };
     };
-    "conventional-commits-filter-2.0.7" = {
+    "conventional-commits-filter-2.0.6" = {
       name = "conventional-commits-filter";
       packageName = "conventional-commits-filter";
-      version = "2.0.7";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz";
-        sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==";
+        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz";
+        sha512 = "4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==";
       };
     };
-    "conventional-commits-parser-3.2.0" = {
+    "conventional-commits-parser-3.1.0" = {
       name = "conventional-commits-parser";
       packageName = "conventional-commits-parser";
-      version = "3.2.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz";
-        sha512 = "XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ==";
+        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz";
+        sha512 = "RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA==";
       };
     };
     "convert-source-map-1.7.0" = {
@@ -2200,13 +2227,13 @@ let
         sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
       };
     };
-    "core-js-compat-3.8.3" = {
+    "core-js-compat-3.6.5" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.8.3";
+      version = "3.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz";
-        sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz";
+        sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2218,13 +2245,13 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "cosmiconfig-6.0.0" = {
+    "cosmiconfig-5.2.1" = {
       name = "cosmiconfig";
       packageName = "cosmiconfig";
-      version = "6.0.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz";
-        sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==";
+        url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz";
+        sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==";
       };
     };
     "cosmiconfig-7.0.0" = {
@@ -2362,22 +2389,13 @@ let
         sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
       };
     };
-    "debug-3.2.7" = {
+    "debug-4.2.0" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.7";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
-      };
-    };
-    "debug-4.3.2" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz";
+        sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
       };
     };
     "decamelize-1.2.0" = {
@@ -2596,13 +2614,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "electron-to-chromium-1.3.642" = {
+    "electron-to-chromium-1.3.565" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.642";
+      version = "1.3.565";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz";
-        sha512 = "cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.565.tgz";
+        sha512 = "me5dGlHFd8Q7mKhqbWRLIYnKjw4i0fO6hmW0JBxa7tM87fBfNEjWokRnDF7V+Qme/9IYpwhfMn+soWs40tXWqg==";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -2650,13 +2668,13 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "es-abstract-1.18.0-next.2" = {
+    "es-abstract-1.17.6" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.18.0-next.2";
+      version = "1.17.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
-        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz";
+        sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -2677,13 +2695,13 @@ let
         sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==";
       };
     };
-    "escalade-3.1.1" = {
+    "escalade-3.0.2" = {
       name = "escalade";
       packageName = "escalade";
-      version = "3.1.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz";
-        sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==";
+        url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz";
+        sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -2794,22 +2812,22 @@ let
         sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
       };
     };
-    "fast-glob-3.2.5" = {
+    "fast-glob-3.2.4" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.5";
+      version = "3.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
-        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz";
+        sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==";
       };
     };
-    "fastq-1.10.0" = {
+    "fastq-1.8.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.10.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
-        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz";
+        sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==";
       };
     };
     "figures-2.0.0" = {
@@ -2956,13 +2974,13 @@ let
         sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==";
       };
     };
-    "flat-4.1.1" = {
+    "flat-4.1.0" = {
       name = "flat";
       packageName = "flat";
-      version = "4.1.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz";
-        sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==";
+        url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz";
+        sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==";
       };
     };
     "follow-redirects-1.5.10" = {
@@ -3028,13 +3046,13 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
-    "fromentries-1.3.2" = {
+    "fromentries-1.2.1" = {
       name = "fromentries";
       packageName = "fromentries";
-      version = "1.3.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz";
-        sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==";
+        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.2.1.tgz";
+        sha512 = "Xu2Qh8yqYuDhQGOhD5iJGninErSfI9A3FrriD3tjUgV5VbJFeH8vfgZ9HnC6jWN80QDVNQK5vmxRAmEAp7Mevw==";
       };
     };
     "fs-extra-8.1.0" = {
@@ -3082,13 +3100,13 @@ let
         sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
-    "gensync-1.0.0-beta.2" = {
+    "gensync-1.0.0-beta.1" = {
       name = "gensync";
       packageName = "gensync";
-      version = "1.0.0-beta.2";
+      version = "1.0.0-beta.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
-        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
+        sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==";
       };
     };
     "get-caller-file-1.0.3" = {
@@ -3118,15 +3136,6 @@ let
         sha1 = "ead774abee72e20409433a066366023dd6887a41";
       };
     };
-    "get-intrinsic-1.0.2" = {
-      name = "get-intrinsic";
-      packageName = "get-intrinsic";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
-        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
-      };
-    };
     "get-package-type-0.1.0" = {
       name = "get-package-type";
       packageName = "get-package-type";
@@ -3415,13 +3424,13 @@ let
         sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
       };
     };
-    "hasha-5.2.2" = {
+    "hasha-5.2.0" = {
       name = "hasha";
       packageName = "hasha";
-      version = "5.2.2";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz";
-        sha512 = "Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==";
+        url = "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz";
+        sha512 = "2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==";
       };
     };
     "hawk-1.1.1" = {
@@ -3478,15 +3487,6 @@ let
         sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
       };
     };
-    "hosted-git-info-3.0.7" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "3.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz";
-        sha512 = "fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==";
-      };
-    };
     "html-escaper-2.0.2" = {
       name = "html-escaper";
       packageName = "html-escaper";
@@ -3559,13 +3559,22 @@ let
         sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
       };
     };
-    "import-fresh-3.3.0" = {
+    "import-fresh-2.0.0" = {
       name = "import-fresh";
       packageName = "import-fresh";
-      version = "3.3.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz";
-        sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz";
+        sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
+      };
+    };
+    "import-fresh-3.2.1" = {
+      name = "import-fresh";
+      packageName = "import-fresh";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz";
+        sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==";
       };
     };
     "import-from-3.0.0" = {
@@ -3595,13 +3604,13 @@ let
         sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     };
-    "in-publish-2.0.0" = {
+    "in-publish-2.0.1" = {
       name = "in-publish";
       packageName = "in-publish";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz";
-        sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51";
+        url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz";
+        sha512 = "oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==";
       };
     };
     "indent-string-4.0.0" = {
@@ -3631,13 +3640,13 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.8" = {
+    "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.8";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
     "inquirer-6.5.2" = {
@@ -3721,22 +3730,22 @@ let
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-buffer-2.0.5" = {
+    "is-buffer-2.0.4" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "2.0.5";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz";
-        sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
+        sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
       };
     };
-    "is-callable-1.2.2" = {
+    "is-callable-1.2.1" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.2.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
-        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz";
+        sha512 = "wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==";
       };
     };
     "is-ci-1.2.1" = {
@@ -3748,15 +3757,6 @@ let
         sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==";
       };
     };
-    "is-core-module-2.2.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
-        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
-      };
-    };
     "is-data-descriptor-0.1.4" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -3802,6 +3802,15 @@ let
         sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
       };
     };
+    "is-directory-0.3.1" = {
+      name = "is-directory";
+      packageName = "is-directory";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz";
+        sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1";
+      };
+    };
     "is-extendable-0.1.1" = {
       name = "is-extendable";
       packageName = "is-extendable";
@@ -3883,15 +3892,6 @@ let
         sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
       };
     };
-    "is-negative-zero-2.0.1" = {
-      name = "is-negative-zero";
-      packageName = "is-negative-zero";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
-        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
-      };
-    };
     "is-npm-1.0.0" = {
       name = "is-npm";
       packageName = "is-npm";
@@ -3937,13 +3937,13 @@ let
         sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==";
       };
     };
-    "is-object-1.0.2" = {
+    "is-object-1.0.1" = {
       name = "is-object";
       packageName = "is-object";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz";
-        sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==";
+        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz";
+        sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
       };
     };
     "is-path-inside-1.0.1" = {
@@ -4315,13 +4315,13 @@ let
         sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
       };
     };
-    "just-extend-4.1.1" = {
+    "just-extend-4.1.0" = {
       name = "just-extend";
       packageName = "just-extend";
-      version = "4.1.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz";
-        sha512 = "aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==";
+        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz";
+        sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==";
       };
     };
     "kind-of-3.2.2" = {
@@ -4657,15 +4657,6 @@ let
         sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
       };
     };
-    "lru-cache-6.0.0" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
-        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
-      };
-    };
     "macos-release-2.4.1" = {
       name = "macos-release";
       packageName = "macos-release";
@@ -4756,13 +4747,13 @@ let
         sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
       };
     };
-    "marked-0.7.0" = {
+    "marked-0.6.3" = {
       name = "marked";
       packageName = "marked";
-      version = "0.7.0";
+      version = "0.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz";
-        sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==";
+        url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz";
+        sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==";
       };
     };
     "marked-terminal-3.3.0" = {
@@ -4792,13 +4783,13 @@ let
         sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
       };
     };
-    "meow-8.1.2" = {
+    "meow-7.1.1" = {
       name = "meow";
       packageName = "meow";
-      version = "8.1.2";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz";
-        sha512 = "r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==";
+        url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz";
+        sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==";
       };
     };
     "merge-1.2.1" = {
@@ -4864,13 +4855,13 @@ let
         sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
       };
     };
-    "mime-2.5.0" = {
+    "mime-2.4.6" = {
       name = "mime";
       packageName = "mime";
-      version = "2.5.0";
+      version = "2.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
-        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
+        url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz";
+        sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==";
       };
     };
     "mime-types-1.0.2" = {
@@ -4972,13 +4963,13 @@ let
         sha512 = "qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ==";
       };
     };
-    "mocha-junit-reporter-1.18.0" = {
+    "mocha-junit-reporter-1.23.3" = {
       name = "mocha-junit-reporter";
       packageName = "mocha-junit-reporter";
-      version = "1.18.0";
+      version = "1.23.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.18.0.tgz";
-        sha512 = "y3XuqKa2+HRYtg0wYyhW/XsLm2Ps+pqf9HaTAt7+MVUAKFJaNAHOrNseTZo9KCxjfIbxUWwckP5qCDDPUmjSWA==";
+        url = "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz";
+        sha512 = "ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==";
       };
     };
     "mocha-multi-reporters-1.1.7" = {
@@ -5035,15 +5026,6 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
-    "ms-2.1.3" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
-      };
-    };
     "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -5053,13 +5035,13 @@ let
         sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
-    "nan-2.14.2" = {
+    "nan-2.14.1" = {
       name = "nan";
       packageName = "nan";
-      version = "2.14.2";
+      version = "2.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz";
-        sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz";
+        sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -5152,13 +5134,13 @@ let
         sha512 = "RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==";
       };
     };
-    "node-releases-1.1.70" = {
+    "node-releases-1.1.61" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.70";
+      version = "1.1.61";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz";
-        sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz";
+        sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==";
       };
     };
     "node-uuid-1.4.8" = {
@@ -5197,15 +5179,6 @@ let
         sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
       };
     };
-    "normalize-package-data-3.0.0" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz";
-        sha512 = "6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==";
-      };
-    };
     "normalize-path-2.1.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
@@ -5233,13 +5206,13 @@ let
         sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==";
       };
     };
-    "npm-6.14.11" = {
+    "npm-6.14.8" = {
       name = "npm";
       packageName = "npm";
-      version = "6.14.11";
+      version = "6.14.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz";
-        sha512 = "1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ==";
+        url = "https://registry.npmjs.org/npm/-/npm-6.14.8.tgz";
+        sha512 = "HBZVBMYs5blsj94GTeQZel7s9odVuuSUHy1+AlZh7rPVux1os2ashvEGLy/STNK7vUjbrCg5Kq9/GXisJgdf6A==";
       };
     };
     "npm-run-path-2.0.2" = {
@@ -5296,13 +5269,13 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-inspect-1.9.0" = {
+    "object-inspect-1.8.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.9.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
-        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
+        sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
       };
     };
     "object-keys-1.1.1" = {
@@ -5332,22 +5305,13 @@ let
         sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.assign-4.1.2" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
-        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
-      };
-    };
-    "object.getownpropertydescriptors-2.1.1" = {
+    "object.getownpropertydescriptors-2.1.0" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.1.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz";
-        sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
       };
     };
     "object.pick-1.3.0" = {
@@ -5629,13 +5593,13 @@ let
         sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
       };
     };
-    "parse-json-5.2.0" = {
+    "parse-json-5.1.0" = {
       name = "parse-json";
       packageName = "parse-json";
-      version = "5.2.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz";
-        sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==";
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz";
+        sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -5863,13 +5827,13 @@ let
         sha512 = "1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==";
       };
     };
-    "proxyquire-2.1.0" = {
+    "proxyquire-2.1.3" = {
       name = "proxyquire";
       packageName = "proxyquire";
-      version = "2.1.0";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.0.tgz";
-        sha512 = "kptdFArCfGRtQFv3Qwjr10lwbEV0TBJYvfqzhwucyfEXqVgmnAkyEw/S3FYzR5HI9i5QOq4rcqQjZ6AlknlCDQ==";
+        url = "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz";
+        sha512 = "BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==";
       };
     };
     "pseudomap-1.0.2" = {
@@ -5980,6 +5944,15 @@ let
         sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
       };
     };
+    "read-pkg-up-6.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz";
+        sha512 = "odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw==";
+      };
+    };
     "read-pkg-up-7.0.1" = {
       name = "read-pkg-up";
       packageName = "read-pkg-up";
@@ -6007,15 +5980,6 @@ let
         sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
-    "readable-stream-3.6.0" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
-        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
-      };
-    };
     "readdirp-2.2.1" = {
       name = "readdirp";
       packageName = "readdirp";
@@ -6043,13 +6007,13 @@ let
         sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b";
       };
     };
-    "regenerate-1.4.2" = {
+    "regenerate-1.4.1" = {
       name = "regenerate";
       packageName = "regenerate";
-      version = "1.4.2";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz";
-        sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
+        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz";
+        sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==";
       };
     };
     "regenerate-unicode-properties-8.2.0" = {
@@ -6088,13 +6052,13 @@ let
         sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
-    "regexpu-core-4.7.1" = {
+    "regexpu-core-4.7.0" = {
       name = "regexpu-core";
       packageName = "regexpu-core";
-      version = "4.7.1";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz";
-        sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==";
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz";
+        sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==";
       };
     };
     "registry-auth-token-3.4.0" = {
@@ -6106,13 +6070,13 @@ let
         sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
       };
     };
-    "registry-auth-token-4.2.1" = {
+    "registry-auth-token-4.2.0" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
-      version = "4.2.1";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz";
-        sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==";
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz";
+        sha512 = "P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==";
       };
     };
     "registry-url-3.1.0" = {
@@ -6133,13 +6097,13 @@ let
         sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
       };
     };
-    "regjsparser-0.6.6" = {
+    "regjsparser-0.6.4" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.6.6";
+      version = "0.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz";
-        sha512 = "jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
+        sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
       };
     };
     "release-zalgo-1.0.0" = {
@@ -6214,22 +6178,13 @@ let
         sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
       };
     };
-    "resolve-1.19.0" = {
+    "resolve-1.17.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.19.0";
+      version = "1.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
-        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
-      };
-    };
-    "resolve-1.8.1" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz";
-        sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz";
+        sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
       };
     };
     "resolve-dir-1.0.1" = {
@@ -6241,6 +6196,15 @@ let
         sha1 = "79a40644c362be82f26effe739c9bb5382046f43";
       };
     };
+    "resolve-from-3.0.0" = {
+      name = "resolve-from";
+      packageName = "resolve-from";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz";
+        sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
+      };
+    };
     "resolve-from-4.0.0" = {
       name = "resolve-from";
       packageName = "resolve-from";
@@ -6349,13 +6313,13 @@ let
         sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==";
       };
     };
-    "run-parallel-1.1.10" = {
+    "run-parallel-1.1.9" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.10";
+      version = "1.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz";
-        sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
+        sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
       };
     };
     "rxjs-6.6.3" = {
@@ -6394,13 +6358,13 @@ let
         sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
-    "semantic-release-15.14.0" = {
+    "semantic-release-15.13.18" = {
       name = "semantic-release";
       packageName = "semantic-release";
-      version = "15.14.0";
+      version = "15.13.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semantic-release/-/semantic-release-15.14.0.tgz";
-        sha512 = "Cn43W35AOLY0RMcDbtwhJODJmWg6YCs1+R5jRQsTmmkEGzkV4B2F/QXkjVZpl4UbH91r93GGH0xhoq9kh7I5PA==";
+        url = "https://registry.npmjs.org/semantic-release/-/semantic-release-15.13.18.tgz";
+        sha512 = "JtfdrhF1zRm91nJH/Rg3taftbWGwktJqqrJJdbmZGKYx63cfC4PoaS0jxRifGJUdmmgW/Kxz8f5bhtB+p1bu8A==";
       };
     };
     "semver-5.7.1" = {
@@ -6430,15 +6394,6 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
-    "semver-7.3.4" = {
-      name = "semver";
-      packageName = "semver";
-      version = "7.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
-        sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
-      };
-    };
     "semver-diff-2.1.0" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -6529,13 +6484,13 @@ let
         sha512 = "iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w==";
       };
     };
-    "sinon-6.3.4" = {
+    "sinon-6.3.5" = {
       name = "sinon";
       packageName = "sinon";
-      version = "6.3.4";
+      version = "6.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sinon/-/sinon-6.3.4.tgz";
-        sha512 = "NIaR56Z1mefuRBXYrf4otqBxkWiKveX+fvqs3HzFq2b07HcgpkMgIwmQM/owNjNFAHkx0kJXW+Q0mDthiuslXw==";
+        url = "https://registry.npmjs.org/sinon/-/sinon-6.3.5.tgz";
+        sha512 = "xgoZ2gKjyVRcF08RrIQc+srnSyY1JDJtxu3Nsz07j1ffjgXoY6uPLf/qja6nDBZgzYYEovVkFryw2+KiZz11xQ==";
       };
     };
     "slash-2.0.0" = {
@@ -6700,13 +6655,13 @@ let
         sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.7" = {
+    "spdx-license-ids-3.0.5" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.7";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
-        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
+        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
       };
     };
     "split-0.2.10" = {
@@ -6826,22 +6781,22 @@ let
         sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
       };
     };
-    "string.prototype.trimend-1.0.3" = {
+    "string.prototype.trimend-1.0.1" = {
       name = "string.prototype.trimend";
       packageName = "string.prototype.trimend";
-      version = "1.0.3";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
-        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
+        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
       };
     };
-    "string.prototype.trimstart-1.0.3" = {
+    "string.prototype.trimstart-1.0.1" = {
       name = "string.prototype.trimstart";
       packageName = "string.prototype.trimstart";
-      version = "1.0.3";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
-        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
+        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
       };
     };
     "string_decoder-0.10.31" = {
@@ -7087,13 +7042,13 @@ let
         sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
       };
     };
-    "through2-4.0.2" = {
+    "through2-3.0.2" = {
       name = "through2";
       packageName = "through2";
-      version = "4.0.2";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz";
-        sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==";
+        url = "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz";
+        sha512 = "enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==";
       };
     };
     "timed-out-4.0.1" = {
@@ -7204,13 +7159,13 @@ let
         sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3";
       };
     };
-    "tslib-1.14.1" = {
+    "tslib-1.13.0" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.14.1";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
-        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz";
+        sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -7231,13 +7186,13 @@ let
         sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==";
       };
     };
-    "type-fest-0.18.1" = {
+    "type-fest-0.13.1" = {
       name = "type-fest";
       packageName = "type-fest";
-      version = "0.18.1";
+      version = "0.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz";
-        sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==";
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz";
+        sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==";
       };
     };
     "type-fest-0.3.1" = {
@@ -7249,6 +7204,15 @@ let
         sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==";
       };
     };
+    "type-fest-0.5.2" = {
+      name = "type-fest";
+      packageName = "type-fest";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz";
+        sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==";
+      };
+    };
     "type-fest-0.6.0" = {
       name = "type-fest";
       packageName = "type-fest";
@@ -7276,13 +7240,13 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "uglify-js-3.12.5" = {
+    "uglify-js-3.10.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.12.5";
+      version = "3.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
-        sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz";
+        sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==";
       };
     };
     "undefsafe-2.0.3" = {
@@ -7465,6 +7429,15 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
+    "uuid-3.3.2" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+      };
+    };
     "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
@@ -7627,13 +7600,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.1" = {
+    "y18n-4.0.0" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
-        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
     "yallist-2.1.2" = {
@@ -7645,15 +7618,6 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "yallist-4.0.0" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
-        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
-      };
-    };
     "yaml-1.10.0" = {
       name = "yaml";
       packageName = "yaml";
@@ -7717,15 +7681,6 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
-    "yargs-parser-20.2.4" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "20.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz";
-        sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==";
-      };
-    };
     "yargs-unparser-1.5.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
@@ -7741,68 +7696,72 @@ in
   commitizen = nodeEnv.buildNodePackage {
     name = "commitizen";
     packageName = "commitizen";
-    version = "4.2.3";
+    version = "4.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.3.tgz";
-      sha512 = "pYlYEng7XMV2TW4xtjDKBGqeJ0Teq2zyRSx2S3Ml1XAplHSlJZK8vm1KdGclpMEZuGafbS5TeHXIVnHk8RWIzQ==";
+      url = "https://registry.npmjs.org/commitizen/-/commitizen-4.2.1.tgz";
+      sha512 = "nZsp8IThkDu7C+93BFD/mLShb9Gd6Wsaf90tpKE3x/6u5y/Q52kzanIJpGr0qvIsJ5bCMpgKtr3Lbu3miEJfaA==";
     };
     dependencies = [
       sources."@babel/cli-7.11.6"
-      sources."@babel/code-frame-7.12.11"
-      sources."@babel/compat-data-7.12.7"
+      sources."@babel/code-frame-7.10.4"
+      (sources."@babel/compat-data-7.11.0" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
       (sources."@babel/core-7.11.6" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.2.0"
           sources."ms-2.1.2"
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/generator-7.12.11"
-      sources."@babel/helper-annotate-as-pure-7.12.10"
+      sources."@babel/generator-7.11.6"
+      sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
-      (sources."@babel/helper-compilation-targets-7.12.5" // {
+      (sources."@babel/helper-compilation-targets-7.10.4" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/helper-create-class-features-plugin-7.12.1"
-      sources."@babel/helper-create-regexp-features-plugin-7.12.7"
+      sources."@babel/helper-create-class-features-plugin-7.10.5"
+      sources."@babel/helper-create-regexp-features-plugin-7.10.4"
       sources."@babel/helper-define-map-7.10.5"
-      sources."@babel/helper-explode-assignable-expression-7.12.1"
-      sources."@babel/helper-function-name-7.12.11"
-      sources."@babel/helper-get-function-arity-7.12.10"
+      sources."@babel/helper-explode-assignable-expression-7.11.4"
+      sources."@babel/helper-function-name-7.10.4"
+      sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.7"
-      sources."@babel/helper-module-imports-7.12.5"
-      sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.12.10"
+      sources."@babel/helper-member-expression-to-functions-7.11.0"
+      sources."@babel/helper-module-imports-7.10.4"
+      sources."@babel/helper-module-transforms-7.11.0"
+      sources."@babel/helper-optimise-call-expression-7.10.4"
       sources."@babel/helper-plugin-utils-7.10.4"
-      sources."@babel/helper-remap-async-to-generator-7.12.1"
-      sources."@babel/helper-replace-supers-7.12.11"
-      sources."@babel/helper-simple-access-7.12.1"
-      sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
-      sources."@babel/helper-split-export-declaration-7.12.11"
-      sources."@babel/helper-validator-identifier-7.12.11"
-      sources."@babel/helper-validator-option-7.12.11"
-      sources."@babel/helper-wrap-function-7.12.3"
-      sources."@babel/helpers-7.12.5"
+      sources."@babel/helper-regex-7.10.5"
+      sources."@babel/helper-remap-async-to-generator-7.11.4"
+      sources."@babel/helper-replace-supers-7.10.4"
+      sources."@babel/helper-simple-access-7.10.4"
+      sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0"
+      sources."@babel/helper-split-export-declaration-7.11.0"
+      sources."@babel/helper-validator-identifier-7.10.4"
+      sources."@babel/helper-wrap-function-7.10.4"
+      sources."@babel/helpers-7.10.4"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.11"
-      sources."@babel/plugin-proposal-async-generator-functions-7.12.12"
-      sources."@babel/plugin-proposal-class-properties-7.12.1"
-      sources."@babel/plugin-proposal-dynamic-import-7.12.1"
-      sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
-      sources."@babel/plugin-proposal-json-strings-7.12.1"
-      sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
-      sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.7"
-      sources."@babel/plugin-proposal-object-rest-spread-7.11.0"
-      sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-      sources."@babel/plugin-proposal-optional-chaining-7.12.7"
-      sources."@babel/plugin-proposal-private-methods-7.12.1"
-      sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
+      sources."@babel/parser-7.11.5"
+      sources."@babel/plugin-proposal-async-generator-functions-7.10.5"
+      sources."@babel/plugin-proposal-class-properties-7.10.4"
+      sources."@babel/plugin-proposal-dynamic-import-7.10.4"
+      sources."@babel/plugin-proposal-export-namespace-from-7.10.4"
+      sources."@babel/plugin-proposal-json-strings-7.10.4"
+      sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0"
+      sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4"
+      sources."@babel/plugin-proposal-numeric-separator-7.10.4"
+      sources."@babel/plugin-proposal-object-rest-spread-7.9.0"
+      sources."@babel/plugin-proposal-optional-catch-binding-7.10.4"
+      sources."@babel/plugin-proposal-optional-chaining-7.11.0"
+      sources."@babel/plugin-proposal-private-methods-7.10.4"
+      sources."@babel/plugin-proposal-unicode-property-regex-7.10.4"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
-      sources."@babel/plugin-syntax-class-properties-7.12.1"
+      sources."@babel/plugin-syntax-class-properties-7.10.4"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
       sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
       sources."@babel/plugin-syntax-json-strings-7.8.3"
@@ -7812,70 +7771,60 @@ in
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
       sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
       sources."@babel/plugin-syntax-optional-chaining-7.8.3"
-      sources."@babel/plugin-syntax-top-level-await-7.12.1"
-      sources."@babel/plugin-transform-arrow-functions-7.12.1"
-      sources."@babel/plugin-transform-async-to-generator-7.12.1"
-      sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
-      sources."@babel/plugin-transform-block-scoping-7.12.12"
-      sources."@babel/plugin-transform-classes-7.12.1"
-      sources."@babel/plugin-transform-computed-properties-7.12.1"
-      sources."@babel/plugin-transform-destructuring-7.12.1"
-      sources."@babel/plugin-transform-dotall-regex-7.12.1"
-      sources."@babel/plugin-transform-duplicate-keys-7.12.1"
-      sources."@babel/plugin-transform-exponentiation-operator-7.12.1"
-      sources."@babel/plugin-transform-for-of-7.12.1"
-      sources."@babel/plugin-transform-function-name-7.12.1"
-      sources."@babel/plugin-transform-literals-7.12.1"
-      sources."@babel/plugin-transform-member-expression-literals-7.12.1"
-      sources."@babel/plugin-transform-modules-amd-7.12.1"
-      sources."@babel/plugin-transform-modules-commonjs-7.12.1"
-      sources."@babel/plugin-transform-modules-systemjs-7.12.1"
-      sources."@babel/plugin-transform-modules-umd-7.12.1"
-      sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1"
-      sources."@babel/plugin-transform-new-target-7.12.1"
-      sources."@babel/plugin-transform-object-super-7.12.1"
-      sources."@babel/plugin-transform-parameters-7.12.1"
-      sources."@babel/plugin-transform-property-literals-7.12.1"
-      sources."@babel/plugin-transform-regenerator-7.12.1"
-      sources."@babel/plugin-transform-reserved-words-7.12.1"
-      sources."@babel/plugin-transform-shorthand-properties-7.12.1"
-      sources."@babel/plugin-transform-spread-7.12.1"
-      sources."@babel/plugin-transform-sticky-regex-7.12.7"
-      sources."@babel/plugin-transform-template-literals-7.12.1"
-      sources."@babel/plugin-transform-typeof-symbol-7.12.10"
-      sources."@babel/plugin-transform-unicode-escapes-7.12.1"
-      sources."@babel/plugin-transform-unicode-regex-7.12.1"
+      sources."@babel/plugin-syntax-top-level-await-7.10.4"
+      sources."@babel/plugin-transform-arrow-functions-7.10.4"
+      sources."@babel/plugin-transform-async-to-generator-7.10.4"
+      sources."@babel/plugin-transform-block-scoped-functions-7.10.4"
+      sources."@babel/plugin-transform-block-scoping-7.11.1"
+      sources."@babel/plugin-transform-classes-7.10.4"
+      sources."@babel/plugin-transform-computed-properties-7.10.4"
+      sources."@babel/plugin-transform-destructuring-7.10.4"
+      sources."@babel/plugin-transform-dotall-regex-7.10.4"
+      sources."@babel/plugin-transform-duplicate-keys-7.10.4"
+      sources."@babel/plugin-transform-exponentiation-operator-7.10.4"
+      sources."@babel/plugin-transform-for-of-7.10.4"
+      sources."@babel/plugin-transform-function-name-7.10.4"
+      sources."@babel/plugin-transform-literals-7.10.4"
+      sources."@babel/plugin-transform-member-expression-literals-7.10.4"
+      sources."@babel/plugin-transform-modules-amd-7.10.5"
+      sources."@babel/plugin-transform-modules-commonjs-7.10.4"
+      sources."@babel/plugin-transform-modules-systemjs-7.10.5"
+      sources."@babel/plugin-transform-modules-umd-7.10.4"
+      sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4"
+      sources."@babel/plugin-transform-new-target-7.10.4"
+      sources."@babel/plugin-transform-object-super-7.10.4"
+      sources."@babel/plugin-transform-parameters-7.10.5"
+      sources."@babel/plugin-transform-property-literals-7.10.4"
+      sources."@babel/plugin-transform-regenerator-7.10.4"
+      sources."@babel/plugin-transform-reserved-words-7.10.4"
+      sources."@babel/plugin-transform-shorthand-properties-7.10.4"
+      sources."@babel/plugin-transform-spread-7.11.0"
+      sources."@babel/plugin-transform-sticky-regex-7.10.4"
+      sources."@babel/plugin-transform-template-literals-7.10.5"
+      sources."@babel/plugin-transform-typeof-symbol-7.10.4"
+      sources."@babel/plugin-transform-unicode-escapes-7.10.4"
+      sources."@babel/plugin-transform-unicode-regex-7.10.4"
       (sources."@babel/preset-env-7.11.5" // {
         dependencies = [
+          sources."@babel/plugin-proposal-object-rest-spread-7.11.0"
           sources."semver-5.7.1"
         ];
       })
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/register-7.11.5"
-      sources."@babel/runtime-7.12.5"
-      sources."@babel/template-7.12.7"
-      (sources."@babel/traverse-7.12.12" // {
+      sources."@babel/runtime-7.11.2"
+      sources."@babel/template-7.10.4"
+      (sources."@babel/traverse-7.11.5" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.2.0"
           sources."ms-2.1.2"
         ];
       })
-      sources."@babel/types-7.12.12"
-      sources."@commitlint/execute-rule-12.0.0"
-      (sources."@commitlint/load-12.0.0" // {
+      sources."@babel/types-7.11.5"
+      sources."@commitlint/execute-rule-11.0.0"
+      (sources."@commitlint/load-11.0.0" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."chalk-4.1.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."has-flag-4.0.0"
-          sources."supports-color-7.2.0"
-        ];
-      })
-      sources."@commitlint/resolve-extends-12.0.0"
-      (sources."@commitlint/types-12.0.0" // {
-        dependencies = [
-          sources."ansi-styles-4.3.0"
+          sources."ansi-styles-4.2.1"
           sources."chalk-4.1.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
@@ -7883,6 +7832,8 @@ in
           sources."supports-color-7.2.0"
         ];
       })
+      sources."@commitlint/resolve-extends-11.0.0"
+      sources."@commitlint/types-11.0.0"
       (sources."@istanbuljs/load-nyc-config-1.1.0" // {
         dependencies = [
           sources."find-up-4.1.0"
@@ -7893,31 +7844,30 @@ in
       })
       sources."@istanbuljs/nyc-config-babel-2.1.1"
       sources."@istanbuljs/schema-0.1.2"
-      sources."@nodelib/fs.scandir-2.1.4"
-      sources."@nodelib/fs.stat-2.0.4"
-      sources."@nodelib/fs.walk-1.2.6"
-      sources."@octokit/auth-token-2.4.4"
-      (sources."@octokit/endpoint-6.0.10" // {
+      sources."@nodelib/fs.scandir-2.1.3"
+      sources."@nodelib/fs.stat-2.0.3"
+      sources."@nodelib/fs.walk-1.2.4"
+      sources."@octokit/auth-token-2.4.2"
+      (sources."@octokit/endpoint-6.0.6" // {
         dependencies = [
           sources."is-plain-object-5.0.0"
           sources."universal-user-agent-6.0.0"
         ];
       })
-      sources."@octokit/openapi-types-3.1.1"
       (sources."@octokit/plugin-paginate-rest-1.1.2" // {
         dependencies = [
           sources."@octokit/types-2.16.2"
         ];
       })
-      sources."@octokit/plugin-request-log-1.0.2"
+      sources."@octokit/plugin-request-log-1.0.0"
       (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // {
         dependencies = [
           sources."@octokit/types-2.16.2"
         ];
       })
-      (sources."@octokit/request-5.4.12" // {
+      (sources."@octokit/request-5.4.8" // {
         dependencies = [
-          sources."@octokit/request-error-2.0.4"
+          sources."@octokit/request-error-2.0.2"
           sources."is-plain-object-5.0.0"
           sources."universal-user-agent-6.0.0"
         ];
@@ -7928,18 +7878,18 @@ in
         ];
       })
       sources."@octokit/rest-16.43.2"
-      sources."@octokit/types-6.4.2"
+      sources."@octokit/types-5.4.1"
       (sources."@semantic-release/commit-analyzer-6.3.3" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.2.0"
           sources."ms-2.1.2"
         ];
       })
       sources."@semantic-release/error-2.2.0"
       (sources."@semantic-release/github-5.5.8" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."mime-2.5.0"
+          sources."debug-4.2.0"
+          sources."mime-2.4.6"
           sources."ms-2.1.2"
         ];
       })
@@ -7955,7 +7905,7 @@ in
           sources."p-finally-2.0.1"
           sources."path-key-3.1.1"
           sources."read-pkg-5.2.0"
-          sources."registry-auth-token-4.2.1"
+          sources."registry-auth-token-4.2.0"
           sources."shebang-command-2.0.0"
           sources."shebang-regex-3.0.0"
           sources."type-fest-0.6.0"
@@ -7964,7 +7914,7 @@ in
       })
       (sources."@semantic-release/release-notes-generator-7.3.5" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.2.0"
           sources."find-up-4.1.0"
           sources."get-stream-5.2.0"
           sources."locate-path-5.0.0"
@@ -7976,7 +7926,7 @@ in
           sources."type-fest-0.6.0"
         ];
       })
-      sources."@sinonjs/commons-1.8.2"
+      sources."@sinonjs/commons-1.8.1"
       (sources."@sinonjs/formatio-3.2.2" // {
         dependencies = [
           sources."@sinonjs/samsam-3.3.3"
@@ -7984,10 +7934,11 @@ in
       })
       sources."@sinonjs/samsam-2.1.3"
       sources."@sinonjs/text-encoding-0.7.1"
+      sources."@types/color-name-1.1.1"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.22"
+      sources."@types/minimist-1.2.0"
+      sources."@types/node-14.10.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/retry-0.12.0"
@@ -8029,7 +7980,7 @@ in
       sources."aws-sign2-0.5.0"
       (sources."axios-0.19.0" // {
         dependencies = [
-          sources."is-buffer-2.0.5"
+          sources."is-buffer-2.0.4"
         ];
       })
       sources."babel-plugin-dynamic-import-node-2.3.3"
@@ -8064,7 +8015,7 @@ in
         ];
       })
       sources."browser-stdout-1.3.1"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.14.2"
       sources."btoa-lite-1.0.0"
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
@@ -8075,15 +8026,20 @@ in
           sources."write-file-atomic-3.0.3"
         ];
       })
-      sources."call-bind-1.0.2"
+      (sources."caller-callsite-2.0.0" // {
+        dependencies = [
+          sources."callsites-2.0.0"
+        ];
+      })
+      sources."caller-path-2.0.0"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001125"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
       sources."caseless-0.6.0"
-      sources."chai-4.1.2"
+      sources."chai-4.2.0"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."charenc-0.0.2"
@@ -8110,13 +8066,9 @@ in
       sources."clean-stack-2.2.0"
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
-      (sources."cli-table-0.3.4" // {
+      (sources."cli-table-0.3.1" // {
         dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
+          sources."colors-1.0.3"
         ];
       })
       sources."cli-width-2.2.1"
@@ -8130,11 +8082,10 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colorette-1.2.1"
       sources."colors-0.6.2"
       sources."combined-stream-0.0.7"
       sources."commander-4.1.1"
-      sources."commitizen-4.2.3"
+      sources."commitizen-4.2.1"
       sources."commondir-1.0.1"
       (sources."compare-func-2.0.0" // {
         dependencies = [
@@ -8150,18 +8101,18 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."conventional-changelog-angular-5.0.12"
-      (sources."conventional-changelog-writer-4.1.0" // {
+      sources."conventional-changelog-angular-5.0.11"
+      (sources."conventional-changelog-writer-4.0.17" // {
         dependencies = [
           sources."split-1.0.1"
         ];
       })
       sources."conventional-commit-types-3.0.0"
-      sources."conventional-commits-filter-2.0.7"
-      sources."conventional-commits-parser-3.2.0"
+      sources."conventional-commits-filter-2.0.6"
+      sources."conventional-commits-parser-3.1.0"
       sources."convert-source-map-1.7.0"
       sources."copy-descriptor-0.1.1"
-      (sources."core-js-compat-3.8.3" // {
+      (sources."core-js-compat-3.6.5" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -8212,7 +8163,7 @@ in
       sources."duplexer-0.1.2"
       sources."duplexer2-0.1.4"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.565"
       sources."emoji-regex-7.0.3"
       sources."end-of-stream-1.4.4"
       (sources."env-ci-4.5.2" // {
@@ -8232,10 +8183,10 @@ in
         ];
       })
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.17.6"
       sources."es-to-primitive-1.2.1"
       sources."es6-error-4.1.1"
-      sources."escalade-3.1.1"
+      sources."escalade-3.0.2"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."esutils-2.0.3"
@@ -8271,7 +8222,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      (sources."fast-glob-3.2.5" // {
+      (sources."fast-glob-3.2.4" // {
         dependencies = [
           sources."braces-3.0.2"
           sources."fill-range-7.0.1"
@@ -8281,7 +8232,7 @@ in
           sources."to-regex-range-5.0.1"
         ];
       })
-      sources."fastq-1.10.0"
+      sources."fastq-1.8.0"
       sources."figures-2.0.0"
       sources."file-uri-to-path-1.0.0"
       sources."fill-keys-1.0.2"
@@ -8301,9 +8252,9 @@ in
         ];
       })
       sources."findup-sync-3.0.0"
-      (sources."flat-4.1.1" // {
+      (sources."flat-4.1.0" // {
         dependencies = [
-          sources."is-buffer-2.0.5"
+          sources."is-buffer-2.0.4"
         ];
       })
       (sources."follow-redirects-1.5.10" // {
@@ -8325,16 +8276,15 @@ in
       sources."form-data-0.1.4"
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
-      sources."fromentries-1.3.2"
+      sources."fromentries-1.2.1"
       sources."fs-extra-8.1.0"
       sources."fs-readdir-recursive-1.1.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.2"
+      sources."gensync-1.0.0-beta.1"
       sources."get-caller-file-2.0.5"
       sources."get-func-name-2.0.0"
-      sources."get-intrinsic-1.0.2"
       sources."get-package-type-0.1.0"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
@@ -8383,7 +8333,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      (sources."hasha-5.2.2" // {
+      (sources."hasha-5.2.0" // {
         dependencies = [
           sources."is-stream-2.0.0"
         ];
@@ -8397,14 +8347,14 @@ in
       sources."html-escaper-2.0.2"
       (sources."http-proxy-agent-3.0.0" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.2.0"
           sources."ms-2.1.2"
         ];
       })
       sources."http-signature-0.10.1"
       (sources."https-proxy-agent-4.0.0" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.2.0"
           sources."ms-2.1.2"
         ];
       })
@@ -8412,7 +8362,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."ignore-5.1.8"
       sources."ignore-by-default-1.0.1"
-      (sources."import-fresh-3.3.0" // {
+      (sources."import-fresh-3.2.1" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -8420,11 +8370,11 @@ in
       sources."import-from-3.0.0"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
-      sources."in-publish-2.0.0"
+      sources."in-publish-2.0.1"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.8"
+      sources."ini-1.3.5"
       sources."inquirer-6.5.2"
       (sources."into-stream-5.1.1" // {
         dependencies = [
@@ -8437,18 +8387,17 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
+      sources."is-callable-1.2.1"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
+      sources."is-directory-0.3.1"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-installed-globally-0.1.0"
-      sources."is-negative-zero-2.0.1"
       sources."is-npm-1.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
@@ -8456,7 +8405,7 @@ in
         ];
       })
       sources."is-obj-1.0.1"
-      sources."is-object-1.0.2"
+      sources."is-object-1.0.1"
       sources."is-path-inside-1.0.1"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
@@ -8484,6 +8433,7 @@ in
           sources."path-key-3.1.1"
           sources."shebang-command-2.0.0"
           sources."shebang-regex-3.0.0"
+          sources."uuid-3.4.0"
           sources."which-2.0.2"
         ];
       })
@@ -8497,7 +8447,7 @@ in
       })
       (sources."istanbul-lib-source-maps-4.0.0" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.2.0"
           sources."istanbul-lib-coverage-3.0.0"
           sources."ms-2.1.2"
           sources."source-map-0.6.1"
@@ -8515,7 +8465,7 @@ in
       sources."jsonfile-4.0.0"
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
-      sources."just-extend-4.1.1"
+      sources."just-extend-4.1.0"
       sources."kind-of-6.0.3"
       sources."latest-version-3.1.0"
       sources."lcid-2.0.0"
@@ -8562,7 +8512,7 @@ in
       sources."map-cache-0.2.2"
       sources."map-obj-4.1.0"
       sources."map-visit-1.0.0"
-      sources."marked-0.7.0"
+      sources."marked-0.6.3"
       sources."marked-terminal-3.3.0"
       sources."md5-2.3.0"
       (sources."mem-4.3.0" // {
@@ -8570,20 +8520,14 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      (sources."meow-8.1.2" // {
+      (sources."meow-7.1.1" // {
         dependencies = [
           sources."find-up-4.1.0"
-          sources."hosted-git-info-3.0.7"
           sources."locate-path-5.0.0"
-          sources."lru-cache-6.0.0"
-          sources."normalize-package-data-3.0.0"
           sources."p-locate-4.1.0"
           sources."path-exists-4.0.0"
           (sources."read-pkg-5.2.0" // {
             dependencies = [
-              sources."hosted-git-info-2.8.8"
-              sources."normalize-package-data-2.5.0"
-              sources."semver-5.7.1"
               sources."type-fest-0.6.0"
             ];
           })
@@ -8592,10 +8536,8 @@ in
               sources."type-fest-0.8.1"
             ];
           })
-          sources."semver-7.3.4"
-          sources."type-fest-0.18.1"
-          sources."yallist-4.0.0"
-          sources."yargs-parser-20.2.4"
+          sources."type-fest-0.13.1"
+          sources."yargs-parser-18.1.3"
         ];
       })
       sources."merge-1.2.1"
@@ -8625,27 +8567,26 @@ in
           sources."debug-3.2.6"
           sources."glob-7.1.3"
           sources."ms-2.1.1"
-          sources."object.assign-4.1.0"
           sources."strip-json-comments-2.0.1"
           sources."supports-color-6.0.0"
         ];
       })
-      (sources."mocha-junit-reporter-1.18.0" // {
+      (sources."mocha-junit-reporter-1.23.3" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
         ];
       })
       (sources."mocha-multi-reporters-1.1.7" // {
         dependencies = [
-          sources."debug-3.2.7"
-          sources."ms-2.1.3"
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
         ];
       })
       sources."modify-values-1.0.1"
       sources."module-not-found-error-1.0.1"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
-      sources."nan-2.14.2"
+      sources."nan-2.14.1"
       sources."nanomatch-1.2.13"
       sources."neo-async-2.6.2"
       sources."nerf-dart-1.0.0"
@@ -8664,12 +8605,12 @@ in
       sources."node-fetch-2.6.1"
       sources."node-modules-regexp-1.0.0"
       sources."node-preload-0.2.1"
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.61"
       sources."node-uuid-1.4.8"
       (sources."nodemon-1.19.1" // {
         dependencies = [
-          sources."debug-3.2.7"
-          sources."ms-2.1.3"
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
           sources."semver-5.7.1"
         ];
       })
@@ -8681,13 +8622,13 @@ in
       })
       sources."normalize-path-3.0.0"
       sources."normalize-url-4.5.0"
-      sources."npm-6.14.11"
+      sources."npm-6.14.8"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
       (sources."nyc-15.1.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.3.0"
+          sources."ansi-styles-4.2.1"
           sources."cliui-6.0.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
@@ -8725,11 +8666,11 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.9.0"
+      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.1"
+      sources."object.assign-4.1.0"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."object.pick-1.3.0"
       sources."octokit-pagination-methods-1.1.0"
       sources."once-1.4.0"
@@ -8766,7 +8707,7 @@ in
       })
       sources."pad-right-0.2.2"
       sources."parent-module-1.0.1"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
@@ -8799,11 +8740,7 @@ in
       sources."prepend-http-1.0.4"
       sources."process-nextick-args-2.0.1"
       sources."process-on-spawn-1.0.0"
-      (sources."proxyquire-2.1.0" // {
-        dependencies = [
-          sources."resolve-1.8.1"
-        ];
-      })
+      sources."proxyquire-2.1.3"
       sources."pseudomap-1.0.2"
       sources."psl-1.8.0"
       sources."pstree.remy-1.1.8"
@@ -8828,16 +8765,16 @@ in
       sources."readdirp-2.2.1"
       sources."redent-3.0.0"
       sources."redeyed-2.1.1"
-      sources."regenerate-1.4.2"
+      sources."regenerate-1.4.1"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
-      sources."regexpu-core-4.7.1"
+      sources."regexpu-core-4.7.0"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.6" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -8849,7 +8786,7 @@ in
       sources."request-2.42.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.19.0"
+      sources."resolve-1.17.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-from-5.0.0"
       sources."resolve-global-1.0.0"
@@ -8862,51 +8799,36 @@ in
       sources."right-pad-1.0.1"
       sources."rimraf-3.0.2"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.10"
+      sources."run-parallel-1.1.9"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      (sources."semantic-release-15.14.0" // {
+      (sources."semantic-release-15.13.18" // {
         dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.3.0"
-          sources."cliui-6.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."cosmiconfig-6.0.0"
-          sources."cross-spawn-7.0.3"
-          sources."debug-4.3.2"
-          sources."emoji-regex-8.0.0"
-          sources."execa-3.4.0"
+          sources."cosmiconfig-5.2.1"
+          sources."debug-4.2.0"
           sources."figures-3.2.0"
           sources."find-up-4.1.0"
           sources."get-stream-5.2.0"
-          sources."hosted-git-info-3.0.7"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."is-stream-2.0.0"
+          (sources."import-fresh-2.0.0" // {
+            dependencies = [
+              sources."resolve-from-3.0.0"
+            ];
+          })
           sources."locate-path-5.0.0"
-          sources."lru-cache-6.0.0"
-          sources."mimic-fn-2.1.0"
           sources."ms-2.1.2"
-          sources."npm-run-path-4.0.1"
-          sources."onetime-5.1.2"
-          sources."p-finally-2.0.1"
           sources."p-locate-4.1.0"
+          sources."parse-json-4.0.0"
           sources."path-exists-4.0.0"
-          sources."path-key-3.1.1"
-          sources."read-pkg-5.2.0"
-          sources."read-pkg-up-7.0.1"
-          sources."shebang-command-2.0.0"
-          sources."shebang-regex-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
-          sources."type-fest-0.6.0"
-          sources."which-2.0.2"
-          sources."wrap-ansi-6.2.0"
-          sources."yallist-4.0.0"
-          sources."yargs-15.4.1"
-          sources."yargs-parser-18.1.3"
+          (sources."read-pkg-5.2.0" // {
+            dependencies = [
+              sources."parse-json-5.1.0"
+              sources."type-fest-0.6.0"
+            ];
+          })
+          sources."read-pkg-up-6.0.0"
+          sources."type-fest-0.5.2"
         ];
       })
       sources."semver-6.3.0"
@@ -8926,7 +8848,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.3"
       sources."signale-1.4.0"
-      sources."sinon-6.3.4"
+      sources."sinon-6.3.5"
       sources."slash-2.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -8976,7 +8898,7 @@ in
       sources."spdx-correct-3.1.1"
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.7"
+      sources."spdx-license-ids-3.0.5"
       sources."split-0.2.10"
       sources."split-string-3.1.0"
       (sources."split2-2.2.0" // {
@@ -9009,8 +8931,8 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
+      sources."string.prototype.trimend-1.0.1"
+      sources."string.prototype.trimstart-1.0.1"
       sources."string_decoder-1.1.1"
       sources."stringstream-0.0.6"
       (sources."strip-ansi-5.2.0" // {
@@ -9046,11 +8968,7 @@ in
       sources."test-exclude-5.2.3"
       sources."text-extensions-1.9.0"
       sources."through-2.3.8"
-      (sources."through2-4.0.2" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      sources."through2-3.0.2"
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
       sources."to-fast-properties-2.0.0"
@@ -9066,12 +8984,12 @@ in
       sources."traverse-0.6.6"
       sources."trim-newlines-3.0.0"
       sources."trim-off-newlines-1.0.1"
-      sources."tslib-1.14.1"
+      sources."tslib-1.13.0"
       sources."tunnel-agent-0.4.3"
       sources."type-detect-4.0.8"
       sources."type-fest-0.8.1"
       sources."typedarray-to-buffer-3.1.5"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.10.4"
       sources."undefsafe-2.0.3"
       sources."unicode-canonical-property-names-ecmascript-1.0.4"
       sources."unicode-match-property-ecmascript-1.0.4"
@@ -9100,7 +9018,7 @@ in
       sources."urlgrey-0.4.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.4.0"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.4"
       sources."which-1.3.1"
       sources."which-module-2.0.0"
@@ -9122,7 +9040,7 @@ in
       sources."xdg-basedir-3.0.0"
       sources."xml-1.0.1"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.1"
+      sources."y18n-4.0.0"
       sources."yallist-2.1.2"
       sources."yaml-1.10.0"
       (sources."yargs-13.2.2" // {
@@ -9143,7 +9061,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Git commit, but play nice with conventions.";
-      homepage = "https://github.com/commitizen/cz-cli";
+      homepage = https://github.com/commitizen/cz-cli;
       license = "MIT";
     };
     production = false;
diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
index 0ffa56eae90..d805fe3827d 100755
--- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh
+++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
@@ -10,4 +10,6 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
     -i node-packages.json \
     -o node-packages.nix \
     -c node-composition.nix \
-    --no-copy-node-env -e ../../../node-packages/node-env.nix
+    # TODO: Switch to the commented out version once nodejs package set gets updated to new node2nix
+    -e node-env.nix
+    # --no-copy-node-env -e ../../../node-packages/node-env.nix
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 4b662bd072b..c43e7cc7f25 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -1,17 +1,17 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
 
 let
-  nodeEnv = import ../../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+  nodeEnv = import ./node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix
new file mode 100644
index 00000000000..e1abf530493
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/node-env.nix
@@ -0,0 +1,542 @@
+# This file originates from node2nix
+
+{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+
+let
+  python = if nodejs ? python then nodejs.python else python2;
+
+  # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
+  tarWrapper = runCommand "tarWrapper" {} ''
+    mkdir -p $out/bin
+
+    cat > $out/bin/tar <<EOF
+    #! ${stdenv.shell} -e
+    $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
+    EOF
+
+    chmod +x $out/bin/tar
+  '';
+
+  # Function that generates a TGZ file from a NPM project
+  buildNodeSourceDist =
+    { name, version, src, ... }:
+
+    stdenv.mkDerivation {
+      name = "node-tarball-${name}-${version}";
+      inherit src;
+      buildInputs = [ nodejs ];
+      buildPhase = ''
+        export HOME=$TMPDIR
+        tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
+      '';
+      installPhase = ''
+        mkdir -p $out/tarballs
+        mv $tgzFile $out/tarballs
+        mkdir -p $out/nix-support
+        echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
+      '';
+    };
+
+  includeDependencies = {dependencies}:
+    stdenv.lib.optionalString (dependencies != [])
+      (stdenv.lib.concatMapStrings (dependency:
+        ''
+          # Bundle the dependencies of the package
+          mkdir -p node_modules
+          cd node_modules
+
+          # Only include dependencies if they don't exist. They may also be bundled in the package.
+          if [ ! -e "${dependency.name}" ]
+          then
+              ${composePackage dependency}
+          fi
+
+          cd ..
+        ''
+      ) dependencies);
+
+  # Recursively composes the dependencies of a package
+  composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+    builtins.addErrorContext "while evaluating node package '${packageName}'" ''
+      DIR=$(pwd)
+      cd $TMPDIR
+
+      unpackFile ${src}
+
+      # Make the base dir in which the target dependency resides first
+      mkdir -p "$(dirname "$DIR/${packageName}")"
+
+      if [ -f "${src}" ]
+      then
+          # Figure out what directory has been unpacked
+          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
+
+          # Restore write permissions to make building work
+          find "$packageDir" -type d -exec chmod u+x {} \;
+          chmod -R u+w "$packageDir"
+
+          # Move the extracted tarball into the output folder
+          mv "$packageDir" "$DIR/${packageName}"
+      elif [ -d "${src}" ]
+      then
+          # Get a stripped name (without hash) of the source directory.
+          # On old nixpkgs it's already set internally.
+          if [ -z "$strippedName" ]
+          then
+              strippedName="$(stripHash ${src})"
+          fi
+
+          # Restore write permissions to make building work
+          chmod -R u+w "$strippedName"
+
+          # Move the extracted directory into the output folder
+          mv "$strippedName" "$DIR/${packageName}"
+      fi
+
+      # Unset the stripped name to not confuse the next unpack step
+      unset strippedName
+
+      # Include the dependencies of the package
+      cd "$DIR/${packageName}"
+      ${includeDependencies { inherit dependencies; }}
+      cd ..
+      ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+    '';
+
+  pinpointDependencies = {dependencies, production}:
+    let
+      pinpointDependenciesFromPackageJSON = writeTextFile {
+        name = "pinpointDependencies.js";
+        text = ''
+          var fs = require('fs');
+          var path = require('path');
+
+          function resolveDependencyVersion(location, name) {
+              if(location == process.env['NIX_STORE']) {
+                  return null;
+              } else {
+                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+
+                  if(fs.existsSync(dependencyPackageJSON)) {
+                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+
+                      if(dependencyPackageObj.name == name) {
+                          return dependencyPackageObj.version;
+                      }
+                  } else {
+                      return resolveDependencyVersion(path.resolve(location, ".."), name);
+                  }
+              }
+          }
+
+          function replaceDependencies(dependencies) {
+              if(typeof dependencies == "object" && dependencies !== null) {
+                  for(var dependency in dependencies) {
+                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+
+                      if(resolvedVersion === null) {
+                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+                      } else {
+                          dependencies[dependency] = resolvedVersion;
+                      }
+                  }
+              }
+          }
+
+          /* Read the package.json configuration */
+          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+          /* Pinpoint all dependencies */
+          replaceDependencies(packageObj.dependencies);
+          if(process.argv[2] == "development") {
+              replaceDependencies(packageObj.devDependencies);
+          }
+          replaceDependencies(packageObj.optionalDependencies);
+
+          /* Write the fixed package.json file */
+          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+        '';
+      };
+    in
+    ''
+      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+
+      ${stdenv.lib.optionalString (dependencies != [])
+        ''
+          if [ -d node_modules ]
+          then
+              cd node_modules
+              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              cd ..
+          fi
+        ''}
+    '';
+
+  # Recursively traverses all dependencies of a package and pinpoints all
+  # dependencies in the package.json file to the versions that are actually
+  # being used.
+
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+    ''
+      if [ -d "${packageName}" ]
+      then
+          cd "${packageName}"
+          ${pinpointDependencies { inherit dependencies production; }}
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      fi
+    '';
+
+  # Extract the Node.js source code which is used to compile packages with
+  # native bindings
+  nodeSources = runCommand "node-sources" {} ''
+    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+    mv node-* $out
+  '';
+
+  # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
+  addIntegrityFieldsScript = writeTextFile {
+    name = "addintegrityfields.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      function augmentDependencies(baseDir, dependencies) {
+          for(var dependencyName in dependencies) {
+              var dependency = dependencies[dependencyName];
+
+              // Open package.json and augment metadata fields
+              var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
+              var packageJSONPath = path.join(packageJSONDir, "package.json");
+
+              if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
+                  console.log("Adding metadata fields to: "+packageJSONPath);
+                  var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
+
+                  if(dependency.integrity) {
+                      packageObj["_integrity"] = dependency.integrity;
+                  } else {
+                      packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
+                  }
+
+                  if(dependency.resolved) {
+                      packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
+                  } else {
+                      packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+                  }
+
+                  if(dependency.from !== undefined) { // Adopt from property if one has been provided
+                      packageObj["_from"] = dependency.from;
+                  }
+
+                  fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
+              }
+
+              // Augment transitive dependencies
+              if(dependency.dependencies !== undefined) {
+                  augmentDependencies(packageJSONDir, dependency.dependencies);
+              }
+          }
+      }
+
+      if(fs.existsSync("./package-lock.json")) {
+          var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
+
+          if(packageLock.lockfileVersion !== 1) {
+             process.stderr.write("Sorry, I only understand lock file version 1!\n");
+             process.exit(1);
+          }
+
+          if(packageLock.dependencies !== undefined) {
+              augmentDependencies(".", packageLock.dependencies);
+          }
+      }
+    '';
+  };
+
+  # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
+  reconstructPackageLock = writeTextFile {
+    name = "addintegrityfields.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+      var lockObj = {
+          name: packageObj.name,
+          version: packageObj.version,
+          lockfileVersion: 1,
+          requires: true,
+          dependencies: {}
+      };
+
+      function augmentPackageJSON(filePath, dependencies) {
+          var packageJSON = path.join(filePath, "package.json");
+          if(fs.existsSync(packageJSON)) {
+              var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+              dependencies[packageObj.name] = {
+                  version: packageObj.version,
+                  integrity: "sha1-000000000000000000000000000=",
+                  dependencies: {}
+              };
+              processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+          }
+      }
+
+      function processDependencies(dir, dependencies) {
+          if(fs.existsSync(dir)) {
+              var files = fs.readdirSync(dir);
+
+              files.forEach(function(entry) {
+                  var filePath = path.join(dir, entry);
+                  var stats = fs.statSync(filePath);
+
+                  if(stats.isDirectory()) {
+                      if(entry.substr(0, 1) == "@") {
+                          // When we encounter a namespace folder, augment all packages belonging to the scope
+                          var pkgFiles = fs.readdirSync(filePath);
+
+                          pkgFiles.forEach(function(entry) {
+                              if(stats.isDirectory()) {
+                                  var pkgFilePath = path.join(filePath, entry);
+                                  augmentPackageJSON(pkgFilePath, dependencies);
+                              }
+                          });
+                      } else {
+                          augmentPackageJSON(filePath, dependencies);
+                      }
+                  }
+              });
+          }
+      }
+
+      processDependencies("node_modules", lockObj.dependencies);
+
+      fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
+    '';
+  };
+
+  prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
+    let
+      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+    in
+    ''
+        # Pinpoint the versions of all dependencies to the ones that are actually being used
+        echo "pinpointing versions of dependencies..."
+        source $pinpointDependenciesScriptPath
+
+        # Patch the shebangs of the bundled modules to prevent them from
+        # calling executables outside the Nix store as much as possible
+        patchShebangs .
+
+        # Deploy the Node.js package by running npm install. Since the
+        # dependencies have been provided already by ourselves, it should not
+        # attempt to install them again, which is good, because we want to make
+        # it Nix's responsibility. If it needs to install any dependencies
+        # anyway (e.g. because the dependency parameters are
+        # incomplete/incorrect), it fails.
+        #
+        # The other responsibilities of NPM are kept -- version checks, build
+        # steps, postprocessing etc.
+
+        export HOME=$TMPDIR
+        cd "${packageName}"
+        runHook preRebuild
+
+        ${stdenv.lib.optionalString bypassCache ''
+          ${stdenv.lib.optionalString reconstructLock ''
+            if [ -f package-lock.json ]
+            then
+                echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
+                echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
+                rm package-lock.json
+            else
+                echo "No package-lock.json file found, reconstructing..."
+            fi
+
+            node ${reconstructPackageLock}
+          ''}
+
+          node ${addIntegrityFieldsScript}
+        ''}
+
+        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
+        if [ "''${dontNpmInstall-}" != "1" ]
+        then
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+        fi
+    '';
+
+  # Builds and composes an NPM package including all its dependencies
+  buildNodePackage =
+    { name
+    , packageName
+    , version
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , reconstructLock ? false
+    , preRebuild ? ""
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
+    let
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+    in
+    stdenv.mkDerivation ({
+      name = "node_${name}-${version}";
+      buildInputs = [ tarWrapper python nodejs ]
+        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+        ++ buildInputs;
+
+      inherit nodejs;
+
+      inherit dontStrip; # Stripping may fail a build for some package deployments
+      inherit dontNpmInstall preRebuild unpackPhase buildPhase;
+
+      compositionScript = composePackage args;
+      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+
+      installPhase = ''
+        # Create and enter a root node_modules/ folder
+        mkdir -p $out/lib/node_modules
+        cd $out/lib/node_modules
+
+        # Compose the package and all its dependencies
+        source $compositionScriptPath
+
+        ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+        # Create symlink to the deployed executable folder, if applicable
+        if [ -d "$out/lib/node_modules/.bin" ]
+        then
+            ln -s $out/lib/node_modules/.bin $out/bin
+        fi
+
+        # Create symlinks to the deployed manual page folders, if applicable
+        if [ -d "$out/lib/node_modules/${packageName}/man" ]
+        then
+            mkdir -p $out/share
+            for dir in "$out/lib/node_modules/${packageName}/man/"*
+            do
+                mkdir -p $out/share/man/$(basename "$dir")
+                for page in "$dir"/*
+                do
+                    ln -s $page $out/share/man/$(basename "$dir")
+                done
+            done
+        fi
+
+        # Run post install hook, if provided
+        runHook postInstall
+      '';
+    } // extraArgs);
+
+  # Builds a development shell
+  buildNodeShell =
+    { name
+    , packageName
+    , version
+    , src
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , reconstructLock ? false
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
+    let
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+
+      nodeDependencies = stdenv.mkDerivation ({
+        name = "node-dependencies-${name}-${version}";
+
+        buildInputs = [ tarWrapper python nodejs ]
+          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
+
+        inherit dontStrip; # Stripping may fail a build for some package deployments
+        inherit dontNpmInstall unpackPhase buildPhase;
+
+        includeScript = includeDependencies { inherit dependencies; };
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+
+        installPhase = ''
+          mkdir -p $out/${packageName}
+          cd $out/${packageName}
+
+          source $includeScriptPath
+
+          # Create fake package.json to make the npm commands work properly
+          cp ${src}/package.json .
+          chmod 644 package.json
+          ${stdenv.lib.optionalString bypassCache ''
+            if [ -f ${src}/package-lock.json ]
+            then
+                cp ${src}/package-lock.json .
+            fi
+          ''}
+
+          # Go to the parent folder to make sure that all packages are pinpointed
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+          # Expose the executables that were installed
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          mv ${packageName} lib
+          ln -s $out/lib/node_modules/.bin $out/bin
+        '';
+      } // extraArgs);
+    in
+    stdenv.mkDerivation {
+      name = "node-shell-${name}-${version}";
+
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildCommand = ''
+        mkdir -p $out/bin
+        cat > $out/bin/shell <<EOF
+        #! ${stdenv.shell} -e
+        $shellHook
+        exec ${stdenv.shell}
+        EOF
+        chmod +x $out/bin/shell
+      '';
+
+      # Provide the dependencies in a development shell through the NODE_PATH environment variable
+      inherit nodeDependencies;
+      shellHook = stdenv.lib.optionalString (dependencies != []) ''
+        export NODE_PATH=${nodeDependencies}/lib/node_modules
+        export PATH="${nodeDependencies}/bin:$PATH"
+      '';
+    };
+in
+{
+  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
+  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
+}
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 16414b3ee77..015958d1239 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/cli-7.12.10" = {
+    "@babel/cli-7.12.8" = {
       name = "_at_babel_slash_cli";
       packageName = "@babel/cli";
-      version = "7.12.10";
+      version = "7.12.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.10.tgz";
-        sha512 = "+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==";
+        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.8.tgz";
+        sha512 = "/6nQj11oaGhLmZiuRUfxsujiPDc9BBReemiXgIbxc+M5W+MIiFKYwvNDJvBfnGKNsJTKbUfEheKc9cwoPHAVQA==";
       };
     };
     "@babel/code-frame-7.0.0" = {
@@ -22,13 +22,13 @@ let
         sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==";
       };
     };
-    "@babel/code-frame-7.12.11" = {
+    "@babel/code-frame-7.10.4" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
-        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";
+        sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
     "@babel/compat-data-7.12.7" = {
@@ -40,31 +40,31 @@ let
         sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
       };
     };
-    "@babel/core-7.12.10" = {
+    "@babel/core-7.12.9" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.10";
+      version = "7.12.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz";
-        sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz";
+        sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==";
       };
     };
-    "@babel/generator-7.12.11" = {
+    "@babel/generator-7.12.5" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.12.11";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
-        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
+        sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
       };
     };
-    "@babel/helper-annotate-as-pure-7.12.10" = {
+    "@babel/helper-annotate-as-pure-7.10.4" = {
       name = "_at_babel_slash_helper-annotate-as-pure";
       packageName = "@babel/helper-annotate-as-pure";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz";
-        sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==";
+        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz";
+        sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==";
       };
     };
     "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = {
@@ -121,22 +121,22 @@ let
         sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==";
       };
     };
-    "@babel/helper-function-name-7.12.11" = {
+    "@babel/helper-function-name-7.10.4" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
-        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
+        sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
       };
     };
-    "@babel/helper-get-function-arity-7.12.10" = {
+    "@babel/helper-get-function-arity-7.10.4" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
-        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
+        sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
       };
     };
     "@babel/helper-hoist-variables-7.10.4" = {
@@ -175,13 +175,13 @@ let
         sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.12.10" = {
+    "@babel/helper-optimise-call-expression-7.12.7" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.12.10";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
-        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz";
+        sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==";
       };
     };
     "@babel/helper-plugin-utils-7.10.4" = {
@@ -202,13 +202,13 @@ let
         sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
       };
     };
-    "@babel/helper-replace-supers-7.12.11" = {
+    "@babel/helper-replace-supers-7.12.5" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.12.11";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
-        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+        sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
       };
     };
     "@babel/helper-simple-access-7.12.1" = {
@@ -229,31 +229,31 @@ let
         sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==";
       };
     };
-    "@babel/helper-split-export-declaration-7.12.11" = {
+    "@babel/helper-split-export-declaration-7.11.0" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.12.11";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
-        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
+        sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
       };
     };
-    "@babel/helper-validator-identifier-7.12.11" = {
+    "@babel/helper-validator-identifier-7.10.4" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
-        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
+        sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
       };
     };
-    "@babel/helper-validator-option-7.12.11" = {
+    "@babel/helper-validator-option-7.12.1" = {
       name = "_at_babel_slash_helper-validator-option";
       packageName = "@babel/helper-validator-option";
-      version = "7.12.11";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz";
-        sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz";
+        sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==";
       };
     };
     "@babel/helper-wrap-function-7.12.3" = {
@@ -283,22 +283,22 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.11" = {
+    "@babel/parser-7.12.7" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.11";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
-        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz";
+        sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==";
       };
     };
-    "@babel/plugin-proposal-async-generator-functions-7.12.12" = {
+    "@babel/plugin-proposal-async-generator-functions-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-async-generator-functions";
       packageName = "@babel/plugin-proposal-async-generator-functions";
-      version = "7.12.12";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz";
-        sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz";
+        sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==";
       };
     };
     "@babel/plugin-proposal-class-properties-7.12.1" = {
@@ -544,13 +544,13 @@ let
         sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.12.12" = {
+    "@babel/plugin-transform-block-scoping-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-block-scoping";
       packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.12.12";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz";
-        sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz";
+        sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==";
       };
     };
     "@babel/plugin-transform-classes-7.12.1" = {
@@ -742,13 +742,13 @@ let
         sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==";
       };
     };
-    "@babel/plugin-transform-runtime-7.12.10" = {
+    "@babel/plugin-transform-runtime-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-runtime";
       packageName = "@babel/plugin-transform-runtime";
-      version = "7.12.10";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz";
-        sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz";
+        sha512 = "Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==";
       };
     };
     "@babel/plugin-transform-shorthand-properties-7.12.1" = {
@@ -787,13 +787,13 @@ let
         sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==";
       };
     };
-    "@babel/plugin-transform-typeof-symbol-7.12.10" = {
+    "@babel/plugin-transform-typeof-symbol-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-typeof-symbol";
       packageName = "@babel/plugin-transform-typeof-symbol";
-      version = "7.12.10";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz";
-        sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz";
+        sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==";
       };
     };
     "@babel/plugin-transform-unicode-escapes-7.12.1" = {
@@ -814,13 +814,13 @@ let
         sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
       };
     };
-    "@babel/preset-env-7.12.10" = {
+    "@babel/preset-env-7.12.7" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.12.10";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.10.tgz";
-        sha512 = "Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz";
+        sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==";
       };
     };
     "@babel/preset-modules-0.1.4" = {
@@ -850,22 +850,22 @@ let
         sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.12.12" = {
+    "@babel/traverse-7.12.9" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.12";
+      version = "7.12.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
-        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz";
+        sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==";
       };
     };
-    "@babel/types-7.12.12" = {
+    "@babel/types-7.12.7" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.12";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
-        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz";
+        sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==";
       };
     };
     "@hapi/address-2.1.4" = {
@@ -922,13 +922,13 @@ let
         sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==";
       };
     };
-    "@nodelib/fs.scandir-2.1.4" = {
+    "@nodelib/fs.scandir-2.1.3" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.4";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
-        sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
+        sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
       };
     };
     "@nodelib/fs.stat-1.1.3" = {
@@ -940,22 +940,22 @@ let
         sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==";
       };
     };
-    "@nodelib/fs.stat-2.0.4" = {
+    "@nodelib/fs.stat-2.0.3" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.4";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
-        sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
+        sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==";
       };
     };
-    "@nodelib/fs.walk-1.2.6" = {
+    "@nodelib/fs.walk-1.2.4" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.6";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
-        sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
+        sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -1039,22 +1039,22 @@ let
         sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==";
       };
     };
-    "@types/http-proxy-1.17.5" = {
+    "@types/http-proxy-1.17.4" = {
       name = "_at_types_slash_http-proxy";
       packageName = "@types/http-proxy";
-      version = "1.17.5";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz";
-        sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q==";
+        url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz";
+        sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==";
       };
     };
-    "@types/json-schema-7.0.7" = {
+    "@types/json-schema-7.0.6" = {
       name = "_at_types_slash_json-schema";
       packageName = "@types/json-schema";
-      version = "7.0.7";
+      version = "7.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz";
-        sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==";
+        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz";
+        sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==";
       };
     };
     "@types/keyv-3.1.1" = {
@@ -1075,13 +1075,13 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/node-14.14.22" = {
+    "@types/node-14.14.10" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.22";
+      version = "14.14.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
-        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz";
+        sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==";
       };
     };
     "@types/parse-json-4.0.0" = {
@@ -1138,22 +1138,22 @@ let
         sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==";
       };
     };
-    "@types/webpack-4.41.26" = {
+    "@types/webpack-4.41.25" = {
       name = "_at_types_slash_webpack";
       packageName = "@types/webpack";
-      version = "4.41.26";
+      version = "4.41.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz";
-        sha512 = "7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==";
+        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz";
+        sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==";
       };
     };
-    "@types/webpack-sources-2.1.0" = {
+    "@types/webpack-sources-2.0.0" = {
       name = "_at_types_slash_webpack-sources";
       packageName = "@types/webpack-sources";
-      version = "2.1.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz";
-        sha512 = "LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==";
+        url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz";
+        sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==";
       };
     };
     "@webassemblyjs/ast-1.9.0" = {
@@ -1795,13 +1795,13 @@ let
         sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
       };
     };
-    "autoprefixer-10.1.0" = {
+    "autoprefixer-10.0.4" = {
       name = "autoprefixer";
       packageName = "autoprefixer";
-      version = "10.1.0";
+      version = "10.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.1.0.tgz";
-        sha512 = "0/lBNwN+ZUnb5su18NZo5MBIjDaq6boQKZcxwy86Gip/CmXA2zZqUoFQLCNAGI5P25ZWSP2RWdhDJ8osfKEjoQ==";
+        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.4.tgz";
+        sha512 = "hmjYejN/WTyPP9cdNmiwtwqM8/ACVJPD5ExtwoOceQohNbgnFNiwpL2+U4bXS8aXozBL00WvH6WhqbuHf0Fgfg==";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -1975,13 +1975,13 @@ let
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
-    "binary-extensions-2.2.0" = {
+    "binary-extensions-2.1.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
-        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
+        sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
       };
     };
     "bindings-1.5.0" = {
@@ -2164,13 +2164,13 @@ let
         sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==";
       };
     };
-    "browserslist-4.16.1" = {
+    "browserslist-4.14.7" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.16.1";
+      version = "4.14.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz";
-        sha512 = "UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz";
+        sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==";
       };
     };
     "buffer-4.9.2" = {
@@ -2299,13 +2299,13 @@ let
         sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==";
       };
     };
-    "call-bind-1.0.2" = {
+    "call-bind-1.0.0" = {
       name = "call-bind";
       packageName = "call-bind";
-      version = "1.0.2";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
-        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
+        sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
       };
     };
     "call-me-maybe-1.0.1" = {
@@ -2353,13 +2353,13 @@ let
         sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
       };
     };
-    "camel-case-4.1.2" = {
+    "camel-case-4.1.1" = {
       name = "camel-case";
       packageName = "camel-case";
-      version = "4.1.2";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz";
-        sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==";
+        url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz";
+        sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==";
       };
     };
     "camelcase-3.0.0" = {
@@ -2398,13 +2398,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001179" = {
+    "caniuse-lite-1.0.30001161" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001179";
+      version = "1.0.30001161";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz";
-        sha512 = "blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz";
+        sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g==";
       };
     };
     "case-sensitive-paths-webpack-plugin-2.3.0" = {
@@ -2533,13 +2533,13 @@ let
         sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==";
       };
     };
-    "chokidar-3.5.1" = {
+    "chokidar-3.4.3" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.5.1";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz";
-        sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz";
+        sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
       };
     };
     "chownr-1.1.4" = {
@@ -2614,13 +2614,13 @@ let
         sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==";
       };
     };
-    "cli-table-0.3.4" = {
+    "cli-table-0.3.1" = {
       name = "cli-table";
       packageName = "cli-table";
-      version = "0.3.4";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.4.tgz";
-        sha512 = "1vinpnX/ZERcmE443i3SZTmU5DF0rPO9DrL4I2iVAllhxzCM9SzPlHnz19fsZB78htkKZvYBvj6SZ6vXnaxmTA==";
+        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
+        sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
       };
     };
     "cli-width-2.2.1" = {
@@ -2839,13 +2839,13 @@ let
         sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
       };
     };
-    "commander-6.2.1" = {
+    "commander-6.2.0" = {
       name = "commander";
       packageName = "commander";
-      version = "6.2.1";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz";
-        sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
+        url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz";
+        sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
       };
     };
     "common-tags-1.8.0" = {
@@ -3064,13 +3064,13 @@ let
         sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
       };
     };
-    "core-js-compat-3.8.3" = {
+    "core-js-compat-3.8.0" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.8.3";
+      version = "3.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz";
-        sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz";
+        sha512 = "o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -3235,6 +3235,15 @@ let
         sha512 = "rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg==";
       };
     };
+    "css-select-1.2.0" = {
+      name = "css-select";
+      packageName = "css-select";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
+        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
+      };
+    };
     "css-select-2.1.0" = {
       name = "css-select";
       packageName = "css-select";
@@ -3271,6 +3280,15 @@ let
         sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==";
       };
     };
+    "css-what-2.1.3" = {
+      name = "css-what";
+      packageName = "css-what";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
+        sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
+      };
+    };
     "css-what-3.4.2" = {
       name = "css-what";
       packageName = "css-what";
@@ -3397,13 +3415,13 @@ let
         sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
-    "debug-4.3.2" = {
+    "debug-4.3.1" = {
       name = "debug";
       packageName = "debug";
-      version = "4.3.2";
+      version = "4.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
+        sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
       };
     };
     "decamelize-1.2.0" = {
@@ -3703,13 +3721,13 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domelementtype-2.1.0" = {
+    "domelementtype-2.0.2" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "2.1.0";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
-        sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz";
+        sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==";
       };
     };
     "domhandler-2.4.2" = {
@@ -3721,6 +3739,15 @@ let
         sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
       };
     };
+    "domutils-1.5.1" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+      };
+    };
     "domutils-1.7.0" = {
       name = "domutils";
       packageName = "domutils";
@@ -3730,13 +3757,13 @@ let
         sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
       };
     };
-    "dot-case-3.0.4" = {
+    "dot-case-3.0.3" = {
       name = "dot-case";
       packageName = "dot-case";
-      version = "3.0.4";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz";
-        sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==";
+        url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz";
+        sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==";
       };
     };
     "dot-prop-5.3.0" = {
@@ -3802,13 +3829,13 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "electron-to-chromium-1.3.643" = {
+    "electron-to-chromium-1.3.610" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.643";
+      version = "1.3.610";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.643.tgz";
-        sha512 = "TGomM4gj8adt/uqRgPbu9F0yhUVAR1deww5X0fvbQgpGr9suSMjLgc4IwQ9YKGkp1t03cDbZum20OfAkiTYjAg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz";
+        sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g==";
       };
     };
     "elliptic-6.5.3" = {
@@ -3838,6 +3865,16 @@ let
         sha512 = "6y36ewCcVmTOx8lj7cKJs3bhI5qMfoVEigePZ9PhEUNKpwjjML/pU2u2YSpHVAznuCcojoF6KIsrS1Ci7GtVaQ==";
       };
     };
+    "elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf" = {
+      name = "elm-analyse";
+      packageName = "elm-analyse";
+      version = "0.16.6-alpha";
+      src = fetchgit {
+        url = "git://github.com/elm-tooling/elm-analyse";
+        rev = "7f4000cce5ef024fe5e82c7ee1725feef95a9daf";
+        sha256 = "270cb1adfdeb368dde2b780938f653e9aa46cc97afbe4de828813fef7c30e556";
+      };
+    };
     "elm-asset-webpack-loader-1.1.2" = {
       name = "elm-asset-webpack-loader";
       packageName = "elm-asset-webpack-loader";
@@ -3874,6 +3911,15 @@ let
         sha512 = "FcRN8UlTl52EigvGjTaG9rnfdUJYh88eWRrruUmZLNVb/71maM92l3HNDAcyztOj4pEYGhoo9DEHEquZm6B08A==";
       };
     };
+    "elm-json-0.2.8" = {
+      name = "elm-json";
+      packageName = "elm-json";
+      version = "0.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elm-json/-/elm-json-0.2.8.tgz";
+        sha512 = "YfK39CNrHjB4LMnas6aAb2LP37YgqAnh69bWD7ojAs7lBNNkWIeBifeszAfmapylQt1MVuwj6zPPYwrqRQXEBA==";
+      };
+    };
     "elm-test-0.19.1" = {
       name = "elm-test";
       packageName = "elm-test";
@@ -3892,15 +3938,6 @@ let
         sha512 = "DUzKPNzJb/2ZsPbtHttT5JIKGY1KtT7d9cexSNQI7DppvoEHxZ4nCd5EObv5kjskmC0JkQ5PHmCkIruQsbOdkQ==";
       };
     };
-    "elm-tooling-1.0.2" = {
-      name = "elm-tooling";
-      packageName = "elm-tooling";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.0.2.tgz";
-        sha512 = "sE48Opzo1pIUtyHQafIqj6g+G1Kefk3mWOMAE8TgKujhJL2JqXxDKiYB0afJxzxJkn/YYVLmzWoM+VhHM5q+0A==";
-      };
-    };
     "elm-webpack-loader-6.0.1" = {
       name = "elm-webpack-loader";
       packageName = "elm-webpack-loader";
@@ -3982,13 +4019,13 @@ let
         sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
       };
     };
-    "enhanced-resolve-4.5.0" = {
+    "enhanced-resolve-4.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "4.5.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz";
-        sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz";
+        sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==";
       };
     };
     "entities-1.1.2" = {
@@ -4009,13 +4046,13 @@ let
         sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
       };
     };
-    "errno-0.1.8" = {
+    "errno-0.1.7" = {
       name = "errno";
       packageName = "errno";
-      version = "0.1.8";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz";
-        sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==";
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
+        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
       };
     };
     "error-ex-1.3.2" = {
@@ -4027,13 +4064,22 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "es-abstract-1.18.0-next.2" = {
+    "es-abstract-1.17.7" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.18.0-next.2";
+      version = "1.17.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
-        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz";
+        sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==";
+      };
+    };
+    "es-abstract-1.18.0-next.1" = {
+      name = "es-abstract";
+      packageName = "es-abstract";
+      version = "1.18.0-next.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz";
+        sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -4225,13 +4271,13 @@ let
         sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
       };
     };
-    "execa-5.0.0" = {
+    "execa-4.1.0" = {
       name = "execa";
       packageName = "execa";
-      version = "5.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz";
-        sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==";
+        url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz";
+        sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==";
       };
     };
     "expand-brackets-2.1.4" = {
@@ -4378,13 +4424,13 @@ let
         sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==";
       };
     };
-    "fast-glob-3.2.5" = {
+    "fast-glob-3.2.4" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.5";
+      version = "3.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
-        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz";
+        sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==";
       };
     };
     "fast-json-stable-stringify-2.1.0" = {
@@ -4396,13 +4442,13 @@ let
         sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
-    "fastq-1.10.0" = {
+    "fastq-1.9.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.10.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
-        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz";
+        sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==";
       };
     };
     "faye-websocket-0.10.0" = {
@@ -4657,13 +4703,13 @@ let
         sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A==";
       };
     };
-    "follow-redirects-1.13.1" = {
+    "follow-redirects-1.13.0" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.13.1";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz";
-        sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz";
+        sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==";
       };
     };
     "for-in-1.0.2" = {
@@ -4702,15 +4748,6 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
-    "fraction.js-4.0.13" = {
-      name = "fraction.js";
-      packageName = "fraction.js";
-      version = "4.0.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz";
-        sha512 = "E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA==";
-      };
-    };
     "fragment-cache-0.2.1" = {
       name = "fragment-cache";
       packageName = "fragment-cache";
@@ -4738,15 +4775,6 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
-    "fromentries-1.3.2" = {
-      name = "fromentries";
-      packageName = "fromentries";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz";
-        sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==";
-      };
-    };
     "fs-extra-2.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -4801,13 +4829,13 @@ let
         sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==";
       };
     };
-    "fs-extra-9.1.0" = {
+    "fs-extra-9.0.1" = {
       name = "fs-extra";
       packageName = "fs-extra";
-      version = "9.1.0";
+      version = "9.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz";
-        sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz";
+        sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==";
       };
     };
     "fs-minipass-1.2.7" = {
@@ -4864,13 +4892,13 @@ let
         sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
       };
     };
-    "fsevents-2.3.1" = {
+    "fsevents-2.2.1" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "2.3.1";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz";
-        sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz";
+        sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==";
       };
     };
     "function-bind-1.1.1" = {
@@ -4909,13 +4937,13 @@ let
         sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
-    "get-intrinsic-1.0.2" = {
+    "get-intrinsic-1.0.1" = {
       name = "get-intrinsic";
       packageName = "get-intrinsic";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
-        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
+        sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
       };
     };
     "get-own-enumerable-property-symbols-3.0.2" = {
@@ -4954,15 +4982,6 @@ let
         sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==";
       };
     };
-    "get-stream-6.0.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz";
-        sha512 = "A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==";
-      };
-    };
     "get-value-2.0.6" = {
       name = "get-value";
       packageName = "get-value";
@@ -5053,13 +5072,13 @@ let
         sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
       };
     };
-    "globby-11.0.2" = {
+    "globby-11.0.1" = {
       name = "globby";
       packageName = "globby";
-      version = "11.0.2";
+      version = "11.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz";
-        sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==";
+        url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz";
+        sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==";
       };
     };
     "globby-6.1.0" = {
@@ -5350,13 +5369,13 @@ let
         sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==";
       };
     };
-    "html-entities-1.4.0" = {
+    "html-entities-1.3.1" = {
       name = "html-entities";
       packageName = "html-entities";
-      version = "1.4.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz";
-        sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==";
+        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz";
+        sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==";
       };
     };
     "html-minifier-terser-5.1.1" = {
@@ -5440,13 +5459,13 @@ let
         sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==";
       };
     };
-    "http-parser-js-0.5.3" = {
+    "http-parser-js-0.5.2" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.5.3";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz";
-        sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz";
+        sha512 = "opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==";
       };
     };
     "http-proxy-1.17.0" = {
@@ -5503,13 +5522,13 @@ let
         sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     };
-    "human-signals-2.1.0" = {
+    "human-signals-1.1.1" = {
       name = "human-signals";
       packageName = "human-signals";
-      version = "2.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz";
-        sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==";
+        url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz";
+        sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==";
       };
     };
     "i-0.3.6" = {
@@ -5602,13 +5621,13 @@ let
         sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
       };
     };
-    "import-fresh-3.3.0" = {
+    "import-fresh-3.2.2" = {
       name = "import-fresh";
       packageName = "import-fresh";
-      version = "3.3.0";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz";
-        sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
+        sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
       };
     };
     "import-local-2.0.0" = {
@@ -5683,13 +5702,13 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.8" = {
+    "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.8";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
     "inquirer-6.2.0" = {
@@ -5782,13 +5801,13 @@ let
         sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
       };
     };
-    "is-arguments-1.1.0" = {
+    "is-arguments-1.0.4" = {
       name = "is-arguments";
       packageName = "is-arguments";
-      version = "1.1.0";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz";
-        sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==";
+        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz";
+        sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -6007,13 +6026,13 @@ let
         sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==";
       };
     };
-    "is-negative-zero-2.0.1" = {
+    "is-negative-zero-2.0.0" = {
       name = "is-negative-zero";
       packageName = "is-negative-zero";
-      version = "2.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
-        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
+        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz";
+        sha1 = "9553b121b0fac28869da9ed459e20c7543788461";
       };
     };
     "is-number-3.0.0" = {
@@ -6052,13 +6071,13 @@ let
         sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==";
       };
     };
-    "is-object-1.0.2" = {
+    "is-object-1.0.1" = {
       name = "is-object";
       packageName = "is-object";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz";
-        sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==";
+        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz";
+        sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
       };
     };
     "is-path-cwd-2.2.0" = {
@@ -6286,13 +6305,13 @@ let
         sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
       };
     };
-    "js-yaml-3.14.1" = {
+    "js-yaml-3.14.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.1";
+      version = "3.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
+        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
       };
     };
     "jsbn-0.1.1" = {
@@ -6754,13 +6773,13 @@ let
         sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==";
       };
     };
-    "lower-case-2.0.2" = {
+    "lower-case-2.0.1" = {
       name = "lower-case";
       packageName = "lower-case";
-      version = "2.0.2";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz";
-        sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==";
+        url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz";
+        sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==";
       };
     };
     "lowercase-keys-1.0.1" = {
@@ -6799,15 +6818,6 @@ let
         sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
       };
     };
-    "lru-cache-6.0.0" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
-        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
-      };
-    };
     "make-dir-1.3.0" = {
       name = "make-dir";
       packageName = "make-dir";
@@ -7006,31 +7016,31 @@ let
         sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==";
       };
     };
-    "mime-2.5.0" = {
+    "mime-2.4.6" = {
       name = "mime";
       packageName = "mime";
-      version = "2.5.0";
+      version = "2.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
-        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
+        url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz";
+        sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==";
       };
     };
-    "mime-db-1.45.0" = {
+    "mime-db-1.44.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.45.0";
+      version = "1.44.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
-        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
       };
     };
-    "mime-types-2.1.28" = {
+    "mime-types-2.1.27" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.28";
+      version = "2.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
-        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -7294,13 +7304,13 @@ let
         sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
       };
     };
-    "nanoid-3.1.20" = {
+    "nanoid-3.1.18" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "3.1.20";
+      version = "3.1.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz";
-        sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz";
+        sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -7348,13 +7358,13 @@ let
         sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
       };
     };
-    "no-case-3.0.4" = {
+    "no-case-3.0.3" = {
       name = "no-case";
       packageName = "no-case";
-      version = "3.0.4";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz";
-        sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==";
+        url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz";
+        sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==";
       };
     };
     "node-elm-compiler-5.0.4" = {
@@ -7393,13 +7403,13 @@ let
         sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==";
       };
     };
-    "node-releases-1.1.70" = {
+    "node-releases-1.1.67" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.70";
+      version = "1.1.67";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz";
-        sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz";
+        sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==";
       };
     };
     "node-watch-0.5.5" = {
@@ -7519,6 +7529,15 @@ let
         sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==";
       };
     };
+    "num2fraction-1.2.2" = {
+      name = "num2fraction";
+      packageName = "num2fraction";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz";
+        sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
+      };
+    };
     "number-is-nan-1.0.1" = {
       name = "number-is-nan";
       packageName = "number-is-nan";
@@ -7555,13 +7574,13 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-inspect-1.9.0" = {
+    "object-inspect-1.8.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.9.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
-        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
+        sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
       };
     };
     "object-is-1.1.4" = {
@@ -7699,13 +7718,13 @@ let
         sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==";
       };
     };
-    "open-7.3.1" = {
+    "open-7.3.0" = {
       name = "open";
       packageName = "open";
-      version = "7.3.1";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.3.1.tgz";
-        sha512 = "f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==";
+        url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz";
+        sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==";
       };
     };
     "opn-5.4.0" = {
@@ -7726,6 +7745,15 @@ let
         sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==";
       };
     };
+    "opn-6.0.0" = {
+      name = "opn";
+      packageName = "opn";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz";
+        sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==";
+      };
+    };
     "optimize-css-assets-webpack-plugin-5.0.3" = {
       name = "optimize-css-assets-webpack-plugin";
       packageName = "optimize-css-assets-webpack-plugin";
@@ -7951,13 +7979,13 @@ let
         sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==";
       };
     };
-    "param-case-3.0.4" = {
+    "param-case-3.0.3" = {
       name = "param-case";
       packageName = "param-case";
-      version = "3.0.4";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz";
-        sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==";
+        url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz";
+        sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==";
       };
     };
     "parent-module-1.0.1" = {
@@ -7996,13 +8024,13 @@ let
         sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
       };
     };
-    "parse-json-5.2.0" = {
+    "parse-json-5.1.0" = {
       name = "parse-json";
       packageName = "parse-json";
-      version = "5.2.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz";
-        sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==";
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz";
+        sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -8023,13 +8051,13 @@ let
         sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==";
       };
     };
-    "pascal-case-3.1.2" = {
+    "pascal-case-3.1.1" = {
       name = "pascal-case";
       packageName = "pascal-case";
-      version = "3.1.2";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz";
-        sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==";
+        url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz";
+        sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==";
       };
     };
     "pascalcase-0.1.1" = {
@@ -8338,13 +8366,13 @@ let
         sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
       };
     };
-    "postcss-8.2.4" = {
+    "postcss-8.1.10" = {
       name = "postcss";
       packageName = "postcss";
-      version = "8.2.4";
+      version = "8.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz";
-        sha512 = "kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz";
+        sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==";
       };
     };
     "postcss-calc-7.0.5" = {
@@ -8707,13 +8735,13 @@ let
         sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
       };
     };
-    "pretty-bytes-5.5.0" = {
+    "pretty-bytes-5.4.1" = {
       name = "pretty-bytes";
       packageName = "pretty-bytes";
-      version = "5.5.0";
+      version = "5.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz";
-        sha512 = "p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==";
+        url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz";
+        sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA==";
       };
     };
     "pretty-error-2.1.2" = {
@@ -9211,13 +9239,13 @@ let
         sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
-    "regexp.prototype.flags-1.3.1" = {
+    "regexp.prototype.flags-1.3.0" = {
       name = "regexp.prototype.flags";
       packageName = "regexp.prototype.flags";
-      version = "1.3.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz";
-        sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==";
+        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz";
+        sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==";
       };
     };
     "regexpu-core-4.7.1" = {
@@ -9256,13 +9284,13 @@ let
         sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
       };
     };
-    "regjsparser-0.6.6" = {
+    "regjsparser-0.6.4" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.6.6";
+      version = "0.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz";
-        sha512 = "jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
+        sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
       };
     };
     "relateurl-0.2.7" = {
@@ -9283,13 +9311,13 @@ let
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "renderkid-2.0.5" = {
+    "renderkid-2.0.4" = {
       name = "renderkid";
       packageName = "renderkid";
-      version = "2.0.5";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz";
-        sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==";
+        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz";
+        sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==";
       };
     };
     "repeat-element-1.1.3" = {
@@ -9733,13 +9761,13 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
-    "semver-7.3.4" = {
+    "semver-7.3.2" = {
       name = "semver";
       packageName = "semver";
-      version = "7.3.4";
+      version = "7.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
-        sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz";
+        sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==";
       };
     };
     "semver-regex-1.0.0" = {
@@ -10876,13 +10904,13 @@ let
         sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1";
       };
     };
-    "ts-debounce-2.2.0" = {
+    "ts-debounce-2.1.0" = {
       name = "ts-debounce";
       packageName = "ts-debounce";
-      version = "2.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-2.2.0.tgz";
-        sha512 = "TsrY1lxPA1XIkF+75pd1XmAVAdjr+dGREi8GhIQvU+kL9Eyr0oCi7jrt11OGe4bLxebxXH5t9RYxbY+fufnfmQ==";
+        url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-2.1.0.tgz";
+        sha512 = "jlrN8iK/Iif5pQd+pIsH8uEexj3vvUT+BwqNrJt5xgZB+ucwVfQVAUMC8Dnx0vlk7AktHxoD9ZDYYVYUtxd5wA==";
       };
     };
     "ts-union-2.3.0" = {
@@ -10903,15 +10931,6 @@ let
         sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
-    "tslib-2.1.0" = {
-      name = "tslib";
-      packageName = "tslib";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz";
-        sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==";
-      };
-    };
     "tsyringe-4.4.0" = {
       name = "tsyringe";
       packageName = "tsyringe";
@@ -11119,6 +11138,15 @@ let
         sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
+    "universalify-1.0.0" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz";
+        sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==";
+      };
+    };
     "universalify-2.0.0" = {
       name = "universalify";
       packageName = "universalify";
@@ -11182,13 +11210,13 @@ let
         sha1 = "4a50875ec5c715d19379799f0590a0e796958f61";
       };
     };
-    "uri-js-4.4.1" = {
+    "uri-js-4.4.0" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.1";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
-        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
+        sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
       };
     };
     "urix-0.1.0" = {
@@ -11362,6 +11390,15 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
+    "vfile-location-3.2.0" = {
+      name = "vfile-location";
+      packageName = "vfile-location";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz";
+        sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==";
+      };
+    };
     "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
@@ -11371,31 +11408,31 @@ let
         sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
       };
     };
-    "vscode-jsonrpc-6.0.0" = {
+    "vscode-jsonrpc-5.0.1" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
-      version = "6.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz";
-        sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==";
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz";
+        sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==";
       };
     };
-    "vscode-languageserver-7.0.0" = {
+    "vscode-languageserver-6.1.1" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
-      version = "7.0.0";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz";
-        sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==";
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz";
+        sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==";
       };
     };
-    "vscode-languageserver-protocol-3.16.0" = {
+    "vscode-languageserver-protocol-3.15.3" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
-      version = "3.16.0";
+      version = "3.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz";
-        sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz";
+        sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==";
       };
     };
     "vscode-languageserver-textdocument-1.0.1" = {
@@ -11407,22 +11444,22 @@ let
         sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==";
       };
     };
-    "vscode-languageserver-types-3.16.0" = {
+    "vscode-languageserver-types-3.15.1" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.16.0";
+      version = "3.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz";
-        sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz";
+        sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==";
       };
     };
-    "vscode-uri-3.0.2" = {
+    "vscode-uri-2.1.2" = {
       name = "vscode-uri";
       packageName = "vscode-uri";
-      version = "3.0.2";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz";
-        sha512 = "jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==";
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz";
+        sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==";
       };
     };
     "watchpack-1.7.5" = {
@@ -11479,13 +11516,13 @@ let
         sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==";
       };
     };
-    "webpack-dev-middleware-3.7.3" = {
+    "webpack-dev-middleware-3.7.2" = {
       name = "webpack-dev-middleware";
       packageName = "webpack-dev-middleware";
-      version = "3.7.3";
+      version = "3.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz";
-        sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==";
+        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz";
+        sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==";
       };
     };
     "webpack-dev-server-3.11.0" = {
@@ -11848,13 +11885,13 @@ let
         sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==";
       };
     };
-    "ws-7.4.2" = {
+    "ws-7.4.0" = {
       name = "ws";
       packageName = "ws";
-      version = "7.4.2";
+      version = "7.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz";
-        sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==";
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz";
+        sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==";
       };
     };
     "xmlbuilder-13.0.2" = {
@@ -11884,22 +11921,22 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-3.2.2" = {
+    "y18n-3.2.1" = {
       name = "y18n";
       packageName = "y18n";
-      version = "3.2.2";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz";
-        sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
+        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "y18n-4.0.1" = {
+    "y18n-4.0.0" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
-        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
     "yallist-2.1.2" = {
@@ -11920,15 +11957,6 @@ let
         sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
-    "yallist-4.0.0" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
-        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
-      };
-    };
     "yaml-1.10.0" = {
       name = "yaml";
       packageName = "yaml";
@@ -12108,8 +12136,8 @@ in
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.4.1"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."minimist-1.2.0"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
@@ -12168,7 +12196,7 @@ in
       sources."typedarray-0.0.6"
       sources."ultron-1.0.2"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -12213,7 +12241,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."binwrap-0.2.2"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -12318,8 +12346,8 @@ in
           sources."yallist-2.1.2"
         ];
       })
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
@@ -12393,7 +12421,7 @@ in
       sources."universalify-0.1.2"
       sources."unzip-stream-0.3.1"
       sources."upgrade-1.1.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."which-1.3.1"
@@ -12412,7 +12440,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."xmlbuilder-13.0.2"
-      sources."y18n-4.0.1"
+      sources."y18n-4.0.0"
       sources."yallist-3.1.1"
       (sources."yargs-15.4.1" // {
         dependencies = [
@@ -12438,10 +12466,10 @@ in
   elm-doc-preview = nodeEnv.buildNodePackage {
     name = "elm-doc-preview";
     packageName = "elm-doc-preview";
-    version = "5.0.5";
+    version = "5.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-5.0.5.tgz";
-      sha512 = "GlWnbw2Bl+pA7QzRlqSYNGEQ3r3oNxMr2Nu0uiCM6AWzQ6Sk3BwtqSiUZvXLLlzWBV9pAQnY9U8xpDpPuh5rOQ==";
+      url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-5.0.3.tgz";
+      sha512 = "j9wli2wOHYiSMARDCRgAZGZ8JkcJqG4rh5+6rSgy5nVGqyXDEN6HCBX/8AhqtKMFKcuCp9ejx04heCaROlb/Eg==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -12453,7 +12481,7 @@ in
       sources."async-limiter-1.0.1"
       sources."balanced-match-1.0.0"
       sources."batch-0.6.1"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -12465,7 +12493,7 @@ in
         ];
       })
       sources."chalk-3.0.0"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."clone-response-1.0.2"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
@@ -12499,7 +12527,7 @@ in
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."get-stream-4.1.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
@@ -12510,7 +12538,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."ini-1.3.8"
+      sources."ini-1.3.5"
       sources."ipaddr.js-1.9.1"
       sources."is-binary-path-2.1.0"
       sources."is-docker-2.1.1"
@@ -12527,8 +12555,8 @@ in
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
@@ -12538,7 +12566,7 @@ in
       sources."normalize-url-4.5.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."p-cancelable-1.1.0"
       sources."package-json-6.5.0"
       sources."parseurl-1.3.3"
@@ -12590,7 +12618,7 @@ in
       sources."vary-1.1.2"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
-      sources."ws-7.4.2"
+      sources."ws-7.4.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -12605,73 +12633,212 @@ in
   "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
     name = "_at_elm-tooling_slash_elm-language-server";
     packageName = "@elm-tooling/elm-language-server";
-    version = "2.0.0";
+    version = "1.13.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.0.0.tgz";
-      sha512 = "1XnQnvuXoGQ6z1gt4VURNtjNzpZ1HBUrUbptMNKZDJS/COW1dVPsXNnXOKROLbMwcJ+UUdBe2onOiWt0hygLTw==";
+      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.13.2.tgz";
+      sha512 = "3bRD+Hut+XPLDY4r0t25tHhfWsXH2UPeruwDfsp/b991AjGpd3HlMNKVAnyu4DD2brUqo6xoHhpp3qTdHPJ2Pw==";
     };
     dependencies = [
-      sources."@nodelib/fs.scandir-2.1.4"
-      sources."@nodelib/fs.stat-2.0.4"
-      sources."@nodelib/fs.walk-1.2.6"
-      sources."anymatch-3.1.1"
+      sources."@nodelib/fs.scandir-2.1.3"
+      sources."@nodelib/fs.stat-2.0.3"
+      sources."@nodelib/fs.walk-1.2.4"
+      sources."accepts-1.3.7"
+      sources."ajv-6.12.6"
+      sources."array-flatten-1.1.1"
       sources."array-union-2.1.0"
-      sources."binary-extensions-2.2.0"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."async-limiter-1.0.1"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.11.0"
+      sources."babel-runtime-6.18.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."body-parser-1.19.0"
       sources."braces-3.0.2"
-      sources."chokidar-3.5.1"
+      sources."bytes-3.1.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.8"
+      sources."concat-stream-1.5.2"
+      sources."content-disposition-0.5.3"
+      sources."content-type-1.0.4"
+      sources."cookie-0.4.0"
+      sources."cookie-signature-1.0.6"
+      sources."core-js-2.6.12"
+      sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
+      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
+      sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
       sources."dir-glob-3.0.1"
+      sources."ecc-jsbn-0.1.2"
+      sources."ee-first-1.1.1"
+      sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf"
+      sources."encodeurl-1.0.2"
+      sources."end-of-stream-1.4.4"
+      sources."escape-html-1.0.3"
       sources."escape-string-regexp-4.0.0"
-      sources."execa-5.0.0"
+      sources."etag-1.8.1"
+      (sources."execa-4.1.0" // {
+        dependencies = [
+          sources."is-stream-2.0.0"
+        ];
+      })
+      sources."express-4.17.1"
+      (sources."express-ws-2.0.0" // {
+        dependencies = [
+          sources."ws-1.1.5"
+        ];
+      })
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.3"
       sources."fast-diff-1.2.0"
-      sources."fast-glob-3.2.5"
-      sources."fastq-1.10.0"
+      sources."fast-glob-3.2.4"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."fastq-1.9.0"
       sources."fill-range-7.0.1"
-      sources."fromentries-1.3.2"
-      sources."fsevents-2.3.1"
-      sources."get-stream-6.0.0"
+      sources."finalhandler-1.1.2"
+      sources."find-0.2.7"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."forwarded-0.1.2"
+      sources."fresh-0.5.2"
+      sources."fs-extra-2.0.0"
+      sources."get-stream-5.2.0"
+      sources."getpass-0.1.7"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.2"
-      sources."human-signals-2.1.0"
+      sources."globby-11.0.1"
+      sources."graceful-fs-4.2.4"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.5"
+      sources."http-errors-1.7.2"
+      sources."http-signature-1.2.0"
+      sources."human-signals-1.1.1"
+      sources."iconv-lite-0.4.24"
       sources."ignore-5.1.8"
-      sources."is-binary-path-2.1.0"
+      sources."inherits-2.0.3"
+      sources."ipaddr.js-1.9.1"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
-      sources."is-stream-2.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-wsl-1.1.0"
+      sources."isarray-1.0.0"
       sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-2.4.0"
+      sources."jsprim-1.4.1"
+      sources."lodash-4.17.20"
+      sources."media-typer-0.3.0"
+      sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
       sources."merge2-1.4.1"
+      sources."methods-1.1.2"
       sources."micromatch-4.0.2"
+      sources."mime-1.6.0"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."mimic-fn-2.1.0"
-      sources."normalize-path-3.0.0"
+      sources."minimist-1.2.5"
+      sources."ms-2.0.0"
+      sources."negotiator-0.6.2"
+      sources."node-watch-0.5.5"
       sources."npm-run-path-4.0.1"
+      sources."oauth-sign-0.9.0"
+      sources."on-finished-2.3.0"
+      sources."once-1.4.0"
       sources."onetime-5.1.2"
+      sources."opn-6.0.0"
+      sources."options-0.0.6"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."parseurl-1.3.3"
       sources."path-key-3.1.1"
+      sources."path-to-regexp-0.1.7"
       sources."path-type-4.0.0"
+      sources."performance-now-2.1.0"
       sources."picomatch-2.2.2"
       sources."pjson-1.0.9"
-      sources."readdirp-3.5.0"
+      sources."process-nextick-args-1.0.7"
+      sources."proxy-addr-2.0.6"
+      sources."psl-1.8.0"
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.7.0"
+      sources."range-parser-1.2.1"
+      sources."raw-body-2.4.0"
+      sources."readable-stream-2.0.6"
       sources."reflect-metadata-0.1.13"
+      sources."regenerator-runtime-0.9.6"
+      (sources."request-2.88.2" // {
+        dependencies = [
+          sources."qs-6.5.2"
+        ];
+      })
       sources."reusify-1.0.4"
       sources."run-parallel-1.1.10"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      sources."setprototypeof-1.1.1"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
       sources."slash-3.0.0"
+      sources."sshpk-1.16.1"
+      sources."statuses-1.5.0"
+      sources."string_decoder-0.10.31"
       sources."strip-final-newline-2.0.0"
+      sources."sums-0.2.4"
+      sources."through2-2.0.1"
+      sources."tmp-0.0.31"
       sources."to-regex-range-5.0.1"
-      sources."ts-debounce-2.2.0"
+      sources."toidentifier-1.0.0"
+      sources."tough-cookie-2.5.0"
+      sources."traverse-chain-0.1.0"
+      sources."ts-debounce-2.1.0"
       sources."tslib-1.14.1"
       sources."tsyringe-4.4.0"
-      sources."vscode-jsonrpc-6.0.0"
-      sources."vscode-languageserver-7.0.0"
-      sources."vscode-languageserver-protocol-3.16.0"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-is-1.6.18"
+      sources."typedarray-0.0.6"
+      sources."ultron-1.0.2"
+      sources."unpipe-1.0.0"
+      sources."uri-js-4.4.0"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."uuid-3.4.0"
+      sources."vary-1.1.2"
+      sources."verror-1.10.0"
+      sources."vscode-jsonrpc-5.0.1"
+      sources."vscode-languageserver-6.1.1"
+      sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-textdocument-1.0.1"
-      sources."vscode-languageserver-types-3.16.0"
-      sources."vscode-uri-3.0.2"
+      sources."vscode-languageserver-types-3.15.1"
+      sources."vscode-uri-2.1.2"
       sources."web-tree-sitter-0.17.1"
       sources."which-2.0.2"
+      sources."wrappy-1.0.2"
+      (sources."ws-3.3.1" // {
+        dependencies = [
+          sources."ultron-1.1.1"
+        ];
+      })
+      sources."xtend-4.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -12696,7 +12863,7 @@ in
       sources."ansi-styles-2.2.1"
       sources."anymatch-3.1.1"
       sources."async-limiter-1.0.1"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."braces-3.0.2"
       sources."chalk-1.1.3"
       sources."charenc-0.0.2"
@@ -12725,9 +12892,9 @@ in
       })
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
-      sources."follow-redirects-1.13.1"
+      sources."follow-redirects-1.13.0"
       sources."fresh-0.5.2"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.2.1"
       sources."get-stream-4.1.0"
       sources."glob-parent-5.1.1"
       sources."has-ansi-2.0.0"
@@ -12820,7 +12987,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."binwrap-0.2.2"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -12829,7 +12996,7 @@ in
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
       sources."chalk-3.0.0"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."chownr-1.1.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
@@ -12851,7 +13018,7 @@ in
       sources."fs-extra-8.1.0"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
@@ -12876,8 +13043,8 @@ in
       sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
       sources."lodash-4.17.20"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
@@ -12918,7 +13085,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."universalify-0.1.2"
       sources."unzip-stream-0.3.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."which-2.0.2"
@@ -12950,7 +13117,7 @@ in
       sources."@types/cacheable-request-6.0.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.10"
       sources."@types/responselike-1.0.0"
       sources."cacheable-lookup-2.0.1"
       sources."cacheable-request-7.0.1"
@@ -12973,15 +13140,14 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
       sources."http-cache-semantics-4.1.0"
-      sources."ini-1.3.8"
-      sources."is-object-1.0.2"
+      sources."ini-1.3.5"
+      sources."is-object-1.0.1"
       sources."isexe-2.0.0"
       sources."isurl-1.0.0"
       sources."json-buffer-3.0.1"
       sources."jsonfile-4.0.0"
       sources."keyv-4.0.3"
       sources."lowercase-keys-2.0.0"
-      sources."lru-cache-6.0.0"
       sources."mimic-response-2.1.0"
       sources."normalize-url-4.5.0"
       sources."npm-conf-1.1.3"
@@ -12996,7 +13162,7 @@ in
       sources."responselike-2.0.0"
       sources."safe-buffer-5.2.1"
       sources."safename-1.0.2"
-      sources."semver-7.3.4"
+      sources."semver-7.3.2"
       sources."to-readable-stream-2.1.0"
       sources."tunnel-agent-0.6.0"
       sources."type-fest-0.10.0"
@@ -13004,7 +13170,6 @@ in
       sources."url-to-options-1.0.1"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
-      sources."yallist-4.0.0"
       sources."yn-4.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -13038,7 +13203,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."binwrap-0.2.2"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -13121,8 +13286,8 @@ in
       sources."jsprim-1.4.1"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.15"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
@@ -13189,7 +13354,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."universalify-0.1.2"
       sources."unzip-stream-0.3.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."which-2.0.1"
@@ -13197,7 +13362,7 @@ in
       sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."xmlbuilder-13.0.2"
-      sources."y18n-4.0.1"
+      sources."y18n-4.0.0"
       sources."yallist-3.1.1"
       sources."yargs-13.3.2"
       sources."yargs-parser-13.1.2"
@@ -13259,44 +13424,44 @@ in
   create-elm-app = nodeEnv.buildNodePackage {
     name = "create-elm-app";
     packageName = "create-elm-app";
-    version = "5.22.0";
+    version = "5.21.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.22.0.tgz";
-      sha512 = "XmYWohoM/xHxFJBPA61MJMqlMcEycBO4gUdtp4mVA6KbIgEV7PTv1UXVFYjTntUNOr5DIxvE1RcqB84rR767Uw==";
+      url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.21.0.tgz";
+      sha512 = "yW7kMk/WyIUZc+OksH+GH8lhOWl129RiJGclJtpnLlmW3IDZYh23bP/e65MxX7BB+7lwi3KSObdbPYfCJf7CuA==";
     };
     dependencies = [
-      sources."@babel/cli-7.12.10"
-      sources."@babel/code-frame-7.12.11"
+      sources."@babel/cli-7.12.8"
+      sources."@babel/code-frame-7.10.4"
       sources."@babel/compat-data-7.12.7"
-      sources."@babel/core-7.12.10"
-      sources."@babel/generator-7.12.11"
-      sources."@babel/helper-annotate-as-pure-7.12.10"
+      sources."@babel/core-7.12.9"
+      sources."@babel/generator-7.12.5"
+      sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
       sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
       sources."@babel/helper-create-regexp-features-plugin-7.12.7"
       sources."@babel/helper-define-map-7.10.5"
       sources."@babel/helper-explode-assignable-expression-7.12.1"
-      sources."@babel/helper-function-name-7.12.11"
-      sources."@babel/helper-get-function-arity-7.12.10"
+      sources."@babel/helper-function-name-7.10.4"
+      sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.12.10"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
       sources."@babel/helper-plugin-utils-7.10.4"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
-      sources."@babel/helper-replace-supers-7.12.11"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
-      sources."@babel/helper-split-export-declaration-7.12.11"
-      sources."@babel/helper-validator-identifier-7.12.11"
-      sources."@babel/helper-validator-option-7.12.11"
+      sources."@babel/helper-split-export-declaration-7.11.0"
+      sources."@babel/helper-validator-identifier-7.10.4"
+      sources."@babel/helper-validator-option-7.12.1"
       sources."@babel/helper-wrap-function-7.12.3"
       sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.11"
-      sources."@babel/plugin-proposal-async-generator-functions-7.12.12"
+      sources."@babel/parser-7.12.7"
+      sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
       sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
@@ -13324,7 +13489,7 @@ in
       sources."@babel/plugin-transform-arrow-functions-7.12.1"
       sources."@babel/plugin-transform-async-to-generator-7.12.1"
       sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
-      sources."@babel/plugin-transform-block-scoping-7.12.12"
+      sources."@babel/plugin-transform-block-scoping-7.12.1"
       sources."@babel/plugin-transform-classes-7.12.1"
       sources."@babel/plugin-transform-computed-properties-7.12.1"
       sources."@babel/plugin-transform-destructuring-7.12.1"
@@ -13346,20 +13511,20 @@ in
       sources."@babel/plugin-transform-property-literals-7.12.1"
       sources."@babel/plugin-transform-regenerator-7.12.1"
       sources."@babel/plugin-transform-reserved-words-7.12.1"
-      sources."@babel/plugin-transform-runtime-7.12.10"
+      sources."@babel/plugin-transform-runtime-7.12.1"
       sources."@babel/plugin-transform-shorthand-properties-7.12.1"
       sources."@babel/plugin-transform-spread-7.12.1"
       sources."@babel/plugin-transform-sticky-regex-7.12.7"
       sources."@babel/plugin-transform-template-literals-7.12.1"
-      sources."@babel/plugin-transform-typeof-symbol-7.12.10"
+      sources."@babel/plugin-transform-typeof-symbol-7.12.1"
       sources."@babel/plugin-transform-unicode-escapes-7.12.1"
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
-      sources."@babel/preset-env-7.12.10"
+      sources."@babel/preset-env-7.12.7"
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.12"
-      sources."@babel/types-7.12.12"
+      sources."@babel/traverse-7.12.9"
+      sources."@babel/types-7.12.7"
       sources."@hapi/address-2.1.4"
       sources."@hapi/bourne-1.3.2"
       sources."@hapi/hoek-8.5.1"
@@ -13370,10 +13535,10 @@ in
       sources."@types/anymatch-1.3.1"
       sources."@types/glob-7.1.3"
       sources."@types/html-minifier-terser-5.1.1"
-      sources."@types/http-proxy-1.17.5"
-      sources."@types/json-schema-7.0.7"
+      sources."@types/http-proxy-1.17.4"
+      sources."@types/json-schema-7.0.6"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.10"
       sources."@types/parse-json-4.0.0"
       sources."@types/q-1.5.4"
       sources."@types/source-list-map-0.1.2"
@@ -13383,12 +13548,12 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.26" // {
+      (sources."@types/webpack-4.41.25" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-sources-2.1.0" // {
+      (sources."@types/webpack-sources-2.0.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -13463,7 +13628,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      sources."autoprefixer-10.1.0"
+      sources."autoprefixer-10.0.4"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."babel-extract-comments-1.0.0"
@@ -13493,7 +13658,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
       sources."binwrap-0.2.2"
       sources."bluebird-3.7.2"
@@ -13526,7 +13691,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.14.7"
       sources."buffer-4.9.2"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
@@ -13536,15 +13701,15 @@ in
       sources."bytes-3.0.0"
       sources."cacache-12.0.4"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
-      sources."camel-case-4.1.2"
+      sources."camel-case-4.1.1"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001161"
       sources."case-sensitive-paths-webpack-plugin-2.3.0"
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
@@ -13554,17 +13719,13 @@ in
         ];
       })
       sources."chardet-0.7.0"
-      (sources."chokidar-3.5.1" // {
+      (sources."chokidar-3.4.3" // {
         dependencies = [
           sources."glob-parent-5.1.1"
         ];
       })
       sources."chownr-1.1.4"
-      (sources."chrome-trace-event-1.0.2" // {
-        dependencies = [
-          sources."tslib-1.14.1"
-        ];
-      })
+      sources."chrome-trace-event-1.0.2"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -13589,12 +13750,10 @@ in
         ];
       })
       sources."cli-cursor-2.1.0"
-      sources."cli-table-0.3.4"
+      sources."cli-table-0.3.1"
       sources."cli-width-2.2.1"
       (sources."cliui-3.2.0" // {
         dependencies = [
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
         ];
       })
@@ -13606,7 +13765,7 @@ in
       sources."color-name-1.1.3"
       sources."color-string-1.5.4"
       sources."colorette-1.2.1"
-      sources."colors-1.4.0"
+      sources."colors-1.0.3"
       sources."combined-stream-1.0.8"
       sources."commander-4.1.1"
       sources."common-tags-1.8.0"
@@ -13643,7 +13802,7 @@ in
         ];
       })
       sources."core-js-2.6.12"
-      (sources."core-js-compat-3.8.3" // {
+      (sources."core-js-compat-3.8.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -13665,19 +13824,17 @@ in
         dependencies = [
           sources."camelcase-6.2.0"
           sources."loader-utils-2.0.0"
-          sources."lru-cache-6.0.0"
-          sources."semver-7.3.4"
-          sources."yallist-4.0.0"
+          sources."semver-7.3.2"
         ];
       })
-      sources."css-select-2.1.0"
+      sources."css-select-1.2.0"
       sources."css-select-base-adapter-0.1.1"
       (sources."css-tree-1.0.0-alpha.37" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      sources."css-what-3.4.2"
+      sources."css-what-2.1.3"
       sources."cssesc-3.0.0"
       sources."cssnano-4.1.10"
       sources."cssnano-preset-default-4.0.7"
@@ -13695,7 +13852,7 @@ in
       sources."cycle-1.0.3"
       sources."cyclist-1.0.1"
       sources."dashdash-1.14.1"
-      sources."debug-4.3.2"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-0.2.2"
@@ -13734,21 +13891,21 @@ in
       sources."dom-converter-0.2.0"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.1.0"
+          sources."domelementtype-2.0.2"
         ];
       })
       sources."domain-browser-1.2.0"
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
-      sources."domutils-1.7.0"
-      sources."dot-case-3.0.4"
+      sources."domutils-1.5.1"
+      sources."dot-case-3.0.3"
       sources."dot-prop-5.3.0"
       sources."dotenv-8.2.0"
       sources."duplexer-0.1.2"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.643"
+      sources."electron-to-chromium-1.3.610"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -13771,19 +13928,19 @@ in
       })
       sources."elm-webpack-loader-6.0.1"
       sources."elmi-to-json-1.3.0"
-      sources."emoji-regex-8.0.0"
+      sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."enhanced-resolve-4.5.0" // {
+      (sources."enhanced-resolve-4.3.0" // {
         dependencies = [
           sources."memory-fs-0.5.0"
         ];
       })
       sources."entities-2.1.0"
-      sources."errno-0.1.8"
+      sources."errno-0.1.7"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
@@ -13910,12 +14067,11 @@ in
       sources."find-up-4.1.0"
       sources."firstline-1.3.1"
       sources."flush-write-stream-1.1.1"
-      sources."follow-redirects-1.13.1"
+      sources."follow-redirects-1.13.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
-      sources."fraction.js-4.0.13"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."from2-2.3.0"
@@ -13924,11 +14080,11 @@ in
       sources."fs-readdir-recursive-1.1.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-1.0.3"
-      sources."get-intrinsic-1.0.2"
+      sources."get-intrinsic-1.0.1"
       sources."get-own-enumerable-property-symbols-3.0.2"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
@@ -13992,7 +14148,7 @@ in
       sources."hsl-regex-1.0.0"
       sources."hsla-regex-1.0.0"
       sources."html-comment-regex-1.1.2"
-      sources."html-entities-1.4.0"
+      sources."html-entities-1.3.1"
       sources."html-minifier-terser-5.1.1"
       sources."html-webpack-plugin-4.5.0"
       (sources."htmlparser2-3.10.1" // {
@@ -14007,7 +14163,7 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      sources."http-parser-js-0.5.3"
+      sources."http-parser-js-0.5.2"
       sources."http-proxy-1.18.1"
       sources."http-proxy-middleware-0.21.0"
       sources."http-signature-1.2.0"
@@ -14034,7 +14190,7 @@ in
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.8"
+      sources."ini-1.3.5"
       (sources."inquirer-6.2.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -14051,7 +14207,7 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-absolute-url-2.1.0"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-arguments-1.1.0"
+      sources."is-arguments-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
@@ -14064,9 +14220,9 @@ in
       sources."is-directory-0.3.1"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-4.0.1"
-      sources."is-negative-zero-2.0.1"
+      sources."is-negative-zero-2.0.0"
       sources."is-number-7.0.0"
       sources."is-obj-2.0.0"
       sources."is-path-cwd-2.2.0"
@@ -14090,7 +14246,7 @@ in
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-3.14.0"
       sources."jsbn-0.1.1"
       sources."jsesc-2.5.2"
       sources."json-parse-better-errors-1.0.2"
@@ -14130,7 +14286,7 @@ in
       sources."lodash.templatesettings-4.2.0"
       sources."lodash.uniq-4.5.0"
       sources."loglevel-1.7.1"
-      sources."lower-case-2.0.2"
+      sources."lower-case-2.0.1"
       sources."lru-cache-5.1.1"
       sources."make-dir-2.1.0"
       sources."map-cache-0.2.2"
@@ -14149,8 +14305,8 @@ in
         ];
       })
       sources."mime-1.6.0"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."mimic-fn-1.2.0"
       (sources."mini-css-extract-plugin-0.12.0" // {
         dependencies = [
@@ -14178,13 +14334,13 @@ in
       sources."mustache-3.2.1"
       sources."mute-stream-0.0.8"
       sources."nan-2.14.2"
-      sources."nanoid-3.1.20"
+      sources."nanoid-3.1.18"
       sources."nanomatch-1.2.13"
       sources."ncp-1.0.1"
       sources."negotiator-0.6.2"
       sources."neo-async-2.6.2"
       sources."nice-try-1.0.5"
-      sources."no-case-3.0.4"
+      sources."no-case-3.0.3"
       (sources."node-elm-compiler-5.0.5" // {
         dependencies = [
           sources."cross-spawn-6.0.5"
@@ -14200,7 +14356,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.67"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."normalize-range-0.1.2"
@@ -14211,6 +14367,7 @@ in
         ];
       })
       sources."nth-check-1.0.2"
+      sources."num2fraction-1.2.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
@@ -14227,7 +14384,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.9.0"
+      sources."object-inspect-1.8.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
@@ -14255,7 +14412,7 @@ in
       sources."p-try-2.2.0"
       sources."pako-1.0.11"
       sources."parallel-transform-1.2.0"
-      sources."param-case-3.0.4"
+      sources."param-case-3.0.3"
       (sources."parent-module-1.0.1" // {
         dependencies = [
           sources."callsites-3.1.0"
@@ -14265,7 +14422,7 @@ in
       sources."parse-json-4.0.0"
       sources."parse-passwd-1.0.0"
       sources."parseurl-1.3.3"
-      sources."pascal-case-3.1.2"
+      sources."pascal-case-3.1.1"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
       sources."path-dirname-1.0.2"
@@ -14331,15 +14488,13 @@ in
       (sources."postcss-loader-4.1.0" // {
         dependencies = [
           sources."cosmiconfig-7.0.0"
-          sources."import-fresh-3.3.0"
+          sources."import-fresh-3.2.2"
           sources."loader-utils-2.0.0"
-          sources."lru-cache-6.0.0"
-          sources."parse-json-5.2.0"
+          sources."parse-json-5.1.0"
           sources."path-type-4.0.0"
           sources."resolve-from-4.0.0"
           sources."schema-utils-3.0.0"
-          sources."semver-7.3.4"
-          sources."yallist-4.0.0"
+          sources."semver-7.3.2"
         ];
       })
       (sources."postcss-merge-longhand-4.0.11" // {
@@ -14431,7 +14586,7 @@ in
       })
       (sources."postcss-safe-parser-5.0.2" // {
         dependencies = [
-          sources."postcss-8.2.4"
+          sources."postcss-8.1.10"
           sources."source-map-0.6.1"
         ];
       })
@@ -14444,13 +14599,17 @@ in
       sources."postcss-unique-selectors-4.0.1"
       sources."postcss-value-parser-4.1.0"
       sources."prepend-http-1.0.4"
-      sources."pretty-bytes-5.5.0"
+      sources."pretty-bytes-5.4.1"
       sources."pretty-error-2.1.2"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
       sources."promise-8.1.0"
       sources."promise-inflight-1.0.1"
-      sources."prompt-1.0.0"
+      (sources."prompt-1.0.0" // {
+        dependencies = [
+          sources."colors-1.4.0"
+        ];
+      })
       sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
@@ -14533,17 +14692,21 @@ in
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.1"
+      (sources."regexp.prototype.flags-1.3.0" // {
+        dependencies = [
+          sources."es-abstract-1.17.7"
+        ];
+      })
       sources."regexpu-core-4.7.1"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.6" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
       })
       sources."relateurl-0.2.7"
       sources."remove-trailing-separator-1.1.0"
-      (sources."renderkid-2.0.5" // {
+      (sources."renderkid-2.0.4" // {
         dependencies = [
           sources."strip-ansi-3.0.1"
         ];
@@ -14571,11 +14734,7 @@ in
       sources."ripemd160-2.0.2"
       sources."run-async-2.4.1"
       sources."run-queue-1.0.3"
-      (sources."rxjs-6.6.3" // {
-        dependencies = [
-          sources."tslib-1.14.1"
-        ];
-      })
+      sources."rxjs-6.6.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -14718,7 +14877,11 @@ in
       sources."stream-shift-1.0.1"
       sources."strict-uri-encode-1.1.0"
       sources."string-replace-loader-2.3.0"
-      sources."string-width-4.2.0"
+      (sources."string-width-1.0.2" // {
+        dependencies = [
+          sources."strip-ansi-3.0.1"
+        ];
+      })
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
@@ -14746,7 +14909,13 @@ in
         ];
       })
       sources."supports-color-5.5.0"
-      sources."svgo-1.3.2"
+      (sources."svgo-1.3.2" // {
+        dependencies = [
+          sources."css-select-2.1.0"
+          sources."css-what-3.4.2"
+          sources."domutils-1.7.0"
+        ];
+      })
       sources."tapable-1.1.3"
       sources."tar-4.4.13"
       (sources."temp-0.9.4" // {
@@ -14791,7 +14960,7 @@ in
       sources."toidentifier-1.0.0"
       sources."tough-cookie-2.5.0"
       sources."traverse-0.3.9"
-      sources."tslib-2.1.0"
+      sources."tslib-1.14.1"
       sources."tty-browserify-0.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -14850,7 +15019,7 @@ in
       })
       sources."unzip-stream-0.3.1"
       sources."upath-1.2.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -14880,6 +15049,7 @@ in
       sources."vary-1.1.2"
       sources."vendors-1.0.4"
       sources."verror-1.10.0"
+      sources."vfile-location-3.2.0"
       sources."vm-browserify-1.1.2"
       sources."watchpack-1.7.5"
       (sources."watchpack-chokidar2-2.0.1" // {
@@ -14913,9 +15083,9 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      (sources."webpack-dev-middleware-3.7.3" // {
+      (sources."webpack-dev-middleware-3.7.2" // {
         dependencies = [
-          sources."mime-2.5.0"
+          sources."mime-2.4.6"
         ];
       })
       (sources."webpack-dev-server-3.11.0" // {
@@ -14930,7 +15100,6 @@ in
               sources."strip-ansi-5.2.0"
             ];
           })
-          sources."emoji-regex-7.0.3"
           sources."extend-shallow-2.0.1"
           sources."fill-range-4.0.0"
           sources."find-up-3.0.0"
@@ -14989,7 +15158,6 @@ in
       (sources."winston-2.1.1" // {
         dependencies = [
           sources."async-1.0.0"
-          sources."colors-1.0.3"
           sources."pkginfo-0.3.1"
         ];
       })
@@ -15016,8 +15184,6 @@ in
       sources."worker-farm-1.7.0"
       (sources."wrap-ansi-2.1.0" // {
         dependencies = [
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
         ];
       })
@@ -15025,16 +15191,13 @@ in
       sources."ws-6.2.1"
       sources."xmlbuilder-15.1.1"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.1"
+      sources."y18n-4.0.0"
       sources."yallist-3.1.1"
       sources."yaml-1.10.0"
       (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."y18n-3.2.2"
+          sources."y18n-3.2.1"
         ];
       })
       (sources."yargs-parser-4.2.1" // {
@@ -15068,7 +15231,7 @@ in
       sources."chalk-4.1.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."commander-6.2.1"
+      sources."commander-6.2.0"
       sources."concat-map-0.0.1"
       sources."cross-spawn-6.0.5"
       sources."find-elm-dependencies-2.0.4"
@@ -15112,10 +15275,10 @@ in
   elm-review = nodeEnv.buildNodePackage {
     name = "elm-review";
     packageName = "elm-review";
-    version = "2.4.0";
+    version = "2.3.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-review/-/elm-review-2.4.0.tgz";
-      sha512 = "UXxXpmMi7/pbWGbUPB3WKEmylaANH53x/fsLj9YT742l2LBLsQxa6Y3k9RmOG+Sy6JP+njAnODi/irDBwYfh7g==";
+      url = "https://registry.npmjs.org/elm-review/-/elm-review-2.3.3.tgz";
+      sha512 = "1TiTnEXzpzACrc/JdB3tvmgNf5Qd0RyX8wbBqPPuc1aWvHHvPf6wi/ncz1gcILFAObr1zquCePkJkoW0uoZiBA==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -15123,8 +15286,9 @@ in
       sources."@types/cacheable-request-6.0.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.10"
       sources."@types/responselike-1.0.0"
+      sources."ajv-6.12.6"
       (sources."ansi-escapes-4.3.1" // {
         dependencies = [
           sources."type-fest-0.11.0"
@@ -15133,15 +15297,28 @@ in
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."binary-0.3.0"
+      sources."binary-extensions-2.1.0"
+      sources."binwrap-0.2.2"
+      sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
+      sources."buffers-0.1.1"
       sources."cacheable-lookup-2.0.1"
       sources."cacheable-request-7.0.1"
+      sources."caseless-0.12.0"
+      sources."chainsaw-0.1.0"
       sources."chalk-4.1.0"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
+      sources."chownr-1.1.4"
       sources."cli-cursor-3.1.0"
       sources."cli-spinners-2.5.0"
       sources."clone-1.0.4"
@@ -15152,7 +15329,9 @@ in
       })
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
+      sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
       (sources."cross-spawn-promise-0.10.2" // {
         dependencies = [
@@ -15162,28 +15341,42 @@ in
           sources."which-1.3.1"
         ];
       })
-      sources."debug-4.3.2"
+      sources."dashdash-1.14.1"
+      sources."debug-4.3.1"
       sources."decompress-response-5.0.0"
       sources."defaults-1.0.3"
       sources."defer-to-connect-2.0.0"
+      sources."delayed-stream-1.0.0"
       sources."duplexer3-0.1.4"
-      sources."elm-tooling-1.0.2"
+      sources."ecc-jsbn-0.1.2"
+      sources."elm-json-0.2.8"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."escape-string-regexp-1.0.5"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.3"
+      sources."fast-json-stable-stringify-2.1.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."folder-hash-3.3.3"
-      sources."fs-extra-9.1.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fs-extra-9.0.1"
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."get-stream-5.2.0"
+      sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."got-10.7.0"
       sources."graceful-fs-4.2.4"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.5"
       sources."has-flag-4.0.0"
       sources."http-cache-semantics-4.1.0"
+      sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
@@ -15192,12 +15385,24 @@ in
       sources."is-glob-4.0.1"
       sources."is-interactive-1.0.0"
       sources."is-number-7.0.0"
+      sources."is-typedarray-1.0.0"
       sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
       sources."json-buffer-3.0.1"
-      sources."jsonfile-6.1.0"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
+      sources."jsprim-1.4.1"
       sources."keyv-4.0.3"
       sources."kleur-3.0.3"
       sources."locate-path-5.0.0"
+      sources."lodash-4.17.20"
       (sources."log-symbols-3.0.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
@@ -15210,15 +15415,25 @@ in
       })
       sources."lowercase-keys-2.0.0"
       sources."lru-cache-4.1.5"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."mimic-fn-2.1.0"
       sources."mimic-response-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
+      (sources."minipass-2.9.0" // {
+        dependencies = [
+          sources."yallist-3.1.1"
+        ];
+      })
+      sources."minizlib-1.3.3"
       sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
+      sources."mustache-3.2.1"
       sources."mute-stream-0.0.8"
       sources."normalize-path-3.0.0"
       sources."normalize-url-4.5.0"
+      sources."oauth-sign-0.9.0"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       (sources."ora-4.1.1" // {
@@ -15236,28 +15451,52 @@ in
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
+      sources."performance-now-2.1.0"
       sources."picomatch-2.2.2"
       sources."prompts-2.4.0"
       sources."pseudomap-1.0.2"
+      sources."psl-1.8.0"
       sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
       sources."readdirp-3.5.0"
+      sources."request-2.88.2"
+      sources."request-promise-4.2.6"
+      sources."request-promise-core-1.1.4"
       sources."responselike-2.0.0"
       sources."restore-cursor-3.1.0"
       sources."rimraf-2.6.3"
+      sources."safe-buffer-5.2.1"
+      sources."safer-buffer-2.1.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
       sources."sisteransi-1.0.5"
+      sources."sshpk-1.16.1"
+      sources."stealthy-require-1.1.1"
       sources."string-width-4.2.0"
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
       sources."supports-hyperlinks-2.1.0"
+      (sources."tar-4.4.13" // {
+        dependencies = [
+          sources."yallist-3.1.1"
+        ];
+      })
       sources."temp-0.9.4"
       sources."terminal-link-2.1.1"
       sources."to-readable-stream-2.1.0"
       sources."to-regex-range-5.0.1"
+      sources."tough-cookie-2.5.0"
+      sources."traverse-0.3.9"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
       sources."type-fest-0.10.0"
-      sources."universalify-2.0.0"
+      sources."universalify-1.0.0"
+      sources."unzip-stream-0.3.1"
+      sources."uri-js-4.4.0"
+      sources."uuid-3.4.0"
+      sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
       sources."which-2.0.2"
       sources."wrap-ansi-6.2.0"
diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix
index baacee29ff2..b565c6d2f5d 100644
--- a/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/development/misc/google-clasp/node-packages.nix b/pkgs/development/misc/google-clasp/node-packages.nix
index d8d15d54a8b..a58f58e05c6 100644
--- a/pkgs/development/misc/google-clasp/node-packages.nix
+++ b/pkgs/development/misc/google-clasp/node-packages.nix
@@ -1,34 +1,34 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@nodelib/fs.scandir-2.1.4" = {
+    "@nodelib/fs.scandir-2.1.3" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.4";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz";
-        sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
+        sha512 = "07zn0jp8b7nrrpkxwx715n68ncr51xiyz46j8g1fdvy07cr3s60npwhds1difzwdgz762zwirirppmc5dwl5pdqmww1m0zp15hv0sbq";
       };
     };
-    "@nodelib/fs.stat-2.0.4" = {
+    "@nodelib/fs.stat-2.0.3" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.4";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz";
-        sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
+        sha512 = "2n8008qx9kqgxsgsd22r2xrkm56nwsnwjfws9s4jjmbrk4gz8vfhdw7vp70kn59mqfihkdks6s0101javrpfi7hg8l0qk3nwjp4a03d";
       };
     };
-    "@nodelib/fs.walk-1.2.6" = {
+    "@nodelib/fs.walk-1.2.4" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.6";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz";
-        sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
+        sha512 = "2nsw6dfpkrkm8pxp2d9jlva5mnwqfzssj9r3xlyvrybb26xvjjkw7c0jvfilz08xvvgaanjxvqz6ycqh35avnqwg8mns39biqwmfpym";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -37,7 +37,7 @@ let
       version = "0.14.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz";
-        sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==";
+        sha512 = "0nvckjkw0vk0vs1c689m143ml2ibm8cd3h8pc5ncq4lnm0k6c7vki57paf57s16k4wf7xi2mg7a1qw3vsrjq9q6kq7s4d83bpvi7lgl";
       };
     };
     "@szmarczak/http-timer-1.1.2" = {
@@ -46,16 +46,25 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz";
-        sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
+        sha512 = "148vnx878hajsqb1aimsqg8wz9kja37pmfrf7ac501q2rci4v3cwwar8z3425pnd6pwvsinymy5qmc6gp2j1pw8g2idwk67pifpd02w";
       };
     };
-    "@types/glob-7.1.3" = {
+    "@types/events-3.0.0" = {
+      name = "_at_types_slash_events";
+      packageName = "@types/events";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
+        sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi";
+      };
+    };
+    "@types/glob-7.1.1" = {
       name = "_at_types_slash_glob";
       packageName = "@types/glob";
-      version = "7.1.3";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz";
-        sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==";
+        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
+        sha512 = "3dhbgdkzpgx010hfgkhndrb094kbd3z6s4waicihnl0rp3jk0f0gs8vvzi84xzissrhml1dfgvbdhahzbh75nny1g6429fnqvlp866l";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -64,16 +73,16 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
-        sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
+        sha512 = "2ff7lcgph45bp2v5zsaxcy00rbh5n5h4njbicwhqilz66pd1lw7xfrpfl4i4ppfcx78zg9cp582b5fjif0dg7r18m44vxfksslvlyml";
       };
     };
-    "@types/node-14.14.22" = {
+    "@types/node-13.9.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.22";
+      version = "13.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
-        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz";
+        sha512 = "2linpd9l89509ib4fbfw2pwgybl5wb23w9cxfxw9vmpbqhklappmlhfg89znkpajqbpvjl40z0srmmwyivdw40zczighzz58qvkm8qk";
       };
     };
     "abort-controller-3.0.0" = {
@@ -82,25 +91,25 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz";
-        sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==";
+        sha512 = "1x70yq0brkpbwyss5m5z3q41f4w6wf2pp1xdy31q49kwshyvmxadwdzwb53vdhbx1sfkzrrf864xswgkc44wl7kvv8qjrcwsvr51jc7";
       };
     };
-    "agent-base-6.0.2" = {
+    "agent-base-6.0.0" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "6.0.2";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz";
-        sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz";
+        sha512 = "2mlsi3nqlanwznzfz3dgmwv412vs83liaiifwqkh671z6j5s1qc7giv90s6dya7dmv9rrxsj0v3zkd9w2fgmpb0mqqf0dxa41qknm4g";
       };
     };
-    "aggregate-error-3.1.0" = {
+    "aggregate-error-3.0.1" = {
       name = "aggregate-error";
       packageName = "aggregate-error";
-      version = "3.1.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz";
-        sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==";
+        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz";
+        sha512 = "00ccx66xcda4wlic1naxckbz0vbzyp0wrcj1wd5dqlr08n264s7c00i4dbq41fnq9b6ip7w1j9n3qyg2kd8hwpfd76i5z3xqrg1msma";
       };
     };
     "ansi-escapes-3.2.0" = {
@@ -109,7 +118,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
-        sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
+        sha512 = "12pp3q4c44hrzr2xl9vqjigwjn2wr1j0lhvshl75z5m6a97hqkd047sdcma1inzjvxhpkzk1qkvag7cw3sya32s9wsfasr6xsnnj63h";
       };
     };
     "ansi-regex-3.0.0" = {
@@ -127,7 +136,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+        sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm";
       };
     };
     "ansi-styles-3.2.1" = {
@@ -136,7 +145,7 @@ let
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
       };
     };
     "array-differ-3.0.0" = {
@@ -145,7 +154,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz";
-        sha512 = "THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==";
+        sha512 = "0r28zgr6s5xc89py7m7slvhh08whrm0bg278byz4218hgw6gd11dc6hpirl0jgblv8n2h55vqixfpmsfqv2l8c0r0zw3d4a5rhmyysc";
       };
     };
     "array-union-2.1.0" = {
@@ -154,7 +163,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz";
-        sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==";
+        sha512 = "35whnhqnw23y121ilf8kl79pyqb9bjsg32gsazzlmww9zgk22c5jycf0vlkpsnp67rqw05hhw97hxw216hpnm6bxa620lyqwjhb2v0w";
       };
     };
     "arrify-2.0.1" = {
@@ -163,7 +172,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz";
-        sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==";
+        sha512 = "2xd8y87g4h0dfnifdci7lhbx35fjxaxrdmcb80kgxahcrqqpnykfkmxxgvpmrfjc7l4rxwk3k81l7n903gk1047idm4rwxwv3189nyx";
       };
     };
     "balanced-match-1.0.0" = {
@@ -175,22 +184,22 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base64-js-1.5.1" = {
+    "base64-js-1.3.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.5.1";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
-        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+        sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q";
       };
     };
-    "bignumber.js-9.0.1" = {
+    "bignumber.js-7.2.1" = {
       name = "bignumber.js";
       packageName = "bignumber.js";
-      version = "9.0.1";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz";
-        sha512 = "IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==";
+        url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz";
+        sha512 = "1sxpshc5qga6sjamj8h1jlswqv7fh7ixr77hbg9x07cwkr19n7vn7a76189gh2003d0p07i2iappgjyfg53bjxzf68iyc3c9q3g71ab";
       };
     };
     "brace-expansion-1.1.11" = {
@@ -199,7 +208,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
       };
     };
     "braces-3.0.2" = {
@@ -208,7 +217,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
-        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
+        sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -226,16 +235,7 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz";
-        sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==";
-      };
-    };
-    "call-bind-1.0.2" = {
-      name = "call-bind";
-      packageName = "call-bind";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
-        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
+        sha512 = "214hpw087zbwnf1naz9184bbz0gn773j70jjvfj0vd7lll2i62j58606l281sz3dngjlhb2v5j00rnqy94y3yhwxmbyda62cc0dqg9s";
       };
     };
     "chalk-2.4.2" = {
@@ -244,7 +244,7 @@ let
       version = "2.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
-        sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
+        sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j";
       };
     };
     "chardet-0.7.0" = {
@@ -253,7 +253,7 @@ let
       version = "0.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz";
-        sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
+        sha512 = "1qg04aw34n3l68g6s6li7pfdspkj3zmb7qsqf096h19jwc34mv8sbhik4xcx9aazys1ycb5k736f4lql46s0rhl361pmlz1r86j4gwr";
       };
     };
     "clean-stack-2.2.0" = {
@@ -262,7 +262,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz";
-        sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==";
+        sha512 = "3a11z08fhd0c5rib496gi10xdi7al80hqy8y4r3zpckaqwgmm9iaarm5arkjr1rwlfg6yk8kics0h1qqqd0x8f5028y44wkfvs85n71";
       };
     };
     "cli-cursor-2.1.0" = {
@@ -280,16 +280,16 @@ let
       version = "0.2.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/cli-spinner/-/cli-spinner-0.2.10.tgz";
-        sha512 = "U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q==";
+        sha512 = "3ysg16xq4z00px0j02wqkmsj8znxkw3bs3vx8v56xz7gbxg31by6h7vh2g0hqnfrg2f3rpmr873q862ljfbh64hsvi25ga9w91i4jsk";
       };
     };
-    "cli-width-2.2.1" = {
+    "cli-width-2.2.0" = {
       name = "cli-width";
       packageName = "cli-width";
-      version = "2.2.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz";
-        sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==";
+        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz";
+        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
       };
     };
     "clone-response-1.0.2" = {
@@ -307,7 +307,7 @@ let
       version = "1.9.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
-        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+        sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21";
       };
     };
     "color-name-1.1.3" = {
@@ -325,7 +325,7 @@ let
       version = "2.20.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
-        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
+        sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s";
       };
     };
     "concat-map-0.0.1" = {
@@ -337,13 +337,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "debug-4.3.2" = {
+    "debug-4.1.1" = {
       name = "debug";
       packageName = "debug";
-      version = "4.3.2";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
+        sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055";
       };
     };
     "decompress-response-3.3.0" = {
@@ -361,7 +361,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
-        sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
+        sha512 = "1aidgab75g8sx8hi5491l2y5k4aag4j6f55kbmyapvyy4hmqdmvh0asr9p8bz2710awqak65jym8w00k6brb1a8v19zc7mcicv9v16h";
       };
     };
     "define-properties-1.1.3" = {
@@ -370,7 +370,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
-        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
+        sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw";
       };
     };
     "del-5.1.0" = {
@@ -379,7 +379,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz";
-        sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==";
+        sha512 = "2fc139fcwy724dim9b5m6b6880q0s716r00ycmd8j13fhwasfrghks9w6mwzyqgvq0c4sgiadqixdv906pmp26xihyklwz7a4wp2zy0";
       };
     };
     "dir-glob-3.0.1" = {
@@ -388,7 +388,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz";
-        sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
+        sha512 = "0h761rklv8qk0vhv6ms98gsvdiyk8455iqqh6wh8dfal5xjx87gmmpyg7773zdrxwvhnzw58pan4rdqjfwkhcv653gsbq4is6kxcjjs";
       };
     };
     "dns-packet-5.2.1" = {
@@ -397,25 +397,25 @@ let
       version = "5.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.2.1.tgz";
-        sha512 = "JHj2yJeKOqlxzeuYpN1d56GfhzivAxavNwHj9co3qptECel27B1rLY5PifJAvubsInX5pGLDjAHuCfCUc2Zv/w==";
+        sha512 = "3znyrkkjkq0kvh1ik1n597rflifrrmy83r8jkwf5mmivv3nx44l96xa6z5gbqq16ypic0xg723rz8g7bpfs967brmqsjflajz4gcy14";
       };
     };
-    "dns-socket-4.2.1" = {
+    "dns-socket-4.2.0" = {
       name = "dns-socket";
       packageName = "dns-socket";
-      version = "4.2.1";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.1.tgz";
-        sha512 = "fNvDq86lS522+zMbh31X8cQzYQd6xumCNlxsuZF5TKxQThF/e+rJbVM6K8mmlsdcSm6yNjKJQq3Sf38viAJj8g==";
+        url = "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.0.tgz";
+        sha512 = "2nqakl6510w3f70ia79lms1y0njjggg2dpp2937qh04bjfkvh179fbizkhy9mxs1hg3d4jbds0aj23wpa4qmnziirvip3mw7pgq6yz1";
       };
     };
-    "dotf-1.5.3" = {
+    "dotf-1.5.0" = {
       name = "dotf";
       packageName = "dotf";
-      version = "1.5.3";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dotf/-/dotf-1.5.3.tgz";
-        sha512 = "hYztBLJ6AoY0GO5qNDy+MH8lNZavrAkVqrfvv9sQSImDo553JRLRjMre11EW4ZPRg8Y4Uha7qwqiMJQDVXxVqg==";
+        url = "https://registry.npmjs.org/dotf/-/dotf-1.5.0.tgz";
+        sha512 = "3b4bpb8nr856zyfi210cp77js41mpq4mvks3qq1xrq8gyamzy41cxy12kis2qyxhbfl34vi3ycb8jhg3g3pn78m1xiwvbfj93776i5p";
       };
     };
     "duplexer3-0.1.4" = {
@@ -433,7 +433,7 @@ let
       version = "1.0.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz";
-        sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==";
+        sha512 = "1qianmi7icfcsfp04wpjqrf9fg9s0l3s8189a5s25494h9zvqf4mx72b7gwiynwpvv1yb3hrg5mklp8dn5287h9j7xdnv1b2vfjba4x";
       };
     };
     "ellipsize-0.1.0" = {
@@ -451,16 +451,16 @@ let
       version = "1.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz";
-        sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
+        sha512 = "3jyw0a0c7m1yxglwk7i5jh8zb3vvx7f9l4frbskxkgf9cyf4i8ww26p8bimnsryrh1dx7lwrxq64vbpjwfcv1svd4lg8m07fa53bv7s";
       };
     };
-    "es-abstract-1.18.0-next.2" = {
+    "es-abstract-1.17.4" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.18.0-next.2";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
-        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -469,7 +469,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
+        sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -487,7 +487,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz";
-        sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==";
+        sha512 = "1czwwj9g33wdi578wfrx6cfs8fmh6yvjrpk620d415f4fiajm084fylyqywq45rc4mf7vrnrr6879c097akbgjf158yrzmkfip9gzcb";
       };
     };
     "exec-sh-0.2.2" = {
@@ -496,7 +496,7 @@ let
       version = "0.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz";
-        sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==";
+        sha512 = "01xwgxaanmd0h0i1pvqy0fk6sqxmab59mjww1mzj3dc25zzrw4z7n7rcl5wd1y7s38lvgcg815qc700kw36ipd42jsf8vji7lkh518l";
       };
     };
     "extend-3.0.2" = {
@@ -505,7 +505,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
-        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+        sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
       };
     };
     "external-editor-3.1.0" = {
@@ -514,34 +514,34 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz";
-        sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==";
+        sha512 = "1xm0arqcf7jp9kgq1g67ss2jvj8kblzbb7dd7sj2gm1g8cj4ilcwnn8vwspz3rh83yjphbl1lvqdyivrji6ccmnp3k2rmk9gl4kii44";
       };
     };
-    "fast-glob-3.2.5" = {
+    "fast-glob-3.2.2" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.5";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
-        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz";
+        sha512 = "3n0a23s3nq6f339d9hw9mw4plbzcdmglhzm09w7azz5fb34xiw60rhhhsvcvqw8c86h3ryfvmk1k624jlf36w3wrrijjhrfivd7qdah";
       };
     };
-    "fast-text-encoding-1.0.3" = {
+    "fast-text-encoding-1.0.1" = {
       name = "fast-text-encoding";
       packageName = "fast-text-encoding";
-      version = "1.0.3";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz";
-        sha512 = "dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==";
+        url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz";
+        sha512 = "04pv2mmlav6kal13gnqyh44v5ikdv2myqr9higzdiwcp2i0nlk9807hiwwgd59xksrxcmnp7c60q6avhycsiigj4mnx9k7pmj0l90f7";
       };
     };
-    "fastq-1.10.0" = {
+    "fastq-1.6.1" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.10.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
-        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz";
+        sha512 = "0vr0q4q5s3glb32wlf6a2c58iixn3mqi4l7bqly16v32krfhh2mj2d5mna93fmjanjdk0h25m30xjx3anmw5297cdvyifcqqbk0g4ls";
       };
     };
     "figures-2.0.0" = {
@@ -559,7 +559,7 @@ let
       version = "7.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
-        sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
+        sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8";
       };
     };
     "find-up-4.1.0" = {
@@ -568,7 +568,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
-        sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
+        sha512 = "2bi4wmj1qymhj4ap1nay5isn0w7x6ymxp30h5y1jv0hx7q0inmirmr09mn621h4alg0gpv2hjwl6ai2giw6pz7qvb85aqizsh0v14ry";
       };
     };
     "fs-extra-8.1.0" = {
@@ -577,7 +577,7 @@ let
       version = "8.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz";
-        sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==";
+        sha512 = "3i4dsx067a564yx62qy0gz15zvsihqybmmx56lqz4cbgh4fiv5ikrj53wa1rfcijlnkywx18az05m1541dm04gb51af57561s0506fa";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -595,7 +595,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
       };
     };
     "fuzzy-0.1.3" = {
@@ -607,13 +607,13 @@ let
         sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8";
       };
     };
-    "gaxios-2.3.4" = {
+    "gaxios-2.3.2" = {
       name = "gaxios";
       packageName = "gaxios";
-      version = "2.3.4";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz";
-        sha512 = "US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA==";
+        url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.2.tgz";
+        sha512 = "23w1hwvfpjhg7rllvid6w45irrya9qhxaffx2xm0pzy822jrbnm40pmg375dyx1wqrw73n613xnpc9aj6w982h12gd10a9gnp5skzrb";
       };
     };
     "gcp-metadata-2.0.4" = {
@@ -622,16 +622,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-2.0.4.tgz";
-        sha512 = "p1lXhJvcKvJHWfQXhkd4Za1kyXRsGZA0JH7Cjs07W9hrg84d/j5tqQhbGewlSLx9gNyuQUid69uLux48YbggLg==";
-      };
-    };
-    "get-intrinsic-1.0.2" = {
-      name = "get-intrinsic";
-      packageName = "get-intrinsic";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
-        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
+        sha512 = "0p21f317hgbp2yvxfflhhdfvj07vg284pn1jnq8m5nkxzhxrs1npn2v7g6qxhky4hs906bcfk4n9bb5g13qc5zlb53z4anwkf25fnd7";
       };
     };
     "get-stream-4.1.0" = {
@@ -640,16 +631,16 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
-        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
+        sha512 = "3pwlllj9naaqzlc5axbxz4jqg3v533xd9jz945mjd3zmca3hh3pr1dpwc7416kjszw6igk060v6x2dgwpr7m1rd4djavmvr8bhavihq";
       };
     };
-    "get-stream-5.2.0" = {
+    "get-stream-5.1.0" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "5.2.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz";
-        sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz";
+        sha512 = "21v525x0f3qrc6f343xp3wjwwrjf1l3x0lmp34hivvvmdcz0a681s0b9wx4k5r3r8jyhc5kd6dqrwqjhpbl285xg333gkgbxhagayhi";
       };
     };
     "glob-7.1.6" = {
@@ -658,16 +649,16 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
       };
     };
-    "glob-parent-5.1.1" = {
+    "glob-parent-5.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.1.1";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
-        sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
+        sha512 = "23qivv79xv6rvb8fsi8hj0ic91ijfkw6dynzp8716bzafazq27dqc9ibxxlkfs7wqnhyzzimaa3xn8i22838ds157kyg60mfa152fxa";
       };
     };
     "globby-10.0.2" = {
@@ -676,7 +667,7 @@ let
       version = "10.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz";
-        sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==";
+        sha512 = "151032pigk461rknfg3y4n80dcxsl597vl4hqkz4ylb620zzbh45bn3zl4lc8brn0klvjpqs2lfi79p9gvs6zybdbqkz8f23gnj5mgd";
       };
     };
     "google-auth-library-4.2.6" = {
@@ -685,7 +676,7 @@ let
       version = "4.2.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-4.2.6.tgz";
-        sha512 = "oJ6tCA9rbsYeIVY+mcLPFHa2hatz3XO6idYIrlI/KhhlMxZrO3tKyU8O2Pxu5KnSBBP7Wj4HtbM1LLKngNFaFw==";
+        sha512 = "0bmmlc0lyr2qddknl3kwnpv2c2d5ag4dvydh3jgr557nfvb2qrna61a7x9aw26ni6x77pbkmf2vcxhlrz19jgjn44gccvkb1w4av7m0";
       };
     };
     "google-p12-pem-2.0.4" = {
@@ -694,7 +685,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.4.tgz";
-        sha512 = "S4blHBQWZRnEW44OcR7TL9WR+QCqByRvhNDZ/uuQfpxywfupikf/miba8js1jZi6ZOGv5slgSuoshCWh6EMDzg==";
+        sha512 = "3706hz8l4jq8b7a99hckrmgw5jbm64d6lxz5ni6kbzlg2m9zg0p573yj3mzxnfhhipj81xa03wr3m9gscg723lfbg21jr8n2hffb1jb";
       };
     };
     "googleapis-40.0.1" = {
@@ -703,7 +694,7 @@ let
       version = "40.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/googleapis/-/googleapis-40.0.1.tgz";
-        sha512 = "B6qZVCautOOspEhru9GZ814I+ztkGWyA4ZEUfaXwXHBruX/HAWqedbsuUEx1w3nCECywK/FLTNUdcbH9zpaMaw==";
+        sha512 = "1mqr5nfznqp27fm9i5z2axh5h8c4yf3fm650bmvfng6l0f7gywnnw2wy2jps54iw606q6b47gxhhppkk78vnss8ljnf7d5f4ra9kah7";
       };
     };
     "googleapis-common-2.0.4" = {
@@ -712,7 +703,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-2.0.4.tgz";
-        sha512 = "8RRkxr24v1jIKCC1onFWA8RGnwFV55m3Qpil9DLX1yLc9e5qvOJsRoDOhhD2e7jFRONYEhT/BzT8vJZANqSr9w==";
+        sha512 = "3vsp91n82bbrz1l0zzi84jqwd2cbf3vyq88dkl08rnf5g3axvsxq8npswrg99cq8avrkrsm06gldi03arqs5d905345igxqpp36857i";
       };
     };
     "got-9.6.0" = {
@@ -721,16 +712,16 @@ let
       version = "9.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz";
-        sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
+        sha512 = "3whcjwqag287wncrji9r9bi3jv8ynkn1hpwdqghqdf8fms01xrjfsaf3z27k14kfjy55aa8gmfbx3nymxgpjd1vi9q8q6gfsnk9dds7";
       };
     };
-    "graceful-fs-4.2.4" = {
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.4";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
-        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
       };
     };
     "gtoken-3.0.2" = {
@@ -739,7 +730,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/gtoken/-/gtoken-3.0.2.tgz";
-        sha512 = "BOBi6Zz31JfxhSHRZBIDdbwIbOPyux10WxJHdx8wz/FMP1zyN1xFrsAWsgcLe5ww5v/OZu/MePUEZAjgJXSauA==";
+        sha512 = "2w9lx15w046817mg36fyrnfzzk3173v1c3v45n0mr2mqdzjbhzlrwfg60gpfiqjbds1vfzjwdn0ig3m0c969l91hpqrgm7pkkln5q04";
       };
     };
     "has-1.0.3" = {
@@ -748,7 +739,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
-        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+        sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz";
       };
     };
     "has-flag-3.0.0" = {
@@ -766,7 +757,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
-        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
+        sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw";
       };
     };
     "http-cache-semantics-4.1.0" = {
@@ -775,7 +766,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
-        sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==";
+        sha512 = "1qvqr3inc283iggn9x9wwiv1zb634i5zmlh8dnl2c5n4czaf2yibs4dncrgxfg7zrdfkcali22mvys4pgyhmfqjb57b91qlay9czaki";
       };
     };
     "https-proxy-agent-5.0.0" = {
@@ -784,7 +775,7 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz";
-        sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==";
+        sha512 = "1n8bc76isd6i45f468ydmgdl77xp7k226d38ij8z6d79b5xjm0fq07bqbsgd914wdd4ld2n4cz3wjm655qvglhwpffnhl0a2zj2cihj";
       };
     };
     "iconv-lite-0.4.24" = {
@@ -793,16 +784,16 @@ let
       version = "0.4.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+        sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
       };
     };
-    "ignore-5.1.8" = {
+    "ignore-5.1.4" = {
       name = "ignore";
       packageName = "ignore";
-      version = "5.1.8";
+      version = "5.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz";
-        sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==";
+        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz";
+        sha512 = "3q41bskh27g3dd95nqaf3lg1ck1iv1dbb6hhzg1jqlkk6j80q5sxb4i3n4k6rfw5nmnvrflaxvi281c7cv2ljlsxip6skb4m14x8dik";
       };
     };
     "indent-string-4.0.0" = {
@@ -811,7 +802,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz";
-        sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==";
+        sha512 = "3172bpzypayzfssbv1vi2anfh58k8bib049cd8m3fy1cvc480k43jnfq45i24acki0kbm54pfcn63pvqrngzsxj5f4frn00xrkc7l0i";
       };
     };
     "inflight-1.0.6" = {
@@ -838,7 +829,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
       };
     };
     "inquirer-6.5.2" = {
@@ -847,7 +838,7 @@ let
       version = "6.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz";
-        sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
+        sha512 = "1qz47j4jjik343ic5fx92q3jv1mfspj9ka574l6jbxr0mh8w1as4945qnl70m5v6rrgxcw64lg0p27j4bx3mfgfp0i1vf11k03nayvj";
       };
     };
     "inquirer-autocomplete-prompt-1.0.1" = {
@@ -856,7 +847,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.0.1.tgz";
-        sha512 = "Y4V6ifAu9LNrNjcEtYq8YUKhrgmmufUn5fsDQqeWgHY8rEO6ZAQkNUiZtBm2kw2uUQlC9HdgrRCHDhTPPguH5A==";
+        sha512 = "3j8f2ryrwa0x1qhmmh7gx22158sw3cknqcv96a86lj08r5s8fn3qxl0jskl40zvwlkzbfd616pa2hk1pj5ba11p6rmv7x1fy24pm1b3";
       };
     };
     "ip-1.1.5" = {
@@ -868,22 +859,22 @@ let
         sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
       };
     };
-    "ip-regex-4.3.0" = {
+    "ip-regex-4.1.0" = {
       name = "ip-regex";
       packageName = "ip-regex";
-      version = "4.3.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz";
-        sha512 = "B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==";
+        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz";
+        sha512 = "0q6z0axsvzqxwaxmspfj4gv06ndlwybjvj5rm928fwh4bj9wwdbkh4kn4cz6a3lrw7662zk2mcpxx9zdvkr9j6jskzz2k82p2jxkad4";
       };
     };
-    "is-callable-1.2.2" = {
+    "is-callable-1.1.5" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.2.2";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
-        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
+        sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi";
       };
     };
     "is-date-object-1.0.2" = {
@@ -892,7 +883,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
+        sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai";
       };
     };
     "is-extglob-2.1.1" = {
@@ -919,7 +910,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
-        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+        sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4";
       };
     };
     "is-ip-3.1.0" = {
@@ -928,16 +919,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz";
-        sha512 = "35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==";
-      };
-    };
-    "is-negative-zero-2.0.1" = {
-      name = "is-negative-zero";
-      packageName = "is-negative-zero";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
-        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
+        sha512 = "3shj9n4j2lm2ls8bzxgfcj28jad9ci5bdy3pmdvgqr7zrbgpaiw9i03qg3p9l4myp3y4vnn42gidb3s07v7gqsknhib4fwwfzkdv6yz";
       };
     };
     "is-number-7.0.0" = {
@@ -946,16 +928,16 @@ let
       version = "7.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
-        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
+        sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73";
       };
     };
-    "is-online-8.5.1" = {
+    "is-online-8.2.1" = {
       name = "is-online";
       packageName = "is-online";
-      version = "8.5.1";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-online/-/is-online-8.5.1.tgz";
-        sha512 = "RKyTQx/rJqw2QOXHwy7TmXdlkpe0Hhj7GBsr6TQJaj4ebNOfameZCMspU5vYbwBBzJ2brWArdSvNVox6T6oCTQ==";
+        url = "https://registry.npmjs.org/is-online/-/is-online-8.2.1.tgz";
+        sha512 = "1hmzlq6v9pq270smya3b58h7g47k6ib733nf6q2qw0b4pia3zz0680knvr5gqs449smlhja5mzzyizbwhbdbrsy1p2gyvrnjbiyk7gk";
       };
     };
     "is-path-cwd-2.2.0" = {
@@ -964,7 +946,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz";
-        sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==";
+        sha512 = "0aws7clcb9cyvvb4430df9fhfnpg9bl1n07ymzp7jdzia0bvjg25gyd39xp2xhgkgpkqazw8csglblifdql0rpj4kfwg1r26xnkdpn3";
       };
     };
     "is-path-inside-3.0.2" = {
@@ -973,16 +955,25 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz";
-        sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==";
+        sha512 = "1b02q8dp20gbph14ccd8fd9cm9kmxvqncp92j49c7bfnraidy0m27ic454xrza7iyhfz147d5jz1qwfqz8g0wabsqlardi650yhcrgz";
       };
     };
-    "is-regex-1.1.1" = {
+    "is-promise-2.1.0" = {
+      name = "is-promise";
+      packageName = "is-promise";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    };
+    "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.1.1";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
-        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
+        sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy";
       };
     };
     "is-stream-2.0.0" = {
@@ -991,7 +982,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
-        sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
+        sha512 = "09j5ybpil7bgiffzq9gw66svm3rrgx634aghkwyslbdx382iqpy991cf3kwfk2jh9bi8fjz5wa996wsjwmq21lzz5svgbsld7wk4ajw";
       };
     };
     "is-symbol-1.0.3" = {
@@ -1000,7 +991,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
+        sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v";
       };
     };
     "is-wsl-1.1.0" = {
@@ -1012,13 +1003,13 @@ let
         sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
       };
     };
-    "json-bigint-0.3.1" = {
+    "json-bigint-0.3.0" = {
       name = "json-bigint";
       packageName = "json-bigint";
-      version = "0.3.1";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.1.tgz";
-        sha512 = "DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ==";
+        url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz";
+        sha1 = "0ccd912c4b8270d05f056fbd13814b53d3825b1e";
       };
     };
     "json-buffer-3.0.0" = {
@@ -1039,13 +1030,13 @@ let
         sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
       };
     };
-    "jsonfile-6.1.0" = {
+    "jsonfile-6.0.1" = {
       name = "jsonfile";
       packageName = "jsonfile";
-      version = "6.1.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz";
-        sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz";
+        sha512 = "038bg8hpg0xbzfcas7llqd4fn4mimcr0xfl7azcsi3kqrra3x0lbrn1dvq0nh082ik799mnj1z4i9hl5myc6znbp87g5nnxzvk9n7cd";
       };
     };
     "jwa-1.4.1" = {
@@ -1054,7 +1045,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz";
-        sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==";
+        sha512 = "10ayxzbvjd8a52s9dzlxbvjqab1fchaq0vfvj7smqp0gyp0v4v731rdsapsbwvvxib4xjpk0ksg1kbs3c9qi1cy02a5442433zxf8ma";
       };
     };
     "jws-3.2.2" = {
@@ -1063,7 +1054,7 @@ let
       version = "3.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz";
-        sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==";
+        sha512 = "0fb9ijf27cljn3nlj1r7xvqjzz71pbrpavhxmvqapb219f31v7ikrdlphxbdxdbaw2fplmlqj5yqx35zxy3qlivb1jkjcd53q45jyb0";
       };
     };
     "keyv-3.1.0" = {
@@ -1072,7 +1063,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz";
-        sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
+        sha512 = "1a1q61z26z860lq8pvcbaz1fii1ipafnk7iab6zs7dqijwiq8mr83cnh1h30jird29s2q4345gszcs3fg48kv6g7i5gydwjivzhjagp";
       };
     };
     "locate-path-5.0.0" = {
@@ -1081,16 +1072,16 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
-        sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
+        sha512 = "3r6llra9imfvg31342986kfkzm34ficva43avn7cng5inb9f5xrnr64jm4pykjjjbjs9np0mhia370ysnf97w4m6jqgnniyjbv71f5p";
       };
     };
-    "lodash-4.17.20" = {
+    "lodash-4.17.15" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.20";
+      version = "4.17.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
-        sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+        sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk";
       };
     };
     "lowercase-keys-1.0.1" = {
@@ -1099,7 +1090,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
+        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
       };
     };
     "lowercase-keys-2.0.0" = {
@@ -1108,7 +1099,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz";
-        sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==";
+        sha512 = "2c8fy71cr597nqfq7savid5rdk1msa2pcvxkn504w8bksci9vpm7x3a9yy87zc1lb5chzqnii12rd1h0jpc8k3kxy2c787w5snmg8xn";
       };
     };
     "lru-cache-5.1.1" = {
@@ -1117,7 +1108,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
-        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
+        sha512 = "3vjhn04mjkxbkfb4fh7xnlghlgmqffqp5i1w2vg1ndgh5izv7nwvr8lq1n1hypfs5pm3bvbk7wf3fjm2pavld1hipz0n8rp012l14ra";
       };
     };
     "merge-1.2.1" = {
@@ -1126,16 +1117,16 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz";
-        sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==";
+        sha512 = "2yh381iph3hr5c720br83iwv18hncwqhqgp9ilnl3dgblm2s7p36skfcqlbv6xqkf6lmlf9h638gb75ds0b3wy2pvwdi1jnzvh6hcan";
       };
     };
-    "merge2-1.4.1" = {
+    "merge2-1.3.0" = {
       name = "merge2";
       packageName = "merge2";
-      version = "1.4.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz";
-        sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==";
+        url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz";
+        sha512 = "1inz1swib3crzbwlqrpy74dhmn520qgzg5lkfmm3k1334lpb98d0xjpa6ydpdgwnp013j1n5m2yqkac4r75w6lbcj94hfj1v40h6gns";
       };
     };
     "micromatch-4.0.2" = {
@@ -1144,16 +1135,16 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz";
-        sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==";
+        sha512 = "3jiz9pr94hycvjgzxbxi0jfz7n142n3z5w14im7i0088lymjpvj8xrapr8s66xcp13ylh374hbpm9ixp8rln55n7lrcll6c4qfnkcfb";
       };
     };
-    "mime-2.5.0" = {
+    "mime-2.4.4" = {
       name = "mime";
       packageName = "mime";
-      version = "2.5.0";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
-        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
+        url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz";
+        sha512 = "0c4qs0w88nqz2v7441rw9bbsgrsh50cifwmqm2i7c96yz2ncdy35cb5g42zhr6z0wmqqcwq5la04nnf1n4y3zncvgyg8b721hvnc71d";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -1162,7 +1153,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
+        sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd";
       };
     };
     "mimic-response-1.0.1" = {
@@ -1171,7 +1162,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz";
-        sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
+        sha512 = "32nwz24nh1f2nbpk8i638ff8hsg1ajmc6746abkssjr951z28362k5a92dd1cfr7bd1l9f507cn0pbam04ixfgsaygskv87g6v1r4cg";
       };
     };
     "minimatch-3.0.4" = {
@@ -1180,7 +1171,16 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
     "minimist-1.2.5" = {
@@ -1189,16 +1189,16 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
       };
     };
-    "mkdirp-0.5.5" = {
+    "mkdirp-0.5.1" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.5";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
-        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
     "ms-2.1.2" = {
@@ -1207,7 +1207,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
       };
     };
     "multimatch-4.0.0" = {
@@ -1216,7 +1216,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz";
-        sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==";
+        sha512 = "02j464lazavd58a1qw29i6lj1g4rkilw7clssc5dp3pmkac528qpi95aazwdqqypsdk4338lqkz6mmbixh68x6w8jxsikxmvkpv2fcl";
       };
     };
     "mute-stream-0.0.7" = {
@@ -1228,22 +1228,22 @@ let
         sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
-    "node-fetch-2.6.1" = {
+    "node-fetch-2.6.0" = {
       name = "node-fetch";
       packageName = "node-fetch";
-      version = "2.6.1";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz";
-        sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==";
+        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz";
+        sha512 = "0s2drvlvgsan0f7cs66kbxxhqj4c399kf35h0jaya2v5syck1afzsx0pbyrlvpncg6ch93r5m88gcz5s3bvp59rm1ig2zm3kcgvilgi";
       };
     };
-    "node-forge-0.9.2" = {
+    "node-forge-0.9.1" = {
       name = "node-forge";
       packageName = "node-forge";
-      version = "0.9.2";
+      version = "0.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz";
-        sha512 = "naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw==";
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.1.tgz";
+        sha512 = "2yn7gwj5adkc0156lv28w32q7mj2ln5af006cvgs9qdf72qnzga4j4fknvbiislxp9xk1ikld3ylrhn3vwqbvrm0y682vsjvr16b90v";
       };
     };
     "normalize-url-4.5.0" = {
@@ -1252,16 +1252,16 @@ let
       version = "4.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz";
-        sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==";
+        sha512 = "02k93b4vrh4rvz479dc5rjv43v54pzz5k5kn21cx6gl2b1c45s3sb29cy4cyifvfl9zqghs9m1f5kcv0hp4cwp8sigyqx9i6p5kpkns";
       };
     };
-    "object-inspect-1.9.0" = {
+    "object-inspect-1.7.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.9.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
-        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb";
       };
     };
     "object-keys-1.1.1" = {
@@ -1270,16 +1270,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
-        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
+        sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n";
       };
     };
-    "object.assign-4.1.2" = {
+    "object.assign-4.1.0" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
-        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
+        sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv";
       };
     };
     "once-1.4.0" = {
@@ -1306,7 +1306,7 @@ let
       version = "6.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz";
-        sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==";
+        sha512 = "0da91ydfkavxd733v8b3bvcrp681xirng4nyrazinl5bc2y3aacjd2g1bnapmzpp7g85bk42qh064hclbflj7jrkg94gvq5z1aafmr0";
       };
     };
     "os-tmpdir-1.0.2" = {
@@ -1324,7 +1324,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-any/-/p-any-2.1.0.tgz";
-        sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg==";
+        sha512 = "0p0ndn153xzq9szwxrshsvfl0g14jhj3rjn6svhrq2r3a0yhsbjc9a95q3a3xpbr8xzmyrv3s1467pvz86n7s7bmf684b81ldqi2094";
       };
     };
     "p-cancelable-1.1.0" = {
@@ -1333,7 +1333,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz";
-        sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
+        sha512 = "2bmkd9ncr81p8w6jy9v676ajg9q27znbjk80r723ydvf8gxk000q13693dhbd22dcagrmhwyjxblmm8w4xnfn6ng5srpkkqwv2dggdk";
       };
     };
     "p-cancelable-2.0.0" = {
@@ -1342,7 +1342,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz";
-        sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==";
+        sha512 = "0va49l2crhr6kr1lgbrjc69hz9scdrarzbrzpvddkfdb9wdr16bv48qajb2m0n6fjammxhvj68d4r35wyfy209rnajfv6nccq7dgwy2";
       };
     };
     "p-finally-1.0.0" = {
@@ -1354,13 +1354,13 @@ let
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-limit-2.3.0" = {
+    "p-limit-2.2.2" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.3.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
-        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
+        sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q";
       };
     };
     "p-locate-4.1.0" = {
@@ -1369,7 +1369,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
-        sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
+        sha512 = "3n0ljmpk3p2j4aaz345w5gkqr128xkhflcb83k75fgns5ddd4bpx7l0q50w9kwy5792xb8d3dpf8bwgzif3463spf3140rhzmkmkgs7";
       };
     };
     "p-map-3.0.0" = {
@@ -1378,7 +1378,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz";
-        sha512 = "d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==";
+        sha512 = "32jjm4kiyqvq9n9z6x2zwd31ylcwil7qq1mzq7gcx7qf9n7jqs9b1zvh1c6rxhcjshqchchq2gpc1fbf1ph6yfj16zfbcvz65arfykp";
       };
     };
     "p-some-4.1.0" = {
@@ -1387,7 +1387,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-some/-/p-some-4.1.0.tgz";
-        sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g==";
+        sha512 = "3baac22g5wchcsla36c7f1h69g658kvp05vb4vk0j04i714j8h09f7a18q9s81d2r05hz5a9wcy9g5ri69rgj5l9rmf06dsp8hwfprh";
       };
     };
     "p-timeout-3.2.0" = {
@@ -1396,7 +1396,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz";
-        sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
+        sha512 = "03cbpzps5mxhlp6hywp92mnnrj4b6ag82f8vdqyz59xrxsrpn58qbh8nzrpiix2asj2d333i81aq0pw9bhki4yw7yf05hr04x9k04mf";
       };
     };
     "p-try-2.2.0" = {
@@ -1405,7 +1405,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+        sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7";
       };
     };
     "path-0.12.7" = {
@@ -1423,7 +1423,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
-        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
+        sha512 = "3zvnv1dp30y10br2qy98z8760jssvps6g9swamdclgxsmhm14dyq0yacrj0d4mk915qhr1z0yh8l3dyd68wn7h7bgv8d39vjk5m0kva";
       };
     };
     "path-is-absolute-1.0.1" = {
@@ -1441,16 +1441,16 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";
-        sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
+        sha512 = "2zw0czk4p8vimrxap6mlnw17lbjrhisby3z1m2j0qdhjcnxlv9lk5d8yxirrqy4ax6ar5qx14rpshmbpvzg9b4mnpzy03aclvqrncl0";
       };
     };
-    "picomatch-2.2.2" = {
+    "picomatch-2.2.1" = {
       name = "picomatch";
       packageName = "picomatch";
-      version = "2.2.2";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
-        sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz";
+        sha512 = "12a2jzmkj24c6k3x71z0knzflw9qqhqx0lk27nrryjs6m7gjmszvgz5pp29xx1h7h7xxaj8cl3i5h98hlx3mpif5h26qdjhrh1ml811";
       };
     };
     "pluralize-8.0.0" = {
@@ -1459,7 +1459,7 @@ let
       version = "8.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz";
-        sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==";
+        sha512 = "048n73397ya45yj4w1pkxy058nkpkzgqcfv89xb3nqs9fi2227kndyi2qhcqzs90zlmkq5jl86kp6iy09kskq5qgm9zkkc7ki7wik9m";
       };
     };
     "prepend-http-2.0.0" = {
@@ -1480,13 +1480,13 @@ let
         sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
       };
     };
-    "public-ip-4.0.3" = {
+    "public-ip-3.2.0" = {
       name = "public-ip";
       packageName = "public-ip";
-      version = "4.0.3";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/public-ip/-/public-ip-4.0.3.tgz";
-        sha512 = "IofiJJWoZ8hZHBk25l4ozLvcET0pjZSxocbUfh4sGkjidMOm4iZNzzWxezGqGsVY7HuxiK7SkyJKHNeT0YQ7uw==";
+        url = "https://registry.npmjs.org/public-ip/-/public-ip-3.2.0.tgz";
+        sha512 = "1prlx3m3fp1d3qh4wxmc9j54fvnq0svqjv5hw4kjiwl45wh0day6xnbv3wscz25ii7g4ksdiysndprcljhwzf1127himkkrvsivh6hc";
       };
     };
     "pump-3.0.0" = {
@@ -1495,16 +1495,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
-        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
+        sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
       };
     };
-    "qs-6.9.6" = {
+    "qs-6.9.1" = {
       name = "qs";
       packageName = "qs";
-      version = "6.9.6";
+      version = "6.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz";
-        sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz";
+        sha512 = "343mpmbfcwx584cqi6siamc4m9z7ljzikmkvgsjm1kncmi1ci4b9k7k9li1gm2l694zxh38l216m0clzivcb4km61vzdjxz4kyvn68b";
       };
     };
     "recursive-readdir-2.2.2" = {
@@ -1513,7 +1513,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz";
-        sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==";
+        sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x";
       };
     };
     "responselike-1.0.2" = {
@@ -1540,7 +1540,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz";
-        sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==";
+        sha512 = "37z410bxpvfjlxmd0rfrzmvd4dl33kqqgi51xp8hbbxxwzdddy5q1b20x9msvqhxvhj93w85fr2hlizsi7rfx91j3gcyzdpqvrwgnak";
       };
     };
     "rimraf-3.0.2" = {
@@ -1549,43 +1549,43 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz";
-        sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==";
+        sha512 = "0h97b8bvn1w87brifdhlnq9qnjxm0pmw87igc4fvvcfzx3h83shp3fszy2k09ff5q44zk1i1c34rjbcryamsak67x7m2600k4qhk695";
       };
     };
-    "run-async-2.4.1" = {
+    "run-async-2.4.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.4.1";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz";
-        sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz";
+        sha512 = "2k7xr99g0l8qvqzd66mpwp3wylfay2i27dh5ca3bmr92l5yixlk0dh53z9ljvyrm3mi7jz89il8gq55sgdv8d8p0v96wbkvyy3xp564";
       };
     };
-    "run-parallel-1.1.10" = {
+    "run-parallel-1.1.9" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.10";
+      version = "1.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz";
-        sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
+        sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc";
       };
     };
-    "rxjs-6.6.3" = {
+    "rxjs-6.5.4" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.6.3";
+      version = "6.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz";
-        sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz";
+        sha512 = "3nzzg67sr57cc5n1065xsxjgrwa405bgbgqm9l8w01lnr660cy8zdjk99hm2n0did4kd75nwiz3843mfbrw7bs100n7g8q4r1fi18wx";
       };
     };
-    "safe-buffer-5.2.1" = {
+    "safe-buffer-5.2.0" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.2.1";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
-        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
+        sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -1594,16 +1594,16 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
       };
     };
-    "signal-exit-3.0.3" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.3";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
-        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "slash-3.0.0" = {
@@ -1612,7 +1612,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz";
-        sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==";
+        sha512 = "3cj4cvlh36f0h6f3dslbkwa3y9nnny8qmwbf4kw3xy8vfbg5mypknds3j2cdhf7xg82hm8smdl8cq88xn4nyw1b9677xjwvly2kbm43";
       };
     };
     "split-lines-2.0.0" = {
@@ -1621,7 +1621,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz";
-        sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA==";
+        sha512 = "2cbq8cchi0fyxiqvfppd5nxc33zkv62my7cmhh82yfxf83w62bkxsz2ax6adanq2x7j9hhxz63k7wb6f315wkzramzix45ipa2iv8l1";
       };
     };
     "string-width-2.1.1" = {
@@ -1630,34 +1630,34 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
-    "string.prototype.padend-3.1.1" = {
+    "string.prototype.padend-3.1.0" = {
       name = "string.prototype.padend";
       packageName = "string.prototype.padend";
-      version = "3.1.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz";
-        sha512 = "eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==";
+        url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz";
+        sha512 = "1l02s91pznws3jzzip0dkcpj5vb41p716rcnw5msglxjyxg87ycmxjvj94bwiy0rklnmbgj4dk981m50q8w32y8iwcw39yxazq2z8nx";
       };
     };
-    "string.prototype.trimend-1.0.3" = {
-      name = "string.prototype.trimend";
-      packageName = "string.prototype.trimend";
-      version = "1.0.3";
+    "string.prototype.trimleft-2.1.1" = {
+      name = "string.prototype.trimleft";
+      packageName = "string.prototype.trimleft";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
-        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca";
       };
     };
-    "string.prototype.trimstart-1.0.3" = {
-      name = "string.prototype.trimstart";
-      packageName = "string.prototype.trimstart";
-      version = "1.0.3";
+    "string.prototype.trimright-2.1.1" = {
+      name = "string.prototype.trimright";
+      packageName = "string.prototype.trimright";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
-        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -1675,7 +1675,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
-        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
+        sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f";
       };
     };
     "strip-bom-4.0.0" = {
@@ -1684,7 +1684,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz";
-        sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==";
+        sha512 = "39mszh7y7d23gk9n6hz9h26hj7f0yr4gdgl5804gflghmz6qi56gqkzv51x65jhw1vyixfih8h09777d6dz0qknvyi0h4kdzqban6yz";
       };
     };
     "supports-color-5.5.0" = {
@@ -1693,7 +1693,7 @@ let
       version = "5.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
-        sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
+        sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2";
       };
     };
     "through-2.3.8" = {
@@ -1711,7 +1711,7 @@ let
       version = "0.0.33";
       src = fetchurl {
         url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
-        sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
+        sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
       };
     };
     "to-readable-stream-1.0.0" = {
@@ -1720,7 +1720,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz";
-        sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==";
+        sha512 = "38v92prncngfq4yfdn3frpy3j9x6bslii3spk436f0fhs6ls7gydxp23lrwjkd3f21s7zkn4j1zzp8lqrajsrgqlikkxk3s3dfbkb92";
       };
     };
     "to-regex-range-5.0.1" = {
@@ -1729,25 +1729,25 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
-        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
+        sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb";
       };
     };
-    "ts2gas-3.6.4" = {
+    "ts2gas-3.6.1" = {
       name = "ts2gas";
       packageName = "ts2gas";
-      version = "3.6.4";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.6.4.tgz";
-        sha512 = "TJgFvXnoUSZ40pRH4FzqtTYhbJfaF6LmeXKWd813cRV31v55DZTyVatYUyhqF7GCAHhbkKRH7HuCFcFhxeZFag==";
+        url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.6.1.tgz";
+        sha512 = "2z54dgic26rzizkbw21p5w5icq508rqasvb4m1w2m17q90h824bgaizvn1hidfbk11k4pzjqy3p91ij6i216l8bljnhr5dcj9j0xzh7";
       };
     };
-    "tslib-1.14.1" = {
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.14.1";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
-        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9";
       };
     };
     "type-fest-0.3.1" = {
@@ -1756,25 +1756,16 @@ let
       version = "0.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz";
-        sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==";
+        sha512 = "1hy8c4b243psdw221rnqcsn8j4hd5ndyy8fw6mnhlaxyf98f61gxlfdf6wb0dcvhil0b45yjrx44lx5bg8si87hg3dj9qbb4yf8jhbi";
       };
     };
-    "typescript-3.9.7" = {
+    "typescript-3.8.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.9.7";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz";
-        sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==";
-      };
-    };
-    "typescript-4.1.3" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz";
-        sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
+        sha512 = "3rwcbg3l3w3l2zr5y9lszqs30s29jzvh1w594rbdljyr582yi6vajzs2fg04s9p79klh3iv0980b91mbr94sl77h9nb7b2mgrz4929i";
       };
     };
     "universalify-0.1.2" = {
@@ -1783,16 +1774,16 @@ let
       version = "0.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
-        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
+        sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc";
       };
     };
-    "universalify-2.0.0" = {
+    "universalify-1.0.0" = {
       name = "universalify";
       packageName = "universalify";
-      version = "2.0.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz";
-        sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==";
+        url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz";
+        sha512 = "2x2m7gasg0x9mp1grwg5r1bvsp5r32xn7dm3i1zp7n02saxc18hj6jj8kmn0l1j5nycwxm2z14xmqzj244ycq008plxxwbrdparggmd";
       };
     };
     "url-parse-lax-3.0.0" = {
@@ -1819,7 +1810,7 @@ let
       version = "0.10.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
-        sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
+        sha512 = "3sbbgsya51i86ih8bn3nfwi3f9556xlnwh32z4k54dwcpi0jibhfa5dpbfmpzyla63yh2zlxs9chl6wkhc8bqjmjxjyxc9p6j2vvyfh";
       };
     };
     "uuid-3.4.0" = {
@@ -1828,7 +1819,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
-        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
+        sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
       };
     };
     "watch-1.0.2" = {
@@ -1855,7 +1846,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+        sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
       };
     };
   };
@@ -1867,20 +1858,21 @@ in
     version = "2.2.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/@google/clasp/-/clasp-2.2.1.tgz";
-      sha512 = "dUdEBfwOuC1d95o1ntZ+4a60M65q2vwvHvgD22bPCx+OU0m+ZUBs5rZSloh/IGDjEVqFbDsHU6SLgM0x3MOhgA==";
+      sha512 = "20a3hyw676q12x4ac3knv45b88y6q10gy49clmnwrn40rdy959qw7qbrxkdn0zq3qpzrnkamqrv9bp1gvb9wdcsyxfjvf0fzh2l8ivm";
     };
     dependencies = [
-      sources."@nodelib/fs.scandir-2.1.4"
-      sources."@nodelib/fs.stat-2.0.4"
-      sources."@nodelib/fs.walk-1.2.6"
+      sources."@nodelib/fs.scandir-2.1.3"
+      sources."@nodelib/fs.stat-2.0.3"
+      sources."@nodelib/fs.walk-1.2.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/glob-7.1.3"
+      sources."@types/events-3.0.0"
+      sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@types/node-13.9.1"
       sources."abort-controller-3.0.0"
-      sources."agent-base-6.0.2"
-      sources."aggregate-error-3.1.0"
+      sources."agent-base-6.0.0"
+      sources."aggregate-error-3.0.1"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -1888,52 +1880,51 @@ in
       sources."array-union-2.1.0"
       sources."arrify-2.0.1"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.5.1"
-      sources."bignumber.js-9.0.1"
+      sources."base64-js-1.3.1"
+      sources."bignumber.js-7.2.1"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."buffer-equal-constant-time-1.0.1"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
-          sources."get-stream-5.2.0"
+          sources."get-stream-5.1.0"
           sources."lowercase-keys-2.0.0"
         ];
       })
-      sources."call-bind-1.0.2"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."clean-stack-2.2.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinner-0.2.10"
-      sources."cli-width-2.2.1"
+      sources."cli-width-2.2.0"
       sources."clone-response-1.0.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."commander-2.20.3"
       sources."concat-map-0.0.1"
-      sources."debug-4.3.2"
+      sources."debug-4.1.1"
       sources."decompress-response-3.3.0"
       sources."defer-to-connect-1.1.3"
       sources."define-properties-1.1.3"
       sources."del-5.1.0"
       sources."dir-glob-3.0.1"
       sources."dns-packet-5.2.1"
-      sources."dns-socket-4.2.1"
-      sources."dotf-1.5.3"
+      sources."dns-socket-4.2.0"
+      sources."dotf-1.5.0"
       sources."duplexer3-0.1.4"
       sources."ecdsa-sig-formatter-1.0.11"
       sources."ellipsize-0.1.0"
       sources."end-of-stream-1.4.4"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.17.4"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."event-target-shim-5.0.1"
       sources."exec-sh-0.2.2"
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
-      sources."fast-glob-3.2.5"
-      sources."fast-text-encoding-1.0.3"
-      sources."fastq-1.10.0"
+      sources."fast-glob-3.2.2"
+      sources."fast-text-encoding-1.0.1"
+      sources."fastq-1.6.1"
       sources."figures-2.0.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
@@ -1946,19 +1937,18 @@ in
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."fuzzy-0.1.3"
-      sources."gaxios-2.3.4"
+      sources."gaxios-2.3.2"
       sources."gcp-metadata-2.0.4"
-      sources."get-intrinsic-1.0.2"
       sources."get-stream-4.1.0"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.1"
+      sources."glob-parent-5.1.0"
       sources."globby-10.0.2"
       sources."google-auth-library-4.2.6"
       sources."google-p12-pem-2.0.4"
       sources."googleapis-40.0.1"
       sources."googleapis-common-2.0.4"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.4"
+      sources."graceful-fs-4.2.3"
       sources."gtoken-3.0.2"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -1966,57 +1956,57 @@ in
       sources."http-cache-semantics-4.1.0"
       sources."https-proxy-agent-5.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.1.8"
+      sources."ignore-5.1.4"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."inquirer-6.5.2"
       sources."inquirer-autocomplete-prompt-1.0.1"
       sources."ip-1.1.5"
-      sources."ip-regex-4.3.0"
-      sources."is-callable-1.2.2"
+      sources."ip-regex-4.1.0"
+      sources."is-callable-1.1.5"
       sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-ip-3.1.0"
-      sources."is-negative-zero-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-online-8.5.1"
+      sources."is-online-8.2.1"
       sources."is-path-cwd-2.2.0"
       sources."is-path-inside-3.0.2"
-      sources."is-regex-1.1.1"
+      sources."is-promise-2.1.0"
+      sources."is-regex-1.0.5"
       sources."is-stream-2.0.0"
       sources."is-symbol-1.0.3"
       sources."is-wsl-1.1.0"
-      sources."json-bigint-0.3.1"
+      sources."json-bigint-0.3.0"
       sources."json-buffer-3.0.0"
-      sources."jsonfile-6.1.0"
+      sources."jsonfile-6.0.1"
       sources."jwa-1.4.1"
       sources."jws-3.2.2"
       sources."keyv-3.1.0"
       sources."locate-path-5.0.0"
-      sources."lodash-4.17.20"
+      sources."lodash-4.17.15"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-5.1.1"
       sources."merge-1.2.1"
-      sources."merge2-1.4.1"
+      sources."merge2-1.3.0"
       sources."micromatch-4.0.2"
-      sources."mime-2.5.0"
+      sources."mime-2.4.4"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
-      sources."mkdirp-0.5.5"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
       sources."multimatch-4.0.0"
       sources."mute-stream-0.0.7"
-      sources."node-fetch-2.6.1"
-      sources."node-forge-0.9.2"
+      sources."node-fetch-2.6.0"
+      sources."node-forge-0.9.1"
       sources."normalize-url-4.5.0"
-      sources."object-inspect-1.9.0"
+      sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.2"
+      sources."object.assign-4.1.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-6.4.0"
@@ -2028,7 +2018,7 @@ in
       })
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-2.3.0"
+      sources."p-limit-2.2.2"
       sources."p-locate-4.1.0"
       sources."p-map-3.0.0"
       (sources."p-some-4.1.0" // {
@@ -2042,24 +2032,24 @@ in
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-4.0.0"
-      sources."picomatch-2.2.2"
+      sources."picomatch-2.2.1"
       sources."pluralize-8.0.0"
       sources."prepend-http-2.0.0"
       sources."process-0.11.10"
-      sources."public-ip-4.0.3"
+      sources."public-ip-3.2.0"
       sources."pump-3.0.0"
-      sources."qs-6.9.6"
+      sources."qs-6.9.1"
       sources."recursive-readdir-2.2.2"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."run-async-2.4.1"
-      sources."run-parallel-1.1.10"
-      sources."rxjs-6.6.3"
-      sources."safe-buffer-5.2.1"
+      sources."run-async-2.4.0"
+      sources."run-parallel-1.1.9"
+      sources."rxjs-6.5.4"
+      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
-      sources."signal-exit-3.0.3"
+      sources."signal-exit-3.0.2"
       sources."slash-3.0.0"
       sources."split-lines-2.0.0"
       (sources."string-width-2.1.1" // {
@@ -2067,9 +2057,9 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string.prototype.padend-3.1.1"
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
+      sources."string.prototype.padend-3.1.0"
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
       (sources."strip-ansi-5.2.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -2081,15 +2071,11 @@ in
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
       sources."to-regex-range-5.0.1"
-      (sources."ts2gas-3.6.4" // {
-        dependencies = [
-          sources."typescript-4.1.3"
-        ];
-      })
-      sources."tslib-1.14.1"
+      sources."ts2gas-3.6.1"
+      sources."tslib-1.11.1"
       sources."type-fest-0.3.1"
-      sources."typescript-3.9.7"
-      sources."universalify-2.0.0"
+      sources."typescript-3.8.3"
+      sources."universalify-1.0.0"
       sources."url-parse-lax-3.0.0"
       sources."url-template-2.0.8"
       (sources."util-0.10.4" // {
@@ -2098,7 +2084,11 @@ in
         ];
       })
       sources."uuid-3.4.0"
-      sources."watch-1.0.2"
+      (sources."watch-1.0.2" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."yallist-3.1.1"
     ];
diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix
index 64326c6b216..027a981ea57 100644
--- a/pkgs/development/node-packages/composition.nix
+++ b/pkgs/development/node-packages/composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index c2b723195b7..f65cb65cf8d 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -1,11 +1,8 @@
 # This file originates from node2nix
 
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
 
 let
-  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
-  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
-
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -41,8 +38,8 @@ let
     };
 
   includeDependencies = {dependencies}:
-    lib.optionalString (dependencies != [])
-      (lib.concatMapStrings (dependency:
+    stdenv.lib.optionalString (dependencies != [])
+      (stdenv.lib.concatMapStrings (dependency:
         ''
           # Bundle the dependencies of the package
           mkdir -p node_modules
@@ -103,7 +100,7 @@ let
       cd "$DIR/${packageName}"
       ${includeDependencies { inherit dependencies; }}
       cd ..
-      ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
   pinpointDependencies = {dependencies, production}:
@@ -164,12 +161,12 @@ let
     ''
       node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
 
-      ${lib.optionalString (dependencies != [])
+      ${stdenv.lib.optionalString (dependencies != [])
         ''
           if [ -d node_modules ]
           then
               cd node_modules
-              ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
               cd ..
           fi
         ''}
@@ -186,7 +183,7 @@ let
           cd "${packageName}"
           ${pinpointDependencies { inherit dependencies production; }}
           cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
       fi
     '';
 
@@ -245,8 +242,8 @@ let
       if(fs.existsSync("./package-lock.json")) {
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-          if(![1, 2].includes(packageLock.lockfileVersion)) {
-             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+          if(packageLock.lockfileVersion !== 1) {
+             process.stderr.write("Sorry, I only understand lock file version 1!\n");
              process.exit(1);
           }
 
@@ -347,8 +344,8 @@ let
         cd "${packageName}"
         runHook preRebuild
 
-        ${lib.optionalString bypassCache ''
-          ${lib.optionalString reconstructLock ''
+        ${stdenv.lib.optionalString bypassCache ''
+          ${stdenv.lib.optionalString reconstructLock ''
             if [ -f package-lock.json ]
             then
                 echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
@@ -364,14 +361,14 @@ let
           node ${addIntegrityFieldsScript}
         ''}
 
-        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
+        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
         if [ "''${dontNpmInstall-}" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
 
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
         fi
     '';
 
@@ -391,16 +388,17 @@ let
     , dontStrip ? true
     , unpackPhase ? "true"
     , buildPhase ? "true"
+    , meta ? {}
     , ... }@args:
 
     let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
     in
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ lib.optional (stdenv.isLinux) utillinux
-        ++ lib.optional (stdenv.isDarwin) libtool
+        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
+        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
       inherit nodejs;
@@ -446,76 +444,13 @@ let
         # Run post install hook, if provided
         runHook postInstall
       '';
+
+      meta = {
+        # default to Node.js' platforms
+        platforms = nodejs.meta.platforms;
+      } // meta;
     } // extraArgs);
 
-  # Builds a node environment (a node_modules folder and a set of binaries)
-  buildNodeDependencies =
-    { name
-    , packageName
-    , version
-    , src
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-    in
-      stdenv.mkDerivation ({
-        name = "node-dependencies-${name}-${version}";
-
-        buildInputs = [ tarWrapper python nodejs ]
-          ++ lib.optional (stdenv.isLinux) utillinux
-          ++ lib.optional (stdenv.isDarwin) libtool
-          ++ buildInputs;
-
-        inherit dontStrip; # Stripping may fail a build for some package deployments
-        inherit dontNpmInstall unpackPhase buildPhase;
-
-        includeScript = includeDependencies { inherit dependencies; };
-        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
-
-        installPhase = ''
-          mkdir -p $out/${packageName}
-          cd $out/${packageName}
-
-          source $includeScriptPath
-
-          # Create fake package.json to make the npm commands work properly
-          cp ${src}/package.json .
-          chmod 644 package.json
-          ${lib.optionalString bypassCache ''
-            if [ -f ${src}/package-lock.json ]
-            then
-                cp ${src}/package-lock.json .
-            fi
-          ''}
-
-          # Go to the parent folder to make sure that all packages are pinpointed
-          cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-          # Expose the executables that were installed
-          cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          mv ${packageName} lib
-          ln -s $out/lib/node_modules/.bin $out/bin
-        '';
-      } // extraArgs);
-
   # Builds a development shell
   buildNodeShell =
     { name
@@ -535,12 +470,59 @@ let
     , ... }@args:
 
     let
-      nodeDependencies = buildNodeDependencies args;
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+
+      nodeDependencies = stdenv.mkDerivation ({
+        name = "node-dependencies-${name}-${version}";
+
+        buildInputs = [ tarWrapper python nodejs ]
+          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
+          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
+
+        inherit dontStrip; # Stripping may fail a build for some package deployments
+        inherit dontNpmInstall unpackPhase buildPhase;
+
+        includeScript = includeDependencies { inherit dependencies; };
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+
+        installPhase = ''
+          mkdir -p $out/${packageName}
+          cd $out/${packageName}
+
+          source $includeScriptPath
+
+          # Create fake package.json to make the npm commands work properly
+          cp ${src}/package.json .
+          chmod 644 package.json
+          ${stdenv.lib.optionalString bypassCache ''
+            if [ -f ${src}/package-lock.json ]
+            then
+                cp ${src}/package-lock.json .
+            fi
+          ''}
+
+          # Go to the parent folder to make sure that all packages are pinpointed
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+          # Expose the executables that were installed
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          mv ${packageName} lib
+          ln -s $out/lib/node_modules/.bin $out/bin
+        '';
+      } // extraArgs);
     in
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -553,15 +535,14 @@ let
 
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
-      shellHook = lib.optionalString (dependencies != []) ''
+      shellHook = stdenv.lib.optionalString (dependencies != []) ''
         export NODE_PATH=${nodeDependencies}/lib/node_modules
         export PATH="${nodeDependencies}/bin:$PATH"
       '';
     };
 in
 {
-  buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
-  buildNodePackage = lib.makeOverridable buildNodePackage;
-  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
-  buildNodeShell = lib.makeOverridable buildNodeShell;
+  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
+  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
 }
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 0743281c180..94c0b38fc76 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -22,13 +22,13 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.1101.0" = {
+    "@angular-devkit/architect-0.1100.5" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.1101.0";
+      version = "0.1100.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1101.0.tgz";
-        sha512 = "Lj1STrxPXvvZVIk9RSTOPEiJeE/PGbBSclz12u92F3DsmbhcCxpiZ8AU8bUvJJ8gsZhGRB0BjPN0gCSWr9Po7w==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.5.tgz";
+        sha512 = "yOYfucNouc1doTbcGbCNMXGMSc36+j97XpdNoeGyzFQ7GwezLAro0a9gxc5PdOxndfelkND7J1JuOjxdW5O17A==";
       };
     };
     "@angular-devkit/core-11.0.3" = {
@@ -49,15 +49,6 @@ let
         sha512 = "hwV8fjF8JNPJkiVWw8MNzeIfDo01aD/OAOlC4L5rQnVHn+i2EiU3brSDmFqyeHPPV3h/QjuBkS3tkN7gSnVWaQ==";
       };
     };
-    "@angular-devkit/core-11.1.0" = {
-      name = "_at_angular-devkit_slash_core";
-      packageName = "@angular-devkit/core";
-      version = "11.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.0.tgz";
-        sha512 = "O2oIcqpQKGvYJH88d/NCgLYZGc9laA1eo2d1s0FH1Udu4c2L+bAsviQqtTKNmzyaqODHrlkt+eKx7uakdwWtnQ==";
-      };
-    };
     "@angular-devkit/schematics-11.0.3" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
@@ -76,15 +67,6 @@ let
         sha512 = "0NKGC8Nf/4vvDpWKB7bwxIazvNnNHnZBX6XlyBXNl+fW8tpTef3PNMJMSErTz9LFnuv61vsKbc36u/Ek2YChWg==";
       };
     };
-    "@angular-devkit/schematics-11.1.0" = {
-      name = "_at_angular-devkit_slash_schematics";
-      packageName = "@angular-devkit/schematics";
-      version = "11.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.1.0.tgz";
-        sha512 = "6qfR5w1jyk8MC+5Tfimz+Czsq3WlsVoB57dpxSZfhGGsv1Vxc8Q41y5f3BrAyEqHYjcH7NtaoLQoJjtra5KaAg==";
-      };
-    };
     "@angular-devkit/schematics-cli-0.1100.3" = {
       name = "_at_angular-devkit_slash_schematics-cli";
       packageName = "@angular-devkit/schematics-cli";
@@ -202,13 +184,13 @@ let
         sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg==";
       };
     };
-    "@apidevtools/json-schema-ref-parser-9.0.7" = {
+    "@apidevtools/json-schema-ref-parser-9.0.6" = {
       name = "_at_apidevtools_slash_json-schema-ref-parser";
       packageName = "@apidevtools/json-schema-ref-parser";
-      version = "9.0.7";
+      version = "9.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz";
-        sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg==";
+        url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz";
+        sha512 = "M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg==";
       };
     };
     "@apollo/federation-0.20.7" = {
@@ -355,6 +337,15 @@ let
         sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==";
       };
     };
+    "@babel/generator-7.12.10" = {
+      name = "_at_babel_slash_generator";
+      packageName = "@babel/generator";
+      version = "7.12.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz";
+        sha512 = "6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==";
+      };
+    };
     "@babel/generator-7.12.11" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -1372,22 +1363,22 @@ let
         sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==";
       };
     };
-    "@bugsnag/browser-7.6.0" = {
+    "@bugsnag/browser-7.5.4" = {
       name = "_at_bugsnag_slash_browser";
       packageName = "@bugsnag/browser";
-      version = "7.6.0";
+      version = "7.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.6.0.tgz";
-        sha512 = "8sth20TM8BVfebkqxqJQOCM2P2L4foOgFH2QA3ruG0iknDKZDhE7XcoWgmUP9zVSNJqkCyiIzcBOuiwZW8JaSQ==";
+        url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.4.tgz";
+        sha512 = "WyhDWeE2MXQTo9uJjpCOxqTWDlVgX/yKE/VZ0nVm4em2AxUmjAPM8jk9YOTYCKQfQFnIpgf62DjVlsszikUIBw==";
       };
     };
-    "@bugsnag/core-7.6.0" = {
+    "@bugsnag/core-7.5.4" = {
       name = "_at_bugsnag_slash_core";
       packageName = "@bugsnag/core";
-      version = "7.6.0";
+      version = "7.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.6.0.tgz";
-        sha512 = "hBYAZJw4ScqoyM1jA1x/m2e4iS2EqYEs0I2hdzBCZFv2ls17ILmU58eRSyVdUfyzbv0J7Hi6DwwBGC4Yb6ROZA==";
+        url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.5.4.tgz";
+        sha512 = "QOvtWzM0XJTk5QCpiDFTva6FJXCKuKQHJu7sjrZwYA/7fblypl+ClP7inz9At5ijkKGm2pLyvZ9vvT2rq9TXuw==";
       };
     };
     "@bugsnag/cuid-3.0.0" = {
@@ -1399,22 +1390,22 @@ let
         sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg==";
       };
     };
-    "@bugsnag/js-7.6.0" = {
+    "@bugsnag/js-7.5.4" = {
       name = "_at_bugsnag_slash_js";
       packageName = "@bugsnag/js";
-      version = "7.6.0";
+      version = "7.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.6.0.tgz";
-        sha512 = "EcI3sTpyOs94/OOjwI7fOg1iZ800o3kkOAipAnULRoP62j1vmErH2l/2xubny7g0JTOL59iZEkt+5O5MhbQJ2A==";
+        url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.4.tgz";
+        sha512 = "V1+482YPndAD0c0ju7Ik1dXunyKAssZWUIqOMs7Ff3PtZb1107sJ4Hw1E7ZusQvvI/IjA6FO3ZJkmzjIJjQ+UA==";
       };
     };
-    "@bugsnag/node-7.6.0" = {
+    "@bugsnag/node-7.5.4" = {
       name = "_at_bugsnag_slash_node";
       packageName = "@bugsnag/node";
-      version = "7.6.0";
+      version = "7.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.6.0.tgz";
-        sha512 = "n3BVb04bq4z16nOM4gbWoXsi6k8R9bryWS/NAYi/jQg6tgyBkNYzmK0ojf3fYJ7uAgCjUJNMX6S9UHSJy/MMcQ==";
+        url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.5.4.tgz";
+        sha512 = "lfHEU2wsBO/hhHjsY6kqD/Ga6A3bzROeZEuE7/cT0xzDUvBnUsrw75/xZ5EyY3Xpyfe/Gw9t336semIqz46+cw==";
       };
     };
     "@bugsnag/safe-json-stringify-6.0.0" = {
@@ -1642,15 +1633,6 @@ let
         sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==";
       };
     };
-    "@eslint/eslintrc-0.3.0" = {
-      name = "_at_eslint_slash_eslintrc";
-      packageName = "@eslint/eslintrc";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz";
-        sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==";
-      };
-    };
     "@evocateur/libnpmaccess-3.1.2" = {
       name = "_at_evocateur_slash_libnpmaccess";
       packageName = "@evocateur/libnpmaccess";
@@ -2065,22 +2047,22 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.156.0" = {
+    "@fluentui/react-7.155.3" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.156.0";
+      version = "7.155.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.156.0.tgz";
-        sha512 = "+ZNi++L+s4sNEHnQfAeBBvr+HHE45psZNubRvsWRVsNRVMrv/vlGGDOS7Z324GrvaZppHfYi36fFssmhqE61vw==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.155.3.tgz";
+        sha512 = "bVK9qMUqjWQ68UPkQGHCMnCKeH8uSlCLF2QgR9ESMV/g0sHUvRqCO1Yuj9JyO4NDanqfX62NDgJzimHKj1/MQg==";
       };
     };
-    "@fluentui/react-focus-7.17.1" = {
+    "@fluentui/react-focus-7.17.0" = {
       name = "_at_fluentui_slash_react-focus";
       packageName = "@fluentui/react-focus";
-      version = "7.17.1";
+      version = "7.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.1.tgz";
-        sha512 = "Nulq2pE4pX6Pf+tGZl8uLp8VfqUzx3elC5v7QvYSBdjnZK8ykitdsa+Sd3PKYWW2EMlzVRSptlzbuJ6JyEDQKQ==";
+        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.0.tgz";
+        sha512 = "xr5LExRnLW9CNyWDkcMmvOAgOXru/GBTIKcVqNahgRf7CIyHraY0m/0gFblwNtPYQOS9ltM3c+fbyYvCXBZvEw==";
       };
     };
     "@fluentui/react-window-provider-1.0.1" = {
@@ -2092,13 +2074,13 @@ let
         sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w==";
       };
     };
-    "@fluentui/theme-1.7.1" = {
+    "@fluentui/theme-1.7.0" = {
       name = "_at_fluentui_slash_theme";
       packageName = "@fluentui/theme";
-      version = "1.7.1";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.1.tgz";
-        sha512 = "cwx8gJ0O9d+Z8g6Lq7BgDgH8XPfSloUSy0GN3fWHJGrDCBPcnmz6/GKbbvxw9PZ2t1iNcAzJEJNT6NyuOOobPA==";
+        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.0.tgz";
+        sha512 = "pzqDZC2bVD6/S45Bnve4wmrXi4cN7XiCr+OhzvgmoQfDkm5vyXsa82/cVtif/zy1OFU96S9zOTtt3e+QQuGUUg==";
       };
     };
     "@google-cloud/paginator-3.0.5" = {
@@ -2137,13 +2119,13 @@ let
         sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==";
       };
     };
-    "@google-cloud/pubsub-2.8.0" = {
+    "@google-cloud/pubsub-2.7.0" = {
       name = "_at_google-cloud_slash_pubsub";
       packageName = "@google-cloud/pubsub";
-      version = "2.8.0";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.8.0.tgz";
-        sha512 = "AoSKAbpHCoLq6jO9vMX+K6hJhkayafan24Rs2RKHU8Y0qF6IGSm1+ly0OG12TgziHWg818/6dljWWKgwDcp8KA==";
+        url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.7.0.tgz";
+        sha512 = "wc/XOo5Ibo3GWmuaLu80EBIhXSdu2vf99HUqBbdsSSkmRNIka2HqoIhLlOFnnncQn0lZnGL7wtKGIDLoH9LiBg==";
       };
     };
     "@graphql-cli/common-4.1.0" = {
@@ -2173,31 +2155,31 @@ let
         sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q==";
       };
     };
-    "@graphql-tools/delegate-7.0.9" = {
+    "@graphql-tools/delegate-7.0.8" = {
       name = "_at_graphql-tools_slash_delegate";
       packageName = "@graphql-tools/delegate";
-      version = "7.0.9";
+      version = "7.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.9.tgz";
-        sha512 = "nlelOb354cyweV+SpTXkoGZHKgJ1PwPkHWq/0RXM5LllQsR3OrSQKKWMrd1g9dyawEZbadCF3fDJJWSQ4HOg2g==";
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.8.tgz";
+        sha512 = "pS1wci7ZxzdCITRrMI66UA+6/E0Z1Yczd3QxJBDb4Kp0nTGy1xy7enGa0+i55EmCvKvuwyx+tzXzwA1fNGRJzg==";
       };
     };
-    "@graphql-tools/graphql-file-loader-6.2.7" = {
+    "@graphql-tools/graphql-file-loader-6.2.6" = {
       name = "_at_graphql-tools_slash_graphql-file-loader";
       packageName = "@graphql-tools/graphql-file-loader";
-      version = "6.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.7.tgz";
-        sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ==";
-      };
-    };
-    "@graphql-tools/import-6.2.6" = {
-      name = "_at_graphql-tools_slash_import";
-      packageName = "@graphql-tools/import";
       version = "6.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.6.tgz";
-        sha512 = "/0H/bDjNK1MnKonk8fMbB7wIYU6QLCwbQOHtSHbFJ4j2qki5CqfAxpF+fGX6KovDtkdigcgRMvSKKi14oiuHPA==";
+        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.6.tgz";
+        sha512 = "L+RdYl5C6+X0zdOTUotY0K5zwqvSGpqI/qcZpVvCDenoAcVTyaNLmnd/ViErwedhCaGqAAV0wI1nPtyKFPlMUg==";
+      };
+    };
+    "@graphql-tools/import-6.2.5" = {
+      name = "_at_graphql-tools_slash_import";
+      packageName = "@graphql-tools/import";
+      version = "6.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.5.tgz";
+        sha512 = "ZGXT5tDod7m+LO38fc+o0JzR1LstL0RF35HKEWoUdxRIVaaeYH9VMuan9Gn+9M9RDME3RnzEa9aGzf9ATj8bTA==";
       };
     };
     "@graphql-tools/json-file-loader-6.2.6" = {
@@ -2218,13 +2200,13 @@ let
         sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
       };
     };
-    "@graphql-tools/merge-6.2.7" = {
+    "@graphql-tools/merge-6.2.6" = {
       name = "_at_graphql-tools_slash_merge";
       packageName = "@graphql-tools/merge";
-      version = "6.2.7";
+      version = "6.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.7.tgz";
-        sha512 = "9acgDkkYeAHpuqhOa3E63NZPCX/iWo819Q320sCCMkydF1xgx0qCRYz/V03xPdpQETKRqBG2i2N2csneeEYYig==";
+        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.6.tgz";
+        sha512 = "G6x0QlIzFHoJ3dyF9a4gxmBtaEYJ+EoAAGqXHsE/drRr58K1jscQdfKZdF1wZWZgxkgakHqgt1+oFMeQg/O6ug==";
       };
     };
     "@graphql-tools/schema-7.1.2" = {
@@ -2236,13 +2218,13 @@ let
         sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ==";
       };
     };
-    "@graphql-tools/url-loader-6.8.0" = {
+    "@graphql-tools/url-loader-6.7.1" = {
       name = "_at_graphql-tools_slash_url-loader";
       packageName = "@graphql-tools/url-loader";
-      version = "6.8.0";
+      version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.0.tgz";
-        sha512 = "x4f93UnH7kNr9iHFpJHL6kYWogRFlxMEnXybHS9xNCFd08+ftMO22bUb8esnFsyNrtMMlkLtshDSyNb3LbIMQg==";
+        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.7.1.tgz";
+        sha512 = "7NJ1G5diJAuWYZszQf0mNwPipVMOjIIMteNkutdExBq4CgN0V1xa3/iC25CUrI7sZiq+D367zZNONmKf+3bA2Q==";
       };
     };
     "@graphql-tools/utils-6.2.4" = {
@@ -2254,13 +2236,13 @@ let
         sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg==";
       };
     };
-    "@graphql-tools/utils-7.2.4" = {
+    "@graphql-tools/utils-7.2.3" = {
       name = "_at_graphql-tools_slash_utils";
       packageName = "@graphql-tools/utils";
-      version = "7.2.4";
+      version = "7.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.4.tgz";
-        sha512 = "EDSb98dTWX8FngvayWejip1DutOl0wGtNbXC7a3CZf5fiJS7bGHQ/8cSlMhe9XaHwpLJCbAk/Ijnp/dYbXk33w==";
+        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.3.tgz";
+        sha512 = "9MvSKeo+8DM72706FvrUP8figQjRzSwBswWrXviyWyt3wSkk6MU2cURQKfMpc0I6nswZvkDSqYoQQ/6mazoXxA==";
       };
     };
     "@graphql-tools/wrap-7.0.5" = {
@@ -2272,22 +2254,31 @@ let
         sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ==";
       };
     };
-    "@grpc/grpc-js-1.2.4" = {
+    "@grpc/grpc-js-1.1.8" = {
       name = "_at_grpc_slash_grpc-js";
       packageName = "@grpc/grpc-js";
-      version = "1.2.4";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.4.tgz";
-        sha512 = "z+EI20HYHLd3/uERtwOqP8Q4EPhGbz5RKUpiyo6xPWfR3pcjpf8sfNvY9XytDQ4xo1wNz7NqH1kh2UBonwzbfg==";
+        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.1.8.tgz";
+        sha512 = "64hg5rmEm6F/NvlWERhHmmgxbWU8nD2TMWE+9TvG7/WcOrFT3fzg/Uu631pXRFwmJ4aWO/kp9vVSlr8FUjBDLA==";
       };
     };
-    "@grpc/proto-loader-0.5.6" = {
+    "@grpc/proto-loader-0.5.5" = {
       name = "_at_grpc_slash_proto-loader";
       packageName = "@grpc/proto-loader";
-      version = "0.5.6";
+      version = "0.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.6.tgz";
-        sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ==";
+        url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.5.tgz";
+        sha512 = "WwN9jVNdHRQoOBo9FDH7qU+mgfjPc8GygPYms3M+y3fbQLfnCe/Kv/E01t7JRgnrsOHH8euvSbed3mIalXhwqQ==";
+      };
+    };
+    "@grpc/proto-loader-0.6.0-pre9" = {
+      name = "_at_grpc_slash_proto-loader";
+      packageName = "@grpc/proto-loader";
+      version = "0.6.0-pre9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.0-pre9.tgz";
+        sha512 = "oM+LjpEjNzW5pNJjt4/hq1HYayNeQT+eGrOPABJnYHv7TyNPDNzkQ76rDYZF86X5swJOa4EujEMzQ9iiTdPgww==";
       };
     };
     "@gulp-sourcemaps/identity-map-1.0.2" = {
@@ -2848,58 +2839,58 @@ let
         sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ==";
       };
     };
-    "@joplin/fork-htmlparser2-4.1.20" = {
+    "@joplin/fork-htmlparser2-4.1.14" = {
       name = "_at_joplin_slash_fork-htmlparser2";
       packageName = "@joplin/fork-htmlparser2";
-      version = "4.1.20";
+      version = "4.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.20.tgz";
-        sha512 = "fao7WvJ6cHs4xLuR8sgitEeErIdepCSQx0Nv5ibHFjMMWlMMcBGa0e4GjEnKJLtY0rL5TCYevgn42HL3u3ISfg==";
+        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.14.tgz";
+        sha512 = "uE5StVO3A6XcQLd5CxRU+XU7ecAKX8lmTFnHlnhBkgn8V8CHsHIUfZy1uw+fZ4gnC0kenq6uiZavhDPBAkibKA==";
       };
     };
-    "@joplin/fork-sax-1.2.24" = {
+    "@joplin/fork-sax-1.2.18" = {
       name = "_at_joplin_slash_fork-sax";
       packageName = "@joplin/fork-sax";
-      version = "1.2.24";
+      version = "1.2.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.24.tgz";
-        sha512 = "bE+T6WaPeWSzWvrgZqTh2Iq4yTAeYt60lr7GgzlKFUZyuVWZDZ0y1yk63goKpZN6iVTd9R3grM1Rx+UaRNV/Ag==";
+        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.18.tgz";
+        sha512 = "tlsBwoayPjEVjAsylCosflTtF4EgGrSP4b/2r5Ci640846YDPdg0nqKuOUs82Xmptc3QQcnjzRKW8+7Up9+lfQ==";
       };
     };
-    "@joplin/lib-1.0.18" = {
+    "@joplin/lib-1.0.15" = {
       name = "_at_joplin_slash_lib";
       packageName = "@joplin/lib";
-      version = "1.0.18";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.18.tgz";
-        sha512 = "r0Z+bolszlPUsanaQIUk/tog3jHw0rGtUxXTHDMtycFWkWYVpjlT3bvxiYrV5MwLjyn/xnfUCIdHeUi/Lz3LPQ==";
+        url = "https://registry.npmjs.org/@joplin/lib/-/lib-1.0.15.tgz";
+        sha512 = "wOA+fxi93b9qfuRV7Ynhc+uUmW2XDVMugHWzqDdiOPd394mYQSX21/Eqvxhd049SsHiqmsMo2scz7rNtFLMnuA==";
       };
     };
-    "@joplin/renderer-1.0.26" = {
+    "@joplin/renderer-1.0.23" = {
       name = "_at_joplin_slash_renderer";
       packageName = "@joplin/renderer";
-      version = "1.0.26";
+      version = "1.0.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.26.tgz";
-        sha512 = "RDRYjuPCn1ltematEZQhgvZbIGBQ+2F3jgAdXpqByg71pmxrMZyOLLbNVYJyKK4w2Ecvmbpwuo0h9RbMb/56Ow==";
+        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.0.23.tgz";
+        sha512 = "1gddYqDLxeyR96m1/9WQ7Ri2tbaIOEW+JmbZKst9HDsgj8LiNwtBha+y35KqRAS6pWimbcXh0RZDkA4DmQ2VOw==";
       };
     };
-    "@joplin/turndown-4.0.42" = {
+    "@joplin/turndown-4.0.36" = {
       name = "_at_joplin_slash_turndown";
       packageName = "@joplin/turndown";
-      version = "4.0.42";
+      version = "4.0.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.42.tgz";
-        sha512 = "rHSJgnsA0Xvpf6V5dDPO1rCBYt4wGdCCdG0VKovDSenf6BpTq0T6agHObE3GMgW8w108Ts4jJdEDJanGc5Phjw==";
+        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.36.tgz";
+        sha512 = "lks0n5HTAsg0O71L9kLoTaASAU4NILG3SyDcX/10K1g2wpoUadmXQmznaa3WqY4RgN0gzRKaZV51d7JtO9ZwXQ==";
       };
     };
-    "@joplin/turndown-plugin-gfm-1.0.24" = {
+    "@joplin/turndown-plugin-gfm-1.0.18" = {
       name = "_at_joplin_slash_turndown-plugin-gfm";
       packageName = "@joplin/turndown-plugin-gfm";
-      version = "1.0.24";
+      version = "1.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.24.tgz";
-        sha512 = "3bIkDqPUJ7CORpkFGE95SRCBFpUzY4KDGPxJsZXWhy2qI/VRE0BXJsxPOls0cWSbHSUKTN7kNGub5iavhtRz2A==";
+        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.18.tgz";
+        sha512 = "6uUXRU5PILzKAUP50t9FOyMrpGgfpw2ugrZ8hAfV+PhNZsjSgsc+cSBBdjn/HIEgNCr9m7TlHSzscxrHg496Iw==";
       };
     };
     "@jsdevtools/ono-7.1.3" = {
@@ -2911,13 +2902,13 @@ let
         sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==";
       };
     };
-    "@jsii/spec-1.17.1" = {
+    "@jsii/spec-1.16.0" = {
       name = "_at_jsii_slash_spec";
       packageName = "@jsii/spec";
-      version = "1.17.1";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.17.1.tgz";
-        sha512 = "9/bdS7MpIVwSgHfaZiYnpE56T2YNE2WAJbhZzQTsYZCYkB8icsP+hVCIWzeyGZmHR9KggaCETbmNlLG0v2QdSw==";
+        url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.16.0.tgz";
+        sha512 = "DH3rDGa781UmRtg/ykFyxrfhjaz1SRz2BblNXDxwArhl0aUiN5HOdzi9icX8CFwdB9+ZxTtXuxap3BwvLa5xnA==";
       };
     };
     "@kwsites/file-exists-1.1.1" = {
@@ -3505,13 +3496,13 @@ let
         sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.145" = {
+    "@microsoft/load-themed-styles-1.10.141" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.145";
+      version = "1.10.141";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.145.tgz";
-        sha512 = "KCwejs/xZMjUCW6XNv8aND0FZAloGvVYJG7QPMlSo7NKxj+dvP6Cvywy9oadKeGvU9Rv1EjbR7HK6yfA2hjnMw==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.141.tgz";
+        sha512 = "IWqbTWhxpp10X2nZI14oqbPtzrRLvXtyX7sV/QDfVBtQQivLilZFynr/X69SAZtbSp/wi7WI8gKl2/6TuTNN1A==";
       };
     };
     "@mozilla/readability-0.3.0" = {
@@ -3559,13 +3550,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-8.1.0" = {
+    "@netlify/build-8.0.1" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "8.1.0";
+      version = "8.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-8.1.0.tgz";
-        sha512 = "5/zJY+kL7423WQyBp2p/pdlGHoK6mx/kLHl4W3QoFe+OlWvf2SREi60wO4Ln0HteT+KgguQKsRxNnp0Ryf2kRA==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-8.0.1.tgz";
+        sha512 = "DOBUR4x0GEmi4hD8LagJfPCtxnaAtjRTJgZdTx9lFngC2OHY+xIwGZ3Ilct1b3vbAcl0SzHA+HZ4xrG2V/EWdw==";
       };
     };
     "@netlify/cache-utils-1.0.6" = {
@@ -3577,31 +3568,31 @@ let
         sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg==";
       };
     };
-    "@netlify/config-3.0.1" = {
+    "@netlify/config-0.11.11" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "3.0.1";
+      version = "0.11.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-3.0.1.tgz";
-        sha512 = "lW+HGiDOfkcAUO3MhXcoLA7n1XnHtupO03gjZlcankksTrBOlkIMw2RFanptg6LAPqlW47cS0DHvU1sSkKyJCg==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-0.11.11.tgz";
+        sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw==";
       };
     };
-    "@netlify/framework-info-2.0.0" = {
-      name = "_at_netlify_slash_framework-info";
-      packageName = "@netlify/framework-info";
-      version = "2.0.0";
+    "@netlify/config-2.4.3" = {
+      name = "_at_netlify_slash_config";
+      packageName = "@netlify/config";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-2.0.0.tgz";
-        sha512 = "2s0del0msTihWnWC5wyUvWoAI85UF8rAQLlCnKo2wih8eJsxem5KoqpiT0/tHpw7GKsgGSN4MQZlg2OKcbWc3g==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.3.tgz";
+        sha512 = "Uz7Oo3tJP2VTgNgsJtRlwAhO5jTozkpNMCKALb814ssJKx7nE/4QvNxJPCQNBDXY9BSeXVIPfy0vMfshxatL+g==";
       };
     };
-    "@netlify/functions-utils-1.3.5" = {
+    "@netlify/functions-utils-1.3.4" = {
       name = "_at_netlify_slash_functions-utils";
       packageName = "@netlify/functions-utils";
-      version = "1.3.5";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.5.tgz";
-        sha512 = "zwH2BPWyscDSyLV/sM6LOCg6Lez8x+OTXXF6zdYvdPhWf9BrnD7xj9lpFH59tXPB77tKgyIATFb8rutTrahJqQ==";
+        url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.4.tgz";
+        sha512 = "AkVd03D6K7Uwli+t5xTMm5c1jn1HRFY3YgslLV91huHI++3CjOsGpsnDfhoN2kj1aN8OLqliTOvs4PQHC2dKpw==";
       };
     };
     "@netlify/git-utils-1.0.6" = {
@@ -3613,22 +3604,31 @@ let
         sha512 = "JpuvzCTf9QXVEgVA4mSshH6fi9Dtg0Pqe5d19yaN2f1H9DNnWro3kJUaoR68Hfo0rBls6kYwWJuNZ/csb03VuQ==";
       };
     };
-    "@netlify/open-api-1.3.0" = {
+    "@netlify/open-api-0.18.1" = {
       name = "_at_netlify_slash_open-api";
       packageName = "@netlify/open-api";
-      version = "1.3.0";
+      version = "0.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.3.0.tgz";
-        sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg==";
+        url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.18.1.tgz";
+        sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw==";
       };
     };
-    "@netlify/plugin-edge-handlers-1.11.1" = {
+    "@netlify/open-api-1.0.0" = {
+      name = "_at_netlify_slash_open-api";
+      packageName = "@netlify/open-api";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-1.0.0.tgz";
+        sha512 = "LAicAlsAZXybGtKzaOTmIYelSe82vgZlc17IeNUQxab2IlUCH7VhTKCx9EyJEgiXhLvmYoOjuYE1Ee9ZsnrybA==";
+      };
+    };
+    "@netlify/plugin-edge-handlers-1.10.0" = {
       name = "_at_netlify_slash_plugin-edge-handlers";
       packageName = "@netlify/plugin-edge-handlers";
-      version = "1.11.1";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.1.tgz";
-        sha512 = "zuEd804TH9PCwpboxCpqx/EiMUOpxkcGjTtxJjwMeMkQHAY5952x4UUts3ZyuG0MvvXqtJwM2hez7gmpEQMkqA==";
+        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.10.0.tgz";
+        sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg==";
       };
     };
     "@netlify/plugins-list-2.2.0" = {
@@ -3649,103 +3649,112 @@ let
         sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q==";
       };
     };
-    "@netlify/traffic-mesh-agent-0.27.10" = {
+    "@netlify/traffic-mesh-agent-0.27.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent";
       packageName = "@netlify/traffic-mesh-agent";
-      version = "0.27.10";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.10.tgz";
-        sha512 = "HZXEdIXzg8CpysYRDVXkBpmjOj/C8Zb8Q/qkkt9x+npJ56HeX6sXAE4vK4SMCRLkkbQ2VyYTaDKg++GefeB2Gg==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.0.tgz";
+        sha512 = "a+jXM75Ir9PavNTzDRkZWQT7jHc02wWF8mRYXWbvku+VLqmmkA61RyhAgSeo5dMWSdMofSRkoifnW7leyv7Obw==";
       };
     };
-    "@netlify/traffic-mesh-agent-darwin-x64-0.27.10" = {
+    "@netlify/traffic-mesh-agent-darwin-x64-0.27.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64";
       packageName = "@netlify/traffic-mesh-agent-darwin-x64";
-      version = "0.27.10";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.10.tgz";
-        sha512 = "j2blCh3TKNV35VPF9Zf/LM3v6pH/gz/Y7uu/78RLbgNvCW0vGN7b1GgFnXQKwrvbL6tRGumJS2P5PWUfEsKOBA==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.0.tgz";
+        sha512 = "a0EDNrdLBjxp+GYj/WQSifuQZorFQkY6spO4wuOl3mQV3tKTkBmu09+FsfitYpgZHDMoPzfhvURJrUtJIHTgqQ==";
       };
     };
-    "@netlify/traffic-mesh-agent-linux-x64-0.27.10" = {
+    "@netlify/traffic-mesh-agent-linux-x64-0.27.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-linux-x64";
       packageName = "@netlify/traffic-mesh-agent-linux-x64";
-      version = "0.27.10";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.10.tgz";
-        sha512 = "JdeGT356TtqbxY6IjsS+wik68V0iNGdRsGV4cYOx/aAfclAyZ9DL29A4nzobyq5J+s5binrbKpix26/WKi+sqA==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.0.tgz";
+        sha512 = "m7p/0eTXKILxCpTqQOmBkYdIjYKwSC2KZbPpDJ4sYfnMIF3qa9uMp8qrK9At/oGPckeiTq4Id775veldhwt2lw==";
       };
     };
-    "@netlify/traffic-mesh-agent-win32-x64-0.27.10" = {
+    "@netlify/traffic-mesh-agent-win32-x64-0.27.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-win32-x64";
       packageName = "@netlify/traffic-mesh-agent-win32-x64";
-      version = "0.27.10";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.10.tgz";
-        sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.0.tgz";
+        sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg==";
       };
     };
-    "@netlify/zip-it-and-ship-it-2.0.2" = {
+    "@netlify/zip-it-and-ship-it-1.7.0" = {
       name = "_at_netlify_slash_zip-it-and-ship-it";
       packageName = "@netlify/zip-it-and-ship-it";
-      version = "2.0.2";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.0.2.tgz";
-        sha512 = "jFUrHXs9b6VP52mey2jY0C6T37IbVPPKNRLGIlKxLJS+fg59MhjIr81kMLHlAw3TBKpOubCcTa91g4qzts/Y/w==";
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.7.0.tgz";
+        sha512 = "7Fatc5OoRZ7V2tusx1CBWIdk9hXrr0JWoW547wsmopCkCl5O4TaLxw12CgfW6EQsjaufSnuQddzvnx5y1b5gGQ==";
       };
     };
-    "@node-red/editor-api-1.2.7" = {
+    "@netlify/zip-it-and-ship-it-2.0.0" = {
+      name = "_at_netlify_slash_zip-it-and-ship-it";
+      packageName = "@netlify/zip-it-and-ship-it";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.0.0.tgz";
+        sha512 = "DQQldFTRmEPHpvvKxAKLNk/RqVIfzZGsBcbmruy3zupPG2W+pGHnQUSMNXrUZmMkqekDh0nCHf8MfG0EakRqGg==";
+      };
+    };
+    "@node-red/editor-api-1.2.6" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "1.2.7";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.7.tgz";
-        sha512 = "DY1rnKjX8ewkVwwCa6T+kjUHjCP+YMms8rPXFYZAi/r148jS7pKC21OgYe4FrJhM5EGREVJClG5Td6QAORR1vw==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.6.tgz";
+        sha512 = "RM243A8AgpoHEc8cu8STCYsJVx790clVxvRUCaLfbAyb+dKn+9b0TOKWsmLUW4fhrMqwwVlFOMulVHPhg0HhGg==";
       };
     };
-    "@node-red/editor-client-1.2.7" = {
+    "@node-red/editor-client-1.2.6" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "1.2.7";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.7.tgz";
-        sha512 = "56NMyLL4iCuSaAYhWnsR3TTQidygoETRaG0GAYuU1iZgh+UZxvnLvIGa4gxgvMdtMgM0t4kS6tyMHhIIbX5Kvw==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.6.tgz";
+        sha512 = "2hMnMVcqhR77mHqHzVj3hNJGZ8VcaO+lhggNYhORJXEqYCeAULj92hMCeoA4pjHDqGBn2F+gldli1WOs1/JgJg==";
       };
     };
-    "@node-red/nodes-1.2.7" = {
+    "@node-red/nodes-1.2.6" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "1.2.7";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.7.tgz";
-        sha512 = "GRUbM7HVPssjxbybMUkjEONi46eGabFYrY2OFZmzFF9L1ywTL9qMeEWsnHdV0Yibkr9Iq0VE4Ss/XZy+cCABAw==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.6.tgz";
+        sha512 = "1LlECIzKKBHUOsWGLw31FT1mWL2mSecr9gBh2FqwnP7gNejebYjwP2zuHKOYs9sPRm3550zOJ5mlutXiiFKwYg==";
       };
     };
-    "@node-red/registry-1.2.7" = {
+    "@node-red/registry-1.2.6" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "1.2.7";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.7.tgz";
-        sha512 = "FC14n/pEPiftsWGHQpLW9/4vstvtFpiczj/7CHp5p1Xmn2quSUzKBFOGtFr1FhglTJ3Nn59OOXL+59HMRF3Vcw==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.6.tgz";
+        sha512 = "+zwHxnMr9Adve627dtw2jl/KSjTY+a5JrwJN10TSKMxVLwYeBLm/ugRTA9tkGiCjr2w9pgsnMUZRFFLfdyRZCQ==";
       };
     };
-    "@node-red/runtime-1.2.7" = {
+    "@node-red/runtime-1.2.6" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "1.2.7";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.7.tgz";
-        sha512 = "0QpolGMBL8ZMXKgzQRp9JFXYuoLaZZ4xkwFehMKH3KubDAYHHTl4tfTdY71hRxe8NbTZW9G9Gftt+e1vj0RGvg==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.6.tgz";
+        sha512 = "zfQGK4Hqssv5TV8S5WLZ77BHYmyylarZvEScVQpivhJHg6HeZL+MffqqtPIyTM1ulklPZvO6fPmq/f5T/CgAgw==";
       };
     };
-    "@node-red/util-1.2.7" = {
+    "@node-red/util-1.2.6" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "1.2.7";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.7.tgz";
-        sha512 = "+mftTJ1AtjqbO/5LjggXd36fcomKjlOy/IunjQULaMGO4MIIqPxZ/QUYTuSi2Z/rgHPMHRuwguwWnoca4GkBnw==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.6.tgz";
+        sha512 = "CYUCS8iqcaZFBf0vwtVPqqNXX0XY0ajFW69smtDItbxslyZL3A0qRMiTTv0qMPA1uvOCEw4wQRSIQV7j/nd0yw==";
       };
     };
     "@nodelib/fs.scandir-2.1.4" = {
@@ -3811,13 +3820,13 @@ let
         sha512 = "aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A==";
       };
     };
-    "@npmcli/move-file-1.1.0" = {
+    "@npmcli/move-file-1.0.1" = {
       name = "_at_npmcli_slash_move-file";
       packageName = "@npmcli/move-file";
-      version = "1.1.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.0.tgz";
-        sha512 = "Iv2iq0JuyYjKeFkSR4LPaCdDZwlGK9X2cP/01nJcp3yMJ1FjNd9vpiEYvLUgzBxKPg2SFmaOhizoQsPc0LWeOQ==";
+        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz";
+        sha512 = "Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==";
       };
     };
     "@npmcli/node-gyp-1.0.1" = {
@@ -3910,13 +3919,13 @@ let
         sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA==";
       };
     };
-    "@oclif/plugin-autocomplete-0.3.0" = {
+    "@oclif/plugin-autocomplete-0.2.1" = {
       name = "_at_oclif_slash_plugin-autocomplete";
       packageName = "@oclif/plugin-autocomplete";
-      version = "0.3.0";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.3.0.tgz";
-        sha512 = "gCuIUCswvoU1BxDDvHSUGxW8rFagiacle8jHqE49+WnuniXD/N8NmJvnzmlNyc8qLE192CnKK+qYyAF+vaFQBg==";
+        url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.2.1.tgz";
+        sha512 = "EOcoh1x3auFg1a7NNVTT+hJ1PPih7Kg1it7WtG8oBgYKe+YD/bvHnX2QlXqi9S7H0XsQQMUb8hxbLP+XwQY/8Q==";
       };
     };
     "@oclif/plugin-help-1.2.11" = {
@@ -3955,6 +3964,15 @@ let
         sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg==";
       };
     };
+    "@oclif/plugin-plugins-1.9.4" = {
+      name = "_at_oclif_slash_plugin-plugins";
+      packageName = "@oclif/plugin-plugins";
+      version = "1.9.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.4.tgz";
+        sha512 = "C5hEbX4zzTjzbym2RJUE4wxz2aL2ocb826HDs3suscsjMPA3mRHyu8/rWJW1Cgc2MeoIybNdrfyPU/zmpWkaWw==";
+      };
+    };
     "@oclif/plugin-plugins-1.9.5" = {
       name = "_at_oclif_slash_plugin-plugins";
       packageName = "@oclif/plugin-plugins";
@@ -4000,13 +4018,13 @@ let
         sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==";
       };
     };
-    "@octokit/openapi-types-3.1.1" = {
+    "@octokit/openapi-types-2.0.1" = {
       name = "_at_octokit_slash_openapi-types";
       packageName = "@octokit/openapi-types";
-      version = "3.1.1";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-3.1.1.tgz";
-        sha512 = "4BsrIf9/WLRbl0IVPEPLDTROduvYR57xCldy47YFQp/TZ9DbREQZbeCrJIe7a+Qjb3qk0KwZmxNYYW8mNQY/HQ==";
+        url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.1.tgz";
+        sha512 = "9AuC04PUnZrjoLiw3uPtwGh9FE4Q3rTqs51oNlQ0rkwgE8ftYsOC+lsrQyvCvWm85smBbSc0FNRKKumvGyb44Q==";
       };
     };
     "@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -4090,13 +4108,13 @@ let
         sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==";
       };
     };
-    "@octokit/types-6.4.2" = {
+    "@octokit/types-6.1.2" = {
       name = "_at_octokit_slash_types";
       packageName = "@octokit/types";
-      version = "6.4.2";
+      version = "6.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/types/-/types-6.4.2.tgz";
-        sha512 = "c3OswFOjp0MydgIxWcu/wIXK9sfoBL2gLjqMZA+KKdvvcwh6g2z0eMu219rFrZzi0KQunO9l/a9yHb9T/AlU1A==";
+        url = "https://registry.npmjs.org/@octokit/types/-/types-6.1.2.tgz";
+        sha512 = "LPCpcLbcky7fWfHCTuc7tMiSHFpFlrThJqVdaHgowBTMS0ijlZFfonQC/C1PrZOjD4xRCYgBqH9yttEATGE/nw==";
       };
     };
     "@opencensus/core-0.0.8" = {
@@ -4126,58 +4144,58 @@ let
         sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A==";
       };
     };
-    "@opentelemetry/api-0.12.0" = {
+    "@opentelemetry/api-0.11.0" = {
       name = "_at_opentelemetry_slash_api";
       packageName = "@opentelemetry/api";
-      version = "0.12.0";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.12.0.tgz";
-        sha512 = "Dn4vU5GlaBrIWzLpsM6xbJwKHdlpwBQ4Bd+cL9ofJP3hKT8jBXpBpribmyaqAzrajzzl2Yt8uTa9rFVLfjDAvw==";
+        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.11.0.tgz";
+        sha512 = "K+1ADLMxduhsXoZ0GRfi9Pw162FvzBQLDQlHru1lg86rpIU+4XqdJkSGo6y3Kg+GmOWq1HNHOA/ydw/rzHQkRg==";
       };
     };
-    "@opentelemetry/context-base-0.12.0" = {
+    "@opentelemetry/context-base-0.11.0" = {
       name = "_at_opentelemetry_slash_context-base";
       packageName = "@opentelemetry/context-base";
-      version = "0.12.0";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.12.0.tgz";
-        sha512 = "UXwSsXo3F3yZ1dIBOG9ID8v2r9e+bqLWoizCtTb8rXtwF+N5TM7hzzvQz72o3nBU+zrI/D5e+OqAYK8ZgDd3DA==";
+        url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.11.0.tgz";
+        sha512 = "ESRk+572bftles7CVlugAj5Azrz61VO0MO0TS2pE9MLVL/zGmWuUBQryART6/nsrFqo+v9HPt37GPNcECTZR1w==";
       };
     };
-    "@opentelemetry/core-0.12.0" = {
+    "@opentelemetry/core-0.11.0" = {
       name = "_at_opentelemetry_slash_core";
       packageName = "@opentelemetry/core";
-      version = "0.12.0";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.12.0.tgz";
-        sha512 = "oLZIkmTNWTJXzo1eA4dGu/S7wOVtylsgnEsCmhSJGhrJVDXm1eW/aGuNs3DVBeuxp0ZvQLAul3/PThsC3YrnzA==";
+        url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.11.0.tgz";
+        sha512 = "ZEKjBXeDGBqzouz0uJmrbEKNExEsQOhsZ3tJDCLcz5dUNoVw642oIn2LYWdQK2YdIfZbEmltiF65/csGsaBtFA==";
       };
     };
-    "@opentelemetry/resources-0.12.0" = {
+    "@opentelemetry/resources-0.11.0" = {
       name = "_at_opentelemetry_slash_resources";
       packageName = "@opentelemetry/resources";
-      version = "0.12.0";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.12.0.tgz";
-        sha512 = "8cYvIKB68cyupc7D6SWzkLtt13mbjgxMahL4JKCM6hWPyiGSJlPFEAey4XFXI5LLpPZRYTPHLVoLqI/xwCFZZA==";
+        url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.11.0.tgz";
+        sha512 = "o7DwV1TcezqBtS5YW2AWBcn01nVpPptIbTr966PLlVBcS//w8LkjeOShiSZxQ0lmV4b2en0FiSouSDoXk/5qIQ==";
       };
     };
-    "@opentelemetry/semantic-conventions-0.12.0" = {
+    "@opentelemetry/semantic-conventions-0.11.0" = {
       name = "_at_opentelemetry_slash_semantic-conventions";
       packageName = "@opentelemetry/semantic-conventions";
-      version = "0.12.0";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.12.0.tgz";
-        sha512 = "BuCcDW0uLNYYTns0/LwXkJ8lp8aDm7kpS+WunEmPAPRSCe6ciOYRvzn5reqJfX93rf+6A3U2SgrBnCTH+0qoQQ==";
+        url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.11.0.tgz";
+        sha512 = "xsthnI/J+Cx0YVDGgUzvrH0ZTtfNtl866M454NarYwDrc0JvC24sYw+XS5PJyk2KDzAHtb0vlrumUc1OAut/Fw==";
       };
     };
-    "@opentelemetry/tracing-0.12.0" = {
+    "@opentelemetry/tracing-0.11.0" = {
       name = "_at_opentelemetry_slash_tracing";
       packageName = "@opentelemetry/tracing";
-      version = "0.12.0";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.12.0.tgz";
-        sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg==";
+        url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.11.0.tgz";
+        sha512 = "QweFmxzl32BcyzwdWCNjVXZT1WeENNS/RWETq/ohqu+fAsTcMyGcr6cOq/yDdFmtBy+bm5WVVdeByEjNS+c4/w==";
       };
     };
     "@ot-builder/bin-composite-types-0.10.37" = {
@@ -4558,13 +4576,13 @@ let
         sha512 = "CY/a6Nw72vrlp/FPx38l4jfEHp4gNEbo8i+WlSJ2cnWO6VE6CKmnC1zb4yQLvdP8f3EuzzoOBZVq6aGN20M82Q==";
       };
     };
-    "@pm2/js-api-0.6.7" = {
+    "@pm2/js-api-0.6.1" = {
       name = "_at_pm2_slash_js-api";
       packageName = "@pm2/js-api";
-      version = "0.6.7";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.7.tgz";
-        sha512 = "jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw==";
+        url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.1.tgz";
+        sha512 = "LImZWHEzcpIrLZ7kt4z3Gllkoz+CChHk2waDretOWeinSItyTMrNpzcXcZd2QikP/57qPolLfHGFipHJmOKkwQ==";
       };
     };
     "@pm2/pm2-version-check-1.0.3" = {
@@ -4747,6 +4765,15 @@ let
         sha512 = "MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA==";
       };
     };
+    "@rollup/plugin-commonjs-15.1.0" = {
+      name = "_at_rollup_slash_plugin-commonjs";
+      packageName = "@rollup/plugin-commonjs";
+      version = "15.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz";
+        sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==";
+      };
+    };
     "@rollup/plugin-commonjs-17.0.0" = {
       name = "_at_rollup_slash_plugin-commonjs";
       packageName = "@rollup/plugin-commonjs";
@@ -4774,13 +4801,22 @@ let
         sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==";
       };
     };
-    "@rollup/plugin-node-resolve-11.1.0" = {
+    "@rollup/plugin-node-resolve-11.0.1" = {
       name = "_at_rollup_slash_plugin-node-resolve";
       packageName = "@rollup/plugin-node-resolve";
-      version = "11.1.0";
+      version = "11.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.0.tgz";
-        sha512 = "ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog==";
+        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.1.tgz";
+        sha512 = "ltlsj/4Bhwwhb+Nb5xCz/6vieuEj2/BAkkqVIKmZwC7pIdl8srmgmglE4S0jFlZa32K4qvdQ6NHdmpRKD/LwoQ==";
+      };
+    };
+    "@rollup/plugin-node-resolve-9.0.0" = {
+      name = "_at_rollup_slash_plugin-node-resolve";
+      packageName = "@rollup/plugin-node-resolve";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz";
+        sha512 = "gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg==";
       };
     };
     "@rollup/pluginutils-3.1.0" = {
@@ -4810,13 +4846,13 @@ let
         sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
       };
     };
-    "@schematics/angular-11.1.0" = {
+    "@schematics/angular-11.0.5" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "11.1.0";
+      version = "11.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.1.0.tgz";
-        sha512 = "g04TcC1gLS1ptFYdIO7qZ+lJARBXoK9g+m5KzQoogdrDkCum+wN15bfYKc5hF8cDYQOOqYjRF5GBdS9Uvc4ulQ==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.5.tgz";
+        sha512 = "7p2wweoJYhim8YUy3ih1SrPGqRsa6+aEFbYgo9v4zt7b3tOva8SvkbC2alayK74fclzQ7umqa6xAwvWhy8ORvg==";
       };
     };
     "@schematics/schematics-0.1100.3" = {
@@ -4828,13 +4864,13 @@ let
         sha512 = "tzjKnjD90FQ4LgRN9ALT2qCqgJYZrAKoy1embFJRuGKA8vv1hTG4JonVDqQEUoNwTc9r/Ok2Z1eenAI9TSUd1A==";
       };
     };
-    "@schematics/update-0.1101.0" = {
+    "@schematics/update-0.1100.5" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.1101.0";
+      version = "0.1100.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1101.0.tgz";
-        sha512 = "WcbiTcn+Rr1uYllTLMbYcMfiz5IRZ7OAapISA82DpDkBeYIUf86ANjkEK1qsuU3zoz5i3CbiWvPq/KTlrzh6dg==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.5.tgz";
+        sha512 = "BYtKKuiWsrlc4FMW3bRyl4tm6lWNMTi8oql/mtkSgH7V5eMmaLDJtM+zDl+qyC/KHPxbHTfoHDapfv1tITSWjA==";
       };
     };
     "@segment/loosely-validate-event-2.0.0" = {
@@ -4864,13 +4900,13 @@ let
         sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
       };
     };
-    "@serverless/components-3.5.1" = {
+    "@serverless/components-3.4.3" = {
       name = "_at_serverless_slash_components";
       packageName = "@serverless/components";
-      version = "3.5.1";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/components/-/components-3.5.1.tgz";
-        sha512 = "GRXdO4e2gWwVQ+RNdbffaym92cIcUHzYfIK3mxWv2zIL/4rKXz5YaptRj6hd3EST12/iBsEOktomtuCfG1i9RA==";
+        url = "https://registry.npmjs.org/@serverless/components/-/components-3.4.3.tgz";
+        sha512 = "buKvUPDeS54bUG9c56bmX5WcL3hBCHASKamHpUGmSa1ArSem8BE76LzPjiNcreOJGSFf9VGMgpsW1d1WKy2fAA==";
       };
     };
     "@serverless/core-1.1.2" = {
@@ -4882,13 +4918,13 @@ let
         sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
       };
     };
-    "@serverless/enterprise-plugin-4.4.2" = {
+    "@serverless/enterprise-plugin-4.4.1" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "4.4.2";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.2.tgz";
-        sha512 = "w5xD8R8tFK6B7QiLvWI5jqVHTtH1LdTyGp5eRcjkdJBa10/D2IZFpJimMAGsBxk9U1JGKO4j0miVnRHIW8ppeg==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.4.1.tgz";
+        sha512 = "MTjpIwpCA1gmldGuEozHNKIlce8BXMilvH2K0nm5vJ45PAUwK1bL9moaLwDadaTEw9B1jKbboa5/wpzJwwFdxA==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -4900,22 +4936,22 @@ let
         sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==";
       };
     };
-    "@serverless/platform-client-3.8.1" = {
+    "@serverless/platform-client-3.1.4" = {
       name = "_at_serverless_slash_platform-client";
       packageName = "@serverless/platform-client";
-      version = "3.8.1";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.8.1.tgz";
-        sha512 = "kdLKQPoiZedgYQ38v5s0Bpo+KpAl/2Cz4qL73oJxfqVI0ZQiINR7jxblT+fA2SwcyJdGzbZf/98Tx4bekwPs2g==";
+        url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.1.4.tgz";
+        sha512 = "oc65L9Dl1Xe+T5qv/fkmjYREtPzrQMdje0fC5ntvsfR3luxvSfQIinHYKbt30Qpyy2sJCBPG4IPEip7b3y0WwA==";
       };
     };
-    "@serverless/platform-client-china-2.1.1" = {
+    "@serverless/platform-client-china-2.0.9" = {
       name = "_at_serverless_slash_platform-client-china";
       packageName = "@serverless/platform-client-china";
-      version = "2.1.1";
+      version = "2.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.1.tgz";
-        sha512 = "mpJ4Pf8gWWcq8cvpix4obSSAUUKG9NqRiFXjBm6mmfiWgge88E/HwY5Nnvf9QWcvr7oxwtDnS+vXXA73s60NjA==";
+        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.9.tgz";
+        sha512 = "qec3a5lVaMH0nccgjVgvcEF8M+M95BXZbbYDGypVHEieJQxrKqj057+VVKsiHBeHYXzr4B3v6pIyQHst40vpIw==";
       };
     };
     "@serverless/platform-sdk-2.3.2" = {
@@ -4954,13 +4990,13 @@ let
         sha512 = "0TqmLwH9r2GAewvz9mhZ+TSyQBoE9ANuB4nNhn6lJvVUgzlzji3aqeFbAuDt+Z60ZkaIDNipU/J5Vf2Lo/QTQQ==";
       };
     };
-    "@serverless/utils-china-1.0.14" = {
+    "@serverless/utils-china-1.0.12" = {
       name = "_at_serverless_slash_utils-china";
       packageName = "@serverless/utils-china";
-      version = "1.0.14";
+      version = "1.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.14.tgz";
-        sha512 = "7ku9ePjb+bneFV1Akmz0t8pU8hhHfPJsBjG/Kf6IjyGAQrEjN/PcY2QUDm0emdCNyCsuido1wp0DWMGiwuhC8Q==";
+        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.12.tgz";
+        sha512 = "PuVap97QTf3Fi5+ez3ZUewGPFHTpf3dwZ+c6YWEoaf+1u7cgXzYFuWx8Ypi+4ghbL93/bf+blqdm+7CQi+CMRg==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -5026,15 +5062,6 @@ let
         sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ==";
       };
     };
-    "@skorfmann/terraform-cloud-1.7.1" = {
-      name = "_at_skorfmann_slash_terraform-cloud";
-      packageName = "@skorfmann/terraform-cloud";
-      version = "1.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.7.1.tgz";
-        sha512 = "uwcalR9R5/9M+UcOeKR+XgCyIlipl5dxiAryuWT8D4erW6sPnTE/B97G6F3VzzrZfcaPmljX5NVG8Dkl79ki6A==";
-      };
-    };
     "@slack/client-3.16.0" = {
       name = "_at_slack_slash_client";
       packageName = "@slack/client";
@@ -5098,15 +5125,6 @@ let
         sha512 = "+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw==";
       };
     };
-    "@snyk/dep-graph-1.23.0" = {
-      name = "_at_snyk_slash_dep-graph";
-      packageName = "@snyk/dep-graph";
-      version = "1.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.23.0.tgz";
-        sha512 = "qR0ENrbcNWHYmSRZCxjrlFy2T7i+rJjL6Rnd2e+NByJgn8zBmX6Qf5FjqNbZAI0AYjOlzXMZjGrbAbe4QkWV+w==";
-      };
-    };
     "@snyk/docker-registry-v2-client-1.13.9" = {
       name = "_at_snyk_slash_docker-registry-v2-client";
       packageName = "@snyk/docker-registry-v2-client";
@@ -5134,13 +5152,13 @@ let
         sha512 = "uO1b6UtT6QGz7F5ZgNdOSyMXBvykUhOcuHBRc//xUnBWsyJwdlAFp/d646zIeaBCe87Fcn5hXuWUGjj+N8rBzA==";
       };
     };
-    "@snyk/java-call-graph-builder-1.19.0" = {
+    "@snyk/java-call-graph-builder-1.18.0" = {
       name = "_at_snyk_slash_java-call-graph-builder";
       packageName = "@snyk/java-call-graph-builder";
-      version = "1.19.0";
+      version = "1.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.0.tgz";
-        sha512 = "in26UkFVEWvGyHmSmVUebvgyubANJB7rfrkE3PKjHDA80NwSLZDSNWOOC2lF2B+4ob4STWjQdMbv+bMqXl5Yew==";
+        url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.18.0.tgz";
+        sha512 = "6Mt+Rs2N4HdHICCjxWRwtGXUrSktCsSGnn7HlL6wi+4JXjPWa+rDCzaF6furqRR3aphZAclgved0haFwwmqBxQ==";
       };
     };
     "@snyk/rpm-parser-2.2.1" = {
@@ -5467,15 +5485,6 @@ let
         sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==";
       };
     };
-    "@types/archiver-5.1.0" = {
-      name = "_at_types_slash_archiver";
-      packageName = "@types/archiver";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/archiver/-/archiver-5.1.0.tgz";
-        sha512 = "baFOhanb/hxmcOd1Uey2TfFg43kTSmM6py1Eo7Rjbv/ivcl7PXLhY0QgXGf50Hx/eskGCFqPfhs/7IZLb15C5g==";
-      };
-    };
     "@types/babel-types-7.0.9" = {
       name = "_at_types_slash_babel-types";
       packageName = "@types/babel-types";
@@ -5719,13 +5728,13 @@ let
         sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A==";
       };
     };
-    "@types/engine.io-3.1.5" = {
+    "@types/engine.io-3.1.4" = {
       name = "_at_types_slash_engine.io";
       packageName = "@types/engine.io";
-      version = "3.1.5";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.5.tgz";
-        sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg==";
+        url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.4.tgz";
+        sha512 = "98rXVukLD6/ozrQ2O80NAlWDGA4INg+tqsEReWJldqyi2fulC9V7Use/n28SWgROXKm6003ycWV4gZHoF8GA6w==";
       };
     };
     "@types/eslint-7.2.6" = {
@@ -5773,15 +5782,6 @@ let
         sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==";
       };
     };
-    "@types/estree-0.0.46" = {
-      name = "_at_types_slash_estree";
-      packageName = "@types/estree";
-      version = "0.0.46";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz";
-        sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==";
-      };
-    };
     "@types/events-3.0.0" = {
       name = "_at_types_slash_events";
       packageName = "@types/events";
@@ -5818,15 +5818,6 @@ let
         sha512 = "YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ==";
       };
     };
-    "@types/express-serve-static-core-4.17.18" = {
-      name = "_at_types_slash_express-serve-static-core";
-      packageName = "@types/express-serve-static-core";
-      version = "4.17.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
-        sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
-      };
-    };
     "@types/fancy-log-1.3.0" = {
       name = "_at_types_slash_fancy-log";
       packageName = "@types/fancy-log";
@@ -5980,13 +5971,13 @@ let
         sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA==";
       };
     };
-    "@types/http-proxy-1.17.5" = {
+    "@types/http-proxy-1.17.4" = {
       name = "_at_types_slash_http-proxy";
       packageName = "@types/http-proxy";
-      version = "1.17.5";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz";
-        sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q==";
+        url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz";
+        sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==";
       };
     };
     "@types/inquirer-6.5.0" = {
@@ -6043,15 +6034,6 @@ let
         sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww==";
       };
     };
-    "@types/js-yaml-3.12.6" = {
-      name = "_at_types_slash_js-yaml";
-      packageName = "@types/js-yaml";
-      version = "3.12.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.6.tgz";
-        sha512 = "cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ==";
-      };
-    };
     "@types/jscodeshift-0.7.2" = {
       name = "_at_types_slash_jscodeshift";
       packageName = "@types/jscodeshift";
@@ -6061,13 +6043,13 @@ let
         sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw==";
       };
     };
-    "@types/json-schema-7.0.7" = {
+    "@types/json-schema-7.0.6" = {
       name = "_at_types_slash_json-schema";
       packageName = "@types/json-schema";
-      version = "7.0.7";
+      version = "7.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz";
-        sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==";
+        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz";
+        sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==";
       };
     };
     "@types/json5-0.0.29" = {
@@ -6133,13 +6115,13 @@ let
         sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==";
       };
     };
-    "@types/lodash-4.14.168" = {
+    "@types/lodash-4.14.167" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.168";
+      version = "4.14.167";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz";
-        sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.167.tgz";
+        sha512 = "w7tQPjARrvdeBkX/Rwg95S592JwxqOjmms3zWQ0XZgSyxSLdzWaYH3vErBhdVS/lRBX7F8aBYcYJYTr5TMGOzw==";
       };
     };
     "@types/long-4.0.1" = {
@@ -6169,13 +6151,13 @@ let
         sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==";
       };
     };
-    "@types/mime-1.3.2" = {
+    "@types/mime-2.0.3" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
-      version = "1.3.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
-        sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
+        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz";
+        sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==";
       };
     };
     "@types/minimatch-3.0.3" = {
@@ -6277,13 +6259,13 @@ let
         sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==";
       };
     };
-    "@types/node-10.17.51" = {
+    "@types/node-10.17.50" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.51";
+      version = "10.17.50";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.51.tgz";
-        sha512 = "KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.50.tgz";
+        sha512 = "vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA==";
       };
     };
     "@types/node-12.12.70" = {
@@ -6295,22 +6277,22 @@ let
         sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ==";
       };
     };
-    "@types/node-12.19.15" = {
+    "@types/node-12.19.12" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.19.15";
+      version = "12.19.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz";
-        sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.19.12.tgz";
+        sha512 = "UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==";
       };
     };
-    "@types/node-13.13.40" = {
+    "@types/node-13.13.39" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.40";
+      version = "13.13.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.40.tgz";
-        sha512 = "eKaRo87lu1yAXrzEJl0zcJxfUMDT5/mZalFyOkT44rnQps41eS2pfWzbaulSPpQLFNy29bFqn+Y5lOTL8ATlEQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.39.tgz";
+        sha512 = "wct+WgRTTkBm2R3vbrFOqyZM5w0g+D8KnhstG9463CJBVC3UVZHMToge7iMBR1vDl/I+NWFHUeK9X+JcF0rWKw==";
       };
     };
     "@types/node-14.11.1" = {
@@ -6322,13 +6304,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.14.22" = {
+    "@types/node-14.14.20" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.22";
+      version = "14.14.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
-        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz";
+        sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==";
       };
     };
     "@types/node-6.14.13" = {
@@ -6367,15 +6349,6 @@ let
         sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==";
       };
     };
-    "@types/node-fetch-2.5.8" = {
-      name = "_at_types_slash_node-fetch";
-      packageName = "@types/node-fetch";
-      version = "2.5.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz";
-        sha512 = "fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==";
-      };
-    };
     "@types/normalize-package-data-2.4.0" = {
       name = "_at_types_slash_normalize-package-data";
       packageName = "@types/normalize-package-data";
@@ -6412,13 +6385,13 @@ let
         sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg==";
       };
     };
-    "@types/pg-types-2.2.0" = {
+    "@types/pg-types-1.11.5" = {
       name = "_at_types_slash_pg-types";
       packageName = "@types/pg-types";
-      version = "2.2.0";
+      version = "1.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-2.2.0.tgz";
-        sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA==";
+        url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-1.11.5.tgz";
+        sha512 = "L8ogeT6vDzT1vxlW3KITTCt+BVXXVkLXfZ/XNm6UqbcJgxf+KPO7yjWx7dQQE8RW07KopL10x2gNMs41+IkMGQ==";
       };
     };
     "@types/q-1.5.4" = {
@@ -6529,13 +6502,13 @@ let
         sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==";
       };
     };
-    "@types/serve-static-1.13.9" = {
+    "@types/serve-static-1.13.8" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.9";
+      version = "1.13.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
-        sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz";
+        sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA==";
       };
     };
     "@types/sizzle-2.3.2" = {
@@ -6583,15 +6556,6 @@ let
         sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA==";
       };
     };
-    "@types/stream-buffers-3.0.3" = {
-      name = "_at_types_slash_stream-buffers";
-      packageName = "@types/stream-buffers";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.3.tgz";
-        sha512 = "NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ==";
-      };
-    };
     "@types/superagent-3.8.2" = {
       name = "_at_types_slash_superagent";
       packageName = "@types/superagent";
@@ -6718,15 +6682,6 @@ let
         sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==";
       };
     };
-    "@types/webpack-4.41.26" = {
-      name = "_at_types_slash_webpack";
-      packageName = "@types/webpack";
-      version = "4.41.26";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz";
-        sha512 = "7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==";
-      };
-    };
     "@types/webpack-sources-2.1.0" = {
       name = "_at_types_slash_webpack-sources";
       packageName = "@types/webpack-sources";
@@ -6808,13 +6763,13 @@ let
         sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==";
       };
     };
-    "@typescript-eslint/eslint-plugin-4.14.0" = {
+    "@typescript-eslint/eslint-plugin-4.12.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.14.0";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.0.tgz";
-        sha512 = "IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz";
+        sha512 = "wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q==";
       };
     };
     "@typescript-eslint/experimental-utils-3.10.1" = {
@@ -6826,13 +6781,13 @@ let
         sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.14.0" = {
+    "@typescript-eslint/experimental-utils-4.12.0" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.14.0";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.0.tgz";
-        sha512 = "6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz";
+        sha512 = "MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA==";
       };
     };
     "@typescript-eslint/parser-3.10.1" = {
@@ -6844,22 +6799,22 @@ let
         sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
       };
     };
-    "@typescript-eslint/parser-4.14.0" = {
+    "@typescript-eslint/parser-4.12.0" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "4.14.0";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.14.0.tgz";
-        sha512 = "sUDeuCjBU+ZF3Lzw0hphTyScmDDJ5QVkyE21pRoBo8iDl7WBtVFS+WDN3blY1CH3SBt7EmYCw6wfmJjF0l/uYg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.12.0.tgz";
+        sha512 = "9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ==";
       };
     };
-    "@typescript-eslint/scope-manager-4.14.0" = {
+    "@typescript-eslint/scope-manager-4.12.0" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.14.0";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.14.0.tgz";
-        sha512 = "/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz";
+        sha512 = "QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg==";
       };
     };
     "@typescript-eslint/types-3.10.1" = {
@@ -6871,13 +6826,13 @@ let
         sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
       };
     };
-    "@typescript-eslint/types-4.14.0" = {
+    "@typescript-eslint/types-4.12.0" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.14.0";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.14.0.tgz";
-        sha512 = "VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.12.0.tgz";
+        sha512 = "N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g==";
       };
     };
     "@typescript-eslint/typescript-estree-2.34.0" = {
@@ -6898,13 +6853,13 @@ let
         sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.14.0" = {
+    "@typescript-eslint/typescript-estree-4.12.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.14.0";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz";
-        sha512 = "wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz";
+        sha512 = "gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w==";
       };
     };
     "@typescript-eslint/visitor-keys-3.10.1" = {
@@ -6916,31 +6871,31 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.14.0" = {
+    "@typescript-eslint/visitor-keys-4.12.0" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.14.0";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz";
-        sha512 = "MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz";
+        sha512 = "hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw==";
       };
     };
-    "@uifabric/foundation-7.9.21" = {
+    "@uifabric/foundation-7.9.20" = {
       name = "_at_uifabric_slash_foundation";
       packageName = "@uifabric/foundation";
-      version = "7.9.21";
+      version = "7.9.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.21.tgz";
-        sha512 = "z58pcC0hJr6S0iYLxNFoqfrfLIMxbSxFHRirk5LDT2HXbiVIYbJwbK4O0InS+sz3chdx8GGSdIUz7muXeT/D+A==";
+        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.20.tgz";
+        sha512 = "AcOClWfs+rNK0XyPLKTK2Nqeom7zOESOfL3Tbwl5VuDlSrlGW9yNywuuo6gJSOyXCJQO5dJFVdGExmB0EM4vkw==";
       };
     };
-    "@uifabric/icons-7.5.18" = {
+    "@uifabric/icons-7.5.17" = {
       name = "_at_uifabric_slash_icons";
       packageName = "@uifabric/icons";
-      version = "7.5.18";
+      version = "7.5.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.18.tgz";
-        sha512 = "gLPEccWlTER9NiXcOHZ+dSJ3tgLAQ4mTf3hTlKV7e7dKBTl95jzcemG5S2NJQ7xWPTH3+5K1Bpd+nqZo9EJw3w==";
+        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.17.tgz";
+        sha512 = "2S1kse0gtseTuV2r59iWukLxxoOJ6GgP2Yhxt9oxzaP9QubpYdxCUepvJmfPQQvvy4GELdykDUWQ6/hbzliJyw==";
       };
     };
     "@uifabric/merge-styles-7.19.1" = {
@@ -6970,13 +6925,13 @@ let
         sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA==";
       };
     };
-    "@uifabric/styling-7.16.19" = {
+    "@uifabric/styling-7.16.18" = {
       name = "_at_uifabric_slash_styling";
       packageName = "@uifabric/styling";
-      version = "7.16.19";
+      version = "7.16.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.19.tgz";
-        sha512 = "T5fjUCx0LbzUC8Myw15YCaBjdGbSrihWSiPHtLVW77k59yWAW947XnH73QngE8xU7kyKPH3AhQrUEBMB2NjHag==";
+        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.18.tgz";
+        sha512 = "jINFRMWfSIOZ4H29YNBHtwZU4f8JFprnyBX2E0Wq9rjqRzgcmdYbN2yn88gym6aC3houSDcYM0rdfG4ETjRQSA==";
       };
     };
     "@uifabric/utilities-7.33.2" = {
@@ -7024,40 +6979,40 @@ let
         sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084";
       };
     };
-    "@vue/cli-shared-utils-4.5.10" = {
+    "@vue/cli-shared-utils-4.5.9" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
-      version = "4.5.10";
+      version = "4.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.10.tgz";
-        sha512 = "Lid6FflDqcvo/JBIBjUriAQ1RkQaKbBpzXSLEK/JmoKkQRHW/rRhDLGI1dEVyOLYnDEiL1m8o1xPJaplUUiXpA==";
+        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.9.tgz";
+        sha512 = "anvsrv+rkQC+hgxaT2nQQxnSWSsIzyysZ36LO7qPjXvDRBvcvKLAAviFlUkYbZ+ntbV8puzJ3zw+gUhQw4SEVA==";
       };
     };
-    "@vue/cli-ui-4.5.10" = {
+    "@vue/cli-ui-4.5.9" = {
       name = "_at_vue_slash_cli-ui";
       packageName = "@vue/cli-ui";
-      version = "4.5.10";
+      version = "4.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.10.tgz";
-        sha512 = "nMB24EZcswLxYBudjlKu15l/q2uO2YAn3iag3k4oGBg4n6ZQNvuAFY842GmuccJO3CHKlBXdyVDKoQUWz8fSQg==";
+        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.9.tgz";
+        sha512 = "JXQk29CLp7eBdO6uCr2s60xBoKjXPzr9ckpCicFMIWFLQOR0+DqWQpS1DIqETbgOmTYQj1LX+v1rkLeA74Lo2A==";
       };
     };
-    "@vue/cli-ui-addon-webpack-4.5.10" = {
+    "@vue/cli-ui-addon-webpack-4.5.9" = {
       name = "_at_vue_slash_cli-ui-addon-webpack";
       packageName = "@vue/cli-ui-addon-webpack";
-      version = "4.5.10";
+      version = "4.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.10.tgz";
-        sha512 = "+/l7m6f8bk++zv6mN4MzJnlBOGfl4M01Ir01n9UP2z2lX2ozpu4kU6bldrssaj/o2u2XazL3udXzbYA6sJFgOg==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.9.tgz";
+        sha512 = "fh79OvbqvZ2YQ7JI7DnDKeS3W72HoEMVS8m969g/kjrqkFM+Rt2cL81LBx3IgX5l/rZP999kof569vYsOyjVnA==";
       };
     };
-    "@vue/cli-ui-addon-widgets-4.5.10" = {
+    "@vue/cli-ui-addon-widgets-4.5.9" = {
       name = "_at_vue_slash_cli-ui-addon-widgets";
       packageName = "@vue/cli-ui-addon-widgets";
-      version = "4.5.10";
+      version = "4.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.10.tgz";
-        sha512 = "Y89eMWLICYqoYRODJbMrr+4qporxo1gtRUAJltDKSgCZ8cn2Pt5A2/jwjxy9PueliKrvt19soF2/ckM3CLy/eA==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.9.tgz";
+        sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA==";
       };
     };
     "@vue/compiler-core-3.0.5" = {
@@ -7132,15 +7087,6 @@ let
         sha512 = "gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw==";
       };
     };
-    "@webassemblyjs/ast-1.11.0" = {
-      name = "_at_webassemblyjs_slash_ast";
-      packageName = "@webassemblyjs/ast";
-      version = "1.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz";
-        sha512 = "kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==";
-      };
-    };
     "@webassemblyjs/ast-1.8.1" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
@@ -7159,13 +7105,13 @@ let
         sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.11.0" = {
-      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
-      packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.11.0";
+    "@webassemblyjs/ast-1.9.1" = {
+      name = "_at_webassemblyjs_slash_ast";
+      packageName = "@webassemblyjs/ast";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz";
-        sha512 = "Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.1.tgz";
+        sha512 = "uMu1nCWn2Wxyy126LlGqRVlhdTOsO/bsBRI4dNq3+6SiSuRKRQX6ejjKgh82LoGAPSq72lDUiQ4FWVaf0PecYw==";
       };
     };
     "@webassemblyjs/floating-point-hex-parser-1.8.1" = {
@@ -7186,13 +7132,13 @@ let
         sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==";
       };
     };
-    "@webassemblyjs/helper-api-error-1.11.0" = {
-      name = "_at_webassemblyjs_slash_helper-api-error";
-      packageName = "@webassemblyjs/helper-api-error";
-      version = "1.11.0";
+    "@webassemblyjs/floating-point-hex-parser-1.9.1" = {
+      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
+      packageName = "@webassemblyjs/floating-point-hex-parser";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz";
-        sha512 = "baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==";
+        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.1.tgz";
+        sha512 = "5VEKu024RySmLKTTBl9q1eO/2K5jk9ZS+2HXDBLA9s9p5IjkaXxWiDb/+b7wSQp6FRdLaH1IVGIfOex58Na2pg==";
       };
     };
     "@webassemblyjs/helper-api-error-1.8.1" = {
@@ -7213,13 +7159,13 @@ let
         sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.11.0" = {
-      name = "_at_webassemblyjs_slash_helper-buffer";
-      packageName = "@webassemblyjs/helper-buffer";
-      version = "1.11.0";
+    "@webassemblyjs/helper-api-error-1.9.1" = {
+      name = "_at_webassemblyjs_slash_helper-api-error";
+      packageName = "@webassemblyjs/helper-api-error";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz";
-        sha512 = "u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.1.tgz";
+        sha512 = "y1lGmfm38djrScwpeL37rRR9f1D6sM8RhMpvM7CYLzOlHVboouZokXK/G88BpzW0NQBSvCCOnW5BFhten4FPfA==";
       };
     };
     "@webassemblyjs/helper-buffer-1.8.1" = {
@@ -7240,13 +7186,13 @@ let
         sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==";
       };
     };
-    "@webassemblyjs/helper-code-frame-1.11.0" = {
-      name = "_at_webassemblyjs_slash_helper-code-frame";
-      packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.11.0";
+    "@webassemblyjs/helper-buffer-1.9.1" = {
+      name = "_at_webassemblyjs_slash_helper-buffer";
+      packageName = "@webassemblyjs/helper-buffer";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.11.0.tgz";
-        sha512 = "crKJ80NppRzmKB9863Xq5ufVT6he+V4A2PoBfeblFGeeCb6zig34mW97tNBzGLcuOfSsq4ncmI4QOtqQBg047g==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.1.tgz";
+        sha512 = "uS6VSgieHbk/m4GSkMU5cqe/5TekdCzQso4revCIEQ3vpGZgqSSExi4jWpTWwDpAHOIAb1Jfrs0gUB9AA4n71w==";
       };
     };
     "@webassemblyjs/helper-code-frame-1.8.1" = {
@@ -7267,31 +7213,31 @@ let
         sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==";
       };
     };
-    "@webassemblyjs/helper-compiler-1.11.0" = {
+    "@webassemblyjs/helper-code-frame-1.9.1" = {
+      name = "_at_webassemblyjs_slash_helper-code-frame";
+      packageName = "@webassemblyjs/helper-code-frame";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.1.tgz";
+        sha512 = "ZQ2ZT6Evk4DPIfD+92AraGYaFIqGm4U20e7FpXwl7WUo2Pn1mZ1v8VGH8i+Y++IQpxPbQo/UyG0Khs7eInskzA==";
+      };
+    };
+    "@webassemblyjs/helper-compiler-1.9.1" = {
       name = "_at_webassemblyjs_slash_helper-compiler";
       packageName = "@webassemblyjs/helper-compiler";
-      version = "1.11.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.11.0.tgz";
-        sha512 = "XEKiHYE951mCW3kjXXK3sHdJI+IOD8k/Vfzk55FeFRJbKxucXZEJ+H1dcDp9MK0wXLtaMSVU5RFXf7chrCjdAg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.9.1.tgz";
+        sha512 = "Qad79JaN6Qgv+lWd3sLqt206o6WRne5AynNPuLQlTlvDh8P/QsqVzf6RAJnjn9snJczXxkdN3BhWg9jSgb1sUw==";
       };
     };
-    "@webassemblyjs/helper-flatten-ast-1.11.0" = {
+    "@webassemblyjs/helper-flatten-ast-1.9.1" = {
       name = "_at_webassemblyjs_slash_helper-flatten-ast";
       packageName = "@webassemblyjs/helper-flatten-ast";
-      version = "1.11.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.11.0.tgz";
-        sha512 = "T5zOuVT4mOXuDu2elXT/0P+2hhsIj/SgUUIxGTmpak6j3XruH0hYOOcnT9ES+qQ4vN3eq63ivGnLaMmjMPcExA==";
-      };
-    };
-    "@webassemblyjs/helper-fsm-1.11.0" = {
-      name = "_at_webassemblyjs_slash_helper-fsm";
-      packageName = "@webassemblyjs/helper-fsm";
-      version = "1.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.11.0.tgz";
-        sha512 = "H0vRFj05zA2J1SVi+VdNbMwi7m0yZQhLqq7vkjYk44ilLzk0zEXaBNofKH5rQcchQUP2gdqoxLLHA9EcUdW9nw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.9.1.tgz";
+        sha512 = "wb7ZvGAzfMdgPYAR5zQwu9R/M+kmJDYXKPCJ9vCMfUn3qMoa69Tn5J+Y9u+HzX7nt3TgPvJFcVZKWxCMIhuP7w==";
       };
     };
     "@webassemblyjs/helper-fsm-1.8.1" = {
@@ -7312,6 +7258,15 @@ let
         sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==";
       };
     };
+    "@webassemblyjs/helper-fsm-1.9.1" = {
+      name = "_at_webassemblyjs_slash_helper-fsm";
+      packageName = "@webassemblyjs/helper-fsm";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.1.tgz";
+        sha512 = "J32HGpveEqqcKFS0YbgicB0zAlpfIxJa5MjxDxhu3i5ltPcVfY5EPvKQ1suRguFPehxiUs+/hfkwPEXom/l0lw==";
+      };
+    };
     "@webassemblyjs/helper-module-context-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-module-context";
       packageName = "@webassemblyjs/helper-module-context";
@@ -7330,22 +7285,13 @@ let
         sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==";
       };
     };
-    "@webassemblyjs/helper-numbers-1.11.0" = {
-      name = "_at_webassemblyjs_slash_helper-numbers";
-      packageName = "@webassemblyjs/helper-numbers";
-      version = "1.11.0";
+    "@webassemblyjs/helper-module-context-1.9.1" = {
+      name = "_at_webassemblyjs_slash_helper-module-context";
+      packageName = "@webassemblyjs/helper-module-context";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz";
-        sha512 = "DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==";
-      };
-    };
-    "@webassemblyjs/helper-wasm-bytecode-1.11.0" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
-      packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz";
-        sha512 = "MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.1.tgz";
+        sha512 = "IEH2cMmEQKt7fqelLWB5e/cMdZXf2rST1JIrzWmf4XBt3QTxGdnnLvV4DYoN8pJjOx0VYXsWg+yF16MmJtolZg==";
       };
     };
     "@webassemblyjs/helper-wasm-bytecode-1.8.1" = {
@@ -7366,13 +7312,13 @@ let
         sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.11.0" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-section";
-      packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.11.0";
+    "@webassemblyjs/helper-wasm-bytecode-1.9.1" = {
+      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
+      packageName = "@webassemblyjs/helper-wasm-bytecode";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz";
-        sha512 = "3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.1.tgz";
+        sha512 = "i2rGTBqFUcSXxyjt2K4vm/3kkHwyzG6o427iCjcIKjOqpWH8SEem+xe82jUk1iydJO250/CvE5o7hzNAMZf0dQ==";
       };
     };
     "@webassemblyjs/helper-wasm-section-1.8.1" = {
@@ -7393,13 +7339,13 @@ let
         sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==";
       };
     };
-    "@webassemblyjs/ieee754-1.11.0" = {
-      name = "_at_webassemblyjs_slash_ieee754";
-      packageName = "@webassemblyjs/ieee754";
-      version = "1.11.0";
+    "@webassemblyjs/helper-wasm-section-1.9.1" = {
+      name = "_at_webassemblyjs_slash_helper-wasm-section";
+      packageName = "@webassemblyjs/helper-wasm-section";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz";
-        sha512 = "KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.1.tgz";
+        sha512 = "FetqzjtXZr2d57IECK+aId3D0IcGweeM0CbAnJHkYJkcRTHP+YcMb7Wmc0j21h5UWBpwYGb9dSkK/93SRCTrGg==";
       };
     };
     "@webassemblyjs/ieee754-1.8.1" = {
@@ -7420,13 +7366,13 @@ let
         sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==";
       };
     };
-    "@webassemblyjs/leb128-1.11.0" = {
-      name = "_at_webassemblyjs_slash_leb128";
-      packageName = "@webassemblyjs/leb128";
-      version = "1.11.0";
+    "@webassemblyjs/ieee754-1.9.1" = {
+      name = "_at_webassemblyjs_slash_ieee754";
+      packageName = "@webassemblyjs/ieee754";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz";
-        sha512 = "aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==";
+        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.1.tgz";
+        sha512 = "EvTG9M78zP1MmkBpUjGQHZc26DzPGZSLIPxYHCjQsBMo60Qy2W34qf8z0exRDtxBbRIoiKa5dFyWer/7r1aaSQ==";
       };
     };
     "@webassemblyjs/leb128-1.8.1" = {
@@ -7447,13 +7393,13 @@ let
         sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==";
       };
     };
-    "@webassemblyjs/utf8-1.11.0" = {
-      name = "_at_webassemblyjs_slash_utf8";
-      packageName = "@webassemblyjs/utf8";
-      version = "1.11.0";
+    "@webassemblyjs/leb128-1.9.1" = {
+      name = "_at_webassemblyjs_slash_leb128";
+      packageName = "@webassemblyjs/leb128";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz";
-        sha512 = "A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.1.tgz";
+        sha512 = "Oc04ub0vFfLnF+2/+ki3AE+anmW4sv9uNBqb+79fgTaPv6xJsOT0dhphNfL3FrME84CbX/D1T9XT8tjFo0IIiw==";
       };
     };
     "@webassemblyjs/utf8-1.8.1" = {
@@ -7474,22 +7420,22 @@ let
         sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==";
       };
     };
-    "@webassemblyjs/validation-1.11.0" = {
-      name = "_at_webassemblyjs_slash_validation";
-      packageName = "@webassemblyjs/validation";
-      version = "1.11.0";
+    "@webassemblyjs/utf8-1.9.1" = {
+      name = "_at_webassemblyjs_slash_utf8";
+      packageName = "@webassemblyjs/utf8";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.11.0.tgz";
-        sha512 = "0doaNEdjsurs3hUahxqoo3AJKvz+QnsIlkDnmd6nNmlFge3ixCrA7B8Xm6vmNoBPWWZgQ0VhvHV8Qs4768q1pw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.1.tgz";
+        sha512 = "llkYtppagjCodFjo0alWOUhAkfOiQPQDIc5oA6C9sFAXz7vC9QhZf/f8ijQIX+A9ToM3c9Pq85X0EX7nx9gVhg==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.11.0" = {
-      name = "_at_webassemblyjs_slash_wasm-edit";
-      packageName = "@webassemblyjs/wasm-edit";
-      version = "1.11.0";
+    "@webassemblyjs/validation-1.9.1" = {
+      name = "_at_webassemblyjs_slash_validation";
+      packageName = "@webassemblyjs/validation";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz";
-        sha512 = "JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==";
+        url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.9.1.tgz";
+        sha512 = "a/Vh1fKuvuqff0KqA9TYATTyk/FihoVcc5vp4qhXHfKjS4J9BIW548gh5YZ81ZB39yg5TKiApRy8zMRa82Ij/A==";
       };
     };
     "@webassemblyjs/wasm-edit-1.9.0" = {
@@ -7501,13 +7447,13 @@ let
         sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==";
       };
     };
-    "@webassemblyjs/wasm-gen-1.11.0" = {
-      name = "_at_webassemblyjs_slash_wasm-gen";
-      packageName = "@webassemblyjs/wasm-gen";
-      version = "1.11.0";
+    "@webassemblyjs/wasm-edit-1.9.1" = {
+      name = "_at_webassemblyjs_slash_wasm-edit";
+      packageName = "@webassemblyjs/wasm-edit";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz";
-        sha512 = "BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.1.tgz";
+        sha512 = "S2IaD6+x9B2Xi8BCT0eGsrXXd8UxAh2LVJpg1ZMtHXnrDcsTtIX2bDjHi40Hio6Lc62dWHmKdvksI+MClCYbbw==";
       };
     };
     "@webassemblyjs/wasm-gen-1.8.1" = {
@@ -7528,13 +7474,13 @@ let
         sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.11.0" = {
-      name = "_at_webassemblyjs_slash_wasm-opt";
-      packageName = "@webassemblyjs/wasm-opt";
-      version = "1.11.0";
+    "@webassemblyjs/wasm-gen-1.9.1" = {
+      name = "_at_webassemblyjs_slash_wasm-gen";
+      packageName = "@webassemblyjs/wasm-gen";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz";
-        sha512 = "tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.1.tgz";
+        sha512 = "bqWI0S4lBQsEN5FTZ35vYzfKUJvtjNnBobB1agCALH30xNk1LToZ7Z8eiaR/Z5iVECTlBndoRQV3F6mbEqE/fg==";
       };
     };
     "@webassemblyjs/wasm-opt-1.9.0" = {
@@ -7546,13 +7492,13 @@ let
         sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.11.0" = {
-      name = "_at_webassemblyjs_slash_wasm-parser";
-      packageName = "@webassemblyjs/wasm-parser";
-      version = "1.11.0";
+    "@webassemblyjs/wasm-opt-1.9.1" = {
+      name = "_at_webassemblyjs_slash_wasm-opt";
+      packageName = "@webassemblyjs/wasm-opt";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz";
-        sha512 = "6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.1.tgz";
+        sha512 = "gSf7I7YWVXZ5c6XqTEqkZjVs8K1kc1k57vsB6KBQscSagDNbAdxt6MwuJoMjsE1yWY1tsuL+pga268A6u+Fdkg==";
       };
     };
     "@webassemblyjs/wasm-parser-1.8.1" = {
@@ -7573,13 +7519,13 @@ let
         sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==";
       };
     };
-    "@webassemblyjs/wast-parser-1.11.0" = {
-      name = "_at_webassemblyjs_slash_wast-parser";
-      packageName = "@webassemblyjs/wast-parser";
-      version = "1.11.0";
+    "@webassemblyjs/wasm-parser-1.9.1" = {
+      name = "_at_webassemblyjs_slash_wasm-parser";
+      packageName = "@webassemblyjs/wasm-parser";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.11.0.tgz";
-        sha512 = "HKFbg+HvjITWuOOWehS2EUdNZ4fsfWislwDTrxuUL6FpzrjtsASd2c4hmqNSW6c7sv5iBx1puUWwNtVqLXxFqw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.1.tgz";
+        sha512 = "ImM4N2T1MEIond0MyE3rXvStVxEmivQrDKf/ggfh5pP6EHu3lL/YTAoSrR7shrbKNPpeKpGesW1LIK/L4kqduw==";
       };
     };
     "@webassemblyjs/wast-parser-1.8.1" = {
@@ -7600,13 +7546,13 @@ let
         sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==";
       };
     };
-    "@webassemblyjs/wast-printer-1.11.0" = {
-      name = "_at_webassemblyjs_slash_wast-printer";
-      packageName = "@webassemblyjs/wast-printer";
-      version = "1.11.0";
+    "@webassemblyjs/wast-parser-1.9.1" = {
+      name = "_at_webassemblyjs_slash_wast-parser";
+      packageName = "@webassemblyjs/wast-parser";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz";
-        sha512 = "Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.1.tgz";
+        sha512 = "2xVxejXSvj3ls/o2TR/zI6p28qsGupjHhnHL6URULQRcXmryn3w7G83jQMcT7PHqUfyle65fZtWLukfdLdE7qw==";
       };
     };
     "@webassemblyjs/wast-printer-1.8.1" = {
@@ -7627,13 +7573,13 @@ let
         sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==";
       };
     };
-    "@webpack-cli/configtest-1.0.0" = {
-      name = "_at_webpack-cli_slash_configtest";
-      packageName = "@webpack-cli/configtest";
-      version = "1.0.0";
+    "@webassemblyjs/wast-printer-1.9.1" = {
+      name = "_at_webassemblyjs_slash_wast-printer";
+      packageName = "@webassemblyjs/wast-printer";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.0.tgz";
-        sha512 = "Un0SdBoN1h4ACnIO7EiCjWuyhNI0Jl96JC+63q6xi4HDUYRZn8Auluea9D+v9NWKc5J4sICVEltdBaVjLX39xw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.1.tgz";
+        sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w==";
       };
     };
     "@webpack-cli/info-1.2.1" = {
@@ -7645,13 +7591,13 @@ let
         sha512 = "fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ==";
       };
     };
-    "@webpack-cli/serve-1.2.2" = {
+    "@webpack-cli/serve-1.2.1" = {
       name = "_at_webpack-cli_slash_serve";
       packageName = "@webpack-cli/serve";
-      version = "1.2.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.2.tgz";
-        sha512 = "03GkWxcgFfm8+WIwcsqJb9agrSDNDDoxaNnexPnCCexP5SCE4IgFd9lNpSy+K2nFqVMpgTFw6SwbmVAVTndVew==";
+        url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.1.tgz";
+        sha512 = "Zj1z6AyS+vqV6Hfi7ngCjFGdHV5EwZNIHo6QfFTNe9PyW+zBU1zJ9BiOW1pmUEq950RC4+Dym6flyA/61/vhyw==";
       };
     };
     "@wry/context-0.4.4" = {
@@ -7834,6 +7780,15 @@ let
         sha1 = "c22822f87e1c939f579887504d9c109c4173829d";
       };
     };
+    "abstract-leveldown-0.12.4" = {
+      name = "abstract-leveldown";
+      packageName = "abstract-leveldown";
+      version = "0.12.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz";
+        sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
+      };
+    };
     "abstract-leveldown-6.0.3" = {
       name = "abstract-leveldown";
       packageName = "abstract-leveldown";
@@ -8131,15 +8086,6 @@ let
         sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==";
       };
     };
-    "adm-zip-0.5.1" = {
-      name = "adm-zip";
-      packageName = "adm-zip";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.1.tgz";
-        sha512 = "a5ABmIFUJ9OxHV5zrXM9Q41JzpRIflFtdgpL4UQM9DsTHHxQzPRaeyAdnMW7kxL0NRWm/NHafJdj6pO+ty7L2g==";
-      };
-    };
     "adverb-where-0.0.9" = {
       name = "adverb-where";
       packageName = "adverb-where";
@@ -8851,13 +8797,13 @@ let
         sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw==";
       };
     };
-    "apollo-2.32.1" = {
+    "apollo-2.32.0" = {
       name = "apollo";
       packageName = "apollo";
-      version = "2.32.1";
+      version = "2.32.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo/-/apollo-2.32.1.tgz";
-        sha512 = "aSjGnxxm+ZZ6uYTuGrBqtQ4e3boG408K16CbB5Zm/QHCRNHpPUz7r9VRDfAJWMFE1mBdWi+r0dyY+7FUkKeRrw==";
+        url = "https://registry.npmjs.org/apollo/-/apollo-2.32.0.tgz";
+        sha512 = "6Wmt9OUYUET3JSQvAS6qgNP+vomf3P5zANARXDhqJ59c0/hAsXhdAvGaFFba+JhRRvyIVBOmaOpB880aNZeadg==";
       };
     };
     "apollo-cache-1.3.5" = {
@@ -8869,13 +8815,13 @@ let
         sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA==";
       };
     };
-    "apollo-cache-control-0.11.6" = {
+    "apollo-cache-control-0.11.5" = {
       name = "apollo-cache-control";
       packageName = "apollo-cache-control";
-      version = "0.11.6";
+      version = "0.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.6.tgz";
-        sha512 = "YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw==";
+        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.5.tgz";
+        sha512 = "jvarfQhwDRazpOsmkt5Pd7qGFrtbL70zMbUZGqDhJSYpfqI672f7bXXc7O3vtpbD3qnS3XTBvK2kspX/Bdo0IA==";
       };
     };
     "apollo-cache-inmemory-1.6.6" = {
@@ -8896,58 +8842,58 @@ let
         sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA==";
       };
     };
-    "apollo-codegen-core-0.39.1" = {
+    "apollo-codegen-core-0.39.0" = {
       name = "apollo-codegen-core";
       packageName = "apollo-codegen-core";
-      version = "0.39.1";
+      version = "0.39.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.1.tgz";
-        sha512 = "8Sb9CN+lYR2BMeg7p3A4wjsQW7oxDTnKbueUHV/fmZU+hg2GNLXqVTdyWE2UWDEOyDTNpQMyysGEUZZBsOmBrw==";
+        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.0.tgz";
+        sha512 = "b+RD8jerDMih2vf73hodOQAx4UODy1l053/Mdr4uIBlDbaF6OA4Q8TbTbH4k7tDzyAoL2pjH5v8AtlU8viIKwg==";
       };
     };
-    "apollo-codegen-flow-0.37.1" = {
+    "apollo-codegen-flow-0.37.0" = {
       name = "apollo-codegen-flow";
       packageName = "apollo-codegen-flow";
-      version = "0.37.1";
+      version = "0.37.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.1.tgz";
-        sha512 = "XhGUzlBxi3IHCBbIsnfk0c41mz30Ky1SPSYtJzrMdtMAdUAfMEGBLXzlLqgp1iAbUegQ10zbp2kgzLG0hkeYhg==";
+        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.0.tgz";
+        sha512 = "VWB++9ObUQx+Y1JPdgrkdkjPichsgXhYfz5w5HSKvare7SlkxEZFOzSXi9/bUAC3gry3B/38do1srDHtXZ366g==";
       };
     };
-    "apollo-codegen-scala-0.38.1" = {
+    "apollo-codegen-scala-0.38.0" = {
       name = "apollo-codegen-scala";
       packageName = "apollo-codegen-scala";
-      version = "0.38.1";
+      version = "0.38.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.1.tgz";
-        sha512 = "WvIX6Gm7KHnh6FJzq/XVRyHMNwwbQEnMfRXpR9zFtaUuzZHfg9RNawtsUGMSQCnNw1sm5YLGIJvNFUp1hUEqGA==";
+        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.0.tgz";
+        sha512 = "oQAV65ZGaFGeNpxVVnZLh2kyBKfA6QzSeyosDp0HKxeXOGQ84dHJg1zGiN0oWXELBM2MqPtwWSGFYgnk3CNeHg==";
       };
     };
-    "apollo-codegen-swift-0.39.1" = {
+    "apollo-codegen-swift-0.39.0" = {
       name = "apollo-codegen-swift";
       packageName = "apollo-codegen-swift";
-      version = "0.39.1";
+      version = "0.39.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.1.tgz";
-        sha512 = "dKqDd2w2YAOkyDbDkJ5etXLdn8foNnm55r5rsIssIxCdtdR5qsusrPHQvywVjHw8ZHBy4o229dVoSzmrIUygKg==";
+        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.0.tgz";
+        sha512 = "fFaR8g62jjYS6QFW354ONcMHJNesy5EtCvYKsR9Sb1eBoLTx/6NkeMiGO28PIIk7bEw7FKMrzQE2UVNSeZbMxQ==";
       };
     };
-    "apollo-codegen-typescript-0.39.1" = {
+    "apollo-codegen-typescript-0.39.0" = {
       name = "apollo-codegen-typescript";
       packageName = "apollo-codegen-typescript";
-      version = "0.39.1";
+      version = "0.39.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.1.tgz";
-        sha512 = "cSnMrAqyK2AMZRxTsBrZZhemfv87AU0OS1/aM45WQRyQurkEjf8GmWMfp2IRkJo9m+jgdo74X5ct3KZOXbYMXg==";
+        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.0.tgz";
+        sha512 = "/clemyhTd+s+b4HoMa72zjWir4QrDqjcN4tnSpQYXSsOFO4e4kWlxSj0zrtyYkcx/Gqod9UrPSSsx2CZHyB37A==";
       };
     };
-    "apollo-datasource-0.7.3" = {
+    "apollo-datasource-0.7.2" = {
       name = "apollo-datasource";
       packageName = "apollo-datasource";
-      version = "0.7.3";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.3.tgz";
-        sha512 = "PE0ucdZYjHjUyXrFWRwT02yLcx2DACsZ0jm1Mp/0m/I9nZu/fEkvJxfsryXB6JndpmQO77gQHixf/xGCN976kA==";
+        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz";
+        sha512 = "ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw==";
       };
     };
     "apollo-env-0.6.5" = {
@@ -9067,22 +9013,22 @@ let
         sha512 = "WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw==";
       };
     };
-    "apollo-server-caching-0.5.3" = {
+    "apollo-server-caching-0.5.2" = {
       name = "apollo-server-caching";
       packageName = "apollo-server-caching";
-      version = "0.5.3";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz";
-        sha512 = "iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ==";
+        url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz";
+        sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==";
       };
     };
-    "apollo-server-core-2.19.2" = {
+    "apollo-server-core-2.19.1" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.19.2";
+      version = "2.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.2.tgz";
-        sha512 = "liLgLhTIGWZtdQbxuxo3/Yv8j+faKQcI60kOL+uwfByGhoKLZEQp5nqi2IdMK6JXt1VuyKwKu7lTzj02a9S3jA==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.1.tgz";
+        sha512 = "5EVmcY8Ij7Ywwu+Ze4VaUhZBcxl8t5ztcSatJrKMd4HYlEHyaNGBV2itfpyqAthxfdMbGKqlpeCHmTGSqDcNpA==";
       };
     };
     "apollo-server-env-2.4.5" = {
@@ -9094,15 +9040,6 @@ let
         sha512 = "nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==";
       };
     };
-    "apollo-server-env-3.0.0" = {
-      name = "apollo-server-env";
-      packageName = "apollo-server-env";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.0.0.tgz";
-        sha512 = "tPSN+VttnPsoQAl/SBVUpGbLA97MXG990XIwq6YUnJyAixrrsjW1xYG7RlaOqetxm80y5mBZKLrRDiiSsW/vog==";
-      };
-    };
     "apollo-server-errors-2.4.2" = {
       name = "apollo-server-errors";
       packageName = "apollo-server-errors";
@@ -9112,40 +9049,40 @@ let
         sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ==";
       };
     };
-    "apollo-server-express-2.19.2" = {
+    "apollo-server-express-2.19.1" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.19.2";
+      version = "2.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.2.tgz";
-        sha512 = "1v2H6BgDkS4QzRbJ9djn2o0yv5m/filbpiupxAsCG9f+sAoSlY3eYSj84Sbex2r5+4itAvT9y84WI7d9RBYs/Q==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.1.tgz";
+        sha512 = "PJQmPtV3JD7RiV6cP7JcqAwVdUq6hWUtvDIoCOxPoeUWYf79nEF4WiYsPXVF0+meLLWKlL1fuSwEEt1CEHEG5w==";
       };
     };
-    "apollo-server-plugin-base-0.10.4" = {
+    "apollo-server-plugin-base-0.10.3" = {
       name = "apollo-server-plugin-base";
       packageName = "apollo-server-plugin-base";
-      version = "0.10.4";
+      version = "0.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.4.tgz";
-        sha512 = "HRhbyHgHFTLP0ImubQObYhSgpmVH4Rk1BinnceZmwudIVLKrqayIVOELdyext/QnSmmzg5W7vF3NLGBcVGMqDg==";
+        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.3.tgz";
+        sha512 = "NCLOsk9Jsd8oLvefkQvROdMDQvnHnzbzz3MPCqEYjCOEv0YBM8T77D0wCwbcViDS2M5p0W6un2ub9s/vU71f7Q==";
       };
     };
-    "apollo-server-types-0.6.3" = {
+    "apollo-server-types-0.6.2" = {
       name = "apollo-server-types";
       packageName = "apollo-server-types";
-      version = "0.6.3";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz";
-        sha512 = "aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==";
+        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.2.tgz";
+        sha512 = "LgSKgAStiDzpUSLYwJoAmy0W8nkxx/ExMmgEPgEYVi6dKPkUmtu561J970PhGdYH+D79ke3g87D+plkUkgfnlQ==";
       };
     };
-    "apollo-tracing-0.12.2" = {
+    "apollo-tracing-0.12.1" = {
       name = "apollo-tracing";
       packageName = "apollo-tracing";
-      version = "0.12.2";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.2.tgz";
-        sha512 = "SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w==";
+        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.1.tgz";
+        sha512 = "qdkUjW+pOaidGOSITypeYE288y28HkPmGNpUtyQSOeTxgqXHtQX3TDWiOJ2SmrLH08xdSwfvz9o5KrTq4PdISg==";
       };
     };
     "apollo-upload-client-11.0.0" = {
@@ -9292,13 +9229,13 @@ let
         sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg==";
       };
     };
-    "archiver-5.2.0" = {
+    "archiver-5.1.0" = {
       name = "archiver";
       packageName = "archiver";
-      version = "5.2.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz";
-        sha512 = "QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ==";
+        url = "https://registry.npmjs.org/archiver/-/archiver-5.1.0.tgz";
+        sha512 = "iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA==";
       };
     };
     "archiver-utils-2.1.0" = {
@@ -10237,13 +10174,13 @@ let
         sha512 = "zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw==";
       };
     };
-    "async-mutex-0.2.6" = {
+    "async-mutex-0.2.4" = {
       name = "async-mutex";
       packageName = "async-mutex";
-      version = "0.2.6";
+      version = "0.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.6.tgz";
-        sha512 = "Hs4R+4SPgamu6rSGW8C7cV9gaWUKEHykfzCCvIRuaVv636Ju10ZdeUbvb4TBEW0INuq2DHZqXbK4Nd3yG4RaRw==";
+        url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.4.tgz";
+        sha512 = "fcQKOXUKMQc57JlmjBCHtkKNrfGpHyR7vu18RfuLfeTAf4hK9PgOadPR5cDrBQ682zasrLUhJFe7EKAHJOduDg==";
       };
     };
     "async-retry-1.3.1" = {
@@ -10462,13 +10399,13 @@ let
         sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
       };
     };
-    "aws-sdk-2.830.0" = {
+    "aws-sdk-2.821.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.830.0";
+      version = "2.821.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.830.0.tgz";
-        sha512 = "vFatoWkdJmRzpymWbqsuwVsAJdhdAvU2JcM9jKRENTNKJw90ljnLyeP1eKCp4O3/4Lg43PVBwY/KUqPy4wL+OA==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.821.0.tgz";
+        sha512 = "UtUlURMzmns1Wq8uAdJcyKsm/nW7iRYgTQEONQIpud0xwtjpPPR1pBFB0RSNZuYnZxcWboo807+jxq+LjaBEKA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -10507,6 +10444,15 @@ let
         sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d";
       };
     };
+    "axios-0.18.1" = {
+      name = "axios";
+      packageName = "axios";
+      version = "0.18.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz";
+        sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==";
+      };
+    };
     "axios-0.19.0" = {
       name = "axios";
       packageName = "axios";
@@ -10525,15 +10471,6 @@ let
         sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
       };
     };
-    "axios-0.21.1" = {
-      name = "axios";
-      packageName = "axios";
-      version = "0.21.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
-        sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
-      };
-    };
     "axios-retry-3.1.9" = {
       name = "axios-retry";
       packageName = "axios-retry";
@@ -11218,6 +11155,15 @@ let
         sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
       };
     };
+    "base64-js-1.3.1" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+        sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
+      };
+    };
     "base64-js-1.5.1" = {
       name = "base64-js";
       packageName = "base64-js";
@@ -11641,13 +11587,13 @@ let
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
-    "binary-extensions-2.2.0" = {
+    "binary-extensions-2.1.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
-        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
+        sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
       };
     };
     "binary-search-1.3.6" = {
@@ -11857,6 +11803,15 @@ let
         sha512 = "5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg==";
       };
     };
+    "bl-0.8.2" = {
+      name = "bl";
+      packageName = "bl";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
+        sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
+      };
+    };
     "bl-1.2.3" = {
       name = "bl";
       packageName = "bl";
@@ -11929,13 +11884,13 @@ let
         sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
       };
     };
-    "blessed-contrib-4.8.21" = {
+    "blessed-contrib-4.8.20" = {
       name = "blessed-contrib";
       packageName = "blessed-contrib";
-      version = "4.8.21";
+      version = "4.8.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.21.tgz";
-        sha512 = "zdQMO3UyfhdG0S+Zqn7YexI6BHlnO26qxBKc9jzgyZdIoq7nELiGM/V89CvrTPblZGQr3eMUqCy7pxlKm3vCYA==";
+        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.20.tgz";
+        sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ==";
       };
     };
     "blgr-0.1.8" = {
@@ -12235,13 +12190,13 @@ let
         sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812";
       };
     };
-    "bower-1.8.12" = {
+    "bower-1.8.8" = {
       name = "bower";
       packageName = "bower";
-      version = "1.8.12";
+      version = "1.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz";
-        sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q==";
+        url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz";
+        sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A==";
       };
     };
     "bower-endpoint-parser-0.2.1" = {
@@ -12307,15 +12262,6 @@ let
         sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==";
       };
     };
-    "boxen-5.0.0" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-5.0.0.tgz";
-        sha512 = "5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA==";
-      };
-    };
     "bplist-creator-0.0.6" = {
       name = "bplist-creator";
       packageName = "bplist-creator";
@@ -12532,6 +12478,15 @@ let
         sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
       };
     };
+    "browserify-fs-1.0.0" = {
+      name = "browserify-fs";
+      packageName = "browserify-fs";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserify-fs/-/browserify-fs-1.0.0.tgz";
+        sha1 = "f075aa8a729d4d1716d066620e386fcc1311a96f";
+      };
+    };
     "browserify-incremental-3.1.1" = {
       name = "browserify-incremental";
       packageName = "browserify-incremental";
@@ -12604,13 +12559,13 @@ let
         sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
       };
     };
-    "browserslist-4.16.1" = {
+    "browserslist-4.16.0" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.16.1";
+      version = "4.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz";
-        sha512 = "UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz";
+        sha512 = "/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==";
       };
     };
     "brq-0.1.8" = {
@@ -13090,15 +13045,6 @@ let
         sha512 = "LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg==";
       };
     };
-    "bunyan-1.8.15" = {
-      name = "bunyan";
-      packageName = "bunyan";
-      version = "1.8.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz";
-        sha512 = "0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==";
-      };
-    };
     "bunyan-syslog-udp-0.2.0" = {
       name = "bunyan-syslog-udp";
       packageName = "bunyan-syslog-udp";
@@ -13333,13 +13279,13 @@ let
         sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==";
       };
     };
-    "call-bind-1.0.2" = {
+    "call-bind-1.0.0" = {
       name = "call-bind";
       packageName = "call-bind";
-      version = "1.0.2";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
-        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
+        sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
       };
     };
     "call-me-maybe-1.0.1" = {
@@ -13567,13 +13513,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001179" = {
+    "caniuse-lite-1.0.30001173" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001179";
+      version = "1.0.30001173";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz";
-        sha512 = "blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz";
+        sha512 = "R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==";
       };
     };
     "canvas-2.6.1" = {
@@ -13693,22 +13639,22 @@ let
         sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==";
       };
     };
-    "cdk8s-1.0.0-beta.6" = {
+    "cdk8s-1.0.0-beta.5" = {
       name = "cdk8s";
       packageName = "cdk8s";
-      version = "1.0.0-beta.6";
+      version = "1.0.0-beta.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.6.tgz";
-        sha512 = "L/J8c7/wSEY2POx5j9SnxxgEJ7V7mFYS3F9pGj2idUfj4GCHbMLCGXQ8bAPzaiWOFSEDVMOPBOangLEia+5RBw==";
+        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.5.tgz";
+        sha512 = "E4l89rGnMI+OCdVojw0vV9xjkNgk9qMswkWc10hZLwwozhnx3ITMVgyjlRiZnCBIKMnKYY8ZhyMgEGgSVpR5fw==";
       };
     };
-    "cdktf-0.1.0" = {
+    "cdktf-0.0.19" = {
       name = "cdktf";
       packageName = "cdktf";
-      version = "0.1.0";
+      version = "0.0.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdktf/-/cdktf-0.1.0.tgz";
-        sha512 = "6PKMz7dkou3qrHD+rnj7fa8U+XujkRUVHsWcVaH7faCxBCIGSxUz0TFb8KeY//o0MHg285Agt1NTCgFIpJ7Clg==";
+        url = "https://registry.npmjs.org/cdktf/-/cdktf-0.0.19.tgz";
+        sha512 = "fBOl+yqMdMNRGNvLwAxOpE38PxHJG5Tdi/3J/Ag+KJwaDEXa/v5+ogwPxNtZ0dUdvZq2ovti9zbhdIPr59BvYQ==";
       };
     };
     "center-align-0.1.3" = {
@@ -14134,15 +14080,6 @@ let
         sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
       };
     };
-    "chokidar-3.5.1" = {
-      name = "chokidar";
-      packageName = "chokidar";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz";
-        sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==";
-      };
-    };
     "chownr-0.0.2" = {
       name = "chownr";
       packageName = "chownr";
@@ -14836,6 +14773,15 @@ let
         sha1 = "b8d19188b3243e390f302410bd0cb1622db82649";
       };
     };
+    "clone-0.1.19" = {
+      name = "clone";
+      packageName = "clone";
+      version = "0.1.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz";
+        sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85";
+      };
+    };
     "clone-0.1.5" = {
       name = "clone";
       packageName = "clone";
@@ -15124,13 +15070,13 @@ let
         sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg==";
       };
     };
-    "codemaker-1.17.1" = {
+    "codemaker-1.16.0" = {
       name = "codemaker";
       packageName = "codemaker";
-      version = "1.17.1";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/codemaker/-/codemaker-1.17.1.tgz";
-        sha512 = "V0oeZjQ0nZgpFErZPn66sVCHwrDvivS+M0xR1gesBNGDpE4ROja6IJXbPVVg/N3S4kYHAXcYuWHdfiEQE2PfwA==";
+        url = "https://registry.npmjs.org/codemaker/-/codemaker-1.16.0.tgz";
+        sha512 = "kC53r6ACRGYcSAKeOcbcUhWZYWynIuBIQ50oLOYUygShjrqF0NO303eSvOzT0Qxaz2TQWI2deUwJBMm3s8HoZg==";
       };
     };
     "codepage-1.4.0" = {
@@ -15646,15 +15592,6 @@ let
         sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
       };
     };
-    "commander-7.0.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz";
-        sha512 = "ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==";
-      };
-    };
     "commandpost-1.4.0" = {
       name = "commandpost";
       packageName = "commandpost";
@@ -16159,13 +16096,13 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "constructs-3.2.112" = {
+    "constructs-3.2.94" = {
       name = "constructs";
       packageName = "constructs";
-      version = "3.2.112";
+      version = "3.2.94";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-3.2.112.tgz";
-        sha512 = "FwhMxwCn5/fl3hig1go1BpVV3klkMCjhGjfjxb+qZe1/S82Nm5TRNsU3A+03+8kXFmt6Ldsao+yO3TPedSROwQ==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-3.2.94.tgz";
+        sha512 = "yK4FKT+hONiC0ebCM0Ln3xuLPF4WPyZSQ8Sl/ZOTTFUI+/csBBxGy7TkY2ZVTbOi7MCHUatZgW2ANsYRaaxoOQ==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -16646,22 +16583,22 @@ let
         sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==";
       };
     };
-    "core-js-3.8.3" = {
+    "core-js-3.8.2" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.8.3";
+      version = "3.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz";
-        sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz";
+        sha512 = "FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A==";
       };
     };
-    "core-js-compat-3.8.3" = {
+    "core-js-compat-3.8.2" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.8.3";
+      version = "3.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz";
-        sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz";
+        sha512 = "LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -18338,13 +18275,13 @@ let
         sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==";
       };
     };
-    "dayjs-1.10.3" = {
+    "dayjs-1.10.1" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.10.3";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.3.tgz";
-        sha512 = "/2fdLN987N8Ki7Id8BUN2nhuiRyxTLumQnSQf9CNncFCyqFsSKb9TNhzRYcC8K8eJSJOKvbvkImo/MKKhNi4iw==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.1.tgz";
+        sha512 = "2xg7JrHQeLBQFkvTumLoy62x1siyeocc98QwjtURgvRqOPYmAkMUdmSjrOA+MlmL6QMQn5MUhDf6rNZNuPc1LQ==";
       };
     };
     "dayjs-1.8.36" = {
@@ -18959,6 +18896,15 @@ let
         sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A==";
       };
     };
+    "deferred-leveldown-0.2.0" = {
+      name = "deferred-leveldown";
+      packageName = "deferred-leveldown";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz";
+        sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
+      };
+    };
     "deferred-leveldown-5.3.0" = {
       name = "deferred-leveldown";
       packageName = "deferred-leveldown";
@@ -19130,6 +19076,15 @@ let
         sha1 = "3a36287f5034e699e7577901052c2e6c94251631";
       };
     };
+    "denque-1.4.1" = {
+      name = "denque";
+      packageName = "denque";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
+        sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==";
+      };
+    };
     "denque-1.5.0" = {
       name = "denque";
       packageName = "denque";
@@ -19823,22 +19778,22 @@ let
         sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ==";
       };
     };
-    "dockerfile-language-service-0.2.0" = {
+    "dockerfile-language-service-0.1.1" = {
       name = "dockerfile-language-service";
       packageName = "dockerfile-language-service";
-      version = "0.2.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.2.0.tgz";
-        sha512 = "Y1JYIDF8F78kNDwyoQoeAPzptJRubIaMJ5q4mATmeDViGVV+mY4m6BjHqw5XtlkHEftljgqMNDvbUORUDIzTHg==";
+        url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.1.1.tgz";
+        sha512 = "Lw4QlxJoy9F1559wxX+0xe5iSNK95Fbzx/YhdmAzfwgbPvdPzvFouIuuMyMPj/Q5JyFH1QAr7VeagOe24w0cqg==";
       };
     };
-    "dockerfile-utils-0.2.0" = {
+    "dockerfile-utils-0.1.1" = {
       name = "dockerfile-utils";
       packageName = "dockerfile-utils";
-      version = "0.2.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.2.0.tgz";
-        sha512 = "B8tEGwLd3w0dWALshXS0gkAwDYdqFKAKm9zIyp/nCFkx8+BOhbz5CiAFlVU+WRvv6kd6AP/YtYVOzSL54MJlmQ==";
+        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.1.1.tgz";
+        sha512 = "ddAA8PCAcT4pBQ1AFRnPjetJ31/7BqNKLHQkZebNE0hBAiOr8SzrnIWvJUcBDHrVbASCVl1Ye37hbaTsUmYHsw==";
       };
     };
     "doctrine-2.1.0" = {
@@ -20543,13 +20498,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.642" = {
+    "electron-to-chromium-1.3.634" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.642";
+      version = "1.3.634";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz";
-        sha512 = "cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.634.tgz";
+        sha512 = "QPrWNYeE/A0xRvl/QP3E0nkaEvYUvH3gM04ZWYtIa6QlSpEetRlRI1xvQ7hiMIySHHEV+mwDSX8Kj4YZY6ZQAw==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -20631,7 +20586,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         name = "emitter-1.0.1.tar.gz";
-        url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1";
+        url = https://codeload.github.com/component/emitter/tar.gz/1.0.1;
         sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
       };
     };
@@ -20887,15 +20842,6 @@ let
         sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA==";
       };
     };
-    "engine.io-4.1.0" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.0.tgz";
-        sha512 = "vW7EAtn0HDQ4MtT5QbmCHF17TaYLONv2/JwdYsq9USPRZVM4zG7WB3k0Nc321z8EuSOlhGokrYlYx4176QhD0A==";
-      };
-    };
     "engine.io-client-1.3.1" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -20959,22 +20905,22 @@ let
         sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359";
       };
     };
-    "enhanced-resolve-4.5.0" = {
+    "enhanced-resolve-4.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "4.5.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz";
-        sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz";
+        sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==";
       };
     };
-    "enhanced-resolve-5.7.0" = {
+    "enhanced-resolve-5.4.1" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "5.7.0";
+      version = "5.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz";
-        sha512 = "6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.4.1.tgz";
+        sha512 = "4GbyIMzYktTFoRSmkbgZ1LU+RXwf4AQ8Z+rSuuh1dC8plp0PPeaWvx6+G4hh4KnUJ48VoxKbNyA1QQQIUpXjYA==";
       };
     };
     "enquirer-2.3.6" = {
@@ -21220,13 +21166,13 @@ let
         sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==";
       };
     };
-    "es-abstract-1.18.0-next.2" = {
+    "es-abstract-1.18.0-next.1" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.18.0-next.2";
+      version = "1.18.0-next.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
-        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz";
+        sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==";
       };
     };
     "es-get-iterator-1.1.1" = {
@@ -21238,15 +21184,6 @@ let
         sha512 = "qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw==";
       };
     };
-    "es-module-lexer-0.3.26" = {
-      name = "es-module-lexer";
-      packageName = "es-module-lexer";
-      version = "0.3.26";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.3.26.tgz";
-        sha512 = "Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA==";
-      };
-    };
     "es-to-primitive-1.2.1" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
@@ -21589,13 +21526,13 @@ let
         sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
       };
     };
-    "eslint-7.18.0" = {
+    "eslint-7.17.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.18.0";
+      version = "7.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz";
-        sha512 = "fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz";
+        sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==";
       };
     };
     "eslint-plugin-no-unsanitized-3.1.4" = {
@@ -22561,13 +22498,13 @@ let
         sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ==";
       };
     };
-    "express-openapi-7.2.3" = {
+    "express-openapi-7.2.0" = {
       name = "express-openapi";
       packageName = "express-openapi";
-      version = "7.2.3";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.2.3.tgz";
-        sha512 = "j79aEXtTKJ6yp5XM+YPGn14GOaODGovDbvuCJzrG0KbaIB2v0liq9ezpvufqsb5ixXZ3jsu+B2FuJJOvUUjW2Q==";
+        url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.2.0.tgz";
+        sha512 = "Zlz1qA5DA5vRj8UrWFNH5cA1js5g0VB5yRIR1cuxPGAclsU8q7Y6Dvx/BhQ10/OGYd8qwFk4mFvDYahSEQe7gw==";
       };
     };
     "express-session-1.17.1" = {
@@ -22948,13 +22885,13 @@ let
         sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==";
       };
     };
-    "fast-glob-3.2.5" = {
+    "fast-glob-3.2.4" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.2.5";
+      version = "3.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz";
-        sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz";
+        sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==";
       };
     };
     "fast-json-parse-1.0.3" = {
@@ -23849,13 +23786,13 @@ let
         sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
       };
     };
-    "flatted-3.1.1" = {
+    "flatted-3.1.0" = {
       name = "flatted";
       packageName = "flatted";
-      version = "3.1.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz";
-        sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==";
+        url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz";
+        sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==";
       };
     };
     "flatten-0.0.1" = {
@@ -23885,13 +23822,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.143.0" = {
+    "flow-parser-0.141.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.143.0";
+      version = "0.141.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.143.0.tgz";
-        sha512 = "PCKiRLALyu/L7b8vN63TCgvpV+vZJVAijPna2SAsSjzDDvQryZjiQMGUIEbbkpGpWVjEtQqyImBK7vSK49ufMg==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.141.0.tgz";
+        sha512 = "WKdBiR9sDfkgEyPGhIgldUrVM08D57CgHLgd0FOXbhcVYXNfw+eHSApQ8SdcdQQoqrOvhlcVRB8lsn9bD5GQOw==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -23993,13 +23930,13 @@ let
         sha512 = "uPTT5I26ePMc6Xhjebu1aiaHAd7P3EqyE9SZB6B9ZIvXtMXhFYNk7iO1yzh1ZXp3aYzdYmrI9k8mSz9urZ9gNQ==";
       };
     };
-    "flumeview-reduce-1.4.0" = {
+    "flumeview-reduce-1.3.17" = {
       name = "flumeview-reduce";
       packageName = "flumeview-reduce";
-      version = "1.4.0";
+      version = "1.3.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.4.0.tgz";
-        sha512 = "ShCMtY5YZl3icnUAWTfwzRXSGN1AUo4Isj1wTRLpMMNgM9p1T0gc6N+r1ajampf1GO19SkqrgZHdPPOaEitvhg==";
+        url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.17.tgz";
+        sha512 = "Li09TntlRpN51GtFKllIh5nDdBcyDazvi5a/yvbdUCS9xAFb8OA6H6uu32W9gG+4GyvfUi9AsOyN8RQ8OcREQA==";
       };
     };
     "flush-write-stream-1.1.1" = {
@@ -24569,15 +24506,6 @@ let
         sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==";
       };
     };
-    "fs-extra-9.1.0" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "9.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz";
-        sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==";
-      };
-    };
     "fs-minipass-1.2.7" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
@@ -24785,13 +24713,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "fuse.js-6.4.6" = {
+    "fuse.js-6.4.5" = {
       name = "fuse.js";
       packageName = "fuse.js";
-      version = "6.4.6";
+      version = "6.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.6.tgz";
-        sha512 = "/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw==";
+        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.5.tgz";
+        sha512 = "AIHjOhexWVqs/jWqun6jTUfdXB3Bm1uShoirHvTZImD2kHEQZ1zOmoDEqIPs8N1LnnwXJeG0T+r9ilEeJzlaoA==";
       };
     };
     "fuzzy-0.1.3" = {
@@ -24821,6 +24749,15 @@ let
         sha1 = "979e22f9451b4b38f051f7937c919dbacc692958";
       };
     };
+    "fwd-stream-1.0.4" = {
+      name = "fwd-stream";
+      packageName = "fwd-stream";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz";
+        sha1 = "ed281cabed46feecf921ee32dc4c50b372ac7cfa";
+      };
+    };
     "fx-runner-1.0.13" = {
       name = "fx-runner";
       packageName = "fx-runner";
@@ -24956,13 +24893,13 @@ let
         sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
       };
     };
-    "geoip-country-4.0.52" = {
+    "geoip-country-4.0.49" = {
       name = "geoip-country";
       packageName = "geoip-country";
-      version = "4.0.52";
+      version = "4.0.49";
       src = fetchurl {
-        url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.52.tgz";
-        sha512 = "sJQR7peegqkHNOVTk6IFiVDHNor48jdHA/RGvsCkV041TBZmImqV1ixf/0BohpgIIS+O5h/Iu6XatGBEpszigA==";
+        url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.49.tgz";
+        sha512 = "oeiRP6aiDBplorW2tl0Rm2k6iNlqrLI9Smn9lk4yBUSsMOqeUHqI7gXBKP59iMZqWq2emclX1IfJL665FX7btQ==";
       };
     };
     "get-amd-module-type-3.0.0" = {
@@ -25406,6 +25343,15 @@ let
         sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ==";
       };
     };
+    "git-url-parse-11.4.0" = {
+      name = "git-url-parse";
+      packageName = "git-url-parse";
+      version = "11.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.0.tgz";
+        sha512 = "KlIa5jvMYLjXMQXkqpFzobsyD/V2K5DRHl5OAf+6oDFPlPLxrGDVQlIdI63c4/Kt6kai4kALENSALlzTGST3GQ==";
+      };
+    };
     "git-url-parse-11.4.3" = {
       name = "git-url-parse";
       packageName = "git-url-parse";
@@ -25691,7 +25637,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         name = "global-2.0.1.tar.gz";
-        url = "https://codeload.github.com/component/global/tar.gz/v2.0.1";
+        url = https://codeload.github.com/component/global/tar.gz/v2.0.1;
         sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785";
       };
     };
@@ -25830,15 +25776,6 @@ let
         sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==";
       };
     };
-    "globby-11.0.2" = {
-      name = "globby";
-      packageName = "globby";
-      version = "11.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz";
-        sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==";
-      };
-    };
     "globby-4.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -25947,13 +25884,13 @@ let
         sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
       };
     };
-    "google-auth-library-6.1.4" = {
+    "google-auth-library-6.1.3" = {
       name = "google-auth-library";
       packageName = "google-auth-library";
-      version = "6.1.4";
+      version = "6.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.4.tgz";
-        sha512 = "q0kYtGWnDd9XquwiQGAZeI2Jnglk7NDi0cChE4tWp6Kpo/kbqnt9scJb0HP+/xqt03Beqw/xQah1OPrci+pOxw==";
+        url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.3.tgz";
+        sha512 = "m9mwvY3GWbr7ZYEbl61isWmk+fvTmOt0YNUfPOUY2VH8K5pZlAIWJjxEi0PqR3OjMretyiQLI6GURMrPSwHQ2g==";
       };
     };
     "google-closure-compiler-js-20170910.0.1" = {
@@ -25965,13 +25902,13 @@ let
         sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew==";
       };
     };
-    "google-gax-2.10.0" = {
+    "google-gax-2.9.2" = {
       name = "google-gax";
       packageName = "google-gax";
-      version = "2.10.0";
+      version = "2.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/google-gax/-/google-gax-2.10.0.tgz";
-        sha512 = "K+1JK5ofNl5k30LsI8UQb/DeLMEbhL/SWirCx0L9pnMcApSfAjRAO7yajXT5X1vicxDBnNSwKs+cu4elxpYraw==";
+        url = "https://registry.npmjs.org/google-gax/-/google-gax-2.9.2.tgz";
+        sha512 = "Pve4osEzNKpBZqFXMfGKBbKCtgnHpUe5IQMh5Ou+Xtg8nLcba94L3gF0xgM5phMdGRRqJn0SMjcuEVmOYu7EBg==";
       };
     };
     "google-p12-pem-3.0.3" = {
@@ -26235,13 +26172,13 @@ let
         sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g==";
       };
     };
-    "graphql-extensions-0.12.8" = {
+    "graphql-extensions-0.12.7" = {
       name = "graphql-extensions";
       packageName = "graphql-extensions";
-      version = "0.12.8";
+      version = "0.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.8.tgz";
-        sha512 = "xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg==";
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.7.tgz";
+        sha512 = "yc9qOmEmWVZNkux9m0eCiHdtYSwNZRHkFhgfKfDn4u/gpsJolft1iyMUADnG/eytiRW0CGZFBpZjHkJhpginuQ==";
       };
     };
     "graphql-subscriptions-1.1.0" = {
@@ -26307,13 +26244,13 @@ let
         sha512 = "U2OiDI5VxYmzRKw0Z2dmfk0zkqMRaecH9Smh1U277gVgVe9Qn+18xqf4skwr4YJszGIh7iQDZ57+5ygOK9sM/Q==";
       };
     };
-    "graphql-ws-4.1.0" = {
+    "graphql-ws-3.1.0" = {
       name = "graphql-ws";
       packageName = "graphql-ws";
-      version = "4.1.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.1.0.tgz";
-        sha512 = "DxJP1y2YzCqVLy7DrQN0iuR2l48vMOBWukX2d/J9aN2o5x9un5psIIq/2UFRh91UGARmfvPH86y1p4qbC1dITg==";
+        url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-3.1.0.tgz";
+        sha512 = "zbex3FSiFz0iRgfkzDNWpOY/sYWoX+iZ5XUhakaDwOh99HSuk8rPt5suuxdXUVzEg5TGQ9rwzNaz/+mTPtS0yg==";
       };
     };
     "gray-matter-2.1.1" = {
@@ -26379,13 +26316,13 @@ let
         sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==";
       };
     };
-    "gtoken-5.2.0" = {
+    "gtoken-5.1.0" = {
       name = "gtoken";
       packageName = "gtoken";
-      version = "5.2.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gtoken/-/gtoken-5.2.0.tgz";
-        sha512 = "qbf6JWEYFMj3WMAluvYXl8GAiji6w8d9OmAGCbBg0xF4xD/yu6ZaO6BhoXNddRjKcOUpZD81iea1H5B45gAo1g==";
+        url = "https://registry.npmjs.org/gtoken/-/gtoken-5.1.0.tgz";
+        sha512 = "4d8N6Lk8TEAHl9vVoRVMh9BNOKWVgl2DdNtr3428O75r3QFrF/a5MMu851VmK0AA8+iSvbwRv69k5XnMLURGhg==";
       };
     };
     "gulp-4.0.2" = {
@@ -28072,6 +28009,15 @@ let
         sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA==";
       };
     };
+    "idb-wrapper-1.7.2" = {
+      name = "idb-wrapper";
+      packageName = "idb-wrapper";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/idb-wrapper/-/idb-wrapper-1.7.2.tgz";
+        sha512 = "zfNREywMuf0NzDo9mVsL0yegjsirJxHpKHvWcyRozIqQy89g0a3U+oBPOCN4cc0oCiOuYgZHimzaW/R46G1Mpg==";
+      };
+    };
     "idx-2.4.0" = {
       name = "idx";
       packageName = "idx";
@@ -28261,6 +28207,15 @@ let
         sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
       };
     };
+    "import-fresh-3.2.1" = {
+      name = "import-fresh";
+      packageName = "import-fresh";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz";
+        sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==";
+      };
+    };
     "import-fresh-3.3.0" = {
       name = "import-fresh";
       packageName = "import-fresh";
@@ -28495,6 +28450,15 @@ let
         sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
       };
     };
+    "ini-1.3.6" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.6.tgz";
+        sha512 = "IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg==";
+      };
+    };
     "ini-1.3.7" = {
       name = "ini";
       packageName = "ini";
@@ -29089,6 +29053,15 @@ let
         sha1 = "2ca9b033651111855412f16be5d77c62a458a766";
       };
     };
+    "is-0.2.7" = {
+      name = "is";
+      packageName = "is";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is/-/is-0.2.7.tgz";
+        sha1 = "3b34a2c48f359972f35042849193ae7264b63562";
+      };
+    };
     "is-3.3.0" = {
       name = "is";
       packageName = "is";
@@ -29854,6 +29827,15 @@ let
         sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==";
       };
     };
+    "is-object-0.1.2" = {
+      name = "is-object";
+      packageName = "is-object";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz";
+        sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7";
+      };
+    };
     "is-object-1.0.2" = {
       name = "is-object";
       packageName = "is-object";
@@ -30511,6 +30493,15 @@ let
         sha512 = "ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==";
       };
     };
+    "isbuffer-0.0.0" = {
+      name = "isbuffer";
+      packageName = "isbuffer";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isbuffer/-/isbuffer-0.0.0.tgz";
+        sha1 = "38c146d9df528b8bf9b0701c3d43cf12df3fc39b";
+      };
+    };
     "isemail-3.2.0" = {
       name = "isemail";
       packageName = "isemail";
@@ -30961,13 +30952,13 @@ let
         sha512 = "Apz3AqpJhToFlo70mwnlbVyqhJRagzhNKKp84ZMeTqe/Ay9oIno8unm7eFepdlR8m8wz/9JXJQxUjK/3Ku/cpg==";
       };
     };
-    "jpeg-js-0.4.3" = {
+    "jpeg-js-0.4.2" = {
       name = "jpeg-js";
       packageName = "jpeg-js";
-      version = "0.4.3";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz";
-        sha512 = "ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==";
+        url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz";
+        sha512 = "+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw==";
       };
     };
     "jpeg-turbo-0.4.0" = {
@@ -30997,13 +30988,13 @@ let
         sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
       };
     };
-    "jquery.terminal-2.20.2" = {
+    "jquery.terminal-2.20.1" = {
       name = "jquery.terminal";
       packageName = "jquery.terminal";
-      version = "2.20.2";
+      version = "2.20.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.2.tgz";
-        sha512 = "f3heC+hG2NE9tuJmGI3g5fR/KoD1/G31rJlXjVYPU2oBqbPQXRiiYvW78mm4aK9+IClYhMoqXiKxdzWIxjAxxA==";
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.1.tgz";
+        sha512 = "XDXH/psm0BquAmQEwomn1g9lYBGS/P6laRgWC/gADi6eJjEBWeyuiP9F5nzoEVhEa2VDnEYbvfm/MBA5DcrvdA==";
       };
     };
     "js-base64-2.6.4" = {
@@ -31015,13 +31006,13 @@ let
         sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==";
       };
     };
-    "js-beautify-1.13.4" = {
+    "js-beautify-1.13.0" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.13.4";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.4.tgz";
-        sha512 = "M5yEWwonlEO3kPcCZ3K3KBSpFRZAEO3FAWC6wtbIGeyg7dusStxvF0WG+HRLBoMZqREXSRSxkkqClDE865x1sg==";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz";
+        sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA==";
       };
     };
     "js-message-1.0.7" = {
@@ -31258,49 +31249,49 @@ let
         sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
       };
     };
-    "jsii-1.17.1" = {
+    "jsii-1.16.0" = {
       name = "jsii";
       packageName = "jsii";
-      version = "1.17.1";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii/-/jsii-1.17.1.tgz";
-        sha512 = "Hx2oJjD7mXWD73A8yRkNzE9QDkfn+oDNUAwQgeMV5xteBvrzKFwiToucMTrPPVL/KO2mEXvWP2Or7MY03DFu7w==";
+        url = "https://registry.npmjs.org/jsii/-/jsii-1.16.0.tgz";
+        sha512 = "8cgroyD6LOlFUlXUMAmjtUhzgyF3oQpVVpIdDzqcn2dNgs7iDnZN/Wo27MfZj8usbIBLLK3DYv7DSf+0/H0yWA==";
       };
     };
-    "jsii-pacmak-1.17.1" = {
+    "jsii-pacmak-1.16.0" = {
       name = "jsii-pacmak";
       packageName = "jsii-pacmak";
-      version = "1.17.1";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.17.1.tgz";
-        sha512 = "9vxNObAkAqzRaU5qcFzJmi6gYQ6fllOqgGjqaEWdWlcMFx2XzgSOtALrksi/YRLwuZtPCZrUnSEV5SeralSkUg==";
+        url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.16.0.tgz";
+        sha512 = "fjNiW8CliOO/GTzbhdA3kJGBvG1PDh2suQKfsUdh2sD0HSRmQPSpVydSmK0pfav7PD6OOfXsWvWI6WlKzNY0pg==";
       };
     };
-    "jsii-reflect-1.17.1" = {
+    "jsii-reflect-1.16.0" = {
       name = "jsii-reflect";
       packageName = "jsii-reflect";
-      version = "1.17.1";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.17.1.tgz";
-        sha512 = "u3Pn/iCZriV6fD77Ettc975XIcGTIz0fjGeStwGIVyb9pcoQiF+WXdg8H9iRr17Rx+m6DTvbRukrszPDX6nMSA==";
+        url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.16.0.tgz";
+        sha512 = "1zxZwni5S9WUQrNJJA+fVVkd1s54u6fdxjuiHpkZUvxkcPUnsuurL8KWImMEvbdz5ykGHEmnjMOOiyRh/XEc2Q==";
       };
     };
-    "jsii-rosetta-1.17.1" = {
+    "jsii-rosetta-1.16.0" = {
       name = "jsii-rosetta";
       packageName = "jsii-rosetta";
-      version = "1.17.1";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.17.1.tgz";
-        sha512 = "Nws1f4FE0qNTJLWoP6Q/jwWYcR2uHB0pQ5AsyR5oVwrJiXjZ06vUD9oJu7GuXb9BxKVf5gJVc6Hh478SwOwF6A==";
+        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.16.0.tgz";
+        sha512 = "1FFGV+JmwyljCNjc9bkW40MIQXvPgNxq+V3zx8/0+FM51S/0O5EvTa/413LX8fzB8sWH0G42NqFa+8k3k9s2hw==";
       };
     };
-    "jsii-srcmak-0.1.204" = {
+    "jsii-srcmak-0.1.180" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.204";
+      version = "0.1.180";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.204.tgz";
-        sha512 = "i+x6t4qf2mY/pd6ZRz9euKlZNcv2dGuKu4ZlDfR2Wl7kQwE6FFmPtPbq1dCMy/yCSAYjSVXAd2FQEHIXhkDhbw==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.180.tgz";
+        sha512 = "U9CmoEM6A7ZhIT66N8r9flPKUsNnkCu5iWkzH9k6sdNwbiEC5KT4MdJUfJ42L1AbX1BXwhmQtFyj7QvKdGI44g==";
       };
     };
     "json-bigint-0.2.3" = {
@@ -31582,13 +31573,13 @@ let
         sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ==";
       };
     };
-    "json2jsii-0.1.188" = {
+    "json2jsii-0.1.172" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.1.188";
+      version = "0.1.172";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.188.tgz";
-        sha512 = "XeUcBQl0rngTFmiSIx0XNW+g0QgAJcqwsUYzvGcDPPSvPngIGmJ/X6d0UH/nDmSVyEilYyKnVP7iYh3y9by9fA==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.172.tgz";
+        sha512 = "X78nchCnnN0M3x6byBMhR9X5fz5BETDxFmAE149WUpMn0Dh6Dg3c7H9FbQkRV1MVaqC0sLJHGIeO++hfgYpa7w==";
       };
     };
     "json3-3.2.6" = {
@@ -32213,13 +32204,13 @@ let
         sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==";
       };
     };
-    "khroma-1.2.0" = {
+    "khroma-1.1.1" = {
       name = "khroma";
       packageName = "khroma";
-      version = "1.2.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/khroma/-/khroma-1.2.0.tgz";
-        sha512 = "DlKk5y243dujy8fOH02aRnnewLfiHJV0s8aXaVrCohgBf3s7fEAn6gc6LLQ21agODlFZS8ufrn+juu70uCA9Tw==";
+        url = "https://registry.npmjs.org/khroma/-/khroma-1.1.1.tgz";
+        sha512 = "p7SYAiFisFFmLHHCqYBNwmfTrVIlWjUq+Pw81lDvnpaXOj2sR/xszTG4873AeaEO1kYQ50Z1c9CIrtQa6bdNdA==";
       };
     };
     "killable-1.0.1" = {
@@ -32636,6 +32627,15 @@ let
         sha512 = "psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw==";
       };
     };
+    "level-blobs-0.1.7" = {
+      name = "level-blobs";
+      packageName = "level-blobs";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-blobs/-/level-blobs-0.1.7.tgz";
+        sha1 = "9ab9b97bb99f1edbf9f78a3433e21ed56386bdaf";
+      };
+    };
     "level-codec-6.2.0" = {
       name = "level-codec";
       packageName = "level-codec";
@@ -32672,6 +32672,42 @@ let
         sha512 = "UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==";
       };
     };
+    "level-filesystem-1.2.0" = {
+      name = "level-filesystem";
+      packageName = "level-filesystem";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-filesystem/-/level-filesystem-1.2.0.tgz";
+        sha1 = "a00aca9919c4a4dfafdca6a8108d225aadff63b3";
+      };
+    };
+    "level-fix-range-1.0.2" = {
+      name = "level-fix-range";
+      packageName = "level-fix-range";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz";
+        sha1 = "bf15b915ae36d8470c821e883ddf79cd16420828";
+      };
+    };
+    "level-fix-range-2.0.0" = {
+      name = "level-fix-range";
+      packageName = "level-fix-range";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz";
+        sha1 = "c417d62159442151a19d9a2367868f1724c2d548";
+      };
+    };
+    "level-hooks-4.5.0" = {
+      name = "level-hooks";
+      packageName = "level-hooks";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz";
+        sha1 = "1b9ae61922930f3305d1a61fc4d83c8102c0dd93";
+      };
+    };
     "level-iterator-stream-4.0.2" = {
       name = "level-iterator-stream";
       packageName = "level-iterator-stream";
@@ -32681,6 +32717,15 @@ let
         sha512 = "ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==";
       };
     };
+    "level-js-2.2.4" = {
+      name = "level-js";
+      packageName = "level-js";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-js/-/level-js-2.2.4.tgz";
+        sha1 = "bc055f4180635d4489b561c9486fa370e8c11697";
+      };
+    };
     "level-js-4.0.2" = {
       name = "level-js";
       packageName = "level-js";
@@ -32708,6 +32753,15 @@ let
         sha512 = "HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==";
       };
     };
+    "level-peek-1.0.6" = {
+      name = "level-peek";
+      packageName = "level-peek";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz";
+        sha1 = "bec51c72a82ee464d336434c7c876c3fcbcce77f";
+      };
+    };
     "level-post-1.0.7" = {
       name = "level-post";
       packageName = "level-post";
@@ -32717,6 +32771,15 @@ let
         sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew==";
       };
     };
+    "level-sublevel-5.2.3" = {
+      name = "level-sublevel";
+      packageName = "level-sublevel";
+      version = "5.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz";
+        sha1 = "744c12c72d2e72be78dde3b9b5cd84d62191413a";
+      };
+    };
     "level-supports-1.0.1" = {
       name = "level-supports";
       packageName = "level-supports";
@@ -32735,6 +32798,15 @@ let
         sha512 = "iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==";
       };
     };
+    "levelup-0.18.6" = {
+      name = "levelup";
+      packageName = "levelup";
+      version = "0.18.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz";
+        sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb";
+      };
+    };
     "levelup-4.4.0" = {
       name = "levelup";
       packageName = "levelup";
@@ -33068,13 +33140,13 @@ let
         sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
       };
     };
-    "loader-runner-4.2.0" = {
+    "loader-runner-4.1.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
-      version = "4.2.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz";
-        sha512 = "92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==";
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.1.0.tgz";
+        sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA==";
       };
     };
     "loader-utils-1.4.0" = {
@@ -35075,13 +35147,13 @@ let
         sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==";
       };
     };
-    "make-fetch-happen-8.0.13" = {
+    "make-fetch-happen-8.0.12" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "8.0.13";
+      version = "8.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.13.tgz";
-        sha512 = "rQ5NijwwdU8tIaBrpTtSVrNCcAJfyDRcKBC76vOQlyJX588/88+TE+UpjWl4BgG7gCkp29wER7xcRqkeg+x64Q==";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.12.tgz";
+        sha512 = "cBD7yM72ltWEV+xlLlbimnh5qHwr+thAb/cZLiaZhicVVPVN63BikBvL5OR68+8+z2fvBOgck628vGJ2ulgF6g==";
       };
     };
     "make-iterator-1.0.1" = {
@@ -35885,15 +35957,6 @@ let
         sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q==";
       };
     };
-    "mem-8.0.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-8.0.0.tgz";
-        sha512 = "qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA==";
-      };
-    };
     "mem-fs-1.2.0" = {
       name = "mem-fs";
       packageName = "mem-fs";
@@ -35948,13 +36011,13 @@ let
         sha1 = "9d7028a6f266deb733510bb7dbba5f51878c561e";
       };
     };
-    "memoizee-0.4.15" = {
+    "memoizee-0.4.14" = {
       name = "memoizee";
       packageName = "memoizee";
-      version = "0.4.15";
+      version = "0.4.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz";
-        sha512 = "UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==";
+        url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz";
+        sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==";
       };
     };
     "memory-cache-0.2.0" = {
@@ -36092,22 +36155,13 @@ let
         sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==";
       };
     };
-    "meow-8.1.2" = {
+    "meow-8.1.0" = {
       name = "meow";
       packageName = "meow";
-      version = "8.1.2";
+      version = "8.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz";
-        sha512 = "r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==";
-      };
-    };
-    "meow-9.0.0" = {
-      name = "meow";
-      packageName = "meow";
-      version = "9.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz";
-        sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==";
+        url = "https://registry.npmjs.org/meow/-/meow-8.1.0.tgz";
+        sha512 = "fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA==";
       };
     };
     "merge-1.2.1" = {
@@ -36191,15 +36245,6 @@ let
         sha512 = "YPn35uEAIrOcsDPjCiKNXXBdO1Aoazsv2zTZjG4+oXa7+tTVUb5sI81NqaTYa47RnoH9Vl4waLlEEJfB8KM9VA==";
       };
     };
-    "mermaid-8.9.0" = {
-      name = "mermaid";
-      packageName = "mermaid";
-      version = "8.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.0.tgz";
-        sha512 = "J582tyE1vkdNu4BGgfwXnFo4Mu6jpuc4uK96mIenavaak9kr4T5gaMmYCo/7edwq/vTBkx/soZ5LcJo5WXZ1BQ==";
-      };
-    };
     "mersenne-0.0.4" = {
       name = "mersenne";
       packageName = "mersenne";
@@ -36470,6 +36515,15 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
+    "mime-2.4.6" = {
+      name = "mime";
+      packageName = "mime";
+      version = "2.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz";
+        sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==";
+      };
+    };
     "mime-2.4.7" = {
       name = "mime";
       packageName = "mime";
@@ -36479,15 +36533,6 @@ let
         sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==";
       };
     };
-    "mime-2.5.0" = {
-      name = "mime";
-      packageName = "mime";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz";
-        sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==";
-      };
-    };
     "mime-db-1.33.0" = {
       name = "mime-db";
       packageName = "mime-db";
@@ -36794,13 +36839,13 @@ let
         sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==";
       };
     };
-    "minipass-fetch-1.3.3" = {
+    "minipass-fetch-1.3.2" = {
       name = "minipass-fetch";
       packageName = "minipass-fetch";
-      version = "1.3.3";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.3.tgz";
-        sha512 = "akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==";
+        url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.2.tgz";
+        sha512 = "/i4fX1ss+Dtwyk++OsAI6SEV+eE1dvI6W+0hORdjfruQ7VD5uYTetJIHcEMjWiEiszWjn2aAtP1CB/Q4KfeoYA==";
       };
     };
     "minipass-flush-1.0.5" = {
@@ -37568,6 +37613,15 @@ let
         sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==";
       };
     };
+    "mustache-4.0.1" = {
+      name = "mustache";
+      packageName = "mustache";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz";
+        sha512 = "yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==";
+      };
+    };
     "mustache-4.1.0" = {
       name = "mustache";
       packageName = "mustache";
@@ -37910,6 +37964,15 @@ let
         sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
       };
     };
+    "native-request-1.0.8" = {
+      name = "native-request";
+      packageName = "native-request";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz";
+        sha512 = "vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==";
+      };
+    };
     "native-url-0.2.6" = {
       name = "native-url";
       packageName = "native-url";
@@ -38126,13 +38189,13 @@ let
         sha512 = "o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==";
       };
     };
-    "needle-2.6.0" = {
+    "needle-2.5.2" = {
       name = "needle";
       packageName = "needle";
-      version = "2.6.0";
+      version = "2.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
-        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz";
+        sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==";
       };
     };
     "negotiator-0.3.0" = {
@@ -38208,13 +38271,22 @@ let
         sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==";
       };
     };
-    "netlify-6.0.12" = {
+    "netlify-4.9.0" = {
       name = "netlify";
       packageName = "netlify";
-      version = "6.0.12";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify/-/netlify-6.0.12.tgz";
-        sha512 = "WAOvHMmd4E/SF8wagbbg0/HV2CXNsmKHvqxJ1carJ6eX1xhqtvLs5xjNL6fFqajj8Qmyl02YmHIq3eb6yyFRWA==";
+        url = "https://registry.npmjs.org/netlify/-/netlify-4.9.0.tgz";
+        sha512 = "x+VqJ+yop05OUpeaT4fhz/NAvJQFjtNhW1s+/i6oP/EZS6/+B0u+qCANF8uP9u3UJcmWvlJmrRoDhj62Xvtwug==";
+      };
+    };
+    "netlify-6.0.9" = {
+      name = "netlify";
+      packageName = "netlify";
+      version = "6.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/netlify/-/netlify-6.0.9.tgz";
+        sha512 = "izoELW+kE5ClHX85f5EExRo42H3hXESwSr69EJdCuDQlTP3JR09xQgZcWL5t7FNdkfBj7Kdhf62tk02TN4+YzA==";
       };
     };
     "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = {
@@ -38226,13 +38298,13 @@ let
         sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA==";
       };
     };
-    "netlify-redirect-parser-3.0.1" = {
+    "netlify-redirect-parser-2.5.0" = {
       name = "netlify-redirect-parser";
       packageName = "netlify-redirect-parser";
-      version = "3.0.1";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.1.tgz";
-        sha512 = "UVcULtvR8KIq3cs1Np0dhh/2shOOEmkbkmynLaxliaCsrI7sS0FFDtf7wL253Yt+KUE1QyoiRwYWyh2FZVznig==";
+        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-2.5.0.tgz";
+        sha512 = "pF8BiOr3Pa4kQLLiOu53I0d30EIUDM0DYqYvCQmKD96cMX2qLh/QsxT0Zh18IrL5a0IWQ236/o76lTe0yEEw6w==";
       };
     };
     "netlify-redirector-0.2.1" = {
@@ -38749,6 +38821,15 @@ let
         sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==";
       };
     };
+    "node-notifier-8.0.0" = {
+      name = "node-notifier";
+      packageName = "node-notifier";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz";
+        sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==";
+      };
+    };
     "node-notifier-8.0.1" = {
       name = "node-notifier";
       packageName = "node-notifier";
@@ -38830,13 +38911,13 @@ let
         sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d";
       };
     };
-    "node-red-admin-0.2.7" = {
+    "node-red-admin-0.2.6" = {
       name = "node-red-admin";
       packageName = "node-red-admin";
-      version = "0.2.7";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.7.tgz";
-        sha512 = "bsFbC7KFfGY37+SuYfmM9Er00cM92anqp6xCj8x7Y+4qZHOXnLi9XDFoWtvvsC1uQyaMqas1ALCfqcOxLlWngw==";
+        url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.6.tgz";
+        sha512 = "s3TlPwl9VbhsCTg9w2nUCdyBwqyRGqnaohy9iPJPmHPnvT+YudVt9VCoJVol5lPlWbDC9QlBQMyHQDdXIxoLkw==";
       };
     };
     "node-red-node-rbe-0.2.9" = {
@@ -38857,13 +38938,13 @@ let
         sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
       };
     };
-    "node-releases-1.1.70" = {
+    "node-releases-1.1.69" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.70";
+      version = "1.1.69";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz";
-        sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz";
+        sha512 = "DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA==";
       };
     };
     "node-source-walk-4.2.0" = {
@@ -39172,13 +39253,13 @@ let
         sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6";
       };
     };
-    "npm-api-1.0.1" = {
+    "npm-api-1.0.0" = {
       name = "npm-api";
       packageName = "npm-api";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.1.tgz";
-        sha512 = "4sITrrzEbPcr0aNV28QyOmgn6C9yKiF8k92jn4buYAK8wmA5xo1qL3II5/gT1r7wxbXBflSduZ2K3FbtOrtGkA==";
+        url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.0.tgz";
+        sha512 = "gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ==";
       };
     };
     "npm-bundled-1.1.1" = {
@@ -39343,6 +39424,15 @@ let
         sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==";
       };
     };
+    "npm-registry-fetch-4.0.7" = {
+      name = "npm-registry-fetch";
+      packageName = "npm-registry-fetch";
+      version = "4.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz";
+        sha512 = "cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==";
+      };
+    };
     "npm-registry-fetch-8.1.5" = {
       name = "npm-registry-fetch";
       packageName = "npm-registry-fetch";
@@ -39592,7 +39682,7 @@ let
       version = "0.9.15";
       src = fetchurl {
         name = "oauth-0.9.15.tar.gz";
-        url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master";
+        url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
         sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
       };
     };
@@ -39740,6 +39830,15 @@ let
         sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==";
       };
     };
+    "object-keys-0.2.0" = {
+      name = "object-keys";
+      packageName = "object-keys";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz";
+        sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67";
+      };
+    };
     "object-keys-0.4.0" = {
       name = "object-keys";
       packageName = "object-keys";
@@ -39938,13 +40037,22 @@ let
         sha1 = "cb236106341536f0dac4815e06708221cad7fb5e";
       };
     };
-    "obz-1.0.3" = {
+    "obz-1.0.2" = {
       name = "obz";
       packageName = "obz";
-      version = "1.0.3";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/obz/-/obz-1.0.3.tgz";
-        sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw==";
+        url = "https://registry.npmjs.org/obz/-/obz-1.0.2.tgz";
+        sha512 = "c+EtVwT2IpXz5we2mR40aPLJ1s0eNOsxYeaYbaHhmsY6kWKo3IRkpwpBU5ck0aHfqfKUUEiKabC6rzsrG/hSHw==";
+      };
+    };
+    "octal-1.0.0" = {
+      name = "octal";
+      packageName = "octal";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz";
+        sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b";
       };
     };
     "octokit-pagination-methods-1.1.0" = {
@@ -39956,13 +40064,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.156.0" = {
+    "office-ui-fabric-react-7.155.3" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.156.0";
+      version = "7.155.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.156.0.tgz";
-        sha512 = "e9EwmkTGRjt+PJiRqB2ZU+8dTOUtDzNcOhiZmyI7Rvmz1XK3LhNDgoExbMQfAuDFEr2TcyvrOidwTAAkoRyWYw==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.155.3.tgz";
+        sha512 = "MOGOEviHa5P580rANl9+vS4QTDt6SeyVlfhGLqZpSgA7VZ4JDCIU/mFyNbl5KG39wfg5JiKic+Lz8rXUrExQfw==";
       };
     };
     "omggif-1.0.10" = {
@@ -40136,13 +40244,13 @@ let
         sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==";
       };
     };
-    "oo-ascii-tree-1.17.1" = {
+    "oo-ascii-tree-1.16.0" = {
       name = "oo-ascii-tree";
       packageName = "oo-ascii-tree";
-      version = "1.17.1";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.17.1.tgz";
-        sha512 = "+59dySSbsBOpRmrdBV6w4lkoxELA6reGNEsD/+HfRw8F+pQhGv5cROX0Y6jAXd1yWbUXY+AbbKVTq1ws/rfv+A==";
+        url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.16.0.tgz";
+        sha512 = "xIuc4hP3NKOhPaPJN1zkTXiGNpNe4vOaS0CUwyCuVv1kBzBhliZ71siaGXpHIL45CBmX6qGAjEiHt7ZS1nQWaA==";
       };
     };
     "opal-runtime-1.0.11" = {
@@ -40199,15 +40307,6 @@ let
         sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==";
       };
     };
-    "open-7.3.1" = {
-      name = "open";
-      packageName = "open";
-      version = "7.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.3.1.tgz";
-        sha512 = "f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==";
-      };
-    };
     "openapi-default-setter-2.1.0" = {
       name = "openapi-default-setter";
       packageName = "openapi-default-setter";
@@ -40217,13 +40316,13 @@ let
         sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A==";
       };
     };
-    "openapi-default-setter-7.2.3" = {
+    "openapi-default-setter-7.0.1" = {
       name = "openapi-default-setter";
       packageName = "openapi-default-setter";
-      version = "7.2.3";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.2.3.tgz";
-        sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw==";
+        url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.0.1.tgz";
+        sha512 = "O9jhaZPEEJzI1HSG3Yw5rOIC0EpZ9PjRJgtksXKuSMyEoxUDnl7zQ27LuFRR1ykSMVhMt8vHMrQBQIwLW8S0yQ==";
       };
     };
     "openapi-framework-0.26.0" = {
@@ -40235,13 +40334,13 @@ let
         sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow==";
       };
     };
-    "openapi-framework-7.2.3" = {
+    "openapi-framework-7.2.0" = {
       name = "openapi-framework";
       packageName = "openapi-framework";
-      version = "7.2.3";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.3.tgz";
-        sha512 = "3UwZFIxcJzMpYQAiwynaWGGWW/OcIdYz+gr5bO0TDOxnZjaZNo5ejru/6T9Gb7zrv15THihc3EdASvB36L0rXg==";
+        url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.0.tgz";
+        sha512 = "rC4U+SIBVxoTujSIrk84PMquBwkNJfhYC7KTTDUUc7yfIyMVKRat5TOuMDyc49Ovsv+7bdkx1stf7d0N9LbtLg==";
       };
     };
     "openapi-jsonschema-parameters-1.2.0" = {
@@ -40253,13 +40352,13 @@ let
         sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ==";
       };
     };
-    "openapi-jsonschema-parameters-7.2.3" = {
+    "openapi-jsonschema-parameters-7.0.2" = {
       name = "openapi-jsonschema-parameters";
       packageName = "openapi-jsonschema-parameters";
-      version = "7.2.3";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.2.3.tgz";
-        sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ==";
+        url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.0.2.tgz";
+        sha512 = "hCC8wsWu9qU/pWCUClAYmUyXRhAeXSZUCRV7NVlj/8+3fWrtTBwk8GKI2dRa5Up0yZ3pstGi3Ewzzuixbmh8sw==";
       };
     };
     "openapi-request-coercer-2.4.0" = {
@@ -40271,13 +40370,13 @@ let
         sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ==";
       };
     };
-    "openapi-request-coercer-7.2.3" = {
+    "openapi-request-coercer-7.1.0" = {
       name = "openapi-request-coercer";
       packageName = "openapi-request-coercer";
-      version = "7.2.3";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.2.3.tgz";
-        sha512 = "w+CcKjQ/UWgtA5lgrCh7t/D2FGaKyQRXgMk8aWuT/y2a/pvdZbXdmdABWdafXB6iVlBr9CKXYHJUDlBcoKH2yQ==";
+        url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.1.0.tgz";
+        sha512 = "6nvSgvOvLYMkUBu3NbHQU6Lcol1WxDr0DsOe3oYHb2tZhokrNEuOF20QYPV+CGZYyEzc0f+Hdas774n5B0euLg==";
       };
     };
     "openapi-request-validator-4.2.0" = {
@@ -40289,13 +40388,13 @@ let
         sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg==";
       };
     };
-    "openapi-request-validator-7.2.3" = {
+    "openapi-request-validator-7.2.0" = {
       name = "openapi-request-validator";
       packageName = "openapi-request-validator";
-      version = "7.2.3";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.3.tgz";
-        sha512 = "bZWIOIc7eDnPzgk159Wzur1U9hLoFTgok3coWA8J/XlNnTgnWGH+dxc8eCAdPlOLJh2AsiSu/fEGKzWJRxzCAw==";
+        url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.0.tgz";
+        sha512 = "LgXvKco6XR5SKr8QBaM6v0++QXY5MP2yvvKv0Ckutef3css9MAyIcokDsBj6DYYzNnjmFxPx4ntuY7CZTC2ZFA==";
       };
     };
     "openapi-response-validator-4.0.0" = {
@@ -40307,13 +40406,13 @@ let
         sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg==";
       };
     };
-    "openapi-response-validator-7.2.3" = {
+    "openapi-response-validator-7.0.1" = {
       name = "openapi-response-validator";
       packageName = "openapi-response-validator";
-      version = "7.2.3";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.2.3.tgz";
-        sha512 = "j9OvLWO/6sWiR4fwdbzPbZuuj02abk+kt8Zd2aXS4mS8K7/sl7QiJGI/VmQpvq9CTlNG67eEKyqgmBzI1ovu/g==";
+        url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.0.1.tgz";
+        sha512 = "Fxr9YdQ6s7/SIvvM888iWnc1GUn/fFxTaMFqHkUv0/eNCYoBfOwAKj9aptaRfL+BJXlsVdXWCJd3GWkwn8sIJA==";
       };
     };
     "openapi-sampler-1.0.0-beta.18" = {
@@ -40334,13 +40433,13 @@ let
         sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA==";
       };
     };
-    "openapi-schema-validator-7.2.3" = {
+    "openapi-schema-validator-7.0.1" = {
       name = "openapi-schema-validator";
       packageName = "openapi-schema-validator";
-      version = "7.2.3";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz";
-        sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA==";
+        url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.0.1.tgz";
+        sha512 = "P/dmF14xWbyaFVcoS1Fs2tUP4AhJO+eEnZV+jbApeo3569/Z2fiki6Mb6Rs7cfi0ewNnV4L4HiYH+HPZaKWnjQ==";
       };
     };
     "openapi-security-handler-2.0.4" = {
@@ -40352,13 +40451,13 @@ let
         sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ==";
       };
     };
-    "openapi-security-handler-7.2.3" = {
+    "openapi-security-handler-7.0.1" = {
       name = "openapi-security-handler";
       packageName = "openapi-security-handler";
-      version = "7.2.3";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.2.3.tgz";
-        sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg==";
+        url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.0.1.tgz";
+        sha512 = "fiRJE2Z5F0tY9QBssBX9g8Txtr0oj1BOU0nOZ6QHHXQdCYxebszGgcXD63uy0UJQwzwVOMs/AlCnKNVS/yMSEg==";
       };
     };
     "openapi-to-graphql-2.2.5" = {
@@ -40397,15 +40496,6 @@ let
         sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A==";
       };
     };
-    "openapi-types-7.2.3" = {
-      name = "openapi-types";
-      packageName = "openapi-types";
-      version = "7.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz";
-        sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA==";
-      };
-    };
     "openapi3-ts-1.4.0" = {
       name = "openapi3-ts";
       packageName = "openapi3-ts";
@@ -40676,15 +40766,6 @@ let
         sha512 = "+wG2v8TUU8EgzPHun1k/n45pXquQ9fHnbXVetl9rRgO6kjZszGGbraF3XPTIdgeA+s1lbRjSEftAnyT0w8ZMvQ==";
       };
     };
-    "ora-5.3.0" = {
-      name = "ora";
-      packageName = "ora";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz";
-        sha512 = "zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==";
-      };
-    };
     "ordered-read-streams-1.0.1" = {
       name = "ordered-read-streams";
       packageName = "ordered-read-streams";
@@ -41387,22 +41468,22 @@ let
         sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA==";
       };
     };
-    "pacote-11.1.14" = {
+    "pacote-11.1.13" = {
       name = "pacote";
       packageName = "pacote";
-      version = "11.1.14";
+      version = "11.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.14.tgz";
-        sha512 = "6c5OhQelaJFDfiw/Zd8MfGCvvFHurSdeGzufZMPvRFImdbNOYFciOINf3DtUNUaU3h98eCb749UyHDsgvL19+A==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.13.tgz";
+        sha512 = "oJ7Bg7p3izrIMhZPHCCHmMHQl+xb+pKBXL5ZYeM2oCZrw6sBRSx7f8l7F+95V2qA0BP3c1cNaaBmUNkbo6Hn9w==";
       };
     };
-    "pacote-11.2.3" = {
+    "pacote-9.5.12" = {
       name = "pacote";
       packageName = "pacote";
-      version = "11.2.3";
+      version = "9.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-11.2.3.tgz";
-        sha512 = "Jphxyk1EjGyLzNwa+MkbcQUQeTIqlKcIoPq0t9ekR9ZxsTGjzhRjz/cOoL9PTVkqAW1FH7qBoVbYL4FqQGNNJg==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz";
+        sha512 = "BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==";
       };
     };
     "pad-0.0.5" = {
@@ -41423,13 +41504,13 @@ let
         sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
       };
     };
-    "paged-request-2.0.2" = {
+    "paged-request-2.0.1" = {
       name = "paged-request";
       packageName = "paged-request";
-      version = "2.0.2";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.2.tgz";
-        sha512 = "NWrGqneZImDdcMU/7vMcAOo1bIi5h/pmpJqe7/jdsy85BA/s5MSaU/KlpxwW/IVPmIwBcq2uKPrBWWhEWhtxag==";
+        url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.1.tgz";
+        sha512 = "C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw==";
       };
     };
     "pako-0.2.9" = {
@@ -41684,13 +41765,13 @@ let
         sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==";
       };
     };
-    "parse-json-5.2.0" = {
+    "parse-json-5.1.0" = {
       name = "parse-json";
       packageName = "parse-json";
-      version = "5.2.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz";
-        sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==";
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz";
+        sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==";
       };
     };
     "parse-latin-4.3.0" = {
@@ -41738,13 +41819,13 @@ let
         sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
-    "parse-path-4.0.3" = {
+    "parse-path-4.0.2" = {
       name = "parse-path";
       packageName = "parse-path";
-      version = "4.0.3";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz";
-        sha512 = "9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA==";
+        url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.2.tgz";
+        sha512 = "HSqVz6iuXSiL8C1ku5Gl1Z5cwDd9Wo0q8CoffdAghP6bz8pJa1tcMC+m4N+z6VAS8QdksnIGq1TB6EgR4vPR6w==";
       };
     };
     "parse-png-2.1.0" = {
@@ -42386,13 +42467,13 @@ let
         sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==";
       };
     };
-    "peek-readable-3.1.3" = {
+    "peek-readable-3.1.1" = {
       name = "peek-readable";
       packageName = "peek-readable";
-      version = "3.1.3";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz";
-        sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg==";
+        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.1.tgz";
+        sha512 = "QHJag0oYYPVkx6rVPEgCLEUMo6VRYbV3GUrqy00lxXJBEIw9LhPCP5MQI6mEfahJO9KYUP8W8qD8kC0V9RyZFQ==";
       };
     };
     "peek-stream-1.1.3" = {
@@ -44502,13 +44583,13 @@ let
         sha512 = "WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw==";
       };
     };
-    "proxy-agent-4.0.1" = {
+    "proxy-agent-4.0.0" = {
       name = "proxy-agent";
       packageName = "proxy-agent";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz";
-        sha512 = "ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==";
+        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.0.tgz";
+        sha512 = "8P0Y2SkwvKjiGU1IkEfYuTteioMIDFxPL4/j49zzt5Mz3pG1KO+mIrDG1qH0PQUHTTczjwGcYl+EzfXiFj5vUQ==";
       };
     };
     "proxy-from-env-1.1.0" = {
@@ -44529,6 +44610,15 @@ let
         sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56";
       };
     };
+    "prr-0.0.0" = {
+      name = "prr";
+      packageName = "prr";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
+        sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
+      };
+    };
     "prr-1.0.1" = {
       name = "prr";
       packageName = "prr";
@@ -45519,13 +45609,13 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
-    "qs-6.9.6" = {
+    "qs-6.9.4" = {
       name = "qs";
       packageName = "qs";
-      version = "6.9.6";
+      version = "6.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz";
-        sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz";
+        sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==";
       };
     };
     "query-string-1.0.1" = {
@@ -45744,13 +45834,13 @@ let
         sha512 = "WAcBP5iLhg1pbjZA40WyMenjK7c5gJUY6Pi5HJ3fLJCeVFNSZv3juf20yFMKxBdvcX5GKbX/HZSfFzlLBdGTdQ==";
       };
     };
-    "random-access-memory-3.1.2" = {
+    "random-access-memory-3.1.1" = {
       name = "random-access-memory";
       packageName = "random-access-memory";
-      version = "3.1.2";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.2.tgz";
-        sha512 = "wIfh4OZ9T+FRNf6rbXLvEb4FfSxyZpvGnC5kC7Xi39SyPkRYfeJyR9Xwa13iLbNyoNKNIkTFUE4g9lXFb1ZflA==";
+        url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.1.tgz";
+        sha512 = "Qy1MliJDozZ1A6Hx3UbEnm8PPCfkiG/8CArbnhrxXMx1YRJPWipgPTB9qyhn4Z7WlLvCEqPb6Bd98OayyVuwrA==";
       };
     };
     "random-access-storage-1.4.1" = {
@@ -45942,15 +46032,6 @@ let
         sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ==";
       };
     };
-    "rc-config-loader-4.0.0" = {
-      name = "rc-config-loader";
-      packageName = "rc-config-loader";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.0.0.tgz";
-        sha512 = "//LRTblJEcqbmmro1GCmZ39qZXD+JqzuD8Y5/IZU3Dhp3A1Yr0Xn68ks8MQ6qKfKvYCWDveUmRDKDA40c+sCXw==";
-      };
-    };
     "re-emitter-1.1.4" = {
       name = "re-emitter";
       packageName = "re-emitter";
@@ -46689,13 +46770,13 @@ let
         sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
-    "regexp.prototype.flags-1.3.1" = {
+    "regexp.prototype.flags-1.3.0" = {
       name = "regexp.prototype.flags";
       packageName = "regexp.prototype.flags";
-      version = "1.3.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz";
-        sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==";
+        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz";
+        sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==";
       };
     };
     "regexpp-1.1.0" = {
@@ -46788,13 +46869,13 @@ let
         sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
       };
     };
-    "regjsparser-0.6.6" = {
+    "regjsparser-0.6.4" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.6.6";
+      version = "0.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz";
-        sha512 = "jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
+        sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
       };
     };
     "rehype-parse-7.0.1" = {
@@ -47418,6 +47499,15 @@ let
         sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
       };
     };
+    "resolve-1.18.1" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.18.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz";
+        sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
+      };
+    };
     "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
@@ -47769,13 +47859,13 @@ let
         sha1 = "eeeb88342fadbe8027c0f36ada921a13e6f96206";
       };
     };
-    "rfdc-1.2.0" = {
+    "rfdc-1.1.4" = {
       name = "rfdc";
       packageName = "rfdc";
-      version = "1.2.0";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz";
-        sha512 = "ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==";
+        url = "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz";
+        sha512 = "5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==";
       };
     };
     "rgb-regex-1.0.1" = {
@@ -47922,13 +48012,13 @@ let
         sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
       };
     };
-    "rollup-2.37.1" = {
+    "rollup-2.36.0" = {
       name = "rollup";
       packageName = "rollup";
-      version = "2.37.1";
+      version = "2.36.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup/-/rollup-2.37.1.tgz";
-        sha512 = "V3ojEeyGeSdrMSuhP3diBb06P+qV4gKQeanbDv+Qh/BZbhdZ7kHV0xAt8Yjk4GFshq/WjO7R4c7DFM20AwTFVQ==";
+        url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz";
+        sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==";
       };
     };
     "rollup-plugin-babel-4.4.0" = {
@@ -47958,22 +48048,13 @@ let
         sha512 = "jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==";
       };
     };
-    "rollup-plugin-inject-3.0.2" = {
-      name = "rollup-plugin-inject";
-      packageName = "rollup-plugin-inject";
-      version = "3.0.2";
+    "rollup-plugin-node-builtins-2.1.2" = {
+      name = "rollup-plugin-node-builtins";
+      packageName = "rollup-plugin-node-builtins";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz";
-        sha512 = "ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==";
-      };
-    };
-    "rollup-plugin-node-polyfills-0.2.1" = {
-      name = "rollup-plugin-node-polyfills";
-      packageName = "rollup-plugin-node-polyfills";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz";
-        sha512 = "4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==";
+        url = "https://registry.npmjs.org/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz";
+        sha1 = "24a1fed4a43257b6b64371d8abc6ce1ab14597e9";
       };
     };
     "rollup-plugin-node-resolve-5.2.0" = {
@@ -48399,13 +48480,13 @@ let
         sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==";
       };
     };
-    "sass-1.32.5" = {
+    "sass-1.32.0" = {
       name = "sass";
       packageName = "sass";
-      version = "1.32.5";
+      version = "1.32.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.32.5.tgz";
-        sha512 = "kU1yJ5zUAmPxr7f3q0YXTAd1oZjSR1g3tYyv+xu0HZSl5JiNOaE987eiz7wCUvbm4I9fGWGU2TgApTtcP4GMNQ==";
+        url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz";
+        sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng==";
       };
     };
     "sax-0.5.8" = {
@@ -48759,6 +48840,15 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
+    "semver-7.1.3" = {
+      name = "semver";
+      packageName = "semver";
+      version = "7.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz";
+        sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==";
+      };
+    };
     "semver-7.2.3" = {
       name = "semver";
       packageName = "semver";
@@ -49956,13 +50046,13 @@ let
         sha512 = "7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q==";
       };
     };
-    "snyk-gradle-plugin-3.12.0" = {
+    "snyk-gradle-plugin-3.11.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "3.12.0";
+      version = "3.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.0.tgz";
-        sha512 = "WAmViagNolXsqPO/xmArlnpmisw6j/4xN6FLJ/gl9cDSSrgTh013sZlynkZj0G1v4enkelIMuqfVKXzinthm/Q==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.11.0.tgz";
+        sha512 = "OXf1A+kcif+vslm/nsel3bDYWsGwum2PsZLETM28nG4JOgqBLYLWvCHPgH9r2aa0MKTq0nBpimvFkzDm/+2qQQ==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -50037,13 +50127,13 @@ let
         sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA==";
       };
     };
-    "snyk-poetry-lockfile-parser-1.1.2" = {
+    "snyk-poetry-lockfile-parser-1.1.1" = {
       name = "snyk-poetry-lockfile-parser";
       packageName = "snyk-poetry-lockfile-parser";
-      version = "1.1.2";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.2.tgz";
-        sha512 = "qaLNhVw/og6LXRmSuPiXcwre07ybJWh8RASF3aumk5R0cmxCU3YLmJ7pfi/N+PMpwiHCfSZFOMIGIL9jXcX9zQ==";
+        url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz";
+        sha512 = "G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA==";
       };
     };
     "snyk-policy-1.14.1" = {
@@ -50055,13 +50145,13 @@ let
         sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g==";
       };
     };
-    "snyk-python-plugin-1.19.2" = {
+    "snyk-python-plugin-1.19.1" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.19.2";
+      version = "1.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.2.tgz";
-        sha512 = "n5Z7WiMTNtrBaDE9blnYVoX5fyXeMVhDNrQ/q21lHRAvDKDCY9tNNfduUjOVG6HbIH89mW8lLUdBNAMu/hpl+Q==";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz";
+        sha512 = "JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g==";
       };
     };
     "snyk-resolve-1.0.1" = {
@@ -50127,13 +50217,13 @@ let
         sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
       };
     };
-    "socket.io-2.4.1" = {
+    "socket.io-2.4.0" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "2.4.1";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz";
-        sha512 = "Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz";
+        sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ==";
       };
     };
     "socket.io-3.0.5" = {
@@ -50145,15 +50235,6 @@ let
         sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
       };
     };
-    "socket.io-3.1.0" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz";
-        sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww==";
-      };
-    };
     "socket.io-adapter-0.2.0" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
@@ -50181,15 +50262,6 @@ let
         sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ==";
       };
     };
-    "socket.io-adapter-2.1.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz";
-        sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==";
-      };
-    };
     "socket.io-client-1.0.6" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
@@ -50235,13 +50307,13 @@ let
         sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a";
       };
     };
-    "socket.io-parser-3.3.2" = {
+    "socket.io-parser-3.3.1" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "3.3.2";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz";
-        sha512 = "FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz";
+        sha512 = "1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==";
       };
     };
     "socket.io-parser-3.4.1" = {
@@ -50253,13 +50325,13 @@ let
         sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==";
       };
     };
-    "socket.io-parser-4.0.4" = {
+    "socket.io-parser-4.0.3" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "4.0.4";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz";
-        sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz";
+        sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw==";
       };
     };
     "sockjs-0.3.20" = {
@@ -51009,15 +51081,6 @@ let
         sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw==";
       };
     };
-    "sqlite3-5.0.1" = {
-      name = "sqlite3";
-      packageName = "sqlite3";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.1.tgz";
-        sha512 = "kh2lTIcYNfmVcvhVJihsYuPj9U0xzBbh6bmqILO2hkryWSC9RRhzYmkIDtJkJ+d8Kg4wZRJ0T1reyHUEspICfg==";
-      };
-    };
     "sqlstring-2.3.1" = {
       name = "sqlstring";
       packageName = "sqlstring";
@@ -51765,15 +51828,6 @@ let
         sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4";
       };
     };
-    "stream-buffers-3.0.2" = {
-      name = "stream-buffers";
-      packageName = "stream-buffers";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz";
-        sha512 = "DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==";
-      };
-    };
     "stream-chain-2.2.4" = {
       name = "stream-chain";
       packageName = "stream-chain";
@@ -52071,13 +52125,13 @@ let
         sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b";
       };
     };
-    "string-kit-0.11.10" = {
+    "string-kit-0.11.8" = {
       name = "string-kit";
       packageName = "string-kit";
-      version = "0.11.10";
+      version = "0.11.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.10.tgz";
-        sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag==";
+        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.8.tgz";
+        sha512 = "lJyXXoptFpgOXL9cWZXtf45jxdbP5qYtaGZsmtFm4CZy9q6wwzvRzQcJiFeLx8I/0RpzBao9WCOGpbyfW2CMWA==";
       };
     };
     "string-length-1.0.1" = {
@@ -52116,6 +52170,15 @@ let
         sha1 = "3aaad855b3e9735c5e412dfe72198ccf99c7f48e";
       };
     };
+    "string-range-1.2.2" = {
+      name = "string-range";
+      packageName = "string-range";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz";
+        sha1 = "a893ed347e72299bc83befbbf2a692a8d239d5dd";
+      };
+    };
     "string-similarity-2.0.0" = {
       name = "string-similarity";
       packageName = "string-similarity";
@@ -52620,13 +52683,13 @@ let
         sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa";
       };
     };
-    "strtok3-6.0.8" = {
+    "strtok3-6.0.6" = {
       name = "strtok3";
       packageName = "strtok3";
-      version = "6.0.8";
+      version = "6.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz";
-        sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw==";
+        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.6.tgz";
+        sha512 = "fVxvAEKDwHFfbQO1yKxKBPfkWZyBr0Zf20UQ/mblbkAQe5h0Xdd2jDb3Mh7yRZd7LSItJ9JWgQWelpEmVoBe2g==";
       };
     };
     "structured-source-3.0.2" = {
@@ -52674,13 +52737,13 @@ let
         sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==";
       };
     };
-    "stylelint-13.9.0" = {
+    "stylelint-13.8.0" = {
       name = "stylelint";
       packageName = "stylelint";
-      version = "13.9.0";
+      version = "13.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz";
-        sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg==";
+        url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz";
+        sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==";
       };
     };
     "stylelint-8.4.0" = {
@@ -53079,13 +53142,13 @@ let
         sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
       };
     };
-    "swagger-ui-dist-3.40.0" = {
+    "swagger-ui-dist-3.38.0" = {
       name = "swagger-ui-dist";
       packageName = "swagger-ui-dist";
-      version = "3.40.0";
+      version = "3.38.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.40.0.tgz";
-        sha512 = "R0eaS61/cOE6wiFOY7AtmoTBV5lZqmyosuE14G9nAudp5MNsNfCTdI9MWJLs8iF28HXdtH8EACiFFtUbQomHog==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.38.0.tgz";
+        sha512 = "sselV8VY6f1BBauY9Sdmwz0jVaWTnGuHQWei7BaTpiUrLcoEUdmmK5bKefLXiwq+dx//es2S8mOvUS+tcXDsKg==";
       };
     };
     "swagger2openapi-6.2.3" = {
@@ -53205,13 +53268,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.34.7" = {
+    "systeminformation-4.34.2" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.34.7";
+      version = "4.34.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.7.tgz";
-        sha512 = "cS3FiSZasFgVNjO9CP3aZmTO2VHwXKG+JN6Z85nWRyOzxRMNbZe7Xzwrewp42hj+OPMC3hk7MrAFyu/qLM65Mw==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.2.tgz";
+        sha512 = "1LynQMla38gIjzyupKBnBLIo4B0TQf3vdhs2bjKPtN02EymuSWpoAM1KX/6+gtFLVmn91MfllE3wSVGQcVTHDw==";
       };
     };
     "table-3.8.3" = {
@@ -53314,13 +53377,13 @@ let
         sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268";
       };
     };
-    "tail-2.2.0" = {
+    "tail-2.1.1" = {
       name = "tail";
       packageName = "tail";
-      version = "2.2.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tail/-/tail-2.2.0.tgz";
-        sha512 = "QqUMtWlnzArTvGyjVnAE5fAiXEm2Psvk/BlE7vWx2/dIEWMsAhcNPz7iW6WTiSM8h1fjtCkRMsaWBS1j6rpGBg==";
+        url = "https://registry.npmjs.org/tail/-/tail-2.1.1.tgz";
+        sha512 = "TBGFzKYD5Af/ts7DBypAQNmPQlt5Uq0bqcf4eRwnfvQcLnSTqruA8h3ps7CKIEPcwX7z9YnP3B6bBHLWYN7+ag==";
       };
     };
     "taketalk-1.0.0" = {
@@ -53422,15 +53485,6 @@ let
         sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==";
       };
     };
-    "tar-6.1.0" = {
-      name = "tar";
-      packageName = "tar";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz";
-        sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==";
-      };
-    };
     "tar-fs-1.16.3" = {
       name = "tar-fs";
       packageName = "tar-fs";
@@ -53674,13 +53728,13 @@ let
         sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==";
       };
     };
-    "terminal-kit-1.45.5" = {
+    "terminal-kit-1.44.3" = {
       name = "terminal-kit";
       packageName = "terminal-kit";
-      version = "1.45.5";
+      version = "1.44.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.45.5.tgz";
-        sha512 = "QWujGLA6xY0gSokQKWNR7A2pMfq7ZvkoZ5k5AschrAGkF1pFQuYalwoDRGOT+QFbme55CxEkzlaxRpWZE0qcyg==";
+        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.44.3.tgz";
+        sha512 = "G7V7l2pqJqa5llfn/ORDgKlUMGG27n1nxuxwWmZ4/1hCURz+yldKrknirIeu/kyK5M3UdtgPJ0wGAAXw+0aVfw==";
       };
     };
     "terminal-link-2.1.1" = {
@@ -53746,13 +53800,13 @@ let
         sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ==";
       };
     };
-    "terser-webpack-plugin-5.1.1" = {
+    "terser-webpack-plugin-5.0.3" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
-      version = "5.1.1";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz";
-        sha512 = "5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==";
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz";
+        sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ==";
       };
     };
     "test-exclude-6.0.0" = {
@@ -54538,13 +54592,13 @@ let
         sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
       };
     };
-    "token-types-2.1.1" = {
+    "token-types-2.0.0" = {
       name = "token-types";
       packageName = "token-types";
-      version = "2.1.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/token-types/-/token-types-2.1.1.tgz";
-        sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q==";
+        url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz";
+        sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw==";
       };
     };
     "toml-2.3.6" = {
@@ -55096,15 +55150,6 @@ let
         sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==";
       };
     };
-    "tslib-2.1.0" = {
-      name = "tslib";
-      packageName = "tslib";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz";
-        sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==";
-      };
-    };
     "tslint-5.20.1" = {
       name = "tslint";
       packageName = "tslint";
@@ -55141,13 +55186,13 @@ let
         sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
       };
     };
-    "tsutils-3.19.1" = {
+    "tsutils-3.18.0" = {
       name = "tsutils";
       packageName = "tsutils";
-      version = "3.19.1";
+      version = "3.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tsutils/-/tsutils-3.19.1.tgz";
-        sha512 = "GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw==";
+        url = "https://registry.npmjs.org/tsutils/-/tsutils-3.18.0.tgz";
+        sha512 = "D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA==";
       };
     };
     "ttf2woff-2.0.2" = {
@@ -55519,6 +55564,15 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
+    "typedarray-to-buffer-1.0.4" = {
+      name = "typedarray-to-buffer";
+      packageName = "typedarray-to-buffer";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz";
+        sha1 = "9bb8ba0e841fb3f4cf1fe7c245e9f3fa8a5fe99c";
+      };
+    };
     "typedarray-to-buffer-3.1.5" = {
       name = "typedarray-to-buffer";
       packageName = "typedarray-to-buffer";
@@ -55663,13 +55717,13 @@ let
         sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==";
       };
     };
-    "ua-parser-js-0.7.23" = {
+    "ua-parser-js-0.7.22" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
-      version = "0.7.23";
+      version = "0.7.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.23.tgz";
-        sha512 = "m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==";
+        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz";
+        sha512 = "YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==";
       };
     };
     "uc.micro-1.0.6" = {
@@ -55690,6 +55744,15 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
+    "uglify-js-3.11.6" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "3.11.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz";
+        sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==";
+      };
+    };
     "uglify-js-3.12.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -55699,15 +55762,6 @@ let
         sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
       };
     };
-    "uglify-js-3.12.5" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.12.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
-        sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
-      };
-    };
     "uglify-js-3.4.10" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -56788,13 +56842,13 @@ let
         sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa";
       };
     };
-    "uri-js-4.4.1" = {
+    "uri-js-4.4.0" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.1";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
-        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
+        sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
       };
     };
     "urijs-1.19.5" = {
@@ -57158,15 +57212,6 @@ let
         sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==";
       };
     };
-    "util.promisify-1.1.1" = {
-      name = "util.promisify";
-      packageName = "util.promisify";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz";
-        sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==";
-      };
-    };
     "utila-0.4.0" = {
       name = "utila";
       packageName = "utila";
@@ -57284,6 +57329,15 @@ let
         sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==";
       };
     };
+    "uuid-8.3.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "8.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz";
+        sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==";
+      };
+    };
     "uuid-8.3.2" = {
       name = "uuid";
       packageName = "uuid";
@@ -57545,13 +57599,13 @@ let
         sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b";
       };
     };
-    "vega-5.19.1" = {
+    "vega-5.17.3" = {
       name = "vega";
       packageName = "vega";
-      version = "5.19.1";
+      version = "5.17.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega/-/vega-5.19.1.tgz";
-        sha512 = "UE6/c9q9kzuz4HULFuU9HscBASoZa+zcXqGKdbQP545Nwmhd078QpcH+wZsq9lYfiTxmFtzLK/a0OH0zhkghvA==";
+        url = "https://registry.npmjs.org/vega/-/vega-5.17.3.tgz";
+        sha512 = "c8N2pNg9MMmC6shNpoxVw3aVp2XPFOgmWNX5BEOAdCaGHRnSgzNy44+gYdGRaIe6+ljTzZg99Mf+OLO50IP42A==";
       };
     };
     "vega-canvas-1.2.6" = {
@@ -57635,13 +57689,13 @@ let
         sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A==";
       };
     };
-    "vega-functions-5.12.0" = {
+    "vega-functions-5.10.0" = {
       name = "vega-functions";
       packageName = "vega-functions";
-      version = "5.12.0";
+      version = "5.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.0.tgz";
-        sha512 = "3hljmGs+gR7TbO/yYuvAP9P5laKISf1GKk4yRHLNdM61fWgKm8pI3f6LY2Hvq9cHQFTiJ3/5/Bx2p1SX5R4quQ==";
+        url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.10.0.tgz";
+        sha512 = "1l28OxUwOj8FEvRU62Oz2hiTuDECrvx1DPU1qLebBKhlgaKbcCk3XyHrn1kUzhMKpXq+SFv5VPxchZP47ASSvQ==";
       };
     };
     "vega-geo-4.3.8" = {
@@ -57680,13 +57734,13 @@ let
         sha512 = "e5enQECdau7rJob0NFB5pGumh3RaaSWWm90+boxMy3ay2b4Ki/3XIvo+C4F1Lx04qSxvQF7tO2LJcklRm6nqRA==";
       };
     };
-    "vega-parser-6.1.3" = {
+    "vega-parser-6.1.2" = {
       name = "vega-parser";
       packageName = "vega-parser";
-      version = "6.1.3";
+      version = "6.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.3.tgz";
-        sha512 = "8oiVhhW26GQ4GZBvolId8FVFvhn3s1KGgPlD7Z+4P2wkV+xe5Nqu0TEJ20F/cn3b88fd0Vj48X3BH3dlSeKNFg==";
+        url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.2.tgz";
+        sha512 = "aGyZrNzPrBruEb/WhemKDuDjQsIkMDGIgnSJci0b+9ZVxjyAzMl7UfGbiYorPiJlnIercjUJbMoFD6fCIf4gqQ==";
       };
     };
     "vega-projection-1.4.5" = {
@@ -57725,22 +57779,22 @@ let
         sha512 = "yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA==";
       };
     };
-    "vega-scenegraph-4.9.3" = {
+    "vega-scenegraph-4.9.2" = {
       name = "vega-scenegraph";
       packageName = "vega-scenegraph";
-      version = "4.9.3";
+      version = "4.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.3.tgz";
-        sha512 = "lBvqLbXqrqRCTGJmSgzZC/tLR/o+TXfakbdhDzNdpgTavTaQ65S/67Gpj5hPpi77DvsfZUIY9lCEeO37aJhy0Q==";
+        url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.2.tgz";
+        sha512 = "epm1CxcB8AucXQlSDeFnmzy0FCj+HV2k9R6ch2lfLRln5lPLEfgJWgFcFhVf5jyheY0FSeHH52Q5zQn1vYI1Ow==";
       };
     };
-    "vega-selections-5.3.0" = {
+    "vega-selections-5.1.5" = {
       name = "vega-selections";
       packageName = "vega-selections";
-      version = "5.3.0";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.0.tgz";
-        sha512 = "vC4NPsuN+IffruFXfH0L3i2A51RgG4PqpLv85TvrEAIYnSkyKDE4bf+wVraR3aPdnLLkc3+tYuMi6le5FmThIA==";
+        url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.5.tgz";
+        sha512 = "oRSsfkqYqA5xfEJqDpgnSDd+w0k6p6SGYisMD6rGXMxuPl0x0Uy6RvDr4nbEtB+dpWdoWEvgrsZVS6axyDNWvQ==";
       };
     };
     "vega-statistics-1.7.9" = {
@@ -58175,13 +58229,13 @@ let
         sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
       };
     };
-    "vsce-1.84.0" = {
+    "vsce-1.83.0" = {
       name = "vsce";
       packageName = "vsce";
-      version = "1.84.0";
+      version = "1.83.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vsce/-/vsce-1.84.0.tgz";
-        sha512 = "mRJDTMC/1GO7byz6dleY28CZo97cM1p0nU3EEMT5bGMpi5Yga3dKdgTvmwgSQF5BYWozNSNSqN1zih5SYzMZjA==";
+        url = "https://registry.npmjs.org/vsce/-/vsce-1.83.0.tgz";
+        sha512 = "gyF/xtCOFcKO+EvC0FQu5jPECHz2XKMWcw62gqwJJ22lVvlj58t49sWe1IGl9S5NpxCek+QMm6V9i/cDwGWs/Q==";
       };
     };
     "vscode-css-languageservice-3.0.13" = {
@@ -58715,13 +58769,13 @@ let
         sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA==";
       };
     };
-    "vue-eslint-parser-7.4.1" = {
+    "vue-eslint-parser-7.3.0" = {
       name = "vue-eslint-parser";
       packageName = "vue-eslint-parser";
-      version = "7.4.1";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz";
-        sha512 = "AFvhdxpFvliYq1xt/biNBslTHE/zbEvSnr1qfHA/KxRIpErmEDrQZlQnvEexednRHmLfDNOMuDYwZL5xkLzIXQ==";
+        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz";
+        sha512 = "n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw==";
       };
     };
     "vue-onsenui-helper-json-1.0.2" = {
@@ -58814,6 +58868,15 @@ let
         sha1 = "340a717bde765726fa0aa07d721e0147a551df0c";
       };
     };
+    "watchpack-1.7.4" = {
+      name = "watchpack";
+      packageName = "watchpack";
+      version = "1.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz";
+        sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==";
+      };
+    };
     "watchpack-1.7.5" = {
       name = "watchpack";
       packageName = "watchpack";
@@ -58904,13 +58967,13 @@ let
         sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A==";
       };
     };
-    "webassemblyjs-1.11.0" = {
+    "webassemblyjs-1.9.1" = {
       name = "webassemblyjs";
       packageName = "webassemblyjs";
-      version = "1.11.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.11.0.tgz";
-        sha512 = "zAwCqHShTm/OBhYzqXlumetrI5yAkMFbFjnv8qba4WtP+KZIchkAml6zPDZWnxQQH2rs9TTbcbXrMVQplleJQA==";
+        url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.9.1.tgz";
+        sha512 = "x0YxqLnuk8PjeZf5NOkmdQ4FwIRa7NlX3WIRhbpzSaGCih6la55TaATY4BpS81lMyjZvpdfKAQlLVzvd5G57fg==";
       };
     };
     "webidl-conversions-2.0.1" = {
@@ -58967,15 +59030,6 @@ let
         sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==";
       };
     };
-    "webpack-4.46.0" = {
-      name = "webpack";
-      packageName = "webpack";
-      version = "4.46.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz";
-        sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==";
-      };
-    };
     "webpack-5.9.0" = {
       name = "webpack";
       packageName = "webpack";
@@ -59048,13 +59102,13 @@ let
         sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ==";
       };
     };
-    "webpack-merge-5.7.3" = {
+    "webpack-merge-4.2.2" = {
       name = "webpack-merge";
       packageName = "webpack-merge";
-      version = "5.7.3";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz";
-        sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==";
+        url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz";
+        sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==";
       };
     };
     "webpack-node-externals-2.5.2" = {
@@ -59372,22 +59426,13 @@ let
         sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA==";
       };
     };
-    "wikipeg-2.0.5" = {
+    "wikipeg-2.0.3" = {
       name = "wikipeg";
       packageName = "wikipeg";
-      version = "2.0.5";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.5.tgz";
-        sha512 = "FMNznSW4Qjexmgqz23YLtXoS6+GKPnbkEsI14xdRxsWv8jQWJ94ffQZ4PpUSsZm7/XAjqrjFiUnbvOOxBhJY4g==";
-      };
-    };
-    "wildcard-2.0.0" = {
-      name = "wildcard";
-      packageName = "wildcard";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz";
-        sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==";
+        url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.3.tgz";
+        sha512 = "VMVqiZRIFqb5rQYhRqvzPy5yFwJyCkjEdNAsSnq6ZxYH+7EN7/U+R3LrIx1Lf16pq+DZuWY3wrkq6YFhU8c0lg==";
       };
     };
     "win-detect-browsers-1.0.2" = {
@@ -60011,6 +60056,24 @@ let
         sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==";
       };
     };
+    "ws-7.3.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "7.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz";
+        sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==";
+      };
+    };
+    "ws-7.4.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "7.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz";
+        sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==";
+      };
+    };
     "ws-7.4.2" = {
       name = "ws";
       packageName = "ws";
@@ -60395,7 +60458,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         name = "xmlhttprequest-1.5.0.tar.gz";
-        url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433";
+        url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433;
         sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f";
       };
     };
@@ -60489,6 +60552,15 @@ let
         sha512 = "1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==";
       };
     };
+    "xtend-2.0.6" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz";
+        sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee";
+      };
+    };
     "xtend-2.1.2" = {
       name = "xtend";
       packageName = "xtend";
@@ -60498,6 +60570,24 @@ let
         sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b";
       };
     };
+    "xtend-2.2.0" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz";
+        sha1 = "eef6b1f198c1c8deafad8b1765a04dad4a01c5a9";
+      };
+    };
+    "xtend-3.0.0" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
+        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
+      };
+    };
     "xtend-4.0.2" = {
       name = "xtend";
       packageName = "xtend";
@@ -60606,13 +60696,13 @@ let
         sha512 = "26QP9JhfcrroDTeMv2OsY4eoI+NKb6tZwy1Uz0MBWi1uGmOw0/6aR9Oa3guOsC96U27GAqT6glRFMjCGqLro7A==";
       };
     };
-    "yaml-language-server-parser-0.1.2" = {
+    "yaml-language-server-parser-0.1.1" = {
       name = "yaml-language-server-parser";
       packageName = "yaml-language-server-parser";
-      version = "0.1.2";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.2.tgz";
-        sha512 = "GQ2eRE5GcKBK8XVKBIcMyOfC8WMZmEs6gogtVc6knLKE6pG+e5L/lOMfBxZzAt2lqye5itMggQ9+6stXAVhMsw==";
+        url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.1.tgz";
+        sha512 = "2PememGb1SrPqXAxXTpBD39rwYZap6CJVSvkfULNv9uwV3VHp1TfkgpsylBb+mpuuivH0JZ52lChXPvNa6yVxw==";
       };
     };
     "yaml-language-server-parser-0.1.3-fa8245c.0" = {
@@ -61125,85 +61215,70 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "11.1.0";
+    version = "11.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-11.1.0.tgz";
-      sha512 = "9QirgfU7+scdi2UASSlEdqkp1Jva3IiesIUIuxeF7scrFCnk/rZIJ9iSvPJ9qUXYpFYyxpX0aPEBvM/HDExeFQ==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.5.tgz";
+      sha512 = "k4j/2z7qkuigJ1shH0McW1wW63clhrbrg98FK4/KWhU/sce5AgVjuHDQFycAclTwHesf7Vs6Gzt7zGlqUmeKIg==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.1101.0"
-      sources."@angular-devkit/core-11.1.0"
-      sources."@angular-devkit/schematics-11.1.0"
-      sources."@npmcli/ci-detect-1.3.0"
-      sources."@npmcli/git-2.0.4"
-      sources."@npmcli/installed-package-contents-1.0.5"
-      (sources."@npmcli/move-file-1.1.0" // {
-        dependencies = [
-          sources."rimraf-2.7.1"
-        ];
-      })
-      sources."@npmcli/node-gyp-1.0.1"
-      sources."@npmcli/promise-spawn-1.3.2"
-      sources."@npmcli/run-script-1.8.1"
-      sources."@schematics/angular-11.1.0"
-      sources."@schematics/update-0.1101.0"
-      sources."@tootallnate/once-1.1.2"
+      sources."@angular-devkit/architect-0.1100.5"
+      sources."@angular-devkit/core-11.0.5"
+      sources."@angular-devkit/schematics-11.0.5"
+      sources."@schematics/angular-11.0.5"
+      sources."@schematics/update-0.1100.5"
       sources."@yarnpkg/lockfile-1.1.0"
-      sources."abbrev-1.1.1"
-      sources."agent-base-6.0.2"
-      sources."agentkeepalive-4.1.3"
-      sources."aggregate-error-3.1.0"
+      sources."JSONStream-1.3.5"
+      sources."agent-base-4.3.0"
+      sources."agentkeepalive-3.5.2"
       sources."ajv-6.12.6"
       sources."ansi-colors-4.1.1"
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."aproba-1.2.0"
-      (sources."are-we-there-yet-1.1.5" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
-      sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."bl-4.0.3"
+      sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.1"
+      sources."buffer-from-1.1.1"
       sources."builtins-1.0.3"
-      sources."cacache-15.0.5"
+      (sources."cacache-12.0.4" // {
+        dependencies = [
+          sources."lru-cache-5.1.1"
+          sources."rimraf-2.7.1"
+          sources."yallist-3.1.1"
+        ];
+      })
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."chardet-0.7.0"
-      sources."chownr-2.0.0"
-      sources."clean-stack-2.2.0"
+      sources."chownr-1.1.4"
       sources."cli-cursor-3.1.0"
       sources."cli-spinners-2.5.0"
       sources."cli-width-3.0.0"
       sources."clone-1.0.4"
-      sources."code-point-at-1.1.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
-      sources."console-control-strings-1.1.0"
+      sources."concat-stream-1.6.2"
+      (sources."copy-concurrently-1.0.5" // {
+        dependencies = [
+          sources."rimraf-2.7.1"
+        ];
+      })
       sources."core-util-is-1.0.2"
+      sources."cyclist-1.0.1"
       sources."dashdash-1.14.1"
-      sources."debug-4.3.1"
-      sources."debuglog-1.0.1"
+      sources."debug-4.2.0"
       sources."defaults-1.0.3"
       sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
-      sources."depd-1.1.2"
-      sources."dezalgo-1.0.3"
+      sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."emoji-regex-8.0.0"
       (sources."encoding-0.1.13" // {
@@ -61211,28 +61286,28 @@ in
           sources."iconv-lite-0.6.2"
         ];
       })
-      sources."env-paths-2.2.0"
+      sources."end-of-stream-1.4.4"
       sources."err-code-1.1.2"
+      sources."es6-promise-4.2.8"
+      sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
+      sources."figgy-pudding-3.5.2"
       sources."figures-3.2.0"
+      sources."flush-write-stream-1.1.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."fs-minipass-2.1.0"
+      sources."from2-2.3.0"
+      sources."fs-minipass-1.2.7"
+      sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      sources."genfun-5.0.0"
+      sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
@@ -61240,136 +61315,202 @@ in
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
-      sources."has-unicode-2.0.1"
       sources."hosted-git-info-3.0.7"
-      sources."http-cache-semantics-4.1.0"
-      sources."http-proxy-agent-4.0.1"
+      sources."http-cache-semantics-3.8.1"
+      (sources."http-proxy-agent-2.1.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."http-signature-1.2.0"
-      sources."https-proxy-agent-5.0.0"
+      (sources."https-proxy-agent-2.2.4" // {
+        dependencies = [
+          sources."debug-3.2.7"
+        ];
+      })
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
+      sources."iferr-0.1.5"
       sources."ignore-walk-3.0.3"
       sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-2.0.0"
+      sources."ini-1.3.6"
       sources."inquirer-7.3.3"
       sources."ip-1.1.5"
       sources."is-core-module-2.2.0"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-interactive-1.0.0"
-      sources."is-lambda-1.0.1"
       sources."is-typedarray-1.0.0"
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
-      sources."json-parse-even-better-errors-2.3.1"
+      sources."json-parse-better-errors-1.0.2"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonc-parser-3.0.0"
+      sources."jsonc-parser-2.3.1"
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
       sources."lodash-4.17.20"
       sources."log-symbols-4.0.0"
       sources."lru-cache-6.0.0"
       sources."magic-string-0.25.7"
-      sources."make-fetch-happen-8.0.13"
+      (sources."make-fetch-happen-5.0.2" // {
+        dependencies = [
+          sources."lru-cache-5.1.1"
+          sources."yallist-3.1.1"
+        ];
+      })
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
-      sources."minipass-3.1.3"
-      sources."minipass-collect-1.0.2"
-      sources."minipass-fetch-1.3.3"
-      sources."minipass-flush-1.0.5"
-      sources."minipass-json-stream-1.0.1"
-      sources."minipass-pipeline-1.2.4"
-      sources."minipass-sized-1.0.3"
-      sources."minizlib-2.1.2"
-      sources."mkdirp-1.0.4"
+      sources."minimist-1.2.5"
+      (sources."minipass-2.9.0" // {
+        dependencies = [
+          sources."yallist-3.1.1"
+        ];
+      })
+      sources."minizlib-1.3.3"
+      sources."mississippi-3.0.0"
+      sources."mkdirp-0.5.5"
+      (sources."move-concurrently-1.0.1" // {
+        dependencies = [
+          sources."rimraf-2.7.1"
+        ];
+      })
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
-      sources."node-gyp-7.1.2"
-      sources."nopt-5.0.0"
+      sources."node-fetch-npm-2.0.4"
+      (sources."normalize-package-data-2.5.0" // {
+        dependencies = [
+          sources."hosted-git-info-2.8.8"
+          sources."semver-5.7.1"
+        ];
+      })
       sources."npm-bundled-1.1.1"
       sources."npm-install-checks-4.0.0"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-package-arg-8.1.0"
-      sources."npm-packlist-2.1.4"
+      sources."npm-packlist-1.4.8"
       sources."npm-pick-manifest-6.1.0"
-      sources."npm-registry-fetch-9.0.0"
-      sources."npmlog-4.1.2"
-      sources."number-is-nan-1.0.1"
+      (sources."npm-registry-fetch-4.0.7" // {
+        dependencies = [
+          sources."hosted-git-info-2.8.8"
+          sources."lru-cache-5.1.1"
+          sources."npm-package-arg-6.1.1"
+          sources."semver-5.7.1"
+          sources."yallist-3.1.1"
+        ];
+      })
       sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."open-7.3.1"
-      sources."ora-5.2.0"
+      sources."open-7.3.0"
+      sources."ora-5.1.0"
+      sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."p-map-4.0.0"
-      sources."pacote-11.1.14"
+      sources."osenv-0.1.5"
+      (sources."pacote-9.5.12" // {
+        dependencies = [
+          sources."hosted-git-info-2.8.8"
+          sources."lru-cache-5.1.1"
+          sources."npm-package-arg-6.1.1"
+          sources."npm-pick-manifest-3.0.2"
+          sources."rimraf-2.7.1"
+          sources."semver-5.7.1"
+          sources."yallist-3.1.1"
+        ];
+      })
+      sources."parallel-transform-1.2.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-1.1.1"
+      sources."protoduck-5.0.1"
       sources."psl-1.8.0"
-      sources."puka-1.0.1"
+      sources."pump-3.0.0"
+      (sources."pumpify-1.5.1" // {
+        dependencies = [
+          sources."pump-2.0.1"
+        ];
+      })
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."read-package-json-fast-1.2.1"
-      sources."readable-stream-3.6.0"
-      sources."readdir-scoped-modules-1.1.0"
+      (sources."readable-stream-2.3.7" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       (sources."request-2.88.2" // {
         dependencies = [
           sources."uuid-3.4.0"
         ];
       })
-      sources."resolve-1.19.0"
+      sources."resolve-1.18.1"
       sources."restore-cursor-3.1.0"
       sources."retry-0.10.1"
       sources."rimraf-3.0.2"
       sources."run-async-2.4.1"
+      sources."run-queue-1.0.3"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.4"
+      sources."semver-7.3.2"
       (sources."semver-intersect-1.4.0" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.3"
       sources."smart-buffer-4.1.0"
-      sources."socks-2.5.1"
-      sources."socks-proxy-agent-5.0.0"
+      sources."socks-2.3.3"
+      (sources."socks-proxy-agent-4.0.2" // {
+        dependencies = [
+          sources."agent-base-4.2.1"
+        ];
+      })
       sources."source-map-0.7.3"
       sources."sourcemap-codec-1.4.8"
+      sources."spdx-correct-3.1.1"
+      sources."spdx-exceptions-2.3.0"
+      sources."spdx-expression-parse-3.0.1"
+      sources."spdx-license-ids-3.0.7"
       sources."sshpk-1.16.1"
-      sources."ssri-8.0.0"
+      sources."ssri-6.0.1"
+      sources."stream-each-1.2.3"
+      sources."stream-shift-1.0.1"
       sources."string-width-4.2.0"
-      sources."string_decoder-1.3.0"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
-      sources."symbol-observable-3.0.0"
-      sources."tar-6.1.0"
+      sources."symbol-observable-2.0.3"
+      (sources."tar-4.4.13" // {
+        dependencies = [
+          sources."yallist-3.1.1"
+        ];
+      })
       sources."through-2.3.8"
+      sources."through2-2.0.5"
       sources."tmp-0.0.33"
       sources."tough-cookie-2.5.0"
       sources."tslib-1.14.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.11.0"
+      sources."typedarray-0.0.6"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
       (sources."universal-analytics-0.4.23" // {
@@ -61377,28 +61518,23 @@ in
           sources."uuid-3.4.0"
         ];
       })
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-8.3.2"
+      sources."uuid-8.3.1"
+      sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
-      sources."which-2.0.2"
-      (sources."wide-align-1.1.3" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."which-1.3.1"
       sources."wrappy-1.0.2"
+      sources."xtend-4.0.2"
+      sources."y18n-4.0.1"
       sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "CLI tool for Angular";
-      homepage = "https://github.com/angular/angular-cli";
+      homepage = https://github.com/angular/angular-cli;
       license = "MIT";
     };
     production = true;
@@ -61435,7 +61571,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The command line interface for Antora.";
-      homepage = "https://antora.org";
+      homepage = https://antora.org/;
       license = "MPL-2.0";
     };
     production = true;
@@ -61491,7 +61627,7 @@ in
           sources."pump-3.0.0"
         ];
       })
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
       sources."clean-git-ref-2.0.1"
@@ -61721,7 +61857,7 @@ in
         ];
       })
       sources."to-utf8-0.0.1"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
@@ -61751,7 +61887,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The default site generator pipeline for producing and publishing static documentation sites with Antora.";
-      homepage = "https://antora.org";
+      homepage = https://antora.org/;
       license = "MPL-2.0";
     };
     production = true;
@@ -61899,7 +62035,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."w3c-hr-time-1.0.2"
@@ -61917,7 +62053,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A secure and free password manager for all of your devices.";
-      homepage = "https://bitwarden.com";
+      homepage = https://bitwarden.com/;
       license = "GPL-3.0";
     };
     production = true;
@@ -61959,9 +62095,9 @@ in
       sources."@types/eslint-7.2.6"
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
-      sources."@types/json-schema-7.0.7"
+      sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
@@ -62006,13 +62142,13 @@ in
       sources."anymatch-3.1.1"
       sources."at-least-node-1.0.0"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.16.0"
       sources."buffer-from-1.1.1"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."chokidar-3.4.3"
@@ -62033,10 +62169,10 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.5.0"
+      sources."enhanced-resolve-4.3.0"
       sources."errno-0.1.8"
       sources."error-ex-1.3.2"
       sources."escalade-3.1.1"
@@ -62111,7 +62247,7 @@ in
         ];
       })
       sources."lines-and-columns-1.1.6"
-      sources."loader-runner-4.2.0"
+      sources."loader-runner-4.1.0"
       sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lodash.toarray-4.4.0"
@@ -62134,7 +62270,7 @@ in
       sources."mute-stream-0.0.8"
       sources."neo-async-2.6.2"
       sources."node-emoji-1.10.0"
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-4.0.1"
       sources."object-assign-4.1.1"
@@ -62153,7 +62289,7 @@ in
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."parent-module-1.0.1"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
@@ -62206,7 +62342,7 @@ in
           sources."commander-2.20.3"
         ];
       })
-      (sources."terser-webpack-plugin-5.1.1" // {
+      (sources."terser-webpack-plugin-5.0.3" // {
         dependencies = [
           sources."p-limit-3.1.0"
           sources."schema-utils-3.0.0"
@@ -62232,13 +62368,13 @@ in
       sources."type-fest-0.11.0"
       sources."typescript-4.0.5"
       sources."universalify-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."watchpack-2.1.0"
       sources."wcwidth-1.0.1"
       (sources."webpack-5.9.0" // {
         dependencies = [
-          sources."enhanced-resolve-5.7.0"
+          sources."enhanced-resolve-5.4.1"
           sources."schema-utils-3.0.0"
           sources."tapable-2.2.0"
         ];
@@ -62269,21 +62405,17 @@ in
   "@vue/cli" = nodeEnv.buildNodePackage {
     name = "_at_vue_slash_cli";
     packageName = "@vue/cli";
-    version = "4.5.10";
+    version = "4.5.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.10.tgz";
-      sha512 = "+D54DdYcirXtV7f6G7WkDSt1nnzmgA17rRu3qhgOlwIaZ5xaJSroDzLgdgizvg4gJ2yJNCmoKrK1FXnjqTdIyQ==";
+      url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.9.tgz";
+      sha512 = "R6fRau8+fqKI+94LrruKtJDaMQGVsJCNzrdefTJ+bn+ljtCS6j9H+XuU8zLa9+X0HBkX4VoBT7XjfwUAo1IIPA==";
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
-      (sources."@apollo/federation-0.20.7" // {
-        dependencies = [
-          sources."apollo-server-env-2.4.5"
-        ];
-      })
+      sources."@apollo/federation-0.20.7"
       (sources."@apollo/protobufjs-1.0.5" // {
         dependencies = [
-          sources."@types/node-10.17.51"
+          sources."@types/node-10.17.50"
         ];
       })
       sources."@apollographql/apollo-tools-0.4.8"
@@ -62300,7 +62432,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      (sources."@babel/generator-7.12.11" // {
+      (sources."@babel/generator-7.12.10" // {
         dependencies = [
           sources."@babel/types-7.12.12"
         ];
@@ -62480,6 +62612,7 @@ in
       })
       (sources."@babel/traverse-7.12.12" // {
         dependencies = [
+          sources."@babel/generator-7.12.11"
           sources."@babel/types-7.12.12"
         ];
       })
@@ -62513,13 +62646,14 @@ in
           sources."@oclif/plugin-help-3.2.1"
           sources."lru-cache-6.0.0"
           sources."semver-7.3.4"
+          sources."yallist-4.0.0"
         ];
       })
       (sources."@oclif/config-1.17.0" // {
         dependencies = [
-          sources."globby-11.0.2"
+          sources."globby-11.0.1"
           sources."is-wsl-2.2.0"
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."@oclif/errors-1.3.4" // {
@@ -62535,17 +62669,15 @@ in
       })
       sources."@oclif/linewrap-1.0.0"
       sources."@oclif/parser-3.8.5"
-      (sources."@oclif/plugin-autocomplete-0.3.0" // {
+      (sources."@oclif/plugin-autocomplete-0.2.1" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."chalk-4.1.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."fs-extra-9.1.0"
-          sources."has-flag-4.0.0"
-          sources."jsonfile-6.1.0"
-          sources."supports-color-7.2.0"
-          sources."universalify-2.0.0"
+          sources."fs-extra-9.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
+          sources."universalify-1.0.0"
         ];
       })
       (sources."@oclif/plugin-help-2.2.3" // {
@@ -62571,22 +62703,15 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      (sources."@oclif/plugin-plugins-1.9.5" // {
+      (sources."@oclif/plugin-plugins-1.9.4" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."chalk-4.1.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."fs-extra-9.1.0"
-          sources."has-flag-4.0.0"
-          sources."jsonfile-6.1.0"
+          sources."fs-extra-8.1.0"
           sources."lru-cache-6.0.0"
           sources."npm-run-path-4.0.1"
           sources."path-key-3.1.1"
           sources."semver-7.3.4"
-          sources."supports-color-7.2.0"
-          sources."tslib-2.1.0"
-          sources."universalify-2.0.0"
+          sources."tslib-2.0.3"
+          sources."yallist-4.0.0"
         ];
       })
       (sources."@oclif/plugin-warn-if-update-available-1.7.0" // {
@@ -62637,9 +62762,9 @@ in
       sources."@types/koa-2.11.6"
       sources."@types/koa-compose-3.2.5"
       sources."@types/long-4.0.1"
-      sources."@types/mime-1.3.2"
+      sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -62648,18 +62773,18 @@ in
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
-      sources."@types/serve-static-1.13.9"
+      sources."@types/serve-static-1.13.8"
       sources."@types/through-0.0.30"
       sources."@types/ws-7.4.0"
       sources."@types/zen-observable-0.8.2"
-      sources."@vue/cli-shared-utils-4.5.10"
-      (sources."@vue/cli-ui-4.5.10" // {
+      sources."@vue/cli-shared-utils-4.5.9"
+      (sources."@vue/cli-ui-4.5.9" // {
         dependencies = [
           sources."clone-2.1.2"
         ];
       })
-      sources."@vue/cli-ui-addon-webpack-4.5.10"
-      sources."@vue/cli-ui-addon-widgets-4.5.10"
+      sources."@vue/cli-ui-addon-webpack-4.5.9"
+      sources."@vue/cli-ui-addon-widgets-4.5.9"
       (sources."@vue/compiler-core-3.0.5" // {
         dependencies = [
           sources."@babel/types-7.12.12"
@@ -62721,28 +62846,28 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      (sources."apollo-2.32.1" // {
+      (sources."apollo-2.32.0" // {
         dependencies = [
           sources."mkdirp-1.0.4"
           sources."strip-ansi-5.2.0"
         ];
       })
       sources."apollo-cache-1.3.5"
-      sources."apollo-cache-control-0.11.6"
+      sources."apollo-cache-control-0.11.5"
       sources."apollo-cache-inmemory-1.6.6"
       sources."apollo-client-2.6.10"
-      (sources."apollo-codegen-core-0.39.1" // {
+      (sources."apollo-codegen-core-0.39.0" // {
         dependencies = [
           sources."recast-0.20.4"
           sources."source-map-0.6.1"
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
-      sources."apollo-codegen-flow-0.37.1"
-      sources."apollo-codegen-scala-0.38.1"
-      sources."apollo-codegen-swift-0.39.1"
-      sources."apollo-codegen-typescript-0.39.1"
-      sources."apollo-datasource-0.7.3"
+      sources."apollo-codegen-flow-0.37.0"
+      sources."apollo-codegen-scala-0.38.0"
+      sources."apollo-codegen-swift-0.39.0"
+      sources."apollo-codegen-typescript-0.39.0"
+      sources."apollo-datasource-0.7.2"
       sources."apollo-env-0.6.5"
       sources."apollo-graphql-0.6.0"
       sources."apollo-language-server-1.25.0"
@@ -62755,23 +62880,18 @@ in
       sources."apollo-link-state-0.4.2"
       sources."apollo-link-ws-1.0.20"
       sources."apollo-reporting-protobuf-0.6.2"
-      (sources."apollo-server-caching-0.5.3" // {
+      sources."apollo-server-caching-0.5.2"
+      (sources."apollo-server-core-2.19.1" // {
         dependencies = [
-          sources."lru-cache-6.0.0"
-        ];
-      })
-      (sources."apollo-server-core-2.19.2" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
           sources."uuid-8.3.2"
         ];
       })
-      sources."apollo-server-env-3.0.0"
+      sources."apollo-server-env-2.4.5"
       sources."apollo-server-errors-2.4.2"
-      sources."apollo-server-express-2.19.2"
-      sources."apollo-server-plugin-base-0.10.4"
-      sources."apollo-server-types-0.6.3"
-      sources."apollo-tracing-0.12.2"
+      sources."apollo-server-express-2.19.1"
+      sources."apollo-server-plugin-base-0.10.3"
+      sources."apollo-server-types-0.6.2"
+      sources."apollo-tracing-0.12.1"
       sources."apollo-upload-client-11.0.0"
       sources."apollo-utilities-1.3.4"
       (sources."archive-type-4.0.0" // {
@@ -62798,7 +62918,7 @@ in
       sources."assign-symbols-1.0.0"
       (sources."ast-types-0.14.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."astral-regex-1.0.0"
@@ -62862,7 +62982,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.16.0"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -62880,26 +63000,24 @@ in
           sources."lowercase-keys-1.0.0"
           sources."normalize-url-2.0.1"
           sources."prepend-http-2.0.0"
-          sources."query-string-5.1.1"
           sources."sort-keys-2.0.0"
-          sources."strict-uri-encode-1.1.0"
         ];
       })
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       (sources."camel-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       (sources."capital-case-1.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."capture-stack-trace-1.0.1"
@@ -62909,7 +63027,7 @@ in
       sources."chalk-2.4.2"
       (sources."change-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."chardet-0.7.0"
@@ -62975,8 +63093,9 @@ in
           sources."semver-7.3.4"
           sources."supports-color-7.2.0"
           sources."supports-hyperlinks-2.1.0"
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
           sources."type-fest-0.11.0"
+          sources."yallist-4.0.0"
         ];
       })
       sources."cli-width-3.0.0"
@@ -63009,7 +63128,7 @@ in
       sources."consolidate-0.16.0"
       (sources."constant-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."content-disposition-0.5.3" // {
@@ -63026,8 +63145,8 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.3"
-      (sources."core-js-compat-3.8.3" // {
+      sources."core-js-3.8.2"
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -63103,7 +63222,7 @@ in
       sources."dir-glob-3.0.1"
       (sources."dot-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."dot-prop-4.2.1"
@@ -63123,7 +63242,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -63133,7 +63252,7 @@ in
       sources."env-ci-3.2.2"
       sources."envinfo-7.7.3"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."es6-error-4.1.1"
       sources."escalade-3.1.1"
@@ -63190,7 +63309,7 @@ in
       sources."extract-stack-1.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fastq-1.10.0"
@@ -63215,8 +63334,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.143.0"
-      sources."for-each-0.3.3"
+      sources."flow-parser-0.141.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -63245,19 +63363,14 @@ in
       sources."getpass-0.1.7"
       sources."git-clone-0.1.0"
       sources."git-config-path-1.0.1"
-      (sources."git-parse-1.0.4" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-          sources."util.promisify-1.0.1"
-        ];
-      })
+      sources."git-parse-1.0.4"
       (sources."git-rev-sync-2.1.0" // {
         dependencies = [
           sources."graceful-fs-4.1.15"
         ];
       })
       sources."git-up-4.0.2"
-      sources."git-url-parse-11.4.3"
+      sources."git-url-parse-11.4.0"
       sources."glob-7.1.5"
       sources."glob-parent-5.1.1"
       sources."glob-to-regexp-0.3.0"
@@ -63265,6 +63378,7 @@ in
         dependencies = [
           sources."lru-cache-6.0.0"
           sources."semver-7.3.4"
+          sources."yallist-4.0.0"
         ];
       })
       sources."global-dirs-0.1.1"
@@ -63318,7 +63432,7 @@ in
           sources."ts-invariant-0.3.3"
         ];
       })
-      sources."graphql-extensions-0.12.8"
+      sources."graphql-extensions-0.12.7"
       sources."graphql-subscriptions-1.1.0"
       sources."graphql-tag-2.11.0"
       sources."graphql-tools-4.0.8"
@@ -63352,7 +63466,7 @@ in
       sources."hash.js-1.1.7"
       (sources."header-case-2.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."homedir-polyfill-1.0.3"
@@ -63551,7 +63665,7 @@ in
       sources."lowdb-1.0.0"
       (sources."lower-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."lowercase-keys-1.0.1"
@@ -63619,7 +63733,7 @@ in
       sources."nice-try-1.0.5"
       (sources."no-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."node-dir-0.1.17"
@@ -63631,7 +63745,7 @@ in
           sources."is-wsl-2.2.0"
         ];
       })
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -63671,7 +63785,11 @@ in
       sources."object-treeify-1.1.31"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.1"
+      (sources."object.getownpropertydescriptors-2.1.1" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."object.pick-1.3.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
@@ -63700,29 +63818,25 @@ in
       })
       (sources."param-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."parse-git-config-2.0.3"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."parse-passwd-1.0.0"
-      (sources."parse-path-4.0.3" // {
-        dependencies = [
-          sources."qs-6.9.6"
-        ];
-      })
+      sources."parse-path-4.0.2"
       sources."parse-url-5.0.2"
       sources."parseurl-1.3.3"
       (sources."pascal-case-3.1.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."pascalcase-0.1.1"
       sources."password-prompt-1.1.2"
       (sources."path-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."path-dirname-1.0.2"
@@ -63742,7 +63856,6 @@ in
           sources."execa-0.9.0"
           sources."get-stream-3.0.0"
           sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
         ];
       })
       sources."pify-3.0.0"
@@ -63785,7 +63898,7 @@ in
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."query-string-6.13.8"
+      sources."query-string-5.1.1"
       sources."range-parser-1.2.1"
       (sources."raw-body-2.4.0" // {
         dependencies = [
@@ -63843,7 +63956,7 @@ in
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.6" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -63896,7 +64009,7 @@ in
       })
       (sources."sentence-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."serialize-error-7.0.1" // {
@@ -63920,7 +64033,7 @@ in
       sources."slice-ansi-0.0.4"
       (sources."snake-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."snapdragon-0.8.2" // {
@@ -63966,7 +64079,6 @@ in
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.7"
-      sources."split-on-first-1.1.0"
       (sources."split-string-3.1.0" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -63996,7 +64108,7 @@ in
       sources."statuses-1.5.0"
       sources."steno-0.4.4"
       sources."streamsearch-0.1.2"
-      sources."strict-uri-encode-2.0.0"
+      sources."strict-uri-encode-1.1.0"
       sources."string-hash-1.1.3"
       sources."string-width-4.2.0"
       sources."string.prototype.trimend-1.0.3"
@@ -64071,7 +64183,6 @@ in
           sources."execa-0.7.0"
           sources."get-stream-3.0.0"
           sources."lru-cache-4.1.5"
-          sources."yallist-2.1.2"
         ];
       })
       sources."through-2.3.8"
@@ -64146,21 +64257,21 @@ in
       })
       (sources."upper-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."upper-case-first-2.0.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       sources."url-to-options-1.0.1"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.1.1"
+      sources."util.promisify-1.0.1"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
@@ -64218,7 +64329,7 @@ in
       sources."xss-1.0.8"
       sources."xtend-4.0.2"
       sources."y18n-4.0.1"
-      sources."yallist-4.0.0"
+      sources."yallist-2.1.2"
       (sources."yaml-front-matter-3.4.1" // {
         dependencies = [
           sources."commander-1.0.0"
@@ -64246,7 +64357,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command line interface for rapid Vue.js development";
-      homepage = "https://cli.vuejs.org/";
+      homepage = https://cli.vuejs.org/;
       license = "MIT";
     };
     production = true;
@@ -64256,31 +64367,31 @@ in
   "@webassemblyjs/cli" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_cli";
     packageName = "@webassemblyjs/cli";
-    version = "1.11.0";
+    version = "1.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.11.0.tgz";
-      sha512 = "mQjMqOSOCu1lsA7cVvCKkK/IBED+qUtjrSuFhLBSEusHu5IqhzWFWnappMRpA424lNDMScsxry5jhbM+c9wyEg==";
+      url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.9.1.tgz";
+      sha512 = "OMu4uSrLdv1bJRrV+zbl6DszJiYaSUwfeigoGMkZvVHzh686pmzka9Bbz85es9Az/dnantDDIokEPSx1FQYm4A==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.11.0"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
-      sources."@webassemblyjs/helper-api-error-1.11.0"
-      sources."@webassemblyjs/helper-code-frame-1.11.0"
-      sources."@webassemblyjs/helper-compiler-1.11.0"
-      sources."@webassemblyjs/helper-flatten-ast-1.11.0"
-      sources."@webassemblyjs/helper-fsm-1.11.0"
-      sources."@webassemblyjs/helper-numbers-1.11.0"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
-      sources."@webassemblyjs/ieee754-1.11.0"
-      sources."@webassemblyjs/leb128-1.11.0"
-      sources."@webassemblyjs/utf8-1.11.0"
-      sources."@webassemblyjs/validation-1.11.0"
-      sources."@webassemblyjs/wasm-parser-1.11.0"
-      sources."@webassemblyjs/wast-parser-1.11.0"
-      sources."@webassemblyjs/wast-printer-1.11.0"
+      sources."@webassemblyjs/ast-1.9.1"
+      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
+      sources."@webassemblyjs/helper-api-error-1.9.1"
+      sources."@webassemblyjs/helper-code-frame-1.9.1"
+      sources."@webassemblyjs/helper-compiler-1.9.1"
+      sources."@webassemblyjs/helper-flatten-ast-1.9.1"
+      sources."@webassemblyjs/helper-fsm-1.9.1"
+      sources."@webassemblyjs/helper-module-context-1.9.1"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
+      sources."@webassemblyjs/ieee754-1.9.1"
+      sources."@webassemblyjs/leb128-1.9.1"
+      sources."@webassemblyjs/utf8-1.9.1"
+      sources."@webassemblyjs/validation-1.9.1"
+      sources."@webassemblyjs/wasm-parser-1.9.1"
+      sources."@webassemblyjs/wast-parser-1.9.1"
+      sources."@webassemblyjs/wast-printer-1.9.1"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."webassemblyjs-1.11.0"
+      sources."webassemblyjs-1.9.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64295,31 +64406,31 @@ in
   "@webassemblyjs/repl" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_repl";
     packageName = "@webassemblyjs/repl";
-    version = "1.11.0";
+    version = "1.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.11.0.tgz";
-      sha512 = "U+f6IHDVPOdj1C22AMb8+xEq5OpEhXKcTl+YyMEqRtUdAt6CVkoeHdaPVv4iDfBaxR15nds8DRq+gHjCncrA3Q==";
+      url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.9.1.tgz";
+      sha512 = "190S+kS/qWfwt/c/QSpRmZpZV57WEL4Cbz2KZu+z5HAg+e53LXxC4XfpxHdsw+1Lo8Z4QB7nI+5xIr2mH+2ZjQ==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.11.0"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
-      sources."@webassemblyjs/helper-api-error-1.11.0"
-      sources."@webassemblyjs/helper-code-frame-1.11.0"
-      sources."@webassemblyjs/helper-compiler-1.11.0"
-      sources."@webassemblyjs/helper-flatten-ast-1.11.0"
-      sources."@webassemblyjs/helper-fsm-1.11.0"
-      sources."@webassemblyjs/helper-numbers-1.11.0"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
-      sources."@webassemblyjs/ieee754-1.11.0"
-      sources."@webassemblyjs/leb128-1.11.0"
-      sources."@webassemblyjs/utf8-1.11.0"
-      sources."@webassemblyjs/validation-1.11.0"
-      sources."@webassemblyjs/wasm-parser-1.11.0"
-      sources."@webassemblyjs/wast-parser-1.11.0"
-      sources."@webassemblyjs/wast-printer-1.11.0"
+      sources."@webassemblyjs/ast-1.9.1"
+      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
+      sources."@webassemblyjs/helper-api-error-1.9.1"
+      sources."@webassemblyjs/helper-code-frame-1.9.1"
+      sources."@webassemblyjs/helper-compiler-1.9.1"
+      sources."@webassemblyjs/helper-flatten-ast-1.9.1"
+      sources."@webassemblyjs/helper-fsm-1.9.1"
+      sources."@webassemblyjs/helper-module-context-1.9.1"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
+      sources."@webassemblyjs/ieee754-1.9.1"
+      sources."@webassemblyjs/leb128-1.9.1"
+      sources."@webassemblyjs/utf8-1.9.1"
+      sources."@webassemblyjs/validation-1.9.1"
+      sources."@webassemblyjs/wasm-parser-1.9.1"
+      sources."@webassemblyjs/wast-parser-1.9.1"
+      sources."@webassemblyjs/wast-printer-1.9.1"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."webassemblyjs-1.11.0"
+      sources."webassemblyjs-1.9.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64371,10 +64482,10 @@ in
   "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_wasm-text-gen";
     packageName = "@webassemblyjs/wasm-text-gen";
-    version = "1.11.0";
+    version = "1.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.11.0.tgz";
-      sha512 = "Q1OfB3hpa4TtM6x5a2gJmZncpQYx0hFt4ohdgv4Ms67kcAVwL29QQ2NDbNqfKr15IzlNAhLGueCzxG6dMjdnbQ==";
+      url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.9.1.tgz";
+      sha512 = "RzgRzhCQJ/DBak+Yoy2bo4W6dUdqiswX8PN7qXsIZpNLYMcOOkcaq2o5gkiT/Y2HM3Rt08GxnBBlanXTrryTKQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -64384,15 +64495,19 @@ in
       sources."@babel/parser-7.12.11"
       sources."@babel/template-7.12.7"
       sources."@babel/types-7.12.12"
-      sources."@webassemblyjs/ast-1.11.0"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
-      sources."@webassemblyjs/helper-api-error-1.11.0"
-      sources."@webassemblyjs/helper-numbers-1.11.0"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
-      sources."@webassemblyjs/ieee754-1.11.0"
-      sources."@webassemblyjs/leb128-1.11.0"
-      sources."@webassemblyjs/utf8-1.11.0"
-      sources."@webassemblyjs/wasm-parser-1.11.0"
+      sources."@webassemblyjs/ast-1.9.1"
+      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
+      sources."@webassemblyjs/helper-api-error-1.9.1"
+      sources."@webassemblyjs/helper-code-frame-1.9.1"
+      sources."@webassemblyjs/helper-fsm-1.9.1"
+      sources."@webassemblyjs/helper-module-context-1.9.1"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
+      sources."@webassemblyjs/ieee754-1.9.1"
+      sources."@webassemblyjs/leb128-1.9.1"
+      sources."@webassemblyjs/utf8-1.9.1"
+      sources."@webassemblyjs/wasm-parser-1.9.1"
+      sources."@webassemblyjs/wast-parser-1.9.1"
+      sources."@webassemblyjs/wast-printer-1.9.1"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."ansi-styles-3.2.1"
@@ -64422,21 +64537,21 @@ in
   "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_wast-refmt";
     packageName = "@webassemblyjs/wast-refmt";
-    version = "1.11.0";
+    version = "1.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.11.0.tgz";
-      sha512 = "UVjojl3i1wzn2odausLskcFh7VaZqbp5HJ5od9pdsLvUZ06cSUo35yJ9Yetoc+yNj/IfdfisJtOcTQmILQ+RqQ==";
+      url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.9.1.tgz";
+      sha512 = "+JfTZZV25LhdJspgw5xznFr/2QiFnHrKvb8CXmEV/s3PNFRpNDUlRPw0ZUZk2cwooZdiWNpC+WKfRPQb8tMx8w==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.11.0"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
-      sources."@webassemblyjs/helper-api-error-1.11.0"
-      sources."@webassemblyjs/helper-code-frame-1.11.0"
-      sources."@webassemblyjs/helper-fsm-1.11.0"
-      sources."@webassemblyjs/helper-numbers-1.11.0"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
-      sources."@webassemblyjs/wast-parser-1.11.0"
-      sources."@webassemblyjs/wast-printer-1.11.0"
+      sources."@webassemblyjs/ast-1.9.1"
+      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
+      sources."@webassemblyjs/helper-api-error-1.9.1"
+      sources."@webassemblyjs/helper-code-frame-1.9.1"
+      sources."@webassemblyjs/helper-fsm-1.9.1"
+      sources."@webassemblyjs/helper-module-context-1.9.1"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
+      sources."@webassemblyjs/wast-parser-1.9.1"
+      sources."@webassemblyjs/wast-printer-1.9.1"
       sources."@xtuc/long-4.2.2"
     ];
     buildInputs = globalBuildInputs;
@@ -64591,7 +64706,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -64609,7 +64724,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Creating Electron app packages";
-      homepage = "https://github.com/electron/asar";
+      homepage = https://github.com/electron/asar;
       license = "MIT";
     };
     production = true;
@@ -64726,7 +64841,7 @@ in
       sources."turndown-4.0.2"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urijs-1.19.5"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -64759,15 +64874,15 @@ in
   bower = nodeEnv.buildNodePackage {
     name = "bower";
     packageName = "bower";
-    version = "1.8.12";
+    version = "1.8.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz";
-      sha512 = "u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q==";
+      url = "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz";
+      sha512 = "1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "The browser package manager";
-      homepage = "http://bower.io";
+      homepage = http://bower.io/;
       license = "MIT";
     };
     production = true;
@@ -64786,7 +64901,7 @@ in
       sources."argparse-1.0.4"
       sources."array-find-index-1.0.2"
       sources."balanced-match-1.0.0"
-      sources."bower-1.8.12"
+      sources."bower-1.8.8"
       sources."bower-endpoint-parser-0.2.1"
       sources."bower-json-0.6.0"
       sources."bower-logger-0.2.1"
@@ -64900,7 +65015,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Generate nix expressions to fetch bower dependencies";
-      homepage = "https://github.com/rvl/bower2nix";
+      homepage = https://github.com/rvl/bower2nix;
       license = "GPL-3.0";
     };
     production = true;
@@ -64955,7 +65070,7 @@ in
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.2"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."cipher-base-1.0.4"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
@@ -64990,7 +65105,7 @@ in
           sources."bn.js-4.11.9"
         ];
       })
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."events-3.2.0"
       sources."evp_bytestokey-1.0.3"
@@ -65203,7 +65318,7 @@ in
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
-      sources."bunyan-1.8.15"
+      sources."bunyan-1.8.14"
       sources."bytes-3.1.0"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
@@ -65555,7 +65670,7 @@ in
       sources."uglify-to-browserify-1.0.2"
       sources."uid-safe-2.1.5"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -65610,7 +65725,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.40"
+      sources."@types/node-13.13.39"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -65672,7 +65787,7 @@ in
       sources."co-3.1.0"
       sources."codepage-1.4.0"
       sources."combined-stream-1.0.8"
-      sources."commander-7.0.0"
+      sources."commander-6.2.1"
       sources."compact2string-1.4.1"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
@@ -65974,7 +66089,7 @@ in
       sources."ultron-1.1.1"
       sources."underscore-1.6.0"
       sources."uniq-1.0.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."utfx-1.0.1"
       sources."util-deprecate-1.0.2"
       sources."utp-0.0.7"
@@ -66015,35 +66130,35 @@ in
   cdk8s-cli = nodeEnv.buildNodePackage {
     name = "cdk8s-cli";
     packageName = "cdk8s-cli";
-    version = "1.0.0-beta.6";
+    version = "1.0.0-beta.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.6.tgz";
-      sha512 = "x6sJTGaSPoyQbcKbxkKxmgdGXLpyO+qbgt6GgN9guIk28dgkoqZG9CcfmwjAs+OXoY4ZiyNKvNO4w9ljW/+XOQ==";
+      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.5.tgz";
+      sha512 = "5jVubGjmRXlrXPDJIl2g2oWApFmN7V2EzonMWDd67TlaOwwS8Ypy4ej3VvwviXyZ7IO9zET4pDNFSInBQE+aJw==";
     };
     dependencies = [
-      sources."@jsii/spec-1.17.1"
-      sources."@types/node-10.17.51"
+      sources."@jsii/spec-1.16.0"
+      sources."@types/node-10.17.50"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."array-filter-1.0.0"
       sources."at-least-node-1.0.0"
       sources."available-typed-arrays-1.0.2"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-6.2.0"
       sources."case-1.6.3"
-      sources."cdk8s-1.0.0-beta.6"
+      sources."cdk8s-1.0.0-beta.5"
       sources."cliui-7.0.4"
       sources."clone-2.1.2"
-      (sources."codemaker-1.17.1" // {
+      (sources."codemaker-1.16.0" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
+          sources."fs-extra-9.0.1"
         ];
       })
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."constructs-3.2.112"
+      sources."constructs-3.2.94"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-4.0.0"
@@ -66054,7 +66169,7 @@ in
       sources."dot-case-3.0.4"
       sources."emoji-regex-8.0.0"
       sources."entities-2.0.3"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.17.7"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
@@ -66087,42 +66202,50 @@ in
       sources."is-set-2.0.2"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      sources."is-typed-array-1.1.4"
+      (sources."is-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."isarray-2.0.5"
-      (sources."jsii-1.17.1" // {
+      (sources."jsii-1.16.0" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
+          sources."fs-extra-9.0.1"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-pacmak-1.17.1" // {
+      (sources."jsii-pacmak-1.16.0" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
+          sources."fs-extra-9.0.1"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-reflect-1.17.1" // {
+      (sources."jsii-reflect-1.16.0" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
+          sources."fs-extra-9.0.1"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-rosetta-1.17.1" // {
+      (sources."jsii-rosetta-1.16.0" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
+          sources."fs-extra-9.0.1"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.204" // {
+      (sources."jsii-srcmak-0.1.180" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
+          sources."fs-extra-9.0.1"
         ];
       })
       sources."json-schema-0.2.5"
-      sources."json2jsii-0.1.188"
-      sources."jsonfile-6.1.0"
+      sources."json2jsii-0.1.172"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."jsonschema-1.4.0"
       sources."locate-path-5.0.0"
       sources."log4js-6.3.0"
@@ -66137,15 +66260,15 @@ in
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
-      sources."oo-ascii-tree-1.17.1"
+      sources."oo-ascii-tree-1.16.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."path-exists-4.0.0"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."rfdc-1.2.0"
+      sources."rfdc-1.1.4"
       sources."semver-7.3.4"
       (sources."semver-intersect-1.4.0" // {
         dependencies = [
@@ -66168,13 +66291,17 @@ in
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
       sources."strip-ansi-6.0.0"
-      sources."tslib-2.1.0"
+      sources."tslib-2.0.3"
       sources."typescript-3.9.7"
-      sources."universalify-2.0.0"
+      sources."universalify-1.0.0"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
       sources."which-module-2.0.0"
-      sources."which-typed-array-1.1.4"
+      (sources."which-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."wrap-ansi-7.0.0"
       sources."xmlbuilder-15.1.1"
       sources."xmldom-0.4.0"
@@ -66206,52 +66333,32 @@ in
   cdktf-cli = nodeEnv.buildNodePackage {
     name = "cdktf-cli";
     packageName = "cdktf-cli";
-    version = "0.1.0";
+    version = "0.0.19";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.1.0.tgz";
-      sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA==";
+      url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.0.19.tgz";
+      sha512 = "JH2DyIQyhpI8lwO4HANha/HiVV2MXVG63iK+PZbEZKJDEr3fVB0WSKvzrp66CarceLiuNy7Z5cIR+81Q6eMx+w==";
     };
     dependencies = [
-      sources."@jsii/spec-1.17.1"
-      sources."@skorfmann/terraform-cloud-1.7.1"
-      sources."@types/archiver-5.1.0"
-      sources."@types/glob-7.1.3"
-      sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@jsii/spec-1.16.0"
+      sources."@types/node-14.14.20"
       sources."@types/readline-sync-1.4.3"
-      sources."@types/stream-buffers-3.0.3"
       sources."@types/uuid-8.3.0"
       sources."@types/yoga-layout-1.9.2"
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
-      sources."archiver-5.2.0"
-      (sources."archiver-utils-2.1.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-        ];
-      })
       sources."array-filter-1.0.0"
       sources."array-includes-3.1.2"
       sources."array.prototype.flatmap-1.2.4"
       sources."arrify-2.0.1"
       sources."astral-regex-2.0.0"
-      sources."async-3.2.0"
       sources."at-least-node-1.0.0"
       sources."auto-bind-4.0.0"
       sources."available-typed-arrays-1.0.2"
-      sources."axios-0.21.1"
-      sources."balanced-match-1.0.0"
-      sources."base64-js-1.5.1"
-      sources."bl-4.0.3"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.1"
-      sources."buffer-crc32-0.2.13"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
-      sources."camelcase-keys-6.2.2"
       sources."case-1.6.3"
-      sources."cdktf-0.1.0"
+      sources."cdktf-0.0.19"
       sources."chalk-4.1.0"
       sources."ci-info-2.0.0"
       sources."cli-cursor-3.1.0"
@@ -66268,57 +66375,35 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."compress-commons-4.0.2"
-      sources."concat-map-0.0.1"
-      sources."constructs-3.2.112"
-      sources."core-util-is-1.0.2"
-      sources."crc-32-1.2.0"
-      sources."crc32-stream-4.0.1"
+      sources."constructs-3.2.94"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-1.2.0"
-      (sources."deep-equal-2.0.5" // {
-        dependencies = [
-          sources."isarray-2.0.5"
-        ];
-      })
+      sources."deep-equal-2.0.5"
       sources."define-properties-1.1.3"
       sources."detect-indent-5.0.0"
       sources."detect-newline-2.1.0"
       sources."doctrine-2.1.0"
       sources."emoji-regex-8.0.0"
-      sources."end-of-stream-1.4.4"
       sources."entities-2.0.3"
-      sources."es-abstract-1.18.0-next.2"
-      (sources."es-get-iterator-1.1.1" // {
-        dependencies = [
-          sources."isarray-2.0.5"
-        ];
-      })
+      sources."es-abstract-1.18.0-next.1"
+      sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-4.0.0"
       sources."eslint-plugin-react-7.22.0"
       sources."esutils-2.0.3"
-      sources."exit-on-epipe-1.0.1"
       sources."find-up-4.1.0"
       sources."flatted-2.0.2"
-      sources."follow-redirects-1.13.1"
       sources."foreach-2.0.5"
-      sources."fs-constants-1.0.0"
       sources."fs-extra-8.1.0"
-      sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.0.2"
-      sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.1"
-      sources."ieee754-1.2.1"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
       (sources."ink-2.7.1" // {
         dependencies = [
           sources."chalk-3.0.0"
@@ -66356,65 +66441,75 @@ in
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."is-wsl-2.2.0"
-      sources."isarray-1.0.0"
+      sources."isarray-2.0.5"
       sources."js-tokens-4.0.0"
-      (sources."jsii-1.17.1" // {
+      (sources."jsii-1.16.0" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
-          sources."jsonfile-6.1.0"
-          sources."universalify-2.0.0"
+          sources."fs-extra-9.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
+          sources."universalify-1.0.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-pacmak-1.17.1" // {
+      (sources."jsii-pacmak-1.16.0" // {
         dependencies = [
           sources."camelcase-6.2.0"
-          sources."codemaker-1.17.1"
+          sources."codemaker-1.16.0"
           sources."decamelize-4.0.0"
-          sources."fs-extra-9.1.0"
-          sources."jsonfile-6.1.0"
-          sources."universalify-2.0.0"
+          sources."fs-extra-9.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
+          sources."universalify-1.0.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-reflect-1.17.1" // {
+      (sources."jsii-reflect-1.16.0" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
-          sources."jsonfile-6.1.0"
-          sources."universalify-2.0.0"
+          sources."fs-extra-9.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
+          sources."universalify-1.0.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-rosetta-1.17.1" // {
+      (sources."jsii-rosetta-1.16.0" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
-          sources."jsonfile-6.1.0"
-          sources."universalify-2.0.0"
+          sources."fs-extra-9.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
+          sources."universalify-1.0.0"
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.204" // {
+      (sources."jsii-srcmak-0.1.180" // {
         dependencies = [
-          sources."fs-extra-9.1.0"
-          sources."jsonfile-6.1.0"
-          sources."universalify-2.0.0"
+          sources."fs-extra-9.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
+          sources."universalify-1.0.0"
         ];
       })
       sources."jsonfile-4.0.0"
       sources."jsonschema-1.4.0"
       sources."jsx-ast-utils-3.2.0"
-      (sources."lazystream-1.0.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-        ];
-      })
       sources."locate-path-5.0.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.difference-4.5.0"
-      sources."lodash.flatten-4.4.0"
-      sources."lodash.isplainobject-4.0.6"
       sources."lodash.throttle-4.1.1"
-      sources."lodash.union-4.6.0"
       (sources."log-update-3.4.0" // {
         dependencies = [
           sources."ansi-escapes-3.2.0"
@@ -66436,14 +66531,11 @@ in
       sources."log4js-6.3.0"
       sources."loose-envify-1.4.0"
       sources."lru-cache-6.0.0"
-      sources."map-obj-4.1.0"
       sources."mdurl-1.0.1"
       sources."mimic-fn-2.1.0"
-      sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."ms-2.1.2"
       sources."ncp-2.0.0"
-      sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
       sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
@@ -66452,33 +66544,29 @@ in
       sources."object.entries-1.1.3"
       sources."object.fromentries-2.0.3"
       sources."object.values-1.1.2"
-      sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."oo-ascii-tree-1.17.1"
-      sources."open-7.3.1"
+      sources."oo-ascii-tree-1.16.0"
+      sources."open-7.3.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
-      sources."printj-1.1.2"
-      sources."process-nextick-args-2.0.1"
       sources."prop-types-15.7.2"
-      sources."quick-lru-4.0.1"
       sources."react-16.14.0"
       sources."react-is-16.13.1"
       sources."react-reconciler-0.24.0"
-      sources."readable-stream-3.6.0"
-      sources."readdir-glob-1.1.1"
       sources."readline-sync-1.4.10"
-      sources."regexp.prototype.flags-1.3.1"
+      (sources."regexp.prototype.flags-1.3.0" // {
+        dependencies = [
+          sources."es-abstract-1.17.7"
+        ];
+      })
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."resolve-1.19.0"
       sources."restore-cursor-3.1.0"
-      sources."rfdc-1.2.0"
-      sources."safe-buffer-5.1.2"
+      sources."rfdc-1.1.4"
       sources."scheduler-0.18.0"
       sources."semver-7.3.4"
       (sources."semver-intersect-1.4.0" // {
@@ -66493,7 +66581,6 @@ in
       sources."sort-json-2.0.0"
       sources."spdx-license-list-6.3.0"
       sources."sscaff-1.2.0"
-      sources."stream-buffers-3.0.2"
       (sources."streamroller-2.2.4" // {
         dependencies = [
           sources."date-format-2.1.0"
@@ -66511,14 +66598,11 @@ in
       sources."string.prototype.repeat-0.2.0"
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
-      sources."string_decoder-1.1.1"
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
-      sources."tar-stream-2.2.0"
       sources."type-fest-0.11.0"
       sources."typescript-3.9.7"
       sources."universalify-0.1.2"
-      sources."util-deprecate-1.0.2"
       sources."uuid-8.3.2"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
@@ -66526,7 +66610,6 @@ in
       sources."which-typed-array-1.1.4"
       sources."widest-line-3.1.0"
       sources."wrap-ansi-6.2.0"
-      sources."wrappy-1.0.2"
       sources."xmlbuilder-15.1.1"
       sources."xmldom-0.4.0"
       sources."y18n-5.0.5"
@@ -66541,7 +66624,6 @@ in
       sources."yargs-parser-20.2.4"
       sources."yn-3.1.1"
       sources."yoga-layout-prebuilt-1.10.0"
-      sources."zip-stream-4.0.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -66691,10 +66773,10 @@ in
   coc-diagnostic = nodeEnv.buildNodePackage {
     name = "coc-diagnostic";
     packageName = "coc-diagnostic";
-    version = "0.18.0";
+    version = "0.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.0.tgz";
-      sha512 = "6ghwTYVdJ/XMcoLb690DPcxVM3t2bCDKTFPqMfkamBhKRJNFJDSjxQiP3Njn5f7g4rYvIuBQdZ8wteB4dr/4HA==";
+      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.14.0.tgz";
+      sha512 = "ccxtSRTqVIuIQrtS5SI0uevO2WC7cSA9dNtiZ/PveDKyxhqyQlfRs9n0bdOJdXteYt6BKUIiqFV8Q48Z71y89A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66732,10 +66814,10 @@ in
   coc-eslint = nodeEnv.buildNodePackage {
     name = "coc-eslint";
     packageName = "coc-eslint";
-    version = "1.4.5";
+    version = "1.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.5.tgz";
-      sha512 = "+xt0bn1nG348Q2tERiL44a/20a+NeDJLtwh7Gnn5VjOQ64OYUGrbAbQphskdVZyLE5qRDTvyiLArN+IxDsmpQQ==";
+      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.4.1.tgz";
+      sha512 = "dqzn4vqmEqIlzwpFxG6AnhXUwDSTMLsg2d4RDwHDhh1yioukSFR+turQxsq9fssuWeV208y54kb/AzmOIji9jA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66750,10 +66832,10 @@ in
   coc-git = nodeEnv.buildNodePackage {
     name = "coc-git";
     packageName = "coc-git";
-    version = "2.2.0";
+    version = "2.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.0.tgz";
-      sha512 = "afm5SjyvQl21+4oGotX8mxjiwEBw8veRJun+sZQ5S4ZXMH6tQBZexE0Nyydcaoa5U0P1TBlI7Ywt+e/IZZxleA==";
+      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.5.tgz";
+      sha512 = "MwoSWGr8mco+/Bth/4zr0kNRuG9rXYgyAEI1mGOuRsMqy2G9LEr4azSP68V2EuIPzYVcYx6ZZk2o5e8b/ux0/w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66768,15 +66850,15 @@ in
   coc-go = nodeEnv.buildNodePackage {
     name = "coc-go";
     packageName = "coc-go";
-    version = "0.13.3";
+    version = "0.13.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.3.tgz";
-      sha512 = "JxAJD3z10ziO8CxgTUlguZp8uy1r6fo0pP+L4GeXKv+q12BHIxWXoAZdd158vAP/YCh0Yw4zBrij57Fg4wtVdg==";
+      url = "https://registry.npmjs.org/coc-go/-/coc-go-0.13.2.tgz";
+      sha512 = "E//SHaQlzmh4nBUJsA6oSZWBVFkEWJ/kjL19jIBbIrY8KWCjxfCm6H8+WDNMUULHS2HQNlUEQzVHS/ftE10iGg==";
     };
     dependencies = [
       sources."isexe-2.0.0"
       sources."node-fetch-2.6.1"
-      sources."tslib-2.1.0"
+      sources."tslib-2.0.3"
       sources."vscode-languageserver-textdocument-1.0.1"
       sources."vscode-uri-3.0.2"
       sources."which-2.0.2"
@@ -66810,10 +66892,10 @@ in
   coc-html = nodeEnv.buildNodePackage {
     name = "coc-html";
     packageName = "coc-html";
-    version = "1.4.1";
+    version = "1.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.4.1.tgz";
-      sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw==";
+      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.3.2.tgz";
+      sha512 = "8upyERwR/7zZNDkATpKy1aIyflzwfsgercRsHm1OG/ECRG2FpUWYkHywHBDbWAdHsipbd2WoO0nr3Ct22JV4oA==";
     };
     dependencies = [
       sources."typescript-4.1.3"
@@ -66884,10 +66966,10 @@ in
   coc-json = nodeEnv.buildNodePackage {
     name = "coc-json";
     packageName = "coc-json";
-    version = "1.3.3";
+    version = "1.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.3.tgz";
-      sha512 = "yMayIIMn/+JaSxHbAG2384sr1/1jvhDCuvRWXeWI+yLLVNCQ7pizGW8EeLC2bSkd01PORRWT4LBn7mNMs6dPRw==";
+      url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.2.tgz";
+      sha512 = "4wSADhO6oE2lxyYJw1cZqz6eYTrJWI4wHLETSTwhkkpZrPCNJA7mSmuB6oowxt7kJRmDVAIZP2mFyLTXU0jU6w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66901,10 +66983,10 @@ in
   coc-lists = nodeEnv.buildNodePackage {
     name = "coc-lists";
     packageName = "coc-lists";
-    version = "1.4.0";
+    version = "1.3.16";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.0.tgz";
-      sha512 = "AKmM8/+BjncinB4MrS/e8hJ7MzvXL5GtAvusGZb3zsAj4tNO77oWiVzE8V09QEWAsorgHVgNv/OXr4EPJMZvpg==";
+      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.16.tgz";
+      sha512 = "6m/LCFHcnFdbJoFnrkzj8OhBvcFl491eYG0247Gti/u2iQCVj2X8RRxdxcGbDh4tR5OEPZdQPcd6YMDbtphPSg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66919,10 +67001,10 @@ in
   coc-markdownlint = nodeEnv.buildNodePackage {
     name = "coc-markdownlint";
     packageName = "coc-markdownlint";
-    version = "1.10.0";
+    version = "1.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.10.0.tgz";
-      sha512 = "tXSfE7JFm2xer0xIdpqlYsBfJiWr/tCU/CcOpvi7cybwfnF7kz9A/pE1Re0noUd9TE+OGp+qQ2IOXXOBuRz/tQ==";
+      url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.9.0.tgz";
+      sha512 = "cTIR4IXs6CC06iDwylxzS0Sq4HhiWofTBqgedtbAckkaoJYOZdM+uMKKdkSO2nt93bHtE4MsEoQ91sxHgKqNfg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66937,10 +67019,10 @@ in
   coc-metals = nodeEnv.buildNodePackage {
     name = "coc-metals";
     packageName = "coc-metals";
-    version = "1.0.1";
+    version = "0.9.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.1.tgz";
-      sha512 = "1chc5qluoxF39fNKSoLNrPWrWsBQc+zHkXmleOka2HLYDQHmqgYqWZiPgJ03IqOoR3uJcS8sgdrCLyVdqWBwrg==";
+      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.9.tgz";
+      sha512 = "VCjIm+ytVrgqzAXMpweh3D8SfQg9oF0BVXSFeUIgsm3xU9BuZd1jU+CxtNNAIihxcJ1LUX1JGn1Sydu541hwzA==";
     };
     dependencies = [
       sources."@chemzqm/neovim-5.2.13"
@@ -66958,7 +67040,7 @@ in
       sources."buffer-indexof-polyfill-1.0.2"
       sources."buffers-0.1.1"
       sources."bytes-3.1.0"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."chainsaw-0.1.0"
       sources."chownr-2.0.0"
       sources."clipboardy-2.3.0"
@@ -67066,7 +67148,7 @@ in
       sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."rfc-3986-1.0.1"
-      sources."rfdc-1.2.0"
+      sources."rfdc-1.1.4"
       sources."rimraf-3.0.2"
       sources."safe-buffer-5.1.2"
       sources."semver-7.3.4"
@@ -67085,9 +67167,9 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."tar-6.1.0"
+      sources."tar-6.0.5"
       sources."traverse-0.3.9"
-      sources."tslib-2.1.0"
+      sources."tslib-2.0.3"
       sources."universalify-0.1.2"
       sources."unzipper-0.10.11"
       sources."util-deprecate-1.0.2"
@@ -67117,10 +67199,10 @@ in
   coc-pairs = nodeEnv.buildNodePackage {
     name = "coc-pairs";
     packageName = "coc-pairs";
-    version = "1.2.22";
+    version = "1.2.21";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.22.tgz";
-      sha512 = "AskNxINhyImxvFhlt0tvFJUS/Z4sUehgKPdy1jxVa+vu4CU903cNR6Dot4phrRRfgSCH3NT8SrYBhg4YvsxlkA==";
+      url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.21.tgz";
+      sha512 = "QTrzPCgk+zNVSnDjCbm3cvzb6c6rIwYMowrGhVb4XGnc8ooMXDBSfMoPYUtVgEJ+Qcu3++93OWr+m2VOHwHxag==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -67147,7 +67229,7 @@ in
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@types/eslint-visitor-keys-1.0.0"
-      sources."@types/json-schema-7.0.7"
+      sources."@types/json-schema-7.0.6"
       sources."@typescript-eslint/experimental-utils-3.10.1"
       sources."@typescript-eslint/parser-3.10.1"
       sources."@typescript-eslint/types-3.10.1"
@@ -67215,7 +67297,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       sources."capture-stack-trace-1.0.1"
       sources."ccount-1.1.0"
       sources."chalk-2.4.2"
@@ -67272,7 +67354,7 @@ in
         ];
       })
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.3"
+      sources."core-js-3.8.2"
       sources."cosmiconfig-3.1.0"
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-6.0.5" // {
@@ -67312,7 +67394,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -68001,7 +68083,7 @@ in
           sources."tsutils-2.29.0"
         ];
       })
-      sources."tsutils-3.19.1"
+      sources."tsutils-3.18.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."typescript-3.9.7"
@@ -68029,7 +68111,7 @@ in
       })
       sources."unzip-response-2.0.1"
       sources."update-notifier-2.5.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       sources."use-3.1.1"
@@ -68153,10 +68235,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.29.0";
+    version = "0.26.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.29.0.tgz";
-      sha512 = "fEvA/RUDaEgIh3odV4sc+t6E2t96ip2Dn5CTaijqMwZcIy69jwVODw1pjR98kTViv3eJ4I419l1fT2iSF+tTtw==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.26.0.tgz";
+      sha512 = "Wn0m/IImB9BryAUhH5WTSqrkWh2tamuMVyMzxUmH1EW71TJKOavfV2DAmSNYSkGCD/H9icUbMIiSwyMI9JVYOw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68189,10 +68271,10 @@ in
   coc-snippets = nodeEnv.buildNodePackage {
     name = "coc-snippets";
     packageName = "coc-snippets";
-    version = "2.4.0";
+    version = "2.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.0.tgz";
-      sha512 = "XjL23iRnKCxeh/qG6FN1SJQQRHLunlxs6UlJua35A42tjztC6ZZYwuE4W9W8oU53iqGrSYrIrkT1+WFznBr/0g==";
+      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.3.1.tgz";
+      sha512 = "n11bVCYeDA0s1wYNAYsQdAHVv4C/k8QkvadSkzRWrNCP29fivGALp+wEYl8rtsqs0aeKY3FtPsI812581g6NPg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68206,10 +68288,10 @@ in
   coc-solargraph = nodeEnv.buildNodePackage {
     name = "coc-solargraph";
     packageName = "coc-solargraph";
-    version = "1.2.0";
+    version = "1.1.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.0.tgz";
-      sha512 = "0bvily8jnfmBx/WjNgZ/1TNVSV2BBSsaAflc4bhwtw1mN7XLAiXLpeK3Eps6qwOYMtTRngJFKxNXKoAM2bCY/A==";
+      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.8.tgz";
+      sha512 = "j0/S9ycyP4cdFhTu3FGaY4t0ZSn1K5EFWi6A90nppQYPwrzSGo3tn5XDO44vaWsYhEUlQfQrXVwtFScKCdc1vg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68273,11 +68355,11 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.16.0"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -68315,7 +68397,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -68325,14 +68407,14 @@ in
       sources."extend-3.0.2"
       sources."fast-deep-equal-3.1.3"
       sources."fast-diff-1.2.0"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fastest-levenshtein-1.0.12"
       sources."fastq-1.10.0"
       sources."file-entry-cache-6.0.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.1"
+      sources."flatted-3.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
@@ -68342,7 +68424,7 @@ in
       sources."global-modules-2.0.0"
       sources."global-prefix-3.0.0"
       sources."globals-11.12.0"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       sources."globjoin-0.1.4"
       sources."gonzales-pe-4.3.0"
       sources."hard-rejection-2.1.0"
@@ -68397,7 +68479,7 @@ in
       sources."mdast-util-from-markdown-0.8.4"
       sources."mdast-util-to-markdown-0.6.2"
       sources."mdast-util-to-string-2.0.0"
-      sources."meow-9.0.0"
+      sources."meow-8.1.0"
       sources."merge2-1.4.1"
       sources."micromark-2.11.2"
       sources."micromatch-4.0.2"
@@ -68410,7 +68492,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       (sources."normalize-package-data-3.0.0" // {
         dependencies = [
           sources."semver-7.3.4"
@@ -68425,7 +68507,7 @@ in
       sources."p-try-2.2.0"
       sources."parent-module-1.0.1"
       sources."parse-entities-2.0.0"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
@@ -68505,7 +68587,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-indent-3.0.0"
       sources."style-search-0.1.0"
-      sources."stylelint-13.9.0"
+      sources."stylelint-13.8.0"
       sources."sugarss-2.0.0"
       sources."supports-color-5.5.0"
       sources."svg-tags-1.0.0"
@@ -68521,7 +68603,7 @@ in
       sources."unist-util-find-all-after-3.0.2"
       sources."unist-util-is-4.0.4"
       sources."unist-util-stringify-position-2.0.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
@@ -68557,10 +68639,10 @@ in
   coc-tabnine = nodeEnv.buildNodePackage {
     name = "coc-tabnine";
     packageName = "coc-tabnine";
-    version = "1.3.3";
+    version = "1.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.3.tgz";
-      sha512 = "6CYtXKaEduGHLjiBdYRcWvl7gzvW92iGTxW7M3KVfn/tRFO+VF+3FuSX7Fg53ol4/USyNOTgXz3uyBjfsZOBXA==";
+      url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.3.tgz";
+      sha512 = "1FVW4hj7eK8PAUS0fzeme/23iBBP9Q3nfoMVzpBGchJiziL2qOhXaFrU0QgliIhiRSMmLnagTx/lWuI8BuO96g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68668,10 +68750,10 @@ in
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";
-    version = "1.6.7";
+    version = "1.6.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.7.tgz";
-      sha512 = "NVBl6AEbEax6GQdBlBy/SelJ5TXCkrnLN/dDqgDWwhIPX6UBFhFTFCLcqcHbfMjLM/MDvP/t85w+OYBGe2gXxg==";
+      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.6.tgz";
+      sha512 = "Rij5moc30YSnhYkiSwilLYorbRkmYPn9uN5b4EMXrNo0wWGReFYRRCxq72BoDEIwbTE3MsuVb67irdMukJ95eA==";
     };
     dependencies = [
       sources."typescript-4.1.3"
@@ -68702,7 +68784,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.3.0"
+      sources."@eslint/eslintrc-0.2.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."ajv-6.12.6"
@@ -68736,7 +68818,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-7.18.0"
+      sources."eslint-7.17.0"
       sources."eslint-plugin-vue-7.4.1"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
@@ -68768,7 +68850,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."file-entry-cache-6.0.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.1"
+      sources."flatted-3.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
@@ -68847,10 +68929,10 @@ in
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
       sources."typescript-4.1.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."v8-compile-cache-2.2.0"
       sources."vls-0.5.10"
-      (sources."vue-eslint-parser-7.4.1" // {
+      (sources."vue-eslint-parser-7.3.0" // {
         dependencies = [
           sources."eslint-visitor-keys-1.3.0"
           sources."espree-6.2.1"
@@ -69013,7 +69095,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Unfancy JavaScript";
-      homepage = "http://coffeescript.org";
+      homepage = http://coffeescript.org/;
       license = "MIT";
     };
     production = true;
@@ -69289,7 +69371,7 @@ in
       })
       sources."extsprintf-1.4.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-parse-1.0.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.10.0"
@@ -69301,7 +69383,7 @@ in
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
-      sources."fs-extra-9.1.0"
+      sources."fs-extra-9.0.1"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-stream-5.2.0"
@@ -69309,7 +69391,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."global-dirs-2.1.0"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       (sources."got-9.6.0" // {
         dependencies = [
           sources."get-stream-4.1.0"
@@ -69392,7 +69474,11 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-6.1.0"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."extsprintf-1.3.0"
@@ -69447,7 +69533,7 @@ in
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."os-homedir-1.0.2"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
@@ -69563,7 +69649,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.34.7"
+      sources."systeminformation-4.34.2"
       sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -69579,10 +69665,10 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."underscore-1.12.0"
       sources."unique-string-2.0.0"
-      sources."universalify-2.0.0"
+      sources."universalify-1.0.0"
       sources."unpipe-1.0.0"
       sources."update-notifier-4.1.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-parse-lax-3.0.0"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -69650,7 +69736,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -69872,7 +69958,7 @@ in
       sources."p-map-3.0.0"
       sources."p-timeout-3.2.0"
       sources."p-try-2.2.0"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
       sources."path-exists-4.0.0"
@@ -70021,7 +70107,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -70111,7 +70197,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.9.6"
+      sources."qs-6.9.4"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.7"
@@ -70271,7 +70357,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Create React Native apps with no build configuration.";
-      homepage = "https://github.com/expo/create-react-native-app";
+      homepage = https://github.com/expo/create-react-native-app;
       license = "BSD-3-Clause";
     };
     production = true;
@@ -70293,7 +70379,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "CSSLint";
-      homepage = "http://csslint.net/";
+      homepage = http://csslint.net/;
       license = "MIT";
     };
     production = true;
@@ -70648,7 +70734,7 @@ in
       sources."menu-string-1.3.0"
       sources."merkle-tree-stream-3.0.3"
       sources."micromatch-3.1.10"
-      sources."mime-2.5.0"
+      sources."mime-2.4.7"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-response-2.1.0"
@@ -70733,7 +70819,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."random-access-file-2.1.4"
-      sources."random-access-memory-3.1.2"
+      sources."random-access-memory-3.1.1"
       sources."random-access-storage-1.4.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
@@ -70915,7 +71001,7 @@ in
       sources."untildify-3.0.3"
       sources."unzip-response-2.0.1"
       sources."update-notifier-2.5.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       sources."use-3.1.1"
@@ -70950,7 +71036,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Dat is the package manager for data. Easily share and version control data.";
-      homepage = "https://datproject.org";
+      homepage = https://datproject.org/;
       license = "BSD-3-Clause";
     };
     production = true;
@@ -70971,7 +71057,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A DHCP server written in JavaScript";
-      homepage = "https://github.com/infusion/node-dhcp";
+      homepage = https://github.com/infusion/node-dhcp;
       license = "MIT OR GPL-2.0";
     };
     production = true;
@@ -70981,10 +71067,10 @@ in
   diagnostic-languageserver = nodeEnv.buildNodePackage {
     name = "diagnostic-languageserver";
     packageName = "diagnostic-languageserver";
-    version = "1.8.1";
+    version = "1.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.1.tgz";
-      sha512 = "W8lFslQXZ6HEjy9Ba7jLYDzqJZFkWVINWZjNDUZslozm2ZLMH7QWNIa74DKZXLA972ZgY8iJ0WIMxn0Y4+1POw==";
+      url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.8.0.tgz";
+      sha512 = "UnQGWIszi+uXkZ/pYUDLKuftSOSIvc/ZBSp/W6OF/Qyr2SsEaSD6TuaIo7TiH1MGQX1b2EW9P1WlE+16Ft4MiA==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.4"
@@ -71001,14 +71087,14 @@ in
       sources."crypto-random-string-2.0.0"
       sources."del-6.0.0"
       sources."dir-glob-3.0.1"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fastq-1.10.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       sources."graceful-fs-4.2.4"
       sources."ignore-5.1.8"
       sources."indent-string-4.0.0"
@@ -71066,15 +71152,15 @@ in
   dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
     name = "dockerfile-language-server-nodejs";
     packageName = "dockerfile-language-server-nodejs";
-    version = "0.3.0";
+    version = "0.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.3.0.tgz";
-      sha512 = "nW0l6S6YZlSGrGu6PBHoLmhwqwxgNTSis1hvjaxpnS3Ohalf/e87HC/pkjg3c+AixytqlXPR7nixzVPDJTkNZQ==";
+      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.2.0.tgz";
+      sha512 = "D6qT5w2y73pF02c+caAPYn/IG7T/231u8WD/qfyt3MBtnRe8x7ZIQK9+VAxFYvCtqbGuN7MiPVoRctkth/jcuA==";
     };
     dependencies = [
       sources."dockerfile-ast-0.1.0"
-      sources."dockerfile-language-service-0.2.0"
-      sources."dockerfile-utils-0.2.0"
+      sources."dockerfile-language-service-0.1.1"
+      sources."dockerfile-utils-0.1.1"
       sources."vscode-jsonrpc-6.0.0"
       sources."vscode-languageserver-7.0.0"
       sources."vscode-languageserver-protocol-3.16.0"
@@ -71101,7 +71187,7 @@ in
     dependencies = [
       sources."@fast-csv/format-4.3.5"
       sources."@fast-csv/parse-4.3.6"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."JSONStream-1.3.5"
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
@@ -71213,7 +71299,7 @@ in
       })
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      (sources."uri-js-4.4.1" // {
+      (sources."uri-js-4.4.0" // {
         dependencies = [
           sources."punycode-2.1.1"
         ];
@@ -71296,7 +71382,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -71476,7 +71562,7 @@ in
       sources."p-limit-2.3.0"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."patch-console-1.0.0"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
@@ -71561,7 +71647,7 @@ in
       sources."trim-newlines-3.0.0"
       sources."type-fest-0.12.0"
       sources."unicode-emoji-modifier-base-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."validate-npm-package-license-3.0.4"
       sources."which-1.3.1"
       sources."widest-line-3.1.0"
@@ -71599,7 +71685,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images.";
-      homepage = "https://www.emojione.com";
+      homepage = https://www.emojione.com/;
     };
     production = true;
     bypassCache = true;
@@ -71623,10 +71709,10 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.156.0"
-      sources."@fluentui/react-focus-7.17.1"
+      sources."@fluentui/react-7.155.3"
+      sources."@fluentui/react-focus-7.17.0"
       sources."@fluentui/react-window-provider-1.0.1"
-      sources."@fluentui/theme-1.7.1"
+      sources."@fluentui/theme-1.7.0"
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
         dependencies = [
           sources."normalize-path-2.1.1"
@@ -71637,11 +71723,11 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."@microsoft/load-themed-styles-1.10.145"
+      sources."@microsoft/load-themed-styles-1.10.141"
       sources."@nodelib/fs.scandir-2.1.4"
       sources."@nodelib/fs.stat-2.0.4"
       sources."@nodelib/fs.walk-1.2.6"
-      sources."@npmcli/move-file-1.1.0"
+      sources."@npmcli/move-file-1.0.1"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/basic-auth-1.1.3"
@@ -71649,17 +71735,17 @@ in
       sources."@types/caseless-0.12.2"
       sources."@types/chart.js-2.9.24"
       sources."@types/connect-3.4.34"
-      sources."@types/engine.io-3.1.5"
+      sources."@types/engine.io-3.1.4"
       sources."@types/express-4.17.8"
-      sources."@types/express-serve-static-core-4.17.18"
+      sources."@types/express-serve-static-core-4.17.17"
       sources."@types/fancy-log-1.3.0"
       sources."@types/glob-7.1.3"
       sources."@types/hls.js-0.13.1"
       sources."@types/js-yaml-3.12.5"
-      sources."@types/json-schema-7.0.7"
+      sources."@types/json-schema-7.0.6"
       sources."@types/lodash-4.14.161"
       sources."@types/material-design-lite-1.1.16"
-      sources."@types/mime-1.3.2"
+      sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
       sources."@types/mithril-2.0.3"
@@ -71668,7 +71754,7 @@ in
       sources."@types/mysql-2.15.15"
       sources."@types/node-14.11.1"
       sources."@types/pg-7.14.5"
-      sources."@types/pg-types-2.2.0"
+      sources."@types/pg-types-1.11.5"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
       (sources."@types/request-2.48.5" // {
@@ -71676,18 +71762,18 @@ in
           sources."form-data-2.5.1"
         ];
       })
-      sources."@types/serve-static-1.13.9"
+      sources."@types/serve-static-1.13.8"
       sources."@types/socket.io-2.1.11"
       sources."@types/socket.io-client-1.4.33"
       sources."@types/sqlite3-3.1.6"
       sources."@types/tough-cookie-4.0.0"
       sources."@types/url-join-4.0.0"
-      sources."@uifabric/foundation-7.9.21"
-      sources."@uifabric/icons-7.5.18"
+      sources."@uifabric/foundation-7.9.20"
+      sources."@uifabric/icons-7.5.17"
       sources."@uifabric/merge-styles-7.19.1"
       sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.19"
+      sources."@uifabric/styling-7.16.18"
       sources."@uifabric/utilities-7.33.2"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -71875,7 +71961,7 @@ in
           sources."minizlib-2.1.2"
           sources."p-map-4.0.0"
           sources."rimraf-3.0.2"
-          sources."tar-6.1.0"
+          sources."tar-6.0.5"
         ];
       })
       sources."cache-base-1.0.1"
@@ -71885,7 +71971,7 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."callsite-1.0.0"
       sources."camelcase-3.0.0"
       sources."caseless-0.12.0"
@@ -72095,7 +72181,7 @@ in
         ];
       })
       sources."engine.io-parser-2.2.1"
-      sources."enhanced-resolve-4.5.0"
+      sources."enhanced-resolve-4.3.0"
       sources."errno-0.1.8"
       sources."error-ex-1.3.2"
       sources."es5-ext-0.10.53"
@@ -72161,7 +72247,7 @@ in
       sources."extsprintf-1.3.0"
       sources."fancy-log-1.3.3"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-1.1.4"
       sources."fastq-1.10.0"
@@ -72466,11 +72552,7 @@ in
       sources."material-design-lite-1.3.0"
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
-      (sources."memoizee-0.4.15" // {
-        dependencies = [
-          sources."next-tick-1.1.0"
-        ];
-      })
+      sources."memoizee-0.4.14"
       (sources."memory-fs-0.5.0" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -72580,7 +72662,7 @@ in
       })
       sources."nan-2.14.2"
       sources."nanomatch-1.2.13"
-      (sources."needle-2.6.0" // {
+      (sources."needle-2.5.2" // {
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
@@ -72655,51 +72737,19 @@ in
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.156.0"
+      sources."office-ui-fabric-react-7.155.3"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      (sources."openapi-default-setter-7.2.3" // {
-        dependencies = [
-          sources."openapi-types-7.2.3"
-        ];
-      })
-      (sources."openapi-framework-7.2.3" // {
-        dependencies = [
-          sources."openapi-types-7.2.3"
-        ];
-      })
-      (sources."openapi-jsonschema-parameters-7.2.3" // {
-        dependencies = [
-          sources."openapi-types-7.2.3"
-        ];
-      })
-      (sources."openapi-request-coercer-7.2.3" // {
-        dependencies = [
-          sources."openapi-types-7.2.3"
-        ];
-      })
-      (sources."openapi-request-validator-7.2.3" // {
-        dependencies = [
-          sources."openapi-types-7.2.3"
-        ];
-      })
-      (sources."openapi-response-validator-7.2.3" // {
-        dependencies = [
-          sources."openapi-types-7.2.3"
-        ];
-      })
-      (sources."openapi-schema-validator-7.2.3" // {
-        dependencies = [
-          sources."openapi-types-7.2.3"
-        ];
-      })
-      (sources."openapi-security-handler-7.2.3" // {
-        dependencies = [
-          sources."openapi-types-7.2.3"
-        ];
-      })
+      sources."openapi-default-setter-7.0.1"
+      sources."openapi-framework-7.2.0"
+      sources."openapi-jsonschema-parameters-7.0.2"
+      sources."openapi-request-coercer-7.1.0"
+      sources."openapi-request-validator-7.2.0"
+      sources."openapi-response-validator-7.0.1"
+      sources."openapi-schema-validator-7.0.1"
+      sources."openapi-security-handler-7.0.1"
       sources."openapi-types-7.0.1"
       (sources."opencollective-1.0.3" // {
         dependencies = [
@@ -72871,7 +72921,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."reusify-1.0.4"
-      sources."rfdc-1.2.0"
+      sources."rfdc-1.1.4"
       sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."run-async-2.4.1"
@@ -72881,7 +72931,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."sass-1.32.5"
+      sources."sass-1.32.0"
       sources."sax-1.2.4"
       sources."scheduler-0.19.1"
       sources."schema-utils-2.7.1"
@@ -72948,7 +72998,7 @@ in
           sources."debug-4.1.1"
           sources."isarray-2.0.1"
           sources."ms-2.1.3"
-          (sources."socket.io-parser-3.3.2" // {
+          (sources."socket.io-parser-3.3.1" // {
             dependencies = [
               sources."component-emitter-1.3.0"
               sources."debug-3.1.0"
@@ -73049,7 +73099,7 @@ in
       sources."sver-compat-1.5.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
       sources."swagger-ui-dist-3.34.0"
-      sources."tail-2.2.0"
+      sources."tail-2.1.1"
       sources."tapable-1.1.3"
       (sources."tar-4.4.13" // {
         dependencies = [
@@ -73138,7 +73188,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -73180,9 +73230,9 @@ in
       (sources."watchpack-1.7.5" // {
         dependencies = [
           sources."anymatch-3.1.1"
-          sources."binary-extensions-2.2.0"
-          sources."chokidar-3.5.1"
-          sources."fsevents-2.3.1"
+          sources."binary-extensions-2.1.0"
+          sources."chokidar-3.4.3"
+          sources."fsevents-2.1.3"
           sources."is-binary-path-2.1.0"
           sources."readdirp-3.5.0"
         ];
@@ -73288,10 +73338,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "7.18.0";
+    version = "7.17.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz";
-      sha512 = "fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz";
+      sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -73301,7 +73351,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.3.0"
+      sources."@eslint/eslintrc-0.2.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."ajv-6.12.6"
@@ -73362,7 +73412,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."file-entry-cache-6.0.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.1"
+      sources."flatted-3.1.0"
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
@@ -73424,7 +73474,7 @@ in
       sources."text-table-0.2.0"
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."v8-compile-cache-2.2.0"
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
@@ -73434,7 +73484,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "An AST-based pattern checker for JavaScript.";
-      homepage = "https://eslint.org";
+      homepage = https://eslint.org/;
       license = "MIT";
     };
     production = true;
@@ -73457,7 +73507,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.3.0"
+      sources."@eslint/eslintrc-0.2.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."ajv-6.12.6"
@@ -73489,7 +73539,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-7.18.0"
+      sources."eslint-7.17.0"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -73520,7 +73570,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."file-entry-cache-6.0.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.1"
+      sources."flatted-3.1.0"
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
@@ -73583,7 +73633,7 @@ in
       sources."text-table-0.2.0"
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."v8-compile-cache-2.2.0"
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
@@ -73593,7 +73643,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Makes eslint the fastest linter on the planet";
-      homepage = "https://github.com/mantoni/eslint_d.js";
+      homepage = https://github.com/mantoni/eslint_d.js;
       license = "MIT";
     };
     production = true;
@@ -73896,7 +73946,7 @@ in
                   sources."lru-cache-6.0.0"
                 ];
               })
-              (sources."tar-6.1.0" // {
+              (sources."tar-6.0.5" // {
                 dependencies = [
                   sources."chownr-2.0.0"
                 ];
@@ -73976,10 +74026,9 @@ in
         ];
       })
       sources."@npmcli/installed-package-contents-1.0.5"
-      (sources."@npmcli/move-file-1.1.0" // {
+      (sources."@npmcli/move-file-1.0.1" // {
         dependencies = [
           sources."mkdirp-1.0.4"
-          sources."rimraf-2.7.1"
         ];
       })
       sources."@npmcli/node-gyp-1.0.1"
@@ -74043,9 +74092,9 @@ in
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
-      sources."@types/json-schema-7.0.7"
+      sources."@types/json-schema-7.0.6"
       sources."@types/keyv-3.1.1"
-      sources."@types/lodash-4.14.168"
+      sources."@types/lodash-4.14.167"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
       sources."@types/node-9.6.61"
@@ -74062,7 +74111,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.26" // {
+      (sources."@types/webpack-4.41.25" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -74219,7 +74268,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."big-integer-1.6.48"
       sources."big.js-5.2.2"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
       sources."bluebird-3.7.2"
       sources."bmp-js-0.1.0"
@@ -74259,7 +74308,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.16.0"
       sources."buffer-5.7.1"
       sources."buffer-equal-0.0.1"
       sources."buffer-from-1.1.1"
@@ -74285,7 +74334,7 @@ in
           sources."normalize-url-4.5.0"
         ];
       })
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsite-1.0.0"
@@ -74293,12 +74342,12 @@ in
       (sources."camel-case-4.1.2" // {
         dependencies = [
           sources."pascal-case-3.1.2"
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.0" // {
@@ -74311,7 +74360,7 @@ in
         ];
       })
       sources."charenc-0.0.2"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."chownr-2.0.0"
       sources."chrome-trace-event-1.0.2"
       sources."ci-info-1.6.0"
@@ -74413,7 +74462,7 @@ in
           sources."array-union-2.1.0"
           sources."find-cache-dir-3.3.1"
           sources."find-up-4.1.0"
-          sources."globby-11.0.2"
+          sources."globby-11.0.1"
           sources."loader-utils-2.0.0"
           sources."locate-path-5.0.0"
           sources."make-dir-3.1.0"
@@ -74427,8 +74476,8 @@ in
           sources."slash-3.0.0"
         ];
       })
-      sources."core-js-3.8.3"
-      (sources."core-js-compat-3.8.3" // {
+      sources."core-js-3.8.2"
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -74490,7 +74539,7 @@ in
       sources."dag-map-1.0.2"
       sources."dashdash-1.14.1"
       sources."dateformat-3.0.3"
-      sources."dayjs-1.10.3"
+      sources."dayjs-1.10.1"
       sources."debug-4.3.2"
       sources."debuglog-1.0.1"
       sources."decache-4.4.0"
@@ -74566,7 +74615,7 @@ in
       })
       (sources."dot-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."dot-prop-5.3.0"
@@ -74575,7 +74624,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -74590,7 +74639,7 @@ in
         ];
       })
       sources."end-of-stream-1.4.4"
-      (sources."enhanced-resolve-4.5.0" // {
+      (sources."enhanced-resolve-4.3.0" // {
         dependencies = [
           sources."memory-fs-0.5.0"
         ];
@@ -74609,7 +74658,7 @@ in
       })
       sources."error-stack-parser-2.0.6"
       sources."errorhandler-1.5.1"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.17.7"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
@@ -74677,7 +74726,7 @@ in
       })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.10.0"
       sources."faye-websocket-0.10.0"
@@ -74746,7 +74795,7 @@ in
       })
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
       (sources."gauge-2.7.4" // {
         dependencies = [
@@ -74970,7 +75019,11 @@ in
       sources."is-string-1.0.5"
       sources."is-svg-3.0.0"
       sources."is-symbol-1.0.3"
-      sources."is-typed-array-1.1.4"
+      (sources."is-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."is-typedarray-1.0.0"
       sources."is-valid-path-0.1.1"
       sources."is-weakmap-2.0.1"
@@ -74993,7 +75046,7 @@ in
       sources."jimp-0.12.1"
       sources."joi-11.4.0"
       sources."join-component-1.1.0"
-      sources."jpeg-js-0.4.3"
+      sources."jpeg-js-0.4.2"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
@@ -75062,7 +75115,7 @@ in
       sources."loose-envify-1.4.0"
       (sources."lower-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."lowercase-keys-1.0.1"
@@ -75072,7 +75125,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      (sources."make-fetch-happen-8.0.13" // {
+      (sources."make-fetch-happen-8.0.12" // {
         dependencies = [
           sources."minipass-3.1.3"
         ];
@@ -75103,7 +75156,7 @@ in
           sources."bn.js-4.11.9"
         ];
       })
-      sources."mime-2.5.0"
+      sources."mime-2.4.7"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-fn-1.2.0"
@@ -75128,7 +75181,7 @@ in
           sources."minipass-3.1.3"
         ];
       })
-      (sources."minipass-fetch-1.3.3" // {
+      (sources."minipass-fetch-1.3.2" // {
         dependencies = [
           sources."minipass-3.1.3"
         ];
@@ -75185,7 +75238,7 @@ in
       sources."nice-try-1.0.5"
       (sources."no-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."node-fetch-2.6.1"
@@ -75205,7 +75258,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       sources."nopt-5.0.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
@@ -75260,10 +75313,22 @@ in
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      sources."object.entries-1.1.3"
-      sources."object.getownpropertydescriptors-2.1.1"
+      (sources."object.entries-1.1.3" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."object.getownpropertydescriptors-2.1.1" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."object.pick-1.3.0"
-      sources."object.values-1.1.2"
+      (sources."object.values-1.1.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."obuf-1.1.2"
       sources."omggif-1.0.10"
       sources."on-finished-2.3.0"
@@ -75313,7 +75378,7 @@ in
           sources."url-parse-lax-3.0.0"
         ];
       })
-      (sources."pacote-11.2.3" // {
+      (sources."pacote-11.1.13" // {
         dependencies = [
           sources."minipass-3.1.3"
           sources."mkdirp-1.0.4"
@@ -75327,7 +75392,7 @@ in
       sources."parallel-transform-1.2.0"
       (sources."param-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."parse-asn1-5.1.6"
@@ -75599,7 +75664,7 @@ in
           sources."is-wsl-2.2.0"
           sources."loader-utils-2.0.0"
           sources."locate-path-5.0.0"
-          sources."open-7.3.1"
+          sources."open-7.3.0"
           sources."p-limit-2.3.0"
           sources."p-locate-4.1.0"
           sources."path-key-3.1.1"
@@ -75629,12 +75694,12 @@ in
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."regexpu-core-4.7.1"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.6" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -75900,7 +75965,7 @@ in
       })
       sources."symbol-observable-1.2.0"
       sources."tapable-1.1.3"
-      (sources."tar-6.1.0" // {
+      (sources."tar-6.0.5" // {
         dependencies = [
           sources."minipass-3.1.3"
           sources."mkdirp-1.0.4"
@@ -75912,7 +75977,7 @@ in
           sources."array-union-2.1.0"
           sources."crypto-random-string-2.0.0"
           sources."del-6.0.0"
-          sources."globby-11.0.2"
+          sources."globby-11.0.1"
           sources."is-path-inside-3.0.2"
           sources."is-stream-2.0.0"
           sources."p-map-4.0.0"
@@ -76015,7 +76080,7 @@ in
       sources."update-check-1.5.3"
       sources."upper-case-1.1.3"
       sources."upper-case-first-1.1.2"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -76228,7 +76293,11 @@ in
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
       sources."which-module-2.0.0"
-      sources."which-typed-array-1.1.4"
+      (sources."which-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       (sources."wide-align-1.1.3" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -76484,7 +76553,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
@@ -76540,8 +76609,8 @@ in
       })
       (sources."@oclif/config-1.17.0" // {
         dependencies = [
-          sources."globby-11.0.2"
-          sources."tslib-2.1.0"
+          sources."globby-11.0.1"
+          sources."tslib-2.0.3"
         ];
       })
       sources."@oclif/errors-1.3.4"
@@ -76718,7 +76787,7 @@ in
       sources."extract-stack-1.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fastq-1.10.0"
@@ -77038,7 +77107,7 @@ in
           sources."has-values-0.1.4"
         ];
       })
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."url-parse-1.4.7"
       sources."url-parse-lax-3.0.0"
@@ -77057,7 +77126,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "faunadb shell";
-      homepage = "https://github.com/fauna/fauna-shell";
+      homepage = https://github.com/fauna/fauna-shell;
       license = "MPL-2.0";
     };
     production = true;
@@ -77067,37 +77136,38 @@ in
   firebase-tools = nodeEnv.buildNodePackage {
     name = "firebase-tools";
     packageName = "firebase-tools";
-    version = "9.2.1";
+    version = "9.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.2.1.tgz";
-      sha512 = "sD4wfB5hs/8IKXV6AJOmkpvXf/St7gVc9QeW4Qz21PG7CkirgRf6FqcYkPKtBcro4wfj48dihnYx/IO1+XPTGg==";
+      url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.1.0.tgz";
+      sha512 = "hTfxL2meJSl5WuwAS6bEJ5nay7tu3MNYb4ZL2KmPL7yLM3IeT+Qd2z1evHhW1VvbDXKR6RTwlBxzdWPs4l75kA==";
     };
     dependencies = [
-      sources."@apidevtools/json-schema-ref-parser-9.0.7"
+      sources."@apidevtools/json-schema-ref-parser-9.0.6"
       sources."@dabh/diagnostics-2.0.2"
       sources."@google-cloud/paginator-3.0.5"
       sources."@google-cloud/precise-date-2.0.3"
       sources."@google-cloud/projectify-2.0.1"
       sources."@google-cloud/promisify-2.0.3"
-      sources."@google-cloud/pubsub-2.8.0"
-      (sources."@grpc/grpc-js-1.2.4" // {
+      sources."@google-cloud/pubsub-2.7.0"
+      (sources."@grpc/grpc-js-1.1.8" // {
         dependencies = [
-          sources."@types/node-12.19.15"
+          sources."@grpc/proto-loader-0.6.0-pre9"
+          sources."@types/node-12.19.12"
           sources."semver-6.3.0"
         ];
       })
-      sources."@grpc/proto-loader-0.5.6"
+      sources."@grpc/proto-loader-0.5.5"
       sources."@jsdevtools/ono-7.1.3"
-      sources."@opentelemetry/api-0.12.0"
-      sources."@opentelemetry/context-base-0.12.0"
-      (sources."@opentelemetry/core-0.12.0" // {
+      sources."@opentelemetry/api-0.11.0"
+      sources."@opentelemetry/context-base-0.11.0"
+      (sources."@opentelemetry/core-0.11.0" // {
         dependencies = [
           sources."semver-7.3.4"
         ];
       })
-      sources."@opentelemetry/resources-0.12.0"
-      sources."@opentelemetry/semantic-conventions-0.12.0"
-      sources."@opentelemetry/tracing-0.12.0"
+      sources."@opentelemetry/resources-0.11.0"
+      sources."@opentelemetry/semantic-conventions-0.11.0"
+      sources."@opentelemetry/tracing-0.11.0"
       sources."@protobufjs/aspromise-1.1.2"
       sources."@protobufjs/base64-1.1.2"
       sources."@protobufjs/codegen-2.0.4"
@@ -77110,10 +77180,9 @@ in
       sources."@protobufjs/utf8-1.1.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@tootallnate/once-1.1.2"
       sources."@types/duplexify-3.6.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
       sources."abort-controller-3.0.0"
@@ -77130,8 +77199,8 @@ in
         ];
       })
       sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-regex-5.0.0"
+      sources."ansi-styles-4.3.0"
       sources."ansicolors-0.3.2"
       sources."anymatch-3.1.1"
       sources."aproba-1.2.0"
@@ -77156,7 +77225,6 @@ in
       sources."as-array-2.0.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
-      sources."ast-types-0.13.4"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
@@ -77173,7 +77241,7 @@ in
       sources."big-integer-1.6.48"
       sources."bignumber.js-9.0.1"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bl-4.0.3"
       sources."blakejs-1.1.0"
       sources."bluebird-3.4.7"
@@ -77185,10 +77253,7 @@ in
       })
       (sources."boxen-4.2.0" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
         ];
@@ -77212,24 +77277,40 @@ in
       sources."cardinal-2.1.1"
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
-      sources."chalk-2.4.2"
+      (sources."chalk-2.4.2" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+        ];
+      })
       sources."chardet-0.7.0"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."chownr-2.0.0"
       sources."ci-info-2.0.0"
       sources."cjson-0.3.3"
       sources."cli-boxes-2.2.1"
-      sources."cli-color-1.4.0"
+      (sources."cli-color-1.4.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-2.5.0"
       sources."cli-table-0.3.4"
       sources."cli-width-2.2.1"
+      sources."cliui-6.0.0"
       sources."clone-1.0.4"
       sources."clone-response-1.0.2"
       sources."code-point-at-1.1.0"
-      sources."color-3.0.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
+      (sources."color-3.0.0" // {
+        dependencies = [
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+        ];
+      })
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."color-string-1.5.4"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
@@ -77289,15 +77370,14 @@ in
       sources."csv-streamify-3.0.4"
       sources."d-1.0.1"
       sources."dashdash-1.14.1"
-      sources."data-uri-to-buffer-3.0.1"
       sources."debug-4.3.2"
+      sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
       sources."deep-freeze-0.0.1"
       sources."deep-is-0.1.3"
       sources."defaults-1.0.3"
       sources."defer-to-connect-1.1.3"
-      sources."degenerator-2.2.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -77328,10 +77408,7 @@ in
       sources."escape-goat-2.1.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.14.3"
       sources."esprima-4.0.1"
-      sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
       sources."etag-1.8.1"
       sources."event-emitter-0.3.5"
       sources."event-target-shim-5.0.1"
@@ -77360,7 +77437,6 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
       sources."fast-safe-stringify-2.0.7"
       sources."fast-text-encoding-1.0.3"
       (sources."fast-url-parser-1.1.3" // {
@@ -77370,7 +77446,6 @@ in
       })
       sources."fecha-4.2.0"
       sources."figures-2.0.0"
-      sources."file-uri-to-path-2.0.0"
       sources."filesize-3.6.1"
       sources."fill-range-7.0.1"
       (sources."finalhandler-1.1.2" // {
@@ -77379,6 +77454,7 @@ in
           sources."ms-2.0.0"
         ];
       })
+      sources."find-up-4.1.0"
       (sources."flat-arguments-1.0.2" // {
         dependencies = [
           (sources."as-array-1.0.0" // {
@@ -77403,21 +77479,15 @@ in
       })
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       (sources."fstream-1.0.12" // {
         dependencies = [
           sources."rimraf-2.7.1"
         ];
       })
-      (sources."ftp-0.3.10" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
-        ];
-      })
       (sources."gauge-2.7.4" // {
         dependencies = [
+          sources."ansi-regex-2.1.1"
           sources."is-fullwidth-code-point-1.0.0"
           sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
@@ -77425,32 +77495,31 @@ in
       })
       sources."gaxios-4.1.0"
       sources."gcp-metadata-4.2.1"
+      sources."get-caller-file-2.0.5"
       sources."get-stream-4.1.0"
-      (sources."get-uri-3.0.2" // {
-        dependencies = [
-          sources."fs-extra-8.1.0"
-          sources."jsonfile-4.0.0"
-        ];
-      })
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."glob-slash-1.0.0"
       sources."glob-slasher-1.0.1"
       sources."global-dirs-2.1.0"
-      sources."google-auth-library-6.1.4"
-      sources."google-gax-2.10.0"
+      sources."google-auth-library-6.1.3"
+      sources."google-gax-2.9.2"
       sources."google-p12-pem-3.0.3"
       sources."got-9.6.0"
       sources."graceful-fs-4.2.4"
-      (sources."gtoken-5.2.0" // {
+      (sources."gtoken-5.1.0" // {
         dependencies = [
-          sources."mime-2.5.0"
+          sources."mime-2.4.7"
         ];
       })
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
-      sources."has-ansi-2.0.0"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
       sources."has-yarn-2.1.0"
@@ -77461,7 +77530,6 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      sources."http-proxy-agent-4.0.1"
       sources."http-signature-1.2.0"
       sources."https-proxy-agent-5.0.0"
       sources."iconv-lite-0.4.24"
@@ -77488,7 +77556,6 @@ in
         ];
       })
       sources."install-artifact-from-github-1.2.0"
-      sources."ip-1.1.5"
       sources."ip-regex-4.2.0"
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.3.2"
@@ -77547,8 +77614,8 @@ in
         ];
       })
       sources."leven-3.1.0"
-      sources."levn-0.3.0"
       sources."listenercount-1.0.1"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lodash._isnative-2.4.1"
       sources."lodash._objecttypes-2.4.1"
@@ -77585,11 +77652,7 @@ in
       sources."marked-0.7.0"
       sources."marked-terminal-3.3.0"
       sources."media-typer-0.3.0"
-      (sources."memoizee-0.4.15" // {
-        dependencies = [
-          sources."next-tick-1.1.0"
-        ];
-      })
+      sources."memoizee-0.4.14"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
@@ -77618,7 +77681,6 @@ in
         ];
       })
       sources."negotiator-0.6.2"
-      sources."netmask-1.0.6"
       sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
       sources."node-emoji-1.10.0"
@@ -77628,7 +77690,7 @@ in
         dependencies = [
           sources."mkdirp-1.0.4"
           sources."semver-7.3.4"
-          sources."tar-6.1.0"
+          sources."tar-6.0.5"
           sources."which-2.0.2"
         ];
       })
@@ -77646,7 +77708,6 @@ in
       sources."onetime-2.0.1"
       sources."open-6.4.0"
       sources."openapi3-ts-1.4.0"
-      sources."optionator-0.8.3"
       (sources."ora-3.4.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -77656,14 +77717,16 @@ in
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-1.1.0"
       sources."p-defer-3.0.0"
-      sources."pac-proxy-agent-4.1.0"
-      sources."pac-resolver-4.1.0"
+      sources."p-limit-2.3.0"
+      sources."p-locate-4.1.0"
+      sources."p-try-2.2.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
       sources."parseurl-1.3.3"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."path-to-regexp-0.1.7"
@@ -77675,24 +77738,16 @@ in
           sources."debug-3.2.7"
         ];
       })
-      sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
       sources."promise-breaker-5.0.0"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.40"
+          sources."@types/node-13.13.39"
         ];
       })
       sources."proxy-addr-2.0.6"
-      (sources."proxy-agent-4.0.1" // {
-        dependencies = [
-          sources."lru-cache-5.1.1"
-          sources."yallist-3.1.1"
-        ];
-      })
-      sources."proxy-from-env-1.1.0"
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
@@ -77712,6 +77767,8 @@ in
           sources."qs-6.5.2"
         ];
       })
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."retry-request-4.1.3"
@@ -77757,10 +77814,6 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.3"
       sources."simple-swizzle-0.2.2"
-      sources."smart-buffer-4.1.0"
-      sources."socks-2.5.1"
-      sources."socks-proxy-agent-5.0.0"
-      sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."stack-trace-0.0.10"
@@ -77768,19 +77821,17 @@ in
       sources."stream-shift-1.0.1"
       (sources."string-length-1.0.1" // {
         dependencies = [
+          sources."ansi-regex-2.1.1"
           sources."strip-ansi-3.0.1"
         ];
       })
       sources."string-width-4.2.0"
       sources."string_decoder-1.3.0"
-      (sources."strip-ansi-6.0.0" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-        ];
-      })
+      sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
       (sources."superstatic-7.1.0" // {
         dependencies = [
+          sources."ansi-regex-2.1.1"
           sources."ansi-styles-2.2.1"
           sources."chalk-1.1.3"
           sources."fs-extra-8.1.0"
@@ -77831,7 +77882,7 @@ in
       sources."toxic-1.0.1"
       sources."traverse-0.3.9"
       sources."triple-beam-1.3.0"
-      sources."tslib-2.1.0"
+      sources."tslib-2.0.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       (sources."tweetsodium-0.0.5" // {
@@ -77840,7 +77891,6 @@ in
         ];
       })
       sources."type-1.2.0"
-      sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."type-is-1.6.18"
       sources."typedarray-to-buffer-3.1.5"
@@ -77857,15 +77907,12 @@ in
       })
       (sources."update-notifier-4.1.3" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
         ];
       })
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-join-0.0.1"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
@@ -77876,6 +77923,7 @@ in
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
       sources."which-1.3.1"
+      sources."which-module-2.0.0"
       (sources."wide-align-1.1.3" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -77897,22 +77945,24 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."word-wrap-1.2.3"
+      sources."wrap-ansi-6.2.0"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
       sources."ws-7.4.2"
       sources."xdg-basedir-4.0.0"
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.31"
-      sources."xregexp-2.0.0"
       sources."xtend-4.0.2"
+      sources."y18n-4.0.1"
       sources."yallist-4.0.0"
+      sources."yargs-15.4.1"
+      sources."yargs-parser-18.1.3"
       sources."zip-stream-2.1.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command-Line Interface for Firebase";
-      homepage = "https://github.com/firebase/firebase-tools";
+      homepage = https://github.com/firebase/firebase-tools;
       license = "MIT";
     };
     production = true;
@@ -78049,7 +78099,7 @@ in
       sources."lodash-4.17.20"
       sources."lru-cache-6.0.0"
       sources."map-obj-4.1.0"
-      (sources."meow-8.1.2" // {
+      (sources."meow-8.1.0" // {
         dependencies = [
           sources."type-fest-0.18.1"
         ];
@@ -78073,7 +78123,7 @@ in
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."path-exists-4.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
@@ -78164,7 +78214,7 @@ in
       sources."concat-map-0.0.1"
       sources."fd-slicer-1.1.0"
       sources."fs.realpath-1.0.0"
-      sources."geoip-country-4.0.52"
+      sources."geoip-country-4.0.49"
       sources."glob-7.1.6"
       sources."iconv-lite-0.5.2"
       sources."inflight-1.0.6"
@@ -78246,7 +78296,7 @@ in
         ];
       })
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."caller-0.0.1"
       sources."camelcase-2.1.1"
       sources."chokidar-2.1.8"
@@ -78291,6 +78341,8 @@ in
       sources."defined-0.0.0"
       sources."director-1.2.7"
       sources."duplexer-0.1.2"
+      sources."es-abstract-1.17.7"
+      sources."es-to-primitive-1.2.1"
       sources."event-stream-3.3.4"
       sources."eventemitter2-6.4.3"
       (sources."expand-brackets-2.1.4" // {
@@ -78362,6 +78414,7 @@ in
       sources."is-arguments-1.1.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.2.2"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -78376,6 +78429,7 @@ in
       })
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.1"
+      sources."is-symbol-1.0.3"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isobject-3.0.1"
@@ -78423,9 +78477,11 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
+      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."optimist-0.6.0"
@@ -78449,7 +78505,7 @@ in
       sources."readable-stream-2.3.7"
       sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -78522,6 +78578,8 @@ in
       })
       sources."stream-combiner-0.0.4"
       sources."string-width-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-0.1.3"
@@ -78611,7 +78669,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command-line JSON viewer";
-      homepage = "https://fx.wtf";
+      homepage = https://fx.wtf/;
       license = "MIT";
     };
     production = true;
@@ -78855,7 +78913,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "git hosting on secure-scuttlebutt (ssb)";
-      homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256";
+      homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256;
       license = "Fair";
     };
     production = true;
@@ -78978,7 +79036,7 @@ in
       sources."figures-3.2.0"
       sources."find-up-3.0.0"
       sources."function-bind-1.1.1"
-      sources."fuse.js-6.4.6"
+      sources."fuse.js-6.4.5"
       sources."get-stream-6.0.0"
       sources."global-dirs-2.1.0"
       (sources."got-9.6.0" // {
@@ -79041,7 +79099,7 @@ in
         ];
       })
       sources."map-obj-4.1.0"
-      (sources."meow-8.1.2" // {
+      (sources."meow-8.1.0" // {
         dependencies = [
           sources."type-fest-0.18.1"
         ];
@@ -79063,7 +79121,7 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      sources."ora-5.3.0"
+      sources."ora-5.2.0"
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-1.1.0"
       sources."p-limit-2.3.0"
@@ -79074,7 +79132,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."path-exists-4.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
@@ -79142,7 +79200,7 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."unique-string-2.0.0"
       sources."update-notifier-5.0.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-license-3.0.4"
@@ -79192,59 +79250,39 @@ in
       sources."@graphql-cli/init-4.1.0"
       (sources."@graphql-tools/batch-execute-7.0.0" // {
         dependencies = [
-          (sources."@graphql-tools/utils-7.2.4" // {
-            dependencies = [
-              sources."tslib-2.1.0"
-            ];
-          })
+          sources."@graphql-tools/utils-7.2.3"
         ];
       })
-      (sources."@graphql-tools/delegate-7.0.9" // {
+      (sources."@graphql-tools/delegate-7.0.8" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.4"
-          sources."tslib-2.1.0"
+          sources."@graphql-tools/utils-7.2.3"
         ];
       })
-      (sources."@graphql-tools/graphql-file-loader-6.2.7" // {
+      (sources."@graphql-tools/graphql-file-loader-6.2.6" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.4"
-          sources."tslib-2.1.0"
-        ];
-      })
-      (sources."@graphql-tools/import-6.2.6" // {
-        dependencies = [
-          sources."tslib-2.1.0"
+          sources."@graphql-tools/utils-7.2.3"
         ];
       })
+      sources."@graphql-tools/import-6.2.5"
       (sources."@graphql-tools/json-file-loader-6.2.6" // {
         dependencies = [
-          (sources."@graphql-tools/utils-7.2.4" // {
-            dependencies = [
-              sources."tslib-2.1.0"
-            ];
-          })
+          sources."@graphql-tools/utils-7.2.3"
         ];
       })
       sources."@graphql-tools/load-6.2.4"
-      (sources."@graphql-tools/merge-6.2.7" // {
+      (sources."@graphql-tools/merge-6.2.6" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.4"
-          sources."tslib-2.1.0"
+          sources."@graphql-tools/utils-7.2.3"
         ];
       })
       (sources."@graphql-tools/schema-7.1.2" // {
         dependencies = [
-          (sources."@graphql-tools/utils-7.2.4" // {
-            dependencies = [
-              sources."tslib-2.1.0"
-            ];
-          })
+          sources."@graphql-tools/utils-7.2.3"
         ];
       })
-      (sources."@graphql-tools/url-loader-6.8.0" // {
+      (sources."@graphql-tools/url-loader-6.7.1" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.2.4"
-          sources."tslib-2.1.0"
+          sources."@graphql-tools/utils-7.2.3"
         ];
       })
       (sources."@graphql-tools/utils-6.2.4" // {
@@ -79258,11 +79296,7 @@ in
       })
       (sources."@graphql-tools/wrap-7.0.5" // {
         dependencies = [
-          (sources."@graphql-tools/utils-7.2.4" // {
-            dependencies = [
-              sources."tslib-2.1.0"
-            ];
-          })
+          sources."@graphql-tools/utils-7.2.3"
         ];
       })
       sources."@kwsites/file-exists-1.1.1"
@@ -79272,7 +79306,7 @@ in
       sources."@nodelib/fs.walk-1.2.6"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -79307,12 +79341,12 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."callsites-3.1.0"
       (sources."camel-case-4.1.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."caseless-0.12.0"
@@ -79368,7 +79402,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.17.7"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-3.3.1"
@@ -79386,7 +79420,7 @@ in
       sources."extract-files-9.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fastq-1.10.0"
@@ -79426,7 +79460,7 @@ in
       sources."graphql-subscriptions-1.1.0"
       sources."graphql-type-json-0.3.2"
       sources."graphql-upload-11.0.0"
-      sources."graphql-ws-4.1.0"
+      sources."graphql-ws-3.1.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -79480,7 +79514,11 @@ in
       sources."is-stream-1.1.0"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      sources."is-typed-array-1.1.4"
+      (sources."is-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."is-typedarray-1.0.0"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
@@ -79525,7 +79563,7 @@ in
       })
       (sources."lower-case-2.0.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."lowercase-keys-1.0.1"
@@ -79551,7 +79589,7 @@ in
       sources."nice-try-1.0.5"
       (sources."no-case-3.0.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."node-emoji-1.10.0"
@@ -79608,10 +79646,10 @@ in
       })
       sources."parent-module-1.0.1"
       sources."parse-github-url-1.0.2"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       (sources."pascal-case-3.1.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."passwd-user-3.0.0"
@@ -79629,7 +79667,7 @@ in
       sources."querystringify-2.2.0"
       sources."rc-1.2.8"
       sources."reftools-1.1.7"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."remove-trailing-separator-1.1.0"
@@ -79701,7 +79739,7 @@ in
       sources."type-fest-0.3.1"
       sources."universalify-1.0.0"
       sources."unixify-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-parse-1.4.7"
       sources."url-parse-lax-3.0.0"
       sources."uuid-3.4.0"
@@ -79711,7 +79749,11 @@ in
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      sources."which-typed-array-1.1.4"
+      (sources."which-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       (sources."wrap-ansi-7.0.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
@@ -79719,7 +79761,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-7.4.2"
+      sources."ws-7.4.1"
       sources."y18n-5.0.5"
       sources."yallist-4.0.0"
       sources."yaml-1.10.0"
@@ -80016,7 +80058,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The Makam metalanguage -- a tool for rapid language prototyping";
-      homepage = "http://astampoulis.github.io/makam/";
+      homepage = http://astampoulis.github.io/makam/;
       license = "GPL-3.0";
     };
     production = true;
@@ -80083,7 +80125,7 @@ in
       sources."ansi-term-0.0.2"
       sources."ansicolors-0.3.2"
       sources."blessed-0.1.81"
-      sources."blessed-contrib-4.8.21"
+      sources."blessed-contrib-4.8.20"
       sources."bresenham-0.0.3"
       sources."buffers-0.1.1"
       sources."cardinal-2.1.1"
@@ -80155,7 +80197,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-4.34.7"
+      sources."systeminformation-4.34.2"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
@@ -80239,7 +80281,7 @@ in
       sources."buffer-equal-1.0.0"
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-3.0.0"
       sources."chokidar-2.1.8"
       (sources."class-utils-0.3.6" // {
@@ -80635,7 +80677,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The streaming build system.";
-      homepage = "https://gulpjs.com";
+      homepage = https://gulpjs.com/;
       license = "MIT";
     };
     production = true;
@@ -80677,7 +80719,7 @@ in
       })
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-3.0.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -80989,7 +81031,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command line interface for gulp";
-      homepage = "https://gulpjs.com";
+      homepage = https://gulpjs.com/;
       license = "MIT";
     };
     production = true;
@@ -81007,7 +81049,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A robust HTML entities encoder/decoder with full Unicode support.";
-      homepage = "https://mths.be/he";
+      homepage = https://mths.be/he;
       license = "MIT";
     };
     production = true;
@@ -81032,13 +81074,13 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.6.1"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       sources."upper-case-1.1.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Highly configurable, well-tested, JavaScript-based HTML minifier.";
-      homepage = "https://kangax.github.io/html-minifier/";
+      homepage = https://kangax.github.io/html-minifier/;
       license = "MIT";
     };
     production = true;
@@ -81123,7 +81165,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."wrappy-1.0.2"
@@ -81132,7 +81174,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The Static Code Analysis Tool for your HTML";
-      homepage = "https://htmlhint.com";
+      homepage = https://htmlhint.com/;
       license = "MIT";
     };
     production = true;
@@ -81165,7 +81207,7 @@ in
       sources."ms-2.1.3"
       sources."opener-1.5.2"
       sources."portfinder-1.0.28"
-      sources."qs-6.9.6"
+      sources."qs-6.9.4"
       sources."requires-port-1.0.0"
       sources."secure-compare-3.0.1"
       sources."union-0.5.0"
@@ -81228,7 +81270,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Cryptocurrency bike-shed";
-      homepage = "https://github.com/handshake-org/hsd";
+      homepage = https://github.com/handshake-org/hsd;
       license = "MIT";
     };
     production = true;
@@ -81255,7 +81297,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Handshake airdrop redemption";
-      homepage = "https://github.com/handshake-org/hs-airdrop";
+      homepage = https://github.com/handshake-org/hs-airdrop;
       license = "MIT";
     };
     production = true;
@@ -81280,7 +81322,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "HSD node and wallet client";
-      homepage = "https://github.com/handshake-org/hs-client";
+      homepage = https://github.com/handshake-org/hs-client;
       license = "MIT";
     };
     production = true;
@@ -81427,7 +81469,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "IJavascript is a Javascript kernel for the Jupyter notebook";
-      homepage = "https://n-riesco.github.io/ijavascript";
+      homepage = https://n-riesco.github.io/ijavascript;
       license = "BSD-3-Clause";
     };
     production = true;
@@ -81628,7 +81670,7 @@ in
       sources."uglify-js-2.8.29"
       sources."uglify-to-browserify-1.0.2"
       sources."update-notifier-0.5.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -81643,7 +81685,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites";
-      homepage = "http://github.com/remy/inliner";
+      homepage = http://github.com/remy/inliner;
       license = "MIT";
     };
     production = true;
@@ -81662,7 +81704,7 @@ in
       sources."async-0.2.10"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."bunyan-1.8.15"
+      sources."bunyan-1.8.14"
       sources."colors-0.6.2"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
@@ -81778,7 +81820,7 @@ in
       sources."is-wsl-2.2.0"
       sources."isexe-2.0.0"
       sources."jquery-3.5.1"
-      sources."jquery.terminal-2.20.2"
+      sources."jquery.terminal-2.20.1"
       sources."jsonfile-2.4.0"
       sources."keyboardevent-key-polyfill-1.1.0"
       sources."line-reader-0.4.0"
@@ -81808,7 +81850,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "High precision scientific calculator with support for physical units";
-      homepage = "https://github.com/sharkdp/insect";
+      homepage = https://github.com/sharkdp/insect;
       license = "MIT";
     };
     production = true;
@@ -81842,7 +81884,7 @@ in
       sources."ansi-styles-3.2.1"
       (sources."ast-types-0.13.4" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."astral-regex-2.0.0"
@@ -81980,7 +82022,7 @@ in
       sources."lru-cache-5.1.1"
       sources."macos-release-2.4.1"
       sources."methods-1.1.2"
-      sources."mime-2.5.0"
+      sources."mime-2.4.7"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-fn-1.2.0"
@@ -82000,7 +82042,7 @@ in
       })
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."optionator-0.8.3"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
@@ -82011,10 +82053,10 @@ in
       sources."path-key-3.1.1"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-agent-4.0.1"
+      sources."proxy-agent-4.0.0"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."qs-6.9.6"
+      sources."qs-6.9.4"
       sources."raw-body-2.4.1"
       sources."readable-stream-3.6.0"
       sources."restore-cursor-2.0.0"
@@ -82106,7 +82148,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A tool for creating and developing Ionic Framework mobile apps.";
-      homepage = "https://ionicframework.com";
+      homepage = https://ionicframework.com/;
       license = "MIT";
     };
     production = true;
@@ -82119,7 +82161,7 @@ in
     version = "3.7.1";
     src = fetchurl {
       name = "iosevka-3.7.1.tar.gz";
-      url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1";
+      url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1;
       sha256 = "ed7aee70af326ef22458f8f7603c599fd2f5164ae8062fbd6fb7d56864d98aca";
     };
     dependencies = [
@@ -82274,7 +82316,7 @@ in
       sources."find-up-1.1.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."fs-extra-9.1.0"
+      sources."fs-extra-9.0.1"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
@@ -82308,7 +82350,11 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-6.1.0"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."jsprim-1.4.1"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
@@ -82450,7 +82496,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."traverse-0.3.9"
       sources."ts-process-promises-1.0.2"
-      sources."tslib-2.1.0"
+      sources."tslib-2.0.3"
       sources."ttf2woff-2.0.2"
       sources."ttf2woff2-3.0.0"
       sources."tunnel-agent-0.6.0"
@@ -82458,8 +82504,8 @@ in
       sources."type-check-0.3.2"
       sources."typo-geom-0.11.0"
       sources."unicoderegexp-0.4.1"
-      sources."universalify-2.0.0"
-      sources."uri-js-4.4.1"
+      sources."universalify-1.0.0"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -82623,7 +82669,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Implementation of the Language Server Protocol for JavaScript and TypeScript";
-      homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
+      homepage = https://github.com/sourcegraph/javascript-typescript-langserver;
       license = "Apache-2.0";
     };
     production = true;
@@ -82633,26 +82679,26 @@ in
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "1.6.4";
+    version = "1.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-1.6.4.tgz";
-      sha512 = "jfiqk9aqN3mAZ+TIGqubTKGTBB5Q8KRmeXS2qr/2N80KFJHCqdCFhsyI/E2hfdd3CA4Gu5Ls9WTxXA3MW/XjwA==";
+      url = "https://registry.npmjs.org/joplin/-/joplin-1.5.1.tgz";
+      sha512 = "V90a+QTDf5SSW8Il0BcWtdqdtDZYd/YFltqRzXGBRwO2nFggeUAuXcQxs5ZxEhQF3Jzvx3yGfrYioZR7B30D2A==";
     };
     dependencies = [
       sources."@braintree/sanitize-url-3.1.0"
       sources."@cronvel/get-pixels-3.4.0"
-      sources."@joplin/fork-htmlparser2-4.1.20"
-      sources."@joplin/fork-sax-1.2.24"
-      sources."@joplin/lib-1.0.18"
-      (sources."@joplin/renderer-1.0.26" // {
+      sources."@joplin/fork-htmlparser2-4.1.14"
+      sources."@joplin/fork-sax-1.2.18"
+      sources."@joplin/lib-1.0.15"
+      (sources."@joplin/renderer-1.0.23" // {
         dependencies = [
           sources."fs-extra-8.1.0"
           sources."jsonfile-4.0.0"
           sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support"
         ];
       })
-      sources."@joplin/turndown-4.0.42"
-      sources."@joplin/turndown-plugin-gfm-1.0.24"
+      sources."@joplin/turndown-4.0.36"
+      sources."@joplin/turndown-plugin-gfm-1.0.18"
       sources."abab-2.0.5"
       sources."abbrev-1.1.1"
       sources."acorn-7.4.1"
@@ -82692,7 +82738,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.830.0" // {
+      (sources."aws-sdk-2.821.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -82707,7 +82753,7 @@ in
       sources."base64-js-1.5.1"
       sources."base64-stream-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       (sources."bl-4.0.3" // {
         dependencies = [
           sources."buffer-5.7.1"
@@ -82726,7 +82772,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."charenc-0.0.2"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."chownr-1.1.4"
       sources."chroma-js-2.1.0"
       sources."clean-css-4.2.3"
@@ -82868,7 +82914,7 @@ in
       })
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."fstream-1.0.12"
       (sources."gauge-2.7.4" // {
         dependencies = [
@@ -82977,7 +83023,7 @@ in
       sources."isobject-2.1.0"
       sources."isstream-0.1.2"
       sources."jmespath-0.15.0"
-      sources."jpeg-js-0.4.3"
+      sources."jpeg-js-0.4.2"
       sources."js-tokens-4.0.0"
       sources."jsbn-0.1.1"
       sources."jsdom-15.2.1"
@@ -82991,8 +83037,12 @@ in
           sources."commander-2.20.3"
         ];
       })
-      sources."keytar-7.3.0"
-      sources."khroma-1.2.0"
+      (sources."keytar-7.3.0" // {
+        dependencies = [
+          sources."node-addon-api-3.1.0"
+        ];
+      })
+      sources."khroma-1.1.1"
       sources."klaw-1.3.1"
       sources."lazyness-1.2.0"
       sources."levenshtein-1.0.5"
@@ -83040,7 +83090,7 @@ in
       sources."md5-2.3.0"
       sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
-      sources."mermaid-8.9.0"
+      sources."mermaid-8.8.4"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."mimic-response-2.1.0"
@@ -83050,7 +83100,7 @@ in
           sources."debug-4.3.2"
           sources."html-minifier-4.0.0"
           sources."ms-2.1.2"
-          sources."uglify-js-3.12.5"
+          sources."uglify-js-3.12.4"
         ];
       })
       sources."minimatch-3.0.4"
@@ -83072,7 +83122,7 @@ in
       sources."napi-build-utils-1.0.2"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
-      sources."needle-2.6.0"
+      sources."needle-2.5.2"
       sources."nextgen-events-1.3.4"
       sources."no-case-2.3.2"
       (sources."node-abi-2.19.3" // {
@@ -83080,7 +83130,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."node-addon-api-3.1.0"
+      sources."node-addon-api-2.0.0"
       sources."node-bitmap-0.0.1"
       sources."node-emoji-1.10.0"
       sources."node-fetch-1.7.3"
@@ -83122,7 +83172,7 @@ in
       })
       sources."omggif-1.0.10"
       sources."once-1.4.0"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."optionator-0.8.3"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -83201,6 +83251,7 @@ in
           sources."color-3.1.3"
           sources."decompress-response-6.0.0"
           sources."mimic-response-3.1.0"
+          sources."node-addon-api-3.1.0"
           sources."simple-get-4.0.0"
         ];
       })
@@ -83222,12 +83273,12 @@ in
       sources."source-map-url-0.4.0"
       sources."split-skip-0.0.2"
       sources."sprintf-js-1.1.2"
-      sources."sqlite3-5.0.1"
+      sources."sqlite3-5.0.0"
       sources."sshpk-1.16.1"
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."strict-uri-encode-1.1.0"
-      sources."string-kit-0.11.10"
+      sources."string-kit-0.11.8"
       sources."string-padding-1.0.2"
       sources."string-to-stream-1.1.1"
       (sources."string-width-1.0.2" // {
@@ -83273,7 +83324,7 @@ in
           sources."q-0.9.7"
         ];
       })
-      sources."terminal-kit-1.45.5"
+      sources."terminal-kit-1.44.3"
       (sources."terser-4.8.0" // {
         dependencies = [
           sources."commander-2.20.3"
@@ -83315,7 +83366,7 @@ in
       sources."unorm-1.6.0"
       sources."unpack-string-0.0.2"
       sources."upper-case-1.1.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       (sources."url-0.10.3" // {
         dependencies = [
@@ -83367,10 +83418,10 @@ in
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
-    version = "1.13.4";
+    version = "1.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.4.tgz";
-      sha512 = "M5yEWwonlEO3kPcCZ3K3KBSpFRZAEO3FAWC6wtbIGeyg7dusStxvF0WG+HRLBoMZqREXSRSxkkqClDE865x1sg==";
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz";
+      sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -83401,7 +83452,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "beautifier.io for node";
-      homepage = "https://beautifier.io/";
+      homepage = https://beautifier.io/;
       license = "MIT";
     };
     production = true;
@@ -83518,7 +83569,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Static analysis tool for JavaScript";
-      homepage = "http://jshint.com/";
+      homepage = http://jshint.com/;
       license = "MIT";
     };
     production = true;
@@ -83561,7 +83612,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "JSON diff";
-      homepage = "https://github.com/andreyvit/json-diff";
+      homepage = https://github.com/andreyvit/json-diff;
     };
     production = true;
     bypassCache = true;
@@ -83603,20 +83654,20 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.9.6"
+      sources."qs-6.9.4"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
       sources."slash-3.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
       sources."superagent-3.8.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03).";
-      homepage = "https://github.com/whitlockjc/json-refs";
+      homepage = https://github.com/whitlockjc/json-refs;
       license = "MIT";
     };
     production = true;
@@ -83860,7 +83911,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Get a full fake REST API with zero coding in less than 30 seconds";
-      homepage = "https://github.com/typicode/json-server";
+      homepage = https://github.com/typicode/json-server;
       license = "MIT";
     };
     production = true;
@@ -83887,7 +83938,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Validate JSON";
-      homepage = "http://zaach.github.com/jsonlint/";
+      homepage = http://zaach.github.com/jsonlint/;
     };
     production = true;
     bypassCache = true;
@@ -83896,74 +83947,85 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "6.0.1";
+    version = "5.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-6.0.1.tgz";
-      sha512 = "LHE8Ywfeji6Sk3jt072j7gUAYZrpw7tCzvQWpgJqwCC9inW4eA3g1yl6srTtC0xiOvZDqXIzx8tgBPm0qhfYkg==";
+      url = "https://registry.npmjs.org/karma/-/karma-5.2.3.tgz";
+      sha512 = "tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==";
     };
     dependencies = [
-      sources."@types/component-emitter-1.2.10"
-      sources."@types/cookie-0.4.0"
-      sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.22"
       sources."accepts-1.3.7"
+      sources."after-0.8.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
+      sources."arraybuffer.slice-0.0.7"
+      sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
+      sources."blob-0.0.5"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."bytes-3.1.0"
-      sources."chokidar-3.5.1"
-      sources."cliui-7.0.4"
+      sources."camelcase-5.3.1"
+      sources."chokidar-3.4.3"
+      sources."cliui-6.0.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
+      sources."component-bind-1.0.0"
       sources."component-emitter-1.3.0"
+      sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
       sources."connect-3.7.0"
       sources."content-type-1.0.4"
       sources."cookie-0.4.1"
-      sources."cors-2.8.5"
       sources."custom-event-1.0.1"
       sources."date-format-3.0.0"
       sources."debug-2.6.9"
+      sources."decamelize-1.2.0"
       sources."depd-1.1.2"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
       sources."ee-first-1.1.1"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-4.1.0" // {
+      (sources."engine.io-3.5.0" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."ms-2.1.2"
+          sources."debug-4.1.1"
+          sources."ms-2.1.3"
         ];
       })
-      sources."engine.io-parser-4.0.2"
+      (sources."engine.io-client-3.5.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."engine.io-parser-2.2.1"
       sources."ent-2.2.0"
-      sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
       sources."eventemitter3-4.0.7"
       sources."extend-3.0.2"
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
+      sources."find-up-4.1.0"
       sources."flatted-2.0.2"
       sources."follow-redirects-1.13.1"
       sources."fs-extra-8.1.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."get-caller-file-2.0.5"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."graceful-fs-4.2.4"
+      sources."has-binary2-1.0.3"
+      sources."has-cors-1.1.0"
       sources."http-errors-1.7.2"
       sources."http-proxy-1.18.1"
       sources."iconv-lite-0.4.24"
+      sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."is-binary-path-2.1.0"
@@ -83971,8 +84033,10 @@ in
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
+      sources."isarray-2.0.1"
       sources."isbinaryfile-4.0.6"
       sources."jsonfile-4.0.0"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       (sources."log4js-6.3.0" // {
         dependencies = [
@@ -83981,17 +84045,22 @@ in
         ];
       })
       sources."media-typer-0.3.0"
-      sources."mime-2.5.0"
+      sources."mime-2.4.7"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
       sources."normalize-path-3.0.0"
-      sources."object-assign-4.1.1"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
+      sources."p-limit-2.3.0"
+      sources."p-locate-4.1.0"
+      sources."p-try-2.2.0"
+      sources."parseqs-0.0.6"
+      sources."parseuri-0.0.6"
       sources."parseurl-1.3.3"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."picomatch-2.2.2"
       sources."qjobs-1.2.0"
@@ -84000,22 +84069,31 @@ in
       sources."raw-body-2.4.0"
       sources."readdirp-3.5.0"
       sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
-      sources."rfdc-1.2.0"
+      sources."rfdc-1.1.4"
       sources."rimraf-3.0.2"
       sources."safer-buffer-2.1.2"
+      sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.1"
-      (sources."socket.io-3.1.0" // {
+      (sources."socket.io-2.4.0" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."ms-2.1.2"
+          sources."debug-4.1.1"
+          sources."ms-2.1.3"
         ];
       })
-      sources."socket.io-adapter-2.1.0"
-      (sources."socket.io-parser-4.0.4" // {
+      sources."socket.io-adapter-1.1.2"
+      (sources."socket.io-client-2.4.0" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."ms-2.1.2"
+          sources."debug-3.1.0"
+          sources."socket.io-parser-3.3.1"
+        ];
+      })
+      (sources."socket.io-parser-3.4.1" // {
+        dependencies = [
+          sources."component-emitter-1.2.1"
+          sources."debug-4.1.1"
+          sources."ms-2.1.3"
         ];
       })
       sources."source-map-0.6.1"
@@ -84030,26 +84108,29 @@ in
       sources."string-width-4.2.0"
       sources."strip-ansi-6.0.0"
       sources."tmp-0.2.1"
+      sources."to-array-0.1.4"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
       sources."type-is-1.6.18"
-      sources."ua-parser-js-0.7.23"
+      sources."ua-parser-js-0.7.22"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
       sources."utils-merge-1.0.1"
-      sources."vary-1.1.2"
       sources."void-elements-2.0.1"
-      sources."wrap-ansi-7.0.0"
+      sources."which-module-2.0.0"
+      sources."wrap-ansi-6.2.0"
       sources."wrappy-1.0.2"
       sources."ws-7.4.2"
-      sources."y18n-5.0.5"
-      sources."yargs-16.2.0"
-      sources."yargs-parser-20.2.4"
+      sources."xmlhttprequest-ssl-1.5.5"
+      sources."y18n-4.0.1"
+      sources."yargs-15.4.1"
+      sources."yargs-parser-18.1.3"
+      sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Spectacular Test Runner for JavaScript.";
-      homepage = "http://karma-runner.github.io/";
+      homepage = http://karma-runner.github.io/;
       license = "MIT";
     };
     production = true;
@@ -84069,7 +84150,7 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."buffer-equal-1.0.0"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
       sources."clone-stats-1.0.0"
@@ -84146,7 +84227,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Merges multiple lcov results into one";
-      homepage = "https://github.com/mweibel/lcov-result-merger";
+      homepage = https://github.com/mweibel/lcov-result-merger;
       license = "MIT";
     };
     production = true;
@@ -84355,7 +84436,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."underscore-1.9.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       (sources."utile-0.3.0" // {
         dependencies = [
           sources."async-0.9.2"
@@ -84523,7 +84604,7 @@ in
           sources."universal-user-agent-6.0.0"
         ];
       })
-      sources."@octokit/openapi-types-3.1.1"
+      sources."@octokit/openapi-types-2.0.1"
       sources."@octokit/plugin-enterprise-rest-6.0.1"
       (sources."@octokit/plugin-paginate-rest-1.1.2" // {
         dependencies = [
@@ -84549,11 +84630,11 @@ in
         ];
       })
       sources."@octokit/rest-16.43.2"
-      sources."@octokit/types-6.4.2"
+      sources."@octokit/types-6.1.2"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -84609,7 +84690,7 @@ in
       sources."byte-size-5.0.1"
       sources."cacache-12.0.4"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
@@ -84750,7 +84831,7 @@ in
       sources."envinfo-7.7.3"
       sources."err-code-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
@@ -85031,7 +85112,7 @@ in
       sources."map-cache-0.2.2"
       sources."map-obj-4.1.0"
       sources."map-visit-1.0.0"
-      (sources."meow-8.1.2" // {
+      (sources."meow-8.1.0" // {
         dependencies = [
           sources."find-up-4.1.0"
           sources."hosted-git-info-3.0.7"
@@ -85039,7 +85120,7 @@ in
           sources."lru-cache-6.0.0"
           sources."normalize-package-data-3.0.0"
           sources."p-locate-4.1.0"
-          sources."parse-json-5.2.0"
+          sources."parse-json-5.1.0"
           sources."path-exists-4.0.0"
           (sources."read-pkg-5.2.0" // {
             dependencies = [
@@ -85160,11 +85241,7 @@ in
       sources."parallel-transform-1.2.0"
       sources."parse-github-repo-url-1.4.1"
       sources."parse-json-4.0.0"
-      (sources."parse-path-4.0.3" // {
-        dependencies = [
-          sources."qs-6.9.6"
-        ];
-      })
+      sources."parse-path-4.0.2"
       sources."parse-url-5.0.2"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
@@ -85196,7 +85273,6 @@ in
       sources."punycode-2.1.1"
       sources."q-1.5.1"
       sources."qs-6.5.2"
-      sources."query-string-6.13.8"
       sources."quick-lru-4.0.1"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.5"
@@ -85307,7 +85383,6 @@ in
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.7"
       sources."split-1.0.1"
-      sources."split-on-first-1.1.0"
       sources."split-string-3.1.0"
       sources."split2-2.2.0"
       sources."sprintf-js-1.0.3"
@@ -85332,7 +85407,6 @@ in
       })
       sources."stream-each-1.2.3"
       sources."stream-shift-1.0.1"
-      sources."strict-uri-encode-2.0.0"
       (sources."string-width-2.1.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -85377,7 +85451,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."union-value-1.0.1"
@@ -85396,7 +85470,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
@@ -85459,28 +85533,23 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "4.1.0";
+    version = "4.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-4.1.0.tgz";
-      sha512 = "w1Ag/f34g7LwtQ/sMVSGWIyZx+gG9ZOAEtyxeX1fG75is6BMyC2lD5kG+1RueX7PkAvlQBm2Lf2aN2j0JbVr2A==";
+      url = "https://registry.npmjs.org/less/-/less-4.0.0.tgz";
+      sha512 = "av1eEa2D0xZfF7fjLJS/Dld7zAYSLU7EOEJvuOELeaNI3i6L/81AdjbK5/pytaRkBwi7ZEa0433IDvMLskKCOw==";
     };
     dependencies = [
       sources."copy-anything-2.0.1"
-      sources."debug-3.2.7"
       sources."errno-0.1.8"
       sources."graceful-fs-4.2.4"
-      sources."iconv-lite-0.4.24"
       sources."image-size-0.5.5"
       sources."is-what-3.12.0"
       sources."make-dir-2.1.0"
       sources."mime-1.6.0"
-      sources."ms-2.1.3"
-      sources."needle-2.6.0"
+      sources."native-request-1.0.8"
       sources."parse-node-version-1.0.1"
       sources."pify-4.0.1"
       sources."prr-1.0.1"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
       sources."semver-5.7.1"
       sources."source-map-0.6.1"
       sources."tslib-1.14.1"
@@ -85488,7 +85557,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Leaner CSS";
-      homepage = "http://lesscss.org";
+      homepage = http://lesscss.org/;
       license = "Apache-2.0";
     };
     production = true;
@@ -85513,7 +85582,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "clean-css plugin for less.js";
-      homepage = "http://lesscss.org";
+      homepage = http://lesscss.org/;
     };
     production = true;
     bypassCache = true;
@@ -86251,7 +86320,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."socket.io-2.4.1" // {
+      (sources."socket.io-2.4.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
@@ -86262,7 +86331,7 @@ in
         dependencies = [
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
-          sources."socket.io-parser-3.3.2"
+          sources."socket.io-parser-3.3.1"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
@@ -86325,7 +86394,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
@@ -86340,7 +86409,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Live Markdown previews for your favourite editor.";
-      homepage = "https://github.com/shime/livedown";
+      homepage = https://github.com/shime/livedown;
       license = "MIT";
     };
     production = true;
@@ -86469,13 +86538,13 @@ in
       sources."@types/babel__generator-7.6.2"
       sources."@types/babel__template-7.4.0"
       sources."@types/babel__traverse-7.11.0"
-      sources."@types/estree-0.0.46"
+      sources."@types/estree-0.0.45"
       sources."@types/graceful-fs-4.1.4"
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
-      sources."@types/json-schema-7.0.7"
-      sources."@types/node-14.14.22"
+      sources."@types/json-schema-7.0.6"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.12"
@@ -86594,7 +86663,7 @@ in
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
       (sources."bl-4.0.3" // {
         dependencies = [
@@ -86629,7 +86698,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.16.0"
       sources."bser-2.1.1"
       sources."buffer-5.2.1"
       sources."buffer-from-1.1.1"
@@ -86643,9 +86712,9 @@ in
       })
       sources."cache-base-1.0.1"
       sources."cached-path-relative-1.0.2"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -86657,10 +86726,11 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."chokidar-3.5.1" // {
+      (sources."chokidar-3.4.3" // {
         dependencies = [
           sources."braces-3.0.2"
           sources."fill-range-7.0.1"
+          sources."fsevents-2.1.3"
           sources."is-number-7.0.0"
           sources."to-regex-range-5.0.1"
         ];
@@ -86717,7 +86787,7 @@ in
       })
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.12"
-      (sources."core-js-compat-3.8.3" // {
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -86768,7 +86838,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -86777,7 +86847,7 @@ in
       sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
-      (sources."enhanced-resolve-4.5.0" // {
+      (sources."enhanced-resolve-4.3.0" // {
         dependencies = [
           sources."memory-fs-0.5.0"
         ];
@@ -87078,7 +87148,7 @@ in
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
@@ -87112,7 +87182,7 @@ in
       sources."paredit.js-0.3.6"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.6"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
@@ -87173,7 +87243,7 @@ in
       sources."regex-not-1.0.2"
       sources."regexpu-core-4.7.1"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.6" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -87392,7 +87462,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -87428,7 +87498,7 @@ in
           sources."readdirp-2.2.1"
         ];
       })
-      (sources."webpack-4.46.0" // {
+      (sources."webpack-4.44.2" // {
         dependencies = [
           sources."acorn-6.4.2"
           sources."micromatch-3.1.10"
@@ -87517,7 +87587,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Madoko is a fast scholarly Markdown processor written in Koka";
-      homepage = "http://madoko.codeplex.com";
+      homepage = http://madoko.codeplex.com/;
     };
     production = true;
     bypassCache = true;
@@ -87526,10 +87596,10 @@ in
   markdown-link-check = nodeEnv.buildNodePackage {
     name = "markdown-link-check";
     packageName = "markdown-link-check";
-    version = "3.8.6";
+    version = "3.8.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.6.tgz";
-      sha512 = "GWzd54hNol2Zwf6fFEhUYqi9wbib1BMdcphvGCZqhinaAKhiILDaQkX7sn2u9GMoItmZ1jQK0f8wULOK/M+M4w==";
+      url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.5.tgz";
+      sha512 = "raCr1YMrIqCUFrBTp90UHDsar/79TPgzlVHA7gSi1DnhM2/BC1lm49V+PGzBd1ZpIYwkmzQ6TYm0AfK7A82/Dw==";
     };
     dependencies = [
       sources."ajv-6.12.6"
@@ -87593,7 +87663,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
     ];
@@ -87879,7 +87949,7 @@ in
       sources."type-1.2.0"
       sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -87895,7 +87965,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Bot to publish twitter, tumblr or rss posts to an mastodon account.";
-      homepage = "https://github.com/yogthos/mastodon-bot";
+      homepage = https://github.com/yogthos/mastodon-bot;
       license = "MIT";
     };
     production = true;
@@ -87951,7 +88021,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined.";
-      homepage = "https://bitbucket.org/aahmed/meat";
+      homepage = https://bitbucket.org/aahmed/meat;
     };
     production = true;
     bypassCache = true;
@@ -87967,7 +88037,7 @@ in
     };
     dependencies = [
       sources."@braintree/sanitize-url-3.1.0"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
@@ -88049,7 +88119,7 @@ in
       sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."khroma-1.2.0"
+      sources."khroma-1.1.1"
       sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lower-case-1.1.4"
@@ -88095,7 +88165,7 @@ in
       sources."through-2.3.8"
       sources."try-catch-2.0.1"
       sources."try-to-catch-1.1.1"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       sources."unbzip2-stream-1.4.3"
       sources."upper-case-1.1.3"
       sources."util-deprecate-1.0.2"
@@ -88116,28 +88186,28 @@ in
   mirakurun = nodeEnv.buildNodePackage {
     name = "mirakurun";
     packageName = "mirakurun";
-    version = "3.5.0";
+    version = "3.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.5.0.tgz";
-      sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg==";
+      url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.4.1.tgz";
+      sha512 = "ymTdhda+4t6njz8xY8ySZS4nDEDEb+zXhmn1JzzxlribUqELcKZ6FwC8JF8HhHg3tcKeFAwVLzL6kHcaqL+okQ==";
     };
     dependencies = [
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.156.0"
-      sources."@fluentui/react-focus-7.17.1"
+      sources."@fluentui/react-7.155.3"
+      sources."@fluentui/react-focus-7.17.0"
       sources."@fluentui/react-window-provider-1.0.1"
-      sources."@fluentui/theme-1.7.1"
-      sources."@microsoft/load-themed-styles-1.10.145"
+      sources."@fluentui/theme-1.7.0"
+      sources."@microsoft/load-themed-styles-1.10.141"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@uifabric/foundation-7.9.21"
-      sources."@uifabric/icons-7.5.18"
+      sources."@uifabric/foundation-7.9.20"
+      sources."@uifabric/icons-7.5.17"
       sources."@uifabric/merge-styles-7.19.1"
       sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.19"
+      sources."@uifabric/styling-7.16.18"
       sources."@uifabric/utilities-7.33.2"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
@@ -88205,7 +88275,7 @@ in
       sources."eventemitter3-4.0.7"
       sources."express-4.17.1"
       sources."express-normalize-query-params-middleware-0.5.1"
-      sources."express-openapi-7.2.3"
+      sources."express-openapi-7.2.0"
       sources."external-editor-2.2.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
@@ -88265,20 +88335,20 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.156.0"
+      sources."office-ui-fabric-react-7.155.3"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."openapi-default-setter-7.2.3"
-      sources."openapi-framework-7.2.3"
-      sources."openapi-jsonschema-parameters-7.2.3"
-      sources."openapi-request-coercer-7.2.3"
-      sources."openapi-request-validator-7.2.3"
-      sources."openapi-response-validator-7.2.3"
-      sources."openapi-schema-validator-7.2.3"
-      sources."openapi-security-handler-7.2.3"
-      sources."openapi-types-7.2.3"
+      sources."openapi-default-setter-7.0.1"
+      sources."openapi-framework-7.2.0"
+      sources."openapi-jsonschema-parameters-7.0.2"
+      sources."openapi-request-coercer-7.1.0"
+      sources."openapi-request-validator-7.2.0"
+      sources."openapi-response-validator-7.0.1"
+      sources."openapi-schema-validator-7.0.1"
+      sources."openapi-security-handler-7.0.1"
+      sources."openapi-types-7.0.1"
       (sources."opencollective-1.0.3" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -88356,8 +88426,8 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
-      sources."swagger-ui-dist-3.40.0"
-      sources."tail-2.2.0"
+      sources."swagger-ui-dist-3.38.0"
+      sources."tail-2.1.1"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
@@ -88366,7 +88436,7 @@ in
       sources."tslib-1.14.1"
       sources."type-is-1.6.18"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
@@ -88378,7 +88448,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Japanese DTV Tuner Server Service.";
-      homepage = "https://github.com/Chinachu/Mirakurun";
+      homepage = https://github.com/Chinachu/Mirakurun;
       license = "Apache-2.0";
     };
     production = true;
@@ -88401,7 +88471,7 @@ in
       sources."anymatch-3.1.1"
       sources."argparse-1.0.10"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-stdout-1.3.1"
@@ -88511,7 +88581,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "simple, flexible, fun test framework";
-      homepage = "https://mochajs.org/";
+      homepage = https://mochajs.org/;
       license = "MIT";
     };
     production = true;
@@ -88559,14 +88629,14 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.9.6"
+      sources."qs-6.9.4"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
       sources."slash-3.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
       sources."superagent-3.8.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -88637,7 +88707,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Neovim client API and neovim remote plugin provider";
-      homepage = "https://github.com/neovim/node-client";
+      homepage = https://github.com/neovim/node-client;
       license = "MIT";
     };
     production = true;
@@ -88647,10 +88717,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "3.4.1";
+    version = "2.70.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.4.1.tgz";
-      sha512 = "g1urfn0WbQpYV0d+UFP3TjLlQxRP5hGv2tB0l/QInXM4CJr1uRyP/XuAOJf104bYamI+6wFcs4haYW+Qg7JVaQ==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.70.0.tgz";
+      sha512 = "VET5LUeZP2TX+xBXYQdiKkVyQfeW+HkeL7pRE2fGOi14fLE3BYSjjdmnCHDX83hgYniHIxKJBH/52zkyQ+m+2Q==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -88758,67 +88828,55 @@ in
       sources."@babel/template-7.12.7"
       sources."@babel/traverse-7.12.12"
       sources."@babel/types-7.12.12"
-      sources."@bugsnag/browser-7.6.0"
-      sources."@bugsnag/core-7.6.0"
+      sources."@bugsnag/browser-7.5.4"
+      sources."@bugsnag/core-7.5.4"
       sources."@bugsnag/cuid-3.0.0"
-      sources."@bugsnag/js-7.6.0"
-      sources."@bugsnag/node-7.6.0"
+      sources."@bugsnag/js-7.5.4"
+      sources."@bugsnag/node-7.5.4"
       sources."@bugsnag/safe-json-stringify-6.0.0"
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-8.1.0" // {
+      (sources."@netlify/build-8.0.1" // {
         dependencies = [
+          sources."@netlify/zip-it-and-ship-it-2.0.0"
           sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
-          sources."execa-3.4.0"
-          sources."locate-path-5.0.0"
           sources."resolve-2.0.0-next.2"
         ];
       })
-      (sources."@netlify/cache-utils-1.0.6" // {
-        dependencies = [
-          sources."locate-path-5.0.0"
-        ];
-      })
-      (sources."@netlify/config-3.0.1" // {
+      sources."@netlify/cache-utils-1.0.6"
+      (sources."@netlify/config-2.4.3" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-3.0.0"
-          sources."execa-3.4.0"
         ];
       })
-      (sources."@netlify/framework-info-2.0.0" // {
+      (sources."@netlify/functions-utils-1.3.4" // {
         dependencies = [
-          sources."locate-path-5.0.0"
+          sources."@netlify/zip-it-and-ship-it-2.0.0"
+          sources."resolve-2.0.0-next.2"
         ];
       })
-      sources."@netlify/functions-utils-1.3.5"
       (sources."@netlify/git-utils-1.0.6" // {
         dependencies = [
           sources."braces-3.0.2"
-          sources."execa-3.4.0"
           sources."fill-range-7.0.1"
           sources."is-number-7.0.0"
           sources."micromatch-4.0.2"
           sources."to-regex-range-5.0.1"
         ];
       })
-      sources."@netlify/open-api-1.3.0"
-      sources."@netlify/plugin-edge-handlers-1.11.1"
+      sources."@netlify/open-api-1.0.0"
+      sources."@netlify/plugin-edge-handlers-1.10.0"
       sources."@netlify/plugins-list-2.2.0"
-      (sources."@netlify/run-utils-1.0.5" // {
+      sources."@netlify/run-utils-1.0.5"
+      sources."@netlify/traffic-mesh-agent-0.27.0"
+      sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0"
+      sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0"
+      sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0"
+      (sources."@netlify/zip-it-and-ship-it-1.7.0" // {
         dependencies = [
-          sources."execa-3.4.0"
-        ];
-      })
-      sources."@netlify/traffic-mesh-agent-0.27.10"
-      sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10"
-      sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10"
-      sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10"
-      (sources."@netlify/zip-it-and-ship-it-2.0.2" // {
-        dependencies = [
-          sources."locate-path-5.0.0"
           sources."resolve-2.0.0-next.2"
         ];
       })
@@ -88842,9 +88900,13 @@ in
           })
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
+          sources."has-flag-4.0.0"
           sources."strip-ansi-5.2.0"
-          sources."supports-color-5.5.0"
+          (sources."supports-color-5.5.0" // {
+            dependencies = [
+              sources."has-flag-3.0.0"
+            ];
+          })
         ];
       })
       (sources."@oclif/command-1.8.0" // {
@@ -88866,23 +88928,22 @@ in
           sources."array-union-2.1.0"
           sources."braces-3.0.2"
           sources."dir-glob-3.0.1"
-          sources."fast-glob-3.2.5"
+          sources."fast-glob-3.2.4"
           sources."fill-range-7.0.1"
           sources."glob-parent-5.1.1"
-          sources."globby-11.0.2"
+          sources."globby-11.0.1"
           sources."ignore-5.1.8"
           sources."is-number-7.0.0"
           sources."micromatch-4.0.2"
           sources."slash-3.0.0"
           sources."to-regex-range-5.0.1"
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."@oclif/errors-1.3.4" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."clean-stack-3.0.1"
-          sources."escape-string-regexp-4.0.0"
           sources."wrap-ansi-7.0.0"
         ];
       })
@@ -88919,7 +88980,6 @@ in
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
           sources."fs-extra-7.0.1"
-          sources."has-flag-3.0.0"
           sources."indent-string-3.2.0"
           sources."is-wsl-1.1.0"
           sources."semver-5.7.1"
@@ -88931,10 +88991,16 @@ in
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
-          sources."fs-extra-9.1.0"
-          sources."jsonfile-6.1.0"
-          sources."tslib-2.1.0"
-          sources."universalify-2.0.0"
+          sources."fs-extra-9.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
+          sources."npm-run-path-4.0.1"
+          sources."path-key-3.1.1"
+          sources."tslib-2.0.3"
+          sources."universalify-1.0.0"
         ];
       })
       sources."@oclif/screen-1.0.4"
@@ -88945,7 +89011,7 @@ in
           sources."universal-user-agent-6.0.0"
         ];
       })
-      sources."@octokit/openapi-types-3.1.1"
+      sources."@octokit/openapi-types-2.0.1"
       (sources."@octokit/plugin-paginate-rest-1.1.2" // {
         dependencies = [
           sources."@octokit/types-2.16.2"
@@ -88970,23 +89036,19 @@ in
         ];
       })
       sources."@octokit/rest-16.43.2"
-      sources."@octokit/types-6.4.2"
+      sources."@octokit/types-6.1.2"
       sources."@rollup/plugin-babel-5.2.2"
-      (sources."@rollup/plugin-commonjs-17.0.0" // {
+      (sources."@rollup/plugin-commonjs-15.1.0" // {
         dependencies = [
           sources."estree-walker-2.0.2"
         ];
       })
       sources."@rollup/plugin-inject-4.0.2"
       sources."@rollup/plugin-json-4.1.0"
-      sources."@rollup/plugin-node-resolve-11.1.0"
+      sources."@rollup/plugin-node-resolve-9.0.0"
       sources."@rollup/pluginutils-3.1.0"
       sources."@sindresorhus/is-0.14.0"
-      (sources."@sindresorhus/slugify-1.1.0" // {
-        dependencies = [
-          sources."escape-string-regexp-4.0.0"
-        ];
-      })
+      sources."@sindresorhus/slugify-1.1.0"
       (sources."@sindresorhus/transliterate-0.1.1" // {
         dependencies = [
           sources."escape-string-regexp-2.0.0"
@@ -88999,14 +89061,14 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/got-8.3.5"
       sources."@types/hast-2.3.1"
-      sources."@types/http-proxy-1.17.5"
+      sources."@types/http-proxy-1.17.4"
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.14.22"
-      sources."@types/node-fetch-2.5.8"
+      sources."@types/node-14.14.20"
+      sources."@types/node-fetch-2.5.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
       sources."@types/resolve-1.17.1"
@@ -89016,6 +89078,11 @@ in
       sources."@types/yargs-parser-20.2.0"
       sources."@typescript-eslint/typescript-estree-2.34.0"
       sources."@ungap/from-entries-0.2.1"
+      (sources."abstract-leveldown-0.12.4" // {
+        dependencies = [
+          sources."xtend-3.0.0"
+        ];
+      })
       sources."accepts-1.3.7"
       sources."agent-base-6.0.2"
       sources."aggregate-error-3.1.0"
@@ -89055,6 +89122,11 @@ in
       sources."array-unique-0.3.2"
       sources."arrify-2.0.1"
       sources."ascii-table-0.0.9"
+      (sources."asn1.js-5.4.1" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."assign-symbols-1.0.0"
       sources."ast-module-types-2.7.1"
       sources."async-3.2.0"
@@ -89062,7 +89134,7 @@ in
       sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.830.0" // {
+      (sources."aws-sdk-2.821.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -89080,8 +89152,9 @@ in
       })
       sources."base64-js-1.5.1"
       sources."before-after-hook-2.1.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bl-4.0.3"
+      sources."bn.js-5.1.3"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -89100,7 +89173,14 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."browserslist-4.16.1"
+      sources."brorand-1.1.0"
+      sources."browserify-aes-1.2.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.2"
+      sources."browserify-fs-1.0.0"
+      sources."browserify-rsa-4.1.0"
+      sources."browserify-sign-4.2.1"
+      sources."browserslist-4.16.0"
       sources."btoa-lite-1.0.0"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
@@ -89109,6 +89189,7 @@ in
       sources."buffer-es6-4.9.3"
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
+      sources."buffer-xor-1.0.3"
       sources."builtin-modules-3.2.0"
       sources."builtins-1.0.3"
       sources."byline-5.0.0"
@@ -89120,10 +89201,10 @@ in
         ];
       })
       sources."cachedir-2.3.0"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       sources."cardinal-2.1.1"
       sources."caw-2.0.1"
       sources."ccount-1.1.0"
@@ -89132,24 +89213,24 @@ in
           sources."ansi-styles-3.2.1"
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
+          sources."escape-string-regexp-1.0.5"
           sources."supports-color-5.5.0"
         ];
       })
       sources."character-entities-html4-1.1.4"
       sources."character-entities-legacy-1.1.4"
       sources."chardet-0.7.0"
-      (sources."chokidar-3.5.1" // {
+      (sources."chokidar-3.4.3" // {
         dependencies = [
           sources."braces-3.0.2"
           sources."fill-range-7.0.1"
-          sources."fsevents-2.3.1"
           sources."glob-parent-5.1.1"
           sources."is-number-7.0.0"
           sources."to-regex-range-5.0.1"
         ];
       })
       sources."ci-info-2.0.0"
+      sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -89180,17 +89261,17 @@ in
           sources."argparse-1.0.10"
           sources."chalk-4.1.0"
           sources."clean-stack-3.0.1"
-          sources."escape-string-regexp-4.0.0"
           sources."extract-stack-2.0.0"
+          sources."has-flag-4.0.0"
           sources."js-yaml-3.14.1"
           sources."supports-hyperlinks-2.1.0"
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
           sources."type-fest-0.11.0"
         ];
       })
       sources."cli-width-2.2.1"
       sources."cliui-6.0.0"
-      sources."clone-1.0.4"
+      sources."clone-0.1.19"
       sources."clone-response-1.0.2"
       sources."collection-visit-1.0.0"
       (sources."color-3.0.0" // {
@@ -89218,6 +89299,12 @@ in
         ];
       })
       sources."concat-map-0.0.1"
+      (sources."concat-stream-1.6.2" // {
+        dependencies = [
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       (sources."concordance-4.0.0" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -89247,7 +89334,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      (sources."core-js-compat-3.8.3" // {
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -89261,7 +89348,20 @@ in
       })
       sources."crc-3.8.0"
       sources."crc32-stream-3.0.1"
-      sources."cross-spawn-7.0.3"
+      (sources."create-ecdh-4.0.4" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
+      (sources."cross-spawn-6.0.5" // {
+        dependencies = [
+          sources."semver-5.7.1"
+          sources."which-1.3.1"
+        ];
+      })
+      sources."crypto-browserify-3.12.0"
       sources."crypto-random-string-2.0.0"
       sources."cyclist-1.0.1"
       sources."date-time-2.1.0"
@@ -89287,7 +89387,6 @@ in
         dependencies = [
           sources."bl-1.2.3"
           sources."file-type-5.2.0"
-          sources."is-stream-1.1.0"
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."tar-stream-1.6.2"
@@ -89296,13 +89395,11 @@ in
       (sources."decompress-tarbz2-4.1.1" // {
         dependencies = [
           sources."file-type-6.2.0"
-          sources."is-stream-1.1.0"
         ];
       })
       (sources."decompress-targz-4.1.1" // {
         dependencies = [
           sources."file-type-5.2.0"
-          sources."is-stream-1.1.0"
         ];
       })
       (sources."decompress-unzip-4.0.1" // {
@@ -89315,8 +89412,13 @@ in
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepmerge-4.2.2"
-      sources."defaults-1.0.3"
+      (sources."defaults-1.0.3" // {
+        dependencies = [
+          sources."clone-1.0.4"
+        ];
+      })
       sources."defer-to-connect-1.1.3"
+      sources."deferred-leveldown-0.2.0"
       sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
       (sources."del-5.1.0" // {
@@ -89327,6 +89429,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."deprecation-2.3.1"
+      sources."des.js-1.0.1"
       sources."destroy-1.0.4"
       sources."detective-amd-3.0.1"
       sources."detective-cjs-3.1.1"
@@ -89337,6 +89440,11 @@ in
       sources."detective-scss-2.0.1"
       sources."detective-stylus-1.0.0"
       sources."detective-typescript-5.8.0"
+      (sources."diffie-hellman-5.0.3" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       (sources."dir-glob-2.2.2" // {
         dependencies = [
           sources."path-type-3.0.0"
@@ -89359,7 +89467,6 @@ in
           sources."normalize-url-2.0.1"
           sources."p-cancelable-0.4.1"
           sources."p-event-2.3.1"
-          sources."p-finally-1.0.0"
           sources."p-timeout-2.0.1"
           sources."pify-3.0.0"
           sources."sort-keys-2.0.0"
@@ -89367,20 +89474,25 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       sources."elf-cam-0.1.1"
+      (sources."elliptic-6.5.3" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."emoji-regex-8.0.0"
       sources."enabled-2.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."env-paths-2.2.0"
       sources."envinfo-7.7.3"
+      sources."errno-0.1.8"
       sources."error-ex-1.3.2"
       sources."error-stack-parser-2.0.6"
       sources."escalade-3.1.1"
       sources."escape-goat-2.1.1"
       sources."escape-html-1.0.3"
-      sources."escape-string-regexp-1.0.5"
+      sources."escape-string-regexp-4.0.0"
       (sources."escodegen-1.14.3" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -89394,10 +89506,16 @@ in
       sources."etag-1.8.1"
       sources."eventemitter3-4.0.7"
       sources."events-1.1.1"
-      (sources."execa-5.0.0" // {
+      sources."evp_bytestokey-1.0.3"
+      (sources."execa-3.4.0" // {
         dependencies = [
-          sources."get-stream-6.0.0"
-          sources."human-signals-2.1.0"
+          sources."cross-spawn-7.0.3"
+          sources."is-stream-2.0.0"
+          sources."npm-run-path-4.0.1"
+          sources."p-finally-2.0.1"
+          sources."path-key-3.1.1"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
         ];
       })
       (sources."expand-brackets-2.1.4" // {
@@ -89456,7 +89574,11 @@ in
       sources."fastq-1.10.0"
       sources."fd-slicer-1.1.0"
       sources."fecha-4.2.0"
-      sources."figures-3.2.0"
+      (sources."figures-3.2.0" // {
+        dependencies = [
+          sources."escape-string-regexp-1.0.5"
+        ];
+      })
       sources."file-size-0.0.5"
       sources."file-type-8.1.0"
       sources."filename-reserved-regex-2.0.0"
@@ -89472,17 +89594,14 @@ in
           sources."debug-2.6.9"
         ];
       })
-      (sources."find-up-4.1.0" // {
-        dependencies = [
-          sources."locate-path-5.0.0"
-        ];
-      })
+      sources."find-up-4.1.0"
       sources."flatten-1.0.3"
       sources."flush-write-stream-2.0.0"
       sources."fn.name-1.1.0"
       sources."folder-walker-3.2.0"
       sources."follow-redirects-1.13.1"
       sources."for-in-1.0.2"
+      sources."foreach-2.0.5"
       sources."form-data-3.0.0"
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
@@ -89500,6 +89619,13 @@ in
       sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
       sources."fuzzy-0.1.3"
+      (sources."fwd-stream-1.0.4" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.0.34"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."gensync-1.0.0-beta.2"
       sources."get-amd-module-type-3.0.0"
       sources."get-caller-file-2.0.5"
@@ -89535,7 +89661,7 @@ in
           sources."array-union-2.1.0"
           sources."braces-3.0.2"
           sources."dir-glob-3.0.1"
-          sources."fast-glob-3.2.5"
+          sources."fast-glob-3.2.4"
           sources."fill-range-7.0.1"
           sources."glob-parent-5.1.1"
           sources."ignore-5.1.8"
@@ -89559,7 +89685,7 @@ in
           sources."ansi-regex-0.2.1"
         ];
       })
-      sources."has-flag-4.0.0"
+      sources."has-flag-3.0.0"
       (sources."has-glob-1.0.0" // {
         dependencies = [
           sources."is-glob-3.1.0"
@@ -89575,18 +89701,26 @@ in
         ];
       })
       sources."has-yarn-2.1.0"
-      sources."hasha-5.2.2"
+      sources."hash-base-3.1.0"
+      sources."hash.js-1.1.7"
+      (sources."hasha-5.2.2" // {
+        dependencies = [
+          sources."is-stream-2.0.0"
+        ];
+      })
       sources."hast-util-from-parse5-6.0.1"
       sources."hast-util-is-element-1.1.0"
       sources."hast-util-parse-selector-2.2.5"
       sources."hast-util-to-html-7.1.2"
       sources."hast-util-whitespace-1.0.4"
       sources."hastscript-6.0.0"
+      sources."hmac-drbg-1.0.1"
       sources."hosted-git-info-2.8.8"
       sources."html-void-elements-1.0.5"
       sources."http-cache-semantics-4.1.0"
       (sources."http-call-5.3.0" // {
         dependencies = [
+          sources."is-stream-2.0.0"
           sources."parse-json-4.0.0"
         ];
       })
@@ -89609,18 +89743,21 @@ in
       sources."human-signals-1.1.1"
       sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
+      sources."idb-wrapper-1.7.2"
       sources."ieee754-1.2.1"
       sources."ignore-4.0.6"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
       sources."indexes-of-1.0.1"
+      sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.8"
       (sources."inquirer-6.5.2" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
+          sources."escape-string-regexp-1.0.5"
           sources."figures-2.0.0"
           sources."is-fullwidth-code-point-2.0.0"
           (sources."string-width-2.1.1" // {
@@ -89645,6 +89782,7 @@ in
       })
       sources."into-stream-3.1.0"
       sources."ipaddr.js-1.9.1"
+      sources."is-0.2.7"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
@@ -89669,24 +89807,29 @@ in
         ];
       })
       sources."is-obj-2.0.0"
-      sources."is-object-1.0.2"
+      sources."is-object-0.1.2"
       sources."is-path-cwd-2.2.0"
       sources."is-path-inside-3.0.2"
       sources."is-plain-obj-2.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-reference-1.2.1"
       sources."is-retry-allowed-1.2.0"
-      sources."is-stream-2.0.0"
+      sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
       sources."is-windows-1.0.2"
       sources."is-wsl-2.2.0"
       sources."is-yarn-global-0.3.0"
       sources."isarray-1.0.0"
+      sources."isbuffer-0.0.0"
       sources."iserror-0.0.2"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
-      sources."isurl-1.0.0"
+      (sources."isurl-1.0.0" // {
+        dependencies = [
+          sources."is-object-1.0.2"
+        ];
+      })
       sources."jest-get-type-24.9.0"
       sources."jest-validate-24.9.0"
       sources."jest-worker-26.6.2"
@@ -89702,11 +89845,7 @@ in
       sources."jsonfile-4.0.0"
       sources."junk-3.1.0"
       sources."jwt-decode-3.1.2"
-      (sources."keep-func-props-3.0.1" // {
-        dependencies = [
-          sources."mimic-fn-3.1.0"
-        ];
-      })
+      sources."keep-func-props-3.0.1"
       sources."keyv-3.1.0"
       sources."kind-of-6.0.3"
       sources."kuler-2.0.0"
@@ -89722,6 +89861,48 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
+      (sources."level-blobs-0.1.7" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      (sources."level-filesystem-1.2.0" // {
+        dependencies = [
+          sources."xtend-2.2.0"
+        ];
+      })
+      sources."level-fix-range-2.0.0"
+      sources."level-hooks-4.5.0"
+      (sources."level-js-2.2.4" // {
+        dependencies = [
+          sources."object-keys-0.4.0"
+          sources."xtend-2.1.2"
+        ];
+      })
+      (sources."level-peek-1.0.6" // {
+        dependencies = [
+          sources."level-fix-range-1.0.2"
+        ];
+      })
+      (sources."level-sublevel-5.2.3" // {
+        dependencies = [
+          sources."object-keys-0.2.0"
+          sources."xtend-2.0.6"
+        ];
+      })
+      (sources."levelup-0.18.6" // {
+        dependencies = [
+          sources."bl-0.8.2"
+          sources."isarray-0.0.1"
+          sources."prr-0.0.0"
+          sources."readable-stream-1.0.34"
+          sources."semver-2.3.2"
+          sources."string_decoder-0.10.31"
+          sources."xtend-3.0.0"
+        ];
+      })
       sources."leven-3.1.0"
       sources."levn-0.3.0"
       sources."lines-and-columns-1.1.6"
@@ -89731,12 +89912,7 @@ in
           sources."type-fest-0.3.1"
         ];
       })
-      (sources."locate-path-6.0.0" // {
-        dependencies = [
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.camelcase-4.3.0"
@@ -89771,6 +89947,7 @@ in
       })
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-6.0.0"
+      sources."ltgt-2.2.1"
       sources."macos-release-2.4.1"
       sources."magic-string-0.25.7"
       (sources."make-dir-3.1.0" // {
@@ -89789,6 +89966,7 @@ in
       })
       sources."md5-hex-2.0.0"
       sources."md5-o-matic-0.1.1"
+      sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
       sources."memoize-one-5.1.1"
       sources."merge-descriptors-1.0.1"
@@ -89798,11 +89976,18 @@ in
       sources."micro-api-client-3.3.0"
       sources."micro-memoize-2.1.2"
       sources."micromatch-3.1.10"
+      (sources."miller-rabin-4.0.1" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."mime-1.6.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
-      sources."mimic-fn-2.1.0"
+      sources."mimic-fn-3.1.0"
       sources."mimic-response-1.0.1"
+      sources."minimalistic-assert-1.0.1"
+      sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
@@ -89836,17 +90021,30 @@ in
       sources."natural-orderby-2.0.3"
       sources."negotiator-0.6.2"
       sources."nested-error-stacks-2.1.0"
-      (sources."netlify-6.0.12" // {
+      (sources."netlify-6.0.9" // {
         dependencies = [
-          sources."qs-6.9.6"
+          sources."@netlify/zip-it-and-ship-it-2.0.0"
+          sources."qs-6.9.4"
+          sources."resolve-2.0.0-next.2"
         ];
       })
       sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16"
-      sources."netlify-redirect-parser-3.0.1"
+      (sources."netlify-redirect-parser-2.5.0" // {
+        dependencies = [
+          sources."@netlify/config-0.11.11"
+          sources."@netlify/open-api-0.18.1"
+          sources."ansi-styles-4.3.0"
+          sources."argparse-1.0.10"
+          sources."chalk-3.0.0"
+          sources."js-yaml-3.14.1"
+          sources."netlify-4.9.0"
+          sources."qs-6.9.4"
+        ];
+      })
       sources."netlify-redirector-0.2.1"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.1"
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       sources."node-source-walk-4.2.0"
       sources."noop2-2.0.0"
       (sources."normalize-package-data-2.5.0" // {
@@ -89861,7 +90059,7 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."npm-run-path-4.0.1"
+      sources."npm-run-path-2.0.2"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -89881,14 +90079,19 @@ in
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
+      sources."octal-1.0.0"
       sources."octokit-pagination-methods-1.1.0"
       sources."omit.js-2.0.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
-      sources."onetime-5.1.2"
-      sources."open-7.3.1"
+      (sources."onetime-5.1.2" // {
+        dependencies = [
+          sources."mimic-fn-2.1.0"
+        ];
+      })
+      sources."open-7.3.0"
       (sources."opn-5.5.0" // {
         dependencies = [
           sources."is-wsl-1.1.0"
@@ -89918,17 +90121,13 @@ in
           sources."p-map-2.1.0"
         ];
       })
-      sources."p-finally-2.0.1"
+      sources."p-finally-1.0.0"
       sources."p-is-promise-1.1.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-map-3.0.0"
       sources."p-reduce-2.1.0"
-      (sources."p-timeout-3.2.0" // {
-        dependencies = [
-          sources."p-finally-1.0.0"
-        ];
-      })
+      sources."p-timeout-3.2.0"
       sources."p-try-2.2.0"
       sources."p-wait-for-3.2.0"
       (sources."package-json-6.5.0" // {
@@ -89942,31 +90141,24 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
+      sources."parse-asn1-5.1.6"
       sources."parse-github-repo-url-1.4.1"
       sources."parse-github-url-1.0.2"
       sources."parse-gitignore-1.0.1"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."parse-ms-2.1.0"
       sources."parse5-6.0.1"
       sources."parseurl-1.3.3"
       sources."pascalcase-0.1.1"
-      (sources."password-prompt-1.1.2" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."path-key-2.0.1"
-          sources."semver-5.7.1"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."which-1.3.1"
-        ];
-      })
+      sources."password-prompt-1.1.2"
       sources."path-dirname-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
+      sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
       sources."path-to-regexp-0.1.7"
       sources."path-type-4.0.0"
+      sources."pbkdf2-3.1.1"
       sources."pend-1.2.0"
       sources."picomatch-2.2.2"
       sources."pify-4.0.1"
@@ -89976,7 +90168,6 @@ in
       sources."posix-character-classes-0.1.1"
       (sources."postcss-7.0.35" // {
         dependencies = [
-          sources."has-flag-3.0.0"
           sources."source-map-0.6.1"
           sources."supports-color-6.1.0"
         ];
@@ -90000,6 +90191,12 @@ in
       sources."property-information-5.6.0"
       sources."proto-list-1.2.4"
       sources."proxy-addr-2.0.6"
+      sources."prr-1.0.1"
+      (sources."public-encrypt-4.0.3" // {
+        dependencies = [
+          sources."bn.js-4.11.9"
+        ];
+      })
       sources."pump-3.0.0"
       sources."punycode-1.3.2"
       sources."pupa-2.1.1"
@@ -90009,6 +90206,7 @@ in
       sources."random-bytes-1.0.0"
       sources."random-item-3.1.0"
       sources."randombytes-2.1.0"
+      sources."randomfill-1.0.4"
       sources."range-parser-1.2.1"
       (sources."raw-body-2.4.1" // {
         dependencies = [
@@ -90035,7 +90233,7 @@ in
       sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.6" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -90061,19 +90259,10 @@ in
       sources."ret-0.1.15"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."rollup-2.37.1"
-      (sources."rollup-plugin-inject-3.0.2" // {
-        dependencies = [
-          sources."estree-walker-0.6.1"
-        ];
-      })
-      sources."rollup-plugin-node-polyfills-0.2.1"
+      sources."ripemd160-2.0.2"
+      sources."rollup-2.36.0"
+      sources."rollup-plugin-node-builtins-2.1.2"
       sources."rollup-plugin-terser-7.0.2"
-      (sources."rollup-pluginutils-2.8.2" // {
-        dependencies = [
-          sources."estree-walker-0.6.1"
-        ];
-      })
       sources."run-async-2.4.1"
       sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
@@ -90109,8 +90298,9 @@ in
         ];
       })
       sources."setprototypeof-1.1.1"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
+      sources."sha.js-2.4.11"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.3"
       (sources."simple-swizzle-0.2.2" // {
         dependencies = [
@@ -90195,6 +90385,7 @@ in
           sources."ansi-regex-0.2.1"
           sources."ansi-styles-1.1.0"
           sources."chalk-0.5.1"
+          sources."escape-string-regexp-1.0.5"
           sources."strip-ansi-0.3.0"
           sources."supports-color-0.2.0"
         ];
@@ -90202,6 +90393,7 @@ in
       sources."statsd-client-0.4.5"
       sources."statuses-1.5.0"
       sources."strict-uri-encode-1.1.0"
+      sources."string-range-1.2.2"
       sources."string-width-4.2.0"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
@@ -90220,8 +90412,16 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."strip-outer-1.0.1"
-      sources."supports-color-7.2.0"
+      (sources."strip-outer-1.0.1" // {
+        dependencies = [
+          sources."escape-string-regexp-1.0.5"
+        ];
+      })
+      (sources."supports-color-7.2.0" // {
+        dependencies = [
+          sources."has-flag-4.0.0"
+        ];
+      })
       (sources."supports-hyperlinks-1.0.1" // {
         dependencies = [
           sources."has-flag-2.0.0"
@@ -90275,16 +90475,21 @@ in
       sources."toml-3.0.0"
       sources."tomlify-j0.4-3.0.0"
       sources."treeify-1.1.0"
-      sources."trim-repeated-1.0.0"
+      (sources."trim-repeated-1.0.0" // {
+        dependencies = [
+          sources."escape-string-regexp-1.0.5"
+        ];
+      })
       sources."triple-beam-1.3.0"
       sources."trough-1.0.5"
       sources."tslib-1.14.1"
-      sources."tsutils-3.19.1"
+      sources."tsutils-3.18.0"
       sources."tunnel-agent-0.6.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."type-is-1.6.18"
-      sources."typedarray-to-buffer-3.1.5"
+      sources."typedarray-0.0.6"
+      sources."typedarray-to-buffer-1.0.4"
       sources."typescript-3.9.7"
       sources."uid-safe-2.1.5"
       sources."unbzip2-stream-1.4.3"
@@ -90359,20 +90564,15 @@ in
       sources."widest-line-3.1.0"
       (sources."windows-release-3.3.3" // {
         dependencies = [
-          sources."cross-spawn-6.0.5"
           sources."execa-1.0.0"
           sources."get-stream-4.1.0"
-          sources."is-stream-1.1.0"
-          sources."npm-run-path-2.0.2"
-          sources."p-finally-1.0.0"
-          sources."path-key-2.0.1"
-          sources."semver-5.7.1"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."which-1.3.1"
         ];
       })
-      sources."winston-3.3.3"
+      (sources."winston-3.3.3" // {
+        dependencies = [
+          sources."is-stream-2.0.0"
+        ];
+      })
       (sources."winston-transport-4.4.0" // {
         dependencies = [
           sources."readable-stream-2.3.7"
@@ -90386,7 +90586,11 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.3"
+      (sources."write-file-atomic-3.0.3" // {
+        dependencies = [
+          sources."typedarray-to-buffer-3.1.5"
+        ];
+      })
       sources."xdg-basedir-4.0.0"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
@@ -90397,13 +90601,12 @@ in
       sources."yargs-parser-18.1.3"
       sources."yarn-1.22.10"
       sources."yauzl-2.10.0"
-      sources."yocto-queue-0.1.0"
       sources."zip-stream-3.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Netlify command line tool";
-      homepage = "https://github.com/netlify/cli";
+      homepage = https://github.com/netlify/cli;
       license = "MIT";
     };
     production = true;
@@ -90525,11 +90728,11 @@ in
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
-      sources."tar-6.1.0"
+      sources."tar-6.0.5"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -90559,7 +90762,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Build tool and bindings loader for node-gyp that supports prebuilds";
-      homepage = "https://github.com/prebuild/node-gyp-build";
+      homepage = https://github.com/prebuild/node-gyp-build;
       license = "MIT";
     };
     production = true;
@@ -90858,7 +91061,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Web Inspector based nodeJS debugger";
-      homepage = "http://github.com/node-inspector/node-inspector";
+      homepage = http://github.com/node-inspector/node-inspector;
     };
     production = true;
     bypassCache = true;
@@ -90906,7 +91109,7 @@ in
       sources."minizlib-1.3.3"
       sources."mkdirp-0.5.5"
       sources."ms-2.1.3"
-      sources."needle-2.6.0"
+      sources."needle-2.5.2"
       sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
@@ -90952,16 +91155,16 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "1.2.7";
+    version = "1.2.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.7.tgz";
-      sha512 = "4ZE+Kh60pXQD/o7prg5Rdl6mlubP1wDZnKdV6TumKBdiqmDwkav5T125ZHYcs/zWMoXe/AUqHS4JDkIsg0OEIA==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.6.tgz";
+      sha512 = "Sy6ZNRFxN4KwT/eGFBt9L6aMXK0XGRwBNlhoFMPObSujLJVMUKHxirHAMst5CvUYigijFXM6ILRC6p/XqYHZRg==";
     };
     dependencies = [
       sources."@babel/runtime-7.12.5"
-      sources."@node-red/editor-api-1.2.7"
-      sources."@node-red/editor-client-1.2.7"
-      (sources."@node-red/nodes-1.2.7" // {
+      sources."@node-red/editor-api-1.2.6"
+      sources."@node-red/editor-client-1.2.6"
+      (sources."@node-red/nodes-1.2.6" // {
         dependencies = [
           sources."cookie-0.4.1"
           sources."http-errors-1.7.3"
@@ -90975,9 +91178,9 @@ in
           })
         ];
       })
-      sources."@node-red/registry-1.2.7"
-      sources."@node-red/runtime-1.2.7"
-      sources."@node-red/util-1.2.7"
+      sources."@node-red/registry-1.2.6"
+      sources."@node-red/runtime-1.2.6"
+      sources."@node-red/util-1.2.6"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       (sources."agent-base-6.0.2" // {
@@ -91005,11 +91208,11 @@ in
       sources."assert-plus-1.0.0"
       sources."async-0.1.22"
       sources."async-limiter-1.0.1"
-      sources."async-mutex-0.2.6"
+      sources."async-mutex-0.2.4"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
-      sources."axios-0.21.1"
+      sources."axios-0.19.2"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.5.1"
       (sources."basic-auth-2.0.1" // {
@@ -91088,7 +91291,7 @@ in
       sources."deep-extend-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."denque-1.5.0"
+      sources."denque-1.4.1"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."detect-libc-1.0.3"
@@ -91130,7 +91333,11 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."finalhandler-1.1.2"
-      sources."follow-redirects-1.13.1"
+      (sources."follow-redirects-1.5.10" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
@@ -91232,7 +91439,7 @@ in
       })
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
-      sources."mime-2.4.7"
+      sources."mime-2.4.6"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
@@ -91268,10 +91475,10 @@ in
       })
       sources."ms-2.0.0"
       sources."multer-1.4.2"
-      sources."mustache-4.1.0"
+      sources."mustache-4.0.1"
       sources."mute-stream-0.0.8"
       sources."nan-2.14.0"
-      (sources."needle-2.6.0" // {
+      (sources."needle-2.5.2" // {
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
@@ -91290,7 +91497,7 @@ in
           sources."yallist-3.1.1"
         ];
       })
-      (sources."node-red-admin-0.2.7" // {
+      (sources."node-red-admin-0.2.6" // {
         dependencies = [
           sources."bcrypt-3.0.8"
         ];
@@ -91389,7 +91596,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."tail-2.2.0"
+      sources."tail-2.1.1"
       (sources."tar-6.0.5" // {
         dependencies = [
           sources."mkdirp-1.0.4"
@@ -91412,19 +91619,19 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."tslib-2.1.0"
+      sources."tslib-2.0.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.12.4"
+      sources."uglify-js-3.11.6"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -91449,7 +91656,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Low-code programming for event-driven applications";
-      homepage = "http://nodered.org";
+      homepage = http://nodered.org/;
       license = "Apache-2.0";
     };
     production = true;
@@ -91459,10 +91666,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.9.0";
+    version = "1.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.9.0.tgz";
-      sha512 = "CZLF+Pu2g/eYhrIAznhKIg0i3McCXQuwd1meNb+ruiRTrNE2p5oc0RNQUKD3ZAId+JQdHKhFc+19G+wmS8g46w==";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.8.0.tgz";
+      sha512 = "v5QBcH6KxWVVRftbXdpGPIo3s0nPRcTJ56vLLbnmk0f1+32efqpI5t+fYekRys5yJPKFlXDRJCo6o8qnw581gQ==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -91476,7 +91683,7 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.5.1"
+      sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
@@ -91540,7 +91747,6 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-1.0.1"
       sources."jsprim-1.4.1"
-      sources."lru-cache-6.0.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."minimatch-3.0.4"
@@ -91600,7 +91806,7 @@ in
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.4"
+      sources."semver-7.1.3"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.3"
       sources."slasp-0.0.4"
@@ -91618,7 +91824,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      (sources."tar-6.1.0" // {
+      (sources."tar-6.0.5" // {
         dependencies = [
           sources."mkdirp-1.0.4"
         ];
@@ -91629,7 +91835,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
       sources."uid-number-0.0.5"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
@@ -91643,7 +91849,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Generate Nix expressions to build NPM packages";
-      homepage = "https://github.com/svanderburg/node2nix";
+      homepage = https://github.com/svanderburg/node2nix;
       license = "MIT";
     };
     production = true;
@@ -91653,10 +91859,10 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "2.0.7";
+    version = "2.0.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz";
-      sha512 = "XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA==";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.6.tgz";
+      sha512 = "4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -91671,7 +91877,7 @@ in
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."boxen-4.2.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -91688,7 +91894,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."ci-info-2.0.0"
       sources."cli-boxes-2.2.1"
       sources."clone-response-1.0.2"
@@ -91707,7 +91913,7 @@ in
       sources."end-of-stream-1.4.4"
       sources."escape-goat-2.1.1"
       sources."fill-range-7.0.1"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."get-stream-4.1.0"
       sources."glob-parent-5.1.1"
       sources."global-dirs-2.1.0"
@@ -91806,7 +92012,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Simple monitor script for use during development of a node.js app.";
-      homepage = "https://nodemon.io";
+      homepage = http://nodemon.io/;
       license = "MIT";
     };
     production = true;
@@ -91849,7 +92055,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/responselike-1.0.0"
@@ -91943,7 +92149,7 @@ in
       sources."escape-string-regexp-4.0.0"
       sources."execa-5.0.0"
       sources."external-editor-3.1.0"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fastq-1.10.0"
       (sources."figures-3.2.0" // {
         dependencies = [
@@ -91959,7 +92165,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."global-dirs-2.1.0"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       (sources."got-10.7.0" // {
         dependencies = [
           sources."get-stream-5.2.0"
@@ -92125,7 +92331,7 @@ in
           sources."mimic-fn-3.1.0"
         ];
       })
-      (sources."meow-8.1.2" // {
+      (sources."meow-8.1.0" // {
         dependencies = [
           sources."type-fest-0.18.1"
         ];
@@ -92161,7 +92367,7 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."org-regex-1.0.0"
       sources."os-tmpdir-1.0.2"
       (sources."ow-0.21.0" // {
@@ -92213,7 +92419,7 @@ in
         ];
       })
       sources."parent-module-1.0.1"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
@@ -92340,15 +92546,15 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.14.11";
+    version = "6.14.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz";
-      sha512 = "1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ==";
+      url = "https://registry.npmjs.org/npm/-/npm-6.14.10.tgz";
+      sha512 = "FT23Qy/JMA+qxEYReMOr1MY7642fKn8Onn+72LASPi872Owvmw0svm+/DXTHOC3yO9CheEO+EslyXEpdBdRtIA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "a package manager for JavaScript";
-      homepage = "https://docs.npmjs.com/";
+      homepage = https://docs.npmjs.com/;
       license = "Artistic-2.0";
     };
     production = true;
@@ -92358,23 +92564,16 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "11.0.2";
+    version = "10.2.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.0.2.tgz";
-      sha512 = "Ck+9Yq6B/N50y6lmGN0bLX1/TEseb/0xTWSAbfia1NVDH2uAzcAhwAgJbkOTqQuM+O6KC80liXTk8tC1w2PKOA==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.5.tgz";
+      sha512 = "R0BN+MqE6T12k0iGivF0WKfn3tuaeQuCai0haVvmsr7GcoPXU+yrlHxl9aFlO2XZ6z4m+pCd107YnbJDcRAf8Q==";
     };
     dependencies = [
-      sources."@nodelib/fs.scandir-2.1.4"
-      sources."@nodelib/fs.stat-2.0.4"
-      sources."@nodelib/fs.walk-1.2.6"
       sources."@npmcli/ci-detect-1.3.0"
       sources."@npmcli/git-2.0.4"
       sources."@npmcli/installed-package-contents-1.0.5"
-      (sources."@npmcli/move-file-1.1.0" // {
-        dependencies = [
-          sources."rimraf-2.7.1"
-        ];
-      })
+      sources."@npmcli/move-file-1.0.1"
       sources."@npmcli/node-gyp-1.0.1"
       sources."@npmcli/promise-spawn-1.3.2"
       sources."@npmcli/run-script-1.8.1"
@@ -92399,8 +92598,7 @@ in
       sources."ansi-styles-4.3.0"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
-      sources."argparse-2.0.1"
-      sources."array-union-2.1.0"
+      sources."argparse-1.0.10"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
@@ -92415,7 +92613,6 @@ in
         ];
       })
       sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
       sources."builtins-1.0.3"
       sources."cacache-15.0.5"
       (sources."cacheable-request-6.1.0" // {
@@ -92463,7 +92660,6 @@ in
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
       sources."dezalgo-1.0.3"
-      sources."dir-glob-3.0.1"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
@@ -92474,14 +92670,12 @@ in
       sources."err-code-1.1.2"
       sources."escape-goat-2.1.1"
       sources."escape-string-regexp-1.0.5"
+      sources."esprima-4.0.1"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fastq-1.10.0"
       sources."figgy-pudding-3.5.2"
-      sources."fill-range-7.0.1"
       sources."find-up-5.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -92500,13 +92694,11 @@ in
       sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.1"
       (sources."global-dirs-2.1.0" // {
         dependencies = [
           sources."ini-1.3.7"
         ];
       })
-      sources."globby-11.0.2"
       sources."got-9.6.0"
       sources."graceful-fs-4.2.4"
       sources."har-schema-2.0.0"
@@ -92521,7 +92713,6 @@ in
       sources."https-proxy-agent-5.0.0"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.6.2"
-      sources."ignore-5.1.8"
       sources."ignore-walk-3.0.3"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -92532,13 +92723,10 @@ in
       sources."ini-1.3.8"
       sources."ip-1.1.5"
       sources."is-ci-2.0.0"
-      sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.1"
       sources."is-installed-globally-0.3.2"
       sources."is-lambda-1.0.1"
       sources."is-npm-5.0.0"
-      sources."is-number-7.0.0"
       sources."is-obj-2.0.0"
       sources."is-path-inside-3.0.2"
       sources."is-typedarray-1.0.0"
@@ -92547,7 +92735,7 @@ in
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jju-1.4.0"
-      sources."js-yaml-4.0.0"
+      sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
       sources."json-buffer-3.0.0"
       sources."json-parse-even-better-errors-2.3.1"
@@ -92580,20 +92768,15 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."make-fetch-happen-8.0.13"
-      sources."map-age-cleaner-0.1.3"
-      sources."mem-8.0.0"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.2"
+      sources."make-fetch-happen-8.0.12"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
-      sources."mimic-fn-3.1.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-3.1.3"
       sources."minipass-collect-1.0.2"
-      sources."minipass-fetch-1.3.3"
+      sources."minipass-fetch-1.3.2"
       sources."minipass-flush-1.0.5"
       sources."minipass-json-stream-1.0.1"
       sources."minipass-pipeline-1.2.4"
@@ -92617,7 +92800,6 @@ in
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."p-cancelable-1.1.0"
-      sources."p-defer-1.0.0"
       sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."p-map-4.0.0"
@@ -92627,13 +92809,11 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."pacote-11.2.3"
+      sources."pacote-11.1.13"
       sources."parse-github-url-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-type-4.0.0"
       sources."performance-now-2.1.0"
-      sources."picomatch-2.2.2"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
@@ -92647,7 +92827,7 @@ in
       sources."pupa-2.1.1"
       sources."qs-6.5.2"
       sources."rc-1.2.8"
-      sources."rc-config-loader-4.0.0"
+      sources."rc-config-loader-3.0.0"
       sources."read-package-json-fast-1.2.1"
       sources."readable-stream-2.3.7"
       sources."readdir-scoped-modules-1.1.0"
@@ -92658,9 +92838,7 @@ in
       sources."require-from-string-2.0.2"
       sources."responselike-1.0.2"
       sources."retry-0.10.1"
-      sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."run-parallel-1.1.10"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-7.3.4"
@@ -92673,11 +92851,11 @@ in
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.3"
       sources."sisteransi-1.0.5"
-      sources."slash-3.0.0"
       sources."smart-buffer-4.1.0"
       sources."socks-2.5.1"
       sources."socks-proxy-agent-5.0.0"
       sources."spawn-please-1.0.0"
+      sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."ssri-8.0.0"
       sources."string-width-4.2.0"
@@ -92685,10 +92863,9 @@ in
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."tar-6.1.0"
+      sources."tar-6.0.5"
       sources."term-size-2.2.1"
       sources."to-readable-stream-1.0.0"
-      sources."to-regex-range-5.0.1"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -92698,7 +92875,7 @@ in
       sources."unique-slug-2.0.2"
       sources."unique-string-2.0.0"
       sources."update-notifier-5.0.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -92723,7 +92900,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Find newer versions of dependencies than what your package.json allows";
-      homepage = "https://github.com/raineorshine/npm-check-updates";
+      homepage = https://github.com/raineorshine/npm-check-updates;
       license = "Apache-2.0";
     };
     production = true;
@@ -92886,7 +93063,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -92897,7 +93074,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Generate nix expressions to build npm packages";
-      homepage = "https://github.com/NixOS/npm2nix";
+      homepage = https://github.com/NixOS/npm2nix;
     };
     production = true;
     bypassCache = true;
@@ -92938,7 +93115,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "OCaml language server";
-      homepage = "https://github.com/freebroccolo/ocaml-language-server";
+      homepage = https://github.com/freebroccolo/ocaml-language-server;
       license = "Apache-2.0";
     };
     production = true;
@@ -93157,7 +93334,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.16.0"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -93168,13 +93345,13 @@ in
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -93201,7 +93378,7 @@ in
       sources."convert-source-map-1.7.0"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.12"
-      (sources."core-js-compat-3.8.3" // {
+      (sources."core-js-compat-3.8.2" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -93309,7 +93486,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -93319,7 +93496,7 @@ in
       sources."entities-1.1.2"
       sources."envinfo-7.7.3"
       sources."error-ex-1.3.2"
-      (sources."es-abstract-1.18.0-next.2" // {
+      (sources."es-abstract-1.18.0-next.1" // {
         dependencies = [
           sources."object-inspect-1.9.0"
         ];
@@ -93564,7 +93741,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
       sources."nth-check-1.0.2"
@@ -93714,7 +93891,7 @@ in
       })
       sources."regexpu-core-4.7.1"
       sources."regjsgen-0.5.2"
-      (sources."regjsparser-0.6.6" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -93868,7 +94045,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -93959,11 +94136,11 @@ in
         ];
       })
       sources."brace-expansion-1.1.11"
-      sources."bunyan-1.8.15"
+      sources."bunyan-1.8.14"
       sources."bunyan-syslog-udp-0.2.0"
       sources."busboy-0.3.1"
       sources."bytes-3.0.0"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       sources."clarinet-0.11.0"
@@ -94170,10 +94347,10 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       sources."unix-dgram-2.0.4"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -94181,7 +94358,7 @@ in
       sources."verror-1.10.0"
       sources."which-module-2.0.0"
       sources."wikimedia-langconv-0.1.0"
-      sources."wikipeg-2.0.5"
+      sources."wikipeg-2.0.3"
       sources."wordwrap-1.0.0"
       sources."worker-farm-1.7.0"
       sources."wrap-ansi-5.1.0"
@@ -94525,7 +94702,7 @@ in
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."chalk-1.1.3"
@@ -94558,6 +94735,8 @@ in
       sources."dns-txt-2.0.2"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
+      sources."es-abstract-1.17.7"
+      sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."external-editor-2.2.0"
       sources."fifo-0.1.4"
@@ -94607,11 +94786,13 @@ in
       sources."ipaddr.js-2.0.0"
       sources."is-arguments-1.1.0"
       sources."is-arrayish-0.2.1"
+      sources."is-callable-1.2.2"
       sources."is-core-module-2.2.0"
       sources."is-date-object-1.0.2"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-regex-1.1.1"
+      sources."is-symbol-1.0.3"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
       sources."k-bucket-0.6.0"
@@ -94629,7 +94810,7 @@ in
       sources."magnet-uri-5.4.0"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
-      sources."mime-2.5.0"
+      sources."mime-2.4.7"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
@@ -94646,8 +94827,10 @@ in
       sources."number-is-nan-1.0.1"
       sources."numeral-2.0.6"
       sources."object-assign-4.1.1"
+      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-0.0.5"
@@ -94699,7 +94882,7 @@ in
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.7"
       sources."redent-1.0.0"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."repeating-2.0.1"
       sources."resolve-1.19.0"
       sources."restore-cursor-2.0.0"
@@ -94733,6 +94916,8 @@ in
       sources."speedometer-0.1.4"
       sources."stream-buffers-2.2.0"
       sources."string-width-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."string2compact-1.3.0" // {
         dependencies = [
           sources."ipaddr.js-1.9.1"
@@ -94782,7 +94967,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Streaming torrent client for Node.js";
-      homepage = "https://github.com/mafintosh/peerflix";
+      homepage = https://github.com/mafintosh/peerflix;
       license = "MIT";
     };
     production = true;
@@ -95079,7 +95264,7 @@ in
           sources."ws-2.3.1"
         ];
       })
-      (sources."socket.io-2.4.1" // {
+      (sources."socket.io-2.4.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
@@ -95090,7 +95275,7 @@ in
         dependencies = [
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
-          sources."socket.io-parser-3.3.2"
+          sources."socket.io-parser-3.3.1"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
@@ -95128,7 +95313,7 @@ in
       sources."ultron-1.1.1"
       sources."uniq-1.0.1"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."utp-0.0.7"
@@ -95204,9 +95389,10 @@ in
           sources."tslib-1.9.3"
         ];
       })
-      (sources."@pm2/js-api-0.6.7" // {
+      (sources."@pm2/js-api-0.6.1" // {
         dependencies = [
           sources."async-2.6.3"
+          sources."debug-3.2.7"
           sources."eventemitter2-6.4.3"
         ];
       })
@@ -95230,9 +95416,9 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."axios-0.21.1"
+      sources."axios-0.19.2"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."blessed-0.1.81"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -95240,7 +95426,7 @@ in
       sources."bytes-3.1.0"
       sources."chalk-3.0.0"
       sources."charm-0.1.2"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."cli-tableau-2.0.1"
       sources."co-4.6.0"
       sources."color-convert-2.0.1"
@@ -95280,9 +95466,14 @@ in
       sources."fclone-1.0.11"
       sources."file-uri-to-path-1.0.0"
       sources."fill-range-7.0.1"
-      sources."follow-redirects-1.13.1"
+      (sources."follow-redirects-1.5.10" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       (sources."ftp-0.3.10" // {
         dependencies = [
           sources."readable-stream-1.1.14"
@@ -95408,11 +95599,11 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.34.7"
+      sources."systeminformation-4.34.2"
       sources."thunkify-2.1.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
-      sources."tslib-2.1.0"
+      sources."tslib-2.0.3"
       sources."tv4-1.3.0"
       sources."type-check-0.3.2"
       sources."unpipe-1.0.0"
@@ -95433,7 +95624,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Production process manager for Node.JS applications with a built-in load balancer.";
-      homepage = "http://pm2.keymetrics.io/";
+      homepage = http://pm2.keymetrics.io/;
       license = "AGPL-3.0";
     };
     production = true;
@@ -95443,15 +95634,15 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "5.15.2";
+    version = "5.14.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.15.2.tgz";
-      sha512 = "YIy5GMRUPDDkcI/g3zr+kuamoaYTgTntHFU5WAVyBmQoYIo03TA2XJq70ii6lhUm6LbQbU6WtUit1cQrwRqAng==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.14.3.tgz";
+      sha512 = "PFjHFWCsHgaNCpOwOAgN6H71PA8td8PnwSE1ArXz//OyfdfIwws1s23XLmokhHcnE3JsBSiIR3NOW8JZ5QcxlQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "Fast, disk space efficient package manager";
-      homepage = "https://pnpm.js.org";
+      homepage = https://pnpm.js.org/;
       license = "MIT";
     };
     production = true;
@@ -95516,11 +95707,11 @@ in
       sources."anymatch-3.1.1"
       sources."array-union-2.1.0"
       sources."at-least-node-1.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."braces-3.0.2"
       sources."callsites-3.1.0"
       sources."chalk-4.1.0"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."cliui-7.0.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
@@ -95532,15 +95723,15 @@ in
       sources."error-ex-1.3.2"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fastq-1.10.0"
       sources."fill-range-7.0.1"
-      sources."fs-extra-9.1.0"
-      sources."fsevents-2.3.1"
+      sources."fs-extra-9.0.1"
+      sources."fsevents-2.1.3"
       sources."get-caller-file-2.0.5"
       sources."get-stdin-8.0.0"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       sources."graceful-fs-4.2.4"
       sources."has-flag-4.0.0"
       sources."ignore-5.1.8"
@@ -95559,7 +95750,11 @@ in
       sources."is-number-7.0.0"
       sources."js-tokens-4.0.0"
       sources."json-parse-even-better-errors-2.3.1"
-      sources."jsonfile-6.1.0"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."lines-and-columns-1.1.6"
       sources."lodash.difference-4.5.0"
       sources."lodash.forown-4.4.0"
@@ -95570,7 +95765,7 @@ in
       sources."micromatch-4.0.2"
       sources."normalize-path-3.0.0"
       sources."parent-module-1.0.1"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."path-type-4.0.0"
       sources."picomatch-2.2.2"
       sources."pify-2.3.0"
@@ -95588,7 +95783,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
       sources."to-regex-range-5.0.1"
-      sources."universalify-2.0.0"
+      sources."universalify-1.0.0"
       sources."wrap-ansi-7.0.0"
       sources."y18n-5.0.5"
       sources."yaml-1.10.0"
@@ -95616,7 +95811,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Prettier is an opinionated code formatter";
-      homepage = "https://prettier.io";
+      homepage = https://prettier.io/;
       license = "MIT";
     };
     production = true;
@@ -95918,7 +96113,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A build system for PureScript projects";
-      homepage = "https://github.com/purescript-contrib/pulp";
+      homepage = https://github.com/purescript-contrib/pulp;
       license = "LGPL-3.0+";
     };
     production = true;
@@ -95948,7 +96143,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Language Server Protocol server for PureScript wrapping purs ide server functionality";
-      homepage = "https://github.com/nwolverson/purescript-language-server";
+      homepage = https://github.com/nwolverson/purescript-language-server;
       license = "MIT";
     };
     production = true;
@@ -95994,10 +96189,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.103";
+    version = "1.1.99";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.103.tgz";
-      sha512 = "o4tgOmXf4maWGwuYRmzdDo7LNDtR2VlPBg7DAeh9kOb9GK53/2kGQieysh6viNbY7HFyZJn+mzQmx8yyeXqjjg==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.99.tgz";
+      sha512 = "DAfK8uVLGF1nuBeFvEXhvApCecuHEpe8ncjnFW/WsBBIQ5JOsjjpwlUDvTutNjkoH9QCTqvg72g6ip9PdWFL/w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -96246,14 +96441,14 @@ in
       sources."available-typed-arrays-1.0.2"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."chalk-1.1.3"
       sources."colors-0.6.2"
       sources."concat-map-0.0.1"
       sources."cycle-1.0.3"
       sources."deep-equal-2.0.5"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.17.7"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -96281,7 +96476,11 @@ in
       sources."is-set-2.0.2"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      sources."is-typed-array-1.1.4"
+      (sources."is-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."isarray-2.0.5"
@@ -96300,7 +96499,7 @@ in
       sources."pkginfo-0.4.1"
       sources."prompt-0.2.14"
       sources."read-1.0.7"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.7.1"
       sources."semver-5.7.1"
@@ -96313,7 +96512,11 @@ in
       sources."utile-0.2.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      sources."which-typed-array-1.1.4"
+      (sources."which-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       (sources."winston-0.8.3" // {
         dependencies = [
           sources."pkginfo-0.3.1"
@@ -96378,7 +96581,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A set of complementary tools to React, including the JSX transformer.";
-      homepage = "https://facebook.github.io/react";
+      homepage = https://facebook.github.io/react;
       license = "BSD-3-Clause";
     };
     production = true;
@@ -96492,7 +96695,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."w3c-hr-time-1.0.2"
@@ -96549,7 +96752,7 @@ in
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.3"
       sources."@redocly/react-dropdown-aria-2.0.11"
-      sources."@types/node-13.13.40"
+      sources."@types/node-13.13.39"
       sources."ajv-5.5.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -96569,7 +96772,7 @@ in
       sources."babel-plugin-syntax-jsx-6.18.0"
       sources."base64-js-1.5.1"
       sources."better-ajv-errors-0.6.7"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bn.js-5.1.3"
       sources."braces-3.0.2"
       sources."brorand-1.1.0"
@@ -96595,7 +96798,7 @@ in
       sources."camelcase-5.3.1"
       sources."camelize-1.0.0"
       sources."chalk-2.4.2"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."cipher-base-1.0.4"
       sources."classnames-2.2.6"
       sources."clipboard-2.0.6"
@@ -96607,7 +96810,7 @@ in
       sources."color-name-1.1.3"
       sources."console-browserify-1.2.0"
       sources."constants-browserify-1.0.0"
-      sources."core-js-3.8.3"
+      sources."core-js-3.8.2"
       sources."core-util-is-1.0.2"
       (sources."create-ecdh-4.0.4" // {
         dependencies = [
@@ -96651,7 +96854,7 @@ in
       sources."find-up-4.1.0"
       sources."foreach-2.0.5"
       sources."format-util-1.0.5"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."get-caller-file-2.0.5"
       sources."glob-parent-5.1.1"
       sources."globals-11.12.0"
@@ -96806,9 +97009,9 @@ in
       sources."to-arraybuffer-1.0.1"
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
-      sources."tslib-2.1.0"
+      sources."tslib-2.0.3"
       sources."tty-browserify-0.0.0"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
@@ -96868,7 +97071,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The HTML Presentation Framework";
-      homepage = "https://revealjs.com";
+      homepage = https://revealjs.com/;
       license = "MIT";
     };
     production = true;
@@ -96878,10 +97081,10 @@ in
   rollup = nodeEnv.buildNodePackage {
     name = "rollup";
     packageName = "rollup";
-    version = "2.37.1";
+    version = "2.36.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rollup/-/rollup-2.37.1.tgz";
-      sha512 = "V3ojEeyGeSdrMSuhP3diBb06P+qV4gKQeanbDv+Qh/BZbhdZ7kHV0xAt8Yjk4GFshq/WjO7R4c7DFM20AwTFVQ==";
+      url = "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz";
+      sha512 = "L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==";
     };
     dependencies = [
       sources."fsevents-2.1.3"
@@ -96889,7 +97092,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Next-generation ES module bundler";
-      homepage = "https://rollupjs.org/";
+      homepage = https://rollupjs.org/;
       license = "MIT";
     };
     production = true;
@@ -96909,7 +97112,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      (sources."@eslint/eslintrc-0.3.0" // {
+      (sources."@eslint/eslintrc-0.2.2" // {
         dependencies = [
           sources."ignore-4.0.6"
         ];
@@ -96918,7 +97121,7 @@ in
       sources."@nodelib/fs.stat-2.0.4"
       sources."@nodelib/fs.walk-1.2.6"
       sources."@rollup/plugin-commonjs-17.0.0"
-      sources."@rollup/plugin-node-resolve-11.1.0"
+      sources."@rollup/plugin-node-resolve-11.0.1"
       (sources."@rollup/pluginutils-3.1.0" // {
         dependencies = [
           sources."estree-walker-1.0.1"
@@ -96926,20 +97129,20 @@ in
       })
       sources."@types/estree-0.0.39"
       sources."@types/glob-7.1.3"
-      sources."@types/json-schema-7.0.7"
+      sources."@types/json-schema-7.0.6"
       sources."@types/minimatch-3.0.3"
       sources."@types/mocha-8.2.0"
       sources."@types/node-12.12.70"
-      sources."@types/node-fetch-2.5.8"
+      sources."@types/node-fetch-2.5.7"
       sources."@types/resolve-1.17.1"
       sources."@types/vscode-1.52.0"
-      sources."@typescript-eslint/eslint-plugin-4.14.0"
-      sources."@typescript-eslint/experimental-utils-4.14.0"
-      sources."@typescript-eslint/parser-4.14.0"
-      sources."@typescript-eslint/scope-manager-4.14.0"
-      sources."@typescript-eslint/types-4.14.0"
-      sources."@typescript-eslint/typescript-estree-4.14.0"
-      sources."@typescript-eslint/visitor-keys-4.14.0"
+      sources."@typescript-eslint/eslint-plugin-4.12.0"
+      sources."@typescript-eslint/experimental-utils-4.12.0"
+      sources."@typescript-eslint/parser-4.12.0"
+      sources."@typescript-eslint/scope-manager-4.12.0"
+      sources."@typescript-eslint/types-4.12.0"
+      sources."@typescript-eslint/typescript-estree-4.12.0"
+      sources."@typescript-eslint/visitor-keys-4.12.0"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
@@ -96955,7 +97158,7 @@ in
       sources."asynckit-0.4.0"
       sources."azure-devops-node-api-7.2.0"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."boolbase-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -97021,7 +97224,7 @@ in
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.18.0" // {
+      (sources."eslint-7.17.0" // {
         dependencies = [
           sources."ignore-4.0.6"
         ];
@@ -97053,7 +97256,7 @@ in
       sources."estree-walker-2.0.2"
       sources."esutils-2.0.3"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fastq-1.10.0"
@@ -97063,7 +97266,7 @@ in
       sources."find-up-5.0.0"
       sources."flat-5.0.2"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.1"
+      sources."flatted-3.1.0"
       sources."form-data-3.0.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
@@ -97073,7 +97276,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."globals-12.4.0"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       sources."growl-1.10.5"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -97184,7 +97387,7 @@ in
       sources."resolve-from-4.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."rollup-2.37.1"
+      sources."rollup-2.36.0"
       sources."run-parallel-1.1.10"
       sources."safe-buffer-5.2.1"
       sources."semver-7.3.4"
@@ -97216,8 +97419,8 @@ in
       sources."text-table-0.2.0"
       sources."tmp-0.0.29"
       sources."to-regex-range-5.0.1"
-      sources."tslib-2.1.0"
-      (sources."tsutils-3.19.1" // {
+      sources."tslib-2.0.3"
+      (sources."tsutils-3.18.0" // {
         dependencies = [
           sources."tslib-1.14.1"
         ];
@@ -97230,10 +97433,10 @@ in
       sources."typescript-formatter-7.2.2"
       sources."uc.micro-1.0.6"
       sources."underscore-1.8.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-join-1.1.0"
       sources."v8-compile-cache-2.2.0"
-      (sources."vsce-1.84.0" // {
+      (sources."vsce-1.83.0" // {
         dependencies = [
           sources."chalk-2.4.2"
           sources."commander-6.2.1"
@@ -97423,7 +97626,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uid2-0.0.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-0.4.9"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -97440,18 +97643,18 @@ in
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";
-    version = "1.32.5";
+    version = "1.32.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sass/-/sass-1.32.5.tgz";
-      sha512 = "kU1yJ5zUAmPxr7f3q0YXTAd1oZjSR1g3tYyv+xu0HZSl5JiNOaE987eiz7wCUvbm4I9fGWGU2TgApTtcP4GMNQ==";
+      url = "https://registry.npmjs.org/sass/-/sass-1.32.0.tgz";
+      sha512 = "fhyqEbMIycQA4blrz/C0pYhv2o4x2y6FYYAH0CshBw3DXh5D5wyERgxw0ptdau1orc/GhNrhF7DFN2etyOCEng==";
     };
     dependencies = [
       sources."anymatch-3.1.1"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."braces-3.0.2"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."fill-range-7.0.1"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."glob-parent-5.1.1"
       sources."is-binary-path-2.1.0"
       sources."is-extglob-2.1.1"
@@ -97465,7 +97668,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A pure JavaScript implementation of Sass.";
-      homepage = "https://github.com/sass/dart-sass";
+      homepage = https://github.com/sass/dart-sass;
       license = "MIT";
     };
     production = true;
@@ -97584,7 +97787,7 @@ in
       sources."supports-color-5.5.0"
       sources."term-size-1.2.0"
       sources."update-check-1.5.2"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."vary-1.1.2"
       sources."which-1.3.1"
       sources."widest-line-2.0.1"
@@ -97603,10 +97806,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.20.0";
+    version = "2.17.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.20.0.tgz";
-      sha512 = "Uc+L9SBZCvV13WURF3UCOpzqW6QOoiPw02M6i3FAOBT7GHkcdLL5zztEKt7gedFQa/bIwk2MtnjMWonK/r59iw==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.17.0.tgz";
+      sha512 = "OVlrvBESW0aQB3G/SrZQ3WFmALhHRU9qUJ/LLoyFlpddAY4hr0APOixWehiHvf4aI7Vuo04lP9zffttjhviOPA==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -97638,10 +97841,9 @@ in
         ];
       })
       sources."@serverless/component-metrics-1.0.8"
-      (sources."@serverless/components-3.5.1" // {
+      (sources."@serverless/components-3.4.3" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."js-yaml-3.14.1"
           sources."ramda-0.27.1"
           sources."strip-ansi-6.0.0"
         ];
@@ -97649,27 +97851,13 @@ in
       (sources."@serverless/core-1.1.2" // {
         dependencies = [
           sources."fs-extra-7.0.1"
-          sources."js-yaml-3.14.1"
           sources."semver-6.3.0"
         ];
       })
-      (sources."@serverless/enterprise-plugin-4.4.2" // {
-        dependencies = [
-          sources."js-yaml-3.14.1"
-        ];
-      })
+      sources."@serverless/enterprise-plugin-4.4.1"
       sources."@serverless/event-mocks-1.1.1"
-      (sources."@serverless/platform-client-3.8.1" // {
-        dependencies = [
-          sources."js-yaml-3.14.1"
-        ];
-      })
-      (sources."@serverless/platform-client-china-2.1.1" // {
-        dependencies = [
-          sources."adm-zip-0.5.1"
-          sources."js-yaml-3.14.1"
-        ];
-      })
+      sources."@serverless/platform-client-3.1.4"
+      sources."@serverless/platform-client-china-2.0.9"
       (sources."@serverless/platform-sdk-2.3.2" // {
         dependencies = [
           sources."chalk-2.4.2"
@@ -97685,10 +97873,12 @@ in
       sources."@serverless/template-1.1.4"
       (sources."@serverless/utils-2.2.0" // {
         dependencies = [
+          sources."argparse-2.0.1"
+          sources."js-yaml-4.0.0"
           sources."write-file-atomic-3.0.3"
         ];
       })
-      sources."@serverless/utils-china-1.0.14"
+      sources."@serverless/utils-china-1.0.12"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tencent-sdk/capi-1.1.8"
@@ -97696,9 +97886,9 @@ in
       sources."@types/caseless-0.12.2"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/lodash-4.14.168"
+      sources."@types/lodash-4.14.167"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -97725,7 +97915,7 @@ in
           sources."file-type-4.4.0"
         ];
       })
-      (sources."archiver-5.2.0" // {
+      (sources."archiver-5.1.0" // {
         dependencies = [
           sources."async-3.2.0"
           sources."bl-4.0.3"
@@ -97755,7 +97945,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.830.0" // {
+      (sources."aws-sdk-2.821.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -97764,14 +97954,14 @@ in
       })
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
-      sources."axios-0.21.1"
+      sources."axios-0.19.2"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
       (sources."bl-2.2.1" // {
         dependencies = [
@@ -97789,13 +97979,19 @@ in
       })
       sources."blob-0.0.5"
       sources."bluebird-3.7.2"
-      (sources."boxen-5.0.0" // {
+      (sources."boxen-4.2.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
+          sources."ansi-styles-4.3.0"
+          sources."chalk-3.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
           sources."is-fullwidth-code-point-3.0.0"
           sources."string-width-4.2.0"
           sources."strip-ansi-6.0.0"
-          sources."type-fest-0.20.2"
+          sources."supports-color-7.2.0"
+          sources."type-fest-0.8.1"
         ];
       })
       sources."brace-expansion-1.1.11"
@@ -97817,7 +98013,7 @@ in
         ];
       })
       sources."cachedir-2.3.0"
-      sources."camelcase-6.2.0"
+      sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       (sources."chainsaw-0.1.0" // {
         dependencies = [
@@ -97835,7 +98031,7 @@ in
       })
       sources."chardet-0.7.0"
       sources."child-process-ext-2.1.1"
-      sources."chokidar-3.5.1"
+      sources."chokidar-3.4.3"
       sources."chownr-1.1.4"
       sources."cli-boxes-2.2.1"
       (sources."cli-color-2.0.0" // {
@@ -97882,8 +98078,8 @@ in
         ];
       })
       sources."dashdash-1.14.1"
-      sources."dayjs-1.10.3"
-      sources."debug-2.6.9"
+      sources."dayjs-1.10.1"
+      sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
       sources."decompress-4.2.1"
       sources."decompress-response-3.3.0"
@@ -97945,11 +98141,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."enabled-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."engine.io-client-3.5.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
+      sources."engine.io-client-3.5.0"
       sources."engine.io-parser-2.2.1"
       sources."env-variable-0.0.6"
       sources."es5-ext-0.10.53"
@@ -97977,7 +98169,7 @@ in
       sources."external-editor-3.1.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fastest-levenshtein-1.0.12"
@@ -97993,7 +98185,7 @@ in
       sources."fill-range-7.0.1"
       sources."find-requires-1.0.0"
       sources."flat-5.0.2"
-      sources."follow-redirects-1.13.1"
+      sources."follow-redirects-1.5.10"
       sources."forever-agent-0.6.1"
       sources."form-data-2.5.1"
       sources."formidable-1.2.2"
@@ -98005,16 +98197,20 @@ in
         ];
       })
       sources."fs-constants-1.0.0"
-      (sources."fs-extra-9.1.0" // {
+      (sources."fs-extra-9.0.1" // {
         dependencies = [
-          sources."jsonfile-6.1.0"
-          sources."universalify-2.0.0"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
+          sources."universalify-1.0.0"
         ];
       })
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."fs2-0.3.9"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       (sources."gauge-2.7.4" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -98027,7 +98223,7 @@ in
       sources."github-from-package-0.0.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       (sources."got-11.8.1" // {
         dependencies = [
           sources."@sindresorhus/is-4.0.0"
@@ -98108,18 +98304,13 @@ in
       sources."isstream-0.1.2"
       sources."isurl-1.0.0"
       sources."jmespath-0.15.0"
-      (sources."js-yaml-4.0.0" // {
-        dependencies = [
-          sources."argparse-2.0.1"
-        ];
-      })
+      sources."js-yaml-3.14.1"
       sources."jsbn-0.1.1"
       sources."json-buffer-3.0.0"
       sources."json-cycle-1.3.0"
       (sources."json-refs-3.0.15" // {
         dependencies = [
           sources."commander-4.1.1"
-          sources."js-yaml-3.14.1"
         ];
       })
       sources."json-schema-0.2.3"
@@ -98137,6 +98328,7 @@ in
       sources."jwt-decode-2.2.0"
       (sources."kafka-node-5.0.0" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."uuid-3.4.0"
         ];
       })
@@ -98175,11 +98367,7 @@ in
           sources."pify-3.0.0"
         ];
       })
-      (sources."memoizee-0.4.15" // {
-        dependencies = [
-          sources."next-tick-1.1.0"
-        ];
-      })
+      sources."memoizee-0.4.14"
       sources."merge2-1.4.1"
       sources."methods-1.1.2"
       sources."micromatch-4.0.2"
@@ -98222,7 +98410,7 @@ in
       sources."once-1.4.0"
       sources."one-time-0.0.4"
       sources."onetime-5.1.2"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       (sources."opn-5.5.0" // {
         dependencies = [
           sources."is-wsl-1.1.0"
@@ -98268,7 +98456,7 @@ in
       sources."promise-queue-2.2.5"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.40"
+          sources."@types/node-13.13.39"
           sources."long-4.0.0"
         ];
       })
@@ -98304,7 +98492,6 @@ in
       sources."reusify-1.0.4"
       sources."run-async-2.4.1"
       sources."run-parallel-1.1.10"
-      sources."run-parallel-limit-1.0.6"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
@@ -98328,14 +98515,9 @@ in
       sources."simple-swizzle-0.2.2"
       sources."slash-3.0.0"
       sources."snappy-6.3.5"
-      (sources."socket.io-client-2.4.0" // {
+      sources."socket.io-client-2.4.0"
+      (sources."socket.io-parser-3.3.1" // {
         dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
-      (sources."socket.io-parser-3.3.2" // {
-        dependencies = [
-          sources."debug-3.1.0"
           sources."isarray-2.0.1"
         ];
       })
@@ -98365,8 +98547,6 @@ in
       sources."strip-outer-1.0.1"
       (sources."superagent-3.8.3" // {
         dependencies = [
-          sources."debug-3.2.7"
-          sources."ms-2.1.3"
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
@@ -98394,7 +98574,7 @@ in
           sources."untildify-3.0.3"
         ];
       })
-      (sources."tar-6.1.0" // {
+      (sources."tar-6.0.5" // {
         dependencies = [
           sources."chownr-2.0.0"
           sources."mkdirp-1.0.4"
@@ -98413,6 +98593,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
+      sources."term-size-2.2.1"
       sources."text-hex-1.0.0"
       sources."throat-5.0.0"
       sources."through-2.3.8"
@@ -98436,7 +98617,7 @@ in
       sources."unbzip2-stream-1.4.3"
       sources."universalify-0.1.2"
       sources."untildify-4.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       (sources."url-0.10.3" // {
         dependencies = [
           sources."punycode-1.3.2"
@@ -98467,17 +98648,6 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      (sources."wrap-ansi-7.0.0" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
-        ];
-      })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
       sources."ws-7.4.2"
@@ -98497,7 +98667,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more";
-      homepage = "https://serverless.com/framework/docs/";
+      homepage = https://serverless.com/framework/docs/;
       license = "MIT";
     };
     production = true;
@@ -98713,7 +98883,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."utf8-2.0.0"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -99142,10 +99312,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.439.0";
+    version = "1.437.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.439.0.tgz";
-      sha512 = "VHai1FZxbQEH3CKBgJo76FBF5MuLnAVyg4lXxRCOBLOW2vCK8kCZnaMMwvlOCubYCAdnzUOE34qCwJi/zG5RWw==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.437.3.tgz";
+      sha512 = "DFcYz8Q8LT/XNCNxaeEoGahazvkEhWS//JWJTfr6W1d5jMnORQauPxxj4RR3WGjKewSDl2eElwK1jhi5RNOP9g==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -99159,7 +99329,7 @@ in
       sources."@snyk/dep-graph-1.21.0"
       sources."@snyk/docker-registry-v2-client-1.13.9"
       sources."@snyk/gemfile-1.2.0"
-      (sources."@snyk/java-call-graph-builder-1.19.0" // {
+      (sources."@snyk/java-call-graph-builder-1.18.0" // {
         dependencies = [
           sources."rimraf-3.0.2"
           sources."tmp-0.2.1"
@@ -99168,7 +99338,7 @@ in
       sources."@snyk/rpm-parser-2.2.1"
       (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."@snyk/snyk-docker-pull-3.2.3" // {
@@ -99182,9 +99352,9 @@ in
       sources."@types/graphlib-2.1.7"
       sources."@types/hosted-git-info-2.7.0"
       sources."@types/http-cache-semantics-4.0.0"
-      sources."@types/js-yaml-3.12.6"
+      sources."@types/js-yaml-3.12.5"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -99207,7 +99377,7 @@ in
       sources."asn1-0.2.4"
       (sources."ast-types-0.14.2" // {
         dependencies = [
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."async-3.2.0"
@@ -99446,7 +99616,7 @@ in
       sources."object-hash-2.1.1"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."optionator-0.8.3"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
@@ -99486,7 +99656,6 @@ in
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
       sources."promise-7.3.1"
-      sources."promise-queue-2.2.5"
       sources."proxy-agent-3.1.1"
       sources."proxy-from-env-1.1.0"
       sources."pseudomap-1.0.2"
@@ -99534,7 +99703,7 @@ in
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."snyk-docker-plugin-4.13.1" // {
@@ -99551,7 +99720,7 @@ in
           sources."tmp-0.2.1"
         ];
       })
-      (sources."snyk-gradle-plugin-3.12.0" // {
+      (sources."snyk-gradle-plugin-3.11.0" // {
         dependencies = [
           (sources."@snyk/cli-interface-2.9.1" // {
             dependencies = [
@@ -99567,7 +99736,7 @@ in
           sources."rimraf-3.0.2"
           sources."supports-color-7.2.0"
           sources."tmp-0.2.1"
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       sources."snyk-module-3.1.0"
@@ -99610,14 +99779,9 @@ in
           sources."tslib-1.11.1"
         ];
       })
-      (sources."snyk-poetry-lockfile-parser-1.1.2" // {
+      (sources."snyk-poetry-lockfile-parser-1.1.1" // {
         dependencies = [
-          (sources."@snyk/dep-graph-1.23.0" // {
-            dependencies = [
-              sources."tslib-1.14.1"
-            ];
-          })
-          sources."tslib-2.1.0"
+          sources."tslib-2.0.3"
         ];
       })
       (sources."snyk-policy-1.14.1" // {
@@ -99631,7 +99795,7 @@ in
           })
         ];
       })
-      sources."snyk-python-plugin-1.19.2"
+      sources."snyk-python-plugin-1.19.1"
       (sources."snyk-resolve-1.0.1" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -99770,16 +99934,16 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "3.1.0";
+    version = "3.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz";
-      sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz";
+      sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
     };
     dependencies = [
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."accepts-1.3.7"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
@@ -99787,15 +99951,15 @@ in
       sources."cookie-0.4.1"
       sources."cors-2.8.5"
       sources."debug-4.3.2"
-      sources."engine.io-4.1.0"
+      sources."engine.io-4.0.6"
       sources."engine.io-parser-4.0.2"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."ms-2.1.2"
       sources."negotiator-0.6.2"
       sources."object-assign-4.1.1"
-      sources."socket.io-adapter-2.1.0"
-      sources."socket.io-parser-4.0.4"
+      sources."socket.io-adapter-2.0.3"
+      sources."socket.io-parser-4.0.3"
       sources."vary-1.1.2"
       sources."ws-7.4.2"
     ];
@@ -100041,7 +100205,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-2.1.1"
       sources."ccount-1.1.0"
       sources."chalk-1.1.3"
@@ -100129,11 +100293,7 @@ in
       })
       sources."epidemic-broadcast-trees-7.0.0"
       sources."errno-0.1.8"
-      (sources."es-abstract-1.18.0-next.2" // {
-        dependencies = [
-          sources."object-inspect-1.9.0"
-        ];
-      })
+      sources."es-abstract-1.17.7"
       (sources."es-get-iterator-1.1.1" // {
         dependencies = [
           sources."isarray-2.0.5"
@@ -100182,7 +100342,7 @@ in
           sources."mkdirp-1.0.4"
         ];
       })
-      (sources."flumeview-reduce-1.4.0" // {
+      (sources."flumeview-reduce-1.3.17" // {
         dependencies = [
           (sources."atomic-file-2.1.1" // {
             dependencies = [
@@ -100289,7 +100449,11 @@ in
       sources."is-set-2.0.2"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      sources."is-typed-array-1.1.4"
+      (sources."is-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."is-typedarray-1.0.0"
       sources."is-valid-domain-0.0.17"
       sources."is-weakmap-2.0.1"
@@ -100397,7 +100561,7 @@ in
           })
         ];
       })
-      sources."object-inspect-1.7.0"
+      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       (sources."object-visit-1.0.1" // {
@@ -100415,7 +100579,7 @@ in
       sources."observ-0.2.0"
       sources."observ-debounce-1.1.1"
       sources."obv-0.0.1"
-      sources."obz-1.0.3"
+      sources."obz-1.0.2"
       sources."on-change-network-0.0.2"
       sources."on-wakeup-1.0.1"
       sources."once-1.4.0"
@@ -100564,7 +100728,7 @@ in
       })
       sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."relative-url-1.0.2"
       (sources."remark-3.2.3" // {
         dependencies = [
@@ -100604,11 +100768,7 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."shellsubstitute-1.2.0"
-      (sources."side-channel-1.0.4" // {
-        dependencies = [
-          sources."object-inspect-1.9.0"
-        ];
-      })
+      sources."side-channel-1.0.4"
       sources."smart-buffer-4.1.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -100713,7 +100873,11 @@ in
         ];
       })
       sources."string-width-1.0.2"
-      sources."string.prototype.trim-1.2.3"
+      (sources."string.prototype.trim-1.2.3" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
@@ -100725,6 +100889,7 @@ in
         dependencies = [
           sources."glob-7.1.6"
           sources."is-regex-1.0.5"
+          sources."object-inspect-1.7.0"
         ];
       })
       sources."text-table-0.2.0"
@@ -100781,7 +100946,11 @@ in
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
-      sources."which-typed-array-1.1.4"
+      (sources."which-typed-array-1.1.4" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."word-wrap-1.2.3"
       sources."wrap-fn-0.1.5"
       sources."wrappy-1.0.2"
@@ -100792,7 +100961,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "network protocol layer for secure-scuttlebutt";
-      homepage = "https://github.com/ssbc/ssb-server";
+      homepage = https://github.com/ssbc/ssb-server;
       license = "MIT";
     };
     production = true;
@@ -100810,7 +100979,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Send metric data from statsd to Stackdriver";
-      homepage = "https://www.stackdriver.com";
+      homepage = https://www.stackdriver.com/;
       license = "MIT";
     };
     production = true;
@@ -100885,7 +101054,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.830.0" // {
+      (sources."aws-sdk-2.821.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -100925,7 +101094,7 @@ in
       sources."buffer-from-1.1.1"
       sources."bufferutil-1.3.0"
       sources."bufferview-1.0.1"
-      sources."bunyan-1.8.15"
+      sources."bunyan-1.8.14"
       sources."busboy-0.2.14"
       sources."bytebuffer-3.5.5"
       sources."bytes-3.1.0"
@@ -101411,7 +101580,7 @@ in
       sources."signal-exit-3.0.3"
       sources."slash-1.0.0"
       sources."sntp-1.0.9"
-      (sources."socket.io-2.4.1" // {
+      (sources."socket.io-2.4.0" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -101422,7 +101591,7 @@ in
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
           sources."ms-2.0.0"
-          sources."socket.io-parser-3.3.2"
+          sources."socket.io-parser-3.3.1"
         ];
       })
       (sources."socket.io-parser-3.4.1" // {
@@ -101473,7 +101642,7 @@ in
         dependencies = [
           sources."debug-3.2.7"
           sources."form-data-2.5.1"
-          sources."qs-6.9.6"
+          sources."qs-6.9.4"
           sources."readable-stream-2.3.7"
           sources."string_decoder-1.1.1"
         ];
@@ -101486,7 +101655,7 @@ in
           sources."esprima-4.0.1"
           sources."js-yaml-3.14.1"
           sources."lodash-3.10.1"
-          sources."qs-6.9.6"
+          sources."qs-6.9.4"
         ];
       })
       sources."swagger-schema-official-2.0.0-bab6bed"
@@ -101536,7 +101705,7 @@ in
       sources."uid2-0.0.3"
       sources."ultron-1.0.2"
       sources."unpipe-1.0.0"
-      (sources."uri-js-4.4.1" // {
+      (sources."uri-js-4.4.0" // {
         dependencies = [
           sources."punycode-2.1.1"
         ];
@@ -101651,10 +101820,10 @@ in
   stylelint = nodeEnv.buildNodePackage {
     name = "stylelint";
     packageName = "stylelint";
-    version = "13.9.0";
+    version = "13.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz";
-      sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg==";
+      url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz";
+      sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -101701,11 +101870,11 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.16.0"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -101743,7 +101912,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.642"
+      sources."electron-to-chromium-1.3.634"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -101752,14 +101921,14 @@ in
       sources."execall-2.0.0"
       sources."extend-3.0.2"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fastest-levenshtein-1.0.12"
       sources."fastq-1.10.0"
       sources."file-entry-cache-6.0.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."flat-cache-3.0.4"
-      sources."flatted-3.1.1"
+      sources."flatted-3.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
@@ -101769,7 +101938,7 @@ in
       sources."global-modules-2.0.0"
       sources."global-prefix-3.0.0"
       sources."globals-11.12.0"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       sources."globjoin-0.1.4"
       sources."gonzales-pe-4.3.0"
       sources."hard-rejection-2.1.0"
@@ -101824,7 +101993,7 @@ in
       sources."mdast-util-from-markdown-0.8.4"
       sources."mdast-util-to-markdown-0.6.2"
       sources."mdast-util-to-string-2.0.0"
-      sources."meow-9.0.0"
+      sources."meow-8.1.0"
       sources."merge2-1.4.1"
       sources."micromark-2.11.2"
       sources."micromatch-4.0.2"
@@ -101837,7 +102006,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       (sources."normalize-package-data-3.0.0" // {
         dependencies = [
           sources."semver-7.3.4"
@@ -101852,7 +102021,7 @@ in
       sources."p-try-2.2.0"
       sources."parent-module-1.0.1"
       sources."parse-entities-2.0.0"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -101946,7 +102115,7 @@ in
       sources."unist-util-find-all-after-3.0.2"
       sources."unist-util-is-4.0.4"
       sources."unist-util-stringify-position-2.0.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
@@ -101963,7 +102132,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A mighty, modern CSS linter.";
-      homepage = "https://stylelint.io";
+      homepage = https://stylelint.io/;
       license = "MIT";
     };
     production = true;
@@ -101983,7 +102152,7 @@ in
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
       sources."boolbase-1.0.0"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."chalk-2.4.2"
       sources."coa-2.0.2"
       sources."color-convert-1.9.3"
@@ -102007,7 +102176,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domutils-1.7.0"
       sources."entities-2.1.0"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -102049,7 +102218,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Nodejs-based tool for optimizing SVG vector graphics files";
-      homepage = "https://github.com/svg/svgo";
+      homepage = https://github.com/svg/svgo;
       license = "MIT";
     };
     production = true;
@@ -102451,7 +102620,7 @@ in
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
-          sources."qs-6.9.6"
+          sources."qs-6.9.4"
           sources."superagent-3.8.3"
         ];
       })
@@ -102628,7 +102797,7 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       sources."undefsafe-2.0.3"
       (sources."union-value-1.0.1" // {
         dependencies = [
@@ -102748,7 +102917,7 @@ in
       sources."jsprim-1.4.1"
       sources."locate-path-3.0.0"
       sources."long-4.0.0"
-      sources."mime-2.5.0"
+      sources."mime-2.4.7"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."minimist-1.2.5"
@@ -102789,7 +102958,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-1.0.3"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."which-module-2.0.0"
@@ -102892,7 +103061,7 @@ in
       sources."boundary-1.0.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       (sources."chalk-1.1.3" // {
         dependencies = [
           sources."strip-ansi-3.0.1"
@@ -102915,6 +103084,8 @@ in
       sources."define-properties-1.1.3"
       sources."diff-4.0.2"
       sources."error-ex-1.3.2"
+      sources."es-abstract-1.17.7"
+      sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
@@ -102942,6 +103113,7 @@ in
       sources."is-arguments-1.1.0"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.2.2"
       sources."is-core-module-2.2.0"
       sources."is-date-object-1.0.2"
       sources."is-decimal-1.0.4"
@@ -102950,6 +103122,7 @@ in
       sources."is-hexadecimal-1.0.4"
       sources."is-plain-obj-1.1.0"
       sources."is-regex-1.1.1"
+      sources."is-symbol-1.0.3"
       sources."is-utf8-0.2.1"
       sources."is-whitespace-character-1.0.4"
       sources."is-word-character-1.0.4"
@@ -102973,8 +103146,10 @@ in
       sources."ms-2.1.2"
       sources."normalize-package-data-2.5.0"
       sources."number-is-nan-1.0.1"
+      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."optionator-0.9.1"
       sources."p-limit-1.3.0"
@@ -103006,7 +103181,7 @@ in
         ];
       })
       sources."readable-stream-2.3.7"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."remark-frontmatter-1.3.3"
       sources."remark-parse-5.0.0"
       sources."repeat-string-1.6.1"
@@ -103028,6 +103203,8 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       (sources."strip-ansi-6.0.0" // {
         dependencies = [
@@ -103076,7 +103253,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The pluggable linting tool for text and markdown.";
-      homepage = "https://github.com/textlint/textlint/";
+      homepage = https://github.com/textlint/textlint/;
       license = "MIT";
     };
     production = true;
@@ -103098,7 +103275,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Latex plugin for [textlint](https://github.com/textlint/textlint &#34;textlint&#34;).";
-      homepage = "https://github.com/elzup/textlint-plugin-latex";
+      homepage = https://github.com/elzup/textlint-plugin-latex;
       license = "MIT";
     };
     production = true;
@@ -103114,20 +103291,30 @@ in
       sha1 = "8d49dd02b3a7a88d7e6b32817f9e202c5c6596b9";
     };
     dependencies = [
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."define-properties-1.1.3"
+      sources."es-abstract-1.17.7"
+      sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.0.2"
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
+      sources."is-callable-1.2.2"
+      sources."is-date-object-1.0.2"
+      sources."is-regex-1.1.1"
+      sources."is-symbol-1.0.3"
       sources."match-index-1.0.3"
+      sources."object-inspect-1.9.0"
       sources."object-keys-1.1.1"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."object.assign-4.1.2"
+      sources."regexp.prototype.flags-1.3.0"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule check that abbreviations within parentheses.";
-      homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses";
+      homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses;
       license = "MIT";
     };
     production = true;
@@ -103366,7 +103553,7 @@ in
       })
       sources."parse-english-4.2.0"
       sources."parse-entities-2.0.0"
-      sources."parse-json-5.2.0"
+      sources."parse-json-5.1.0"
       sources."parse-latin-4.3.0"
       sources."parse5-6.0.1"
       sources."path-exists-4.0.0"
@@ -103542,7 +103729,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule for alex";
-      homepage = "https://github.com/textlint-rule/textlint-rule-alex";
+      homepage = https://github.com/textlint-rule/textlint-rule-alex;
       license = "MIT";
     };
     production = true;
@@ -103567,7 +103754,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule to check common misspellings";
-      homepage = "https://github.com/io-monad/textlint-rule-common-misspellings";
+      homepage = https://github.com/io-monad/textlint-rule-common-misspellings;
       license = "GPL-3.0";
     };
     production = true;
@@ -103589,7 +103776,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Textlint rule to check correct usage of diacritics";
-      homepage = "https://github.com/sapegin/textlint-rule-diacritics";
+      homepage = https://github.com/sapegin/textlint-rule-diacritics;
       license = "MIT";
     };
     production = true;
@@ -103626,7 +103813,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule that specify the maximum word count of a sentence.";
-      homepage = "https://github.com/azu/textlint-rule-en-max-word-count";
+      homepage = https://github.com/azu/textlint-rule-en-max-word-count;
       license = "MIT";
     };
     production = true;
@@ -103683,10 +103870,10 @@ in
       sources."@textlint/types-1.4.6"
       sources."boundary-1.0.1"
       sources."buffer-from-1.1.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."concat-stream-2.0.0"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.0.2"
@@ -103720,7 +103907,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule that check no start with duplicated conjunction.";
-      homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction";
+      homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction;
       license = "MIT";
     };
     production = true;
@@ -103737,7 +103924,7 @@ in
     };
     dependencies = [
       sources."array.prototype.find-2.1.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."check-ends-with-period-1.0.1"
       sources."define-properties-1.1.3"
       sources."emoji-regex-6.5.1"
@@ -103761,7 +103948,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule that check with or without period in list item.";
-      homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item";
+      homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item;
       license = "MIT";
     };
     production = true;
@@ -103771,10 +103958,10 @@ in
   textlint-rule-stop-words = nodeEnv.buildNodePackage {
     name = "textlint-rule-stop-words";
     packageName = "textlint-rule-stop-words";
-    version = "2.0.9";
+    version = "2.0.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.9.tgz";
-      sha512 = "UW7nWrqBUHfz/sRLTFo40BNjwXOiXSHg00TJuYY4GVDQtsWRLyAsOnXSBqClP4i6wl7ejMBeYmB5mfllYAYMgA==";
+      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.8.tgz";
+      sha512 = "D945uyFkeMo6KJhMJaFTEHudP+Jkl00rLOQKRibV1zl933muR6NXqz+uXAvitPAEWH20kwQA40E0Cd1t8nJQ1w==";
     };
     dependencies = [
       sources."@textlint/ast-node-types-4.3.5"
@@ -103791,7 +103978,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Textlint rule to find filler words, buzzwords and chiches";
-      homepage = "https://github.com/sapegin/textlint-rule-stop-words";
+      homepage = https://github.com/sapegin/textlint-rule-stop-words;
       license = "MIT";
     };
     production = true;
@@ -103801,10 +103988,10 @@ in
   textlint-rule-terminology = nodeEnv.buildNodePackage {
     name = "textlint-rule-terminology";
     packageName = "textlint-rule-terminology";
-    version = "2.1.5";
+    version = "2.1.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.5.tgz";
-      sha512 = "VW+ea4ByLPddSUqoFkVVJF8zWnO8kqKwvC681wGFAjI4CYz9WhjEQH1ikhoEHXnd5AFXNArcjyoa8hoihrXy0w==";
+      url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.4.tgz";
+      sha512 = "kLw4qL8RwY2lCNqgKveHc5sjCDlS5Tdw2TXWOrHvSvQxqaVOwsv3+51oMIQLGfJzQrhFSMlSlw5MvfaOerBvPQ==";
     };
     dependencies = [
       sources."@textlint/ast-node-types-4.3.5"
@@ -103821,7 +104008,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "TextLint rule to check correct terms spelling";
-      homepage = "https://github.com/sapegin/textlint-rule-terminology";
+      homepage = https://github.com/sapegin/textlint-rule-terminology;
       license = "MIT";
     };
     production = true;
@@ -103838,9 +104025,9 @@ in
     };
     dependencies = [
       sources."array-includes-3.1.2"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.18.0-next.2"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.0.2"
@@ -103862,7 +104049,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule that check unexpanded acronym word.";
-      homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym";
+      homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym;
       license = "MIT";
     };
     production = true;
@@ -103882,7 +104069,7 @@ in
       sources."@textlint/types-1.4.6"
       sources."adverb-where-0.0.9"
       sources."boundary-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."define-properties-1.1.3"
       sources."e-prime-0.10.4"
       sources."function-bind-1.1.1"
@@ -103905,7 +104092,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "textlint rule to check your English style with write good";
-      homepage = "https://github.com/textlint-rule/textlint-rule-write-good";
+      homepage = https://github.com/textlint-rule/textlint-rule-write-good;
       license = "MIT";
     };
     production = true;
@@ -103928,7 +104115,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -104004,7 +104191,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-3.8.3"
+      sources."core-js-3.8.2"
       sources."core-util-is-1.0.2"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
@@ -104159,7 +104346,7 @@ in
       sources."mkdirp-0.5.5"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
-      (sources."needle-2.6.0" // {
+      (sources."needle-2.5.2" // {
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
@@ -104227,7 +104414,7 @@ in
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
-      sources."peek-readable-3.1.3"
+      sources."peek-readable-3.1.1"
       sources."performance-now-2.1.0"
       sources."pify-4.0.1"
       sources."precond-0.2.3"
@@ -104283,7 +104470,7 @@ in
           sources."base64-arraybuffer-0.1.5"
           sources."debug-4.1.1"
           sources."ms-2.1.3"
-          (sources."socket.io-parser-3.3.2" // {
+          (sources."socket.io-parser-3.3.1" // {
             dependencies = [
               sources."component-emitter-1.3.0"
               sources."debug-3.1.0"
@@ -104312,14 +104499,14 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
-      sources."strtok3-6.0.8"
+      sources."strtok3-6.0.6"
       sources."supports-color-7.2.0"
       sources."tar-4.4.13"
       sources."tlds-1.208.0"
       sources."to-array-0.1.4"
       sources."to-readable-stream-1.0.0"
       sources."toidentifier-1.0.0"
-      sources."token-types-2.1.1"
+      sources."token-types-2.0.0"
       sources."tough-cookie-2.5.0"
       sources."trim-repeated-1.0.0"
       sources."tunnel-agent-0.6.0"
@@ -104329,7 +104516,7 @@ in
       sources."ua-parser-js-0.7.21"
       sources."uc.micro-1.0.6"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-parse-lax-3.0.0"
       sources."urlsafe-base64-1.0.0"
       sources."util-deprecate-1.0.2"
@@ -104352,7 +104539,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The self-hosted Web IRC client";
-      homepage = "https://thelounge.chat/";
+      homepage = https://thelounge.chat/;
       license = "MIT";
     };
     production = true;
@@ -104370,7 +104557,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "JavaScript 3D library";
-      homepage = "https://threejs.org/";
+      homepage = https://threejs.org/;
       license = "MIT";
     };
     production = true;
@@ -104497,7 +104684,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."universalify-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."uuid-8.3.2"
       sources."verror-1.10.0"
       (sources."winston-2.4.5" // {
@@ -104712,7 +104899,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Joyent Triton CLI and client (https://www.joyent.com/triton)";
-      homepage = "https://github.com/joyent/node-triton";
+      homepage = https://github.com/joyent/node-triton;
       license = "MPL-2.0";
     };
     production = true;
@@ -104761,7 +104948,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "TSUN: a repl for TypeScript Upgraded Node";
-      homepage = "https://github.com/HerringtonDarkholme/typescript-repl";
+      homepage = https://github.com/HerringtonDarkholme/typescript-repl;
       license = "MIT";
     };
     production = true;
@@ -104802,7 +104989,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "TypeScript is a language for application scale JavaScript development";
-      homepage = "https://www.typescriptlang.org/";
+      homepage = https://www.typescriptlang.org/;
       license = "Apache-2.0";
     };
     production = true;
@@ -104812,10 +104999,10 @@ in
   typescript-language-server = nodeEnv.buildNodePackage {
     name = "typescript-language-server";
     packageName = "typescript-language-server";
-    version = "0.5.1";
+    version = "0.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.1.tgz";
-      sha512 = "60Kguhwk/R1BB4pEIb6B9C7Ix7JzLzYnsODlmorYMPjMeEV0rCBqTR6FGAj4wVw/eHrHcpwLENmmURKUd8aybA==";
+      url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.4.0.tgz";
+      sha512 = "K8jNOmDFn+QfrCh8ujby2pGDs5rpjYZQn+zvQnf42rxG4IHbfw5CHoMvbGkWPK/J5Gw8/l5K3i03kVZC2IBElg==";
     };
     dependencies = [
       sources."command-exists-1.2.6"
@@ -104839,7 +105026,6 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver";
-      homepage = "https://github.com/theia-ide/typescript-language-server#readme";
       license = "Apache-2.0";
     };
     production = true;
@@ -104849,10 +105035,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.12.5";
+    version = "3.12.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
-      sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz";
+      sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -104898,7 +105084,7 @@ in
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ansi-regex-5.0.0"
@@ -105054,7 +105240,7 @@ in
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."p-cancelable-1.1.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
@@ -105110,7 +105296,7 @@ in
         ];
       })
       sources."socket.io-adapter-2.0.3"
-      (sources."socket.io-parser-4.0.4" // {
+      (sources."socket.io-parser-4.0.3" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
@@ -105171,10 +105357,10 @@ in
   vega-cli = nodeEnv.buildNodePackage {
     name = "vega-cli";
     packageName = "vega-cli";
-    version = "5.19.1";
+    version = "5.17.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.19.1.tgz";
-      sha512 = "zUyyUYl2GgpAqdaQ3f/riNdaued3030hiJAjreX7/3XBiJ64vmF1l42x3KD8rq24ff9xLFwe0qyfnQOk4nK+fg==";
+      url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.17.3.tgz";
+      sha512 = "gxLAxIxFmq+36eB0ETCo4F29+/gWFfGftLxpCs8/fVKW9ILfJnEBd3M+7qdQKRHhVbImqsPetaKzwtIYH7/EPw==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -105251,7 +105437,7 @@ in
       sources."mkdirp-0.5.5"
       sources."ms-2.1.3"
       sources."nan-2.14.2"
-      sources."needle-2.6.0"
+      sources."needle-2.5.2"
       sources."node-fetch-2.6.1"
       sources."node-pre-gyp-0.11.0"
       sources."nopt-4.0.3"
@@ -105289,7 +105475,7 @@ in
       sources."tar-4.4.13"
       sources."topojson-client-3.1.0"
       sources."util-deprecate-1.0.2"
-      sources."vega-5.19.1"
+      sources."vega-5.17.3"
       sources."vega-canvas-1.2.6"
       sources."vega-crossfilter-4.0.5"
       sources."vega-dataflow-5.7.3"
@@ -105298,18 +105484,18 @@ in
       sources."vega-expression-4.0.1"
       sources."vega-force-4.0.7"
       sources."vega-format-1.0.4"
-      sources."vega-functions-5.12.0"
+      sources."vega-functions-5.10.0"
       sources."vega-geo-4.3.8"
       sources."vega-hierarchy-4.0.9"
       sources."vega-label-1.0.0"
       sources."vega-loader-4.4.0"
-      sources."vega-parser-6.1.3"
+      sources."vega-parser-6.1.2"
       sources."vega-projection-1.4.5"
       sources."vega-regression-1.0.9"
       sources."vega-runtime-6.1.3"
       sources."vega-scale-7.1.1"
-      sources."vega-scenegraph-4.9.3"
-      sources."vega-selections-5.3.0"
+      sources."vega-scenegraph-4.9.2"
+      sources."vega-selections-5.1.5"
       sources."vega-statistics-1.7.9"
       sources."vega-time-2.0.4"
       sources."vega-transforms-4.9.3"
@@ -105391,7 +105577,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Vega-Lite is a concise high-level language for interactive visualization.";
-      homepage = "https://vega.github.io/vega-lite/";
+      homepage = https://vega.github.io/vega-lite/;
       license = "BSD-3-Clause";
     };
     production = true;
@@ -105642,7 +105828,7 @@ in
       })
       sources."base64-js-1.5.1"
       sources."big.js-5.2.2"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
       sources."bluebird-3.7.2"
       sources."bn.js-5.1.3"
@@ -105678,7 +105864,7 @@ in
         ];
       })
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
       (sources."chalk-2.4.2" // {
         dependencies = [
@@ -105781,10 +105967,10 @@ in
       sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.5.0"
+      sources."enhanced-resolve-4.3.0"
       sources."entities-2.1.0"
       sources."errno-0.1.8"
-      (sources."es-abstract-1.18.0-next.2" // {
+      (sources."es-abstract-1.18.0-next.1" // {
         dependencies = [
           sources."object.assign-4.1.2"
         ];
@@ -106271,7 +106457,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -106288,13 +106474,12 @@ in
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.2.0"
       sources."vm-browserify-1.1.2"
-      sources."vsce-1.84.0"
+      sources."vsce-1.83.0"
       sources."vscode-debugadapter-testsupport-1.43.0"
       sources."vscode-debugprotocol-1.43.0"
       (sources."watchpack-1.7.5" // {
         dependencies = [
-          sources."chokidar-3.5.1"
-          sources."fsevents-2.3.1"
+          sources."chokidar-3.4.3"
           sources."readdirp-3.5.0"
         ];
       })
@@ -106322,7 +106507,7 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      (sources."webpack-4.46.0" // {
+      (sources."webpack-4.44.2" // {
         dependencies = [
           (sources."braces-2.3.2" // {
             dependencies = [
@@ -106641,12 +106826,12 @@ in
       sources."tslib-1.14.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       sources."uid-0.0.2"
       sources."unbzip2-stream-1.4.3"
       sources."unyield-0.0.1"
       sources."unzip-response-2.0.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."url-parse-lax-1.0.0"
       sources."url-to-options-1.0.1"
       sources."user-home-2.0.0"
@@ -106700,7 +106885,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -106752,7 +106937,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bootstrap-vue-helper-json-1.1.1"
       (sources."boxen-3.2.0" // {
         dependencies = [
@@ -106900,7 +107085,7 @@ in
           sources."eslint-scope-5.1.1"
           sources."espree-6.2.1"
           sources."ms-2.1.2"
-          sources."vue-eslint-parser-7.4.1"
+          sources."vue-eslint-parser-7.3.0"
         ];
       })
       sources."eslint-scope-4.0.3"
@@ -107083,7 +107268,7 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
-      (sources."js-beautify-1.13.4" // {
+      (sources."js-beautify-1.13.0" // {
         dependencies = [
           sources."mkdirp-1.0.4"
         ];
@@ -107525,7 +107710,7 @@ in
       })
       sources."untildify-2.1.0"
       sources."update-notifier-3.0.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
       sources."use-3.1.1"
@@ -107601,7 +107786,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "vue-language-server";
-      homepage = "https://github.com/vuejs/vetur/tree/master/server";
+      homepage = https://github.com/vuejs/vetur/tree/master/server;
       license = "MIT";
     };
     production = true;
@@ -107611,10 +107796,10 @@ in
   web-ext = nodeEnv.buildNodePackage {
     name = "web-ext";
     packageName = "web-ext";
-    version = "5.5.0";
+    version = "5.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/web-ext/-/web-ext-5.5.0.tgz";
-      sha512 = "f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw==";
+      url = "https://registry.npmjs.org/web-ext/-/web-ext-5.4.1.tgz";
+      sha512 = "AnTjSFtvidZfmVYzvceM/XixsigiWU3l66UzcxgXxXhOoEQU5ZHlXFGVJdHEYfkI5SnEyDG+WlhsdTUHNLOXJw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -107646,7 +107831,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/yauzl-2.9.1"
       sources."JSONSelect-0.2.1"
       sources."acorn-7.4.1"
@@ -107717,7 +107902,7 @@ in
       })
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
       sources."bl-4.0.3"
       sources."bluebird-2.9.34"
@@ -107741,15 +107926,15 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."callsites-3.1.0"
       sources."camelcase-6.0.0"
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."cheerio-1.0.0-rc.3"
-      (sources."chokidar-3.5.1" // {
+      (sources."chokidar-3.4.3" // {
         dependencies = [
-          sources."fsevents-2.3.1"
+          sources."fsevents-2.1.3"
         ];
       })
       (sources."chrome-launcher-0.13.4" // {
@@ -107851,6 +108036,8 @@ in
       sources."enquirer-2.3.6"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
+      sources."es-abstract-1.17.7"
+      sources."es-to-primitive-1.2.1"
       sources."es6-error-4.1.1"
       sources."es6-promise-2.3.0"
       sources."es6-promisify-6.1.1"
@@ -108021,7 +108208,7 @@ in
       sources."human-signals-1.1.1"
       sources."ieee754-1.2.1"
       sources."ignore-4.0.6"
-      sources."import-fresh-3.3.0"
+      sources."import-fresh-3.2.1"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -108034,6 +108221,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
@@ -108053,6 +108241,7 @@ in
       sources."is-regex-1.1.1"
       sources."is-relative-0.1.3"
       sources."is-stream-2.0.0"
+      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
@@ -108179,7 +108368,7 @@ in
       sources."neo-async-2.6.2"
       sources."next-tick-1.1.0"
       sources."node-forge-0.10.0"
-      (sources."node-notifier-8.0.1" // {
+      (sources."node-notifier-8.0.0" // {
         dependencies = [
           sources."uuid-8.3.2"
         ];
@@ -108203,9 +108392,11 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
+      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
@@ -108262,7 +108453,7 @@ in
       sources."readdirp-3.5.0"
       sources."regenerator-runtime-0.13.7"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."regexpp-3.1.0"
       sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
@@ -108388,6 +108579,8 @@ in
           sources."strip-ansi-6.0.0"
         ];
       })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-4.0.0"
@@ -108450,7 +108643,7 @@ in
       })
       sources."upath-2.0.1"
       sources."update-notifier-5.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
       sources."use-3.1.1"
@@ -108459,7 +108652,7 @@ in
       sources."v8-compile-cache-2.2.0"
       sources."verror-1.10.0"
       sources."vfile-location-3.2.0"
-      sources."watchpack-1.7.5"
+      sources."watchpack-1.7.4"
       (sources."watchpack-chokidar2-2.0.1" // {
         dependencies = [
           sources."anymatch-2.0.0"
@@ -108505,7 +108698,7 @@ in
         ];
       })
       sources."write-file-atomic-3.0.3"
-      sources."ws-7.4.2"
+      sources."ws-7.3.1"
       sources."xdg-basedir-4.0.0"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
@@ -108534,7 +108727,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A command line tool to help build, run, and test web extensions";
-      homepage = "https://github.com/mozilla/web-ext";
+      homepage = https://github.com/mozilla/web-ext;
       license = "MPL-2.0";
     };
     production = true;
@@ -108544,46 +108737,48 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.16.0";
+    version = "5.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.16.0.tgz";
-      sha512 = "QOkctcjYfEGxcYg4AzPJafyAQ7ANc266/URkX881uFA7b2k31E0Dmpy1ExfppHOTp1kHDTsRh9sXojVUvgPF0g==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.11.1.tgz";
+      sha512 = "tNUIdAmYJv+nupRs/U/gqmADm6fgrf5xE+rSlSsf2PgsGO7j2WG7ccU6AWNlOJlHFl+HnmXlBmHIkiLf+XA9mQ==";
     };
     dependencies = [
       sources."@types/eslint-7.2.6"
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
-      sources."@types/json-schema-7.0.7"
-      sources."@types/node-14.14.22"
-      sources."@webassemblyjs/ast-1.11.0"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
-      sources."@webassemblyjs/helper-api-error-1.11.0"
-      sources."@webassemblyjs/helper-buffer-1.11.0"
-      sources."@webassemblyjs/helper-numbers-1.11.0"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.0"
-      sources."@webassemblyjs/helper-wasm-section-1.11.0"
-      sources."@webassemblyjs/ieee754-1.11.0"
-      sources."@webassemblyjs/leb128-1.11.0"
-      sources."@webassemblyjs/utf8-1.11.0"
-      sources."@webassemblyjs/wasm-edit-1.11.0"
-      sources."@webassemblyjs/wasm-gen-1.11.0"
-      sources."@webassemblyjs/wasm-opt-1.11.0"
-      sources."@webassemblyjs/wasm-parser-1.11.0"
-      sources."@webassemblyjs/wast-printer-1.11.0"
+      sources."@types/json-schema-7.0.6"
+      sources."@types/node-14.14.20"
+      sources."@webassemblyjs/ast-1.9.1"
+      sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
+      sources."@webassemblyjs/helper-api-error-1.9.1"
+      sources."@webassemblyjs/helper-buffer-1.9.1"
+      sources."@webassemblyjs/helper-code-frame-1.9.1"
+      sources."@webassemblyjs/helper-fsm-1.9.1"
+      sources."@webassemblyjs/helper-module-context-1.9.1"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.9.1"
+      sources."@webassemblyjs/helper-wasm-section-1.9.1"
+      sources."@webassemblyjs/ieee754-1.9.1"
+      sources."@webassemblyjs/leb128-1.9.1"
+      sources."@webassemblyjs/utf8-1.9.1"
+      sources."@webassemblyjs/wasm-edit-1.9.1"
+      sources."@webassemblyjs/wasm-gen-1.9.1"
+      sources."@webassemblyjs/wasm-opt-1.9.1"
+      sources."@webassemblyjs/wasm-parser-1.9.1"
+      sources."@webassemblyjs/wast-parser-1.9.1"
+      sources."@webassemblyjs/wast-printer-1.9.1"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."acorn-8.0.4"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
-      sources."browserslist-4.16.1"
+      sources."browserslist-4.16.0"
       sources."buffer-from-1.1.1"
-      sources."caniuse-lite-1.0.30001179"
+      sources."caniuse-lite-1.0.30001173"
       sources."chrome-trace-event-1.0.2"
       sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.642"
-      sources."enhanced-resolve-5.7.0"
-      sources."es-module-lexer-0.3.26"
+      sources."electron-to-chromium-1.3.634"
+      sources."enhanced-resolve-5.4.1"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
@@ -108602,13 +108797,13 @@ in
       sources."jest-worker-26.6.2"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-traverse-0.4.1"
-      sources."loader-runner-4.2.0"
+      sources."loader-runner-4.1.0"
       sources."locate-path-6.0.0"
       sources."merge-stream-2.0.0"
       sources."mime-db-1.45.0"
       sources."mime-types-2.1.28"
       sources."neo-async-2.6.2"
-      sources."node-releases-1.1.70"
+      sources."node-releases-1.1.69"
       sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."path-exists-4.0.0"
@@ -108628,9 +108823,9 @@ in
           sources."source-map-0.7.3"
         ];
       })
-      sources."terser-webpack-plugin-5.1.1"
+      sources."terser-webpack-plugin-5.0.3"
       sources."tslib-1.14.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."watchpack-2.1.0"
       sources."webpack-sources-2.2.0"
       sources."yocto-queue-0.1.0"
@@ -108638,7 +108833,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.";
-      homepage = "https://github.com/webpack/webpack";
+      homepage = https://github.com/webpack/webpack;
       license = "MIT";
     };
     production = true;
@@ -108648,18 +108843,16 @@ in
   webpack-cli = nodeEnv.buildNodePackage {
     name = "webpack-cli";
     packageName = "webpack-cli";
-    version = "4.4.0";
+    version = "4.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.4.0.tgz";
-      sha512 = "/Qh07CXfXEkMu5S8wEpjuaw2Zj/CC0hf/qbTDp6N8N7JjdGuaOjZ7kttz+zhuJO/J5m7alQEhNk9lsc4rC6xgQ==";
+      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.3.1.tgz";
+      sha512 = "/F4+9QNZM/qKzzL9/06Am8NXIkGV+/NqQ62Dx7DSqudxxpAgBqYn6V7+zp+0Y7JuWksKUbczRY3wMTd+7Uj6OA==";
     };
     dependencies = [
       sources."@discoveryjs/json-ext-0.5.2"
-      sources."@webpack-cli/configtest-1.0.0"
       sources."@webpack-cli/info-1.2.1"
-      sources."@webpack-cli/serve-1.2.2"
+      sources."@webpack-cli/serve-1.2.1"
       sources."ansi-colors-4.1.1"
-      sources."clone-deep-4.0.1"
       sources."colorette-1.2.1"
       sources."commander-6.2.1"
       sources."cross-spawn-7.0.3"
@@ -108675,12 +108868,10 @@ in
       sources."import-local-3.0.2"
       sources."interpret-2.2.0"
       sources."is-core-module-2.2.0"
-      sources."is-plain-object-2.0.4"
       sources."is-stream-2.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
-      sources."kind-of-6.0.3"
       sources."locate-path-5.0.0"
+      sources."lodash-4.17.20"
       sources."merge-stream-2.0.0"
       sources."mimic-fn-2.1.0"
       sources."npm-run-path-4.0.1"
@@ -108696,15 +108887,13 @@ in
       sources."resolve-1.19.0"
       sources."resolve-cwd-3.0.0"
       sources."resolve-from-5.0.0"
-      sources."shallow-clone-3.0.1"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
       sources."strip-final-newline-2.0.0"
       sources."v8-compile-cache-2.2.0"
-      sources."webpack-merge-5.7.3"
+      sources."webpack-merge-4.2.2"
       sources."which-2.0.2"
-      sources."wildcard-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -108719,15 +108908,15 @@ in
   webpack-dev-server = nodeEnv.buildNodePackage {
     name = "webpack-dev-server";
     packageName = "webpack-dev-server";
-    version = "3.11.2";
+    version = "3.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz";
-      sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==";
+      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz";
+      sha512 = "u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ==";
     };
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -108779,7 +108968,7 @@ in
       sources."buffer-indexof-1.1.1"
       sources."bytes-3.0.0"
       sources."cache-base-1.0.1"
-      sources."call-bind-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
       sources."chokidar-2.1.8"
       (sources."class-utils-0.3.6" // {
@@ -108856,6 +109045,8 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."errno-0.1.8"
+      sources."es-abstract-1.17.7"
+      sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."eventemitter3-4.0.7"
@@ -108970,6 +109161,7 @@ in
       sources."is-arguments-1.1.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.2.2"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -108988,6 +109180,7 @@ in
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.1"
       sources."is-stream-1.1.0"
+      sources."is-symbol-1.0.3"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
@@ -109039,9 +109232,11 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."object-inspect-1.9.0"
       sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
+      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."obuf-1.1.2"
       sources."on-finished-2.3.0"
@@ -109095,7 +109290,7 @@ in
       })
       sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.1"
+      sources."regexp.prototype.flags-1.3.0"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -109216,6 +109411,8 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -109251,7 +109448,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -109267,7 +109464,7 @@ in
       sources."wbuf-1.7.3"
       (sources."webpack-dev-middleware-3.7.3" // {
         dependencies = [
-          sources."mime-2.5.0"
+          sources."mime-2.4.7"
         ];
       })
       sources."webpack-log-2.0.0"
@@ -109309,7 +109506,7 @@ in
       sources."@nodelib/fs.scandir-2.1.4"
       sources."@nodelib/fs.stat-2.0.4"
       sources."@nodelib/fs.walk-1.2.6"
-      sources."@types/json-schema-7.0.7"
+      sources."@types/json-schema-7.0.6"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
       sources."array-union-2.1.0"
@@ -109318,12 +109515,12 @@ in
       sources."dir-glob-3.0.1"
       sources."emojis-list-3.0.0"
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.5"
+      sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.10.0"
       sources."fill-range-7.0.1"
       sources."glob-parent-5.1.1"
-      sources."globby-11.0.2"
+      sources."globby-11.0.1"
       sources."ignore-5.1.8"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
@@ -109347,13 +109544,13 @@ in
       sources."serialize-javascript-5.0.1"
       sources."slash-3.0.0"
       sources."to-regex-range-5.0.1"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Copy files && directories with webpack";
-      homepage = "https://github.com/webpack-contrib/copy-webpack-plugin";
+      homepage = https://github.com/webpack-contrib/copy-webpack-plugin;
       license = "MIT";
     };
     production = true;
@@ -109380,7 +109577,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.40"
+      sources."@types/node-13.13.39"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -109521,7 +109718,7 @@ in
       sources."mdns-js-packet-0.2.0"
       sources."mediasource-2.4.0"
       sources."memory-chunk-store-1.3.0"
-      sources."mime-2.5.0"
+      sources."mime-2.4.7"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
@@ -109545,7 +109742,7 @@ in
       sources."nodebmc-0.0.7"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
-      sources."open-7.3.1"
+      sources."open-7.3.0"
       sources."package-json-versionify-1.0.4"
       (sources."parse-torrent-7.1.3" // {
         dependencies = [
@@ -109670,7 +109867,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "WebTorrent, the streaming torrent client. For the command line.";
-      homepage = "https://webtorrent.io";
+      homepage = https://webtorrent.io/;
       license = "MIT";
     };
     production = true;
@@ -109725,10 +109922,10 @@ in
   yaml-language-server = nodeEnv.buildNodePackage {
     name = "yaml-language-server";
     packageName = "yaml-language-server";
-    version = "0.14.0";
+    version = "0.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.14.0.tgz";
-      sha512 = "aMNzS7YoMrgG0QdCMonlrFS/fPiag4zVs9cJ7RB0ZzwiALB2446UFXwy6SaTmKfJq353rjGJ+d7j1HHKSX/IqA==";
+      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.0.tgz";
+      sha512 = "5FHW7dUAyIjEM3mRzIplE0pZut2K30cA+K7coaOxFxi82LTk/oiVLS4/AQFnOtGicSyoi4YOiRqpMZ04vgtuew==";
     };
     dependencies = [
       sources."agent-base-4.3.0"
@@ -109766,7 +109963,7 @@ in
       sources."vscode-languageserver-types-3.16.0"
       sources."vscode-nls-4.1.2"
       sources."vscode-uri-2.1.2"
-      sources."yaml-language-server-parser-0.1.2"
+      sources."yaml-language-server-parser-0.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -109813,7 +110010,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"
@@ -109842,7 +110039,11 @@ in
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
-      sources."axios-0.21.1"
+      (sources."axios-0.18.1" // {
+        dependencies = [
+          sources."is-buffer-2.0.5"
+        ];
+      })
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -109935,7 +110136,7 @@ in
       sources."config-chain-1.1.12"
       sources."configstore-3.1.5"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.8.3"
+      sources."core-js-3.8.2"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-6.0.5"
@@ -110037,7 +110238,11 @@ in
       sources."find-up-2.1.0"
       sources."find-versions-2.0.0"
       sources."first-chunk-stream-2.0.0"
-      sources."follow-redirects-1.13.1"
+      (sources."follow-redirects-1.5.10" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."for-in-1.0.2"
       sources."foreachasync-3.0.0"
       sources."forever-agent-0.6.1"
@@ -110272,10 +110477,9 @@ in
       sources."mute-stream-0.0.7"
       sources."nanomatch-1.2.13"
       sources."nice-try-1.0.5"
-      sources."node-fetch-2.6.1"
       sources."normalize-package-data-2.5.0"
       sources."normalize-url-2.0.1"
-      sources."npm-api-1.0.1"
+      sources."npm-api-1.0.0"
       sources."npm-conf-1.1.3"
       (sources."npm-keyword-5.0.0" // {
         dependencies = [
@@ -110331,7 +110535,7 @@ in
       sources."p-try-1.0.0"
       sources."package-json-5.0.0"
       sources."pad-component-0.0.1"
-      sources."paged-request-2.0.2"
+      sources."paged-request-2.0.1"
       sources."parse-help-1.0.0"
       sources."parse-json-2.2.0"
       sources."pascalcase-0.1.1"
@@ -110611,7 +110815,7 @@ in
       sources."untildify-3.0.3"
       sources."unzip-response-2.0.1"
       sources."update-notifier-2.5.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
       sources."url-to-options-1.0.1"
@@ -110728,7 +110932,7 @@ in
           sources."p-limit-2.3.0"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
-          sources."parse-json-5.2.0"
+          sources."parse-json-5.1.0"
           (sources."path-type-3.0.0" // {
             dependencies = [
               sources."pify-3.0.0"
@@ -110758,7 +110962,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "CLI tool for running Yeoman generators";
-      homepage = "http://yeoman.io";
+      homepage = http://yeoman.io/;
       license = "BSD-2-Clause";
     };
     production = true;
diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix
index 64326c6b216..027a981ea57 100644
--- a/pkgs/development/web/newman/node-composition.nix
+++ b/pkgs/development/web/newman/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/development/web/newman/node-env.nix b/pkgs/development/web/newman/node-env.nix
index c2b723195b7..04e3ee097fa 100644
--- a/pkgs/development/web/newman/node-env.nix
+++ b/pkgs/development/web/newman/node-env.nix
@@ -1,11 +1,8 @@
 # This file originates from node2nix
 
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
 
 let
-  # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
-  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
-
   python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -41,8 +38,8 @@ let
     };
 
   includeDependencies = {dependencies}:
-    lib.optionalString (dependencies != [])
-      (lib.concatMapStrings (dependency:
+    stdenv.lib.optionalString (dependencies != [])
+      (stdenv.lib.concatMapStrings (dependency:
         ''
           # Bundle the dependencies of the package
           mkdir -p node_modules
@@ -103,7 +100,7 @@ let
       cd "$DIR/${packageName}"
       ${includeDependencies { inherit dependencies; }}
       cd ..
-      ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
   pinpointDependencies = {dependencies, production}:
@@ -164,12 +161,12 @@ let
     ''
       node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
 
-      ${lib.optionalString (dependencies != [])
+      ${stdenv.lib.optionalString (dependencies != [])
         ''
           if [ -d node_modules ]
           then
               cd node_modules
-              ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
               cd ..
           fi
         ''}
@@ -186,7 +183,7 @@ let
           cd "${packageName}"
           ${pinpointDependencies { inherit dependencies production; }}
           cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
       fi
     '';
 
@@ -245,8 +242,8 @@ let
       if(fs.existsSync("./package-lock.json")) {
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-          if(![1, 2].includes(packageLock.lockfileVersion)) {
-             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+          if(packageLock.lockfileVersion !== 1) {
+             process.stderr.write("Sorry, I only understand lock file version 1!\n");
              process.exit(1);
           }
 
@@ -347,8 +344,8 @@ let
         cd "${packageName}"
         runHook preRebuild
 
-        ${lib.optionalString bypassCache ''
-          ${lib.optionalString reconstructLock ''
+        ${stdenv.lib.optionalString bypassCache ''
+          ${stdenv.lib.optionalString reconstructLock ''
             if [ -f package-lock.json ]
             then
                 echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
@@ -364,14 +361,14 @@ let
           node ${addIntegrityFieldsScript}
         ''}
 
-        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
+        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
         if [ "''${dontNpmInstall-}" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
 
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
         fi
     '';
 
@@ -399,8 +396,8 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ lib.optional (stdenv.isLinux) utillinux
-        ++ lib.optional (stdenv.isDarwin) libtool
+        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
+        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
       inherit nodejs;
@@ -448,74 +445,6 @@ let
       '';
     } // extraArgs);
 
-  # Builds a node environment (a node_modules folder and a set of binaries)
-  buildNodeDependencies =
-    { name
-    , packageName
-    , version
-    , src
-    , dependencies ? []
-    , buildInputs ? []
-    , production ? true
-    , npmFlags ? ""
-    , dontNpmInstall ? false
-    , bypassCache ? false
-    , reconstructLock ? false
-    , dontStrip ? true
-    , unpackPhase ? "true"
-    , buildPhase ? "true"
-    , ... }@args:
-
-    let
-      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-    in
-      stdenv.mkDerivation ({
-        name = "node-dependencies-${name}-${version}";
-
-        buildInputs = [ tarWrapper python nodejs ]
-          ++ lib.optional (stdenv.isLinux) utillinux
-          ++ lib.optional (stdenv.isDarwin) libtool
-          ++ buildInputs;
-
-        inherit dontStrip; # Stripping may fail a build for some package deployments
-        inherit dontNpmInstall unpackPhase buildPhase;
-
-        includeScript = includeDependencies { inherit dependencies; };
-        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
-
-        installPhase = ''
-          mkdir -p $out/${packageName}
-          cd $out/${packageName}
-
-          source $includeScriptPath
-
-          # Create fake package.json to make the npm commands work properly
-          cp ${src}/package.json .
-          chmod 644 package.json
-          ${lib.optionalString bypassCache ''
-            if [ -f ${src}/package-lock.json ]
-            then
-                cp ${src}/package-lock.json .
-            fi
-          ''}
-
-          # Go to the parent folder to make sure that all packages are pinpointed
-          cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-          # Expose the executables that were installed
-          cd ..
-          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-          mv ${packageName} lib
-          ln -s $out/lib/node_modules/.bin $out/bin
-        '';
-      } // extraArgs);
-
   # Builds a development shell
   buildNodeShell =
     { name
@@ -535,12 +464,59 @@ let
     , ... }@args:
 
     let
-      nodeDependencies = buildNodeDependencies args;
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+
+      nodeDependencies = stdenv.mkDerivation ({
+        name = "node-dependencies-${name}-${version}";
+
+        buildInputs = [ tarWrapper python nodejs ]
+          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
+          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
+
+        inherit dontStrip; # Stripping may fail a build for some package deployments
+        inherit dontNpmInstall unpackPhase buildPhase;
+
+        includeScript = includeDependencies { inherit dependencies; };
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+
+        installPhase = ''
+          mkdir -p $out/${packageName}
+          cd $out/${packageName}
+
+          source $includeScriptPath
+
+          # Create fake package.json to make the npm commands work properly
+          cp ${src}/package.json .
+          chmod 644 package.json
+          ${stdenv.lib.optionalString bypassCache ''
+            if [ -f ${src}/package-lock.json ]
+            then
+                cp ${src}/package-lock.json .
+            fi
+          ''}
+
+          # Go to the parent folder to make sure that all packages are pinpointed
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+          # Expose the executables that were installed
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          mv ${packageName} lib
+          ln -s $out/lib/node_modules/.bin $out/bin
+        '';
+      } // extraArgs);
     in
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -553,15 +529,14 @@ let
 
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
-      shellHook = lib.optionalString (dependencies != []) ''
+      shellHook = stdenv.lib.optionalString (dependencies != []) ''
         export NODE_PATH=${nodeDependencies}/lib/node_modules
         export PATH="${nodeDependencies}/bin:$PATH"
       '';
     };
 in
 {
-  buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
-  buildNodePackage = lib.makeOverridable buildNodePackage;
-  buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
-  buildNodeShell = lib.makeOverridable buildNodeShell;
+  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
+  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
 }
diff --git a/pkgs/development/web/newman/node-packages.nix b/pkgs/development/web/newman/node-packages.nix
index d97e5cb7383..680be3d499c 100644
--- a/pkgs/development/web/newman/node-packages.nix
+++ b/pkgs/development/web/newman/node-packages.nix
@@ -1,61 +1,61 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/code-frame-7.12.11" = {
+    "@babel/code-frame-7.10.4" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
-        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";
+        sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
-    "@babel/core-7.12.10" = {
+    "@babel/core-7.12.3" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.10";
+      version = "7.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz";
-        sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz";
+        sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==";
       };
     };
-    "@babel/generator-7.12.11" = {
+    "@babel/generator-7.12.5" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.12.11";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
-        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
+        sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
       };
     };
-    "@babel/helper-function-name-7.12.11" = {
+    "@babel/helper-function-name-7.10.4" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
-        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
+        sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
       };
     };
-    "@babel/helper-get-function-arity-7.12.10" = {
+    "@babel/helper-get-function-arity-7.10.4" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
-        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
+        sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.12.7" = {
+    "@babel/helper-member-expression-to-functions-7.12.1" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.12.7";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
-        sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz";
+        sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
       };
     };
     "@babel/helper-module-imports-7.12.5" = {
@@ -76,22 +76,22 @@ let
         sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.12.10" = {
+    "@babel/helper-optimise-call-expression-7.10.4" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
-        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
+        sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==";
       };
     };
-    "@babel/helper-replace-supers-7.12.11" = {
+    "@babel/helper-replace-supers-7.12.5" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.12.11";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
-        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+        sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
       };
     };
     "@babel/helper-simple-access-7.12.1" = {
@@ -103,22 +103,22 @@ let
         sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
       };
     };
-    "@babel/helper-split-export-declaration-7.12.11" = {
+    "@babel/helper-split-export-declaration-7.11.0" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.12.11";
+      version = "7.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
-        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
+        sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
       };
     };
-    "@babel/helper-validator-identifier-7.12.11" = {
+    "@babel/helper-validator-identifier-7.10.4" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
-      version = "7.12.11";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
-        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
+        sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
       };
     };
     "@babel/helpers-7.12.5" = {
@@ -139,49 +139,49 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.11" = {
+    "@babel/parser-7.12.5" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.11";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
-        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz";
+        sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==";
       };
     };
-    "@babel/template-7.12.7" = {
+    "@babel/template-7.10.4" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.12.7";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
-        sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz";
+        sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
       };
     };
-    "@babel/traverse-7.12.12" = {
+    "@babel/traverse-7.12.5" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.12";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
-        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz";
+        sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==";
       };
     };
-    "@babel/types-7.12.12" = {
+    "@babel/types-7.12.6" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.12";
+      version = "7.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
-        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz";
+        sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
       };
     };
-    "@eslint/eslintrc-0.3.0" = {
+    "@eslint/eslintrc-0.2.1" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
-      version = "0.3.0";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz";
-        sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==";
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
+        sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
       };
     };
     "@istanbuljs/load-nyc-config-1.1.0" = {
@@ -220,13 +220,13 @@ let
         sha512 = "k57fzmAZ2PJGxfOA4SGR05ejorHbVAa/84Hxh/2nAztjNXc4ZjOm9NUIk6/Z6LCrBvJZqjRZbN8e/nROVUPVdg==";
       };
     };
-    "@sinonjs/commons-1.8.2" = {
+    "@sinonjs/commons-1.8.1" = {
       name = "_at_sinonjs_slash_commons";
       packageName = "@sinonjs/commons";
-      version = "1.8.2";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz";
-        sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==";
+        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz";
+        sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==";
       };
     };
     "@sinonjs/fake-timers-6.0.1" = {
@@ -238,13 +238,22 @@ let
         sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==";
       };
     };
-    "@sinonjs/samsam-5.3.1" = {
+    "@sinonjs/formatio-5.0.1" = {
+      name = "_at_sinonjs_slash_formatio";
+      packageName = "@sinonjs/formatio";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz";
+        sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==";
+      };
+    };
+    "@sinonjs/samsam-5.2.0" = {
       name = "_at_sinonjs_slash_samsam";
       packageName = "@sinonjs/samsam";
-      version = "5.3.1";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz";
-        sha512 = "1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==";
+        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.2.0.tgz";
+        sha512 = "CaIcyX5cDsjcW/ab7HposFWzV1kC++4HNsfnEdFJa7cP1QIuILAKV+BgfeqRXhcnSAc76r/Rh/O5C+300BwUIw==";
       };
     };
     "@sinonjs/text-encoding-0.7.1" = {
@@ -310,15 +319,6 @@ let
         sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
-    "ajv-7.0.3" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "7.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz";
-        sha512 = "R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==";
-      };
-    };
     "ansi-colors-4.1.1" = {
       name = "ansi-colors";
       packageName = "ansi-colors";
@@ -472,15 +472,6 @@ let
         sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==";
       };
     };
-    "array-back-5.0.0" = {
-      name = "array-back";
-      packageName = "array-back";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-back/-/array-back-5.0.0.tgz";
-        sha512 = "kgVWwJReZWmVuWOQKEOohXKJX+nD02JAZ54D1RRWlv8L0NebauKAaFxACKzB74RTclt1+WNz5KHaLRDAPZbDEw==";
-      };
-    };
     "array-uniq-1.0.3" = {
       name = "array-uniq";
       packageName = "array-uniq";
@@ -517,13 +508,13 @@ let
         sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==";
       };
     };
-    "astral-regex-2.0.0" = {
+    "astral-regex-1.0.0" = {
       name = "astral-regex";
       packageName = "astral-regex";
-      version = "2.0.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz";
-        sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==";
+        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
+        sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
       };
     };
     "async-1.0.0" = {
@@ -580,6 +571,15 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
+    "aws4-1.10.1" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz";
+        sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==";
+      };
+    };
     "aws4-1.11.0" = {
       name = "aws4";
       packageName = "aws4";
@@ -598,13 +598,13 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base64-js-1.5.1" = {
+    "base64-js-1.3.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.5.1";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
-        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+        sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
       };
     };
     "bcrypt-pbkdf-1.0.2" = {
@@ -616,13 +616,13 @@ let
         sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     };
-    "binary-extensions-2.2.0" = {
+    "binary-extensions-2.1.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
-        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
+        sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
       };
     };
     "bl-1.2.3" = {
@@ -1030,6 +1030,15 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
+    "commander-5.1.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz";
+        sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
+      };
+    };
     "commander-6.2.0" = {
       name = "commander";
       packageName = "commander";
@@ -1039,15 +1048,6 @@ let
         sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
       };
     };
-    "commander-6.2.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz";
-        sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
-      };
-    };
     "comment-parser-0.7.6" = {
       name = "comment-parser";
       packageName = "comment-parser";
@@ -1129,13 +1129,13 @@ let
         sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==";
       };
     };
-    "csv-parse-4.14.2" = {
+    "csv-parse-4.12.0" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "4.14.2";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.14.2.tgz";
-        sha512 = "YE2xlTKtM035/94llhgsp9qFQxGi47EkQJ1pZ+mLT/98GpIsbjkMGAb7Rmu9hNxVfYFOLf10hP+rPVqnoccLgw==";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.12.0.tgz";
+        sha512 = "wPQl3H79vWLPI8cgKFcQXl0NBgYYEqVnT1i6/So7OjMpsI540oD7p93r3w6fDSyPvwkTepG05F69/7AViX2lXg==";
       };
     };
     "cycle-1.0.3" = {
@@ -1174,13 +1174,13 @@ let
         sha1 = "32b4b3105e8861043a6f9ac755d80e542d365b31";
       };
     };
-    "debug-3.2.7" = {
+    "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.7";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
       };
     };
     "debug-4.2.0" = {
@@ -1192,13 +1192,13 @@ let
         sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
       };
     };
-    "debug-4.3.2" = {
+    "debug-4.3.0" = {
       name = "debug";
       packageName = "debug";
-      version = "4.3.2";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz";
+        sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==";
       };
     };
     "decamelize-1.2.0" = {
@@ -1336,13 +1336,13 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domelementtype-2.1.0" = {
+    "domelementtype-2.0.2" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "2.1.0";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
-        sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz";
+        sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==";
       };
     };
     "domhandler-2.4.2" = {
@@ -1489,22 +1489,22 @@ let
         sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
       };
     };
-    "eslint-7.18.0" = {
+    "eslint-7.12.1" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.18.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz";
-        sha512 = "fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz";
+        sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==";
       };
     };
-    "eslint-plugin-jsdoc-30.7.13" = {
+    "eslint-plugin-jsdoc-30.7.6" = {
       name = "eslint-plugin-jsdoc";
       packageName = "eslint-plugin-jsdoc";
-      version = "30.7.13";
+      version = "30.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz";
-        sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==";
+        url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.6.tgz";
+        sha512 = "w18IOiS/9ahKgRfQOuHbce+EQYx3fwIkZhUZDEK+augNlhJkzgTSZkrBkzaflSbFNZ9/Tk4xzUABEaTbsBSzew==";
       };
     };
     "eslint-plugin-lodash-7.1.0" = {
@@ -1570,13 +1570,13 @@ let
         sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==";
       };
     };
-    "espree-7.3.1" = {
+    "espree-7.3.0" = {
       name = "espree";
       packageName = "espree";
-      version = "7.3.1";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz";
-        sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==";
+        url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz";
+        sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==";
       };
     };
     "esprima-4.0.1" = {
@@ -1705,13 +1705,13 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "file-entry-cache-6.0.0" = {
+    "file-entry-cache-5.0.1" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
-      version = "6.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz";
-        sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==";
+        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
+        sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
       };
     };
     "file-set-4.0.1" = {
@@ -1804,13 +1804,22 @@ let
         sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==";
       };
     };
-    "flat-cache-3.0.4" = {
+    "flat-cache-2.0.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "3.0.4";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz";
-        sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz";
+        sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
+      };
+    };
+    "flatted-2.0.2" = {
+      name = "flatted";
+      packageName = "flatted";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz";
+        sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
       };
     };
     "flatted-3.1.0" = {
@@ -1840,13 +1849,13 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "fromentries-1.3.2" = {
+    "fromentries-1.3.1" = {
       name = "fromentries";
       packageName = "fromentries";
-      version = "1.3.2";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz";
-        sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==";
+        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.1.tgz";
+        sha512 = "w4t/zm2J+uAcrpeKyW0VmYiIs3aqe/xKQ+2qwazVNZSCklQHhaVjk6XzKw5GtImq5thgL0IVRjGRAOastb08RQ==";
       };
     };
     "fs-constants-1.0.0" = {
@@ -2164,13 +2173,13 @@ let
         sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
       };
     };
-    "import-fresh-3.3.0" = {
+    "import-fresh-3.2.2" = {
       name = "import-fresh";
       packageName = "import-fresh";
-      version = "3.3.0";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz";
-        sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
+        sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
       };
     };
     "imurmurhash-0.1.4" = {
@@ -2245,13 +2254,13 @@ let
         sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
       };
     };
-    "is-core-module-2.2.0" = {
+    "is-core-module-2.0.0" = {
       name = "is-core-module";
       packageName = "is-core-module";
-      version = "2.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
-        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz";
+        sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==";
       };
     };
     "is-extglob-2.1.1" = {
@@ -2470,15 +2479,6 @@ let
         sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
       };
     };
-    "js-yaml-3.14.1" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
-      };
-    };
     "js2xmlparser-4.0.1" = {
       name = "js2xmlparser";
       packageName = "js2xmlparser";
@@ -2569,15 +2569,6 @@ let
         sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
       };
     };
-    "json-schema-traverse-1.0.0" = {
-      name = "json-schema-traverse";
-      packageName = "json-schema-traverse";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz";
-        sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==";
-      };
-    };
     "json-stable-stringify-without-jsonify-1.0.1" = {
       name = "json-stable-stringify-without-jsonify";
       packageName = "json-stable-stringify-without-jsonify";
@@ -2722,6 +2713,15 @@ let
         sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
       };
     };
+    "lodash-4.17.19" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz";
+        sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==";
+      };
+    };
     "lodash-4.17.20" = {
       name = "lodash";
       packageName = "lodash";
@@ -2857,15 +2857,6 @@ let
         sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
       };
     };
-    "lru-cache-6.0.0" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
-        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
-      };
-    };
     "make-dir-1.3.0" = {
       name = "make-dir";
       packageName = "make-dir";
@@ -2911,13 +2902,13 @@ let
         sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==";
       };
     };
-    "marked-1.2.7" = {
+    "marked-1.2.0" = {
       name = "marked";
       packageName = "marked";
-      version = "1.2.7";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz";
-        sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz";
+        sha512 = "tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA==";
       };
     };
     "mdurl-1.0.1" = {
@@ -2929,13 +2920,13 @@ let
         sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
       };
     };
-    "mime-db-1.45.0" = {
+    "mime-db-1.44.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.45.0";
+      version = "1.44.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
-        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
       };
     };
     "mime-format-2.0.0" = {
@@ -2947,13 +2938,13 @@ let
         sha1 = "e29f8891e284d78270246f0050d6834bdbbe1332";
       };
     };
-    "mime-types-2.1.28" = {
+    "mime-types-2.1.27" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.28";
+      version = "2.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
-        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
       };
     };
     "minimatch-3.0.4" = {
@@ -3019,15 +3010,6 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
-    "ms-2.1.3" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
-      };
-    };
     "nanoid-3.1.12" = {
       name = "nanoid";
       packageName = "nanoid";
@@ -3064,13 +3046,13 @@ let
         sha512 = "bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==";
       };
     };
-    "nock-13.0.6" = {
+    "nock-13.0.4" = {
       name = "nock";
       packageName = "nock";
-      version = "13.0.6";
+      version = "13.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nock/-/nock-13.0.6.tgz";
-        sha512 = "W81UZ1Tv21SWDZcA8Lu9LXYVl2gO9ADY5GadC6gFV9690h4TXz0oCkEoMckN/sPMHkDA79Ka9dXga9Mt1+j+Sg==";
+        url = "https://registry.npmjs.org/nock/-/nock-13.0.4.tgz";
+        sha512 = "alqTV8Qt7TUbc74x1pKRLSENzfjp4nywovcJgi/1aXDiUxXdt7TkruSTF5MDWPP7UoPVgea4F9ghVdmX0xxnSA==";
       };
     };
     "node-oauth1-1.3.0" = {
@@ -3190,13 +3172,13 @@ let
         sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
       };
     };
-    "p-limit-3.1.0" = {
+    "p-limit-3.0.2" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "3.1.0";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz";
-        sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz";
+        sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==";
       };
     };
     "p-locate-3.0.0" = {
@@ -3397,22 +3379,22 @@ let
         sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
       };
     };
-    "postman-collection-3.6.9" = {
+    "postman-collection-3.6.8" = {
       name = "postman-collection";
       packageName = "postman-collection";
-      version = "3.6.9";
+      version = "3.6.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.9.tgz";
-        sha512 = "R3A4tM/Ll6ekkfsXqqefR2r/jSyubXc9Pa/DQSbocEUKzdT3QMMb0QR5SHNjDuR1qE+bywC5dyD2FO2+DFXJ6w==";
+        url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.8.tgz";
+        sha512 = "TNPaK2dpVRhttUFo/WN0ReopXEtuSQMktwcvwJbQ0z8K+5hftvyx2ia40xgg9qFl/Ra78qoNTUmLL1s3lRqLMg==";
       };
     };
-    "postman-collection-transformer-4.0.0" = {
+    "postman-collection-transformer-3.3.3" = {
       name = "postman-collection-transformer";
       packageName = "postman-collection-transformer";
-      version = "4.0.0";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-collection-transformer/-/postman-collection-transformer-4.0.0.tgz";
-        sha512 = "AGNGiSvMR7uJpuf2PpYbteYTsE/xsutyuUTaIRCcBhw8h0PS4vyQHua15uNB+PRaNsV8wKFm30T6z23yUg0rKg==";
+        url = "https://registry.npmjs.org/postman-collection-transformer/-/postman-collection-transformer-3.3.3.tgz";
+        sha512 = "Ra0hfljwB6xnGJ7a638K0TkXTf5BuwGNo1Ahpa9ECehOTOlUFisE8dqX5VZl04QGbpvN5nmr0rwrtLXtK53Abg==";
       };
     };
     "postman-jsdoc-theme-0.0.3" = {
@@ -3424,40 +3406,40 @@ let
         sha1 = "60e4fbf3b2175f772520b3c978c07a8bd32b5829";
       };
     };
-    "postman-request-2.88.1-postman.28" = {
+    "postman-request-2.88.1-postman.27" = {
       name = "postman-request";
       packageName = "postman-request";
-      version = "2.88.1-postman.28";
+      version = "2.88.1-postman.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.28.tgz";
-        sha512 = "QjhC9tIuHZTlYJafzCz7u+Nq57NgtOhJmt94RjcNyzpIts1QbihmAgYm0OhNoqcOIU91sNi2aYw2PCyAJR3kcQ==";
+        url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.27.tgz";
+        sha512 = "4Qc7p3/cbp5S4Q6LcOzJ+K5N7loWDKjW0S9hj8M2AMJDUVcFUbdgvQb6ZfTERz2+34xP9ByCy7VhdnNCATe/bA==";
       };
     };
-    "postman-runtime-7.26.10" = {
+    "postman-runtime-7.26.8" = {
       name = "postman-runtime";
       packageName = "postman-runtime";
-      version = "7.26.10";
+      version = "7.26.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.10.tgz";
-        sha512 = "rYrSF/G0FoWHvOfbEuKVAgKYU8Nl6ow4+iYfdpRfJuTNcrHmfsdumzzdRJ8n0ZY0awAyrrtcAUr/NvSfdof3qA==";
+        url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.8.tgz";
+        sha512 = "ZMUZ7mQ2SMOX/C/ntgx2SAfRt3VV6wOy+aLyWbAqpQPo5Jfodxwv9QhxGj3S2km+IYzO6BT1luzE8X8fr2UafA==";
       };
     };
-    "postman-sandbox-4.0.1" = {
+    "postman-sandbox-4.0.0" = {
       name = "postman-sandbox";
       packageName = "postman-sandbox";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.1.tgz";
-        sha512 = "m0Jw95y5kzSdCY3yWf/hZlkqYxRyBG5sxqiI2D/48nKiHnYLkyMSHErRDJbMj7K4tjXBXn+BKWpWnRsf+iBdlw==";
+        url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.0.tgz";
+        sha512 = "0j1VCDa5MHMTfZqv2XSYUyn+hgT9izoRdGFAvjtHCH+i+2TP1KxqXzjxXzOdx1pt26wpl9APdJ2hKKFpx9UlrQ==";
       };
     };
-    "postman-url-encoder-3.0.1" = {
+    "postman-url-encoder-3.0.0" = {
       name = "postman-url-encoder";
       packageName = "postman-url-encoder";
-      version = "3.0.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.1.tgz";
-        sha512 = "dMPqXnkDlstM2Eya+Gw4MIGWEan8TzldDcUKZIhZUsJ/G5JjubfQPhFhVWKzuATDMvwvrWbSjF+8VmAvbu6giw==";
+        url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.0.tgz";
+        sha512 = "bk5wus5/5Ei9pbh+sQXaAxS5n4ZwiNAaIA8VBvRcXP6QyKcue2yF6xk1HqdtaZoH1G8+6509SVeOBojoFQ7nrA==";
       };
     };
     "prelude-ls-1.2.1" = {
@@ -3730,15 +3712,6 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
-    "require-from-string-2.0.2" = {
-      name = "require-from-string";
-      packageName = "require-from-string";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz";
-        sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==";
-      };
-    };
     "require-main-filename-2.0.0" = {
       name = "require-main-filename";
       packageName = "require-main-filename";
@@ -3757,13 +3730,13 @@ let
         sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==";
       };
     };
-    "resolve-1.19.0" = {
+    "resolve-1.18.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.19.0";
+      version = "1.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
-        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz";
+        sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
       };
     };
     "resolve-from-4.0.0" = {
@@ -3793,6 +3766,15 @@ let
         sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
       };
     };
+    "rimraf-2.6.3" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
+        sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
+      };
+    };
     "rimraf-3.0.2" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3874,13 +3856,13 @@ let
         sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
       };
     };
-    "semver-7.3.4" = {
+    "semver-7.3.2" = {
       name = "semver";
       packageName = "semver";
-      version = "7.3.4";
+      version = "7.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
-        sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz";
+        sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==";
       };
     };
     "serialised-error-1.1.3" = {
@@ -3964,31 +3946,31 @@ let
         sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
-    "sinon-9.2.3" = {
+    "sinon-9.2.1" = {
       name = "sinon";
       packageName = "sinon";
-      version = "9.2.3";
+      version = "9.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sinon/-/sinon-9.2.3.tgz";
-        sha512 = "m+DyAWvqVHZtjnjX/nuShasykFeiZ+nPuEfD4G3gpvKGkXRhkF/6NSt2qN2FjZhfrcHXFzUzI+NLnk+42fnLEw==";
+        url = "https://registry.npmjs.org/sinon/-/sinon-9.2.1.tgz";
+        sha512 = "naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w==";
       };
     };
-    "slice-ansi-4.0.0" = {
+    "slice-ansi-2.1.0" = {
       name = "slice-ansi";
       packageName = "slice-ansi";
-      version = "4.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz";
-        sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==";
+        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz";
+        sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
       };
     };
-    "sort-array-4.1.3" = {
+    "sort-array-4.1.2" = {
       name = "sort-array";
       packageName = "sort-array";
-      version = "4.1.3";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sort-array/-/sort-array-4.1.3.tgz";
-        sha512 = "6auiM0DNob/zF+7Ae/SM4BFL5D7DPK/HVcllhVu5V+FgoCPs0A6b6ZwJDuvJpXQgFpxqLZUOD2kdxqO4Z59dkg==";
+        url = "https://registry.npmjs.org/sort-array/-/sort-array-4.1.2.tgz";
+        sha512 = "G5IUpM+OcVnyaWHMv84Y/RQYiFQoSu6eUtJZu840iM6nR7zeY/eOGny2epkr5VKqCGDkOj3UBzOluDZ7hFpljA==";
       };
     };
     "source-map-0.5.7" = {
@@ -4036,13 +4018,13 @@ let
         sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.7" = {
+    "spdx-license-ids-3.0.6" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.7";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
-        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
+        sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==";
       };
     };
     "split-ca-1.0.1" = {
@@ -4288,13 +4270,13 @@ let
         sha1 = "b6f9a900d496a57f02408f22198c109dda063041";
       };
     };
-    "table-6.0.7" = {
+    "table-5.4.6" = {
       name = "table";
       packageName = "table";
-      version = "6.0.7";
+      version = "5.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz";
-        sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==";
+        url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz";
+        sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
       };
     };
     "table-layout-0.4.5" = {
@@ -4540,13 +4522,13 @@ let
         sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==";
       };
     };
-    "uglify-js-3.12.5" = {
+    "uglify-js-3.11.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.12.5";
+      version = "3.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
-        sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz";
+        sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==";
       };
     };
     "underscore-1.10.2" = {
@@ -4567,13 +4549,13 @@ let
         sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
       };
     };
-    "uri-js-4.4.1" = {
+    "uri-js-4.4.0" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.1";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
-        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
+        sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
       };
     };
     "utcstring-0.1.0" = {
@@ -4747,6 +4729,15 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
+    "write-1.0.3" = {
+      name = "write";
+      packageName = "write";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz";
+        sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==";
+      };
+    };
     "write-file-atomic-3.0.3" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -4810,13 +4801,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.1" = {
+    "y18n-4.0.0" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
-        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
     "yallist-2.1.2" = {
@@ -4828,15 +4819,6 @@ let
         sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
       };
     };
-    "yallist-4.0.0" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
-        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
-      };
-    };
     "yargs-13.3.2" = {
       name = "yargs";
       packageName = "yargs";
@@ -4882,67 +4864,55 @@ let
         sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==";
       };
     };
-    "yocto-queue-0.1.0" = {
-      name = "yocto-queue";
-      packageName = "yocto-queue";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz";
-        sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==";
-      };
-    };
   };
 in
 {
   newman = nodeEnv.buildNodePackage {
     name = "newman";
     packageName = "newman";
-    version = "5.2.2";
+    version = "5.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/newman/-/newman-5.2.2.tgz";
-      sha512 = "aRkh8eeRkKBlwxwBSdYQFZVLvSNMfRDmwPUfddlYR6PwZVKwukmoJmo9QTkRmo6vehgMmt2RTVkfwIIp73X1gg==";
+      url = "https://registry.npmjs.org/newman/-/newman-5.2.1.tgz";
+      sha512 = "kEuTMQCiORHZFx92sPVih8RHsJ40JxgxvlsrUe6MFXLQg2/UrO1KaUQCDabTy41tOu0a+dx6Mtg+x+uK1rCPcA==";
     };
     dependencies = [
-      sources."@babel/code-frame-7.12.11"
-      (sources."@babel/core-7.12.10" // {
+      sources."@babel/code-frame-7.10.4"
+      (sources."@babel/core-7.12.3" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."ms-2.1.2"
+          sources."debug-4.3.0"
           sources."semver-5.7.1"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.12.11" // {
+      (sources."@babel/generator-7.12.5" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
-      sources."@babel/helper-function-name-7.12.11"
-      sources."@babel/helper-get-function-arity-7.12.10"
-      sources."@babel/helper-member-expression-to-functions-7.12.7"
+      sources."@babel/helper-function-name-7.10.4"
+      sources."@babel/helper-get-function-arity-7.10.4"
+      sources."@babel/helper-member-expression-to-functions-7.12.1"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.12.10"
-      sources."@babel/helper-replace-supers-7.12.11"
+      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
-      sources."@babel/helper-split-export-declaration-7.12.11"
-      sources."@babel/helper-validator-identifier-7.12.11"
+      sources."@babel/helper-split-export-declaration-7.11.0"
+      sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.11"
-      sources."@babel/template-7.12.7"
-      (sources."@babel/traverse-7.12.12" // {
+      sources."@babel/parser-7.12.5"
+      sources."@babel/template-7.10.4"
+      (sources."@babel/traverse-7.12.5" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.3.0"
           sources."globals-11.12.0"
-          sources."ms-2.1.2"
         ];
       })
-      sources."@babel/types-7.12.12"
-      (sources."@eslint/eslintrc-0.3.0" // {
+      sources."@babel/types-7.12.6"
+      (sources."@eslint/eslintrc-0.2.1" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."ms-2.1.2"
+          sources."debug-4.3.0"
         ];
       })
       (sources."@istanbuljs/load-nyc-config-1.1.0" // {
@@ -4956,9 +4926,10 @@ in
       sources."@istanbuljs/schema-0.1.2"
       sources."@postman/form-data-3.1.1"
       sources."@postman/tunnel-agent-0.6.3"
-      sources."@sinonjs/commons-1.8.2"
+      sources."@sinonjs/commons-1.8.1"
       sources."@sinonjs/fake-timers-6.0.1"
-      sources."@sinonjs/samsam-5.3.1"
+      sources."@sinonjs/formatio-5.0.1"
+      sources."@sinonjs/samsam-5.2.0"
       sources."@sinonjs/text-encoding-0.7.1"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."JSONStream-1.3.2"
@@ -4983,15 +4954,15 @@ in
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."assertion-error-1.1.0"
-      sources."astral-regex-2.0.0"
+      sources."astral-regex-1.0.0"
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.5.1"
+      sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.1.0"
       (sources."bl-1.2.3" // {
         dependencies = [
           (sources."readable-stream-2.3.7" // {
@@ -5066,7 +5037,7 @@ in
           sources."array-back-2.0.0"
         ];
       })
-      sources."commander-6.2.1"
+      sources."commander-6.2.0"
       sources."comment-parser-0.7.6"
       sources."common-sequence-2.0.0"
       sources."commondir-1.0.1"
@@ -5090,12 +5061,12 @@ in
       })
       sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
-      sources."csv-parse-4.14.2"
+      sources."csv-parse-4.12.0"
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
       sources."date-format-0.0.2"
       sources."dbug-0.4.2"
-      sources."debug-3.2.7"
+      sources."debug-3.2.6"
       sources."decamelize-1.2.0"
       sources."deep-eql-3.0.1"
       sources."deep-extend-0.6.0"
@@ -5126,7 +5097,7 @@ in
       sources."doctrine-3.0.0"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.1.0"
+          sources."domelementtype-2.0.2"
           sources."entities-2.1.0"
         ];
       })
@@ -5137,9 +5108,7 @@ in
       (sources."editorconfig-0.15.3" // {
         dependencies = [
           sources."commander-2.20.3"
-          sources."lru-cache-4.1.5"
           sources."semver-5.7.1"
-          sources."yallist-2.1.2"
         ];
       })
       sources."emoji-regex-8.0.0"
@@ -5149,22 +5118,20 @@ in
       sources."es6-error-4.1.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.18.0" // {
+      (sources."eslint-7.12.1" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
-          sources."debug-4.3.2"
+          sources."debug-4.3.0"
           sources."has-flag-4.0.0"
-          sources."ms-2.1.2"
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."eslint-plugin-jsdoc-30.7.13" // {
+      (sources."eslint-plugin-jsdoc-30.7.6" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."ms-2.1.2"
+          sources."debug-4.3.0"
         ];
       })
       sources."eslint-plugin-lodash-7.1.0"
@@ -5177,7 +5144,7 @@ in
         ];
       })
       sources."eslint-visitor-keys-2.0.0"
-      (sources."espree-7.3.1" // {
+      (sources."espree-7.3.0" // {
         dependencies = [
           sources."eslint-visitor-keys-1.3.0"
         ];
@@ -5203,7 +5170,7 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."file-entry-cache-6.0.0"
+      sources."file-entry-cache-5.0.1"
       sources."file-set-4.0.1"
       sources."file-type-3.9.0"
       sources."filesize-6.1.0"
@@ -5221,11 +5188,15 @@ in
       })
       sources."find-up-5.0.0"
       sources."flat-5.0.2"
-      sources."flat-cache-3.0.4"
+      (sources."flat-cache-2.0.1" // {
+        dependencies = [
+          sources."flatted-2.0.2"
+        ];
+      })
       sources."flatted-3.1.0"
       sources."foreground-child-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."fromentries-1.3.2"
+      sources."fromentries-1.3.1"
       sources."fs-constants-1.0.0"
       sources."fs-then-native-2.0.0"
       sources."fs.realpath-1.0.0"
@@ -5263,7 +5234,7 @@ in
       sources."httpreq-0.4.24"
       sources."iconv-lite-0.6.2"
       sources."ignore-4.0.6"
-      (sources."import-fresh-3.3.0" // {
+      (sources."import-fresh-3.2.2" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -5284,7 +5255,7 @@ in
       sources."interpret-1.4.0"
       sources."ip-regex-2.1.0"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.2.0"
+      sources."is-core-module-2.0.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
@@ -5306,6 +5277,7 @@ in
       (sources."istanbul-lib-processinfo-2.0.2" // {
         dependencies = [
           sources."make-dir-3.1.0"
+          sources."rimraf-3.0.2"
           sources."semver-6.3.0"
         ];
       })
@@ -5319,14 +5291,13 @@ in
       })
       (sources."istanbul-lib-source-maps-4.0.0" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."ms-2.1.2"
+          sources."debug-4.3.0"
         ];
       })
       sources."istanbul-reports-3.0.2"
       sources."js-sha512-0.8.0"
       sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-3.14.0"
       sources."js2xmlparser-4.0.1"
       sources."jsbn-0.1.1"
       (sources."jsdoc-3.6.6" // {
@@ -5383,7 +5354,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       (sources."markdown-it-10.0.0" // {
         dependencies = [
@@ -5391,11 +5362,11 @@ in
         ];
       })
       sources."markdown-it-anchor-5.3.0"
-      sources."marked-1.2.7"
+      sources."marked-1.2.0"
       sources."mdurl-1.0.1"
-      sources."mime-db-1.45.0"
+      sources."mime-db-1.44.0"
       sources."mime-format-2.0.0"
-      sources."mime-types-2.1.28"
+      sources."mime-types-2.1.27"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdirp-1.0.4"
@@ -5405,20 +5376,17 @@ in
           sources."debug-4.2.0"
           sources."escape-string-regexp-4.0.0"
           sources."has-flag-4.0.0"
-          sources."js-yaml-3.14.0"
-          sources."ms-2.1.2"
           sources."supports-color-7.2.0"
         ];
       })
-      sources."ms-2.1.3"
+      sources."ms-2.1.2"
       sources."nanoid-3.1.12"
       sources."natural-compare-1.4.0"
       sources."neo-async-2.6.2"
       sources."nise-4.0.4"
-      (sources."nock-13.0.6" // {
+      (sources."nock-13.0.4" // {
         dependencies = [
-          sources."debug-4.3.2"
-          sources."ms-2.1.2"
+          sources."debug-4.3.0"
         ];
       })
       sources."node-oauth1-1.3.0"
@@ -5436,6 +5404,7 @@ in
           sources."make-dir-3.1.0"
           sources."p-limit-2.3.0"
           sources."p-locate-4.1.0"
+          sources."rimraf-3.0.2"
           sources."semver-6.3.0"
           sources."wrap-ansi-6.2.0"
           sources."yargs-15.4.1"
@@ -5449,7 +5418,7 @@ in
       sources."object-to-spawn-args-2.0.0"
       sources."once-1.4.0"
       sources."optionator-0.9.1"
-      sources."p-limit-3.1.0"
+      sources."p-limit-3.0.2"
       sources."p-locate-5.0.0"
       sources."p-map-3.0.0"
       sources."p-try-2.2.0"
@@ -5491,25 +5460,27 @@ in
           sources."supports-color-6.1.0"
         ];
       })
-      sources."postman-collection-3.6.9"
-      (sources."postman-collection-transformer-4.0.0" // {
+      sources."postman-collection-3.6.8"
+      (sources."postman-collection-transformer-3.3.3" // {
         dependencies = [
-          sources."commander-6.2.0"
+          sources."commander-5.1.0"
+          sources."lodash-4.17.19"
         ];
       })
       sources."postman-jsdoc-theme-0.0.3"
-      (sources."postman-request-2.88.1-postman.28" // {
+      (sources."postman-request-2.88.1-postman.27" // {
         dependencies = [
           sources."tough-cookie-2.5.0"
         ];
       })
-      (sources."postman-runtime-7.26.10" // {
+      (sources."postman-runtime-7.26.8" // {
         dependencies = [
           sources."async-2.6.3"
+          sources."aws4-1.10.1"
         ];
       })
-      sources."postman-sandbox-4.0.1"
-      sources."postman-url-encoder-3.0.1"
+      sources."postman-sandbox-4.0.0"
+      sources."postman-url-encoder-3.0.0"
       sources."prelude-ls-1.2.1"
       sources."pretty-ms-7.0.1"
       sources."process-nextick-args-2.0.1"
@@ -5547,19 +5518,18 @@ in
       sources."regextras-0.7.1"
       sources."release-zalgo-1.0.0"
       sources."require-directory-2.1.1"
-      sources."require-from-string-2.0.2"
       sources."require-main-filename-2.0.0"
       sources."requizzle-0.2.3"
-      sources."resolve-1.19.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-5.0.0"
       sources."ret-0.1.15"
-      sources."rimraf-3.0.2"
+      sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.1"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sanitize-html-1.20.1"
       sources."sax-1.2.4"
-      sources."semver-7.3.4"
+      sources."semver-7.3.2"
       (sources."serialised-error-1.1.3" // {
         dependencies = [
           sources."stack-trace-0.0.9"
@@ -5573,22 +5543,19 @@ in
       sources."shelljs-0.8.4"
       sources."sigmund-1.0.1"
       sources."signal-exit-3.0.3"
-      (sources."sinon-9.2.3" // {
+      (sources."sinon-9.2.1" // {
         dependencies = [
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."slice-ansi-4.0.0" // {
+      (sources."slice-ansi-2.1.0" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
+          sources."is-fullwidth-code-point-2.0.0"
         ];
       })
-      (sources."sort-array-4.1.3" // {
+      (sources."sort-array-4.1.2" // {
         dependencies = [
-          sources."array-back-5.0.0"
           sources."typical-6.0.1"
         ];
       })
@@ -5596,12 +5563,13 @@ in
       (sources."spawn-wrap-2.0.0" // {
         dependencies = [
           sources."make-dir-3.1.0"
+          sources."rimraf-3.0.2"
           sources."semver-6.3.0"
         ];
       })
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.7"
+      sources."spdx-license-ids-3.0.6"
       sources."split-ca-1.0.1"
       sources."sprintf-js-1.0.3"
       sources."srcset-1.0.0"
@@ -5622,10 +5590,13 @@ in
       sources."strip-json-comments-3.1.1"
       sources."supports-color-5.5.0"
       sources."symbol-0.3.1"
-      (sources."table-6.0.7" // {
+      (sources."table-5.4.6" // {
         dependencies = [
-          sources."ajv-7.0.3"
-          sources."json-schema-traverse-1.0.0"
+          sources."ansi-regex-4.1.0"
+          sources."emoji-regex-7.0.3"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
         ];
       })
       (sources."table-layout-0.4.5" // {
@@ -5668,9 +5639,9 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."typical-2.6.1"
       sources."uc.micro-1.0.6"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.11.5"
       sources."underscore-1.7.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.4.0"
       sources."utcstring-0.1.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -5708,6 +5679,11 @@ in
         ];
       })
       sources."wrappy-1.0.2"
+      (sources."write-1.0.3" // {
+        dependencies = [
+          sources."mkdirp-0.5.5"
+        ];
+      })
       sources."write-file-atomic-3.0.3"
       (sources."xml2js-0.4.23" // {
         dependencies = [
@@ -5717,8 +5693,8 @@ in
       sources."xmlbuilder-15.1.1"
       sources."xmlcreate-2.0.3"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.1"
-      sources."yallist-4.0.0"
+      sources."y18n-4.0.0"
+      sources."yallist-2.1.2"
       (sources."yargs-13.3.2" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -5740,12 +5716,11 @@ in
           sources."decamelize-4.0.0"
         ];
       })
-      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Command-line companion utility for Postman";
-      homepage = "https://github.com/postmanlabs/newman";
+      homepage = https://github.com/postmanlabs/newman;
       license = "Apache-2.0";
     };
     production = false;
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 4dbaae6c90d..4964056055e 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -1,34 +1,43 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@sinonjs/commons-1.8.2" = {
+    "@sinonjs/commons-1.7.1" = {
       name = "_at_sinonjs_slash_commons";
       packageName = "@sinonjs/commons";
-      version = "1.8.2";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz";
-        sha512 = "sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==";
+        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz";
+        sha512 = "Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ==";
       };
     };
-    "@sinonjs/fake-timers-6.0.1" = {
+    "@sinonjs/fake-timers-6.0.0" = {
       name = "_at_sinonjs_slash_fake-timers";
       packageName = "@sinonjs/fake-timers";
-      version = "6.0.1";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz";
-        sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==";
+        url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.0.tgz";
+        sha512 = "atR1J/jRXvQAb47gfzSK8zavXy7BcpnYq21ALon0U99etu99vsir0trzIO3wpeLtW+LLVY6X7EkfVTbjGSH8Ww==";
       };
     };
-    "@sinonjs/samsam-5.3.1" = {
+    "@sinonjs/formatio-5.0.1" = {
+      name = "_at_sinonjs_slash_formatio";
+      packageName = "@sinonjs/formatio";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz";
+        sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==";
+      };
+    };
+    "@sinonjs/samsam-5.0.3" = {
       name = "_at_sinonjs_slash_samsam";
       packageName = "@sinonjs/samsam";
-      version = "5.3.1";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz";
-        sha512 = "1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==";
+        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.0.3.tgz";
+        sha512 = "QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==";
       };
     };
     "@sinonjs/text-encoding-0.7.1" = {
@@ -40,22 +49,13 @@ let
         sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==";
       };
     };
-    "@ungap/promise-all-settled-1.1.2" = {
-      name = "_at_ungap_slash_promise-all-settled";
-      packageName = "@ungap/promise-all-settled";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz";
-        sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==";
-      };
-    };
     "JSONStream-1.3.5" = {
       name = "JSONStream";
       packageName = "JSONStream";
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz";
-        sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==";
+        sha512 = "2lyrcp8yh09p0f000ng5q5r5xwm464cx60mnyjlaw9f0as75ifl27a22cyk61zpa7zilg9k5crblj9lbbnnsi42ndymbwcqsfwaps0k";
       };
     };
     "abbrev-1.1.1" = {
@@ -64,16 +64,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
       };
     };
-    "acorn-7.4.1" = {
+    "acorn-7.1.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "7.4.1";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
-        sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz";
+        sha512 = "29c8jlhwnfbnqa2s1v593lcpksv4hl56lywss4gy6w0mwmhx4ydf2n7var8bhcf39nm9asph0ybnf1hkw0s0j91qi7r99ir01v7pmv9";
       };
     };
     "acorn-node-1.8.2" = {
@@ -82,16 +82,16 @@ let
       version = "1.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz";
-        sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==";
+        sha512 = "3ja2k5v6p53920jdprvx0p83ycv68fdphfdmr72xmvg2450i37chn1f7mlvfxv4q8i14ypbnsbbyirii033qa6jkvcg5fa3r5z7wszj";
       };
     };
-    "acorn-walk-7.2.0" = {
+    "acorn-walk-7.1.1" = {
       name = "acorn-walk";
       packageName = "acorn-walk";
-      version = "7.2.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz";
-        sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==";
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz";
+        sha512 = "10s7pz9c2jqw7sjmkkwfb6kyyfgb7qqpmz2gc0fq9phhmfknyw029x1jbw0cwi47wbacpwkw65601arnid2l95lmz0xbzv6ddilznf1";
       };
     };
     "adm-zip-0.2.1" = {
@@ -103,13 +103,22 @@ let
         sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
       };
     };
-    "ansi-colors-4.1.1" = {
+    "ajv-6.12.0" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "6.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g";
+      };
+    };
+    "ansi-colors-3.2.3" = {
       name = "ansi-colors";
       packageName = "ansi-colors";
-      version = "4.1.1";
+      version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz";
-        sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==";
+        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz";
+        sha512 = "2gpv8bq9jq550ygnnm5srza0w0lfg8mr8z39702l0rgxhf35sxmdzxpppvwcp50rpk0dgjz516nbkygm0fk4675kb9qsgb5x35cfh9c";
       };
     };
     "ansi-regex-3.0.0" = {
@@ -127,7 +136,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
-        sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+        sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm";
       };
     };
     "ansi-styles-3.2.1" = {
@@ -136,16 +145,7 @@ let
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
-      };
-    };
-    "ansi-styles-4.3.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
-        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
+        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
       };
     };
     "anymatch-3.1.1" = {
@@ -154,7 +154,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz";
-        sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==";
+        sha512 = "2776jrfn8kh9r6qhz6s43znnwvqmbqrjsch99hdv21j53sj4njyjhrya67drxk8y7hvi28mjvdjj277jy4qd2zfayrjli3cdbdkkkwq";
       };
     };
     "argparse-1.0.10" = {
@@ -163,16 +163,16 @@ let
       version = "1.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
       };
     };
-    "array-filter-1.0.0" = {
-      name = "array-filter";
-      packageName = "array-filter";
-      version = "1.0.0";
+    "asap-2.0.6" = {
+      name = "asap";
+      packageName = "asap";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz";
-        sha1 = "baf79e62e6ef4c2a4c0b831232daffec251f9d83";
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
       };
     };
     "asn1-0.1.11" = {
@@ -184,13 +184,22 @@ let
         sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
       };
     };
-    "asn1.js-5.4.1" = {
+    "asn1-0.2.4" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
+        sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g";
+      };
+    };
+    "asn1.js-4.10.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "5.4.1";
+      version = "4.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz";
-        sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
+        sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7";
       };
     };
     "assert-1.5.0" = {
@@ -199,7 +208,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz";
-        sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==";
+        sha512 = "1n2xh5m359gm4my50j2206n32q2h044lqrl8h122gjn41fizlrh32j1lj7wqfix1iblyvi7zvdgvzbf97f840lr17vfk8ph1imj0fqh";
       };
     };
     "assert-plus-0.1.5" = {
@@ -211,6 +220,15 @@ let
         sha1 = "ee74009413002d84cec7219c6ac811812e723160";
       };
     };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
     "async-0.9.2" = {
       name = "async";
       packageName = "async";
@@ -220,13 +238,13 @@ let
         sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
       };
     };
-    "available-typed-arrays-1.0.2" = {
-      name = "available-typed-arrays";
-      packageName = "available-typed-arrays";
-      version = "1.0.2";
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz";
-        sha512 = "XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==";
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
     "aws-sign2-0.5.0" = {
@@ -238,6 +256,24 @@ let
         sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
       };
     };
+    "aws-sign2-0.7.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
+        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+      };
+    };
+    "aws4-1.9.1" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0";
+      };
+    };
     "balanced-match-1.0.0" = {
       name = "balanced-match";
       packageName = "balanced-match";
@@ -247,40 +283,40 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base64-js-1.5.1" = {
+    "base64-js-1.3.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.5.1";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
-        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+        sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q";
       };
     };
-    "binary-extensions-2.2.0" = {
+    "bcrypt-pbkdf-1.0.2" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    };
+    "binary-extensions-2.0.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
-        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz";
+        sha512 = "2izzpdg2m0av5pzbv1zyjfi15ddz5yk1d4h9cilzc8z6pzq5abcicnm2xx4b2jdrjk2l4h3zfawsxhnbzlgvlv4700q5930k796s69y";
       };
     };
-    "bn.js-4.11.9" = {
+    "bn.js-4.11.8" = {
       name = "bn.js";
       packageName = "bn.js";
-      version = "4.11.9";
+      version = "4.11.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz";
-        sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==";
-      };
-    };
-    "bn.js-5.1.3" = {
-      name = "bn.js";
-      packageName = "bn.js";
-      version = "5.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz";
-        sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==";
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
+        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
       };
     };
     "boom-0.4.2" = {
@@ -298,7 +334,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
       };
     };
     "braces-3.0.2" = {
@@ -307,7 +343,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
-        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
+        sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg";
       };
     };
     "brorand-1.1.0" = {
@@ -325,16 +361,16 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz";
-        sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==";
+        sha512 = "1cav0iv5irfvilx6x14zbxil5m012hxan16cgyp9yjs6fqfg6fny2cdjimfwgil9ma8n4w8g8wv4yn843sz257p44vkbaz8qn1jxdks";
       };
     };
-    "browser-resolve-2.0.0" = {
+    "browser-resolve-1.11.3" = {
       name = "browser-resolve";
       packageName = "browser-resolve";
-      version = "2.0.0";
+      version = "1.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz";
-        sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==";
+        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz";
+        sha512 = "1slq1pnm0b2903am1rl17iczlsl08sq4rckkr5fgkchgzfac13kiibwdk08yy2m62lgir8dmj9d61vil8q0vrm1d2mzw1qn2vaf443v";
       };
     };
     "browser-stdout-1.3.1" = {
@@ -343,7 +379,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
-        sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
+        sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
       };
     };
     "browserify-aes-1.2.0" = {
@@ -352,7 +388,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
-        sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==";
+        sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v";
       };
     };
     "browserify-cipher-1.0.1" = {
@@ -361,7 +397,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
-        sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==";
+        sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h";
       };
     };
     "browserify-des-1.0.2" = {
@@ -370,25 +406,25 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz";
-        sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
+        sha512 = "3j1gv3firnsbjppm47ldxbav9rmh3plq026zn728wvhgf19i4r7kxzyyj7hpibhjv61lcm9i4b869yy90c8hfj7w8rmr17p2zbhwah6";
       };
     };
-    "browserify-rsa-4.1.0" = {
+    "browserify-rsa-4.0.1" = {
       name = "browserify-rsa";
       packageName = "browserify-rsa";
-      version = "4.1.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz";
-        sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==";
+        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "browserify-sign-4.2.1" = {
+    "browserify-sign-4.0.4" = {
       name = "browserify-sign";
       packageName = "browserify-sign";
-      version = "4.2.1";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz";
-        sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==";
+        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
+        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
       };
     };
     "browserify-zlib-0.2.0" = {
@@ -397,16 +433,16 @@ let
       version = "0.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
-        sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
+        sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
       };
     };
-    "buffer-5.2.1" = {
+    "buffer-5.5.0" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.2.1";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz";
-        sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz";
+        sha512 = "9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==";
       };
     };
     "buffer-from-1.1.1" = {
@@ -415,7 +451,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
-        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+        sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri";
       };
     };
     "buffer-xor-1.0.3" = {
@@ -442,16 +478,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz";
-        sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==";
-      };
-    };
-    "call-bind-1.0.2" = {
-      name = "call-bind";
-      packageName = "call-bind";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
-        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
+        sha512 = "0icxxn530vx1cwkygvk52k2l9brpv2mdbyk0j4hyr224b23vxvh131l2m1gljpfvsikzib3x2zyiy2xngjjfz9k9n68lvq4ram8dgg6";
       };
     };
     "camelcase-5.3.1" = {
@@ -460,34 +487,34 @@ let
       version = "5.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
-        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
+        sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg";
       };
     };
-    "camelcase-6.2.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "6.2.0";
+    "caseless-0.12.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz";
-        sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "chalk-4.1.0" = {
+    "chalk-2.4.2" = {
       name = "chalk";
       packageName = "chalk";
-      version = "4.1.0";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz";
-        sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
+        sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j";
       };
     };
-    "chokidar-3.4.3" = {
+    "chokidar-3.3.0" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.4.3";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz";
-        sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz";
+        sha512 = "3hbyi14x38mvx936wbajln4g1l8fcyi8fwvcrhf2jqn0yzcyda1d20q67k445j9bvs5kr7jdhd2s07srb2pnm7hxmjngp2k6wn8lsbl";
       };
     };
     "cipher-base-1.0.4" = {
@@ -496,7 +523,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==";
+        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
       };
     };
     "cli-1.0.1" = {
@@ -514,7 +541,16 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
-        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
+        sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx";
+      };
+    };
+    "clone-2.1.2" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz";
+        sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
       };
     };
     "color-convert-1.9.3" = {
@@ -523,16 +559,7 @@ let
       version = "1.9.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
-        sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
-      };
-    };
-    "color-convert-2.0.1" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz";
-        sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
+        sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21";
       };
     };
     "color-name-1.1.3" = {
@@ -544,15 +571,6 @@ let
         sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
       };
     };
-    "color-name-1.1.4" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz";
-        sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
-      };
-    };
     "combine-source-map-0.8.0" = {
       name = "combine-source-map";
       packageName = "combine-source-map";
@@ -571,13 +589,22 @@ let
         sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
       };
     };
+    "combined-stream-1.0.8" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
+        sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm";
+      };
+    };
     "commander-2.20.3" = {
       name = "commander";
       packageName = "commander";
       version = "2.20.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
-        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
+        sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s";
       };
     };
     "concat-map-0.0.1" = {
@@ -595,7 +622,7 @@ let
       version = "1.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
-        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+        sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv";
       };
     };
     "config-chain-1.1.12" = {
@@ -604,7 +631,7 @@ let
       version = "1.1.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz";
-        sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
+        sha512 = "2hg7rni4gx8l765i8qzkp9dv69c8r06i8rxxkkkrsklbd8iz6ingxnp10r4fqqrm9jxy3gp8yp0lzpybwdf27kq49abkyxwrchqwmvb";
       };
     };
     "console-browserify-1.1.0" = {
@@ -622,7 +649,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz";
-        sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==";
+        sha512 = "168x7bp4xr522yw92himv9xv14q336ps1kkg79qcmarg3q4yzpd52pa8x8zgq11b6996f8053799k6365437si3pk85w5z4y8xiijb4";
       };
     };
     "constants-browserify-1.0.0" = {
@@ -643,15 +670,6 @@ let
         sha1 = "4829c877e9fe49b3161f3bf3673888e204699860";
       };
     };
-    "copy-anything-2.0.1" = {
-      name = "copy-anything";
-      packageName = "copy-anything";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz";
-        sha512 = "lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==";
-      };
-    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -661,13 +679,13 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "create-ecdh-4.0.4" = {
+    "create-ecdh-4.0.3" = {
       name = "create-ecdh";
       packageName = "create-ecdh";
-      version = "4.0.4";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz";
-        sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==";
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
+        sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r";
       };
     };
     "create-hash-1.2.0" = {
@@ -676,7 +694,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
-        sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==";
+        sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg";
       };
     };
     "create-hmac-1.1.7" = {
@@ -685,7 +703,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
-        sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
+        sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h";
       };
     };
     "cryptiles-0.2.2" = {
@@ -703,7 +721,7 @@ let
       version = "3.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
-        sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==";
+        sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz";
       };
     };
     "ctype-0.5.3" = {
@@ -721,7 +739,16 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz";
-        sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==";
+        sha512 = "182hz56w7yx6vplmlvvlqz57ckfvxch0nh5sj54074r7k3ydd8wwwajcgkvg7732hwgksm5b30jfr9c30wq8zq4f663gf9ap33isbjp";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
     "date-now-0.1.4" = {
@@ -733,22 +760,13 @@ let
         sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
       };
     };
-    "debug-3.2.7" = {
+    "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.7";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
-      };
-    };
-    "debug-4.2.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz";
-        sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
       };
     };
     "decamelize-1.2.0" = {
@@ -760,22 +778,13 @@ let
         sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     };
-    "decamelize-4.0.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz";
-        sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==";
-      };
-    };
     "define-properties-1.1.3" = {
       name = "define-properties";
       packageName = "define-properties";
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
-        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
+        sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw";
       };
     };
     "defined-1.0.0" = {
@@ -796,13 +805,22 @@ let
         sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
       };
     };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
     "deps-sort-2.0.1" = {
       name = "deps-sort";
       packageName = "deps-sort";
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz";
-        sha512 = "1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==";
+        sha512 = "1zsk235mlp9j7mkhw08fqx4rgn4r45mk4j54zf137nlyw4gs4irwwxjn6nllyv7jw30ihn1ad7xffg282zl394f52vqz9pr19fym2nn";
       };
     };
     "des.js-1.0.1" = {
@@ -811,7 +829,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz";
-        sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==";
+        sha512 = "085ljc5q2yk3jabd61p91n821q4prv13qalbfni9ybcb900b4mmcdnndi5b5prfs9wybp13asd13shlxgrbsgvyfx7nbgvby6jkhhj3";
       };
     };
     "detective-5.2.0" = {
@@ -820,7 +838,16 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz";
-        sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==";
+        sha512 = "0z7r2wfccs5i4n1v5ln5p5dkqvy3w97pmnl8kybcw1r7z1c067xr72nqn48j65nk435cpc261m6gdyfyhxjlqabs25bnlflx73hhaz9";
+      };
+    };
+    "diff-3.5.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";
+        sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3";
       };
     };
     "diff-4.0.2" = {
@@ -829,7 +856,7 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz";
-        sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==";
+        sha512 = "3ndiq7a8qsn2j6vlq5c6d38ynlydlhvk6q01rj321lcarrh0z7721w6cbrdw7lkx6pyfms59y1jkqcl6g2ir1rz5xr17q40lk26djg7";
       };
     };
     "diffie-hellman-5.0.3" = {
@@ -838,7 +865,7 @@ let
       version = "5.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
-        sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
+        sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj";
       };
     };
     "dom-serializer-0.2.2" = {
@@ -847,7 +874,7 @@ let
       version = "0.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz";
-        sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
+        sha512 = "3v6s9yk4g6cw8chgrba79rbahiqw782013df898df7k7d81n69x2135qashgf23q59zr3w42qncyf4hszlll8knkhv0xccifdplzz6v";
       };
     };
     "domain-browser-1.2.0" = {
@@ -856,7 +883,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
-        sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
+        sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f";
       };
     };
     "domelementtype-1.3.1" = {
@@ -865,16 +892,16 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz";
-        sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
+        sha512 = "3gmb8frh13hzm986ggv14h63h5033jp045mvy1wrcj9j56j822a86arwq7x743i6glkv1bw6qwqriivypd0icbkzi492cm96kwq28h5";
       };
     };
-    "domelementtype-2.1.0" = {
+    "domelementtype-2.0.1" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "2.1.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
-        sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz";
+        sha512 = "00vkhxlz4gkgfqzkp7faclfand3fr36zi4lpr50rjwbx54nfpr2fy612p2ixzpysqi28nfyzznngx5gvgcd13b52iy6ar8q7d88fwz4";
       };
     };
     "domhandler-2.3.0" = {
@@ -904,13 +931,22 @@ let
         sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
       };
     };
-    "elliptic-6.5.3" = {
+    "ecc-jsbn-0.1.2" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    };
+    "elliptic-6.5.2" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.3";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz";
-        sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz";
+        sha512 = "33kzl02iwbq3pl33ihcdq9nm48yzhfj96183zzra06hp3z6bacz3d99pl74jziwygys4npxbxwnvszz12wl8lpkjw8b4r9ki797p33z";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -919,7 +955,7 @@ let
       version = "7.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
-        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
+        sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b";
       };
     };
     "entities-1.0.0" = {
@@ -931,31 +967,31 @@ let
         sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
       };
     };
-    "entities-2.1.0" = {
+    "entities-2.0.0" = {
       name = "entities";
       packageName = "entities";
-      version = "2.1.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz";
-        sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
+        url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz";
+        sha512 = "0pqz0h0aafqad2dm3qs73sqk6nhgr7icrfqwnxbzysbdkh11grcbssa7m1nkyzc22g9zwpi752fpw5r58rrldhjjlqh4isj89bzpmqg";
       };
     };
-    "errno-0.1.8" = {
+    "errno-0.1.7" = {
       name = "errno";
       packageName = "errno";
-      version = "0.1.8";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz";
-        sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==";
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
+        sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii";
       };
     };
-    "es-abstract-1.18.0-next.2" = {
+    "es-abstract-1.17.4" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.18.0-next.2";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
-        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha512 = "24sx605c7x5di53nzw0x2brrfvy4nw76ws0gsd1hskdifrcxafn8fwk0n11si002zxhfs9c8nba1acaj2zkrqrgp8k5vw0vz2dyxv81";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -964,16 +1000,16 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
+        sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0";
       };
     };
-    "escape-string-regexp-4.0.0" = {
+    "escape-string-regexp-1.0.5" = {
       name = "escape-string-regexp";
       packageName = "escape-string-regexp";
-      version = "4.0.0";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz";
-        sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
     "esprima-4.0.1" = {
@@ -982,16 +1018,16 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
-        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
+        sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq";
       };
     };
-    "events-3.2.0" = {
+    "events-2.1.0" = {
       name = "events";
       packageName = "events";
-      version = "3.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz";
-        sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==";
+        url = "https://registry.npmjs.org/events/-/events-2.1.0.tgz";
+        sha512 = "059cw923gab3r2d2nk9nafd3h9skxvimn2k4qhnhss6j5vwwgvqaac3668299zdc634q9r8by6vidhjnkf052ir1vyw6xx7nyhs56fx";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -1000,7 +1036,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
-        sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
+        sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx";
       };
     };
     "exit-0.1.2" = {
@@ -1012,13 +1048,49 @@ let
         sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
       };
     };
+    "extend-3.0.2" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
+        sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
+      };
+    };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "fast-deep-equal-3.1.1" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi";
+      };
+    };
+    "fast-json-stable-stringify-2.1.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn";
+      };
+    };
     "fast-safe-stringify-2.0.7" = {
       name = "fast-safe-stringify";
       packageName = "fast-safe-stringify";
       version = "2.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz";
-        sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
+        sha512 = "1ab0spv3wadhidsh9x8qar1ryn7ahv308yzc5cl32wssk99rr7vrkcs00vn2kggz6drps08vk24gi9gmqpg39jd1rnaryykvh4vmnaj";
       };
     };
     "fill-range-7.0.1" = {
@@ -1027,7 +1099,7 @@ let
       version = "7.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
-        sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
+        sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8";
       };
     };
     "find-up-3.0.0" = {
@@ -1036,34 +1108,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
-        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+        sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p";
       };
     };
-    "find-up-5.0.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz";
-        sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==";
-      };
-    };
-    "flat-5.0.2" = {
+    "flat-4.1.0" = {
       name = "flat";
       packageName = "flat";
-      version = "5.0.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz";
-        sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==";
-      };
-    };
-    "foreach-2.0.5" = {
-      name = "foreach";
-      packageName = "foreach";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz";
-        sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99";
+        url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz";
+        sha512 = "0bj2zrb5x98lffdcjsvaf2hns9ih2jzj4dz9yg9k8zqrak4x0i93dvf01qp458mr6d1x4dsqsxc3ag00g2mskrr23h7x71kna4d67rz";
       };
     };
     "forever-agent-0.5.2" = {
@@ -1075,6 +1129,15 @@ let
         sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
       };
     };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
     "form-data-0.1.4" = {
       name = "form-data";
       packageName = "form-data";
@@ -1084,6 +1147,15 @@ let
         sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
       };
     };
+    "form-data-2.3.3" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
+        sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn";
+      };
+    };
     "fs.realpath-1.0.0" = {
       name = "fs.realpath";
       packageName = "fs.realpath";
@@ -1093,13 +1165,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-2.1.3" = {
+    "fsevents-2.1.2" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "2.1.3";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz";
-        sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz";
+        sha512 = "1j5ssfzy4xklkj74z7q64dpcld4zicsva1ihfys8dwa9l5apv7q350g4vg65nfp58c7aqkai1qmjlc3xshb97p5h3lsrl0r3j407327";
       };
     };
     "function-bind-1.1.1" = {
@@ -1108,7 +1180,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
       };
     };
     "get-assigned-identifiers-1.2.0" = {
@@ -1117,7 +1189,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz";
-        sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==";
+        sha512 = "1snk8irwshrwijh05cwxsdvjc5p2aqr8mk6qdcwxaka3llypkyibdz2mdkzw67g9l2vzhidfqg0ahdrzyknjk4a7c613bwkw6cp044q";
       };
     };
     "get-caller-file-2.0.5" = {
@@ -1126,16 +1198,25 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz";
-        sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
+        sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g";
       };
     };
-    "get-intrinsic-1.0.2" = {
-      name = "get-intrinsic";
-      packageName = "get-intrinsic";
-      version = "1.0.2";
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
-        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "glob-7.1.3" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
+        sha512 = "30h0j9f3xj7mwciwmi9q9ilhlc0l391jrvv0xws0yxgh389ynin3qqrw8xiyfy5w3f667bwn9p0i3f01s2ir0ai1rwbb038ij4fxixx";
       };
     };
     "glob-7.1.6" = {
@@ -1144,25 +1225,25 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
       };
     };
-    "glob-parent-5.1.1" = {
+    "glob-parent-5.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.1.1";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
-        sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
+        sha512 = "23qivv79xv6rvb8fsi8hj0ic91ijfkw6dynzp8716bzafazq27dqc9ibxxlkfs7wqnhyzzimaa3xn8i22838ds157kyg60mfa152fxa";
       };
     };
-    "graceful-fs-4.2.4" = {
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.4";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
-        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
       };
     };
     "growl-1.10.5" = {
@@ -1171,7 +1252,25 @@ let
       version = "1.10.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz";
-        sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==";
+        sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8";
+      };
+    };
+    "har-schema-2.0.0" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+      };
+    };
+    "har-validator-5.1.3" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "5.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
+        sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh";
       };
     };
     "has-1.0.3" = {
@@ -1180,7 +1279,16 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
-        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+        sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz";
+      };
+    };
+    "has-flag-3.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
+        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
     "has-flag-4.0.0" = {
@@ -1189,7 +1297,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz";
-        sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
+        sha512 = "0ylry8j6wanggw1786jw36k056caw516fasjfz5jl945p7g0zl2aqxsjd5fxxfah3hlhrbflnsb88vx42080sfsfbb38aimyi7hja8k";
       };
     };
     "has-symbols-1.0.1" = {
@@ -1198,16 +1306,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
-        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
+        sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw";
       };
     };
-    "hash-base-3.1.0" = {
+    "hash-base-3.0.4" = {
       name = "hash-base";
       packageName = "hash-base";
-      version = "3.1.0";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz";
-        sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==";
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
+        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
       };
     };
     "hash.js-1.1.7" = {
@@ -1216,7 +1324,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz";
-        sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==";
+        sha512 = "1f5xc15zpy3b7hssv57xnd92ja5r073zvd2pczvncxmy1jnbjcx716riyr2syvah88qk7328a6fz049mziv2k837093xqxd86r9m8xm";
       };
     };
     "hawk-1.0.0" = {
@@ -1234,7 +1342,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz";
-        sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
+        sha512 = "0dwml2q9r97ga11qbbn5sb46v4g47lx174dz9g1jgxpycknhg1d5dlsij2vja905p8h243jj51hfa5cmzh8n9rdcs8r78lg86fl7z8p";
       };
     };
     "hmac-drbg-1.0.1" = {
@@ -1282,6 +1390,15 @@ let
         sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
       };
     };
+    "http-signature-1.2.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+      };
+    };
     "https-browserify-1.0.0" = {
       name = "https-browserify";
       packageName = "https-browserify";
@@ -1291,22 +1408,13 @@ let
         sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     };
-    "iconv-lite-0.4.24" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
-      };
-    };
-    "ieee754-1.2.1" = {
+    "ieee754-1.1.13" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.2.1";
+      version = "1.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz";
-        sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
+        sha512 = "179jm8fhl2advz4j63klrp57sm99wvyb5jcxwfr9rhi730ybcxkyfqrr0pmwvir12zjzpkwwvjjkjclwrss7lpab7dg2myqc8izpxz2";
       };
     };
     "image-size-0.5.5" = {
@@ -1345,13 +1453,22 @@ let
         sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
       };
     };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
     "inherits-2.0.4" = {
       name = "inherits";
       packageName = "inherits";
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
       };
     };
     "ini-1.1.0" = {
@@ -1363,13 +1480,13 @@ let
         sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
       };
     };
-    "ini-1.3.8" = {
+    "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.8";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
       };
     };
     "inline-source-map-0.6.2" = {
@@ -1381,31 +1498,31 @@ let
         sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5";
       };
     };
-    "insert-module-globals-7.2.1" = {
+    "insert-module-globals-7.2.0" = {
       name = "insert-module-globals";
       packageName = "insert-module-globals";
-      version = "7.2.1";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz";
-        sha512 = "ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==";
+        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz";
+        sha512 = "15ks7a4jsdgwd9cpql86xignkdz7wf7jxz7r8pyyqgfr3n51nc6y3m271cxzwm4ccaajb6y9sc5hw80ga7pg37306zps6lndyaqskjl";
       };
     };
-    "interpret-1.4.0" = {
+    "interpret-1.2.0" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.4.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz";
-        sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz";
+        sha512 = "1pibn9f6dn61lmilqiv8hb4aix4b78xf9sdws3rnl060vvv6l4qrw6gfmncq5n0f0rah2yj1ssfg80chaw9y5aa860wfdcccb4ghgcr";
       };
     };
-    "is-arguments-1.1.0" = {
-      name = "is-arguments";
-      packageName = "is-arguments";
-      version = "1.1.0";
+    "ip-regex-2.1.0" = {
+      name = "ip-regex";
+      packageName = "ip-regex";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz";
-        sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==";
+        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz";
+        sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
       };
     };
     "is-binary-path-2.1.0" = {
@@ -1414,7 +1531,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
-        sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
+        sha512 = "1gldm4swvg3612pg55yjza8dvpv4daf374dijjg8kcmndlq55933pdd7gw4gq4c2aa5fn9vnasz3h9spg3pd8p1rafkr91sxdhi3hb4";
       };
     };
     "is-buffer-1.1.6" = {
@@ -1423,25 +1540,25 @@ let
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
-        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
+        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
       };
     };
-    "is-callable-1.2.2" = {
+    "is-buffer-2.0.4" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
+        sha512 = "3c1f1cy2867lfdcfxpy91qxbjxizlwa2dhz3mgckg17xd4xcx284ylzvfk3v7l6mdynrk7xc2rg31avi6caj053p7bgaf4p8ni6pb9a";
+      };
+    };
+    "is-callable-1.1.5" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.2.2";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
-        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
-      };
-    };
-    "is-core-module-2.2.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
-        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
+        sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi";
       };
     };
     "is-date-object-1.0.2" = {
@@ -1450,7 +1567,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
+        sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai";
       };
     };
     "is-extglob-2.1.1" = {
@@ -1471,31 +1588,13 @@ let
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
-    "is-generator-function-1.0.8" = {
-      name = "is-generator-function";
-      packageName = "is-generator-function";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz";
-        sha512 = "2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==";
-      };
-    };
     "is-glob-4.0.1" = {
       name = "is-glob";
       packageName = "is-glob";
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
-        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
-      };
-    };
-    "is-negative-zero-2.0.1" = {
-      name = "is-negative-zero";
-      packageName = "is-negative-zero";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
-        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
+        sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4";
       };
     };
     "is-number-7.0.0" = {
@@ -1504,25 +1603,16 @@ let
       version = "7.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
-        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
+        sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73";
       };
     };
-    "is-plain-obj-2.1.0" = {
-      name = "is-plain-obj";
-      packageName = "is-plain-obj";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz";
-        sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==";
-      };
-    };
-    "is-regex-1.1.1" = {
+    "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.1.1";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
-        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
+        sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy";
       };
     };
     "is-symbol-1.0.3" = {
@@ -1531,25 +1621,16 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
+        sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v";
       };
     };
-    "is-typed-array-1.1.4" = {
-      name = "is-typed-array";
-      packageName = "is-typed-array";
-      version = "1.1.4";
+    "is-typedarray-1.0.0" = {
+      name = "is-typedarray";
+      packageName = "is-typedarray";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.4.tgz";
-        sha512 = "ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA==";
-      };
-    };
-    "is-what-3.12.0" = {
-      name = "is-what";
-      packageName = "is-what";
-      version = "3.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz";
-        sha512 = "2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==";
+        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
       };
     };
     "isarray-0.0.1" = {
@@ -1579,13 +1660,58 @@ let
         sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
-    "js-yaml-3.14.0" = {
+    "isstream-0.1.2" = {
+      name = "isstream";
+      packageName = "isstream";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    };
+    "js-yaml-3.13.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.0";
+      version = "3.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
-        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
+        sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1";
+      };
+    };
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "json-schema-traverse-0.4.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+        sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5";
+      };
+    };
+    "json-stable-stringify-0.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
+        sha1 = "611c23e814db375527df851193db59dd2af27f45";
       };
     };
     "json-stringify-safe-5.0.1" = {
@@ -1597,6 +1723,15 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
+    "jsonify-0.0.0" = {
+      name = "jsonify";
+      packageName = "jsonify";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+      };
+    };
     "jsonparse-1.3.1" = {
       name = "jsonparse";
       packageName = "jsonparse";
@@ -1606,13 +1741,22 @@ let
         sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
       };
     };
-    "just-extend-4.1.1" = {
+    "jsprim-1.4.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+      };
+    };
+    "just-extend-4.1.0" = {
       name = "just-extend";
       packageName = "just-extend";
-      version = "4.1.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz";
-        sha512 = "aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==";
+        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz";
+        sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==";
       };
     };
     "kew-0.1.7" = {
@@ -1630,7 +1774,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz";
-        sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==";
+        sha512 = "01ili1w037l9b1l99ljcygi8xwcirjndh89qb1ja448vpfv6b0ixcp05cj8z9c0646bwrjabb8q0xy60pkshnn4977lhra5f54hpbh9";
       };
     };
     "locate-path-3.0.0" = {
@@ -1639,25 +1783,16 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
-        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+        sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc";
       };
     };
-    "locate-path-6.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz";
-        sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==";
-      };
-    };
-    "lodash-4.17.20" = {
+    "lodash-4.17.15" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.20";
+      version = "4.17.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
-        sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+        sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk";
       };
     };
     "lodash.get-4.4.2" = {
@@ -1678,22 +1813,13 @@ let
         sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
       };
     };
-    "log-symbols-4.0.0" = {
+    "log-symbols-3.0.0" = {
       name = "log-symbols";
       packageName = "log-symbols";
-      version = "4.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz";
-        sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==";
-      };
-    };
-    "make-dir-2.1.0" = {
-      name = "make-dir";
-      packageName = "make-dir";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
-        sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz";
+        sha512 = "2fmk82kxm1wkgm5kgxx84nsf7pvyspj47axslj3sfcyx69hx1vymrgbqj00jfnmrjc80wb87xs3kyfa37k55wzhgvk6v21vw8d0sabm";
       };
     };
     "md5.js-1.3.5" = {
@@ -1702,7 +1828,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz";
-        sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
+        sha512 = "29ds70y468n42xivsz4vrgy8rp2x4nxz52z1vkd1k49556gvn74pq998s510g3jgz9972m9yxs6yk1kw752blq97b9w8gaddkwlyay6";
       };
     };
     "miller-rabin-4.0.1" = {
@@ -1711,7 +1837,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
-        sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
+        sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp";
       };
     };
     "mime-1.2.11" = {
@@ -1729,7 +1855,25 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
-        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
+        sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
+      };
+    };
+    "mime-db-1.43.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.43.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv";
+      };
+    };
+    "mime-types-2.1.26" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.26";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk";
       };
     };
     "minimalistic-assert-1.0.1" = {
@@ -1738,7 +1882,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
-        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
+        sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -1756,7 +1900,16 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
     "minimist-1.2.5" = {
@@ -1765,7 +1918,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
       };
     };
     "mkdirp-0.3.5" = {
@@ -1777,13 +1930,13 @@ let
         sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
       };
     };
-    "mkdirp-classic-0.5.3" = {
-      name = "mkdirp-classic";
-      packageName = "mkdirp-classic";
-      version = "0.5.3";
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz";
-        sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
     "mocha-phantomjs-core-1.3.1" = {
@@ -1795,40 +1948,22 @@ let
         sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18";
       };
     };
-    "module-deps-6.2.3" = {
+    "module-deps-6.2.2" = {
       name = "module-deps";
       packageName = "module-deps";
-      version = "6.2.3";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz";
-        sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==";
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.2.tgz";
+        sha512 = "3gkwqnfbsjlh9sswxyiqwv4hzvph69yfaj8c2kibsc9xs6nvys3s2yvjyb41p1qqprlzrr9pqm1l5qpx8wis3z20cw95fzr7g4bmp3b";
       };
     };
-    "ms-2.1.2" = {
+    "ms-2.1.1" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.2";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
-      };
-    };
-    "ms-2.1.3" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
-      };
-    };
-    "nanoid-3.1.12" = {
-      name = "nanoid";
-      packageName = "nanoid";
-      version = "3.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz";
-        sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
+        sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn";
       };
     };
     "ncp-0.4.2" = {
@@ -1840,22 +1975,22 @@ let
         sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
-    "needle-2.6.0" = {
-      name = "needle";
-      packageName = "needle";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
-        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
-      };
-    };
-    "nise-4.0.4" = {
+    "nise-4.0.3" = {
       name = "nise";
       packageName = "nise";
-      version = "4.0.4";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz";
-        sha512 = "bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==";
+        url = "https://registry.npmjs.org/nise/-/nise-4.0.3.tgz";
+        sha512 = "EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg==";
+      };
+    };
+    "node-environment-flags-1.0.6" = {
+      name = "node-environment-flags";
+      packageName = "node-environment-flags";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz";
+        sha512 = "0gis4xp1wacn31j3p8vdd32ykzs2pskf8pgfjkm092zcx72v03dphpsayrls8bmmi91s6ic4718lgi28mm40hj96f9ywbvfxbcz4jz4";
       };
     };
     "node-uuid-1.4.8" = {
@@ -1882,7 +2017,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
-        sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+        sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9";
       };
     };
     "npmconf-0.0.24" = {
@@ -1903,6 +2038,15 @@ let
         sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
       };
     };
+    "oauth-sign-0.9.0" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
+        sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x";
+      };
+    };
     "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -1912,13 +2056,13 @@ let
         sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
-    "object-inspect-1.9.0" = {
+    "object-inspect-1.7.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.9.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
-        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb";
       };
     };
     "object-keys-1.1.1" = {
@@ -1927,16 +2071,25 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
-        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
+        sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n";
       };
     };
-    "object.assign-4.1.2" = {
+    "object.assign-4.1.0" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
-        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
+        sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv";
+      };
+    };
+    "object.getownpropertydescriptors-2.1.0" = {
+      name = "object.getownpropertydescriptors";
+      packageName = "object.getownpropertydescriptors";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7";
       };
     };
     "once-1.1.1" = {
@@ -1975,22 +2128,13 @@ let
         sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
       };
     };
-    "p-limit-2.3.0" = {
+    "p-limit-2.2.2" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.3.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
-        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
-      };
-    };
-    "p-limit-3.1.0" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz";
-        sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
+        sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q";
       };
     };
     "p-locate-3.0.0" = {
@@ -1999,16 +2143,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
-        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
-      };
-    };
-    "p-locate-5.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz";
-        sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==";
+        sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7";
       };
     };
     "p-try-2.2.0" = {
@@ -2017,7 +2152,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+        sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7";
       };
     };
     "pako-1.0.11" = {
@@ -2026,7 +2161,7 @@ let
       version = "1.0.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz";
-        sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
+        sha512 = "1imm2ygnj1himskq6lblzdh3ngc6p9gkvhrbzivalqf3nwafzfglpmbh8wkaz0rsiaxh67jzxbb16m2ygapfcnfwqg9gkdqzkqc24p2";
       };
     };
     "parents-1.0.1" = {
@@ -2038,31 +2173,22 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.6" = {
+    "parse-asn1-5.1.5" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.6";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz";
-        sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
+        sha512 = "16n59f599pq8832a6c5wyxnqdf4vrqrdnclzs6vp9m2z2h9qmxamjk6xcrl1aal758jyba0pvyz1bkf7npm7achfxxa29jwaygihhwf";
       };
     };
-    "parse-node-version-1.0.1" = {
-      name = "parse-node-version";
-      packageName = "parse-node-version";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz";
-        sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==";
-      };
-    };
-    "path-browserify-1.0.1" = {
+    "path-browserify-0.0.1" = {
       name = "path-browserify";
       packageName = "path-browserify";
-      version = "1.0.1";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz";
-        sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==";
+        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz";
+        sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5";
       };
     };
     "path-exists-3.0.0" = {
@@ -2074,15 +2200,6 @@ let
         sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
       };
     };
-    "path-exists-4.0.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
-        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
-      };
-    };
     "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
@@ -2098,7 +2215,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
-        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+        sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r";
       };
     };
     "path-platform-0.11.15" = {
@@ -2116,16 +2233,25 @@ let
       version = "1.8.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz";
-        sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==";
+        sha512 = "1a1s16c1sx28yq8nh8sqkj9izaypszmxfk27x5hl1wid9611b5viffw9vbwqw6sik20ksgmh18dqndglbvq82dii4jl0aal353ck3cz";
       };
     };
-    "pbkdf2-3.1.1" = {
+    "pbkdf2-3.0.17" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.1.1";
+      version = "3.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz";
-        sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz";
+        sha512 = "2s4nd3yv3kkyywvh5rkrvbr6w2h6a4q786v548w895ralcq9cllqzyxr0jgxf911k3zpmzycimsg3ggww3lkrhd3bk9wribrgjaby2k";
+      };
+    };
+    "performance-now-2.1.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
     "phantomjs-1.9.7-15" = {
@@ -2137,22 +2263,13 @@ let
         sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b";
       };
     };
-    "picomatch-2.2.2" = {
+    "picomatch-2.2.1" = {
       name = "picomatch";
       packageName = "picomatch";
-      version = "2.2.2";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
-        sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
-      };
-    };
-    "pify-4.0.1" = {
-      name = "pify";
-      packageName = "pify";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz";
-        sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==";
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz";
+        sha512 = "12a2jzmkj24c6k3x71z0knzflw9qqhqx0lk27nrryjs6m7gjmszvgz5pp29xx1h7h7xxaj8cl3i5h98hlx3mpif5h26qdjhrh1ml811";
       };
     };
     "process-0.11.10" = {
@@ -2170,7 +2287,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
+        sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
       };
     };
     "progress-1.1.8" = {
@@ -2182,6 +2299,15 @@ let
         sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
       };
     };
+    "promise-7.3.1" = {
+      name = "promise";
+      packageName = "promise";
+      version = "7.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
+        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
+      };
+    };
     "proto-list-1.2.4" = {
       name = "proto-list";
       packageName = "proto-list";
@@ -2200,13 +2326,13 @@ let
         sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
       };
     };
-    "psl-1.8.0" = {
+    "psl-1.7.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.8.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
-        sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
+        sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4";
       };
     };
     "public-encrypt-4.0.3" = {
@@ -2215,7 +2341,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz";
-        sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==";
+        sha512 = "3qnsvs746b98ifyv12qj1g6hl6fq25vip5mswhvn3gnl7r32fids6mw3jb0gdcqrrl5x9ik475sf0vx6mbhmif49idkwjwrhbr5lnnd";
       };
     };
     "punycode-1.3.2" = {
@@ -2242,7 +2368,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+        sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx";
       };
     };
     "qs-0.6.6" = {
@@ -2254,6 +2380,15 @@ let
         sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
       };
     };
+    "qs-6.5.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
+      };
+    };
     "querystring-0.2.0" = {
       name = "querystring";
       packageName = "querystring";
@@ -2278,7 +2413,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
-        sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
+        sha512 = "2cimbs750ysa2wxsiw9mmc1xqjb8w0c4s22p2mv2n676s8hchvzcl1l5p78jnk62d2jzacpr9zbl9w64kaqnipcbaa25q7ywn47g2dx";
       };
     };
     "randomfill-1.0.4" = {
@@ -2287,7 +2422,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz";
-        sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==";
+        sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk";
       };
     };
     "read-only-stream-2.0.0" = {
@@ -2314,7 +2449,7 @@ let
       version = "2.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
+        sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
       };
     };
     "readable-stream-3.6.0" = {
@@ -2323,16 +2458,16 @@ let
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
-        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
+        sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05";
       };
     };
-    "readdirp-3.5.0" = {
+    "readdirp-3.2.0" = {
       name = "readdirp";
       packageName = "readdirp";
-      version = "3.5.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
-        sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz";
+        sha512 = "0chzz12q3inpmwm6b4gi7g9n39jp24ah3mmjgss87hfsbx86vnxf49bx9wk2ng66037x2fh0cjf5rgx00c1m86lqlh7r6g9xm13ifbj";
       };
     };
     "rechoir-0.6.2" = {
@@ -2353,6 +2488,15 @@ let
         sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
       };
     };
+    "request-2.88.2" = {
+      name = "request";
+      packageName = "request";
+      version = "2.88.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj";
+      };
+    };
     "request-progress-0.3.1" = {
       name = "request-progress";
       packageName = "request-progress";
@@ -2377,16 +2521,25 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
-        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
+        sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl";
       };
     };
-    "resolve-1.19.0" = {
+    "resolve-1.1.7" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.19.0";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
-        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
+    "resolve-1.15.1" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.15.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
+        sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk";
       };
     };
     "rimraf-2.2.8" = {
@@ -2404,7 +2557,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
-        sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
+        sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -2413,16 +2566,16 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
       };
     };
-    "safe-buffer-5.2.1" = {
+    "safe-buffer-5.2.0" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.2.1";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
-        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
+        sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -2431,16 +2584,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
-      };
-    };
-    "sax-1.2.4" = {
-      name = "sax";
-      packageName = "sax";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
       };
     };
     "semver-1.1.4" = {
@@ -2458,16 +2602,7 @@ let
       version = "5.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
-      };
-    };
-    "serialize-javascript-5.0.1" = {
-      name = "serialize-javascript";
-      packageName = "serialize-javascript";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz";
-        sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==";
+        sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
       };
     };
     "set-blocking-2.0.0" = {
@@ -2485,7 +2620,16 @@ let
       version = "2.4.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
-        sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
+        sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0";
+      };
+    };
+    "shasum-1.0.2" = {
+      name = "shasum";
+      packageName = "shasum";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz";
+        sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
       };
     };
     "shasum-object-1.0.0" = {
@@ -2494,7 +2638,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz";
-        sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==";
+        sha512 = "1bdc4kbk4jy4crxvf36kwbf91ya8xy2xap7mlrdxz44j51y77mhfgzp846w2bxwiw3rrj9lbcylc636ffm7j8c66fx5iigpkyp3kai2";
       };
     };
     "shell-quote-1.7.2" = {
@@ -2503,7 +2647,7 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz";
-        sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==";
+        sha512 = "11a56bai83fzl9zdqp594aypy7f31mkm2whi4ar94wf0w6lzmzfmbw4qd6bn1bibkmb9407wkff5k3d7xvsi3ycj2mw1camyadzy74r";
       };
     };
     "shelljs-0.3.0" = {
@@ -2560,13 +2704,13 @@ let
         sha512 = "oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==";
       };
     };
-    "simple-concat-1.0.1" = {
+    "simple-concat-1.0.0" = {
       name = "simple-concat";
       packageName = "simple-concat";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz";
-        sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==";
+        url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz";
+        sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6";
       };
     };
     "sntp-0.2.4" = {
@@ -2593,7 +2737,7 @@ let
       version = "0.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
-        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+        sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -2605,13 +2749,22 @@ let
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "stream-browserify-3.0.0" = {
+    "sshpk-1.16.1" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.16.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
+        sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x";
+      };
+    };
+    "stream-browserify-2.0.2" = {
       name = "stream-browserify";
       packageName = "stream-browserify";
-      version = "3.0.0";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz";
-        sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==";
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz";
+        sha512 = "2mfvadpwj9mzxps4arl1frxlkz96hfp0sc5pvq76s0ijf8fgw26mm3a721zq3iz1f8155w3a41wkixbdlwn1cavv0mzics796da2zlx";
       };
     };
     "stream-combiner2-1.1.1" = {
@@ -2623,13 +2776,13 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
-    "stream-http-3.1.1" = {
+    "stream-http-3.1.0" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "3.1.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.1.tgz";
-        sha512 = "S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.0.tgz";
+        sha512 = "cuB6RgO7BqC4FBYzmnvhob5Do3wIdIsXAgGycHJnW+981gHqoYcYz9lqjJrk8WXRddbwPuqPYRl+bag6mYv4lw==";
       };
     };
     "stream-splicer-2.0.1" = {
@@ -2638,7 +2791,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz";
-        sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==";
+        sha512 = "275m2xn6ygpp4iw0mjl0a2x39m333xxmr3qlk47mymsqxn8wg8czyv608nbg89w7vyn483ik8f7vlmx107yx4vw06r89fagygiy2b2y";
       };
     };
     "string-width-2.1.1" = {
@@ -2647,7 +2800,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
     "string-width-3.1.0" = {
@@ -2656,25 +2809,25 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
-        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
+        sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx";
       };
     };
-    "string.prototype.trimend-1.0.3" = {
-      name = "string.prototype.trimend";
-      packageName = "string.prototype.trimend";
-      version = "1.0.3";
+    "string.prototype.trimleft-2.1.1" = {
+      name = "string.prototype.trimleft";
+      packageName = "string.prototype.trimleft";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
-        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha512 = "013lf0f398s2xb9jhq9acspdnnk52k7whcga9am4b8a2wrgpc2w7xgkydg4sg4ah9z3i1syimzqs7dc89390xmwlx8zxf6gvlcq1vca";
       };
     };
-    "string.prototype.trimstart-1.0.3" = {
-      name = "string.prototype.trimstart";
-      packageName = "string.prototype.trimstart";
-      version = "1.0.3";
+    "string.prototype.trimright-2.1.1" = {
+      name = "string.prototype.trimright";
+      packageName = "string.prototype.trimright";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
-        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha512 = "3x2qc2fc2fh9sj3vw9w45h246vspjfn88b0k356ldazylhap91vg825bppg73s9n63kwpql3gpw24lv8zx0b2arblcqhh7ygwpxcnx8";
       };
     };
     "string_decoder-0.10.31" = {
@@ -2692,7 +2845,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
       };
     };
     "string_decoder-1.3.0" = {
@@ -2701,7 +2854,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
-        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
+        sha512 = "1w0mz57mvmqykm0jwma6lr4i9pip8p8c1ldaax7sxnrl6j0jbrkwggs037r1psmac0w04i9mb2rc1gzj1n2f0xvy1fr332n9pqmfi46";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -2719,7 +2872,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
-        sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
+        sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f";
       };
     };
     "strip-json-comments-1.0.4" = {
@@ -2731,13 +2884,13 @@ let
         sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
       };
     };
-    "strip-json-comments-3.1.1" = {
+    "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
-      version = "3.1.1";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz";
-        sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==";
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
     "subarg-1.0.0" = {
@@ -2749,13 +2902,31 @@ let
         sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
       };
     };
-    "supports-color-7.2.0" = {
+    "supports-color-5.5.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "7.2.0";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz";
-        sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
+        sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2";
+      };
+    };
+    "supports-color-6.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz";
+        sha512 = "0p5l02lyminbqmcpm7257093sd8w5ca7q5xnnym2z71bwbhmisnyzn2jh5xma418sx29m8yinka6f7rphc7dl76lc88bm2w4z14lzx2";
+      };
+    };
+    "supports-color-7.1.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "7.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz";
+        sha512 = "3k12babask2rk5v9n9wdgng00rqac2w5wwvkawlx3brjpqvfpy4j70650ggw5pa7bm5hnn1ppsppsqrcwrvjsk1mxb3vi993yjqh551";
       };
     };
     "syntax-error-1.4.0" = {
@@ -2764,7 +2935,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz";
-        sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
+        sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0";
       };
     };
     "throttleit-0.0.2" = {
@@ -2791,7 +2962,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz";
-        sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
+        sha512 = "14xi6lbly1f37015ny2pzcnf5kaksjmpnhm61gfhwn686w5ac519qb1icxdda974n84f342g0y15kysj1hci2vl40z91aiivyhx2spy";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -2809,25 +2980,34 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
-        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
+        sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb";
       };
     };
-    "tough-cookie-4.0.0" = {
+    "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "4.0.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz";
-        sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly";
       };
     };
-    "tslib-1.14.1" = {
+    "tough-cookie-3.0.1" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz";
+        sha512 = "2raf12jixrfcagphh9s0fagbfk5va7m0jpj9dbc5dk5b5rr8xbxz4j1af4ppvillqnbi39yiicwnj1qpppc89c71zywnri9xv98j369";
+      };
+    };
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.14.1";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
-        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9";
       };
     };
     "tty-browserify-0.0.1" = {
@@ -2836,7 +3016,7 @@ let
       version = "0.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz";
-        sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==";
+        sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -2848,13 +3028,31 @@ let
         sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
     "type-detect-4.0.8" = {
       name = "type-detect";
       packageName = "type-detect";
       version = "4.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz";
-        sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==";
+        sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni";
       };
     };
     "typedarray-0.0.6" = {
@@ -2872,7 +3070,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz";
-        sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
+        sha512 = "2iz3bypw716y5lgdg89d7jwnkqnla4sid3l5hr2259ypf8h6sbkw3n0xa51ckzkkayf0c39ksaiax2j6ighj36p5ipwh5p1wx50d1z0";
       };
     };
     "undeclared-identifiers-1.1.3" = {
@@ -2881,16 +3079,16 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz";
-        sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==";
+        sha512 = "0xp0ipldz5gsxzh6lm1gj69ab3y6pwn9yq68b8lqg4f3jsl8kr0wkn0kd3fqvs0i71kzhp6g3z0q9rdy4xy6i0a53q6g5k3gki9d4x4";
       };
     };
-    "universalify-0.1.2" = {
-      name = "universalify";
-      packageName = "universalify";
-      version = "0.1.2";
+    "uri-js-4.2.2" = {
+      name = "uri-js";
+      packageName = "uri-js";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
-        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+        sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9";
       };
     };
     "url-0.11.0" = {
@@ -2911,13 +3109,13 @@ let
         sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
       };
     };
-    "util-0.12.3" = {
+    "util-0.10.4" = {
       name = "util";
       packageName = "util";
-      version = "0.12.3";
+      version = "0.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util/-/util-0.12.3.tgz";
-        sha512 = "I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==";
+        url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
+        sha512 = "3sbbgsya51i86ih8bn3nfwi3f9556xlnwh32z4k54dwcpi0jibhfa5dpbfmpzyla63yh2zlxs9chl6wkhc8bqjmjxjyxc9p6j2vvyfh";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -2929,13 +3127,31 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
+    "uuid-3.4.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
+      };
+    };
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    };
     "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
-        sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
+        sha512 = "00japcjqx1df1bgck837ds0xvg5dr7g4j30a38zhbmanqss2kyxs4p7pgmldlnxpa31js50gydy8x9qi89s4x74iidf6k6nfgqsc5ns";
       };
     };
     "which-1.0.9" = {
@@ -2947,13 +3163,13 @@ let
         sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
       };
     };
-    "which-2.0.2" = {
+    "which-1.3.1" = {
       name = "which";
       packageName = "which";
-      version = "2.0.2";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz";
-        sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==";
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz";
       };
     };
     "which-module-2.0.0" = {
@@ -2965,31 +3181,13 @@ let
         sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
       };
     };
-    "which-typed-array-1.1.4" = {
-      name = "which-typed-array";
-      packageName = "which-typed-array";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz";
-        sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==";
-      };
-    };
     "wide-align-1.1.3" = {
       name = "wide-align";
       packageName = "wide-align";
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
-        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
-      };
-    };
-    "workerpool-6.0.2" = {
-      name = "workerpool";
-      packageName = "workerpool";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz";
-        sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==";
+        sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0";
       };
     };
     "wrap-ansi-5.1.0" = {
@@ -2998,7 +3196,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
-        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
+        sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0";
       };
     };
     "wrappy-1.0.2" = {
@@ -3016,52 +3214,43 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz";
-        sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
+        sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic";
       };
     };
-    "y18n-4.0.1" = {
+    "y18n-4.0.0" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
-        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g";
       };
     };
-    "yargs-13.3.2" = {
+    "yargs-13.3.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "13.3.2";
+      version = "13.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
-        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
+        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
       };
     };
-    "yargs-parser-13.1.2" = {
+    "yargs-parser-13.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "13.1.2";
+      version = "13.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
-        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
+        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
       };
     };
-    "yargs-unparser-2.0.0" = {
+    "yargs-unparser-1.6.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
-      version = "2.0.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz";
-        sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==";
-      };
-    };
-    "yocto-queue-0.1.0" = {
-      name = "yocto-queue";
-      packageName = "yocto-queue";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz";
-        sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==";
+        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz";
+        sha512 = "17qgbcv8wypl4qr620558qd8ff03nqqiq84mp200mizrbsfj4nyil345iny8zx4ia5hfpjmk2mnhqp7y54qpsypd993ml57cj14mnsv";
       };
     };
   };
@@ -3070,15 +3259,15 @@ in
   marked = nodeEnv.buildNodePackage {
     name = "marked";
     packageName = "marked";
-    version = "1.2.7";
+    version = "0.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz";
-      sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==";
+      url = "https://registry.npmjs.org/marked/-/marked-0.8.0.tgz";
+      sha512 = "MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "A markdown parser built for speed";
-      homepage = "https://marked.js.org";
+      homepage = "https://marked.js.org/";
       license = "MIT";
     };
     production = true;
@@ -3088,52 +3277,45 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "17.0.0";
+    version = "16.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz";
-      sha512 = "SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w==";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz";
+      sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."acorn-7.4.1"
+      sources."acorn-7.1.1"
       sources."acorn-node-1.8.2"
-      sources."acorn-walk-7.2.0"
-      sources."array-filter-1.0.0"
-      (sources."asn1.js-5.4.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."acorn-walk-7.1.1"
+      sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
           sources."inherits-2.0.1"
           sources."util-0.10.3"
         ];
       })
-      sources."available-typed-arrays-1.0.2"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.5.1"
-      sources."bn.js-5.1.3"
+      sources."base64-js-1.3.1"
+      sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
       sources."browser-pack-6.1.0"
-      sources."browser-resolve-2.0.0"
+      (sources."browser-resolve-1.11.3" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      sources."browserify-rsa-4.1.0"
-      (sources."browserify-sign-4.2.1" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      sources."browserify-rsa-4.0.1"
+      sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.2.1"
+      sources."buffer-5.5.0"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.2"
-      sources."call-bind-1.0.2"
       sources."cipher-base-1.0.4"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
@@ -3142,106 +3324,70 @@ in
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
       sources."core-util-is-1.0.2"
-      (sources."create-ecdh-4.0.4" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."dash-ast-1.0.0"
-      sources."define-properties-1.1.3"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.1"
       sources."des.js-1.0.1"
-      sources."detective-5.2.0"
-      (sources."diffie-hellman-5.0.3" // {
+      (sources."detective-5.2.0" // {
         dependencies = [
-          sources."bn.js-4.11.9"
+          sources."minimist-1.2.5"
         ];
       })
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
-      (sources."elliptic-6.5.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
-      sources."es-abstract-1.18.0-next.2"
-      sources."es-to-primitive-1.2.1"
-      sources."events-3.2.0"
+      sources."elliptic-6.5.2"
+      sources."events-2.1.0"
       sources."evp_bytestokey-1.0.3"
       sources."fast-safe-stringify-2.0.7"
-      sources."foreach-2.0.5"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-assigned-identifiers-1.2.0"
-      sources."get-intrinsic-1.0.2"
       sources."glob-7.1.6"
       sources."has-1.0.3"
-      sources."has-symbols-1.0.1"
-      (sources."hash-base-3.1.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      sources."hash-base-3.0.4"
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.2.1"
+      sources."ieee754-1.1.13"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."inline-source-map-0.6.2"
-      sources."insert-module-globals-7.2.1"
-      sources."is-arguments-1.1.0"
+      sources."insert-module-globals-7.2.0"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
-      sources."is-core-module-2.2.0"
-      sources."is-date-object-1.0.2"
-      sources."is-generator-function-1.0.8"
-      sources."is-negative-zero-2.0.1"
-      sources."is-regex-1.1.1"
-      sources."is-symbol-1.0.3"
-      sources."is-typed-array-1.1.4"
       sources."isarray-1.0.0"
+      sources."json-stable-stringify-0.0.1"
+      sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
       sources."labeled-stream-splicer-2.0.2"
       sources."lodash.memoize-3.0.4"
       sources."md5.js-1.3.5"
-      (sources."miller-rabin-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."miller-rabin-4.0.1"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
-      sources."mkdirp-classic-0.5.3"
-      sources."module-deps-6.2.3"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."module-deps-6.2.2"
       sources."object-assign-4.1.1"
-      sources."object-inspect-1.9.0"
-      sources."object-keys-1.1.1"
-      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
       sources."pako-1.0.11"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.6"
-      sources."path-browserify-1.0.1"
+      sources."parse-asn1-5.1.5"
+      sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.1.1"
+      sources."pbkdf2-3.0.17"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
-      (sources."public-encrypt-4.0.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."public-encrypt-4.0.3"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -3254,31 +3400,29 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.19.0"
+      sources."resolve-1.15.1"
       sources."ripemd160-2.0.2"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
+      sources."safe-buffer-5.2.0"
       sources."sha.js-2.4.11"
+      sources."shasum-1.0.2"
       sources."shasum-object-1.0.0"
       sources."shell-quote-1.7.2"
-      sources."simple-concat-1.0.1"
+      sources."simple-concat-1.0.0"
       sources."source-map-0.5.7"
-      (sources."stream-browserify-3.0.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      sources."stream-browserify-2.0.2"
       sources."stream-combiner2-1.1.1"
-      (sources."stream-http-3.1.1" // {
+      (sources."stream-http-3.1.0" // {
         dependencies = [
           sources."readable-stream-3.6.0"
         ];
       })
       sources."stream-splicer-2.0.1"
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.3.0"
-      sources."subarg-1.0.0"
+      (sources."subarg-1.0.0" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       sources."syntax-error-1.4.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
@@ -3292,10 +3436,13 @@ in
           sources."punycode-1.3.2"
         ];
       })
-      sources."util-0.12.3"
+      (sources."util-0.10.4" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+        ];
+      })
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-1.1.2"
-      sources."which-typed-array-1.1.4"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.2"
     ];
@@ -3312,15 +3459,19 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.12.5";
+    version = "3.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
-      sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz";
+      sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==";
     };
+    dependencies = [
+      sources."commander-2.20.3"
+      sources."source-map-0.6.1"
+    ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "JavaScript parser, mangler/compressor and beautifier toolkit";
-      homepage = "https://github.com/mishoo/UglifyJS#readme";
+      homepage = "https://github.com/mishoo/UglifyJS2#readme";
       license = "BSD-2-Clause";
     };
     production = true;
@@ -3330,36 +3481,76 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "4.1.0";
+    version = "3.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-4.1.0.tgz";
-      sha512 = "w1Ag/f34g7LwtQ/sMVSGWIyZx+gG9ZOAEtyxeX1fG75is6BMyC2lD5kG+1RueX7PkAvlQBm2Lf2aN2j0JbVr2A==";
+      url = "https://registry.npmjs.org/less/-/less-3.11.1.tgz";
+      sha512 = "3p1iabzyyzdnvvqfmi17bs5i1mbwpbq4mh9ahz503jwjyarjqxzlq7yzbp0b499yzz6v1pn9s7hlyx98pxj40zs7a9jn42iipgrfmdn";
     };
     dependencies = [
-      sources."copy-anything-2.0.1"
-      sources."debug-3.2.7"
-      sources."errno-0.1.8"
-      sources."graceful-fs-4.2.4"
-      sources."iconv-lite-0.4.24"
+      sources."ajv-6.12.0"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.9.1"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."caseless-0.12.0"
+      sources."clone-2.1.2"
+      sources."combined-stream-1.0.8"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."errno-0.1.7"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."getpass-0.1.7"
+      sources."graceful-fs-4.2.3"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."http-signature-1.2.0"
       sources."image-size-0.5.5"
-      sources."is-what-3.12.0"
-      sources."make-dir-2.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
       sources."mime-1.6.0"
-      sources."ms-2.1.3"
-      sources."needle-2.6.0"
-      sources."parse-node-version-1.0.1"
-      sources."pify-4.0.1"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."oauth-sign-0.9.0"
+      sources."performance-now-2.1.0"
+      sources."promise-7.3.1"
       sources."prr-1.0.1"
+      sources."psl-1.7.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."request-2.88.2"
+      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
-      sources."semver-5.7.1"
       sources."source-map-0.6.1"
-      sources."tslib-1.14.1"
+      sources."sshpk-1.16.1"
+      sources."tough-cookie-2.5.0"
+      sources."tslib-1.11.1"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."uri-js-4.2.2"
+      sources."uuid-3.4.0"
+      sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Leaner CSS";
-      homepage = "http://lesscss.org";
+      homepage = "http://lesscss.org/";
       license = "Apache-2.0";
     };
     production = true;
@@ -3369,26 +3560,29 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "8.2.1";
+    version = "7.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz";
-      sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==";
+      url = "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz";
+      sha512 = "MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ==";
     };
     dependencies = [
-      sources."@ungap/promise-all-settled-1.1.2"
-      sources."ansi-colors-4.1.1"
+      sources."ansi-colors-3.2.3"
       sources."ansi-regex-3.0.0"
-      sources."ansi-styles-4.3.0"
+      sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.1"
       sources."argparse-1.0.10"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-stdout-1.3.1"
       sources."camelcase-5.3.1"
-      sources."chalk-4.1.0"
-      sources."chokidar-3.4.3"
+      (sources."chalk-2.4.2" // {
+        dependencies = [
+          sources."supports-color-5.5.0"
+        ];
+      })
+      sources."chokidar-3.3.0"
       (sources."cliui-5.0.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -3396,98 +3590,100 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
-      sources."debug-4.2.0"
+      sources."debug-3.2.6"
       sources."decamelize-1.2.0"
-      sources."diff-4.0.2"
+      sources."define-properties-1.1.3"
+      sources."diff-3.5.0"
       sources."emoji-regex-7.0.3"
-      sources."escape-string-regexp-4.0.0"
+      sources."es-abstract-1.17.4"
+      sources."es-to-primitive-1.2.1"
+      sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."fill-range-7.0.1"
-      sources."find-up-5.0.0"
-      sources."flat-5.0.2"
+      sources."find-up-3.0.0"
+      sources."flat-4.1.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.1.2"
+      sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
-      sources."glob-7.1.6"
-      sources."glob-parent-5.1.1"
+      sources."glob-7.1.3"
+      sources."glob-parent-5.1.0"
       sources."growl-1.10.5"
-      sources."has-flag-4.0.0"
+      sources."has-1.0.3"
+      sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.1"
       sources."he-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
+      sources."is-buffer-2.0.4"
+      sources."is-callable-1.1.5"
+      sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
-      sources."is-plain-obj-2.1.0"
+      sources."is-regex-1.0.5"
+      sources."is-symbol-1.0.3"
       sources."isexe-2.0.0"
-      sources."js-yaml-3.14.0"
-      sources."locate-path-6.0.0"
-      sources."log-symbols-4.0.0"
+      sources."js-yaml-3.13.1"
+      sources."locate-path-3.0.0"
+      sources."lodash-4.17.15"
+      sources."log-symbols-3.0.0"
       sources."minimatch-3.0.4"
-      sources."ms-2.1.2"
-      sources."nanoid-3.1.12"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.1"
+      sources."node-environment-flags-1.0.6"
       sources."normalize-path-3.0.0"
+      sources."object-inspect-1.7.0"
+      sources."object-keys-1.1.1"
+      sources."object.assign-4.1.0"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."once-1.4.0"
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
+      sources."p-limit-2.2.2"
+      sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
-      sources."path-exists-4.0.0"
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."picomatch-2.2.2"
-      sources."randombytes-2.1.0"
-      sources."readdirp-3.5.0"
+      sources."picomatch-2.2.1"
+      sources."readdirp-3.2.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."safe-buffer-5.2.1"
-      sources."serialize-javascript-5.0.1"
+      sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
       sources."sprintf-js-1.0.3"
       sources."string-width-2.1.1"
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
       sources."strip-ansi-4.0.0"
-      sources."strip-json-comments-3.1.1"
-      sources."supports-color-7.2.0"
+      sources."strip-json-comments-2.0.1"
+      sources."supports-color-6.0.0"
       sources."to-regex-range-5.0.1"
-      sources."which-2.0.2"
+      sources."which-1.3.1"
       sources."which-module-2.0.0"
       sources."wide-align-1.1.3"
-      sources."workerpool-6.0.2"
       (sources."wrap-ansi-5.1.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
       sources."wrappy-1.0.2"
-      sources."y18n-4.0.1"
-      (sources."yargs-13.3.2" // {
+      sources."y18n-4.0.0"
+      (sources."yargs-13.3.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
-          sources."find-up-3.0.0"
-          sources."locate-path-3.0.0"
-          sources."p-limit-2.3.0"
-          sources."p-locate-3.0.0"
-          sources."path-exists-3.0.0"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."yargs-parser-13.1.2"
-      (sources."yargs-unparser-2.0.0" // {
-        dependencies = [
-          sources."camelcase-6.2.0"
-          sources."decamelize-4.0.0"
-        ];
-      })
-      sources."yocto-queue-0.1.0"
+      sources."yargs-parser-13.1.1"
+      sources."yargs-unparser-1.6.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3519,7 +3715,7 @@ in
       sources."commander-2.20.3"
       (sources."config-chain-1.1.12" // {
         dependencies = [
-          sources."ini-1.3.8"
+          sources."ini-1.3.5"
         ];
       })
       sources."cryptiles-0.2.2"
@@ -3532,6 +3728,7 @@ in
       sources."http-signature-0.10.1"
       sources."inherits-1.0.2"
       sources."ini-1.1.0"
+      sources."ip-regex-2.1.0"
       sources."json-stringify-safe-5.0.1"
       sources."kew-0.1.7"
       sources."mime-1.2.11"
@@ -3547,7 +3744,7 @@ in
       sources."phantomjs-1.9.7-15"
       sources."progress-1.1.8"
       sources."proto-list-1.2.4"
-      sources."psl-1.8.0"
+      sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-0.6.6"
       sources."request-2.36.0"
@@ -3556,9 +3753,8 @@ in
       sources."semver-1.1.4"
       sources."sntp-0.2.4"
       sources."throttleit-0.0.2"
-      sources."tough-cookie-4.0.0"
+      sources."tough-cookie-3.0.1"
       sources."tunnel-agent-0.4.3"
-      sources."universalify-0.1.2"
       sources."which-1.0.9"
     ];
     buildInputs = globalBuildInputs;
@@ -3598,24 +3794,25 @@ in
   sinon = nodeEnv.buildNodePackage {
     name = "sinon";
     packageName = "sinon";
-    version = "9.2.3";
+    version = "9.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sinon/-/sinon-9.2.3.tgz";
-      sha512 = "m+DyAWvqVHZtjnjX/nuShasykFeiZ+nPuEfD4G3gpvKGkXRhkF/6NSt2qN2FjZhfrcHXFzUzI+NLnk+42fnLEw==";
+      url = "https://registry.npmjs.org/sinon/-/sinon-9.0.1.tgz";
+      sha512 = "iTTyiQo5T94jrOx7X7QLBZyucUJ2WvL9J13+96HMfm2CGoJYbIPqRfl6wgNcqmzk0DI28jeGx5bUTXizkrqBmg==";
     };
     dependencies = [
-      sources."@sinonjs/commons-1.8.2"
-      sources."@sinonjs/fake-timers-6.0.1"
-      sources."@sinonjs/samsam-5.3.1"
+      sources."@sinonjs/commons-1.7.1"
+      sources."@sinonjs/fake-timers-6.0.0"
+      sources."@sinonjs/formatio-5.0.1"
+      sources."@sinonjs/samsam-5.0.3"
       sources."@sinonjs/text-encoding-0.7.1"
       sources."diff-4.0.2"
       sources."has-flag-4.0.0"
       sources."isarray-0.0.1"
-      sources."just-extend-4.1.1"
+      sources."just-extend-4.1.0"
       sources."lodash.get-4.4.2"
-      sources."nise-4.0.4"
+      sources."nise-4.0.3"
       sources."path-to-regexp-1.8.0"
-      sources."supports-color-7.2.0"
+      sources."supports-color-7.1.0"
       sources."type-detect-4.0.8"
     ];
     buildInputs = globalBuildInputs;
@@ -3631,10 +3828,10 @@ in
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
     packageName = "jshint";
-    version = "2.12.0";
+    version = "2.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.12.0.tgz";
-      sha512 = "TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA==";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz";
+      sha512 = "ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -3646,8 +3843,8 @@ in
       sources."date-now-0.1.4"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.1.0"
-          sources."entities-2.1.0"
+          sources."domelementtype-2.0.1"
+          sources."entities-2.0.0"
         ];
       })
       sources."domelementtype-1.3.1"
@@ -3661,7 +3858,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."isarray-0.0.1"
-      sources."lodash-4.17.20"
+      sources."lodash-4.17.15"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -3675,7 +3872,7 @@ in
     meta = {
       description = "Static analysis tool for JavaScript";
       homepage = "http://jshint.com/";
-      license = "MIT";
+      license = "(MIT AND JSON)";
     };
     production = true;
     bypassCache = true;
@@ -3684,29 +3881,26 @@ in
   shelljs = nodeEnv.buildNodePackage {
     name = "shelljs";
     packageName = "shelljs";
-    version = "0.8.4";
+    version = "0.8.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz";
-      sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz";
+      sha512 = "3ndzzikwq0c0084xy1s0v9q2msc8wc7qrmi0bi1llshsmlhfz4dn1k9i2r666ls7xmq62idmify0ksc1vq3mrjqcrqbm20na0m03kbx";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.1"
       sources."glob-7.1.6"
-      sources."has-1.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."interpret-1.4.0"
-      sources."is-core-module-2.2.0"
+      sources."interpret-1.2.0"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."rechoir-0.6.2"
-      sources."resolve-1.19.0"
+      sources."resolve-1.15.1"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index baacee29ff2..b565c6d2f5d 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix
index 3c03a5f0c08..7ccb5cab835 100644
--- a/pkgs/misc/base16-builder/node-packages-generated.nix
+++ b/pkgs/misc/base16-builder/node-packages-generated.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -10,7 +10,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -46,7 +46,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
       };
     };
     "are-we-there-yet-1.1.5" = {
@@ -55,7 +55,7 @@ let
       version = "1.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
-        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+        sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6";
       };
     };
     "argparse-1.0.10" = {
@@ -64,7 +64,7 @@ let
       version = "1.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
       };
     };
     "array-find-index-1.0.2" = {
@@ -100,7 +100,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
       };
     };
     "bulk-replace-0.0.1" = {
@@ -136,7 +136,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz";
-        sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
+        sha512 = "2mv8dgq8fr86zs5mam6bkp0j241lpb5rbwpq8zc5gkj7f8zir1cd71m0yyy8zy46hvf86b9k7pbhvkz08ii4mhxh14xshkrgik0p14r";
       };
     };
     "chalk-1.1.3" = {
@@ -154,7 +154,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
-        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
+        sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc";
       };
     };
     "code-point-at-1.1.0" = {
@@ -229,13 +229,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "debug-3.2.7" = {
+    "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.7";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
       };
     };
     "decamelize-1.2.0" = {
@@ -253,7 +253,7 @@ let
       version = "0.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
-        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
+        sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c";
       };
     };
     "delegates-1.0.0" = {
@@ -298,7 +298,7 @@ let
       version = "2.7.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
-        sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
+        sha512 = "2ad39acbba96hqbgf714pacri515xjn8jd43bkfb1wwp04vflpjj0qhnnmsq074g7d1kycyj1bmf620s43qb3x74hrfb4ky3v5axygf";
       };
     };
     "error-ex-1.3.2" = {
@@ -307,7 +307,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
-        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+        sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -325,7 +325,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
-        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
+        sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq";
       };
     };
     "filled-array-1.1.0" = {
@@ -352,7 +352,7 @@ let
       version = "1.2.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
-        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
+        sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r";
       };
     };
     "fs-promise-0.3.1" = {
@@ -373,15 +373,6 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "function-bind-1.1.1" = {
-      name = "function-bind";
-      packageName = "function-bind";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
-      };
-    };
     "gauge-2.7.4" = {
       name = "gauge";
       packageName = "gauge";
@@ -406,7 +397,7 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
       };
     };
     "got-5.7.1" = {
@@ -418,22 +409,13 @@ let
         sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
       };
     };
-    "graceful-fs-4.2.4" = {
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.4";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
-        sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
-      };
-    };
-    "has-1.0.3" = {
-      name = "has";
-      packageName = "has";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
-        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
       };
     };
     "has-ansi-2.0.0" = {
@@ -454,13 +436,13 @@ let
         sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
       };
     };
-    "hepburn-1.2.0" = {
+    "hepburn-1.1.1" = {
       name = "hepburn";
       packageName = "hepburn";
-      version = "1.2.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hepburn/-/hepburn-1.2.0.tgz";
-        sha512 = "xWjHb03dN/ivNcqG2vqA//sHQ0oapYGZ9QV/2TR7m2+cggxzoVpbDxZn9s/Zm1tF88/7a1IpdZyn00tNP5oABA==";
+        url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz";
+        sha512 = "3vc0v8438m2a8yw40nfhqw4ldddxkzjsimpq24c9la9ik0mnr5g8wbhnxpvlf1j39m2x5fin2d82kzjdpzf22shb0wfkpadqacdjk9s";
       };
     };
     "hosted-git-info-2.8.8" = {
@@ -469,7 +451,7 @@ let
       version = "2.8.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
-        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
+        sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z";
       };
     };
     "iconv-lite-0.4.24" = {
@@ -478,7 +460,7 @@ let
       version = "0.4.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+        sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
       };
     };
     "ignore-walk-3.0.3" = {
@@ -487,7 +469,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
-        sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
+        sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv";
       };
     };
     "imurmurhash-0.1.4" = {
@@ -523,16 +505,16 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
       };
     };
-    "ini-1.3.8" = {
+    "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.8";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
       };
     };
     "is-arrayish-0.2.1" = {
@@ -544,22 +526,13 @@ let
         sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
       };
     };
-    "is-core-module-2.2.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
-        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
-      };
-    };
     "is-finite-1.1.0" = {
       name = "is-finite";
       packageName = "is-finite";
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
-        sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
+        sha512 = "3gj0k3vlpbc7zg5xkl8yjnilqs2dmk3ks67shchrfmnzkj6r4aad994xwfczx99ccjx6cixdqg4sawk2m92lqhh6jmfl17zlnv8rp3i";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -604,7 +577,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
-        sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
+        sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5";
       };
     };
     "is-stream-1.1.0" = {
@@ -634,13 +607,13 @@ let
         sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
       };
     };
-    "js-yaml-3.14.1" = {
+    "js-yaml-3.13.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.1";
+      version = "3.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
+        sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1";
       };
     };
     "keypress-0.1.0" = {
@@ -667,7 +640,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz";
-        sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA==";
+        sha512 = "1y0l6pib2v3nrpa6n9axb2mmjd5s50a2kqbvm7jp2zhr7dpdz0ym73kvi7h1g9i9fw6jqaiwxkas7av1fn7qjk2rgmrnkwpag50ddw9";
       };
     };
     "load-json-file-1.1.0" = {
@@ -694,7 +667,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
+        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
       };
     };
     "map-obj-1.0.1" = {
@@ -721,7 +694,16 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
     "minimist-1.2.5" = {
@@ -730,7 +712,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
       };
     };
     "minipass-2.9.0" = {
@@ -739,7 +721,7 @@ let
       version = "2.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
-        sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
+        sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3";
       };
     };
     "minizlib-1.3.3" = {
@@ -748,43 +730,43 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
-        sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
+        sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9";
       };
     };
-    "mkdirp-0.5.5" = {
+    "mkdirp-0.5.1" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.5";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
-        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "ms-2.1.3" = {
+    "ms-2.1.2" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.3";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
       };
     };
-    "needle-2.6.0" = {
+    "nan-2.14.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
+        sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0";
+      };
+    };
+    "needle-2.4.0" = {
       name = "needle";
       packageName = "needle";
-      version = "2.6.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
-        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
-      };
-    };
-    "node-addon-api-3.1.0" = {
-      name = "node-addon-api";
-      packageName = "node-addon-api";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz";
-        sha512 = "flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
+        sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0";
       };
     };
     "node-pre-gyp-0.14.0" = {
@@ -793,7 +775,7 @@ let
       version = "0.14.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
-        sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==";
+        sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq";
       };
     };
     "node-status-codes-1.0.0" = {
@@ -805,13 +787,13 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
-    "nodejieba-2.5.1" = {
+    "nodejieba-2.4.1" = {
       name = "nodejieba";
       packageName = "nodejieba";
-      version = "2.5.1";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.5.1.tgz";
-        sha512 = "VnJBQSl2G8swDf3ZAXMbXrMCrGFO+kVKbkB93OaBthGbEG5BrxfD8I2m7auaRX8E5C1t+hlwo3HCmQOWKkiZ9A==";
+        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.4.1.tgz";
+        sha512 = "2w90xh2sxyp6mkyr4jp6pp72q6vv95ly3a12fzyfv5rc0xinivplz98vnpb8fx92pdxf9aj7wavl9qcl1kl6rva0s1vdrcfhsb5a6bz";
       };
     };
     "nopt-4.0.3" = {
@@ -820,7 +802,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
-        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
+        sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha";
       };
     };
     "normalize-package-data-2.5.0" = {
@@ -829,7 +811,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
-        sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
+        sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z";
       };
     };
     "npm-bundled-1.1.1" = {
@@ -838,7 +820,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
-        sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
+        sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2";
       };
     };
     "npm-normalize-package-bin-1.0.1" = {
@@ -847,7 +829,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
-        sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
+        sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh";
       };
     };
     "npm-packlist-1.4.8" = {
@@ -856,7 +838,7 @@ let
       version = "1.4.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
-        sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
+        sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77";
       };
     };
     "npmlog-4.1.2" = {
@@ -865,7 +847,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -928,7 +910,7 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+        sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
       };
     };
     "package-json-2.4.0" = {
@@ -973,7 +955,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
-        sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+        sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r";
       };
     };
     "path-type-1.1.0" = {
@@ -1012,13 +994,13 @@ let
         sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "pinyin-2.9.1" = {
+    "pinyin-2.9.0" = {
       name = "pinyin";
       packageName = "pinyin";
-      version = "2.9.1";
+      version = "2.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.1.tgz";
-        sha512 = "U7kHlVP6yUYl2DV2bX4brlYWdgaAlwtqJrdkboiyri9ixRDVqVO3LD98te3PT5deN5EA9W8ywuG9GaYZfiiIlw==";
+        url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz";
+        sha512 = "3fjgppnlcvcbx314q2q32amxyvda5xzj8bgi7s131n15r8wwi94w5bnb7q2lbgag0qc4d5fhg0a14ipwvh0j7si1fmndmw4dgxi15jd";
       };
     };
     "prepend-http-1.0.4" = {
@@ -1036,7 +1018,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
+        sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
       };
     };
     "rc-1.2.8" = {
@@ -1045,7 +1027,7 @@ let
       version = "1.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
-        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
+        sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb";
       };
     };
     "read-all-stream-3.1.0" = {
@@ -1081,7 +1063,7 @@ let
       version = "2.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
+        sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
       };
     };
     "redent-1.0.0" = {
@@ -1099,7 +1081,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz";
-        sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
+        sha512 = "3w8zjx5s044i7wr9bqqgjfkjawg0cajc9j9gmzkqs0i420algjvkd5k27j9pvhx1yq7nvdchsl96zcyjf64n14765q0f18y1wbkmcz0";
       };
     };
     "registry-url-3.1.0" = {
@@ -1120,13 +1102,13 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
-    "resolve-1.19.0" = {
+    "resolve-1.15.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.19.0";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
-        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
+        sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk";
       };
     };
     "rimraf-2.7.1" = {
@@ -1135,7 +1117,7 @@ let
       version = "2.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
-        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+        sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -1144,7 +1126,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -1153,7 +1135,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
       };
     };
     "sax-1.2.4" = {
@@ -1162,7 +1144,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
       };
     };
     "semver-5.7.1" = {
@@ -1171,7 +1153,7 @@ let
       version = "5.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+        sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
       };
     };
     "semver-diff-2.1.0" = {
@@ -1192,13 +1174,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "signal-exit-3.0.3" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.3";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
-        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "slide-1.1.6" = {
@@ -1210,40 +1192,40 @@ let
         sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
       };
     };
-    "spdx-correct-3.1.1" = {
+    "spdx-correct-3.1.0" = {
       name = "spdx-correct";
       packageName = "spdx-correct";
-      version = "3.1.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz";
-        sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==";
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
+        sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn";
       };
     };
-    "spdx-exceptions-2.3.0" = {
+    "spdx-exceptions-2.2.0" = {
       name = "spdx-exceptions";
       packageName = "spdx-exceptions";
-      version = "2.3.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
-        sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
+        sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r";
       };
     };
-    "spdx-expression-parse-3.0.1" = {
+    "spdx-expression-parse-3.0.0" = {
       name = "spdx-expression-parse";
       packageName = "spdx-expression-parse";
-      version = "3.0.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
-        sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2";
       };
     };
-    "spdx-license-ids-3.0.7" = {
+    "spdx-license-ids-3.0.5" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.7";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
-        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
+        sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97";
       };
     };
     "speakingurl-14.0.1" = {
@@ -1252,7 +1234,7 @@ let
       version = "14.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz";
-        sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==";
+        sha512 = "2nmh1645i59b0ij75rjrps837iipz5m67bwbv5hfn34wjcvzwsrysvdwd1ykdbd1njwazh8prbqsm0dm4lh8sb1r3l0bnmgpfzriwyl";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -1279,7 +1261,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
       };
     };
     "strip-ansi-3.0.1" = {
@@ -1333,7 +1315,7 @@ let
       version = "4.4.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
-        sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
+        sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3";
       };
     };
     "timed-out-3.1.3" = {
@@ -1405,7 +1387,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
-        sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
+        sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf";
       };
     };
     "wide-align-1.1.3" = {
@@ -1414,7 +1396,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
-        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+        sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0";
       };
     };
     "widest-line-1.0.0" = {
@@ -1459,7 +1441,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+        sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
       };
     };
   };
@@ -1499,7 +1481,7 @@ in
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."currently-unhandled-0.4.1"
-      sources."debug-3.2.7"
+      sources."debug-3.2.6"
       sources."decamelize-1.2.0"
       sources."deep-extend-0.6.0"
       sources."delegates-1.0.0"
@@ -1515,16 +1497,14 @@ in
       sources."fs-minipass-1.2.7"
       sources."fs-promise-0.3.1"
       sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
       sources."get-stdin-4.0.1"
       sources."glob-7.1.6"
       sources."got-5.7.1"
-      sources."graceful-fs-4.2.4"
-      sources."has-1.0.3"
+      sources."graceful-fs-4.2.3"
       sources."has-ansi-2.0.0"
       sources."has-unicode-2.0.1"
-      sources."hepburn-1.2.0"
+      sources."hepburn-1.1.1"
       sources."hosted-git-info-2.8.8"
       sources."iconv-lite-0.4.24"
       sources."ignore-walk-3.0.3"
@@ -1532,9 +1512,8 @@ in
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.8"
+      sources."ini-1.3.5"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.2.0"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-npm-1.0.0"
@@ -1544,7 +1523,7 @@ in
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-3.13.1"
       sources."keypress-0.1.0"
       sources."latest-version-2.0.0"
       sources."limax-1.7.0"
@@ -1552,18 +1531,22 @@ in
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
       sources."map-obj-1.0.1"
-      sources."meow-3.7.0"
+      (sources."meow-3.7.0" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
+      sources."minimist-0.0.8"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.5"
-      sources."ms-2.1.3"
-      sources."needle-2.6.0"
-      sources."node-addon-api-3.1.0"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."nan-2.14.0"
+      sources."needle-2.4.0"
       sources."node-pre-gyp-0.14.0"
       sources."node-status-codes-1.0.0"
-      sources."nodejieba-2.5.1"
+      sources."nodejieba-2.4.1"
       sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
       sources."npm-bundled-1.1.1"
@@ -1586,10 +1569,14 @@ in
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      sources."pinyin-2.9.1"
+      sources."pinyin-2.9.0"
       sources."prepend-http-1.0.4"
       sources."process-nextick-args-2.0.1"
-      sources."rc-1.2.8"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       sources."read-all-stream-3.1.0"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
@@ -1598,7 +1585,7 @@ in
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."repeating-2.0.1"
-      sources."resolve-1.19.0"
+      sources."resolve-1.15.1"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -1606,12 +1593,12 @@ in
       sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.3"
+      sources."signal-exit-3.0.2"
       sources."slide-1.1.6"
-      sources."spdx-correct-3.1.1"
-      sources."spdx-exceptions-2.3.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.7"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
       sources."speakingurl-14.0.1"
       sources."sprintf-js-1.0.3"
       sources."string-width-1.0.2"
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index 79748949ff7..396f2b2657d 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -7,15 +7,15 @@
 let
   globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
     inherit nodeEnv;
-    inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit;
+    inherit (pkgs) fetchurl fetchgit;
   });
   nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv globalBuildInputs;
 }
diff --git a/pkgs/misc/base16-builder/supplement.nix b/pkgs/misc/base16-builder/supplement.nix
index 104cda58dc0..3d4c43d5e70 100644
--- a/pkgs/misc/base16-builder/supplement.nix
+++ b/pkgs/misc/base16-builder/supplement.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -10,7 +10,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -28,7 +28,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
       };
     };
     "are-we-there-yet-1.1.5" = {
@@ -37,7 +37,7 @@ let
       version = "1.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
-        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+        sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6";
       };
     };
     "balanced-match-1.0.0" = {
@@ -55,7 +55,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
       };
     };
     "chownr-1.1.4" = {
@@ -64,7 +64,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
-        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
+        sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc";
       };
     };
     "code-point-at-1.1.0" = {
@@ -103,13 +103,13 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "debug-3.2.7" = {
+    "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.7";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
       };
     };
     "deep-extend-0.6.0" = {
@@ -118,7 +118,7 @@ let
       version = "0.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
-        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
+        sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c";
       };
     };
     "delegates-1.0.0" = {
@@ -145,7 +145,7 @@ let
       version = "1.2.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
-        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
+        sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -172,7 +172,7 @@ let
       version = "7.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
-        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+        sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
       };
     };
     "has-unicode-2.0.1" = {
@@ -190,7 +190,7 @@ let
       version = "0.4.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
-        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+        sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
       };
     };
     "ignore-walk-3.0.3" = {
@@ -199,7 +199,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
-        sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
+        sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv";
       };
     };
     "inflight-1.0.6" = {
@@ -217,16 +217,16 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+        sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
       };
     };
-    "ini-1.3.8" = {
+    "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.8";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -253,7 +253,16 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
     "minimist-1.2.5" = {
@@ -262,7 +271,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+        sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
       };
     };
     "minipass-2.9.0" = {
@@ -271,7 +280,7 @@ let
       version = "2.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
-        sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
+        sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3";
       };
     };
     "minizlib-1.3.3" = {
@@ -280,34 +289,34 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
-        sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
+        sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9";
       };
     };
-    "mkdirp-0.5.5" = {
+    "mkdirp-0.5.1" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.5";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
-        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "ms-2.1.3" = {
+    "ms-2.1.2" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.3";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
       };
     };
-    "needle-2.6.0" = {
+    "needle-2.4.0" = {
       name = "needle";
       packageName = "needle";
-      version = "2.6.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
-        sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
+        sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0";
       };
     };
     "nopt-4.0.3" = {
@@ -316,7 +325,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
-        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
+        sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha";
       };
     };
     "npm-bundled-1.1.1" = {
@@ -325,7 +334,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
-        sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
+        sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2";
       };
     };
     "npm-normalize-package-bin-1.0.1" = {
@@ -334,7 +343,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
-        sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
+        sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh";
       };
     };
     "npm-packlist-1.4.8" = {
@@ -343,7 +352,7 @@ let
       version = "1.4.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
-        sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
+        sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77";
       };
     };
     "npmlog-4.1.2" = {
@@ -352,7 +361,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -406,7 +415,7 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+        sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
       };
     };
     "path-is-absolute-1.0.1" = {
@@ -424,7 +433,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
+        sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
       };
     };
     "rc-1.2.8" = {
@@ -433,7 +442,7 @@ let
       version = "1.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
-        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
+        sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb";
       };
     };
     "readable-stream-2.3.7" = {
@@ -442,7 +451,7 @@ let
       version = "2.3.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
-        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
+        sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
       };
     };
     "rimraf-2.7.1" = {
@@ -451,7 +460,7 @@ let
       version = "2.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
-        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+        sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -460,7 +469,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -469,7 +478,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
       };
     };
     "sax-1.2.4" = {
@@ -478,7 +487,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
       };
     };
     "semver-5.7.1" = {
@@ -487,7 +496,7 @@ let
       version = "5.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+        sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
       };
     };
     "set-blocking-2.0.0" = {
@@ -499,13 +508,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "signal-exit-3.0.3" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.3";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
-        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "string-width-1.0.2" = {
@@ -523,7 +532,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
       };
     };
     "strip-ansi-3.0.1" = {
@@ -550,7 +559,7 @@ let
       version = "4.4.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
-        sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
+        sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -568,7 +577,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
-        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+        sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0";
       };
     };
     "wrappy-1.0.2" = {
@@ -586,7 +595,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+        sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
       };
     };
   };
@@ -595,10 +604,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.17.0";
+    version = "0.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz";
-      sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A==";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
+      sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -612,7 +621,7 @@ in
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."debug-3.2.7"
+      sources."debug-3.2.6"
       sources."deep-extend-0.6.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
@@ -625,16 +634,16 @@ in
       sources."ignore-walk-3.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.8"
+      sources."ini-1.3.5"
       sources."is-fullwidth-code-point-1.0.0"
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
+      sources."minimist-0.0.8"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.5"
-      sources."ms-2.1.3"
-      sources."needle-2.6.0"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."needle-2.4.0"
       sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
@@ -648,7 +657,11 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.1"
-      sources."rc-1.2.8"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       sources."readable-stream-2.3.7"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
@@ -656,7 +669,7 @@ in
       sources."sax-1.2.4"
       sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.3"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index e0d21f7d44d..693eeaeaec6 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
index 39a19f8498a..a2045ee15f1 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
@@ -1,43 +1,34 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/code-frame-7.12.11" = {
+    "@babel/code-frame-7.10.3" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.12.11";
+      version = "7.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
-        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz";
+        sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==";
       };
     };
-    "@babel/helper-validator-identifier-7.12.11" = {
+    "@babel/helper-validator-identifier-7.10.3" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
-      version = "7.12.11";
+      version = "7.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
-        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz";
+        sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==";
       };
     };
-    "@babel/highlight-7.10.4" = {
+    "@babel/highlight-7.10.3" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.10.4";
+      version = "7.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz";
-        sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
-      };
-    };
-    "@babel/runtime-7.12.5" = {
-      name = "_at_babel_slash_runtime";
-      packageName = "@babel/runtime";
-      version = "7.12.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
-        sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz";
+        sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==";
       };
     };
     "@dabh/diagnostics-2.0.2" = {
@@ -67,22 +58,22 @@ let
         sha512 = "x2B4hyoxjg62cxf4M5QRomx+xYp2XoajPKdd24SM2Sl4m+IrzwKzmcrysQuYmF6BMsm3IoTKymW5BBGckHGTIw==";
       };
     };
-    "@slack/types-1.10.0" = {
+    "@slack/types-1.7.0" = {
       name = "_at_slack_slash_types";
       packageName = "@slack/types";
-      version = "1.10.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@slack/types/-/types-1.10.0.tgz";
-        sha512 = "tA7GG7Tj479vojfV3AoxbckalA48aK6giGjNtgH6ihpLwTyHE3fIgRrvt8TWfLwW8X8dyu7vgmAsGLRG7hWWOg==";
+        url = "https://registry.npmjs.org/@slack/types/-/types-1.7.0.tgz";
+        sha512 = "aigLPmTO513JxeFyeII/74y+S5jU39tabDWPsZyMHJWCYqK3vCkRvV73NL+Ay+Tq5RC2NgSmkedk1wvQJ6oXLg==";
       };
     };
-    "@slack/web-api-5.15.0" = {
+    "@slack/web-api-5.10.0" = {
       name = "_at_slack_slash_web-api";
       packageName = "@slack/web-api";
-      version = "5.15.0";
+      version = "5.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.15.0.tgz";
-        sha512 = "tjQ8Zqv/Fmj9SOL9yIEd7IpTiKfKHi9DKAkfRVeotoX0clMr3SqQtBqO+KZMX27gm7dmgJsQaDKlILyzdCO+IA==";
+        url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.10.0.tgz";
+        sha512 = "t8c2lcSrdX8LIUOS1RvslbBBKvuNaTtbEcrWai4yDGkiNIxzhk+dHPcJzd7A4A0DkAgiEwXeezR7RCELuG8WgQ==";
       };
     };
     "@types/body-parser-1.19.0" = {
@@ -103,40 +94,40 @@ let
         sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==";
       };
     };
-    "@types/chai-4.2.14" = {
+    "@types/chai-4.2.11" = {
       name = "_at_types_slash_chai";
       packageName = "@types/chai";
-      version = "4.2.14";
+      version = "4.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.14.tgz";
-        sha512 = "G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==";
+        url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz";
+        sha512 = "t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==";
       };
     };
-    "@types/connect-3.4.34" = {
+    "@types/connect-3.4.33" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.34";
+      version = "3.4.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz";
-        sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz";
+        sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==";
       };
     };
-    "@types/express-4.17.11" = {
+    "@types/express-4.17.6" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.11";
+      version = "4.17.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz";
-        sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz";
+        sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==";
       };
     };
-    "@types/express-serve-static-core-4.17.18" = {
+    "@types/express-serve-static-core-4.17.7" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.18";
+      version = "4.17.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
-        sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz";
+        sha512 = "EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw==";
       };
     };
     "@types/is-stream-1.1.0" = {
@@ -148,13 +139,13 @@ let
         sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg==";
       };
     };
-    "@types/mime-1.3.2" = {
+    "@types/mime-2.0.2" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
-      version = "1.3.2";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
-        sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
+        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.2.tgz";
+        sha512 = "4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q==";
       };
     };
     "@types/mocha-7.0.2" = {
@@ -166,22 +157,22 @@ let
         sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==";
       };
     };
-    "@types/nedb-1.8.11" = {
+    "@types/nedb-1.8.9" = {
       name = "_at_types_slash_nedb";
       packageName = "@types/nedb";
-      version = "1.8.11";
+      version = "1.8.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz";
-        sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw==";
+        url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.9.tgz";
+        sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ==";
       };
     };
-    "@types/node-13.13.40" = {
+    "@types/node-13.9.3" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.40";
+      version = "13.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.40.tgz";
-        sha512 = "eKaRo87lu1yAXrzEJl0zcJxfUMDT5/mZalFyOkT44rnQps41eS2pfWzbaulSPpQLFNy29bFqn+Y5lOTL8ATlEQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz";
+        sha512 = "28ci34pqk99zkrqa473xlzfms3j6nj4nl2i69ghpbjvw2mh68bd0nd2shb78i09gng4d0fj65l2njrqbdjzmhqix4fvqyiarrlkwnyk";
       };
     };
     "@types/node-emoji-1.8.1" = {
@@ -211,13 +202,13 @@ let
         sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ==";
       };
     };
-    "@types/qs-6.9.5" = {
+    "@types/qs-6.9.3" = {
       name = "_at_types_slash_qs";
       packageName = "@types/qs";
-      version = "6.9.5";
+      version = "6.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz";
-        sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==";
+        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.3.tgz";
+        sha512 = "7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA==";
       };
     };
     "@types/randomstring-1.1.6" = {
@@ -265,13 +256,13 @@ let
         sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==";
       };
     };
-    "@types/serve-static-1.13.9" = {
+    "@types/serve-static-1.13.4" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.9";
+      version = "1.13.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
-        sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.4.tgz";
+        sha512 = "jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug==";
       };
     };
     "@types/tough-cookie-4.0.0" = {
@@ -292,22 +283,22 @@ let
         sha512 = "WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g==";
       };
     };
-    "@types/ws-7.4.0" = {
+    "@types/ws-7.2.5" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "7.4.0";
+      version = "7.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.0.tgz";
-        sha512 = "Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.5.tgz";
+        sha512 = "4UEih9BI1nBKii385G9id1oFrSkLcClbwtDfcYj8HJLQqZVAtb/42vXVrYvRWCcufNF/a+rZD3MxNwghA7UmCg==";
       };
     };
-    "@types/yargs-13.0.11" = {
+    "@types/yargs-13.0.9" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "13.0.11";
+      version = "13.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz";
-        sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz";
+        sha512 = "xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==";
       };
     };
     "@types/yargs-parser-13.1.0" = {
@@ -356,13 +347,13 @@ let
         sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
       };
     };
-    "ajv-6.12.6" = {
+    "ajv-6.12.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.6";
+      version = "6.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
-        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz";
+        sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==";
       };
     };
     "another-json-0.2.0" = {
@@ -410,15 +401,6 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
-    "ansi-styles-4.3.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
-        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
-      };
-    };
     "anymatch-3.1.1" = {
       name = "anymatch";
       packageName = "anymatch";
@@ -482,13 +464,13 @@ let
         sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
       };
     };
-    "assert-options-0.7.0" = {
+    "assert-options-0.6.2" = {
       name = "assert-options";
       packageName = "assert-options";
-      version = "0.7.0";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz";
-        sha512 = "7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ==";
+        url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz";
+        sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw==";
       };
     };
     "assert-plus-1.0.0" = {
@@ -554,22 +536,31 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.11.0" = {
+    "aws4-1.10.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.11.0";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
-        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz";
+        sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==";
       };
     };
-    "axios-0.21.1" = {
+    "axios-0.19.2" = {
       name = "axios";
       packageName = "axios";
-      version = "0.21.1";
+      version = "0.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
-        sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
+        url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
+        sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
+      };
+    };
+    "babel-runtime-6.26.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
+        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
       };
     };
     "balanced-match-1.0.0" = {
@@ -608,13 +599,13 @@ let
         sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     };
-    "binary-extensions-2.2.0" = {
+    "binary-extensions-2.0.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "2.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz";
-        sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz";
+        sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==";
       };
     };
     "binary-search-tree-0.2.5" = {
@@ -635,13 +626,22 @@ let
         sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524";
       };
     };
-    "bluebird-3.7.2" = {
+    "bluebird-2.11.0" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.7.2";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
-        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz";
+        sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
+      };
+    };
+    "bluebird-3.5.5" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
+        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
       };
     };
     "body-parser-1.19.0" = {
@@ -734,15 +734,6 @@ let
         sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
       };
     };
-    "call-bind-1.0.2" = {
-      name = "call-bind";
-      packageName = "call-bind";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz";
-        sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
-      };
-    };
     "camelcase-5.3.1" = {
       name = "camelcase";
       packageName = "camelcase";
@@ -779,15 +770,6 @@ let
         sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
-    "chalk-4.1.0" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz";
-        sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==";
-      };
-    };
     "check-error-1.0.2" = {
       name = "check-error";
       packageName = "check-error";
@@ -806,13 +788,13 @@ let
         sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==";
       };
     };
-    "chokidar-3.5.1" = {
+    "chokidar-3.4.0" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.5.1";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz";
-        sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz";
+        sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==";
       };
     };
     "cliui-5.0.0" = {
@@ -842,15 +824,6 @@ let
         sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
       };
     };
-    "color-convert-2.0.1" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz";
-        sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
-      };
-    };
     "color-name-1.1.3" = {
       name = "color-name";
       packageName = "color-name";
@@ -860,22 +833,13 @@ let
         sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
       };
     };
-    "color-name-1.1.4" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz";
-        sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
-      };
-    };
-    "color-string-1.5.4" = {
+    "color-string-1.5.3" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.5.4";
+      version = "1.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz";
-        sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz";
+        sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==";
       };
     };
     "colors-1.4.0" = {
@@ -914,13 +878,13 @@ let
         sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
-    "commander-5.1.0" = {
+    "commander-3.0.2" = {
       name = "commander";
       packageName = "commander";
-      version = "5.1.0";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz";
-        sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
+        url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz";
+        sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==";
       };
     };
     "concat-map-0.0.1" = {
@@ -968,6 +932,15 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
+    "core-js-2.6.11" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "2.6.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
+        sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
+      };
+    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -1004,6 +977,15 @@ let
         sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
+    "debug-3.1.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
+        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
+      };
+    };
     "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
@@ -1139,13 +1121,13 @@ let
         sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     };
-    "es-abstract-1.18.0-next.2" = {
+    "es-abstract-1.17.6" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.18.0-next.2";
+      version = "1.17.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
-        sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz";
+        sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -1211,13 +1193,13 @@ let
         sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==";
       };
     };
-    "eventemitter3-4.0.7" = {
+    "eventemitter3-4.0.4" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "4.0.7";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz";
-        sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz";
+        sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==";
       };
     };
     "express-4.17.1" = {
@@ -1301,15 +1283,6 @@ let
         sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ==";
       };
     };
-    "file-stream-rotator-0.5.7" = {
-      name = "file-stream-rotator";
-      packageName = "file-stream-rotator";
-      version = "0.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.5.7.tgz";
-        sha512 = "VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ==";
-      };
-    };
     "fill-range-7.0.1" = {
       name = "fill-range";
       packageName = "fill-range";
@@ -1346,13 +1319,13 @@ let
         sha512 = "3l+5/1tuw616Lgb0QBimxfdd2TqaDGpfCBpfX6EqtFmqUV3FtQnVEX4Aa62DagYEqnsTIjZcTfbq9msDbXYgyA==";
       };
     };
-    "flat-4.1.1" = {
+    "flat-4.1.0" = {
       name = "flat";
       packageName = "flat";
-      version = "4.1.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz";
-        sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==";
+        url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz";
+        sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==";
       };
     };
     "fn.name-1.1.0" = {
@@ -1364,13 +1337,13 @@ let
         sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
       };
     };
-    "follow-redirects-1.13.1" = {
+    "follow-redirects-1.5.10" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.13.1";
+      version = "1.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz";
-        sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
+        sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
       };
     };
     "forever-agent-0.6.1" = {
@@ -1436,15 +1409,6 @@ let
         sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
       };
     };
-    "fsevents-2.3.1" = {
-      name = "fsevents";
-      packageName = "fsevents";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz";
-        sha512 = "YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==";
-      };
-    };
     "function-bind-1.1.1" = {
       name = "function-bind";
       packageName = "function-bind";
@@ -1490,15 +1454,6 @@ let
         sha1 = "ead774abee72e20409433a066366023dd6887a41";
       };
     };
-    "get-intrinsic-1.0.2" = {
-      name = "get-intrinsic";
-      packageName = "get-intrinsic";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
-        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
-      };
-    };
     "getpass-0.1.7" = {
       name = "getpass";
       packageName = "getpass";
@@ -1544,13 +1499,13 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-5.1.5" = {
+    "har-validator-5.1.3" = {
       name = "har-validator";
       packageName = "har-validator";
-      version = "5.1.5";
+      version = "5.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz";
-        sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
+        sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
       };
     };
     "has-1.0.3" = {
@@ -1571,15 +1526,6 @@ let
         sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
-    "has-flag-4.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz";
-        sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
-      };
-    };
     "has-symbols-1.0.1" = {
       name = "has-symbols";
       packageName = "has-symbols";
@@ -1679,31 +1625,22 @@ let
         sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
       };
     };
-    "is-buffer-2.0.5" = {
+    "is-buffer-2.0.4" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "2.0.5";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz";
-        sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
+        sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
       };
     };
-    "is-callable-1.2.2" = {
+    "is-callable-1.2.0" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.2.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
-        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
-      };
-    };
-    "is-core-module-2.2.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
-        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz";
+        sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==";
       };
     };
     "is-date-object-1.0.2" = {
@@ -1751,22 +1688,13 @@ let
         sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==";
       };
     };
-    "is-my-json-valid-2.20.5" = {
+    "is-my-json-valid-2.20.0" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.20.5";
+      version = "2.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz";
-        sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A==";
-      };
-    };
-    "is-negative-zero-2.0.1" = {
-      name = "is-negative-zero";
-      packageName = "is-negative-zero";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz";
-        sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz";
+        sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==";
       };
     };
     "is-number-7.0.0" = {
@@ -1787,13 +1715,13 @@ let
         sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
       };
     };
-    "is-regex-1.1.1" = {
+    "is-regex-1.1.0" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.1.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
-        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz";
+        sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==";
       };
     };
     "is-stream-1.1.0" = {
@@ -1877,13 +1805,13 @@ let
         sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
       };
     };
-    "js-yaml-3.14.1" = {
+    "js-yaml-3.14.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.1";
+      version = "3.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
+        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
       };
     };
     "jsbn-0.1.1" = {
@@ -1922,13 +1850,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "jsonpointer-4.1.0" = {
+    "jsonpointer-4.0.1" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.1.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz";
-        sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
     "jsprim-1.4.1" = {
@@ -1958,13 +1886,13 @@ let
         sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e";
       };
     };
-    "localforage-1.9.0" = {
+    "localforage-1.7.4" = {
       name = "localforage";
       packageName = "localforage";
-      version = "1.9.0";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz";
-        sha512 = "rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==";
+        url = "https://registry.npmjs.org/localforage/-/localforage-1.7.4.tgz";
+        sha512 = "3EmVZatmNVeCo/t6Te7P06h2alGwbq8wXlSkcSXMvDE2/edPmsVqTPlzGnZaqwZZDBs6v+kxWpqjVsqsNJT8jA==";
       };
     };
     "locate-path-3.0.0" = {
@@ -1976,13 +1904,13 @@ let
         sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
-    "lodash-4.17.20" = {
+    "lodash-4.17.15" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.20";
+      version = "4.17.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
-        sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
       };
     };
     "lodash.toarray-4.4.0" = {
@@ -2021,13 +1949,13 @@ let
         sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";
       };
     };
-    "loglevel-1.7.1" = {
+    "loglevel-1.6.8" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.7.1";
+      version = "1.6.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz";
-        sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz";
+        sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==";
       };
     };
     "make-error-1.3.6" = {
@@ -2039,31 +1967,31 @@ let
         sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
-    "matrix-appservice-0.4.2" = {
+    "matrix-appservice-0.4.1" = {
       name = "matrix-appservice";
       packageName = "matrix-appservice";
-      version = "0.4.2";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.4.2.tgz";
-        sha512 = "YD2zFiPo9FedjA86gfWFN2UVDwDBhWL1Kas/txG0iwpT6jcJmOvpPqbfuFeYk3Q3G3c5BZ8k8tABMpzS9Bu39A==";
+        url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.4.1.tgz";
+        sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA==";
       };
     };
-    "matrix-appservice-bridge-1.13.2" = {
+    "matrix-appservice-bridge-1.12.2" = {
       name = "matrix-appservice-bridge";
       packageName = "matrix-appservice-bridge";
-      version = "1.13.2";
+      version = "1.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.13.2.tgz";
-        sha512 = "9sVLKeZAKTVDgYPlsJwiShD1AAXHKbh5a85KUkU8gvD0zg7EZOiNjgelltZ1qrutmv4cyJO3sSUzvUVBCKOXuQ==";
+        url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz";
+        sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ==";
       };
     };
-    "matrix-js-sdk-6.2.2" = {
+    "matrix-js-sdk-2.4.6" = {
       name = "matrix-js-sdk";
       packageName = "matrix-js-sdk";
-      version = "6.2.2";
+      version = "2.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz";
-        sha512 = "uTXmKVzl7GXM3R70cl2E87H+mtwN3ILqPeB80Z/2ITN9Vaf9pMURCCAuHePEBXbhnD7DOZj7Cke42uP+ByR6Hw==";
+        url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-2.4.6.tgz";
+        sha512 = "ydU64WwAYFjaTJ7JTv/JM3HmSY7leHWm3x3j0J4KWVhDDxsLoQ/v8Tc6FwlVom9/B9VvGTk+AG3aY0zgNk8LQg==";
       };
     };
     "media-typer-0.3.0" = {
@@ -2102,22 +2030,22 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.45.0" = {
+    "mime-db-1.44.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.45.0";
+      version = "1.44.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
-        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
       };
     };
-    "mime-types-2.1.28" = {
+    "mime-types-2.1.27" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.28";
+      version = "2.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
-        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
       };
     };
     "minimatch-3.0.4" = {
@@ -2156,13 +2084,13 @@ let
         sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==";
       };
     };
-    "moment-2.29.1" = {
+    "moment-2.27.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.29.1";
+      version = "2.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz";
-        sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==";
+        url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz";
+        sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==";
       };
     };
     "morgan-1.10.0" = {
@@ -2192,13 +2120,13 @@ let
         sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
       };
     };
-    "ms-2.1.3" = {
+    "ms-2.1.2" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.3";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
     "nedb-1.8.0" = {
@@ -2237,13 +2165,13 @@ let
         sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==";
       };
     };
-    "nopt-4.0.3" = {
+    "nopt-3.0.6" = {
       name = "nopt";
       packageName = "nopt";
-      version = "4.0.3";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
-        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
+        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
+        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
       };
     };
     "normalize-path-3.0.0" = {
@@ -2255,13 +2183,13 @@ let
         sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
-    "nunjucks-3.2.2" = {
+    "nunjucks-3.2.1" = {
       name = "nunjucks";
       packageName = "nunjucks";
-      version = "3.2.2";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.2.tgz";
-        sha512 = "KUi85OoF2NMygwODAy28Lh9qHmq5hO3rBlbkYoC8v377h4l8Pt5qFjILl0LWpMbOrZ18CzfVVUvIHUIrtED3sA==";
+        url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.1.tgz";
+        sha512 = "LYlVuC1ZNSalQQkLNNPvcgPt2M9FTY9bs39mTCuFXtqh7jWbYzhDlmz2M6onPiXEhdZo+b9anRhc+uBGuJZ2bQ==";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -2282,22 +2210,13 @@ let
         sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==";
       };
     };
-    "object-hash-2.1.1" = {
-      name = "object-hash";
-      packageName = "object-hash";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz";
-        sha512 = "VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==";
-      };
-    };
-    "object-inspect-1.9.0" = {
+    "object-inspect-1.8.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.9.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz";
-        sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
+        sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
       };
     };
     "object-keys-1.1.1" = {
@@ -2318,22 +2237,13 @@ let
         sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.assign-4.1.2" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
-        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
-      };
-    };
-    "object.getownpropertydescriptors-2.1.1" = {
+    "object.getownpropertydescriptors-2.1.0" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.1.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz";
-        sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
       };
     };
     "on-finished-2.3.0" = {
@@ -2372,33 +2282,6 @@ let
         sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
-      };
-    };
-    "osenv-0.1.5" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
-      };
-    };
     "p-cancelable-1.1.0" = {
       name = "p-cancelable";
       packageName = "p-cancelable";
@@ -2444,13 +2327,13 @@ let
         sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng==";
       };
     };
-    "p-queue-6.6.2" = {
+    "p-queue-6.4.0" = {
       name = "p-queue";
       packageName = "p-queue";
-      version = "6.6.2";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz";
-        sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==";
+        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz";
+        sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw==";
       };
     };
     "p-retry-4.2.0" = {
@@ -2552,22 +2435,22 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "pg-8.5.1" = {
+    "pg-8.2.1" = {
       name = "pg";
       packageName = "pg";
-      version = "8.5.1";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz";
-        sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==";
+        url = "https://registry.npmjs.org/pg/-/pg-8.2.1.tgz";
+        sha512 = "DKzffhpkWRr9jx7vKxA+ur79KG+SKw+PdjMb1IRhMiKI9zqYUGczwFprqy+5Veh/DCcFs1Y6V8lRLN5I1DlleQ==";
       };
     };
-    "pg-connection-string-2.4.0" = {
+    "pg-connection-string-2.2.3" = {
       name = "pg-connection-string";
       packageName = "pg-connection-string";
-      version = "2.4.0";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz";
-        sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ==";
+        url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.3.tgz";
+        sha512 = "I/KCSQGmOrZx6sMHXkOs2MjddrYcqpza3Dtsy0AjIgBr/bZiPJRK9WhABXN1Uy1UDazRbi9gZEzO2sAhL5EqiQ==";
       };
     };
     "pg-int8-1.0.1" = {
@@ -2579,40 +2462,40 @@ let
         sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==";
       };
     };
-    "pg-minify-1.6.2" = {
+    "pg-minify-1.6.1" = {
       name = "pg-minify";
       packageName = "pg-minify";
-      version = "1.6.2";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz";
-        sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==";
+        url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz";
+        sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g==";
       };
     };
-    "pg-pool-3.2.2" = {
+    "pg-pool-3.2.1" = {
       name = "pg-pool";
       packageName = "pg-pool";
-      version = "3.2.2";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz";
-        sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==";
+        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz";
+        sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA==";
       };
     };
-    "pg-promise-10.9.1" = {
+    "pg-promise-10.5.7" = {
       name = "pg-promise";
       packageName = "pg-promise";
-      version = "10.9.1";
+      version = "10.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.9.1.tgz";
-        sha512 = "Om5sYmsm2NWXP+D0Soappb4fuidER9qNLcnVo9nBPFqwPfpnBZZPzzLaVvwBXs//+kJ9L4bBTXm2iWNAp39e2A==";
+        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.7.tgz";
+        sha512 = "feCpn4J4MsNnR5Ve3fpbIlmbohwRirvZEI1Dcy72zwKvIKKRHPk7TJZFQHP4YQhaZ3sT3VGgg0o1/I+uhht/1g==";
       };
     };
-    "pg-protocol-1.4.0" = {
+    "pg-protocol-1.2.4" = {
       name = "pg-protocol";
       packageName = "pg-protocol";
-      version = "1.4.0";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz";
-        sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==";
+        url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.4.tgz";
+        sha512 = "/8L/G+vW/VhWjTGXpGh8XVkXOFx1ZDY+Yuz//Ab8CfjInzFkreI+fDG3WjCeSra7fIZwAFxzbGptNbm8xSXenw==";
       };
     };
     "pg-types-2.2.0" = {
@@ -2624,13 +2507,13 @@ let
         sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==";
       };
     };
-    "pgpass-1.0.4" = {
+    "pgpass-1.0.2" = {
       name = "pgpass";
       packageName = "pgpass";
-      version = "1.0.4";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz";
-        sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==";
+        url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz";
+        sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306";
       };
     };
     "picomatch-2.2.2" = {
@@ -2660,13 +2543,13 @@ let
         sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35";
       };
     };
-    "postgres-date-1.0.7" = {
+    "postgres-date-1.0.5" = {
       name = "postgres-date";
       packageName = "postgres-date";
-      version = "1.0.7";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz";
-        sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==";
+        url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz";
+        sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA==";
       };
     };
     "postgres-interval-1.2.0" = {
@@ -2687,13 +2570,13 @@ let
         sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
-    "prom-client-12.0.0" = {
+    "prom-client-11.5.3" = {
       name = "prom-client";
       packageName = "prom-client";
-      version = "12.0.0";
+      version = "11.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz";
-        sha512 = "JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ==";
+        url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz";
+        sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==";
       };
     };
     "proxy-addr-2.0.6" = {
@@ -2804,22 +2687,22 @@ let
         sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==";
       };
     };
-    "readdirp-3.5.0" = {
+    "readdirp-3.4.0" = {
       name = "readdirp";
       packageName = "readdirp";
-      version = "3.5.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
-        sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz";
+        sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==";
       };
     };
-    "regenerator-runtime-0.13.7" = {
+    "regenerator-runtime-0.11.1" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
-      version = "0.13.7";
+      version = "0.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz";
-        sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==";
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
+        sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
       };
     };
     "request-2.88.2" = {
@@ -2831,22 +2714,22 @@ let
         sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "request-promise-core-1.1.4" = {
+    "request-promise-core-1.1.3" = {
       name = "request-promise-core";
       packageName = "request-promise-core";
-      version = "1.1.4";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz";
-        sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==";
+        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz";
+        sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==";
       };
     };
-    "request-promise-native-1.0.9" = {
+    "request-promise-native-1.0.8" = {
       name = "request-promise-native";
       packageName = "request-promise-native";
-      version = "1.0.9";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz";
-        sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
+        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz";
+        sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==";
       };
     };
     "require-directory-2.1.1" = {
@@ -2867,13 +2750,13 @@ let
         sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
       };
     };
-    "resolve-1.19.0" = {
+    "resolve-1.17.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.19.0";
+      version = "1.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
-        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz";
+        sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
       };
     };
     "retry-0.12.0" = {
@@ -2894,6 +2777,15 @@ let
         sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
+    "safe-buffer-5.2.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
+      };
+    };
     "safer-buffer-2.1.2" = {
       name = "safer-buffer";
       packageName = "safer-buffer";
@@ -2903,6 +2795,15 @@ let
         sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
+    "semver-4.3.2" = {
+      name = "semver";
+      packageName = "semver";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz";
+        sha1 = "c7a07158a80bedd052355b770d82d6640f803be7";
+      };
+    };
     "semver-5.7.1" = {
       name = "semver";
       packageName = "semver";
@@ -2984,22 +2885,22 @@ let
         sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==";
       };
     };
-    "spex-3.2.0" = {
+    "spex-3.0.1" = {
       name = "spex";
       packageName = "spex";
-      version = "3.2.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz";
-        sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg==";
+        url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz";
+        sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA==";
       };
     };
-    "split2-3.2.2" = {
-      name = "split2";
-      packageName = "split2";
-      version = "3.2.2";
+    "split-1.0.1" = {
+      name = "split";
+      packageName = "split";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz";
-        sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==";
+        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
+        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -3065,22 +2966,22 @@ let
         sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
-    "string.prototype.trimend-1.0.3" = {
+    "string.prototype.trimend-1.0.1" = {
       name = "string.prototype.trimend";
       packageName = "string.prototype.trimend";
-      version = "1.0.3";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
-        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
+        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
       };
     };
-    "string.prototype.trimstart-1.0.3" = {
+    "string.prototype.trimstart-1.0.1" = {
       name = "string.prototype.trimstart";
       packageName = "string.prototype.trimstart";
-      version = "1.0.3";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
-        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
+        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
       };
     };
     "string_decoder-1.1.1" = {
@@ -3092,6 +2993,15 @@ let
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
+    "string_decoder-1.3.0" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
+        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
+      };
+    };
     "strip-ansi-4.0.0" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
@@ -3137,15 +3047,6 @@ let
         sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==";
       };
     };
-    "supports-color-7.2.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz";
-        sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
-      };
-    };
     "tdigest-0.1.1" = {
       name = "tdigest";
       packageName = "tdigest";
@@ -3164,6 +3065,15 @@ let
         sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==";
       };
     };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
     "to-regex-range-5.0.1" = {
       name = "to-regex-range";
       packageName = "to-regex-range";
@@ -3209,22 +3119,22 @@ let
         sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==";
       };
     };
-    "tslib-1.14.1" = {
+    "tslib-1.13.0" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.14.1";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
-        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz";
+        sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==";
       };
     };
-    "tslint-6.1.3" = {
+    "tslint-6.1.2" = {
       name = "tslint";
       packageName = "tslint";
-      version = "6.1.3";
+      version = "6.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz";
-        sha512 = "IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==";
+        url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz";
+        sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA==";
       };
     };
     "tsutils-2.29.0" = {
@@ -3272,13 +3182,13 @@ let
         sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
-    "typescript-3.9.7" = {
+    "typescript-3.9.5" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.9.7";
+      version = "3.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz";
-        sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz";
+        sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==";
       };
     };
     "underscore-1.4.4" = {
@@ -3308,13 +3218,13 @@ let
         sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
       };
     };
-    "uri-js-4.4.1" = {
+    "uri-js-4.2.2" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
-        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -3398,13 +3308,13 @@ let
         sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
-    "winston-3.3.3" = {
+    "winston-3.3.2" = {
       name = "winston";
       packageName = "winston";
-      version = "3.3.3";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz";
-        sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==";
+        url = "https://registry.npmjs.org/winston/-/winston-3.3.2.tgz";
+        sha512 = "vTOrUZlyQPS8VpCcQ1JT8BumDAUe4awCHZ9nmGgO7LqkV4atj0dKa5suA7Trf7QKtBszE2yUs9d8744Kz9j4jQ==";
       };
     };
     "winston-compat-0.1.5" = {
@@ -3425,15 +3335,6 @@ let
         sha512 = "KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA==";
       };
     };
-    "winston-daily-rotate-file-4.5.0" = {
-      name = "winston-daily-rotate-file";
-      packageName = "winston-daily-rotate-file";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.0.tgz";
-        sha512 = "/HqeWiU48dzGqcrABRlxYWVMdL6l3uKCtFSJyrqK+E2rLnSFNsgYpvwx15EgTitBLNzH69lQd/+z2ASryV2aqw==";
-      };
-    };
     "winston-transport-4.4.0" = {
       name = "winston-transport";
       packageName = "winston-transport";
@@ -3479,13 +3380,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.1" = {
+    "y18n-4.0.0" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
-        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
     "yargs-13.3.2" = {
@@ -3537,20 +3438,9 @@ in
       sha256 = "cddcff326688ceddfd37eae44d3947ea84cf1d8fd2062e3c203ffbf35e2ea7f6";
     };
     dependencies = [
-      sources."@babel/code-frame-7.12.11"
-      sources."@babel/helper-validator-identifier-7.12.11"
-      (sources."@babel/highlight-7.10.4" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."@babel/runtime-7.12.5"
+      sources."@babel/code-frame-7.10.3"
+      sources."@babel/helper-validator-identifier-7.10.3"
+      sources."@babel/highlight-7.10.3"
       sources."@dabh/diagnostics-2.0.2"
       sources."@slack/logger-1.1.1"
       (sources."@slack/rtm-api-5.0.5" // {
@@ -3558,43 +3448,47 @@ in
           sources."p-queue-2.4.2"
         ];
       })
-      sources."@slack/types-1.10.0"
-      sources."@slack/web-api-5.15.0"
+      sources."@slack/types-1.7.0"
+      (sources."@slack/web-api-5.10.0" // {
+        dependencies = [
+          sources."p-queue-2.4.2"
+        ];
+      })
       sources."@types/body-parser-1.19.0"
       sources."@types/caseless-0.12.2"
-      sources."@types/chai-4.2.14"
-      sources."@types/connect-3.4.34"
-      sources."@types/express-4.17.11"
-      sources."@types/express-serve-static-core-4.17.18"
+      sources."@types/chai-4.2.11"
+      sources."@types/connect-3.4.33"
+      sources."@types/express-4.17.6"
+      sources."@types/express-serve-static-core-4.17.7"
       sources."@types/is-stream-1.1.0"
-      sources."@types/mime-1.3.2"
+      sources."@types/mime-2.0.2"
       sources."@types/mocha-7.0.2"
-      sources."@types/nedb-1.8.11"
-      sources."@types/node-13.13.40"
+      sources."@types/nedb-1.8.9"
+      sources."@types/node-13.9.3"
       sources."@types/node-emoji-1.8.1"
       sources."@types/nunjucks-3.1.3"
       sources."@types/p-queue-2.3.2"
-      sources."@types/qs-6.9.5"
+      sources."@types/qs-6.9.3"
       sources."@types/randomstring-1.1.6"
       sources."@types/range-parser-1.2.3"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/retry-0.12.0"
-      sources."@types/serve-static-1.13.9"
+      sources."@types/serve-static-1.13.4"
       sources."@types/tough-cookie-4.0.0"
       sources."@types/uuid-7.0.4"
-      sources."@types/ws-7.4.0"
-      sources."@types/yargs-13.0.11"
+      sources."@types/ws-7.2.5"
+      sources."@types/yargs-13.0.9"
       sources."@types/yargs-parser-13.1.0"
       sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4"
       sources."a-sync-waterfall-1.0.1"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
-      sources."ajv-6.12.6"
+      sources."ajv-6.12.2"
       sources."another-json-0.2.0"
       sources."ansi-colors-3.2.3"
       sources."ansi-regex-4.1.0"
-      sources."ansi-styles-4.3.0"
+      sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.1"
       sources."arg-4.1.3"
       sources."argparse-1.0.10"
@@ -3602,24 +3496,29 @@ in
       sources."array-uniq-1.0.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
-      sources."assert-options-0.7.0"
+      sources."assert-options-0.6.2"
       sources."assert-plus-1.0.0"
       sources."assertion-error-1.1.0"
       sources."async-0.2.10"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.11.0"
-      sources."axios-0.21.1"
+      sources."aws4-1.10.0"
+      sources."axios-0.19.2"
+      sources."babel-runtime-6.26.0"
       sources."balanced-match-1.0.0"
       sources."base-x-3.0.8"
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.2.0"
+      sources."binary-extensions-2.0.0"
       sources."binary-search-tree-0.2.5"
       sources."bintrees-1.0.1"
-      sources."bluebird-3.7.2"
-      sources."body-parser-1.19.0"
+      sources."bluebird-2.11.0"
+      (sources."body-parser-1.19.0" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-request-0.3.3"
@@ -3629,36 +3528,35 @@ in
       sources."buffer-writer-2.0.0"
       sources."builtin-modules-1.1.1"
       sources."bytes-3.1.0"
-      sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       sources."chai-4.2.0"
-      sources."chalk-4.1.0"
-      sources."check-error-1.0.2"
-      sources."chokidar-3.5.1"
-      sources."cliui-5.0.0"
-      (sources."color-3.0.0" // {
+      (sources."chalk-2.4.2" // {
         dependencies = [
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
+          sources."escape-string-regexp-1.0.5"
         ];
       })
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."color-string-1.5.4"
+      sources."check-error-1.0.2"
+      sources."chokidar-3.4.0"
+      sources."cliui-5.0.0"
+      sources."color-3.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."color-string-1.5.3"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."combined-stream-1.0.8"
-      sources."commander-5.1.0"
+      sources."commander-3.0.2"
       sources."concat-map-0.0.1"
       sources."content-disposition-0.5.3"
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
+      sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
+      sources."debug-3.1.0"
       sources."decamelize-1.2.0"
       sources."deep-eql-3.0.1"
       sources."define-properties-1.1.3"
@@ -3671,52 +3569,55 @@ in
       sources."emoji-regex-7.0.3"
       sources."enabled-2.0.0"
       sources."encodeurl-1.0.2"
-      (sources."es-abstract-1.18.0-next.2" // {
-        dependencies = [
-          sources."object.assign-4.1.2"
-        ];
-      })
+      sources."es-abstract-1.17.6"
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-2.0.0"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
       sources."eventemitter3-3.1.2"
-      sources."express-4.17.1"
+      (sources."express-4.17.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fecha-4.2.0"
-      sources."file-stream-rotator-0.5.7"
+      sources."file-stream-rotator-0.4.1"
       sources."fill-range-7.0.1"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."find-up-3.0.0"
       sources."finity-0.5.4"
-      sources."flat-4.1.1"
+      sources."flat-4.1.0"
       sources."fn.name-1.1.0"
-      sources."follow-redirects-1.13.1"
+      sources."follow-redirects-1.5.10"
       sources."forever-agent-0.6.1"
       sources."form-data-2.5.1"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.1"
+      sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
       sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       sources."get-caller-file-2.0.5"
       sources."get-func-name-2.0.0"
-      sources."get-intrinsic-1.0.2"
       sources."getpass-0.1.7"
       sources."glob-7.1.3"
       sources."glob-parent-5.1.1"
       sources."growl-1.10.5"
       sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
+      sources."har-validator-5.1.3"
       sources."has-1.0.3"
-      sources."has-flag-4.0.0"
+      sources."has-flag-3.0.0"
       sources."has-symbols-1.0.1"
       sources."he-1.2.0"
       sources."http-errors-1.7.2"
@@ -3728,19 +3629,17 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.3.2"
       sources."is-binary-path-2.1.0"
-      sources."is-buffer-2.0.5"
-      sources."is-callable-1.2.2"
-      sources."is-core-module-2.2.0"
+      sources."is-buffer-2.0.4"
+      sources."is-callable-1.2.0"
       sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-my-ip-valid-1.0.0"
-      sources."is-my-json-valid-2.20.5"
-      sources."is-negative-zero-2.0.1"
+      sources."is-my-json-valid-2.20.0"
       sources."is-number-7.0.0"
       sources."is-property-1.0.2"
-      sources."is-regex-1.1.1"
+      sources."is-regex-1.1.0"
       sources."is-stream-1.1.0"
       sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
@@ -3748,50 +3647,40 @@ in
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-3.14.0"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonpointer-4.1.0"
+      sources."jsonpointer-4.0.1"
       sources."jsprim-1.4.1"
       sources."kuler-2.0.0"
       sources."lie-3.1.1"
-      sources."localforage-1.9.0"
+      sources."localforage-1.7.4"
       sources."locate-path-3.0.0"
-      sources."lodash-4.17.20"
+      sources."lodash-4.17.15"
       sources."lodash.toarray-4.4.0"
-      (sources."log-symbols-3.0.0" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
+      sources."log-symbols-3.0.0"
       (sources."logform-2.2.0" // {
         dependencies = [
-          sources."ms-2.1.3"
+          sources."ms-2.1.2"
         ];
       })
-      sources."loglevel-1.7.1"
+      sources."loglevel-1.6.8"
       sources."make-error-1.3.6"
-      sources."matrix-appservice-0.4.2"
-      (sources."matrix-appservice-bridge-1.13.2" // {
+      sources."matrix-appservice-0.4.1"
+      sources."matrix-appservice-bridge-1.12.2"
+      (sources."matrix-js-sdk-2.4.6" // {
         dependencies = [
-          sources."winston-daily-rotate-file-4.5.0"
+          sources."bluebird-3.5.5"
         ];
       })
-      sources."matrix-js-sdk-6.2.2"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdirp-0.5.5"
@@ -3800,17 +3689,16 @@ in
           sources."chokidar-3.3.0"
           sources."debug-3.2.6"
           sources."escape-string-regexp-1.0.5"
-          sources."fsevents-2.1.3"
-          sources."has-flag-3.0.0"
           sources."js-yaml-3.13.1"
           sources."ms-2.1.1"
           sources."readdirp-3.2.0"
           sources."supports-color-6.0.0"
         ];
       })
-      sources."moment-2.29.1"
+      sources."moment-2.27.0"
       (sources."morgan-1.10.0" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."depd-2.0.0"
         ];
       })
@@ -3823,29 +3711,26 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."nopt-4.0.3"
+      sources."nopt-3.0.6"
       sources."normalize-path-3.0.0"
-      sources."nunjucks-3.2.2"
+      sources."nunjucks-3.2.1"
       sources."oauth-sign-0.9.0"
-      sources."object-hash-2.1.1"
-      sources."object-inspect-1.9.0"
+      sources."object-hash-1.3.1"
+      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.1.1"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
       sources."p-limit-2.3.0"
       sources."p-locate-3.0.0"
-      (sources."p-queue-6.6.2" // {
+      (sources."p-queue-6.4.0" // {
         dependencies = [
-          sources."eventemitter3-4.0.7"
+          sources."eventemitter3-4.0.4"
         ];
       })
       sources."p-retry-4.2.0"
@@ -3859,22 +3744,22 @@ in
       sources."path-to-regexp-0.1.7"
       sources."pathval-1.1.0"
       sources."performance-now-2.1.0"
-      sources."pg-8.5.1"
-      sources."pg-connection-string-2.4.0"
+      sources."pg-8.2.1"
+      sources."pg-connection-string-2.2.3"
       sources."pg-int8-1.0.1"
-      sources."pg-minify-1.6.2"
-      sources."pg-pool-3.2.2"
-      sources."pg-promise-10.9.1"
-      sources."pg-protocol-1.4.0"
+      sources."pg-minify-1.6.1"
+      sources."pg-pool-3.2.1"
+      sources."pg-promise-10.5.7"
+      sources."pg-protocol-1.2.4"
       sources."pg-types-2.2.0"
-      sources."pgpass-1.0.4"
+      sources."pgpass-1.0.2"
       sources."picomatch-2.2.2"
       sources."postgres-array-2.0.0"
       sources."postgres-bytea-1.0.0"
-      sources."postgres-date-1.0.7"
+      sources."postgres-date-1.0.5"
       sources."postgres-interval-1.2.0"
       sources."process-nextick-args-2.0.1"
-      sources."prom-client-12.0.0"
+      sources."prom-client-11.5.3"
       sources."proxy-addr-2.0.6"
       sources."psl-1.8.0"
       sources."punycode-2.1.1"
@@ -3883,9 +3768,9 @@ in
       sources."randomstring-1.1.5"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
-      sources."readable-stream-2.3.7"
-      sources."readdirp-3.5.0"
-      sources."regenerator-runtime-0.13.7"
+      sources."readable-stream-3.6.0"
+      sources."readdirp-3.4.0"
+      sources."regenerator-runtime-0.11.1"
       (sources."request-2.88.2" // {
         dependencies = [
           sources."form-data-2.3.3"
@@ -3893,17 +3778,22 @@ in
           sources."uuid-3.4.0"
         ];
       })
-      sources."request-promise-core-1.1.4"
-      sources."request-promise-native-1.0.9"
+      sources."request-promise-core-1.1.3"
+      sources."request-promise-native-1.0.8"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.19.0"
+      sources."resolve-1.17.0"
       sources."retry-0.12.0"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.3.0"
+      sources."semver-4.3.2"
       (sources."send-0.17.1" // {
         dependencies = [
+          (sources."debug-2.6.9" // {
+            dependencies = [
+              sources."ms-2.0.0"
+            ];
+          })
           sources."ms-2.1.1"
         ];
       })
@@ -3913,26 +3803,27 @@ in
       sources."simple-swizzle-0.2.2"
       sources."source-map-0.6.1"
       sources."source-map-support-0.5.19"
-      sources."spex-3.2.0"
-      (sources."split2-3.2.2" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      sources."spex-3.0.1"
+      sources."split-1.0.1"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."string-width-3.1.0"
-      sources."string.prototype.trimend-1.0.3"
-      sources."string.prototype.trimstart-1.0.3"
-      sources."string_decoder-1.1.1"
+      sources."string.prototype.trimend-1.0.1"
+      sources."string.prototype.trimstart-1.0.1"
+      (sources."string_decoder-1.3.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.1"
+        ];
+      })
       sources."strip-ansi-5.2.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-7.2.0"
+      sources."supports-color-5.5.0"
       sources."tdigest-0.1.1"
       sources."text-hex-1.0.0"
+      sources."through-2.3.8"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
       sources."tough-cookie-2.5.0"
@@ -3942,19 +3833,12 @@ in
           sources."diff-4.0.2"
         ];
       })
-      sources."tslib-1.14.1"
-      (sources."tslint-6.1.3" // {
+      sources."tslib-1.13.0"
+      (sources."tslint-6.1.2" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
           sources."commander-2.20.3"
           sources."diff-4.0.2"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
           sources."semver-5.7.1"
-          sources."supports-color-5.5.0"
         ];
       })
       sources."tsutils-2.29.0"
@@ -3962,11 +3846,11 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-detect-4.0.8"
       sources."type-is-1.6.18"
-      sources."typescript-3.9.7"
+      sources."typescript-3.9.5"
       sources."underscore-1.4.4"
       sources."unhomoglyph-1.0.6"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-7.0.3"
@@ -3981,38 +3865,35 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      (sources."winston-3.3.3" // {
+      (sources."winston-3.3.2" // {
         dependencies = [
           sources."async-3.2.0"
           sources."is-stream-2.0.0"
-          sources."readable-stream-3.6.0"
         ];
       })
       (sources."winston-compat-0.1.5" // {
         dependencies = [
           sources."fecha-2.3.3"
           sources."logform-1.10.0"
-          sources."ms-2.1.3"
+          sources."ms-2.1.2"
         ];
       })
       (sources."winston-daily-rotate-file-3.10.0" // {
         dependencies = [
-          sources."file-stream-rotator-0.4.1"
-          sources."object-hash-1.3.1"
+          sources."semver-6.3.0"
         ];
       })
-      sources."winston-transport-4.4.0"
-      (sources."wrap-ansi-5.1.0" // {
+      (sources."winston-transport-4.4.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
         ];
       })
+      sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."ws-5.2.2"
       sources."xtend-4.0.2"
-      sources."y18n-4.0.1"
+      sources."y18n-4.0.0"
       sources."yargs-13.3.2"
       sources."yargs-parser-13.1.2"
       sources."yargs-unparser-1.6.0"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index 47e64e9d911..c8186e1d02c 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -49,13 +49,13 @@ let
         sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
       };
     };
-    "chainpad-crypto-0.2.5" = {
+    "chainpad-crypto-0.2.4" = {
       name = "chainpad-crypto";
       packageName = "chainpad-crypto";
-      version = "0.2.5";
+      version = "0.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.5.tgz";
-        sha512 = "K9vRsAspuX+uU1goXPz0CawpLIaOHq+1JP3WfDLqaz67LbCX/MLIUt9aMcSeIJcwZ9uMpqnbMGRktyVPoz6MCA==";
+        url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz";
+        sha512 = "fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg==";
       };
     };
     "chainpad-server-4.0.9" = {
@@ -337,22 +337,22 @@ let
         sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
       };
     };
-    "mime-db-1.45.0" = {
+    "mime-db-1.44.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.45.0";
+      version = "1.44.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
-        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
       };
     };
-    "mime-types-2.1.28" = {
+    "mime-types-2.1.27" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.28";
+      version = "2.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
-        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
       };
     };
     "ms-2.0.0" = {
@@ -562,12 +562,12 @@ let
         sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb";
       };
     };
-    "tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" = {
+    "tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
       version = "0.12.2";
       src = fetchgit {
-        url = "https://github.com/dchest/tweetnacl-js.git";
+        url = "git://github.com/dchest/tweetnacl-js.git";
         rev = "8a21381d696acdc4e99c9f706f1ad23285795f79";
         sha256 = "10f27b673944107995b3f6dcd65caecd705acdae9c37b7e79b810a8a72a40a31";
       };
@@ -662,9 +662,9 @@ in
       sources."async-limiter-1.0.1"
       sources."body-parser-1.18.3"
       sources."bytes-3.0.0"
-      (sources."chainpad-crypto-0.2.5" // {
+      (sources."chainpad-crypto-0.2.4" // {
         dependencies = [
-          sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2"
+          sources."tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2"
         ];
       })
       sources."chainpad-server-4.0.9"
@@ -698,8 +698,8 @@ in
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.4.1"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
       sources."netflux-websocket-0.1.20"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 76d5cf6a202..d0273cfe1f9 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
index 7417a916595..af58cbf3f9b 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -22,31 +22,31 @@ let
         sha512 = "g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ==";
       };
     };
-    "@formatjs/ecma402-abstract-1.5.1" = {
+    "@formatjs/ecma402-abstract-1.5.0" = {
       name = "_at_formatjs_slash_ecma402-abstract";
       packageName = "@formatjs/ecma402-abstract";
-      version = "1.5.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.1.tgz";
-        sha512 = "io9XhgIpEbc6jSdn4QVnJeFaUzy6gS5fGiIRCUJ7QKqCNp69JS8EJPW8gCtvwz+JQtx2SJvhaMJbzz3rGkTXBA==";
+        url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz";
+        sha512 = "wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==";
       };
     };
-    "@formatjs/intl-datetimeformat-3.2.3" = {
+    "@formatjs/intl-datetimeformat-3.2.2" = {
       name = "_at_formatjs_slash_intl-datetimeformat";
       packageName = "@formatjs/intl-datetimeformat";
-      version = "3.2.3";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.3.tgz";
-        sha512 = "KnQUVuctlozQHULnBi+WLZDAGznFYviVU2HqgCYin2ZEz45IJ9dIZH9gqwsIgiLDgudptHfbj98I3JeKJhprcg==";
+        url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.2.tgz";
+        sha512 = "wIqe4dPzbYB6SrJWNPKBnXkPj1pR68qtGCzHkPo8JGRpWQcVpHh3Cigw1cQs2I9M1F9dOtFHQP6gi+xsb1kAiA==";
       };
     };
-    "@formatjs/intl-displaynames-4.0.4" = {
+    "@formatjs/intl-displaynames-4.0.3" = {
       name = "_at_formatjs_slash_intl-displaynames";
       packageName = "@formatjs/intl-displaynames";
-      version = "4.0.4";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.4.tgz";
-        sha512 = "oNeLM0vZDFNZSqrz70XhxbMGtjfQ7T/UUcA9K4DvjWX6vmgCbpw5rdwEddhTotY3EmTyUJueK+14e2gIwfCbBA==";
+        url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.3.tgz";
+        sha512 = "wNJZzIzlA88oyHZAFdAnLKV/srtIrU//md9SU2Bo0LKXKIukz/g5LmJlyhq6uF1oYoJzVvvTxoVXscBJmKcJmg==";
       };
     };
     "@formatjs/intl-getcanonicallocales-1.5.3" = {
@@ -58,49 +58,49 @@ let
         sha512 = "QVBnSPZ32Y80wkXbf36hP9VbyklbOb8edppxFcgO9Lbd47zagllw65Y81QOHEn/j11JcTn2OhW0vea95LHvQmA==";
       };
     };
-    "@formatjs/intl-listformat-5.0.4" = {
+    "@formatjs/intl-listformat-5.0.3" = {
       name = "_at_formatjs_slash_intl-listformat";
       packageName = "@formatjs/intl-listformat";
-      version = "5.0.4";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.4.tgz";
-        sha512 = "0DQ2NF1PmO3+mvZp4V/SPNk7kUaLDcZR3eWbN8cGvSafWOrcv1iEcTXOd8ow8u9OA0gBTWwgPDcQFn7W0mU8kw==";
+        url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.3.tgz";
+        sha512 = "IaW428RI5RpwXr/+doYT1H4ZHL3mYLU3nzR7ZaTkk5dBi1PKKGk1sDwymEzVxyrELT0WHhqhqLKdLjXAqxCz9g==";
       };
     };
-    "@formatjs/intl-locale-2.4.13" = {
+    "@formatjs/intl-locale-2.4.12" = {
       name = "_at_formatjs_slash_intl-locale";
       packageName = "@formatjs/intl-locale";
-      version = "2.4.13";
+      version = "2.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.13.tgz";
-        sha512 = "hrglCuFjRpMrutmuL+Ck84KBxeHhouk7d5B/G9kqHL4zmrW6AsBwU+0KeyvareiY3MWzYZhQj1Nm3JEGulQRUQ==";
+        url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.12.tgz";
+        sha512 = "40khHPYtZRdqjQs1fItNj94eMoiGwJJOAKN//9qUhAsHrXvGxseFVBSg+mItV0Orwb3wqItUj3hu6evrouhstw==";
       };
     };
-    "@formatjs/intl-numberformat-6.1.3" = {
+    "@formatjs/intl-numberformat-6.1.2" = {
       name = "_at_formatjs_slash_intl-numberformat";
       packageName = "@formatjs/intl-numberformat";
-      version = "6.1.3";
+      version = "6.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.3.tgz";
-        sha512 = "bLVEt4G7IfacLpiBKg2VfHKnPrzWOWX/jxEi+OIUk6M2bEfYj8Vi1nYGb8+D7ZHCbuj/L7+lnlL4bItPTXT8JA==";
+        url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.2.tgz";
+        sha512 = "td0XggQKu8dlPUlP2f322NW0WY58zWLlOoiUVh4eolcWqOs4maKL8tjmFBPXSQt55JiKy14ZrDw1dljyNHLB0g==";
       };
     };
-    "@formatjs/intl-pluralrules-4.0.5" = {
+    "@formatjs/intl-pluralrules-4.0.2" = {
       name = "_at_formatjs_slash_intl-pluralrules";
       packageName = "@formatjs/intl-pluralrules";
-      version = "4.0.5";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.5.tgz";
-        sha512 = "mWsCpc/SZ6rk0Qb3zpv5bUz6uJysW6qap0qJJz6d0MJpszN3GNsk8CbP5q62oUaWvBmHoeXBvAG9VVEu1TUexw==";
+        url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.2.tgz";
+        sha512 = "Oh4zmA3odkXBCPAGVhZuAnP3IfCPy8DyizA9s4QkYptVICX38RbUvXwzr2a9DVpKNiZ7i2TnV4Qkeo06N/6b7Q==";
       };
     };
-    "@formatjs/intl-relativetimeformat-8.0.3" = {
+    "@formatjs/intl-relativetimeformat-8.0.2" = {
       name = "_at_formatjs_slash_intl-relativetimeformat";
       packageName = "@formatjs/intl-relativetimeformat";
-      version = "8.0.3";
+      version = "8.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.3.tgz";
-        sha512 = "OIobPtY5vtwe5IM0B0J3KmewYB/NTcbgiW9yRdWzMA1TeFSd8LfuficICYuzUZt25Kh/eIw4g37ArhS1WH/6Iw==";
+        url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.2.tgz";
+        sha512 = "RBO+4zxJuIYtYGfxv1GuZJQDtrA+fZlgcHjSVoo5HwznWdfg5vVTe8qdbSDbdyFobbB2OYqwj4mcRO2M5P1oNw==";
       };
     };
     "@juggle/resize-observer-3.2.0" = {
@@ -139,13 +139,13 @@ let
         sha512 = "zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg==";
       };
     };
-    "@types/node-14.14.22" = {
+    "@types/node-14.14.20" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.22";
+      version = "14.14.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
-        sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz";
+        sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==";
       };
     };
     "@webcomponents/template-1.4.4" = {
@@ -427,13 +427,13 @@ let
         sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     };
-    "engine.io-4.1.0" = {
+    "engine.io-4.0.6" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "4.1.0";
+      version = "4.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.0.tgz";
-        sha512 = "vW7EAtn0HDQ4MtT5QbmCHF17TaYLONv2/JwdYsq9USPRZVM4zG7WB3k0Nc321z8EuSOlhGokrYlYx4176QhD0A==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.6.tgz";
+        sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA==";
       };
     };
     "engine.io-parser-4.0.2" = {
@@ -886,13 +886,13 @@ let
         sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==";
       };
     };
-    "polyfill-library-3.103.0" = {
+    "polyfill-library-3.101.0" = {
       name = "polyfill-library";
       packageName = "polyfill-library";
-      version = "3.103.0";
+      version = "3.101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.103.0.tgz";
-        sha512 = "z6DMbqDGO87IeG/sjN/PGPgGLzhKftVj6OeRujxgQn+Kz7x+E8uzFvdB3X8dqoE4xaY6aX3ar0UzRxRlYPH9yg==";
+        url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.101.0.tgz";
+        sha512 = "o/ln6GpYGf1Tn8wJiTkoZ3vEtf6oWrcqM9YC61CW4KaHawVm36R/wN+6ZAv7JoAsPFm0J7PsroukpJVlVxPRjQ==";
       };
     };
     "process-nextick-args-2.0.1" = {
@@ -1012,31 +1012,31 @@ let
         sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
       };
     };
-    "socket.io-3.1.0" = {
+    "socket.io-3.0.5" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "3.1.0";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz";
-        sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz";
+        sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
       };
     };
-    "socket.io-adapter-2.1.0" = {
+    "socket.io-adapter-2.0.3" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
-      version = "2.1.0";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz";
-        sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==";
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz";
+        sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ==";
       };
     };
-    "socket.io-parser-4.0.4" = {
+    "socket.io-parser-4.0.3" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "4.0.4";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz";
-        sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz";
+        sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw==";
       };
     };
     "source-map-0.5.7" = {
@@ -1147,13 +1147,13 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.12.5" = {
+    "uglify-js-3.12.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.12.5";
+      version = "3.12.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz";
-        sha512 = "SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz";
+        sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -1315,20 +1315,20 @@ in
     dependencies = [
       sources."@financial-times/polyfill-useragent-normaliser-1.9.0"
       sources."@financial-times/useragent_parser-1.5.1"
-      sources."@formatjs/ecma402-abstract-1.5.1"
-      sources."@formatjs/intl-datetimeformat-3.2.3"
-      sources."@formatjs/intl-displaynames-4.0.4"
+      sources."@formatjs/ecma402-abstract-1.5.0"
+      sources."@formatjs/intl-datetimeformat-3.2.2"
+      sources."@formatjs/intl-displaynames-4.0.3"
       sources."@formatjs/intl-getcanonicallocales-1.5.3"
-      sources."@formatjs/intl-listformat-5.0.4"
-      sources."@formatjs/intl-locale-2.4.13"
-      sources."@formatjs/intl-numberformat-6.1.3"
-      sources."@formatjs/intl-pluralrules-4.0.5"
-      sources."@formatjs/intl-relativetimeformat-8.0.3"
+      sources."@formatjs/intl-listformat-5.0.3"
+      sources."@formatjs/intl-locale-2.4.12"
+      sources."@formatjs/intl-numberformat-6.1.2"
+      sources."@formatjs/intl-pluralrules-4.0.2"
+      sources."@formatjs/intl-relativetimeformat-8.0.2"
       sources."@juggle/resize-observer-3.2.0"
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.9"
-      sources."@types/node-14.14.22"
+      sources."@types/node-14.14.20"
       sources."@webcomponents/template-1.4.4"
       sources."Base64-1.1.0"
       sources."abort-controller-3.0.0"
@@ -1362,7 +1362,7 @@ in
       sources."diff-4.0.2"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-4.1.0" // {
+      (sources."engine.io-4.0.6" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
@@ -1415,7 +1415,7 @@ in
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."picturefill-3.0.3"
-      (sources."polyfill-library-3.103.0" // {
+      (sources."polyfill-library-3.101.0" // {
         dependencies = [
           sources."source-map-0.5.7"
           sources."uglify-js-2.8.29"
@@ -1443,14 +1443,14 @@ in
       })
       sources."serve-static-1.14.1"
       sources."setprototypeof-1.1.1"
-      (sources."socket.io-3.1.0" // {
+      (sources."socket.io-3.0.5" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
-      sources."socket.io-adapter-2.1.0"
-      (sources."socket.io-parser-4.0.4" // {
+      sources."socket.io-adapter-2.0.3"
+      (sources."socket.io-parser-4.0.3" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
@@ -1466,7 +1466,7 @@ in
       sources."toidentifier-1.0.0"
       sources."toposort-2.0.2"
       sources."tslib-2.1.0"
-      sources."uglify-js-3.12.5"
+      sources."uglify-js-3.12.4"
       sources."uglify-to-browserify-1.0.2"
       sources."unorm-1.6.0"
       sources."usertiming-0.1.8"
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix
index 76d5cf6a202..d0273cfe1f9 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix
index 3560081fefd..a9da40e3fe4 100644
--- a/pkgs/servers/zigbee2mqtt/node-packages.nix
+++ b/pkgs/servers/zigbee2mqtt/node-packages.nix
@@ -1,25 +1,16 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/cli-7.12.10" = {
+    "@babel/cli-7.12.1" = {
       name = "_at_babel_slash_cli";
       packageName = "@babel/cli";
-      version = "7.12.10";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.10.tgz";
-        sha512 = "+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==";
-      };
-    };
-    "@babel/cli-7.12.8" = {
-      name = "_at_babel_slash_cli";
-      packageName = "@babel/cli";
-      version = "7.12.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.8.tgz";
-        sha512 = "/6nQj11oaGhLmZiuRUfxsujiPDc9BBReemiXgIbxc+M5W+MIiFKYwvNDJvBfnGKNsJTKbUfEheKc9cwoPHAVQA==";
+        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.1.tgz";
+        sha512 = "eRJREyrfAJ2r42Iaxe8h3v6yyj1wu9OyosaUHW6UImjGf9ahGL9nsFNh7OCopvtcPL8WnEo7tp78wrZaZ6vG9g==";
       };
     };
     "@babel/code-frame-7.10.4" = {
@@ -31,31 +22,22 @@ let
         sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
-    "@babel/code-frame-7.12.11" = {
-      name = "_at_babel_slash_code-frame";
-      packageName = "@babel/code-frame";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz";
-        sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
-      };
-    };
-    "@babel/compat-data-7.12.7" = {
+    "@babel/compat-data-7.12.5" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.12.7";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz";
-        sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz";
+        sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==";
       };
     };
-    "@babel/core-7.12.10" = {
+    "@babel/core-7.12.3" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.10";
+      version = "7.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz";
-        sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz";
+        sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==";
       };
     };
     "@babel/core-7.12.9" = {
@@ -67,15 +49,6 @@ let
         sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==";
       };
     };
-    "@babel/generator-7.12.11" = {
-      name = "_at_babel_slash_generator";
-      packageName = "@babel/generator";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz";
-        sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
-      };
-    };
     "@babel/generator-7.12.5" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -94,15 +67,6 @@ let
         sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==";
       };
     };
-    "@babel/helper-annotate-as-pure-7.12.10" = {
-      name = "_at_babel_slash_helper-annotate-as-pure";
-      packageName = "@babel/helper-annotate-as-pure";
-      version = "7.12.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz";
-        sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==";
-      };
-    };
     "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = {
       name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor";
       packageName = "@babel/helper-builder-binary-assignment-operator-visitor";
@@ -130,13 +94,13 @@ let
         sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==";
       };
     };
-    "@babel/helper-create-regexp-features-plugin-7.12.7" = {
+    "@babel/helper-create-regexp-features-plugin-7.12.1" = {
       name = "_at_babel_slash_helper-create-regexp-features-plugin";
       packageName = "@babel/helper-create-regexp-features-plugin";
-      version = "7.12.7";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz";
-        sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==";
+        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz";
+        sha512 = "rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==";
       };
     };
     "@babel/helper-define-map-7.10.5" = {
@@ -166,15 +130,6 @@ let
         sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
       };
     };
-    "@babel/helper-function-name-7.12.11" = {
-      name = "_at_babel_slash_helper-function-name";
-      packageName = "@babel/helper-function-name";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz";
-        sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==";
-      };
-    };
     "@babel/helper-get-function-arity-7.10.4" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
@@ -184,15 +139,6 @@ let
         sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
       };
     };
-    "@babel/helper-get-function-arity-7.12.10" = {
-      name = "_at_babel_slash_helper-get-function-arity";
-      packageName = "@babel/helper-get-function-arity";
-      version = "7.12.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz";
-        sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==";
-      };
-    };
     "@babel/helper-hoist-variables-7.10.4" = {
       name = "_at_babel_slash_helper-hoist-variables";
       packageName = "@babel/helper-hoist-variables";
@@ -202,6 +148,15 @@ let
         sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==";
       };
     };
+    "@babel/helper-member-expression-to-functions-7.12.1" = {
+      name = "_at_babel_slash_helper-member-expression-to-functions";
+      packageName = "@babel/helper-member-expression-to-functions";
+      version = "7.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz";
+        sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
+      };
+    };
     "@babel/helper-member-expression-to-functions-7.12.7" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
@@ -229,13 +184,13 @@ let
         sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.12.10" = {
+    "@babel/helper-optimise-call-expression-7.10.4" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.12.10";
+      version = "7.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz";
-        sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
+        sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==";
       };
     };
     "@babel/helper-optimise-call-expression-7.12.7" = {
@@ -256,6 +211,15 @@ let
         sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
       };
     };
+    "@babel/helper-regex-7.10.5" = {
+      name = "_at_babel_slash_helper-regex";
+      packageName = "@babel/helper-regex";
+      version = "7.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz";
+        sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==";
+      };
+    };
     "@babel/helper-remap-async-to-generator-7.12.1" = {
       name = "_at_babel_slash_helper-remap-async-to-generator";
       packageName = "@babel/helper-remap-async-to-generator";
@@ -265,15 +229,6 @@ let
         sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
       };
     };
-    "@babel/helper-replace-supers-7.12.11" = {
-      name = "_at_babel_slash_helper-replace-supers";
-      packageName = "@babel/helper-replace-supers";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz";
-        sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==";
-      };
-    };
     "@babel/helper-replace-supers-7.12.5" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
@@ -310,15 +265,6 @@ let
         sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
       };
     };
-    "@babel/helper-split-export-declaration-7.12.11" = {
-      name = "_at_babel_slash_helper-split-export-declaration";
-      packageName = "@babel/helper-split-export-declaration";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz";
-        sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==";
-      };
-    };
     "@babel/helper-validator-identifier-7.10.4" = {
       name = "_at_babel_slash_helper-validator-identifier";
       packageName = "@babel/helper-validator-identifier";
@@ -328,15 +274,6 @@ let
         sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
       };
     };
-    "@babel/helper-validator-identifier-7.12.11" = {
-      name = "_at_babel_slash_helper-validator-identifier";
-      packageName = "@babel/helper-validator-identifier";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz";
-        sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==";
-      };
-    };
     "@babel/helper-validator-option-7.12.1" = {
       name = "_at_babel_slash_helper-validator-option";
       packageName = "@babel/helper-validator-option";
@@ -346,15 +283,6 @@ let
         sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==";
       };
     };
-    "@babel/helper-validator-option-7.12.11" = {
-      name = "_at_babel_slash_helper-validator-option";
-      packageName = "@babel/helper-validator-option";
-      version = "7.12.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz";
-        sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==";
-      };
-    };
     "@babel/helper-wrap-function-7.12.3" = {
       name = "_at_babel_slash_helper-wrap-function";
       packageName = "@babel/helper-wrap-function";
@@ -382,13 +310,13 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.11" = {
+    "@babel/parser-7.12.5" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.11";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz";
-        sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz";
+        sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==";
       };
     };
     "@babel/parser-7.12.7" = {
@@ -409,15 +337,6 @@ let
         sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==";
       };
     };
-    "@babel/plugin-proposal-async-generator-functions-7.12.12" = {
-      name = "_at_babel_slash_plugin-proposal-async-generator-functions";
-      packageName = "@babel/plugin-proposal-async-generator-functions";
-      version = "7.12.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz";
-        sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==";
-      };
-    };
     "@babel/plugin-proposal-class-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-class-properties";
       packageName = "@babel/plugin-proposal-class-properties";
@@ -472,13 +391,13 @@ let
         sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
       };
     };
-    "@babel/plugin-proposal-numeric-separator-7.12.7" = {
+    "@babel/plugin-proposal-numeric-separator-7.12.5" = {
       name = "_at_babel_slash_plugin-proposal-numeric-separator";
       packageName = "@babel/plugin-proposal-numeric-separator";
-      version = "7.12.7";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz";
-        sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz";
+        sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==";
       };
     };
     "@babel/plugin-proposal-object-rest-spread-7.12.1" = {
@@ -499,13 +418,13 @@ let
         sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==";
       };
     };
-    "@babel/plugin-proposal-optional-chaining-7.12.7" = {
+    "@babel/plugin-proposal-optional-chaining-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-optional-chaining";
       packageName = "@babel/plugin-proposal-optional-chaining";
-      version = "7.12.7";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz";
-        sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz";
+        sha512 = "c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==";
       };
     };
     "@babel/plugin-proposal-private-methods-7.12.1" = {
@@ -697,15 +616,6 @@ let
         sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.12.12" = {
-      name = "_at_babel_slash_plugin-transform-block-scoping";
-      packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.12.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz";
-        sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==";
-      };
-    };
     "@babel/plugin-transform-classes-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
@@ -913,13 +823,13 @@ let
         sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==";
       };
     };
-    "@babel/plugin-transform-sticky-regex-7.12.7" = {
+    "@babel/plugin-transform-sticky-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-sticky-regex";
       packageName = "@babel/plugin-transform-sticky-regex";
-      version = "7.12.7";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz";
-        sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz";
+        sha512 = "CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==";
       };
     };
     "@babel/plugin-transform-template-literals-7.12.1" = {
@@ -940,15 +850,6 @@ let
         sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==";
       };
     };
-    "@babel/plugin-transform-typeof-symbol-7.12.10" = {
-      name = "_at_babel_slash_plugin-transform-typeof-symbol";
-      packageName = "@babel/plugin-transform-typeof-symbol";
-      version = "7.12.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz";
-        sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==";
-      };
-    };
     "@babel/plugin-transform-typescript-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
@@ -976,22 +877,13 @@ let
         sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
       };
     };
-    "@babel/preset-env-7.12.11" = {
+    "@babel/preset-env-7.12.1" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.12.11";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz";
-        sha512 = "j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==";
-      };
-    };
-    "@babel/preset-env-7.12.7" = {
-      name = "_at_babel_slash_preset-env";
-      packageName = "@babel/preset-env";
-      version = "7.12.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz";
-        sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz";
+        sha512 = "H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==";
       };
     };
     "@babel/preset-modules-0.1.4" = {
@@ -1003,13 +895,13 @@ let
         sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==";
       };
     };
-    "@babel/preset-typescript-7.12.7" = {
+    "@babel/preset-typescript-7.12.1" = {
       name = "_at_babel_slash_preset-typescript";
       packageName = "@babel/preset-typescript";
-      version = "7.12.7";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz";
-        sha512 = "nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw==";
+        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz";
+        sha512 = "hNK/DhmoJPsksdHuI/RVrcEws7GN5eamhi28JkO52MqIxU8Z0QpmiSOQxZHWOHV7I3P4UjHV97ay4TcamMA6Kw==";
       };
     };
     "@babel/runtime-7.12.5" = {
@@ -1021,6 +913,15 @@ let
         sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
       };
     };
+    "@babel/template-7.10.4" = {
+      name = "_at_babel_slash_template";
+      packageName = "@babel/template";
+      version = "7.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz";
+        sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
+      };
+    };
     "@babel/template-7.12.7" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
@@ -1030,13 +931,13 @@ let
         sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.12.12" = {
+    "@babel/traverse-7.12.5" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.12";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz";
-        sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz";
+        sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==";
       };
     };
     "@babel/traverse-7.12.9" = {
@@ -1048,13 +949,13 @@ let
         sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==";
       };
     };
-    "@babel/types-7.12.12" = {
+    "@babel/types-7.12.6" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.12";
+      version = "7.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz";
-        sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz";
+        sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
       };
     };
     "@babel/types-7.12.7" = {
@@ -1093,13 +994,13 @@ let
         sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
       };
     };
-    "@eslint/eslintrc-0.2.2" = {
+    "@eslint/eslintrc-0.2.1" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
-      version = "0.2.2";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz";
-        sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==";
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
+        sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
       };
     };
     "@istanbuljs/load-nyc-config-1.1.0" = {
@@ -1219,13 +1120,13 @@ let
         sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==";
       };
     };
-    "@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents" = {
+    "@nicolo-ribaudo/chokidar-2-2.1.8" = {
       name = "_at_nicolo-ribaudo_slash_chokidar-2";
       packageName = "@nicolo-ribaudo/chokidar-2";
-      version = "2.1.8-no-fsevents";
+      version = "2.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.tgz";
-        sha512 = "+nb9vWloHNNMFHjGofEam3wopE3m1yuambrrd/fnPc+lFOMB9ROTqQlche9ByFWNkdNqfSgR/kkQtQ8DzEWt2w==";
+        url = "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8.tgz";
+        sha512 = "FohwULwAebCUKi/akMFyGi7jfc7JXTeMHzKxuP3umRd9mK/2Y7/SMBSI2jX+YLopPXi+PF9l307NmpfxTdCegA==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -1273,22 +1174,13 @@ let
         sha512 = "HfrvJ/LXULHk8w63CGxwDNiDidFgDX8BnadY+cgVS6yHMHikbhLCLjCmUKsKBWaGKRqOznl0w+iUl7TMi1lkXQ==";
       };
     };
-    "@serialport/bindings-9.0.3" = {
+    "@serialport/bindings-9.0.2" = {
       name = "_at_serialport_slash_bindings";
       packageName = "@serialport/bindings";
-      version = "9.0.3";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.3.tgz";
-        sha512 = "hnqVqEc4IqGCIjztGkd30V0KcTatQ1T/SS03MZ9KLn6e3y2PSXFqf0TqxB0qF7K9lGHWldMTiPOQaZnuV/oZLQ==";
-      };
-    };
-    "@serialport/bindings-9.0.4" = {
-      name = "_at_serialport_slash_bindings";
-      packageName = "@serialport/bindings";
-      version = "9.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.4.tgz";
-        sha512 = "6dlE1vm5c1xk667f1Zm7D+msbHJ9jdnUr9l8DResKpj2iCBzbCNsW+yCYq26WxzXWc1L2HUaS3/aL+k0wm5amg==";
+        url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.2.tgz";
+        sha512 = "kQ3co4aGwwbUqkRdJ7UfdlbLB5dUQwNfSglexC8iv65D5HXfjSBR1bE0XUH8PH/v/6Dh6CSnwf6OP0I3H5vMWQ==";
       };
     };
     "@serialport/parser-byte-length-9.0.1" = {
@@ -1399,13 +1291,22 @@ let
         sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==";
       };
     };
-    "@types/babel__traverse-7.11.0" = {
+    "@types/babel__traverse-7.0.15" = {
       name = "_at_types_slash_babel__traverse";
       packageName = "@types/babel__traverse";
-      version = "7.11.0";
+      version = "7.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz";
-        sha512 = "kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==";
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz";
+        sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==";
+      };
+    };
+    "@types/babel__traverse-7.0.16" = {
+      name = "_at_types_slash_babel__traverse";
+      packageName = "@types/babel__traverse";
+      version = "7.0.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.16.tgz";
+        sha512 = "S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w==";
       };
     };
     "@types/debounce-1.2.0" = {
@@ -1462,22 +1363,13 @@ let
         sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==";
       };
     };
-    "@types/jest-26.0.18" = {
+    "@types/jest-26.0.15" = {
       name = "_at_types_slash_jest";
       packageName = "@types/jest";
-      version = "26.0.18";
+      version = "26.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.18.tgz";
-        sha512 = "scDPs+mELZgsFetTgBSsIxKGrlitn9t/d2ecP+S1QSIGD+31fkMBEftLfOAX5k3tU06/0PjreJIQ+gWEbbHqpw==";
-      };
-    };
-    "@types/jest-26.0.19" = {
-      name = "_at_types_slash_jest";
-      packageName = "@types/jest";
-      version = "26.0.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.19.tgz";
-        sha512 = "jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==";
+        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.15.tgz";
+        sha512 = "s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==";
       };
     };
     "@types/json-schema-7.0.6" = {
@@ -1498,22 +1390,22 @@ let
         sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw==";
       };
     };
-    "@types/node-14.14.11" = {
+    "@types/node-14.14.10" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.11";
+      version = "14.14.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.11.tgz";
-        sha512 = "BJ97wAUuU3NUiUCp44xzUFquQEvnk1wu7q4CMEUYKJWjdkr0YWYDsm4RFtAvxYsNjLsKcrFt6RvK8r+mnzMbEQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz";
+        sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==";
       };
     };
-    "@types/node-14.14.16" = {
+    "@types/node-14.14.7" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.16";
+      version = "14.14.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.16.tgz";
-        sha512 = "naXYePhweTi+BMv11TgioE2/FXU4fSl29HAH1ffxVciNsH3rYXjNP2yM8wqmSm7jS20gM8TIklKiTen+1iVncw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz";
+        sha512 = "Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==";
       };
     };
     "@types/normalize-package-data-2.4.0" = {
@@ -1534,15 +1426,6 @@ let
         sha512 = "UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==";
       };
     };
-    "@types/prettier-2.1.6" = {
-      name = "_at_types_slash_prettier";
-      packageName = "@types/prettier";
-      version = "2.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.6.tgz";
-        sha512 = "6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA==";
-      };
-    };
     "@types/serialport-8.0.1" = {
       name = "_at_types_slash_serialport";
       packageName = "@types/serialport";
@@ -1561,22 +1444,22 @@ let
         sha512 = "RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==";
       };
     };
-    "@types/yargs-15.0.11" = {
+    "@types/yargs-15.0.10" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "15.0.11";
+      version = "15.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.11.tgz";
-        sha512 = "jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz";
+        sha512 = "z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==";
       };
     };
-    "@types/yargs-15.0.12" = {
+    "@types/yargs-15.0.9" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "15.0.12";
+      version = "15.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz";
-        sha512 = "f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz";
+        sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==";
       };
     };
     "@types/yargs-parser-15.0.0" = {
@@ -1588,139 +1471,112 @@ let
         sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==";
       };
     };
-    "@types/yargs-parser-20.2.0" = {
-      name = "_at_types_slash_yargs-parser";
-      packageName = "@types/yargs-parser";
-      version = "20.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz";
-        sha512 = "37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==";
-      };
-    };
-    "@typescript-eslint/eslint-plugin-4.11.0" = {
+    "@typescript-eslint/eslint-plugin-4.7.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.11.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.11.0.tgz";
-        sha512 = "x4arJMXBxyD6aBXLm3W7mSDZRiABzy+2PCLJbL7OPqlp53VXhaA1HKK7R2rTee5OlRhnUgnp8lZyVIqjnyPT6g==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.7.0.tgz";
+        sha512 = "li9aiSVBBd7kU5VlQlT1AqP0uWGDK6JYKUQ9cVDnOg34VNnd9t4jr0Yqc/bKxJr/tDCPDaB4KzoSFN9fgVxe/Q==";
       };
     };
-    "@typescript-eslint/eslint-plugin-4.9.1" = {
-      name = "_at_typescript-eslint_slash_eslint-plugin";
-      packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.9.1.tgz";
-        sha512 = "QRLDSvIPeI1pz5tVuurD+cStNR4sle4avtHhxA+2uyixWGFjKzJ+EaFVRW6dA/jOgjV5DTAjOxboQkRDE8cRlQ==";
-      };
-    };
-    "@typescript-eslint/experimental-utils-4.11.0" = {
+    "@typescript-eslint/experimental-utils-4.7.0" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.11.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.11.0.tgz";
-        sha512 = "1VC6mSbYwl1FguKt8OgPs8xxaJgtqFpjY/UzUYDBKq4pfQ5lBvN2WVeqYkzf7evW42axUHYl2jm9tNyFsb8oLg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.7.0.tgz";
+        sha512 = "cymzovXAiD4EF+YoHAB5Oh02MpnXjvyaOb+v+BdpY7lsJXZQN34oIETeUwVT2XfV9rSNpXaIcknDLfupO/tUoA==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.9.1" = {
+    "@typescript-eslint/experimental-utils-4.8.2" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.9.1";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.9.1.tgz";
-        sha512 = "c3k/xJqk0exLFs+cWSJxIjqLYwdHCuLWhnpnikmPQD2+NGAx9KjLYlBDcSI81EArh9FDYSL6dslAUSwILeWOxg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.2.tgz";
+        sha512 = "hpTw6o6IhBZEsQsjuw/4RWmceRyESfAiEzAEnXHKG1X7S5DXFaZ4IO1JO7CW1aQ604leQBzjZmuMI9QBCAJX8Q==";
       };
     };
-    "@typescript-eslint/parser-4.11.0" = {
+    "@typescript-eslint/parser-4.7.0" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "4.11.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.11.0.tgz";
-        sha512 = "NBTtKCC7ZtuxEV5CrHUO4Pg2s784pvavc3cnz6V+oJvVbK4tH9135f/RBP6eUA2KHiFKAollSrgSctQGmHbqJQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.7.0.tgz";
+        sha512 = "+meGV8bMP1sJHBI2AFq1GeTwofcGiur8LoIr6v+rEmD9knyCqDlrQcFHR0KDDfldHIFDU/enZ53fla6ReF4wRw==";
       };
     };
-    "@typescript-eslint/parser-4.9.1" = {
-      name = "_at_typescript-eslint_slash_parser";
-      packageName = "@typescript-eslint/parser";
-      version = "4.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.9.1.tgz";
-        sha512 = "Gv2VpqiomvQ2v4UL+dXlQcZ8zCX4eTkoIW+1aGVWT6yTO+6jbxsw7yQl2z2pPl/4B9qa5JXeIbhJpONKjXIy3g==";
-      };
-    };
-    "@typescript-eslint/scope-manager-4.11.0" = {
+    "@typescript-eslint/scope-manager-4.7.0" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.11.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.11.0.tgz";
-        sha512 = "6VSTm/4vC2dHM3ySDW9Kl48en+yLNfVV6LECU8jodBHQOhO8adAVizaZ1fV0QGZnLQjQ/y0aBj5/KXPp2hBTjA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.7.0.tgz";
+        sha512 = "ILITvqwDJYbcDCROj6+Ob0oCKNg3SH46iWcNcTIT9B5aiVssoTYkhKjxOMNzR1F7WSJkik4zmuqve5MdnA0DyA==";
       };
     };
-    "@typescript-eslint/scope-manager-4.9.1" = {
+    "@typescript-eslint/scope-manager-4.8.2" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.9.1";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.9.1.tgz";
-        sha512 = "sa4L9yUfD/1sg9Kl8OxPxvpUcqxKXRjBeZxBuZSSV1v13hjfEJkn84n0An2hN8oLQ1PmEl2uA6FkI07idXeFgQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.8.2.tgz";
+        sha512 = "qHQ8ODi7mMin4Sq2eh/6eu03uVzsf5TX+J43xRmiq8ujng7ViQSHNPLOHGw/Wr5dFEoxq/ubKhzClIIdQy5q3g==";
       };
     };
-    "@typescript-eslint/types-4.11.0" = {
+    "@typescript-eslint/types-4.7.0" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.11.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.11.0.tgz";
-        sha512 = "XXOdt/NPX++txOQHM1kUMgJUS43KSlXGdR/aDyEwuAEETwuPt02Nc7v+s57PzuSqMbNLclblQdv3YcWOdXhQ7g==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.7.0.tgz";
+        sha512 = "uLszFe0wExJc+I7q0Z/+BnP7wao/kzX0hB5vJn4LIgrfrMLgnB2UXoReV19lkJQS1a1mHWGGODSxnBx6JQC3Sg==";
       };
     };
-    "@typescript-eslint/types-4.9.1" = {
+    "@typescript-eslint/types-4.8.2" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.9.1";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.9.1.tgz";
-        sha512 = "fjkT+tXR13ks6Le7JiEdagnwEFc49IkOyys7ueWQ4O8k4quKPwPJudrwlVOJCUQhXo45PrfIvIarcrEjFTNwUA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.8.2.tgz";
+        sha512 = "z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.11.0" = {
+    "@typescript-eslint/typescript-estree-4.7.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.11.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.0.tgz";
-        sha512 = "eA6sT5dE5RHAFhtcC+b5WDlUIGwnO9b0yrfGa1mIOIAjqwSQCpXbLiFmKTdRbQN/xH2EZkGqqLDrKUuYOZ0+Hg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.7.0.tgz";
+        sha512 = "5XZRQznD1MfUmxu1t8/j2Af4OxbA7EFU2rbo0No7meb46eHgGkSieFdfV6omiC/DGIBhH9H9gXn7okBbVOm8jw==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.9.1" = {
+    "@typescript-eslint/typescript-estree-4.8.2" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.9.1";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.1.tgz";
-        sha512 = "bzP8vqwX6Vgmvs81bPtCkLtM/Skh36NE6unu6tsDeU/ZFoYthlTXbBmpIrvosgiDKlWTfb2ZpPELHH89aQjeQw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz";
+        sha512 = "HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.11.0" = {
+    "@typescript-eslint/visitor-keys-4.7.0" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.11.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.0.tgz";
-        sha512 = "tRYKyY0i7cMk6v4UIOCjl1LhuepC/pc6adQqJk4Is3YcC6k46HvsV9Wl7vQoLbm9qADgeujiT7KdLrylvFIQ+A==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.7.0.tgz";
+        sha512 = "aDJDWuCRsf1lXOtignlfiPODkzSxxop7D0rZ91L6ZuMlcMCSh0YyK+gAfo5zN/ih6WxMwhoXgJWC3cWQdaKC+A==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.9.1" = {
+    "@typescript-eslint/visitor-keys-4.8.2" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.9.1";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.1.tgz";
-        sha512 = "9gspzc6UqLQHd7lXQS7oWs+hrYggspv/rk6zzEMhCbYwPE/sF7oxo7GAjkS35Tdlt7wguIG+ViWCPtVZHz/ybQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz";
+        sha512 = "Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw==";
       };
     };
     "abab-2.0.5" = {
@@ -1975,15 +1831,6 @@ let
         sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
       };
     };
-    "astral-regex-2.0.0" = {
-      name = "astral-regex";
-      packageName = "astral-regex";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz";
-        sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==";
-      };
-    };
     "async-3.2.0" = {
       name = "async";
       packageName = "async";
@@ -2047,13 +1894,13 @@ let
         sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
-    "axios-0.21.1" = {
+    "axios-0.21.0" = {
       name = "axios";
       packageName = "axios";
-      version = "0.21.1";
+      version = "0.21.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
-        sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
+        url = "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz";
+        sha512 = "fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==";
       };
     };
     "babel-jest-26.6.3" = {
@@ -2101,15 +1948,6 @@ let
         sha512 = "mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==";
       };
     };
-    "babel-preset-current-node-syntax-1.0.1" = {
-      name = "babel-preset-current-node-syntax";
-      packageName = "babel-preset-current-node-syntax";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz";
-        sha512 = "M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==";
-      };
-    };
     "babel-preset-jest-26.6.2" = {
       name = "babel-preset-jest";
       packageName = "babel-preset-jest";
@@ -2227,22 +2065,13 @@ let
         sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
       };
     };
-    "browserslist-4.15.0" = {
+    "browserslist-4.14.7" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.15.0";
+      version = "4.14.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.15.0.tgz";
-        sha512 = "IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ==";
-      };
-    };
-    "browserslist-4.16.0" = {
-      name = "browserslist";
-      packageName = "browserslist";
-      version = "4.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz";
-        sha512 = "/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz";
+        sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==";
       };
     };
     "bser-2.1.1" = {
@@ -2335,22 +2164,13 @@ let
         sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
       };
     };
-    "caniuse-lite-1.0.30001165" = {
+    "caniuse-lite-1.0.30001157" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001165";
+      version = "1.0.30001157";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz";
-        sha512 = "8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==";
-      };
-    };
-    "caniuse-lite-1.0.30001170" = {
-      name = "caniuse-lite";
-      packageName = "caniuse-lite";
-      version = "1.0.30001170";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001170.tgz";
-        sha512 = "Dd4d/+0tsK0UNLrZs3CvNukqalnVTRrxb5mcQm8rHL49t7V5ZaTygwXkrq+FB+dVDf++4ri8eJnFEJAB8332PA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz";
+        sha512 = "gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -2398,6 +2218,15 @@ let
         sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==";
       };
     };
+    "chokidar-2.1.8" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "2.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz";
+        sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
+      };
+    };
     "chokidar-3.4.3" = {
       name = "chokidar";
       packageName = "chokidar";
@@ -2650,13 +2479,13 @@ let
         sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
       };
     };
-    "core-js-compat-3.8.1" = {
+    "core-js-compat-3.7.0" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.8.1";
+      version = "3.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.1.tgz";
-        sha512 = "a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz";
+        sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2758,6 +2587,15 @@ let
         sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
+    "debug-4.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz";
+        sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
+      };
+    };
     "debug-4.3.1" = {
       name = "debug";
       packageName = "debug";
@@ -2983,22 +2821,13 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "electron-to-chromium-1.3.620" = {
+    "electron-to-chromium-1.3.596" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.620";
+      version = "1.3.596";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.620.tgz";
-        sha512 = "YbgWXUR2Mu+Fp6rm3GZ5YJdNo8SgZKLUTNSl2PNvdOcM8OIz07jRJnRkIaV9vdszFv9UUuGChh19w9qSuoLJgw==";
-      };
-    };
-    "electron-to-chromium-1.3.633" = {
-      name = "electron-to-chromium";
-      packageName = "electron-to-chromium";
-      version = "1.3.633";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.633.tgz";
-        sha512 = "bsVCsONiVX1abkWdH7KtpuDAhsQ3N3bjPYhROSAXE78roJKet0Y5wznA14JE9pzbwSZmSMAW6KiKYf1RvbTJkA==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz";
+        sha512 = "nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg==";
       };
     };
     "emittery-0.7.2" = {
@@ -3172,22 +3001,22 @@ let
         sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==";
       };
     };
-    "eslint-7.15.0" = {
+    "eslint-7.13.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.15.0";
+      version = "7.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.15.0.tgz";
-        sha512 = "Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz";
+        sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==";
       };
     };
-    "eslint-7.16.0" = {
+    "eslint-7.14.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.16.0";
+      version = "7.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.16.0.tgz";
-        sha512 = "iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz";
+        sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
       };
     };
     "eslint-config-google-0.14.0" = {
@@ -3244,13 +3073,13 @@ let
         sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==";
       };
     };
-    "espree-7.3.1" = {
+    "espree-7.3.0" = {
       name = "espree";
       packageName = "espree";
-      version = "7.3.1";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz";
-        sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==";
+        url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz";
+        sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==";
       };
     };
     "esprima-4.0.1" = {
@@ -3487,15 +3316,6 @@ let
         sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
       };
     };
-    "fastq-1.10.0" = {
-      name = "fastq";
-      packageName = "fastq";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz";
-        sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==";
-      };
-    };
     "fastq-1.9.0" = {
       name = "fastq";
       packageName = "fastq";
@@ -3523,13 +3343,13 @@ let
         sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==";
       };
     };
-    "file-entry-cache-6.0.0" = {
+    "file-entry-cache-5.0.1" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
-      version = "6.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz";
-        sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==";
+        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
+        sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
       };
     };
     "file-uri-to-path-1.0.0" = {
@@ -3577,22 +3397,22 @@ let
         sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
       };
     };
-    "flat-cache-3.0.4" = {
+    "flat-cache-2.0.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "3.0.4";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz";
-        sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz";
+        sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
       };
     };
-    "flatted-3.1.0" = {
+    "flatted-2.0.2" = {
       name = "flatted";
       packageName = "flatted";
-      version = "3.1.0";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz";
-        sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==";
+        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz";
+        sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
       };
     };
     "fn.name-1.1.0" = {
@@ -3604,13 +3424,13 @@ let
         sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
       };
     };
-    "follow-redirects-1.13.1" = {
+    "follow-redirects-1.13.0" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.13.1";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz";
-        sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz";
+        sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==";
       };
     };
     "for-in-1.0.2" = {
@@ -3694,6 +3514,15 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
+    "fsevents-1.2.13" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "1.2.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz";
+        sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==";
+      };
+    };
     "fsevents-2.1.3" = {
       name = "fsevents";
       packageName = "fsevents";
@@ -3766,15 +3595,6 @@ let
         sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
       };
     };
-    "get-intrinsic-1.0.2" = {
-      name = "get-intrinsic";
-      packageName = "get-intrinsic";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz";
-        sha512 = "aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==";
-      };
-    };
     "get-package-type-0.1.0" = {
       name = "get-package-type";
       packageName = "get-package-type";
@@ -4045,6 +3865,15 @@ let
         sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
+    "highlight.js-10.3.2" = {
+      name = "highlight.js";
+      packageName = "highlight.js";
+      version = "10.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz";
+        sha512 = "3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==";
+      };
+    };
     "hosted-git-info-2.8.8" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
@@ -4108,13 +3937,13 @@ let
         sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==";
       };
     };
-    "humanize-duration-3.25.0" = {
+    "humanize-duration-3.24.0" = {
       name = "humanize-duration";
       packageName = "humanize-duration";
-      version = "3.25.0";
+      version = "3.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.25.0.tgz";
-        sha512 = "QXth17C/8J2QVO0urby5sANmgvwdOF4YZW3mO13ZTkJli4ltVphzMJVG+HkVuTN/bIq1W/O0jRYSyQACus/GVQ==";
+        url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.24.0.tgz";
+        sha512 = "B3udnqisaDeRsvUSb+5n2hjxhABI9jotB+i1IEhgHhguTeM5LxIUKoVIu7UpeyaPOygr/Fnv7UhOi45kYYG+tg==";
       };
     };
     "iconv-lite-0.4.24" = {
@@ -4162,15 +3991,6 @@ let
         sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
       };
     };
-    "import-fresh-3.3.0" = {
-      name = "import-fresh";
-      packageName = "import-fresh";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz";
-        sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==";
-      };
-    };
     "import-local-3.0.2" = {
       name = "import-local";
       packageName = "import-local";
@@ -4207,22 +4027,13 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "ini-1.3.6" = {
+    "ini-1.3.5" = {
       name = "ini";
       packageName = "ini";
-      version = "1.3.6";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.6.tgz";
-        sha512 = "IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg==";
-      };
-    };
-    "ini-1.3.8" = {
-      name = "ini";
-      packageName = "ini";
-      version = "1.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
     "interpret-1.4.0" = {
@@ -4324,6 +4135,15 @@ let
         sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
       };
     };
+    "is-core-module-2.1.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz";
+        sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==";
+      };
+    };
     "is-core-module-2.2.0" = {
       name = "is-core-module";
       packageName = "is-core-module";
@@ -4918,13 +4738,13 @@ let
         sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
       };
     };
-    "js-yaml-3.14.1" = {
+    "js-yaml-3.14.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.14.1";
+      version = "3.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
+        sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
       };
     };
     "jsbn-0.1.1" = {
@@ -5170,24 +4990,6 @@ let
         sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";
       };
     };
-    "lru-cache-5.1.1" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
-        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
-      };
-    };
-    "lru-cache-6.0.0" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
-        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
-      };
-    };
     "lunr-2.3.9" = {
       name = "lunr";
       packageName = "lunr";
@@ -5242,22 +5044,13 @@ let
         sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
       };
     };
-    "marked-1.2.5" = {
+    "marked-1.2.3" = {
       name = "marked";
       packageName = "marked";
-      version = "1.2.5";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.5.tgz";
-        sha512 = "2AlqgYnVPOc9WDyWu7S5DJaEZsfk6dNh/neatQ3IHUW4QLutM/VPSH9lG7bif+XjFWc9K9XR3QvR+fXuECmfdA==";
-      };
-    };
-    "marked-1.2.7" = {
-      name = "marked";
-      packageName = "marked";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz";
-        sha512 = "No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.3.tgz";
+        sha512 = "RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw==";
       };
     };
     "merge-stream-2.0.0" = {
@@ -5386,6 +5179,15 @@ let
         sha512 = "gbTtiEu8P/GSMh1lAa0YYNr8XIfDzFgnWtetw3Hfz9nw6YXySHNYOZF/uUTgyp8GHvFnNw/EG7VhOkD6zfVb6A==";
       };
     };
+    "mkdirp-0.5.5" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
+      };
+    };
     "mkdirp-classic-0.5.3" = {
       name = "mkdirp-classic";
       packageName = "mkdirp-classic";
@@ -5413,13 +5215,13 @@ let
         sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg==";
       };
     };
-    "mqtt-packet-6.7.0" = {
+    "mqtt-packet-6.6.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "6.7.0";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.7.0.tgz";
-        sha512 = "GzgeeCirQpB59FyhHvf8BLiIYgxctPSxuSyaF2vWnkt7paX7jtuQ8Gpl+DkHCxZmYuv7GQE6zcUAegpafd0MqQ==";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.6.0.tgz";
+        sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ==";
       };
     };
     "ms-2.0.0" = {
@@ -5449,15 +5251,6 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
-    "ms-2.1.3" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
-      };
-    };
     "nan-2.14.2" = {
       name = "nan";
       packageName = "nan";
@@ -5521,13 +5314,13 @@ let
         sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
       };
     };
-    "node-abi-2.19.3" = {
+    "node-abi-2.19.1" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.19.3";
+      version = "2.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz";
-        sha512 = "9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz";
+        sha512 = "HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==";
       };
     };
     "node-int64-0.4.0" = {
@@ -5557,22 +5350,13 @@ let
         sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==";
       };
     };
-    "node-notifier-8.0.1" = {
-      name = "node-notifier";
-      packageName = "node-notifier";
-      version = "8.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz";
-        sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==";
-      };
-    };
-    "node-releases-1.1.67" = {
+    "node-releases-1.1.66" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.67";
+      version = "1.1.66";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz";
-        sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz";
+        sha512 = "JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==";
       };
     };
     "noop-logger-0.1.1" = {
@@ -5764,15 +5548,6 @@ let
         sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
       };
     };
-    "onigasm-2.2.5" = {
-      name = "onigasm";
-      packageName = "onigasm";
-      version = "2.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz";
-        sha512 = "F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==";
-      };
-    };
     "optionator-0.8.3" = {
       name = "optionator";
       packageName = "optionator";
@@ -5800,6 +5575,15 @@ let
         sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
       };
     };
+    "p-each-series-2.1.0" = {
+      name = "p-each-series";
+      packageName = "p-each-series";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz";
+        sha512 = "ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==";
+      };
+    };
     "p-each-series-2.2.0" = {
       name = "p-each-series";
       packageName = "p-each-series";
@@ -6007,13 +5791,13 @@ let
         sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
       };
     };
-    "prebuild-install-6.0.0" = {
+    "prebuild-install-5.3.6" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "6.0.0";
+      version = "5.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz";
-        sha512 = "h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz";
+        sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -6439,6 +6223,15 @@ let
         sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==";
       };
     };
+    "rimraf-2.6.3" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
+        sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
+      };
+    };
     "rimraf-3.0.2" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -6547,13 +6340,13 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
-    "semver-7.3.4" = {
+    "semver-7.3.2" = {
       name = "semver";
       packageName = "semver";
-      version = "7.3.4";
+      version = "7.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
-        sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz";
+        sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==";
       };
     };
     "send-0.17.1" = {
@@ -6565,22 +6358,13 @@ let
         sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
       };
     };
-    "serialport-9.0.3" = {
+    "serialport-9.0.2" = {
       name = "serialport";
       packageName = "serialport";
-      version = "9.0.3";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-9.0.3.tgz";
-        sha512 = "1JjH9jtWZ5up2SQTeNPA4I3vhHCDYh1AjN3SybZYf5m9KF9tFVIOGLGIMncqnWKYx3ks/wqfCpmpYUHkFYC3wg==";
-      };
-    };
-    "serialport-9.0.4" = {
-      name = "serialport";
-      packageName = "serialport";
-      version = "9.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-9.0.4.tgz";
-        sha512 = "Wtl6sxciHKNdJKW8jUZm+f5KRXt0J0UP25ksM8N31l08KTdAhZ5MmKNUFpoO/YYG6TvHFOu+07PUX35m+TUw7g==";
+        url = "https://registry.npmjs.org/serialport/-/serialport-9.0.2.tgz";
+        sha512 = "N++EVrc2F3kUJ6aCE6BLxHwTrelFAZM3LFw4lo8TV0fDtfrwTc3+aoDpSsvfQg3DxrRf3shCtA6WYEH4g8kapw==";
       };
     };
     "serve-static-1.14.1" = {
@@ -6673,33 +6457,6 @@ let
         sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
       };
     };
-    "shiki-0.2.7" = {
-      name = "shiki";
-      packageName = "shiki";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shiki/-/shiki-0.2.7.tgz";
-        sha512 = "bwVc7cdtYYHEO9O+XJ8aNOskKRfaQd5Y4ovLRfbQkmiLSUaR+bdlssbZUUhbQ0JAFMYcTcJ5tjG5KtnufttDHQ==";
-      };
-    };
-    "shiki-languages-0.2.7" = {
-      name = "shiki-languages";
-      packageName = "shiki-languages";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shiki-languages/-/shiki-languages-0.2.7.tgz";
-        sha512 = "REmakh7pn2jCn9GDMRSK36oDgqhh+rSvJPo77sdWTOmk44C5b0XlYPwJZcFOMJWUZJE0c7FCbKclw4FLwUKLRw==";
-      };
-    };
-    "shiki-themes-0.2.7" = {
-      name = "shiki-themes";
-      packageName = "shiki-themes";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shiki-themes/-/shiki-themes-0.2.7.tgz";
-        sha512 = "ZMmboDYw5+SEpugM8KGUq3tkZ0vXg+k60XX6NngDK7gc1Sv6YLUlanpvG3evm57uKJvfXsky/S5MzSOTtYKLjA==";
-      };
-    };
     "signal-exit-3.0.3" = {
       name = "signal-exit";
       packageName = "signal-exit";
@@ -6772,15 +6529,6 @@ let
         sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
       };
     };
-    "slice-ansi-4.0.0" = {
-      name = "slice-ansi";
-      packageName = "slice-ansi";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz";
-        sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==";
-      };
-    };
     "slip-1.0.2" = {
       name = "slip";
       packageName = "slip";
@@ -6898,13 +6646,13 @@ let
         sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.7" = {
+    "spdx-license-ids-3.0.6" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.7";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
-        sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
+        sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==";
       };
     };
     "split-string-3.1.0" = {
@@ -7168,15 +6916,6 @@ let
         sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
       };
     };
-    "table-6.0.4" = {
-      name = "table";
-      packageName = "table";
-      version = "6.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-6.0.4.tgz";
-        sha512 = "sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw==";
-      };
-    };
     "tar-fs-2.1.1" = {
       name = "tar-fs";
       packageName = "tar-fs";
@@ -7492,49 +7231,31 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typedoc-0.20.0-beta.27" = {
+    "typedoc-0.19.2" = {
       name = "typedoc";
       packageName = "typedoc";
-      version = "0.20.0-beta.27";
+      version = "0.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc/-/typedoc-0.20.0-beta.27.tgz";
-        sha512 = "+TMTlYV7N6mIGEuNIaPEqss3jWOLX2v7rLVz5vT+PfjVgwX+1s+LdPe+plV1hm5Ha1HwFNuVlozXxxWvf95dwA==";
+        url = "https://registry.npmjs.org/typedoc/-/typedoc-0.19.2.tgz";
+        sha512 = "oDEg1BLEzi1qvgdQXc658EYgJ5qJLVSeZ0hQ57Eq4JXy6Vj2VX4RVo18qYxRWz75ifAaYuYNBUCnbhjd37TfOg==";
       };
     };
-    "typedoc-0.20.0-beta.30" = {
-      name = "typedoc";
-      packageName = "typedoc";
-      version = "0.20.0-beta.30";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc/-/typedoc-0.20.0-beta.30.tgz";
-        sha512 = "nAisQV1Wmu/a/AgZMJ4/H7Z0e+eR/XVaF7ilSM5b7YJ2HP7iuqFw4j/e6a88ZHYf1nNfjBB9XpaqP/JYwHo4sQ==";
-      };
-    };
-    "typedoc-default-themes-0.12.0-beta.10" = {
+    "typedoc-default-themes-0.11.4" = {
       name = "typedoc-default-themes";
       packageName = "typedoc-default-themes";
-      version = "0.12.0-beta.10";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.12.0-beta.10.tgz";
-        sha512 = "RqTLRQvzuLrNEZ1VcmYoQiFkixW0QvVUv0R35jlkhxAMGtoo/giUVtWrWY1+Yp7HBnfI/wZKvhZpQYswbDL7eQ==";
+        url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.4.tgz";
+        sha512 = "Y4Lf+qIb9NTydrexlazAM46SSLrmrQRqWiD52593g53SsmUFioAsMWt8m834J6qsp+7wHRjxCXSZeiiW5cMUdw==";
       };
     };
-    "typedoc-plugin-markdown-3.1.0" = {
+    "typedoc-plugin-markdown-3.0.11" = {
       name = "typedoc-plugin-markdown";
       packageName = "typedoc-plugin-markdown";
-      version = "3.1.0";
+      version = "3.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.1.0.tgz";
-        sha512 = "DhY2WbWfkLyU/MJV8a3TeJjY8e/IBzgG6SEFhtFp6GgmXXdsSHJre2ASFRH6T2ShIUZAPdvHkFcehpSVAfNgPA==";
-      };
-    };
-    "typedoc-plugin-markdown-3.1.1" = {
-      name = "typedoc-plugin-markdown";
-      packageName = "typedoc-plugin-markdown";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.1.1.tgz";
-        sha512 = "esrSaGw9NeGOR1fixubeSYCtQ9tw1iv7xa6bMvwznjs+jOUEdP0/OBe7l2bbk3PoqhNiFBozBJDo3CpcMJGHnw==";
+        url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.0.11.tgz";
+        sha512 = "/BE/PqnIVbQJ525czM+T3CVaA1gVN9X1Le100z8TV/Lze8LZVkuAUiHRIgw9BKYFm9IQaB88W55k4EV6uUVwYQ==";
       };
     };
     "typedoc-plugin-no-inherit-1.2.0" = {
@@ -7555,40 +7276,22 @@ let
         sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA==";
       };
     };
-    "typescript-4.1.2" = {
+    "typescript-4.0.5" = {
       name = "typescript";
       packageName = "typescript";
-      version = "4.1.2";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz";
-        sha512 = "thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz";
+        sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==";
       };
     };
-    "typescript-4.1.3" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz";
-        sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==";
-      };
-    };
-    "uglify-js-3.12.1" = {
+    "uglify-js-3.11.6" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.12.1";
+      version = "3.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz";
-        sha512 = "o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ==";
-      };
-    };
-    "uglify-js-3.12.3" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.12.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.3.tgz";
-        sha512 = "feZzR+kIcSVuLi3s/0x0b2Tx4Iokwqt+8PJM7yRHKuldg4MLdam4TCFeICv+lgDtuYiCtdmrtIP+uN9LWvDasw==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz";
+        sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -7753,13 +7456,13 @@ let
         sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
-    "uuid-8.3.2" = {
+    "uuid-8.3.1" = {
       name = "uuid";
       packageName = "uuid";
-      version = "8.3.2";
+      version = "8.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz";
-        sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz";
+        sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==";
       };
     };
     "v8-compile-cache-2.2.0" = {
@@ -7780,15 +7483,6 @@ let
         sha512 = "fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==";
       };
     };
-    "v8-to-istanbul-7.1.0" = {
-      name = "v8-to-istanbul";
-      packageName = "v8-to-istanbul";
-      version = "7.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz";
-        sha512 = "uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==";
-      };
-    };
     "validate-npm-package-license-3.0.4" = {
       name = "validate-npm-package-license";
       packageName = "validate-npm-package-license";
@@ -7807,15 +7501,6 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vscode-textmate-5.2.0" = {
-      name = "vscode-textmate";
-      packageName = "vscode-textmate";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz";
-        sha512 = "Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==";
-      };
-    };
     "w3c-hr-time-1.0.2" = {
       name = "w3c-hr-time";
       packageName = "w3c-hr-time";
@@ -7996,6 +7681,15 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
+    "write-1.0.3" = {
+      name = "write";
+      packageName = "write";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz";
+        sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==";
+      };
+    };
     "write-file-atomic-3.0.3" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -8005,13 +7699,13 @@ let
         sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==";
       };
     };
-    "ws-7.4.1" = {
+    "ws-7.4.0" = {
       name = "ws";
       packageName = "ws";
-      version = "7.4.1";
+      version = "7.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz";
-        sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==";
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz";
+        sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==";
       };
     };
     "xml-name-validator-3.0.0" = {
@@ -8041,31 +7735,13 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.1" = {
+    "y18n-4.0.0" = {
       name = "y18n";
       packageName = "y18n";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz";
-        sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==";
-      };
-    };
-    "yallist-3.1.1" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
-      };
-    };
-    "yallist-4.0.0" = {
-      name = "yallist";
-      packageName = "yallist";
       version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
-        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
     "yargs-15.4.1" = {
@@ -8086,47 +7762,38 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
-    "zigbee-herdsman-0.13.41" = {
+    "zigbee-herdsman-0.13.37" = {
       name = "zigbee-herdsman";
       packageName = "zigbee-herdsman";
-      version = "0.13.41";
+      version = "0.13.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.41.tgz";
-        sha512 = "qHAvPHr8CrzD9pRiiqNmlwxh/KvIfvGpopGBl4Hl2LJln3ruzt1cpHA3jcvR/WUC4vQsTtdEk2911BNEb5APWw==";
+        url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.37.tgz";
+        sha512 = "eK2EK2mqT80ueHvEicKmXGyw+VezoK+7NcHX9WjjeQL6bdOpaLCuDGZY0sOh86Lmodyvdd0ZxY7MwA6z/Ko2PA==";
       };
     };
-    "zigbee-herdsman-0.13.46" = {
-      name = "zigbee-herdsman";
-      packageName = "zigbee-herdsman";
-      version = "0.13.46";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.46.tgz";
-        sha512 = "GH0JvIC0cd91cqLQpJ8Cd+o2+gKct2wsMGq8c6XTiGeJpcF47fIlMaHWEK/CuBcBJ6rnid8mGPdTHmOsPT1Bmw==";
-      };
-    };
-    "zigbee-herdsman-converters-14.0.3" = {
+    "zigbee-herdsman-converters-13.0.7" = {
       name = "zigbee-herdsman-converters";
       packageName = "zigbee-herdsman-converters";
-      version = "14.0.3";
+      version = "13.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.3.tgz";
-        sha512 = "ObZqRgK81C3BIbTXaGL/QEUXP1F1tmj8vjAWVtrlGWkYjCQp4GYKxQU1FHNn342V6/3WxBo122OWrFFRxH3Xfw==";
+        url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-13.0.7.tgz";
+        sha512 = "aHqcbkQmoSkBth4s94//wJm2UO+0YFQkIndRBbz1XAIdNeHDhUVA6ZT1B1DgJZEbF/HRW8ZZLC+biSF6h/1HvQ==";
       };
     };
-    "zigbee2mqtt-frontend-0.2.129" = {
+    "zigbee2mqtt-frontend-0.2.100" = {
       name = "zigbee2mqtt-frontend";
       packageName = "zigbee2mqtt-frontend";
-      version = "0.2.129";
+      version = "0.2.100";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.129.tgz";
-        sha512 = "gvzgYMtI7XF97HueC65MxwqB7Hcoc2HNRnyydqJuq11w0FrzFBg/VLhDpsW5Sor8oz/C8cjd8rtS1yC2jqI1Eg==";
+        url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.100.tgz";
+        sha512 = "/WASdNtWYAqts8RvC3j6HkdnZifg2KEocGS1eIl1G7Gghoj/80TiF5TVYtU3YG9M40vgMIIMvIwrmc8UOmdJhg==";
       };
     };
   };
   args = {
     name = "zigbee2mqtt";
     packageName = "zigbee2mqtt";
-    version = "1.17.0";
+    version = "1.16.2";
     src = ./.;
     dependencies = [
       sources."@dabh/diagnostics-2.0.2"
@@ -8200,7 +7867,7 @@ let
       sources."glossy-0.1.7"
       sources."help-me-1.1.0"
       sources."http-errors-1.7.3"
-      sources."humanize-duration-3.25.0"
+      sources."humanize-duration-3.24.0"
       sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -8214,17 +7881,16 @@ let
       sources."is-unc-path-1.0.0"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
-      sources."js-yaml-3.14.1"
+      sources."js-yaml-3.14.0"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."kuler-2.0.0"
       sources."leven-2.1.0"
       (sources."logform-2.2.0" // {
         dependencies = [
-          sources."ms-2.1.3"
+          sources."ms-2.1.2"
         ];
       })
-      sources."lru-cache-6.0.0"
       sources."mime-1.6.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
@@ -8236,7 +7902,7 @@ let
           sources."ms-2.1.2"
         ];
       })
-      (sources."mqtt-packet-6.7.0" // {
+      (sources."mqtt-packet-6.6.0" // {
         dependencies = [
           sources."debug-4.3.1"
           sources."ms-2.1.2"
@@ -8267,7 +7933,7 @@ let
       sources."remove-trailing-separator-1.1.0"
       sources."rimraf-3.0.2"
       sources."safe-buffer-5.1.2"
-      sources."semver-7.3.4"
+      sources."semver-7.3.2"
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
@@ -8308,53 +7974,53 @@ let
       sources."winston-syslog-2.4.4"
       sources."winston-transport-4.4.0"
       sources."wrappy-1.0.2"
-      sources."ws-7.4.1"
+      sources."ws-7.4.0"
       sources."xtend-4.0.2"
-      sources."yallist-4.0.0"
-      (sources."zigbee-herdsman-0.13.46" // {
+      (sources."zigbee-herdsman-0.13.37" // {
         dependencies = [
-          sources."@babel/cli-7.12.10"
-          sources."@babel/code-frame-7.12.11"
-          sources."@babel/compat-data-7.12.7"
-          sources."@babel/core-7.12.10"
-          sources."@babel/generator-7.12.11"
-          sources."@babel/helper-annotate-as-pure-7.12.10"
+          sources."@babel/cli-7.12.1"
+          sources."@babel/code-frame-7.10.4"
+          sources."@babel/compat-data-7.12.5"
+          sources."@babel/core-7.12.3"
+          sources."@babel/generator-7.12.5"
+          sources."@babel/helper-annotate-as-pure-7.10.4"
           sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
           sources."@babel/helper-compilation-targets-7.12.5"
           sources."@babel/helper-create-class-features-plugin-7.12.1"
-          sources."@babel/helper-create-regexp-features-plugin-7.12.7"
+          sources."@babel/helper-create-regexp-features-plugin-7.12.1"
           sources."@babel/helper-define-map-7.10.5"
           sources."@babel/helper-explode-assignable-expression-7.12.1"
-          sources."@babel/helper-function-name-7.12.11"
-          sources."@babel/helper-get-function-arity-7.12.10"
+          sources."@babel/helper-function-name-7.10.4"
+          sources."@babel/helper-get-function-arity-7.10.4"
           sources."@babel/helper-hoist-variables-7.10.4"
-          sources."@babel/helper-member-expression-to-functions-7.12.7"
+          sources."@babel/helper-member-expression-to-functions-7.12.1"
           sources."@babel/helper-module-imports-7.12.5"
           sources."@babel/helper-module-transforms-7.12.1"
-          sources."@babel/helper-optimise-call-expression-7.12.10"
+          sources."@babel/helper-optimise-call-expression-7.10.4"
           sources."@babel/helper-plugin-utils-7.10.4"
+          sources."@babel/helper-regex-7.10.5"
           sources."@babel/helper-remap-async-to-generator-7.12.1"
-          sources."@babel/helper-replace-supers-7.12.11"
+          sources."@babel/helper-replace-supers-7.12.5"
           sources."@babel/helper-simple-access-7.12.1"
           sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
-          sources."@babel/helper-split-export-declaration-7.12.11"
-          sources."@babel/helper-validator-identifier-7.12.11"
-          sources."@babel/helper-validator-option-7.12.11"
+          sources."@babel/helper-split-export-declaration-7.11.0"
+          sources."@babel/helper-validator-identifier-7.10.4"
+          sources."@babel/helper-validator-option-7.12.1"
           sources."@babel/helper-wrap-function-7.12.3"
           sources."@babel/helpers-7.12.5"
           sources."@babel/highlight-7.10.4"
-          sources."@babel/parser-7.12.11"
-          sources."@babel/plugin-proposal-async-generator-functions-7.12.12"
+          sources."@babel/parser-7.12.5"
+          sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
           sources."@babel/plugin-proposal-class-properties-7.12.1"
           sources."@babel/plugin-proposal-dynamic-import-7.12.1"
           sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
           sources."@babel/plugin-proposal-json-strings-7.12.1"
           sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
           sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-          sources."@babel/plugin-proposal-numeric-separator-7.12.7"
+          sources."@babel/plugin-proposal-numeric-separator-7.12.5"
           sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
           sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-          sources."@babel/plugin-proposal-optional-chaining-7.12.7"
+          sources."@babel/plugin-proposal-optional-chaining-7.12.1"
           sources."@babel/plugin-proposal-private-methods-7.12.1"
           sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
           sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -8375,7 +8041,7 @@ let
           sources."@babel/plugin-transform-arrow-functions-7.12.1"
           sources."@babel/plugin-transform-async-to-generator-7.12.1"
           sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
-          sources."@babel/plugin-transform-block-scoping-7.12.12"
+          sources."@babel/plugin-transform-block-scoping-7.12.1"
           sources."@babel/plugin-transform-classes-7.12.1"
           sources."@babel/plugin-transform-computed-properties-7.12.1"
           sources."@babel/plugin-transform-destructuring-7.12.1"
@@ -8399,22 +8065,22 @@ let
           sources."@babel/plugin-transform-reserved-words-7.12.1"
           sources."@babel/plugin-transform-shorthand-properties-7.12.1"
           sources."@babel/plugin-transform-spread-7.12.1"
-          sources."@babel/plugin-transform-sticky-regex-7.12.7"
+          sources."@babel/plugin-transform-sticky-regex-7.12.1"
           sources."@babel/plugin-transform-template-literals-7.12.1"
-          sources."@babel/plugin-transform-typeof-symbol-7.12.10"
+          sources."@babel/plugin-transform-typeof-symbol-7.12.1"
           sources."@babel/plugin-transform-typescript-7.12.1"
           sources."@babel/plugin-transform-unicode-escapes-7.12.1"
           sources."@babel/plugin-transform-unicode-regex-7.12.1"
-          sources."@babel/preset-env-7.12.11"
+          sources."@babel/preset-env-7.12.1"
           sources."@babel/preset-modules-0.1.4"
-          sources."@babel/preset-typescript-7.12.7"
+          sources."@babel/preset-typescript-7.12.1"
           sources."@babel/runtime-7.12.5"
-          sources."@babel/template-7.12.7"
-          sources."@babel/traverse-7.12.12"
-          sources."@babel/types-7.12.12"
+          sources."@babel/template-7.10.4"
+          sources."@babel/traverse-7.12.5"
+          sources."@babel/types-7.12.6"
           sources."@bcoe/v8-coverage-0.2.3"
           sources."@cnakazawa/watch-1.0.4"
-          (sources."@eslint/eslintrc-0.2.2" // {
+          (sources."@eslint/eslintrc-0.2.1" // {
             dependencies = [
               sources."globals-12.4.0"
               sources."ignore-4.0.6"
@@ -8446,6 +8112,7 @@ let
               sources."has-flag-4.0.0"
               sources."is-number-7.0.0"
               sources."micromatch-4.0.2"
+              sources."rimraf-3.0.2"
               sources."slash-3.0.0"
               sources."strip-ansi-6.0.0"
               sources."supports-color-7.2.0"
@@ -8501,13 +8168,17 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          sources."@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents"
+          (sources."@nicolo-ribaudo/chokidar-2-2.1.8" // {
+            dependencies = [
+              sources."chokidar-2.1.8"
+            ];
+          })
           sources."@nodelib/fs.scandir-2.1.3"
           sources."@nodelib/fs.stat-2.0.3"
           sources."@nodelib/fs.walk-1.2.4"
           sources."@serialport/binding-abstract-9.0.2"
           sources."@serialport/binding-mock-9.0.2"
-          sources."@serialport/bindings-9.0.4"
+          sources."@serialport/bindings-9.0.2"
           sources."@serialport/parser-byte-length-9.0.1"
           sources."@serialport/parser-cctalk-9.0.1"
           sources."@serialport/parser-delimiter-9.0.1"
@@ -8520,38 +8191,38 @@ let
           sources."@types/babel__core-7.1.12"
           sources."@types/babel__generator-7.6.2"
           sources."@types/babel__template-7.4.0"
-          sources."@types/babel__traverse-7.11.0"
+          sources."@types/babel__traverse-7.0.15"
           sources."@types/debounce-1.2.0"
           sources."@types/debug-4.1.5"
           sources."@types/graceful-fs-4.1.4"
           sources."@types/istanbul-lib-coverage-2.0.3"
           sources."@types/istanbul-lib-report-3.0.0"
           sources."@types/istanbul-reports-3.0.0"
-          sources."@types/jest-26.0.19"
+          sources."@types/jest-26.0.15"
           sources."@types/json-schema-7.0.6"
           sources."@types/nedb-1.8.11"
-          sources."@types/node-14.14.16"
+          sources."@types/node-14.14.7"
           sources."@types/normalize-package-data-2.4.0"
-          sources."@types/prettier-2.1.6"
+          sources."@types/prettier-2.1.5"
           sources."@types/serialport-8.0.1"
           sources."@types/stack-utils-2.0.0"
-          sources."@types/yargs-15.0.12"
-          sources."@types/yargs-parser-20.2.0"
-          (sources."@typescript-eslint/eslint-plugin-4.11.0" // {
+          sources."@types/yargs-15.0.9"
+          sources."@types/yargs-parser-15.0.0"
+          (sources."@typescript-eslint/eslint-plugin-4.7.0" // {
             dependencies = [
-              sources."semver-7.3.4"
+              sources."semver-7.3.2"
             ];
           })
-          sources."@typescript-eslint/experimental-utils-4.11.0"
-          sources."@typescript-eslint/parser-4.11.0"
-          sources."@typescript-eslint/scope-manager-4.11.0"
-          sources."@typescript-eslint/types-4.11.0"
-          (sources."@typescript-eslint/typescript-estree-4.11.0" // {
+          sources."@typescript-eslint/experimental-utils-4.7.0"
+          sources."@typescript-eslint/parser-4.7.0"
+          sources."@typescript-eslint/scope-manager-4.7.0"
+          sources."@typescript-eslint/types-4.7.0"
+          (sources."@typescript-eslint/typescript-estree-4.7.0" // {
             dependencies = [
-              sources."semver-7.3.4"
+              sources."semver-7.3.2"
             ];
           })
-          sources."@typescript-eslint/visitor-keys-4.11.0"
+          sources."@typescript-eslint/visitor-keys-4.7.0"
           sources."abab-2.0.5"
           sources."acorn-7.4.1"
           sources."acorn-globals-6.0.0"
@@ -8582,7 +8253,7 @@ let
           sources."asn1-0.2.4"
           sources."assert-plus-1.0.0"
           sources."assign-symbols-1.0.0"
-          sources."astral-regex-2.0.0"
+          sources."astral-regex-1.0.0"
           sources."async-each-1.0.3"
           sources."asynckit-0.4.0"
           sources."at-least-node-1.0.0"
@@ -8603,7 +8274,7 @@ let
           sources."babel-plugin-dynamic-import-node-2.3.3"
           sources."babel-plugin-istanbul-6.0.0"
           sources."babel-plugin-jest-hoist-26.6.2"
-          sources."babel-preset-current-node-syntax-1.0.1"
+          sources."babel-preset-current-node-syntax-1.0.0"
           sources."babel-preset-jest-26.6.2"
           sources."balanced-match-1.0.0"
           (sources."base-0.11.2" // {
@@ -8632,7 +8303,7 @@ let
             ];
           })
           sources."browser-process-hrtime-1.0.0"
-          sources."browserslist-4.16.0"
+          sources."browserslist-4.14.7"
           sources."bser-2.1.1"
           sources."buffer-5.7.1"
           sources."buffer-from-1.1.1"
@@ -8640,7 +8311,7 @@ let
           sources."call-bind-1.0.0"
           sources."callsites-3.1.0"
           sources."camelcase-5.3.1"
-          sources."caniuse-lite-1.0.30001170"
+          sources."caniuse-lite-1.0.30001157"
           sources."capture-exit-2.0.0"
           sources."caseless-0.12.0"
           sources."chalk-2.4.2"
@@ -8651,6 +8322,7 @@ let
               sources."binary-extensions-2.1.0"
               sources."braces-3.0.2"
               sources."fill-range-7.0.1"
+              sources."fsevents-2.1.3"
               sources."glob-parent-5.1.1"
               sources."is-binary-path-2.1.0"
               sources."is-number-7.0.0"
@@ -8669,6 +8341,7 @@ let
           (sources."cliui-6.0.0" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
+              sources."emoji-regex-8.0.0"
               sources."is-fullwidth-code-point-3.0.0"
               sources."string-width-4.2.0"
               sources."strip-ansi-6.0.0"
@@ -8681,7 +8354,6 @@ let
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
           sources."colorette-1.2.1"
-          sources."colors-1.4.0"
           sources."combined-stream-1.0.8"
           sources."commander-4.1.1"
           sources."component-emitter-1.3.0"
@@ -8689,7 +8361,7 @@ let
           sources."console-control-strings-1.1.0"
           sources."convert-source-map-1.7.0"
           sources."copy-descriptor-0.1.1"
-          (sources."core-js-compat-3.8.1" // {
+          (sources."core-js-compat-3.7.0" // {
             dependencies = [
               sources."semver-7.0.0"
             ];
@@ -8705,7 +8377,7 @@ let
           sources."dashdash-1.14.1"
           sources."data-urls-2.0.0"
           sources."debounce-1.2.0"
-          sources."debug-4.3.1"
+          sources."debug-4.2.0"
           sources."decamelize-1.2.0"
           sources."decimal.js-10.2.1"
           sources."decode-uri-component-0.2.0"
@@ -8734,9 +8406,9 @@ let
             ];
           })
           sources."ecc-jsbn-0.1.2"
-          sources."electron-to-chromium-1.3.633"
+          sources."electron-to-chromium-1.3.596"
           sources."emittery-0.7.2"
-          sources."emoji-regex-8.0.0"
+          sources."emoji-regex-7.0.3"
           sources."end-of-stream-1.4.4"
           sources."enquirer-2.3.6"
           sources."error-ex-1.3.2"
@@ -8751,7 +8423,7 @@ let
               sources."type-check-0.3.2"
             ];
           })
-          (sources."eslint-7.16.0" // {
+          (sources."eslint-7.13.0" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
               sources."ansi-styles-4.3.0"
@@ -8764,7 +8436,7 @@ let
               sources."has-flag-4.0.0"
               sources."ignore-4.0.6"
               sources."path-key-3.1.1"
-              sources."semver-7.3.4"
+              sources."semver-7.3.2"
               sources."shebang-command-2.0.0"
               sources."shebang-regex-3.0.0"
               sources."strip-ansi-6.0.0"
@@ -8780,7 +8452,7 @@ let
             ];
           })
           sources."eslint-visitor-keys-2.0.0"
-          (sources."espree-7.3.1" // {
+          (sources."espree-7.3.0" // {
             dependencies = [
               sources."eslint-visitor-keys-1.3.0"
             ];
@@ -8846,9 +8518,9 @@ let
           })
           sources."fast-json-stable-stringify-2.1.0"
           sources."fast-levenshtein-2.0.6"
-          sources."fastq-1.10.0"
+          sources."fastq-1.9.0"
           sources."fb-watchman-2.0.1"
-          sources."file-entry-cache-6.0.0"
+          sources."file-entry-cache-5.0.1"
           sources."file-uri-to-path-1.0.0"
           (sources."fill-range-4.0.0" // {
             dependencies = [
@@ -8856,8 +8528,8 @@ let
             ];
           })
           sources."find-up-4.1.0"
-          sources."flat-cache-3.0.4"
-          sources."flatted-3.1.0"
+          sources."flat-cache-2.0.1"
+          sources."flatted-2.0.2"
           sources."for-in-1.0.2"
           sources."forever-agent-0.6.1"
           sources."form-data-2.3.3"
@@ -8866,13 +8538,13 @@ let
           sources."fs-extra-9.0.1"
           sources."fs-readdir-recursive-1.1.0"
           sources."fs.realpath-1.0.0"
-          sources."fsevents-2.1.3"
+          sources."fsevents-1.2.13"
           sources."function-bind-1.1.1"
           sources."functional-red-black-tree-1.0.1"
           sources."gauge-2.7.4"
           sources."gensync-1.0.0-beta.2"
           sources."get-caller-file-2.0.5"
-          sources."get-intrinsic-1.0.2"
+          sources."get-intrinsic-1.0.1"
           sources."get-package-type-0.1.0"
           sources."get-stream-4.1.0"
           sources."get-value-2.0.6"
@@ -8909,6 +8581,7 @@ let
               sources."kind-of-4.0.0"
             ];
           })
+          sources."highlight.js-10.3.2"
           sources."hosted-git-info-2.8.8"
           sources."html-encoding-sniffer-2.0.1"
           sources."html-escaper-2.0.2"
@@ -8917,7 +8590,7 @@ let
           sources."iconv-lite-0.4.24"
           sources."ieee754-1.2.1"
           sources."ignore-5.1.8"
-          (sources."import-fresh-3.3.0" // {
+          (sources."import-fresh-3.2.2" // {
             dependencies = [
               sources."resolve-from-4.0.0"
             ];
@@ -8926,7 +8599,7 @@ let
           sources."imurmurhash-0.1.4"
           sources."inflight-1.0.6"
           sources."inherits-2.0.4"
-          sources."ini-1.3.8"
+          sources."ini-1.3.5"
           sources."interpret-1.4.0"
           sources."ip-regex-2.1.0"
           (sources."is-accessor-descriptor-0.1.6" // {
@@ -8938,7 +8611,7 @@ let
           sources."is-binary-path-1.0.1"
           sources."is-buffer-1.1.6"
           sources."is-ci-2.0.0"
-          sources."is-core-module-2.2.0"
+          sources."is-core-module-2.1.0"
           (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -9058,6 +8731,7 @@ let
               sources."anymatch-3.1.1"
               sources."braces-3.0.2"
               sources."fill-range-7.0.1"
+              sources."fsevents-2.2.1"
               sources."is-number-7.0.0"
               sources."micromatch-4.0.2"
               sources."to-regex-range-5.0.1"
@@ -9144,7 +8818,7 @@ let
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."has-flag-4.0.0"
-              sources."semver-7.3.4"
+              sources."semver-7.3.2"
               sources."supports-color-7.2.0"
             ];
           })
@@ -9191,7 +8865,7 @@ let
             ];
           })
           sources."js-tokens-4.0.0"
-          sources."js-yaml-3.14.1"
+          sources."js-yaml-3.14.0"
           sources."jsbn-0.1.1"
           sources."jsdom-16.4.0"
           sources."jsesc-2.5.2"
@@ -9215,13 +8889,12 @@ let
           sources."locate-path-5.0.0"
           sources."lodash-4.17.20"
           sources."lodash.sortby-4.7.0"
-          sources."lru-cache-6.0.0"
           sources."lunr-2.3.9"
           sources."make-dir-2.1.0"
           sources."makeerror-1.0.11"
           sources."map-cache-0.2.2"
           sources."map-visit-1.0.0"
-          sources."marked-1.2.7"
+          sources."marked-1.2.3"
           sources."merge-stream-2.0.0"
           sources."merge2-1.4.1"
           sources."micromatch-3.1.10"
@@ -9232,6 +8905,7 @@ let
           sources."minimatch-3.0.4"
           sources."minimist-1.2.5"
           sources."mixin-deep-2.0.1"
+          sources."mkdirp-0.5.5"
           sources."mkdirp-classic-0.5.3"
           sources."ms-2.1.2"
           sources."nan-2.14.2"
@@ -9240,16 +8914,16 @@ let
           sources."natural-compare-1.4.0"
           sources."neo-async-2.6.2"
           sources."nice-try-1.0.5"
-          sources."node-abi-2.19.3"
+          sources."node-abi-2.19.1"
           sources."node-int64-0.4.0"
           sources."node-modules-regexp-1.0.0"
-          (sources."node-notifier-8.0.1" // {
+          (sources."node-notifier-8.0.0" // {
             dependencies = [
-              sources."semver-7.3.4"
+              sources."semver-7.3.2"
               sources."which-2.0.2"
             ];
           })
-          sources."node-releases-1.1.67"
+          sources."node-releases-1.1.66"
           sources."noop-logger-0.1.1"
           sources."normalize-package-data-2.5.0"
           sources."normalize-path-3.0.0"
@@ -9271,14 +8945,8 @@ let
           sources."object.pick-1.3.0"
           sources."once-1.4.0"
           sources."onetime-5.1.2"
-          (sources."onigasm-2.2.5" // {
-            dependencies = [
-              sources."lru-cache-5.1.1"
-              sources."yallist-3.1.1"
-            ];
-          })
           sources."optionator-0.9.1"
-          sources."p-each-series-2.2.0"
+          sources."p-each-series-2.1.0"
           sources."p-finally-1.0.0"
           sources."p-limit-2.3.0"
           sources."p-locate-4.1.0"
@@ -9299,7 +8967,7 @@ let
           sources."pirates-4.0.1"
           sources."pkg-dir-4.2.0"
           sources."posix-character-classes-0.1.1"
-          sources."prebuild-install-6.0.0"
+          sources."prebuild-install-5.3.6"
           sources."prelude-ls-1.2.1"
           (sources."pretty-format-26.6.2" // {
             dependencies = [
@@ -9363,7 +9031,7 @@ let
           sources."resolve-url-0.2.1"
           sources."ret-0.1.15"
           sources."reusify-1.0.4"
-          sources."rimraf-3.0.2"
+          sources."rimraf-2.6.3"
           sources."rsvp-4.8.5"
           sources."run-parallel-1.1.10"
           sources."safe-buffer-5.1.2"
@@ -9372,7 +9040,7 @@ let
           sources."sane-4.1.0"
           sources."saxes-5.0.1"
           sources."semver-5.7.1"
-          sources."serialport-9.0.4"
+          sources."serialport-9.0.2"
           sources."set-blocking-2.0.0"
           (sources."set-value-2.0.1" // {
             dependencies = [
@@ -9383,20 +9051,14 @@ let
           sources."shebang-regex-1.0.0"
           sources."shelljs-0.8.4"
           sources."shellwords-0.1.1"
-          sources."shiki-0.2.7"
-          sources."shiki-languages-0.2.7"
-          sources."shiki-themes-0.2.7"
           sources."signal-exit-3.0.3"
           sources."simple-concat-1.0.1"
           sources."simple-get-3.1.0"
           sources."sisteransi-1.0.5"
           sources."slash-2.0.0"
-          (sources."slice-ansi-4.0.0" // {
+          (sources."slice-ansi-2.1.0" // {
             dependencies = [
-              sources."ansi-styles-4.3.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."is-fullwidth-code-point-3.0.0"
+              sources."is-fullwidth-code-point-2.0.0"
             ];
           })
           sources."slip-1.0.2"
@@ -9432,7 +9094,7 @@ let
           sources."spdx-correct-3.1.1"
           sources."spdx-exceptions-2.3.0"
           sources."spdx-expression-parse-3.0.1"
-          sources."spdx-license-ids-3.0.7"
+          sources."spdx-license-ids-3.0.6"
           sources."split-string-3.1.0"
           sources."sprintf-js-1.0.3"
           sources."sshpk-1.16.1"
@@ -9468,12 +9130,12 @@ let
             ];
           })
           sources."symbol-tree-3.2.4"
-          (sources."table-6.0.4" // {
+          (sources."table-5.4.6" // {
             dependencies = [
-              sources."ansi-regex-5.0.0"
-              sources."is-fullwidth-code-point-3.0.0"
-              sources."string-width-4.2.0"
-              sources."strip-ansi-6.0.0"
+              sources."ansi-regex-4.1.0"
+              sources."is-fullwidth-code-point-2.0.0"
+              sources."string-width-3.1.0"
+              sources."strip-ansi-5.2.0"
             ];
           })
           sources."tar-fs-2.1.1"
@@ -9505,13 +9167,17 @@ let
           sources."type-detect-4.0.8"
           sources."type-fest-0.8.1"
           sources."typedarray-to-buffer-3.1.5"
-          sources."typedoc-0.20.0-beta.30"
-          sources."typedoc-default-themes-0.12.0-beta.10"
-          sources."typedoc-plugin-markdown-3.1.1"
+          (sources."typedoc-0.19.2" // {
+            dependencies = [
+              sources."semver-7.3.2"
+            ];
+          })
+          sources."typedoc-default-themes-0.11.4"
+          sources."typedoc-plugin-markdown-3.0.11"
           sources."typedoc-plugin-no-inherit-1.2.0"
           sources."typedoc-plugin-sourcefile-url-1.0.6"
-          sources."typescript-4.1.3"
-          sources."uglify-js-3.12.3"
+          sources."typescript-4.0.5"
+          sources."uglify-js-3.11.6"
           sources."unicode-canonical-property-names-ecmascript-1.0.4"
           sources."unicode-match-property-ecmascript-1.0.4"
           sources."unicode-match-property-value-ecmascript-1.2.0"
@@ -9533,16 +9199,15 @@ let
           sources."urix-0.1.0"
           sources."use-3.1.1"
           sources."util-deprecate-1.0.2"
-          sources."uuid-8.3.2"
+          sources."uuid-8.3.1"
           sources."v8-compile-cache-2.2.0"
-          (sources."v8-to-istanbul-7.1.0" // {
+          (sources."v8-to-istanbul-7.0.0" // {
             dependencies = [
               sources."source-map-0.7.3"
             ];
           })
           sources."validate-npm-package-license-3.0.4"
           sources."verror-1.10.0"
-          sources."vscode-textmate-5.2.0"
           sources."w3c-hr-time-1.0.2"
           sources."w3c-xmlserializer-2.0.0"
           sources."walker-1.0.7"
@@ -9562,21 +9227,23 @@ let
               sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
+              sources."emoji-regex-8.0.0"
               sources."is-fullwidth-code-point-3.0.0"
               sources."string-width-4.2.0"
               sources."strip-ansi-6.0.0"
             ];
           })
           sources."wrappy-1.0.2"
+          sources."write-1.0.3"
           sources."write-file-atomic-3.0.3"
-          sources."ws-7.4.1"
+          sources."ws-7.4.0"
           sources."xml-name-validator-3.0.0"
           sources."xmlchars-2.2.0"
-          sources."y18n-4.0.1"
-          sources."yallist-4.0.0"
+          sources."y18n-4.0.0"
           (sources."yargs-15.4.1" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
+              sources."emoji-regex-8.0.0"
               sources."is-fullwidth-code-point-3.0.0"
               sources."string-width-4.2.0"
               sources."strip-ansi-6.0.0"
@@ -9585,38 +9252,38 @@ let
           sources."yargs-parser-18.1.3"
         ];
       })
-      (sources."zigbee-herdsman-converters-14.0.3" // {
+      (sources."zigbee-herdsman-converters-13.0.7" // {
         dependencies = [
-          sources."@babel/code-frame-7.12.11"
-          (sources."@babel/core-7.12.10" // {
+          sources."@babel/code-frame-7.10.4"
+          (sources."@babel/core-7.12.9" // {
             dependencies = [
               sources."semver-5.7.1"
               sources."source-map-0.5.7"
             ];
           })
-          (sources."@babel/generator-7.12.11" // {
+          (sources."@babel/generator-7.12.5" // {
             dependencies = [
               sources."source-map-0.5.7"
             ];
           })
-          sources."@babel/helper-function-name-7.12.11"
-          sources."@babel/helper-get-function-arity-7.12.10"
+          sources."@babel/helper-function-name-7.10.4"
+          sources."@babel/helper-get-function-arity-7.10.4"
           sources."@babel/helper-member-expression-to-functions-7.12.7"
           sources."@babel/helper-module-imports-7.12.5"
           sources."@babel/helper-module-transforms-7.12.1"
-          sources."@babel/helper-optimise-call-expression-7.12.10"
+          sources."@babel/helper-optimise-call-expression-7.12.7"
           sources."@babel/helper-plugin-utils-7.10.4"
-          sources."@babel/helper-replace-supers-7.12.11"
+          sources."@babel/helper-replace-supers-7.12.5"
           sources."@babel/helper-simple-access-7.12.1"
-          sources."@babel/helper-split-export-declaration-7.12.11"
-          sources."@babel/helper-validator-identifier-7.12.11"
+          sources."@babel/helper-split-export-declaration-7.11.0"
+          sources."@babel/helper-validator-identifier-7.10.4"
           sources."@babel/helpers-7.12.5"
           (sources."@babel/highlight-7.10.4" // {
             dependencies = [
               sources."chalk-2.4.2"
             ];
           })
-          sources."@babel/parser-7.12.11"
+          sources."@babel/parser-7.12.7"
           sources."@babel/plugin-syntax-async-generators-7.8.4"
           sources."@babel/plugin-syntax-bigint-7.8.3"
           sources."@babel/plugin-syntax-class-properties-7.12.1"
@@ -9630,15 +9297,15 @@ let
           sources."@babel/plugin-syntax-optional-chaining-7.8.3"
           sources."@babel/plugin-syntax-top-level-await-7.12.1"
           sources."@babel/template-7.12.7"
-          (sources."@babel/traverse-7.12.12" // {
+          (sources."@babel/traverse-7.12.9" // {
             dependencies = [
               sources."globals-11.12.0"
             ];
           })
-          sources."@babel/types-7.12.12"
+          sources."@babel/types-7.12.7"
           sources."@bcoe/v8-coverage-0.2.3"
           sources."@cnakazawa/watch-1.0.4"
-          sources."@eslint/eslintrc-0.2.2"
+          sources."@eslint/eslintrc-0.2.1"
           (sources."@istanbuljs/load-nyc-config-1.1.0" // {
             dependencies = [
               sources."resolve-from-5.0.0"
@@ -9646,7 +9313,11 @@ let
           })
           sources."@istanbuljs/schema-0.1.2"
           sources."@jest/console-26.6.2"
-          sources."@jest/core-26.6.3"
+          (sources."@jest/core-26.6.3" // {
+            dependencies = [
+              sources."rimraf-3.0.2"
+            ];
+          })
           sources."@jest/environment-26.6.2"
           sources."@jest/fake-timers-26.6.2"
           sources."@jest/globals-26.6.2"
@@ -9664,23 +9335,23 @@ let
           sources."@types/babel__core-7.1.12"
           sources."@types/babel__generator-7.6.2"
           sources."@types/babel__template-7.4.0"
-          sources."@types/babel__traverse-7.11.0"
+          sources."@types/babel__traverse-7.0.16"
           sources."@types/graceful-fs-4.1.4"
           sources."@types/istanbul-lib-coverage-2.0.3"
           sources."@types/istanbul-lib-report-3.0.0"
           sources."@types/istanbul-reports-3.0.0"
           sources."@types/json-schema-7.0.6"
-          sources."@types/node-14.14.16"
+          sources."@types/node-14.14.10"
           sources."@types/normalize-package-data-2.4.0"
-          sources."@types/prettier-2.1.6"
+          sources."@types/prettier-2.1.5"
           sources."@types/stack-utils-2.0.0"
-          sources."@types/yargs-15.0.12"
-          sources."@types/yargs-parser-20.2.0"
-          sources."@typescript-eslint/experimental-utils-4.11.0"
-          sources."@typescript-eslint/scope-manager-4.11.0"
-          sources."@typescript-eslint/types-4.11.0"
-          sources."@typescript-eslint/typescript-estree-4.11.0"
-          sources."@typescript-eslint/visitor-keys-4.11.0"
+          sources."@types/yargs-15.0.10"
+          sources."@types/yargs-parser-15.0.0"
+          sources."@typescript-eslint/experimental-utils-4.8.2"
+          sources."@typescript-eslint/scope-manager-4.8.2"
+          sources."@typescript-eslint/types-4.8.2"
+          sources."@typescript-eslint/typescript-estree-4.8.2"
+          sources."@typescript-eslint/visitor-keys-4.8.2"
           sources."abab-2.0.5"
           sources."acorn-7.4.1"
           sources."acorn-globals-6.0.0"
@@ -9706,16 +9377,16 @@ let
           sources."asn1-0.2.4"
           sources."assert-plus-1.0.0"
           sources."assign-symbols-1.0.0"
-          sources."astral-regex-2.0.0"
+          sources."astral-regex-1.0.0"
           sources."asynckit-0.4.0"
           sources."atob-2.1.2"
           sources."aws-sign2-0.7.0"
           sources."aws4-1.11.0"
-          sources."axios-0.21.1"
+          sources."axios-0.21.0"
           sources."babel-jest-26.6.3"
           sources."babel-plugin-istanbul-6.0.0"
           sources."babel-plugin-jest-hoist-26.6.2"
-          sources."babel-preset-current-node-syntax-1.0.1"
+          sources."babel-preset-current-node-syntax-1.0.0"
           sources."babel-preset-jest-26.6.2"
           sources."balanced-match-1.0.0"
           (sources."base-0.11.2" // {
@@ -9758,7 +9429,13 @@ let
               sources."define-property-0.2.5"
             ];
           })
-          sources."cliui-6.0.0"
+          (sources."cliui-6.0.0" // {
+            dependencies = [
+              sources."emoji-regex-8.0.0"
+              sources."is-fullwidth-code-point-3.0.0"
+              sources."string-width-4.2.0"
+            ];
+          })
           sources."co-4.6.0"
           sources."collect-v8-coverage-1.0.1"
           sources."collection-visit-1.0.0"
@@ -9808,7 +9485,7 @@ let
           })
           sources."ecc-jsbn-0.1.2"
           sources."emittery-0.7.2"
-          sources."emoji-regex-8.0.0"
+          sources."emoji-regex-7.0.3"
           sources."end-of-stream-1.4.4"
           sources."enquirer-2.3.6"
           sources."error-ex-1.3.2"
@@ -9821,7 +9498,7 @@ let
               sources."type-check-0.3.2"
             ];
           })
-          sources."eslint-7.16.0"
+          sources."eslint-7.14.0"
           sources."eslint-config-google-0.14.0"
           sources."eslint-plugin-jest-24.1.3"
           sources."eslint-scope-5.1.1"
@@ -9831,7 +9508,7 @@ let
             ];
           })
           sources."eslint-visitor-keys-2.0.0"
-          (sources."espree-7.3.1" // {
+          (sources."espree-7.3.0" // {
             dependencies = [
               sources."eslint-visitor-keys-1.3.0"
             ];
@@ -9896,14 +9573,14 @@ let
           sources."fast-glob-3.2.4"
           sources."fast-json-stable-stringify-2.1.0"
           sources."fast-levenshtein-2.0.6"
-          sources."fastq-1.10.0"
+          sources."fastq-1.9.0"
           sources."fb-watchman-2.0.1"
-          sources."file-entry-cache-6.0.0"
+          sources."file-entry-cache-5.0.1"
           sources."fill-range-7.0.1"
           sources."find-up-4.1.0"
-          sources."flat-cache-3.0.4"
-          sources."flatted-3.1.0"
-          sources."follow-redirects-1.13.1"
+          sources."flat-cache-2.0.1"
+          sources."flatted-2.0.2"
+          sources."follow-redirects-1.13.0"
           sources."for-in-1.0.2"
           sources."forever-agent-0.6.1"
           sources."form-data-2.3.3"
@@ -9953,7 +9630,7 @@ let
           sources."iconv-lite-0.4.24"
           sources."ieee754-1.2.1"
           sources."ignore-4.0.6"
-          sources."import-fresh-3.3.0"
+          sources."import-fresh-3.2.2"
           sources."import-local-3.0.2"
           sources."imurmurhash-0.1.4"
           sources."inflight-1.0.6"
@@ -9981,7 +9658,7 @@ let
           sources."is-docker-2.1.1"
           sources."is-extendable-0.1.1"
           sources."is-extglob-2.1.1"
-          sources."is-fullwidth-code-point-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
           sources."is-generator-fn-2.1.0"
           sources."is-glob-4.0.1"
           sources."is-number-7.0.0"
@@ -10057,7 +9734,7 @@ let
             ];
           })
           sources."js-tokens-4.0.0"
-          sources."js-yaml-3.14.1"
+          sources."js-yaml-3.14.0"
           sources."jsbn-0.1.1"
           sources."jsdom-16.4.0"
           sources."jsesc-2.5.2"
@@ -10076,7 +9753,6 @@ let
           sources."locate-path-5.0.0"
           sources."lodash-4.17.20"
           sources."lodash.sortby-4.7.0"
-          sources."lru-cache-6.0.0"
           (sources."make-dir-3.1.0" // {
             dependencies = [
               sources."semver-6.3.0"
@@ -10098,13 +9774,14 @@ let
               sources."is-extendable-1.0.1"
             ];
           })
+          sources."mkdirp-0.5.5"
           sources."ms-2.1.2"
           sources."nanomatch-1.2.13"
           sources."natural-compare-1.4.0"
           sources."nice-try-1.0.5"
           sources."node-int64-0.4.0"
           sources."node-modules-regexp-1.0.0"
-          sources."node-notifier-8.0.1"
+          sources."node-notifier-8.0.0"
           (sources."normalize-package-data-2.5.0" // {
             dependencies = [
               sources."semver-5.7.1"
@@ -10199,7 +9876,7 @@ let
           sources."resolve-url-0.2.1"
           sources."ret-0.1.15"
           sources."reusify-1.0.4"
-          sources."rimraf-3.0.2"
+          sources."rimraf-2.6.3"
           sources."rsvp-4.8.5"
           sources."run-parallel-1.1.10"
           sources."safe-buffer-5.2.1"
@@ -10229,7 +9906,7 @@ let
             ];
           })
           sources."saxes-5.0.1"
-          sources."semver-7.3.4"
+          sources."semver-7.3.2"
           sources."set-blocking-2.0.0"
           (sources."set-value-2.0.1" // {
             dependencies = [
@@ -10242,13 +9919,7 @@ let
           sources."signal-exit-3.0.3"
           sources."sisteransi-1.0.5"
           sources."slash-3.0.0"
-          (sources."slice-ansi-4.0.0" // {
-            dependencies = [
-              sources."ansi-styles-4.3.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-            ];
-          })
+          sources."slice-ansi-2.1.0"
           (sources."snapdragon-0.8.2" // {
             dependencies = [
               sources."debug-2.6.9"
@@ -10278,7 +9949,7 @@ let
           sources."spdx-correct-3.1.1"
           sources."spdx-exceptions-2.3.0"
           sources."spdx-expression-parse-3.0.1"
-          sources."spdx-license-ids-3.0.7"
+          sources."spdx-license-ids-3.0.6"
           sources."split-string-3.1.0"
           sources."sprintf-js-1.0.3"
           sources."sshpk-1.16.1"
@@ -10294,7 +9965,12 @@ let
           })
           sources."stealthy-require-1.1.1"
           sources."string-length-4.0.1"
-          sources."string-width-4.2.0"
+          (sources."string-width-3.1.0" // {
+            dependencies = [
+              sources."ansi-regex-4.1.0"
+              sources."strip-ansi-5.2.0"
+            ];
+          })
           sources."string_decoder-1.3.0"
           sources."strip-ansi-6.0.0"
           sources."strip-bom-4.0.0"
@@ -10309,7 +9985,7 @@ let
             ];
           })
           sources."symbol-tree-3.2.4"
-          sources."table-6.0.4"
+          sources."table-5.4.6"
           sources."tar-stream-2.1.4"
           sources."terminal-link-2.1.1"
           sources."test-exclude-6.0.0"
@@ -10349,9 +10025,9 @@ let
           sources."urix-0.1.0"
           sources."use-3.1.1"
           sources."util-deprecate-1.0.2"
-          sources."uuid-8.3.2"
+          sources."uuid-8.3.1"
           sources."v8-compile-cache-2.2.0"
-          (sources."v8-to-istanbul-7.1.0" // {
+          (sources."v8-to-istanbul-7.0.0" // {
             dependencies = [
               sources."source-map-0.7.3"
             ];
@@ -10373,1299 +10049,34 @@ let
               sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
+              sources."emoji-regex-8.0.0"
+              sources."is-fullwidth-code-point-3.0.0"
+              sources."string-width-4.2.0"
             ];
           })
           sources."wrappy-1.0.2"
+          sources."write-1.0.3"
           sources."write-file-atomic-3.0.3"
-          sources."ws-7.4.1"
+          sources."ws-7.4.0"
           sources."xml-name-validator-3.0.0"
           sources."xmlchars-2.2.0"
-          sources."y18n-4.0.1"
-          sources."yallist-4.0.0"
-          sources."yargs-15.4.1"
-          sources."yargs-parser-18.1.3"
-          (sources."zigbee-herdsman-0.13.41" // {
+          sources."y18n-4.0.0"
+          (sources."yargs-15.4.1" // {
             dependencies = [
-              sources."@babel/cli-7.12.8"
-              sources."@babel/code-frame-7.10.4"
-              sources."@babel/compat-data-7.12.7"
-              sources."@babel/core-7.12.9"
-              sources."@babel/generator-7.12.5"
-              sources."@babel/helper-annotate-as-pure-7.10.4"
-              sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
-              sources."@babel/helper-compilation-targets-7.12.5"
-              sources."@babel/helper-create-class-features-plugin-7.12.1"
-              sources."@babel/helper-create-regexp-features-plugin-7.12.7"
-              sources."@babel/helper-define-map-7.10.5"
-              sources."@babel/helper-explode-assignable-expression-7.12.1"
-              sources."@babel/helper-function-name-7.10.4"
-              sources."@babel/helper-get-function-arity-7.10.4"
-              sources."@babel/helper-hoist-variables-7.10.4"
-              sources."@babel/helper-member-expression-to-functions-7.12.7"
-              sources."@babel/helper-module-imports-7.12.5"
-              sources."@babel/helper-module-transforms-7.12.1"
-              sources."@babel/helper-optimise-call-expression-7.12.7"
-              sources."@babel/helper-plugin-utils-7.10.4"
-              sources."@babel/helper-remap-async-to-generator-7.12.1"
-              sources."@babel/helper-replace-supers-7.12.5"
-              sources."@babel/helper-simple-access-7.12.1"
-              sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
-              sources."@babel/helper-split-export-declaration-7.11.0"
-              sources."@babel/helper-validator-identifier-7.10.4"
-              sources."@babel/helper-validator-option-7.12.1"
-              sources."@babel/helper-wrap-function-7.12.3"
-              sources."@babel/helpers-7.12.5"
-              sources."@babel/highlight-7.10.4"
-              sources."@babel/parser-7.12.7"
-              sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
-              sources."@babel/plugin-proposal-class-properties-7.12.1"
-              sources."@babel/plugin-proposal-dynamic-import-7.12.1"
-              sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
-              sources."@babel/plugin-proposal-json-strings-7.12.1"
-              sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
-              sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-              sources."@babel/plugin-proposal-numeric-separator-7.12.7"
-              sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
-              sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-              sources."@babel/plugin-proposal-optional-chaining-7.12.7"
-              sources."@babel/plugin-proposal-private-methods-7.12.1"
-              sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
-              sources."@babel/plugin-syntax-async-generators-7.8.4"
-              sources."@babel/plugin-syntax-bigint-7.8.3"
-              sources."@babel/plugin-syntax-class-properties-7.12.1"
-              sources."@babel/plugin-syntax-dynamic-import-7.8.3"
-              sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
-              sources."@babel/plugin-syntax-import-meta-7.10.4"
-              sources."@babel/plugin-syntax-json-strings-7.8.3"
-              sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4"
-              sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
-              sources."@babel/plugin-syntax-numeric-separator-7.10.4"
-              sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
-              sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
-              sources."@babel/plugin-syntax-optional-chaining-7.8.3"
-              sources."@babel/plugin-syntax-top-level-await-7.12.1"
-              sources."@babel/plugin-syntax-typescript-7.12.1"
-              sources."@babel/plugin-transform-arrow-functions-7.12.1"
-              sources."@babel/plugin-transform-async-to-generator-7.12.1"
-              sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
-              sources."@babel/plugin-transform-block-scoping-7.12.1"
-              sources."@babel/plugin-transform-classes-7.12.1"
-              sources."@babel/plugin-transform-computed-properties-7.12.1"
-              sources."@babel/plugin-transform-destructuring-7.12.1"
-              sources."@babel/plugin-transform-dotall-regex-7.12.1"
-              sources."@babel/plugin-transform-duplicate-keys-7.12.1"
-              sources."@babel/plugin-transform-exponentiation-operator-7.12.1"
-              sources."@babel/plugin-transform-for-of-7.12.1"
-              sources."@babel/plugin-transform-function-name-7.12.1"
-              sources."@babel/plugin-transform-literals-7.12.1"
-              sources."@babel/plugin-transform-member-expression-literals-7.12.1"
-              sources."@babel/plugin-transform-modules-amd-7.12.1"
-              sources."@babel/plugin-transform-modules-commonjs-7.12.1"
-              sources."@babel/plugin-transform-modules-systemjs-7.12.1"
-              sources."@babel/plugin-transform-modules-umd-7.12.1"
-              sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1"
-              sources."@babel/plugin-transform-new-target-7.12.1"
-              sources."@babel/plugin-transform-object-super-7.12.1"
-              sources."@babel/plugin-transform-parameters-7.12.1"
-              sources."@babel/plugin-transform-property-literals-7.12.1"
-              sources."@babel/plugin-transform-regenerator-7.12.1"
-              sources."@babel/plugin-transform-reserved-words-7.12.1"
-              sources."@babel/plugin-transform-shorthand-properties-7.12.1"
-              sources."@babel/plugin-transform-spread-7.12.1"
-              sources."@babel/plugin-transform-sticky-regex-7.12.7"
-              sources."@babel/plugin-transform-template-literals-7.12.1"
-              sources."@babel/plugin-transform-typeof-symbol-7.12.1"
-              sources."@babel/plugin-transform-typescript-7.12.1"
-              sources."@babel/plugin-transform-unicode-escapes-7.12.1"
-              sources."@babel/plugin-transform-unicode-regex-7.12.1"
-              sources."@babel/preset-env-7.12.7"
-              sources."@babel/preset-modules-0.1.4"
-              sources."@babel/preset-typescript-7.12.7"
-              sources."@babel/runtime-7.12.5"
-              sources."@babel/template-7.12.7"
-              sources."@babel/traverse-7.12.9"
-              sources."@babel/types-7.12.7"
-              sources."@bcoe/v8-coverage-0.2.3"
-              sources."@cnakazawa/watch-1.0.4"
-              (sources."@eslint/eslintrc-0.2.2" // {
-                dependencies = [
-                  sources."globals-12.4.0"
-                  sources."ignore-4.0.6"
-                  sources."strip-json-comments-3.1.1"
-                ];
-              })
-              sources."@istanbuljs/load-nyc-config-1.1.0"
-              sources."@istanbuljs/schema-0.1.2"
-              (sources."@jest/console-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."slash-3.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."@jest/core-26.6.3" // {
-                dependencies = [
-                  sources."ansi-regex-5.0.0"
-                  sources."ansi-styles-4.3.0"
-                  sources."braces-3.0.2"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."fill-range-7.0.1"
-                  sources."has-flag-4.0.0"
-                  sources."is-number-7.0.0"
-                  sources."micromatch-4.0.2"
-                  sources."slash-3.0.0"
-                  sources."strip-ansi-6.0.0"
-                  sources."supports-color-7.2.0"
-                  sources."to-regex-range-5.0.1"
-                ];
-              })
-              sources."@jest/environment-26.6.2"
-              sources."@jest/fake-timers-26.6.2"
-              sources."@jest/globals-26.6.2"
-              (sources."@jest/reporters-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."slash-3.0.0"
-                  sources."source-map-0.6.1"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."@jest/source-map-26.6.2" // {
-                dependencies = [
-                  sources."source-map-0.6.1"
-                ];
-              })
-              sources."@jest/test-result-26.6.2"
-              sources."@jest/test-sequencer-26.6.3"
-              (sources."@jest/transform-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."braces-3.0.2"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."fill-range-7.0.1"
-                  sources."has-flag-4.0.0"
-                  sources."is-number-7.0.0"
-                  sources."micromatch-4.0.2"
-                  sources."slash-3.0.0"
-                  sources."source-map-0.6.1"
-                  sources."supports-color-7.2.0"
-                  sources."to-regex-range-5.0.1"
-                ];
-              })
-              (sources."@jest/types-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents"
-              sources."@nodelib/fs.scandir-2.1.3"
-              sources."@nodelib/fs.stat-2.0.3"
-              sources."@nodelib/fs.walk-1.2.4"
-              sources."@serialport/binding-abstract-9.0.2"
-              sources."@serialport/binding-mock-9.0.2"
-              sources."@serialport/bindings-9.0.3"
-              sources."@serialport/parser-byte-length-9.0.1"
-              sources."@serialport/parser-cctalk-9.0.1"
-              sources."@serialport/parser-delimiter-9.0.1"
-              sources."@serialport/parser-readline-9.0.1"
-              sources."@serialport/parser-ready-9.0.1"
-              sources."@serialport/parser-regex-9.0.1"
-              sources."@serialport/stream-9.0.2"
-              sources."@sinonjs/commons-1.8.1"
-              sources."@sinonjs/fake-timers-6.0.1"
-              sources."@types/babel__core-7.1.12"
-              sources."@types/babel__generator-7.6.2"
-              sources."@types/babel__template-7.4.0"
-              sources."@types/babel__traverse-7.11.0"
-              sources."@types/debounce-1.2.0"
-              sources."@types/debug-4.1.5"
-              sources."@types/graceful-fs-4.1.4"
-              sources."@types/istanbul-lib-coverage-2.0.3"
-              sources."@types/istanbul-lib-report-3.0.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."@types/jest-26.0.18"
-              sources."@types/json-schema-7.0.6"
-              sources."@types/nedb-1.8.11"
-              sources."@types/node-14.14.11"
-              sources."@types/normalize-package-data-2.4.0"
-              sources."@types/prettier-2.1.5"
-              sources."@types/serialport-8.0.1"
-              sources."@types/stack-utils-2.0.0"
-              sources."@types/yargs-15.0.11"
-              sources."@types/yargs-parser-15.0.0"
-              (sources."@typescript-eslint/eslint-plugin-4.9.1" // {
-                dependencies = [
-                  sources."semver-7.3.4"
-                ];
-              })
-              sources."@typescript-eslint/experimental-utils-4.9.1"
-              sources."@typescript-eslint/parser-4.9.1"
-              sources."@typescript-eslint/scope-manager-4.9.1"
-              sources."@typescript-eslint/types-4.9.1"
-              (sources."@typescript-eslint/typescript-estree-4.9.1" // {
-                dependencies = [
-                  sources."semver-7.3.4"
-                ];
-              })
-              sources."@typescript-eslint/visitor-keys-4.9.1"
-              sources."abab-2.0.5"
-              sources."acorn-7.4.1"
-              sources."acorn-globals-6.0.0"
-              sources."acorn-jsx-5.3.1"
-              sources."acorn-walk-7.2.0"
-              sources."ajv-6.12.6"
-              sources."ansi-colors-4.1.1"
-              (sources."ansi-escapes-4.3.1" // {
-                dependencies = [
-                  sources."type-fest-0.11.0"
-                ];
-              })
-              sources."ansi-regex-2.1.1"
-              sources."ansi-styles-3.2.1"
-              (sources."anymatch-2.0.0" // {
-                dependencies = [
-                  sources."normalize-path-2.1.1"
-                ];
-              })
-              sources."aproba-1.2.0"
-              sources."are-we-there-yet-1.1.5"
-              sources."argparse-1.0.10"
-              sources."arr-diff-4.0.0"
-              sources."arr-flatten-1.1.0"
-              sources."arr-union-3.1.0"
-              sources."array-union-2.1.0"
-              sources."array-unique-0.3.2"
-              sources."asn1-0.2.4"
-              sources."assert-plus-1.0.0"
-              sources."assign-symbols-1.0.0"
-              sources."astral-regex-1.0.0"
-              sources."async-each-1.0.3"
-              sources."asynckit-0.4.0"
-              sources."at-least-node-1.0.0"
-              sources."atob-2.1.2"
-              sources."aws-sign2-0.7.0"
-              sources."aws4-1.11.0"
-              (sources."babel-jest-26.6.3" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."slash-3.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."babel-plugin-dynamic-import-node-2.3.3"
-              sources."babel-plugin-istanbul-6.0.0"
-              sources."babel-plugin-jest-hoist-26.6.2"
-              sources."babel-preset-current-node-syntax-1.0.0"
-              sources."babel-preset-jest-26.6.2"
-              sources."balanced-match-1.0.0"
-              (sources."base-0.11.2" // {
-                dependencies = [
-                  sources."define-property-1.0.0"
-                  sources."is-accessor-descriptor-1.0.0"
-                  sources."is-data-descriptor-1.0.0"
-                  sources."is-descriptor-1.0.2"
-                  sources."is-extendable-1.0.1"
-                  sources."mixin-deep-1.3.2"
-                ];
-              })
-              sources."base64-js-1.5.1"
-              sources."bcrypt-pbkdf-1.0.2"
-              sources."binary-extensions-1.13.1"
-              sources."bindings-1.5.0"
-              (sources."bl-4.0.3" // {
-                dependencies = [
-                  sources."readable-stream-3.6.0"
-                ];
-              })
-              sources."brace-expansion-1.1.11"
-              (sources."braces-2.3.2" // {
-                dependencies = [
-                  sources."extend-shallow-2.0.1"
-                ];
-              })
-              sources."browser-process-hrtime-1.0.0"
-              sources."browserslist-4.15.0"
-              sources."bser-2.1.1"
-              sources."buffer-5.7.1"
-              sources."buffer-from-1.1.1"
-              sources."cache-base-1.0.1"
-              sources."call-bind-1.0.0"
-              sources."callsites-3.1.0"
-              sources."camelcase-5.3.1"
-              sources."caniuse-lite-1.0.30001165"
-              sources."capture-exit-2.0.0"
-              sources."caseless-0.12.0"
-              sources."chalk-2.4.2"
-              sources."char-regex-1.0.2"
-              (sources."chokidar-3.4.3" // {
-                dependencies = [
-                  sources."anymatch-3.1.1"
-                  sources."binary-extensions-2.1.0"
-                  sources."braces-3.0.2"
-                  sources."fill-range-7.0.1"
-                  sources."glob-parent-5.1.1"
-                  sources."is-binary-path-2.1.0"
-                  sources."is-number-7.0.0"
-                  sources."readdirp-3.5.0"
-                  sources."to-regex-range-5.0.1"
-                ];
-              })
-              sources."chownr-1.1.4"
-              sources."ci-info-2.0.0"
-              sources."cjs-module-lexer-0.6.0"
-              (sources."class-utils-0.3.6" // {
-                dependencies = [
-                  sources."define-property-0.2.5"
-                ];
-              })
-              (sources."cliui-6.0.0" // {
-                dependencies = [
-                  sources."ansi-regex-5.0.0"
-                  sources."emoji-regex-8.0.0"
-                  sources."is-fullwidth-code-point-3.0.0"
-                  sources."string-width-4.2.0"
-                  sources."strip-ansi-6.0.0"
-                ];
-              })
-              sources."co-4.6.0"
-              sources."code-point-at-1.1.0"
-              sources."collect-v8-coverage-1.0.1"
-              sources."collection-visit-1.0.0"
-              sources."color-convert-1.9.3"
-              sources."color-name-1.1.3"
-              sources."colorette-1.2.1"
-              sources."colors-1.4.0"
-              sources."combined-stream-1.0.8"
-              sources."commander-4.1.1"
-              sources."component-emitter-1.3.0"
-              sources."concat-map-0.0.1"
-              sources."console-control-strings-1.1.0"
-              sources."convert-source-map-1.7.0"
-              sources."copy-descriptor-0.1.1"
-              (sources."core-js-compat-3.8.1" // {
-                dependencies = [
-                  sources."semver-7.0.0"
-                ];
-              })
-              sources."core-util-is-1.0.2"
-              sources."cross-spawn-6.0.5"
-              sources."cssom-0.4.4"
-              (sources."cssstyle-2.3.0" // {
-                dependencies = [
-                  sources."cssom-0.3.8"
-                ];
-              })
-              sources."dashdash-1.14.1"
-              sources."data-urls-2.0.0"
-              sources."debounce-1.2.0"
-              sources."debug-4.3.1"
-              sources."decamelize-1.2.0"
-              sources."decimal.js-10.2.1"
-              sources."decode-uri-component-0.2.0"
-              sources."decompress-response-4.2.1"
-              sources."deep-extend-0.6.0"
-              sources."deep-is-0.1.3"
-              sources."deepmerge-4.2.2"
-              sources."define-properties-1.1.3"
-              (sources."define-property-2.0.2" // {
-                dependencies = [
-                  sources."is-accessor-descriptor-1.0.0"
-                  sources."is-data-descriptor-1.0.0"
-                  sources."is-descriptor-1.0.2"
-                ];
-              })
-              sources."delayed-stream-1.0.0"
-              sources."delegates-1.0.0"
-              sources."detect-libc-1.0.3"
-              sources."detect-newline-3.1.0"
-              sources."diff-sequences-26.6.2"
-              sources."dir-glob-3.0.1"
-              sources."doctrine-3.0.0"
-              (sources."domexception-2.0.1" // {
-                dependencies = [
-                  sources."webidl-conversions-5.0.0"
-                ];
-              })
-              sources."ecc-jsbn-0.1.2"
-              sources."electron-to-chromium-1.3.620"
-              sources."emittery-0.7.2"
-              sources."emoji-regex-7.0.3"
-              sources."end-of-stream-1.4.4"
-              sources."enquirer-2.3.6"
-              sources."error-ex-1.3.2"
-              sources."escalade-3.1.1"
-              sources."escape-string-regexp-1.0.5"
-              (sources."escodegen-1.14.3" // {
-                dependencies = [
-                  sources."levn-0.3.0"
-                  sources."optionator-0.8.3"
-                  sources."prelude-ls-1.1.2"
-                  sources."source-map-0.6.1"
-                  sources."type-check-0.3.2"
-                ];
-              })
-              (sources."eslint-7.15.0" // {
-                dependencies = [
-                  sources."ansi-regex-5.0.0"
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."cross-spawn-7.0.3"
-                  sources."glob-parent-5.1.1"
-                  sources."globals-12.4.0"
-                  sources."has-flag-4.0.0"
-                  sources."ignore-4.0.6"
-                  sources."path-key-3.1.1"
-                  sources."semver-7.3.4"
-                  sources."shebang-command-2.0.0"
-                  sources."shebang-regex-3.0.0"
-                  sources."strip-ansi-6.0.0"
-                  sources."strip-json-comments-3.1.1"
-                  sources."supports-color-7.2.0"
-                  sources."which-2.0.2"
-                ];
-              })
-              sources."eslint-scope-5.1.1"
-              (sources."eslint-utils-2.1.0" // {
-                dependencies = [
-                  sources."eslint-visitor-keys-1.3.0"
-                ];
-              })
-              sources."eslint-visitor-keys-2.0.0"
-              (sources."espree-7.3.1" // {
-                dependencies = [
-                  sources."eslint-visitor-keys-1.3.0"
-                ];
-              })
-              sources."esprima-4.0.1"
-              (sources."esquery-1.3.1" // {
-                dependencies = [
-                  sources."estraverse-5.2.0"
-                ];
-              })
-              (sources."esrecurse-4.3.0" // {
-                dependencies = [
-                  sources."estraverse-5.2.0"
-                ];
-              })
-              sources."estraverse-4.3.0"
-              sources."esutils-2.0.3"
-              sources."exec-sh-0.3.4"
-              sources."execa-1.0.0"
-              sources."exit-0.1.2"
-              (sources."expand-brackets-2.1.4" // {
-                dependencies = [
-                  sources."debug-2.6.9"
-                  sources."define-property-0.2.5"
-                  sources."extend-shallow-2.0.1"
-                  sources."ms-2.0.0"
-                ];
-              })
-              sources."expand-template-2.0.3"
-              (sources."expect-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                ];
-              })
-              sources."extend-3.0.2"
-              (sources."extend-shallow-3.0.2" // {
-                dependencies = [
-                  sources."is-extendable-1.0.1"
-                ];
-              })
-              (sources."extglob-2.0.4" // {
-                dependencies = [
-                  sources."define-property-1.0.0"
-                  sources."extend-shallow-2.0.1"
-                  sources."is-accessor-descriptor-1.0.0"
-                  sources."is-data-descriptor-1.0.0"
-                  sources."is-descriptor-1.0.2"
-                ];
-              })
-              sources."extsprintf-1.3.0"
-              sources."fast-deep-equal-3.1.3"
-              (sources."fast-glob-3.2.4" // {
-                dependencies = [
-                  sources."braces-3.0.2"
-                  sources."fill-range-7.0.1"
-                  sources."glob-parent-5.1.1"
-                  sources."is-number-7.0.0"
-                  sources."micromatch-4.0.2"
-                  sources."to-regex-range-5.0.1"
-                ];
-              })
-              sources."fast-json-stable-stringify-2.1.0"
-              sources."fast-levenshtein-2.0.6"
-              sources."fastq-1.9.0"
-              sources."fb-watchman-2.0.1"
-              sources."file-entry-cache-6.0.0"
-              sources."file-uri-to-path-1.0.0"
-              (sources."fill-range-4.0.0" // {
-                dependencies = [
-                  sources."extend-shallow-2.0.1"
-                ];
-              })
-              sources."find-up-4.1.0"
-              sources."flat-cache-3.0.4"
-              sources."flatted-3.1.0"
-              sources."for-in-1.0.2"
-              sources."forever-agent-0.6.1"
-              sources."form-data-2.3.3"
-              sources."fragment-cache-0.2.1"
-              sources."fs-constants-1.0.0"
-              sources."fs-extra-9.0.1"
-              sources."fs-readdir-recursive-1.1.0"
-              sources."fs.realpath-1.0.0"
-              sources."fsevents-2.1.3"
-              sources."function-bind-1.1.1"
-              sources."functional-red-black-tree-1.0.1"
-              sources."gauge-2.7.4"
-              sources."gensync-1.0.0-beta.2"
-              sources."get-caller-file-2.0.5"
-              sources."get-intrinsic-1.0.1"
-              sources."get-package-type-0.1.0"
-              sources."get-stream-4.1.0"
-              sources."get-value-2.0.6"
-              sources."getpass-0.1.7"
-              sources."github-from-package-0.0.0"
-              sources."glob-7.1.6"
-              (sources."glob-parent-3.1.0" // {
-                dependencies = [
-                  sources."is-glob-3.1.0"
-                ];
-              })
-              sources."globals-11.12.0"
-              (sources."globby-11.0.1" // {
-                dependencies = [
-                  sources."slash-3.0.0"
-                ];
-              })
-              sources."graceful-fs-4.2.4"
-              sources."growly-1.3.0"
-              (sources."handlebars-4.7.6" // {
-                dependencies = [
-                  sources."source-map-0.6.1"
-                ];
-              })
-              sources."har-schema-2.0.0"
-              sources."har-validator-5.1.5"
-              sources."has-1.0.3"
-              sources."has-flag-3.0.0"
-              sources."has-symbols-1.0.1"
-              sources."has-unicode-2.0.1"
-              sources."has-value-1.0.0"
-              (sources."has-values-1.0.0" // {
-                dependencies = [
-                  sources."kind-of-4.0.0"
-                ];
-              })
-              sources."hosted-git-info-2.8.8"
-              sources."html-encoding-sniffer-2.0.1"
-              sources."html-escaper-2.0.2"
-              sources."http-signature-1.2.0"
-              sources."human-signals-1.1.1"
-              sources."iconv-lite-0.4.24"
-              sources."ieee754-1.2.1"
-              sources."ignore-5.1.8"
-              (sources."import-fresh-3.2.2" // {
-                dependencies = [
-                  sources."resolve-from-4.0.0"
-                ];
-              })
-              sources."import-local-3.0.2"
-              sources."imurmurhash-0.1.4"
-              sources."inflight-1.0.6"
-              sources."inherits-2.0.4"
-              sources."ini-1.3.6"
-              sources."interpret-1.4.0"
-              sources."ip-regex-2.1.0"
-              (sources."is-accessor-descriptor-0.1.6" // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              })
-              sources."is-arrayish-0.2.1"
-              sources."is-binary-path-1.0.1"
-              sources."is-buffer-1.1.6"
-              sources."is-ci-2.0.0"
-              sources."is-core-module-2.2.0"
-              (sources."is-data-descriptor-0.1.4" // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              })
-              (sources."is-descriptor-0.1.6" // {
-                dependencies = [
-                  sources."kind-of-5.1.0"
-                ];
-              })
-              sources."is-docker-2.1.1"
-              sources."is-extendable-0.1.1"
-              sources."is-extglob-2.1.1"
-              sources."is-fullwidth-code-point-1.0.0"
-              sources."is-generator-fn-2.1.0"
-              sources."is-glob-4.0.1"
-              (sources."is-number-3.0.0" // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              })
-              sources."is-plain-object-2.0.4"
-              sources."is-potential-custom-element-name-1.0.0"
-              sources."is-stream-1.1.0"
-              sources."is-typedarray-1.0.0"
-              sources."is-windows-1.0.2"
-              sources."is-wsl-2.2.0"
-              sources."isarray-1.0.0"
-              sources."isexe-2.0.0"
-              sources."isobject-3.0.1"
-              sources."isstream-0.1.2"
-              sources."istanbul-lib-coverage-3.0.0"
-              (sources."istanbul-lib-instrument-4.0.3" // {
-                dependencies = [
-                  sources."semver-6.3.0"
-                ];
-              })
-              (sources."istanbul-lib-report-3.0.0" // {
-                dependencies = [
-                  sources."has-flag-4.0.0"
-                  sources."make-dir-3.1.0"
-                  sources."semver-6.3.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."istanbul-lib-source-maps-4.0.0" // {
-                dependencies = [
-                  sources."source-map-0.6.1"
-                ];
-              })
-              sources."istanbul-reports-3.0.2"
-              (sources."jest-26.6.3" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."jest-cli-26.6.3"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."jest-changed-files-26.6.2" // {
-                dependencies = [
-                  sources."cross-spawn-7.0.3"
-                  sources."execa-4.1.0"
-                  sources."get-stream-5.2.0"
-                  sources."is-stream-2.0.0"
-                  sources."npm-run-path-4.0.1"
-                  sources."path-key-3.1.1"
-                  sources."shebang-command-2.0.0"
-                  sources."shebang-regex-3.0.0"
-                  sources."which-2.0.2"
-                ];
-              })
-              (sources."jest-config-26.6.3" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."braces-3.0.2"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."fill-range-7.0.1"
-                  sources."has-flag-4.0.0"
-                  sources."is-number-7.0.0"
-                  sources."micromatch-4.0.2"
-                  sources."supports-color-7.2.0"
-                  sources."to-regex-range-5.0.1"
-                ];
-              })
-              (sources."jest-diff-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."jest-docblock-26.0.0"
-              (sources."jest-each-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."jest-environment-jsdom-26.6.2"
-              sources."jest-environment-node-26.6.2"
-              sources."jest-get-type-26.3.0"
-              (sources."jest-haste-map-26.6.2" // {
-                dependencies = [
-                  sources."anymatch-3.1.1"
-                  sources."braces-3.0.2"
-                  sources."fill-range-7.0.1"
-                  sources."is-number-7.0.0"
-                  sources."micromatch-4.0.2"
-                  sources."to-regex-range-5.0.1"
-                ];
-              })
-              (sources."jest-jasmine2-26.6.3" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."jest-leak-detector-26.6.2"
-              (sources."jest-matcher-utils-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."jest-message-util-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."braces-3.0.2"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."fill-range-7.0.1"
-                  sources."has-flag-4.0.0"
-                  sources."is-number-7.0.0"
-                  sources."micromatch-4.0.2"
-                  sources."slash-3.0.0"
-                  sources."supports-color-7.2.0"
-                  sources."to-regex-range-5.0.1"
-                ];
-              })
-              sources."jest-mock-26.6.2"
-              sources."jest-pnp-resolver-1.2.2"
-              sources."jest-regex-util-26.0.0"
-              (sources."jest-resolve-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."slash-3.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."jest-resolve-dependencies-26.6.3"
-              (sources."jest-runner-26.6.3" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."jest-runtime-26.6.3" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."slash-3.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."jest-serializer-26.6.2"
-              (sources."jest-snapshot-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."semver-7.3.4"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."jest-util-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."braces-3.0.2"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."fill-range-7.0.1"
-                  sources."has-flag-4.0.0"
-                  sources."is-number-7.0.0"
-                  sources."micromatch-4.0.2"
-                  sources."supports-color-7.2.0"
-                  sources."to-regex-range-5.0.1"
-                ];
-              })
-              (sources."jest-validate-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."camelcase-6.2.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."jest-watcher-26.6.2" // {
-                dependencies = [
-                  sources."ansi-styles-4.3.0"
-                  sources."chalk-4.1.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              (sources."jest-worker-26.6.2" // {
-                dependencies = [
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."js-tokens-4.0.0"
-              sources."js-yaml-3.14.1"
-              sources."jsbn-0.1.1"
-              sources."jsdom-16.4.0"
-              sources."jsesc-2.5.2"
-              sources."json-parse-even-better-errors-2.3.1"
-              sources."json-schema-0.2.3"
-              sources."json-schema-traverse-0.4.1"
-              sources."json-stable-stringify-without-jsonify-1.0.1"
-              sources."json-stringify-safe-5.0.1"
-              sources."json5-2.1.3"
-              (sources."jsonfile-6.1.0" // {
-                dependencies = [
-                  sources."universalify-2.0.0"
-                ];
-              })
-              sources."jsprim-1.4.1"
-              sources."kind-of-6.0.3"
-              sources."kleur-3.0.3"
-              sources."leven-3.1.0"
-              sources."levn-0.4.1"
-              sources."lines-and-columns-1.1.6"
-              sources."locate-path-5.0.0"
-              sources."lodash-4.17.20"
-              sources."lodash.sortby-4.7.0"
-              sources."lru-cache-6.0.0"
-              sources."lunr-2.3.9"
-              sources."make-dir-2.1.0"
-              sources."makeerror-1.0.11"
-              sources."map-cache-0.2.2"
-              sources."map-visit-1.0.0"
-              sources."marked-1.2.5"
-              sources."merge-stream-2.0.0"
-              sources."merge2-1.4.1"
-              sources."micromatch-3.1.10"
-              sources."mime-db-1.44.0"
-              sources."mime-types-2.1.27"
-              sources."mimic-fn-2.1.0"
-              sources."mimic-response-2.1.0"
-              sources."minimatch-3.0.4"
-              sources."minimist-1.2.5"
-              sources."mixin-deep-2.0.1"
-              sources."mkdirp-classic-0.5.3"
-              sources."ms-2.1.2"
-              sources."nan-2.14.2"
-              sources."nanomatch-1.2.13"
-              sources."napi-build-utils-1.0.2"
-              sources."natural-compare-1.4.0"
-              sources."neo-async-2.6.2"
-              sources."nice-try-1.0.5"
-              sources."node-abi-2.19.3"
-              sources."node-int64-0.4.0"
-              sources."node-modules-regexp-1.0.0"
-              (sources."node-notifier-8.0.0" // {
-                dependencies = [
-                  sources."semver-7.3.4"
-                  sources."which-2.0.2"
-                ];
-              })
-              sources."node-releases-1.1.67"
-              sources."noop-logger-0.1.1"
-              sources."normalize-package-data-2.5.0"
-              sources."normalize-path-3.0.0"
-              sources."npm-run-path-2.0.2"
-              sources."npmlog-4.1.2"
-              sources."number-is-nan-1.0.1"
-              sources."nwsapi-2.2.0"
-              sources."oauth-sign-0.9.0"
-              sources."object-assign-4.1.1"
-              (sources."object-copy-0.1.0" // {
-                dependencies = [
-                  sources."define-property-0.2.5"
-                  sources."kind-of-3.2.2"
-                ];
-              })
-              sources."object-keys-1.1.1"
-              sources."object-visit-1.0.1"
-              sources."object.assign-4.1.2"
-              sources."object.pick-1.3.0"
-              sources."once-1.4.0"
-              sources."onetime-5.1.2"
-              (sources."onigasm-2.2.5" // {
-                dependencies = [
-                  sources."lru-cache-5.1.1"
-                  sources."yallist-3.1.1"
-                ];
-              })
-              sources."optionator-0.9.1"
-              sources."p-each-series-2.2.0"
-              sources."p-finally-1.0.0"
-              sources."p-limit-2.3.0"
-              sources."p-locate-4.1.0"
-              sources."p-try-2.2.0"
-              sources."parent-module-1.0.1"
-              sources."parse-json-5.1.0"
-              sources."parse5-5.1.1"
-              sources."pascalcase-0.1.1"
-              sources."path-dirname-1.0.2"
-              sources."path-exists-4.0.0"
-              sources."path-is-absolute-1.0.1"
-              sources."path-key-2.0.1"
-              sources."path-parse-1.0.6"
-              sources."path-type-4.0.0"
-              sources."performance-now-2.1.0"
-              sources."picomatch-2.2.2"
-              sources."pify-4.0.1"
-              sources."pirates-4.0.1"
-              sources."pkg-dir-4.2.0"
-              sources."posix-character-classes-0.1.1"
-              sources."prebuild-install-6.0.0"
-              sources."prelude-ls-1.2.1"
-              (sources."pretty-format-26.6.2" // {
-                dependencies = [
-                  sources."ansi-regex-5.0.0"
-                  sources."ansi-styles-4.3.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                ];
-              })
-              sources."process-nextick-args-2.0.1"
-              sources."progress-2.0.3"
-              sources."prompts-2.4.0"
-              sources."psl-1.8.0"
-              sources."pump-3.0.0"
-              sources."punycode-2.1.1"
-              sources."qs-6.5.2"
-              sources."rc-1.2.8"
-              sources."react-is-17.0.1"
-              (sources."read-pkg-5.2.0" // {
-                dependencies = [
-                  sources."type-fest-0.6.0"
-                ];
-              })
-              sources."read-pkg-up-7.0.1"
-              sources."readable-stream-2.3.7"
-              sources."readdirp-2.2.1"
-              sources."rechoir-0.6.2"
-              sources."regenerate-1.4.2"
-              sources."regenerate-unicode-properties-8.2.0"
-              sources."regenerator-runtime-0.13.7"
-              sources."regenerator-transform-0.14.5"
-              sources."regex-not-1.0.2"
-              sources."regexpp-3.1.0"
-              sources."regexpu-core-4.7.1"
-              sources."regjsgen-0.5.2"
-              (sources."regjsparser-0.6.4" // {
-                dependencies = [
-                  sources."jsesc-0.5.0"
-                ];
-              })
-              sources."remove-trailing-separator-1.1.0"
-              sources."repeat-element-1.1.3"
-              sources."repeat-string-1.6.1"
-              (sources."request-2.88.2" // {
-                dependencies = [
-                  sources."tough-cookie-2.5.0"
-                  sources."uuid-3.4.0"
-                ];
-              })
-              sources."request-promise-core-1.1.4"
-              (sources."request-promise-native-1.0.9" // {
-                dependencies = [
-                  sources."tough-cookie-2.5.0"
-                ];
-              })
-              sources."require-directory-2.1.1"
-              sources."require-main-filename-2.0.0"
-              sources."resolve-1.19.0"
-              sources."resolve-cwd-3.0.0"
-              sources."resolve-from-5.0.0"
-              sources."resolve-url-0.2.1"
-              sources."ret-0.1.15"
-              sources."reusify-1.0.4"
-              sources."rimraf-3.0.2"
-              sources."rsvp-4.8.5"
-              sources."run-parallel-1.1.10"
-              sources."safe-buffer-5.1.2"
-              sources."safe-regex-1.1.0"
-              sources."safer-buffer-2.1.2"
-              sources."sane-4.1.0"
-              sources."saxes-5.0.1"
-              sources."semver-5.7.1"
-              sources."serialport-9.0.3"
-              sources."set-blocking-2.0.0"
-              (sources."set-value-2.0.1" // {
-                dependencies = [
-                  sources."extend-shallow-2.0.1"
-                ];
-              })
-              sources."shebang-command-1.2.0"
-              sources."shebang-regex-1.0.0"
-              sources."shelljs-0.8.4"
-              sources."shellwords-0.1.1"
-              sources."shiki-0.2.7"
-              sources."shiki-languages-0.2.7"
-              sources."shiki-themes-0.2.7"
-              sources."signal-exit-3.0.3"
-              sources."simple-concat-1.0.1"
-              sources."simple-get-3.1.0"
-              sources."sisteransi-1.0.5"
-              sources."slash-2.0.0"
-              (sources."slice-ansi-2.1.0" // {
-                dependencies = [
-                  sources."is-fullwidth-code-point-2.0.0"
-                ];
-              })
-              sources."slip-1.0.2"
-              (sources."snapdragon-0.8.2" // {
-                dependencies = [
-                  sources."debug-2.6.9"
-                  sources."define-property-0.2.5"
-                  sources."extend-shallow-2.0.1"
-                  sources."ms-2.0.0"
-                ];
-              })
-              (sources."snapdragon-node-2.1.1" // {
-                dependencies = [
-                  sources."define-property-1.0.0"
-                  sources."is-accessor-descriptor-1.0.0"
-                  sources."is-data-descriptor-1.0.0"
-                  sources."is-descriptor-1.0.2"
-                ];
-              })
-              (sources."snapdragon-util-3.0.1" // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              })
-              sources."source-map-0.5.7"
-              sources."source-map-resolve-0.5.3"
-              (sources."source-map-support-0.5.19" // {
-                dependencies = [
-                  sources."source-map-0.6.1"
-                ];
-              })
-              sources."source-map-url-0.4.0"
-              sources."spdx-correct-3.1.1"
-              sources."spdx-exceptions-2.3.0"
-              sources."spdx-expression-parse-3.0.1"
-              sources."spdx-license-ids-3.0.7"
-              sources."split-string-3.1.0"
-              sources."sprintf-js-1.0.3"
-              sources."sshpk-1.16.1"
-              (sources."stack-utils-2.0.3" // {
-                dependencies = [
-                  sources."escape-string-regexp-2.0.0"
-                ];
-              })
-              (sources."static-extend-0.1.2" // {
-                dependencies = [
-                  sources."define-property-0.2.5"
-                ];
-              })
-              sources."stealthy-require-1.1.1"
-              (sources."string-length-4.0.1" // {
-                dependencies = [
-                  sources."ansi-regex-5.0.0"
-                  sources."strip-ansi-6.0.0"
-                ];
-              })
-              sources."string-width-1.0.2"
-              sources."string_decoder-1.1.1"
-              sources."strip-ansi-3.0.1"
-              sources."strip-bom-4.0.0"
-              sources."strip-eof-1.0.0"
-              sources."strip-final-newline-2.0.0"
-              sources."strip-json-comments-2.0.1"
-              sources."supports-color-5.5.0"
-              (sources."supports-hyperlinks-2.1.0" // {
-                dependencies = [
-                  sources."has-flag-4.0.0"
-                  sources."supports-color-7.2.0"
-                ];
-              })
-              sources."symbol-tree-3.2.4"
-              (sources."table-5.4.6" // {
-                dependencies = [
-                  sources."ansi-regex-4.1.0"
-                  sources."is-fullwidth-code-point-2.0.0"
-                  sources."string-width-3.1.0"
-                  sources."strip-ansi-5.2.0"
-                ];
-              })
-              sources."tar-fs-2.1.1"
-              (sources."tar-stream-2.1.4" // {
-                dependencies = [
-                  sources."readable-stream-3.6.0"
-                ];
-              })
-              sources."terminal-link-2.1.1"
-              sources."test-exclude-6.0.0"
-              sources."text-table-0.2.0"
-              sources."throat-5.0.0"
-              sources."tmpl-1.0.4"
-              sources."to-fast-properties-2.0.0"
-              (sources."to-object-path-0.3.0" // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              })
-              sources."to-regex-3.0.2"
-              sources."to-regex-range-2.1.1"
-              sources."tough-cookie-3.0.1"
-              sources."tr46-2.0.2"
-              sources."tslib-1.14.1"
-              sources."tsutils-3.17.1"
-              sources."tunnel-agent-0.6.0"
-              sources."tweetnacl-0.14.5"
-              sources."type-check-0.4.0"
-              sources."type-detect-4.0.8"
-              sources."type-fest-0.8.1"
-              sources."typedarray-to-buffer-3.1.5"
-              sources."typedoc-0.20.0-beta.27"
-              sources."typedoc-default-themes-0.12.0-beta.10"
-              sources."typedoc-plugin-markdown-3.1.0"
-              sources."typedoc-plugin-no-inherit-1.2.0"
-              sources."typedoc-plugin-sourcefile-url-1.0.6"
-              sources."typescript-4.1.2"
-              sources."uglify-js-3.12.1"
-              sources."unicode-canonical-property-names-ecmascript-1.0.4"
-              sources."unicode-match-property-ecmascript-1.0.4"
-              sources."unicode-match-property-value-ecmascript-1.2.0"
-              sources."unicode-property-aliases-ecmascript-1.1.0"
-              sources."union-value-1.0.1"
-              sources."universalify-1.0.0"
-              (sources."unset-value-1.0.0" // {
-                dependencies = [
-                  (sources."has-value-0.3.1" // {
-                    dependencies = [
-                      sources."isobject-2.1.0"
-                    ];
-                  })
-                  sources."has-values-0.1.4"
-                ];
-              })
-              sources."upath-1.2.0"
-              sources."uri-js-4.4.0"
-              sources."urix-0.1.0"
-              sources."use-3.1.1"
-              sources."util-deprecate-1.0.2"
-              sources."uuid-8.3.2"
-              sources."v8-compile-cache-2.2.0"
-              (sources."v8-to-istanbul-7.0.0" // {
-                dependencies = [
-                  sources."source-map-0.7.3"
-                ];
-              })
-              sources."validate-npm-package-license-3.0.4"
-              sources."verror-1.10.0"
-              sources."vscode-textmate-5.2.0"
-              sources."w3c-hr-time-1.0.2"
-              sources."w3c-xmlserializer-2.0.0"
-              sources."walker-1.0.7"
-              sources."webidl-conversions-6.1.0"
-              sources."whatwg-encoding-1.0.5"
-              sources."whatwg-mimetype-2.3.0"
-              sources."whatwg-url-8.4.0"
-              sources."which-1.3.1"
-              sources."which-module-2.0.0"
-              sources."which-pm-runs-1.0.0"
-              sources."wide-align-1.1.3"
-              sources."word-wrap-1.2.3"
-              sources."wordwrap-1.0.0"
-              (sources."wrap-ansi-6.2.0" // {
-                dependencies = [
-                  sources."ansi-regex-5.0.0"
-                  sources."ansi-styles-4.3.0"
-                  sources."color-convert-2.0.1"
-                  sources."color-name-1.1.4"
-                  sources."emoji-regex-8.0.0"
-                  sources."is-fullwidth-code-point-3.0.0"
-                  sources."string-width-4.2.0"
-                  sources."strip-ansi-6.0.0"
-                ];
-              })
-              sources."wrappy-1.0.2"
-              sources."write-file-atomic-3.0.3"
-              sources."ws-7.4.1"
-              sources."xml-name-validator-3.0.0"
-              sources."xmlchars-2.2.0"
-              sources."y18n-4.0.1"
-              sources."yallist-4.0.0"
-              (sources."yargs-15.4.1" // {
-                dependencies = [
-                  sources."ansi-regex-5.0.0"
-                  sources."emoji-regex-8.0.0"
-                  sources."is-fullwidth-code-point-3.0.0"
-                  sources."string-width-4.2.0"
-                  sources."strip-ansi-6.0.0"
-                ];
-              })
-              sources."yargs-parser-18.1.3"
+              sources."emoji-regex-8.0.0"
+              sources."is-fullwidth-code-point-3.0.0"
+              sources."string-width-4.2.0"
             ];
           })
+          sources."yargs-parser-18.1.3"
         ];
       })
-      sources."zigbee2mqtt-frontend-0.2.129"
+      sources."zigbee2mqtt-frontend-0.2.100"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Zigbee to MQTT bridge using Zigbee-herdsman";
-      homepage = "https://koenkk.github.io/zigbee2mqtt";
+      homepage = https://koenkk.github.io/zigbee2mqtt;
       license = "GPL-3.0";
     };
     production = true;
@@ -11679,16 +10090,4 @@ in
   tarball = nodeEnv.buildNodeSourceDist args;
   package = nodeEnv.buildNodePackage args;
   shell = nodeEnv.buildNodeShell args;
-  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
-    src = stdenv.mkDerivation {
-      name = args.name + "-package-json";
-      src = nix-gitignore.gitignoreSourcePure [
-        "*"
-        "!package.json"
-        "!package-lock.json"
-      ] args.src;
-      dontBuild = true;
-      installPhase = "mkdir -p $out; cp -r ./* $out;";
-    };
-  });
 }
diff --git a/pkgs/servers/zigbee2mqtt/node.nix b/pkgs/servers/zigbee2mqtt/node.nix
index 171f9e0c8d4..2d0fadffa97 100644
--- a/pkgs/servers/zigbee2mqtt/node.nix
+++ b/pkgs/servers/zigbee2mqtt/node.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/graphics/ldgallery/viewer/generate.sh b/pkgs/tools/graphics/ldgallery/viewer/generate.sh
index f115fb11d9b..0874051b676 100755
--- a/pkgs/tools/graphics/ldgallery/viewer/generate.sh
+++ b/pkgs/tools/graphics/ldgallery/viewer/generate.sh
@@ -24,7 +24,11 @@ node2nix \
   --input ./package.json \
   --lock ./package-lock.json \
   --output node-packages.nix \
-  --composition node-composition.nix \
-  --no-copy-node-env
+  --composition node-composition.nix
 
 rm package.json package-lock.json
+
+# Temporary quickfix to accomodate for the util-linux package rename.
+# See https://github.com/svanderburg/node2nix/issues/213
+git restore :/pkgs/development/node-packages/node-env.nix
+sed -i 's/utillinux/util-linux/g' node-composition.nix
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
index aaf54a05c88..55566aafc58 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
index ce00bdfd097..9946ce0e63c 100644
--- a/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
+++ b/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -13252,7 +13252,7 @@ let
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      homepage = "https://ldgallery.pacien.org/";
+      homepage = https://ldgallery.pacien.org/;
       license = "AGPL-3";
     };
     production = false;
@@ -13266,16 +13266,4 @@ in
   tarball = nodeEnv.buildNodeSourceDist args;
   package = nodeEnv.buildNodePackage args;
   shell = nodeEnv.buildNodeShell args;
-  nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
-    src = stdenv.mkDerivation {
-      name = args.name + "-package-json";
-      src = nix-gitignore.gitignoreSourcePure [
-        "*"
-        "!package.json"
-        "!package-lock.json"
-      ] args.src;
-      dontBuild = true;
-      installPhase = "mkdir -p $out; cp -r ./* $out;";
-    };
-  });
 }
diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix
index b43d2938009..66e70162675 100644
--- a/pkgs/tools/networking/airfield/node-packages.nix
+++ b/pkgs/tools/networking/airfield/node-packages.nix
@@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "ajv-6.12.6" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.6";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
-        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g";
       };
     };
     "asn1-0.2.4" = {
@@ -19,7 +19,7 @@ let
       version = "0.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
-        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
+        sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g";
       };
     };
     "assert-plus-1.0.0" = {
@@ -49,13 +49,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.11.0" = {
+    "aws4-1.9.1" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.11.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
-        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0";
       };
     };
     "bcrypt-pbkdf-1.0.2" = {
@@ -100,7 +100,7 @@ let
       version = "1.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
-        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
+        sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm";
       };
     };
     "commander-0.6.1" = {
@@ -166,13 +166,13 @@ let
         sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
-    "debug-4.3.2" = {
+    "debug-4.1.1" = {
       name = "debug";
       packageName = "debug";
-      version = "4.3.2";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
+        sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -184,13 +184,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "denque-1.5.0" = {
+    "denque-1.4.1" = {
       name = "denque";
       packageName = "denque";
-      version = "1.5.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz";
-        sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==";
+        url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
+        sha512 = "2spb0s12jkarfiydj4sj4iw1yfjzaplakzw7bma0pwnbra23l1b85rsyzc25szlfdl3bm5bb42fmy4xhf1xdpxaywmwh6aa4swwzz1r";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -208,7 +208,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
-        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+        sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
       };
     };
     "extsprintf-1.3.0" = {
@@ -220,13 +220,13 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-3.1.3" = {
+    "fast-deep-equal-3.1.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "3.1.3";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
-        sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi";
       };
     };
     "fast-json-stable-stringify-2.1.0" = {
@@ -235,7 +235,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
-        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
+        sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn";
       };
     };
     "forever-agent-0.6.1" = {
@@ -253,7 +253,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
-        sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
+        sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn";
       };
     };
     "formidable-1.0.11" = {
@@ -292,13 +292,13 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-5.1.5" = {
+    "har-validator-5.1.3" = {
       name = "har-validator";
       packageName = "har-validator";
-      version = "5.1.5";
+      version = "5.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz";
-        sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
+        sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh";
       };
     };
     "http-signature-1.2.0" = {
@@ -352,7 +352,7 @@ let
       version = "0.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
-        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+        sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5";
       };
     };
     "json-stringify-safe-5.0.1" = {
@@ -391,22 +391,22 @@ let
         sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
       };
     };
-    "mime-db-1.45.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.45.0";
+      version = "1.43.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
-        sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv";
       };
     };
-    "mime-types-2.1.28" = {
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.28";
+      version = "2.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
-        sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk";
       };
     };
     "mkdirp-0.3.3" = {
@@ -424,7 +424,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+        sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -433,7 +433,7 @@ let
       version = "0.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
-        sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
+        sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x";
       };
     };
     "pause-0.0.1" = {
@@ -454,13 +454,13 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "psl-1.8.0" = {
+    "psl-1.7.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.8.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
-        sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
+        sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4";
       };
     };
     "punycode-2.1.1" = {
@@ -469,7 +469,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+        sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx";
       };
     };
     "qs-0.5.1" = {
@@ -487,7 +487,7 @@ let
       version = "6.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
-        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
+        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
       };
     };
     "range-parser-0.0.4" = {
@@ -499,13 +499,13 @@ let
         sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
       };
     };
-    "redis-commands-1.6.0" = {
+    "redis-commands-1.5.0" = {
       name = "redis-commands";
       packageName = "redis-commands";
-      version = "1.6.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz";
-        sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ==";
+        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz";
+        sha512 = "0kdmbh04hif6g8qr3zcwjkjg1v3rjgss0dq3sy144l5ja5vp4ndb5hdn2acrx57w01swbwpkskmy788lr2nxdq0g46azqsrmad5mb78";
       };
     };
     "redis-errors-1.2.0" = {
@@ -526,13 +526,13 @@ let
         sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4";
       };
     };
-    "safe-buffer-5.2.1" = {
+    "safe-buffer-5.2.0" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.2.1";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
-        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
+        sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -541,7 +541,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
       };
     };
     "send-0.1.0" = {
@@ -559,7 +559,7 @@ let
       version = "1.16.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
-        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
+        sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x";
       };
     };
     "tough-cookie-2.5.0" = {
@@ -568,7 +568,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
-        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
+        sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -589,22 +589,22 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "underscore-1.12.0" = {
+    "underscore-1.9.2" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.12.0";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
-        sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
+        sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg";
       };
     };
-    "uri-js-4.4.1" = {
+    "uri-js-4.2.2" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.4.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
-        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+        sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9";
       };
     };
     "uuid-3.4.0" = {
@@ -613,7 +613,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
-        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
+        sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
       };
     };
     "verror-1.10.0" = {
@@ -644,7 +644,7 @@ in
       sources."cookie-0.0.5"
       sources."cookie-signature-0.0.1"
       sources."crc-0.2.0"
-      sources."debug-4.3.2"
+      sources."debug-4.1.1"
       sources."formidable-1.0.11"
       sources."fresh-0.1.0"
       sources."methods-0.0.1"
@@ -673,7 +673,7 @@ in
       sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
     };
     dependencies = [
-      sources."underscore-1.12.0"
+      sources."underscore-1.9.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -706,11 +706,11 @@ in
     version = "3.0.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/redis/-/redis-3.0.2.tgz";
-      sha512 = "PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==";
+      sha512 = "26lf40x7al63vywd96j6idqbn8fagv4jp6ar9cc80aili5d59sy14hvb3haw8xhjqxc3481dkmbvza8x3p1dcn3p2az5snlp054pn1w";
     };
     dependencies = [
-      sources."denque-1.5.0"
-      sources."redis-commands-1.6.0"
+      sources."denque-1.4.1"
+      sources."redis-commands-1.5.0"
       sources."redis-errors-1.2.0"
       sources."redis-parser-3.0.0"
     ];
@@ -727,10 +727,10 @@ in
   connect-redis = nodeEnv.buildNodePackage {
     name = "connect-redis";
     packageName = "connect-redis";
-    version = "5.0.0";
+    version = "4.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-5.0.0.tgz";
-      sha512 = "R4nTW5uXeG5s6zr/q4abmtcdloglZrL/A3cpa0JU0RLFJU4mTR553HUY8OZ0ngeySkGDclwQ5xmCcjjKkxdOSg==";
+      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.4.tgz";
+      sha512 = "014p1jjd7bzdsd81v0918ac5j4k1qs4qi2nzzndyn50rznd04hx85l23jpicznwc2j3nkz5bj15zbi98ld3akxb5rwl46r5sdp3nyb9";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -748,7 +748,7 @@ in
     version = "3.2.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz";
-      sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==";
+      sha512 = "1kwiqca4ql149ywfzbp1lpmqixnh1y9i5aizcd0fvndrq9sn31j0cr38wdgbr5xqvlxgjfs3jwryg7ddnwc8n1b5nlksfjmj48sc7ad";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -766,15 +766,15 @@ in
     version = "2.88.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
-      sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
+      sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj";
     };
     dependencies = [
-      sources."ajv-6.12.6"
+      sources."ajv-6.12.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.11.0"
+      sources."aws4-1.9.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.8"
@@ -784,13 +784,13 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
+      sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."getpass-0.1.7"
       sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
+      sources."har-validator-5.1.3"
       sources."http-signature-1.2.0"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
@@ -799,20 +799,20 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
-      sources."mime-db-1.45.0"
-      sources."mime-types-2.1.28"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."oauth-sign-0.9.0"
       sources."performance-now-2.1.0"
-      sources."psl-1.8.0"
+      sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."safe-buffer-5.2.1"
+      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sshpk-1.16.1"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uri-js-4.4.1"
+      sources."uri-js-4.2.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
     ];
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 0bcd0eb4b85..6f3f95714a2 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index 0bcd0eb4b85..6f3f95714a2 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
 }
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index 0b6857cf716..b5b42e9164a 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/pkgs/tools/package-management/nixui/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -49,15 +49,6 @@ let
         sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593";
       };
     };
-    "underscore-1.12.0" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
-        sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
-      };
-    };
     "underscore-1.4.4" = {
       name = "underscore";
       packageName = "underscore";
@@ -67,6 +58,15 @@ let
         sha1 = "61a6a32010622afa07963bf325203cf12239d604";
       };
     };
+    "underscore-1.9.2" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
+        sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg";
+      };
+    };
   };
 in
 {
@@ -93,7 +93,7 @@ in
           sources."underscore-1.4.4"
         ];
       })
-      sources."underscore-1.12.0"
+      sources."underscore-1.9.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {

From 7bf79f3792894d8f3501ebeea337554b1e861219 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Mon, 25 Jan 2021 11:54:30 +0100
Subject: [PATCH 891/956] spglib: init at 1.16.0

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

diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix
new file mode 100644
index 00000000000..f4667acd579
--- /dev/null
+++ b/pkgs/development/libraries/spglib/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, cmake } :
+
+stdenv.mkDerivation rec {
+  pname = "spglib";
+  version = "1.16.0";
+
+  src = fetchFromGitHub {
+    owner = "atztogo";
+    repo = "spglib";
+    rev = "v${version}";
+    sha256 = "1kzc956m1pnazhz52vspqridlw72wd8x5l3dsilpdxl491aa2nws";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  checkTarget = "check";
+  doCheck = true;
+
+  meta = with lib; {
+    description = "C library for finding and handling crystal symmetries";
+    homepage = "https://atztogo.github.io/spglib/";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 156d0c8afd9..3552909ebf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7854,6 +7854,8 @@ in
 
   soapui = callPackage ../applications/networking/soapui { };
 
+  spglib = callPackage ../development/libraries/spglib { };
+
   ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { };
 
   sshguard = callPackage ../tools/security/sshguard {};

From 13e91f4a198139b1208e2293fd348954f0fd07e6 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Mon, 25 Jan 2021 11:06:09 +0000
Subject: [PATCH 892/956] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 110 ++++++++++++++--------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 192a1b92f71..0dfd5a40c97 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "471e20ed2bfb373068ccd54db5603bd3f4dcbae0";
-      sha256 = "0gzl8vbbqpjr1pw328p2lq7xsp85wrg0sfa1hsj62vay4gw3m84q";
+      rev = "3a1728297a915b6e41c6339d571e85bc3756e5ff";
+      sha256 = "0zhpw9x97z430r9g73rchagznsxf1landlql42gzha64wsk5ihiw";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -365,24 +365,24 @@ let
 
   caw-vim = buildVimPluginFrom2Nix {
     pname = "caw-vim";
-    version = "2020-12-01";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "27be5a97a3971f185a23cfbea91d1651cbb4f388";
-      sha256 = "0aahsx4i1c5025didi9ajqdwbx534lpafcsdd2169zhqxgzqlhds";
+      rev = "26b91ddfcebaee954a3cd2aec1769a5b16779bdd";
+      sha256 = "0yiic0a1l9ggwh3f5y150j74hxj7v783j4y3wnn5j1n7ljvqvhqc";
     };
     meta.homepage = "https://github.com/tyru/caw.vim/";
   };
 
   chadtree = buildVimPluginFrom2Nix {
     pname = "chadtree";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "64e54cc9f39dc2084555522bec017cc35ccb8d9d";
-      sha256 = "04fm2m2iiclbcijdmqa20a72af2vizx6bid8q348bsw2ppdh3r1a";
+      rev = "0dad2908db0139de301035315c812b3fc2ccbd6e";
+      sha256 = "175glq9iphr1xplqfcralp8xqn9i3d931s4z0mw3frhvfnrj6vi0";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -473,12 +473,12 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "9b0687cdbe4b64c790f6022c605f1078430916d9";
-      sha256 = "0n74sab6i8bq21zjrdd3vcv97bra9dg06dn6zpdc81n7pi13z6a5";
+      rev = "07b73e6e40951f4cecfc067dbf59dc9f34203802";
+      sha256 = "0c1wl6n89f2cxchjakcipx7sajbsr5ab1zbsjabhpnlpp9sn65jc";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -533,12 +533,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2021-01-18";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "a9b682ad79cc4b7b836fc7e31f7d01ecd88d7c51";
-      sha256 = "1gpz1d6cy4pmaqzgp5bq8dndpzq9qiwq0794vgi58hnk65sbjai9";
+      rev = "35935515f6cae76db5f5ab339bd0055291bf6453";
+      sha256 = "1gkd37xjsv9msqs579f9fjqwpwsikkcx6qsdw9bgxfkhdmi3jmck";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -882,12 +882,12 @@ let
 
   denite-git = buildVimPluginFrom2Nix {
     pname = "denite-git";
-    version = "2020-11-21";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "denite-git";
-      rev = "df995dae2ea31a2af5df12e1d405d9f1cf702ab1";
-      sha256 = "14fcr2i3nq1x6rcjw3bqd4qdxdns7z67q92pj4w349qnqzr8pd0m";
+      rev = "031c2db8fd7ff68078ba3e4f05d21a7950353433";
+      sha256 = "0h5a0cmrv1w7zvzxj8gdddhyiqi1qa91qsyl2axhcrdishpc0hnn";
     };
     meta.homepage = "https://github.com/neoclide/denite-git/";
   };
@@ -1136,12 +1136,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2021-01-23";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "e149cc4b581721c434986b2681db30d9ff4cb372";
-      sha256 = "0cfizq9zbbfqypqjkph7np1mn4vakfim7qylblmzc6s24kx9kyf7";
+      rev = "2e3f5b5c24152d9aa4a0299ce6d1b7a6b76327eb";
+      sha256 = "0yf35ak46pnknas6isvi4gpyc9n757a46kjvwwyh32pznfqpl41p";
     };
     meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
   };
@@ -2920,8 +2920,8 @@ let
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "9f91a07b38b6f66a56ca15161ffec83a5468b95a";
-      sha256 = "01da135ffng6praixsnwgas0nm26ik9y8hm06jy394p2b2mk1g1g";
+      rev = "9f3fee22c79c93610410cc81ddf3489c8ba1d007";
+      sha256 = "05cdym1fvbzs98khi6dj08h5gwkmp737a3cs1zbbx3hajvv3c8i6";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -3072,12 +3072,12 @@ let
 
   oceanic-next = buildVimPluginFrom2Nix {
     pname = "oceanic-next";
-    version = "2020-11-19";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "mhartington";
       repo = "oceanic-next";
-      rev = "29d694b9f6323c90fb0f3f54239090370caa99fb";
-      sha256 = "0lwwzfayv7ql1qpydqgyr0g024shzck2m8d04dn5g0vf5qqf3qi6";
+      rev = "9f005681ce7c4664105832f23fc7c8516a13d8f5";
+      sha256 = "1fp0yq93b161qrmx5vxkxvd56xa3x5iyxly99sv0llk8ib8g7gy6";
     };
     meta.homepage = "https://github.com/mhartington/oceanic-next/";
   };
@@ -3228,12 +3228,12 @@ let
 
   plenary-nvim = buildVimPluginFrom2Nix {
     pname = "plenary-nvim";
-    version = "2021-01-21";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "d63b5b8d3fe2de5db6748ef8f0d3b397c6910d2d";
-      sha256 = "0nfq9ahg89l5af9yxakr8ywpvpig77pa3wi37kkg67g8yq31zxg0";
+      rev = "81dde2c7faf34a8afa2127151b067ebc2983f7d8";
+      sha256 = "0knz5xzsxpqjaybg6ywx0svdy91yjz1pbv3zm7y19avbks2jhd6f";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -3762,8 +3762,8 @@ let
     src = fetchFromGitHub {
       owner = "tami5";
       repo = "sql.nvim";
-      rev = "f0958180a5648ed1fc1fbedb89b94d81a45216a6";
-      sha256 = "1bi2j4j9vkjw8dnb73jb7la4s4b71wr2q5mwhc1iyd15gxaya7xw";
+      rev = "deab3730a5558c9b780c9e4f7ddb5252e44cb6e7";
+      sha256 = "0yyz2g2i3dv0lziyj40px2f1yqg0q6snazzs1mq4yvabz1vq3zkk";
     };
     meta.homepage = "https://github.com/tami5/sql.nvim/";
   };
@@ -3890,12 +3890,12 @@ let
 
   tagbar = buildVimPluginFrom2Nix {
     pname = "tagbar";
-    version = "2021-01-21";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "16f3f9b77b0440a14f1400bf3340bc41b781a1d5";
-      sha256 = "08ixhd2axs5p3a3c7f9pawscn811rrc84cpqqip5k78f7ws77yw8";
+      rev = "7a968502d778ab86b01afd4c8b0d20f5af14fad0";
+      sha256 = "1skszyhsbz4yv16nlrnhkdrrd51hpq1d2gn1h819m0vqgqz4qphn";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
   };
@@ -3975,12 +3975,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2021-01-23";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "099910dcd922723b2634c74c0958ef4d169721dd";
-      sha256 = "0nyd6ym87xmhd8zr5fl4h2hdnd9f0sc42ra5s0a8z8s52rd651x2";
+      rev = "951ede2a7007059cb4ebc6b6761030dfb52b6bc5";
+      sha256 = "176gz1mj6finfzgf86ra111sb5jbx1v45i0aalgr2znrr29f1a9z";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -4960,12 +4960,12 @@ let
 
   vim-dadbod = buildVimPluginFrom2Nix {
     pname = "vim-dadbod";
-    version = "2020-12-08";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dadbod";
-      rev = "4a2a8bc6dca50bc58885bdf2c0a153d0990d7872";
-      sha256 = "0algcf02i273wmkg9yqhrxy10vi3j6vf08v0rnxnhima70gr1m1c";
+      rev = "fb543e602de2fe74a7928c78e152bb964abb7a9a";
+      sha256 = "05fwa2v0fz1rgfyp2f47hcr7vzgwfrw14flr43d7a88d8qka9lqs";
     };
     meta.homepage = "https://github.com/tpope/vim-dadbod/";
   };
@@ -5356,12 +5356,12 @@ let
 
   vim-floaterm = buildVimPluginFrom2Nix {
     pname = "vim-floaterm";
-    version = "2021-01-21";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "4cdbad8981ac4e7f8c57de5100561b87adcb7ae3";
-      sha256 = "00nrk5ldrn52fvslg3lrbfi63wngf34hlhfrcd5jsgllp918wpcz";
+      rev = "8cc3bd21080c027de91224e37d897293f1b14a0f";
+      sha256 = "1fnkidkvp4m95hxlhn874wc0xy179ydqb3ia5y8ijj8dddny8d67";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
   };
@@ -6162,12 +6162,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2021-01-23";
+    version = "2021-01-24";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "ec4818d6fc7bd6705972ef138a71293678e8abed";
-      sha256 = "0v54bmwr9cxqp2dnb7f413i1lnyk6vaf9vgprmyj3yzrycwgpqam";
+      rev = "c8d00fc7299d0ff73a37dcd7f6bb5564fb30d1a3";
+      sha256 = "1axnrgldjkpqxxh6hpjmzjvk7af2n08kqb7205d5y307ya1rh5lw";
     };
     meta.homepage = "https://github.com/natebosch/vim-lsc/";
   };
@@ -6991,12 +6991,12 @@ let
 
   vim-repeat = buildVimPluginFrom2Nix {
     pname = "vim-repeat";
-    version = "2019-11-13";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-repeat";
-      rev = "c947ad2b6a16983724a0153bdf7f66d7a80a32ca";
-      sha256 = "00hhbqcx21j0738ad5xh92lsykpa0qxhdy1s7wnwc8d3jndmyjwb";
+      rev = "24afe922e6a05891756ecf331f39a1f6743d3d5a";
+      sha256 = "0y18cy5wvkb4pv5qjsfndrpcvz0dg9v0r6ia8k9isp4agdmxkdzj";
     };
     meta.homepage = "https://github.com/tpope/vim-repeat/";
   };
@@ -7736,12 +7736,12 @@ let
 
   vim-vinegar = buildVimPluginFrom2Nix {
     pname = "vim-vinegar";
-    version = "2020-06-27";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-vinegar";
-      rev = "5fee9d230ec4a6a16c45f2c71482595e4d9a67bd";
-      sha256 = "14n0mnj1lmk3bmhm0knipsw120dlxpsd98fimmchw0kd80vpph41";
+      rev = "5f48edf4dcc130ae4a658541c0d6f72a558bc70d";
+      sha256 = "195l6ly7ry8721rlkcp9103czvfcmqifbgbibdqdi3pjmaafrb9l";
     };
     meta.homepage = "https://github.com/tpope/vim-vinegar/";
   };
@@ -8061,12 +8061,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "fb6ed9883ea48c93e419736777d5f2e86fa4009b";
-      sha256 = "0zrf3l7rckidrhlx6jdndabdiwgdyjfnax0ax20g4ynzmzlbj24l";
+      rev = "47e038635b98b21aa5d48e319f6058ba5a38e209";
+      sha256 = "16hjn9dmv8n24dflircdfkx4iq4b5w2drbn745i77fn5a0s1n3nk";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };

From 8d56df7390debc36a8eb49c47bcecb1a3f1d85e0 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Mon, 25 Jan 2021 11:06:33 +0000
Subject: [PATCH 893/956] vimPlugins.lspsaga-nvim: init at 2021-01-25

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 0dfd5a40c97..4a1dc589110 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2218,6 +2218,18 @@ let
     meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
   };
 
+  lspsaga-nvim = buildVimPluginFrom2Nix {
+    pname = "lspsaga-nvim";
+    version = "2021-01-25";
+    src = fetchFromGitHub {
+      owner = "glepnir";
+      repo = "lspsaga.nvim";
+      rev = "3e230bb8a5cd788d899d11b5528cd63ea47466a9";
+      sha256 = "0pnq8nbllk6ghjxxhnb5rbvxcj04pyplp58p58cw4dch7p4f82h5";
+    };
+    meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
+  };
+
   lualine-nvim = buildVimPluginFrom2Nix {
     pname = "lualine-nvim";
     version = "2021-01-21";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e0babda2945..d11e3870f7a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -135,6 +135,7 @@ gfanto/fzf-lsp.nvim@main
 gibiansky/vim-textobj-haskell
 gioele/vim-autoswap
 glepnir/galaxyline.nvim@main
+glepnir/lspsaga.nvim@main
 glts/vim-textobj-comment
 godlygeek/csapprox
 godlygeek/tabular

From 78ec7312654c75b264fccf0bb42235a450964351 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Mon, 25 Jan 2021 11:06:56 +0000
Subject: [PATCH 894/956] vimPlugins.zephyr-nvim: init at 2021-01-13

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4a1dc589110..4c1a633fbf9 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -8301,6 +8301,18 @@ let
     meta.homepage = "https://github.com/jnurmine/zenburn/";
   };
 
+  zephyr-nvim = buildVimPluginFrom2Nix {
+    pname = "zephyr-nvim";
+    version = "2021-01-13";
+    src = fetchFromGitHub {
+      owner = "glepnir";
+      repo = "zephyr-nvim";
+      rev = "bc1a7584b435b9921e245c3621ab7524be370b2d";
+      sha256 = "0fvgky7i6m5n4h4l73xdisxhpcc8cv9pq8jrvz571gmyjsh1rrrv";
+    };
+    meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
+  };
+
   zig-vim = buildVimPluginFrom2Nix {
     pname = "zig-vim";
     version = "2021-01-19";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index d11e3870f7a..e92d725fa5e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -136,6 +136,7 @@ gibiansky/vim-textobj-haskell
 gioele/vim-autoswap
 glepnir/galaxyline.nvim@main
 glepnir/lspsaga.nvim@main
+glepnir/zephyr-nvim@main
 glts/vim-textobj-comment
 godlygeek/csapprox
 godlygeek/tabular

From 82fad3646e5128ea086febb6ebf44336ab3ec227 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Mon, 25 Jan 2021 11:07:20 +0000
Subject: [PATCH 895/956] vimPlugins.oceanic-material: init at 2020-11-02

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4c1a633fbf9..8fcc4a089d1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3082,6 +3082,18 @@ let
     meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
   };
 
+  oceanic-material = buildVimPluginFrom2Nix {
+    pname = "oceanic-material";
+    version = "2020-11-02";
+    src = fetchFromGitHub {
+      owner = "glepnir";
+      repo = "oceanic-material";
+      rev = "900f487a1e8229a12f247a0cb7a533fe258945ae";
+      sha256 = "1i6k2p11bsvjrkn9sdkql0im8ys8l9y0l6i850n9hdzvq919cfxv";
+    };
+    meta.homepage = "https://github.com/glepnir/oceanic-material/";
+  };
+
   oceanic-next = buildVimPluginFrom2Nix {
     pname = "oceanic-next";
     version = "2021-01-24";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e92d725fa5e..e44b639a4db 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -136,6 +136,7 @@ gibiansky/vim-textobj-haskell
 gioele/vim-autoswap
 glepnir/galaxyline.nvim@main
 glepnir/lspsaga.nvim@main
+glepnir/oceanic-material
 glepnir/zephyr-nvim@main
 glts/vim-textobj-comment
 godlygeek/csapprox

From 4ff48ea01cc277de07168caf625fd4a03b5dc710 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 25 Jan 2021 12:11:59 +0100
Subject: [PATCH 896/956] nixos/tests/searx: fix build

yq-go has been updated with breaking changes to the syntax.
---
 nixos/tests/searx.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix
index 22c1967b816..7c28eea30d2 100644
--- a/nixos/tests/searx.nix
+++ b/nixos/tests/searx.nix
@@ -81,8 +81,9 @@ import ./make-test-python.nix ({ pkgs, ...} :
           base.wait_for_unit("searx-init")
           base.wait_for_file("/run/searx/settings.yml")
           output = base.succeed(
-              "${pkgs.yq-go}/bin/yq r /run/searx/settings.yml"
-              " 'engines.(name==startpage).shortcut'"
+              "${pkgs.yq-go}/bin/yq eval"
+              " '.engines[] | select(.name==\"startpage\") | .shortcut'"
+              " /run/searx/settings.yml"
           ).strip()
           assert output == "start", "Settings not merged"
 

From 32f19166bc09aa2cd2c89dcec6e84ba6a183e369 Mon Sep 17 00:00:00 2001
From: ilian <ilian@tuta.io>
Date: Sat, 23 Jan 2021 12:07:05 +0100
Subject: [PATCH 897/956] reaper: mark audio backend libs as optional, add
 missing plugin libs

---
 pkgs/applications/audio/reaper/default.nix | 45 +++++++++++++---------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 8f3a17bf1b6..5f89b4929df 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -1,7 +1,16 @@
-{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper
-, alsaLib, xorg, libjack2
-, gtk3, pango, gdk-pixbuf, cairo, glib, freetype
-, libpulseaudio, xdg_utils
+{ config, lib, stdenv
+, fetchurl
+, autoPatchelfHook
+, makeWrapper
+
+, alsaLib
+, gtk3
+, lame
+, ffmpeg
+, vlc
+
+, jackSupport ? true, libjack2
+, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
 }:
 
 stdenv.mkDerivation rec {
@@ -17,22 +26,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     alsaLib
-
-    xorg.libX11
-    xorg.libXi
-
-    gdk-pixbuf
-    pango
-    cairo
-    glib
-    freetype
-
-    xdg_utils
+    stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6
+    gtk3
   ];
 
   runtimeDependencies = [
-    gtk3
-  ];
+    gtk3 # libSwell needs libgdk-3.so.0
+  ]
+  ++ lib.optional jackSupport libjack2
+  ++ lib.optional pulseaudioSupport libpulseaudio;
 
   dontBuild = true;
 
@@ -42,8 +44,15 @@ stdenv.mkDerivation rec {
       --integrate-user-desktop
     rm $out/opt/REAPER/uninstall-reaper.sh
 
+    # Dynamic loading of plugin dependencies does not adhere to rpath of
+    # reaper executable that gets modified with runtimeDependencies.
+    # Patching each plugin with DT_NEEDED is cumbersome and requires
+    # hardcoding of API versions of each dependency.
+    # Setting the rpath of the plugin shared object files does not
+    # seem to have an effect for some plugins.
+    # We opt for wrapping the executable with LD_LIBRARY_PATH prefix.
     wrapProgram $out/opt/REAPER/reaper \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpulseaudio libjack2 ]}"
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc ]}"
 
     mkdir $out/bin
     ln -s $out/opt/REAPER/reaper $out/bin/

From 95ab0eda16d4774109ccf6fdf9ea481732fdaf0b Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 25 Jan 2021 00:24:44 +0100
Subject: [PATCH 898/956] bindfs: 1.14.8 -> 1.14.9

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

diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index a8baeaf3ef5..cc6916869b6 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,16 +1,14 @@
 { lib, stdenv, fetchurl, fuse, pkg-config }:
 
 stdenv.mkDerivation rec {
-  version = "1.14.8";
+  version = "1.14.9";
   pname = "bindfs";
 
   src = fetchurl {
     url    = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
-    sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5";
+    sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n";
   };
 
-  dontStrip = true;
-
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse ];
   postFixup = ''

From 1ddc7304121b2ebdc052b55a73bcfec5c1d78a12 Mon Sep 17 00:00:00 2001
From: ilian <ilian@tuta.io>
Date: Mon, 25 Jan 2021 12:16:53 +0100
Subject: [PATCH 899/956] moreutils: 0.63 -> 0.65

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

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 5d39cb00b95..ad2d0127ab0 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -3,12 +3,12 @@
 with lib;
 stdenv.mkDerivation rec {
   pname = "moreutils";
-  version = "0.63";
+  version = "0.65";
 
   src = fetchgit {
     url = "git://git.joeyh.name/moreutils";
     rev = "refs/tags/${version}";
-    sha256 = "17sszmcdck4w01hgcq7vd25p2iw3yzvjwx1yf20jg85gzs1dplrd";
+    sha256 = "17r80xs756c5vv4ghh901c8abraqqfp7ncagv9ys4il3jngfqbrb";
   };
 
   preBuild = ''

From 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e Mon Sep 17 00:00:00 2001
From: Gurjeet Singh <gurjeet@singh.im>
Date: Mon, 25 Jan 2021 03:54:49 -0800
Subject: [PATCH 900/956] vim: add vim_darwin package for macOS (#108109)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 156d0c8afd9..73b42d95b28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25231,6 +25231,20 @@ in
     gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
   });
 
+  vim-darwin = (vim_configurable.override {
+    config = {
+      vim = {
+        gui = "none";
+        darwin = true;
+      };
+    };
+  }).overrideAttrs (oldAttrs: rec {
+    pname = "vim-darwin";
+    meta = {
+      platforms = stdenv.lib.platforms.darwin;
+    };
+  });
+
   vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
 
   vimv = callPackage ../tools/misc/vimv/default.nix { };

From 7db3b75d2107ad28467cfb621ca5dfa37580d6d3 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 25 Jan 2021 13:06:19 +0100
Subject: [PATCH 901/956] warzone2100: add fgaz to maintainers

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

diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 1f6e2995a2a..cd371e21075 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -62,7 +62,7 @@ mkDerivation rec {
     '';
     homepage = "http://wz2100.net";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.astsmtl ];
+    maintainers = with maintainers; [ astsmtl fgaz ];
     platforms = platforms.linux;
   };
 }

From 321f70a6035ee7fa311bc2a05b2a9f9490da6eb6 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 25 Jan 2021 13:07:03 +0100
Subject: [PATCH 902/956] warzone2100: 3.3.0 -> 3.4.1

---
 pkgs/games/warzone2100/default.nix | 90 +++++++++++++++++++++++-------
 1 file changed, 70 insertions(+), 20 deletions(-)

diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index cd371e21075..ce330536b75 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -1,6 +1,33 @@
-{ lib, stdenv, mkDerivation, fetchurl, autoconf, automake
-, perl, unzip, zip, which, pkg-config, qtbase, qtscript
-, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr
+{ lib
+, mkDerivation
+, fetchurl
+, cmake
+, ninja
+, zip, unzip
+, pkg-config
+, asciidoctor
+, gettext
+
+, qtbase
+, qtscript
+, SDL2
+, libtheora
+, libvorbis
+, openal
+, openalSoft
+, glew
+, physfs
+, fribidi
+, libXrandr
+, miniupnpc
+, libsodium
+, curl
+, libpng
+, freetype
+, harfbuzz
+, sqlite
+, which
+
 , withVideos ? false
 }:
 
@@ -14,38 +41,61 @@ in
 
 mkDerivation rec {
   inherit pname;
-  version  = "3.3.0";
+  version  = "3.4.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/releases/${version}/${pname}-${version}_src.tar.xz";
-    sha256 = "1s0n67rh32g0bgq72p4qzkcqjlw58gc70r4r6gl9k90pil9chj6c";
+    url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
+    sha256 = "0savalmw1kp1sf8vg5aqrl5hc77p4jacxy5y9qj8k2hi2vqdfb7a";
   };
 
   buildInputs = [
-    qtbase qtscript SDL2 libtheora openal
-    glew physfs fribidi libXrandr
-  ];
-  nativeBuildInputs = [
-    perl zip unzip pkg-config autoconf automake
+    qtbase
+    qtscript
+    SDL2
+    libtheora
+    libvorbis
+    openal
+    openalSoft
+    glew
+    physfs
+    fribidi
+    libXrandr
+    miniupnpc
+    libsodium
+    curl
+    libpng
+    freetype
+    harfbuzz
+    sqlite
   ];
 
-  preConfigure = "./autogen.sh";
+  nativeBuildInputs = [
+    cmake
+    ninja
+    zip unzip
+    asciidoctor
+    gettext
+  ];
 
   postPatch = ''
     substituteInPlace lib/exceptionhandler/dumpinfo.cpp \
-                      --replace "which %s" "${which}/bin/which %s"
+                      --replace '"which "' '"${which}/bin/which "'
     substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \
                       --replace "which %s" "${which}/bin/which %s"
   '';
 
-  configureFlags = [ "--with-distributor=NixOS" ];
+  cmakeFlags = [
+    "-DWZ_DISTRIBUTOR=NixOS"
+    # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute
+    # path, but this results in an error.
+    # By resetting it, we let the CMakeLists set it to an accepted value
+    # based on prefix.
+    "-DCMAKE_INSTALL_BINDIR="
+  ];
 
-  hardeningDisable = [ "format" ];
-
-  enableParallelBuilding = true;
-
-  postInstall = lib.optionalString withVideos
-    "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
+  postInstall = lib.optionalString withVideos ''
+    cp ${sequences_src} $out/share/warzone2100/sequences.wz
+  '';
 
   meta = with lib; {
     description = "A free RTS game, originally developed by Pumpkin Studios";

From d8f3ef1c1435ac0bafc5afae6c4ea3ca704ee40d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 25 Jan 2021 04:17:22 -0800
Subject: [PATCH 903/956] postsrsd: 1.9 -> 1.10 (#110211)

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

diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index 978a3f6216b..2ba07ee5739 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "postsrsd";
-  version = "1.9";
+  version = "1.10";
 
   src = fetchFromGitHub {
     owner = "roehling";
     repo = "postsrsd";
     rev = version;
-    sha256 = "0kmdm8nwb40cs4wvxv2kapjbiy4h6924zmx8h1kk7j3j9yjshl1p";
+    sha256 = "sha256-AqOHHOnGqOnIw5hPPiJjUJFiwngTux7gwn8qig0t7hs=";
   };
 
   cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ];

From b193bc75adad98359d2a48d90bb7dfec1cf264c8 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Mon, 25 Jan 2021 13:18:20 +0100
Subject: [PATCH 904/956] poly2tri-c: move away from untrusted repo to one that
 is owned by its Nixpkgs maintainer

See also:
https://gitlab.gnome.org/GNOME/gegl/-/issues/214#note_1002908
https://github.com/NixOS/nixpkgs/pull/109812
---
 pkgs/development/libraries/poly2tri-c/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix
index 1f0ee81da95..cdfd376add1 100644
--- a/pkgs/development/libraries/poly2tri-c/default.nix
+++ b/pkgs/development/libraries/poly2tri-c/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv
-, fetchFromGitHub
+, fetchFromGitLab
 , autoreconfHook
 , pkg-config
 , glib
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "out" "dev" ];
 
-  src = fetchFromGitHub {
-    owner = "Mattey40";
-    repo = "poly2tri-c";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "jtojnar";
+    repo = pname;
     rev = "p2tc-${version}";
     sha256 = "158vm3wqfxs22b74kqc4prlvjny38qqm3kz5wrgasmx0qciwh0g8";
   };

From 45da9fe59b50ba7bece54eea124a1312dc01fb9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 25 Jan 2021 13:46:46 +0100
Subject: [PATCH 905/956] sqlcipher: 4.4.0 -> 4.4.2

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

diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index cc5656dcc64..9097d5abe54 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -4,13 +4,13 @@ assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation rec {
   pname = "sqlcipher";
-  version = "4.4.0";
+  version = "4.4.2";
 
   src = fetchFromGitHub {
     owner = "sqlcipher";
     repo = "sqlcipher";
     rev = "v${version}";
-    sha256 = "0mx0n5n3s39r25b31sdkrd4psxjqqgcv6rpm9d57w5rlk75g2fiv";
+    sha256 = "0zhww6fpnfflnzp6091npz38ab6cpq75v3ghqvcj5kqg09vqm5na";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 16bfde2e7e7ecd04e321234475e5b92796dfe59e Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Mon, 25 Jan 2021 13:47:00 +0100
Subject: [PATCH 906/956] spirv-cross: 2020-09-17 -> 2021-01-15

---
 pkgs/tools/graphics/spirv-cross/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix
index 61ea43d3dbd..cb5a37527bf 100644
--- a/pkgs/tools/graphics/spirv-cross/default.nix
+++ b/pkgs/tools/graphics/spirv-cross/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spirv-cross";
-  version = "2020-09-17";
+  version = "2021-01-15";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Cross";
     rev = version;
-    sha256 = "03agx9f7klw96isfdz3xsw47308qxmgs24nsz7j9kx3f337fn435";
+    sha256 = "/9/Owt7XcdOjujWZnaG1Q7FlywvsRo8/l8/CouS48Vk=";
   };
 
   nativeBuildInputs = [ cmake python3 ];

From b27bc8378960de5ac887047d17e097be7b915b6d Mon Sep 17 00:00:00 2001
From: Even Brenden <evenbrenden@gmail.com>
Date: Mon, 25 Jan 2021 13:50:23 +0100
Subject: [PATCH 907/956] jotta-cli: 0.7.35160 -> 0.9.38023

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

diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix
index 069d98111cc..a4b2dd6ae6e 100644
--- a/pkgs/applications/misc/jotta-cli/default.nix
+++ b/pkgs/applications/misc/jotta-cli/default.nix
@@ -5,10 +5,10 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "jotta-cli";
-  version = "0.7.35160";
+  version = "0.9.38023";
   src = fetchzip {
       url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
-      sha256 = "00fzycy199l9y738cj71s88qz96ppczb5sqsk3x9w4jj4m6ks239";
+      sha256 = "0whbf7sb4i3g1f6yps3a6l3f0z3dg681ypax4snxw5vchi3h99kc";
       stripRoot = false;
     };
 

From f62d2652e21edc74ff25e70fd416ae42c4584868 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 25 Jan 2021 12:13:34 +0100
Subject: [PATCH 908/956] nixos/uwsgi: set up the default runtime directory

Fix issue #110691
---
 nixos/modules/services/web-servers/uwsgi.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 506cd364a65..2dfc39c847a 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -209,6 +209,7 @@ in {
         KillSignal = "SIGQUIT";
         AmbientCapabilities = cfg.capabilities;
         CapabilityBoundingSet = cfg.capabilities;
+        RuntimeDirectory = mkIf (cfg.runDir == "/run/uwsgi") "uwsgi";
       };
     };
 

From d745d128b6d02673430481b5239f4ace696415cf Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Mon, 25 Jan 2021 14:12:38 +0000
Subject: [PATCH 909/956] python3Packages.pygdbmi: 0.9.0.2 -> 0.10.0.0

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

diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix
index b3d1fb3d26d..c1be042dc7d 100644
--- a/pkgs/development/python-modules/pygdbmi/default.nix
+++ b/pkgs/development/python-modules/pygdbmi/default.nix
@@ -7,15 +7,13 @@
 
 buildPythonPackage rec {
   pname = "pygdbmi";
-  version = "0.9.0.2";
+  version = "0.10.0.0";
 
   src = fetchFromGitHub {
-    #inherit pname version;
-    #inherit pname version;
     owner = "cs01";
     repo = "pygdbmi";
     rev = version;
-    sha256 = "01isx7912dbalmc3xsafk1a1n6bzzfrjn2363djcq0v57rqii53d";
+    sha256 = "0a6b3zyxwdcb671c6lrwxm8fhvsbjh0m8hf1r18m9dha86laimjr";
   };
 
   checkInputs = [ gdb ];

From 570daf897f9c5a3745f3daa495cd6b80c7f8b830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 25 Jan 2021 15:13:53 +0100
Subject: [PATCH 910/956] opentsdb: mark as insecure

https://github.com/OpenTSDB/opentsdb/issues/2051 has not been addressed yet
---
 pkgs/tools/misc/opentsdb/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index d1fd243467d..168eda1cf3d 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -32,5 +32,8 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];
+    knownVulnerabilities = [
+      "CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051
+    ];
   };
 }

From 2e802894ba9f7e3090736f33b7b4d2ee7eeb92a4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 25 Jan 2021 22:25:22 +0800
Subject: [PATCH 911/956] icr: 0.8.0 -> unstable-2020-10-05 (#110436)

---
 pkgs/development/tools/icr/default.nix | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix
index 13c4cbe37db..ca052c0f210 100644
--- a/pkgs/development/tools/icr/default.nix
+++ b/pkgs/development/tools/icr/default.nix
@@ -1,15 +1,26 @@
-{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkg-config, which
-, openssl, readline, libyaml, zlib }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, crystal
+, shards
+, makeWrapper
+, pkg-config
+, which
+, openssl
+, readline
+, libyaml
+, zlib
+}:
 
 crystal.buildCrystalPackage rec {
   pname = "icr";
-  version = "0.8.0";
+  version = "unstable-2020-10-06";
 
   src = fetchFromGitHub {
     owner = "crystal-community";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1bz2bhs6csyg2rhrlknlvaiilq3vq8plxjh1hdxmbrfi3n6c7k5a";
+    repo = "icr";
+    rev = "8c57cd7c1fdf8088cb05c1587bd6c40d244a8a80";
+    sha256 = "sha256-b0w6oG2npNgdi2ZowMlJy0iUxQWqb9+DiruQl7Ztb0E=";
   };
 
   shardsFile = ./shards.nix;

From 37c858e55d9615a29fb371f7e29ffd7c10e73252 Mon Sep 17 00:00:00 2001
From: Shaw Vrana <shaw@vranix.com>
Date: Mon, 25 Jan 2021 06:25:49 -0800
Subject: [PATCH 912/956] standardnotes: fix for 3.5.11 (#110531)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/applications/editors/standardnotes/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index e472df44a60..f88d4489504 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
-  , fetchurl, runtimeShell }:
+, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }:
 
 let
   version = "3.5.11";
@@ -30,6 +30,14 @@ let
 in appimageTools.wrapType2 rec {
   inherit name src;
 
+  profile = ''
+    export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+  '';
+
+  extraPkgs = pkgs: with pkgs; [
+    libsecret
+  ];
+
   extraInstallCommands = ''
     # directory in /nix/store so readonly
     cp -r  ${appimageContents}/* $out

From 8d29fd4b0028d2061165d1ea72961c85de453615 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Mon, 25 Jan 2021 13:59:24 +0100
Subject: [PATCH 913/956] gede: 2.16.2 -> 2.17.1

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

diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 39954b458b4..486557d9219 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "gede";
-  version = "2.16.2";
+  version = "2.17.1";
 
   src = fetchurl {
-    url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz";
-    sha256 = "18a8n9yvhgkbc97p2995j7b5ncfdzy1fy13ahdafqmcpkl4r1hrj";
+    url = "http://gede.dexar.se/uploads/source/${pname}-${version}.tar.xz";
+    sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3";
   };
 
   nativeBuildInputs = [ qmake makeWrapper python ];
@@ -25,7 +25,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "Graphical frontend (GUI) to GDB";
-    homepage = "http://gede.acidron.com";
+    homepage = "http://gede.dexar.se";
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ juliendehos ];

From e610806903601b8bd6b80426c5789dc77632b6a3 Mon Sep 17 00:00:00 2001
From: spease <peasteven@gmail.com>
Date: Mon, 25 Jan 2021 06:48:16 -0800
Subject: [PATCH 914/956] halide: Enable on platforms.all (#110106)

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

diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index 1ff821edf80..69b7cd4d868 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -49,7 +49,7 @@ llvmPackages.stdenv.mkDerivation rec {
     description = "C++ based language for image processing and computational photography";
     homepage = "https://halide-lang.org";
     license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+    platforms = platforms.all;
     maintainers = [ maintainers.ck3d ];
   };
 }

From 0af347320c083112120d81f55a1a77f12eee31ac Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 25 Jan 2021 15:16:56 +0100
Subject: [PATCH 915/956] pythonPackages.pytest-check: 0.3.9 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
index 41f316a18a6..05082a1aecf 100644
--- a/pkgs/development/python-modules/pytest-check/default.nix
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-check";
-  version = "0.3.9";
+  version = "1.0.1";
 
   src = fetchPypi {
     pname = "pytest_check";
     inherit version;
-    sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9";
+    sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s";
   };
 
   propagatedBuildInputs = [ pytest ];

From 7e33a28b4b34017c96e78199347845b2c9e252d8 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 25 Jan 2021 15:17:20 +0100
Subject: [PATCH 916/956] staticjinja: 0.4.0 -> 1.0.3

---
 .../python-modules/staticjinja/default.nix      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix
index d49bae2eab9..a49f6a4fdfc 100644
--- a/pkgs/development/python-modules/staticjinja/default.nix
+++ b/pkgs/development/python-modules/staticjinja/default.nix
@@ -6,12 +6,16 @@
 , easywatch
 , jinja2
 , pytestCheckHook
+, pytest-check
+, fetchPypi
 , markdown
+, sphinx
+, sphinx_rtd_theme
 }:
 
 buildPythonPackage rec {
   pname = "staticjinja";
-  version = "0.4.0";
+  version = "1.0.3";
 
   disabled = isPy27; # 0.4.0 drops python2 support
 
@@ -21,7 +25,7 @@ buildPythonPackage rec {
     owner = "staticjinja";
     repo = pname;
     rev = version;
-    sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i";
+    sha256 = "12rpv5gv64i5j4w98wm1444xnnmarcn3pg783j3fkkzc58lk5wwj";
   };
 
   propagatedBuildInputs = [
@@ -32,13 +36,18 @@ buildPythonPackage rec {
 
   checkInputs = [
     pytestCheckHook
+    pytest-check
     markdown
+    sphinx_rtd_theme
+    sphinx
   ];
 
-  # Import paths differ by a "build/lib" subdirectory, but the files are
-  # the same, so we ignore import mismatches.
   preCheck = ''
+    # Import paths differ by a "build/lib" subdirectory, but the files are
+    # the same, so we ignore import mismatches.
     export PY_IGNORE_IMPORTMISMATCH=1
+    # The tests need to find and call the installed staticjinja executable
+    export PATH="$PATH:$out/bin";
   '';
 
   meta = with lib; {

From e912b8e1167b7aac4d01929a5eafeb4f2401e358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 25 Jan 2021 16:18:22 +0100
Subject: [PATCH 917/956] flink_1_5: drop

It suffers from CVE-2020-17518.
---
 .../networking/cluster/flink/default.nix      | 25 ++++---------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index d8b156bed88..2efbfb2f722 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -1,27 +1,12 @@
-{ lib, stdenv, fetchurl, makeWrapper, jre
-, version ? "1.6" }:
-
-let
-  versionMap = {
-    "1.5" = {
-      flinkVersion = "1.5.5";
-      sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z";
-    };
-    "1.6" = {
-      flinkVersion = "1.11.1";
-      sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0";
-    };
-  };
-in
-
-with versionMap.${version};
+{ lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "flink-${flinkVersion}";
+  pname = "flink";
+  version = "1.11.1";
 
   src = fetchurl {
-    url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz";
-    inherit sha256;
+    url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
+    sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1b37bd3a97c..2ce4245ba30 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -168,6 +168,7 @@ mapAliases ({
   firestr = throw "firestr has been removed."; # added 2019-12-08
   fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
   flameGraph = flamegraph; # added 2018-04-25
+  flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25
   flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
   foldingathome = fahclient; # added 2020-09-03
   font-awesome-ttf = font-awesome; # 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0d24da0ca8..6e9a421b86a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21782,7 +21782,6 @@ in
   fldigi = callPackage ../applications/radio/fldigi { };
 
   flink = callPackage ../applications/networking/cluster/flink { };
-  flink_1_5 = flink.override { version = "1.5"; };
 
   fllog = callPackage ../applications/radio/fllog { };
 

From f7129e8cbc9a19cc50cae338dd4548ca82dd8267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 25 Jan 2021 16:21:58 +0100
Subject: [PATCH 918/956] flink: 1.11.1 -> 1.11.3

addresses CVE-2020-17518 and CVE-2020-17519
---
 pkgs/applications/networking/cluster/flink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 2efbfb2f722..9b9b61a3854 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "flink";
-  version = "1.11.1";
+  version = "1.11.3";
 
   src = fetchurl {
     url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
-    sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0";
+    sha256 = "0xd350wf5x17nmz51fdchp7092q9hi67783mmd4ncszy7rhkkdnn";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8573814f46607f492ae393afc10bf2e19fd3bab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 25 Jan 2021 16:24:25 +0100
Subject: [PATCH 919/956] flink: 1.11.3 -> 1.12.1

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

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 9b9b61a3854..3c3bc2bace2 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "flink";
-  version = "1.11.3";
+  version = "1.12.1";
 
   src = fetchurl {
     url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
-    sha256 = "0xd350wf5x17nmz51fdchp7092q9hi67783mmd4ncszy7rhkkdnn";
+    sha256 = "146azc5wg1xby3nqz8mha959qy99z2h8032rfgs2mcl3d5rrsm2l";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 38b140b3e1a7ba55268e4af9c57ae938f0a28289 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Mon, 25 Jan 2021 15:36:15 +0000
Subject: [PATCH 920/956] gdbgui: 0.13.2.1 -> 0.14.0.2

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

diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index c01bb61f4f6..4a694ed87f4 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -3,6 +3,10 @@
 , fetchPypi
 , gdb
 , flask
+, six
+, bidict
+, python-engineio
+, python-socketio
 , flask-socketio
 , flask-compress
 , pygdbmi
@@ -12,14 +16,48 @@
 , eventlet
 , }:
 
+let
+  # gdbgui only works with the latest previous major version of flask-socketio,
+  # which depends itself on the latest previous major versions of dependencies.
+  python-engineio' = python-engineio.overridePythonAttrs (old: rec {
+    version = "3.14.2";
+    src = fetchPypi {
+      inherit (old) pname;
+      inherit version;
+      sha256 = "119halljynqsgswlhlh750qv56js1p7j52sc0nbwxh8450zmbd7a";
+    };
+    propagatedBuildInputs = [ six ];
+    doCheck = false;
+  });
+  python-socketio' = python-socketio.overridePythonAttrs (old: rec {
+    version = "4.6.1";
+    src = fetchPypi {
+      inherit (old) pname;
+      inherit version;
+      sha256 = "047syhrrxh327p0fnab0d1zy25zijnj3gs1qg3kjpsy1jaj5l7yd";
+    };
+    propagatedBuildInputs = [ bidict python-engineio' ];
+    doCheck = false;
+  });
+  flask-socketio' = flask-socketio.overridePythonAttrs (old: rec {
+    version = "4.3.2";
+    src = fetchPypi {
+      inherit (old) pname;
+      inherit version;
+      sha256 = "0s2xs9kv9cbwy8bcxszhdwlcb9ldv0fj33lwilf5vypj0wsin01p";
+    };
+    propagatedBuildInputs = [ flask python-socketio' ];
+    doCheck = false;
+  });
+in
 buildPythonApplication rec {
   pname = "gdbgui";
-  version = "0.13.2.1";
+  version = "0.14.0.2";
 
   buildInputs = [ gdb ];
   propagatedBuildInputs = [
     flask
-    flask-socketio
+    flask-socketio'
     flask-compress
     pygdbmi
     pygments
@@ -30,13 +68,14 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zn5wi47m8pn4amx574ryyhqvhynipxzyxbx0878ap6g36vh6l1h";
+    sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d";
   };
 
   postPatch = ''
     echo ${version} > gdbgui/VERSION.txt
     # remove upper version bound
     sed -ie 's!, <.*"!"!' setup.py
+    sed -i 's/greenlet==/greenlet>=/' setup.py
   '';
 
   postInstall = ''
@@ -52,6 +91,6 @@ buildPythonApplication rec {
     homepage = "https://www.gdbgui.com/";
     license = licenses.gpl3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ yrashk ];
+    maintainers = with maintainers; [ yrashk dump_stack ];
   };
 }

From 0ffffcc5da7313f40a70384beddcef4ea9dfbdf5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Jan 2021 01:38:42 +0100
Subject: [PATCH 921/956] ajour: init at 0.6.3

---
 pkgs/tools/games/ajour/default.nix | 81 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  5 ++
 2 files changed, 86 insertions(+)
 create mode 100644 pkgs/tools/games/ajour/default.nix

diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix
new file mode 100644
index 00000000000..82bb6c54aa7
--- /dev/null
+++ b/pkgs/tools/games/ajour/default.nix
@@ -0,0 +1,81 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, autoPatchelfHook
+, cmake
+, makeWrapper
+, pkg-config
+, python3
+, expat
+, freetype
+, kdialog
+, zenity
+, openssl
+, libX11
+, libxcb
+, libXcursor
+, libXi
+, libxkbcommon
+, libXrandr
+, vulkan-loader
+, wayland
+}:
+
+let
+  rpathLibs = [
+    libXcursor
+    libXi
+    libxkbcommon
+    libXrandr
+    libX11
+    vulkan-loader
+    wayland
+  ];
+
+in rustPlatform.buildRustPackage rec {
+  pname = "Ajour";
+  version = "0.6.3";
+
+  src = fetchFromGitHub {
+    owner = "casperstorm";
+    repo = "ajour";
+    rev = version;
+    sha256 = "080759j18pws5c8bmqn1bwvmlaq8k01kzj7bnwncwinl5j35mi2j";
+  };
+
+  cargoSha256 = "1614lln5zh2j2np68pllwcqmywvzzmkj71b158fw2d98ijbi9lmw";
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    cmake
+    makeWrapper
+    pkg-config
+    python3
+  ];
+
+  buildInputs = [
+    expat
+    freetype
+    openssl
+    libxcb
+    libX11
+  ];
+
+  fixupPhase = ''
+    patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $out/bin/ajour)" $out/bin/ajour
+    wrapProgram $out/bin/ajour --prefix PATH ":" ${lib.makeBinPath [ zenity kdialog ]}
+  '';
+
+  meta = with lib; {
+    description = "World of Warcraft addon manager written in Rust";
+    longDescription = ''
+      Ajour is a World of Warcraft addon manager written in Rust with a
+      strong focus on performance and simplicity. The project is
+      completely advertisement free, privacy respecting and open source.
+    '';
+    homepage = "https://github.com/casperstorm/ajour";
+    changelog = "https://github.com/casperstorm/ajour/blob/master/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23e212bcc12..133f8c1970f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -721,6 +721,11 @@ in
 
   aj-snapshot  = callPackage ../applications/audio/aj-snapshot { };
 
+  ajour = callPackage ../tools/games/ajour {
+    inherit (gnome3) zenity;
+    inherit (plasma5Packages) kdialog;
+  };
+
   albert = libsForQt5.callPackage ../applications/misc/albert {};
 
   metapixel = callPackage ../tools/graphics/metapixel { };

From 88033a4862c1eb55929b8a4163da2137f377e6af Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 25 Jan 2021 17:06:31 +0100
Subject: [PATCH 922/956] scylladb: mark as broken

The package does not build due to changes in Boost.
---
 pkgs/servers/scylladb/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix
index b0793d5e42a..ecc79acfbe7 100644
--- a/pkgs/servers/scylladb/default.nix
+++ b/pkgs/servers/scylladb/default.nix
@@ -98,5 +98,6 @@ gcc8Stdenv.mkDerivation {
     platforms = lib.platforms.linux;
     hydraPlatforms = []; # It's huge ATM, about 18 GB.
     maintainers = [ lib.maintainers.farlion ];
+    broken = true;
   };
 }

From eefdd0983997458528f78445d04066b6d3fc147d Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 23 Jan 2021 01:07:16 +0100
Subject: [PATCH 923/956] cryptopp: 8.2.0 -> 8.4.0

Fixes CVE-2019-14318.
---
 .../libraries/crypto++/default.nix            | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index 041e7d49d50..b2232907db7 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,16 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, nasm, which }:
+{ lib, stdenv, fetchFromGitHub, }:
 
-with lib;
 stdenv.mkDerivation rec {
   pname = "crypto++";
-  version = "8.2.0";
-  underscoredVersion = strings.replaceStrings ["."] ["_"] version;
+  version = "8.4.0";
+  underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version;
 
   src = fetchFromGitHub {
     owner = "weidai11";
     repo = "cryptopp";
     rev = "CRYPTOPP_${underscoredVersion}";
-    sha256 = "01zrrzjn14yhkb9fzzl57vmh7ig9a6n6fka45f8za0gf7jpcq3mj";
+    sha256 = "1gwn8yh1mh41hkh6sgnhb9c3ygrdazd7645msl20i0zdvcp7f5w3";
   };
 
   postPatch = ''
@@ -19,9 +18,6 @@ stdenv.mkDerivation rec {
         --replace "ARFLAGS = -static -o" "ARFLAGS = -cru"
   '';
 
-  nativeBuildInputs = optionals stdenv.hostPlatform.isx86 [ nasm which ];
-
-  preBuild = optionalString stdenv.hostPlatform.isx86 "${stdenv.shell} rdrand-nasm.sh";
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
   buildFlags = [ "shared" "libcryptopp.pc" ];
   enableParallelBuilding = true;
@@ -31,17 +27,17 @@ stdenv.mkDerivation rec {
   preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store
   installTargets = [ "install-lib" ];
   installFlags = [ "LDCONF=true" ];
-  postInstall = optionalString (!stdenv.hostPlatform.isDarwin) ''
-    ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version}
-    ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.major version}
+  postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.majorMinor version}
+    ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.major version}
   '';
 
   meta = {
     description = "Crypto++, a free C++ class library of cryptographic schemes";
     homepage = "https://cryptopp.com/";
     changelog = "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt";
-    license = with licenses; [ boost publicDomain ];
-    platforms = platforms.all;
-    maintainers = with maintainers; [ c0bw3b ];
+    license = with lib.licenses; [ boost publicDomain ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ c0bw3b ];
   };
 }

From a6ce00c50c36624fec06b2b756a766d4d0f4a888 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 25 Jan 2021 09:26:54 +0100
Subject: [PATCH 924/956] treewide: remove stdenv where not needed

---
 .../accessibility/contrast/default.nix           |  2 +-
 pkgs/applications/audio/cadence/default.nix      |  3 +--
 pkgs/applications/audio/clementine/default.nix   |  2 +-
 .../audio/cozy-audiobooks/default.nix            |  2 +-
 pkgs/applications/audio/curseradio/default.nix   |  2 +-
 pkgs/applications/audio/dfasma/default.nix       |  2 +-
 pkgs/applications/audio/dr14_tmeter/default.nix  |  2 +-
 pkgs/applications/audio/faust/faust2jackrust.nix |  3 +--
 pkgs/applications/audio/fmit/default.nix         |  2 +-
 .../audio/gnome-podcasts/default.nix             |  2 +-
 pkgs/applications/audio/gpodder/default.nix      |  2 +-
 pkgs/applications/audio/greg/default.nix         |  2 +-
 pkgs/applications/audio/gtklick/default.nix      |  2 +-
 pkgs/applications/audio/jamulus/default.nix      |  2 +-
 pkgs/applications/audio/librespot/default.nix    |  2 +-
 pkgs/applications/audio/lmms/default.nix         |  2 +-
 pkgs/applications/audio/mimms/default.nix        |  2 +-
 pkgs/applications/audio/mixxx/default.nix        |  2 +-
 pkgs/applications/audio/mopidy/gmusic.nix        |  2 +-
 pkgs/applications/audio/mopidy/iris.nix          |  2 +-
 pkgs/applications/audio/mopidy/moped.nix         |  2 +-
 pkgs/applications/audio/mopidy/mopify.nix        |  2 +-
 pkgs/applications/audio/mopidy/mpd.nix           |  2 +-
 pkgs/applications/audio/mopidy/mpris.nix         |  2 +-
 pkgs/applications/audio/mopidy/scrobbler.nix     |  2 +-
 pkgs/applications/audio/mopidy/somafm.nix        |  2 +-
 pkgs/applications/audio/mopidy/soundcloud.nix    |  2 +-
 .../applications/audio/mopidy/spotify-tunigo.nix |  2 +-
 pkgs/applications/audio/mopidy/spotify.nix       |  2 +-
 pkgs/applications/audio/mopidy/tunein.nix        |  2 +-
 pkgs/applications/audio/mopidy/youtube.nix       |  2 +-
 pkgs/applications/audio/munt/default.nix         |  2 +-
 pkgs/applications/audio/musescore/default.nix    |  2 +-
 pkgs/applications/audio/noisetorch/default.nix   |  2 +-
 pkgs/applications/audio/padthv1/default.nix      |  2 +-
 pkgs/applications/audio/picard/default.nix       |  2 +-
 pkgs/applications/audio/pithos/default.nix       |  2 +-
 pkgs/applications/audio/polyphone/default.nix    |  2 +-
 pkgs/applications/audio/puddletag/default.nix    |  2 +-
 .../audio/pulseaudio-dlna/default.nix            |  2 +-
 .../audio/pulseaudio-dlna/zeroconf.nix           |  2 +-
 pkgs/applications/audio/qjackctl/default.nix     |  2 +-
 pkgs/applications/audio/qmmp/default.nix         |  2 +-
 pkgs/applications/audio/qsampler/default.nix     |  2 +-
 pkgs/applications/audio/qsynth/default.nix       |  2 +-
 pkgs/applications/audio/qtractor/default.nix     |  2 +-
 pkgs/applications/audio/shortwave/default.nix    |  2 +-
 pkgs/applications/audio/sonata/default.nix       |  2 +-
 .../audio/spotify-cli-linux/default.nix          |  2 +-
 pkgs/applications/audio/synthv1/default.nix      |  2 +-
 pkgs/applications/audio/traverso/default.nix     |  2 +-
 pkgs/applications/audio/whipper/default.nix      |  2 +-
 pkgs/applications/blockchains/ethabi.nix         |  2 +-
 .../blockchains/ledger-live-desktop/default.nix  |  2 +-
 pkgs/applications/blockchains/quorum.nix         |  2 +-
 pkgs/applications/blockchains/turbo-geth.nix     |  2 +-
 .../editors/emacs-modes/sv-kalender/default.nix  |  2 +-
 pkgs/applications/editors/featherpad/default.nix |  2 +-
 .../applications/editors/focuswriter/default.nix |  2 +-
 pkgs/applications/editors/hecate/default.nix     |  2 +-
 pkgs/applications/editors/hexdino/default.nix    |  2 +-
 pkgs/applications/editors/kibi/default.nix       |  2 +-
 pkgs/applications/editors/manuskript/default.nix |  2 +-
 pkgs/applications/editors/mindforger/default.nix |  2 +-
 .../editors/neovim/gnvim/default.nix             |  2 +-
 .../editors/neovim/neovim-remote.nix             |  2 +-
 pkgs/applications/editors/okteta/default.nix     |  2 +-
 pkgs/applications/editors/retext/default.nix     |  2 +-
 pkgs/applications/editors/sigil/default.nix      |  2 +-
 pkgs/applications/editors/texmacs/common.nix     |  2 +-
 pkgs/applications/editors/thonny/default.nix     |  2 +-
 pkgs/applications/editors/tiled/default.nix      |  2 +-
 .../applications/graphics/displaycal/default.nix |  2 +-
 pkgs/applications/graphics/dosage/default.nix    |  2 +-
 pkgs/applications/graphics/freecad/default.nix   |  2 +-
 pkgs/applications/graphics/gimp/wrapper.nix      |  2 +-
 pkgs/applications/graphics/gscan2pdf/default.nix |  2 +-
 pkgs/applications/graphics/hydrus/default.nix    |  2 +-
 pkgs/applications/graphics/ipe/default.nix       |  2 +-
 .../graphics/kgraphviewer/default.nix            |  2 +-
 pkgs/applications/graphics/krop/default.nix      |  2 +-
 .../graphics/luminance-hdr/default.nix           |  2 +-
 pkgs/applications/graphics/mcomix3/default.nix   |  3 +--
 pkgs/applications/graphics/meme/default.nix      |  2 +-
 pkgs/applications/graphics/mypaint/default.nix   |  2 +-
 pkgs/applications/graphics/nomacs/default.nix    |  2 +-
 pkgs/applications/graphics/paraview/default.nix  |  2 +-
 pkgs/applications/graphics/pdfcpu/default.nix    |  2 +-
 .../applications/graphics/photoflare/default.nix |  2 +-
 pkgs/applications/graphics/photoqt/default.nix   |  2 +-
 .../applications/graphics/phototonic/default.nix |  2 +-
 .../graphics/pick-colour-picker/default.nix      |  2 +-
 pkgs/applications/graphics/pinta/default.nix     |  2 +-
 .../applications/graphics/qcomicbook/default.nix |  2 +-
 .../graphics/rapid-photo-downloader/default.nix  |  2 +-
 pkgs/applications/graphics/renderdoc/default.nix |  2 +-
 .../graphics/scantailor/advanced.nix             |  2 +-
 pkgs/applications/graphics/tesseract/wrapper.nix |  2 +-
 pkgs/applications/logging/humioctl/default.nix   |  2 +-
 pkgs/applications/misc/antfs-cli/default.nix     |  2 +-
 pkgs/applications/misc/ape/apeclex.nix           |  2 +-
 pkgs/applications/misc/archivy/default.nix       |  2 +-
 pkgs/applications/misc/ausweisapp2/default.nix   |  2 +-
 pkgs/applications/misc/autospotting/default.nix  |  2 +-
 pkgs/applications/misc/barrier/default.nix       |  2 +-
 pkgs/applications/misc/bibletime/default.nix     |  2 +-
 pkgs/applications/misc/bleachbit/default.nix     |  2 +-
 pkgs/applications/misc/break-time/default.nix    |  2 +-
 pkgs/applications/misc/buku/default.nix          |  2 +-
 pkgs/applications/misc/candle/default.nix        |  2 +-
 pkgs/applications/misc/cheat/default.nix         |  2 +-
 .../applications/misc/chewing-editor/default.nix |  2 +-
 pkgs/applications/misc/coursera-dl/default.nix   |  2 +-
 .../applications/misc/crow-translate/default.nix |  2 +-
 pkgs/applications/misc/cum/default.nix           |  2 +-
 pkgs/applications/misc/cura/lulzbot/libarcus.nix |  2 +-
 .../misc/cura/lulzbot/libsavitar.nix             |  2 +-
 pkgs/applications/misc/cura/lulzbot/uranium.nix  |  2 +-
 pkgs/applications/misc/dasel/default.nix         |  2 +-
 .../misc/devdocs-desktop/default.nix             |  2 +-
 pkgs/applications/misc/dfilemanager/default.nix  |  2 +-
 pkgs/applications/misc/diffpdf/default.nix       |  2 +-
 pkgs/applications/misc/dmensamenu/default.nix    |  2 +-
 pkgs/applications/misc/dockbarx/default.nix      |  2 +-
 pkgs/applications/misc/dotfiles/default.nix      |  2 +-
 pkgs/applications/misc/dstask/default.nix        |  2 +-
 pkgs/applications/misc/dupeguru/default.nix      |  2 +-
 pkgs/applications/misc/electrum/dash.nix         |  2 +-
 pkgs/applications/misc/electrum/ltc.nix          |  2 +-
 pkgs/applications/misc/elfx86exts/default.nix    |  2 +-
 pkgs/applications/misc/exercism/default.nix      |  2 +-
 pkgs/applications/misc/expenses/default.nix      |  2 +-
 pkgs/applications/misc/fbmenugen/default.nix     |  2 +-
 pkgs/applications/misc/geoipupdate/default.nix   |  2 +-
 pkgs/applications/misc/get_iplayer/default.nix   |  2 +-
 pkgs/applications/misc/go-jira/default.nix       |  2 +-
 .../applications/misc/golden-cheetah/default.nix |  2 +-
 pkgs/applications/misc/gpsbabel/gui.nix          |  2 +-
 pkgs/applications/misc/gramps/default.nix        |  2 +-
 pkgs/applications/misc/gsctl/default.nix         |  2 +-
 pkgs/applications/misc/hamster/default.nix       |  2 +-
 pkgs/applications/misc/haxor-news/default.nix    |  2 +-
 pkgs/applications/misc/hivemind/default.nix      |  2 +-
 pkgs/applications/misc/hugo/default.nix          |  2 +-
 pkgs/applications/misc/jrnl/default.nix          |  2 +-
 pkgs/applications/misc/k4dirstat/default.nix     |  2 +-
 pkgs/applications/misc/keepass/default.nix       |  2 +-
 pkgs/applications/misc/khard/default.nix         |  2 +-
 pkgs/applications/misc/kondo/default.nix         |  2 +-
 pkgs/applications/misc/kupfer/default.nix        |  2 +-
 pkgs/applications/misc/loxodo/default.nix        |  2 +-
 pkgs/applications/misc/madonctl/default.nix      |  2 +-
 pkgs/applications/misc/mediaelch/default.nix     |  2 +-
 pkgs/applications/misc/menumaker/default.nix     |  2 +-
 pkgs/applications/misc/mop/default.nix           |  2 +-
 pkgs/applications/misc/mqtt-bench/default.nix    |  2 +-
 pkgs/applications/misc/multibootusb/default.nix  |  2 +-
 pkgs/applications/misc/nixnote2/default.nix      |  2 +-
 pkgs/applications/misc/ocropus/default.nix       |  2 +-
 pkgs/applications/misc/onboard/default.nix       |  2 +-
 pkgs/applications/misc/opentx/default.nix        |  2 +-
 pkgs/applications/misc/orca/default.nix          |  2 +-
 .../misc/pass-secret-service/default.nix         |  2 +-
 pkgs/applications/misc/pdf-quench/default.nix    |  2 +-
 pkgs/applications/misc/pdfarranger/default.nix   |  2 +-
 pkgs/applications/misc/pdfdiff/default.nix       |  2 +-
 pkgs/applications/misc/pgmodeler/default.nix     |  3 +--
 pkgs/applications/misc/pipr/default.nix          |  3 +--
 pkgs/applications/misc/plover/default.nix        |  2 +-
 pkgs/applications/misc/prevo/default.nix         |  2 +-
 pkgs/applications/misc/printrun/default.nix      |  2 +-
 pkgs/applications/misc/pydf/default.nix          |  2 +-
 pkgs/applications/misc/pyditz/cerberus.nix       |  2 +-
 pkgs/applications/misc/pyditz/default.nix        |  2 +-
 pkgs/applications/misc/pytrainer/default.nix     |  2 +-
 pkgs/applications/misc/qdirstat/default.nix      |  2 +-
 pkgs/applications/misc/qlcplus/default.nix       |  2 +-
 pkgs/applications/misc/qpdfview/default.nix      |  2 +-
 pkgs/applications/misc/qsudo/default.nix         |  2 +-
 pkgs/applications/misc/qt-box-editor/default.nix |  2 +-
 .../misc/qtbitcointrader/default.nix             |  2 +-
 pkgs/applications/misc/ranger/default.nix        |  2 +-
 .../misc/remarkable/remarkable-mouse/default.nix |  2 +-
 .../misc/remarkable/rmapi/default.nix            |  2 +-
 .../misc/remarkable/rmview/default.nix           |  2 +-
 pkgs/applications/misc/rsclock/default.nix       |  2 +-
 .../applications/misc/rss-bridge-cli/default.nix |  2 +-
 pkgs/applications/misc/rtv/default.nix           |  2 +-
 pkgs/applications/misc/snapper-gui/default.nix   |  2 +-
 .../applications/misc/syncthing-tray/default.nix |  2 +-
 .../misc/taskwarrior-tui/default.nix             |  2 +-
 pkgs/applications/misc/termdown/default.nix      |  2 +-
 .../misc/terminal-parrot/default.nix             |  2 +-
 pkgs/applications/misc/termpdf.py/default.nix    |  2 +-
 pkgs/applications/misc/tickrs/default.nix        |  2 +-
 pkgs/applications/misc/tipp10/default.nix        |  2 +-
 pkgs/applications/misc/todiff/default.nix        |  2 +-
 pkgs/applications/misc/toot/default.nix          |  2 +-
 pkgs/applications/misc/topydo/default.nix        |  2 +-
 pkgs/applications/misc/tty-share/default.nix     |  2 +-
 pkgs/applications/misc/tut/default.nix           |  2 +-
 pkgs/applications/misc/tzupdate/default.nix      |  2 +-
 pkgs/applications/misc/udiskie/default.nix       |  2 +-
 pkgs/applications/misc/ulauncher/default.nix     |  2 +-
 pkgs/applications/misc/urlscan/default.nix       |  2 +-
 pkgs/applications/misc/valentina/default.nix     |  2 +-
 pkgs/applications/misc/vym/default.nix           |  2 +-
 pkgs/applications/misc/wego/default.nix          |  2 +-
 pkgs/applications/misc/wikicurses/default.nix    |  2 +-
 pkgs/applications/misc/xdgmenumaker/default.nix  |  2 +-
 pkgs/applications/misc/yokadi/default.nix        |  2 +-
 pkgs/applications/misc/zk-shell/default.nix      |  2 +-
 pkgs/applications/misc/zscroll/default.nix       |  2 +-
 pkgs/applications/networking/brig/default.nix    |  2 +-
 .../networking/browsers/browsh/default.nix       |  2 +-
 .../networking/browsers/castor/default.nix       |  2 +-
 .../networking/browsers/chromium/browser.nix     |  2 +-
 .../networking/browsers/eolie/default.nix        |  2 +-
 .../networking/browsers/qutebrowser/default.nix  |  2 +-
 pkgs/applications/networking/c14/default.nix     |  2 +-
 .../networking/cloudflared/default.nix           |  2 +-
 .../networking/cluster/atlantis/default.nix      |  2 +-
 .../cluster/docker-machine/default.nix           |  2 +-
 .../networking/cluster/docker-machine/kvm.nix    |  2 +-
 .../networking/cluster/fluxcd/default.nix        |  2 +-
 .../networking/cluster/fluxctl/default.nix       |  2 +-
 .../networking/cluster/habitat/default.nix       |  2 +-
 .../networking/cluster/helm/default.nix          |  2 +-
 .../networking/cluster/k9s/default.nix           |  2 +-
 .../networking/cluster/kops/default.nix          |  2 +-
 .../networking/cluster/kubeless/default.nix      |  2 +-
 .../networking/cluster/kubelogin/default.nix     |  2 +-
 .../networking/cluster/kubernix/default.nix      |  2 +-
 .../networking/cluster/kubeval/default.nix       |  2 +-
 .../networking/cluster/linkerd/default.nix       |  2 +-
 .../networking/cluster/openshift/default.nix     |  2 +-
 .../networking/cluster/popeye/default.nix        |  2 +-
 .../networking/cluster/ssm-agent/default.nix     |  2 +-
 .../cluster/terraform-inventory/default.nix      |  2 +-
 .../terraform-providers/ansible/default.nix      |  2 +-
 .../terraform-providers/cloudfoundry/default.nix |  2 +-
 .../elasticsearch/default.nix                    |  2 +-
 .../terraform-providers/gandi/default.nix        |  2 +-
 .../terraform-providers/hcloud/default.nix       |  2 +-
 .../terraform-providers/keycloak/default.nix     |  2 +-
 .../terraform-providers/libvirt/default.nix      |  2 +-
 .../terraform-providers/linuxbox/default.nix     |  2 +-
 .../cluster/terraform-providers/lxd/default.nix  |  2 +-
 .../terraform-providers/shell/default.nix        |  2 +-
 .../terraform-providers/vercel/default.nix       |  2 +-
 .../terraform-providers/vpsadmin/default.nix     |  2 +-
 .../networking/cluster/tilt/default.nix          |  2 +-
 .../networking/cluster/velero/default.nix        |  2 +-
 pkgs/applications/networking/datovka/default.nix |  2 +-
 .../networking/dyndns/cfdyndns/default.nix       |  2 +-
 .../feedreaders/canto-curses/default.nix         |  2 +-
 .../feedreaders/canto-daemon/default.nix         |  2 +-
 .../networking/feedreaders/feeds/default.nix     |  2 +-
 .../networking/feedreaders/rawdog/default.nix    |  2 +-
 pkgs/applications/networking/flent/default.nix   |  2 +-
 pkgs/applications/networking/gdrive/default.nix  |  2 +-
 pkgs/applications/networking/gns3/server.nix     |  2 +-
 .../instant-messengers/blink/default.nix         |  2 +-
 .../instant-messengers/cordless/default.nix      |  2 +-
 .../instant-messengers/coyim/default.nix         |  2 +-
 .../element/element-desktop.nix                  |  2 +-
 .../instant-messengers/ferdi/default.nix         |  2 +-
 .../instant-messengers/franz/default.nix         |  2 +-
 .../instant-messengers/linphone/default.nix      |  2 +-
 .../instant-messengers/matrixcli/default.nix     |  2 +-
 .../networking/instant-messengers/mm/default.nix |  2 +-
 .../instant-messengers/neochat/default.nix       |  2 +-
 .../instant-messengers/pybitmessage/default.nix  |  2 +-
 .../instant-messengers/rambox/rambox.nix         |  2 +-
 .../instant-messengers/ricochet/default.nix      |  2 +-
 .../instant-messengers/scudcloud/default.nix     |  2 +-
 .../instant-messengers/slack-term/default.nix    |  2 +-
 .../instant-messengers/swift-im/default.nix      |  2 +-
 .../instant-messengers/tensor/default.nix        |  2 +-
 .../instant-messengers/turses/default.nix        |  2 +-
 .../instant-messengers/twinkle/default.nix       |  2 +-
 .../instant-messengers/xmpp-client/default.nix   |  2 +-
 .../networking/ipfs-cluster/default.nix          |  2 +-
 pkgs/applications/networking/ipfs/default.nix    |  2 +-
 pkgs/applications/networking/ipget/default.nix   |  2 +-
 .../networking/irc/qweechat/default.nix          |  2 +-
 .../weechat/scripts/weechat-matrix/default.nix   |  2 +-
 pkgs/applications/networking/lieer/default.nix   |  2 +-
 .../networking/maestral-qt/default.nix           |  3 +--
 .../networking/mailreaders/aerc/default.nix      |  2 +-
 .../networking/mailreaders/afew/default.nix      |  2 +-
 .../networking/mailreaders/mailpile/default.nix  |  2 +-
 .../networking/mailreaders/meli/default.nix      |  3 +--
 .../mailreaders/mlarchive2maildir/default.nix    |  2 +-
 .../networking/owncloud-client/default.nix       |  2 +-
 .../networking/p2p/deluge/default.nix            |  2 +-
 .../networking/p2p/zeronet/default.nix           |  2 +-
 .../applications/networking/protocol/default.nix |  2 +-
 pkgs/applications/networking/pyload/default.nix  |  2 +-
 pkgs/applications/networking/qv2ray/default.nix  |  2 +-
 .../networking/remote/x2goclient/default.nix     |  2 +-
 .../networking/shellhub-agent/default.nix        |  2 +-
 .../soulseek/nicotine-plus/default.nix           |  2 +-
 .../networking/sync/acd_cli/default.nix          |  2 +-
 .../networking/sync/desync/default.nix           |  2 +-
 .../networking/syncthing-gtk/default.nix         |  2 +-
 pkgs/applications/networking/twtxt/default.nix   |  2 +-
 pkgs/applications/networking/versus/default.nix  |  2 +-
 .../office/beamerpresenter/default.nix           |  2 +-
 pkgs/applications/office/espanso/default.nix     |  2 +-
 pkgs/applications/office/fava/default.nix        |  2 +-
 pkgs/applications/office/gtg/default.nix         |  2 +-
 pkgs/applications/office/keepnote/default.nix    |  2 +-
 .../office/ledger-autosync/default.nix           |  2 +-
 .../office/libreoffice/src-fresh/override.nix    |  2 +-
 .../office/libreoffice/src-still/override.nix    |  2 +-
 pkgs/applications/office/mytetra/default.nix     |  2 +-
 pkgs/applications/office/qnotero/default.nix     |  2 +-
 pkgs/applications/office/scribus/unstable.nix    |  2 +-
 pkgs/applications/office/skanlite/default.nix    |  2 +-
 pkgs/applications/office/timeular/default.nix    |  2 +-
 pkgs/applications/office/todoman/default.nix     |  2 +-
 pkgs/applications/office/tryton/default.nix      |  2 +-
 pkgs/applications/office/watson/default.nix      |  2 +-
 pkgs/applications/radio/chirp/default.nix        |  2 +-
 pkgs/applications/radio/gqrx/default.nix         |  2 +-
 pkgs/applications/radio/qsstv/default.nix        |  2 +-
 pkgs/applications/radio/quisk/default.nix        |  2 +-
 pkgs/applications/radio/urh/default.nix          |  2 +-
 .../science/biology/eggnog-mapper/default.nix    |  2 +-
 .../science/biology/obitools/obitools3.nix       |  2 +-
 .../science/biology/poretools/default.nix        |  2 +-
 .../science/biology/tebreak/default.nix          |  2 +-
 .../science/chemistry/d-seams/default.nix        |  2 +-
 .../science/chemistry/pymol/default.nix          |  2 +-
 .../science/electronics/caneda/default.nix       |  2 +-
 .../science/electronics/fritzing/default.nix     |  2 +-
 .../science/logic/petrinizer/default.nix         |  2 +-
 .../science/logic/petrinizer/sbv-7.13.nix        |  2 +-
 .../applications/science/logic/petrinizer/z3.nix |  2 +-
 .../machine-learning/labelimg/default.nix        |  2 +-
 .../science/math/almonds/default.nix             |  2 +-
 pkgs/applications/science/math/cemu/default.nix  |  2 +-
 pkgs/applications/science/misc/rink/default.nix  |  2 +-
 .../science/misc/snakemake/default.nix           |  2 +-
 .../terminal-emulators/guake/default.nix         |  2 +-
 .../terminal-emulators/terminator/default.nix    |  2 +-
 .../git-and-tools/bump2version/default.nix       |  2 +-
 .../git-and-tools/ghorg/default.nix              |  2 +-
 .../git-and-tools/ghq/default.nix                |  2 +-
 .../git-annex-metadata-gui/default.nix           |  2 +-
 .../git-annex-remote-b2/default.nix              |  2 +-
 .../git-and-tools/git-appraise/default.nix       |  2 +-
 .../git-and-tools/git-big-picture/default.nix    |  2 +-
 .../git-and-tools/git-bug/default.nix            |  2 +-
 .../git-and-tools/git-cola/default.nix           |  2 +-
 .../git-and-tools/git-fame/default.nix           |  2 +-
 .../git-and-tools/git-remote-hg/default.nix      |  2 +-
 .../git-and-tools/git-vanity-hash/default.nix    |  2 +-
 .../git-and-tools/gitbatch/default.nix           |  2 +-
 .../git-and-tools/gitin/default.nix              |  2 +-
 .../git-and-tools/gitweb/default.nix             |  2 +-
 .../git-and-tools/grv/default.nix                |  2 +-
 .../git-and-tools/hub/default.nix                |  2 +-
 .../git-and-tools/lefthook/default.nix           |  2 +-
 .../git-and-tools/pass-git-helper/default.nix    |  2 +-
 .../git-and-tools/scmpuff/default.nix            |  2 +-
 .../git-and-tools/stgit/default.nix              |  2 +-
 .../version-management/git-crecord/default.nix   |  2 +-
 .../version-management/git-lfs/1.nix             |  2 +-
 .../version-management/git-up/default.nix        |  2 +-
 .../version-management/gitea/default.nix         |  2 +-
 .../version-management/gitinspector/default.nix  |  2 +-
 .../version-management/gitlab/gitaly/default.nix |  2 +-
 .../gitlab/gitlab-shell/default.nix              |  2 +-
 .../gitlab/gitlab-workhorse/default.nix          |  2 +-
 .../version-management/gitless/default.nix       |  2 +-
 .../version-management/gogs/default.nix          |  2 +-
 .../version-management/meld/default.nix          |  2 +-
 .../version-management/nitpick/default.nix       |  2 +-
 .../version-management/peru/default.nix          |  2 +-
 .../version-management/sourcehut/builds.nix      |  2 +-
 .../version-management/sourcehut/core.nix        |  2 +-
 .../version-management/sourcehut/dispatch.nix    |  2 +-
 .../version-management/sourcehut/git.nix         |  2 +-
 .../version-management/sourcehut/hg.nix          |  2 +-
 .../version-management/sourcehut/hub.nix         |  2 +-
 .../version-management/sourcehut/lists.nix       |  2 +-
 .../version-management/sourcehut/man.nix         |  2 +-
 .../version-management/sourcehut/meta.nix        |  2 +-
 .../version-management/sourcehut/paste.nix       |  2 +-
 .../version-management/sourcehut/scm.nix         |  2 +-
 .../version-management/sourcehut/todo.nix        |  2 +-
 pkgs/applications/video/clipgrab/default.nix     |  2 +-
 pkgs/applications/video/devede/default.nix       |  2 +-
 .../video/electronplayer/electronplayer.nix      |  2 +-
 .../video/jellyfin-mpv-shim/default.nix          |  2 +-
 pkgs/applications/video/kazam/default.nix        |  2 +-
 pkgs/applications/video/kodi/wrapper.nix         |  2 +-
 pkgs/applications/video/makemkv/default.nix      |  2 +-
 pkgs/applications/video/mythtv/default.nix       |  2 +-
 pkgs/applications/video/pitivi/default.nix       |  2 +-
 .../video/plex-media-player/default.nix          |  2 +-
 .../applications/video/plex-mpv-shim/default.nix |  2 +-
 pkgs/applications/video/pyca/default.nix         |  2 +-
 .../video/qmediathekview/default.nix             |  2 +-
 pkgs/applications/video/shotcut/default.nix      |  2 +-
 pkgs/applications/video/tartube/default.nix      |  3 +--
 pkgs/applications/video/vokoscreen/default.nix   |  2 +-
 .../virtualization/aqemu/default.nix             |  2 +-
 .../applications/virtualization/cntr/default.nix |  2 +-
 .../virtualization/cri-o/default.nix             |  2 +-
 .../virtualization/docker-compose/default.nix    |  2 +-
 .../virtualization/docker-slim/default.nix       |  2 +-
 .../virtualization/docker/buildx.nix             |  2 +-
 .../virtualization/docker/distribution.nix       |  2 +-
 .../applications/virtualization/docker/proxy.nix |  2 +-
 .../virtualization/ecs-agent/default.nix         |  2 +-
 .../virtualization/firectl/default.nix           |  2 +-
 .../virtualization/gvisor/default.nix            |  2 +-
 .../virtualization/qtemu/default.nix             |  2 +-
 .../virtualization/singularity/default.nix       |  3 +--
 .../virtualization/virt-manager/default.nix      |  2 +-
 pkgs/applications/virtualization/xen/4.10.nix    |  2 +-
 .../applications/virtualization/xen/packages.nix |  2 +-
 .../window-managers/btops/default.nix            |  2 +-
 .../window-managers/dwm/dwm-status.nix           |  2 +-
 pkgs/applications/window-managers/i3/gaps.nix    |  2 +-
 .../applications/window-managers/i3/pystatus.nix |  2 +-
 .../window-managers/i3/status-rust.nix           |  2 +-
 .../window-managers/i3/wk-switch.nix             |  2 +-
 pkgs/applications/window-managers/i3/wmfocus.nix |  2 +-
 .../window-managers/leftwm/default.nix           |  2 +-
 .../window-managers/qtile/default.nix            |  2 +-
 .../window-managers/sway/wrapper.nix             |  2 +-
 pkgs/build-support/appimage/default.nix          |  2 +-
 .../build-fhs-userenv-bubblewrap/default.nix     |  2 +-
 pkgs/build-support/emacs/trivial.nix             |  2 +-
 .../fetchdocker/fetchDockerConfig.nix            |  2 +-
 .../fetchdocker/fetchDockerLayer.nix             |  2 +-
 pkgs/build-support/plugins.nix                   |  2 +-
 pkgs/common-updater/unstable-updater.nix         |  3 +--
 pkgs/data/documentation/zeal/default.nix         |  2 +-
 pkgs/data/fonts/et-book/default.nix              |  2 +-
 pkgs/data/fonts/fira-code/default.nix            |  2 +-
 pkgs/data/fonts/fira-code/symbols.nix            |  2 +-
 pkgs/data/fonts/fira-mono/default.nix            |  2 +-
 pkgs/data/fonts/fixedsys-excelsior/default.nix   |  2 +-
 pkgs/data/fonts/go-font/default.nix              |  2 +-
 pkgs/data/fonts/jost/default.nix                 |  2 +-
 pkgs/data/fonts/paratype-pt/mono.nix             |  2 +-
 pkgs/data/fonts/paratype-pt/sans.nix             |  2 +-
 pkgs/data/fonts/paratype-pt/serif.nix            |  2 +-
 pkgs/data/fonts/ttf-bitstream-vera/default.nix   |  2 +-
 pkgs/data/fonts/ttf-tw-moe/default.nix           |  2 +-
 pkgs/data/fonts/vista-fonts/default.nix          |  2 +-
 pkgs/data/misc/iana-etc/default.nix              |  2 +-
 pkgs/data/misc/mime-types/default.nix            |  2 +-
 pkgs/data/misc/unicode-emoji/default.nix         |  3 +--
 .../cinnamon-gsettings-overrides/default.nix     |  2 +-
 pkgs/desktops/cinnamon/warpinator/default.nix    |  2 +-
 .../desktops/gnome-3/apps/accerciser/default.nix |  2 +-
 .../gnome-3/apps/gnome-music/default.nix         |  2 +-
 .../desktops/gnome-3/core/gnome-tour/default.nix |  2 +-
 .../lumina/lumina-calculator/default.nix         |  2 +-
 pkgs/desktops/lumina/lumina-pdf/default.nix      |  2 +-
 pkgs/desktops/lumina/lumina/default.nix          |  2 +-
 pkgs/desktops/mate/mate-tweak/default.nix        |  2 +-
 pkgs/desktops/mate/mozo/default.nix              |  2 +-
 .../elementary-gsettings-schemas/default.nix     |  2 +-
 .../xfce/applications/catfish/default.nix        |  2 +-
 .../xfce4-datetime-plugin/default.nix            |  2 +-
 .../xfce/thunar-plugins/archive/default.nix      |  2 +-
 pkgs/development/arduino/ino/default.nix         |  2 +-
 pkgs/development/beam-modules/build-hex.nix      |  2 +-
 pkgs/development/beam-modules/default.nix        |  2 +-
 pkgs/development/beam-modules/lib.nix            |  2 +-
 pkgs/development/compilers/carp/default.nix      |  2 +-
 pkgs/development/compilers/chicken/4/egg2nix.nix |  2 +-
 pkgs/development/compilers/chicken/4/eggs.nix    |  2 +-
 pkgs/development/compilers/chicken/5/egg2nix.nix |  2 +-
 pkgs/development/compilers/chicken/5/eggs.nix    |  2 +-
 .../compilers/elm/packages/elm-format.nix        |  2 +-
 .../compilers/elm/packages/elm-instrument.nix    |  2 +-
 pkgs/development/compilers/elm/packages/elm.nix  |  2 +-
 .../compilers/elm/packages/elmi-to-json.nix      |  2 +-
 .../compilers/elm/packages/indents.nix           |  2 +-
 .../compilers/ghcjs-ng/ghcjs-base.nix            |  2 +-
 .../compilers/ios-cross-compile/9.2.nix          |  2 +-
 .../compilers/jetbrains-jdk/default.nix          |  2 +-
 .../meta-environment/meta-build-env/default.nix  |  4 +++-
 pkgs/development/compilers/osl/default.nix       |  2 +-
 pkgs/development/compilers/pakcs/curry-base.nix  |  2 +-
 .../compilers/pakcs/curry-frontend.nix           |  2 +-
 pkgs/development/compilers/vyper/default.nix     |  2 +-
 pkgs/development/idris-modules/tfrandom.nix      |  4 ++--
 pkgs/development/idris-modules/with-packages.nix |  2 +-
 pkgs/development/interpreters/hy/default.nix     |  2 +-
 pkgs/development/interpreters/joker/default.nix  |  2 +-
 .../interpreters/lfe/generic-builder.nix         |  2 +-
 pkgs/development/interpreters/perl/wrapper.nix   |  2 +-
 pkgs/development/interpreters/pyrex/0.9.5.nix    |  2 +-
 pkgs/development/interpreters/pyrex/0.9.6.nix    |  2 +-
 .../java-modules/build-maven-package.nix         |  2 +-
 pkgs/development/java-modules/junit/default.nix  |  2 +-
 .../java-modules/maven-hello/default.nix         |  2 +-
 pkgs/development/java-modules/maven-minimal.nix  |  2 +-
 .../libraries/agda/agda-prelude/default.nix      |  2 +-
 .../agda/functional-linear-algebra/default.nix   |  2 +-
 .../libraries/agda/iowa-stdlib/default.nix       |  2 +-
 .../libraries/agda/standard-library/default.nix  |  2 +-
 pkgs/development/libraries/appstream/qt.nix      |  2 +-
 pkgs/development/libraries/boost/1.59.nix        |  2 +-
 pkgs/development/libraries/boost/1.60.nix        |  2 +-
 pkgs/development/libraries/boost/1.65.nix        |  2 +-
 pkgs/development/libraries/boost/1.66.nix        |  2 +-
 pkgs/development/libraries/boost/1.68.nix        |  2 +-
 pkgs/development/libraries/boost/1.69.nix        |  2 +-
 pkgs/development/libraries/boost/1.70.nix        |  2 +-
 pkgs/development/libraries/boost/1.71.nix        |  2 +-
 pkgs/development/libraries/boost/1.72.nix        |  2 +-
 pkgs/development/libraries/boost/1.73.nix        |  2 +-
 pkgs/development/libraries/boost/1.74.nix        |  2 +-
 pkgs/development/libraries/boost/1.75.nix        |  2 +-
 pkgs/development/libraries/cxxtest/default.nix   |  2 +-
 pkgs/development/libraries/ffmpeg/3.4.nix        |  2 +-
 pkgs/development/libraries/ffmpeg/4.nix          |  2 +-
 .../development/libraries/java/junit/default.nix |  2 +-
 .../libraries/libcollectdclient/default.nix      |  2 +-
 .../libraries/libmicrohttpd/0.9.70.nix           |  2 +-
 .../libraries/libmicrohttpd/0.9.71.nix           |  2 +-
 .../libraries/libmicrohttpd/0.9.72.nix           |  2 +-
 pkgs/development/libraries/lief/default.nix      |  2 +-
 pkgs/development/libraries/mlt/qt-5.nix          |  2 +-
 pkgs/development/libraries/packr/default.nix     |  2 +-
 pkgs/development/libraries/pkger/default.nix     |  2 +-
 .../libraries/prototypejs/default.nix            |  2 +-
 pkgs/development/libraries/psol/generic.nix      |  2 +-
 .../libraries/qt-5/modules/qtmacextras.nix       |  2 +-
 .../libraries/qtstyleplugins/default.nix         |  2 +-
 .../libraries/scriptaculous/default.nix          |  4 +++-
 .../libraries/smarty3-i18n/default.nix           |  4 +++-
 pkgs/development/libraries/smarty3/default.nix   |  4 +++-
 .../libraries/stellarsolver/default.nix          |  2 +-
 .../development/libraries/vapoursynth/editor.nix |  2 +-
 .../lua-modules/generated-packages.nix           |  2 +-
 .../misc/haskell/hasura/ci-info/default.nix      |  2 +-
 .../haskell/hasura/graphql-engine/default.nix    |  2 +-
 .../haskell/hasura/graphql-parser/default.nix    |  2 +-
 .../misc/haskell/hasura/pg-client/default.nix    |  2 +-
 pkgs/development/misc/loc/default.nix            |  2 +-
 .../ocaml-modules/janestreet/variantslib.nix     |  2 +-
 pkgs/development/ocaml-modules/kafka/default.nix |  2 +-
 .../development/ocaml-modules/parany/default.nix |  2 +-
 .../ocaml-modules/phylogenetics/default.nix      |  2 +-
 pkgs/development/ocaml-modules/wtf8/default.nix  |  2 +-
 pkgs/development/perl-modules/MNI/default.nix    |  2 +-
 .../perl-modules/Percona-Toolkit/default.nix     |  2 +-
 .../development/perl-modules/maatkit/default.nix |  2 +-
 .../python-modules/FormEncode/default.nix        |  2 +-
 .../development/python-modules/HTSeq/default.nix |  2 +-
 pkgs/development/python-modules/IPy/default.nix  |  2 +-
 pkgs/development/python-modules/PyLD/default.nix |  2 +-
 .../python-modules/ROPGadget/default.nix         |  2 +-
 pkgs/development/python-modules/Wand/default.nix |  2 +-
 .../WazeRouteCalculator/default.nix              |  2 +-
 .../python-modules/aadict/default.nix            |  2 +-
 .../python-modules/aafigure/default.nix          |  2 +-
 .../python-modules/acebinf/default.nix           |  2 +-
 .../python-modules/acme-tiny/default.nix         |  2 +-
 .../python-modules/actdiag/default.nix           |  2 +-
 pkgs/development/python-modules/adal/default.nix |  2 +-
 .../development/python-modules/aenum/default.nix |  2 +-
 .../python-modules/agate-dbf/default.nix         |  2 +-
 .../python-modules/agate-sql/default.nix         |  2 +-
 .../python-modules/aiobotocore/default.nix       |  2 +-
 .../python-modules/aiodns/default.nix            |  2 +-
 .../python-modules/aioeventlet/default.nix       |  2 +-
 .../python-modules/aioitertools/default.nix      |  2 +-
 .../python-modules/aioredis/default.nix          |  2 +-
 .../python-modules/aiozeroconf/default.nix       |  2 +-
 pkgs/development/python-modules/ajpy/default.nix |  2 +-
 .../python-modules/alabaster/default.nix         |  2 +-
 .../python-modules/alarmdecoder/default.nix      |  2 +-
 .../python-modules/alembic/default.nix           |  2 +-
 .../python-modules/alerta-server/default.nix     |  2 +-
 .../python-modules/alerta/default.nix            |  2 +-
 pkgs/development/python-modules/alot/default.nix |  2 +-
 .../python-modules/altair/default.nix            |  2 +-
 .../python-modules/amazon_kclpy/default.nix      |  2 +-
 .../development/python-modules/amply/default.nix |  2 +-
 pkgs/development/python-modules/amqp/default.nix |  2 +-
 .../python-modules/amqplib/default.nix           |  2 +-
 .../python-modules/aniso8601/default.nix         |  2 +-
 .../development/python-modules/annoy/default.nix |  2 +-
 .../python-modules/anonip/default.nix            |  2 +-
 .../python-modules/ansicolor/default.nix         |  2 +-
 .../python-modules/ansicolors/default.nix        |  2 +-
 .../python-modules/ansiconv/default.nix          |  2 +-
 .../python-modules/apipkg/default.nix            |  2 +-
 .../python-modules/approvaltests/default.nix     |  2 +-
 pkgs/development/python-modules/apsw/default.nix |  2 +-
 pkgs/development/python-modules/argh/default.nix |  2 +-
 pkgs/development/python-modules/args/default.nix |  2 +-
 .../python-modules/aria2p/default.nix            |  2 +-
 .../development/python-modules/arrow/default.nix |  2 +-
 .../development/python-modules/asana/default.nix |  2 +-
 .../python-modules/asn1ate/default.nix           |  2 +-
 .../python-modules/astral/default.nix            |  2 +-
 .../python-modules/astunparse/default.nix        |  2 +-
 .../python-modules/asyncssh/default.nix          |  2 +-
 .../python-modules/atomiclong/default.nix        |  2 +-
 .../python-modules/atomicwrites/default.nix      |  2 +-
 .../python-modules/atomman/default.nix           |  2 +-
 .../python-modules/atsim_potentials/default.nix  |  2 +-
 .../python-modules/attrdict/default.nix          |  2 +-
 .../python-modules/authlib/default.nix           |  2 +-
 .../python-modules/authres/default.nix           |  2 +-
 .../python-modules/autograd/default.nix          |  2 +-
 .../python-modules/autologging/default.nix       |  2 +-
 .../python-modules/automat/default.nix           |  2 +-
 .../python-modules/autopep8/default.nix          |  2 +-
 .../python-modules/avro-python3/default.nix      |  2 +-
 pkgs/development/python-modules/avro/default.nix |  2 +-
 .../python-modules/avro3k/default.nix            |  2 +-
 .../python-modules/awesome-slugify/default.nix   |  2 +-
 .../development/python-modules/b2sdk/default.nix |  2 +-
 .../python-modules/babelfish/default.nix         |  2 +-
 .../babelgladeextractor/default.nix              |  3 +--
 .../backports-shutil-which/default.nix           |  2 +-
 .../python-modules/backports_csv/default.nix     |  2 +-
 .../python-modules/backports_os/default.nix      |  2 +-
 .../backports_unittest-mock/default.nix          |  2 +-
 .../python-modules/backports_weakref/default.nix |  2 +-
 .../python-modules/bacpypes/default.nix          |  2 +-
 pkgs/development/python-modules/bap/default.nix  |  2 +-
 .../python-modules/base58/default.nix            |  2 +-
 .../python-modules/basemap/default.nix           |  2 +-
 .../python-modules/batinfo/default.nix           |  2 +-
 .../python-modules/bayespy/default.nix           |  2 +-
 .../development/python-modules/bcdoc/default.nix |  2 +-
 pkgs/development/python-modules/bcrypt/3_1.nix   |  2 +-
 .../python-modules/bcrypt/default.nix            |  2 +-
 .../python-modules/beancount/default.nix         |  2 +-
 .../python-modules/beanstalkc/default.nix        |  2 +-
 .../python-modules/beautifulsoup4/default.nix    |  2 +-
 .../development/python-modules/bedup/default.nix |  2 +-
 .../python-modules/bellows/default.nix           |  2 +-
 .../python-modules/bespon/default.nix            |  2 +-
 .../python-modules/betamax-matchers/default.nix  |  2 +-
 .../betamax-serializers/default.nix              |  2 +-
 .../python-modules/betamax/default.nix           |  2 +-
 .../python-modules/billiard/default.nix          |  2 +-
 .../python-modules/binwalk/default.nix           |  2 +-
 .../python-modules/bitbucket-api/default.nix     |  2 +-
 .../python-modules/bitbucket-cli/default.nix     |  2 +-
 .../python-modules/bitmath/default.nix           |  2 +-
 .../python-modules/bitstring/default.nix         |  2 +-
 .../python-modules/bjoern/default.nix            |  2 +-
 .../python-modules/black-macchiato/default.nix   |  2 +-
 .../development/python-modules/bleak/default.nix |  2 +-
 .../python-modules/blessed/default.nix           |  2 +-
 .../python-modules/blessings/default.nix         |  2 +-
 .../python-modules/blinker/default.nix           |  2 +-
 pkgs/development/python-modules/blis/default.nix |  2 +-
 .../development/python-modules/blist/default.nix |  2 +-
 .../python-modules/blivet/default.nix            |  2 +-
 .../python-modules/block-io/default.nix          |  2 +-
 .../python-modules/blockdiag/default.nix         |  2 +-
 .../python-modules/bluepy/default.nix            |  2 +-
 .../python-modules/boltons/default.nix           |  2 +-
 .../python-modules/boltztrap2/default.nix        |  2 +-
 .../python-modules/bottle/default.nix            |  2 +-
 .../development/python-modules/box2d/default.nix |  2 +-
 .../python-modules/bpython/default.nix           |  2 +-
 .../python-modules/bsddb3/default.nix            |  2 +-
 .../python-modules/bsdiff4/default.nix           |  2 +-
 .../python-modules/bt-proximity/default.nix      |  2 +-
 .../python-modules/btchip/default.nix            |  2 +-
 .../python-modules/btrees/default.nix            |  2 +-
 .../development/python-modules/btrfs/default.nix |  2 +-
 .../python-modules/bugsnag/default.nix           |  2 +-
 .../python-modules/bugwarrior/default.nix        |  2 +-
 pkgs/development/python-modules/bugz/default.nix |  2 +-
 .../python-modules/bugzilla/default.nix          |  2 +-
 .../python-modules/buildout/default.nix          |  2 +-
 .../development/python-modules/bumps/default.nix |  2 +-
 .../development/python-modules/bunch/default.nix |  2 +-
 .../development/python-modules/bwapy/default.nix |  2 +-
 .../python-modules/cachecontrol/default.nix      |  2 +-
 .../python-modules/cachelib/default.nix          |  2 +-
 .../python-modules/cachetools/default.nix        |  2 +-
 pkgs/development/python-modules/cairosvg/1_x.nix |  2 +-
 .../python-modules/cairosvg/default.nix          |  2 +-
 .../python-modules/canonicaljson/default.nix     |  2 +-
 .../python-modules/carbon/default.nix            |  2 +-
 .../python-modules/carrot/default.nix            |  2 +-
 pkgs/development/python-modules/case/default.nix |  2 +-
 .../python-modules/cassandra-driver/default.nix  |  2 +-
 .../python-modules/casttube/default.nix          |  2 +-
 .../python-modules/catalogue/default.nix         |  2 +-
 pkgs/development/python-modules/cbor/default.nix |  2 +-
 .../python-modules/cccolutils/default.nix        |  2 +-
 .../python-modules/cement/default.nix            |  2 +-
 .../python-modules/cerberus/default.nix          |  2 +-
 .../python-modules/certipy/default.nix           |  2 +-
 .../python-modules/cgroup-utils/default.nix      |  2 +-
 pkgs/development/python-modules/chai/default.nix |  2 +-
 .../python-modules/chainmap/default.nix          |  2 +-
 .../python-modules/chameleon/default.nix         |  2 +-
 .../python-modules/channels-redis/default.nix    |  2 +-
 .../python-modules/channels/default.nix          |  2 +-
 .../python-modules/chardet/default.nix           |  2 +-
 .../python-modules/check-manifest/default.nix    |  2 +-
 .../development/python-modules/cjson/default.nix |  2 +-
 .../python-modules/ckcc-protocol/default.nix     |  3 +--
 pkgs/development/python-modules/clf/default.nix  |  2 +-
 .../python-modules/cliapp/default.nix            |  2 +-
 .../python-modules/click-completion/default.nix  |  2 +-
 .../python-modules/click-didyoumean/default.nix  |  2 +-
 .../python-modules/click-help-colors/default.nix |  2 +-
 .../python-modules/click-log/default.nix         |  2 +-
 .../python-modules/click-plugins/default.nix     |  2 +-
 .../python-modules/click-repl/default.nix        |  2 +-
 .../python-modules/clickclick/default.nix        |  2 +-
 .../development/python-modules/cligj/default.nix |  2 +-
 .../development/python-modules/clint/default.nix |  2 +-
 .../development/python-modules/clize/default.nix |  2 +-
 .../python-modules/closure-linter/default.nix    |  2 +-
 .../python-modules/cloudpickle/default.nix       |  2 +-
 .../python-modules/clustershell/default.nix      |  2 +-
 .../python-modules/cmdline/default.nix           |  2 +-
 .../python-modules/cmdtest/default.nix           |  2 +-
 .../python-modules/cocotb/default.nix            |  2 +-
 .../python-modules/cogapp/default.nix            |  2 +-
 .../python-modules/coilmq/default.nix            |  2 +-
 .../python-modules/colanderalchemy/default.nix   |  2 +-
 .../python-modules/colorama/default.nix          |  2 +-
 .../python-modules/colorcet/default.nix          |  2 +-
 .../python-modules/colorclass/default.nix        |  2 +-
 .../python-modules/colored/default.nix           |  2 +-
 .../python-modules/colour/default.nix            |  2 +-
 .../python-modules/configobj/default.nix         |  2 +-
 .../python-modules/configshell/default.nix       |  2 +-
 .../python-modules/confluent-kafka/default.nix   |  2 +-
 .../python-modules/constantly/default.nix        |  2 +-
 .../python-modules/consul/default.nix            |  2 +-
 .../python-modules/contexter/default.nix         |  2 +-
 .../python-modules/convertdate/default.nix       |  2 +-
 .../python-modules/cookiecutter/default.nix      |  2 +-
 .../python-modules/cookies/default.nix           |  2 +-
 .../python-modules/coreapi/default.nix           |  2 +-
 .../python-modules/coreschema/default.nix        |  2 +-
 .../python-modules/cornice/default.nix           |  2 +-
 .../python-modules/cov-core/default.nix          |  2 +-
 .../python-modules/cppheaderparser/default.nix   |  2 +-
 .../development/python-modules/crate/default.nix |  2 +-
 .../python-modules/crayons/default.nix           |  2 +-
 .../development/python-modules/crc16/default.nix |  2 +-
 .../python-modules/crccheck/default.nix          |  2 +-
 .../python-modules/crcmod/default.nix            |  2 +-
 .../python-modules/credstash/default.nix         |  2 +-
 .../python-modules/cryptacular/default.nix       |  2 +-
 .../python-modules/cssmin/default.nix            |  2 +-
 .../python-modules/cssselect/default.nix         |  2 +-
 .../python-modules/cssutils/default.nix          |  2 +-
 pkgs/development/python-modules/cupy/default.nix |  2 +-
 .../python-modules/curtsies/default.nix          |  2 +-
 .../python-modules/curve25519-donna/default.nix  |  2 +-
 .../python-modules/cvxopt/default.nix            |  3 +--
 .../python-modules/cx_freeze/default.nix         |  2 +-
 .../python-modules/cx_oracle/default.nix         |  2 +-
 .../development/python-modules/cymem/default.nix |  2 +-
 .../python-modules/cypari2/default.nix           |  2 +-
 .../python-modules/daemonize/default.nix         |  2 +-
 .../python-modules/darcsver/default.nix          |  2 +-
 .../python-modules/dask-glm/default.nix          |  2 +-
 .../python-modules/dask-image/default.nix        |  2 +-
 .../python-modules/dask-jobqueue/default.nix     |  2 +-
 .../python-modules/dask-ml/default.nix           |  2 +-
 .../python-modules/dask-mpi/default.nix          |  2 +-
 .../python-modules/dask-xgboost/default.nix      |  2 +-
 .../python-modules/databricks-cli/default.nix    |  2 +-
 .../python-modules/dataclasses/default.nix       |  2 +-
 .../python-modules/datadiff/default.nix          |  2 +-
 .../python-modules/datamodeldict/default.nix     |  2 +-
 .../python-modules/dateutil/default.nix          |  2 +-
 .../python-modules/datrie/default.nix            |  2 +-
 pkgs/development/python-modules/dbf/default.nix  |  2 +-
 .../python-modules/dbfread/default.nix           |  2 +-
 .../python-modules/dbus-next/default.nix         |  2 +-
 .../python-modules/dbutils/default.nix           |  2 +-
 .../python-modules/dcmstack/default.nix          |  2 +-
 pkgs/development/python-modules/deap/default.nix |  2 +-
 .../python-modules/deluge-client/default.nix     |  2 +-
 .../python-modules/demjson/default.nix           |  2 +-
 .../dependency-injector/default.nix              |  2 +-
 .../python-modules/deprecated/default.nix        |  2 +-
 .../python-modules/derpconf/default.nix          |  2 +-
 .../python-modules/descartes/default.nix         |  2 +-
 .../python-modules/deskcon/default.nix           |  2 +-
 .../python-modules/diff_cover/default.nix        |  2 +-
 .../python-modules/digi-xbee/default.nix         |  2 +-
 .../python-modules/discogs_client/default.nix    |  2 +-
 .../python-modules/distlib/default.nix           |  2 +-
 .../python-modules/distorm3/default.nix          |  2 +-
 .../python-modules/distro/default.nix            |  2 +-
 .../python-modules/distutils_extra/default.nix   |  2 +-
 .../python-modules/dj-email-url/default.nix      |  2 +-
 .../python-modules/dj-search-url/default.nix     |  2 +-
 .../python-modules/django-allauth/default.nix    |  2 +-
 .../python-modules/django-anymail/default.nix    |  2 +-
 .../python-modules/django-auth-ldap/default.nix  |  2 +-
 .../python-modules/django-cache-url/default.nix  |  2 +-
 .../python-modules/django-cleanup/default.nix    |  2 +-
 .../python-modules/django-compat/default.nix     |  2 +-
 .../django-configurations/default.nix            |  2 +-
 .../python-modules/django-csp/default.nix        |  2 +-
 .../django-discover-runner/default.nix           |  2 +-
 .../django-dynamic-preferences/default.nix       |  2 +-
 .../python-modules/django-filter/default.nix     |  2 +-
 .../python-modules/django-gravatar2/default.nix  |  2 +-
 .../django-hijack-admin/default.nix              |  2 +-
 .../python-modules/django-hijack/default.nix     |  2 +-
 .../django-logentry-admin/default.nix            |  2 +-
 .../python-modules/django-mailman3/default.nix   |  2 +-
 .../django-maintenance-mode/default.nix          |  2 +-
 .../django-oauth-toolkit/default.nix             |  2 +-
 .../python-modules/django-paintstore/default.nix |  2 +-
 .../django-polymorphic/default.nix               |  2 +-
 .../django-postgresql-netfields/default.nix      |  2 +-
 .../python-modules/django-q/default.nix          |  2 +-
 .../django-ranged-response/default.nix           |  2 +-
 .../python-modules/django-raster/default.nix     |  2 +-
 .../python-modules/django-storages/default.nix   |  2 +-
 .../django-versatileimagefield/default.nix       |  2 +-
 .../django-webpack-loader/default.nix            |  2 +-
 .../django-widget-tweaks/default.nix             |  2 +-
 .../python-modules/django_appconf/default.nix    |  2 +-
 .../python-modules/django_classytags/default.nix |  2 +-
 .../python-modules/django_colorful/default.nix   |  2 +-
 .../python-modules/django_compressor/default.nix |  2 +-
 .../django_contrib_comments/default.nix          |  2 +-
 .../python-modules/django_environ/default.nix    |  2 +-
 .../python-modules/django_evolution/default.nix  |  2 +-
 .../python-modules/django_guardian/default.nix   |  2 +-
 .../django_modelcluster/default.nix              |  2 +-
 .../python-modules/django_nose/default.nix       |  2 +-
 .../python-modules/django_redis/default.nix      |  2 +-
 .../python-modules/django_reversion/default.nix  |  2 +-
 .../python-modules/django_silk/default.nix       |  2 +-
 .../python-modules/django_taggit/default.nix     |  2 +-
 .../python-modules/django_treebeard/default.nix  |  2 +-
 .../djangorestframework/default.nix              |  2 +-
 .../python-modules/dkimpy/default.nix            |  2 +-
 .../python-modules/docker-pycreds/default.nix    |  2 +-
 .../python-modules/dockerfile-parse/default.nix  |  2 +-
 .../python-modules/dockerpty/default.nix         |  2 +-
 .../python-modules/docopt/default.nix            |  2 +-
 .../doctest-ignore-unicode/default.nix           |  2 +-
 .../python-modules/dogpile.cache/default.nix     |  2 +-
 .../python-modules/dogpile.core/default.nix      |  2 +-
 .../python-modules/dot2tex/default.nix           |  2 +-
 .../development/python-modules/dpath/default.nix |  2 +-
 pkgs/development/python-modules/dpkt/default.nix |  2 +-
 .../python-modules/drf-yasg/default.nix          |  2 +-
 .../python-modules/dropbox/default.nix           |  2 +-
 .../development/python-modules/dtopt/default.nix |  2 +-
 .../development/python-modules/dufte/default.nix |  2 +-
 pkgs/development/python-modules/dyn/default.nix  |  2 +-
 pkgs/development/python-modules/dynd/default.nix |  2 +-
 .../python-modules/easygui/default.nix           |  2 +-
 .../python-modules/easyprocess/default.nix       |  2 +-
 .../python-modules/easysnmp/default.nix          |  3 +--
 .../development/python-modules/ecdsa/default.nix |  2 +-
 .../python-modules/ed25519/default.nix           |  2 +-
 .../python-modules/editorconfig/default.nix      |  2 +-
 .../python-modules/edward/default.nix            |  2 +-
 .../python-modules/eggdeps/default.nix           |  2 +-
 .../python-modules/elasticsearch-dsl/default.nix |  2 +-
 .../python-modules/elasticsearch/default.nix     |  2 +-
 .../development/python-modules/eliot/default.nix |  2 +-
 .../development/python-modules/emcee/default.nix |  2 +-
 pkgs/development/python-modules/emv/default.nix  |  2 +-
 pkgs/development/python-modules/enum/default.nix |  2 +-
 .../python-modules/enum34/default.nix            |  2 +-
 pkgs/development/python-modules/epc/default.nix  |  2 +-
 .../development/python-modules/ephem/default.nix |  2 +-
 .../python-modules/et_xmlfile/default.nix        |  2 +-
 pkgs/development/python-modules/etcd/default.nix |  2 +-
 pkgs/development/python-modules/eve/default.nix  |  2 +-
 .../python-modules/eventlib/default.nix          |  2 +-
 .../python-modules/evernote/default.nix          |  2 +-
 .../python-modules/exchangelib/default.nix       |  2 +-
 .../python-modules/execnet/default.nix           |  3 +--
 .../python-modules/exifread/default.nix          |  2 +-
 .../development/python-modules/eyed3/default.nix |  3 +--
 .../development/python-modules/ezdxf/default.nix |  2 +-
 pkgs/development/python-modules/face/default.nix |  2 +-
 .../python-modules/face_recognition/default.nix  |  2 +-
 .../face_recognition_models/default.nix          |  2 +-
 .../python-modules/fake-useragent/default.nix    |  2 +-
 .../python-modules/fake_factory/default.nix      |  2 +-
 .../python-modules/falcon/default.nix            |  2 +-
 .../python-modules/fasteners/default.nix         |  2 +-
 .../python-modules/fastentrypoints/default.nix   |  2 +-
 .../python-modules/fastimport/default.nix        |  2 +-
 .../python-modules/fastpair/default.nix          |  2 +-
 .../python-modules/fastpbkdf2/default.nix        |  2 +-
 .../python-modules/fastprogress/default.nix      |  2 +-
 .../python-modules/fastrlock/default.nix         |  2 +-
 .../python-modules/fasttext/default.nix          |  2 +-
 .../development/python-modules/fdint/default.nix |  2 +-
 .../python-modules/feedgen/default.nix           |  2 +-
 .../python-modules/feedgenerator/default.nix     |  2 +-
 pkgs/development/python-modules/feedparser/5.nix |  2 +-
 .../python-modules/feedparser/default.nix        |  2 +-
 .../python-modules/filebrowser_safe/default.nix  |  2 +-
 .../python-modules/filebytes/default.nix         |  2 +-
 .../python-modules/filelock/default.nix          |  2 +-
 .../python-modules/filterpy/default.nix          |  2 +-
 .../development/python-modules/fints/default.nix |  2 +-
 pkgs/development/python-modules/fire/default.nix |  2 +-
 .../development/python-modules/first/default.nix |  2 +-
 .../python-modules/flake8/default.nix            |  2 +-
 .../development/python-modules/flaky/default.nix |  2 +-
 .../python-modules/flask-babel/default.nix       |  2 +-
 .../python-modules/flask-common/default.nix      |  2 +-
 .../python-modules/flask-compress/default.nix    |  2 +-
 .../python-modules/flask-cors/default.nix        |  2 +-
 .../python-modules/flask-elastic/default.nix     |  2 +-
 .../flask-jwt-extended/default.nix               |  2 +-
 .../python-modules/flask-ldap-login/default.nix  |  2 +-
 .../python-modules/flask-limiter/default.nix     |  2 +-
 .../python-modules/flask-login/default.nix       |  2 +-
 .../flask-reverse-proxy-fix/default.nix          |  2 +-
 .../python-modules/flask-silk/default.nix        |  2 +-
 .../python-modules/flask-sqlalchemy/default.nix  |  2 +-
 .../python-modules/flask-swagger-ui/default.nix  |  2 +-
 .../python-modules/flask-swagger/default.nix     |  2 +-
 .../python-modules/flask-versioned/default.nix   |  2 +-
 .../python-modules/flask-wtf/default.nix         |  2 +-
 .../development/python-modules/flask/default.nix |  2 +-
 .../python-modules/flaskbabel/default.nix        |  2 +-
 .../python-modules/flowlogs_reader/default.nix   |  2 +-
 pkgs/development/python-modules/flup/default.nix |  2 +-
 .../python-modules/flux-led/default.nix          |  2 +-
 .../python-modules/foolscap/default.nix          |  2 +-
 .../python-modules/forbiddenfruit/default.nix    |  2 +-
 .../python-modules/foxdot/default.nix            |  2 +-
 .../development/python-modules/freezegun/0.3.nix |  2 +-
 .../python-modules/freezegun/default.nix         |  2 +-
 .../python-modules/fritzconnection/default.nix   |  2 +-
 .../python-modules/frozendict/default.nix        |  2 +-
 pkgs/development/python-modules/ftfy/default.nix |  2 +-
 .../development/python-modules/fudge/default.nix |  2 +-
 .../python-modules/funcparserlib/default.nix     |  2 +-
 .../python-modules/funcsigs/default.nix          |  2 +-
 .../python-modules/functools32/default.nix       |  2 +-
 .../development/python-modules/funcy/default.nix |  2 +-
 pkgs/development/python-modules/furl/default.nix |  2 +-
 .../python-modules/fuse-python/default.nix       |  2 +-
 .../python-modules/fusepy/default.nix            |  2 +-
 .../python-modules/fuzzywuzzy/default.nix        |  2 +-
 pkgs/development/python-modules/gast/default.nix |  2 +-
 .../python-modules/gateone/default.nix           |  2 +-
 .../development/python-modules/gcovr/default.nix |  2 +-
 .../development/python-modules/gdata/default.nix |  2 +-
 .../python-modules/gdrivefs/default.nix          |  2 +-
 .../python-modules/geeknote/default.nix          |  2 +-
 .../python-modules/genanki/default.nix           |  2 +-
 .../python-modules/genshi/default.nix            |  2 +-
 .../python-modules/genzshcomp/default.nix        |  2 +-
 .../python-modules/geoalchemy2/default.nix       |  2 +-
 .../python-modules/geographiclib/default.nix     |  2 +-
 pkgs/development/python-modules/geopy/2.nix      |  2 +-
 .../python-modules/gevent-socketio/default.nix   |  2 +-
 .../python-modules/gevent-websocket/default.nix  |  2 +-
 .../python-modules/gevent/default.nix            |  2 +-
 .../python-modules/geventhttpclient/default.nix  |  2 +-
 .../python-modules/ghdiff/default.nix            |  2 +-
 pkgs/development/python-modules/gipc/default.nix |  2 +-
 .../python-modules/git-annex-adapter/default.nix |  2 +-
 .../python-modules/git-sweep/default.nix         |  2 +-
 .../python-modules/globre/default.nix            |  2 +-
 pkgs/development/python-modules/glom/default.nix |  2 +-
 .../development/python-modules/gmpy2/default.nix |  2 +-
 .../python-modules/gmusicapi/default.nix         |  2 +-
 .../python-modules/gnureadline/default.nix       |  2 +-
 .../python-modules/gnutls/default.nix            |  2 +-
 .../python-modules/goobook/default.nix           |  2 +-
 .../python-modules/google-apputils/default.nix   |  2 +-
 .../python-modules/google-auth/default.nix       |  2 +-
 .../google-cloud-asset/default.nix               |  2 +-
 .../google-cloud-automl/default.nix              |  2 +-
 .../default.nix                                  |  2 +-
 .../google-cloud-bigquery/default.nix            |  2 +-
 .../google-cloud-bigtable/default.nix            |  2 +-
 .../google-cloud-container/default.nix           |  2 +-
 .../python-modules/google-cloud-core/default.nix |  2 +-
 .../google-cloud-dataproc/default.nix            |  2 +-
 .../google-cloud-datastore/default.nix           |  2 +-
 .../python-modules/google-cloud-dlp/default.nix  |  2 +-
 .../python-modules/google-cloud-dns/default.nix  |  2 +-
 .../google-cloud-error-reporting/default.nix     |  2 +-
 .../google-cloud-firestore/default.nix           |  2 +-
 .../python-modules/google-cloud-iot/default.nix  |  2 +-
 .../python-modules/google-cloud-kms/default.nix  |  2 +-
 .../google-cloud-language/default.nix            |  2 +-
 .../google-cloud-logging/default.nix             |  2 +-
 .../google-cloud-monitoring/default.nix          |  2 +-
 .../google-cloud-pubsub/default.nix              |  2 +-
 .../google-cloud-redis/default.nix               |  2 +-
 .../google-cloud-resource-manager/default.nix    |  2 +-
 .../google-cloud-runtimeconfig/default.nix       |  2 +-
 .../google-cloud-securitycenter/default.nix      |  2 +-
 .../google-cloud-spanner/default.nix             |  2 +-
 .../google-cloud-speech/default.nix              |  2 +-
 .../google-cloud-tasks/default.nix               |  2 +-
 .../google-cloud-testutils/default.nix           |  2 +-
 .../google-cloud-texttospeech/default.nix        |  2 +-
 .../google-cloud-trace/default.nix               |  2 +-
 .../google-cloud-translate/default.nix           |  2 +-
 .../google-cloud-videointelligence/default.nix   |  2 +-
 .../google-cloud-vision/default.nix              |  2 +-
 .../google-cloud-websecurityscanner/default.nix  |  2 +-
 .../googleapis_common_protos/default.nix         |  2 +-
 .../python-modules/googlemaps/default.nix        |  2 +-
 .../python-modules/gorilla/default.nix           |  2 +-
 .../development/python-modules/gpapi/default.nix |  2 +-
 .../python-modules/gphoto2/default.nix           |  2 +-
 .../python-modules/gplaycli/default.nix          |  2 +-
 .../python-modules/gpsoauth/default.nix          |  2 +-
 .../python-modules/gpyopt/default.nix            |  2 +-
 .../python-modules/gradient_sdk/default.nix      |  2 +-
 .../python-modules/gradient_statsd/default.nix   |  2 +-
 .../python-modules/graphite-web/default.nix      |  2 +-
 .../python-modules/graphite_beacon/default.nix   |  2 +-
 .../python-modules/grappelli_safe/default.nix    |  2 +-
 .../python-modules/grequests/default.nix         |  2 +-
 pkgs/development/python-modules/grip/default.nix |  2 +-
 .../grpc_google_iam_v1/default.nix               |  2 +-
 .../python-modules/grpcio-gcp/default.nix        |  2 +-
 pkgs/development/python-modules/gsd/1.7.nix      |  2 +-
 .../python-modules/gspread/default.nix           |  2 +-
 .../python-modules/gst-python/default.nix        |  2 +-
 .../python-modules/gtimelog/default.nix          |  2 +-
 .../python-modules/guestfs/default.nix           |  2 +-
 pkgs/development/python-modules/gunicorn/19.nix  |  2 +-
 .../python-modules/gunicorn/default.nix          |  2 +-
 .../guzzle_sphinx_theme/default.nix              |  2 +-
 pkgs/development/python-modules/h2/default.nix   |  2 +-
 .../python-modules/ha-ffmpeg/default.nix         |  2 +-
 .../python-modules/handout/default.nix           |  2 +-
 .../python-modules/hawkauthlib/default.nix       |  2 +-
 .../python-modules/hbmqtt/default.nix            |  2 +-
 .../python-modules/hcs_utils/default.nix         |  2 +-
 .../python-modules/hdmedians/default.nix         |  2 +-
 .../python-modules/heapdict/default.nix          |  2 +-
 .../python-modules/helper/default.nix            |  2 +-
 .../python-modules/hetzner/default.nix           |  2 +-
 .../python-modules/heudiconv/default.nix         |  2 +-
 .../development/python-modules/hglib/default.nix |  2 +-
 .../development/python-modules/hgsvn/default.nix |  2 +-
 .../python-modules/hieroglyph/default.nix        |  2 +-
 .../python-modules/hiredis/default.nix           |  2 +-
 pkgs/development/python-modules/hiro/default.nix |  2 +-
 .../development/python-modules/hjson/default.nix |  2 +-
 pkgs/development/python-modules/hkdf/default.nix |  2 +-
 .../python-modules/hocr-tools/default.nix        |  2 +-
 .../python-modules/holidays/default.nix          |  2 +-
 .../development/python-modules/hpack/default.nix |  2 +-
 .../python-modules/hsaudiotag/default.nix        |  2 +-
 .../python-modules/hsaudiotag3k/default.nix      |  2 +-
 .../python-modules/html2text/2018.nix            |  2 +-
 .../python-modules/html5-parser/default.nix      |  2 +-
 .../python-modules/htmllaundry/default.nix       |  2 +-
 .../python-modules/httmock/default.nix           |  2 +-
 .../python-modules/http_signature/default.nix    |  2 +-
 .../python-modules/httpauth/default.nix          |  2 +-
 .../python-modules/httpbin/default.nix           |  2 +-
 .../python-modules/humanize/default.nix          |  2 +-
 .../python-modules/hyperframe/default.nix        |  2 +-
 .../python-modules/hyperopt/default.nix          |  2 +-
 .../development/python-modules/i3-py/default.nix |  2 +-
 .../development/python-modules/i3ipc/default.nix |  2 +-
 .../python-modules/icalendar/default.nix         |  2 +-
 pkgs/development/python-modules/ics/default.nix  |  2 +-
 .../python-modules/ifaddr/default.nix            |  2 +-
 .../python-modules/ifconfig-parser/default.nix   |  2 +-
 .../development/python-modules/ijson/default.nix |  2 +-
 .../python-modules/image-match/default.nix       |  2 +-
 .../python-modules/imagecorruptions/default.nix  |  2 +-
 .../python-modules/imageio/default.nix           |  2 +-
 .../python-modules/imagesize/default.nix         |  2 +-
 .../python-modules/imapclient/default.nix        |  2 +-
 .../python-modules/imbalanced-learn/0.4.nix      |  2 +-
 .../python-modules/imbalanced-learn/default.nix  |  2 +-
 .../python-modules/imgaug/default.nix            |  2 +-
 .../python-modules/imgsize/default.nix           |  2 +-
 .../python-modules/importmagic/default.nix       |  2 +-
 .../python-modules/imread/default.nix            |  2 +-
 .../python-modules/imutils/default.nix           |  2 +-
 .../python-modules/influxdb/default.nix          |  2 +-
 .../python-modules/influxgraph/default.nix       |  2 +-
 .../python-modules/infoqscraper/default.nix      |  2 +-
 .../python-modules/inifile/default.nix           |  2 +-
 .../python-modules/iniparse/default.nix          |  2 +-
 .../python-modules/inquirer/default.nix          |  2 +-
 .../python-modules/interruptingcow/default.nix   |  2 +-
 .../python-modules/intervaltree/default.nix      |  2 +-
 .../python-modules/ipaddr/default.nix            |  2 +-
 .../python-modules/ipaddress/default.nix         |  2 +-
 pkgs/development/python-modules/ipdb/default.nix |  2 +-
 .../python-modules/ipdbplugin/default.nix        |  2 +-
 .../python-modules/ipfsapi/default.nix           |  2 +-
 .../python-modules/iptools/default.nix           |  2 +-
 .../python-modules/iso3166/default.nix           |  2 +-
 .../python-modules/isodate/default.nix           |  2 +-
 .../python-modules/itsdangerous/default.nix      |  2 +-
 .../python-modules/itypes/default.nix            |  2 +-
 .../development/python-modules/j2cli/default.nix |  2 +-
 .../python-modules/jabberbot/default.nix         |  2 +-
 pkgs/development/python-modules/jc/default.nix   |  2 +-
 .../python-modules/jdatetime/default.nix         |  2 +-
 pkgs/development/python-modules/jedi/default.nix |  2 +-
 .../python-modules/jinja2_pluralize/default.nix  |  2 +-
 .../python-modules/jinja2_time/default.nix       |  2 +-
 .../python-modules/jmespath/default.nix          |  2 +-
 .../python-modules/jpylyzer/default.nix          |  2 +-
 .../python-modules/jsonfield/default.nix         |  2 +-
 .../python-modules/jsonpath_rw/default.nix       |  2 +-
 .../python-modules/jsonref/default.nix           |  2 +-
 .../python-modules/jsonrpc-async/default.nix     |  2 +-
 .../python-modules/jsonrpc-base/default.nix      |  2 +-
 .../python-modules/jsonrpc-websocket/default.nix |  2 +-
 .../python-modules/jsonwatch/default.nix         |  2 +-
 pkgs/development/python-modules/jug/default.nix  |  2 +-
 .../python-modules/junos-eznc/default.nix        |  2 +-
 .../jupyter-repo2docker/default.nix              |  2 +-
 .../python-modules/jupyter-telemetry/default.nix |  3 +--
 .../python-modules/jupyter/default.nix           |  2 +-
 .../python-modules/jupyterlab_server/default.nix |  2 +-
 .../python-modules/kaa-base/default.nix          |  2 +-
 .../python-modules/kaa-metadata/default.nix      |  2 +-
 .../python-modules/kafka-python/default.nix      |  2 +-
 .../python-modules/kaitaistruct/default.nix      |  2 +-
 .../python-modules/kajiki/default.nix            |  2 +-
 .../python-modules/kaptan/default.nix            |  2 +-
 .../development/python-modules/kazoo/default.nix |  2 +-
 pkgs/development/python-modules/keep/default.nix |  2 +-
 .../python-modules/keepalive/default.nix         |  2 +-
 .../python-modules/keepkey/default.nix           |  2 +-
 .../python-modules/keepkey_agent/default.nix     |  2 +-
 .../development/python-modules/keras/default.nix |  2 +-
 .../python-modules/kerberos/default.nix          |  2 +-
 .../python-modules/keyrings-alt/default.nix      |  2 +-
 .../python-modules/kitchen/default.nix           |  2 +-
 .../development/python-modules/knack/default.nix |  3 +--
 .../korean-lunar-calendar/default.nix            |  2 +-
 .../python-modules/kubernetes/default.nix        |  2 +-
 .../development/python-modules/larch/default.nix |  2 +-
 .../python-modules/lasagne/default.nix           |  2 +-
 .../python-modules/lazy-object-proxy/default.nix |  2 +-
 .../python-modules/lazy_import/default.nix       |  2 +-
 .../development/python-modules/ldap3/default.nix |  2 +-
 pkgs/development/python-modules/le/default.nix   |  2 +-
 .../python-modules/leather/default.nix           |  2 +-
 .../python-modules/ledger_agent/default.nix      |  2 +-
 .../python-modules/ledgerblue/default.nix        |  2 +-
 .../python-modules/libagent/default.nix          |  2 +-
 .../python-modules/libais/default.nix            |  2 +-
 .../python-modules/libarcus/default.nix          |  2 +-
 .../python-modules/libasyncns/default.nix        |  2 +-
 .../python-modules/libkeepass/default.nix        |  2 +-
 .../python-modules/liblarch/default.nix          |  2 +-
 .../development/python-modules/libmr/default.nix |  2 +-
 .../python-modules/librosa/default.nix           |  2 +-
 .../python-modules/libsavitar/default.nix        |  2 +-
 .../python-modules/libsoundtouch/default.nix     |  2 +-
 .../python-modules/libthumbor/default.nix        |  2 +-
 .../python-modules/libtmux/default.nix           |  2 +-
 .../python-modules/libversion/default.nix        |  2 +-
 .../development/python-modules/libvirt/5.9.0.nix |  2 +-
 .../python-modules/libvirt/default.nix           |  2 +-
 .../python-modules/lightblue/default.nix         |  2 +-
 .../python-modules/lightning/default.nix         |  2 +-
 .../python-modules/limits/default.nix            |  2 +-
 .../python-modules/limnoria/default.nix          |  2 +-
 .../python-modules/linecache2/default.nix        |  2 +-
 .../python-modules/linode-api/default.nix        |  2 +-
 .../python-modules/linode/default.nix            |  2 +-
 .../python-modules/livelossplot/default.nix      |  2 +-
 .../livestreamer-curses/default.nix              |  2 +-
 .../python-modules/livestreamer/default.nix      |  2 +-
 pkgs/development/python-modules/lmdb/default.nix |  2 +-
 .../development/python-modules/lmtpd/default.nix |  2 +-
 .../python-modules/localzone/default.nix         |  2 +-
 .../python-modules/locket/default.nix            |  2 +-
 .../python-modules/logilab/common.nix            |  2 +-
 .../python-modules/logilab/constraint.nix        |  2 +-
 .../python-modules/logilab_astng/default.nix     |  2 +-
 .../python-modules/logutils/default.nix          |  2 +-
 pkgs/development/python-modules/lpod/default.nix |  2 +-
 pkgs/development/python-modules/lsi/default.nix  |  2 +-
 pkgs/development/python-modules/lxc/default.nix  |  2 +-
 .../python-modules/lyricwikia/default.nix        |  2 +-
 .../python-modules/m2crypto/default.nix          |  3 +--
 pkgs/development/python-modules/m2r/default.nix  |  2 +-
 .../magic-wormhole-mailbox-server/default.nix    |  2 +-
 .../python-modules/mailcap-fix/default.nix       |  2 +-
 .../python-modules/mailchimp/default.nix         |  2 +-
 .../mailman-hyperkitty/default.nix               |  2 +-
 .../python-modules/mailman-rss/default.nix       |  2 +-
 .../python-modules/mailmanclient/default.nix     |  2 +-
 .../python-modules/manuel/default.nix            |  2 +-
 .../python-modules/mapsplotlib/default.nix       |  2 +-
 .../marionette-harness/mozinfo.nix               |  2 +-
 .../python-modules/marisa/default.nix            |  2 +-
 .../python-modules/markdown-macros/default.nix   |  2 +-
 .../python-modules/markdown2/default.nix         |  2 +-
 .../python-modules/markerlib/default.nix         |  2 +-
 .../python-modules/markupsafe/default.nix        |  2 +-
 .../python-modules/matrix-client/default.nix     |  2 +-
 pkgs/development/python-modules/maya/default.nix |  2 +-
 .../python-modules/mccabe/default.nix            |  2 +-
 pkgs/development/python-modules/mdp/default.nix  |  2 +-
 .../python-modules/mechanize/default.nix         |  2 +-
 .../python-modules/meinheld/default.nix          |  2 +-
 .../development/python-modules/meld3/default.nix |  2 +-
 .../python-modules/meliae/default.nix            |  2 +-
 .../python-modules/memcached/default.nix         |  2 +-
 .../python-modules/memory_profiler/default.nix   |  2 +-
 .../python-modules/mergedeep/default.nix         |  2 +-
 pkgs/development/python-modules/mesa/default.nix |  2 +-
 .../python-modules/metaphone/default.nix         |  2 +-
 .../python-modules/mezzanine/default.nix         |  2 +-
 .../python-modules/micawber/default.nix          |  2 +-
 .../python-modules/midiutil/default.nix          |  2 +-
 pkgs/development/python-modules/milc/default.nix |  2 +-
 .../python-modules/minimock/default.nix          |  2 +-
 .../python-modules/miniupnpc/default.nix         |  2 +-
 .../python-modules/mlflow/default.nix            |  2 +-
 .../python-modules/mlrose/default.nix            |  2 +-
 .../python-modules/mlxtend/default.nix           |  2 +-
 .../python-modules/mmpython/default.nix          |  2 +-
 .../python-modules/mockito/default.nix           |  2 +-
 .../python-modules/modestmaps/default.nix        |  2 +-
 .../python-modules/mongodict/default.nix         |  2 +-
 .../python-modules/moretools/default.nix         |  2 +-
 .../python-modules/moviepy/default.nix           |  2 +-
 pkgs/development/python-modules/mox/default.nix  |  2 +-
 pkgs/development/python-modules/mox3/default.nix |  2 +-
 .../python-modules/mozsvc/default.nix            |  2 +-
 pkgs/development/python-modules/mpd/default.nix  |  2 +-
 pkgs/development/python-modules/mpd2/default.nix |  2 +-
 .../python-modules/mpmath/default.nix            |  2 +-
 .../development/python-modules/mrbob/default.nix |  2 +-
 .../python-modules/msgpack-numpy/default.nix     |  2 +-
 .../python-modules/msrplib/default.nix           |  2 +-
 .../python-modules/multi_key_dict/default.nix    |  2 +-
 .../development/python-modules/munch/default.nix |  2 +-
 .../python-modules/munkres/default.nix           |  2 +-
 .../python-modules/murmurhash/default.nix        |  2 +-
 .../python-modules/musicbrainzngs/default.nix    |  2 +-
 .../development/python-modules/mutag/default.nix |  2 +-
 .../python-modules/muttils/default.nix           |  2 +-
 .../python-modules/mwclient/default.nix          |  2 +-
 .../python-modules/mwlib-ext/default.nix         |  2 +-
 .../python-modules/mwlib-rl/default.nix          |  2 +-
 .../development/python-modules/mwlib/default.nix |  2 +-
 .../python-modules/mwparserfromhell/default.nix  |  2 +-
 .../python-modules/mypy-protobuf/default.nix     |  2 +-
 .../python-modules/mypy/extensions.nix           |  2 +-
 .../python-modules/mysqlclient/default.nix       |  2 +-
 .../python-modules/namebench/default.nix         |  2 +-
 .../python-modules/nameparser/default.nix        |  2 +-
 .../python-modules/nanoleaf/default.nix          |  2 +-
 .../python-modules/nanomsg-python/default.nix    |  2 +-
 .../python-modules/nbclient/default.nix          |  2 +-
 .../python-modules/nbxmpp/default.nix            |  2 +-
 .../python-modules/ncclient/default.nix          |  2 +-
 .../python-modules/ndg-httpsclient/default.nix   |  2 +-
 .../python-modules/netaddr/default.nix           |  2 +-
 .../python-modules/netcdf4/default.nix           |  2 +-
 .../python-modules/netdisco/default.nix          |  2 +-
 .../python-modules/netifaces/default.nix         |  2 +-
 .../python-modules/neuronpy/default.nix          |  2 +-
 .../development/python-modules/nevow/default.nix |  2 +-
 .../development/python-modules/nimfa/default.nix |  2 +-
 pkgs/development/python-modules/nine/default.nix |  2 +-
 pkgs/development/python-modules/nipy/default.nix |  2 +-
 .../python-modules/nixpkgs/default.nix           |  2 +-
 .../python-modules/node-semver/default.nix       |  2 +-
 .../development/python-modules/noise/default.nix |  2 +-
 .../python-modules/nose-cover3/default.nix       |  2 +-
 .../python-modules/nose-cprof/default.nix        |  2 +-
 .../python-modules/nose-focus/default.nix        |  2 +-
 .../python-modules/nose-of-yeti/default.nix      |  2 +-
 .../nose-pattern-exclude/default.nix             |  2 +-
 pkgs/development/python-modules/nose/default.nix |  2 +-
 .../development/python-modules/nose2/default.nix |  2 +-
 .../python-modules/nose_progressive/default.nix  |  2 +-
 .../python-modules/nosejs/default.nix            |  2 +-
 .../python-modules/nosexcover/default.nix        |  2 +-
 pkgs/development/python-modules/notmuch/2.nix    |  2 +-
 .../python-modules/notmuch/default.nix           |  2 +-
 .../python-modules/ntplib/default.nix            |  2 +-
 .../python-modules/numericalunits/default.nix    |  2 +-
 .../python-modules/nvchecker/default.nix         |  2 +-
 .../python-modules/nwdiag/default.nix            |  2 +-
 .../python-modules/nxt-python/default.nix        |  2 +-
 pkgs/development/python-modules/oath/default.nix |  2 +-
 .../development/python-modules/oauth/default.nix |  2 +-
 .../python-modules/oauth2/default.nix            |  2 +-
 pkgs/development/python-modules/oauthlib/3.1.nix |  2 +-
 .../python-modules/oauthlib/default.nix          |  2 +-
 .../python-modules/obfsproxy/default.nix         |  2 +-
 .../python-modules/objgraph/default.nix          |  2 +-
 .../python-modules/offtrac/default.nix           |  2 +-
 .../python-modules/ofxclient/default.nix         |  2 +-
 .../python-modules/ofxhome/default.nix           |  2 +-
 .../python-modules/ofxparse/default.nix          |  2 +-
 .../python-modules/ofxtools/default.nix          |  2 +-
 .../python-modules/olefile/default.nix           |  2 +-
 .../python-modules/omegaconf/default.nix         |  2 +-
 .../python-modules/onkyo-eiscp/default.nix       |  2 +-
 .../python-modules/openant/default.nix           |  2 +-
 .../openbabel-bindings/default.nix               |  2 +-
 .../python-modules/openidc-client/default.nix    |  2 +-
 .../python-modules/openrazer/common.nix          |  2 +-
 .../python-modules/openrazer/daemon.nix          |  3 +--
 .../python-modules/openrazer/pylib.nix           |  3 +--
 .../python-modules/ordereddict/default.nix       |  2 +-
 .../python-modules/orderedmultidict/default.nix  |  2 +-
 .../python-modules/orderedset/default.nix        |  2 +-
 pkgs/development/python-modules/osc/default.nix  |  2 +-
 .../development/python-modules/osmnx/default.nix |  2 +-
 pkgs/development/python-modules/packaging/2.nix  |  2 +-
 .../python-modules/packaging/default.nix         |  2 +-
 .../python-modules/pagelabels/default.nix        |  2 +-
 .../python-modules/pagerduty/default.nix         |  2 +-
 .../python-modules/palettable/default.nix        |  2 +-
 .../development/python-modules/pamqp/default.nix |  2 +-
 .../python-modules/pandas-datareader/default.nix |  2 +-
 .../python-modules/pandocfilters/default.nix     |  2 +-
 .../python-modules/paperspace/default.nix        |  2 +-
 .../python-modules/parameterized/default.nix     |  2 +-
 .../python-modules/paramz/default.nix            |  2 +-
 .../python-modules/parse-type/default.nix        |  2 +-
 .../development/python-modules/parse/default.nix |  2 +-
 .../python-modules/parsedatetime/default.nix     |  2 +-
 .../python-modules/parsimonious/default.nix      |  2 +-
 .../development/python-modules/paste/default.nix |  2 +-
 .../python-modules/pastedeploy/default.nix       |  2 +-
 .../python-modules/pastescript/default.nix       |  2 +-
 .../python-modules/patator/default.nix           |  2 +-
 .../python-modules/patch-ng/default.nix          |  2 +-
 .../development/python-modules/patch/default.nix |  2 +-
 .../python-modules/path-and-address/default.nix  |  2 +-
 .../python-modules/pathos/default.nix            |  2 +-
 .../python-modules/pathtools/default.nix         |  2 +-
 .../python-modules/patool/default.nix            |  2 +-
 .../development/python-modules/paver/default.nix |  2 +-
 .../python-modules/pbkdf2/default.nix            |  2 +-
 .../python-modules/pc-ble-driver-py/default.nix  |  2 +-
 pkgs/development/python-modules/pcpp/default.nix |  2 +-
 .../python-modules/pdf2image/default.nix         |  2 +-
 .../python-modules/pdfkit/default.nix            |  2 +-
 .../python-modules/pdfminer_six/default.nix      |  2 +-
 .../python-modules/pdfposter/default.nix         |  2 +-
 .../development/python-modules/pdfrw/default.nix |  2 +-
 pkgs/development/python-modules/pdfx/default.nix |  2 +-
 .../development/python-modules/pecan/default.nix |  2 +-
 .../python-modules/pelican/default.nix           |  2 +-
 .../python-modules/pep257/default.nix            |  2 +-
 pkgs/development/python-modules/pep8/default.nix |  2 +-
 .../python-modules/peppercorn/default.nix        |  2 +-
 .../python-modules/persisting-theory/default.nix |  2 +-
 pkgs/development/python-modules/pex/default.nix  |  2 +-
 .../development/python-modules/pexif/default.nix |  2 +-
 pkgs/development/python-modules/pg8000/1_12.nix  |  2 +-
 .../python-modules/pg8000/default.nix            |  2 +-
 .../python-modules/pgpdump/default.nix           |  2 +-
 .../python-modules/pgspecial/default.nix         |  2 +-
 pkgs/development/python-modules/phe/default.nix  |  2 +-
 .../python-modules/phonopy/default.nix           |  2 +-
 .../phx-class-registry/default.nix               |  2 +-
 .../python-modules/pickleshare/default.nix       |  2 +-
 pkgs/development/python-modules/pid/default.nix  |  2 +-
 pkgs/development/python-modules/piep/default.nix |  2 +-
 .../python-modules/pika-pool/default.nix         |  2 +-
 pkgs/development/python-modules/pika/default.nix |  2 +-
 .../python-modules/pikepdf/default.nix           |  2 +-
 .../python-modules/pilkit/default.nix            |  2 +-
 .../python-modules/pillowfight/default.nix       |  2 +-
 pkgs/development/python-modules/pims/default.nix |  2 +-
 pkgs/development/python-modules/pivy/default.nix |  2 +-
 .../python-modules/pkginfo/default.nix           |  2 +-
 .../python-modules/pkuseg/default.nix            |  2 +-
 pkgs/development/python-modules/plac/default.nix |  2 +-
 .../python-modules/pluginbase/default.nix        |  2 +-
 .../python-modules/plyvel/default.nix            |  2 +-
 .../python-modules/pocket/default.nix            |  2 +-
 .../development/python-modules/polib/default.nix |  2 +-
 .../python-modules/pomegranate/default.nix       |  2 +-
 pkgs/development/python-modules/pony/default.nix |  2 +-
 .../development/python-modules/pooch/default.nix |  2 +-
 .../python-modules/poppler-qt5/default.nix       |  2 +-
 .../python-modules/portend/default.nix           |  2 +-
 .../python-modules/posix_ipc/default.nix         |  2 +-
 pkgs/development/python-modules/potr/default.nix |  2 +-
 .../development/python-modules/power/default.nix |  2 +-
 pkgs/development/python-modules/pox/default.nix  |  2 +-
 pkgs/development/python-modules/poyo/default.nix |  2 +-
 .../python-modules/ppscore/default.nix           |  2 +-
 pkgs/development/python-modules/praw/6.3.nix     |  2 +-
 pkgs/development/python-modules/praw/default.nix |  2 +-
 .../python-modules/prawcore/default.nix          |  2 +-
 .../python-modules/preggy/default.nix            |  2 +-
 .../python-modules/preshed/default.nix           |  2 +-
 .../python-modules/pretend/default.nix           |  2 +-
 .../development/python-modules/prettytable/1.nix |  2 +-
 .../python-modules/prettytable/default.nix       |  2 +-
 .../python-modules/proboscis/default.nix         |  2 +-
 .../python-modules/process-tests/default.nix     |  2 +-
 .../python-modules/proglog/default.nix           |  2 +-
 .../python-modules/progress/default.nix          |  2 +-
 .../python-modules/progressbar/default.nix       |  2 +-
 .../python-modules/progressbar2/default.nix      |  2 +-
 .../python-modules/progressbar231/default.nix    |  2 +-
 .../python-modules/progressbar33/default.nix     |  2 +-
 .../python-modules/proto-plus/default.nix        |  2 +-
 pkgs/development/python-modules/prov/default.nix |  2 +-
 .../python-modules/ptable/default.nix            |  2 +-
 .../development/python-modules/ptest/default.nix |  2 +-
 .../python-modules/ptpython/default.nix          |  2 +-
 .../python-modules/publicsuffix/default.nix      |  2 +-
 .../python-modules/publicsuffix2/default.nix     |  2 +-
 pkgs/development/python-modules/pudb/default.nix |  2 +-
 .../python-modules/pure-pcapy3/default.nix       |  2 +-
 .../python-modules/purepng/default.nix           |  2 +-
 .../python-modules/pushover/default.nix          |  2 +-
 .../development/python-modules/pvlib/default.nix |  2 +-
 .../python-modules/pweave/default.nix            |  2 +-
 .../python-modules/pwntools/default.nix          |  2 +-
 pkgs/development/python-modules/pxml/default.nix |  2 +-
 .../python-modules/py-radix/default.nix          |  2 +-
 pkgs/development/python-modules/py/default.nix   |  2 +-
 .../python-modules/py3dns/default.nix            |  2 +-
 .../python-modules/py3status/default.nix         |  2 +-
 pkgs/development/python-modules/py4j/default.nix |  2 +-
 .../python-modules/pyGithub/default.nix          |  2 +-
 .../python-modules/py_scrypt/default.nix         |  2 +-
 .../python-modules/pyacoustid/default.nix        |  2 +-
 .../python-modules/pyalgotrade/default.nix       |  2 +-
 .../development/python-modules/pyamf/default.nix |  2 +-
 .../python-modules/pyannotate/default.nix        |  2 +-
 .../python-modules/pyasn1-modules/default.nix    |  2 +-
 .../python-modules/pyasn1/default.nix            |  2 +-
 .../development/python-modules/pyatv/default.nix |  2 +-
 .../python-modules/pyaudio/default.nix           |  2 +-
 .../python-modules/pyaxmlparser/default.nix      |  2 +-
 .../python-modules/pybase64/default.nix          |  2 +-
 .../python-modules/pybindgen/default.nix         |  2 +-
 .../python-modules/pyblosxom/default.nix         |  2 +-
 .../python-modules/pybluez/default.nix           |  2 +-
 .../python-modules/pybrowserid/default.nix       |  2 +-
 .../python-modules/pycallgraph/default.nix       |  2 +-
 .../python-modules/pycangjie/default.nix         |  2 +-
 .../python-modules/pycapnp/default.nix           |  2 +-
 .../python-modules/pycarddav/default.nix         |  2 +-
 .../python-modules/pycares/default.nix           |  2 +-
 .../python-modules/pychart/default.nix           |  2 +-
 .../python-modules/pychef/default.nix            |  2 +-
 .../python-modules/pyclipper/default.nix         |  2 +-
 pkgs/development/python-modules/pycm/default.nix |  2 +-
 .../python-modules/pycoin/default.nix            |  2 +-
 .../python-modules/pycollada/default.nix         |  2 +-
 .../python-modules/pycontracts/default.nix       |  2 +-
 .../python-modules/pycountry/default.nix         |  2 +-
 .../python-modules/pycparser/default.nix         |  2 +-
 .../python-modules/pycryptopp/default.nix        |  2 +-
 .../python-modules/pydenticon/default.nix        |  2 +-
 .../python-modules/pydicom/default.nix           |  2 +-
 .../python-modules/pydispatcher/default.nix      |  2 +-
 .../development/python-modules/pydns/default.nix |  2 +-
 .../python-modules/pyechonest/default.nix        |  2 +-
 pkgs/development/python-modules/pyee/default.nix |  2 +-
 .../development/python-modules/pyemd/default.nix |  2 +-
 .../python-modules/pyexcelerator/default.nix     |  2 +-
 .../development/python-modules/pyext/default.nix |  2 +-
 .../python-modules/pyfantom/default.nix          |  2 +-
 .../python-modules/pyfftw/default.nix            |  2 +-
 .../python-modules/pyfiglet/default.nix          |  2 +-
 .../python-modules/pyflakes/default.nix          |  2 +-
 .../python-modules/pyftpdlib/default.nix         |  2 +-
 .../python-modules/pyfttt/default.nix            |  2 +-
 .../development/python-modules/pygal/default.nix |  2 +-
 .../python-modules/pygame_sdl2/default.nix       |  2 +-
 .../python-modules/pygccxml/default.nix          |  2 +-
 .../python-modules/pygeoip/default.nix           |  2 +-
 .../pygments-better-html/default.nix             |  2 +-
 .../pygments-markdown-lexer/default.nix          |  2 +-
 .../python-modules/pygpgme/default.nix           |  2 +-
 .../python-modules/pygraphviz/default.nix        |  2 +-
 .../python-modules/pygreat/default.nix           |  2 +-
 .../python-modules/pygrok/default.nix            |  2 +-
 pkgs/development/python-modules/pyhamcrest/1.nix |  2 +-
 .../python-modules/pyhamcrest/default.nix        |  2 +-
 .../python-modules/pyhomematic/default.nix       |  2 +-
 .../development/python-modules/pyicu/default.nix |  2 +-
 .../python-modules/pyinotify/default.nix         |  2 +-
 .../python-modules/pyinputevent/default.nix      |  2 +-
 .../python-modules/pykdtree/default.nix          |  2 +-
 .../python-modules/pykerberos/default.nix        |  2 +-
 .../python-modules/pykickstart/default.nix       |  2 +-
 .../python-modules/pylast/default.nix            |  2 +-
 .../python-modules/pylibconfig2/default.nix      |  2 +-
 .../python-modules/pyliblo/default.nix           |  2 +-
 .../python-modules/pylibmc/default.nix           |  2 +-
 .../python-modules/pymaging/default.nix          |  2 +-
 .../python-modules/pymaging_png/default.nix      |  2 +-
 .../python-modules/pymatgen/default.nix          |  2 +-
 .../python-modules/pymeeus/default.nix           |  2 +-
 .../python-modules/pymemoize/default.nix         |  2 +-
 .../python-modules/pymetar/default.nix           |  2 +-
 .../python-modules/pymetno/default.nix           |  2 +-
 .../python-modules/pymsgbox/default.nix          |  2 +-
 .../python-modules/pymupdf/default.nix           |  2 +-
 .../python-modules/pymysqlsa/default.nix         |  2 +-
 .../development/python-modules/pynac/default.nix |  2 +-
 .../python-modules/pynacl/default.nix            |  2 +-
 .../python-modules/pynest2d/default.nix          |  2 +-
 .../python-modules/pynisher/default.nix          |  2 +-
 .../development/python-modules/pynzb/default.nix |  2 +-
 .../python-modules/pyodbc/default.nix            |  2 +-
 .../python-modules/pyopencl/default.nix          |  2 +-
 .../pyopengl-accelerate/default.nix              |  3 +--
 .../python-modules/pypandoc/default.nix          |  2 +-
 .../development/python-modules/pypdf/default.nix |  2 +-
 .../python-modules/pypdf2/default.nix            |  2 +-
 .../python-modules/pypeg2/default.nix            |  2 +-
 .../python-modules/pyphen/default.nix            |  2 +-
 .../python-modules/pypillowfight/default.nix     |  2 +-
 .../python-modules/pyplatec/default.nix          |  2 +-
 .../python-modules/pypoppler/default.nix         |  2 +-
 .../python-modules/pyprind/default.nix           |  2 +-
 .../python-modules/pyptlib/default.nix           |  2 +-
 .../python-modules/pypugjs/default.nix           |  2 +-
 .../python-modules/pyqtgraph/default.nix         |  2 +-
 .../python-modules/pyquery/default.nix           |  2 +-
 .../python-modules/pyramid/default.nix           |  2 +-
 .../python-modules/pyramid_beaker/default.nix    |  2 +-
 .../python-modules/pyramid_chameleon/default.nix |  2 +-
 .../python-modules/pyramid_exclog/default.nix    |  2 +-
 .../python-modules/pyramid_hawkauth/default.nix  |  2 +-
 .../python-modules/pyramid_jinja2/default.nix    |  2 +-
 .../python-modules/pyramid_mako/default.nix      |  2 +-
 .../python-modules/pyramid_multiauth/default.nix |  2 +-
 .../python-modules/pyreport/default.nix          |  2 +-
 .../development/python-modules/pyres/default.nix |  2 +-
 .../python-modules/pyrfc3339/default.nix         |  2 +-
 .../development/python-modules/pyro4/default.nix |  3 +--
 .../python-modules/pyroma/default.nix            |  2 +-
 .../python-modules/pyroute2/default.nix          |  2 +-
 pkgs/development/python-modules/pyrr/default.nix |  2 +-
 .../python-modules/pyrsistent/default.nix        |  2 +-
 .../python-modules/pyrss2gen/default.nix         |  2 +-
 .../python-modules/pysaml2/default.nix           |  2 +-
 .../python-modules/pyscss/default.nix            |  2 +-
 .../python-modules/pysendfile/default.nix        |  2 +-
 .../python-modules/pysensors/default.nix         |  2 +-
 .../python-modules/pyserial-asyncio/default.nix  |  2 +-
 .../python-modules/pysftp/default.nix            |  2 +-
 .../development/python-modules/pyshp/default.nix |  2 +-
 .../python-modules/pysigset/default.nix          |  2 +-
 .../python-modules/pysmbc/default.nix            |  2 +-
 .../development/python-modules/pysmf/default.nix |  2 +-
 .../development/python-modules/pysmi/default.nix |  2 +-
 .../python-modules/pysnmp/default.nix            |  2 +-
 .../python-modules/pysocks/default.nix           |  2 +-
 .../python-modules/pyspark/default.nix           |  2 +-
 .../python-modules/pysqueezebox/default.nix      |  2 +-
 .../development/python-modules/pysrt/default.nix |  2 +-
 .../python-modules/pyssim/default.nix            |  2 +-
 .../python-modules/pystache/default.nix          |  2 +-
 .../python-modules/pystemd/default.nix           |  2 +-
 .../python-modules/pystemmer/default.nix         |  2 +-
 .../python-modules/pytabix/default.nix           |  2 +-
 .../python-modules/pytado/default.nix            |  2 +-
 pkgs/development/python-modules/pyte/default.nix |  2 +-
 .../python-modules/pytest-aiohttp/default.nix    |  2 +-
 .../python-modules/pytest-annotate/default.nix   |  2 +-
 .../python-modules/pytest-ansible/default.nix    |  2 +-
 .../python-modules/pytest-asyncio/default.nix    |  2 +-
 .../python-modules/pytest-bdd/default.nix        |  2 +-
 .../python-modules/pytest-catchlog/default.nix   |  2 +-
 .../python-modules/pytest-celery/default.nix     |  2 +-
 .../python-modules/pytest-check/default.nix      |  2 +-
 .../python-modules/pytest-cov/default.nix        |  2 +-
 .../python-modules/pytest-datadir/default.nix    |  2 +-
 .../python-modules/pytest-datafiles/default.nix  |  2 +-
 .../python-modules/pytest-dependency/default.nix |  2 +-
 .../python-modules/pytest-django/default.nix     |  2 +-
 .../pytest-fixture-config/default.nix            |  2 +-
 .../python-modules/pytest-flakes/default.nix     |  2 +-
 .../python-modules/pytest-flask/default.nix      |  2 +-
 .../pytest-helpers-namespace/default.nix         |  2 +-
 .../python-modules/pytest-html/default.nix       |  2 +-
 .../python-modules/pytest-metadata/default.nix   |  2 +-
 .../python-modules/pytest-mpl/default.nix        |  2 +-
 .../python-modules/pytest-pep257/default.nix     |  2 +-
 .../python-modules/pytest-quickcheck/default.nix |  2 +-
 .../pytest-raisesregexp/default.nix              |  2 +-
 .../pytest-random-order/default.nix              |  2 +-
 .../python-modules/pytest-relaxed/default.nix    |  2 +-
 .../pytest-rerunfailures/default.nix             |  2 +-
 .../pytest-server-fixtures/default.nix           |  2 +-
 .../python-modules/pytest-shutil/default.nix     |  2 +-
 .../pytest-subtesthack/default.nix               |  2 +-
 .../python-modules/pytest-virtualenv/default.nix |  2 +-
 .../python-modules/pytest-xdist/1.nix            |  2 +-
 .../python-modules/pytest-xdist/default.nix      |  2 +-
 pkgs/development/python-modules/pytest/4.nix     |  2 +-
 pkgs/development/python-modules/pytest/5.nix     |  2 +-
 .../python-modules/pytest/default.nix            |  2 +-
 .../python-modules/pytestcache/default.nix       |  2 +-
 .../python-modules/pytestrunner/default.nix      |  2 +-
 .../python-modules/python-doi/default.nix        |  2 +-
 .../python-modules/python-editor/default.nix     |  2 +-
 .../python-modules/python-efl/default.nix        |  2 +-
 .../python-modules/python-etcd/default.nix       |  2 +-
 .../python-modules/python-forecastio/default.nix |  2 +-
 .../python-frontmatter/default.nix               |  2 +-
 .../python-modules/python-gitlab/default.nix     |  2 +-
 .../python-modules/python-gnupg/default.nix      |  2 +-
 .../python-modules/python-hosts/default.nix      |  2 +-
 .../python-modules/python-jose/default.nix       |  2 +-
 .../python-json-logger/default.nix               |  2 +-
 .../python-jsonrpc-server/default.nix            |  2 +-
 .../python-language-server/default.nix           |  2 +-
 .../python-modules/python-ldap-test/default.nix  |  2 +-
 .../python-levenshtein/default.nix               |  2 +-
 .../python-modules/python-ly/default.nix         |  2 +-
 .../python-modules/python-lzf/default.nix        |  2 +-
 .../python-modules/python-mapnik/default.nix     |  2 +-
 .../python-modules/python-miio/default.nix       |  2 +-
 .../python-modules/python-mnist/default.nix      |  2 +-
 .../python-modules/python-nomad/default.nix      |  2 +-
 .../python-modules/python-otr/default.nix        |  2 +-
 .../python-modules/python-packer/default.nix     |  2 +-
 .../python-modules/python-pipedrive/default.nix  |  2 +-
 .../python-modules/python-ptrace/default.nix     |  2 +-
 .../python-modules/python-rapidjson/default.nix  |  2 +-
 .../python-modules/python-redis-lock/default.nix |  2 +-
 .../python-simple-hipchat/default.nix            |  2 +-
 .../python-modules/python-slugify/default.nix    |  2 +-
 .../python-modules/python-socketio/default.nix   |  2 +-
 .../python-telegram-bot/default.nix              |  2 +-
 .../python-modules/python-twitter/default.nix    |  2 +-
 .../python-u2flib-host/default.nix               |  2 +-
 .../python-modules/python-uinput/default.nix     |  2 +-
 .../python-modules/python-unshare/default.nix    |  2 +-
 .../python-modules/python-vipaccess/default.nix  |  2 +-
 .../python-modules/python-wifi/default.nix       |  2 +-
 .../python2-pythondialog/default.nix             |  2 +-
 .../python-modules/python3-openid/default.nix    |  2 +-
 .../python-modules/python_fedora/default.nix     |  2 +-
 .../python-modules/python_keyczar/default.nix    |  2 +-
 .../python-modules/python_mimeparse/default.nix  |  2 +-
 .../python-modules/python_openzwave/default.nix  |  2 +-
 .../python-modules/python_statsd/default.nix     |  2 +-
 .../python-modules/pythondialog/default.nix      |  2 +-
 .../python-modules/pythonirclib/default.nix      |  2 +-
 .../python-modules/pythonix/default.nix          |  2 +-
 .../python-modules/pytimeparse/default.nix       |  2 +-
 .../python-modules/pytoml/default.nix            |  2 +-
 .../python-modules/pytrends/default.nix          |  2 +-
 .../python-modules/pytricia/default.nix          |  2 +-
 .../development/python-modules/pytun/default.nix |  2 +-
 .../python-modules/pytzdata/default.nix          |  2 +-
 .../python-modules/pyunifi/default.nix           |  2 +-
 .../python-modules/pyupdate/default.nix          |  2 +-
 .../python-modules/pyutil/default.nix            |  2 +-
 pkgs/development/python-modules/pyuv/default.nix |  2 +-
 .../python-modules/pyvoro/default.nix            |  2 +-
 .../python-modules/pywatchman/default.nix        |  2 +-
 .../python-modules/pywebdav/default.nix          |  2 +-
 pkgs/development/python-modules/pyx/default.nix  |  2 +-
 .../python-modules/pyzufall/default.nix          |  2 +-
 .../python-modules/qpid-python/default.nix       |  2 +-
 .../python-modules/qrcode/default.nix            |  2 +-
 .../python-modules/qscintilla/default.nix        |  2 +-
 .../python-modules/qserve/default.nix            |  2 +-
 .../python-modules/qtawesome/default.nix         |  2 +-
 pkgs/development/python-modules/qtpy/default.nix |  2 +-
 .../querystring-parser/default.nix               |  2 +-
 .../python-modules/queuelib/default.nix          |  2 +-
 .../python-modules/rabbitpy/default.nix          |  2 +-
 .../python-modules/radicale_infcloud/default.nix |  2 +-
 .../python-modules/rainbowstream/default.nix     |  2 +-
 .../python-modules/ramlfications/default.nix     |  2 +-
 .../python-modules/random2/default.nix           |  2 +-
 .../python-modules/rarfile/default.nix           |  2 +-
 .../python-modules/ratelimiter/default.nix       |  2 +-
 .../python-modules/rawkit/default.nix            |  2 +-
 .../python-modules/rcssmin/default.nix           |  2 +-
 .../python-modules/readchar/default.nix          |  2 +-
 .../python-modules/readme/default.nix            |  2 +-
 .../python-modules/rebulk/default.nix            |  2 +-
 .../python-modules/recaptcha_client/default.nix  |  2 +-
 .../python-modules/reedsolo/default.nix          |  2 +-
 .../python-modules/remotecv/default.nix          |  2 +-
 .../python-modules/rencode/default.nix           |  2 +-
 .../python-modules/repeated_test/default.nix     |  2 +-
 .../python-modules/repocheck/default.nix         |  2 +-
 .../python-modules/repoze_lru/default.nix        |  2 +-
 .../repoze_sphinx_autointerface/default.nix      |  2 +-
 .../python-modules/repoze_who/default.nix        |  2 +-
 .../python-modules/requests-cache/default.nix    |  2 +-
 .../requests-http-signature/default.nix          |  2 +-
 .../python-modules/requests-kerberos/default.nix |  2 +-
 .../python-modules/requests/default.nix          |  2 +-
 .../python-modules/resampy/default.nix           |  2 +-
 .../python-modules/rethinkdb/default.nix         |  2 +-
 .../python-modules/retry_decorator/default.nix   |  2 +-
 .../python-modules/retrying/default.nix          |  2 +-
 .../python-modules/rfc-bibtex/default.nix        |  2 +-
 .../python-modules/rfc3986/default.nix           |  2 +-
 .../python-modules/rfc3987/default.nix           |  2 +-
 pkgs/development/python-modules/rich/default.nix |  2 +-
 .../python-modules/rjsmin/default.nix            |  2 +-
 .../python-modules/rl-coach/default.nix          |  3 +--
 .../python-modules/robomachine/default.nix       |  2 +-
 .../python-modules/robot-detection/default.nix   |  2 +-
 .../robotframework-databaselibrary/default.nix   |  2 +-
 .../robotframework-requests/default.nix          |  2 +-
 .../robotframework-ride/default.nix              |  2 +-
 .../robotframework-selenium2library/default.nix  |  2 +-
 .../robotframework-seleniumlibrary/default.nix   |  2 +-
 .../robotframework-sshlibrary/default.nix        |  2 +-
 .../robotframework-tools/default.nix             |  2 +-
 .../python-modules/robotframework/default.nix    |  2 +-
 .../robotstatuschecker/default.nix               |  2 +-
 .../python-modules/robotsuite/default.nix        |  2 +-
 pkgs/development/python-modules/roku/default.nix |  2 +-
 .../development/python-modules/roman/default.nix |  2 +-
 pkgs/development/python-modules/rope/default.nix |  2 +-
 .../python-modules/ropper/default.nix            |  2 +-
 .../python-modules/routes/default.nix            |  2 +-
 pkgs/development/python-modules/rpdb/default.nix |  2 +-
 pkgs/development/python-modules/rpkg/default.nix |  2 +-
 pkgs/development/python-modules/rply/default.nix |  2 +-
 .../python-modules/rpmfluff/default.nix          |  2 +-
 pkgs/development/python-modules/rq/default.nix   |  2 +-
 pkgs/development/python-modules/rsa/4_0.nix      |  2 +-
 pkgs/development/python-modules/rsa/default.nix  |  2 +-
 .../python-modules/rtslib/default.nix            |  2 +-
 .../python-modules/ruamel_base/default.nix       |  2 +-
 .../ruamel_ordereddict/default.nix               |  2 +-
 .../python-modules/ruamel_yaml_clib/default.nix  |  2 +-
 .../python-modules/rubymarshal/default.nix       |  2 +-
 .../python-modules/runsnakerun/default.nix       |  2 +-
 pkgs/development/python-modules/s3fs/default.nix |  2 +-
 .../python-modules/sacremoses/default.nix        |  2 +-
 pkgs/development/python-modules/safe/default.nix |  2 +-
 .../python-modules/salmon-mail/default.nix       |  2 +-
 .../python-modules/samplerate/default.nix        |  2 +-
 .../python-modules/sandboxlib/default.nix        |  2 +-
 .../sapi-python-client/default.nix               |  2 +-
 .../python-modules/scales/default.nix            |  2 +-
 .../python-modules/schedule/default.nix          |  2 +-
 .../python-modules/schema/default.nix            |  2 +-
 .../python-modules/scikit-bio/default.nix        |  2 +-
 .../python-modules/scikits-odes/default.nix      |  3 +--
 pkgs/development/python-modules/scp/default.nix  |  2 +-
 .../python-modules/scrapy-deltafetch/default.nix |  2 +-
 .../scrapy-fake-useragent/default.nix            |  2 +-
 .../python-modules/scrapy-splash/default.nix     |  2 +-
 .../python-modules/screeninfo/default.nix        |  2 +-
 .../python-modules/scripttest/default.nix        |  2 +-
 .../python-modules/sdnotify/default.nix          |  2 +-
 .../python-modules/seabreeze/default.nix         |  2 +-
 .../python-modules/seekpath/default.nix          |  2 +-
 .../python-modules/selectors2/default.nix        |  2 +-
 .../python-modules/selectors34/default.nix       |  2 +-
 .../python-modules/semantic/default.nix          |  2 +-
 .../python-modules/semver/default.nix            |  2 +-
 .../python-modules/sentencepiece/default.nix     |  2 +-
 .../python-modules/sentry-sdk/default.nix        |  2 +-
 .../python-modules/sepaxml/default.nix           |  2 +-
 .../python-modules/seqdiag/default.nix           |  2 +-
 .../python-modules/serpent/default.nix           |  3 +--
 .../python-modules/serversyncstorage/default.nix |  2 +-
 .../python-modules/setproctitle/default.nix      |  2 +-
 .../python-modules/setuptools-git/default.nix    |  2 +-
 .../python-modules/setuptools-lint/default.nix   |  2 +-
 .../python-modules/setuptools-rust/default.nix   |  2 +-
 .../setuptools-scm-git-archive/default.nix       |  2 +-
 .../python-modules/setuptools_scm/default.nix    |  2 +-
 .../python-modules/setuptoolsdarcs/default.nix   |  2 +-
 .../python-modules/setuptoolstrial/default.nix   |  2 +-
 .../python-modules/sexpdata/default.nix          |  2 +-
 .../python-modules/sgmllib3k/default.nix         |  3 +--
 pkgs/development/python-modules/shap/default.nix |  2 +-
 .../python-modules/shellingham/default.nix       |  2 +-
 .../python-modules/shippai/default.nix           |  2 +-
 .../python-modules/shortuuid/default.nix         |  2 +-
 .../python-modules/should-dsl/default.nix        |  2 +-
 .../python-modules/shouldbe/default.nix          |  2 +-
 .../python-modules/signedjson/default.nix        |  2 +-
 .../python-modules/sigtools/default.nix          |  2 +-
 .../python-modules/simanneal/default.nix         |  2 +-
 .../simple-websocket-server/default.nix          |  2 +-
 .../python-modules/simpleai/default.nix          |  2 +-
 .../python-modules/simplebayes/default.nix       |  2 +-
 .../python-modules/simpleparse/default.nix       |  2 +-
 .../development/python-modules/skein/default.nix |  2 +-
 .../python-modules/sklearn-deap/default.nix      |  2 +-
 .../python-modules/slackclient/default.nix       |  2 +-
 .../python-modules/sleekxmpp/default.nix         |  2 +-
 .../python-modules/slicer/default.nix            |  2 +-
 .../python-modules/slicerator/default.nix        |  2 +-
 pkgs/development/python-modules/slob/default.nix |  2 +-
 .../python-modules/slowaes/default.nix           |  2 +-
 .../python-modules/smartdc/default.nix           |  2 +-
 .../python-modules/smartypants/default.nix       |  2 +-
 .../python-modules/snakeviz/default.nix          |  2 +-
 .../python-modules/snapcast/default.nix          |  2 +-
 .../python-modules/snowballstemmer/default.nix   |  2 +-
 .../python-modules/socksipy-branch/default.nix   |  2 +-
 .../python-modules/somajo/default.nix            |  2 +-
 .../development/python-modules/sopel/default.nix |  2 +-
 .../python-modules/sorl_thumbnail/default.nix    |  2 +-
 .../python-modules/spark_parser/default.nix      |  2 +-
 .../python-modules/sparqlwrapper/default.nix     |  2 +-
 .../python-modules/speaklater/default.nix        |  2 +-
 .../python-modules/spglib/default.nix            |  2 +-
 .../sphinx_pypi_upload/default.nix               |  2 +-
 .../python-modules/sphinx_rtd_theme/default.nix  |  2 +-
 .../sphinxcontrib-applehelp/default.nix          |  2 +-
 .../sphinxcontrib-autoapi/default.nix            |  2 +-
 .../sphinxcontrib-blockdiag/default.nix          |  2 +-
 .../sphinxcontrib-devhelp/default.nix            |  2 +-
 .../sphinxcontrib-htmlhelp/default.nix           |  2 +-
 .../sphinxcontrib-jsmath/default.nix             |  2 +-
 .../sphinxcontrib-openapi/default.nix            |  2 +-
 .../sphinxcontrib-qthelp/default.nix             |  2 +-
 .../sphinxcontrib-serializinghtml/default.nix    |  2 +-
 .../sphinxcontrib-spelling/default.nix           |  3 +--
 .../sphinxcontrib_httpdomain/default.nix         |  2 +-
 .../sphinxcontrib_newsfeed/default.nix           |  2 +-
 .../sphinxcontrib_plantuml/default.nix           |  2 +-
 .../python-modules/spyder-kernels/default.nix    |  2 +-
 pkgs/development/python-modules/spyder/3.nix     |  2 +-
 .../python-modules/spyder/default.nix            |  2 +-
 .../sqlalchemy-continuum/default.nix             |  3 +--
 .../python-modules/sqlalchemy-i18n/default.nix   |  3 +--
 .../sqlalchemy-imageattach/default.nix           |  2 +-
 .../python-modules/sqlite3dbm/default.nix        |  2 +-
 .../python-modules/sqlobject/default.nix         |  2 +-
 .../python-modules/squaremap/default.nix         |  2 +-
 pkgs/development/python-modules/srp/default.nix  |  2 +-
 .../python-modules/srptools/default.nix          |  2 +-
 .../development/python-modules/srsly/default.nix |  3 +--
 .../python-modules/srvlookup/default.nix         |  2 +-
 .../python-modules/ssdeep/default.nix            |  2 +-
 pkgs/development/python-modules/ssdp/default.nix |  2 +-
 .../python-modules/sseclient/default.nix         |  2 +-
 .../development/python-modules/sslib/default.nix |  2 +-
 .../python-modules/statsd/default.nix            |  2 +-
 .../python-modules/stompclient/default.nix       |  2 +-
 .../python-modules/strict-rfc3339/default.nix    |  2 +-
 .../python-modules/stringcase/default.nix        |  2 +-
 .../python-modules/subdownloader/default.nix     |  2 +-
 .../python-modules/suds-jurko/default.nix        |  2 +-
 pkgs/development/python-modules/suds/default.nix |  2 +-
 pkgs/development/python-modules/sumo/default.nix |  2 +-
 pkgs/development/python-modules/sure/default.nix |  2 +-
 .../python-modules/survey/default.nix            |  2 +-
 .../python-modules/svg-path/default.nix          |  2 +-
 .../python-modules/svg2tikz/default.nix          |  2 +-
 .../python-modules/swagger-ui-bundle/default.nix |  2 +-
 .../python-modules/swspotify/default.nix         |  2 +-
 .../python-modules/sybase/default.nix            |  2 +-
 .../python-modules/systemd/default.nix           |  2 +-
 .../python-modules/sysv_ipc/default.nix          |  2 +-
 .../python-modules/tarman/default.nix            |  2 +-
 .../development/python-modules/taskw/default.nix |  2 +-
 .../development/python-modules/tatsu/default.nix |  2 +-
 .../development/python-modules/tblib/default.nix |  2 +-
 .../python-modules/telegram/default.nix          |  2 +-
 .../tensorflow-estimator/default.nix             |  2 +-
 .../python-modules/termcolor/default.nix         |  2 +-
 .../python-modules/terminaltables/default.nix    |  2 +-
 .../python-modules/testpath/default.nix          |  2 +-
 .../python-modules/testrepository/default.nix    |  2 +-
 .../python-modules/testscenarios/default.nix     |  2 +-
 .../python-modules/threadpool/default.nix        |  2 +-
 .../python-modules/thrift/default.nix            |  2 +-
 .../python-modules/thumborpexif/default.nix      |  2 +-
 .../python-modules/tilestache/default.nix        |  2 +-
 .../python-modules/timelib/default.nix           |  2 +-
 .../python-modules/timeout-decorator/default.nix |  2 +-
 .../python-modules/tissue/default.nix            |  2 +-
 pkgs/development/python-modules/tlsh/default.nix |  2 +-
 .../python-modules/tlslite-ng/default.nix        |  2 +-
 .../python-modules/tlslite/default.nix           |  2 +-
 .../python-modules/toggl-cli/default.nix         |  2 +-
 .../python-modules/tokenizers/default.nix        |  2 +-
 .../python-modules/tokenlib/default.nix          |  2 +-
 pkgs/development/python-modules/toml/default.nix |  2 +-
 .../python-modules/toposort/default.nix          |  2 +-
 .../python-modules/torchvision/default.nix       |  2 +-
 .../python-modules/traceback2/default.nix        |  2 +-
 .../python-modules/tracing/default.nix           |  2 +-
 .../python-modules/traits/default.nix            |  2 +-
 .../python-modules/transaction/default.nix       |  2 +-
 .../python-modules/transformers/default.nix      |  2 +-
 .../python-modules/transip/default.nix           |  2 +-
 .../python-modules/translationstring/default.nix |  2 +-
 .../python-modules/transmissionrpc/default.nix   |  2 +-
 pkgs/development/python-modules/treq/default.nix |  2 +-
 .../python-modules/trezor_agent/default.nix      |  2 +-
 .../python-modules/trueskill/default.nix         |  2 +-
 .../python-modules/ttystatus/default.nix         |  2 +-
 .../python-modules/tvdb_api/default.nix          |  2 +-
 .../python-modules/tvnamer/default.nix           |  2 +-
 .../python-modules/twiggy/default.nix            |  2 +-
 .../python-modules/twilio/default.nix            |  2 +-
 .../twitter-common-collections/default.nix       |  2 +-
 .../twitter-common-confluence/default.nix        |  2 +-
 .../twitter-common-dirutil/default.nix           |  2 +-
 .../twitter-common-lang/default.nix              |  2 +-
 .../twitter-common-log/default.nix               |  2 +-
 .../twitter-common-options/default.nix           |  2 +-
 .../python-modules/twitter/default.nix           |  2 +-
 .../development/python-modules/txaio/default.nix |  2 +-
 .../python-modules/txamqp/default.nix            |  2 +-
 .../python-modules/txdbus/default.nix            |  2 +-
 .../python-modules/txgithub/default.nix          |  2 +-
 .../python-modules/txrequests/default.nix        |  2 +-
 .../python-modules/typeguard/default.nix         |  2 +-
 .../python-modules/typogrify/default.nix         |  2 +-
 .../python-modules/tzlocal/default.nix           |  2 +-
 .../python-modules/ua-parser/default.nix         |  2 +-
 pkgs/development/python-modules/ujson/2.nix      |  2 +-
 .../development/python-modules/ujson/default.nix |  2 +-
 .../python-modules/umalqurra/default.nix         |  2 +-
 .../python-modules/umemcache/default.nix         |  2 +-
 .../python-modules/uncertainties/default.nix     |  2 +-
 .../python-modules/uncompyle6/default.nix        |  2 +-
 .../python-modules/unicode-slugify/default.nix   |  2 +-
 .../python-modules/unicodecsv/default.nix        |  2 +-
 .../python-modules/unidecode/default.nix         |  2 +-
 .../development/python-modules/unifi/default.nix |  2 +-
 .../python-modules/unittest2/default.nix         |  2 +-
 .../python-modules/unpaddedbase64/default.nix    |  2 +-
 .../development/python-modules/upass/default.nix |  2 +-
 .../python-modules/update_checker/default.nix    |  2 +-
 .../python-modules/uproot3-methods/default.nix   |  2 +-
 .../python-modules/uptime/default.nix            |  2 +-
 .../python-modules/uranium/default.nix           |  2 +-
 .../python-modules/uritools/default.nix          |  2 +-
 .../python-modules/urlgrabber/default.nix        |  2 +-
 .../development/python-modules/urwid/default.nix |  2 +-
 .../python-modules/urwidtrees/default.nix        |  2 +-
 .../python-modules/usbtmc/default.nix            |  2 +-
 .../python-modules/user-agents/default.nix       |  2 +-
 .../python-modules/validate-email/default.nix    |  2 +-
 .../python-modules/validictory/default.nix       |  2 +-
 .../python-modules/vcversioner/default.nix       |  2 +-
 pkgs/development/python-modules/vdf/default.nix  |  2 +-
 .../python-modules/vdirsyncer/default.nix        |  2 +-
 pkgs/development/python-modules/vega/default.nix |  2 +-
 .../python-modules/venusian/default.nix          |  2 +-
 .../python-modules/versioneer/default.nix        |  2 +-
 .../python-modules/versiontools/default.nix      |  2 +-
 .../python-modules/veryprettytable/default.nix   |  2 +-
 .../python-modules/vidstab/default.nix           |  2 +-
 pkgs/development/python-modules/vine/default.nix |  2 +-
 .../python-modules/virtualenv-clone/default.nix  |  2 +-
 .../python-modules/virtualenvwrapper/default.nix |  2 +-
 .../python-modules/vmprof/default.nix            |  2 +-
 .../development/python-modules/vncdo/default.nix |  2 +-
 .../python-modules/voluptuous/default.nix        |  2 +-
 .../development/python-modules/vultr/default.nix |  2 +-
 .../development/python-modules/vxi11/default.nix |  2 +-
 .../development/python-modules/w3lib/default.nix |  2 +-
 .../python-modules/waitress/default.nix          |  2 +-
 .../python-modules/wakeonlan/default.nix         |  2 +-
 .../python-modules/warlock/default.nix           |  2 +-
 .../python-modules/wasabi/default.nix            |  2 +-
 pkgs/development/python-modules/web/default.nix  |  2 +-
 .../python-modules/webapp2/default.nix           |  2 +-
 .../python-modules/webhelpers/default.nix        |  2 +-
 .../development/python-modules/webob/default.nix |  2 +-
 .../python-modules/websockify/default.nix        |  2 +-
 .../python-modules/webtest/default.nix           |  2 +-
 .../python-modules/whisper/default.nix           |  2 +-
 .../python-modules/whitenoise/default.nix        |  2 +-
 .../python-modules/whoosh/default.nix            |  2 +-
 .../python-modules/willow/default.nix            |  2 +-
 .../python-modules/word2vec/default.nix          |  2 +-
 .../python-modules/wordcloud/default.nix         |  2 +-
 .../python-modules/worldengine/default.nix       |  2 +-
 .../python-modules/wrapio/default.nix            |  2 +-
 .../development/python-modules/ws4py/default.nix |  2 +-
 .../python-modules/wsgiproxy/default.nix         |  2 +-
 .../python-modules/wsgiproxy2/default.nix        |  2 +-
 .../python-modules/wtforms/default.nix           |  2 +-
 .../python-modules/x11_hash/default.nix          |  2 +-
 pkgs/development/python-modules/x256/default.nix |  2 +-
 pkgs/development/python-modules/xapp/default.nix |  2 +-
 .../development/python-modules/xattr/default.nix |  2 +-
 .../python-modules/xcaplib/default.nix           |  2 +-
 pkgs/development/python-modules/xdot/default.nix |  2 +-
 .../python-modules/xhtml2pdf/default.nix         |  2 +-
 .../python-modules/xkcdpass/default.nix          |  2 +-
 pkgs/development/python-modules/xlrd/default.nix |  2 +-
 .../python-modules/xlsx2csv/default.nix          |  2 +-
 .../python-modules/xml2rfc/default.nix           |  2 +-
 .../python-modules/xmodem/default.nix            |  2 +-
 .../python-modules/xmpppy/default.nix            |  2 +-
 .../python-modules/xvfbwrapper/default.nix       |  2 +-
 .../python-modules/xxhash/default.nix            |  2 +-
 .../python-modules/yamllint/default.nix          |  2 +-
 pkgs/development/python-modules/yanc/default.nix |  2 +-
 pkgs/development/python-modules/yapf/default.nix |  2 +-
 .../development/python-modules/yapsy/default.nix |  2 +-
 pkgs/development/python-modules/yarl/default.nix |  3 +--
 .../development/python-modules/ydiff/default.nix |  2 +-
 .../python-modules/yowsup/default.nix            |  2 +-
 .../python-modules/z3c-checkversions/default.nix |  2 +-
 pkgs/development/python-modules/zake/default.nix |  2 +-
 .../python-modules/zbaemon/default.nix           |  2 +-
 .../python-modules/zbase32/default.nix           |  2 +-
 .../python-modules/zc_lockfile/default.nix       |  2 +-
 .../python-modules/zdaemon/default.nix           |  2 +-
 .../python-modules/zerobin/default.nix           |  2 +-
 .../python-modules/zeroc-ice/default.nix         |  2 +-
 pkgs/development/python-modules/zfec/default.nix |  2 +-
 pkgs/development/python-modules/zict/default.nix |  2 +-
 .../python-modules/zigpy-znp/default.nix         |  2 +-
 pkgs/development/python-modules/zodb/default.nix |  2 +-
 .../python-modules/zope_broken/default.nix       |  2 +-
 .../python-modules/zope_component/default.nix    |  2 +-
 .../zope_configuration/default.nix               |  2 +-
 .../python-modules/zope_contenttype/default.nix  |  2 +-
 .../python-modules/zope_deprecation/default.nix  |  2 +-
 .../python-modules/zope_dottedname/default.nix   |  2 +-
 .../python-modules/zope_event/default.nix        |  2 +-
 .../python-modules/zope_exceptions/default.nix   |  2 +-
 .../zope_filerepresentation/default.nix          |  2 +-
 .../zope_i18nmessageid/default.nix               |  2 +-
 .../python-modules/zope_interface/default.nix    |  2 +-
 .../zope_lifecycleevent/default.nix              |  2 +-
 .../python-modules/zope_location/default.nix     |  2 +-
 .../python-modules/zope_proxy/default.nix        |  2 +-
 .../python-modules/zope_schema/default.nix       |  2 +-
 .../python-modules/zope_size/default.nix         |  2 +-
 .../python-modules/zope_testing/default.nix      |  2 +-
 .../python-modules/zope_testrunner/default.nix   |  2 +-
 pkgs/development/python-modules/zstd/default.nix |  2 +-
 .../ruby-modules/bundler-app/default.nix         |  2 +-
 pkgs/development/ruby-modules/testing/driver.nix |  2 +-
 pkgs/development/tools/ameba/default.nix         |  2 +-
 .../tools/analysis/autoflake/default.nix         |  2 +-
 .../tools/analysis/bingrep/default.nix           |  2 +-
 .../tools/analysis/checkov/default.nix           |  2 +-
 .../development/tools/analysis/egypt/default.nix |  2 +-
 .../tools/analysis/evmdis/default.nix            |  2 +-
 .../tools/analysis/hotspot/default.nix           |  2 +-
 .../tools/analysis/panopticon/default.nix        |  2 +-
 .../tools/analysis/snowman/default.nix           |  2 +-
 .../analysis/uefi-firmware-parser/default.nix    |  2 +-
 pkgs/development/tools/asn2quickder/default.nix  |  2 +-
 pkgs/development/tools/async/default.nix         |  2 +-
 pkgs/development/tools/azcopy/default.nix        |  2 +-
 pkgs/development/tools/bazelisk/default.nix      |  2 +-
 .../bazel/bazel-remote/default.nix               |  2 +-
 .../build-managers/bazel/buildtools/default.nix  |  2 +-
 .../tools/build-managers/fac/default.nix         |  2 +-
 .../tools/build-managers/meson/default.nix       |  2 +-
 .../tools/build-managers/pants/default.nix       |  2 +-
 .../tools/build-managers/scons/common.nix        |  2 +-
 .../tools/build-managers/shards/default.nix      |  2 +-
 pkgs/development/tools/clog-cli/default.nix      |  2 +-
 .../development/tools/compile-daemon/default.nix |  2 +-
 .../buildkite-agent/default.nix                  |  2 +-
 .../buildkite-agent/generic.nix                  |  2 +-
 .../continuous-integration/drone-cli/default.nix |  2 +-
 .../continuous-integration/drone/default.nix     |  2 +-
 pkgs/development/tools/corgi/default.nix         |  2 +-
 pkgs/development/tools/cppclean/default.nix      |  2 +-
 pkgs/development/tools/cue/default.nix           |  2 +-
 pkgs/development/tools/dapr/cli/default.nix      |  2 +-
 .../tools/database/dbmate/default.nix            |  2 +-
 .../tools/database/pyrseas/default.nix           |  2 +-
 .../timescaledb-parallel-copy/default.nix        |  2 +-
 .../tools/database/timescaledb-tune/default.nix  |  2 +-
 pkgs/development/tools/deis/default.nix          |  2 +-
 pkgs/development/tools/deisctl/default.nix       |  2 +-
 pkgs/development/tools/delve/default.nix         |  2 +-
 pkgs/development/tools/dep/default.nix           |  2 +-
 pkgs/development/tools/dep2nix/default.nix       |  2 +-
 pkgs/development/tools/devd/default.nix          |  2 +-
 pkgs/development/tools/devpi-client/default.nix  |  2 +-
 pkgs/development/tools/devpi-server/default.nix  |  2 +-
 .../tools/documentation/antora/default.nix       |  2 +-
 .../documentation/gnome-doc-utils/default.nix    |  2 +-
 .../tools/documentation/gtk-doc/default.nix      |  2 +-
 .../tools/documentation/mdsh/default.nix         |  2 +-
 .../tools/documentation/mkdocs/default.nix       |  2 +-
 pkgs/development/tools/easyjson/default.nix      |  2 +-
 pkgs/development/tools/eliot-tree/default.nix    |  2 +-
 pkgs/development/tools/fac/default.nix           |  2 +-
 pkgs/development/tools/fedpkg/default.nix        |  2 +-
 pkgs/development/tools/flootty/default.nix       |  2 +-
 pkgs/development/tools/gauge/default.nix         |  2 +-
 pkgs/development/tools/gdm/default.nix           |  2 +-
 pkgs/development/tools/ginkgo/default.nix        |  2 +-
 pkgs/development/tools/gir/default.nix           |  2 +-
 pkgs/development/tools/git-series/default.nix    |  2 +-
 pkgs/development/tools/github/cligh/default.nix  |  2 +-
 pkgs/development/tools/glide/default.nix         |  2 +-
 pkgs/development/tools/gllvm/default.nix         |  2 +-
 pkgs/development/tools/glock/default.nix         |  2 +-
 .../tools/go-bindata-assetfs/default.nix         |  2 +-
 pkgs/development/tools/go-bindata/default.nix    |  2 +-
 .../tools/go-junit-report/default.nix            |  2 +-
 pkgs/development/tools/go-langserver/default.nix |  2 +-
 pkgs/development/tools/go-migrate/default.nix    |  2 +-
 pkgs/development/tools/go-outline/default.nix    |  2 +-
 pkgs/development/tools/go-protobuf/default.nix   |  2 +-
 pkgs/development/tools/go-repo-root/default.nix  |  2 +-
 pkgs/development/tools/go-symbols/default.nix    |  2 +-
 pkgs/development/tools/go2nix/default.nix        |  2 +-
 pkgs/development/tools/goa/default.nix           |  2 +-
 pkgs/development/tools/gocode-gomod/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/godot/headless.nix        |  2 +-
 pkgs/development/tools/godot/server.nix          |  2 +-
 pkgs/development/tools/gojsontoyaml/default.nix  |  2 +-
 pkgs/development/tools/golint/default.nix        |  2 +-
 pkgs/development/tools/gomodifytags/default.nix  |  2 +-
 pkgs/development/tools/gomplate/default.nix      |  2 +-
 pkgs/development/tools/gopkgs/default.nix        |  2 +-
 pkgs/development/tools/gopls/default.nix         |  2 +-
 pkgs/development/tools/gore/default.nix          |  2 +-
 pkgs/development/tools/gosec/default.nix         |  2 +-
 pkgs/development/tools/gotags/default.nix        |  2 +-
 pkgs/development/tools/gotests/default.nix       |  2 +-
 pkgs/development/tools/gotestsum/default.nix     |  2 +-
 pkgs/development/tools/gotools/default.nix       |  2 +-
 pkgs/development/tools/govendor/default.nix      |  2 +-
 pkgs/development/tools/govers/default.nix        |  2 +-
 pkgs/development/tools/gox/default.nix           |  2 +-
 pkgs/development/tools/gron/default.nix          |  2 +-
 .../tools/haskell/dconf2nix/dconf2nix.nix        |  2 +-
 .../haskell/haskell-language-server/default.nix  |  2 +-
 .../haskell-language-server/hls-class-plugin.nix |  2 +-
 .../haskell-language-server/hls-eval-plugin.nix  |  2 +-
 .../hls-explicit-imports-plugin.nix              |  2 +-
 .../haskell-language-server/hls-hlint-plugin.nix |  2 +-
 .../hls-retrie-plugin.nix                        |  2 +-
 .../hls-tactics-plugin.nix                       |  2 +-
 .../tools/haskell/vaultenv/default.nix           |  2 +-
 pkgs/development/tools/hcloud/default.nix        |  2 +-
 pkgs/development/tools/icr/default.nix           |  3 +--
 pkgs/development/tools/jd/default.nix            |  2 +-
 pkgs/development/tools/jid/default.nix           |  2 +-
 pkgs/development/tools/jira_cli/default.nix      |  2 +-
 pkgs/development/tools/jl/default.nix            |  2 +-
 pkgs/development/tools/jmespath/default.nix      |  2 +-
 pkgs/development/tools/jp/default.nix            |  2 +-
 pkgs/development/tools/just/default.nix          |  2 +-
 pkgs/development/tools/k6/default.nix            |  2 +-
 pkgs/development/tools/kcli/default.nix          |  2 +-
 pkgs/development/tools/kind/default.nix          |  2 +-
 pkgs/development/tools/krew/default.nix          |  2 +-
 pkgs/development/tools/kubectx/default.nix       |  2 +-
 pkgs/development/tools/kubeprompt/default.nix    |  2 +-
 pkgs/development/tools/kubicorn/default.nix      |  2 +-
 pkgs/development/tools/lazygit/default.nix       |  2 +-
 pkgs/development/tools/leaps/default.nix         |  2 +-
 pkgs/development/tools/manul/default.nix         |  2 +-
 .../tools/misc/circleci-cli/default.nix          |  2 +-
 pkgs/development/tools/misc/d-feet/default.nix   |  2 +-
 pkgs/development/tools/misc/docopts/default.nix  |  2 +-
 pkgs/development/tools/misc/elfinfo/default.nix  |  2 +-
 pkgs/development/tools/misc/gdbgui/default.nix   |  2 +-
 .../development/tools/misc/itm-tools/default.nix |  2 +-
 pkgs/development/tools/misc/loccount/default.nix |  2 +-
 pkgs/development/tools/misc/nrfutil/default.nix  |  2 +-
 .../tools/misc/perfect-hash/default.nix          |  2 +-
 pkgs/development/tools/misc/ptags/default.nix    |  2 +-
 pkgs/development/tools/misc/scc/default.nix      |  2 +-
 pkgs/development/tools/misc/unused/default.nix   |  2 +-
 .../development/tools/misc/whatstyle/default.nix |  2 +-
 pkgs/development/tools/modd/default.nix          |  2 +-
 pkgs/development/tools/mustache-go/default.nix   |  2 +-
 .../development/tools/ofono-phonesim/default.nix |  2 +-
 pkgs/development/tools/out-of-tree/default.nix   |  2 +-
 pkgs/development/tools/packer/default.nix        |  2 +-
 pkgs/development/tools/packet-cli/default.nix    |  2 +-
 pkgs/development/tools/packet/default.nix        |  2 +-
 pkgs/development/tools/parinfer-rust/default.nix |  2 +-
 pkgs/development/tools/pax-rs/default.nix        |  2 +-
 pkgs/development/tools/pew/default.nix           |  2 +-
 .../tools/profiling/pprof/default.nix            |  2 +-
 .../development/tools/purescript/spago/spago.nix |  2 +-
 pkgs/development/tools/quicktemplate/default.nix |  2 +-
 pkgs/development/tools/rdbtools/default.nix      |  2 +-
 pkgs/development/tools/remarshal/default.nix     |  2 +-
 pkgs/development/tools/renderizer/default.nix    |  2 +-
 pkgs/development/tools/reno/default.nix          |  2 +-
 pkgs/development/tools/richgo/default.nix        |  2 +-
 pkgs/development/tools/run/default.nix           |  2 +-
 pkgs/development/tools/rust/bindgen/default.nix  |  2 +-
 .../tools/rust/cargo-binutils/default.nix        |  2 +-
 .../tools/rust/cargo-embed/default.nix           |  2 +-
 .../tools/rust/cargo-flash/default.nix           |  2 +-
 .../tools/rust/cargo-fuzz/default.nix            |  2 +-
 .../tools/rust/cargo-readme/default.nix          |  2 +-
 .../tools/rust/cargo-sweep/default.nix           |  2 +-
 .../tools/rust/cargo-sync-readme/default.nix     |  2 +-
 .../tools/rust/cargo-wipe/default.nix            |  2 +-
 .../tools/rust/cargo-xbuild/default.nix          |  2 +-
 pkgs/development/tools/rust/svd2rust/default.nix |  2 +-
 pkgs/development/tools/sourcetrail/jedi.nix      |  2 +-
 pkgs/development/tools/summon/default.nix        |  2 +-
 pkgs/development/tools/systemfd/default.nix      |  2 +-
 pkgs/development/tools/textql/default.nix        |  2 +-
 pkgs/development/tools/unityhub/default.nix      |  2 +-
 pkgs/development/tools/vcstool/default.nix       |  2 +-
 pkgs/development/tools/vend/default.nix          |  2 +-
 pkgs/development/tools/vultr-cli/default.nix     |  2 +-
 pkgs/development/tools/vultr/default.nix         |  2 +-
 pkgs/development/tools/winpdb/default.nix        |  2 +-
 pkgs/development/tools/wllvm/default.nix         |  2 +-
 pkgs/development/tools/ws/default.nix            |  2 +-
 pkgs/development/tools/yaml2json/default.nix     |  2 +-
 pkgs/development/tools/yj/default.nix            |  2 +-
 .../development/web/shopify-themekit/default.nix |  2 +-
 pkgs/development/web/wml/default.nix             |  2 +-
 pkgs/games/20kly/default.nix                     |  2 +-
 pkgs/games/boohu/default.nix                     |  2 +-
 pkgs/games/chessx/default.nix                    |  2 +-
 pkgs/games/cockatrice/default.nix                |  2 +-
 pkgs/games/eidolon/default.nix                   |  2 +-
 pkgs/games/endgame-singularity/default.nix       |  2 +-
 pkgs/games/enyo-doom/default.nix                 |  2 +-
 pkgs/games/factorio/mods.nix                     |  2 +-
 pkgs/games/frogatto/default.nix                  |  2 +-
 pkgs/games/frozen-bubble/default.nix             |  2 +-
 pkgs/games/gscrabble/default.nix                 |  2 +-
 pkgs/games/gshogi/default.nix                    |  2 +-
 pkgs/games/harmonist/default.nix                 |  2 +-
 pkgs/games/lunar-client/default.nix              |  2 +-
 pkgs/games/multimc/default.nix                   |  2 +-
 pkgs/games/openra/common.nix                     |  2 +-
 pkgs/games/pokerth/default.nix                   |  2 +-
 pkgs/games/portmod/default.nix                   |  2 +-
 pkgs/games/pro-office-calculator/default.nix     |  2 +-
 pkgs/games/pysolfc/default.nix                   |  2 +-
 pkgs/games/the-butterfly-effect/default.nix      |  2 +-
 pkgs/games/wyvern/default.nix                    |  2 +-
 pkgs/misc/doge/default.nix                       |  2 +-
 pkgs/misc/drivers/steamcontroller/default.nix    |  2 +-
 pkgs/misc/emulators/citra/default.nix            |  2 +-
 pkgs/misc/emulators/firebird-emu/default.nix     |  2 +-
 pkgs/misc/emulators/melonDS/default.nix          |  2 +-
 pkgs/misc/emulators/ruffle/default.nix           |  2 +-
 pkgs/misc/emulators/wine/staging.nix             |  2 +-
 pkgs/misc/emulators/yabause/default.nix          |  2 +-
 pkgs/misc/lilypond/with-fonts.nix                |  2 +-
 pkgs/misc/logging/beats/6.x.nix                  |  2 +-
 pkgs/misc/logging/beats/7.x.nix                  |  2 +-
 pkgs/misc/vscode-extensions/cpptools/default.nix |  2 +-
 pkgs/misc/vscode-extensions/default.nix          |  2 +-
 .../vscode-extensions/remote-ssh/default.nix     |  2 +-
 .../vscode-extensions/rust-analyzer/default.nix  |  2 +-
 pkgs/misc/vscode-extensions/wakatime/default.nix |  2 +-
 .../CarbonHeaders/default.nix                    |  2 +-
 .../CommonCrypto/default.nix                     |  2 +-
 .../darwin/apple-source-releases/Csu/default.nix |  2 +-
 .../apple-source-releases/IOKit/default.nix      |  2 +-
 .../apple-source-releases/Librpcsvc/default.nix  |  2 +-
 .../apple-source-releases/Libsystem/default.nix  |  2 +-
 .../apple-source-releases/adv_cmds/boot.nix      |  2 +-
 .../apple-source-releases/adv_cmds/default.nix   |  2 +-
 .../architecture/default.nix                     |  2 +-
 .../apple-source-releases/basic_cmds/default.nix |  2 +-
 .../bootstrap_cmds/default.nix                   |  2 +-
 .../apple-source-releases/bsdmake/default.nix    |  2 +-
 .../developer_cmds/default.nix                   |  2 +-
 .../diskdev_cmds/default.nix                     |  2 +-
 .../apple-source-releases/dyld/default.nix       |  2 +-
 .../apple-source-releases/file_cmds/default.nix  |  2 +-
 .../apple-source-releases/libpthread/default.nix |  2 +-
 .../apple-source-releases/libunwind/default.nix  |  2 +-
 .../network_cmds/default.nix                     |  2 +-
 .../apple-source-releases/shell_cmds/default.nix |  2 +-
 .../apple-source-releases/text_cmds/default.nix  |  2 +-
 pkgs/os-specific/darwin/stubs/default.nix        |  2 +-
 pkgs/os-specific/darwin/xcode/sdk-pkgs.nix       |  2 +-
 pkgs/os-specific/linux/busybox/sandbox-shell.nix |  2 +-
 pkgs/os-specific/linux/cpuset/default.nix        |  2 +-
 pkgs/os-specific/linux/ffado/default.nix         |  2 +-
 .../linux/firmware/zd1211/default.nix            |  2 +-
 pkgs/os-specific/linux/fscrypt/default.nix       |  2 +-
 pkgs/os-specific/linux/iotop/default.nix         |  2 +-
 pkgs/os-specific/linux/iproute/mptcp.nix         |  2 +-
 .../os-specific/linux/kernel/hardened/config.nix |  2 +-
 pkgs/os-specific/linux/kernel/linux-4.14.nix     |  2 +-
 pkgs/os-specific/linux/kernel/linux-4.19.nix     |  2 +-
 pkgs/os-specific/linux/kernel/linux-4.4.nix      |  2 +-
 pkgs/os-specific/linux/kernel/linux-4.9.nix      |  2 +-
 pkgs/os-specific/linux/kernel/linux-5.10.nix     |  2 +-
 pkgs/os-specific/linux/kernel/linux-5.4.nix      |  2 +-
 .../linux/kernel/linux-hardkernel-4.14.nix       |  2 +-
 pkgs/os-specific/linux/kernel/linux-lqx.nix      |  2 +-
 pkgs/os-specific/linux/kernel/linux-mptcp-95.nix |  2 +-
 .../linux/kernel/linux-testing-bcachefs.nix      |  2 +-
 pkgs/os-specific/linux/kernel/linux-testing.nix  |  2 +-
 pkgs/os-specific/linux/kernel/linux-zen.nix      |  2 +-
 pkgs/os-specific/linux/net-tools/mptcp.nix       |  2 +-
 .../linux/oci-seccomp-bpf-hook/default.nix       |  2 +-
 pkgs/os-specific/linux/openrazer/driver.nix      |  2 +-
 pkgs/os-specific/linux/piper/default.nix         |  2 +-
 pkgs/os-specific/linux/s6-linux-init/default.nix |  2 +-
 .../os-specific/linux/s6-linux-utils/default.nix |  2 +-
 pkgs/os-specific/linux/sd-switch/default.nix     |  2 +-
 pkgs/os-specific/linux/setools/default.nix       |  2 +-
 pkgs/os-specific/linux/targetcli/default.nix     |  2 +-
 pkgs/os-specific/linux/trace-cmd/kernelshark.nix |  2 +-
 pkgs/os-specific/linux/undervolt/default.nix     |  2 +-
 pkgs/os-specific/linux/wpa_supplicant/gui.nix    |  2 +-
 pkgs/servers/caddy/default.nix                   |  2 +-
 pkgs/servers/cayley/default.nix                  |  2 +-
 pkgs/servers/cloud-print-connector/default.nix   |  2 +-
 pkgs/servers/consul/default.nix                  |  2 +-
 pkgs/servers/demoit/default.nix                  |  2 +-
 pkgs/servers/dns/coredns/default.nix             |  2 +-
 pkgs/servers/foundationdb/default.nix            |  2 +-
 pkgs/servers/gotty/default.nix                   |  2 +-
 pkgs/servers/headphones/default.nix              |  2 +-
 pkgs/servers/holochain-go/default.nix            |  2 +-
 pkgs/servers/http/hyp/default.nix                |  2 +-
 pkgs/servers/hydron/default.nix                  |  2 +-
 pkgs/servers/icingaweb2/default.nix              |  8 +++++---
 pkgs/servers/icingaweb2/theme-april/default.nix  |  9 +++++++--
 pkgs/servers/icingaweb2/theme-lsd/default.nix    |  9 +++++++--
 .../icingaweb2/theme-particles/default.nix       |  9 +++++++--
 pkgs/servers/icingaweb2/theme-snow/default.nix   |  9 +++++++--
 pkgs/servers/icingaweb2/theme-spring/default.nix |  9 +++++++--
 .../servers/icingaweb2/theme-unicorn/default.nix | 10 ++++++++--
 pkgs/servers/identd/nullidentdmod/default.nix    |  4 +++-
 pkgs/servers/irc/robustirc-bridge/default.nix    |  2 +-
 pkgs/servers/isso/default.nix                    |  2 +-
 pkgs/servers/kapowbang/default.nix               |  2 +-
 pkgs/servers/livepeer/default.nix                |  2 +-
 pkgs/servers/mail/mailhog/default.nix            |  2 +-
 pkgs/servers/mail/mailman/default.nix            |  2 +-
 pkgs/servers/mail/mailman/hyperkitty.nix         |  2 +-
 pkgs/servers/mail/mailman/postorius.nix          |  2 +-
 pkgs/servers/mail/postfix/pflogsumm.nix          |  2 +-
 pkgs/servers/mail/postgrey/default.nix           |  2 +-
 pkgs/servers/mail/spamassassin/default.nix       |  2 +-
 pkgs/servers/matterbridge/default.nix            |  2 +-
 pkgs/servers/mattermost/matterircd.nix           |  2 +-
 pkgs/servers/mautrix-whatsapp/default.nix        |  2 +-
 pkgs/servers/miniflux/default.nix                |  2 +-
 pkgs/servers/minio/default.nix                   |  2 +-
 .../misc/client-ip-echo/client-ip-echo.nix       |  2 +-
 .../monitoring/alertmanager-bot/default.nix      |  2 +-
 pkgs/servers/monitoring/cadvisor/default.nix     |  2 +-
 .../servers/monitoring/consul-alerts/default.nix |  2 +-
 .../monitoring/fusion-inventory/default.nix      |  2 +-
 .../monitoring/grafana-reporter/default.nix      |  2 +-
 pkgs/servers/monitoring/plugins/esxi.nix         |  2 +-
 .../monitoring/prometheus/alertmanager.nix       |  2 +-
 .../monitoring/prometheus/apcupsd-exporter.nix   |  2 +-
 .../monitoring/prometheus/aws-s3-exporter.nix    |  2 +-
 .../monitoring/prometheus/bind-exporter.nix      |  2 +-
 .../monitoring/prometheus/bird-exporter.nix      |  2 +-
 .../monitoring/prometheus/blackbox-exporter.nix  |  2 +-
 .../monitoring/prometheus/collectd-exporter.nix  |  2 +-
 .../monitoring/prometheus/consul-exporter.nix    |  2 +-
 .../monitoring/prometheus/dnsmasq-exporter.nix   |  2 +-
 .../monitoring/prometheus/dovecot-exporter.nix   |  2 +-
 .../monitoring/prometheus/fritzbox-exporter.nix  |  2 +-
 .../prometheus/gitlab-ci-pipelines-exporter.nix  |  2 +-
 .../monitoring/prometheus/haproxy-exporter.nix   |  2 +-
 .../monitoring/prometheus/keylight-exporter.nix  |  2 +-
 .../monitoring/prometheus/lnd-exporter.nix       |  2 +-
 .../monitoring/prometheus/mail-exporter.nix      |  2 +-
 .../monitoring/prometheus/mesos-exporter.nix     |  2 +-
 .../monitoring/prometheus/mikrotik-exporter.nix  |  2 +-
 .../prometheus/minio-exporter/default.nix        |  2 +-
 .../prometheus/modemmanager-exporter.nix         |  2 +-
 .../monitoring/prometheus/mysqld-exporter.nix    |  2 +-
 .../monitoring/prometheus/nginx-exporter.nix     |  2 +-
 .../monitoring/prometheus/nginxlog-exporter.nix  |  2 +-
 .../monitoring/prometheus/node-exporter.nix      |  2 +-
 .../monitoring/prometheus/openvpn-exporter.nix   |  2 +-
 .../monitoring/prometheus/postfix-exporter.nix   |  2 +-
 .../monitoring/prometheus/process-exporter.nix   |  2 +-
 pkgs/servers/monitoring/prometheus/prom2json.nix |  2 +-
 pkgs/servers/monitoring/prometheus/promscale.nix |  2 +-
 .../monitoring/prometheus/pushgateway.nix        |  2 +-
 .../monitoring/prometheus/rabbitmq-exporter.nix  |  2 +-
 .../monitoring/prometheus/redis-exporter.nix     |  2 +-
 .../monitoring/prometheus/snmp-exporter.nix      |  2 +-
 .../monitoring/prometheus/sql-exporter.nix       |  2 +-
 .../monitoring/prometheus/statsd-exporter.nix    |  2 +-
 .../monitoring/prometheus/surfboard-exporter.nix |  2 +-
 .../prometheus/unifi-exporter/default.nix        |  2 +-
 pkgs/servers/monitoring/thanos/default.nix       |  2 +-
 pkgs/servers/monitoring/unifi-poller/default.nix |  2 +-
 pkgs/servers/nextcloud/news-updater.nix          |  2 +-
 pkgs/servers/nginx-sso/default.nix               |  2 +-
 pkgs/servers/nosql/mongodb/v3_4.nix              |  2 +-
 pkgs/servers/openxpki/default.nix                |  2 +-
 pkgs/servers/radicale/1.x.nix                    |  2 +-
 pkgs/servers/radicale/2.x.nix                    |  2 +-
 pkgs/servers/routinator/default.nix              |  2 +-
 pkgs/servers/rtsp-simple-server/default.nix      |  2 +-
 pkgs/servers/scylladb/default.nix                |  2 +-
 pkgs/servers/serf/default.nix                    |  2 +-
 pkgs/servers/sickbeard/sickrage.nix              |  2 +-
 pkgs/servers/simplehttp2server/default.nix       |  2 +-
 pkgs/servers/skydns/default.nix                  |  2 +-
 pkgs/servers/slimserver/default.nix              |  2 +-
 pkgs/servers/sql/dolt/default.nix                |  2 +-
 pkgs/servers/tarssh/default.nix                  |  2 +-
 pkgs/servers/tegola/default.nix                  |  2 +-
 pkgs/servers/teleport/default.nix                |  2 +-
 pkgs/servers/traefik/default.nix                 |  2 +-
 pkgs/servers/trezord/default.nix                 |  2 +-
 pkgs/servers/trickster/trickster.nix             |  2 +-
 .../tt-rss/plugin-ff-instagram/default.nix       |  4 +++-
 .../tt-rss/plugin-tumblr-gdpr/default.nix        |  4 +++-
 pkgs/servers/tt-rss/theme-feedly/default.nix     |  4 +++-
 pkgs/servers/udpt/default.nix                    |  2 +-
 pkgs/servers/unpfs/default.nix                   |  2 +-
 pkgs/servers/web-apps/morty/default.nix          |  2 +-
 pkgs/servers/web-apps/shiori/default.nix         |  2 +-
 pkgs/servers/webmetro/default.nix                |  2 +-
 pkgs/servers/x11/xorg/xwayland.nix               |  2 +-
 pkgs/servers/xandikos/default.nix                |  2 +-
 pkgs/servers/zigbee2mqtt/default.nix             |  2 +-
 pkgs/shells/elvish/default.nix                   |  2 +-
 pkgs/shells/fish/babelfish.nix                   |  2 +-
 pkgs/shells/oh/default.nix                       |  2 +-
 pkgs/shells/pash/default.nix                     |  2 +-
 pkgs/shells/zsh/zsh-git-prompt/default.nix       |  2 +-
 pkgs/test/haskell-shellFor/default.nix           |  2 +-
 pkgs/test/install-shell-files/default.nix        |  2 +-
 pkgs/tools/X11/arandr/default.nix                |  2 +-
 pkgs/tools/X11/go-sct/default.nix                |  2 +-
 pkgs/tools/X11/grobi/default.nix                 |  2 +-
 pkgs/tools/X11/wpgtk/default.nix                 |  2 +-
 pkgs/tools/X11/xpra/default.nix                  |  2 +-
 pkgs/tools/admin/afterburn/default.nix           |  2 +-
 pkgs/tools/admin/aws-nuke/default.nix            |  2 +-
 pkgs/tools/admin/aws-rotate-key/default.nix      |  2 +-
 pkgs/tools/admin/awslogs/default.nix             |  2 +-
 pkgs/tools/admin/berglas/default.nix             |  2 +-
 pkgs/tools/admin/certigo/default.nix             |  2 +-
 pkgs/tools/admin/chkcrontab/default.nix          |  2 +-
 pkgs/tools/admin/credhub-cli/default.nix         |  2 +-
 .../admin/docker-credential-gcr/default.nix      |  2 +-
 pkgs/tools/admin/exoscale-cli/default.nix        |  2 +-
 pkgs/tools/admin/iamy/default.nix                |  2 +-
 pkgs/tools/admin/lxd/default.nix                 |  2 +-
 pkgs/tools/admin/s3bro/default.nix               |  2 +-
 pkgs/tools/admin/scaleway-cli/default.nix        |  2 +-
 pkgs/tools/admin/sewer/default.nix               |  2 +-
 pkgs/tools/admin/simp_le/default.nix             |  2 +-
 pkgs/tools/admin/ssh-import-id/default.nix       |  2 +-
 pkgs/tools/admin/ssmsh/default.nix               |  2 +-
 pkgs/tools/admin/stripe-cli/default.nix          |  2 +-
 pkgs/tools/audio/beets/plugins/alternatives.nix  |  2 +-
 pkgs/tools/audio/beets/plugins/check.nix         |  2 +-
 pkgs/tools/audio/beets/plugins/copyartifacts.nix |  2 +-
 pkgs/tools/audio/mididings/default.nix           |  2 +-
 pkgs/tools/audio/mpd-mpris/default.nix           |  2 +-
 pkgs/tools/audio/mpdris2/default.nix             |  2 +-
 pkgs/tools/audio/opl3bankeditor/default.nix      |  2 +-
 pkgs/tools/audio/video2midi/default.nix          |  2 +-
 pkgs/tools/audio/volctl/default.nix              |  2 +-
 pkgs/tools/backup/bupstash/default.nix           |  2 +-
 pkgs/tools/backup/diskrsync/default.nix          |  2 +-
 pkgs/tools/backup/grab-site/default.nix          |  2 +-
 pkgs/tools/backup/httrack/qt.nix                 |  2 +-
 pkgs/tools/backup/iceshelf/default.nix           |  2 +-
 pkgs/tools/backup/luckybackup/default.nix        |  2 +-
 pkgs/tools/backup/rdiff-backup/default.nix       |  2 +-
 pkgs/tools/backup/s3ql/default.nix               |  2 +-
 .../backup/ugarit-manifest-maker/default.nix     |  2 +-
 pkgs/tools/backup/ugarit/default.nix             |  2 +-
 pkgs/tools/backup/wal-e/default.nix              |  2 +-
 pkgs/tools/backup/zfs-replicate/default.nix      |  2 +-
 pkgs/tools/cd-dvd/isolyzer/default.nix           |  2 +-
 pkgs/tools/compression/dtrx/default.nix          |  2 +-
 .../android-file-transfer/default.nix            |  2 +-
 pkgs/tools/filesystems/catcli/default.nix        |  2 +-
 pkgs/tools/filesystems/convoy/default.nix        |  2 +-
 pkgs/tools/filesystems/gitfs/default.nix         |  2 +-
 pkgs/tools/filesystems/gocryptfs/default.nix     |  2 +-
 pkgs/tools/filesystems/nixpart/default.nix       |  2 +-
 pkgs/tools/filesystems/sandboxfs/default.nix     |  2 +-
 pkgs/tools/filesystems/tmsu/default.nix          |  2 +-
 pkgs/tools/filesystems/ubidump/default.nix       |  2 +-
 pkgs/tools/graphics/feedgnuplot/default.nix      |  2 +-
 pkgs/tools/graphics/gifski/default.nix           |  2 +-
 pkgs/tools/graphics/graph-easy/default.nix       |  2 +-
 .../graphics/ldgallery/compiler/default.nix      |  2 +-
 pkgs/tools/graphics/pdfredacttools/default.nix   |  2 +-
 pkgs/tools/graphics/puppeteer-cli/default.nix    |  2 +-
 pkgs/tools/graphics/rocket/default.nix           |  2 +-
 pkgs/tools/graphics/shotgun/default.nix          |  2 +-
 pkgs/tools/graphics/svgcleaner/default.nix       |  2 +-
 .../inputmethods/evdevremapkeys/default.nix      |  2 +-
 pkgs/tools/inputmethods/evscript/default.nix     |  2 +-
 .../fcitx5/fcitx5-chinese-addons.nix             |  2 +-
 .../inputmethods/fcitx5/fcitx5-configtool.nix    |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix     |  2 +-
 pkgs/tools/inputmethods/ibus/wrapper.nix         |  2 +-
 pkgs/tools/misc/3mux/default.nix                 |  2 +-
 pkgs/tools/misc/adafruit-ampy/default.nix        |  2 +-
 pkgs/tools/misc/apt-offline/default.nix          |  2 +-
 pkgs/tools/misc/aptly/default.nix                |  2 +-
 pkgs/tools/misc/asciinema-scenario/default.nix   |  2 +-
 pkgs/tools/misc/azure-vhd-utils/default.nix      |  2 +-
 pkgs/tools/misc/bashplotlib/default.nix          |  2 +-
 pkgs/tools/misc/bmap-tools/default.nix           |  2 +-
 pkgs/tools/misc/bonfire/default.nix              |  2 +-
 pkgs/tools/misc/broadlink-cli/default.nix        |  2 +-
 pkgs/tools/misc/chezmoi/default.nix              |  2 +-
 pkgs/tools/misc/ckb-next/default.nix             |  2 +-
 pkgs/tools/misc/claws/default.nix                |  2 +-
 pkgs/tools/misc/cloud-sql-proxy/default.nix      |  2 +-
 pkgs/tools/misc/code-minimap/default.nix         |  2 +-
 pkgs/tools/misc/codebraid/default.nix            |  2 +-
 pkgs/tools/misc/crudini/default.nix              |  2 +-
 pkgs/tools/misc/dashing/default.nix              |  2 +-
 pkgs/tools/misc/diskonaut/default.nix            |  2 +-
 pkgs/tools/misc/docker-ls/default.nix            |  2 +-
 pkgs/tools/misc/docui/default.nix                |  2 +-
 pkgs/tools/misc/doitlive/default.nix             |  2 +-
 pkgs/tools/misc/dust/default.nix                 |  2 +-
 pkgs/tools/misc/envdir-go/default.nix            |  2 +-
 pkgs/tools/misc/esptool/default.nix              |  2 +-
 pkgs/tools/misc/eva/default.nix                  |  2 +-
 pkgs/tools/misc/fselect/default.nix              |  2 +-
 pkgs/tools/misc/fsql/default.nix                 |  2 +-
 pkgs/tools/misc/g933-utils/default.nix           |  2 +-
 pkgs/tools/misc/gawp/default.nix                 |  2 +-
 pkgs/tools/misc/gh-ost/default.nix               |  2 +-
 pkgs/tools/misc/gif-for-cli/default.nix          |  2 +-
 pkgs/tools/misc/git-town/default.nix             |  2 +-
 pkgs/tools/misc/go.rice/default.nix              |  2 +-
 pkgs/tools/misc/gosu/default.nix                 |  2 +-
 pkgs/tools/misc/grc/default.nix                  |  2 +-
 pkgs/tools/misc/hacksaw/default.nix              |  2 +-
 pkgs/tools/misc/heatseeker/default.nix           |  2 +-
 pkgs/tools/misc/hexyl/default.nix                |  2 +-
 pkgs/tools/misc/hyperledger-fabric/default.nix   |  2 +-
 pkgs/tools/misc/i3cat/default.nix                |  2 +-
 pkgs/tools/misc/i3minator/default.nix            |  2 +-
 pkgs/tools/misc/ical2org/default.nix             |  2 +-
 pkgs/tools/misc/kargo/default.nix                |  2 +-
 pkgs/tools/misc/kt/default.nix                   |  2 +-
 pkgs/tools/misc/lazydocker/default.nix           |  2 +-
 pkgs/tools/misc/lice/default.nix                 |  2 +-
 pkgs/tools/misc/lnch/default.nix                 |  2 +-
 pkgs/tools/misc/lokalise2-cli/default.nix        |  2 +-
 pkgs/tools/misc/loop/default.nix                 |  2 +-
 pkgs/tools/misc/lsd/default.nix                  |  2 +-
 pkgs/tools/misc/me_cleaner/default.nix           |  2 +-
 pkgs/tools/misc/microplane/default.nix           |  2 +-
 pkgs/tools/misc/mimeo/default.nix                |  2 +-
 pkgs/tools/misc/mmake/default.nix                |  2 +-
 pkgs/tools/misc/mongodb-tools/default.nix        |  3 +--
 pkgs/tools/misc/nagstamon/default.nix            |  2 +-
 pkgs/tools/misc/noteshrink/default.nix           |  2 +-
 pkgs/tools/misc/ntfy/default.nix                 |  2 +-
 pkgs/tools/misc/pdd/default.nix                  |  2 +-
 pkgs/tools/misc/pdf-parser/default.nix           |  2 +-
 pkgs/tools/misc/pgcenter/default.nix             |  2 +-
 pkgs/tools/misc/pgmetrics/default.nix            |  2 +-
 pkgs/tools/misc/phraseapp-client/default.nix     |  2 +-
 pkgs/tools/misc/pistol/default.nix               |  2 +-
 pkgs/tools/misc/powerline-go/default.nix         |  2 +-
 pkgs/tools/misc/pubs/default.nix                 |  2 +-
 pkgs/tools/misc/rargs/default.nix                |  2 +-
 pkgs/tools/misc/rename/default.nix               |  2 +-
 pkgs/tools/misc/shelldap/default.nix             |  2 +-
 pkgs/tools/misc/swaglyrics/default.nix           |  2 +-
 pkgs/tools/misc/systrayhelper/default.nix        |  2 +-
 pkgs/tools/misc/tagref/default.nix               |  2 +-
 pkgs/tools/misc/tensorman/default.nix            |  2 +-
 pkgs/tools/misc/tewisay/default.nix              |  2 +-
 pkgs/tools/misc/thefuck/default.nix              |  2 +-
 pkgs/tools/misc/tmuxp/default.nix                |  2 +-
 pkgs/tools/misc/togglesg-download/default.nix    |  2 +-
 pkgs/tools/misc/trash-cli/default.nix            |  2 +-
 pkgs/tools/misc/trillian/default.nix             | 16 ++++++----------
 pkgs/tools/misc/tydra/default.nix                |  2 +-
 pkgs/tools/misc/unicode/default.nix              |  2 +-
 pkgs/tools/misc/upower-notify/default.nix        |  2 +-
 pkgs/tools/misc/vimwiki-markdown/default.nix     |  2 +-
 pkgs/tools/misc/vivid/default.nix                |  2 +-
 pkgs/tools/misc/void/default.nix                 |  2 +-
 pkgs/tools/misc/wakatime/default.nix             |  2 +-
 pkgs/tools/misc/xdxf2slob/default.nix            |  2 +-
 pkgs/tools/misc/xflux/gui.nix                    |  2 +-
 pkgs/tools/misc/xmonad-log/default.nix           |  2 +-
 pkgs/tools/misc/yle-dl/default.nix               |  2 +-
 pkgs/tools/misc/you-get/default.nix              |  2 +-
 pkgs/tools/misc/yubikey-neo-manager/default.nix  |  2 +-
 .../misc/yubikey-personalization-gui/default.nix |  2 +-
 pkgs/tools/misc/zabbixctl/default.nix            |  2 +-
 pkgs/tools/networking/assh/default.nix           |  2 +-
 pkgs/tools/networking/brook/default.nix          |  2 +-
 pkgs/tools/networking/bukubrow/default.nix       |  2 +-
 pkgs/tools/networking/circus/default.nix         |  2 +-
 pkgs/tools/networking/clash/default.nix          |  2 +-
 .../connman/connman-notify/default.nix           |  2 +-
 pkgs/tools/networking/corerad/default.nix        |  2 +-
 pkgs/tools/networking/croc/default.nix           |  2 +-
 .../networking/curl-unix-socket/default.nix      |  2 +-
 pkgs/tools/networking/dd-agent/datadog-agent.nix |  2 +-
 .../dd-agent/datadog-process-agent.nix           |  2 +-
 pkgs/tools/networking/ddclient/default.nix       |  2 +-
 .../tools/networking/dnscrypt-proxy2/default.nix |  2 +-
 pkgs/tools/networking/dnsproxy/default.nix       |  2 +-
 pkgs/tools/networking/filegive/default.nix       |  2 +-
 pkgs/tools/networking/getmail/default.nix        |  2 +-
 pkgs/tools/networking/goklp/default.nix          |  2 +-
 pkgs/tools/networking/goreplay/default.nix       |  2 +-
 pkgs/tools/networking/http-prompt/default.nix    |  2 +-
 pkgs/tools/networking/httpie/default.nix         |  2 +-
 pkgs/tools/networking/httplab/default.nix        |  2 +-
 pkgs/tools/networking/httpstat/default.nix       |  2 +-
 pkgs/tools/networking/ipgrep/default.nix         |  2 +-
 pkgs/tools/networking/kail/default.nix           |  2 +-
 pkgs/tools/networking/minio-client/default.nix   |  2 +-
 pkgs/tools/networking/offlineimap/default.nix    |  2 +-
 pkgs/tools/networking/persepolis/default.nix     |  2 +-
 pkgs/tools/networking/photon/default.nix         |  2 +-
 pkgs/tools/networking/pirate-get/default.nix     |  2 +-
 pkgs/tools/networking/pixiecore/default.nix      |  2 +-
 pkgs/tools/networking/polysh/default.nix         |  2 +-
 pkgs/tools/networking/proxify/default.nix        |  2 +-
 pkgs/tools/networking/pssh/default.nix           |  2 +-
 pkgs/tools/networking/pykms/default.nix          |  2 +-
 pkgs/tools/networking/s3cmd/default.nix          |  2 +-
 pkgs/tools/networking/s3gof3r/default.nix        |  2 +-
 pkgs/tools/networking/s4cmd/default.nix          |  2 +-
 pkgs/tools/networking/shadowfox/default.nix      |  2 +-
 pkgs/tools/networking/subfinder/default.nix      |  2 +-
 pkgs/tools/networking/tdns-cli/default.nix       |  2 +-
 pkgs/tools/networking/tendermint/default.nix     |  2 +-
 pkgs/tools/networking/termshark/default.nix      |  2 +-
 pkgs/tools/networking/tox-node/default.nix       |  2 +-
 pkgs/tools/networking/ua/default.nix             |  2 +-
 pkgs/tools/networking/urlwatch/default.nix       |  2 +-
 pkgs/tools/networking/waitron/default.nix        |  2 +-
 pkgs/tools/networking/wifite2/default.nix        |  2 +-
 pkgs/tools/networking/wireguard-go/default.nix   |  2 +-
 .../networking/wormhole-william/default.nix      |  2 +-
 pkgs/tools/networking/wstunnel/default.nix       |  2 +-
 pkgs/tools/networking/wuzz/default.nix           |  2 +-
 pkgs/tools/networking/yrd/default.nix            |  2 +-
 pkgs/tools/nix/cached-nix-shell/default.nix      |  2 +-
 pkgs/tools/nix/nar-serve/default.nix             |  2 +-
 pkgs/tools/nix/nix-output-monitor/default.nix    |  2 +-
 pkgs/tools/nix/nix-query-tree-viewer/default.nix |  2 +-
 .../package-management/cargo-kcov/default.nix    |  3 +--
 pkgs/tools/package-management/gx/default.nix     |  2 +-
 pkgs/tools/package-management/gx/go/default.nix  |  2 +-
 .../package-management/mynewt-newt/default.nix   |  2 +-
 .../tools/package-management/nix-doc/default.nix |  2 +-
 .../nix-simple-deploy/default.nix                |  2 +-
 .../nixpkgs-review/default.nix                   |  3 +--
 .../package-management/python2nix/default.nix    |  2 +-
 pkgs/tools/security/2fa/default.nix              |  2 +-
 .../security/aws-iam-authenticator/default.nix   |  2 +-
 pkgs/tools/security/aws-okta/default.nix         |  2 +-
 pkgs/tools/security/certmgr/default.nix          |  2 +-
 pkgs/tools/security/certstrap/default.nix        |  2 +-
 pkgs/tools/security/cfssl/default.nix            |  2 +-
 .../security/chrome-token-signing/default.nix    |  2 +-
 pkgs/tools/security/cloudbrute/default.nix       |  2 +-
 pkgs/tools/security/creddump/default.nix         |  2 +-
 pkgs/tools/security/crlfuzz/default.nix          |  2 +-
 pkgs/tools/security/crowbar/default.nix          |  2 +-
 pkgs/tools/security/deepsea/default.nix          |  2 +-
 pkgs/tools/security/dnsrecon/default.nix         |  2 +-
 pkgs/tools/security/dnsx/default.nix             |  2 +-
 pkgs/tools/security/ffuf/default.nix             |  2 +-
 pkgs/tools/security/fido2luks/default.nix        |  2 +-
 pkgs/tools/security/fierce/default.nix           |  2 +-
 pkgs/tools/security/gau/default.nix              |  2 +-
 pkgs/tools/security/gnome-keysign/default.nix    |  2 +-
 pkgs/tools/security/gospider/default.nix         |  2 +-
 pkgs/tools/security/grype/default.nix            |  2 +-
 pkgs/tools/security/hologram/default.nix         |  2 +-
 pkgs/tools/security/httpx/default.nix            |  2 +-
 pkgs/tools/security/keybase/kbfs.nix             |  2 +-
 pkgs/tools/security/knockknock/default.nix       |  2 +-
 pkgs/tools/security/lesspass-cli/default.nix     |  2 +-
 pkgs/tools/security/notary/default.nix           |  2 +-
 pkgs/tools/security/nuclei/default.nix           |  2 +-
 pkgs/tools/security/onioncircuits/default.nix    |  2 +-
 pkgs/tools/security/pius/default.nix             |  2 +-
 pkgs/tools/security/pyrit/default.nix            |  2 +-
 pkgs/tools/security/qdigidoc/default.nix         |  2 +-
 pkgs/tools/security/safe/default.nix             |  2 +-
 pkgs/tools/security/saml2aws/default.nix         |  2 +-
 pkgs/tools/security/sops/default.nix             |  2 +-
 pkgs/tools/security/subjs/default.nix            |  2 +-
 pkgs/tools/security/sudolikeaboss/default.nix    |  2 +-
 pkgs/tools/security/teler/default.nix            |  2 +-
 pkgs/tools/security/urlhunter/default.nix        |  2 +-
 pkgs/tools/security/vault/default.nix            |  2 +-
 pkgs/tools/security/volatility/default.nix       |  2 +-
 pkgs/tools/security/vulnix/default.nix           |  2 +-
 pkgs/tools/system/auto-cpufreq/default.nix       |  2 +-
 pkgs/tools/system/awstats/default.nix            |  2 +-
 pkgs/tools/system/cm-rgb/default.nix             |  2 +-
 pkgs/tools/system/consul-template/default.nix    |  2 +-
 pkgs/tools/system/envconsul/default.nix          |  2 +-
 pkgs/tools/system/gdu/default.nix                |  2 +-
 pkgs/tools/system/gotop/default.nix              |  2 +-
 pkgs/tools/system/honcho/default.nix             |  2 +-
 pkgs/tools/system/journalwatch/default.nix       |  2 +-
 pkgs/tools/system/localtime/default.nix          |  2 +-
 pkgs/tools/system/pcstat/default.nix             |  2 +-
 pkgs/tools/system/ps_mem/default.nix             |  2 +-
 pkgs/tools/system/s-tui/default.nix              |  2 +-
 pkgs/tools/system/s6-rc/default.nix              |  2 +-
 .../system/systemd-journal2gelf/default.nix      |  2 +-
 pkgs/tools/system/tre-command/default.nix        |  2 +-
 pkgs/tools/text/angle-grinder/default.nix        |  2 +-
 pkgs/tools/text/choose/default.nix               |  2 +-
 pkgs/tools/text/codesearch/default.nix           |  2 +-
 pkgs/tools/text/fanficfare/default.nix           |  2 +-
 pkgs/tools/text/gjo/default.nix                  |  2 +-
 pkgs/tools/text/grin/default.nix                 |  2 +-
 pkgs/tools/text/gucci/default.nix                |  2 +-
 pkgs/tools/text/icdiff/default.nix               |  2 +-
 pkgs/tools/text/invoice2data/default.nix         |  2 +-
 pkgs/tools/text/markdown-pp/default.nix          |  2 +-
 pkgs/tools/text/pbgopy/default.nix               |  2 +-
 pkgs/tools/text/platinum-searcher/default.nix    |  2 +-
 pkgs/tools/text/proselint/default.nix            |  2 +-
 pkgs/tools/text/rpl/default.nix                  |  2 +-
 pkgs/tools/text/schema2ldif/default.nix          |  4 +++-
 pkgs/tools/text/transifex-client/default.nix     |  2 +-
 pkgs/tools/text/xurls/default.nix                |  2 +-
 pkgs/tools/typesetting/mmark/default.nix         |  2 +-
 pkgs/tools/typesetting/odpdown/default.nix       |  2 +-
 pkgs/tools/typesetting/tikzit/default.nix        |  2 +-
 pkgs/tools/video/vnc2flv/default.nix             |  2 +-
 pkgs/tools/virtualization/awless/default.nix     |  2 +-
 pkgs/tools/virtualization/awsebcli/default.nix   |  2 +-
 .../virtualization/distrobuilder/default.nix     |  2 +-
 pkgs/tools/virtualization/euca2ools/default.nix  |  2 +-
 .../tools/virtualization/marathonctl/default.nix |  2 +-
 pkgs/tools/virtualization/udocker/default.nix    |  2 +-
 pkgs/top-level/all-packages.nix                  |  2 +-
 2779 files changed, 2844 insertions(+), 2834 deletions(-)

diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix
index 2899d4ea6ef..689ad273575 100644
--- a/pkgs/applications/accessibility/contrast/default.nix
+++ b/pkgs/applications/accessibility/contrast/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitLab
 , cairo
 , dbus
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index d71420d0722..2d3ac0c314e 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -1,7 +1,6 @@
-{ stdenv
+{ lib
 , a2jmidid
 , coreutils
-, lib
 , libjack2
 , fetchpatch
 , fetchzip
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 12aec0d4cbb..be0f2f72529 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
 , qtbase, qtx11extras
 , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
 , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix
index e78e50877d3..bcad36e2da9 100644
--- a/pkgs/applications/audio/cozy-audiobooks/default.nix
+++ b/pkgs/applications/audio/cozy-audiobooks/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, fetchFromGitHub
 , ninja
 , meson
 , pkg-config
diff --git a/pkgs/applications/audio/curseradio/default.nix b/pkgs/applications/audio/curseradio/default.nix
index 82f3b130e6e..94059e06e54 100644
--- a/pkgs/applications/audio/curseradio/default.nix
+++ b/pkgs/applications/audio/curseradio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, python3Packages, mpv }:
+{ lib, fetchFromGitHub, substituteAll, python3Packages, mpv }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.2";
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 20a1044fe24..3d4e5e5e5b9 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
+{ mkDerivation, lib, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
 
 let
 
diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix
index 92e6eb2b323..80b2cff3ce0 100644
--- a/pkgs/applications/audio/dr14_tmeter/default.nix
+++ b/pkgs/applications/audio/dr14_tmeter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, pkgs }:
+{ lib, fetchFromGitHub, python3Packages, pkgs }:
 
 python3Packages.buildPythonApplication rec {
   pname = "dr14_tmeter";
diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix
index 77335da2ce7..a93251c8d2d 100644
--- a/pkgs/applications/audio/faust/faust2jackrust.nix
+++ b/pkgs/applications/audio/faust/faust2jackrust.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, faust
+{ faust
 , libjack2
 , cargo
 , binutils
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index e22067c38fc..b91c72a5c75 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook
+{ lib, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook
 , alsaSupport ? true, alsaLib ? null
 , jackSupport ? false, libjack2 ? null
 , portaudioSupport ? false, portaudio ? null }:
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index ed51304b225..1733aef4177 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchFromGitLab
 , fetchpatch
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index dea1f5fe7bc..229050654cd 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, python3Packages, intltool
+{ lib, fetchFromGitHub, python3, python3Packages, intltool
 , glibcLocales, gnome3, gtk3, wrapGAppsHook
 , gobject-introspection
 }:
diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix
index 46e1baed07d..95f3bf9988c 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/applications/audio/greg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 with pythonPackages; buildPythonApplication rec {
   pname = "greg";
diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
index ddd09ce4452..b3b95ca057e 100644
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages, gettext, klick}:
+{ lib, fetchurl, pythonPackages, gettext, klick}:
 
 pythonPackages.buildPythonApplication rec {
   pname = "gtklick";
diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix
index c6510f5469c..13b488ce7d7 100644
--- a/pkgs/applications/audio/jamulus/default.nix
+++ b/pkgs/applications/audio/jamulus/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2
+{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2
 }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 7ba47be686e..13aa4fe5bc2 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true
+{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true
 , withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null
 , withPortAudio ? false, portaudio ? null }:
 
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 4d52a286aba..11a7d0cf3c6 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13
+{ lib, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13
 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
 , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
 , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }:
diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix
index 793ee3d263a..9811998c368 100644
--- a/pkgs/applications/audio/mimms/default.nix
+++ b/pkgs/applications/audio/mimms/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, pythonPackages, libmms }:
+{ fetchurl, lib, pythonPackages, libmms }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "mimms";
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 70e6616482f..7af4b585adf 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint
+{ lib, mkDerivation, fetchurl, fetchFromGitHub, chromaprint
 , fftw, flac, faad2, glibcLocales, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , libGLU, libxcb, lilv, lv2, opusfile
diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix
index 54af3bc68f1..6e76d6af87d 100644
--- a/pkgs/applications/audio/mopidy/gmusic.nix
+++ b/pkgs/applications/audio/mopidy/gmusic.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, mopidy }:
+{ lib, python3Packages, mopidy }:
 
 python3Packages.buildPythonApplication rec {
   pname = "mopidy-gmusic";
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 05827b0bb56..c2171d4cecc 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, mopidy }:
+{ lib, python3Packages, mopidy }:
 
 python3Packages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix
index 8daaef7d45d..c191eba4c4d 100644
--- a/pkgs/applications/audio/mopidy/moped.nix
+++ b/pkgs/applications/audio/mopidy/moped.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages, mopidy, glibcLocales }:
+{ lib, pythonPackages, mopidy, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Moped";
diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix
index 17e68c16539..670b1a9c509 100644
--- a/pkgs/applications/audio/mopidy/mopify.nix
+++ b/pkgs/applications/audio/mopidy/mopify.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages, mopidy }:
+{ lib, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Mopify";
diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix
index 8d6d7a1528b..d686d492898 100644
--- a/pkgs/applications/audio/mopidy/mpd.nix
+++ b/pkgs/applications/audio/mopidy/mpd.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, mopidy }:
+{ lib, python3Packages, mopidy }:
 
 python3Packages.buildPythonApplication rec {
   pname = "Mopidy-MPD";
diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix
index 868dbaf3035..6327ba020bf 100644
--- a/pkgs/applications/audio/mopidy/mpris.nix
+++ b/pkgs/applications/audio/mopidy/mpris.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, mopidy }:
+{ lib, python3Packages, mopidy }:
 
 python3Packages.buildPythonApplication rec {
   pname = "mopidy-mpris";
diff --git a/pkgs/applications/audio/mopidy/scrobbler.nix b/pkgs/applications/audio/mopidy/scrobbler.nix
index be38c6a7040..621ced53646 100644
--- a/pkgs/applications/audio/mopidy/scrobbler.nix
+++ b/pkgs/applications/audio/mopidy/scrobbler.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, mopidy }:
+{ lib, python3Packages, mopidy }:
 
 python3Packages.buildPythonApplication rec {
   pname = "Mopidy-Scrobbler";
diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix
index afa46726db7..0637731dcb5 100644
--- a/pkgs/applications/audio/mopidy/somafm.nix
+++ b/pkgs/applications/audio/mopidy/somafm.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, mopidy }:
+{ lib, python3Packages, mopidy }:
 
 python3Packages.buildPythonApplication rec {
   pname = "mopidy-somafm";
diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix
index bdc3523652c..d8a244b5146 100644
--- a/pkgs/applications/audio/mopidy/soundcloud.nix
+++ b/pkgs/applications/audio/mopidy/soundcloud.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }:
+{ lib, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-soundcloud";
diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix
index 8fafab0970f..70d076190cd 100644
--- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix
+++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }:
+{ lib, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-spotify-tunigo";
diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix
index 57ba6ea1f61..e44b9f35daa 100644
--- a/pkgs/applications/audio/mopidy/spotify.nix
+++ b/pkgs/applications/audio/mopidy/spotify.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages, mopidy }:
+{ lib, fetchurl, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-spotify";
diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix
index d8a6d6eacca..4a3edd2a434 100644
--- a/pkgs/applications/audio/mopidy/tunein.nix
+++ b/pkgs/applications/audio/mopidy/tunein.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, mopidy }:
+{ lib, python3Packages, mopidy }:
 
 python3Packages.buildPythonApplication rec {
   pname = "mopidy-tunein";
diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix
index 35a85b95801..b84a756c2ce 100644
--- a/pkgs/applications/audio/mopidy/youtube.nix
+++ b/pkgs/applications/audio/mopidy/youtube.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, mopidy }:
+{ lib, python3Packages, mopidy }:
 
 python3Packages.buildPythonApplication rec {
   pname = "mopidy-youtube";
diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix
index 6d010c6cd95..0efe034034a 100644
--- a/pkgs/applications/audio/munt/default.nix
+++ b/pkgs/applications/audio/munt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }:
 
 let
   desktopItem = makeDesktopItem rec {
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index ff39e62e729..47f8e5a22e6 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
 , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
 , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
 , qtquickcontrols2, qtscript, qtsvg, qttools
diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix
index bb22b3cec22..fea6e097de7 100644
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, rnnoise-plugin }:
+{ lib, buildGoModule, fetchFromGitHub, rnnoise-plugin }:
 
 buildGoModule rec {
   pname = "NoiseTorch";
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 1d84aed8b2e..f238a687609 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }:
+{ lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }:
 
 mkDerivation rec {
   pname = "padthv1";
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 733cb702c7e..200e457c568 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5
+{ lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5
 , enablePlayback ? true
 , gst_all_1
 }:
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index c64371f091c..939b53c44fb 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib
+{ lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib
 , wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection
 , libnotify, libsecret, gst_all_1 }:
 
diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix
index 05800c360fa..a331952aa81 100644
--- a/pkgs/applications/audio/polyphone/default.nix
+++ b/pkgs/applications/audio/polyphone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }:
+{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }:
 
 mkDerivation rec {
   version = "2.2.0";
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index 94a571df294..efa1d943610 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }:
+{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }:
 
 python3Packages.buildPythonApplication rec {
   pname = "puddletag";
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
index a19a03d4bd2..83de192c6b3 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, stdenv, pythonPackages
+{ fetchFromGitHub, lib, pythonPackages
 , mp3Support ? true, lame ? null
 , opusSupport ? true, opusTools ? null
 , faacSupport ? false, faac ? null
diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
index 0e3eeac984a..d4f3306697d 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , ifaddr
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 719ddd28e2a..586dfeae733 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub
+{ lib, mkDerivation, fetchFromGitHub
 , pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras
 # Enable jack session support
 , jackSession ? false
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 950e16cedc8..f079b99af77 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper
+{ lib, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper
 , qtbase, qttools, qtmultimedia, qtx11extras
 # transports
 , curl, libmms
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 03f519d3816..bb40e0b3eeb 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, qttools
+{ lib, fetchurl, autoconf, automake, libtool, pkg-config, qttools
 , liblscp, libgig, qtbase, mkDerivation }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 4b712bf1d25..f708207cce9 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config
+{ lib, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config
 , mkDerivation, qtbase, qttools, qtx11extras
 }:
 
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 493a99f6b71..f19d0f70fdf 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -24,7 +24,7 @@
 , serd
 , sord
 , sratom
-, lib, stdenv
+, lib
 , suil
 }:
 
diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix
index 2cc8c53f607..a503d3b344c 100644
--- a/pkgs/applications/audio/shortwave/default.nix
+++ b/pkgs/applications/audio/shortwave/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitLab
 , cargo
 , dbus
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index bc098cedaf4..83af7985dbe 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, gettext
+{ lib, fetchFromGitHub, wrapGAppsHook, gettext
 , python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
 
 let
diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix
index 593ad9468eb..e473d97ce56 100644
--- a/pkgs/applications/audio/spotify-cli-linux/default.nix
+++ b/pkgs/applications/audio/spotify-cli-linux/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, dbus }:
+{ lib, python3Packages, dbus }:
 python3Packages.buildPythonApplication rec {
   pname = "spotify-cli-linux";
   version = "1.6.0";
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 8097ee90930..50e16c355e2 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }:
+{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }:
 
 mkDerivation rec {
   pname = "synthv1";
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix
index 1cb9795005c..71a91dc3105 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/applications/audio/traverso/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config
+{ mkDerivation, lib, fetchurl, cmake, pkg-config
 , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
 , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
 }:
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index 8a46a06efce..97d42eb9c69 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
+{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
 , sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }:
 
 python3.pkgs.buildPythonApplication rec {
diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix
index ec142cc723e..8cf3295ccab 100644
--- a/pkgs/applications/blockchains/ethabi.nix
+++ b/pkgs/applications/blockchains/ethabi.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "ethabi";
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 54805f2512f..21e5a124f7d 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
+{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
 
 let
   pname = "ledger-live-desktop";
diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix
index 499e2a77c6f..1424ddc9516 100644
--- a/pkgs/applications/blockchains/quorum.nix
+++ b/pkgs/applications/blockchains/quorum.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }:
+{ lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }:
 
 buildGoPackage rec {
   pname = "quorum";
diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix
index 79a1eda3495..dcfba417149 100644
--- a/pkgs/applications/blockchains/turbo-geth.nix
+++ b/pkgs/applications/blockchains/turbo-geth.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "turbo-geth";
diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
index dd553fc1998..ea871ccf414 100644
--- a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, trivialBuild }:
+{ fetchurl, lib, trivialBuild }:
 
 trivialBuild {
   pname = "sv-kalender";
diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index 059d49151d8..c73238ce366 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }:
+{ lib, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }:
 mkDerivation rec {
   pname = "featherpad";
   version = "0.10.0";
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 31a7026106e..d47c315f613 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:
+{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:
 
 mkDerivation rec {
   pname = "focuswriter";
diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix
index a0fdcfbb3f6..5429497d209 100644
--- a/pkgs/applications/editors/hecate/default.nix
+++ b/pkgs/applications/editors/hecate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   version = "0.0.1";
diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix
index 5d782aa1abc..f92a4557ac7 100644
--- a/pkgs/applications/editors/hexdino/default.nix
+++ b/pkgs/applications/editors/hexdino/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, ncurses }:
+{ lib, fetchFromGitHub, rustPlatform, ncurses }:
 
 rustPlatform.buildRustPackage {
   pname = "hexdino";
diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix
index 07454d331c6..71833be3300 100644
--- a/pkgs/applications/editors/kibi/default.nix
+++ b/pkgs/applications/editors/kibi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , rustPlatform
 }:
diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix
index cc39da90c23..49dafe8fc1a 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/applications/editors/manuskript/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
+{ lib, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
 
 python3Packages.buildPythonApplication rec {
   pname = "manuskript";
diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index a8e60cddfbb..512e0f12441 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -4,7 +4,7 @@
 , qmake
 , qtbase
 , qtwebkit
-, lib, stdenv
+, lib
 , wrapGAppsHook
 }:
 
diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix
index f1d56584e49..208339c2e38 100644
--- a/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }:
+{ lib, rustPlatform, fetchFromGitHub, gtk, webkitgtk }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gnvim-unwrapped";
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index 1d82e70f5c4..867e2275128 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 with lib;
 
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index d51f46b9e0a..b2011c5d8e6 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
+{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
 , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts
 , qca-qt5, shared-mime-info }:
 
diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix
index 99f7340f753..6bf0f191ece 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/pkgs/applications/editors/retext/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts
+{ lib, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts
 # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
 # available.
 , enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ]
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 1094c3c7553..b34441d100c 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper
 , boost, xercesc, hunspell, zlib, pcre16
 , qtbase, qttools, qtwebengine, qtxmlpatterns
 , python3Packages
diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix
index 3ffcc8ecf45..e52d95f837d 100644
--- a/pkgs/applications/editors/texmacs/common.nix
+++ b/pkgs/applications/editors/texmacs/common.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }:
+{ lib, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }:
 rec {
   extraFontsSrc = fetchurl {
     url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
index e98d57420e8..39aefe3fa16 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3 }:
+{ lib, fetchFromGitHub, python3 }:
 
 with python3.pkgs;
 
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index f5306e75a56..b6222c8a6d2 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake
+{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake
 , python, qtbase, qttools }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
index d1cee064aee..3b6bb01bb15 100644
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ b/pkgs/applications/graphics/displaycal/default.nix
@@ -1,5 +1,5 @@
 { python2
-, lib, stdenv
+, lib
 , fetchurl
 , pkg-config
 , libXext
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index b2997c2c474..db0012a184b 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
   pname = "dosage";
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 3563220f2b8..1c4f05b42da 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
 xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
 opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
 gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }:
diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix
index 094dcf0703e..8fde04d0d1d 100644
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}:
+{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}:
 
 let
 allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix
index 30c21149827..0e65d3199ab 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages, wrapGAppsHook,
+{ lib, fetchurl, perlPackages, wrapGAppsHook,
   # libs
   librsvg, sane-backends, sane-frontends,
   # runtime dependencies
diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 95b96bcff1b..f5b8b806215 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , lzma
 , qt5
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 1ea21506e31..d9c51d38802 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript
+{ lib, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript
 , libjpeg, libpng, qtbase, mkDerivation
 }:
 
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index 283ed117954..294b6c4ca70 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook
+{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook
 , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons
 , qtbase, qtsvg
 , boost, graphviz
diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix
index 314e4c6ec14..ef335cd6be2 100644
--- a/pkgs/applications/graphics/krop/default.nix
+++ b/pkgs/applications/graphics/krop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}:
+{ lib, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}:
 
 python3Packages.buildPythonApplication rec {
   pname = "krop";
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
index 36154af137b..c44ff57d18f 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkg-config
+{ lib, mkDerivation, cmake, fetchFromGitHub, pkg-config
 , boost, exiv2, fftwFloat, gsl
 , ilmbase, lcms2, libraw, libtiff, openexr
 , qtbase, qtdeclarative, qttools, qtwebengine, eigen
diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix
index 81077578eb2..add40043c0f 100644
--- a/pkgs/applications/graphics/mcomix3/default.nix
+++ b/pkgs/applications/graphics/mcomix3/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchFromGitHub
 , wrapGAppsHook
 , installShellFiles
diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix
index c894de2c933..d06ff027c5b 100644
--- a/pkgs/applications/graphics/meme/default.nix
+++ b/pkgs/applications/graphics/meme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , unstableGitUpdater
 , buildGoModule
 , fetchFromGitHub
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 9da9c20942e..7b83bdec8c6 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , gtk3
 , gettext
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 8a3e41965ff..bd6d732ac68 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchFromGitHub
 , fetchpatch
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 7bbff5499f6..79feab3ab7a 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -1,6 +1,6 @@
 { boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras,
   qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper,
-  mkDerivation, ninja, mpi, python3, lib, stdenv, tbb, libGLU, libGL }:
+  mkDerivation, ninja, mpi, python3, lib, tbb, libGLU, libGL }:
 
 mkDerivation rec {
   pname = "paraview";
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index bcc09498121..857a68df092 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "pdfcpu";
diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix
index ca2455dd048..0c25364b76a 100644
--- a/pkgs/applications/graphics/photoflare/default.nix
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools
+{ mkDerivation, lib, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools
 }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index fe49d5fa154..52e38b23c1f 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
+{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
 , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
 , extra-cmake-modules, poppler, kimageformats, libarchive, libdevil
 }:
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index 21960358a7b..5044e60161c 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, exiv2 }:
 
 mkDerivation rec {
   pname = "phototonic";
diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix
index d4788b3c1e7..e3ab0c772a1 100644
--- a/pkgs/applications/graphics/pick-colour-picker/default.nix
+++ b/pkgs/applications/graphics/pick-colour-picker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonPackage
 , pygobject3
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index 8b6e581ae0b..2635b2d3d88 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp,
+{ lib, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp,
   gettext }:
 
 let
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index c4fc79c7fec..47bf2d95028 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }:
+{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }:
 
 mkDerivation rec {
   pname = "qcomicbook";
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index 26522d78bcd..f444ebfe5be 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivationWith, fetchurl, python3Packages
+{ lib, mkDerivationWith, fetchurl, python3Packages
 , file, intltool, gobject-introspection, libgudev
 , udisks, gexiv2, gst_all_1, libnotify
 , exiftool, gdk-pixbuf, libmediainfo, vmtouch
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index b985ae7d571..c51794881e9 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mkDerivation
+{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation
 , qtbase, qtx11extras, qtsvg, makeWrapper
 , vulkan-loader, libglvnd, xorg, python3, python3Packages
 , bison, pcre, automake, autoconf, addOpenGLRunpath
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 361f1fa1809..048b8b56fc0 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, mkDerivation
+{ lib, fetchFromGitHub, mkDerivation
 , cmake, libjpeg, libpng, libtiff, boost
 , qtbase, qttools }:
 
diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix
index 22751f38fe1..313920d8154 100644
--- a/pkgs/applications/graphics/tesseract/wrapper.nix
+++ b/pkgs/applications/graphics/tesseract/wrapper.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, makeWrapper, tesseractBase, languages
+{ lib, makeWrapper, tesseractBase, languages
 
 # A list of languages like [ "eng" "spa" … ] or `null` for all available languages
 , enableLanguages ? null
diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix
index 0130017356c..f3aef213ad2 100644
--- a/pkgs/applications/logging/humioctl/default.nix
+++ b/pkgs/applications/logging/humioctl/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }:
+{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
 
 let
   humioCtlVersion = "0.28.2";
diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix
index 133194f7af5..516b786222d 100644
--- a/pkgs/applications/misc/antfs-cli/default.nix
+++ b/pkgs/applications/misc/antfs-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication {
   pname = "antfs-cli";
diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix
index b01bfbedb8a..81096d9877f 100644
--- a/pkgs/applications/misc/ape/apeclex.nix
+++ b/pkgs/applications/misc/ape/apeclex.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, attemptoClex, callPackage }:
+{ lib, attemptoClex, callPackage }:
 
 callPackage ./. {
   pname = "ape-clex";
diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix
index c94011466ec..4fa3d5cf419 100644
--- a/pkgs/applications/misc/archivy/default.nix
+++ b/pkgs/applications/misc/archivy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python3, fetchPypi, appdirs, attrs, requests,
+{ lib, python3, fetchPypi, appdirs, attrs, requests,
 beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf,
 pypandoc, python-dotenv, python-frontmatter, tinydb, validators,
 watchdog, wtforms }:
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index 82e7c1bb21b..bd3194e3fea 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets
 , qtquickcontrols2, qtgraphicaleffects }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
index 0b57ad29266..ac929bfa5b1 100644
--- a/pkgs/applications/misc/autospotting/default.nix
+++ b/pkgs/applications/misc/autospotting/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "autospotting";
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
index fa5980b115e..b9dbcf529be 100644
--- a/pkgs/applications/misc/barrier/default.nix
+++ b/pkgs/applications/misc/barrier/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
+{ lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
   openssl, wrapGAppsHook,
   avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
 }:
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 3213ed9edf0..eb909155e4e 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, stdenv, fetchurl, cmake, pkg-config, sword, boost, clucene_core
+{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core
 , qtbase, qttools, qtsvg, qtwebkit
 }:
 
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 89686e50d17..952d1fe16db 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python3Packages
 , fetchurl
 , gettext
diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix
index 05815e242f0..3458ac3f250 100644
--- a/pkgs/applications/misc/break-time/default.nix
+++ b/pkgs/applications/misc/break-time/default.nix
@@ -5,7 +5,7 @@
 , pkg-config
 , python3
 , rustPlatform
-, lib, stdenv
+, lib
 , wrapGAppsHook
 }:
 
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 772754ecc6d..68b4f7b3e56 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchFromGitHub }:
+{ lib, python3, fetchFromGitHub }:
 
 with python3.pkgs; buildPythonApplication rec {
   version = "4.5";
diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix
index d3357b41bd2..8df75b0cbd1 100644
--- a/pkgs/applications/misc/candle/default.nix
+++ b/pkgs/applications/misc/candle/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qtserialport, qmake }:
 
 mkDerivation rec {
   pname = "candle";
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 988af330deb..90eb38329a3 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, fetchFromGitHub
 , buildGoModule, installShellFiles }:
 
 buildGoModule rec {
diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix
index fb5d9aed959..13ee17999fe 100644
--- a/pkgs/applications/misc/chewing-editor/default.nix
+++ b/pkgs/applications/misc/chewing-editor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase
 , qttools }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix
index 631d53b506f..56938f5338d 100644
--- a/pkgs/applications/misc/coursera-dl/default.nix
+++ b/pkgs/applications/misc/coursera-dl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }:
+{ lib, fetchFromGitHub, glibcLocales, pandoc, python3 }:
 
 let
   pythonPackages = python3.pkgs;
diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix
index 7b9d7faba94..8cb87274c1d 100644
--- a/pkgs/applications/misc/crow-translate/default.nix
+++ b/pkgs/applications/misc/crow-translate/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , mkDerivation
 , fetchFromGitHub
 , substituteAll
diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix
index 6b851e80f34..42df68f6721 100644
--- a/pkgs/applications/misc/cum/default.nix
+++ b/pkgs/applications/misc/cum/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 with python3Packages;
 
diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
index 1e186bdf5fd..7b1dbf4d85e 100644
--- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
+{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
 
 buildPythonPackage {
   pname = "libarcus";
diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
index fb920235031..f12059e6317 100644
--- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
+{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
 
 buildPythonPackage {
   pname = "libsavitar-lulzbot";
diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix
index 77a4f3edef6..01166092b2b 100644
--- a/pkgs/applications/misc/cura/lulzbot/uranium.nix
+++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
+{ lib, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
 , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage {
diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index 3a46b5e2f9a..20742311375 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 }:
diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix
index 3425ceb44a9..fe15d90f254 100644
--- a/pkgs/applications/misc/devdocs-desktop/default.nix
+++ b/pkgs/applications/misc/devdocs-desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
+{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
 
 let
   version = "0.7.1";
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 6af92285c2b..19cfa95a88e 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }:
 
 mkDerivation {
   pname = "dfilemanager";
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index c1a4d5e4440..30715dd51f3 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
+{ lib, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
 
 mkDerivation rec {
   version = "2.1.3";
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix
index a0b4237c7f6..a8817a542e3 100644
--- a/pkgs/applications/misc/dmensamenu/default.nix
+++ b/pkgs/applications/misc/dmensamenu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }:
+{ lib, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }:
 
 buildPythonApplication rec {
   pname = "dmensamenu";
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix
index e0e9fcd6feb..b31c17cc319 100644
--- a/pkgs/applications/misc/dockbarx/default.nix
+++ b/pkgs/applications/misc/dockbarx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }:
+{ lib, fetchFromGitHub, pythonPackages, gnome2, keybinder }:
 
 pythonPackages.buildPythonApplication rec {
   ver = "0.93";
diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix
index 913ed9523ba..911a319a963 100644
--- a/pkgs/applications/misc/dotfiles/default.nix
+++ b/pkgs/applications/misc/dotfiles/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages }:
+{ lib, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "dotfiles";
diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix
index 78efa133c1e..cd1c659ec5b 100644
--- a/pkgs/applications/misc/dstask/default.nix
+++ b/pkgs/applications/misc/dstask/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dstask";
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
index 418658fec22..d2332b4d9c7 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}:
+{lib, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}:
 
 python3Packages.buildPythonApplication rec {
   pname = "dupeguru";
diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
index 29ac8b4484b..d0606001ad4 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/pkgs/applications/misc/electrum/dash.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2Packages }:
+{ lib, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   version = "2.9.3.1";
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index ad6ed6f7a78..bd015afdc57 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , python3Packages
 , wrapQtAppsHook
diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix
index 8fc7fb32743..690b88d8417 100644
--- a/pkgs/applications/misc/elfx86exts/default.nix
+++ b/pkgs/applications/misc/elfx86exts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchFromGitHub
 }:
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 1eeeba1b439..79420eacec8 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "exercism";
diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix
index 7f932b5b1e5..63f942c2c59 100644
--- a/pkgs/applications/misc/expenses/default.nix
+++ b/pkgs/applications/misc/expenses/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , buildGoModule
 , fetchFromGitHub
 , sqlite
diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix
index 26b8beab19c..36629179ab5 100644
--- a/pkgs/applications/misc/fbmenugen/default.nix
+++ b/pkgs/applications/misc/fbmenugen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , fluxbox
 , gnused
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
index 1e0aba0400f..12b5a38877a 100644
--- a/pkgs/applications/misc/geoipupdate/default.nix
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "geoipupdate";
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index 6664974a41a..d4f50451719 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}:
+{ lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}:
 
 with lib;
 
diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix
index c2871766deb..2f2a0a22126 100644
--- a/pkgs/applications/misc/go-jira/default.nix
+++ b/pkgs/applications/misc/go-jira/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "go-jira";
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 57e2d95f043..fa58c2d3965 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, mkDerivation
+{ lib, fetchFromGitHub, fetchpatch, mkDerivation
 , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
 , qtconnectivity, qtcharts, libusb-compat-0_1
 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix
index 3de63203f24..4025b313128 100644
--- a/pkgs/applications/misc/gpsbabel/gui.nix
+++ b/pkgs/applications/misc/gpsbabel/gui.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }:
+{ lib, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }:
 
 mkDerivation {
   pname = "gpsbabel-gui";
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 4fc4586ca4e..1628f0473fa 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2,
+{ lib, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2,
   pango, gobject-introspection, wrapGAppsHook, gettext,
 # Optional packages:
  enableOSM ? true, osm-gps-map,
diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix
index 101baa09396..15d8b966396 100644
--- a/pkgs/applications/misc/gsctl/default.nix
+++ b/pkgs/applications/misc/gsctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gsctl";
diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix
index 855123ef793..dbf7e1aee74 100644
--- a/pkgs/applications/misc/hamster/default.nix
+++ b/pkgs/applications/misc/hamster/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool
+{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool
 , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }:
 
 python3Packages.buildPythonApplication rec {
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index 467cbfad656..fc9607e7be6 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, fetchpatch }:
+{ lib, fetchFromGitHub, python3, fetchpatch }:
 
 
 let
diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix
index fc22d3a854a..6ada1fd749b 100644
--- a/pkgs/applications/misc/hivemind/default.nix
+++ b/pkgs/applications/misc/hivemind/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, runtimeShell }:
+{ lib, buildGoPackage, fetchFromGitHub, runtimeShell }:
 
 buildGoPackage rec {
   pname = "hivemind";
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 2d2ccefe934..35246a45da2 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "hugo";
diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix
index 7fc8ef88330..79f87612e49 100644
--- a/pkgs/applications/misc/jrnl/default.nix
+++ b/pkgs/applications/misc/jrnl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python3
 }:
 
diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix
index 341341c3ca8..467945af6ac 100644
--- a/pkgs/applications/misc/k4dirstat/default.nix
+++ b/pkgs/applications/misc/k4dirstat/default.nix
@@ -6,7 +6,7 @@
 , kio
 , kjobwidgets
 , kxmlgui
-, lib, stdenv
+, lib
 }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index c1d9448c6a6..59d986321dd 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem,
+{ lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem,
   unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }:
 
 with builtins; buildDotnetPackage rec {
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 5effc88acb0..3bec8db0687 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, glibcLocales, python3 }:
+{ lib, glibcLocales, python3 }:
 
 python3.pkgs.buildPythonApplication rec {
   version = "0.17.0";
diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix
index 545dc85efeb..dcbeb408759 100644
--- a/pkgs/applications/misc/kondo/default.nix
+++ b/pkgs/applications/misc/kondo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "kondo";
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index ce21ea75b30..243583b8762 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , intltool
 , python3Packages
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index e32535d4445..65f9a9f0f17 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python27Packages, fetchgit }:
+{ lib, python27Packages, fetchgit }:
 let
   py = python27Packages;
   python = py.python;
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index 249ed48bd1c..2a65fc25af2 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "madonctl";
diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix
index f19cbee8b79..4adfe0f6526 100644
--- a/pkgs/applications/misc/mediaelch/default.nix
+++ b/pkgs/applications/misc/mediaelch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchFromGitHub
 , qmake
diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix
index 192228de5d9..086db35a5ad 100644
--- a/pkgs/applications/misc/menumaker/default.nix
+++ b/pkgs/applications/misc/menumaker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages }:
+{ lib, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "menumaker";
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index 07102fe56f2..007965f868b 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "mop";
diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix
index c01a1b9cbc6..657ac9645de 100644
--- a/pkgs/applications/misc/mqtt-bench/default.nix
+++ b/pkgs/applications/misc/mqtt-bench/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
   pname = "mqtt-bench";
diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix
index 173291183da..fd1ca666589 100644
--- a/pkgs/applications/misc/multibootusb/default.nix
+++ b/pkgs/applications/misc/multibootusb/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip,
   coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk,
-  python36Packages, qt5, runtimeShell, lib, stdenv, util-linux, wrapQtAppsHook }:
+  python36Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }:
 
 # Note: Multibootusb is tricky to maintain. It relies on the
 # $PYTHONPATH variable containing some of their code, so that
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index b23c41e6fee..cbb7a110c4c 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, boost
+{ lib, mkDerivation, fetchFromGitHub, boost
 , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}:
 
 mkDerivation rec {
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 2b0986eeba6..507399c012b 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, pythonPackages, curl }:
+{ lib, fetchFromGitHub, fetchurl, pythonPackages, curl }:
 
 let
   getmodel = name: sha256: {
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index 42433936aba..d52120e0fb7 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -1,5 +1,5 @@
 { fetchurl
-, lib, stdenv
+, lib
 , substituteAll
 , aspellWithDicts
 , at-spi2-core ? null
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index bb8f8d4013f..2ca4e3203ac 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub
+{ lib, mkDerivation, fetchFromGitHub
 , cmake, gcc-arm-embedded, python3Packages
 , qtbase, qtmultimedia, qttranslations, SDL, gtest
 , dfu-util, avrdude
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 25cca1536f8..72d68431b8c 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , pkg-config
 , fetchurl
 , buildPythonApplication
diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix
index f2386a5cd83..932fa588d27 100644
--- a/pkgs/applications/misc/pass-secret-service/default.nix
+++ b/pkgs/applications/misc/pass-secret-service/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, dbus, gnupg }:
+{ lib, fetchFromGitHub, python3, dbus, gnupg }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pass-secret-service";
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index 907cceeb58b..4255127b3df 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}:
+{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook}:
 
 python3.pkgs.buildPythonApplication {
   pname = "pdf-quench";
diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix
index 8c8413b2ce6..73dd9390382 100644
--- a/pkgs/applications/misc/pdfarranger/default.nix
+++ b/pkgs/applications/misc/pdfarranger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lib
+{ fetchFromGitHub, lib
 , wrapGAppsHook, intltool
 , python3Packages, gtk3, poppler_gi
 }:
diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix
index 31719cdfef2..5e489bebb25 100644
--- a/pkgs/applications/misc/pdfdiff/default.nix
+++ b/pkgs/applications/misc/pdfdiff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages, fetchurl, xpdf }:
+{ lib, pythonPackages, fetchurl, xpdf }:
 let
   py = pythonPackages;
 in
diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index 67010e713c3..0a99d357e68 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchFromGitHub
 , pkg-config
 , qmake
diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix
index 7332f201689..6ca315b1092 100644
--- a/pkgs/applications/misc/pipr/default.nix
+++ b/pkgs/applications/misc/pipr/default.nix
@@ -1,9 +1,8 @@
-{ stdenv
+{ lib
 , fetchFromGitHub
 , rustPlatform
 , bubblewrap
 , makeWrapper
-, lib
 }:
 
 rustPlatform.buildRustPackage rec {
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 2a3368e351f..05886a85bf0 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python27Packages, python36Packages, wmctrl,
+{ lib, fetchurl, python27Packages, python36Packages, wmctrl,
   qtbase, mkDerivationWith }:
 
 {
diff --git a/pkgs/applications/misc/prevo/default.nix b/pkgs/applications/misc/prevo/default.nix
index 92d78869503..45f5889d4d5 100644
--- a/pkgs/applications/misc/prevo/default.nix
+++ b/pkgs/applications/misc/prevo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, symlinkJoin, prevo-tools, prevo-data, makeWrapper }:
+{ lib, symlinkJoin, prevo-tools, prevo-data, makeWrapper }:
 
 symlinkJoin rec {
   name = "prevo-${version}";
diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix
index 13f9178f330..63160955130 100644
--- a/pkgs/applications/misc/printrun/default.nix
+++ b/pkgs/applications/misc/printrun/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
   pname = "printrun";
diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix
index 0135e10d6df..afec377e9b6 100644
--- a/pkgs/applications/misc/pydf/default.nix
+++ b/pkgs/applications/misc/pydf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   pname = "pydf";
diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix
index a26b6b014da..5eb43c0e357 100644
--- a/pkgs/applications/misc/pyditz/cerberus.nix
+++ b/pkgs/applications/misc/pyditz/cerberus.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }:
 
 buildPythonPackage rec {
   pname = "Cerberus";
diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix
index 268d2fb2860..5765aeba7dd 100644
--- a/pkgs/applications/misc/pyditz/default.nix
+++ b/pkgs/applications/misc/pyditz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages }:
+{ lib, pythonPackages }:
 
 with pythonPackages;
 
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index eb775a1f602..4e1e1f31f19 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , perl
 , python3
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index a51bd3a80c0..7830f2035d9 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, qmake
+{ lib, fetchFromGitHub, qmake
 , coreutils, xdg_utils, bash
 , makeWrapper, perlPackages, mkDerivation }:
 
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index c6306294ecd..721c95c028b 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev
+{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev
 , qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1
 , libsndfile, libmad
 }:
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 0892632c1d8..6ae81fca27c 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups
+{lib, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups
 , file, ghostscript
 }:
 let
diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix
index f7dbc9a9058..5f9958f2d5d 100644
--- a/pkgs/applications/misc/qsudo/default.nix
+++ b/pkgs/applications/misc/qsudo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchFromGitHub
 , qmake
diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix
index 5de2428250a..9480a32aae3 100644
--- a/pkgs/applications/misc/qt-box-editor/default.nix
+++ b/pkgs/applications/misc/qt-box-editor/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation
-, lib, stdenv
+, lib
 , fetchFromGitHub
 , qtbase
 , qtsvg
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 4ab70a5a8d7..fafd91f7811 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, qt5, mkDerivation }:
+{ lib, fetchzip, qt5, mkDerivation }:
 
 let
   version = "1.40.43";
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 8394fd4c534..619b2ba9955 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, python3Packages, file, less, highlight
+{ lib, fetchFromGitHub, python3Packages, file, less, highlight
 , imagePreviewSupport ? true, w3m ? null}:
 
 with lib;
diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
index 77538f24361..800170b314a 100644
--- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
+++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi, python3Packages }:
+{ lib, buildPythonApplication, fetchPypi, python3Packages }:
 
 buildPythonApplication rec {
   pname = "remarkable-mouse";
diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix
index 22a154da4fd..e2a5f348da5 100644
--- a/pkgs/applications/misc/remarkable/rmapi/default.nix
+++ b/pkgs/applications/misc/remarkable/rmapi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "rmapi";
diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix
index 3148bf0ccf3..385607ec709 100644
--- a/pkgs/applications/misc/remarkable/rmview/default.nix
+++ b/pkgs/applications/misc/remarkable/rmview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
+{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
 
 python3Packages.buildPythonApplication rec {
   pname = "rmview";
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index d7b38e2d665..bc36b2f379e 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rsClock";
diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/applications/misc/rss-bridge-cli/default.nix
index 4ab79440b23..7550e6bcb95 100644
--- a/pkgs/applications/misc/rss-bridge-cli/default.nix
+++ b/pkgs/applications/misc/rss-bridge-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, writeShellScriptBin, rss-bridge, php }:
+{ lib, writeShellScriptBin, rss-bridge, php }:
 
 let
   phpWithExts = (php.withExtensions
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 34393696232..be539a37a30 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 with python3Packages;
 buildPythonApplication rec {
diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix
index e41860551fc..5beacfad2f9 100644
--- a/pkgs/applications/misc/snapper-gui/default.nix
+++ b/pkgs/applications/misc/snapper-gui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, python3Packages
+{ lib, fetchFromGitHub, python3, python3Packages
 , gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper
 , gobject-introspection
 }:
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
index 15ef1654e70..db734bff587 100644
--- a/pkgs/applications/misc/syncthing-tray/default.nix
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }:
+{ lib, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }:
 
 buildGoPackage rec {
   pname = "syncthing-tray";
diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix
index ae730d597ce..1a97f6c0feb 100644
--- a/pkgs/applications/misc/taskwarrior-tui/default.nix
+++ b/pkgs/applications/misc/taskwarrior-tui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchFromGitHub
 }:
diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
index d8bb03138f3..562a0f0bdcb 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonApplication
 , click
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix
index e3e64cfd68a..b44b4bd0a70 100644
--- a/pkgs/applications/misc/terminal-parrot/default.nix
+++ b/pkgs/applications/misc/terminal-parrot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "terminal-parrot";
diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix
index 2541a17fc20..95937ea5f2e 100644
--- a/pkgs/applications/misc/termpdf.py/default.nix
+++ b/pkgs/applications/misc/termpdf.py/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonApplication
 , fetchFromGitHub
 , fetchPypi
diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix
index ced50748d0f..856fa60d8e6 100644
--- a/pkgs/applications/misc/tickrs/default.nix
+++ b/pkgs/applications/misc/tickrs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, perl }:
+{ lib, rustPlatform, fetchFromGitHub, perl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tickrs";
diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix
index 0658b43626e..3333760a759 100644
--- a/pkgs/applications/misc/tipp10/default.nix
+++ b/pkgs/applications/misc/tipp10/default.nix
@@ -1,4 +1,4 @@
-{ cmake, lib, stdenv, mkDerivation, fetchFromGitLab,
+{ cmake, lib, mkDerivation, fetchFromGitLab,
   qtmultimedia, qttools, ... }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index bc172c9b49f..069a63fb66b 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "todiff";
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index d992d9cdc41..2a322b20881 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.27.0";
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
index 4ff3090d1f8..3ea3511308b 100644
--- a/pkgs/applications/misc/topydo/default.nix
+++ b/pkgs/applications/misc/topydo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }:
+{ lib, python3Packages, fetchFromGitHub, glibcLocales }:
 
 with python3Packages;
 
diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix
index be9a0bafcc6..a402a669fbe 100644
--- a/pkgs/applications/misc/tty-share/default.nix
+++ b/pkgs/applications/misc/tty-share/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 # Upstream has a `./vendor` directory with all deps which we rely upon.
 buildGoPackage rec {
diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix
index 1fa3e9b7883..893f901044a 100644
--- a/pkgs/applications/misc/tut/default.nix
+++ b/pkgs/applications/misc/tut/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "tut";
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix
index 3873f8d248e..f6416f0f352 100644
--- a/pkgs/applications/misc/tzupdate/default.nix
+++ b/pkgs/applications/misc/tzupdate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3 }:
+{ lib, python3 }:
 
 let
   inherit (python3.pkgs) buildPythonApplication fetchPypi requests;
diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index e2178850da1..87c49a19a19 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, asciidoc-full, gettext
+{ lib, fetchFromGitHub, asciidoc-full, gettext
 , gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg
 , udisks2, wrapGAppsHook
 , python3Packages
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index 8c17d264293..989649ec414 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , nix-update-script
 , python3Packages
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 3e97088371a..a56a09a8e34 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
   pname = "urlscan";
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
index 1818ed9a215..7329d8204cd 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchhg
+{ mkDerivation, lib, fetchhg
 , qmake, qttools
 , qtbase, qtsvg, qtxmlpatterns
 , poppler_utils
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index b4591d8717c..9d820fc4da7 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }:
+{ lib, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }:
 
 mkDerivation rec {
   pname = "vym";
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index 74c424a277b..4bbd0289a15 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "wego";
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index e234a9007fd..ec7dff14143 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   version = "1.4";
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index c1af7ae373c..00ae2df100e 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
+{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
 
 python3Packages.buildPythonApplication rec {
   pname = "xdgmenumaker";
diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix
index ca329521142..e31a69963ff 100644
--- a/pkgs/applications/misc/yokadi/default.nix
+++ b/pkgs/applications/misc/yokadi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonApplication, dateutil,
+{ lib, fetchurl, buildPythonApplication, dateutil,
   sqlalchemy, setproctitle, icalendar }:
 
 buildPythonApplication rec {
diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix
index 5e27f9d45b6..1dbaa842ba4 100644
--- a/pkgs/applications/misc/zk-shell/default.nix
+++ b/pkgs/applications/misc/zk-shell/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   version = "1.0.0";
diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix
index 748bc21ee35..3acac8b3c68 100644
--- a/pkgs/applications/misc/zscroll/default.nix
+++ b/pkgs/applications/misc/zscroll/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, python3Packages, fetchFromGitHub }:
+{ lib, python3, python3Packages, fetchFromGitHub }:
 
 let version = "1.0"; in
 
diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix
index a56a586b82a..20b685a162f 100644
--- a/pkgs/applications/networking/brig/default.nix
+++ b/pkgs/applications/networking/brig/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "brig";
diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix
index aa57b9a17f6..e106eb7ff66 100644
--- a/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/pkgs/applications/networking/browsers/browsh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:
+{ lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:
 
 let
   version = "1.6.4";
diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix
index 6482ce59da6..be3d8295f99 100644
--- a/pkgs/applications/networking/browsers/castor/default.nix
+++ b/pkgs/applications/networking/browsers/castor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , rustPlatform
 , pkg-config
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 22d21a5efa5..c4a5508b753 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }:
+{ lib, mkChromiumDerivation, channel, enableWideVine, ungoogled }:
 
 with lib;
 
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 6b3b6351230..874a73dae8e 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, meson, ninja, pkg-config, nix-update-script
+{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script
 , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
 , glib-networking, gtkspell3, hunspell, desktop-file-utils
 , gobject-introspection, wrapGAppsHook, gnome3 }:
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 753ea1dc08d..35130ab3393 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchzip, python3
+{ lib, fetchurl, fetchzip, python3
 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
 , libxslt, gst_all_1 ? null
diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix
index 572975f78d0..3a9192164ad 100644
--- a/pkgs/applications/networking/c14/default.nix
+++ b/pkgs/applications/networking/c14/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "c14-cli";
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index c82b297f9d6..810ea11b017 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "cloudflared";
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index c6f83535106..728e23ff380 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "atlantis";
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 5a4f6b7db0e..c483125d851 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage rec {
   pname = "machine";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index c833dea21c7..4940f6331d4 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }:
+{ lib, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }:
 
 buildGoPackage rec {
   pname = "docker-machine-kvm";
diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index 1dadc0b7f08..39399a7dbcf 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "fluxcd";
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index 896c04d6879..4a8f42e3cc7 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "fluxctl";
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index f9b67b6821a..d9827039500 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config
+{ lib, fetchFromGitHub, rustPlatform, pkg-config
 , libsodium, libarchive, openssl, zeromq }:
 
 rustPlatform.buildRustPackage rec {
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 7d97896c360..d823e38f3f2 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "helm";
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index abc23058303..11e2b0a2915 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "k9s";
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 98ffcd6fe67..9b1a155a25b 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }:
+{ lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }:
 let
   goPackagePath = "k8s.io/kops";
 
diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix
index fd7eabf1276..38323b98b19 100644
--- a/pkgs/applications/networking/cluster/kubeless/default.nix
+++ b/pkgs/applications/networking/cluster/kubeless/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage rec {
   pname = "kubeless";
diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix
index c72702fdc77..d7f829dc00e 100644
--- a/pkgs/applications/networking/cluster/kubelogin/default.nix
+++ b/pkgs/applications/networking/cluster/kubelogin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule, go }:
+{ lib, fetchFromGitHub, buildGoModule, go }:
 
 buildGoModule rec {
   pname = "kubelogin";
diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/applications/networking/cluster/kubernix/default.nix
index 1411892b75b..88cacfea4f1 100644
--- a/pkgs/applications/networking/cluster/kubernix/default.nix
+++ b/pkgs/applications/networking/cluster/kubernix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "kubernix";
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index d26f8ed5dc6..28b3b719997 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }:
+{ lib, fetchFromGitHub, buildGoModule, makeWrapper }:
 
 buildGoModule rec {
   pname = "kubeval";
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index 8718da46246..11b62f479c7 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule {
   pname = "linkerd-unstable";
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 09bf82e43fe..53209d2edd6 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux
+{ lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux
 , coreutils, kerberos, ncurses, clang, installShellFiles
 , components ? [
   "cmd/oc"
diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix
index 650532ae8b9..89802f12be5 100644
--- a/pkgs/applications/networking/cluster/popeye/default.nix
+++ b/pkgs/applications/networking/cluster/popeye/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "popeye";
diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
index 80c8244bee1..928fb351c6a 100644
--- a/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }:
+{ lib, fetchFromGitHub, buildGoPackage, bash, makeWrapper }:
 
 buildGoPackage rec {
   pname   = "amazon-ssm-agent";
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
index 7b9bf354af7..085b504314e 100644
--- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub}:
+{ lib, buildGoPackage, fetchFromGitHub}:
 
 buildGoPackage rec {
   pname = "terraform-inventory";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
index 14d411c0239..b8e3c1540e9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 buildGoPackage rec {
   pname = "terraform-provider-ansible";
   version = "1.0.3";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix
index 0528bce81e3..1ee986d2030 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "terraform-provider-cloudfoundry";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index 47e4f30d009..6ae781046df 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
   pname = "terraform-provider-elasticsearch";
   version = "0.7.0";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
index fe508f4fa2e..13afa8d3818 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 buildGoPackage rec {
   pname = "terraform-provider-gandi";
   version = "1.0.0";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix
index 97331e683ef..f9a84866934 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "terraform-provider-hcloud";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix
index f2244345a9c..043e081d94e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildGoModule
 }:
diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 6a1f895c053..ed2409ead9a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }:
+{ lib, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }:
 
 # USAGE:
 # install the following package globally or in nix-shell:
diff --git a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix
index f445d48eaee..4f8c44aad3f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "terraform-provider-linuxbox";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
index 6ccc551b4d3..23d41ce7f1f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "terraform-provider-lxd";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
index 2bf76758752..f2e9b86a646 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
   pname = "terraform-provider-shell";
   version = "1.6.0";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix
index f4cfe6ba02f..f37d1ac5d87 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "terraform-provider-vercel";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix
index 4f56070fa51..93401dfc635 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
   pname = "terraform-provider-vpsadmin";
   version = "0.1.0";
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index 9f2a223c448..2a6a808b0c9 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "tilt";
diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix
index ec95b090c2e..250d6cfc1a0 100644
--- a/pkgs/applications/networking/cluster/velero/default.nix
+++ b/pkgs/applications/networking/cluster/velero/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "velero";
diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix
index ca675dd7836..a48bd4ae44d 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/pkgs/applications/networking/datovka/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchurl
 , libxml2
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index 23f557a1e6d..dae9ad3bc33 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
+{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
 
 with rustPlatform;
 
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 39d9aa90596..729d12c1e5b 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }:
+{ lib, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.9.9";
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index a67e0c3aed2..5eb8c9d7437 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, }:
+{ lib, fetchFromGitHub, python3Packages, }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.9.8";
diff --git a/pkgs/applications/networking/feedreaders/feeds/default.nix b/pkgs/applications/networking/feedreaders/feeds/default.nix
index 243999553e6..8b83762089d 100644
--- a/pkgs/applications/networking/feedreaders/feeds/default.nix
+++ b/pkgs/applications/networking/feedreaders/feeds/default.nix
@@ -1,6 +1,6 @@
 { lib
 , callPackage
-, stdenv
+
 , fetchFromGitLab
 
 , appstream
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index d24e0fbf717..f840c191f90 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2Packages }:
+{ lib, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   pname = "rawdog";
diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index 5f9350b70cd..bcff9e4f8b7 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python
+{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python
 , pythonPackages, qt5, sphinx, xvfb_run }:
 
 buildPythonApplication rec {
diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix
index b51512332c5..b62bda3c469 100644
--- a/pkgs/applications/networking/gdrive/default.nix
+++ b/pkgs/applications/networking/gdrive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gdrive";
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index c2ca0f580c3..62fdfd71f23 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -1,6 +1,6 @@
 { stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
 
-{ lib, stdenv, python3, fetchFromGitHub }:
+{ lib, python3, fetchFromGitHub }:
 
 let
   defaultOverrides = commonOverrides ++ [
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 9dd6754af0c..7ed3b167383 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchdarcs, pythonPackages, libvncserver, zlib
+{ lib, fetchdarcs, pythonPackages, libvncserver, zlib
 , gnutls, libvpx, makeDesktopItem, mkDerivationWith }:
 
 mkDerivationWith pythonPackages.buildPythonApplication rec {
diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix
index 5d95eddb6b6..a906c46c4ae 100644
--- a/pkgs/applications/networking/instant-messengers/cordless/default.nix
+++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "cordless";
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index 0de7e264ec4..31896f20184 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config,
+{ lib, buildGoPackage, fetchFromGitHub, pkg-config,
   cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
 
 buildGoPackage rec {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index fcd06326e21..274298226ec 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, fetchFromGitHub
 , makeWrapper, makeDesktopItem, mkYarnPackage
 , electron, element-web
 }:
diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
index 458808c832d..e4f8d3c99ee 100644
--- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkFranzDerivation, fetchurl }:
+{ lib, mkFranzDerivation, fetchurl }:
 
 mkFranzDerivation rec {
   pname = "ferdi";
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index a72ff17abcd..9f772bf3f6d 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkFranzDerivation, fetchurl }:
+{ lib, mkFranzDerivation, fetchurl }:
 
 mkFranzDerivation rec {
   pname = "franz";
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index a3df74a0016..f0846fc63f7 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -45,7 +45,7 @@
 , readline
 , speex
 , sqlite
-, stdenv
+
 , udev
 , zlib
 }:
diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
index bca999f5762..aadb18606e1 100644
--- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit
+{ lib, fetchgit
   , buildPythonApplication, buildPythonPackage
   , pygobject3, pytestrunner, requests, responses, pytest, python-olm
   , canonicaljson, olm
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index 7229218a704..c8f24e72a9a 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchgit }:
+{ lib, buildGoModule, fetchgit }:
 
 buildGoModule {
   pname = "mm";
diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix
index bcd6fdc9f3e..cd456b336dd 100644
--- a/pkgs/applications/networking/instant-messengers/neochat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation
-, lib, stdenv
+, lib
 , fetchFromGitLab
 , pkg-config
 , cmake
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index 06f02fa8094..279eea2f2d7 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2Packages, openssl }:
+{ lib, fetchFromGitHub, python2Packages, openssl }:
 
 python2Packages.buildPythonApplication rec {
   pname = "pybitmessage";
diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
index 6881ae270f9..56930f561c7 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
@@ -1,6 +1,6 @@
 { pname, version, src, meta, desktopName ? "Rambox" }:
 
-{ appimageTools, stdenv, lib, fetchurl, makeDesktopItem }:
+{ appimageTools, lib, fetchurl, makeDesktopItem }:
 
 let
   name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index 2a234edaa08..97d8d39f656 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, pkg-config, makeDesktopItem
+{ mkDerivation, lib, fetchurl, pkg-config, makeDesktopItem
 , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
 , openssl, protobuf, qmake
 }:
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index 55935f69e1c..29d4c3600c3 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages }:
+{ lib, fetchurl, python3Packages }:
 
 let version = "1.63";
 in python3Packages.buildPythonPackage {
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 66d59346c4b..30cc7396c56 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   # https://github.com/erroneousboat/slack-term
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index 1dadc728eee..58335bed421 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qttools, sconsPackages
+{ mkDerivation, lib, fetchurl, pkg-config, qttools, sconsPackages
 , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
 }:
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index 93b3315c1ef..114b3ab8f4d 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
+{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
 
 # we now have libqmatrixclient so a future version of tensor that supports it
 # should use that
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
index 4c49f41f623..256e026a060 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchpatch, python3Packages }:
+{ lib, fetchpatch, python3Packages }:
 
 with lib;
 with python3Packages;
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 004a4dab823..8b306c07506 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , cmake
 , libxml2
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
index fb1f5a0a69c..4367230f775 100644
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "xmpp-client";
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index dcb25c73657..67d45c44868 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ipfs-cluster";
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index fd9d8bd0d34..c54b4428819 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchurl, nixosTests }:
+{ lib, buildGoModule, fetchurl, nixosTests }:
 
 buildGoModule rec {
   pname = "ipfs";
diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix
index ded83f30a1a..8817d90dd6e 100644
--- a/pkgs/applications/networking/ipget/default.nix
+++ b/pkgs/applications/networking/ipget/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ipget";
diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix
index 18a4872a44f..c4a67c8098a 100644
--- a/pkgs/applications/networking/irc/qweechat/default.nix
+++ b/pkgs/applications/networking/irc/qweechat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python27Packages }:
+{ lib, fetchFromGitHub, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
   version = "2016-07-29";
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index b77d9c984de..07e4dd54e5e 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, lib, stdenv
+, lib
 , python
 , fetchFromGitHub
 , pyopenssl
diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix
index aee21dca645..3ad2762a2cf 100644
--- a/pkgs/applications/networking/lieer/default.nix
+++ b/pkgs/applications/networking/lieer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "lieer";
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index dbcae7a0ec3..b568775481c 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchFromGitHub
 , python3
 , wrapQtAppsHook
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index b01ec9ef2cd..b43e6bb093c 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchurl
+{ lib, buildGoModule, fetchurl
 , go, ncurses, notmuch, scdoc
 , python3, perl, w3m, dante
 , fetchFromGitHub
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
index dbc55850f9f..8a5f607dd32 100644
--- a/pkgs/applications/networking/mailreaders/afew/default.nix
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, notmuch }:
+{ lib, python3Packages, notmuch }:
 
 python3Packages.buildPythonApplication rec {
   pname = "afew";
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 2cb1fd56ecc..1d1dc030c31 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }:
+{ lib, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }:
 
 python2Packages.buildPythonApplication rec {
   pname = "mailpile";
diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix
index 2ced5e60db4..ec50e913176 100644
--- a/pkgs/applications/networking/mailreaders/meli/default.nix
+++ b/pkgs/applications/networking/mailreaders/meli/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchgit
 , rustPlatform
 , pkg-config
diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
index ea10bf89248..6cd0b3db786 100644
--- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
+++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, notmuch }:
+{ lib, python3, notmuch }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "mlarchive2maildir";
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 452acc1c7ca..761d0e6b244 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }:
+{ lib, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }:
 
 mkDerivation rec {
   pname = "owncloud-client";
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index 068776fe17a..4587da48a4a 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages
+{ lib, fetchurl, intltool, libtorrent-rasterbar, pythonPackages
 , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }:
 
 pythonPackages.buildPythonPackage rec {
diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix
index 7deddf8578b..4440b24a2b1 100644
--- a/pkgs/applications/networking/p2p/zeronet/default.nix
+++ b/pkgs/applications/networking/p2p/zeronet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "zeronet";
diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix
index 70723f48646..6690a75485b 100644
--- a/pkgs/applications/networking/protocol/default.nix
+++ b/pkgs/applications/networking/protocol/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub }:
+{ lib, buildPythonApplication, fetchFromGitHub }:
 
 buildPythonApplication {
   pname = "protocol-unstable";
diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix
index dcfa88d9d4c..f70359cf7ac 100644
--- a/pkgs/applications/networking/pyload/default.nix
+++ b/pkgs/applications/networking/pyload/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }:
+{ lib, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }:
 
 let
   beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix
index 7c3c23a89ee..7b97bd8543d 100644
--- a/pkgs/applications/networking/qv2ray/default.nix
+++ b/pkgs/applications/networking/qv2ray/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchFromGitHub
 , qmake
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 7441cdf4eef..4156c82f91b 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
+{ lib, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
 , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
 
 mkDerivation {
diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix
index db9e112a063..f66df96e9db 100644
--- a/pkgs/applications/networking/shellhub-agent/default.nix
+++ b/pkgs/applications/networking/shellhub-agent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 , genericUpdater
diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
index 7cfe9ddfc97..045120813f0 100644
--- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
+++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python27Packages, geoip }:
+{ lib, fetchFromGitHub, python27Packages, geoip }:
 
 with lib;
 
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix
index 2f83873fbf8..49fc578377c 100644
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonApplication, fuse
+{ lib, fetchFromGitHub, buildPythonApplication, fuse
 , appdirs, colorama, dateutil, requests, requests_toolbelt
 , fusepy, sqlalchemy }:
 
diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix
index 689a2b3fdda..bc2776657c2 100644
--- a/pkgs/applications/networking/sync/desync/default.nix
+++ b/pkgs/applications/networking/sync/desync/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "desync";
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index a7f9c5f9f4b..015033d6ca5 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
+{ lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
 , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
 , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
 , bcrypt, gobject-introspection, gsettings-desktop-schemas
diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix
index 98877880255..ff6e61c614f 100644
--- a/pkgs/applications/networking/twtxt/default.nix
+++ b/pkgs/applications/networking/twtxt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "twtxt";
diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/applications/networking/versus/default.nix
index 5e1b1e873c9..1e3dd211326 100644
--- a/pkgs/applications/networking/versus/default.nix
+++ b/pkgs/applications/networking/versus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "versus";
diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix
index c07b4c5e1aa..4e8bcaee019 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/applications/office/beamerpresenter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, installShellFiles,
+{ lib, mkDerivation, fetchFromGitHub, installShellFiles,
   qmake, qtbase, poppler, qtmultimedia }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix
index 808811e20e8..d20e19c6859 100644
--- a/pkgs/applications/office/espanso/default.nix
+++ b/pkgs/applications/office/espanso/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , rustPlatform
 , pkg-config
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index fd5f3b8d7c5..b070683e6f2 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, beancount }:
+{ lib, python3, beancount }:
 
 let
   inherit (python3.pkgs) buildPythonApplication fetchPypi;
diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix
index 52558df5da8..4c892b2605b 100644
--- a/pkgs/applications/office/gtg/default.nix
+++ b/pkgs/applications/office/gtg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , meson
 , python3Packages
diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix
index 30b4d5fa690..14f48da2230 100644
--- a/pkgs/applications/office/keepnote/default.nix
+++ b/pkgs/applications/office/keepnote/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2Packages }:
+{ lib, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication {
   name = "keepnote-0.7.8";
diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix
index 81e49e6e0aa..90e5995669e 100644
--- a/pkgs/applications/office/ledger-autosync/default.nix
+++ b/pkgs/applications/office/ledger-autosync/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }:
+{ lib, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }:
 
 python3Packages.buildPythonApplication rec {
   pname = "ledger-autosync";
diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix
index 8586fa1f673..0141b74c389 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/override.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, kdeIntegration, ... }:
+{ lib, kdeIntegration, ... }:
 attrs:
 {
   postConfigure = attrs.postConfigure + ''
diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix
index 119b5a645d6..50812d0efb9 100644
--- a/pkgs/applications/office/libreoffice/src-still/override.nix
+++ b/pkgs/applications/office/libreoffice/src-still/override.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, kdeIntegration, fetchpatch, ... }:
+{ lib, kdeIntegration, fetchpatch, ... }:
 attrs:
 {
   patches = attrs.patches or [ ] ++ [
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index f48ec3fb237..384d7fadaf0 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }:
+{ lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }:
 
 let
   version = "1.44.55";
diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix
index 6ffdd5fefed..4459e42356a 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/applications/office/qnotero/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
+{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
 
 python3Packages.buildPythonPackage rec {
   pname = "qnotero";
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index 7f4054bfb4e..acf44880452 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -22,7 +22,7 @@
 , qtbase
 , qtimageformats
 , qttools
-, lib, stdenv
+, lib
 }:
 
 let
diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix
index 7436054715d..89cf2add212 100644
--- a/pkgs/applications/office/skanlite/default.nix
+++ b/pkgs/applications/office/skanlite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase,
+{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase,
   kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets,
   libksane
 }:
diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix
index 63f86171dce..6c1068d4584 100644
--- a/pkgs/applications/office/timeular/default.nix
+++ b/pkgs/applications/office/timeular/default.nix
@@ -1,5 +1,5 @@
 {
-  lib, stdenv,
+  lib,
   fetchurl,
   appimageTools,
   libsecret
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index dc788a6f195..4011879ddb8 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python3
 , glibcLocales
 , installShellFiles
diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
index 6b49a27a08a..65eb48f3b2d 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/pkgs/applications/office/tryton/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python3Packages
 , pkg-config
 , librsvg
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index 30992e60a6f..18c1b9469e7 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages, installShellFiles }:
+{ lib, fetchFromGitHub, pythonPackages, installShellFiles }:
 
 with pythonPackages;
 
diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix
index 6b84e47909d..e9b446dc584 100644
--- a/pkgs/applications/radio/chirp/default.nix
+++ b/pkgs/applications/radio/chirp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , python2
 }:
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 8a612309909..217818f67c2 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr
+{ lib, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr
 , mkDerivation
 # drivers (optional):
 , rtl-sdr, hackrf
diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix
index d92cf9e25cd..e6fa95b5dc7 100644
--- a/pkgs/applications/radio/qsstv/default.nix
+++ b/pkgs/applications/radio/qsstv/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw,
+{ mkDerivation, lib, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw,
   libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix
index c0dab8773c7..19a4e715013 100644
--- a/pkgs/applications/radio/quisk/default.nix
+++ b/pkgs/applications/radio/quisk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python38Packages, fetchPypi
+{ lib, python38Packages, fetchPypi
 , fftw, alsaLib, pulseaudio, wxPython_4_0 }:
 
 python38Packages.buildPythonApplication rec {
diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index 3a51f77d7bd..00d3431b6e3 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, python3Packages
+{ lib, fetchFromGitHub, python3Packages
 , hackrf, rtl-sdr, airspy, limesuite, libiio
 , qt5
 , USRPSupport ? false, uhd }:
diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix
index c6defb245c7..7eb3afd437a 100644
--- a/pkgs/applications/science/biology/eggnog-mapper/default.nix
+++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }:
+{ lib, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }:
 
 python27Packages.buildPythonApplication rec {
   pname = "eggnog-mapper";
diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix
index 55a9612c62d..082a779e12b 100644
--- a/pkgs/applications/science/biology/obitools/obitools3.nix
+++ b/pkgs/applications/science/biology/obitools/obitools3.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages, cmake, python3 }:
+{ lib, fetchurl, python3Packages, cmake, python3 }:
 
 let
   pythonPackages = python3Packages;
diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
index 454843e2f32..b2cefefb5cb 100755
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ b/pkgs/applications/science/biology/poretools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages, fetchFromGitHub }:
+{ lib, pythonPackages, fetchFromGitHub }:
 
 pythonPackages.buildPythonPackage rec {
   pname = "poretools";
diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix
index b70ac29e38f..cb606a6b346 100644
--- a/pkgs/applications/science/biology/tebreak/default.nix
+++ b/pkgs/applications/science/biology/tebreak/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa
+{ lib, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa
 , samtools, findutils, python }:
 
 python3Packages.buildPythonApplication rec {
diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix
index cbe73bb7edc..f5e21db4b55 100644
--- a/pkgs/applications/science/chemistry/d-seams/default.nix
+++ b/pkgs/applications/science/chemistry/d-seams/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, stdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake
+{ clangStdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake
 , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }:
 
 clangStdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 47498690122..2df8b0e6d47 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, makeDesktopItem
+{ lib, fetchurl, fetchFromGitHub, makeDesktopItem
 , python3, python3Packages
 , glew, glm, freeglut, libpng, libxml2, tk, freetype, msgpack }:
 
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 14c654bd697..6a9a491af1e 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
 
 mkDerivation rec {
   pname = "caneda";
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index b25f76800e8..79c01d3ec71 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkg-config
+{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config
 , qtbase, qtsvg, qttools, qtserialport, boost, libgit2
 }:
 
diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix
index 5118795978d..38039f61fda 100644
--- a/pkgs/applications/science/logic/petrinizer/default.nix
+++ b/pkgs/applications/science/logic/petrinizer/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, callPackage, buildPackages
 , async, base, bytestring, containers, fetchFromGitLab, mtl
-, parallel-io, parsec, lib, stdenv, stm, transformers
+, parallel-io, parsec, lib, stm, transformers
 }:
 let
   z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; };
diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
index 96e216417df..f0c8dd24904 100644
--- a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
+++ b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
@@ -1,7 +1,7 @@
 { mkDerivation, array, async, base, bytestring, containers
 , crackNum, deepseq, directory, doctest, filepath, generic-deriving
 , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random
-, lib, stdenv, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
 , template-haskell, time, z3
 }:
 mkDerivation {
diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix
index 3574954c376..a20ccea16dc 100644
--- a/pkgs/applications/science/logic/petrinizer/z3.nix
+++ b/pkgs/applications/science/logic/petrinizer/z3.nix
@@ -1,5 +1,5 @@
 { mkDerivation, fetchpatch
-, base, containers, gomp, hspec, QuickCheck, lib, stdenv
+, base, containers, gomp, hspec, QuickCheck, lib
 , transformers, z3
 }:
 mkDerivation {
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix
index 4bfd4b9421f..50d0aa6f9d1 100644
--- a/pkgs/applications/science/machine-learning/labelimg/default.nix
+++ b/pkgs/applications/science/machine-learning/labelimg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub, qt5 }:
+{ lib, python3Packages, fetchFromGitHub, qt5 }:
   python3Packages.buildPythonApplication rec {
     pname = "labelImg";
     version = "1.8.3";
diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix
index 7271b6d8755..ec3891667c5 100644
--- a/pkgs/applications/science/math/almonds/default.nix
+++ b/pkgs/applications/science/math/almonds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchFromGitHub, ncurses }:
+{ lib, python3, fetchFromGitHub, ncurses }:
 
 with python3.pkgs; buildPythonApplication rec {
   pname = "almonds";
diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix
index cc8c3514a0b..9d56ac70d92 100644
--- a/pkgs/applications/science/math/cemu/default.nix
+++ b/pkgs/applications/science/math/cemu/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub
-, lib, stdenv
+, lib
 , mkDerivation
 , SDL2
 , libGL
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index 5670969e7a2..4f0d1eae487 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }:
+{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }:
 
 rustPlatform.buildRustPackage rec {
   version = "0.5.1";
diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index 6b3c405a9ac..edf26f7ec23 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix
index 77a052a4f1d..62cb6707c1b 100644
--- a/pkgs/applications/terminal-emulators/guake/default.nix
+++ b/pkgs/applications/terminal-emulators/guake/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , python3
 , glibcLocales
diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix
index 80698c56cde..433e5c30618 100644
--- a/pkgs/applications/terminal-emulators/terminator/default.nix
+++ b/pkgs/applications/terminal-emulators/terminator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , python3
 , keybinder3
diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
index 393edc57dcc..47d31d6c18f 100644
--- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }:
+{ buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }:
 
 buildPythonApplication rec {
   pname = "bump2version";
diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
index b038e98e2db..4bfe06fee74 100644
--- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ghorg";
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index c6fbf3b9569..f56ce386e42 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ghq";
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
index 1908b753924..4d57820c84e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }:
+{ lib, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }:
 
 buildPythonApplication rec {
   pname = "git-annex-metadata-gui";
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 95e583585f1..6d3b6554733 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 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "git-annex-remote-b2";
diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
index ba4cd42d29d..33580712932 100644
--- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "git-appraise-unstable";
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index ec832866c71..5f84d423573 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, python3Packages, lib, stdenv, git, graphviz }:
+{ fetchFromGitHub, python3Packages, lib, git, graphviz }:
 
 python3Packages.buildPythonApplication rec {
   pname = "git-big-picture";
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index 9ca5c707b5c..7a24fe8e035 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "git-bug";
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 e7e0e009d11..5e105ad9dd3 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 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
+{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
 
 let
   inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify;
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 216a1035c72..4dc9c4f8453 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 @@
-{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
+{ lib, bundlerEnv, ruby, bundlerUpdateScript }:
 
 bundlerEnv {
   inherit ruby;
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index dd4e6e011a6..69689a49a92 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, python3Packages
+{ lib, fetchFromGitHub, python3Packages
 , asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2
 }:
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix
index 77e07743616..85a84103118 100644
--- a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "git-vanity-hash";
diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix
index dc853be6772..25f7e95d184 100644
--- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gitbatch-unstable";
diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix
index e2aaafea202..3d429b7c561 100644
--- a/pkgs/applications/version-management/git-and-tools/gitin/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoPackage
 , fetchFromGitHub
 , pkg-config
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
index 6f5ce3358a3..1fa2ebc6f74 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildEnv, git, fetchFromGitHub
+{ lib, buildEnv, git, fetchFromGitHub
 , gitwebTheme ? false }:
 
 let
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 04103465189..e43c602d6d9 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline
+{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline
 , cmake }:
 let
   version = "0.3.2";
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 4b189c55c8a..e0d7e46d22a 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 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }:
 
 buildGoPackage rec {
   pname = "hub";
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index ce749308843..18f2e5ad487 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 # Currently `buildGo114Module` is passed as `buildGoModule` from
 # `../default.nix`. Please remove the fixed 1.14 once a new release has been
diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
index 5feb71c7931..1821dba0f00 100644
--- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }:
+{ lib, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }:
 
 buildPythonApplication rec {
   pname   = "pass-git-helper";
diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix
index 69062d305b7..1e65834f519 100644
--- a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "scmpuff";
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 3a37c798a08..4ee92c1d5e6 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub, git, installShellFiles }:
+{ lib, python3Packages, fetchFromGitHub, git, installShellFiles }:
 
 python3Packages.buildPythonApplication rec {
   pname = "stgit";
diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix
index 3b906e4dc2e..5dc75ce4d70 100644
--- a/pkgs/applications/version-management/git-crecord/default.nix
+++ b/pkgs/applications/version-management/git-crecord/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "git-crecord";
diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
index 3c758908cd4..f72f5190750 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "git-lfs";
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index 57a40de9d4a..06a2bb48989 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages, git }:
+{ lib, fetchurl, pythonPackages, git }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "git-up";
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 68b3a3e9099..f2d258ea1af 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchurl, makeWrapper
+{ lib, buildGoPackage, fetchurl, makeWrapper
 , git, bash, gzip, openssh, pam
 , sqliteSupport ? true
 , pamSupport ? true
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index 68dd3c190be..384f5d0f01f 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, python2Packages}:
+{ lib, fetchzip, python2Packages}:
 
 python2Packages.buildPythonApplication rec {
   pname = "gitinspector";
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index acfd91be331..d61c97f9bb1 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby
+{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby
 , bundlerEnv, pkg-config
 # libgit2 + dependencies
 , libgit2, openssl, zlib, pcre, http-parser }:
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index d1b5958c751..a1a9df57f04 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, buildGoModule, ruby }:
+{ lib, fetchFromGitLab, buildGoModule, ruby }:
 
 buildGoModule rec {
   pname = "gitlab-shell";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index b38485716d7..883753616c9 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, git, buildGoModule }:
+{ lib, fetchFromGitLab, git, buildGoModule }:
 
 buildGoModule rec {
   pname = "gitlab-workhorse";
diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix
index e53da902e13..310158e3eea 100644
--- a/pkgs/applications/version-management/gitless/default.nix
+++ b/pkgs/applications/version-management/gitless/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, python, lib, stdenv }:
+{ fetchFromGitHub, python, lib }:
 
 with python.pkgs;
 buildPythonApplication rec {
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index fed2fd9ea33..c0b0021f8cb 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper
 , git, bash, gzip, openssh, pam
 , sqliteSupport ? true
 , pamSupport ? true
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 4f94e2926c4..268098b2d2d 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , gettext
 , itstool
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
index ba1f3bbb93b..56d3531f721 100644
--- a/pkgs/applications/version-management/nitpick/default.nix
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub
 , buildPythonPackage
-, lib, stdenv
+, lib
 , isPy27
 }:
 
diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix
index d7ad9060879..b7b6d62e4b4 100644
--- a/pkgs/applications/version-management/peru/default.nix
+++ b/pkgs/applications/version-management/peru/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "peru";
diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix
index 200d1d5384f..3e89fe0a4dc 100644
--- a/pkgs/applications/version-management/sourcehut/builds.nix
+++ b/pkgs/applications/version-management/sourcehut/builds.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , buildGoModule
 , srht, redis, celery, pyyaml, markdown }:
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index bcc47920ebe..69f8a7d4e45 100644
--- a/pkgs/applications/version-management/sourcehut/core.nix
+++ b/pkgs/applications/version-management/sourcehut/core.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, fetchNodeModules, buildPythonPackage
+{ lib, fetchgit, fetchNodeModules, buildPythonPackage
 , pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments
 , requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client
 , celery, alembic, importlib-metadata, mistletoe
diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix
index c7c11cafc8b..ea3f58e3890 100644
--- a/pkgs/applications/version-management/sourcehut/dispatch.nix
+++ b/pkgs/applications/version-management/sourcehut/dispatch.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , srht, pyyaml, PyGithub }:
 
diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix
index 3ef49b79664..8966cbe0800 100644
--- a/pkgs/applications/version-management/sourcehut/git.nix
+++ b/pkgs/applications/version-management/sourcehut/git.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , buildGoModule
 , srht, minio, pygit2, scmsrht }:
diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix
index d0e14090846..fae311831f2 100644
--- a/pkgs/applications/version-management/sourcehut/hg.nix
+++ b/pkgs/applications/version-management/sourcehut/hg.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchhg, buildPythonPackage
+{ lib, fetchhg, buildPythonPackage
 , python
 , srht, hglib, scmsrht, unidiff }:
 
diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix
index 8ea4961e7d4..99b5663a9b8 100644
--- a/pkgs/applications/version-management/sourcehut/hub.nix
+++ b/pkgs/applications/version-management/sourcehut/hub.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , srht }:
 
diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix
index a0b52a2d564..25d22dede35 100644
--- a/pkgs/applications/version-management/sourcehut/lists.nix
+++ b/pkgs/applications/version-management/sourcehut/lists.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , srht, asyncpg, aiosmtpd, pygit2, emailthreads }:
 
diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix
index 26939d2bebe..24a31a3ef17 100644
--- a/pkgs/applications/version-management/sourcehut/man.nix
+++ b/pkgs/applications/version-management/sourcehut/man.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , srht, pygit2 }:
 
diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix
index b6622d97487..d07bd29357a 100644
--- a/pkgs/applications/version-management/sourcehut/meta.nix
+++ b/pkgs/applications/version-management/sourcehut/meta.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , buildGoModule
 , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache
diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix
index eaec8b710dd..12747f98103 100644
--- a/pkgs/applications/version-management/sourcehut/paste.nix
+++ b/pkgs/applications/version-management/sourcehut/paste.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , srht, pyyaml }:
 
diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix
index 6e8b03835bc..615716d03af 100644
--- a/pkgs/applications/version-management/sourcehut/scm.nix
+++ b/pkgs/applications/version-management/sourcehut/scm.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , srht, redis, pyyaml, buildsrht
 , writeText }:
 
diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix
index 357dcd4d2e2..85ae3b2cf14 100644
--- a/pkgs/applications/version-management/sourcehut/todo.nix
+++ b/pkgs/applications/version-management/sourcehut/todo.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, buildPythonPackage
+{ lib, fetchgit, buildPythonPackage
 , python
 , srht, redis, alembic, pystache
 , pytest, factory_boy, writeText }:
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index c1701dd5174..6db2450d136 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeDesktopItem, ffmpeg_3
+{ lib, fetchurl, makeDesktopItem, ffmpeg_3
 , qmake, qttools, mkDerivation
 , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine
 }:
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 4b1b7ae0b60..6a4d0dc1b8d 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor
+{ lib, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor
 , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
 
 let
diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix
index a4ebbf159b8..15f5b60a09a 100644
--- a/pkgs/applications/video/electronplayer/electronplayer.nix
+++ b/pkgs/applications/video/electronplayer/electronplayer.nix
@@ -1,4 +1,4 @@
-{ appimageTools, lib, stdenv, fetchurl }:
+{ appimageTools, lib, fetchurl }:
 let
   pname = "electronplayer";
   version = "2.0.8";
diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
index fe06e9431f9..6dc42a47685 100644
--- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, callPackage
+{ lib, buildPythonApplication, fetchFromGitHub, callPackage
 , mpv, python-mpv-jsonipc, jellyfin-apiclient-python
 , pillow, tkinter, pystray, jinja2, pywebview }:
 
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index e6e971ad438..35b7d173257 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection
+{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection
 , gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio
 , fetchpatch }:
 
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index 6bec8f9c891..80a36df3de7 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }:
+{ lib, makeWrapper, buildEnv, kodi, plugins }:
 
 let
   drvName = builtins.parseDrvName kodi.name;
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 29676abb755..cec6468c43b 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchurl
 , autoPatchelfHook
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index a58c32dc563..236aec2ee56 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
+{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
 , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype
 , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
 , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 1b2af7614ab..e388d5a67fe 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , fetchurl
 , pkg-config
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index e690c507024..e7a735f167c 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation
+{ lib, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation
 , libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras
 , libvdpau, SDL2, mpv, libGL }:
 let
diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix
index 7738dd99d21..d0904790a9e 100644
--- a/pkgs/applications/video/plex-mpv-shim/default.nix
+++ b/pkgs/applications/video/plex-mpv-shim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }:
+{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }:
 
 buildPythonApplication rec {
   pname = "plex-mpv-shim";
diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix
index bf54c0a2d6c..df42bbec156 100644
--- a/pkgs/applications/video/pyca/default.nix
+++ b/pkgs/applications/video/pyca/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }:
+{ lib, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }:
 
 buildPythonApplication rec {
   pname = "pyca";
diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix
index b05fa113a30..d0f41413570 100644
--- a/pkgs/applications/video/qmediathekview/default.nix
+++ b/pkgs/applications/video/qmediathekview/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }:
 
 mkDerivation rec {
   pname = "QMediathekView";
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index ade4b61931b..d580d98a6c1 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , fetchpatch
 , mkDerivation
diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix
index 3bd48019d0d..12525da35c4 100644
--- a/pkgs/applications/video/tartube/default.nix
+++ b/pkgs/applications/video/tartube/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchFromGitHub
 , gdk-pixbuf
 , gobject-introspection
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 06e91218cac..598a162f399 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, mkDerivation
+{ lib, fetchFromGitHub, mkDerivation
 , pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
 , ffmpeg
 }:
diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix
index d31523e946a..2d865f41818 100644
--- a/pkgs/applications/virtualization/aqemu/default.nix
+++ b/pkgs/applications/virtualization/aqemu/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib, stdenv
+{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib
 }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index f7b7c99b554..2283b45aee4 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cntr";
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 388cf328ff5..99505371507 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , btrfs-progs
 , buildGoModule
 , fetchFromGitHub
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index 3dabcf57daf..e4e7a204934 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder
+{ lib, buildPythonApplication, fetchPypi, pythonOlder
 , installShellFiles
 , mock, pytest, nose
 , pyyaml, backports_ssl_match_hostname, colorama, docopt
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 6c1ef95cd6f..59c59426830 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoPackage
 , fetchFromGitHub
 , makeWrapper
diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 9eb03508572..84019395853 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "docker-buildx";
diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix
index f41862c0dd1..96722fe393f 100644
--- a/pkgs/applications/virtualization/docker/distribution.nix
+++ b/pkgs/applications/virtualization/docker/distribution.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "distribution";
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index 7fd7cda81e2..59fc80eefbf 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "docker-proxy-${rev}";
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index 41a09315333..390f3049c02 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   pname   = "amazon-ecs-agent";
diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix
index 0b5fc5dac52..ac531b36dd2 100644
--- a/pkgs/applications/virtualization/firectl/default.nix
+++ b/pkgs/applications/virtualization/firectl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "firectl";
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
index 2d423911c99..fd001d598ad 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildBazelPackage
 , fetchFromGitHub
 , cacert
diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix
index 00dffc385a1..3a5f26bfcc8 100644
--- a/pkgs/applications/virtualization/qtemu/default.nix
+++ b/pkgs/applications/virtualization/qtemu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }:
+{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }:
 
 mkDerivation rec {
   pname = "qtemu";
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 6961dcf7b89..24b71b46165 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,5 +1,4 @@
-{stdenv
-, lib
+{ lib
 , fetchurl
 , util-linux
 , gpgme
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 8fe9caf0e57..11ddaff8d3b 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages, intltool, file
+{ lib, fetchurl, python3Packages, intltool, file
 , wrapGAppsHook, gtk-vnc, vte, avahi, dconf
 , gobject-introspection, libvirt-glib, system-libvirt
 , gsettings-desktop-schemas, glib, libosinfo, gnome3
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index 2f9882dee9b..bc9003e128a 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, fetchurl, fetchpatch, fetchgit
+{ lib, callPackage, fetchurl, fetchpatch, fetchgit
 , ocaml-ng
 , withInternalQemu ? true
 , withInternalTraditionalQemu ? true
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index 55e3b12c3b7..5ff263dc8ff 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -1,5 +1,5 @@
 { callPackage
-, stdenv
+
 }:
 
 # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim
diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
index f0bb26f43e2..5f107337ee4 100644
--- a/pkgs/applications/window-managers/btops/default.nix
+++ b/pkgs/applications/window-managers/btops/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "btops";
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 1724a2c9824..d419b0ebe3a 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
+{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
 , enableAlsaUtils ? true, alsaUtils, coreutils
 , enableNetwork ? true, dnsutils, iproute, wirelesstools }:
 
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index 52322d8e194..1a11d40e3df 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, i3, autoreconfHook }:
+{ fetchurl, lib, i3, autoreconfHook }:
 
 i3.overrideAttrs (oldAttrs : rec {
 
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index 404e7b41f55..bddaab61578 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , libpulseaudio
 , libnotify
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index b9dbe6136b4..be7e88a2501 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix
index e7fd87aaf3b..d0055ef6365 100644
--- a/pkgs/applications/window-managers/i3/wk-switch.nix
+++ b/pkgs/applications/window-managers/i3/wk-switch.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "i3-wk-switch";
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index db6ec29d9e9..9169cfc3817 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform
+{ lib, fetchFromGitHub, rustPlatform
 , xorg, python3, pkg-config, cairo, libxkbcommon }:
 
 rustPlatform.buildRustPackage rec {
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index 712e9ab22c7..cdef71c965e 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }:
+{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }:
 
 let
     rpath = lib.makeLibraryPath [ libXinerama libX11 ];
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 709a5b14736..21059c25afb 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }:
+{ lib, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }:
 
 let cairocffi-xcffib = python37Packages.cairocffi.override {
     withXcffib = true;
diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix
index 0a80ce70e03..319023eb2e5 100644
--- a/pkgs/applications/window-managers/sway/wrapper.nix
+++ b/pkgs/applications/window-managers/sway/wrapper.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , sway-unwrapped
 , makeWrapper, symlinkJoin, writeShellScriptBin
 , withBaseWrapper ? true, extraSessionCommands ? "", dbus
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 170c25dffe2..1613e9dea24 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , bash
 , binutils-unwrapped
 , coreutils
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index b40569a479b..9a9e5a9ce10 100644
--- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }:
+{ lib, callPackage, runCommandLocal, writeShellScriptBin, coreutils, bubblewrap }:
 
 args @ {
   name
diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix
index 396c971b2f0..9a36b44a270 100644
--- a/pkgs/build-support/emacs/trivial.nix
+++ b/pkgs/build-support/emacs/trivial.nix
@@ -1,6 +1,6 @@
 # trivial builder for Emacs packages
 
-{ lib, stdenv, texinfo, ... }@envargs:
+{ lib, texinfo, ... }@envargs:
 
 with lib;
 
diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix
index 9fd813bfa57..e8b2403d8f3 100644
--- a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix
+++ b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix
@@ -1,4 +1,4 @@
-pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }:
+pkgargs@{ lib, haskellPackages, writeText, gawk }:
 let
   generic-fetcher =
     import ./generic-fetcher.nix pkgargs;
diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix
index 869ba637429..0fbbc078efc 100644
--- a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix
+++ b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix
@@ -1,4 +1,4 @@
-pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }:
+pkgargs@{ lib, haskellPackages, writeText, gawk }:
 let
   generic-fetcher =
     import ./generic-fetcher.nix pkgargs;
diff --git a/pkgs/build-support/plugins.nix b/pkgs/build-support/plugins.nix
index 1ed74851597..31b478c6c0d 100644
--- a/pkgs/build-support/plugins.nix
+++ b/pkgs/build-support/plugins.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv }:
+{ lib }:
 # helper functions for packaging programs with plugin systems
 {
 
diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix
index 94cd33b9a26..d315c1027ab 100644
--- a/pkgs/common-updater/unstable-updater.nix
+++ b/pkgs/common-updater/unstable-updater.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, writeShellScript
+{ writeShellScript
 , coreutils
 , git
 , nix
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index a6c0b1f4918..8c806b87d4b 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config
+{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config
 , qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation
 , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms  }:
 
diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix
index e7d97b77707..c410826b2fb 100644
--- a/pkgs/data/fonts/et-book/default.nix
+++ b/pkgs/data/fonts/et-book/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, fetchFromGitHub }:
 
 fetchFromGitHub rec {
   rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031";
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 546c7d905a7..d5c5d0e000a 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 let
   version = "5.2";
diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix
index 2e4cfc8f05b..e226c351a33 100644
--- a/pkgs/data/fonts/fira-code/symbols.nix
+++ b/pkgs/data/fonts/fira-code/symbols.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 fetchzip {
   name = "fira-code-symbols-20160811";
diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
index 37f285b5552..2aef2fc4b05 100644
--- a/pkgs/data/fonts/fira-mono/default.nix
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 fetchzip {
   name = "fira-mono-3.206";
diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix
index e55ae0bcf11..8bdbc2d4c4f 100644
--- a/pkgs/data/fonts/fixedsys-excelsior/default.nix
+++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl } :
+{ lib, fetchurl } :
 
 let
   major = "3";
diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix
index 056cd621394..ed17dfc9054 100644
--- a/pkgs/data/fonts/go-font/default.nix
+++ b/pkgs/data/fonts/go-font/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit }:
+{ lib, fetchgit }:
 
 let
   version = "2017-03-30";
diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix
index a8df441d999..457cb0d03c9 100644
--- a/pkgs/data/fonts/jost/default.nix
+++ b/pkgs/data/fonts/jost/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchzip}:
+{lib, fetchzip}:
 
 let
   version = "3.5";
diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix
index eecab47c087..6b1cd370241 100644
--- a/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/pkgs/data/fonts/paratype-pt/mono.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 fetchzip {
   name = "paratype-pt-mono";
diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix
index 826b8887365..d6b783ebe4c 100644
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/pkgs/data/fonts/paratype-pt/sans.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 fetchzip {
   name = "paratype-pt-sans";
diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix
index bbff974e107..2b5eeafd09b 100644
--- a/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/pkgs/data/fonts/paratype-pt/serif.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 fetchzip {
   name = "paratype-pt-serif";
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index bcf6cefb8d6..95e4ce2a52a 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 let
   pname = "ttf-bitstream-vera";
   version = "1.10";
diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix
index 69579289442..bf52d07c52e 100644
--- a/pkgs/data/fonts/ttf-tw-moe/default.nix
+++ b/pkgs/data/fonts/ttf-tw-moe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 let
   version = "2020-11-14";
 in
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index b71ef7c99ec..20b5b673ccf 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, cabextract }:
+{ lib, fetchzip, cabextract }:
 
 fetchzip {
   name = "vista-fonts-1";
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index 1936bd6627a..421054fa17f 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 let
   version = "20200729";
diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix
index dc942868250..77b67e48f92 100644
--- a/pkgs/data/misc/mime-types/default.nix
+++ b/pkgs/data/misc/mime-types/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 let
   version = "9";
diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix
index 60ff492330d..b91afb08f60 100644
--- a/pkgs/data/misc/unicode-emoji/default.nix
+++ b/pkgs/data/misc/unicode-emoji/default.nix
@@ -1,7 +1,6 @@
-{ stdenv
+{ lib
 , fetchurl
 , symlinkJoin
-, lib
 }:
 
 let
diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
index 26d9be6d904..832a534e5da 100644
--- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , runCommand
 , nixos-artwork
 , glib
diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix
index 2338c834d1f..efcd20457b3 100644
--- a/pkgs/desktops/cinnamon/warpinator/default.nix
+++ b/pkgs/desktops/cinnamon/warpinator/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub
-, lib, stdenv
+, lib
 , gobject-introspection
 , meson
 , ninja
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 550f3f31d0b..2f8163adc72 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , pkg-config
 , gnome3
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index fc0ee5d38ff..be456071e41 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , meson
 , ninja
 , gettext
diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
index 26d7593038b..2b84442620d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , gettext
 , meson
diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix
index 05d80997b76..d0f09bbfae2 100644
--- a/pkgs/desktops/lumina/lumina-calculator/default.nix
+++ b/pkgs/desktops/lumina/lumina-calculator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }:
+{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }:
 
 mkDerivation rec {
   pname = "lumina-calculator";
diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix
index 8d975c749d6..679dfa65b5a 100644
--- a/pkgs/desktops/lumina/lumina-pdf/default.nix
+++ b/pkgs/desktops/lumina/lumina-pdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }:
+{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }:
 
 mkDerivation rec {
   pname = "lumina-pdf";
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index 4daaf15534c..d31f16e235a 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchFromGitHub
 , fluxbox
diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix
index 316a72a09c7..ce97bc416e6 100644
--- a/pkgs/desktops/mate/mate-tweak/default.nix
+++ b/pkgs/desktops/mate/mate-tweak/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , python3Packages
 , intltool
diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
index cee4261a77d..4d893cd2e74 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
+{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "mozo";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index 40ac23ca7f1..bfe95e0be46 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , runCommand
 , mutter
 , elementary-default-settings
diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix
index 85f823221b7..e47f1dea3f6 100644
--- a/pkgs/desktops/xfce/applications/catfish/default.nix
+++ b/pkgs/desktops/xfce/applications/catfish/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, file, which, intltool, gobject-introspection,
+{ lib, fetchurl, file, which, intltool, gobject-introspection,
   findutils, xdg_utils, dconf, gtk3, python3Packages,
   wrapGAppsHook
 }:
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
index aa14c878b12..304b9d9076d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
@@ -1,5 +1,5 @@
 { mkXfceDerivation
-, lib, stdenv
+, lib
 , intltool
 , libxfce4ui
 , xfce4-panel
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index 985b067a02f..c46b5a0fd1b 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkXfceDerivation
 , gtk3
 , thunar
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index c536ed8c2c0..822cfb0e361 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, python2Packages, picocom
+{ lib, fetchurl, python2Packages, picocom
 , avrdude, arduino-core }:
 
 python2Packages.buildPythonApplication rec {
diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix
index e0d9dfc4288..1ebe3760ec8 100644
--- a/pkgs/development/beam-modules/build-hex.nix
+++ b/pkgs/development/beam-modules/build-hex.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildRebar3, fetchHex }:
+{ lib, buildRebar3, fetchHex }:
 
 { name, version, sha256
 , builder ? buildRebar3
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 4f312129b38..570155e4d1a 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgs, erlang }:
+{ lib, pkgs, erlang }:
 
 let
   inherit (lib) makeExtensible;
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index 7ae2e0e2606..1b021cf9347 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, stdenv }:
+{ pkgs, lib }:
 
 rec {
 
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix
index 0299c179775..b0a14534b08 100644
--- a/pkgs/development/compilers/carp/default.nix
+++ b/pkgs/development/compilers/carp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
+{ lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
 
 haskellPackages.mkDerivation rec {
 
diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix
index 2775666f14c..d2f2805ed7f 100644
--- a/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/4/egg2nix.nix
@@ -1,4 +1,4 @@
-{ stdenv, eggDerivation, fetchurl, chickenEggs }:
+{ eggDerivation, fetchurl, chickenEggs }:
 
 # Note: This mostly reimplements the default.nix already contained in
 # the tarball. Is there a nicer way than duplicating code?
diff --git a/pkgs/development/compilers/chicken/4/eggs.nix b/pkgs/development/compilers/chicken/4/eggs.nix
index 6e6f104f8a0..8c96caca262 100644
--- a/pkgs/development/compilers/chicken/4/eggs.nix
+++ b/pkgs/development/compilers/chicken/4/eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs }:
 rec {
   inherit (pkgs) eggDerivation fetchegg;
 
diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix
index 69e8d9e62c3..62b634eb637 100644
--- a/pkgs/development/compilers/chicken/5/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/5/egg2nix.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, eggDerivation, fetchFromGitHub, chickenEggs }:
+{ lib, eggDerivation, fetchFromGitHub, chickenEggs }:
 
 # Note: This mostly reimplements the default.nix already contained in
 # the tarball. Is there a nicer way than duplicating code?
diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix
index 3c4ae74c1e6..1c1377350d2 100644
--- a/pkgs/development/compilers/chicken/5/eggs.nix
+++ b/pkgs/development/compilers/chicken/5/eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs }:
 rec {
   inherit (pkgs) eggDerivation fetchegg;
 
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 71386e00ef1..b2f655d4f1c 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -1,7 +1,7 @@
 { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary
 , bytestring, cmark, containers, directory, filepath, free, HUnit
 , indents, json, mtl, optparse-applicative, parsec, process
-, QuickCheck, quickcheck-io, split, lib, stdenv, tasty, tasty-golden
+, QuickCheck, quickcheck-io, split, lib, tasty, tasty-golden
 , tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix
index cd13eb4de4f..cf0ba2303e1 100644
--- a/pkgs/development/compilers/elm/packages/elm-instrument.nix
+++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix
@@ -2,7 +2,7 @@
 , bytestring, Cabal, cmark, containers, directory, elm-format
 , fetchgit, filepath, free, HUnit, indents, json, mtl
 , optparse-applicative, parsec, process, QuickCheck, quickcheck-io
-, split, lib, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+, split, lib, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
 , text
 }:
 mkDerivation {
diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix
index edb2ed6ed7a..c012d59d8ae 100644
--- a/pkgs/development/compilers/elm/packages/elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm.nix
@@ -3,7 +3,7 @@
 , file-embed, filelock, filepath, ghc-prim, haskeline, HTTP
 , http-client, http-client-tls, http-types, language-glsl, mtl
 , network, parsec, process, raw-strings-qq, scientific, SHA
-, snap-core, snap-server, lib, stdenv, template-haskell, time
+, snap-core, snap-server, lib, template-haskell, time
 , unordered-containers, utf8-string, vector, zip-archive
 }:
 mkDerivation {
diff --git a/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/pkgs/development/compilers/elm/packages/elmi-to-json.nix
index 6788fce6a99..3362ce5cc7a 100644
--- a/pkgs/development/compilers/elm/packages/elmi-to-json.nix
+++ b/pkgs/development/compilers/elm/packages/elmi-to-json.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, binary, bytestring, containers
 , directory, fetchgit, filepath, ghc-prim, hpack
-, optparse-applicative, lib, stdenv, text, unliftio
+, optparse-applicative, lib, text, unliftio
 , unordered-containers
 }:
 mkDerivation {
diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/pkgs/development/compilers/elm/packages/indents.nix
index 80f3c08d9e3..d196e8d0fbf 100644
--- a/pkgs/development/compilers/elm/packages/indents.nix
+++ b/pkgs/development/compilers/elm/packages/indents.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, concatenative, mtl, parsec, lib, stdenv }:
+{ mkDerivation, base, concatenative, mtl, parsec, lib }:
 mkDerivation {
   pname = "indents";
   version = "0.3.3";
diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
index 82c37bd8617..54a60b50372 100644
--- a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
+++ b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
@@ -1,7 +1,7 @@
 { mkDerivation, aeson, array, attoparsec, base, binary, bytestring
 , containers, deepseq, directory, dlist, fetchgit, ghc-prim
 , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck
-, quickcheck-unicode, random, scientific, stdenv, test-framework
+, quickcheck-unicode, random, scientific, test-framework
 , test-framework-hunit, test-framework-quickcheck2, text, time
 , transformers, unordered-containers, vector
 }:
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix
index cabdbd9dcc0..688ca15177a 100644
--- a/pkgs/development/compilers/ios-cross-compile/9.2.nix
+++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, git, clang,
+{ lib, git, clang,
   fetchFromGitHub, requireFile,
   openssl, xz, gnutar,
   automake, autoconf, libtool, clangStdenv } :
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 2edf93b7fc0..3b5465ac9c3 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, openjdk11, fetchFromGitHub, jetbrains }:
+{ lib, openjdk11, fetchFromGitHub, jetbrains }:
 
 openjdk11.overrideAttrs (oldAttrs: rec {
   pname = "jetbrains-jdk";
diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
index 34d8f98970e..454156c2d28 100644
--- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
+++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
@@ -1,4 +1,6 @@
-{lib, stdenv, fetchurl}: stdenv.mkDerivation {
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "meta-build-env-0.1";
   src = fetchurl {
     url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz";
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index d3de5cad2f6..10067644813 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, lib, stdenv, fetchFromGitHub, cmake, zlib, openexr,
+{ clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr,
 openimageio, llvm, boost165, flex, bison, partio, pugixml,
 util-linux, python
 }:
diff --git a/pkgs/development/compilers/pakcs/curry-base.nix b/pkgs/development/compilers/pakcs/curry-base.nix
index 660a4f2de40..c461d2caa93 100644
--- a/pkgs/development/compilers/pakcs/curry-base.nix
+++ b/pkgs/development/compilers/pakcs/curry-base.nix
@@ -1,5 +1,5 @@
 { mkDerivation, base, Cabal, containers, directory, extra, filepath
-, mtl, parsec, pretty, lib, stdenv, time, transformers
+, mtl, parsec, pretty, lib, time, transformers
 }:
 mkDerivation {
   pname = "curry-base";
diff --git a/pkgs/development/compilers/pakcs/curry-frontend.nix b/pkgs/development/compilers/pakcs/curry-frontend.nix
index 8fd1645ee70..88e88487594 100644
--- a/pkgs/development/compilers/pakcs/curry-frontend.nix
+++ b/pkgs/development/compilers/pakcs/curry-frontend.nix
@@ -1,6 +1,6 @@
 { mkDerivation, base, bytestring, Cabal, containers, curry-base
 , directory, extra, file-embed, filepath, mtl, network-uri, pretty
-, process, set-extra, lib, stdenv, template-haskell, transformers
+, process, set-extra, lib, template-haskell, transformers
 }:
 mkDerivation {
   pname = "curry-frontend";
diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix
index 79702c01bee..81ee04edf08 100644
--- a/pkgs/development/compilers/vyper/default.nix
+++ b/pkgs/development/compilers/vyper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, writeText, asttokens
+{ lib, buildPythonPackage, fetchPypi, writeText, asttokens
 , pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx
 , sphinx_rtd_theme, pytestrunner }:
 
diff --git a/pkgs/development/idris-modules/tfrandom.nix b/pkgs/development/idris-modules/tfrandom.nix
index 5c631950312..8249259075c 100644
--- a/pkgs/development/idris-modules/tfrandom.nix
+++ b/pkgs/development/idris-modules/tfrandom.nix
@@ -1,8 +1,8 @@
-{ stdenv
+{ lib
 , build-idris-package
 , fetchFromGitHub
-, lib
 }:
+
 build-idris-package  {
   name = "tf-random";
   version = "2020-01-15";
diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index 72b9067b691..080cbe2778a 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -1,6 +1,6 @@
 # Build a version of idris with a set of packages visible
 # packages: The packages visible to idris
-{ stdenv, lib, idris, symlinkJoin, makeWrapper }: packages:
+{ lib, idris, symlinkJoin, makeWrapper }: packages:
 
 let paths = lib.closePropagation packages;
 in
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index 6bfef26b4dd..e39bf915cfc 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "hy";
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 3d36dde8e0f..004d2732f3a 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "joker";
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index d6090152d15..895054fac46 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
+{ lib, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
 
 { baseName ? "lfe"
 , version
diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix
index 865d8fde9ea..da95b5a8964 100644
--- a/pkgs/development/interpreters/perl/wrapper.nix
+++ b/pkgs/development/interpreters/perl/wrapper.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, perl, buildEnv, makeWrapper
+{ lib, perl, buildEnv, makeWrapper
 , extraLibs ? []
 , extraOutputsToInstall ? []
 , postBuild ? ""
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 668adf2c44a..a9c71c6fcf7 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2Packages }:
+{ lib, 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 2c4c74baecf..12429c05fe6 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2Packages }:
+{ lib, fetchurl, python2Packages }:
 
 let version = "0.9.6.4"; in
 
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index cb895d9c672..432f972b0ff 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -5,7 +5,7 @@ with builtins;
 with lib;
 
 let
-  mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; };
+  mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs ; };
 in stdenv.mkDerivation rec {
   inherit mavenDeps src name meta m2Path;
 
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index c4b02071ec0..2cb9ab001c2 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgs, mavenbuild, fetchMaven }:
+{ lib, pkgs, mavenbuild, fetchMaven }:
 
 with pkgs.javaPackages;
 
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index e0087e857a4..eac127b6dcc 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgs, mavenbuild }:
+{ lib, pkgs, mavenbuild }:
 
 with pkgs.javaPackages;
 
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index 9019e3ba28e..d966a75bb9d 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgs }:
+{ lib, pkgs }:
 
 with lib;
 with pkgs.javaPackages;
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
index 79bb783cc9f..21883acd195 100644
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub }:
+{ lib, mkDerivation, fetchFromGitHub }:
 
 mkDerivation rec {
   version = "compat-2.6.1";
diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
index 7ec892bfe02..ce4deb5b519 100644
--- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, stdenv, mkDerivation, standard-library }:
+{ fetchFromGitHub, lib, mkDerivation, standard-library }:
 
 mkDerivation rec {
   version = "0.1";
diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
index 2ebb3f66ed0..1383cff9e55 100644
--- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub }:
+{ lib, mkDerivation, fetchFromGitHub }:
 
 mkDerivation (rec {
   version = "1.5.0";
diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix
index 1d8dc03bbde..c0b0287d897 100644
--- a/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/pkgs/development/libraries/agda/standard-library/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }:
+{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages }:
 
 mkDerivation rec {
   pname = "standard-library";
diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index c9fc96b3251..9ae1cce684a 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/pkgs/development/libraries/appstream/qt.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, appstream, qtbase, qttools }:
+{ mkDerivation, appstream, qtbase, qttools }:
 
 # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
 
diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix
index fb65e49c500..0f6e9a35b6e 100644
--- a/pkgs/development/libraries/boost/1.59.nix
+++ b/pkgs/development/libraries/boost/1.59.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
+{ callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.59.0";
diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix
index 646f4652f77..4bc7a1cc732 100644
--- a/pkgs/development/libraries/boost/1.60.nix
+++ b/pkgs/development/libraries/boost/1.60.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
+{ callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.60.0";
diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix
index 922c09ba7fe..764f38d5b74 100644
--- a/pkgs/development/libraries/boost/1.65.nix
+++ b/pkgs/development/libraries/boost/1.65.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
+{ callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.65.1";
diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix
index 0a99717a799..af61aa51944 100644
--- a/pkgs/development/libraries/boost/1.66.nix
+++ b/pkgs/development/libraries/boost/1.66.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
+{ callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.66.0";
diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix
index 4d98172c6d0..920dd9a300b 100644
--- a/pkgs/development/libraries/boost/1.68.nix
+++ b/pkgs/development/libraries/boost/1.68.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.68.0";
diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix
index 95c4aa854a4..7292356ecd1 100644
--- a/pkgs/development/libraries/boost/1.69.nix
+++ b/pkgs/development/libraries/boost/1.69.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.69.0";
diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix
index 45a8bdb9318..3b898cfc0ae 100644
--- a/pkgs/development/libraries/boost/1.70.nix
+++ b/pkgs/development/libraries/boost/1.70.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // {
   version = "1.70.0";
diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix
index 7b128e25bb6..bec741dd88a 100644
--- a/pkgs/development/libraries/boost/1.71.nix
+++ b/pkgs/development/libraries/boost/1.71.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "1.71.0";
diff --git a/pkgs/development/libraries/boost/1.72.nix b/pkgs/development/libraries/boost/1.72.nix
index 680afe8bcb8..97dad9b6c8a 100644
--- a/pkgs/development/libraries/boost/1.72.nix
+++ b/pkgs/development/libraries/boost/1.72.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "1.72.0";
diff --git a/pkgs/development/libraries/boost/1.73.nix b/pkgs/development/libraries/boost/1.73.nix
index 99a5486f197..289bea197c3 100644
--- a/pkgs/development/libraries/boost/1.73.nix
+++ b/pkgs/development/libraries/boost/1.73.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "1.73.0";
diff --git a/pkgs/development/libraries/boost/1.74.nix b/pkgs/development/libraries/boost/1.74.nix
index 35b4013dcb3..a181ed94c26 100644
--- a/pkgs/development/libraries/boost/1.74.nix
+++ b/pkgs/development/libraries/boost/1.74.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "1.74.0";
diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix
index 9912032c777..ff1073bd026 100644
--- a/pkgs/development/libraries/boost/1.75.nix
+++ b/pkgs/development/libraries/boost/1.75.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "1.75.0";
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index 1a828cc451d..3469cda3fc7 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub }:
+{ lib, buildPythonApplication, fetchFromGitHub }:
 
 buildPythonApplication rec {
   pname = "cxxtest";
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix
index 629fdba5673..be341d588c1 100644
--- a/pkgs/development/libraries/ffmpeg/3.4.nix
+++ b/pkgs/development/libraries/ffmpeg/3.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchpatch
+{ callPackage, fetchpatch
 # Darwin frameworks
 , Cocoa, CoreMedia
 , ...
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index 7e3941d3f37..2cc409fc037 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchpatch
+{ callPackage, fetchpatch
 # Darwin frameworks
 , Cocoa, CoreMedia, VideoToolbox
 , ...
diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index 1695d11cb25..5a107985177 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, antBuild, fetchgit, perl }:
+{ lib, antBuild, fetchgit, perl }:
 
 let
   version = "4.11";
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index df8db3ac9f8..0bf654ee963 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, collectd }:
+{ lib, collectd }:
 with lib;
 
 collectd.overrideAttrs (oldAttrs: {
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.70.nix b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix
index 1cd04b0b277..c0321e327c5 100644
--- a/pkgs/development/libraries/libmicrohttpd/0.9.70.nix
+++ b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl }:
+{ callPackage, fetchurl }:
 
 callPackage ./generic.nix ( rec {
   version = "0.9.70";
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix
index 74bd6cce42c..7e60f8c7272 100644
--- a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix
+++ b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl }:
+{ callPackage, fetchurl }:
 
 callPackage ./generic.nix ( rec {
   version = "0.9.71";
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
index 8eeb94cdc29..4c695218184 100644
--- a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
+++ b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl }:
+{ callPackage, fetchurl }:
 
 callPackage ./generic.nix ( rec {
   version = "0.9.72";
diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix
index 3b57d0c2f7a..953eee3b8bd 100644
--- a/pkgs/development/libraries/lief/default.nix
+++ b/pkgs/development/libraries/lief/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 fetchzip {
   url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz";
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index 7004a5e11c0..7434383e165 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , SDL
 , ffmpeg
diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix
index 7bf0cb2c5fb..e3abc6e5d62 100644
--- a/pkgs/development/libraries/packr/default.nix
+++ b/pkgs/development/libraries/packr/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule
 , fetchFromGitHub
 , lib
-, stdenv
+
 , symlinkJoin
 }:
 
diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix
index 4d7c682f022..f2e984c8c81 100644
--- a/pkgs/development/libraries/pkger/default.nix
+++ b/pkgs/development/libraries/pkger/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule
 , fetchFromGitHub
 , lib
-, stdenv
+
 }:
 
 buildGoModule rec {
diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix
index 81e72036694..fd06b49604a 100644
--- a/pkgs/development/libraries/prototypejs/default.nix
+++ b/pkgs/development/libraries/prototypejs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ... }:
+{ lib, fetchurl, ... }:
 let
   version = "1.7.3.0";
 in fetchurl {
diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix
index 57784c3a502..aa2522a5dad 100644
--- a/pkgs/development/libraries/psol/generic.nix
+++ b/pkgs/development/libraries/psol/generic.nix
@@ -1,4 +1,4 @@
-{ fetchzip, lib, stdenv }:
+{ fetchzip, lib }:
 { version, sha256 }:
 { inherit version; } // fetchzip {
   inherit sha256;
diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
index 6639e4c8d69..5e7ccf70204 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, qtModule, qtbase }:
+{ lib, qtModule, qtbase }:
 
 qtModule {
   name = "qtmacextras";
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index 84d7f46a2b2..4587bf46162 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
+{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
 
 mkDerivation {
   name = "qtstyleplugins-2017-03-11";
diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix
index c2beda45ab3..e3c8ea00f44 100644
--- a/pkgs/development/libraries/scriptaculous/default.nix
+++ b/pkgs/development/libraries/scriptaculous/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchurl, unzip, ... }:
+
+stdenv.mkDerivation rec {
   pname = "scriptaculous";
   version = "1.9.0";
 
diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix
index 7fb6b1adb5a..e617ba58e8b 100644
--- a/pkgs/development/libraries/smarty3-i18n/default.nix
+++ b/pkgs/development/libraries/smarty3-i18n/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, ... }:
+
+stdenv.mkDerivation rec {
   pname = "smarty-i18n";
   version = "1.0";
 
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix
index 2070a3bab79..29f640dedfc 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/pkgs/development/libraries/smarty3/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, ... }:
+
+stdenv.mkDerivation rec {
   pname = "smarty3";
   version = "3.1.36";
 
diff --git a/pkgs/development/libraries/stellarsolver/default.nix b/pkgs/development/libraries/stellarsolver/default.nix
index 8badf60d942..f55c72bd209 100644
--- a/pkgs/development/libraries/stellarsolver/default.nix
+++ b/pkgs/development/libraries/stellarsolver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake,
+{ lib, mkDerivation, fetchFromGitHub, cmake,
   qtbase, cfitsio, gsl, wcslib, withTester ? false }:
 
 mkDerivation rec {
diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix
index 76b50a10907..f9ebed19752 100644
--- a/pkgs/development/libraries/vapoursynth/editor.nix
+++ b/pkgs/development/libraries/vapoursynth/editor.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromBitbucket
+{ lib, mkDerivation, fetchFromBitbucket
 , python3, vapoursynth
 , qmake, qtbase, qtwebsockets
 }:
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 8ec44d17016..85f39228584 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul
 
 These packages are manually refined in lua-overrides.nix
 */
-{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args:
+{ self, lib, fetchurl, fetchgit, pkgs, ... } @ args:
 self: super:
 with self;
 {
diff --git a/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/pkgs/development/misc/haskell/hasura/ci-info/default.nix
index 55b070a9f77..2770e74a698 100644
--- a/pkgs/development/misc/haskell/hasura/ci-info/default.nix
+++ b/pkgs/development/misc/haskell/hasura/ci-info/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
-, hpack, lib, stdenv, template-haskell, text, th-lift-instances
+, hpack, lib, template-haskell, text, th-lift-instances
 , unordered-containers
 }:
 mkDerivation {
diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
index 3cf840c15e1..9e7d448e4c1 100644
--- a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
@@ -13,7 +13,7 @@
 , optparse-applicative, pem, pg-client, postgresql-binary
 , postgresql-libpq, process, profunctors, psqueues, QuickCheck
 , regex-tdfa, safe, scientific, semver, shakespeare, split
-, Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text
+, Spock-core, lib, stm, stm-containers, template-haskell, text
 , text-builder, text-conversions, th-lift-instances, these, time
 , transformers, transformers-base, unix, unordered-containers
 , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
index 82314a7485b..dbd3edf0064 100644
--- a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, attoparsec, base, bytestring, containers
 , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
-, protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text
+, protolude, regex-tdfa, scientific, lib, template-haskell, text
 , text-builder, th-lift-instances, unordered-containers, vector
 }:
 mkDerivation {
diff --git a/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix
index aa780abd8e9..bccb3f6eda3 100644
--- a/pkgs/development/misc/haskell/hasura/pg-client/default.nix
+++ b/pkgs/development/misc/haskell/hasura/pg-client/default.nix
@@ -2,7 +2,7 @@
 , criterion, fetchgit, file-embed, hashable, hashtables, hasql
 , hasql-pool, hasql-transaction, monad-control, mtl
 , postgresql-binary, postgresql-libpq, resource-pool, retry
-, scientific, lib, stdenv, template-haskell, text, text-builder, th-lift
+, scientific, lib, template-haskell, text, text-builder, th-lift
 , th-lift-instances, time, transformers-base, uuid, vector
 }:
 mkDerivation {
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index 74b5ca09d2a..fb518279d00 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix
index 3fd7877d2bb..053ab412f88 100644
--- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, buildOcamlJane, type_conv}:
+{lib, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   name = "variantslib";
diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix
index d1ebe95be89..66055dca66e 100644
--- a/pkgs/development/ocaml-modules/kafka/default.nix
+++ b/pkgs/development/ocaml-modules/kafka/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt,
+{ lib, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt,
   rdkafka, zlib }:
 
 buildDunePackage rec {
diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix
index 34e14959e32..afe9e7d39b5 100644
--- a/pkgs/development/ocaml-modules/parany/default.nix
+++ b/pkgs/development/ocaml-modules/parany/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }:
+{ lib, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }:
 
 buildDunePackage rec {
   pname = "parany";
diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix
index d3d6097b446..b284f7ef5eb 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving
+{ lib, buildDunePackage, fetchFromGitHub, ppx_deriving
 , alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }:
 
 buildDunePackage rec {
diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix
index b46386b1666..828df66b41d 100644
--- a/pkgs/development/ocaml-modules/wtf8/default.nix
+++ b/pkgs/development/ocaml-modules/wtf8/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildDunePackage }:
+{ lib, fetchurl, buildDunePackage }:
 
 buildDunePackage rec {
   pname = "wtf8";
diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix
index c0fc8f28108..2ef7b90842e 100644
--- a/pkgs/development/perl-modules/MNI/default.nix
+++ b/pkgs/development/perl-modules/MNI/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, buildPerlPackage, lib, stdenv }:
+{ fetchFromGitHub, buildPerlPackage, lib }:
 
 buildPerlPackage {
   pname = "MNI-Perllib";
diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index 3c555ca37ab..5efac53f837 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang
+{ lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang
 , DBDmysql, DBI, IOSocketSSL, TermReadKey
 }:
 
diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix
index 29bcc9bab25..d6945083f63 100644
--- a/pkgs/development/perl-modules/maatkit/default.nix
+++ b/pkgs/development/perl-modules/maatkit/default.nix
@@ -1,4 +1,4 @@
-{buildPerlPackage, lib, stdenv, fetchurl, DBDmysql}:
+{buildPerlPackage, lib, fetchurl, DBDmysql}:
 
 buildPerlPackage {
   pname = "maatkit";
diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix
index 2b06fcdce7d..74884f36f03 100644
--- a/pkgs/development/python-modules/FormEncode/default.nix
+++ b/pkgs/development/python-modules/FormEncode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }:
+{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }:
 
 buildPythonPackage rec {
   pname = "FormEncode";
diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix
index be4bb9e31d3..486f8a4556f 100644
--- a/pkgs/development/python-modules/HTSeq/default.nix
+++ b/pkgs/development/python-modules/HTSeq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }:
+{ lib, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }:
 buildPythonPackage rec {
   version = "0.12.4";
   pname = "HTSeq";
diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix
index f142c245922..05587ef0740 100644
--- a/pkgs/development/python-modules/IPy/default.nix
+++ b/pkgs/development/python-modules/IPy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "IPy";
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix
index 247b7f0332f..5a4741a730a 100644
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }:
+{ lib, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }:
 
 let
 
diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix
index ebedb3c6969..8c34e75139f 100644
--- a/pkgs/development/python-modules/ROPGadget/default.nix
+++ b/pkgs/development/python-modules/ROPGadget/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , capstone}:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index d7ad28c0133..e180f0cea33 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , imagemagick7Big
diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix
index 28515e6f602..6da500413f0 100644
--- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix
+++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix
index cf6976fa6c1..de3ec6fa7f0 100644
--- a/pkgs/development/python-modules/aadict/default.nix
+++ b/pkgs/development/python-modules/aadict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix
index 5350443eeaa..0b9f1457178 100644
--- a/pkgs/development/python-modules/aafigure/default.nix
+++ b/pkgs/development/python-modules/aafigure/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }:
+{ lib, buildPythonPackage, fetchPypi, pillow }:
 
 buildPythonPackage rec {
   pname = "aafigure";
diff --git a/pkgs/development/python-modules/acebinf/default.nix b/pkgs/development/python-modules/acebinf/default.nix
index f8134aaf5b3..7889e007d83 100644
--- a/pkgs/development/python-modules/acebinf/default.nix
+++ b/pkgs/development/python-modules/acebinf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyvcf
diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix
index 75408244e66..c979104914d 100644
--- a/pkgs/development/python-modules/acme-tiny/default.nix
+++ b/pkgs/development/python-modules/acme-tiny/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse
+{ lib, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse
 , openssl }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix
index ca47018f56f..92917f6ea95 100644
--- a/pkgs/development/python-modules/actdiag/default.nix
+++ b/pkgs/development/python-modules/actdiag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , nose, docutils, blockdiag, reportlab }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index f7e973c8f69..55dc21240ec 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , requests, pyjwt, dateutil }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index f21d8f4195a..4f30eefbf90 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }:
+{ lib, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "aenum";
diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix
index 099fb1701cb..0299a94ebb0 100644
--- a/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/pkgs/development/python-modules/agate-dbf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:
+{ lib, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:
 
 buildPythonPackage rec {
     pname = "agate-dbf";
diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
index 566951ea71d..29bbfa81ed2 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
+{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
 
 buildPythonPackage rec {
     pname = "agate-sql";
diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 30821986539..2e7c9c2401c 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index 4ba4bd59af2..1adc6f81524 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , isPy27, isPyPy, python, pycares, typing, trollius }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix
index 4bdd2b1327c..0d6796706cb 100644
--- a/pkgs/development/python-modules/aioeventlet/default.nix
+++ b/pkgs/development/python-modules/aioeventlet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , eventlet
diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix
index 1c5ce1e2fae..91d83e93cbd 100644
--- a/pkgs/development/python-modules/aioitertools/default.nix
+++ b/pkgs/development/python-modules/aioitertools/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix
index 94f503fe2cc..fe48ba0e1e1 100644
--- a/pkgs/development/python-modules/aioredis/default.nix
+++ b/pkgs/development/python-modules/aioredis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pkgs, async-timeout, hiredis, isPyPy, isPy27
 }:
 
diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix
index d73ae2b35df..fe3943c25b1 100644
--- a/pkgs/development/python-modules/aiozeroconf/default.nix
+++ b/pkgs/development/python-modules/aiozeroconf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , netifaces
diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix
index 0dd135e139f..926b5ed7efe 100644
--- a/pkgs/development/python-modules/ajpy/default.nix
+++ b/pkgs/development/python-modules/ajpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ajpy";
diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix
index b4cc69e555b..72eda332f95 100644
--- a/pkgs/development/python-modules/alabaster/default.nix
+++ b/pkgs/development/python-modules/alabaster/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pygments }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix
index b563a80447f..10438d54081 100644
--- a/pkgs/development/python-modules/alarmdecoder/default.nix
+++ b/pkgs/development/python-modules/alarmdecoder/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb
+{ lib, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb
 , pyopenssl, nose, isPy3k, pythonOlder, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 142c6d1c416..5a4ef5e0bc6 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, pytestcov, mock, coverage, setuptools
 , Mako, sqlalchemy, python-editor, dateutil
 }:
diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix
index dd2d82578ea..82783dd16bb 100644
--- a/pkgs/development/python-modules/alerta-server/default.nix
+++ b/pkgs/development/python-modules/alerta-server/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk
 }:
 
diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix
index 19dd17ee3f0..e69503777d4 100644
--- a/pkgs/development/python-modules/alerta/default.nix
+++ b/pkgs/development/python-modules/alerta/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , six, click, requests, requests-hawk, pytz, tabulate, pythonOlder
 }:
 
diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index 21c6aaff2fb..1f4617ce9c0 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k
+{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k
 , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
 , service-identity
 , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index a3b515ebeca..37c1efd9c1b 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27
 , entrypoints
 , glibcLocales
 , ipython
diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix
index ed266c0db78..44dc739f1ca 100644
--- a/pkgs/development/python-modules/amazon_kclpy/default.nix
+++ b/pkgs/development/python-modules/amazon_kclpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }:
 
 buildPythonPackage rec {
   pname = "amazon_kclpy";
diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix
index 32bcbb4589a..0589caf1e6a 100644
--- a/pkgs/development/python-modules/amply/default.nix
+++ b/pkgs/development/python-modules/amply/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , setuptools_scm
diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index b614ae453d2..be40465496c 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }:
 
 buildPythonPackage rec {
   pname = "amqp";
diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
index c7b4dc865bb..430065b7d1f 100644
--- a/pkgs/development/python-modules/amqplib/default.nix
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, python }:
+{ lib, buildPythonPackage, fetchPypi, python }:
 
 buildPythonPackage rec {
   pname = "amqplib";
diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
index 804402a4ca6..538cb11db13 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , dateutil, mock, isPy3k }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix
index 0bd06084380..d5f24492c90 100644
--- a/pkgs/development/python-modules/annoy/default.nix
+++ b/pkgs/development/python-modules/annoy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , h5py
diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix
index 9c1b3abf980..0663fddd6fb 100644
--- a/pkgs/development/python-modules/anonip/default.nix
+++ b/pkgs/development/python-modules/anonip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }:
+{ lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }:
 
 buildPythonPackage rec {
   pname = "anonip";
diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix
index 3d96061362e..99a419a60fa 100644
--- a/pkgs/development/python-modules/ansicolor/default.nix
+++ b/pkgs/development/python-modules/ansicolor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ansicolor";
diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix
index 7d6dd2127e6..fab91690ab2 100644
--- a/pkgs/development/python-modules/ansicolors/default.nix
+++ b/pkgs/development/python-modules/ansicolors/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "ansicolors";
diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix
index 6a3571960d0..ba0c06f536a 100644
--- a/pkgs/development/python-modules/ansiconv/default.nix
+++ b/pkgs/development/python-modules/ansiconv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
 
 buildPythonPackage rec {
   pname = "ansiconv";
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index 604c37b42ba..10e2369e12e 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, setuptools_scm, isPy3k }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index bc47de37128..6f2c55d45cb 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }:
 
 buildPythonPackage rec {
   version = "0.2.6";
diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index de74480765a..8933d4e91bc 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
 , sqlite, isPyPy }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix
index 0e2beb6a31e..bbe120ec14f 100644
--- a/pkgs/development/python-modules/argh/default.nix
+++ b/pkgs/development/python-modules/argh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix
index cb349484f27..9faf16037d0 100644
--- a/pkgs/development/python-modules/args/default.nix
+++ b/pkgs/development/python-modules/args/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "args";
diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
index 076fec8c56b..2bb950beb28 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , aria2, poetry, pytest, pytestcov, pytest_xdist, responses
 , asciimatics, loguru, requests, setuptools, websocket_client
 }:
diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
index 7dbe3b98fca..d87f1ede3cc 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27
 , nose, chai, simplejson, backports_functools_lru_cache
 , python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index ed5e441df97..c7839f05147 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six
-, fetchFromGitHub, responses, lib, stdenv
+, fetchFromGitHub, responses, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix
index 2735bbf2f70..a141fc746f7 100644
--- a/pkgs/development/python-modules/asn1ate/default.nix
+++ b/pkgs/development/python-modules/asn1ate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }:
+{ lib, buildPythonPackage, fetchFromGitHub, pyparsing }:
 
 buildPythonPackage rec {
   pname = "asn1ate";
diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index 4ea53e17eb0..8c97ef6750f 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }:
 
 buildPythonPackage rec {
   pname = "astral";
diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix
index c9001da5c70..b32df24f5bb 100644
--- a/pkgs/development/python-modules/astunparse/default.nix
+++ b/pkgs/development/python-modules/astunparse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , six
diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index d3684ea5720..9271adeb617 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , cryptography
 , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
 , openssl, openssh, pytestCheckHook }:
diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix
index 7bcb36d548d..0fccc943c8a 100644
--- a/pkgs/development/python-modules/atomiclong/default.nix
+++ b/pkgs/development/python-modules/atomiclong/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, cffi }:
+{ lib, buildPythonPackage, fetchPypi, pytest, cffi }:
 
 buildPythonPackage rec {
   pname = "atomiclong";
diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix
index e958b0f16d6..5335c044cd2 100644
--- a/pkgs/development/python-modules/atomicwrites/default.nix
+++ b/pkgs/development/python-modules/atomicwrites/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "atomicwrites";
diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix
index 147d2e77deb..b576504588a 100644
--- a/pkgs/development/python-modules/atomman/default.nix
+++ b/pkgs/development/python-modules/atomman/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , cython
 , datamodeldict
 , matplotlib
diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix
index 6b8b8dccef8..4802ea867b7 100644
--- a/pkgs/development/python-modules/atsim_potentials/default.nix
+++ b/pkgs/development/python-modules/atsim_potentials/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , configparser
diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix
index 5c7514f9da6..cb87b9027f0 100644
--- a/pkgs/development/python-modules/attrdict/default.nix
+++ b/pkgs/development/python-modules/attrdict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }:
+{ lib, buildPythonPackage, fetchPypi, coverage, nose, six }:
 
 buildPythonPackage rec {
   pname = "attrdict";
diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix
index 3e6faae9af0..4fa14a60ff8 100644
--- a/pkgs/development/python-modules/authlib/default.nix
+++ b/pkgs/development/python-modules/authlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix
index c3d0402d48d..196e573717b 100644
--- a/pkgs/development/python-modules/authres/default.nix
+++ b/pkgs/development/python-modules/authres/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, python }:
+{ lib, fetchPypi, buildPythonPackage, python }:
 
 buildPythonPackage rec {
   pname = "authres";
diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix
index fef97a7a6f4..0bdee21b69c 100644
--- a/pkgs/development/python-modules/autograd/default.nix
+++ b/pkgs/development/python-modules/autograd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, future }:
+{ lib, buildPythonPackage, fetchPypi, numpy, future }:
 
 buildPythonPackage rec {
   pname = "autograd";
diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix
index 7cd66dc2c3f..fdd935303d0 100644
--- a/pkgs/development/python-modules/autologging/default.nix
+++ b/pkgs/development/python-modules/autologging/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "Autologging";
diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix
index fa395f119ee..20f54870e1f 100644
--- a/pkgs/development/python-modules/automat/default.nix
+++ b/pkgs/development/python-modules/automat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
   m2r, setuptools_scm, six, attrs }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index afeaef40661..c748c0cb8c1 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales
+{ lib, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales
 , toml
 }:
 
diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix
index 3e9a0e492d3..e0294246fb2 100644
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/pkgs/development/python-modules/avro-python3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }:
 
 buildPythonPackage rec {
   pname = "avro-python3";
diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix
index 35cab724a86..5a38e86eee3 100644
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }:
 
 buildPythonPackage rec {
   pname = "avro";
diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix
index b600bc75c7a..f6ad9bf086c 100644
--- a/pkgs/development/python-modules/avro3k/default.nix
+++ b/pkgs/development/python-modules/avro3k/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "avro3k";
diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix
index 00882cb0827..47ca9859b5e 100644
--- a/pkgs/development/python-modules/awesome-slugify/default.nix
+++ b/pkgs/development/python-modules/awesome-slugify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }:
+{ lib, buildPythonPackage, fetchPypi, unidecode, regex, python }:
 
 buildPythonPackage rec {
   pname = "awesome-slugify";
diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix
index da43f6e5690..cd695132d7a 100644
--- a/pkgs/development/python-modules/b2sdk/default.nix
+++ b/pkgs/development/python-modules/b2sdk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook
+{ lib, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook
 , requests, arrow, logfury, tqdm }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix
index 5ac04429215..ba015f597ce 100644
--- a/pkgs/development/python-modules/babelfish/default.nix
+++ b/pkgs/development/python-modules/babelfish/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }:
+{ lib, buildPythonPackage, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "babelfish";
diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix
index 0df03754127..b1516d1abdb 100644
--- a/pkgs/development/python-modules/babelgladeextractor/default.nix
+++ b/pkgs/development/python-modules/babelgladeextractor/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , isPy3k
 , buildPythonPackage
 , fetchPypi
diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix
index 5fe922b9046..52163abe8bc 100644
--- a/pkgs/development/python-modules/backports-shutil-which/default.nix
+++ b/pkgs/development/python-modules/backports-shutil-which/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }:
+{ lib, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   pname = "backports.shutil_which";
diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix
index 5216149ddc2..6086178c959 100644
--- a/pkgs/development/python-modules/backports_csv/default.nix
+++ b/pkgs/development/python-modules/backports_csv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, future }:
+{ lib, buildPythonPackage, fetchPypi, future }:
 
 buildPythonPackage rec {
 
diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix
index b3e231bcd05..39973e433ee 100644
--- a/pkgs/development/python-modules/backports_os/default.nix
+++ b/pkgs/development/python-modules/backports_os/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix
index 08f98de79f2..a9950eb704f 100644
--- a/pkgs/development/python-modules/backports_unittest-mock/default.nix
+++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }:
+{ lib, buildPythonPackage, fetchPypi, setuptools_scm, mock }:
 
 buildPythonPackage rec {
   pname = "backports.unittest_mock";
diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix
index 9770fb45981..c04b88a3f32 100644
--- a/pkgs/development/python-modules/backports_weakref/default.nix
+++ b/pkgs/development/python-modules/backports_weakref/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix
index 59542e61c56..f07c5e90d51 100644
--- a/pkgs/development/python-modules/bacpypes/default.nix
+++ b/pkgs/development/python-modules/bacpypes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub
+{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub
 , wheel, pytestCheckHook, pytestrunner }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index d2575afb77d..03abf67f86a 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}:
+{lib, buildPythonPackage, fetchFromGitHub, bap, requests}:
 
 buildPythonPackage rec {
   pname = "bap";
diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix
index a36727429ca..1e1da32f6c9 100644
--- a/pkgs/development/python-modules/base58/default.nix
+++ b/pkgs/development/python-modules/base58/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }:
+{ lib, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }:
 
 buildPythonPackage rec {
   pname = "base58";
diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix
index c97548bdee8..2fadda388ba 100644
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/pkgs/development/python-modules/basemap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , numpy
diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix
index 0ed3486272d..17d28c12914 100644
--- a/pkgs/development/python-modules/batinfo/default.nix
+++ b/pkgs/development/python-modules/batinfo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "batinfo";
diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix
index b470d21b1be..6ebe9919ec9 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , pytest, nose, glibcLocales
 , numpy, scipy, matplotlib, h5py }:
 
diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix
index 185fcb86b0b..29c267aa45f 100644
--- a/pkgs/development/python-modules/bcdoc/default.nix
+++ b/pkgs/development/python-modules/bcdoc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, six }:
+{ lib, buildPythonPackage, fetchPypi, docutils, six }:
 
 buildPythonPackage rec {
   pname = "bcdoc";
diff --git a/pkgs/development/python-modules/bcrypt/3_1.nix b/pkgs/development/python-modules/bcrypt/3_1.nix
index c70161cf28b..df57eb3cd0c 100644
--- a/pkgs/development/python-modules/bcrypt/3_1.nix
+++ b/pkgs/development/python-modules/bcrypt/3_1.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , isPyPy, cffi, pytest, six }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index e74b0934b30..cfd17262a2b 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, isPyPy, fetchPypi, pythonOlder
 , cffi, pycparser, mock, pytest, py, six }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index fa97c7c97a9..e4a6a5f5625 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , beautifulsoup4, bottle, chardet, dateutil
 , google_api_python_client, lxml, oauth2client
 , ply, python_magic, pytest, requests }:
diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix
index a74f6c6f8f2..ffdb2f6f8f2 100644
--- a/pkgs/development/python-modules/beanstalkc/default.nix
+++ b/pkgs/development/python-modules/beanstalkc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage }:
+{ lib, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "beanstalkc";
diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index 555669da243..b00c03a09c1 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }:
+{ lib, buildPythonPackage, fetchPypi, soupsieve, pytest, python }:
 
 buildPythonPackage rec {
   pname = "beautifulsoup4";
diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix
index f38d4263c24..454a972f177 100644
--- a/pkgs/development/python-modules/bedup/default.nix
+++ b/pkgs/development/python-modules/bedup/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , btrfs-progs
diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index 6ee8b6499b5..d47c5d716a7 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , click, click-log, pure-pcapy3
 , pyserial-asyncio, voluptuous, zigpy
 , asynctest, pytestCheckHook, pytest-asyncio }:
diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix
index 555a0a48758..599ad71b241 100644
--- a/pkgs/development/python-modules/bespon/default.nix
+++ b/pkgs/development/python-modules/bespon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix
index 424b8ef4ef3..459d3c51d7e 100644
--- a/pkgs/development/python-modules/betamax-matchers/default.nix
+++ b/pkgs/development/python-modules/betamax-matchers/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , betamax, requests_toolbelt }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix
index 3d3cad4d95b..0ddc9845bfa 100644
--- a/pkgs/development/python-modules/betamax-serializers/default.nix
+++ b/pkgs/development/python-modules/betamax-serializers/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , betamax, pyyaml }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix
index 5e1469bfc52..5906a531f22 100644
--- a/pkgs/development/python-modules/betamax/default.nix
+++ b/pkgs/development/python-modules/betamax/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "betamax";
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 4f8aa3565da..2d4eabf215e 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }:
+{ lib, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }:
 
 buildPythonPackage rec {
   pname = "billiard";
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index c2f059dd93d..499d442c822 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , zlib
diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix
index 559661bbb4f..b874f1af525 100644
--- a/pkgs/development/python-modules/bitbucket-api/default.nix
+++ b/pkgs/development/python-modules/bitbucket-api/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , requests_oauthlib, nose, sh }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix
index 50075fe70fc..bb1fa1d6c17 100644
--- a/pkgs/development/python-modules/bitbucket-cli/default.nix
+++ b/pkgs/development/python-modules/bitbucket-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }:
 
 buildPythonPackage rec {
   pname = "bitbucket-cli";
diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix
index 49992c561f7..5643ea29bc2 100644
--- a/pkgs/development/python-modules/bitmath/default.nix
+++ b/pkgs/development/python-modules/bitmath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }:
 
 buildPythonPackage rec {
   pname = "bitmath";
diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix
index d6eaf31056f..ed67f2be5c5 100644
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/pkgs/development/python-modules/bitstring/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "bitstring";
diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index 2949ecbf6f9..ef599d89be2 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, libev, python }:
+{ lib, buildPythonPackage, fetchPypi, libev, python }:
 
 buildPythonPackage rec {
   pname = "bjoern";
diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix
index 536ad1f14b6..80aed4e6fef 100644
--- a/pkgs/development/python-modules/black-macchiato/default.nix
+++ b/pkgs/development/python-modules/black-macchiato/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv,
+{ lib,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 06dc3217dc8..38390e8377e 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
 
 buildPythonPackage rec {
   pname = "bleak";
diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix
index 7adacecc647..f0167625cf6 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, six
 , wcwidth, pytest, mock, glibcLocales
 }:
 
diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix
index 5263a92ec3d..00b7fd9a63d 100644
--- a/pkgs/development/python-modules/blessings/default.nix
+++ b/pkgs/development/python-modules/blessings/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix
index e33ad162631..5591113ab0a 100644
--- a/pkgs/development/python-modules/blinker/default.nix
+++ b/pkgs/development/python-modules/blinker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "blinker";
diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index eeb62e8fed3..2b8aeb2edcd 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cython
diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix
index 505f01af5fe..d4dcb54c5cd 100644
--- a/pkgs/development/python-modules/blist/default.nix
+++ b/pkgs/development/python-modules/blist/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchpatch
 , fetchPypi
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 94abc39fd28..fd97fa20648 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
+{ lib, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
 , pyudev, six, libselinux, multipath-tools, lsof, util-linux
 }:
 
diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix
index 3a9704d71bc..b823b8711a5 100644
--- a/pkgs/development/python-modules/block-io/default.nix
+++ b/pkgs/development/python-modules/block-io/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }:
+{ lib, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }:
 
 buildPythonPackage rec {
   pname = "block-io";
diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index 5adc854d026..f5d8b93c481 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , setuptools, funcparserlib, pillow, webcolors, reportlab, docutils
 }:
 
diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix
index d833d20934d..11930050ba3 100644
--- a/pkgs/development/python-modules/bluepy/default.nix
+++ b/pkgs/development/python-modules/bluepy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkg-config
diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix
index 13e264340da..f4842981c4a 100644
--- a/pkgs/development/python-modules/boltons/default.nix
+++ b/pkgs/development/python-modules/boltons/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
 
 buildPythonPackage rec {
   pname = "boltons";
diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix
index 48bc53bbeed..f80a8deb9ab 100644
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/pkgs/development/python-modules/boltztrap2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , spglib
diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix
index 213d69dd989..eeaf34a44eb 100644
--- a/pkgs/development/python-modules/bottle/default.nix
+++ b/pkgs/development/python-modules/bottle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }:
+{ lib, buildPythonPackage, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "bottle";
diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix
index 92ac90ab6d4..e6f6a390f37 100644
--- a/pkgs/development/python-modules/box2d/default.nix
+++ b/pkgs/development/python-modules/box2d/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , swig2
diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
index 108d8ec0c66..8a37ed0bd97 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , curtsies
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
index 9877a03a087..82459398ca7 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix
index f70f71c1a69..339e649c53a 100644
--- a/pkgs/development/python-modules/bsdiff4/default.nix
+++ b/pkgs/development/python-modules/bsdiff4/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , aflplusplus
diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix
index 209565fa21b..8ac1b977f39 100644
--- a/pkgs/development/python-modules/bt-proximity/default.nix
+++ b/pkgs/development/python-modules/bt-proximity/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , pybluez }:
 
 buildPythonPackage {
diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix
index ebb14a77b56..3d206c829e8 100644
--- a/pkgs/development/python-modules/btchip/default.nix
+++ b/pkgs/development/python-modules/btchip/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }:
+{ lib, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }:
 
 buildPythonPackage rec {
   pname = "btchip-python";
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 471ba54215d..3da6852c54d 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , persistent
diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix
index 8ea93fe005e..adaf1f610e3 100644
--- a/pkgs/development/python-modules/btrfs/default.nix
+++ b/pkgs/development/python-modules/btrfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix
index 5e3b0b4e89f..33845368480 100644
--- a/pkgs/development/python-modules/bugsnag/default.nix
+++ b/pkgs/development/python-modules/bugsnag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix
index 3d27384efe1..c59d2196d20 100644
--- a/pkgs/development/python-modules/bugwarrior/default.nix
+++ b/pkgs/development/python-modules/bugwarrior/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools
 , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six
 , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }:
 
diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix
index 5324a43e1b0..a57e957efe6 100644
--- a/pkgs/development/python-modules/bugz/default.nix
+++ b/pkgs/development/python-modules/bugz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix
index fc122ecd233..365f3654298 100644
--- a/pkgs/development/python-modules/bugzilla/default.nix
+++ b/pkgs/development/python-modules/bugzilla/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pep8, coverage, logilab_common, requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index 0751b284a78..a9fe66a37ea 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "zc.buildout";
diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index 05f082c747b..7e94bd55b28 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six}:
+{ lib, buildPythonPackage, fetchPypi, six}:
 
 buildPythonPackage rec {
   pname = "bumps";
diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix
index ce77085e4f7..2758ff5b418 100644
--- a/pkgs/development/python-modules/bunch/default.nix
+++ b/pkgs/development/python-modules/bunch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "bunch";
diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix
index c736eb577d4..f6c926cf419 100644
--- a/pkgs/development/python-modules/bwapy/default.nix
+++ b/pkgs/development/python-modules/bwapy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix
index 53b13ddb568..ba9b9022ac8 100644
--- a/pkgs/development/python-modules/cachecontrol/default.nix
+++ b/pkgs/development/python-modules/cachecontrol/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix
index 503b546116e..154c67bb379 100644
--- a/pkgs/development/python-modules/cachelib/default.nix
+++ b/pkgs/development/python-modules/cachelib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cachelib";
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index 6fd3f637875..56efa9a3485 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+{ lib, buildPythonPackage, fetchPypi, isPy27 }:
 
 buildPythonPackage rec {
   pname = "cachetools";
diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix
index bb5629cf4e5..3e1a67f8282 100644
--- a/pkgs/development/python-modules/cairosvg/1_x.nix
+++ b/pkgs/development/python-modules/cairosvg/1_x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig
+{ lib, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig
 , cssselect2, defusedxml, pillow, tinycss2 }:
 
 # CairoSVG 2.x dropped support for Python 2 so offer CairoSVG 1.x as an
diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 9d1c54651c2..53f3ebc0c08 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
+{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
 , cairocffi, cssselect2, defusedxml, pillow, tinycss2
 , pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
 
diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix
index 96af6f4bf78..4a4f56f5abf 100644
--- a/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/pkgs/development/python-modules/canonicaljson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , frozendict, simplejson, six, isPy27
 }:
 
diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix
index e0a31829b05..b651a654d5e 100644
--- a/pkgs/development/python-modules/carbon/default.nix
+++ b/pkgs/development/python-modules/carbon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , twisted, whisper, txamqp, cachetools, urllib3
 }:
 
diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix
index c2262decd31..a772535ad82 100644
--- a/pkgs/development/python-modules/carrot/default.nix
+++ b/pkgs/development/python-modules/carrot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , nose, amqplib, anyjson }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix
index 5d1a7696516..3f95d9e22af 100644
--- a/pkgs/development/python-modules/case/default.nix
+++ b/pkgs/development/python-modules/case/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , six, nose, unittest2, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index 32cf844cf00..e1cb9f211bc 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, python, pythonOlder
 , cython
 , eventlet
 , futures
diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix
index 85b1147c13a..9d29a013743 100644
--- a/pkgs/development/python-modules/casttube/default.nix
+++ b/pkgs/development/python-modules/casttube/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "casttube";
diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix
index c4cd89cab68..a9c5bae71f4 100644
--- a/pkgs/development/python-modules/catalogue/default.nix
+++ b/pkgs/development/python-modules/catalogue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix
index f081511265f..cc3d8914ad2 100644
--- a/pkgs/development/python-modules/cbor/default.nix
+++ b/pkgs/development/python-modules/cbor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cbor";
diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix
index 96e75405ee3..e231624e40f 100644
--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }:
 
 buildPythonPackage rec {
   pname = "CCColUtils";
diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
index 9133389f0ce..f021ea16b62 100644
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/pkgs/development/python-modules/cement/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "cement";
diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix
index 08b7527c54c..cdf6519d325 100644
--- a/pkgs/development/python-modules/cerberus/default.nix
+++ b/pkgs/development/python-modules/cerberus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }:
 
 buildPythonPackage rec {
   pname = "Cerberus";
diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix
index 049e3ffdb5d..a3cde807076 100644
--- a/pkgs/development/python-modules/certipy/default.nix
+++ b/pkgs/development/python-modules/certipy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyopenssl
diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix
index 2000a4e0a3b..8b3a6afa9b3 100644
--- a/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }:
+{ lib, buildPythonPackage, fetchFromGitHub, pep8, nose }:
 
 buildPythonPackage rec {
   version = "0.8";
diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix
index 3400b33635a..9f9d48d9017 100644
--- a/pkgs/development/python-modules/chai/default.nix
+++ b/pkgs/development/python-modules/chai/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "chai";
diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix
index 3858fc44f23..4619bff2b04 100644
--- a/pkgs/development/python-modules/chainmap/default.nix
+++ b/pkgs/development/python-modules/chainmap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "chainmap";
diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix
index a2ffcb9a023..fccfec53512 100644
--- a/pkgs/development/python-modules/chameleon/default.nix
+++ b/pkgs/development/python-modules/chameleon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix
index 3f341f5527a..1e267aa5126 100644
--- a/pkgs/development/python-modules/channels-redis/default.nix
+++ b/pkgs/development/python-modules/channels-redis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , aioredis
 , asgiref
 , buildPythonPackage
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index c2836ef4faa..0f5e708d091 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
   asgiref, django, daphne
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix
index bbc41df0cd8..65381d40268 100644
--- a/pkgs/development/python-modules/chardet/default.nix
+++ b/pkgs/development/python-modules/chardet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch
+{ lib, buildPythonPackage, fetchPypi, fetchpatch
 , pytest, pytestrunner, hypothesis }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index 8a2c7488206..95bb9660d4c 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
+{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
 
 buildPythonPackage rec {
   pname = "check-manifest";
diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix
index ce70a2f459d..d34534e3eb8 100644
--- a/pkgs/development/python-modules/cjson/default.nix
+++ b/pkgs/development/python-modules/cjson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, isPyPy }:
 
 buildPythonPackage rec {
   pname = "python-cjson";
diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix
index dd72f5705e7..eaf89948e8f 100644
--- a/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -1,9 +1,8 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , click
 , ecdsa
 , hidapi
-, lib
 , fetchPypi
 , pytest
 , pyaes
diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix
index f4168d689d4..978d08051f7 100644
--- a/pkgs/development/python-modules/clf/default.nix
+++ b/pkgs/development/python-modules/clf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , docopt, requests, pygments }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix
index 4b7611c092e..e410a37fcb4 100644
--- a/pkgs/development/python-modules/cliapp/default.nix
+++ b/pkgs/development/python-modules/cliapp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 , sphinx
diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix
index 61a15428632..19fdac37615 100644
--- a/pkgs/development/python-modules/click-completion/default.nix
+++ b/pkgs/development/python-modules/click-completion/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k,
+{ lib, buildPythonPackage, fetchPypi, isPy3k,
   click, jinja2, shellingham, six
 }:
 
diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix
index 8d3c3ba3e24..c4574072b4c 100644
--- a/pkgs/development/python-modules/click-didyoumean/default.nix
+++ b/pkgs/development/python-modules/click-didyoumean/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
   click
 }:
 
diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix
index dbe4e33ca84..b17dc1a0c11 100644
--- a/pkgs/development/python-modules/click-help-colors/default.nix
+++ b/pkgs/development/python-modules/click-help-colors/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , click, pytest
 }:
 
diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix
index 4aa63dd4537..3145d4775e3 100644
--- a/pkgs/development/python-modules/click-log/default.nix
+++ b/pkgs/development/python-modules/click-log/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, click }:
+{ lib, buildPythonPackage, fetchPypi, click }:
 
 buildPythonPackage rec {
   pname = "click-log";
diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix
index c2b25341e17..31ae00a348d 100644
--- a/pkgs/development/python-modules/click-plugins/default.nix
+++ b/pkgs/development/python-modules/click-plugins/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
   click, pytest
 }:
 
diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix
index 23adb12da65..ee8773999ff 100644
--- a/pkgs/development/python-modules/click-repl/default.nix
+++ b/pkgs/development/python-modules/click-repl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }:
+{ lib, buildPythonPackage, fetchPypi, click, prompt_toolkit }:
 
 buildPythonPackage rec {
   pname = "click-repl";
diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix
index e211b955ac8..d829f43dc0d 100644
--- a/pkgs/development/python-modules/clickclick/default.nix
+++ b/pkgs/development/python-modules/clickclick/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }:
 
 buildPythonPackage rec {
   pname = "clickclick";
diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix
index f9d953d8536..b44f4e0ec17 100644
--- a/pkgs/development/python-modules/cligj/default.nix
+++ b/pkgs/development/python-modules/cligj/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , click, pytest, glibcLocales
 }:
 
diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix
index 133fc0de55c..66e2d5f52f3 100644
--- a/pkgs/development/python-modules/clint/default.nix
+++ b/pkgs/development/python-modules/clint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix
index c9c3f5c905c..1418db69a39 100644
--- a/pkgs/development/python-modules/clize/default.nix
+++ b/pkgs/development/python-modules/clize/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , dateutil
diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix
index 75f5ba0b449..18782fb50bb 100644
--- a/pkgs/development/python-modules/closure-linter/default.nix
+++ b/pkgs/development/python-modules/closure-linter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 , isPy3k
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index e5b4a63a564..f525b6e7f1d 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "cloudpickle";
diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix
index a0e744f9919..d247cecdfa6 100644
--- a/pkgs/development/python-modules/clustershell/default.nix
+++ b/pkgs/development/python-modules/clustershell/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh
+{ lib, buildPythonPackage, fetchPypi, pyyaml, openssh
 , nose, bc, hostname, coreutils, bash, gnused
 }:
 
diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix
index 4249ed7164b..71273ed1a22 100644
--- a/pkgs/development/python-modules/cmdline/default.nix
+++ b/pkgs/development/python-modules/cmdline/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }:
+{ lib, buildPythonPackage, fetchPypi, pyyaml }:
 
 buildPythonPackage rec {
   pname = "cmdline";
diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix
index 5bb4ef79a20..28d78203b6d 100644
--- a/pkgs/development/python-modules/cmdtest/default.nix
+++ b/pkgs/development/python-modules/cmdtest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , cliapp
diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index e95900d17b5..9cbf86ab1cf 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }:
+{ lib, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }:
 
 buildPythonPackage rec {
   pname = "cocotb";
diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix
index 019faeaebc3..c996c23d9ae 100644
--- a/pkgs/development/python-modules/cogapp/default.nix
+++ b/pkgs/development/python-modules/cogapp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cogapp";
diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix
index bc0b6af146a..b21ea193cbf 100644
--- a/pkgs/development/python-modules/coilmq/default.nix
+++ b/pkgs/development/python-modules/coilmq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , stompclient, python-daemon, redis, pid, pytest, six, click, coverage
 , sqlalchemy }:
 
diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix
index a5b29af1c31..a3fa33f327c 100644
--- a/pkgs/development/python-modules/colanderalchemy/default.nix
+++ b/pkgs/development/python-modules/colanderalchemy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , unittest2
diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix
index 6778c6acadb..1d472035b2f 100644
--- a/pkgs/development/python-modules/colorama/default.nix
+++ b/pkgs/development/python-modules/colorama/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "colorama";
diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index 303d244fff3..6198e4e1b28 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , param
diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix
index 08da356e222..50a052ec1f9 100644
--- a/pkgs/development/python-modules/colorclass/default.nix
+++ b/pkgs/development/python-modules/colorclass/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "colorclass";
diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix
index 5caa0cad2f6..502f31aa9b8 100644
--- a/pkgs/development/python-modules/colored/default.nix
+++ b/pkgs/development/python-modules/colored/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix
index 6a6ad9d4946..f7419666f53 100644
--- a/pkgs/development/python-modules/colour/default.nix
+++ b/pkgs/development/python-modules/colour/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, d2to1 }:
+{ lib, buildPythonPackage, fetchPypi, d2to1 }:
 
 buildPythonPackage rec {
   pname = "colour";
diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix
index d0988689275..746c5f35f25 100644
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/pkgs/development/python-modules/configobj/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage
+{ lib, buildPythonPackage
 , fetchFromGitHub
 , six
 , mock, pytest
diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix
index ba3700962bf..a41d077f22d 100644
--- a/pkgs/development/python-modules/configshell/default.nix
+++ b/pkgs/development/python-modules/configshell/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }:
+{ lib, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }:
 
 buildPythonPackage rec {
   pname = "configshell";
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index f3e8b1c943b..cd2ddf9da69 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
 
 buildPythonPackage rec {
   version = "1.5.0";
diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
index 189573699b9..e3a9c642f47 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 }:
 buildPythonPackage rec {
   pname = "constantly";
diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix
index 3978b14484a..a3b92ee7255 100644
--- a/pkgs/development/python-modules/consul/default.nix
+++ b/pkgs/development/python-modules/consul/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , requests, six, pytest }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix
index d8b74d4fedb..9937d4b4752 100644
--- a/pkgs/development/python-modules/contexter/default.nix
+++ b/pkgs/development/python-modules/contexter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "contexter";
diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
index f28923002f7..60eedd3ec17 100644
--- a/pkgs/development/python-modules/convertdate/default.nix
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }:
+{ lib, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }:
 
 buildPythonPackage rec {
   pname = "convertdate";
diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix
index f9a4fe98208..c5ee4d8617d 100644
--- a/pkgs/development/python-modules/cookiecutter/default.nix
+++ b/pkgs/development/python-modules/cookiecutter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy
+{ lib, buildPythonPackage, fetchPypi, isPyPy
 , pytest, pytestcov, pytest-mock, freezegun
 , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests
 , python-slugify }:
diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix
index 59d2214f758..a4e35dac346 100644
--- a/pkgs/development/python-modules/cookies/default.nix
+++ b/pkgs/development/python-modules/cookies/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cookies";
diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix
index 8ac69a45739..8b957fee4f6 100644
--- a/pkgs/development/python-modules/coreapi/default.nix
+++ b/pkgs/development/python-modules/coreapi/default.nix
@@ -1,5 +1,5 @@
 {
-  lib, stdenv,
+  lib,
   fetchFromGitHub,
   buildPythonPackage,
   django,
diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix
index 73167dea8a7..65bdee5a8da 100644
--- a/pkgs/development/python-modules/coreschema/default.nix
+++ b/pkgs/development/python-modules/coreschema/default.nix
@@ -1,5 +1,5 @@
 {
-  lib, stdenv,
+  lib,
   fetchFromGitHub,
   buildPythonPackage,
   jinja2,
diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
index 10c55920193..6c488a271e2 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyramid
diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix
index 44461a8ca9f..ce3b08fbc9f 100644
--- a/pkgs/development/python-modules/cov-core/default.nix
+++ b/pkgs/development/python-modules/cov-core/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, coverage }:
+{ lib, buildPythonPackage, fetchPypi, coverage }:
 
 buildPythonPackage rec {
   pname = "cov-core";
diff --git a/pkgs/development/python-modules/cppheaderparser/default.nix b/pkgs/development/python-modules/cppheaderparser/default.nix
index b51499de449..7602132c24a 100644
--- a/pkgs/development/python-modules/cppheaderparser/default.nix
+++ b/pkgs/development/python-modules/cppheaderparser/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage
 , fetchPypi
 , ply
-, lib, stdenv
+, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix
index 37e49210009..a37160a01ac 100644
--- a/pkgs/development/python-modules/crate/default.nix
+++ b/pkgs/development/python-modules/crate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , urllib3
diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix
index c93bf71687f..53caec66596 100644
--- a/pkgs/development/python-modules/crayons/default.nix
+++ b/pkgs/development/python-modules/crayons/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, colorama }:
+{ lib, fetchPypi, buildPythonPackage, colorama }:
 
 buildPythonPackage rec {
   pname = "crayons";
diff --git a/pkgs/development/python-modules/crc16/default.nix b/pkgs/development/python-modules/crc16/default.nix
index 1e3c9cbbf4f..ebf86a3571c 100644
--- a/pkgs/development/python-modules/crc16/default.nix
+++ b/pkgs/development/python-modules/crc16/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "crc16";
diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix
index 8dc03801285..1762d60dfde 100644
--- a/pkgs/development/python-modules/crccheck/default.nix
+++ b/pkgs/development/python-modules/crccheck/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , nose }:
 
 let
diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix
index 488b723d89f..082369baf73 100644
--- a/pkgs/development/python-modules/crcmod/default.nix
+++ b/pkgs/development/python-modules/crcmod/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "crcmod";
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index ca5e1fe334a..0267aee7610 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }:
+{ lib, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }:
 
 buildPythonPackage rec {
   pname = "credstash";
diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix
index dc97e96e4f5..dccfddaea1a 100644
--- a/pkgs/development/python-modules/cryptacular/default.nix
+++ b/pkgs/development/python-modules/cryptacular/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
+{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
 , coverage, nose, pbkdf2 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix
index a6f6f3c956a..929640a7c1e 100644
--- a/pkgs/development/python-modules/cssmin/default.nix
+++ b/pkgs/development/python-modules/cssmin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cssmin";
diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix
index fe13fa9582e..04b6dc36afa 100644
--- a/pkgs/development/python-modules/cssselect/default.nix
+++ b/pkgs/development/python-modules/cssselect/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cssselect";
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index ea3ac6236e9..a12fbf48c82 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, mock }:
+{ lib, buildPythonPackage, fetchPypi, mock }:
 
 buildPythonPackage rec {
   pname = "cssutils";
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 09685d392d6..23e6ef45b50 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage
+{ lib, buildPythonPackage
 , fetchPypi, isPy3k, linuxPackages
 , fastrlock, numpy, six, wheel, pytest, mock, setuptools
 , cudatoolkit, cudnn, nccl
diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix
index 4c4c7dbe231..62f1435df30 100644
--- a/pkgs/development/python-modules/curtsies/default.nix
+++ b/pkgs/development/python-modules/curtsies/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }:
 
 buildPythonPackage rec {
   pname = "curtsies";
diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix
index e42f4021a6f..7698b5d6571 100644
--- a/pkgs/development/python-modules/curve25519-donna/default.nix
+++ b/pkgs/development/python-modules/curve25519-donna/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "curve25519-donna";
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index bafa75072f7..9270effcaa9 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 14a585617c6..1c3ee689299 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }:
+{ lib, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }:
 
 buildPythonPackage rec {
   pname = "cx_Freeze";
diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index 89946964544..c81443e0990 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, odpic }:
+{ lib, buildPythonPackage, fetchPypi, odpic }:
 
 buildPythonPackage rec {
   pname = "cx_Oracle";
diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
index d805ba5de1f..c2de6d82a5b 100644
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , cython
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index 8a0adb3d6c9..a7115d1e940 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , python
 , fetchPypi
diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix
index 30d4f1bd714..26f23b7156d 100644
--- a/pkgs/development/python-modules/daemonize/default.nix
+++ b/pkgs/development/python-modules/daemonize/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix
index 6484d84253b..c46337981bd 100644
--- a/pkgs/development/python-modules/darcsver/default.nix
+++ b/pkgs/development/python-modules/darcsver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, mock }:
 
 buildPythonPackage rec {
   pname = "darcsver";
diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix
index 1db03b66ffb..86bc2da1565 100644
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cloudpickle
diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix
index eac503c2f85..a3cc7b6afda 100644
--- a/pkgs/development/python-modules/dask-image/default.nix
+++ b/pkgs/development/python-modules/dask-image/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index be27399b71f..f4f5c03858a 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , dask
diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
index 4d3aa8e79a0..4836fe35d18 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix
index f2d8737b38e..1bec4c82872 100644
--- a/pkgs/development/python-modules/dask-mpi/default.nix
+++ b/pkgs/development/python-modules/dask-mpi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , dask
diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix
index c60f628d72e..4e64b8c9f0c 100644
--- a/pkgs/development/python-modules/dask-xgboost/default.nix
+++ b/pkgs/development/python-modules/dask-xgboost/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , xgboost
diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
index 30001b781d2..483c565536d 100644
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , click
 , requests
 , tabulate
diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix
index a88995937d8..c276e9d000b 100644
--- a/pkgs/development/python-modules/dataclasses/default.nix
+++ b/pkgs/development/python-modules/dataclasses/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+{ lib, buildPythonPackage, fetchPypi, isPy36 }:
 
 buildPythonPackage rec {
   pname = "dataclasses";
diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix
index 68046235227..4124457586c 100644
--- a/pkgs/development/python-modules/datadiff/default.nix
+++ b/pkgs/development/python-modules/datadiff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix
index f3eab1d1d4e..551b1096222 100644
--- a/pkgs/development/python-modules/datamodeldict/default.nix
+++ b/pkgs/development/python-modules/datamodeldict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , xmltodict
diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
index a6aca68ef29..dcad0c3698a 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }:
+{ lib, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }:
 buildPythonPackage rec {
   pname = "python-dateutil";
   version = "2.8.1";
diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix
index c7f74730c16..d8bbc96fcc4 100644
--- a/pkgs/development/python-modules/datrie/default.nix
+++ b/pkgs/development/python-modules/datrie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch
+{ lib, buildPythonPackage, fetchPypi, fetchpatch
 , cython, pytest, pytestrunner, hypothesis }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index b9c264a2015..18560734bd8 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }:
+{ lib, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }:
 
 buildPythonPackage rec {
     pname = "dbf";
diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix
index 9f78f3fdde1..1708a75fc10 100644
--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
     pname = "dbfread";
diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix
index 76385ac8023..d7cf79f9d07 100644
--- a/pkgs/development/python-modules/dbus-next/default.nix
+++ b/pkgs/development/python-modules/dbus-next/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , python
diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix
index 42ae779e0d2..848e5038af8 100644
--- a/pkgs/development/python-modules/dbutils/default.nix
+++ b/pkgs/development/python-modules/dbutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }:
 
 buildPythonPackage rec {
   version = "2.0";
diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix
index a6669d0e30d..ee554a6e2bd 100644
--- a/pkgs/development/python-modules/dcmstack/default.nix
+++ b/pkgs/development/python-modules/dcmstack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pythonAtLeast
diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix
index 21dc9d3832c..f260727b87a 100644
--- a/pkgs/development/python-modules/deap/default.nix
+++ b/pkgs/development/python-modules/deap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }:
+{ lib, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }:
 
 buildPythonPackage rec {
   pname = "deap";
diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix
index a271371e22f..4426fe65bf5 100644
--- a/pkgs/development/python-modules/deluge-client/default.nix
+++ b/pkgs/development/python-modules/deluge-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "deluge-client";
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index fc70562938e..25e2692af3b 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, python, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "demjson";
diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 0c2e2055ff9..979d2811fe6 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }:
 
 let
   testPath =
diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix
index a64ed0b9d99..589335f8258 100644
--- a/pkgs/development/python-modules/deprecated/default.nix
+++ b/pkgs/development/python-modules/deprecated/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage,
+{ lib, fetchPypi, buildPythonPackage,
   wrapt, pytest, tox }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix
index f9b8f5dec7c..cc7b6870ad8 100644
--- a/pkgs/development/python-modules/derpconf/default.nix
+++ b/pkgs/development/python-modules/derpconf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "derpconf";
diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix
index 5280ff2417a..b10526ff0fd 100644
--- a/pkgs/development/python-modules/descartes/default.nix
+++ b/pkgs/development/python-modules/descartes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
   matplotlib, shapely
 }:
 
diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix
index 01918445b34..43d5a955027 100644
--- a/pkgs/development/python-modules/deskcon/default.nix
+++ b/pkgs/development/python-modules/deskcon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , pyopenssl
 , pkgs
diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix
index 9672cca46b0..03b1f4fa28e 100644
--- a/pkgs/development/python-modules/diff_cover/default.nix
+++ b/pkgs/development/python-modules/diff_cover/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , inflect
 , jinja2
 , jinja2_pluralize
diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix
index ad653c6313c..d5f1445a677 100644
--- a/pkgs/development/python-modules/digi-xbee/default.nix
+++ b/pkgs/development/python-modules/digi-xbee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }:
+{ buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }:
 
 buildPythonPackage rec {
   pname = "digi-xbee";
diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix
index 5e3ac1e1fcd..e522ac4b6c9 100644
--- a/pkgs/development/python-modules/discogs_client/default.nix
+++ b/pkgs/development/python-modules/discogs_client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }:
+{ lib, buildPythonPackage, fetchPypi, requests, oauthlib }:
 
 buildPythonPackage rec {
   pname = "discogs-client";
diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix
index 403834a3731..12e05b58c4c 100644
--- a/pkgs/development/python-modules/distlib/default.nix
+++ b/pkgs/development/python-modules/distlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "distlib";
diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix
index e9b8e66d4c9..d798414c197 100644
--- a/pkgs/development/python-modules/distorm3/default.nix
+++ b/pkgs/development/python-modules/distorm3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "distorm3";
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index 81bcccd8bd6..16d26e741aa 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "distro";
diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix
index 882a3995799..c2fbcdfe46c 100644
--- a/pkgs/development/python-modules/distutils_extra/default.nix
+++ b/pkgs/development/python-modules/distutils_extra/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 }:
diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix
index f8dd9dca202..0cabbef1d15 100644
--- a/pkgs/development/python-modules/dj-email-url/default.nix
+++ b/pkgs/development/python-modules/dj-email-url/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix
index 321bec8149d..b216c8e62a1 100644
--- a/pkgs/development/python-modules/dj-search-url/default.nix
+++ b/pkgs/development/python-modules/dj-search-url/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index fafd7ab9a63..143e76cf0d8 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
+{ lib, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
 , django, python3-openid, mock, coverage }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix
index 892cf179c37..96d5aa7fd9d 100644
--- a/pkgs/development/python-modules/django-anymail/default.nix
+++ b/pkgs/development/python-modules/django-anymail/default.nix
@@ -1,5 +1,5 @@
 {
-    lib, stdenv,
+    lib,
     buildPythonPackage,
     fetchFromGitHub,
     six,
diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix
index d0dacd659a1..2271be1d16f 100644
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi, isPy27
 , ldap , django
diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix
index 103bfb29578..6487e276232 100644
--- a/pkgs/development/python-modules/django-cache-url/default.nix
+++ b/pkgs/development/python-modules/django-cache-url/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix
index 39f65275fee..83dbbc5d197 100644
--- a/pkgs/development/python-modules/django-cleanup/default.nix
+++ b/pkgs/development/python-modules/django-cleanup/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, django
+{ lib, buildPythonPackage, fetchPypi, django
 , redis, async-timeout, hiredis
 }:
 
diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index ef18bfe77ec..d33a4be2817 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/pkgs/development/python-modules/django-compat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python,
+{ lib, buildPythonPackage, fetchFromGitHub, python,
   django, six
 }:
 
diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix
index bf1835071f8..b6b736e9238 100644
--- a/pkgs/development/python-modules/django-configurations/default.nix
+++ b/pkgs/development/python-modules/django-configurations/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django-discover-runner
diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix
index d87e39b8e3f..1f7b2811405 100644
--- a/pkgs/development/python-modules/django-csp/default.nix
+++ b/pkgs/development/python-modules/django-csp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, django }:
+{ lib, fetchPypi, buildPythonPackage, django }:
 
 buildPythonPackage rec {
   pname = "django-csp";
diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix
index 63d51d41fc9..8d07148ce18 100644
--- a/pkgs/development/python-modules/django-discover-runner/default.nix
+++ b/pkgs/development/python-modules/django-discover-runner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix
index 7288896c4fe..7e5105807cf 100644
--- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix
+++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , django, persisting-theory, six
 }:
 
diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix
index e4ca546bbc2..00c260946cc 100644
--- a/pkgs/development/python-modules/django-filter/default.nix
+++ b/pkgs/development/python-modules/django-filter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix
index 08312606603..458723601dd 100644
--- a/pkgs/development/python-modules/django-gravatar2/default.nix
+++ b/pkgs/development/python-modules/django-gravatar2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "django-gravatar2";
diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix
index 54056547f48..ee5a47d3787 100644
--- a/pkgs/development/python-modules/django-hijack-admin/default.nix
+++ b/pkgs/development/python-modules/django-hijack-admin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python,
+{ lib, buildPythonPackage, fetchFromGitHub, python,
   django_hijack, django_nose }:
 buildPythonPackage rec {
   pname = "django-hijack-admin";
diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index bd6f870de66..fd9c30a4bc7 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python,
+{ lib, buildPythonPackage, fetchFromGitHub, python,
   django, django_compat, django_nose
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix
index 59e9782f050..7bba272c155 100644
--- a/pkgs/development/python-modules/django-logentry-admin/default.nix
+++ b/pkgs/development/python-modules/django-logentry-admin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }:
+{ lib, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }:
 
 buildPythonPackage rec {
   pname = "django-logentry-admin";
diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index 40063c89e43..11939b9b773 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor
+{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor
 , django-allauth, mailmanclient, django, mock
 }:
 
diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix
index c599e28d206..b4d90da0880 100644
--- a/pkgs/development/python-modules/django-maintenance-mode/default.nix
+++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }:
+{ lib, fetchFromGitHub, buildPythonPackage, pytest, django }:
 
 buildPythonPackage rec {
   pname = "django-maintenance-mode";
diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 6e16af5bc8f..e7cb4814cb4 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , django, requests, oauthlib
 }:
 
diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix
index 4fed9bf470b..8790067e4af 100644
--- a/pkgs/development/python-modules/django-paintstore/default.nix
+++ b/pkgs/development/python-modules/django-paintstore/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib
+{ lib, buildPythonPackage, fetchPypi, requests, requests_oauthlib
 , django, python3-openid }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index b3b71231b75..4b8d79a2917 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }:
+{ lib, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }:
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index f2bd574919a..141a46f5315 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , django
 , netaddr
diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix
index 2eb3b19f554..16b1e0bcc59 100644
--- a/pkgs/development/python-modules/django-q/default.nix
+++ b/pkgs/development/python-modules/django-q/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow
+{ lib, buildPythonPackage, fetchPypi, django-picklefield, arrow
 , blessed, django, future }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/django-ranged-response/default.nix b/pkgs/development/python-modules/django-ranged-response/default.nix
index d517563590f..df5fc4b205b 100644
--- a/pkgs/development/python-modules/django-ranged-response/default.nix
+++ b/pkgs/development/python-modules/django-ranged-response/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, django }:
+{ lib, fetchurl, fetchPypi, buildPythonPackage, django }:
 
 buildPythonPackage rec {
   pname = "django-ranged-response";
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 173452ebe48..609388a311c 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k,
+{ lib, buildPythonPackage, fetchPypi, isPy3k,
   numpy, django_colorful, pillow, psycopg2,
   pyparsing, django, celery, boto3, importlib-metadata
 }:
diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix
index 869c3bf74ee..6efba78d4ca 100644
--- a/pkgs/development/python-modules/django-storages/default.nix
+++ b/pkgs/development/python-modules/django-storages/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , django
 }:
 
diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix
index 39912f47420..4307fc69d45 100644
--- a/pkgs/development/python-modules/django-versatileimagefield/default.nix
+++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix
index e3e094ab706..3e849b48773 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/pkgs/development/python-modules/django-webpack-loader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "django-webpack-loader";
diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix
index 8529df09bb7..853e12327d3 100644
--- a/pkgs/development/python-modules/django-widget-tweaks/default.nix
+++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchFromGitHub, python, lib, stdenv, django }:
+{ buildPythonPackage, fetchFromGitHub, python, lib, django }:
 
 buildPythonPackage rec {
   pname = "django-widget-tweaks";
diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix
index c9c9913d764..5da9ed0ca26 100644
--- a/pkgs/development/python-modules/django_appconf/default.nix
+++ b/pkgs/development/python-modules/django_appconf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }:
+{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }:
 buildPythonPackage rec {
   pname = "django-appconf";
   version = "1.0.3";
diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix
index e0a297e53c0..2ef8639c17e 100644
--- a/pkgs/development/python-modules/django_classytags/default.nix
+++ b/pkgs/development/python-modules/django_classytags/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django_colorful/default.nix
index 468327139e6..5de127a9722 100644
--- a/pkgs/development/python-modules/django_colorful/default.nix
+++ b/pkgs/development/python-modules/django_colorful/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix
index f0080436489..edf5faa5af4 100644
--- a/pkgs/development/python-modules/django_compressor/default.nix
+++ b/pkgs/development/python-modules/django_compressor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
   rcssmin, rjsmin, django_appconf }:
 buildPythonPackage rec {
     pname = "django_compressor";
diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix
index a8872967df4..a452db3cf28 100644
--- a/pkgs/development/python-modules/django_contrib_comments/default.nix
+++ b/pkgs/development/python-modules/django_contrib_comments/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix
index fa2618fa1a7..3f01a2b294a 100644
--- a/pkgs/development/python-modules/django_environ/default.nix
+++ b/pkgs/development/python-modules/django_environ/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix
index dba92efb2d9..816442d6e2a 100644
--- a/pkgs/development/python-modules/django_evolution/default.nix
+++ b/pkgs/development/python-modules/django_evolution/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix
index 60023660ea5..957944f01d3 100644
--- a/pkgs/development/python-modules/django_guardian/default.nix
+++ b/pkgs/development/python-modules/django_guardian/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , django_environ, mock, django
 , pytest, pytestrunner, pytest-django
 }:
diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix
index 500fe2e2fbc..fdd4bd03b70 100644
--- a/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytz
diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix
index 7f2f9efcfc5..2506f6aba44 100644
--- a/pkgs/development/python-modules/django_nose/default.nix
+++ b/pkgs/development/python-modules/django_nose/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix
index 434dea7f0f2..56e4e845f08 100644
--- a/pkgs/development/python-modules/django_redis/default.nix
+++ b/pkgs/development/python-modules/django_redis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage,
+{ lib, fetchPypi, buildPythonPackage,
   mock, django, redis, msgpack }:
 buildPythonPackage rec {
   pname = "django-redis";
diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix
index 16574770ff9..3f038b4fd06 100644
--- a/pkgs/development/python-modules/django_reversion/default.nix
+++ b/pkgs/development/python-modules/django_reversion/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix
index 66475b35d2a..90ba6cf2924 100644
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , python
 , fetchFromGitHub
diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix
index e715dde7c41..b51f0421fd9 100644
--- a/pkgs/development/python-modules/django_taggit/default.nix
+++ b/pkgs/development/python-modules/django_taggit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , python
 , fetchPypi
diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix
index e734a5f7ae8..88536b210d2 100644
--- a/pkgs/development/python-modules/django_treebeard/default.nix
+++ b/pkgs/development/python-modules/django_treebeard/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index ce92fab3e96..66a57625b4a 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, django, isPy27 }:
+{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }:
 
 buildPythonPackage rec {
   version = "3.12.2";
diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix
index e7a80d91d24..aaaf5708a59 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/pkgs/development/python-modules/dkimpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, openssl, buildPythonPackage
+{ lib, fetchPypi, openssl, buildPythonPackage
 , pytest, dnspython, pynacl, authres, python }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix
index 543f4994020..c022d62bfa8 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "docker-pycreds";
diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix
index 74e363d18b9..45fe856f6f0 100644
--- a/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/pkgs/development/python-modules/dockerfile-parse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
+{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
 
 buildPythonPackage rec {
   version = "1.1.0";
diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix
index b6267b87c1b..775767e6fec 100644
--- a/pkgs/development/python-modules/dockerpty/default.nix
+++ b/pkgs/development/python-modules/dockerpty/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "dockerpty";
diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix
index 2dc4bb38cf1..68df40a3cbf 100644
--- a/pkgs/development/python-modules/docopt/default.nix
+++ b/pkgs/development/python-modules/docopt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "docopt";
diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
index 12d15799ecc..533dbed29b3 100644
--- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
+++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "doctest-ignore-unicode";
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index 5dba1b91bc1..92fae14f4ea 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix
index f6eabc378b3..8ef37282250 100644
--- a/pkgs/development/python-modules/dogpile.core/default.nix
+++ b/pkgs/development/python-modules/dogpile.core/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "dogpile.core";
diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix
index 2626f420676..2154f33bb8b 100644
--- a/pkgs/development/python-modules/dot2tex/default.nix
+++ b/pkgs/development/python-modules/dot2tex/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python
 , buildPythonPackage
 , fetchPypi
diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix
index 505bd7bb456..9db726a12a1 100644
--- a/pkgs/development/python-modules/dpath/default.nix
+++ b/pkgs/development/python-modules/dpath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27
+{ lib, fetchPypi, buildPythonPackage, isPy27
 , mock, pytestCheckHook, nose, hypothesis
 }:
 
diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix
index 177b260e804..52f4f42661d 100644
--- a/pkgs/development/python-modules/dpkt/default.nix
+++ b/pkgs/development/python-modules/dpkt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "dpkt";
diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix
index dd92d51d6c6..d69ece809bb 100644
--- a/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/pkgs/development/python-modules/drf-yasg/default.nix
@@ -1,5 +1,5 @@
 {
-  lib, stdenv,
+  lib,
   buildPythonPackage,
   fetchPypi,
   inflection,
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 22e66d0a4a4..ca0283b2cbd 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytestrunner, requests, urllib3, mock, setuptools }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix
index 84631c21708..a5d4675f993 100644
--- a/pkgs/development/python-modules/dtopt/default.nix
+++ b/pkgs/development/python-modules/dtopt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index d8435afa3f9..f5e9fa6195a 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix
index b5fa28f2de6..7cddb324f3a 100644
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock
+{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock
 , pytest_xdist, covCore, glibcLocales }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix
index f23d19510ee..9323255cc27 100644
--- a/pkgs/development/python-modules/dynd/default.nix
+++ b/pkgs/development/python-modules/dynd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPyPy
 , isPy3k
diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix
index 441d839d36f..322e6461e5d 100644
--- a/pkgs/development/python-modules/easygui/default.nix
+++ b/pkgs/development/python-modules/easygui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "easygui";
diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix
index fc86edf5d4d..c98a8b572d4 100644
--- a/pkgs/development/python-modules/easyprocess/default.nix
+++ b/pkgs/development/python-modules/easyprocess/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "EasyProcess";
diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix
index d5c69d4c7e9..11b13d8325a 100644
--- a/pkgs/development/python-modules/easysnmp/default.nix
+++ b/pkgs/development/python-modules/easysnmp/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , pythonAtLeast
 , fetchFromGitHub
diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
index 2a17f84bb3b..3c892185687 100644
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
index 183d7cc3ca5..47692075d3b 100644
--- a/pkgs/development/python-modules/ed25519/default.nix
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "ed25519";
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix
index 727c3003db5..4329db98c2b 100644
--- a/pkgs/development/python-modules/editorconfig/default.nix
+++ b/pkgs/development/python-modules/editorconfig/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 , cmake
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index c1171043356..ac2d5023cc9 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
+{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
 , Keras, numpy, scipy, six, tensorflow }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix
index ae339368ff5..02c2c644449 100644
--- a/pkgs/development/python-modules/eggdeps/default.nix
+++ b/pkgs/development/python-modules/eggdeps/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_interface
diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index 67e277b57ac..a2f2ff038db 100644
--- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix
index 4929d1f51a4..9161525c2bc 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@@ -2,7 +2,7 @@
 , fetchPypi
 , urllib3, requests
 , nosexcover, mock
-, lib, stdenv
+, lib
 }:
 
 buildPythonPackage (rec {
diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix
index 472834c5c72..152561b69ce 100644
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix
index 12974a9422d..a4f2bece349 100644
--- a/pkgs/development/python-modules/emcee/default.nix
+++ b/pkgs/development/python-modules/emcee/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , numpy }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix
index 26d40d8d205..f68729a42b6 100644
--- a/pkgs/development/python-modules/emv/default.nix
+++ b/pkgs/development/python-modules/emv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , click, enum-compat, pyscard, pycountry, terminaltables
 , pytestCheckHook, pythonOlder
 }:
diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix
index ad266623c78..db827601d5d 100644
--- a/pkgs/development/python-modules/enum/default.nix
+++ b/pkgs/development/python-modules/enum/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix
index 5e26853098f..91f54dc99cb 100644
--- a/pkgs/development/python-modules/enum34/default.nix
+++ b/pkgs/development/python-modules/enum34/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix
index d7459543163..3950afa578e 100644
--- a/pkgs/development/python-modules/epc/default.nix
+++ b/pkgs/development/python-modules/epc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , sexpdata
diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix
index 4d6e5940926..c0d77c29748 100644
--- a/pkgs/development/python-modules/ephem/default.nix
+++ b/pkgs/development/python-modules/ephem/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , glibcLocales, pytest }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix
index 5ba9490d945..e407ca35e89 100644
--- a/pkgs/development/python-modules/et_xmlfile/default.nix
+++ b/pkgs/development/python-modules/et_xmlfile/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , lxml
diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix
index 338992259a1..0c2fd0c2952 100644
--- a/pkgs/development/python-modules/etcd/default.nix
+++ b/pkgs/development/python-modules/etcd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , simplejson
diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index b931db188e3..4d5c6173cd7 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , flask
diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix
index 1b2b44d65f7..4d4bff85842 100644
--- a/pkgs/development/python-modules/eventlib/default.nix
+++ b/pkgs/development/python-modules/eventlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchdarcs
diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix
index 70c7fad963a..8c6e4b6c7c2 100644
--- a/pkgs/development/python-modules/evernote/default.nix
+++ b/pkgs/development/python-modules/evernote/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
index e380ca613cf..706e4d8137f 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage,
+{ lib, fetchFromGitHub, buildPythonPackage,
   pythonOlder,
   lxml, tzlocal, python-dateutil, pygments, requests-kerberos,
   defusedxml, cached-property, isodate, requests_ntlm, dnspython,
diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 0a22ab4b051..ec4bcca9f86 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , isPyPy
 , fetchPypi
diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix
index e86a681a8e3..e26f616f8db 100644
--- a/pkgs/development/python-modules/exifread/default.nix
+++ b/pkgs/development/python-modules/exifread/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix
index 08faf5c2ba8..3dfd810f99c 100644
--- a/pkgs/development/python-modules/eyed3/default.nix
+++ b/pkgs/development/python-modules/eyed3/default.nix
@@ -1,11 +1,10 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
 , python
 , isPyPy
 , six
-, lib
 , filetype
 , deprecation
 , dataclasses
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 6dfefe09204..3fd30062b0d 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
+{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
 
 buildPythonPackage rec {
   version = "0.12";
diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix
index 89e7156fa52..db1810ca056 100644
--- a/pkgs/development/python-modules/face/default.nix
+++ b/pkgs/development/python-modules/face/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, boltons, pytest }:
+{ lib, buildPythonPackage, fetchPypi, boltons, pytest }:
 
 buildPythonPackage rec {
   pname = "face";
diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix
index 1896bdfac59..6b2c6411aa1 100644
--- a/pkgs/development/python-modules/face_recognition/default.nix
+++ b/pkgs/development/python-modules/face_recognition/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy
-, face_recognition_models, lib, stdenv, flake8, pytest, glibcLocales
+, face_recognition_models, lib, flake8, pytest, glibcLocales
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix
index d5838438b7d..6ec2634029b 100644
--- a/pkgs/development/python-modules/face_recognition_models/default.nix
+++ b/pkgs/development/python-modules/face_recognition_models/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, lib, stdenv, fetchPypi, setuptools }:
+{ buildPythonPackage, lib, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "face_recognition_models";
diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix
index be26ab98af6..9b207a81c3c 100644
--- a/pkgs/development/python-modules/fake-useragent/default.nix
+++ b/pkgs/development/python-modules/fake-useragent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, six, pytest }:
+{ lib, fetchPypi, buildPythonPackage, six, pytest }:
 
 buildPythonPackage rec {
   pname = "fake-useragent";
diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix
index 82af8d04e07..2e561a163ab 100644
--- a/pkgs/development/python-modules/fake_factory/default.nix
+++ b/pkgs/development/python-modules/fake_factory/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix
index 8d1aa02026c..eb6cbfa242e 100644
--- a/pkgs/development/python-modules/falcon/default.nix
+++ b/pkgs/development/python-modules/falcon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , coverage
diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix
index 57ad69c0be4..55b9d3b3023 100644
--- a/pkgs/development/python-modules/fasteners/default.nix
+++ b/pkgs/development/python-modules/fasteners/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix
index eb86784ddc7..7671feb359f 100644
--- a/pkgs/development/python-modules/fastentrypoints/default.nix
+++ b/pkgs/development/python-modules/fastentrypoints/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "fastentrypoints";
diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix
index 55aad9d71ea..383a0e4fbd5 100644
--- a/pkgs/development/python-modules/fastimport/default.nix
+++ b/pkgs/development/python-modules/fastimport/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, python, fetchPypi}:
+{ lib, buildPythonPackage, python, fetchPypi}:
 
 buildPythonPackage rec {
   pname = "fastimport";
diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix
index 82964070d03..9a3f8c53b1d 100644
--- a/pkgs/development/python-modules/fastpair/default.nix
+++ b/pkgs/development/python-modules/fastpair/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }:
 
 buildPythonPackage {
   pname = "fastpair";
diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix
index e033dc42d45..e154471d7a8 100644
--- a/pkgs/development/python-modules/fastpbkdf2/default.nix
+++ b/pkgs/development/python-modules/fastpbkdf2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage
+{ lib, fetchFromGitHub, buildPythonPackage
 , openssl, pytest, cffi, six }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix
index 25cc2b8792f..9b43c05989f 100644
--- a/pkgs/development/python-modules/fastprogress/default.nix
+++ b/pkgs/development/python-modules/fastprogress/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix
index 7aedbbdd8f7..0821778d024 100644
--- a/pkgs/development/python-modules/fastrlock/default.nix
+++ b/pkgs/development/python-modules/fastrlock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "fastrlock";
diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix
index bf3bd987564..f3bddec76bd 100644
--- a/pkgs/development/python-modules/fasttext/default.nix
+++ b/pkgs/development/python-modules/fasttext/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }:
+{lib, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }:
 
 buildPythonPackage rec {
   inherit (pkgs.fasttext) pname version src;
diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix
index 4de0d18ca8b..413416c99a2 100644
--- a/pkgs/development/python-modules/fdint/default.nix
+++ b/pkgs/development/python-modules/fdint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cython
diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix
index 509ffaed9d7..59ca95a0338 100644
--- a/pkgs/development/python-modules/feedgen/default.nix
+++ b/pkgs/development/python-modules/feedgen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }:
+{ lib, buildPythonPackage, fetchPypi, dateutil, lxml }:
 
 buildPythonPackage rec {
   pname = "feedgen";
diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
index 8508cc637f2..d5eb1306b39 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }:
+{ lib, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }:
 
 buildPythonPackage rec {
   pname = "feedgenerator";
diff --git a/pkgs/development/python-modules/feedparser/5.nix b/pkgs/development/python-modules/feedparser/5.nix
index a79048c5525..58cdad9884e 100644
--- a/pkgs/development/python-modules/feedparser/5.nix
+++ b/pkgs/development/python-modules/feedparser/5.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix
index 7b48fe6f73e..38e9761952d 100644
--- a/pkgs/development/python-modules/feedparser/default.nix
+++ b/pkgs/development/python-modules/feedparser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix
index df132211d4f..0cc1eae5ac2 100644
--- a/pkgs/development/python-modules/filebrowser_safe/default.nix
+++ b/pkgs/development/python-modules/filebrowser_safe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix
index bfac6a0e6b2..5b6d6284ced 100644
--- a/pkgs/development/python-modules/filebytes/default.nix
+++ b/pkgs/development/python-modules/filebytes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 77ddec306fc..97073bb6b03 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "filelock";
diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix
index 53059ce43d0..9740117b9b9 100644
--- a/pkgs/development/python-modules/filterpy/default.nix
+++ b/pkgs/development/python-modules/filterpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix
index 8e02dac5850..c4dfc04046b 100644
--- a/pkgs/development/python-modules/fints/default.nix
+++ b/pkgs/development/python-modules/fints/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , bleach
 , mt-940
 , pytest
diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix
index 6a2cc594360..54f22032c6a 100644
--- a/pkgs/development/python-modules/fire/default.nix
+++ b/pkgs/development/python-modules/fire/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock
 , python-Levenshtein, pytest, termcolor, isPy27, enum34 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix
index a5bdf847eff..491fcd39805 100644
--- a/pkgs/development/python-modules/first/default.nix
+++ b/pkgs/development/python-modules/first/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "first";
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index 9e53ed28ff3..6f1d8181a58 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , mock, pytest, pytestrunner
 , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata
 }:
diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix
index 02b0641a34e..fe068211dfb 100644
--- a/pkgs/development/python-modules/flaky/default.nix
+++ b/pkgs/development/python-modules/flaky/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mock
diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix
index da6176e6781..602564d1626 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/pkgs/development/python-modules/flask-babel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , python
 , fetchPypi
diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix
index 7dbf507f220..cba8e9e8efd 100644
--- a/pkgs/development/python-modules/flask-common/default.nix
+++ b/pkgs/development/python-modules/flask-common/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix
index 9491ca8be77..1e133df2b2b 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/pkgs/development/python-modules/flask-compress/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, flask
+{ lib, fetchPypi, buildPythonPackage, flask
 , brotli
 }:
 
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index 731e8b106ab..25c054b231b 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , nose, flask, six, packaging }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/pkgs/development/python-modules/flask-elastic/default.nix
index 6986cd75be6..3a9daa577d4 100644
--- a/pkgs/development/python-modules/flask-elastic/default.nix
+++ b/pkgs/development/python-modules/flask-elastic/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , flask, elasticsearch }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix
index cf8a70b0533..580cd1f89f7 100644
--- a/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }:
+{ lib, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }:
 
 buildPythonPackage rec {
   pname = "Flask-JWT-Extended";
diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
index 1673ca24e6e..08aa2efb8f2 100644
--- a/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ b/pkgs/development/python-modules/flask-ldap-login/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
+{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
 , flask, flask_wtf, flask_testing, ldap
 , mock, nose }:
 
diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix
index 38d42da1c8a..d22096f9149 100644
--- a/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/pkgs/development/python-modules/flask-limiter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, flask, limits }:
+{ lib, fetchPypi, buildPythonPackage, flask, limits }:
 
 buildPythonPackage rec {
   pname = "Flask-Limiter";
diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix
index 919e353eb8e..9d54849e92d 100644
--- a/pkgs/development/python-modules/flask-login/default.nix
+++ b/pkgs/development/python-modules/flask-login/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
+{ lib, buildPythonPackage, fetchPypi, pythonAtLeast
 , flask, blinker, nose, mock, semantic-version }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
index 550f6520e7d..18e48329288 100644
--- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
+++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy3k
diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix
index 92d2f90848c..f6b6fd81528 100644
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/pkgs/development/python-modules/flask-silk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , flask
diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index 16b8c9c7fc7..1bac82fb44f 100644
--- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }:
+{ lib, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }:
 
 buildPythonPackage rec {
   pname = "Flask-SQLAlchemy";
diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix
index 79650e7c175..d238ba5acb7 100644
--- a/pkgs/development/python-modules/flask-swagger-ui/default.nix
+++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, flask }:
+{ lib, buildPythonPackage, fetchPypi, flask }:
 
 buildPythonPackage rec {
   pname = "flask-swagger-ui";
diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix
index 20624c31862..66c45b85522 100644
--- a/pkgs/development/python-modules/flask-swagger/default.nix
+++ b/pkgs/development/python-modules/flask-swagger/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , flask, pyyaml }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix
index 15e7b2c1875..e30abdb7cb4 100644
--- a/pkgs/development/python-modules/flask-versioned/default.nix
+++ b/pkgs/development/python-modules/flask-versioned/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flask }:
+{ lib, buildPythonPackage, fetchFromGitHub, flask }:
 
 buildPythonPackage rec {
   pname = "Flask-Versioned";
diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix
index eadc7842a01..00af0ce61e9 100644
--- a/pkgs/development/python-modules/flask-wtf/default.nix
+++ b/pkgs/development/python-modules/flask-wtf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }:
+{ lib, fetchPypi, buildPythonPackage, flask, wtforms, nose }:
 
 buildPythonPackage rec {
   pname = "Flask-WTF";
diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index d121b4e32c8..27f436c3c53 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , itsdangerous, click, werkzeug, jinja2, pytest }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix
index eef31359f50..d15950bba9a 100644
--- a/pkgs/development/python-modules/flaskbabel/default.nix
+++ b/pkgs/development/python-modules/flaskbabel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , flask
diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix
index 1a6591040a2..9fd36fab294 100644
--- a/pkgs/development/python-modules/flowlogs_reader/default.nix
+++ b/pkgs/development/python-modules/flowlogs_reader/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix
index 52ac5da27aa..fa19d9bdf7a 100644
--- a/pkgs/development/python-modules/flup/default.nix
+++ b/pkgs/development/python-modules/flup/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchPypi
diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index ddec811e21c..64eafed6c19 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , aiohttp, zigpy
 , pytest, isPy27 }:
 
diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix
index 396bef6d009..e0d38a5a131 100644
--- a/pkgs/development/python-modules/foolscap/default.nix
+++ b/pkgs/development/python-modules/foolscap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mock
diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix
index 64713d96ade..1bb3b17e9df 100644
--- a/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix
index d60c1e89900..072129e6ea5 100644
--- a/pkgs/development/python-modules/foxdot/default.nix
+++ b/pkgs/development/python-modules/foxdot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }:
+{ lib, buildPythonPackage, fetchPypi, tkinter, supercollider }:
 
 buildPythonPackage rec {
   pname = "FoxDot";
diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix
index 9dc88596f26..09ce8bbd11b 100644
--- a/pkgs/development/python-modules/freezegun/0.3.nix
+++ b/pkgs/development/python-modules/freezegun/0.3.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix
index f1b1d9738d7..4c5a87e8266 100644
--- a/pkgs/development/python-modules/freezegun/default.nix
+++ b/pkgs/development/python-modules/freezegun/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix
index 571fba1a8ac..b8312d1c8ec 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/pkgs/development/python-modules/fritzconnection/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }:
+{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }:
 
 buildPythonPackage rec {
   pname = "fritzconnection";
diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix
index dd0c9929826..e172f3815b7 100644
--- a/pkgs/development/python-modules/frozendict/default.nix
+++ b/pkgs/development/python-modules/frozendict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "frozendict";
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index 63342c7045d..dbc36317228 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchPypi
diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix
index 3f53b66d1ef..ba97b2e8f47 100644
--- a/pkgs/development/python-modules/fudge/default.nix
+++ b/pkgs/development/python-modules/fudge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix
index 773ed1dccd6..19e2dd146d2 100644
--- a/pkgs/development/python-modules/funcparserlib/default.nix
+++ b/pkgs/development/python-modules/funcparserlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
index 1464baa57df..8a7335accda 100644
--- a/pkgs/development/python-modules/funcsigs/default.nix
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , isPyPy, isPy3k, unittest2
 }:
 
diff --git a/pkgs/development/python-modules/functools32/default.nix b/pkgs/development/python-modules/functools32/default.nix
index cec9da42395..be907e963c1 100644
--- a/pkgs/development/python-modules/functools32/default.nix
+++ b/pkgs/development/python-modules/functools32/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix
index 3db08cf22bb..515f0925caf 100644
--- a/pkgs/development/python-modules/funcy/default.nix
+++ b/pkgs/development/python-modules/funcy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix
index b7592885007..72089da11e1 100644
--- a/pkgs/development/python-modules/furl/default.nix
+++ b/pkgs/development/python-modules/furl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }:
+{ lib, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }:
 
 buildPythonPackage rec {
   pname = "furl";
diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix
index a130fab0d7e..14f2cb584ea 100644
--- a/pkgs/development/python-modules/fuse-python/default.nix
+++ b/pkgs/development/python-modules/fuse-python/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, fuse }:
+{ lib, buildPythonPackage, fetchPypi, pkg-config, fuse }:
 
 buildPythonPackage rec {
   pname = "fuse-python";
diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix
index 858d3e13ea0..45b70863042 100644
--- a/pkgs/development/python-modules/fusepy/default.nix
+++ b/pkgs/development/python-modules/fusepy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix
index c2d16a55984..0bcf8efc359 100644
--- a/pkgs/development/python-modules/fuzzywuzzy/default.nix
+++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }:
+{ lib, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }:
 
 buildPythonPackage rec {
   pname = "fuzzywuzzy";
diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
index e4dbe43ef8d..38334d5cc6b 100644
--- a/pkgs/development/python-modules/gast/default.nix
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, astunparse }:
+{ lib, fetchPypi, buildPythonPackage, astunparse }:
 
 buildPythonPackage rec {
   pname = "gast";
diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix
index 981cbbb7e8c..5c45e875e5d 100644
--- a/pkgs/development/python-modules/gateone/default.nix
+++ b/pkgs/development/python-modules/gateone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , tornado
 , futures
diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix
index bedb7f3a375..1332777189b 100644
--- a/pkgs/development/python-modules/gcovr/default.nix
+++ b/pkgs/development/python-modules/gcovr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , jinja2
diff --git a/pkgs/development/python-modules/gdata/default.nix b/pkgs/development/python-modules/gdata/default.nix
index bf9c01c250a..94430d0d941 100644
--- a/pkgs/development/python-modules/gdata/default.nix
+++ b/pkgs/development/python-modules/gdata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 }:
diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix
index aab5efea97d..6060dc3a5bb 100644
--- a/pkgs/development/python-modules/gdrivefs/default.nix
+++ b/pkgs/development/python-modules/gdrivefs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPy3k
diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix
index 4eb209a8af7..6c416548184 100644
--- a/pkgs/development/python-modules/geeknote/default.nix
+++ b/pkgs/development/python-modules/geeknote/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
index f43fdabf09e..3f217afd8bb 100644
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner
 }:
 
diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix
index 9a6e4508e30..c476960bbf8 100644
--- a/pkgs/development/python-modules/genshi/default.nix
+++ b/pkgs/development/python-modules/genshi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools
diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix
index 8f486cc29ef..a848eff41a6 100644
--- a/pkgs/development/python-modules/genzshcomp/default.nix
+++ b/pkgs/development/python-modules/genzshcomp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools
diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index 56f9346668f..b629d48c61f 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , sqlalchemy
diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix
index 98c1ee417e4..5167b986604 100644
--- a/pkgs/development/python-modules/geographiclib/default.nix
+++ b/pkgs/development/python-modules/geographiclib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix
index ae4e07e2547..48df43e2217 100644
--- a/pkgs/development/python-modules/geopy/2.nix
+++ b/pkgs/development/python-modules/geopy/2.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix
index 88d1089d5a3..4a25e0d7e14 100644
--- a/pkgs/development/python-modules/gevent-socketio/default.nix
+++ b/pkgs/development/python-modules/gevent-socketio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , versiontools
diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix
index 431a0c09a30..7ff62a378ca 100644
--- a/pkgs/development/python-modules/gevent-websocket/default.nix
+++ b/pkgs/development/python-modules/gevent-websocket/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index 0fcf6cdfaaa..3fe9e648ce3 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet
+{ lib, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet
 , zope_interface
 }:
 
diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix
index fafbef12bd3..c82da3c8a98 100644
--- a/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix
index a9582648117..efbdc2f59f9 100644
--- a/pkgs/development/python-modules/ghdiff/default.nix
+++ b/pkgs/development/python-modules/ghdiff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , zope_testrunner, six, chardet}:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
index a48547f2909..8df2808328f 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , gevent
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index 5922377ab3a..d41874cff3b 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll
+{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll
 , python, util-linux, pygit2, gitMinimal, git-annex, cacert
 }:
 
diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix
index adb9de4dbc0..2b17a46190b 100644
--- a/pkgs/development/python-modules/git-sweep/default.nix
+++ b/pkgs/development/python-modules/git-sweep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , GitPython
diff --git a/pkgs/development/python-modules/globre/default.nix b/pkgs/development/python-modules/globre/default.nix
index 21d2983ab01..5debd1d0ab6 100644
--- a/pkgs/development/python-modules/globre/default.nix
+++ b/pkgs/development/python-modules/globre/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , pythonAtLeast
 , buildPythonPackage
 , fetchPypi
diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix
index 2acc87a17ac..89f0de47490 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/pkgs/development/python-modules/glom/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , boltons
diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
index 808b918681b..204415d7531 100644
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , fetchpatch
diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix
index 821e0ba0afa..1797f1d4264 100644
--- a/pkgs/development/python-modules/gmusicapi/default.nix
+++ b/pkgs/development/python-modules/gmusicapi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , validictory
diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix
index 71116c37041..6f3ae30e8cd 100644
--- a/pkgs/development/python-modules/gnureadline/default.nix
+++ b/pkgs/development/python-modules/gnureadline/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix
index addbee81bd3..3c68a1713a0 100644
--- a/pkgs/development/python-modules/gnutls/default.nix
+++ b/pkgs/development/python-modules/gnutls/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix
index c587c928e7e..83175b6c86a 100644
--- a/pkgs/development/python-modules/goobook/default.nix
+++ b/pkgs/development/python-modules/goobook/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , docutils, installShellFiles
 , google_api_python_client, simplejson, oauth2client, setuptools, xdg
 }:
diff --git a/pkgs/development/python-modules/google-apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix
index 7cc7f485882..321837f56ae 100644
--- a/pkgs/development/python-modules/google-apputils/default.nix
+++ b/pkgs/development/python-modules/google-apputils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index 9120f93a3bd..22b02552cd7 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchpatch
 , fetchPypi
diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 8f04fb7451d..aec3b51acb5 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index 302ce8ceaed..83fe052a542 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 4ec12a8fa2f..8f67fed79d7 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 5eab2c730f7..a99588199bf 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index 9632dc902d1..93cbc22b7cd 100644
--- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 6d91bed83ae..1cf94d220e6 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix
index 72709c62cec..44764a4edb1 100644
--- a/pkgs/development/python-modules/google-cloud-core/default.nix
+++ b/pkgs/development/python-modules/google-cloud-core/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 1b7a570fed2..095e01fbbd7 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index 84f98550b9a..4c8c79c7dda 100644
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 9076c129804..451607a5357 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix
index 0636da60e9a..fa4c8c6c52d 100644
--- a/pkgs/development/python-modules/google-cloud-dns/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index b3181f8fcde..1457c044fe5 100644
--- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index f0c235ca0c9..30ef0af76a1 100644
--- a/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , aiounittest
diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix
index 2b28f84a315..ac511f80647 100644
--- a/pkgs/development/python-modules/google-cloud-iot/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 6675767a244..94dd7c1ba8f 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 7186ecd6f35..c43c51d97f7 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index 58d03f206fc..b8ffa935fc3 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index 8dc665fe210..f8fc079aa3e 100644
--- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 46a28b1ffd1..d3846ad4f42 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index 4dcf7fd3d31..86fbc360d73 100644
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index 11baf3d73f3..8a265182fba 100644
--- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
index 81fa97f152b..0a3285566f1 100644
--- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
+++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index 242198a2197..184044594d5 100644
--- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index 382476af0ca..759a8f25c1a 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index 3359cfdd743..c57329eebcc 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index e30986af610..5911bfe6156 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix
index 3f6792fa77b..2380e9183b7 100644
--- a/pkgs/development/python-modules/google-cloud-testutils/default.nix
+++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, google-auth, six }:
+{ lib, buildPythonPackage, fetchPypi, google-auth, six }:
 
 buildPythonPackage rec {
   pname = "google-cloud-testutils";
diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index a7228a42999..3c84c21344a 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix
index 1252c99bf48..486a71c7a97 100644
--- a/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index 32d402e1cf0..2b0ac55fa2e 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index 43fed1fe27f..26e3320a5cc 100644
--- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mock
diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index 57a51f96e65..12f63bd0e1c 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , google-api-core
diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 20614f5b5d8..ac91ab85bd6 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 7e5b786b4fb..898971629ae 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , grpc
diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix
index c971119833e..007d4eb2cea 100644
--- a/pkgs/development/python-modules/googlemaps/default.nix
+++ b/pkgs/development/python-modules/googlemaps/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , requests
diff --git a/pkgs/development/python-modules/gorilla/default.nix b/pkgs/development/python-modules/gorilla/default.nix
index bf4212edc51..42da4541647 100644
--- a/pkgs/development/python-modules/gorilla/default.nix
+++ b/pkgs/development/python-modules/gorilla/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi}:
+{ lib, buildPythonPackage, fetchPypi}:
 
 buildPythonPackage rec {
   pname = "gorilla";
diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix
index 788473b5ab8..6ed9f48dd61 100644
--- a/pkgs/development/python-modules/gpapi/default.nix
+++ b/pkgs/development/python-modules/gpapi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , requests
 , protobuf
 , pycryptodome
diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index 0dd68918aed..31ac03347cb 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , pkg-config
 , libgphoto2 }:
 
diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
index ecd52ad848c..28f244bc354 100644
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ b/pkgs/development/python-modules/gplaycli/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, lib, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient
+{ buildPythonPackage, lib, libffi, isPy3k, pyasn1, clint, ndg-httpsclient
 , protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub
 }:
 
diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix
index 2c4dfcd8139..1ad50642e2b 100644
--- a/pkgs/development/python-modules/gpsoauth/default.nix
+++ b/pkgs/development/python-modules/gpsoauth/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cffi
diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix
index 22e6743582c..85b6efabaa8 100644
--- a/pkgs/development/python-modules/gpyopt/default.nix
+++ b/pkgs/development/python-modules/gpyopt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools
+{ lib, buildPythonPackage, fetchFromGitHub, setuptools
 , numpy, scipy, gpy, emcee, nose }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/gradient_sdk/default.nix b/pkgs/development/python-modules/gradient_sdk/default.nix
index adaafd8eadb..3dffb38f2ff 100644
--- a/pkgs/development/python-modules/gradient_sdk/default.nix
+++ b/pkgs/development/python-modules/gradient_sdk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , hyperopt
 }:
 
diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix
index 607737d99ae..ada005d14f8 100644
--- a/pkgs/development/python-modules/gradient_statsd/default.nix
+++ b/pkgs/development/python-modules/gradient_statsd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , boto3, requests, datadog, configparser, python
 }:
 
diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix
index 0bced13cd11..17ac9132916 100644
--- a/pkgs/development/python-modules/graphite-web/default.nix
+++ b/pkgs/development/python-modules/graphite-web/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix
index 06b66ccbc14..20522d28304 100644
--- a/pkgs/development/python-modules/graphite_beacon/default.nix
+++ b/pkgs/development/python-modules/graphite_beacon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , tornado_5, pyyaml, funcparserlib
 , nixosTests
 }:
diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix
index 7b2dd7e3fed..ae7ddb0c76b 100644
--- a/pkgs/development/python-modules/grappelli_safe/default.nix
+++ b/pkgs/development/python-modules/grappelli_safe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix
index 5ce5df8cdea..50c95df7dc9 100644
--- a/pkgs/development/python-modules/grequests/default.nix
+++ b/pkgs/development/python-modules/grequests/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix
index 019cd798d64..dafa692493e 100644
--- a/pkgs/development/python-modules/grip/default.nix
+++ b/pkgs/development/python-modules/grip/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , fetchpatch
 # Python bits:
diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
index dd9527006da..7291cd4b65e 100644
--- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
+++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , grpcio
diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/pkgs/development/python-modules/grpcio-gcp/default.nix
index 1b631c0973e..656e147ac50 100644
--- a/pkgs/development/python-modules/grpcio-gcp/default.nix
+++ b/pkgs/development/python-modules/grpcio-gcp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , grpcio
diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix
index 0512a4906a2..8d19acdc70d 100644
--- a/pkgs/development/python-modules/gsd/1.7.nix
+++ b/pkgs/development/python-modules/gsd/1.7.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index 7cf2a8c8df1..0370f80b4a4 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 9ff8434cc9a..ea89f7214c6 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , meson
 , ninja
-, stdenv
+
 , pkg-config
 , python3
 , pygobject3
diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix
index 3af8e97ba71..bb31baa7888 100644
--- a/pkgs/development/python-modules/gtimelog/default.nix
+++ b/pkgs/development/python-modules/gtimelog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper
+{ lib, fetchFromGitHub, makeWrapper
 , glibcLocales, gobject-introspection, gtk3, libsoup, libsecret
 , buildPythonPackage, python
 , pygobject3, freezegun, mock
diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix
index 23a2545525a..0f1d2ddf05c 100644
--- a/pkgs/development/python-modules/guestfs/default.nix
+++ b/pkgs/development/python-modules/guestfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }:
+{ lib, buildPythonPackage, fetchurl, libguestfs, qemu }:
 
 buildPythonPackage rec {
   pname = "guestfs";
diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix
index c1091fa980c..7d43ce95a7e 100644
--- a/pkgs/development/python-modules/gunicorn/19.nix
+++ b/pkgs/development/python-modules/gunicorn/19.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , coverage
 , mock
 , pytest
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index 983335f4395..3f3eceee378 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27
 , coverage
 , mock
 , pytest
diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
index f70625b86fe..6f765bd98d6 100644
--- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
+++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, sphinx, fetchPypi }:
+{ lib, buildPythonPackage, sphinx, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "guzzle_sphinx_theme";
diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
index 6dad775732c..ba681658e9a 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , enum34, hpack, hyperframe, pytestCheckHook, hypothesis }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
index 653c4483ce8..84810fd2b53 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , ffmpeg_3, async-timeout }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix
index b2b7b4b3d14..316c9a6edca 100644
--- a/pkgs/development/python-modules/handout/default.nix
+++ b/pkgs/development/python-modules/handout/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , imageio, imageio-ffmpeg }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix
index a0b7d50b560..7afb4eefa06 100644
--- a/pkgs/development/python-modules/hawkauthlib/default.nix
+++ b/pkgs/development/python-modules/hawkauthlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , requests
diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix
index 003805f939c..c457da91886 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/pkgs/development/python-modules/hbmqtt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools
+{ lib, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools
 , transitions, websockets, passlib, docopt, pyyaml, nose }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix
index 56e9811396e..5dd94e5de2e 100644
--- a/pkgs/development/python-modules/hcs_utils/default.nix
+++ b/pkgs/development/python-modules/hcs_utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }:
+{ lib, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }:
 
 buildPythonPackage rec {
   pname = "hcs_utils";
diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix
index 3b65e10bfce..f1b0d13e56e 100644
--- a/pkgs/development/python-modules/hdmedians/default.nix
+++ b/pkgs/development/python-modules/hdmedians/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix
index 4cd695925f2..61cbe39a256 100644
--- a/pkgs/development/python-modules/heapdict/default.nix
+++ b/pkgs/development/python-modules/heapdict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "HeapDict";
diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix
index 4c7ff0c3878..8560364d4f4 100644
--- a/pkgs/development/python-modules/helper/default.nix
+++ b/pkgs/development/python-modules/helper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }:
+{ lib, buildPythonPackage, fetchPypi, pyyaml, mock }:
 
 buildPythonPackage rec {
   pname = "helper";
diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix
index 3b938dfc237..9b89567d8ef 100644
--- a/pkgs/development/python-modules/hetzner/default.nix
+++ b/pkgs/development/python-modules/hetzner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix
index ce291818824..4e65f5b9172 100644
--- a/pkgs/development/python-modules/heudiconv/default.nix
+++ b/pkgs/development/python-modules/heudiconv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix
index afac7983584..a6ed6b935ad 100644
--- a/pkgs/development/python-modules/hglib/default.nix
+++ b/pkgs/development/python-modules/hglib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }:
 
 buildPythonPackage rec {
   pname = "python-hglib";
diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix
index 2ee6024cd47..b8b6d43b548 100644
--- a/pkgs/development/python-modules/hgsvn/default.nix
+++ b/pkgs/development/python-modules/hgsvn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix
index 418059c5165..d7fa9af5efa 100644
--- a/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }:
+{ lib, fetchPypi, buildPythonPackage, isPy27, sphinx }:
 
 buildPythonPackage rec {
   pname = "hieroglyph";
diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix
index e9d5677f8be..ef10d195671 100644
--- a/pkgs/development/python-modules/hiredis/default.nix
+++ b/pkgs/development/python-modules/hiredis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , redis
diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix
index 3ff672a22db..00b56060964 100644
--- a/pkgs/development/python-modules/hiro/default.nix
+++ b/pkgs/development/python-modules/hiro/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six, mock }:
+{ lib, buildPythonPackage, fetchPypi, six, mock }:
 buildPythonPackage rec {
   pname = "hiro";
   version = "0.5.1";
diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix
index 3393ad18691..096edbe5252 100644
--- a/pkgs/development/python-modules/hjson/default.nix
+++ b/pkgs/development/python-modules/hjson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pythonImportsCheckHook
diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix
index 966ce7001fb..43e7a8f4ce3 100644
--- a/pkgs/development/python-modules/hkdf/default.nix
+++ b/pkgs/development/python-modules/hkdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix
index 79a2e83508a..cfbf63a5869 100644
--- a/pkgs/development/python-modules/hocr-tools/default.nix
+++ b/pkgs/development/python-modules/hocr-tools/default.nix
@@ -3,7 +3,7 @@
 , lxml
 , pillow
 , reportlab
-, lib, stdenv
+, lib
 }:
 buildPythonPackage rec {
   pname = "hocr-tools";
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index b5e0062d115..789dc57a571 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , convertdate
diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix
index 9b6f724cd31..a5140a216cf 100644
--- a/pkgs/development/python-modules/hpack/default.nix
+++ b/pkgs/development/python-modules/hpack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/pkgs/development/python-modules/hsaudiotag/default.nix
index fba71dc3f10..d38ceec7e13 100644
--- a/pkgs/development/python-modules/hsaudiotag/default.nix
+++ b/pkgs/development/python-modules/hsaudiotag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix
index 52919e48983..66ea895960c 100644
--- a/pkgs/development/python-modules/hsaudiotag3k/default.nix
+++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/html2text/2018.nix b/pkgs/development/python-modules/html2text/2018.nix
index 73540359ee1..06d0c14c7e4 100644
--- a/pkgs/development/python-modules/html2text/2018.nix
+++ b/pkgs/development/python-modules/html2text/2018.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index 0ceeda04582..d20f0a9abfd 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }:
+{ lib, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }:
 
 buildPythonPackage rec {
   pname = "html5-parser";
diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix
index ef660fc0b92..e844c99693a 100644
--- a/pkgs/development/python-modules/htmllaundry/default.nix
+++ b/pkgs/development/python-modules/htmllaundry/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi, nose
 , six
diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix
index 117c7f5e132..cbf6b95ccd3 100644
--- a/pkgs/development/python-modules/httmock/default.nix
+++ b/pkgs/development/python-modules/httmock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }:
+{ lib, buildPythonPackage, fetchFromGitHub, requests }:
 
 buildPythonPackage rec {
   pname   = "httmock";
diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix
index 145eea751b9..9169f1e4126 100644
--- a/pkgs/development/python-modules/http_signature/default.nix
+++ b/pkgs/development/python-modules/http_signature/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix
index b7867e22f17..a7d4240db14 100644
--- a/pkgs/development/python-modules/httpauth/default.nix
+++ b/pkgs/development/python-modules/httpauth/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix
index cbaf89c3ca6..2e711141fcb 100644
--- a/pkgs/development/python-modules/httpbin/default.nix
+++ b/pkgs/development/python-modules/httpbin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index 09e94f6275d..b6f78e5cf8f 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix
index a74198f3832..6cdee9948b9 100644
--- a/pkgs/development/python-modules/hyperframe/default.nix
+++ b/pkgs/development/python-modules/hyperframe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "hyperframe";
diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix
index ba4aeef402e..d407ff95a01 100644
--- a/pkgs/development/python-modules/hyperopt/default.nix
+++ b/pkgs/development/python-modules/hyperopt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , cloudpickle, numpy, future, networkx
 , six, tqdm, scipy, pymongo
 }:
diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix
index 4dea7526b7e..312c1bb45c7 100644
--- a/pkgs/development/python-modules/i3-py/default.nix
+++ b/pkgs/development/python-modules/i3-py/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix
index c27d4135411..37d5ccd8786 100644
--- a/pkgs/development/python-modules/i3ipc/default.nix
+++ b/pkgs/development/python-modules/i3ipc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , xorgserver, pytest, pytest-xvfb, i3, python, xlib, xdpyinfo
 , makeFontsConf, coreutils
 }:
diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index 4499d5d62f4..8e75a945d10 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools
diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix
index c186020fee1..011909d6b80 100644
--- a/pkgs/development/python-modules/ics/default.nix
+++ b/pkgs/development/python-modules/ics/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , tatsu, arrow
 , pytestCheckHook, pytest-flakes
 }:
diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix
index 47997dbdc26..35bafd67fa9 100644
--- a/pkgs/development/python-modules/ifaddr/default.nix
+++ b/pkgs/development/python-modules/ifaddr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , ipaddress
diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix
index bdfd3767f8c..be4e2026bf1 100644
--- a/pkgs/development/python-modules/ifconfig-parser/default.nix
+++ b/pkgs/development/python-modules/ifconfig-parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "ifconfig-parser";
diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index a82a20ca7c8..8ccc7eb4e0c 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ijson";
diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix
index 5c1953d6ac3..7464f3c8997 100644
--- a/pkgs/development/python-modules/image-match/default.nix
+++ b/pkgs/development/python-modules/image-match/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }:
 
 buildPythonPackage {
   pname = "image-match";
diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix
index 65c1cfd020a..8d2b7fd8da8 100644
--- a/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -2,7 +2,7 @@
 , fetchPypi
 , numpy
 , scikitimage
-, lib, stdenv
+, lib
 , opencv3
 }:
 
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index 71f7eae9c32..67920dc7b7d 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy27
 , pathlib
diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix
index cd48f54ee8f..42cf6b50764 100644
--- a/pkgs/development/python-modules/imagesize/default.nix
+++ b/pkgs/development/python-modules/imagesize/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix
index c091f53b8d4..27667f860ff 100644
--- a/pkgs/development/python-modules/imapclient/default.nix
+++ b/pkgs/development/python-modules/imapclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , mock
diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix
index fe21096d635..96ba16b1cd1 100644
--- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }:
+{ lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }:
 
 buildPythonPackage rec {
   pname = "imbalanced-learn";
diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix
index 4253ed30e41..f5418b89e80 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27
 , pandas
 , pytestCheckHook
 , scikitlearn
diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix
index 9ca8531dbbc..343c7869a6c 100644
--- a/pkgs/development/python-modules/imgaug/default.nix
+++ b/pkgs/development/python-modules/imgaug/default.nix
@@ -9,7 +9,7 @@
 , scipy
 , shapely
 , six
-, lib, stdenv
+, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/imgsize/default.nix b/pkgs/development/python-modules/imgsize/default.nix
index d1a69c043d0..a8f50cd8f32 100644
--- a/pkgs/development/python-modules/imgsize/default.nix
+++ b/pkgs/development/python-modules/imgsize/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix
index 3a6a3c9ef8d..54308d632b2 100644
--- a/pkgs/development/python-modules/importmagic/default.nix
+++ b/pkgs/development/python-modules/importmagic/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix
index 65ae47ed87b..3d09e6a4397 100644
--- a/pkgs/development/python-modules/imread/default.nix
+++ b/pkgs/development/python-modules/imread/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix
index 33c2ae0001c..f402f913f38 100644
--- a/pkgs/development/python-modules/imutils/default.nix
+++ b/pkgs/development/python-modules/imutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , opencv3
diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix
index 2d0fd5a93ad..69fe83b8779 100644
--- a/pkgs/development/python-modules/influxdb/default.nix
+++ b/pkgs/development/python-modules/influxdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix
index 32374453375..c8403cf6446 100644
--- a/pkgs/development/python-modules/influxgraph/default.nix
+++ b/pkgs/development/python-modules/influxgraph/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , influxdb, graphite_api, memcached
 }:
 
diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix
index 4baa891a779..b250dfc6c7f 100644
--- a/pkgs/development/python-modules/infoqscraper/default.nix
+++ b/pkgs/development/python-modules/infoqscraper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , html5lib
 , six
diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix
index 9bd24a4d788..c94c12ab0a8 100644
--- a/pkgs/development/python-modules/inifile/default.nix
+++ b/pkgs/development/python-modules/inifile/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix
index c515b7865b1..e4473c0bd1c 100644
--- a/pkgs/development/python-modules/iniparse/default.nix
+++ b/pkgs/development/python-modules/iniparse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix
index c434a3f52bc..e55fd8f39d5 100644
--- a/pkgs/development/python-modules/inquirer/default.nix
+++ b/pkgs/development/python-modules/inquirer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }:
+{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }:
 
 buildPythonPackage rec {
   pname = "inquirer";
diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix
index b4e1dfaff18..62e021afdbb 100644
--- a/pkgs/development/python-modules/interruptingcow/default.nix
+++ b/pkgs/development/python-modules/interruptingcow/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "interruptingcow";
   version = "0.8";
diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix
index 27a5fa3650e..dca73a93e8f 100644
--- a/pkgs/development/python-modules/intervaltree/default.nix
+++ b/pkgs/development/python-modules/intervaltree/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , python, pytest, sortedcontainers }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix
index 427681fedb8..b29ee917928 100644
--- a/pkgs/development/python-modules/ipaddr/default.nix
+++ b/pkgs/development/python-modules/ipaddr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix
index f2e479aff96..06211470daa 100644
--- a/pkgs/development/python-modules/ipaddress/default.nix
+++ b/pkgs/development/python-modules/ipaddress/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index b21907f75ff..7b8c877371c 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , ipython
diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix
index 057d82cbebc..9788fd8a544 100644
--- a/pkgs/development/python-modules/ipdbplugin/default.nix
+++ b/pkgs/development/python-modules/ipdbplugin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix
index 3deb0c6cb80..c97eafb6054 100644
--- a/pkgs/development/python-modules/ipfsapi/default.nix
+++ b/pkgs/development/python-modules/ipfsapi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix
index 431c05bb388..3f2b854b6e7 100644
--- a/pkgs/development/python-modules/iptools/default.nix
+++ b/pkgs/development/python-modules/iptools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix
index acf6d3c9331..61ec91075b5 100644
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
+{ lib, fetchFromGitHub, buildPythonPackage, pytest }:
 
 buildPythonPackage {
   pname = "iso3166";
diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix
index d2098a83c95..19a643d216a 100644
--- a/pkgs/development/python-modules/isodate/default.nix
+++ b/pkgs/development/python-modules/isodate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix
index e89786d4e18..d1669a1ed5b 100644
--- a/pkgs/development/python-modules/itsdangerous/default.nix
+++ b/pkgs/development/python-modules/itsdangerous/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix
index 417d1a20b3b..1b684547240 100644
--- a/pkgs/development/python-modules/itypes/default.nix
+++ b/pkgs/development/python-modules/itypes/default.nix
@@ -1,5 +1,5 @@
 {
-  lib, stdenv,
+  lib,
   fetchFromGitHub,
   buildPythonPackage,
   pytest,
diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix
index 14cf18ae694..d6efe84edfd 100644
--- a/pkgs/development/python-modules/j2cli/default.nix
+++ b/pkgs/development/python-modules/j2cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , jinja2
diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix
index 4c625d94485..d00ccd06c8d 100644
--- a/pkgs/development/python-modules/jabberbot/default.nix
+++ b/pkgs/development/python-modules/jabberbot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi, xmpppy }:
 
 buildPythonPackage rec {
   pname = "jabberbot";
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index 6f120fa6ea2..b4590ed28d3 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , ruamel_yaml
diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix
index d4aa49c3ca3..90f7c310faa 100644
--- a/pkgs/development/python-modules/jdatetime/default.nix
+++ b/pkgs/development/python-modules/jdatetime/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "jdatetime";
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 6e833a77460..305b9f6c6b6 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
 
 buildPythonPackage rec {
   pname = "jedi";
diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix
index 0a6d0c365a0..db196403822 100644
--- a/pkgs/development/python-modules/jinja2_pluralize/default.nix
+++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }:
+{ lib, buildPythonPackage, fetchPypi, jinja2, inflect }:
 
 buildPythonPackage rec {
   pname = "jinja2_pluralize";
diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2_time/default.nix
index 7887fe96f75..4268413fd3f 100644
--- a/pkgs/development/python-modules/jinja2_time/default.nix
+++ b/pkgs/development/python-modules/jinja2_time/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , arrow
diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix
index 3b31700de0e..3f74ae8d810 100644
--- a/pkgs/development/python-modules/jmespath/default.nix
+++ b/pkgs/development/python-modules/jmespath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , ply
diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix
index c5c9cdf1505..6f9ceb96e3f 100644
--- a/pkgs/development/python-modules/jpylyzer/default.nix
+++ b/pkgs/development/python-modules/jpylyzer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonPackage
 , six
diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix
index 07ee609d653..6b7faf9a312 100644
--- a/pkgs/development/python-modules/jsonfield/default.nix
+++ b/pkgs/development/python-modules/jsonfield/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }:
+{ lib, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }:
 
 buildPythonPackage rec {
   pname = "jsonfield";
diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/pkgs/development/python-modules/jsonpath_rw/default.nix
index 81a6eb3fb27..d2b177c742a 100644
--- a/pkgs/development/python-modules/jsonpath_rw/default.nix
+++ b/pkgs/development/python-modules/jsonpath_rw/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix
index b901d811a23..3154f63f318 100644
--- a/pkgs/development/python-modules/jsonref/default.nix
+++ b/pkgs/development/python-modules/jsonref/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 0b77db5df4e..00f0d748bbb 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , aiohttp, jsonrpc-base }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix
index cc4bd1b2f68..db47a2240fb 100644
--- a/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-base/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "jsonrpc-base";
diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index d14d382f013..bf8960ad27d 100644
--- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , aiohttp, jsonrpc-base, pep8
 , pytestCheckHook
 , pytest-asyncio
diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix
index feced944225..7b08572d231 100644
--- a/pkgs/development/python-modules/jsonwatch/default.nix
+++ b/pkgs/development/python-modules/jsonwatch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , six
diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index eff6accaa02..7646c007818 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch
+{ lib, buildPythonPackage, fetchPypi, fetchpatch
 , nose, numpy
 , bottle, pyyaml, redis, six
 , zlib
diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix
index d9234d836b0..60ec37dbde9 100644
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/pkgs/development/python-modules/junos-eznc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index f01605513cb..5d8060d1944 100644
--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
+{ lib, buildPythonPackage, fetchPypi, pythonAtLeast
 , docker
 , escapism
 , jinja2
diff --git a/pkgs/development/python-modules/jupyter-telemetry/default.nix b/pkgs/development/python-modules/jupyter-telemetry/default.nix
index 0f0c0d346e6..9dddd8ec568 100644
--- a/pkgs/development/python-modules/jupyter-telemetry/default.nix
+++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix
index 03d28bbf55d..818623c2513 100644
--- a/pkgs/development/python-modules/jupyter/default.nix
+++ b/pkgs/development/python-modules/jupyter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , notebook
diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix
index bfbd1cc89e0..3d9b5b9f831 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , notebook
diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix
index 24a02f7f696..5b789f5eda8 100644
--- a/pkgs/development/python-modules/kaa-base/default.nix
+++ b/pkgs/development/python-modules/kaa-base/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix
index 5164004e8ea..5a50d9e9c0a 100644
--- a/pkgs/development/python-modules/kaa-metadata/default.nix
+++ b/pkgs/development/python-modules/kaa-metadata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , kaa-base
diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
index b147b30c2ce..d8f37f563d4 100644
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ b/pkgs/development/python-modules/kafka-python/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }:
+{ lib, buildPythonPackage, fetchPypi, pytest, six, mock }:
 
 buildPythonPackage rec {
   version = "2.0.2";
diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix
index 866042b6942..1050ae88e43 100644
--- a/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "kaitaistruct";
diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index 2a45404919c..471ee4416b6 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , Babel
diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix
index dea22059f09..c5f00393839 100644
--- a/pkgs/development/python-modules/kaptan/default.nix
+++ b/pkgs/development/python-modules/kaptan/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyyaml
diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix
index d8743776578..31b65023371 100644
--- a/pkgs/development/python-modules/kazoo/default.nix
+++ b/pkgs/development/python-modules/kazoo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix
index 22ae853c043..5a70dcb4676 100644
--- a/pkgs/development/python-modules/keep/default.nix
+++ b/pkgs/development/python-modules/keep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , PyGithub
diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix
index 7a488edf895..b6daec6ca20 100644
--- a/pkgs/development/python-modules/keepalive/default.nix
+++ b/pkgs/development/python-modules/keepalive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
index 437a0193c61..6b4568cd748 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest
+{ lib, fetchFromGitHub, buildPythonPackage, pytest
 , ecdsa , mnemonic, protobuf, hidapi, trezor }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix
index b9189cf4e16..27ef7d8dbf4 100644
--- a/pkgs/development/python-modules/keepkey_agent/default.nix
+++ b/pkgs/development/python-modules/keepkey_agent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , keepkey
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 7274d3d17a6..e90dd1a806a 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, pytestcov, pytest_xdist
 , six, numpy, scipy, pyyaml, h5py
 , keras-applications, keras-preprocessing
diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix
index 985339caed5..7a9ce3aab44 100644
--- a/pkgs/development/python-modules/kerberos/default.nix
+++ b/pkgs/development/python-modules/kerberos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , kerberos
diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index bc20ff4e374..5b53d201a0b 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six
 , pytest, backports_unittest-mock, keyring, setuptools_scm, toml
 }:
 
diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix
index 1a14b974114..0b6f41d2c19 100644
--- a/pkgs/development/python-modules/kitchen/default.nix
+++ b/pkgs/development/python-modules/kitchen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "kitchen";
   version = "1.2.6";
diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix
index dd45e967231..c08bdab4cf3 100644
--- a/pkgs/development/python-modules/knack/default.nix
+++ b/pkgs/development/python-modules/knack/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , fetchPypi
 , argcomplete
diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix
index 8ad94d955ae..a1b22a727ad 100644
--- a/pkgs/development/python-modules/korean-lunar-calendar/default.nix
+++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 17218078196..f2cb598a6c9 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast,
+{ lib, buildPythonPackage, fetchPypi, pythonAtLeast,
   ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
   isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
 
diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix
index 7708bc0dbc0..630430b8270 100644
--- a/pkgs/development/python-modules/larch/default.nix
+++ b/pkgs/development/python-modules/larch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , sphinx
diff --git a/pkgs/development/python-modules/lasagne/default.nix b/pkgs/development/python-modules/lasagne/default.nix
index 5bddf5cbe6f..5db149708ff 100644
--- a/pkgs/development/python-modules/lasagne/default.nix
+++ b/pkgs/development/python-modules/lasagne/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix
index 63784b4005b..82a784cfe3c 100644
--- a/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix
index 1bc52b3a65c..60eba0577b0 100644
--- a/pkgs/development/python-modules/lazy_import/default.nix
+++ b/pkgs/development/python-modules/lazy_import/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest
 , pytest_xdist
 , six }:
diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix
index e1accc4d177..71af0d294a2 100644
--- a/pkgs/development/python-modules/ldap3/default.nix
+++ b/pkgs/development/python-modules/ldap3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pyasn1 }:
+{ lib, fetchPypi, buildPythonPackage, pyasn1 }:
 
 buildPythonPackage rec {
   pname = "ldap3";
diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix
index 6415b255c71..d42527ae97a 100644
--- a/pkgs/development/python-modules/le/default.nix
+++ b/pkgs/development/python-modules/le/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPy3k
diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix
index 99c1f080a03..197e88e8e8b 100644
--- a/pkgs/development/python-modules/leather/default.nix
+++ b/pkgs/development/python-modules/leather/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, six }:
+{ lib, fetchPypi, buildPythonPackage, six }:
 
 buildPythonPackage rec {
   pname = "leather";
diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix
index 4fc935799c3..8a0ace12645 100644
--- a/pkgs/development/python-modules/ledger_agent/default.nix
+++ b/pkgs/development/python-modules/ledger_agent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , ledgerblue
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index f853dfbf01f..fe94753f1a6 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, hidapi
+{ lib, fetchPypi, buildPythonPackage, hidapi
 , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
 , websocket_client
 }:
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index debe88f2f6c..47be977755c 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
+{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
   unidecode, mock, pytest , backports-shutil-which, ConfigArgParse,
   python-daemon, pymsgbox }:
 
diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix
index eb1ce861dd2..33710c6682d 100644
--- a/pkgs/development/python-modules/libais/default.nix
+++ b/pkgs/development/python-modules/libais/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
   six, pytest, pytestrunner, pytestcov, coverage
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index 5a5116de547..6e5d8f771e8 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub
+{ lib, buildPythonPackage, python, fetchFromGitHub
 , cmake, sip, protobuf, pythonOlder }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix
index fc45622a671..38ca9b26360 100644
--- a/pkgs/development/python-modules/libasyncns/default.nix
+++ b/pkgs/development/python-modules/libasyncns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchurl
+{ lib, buildPythonPackage, fetchurl
 , libasyncns, pkg-config }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix
index cfc687e37c1..aa922db9c10 100644
--- a/pkgs/development/python-modules/libkeepass/default.nix
+++ b/pkgs/development/python-modules/libkeepass/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , lxml, pycryptodome, colorama }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix
index b824dec172e..5ff8d25d54b 100644
--- a/pkgs/development/python-modules/liblarch/default.nix
+++ b/pkgs/development/python-modules/liblarch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonPackage
 , python
diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix
index a0ef924e56e..d775cc7b245 100644
--- a/pkgs/development/python-modules/libmr/default.nix
+++ b/pkgs/development/python-modules/libmr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }:
+{ lib, buildPythonPackage, fetchPypi, numpy, cython }:
 
 buildPythonPackage rec {
   pname = "libmr";
diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix
index 777eed4ddb3..ce8f2a73fa7 100644
--- a/pkgs/development/python-modules/librosa/default.nix
+++ b/pkgs/development/python-modules/librosa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , joblib
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index 559289987e6..7ef22e3f6ee 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }:
+{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }:
 
 buildPythonPackage rec {
   pname = "libsavitar";
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix
index 40f1b2f8e9c..a4f98ffada8 100644
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , fetchFromGitHub
-, stdenv
+
 , lib
 , pythonOlder
 , requests
diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix
index 72e62514a52..c3d8ec9526f 100644
--- a/pkgs/development/python-modules/libthumbor/default.nix
+++ b/pkgs/development/python-modules/libthumbor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index df9728eb334..e019951f6ff 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }:
+{ lib, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   pname = "libtmux";
diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
index d54a176f686..2edc9211d92 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }:
+{ lib, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "libversion";
diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix
index 1134d4f1c57..bfc6b711ab2 100644
--- a/pkgs/development/python-modules/libvirt/5.9.0.nix
+++ b/pkgs/development/python-modules/libvirt/5.9.0.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }:
+{ lib, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }:
 
 buildPythonPackage rec {
   pname = "libvirt";
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index d29cf5a7a85..ee2d88b4c04 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }:
+{ lib, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }:
 
 buildPythonPackage rec {
   pname = "libvirt";
diff --git a/pkgs/development/python-modules/lightblue/default.nix b/pkgs/development/python-modules/lightblue/default.nix
index 3e85a3cfaa0..feb27181244 100644
--- a/pkgs/development/python-modules/lightblue/default.nix
+++ b/pkgs/development/python-modules/lightblue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , pkgs
diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix
index 782bd41413e..f6d21f95dbf 100644
--- a/pkgs/development/python-modules/lightning/default.nix
+++ b/pkgs/development/python-modules/lightning/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index e1cd31867de..fc6982440d6 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, six }:
+{ lib, fetchPypi, buildPythonPackage, six }:
 
 buildPythonPackage rec {
   pname = "limits";
diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index c92e014e989..ff7ac9fb3f9 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix
index 3945ec5001c..3c2238b0875 100644
--- a/pkgs/development/python-modules/linecache2/default.nix
+++ b/pkgs/development/python-modules/linecache2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pbr
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index 61624a64d66..7df182d94fe 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv,
+{
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix
index 611b91bb930..3433c0e5717 100644
--- a/pkgs/development/python-modules/linode/default.nix
+++ b/pkgs/development/python-modules/linode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix
index bbf1b966bf1..2951ab7a427 100644
--- a/pkgs/development/python-modules/livelossplot/default.nix
+++ b/pkgs/development/python-modules/livelossplot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix
index d76eb736ac7..5f17a700617 100644
--- a/pkgs/development/python-modules/livestreamer-curses/default.nix
+++ b/pkgs/development/python-modules/livestreamer-curses/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPyPy
diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix
index 7ae9124bb82..184a215c407 100644
--- a/pkgs/development/python-modules/livestreamer/default.nix
+++ b/pkgs/development/python-modules/livestreamer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , pkgs
 , isPyPy
diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index 20020b97ef2..f3e7a86a2aa 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix
index 3a1beba29d4..bb27c29173b 100644
--- a/pkgs/development/python-modules/lmtpd/default.nix
+++ b/pkgs/development/python-modules/lmtpd/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k, lib, stdenv }:
+{ buildPythonPackage, fetchPypi, isPy3k, lib }:
 
 buildPythonPackage rec {
   pname = "lmtpd";
diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix
index 8690b1e4c91..0960a824817 100644
--- a/pkgs/development/python-modules/localzone/default.nix
+++ b/pkgs/development/python-modules/localzone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , dnspython
diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix
index 45985a17d3e..e0be7d8f944 100644
--- a/pkgs/development/python-modules/locket/default.nix
+++ b/pkgs/development/python-modules/locket/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "locket";
diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index b7ba746d79e..a1cb1b248ae 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, unittest2, six }:
 
 buildPythonPackage rec {
   pname = "logilab-common";
diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix
index 9a071b5cf5f..bbc65a51c3c 100644
--- a/pkgs/development/python-modules/logilab/constraint.nix
+++ b/pkgs/development/python-modules/logilab/constraint.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, logilab_common, six }:
+{ lib, buildPythonPackage, fetchPypi, logilab_common, six }:
 
 buildPythonPackage rec {
   pname = "logilab-constraint";
diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix
index 15cea1d7baa..dac5862324a 100644
--- a/pkgs/development/python-modules/logilab_astng/default.nix
+++ b/pkgs/development/python-modules/logilab_astng/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , logilab_common
diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix
index d49667d7cc8..0a49262647e 100644
--- a/pkgs/development/python-modules/logutils/default.nix
+++ b/pkgs/development/python-modules/logutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix
index 67b48cecd62..9c719d234f8 100644
--- a/pkgs/development/python-modules/lpod/default.nix
+++ b/pkgs/development/python-modules/lpod/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , lxml
diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix
index 0fca2f7b372..b570a62d9e3 100644
--- a/pkgs/development/python-modules/lsi/default.nix
+++ b/pkgs/development/python-modules/lsi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchPypi
diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix
index a20db9dd503..4534e0a01ef 100644
--- a/pkgs/development/python-modules/lxc/default.nix
+++ b/pkgs/development/python-modules/lxc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy3k
diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix
index 585c38ab33e..a5ea55c39cf 100644
--- a/pkgs/development/python-modules/lyricwikia/default.nix
+++ b/pkgs/development/python-modules/lyricwikia/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }:
+{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }:
 buildPythonPackage rec {
   pname = "lyricwikia";
   version = "0.1.11";
diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index af07be47dcd..8e214540b12 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchpatch
 , buildPythonPackage
 , fetchPypi
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 149e4d6ed56..35331c14b08 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
   mistune, docutils } :
 buildPythonPackage rec {
   pname = "m2r";
diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
index 14ae268c03a..dfd16c04a6f 100644
--- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }:
 
 buildPythonPackage rec {
   version = "0.4.1";
diff --git a/pkgs/development/python-modules/mailcap-fix/default.nix b/pkgs/development/python-modules/mailcap-fix/default.nix
index 08991edce4a..da735d9d048 100644
--- a/pkgs/development/python-modules/mailcap-fix/default.nix
+++ b/pkgs/development/python-modules/mailcap-fix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy36
diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix
index 0032caa7a0a..91563b7fe7e 100644
--- a/pkgs/development/python-modules/mailchimp/default.nix
+++ b/pkgs/development/python-modules/mailchimp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , docopt
diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix
index 8ab80e33717..1d3b69f6bf2 100644
--- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix
+++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, mailman, mock }:
+{ lib, buildPythonPackage, fetchPypi, mailman, mock }:
 
 buildPythonPackage rec {
   pname = "mailman-hyperkitty";
diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix
index 84c97eb16e2..e2043b0d6d4 100644
--- a/pkgs/development/python-modules/mailman-rss/default.nix
+++ b/pkgs/development/python-modules/mailman-rss/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, withTwitter ? false}:
+{ lib, python3Packages, withTwitter ? false}:
 
 python3Packages.buildPythonApplication rec {
   pname = "mailman-rss";
diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix
index 280ee95b830..edc19f66f71 100644
--- a/pkgs/development/python-modules/mailmanclient/default.nix
+++ b/pkgs/development/python-modules/mailmanclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }:
 
 buildPythonPackage rec {
   pname = "mailmanclient";
diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix
index 59243783ecf..2f14ed863c3 100644
--- a/pkgs/development/python-modules/manuel/default.nix
+++ b/pkgs/development/python-modules/manuel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix
index 54d0ade40f3..28a6e9c0c5c 100644
--- a/pkgs/development/python-modules/mapsplotlib/default.nix
+++ b/pkgs/development/python-modules/mapsplotlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchPypi
diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
index b7d91cc16f5..99f3afc31f6 100644
--- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix
index a30f7062df0..93a4ccb959f 100644
--- a/pkgs/development/python-modules/marisa/default.nix
+++ b/pkgs/development/python-modules/marisa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig
+{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig
 , isPy3k
 }:
 
diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix
index e248bfe60cc..e95cbe3c4c1 100644
--- a/pkgs/development/python-modules/markdown-macros/default.nix
+++ b/pkgs/development/python-modules/markdown-macros/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index 2f929012df8..b1513d06e58 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "markdown2";
diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix
index d039198b393..7762a970fb1 100644
--- a/pkgs/development/python-modules/markerlib/default.nix
+++ b/pkgs/development/python-modules/markerlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index 6a6e06cd317..ae0878c7a97 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
index 34c99a1ebe1..b8439a0c23d 100644
--- a/pkgs/development/python-modules/matrix-client/default.nix
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix
index 9cd1019a030..4a751a188c2 100644
--- a/pkgs/development/python-modules/maya/default.nix
+++ b/pkgs/development/python-modules/maya/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage
+{ lib, fetchPypi, fetchpatch, buildPythonPackage
 , dateparser, humanize, pendulum, ruamel_yaml, tzlocal }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix
index 2886a436a00..03343aec16e 100644
--- a/pkgs/development/python-modules/mccabe/default.nix
+++ b/pkgs/development/python-modules/mccabe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }:
 
 buildPythonPackage rec {
   pname = "mccabe";
diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix
index 5313cd8e89a..55a440e6808 100644
--- a/pkgs/development/python-modules/mdp/default.nix
+++ b/pkgs/development/python-modules/mdp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }:
+{ lib, buildPythonPackage, fetchPypi, pytest, future, numpy }:
 
 buildPythonPackage rec {
   pname = "MDP";
diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
index e2d2269a43c..7eb119fa955 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , html5lib
diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix
index ce7f2316800..9cf02e4c886 100644
--- a/pkgs/development/python-modules/meinheld/default.nix
+++ b/pkgs/development/python-modules/meinheld/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, greenlet }:
+{ lib, fetchPypi, buildPythonPackage, greenlet }:
 
 buildPythonPackage rec {
   pname = "meinheld";
diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix
index 8871bfdda46..a751dbeac3f 100644
--- a/pkgs/development/python-modules/meld3/default.nix
+++ b/pkgs/development/python-modules/meld3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix
index d602e3d94fd..4c6aa746448 100644
--- a/pkgs/development/python-modules/meliae/default.nix
+++ b/pkgs/development/python-modules/meliae/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cython
diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix
index b75bd31361d..02f4bc3aa44 100644
--- a/pkgs/development/python-modules/memcached/default.nix
+++ b/pkgs/development/python-modules/memcached/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , fetchPypi
diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix
index 28ff6b7c5e3..994863dbbc0 100644
--- a/pkgs/development/python-modules/memory_profiler/default.nix
+++ b/pkgs/development/python-modules/memory_profiler/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python
 }:
 
diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix
index bcbca347548..cdd19beb68d 100644
--- a/pkgs/development/python-modules/mergedeep/default.nix
+++ b/pkgs/development/python-modules/mergedeep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }:
+{ lib, buildPythonPackage, isPy27, fetchFromGitHub, pytest }:
 
 buildPythonPackage rec {
   pname = "mergedeep";
diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix
index 5b97f972dad..aaf13a76530 100644
--- a/pkgs/development/python-modules/mesa/default.nix
+++ b/pkgs/development/python-modules/mesa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , cookiecutter, networkx , pandas, tornado, tqdm
 , pytest }:
 
diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix
index 1c8557f15c4..d6b0c30c504 100644
--- a/pkgs/development/python-modules/metaphone/default.nix
+++ b/pkgs/development/python-modules/metaphone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "metaphone";
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index 86deecb5d4f..c157cd2a6be 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix
index 9d31dd378ac..73f50d32a5f 100644
--- a/pkgs/development/python-modules/micawber/default.nix
+++ b/pkgs/development/python-modules/micawber/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }:
+{ lib, buildPythonPackage, fetchPypi, beautifulsoup4 }:
 
 buildPythonPackage rec {
   pname = "micawber";
diff --git a/pkgs/development/python-modules/midiutil/default.nix b/pkgs/development/python-modules/midiutil/default.nix
index 5ac8d917d75..d1cae8c7804 100644
--- a/pkgs/development/python-modules/midiutil/default.nix
+++ b/pkgs/development/python-modules/midiutil/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "MIDIUtil";
diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix
index dc824d56547..998f0a58b2b 100644
--- a/pkgs/development/python-modules/milc/default.nix
+++ b/pkgs/development/python-modules/milc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , appdirs
diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix
index f154eabb744..faa836b71d7 100644
--- a/pkgs/development/python-modules/minimock/default.nix
+++ b/pkgs/development/python-modules/minimock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , nose
diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix
index 7178405ab74..fe7a9f69691 100644
--- a/pkgs/development/python-modules/miniupnpc/default.nix
+++ b/pkgs/development/python-modules/miniupnpc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "miniupnpc";
diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 89cc8f99146..5ffde397337 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27
 , alembic
 , click
 , cloudpickle
diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix
index c3c7c55f292..40e3b6ce095 100644
--- a/pkgs/development/python-modules/mlrose/default.nix
+++ b/pkgs/development/python-modules/mlrose/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }:
+{ lib, isPy27, buildPythonPackage, fetchPypi, scikitlearn }:
 
 buildPythonPackage rec {
   pname = "mlrose";
diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix
index 94af156d9af..35f55bb2793 100644
--- a/pkgs/development/python-modules/mlxtend/default.nix
+++ b/pkgs/development/python-modules/mlxtend/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/mmpython/default.nix b/pkgs/development/python-modules/mmpython/default.nix
index e40fc197a5b..64c270ca072 100644
--- a/pkgs/development/python-modules/mmpython/default.nix
+++ b/pkgs/development/python-modules/mmpython/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPyPy
diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix
index d7ca86b8ea3..69cdf7b56b0 100644
--- a/pkgs/development/python-modules/mockito/default.nix
+++ b/pkgs/development/python-modules/mockito/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
 
 buildPythonPackage rec {
   version = "1.2.2";
diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix
index a7862ef5c67..202589b7435 100644
--- a/pkgs/development/python-modules/modestmaps/default.nix
+++ b/pkgs/development/python-modules/modestmaps/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pillow
diff --git a/pkgs/development/python-modules/mongodict/default.nix b/pkgs/development/python-modules/mongodict/default.nix
index 467093e84ce..c2fbd6a7ad1 100644
--- a/pkgs/development/python-modules/mongodict/default.nix
+++ b/pkgs/development/python-modules/mongodict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pymongo
diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix
index d39f67a7311..5a96682accd 100644
--- a/pkgs/development/python-modules/moretools/default.nix
+++ b/pkgs/development/python-modules/moretools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , six, pathpy, zetup, pytest
 , decorator }:
 
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 8bc984a5287..4cd1fec3d8b 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
diff --git a/pkgs/development/python-modules/mox/default.nix b/pkgs/development/python-modules/mox/default.nix
index 94d4791224d..380dbe594a5 100644
--- a/pkgs/development/python-modules/mox/default.nix
+++ b/pkgs/development/python-modules/mox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 }:
diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix
index 77a02ae8a73..1883c9c8c01 100644
--- a/pkgs/development/python-modules/mox3/default.nix
+++ b/pkgs/development/python-modules/mox3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix
index 55afb1773fe..0caa347edac 100644
--- a/pkgs/development/python-modules/mozsvc/default.nix
+++ b/pkgs/development/python-modules/mozsvc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pyramid
diff --git a/pkgs/development/python-modules/mpd/default.nix b/pkgs/development/python-modules/mpd/default.nix
index 212e6b5f13c..b535144fac9 100644
--- a/pkgs/development/python-modules/mpd/default.nix
+++ b/pkgs/development/python-modules/mpd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix
index 7fdf64c0e4b..031f26c4997 100644
--- a/pkgs/development/python-modules/mpd2/default.nix
+++ b/pkgs/development/python-modules/mpd2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix
index 86d55b34f04..3569f6239f0 100644
--- a/pkgs/development/python-modules/mpmath/default.nix
+++ b/pkgs/development/python-modules/mpmath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix
index 64d0ce13a86..8921719a3ae 100644
--- a/pkgs/development/python-modules/mrbob/default.nix
+++ b/pkgs/development/python-modules/mrbob/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, lib, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six
+{ buildPythonPackage, lib, glibcLocales, mock, nose, isPy3k, jinja2, six
 , fetchPypi
 }:
 
diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
index 56bfa06a628..8b50e04d428 100644
--- a/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cython
diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix
index 16c4cc0f43a..e615b3e34e2 100644
--- a/pkgs/development/python-modules/msrplib/default.nix
+++ b/pkgs/development/python-modules/msrplib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchdarcs
 , eventlib
diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/pkgs/development/python-modules/multi_key_dict/default.nix
index f76cde9bec5..cb539e4dd90 100644
--- a/pkgs/development/python-modules/multi_key_dict/default.nix
+++ b/pkgs/development/python-modules/multi_key_dict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix
index 2ff2ce4cefb..f6ca7c1d690 100644
--- a/pkgs/development/python-modules/munch/default.nix
+++ b/pkgs/development/python-modules/munch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix
index cb88b666cfa..ffb4f877490 100644
--- a/pkgs/development/python-modules/munkres/default.nix
+++ b/pkgs/development/python-modules/munkres/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index 68aa29a6ede..c2a7eb19337 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cython
diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix
index 02ec3815711..e5f5eff6b28 100644
--- a/pkgs/development/python-modules/musicbrainzngs/default.nix
+++ b/pkgs/development/python-modules/musicbrainzngs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix
index 45725c0fabb..ee190008f59 100644
--- a/pkgs/development/python-modules/mutag/default.nix
+++ b/pkgs/development/python-modules/mutag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 , isPy3k
diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix
index 1d6b5ce8df4..98f96d13212 100644
--- a/pkgs/development/python-modules/muttils/default.nix
+++ b/pkgs/development/python-modules/muttils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPy3k
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index ac9373b574a..2eed1eefeec 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , requests, requests_oauthlib, six
 , pytest, pytestcache, pytestcov, responses, mock
 }:
diff --git a/pkgs/development/python-modules/mwlib-ext/default.nix b/pkgs/development/python-modules/mwlib-ext/default.nix
index 0a81fd58d7e..b9b18eaf9e5 100644
--- a/pkgs/development/python-modules/mwlib-ext/default.nix
+++ b/pkgs/development/python-modules/mwlib-ext/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/mwlib-rl/default.nix b/pkgs/development/python-modules/mwlib-rl/default.nix
index d27de2ed45c..fdb70726eb6 100644
--- a/pkgs/development/python-modules/mwlib-rl/default.nix
+++ b/pkgs/development/python-modules/mwlib-rl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mwlib
diff --git a/pkgs/development/python-modules/mwlib/default.nix b/pkgs/development/python-modules/mwlib/default.nix
index e9defe3ee14..d9edb2ef3ba 100644
--- a/pkgs/development/python-modules/mwlib/default.nix
+++ b/pkgs/development/python-modules/mwlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix
index 0546688b867..56aa4661516 100644
--- a/pkgs/development/python-modules/mwparserfromhell/default.nix
+++ b/pkgs/development/python-modules/mwparserfromhell/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix
index f444ba039c2..69178edb691 100644
--- a/pkgs/development/python-modules/mypy-protobuf/default.nix
+++ b/pkgs/development/python-modules/mypy-protobuf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonApplication, protobuf }:
+{ lib, fetchPypi, buildPythonApplication, protobuf }:
 
 buildPythonApplication rec {
   pname = "mypy-protobuf";
diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix
index 21a3ee21dbd..5992a6815d8 100644
--- a/pkgs/development/python-modules/mypy/extensions.nix
+++ b/pkgs/development/python-modules/mypy/extensions.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }:
+{ lib, fetchPypi, buildPythonPackage, typing, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "mypy-extensions";
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index 9d91543b7ff..b7a0f39990e 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
+{ lib, buildPythonPackage, fetchPypi, libmysqlclient }:
 
 buildPythonPackage rec {
   pname = "mysqlclient";
diff --git a/pkgs/development/python-modules/namebench/default.nix b/pkgs/development/python-modules/namebench/default.nix
index eefdcce7990..b7b542b8a7a 100644
--- a/pkgs/development/python-modules/namebench/default.nix
+++ b/pkgs/development/python-modules/namebench/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , isPyPy
diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix
index 0c8e442affc..0d7b53f03cb 100644
--- a/pkgs/development/python-modules/nameparser/default.nix
+++ b/pkgs/development/python-modules/nameparser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix
index f6131cd5309..8712c582bed 100644
--- a/pkgs/development/python-modules/nanoleaf/default.nix
+++ b/pkgs/development/python-modules/nanoleaf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "nanoleaf";
diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix
index 4cf33fb2074..765941457d4 100644
--- a/pkgs/development/python-modules/nanomsg-python/default.nix
+++ b/pkgs/development/python-modules/nanomsg-python/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }:
+{ lib, buildPythonPackage, fetchFromGitHub, nanomsg }:
 
 buildPythonPackage {
   pname = "nanomsg-python";
diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index d846511eb3f..c320415e075 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder,
+{ lib, buildPythonPackage, fetchPypi, pythonOlder,
   async_generator, traitlets, nbformat, nest-asyncio, jupyter_client,
   pytest, xmltodict, nbconvert, ipywidgets
 , doCheck ? true
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 28946bd1a6e..3826a746758 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }:
+{ lib, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }:
 
 let
   pname = "nbxmpp";
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index f933587dcad..ba3b9e4b087 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , paramiko
diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix
index 7768614a5d1..0082b8e8db2 100644
--- a/pkgs/development/python-modules/ndg-httpsclient/default.nix
+++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pyopenssl
diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix
index 7f4aab9c371..3f7f78a374c 100644
--- a/pkgs/development/python-modules/netaddr/default.nix
+++ b/pkgs/development/python-modules/netaddr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 456124b19bd..60f7dbe6c23 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, pytest
+{ lib, buildPythonPackage, fetchPypi, isPyPy, pytest
 , numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index e546ac6cd57..489b6bddf56 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }:
 
 buildPythonPackage rec {
   pname = "netdisco";
diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix
index 07dc63c2181..f7638b29a4c 100644
--- a/pkgs/development/python-modules/netifaces/default.nix
+++ b/pkgs/development/python-modules/netifaces/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix
index b81398f918c..2d388dfa4c2 100644
--- a/pkgs/development/python-modules/neuronpy/default.nix
+++ b/pkgs/development/python-modules/neuronpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix
index 356754fdeac..b608ae58fc7 100644
--- a/pkgs/development/python-modules/nevow/default.nix
+++ b/pkgs/development/python-modules/nevow/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }:
+{ lib, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }:
 
 buildPythonPackage rec {
   pname = "Nevow";
diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix
index dc889440aa4..eb04e0c4d89 100644
--- a/pkgs/development/python-modules/nimfa/default.nix
+++ b/pkgs/development/python-modules/nimfa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/nine/default.nix b/pkgs/development/python-modules/nine/default.nix
index 1747332ed5a..e2ca5c6f27d 100644
--- a/pkgs/development/python-modules/nine/default.nix
+++ b/pkgs/development/python-modules/nine/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix
index cb7871aed61..6229baef32a 100644
--- a/pkgs/development/python-modules/nipy/default.nix
+++ b/pkgs/development/python-modules/nipy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix
index 4edd31d6a25..acebe5d758f 100644
--- a/pkgs/development/python-modules/nixpkgs/default.nix
+++ b/pkgs/development/python-modules/nixpkgs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pbr
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 5ba62fb9210..535ff621de5 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }:
+{ lib, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   version = "0.7.0";
diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix
index 98f336c4986..ebd0178602c 100644
--- a/pkgs/development/python-modules/noise/default.nix
+++ b/pkgs/development/python-modules/noise/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "noise";
diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix
index 185270176ac..b75dcc526c5 100644
--- a/pkgs/development/python-modules/nose-cover3/default.nix
+++ b/pkgs/development/python-modules/nose-cover3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix
index 4f90ee4be8b..f4959ec7be7 100644
--- a/pkgs/development/python-modules/nose-cprof/default.nix
+++ b/pkgs/development/python-modules/nose-cprof/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix
index 8e31867d85c..2805dc4545a 100644
--- a/pkgs/development/python-modules/nose-focus/default.nix
+++ b/pkgs/development/python-modules/nose-focus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti
+{ lib, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti
 , nose-pattern-exclude, which }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix
index 2bd63f3295d..16fb264b39a 100644
--- a/pkgs/development/python-modules/nose-of-yeti/default.nix
+++ b/pkgs/development/python-modules/nose-of-yeti/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }:
+{ lib, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }:
 
 buildPythonPackage rec {
   pname = "nose-of-yeti";
diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix
index 05a7102f1ae..a550dc5aee1 100644
--- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix
+++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "nose-pattern-exclude";
diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix
index 2805b7c2ea1..456bbfd9aed 100644
--- a/pkgs/development/python-modules/nose/default.nix
+++ b/pkgs/development/python-modules/nose/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix
index b815e223d82..29ea73619ff 100644
--- a/pkgs/development/python-modules/nose2/default.nix
+++ b/pkgs/development/python-modules/nose2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix
index b920bb40736..bef7058bc3f 100644
--- a/pkgs/development/python-modules/nose_progressive/default.nix
+++ b/pkgs/development/python-modules/nose_progressive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix
index c165e87ff2e..f80953bd2d7 100644
--- a/pkgs/development/python-modules/nosejs/default.nix
+++ b/pkgs/development/python-modules/nosejs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix
index 36747a50aae..f60ed65448d 100644
--- a/pkgs/development/python-modules/nosexcover/default.nix
+++ b/pkgs/development/python-modules/nosexcover/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , coverage
diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix
index 970928e03f4..bde039836ff 100644
--- a/pkgs/development/python-modules/notmuch/2.nix
+++ b/pkgs/development/python-modules/notmuch/2.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , buildPythonPackage
 , notmuch
 , python
diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix
index 609d4c78d5d..90695b84c66 100644
--- a/pkgs/development/python-modules/notmuch/default.nix
+++ b/pkgs/development/python-modules/notmuch/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , buildPythonPackage
 , notmuch
 , python
diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix
index 266482a8ff2..be8a370f3f3 100644
--- a/pkgs/development/python-modules/ntplib/default.nix
+++ b/pkgs/development/python-modules/ntplib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix
index 0c71b065a32..8e2f630fdba 100644
--- a/pkgs/development/python-modules/numericalunits/default.nix
+++ b/pkgs/development/python-modules/numericalunits/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 832e281a9a1..17537be82b4 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix
index 4676fdef0cd..c8147d9d9a4 100644
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
+{ lib, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
 , blockdiag, setuptools
 }:
 
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix
index 4057ba1de8a..38920dc5542 100644
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 , isPy3k
diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix
index 158cf036840..fd12a830472 100644
--- a/pkgs/development/python-modules/oath/default.nix
+++ b/pkgs/development/python-modules/oath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/oauth/default.nix b/pkgs/development/python-modules/oauth/default.nix
index 0e53eaec7c0..c74de8d6bd6 100644
--- a/pkgs/development/python-modules/oauth/default.nix
+++ b/pkgs/development/python-modules/oauth/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix
index 70b2e94e37c..d9c0ae505f7 100644
--- a/pkgs/development/python-modules/oauth2/default.nix
+++ b/pkgs/development/python-modules/oauth2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , httplib2
diff --git a/pkgs/development/python-modules/oauthlib/3.1.nix b/pkgs/development/python-modules/oauthlib/3.1.nix
index 40501733e4c..10757812037 100644
--- a/pkgs/development/python-modules/oauthlib/3.1.nix
+++ b/pkgs/development/python-modules/oauthlib/3.1.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mock
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index df65547a256..5c4cbc78adb 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , mock
diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix
index 1dec57cafb4..b5736851fbb 100644
--- a/pkgs/development/python-modules/obfsproxy/default.nix
+++ b/pkgs/development/python-modules/obfsproxy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 , pyptlib
diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix
index 8bb119bcb4b..c79b11252be 100644
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix
index edec161a133..1ae555ffa15 100644
--- a/pkgs/development/python-modules/offtrac/default.nix
+++ b/pkgs/development/python-modules/offtrac/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix
index 5ef7060b7f6..72e2be7c78b 100644
--- a/pkgs/development/python-modules/ofxclient/default.nix
+++ b/pkgs/development/python-modules/ofxclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi,
  ofxhome, ofxparse, beautifulsoup4, lxml, keyring
 }:
 
diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix
index d9a28da1806..72ca65ed171 100644
--- a/pkgs/development/python-modules/ofxhome/default.nix
+++ b/pkgs/development/python-modules/ofxhome/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   version = "0.3.3";
diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix
index 235875eec7c..d018a924d89 100644
--- a/pkgs/development/python-modules/ofxparse/default.nix
+++ b/pkgs/development/python-modules/ofxparse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix
index 8f280d1cfd4..a32b0b23294 100644
--- a/pkgs/development/python-modules/ofxtools/default.nix
+++ b/pkgs/development/python-modules/ofxtools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , nose
diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix
index 96c0a0b51be..d2c39e54ef4 100644
--- a/pkgs/development/python-modules/olefile/default.nix
+++ b/pkgs/development/python-modules/olefile/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "olefile";
   version = "0.46";
diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index 99b9cccc7de..ad9da46243b 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix
index 067db3a69fe..08770678432 100644
--- a/pkgs/development/python-modules/onkyo-eiscp/default.nix
+++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , docopt, netifaces }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix
index 374b7cb059d..71f699e0552 100644
--- a/pkgs/development/python-modules/openant/default.nix
+++ b/pkgs/development/python-modules/openant/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pyusb
diff --git a/pkgs/development/python-modules/openbabel-bindings/default.nix b/pkgs/development/python-modules/openbabel-bindings/default.nix
index 18a6a8dd032..6488b8fad2f 100644
--- a/pkgs/development/python-modules/openbabel-bindings/default.nix
+++ b/pkgs/development/python-modules/openbabel-bindings/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, openbabel, python, buildPythonPackage }:
+{ lib, openbabel, python, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "openbabel";
diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix
index 7d373c13a8a..ce6ccee9793 100644
--- a/pkgs/development/python-modules/openidc-client/default.nix
+++ b/pkgs/development/python-modules/openidc-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "openidc-client";
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index 843380ebf21..2ed723944dd 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 }: rec {
   version = "2.9.0";
diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
index 6c22d3bae5d..8b1ff86fcab 100644
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -11,12 +11,11 @@
 , pygobject3
 , pyudev
 , setproctitle
-, stdenv
 , wrapGAppsHook
 }:
 
 let
-  common = import ./common.nix { inherit stdenv lib fetchFromGitHub; };
+  common = import ./common.nix { inherit lib fetchFromGitHub; };
 in
 buildPythonApplication (common // rec {
   pname = "openrazer_daemon";
diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix
index 52fe63318a3..fb83d64c502 100644
--- a/pkgs/development/python-modules/openrazer/pylib.nix
+++ b/pkgs/development/python-modules/openrazer/pylib.nix
@@ -3,12 +3,11 @@
 , dbus-python
 , fetchFromGitHub
 , numpy
-, stdenv
 , openrazer-daemon
 }:
 
 let
-  common = import ./common.nix { inherit stdenv lib fetchFromGitHub; };
+  common = import ./common.nix { inherit lib fetchFromGitHub; };
 in
 buildPythonPackage (common // rec {
   pname = "openrazer";
diff --git a/pkgs/development/python-modules/ordereddict/default.nix b/pkgs/development/python-modules/ordereddict/default.nix
index e2931840a66..6ef00640585 100644
--- a/pkgs/development/python-modules/ordereddict/default.nix
+++ b/pkgs/development/python-modules/ordereddict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix
index 1cd0f648bd3..7c37cc7aa5a 100644
--- a/pkgs/development/python-modules/orderedmultidict/default.nix
+++ b/pkgs/development/python-modules/orderedmultidict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }:
+{ lib, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }:
 
 buildPythonPackage rec {
   pname = "orderedmultidict";
diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix
index aced6cf0853..db9c265ef3e 100644
--- a/pkgs/development/python-modules/orderedset/default.nix
+++ b/pkgs/development/python-modules/orderedset/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "orderedset";
diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix
index dad78727f2d..ac7e401bf6c 100644
--- a/pkgs/development/python-modules/osc/default.nix
+++ b/pkgs/development/python-modules/osc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber
+{ lib, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber
 , m2crypto, rpm, chardet
 }:
 
diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix
index c624e262cf9..e1c22ddbfa3 100755
--- a/pkgs/development/python-modules/osmnx/default.nix
+++ b/pkgs/development/python-modules/osmnx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy
+{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy
 , pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/packaging/2.nix b/pkgs/development/python-modules/packaging/2.nix
index 5d841eb4fb1..a9b4e159469 100644
--- a/pkgs/development/python-modules/packaging/2.nix
+++ b/pkgs/development/python-modules/packaging/2.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyparsing
diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index 973e516f5a9..689c2e4516d 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyparsing
diff --git a/pkgs/development/python-modules/pagelabels/default.nix b/pkgs/development/python-modules/pagelabels/default.nix
index 5daa60f475d..c17f0ad60dd 100644
--- a/pkgs/development/python-modules/pagelabels/default.nix
+++ b/pkgs/development/python-modules/pagelabels/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pdfrw }:
+{ lib, buildPythonPackage, fetchPypi, pdfrw }:
 
 buildPythonPackage rec {
   pname = "pagelabels";
diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/pkgs/development/python-modules/pagerduty/default.nix
index ebe2c8b5854..8390cceb2fc 100644
--- a/pkgs/development/python-modules/pagerduty/default.nix
+++ b/pkgs/development/python-modules/pagerduty/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix
index d61973aa3bf..dce72bb74bb 100644
--- a/pkgs/development/python-modules/palettable/default.nix
+++ b/pkgs/development/python-modules/palettable/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "palettable";
diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index 2e8e4500f24..6df8b5491c9 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mock
diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix
index c4bf9c140df..ea0ba44e99d 100644
--- a/pkgs/development/python-modules/pandas-datareader/default.nix
+++ b/pkgs/development/python-modules/pandas-datareader/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix
index d31bc2657c9..8ca57440b3f 100644
--- a/pkgs/development/python-modules/pandocfilters/default.nix
+++ b/pkgs/development/python-modules/pandocfilters/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix
index 4553b253819..86dbffd76b7 100644
--- a/pkgs/development/python-modules/paperspace/default.nix
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , boto3, requests, gradient_statsd, terminaltables
 , click-completion , click-didyoumean, click-help-colors
 , colorama, requests_toolbelt, gradient_sdk, progressbar2
diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix
index 16925bd1286..207a6a38bd5 100644
--- a/pkgs/development/python-modules/parameterized/default.nix
+++ b/pkgs/development/python-modules/parameterized/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }:
+{ lib, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }:
 
 buildPythonPackage rec {
   pname = "parameterized";
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 65cc79745ca..99065aa1994 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }:
+{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }:
 
 buildPythonPackage rec {
   pname = "paramz";
diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
index d338a351e54..decb15ff5e6 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi
+{ lib, 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 d72e607bc41..c5c0c1d7ae6 100644
--- a/pkgs/development/python-modules/parse/default.nix
+++ b/pkgs/development/python-modules/parse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi
+{ lib, fetchPypi
 , buildPythonPackage, python
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix
index 1f98940fff0..77196a7c0e9 100644
--- a/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/pkgs/development/python-modules/parsedatetime/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix
index d41953246db..557e632f2ed 100644
--- a/pkgs/development/python-modules/parsimonious/default.nix
+++ b/pkgs/development/python-modules/parsimonious/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index a29deed503e..533a4dc3a30 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix
index 950b232fa7e..672708b0fd9 100644
--- a/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/pkgs/development/python-modules/pastedeploy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestrunner
diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix
index 57dbb7b9352..a526d383393 100644
--- a/pkgs/development/python-modules/pastescript/default.nix
+++ b/pkgs/development/python-modules/pastescript/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix
index 96ed85d7bce..2f0a9b9b62b 100644
--- a/pkgs/development/python-modules/patator/default.nix
+++ b/pkgs/development/python-modules/patator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi
+{ lib, buildPythonPackage, isPy27, fetchPypi
 , paramiko, pycurl, ajpy, impacket, pyopenssl, cx_oracle, mysqlclient
 , psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1, pysqlcipher3 }:
 
diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix
index 981dc067fe7..126155722f4 100644
--- a/pkgs/development/python-modules/patch-ng/default.nix
+++ b/pkgs/development/python-modules/patch-ng/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/patch/default.nix b/pkgs/development/python-modules/patch/default.nix
index 8d7e78c6c27..ed11b3a4b52 100644
--- a/pkgs/development/python-modules/patch/default.nix
+++ b/pkgs/development/python-modules/patch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchzip
 }:
diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix
index 9512b0eb0b8..bd71ffad0f2 100644
--- a/pkgs/development/python-modules/path-and-address/default.nix
+++ b/pkgs/development/python-modules/path-and-address/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix
index 77807090602..fd6bd238d1e 100644
--- a/pkgs/development/python-modules/pathos/default.nix
+++ b/pkgs/development/python-modules/pathos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , dill
diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix
index 57fff82a81d..86c2aeb88dc 100644
--- a/pkgs/development/python-modules/pathtools/default.nix
+++ b/pkgs/development/python-modules/pathtools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix
index 1420597a1f3..2fa07d32ccb 100644
--- a/pkgs/development/python-modules/patool/default.nix
+++ b/pkgs/development/python-modules/patool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip,
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip,
   unzip, cabextract, zip, zopfli, lzip, zpaq, gnutar, gnugrep, diffutils, file,
   gzip, bzip2, xz}:
 
diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix
index 5d01df22b6d..8721ef3dd60 100644
--- a/pkgs/development/python-modules/paver/default.nix
+++ b/pkgs/development/python-modules/paver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix
index 18a2b9b95a3..8f489ca24b9 100644
--- a/pkgs/development/python-modules/pbkdf2/default.nix
+++ b/pkgs/development/python-modules/pbkdf2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pbkdf2";
diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index 6a12eea1b00..bd6432db534 100644
--- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder
+{ lib, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder
 , buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix
index aea7ff0fcda..704e979c2ca 100644
--- a/pkgs/development/python-modules/pcpp/default.nix
+++ b/pkgs/development/python-modules/pcpp/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix
index adc43ef4c2e..4eddc028a25 100644
--- a/pkgs/development/python-modules/pdf2image/default.nix
+++ b/pkgs/development/python-modules/pdf2image/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }:
+{ lib, buildPythonPackage, fetchPypi, pillow, poppler_utils }:
 
 buildPythonPackage rec {
   pname = "pdf2image";
diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix
index 10bc09e8ca9..431f7f09796 100644
--- a/pkgs/development/python-modules/pdfkit/default.nix
+++ b/pkgs/development/python-modules/pdfkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix
index 9a659eebe33..96ba6686905 100644
--- a/pkgs/development/python-modules/pdfminer_six/default.nix
+++ b/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }:
 
 buildPythonPackage rec {
   pname = "pdfminer_six";
diff --git a/pkgs/development/python-modules/pdfposter/default.nix b/pkgs/development/python-modules/pdfposter/default.nix
index 0a21ed1e499..00cfea5cc9b 100644
--- a/pkgs/development/python-modules/pdfposter/default.nix
+++ b/pkgs/development/python-modules/pdfposter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pypdf2 }:
+{ lib, buildPythonPackage, fetchPypi, pypdf2 }:
 
 buildPythonPackage rec {
   pname = "pdftools.pdfposter";
diff --git a/pkgs/development/python-modules/pdfrw/default.nix b/pkgs/development/python-modules/pdfrw/default.nix
index 49abb3751c9..5cc619ef6a4 100644
--- a/pkgs/development/python-modules/pdfrw/default.nix
+++ b/pkgs/development/python-modules/pdfrw/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pdfrw";
diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix
index 97dee7e7570..a8c110fdba7 100644
--- a/pkgs/development/python-modules/pdfx/default.nix
+++ b/pkgs/development/python-modules/pdfx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }:
 
 buildPythonPackage rec {
   pname = "pdfx";
diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index ed0c89b7802..a66c4077c3c 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , isPy27
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 0b103b780c0..71bec7e42df 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , glibcLocales, git
 , mock, nose, markdown, lxml, typogrify
 , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator
diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix
index 296b55eec12..e9cba70e631 100644
--- a/pkgs/development/python-modules/pep257/default.nix
+++ b/pkgs/development/python-modules/pep257/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchurl, pytest, mock }:
+{ lib, buildPythonPackage, fetchurl, pytest, mock }:
 buildPythonPackage rec {
   pname = "pep257";
   version = "0.7.0";
diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix
index 8ef3bfea0f5..cc0e546b957 100644
--- a/pkgs/development/python-modules/pep8/default.nix
+++ b/pkgs/development/python-modules/pep8/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix
index 6caf61b0cd0..310cc565b21 100644
--- a/pkgs/development/python-modules/peppercorn/default.nix
+++ b/pkgs/development/python-modules/peppercorn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix
index 86bae927d9f..6859b6264a8 100644
--- a/pkgs/development/python-modules/persisting-theory/default.nix
+++ b/pkgs/development/python-modules/persisting-theory/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , nose
 }:
 
diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 1d7de0088a8..e65f62c8ff7 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools
diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix
index 326dde176ae..a31d80eed05 100644
--- a/pkgs/development/python-modules/pexif/default.nix
+++ b/pkgs/development/python-modules/pexif/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix
index d84bb2014b8..e53817b3911 100644
--- a/pkgs/development/python-modules/pg8000/1_12.nix
+++ b/pkgs/development/python-modules/pg8000/1_12.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytz
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 8f63e00e799..9f9bb1702a9 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , scramp
diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/pkgs/development/python-modules/pgpdump/default.nix
index d795cc3678f..e952ced742c 100644
--- a/pkgs/development/python-modules/pgpdump/default.nix
+++ b/pkgs/development/python-modules/pgpdump/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 796a3819881..476921da632 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }:
+{ lib, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }:
 
 buildPythonPackage rec {
   pname = "pgspecial";
diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix
index 5a00a4ccb09..86a5ec848ac 100644
--- a/pkgs/development/python-modules/phe/default.nix
+++ b/pkgs/development/python-modules/phe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } :
+{ lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } :
 
 let
   pname = "phe";
diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index 03e0c54caab..2259fcd7ba5 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }:
+{ lib, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "phonopy";
diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix
index 9ed84e86371..94538dc6e74 100644
--- a/pkgs/development/python-modules/phx-class-registry/default.nix
+++ b/pkgs/development/python-modules/phx-class-registry/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "phx-class-registry";
diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix
index 2151e13b960..34798cc3ee5 100644
--- a/pkgs/development/python-modules/pickleshare/default.nix
+++ b/pkgs/development/python-modules/pickleshare/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pathpy
diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix
index 95aca29da5d..f4ce57b3a20 100644
--- a/pkgs/development/python-modules/pid/default.nix
+++ b/pkgs/development/python-modules/pid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix
index c4fd24d070e..aacd9e314cb 100644
--- a/pkgs/development/python-modules/piep/default.nix
+++ b/pkgs/development/python-modules/piep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix
index a36fcdf18bb..051fdef8fe7 100644
--- a/pkgs/development/python-modules/pika-pool/default.nix
+++ b/pkgs/development/python-modules/pika-pool/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pika
 }:
 
diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix
index ec8310bdb55..c1bfe5297d7 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index ff2a2ce4c5e..38efe0a49b0 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -18,7 +18,7 @@
 , qpdf
 , setuptools-scm-git-archive
 , setuptools_scm
-, lib, stdenv
+, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix
index 4a3c682c122..bc21d6bf465 100644
--- a/pkgs/development/python-modules/pilkit/default.nix
+++ b/pkgs/development/python-modules/pilkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pillow
diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix
index 9e23f69d19c..c022fdb988d 100644
--- a/pkgs/development/python-modules/pillowfight/default.nix
+++ b/pkgs/development/python-modules/pillowfight/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pillow
diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix
index d2a5641acff..bfe4e2b9ea0 100644
--- a/pkgs/development/python-modules/pims/default.nix
+++ b/pkgs/development/python-modules/pims/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , slicerator
diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index aae90d2f8b4..312c87ae544 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }:
+{ lib, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }:
 
 buildPythonPackage rec {
   pname = "pivy";
diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix
index dbf487c5d3a..5216ab17879 100644
--- a/pkgs/development/python-modules/pkginfo/default.nix
+++ b/pkgs/development/python-modules/pkginfo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pkginfo";
diff --git a/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix
index 8e3e301793a..1944ac5197c 100644
--- a/pkgs/development/python-modules/pkuseg/default.nix
+++ b/pkgs/development/python-modules/pkuseg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
index 9e2c66d9d1e..9261133bc92 100644
--- a/pkgs/development/python-modules/plac/default.nix
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix
index 956ea1b720a..697717eeca6 100644
--- a/pkgs/development/python-modules/pluginbase/default.nix
+++ b/pkgs/development/python-modules/pluginbase/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }:
+{ lib, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   version = "1.0.0";
diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix
index d8537d68158..aa247c8e426 100644
--- a/pkgs/development/python-modules/plyvel/default.nix
+++ b/pkgs/development/python-modules/plyvel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
diff --git a/pkgs/development/python-modules/pocket/default.nix b/pkgs/development/python-modules/pocket/default.nix
index 3599d3dec55..e5a2d464bde 100644
--- a/pkgs/development/python-modules/pocket/default.nix
+++ b/pkgs/development/python-modules/pocket/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix
index f7c4e1139a8..00353ac0cca 100644
--- a/pkgs/development/python-modules/polib/default.nix
+++ b/pkgs/development/python-modules/polib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "polib";
diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index 7595730eb31..8f260ad8ccb 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }:
+{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }:
 
 buildPythonPackage rec {
   pname = "pomegranate";
diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix
index 7a734927ee1..03330c4cfec 100644
--- a/pkgs/development/python-modules/pony/default.nix
+++ b/pkgs/development/python-modules/pony/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python, buildPythonPackage, fetchPypi }:
+{ lib, python, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pony";
diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix
index 282239d9890..de0ba145828 100644
--- a/pkgs/development/python-modules/pooch/default.nix
+++ b/pkgs/development/python-modules/pooch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy27
 , fetchPypi
diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix
index 4aaaea40677..e94a234dc1a 100644
--- a/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch
+{ buildPythonPackage, fetchPypi, lib, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch
 , substituteAll
 }:
 
diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index 10b30d05fa3..1408f7ca905 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, setuptools_scm, tempora, pytest-black, pytestcov }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix
index 2fb6128dc1b..59f4b4b707f 100644
--- a/pkgs/development/python-modules/posix_ipc/default.nix
+++ b/pkgs/development/python-modules/posix_ipc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix
index 9f2774b9a60..671010bb900 100644
--- a/pkgs/development/python-modules/potr/default.nix
+++ b/pkgs/development/python-modules/potr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pycrypto }:
+{ lib, fetchPypi, buildPythonPackage, pycrypto }:
 
 buildPythonPackage rec {
   pname = "python-potr";
diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix
index d1998faf6b6..8f72553092e 100644
--- a/pkgs/development/python-modules/power/default.nix
+++ b/pkgs/development/python-modules/power/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix
index e7013154f99..24591824e07 100644
--- a/pkgs/development/python-modules/pox/default.nix
+++ b/pkgs/development/python-modules/pox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix
index d600e46c6b4..b7963258f33 100644
--- a/pkgs/development/python-modules/poyo/default.nix
+++ b/pkgs/development/python-modules/poyo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix
index 00542c6e90e..ad3a393a00d 100644
--- a/pkgs/development/python-modules/ppscore/default.nix
+++ b/pkgs/development/python-modules/ppscore/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix
index 00182eda037..3fc485c00ec 100644
--- a/pkgs/development/python-modules/praw/6.3.nix
+++ b/pkgs/development/python-modules/praw/6.3.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , betamax
 , betamax-serializers
 , betamax-matchers
diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index 61b869e87fb..a4c048e9c9b 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , betamax
 , betamax-serializers
 , betamax-matchers
diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix
index 533c31d87ce..2b6eff885f9 100644
--- a/pkgs/development/python-modules/prawcore/default.nix
+++ b/pkgs/development/python-modules/prawcore/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27
 , requests
 , testfixtures, mock, requests_toolbelt
 , betamax, betamax-serializers, betamax-matchers, pytest
diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix
index a2144f303be..44be123335f 100644
--- a/pkgs/development/python-modules/preggy/default.nix
+++ b/pkgs/development/python-modules/preggy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }:
+{ lib, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }:
 
 buildPythonPackage rec {
   pname = "preggy";
diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix
index 5d75c95d770..767d5b867f0 100644
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , murmurhash
diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix
index 4fe726591e6..87e0e6613b1 100644
--- a/pkgs/development/python-modules/pretend/default.nix
+++ b/pkgs/development/python-modules/pretend/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pretend";
diff --git a/pkgs/development/python-modules/prettytable/1.nix b/pkgs/development/python-modules/prettytable/1.nix
index 5b7457af9bf..0bd18f0721f 100644
--- a/pkgs/development/python-modules/prettytable/1.nix
+++ b/pkgs/development/python-modules/prettytable/1.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index 5a15cfd24eb..5463403dec7 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix
index 00905136716..a2a1d04ebe0 100644
--- a/pkgs/development/python-modules/proboscis/default.nix
+++ b/pkgs/development/python-modules/proboscis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "proboscis";
diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix
index 4b83205d723..abf175b5531 100644
--- a/pkgs/development/python-modules/process-tests/default.nix
+++ b/pkgs/development/python-modules/process-tests/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix
index 3f8c1104381..9839ea9dd23 100644
--- a/pkgs/development/python-modules/proglog/default.nix
+++ b/pkgs/development/python-modules/proglog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, tqdm }:
+{ lib, fetchPypi, buildPythonPackage, tqdm }:
 
 buildPythonPackage rec {
   pname = "proglog";
diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix
index 2c5dbc1386e..fcc1a7a9229 100644
--- a/pkgs/development/python-modules/progress/default.nix
+++ b/pkgs/development/python-modules/progress/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix
index a1fdddd95db..68967ecf653 100644
--- a/pkgs/development/python-modules/progressbar/default.nix
+++ b/pkgs/development/python-modules/progressbar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "progressbar";
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index cc3029ade64..b5c488c0838 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python
 , buildPythonPackage
 , fetchPypi
diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix
index f8980647482..d421efde8aa 100644
--- a/pkgs/development/python-modules/progressbar231/default.nix
+++ b/pkgs/development/python-modules/progressbar231/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "progressbar231";
diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix
index 0b53b83f5cc..a483a6001f0 100644
--- a/pkgs/development/python-modules/progressbar33/default.nix
+++ b/pkgs/development/python-modules/progressbar33/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "progressbar33";
diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix
index 1cd732b19ae..cc9444098de 100644
--- a/pkgs/development/python-modules/proto-plus/default.nix
+++ b/pkgs/development/python-modules/proto-plus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index 9ab4cbf72bd..acee0f09b84 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , lxml
diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix
index ffa9bdacd2d..ae2ad58a1ac 100644
--- a/pkgs/development/python-modules/ptable/default.nix
+++ b/pkgs/development/python-modules/ptable/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }:
+{ lib, buildPythonPackage, fetchFromGitHub, nose }:
 
 buildPythonPackage {
   pname = "ptable";
diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix
index c19780a4411..2a4180a4cbe 100644
--- a/pkgs/development/python-modules/ptest/default.nix
+++ b/pkgs/development/python-modules/ptest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix
index fd7b92692fc..2758c3a582f 100644
--- a/pkgs/development/python-modules/ptpython/default.nix
+++ b/pkgs/development/python-modules/ptpython/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi
+{ lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi
 , pygments, importlib-metadata, isPy3k }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix
index abac4fb3baa..997bc31c865 100644
--- a/pkgs/development/python-modules/publicsuffix/default.nix
+++ b/pkgs/development/python-modules/publicsuffix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "publicsuffix";
diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix
index 2d9bc73baa3..30a02ec2f0d 100644
--- a/pkgs/development/python-modules/publicsuffix2/default.nix
+++ b/pkgs/development/python-modules/publicsuffix2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }:
+{ lib, buildPythonPackage, fetchFromGitHub, requests }:
 
 buildPythonPackage rec {
   pname = "publicsuffix2";
diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix
index 0ee2a8470b5..db48fbf1e48 100644
--- a/pkgs/development/python-modules/pudb/default.nix
+++ b/pkgs/development/python-modules/pudb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pygments
diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix
index 9679cc593df..636cbaff71c 100644
--- a/pkgs/development/python-modules/pure-pcapy3/default.nix
+++ b/pkgs/development/python-modules/pure-pcapy3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pure-pcapy3";
diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix
index 715b2ca6902..3615935b88e 100644
--- a/pkgs/development/python-modules/purepng/default.nix
+++ b/pkgs/development/python-modules/purepng/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , python
 , fetchFromGitHub
diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix
index 1093f125a96..1ef14af135f 100644
--- a/pkgs/development/python-modules/pushover/default.nix
+++ b/pkgs/development/python-modules/pushover/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 006246e5836..3a93b36cb2b 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six
 , pytestCheckHook, flaky, mock, pytest-mock, requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix
index fe74fcece1c..1b8e1a3cc6f 100644
--- a/pkgs/development/python-modules/pweave/default.nix
+++ b/pkgs/development/python-modules/pweave/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mock
diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix
index 77f7859c6d4..a24e1d5db13 100644
--- a/pkgs/development/python-modules/pwntools/default.nix
+++ b/pkgs/development/python-modules/pwntools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , debugger
 , fetchPypi
diff --git a/pkgs/development/python-modules/pxml/default.nix b/pkgs/development/python-modules/pxml/default.nix
index 57614089e66..21dc2f4abc4 100644
--- a/pkgs/development/python-modules/pxml/default.nix
+++ b/pkgs/development/python-modules/pxml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , pythonAtLeast
 , isPy27
 , buildPythonPackage
diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix
index fa057ae9925..18fff5ec97f 100644
--- a/pkgs/development/python-modules/py-radix/default.nix
+++ b/pkgs/development/python-modules/py-radix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , coverage
diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
index 4d2b77bb1f2..aa12deabb37 100644
--- a/pkgs/development/python-modules/py/default.nix
+++ b/pkgs/development/python-modules/py/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
+{ lib, buildPythonPackage, fetchPypi, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "py";
diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix
index 1f7aeaf1e11..12297b9a6f7 100644
--- a/pkgs/development/python-modules/py3dns/default.nix
+++ b/pkgs/development/python-modules/py3dns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index 71314a08eeb..bd0f179dc85 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix
index 588d7a32d22..8eb1649fcc5 100644
--- a/pkgs/development/python-modules/py4j/default.nix
+++ b/pkgs/development/python-modules/py4j/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, stdenv }:
+{ buildPythonPackage, fetchPypi, lib }:
 
 buildPythonPackage rec {
   pname = "py4j";
diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix
index f53cc45b9fe..c214b375ff3 100644
--- a/pkgs/development/python-modules/pyGithub/default.nix
+++ b/pkgs/development/python-modules/pyGithub/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , cryptography
 , deprecated
diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix
index af86ce3821e..b5ae4193f18 100644
--- a/pkgs/development/python-modules/py_scrypt/default.nix
+++ b/pkgs/development/python-modules/py_scrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , openssl
diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix
index d424b214429..5bebb1d5bc7 100644
--- a/pkgs/development/python-modules/pyacoustid/default.nix
+++ b/pkgs/development/python-modules/pyacoustid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix
index 075103e9e40..680a8f6f830 100644
--- a/pkgs/development/python-modules/pyalgotrade/default.nix
+++ b/pkgs/development/python-modules/pyalgotrade/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , matplotlib
diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix
index f0cf111a87a..cebb1cc3f0b 100644
--- a/pkgs/development/python-modules/pyamf/default.nix
+++ b/pkgs/development/python-modules/pyamf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }:
+{ lib, fetchPypi, buildPythonPackage, isPy3k, defusedxml }:
 
 buildPythonPackage rec {
   pname = "PyAMF";
diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix
index 9c9c18a886e..332a4161fe7 100644
--- a/pkgs/development/python-modules/pyannotate/default.nix
+++ b/pkgs/development/python-modules/pyannotate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix
index 2be2e8b9c11..4bb515e17aa 100644
--- a/pkgs/development/python-modules/pyasn1-modules/default.nix
+++ b/pkgs/development/python-modules/pyasn1-modules/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyasn1
diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix
index 9b269f79c86..a0037d64683 100644
--- a/pkgs/development/python-modules/pyasn1/default.nix
+++ b/pkgs/development/python-modules/pyasn1/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, }:
+{ lib, buildPythonPackage, fetchPypi, }:
 
 buildPythonPackage rec {
   pname = "pyasn1";
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 187f94dbd77..9e4f872e6f2 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage
+{ lib, buildPythonPackage
 , aiohttp
 , aiozeroconf
 , asynctest
diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix
index d88dc7009b7..e937b8759f6 100644
--- a/pkgs/development/python-modules/pyaudio/default.nix
+++ b/pkgs/development/python-modules/pyaudio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index 63e180b11b2..e77c6dda840 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, lib, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:
+{ buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytest, isPy3k }:
 
 buildPythonPackage rec {
   version = "0.3.24";
diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index e462d53fea8..aa65d7ccadf 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, lib, stdenv, fetchPypi, six, pytest }:
+{ buildPythonPackage, isPy3k, lib, fetchPypi, six, pytest }:
 
 buildPythonPackage rec {
   pname = "pybase64";
diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix
index 4b6f7f1682f..9e8174f9b7f 100644
--- a/pkgs/development/python-modules/pybindgen/default.nix
+++ b/pkgs/development/python-modules/pybindgen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }:
+{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }:
 buildPythonPackage rec {
   pname = "PyBindGen";
   version = "0.21.0";
diff --git a/pkgs/development/python-modules/pyblosxom/default.nix b/pkgs/development/python-modules/pyblosxom/default.nix
index dee6aea559a..77e47eb9836 100644
--- a/pkgs/development/python-modules/pyblosxom/default.nix
+++ b/pkgs/development/python-modules/pyblosxom/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , pygments
diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix
index a02861c68cd..1cd7d91ef25 100644
--- a/pkgs/development/python-modules/pybluez/default.nix
+++ b/pkgs/development/python-modules/pybluez/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pkgs
diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix
index eacbd81055c..7517de59754 100644
--- a/pkgs/development/python-modules/pybrowserid/default.nix
+++ b/pkgs/development/python-modules/pybrowserid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , requests, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix
index 1353af406ca..af9f18aad2c 100644
--- a/pkgs/development/python-modules/pycallgraph/default.nix
+++ b/pkgs/development/python-modules/pycallgraph/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 6fc9d2af1cb..1f7ccde2576 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie
+{ lib, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie
 , sqlite, buildPythonPackage, cython
 }:
 
diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix
index ab9088cf1e5..7e8954e04d0 100644
--- a/pkgs/development/python-modules/pycapnp/default.nix
+++ b/pkgs/development/python-modules/pycapnp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , capnproto
 , cython
diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/pkgs/development/python-modules/pycarddav/default.nix
index 7885cf65b83..b3479695a89 100644
--- a/pkgs/development/python-modules/pycarddav/default.nix
+++ b/pkgs/development/python-modules/pycarddav/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix
index 8404063ac1f..9b3ec94babc 100644
--- a/pkgs/development/python-modules/pycares/default.nix
+++ b/pkgs/development/python-modules/pycares/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix
index 2c2399fca92..f020361474a 100644
--- a/pkgs/development/python-modules/pychart/default.nix
+++ b/pkgs/development/python-modules/pychart/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+{ lib, buildPythonPackage, fetchPypi, isPy27 }:
 
 buildPythonPackage rec {
   pname = "pychart";
diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix
index 1702cde840c..ddd7dec820d 100644
--- a/pkgs/development/python-modules/pychef/default.nix
+++ b/pkgs/development/python-modules/pychef/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix
index e8938954709..27a2a1d8084 100644
--- a/pkgs/development/python-modules/pyclipper/default.nix
+++ b/pkgs/development/python-modules/pyclipper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , setuptools_scm
diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix
index ada4eeeb556..8e0a9e3b152 100644
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/pkgs/development/python-modules/pycm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }:
 
 buildPythonPackage rec {
   pname = "pycm";
diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix
index a21c8f6f549..d42cfcadfee 100644
--- a/pkgs/development/python-modules/pycoin/default.nix
+++ b/pkgs/development/python-modules/pycoin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , gnupg
diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
index 4b177012f4e..e8e0809c022 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }:
+{ lib, fetchPypi, buildPythonPackage, numpy, dateutil }:
 
 buildPythonPackage rec {
   pname = "pycollada";
diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix
index 0b511e024dc..2a90bef7256 100644
--- a/pkgs/development/python-modules/pycontracts/default.nix
+++ b/pkgs/development/python-modules/pycontracts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , nose, pyparsing, decorator, six, future }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
index b402e909240..525a5610711 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 ,
diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix
index a246ce53a1e..5fe7cab1cdb 100644
--- a/pkgs/development/python-modules/pycparser/default.nix
+++ b/pkgs/development/python-modules/pycparser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, python }:
+{ lib, buildPythonPackage, fetchPypi, python }:
 
 buildPythonPackage rec {
   pname = "pycparser";
diff --git a/pkgs/development/python-modules/pycryptopp/default.nix b/pkgs/development/python-modules/pycryptopp/default.nix
index 0f17d9e59a8..7079cde0d59 100644
--- a/pkgs/development/python-modules/pycryptopp/default.nix
+++ b/pkgs/development/python-modules/pycryptopp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix
index 763cfb9b845..44913e1de47 100644
--- a/pkgs/development/python-modules/pydenticon/default.nix
+++ b/pkgs/development/python-modules/pydenticon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pillow
diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix
index 08c5f099d28..be3cddc7c14 100644
--- a/pkgs/development/python-modules/pydicom/default.nix
+++ b/pkgs/development/python-modules/pydicom/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix
index d132fad7313..d949b16d105 100644
--- a/pkgs/development/python-modules/pydispatcher/default.nix
+++ b/pkgs/development/python-modules/pydispatcher/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/pydns/default.nix b/pkgs/development/python-modules/pydns/default.nix
index a93820bfaef..a6fb07c1520 100644
--- a/pkgs/development/python-modules/pydns/default.nix
+++ b/pkgs/development/python-modules/pydns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix
index 10ade4fa2ca..83820629552 100644
--- a/pkgs/development/python-modules/pyechonest/default.nix
+++ b/pkgs/development/python-modules/pyechonest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "pyechonest";
diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix
index 712db3e8712..7e388b93971 100644
--- a/pkgs/development/python-modules/pyee/default.nix
+++ b/pkgs/development/python-modules/pyee/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, stdenv, isPy27 }:
+{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, isPy27 }:
 
 buildPythonPackage rec {
   pname = "pyee";
diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index 4e7594fbab5..c7b277a6098 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }:
+{ lib, buildPythonPackage, fetchPypi, numpy, cython }:
 
 buildPythonPackage rec {
   pname = "pyemd";
diff --git a/pkgs/development/python-modules/pyexcelerator/default.nix b/pkgs/development/python-modules/pyexcelerator/default.nix
index 37388507394..b3a376616d3 100644
--- a/pkgs/development/python-modules/pyexcelerator/default.nix
+++ b/pkgs/development/python-modules/pyexcelerator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix
index befbd3c2de1..eb88bf78586 100644
--- a/pkgs/development/python-modules/pyext/default.nix
+++ b/pkgs/development/python-modules/pyext/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage {
     pname = "pyext";
diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix
index a17388b34b5..d7c77e763e7 100644
--- a/pkgs/development/python-modules/pyfantom/default.nix
+++ b/pkgs/development/python-modules/pyfantom/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 }:
diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix
index ff66dc8f867..155254a6af3 100644
--- a/pkgs/development/python-modules/pyfftw/default.nix
+++ b/pkgs/development/python-modules/pyfftw/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix
index a4fe9ec9dfe..e9671e03cb3 100644
--- a/pkgs/development/python-modules/pyfiglet/default.nix
+++ b/pkgs/development/python-modules/pyfiglet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   version = "0.8.post1";
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index 2ff88a78a4e..cf1b8878183 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }:
 
 buildPythonPackage rec {
   pname = "pyflakes";
diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
index 5d0d72eb495..b3aa456c4a9 100644
--- a/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mock
diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix
index 8648ad4f876..c8b52fce409 100644
--- a/pkgs/development/python-modules/pyfttt/default.nix
+++ b/pkgs/development/python-modules/pyfttt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index 6855c9e4f02..ec4cff2de61 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , fetchpatch
diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix
index afca3dd7bc1..00965b4a149 100644
--- a/pkgs/development/python-modules/pygame_sdl2/default.nix
+++ b/pkgs/development/python-modules/pygame_sdl2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchurl, isPy27
+{ lib, buildPythonPackage, fetchurl, isPy27
 , 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 a1a6b0222b8..7e06b27a23f 100644
--- a/pkgs/development/python-modules/pygccxml/default.nix
+++ b/pkgs/development/python-modules/pygccxml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, castxml, fetchFromGitHub, buildPythonPackage,
+{ lib, castxml, fetchFromGitHub, buildPythonPackage,
 llvmPackages }:
 buildPythonPackage rec {
   pname = "pygccxml";
diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix
index 7aa16ac1e9a..b9b588d669a 100644
--- a/pkgs/development/python-modules/pygeoip/default.nix
+++ b/pkgs/development/python-modules/pygeoip/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , nose }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix
index 2e5d6271c66..152e9463b0e 100644
--- a/pkgs/development/python-modules/pygments-better-html/default.nix
+++ b/pkgs/development/python-modules/pygments-better-html/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pygments
diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
index 31a6b043494..0a88e34005c 100644
--- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
+++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pygments
diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix
index 416410ab3ce..29be02751bb 100644
--- a/pkgs/development/python-modules/pygpgme/default.nix
+++ b/pkgs/development/python-modules/pygpgme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchurl, isPyPy
+{ lib, buildPythonPackage, fetchurl, isPyPy
 , gpgme }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index f239647bafa..e9b66a95771 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz
+{ lib, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz
 , pkg-config, doctest-ignore-unicode, mock, nose }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix
index 20a96d1f8f2..92526b465b1 100644
--- a/pkgs/development/python-modules/pygreat/default.nix
+++ b/pkgs/development/python-modules/pygreat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }:
+{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }:
 
 buildPythonPackage {
   pname = "pygreat";
diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix
index 8f694a117fe..56d8b05af9a 100644
--- a/pkgs/development/python-modules/pygrok/default.nix
+++ b/pkgs/development/python-modules/pygrok/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, regex, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, regex, pytest }:
 
 buildPythonPackage rec {
   pname = "pygrok";
diff --git a/pkgs/development/python-modules/pyhamcrest/1.nix b/pkgs/development/python-modules/pyhamcrest/1.nix
index 5df52d9b658..4c2ec4df681 100644
--- a/pkgs/development/python-modules/pyhamcrest/1.nix
+++ b/pkgs/development/python-modules/pyhamcrest/1.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , mock, pytest
 , six
 }:
diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
index a66e26b1319..fd6ba2f2df9 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , mock, pytest
 , six
 }:
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 502d648b400..65d3f60da04 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pyhomematic";
diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix
index 3512e33c81d..e152002cdd1 100644
--- a/pkgs/development/python-modules/pyicu/default.nix
+++ b/pkgs/development/python-modules/pyicu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix
index 92c2f5bb671..e5714ec1800 100644
--- a/pkgs/development/python-modules/pyinotify/default.nix
+++ b/pkgs/development/python-modules/pyinotify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix
index a52a0bb4001..1d4f4cfa784 100644
--- a/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/pkgs/development/python-modules/pyinputevent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix
index f37ddb2483e..3161548f8b5 100644
--- a/pkgs/development/python-modules/pykdtree/default.nix
+++ b/pkgs/development/python-modules/pykdtree/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }:
+{ lib, buildPythonPackage, fetchPypi, numpy, nose, openmp }:
 
 buildPythonPackage rec {
   pname = "pykdtree";
diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix
index 07a32a25a0c..13d7a4fd248 100644
--- a/pkgs/development/python-modules/pykerberos/default.nix
+++ b/pkgs/development/python-modules/pykerberos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, krb5 }:
+{ lib, fetchPypi, buildPythonPackage, krb5 }:
 
 buildPythonPackage rec {
   pname = "pykerberos";
diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix
index bc10295e232..8b1eefdafed 100644
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ b/pkgs/development/python-modules/pykickstart/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , urlgrabber
diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index 707554be559..26812ff9151 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six
+{ lib, buildPythonPackage, fetchPypi, isPy3k, certifi, six
 , setuptools_scm
 }:
 
diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix
index 25989d0353e..2cabb78544e 100644
--- a/pkgs/development/python-modules/pylibconfig2/default.nix
+++ b/pkgs/development/python-modules/pylibconfig2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pyparsing }:
+{ lib, buildPythonPackage, fetchPypi, pyparsing }:
 buildPythonPackage rec {
   pname = "pylibconfig2";
   version = "0.2.5";
diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix
index 454f08fd10e..64f8e62c286 100644
--- a/pkgs/development/python-modules/pyliblo/default.nix
+++ b/pkgs/development/python-modules/pyliblo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPyPy
diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
index 8bb62c09134..9fb8401bdc4 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, stdenv, libmemcached, zlib, cyrus_sasl }:
+{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }:
 
 buildPythonPackage rec {
   version = "1.6.1";
diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix
index 3b35ce3e716..8869924bddb 100644
--- a/pkgs/development/python-modules/pymaging/default.nix
+++ b/pkgs/development/python-modules/pymaging/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix
index 64ea5b4ff5b..6d12ddd4006 100644
--- a/pkgs/development/python-modules/pymaging_png/default.nix
+++ b/pkgs/development/python-modules/pymaging_png/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pymaging
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 84fcdbef6a3..bae7a561323 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , enum34
 , glibcLocales
 , matplotlib
diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix
index 96fb9d6f694..13e80a38e4b 100644
--- a/pkgs/development/python-modules/pymeeus/default.nix
+++ b/pkgs/development/python-modules/pymeeus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "PyMeeus";
diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/pkgs/development/python-modules/pymemoize/default.nix
index b44ff9fef49..f66a6ef702b 100644
--- a/pkgs/development/python-modules/pymemoize/default.nix
+++ b/pkgs/development/python-modules/pymemoize/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , django
diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix
index 84139091ae4..72a17f27dca 100644
--- a/pkgs/development/python-modules/pymetar/default.nix
+++ b/pkgs/development/python-modules/pymetar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python, buildPythonPackage, isPy3k, fetchPypi }:
+{ lib, python, buildPythonPackage, isPy3k, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pymetar";
diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix
index 2b10e2f164f..b3d91c595d8 100644
--- a/pkgs/development/python-modules/pymetno/default.nix
+++ b/pkgs/development/python-modules/pymetno/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , aiohttp
diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix
index d69c0011ac5..84ab3dcab1b 100644
--- a/pkgs/development/python-modules/pymsgbox/default.nix
+++ b/pkgs/development/python-modules/pymsgbox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, tkinter }:
+{ lib, fetchPypi, buildPythonPackage, tkinter }:
 
 buildPythonPackage rec {
   pname = "PyMsgBox";
diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 8ce7d5a19c6..501f829dc14 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
+{ lib, buildPythonPackage, fetchPypi, mupdf, swig }:
 buildPythonPackage rec {
   pname = "pymupdf";
   version = "1.18.0";
diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix
index 6009b03e508..49b5a49193d 100644
--- a/pkgs/development/python-modules/pymysqlsa/default.nix
+++ b/pkgs/development/python-modules/pymysqlsa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pymysql
diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix
index 656825a36bb..a6df8cb036d 100644
--- a/pkgs/development/python-modules/pynac/default.nix
+++ b/pkgs/development/python-modules/pynac/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 }:
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index be69bf3d802..37cf0a9ef10 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix
index 6214f3db42b..7ca72293382 100644
--- a/pkgs/development/python-modules/pynest2d/default.nix
+++ b/pkgs/development/python-modules/pynest2d/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake
+{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake
 , pythonOlder, libnest2d, sip, clipper }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix
index 0ecac704e1e..28e9922e172 100644
--- a/pkgs/development/python-modules/pynisher/default.nix
+++ b/pkgs/development/python-modules/pynisher/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, psutil, docutils }:
+{ lib, buildPythonPackage, fetchPypi, psutil, docutils }:
 
 buildPythonPackage rec {
   pname = "pynisher";
diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix
index 294c2374f53..3f1cca75dc1 100644
--- a/pkgs/development/python-modules/pynzb/default.nix
+++ b/pkgs/development/python-modules/pynzb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index 2dec1d8705b..8f2686a7914 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }:
+{ lib, buildPythonPackage, fetchPypi, isPyPy, unixODBC }:
 
 buildPythonPackage rec {
   pname = "pyodbc";
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index 4171eaeeb57..cf881a58048 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , Mako
diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
index 23de6b2323f..c6839bba989 100644
--- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix
+++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
@@ -1,7 +1,6 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
-, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index ffe7bf01423..c54e220228a 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
 , pandoc, haskellPackages, texlive }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index d69b1078aee..1244f374b44 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix
index cd91cc347a4..26d27f4455a 100644
--- a/pkgs/development/python-modules/pypdf2/default.nix
+++ b/pkgs/development/python-modules/pypdf2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , glibcLocales
diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix
index 1f16a307a0c..8b630f743d1 100644
--- a/pkgs/development/python-modules/pypeg2/default.nix
+++ b/pkgs/development/python-modules/pypeg2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix
index d8b9abcf97a..2f573b67838 100644
--- a/pkgs/development/python-modules/pyphen/default.nix
+++ b/pkgs/development/python-modules/pyphen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "Pyphen";
diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix
index bc0e4535999..1fc4198ebeb 100644
--- a/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/pkgs/development/python-modules/pypillowfight/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow
+{ lib, buildPythonPackage, fetchFromGitLab, nose, pillow
 , isPy3k, isPyPy
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix
index 8747840fd7c..0c8c6c4328a 100644
--- a/pkgs/development/python-modules/pyplatec/default.nix
+++ b/pkgs/development/python-modules/pyplatec/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix
index 83190bc292a..348f9171502 100644
--- a/pkgs/development/python-modules/pypoppler/default.nix
+++ b/pkgs/development/python-modules/pypoppler/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix
index d270136558f..9c13a953570 100644
--- a/pkgs/development/python-modules/pyprind/default.nix
+++ b/pkgs/development/python-modules/pyprind/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , psutil
 , pytest }:
 
diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix
index af2575d2143..9f9f99884b9 100644
--- a/pkgs/development/python-modules/pyptlib/default.nix
+++ b/pkgs/development/python-modules/pyptlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
index b806177b4d7..22ac89cf6a9 100644
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
 , django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index 98b30b24707..f43bfb9aaa6 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix
index 2496d9d968f..2bb2eb1c6fc 100644
--- a/pkgs/development/python-modules/pyquery/default.nix
+++ b/pkgs/development/python-modules/pyquery/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cssselect
diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
index 5f1e5c7d75a..44ac5a9221a 100644
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/pkgs/development/python-modules/pyramid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , webtest
diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix
index 88dc62886fc..5c4e7c104bf 100644
--- a/pkgs/development/python-modules/pyramid_beaker/default.nix
+++ b/pkgs/development/python-modules/pyramid_beaker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }:
+{ lib, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }:
 
 buildPythonPackage rec {
   pname = "pyramid_beaker";
diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix
index 2bb5a03bdb9..d3388fdff35 100644
--- a/pkgs/development/python-modules/pyramid_chameleon/default.nix
+++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , chameleon
diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix
index 80514cc91b4..55da77f4964 100644
--- a/pkgs/development/python-modules/pyramid_exclog/default.nix
+++ b/pkgs/development/python-modules/pyramid_exclog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyramid
diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix
index ab4025b7230..f2f156e98b6 100644
--- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix
+++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pyramid
diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix
index 0497ab79613..464d8d209bf 100644
--- a/pkgs/development/python-modules/pyramid_jinja2/default.nix
+++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , webtest
diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix
index 8c71563e2d7..2f8c5e1e075 100644
--- a/pkgs/development/python-modules/pyramid_mako/default.nix
+++ b/pkgs/development/python-modules/pyramid_mako/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , webtest
diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix
index 9167918fc47..545883a25c1 100644
--- a/pkgs/development/python-modules/pyramid_multiauth/default.nix
+++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyramid
diff --git a/pkgs/development/python-modules/pyreport/default.nix b/pkgs/development/python-modules/pyreport/default.nix
index 09a1e7c6b41..6b9649699ba 100644
--- a/pkgs/development/python-modules/pyreport/default.nix
+++ b/pkgs/development/python-modules/pyreport/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix
index 6d49bd02594..b1d5f4efb09 100644
--- a/pkgs/development/python-modules/pyres/default.nix
+++ b/pkgs/development/python-modules/pyres/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
+{ lib, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
 
 let
 
diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix
index f6be3c4c897..9885d4f5443 100644
--- a/pkgs/development/python-modules/pyrfc3339/default.nix
+++ b/pkgs/development/python-modules/pyrfc3339/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytz
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
index a84b22e0656..626560d89b6 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -1,7 +1,6 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
-, lib
 , python
 , serpent
 , dill
diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix
index e533f650169..bddf2413970 100644
--- a/pkgs/development/python-modules/pyroma/default.nix
+++ b/pkgs/development/python-modules/pyroma/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , docutils, pygments, setuptools
 }:
 
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index f2378863720..e5c87a94b07 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, buildPythonPackage, fetchPypi}:
+{lib, buildPythonPackage, fetchPypi}:
 
 buildPythonPackage rec {
   pname = "pyroute2";
diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix
index f8ac5d8e867..cb1da523868 100644
--- a/pkgs/development/python-modules/pyrr/default.nix
+++ b/pkgs/development/python-modules/pyrr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools
diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index 211bc85f511..79f6666474e 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix
index e3586e6dbf1..4a7dc788caa 100644
--- a/pkgs/development/python-modules/pyrss2gen/default.nix
+++ b/pkgs/development/python-modules/pyrss2gen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 7d2fdb5b426..2ffbb97223f 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchFromGitHub
diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix
index 6da19bc48ab..e4e7791fa79 100644
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix
index a35f2ae77f0..1a7c783e829 100644
--- a/pkgs/development/python-modules/pysendfile/default.nix
+++ b/pkgs/development/python-modules/pysendfile/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix
index 214412c4cee..8cff62b89c1 100644
--- a/pkgs/development/python-modules/pysensors/default.nix
+++ b/pkgs/development/python-modules/pysensors/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
+{ lib, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
 buildPythonPackage {
   version = "2017-07-13";
   pname = "pysensors";
diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix
index ff3d624490b..54f3f80a3f8 100644
--- a/pkgs/development/python-modules/pyserial-asyncio/default.nix
+++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , pyserial }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix
index 28daf6b385e..3333a30bd1a 100644
--- a/pkgs/development/python-modules/pysftp/default.nix
+++ b/pkgs/development/python-modules/pysftp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index 661c70a0ab2..7f494e98ad2 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , setuptools }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix
index 8e31735db2e..ccacb412924 100644
--- a/pkgs/development/python-modules/pysigset/default.nix
+++ b/pkgs/development/python-modules/pysigset/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pysigset";
diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix
index 6834a78f428..bea1438f679 100644
--- a/pkgs/development/python-modules/pysmbc/default.nix
+++ b/pkgs/development/python-modules/pysmbc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , samba, pkg-config
 , setuptools }:
 
diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix
index 02559510100..25f5fc6a20c 100644
--- a/pkgs/development/python-modules/pysmf/default.nix
+++ b/pkgs/development/python-modules/pysmf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }:
 
 buildPythonPackage rec {
   pname = "pysmf";
diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix
index 953581aa302..7b96b97f0bb 100644
--- a/pkgs/development/python-modules/pysmi/default.nix
+++ b/pkgs/development/python-modules/pysmi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , ply
diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index 7dce4d9b4d1..0b0e298d5d0 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyasn1
diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix
index 79c163726b7..70fb74ab4dd 100644
--- a/pkgs/development/python-modules/pysocks/default.nix
+++ b/pkgs/development/python-modules/pysocks/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index 342755131a3..f8a7c09b407 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, stdenv, py4j }:
+{ buildPythonPackage, fetchPypi, lib, py4j }:
 
 buildPythonPackage rec {
   pname = "pyspark";
diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix
index 7c5d8ca5abf..8445f6d7e89 100644
--- a/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }:
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }:
 
 buildPythonPackage rec {
   pname = "pysqueezebox";
diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix
index 4012a732466..1099bffc40f 100644
--- a/pkgs/development/python-modules/pysrt/default.nix
+++ b/pkgs/development/python-modules/pysrt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , chardet
diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix
index 4f73ada61af..cdbbfeabf88 100644
--- a/pkgs/development/python-modules/pyssim/default.nix
+++ b/pkgs/development/python-modules/pyssim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }:
+{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }:
 
 buildPythonPackage rec {
   pname = "pyssim";
diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
index 6ed036aecb1..c93655e10a8 100644
--- a/pkgs/development/python-modules/pystache/default.nix
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }:
+{ lib, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "pystache";
diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix
index 69186591949..e77dd605388 100644
--- a/pkgs/development/python-modules/pystemd/default.nix
+++ b/pkgs/development/python-modules/pystemd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python, systemd }:
+{ lib, python, systemd }:
 
 python.pkgs.buildPythonPackage rec {
   pname = "pystemd";
diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix
index 0ba23ffec5d..120867f389c 100644
--- a/pkgs/development/python-modules/pystemmer/default.nix
+++ b/pkgs/development/python-modules/pystemmer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python, fetchPypi, buildPythonPackage, cython }:
+{ lib, python, fetchPypi, buildPythonPackage, cython }:
 
 buildPythonPackage rec {
   pname = "PyStemmer";
diff --git a/pkgs/development/python-modules/pytabix/default.nix b/pkgs/development/python-modules/pytabix/default.nix
index db8437d8957..fb2e622eac9 100644
--- a/pkgs/development/python-modules/pytabix/default.nix
+++ b/pkgs/development/python-modules/pytabix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchPypi
diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix
index 636210c93d5..a54c89f348d 100644
--- a/pkgs/development/python-modules/pytado/default.nix
+++ b/pkgs/development/python-modules/pytado/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "PyTado";
diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix
index 65d3d9218d0..e930f1d5717 100644
--- a/pkgs/development/python-modules/pyte/default.nix
+++ b/pkgs/development/python-modules/pyte/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
 
 buildPythonPackage rec {
   pname = "pyte";
diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix
index 7384eb36070..fad9a70af0f 100644
--- a/pkgs/development/python-modules/pytest-aiohttp/default.nix
+++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }:
+{ lib, buildPythonPackage, fetchPypi, pytest, aiohttp }:
 
 buildPythonPackage rec {
   pname = "pytest-aiohttp";
diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix
index 1a7f77bf9b6..68b67f061bb 100644
--- a/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/pkgs/development/python-modules/pytest-annotate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyannotate
diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 309a33e8907..4ca6bdac6e9 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , ansible
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index c621d9a4785..0f37d09a9e0 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
+{ lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
 buildPythonPackage rec {
   pname = "pytest-asyncio";
   version = "0.14.0";
diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix
index 493a2307e7e..83757c2e166 100644
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , execnet
 , glob2
 , Mako
diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix
index 2fb02244d1d..39c26a3e0f3 100644
--- a/pkgs/development/python-modules/pytest-catchlog/default.nix
+++ b/pkgs/development/python-modules/pytest-catchlog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, unzip }:
+{ lib, buildPythonPackage, fetchPypi, pytest, unzip }:
 
 buildPythonPackage rec {
   pname = "pytest-catchlog";
diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix
index 034c657b5b0..414cf1ecc9c 100644
--- a/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/pkgs/development/python-modules/pytest-celery/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, setuptools_scm }:
+{ lib, buildPythonPackage, fetchPypi, pytest, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "pytest-celery";
diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
index 41f316a18a6..a0ae504746d 100644
--- a/pkgs/development/python-modules/pytest-check/default.nix
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix
index aa921ddeb3d..003d7e14ab5 100644
--- a/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/pkgs/development/python-modules/pytest-cov/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, coverage }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix
index b1cdb1033a6..1dc218c0808 100644
--- a/pkgs/development/python-modules/pytest-datadir/default.nix
+++ b/pkgs/development/python-modules/pytest-datadir/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , setuptools_scm, pytest, cmake
 }:
 
diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix
index bc6e2441b0f..bdcab2788ae 100644
--- a/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/pkgs/development/python-modules/pytest-datafiles/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, py, pytest }:
+{ lib, buildPythonPackage, fetchPypi, py, pytest }:
 
 buildPythonPackage rec {
   pname = "pytest-datafiles";
diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix
index 9a3dbed55b1..7108a8f4c17 100644
--- a/pkgs/development/python-modules/pytest-dependency/default.nix
+++ b/pkgs/development/python-modules/pytest-dependency/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest }:
 
 buildPythonPackage rec {
   version = "0.5.1";
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 069aa2812eb..bfcda812529 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix
index 061f62bfc17..32392f8f14c 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , setuptools-git, pytest }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index fd4ed097806..805c19751ed 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , pytest
 , pyflakes
 }:
diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix
index 74e33a7731b..7b459b4a294 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/pkgs/development/python-modules/pytest-flask/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }:
+{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }:
 
 buildPythonPackage rec {
   pname = "pytest-flask";
diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
index 41263ce692b..c634aa00718 100644
--- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
+++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage
 , fetchFromGitHub
 , pytest
-, lib, stdenv
+, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix
index 0b1090f7b81..1b09d6863b9 100644
--- a/pkgs/development/python-modules/pytest-html/default.nix
+++ b/pkgs/development/python-modules/pytest-html/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , pytest, pytest-metadata, setuptools_scm }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix
index e8b224dc1d4..f7766003be1 100644
--- a/pkgs/development/python-modules/pytest-metadata/default.nix
+++ b/pkgs/development/python-modules/pytest-metadata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, setuptools_scm }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix
index 0cc3a993c23..30a2757ecf3 100644
--- a/pkgs/development/python-modules/pytest-mpl/default.nix
+++ b/pkgs/development/python-modules/pytest-mpl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix
index eb5203c0246..827386786b7 100644
--- a/pkgs/development/python-modules/pytest-pep257/default.nix
+++ b/pkgs/development/python-modules/pytest-pep257/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pep257 }:
 
 buildPythonPackage rec {
   pname = "pytest-pep257";
diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 5148fa4b760..4e08a8fabba 100644
--- a/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }:
 buildPythonPackage rec {
   pname = "pytest-quickcheck";
   version = "0.8.6";
diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix
index 0d02a25ec3c..78b99714378 100644
--- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix
+++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , py, pytest }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix
index 2def886c5cb..d84bb3c9acf 100644
--- a/pkgs/development/python-modules/pytest-random-order/default.nix
+++ b/pkgs/development/python-modules/pytest-random-order/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix
index 401307039e5..19d031b6a2b 100644
--- a/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/pkgs/development/python-modules/pytest-relaxed/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 537f32316a3..1bd91fe70f7 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }:
+{ lib, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "pytest-rerunfailures";
diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix
index 41fcfc7b159..ca3c9a37c1a 100644
--- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix
+++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, pytest-shutil, pytest-fixture-config, psutil
 , requests, future, retry }:
 
diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index 3edafdfb473..9d088e44f8d 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, isPyPy, buildPythonPackage, fetchPypi
+{ lib, isPyPy, buildPythonPackage, fetchPypi
 , pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet
 , contextlib2, termcolor }:
 
diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix
index f7454ee644c..5006ac51150 100644
--- a/pkgs/development/python-modules/pytest-subtesthack/default.nix
+++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "pytest-subtesthack";
diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix
index a910bf3245f..8ea981ba2e7 100644
--- a/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix
index 0c5ae06e861..fa794f94141 100644
--- a/pkgs/development/python-modules/pytest-xdist/1.nix
+++ b/pkgs/development/python-modules/pytest-xdist/1.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest
+{ lib, fetchPypi, buildPythonPackage, execnet, pytest
 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index e5019f842fe..30e43c17c91 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6
+{ lib, fetchPypi, buildPythonPackage, execnet, pytest_6
 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix
index 63e57a7f769..f30eec15a0a 100644
--- a/pkgs/development/python-modules/pytest/4.nix
+++ b/pkgs/development/python-modules/pytest/4.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
+{ lib, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
 , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
 }:
diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix
index 1293cc94b0f..341d5ac2240 100644
--- a/pkgs/development/python-modules/pytest/5.nix
+++ b/pkgs/development/python-modules/pytest/5.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
+{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
 , atomicwrites
 , attrs
 , funcsigs
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 6f5c99a99b1..798084d1111 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
+{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
 , atomicwrites
 , attrs
 , funcsigs
diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix
index 877e357d946..cf8643db06d 100644
--- a/pkgs/development/python-modules/pytestcache/default.nix
+++ b/pkgs/development/python-modules/pytestcache/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, execnet }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix
index 7fd901babd0..d6203276b82 100644
--- a/pkgs/development/python-modules/pytestrunner/default.nix
+++ b/pkgs/development/python-modules/pytestrunner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
+{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
 
 buildPythonPackage rec {
   pname = "pytest-runner";
diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix
index 7e94f743da4..e0cb03d611d 100644
--- a/pkgs/development/python-modules/python-doi/default.nix
+++ b/pkgs/development/python-modules/python-doi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }:
 
 buildPythonPackage rec {
   pname = "python-doi";
diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
index 19efcb89d3d..212e191568c 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   version = "1.0.4";
diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix
index 44e35a186e2..293d9771280 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , buildPythonPackage
 , pkg-config
diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix
index f4305473797..f9b01802c42 100644
--- a/pkgs/development/python-modules/python-etcd/default.nix
+++ b/pkgs/development/python-modules/python-etcd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix
index 392c5c2126d..991ec3279de 100644
--- a/pkgs/development/python-modules/python-forecastio/default.nix
+++ b/pkgs/development/python-modules/python-forecastio/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, lib, stdenv, fetchPypi
+{ buildPythonPackage, lib, fetchPypi
 , requests
 , nose
 , responses
diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix
index 661ea4ba249..6c6806f043c 100644
--- a/pkgs/development/python-modules/python-frontmatter/default.nix
+++ b/pkgs/development/python-modules/python-frontmatter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   pname = "python-frontmatter";
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index c706ff7903c..1a2e28d57ab 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }:
+{ lib, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }:
 
 buildPythonPackage rec {
   pname = "python-gitlab";
diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix
index 36ca3a71906..fe686761107 100644
--- a/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/pkgs/development/python-modules/python-gnupg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, gnupg }:
+{ lib, buildPythonPackage, fetchPypi, gnupg }:
 
 buildPythonPackage rec {
   pname   = "python-gnupg";
diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix
index 238b9b9e4af..c8f1179bc66 100644
--- a/pkgs/development/python-modules/python-hosts/default.nix
+++ b/pkgs/development/python-modules/python-hosts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }:
+{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }:
 
 buildPythonPackage rec {
   pname = "python-hosts";
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 0de220094c0..15c6474cc38 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , future, six, ecdsa, rsa
 , pycrypto, pytestcov, pytestrunner, cryptography
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix
index 96ce13ab265..cb36bf50e18 100644
--- a/pkgs/development/python-modules/python-json-logger/default.nix
+++ b/pkgs/development/python-modules/python-json-logger/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 3a0ab33363e..53dab817eb2 100644
--- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , pytestCheckHook, mock, pytestcov, coverage
 , future, futures, ujson, isPy38
 }:
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index f22652d0f73..b30542dacbd 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].
diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix
index 94d8abd1fab..379aaa5ab64 100644
--- a/pkgs/development/python-modules/python-ldap-test/default.nix
+++ b/pkgs/development/python-modules/python-ldap-test/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, py4j }:
+{ lib, buildPythonPackage, fetchPypi, py4j }:
 
 buildPythonPackage rec {
   pname = "python-ldap-test";
diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix
index 60767e77e76..dda64a85fb2 100644
--- a/pkgs/development/python-modules/python-levenshtein/default.nix
+++ b/pkgs/development/python-modules/python-levenshtein/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix
index 6f83a7f61c7..cc38553a817 100644
--- a/pkgs/development/python-modules/python-ly/default.nix
+++ b/pkgs/development/python-modules/python-ly/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, stdenv }:
+{ buildPythonPackage, fetchPypi, lib }:
 
 buildPythonPackage rec {
   pname = "python-ly";
diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix
index a1fd0113423..61194ff8f9c 100644
--- a/pkgs/development/python-modules/python-lzf/default.nix
+++ b/pkgs/development/python-modules/python-lzf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   version = "0.2.4";
diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index fe68ed60e37..36c297358e8 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPyPy
 , python
diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix
index 8321795c2fb..78c89408ac2 100644
--- a/pkgs/development/python-modules/python-miio/default.nix
+++ b/pkgs/development/python-modules/python-miio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , appdirs
diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix
index a24f2a383a3..131c0f2f5ac 100644
--- a/pkgs/development/python-modules/python-mnist/default.nix
+++ b/pkgs/development/python-modules/python-mnist/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "python-mnist";
diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix
index ba3ecd3883a..4bb12ab7237 100644
--- a/pkgs/development/python-modules/python-nomad/default.nix
+++ b/pkgs/development/python-modules/python-nomad/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "python-nomad";
diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix
index 7a40998eebd..6b657dba78d 100644
--- a/pkgs/development/python-modules/python-otr/default.nix
+++ b/pkgs/development/python-modules/python-otr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy3k
diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix
index ba02ec84635..2e2b59eb29d 100644
--- a/pkgs/development/python-modules/python-packer/default.nix
+++ b/pkgs/development/python-modules/python-packer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, sh }:
 
 buildPythonPackage rec {
   pname = "python-packer";
diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix
index 6e0c0ef5788..d776002b212 100644
--- a/pkgs/development/python-modules/python-pipedrive/default.nix
+++ b/pkgs/development/python-modules/python-pipedrive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix
index 2d81581c0cc..1af58300c2f 100644
--- a/pkgs/development/python-modules/python-ptrace/default.nix
+++ b/pkgs/development/python-modules/python-ptrace/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
index c4cf0dc7425..4ef3b9f8379 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix
index 235d085fffd..7a53e73b2b8 100644
--- a/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , redis
diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix
index 8ec7f6887ad..3162a032628 100644
--- a/pkgs/development/python-modules/python-simple-hipchat/default.nix
+++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , unzip }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
index 1860ff6d24d..fd488f4be9d 100644
--- a/pkgs/development/python-modules/python-slugify/default.nix
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, python, text-unidecode }:
+{ lib, fetchPypi, buildPythonPackage, python, text-unidecode }:
 
 buildPythonPackage rec {
     pname = "python-slugify";
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index ee9a6030144..e9c2ae146b0 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , bidict
 , buildPythonPackage
 , fetchFromGitHub
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 52dea24c45f..b681fcf85a9 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , certifi
diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix
index 4b1e7e2c1eb..c368d97633f 100644
--- a/pkgs/development/python-modules/python-twitter/default.nix
+++ b/pkgs/development/python-modules/python-twitter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , fetchpatch
diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix
index 7f6f14c9888..94f56698a3e 100644
--- a/pkgs/development/python-modules/python-u2flib-host/default.nix
+++ b/pkgs/development/python-modules/python-u2flib-host/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, requests, hidapi }:
+{ lib, fetchPypi, buildPythonPackage, requests, hidapi }:
 
 buildPythonPackage rec {
   pname = "python-u2flib-host";
diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix
index 69f741e7437..8d82ffb6b3b 100644
--- a/pkgs/development/python-modules/python-uinput/default.nix
+++ b/pkgs/development/python-modules/python-uinput/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , udev }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix
index fa82027777f..f80721078db 100644
--- a/pkgs/development/python-modules/python-unshare/default.nix
+++ b/pkgs/development/python-modules/python-unshare/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix
index f96086393f2..8c3a5bf797d 100644
--- a/pkgs/development/python-modules/python-vipaccess/default.nix
+++ b/pkgs/development/python-modules/python-vipaccess/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , oath
diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix
index 503fbe101b9..7f6eee4906c 100644
--- a/pkgs/development/python-modules/python-wifi/default.nix
+++ b/pkgs/development/python-modules/python-wifi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix
index b9d9b110f60..78378a738db 100644
--- a/pkgs/development/python-modules/python2-pythondialog/default.nix
+++ b/pkgs/development/python-modules/python2-pythondialog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix
index ad8ea88d1d0..769067f53fb 100644
--- a/pkgs/development/python-modules/python3-openid/default.nix
+++ b/pkgs/development/python-modules/python3-openid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }:
+{ lib, isPy3k, buildPythonPackage, fetchPypi, defusedxml }:
 
 buildPythonPackage rec {
   pname = "python3-openid";
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix
index df12d7aeaff..6a5c6a304f1 100644
--- a/pkgs/development/python-modules/python_fedora/default.nix
+++ b/pkgs/development/python-modules/python_fedora/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver
+{ lib, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver
 , six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/python_keyczar/default.nix b/pkgs/development/python-modules/python_keyczar/default.nix
index 5fff75ada91..66cf28a15dd 100644
--- a/pkgs/development/python-modules/python_keyczar/default.nix
+++ b/pkgs/development/python-modules/python_keyczar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyasn1
diff --git a/pkgs/development/python-modules/python_mimeparse/default.nix b/pkgs/development/python-modules/python_mimeparse/default.nix
index c3f85affe81..0f713bd2139 100644
--- a/pkgs/development/python-modules/python_mimeparse/default.nix
+++ b/pkgs/development/python-modules/python_mimeparse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix
index 2c5357297ea..8f649d4d4d2 100644
--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/pkgs/development/python-modules/python_openzwave/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , pkg-config
 , systemd, libyaml, openzwave, cython, pyserial
 , six, pydispatcher, urwid }:
diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix
index ae293c44c0f..2aabaec2e14 100644
--- a/pkgs/development/python-modules/python_statsd/default.nix
+++ b/pkgs/development/python-modules/python_statsd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix
index c385f11b2f0..6f8b6a2bbec 100644
--- a/pkgs/development/python-modules/pythondialog/default.nix
+++ b/pkgs/development/python-modules/pythondialog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix
index 178e1855a06..54c84fe6ef5 100644
--- a/pkgs/development/python-modules/pythonirclib/default.nix
+++ b/pkgs/development/python-modules/pythonirclib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , paver
diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix
index 80535b28bf2..9261ab2a8f2 100644
--- a/pkgs/development/python-modules/pythonix/default.nix
+++ b/pkgs/development/python-modules/pythonix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }:
+{ lib, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }:
 
 buildPythonPackage rec {
   pname = "pythonix";
diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix
index 1ced6437530..3bf0ad078c5 100644
--- a/pkgs/development/python-modules/pytimeparse/default.nix
+++ b/pkgs/development/python-modules/pytimeparse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, nose }:
+{ lib, fetchPypi, buildPythonPackage, nose }:
 
 buildPythonPackage rec {
     pname = "pytimeparse";
diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix
index 64e6ed4c669..b13dfd07dad 100644
--- a/pkgs/development/python-modules/pytoml/default.nix
+++ b/pkgs/development/python-modules/pytoml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , python
diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix
index 83980c3d00b..3ce1e70e823 100644
--- a/pkgs/development/python-modules/pytrends/default.nix
+++ b/pkgs/development/python-modules/pytrends/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix
index 8e168bf8181..01c4ea014ad 100644
--- a/pkgs/development/python-modules/pytricia/default.nix
+++ b/pkgs/development/python-modules/pytricia/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix
index 2b49b169c6d..3437c0fbe7a 100644
--- a/pkgs/development/python-modules/pytun/default.nix
+++ b/pkgs/development/python-modules/pytun/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix
index 739325d3333..342bb088170 100644
--- a/pkgs/development/python-modules/pytzdata/default.nix
+++ b/pkgs/development/python-modules/pytzdata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "pytzdata";
diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix
index 1eec6f3ea84..dfbae696b8e 100644
--- a/pkgs/development/python-modules/pyunifi/default.nix
+++ b/pkgs/development/python-modules/pyunifi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix
index f33aba8d625..cd0460dc7e1 100644
--- a/pkgs/development/python-modules/pyupdate/default.nix
+++ b/pkgs/development/python-modules/pyupdate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
 , requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix
index f1c0d3be8cc..dd1c7b2da5b 100644
--- a/pkgs/development/python-modules/pyutil/default.nix
+++ b/pkgs/development/python-modules/pyutil/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptoolsDarcs
diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix
index 95477196d8b..0be0d61ed0d 100644
--- a/pkgs/development/python-modules/pyuv/default.nix
+++ b/pkgs/development/python-modules/pyuv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPyPy
 , pkgs
diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix
index 7013cc7809d..2fd5a96fa93 100644
--- a/pkgs/development/python-modules/pyvoro/default.nix
+++ b/pkgs/development/python-modules/pyvoro/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix
index 5e3c4d6cc5a..a2cd2a6eed5 100644
--- a/pkgs/development/python-modules/pywatchman/default.nix
+++ b/pkgs/development/python-modules/pywatchman/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, watchman }:
+{ lib, buildPythonPackage, fetchPypi, watchman }:
 
 buildPythonPackage rec {
   pname = "pywatchman";
diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix
index 5ed3e28b5b1..2f6bb8553a4 100644
--- a/pkgs/development/python-modules/pywebdav/default.nix
+++ b/pkgs/development/python-modules/pywebdav/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }:
+{ lib, fetchPypi, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
   pname = "PyWebDAV";
diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix
index b19e5f97e14..d46bd718a3a 100644
--- a/pkgs/development/python-modules/pyx/default.nix
+++ b/pkgs/development/python-modules/pyx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix
index 03fce00629d..e0434e8e4dd 100644
--- a/pkgs/development/python-modules/pyzufall/default.nix
+++ b/pkgs/development/python-modules/pyzufall/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }:
+{ lib, fetchPypi, python, buildPythonPackage, nose, future, coverage }:
 
 buildPythonPackage rec {
   pname = "PyZufall";
diff --git a/pkgs/development/python-modules/qpid-python/default.nix b/pkgs/development/python-modules/qpid-python/default.nix
index ef540538792..24c90d072a2 100644
--- a/pkgs/development/python-modules/qpid-python/default.nix
+++ b/pkgs/development/python-modules/qpid-python/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPy3k
diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix
index 113d53ff29b..29f2ab49606 100644
--- a/pkgs/development/python-modules/qrcode/default.nix
+++ b/pkgs/development/python-modules/qrcode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix
index 82c3773f303..24719de779e 100644
--- a/pkgs/development/python-modules/qscintilla/default.nix
+++ b/pkgs/development/python-modules/qscintilla/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , disabledIf
 , isPy3k
diff --git a/pkgs/development/python-modules/qserve/default.nix b/pkgs/development/python-modules/qserve/default.nix
index ff606d13236..0548b6fdf17 100644
--- a/pkgs/development/python-modules/qserve/default.nix
+++ b/pkgs/development/python-modules/qserve/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index 11b4885e4c8..4945bead42d 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }:
+{ lib, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }:
 
 buildPythonPackage rec {
   pname = "QtAwesome";
diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index 76db7090a04..17e1d9dbe83 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pyside, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pyside, pytest }:
 
 buildPythonPackage rec {
   pname = "QtPy";
diff --git a/pkgs/development/python-modules/querystring-parser/default.nix b/pkgs/development/python-modules/querystring-parser/default.nix
index 25b3c113cec..6288d196bb4 100644
--- a/pkgs/development/python-modules/querystring-parser/default.nix
+++ b/pkgs/development/python-modules/querystring-parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, python, isPy27
+{ lib, buildPythonPackage, fetchPypi, python, isPy27
 , six
 }:
 
diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix
index 7471ea18065..3814663c044 100644
--- a/pkgs/development/python-modules/queuelib/default.nix
+++ b/pkgs/development/python-modules/queuelib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix
index 79975ada501..0de5d6de3bb 100644
--- a/pkgs/development/python-modules/rabbitpy/default.nix
+++ b/pkgs/development/python-modules/rabbitpy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , mock
diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix
index 5c561b6e654..5d3540e0195 100644
--- a/pkgs/development/python-modules/radicale_infcloud/default.nix
+++ b/pkgs/development/python-modules/radicale_infcloud/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage }:
+{ lib, fetchFromGitHub, buildPythonPackage }:
 
 buildPythonPackage {
   pname = "radicale_infcloud";
diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix
index c5ec1d3ab4e..e484c07f31c 100644
--- a/pkgs/development/python-modules/rainbowstream/default.nix
+++ b/pkgs/development/python-modules/rainbowstream/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix
index 2d3e2bdc0e0..c3ae88d1775 100644
--- a/pkgs/development/python-modules/ramlfications/default.nix
+++ b/pkgs/development/python-modules/ramlfications/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , mock, pytest, pytest-mock, pytest-server-fixtures, pytest-localserver
 , termcolor, click, markdown2, six, jsonref, pyyaml, xmltodict, attrs
 }:
diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix
index 9ed7701a3f4..6845a5707da 100644
--- a/pkgs/development/python-modules/random2/default.nix
+++ b/pkgs/development/python-modules/random2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index 22c34b82a5f..545782d853e 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27
 # unrar is non-free software
 , useUnrar ? false, unrar
 }:
diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/pkgs/development/python-modules/ratelimiter/default.nix
index 4d3ff6d486b..fc51e1488d6 100644
--- a/pkgs/development/python-modules/ratelimiter/default.nix
+++ b/pkgs/development/python-modules/ratelimiter/default.nix
@@ -1,5 +1,5 @@
 {
-  lib, stdenv
+  lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix
index 974f7ac4d1c..0a96123db04 100644
--- a/pkgs/development/python-modules/rawkit/default.nix
+++ b/pkgs/development/python-modules/rawkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, fetchpatch
+{ lib, fetchPypi, buildPythonPackage, fetchpatch
 , libraw
 , pytest, mock }:
 
diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix
index 507102222fe..3de6f203803 100644
--- a/pkgs/development/python-modules/rcssmin/default.nix
+++ b/pkgs/development/python-modules/rcssmin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "rcssmin";
   version = "1.0.6";
diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix
index 211f5d63a7d..ea13c7083fe 100644
--- a/pkgs/development/python-modules/readchar/default.nix
+++ b/pkgs/development/python-modules/readchar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }:
+{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }:
 
 buildPythonPackage rec {
   pname = "readchar";
diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix
index 044c487eb03..95b45185a08 100644
--- a/pkgs/development/python-modules/readme/default.nix
+++ b/pkgs/development/python-modules/readme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index 750efe357c2..8a4754e7a61 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}:
 
 buildPythonPackage rec {
   pname = "rebulk";
diff --git a/pkgs/development/python-modules/recaptcha_client/default.nix b/pkgs/development/python-modules/recaptcha_client/default.nix
index 08e7ff47aa1..dce24cfa7a8 100644
--- a/pkgs/development/python-modules/recaptcha_client/default.nix
+++ b/pkgs/development/python-modules/recaptcha_client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix
index c87a89b82a4..d9dd54e29f4 100644
--- a/pkgs/development/python-modules/reedsolo/default.nix
+++ b/pkgs/development/python-modules/reedsolo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }:
+{ lib, buildPythonPackage, fetchFromGitHub, cython, nose }:
 
 buildPythonPackage rec {
   pname = "reedsolo";
diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix
index dc40763f6fe..078e431f3ba 100644
--- a/pkgs/development/python-modules/remotecv/default.nix
+++ b/pkgs/development/python-modules/remotecv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose
+{ lib, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose
 , preggy, numpy, yanc, nose-focus, mock, opencv }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix
index a8f0f81ee71..a742c422ee9 100644
--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/pkgs/development/python-modules/rencode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 , cython
diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/pkgs/development/python-modules/repeated_test/default.nix
index a9355cda41c..2c51238e19b 100644
--- a/pkgs/development/python-modules/repeated_test/default.nix
+++ b/pkgs/development/python-modules/repeated_test/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , unittest2
diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix
index ad8c3aef2ea..9d6c2c41921 100644
--- a/pkgs/development/python-modules/repocheck/default.nix
+++ b/pkgs/development/python-modules/repocheck/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/pkgs/development/python-modules/repoze_lru/default.nix
index 7b8f0ecd809..e986f47e6e0 100644
--- a/pkgs/development/python-modules/repoze_lru/default.nix
+++ b/pkgs/development/python-modules/repoze_lru/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
index 53761203113..5d5e27a2e11 100644
--- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
+++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_interface
diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix
index f64158f26a1..1b33bb6954b 100644
--- a/pkgs/development/python-modules/repoze_who/default.nix
+++ b/pkgs/development/python-modules/repoze_who/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_interface
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index 2b3d57831c8..d39fcc5f2a6 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , mock, requests, six, urllib3 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix
index cd36a452819..225a8f149e4 100644
--- a/pkgs/development/python-modules/requests-http-signature/default.nix
+++ b/pkgs/development/python-modules/requests-http-signature/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , requests
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
index a1c6f4fb0a1..73272990e0f 100644
--- a/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }:
+{ lib, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }:
 
 buildPythonPackage rec {
   pname = "requests-kerberos";
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index a49b0710220..e0dfb9a24a6 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , urllib3, idna, chardet, certifi
 , pytest }:
 
diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix
index 38b4ae9911d..551c7f5b93e 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/pkgs/development/python-modules/resampy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pytest
diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix
index b3590023373..947aa505f70 100644
--- a/pkgs/development/python-modules/rethinkdb/default.nix
+++ b/pkgs/development/python-modules/rethinkdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix
index 12ba4f9a1a5..c2f91c8fe1b 100644
--- a/pkgs/development/python-modules/retry_decorator/default.nix
+++ b/pkgs/development/python-modules/retry_decorator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix
index 65127d040f4..5e2451affb9 100644
--- a/pkgs/development/python-modules/retrying/default.nix
+++ b/pkgs/development/python-modules/retrying/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix
index c002f0baaa9..b9b7cdb76c4 100644
--- a/pkgs/development/python-modules/rfc-bibtex/default.nix
+++ b/pkgs/development/python-modules/rfc-bibtex/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi, isPy3k }:
+{ lib, buildPythonApplication, fetchPypi, isPy3k }:
 
 buildPythonApplication rec {
   pname = "rfc-bibtex";
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index 561bda08d0c..93f2f2ce37d 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, idna, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchPypi, idna, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "rfc3986";
diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/pkgs/development/python-modules/rfc3987/default.nix
index 1ec8fc2153c..41beb1c8c17 100644
--- a/pkgs/development/python-modules/rfc3987/default.nix
+++ b/pkgs/development/python-modules/rfc3987/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "rfc3987";
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index d19f47281cd..3c0810072c0 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix
index 7ca9d711739..d78c445a3e5 100644
--- a/pkgs/development/python-modules/rjsmin/default.nix
+++ b/pkgs/development/python-modules/rjsmin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "rjsmin";
   version = "1.1.0";
diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix
index 0ac5d9ab2a3..0724abec19a 100644
--- a/pkgs/development/python-modules/rl-coach/default.nix
+++ b/pkgs/development/python-modules/rl-coach/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix
index fe069be459c..4f5d44006c4 100644
--- a/pkgs/development/python-modules/robomachine/default.nix
+++ b/pkgs/development/python-modules/robomachine/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }:
+{ lib, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }:
 
 buildPythonPackage rec {
   pname = "RoboMachine";
diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix
index 3cf064d2669..31b1f43a4e2 100644
--- a/pkgs/development/python-modules/robot-detection/default.nix
+++ b/pkgs/development/python-modules/robot-detection/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six }:
+{ lib, buildPythonPackage, fetchPypi, six }:
 
 buildPythonPackage rec {
   pname = "robot-detection";
diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
index c3eb309dfe0..8dfbb32fe08 100644
--- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , robotframework
diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix
index 967138620e9..f23979f21fd 100644
--- a/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/pkgs/development/python-modules/robotframework-requests/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , unittest2
diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix
index 39e42596e2a..bc9e0873fe5 100644
--- a/pkgs/development/python-modules/robotframework-ride/default.nix
+++ b/pkgs/development/python-modules/robotframework-ride/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }:
+{ lib, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }:
 
 buildPythonPackage rec {
   version = "1.2.3";
diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix
index 5fa87d17d11..6d079a99b4f 100644
--- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix
+++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }:
+{ lib, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }:
 
 buildPythonPackage rec {
   version = "3.0.0";
diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
index 60123d6b87d..fbb8cb034a5 100644
--- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
+{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
 
 buildPythonPackage rec {
   version = "3.3.1";
diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
index 7e3bcbcc55d..62fb43e0269 100644
--- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , robotframework
diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix
index 5bc7bbceae7..9b90b25bfb7 100644
--- a/pkgs/development/python-modules/robotframework-tools/default.nix
+++ b/pkgs/development/python-modules/robotframework-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix
index 953602ca1ad..cc57fa0d026 100644
--- a/pkgs/development/python-modules/robotframework/default.nix
+++ b/pkgs/development/python-modules/robotframework/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "robotframework";
diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix
index b0bd44f9c15..81226a23452 100644
--- a/pkgs/development/python-modules/robotstatuschecker/default.nix
+++ b/pkgs/development/python-modules/robotstatuschecker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }:
+{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework }:
 
 buildPythonPackage rec {
   version = "1.3";
diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix
index 126153ec50e..5c46686adae 100644
--- a/pkgs/development/python-modules/robotsuite/default.nix
+++ b/pkgs/development/python-modules/robotsuite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , unittest2, lxml, robotframework
 }:
 
diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix
index 5e3644468fe..c82eda6e35c 100644
--- a/pkgs/development/python-modules/roku/default.nix
+++ b/pkgs/development/python-modules/roku/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27
+{ lib, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/roman/default.nix b/pkgs/development/python-modules/roman/default.nix
index 33f0f7f18d7..cde0ab0f271 100644
--- a/pkgs/development/python-modules/roman/default.nix
+++ b/pkgs/development/python-modules/roman/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index 65edd602d8d..c4e451aade5 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }:
+{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, nose }:
 
 buildPythonPackage rec {
   pname = "rope";
diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 8b193caa7b8..5a472ceb180 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonApplication
 , fetchPypi
 , capstone
diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix
index 0129ef69e2c..1176fcb4eb0 100644
--- a/pkgs/development/python-modules/routes/default.nix
+++ b/pkgs/development/python-modules/routes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , repoze_lru
diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix
index fb84adb7d24..69a886f6e0d 100644
--- a/pkgs/development/python-modules/rpdb/default.nix
+++ b/pkgs/development/python-modules/rpdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix
index 731a5738e73..5f1cfc622c9 100644
--- a/pkgs/development/python-modules/rpkg/default.nix
+++ b/pkgs/development/python-modules/rpkg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils
+{ lib, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils
 , koji, rpmfluff }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
index 0da9d2b7101..33f8547496d 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }:
+{ lib, pytest, fetchFromGitHub, buildPythonPackage, appdirs }:
 
 buildPythonPackage rec {
   pname = "rply";
diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix
index 96050ba14b0..9957393770b 100644
--- a/pkgs/development/python-modules/rpmfluff/default.nix
+++ b/pkgs/development/python-modules/rpmfluff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , glibcLocales
diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index c9ca5977cb1..8ec05aae9d5 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }:
+{ lib, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }:
 
 buildPythonPackage rec {
   pname = "rq";
diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix
index 8400647aaad..1a9ad2171a0 100644
--- a/pkgs/development/python-modules/rsa/4_0.nix
+++ b/pkgs/development/python-modules/rsa/4_0.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , unittest2
diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix
index b688369beb5..7a990061e00 100644
--- a/pkgs/development/python-modules/rsa/default.nix
+++ b/pkgs/development/python-modules/rsa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , unittest2
diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix
index e53756b0181..e6289378c96 100644
--- a/pkgs/development/python-modules/rtslib/default.nix
+++ b/pkgs/development/python-modules/rtslib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }:
+{ lib, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }:
 
 buildPythonPackage rec {
   pname = "rtslib";
diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix
index 950f523f4a9..1f829bb4e0b 100644
--- a/pkgs/development/python-modules/ruamel_base/default.nix
+++ b/pkgs/development/python-modules/ruamel_base/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix
index 1e5820a37f7..98c36221dcd 100644
--- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix
+++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
index debf2aaf774..8304f5d7dad 100644
--- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchhg
 , ruamel_base
diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix
index edb793c19d5..51cec6f8602 100644
--- a/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/pkgs/development/python-modules/rubymarshal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, hypothesis, isPy3k }:
 
 buildPythonPackage rec {
   pname = "rubymarshal";
diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix
index 1475b003231..ace9b8269c5 100644
--- a/pkgs/development/python-modules/runsnakerun/default.nix
+++ b/pkgs/development/python-modules/runsnakerun/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , squaremap
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 0154059c4f7..9bb2a513174 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }:
+{ lib, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }:
 
 buildPythonPackage rec {
   pname = "s3fs";
diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix
index 9f97757edad..4ffea014001 100644
--- a/pkgs/development/python-modules/sacremoses/default.nix
+++ b/pkgs/development/python-modules/sacremoses/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, lib, stdenv
+, lib
 , fetchFromGitHub
 , click
 , six
diff --git a/pkgs/development/python-modules/safe/default.nix b/pkgs/development/python-modules/safe/default.nix
index d167760c3e0..6a4515b90f8 100644
--- a/pkgs/development/python-modules/safe/default.nix
+++ b/pkgs/development/python-modules/safe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index 5e6aa5927ec..0b8edf8bdd9 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd
+{ lib, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd
 , python-daemon, six, jinja2, mock, click }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix
index a4a19f7ad12..9c26c9e2e2b 100644
--- a/pkgs/development/python-modules/samplerate/default.nix
+++ b/pkgs/development/python-modules/samplerate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , numpy
 , pkgs
diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/pkgs/development/python-modules/sandboxlib/default.nix
index 42872e31891..1be4c485b80 100644
--- a/pkgs/development/python-modules/sandboxlib/default.nix
+++ b/pkgs/development/python-modules/sandboxlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pbr
diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix
index 8a7a62d8ce8..222b4c60c7f 100644
--- a/pkgs/development/python-modules/sapi-python-client/default.nix
+++ b/pkgs/development/python-modules/sapi-python-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }:
+{ lib, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }:
 
 buildPythonPackage rec {
     pname = "sapi-python-client";
diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix
index 5aae6297268..3806ffb9d46 100644
--- a/pkgs/development/python-modules/scales/default.nix
+++ b/pkgs/development/python-modules/scales/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix
index 596ed993233..2eda0cd6ac9 100644
--- a/pkgs/development/python-modules/schedule/default.nix
+++ b/pkgs/development/python-modules/schedule/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , mock
diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix
index 1502c7d10ab..483a891f933 100644
--- a/pkgs/development/python-modules/schema/default.nix
+++ b/pkgs/development/python-modules/schema/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }:
+{ lib, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }:
 
 buildPythonPackage rec {
 
diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
index 8fa0186498f..f14c4d82f42 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , cython
diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix
index 383cf1f70c6..8921e0061aa 100644
--- a/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/pkgs/development/python-modules/scikits-odes/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , fetchPypi
 , fetchurl
diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix
index f5cd96e71aa..abbe932c267 100644
--- a/pkgs/development/python-modules/scp/default.nix
+++ b/pkgs/development/python-modules/scp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , paramiko
diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix
index 900943a0e15..006c8ed0302 100644
--- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix
+++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }:
+{ lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }:
 
 buildPythonPackage rec {
   pname = "scrapy-deltafetch";
diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
index 4f6eecfe914..f9f896a563b 100644
--- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
+++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }:
+{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }:
 
 buildPythonPackage rec {
   pname = "scrapy-fake-useragent";
diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix
index ab00377f4a0..5f6721f8162 100644
--- a/pkgs/development/python-modules/scrapy-splash/default.nix
+++ b/pkgs/development/python-modules/scrapy-splash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, six }:
+{ lib, fetchPypi, buildPythonPackage, scrapy, six }:
 
 buildPythonPackage rec {
   pname = "scrapy-splash";
diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index f71f8d0c263..5f238a7e05f 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
+{ lib, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
 
 buildPythonApplication rec {
   pname = "screeninfo";
diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix
index ab234ce2243..5fe4b2b2ee6 100644
--- a/pkgs/development/python-modules/scripttest/default.nix
+++ b/pkgs/development/python-modules/scripttest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/pkgs/development/python-modules/sdnotify/default.nix
index 0003d9c0131..a447283c63a 100644
--- a/pkgs/development/python-modules/sdnotify/default.nix
+++ b/pkgs/development/python-modules/sdnotify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix
index cc9594d0452..f4a4955a739 100644
--- a/pkgs/development/python-modules/seabreeze/default.nix
+++ b/pkgs/development/python-modules/seabreeze/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonPackage
 , pyusb
diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix
index 637b55eec8d..dbfe4510776 100644
--- a/pkgs/development/python-modules/seekpath/default.nix
+++ b/pkgs/development/python-modules/seekpath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }:
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }:
 
 buildPythonPackage rec {
   pname = "seekpath";
diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix
index ff6b81d3105..bd3f77b5b08 100644
--- a/pkgs/development/python-modules/selectors2/default.nix
+++ b/pkgs/development/python-modules/selectors2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , nose, psutil, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix
index ea3b403fdae..2209ccf43d2 100644
--- a/pkgs/development/python-modules/selectors34/default.nix
+++ b/pkgs/development/python-modules/selectors34/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix
index 83e4879e1fd..518b7637ad7 100644
--- a/pkgs/development/python-modules/semantic/default.nix
+++ b/pkgs/development/python-modules/semantic/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index 71ec776db7c..c281a6d6b0d 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonPackage
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix
index dd324260f83..c1ad64b3f5e 100644
--- a/pkgs/development/python-modules/sentencepiece/default.nix
+++ b/pkgs/development/python-modules/sentencepiece/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, stdenv
+
 , sentencepiece
 , pkg-config
 }:
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index ea9bbc1f0c3..b3a1c4ee2f4 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -17,7 +17,7 @@
 , rq
 , sanic
 , sqlalchemy
-, lib, stdenv
+, lib
 , tornado
 , urllib3
 , trytond
diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix
index 095b47db2bf..8f6d4eb94f5 100644
--- a/pkgs/development/python-modules/sepaxml/default.nix
+++ b/pkgs/development/python-modules/sepaxml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , lxml
 , pytest
 , text-unidecode
diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index ba4cdca0c63..2ae9defc504 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils
+{ lib, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils
 , blockdiag
 }:
 
diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix
index 36840813b40..50f6e0b63a6 100644
--- a/pkgs/development/python-modules/serpent/default.nix
+++ b/pkgs/development/python-modules/serpent/default.nix
@@ -1,7 +1,6 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
-, lib
 , python
 , isPy27
 , enum34
diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix
index fa212d6a4de..a409d48837e 100644
--- a/pkgs/development/python-modules/serversyncstorage/default.nix
+++ b/pkgs/development/python-modules/serversyncstorage/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix
index a9c0e7fda89..9338166efef 100644
--- a/pkgs/development/python-modules/setproctitle/default.nix
+++ b/pkgs/development/python-modules/setproctitle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix
index 18fae7b1610..06e699e19a3 100644
--- a/pkgs/development/python-modules/setuptools-git/default.nix
+++ b/pkgs/development/python-modules/setuptools-git/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix
index ba42c21ad36..f1eb2903f03 100644
--- a/pkgs/development/python-modules/setuptools-lint/default.nix
+++ b/pkgs/development/python-modules/setuptools-lint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pylint }:
+{ lib, buildPythonPackage, fetchPypi, pylint }:
 
 buildPythonPackage rec {
   pname = "setuptools-lint";
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index 2d9a4b17d40..ee4a3b55164 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
index d8558aaf83a..98795eadfd4 100644
--- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
+++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
+{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
 
 buildPythonPackage rec {
   pname = "setuptools-scm-git-archive";
diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix
index a766bb6c294..ba716c313fd 100644
--- a/pkgs/development/python-modules/setuptools_scm/default.nix
+++ b/pkgs/development/python-modules/setuptools_scm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pip, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pip, pytest }:
 
 buildPythonPackage rec {
   pname = "setuptools_scm";
diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix
index f6358a831c9..41fe5043ea8 100644
--- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix
+++ b/pkgs/development/python-modules/setuptoolsdarcs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , darcsver
diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix
index 1d29f77cf0f..bef492e5dbc 100644
--- a/pkgs/development/python-modules/setuptoolstrial/default.nix
+++ b/pkgs/development/python-modules/setuptoolstrial/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix
index 89f716d9be2..fd7d99fbb3f 100644
--- a/pkgs/development/python-modules/sexpdata/default.nix
+++ b/pkgs/development/python-modules/sexpdata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix
index 6884bed2748..1104c843c6e 100644
--- a/pkgs/development/python-modules/sgmllib3k/default.nix
+++ b/pkgs/development/python-modules/sgmllib3k/default.nix
@@ -1,8 +1,7 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
-, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix
index 1ce9a879ee1..cfbd6f92b04 100644
--- a/pkgs/development/python-modules/shap/default.nix
+++ b/pkgs/development/python-modules/shap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
index 77a4b98f54c..300368b31f1 100644
--- a/pkgs/development/python-modules/shellingham/default.nix
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix
index 8fd15b71a01..e7efb1ef2dc 100644
--- a/pkgs/development/python-modules/shippai/default.nix
+++ b/pkgs/development/python-modules/shippai/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "shippai";
diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix
index 35401afa6e3..f1c1efbc0ec 100644
--- a/pkgs/development/python-modules/shortuuid/default.nix
+++ b/pkgs/development/python-modules/shortuuid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchPypi
diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix
index 1499f1ce4bc..7510ba88d1d 100644
--- a/pkgs/development/python-modules/should-dsl/default.nix
+++ b/pkgs/development/python-modules/should-dsl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "should-dsl";
diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix
index 9959f26036c..b733c1c9516 100644
--- a/pkgs/development/python-modules/shouldbe/default.nix
+++ b/pkgs/development/python-modules/shouldbe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , pythonAtLeast
 , fetchPypi
diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix
index 12614a3446b..2f47113408e 100644
--- a/pkgs/development/python-modules/signedjson/default.nix
+++ b/pkgs/development/python-modules/signedjson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , canonicaljson
diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix
index 0c11a2b6c56..1d81ba5180c 100644
--- a/pkgs/development/python-modules/sigtools/default.nix
+++ b/pkgs/development/python-modules/sigtools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , repeated_test
diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix
index 958f53be567..2d29797b28f 100644
--- a/pkgs/development/python-modules/simanneal/default.nix
+++ b/pkgs/development/python-modules/simanneal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
+{ lib, fetchFromGitHub, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   pname = "simanneal";
diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix
index f8d579b6088..7228e6d9f3e 100644
--- a/pkgs/development/python-modules/simple-websocket-server/default.nix
+++ b/pkgs/development/python-modules/simple-websocket-server/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage {
   pname = "simple-websocket-server";
diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix
index 0786ebfae6e..2ad7fe9ba28 100644
--- a/pkgs/development/python-modules/simpleai/default.nix
+++ b/pkgs/development/python-modules/simpleai/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix
index ed86b48fc07..06fe8e236b3 100644
--- a/pkgs/development/python-modules/simplebayes/default.nix
+++ b/pkgs/development/python-modules/simplebayes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , nose
diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix
index 6395f4af223..e81a7d41b7a 100644
--- a/pkgs/development/python-modules/simpleparse/default.nix
+++ b/pkgs/development/python-modules/simpleparse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix
index 40a17926427..ad7cc021439 100644
--- a/pkgs/development/python-modules/skein/default.nix
+++ b/pkgs/development/python-modules/skein/default.nix
@@ -5,7 +5,7 @@
 , jre
 , lib
 , pythonPackages
-, stdenv
+
 }:
 
 let
diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix
index 36ec8b18ca7..958fc613f6f 100644
--- a/pkgs/development/python-modules/sklearn-deap/default.nix
+++ b/pkgs/development/python-modules/sklearn-deap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }:
 
 buildPythonPackage rec {
   pname = "sklearn-deap";
diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix
index 571398b783d..a690788095e 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , aiohttp
diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix
index e6d5e59a80e..07be197f276 100644
--- a/pkgs/development/python-modules/sleekxmpp/default.nix
+++ b/pkgs/development/python-modules/sleekxmpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }:
+{ lib, fetchPypi, buildPythonPackage, dns, pyasn1 }:
 
 buildPythonPackage rec {
   pname = "sleekxmpp";
diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix
index b5521f415d7..83f3e412ddc 100644
--- a/pkgs/development/python-modules/slicer/default.nix
+++ b/pkgs/development/python-modules/slicer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix
index 39669220003..191159a648e 100644
--- a/pkgs/development/python-modules/slicerator/default.nix
+++ b/pkgs/development/python-modules/slicerator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix
index a7520c62a62..0caec499a95 100644
--- a/pkgs/development/python-modules/slob/default.nix
+++ b/pkgs/development/python-modules/slob/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy3k
diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix
index 5d738fea57e..ddca8509744 100644
--- a/pkgs/development/python-modules/slowaes/default.nix
+++ b/pkgs/development/python-modules/slowaes/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix
index 0b36a7e9f6e..ceba9eae9e4 100644
--- a/pkgs/development/python-modules/smartdc/default.nix
+++ b/pkgs/development/python-modules/smartdc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix
index a497f3db413..d1e11e30d61 100644
--- a/pkgs/development/python-modules/smartypants/default.nix
+++ b/pkgs/development/python-modules/smartypants/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchhg
 , isPyPy
diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index 2c54f65d9c3..42602f15e9b 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, tornado }:
+{ lib, fetchPypi, buildPythonPackage, tornado }:
 
 buildPythonPackage rec {
   pname = "snakeviz";
diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix
index 8446683cb1a..c5df9f7d991 100644
--- a/pkgs/development/python-modules/snapcast/default.nix
+++ b/pkgs/development/python-modules/snapcast/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pytest
+{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest
 , construct }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix
index 3364470da1b..84b2bb2e143 100644
--- a/pkgs/development/python-modules/snowballstemmer/default.nix
+++ b/pkgs/development/python-modules/snowballstemmer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, PyStemmer, fetchPypi }:
+{ lib, buildPythonPackage, PyStemmer, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "snowballstemmer";
diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix
index ca9d8707ac6..abfee3718b5 100644
--- a/pkgs/development/python-modules/socksipy-branch/default.nix
+++ b/pkgs/development/python-modules/socksipy-branch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix
index bd351b5e86f..ba1dd1c3011 100644
--- a/pkgs/development/python-modules/somajo/default.nix
+++ b/pkgs/development/python-modules/somajo/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
+{ pkgs, lib, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
 
 buildPythonPackage rec {
   pname = "SoMaJo";
diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index 095c0917e59..7b549933588 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy
+{ lib, buildPythonPackage, fetchPypi, isPyPy
 , dnspython
 , geoip2
 , ipython
diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix
index e918a1aee3b..daeca60c1e1 100644
--- a/pkgs/development/python-modules/sorl_thumbnail/default.nix
+++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix
index ba927431f2c..fb30daf81fe 100644
--- a/pkgs/development/python-modules/spark_parser/default.nix
+++ b/pkgs/development/python-modules/spark_parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix
index b97cbee2a5f..41c11172d9b 100644
--- a/pkgs/development/python-modules/sparqlwrapper/default.nix
+++ b/pkgs/development/python-modules/sparqlwrapper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix
index efb0908dc5f..a9acfb2dbb3 100644
--- a/pkgs/development/python-modules/speaklater/default.nix
+++ b/pkgs/development/python-modules/speaklater/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix
index 08bbb34156b..88da35a0f97 100644
--- a/pkgs/development/python-modules/spglib/default.nix
+++ b/pkgs/development/python-modules/spglib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }:
 
 buildPythonPackage rec {
   pname = "spglib";
diff --git a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
index 77f283795db..d2c20e980e7 100644
--- a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
+++ b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
index 11e3c2a87e9..87da4131351 100644
--- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
+++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , sphinx
diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
index e2bfc5bdaa5..9c3c16657f2 100644
--- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
index 6822c0f153d..068c4d5d2e9 100644
--- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
index a2603b876e5..956e3c033b9 100644
--- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
index 7398cbc433f..1f33c06b984 100644
--- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
index 150840f19b4..8ca631a2b3c 100644
--- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
index 609799f1864..cd67732605b 100644
--- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index 6375bdab3c2..a9548305d3b 100644
--- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
index adf02860d12..9d16ede62a2 100644
--- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
index 52ebe15c1b6..b898e9cb67d 100644
--- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index a3054f34145..2b5beb4df07 100644
--- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
index ee652b42d8a..21ada23d47f 100644
--- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , sphinx
diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
index 2d56b57df9b..a298025f8ba 100644
--- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , sphinx
diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
index db8997dfd21..e028b6eea80 100644
--- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , sphinx
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index e0a8d6b9c18..9533db6e4a7 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
+{ lib, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
   jupyter_client, pyzmq }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix
index 34d59d0eb22..0fb98fa38e3 100644
--- a/pkgs/development/python-modules/spyder/3.nix
+++ b/pkgs/development/python-modules/spyder/3.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle,
+{ lib, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle,
   psutil, pyflakes, rope, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
   spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 26013e71158..e7c94ec724b 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle,
+{ lib, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle,
   psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
   spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server
diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
index 4050adc29f5..33b408240fc 100644
--- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchPypi
 , buildPythonPackage
 , flask
diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix
index 4ef0adefe3e..84be4587e66 100644
--- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchPypi
 , buildPythonPackage
 , sqlalchemy
diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
index 6a8c910cfce..15ac7dc3a55 100644
--- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , pytest
 , Wand
diff --git a/pkgs/development/python-modules/sqlite3dbm/default.nix b/pkgs/development/python-modules/sqlite3dbm/default.nix
index 1d0b3f15c3f..3057f89adf4 100644
--- a/pkgs/development/python-modules/sqlite3dbm/default.nix
+++ b/pkgs/development/python-modules/sqlite3dbm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix
index ccbc6659fe3..f3c438342bc 100644
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix
index c17a88435dd..bab9e2f99f2 100644
--- a/pkgs/development/python-modules/squaremap/default.nix
+++ b/pkgs/development/python-modules/squaremap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , isPy3k
 , fetchPypi
diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix
index 2afbb22d64e..c0d3a0a4aed 100644
--- a/pkgs/development/python-modules/srp/default.nix
+++ b/pkgs/development/python-modules/srp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, lib }:
+{ buildPythonPackage, fetchPypi, six, lib }:
 
 buildPythonPackage rec {
   pname = "srp";
diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix
index f130009d30d..68ca009d9dc 100644
--- a/pkgs/development/python-modules/srptools/default.nix
+++ b/pkgs/development/python-modules/srptools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }:
+{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }:
 
 buildPythonPackage rec {
   pname = "srptools";
diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 42320e50fa8..86b689d09d1 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix
index c399ee760fd..f325d40ba92 100644
--- a/pkgs/development/python-modules/srvlookup/default.nix
+++ b/pkgs/development/python-modules/srvlookup/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , dnspython
 , mock, nose
 }:
diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix
index 8300c3ec2f6..904595865b8 100644
--- a/pkgs/development/python-modules/ssdeep/default.nix
+++ b/pkgs/development/python-modules/ssdeep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pkgs
diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix
index 82ea4b066a3..ac39cffa393 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix
index 9d944e112fe..6bbeb23ed1f 100644
--- a/pkgs/development/python-modules/sseclient/default.nix
+++ b/pkgs/development/python-modules/sseclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27
 , requests, six
 , backports_unittest-mock, pytestCheckHook, pytestrunner }:
 
diff --git a/pkgs/development/python-modules/sslib/default.nix b/pkgs/development/python-modules/sslib/default.nix
index 026ac8a30b7..407053785f0 100644
--- a/pkgs/development/python-modules/sslib/default.nix
+++ b/pkgs/development/python-modules/sslib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }:
+{ lib, fetchPypi, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
   pname = "sslib";
diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix
index 447fed3263c..561a1d14ca4 100644
--- a/pkgs/development/python-modules/statsd/default.nix
+++ b/pkgs/development/python-modules/statsd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/stompclient/default.nix b/pkgs/development/python-modules/stompclient/default.nix
index 17bafbad282..149be55da58 100644
--- a/pkgs/development/python-modules/stompclient/default.nix
+++ b/pkgs/development/python-modules/stompclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/pkgs/development/python-modules/strict-rfc3339/default.nix
index 53701999b02..e76365a525a 100644
--- a/pkgs/development/python-modules/strict-rfc3339/default.nix
+++ b/pkgs/development/python-modules/strict-rfc3339/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "strict-rfc3339";
diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix
index 10afb511393..e02cc0384f9 100644
--- a/pkgs/development/python-modules/stringcase/default.nix
+++ b/pkgs/development/python-modules/stringcase/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, stdenv
+{ buildPythonPackage, fetchPypi, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix
index 2dac94ac15d..2b536fa0e62 100644
--- a/pkgs/development/python-modules/subdownloader/default.nix
+++ b/pkgs/development/python-modules/subdownloader/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , mmpython
diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix
index 4bf74fe00b4..af307919387 100644
--- a/pkgs/development/python-modules/suds-jurko/default.nix
+++ b/pkgs/development/python-modules/suds-jurko/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix
index 24425fef95f..1a96df26da1 100644
--- a/pkgs/development/python-modules/suds/default.nix
+++ b/pkgs/development/python-modules/suds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix
index e647cd4a9d2..e1b3d8c705e 100644
--- a/pkgs/development/python-modules/sumo/default.nix
+++ b/pkgs/development/python-modules/sumo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , h5py
 , matplotlib
 , numpy
diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index efff79f679f..ee21e9c4516 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , rednose
diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix
index f9bec0451ff..436127fae9c 100644
--- a/pkgs/development/python-modules/survey/default.nix
+++ b/pkgs/development/python-modules/survey/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , wrapio
diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix
index 585dbf64b3c..820d4121633 100644
--- a/pkgs/development/python-modules/svg-path/default.nix
+++ b/pkgs/development/python-modules/svg-path/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "svg.path";
   version = "4.0.2";
diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix
index fb0475ef3b9..38516ab73c3 100644
--- a/pkgs/development/python-modules/svg2tikz/default.nix
+++ b/pkgs/development/python-modules/svg2tikz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchgit
 , lxml
diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix
index 613de201b2d..9dbd29739fe 100644
--- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix
+++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }:
+{ lib, buildPythonPackage, fetchPypi, jinja2, flake8 }:
 
 buildPythonPackage rec {
   pname = "swagger-ui-bundle";
diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix
index 321a48e72b6..e213e9e265e 100644
--- a/pkgs/development/python-modules/swspotify/default.nix
+++ b/pkgs/development/python-modules/swspotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }:
+{ lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }:
 
 buildPythonPackage rec {
   pname = "SwSpotify";
diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix
index 20c2a158a3b..5a14e7e7f40 100644
--- a/pkgs/development/python-modules/sybase/default.nix
+++ b/pkgs/development/python-modules/sybase/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , isPy3k
diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix
index 2035ce8b26b..86c330bd1d8 100644
--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }:
+{ lib, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }:
 
 buildPythonPackage rec {
   pname = "systemd";
diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix
index 87a81e4fb17..5d9b5a034c2 100644
--- a/pkgs/development/python-modules/sysv_ipc/default.nix
+++ b/pkgs/development/python-modules/sysv_ipc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/tarman/default.nix b/pkgs/development/python-modules/tarman/default.nix
index 682da22ced8..c2a2c4405e2 100644
--- a/pkgs/development/python-modules/tarman/default.nix
+++ b/pkgs/development/python-modules/tarman/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix
index 5a135894713..9e1ae3302c1 100644
--- a/pkgs/development/python-modules/taskw/default.nix
+++ b/pkgs/development/python-modules/taskw/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index cba34a95a7b..540c315c8ff 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , colorama, mypy, pyyaml, regex
 , dataclasses, typing
 , pytestrunner, pytest-mypy
diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix
index 7e704e0b2c6..2f06b665d33 100644
--- a/pkgs/development/python-modules/tblib/default.nix
+++ b/pkgs/development/python-modules/tblib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "tblib";
diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix
index 95293d095fd..c297efc0efd 100644
--- a/pkgs/development/python-modules/telegram/default.nix
+++ b/pkgs/development/python-modules/telegram/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix
index bca75224fa3..dd3b4641bea 100644
--- a/pkgs/development/python-modules/tensorflow-estimator/default.nix
+++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , numpy
 , absl-py
 , mock
diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix
index df0f4d6208a..e440dab114f 100644
--- a/pkgs/development/python-modules/termcolor/default.nix
+++ b/pkgs/development/python-modules/termcolor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix
index 28e49316ad7..51a0b071224 100644
--- a/pkgs/development/python-modules/terminaltables/default.nix
+++ b/pkgs/development/python-modules/terminaltables/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix
index a5ab52e5cdd..c95bd0c78b6 100644
--- a/pkgs/development/python-modules/testpath/default.nix
+++ b/pkgs/development/python-modules/testpath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix
index c249ca212b6..45093a5f7cf 100644
--- a/pkgs/development/python-modules/testrepository/default.nix
+++ b/pkgs/development/python-modules/testrepository/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , testtools
diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix
index 465384edcb0..8df35ac4b88 100644
--- a/pkgs/development/python-modules/testscenarios/default.nix
+++ b/pkgs/development/python-modules/testscenarios/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , testtools
diff --git a/pkgs/development/python-modules/threadpool/default.nix b/pkgs/development/python-modules/threadpool/default.nix
index 7a1696feb66..9c83e7e45c2 100644
--- a/pkgs/development/python-modules/threadpool/default.nix
+++ b/pkgs/development/python-modules/threadpool/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix
index c7279b867b1..7b16d666870 100644
--- a/pkgs/development/python-modules/thrift/default.nix
+++ b/pkgs/development/python-modules/thrift/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix
index abfad4ffaac..28b2e5a9f93 100644
--- a/pkgs/development/python-modules/thumborpexif/default.nix
+++ b/pkgs/development/python-modules/thumborpexif/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix
index 170360c133e..ce46fd56f24 100644
--- a/pkgs/development/python-modules/tilestache/default.nix
+++ b/pkgs/development/python-modules/tilestache/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , modestmaps
diff --git a/pkgs/development/python-modules/timelib/default.nix b/pkgs/development/python-modules/timelib/default.nix
index 65b121ddfaf..e2f3cc1d3cc 100644
--- a/pkgs/development/python-modules/timelib/default.nix
+++ b/pkgs/development/python-modules/timelib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix
index b1160cafe30..c2d21fea153 100644
--- a/pkgs/development/python-modules/timeout-decorator/default.nix
+++ b/pkgs/development/python-modules/timeout-decorator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "timeout-decorator";
   version = "0.5.0";
diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix
index fc4316c98fe..e1ef7f9edf4 100644
--- a/pkgs/development/python-modules/tissue/default.nix
+++ b/pkgs/development/python-modules/tissue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix
index 302b113364d..7be95b97088 100644
--- a/pkgs/development/python-modules/tlsh/default.nix
+++ b/pkgs/development/python-modules/tlsh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , cmake
diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix
index a952c95d93e..37751890c7b 100644
--- a/pkgs/development/python-modules/tlslite-ng/default.nix
+++ b/pkgs/development/python-modules/tlslite-ng/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , ecdsa
diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix
index a1e78c5db76..52b662be2b2 100644
--- a/pkgs/development/python-modules/tlslite/default.nix
+++ b/pkgs/development/python-modules/tlslite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 875e70cee58..d7eece65002 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder
 , click
 , click-completion
 , factory_boy
diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix
index ec435a0ac35..cf122613f63 100644
--- a/pkgs/development/python-modules/tokenizers/default.nix
+++ b/pkgs/development/python-modules/tokenizers/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchFromGitHub
 , fetchurl
diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix
index 2bed1887016..bed053f8282 100644
--- a/pkgs/development/python-modules/tokenlib/default.nix
+++ b/pkgs/development/python-modules/tokenlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , requests
diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix
index 0d0d87c73d1..bdc1b141eed 100644
--- a/pkgs/development/python-modules/toml/default.nix
+++ b/pkgs/development/python-modules/toml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "toml";
diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix
index 43df3c4e21e..540835c7e31 100644
--- a/pkgs/development/python-modules/toposort/default.nix
+++ b/pkgs/development/python-modules/toposort/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 928616eb4f8..79f6a19ffcb 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , ninja
diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix
index 5309ae47a02..040874286bd 100644
--- a/pkgs/development/python-modules/traceback2/default.nix
+++ b/pkgs/development/python-modules/traceback2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pbr
diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix
index f4c01f003a9..c2adc9ec9c5 100644
--- a/pkgs/development/python-modules/tracing/default.nix
+++ b/pkgs/development/python-modules/tracing/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , sphinx
diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix
index e3bc8b43fe4..d9986dd87fe 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix
index def2559a72d..6bb5987ba48 100644
--- a/pkgs/development/python-modules/transaction/default.nix
+++ b/pkgs/development/python-modules/transaction/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , zope_interface
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 59420475440..efc33ad8a23 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, lib, stdenv
+, lib
 , fetchFromGitHub
 , pythonOlder
 , cookiecutter
diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix
index e270d5a0662..94d3cb85be4 100644
--- a/pkgs/development/python-modules/transip/default.nix
+++ b/pkgs/development/python-modules/transip/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , isPy27
diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix
index 2f39b57b480..f7036128e08 100644
--- a/pkgs/development/python-modules/translationstring/default.nix
+++ b/pkgs/development/python-modules/translationstring/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix
index a128b150579..39901a17f00 100644
--- a/pkgs/development/python-modules/transmissionrpc/default.nix
+++ b/pkgs/development/python-modules/transmissionrpc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 477223e9618..447e2a5b986 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six
+{ lib, fetchPypi, buildPythonPackage, service-identity, requests, six
 , mock, twisted, incremental, pep8, httpbin
 }:
 
diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix
index 537b4db7995..cef74c8636b 100644
--- a/pkgs/development/python-modules/trezor_agent/default.nix
+++ b/pkgs/development/python-modules/trezor_agent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , trezor
diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix
index 0c3efa404ec..db16ed7fafb 100644
--- a/pkgs/development/python-modules/trueskill/default.nix
+++ b/pkgs/development/python-modules/trueskill/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , six }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix
index 24eb1063707..f32045ce9cd 100644
--- a/pkgs/development/python-modules/ttystatus/default.nix
+++ b/pkgs/development/python-modules/ttystatus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , sphinx
diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix
index f2cdbe8dc63..845aff673b7 100644
--- a/pkgs/development/python-modules/tvdb_api/default.nix
+++ b/pkgs/development/python-modules/tvdb_api/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , requests-cache
diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix
index fa155b86f40..6a720421c72 100644
--- a/pkgs/development/python-modules/tvnamer/default.nix
+++ b/pkgs/development/python-modules/tvnamer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix
index 9647dc8ae67..45e59860227 100644
--- a/pkgs/development/python-modules/twiggy/default.nix
+++ b/pkgs/development/python-modules/twiggy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 7931a4ad0ec..ff4bb845c89 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , pyjwt, pysocks, pytz, requests, six, nose, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix
index 72f30514dc6..644a97d2b2e 100644
--- a/pkgs/development/python-modules/twitter-common-collections/default.nix
+++ b/pkgs/development/python-modules/twitter-common-collections/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , twitter-common-lang
diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix
index ee5bf9bdbe1..d718a18822b 100644
--- a/pkgs/development/python-modules/twitter-common-confluence/default.nix
+++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , twitter-common-log
diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix
index 14b0bcd0673..bf9ec099ddb 100644
--- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix
+++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , twitter-common-lang
diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix
index 4b4a5c0fc2e..93178f46792 100644
--- a/pkgs/development/python-modules/twitter-common-lang/default.nix
+++ b/pkgs/development/python-modules/twitter-common-lang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix
index 8cf99c39dc2..61f5d99a8f1 100644
--- a/pkgs/development/python-modules/twitter-common-log/default.nix
+++ b/pkgs/development/python-modules/twitter-common-log/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , twitter-common-options
diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix
index a5505330bc0..b3ae7f7f5d9 100644
--- a/pkgs/development/python-modules/twitter-common-options/default.nix
+++ b/pkgs/development/python-modules/twitter-common-options/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix
index 23d647d9315..7114dc661f4 100644
--- a/pkgs/development/python-modules/twitter/default.nix
+++ b/pkgs/development/python-modules/twitter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 4d756fa89f3..814b6234ee3 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }:
+{ lib, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }:
 
 buildPythonPackage rec {
   pname = "txaio";
diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix
index f0e3904a881..cc66e041ae3 100644
--- a/pkgs/development/python-modules/txamqp/default.nix
+++ b/pkgs/development/python-modules/txamqp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , twisted
diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix
index 461ddeee34b..31afbd4fdf9 100644
--- a/pkgs/development/python-modules/txdbus/default.nix
+++ b/pkgs/development/python-modules/txdbus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, six, twisted }:
+{ lib, buildPythonPackage, fetchPypi, six, twisted }:
 
 buildPythonPackage rec {
   pname = "txdbus";
diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix
index 402e5011ede..09af476e94d 100644
--- a/pkgs/development/python-modules/txgithub/default.nix
+++ b/pkgs/development/python-modules/txgithub/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pyopenssl
diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix
index 06979e2b9b3..be32dc4a738 100644
--- a/pkgs/development/python-modules/txrequests/default.nix
+++ b/pkgs/development/python-modules/txrequests/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , twisted
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 448e52af7af..7aced09b33d 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage
 , fetchPypi
 , pythonOlder
-, lib, stdenv
+, lib
 , setuptools_scm
 , pytest
 , typing-extensions
diff --git a/pkgs/development/python-modules/typogrify/default.nix b/pkgs/development/python-modules/typogrify/default.nix
index faa1c8641c0..25445d8a7d2 100644
--- a/pkgs/development/python-modules/typogrify/default.nix
+++ b/pkgs/development/python-modules/typogrify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix
index df0923833fd..a7cd91d6845 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/pkgs/development/python-modules/tzlocal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytz }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix
index 370ed527d19..36d725d14f4 100644
--- a/pkgs/development/python-modules/ua-parser/default.nix
+++ b/pkgs/development/python-modules/ua-parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }:
+{ lib, buildPythonPackage, fetchPypi, pyyaml }:
 
 buildPythonPackage rec {
   pname = "ua-parser";
diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix
index f31b26a1960..36aa5a020c3 100644
--- a/pkgs/development/python-modules/ujson/2.nix
+++ b/pkgs/development/python-modules/ujson/2.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix
index 1c12a092a2f..9c759bd41b3 100644
--- a/pkgs/development/python-modules/ujson/default.nix
+++ b/pkgs/development/python-modules/ujson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix
index 4411dbac11b..0e1b4c681e5 100644
--- a/pkgs/development/python-modules/umalqurra/default.nix
+++ b/pkgs/development/python-modules/umalqurra/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix
index f852483cda6..26f8ba02756 100644
--- a/pkgs/development/python-modules/umemcache/default.nix
+++ b/pkgs/development/python-modules/umemcache/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl }:
+{ lib, buildPythonPackage, isPy3k, fetchurl }:
 
 buildPythonPackage rec {
   pname = "umemcache";
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index 117188198ca..b43927c063e 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , nose, numpy, future
 }:
 
diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix
index 4f8d461c87e..31095fcd50e 100644
--- a/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/pkgs/development/python-modules/uncompyle6/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonAtLeast
diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix
index 80ac5151b53..a0574f948f0 100644
--- a/pkgs/development/python-modules/unicode-slugify/default.nix
+++ b/pkgs/development/python-modules/unicode-slugify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix
index 9393ff58bc2..ede2b0d3f09 100644
--- a/pkgs/development/python-modules/unicodecsv/default.nix
+++ b/pkgs/development/python-modules/unicodecsv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix
index 34de3d71386..70724bb71b5 100644
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/pkgs/development/python-modules/unidecode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, glibcLocales }:
+{ lib, buildPythonPackage, fetchPypi, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "Unidecode";
diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix
index 66ab9ba3972..fc98695dd6f 100644
--- a/pkgs/development/python-modules/unifi/default.nix
+++ b/pkgs/development/python-modules/unifi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage
+{ lib, buildPythonPackage
 , fetchPypi, urllib3 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix
index a7c1252f4b4..ae8cab53b0c 100644
--- a/pkgs/development/python-modules/unittest2/default.nix
+++ b/pkgs/development/python-modules/unittest2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix
index 52d2a42b4ba..96b27127cc6 100644
--- a/pkgs/development/python-modules/unpaddedbase64/default.nix
+++ b/pkgs/development/python-modules/unpaddedbase64/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix
index 442876d7a97..61197c7219d 100644
--- a/pkgs/development/python-modules/upass/default.nix
+++ b/pkgs/development/python-modules/upass/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchurl
 , pyperclip
diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix
index f9171e8cbc9..432232c60f9 100644
--- a/pkgs/development/python-modules/update_checker/default.nix
+++ b/pkgs/development/python-modules/update_checker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests, isPy27
+{ lib, buildPythonPackage, fetchPypi, requests, isPy27
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix
index 5164bf854ad..21fe31630de 100644
--- a/pkgs/development/python-modules/uproot3-methods/default.nix
+++ b/pkgs/development/python-modules/uproot3-methods/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix
index 8f8c067d36a..640d2a6ed57 100644
--- a/pkgs/development/python-modules/uptime/default.nix
+++ b/pkgs/development/python-modules/uptime/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index f5bca2ed0fe..ff262d6b0a3 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, cmake
+{ lib, buildPythonPackage, fetchFromGitHub, python, cmake
 , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index b06da7c6acc..2f4710eea46 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+{ lib, buildPythonPackage, fetchPypi, isPy27 }:
 
 buildPythonPackage rec {
   pname = "uritools";
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index 3a7158be73c..e78dc9b904d 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pycurl, six }:
+{ lib, buildPythonPackage, fetchPypi, pycurl, six }:
 
 buildPythonPackage rec {
   pname = "urlgrabber";
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index e3c5311136c..ceb57e86afb 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "urwid";
diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix
index 4c3a3e896f8..863989156c3 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , glibcLocales
diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix
index b1f5b301dee..6dbb6ce184f 100644
--- a/pkgs/development/python-modules/usbtmc/default.nix
+++ b/pkgs/development/python-modules/usbtmc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonPackage, pyusb }:
+{ lib, fetchurl, buildPythonPackage, pyusb }:
 
 buildPythonPackage rec {
   pname = "usbtmc";
diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix
index 7f8470cfbdc..d01c601c82a 100644
--- a/pkgs/development/python-modules/user-agents/default.nix
+++ b/pkgs/development/python-modules/user-agents/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }:
+{ lib, buildPythonPackage, fetchFromGitHub, ua-parser }:
 
 buildPythonPackage rec {
   pname = "user-agents";
diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix
index 327cfcf3f0d..2b1fdb4963d 100644
--- a/pkgs/development/python-modules/validate-email/default.nix
+++ b/pkgs/development/python-modules/validate-email/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "validate-email";
diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix
index e89b3d7bcd2..29ffb76591e 100644
--- a/pkgs/development/python-modules/validictory/default.nix
+++ b/pkgs/development/python-modules/validictory/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix
index 7d73a6e812d..236bb8d149b 100644
--- a/pkgs/development/python-modules/vcversioner/default.nix
+++ b/pkgs/development/python-modules/vcversioner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "vcversioner";
diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix
index 9e4e92d21ae..846aa7a13df 100644
--- a/pkgs/development/python-modules/vdf/default.nix
+++ b/pkgs/development/python-modules/vdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , pytest, pytestcov, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
index bda65ab4907..1f7642bfe34 100644
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index 3a36d5de606..083aa630209 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage , fetchPypi, pythonOlder
+{ lib, buildPythonPackage , fetchPypi, pythonOlder
 , pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix
index 68d974aabec..82e291ae462 100644
--- a/pkgs/development/python-modules/venusian/default.nix
+++ b/pkgs/development/python-modules/venusian/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix
index fa3329503a3..3685e78d4b4 100644
--- a/pkgs/development/python-modules/versioneer/default.nix
+++ b/pkgs/development/python-modules/versioneer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+{ lib, buildPythonPackage, fetchPypi, isPy27 }:
 
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix
index 45b34d95301..f74c8610b4c 100644
--- a/pkgs/development/python-modules/versiontools/default.nix
+++ b/pkgs/development/python-modules/versiontools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix
index f2c8cee451d..003fd6db621 100644
--- a/pkgs/development/python-modules/veryprettytable/default.nix
+++ b/pkgs/development/python-modules/veryprettytable/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , termcolor
diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix
index 548105a0177..4119b26259d 100644
--- a/pkgs/development/python-modules/vidstab/default.nix
+++ b/pkgs/development/python-modules/vidstab/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix
index 048fa435e0b..8fc895cfa44 100644
--- a/pkgs/development/python-modules/vine/default.nix
+++ b/pkgs/development/python-modules/vine/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , case, pytest, pythonOlder }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 9b225021cf2..4dfebc13075 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix
index 658f41126fc..087a1a2ca51 100644
--- a/pkgs/development/python-modules/virtualenvwrapper/default.nix
+++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pbr
diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix
index f8be722ef90..3962a1e02c3 100644
--- a/pkgs/development/python-modules/vmprof/default.nix
+++ b/pkgs/development/python-modules/vmprof/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , colorama
diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix
index cb1b1677e1b..ef33a46cc34 100644
--- a/pkgs/development/python-modules/vncdo/default.nix
+++ b/pkgs/development/python-modules/vncdo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, fetchFromGitHub
 , buildPythonPackage, isPy27
 , pillow
 , twisted
diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix
index 63be8cd4bd0..9882724fbb6 100644
--- a/pkgs/development/python-modules/voluptuous/default.nix
+++ b/pkgs/development/python-modules/voluptuous/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, nose }:
+{ lib, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "voluptuous";
diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix
index d4349d310be..975e4098112 100644
--- a/pkgs/development/python-modules/vultr/default.nix
+++ b/pkgs/development/python-modules/vultr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , requests
diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix
index 5d9531aa904..242fe47b33d 100644
--- a/pkgs/development/python-modules/vxi11/default.nix
+++ b/pkgs/development/python-modules/vxi11/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }:
+{ lib, buildPythonPackage, fetchFromGitHub, nose }:
 
 buildPythonPackage rec {
   pname = "python-vxi11";
diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix
index ae404e01cfb..0c80423e36a 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/pkgs/development/python-modules/w3lib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix
index 09f4f66e0b5..4edd4c6ccff 100644
--- a/pkgs/development/python-modules/waitress/default.nix
+++ b/pkgs/development/python-modules/waitress/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix
index 29c30e7ba6a..86d405a33ef 100644
--- a/pkgs/development/python-modules/wakeonlan/default.nix
+++ b/pkgs/development/python-modules/wakeonlan/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }:
+{ lib, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "wakeonlan";
diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix
index 80dcabdcb20..1b62c918f33 100644
--- a/pkgs/development/python-modules/warlock/default.nix
+++ b/pkgs/development/python-modules/warlock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix
index 5a0c2ecaa5f..f9bc1916ad6 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/pkgs/development/python-modules/wasabi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix
index 84b4cc8dcfb..1b40519d592 100644
--- a/pkgs/development/python-modules/web/default.nix
+++ b/pkgs/development/python-modules/web/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook
 , cheroot
 , dbutils, mysqlclient, pymysql, mysql-connector, psycopg2
 }:
diff --git a/pkgs/development/python-modules/webapp2/default.nix b/pkgs/development/python-modules/webapp2/default.nix
index 048c5d91b1d..841fb5bd74b 100644
--- a/pkgs/development/python-modules/webapp2/default.nix
+++ b/pkgs/development/python-modules/webapp2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , webob
diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix
index 040341ed376..dcb2bd3817d 100644
--- a/pkgs/development/python-modules/webhelpers/default.nix
+++ b/pkgs/development/python-modules/webhelpers/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , routes
diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 78ca8f918a3..124b45a2eb3 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , nose
diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix
index 021344b2207..d3072e75041 100644
--- a/pkgs/development/python-modules/websockify/default.nix
+++ b/pkgs/development/python-modules/websockify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , numpy
diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix
index 98ee58d3f6c..d56e5415b91 100644
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/pkgs/development/python-modules/webtest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy27
diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix
index ad25df4868a..7b084c16267 100644
--- a/pkgs/development/python-modules/whisper/default.nix
+++ b/pkgs/development/python-modules/whisper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, mock, six }:
+{ lib, buildPythonPackage, fetchPypi, mock, six }:
 
 buildPythonPackage rec {
   pname = "whisper";
diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix
index 2399c6ed73f..3c63c727c0d 100644
--- a/pkgs/development/python-modules/whitenoise/default.nix
+++ b/pkgs/development/python-modules/whitenoise/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 }:
+{ lib, fetchPypi, buildPythonPackage, isPy27 }:
 
 buildPythonPackage rec {
   pname = "whitenoise";
diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix
index f5bbccec2a5..d3ff703f694 100644
--- a/pkgs/development/python-modules/whoosh/default.nix
+++ b/pkgs/development/python-modules/whoosh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "Whoosh";
diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix
index fbf4965117b..3dafd4df44b 100644
--- a/pkgs/development/python-modules/willow/default.nix
+++ b/pkgs/development/python-modules/willow/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix
index 647914bfbe5..259566c8fc2 100644
--- a/pkgs/development/python-modules/word2vec/default.nix
+++ b/pkgs/development/python-modules/word2vec/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , fetchzip
diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix
index b4dd108ae73..80f22efbda8 100644
--- a/pkgs/development/python-modules/wordcloud/default.nix
+++ b/pkgs/development/python-modules/wordcloud/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub
 , matplotlib
 , mock
 , numpy
diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix
index 51c0de77917..13ce4bc873d 100644
--- a/pkgs/development/python-modules/worldengine/default.nix
+++ b/pkgs/development/python-modules/worldengine/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , pythonOlder
 , isPy27
diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix
index 757585bd145..bbbc1917f54 100644
--- a/pkgs/development/python-modules/wrapio/default.nix
+++ b/pkgs/development/python-modules/wrapio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix
index 2b7a66df285..8abf78520dc 100644
--- a/pkgs/development/python-modules/ws4py/default.nix
+++ b/pkgs/development/python-modules/ws4py/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, git
+{ lib, buildPythonPackage, fetchPypi, pytest, mock, git
 , cherrypy, gevent, tornado }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/wsgiproxy/default.nix b/pkgs/development/python-modules/wsgiproxy/default.nix
index 12aa3c88d96..e2cc26ff143 100644
--- a/pkgs/development/python-modules/wsgiproxy/default.nix
+++ b/pkgs/development/python-modules/wsgiproxy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , paste
diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix
index 81a2f98b86f..2a9856cdd08 100644
--- a/pkgs/development/python-modules/wsgiproxy2/default.nix
+++ b/pkgs/development/python-modules/wsgiproxy2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix
index 45c465ddcba..96440c438bc 100644
--- a/pkgs/development/python-modules/wtforms/default.nix
+++ b/pkgs/development/python-modules/wtforms/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , markupsafe
diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix
index 21bb787402c..e9cfe317432 100644
--- a/pkgs/development/python-modules/x11_hash/default.nix
+++ b/pkgs/development/python-modules/x11_hash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/x256/default.nix b/pkgs/development/python-modules/x256/default.nix
index 4ceb2dcae79..4430fa2e4b8 100644
--- a/pkgs/development/python-modules/x256/default.nix
+++ b/pkgs/development/python-modules/x256/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix
index 28901017b2b..44435dd6bd8 100644
--- a/pkgs/development/python-modules/xapp/default.nix
+++ b/pkgs/development/python-modules/xapp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonPackage
 , psutil
diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix
index 3583358a560..a39c3532f4b 100644
--- a/pkgs/development/python-modules/xattr/default.nix
+++ b/pkgs/development/python-modules/xattr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix
index f6bb5712c2e..086eaf1e348 100644
--- a/pkgs/development/python-modules/xcaplib/default.nix
+++ b/pkgs/development/python-modules/xcaplib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchdarcs
 , isPy3k
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index 21b45b9c322..7dbbd89e781 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run, stdenv
+{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run
 , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index e3328c7e453..efdb40cd6f8 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pillow
diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix
index 88f7b9b94a1..280ce5a790a 100644
--- a/pkgs/development/python-modules/xkcdpass/default.nix
+++ b/pkgs/development/python-modules/xkcdpass/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix
index 031ac047936..d880fd83396 100644
--- a/pkgs/development/python-modules/xlrd/default.nix
+++ b/pkgs/development/python-modules/xlrd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix
index a5b67632d83..6f7726da68d 100644
--- a/pkgs/development/python-modules/xlsx2csv/default.nix
+++ b/pkgs/development/python-modules/xlsx2csv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index e06daf3c5b8..fdf042c2ac2 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address
+{ lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address
 , pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs
 }:
 
diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix
index 9023c4cc79e..a53567f7fa8 100644
--- a/pkgs/development/python-modules/xmodem/default.nix
+++ b/pkgs/development/python-modules/xmodem/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }:
 
 buildPythonPackage rec {
   pname = "xmodem";
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index fd046adadd9..65e2b3711fa 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchurl, isPy3k }:
+{ lib, buildPythonPackage, fetchurl, isPy3k }:
 buildPythonPackage rec {
   pname = "xmpp.py";
   version = "0.5.0rc1";
diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix
index 0852fd2e15c..f037cb40338 100644
--- a/pkgs/development/python-modules/xvfbwrapper/default.nix
+++ b/pkgs/development/python-modules/xvfbwrapper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , xorgserver
diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix
index d2f6ae54a4c..08bcfcdacde 100644
--- a/pkgs/development/python-modules/xxhash/default.nix
+++ b/pkgs/development/python-modules/xxhash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 7145c504cd9..13545c0430d 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , nose, pyyaml, pathspec }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix
index 6d4a3b41fbc..925276c0ad6 100644
--- a/pkgs/development/python-modules/yanc/default.nix
+++ b/pkgs/development/python-modules/yanc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }:
+{ lib, buildPythonPackage, pythonOlder, fetchPypi, nose }:
 
 buildPythonPackage rec {
   pname = "yanc";
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 36409ae4019..9c0e9d35399 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "yapf";
diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix
index 359a855a3e5..e60b0a11473 100644
--- a/pkgs/development/python-modules/yapsy/default.nix
+++ b/pkgs/development/python-modules/yapsy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 7a88b695f63..0aeb85e6ca2 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchPypi
 , buildPythonPackage
 , pythonOlder
diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix
index be935b1995c..e7452b89a53 100644
--- a/pkgs/development/python-modules/ydiff/default.nix
+++ b/pkgs/development/python-modules/ydiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, docutils, pygments
+{ lib, buildPythonPackage, fetchPypi, docutils, pygments
 , gitMinimal, mercurial, subversion, patchutils, less
 }:
 
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index 48c21434194..0ff3212f48c 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, lib, stdenv, fetchFromGitHub, six, python-axolotl, pytest
+{ buildPythonPackage, lib, fetchFromGitHub, six, python-axolotl, pytest
 , isPy3k, consonance, appdirs
 }:
 
diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix
index f1af120d56e..8610306ea6f 100644
--- a/pkgs/development/python-modules/z3c-checkversions/default.nix
+++ b/pkgs/development/python-modules/z3c-checkversions/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , python
diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix
index 1d1d21a462e..89635a88f35 100644
--- a/pkgs/development/python-modules/zake/default.nix
+++ b/pkgs/development/python-modules/zake/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , kazoo
diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix
index 4e126074b18..23eae31057f 100644
--- a/pkgs/development/python-modules/zbaemon/default.nix
+++ b/pkgs/development/python-modules/zbaemon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zconfig
diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix
index a4e7a476bec..715da719bbb 100644
--- a/pkgs/development/python-modules/zbase32/default.nix
+++ b/pkgs/development/python-modules/zbase32/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptoolsDarcs
diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix
index 3b75de3a24b..97289ec3630 100644
--- a/pkgs/development/python-modules/zc_lockfile/default.nix
+++ b/pkgs/development/python-modules/zc_lockfile/default.nix
@@ -2,7 +2,7 @@
 , fetchPypi
 , mock
 , zope_testing
-, lib, stdenv
+, lib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix
index 4e126074b18..23eae31057f 100644
--- a/pkgs/development/python-modules/zdaemon/default.nix
+++ b/pkgs/development/python-modules/zdaemon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zconfig
diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix
index e1208875668..19d02a70496 100644
--- a/pkgs/development/python-modules/zerobin/default.nix
+++ b/pkgs/development/python-modules/zerobin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , cherrypy
diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix
index f85674d6867..6dccf51100e 100644
--- a/pkgs/development/python-modules/zeroc-ice/default.nix
+++ b/pkgs/development/python-modules/zeroc-ice/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }:
+{ lib, buildPythonPackage, fetchPypi, openssl, bzip2 }:
 
 buildPythonPackage rec {
   pname = "zeroc-ice";
diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix
index 8a5aaf46b0e..bcec7a09251 100644
--- a/pkgs/development/python-modules/zfec/default.nix
+++ b/pkgs/development/python-modules/zfec/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , setuptoolsDarcs
diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix
index da36c1cba89..611660fc3eb 100644
--- a/pkgs/development/python-modules/zict/default.nix
+++ b/pkgs/development/python-modules/zict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , pytest, heapdict, pythonOlder }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index 4de49cbc46b..1a1c639a473 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , async-timeout
 , asynctest
 , buildPythonPackage
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index d48b9c4b950..aa7cc6c97eb 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchPypi
 , buildPythonPackage
 , python
diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/pkgs/development/python-modules/zope_broken/default.nix
index 899d7f3344b..a3583654e66 100644
--- a/pkgs/development/python-modules/zope_broken/default.nix
+++ b/pkgs/development/python-modules/zope_broken/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_interface
diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix
index 6ea86b9b984..65556c9dc41 100644
--- a/pkgs/development/python-modules/zope_component/default.nix
+++ b/pkgs/development/python-modules/zope_component/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope-deferredimport
diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix
index e8d05b7767b..e3ede9f94af 100644
--- a/pkgs/development/python-modules/zope_configuration/default.nix
+++ b/pkgs/development/python-modules/zope_configuration/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_i18nmessageid
diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix
index 6b66cca18aa..15010d80a14 100644
--- a/pkgs/development/python-modules/zope_contenttype/default.nix
+++ b/pkgs/development/python-modules/zope_contenttype/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_testrunner
diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix
index cda7af8e7a0..7eb66f7a9c5 100644
--- a/pkgs/development/python-modules/zope_deprecation/default.nix
+++ b/pkgs/development/python-modules/zope_deprecation/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_testing
diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix
index 0e8f3543136..cbd5cd6d653 100644
--- a/pkgs/development/python-modules/zope_dottedname/default.nix
+++ b/pkgs/development/python-modules/zope_dottedname/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix
index cc82da7ea9a..2ebf6e017b5 100644
--- a/pkgs/development/python-modules/zope_event/default.nix
+++ b/pkgs/development/python-modules/zope_event/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix
index 09f08c7bba4..0586227c61c 100644
--- a/pkgs/development/python-modules/zope_exceptions/default.nix
+++ b/pkgs/development/python-modules/zope_exceptions/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_interface
diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix
index 7aae2a24d62..4792a09e26b 100644
--- a/pkgs/development/python-modules/zope_filerepresentation/default.nix
+++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_schema
diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix
index 49270488ecd..1155adc83e9 100644
--- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix
+++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , six
diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
index 7a32045fc3e..7b5d7abf682 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_event
diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix
index 390624b50de..809d8252cb2 100644
--- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix
+++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix
index 62b2cef9ea7..69fee2e338f 100644
--- a/pkgs/development/python-modules/zope_location/default.nix
+++ b/pkgs/development/python-modules/zope_location/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_proxy
diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix
index af108c058c7..67e8a191d97 100644
--- a/pkgs/development/python-modules/zope_proxy/default.nix
+++ b/pkgs/development/python-modules/zope_proxy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_interface
diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix
index c7e228c4e05..75683cb2eb8 100644
--- a/pkgs/development/python-modules/zope_schema/default.nix
+++ b/pkgs/development/python-modules/zope_schema/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_location
diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix
index 79eadc880a2..6945dddceaa 100644
--- a/pkgs/development/python-modules/zope_size/default.nix
+++ b/pkgs/development/python-modules/zope_size/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_i18nmessageid
diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix
index 3d7cbf90c25..2f37f15453d 100644
--- a/pkgs/development/python-modules/zope_testing/default.nix
+++ b/pkgs/development/python-modules/zope_testing/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index c516106e48b..5ee42c84275 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , zope_interface
diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index af7bb7692f6..1d8fa8d93e9 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkg-config, fetchPypi, buildPythonPackage
+{ lib, pkg-config, fetchPypi, buildPythonPackage
 , buildPackages
 , zstd, pytest }:
 
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index 0859f08c2f7..03bf7275cc7 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, runCommand, makeWrapper, ruby }@defs:
+{ lib, callPackage, runCommand, makeWrapper, ruby }@defs:
 
 # Use for simple installation of Ruby tools shipped in a Gem.
 # Start with a Gemfile that includes `gem <toolgem>`
diff --git a/pkgs/development/ruby-modules/testing/driver.nix b/pkgs/development/ruby-modules/testing/driver.nix
index 65e7c8d4416..23a9a1cec54 100644
--- a/pkgs/development/ruby-modules/testing/driver.nix
+++ b/pkgs/development/ruby-modules/testing/driver.nix
@@ -5,7 +5,7 @@ nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace
 Confusingly, the ideal result ends with something like:
 error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed
 */
-{ writeText, lib, callPackage, testFiles, stdenv, ruby }@defs:
+{ writeText, lib, callPackage, testFiles, ruby }@defs:
 let
   testTools = rec {
     test = import ./testing.nix;
diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix
index f8cb7441116..9bfaab51554 100644
--- a/pkgs/development/tools/ameba/default.nix
+++ b/pkgs/development/tools/ameba/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, crystal }:
+{ lib, fetchFromGitHub, crystal }:
 
 crystal.buildCrystalPackage rec {
   pname = "ameba";
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index 884b511b8af..03e01aadb71 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 with python3Packages;
 buildPythonApplication rec {
diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix
index ae54723dda3..338bc3e189c 100644
--- a/pkgs/development/tools/analysis/bingrep/default.nix
+++ b/pkgs/development/tools/analysis/bingrep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "bingrep";
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 6277b1d4239..06c366529df 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, lib, python3, fetchFromGitHub }:
+{ pkgs, lib, python3, fetchFromGitHub }:
 
 let
   pname = "checkov";
diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix
index cfb974c86dd..02665022099 100644
--- a/pkgs/development/tools/analysis/egypt/default.nix
+++ b/pkgs/development/tools/analysis/egypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages }:
+{ lib, fetchurl, perlPackages }:
 
 perlPackages.buildPerlPackage rec {
   pname = "egypt";
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix
index b8f3aa0ac1f..4061090b182 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/pkgs/development/tools/analysis/evmdis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "evmdis-unstable";
diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix
index 6ea079e3ec1..94b440f58c8 100644
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv,
+{ lib,
   mkDerivation,
   cmake,
   elfutils,
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix
index ff5014bd46a..0ef33270e92 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/pkgs/development/tools/analysis/panopticon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake
+{ lib, fetchFromGitHub, rustPlatform, qt5, git, cmake
 , pkg-config, makeWrapper }:
 
 rustPlatform.buildRustPackage rec {
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index 261645c062d..870f084580b 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }:
 
 mkDerivation rec {
   pname = "snowman";
diff --git a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
index 17f39071462..b879a6ef237 100644
--- a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
+++ b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchFromGitHub }:
+{ lib, python3, fetchFromGitHub }:
 
 with python3.pkgs;
 
diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix
index b2432f7fefc..9ffcbb172d4 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/pkgs/development/tools/asn2quickder/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake
+{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake
 , pytestrunner, pytest, six, pyparsing, asn1ate }:
 
 buildPythonApplication rec {
diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix
index 54e16cb6faa..a45e93ab151 100644
--- a/pkgs/development/tools/async/default.nix
+++ b/pkgs/development/tools/async/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "async";
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 822480b1d3f..98a6bcd5bbc 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index e4a6b3c2869..2cfde85f224 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "bazelisk";
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index ac03288f148..80c949c1efb 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , git
 , go
-, lib, stdenv
+, lib
 }:
 
 buildBazelPackage rec {
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index 436b681e005..441254ce263 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "bazel-buildtools";
diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix
index 25450ceb6d9..601f7ea9fea 100644
--- a/pkgs/development/tools/build-managers/fac/default.nix
+++ b/pkgs/development/tools/build-managers/fac/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, git, fetchFromGitHub, rustPlatform }:
+{ lib, git, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "fac-build";
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 74d96d4af00..7009aa4898f 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,6 +1,6 @@
 { lib
 , python3
-, stdenv
+
 , writeTextDir
 , substituteAll
 , fetchpatch
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 03eac2db5e3..53333c217ba 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages }:
+{ lib, pythonPackages }:
 
 with lib;
 with pythonPackages;
diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix
index 1de2ecbbc8b..63df4ccf7be 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, python3Packages, lib }:
+{ fetchurl, python3Packages, lib }:
 
 python3Packages.buildPythonApplication rec {
   pname = "scons";
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 868ea265f6f..8cab1667b21 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , crystal_0_34
 , crystal_0_35
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 182a7f98c4c..c3b477e3ea3 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, rustPlatform, lib, stdenv }:
+{ fetchFromGitHub, rustPlatform, lib }:
 
 with rustPlatform;
 
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix
index ef08b2d5813..a12fb4424e8 100644
--- a/pkgs/development/tools/compile-daemon/default.nix
+++ b/pkgs/development/tools/compile-daemon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "compile-daemon-unstable";
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index bd8608a9119..ed1171458b1 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, stdenv, buildGoModule,
+{ fetchFromGitHub, lib, buildGoModule,
   makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
 buildGoModule rec {
   name = "buildkite-agent-${version}";
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index 232efe32a1a..64ca730d7dc 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
+{ buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
 , src, version, hasBootstrapScript, postPatch ? ""
 , ... }:
 let
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index b1ee5349a5c..6c9cffe41b2 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 let version = "1.2.4";
 in buildGoModule rec {
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index ffdf588895a..c6d609e38cf 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   name = "drone.io-${version}";
diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix
index a7698ef4fb8..e39e42c40af 100644
--- a/pkgs/development/tools/corgi/default.nix
+++ b/pkgs/development/tools/corgi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "corgi-${rev}";
diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix
index 4e00eb903eb..460d7cddb83 100644
--- a/pkgs/development/tools/cppclean/default.nix
+++ b/pkgs/development/tools/cppclean/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 with python3Packages;
 
diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
index 243be958b07..28660732ea4 100644
--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchgit, lib, stdenv }:
+{ buildGoModule, fetchgit, lib }:
 
 buildGoModule rec {
   pname = "cue";
diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix
index 7a8243ece25..57fd984dc17 100644
--- a/pkgs/development/tools/dapr/cli/default.nix
+++ b/pkgs/development/tools/dapr/cli/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib, stdenv }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 let
   pname = "dapr";
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 9c01c1e9d2d..6634c2b6384 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dbmate";
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix
index 119aa2eb8f8..075cd5053be 100644
--- a/pkgs/development/tools/database/pyrseas/default.nix
+++ b/pkgs/development/tools/database/pyrseas/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages, fetchFromGitHub }:
+{ lib, pythonPackages, fetchFromGitHub }:
 
 let
   pgdbconn = pythonPackages.buildPythonPackage {
diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
index 2b8a6f7cca0..42c2a55fd3e 100644
--- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
+++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "timescaledb-parallel-copy";
diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix
index cec374ccb3a..34d5d12607f 100644
--- a/pkgs/development/tools/database/timescaledb-tune/default.nix
+++ b/pkgs/development/tools/database/timescaledb-tune/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "timescaledb-tune";
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index c8e20d42063..8286435d9a3 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "deis";
diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix
index 0f5df40d92c..67245a5ebbe 100644
--- a/pkgs/development/tools/deisctl/default.nix
+++ b/pkgs/development/tools/deisctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "deis";
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index 62fb32c8516..bd8f2484b33 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "delve";
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index ff7f370b0d4..ff7bad87afd 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "dep";
diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix
index daa68b1b931..5d98ecd5729 100644
--- a/pkgs/development/tools/dep2nix/default.nix
+++ b/pkgs/development/tools/dep2nix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage
+{ lib, fetchFromGitHub, buildGoPackage
 , makeWrapper, nix-prefetch-scripts }:
 
 buildGoPackage rec {
diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix
index 32f29f7e128..0789850a494 100644
--- a/pkgs/development/tools/devd/default.nix
+++ b/pkgs/development/tools/devd/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, lib, stdenv }:
+{ buildGoPackage, fetchFromGitHub, lib }:
 
 buildGoPackage rec {
   pname = "devd";
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 766f3f2b729..5905e05d071 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonApplication
 , fetchPypi
 # buildInputs
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 3d8cb16bb47..8a484a23349 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, nginx }:
+{ lib, fetchFromGitHub, python3Packages, nginx }:
 
 python3Packages.buildPythonApplication rec {
   pname = "devpi-server";
diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix
index d553df59446..ea8aeb83c8c 100644
--- a/pkgs/development/tools/documentation/antora/default.nix
+++ b/pkgs/development/tools/documentation/antora/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, nodePackages }:
+{ lib, nodePackages }:
 
 let
   linkNodeDeps = ({ pkg, deps, name ? "" }:
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index 2e04d3dd365..d031145a997 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
+{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
 , python2Packages }:
 
 python2Packages.buildPythonApplication rec {
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index b1ea6a0634b..d82c288e5aa 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitLab
 , meson
 , ninja
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index d2e555a4550..c8e6cafa27a 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "mdsh";
diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index bee22856eb1..64d834f1bb2 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python3, fetchFromGitHub }:
+{ lib, python3, fetchFromGitHub }:
 
 with python3.pkgs;
 
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index a458f0dbfce..75bfc1d4c14 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "easyjson";
diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix
index e60642c5fe6..adcedfe643c 100644
--- a/pkgs/development/tools/eliot-tree/default.nix
+++ b/pkgs/development/tools/eliot-tree/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "eliot-tree";
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index ef3298c5478..c50fd834e03 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
+{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
 
 buildGoPackage rec {
   pname = "fac";
diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
index 285e71707fd..d9633e88f34 100644
--- a/pkgs/development/tools/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
+{ lib, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
 
 let
   fedora_cert = buildPythonPackage rec {
diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix
index 4867b9c2cb9..e4f76ca9f6a 100644
--- a/pkgs/development/tools/flootty/default.nix
+++ b/pkgs/development/tools/flootty/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "Flootty";
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index a0eb7370bee..168910da06f 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gauge";
diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix
index 7c7f73af1e0..7ecb7895d2f 100644
--- a/pkgs/development/tools/gdm/default.nix
+++ b/pkgs/development/tools/gdm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gdm";
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index b65e7c6a5ee..05db94c7f1e 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ginkgo";
diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix
index 8f38b41f7ae..c88ffef4df1 100644
--- a/pkgs/development/tools/gir/default.nix
+++ b/pkgs/development/tools/gir/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gir";
diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 4f13c3de40b..0f7677c7aa2 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform
+{ lib, fetchFromGitHub, fetchpatch, rustPlatform
 , openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2
 }:
 
diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index dfe66c789ca..ce340239ac4 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
+{ lib, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
 
 buildPythonApplication rec {
   pname = "cligh";
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index f8abde7e00a..05e4ae81061 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "glide";
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index f2c552252fb..78038440a96 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gllvm";
diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix
index c00478c9fb6..b2d1e09e74f 100644
--- a/pkgs/development/tools/glock/default.nix
+++ b/pkgs/development/tools/glock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "glock";
diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix
index 57d0e93a9b0..5131436e024 100644
--- a/pkgs/development/tools/go-bindata-assetfs/default.nix
+++ b/pkgs/development/tools/go-bindata-assetfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-bindata-assetfs";
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index 5d257bbf998..3b73c527315 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "go-bindata";
diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix
index f1e822e3633..110cdbfabc9 100644
--- a/pkgs/development/tools/go-junit-report/default.nix
+++ b/pkgs/development/tools/go-junit-report/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-junit-report-unstable";
diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix
index fdefd6b0178..ac6034dffa4 100644
--- a/pkgs/development/tools/go-langserver/default.nix
+++ b/pkgs/development/tools/go-langserver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-langserver";
diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix
index 1786bfe5f0f..d07e3cd80d3 100644
--- a/pkgs/development/tools/go-migrate/default.nix
+++ b/pkgs/development/tools/go-migrate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "go-migrate";
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix
index d30d5c30f3a..fe4c2e8d4df 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-outline";
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index 0187552d844..1fa027ae72b 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "go-protobuf";
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index 25fc87f8985..b7653aa144e 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "go-repo-root";
diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix
index 3f41007716e..a259b768561 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-symbols";
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index bcd1f56f525..b5a224cb5ae 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
+{ lib, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
   fetchFromGitHub }:
 
 buildGoPackage rec {
diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index 63322b6d363..56b47bd8c60 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "goa";
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index 995bd3102cc..f610b19d79b 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gocode-gomod";
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 9bed4073b2b..be9f70da934 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gocode-unstable";
diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix
index dcec045e5eb..fb6ce653cc4 100644
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/pkgs/development/tools/goconvey/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "goconvey";
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 6d4f40ba6bc..99fe932013e 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "godef";
diff --git a/pkgs/development/tools/godot/headless.nix b/pkgs/development/tools/godot/headless.nix
index 20d3b48f2fd..a8d640eba1a 100644
--- a/pkgs/development/tools/godot/headless.nix
+++ b/pkgs/development/tools/godot/headless.nix
@@ -1,4 +1,4 @@
-{ godot, lib, stdenv }:
+{ godot, lib }:
 godot.overrideAttrs (oldAttrs: rec {
   pname = "godot-headless";
   sconsFlags = "target=release_debug platform=server tools=yes";
diff --git a/pkgs/development/tools/godot/server.nix b/pkgs/development/tools/godot/server.nix
index 6ce347355e3..4254dc746b6 100644
--- a/pkgs/development/tools/godot/server.nix
+++ b/pkgs/development/tools/godot/server.nix
@@ -1,4 +1,4 @@
-{ godot, lib, stdenv }:
+{ godot, lib }:
 godot.overrideAttrs (oldAttrs: rec {
   pname = "godot-server";
   sconsFlags = "target=release platform=server tools=no";
diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix
index 0f772134a0e..0fd45598a83 100644
--- a/pkgs/development/tools/gojsontoyaml/default.nix
+++ b/pkgs/development/tools/gojsontoyaml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gojsontoyaml";
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 1f75384f338..89b9f146495 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "lint";
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index 650f1b89f30..254113f2106 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gomodifytags";
diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix
index f8d6553f74d..0f2c9558174 100644
--- a/pkgs/development/tools/gomplate/default.nix
+++ b/pkgs/development/tools/gomplate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gomplate";
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index e4a72cb27a1..a5413c6a9c0 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gopkgs";
diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix
index 7a7c98e2894..1617900acee 100644
--- a/pkgs/development/tools/gopls/default.nix
+++ b/pkgs/development/tools/gopls/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchgit }:
+{ lib, buildGoModule, fetchgit }:
 
 buildGoModule rec {
   pname = "gopls";
diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix
index 30d7cd1ef33..43bb2d2aad7 100644
--- a/pkgs/development/tools/gore/default.nix
+++ b/pkgs/development/tools/gore/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gore";
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index 69d74496e61..1ebb6e71713 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gosec";
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index ea40bd0e6fe..274f7a476c2 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "gotags";
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index 87a93abee8e..faa2e60aca4 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gotests";
diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix
index ece194f0003..435edd61623 100644
--- a/pkgs/development/tools/gotestsum/default.nix
+++ b/pkgs/development/tools/gotestsum/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "gotestsum";
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 7ca3486a503..285d546d742 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchgit }:
+{ lib, buildGoModule, fetchgit }:
 
 buildGoModule rec {
   pname = "gotools-unstable";
diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix
index edd9b577be4..b24afebb3aa 100644
--- a/pkgs/development/tools/govendor/default.nix
+++ b/pkgs/development/tools/govendor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "govendor";
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index cac76daa6fc..5e2d89cfd5d 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "govers";
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 3deb73acb44..4aa7a314c87 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gox";
diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix
index 6d182b0b5f5..f486bc95bc1 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/pkgs/development/tools/gron/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gron";
diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
index 02c4c96bd8e..b857b910f0a 100644
--- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
+++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
@@ -1,5 +1,5 @@
 { mkDerivation, base, containers, fetchgit, hedgehog
-, optparse-applicative, parsec, lib, stdenv, template-haskell, text
+, optparse-applicative, parsec, lib, template-haskell, text
 }:
 mkDerivation {
   pname = "dconf2nix";
diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix
index 512aec84eea..71b6355db58 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix
@@ -7,7 +7,7 @@
 , hls-tactics-plugin, hslogger, hspec, hspec-core
 , hspec-expectations, lens, lsp-test, mtl, optparse-applicative
 , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
-, shake, lib, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
+, shake, lib, stm, stylish-haskell, tasty, tasty-ant-xml
 , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
 , temporary, text, transformers, unordered-containers, with-utf8
 , yaml
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
index c5168934390..b757dc8c9e8 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, containers, fetchgit, ghc
 , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake
-, lib, stdenv, text, transformers, unordered-containers
+, lib, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-class-plugin";
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
index b5774ddcbfd..2677b45a591 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix
@@ -2,7 +2,7 @@
 , extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
 , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api
 , parser-combinators, pretty-simple, QuickCheck, safe-exceptions
-, shake, lib, stdenv, temporary, text, time, transformers
+, shake, lib, temporary, text, time, transformers
 , unordered-containers
 }:
 mkDerivation {
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
index 1c7d31004b6..8207b5181ba 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
@@ -1,5 +1,5 @@
 { mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc
-, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, stdenv, text
+, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, text
 , unordered-containers
 }:
 mkDerivation {
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
index 4a90933d1e7..02e314cba3a 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
@@ -2,7 +2,7 @@
 , containers, data-default, deepseq, Diff, directory, extra
 , fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide
 , hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens
-, regex-tdfa, shake, lib, stdenv, temporary, text, transformers
+, regex-tdfa, shake, lib, temporary, text, transformers
 , unordered-containers
 }:
 mkDerivation {
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
index 311a26633a5..cca8acb8819 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, containers, deepseq, directory, extra
 , fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
-, hls-plugin-api, retrie, safe-exceptions, shake, lib, stdenv, text
+, hls-plugin-api, retrie, safe-exceptions, shake, lib, text
 , transformers, unordered-containers
 }:
 mkDerivation {
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
index 4f476431d9b..369ce0e27b8 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
@@ -2,7 +2,7 @@
 , directory, extra, fetchgit, filepath, fingertree, generic-lens
 , ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
 , haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover
-, lens, mtl, QuickCheck, refinery, retrie, shake, lib, stdenv, syb, text
+, lens, mtl, QuickCheck, refinery, retrie, shake, lib, syb, text
 , transformers
 }:
 mkDerivation {
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index 42cf3322420..8c817e8eeef 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, async, base, bytestring, connection, containers
 , directory, hpack, hspec, hspec-discover, hspec-expectations
 , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl
-, optparse-applicative, parser-combinators, retry, lib, stdenv, text
+, optparse-applicative, parser-combinators, retry, lib, text
 , unix, unordered-containers, utf8-string, fetchzip, dotenv
 }:
 mkDerivation rec {
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 5c4fe48f60f..3e6ef4d4d34 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "hcloud";
diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix
index ca052c0f210..11e52f77cb8 100644
--- a/pkgs/development/tools/icr/default.nix
+++ b/pkgs/development/tools/icr/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , fetchFromGitHub
 , crystal
 , shards
diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix
index 772e2802ff5..96d2807b9ab 100644
--- a/pkgs/development/tools/jd/default.nix
+++ b/pkgs/development/tools/jd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "jd";
diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix
index 5e4e3df6942..b48de54dd22 100644
--- a/pkgs/development/tools/jid/default.nix
+++ b/pkgs/development/tools/jid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jid";
diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix
index 7b7647da033..cf15a61477e 100644
--- a/pkgs/development/tools/jira_cli/default.nix
+++ b/pkgs/development/tools/jira_cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, libffi, openssl, python3Packages }:
+{ lib, libffi, openssl, python3Packages }:
 let
   inherit (python3Packages) fetchPypi buildPythonApplication vcrpy mock hiro;
 in
diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix
index e0bf896c149..15347432f70 100644
--- a/pkgs/development/tools/jl/default.nix
+++ b/pkgs/development/tools/jl/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, fetchFromGitHub, fetchpatch
 , aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra
-, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib, stdenv
+, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib
 , text, unordered-containers, vector
 }:
 mkDerivation rec {
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
index f5a7092e60f..5abbf71e7f4 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jmespath";
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index d8d703feed3..f1f5b37c10d 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "jp";
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index bbdd1bd016d..e96d8f38af4 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
+{ lib, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "just";
diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix
index 6a8fe4caf01..6a94d40c206 100644
--- a/pkgs/development/tools/k6/default.nix
+++ b/pkgs/development/tools/k6/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "k6";
diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix
index 6c9f62c6f72..9cd1c976162 100644
--- a/pkgs/development/tools/kcli/default.nix
+++ b/pkgs/development/tools/kcli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "kcli";
diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index 3fff2aae1f4..47b23ae2342 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 with lib;
 
diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix
index 7449d6df38e..f2a4f390f82 100644
--- a/pkgs/development/tools/krew/default.nix
+++ b/pkgs/development/tools/krew/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "krew";
diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index f2186709e83..46955855332 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "kubectx";
diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix
index 4fc8f325342..39cd59cbec6 100644
--- a/pkgs/development/tools/kubeprompt/default.nix
+++ b/pkgs/development/tools/kubeprompt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "kubeprompt";
diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix
index f0985277a25..706b91aad25 100644
--- a/pkgs/development/tools/kubicorn/default.nix
+++ b/pkgs/development/tools/kubicorn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 with lib;
 
diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 1e8ebb0d087..a2707eb72e9 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "lazygit";
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index e68542e584f..934881b6781 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "leaps";
diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix
index 4265c2a7450..306c9143c5c 100644
--- a/pkgs/development/tools/manul/default.nix
+++ b/pkgs/development/tools/manul/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   name = "manul-unstable-2016-09-30";
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 73ea64f1d62..140e4869e88 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "circleci-cli";
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index 60d3c5c4539..5c130a99c92 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , pkg-config
 , fetchurl
 , meson
diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix
index 3614270574e..74450bdfe73 100644
--- a/pkgs/development/tools/misc/docopts/default.nix
+++ b/pkgs/development/tools/misc/docopts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "docopts";
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index cd19e263f0a..e3ee51c58fd 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "elfinfo";
diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index c01bb61f4f6..92338bb0323 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonApplication
 , fetchPypi
 , gdb
diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix
index 992b76bd62d..32c32b536d9 100644
--- a/pkgs/development/tools/misc/itm-tools/default.nix
+++ b/pkgs/development/tools/misc/itm-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config }:
+{ lib, fetchFromGitHub, rustPlatform, pkg-config }:
 
 rustPlatform.buildRustPackage rec {
   pname = "itm-tools";
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
index 59bab3742a2..32a14404c60 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitLab }:
+{ lib, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
   pname = "loccount";
   version = "1.2";
diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix
index a8a18b254b9..6d58a39f704 100644
--- a/pkgs/development/tools/misc/nrfutil/default.nix
+++ b/pkgs/development/tools/misc/nrfutil/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python37Packages, fetchFromGitHub }:
+{ lib, python37Packages, fetchFromGitHub }:
 
 with python37Packages; buildPythonApplication rec {
   pname = "nrfutil";
diff --git a/pkgs/development/tools/misc/perfect-hash/default.nix b/pkgs/development/tools/misc/perfect-hash/default.nix
index 7447bf66022..71747f0d117 100644
--- a/pkgs/development/tools/misc/perfect-hash/default.nix
+++ b/pkgs/development/tools/misc/perfect-hash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchFromGitHub }:
+{ lib, python3, fetchFromGitHub }:
 python3.pkgs.buildPythonApplication rec {
   pname = "perfect-hash";
   version = "0.4.1";
diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix
index 0ef7a2aa73a..8406ecf298f 100644
--- a/pkgs/development/tools/misc/ptags/default.nix
+++ b/pkgs/development/tools/misc/ptags/default.nix
@@ -2,7 +2,7 @@
 , cargo
 , lib
 , rustPlatform
-, stdenv
+
 }:
 
 rustPlatform.buildRustPackage rec {
diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix
index 49052c141a1..8a5cbbcfdfa 100644
--- a/pkgs/development/tools/misc/scc/default.nix
+++ b/pkgs/development/tools/misc/scc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "scc";
diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix
index 6487c3fc2c0..1a5f3efe0e6 100644
--- a/pkgs/development/tools/misc/unused/default.nix
+++ b/pkgs/development/tools/misc/unused/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake }:
+{ lib, fetchFromGitHub, rustPlatform, cmake }:
 rustPlatform.buildRustPackage rec {
   pname = "unused";
   version = "0.2.1";
diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index 6afcfe871a4..d448251bf13 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchFromGitHub, clang-unwrapped }:
+{ lib, python3, fetchFromGitHub, clang-unwrapped }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "whatstyle";
diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix
index efe4c960566..c42e364b88e 100644
--- a/pkgs/development/tools/modd/default.nix
+++ b/pkgs/development/tools/modd/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, lib, stdenv }:
+{ buildGoPackage, fetchFromGitHub, lib }:
 
 buildGoPackage rec {
   pname = "modd";
diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix
index 99e4eb62156..40181f16288 100644
--- a/pkgs/development/tools/mustache-go/default.nix
+++ b/pkgs/development/tools/mustache-go/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "mustache-go";
diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix
index 82ed82a67bd..c9728f9cbbf 100644
--- a/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/pkgs/development/tools/ofono-phonesim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchgit
 , autoreconfHook
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix
index 9ab69d1d5d8..4547012e2f3 100644
--- a/pkgs/development/tools/out-of-tree/default.nix
+++ b/pkgs/development/tools/out-of-tree/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }:
+{ lib, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }:
 
 buildGoModule rec {
   pname = "out-of-tree";
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index d4dd46cdcb5..16e5ac08203 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   pname = "packer";
   version = "1.6.6";
diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix
index ec07e4b058e..79457643ce6 100644
--- a/pkgs/development/tools/packet-cli/default.nix
+++ b/pkgs/development/tools/packet-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "packet-cli";
diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix
index 31ccf19bb05..723e5d8bb2d 100644
--- a/pkgs/development/tools/packet/default.nix
+++ b/pkgs/development/tools/packet/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "packet";
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index 79c8f379188..ce733b8a213 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages }:
+{ lib, rustPlatform, fetchFromGitHub, llvmPackages }:
 
 rustPlatform.buildRustPackage rec {
   pname = "parinfer-rust";
diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix
index cda3ba5e8a8..ff4219ad09c 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/pkgs/development/tools/pax-rs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } :
+{ lib, fetchFromGitHub, fetchurl, rustPlatform, runCommand } :
 with rustPlatform;
 
 buildRustPackage rec {
diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix
index 6ca94041bb5..2d7294ec105 100644
--- a/pkgs/development/tools/pew/default.nix
+++ b/pkgs/development/tools/pew/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3 }:
+{ lib, python3 }:
 
 with python3.pkgs;
 
diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix
index dd2345378d4..eab000e8d8e 100644
--- a/pkgs/development/tools/profiling/pprof/default.nix
+++ b/pkgs/development/tools/profiling/pprof/default.nix
@@ -1,5 +1,5 @@
 # This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "pprof-unstable";
diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix
index 3f54a4f9c0e..58458ea79aa 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@@ -6,7 +6,7 @@
 , http-conduit, http-types, lens-family-core, megaparsec, mtl
 , network-uri, open-browser, optparse-applicative, prettyprinter
 , process, QuickCheck, retry, rio, rio-orphans, safe, semver-range
-, lib, stdenv, stm, stringsearch, tar, template-haskell, temporary, text
+, lib, stm, stringsearch, tar, template-haskell, temporary, text
 , time, transformers, turtle, unliftio, unordered-containers
 , utf8-string, vector, versions, with-utf8, zlib
 }:
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index 4edb60d11a1..4fe51d3e046 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "quicktemplate";
diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix
index 5674876daba..e2f053c1e81 100644
--- a/pkgs/development/tools/rdbtools/default.nix
+++ b/pkgs/development/tools/rdbtools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python }:
+{ lib, python }:
 
 with python.pkgs;
 
diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix
index c37779a5293..385db11d7ff 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/pkgs/development/tools/remarshal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "remarshal";
diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix
index 747e80adf4f..22bf5fbe904 100644
--- a/pkgs/development/tools/renderizer/default.nix
+++ b/pkgs/development/tools/renderizer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "renderizer";
diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
index 17a334aba20..ca01f6ebfa2 100644
--- a/pkgs/development/tools/reno/default.nix
+++ b/pkgs/development/tools/reno/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , git
 , gnupg1
 , python3Packages
diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix
index 1013c4aa8b4..81a912171f3 100644
--- a/pkgs/development/tools/richgo/default.nix
+++ b/pkgs/development/tools/richgo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "richgo";
diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix
index a0c169d8466..45fb2b8f957 100644
--- a/pkgs/development/tools/run/default.nix
+++ b/pkgs/development/tools/run/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "run";
   version = "0.7.2";
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index eef8a5e41fd..f379e58ba16 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
+{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
 , runtimeShell
 , bash
 }:
diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix
index b79611ff5ec..8b40d9b686d 100644
--- a/pkgs/development/tools/rust/cargo-binutils/default.nix
+++ b/pkgs/development/tools/rust/cargo-binutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, runCommand }:
+{ lib, fetchFromGitHub, rustPlatform, runCommand }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-binutils";
diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix
index e4c5d8ab48c..989885e99a7 100644
--- a/pkgs/development/tools/rust/cargo-embed/default.nix
+++ b/pkgs/development/tools/rust/cargo-embed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib
+{ lib
 , rustPlatform, fetchFromGitHub
 , libusb1, pkg-config, rustfmt }:
 
diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix
index dbd79f179aa..39b56c2d656 100644
--- a/pkgs/development/tools/rust/cargo-flash/default.nix
+++ b/pkgs/development/tools/rust/cargo-flash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib
+{ lib
 , rustPlatform, fetchFromGitHub
 , libusb1, pkg-config, rustfmt }:
 
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index 904ba6efb52..569c8f88da2 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-fuzz";
diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix
index ae638cac8a9..358c58bef4d 100644
--- a/pkgs/development/tools/rust/cargo-readme/default.nix
+++ b/pkgs/development/tools/rust/cargo-readme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch }:
+{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-readme";
diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix
index 210449a7230..f20bdb9cc17 100644
--- a/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ b/pkgs/development/tools/rust/cargo-sweep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-sweep";
diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix
index 45ea6c430d1..54f21ab4627 100644
--- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix
+++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-sync-readme";
diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix
index 6c73b245e04..c4c079c523b 100644
--- a/pkgs/development/tools/rust/cargo-wipe/default.nix
+++ b/pkgs/development/tools/rust/cargo-wipe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchFromGitHub
 , nix-update-script
diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 2e800402c1d..8aa701779bc 100644
--- a/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xbuild";
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix
index 97da8056290..6ec06fffe21 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/pkgs/development/tools/rust/svd2rust/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix
index fa25604f9fc..2e1ca55dad3 100644
--- a/pkgs/development/tools/sourcetrail/jedi.nix
+++ b/pkgs/development/tools/sourcetrail/jedi.nix
@@ -1,6 +1,6 @@
 # Taken from a past commit of nixpkgs
 
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
+{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
 
 buildPythonPackage rec {
   pname = "jedi";
diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix
index 5d851adc5ab..5c811aaf239 100644
--- a/pkgs/development/tools/summon/default.nix
+++ b/pkgs/development/tools/summon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }:
+{ buildGoModule, fetchFromGitHub, lib, patchResolver ? true }:
 
 with lib;
 
diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix
index c25f0491c67..a1c93f46dcb 100644
--- a/pkgs/development/tools/systemfd/default.nix
+++ b/pkgs/development/tools/systemfd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, darwin, buildPlatform
+{ lib, fetchgit, darwin, buildPlatform
 , buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }:
 
 ((import ./Cargo.nix {
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index 7dc899c4fc4..7b80192a75e 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, sqlite }:
+{ lib, buildGoPackage, fetchFromGitHub, sqlite }:
 
 buildGoPackage rec {
   pname = "textql";
diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index 9a2c1d72caa..dc2f8022117 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
+{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
 
 let
   version = "2.3.2";
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index 65f91b3324f..f37b17057e5 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages
+{ lib, python3Packages
 , git, breezy, subversion }:
 
 with python3Packages;
diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix
index cfadf694320..0b037a9068c 100644
--- a/pkgs/development/tools/vend/default.nix
+++ b/pkgs/development/tools/vend/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "vend";
diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix
index 23dda32b723..505023f3fdd 100644
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ b/pkgs/development/tools/vultr-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "vultr-cli";
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
index b9ca0febf97..1f101882b5b 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/pkgs/development/tools/vultr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "vultr";
diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix
index b7eaabe8693..b5e0701c136 100644
--- a/pkgs/development/tools/winpdb/default.nix
+++ b/pkgs/development/tools/winpdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages, makeDesktopItem }:
+{ lib, fetchurl, pythonPackages, makeDesktopItem }:
 
 pythonPackages.buildPythonApplication rec {
   name = "winpdb-1.4.8";
diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index a3702f2e3e6..85dbc4f731a 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   version = "1.2.8";
diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix
index 3026289fec1..bef8eb906cf 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
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "ws";
diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix
index d707caaec5a..77f884b82b6 100644
--- a/pkgs/development/tools/yaml2json/default.nix
+++ b/pkgs/development/tools/yaml2json/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 
 buildGoPackage {
diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix
index 68ecaf6479e..303f325dec1 100644
--- a/pkgs/development/tools/yj/default.nix
+++ b/pkgs/development/tools/yj/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "yj";
diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix
index 60a3d330ab8..bf0a8c6d816 100644
--- a/pkgs/development/web/shopify-themekit/default.nix
+++ b/pkgs/development/web/shopify-themekit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "shopify-themekit";
diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix
index 2b882ccc841..a6ffe6e84e3 100644
--- a/pkgs/development/web/wml/default.nix
+++ b/pkgs/development/web/wml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }:
+{ lib, fetchurl, perlPackages, ncurses, lynx, makeWrapper }:
 
 perlPackages.buildPerlPackage {
   pname = "wml";
diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix
index e8778d7bebc..092e0e4eac2 100644
--- a/pkgs/games/20kly/default.nix
+++ b/pkgs/games/20kly/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , python }:
 
diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix
index 9b46420d5ff..83189353645 100644
--- a/pkgs/games/boohu/default.nix
+++ b/pkgs/games/boohu/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, buildGoPackage}:
+{lib, fetchurl, buildGoPackage}:
 
 buildGoPackage rec {
 
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index f63f6362558..fb7c7fddf09 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation
-, lib, stdenv
+, lib
 , pkg-config
 , zlib
 , qtbase
diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
index d47e0d5521d..a657913aad7 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/pkgs/games/cockatrice/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, mkDerivation, cmake, protobuf
+{ lib, fetchFromGitHub, mkDerivation, cmake, protobuf
 , qtbase, qtmultimedia, qttools, qtwebsockets, wrapQtAppsHook
 }:
 
diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix
index 3192976b0f6..dcb72d53b32 100644
--- a/pkgs/games/eidolon/default.nix
+++ b/pkgs/games/eidolon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, rustPlatform, pkg-config, openssl }:
+{ lib, fetchgit, rustPlatform, pkg-config, openssl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "eidolon";
diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix
index f220a85e0eb..d6b15301872 100644
--- a/pkgs/games/endgame-singularity/default.nix
+++ b/pkgs/games/endgame-singularity/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchurl
 , fetchFromGitHub
 , unzip
diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix
index 10cce9f3bf8..eeb4086f924 100644
--- a/pkgs/games/enyo-doom/default.nix
+++ b/pkgs/games/enyo-doom/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitLab, cmake, qtbase }:
+{ mkDerivation, lib, fetchFromGitLab, cmake, qtbase }:
 
 mkDerivation rec {
   pname = "enyo-doom";
diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix
index 8d9976689cc..7327b9e2287 100644
--- a/pkgs/games/factorio/mods.nix
+++ b/pkgs/games/factorio/mods.nix
@@ -2,7 +2,7 @@
 # mods. It will eventually be replaced by a nixos-channel that will provide
 # derivations for most or all of the mods tracked through the official mod
 # manager site.
-{ lib, stdenv, fetchurl
+{ lib, fetchurl
 , factorio-utils
 , allRecommendedMods ? true
 , allOptionalMods ? false
diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix
index fb09847908d..69d5282aedc 100644
--- a/pkgs/games/frogatto/default.nix
+++ b/pkgs/games/frogatto/default.nix
@@ -1,4 +1,4 @@
-{ buildEnv, lib, stdenv, callPackage, makeWrapper, makeDesktopItem }:
+{ buildEnv, lib, callPackage, makeWrapper, makeDesktopItem }:
 
 let
   description = "Action-adventure game, starring a certain quixotic frog";
diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix
index d1521dae3c4..6883acb6014 100644
--- a/pkgs/games/frozen-bubble/default.nix
+++ b/pkgs/games/frozen-bubble/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib }:
+{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib }:
 
 perlPackages.buildPerlModule {
   pname = "frozen-bubble";
diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix
index 7d63510aa99..74411d63d3e 100644
--- a/pkgs/games/gscrabble/default.nix
+++ b/pkgs/games/gscrabble/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub
+{ lib, buildPythonApplication, fetchFromGitHub
 , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection
 , python3Packages, gnome3 }:
 
diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix
index 5ed4bf5a376..c3479f6758a 100644
--- a/pkgs/games/gshogi/default.nix
+++ b/pkgs/games/gshogi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub
+{ lib, buildPythonApplication, fetchFromGitHub
 , gtk3, gobject-introspection
 , wrapGAppsHook, python3Packages }:
 
diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix
index 0705da6bfe9..4609f7d732c 100644
--- a/pkgs/games/harmonist/default.nix
+++ b/pkgs/games/harmonist/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, buildGoPackage}:
+{lib, fetchurl, buildGoPackage}:
 
 buildGoPackage rec {
 
diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix
index f5c0e3faf77..0635ab8aed8 100644
--- a/pkgs/games/lunar-client/default.nix
+++ b/pkgs/games/lunar-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appimageTools, lib, fetchurl, makeDesktopItem }:
+{ appimageTools, lib, fetchurl, makeDesktopItem }:
 let
   name = "lunar-client";
   version = "2.4.0";
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 81fc1b98f36..5a1f42ee130 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }:
 
 let
   jdk = jdk8;
diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix
index 306c5de3b43..41c903e1011 100644
--- a/pkgs/games/openra/common.nix
+++ b/pkgs/games/openra/common.nix
@@ -1,7 +1,7 @@
 /*  The reusable code, and package attributes, between OpenRA engine packages (engine.nix)
     and out-of-tree mod packages (mod.nix).
 */
-{ lib, stdenv, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper
+{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper
 , lua, mono, dotnetPackages, python
 , libGL, freetype, openal, SDL2
 , zenity
diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index 56f0d5a47f2..59555a8ac24 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
+{ lib, mkDerivation, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
 , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite
 , wrapQtAppsHook
 , tinyxml2, target ? "client" }:
diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix
index 07451b8dc2a..ef535991c23 100644
--- a/pkgs/games/portmod/default.nix
+++ b/pkgs/games/portmod/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, python3Packages, fetchFromGitLab, cacert,
+{ lib, callPackage, python3Packages, fetchFromGitLab, cacert,
   rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip,
   jre, makeWrapper, tr-patcher, tes3cmd }:
 
diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix
index dbe2db363ea..381a6e8742b 100644
--- a/pkgs/games/pro-office-calculator/default.nix
+++ b/pkgs/games/pro-office-calculator/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }:
+{ mkDerivation, lib, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }:
 mkDerivation rec {
   version = "1.0.13";
   pname = "pro-office-calculator";
diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix
index c765a1cbdf5..925532bbbf5 100644
--- a/pkgs/games/pysolfc/default.nix
+++ b/pkgs/games/pysolfc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, buildPythonApplication, python3Packages
+{ lib, fetchzip, buildPythonApplication, python3Packages
   , desktop-file-utils, freecell-solver }:
 
 buildPythonApplication rec {
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index c87d1bea1c7..f5330485edd 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }:
+{ lib, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }:
 
 mkDerivation rec {
   pname = "tbe";
diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix
index 5a6bc34fea5..f99faa282fd 100644
--- a/pkgs/games/wyvern/default.nix
+++ b/pkgs/games/wyvern/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchgit
 , rustPlatform
 , unzip
diff --git a/pkgs/misc/doge/default.nix b/pkgs/misc/doge/default.nix
index 8334444ec4c..911917e6d2f 100644
--- a/pkgs/misc/doge/default.nix
+++ b/pkgs/misc/doge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv , python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   pname = "doge";
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
index 77a2e03d161..db5c8e5d903 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders
+{ lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders
 , GyroplotSupport ? false
 }:
 
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index d092a878683..e1a31d208e4 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
+{ mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
 
 mkDerivation {
   pname = "citra";
diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix
index 236eff8610c..c766df9e3c0 100644
--- a/pkgs/misc/emulators/firebird-emu/default.nix
+++ b/pkgs/misc/emulators/firebird-emu/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
+{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
 
 mkDerivation rec {
   pname = "firebird-emu";
diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix
index dbf658b8fce..b028701fe11 100644
--- a/pkgs/misc/emulators/melonDS/default.nix
+++ b/pkgs/misc/emulators/melonDS/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , mkDerivation
 , cmake
diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix
index 475e54076fc..9e1f986341f 100644
--- a/pkgs/misc/emulators/ruffle/default.nix
+++ b/pkgs/misc/emulators/ruffle/default.nix
@@ -5,7 +5,7 @@
 , pkg-config
 , python3
 , rustPlatform
-, lib, stdenv
+, lib
 , wayland
 , xorg
 , vulkan-loader
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 24da1d86bbf..abfc4f832a3 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, wineUnstable }:
+{ lib, callPackage, wineUnstable }:
 
 with callPackage ./util.nix {};
 
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index 43f077227db..17b7b563c15 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
+{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
 , freeglut ? null, openal ? null, SDL2 ? null }:
 
 mkDerivation rec {
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index c4de45421f2..2f3a95a3302 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, lndir, symlinkJoin, makeWrapper
+{ lib, lndir, symlinkJoin, makeWrapper
 , lilypond, openlilylib-fonts
 }:
 
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index 1be14ecec9b..ce80b174d32 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
+{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
 
 let beat = package : extraArgs : buildGoPackage (rec {
       name = "${package}-${version}";
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index d7416731e63..43ea85508c6 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
+{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
 
 let beat = package : extraArgs : buildGoPackage (rec {
       name = "${package}-${version}";
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index bb547b3d34d..188da860530 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, vscode-utils
+{ lib, vscode-utils
 , fetchurl, unzip
 , mono, writeScript, runtimeShell
 , jq, clang-tools
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index f561755fc4b..b894eb7fa4d 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }:
+{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }:
 
 let
   inherit (vscode-utils) buildVscodeMarketplaceExtension;
diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix
index 82924f369ae..746bb4608ab 100644
--- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix
+++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , vscode-utils
 , useLocalExtensions ? false}:
 # Note that useLocalExtensions requires that vscode-server is not running
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
index d19027fa576..0136bf4e5b1 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
@@ -1,5 +1,5 @@
 # Update script: pkgs/development/tools/rust/rust-analyzer/update.sh
-{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages
+{ lib, vscode-utils, jq, rust-analyzer, nodePackages
 , setDefaultServerPath ? true
 }:
 
diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix
index 336cd059f57..86453b960cb 100644
--- a/pkgs/misc/vscode-extensions/wakatime/default.nix
+++ b/pkgs/misc/vscode-extensions/wakatime/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , wakatime, vscode-utils }:
 
 let
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
index 9afd4b475de..b53c5985a21 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation }:
+{ lib, appleDerivation }:
 
 appleDerivation {
   dontBuild = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
index 3e5399dbb35..609cd579f9f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation }:
+{ lib, appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
index 2f6c8319b1c..e3b3179d4a3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation }:
+{ lib, appleDerivation }:
 
 appleDerivation {
   prePatch = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
index cb54212f217..0ba61ccb491 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, IOKitSrcs, xnu, darwin-stubs }:
+{ lib, appleDerivation, IOKitSrcs, xnu, darwin-stubs }:
 
 # Someday it'll make sense to split these out into their own packages, but today is not that day.
 appleDerivation {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
index 7f93a87837a..1bf6396d47f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, developer_cmds }:
+{ lib, appleDerivation, developer_cmds }:
 
 appleDerivation {
   buildInputs = [ developer_cmds ];
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 a5508b5ec12..ad3f5dea975 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo
+{ lib, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo
 , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto
 , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread
 , mDNSResponder, launchd, libutil, hfs, darling, darwin-stubs }:
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix
index 4f719ef8463..4855c532acb 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
+{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
 }:
 
 # this derivation sucks
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 614bdf570f3..6e659df4d62 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 @@
-{ lib, stdenv, appleDerivation, xcbuild, ncurses, libutil }:
+{ lib, appleDerivation, xcbuild, ncurses, libutil }:
 
 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/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
index f7503dbb953..5a3b1710216 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation }:
+{ lib, appleDerivation }:
 
 appleDerivation {
   dontBuild = true;
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 8cff145661f..7d011d2d8cc 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 @@
-{ lib, stdenv, appleDerivation, xcbuildHook }:
+{ lib, appleDerivation, xcbuildHook }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
index 5819101e10a..27a7f7b3e7c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, yacc, flex }:
+{ lib, appleDerivation, yacc, flex }:
 
 appleDerivation {
   nativeBuildInputs = [ yacc flex ];
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 5a5a603eae8..6f666019c3b 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 @@
-{ lib, stdenv, appleDerivation, makeWrapper }:
+{ lib, appleDerivation, makeWrapper }:
 
 appleDerivation {
   nativeBuildInputs = [ makeWrapper ];
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 db57537bacb..77de079e2f0 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 @@
-{ lib, stdenv, appleDerivation, xcbuildHook, llvmPackages }:
+{ lib, appleDerivation, xcbuildHook, llvmPackages }:
 
 appleDerivation {
   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 e46e826053f..1daa4929610 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,4 +1,4 @@
-{ lib, stdenv, appleDerivation, xcbuildHook
+{ lib, appleDerivation, xcbuildHook
 , Libc, xnu, libutil }:
 
 appleDerivation {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
index 4a72ea337eb..01d44d22f5e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation }:
+{ lib, appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
index 407117f1dbd..258d9785e70 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }:
+{ lib, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
index ceb4b18df17..d9a9beaccfc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, libdispatch, xnu }:
+{ lib, appleDerivation, libdispatch, xnu }:
 
 appleDerivation {
   propagatedBuildInputs = [ libdispatch xnu ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
index 24986e28852..5021d3cd7fe 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation }:
+{ lib, appleDerivation }:
 
 appleDerivation {
   buildPhase = ":";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index f216a820dd4..dd3cf030952 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, xcbuildHook
+{ lib, appleDerivation, xcbuildHook
 , openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
 
 appleDerivation {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index 771dd41b575..e2e13a168f0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appleDerivation, xcbuildHook }:
+{ lib, appleDerivation, xcbuildHook }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
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 d5dca4a3035..3f0c91db91c 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 @@
-{ lib, stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }:
+{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix
index e21f00beb5a..862305a069d 100644
--- a/pkgs/os-specific/darwin/stubs/default.nix
+++ b/pkgs/os-specific/darwin/stubs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, writeScriptBin, runtimeShell }:
+{ lib, writeScriptBin, runtimeShell }:
 
 let fake = name: lib.overrideDerivation (writeScriptBin name ''
   #!${runtimeShell}
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index cc485bb62c6..16ed52ea81e 100644
--- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -2,7 +2,7 @@
 , clang-unwrapped
 , binutils-unwrapped
 , runCommand
-, stdenv
+
 , wrapBintoolsWith
 , wrapCCWith
 , buildIosSdk, targetIosSdkPkgs
diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
index 036ea0a0f48..f5db0b25f18 100644
--- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix
+++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
@@ -1,4 +1,4 @@
-{ busybox, stdenv}:
+{ busybox}:
 
 # Minimal shell for use as basic /bin/sh in sandbox builds
 busybox.override {
diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix
index d1a93e4247e..e82e3f5901c 100644
--- a/pkgs/os-specific/linux/cpuset/default.nix
+++ b/pkgs/os-specific/linux/cpuset/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , fetchpatch
 , pythonPackages
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 25f541d7a00..e23591168f6 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , dbus
 , dbus_cplusplus
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index 9baa4eee621..15e53557126 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip }:
+{ lib, fetchzip }:
 
 let
   pname = "zd1211-firmware";
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index db4b70037c8..b60a10c73ed 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }:
+{ lib, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }:
 
 # Don't use this for anything important yet!
 
diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix
index 1924e326c1e..a91175aa59f 100644
--- a/pkgs/os-specific/linux/iotop/default.nix
+++ b/pkgs/os-specific/linux/iotop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages, fetchpatch }:
+{ lib, fetchurl, python3Packages, fetchpatch }:
 
 python3Packages.buildPythonApplication rec {
   name = "iotop-0.6";
diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix
index 6505d1d80ee..7285e27ff36 100644
--- a/pkgs/os-specific/linux/iproute/mptcp.nix
+++ b/pkgs/os-specific/linux/iproute/mptcp.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, iproute, fetchFromGitHub }:
+{ lib, iproute, fetchFromGitHub }:
 
 iproute.overrideAttrs (oa: rec {
   pname = "iproute_mptcp";
diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix
index ffd710e632e..bd0518650d6 100644
--- a/pkgs/os-specific/linux/kernel/hardened/config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened/config.nix
@@ -8,7 +8,7 @@
 #
 # See also <nixos/modules/profiles/hardened.nix>
 
-{ lib, stdenv, version }:
+{ lib, version }:
 
 with lib;
 with lib.kernel;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index d1d9e94e2a6..193f6c3d160 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
 
 with lib;
 
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 2bc5321ea7f..99425f984f7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
 
 with lib;
 
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 9c04ee72238..6b2e8f08ecb 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
+{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
   version = "4.4.253";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index df298ade084..2c0c3457ef0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
+{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
   version = "4.9.253";
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 0eaa148a49c..2afabcad042 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
 
 with lib;
 
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 0469b731b89..1d098416c3d 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
 
 with lib;
 
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index a272bd286f3..a64520ab893 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
+{ buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
 
 buildLinux (args // rec {
   version = "4.14.165-172";
diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index 35df8e99ddc..3c938fd8e6f 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
+{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
 
 let
   version = "5.10.9";
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix
index f7bca36481b..cd661be1078 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
+{ lib, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
 let
   mptcpVersion = "0.95";
   modDirVersion = "4.19.55";
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 5f0f513ff45..b1874bf3820 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
+{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
 
 buildLinux (args // {
   version = "5.9.0-2020.11.20";
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 98fafaadece..5210e3ed7a8 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
 
 with lib;
 
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index aa73e7b8a3e..b30afb59ca8 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
+{ lib, fetchFromGitHub, buildLinux, ... } @ args:
 
 let
   version = "5.10.9";
diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix
index a9f99874367..577b7c25311 100644
--- a/pkgs/os-specific/linux/net-tools/mptcp.nix
+++ b/pkgs/os-specific/linux/net-tools/mptcp.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, nettools, fetchFromGitHub  }:
+{ lib, nettools, fetchFromGitHub  }:
 
 nettools.overrideAttrs(oa: rec {
   name = "net-tools-mptcp";
diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix
index c74810d24d5..f15a5b63779 100644
--- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix
+++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 , go-md2man
diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix
index 32c99a8be13..4745ba818a9 100644
--- a/pkgs/os-specific/linux/openrazer/driver.nix
+++ b/pkgs/os-specific/linux/openrazer/driver.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  common = import ../../../development/python-modules/openrazer/common.nix { inherit lib stdenv fetchFromGitHub; };
+  common = import ../../../development/python-modules/openrazer/common.nix { inherit lib fetchFromGitHub; };
 in
 stdenv.mkDerivation (common // {
   name = "openrazer-${common.version}-${kernel.version}";
diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index 1ef304c617f..839b3f1b78f 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3
+{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3
 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3
 , gobject-introspection }:
 
diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix
index 2fb6c9441ed..87cc098d07d 100644
--- a/pkgs/os-specific/linux/s6-linux-init/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-init/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, skawarePackages }:
+{ lib, skawarePackages }:
 
 with skawarePackages;
 
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 209f596d273..132a0b49574 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, skawarePackages }:
+{ lib, skawarePackages }:
 
 with skawarePackages;
 
diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix
index 026488a24de..a58b7efa7b3 100644
--- a/pkgs/os-specific/linux/sd-switch/default.nix
+++ b/pkgs/os-specific/linux/sd-switch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, dbus }:
+{ lib, fetchFromGitLab, rustPlatform, pkg-config, dbus }:
 
 rustPlatform.buildRustPackage rec {
   pname = "sd-switch";
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index bcdb622866b..0da84ab1cef 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3
+{ lib, fetchFromGitHub, python3
 , libsepol, libselinux, checkpolicy
 , withGraphics ? false
 }:
diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix
index ba1c063cc05..4d3446d5a5d 100644
--- a/pkgs/os-specific/linux/targetcli/default.nix
+++ b/pkgs/os-specific/linux/targetcli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchFromGitHub }:
+{ lib, python3, fetchFromGitHub }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "targetcli";
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index 4db4d64bc93..594cf6bfc42 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
+{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
 mkDerivation {
   pname = "kernelshark";
   version = "1.1.0";
diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix
index 5f4ffb50c07..cc9fb737465 100644
--- a/pkgs/os-specific/linux/undervolt/default.nix
+++ b/pkgs/os-specific/linux/undervolt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.3.0";
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index ab1cece0f33..d2d59ba21a5 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
+{ lib, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
 
 mkDerivation {
   name = "wpa_gui-${wpa_supplicant.version}";
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index d48bcad1794..3e6641b8d26 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "caddy";
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index 8ab171a2f43..c9d06d49771 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "cayley";
diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix
index 8e1ef831269..f6f6a0fbd71 100644
--- a/pkgs/servers/cloud-print-connector/default.nix
+++ b/pkgs/servers/cloud-print-connector/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }:
+{ lib, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }:
 
 # TODO: Add a service for gcp-cups-connector and perhaps some other
 # kind of configuration for the same thing that gcp-connector-util
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 4c0ce8d511e..9dc723417d6 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "consul";
diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix
index 0c6fe818775..4a499e7f878 100644
--- a/pkgs/servers/demoit/default.nix
+++ b/pkgs/servers/demoit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 }:
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index adb1a7f329b..cdfc78d6222 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "coredns";
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 0e608051a9e..10d517179c2 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -1,4 +1,4 @@
-{ gcc6Stdenv, stdenv, gccStdenv, llvmPackages
+{ gcc6Stdenv, gccStdenv, llvmPackages
 , lib, fetchurl, fetchpatch, fetchFromGitHub
 
 , cmake, ninja, which, findutils, m4, gawk
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index c4881baeac0..7bd09569248 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gotty";
diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix
index 75d15d4f378..67b328d661a 100644
--- a/pkgs/servers/headphones/default.nix
+++ b/pkgs/servers/headphones/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }:
+{ lib, fetchFromGitHub, python2, makeWrapper }:
 
 python2.pkgs.buildPythonApplication rec {
   pname = "headphones";
diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix
index e6e35c35900..0d138e1f648 100644
--- a/pkgs/servers/holochain-go/default.nix
+++ b/pkgs/servers/holochain-go/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "holochain-go${version}";
diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix
index 52f345d5477..1faa85cfc14 100644
--- a/pkgs/servers/http/hyp/default.nix
+++ b/pkgs/servers/http/hyp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages }:
+{ lib, fetchurl, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   pname = "hyp-server";
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 8b950ec12c5..41c69bde285 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }:
+{ lib, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }:
 
 buildGoModule rec {
   pname = "hydron";
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index eaf16e38804..e7d9b1a2847 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
+{ stdenv, lib, fetchFromGitHub, makeWrapper, php }:
+
+stdenv.mkDerivation rec {
   pname = "icingaweb2";
   version = "2.8.2";
 
@@ -16,10 +18,10 @@
     cp -ra application bin etc library modules public $out
     cp -ra doc $out/share
 
-    wrapProgram $out/bin/icingacli --prefix PATH : "${makeBinPath [ php ]}"
+    wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php ]}"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Webinterface for Icinga 2";
     longDescription = ''
       A lightweight and extensible web interface to keep an eye on your environment.
diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/pkgs/servers/icingaweb2/theme-april/default.nix
index 7c592fca33b..0a152a7e157 100644
--- a/pkgs/servers/icingaweb2/theme-april/default.nix
+++ b/pkgs/servers/icingaweb2/theme-april/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
   name = "icingaweb2-theme-april";
   version = "1.0.4";
 
@@ -14,7 +19,7 @@
     cp -r * "$out"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Icingaweb2 theme for april fools";
     homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-april";
     license = licenses.publicDomain;
diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix
index 273bcf6945d..59b8df6b4d4 100644
--- a/pkgs/servers/icingaweb2/theme-lsd/default.nix
+++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
   name = "icingaweb2-theme-lsd";
   version = "1.0.3";
 
@@ -14,7 +19,7 @@
     cp -r * "$out"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Psychadelic theme for IcingaWeb 2";
     homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-lsd";
     license = licenses.publicDomain;
diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/pkgs/servers/icingaweb2/theme-particles/default.nix
index 3d28481cd84..ddd363701a7 100644
--- a/pkgs/servers/icingaweb2/theme-particles/default.nix
+++ b/pkgs/servers/icingaweb2/theme-particles/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
   name = "icingaweb2-theme-particles";
   version = "1.0.0";
 
@@ -14,7 +19,7 @@
     cp -r * "$out"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "This theme adds a nice particle effect to the login screen of Icingaweb 2";
     homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-particles";
     license = licenses.publicDomain;
diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix
index 941138bb0a5..5650d1ccdba 100644
--- a/pkgs/servers/icingaweb2/theme-snow/default.nix
+++ b/pkgs/servers/icingaweb2/theme-snow/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
   name = "icingaweb2-theme-snow";
   version = "1.0.0";
 
@@ -20,7 +25,7 @@
     cp -r * "$out"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Snow theme for Icingaweb 2";
     homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-snow";
     license = licenses.publicDomain;
diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/pkgs/servers/icingaweb2/theme-spring/default.nix
index a21f6cc89a2..dda26caf6a1 100644
--- a/pkgs/servers/icingaweb2/theme-spring/default.nix
+++ b/pkgs/servers/icingaweb2/theme-spring/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
   name = "icingaweb2-theme-spring";
   version = "1.0.0";
 
@@ -14,7 +19,7 @@
     cp -r * "$out"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Theme with some soft colors and nice background images loaded from unsplash.com";
     homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-spring";
     license = licenses.publicDomain;
diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/pkgs/servers/icingaweb2/theme-unicorn/default.nix
index a43f7d7c09a..a2bb3f9e4a2 100644
--- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix
+++ b/pkgs/servers/icingaweb2/theme-unicorn/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub }: with lib; stdenv.mkDerivation rec {
+{ lib
+, stdenv
+, fetchurl
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
   name = "icingaweb2-theme-unicorn";
   version = "1.0.2";
 
@@ -35,7 +41,7 @@
     cp unicorn.png "$out/public/img/unicorn.png"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Unicorn theme for IcingaWeb 2";
     homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-unicorn";
     license = licenses.publicDomain;
diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix
index b383135f2eb..ee759ac55ea 100644
--- a/pkgs/servers/identd/nullidentdmod/default.nix
+++ b/pkgs/servers/identd/nullidentdmod/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, ... }:
+
+stdenv.mkDerivation rec {
   pname = "nullidentdmod";
   version = "1.3";
 
diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix
index d0b192010c1..2530c72cbb9 100644
--- a/pkgs/servers/irc/robustirc-bridge/default.nix
+++ b/pkgs/servers/irc/robustirc-bridge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "robustirc-bridge";
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix
index 4680c37c85e..b9bce56d9fa 100644
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/servers/isso/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 with python3Packages; buildPythonApplication rec {
 
diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix
index b52018b64f4..94a1832bd8d 100644
--- a/pkgs/servers/kapowbang/default.nix
+++ b/pkgs/servers/kapowbang/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "kapowbang";
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index acfa1aa2c3f..a016c8e7f09 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule
+{ lib, fetchFromGitHub, buildGoModule
 , pkg-config, ffmpeg, gnutls
 }:
 
diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix
index f1ba497720a..674fdbabb4e 100644
--- a/pkgs/servers/mail/mailhog/default.nix
+++ b/pkgs/servers/mail/mailhog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "MailHog";
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 57ceee948b5..9a86cc31fdd 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython
 , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib
 , requests, zope_configuration, click, falcon, importlib-resources
 , zope_component, lynx, postfix, authheaders, gunicorn
diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix
index 58ef52e9c26..00cf2c1e83c 100644
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock
+{ lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock
 , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3
 , django-haystack, flufl_lock, networkx, dateutil, defusedxml
 , django-paintstore, djangorestframework, django, django-q
diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
index ab8ad4440ab..9330de3a8f3 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock
+{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock
 , django-mailman3, mailmanclient, readme_renderer
 }:
 
diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix
index 1c92a4a7676..800a69e9509 100644
--- a/pkgs/servers/mail/postfix/pflogsumm.nix
+++ b/pkgs/servers/mail/postfix/pflogsumm.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages }:
+{ lib, fetchurl, perlPackages }:
 
 perlPackages.buildPerlPackage rec {
   pname = "pflogsumm";
diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix
index d0eaf40d06c..07b351bfb21 100644
--- a/pkgs/servers/mail/postgrey/default.nix
+++ b/pkgs/servers/mail/postgrey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages, lib, runCommand, postfix }:
+{ fetchurl, perlPackages, lib, runCommand, postfix }:
 
 let
     mk-perl-flags = inputs: lib.concatStringsSep " " (map (dep: "-I ${dep}/${perlPackages.perl.libPrefix}") inputs);
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index c5980bc8889..ff96f0e7c82 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages, makeWrapper, gnupg }:
+{ lib, fetchurl, perlPackages, makeWrapper, gnupg }:
 
 perlPackages.buildPerlPackage rec {
   pname = "SpamAssassin";
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index df22aab1f95..6d12ac84d90 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchurl }:
+{ lib, buildGoModule, fetchurl }:
 
 buildGoModule rec {
   pname = "matterbridge";
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 36edd851f36..3abb728bec1 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "matterircd";
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index eea87392927..a17d8a55acc 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, olm }:
+{ lib, buildGoModule, fetchFromGitHub, olm }:
 
 buildGoModule rec {
   pname = "mautrix-whatsapp";
diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix
index 55dd3d8afc5..7781124259b 100644
--- a/pkgs/servers/miniflux/default.nix
+++ b/pkgs/servers/miniflux/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }:
 
 let
   pname = "miniflux";
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index d54232fd7f2..9477da8a3f8 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "minio";
diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
index a696bc41351..d6a25b3675f 100644
--- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
+++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib, stdenv }:
+{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib }:
 mkDerivation {
   pname = "client-ip-echo";
   version = "0.1.0.5";
diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix
index 7f4959e58eb..1eaaf01578f 100644
--- a/pkgs/servers/monitoring/alertmanager-bot/default.nix
+++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "alertmanager-bot";
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 63000664921..8501aa5e02c 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "cadvisor";
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index 896664658cf..4cf5f6b8068 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "consul-alerts";
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix
index 5d825dbe7f2..0034c253c77 100644
--- a/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
+{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
 , fetchFromGitHub, makeWrapper
 }:
 
diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix
index 43346e9353f..da60be64603 100644
--- a/pkgs/servers/monitoring/grafana-reporter/default.nix
+++ b/pkgs/servers/monitoring/grafana-reporter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }:
+{ lib, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }:
 
 with lib;
 
diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix
index 11183dcc2f2..1ca9e702e7a 100644
--- a/pkgs/servers/monitoring/plugins/esxi.nix
+++ b/pkgs/servers/monitoring/plugins/esxi.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 let
   bName = "check_esxi_hardware";
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 19b98124e8e..bc3cf7539ec 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }:
+{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage rec {
   pname = "alertmanager";
diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
index 648bb59b0d2..64105c9c58f 100644
--- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "apcupsd-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
index 2548e196837..af58a6ebe94 100644
--- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "aws-s3-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index 1a86a0e38d9..5cfdf615830 100644
--- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "bind_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix
index 5670233b054..3cb04304e26 100644
--- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "bird-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 3140056a269..88ef3f02602 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "blackbox_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index f86c3a42773..b3b61567d48 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "collectd-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
index ab4b67402d3..c3cc7eff90a 100644
--- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "consul_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index e0141718696..875db1777fb 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "dnsmasq_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
index c0d96b08bb6..ff7156360a9 100644
--- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "dovecot_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index bc9058e36d9..cefa4579069 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "fritzbox-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
index 718c8f2fcb1..18055f9b06a 100644
--- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gitlab-ci-pipelines-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index e12c76e09f0..6a42297d502 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "haproxy_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
index e7ecffee992..a551e55b216 100644
--- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "keylight-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
index 1f9c38922eb..34a9511d0b5 100644
--- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "lndmon";
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
index daad5dc81cd..2d995ba5293 100644
--- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }:
 
 buildGoModule {
   pname = "mailexporter";
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index 0fb7ee4fce3..0fa2bced125 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "mesos_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
index 5044db4b1c1..37f9b0c4e06 100644
--- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "mikrotik-exporter-unstable";
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index 78642821b94..93e9bca3283 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
   pname = "minio-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
index c23d44dca38..e6178dd52a3 100644
--- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "modemmanager-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index ec181d2e110..ff32764fcde 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "mysqld_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 259b4f752d3..ee5bafbc7c9 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "nginx_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
index b15a54c6529..fad49d27575 100644
--- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "nginxlog_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index e2b601f56c1..42ccb91017f 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "node_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
index 8e3daa931ee..021905ba9e0 100644
--- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "openvpn_exporter-unstable";
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index e3f8b2d44d4..a24edd2fbb0 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
+{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
 , systemd, withSystemdSupport ? true }:
 
 with lib;
diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix
index 5a3c232ac85..a147a3c2905 100644
--- a/pkgs/servers/monitoring/prometheus/process-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "process-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index b333faf0bbd..a370bf1f248 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "prom2json";
diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix
index f4a9070fd84..a4ba3cee620 100644
--- a/pkgs/servers/monitoring/prometheus/promscale.nix
+++ b/pkgs/servers/monitoring/prometheus/promscale.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 }:
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 0d47211005f..aca2836e1a7 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, go, buildGoPackage, fetchFromGitHub }:
+{ lib, go, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "pushgateway";
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index d9c08f8718d..b7832395f62 100644
--- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "rabbitmq_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index 945f403041c..34c058d5d6c 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "redis_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index a71b03a2b41..ece22e496d1 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }:
 
 buildGoPackage rec {
   pname = "snmp_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
index 2784dae63af..553613a9c7e 100644
--- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "sql_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
index a2b0f73904b..31bd583280c 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "statsd_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
index 50915bf65f8..39e475df197 100644
--- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "surfboard_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index 669cf8ffaea..b9971ab7228 100644
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "unifi-exporter";
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 9955b4a8333..755dc151775 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
   version = "0.17.2";
diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix
index 0343384a679..8297503b675 100644
--- a/pkgs/servers/monitoring/unifi-poller/default.nix
+++ b/pkgs/servers/monitoring/unifi-poller/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "unifi-poller";
diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix
index f4dc2d33d1b..19147be3f5d 100644
--- a/pkgs/servers/nextcloud/news-updater.nix
+++ b/pkgs/servers/nextcloud/news-updater.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages, php }:
+{ lib, fetchurl, python3Packages, php }:
 
 python3Packages.buildPythonApplication rec {
   name = "nextcloud-news-updater-${version}";
diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix
index 0029d9ad55e..572f4d94e72 100644
--- a/pkgs/servers/nginx-sso/default.nix
+++ b/pkgs/servers/nginx-sso/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, lib, stdenv, nixosTests }:
+{ buildGoPackage, fetchFromGitHub, lib, nixosTests }:
 
 buildGoPackage rec {
   pname = "nginx-sso";
diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix
index 2a33b9744a2..666a92004b4 100644
--- a/pkgs/servers/nosql/mongodb/v3_4.nix
+++ b/pkgs/servers/nosql/mongodb/v3_4.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
+{ callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
 
 let
   buildMongoDB = callPackage ./mongodb.nix {
diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
index 511ea217328..bdf12a1f923 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages
+{ lib, fetchgit, perl, openssl, perlPackages, gettext, python3Packages
 # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere.
 , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }:
 
diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix
index 3bfab658af6..fafeda88975 100644
--- a/pkgs/servers/radicale/1.x.nix
+++ b/pkgs/servers/radicale/1.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages }:
+{ lib, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "radicale";
diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix
index 918dad537a5..b0902feeead 100644
--- a/pkgs/servers/radicale/2.x.nix
+++ b/pkgs/servers/radicale/2.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3 }:
+{ lib, fetchFromGitHub, python3 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "Radicale";
diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index e62ad975380..4a19932f23e 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "routinator";
diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix
index d3ec7dc75ee..cfc35e8528f 100644
--- a/pkgs/servers/rtsp-simple-server/default.nix
+++ b/pkgs/servers/rtsp-simple-server/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildGoModule
 }:
diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix
index ecc79acfbe7..2ae3d9f486f 100644
--- a/pkgs/servers/scylladb/default.nix
+++ b/pkgs/servers/scylladb/default.nix
@@ -1,5 +1,5 @@
 {
-  lib, stdenv,
+  lib,
   fetchgit,
   python3Packages,
   pkg-config,
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
index 04cd93c5306..8964796862c 100644
--- a/pkgs/servers/serf/default.nix
+++ b/pkgs/servers/serf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "serf";
diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix
index 7bd971e86e7..43ba82caf76 100644
--- a/pkgs/servers/sickbeard/sickrage.nix
+++ b/pkgs/servers/sickbeard/sickrage.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }:
+{ lib, fetchFromGitHub, python2, makeWrapper }:
 
 python2.pkgs.buildPythonApplication rec {
   pname = "sickrage";
diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix
index bc56053515b..d673a201646 100644
--- a/pkgs/servers/simplehttp2server/default.nix
+++ b/pkgs/servers/simplehttp2server/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "simplehttp2server";
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index 587c5d4bda2..e6f35124a6f 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "skydns";
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 5e1e8544818..3e28f501049 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper
+{ lib, fetchurl, makeWrapper
 , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }:
 
 perlPackages.buildPerlPackage rec {
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index b0dc7a22757..75d341e601e 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lib, buildGoModule }:
+{ fetchFromGitHub, lib, buildGoModule }:
 
 buildGoModule rec {
     pname = "dolt";
diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix
index bb353dda928..9240b9c51a2 100644
--- a/pkgs/servers/tarssh/default.nix
+++ b/pkgs/servers/tarssh/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, rustPlatform, lib, stdenv }:
+{ fetchFromGitHub, rustPlatform, lib }:
 
 with rustPlatform;
 
diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix
index c18bf17a7c7..f2161d5d47e 100644
--- a/pkgs/servers/tegola/default.nix
+++ b/pkgs/servers/tegola/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "tegola";
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index f89c8f96fcf..0b55b82d39e 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
-{ lib, stdenv, buildGoPackage, zip, fetchFromGitHub }:
+{ lib, buildGoPackage, zip, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "teleport";
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 4ef454d6b56..340bad6bdc8 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }:
+{ lib, fetchzip, buildGoModule, go-bindata, nixosTests }:
 
 buildGoModule rec {
   pname = "traefik";
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 03ff9f32fa5..cc0fb0d7421 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 , trezor-udev-rules
diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix
index b99375dbb3d..5cf08ee6c3c 100644
--- a/pkgs/servers/trickster/trickster.nix
+++ b/pkgs/servers/trickster/trickster.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "trickster";
diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
index 375726a4692..1accac5bf6f 100644
--- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
+++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation {
+{ lib, stdenv, fetchFromGitHub, ... }:
+
+stdenv.mkDerivation {
   pname = "tt-rss-plugin-ff-instagram";
   version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
 
diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
index 987a6d8aaa6..7df8b717593 100644
--- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
+++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, ... }:
+
+stdenv.mkDerivation rec {
   pname = "tt-rss-plugin-tumblr-gdpr";
   version = "2.1";
 
diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix
index 41f47ca4a4e..f6882611a25 100644
--- a/pkgs/servers/tt-rss/theme-feedly/default.nix
+++ b/pkgs/servers/tt-rss/theme-feedly/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
   pname = "tt-rss-theme-feedly";
   version = "2.5.0";
 
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix
index acdfb95272a..b681727c08f 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/pkgs/servers/udpt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "udpt";
diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix
index 818e92f0596..07342c3edbe 100644
--- a/pkgs/servers/unpfs/default.nix
+++ b/pkgs/servers/unpfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "unpfs";
diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix
index 6b17476623b..04f1e14d5cc 100644
--- a/pkgs/servers/web-apps/morty/default.nix
+++ b/pkgs/servers/web-apps/morty/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "morty";
diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix
index 7100c70c0ed..b39d7a00ced 100644
--- a/pkgs/servers/web-apps/shiori/default.nix
+++ b/pkgs/servers/web-apps/shiori/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "shiori";
diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
index 316e3a52497..6bda15a93e0 100644
--- a/pkgs/servers/webmetro/default.nix
+++ b/pkgs/servers/webmetro/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "webmetro";
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 7fe0e5a9f97..e3d2698e830 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config
+{ lib, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config
 , epoxy, libxslt, libunwind, makeWrapper, egl-wayland
 , defaultFontPath ? "" }:
 
diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix
index b8eb29d87b2..5241139cfa3 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/pkgs/servers/xandikos/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , python3Packages
 , installShellFiles
diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix
index 550e93fb5aa..85465fd7d14 100644
--- a/pkgs/servers/zigbee2mqtt/default.nix
+++ b/pkgs/servers/zigbee2mqtt/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }:
+{ pkgs, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }:
 let
   package = (import ./node.nix { inherit pkgs system; }).package;
 in
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 938029e9af9..82a15edcb26 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "elvish";
diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix
index c23e0b1ca92..368c88aa1bb 100644
--- a/pkgs/shells/fish/babelfish.nix
+++ b/pkgs/shells/fish/babelfish.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "babelfish";
   version = "1.0.1";
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index 3ea41d7f472..33e71358b4d 100644
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchgit, lib }:
+{ buildGoPackage, fetchgit, lib }:
 
 buildGoPackage rec {
   pname = "oh";
diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix
index 8b2ac362959..c7c6e4e5a7d 100644
--- a/pkgs/shells/pash/default.nix
+++ b/pkgs/shells/pash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildDotnetPackage }:
+{ lib, fetchFromGitHub, buildDotnetPackage }:
 
 buildDotnetPackage {
   baseName = "pash";
diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix
index c0c56570b46..7fb2d786193 100644
--- a/pkgs/shells/zsh/zsh-git-prompt/default.nix
+++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix
@@ -32,7 +32,7 @@
 }:
 
 haskellPackages.callPackage
-  ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }:
+  ({ mkDerivation, base, HUnit, parsec, process, QuickCheck }:
    mkDerivation rec {
      pname = "zsh-git-prompt";
      version = "0.4z";  # While we await a real 0.5 release.
diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell-shellFor/default.nix
index 05d09d6f39c..9d13e1112cc 100644
--- a/pkgs/test/haskell-shellFor/default.nix
+++ b/pkgs/test/haskell-shellFor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, haskellPackages, cabal-install }:
+{ lib, haskellPackages, cabal-install }:
 
 (haskellPackages.shellFor {
   packages = p: [ p.database-id-class p.constraints ];
diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix
index e9d32e4ccf6..aef5acc1de6 100644
--- a/pkgs/test/install-shell-files/default.nix
+++ b/pkgs/test/install-shell-files/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }:
+{ lib, runCommandLocal, recurseIntoAttrs, installShellFiles }:
 
 let
   runTest = name: env: buildCommand:
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix
index 00296bc54af..e6f4b5f6ff1 100644
--- a/pkgs/tools/X11/arandr/default.nix
+++ b/pkgs/tools/X11/arandr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages
+{ lib, fetchurl, python3Packages
 , gobject-introspection, gsettings-desktop-schemas, gtk3
 , wrapGAppsHook, xrandr
 }:
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index 2d6965567b7..8744c493b71 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, xorg, buildGoPackage, fetchFromGitHub }:
+{ lib, xorg, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "go-sct";
diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
index 1ebd8ccc4e4..3071ef31781 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule, fetchpatch }:
+{ lib, fetchFromGitHub, buildGoModule, fetchpatch }:
 
 buildGoModule rec {
   version = "0.6.0";
diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix
index f2864ca2eb5..cf9bbd9bb98 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub, libxslt,
+{ lib, python3Packages, fetchFromGitHub, libxslt,
   gobject-introspection, gtk3, wrapGAppsHook, gnome3 }:
 
 python3Packages.buildPythonApplication rec {
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 0c1accd36fb..0dffdf7bbf7 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText
+{ lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText
 , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
 , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
 , ffmpeg, x264, libvpx, libwebp, x265
diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix
index 0d3cd957324..8a42a011da9 100644
--- a/pkgs/tools/admin/afterburn/default.nix
+++ b/pkgs/tools/admin/afterburn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, openssl, pkg-config, fetchFromGitHub, rustPlatform }:
+{ lib, openssl, pkg-config, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "afterburn";
diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix
index 32c006d7a5f..070a9b6430c 100644
--- a/pkgs/tools/admin/aws-nuke/default.nix
+++ b/pkgs/tools/admin/aws-nuke/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 }:
diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix
index 4b26e3a7434..82b57739120 100644
--- a/pkgs/tools/admin/aws-rotate-key/default.nix
+++ b/pkgs/tools/admin/aws-rotate-key/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "aws-rotate-key";
diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix
index f71422f77a2..3e2cf150557 100644
--- a/pkgs/tools/admin/awslogs/default.nix
+++ b/pkgs/tools/admin/awslogs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "awslogs";
diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix
index ca588db01a5..8a6bb559041 100644
--- a/pkgs/tools/admin/berglas/default.nix
+++ b/pkgs/tools/admin/berglas/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "berglas";
diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix
index ff66e926d4b..422c6da82d2 100644
--- a/pkgs/tools/admin/certigo/default.nix
+++ b/pkgs/tools/admin/certigo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "certigo";
diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix
index 6404eb92a26..bbf8d7eaeb1 100644
--- a/pkgs/tools/admin/chkcrontab/default.nix
+++ b/pkgs/tools/admin/chkcrontab/default.nix
@@ -1,4 +1,4 @@
-{ python, lib, stdenv }:
+{ python, lib }:
 
 with python.pkgs;
 
diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix
index 2a1ceb531a5..55af1679d7a 100644
--- a/pkgs/tools/admin/credhub-cli/default.nix
+++ b/pkgs/tools/admin/credhub-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "credhub-cli";
diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix
index 2ca0f2c4d08..7fb128caa19 100644
--- a/pkgs/tools/admin/docker-credential-gcr/default.nix
+++ b/pkgs/tools/admin/docker-credential-gcr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "docker-credential-gcr";
diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index 3fe3856d9c5..8913bed39d5 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "exoscale-cli";
diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix
index e7481e16948..dd35da451ad 100644
--- a/pkgs/tools/admin/iamy/default.nix
+++ b/pkgs/tools/admin/iamy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "iamy";
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index aeff0d931f0..1c263a1969d 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
+{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
 , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
 , squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap
 , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev
diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix
index bf807d14997..35cf7b11e64 100644
--- a/pkgs/tools/admin/s3bro/default.nix
+++ b/pkgs/tools/admin/s3bro/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   pname = "s3bro";
diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix
index 0aeccb755a1..2a8f0d1f114 100644
--- a/pkgs/tools/admin/scaleway-cli/default.nix
+++ b/pkgs/tools/admin/scaleway-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   pname = "scaleway-cli";
diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix
index 42288bafe01..a6f511fe115 100644
--- a/pkgs/tools/admin/sewer/default.nix
+++ b/pkgs/tools/admin/sewer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "sewer";
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index fc064641943..5bfc00ac000 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, bash }:
+{ lib, python3Packages, bash }:
 
 python3Packages.buildPythonApplication rec {
   pname = "simp_le-client";
diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix
index 6c8520648ec..b6ca3135f56 100644
--- a/pkgs/tools/admin/ssh-import-id/default.nix
+++ b/pkgs/tools/admin/ssh-import-id/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, lib, stdenv
+, lib
 , fetchgit
 , requests
 , makeWrapper
diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix
index 6b0d0380901..8ed8b0b812b 100644
--- a/pkgs/tools/admin/ssmsh/default.nix
+++ b/pkgs/tools/admin/ssmsh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ssmsh";
diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix
index c410bd81e89..309bf4803fb 100644
--- a/pkgs/tools/admin/stripe-cli/default.nix
+++ b/pkgs/tools/admin/stripe-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "stripe-cli";
diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix
index a64cc5ebcad..793611699ec 100644
--- a/pkgs/tools/audio/beets/plugins/alternatives.nix
+++ b/pkgs/tools/audio/beets/plugins/alternatives.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, beets, pythonPackages }:
+{ fetchFromGitHub, beets, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "beets-alternatives";
diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix
index 545e6d7cf2c..441dcfe579f 100644
--- a/pkgs/tools/audio/beets/plugins/check.nix
+++ b/pkgs/tools/audio/beets/plugins/check.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }:
+{ lib, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }:
 
 pythonPackages.buildPythonApplication rec {
   name = "beets-check";
diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
index b339bc34ad2..5af52066caa 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }:
+{ fetchFromGitHub, beets, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication {
   name = "beets-copyartifacts";
diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix
index eedfd2f3dbb..d5f78ada91c 100644
--- a/pkgs/tools/audio/mididings/default.nix
+++ b/pkgs/tools/audio/mididings/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2  }:
+{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2  }:
 
 pythonPackages.buildPythonApplication {
   version = "2015-11-17";
diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index 801058e0496..af4000dfa44 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "mpd-mpris";
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index 30b0d90f562..4cd3921fb55 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , autoreconfHook
 , fetchFromGitHub
 , glib
diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix
index c79204cffa2..48f553d960d 100644
--- a/pkgs/tools/audio/opl3bankeditor/default.nix
+++ b/pkgs/tools/audio/opl3bankeditor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }:
 
 mkDerivation rec {
   version = "1.5.1";
diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix
index 3ce76fb61fa..4eafd7f52e1 100644
--- a/pkgs/tools/audio/video2midi/default.nix
+++ b/pkgs/tools/audio/video2midi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages, opencv3 }:
+{ lib, fetchFromGitHub, pythonPackages, opencv3 }:
 
 let
   opencv3_ = pythonPackages.toPythonModule (opencv3.override {
diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix
index 06b6079bde2..d05257f1d08 100644
--- a/pkgs/tools/audio/volctl/default.nix
+++ b/pkgs/tools/audio/volctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }:
+{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }:
 
 python3Packages.buildPythonApplication rec {
   pname = "volctl";
diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix
index 76a3d674ecb..9ed70491fb3 100644
--- a/pkgs/tools/backup/bupstash/default.nix
+++ b/pkgs/tools/backup/bupstash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
+{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
 rustPlatform.buildRustPackage rec {
   pname = "bupstash";
   version = "0.6.4";
diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index d70efa1d224..3b5d901daf0 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, lib, stdenv, openssh, makeWrapper }:
+{ buildGoPackage, fetchFromGitHub, lib, openssh, makeWrapper }:
 
 buildGoPackage rec {
   pname = "diskrsync";
diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix
index 2ef3b5f5420..2f2f01356b4 100644
--- a/pkgs/tools/backup/grab-site/default.nix
+++ b/pkgs/tools/backup/grab-site/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python37, fetchFromGitHub }:
+{ lib, python37, fetchFromGitHub }:
 let
   python = python37.override {
     self = python;
diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix
index 736dfdb557d..2a7c4ff5176 100644
--- a/pkgs/tools/backup/httrack/qt.nix
+++ b/pkgs/tools/backup/httrack/qt.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, makeWrapper
+{ mkDerivation, lib, fetchurl, cmake, pkg-config, makeWrapper
 , httrack, qtbase, qtmultimedia }:
 
 mkDerivation rec {
diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/tools/backup/iceshelf/default.nix
index eb5e883bdac..c066cb76695 100644
--- a/pkgs/tools/backup/iceshelf/default.nix
+++ b/pkgs/tools/backup/iceshelf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, git, awscli, python3 }:
+{ lib, fetchFromGitHub, git, awscli, python3 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "iceshelf";
diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix
index 5a67bea41ea..a8f88e88b0e 100644
--- a/pkgs/tools/backup/luckybackup/default.nix
+++ b/pkgs/tools/backup/luckybackup/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl
+{ mkDerivation, lib, fetchurl
 , pkg-config, libtool, qmake
 , rsync, ssh
 }:
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index f55f163dafb..0d24e3df720 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, python2Packages, librsync, gnused }:
+{lib, fetchurl, python2Packages, librsync, gnused }:
 
 python2Packages.buildPythonApplication {
   name = "rdiff-backup-1.3.3";
diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 74b90236c4e..70394afb50e 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, sqlite, which }:
+{ lib, fetchFromGitHub, python3Packages, sqlite, which }:
 
 python3Packages.buildPythonApplication rec {
   pname = "s3ql";
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix
index 99ddd62e6ae..8c37a7b72ac 100644
--- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix
+++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, stdenv, eggDerivation, fetchegg }:
+{ pkgs, lib, eggDerivation, fetchegg }:
 let
   eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
 in with pkgs; eggDerivation rec {
diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix
index 938c24f38ce..39c11cc0c91 100644
--- a/pkgs/tools/backup/ugarit/default.nix
+++ b/pkgs/tools/backup/ugarit/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, stdenv, eggDerivation, fetchegg }:
+{ pkgs, lib, eggDerivation, fetchegg }:
 let
   eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
 in with pkgs; eggDerivation rec {
diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index 0ed2bf1bf8b..8e54b58e201 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages, lzop, postgresql, pv }:
+{ lib, fetchurl, python3Packages, lzop, postgresql, pv }:
 
 python3Packages.buildPythonApplication rec {
   pname = "wal-e";
diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix
index 02e3c19f004..c167ad1fa01 100644
--- a/pkgs/tools/backup/zfs-replicate/default.nix
+++ b/pkgs/tools/backup/zfs-replicate/default.nix
@@ -1,5 +1,5 @@
 { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest
-, pytestcov, pytestrunner, lib, stdenv, stringcase
+, pytestcov, pytestrunner, lib, stringcase
 }:
 
 buildPythonApplication rec {
diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix
index 477fa337da8..c175eb45aa0 100644
--- a/pkgs/tools/cd-dvd/isolyzer/default.nix
+++ b/pkgs/tools/cd-dvd/isolyzer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python3
 , fetchFromGitHub
 }:
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 0abea9b1285..91d59a4de0f 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchurl, pythonPackages
+{ lib, fetchurl, pythonPackages
 , gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield
 , bzip2, xz, lzip
 # unzip is handled by p7zip
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index 68199a0938e..f0efaaa3231 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }:
 
 mkDerivation rec {
   pname = "android-file-transfer";
diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix
index 8f4e9941029..2f179a151d1 100644
--- a/pkgs/tools/filesystems/catcli/default.nix
+++ b/pkgs/tools/filesystems/catcli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonApplication
 , docopt, anytree
diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix
index 4c493ea2252..774568fdde1 100644
--- a/pkgs/tools/filesystems/convoy/default.nix
+++ b/pkgs/tools/filesystems/convoy/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, lvm2 }:
+{ lib, buildGoPackage, fetchFromGitHub, lvm2 }:
 
 buildGoPackage rec {
   pname = "convoy";
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index 1d1863ede96..e4a120264fd 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "gitfs";
diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix
index 318e39e8322..b8b330c129a 100644
--- a/pkgs/tools/filesystems/gocryptfs/default.nix
+++ b/pkgs/tools/filesystems/gocryptfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 , openssl
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 3a63ad9747f..80ae8ca2b3c 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonApplication, blivet }:
+{ lib, fetchurl, buildPythonApplication, blivet }:
 
 buildPythonApplication rec {
   pname = "nixpart";
diff --git a/pkgs/tools/filesystems/sandboxfs/default.nix b/pkgs/tools/filesystems/sandboxfs/default.nix
index 8777fa50a5d..32d186344dd 100644
--- a/pkgs/tools/filesystems/sandboxfs/default.nix
+++ b/pkgs/tools/filesystems/sandboxfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , rustPlatform
 , fuse
diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix
index 7129de95013..1eac3e03ec9 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/pkgs/tools/filesystems/tmsu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }:
+{ lib, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }:
 
 buildGoPackage rec {
   pname = "tmsu";
diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix
index 2787b87964f..6a6409ad325 100644
--- a/pkgs/tools/filesystems/ubidump/default.nix
+++ b/pkgs/tools/filesystems/ubidump/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }:
+{ lib, fetchFromGitHub, python3, makeWrapper }:
 
 python3.pkgs.buildPythonApplication rec {
 
diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix
index 1fe254d7785..02bb022dfb4 100644
--- a/pkgs/tools/graphics/feedgnuplot/default.nix
+++ b/pkgs/tools/graphics/feedgnuplot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, gawk
+{ lib, fetchFromGitHub, makeWrapper, gawk
 , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages
 }:
 
diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index 0ce24482164..95af281d7ea 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config }:
+{ lib, rustPlatform, fetchFromGitHub, pkg-config }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gifski";
diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix
index 4ae68207aae..341d6dea90a 100644
--- a/pkgs/tools/graphics/graph-easy/default.nix
+++ b/pkgs/tools/graphics/graph-easy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, perlPackages, fetchurl }:
+{ lib, perlPackages, fetchurl }:
 
 perlPackages.buildPerlPackage {
   pname = "Graph-Easy";
diff --git a/pkgs/tools/graphics/ldgallery/compiler/default.nix b/pkgs/tools/graphics/ldgallery/compiler/default.nix
index 000f227075e..9316e9d38e0 100644
--- a/pkgs/tools/graphics/ldgallery/compiler/default.nix
+++ b/pkgs/tools/graphics/ldgallery/compiler/default.nix
@@ -1,7 +1,7 @@
 # generated with cabal2nix by ./generate.sh
 { mkDerivation, aeson, base, cmdargs, containers, data-ordlist
 , directory, fetchgit, filepath, Glob, hpack, parallel-io, process
-, safe, lib, stdenv, text, time, yaml
+, safe, lib, text, time, yaml
 }:
 mkDerivation {
   pname = "ldgallery-compiler";
diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix
index 71d927913c3..0a1cc111b54 100644
--- a/pkgs/tools/graphics/pdfredacttools/default.nix
+++ b/pkgs/tools/graphics/pdfredacttools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }:
+{ lib, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }:
 
 python2Packages.buildPythonApplication rec {
   pname = "pdf-redact-tools";
diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/tools/graphics/puppeteer-cli/default.nix
index c01ee232fa7..20dab27ddf0 100644
--- a/pkgs/tools/graphics/puppeteer-cli/default.nix
+++ b/pkgs/tools/graphics/puppeteer-cli/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, makeWrapper, stdenv, chromium, mkYarnPackage
+{ fetchFromGitHub, makeWrapper, chromium, mkYarnPackage
 }:
 
 mkYarnPackage rec {
diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix
index ec32d6c7140..070e359fe1c 100644
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/pkgs/tools/graphics/rocket/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }:
 
 mkDerivation {
   pname = "rocket";
diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix
index 3c96584029e..79ddd39ea79 100644
--- a/pkgs/tools/graphics/shotgun/default.nix
+++ b/pkgs/tools/graphics/shotgun/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }:
+{ lib, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "shotgun";
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix
index 653e585c6ed..6c5e8569e85 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/pkgs/tools/graphics/svgcleaner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "svgcleaner";
diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/tools/inputmethods/evdevremapkeys/default.nix
index 99f7231c58a..73344ca2690 100644
--- a/pkgs/tools/inputmethods/evdevremapkeys/default.nix
+++ b/pkgs/tools/inputmethods/evdevremapkeys/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   pname = "evdevremapkeys";
diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix
index 01f312fa63d..66f264bc7a3 100644
--- a/pkgs/tools/inputmethods/evscript/default.nix
+++ b/pkgs/tools/inputmethods/evscript/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "evscript";
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index 923fd7c7a74..6d3952c9c22 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchurl
 , fetchFromGitHub
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index ba006873c40..b133d576c6c 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchFromGitHub
 , cmake
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index 155f10fae26..bfb06a98e8f 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , mkDerivation
 , fetchFromGitHub
 , cmake
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index 74426b2b04e..93078325a0d 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, runCommand, makeWrapper, lndir
+{ lib, runCommand, makeWrapper, lndir
 , dconf, hicolor-icon-theme, ibus, librsvg, plugins ? []
 }:
 
diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix
index 3f1e981fd0e..3c51210edc7 100644
--- a/pkgs/tools/misc/3mux/default.nix
+++ b/pkgs/tools/misc/3mux/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "3mux";
diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix
index f5149737639..c9466f54a62 100644
--- a/pkgs/tools/misc/adafruit-ampy/default.nix
+++ b/pkgs/tools/misc/adafruit-ampy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3 }:
+{ lib, python3 }:
 
 with python3.pkgs;
 
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index 5c17b7f2d13..9c952cc7c30 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   version = "1.8.1";
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 369f7dd219f..7f82aebabe4 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }:
+{ lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }:
 
 let
 
diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix
index 25bac976843..f6991662114 100644
--- a/pkgs/tools/misc/asciinema-scenario/default.nix
+++ b/pkgs/tools/misc/asciinema-scenario/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchCrate
 }:
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix
index f8a17790ba1..ad48eae7a87 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.
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "azure-vhd-utils";
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix
index cc3476f598b..44d7e93355b 100644
--- a/pkgs/tools/misc/bashplotlib/default.nix
+++ b/pkgs/tools/misc/bashplotlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication {
   pname = "bashplotlib";
diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix
index ed42f31f26b..79094dc9540 100644
--- a/pkgs/tools/misc/bmap-tools/default.nix
+++ b/pkgs/tools/misc/bmap-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2Packages }:
+{ lib, fetchFromGitHub, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   pname = "bmap-tools";
diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix
index cda58e80d87..a3f1608c3ad 100644
--- a/pkgs/tools/misc/bonfire/default.nix
+++ b/pkgs/tools/misc/bonfire/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 with python3Packages;
 
diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix
index 53925b87591..cb5f582d2de 100644
--- a/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/pkgs/tools/misc/broadlink-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication {
   pname = "broadlink-cli";
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 15a2a643d32..48d8b7c8930 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "chezmoi";
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index 6c13c3bbe6a..9c6909d445d 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev
+{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev
 , pkg-config, qtbase, cmake, zlib, kmod }:
 
 mkDerivation rec {
diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix
index 20c8cc7af8f..c28272e8bfa 100644
--- a/pkgs/tools/misc/claws/default.nix
+++ b/pkgs/tools/misc/claws/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "claws";
diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
index 11bfdc508eb..552ea140d60 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "cloud-sql-proxy";
diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix
index 0ccfe424645..4808fe3ef56 100644
--- a/pkgs/tools/misc/code-minimap/default.nix
+++ b/pkgs/tools/misc/code-minimap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchFromGitHub
 }:
diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix
index a855dac5f12..0ecde80c238 100644
--- a/pkgs/tools/misc/codebraid/default.nix
+++ b/pkgs/tools/misc/codebraid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
   pname = "codebraid";
diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index a4b499a6323..6527a01e43b 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, help2man, installShellFiles }:
+{ lib, fetchFromGitHub, python3Packages, help2man, installShellFiles }:
 
 python3Packages.buildPythonApplication rec {
   pname = "crudini";
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index 546daef5ecb..496639ec07a 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "dashing";
diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix
index 6c295eb00e8..0fb31685170 100644
--- a/pkgs/tools/misc/diskonaut/default.nix
+++ b/pkgs/tools/misc/diskonaut/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "diskonaut";
diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix
index df9755f863d..b8483068117 100644
--- a/pkgs/tools/misc/docker-ls/default.nix
+++ b/pkgs/tools/misc/docker-ls/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib, stdenv, docker }:
+{ buildGoModule, fetchFromGitHub, lib, docker }:
 
 buildGoModule rec {
   pname = "docker-ls";
diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
index e4934853e82..a1b2ad662bc 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/pkgs/tools/misc/docui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "docui";
diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix
index 313dc9935fa..9edc078d9f9 100644
--- a/pkgs/tools/misc/doitlive/default.nix
+++ b/pkgs/tools/misc/doitlive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "doitlive";
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index c40753dcf99..7997f2119a2 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "du-dust";
diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix
index 7ec763f16c6..eafc71030ac 100644
--- a/pkgs/tools/misc/envdir-go/default.nix
+++ b/pkgs/tools/misc/envdir-go/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   version = "1.0.0";
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index 89be1da8cc9..7c7f91621b8 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, openssl }:
+{ lib, fetchFromGitHub, python3, openssl }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "esptool";
diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix
index 65da084f841..253e815008a 100644
--- a/pkgs/tools/misc/eva/default.nix
+++ b/pkgs/tools/misc/eva/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, fetchpatch }:
+{ lib, fetchFromGitHub, rustPlatform, fetchpatch }:
 
 rustPlatform.buildRustPackage rec {
   pname = "eva";
diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index 1076c44a1bb..7416961e84e 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles }:
+{ lib, fetchFromGitHub, rustPlatform, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "fselect";
diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix
index 8e113ee871a..100e7023232 100644
--- a/pkgs/tools/misc/fsql/default.nix
+++ b/pkgs/tools/misc/fsql/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "fsql";
diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix
index 9cb05609772..7fbfadfac76 100644
--- a/pkgs/tools/misc/g933-utils/default.nix
+++ b/pkgs/tools/misc/g933-utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkg-config }:
+{ lib, fetchFromGitHub, rustPlatform, udev, pkg-config }:
 
 rustPlatform.buildRustPackage rec {
   pname = "g933-utils";
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index d518ba88fb6..5c7953a766e 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 with builtins;
 
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index 6096dac9622..dd28ddfaff5 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gh-ost";
diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix
index e82cafdd64c..bbb1b8b9640 100644
--- a/pkgs/tools/misc/gif-for-cli/default.nix
+++ b/pkgs/tools/misc/gif-for-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }:
+{ lib, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }:
 
 python3Packages.buildPythonApplication {
   pname = "gif-for-cli";
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index cf3a6aba19f..56f9452db7b 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "git-town";
diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix
index 26b082e43b3..295bf010279 100644
--- a/pkgs/tools/misc/go.rice/default.nix
+++ b/pkgs/tools/misc/go.rice/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "go.rice";
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
index 7bc7eab3456..033883ab1c8 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "gosu";
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 3188dcdafbf..8fe35012090 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "grc";
diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/tools/misc/hacksaw/default.nix
index a0e884e82d9..419cff20087 100644
--- a/pkgs/tools/misc/hacksaw/default.nix
+++ b/pkgs/tools/misc/hacksaw/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }:
+{ lib, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "hacksaw";
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index 13933c6c28a..9d50530df47 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils }:
+{ lib, fetchFromGitHub, rustPlatform, coreutils }:
 
 rustPlatform.buildRustPackage rec {
   pname = "heatseeker";
diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix
index e75d0105731..d825368cb97 100644
--- a/pkgs/tools/misc/hexyl/default.nix
+++ b/pkgs/tools/misc/hexyl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname   = "hexyl";
diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix
index 13a88dcba30..9f7fa31d3f2 100644
--- a/pkgs/tools/misc/hyperledger-fabric/default.nix
+++ b/pkgs/tools/misc/hyperledger-fabric/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "hyperledger-fabric";
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index d75b878ae6d..e91b17856ed 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "i3cat";
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index d58efd7a0d4..6e207ce6916 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages, glibcLocales }:
+{ lib, fetchFromGitHub, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "i3minator";
diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
index 58afffcd706..78f40974ace 100644
--- a/pkgs/tools/misc/ical2org/default.nix
+++ b/pkgs/tools/misc/ical2org/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage}:
+{ lib, fetchFromGitHub, buildGoPackage}:
 
 buildGoPackage rec {
   pname = "ical2org";
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 00bf9403427..8c24848f4b5 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages }:
+{ lib, fetchurl, python3Packages }:
 
 with python3Packages;
 
diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix
index 8d70b35584e..e4713890ac4 100644
--- a/pkgs/tools/misc/kt/default.nix
+++ b/pkgs/tools/misc/kt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   pname = "kt";
diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index ea66a04a40d..ed186772ab7 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "lazydocker";
diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix
index f7a8c68ed06..3322196d6ed 100644
--- a/pkgs/tools/misc/lice/default.nix
+++ b/pkgs/tools/misc/lice/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
 
diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix
index 377ba05eba6..8f41499ca06 100644
--- a/pkgs/tools/misc/lnch/default.nix
+++ b/pkgs/tools/misc/lnch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   pname = "lnch";
diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix
index 1b2fa9bda86..0cbf43a8790 100644
--- a/pkgs/tools/misc/lokalise2-cli/default.nix
+++ b/pkgs/tools/misc/lokalise2-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "lokalise2-cli";
diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index b7bd7678535..0c3e206a9f2 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage {
   pname = "loop";
diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix
index 239c9651b86..c3c9fab8c1e 100644
--- a/pkgs/tools/misc/lsd/default.nix
+++ b/pkgs/tools/misc/lsd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , nixosTests
 , fetchFromGitHub
 , rustPlatform
diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix
index 19f43f2c8c5..5335624467d 100644
--- a/pkgs/tools/misc/me_cleaner/default.nix
+++ b/pkgs/tools/misc/me_cleaner/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "me_cleaner";
diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix
index a0ac411f98e..131367cf9f2 100644
--- a/pkgs/tools/misc/microplane/default.nix
+++ b/pkgs/tools/misc/microplane/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "microplane";
diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
index 6c332198fa7..f2ef73cfd99 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, desktop-file-utils, file, python3Packages }:
+{ lib, fetchurl, desktop-file-utils, file, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "mimeo";
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix
index 5dcbcb065ec..564e1989aee 100644
--- a/pkgs/tools/misc/mmake/default.nix
+++ b/pkgs/tools/misc/mmake/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "mmake";
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index 0415955e092..7949a82edc4 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildGoPackage
 , fetchFromGitHub
 , openssl
diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix
index 3bd297628b2..e9f76dbf22d 100644
--- a/pkgs/tools/misc/nagstamon/default.nix
+++ b/pkgs/tools/misc/nagstamon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages }:
+{ lib, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "nagstamon";
diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix
index 2d6f23de468..67c49c3ad0d 100644
--- a/pkgs/tools/misc/noteshrink/default.nix
+++ b/pkgs/tools/misc/noteshrink/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, imagemagick }:
+{ lib, fetchFromGitHub, python3, imagemagick }:
 
 with python3.pkgs;
 
diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix
index 9f28d99ba0f..23d4fd57f62 100644
--- a/pkgs/tools/misc/ntfy/default.nix
+++ b/pkgs/tools/misc/ntfy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
   pname = "ntfy";
diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix
index b339f94deb1..916f15c94c6 100644
--- a/pkgs/tools/misc/pdd/default.nix
+++ b/pkgs/tools/misc/pdd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonApplication, dateutil }:
+{ lib, fetchFromGitHub, buildPythonApplication, dateutil }:
 
 buildPythonApplication rec {
   pname = "pdd";
diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix
index ceb8b4d68d9..f4572d0e5bc 100644
--- a/pkgs/tools/misc/pdf-parser/default.nix
+++ b/pkgs/tools/misc/pdf-parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchzip }:
+{ lib, python3Packages, fetchzip }:
 
 python3Packages.buildPythonApplication {
   pname = "pdf-parser";
diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix
index 5a59e3030e6..8afaa61e35b 100644
--- a/pkgs/tools/misc/pgcenter/default.nix
+++ b/pkgs/tools/misc/pgcenter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "pgcenter";
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index 70429ef811a..54e7093747b 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "pgmetrics";
diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
index 27c486f4bea..12b11cf20d0 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "phraseapp-client";
diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix
index 874bbdbaf70..6eec45db011 100644
--- a/pkgs/tools/misc/pistol/default.nix
+++ b/pkgs/tools/misc/pistol/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 , file
diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index 2b46e25c67e..f69a5c7d380 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "powerline-go";
diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix
index 82e7659d152..be5fd6d499c 100644
--- a/pkgs/tools/misc/pubs/default.nix
+++ b/pkgs/tools/misc/pubs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages }:
+{ lib, fetchFromGitHub, fetchpatch, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "pubs";
diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix
index 834a62803f6..dc07e3dd4f4 100644
--- a/pkgs/tools/misc/rargs/default.nix
+++ b/pkgs/tools/misc/rargs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname   = "rargs";
diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix
index 63ceca8d934..a9f42d1139e 100644
--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, perlPackages }:
+{ lib, fetchFromGitHub, perlPackages }:
 
 perlPackages.buildPerlPackage {
   pname = "rename";
diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix
index 41e4207d6c9..18c5aea3dfd 100644
--- a/pkgs/tools/misc/shelldap/default.nix
+++ b/pkgs/tools/misc/shelldap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages }:
+{ lib, fetchurl, perlPackages }:
 perlPackages.buildPerlPackage rec {
   pname = "shelldap";
   version = "1.4.0";
diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix
index c24b12f9539..4bc5c28b559 100644
--- a/pkgs/tools/misc/swaglyrics/default.nix
+++ b/pkgs/tools/misc/swaglyrics/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python3, fetchFromGitHub, ncurses }:
+{ lib, python3, fetchFromGitHub, ncurses }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "swaglyrics";
diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix
index e898ded8154..03d8e58f8b0 100644
--- a/pkgs/tools/misc/systrayhelper/default.nix
+++ b/pkgs/tools/misc/systrayhelper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }:
+{ lib, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "systrayhelper";
diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix
index 43a91eaca52..ba63ec290d4 100644
--- a/pkgs/tools/misc/tagref/default.nix
+++ b/pkgs/tools/misc/tagref/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 rustPlatform.buildRustPackage rec {
   pname = "tagref";
   version = "1.4.1";
diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix
index 84bfdc55d7f..0e724059e99 100644
--- a/pkgs/tools/misc/tensorman/default.nix
+++ b/pkgs/tools/misc/tensorman/default.nix
@@ -1,4 +1,4 @@
-{ pkg-config, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }:
+{ pkg-config, lib, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tensorman";
diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix
index 0e07f3e53f3..3434ac110b3 100644
--- a/pkgs/tools/misc/tewisay/default.nix
+++ b/pkgs/tools/misc/tewisay/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
+{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }:
 
 buildGoPackage rec {
   pname = "tewisay-unstable";
diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix
index bf87505ab13..d26c750a0c7 100644
--- a/pkgs/tools/misc/thefuck/default.nix
+++ b/pkgs/tools/misc/thefuck/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonApplication
+{ lib, fetchFromGitHub, buildPythonApplication
 , colorama, decorator, psutil, pyte, six
 , pytest, pytest-mock
 }:
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 940ae130c84..57d320fd790 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python }:
+{ lib, python }:
 
 with python.pkgs;
 
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix
index c4d8b20ffdd..812ad7900d0 100644
--- a/pkgs/tools/misc/togglesg-download/default.nix
+++ b/pkgs/tools/misc/togglesg-download/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }:
+{ lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }:
 
 pythonPackages.buildPythonApplication {
 
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 1da49a153b8..d199fd7fda3 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "trash-cli";
diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix
index 07b4d834978..8a96248e718 100644
--- a/pkgs/tools/misc/trillian/default.nix
+++ b/pkgs/tools/misc/trillian/default.nix
@@ -1,15 +1,11 @@
-{ stdenv
-, lib
+{ lib
 , buildGoModule
 , fetchFromGitHub
 }:
-let
+
+buildGoModule rec {
   pname = "trillian";
   version = "1.3.11";
-
-in
-buildGoModule {
-  inherit pname version;
   vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l";
 
   src = fetchFromGitHub {
@@ -34,10 +30,10 @@ buildGoModule {
     "cmd/updatetree"
   ];
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/google/trillian";
     description = "A transparent, highly scalable and cryptographically verifiable data store.";
-    license = [ lib.licenses.asl20 ];
-    maintainers = [ lib.maintainers.adisbladis ];
+    license = [ licenses.asl20 ];
+    maintainers = [ maintainers.adisbladis ];
   };
 }
diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/tools/misc/tydra/default.nix
index 6714ee489f5..00c8aa2a2c3 100644
--- a/pkgs/tools/misc/tydra/default.nix
+++ b/pkgs/tools/misc/tydra/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }:
+{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tydra";
diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix
index c8e1a0f7ca4..a2bc615ed86 100644
--- a/pkgs/tools/misc/unicode/default.nix
+++ b/pkgs/tools/misc/unicode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }:
+{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }:
 
 python3Packages.buildPythonApplication rec {
   pname = "unicode";
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index ddc0fa42c69..79460f3a5b7 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
 #
diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix
index c1b1fce7abd..18adf99b9c9 100644
--- a/pkgs/tools/misc/vimwiki-markdown/default.nix
+++ b/pkgs/tools/misc/vimwiki-markdown/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonApplication
 , fetchPypi
 , markdown
diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix
index dad352cc657..e131d8bd4e7 100644
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/pkgs/tools/misc/vivid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "vivid";
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
index e6d36155732..18699e5911d 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/pkgs/tools/misc/void/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "void";
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 75f46106209..e8bd12d567b 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }:
+{ lib, python3Packages, fetchFromGitHub, glibcLocales }:
 
 with python3Packages;
 buildPythonApplication rec {
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix
index 8d4998a9ff9..b898aa2fc24 100644
--- a/pkgs/tools/misc/xdxf2slob/default.nix
+++ b/pkgs/tools/misc/xdxf2slob/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication {
   name = "xdxf2slob-unstable-2015-06-30";
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
index 378337f6232..16379820653 100644
--- a/pkgs/tools/misc/xflux/gui.nix
+++ b/pkgs/tools/misc/xflux/gui.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook
+{ lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook
 , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk
 , pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3
 }:
diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix
index b8dd369cd6a..acd4a9e1d46 100644
--- a/pkgs/tools/misc/xmonad-log/default.nix
+++ b/pkgs/tools/misc/xmonad-log/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "xmonad-log";
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 64568ca46b0..9ee81cd1b15 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }:
+{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "yle-dl";
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 54443083996..f58fb349c95 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi }:
+{ lib, buildPythonApplication, fetchPypi }:
 
 buildPythonApplication rec {
   pname = "you-get";
diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix
index eeb4f5c1bd5..3991b99fcdc 100644
--- a/pkgs/tools/misc/yubikey-neo-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python27Packages
+{ lib, fetchurl, python27Packages
 , libykneomgr, yubikey-personalization, libu2f-host }:
 
 python27Packages.buildPythonPackage rec {
diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index 6934791da8e..af6843e3820 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick
+{ lib, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick
 , libyubikey, yubikey-personalization }:
 
 mkDerivation rec {
diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix
index 15add8ed191..81d81b6794e 100644
--- a/pkgs/tools/misc/zabbixctl/default.nix
+++ b/pkgs/tools/misc/zabbixctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "zabbixctl";
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 13018d183ca..3995fc295d1 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, openssh, makeWrapper }:
+{ lib, buildGoModule, fetchFromGitHub, openssh, makeWrapper }:
 
 buildGoModule rec {
   pname = "assh";
diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix
index f84176495aa..b6f7cb1869a 100644
--- a/pkgs/tools/networking/brook/default.nix
+++ b/pkgs/tools/networking/brook/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "brook";
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix
index 5188954b763..157720651f4 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/pkgs/tools/networking/bukubrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, sqlite }: let
+{ lib, rustPlatform, fetchFromGitHub, sqlite }: let
 
 manifest = {
   description = "Bukubrow extension host application";
diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix
index 891eb19c835..f24c0e629cb 100644
--- a/pkgs/tools/networking/circus/default.nix
+++ b/pkgs/tools/networking/circus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3 }:
+{ lib, python3 }:
 
 let
   python = python3.override {
diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 590fcf1dbaf..543c86db307 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "clash";
diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix
index 9f0c9873e2a..cbf50091303 100644
--- a/pkgs/tools/networking/connman/connman-notify/default.nix
+++ b/pkgs/tools/networking/connman/connman-notify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
+{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
 
 python3Packages.buildPythonApplication {
   pname = "connman-notify";
diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index 64e8e09467d..a7e5026d83a 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "corerad";
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 92493ab109f..4a4578a7356 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, callPackage}:
+{ lib, buildGoModule, fetchFromGitHub, callPackage}:
 
 buildGoModule rec {
   pname = "croc";
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
index 84b5c1861cd..ab4c3292ea5 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, lib, stdenv, fetchFromGitHub }:
+{ buildGoPackage, lib, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "curl-unix-socket-2015-04-10";
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index d980d570226..ad37245d57c 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
+{ lib, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
 
 let
   # keep this in sync with github.com/DataDog/agent-payload dependency
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
index a77030bba93..e2c497dad40 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage  }:
+{ lib, fetchFromGitHub, buildGoPackage  }:
 
 buildGoPackage rec {
   pname = "datadog-process-agent";
diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index 3b52c2be252..51454ac1197 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages, iproute, perl }:
+{ lib, fetchurl, perlPackages, iproute, perl }:
 
 perlPackages.buildPerlPackage rec {
   pname = "ddclient";
diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix
index 3526562e11c..8aedb403260 100644
--- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dnscrypt-proxy2";
diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index a04244642ba..718606fdfa6 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "dnsproxy";
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 3ed250ca4bc..1d7bf884edd 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, lib, stdenv, fetchurl }:
+{ buildGoPackage, lib, fetchurl }:
 
 buildGoPackage rec {
   name = "filegive-0.7.4";
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index d994d9d8cec..4e20cbe7441 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2Packages }:
+{ lib, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   pname = "getmail";
diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix
index 78117a700bd..10c5c8ea64f 100644
--- a/pkgs/tools/networking/goklp/default.nix
+++ b/pkgs/tools/networking/goklp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "goklp";
diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix
index 564c45d2e14..14d0a16366b 100644
--- a/pkgs/tools/networking/goreplay/default.nix
+++ b/pkgs/tools/networking/goreplay/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, libpcap }:
+{ lib, buildGoPackage, fetchFromGitHub, libpcap }:
 
 buildGoPackage rec {
   pname = "goreplay";
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index 59a3bffdc6d..3732fbd879f 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, httpie }:
+{ lib, fetchFromGitHub, python3Packages, httpie }:
 
 python3Packages.buildPythonApplication rec {
   pname = "http-prompt";
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index 66513819ab8..c5e12317fd7 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }:
+{ lib, fetchFromGitHub, python3Packages, docutils, fetchpatch }:
 
 python3Packages.buildPythonApplication rec {
   pname = "httpie";
diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix
index 22dc500fd4c..40851d370c7 100644
--- a/pkgs/tools/networking/httplab/default.nix
+++ b/pkgs/tools/networking/httplab/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "httplab";
diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix
index a8b9630aab2..27c2a145a65 100644
--- a/pkgs/tools/networking/httpstat/default.nix
+++ b/pkgs/tools/networking/httpstat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
+{ lib, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "httpstat";
diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/tools/networking/ipgrep/default.nix
index dd85a5dcb61..d1f5316c27b 100644
--- a/pkgs/tools/networking/ipgrep/default.nix
+++ b/pkgs/tools/networking/ipgrep/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   version = "1.0.1";
diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix
index 2ddcd6c7d4b..ae431b329ea 100644
--- a/pkgs/tools/networking/kail/default.nix
+++ b/pkgs/tools/networking/kail/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "kail";
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 3145f85186b..9d667d0ee1d 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "minio-client";
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 698046358e3..0de96169769 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2Packages,
+{ lib, fetchFromGitHub, python2Packages,
   asciidoc, cacert, libxml2, libxslt, docbook_xsl }:
 
 python2Packages.buildPythonApplication rec {
diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix
index 2ebec34b219..5e4f0542d36 100644
--- a/pkgs/tools/networking/persepolis/default.nix
+++ b/pkgs/tools/networking/persepolis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonApplication, fetchFromGitHub, makeWrapper
+{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper
 , aria
 , libnotify
 , pulseaudio
diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix
index 55dedc09bea..d3f153e44ae 100644
--- a/pkgs/tools/networking/photon/default.nix
+++ b/pkgs/tools/networking/photon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
   pname = "photon";
diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix
index 76b77da1764..dc9133229af 100644
--- a/pkgs/tools/networking/pirate-get/default.nix
+++ b/pkgs/tools/networking/pirate-get/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 with python3Packages;
 
diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix
index ec275c5e6a8..6155d411e13 100644
--- a/pkgs/tools/networking/pixiecore/default.nix
+++ b/pkgs/tools/networking/pixiecore/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "pixiecore";
diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix
index 68cb8fed57a..69e5d0427e5 100644
--- a/pkgs/tools/networking/polysh/default.nix
+++ b/pkgs/tools/networking/polysh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2Packages }:
+{ lib, fetchurl, python2Packages }:
 
 let
   inherit (python2Packages) buildPythonApplication;
diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix
index 7f45d53d41d..6a0bfcc6ee2 100644
--- a/pkgs/tools/networking/proxify/default.nix
+++ b/pkgs/tools/networking/proxify/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix
index b2b08cea844..a17701644c8 100644
--- a/pkgs/tools/networking/pssh/default.nix
+++ b/pkgs/tools/networking/pssh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }:
+{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "pssh";
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index f856f591bf4..0d001e7aeef 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, runtimeShell, fetchFromGitHub, python3, writeText, writeScript
+{ lib, runtimeShell, fetchFromGitHub, python3, writeText, writeScript
 , coreutils, sqlite }:
 
 with python3.pkgs;
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index 06f51b0c506..15f6ff3dfa0 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }:
+{ lib, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }:
 
 buildPythonApplication rec {
   pname = "s3cmd";
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index 390b35b0297..4623b68ad4c 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "s3gof3r";
diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix
index 80874649072..95dc02cb5cd 100644
--- a/pkgs/tools/networking/s4cmd/default.nix
+++ b/pkgs/tools/networking/s4cmd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "s4cmd";
diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix
index c7507925f5f..e6b1c823eb8 100644
--- a/pkgs/tools/networking/shadowfox/default.nix
+++ b/pkgs/tools/networking/shadowfox/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "shadowfox";
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index 4474cba6aee..2844cc2dac0 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "subfinder";
diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix
index 0ed7922874d..9d786d60b12 100644
--- a/pkgs/tools/networking/tdns-cli/default.nix
+++ b/pkgs/tools/networking/tdns-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   name = "tdns-cli";
diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix
index bd280e75379..36269327e81 100644
--- a/pkgs/tools/networking/tendermint/default.nix
+++ b/pkgs/tools/networking/tendermint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "tendermint";
diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix
index f4e790fea36..65ba8d17bcb 100644
--- a/pkgs/tools/networking/termshark/default.nix
+++ b/pkgs/tools/networking/termshark/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }:
+{ lib, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }:
 
 buildGoModule rec {
   pname = "termshark";
diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix
index 85fcea008de..3ef125382b6 100644
--- a/pkgs/tools/networking/tox-node/default.nix
+++ b/pkgs/tools/networking/tox-node/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub
+{ lib, rustPlatform, fetchFromGitHub
 , libsodium, openssl
 , pkg-config
 }:
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index 69bc3fc409b..feb17b283de 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit
+{ lib, buildGoPackage, fetchgit
 , pkg-config
 , glib, libxml2
 }:
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 10bbc963a28..1cea3989ed2 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "urlwatch";
diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix
index 7efe7018d31..8364cd5763d 100644
--- a/pkgs/tools/networking/waitron/default.nix
+++ b/pkgs/tools/networking/waitron/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "waitron-unstable-${version}";
diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix
index 3b1c3f14ac5..054b77f8c9b 100644
--- a/pkgs/tools/networking/wifite2/default.nix
+++ b/pkgs/tools/networking/wifite2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, python3, wirelesstools
+{ lib, fetchFromGitHub, fetchpatch, python3, wirelesstools
 , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools
 , hcxdumptool, pyrit, which }:
 
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 100de62683d..35c5371113c 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchzip }:
+{ lib, buildGoPackage, fetchzip }:
 
 buildGoPackage rec {
   pname = "wireguard-go";
diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix
index 6476d4f43b1..48f842f60ce 100644
--- a/pkgs/tools/networking/wormhole-william/default.nix
+++ b/pkgs/tools/networking/wormhole-william/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "wormhole-william";
diff --git a/pkgs/tools/networking/wstunnel/default.nix b/pkgs/tools/networking/wstunnel/default.nix
index 161b08a7d39..a851dcd4ead 100644
--- a/pkgs/tools/networking/wstunnel/default.nix
+++ b/pkgs/tools/networking/wstunnel/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, async, base, base64-bytestring, binary, bytestring
 , classy-prelude, cmdargs, connection, hslogger, mtl, network
-, network-conduit-tls, stdenv, streaming-commons, text
+, network-conduit-tls, streaming-commons, text
 , unordered-containers, websockets
 , hspec, iproute
 , lib, fetchFromGitHub, fetchpatch
diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
index 73db27f1a94..156841be334 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "wuzz";
diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix
index 7f946718588..75a89b859fe 100644
--- a/pkgs/tools/networking/yrd/default.nix
+++ b/pkgs/tools/networking/yrd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 let
   pname = "yrd";
diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix
index b495a302618..853bf87346f 100644
--- a/pkgs/tools/nix/cached-nix-shell/default.nix
+++ b/pkgs/tools/nix/cached-nix-shell/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, openssl, pkg-config, ronn, rustPlatform }:
+{ lib, fetchFromGitHub, openssl, pkg-config, ronn, rustPlatform }:
 
 let
   blake3-src = fetchFromGitHub {
diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix
index 4b0239a2fa2..146165d880d 100644
--- a/pkgs/tools/nix/nar-serve/default.nix
+++ b/pkgs/tools/nix/nar-serve/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule
 , fetchFromGitHub
 , lib
-, stdenv
+
 }:
 let
   pname = "nar-serve";
diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix
index 38e2b060c0c..b177b9a233a 100644
--- a/pkgs/tools/nix/nix-output-monitor/default.nix
+++ b/pkgs/tools/nix/nix-output-monitor/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, ansi-terminal, async, attoparsec, base, containers
-, directory, HUnit, mtl, nix-derivation, process, relude, lib, stdenv
+, directory, HUnit, mtl, nix-derivation, process, relude, lib
 , stm, text, time, unix, fetchFromGitHub
 }:
 mkDerivation {
diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/tools/nix/nix-query-tree-viewer/default.nix
index f820f36e49f..353aafa2a7e 100644
--- a/pkgs/tools/nix/nix-query-tree-viewer/default.nix
+++ b/pkgs/tools/nix/nix-query-tree-viewer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }:
+{ lib, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }:
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-query-tree-viewer";
diff --git a/pkgs/tools/package-management/cargo-kcov/default.nix b/pkgs/tools/package-management/cargo-kcov/default.nix
index 6b825919b60..8b2dbe3e489 100644
--- a/pkgs/tools/package-management/cargo-kcov/default.nix
+++ b/pkgs/tools/package-management/cargo-kcov/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , rustPlatform
 , fetchFromGitHub
 }:
diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
index 920b23f36ab..60fbdd4941f 100644
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gx";
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
index dd14976e633..ad4435c9e2d 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ lib, stdenv, buildGoPackage, fetchFromGitHub
+{ lib, buildGoPackage, fetchFromGitHub
 , gx
 }:
 
diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix
index 2390c33ca03..dd5c36019f2 100644
--- a/pkgs/tools/package-management/mynewt-newt/default.nix
+++ b/pkgs/tools/package-management/mynewt-newt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
 
 buildGoModule rec {
   pname = "mynewt-newt";
diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix
index 66691d9f5c5..695cd2976d8 100644
--- a/pkgs/tools/package-management/nix-doc/default.nix
+++ b/pkgs/tools/package-management/nix-doc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }:
+{ lib, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }:
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-doc";
diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix
index 47734f73fd6..91f9a39514b 100644
--- a/pkgs/tools/package-management/nix-simple-deploy/default.nix
+++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-simple-deploy";
diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index b1a86f3137e..d3fcac6277f 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -1,9 +1,8 @@
-{ stdenv
+{ lib
 , python3
 , fetchFromGitHub
 , nixFlakes
 , git
-, lib
 }:
 
 python3.pkgs.buildPythonApplication rec {
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
index 3cce599c052..b6ffe9abc02 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication {
   name = "python2nix-20140927";
diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix
index c8518ef0a9f..b06454e736c 100644
--- a/pkgs/tools/security/2fa/default.nix
+++ b/pkgs/tools/security/2fa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   version = "1.2.0";
diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix
index 851eed43ade..e0499681848 100644
--- a/pkgs/tools/security/aws-iam-authenticator/default.nix
+++ b/pkgs/tools/security/aws-iam-authenticator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "aws-iam-authenticator";
diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix
index 73d95f52b8c..08508dd157a 100644
--- a/pkgs/tools/security/aws-okta/default.nix
+++ b/pkgs/tools/security/aws-okta/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, stdenv, libiconv }:
+{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, libiconv }:
 
 buildGoPackage rec {
   pname = "aws-okta";
diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix
index 47848b25b43..e2318c853f1 100644
--- a/pkgs/tools/security/certmgr/default.nix
+++ b/pkgs/tools/security/certmgr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 let
   generic = { patches ? [] }:
diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix
index f0c756f54f9..ff6522f1d35 100644
--- a/pkgs/tools/security/certstrap/default.nix
+++ b/pkgs/tools/security/certstrap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "certstrap";
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 835c5daa72c..e92fe7b951f 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, go-rice }:
+{ lib, buildGoModule, fetchFromGitHub, go-rice }:
 
 buildGoModule rec {
   pname = "cfssl";
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index 4966c6412ab..5c2e6b4de15 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }:
+{ lib, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }:
 
 mkDerivation rec {
   pname = "chrome-token-signing";
diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/tools/security/cloudbrute/default.nix
index 06f0dd413a5..84a59ec495f 100644
--- a/pkgs/tools/security/cloudbrute/default.nix
+++ b/pkgs/tools/security/cloudbrute/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix
index 7a936408433..e9e5685acf4 100644
--- a/pkgs/tools/security/creddump/default.nix
+++ b/pkgs/tools/security/creddump/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, python2, python2Packages }:
+{ lib, fetchFromGitLab, python2, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   pname = "creddump";
diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/tools/security/crlfuzz/default.nix
index feddd893cec..88bd45bb5e1 100644
--- a/pkgs/tools/security/crlfuzz/default.nix
+++ b/pkgs/tools/security/crlfuzz/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/tools/security/crowbar/default.nix
index 2f197421e1f..e58f77457de 100644
--- a/pkgs/tools/security/crowbar/default.nix
+++ b/pkgs/tools/security/crowbar/default.nix
@@ -3,7 +3,7 @@
 , nmap
 , openvpn
 , python3Packages
-, lib, stdenv
+, lib
 , tigervnc
 }:
 
diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix
index 855549bb0c8..e351eb7a79d 100644
--- a/pkgs/tools/security/deepsea/default.nix
+++ b/pkgs/tools/security/deepsea/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix
index 65b18c5c822..5eda4e75f94 100644
--- a/pkgs/tools/security/dnsrecon/default.nix
+++ b/pkgs/tools/security/dnsrecon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3 }:
+{ lib, fetchFromGitHub, python3 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "dnsrecon";
diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix
index 1a82467201d..35f033cb983 100644
--- a/pkgs/tools/security/dnsx/default.nix
+++ b/pkgs/tools/security/dnsx/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix
index 084601a4122..46995e28441 100644
--- a/pkgs/tools/security/ffuf/default.nix
+++ b/pkgs/tools/security/ffuf/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix
index e0dcdadb7b0..f8c5b4a9f12 100644
--- a/pkgs/tools/security/fido2luks/default.nix
+++ b/pkgs/tools/security/fido2luks/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , rustPlatform
 , fetchFromGitHub
 , cryptsetup
diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix
index 3d6472cbb44..797a2db211b 100644
--- a/pkgs/tools/security/fierce/default.nix
+++ b/pkgs/tools/security/fierce/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3 }:
+{ lib, fetchFromGitHub, python3 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fierce";
diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix
index 98045a107e5..46498e49cff 100644
--- a/pkgs/tools/security/gau/default.nix
+++ b/pkgs/tools/security/gau/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix
index db0e88a805b..a94be8295ea 100644
--- a/pkgs/tools/security/gnome-keysign/default.nix
+++ b/pkgs/tools/security/gnome-keysign/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitLab
 , fetchpatch
 , python3
diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/tools/security/gospider/default.nix
index f32ecdc94e6..f4b750d394a 100644
--- a/pkgs/tools/security/gospider/default.nix
+++ b/pkgs/tools/security/gospider/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix
index 49530213985..ac896c4d55b 100644
--- a/pkgs/tools/security/grype/default.nix
+++ b/pkgs/tools/security/grype/default.nix
@@ -1,7 +1,7 @@
 { buildGoModule
 , docker
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index 6ec4d7776e1..9c1c896d889 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "hologram-2018-03-19";
diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix
index 7135baab375..bff9e03bc6f 100644
--- a/pkgs/tools/security/httpx/default.nix
+++ b/pkgs/tools/security/httpx/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix
index 6916d6b99bd..67abb57394c 100644
--- a/pkgs/tools/security/keybase/kbfs.nix
+++ b/pkgs/tools/security/keybase/kbfs.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, keybase }:
+{ lib, buildGoPackage, fetchFromGitHub, keybase }:
 
 buildGoPackage {
   pname = "kbfs";
diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
index 7a00f183f15..960667e72de 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2Packages, hping }:
+{ lib, fetchFromGitHub, python2Packages, hping }:
 let
   rev  = "bf14bbff";
 in python2Packages.buildPythonApplication rec {
diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix
index 20473d1003e..ce64b6847fe 100644
--- a/pkgs/tools/security/lesspass-cli/default.nix
+++ b/pkgs/tools/security/lesspass-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, fetchFromGitHub }:
+{ lib, python3, fetchFromGitHub }:
 
 let
   inherit (python3.pkgs) buildPythonApplication pytest mock pexpect;
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index fa3db0c3623..ab6ec0b1681 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage, libtool }:
+{ lib, fetchFromGitHub, buildGoPackage, libtool }:
 
 buildGoPackage rec {
   pname = "notary";
diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix
index 7e9d3d52e56..2df24e63d89 100644
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index bdaf087004a..8c5083ee8af 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }:
+{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "onioncircuits";
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index 7d038a1aeab..3612caa196c 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, stdenv, python3Packages, gnupg, perl }:
+{ fetchFromGitHub, lib, python3Packages, gnupg, perl }:
 
 let version = "3.0.0"; in
 python3Packages.buildPythonApplication {
diff --git a/pkgs/tools/security/pyrit/default.nix b/pkgs/tools/security/pyrit/default.nix
index ead55036425..dc1d0b97f87 100644
--- a/pkgs/tools/security/pyrit/default.nix
+++ b/pkgs/tools/security/pyrit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }:
+{ lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }:
 
 let
   version = "2019-12-13";
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index 2b769ee0a15..8ba6937c448 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config
+{ lib, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config
 , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }:
 
 mkDerivation rec {
diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/tools/security/safe/default.nix
index 2f0f4501fd2..503cfbd9e86 100644
--- a/pkgs/tools/security/safe/default.nix
+++ b/pkgs/tools/security/safe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoPackage
 , fetchFromGitHub
 }:
diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index ade299ec589..57a92ef4b99 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "saml2aws";
diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index 9eddc308a4f..ae6f000fe3f 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "sops";
diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/tools/security/subjs/default.nix
index 5b9a237d49c..1b7986c0a77 100644
--- a/pkgs/tools/security/subjs/default.nix
+++ b/pkgs/tools/security/subjs/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix
index bdaf8f129d0..53f99636b45 100644
--- a/pkgs/tools/security/sudolikeaboss/default.nix
+++ b/pkgs/tools/security/sudolikeaboss/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix, then modified by hand for Darwin support.
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, darwin }:
+{ lib, buildGoPackage, fetchFromGitHub, darwin }:
 
 buildGoPackage rec {
   pname = "sudolikeaboss-unstable";
diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix
index 1acb9e5609e..4a971243ad1 100644
--- a/pkgs/tools/security/teler/default.nix
+++ b/pkgs/tools/security/teler/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/urlhunter/default.nix b/pkgs/tools/security/urlhunter/default.nix
index 3364b622ad6..ebc628e563c 100644
--- a/pkgs/tools/security/urlhunter/default.nix
+++ b/pkgs/tools/security/urlhunter/default.nix
@@ -1,6 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, lib, stdenv
+, lib
 }:
 
 buildGoModule rec {
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 3af00b9a22b..4d9893e103f 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }:
+{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }:
 
 buildGoPackage rec {
   pname = "vault";
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index 80cd0d971a3..6cc5ddbfb4c 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "volatility";
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index e95adf3e1e6..a7ce0fb4b6e 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , python3Packages
 , nix
 , ronn
diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix
index 5a94cff19e1..b4bef5fc5e3 100644
--- a/pkgs/tools/system/auto-cpufreq/default.nix
+++ b/pkgs/tools/system/auto-cpufreq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonPackage rec {
   pname = "auto-cpufreq";
diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix
index b04532d842f..88162780cb7 100644
--- a/pkgs/tools/system/awstats/default.nix
+++ b/pkgs/tools/system/awstats/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perlPackages, jdk }:
+{ lib, fetchurl, perlPackages, jdk }:
 
 perlPackages.buildPerlPackage rec {
   pname = "awstats";
diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix
index 9c75fe78c99..47fdba50c5e 100644
--- a/pkgs/tools/system/cm-rgb/default.nix
+++ b/pkgs/tools/system/cm-rgb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildPythonApplication
 , fetchFromGitHub
 , atk
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 7604584e167..a285c720eaa 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "consul-template";
diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix
index 1706b32449e..9e8180b318a 100644
--- a/pkgs/tools/system/envconsul/default.nix
+++ b/pkgs/tools/system/envconsul/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "envconsul";
diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix
index 53e69cd8cd6..0ade0443dc0 100644
--- a/pkgs/tools/system/gdu/default.nix
+++ b/pkgs/tools/system/gdu/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+
 , buildGoModule
 , fetchFromGitHub
 , installShellFiles
diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix
index b49307f500f..3acace9eaae 100644
--- a/pkgs/tools/system/gotop/default.nix
+++ b/pkgs/tools/system/gotop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gotop";
diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix
index f39c7dd793c..b653f240724 100644
--- a/pkgs/tools/system/honcho/default.nix
+++ b/pkgs/tools/system/honcho/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 let
   inherit (pythonPackages) python;
diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix
index 0ec7ef36623..3d85d13149c 100644
--- a/pkgs/tools/system/journalwatch/default.nix
+++ b/pkgs/tools/system/journalwatch/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }:
 
 buildPythonPackage rec {
   pname = "journalwatch";
diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix
index 99e0674016b..798e3b3e883 100644
--- a/pkgs/tools/system/localtime/default.nix
+++ b/pkgs/tools/system/localtime/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildGoPackage, m4 }:
+{ lib, fetchFromGitHub, buildGoPackage, m4 }:
 
 buildGoPackage rec {
   name = "localtime-2017-11-07";
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
index 9e0f6fe147e..d01b08a1434 100644
--- a/pkgs/tools/system/pcstat/default.nix
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "pcstat-unstable";
diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix
index dcca1a86da7..152bb1150e5 100644
--- a/pkgs/tools/system/ps_mem/default.nix
+++ b/pkgs/tools/system/ps_mem/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages, fetchFromGitHub }:
+{ lib, pythonPackages, fetchFromGitHub }:
 
 let
   version = "3.13";
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 51c47ab1050..3943a8f4eef 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   pname = "s-tui";
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 30467926f5d..20c23e15051 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, skawarePackages }:
+{ lib, skawarePackages }:
 
 with skawarePackages;
 
diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix
index 7ac5d7cf210..62a7c9d8aea 100644
--- a/pkgs/tools/system/systemd-journal2gelf/default.nix
+++ b/pkgs/tools/system/systemd-journal2gelf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "SystemdJournal2Gelf-unstable";
diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix
index 5a2ad41c744..638caa3c62b 100644
--- a/pkgs/tools/system/tre-command/default.nix
+++ b/pkgs/tools/system/tre-command/default.nix
@@ -1,4 +1,4 @@
-{ rustPlatform, fetchFromGitHub, lib, stdenv, installShellFiles }:
+{ rustPlatform, fetchFromGitHub, lib, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tre-command";
diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix
index 82ca3ff0f60..66441d73713 100644
--- a/pkgs/tools/text/angle-grinder/default.nix
+++ b/pkgs/tools/text/angle-grinder/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , rustPlatform
 }:
diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix
index 20d651df008..7816f79649c 100644
--- a/pkgs/tools/text/choose/default.nix
+++ b/pkgs/tools/text/choose/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , rustPlatform
 }:
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index bdb273de372..9c3e9fbd840 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.
-{ lib, stdenv, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "codesearch";
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index ad92ffa9350..e1db7d3d39c 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages }:
+{ lib, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "FanFicFare";
diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix
index 27dcf633fe7..0ab9a54c47b 100644
--- a/pkgs/tools/text/gjo/default.nix
+++ b/pkgs/tools/text/gjo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 }:
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index dd3568ef0bb..5d89619001b 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python2Packages }:
+{ lib, fetchFromGitHub, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   program = "grin";
diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix
index 4e938787ff4..943b86d3b05 100644
--- a/pkgs/tools/text/gucci/default.nix
+++ b/pkgs/tools/text/gucci/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gucci";
diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index 07082c4c56f..3ead56298cf 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "icdiff";
diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix
index 87f3f3daff3..8007724f4a5 100644
--- a/pkgs/tools/text/invoice2data/default.nix
+++ b/pkgs/tools/text/invoice2data/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3Packages, xpdf, imagemagick, tesseract }:
+{ lib, python3Packages, xpdf, imagemagick, tesseract }:
 
 python3Packages.buildPythonPackage rec {
   pname = "invoice2data";
diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix
index 55febe11729..50ef560f6c3 100644
--- a/pkgs/tools/text/markdown-pp/default.nix
+++ b/pkgs/tools/text/markdown-pp/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, pythonPackages, lib, stdenv }:
+{ fetchFromGitHub, pythonPackages, lib }:
 
 with pythonPackages;
 buildPythonApplication rec {
diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/tools/text/pbgopy/default.nix
index 5e1473f8a3c..d4ed4eb0f03 100644
--- a/pkgs/tools/text/pbgopy/default.nix
+++ b/pkgs/tools/text/pbgopy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "pbgopy";
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix
index 30e7e58345d..ca89b7dc2d8 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/pkgs/tools/text/platinum-searcher/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "the_platinum_searcher";
diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix
index ea72468dc69..143c43f660d 100644
--- a/pkgs/tools/text/proselint/default.nix
+++ b/pkgs/tools/text/proselint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonApplication, click, future, six }:
+{ lib, fetchurl, buildPythonApplication, click, future, six }:
 
 buildPythonApplication rec {
   pname = "proselint";
diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix
index f53a1d79080..97a30211621 100644
--- a/pkgs/tools/text/rpl/default.nix
+++ b/pkgs/tools/text/rpl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "rpl";
diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix
index 409bbc16a93..84196ae1119 100644
--- a/pkgs/tools/text/schema2ldif/default.nix
+++ b/pkgs/tools/text/schema2ldif/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec {
+{ lib, stdenv, fetchurl, makeWrapper, perlPackages }:
+
+stdenv.mkDerivation rec {
   pname = "schema2ldif";
   version = "1.3";
 
diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix
index 411c9cb9899..a0f3ad1c5e3 100644
--- a/pkgs/tools/text/transifex-client/default.nix
+++ b/pkgs/tools/text/transifex-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi
+{ lib, buildPythonApplication, fetchPypi
 , python-slugify, requests, urllib3, six, setuptools }:
 
 buildPythonApplication rec {
diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index b1fd02ca75b..fa5418b4581 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, lib, stdenv, fetchFromGitHub }:
+{ buildGoPackage, lib, fetchFromGitHub }:
 
 buildGoPackage rec {
   version = "2.2.0";
diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix
index 70f7e8f53ca..bc5ddcc9d75 100644
--- a/pkgs/tools/typesetting/mmark/default.nix
+++ b/pkgs/tools/typesetting/mmark/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "mmark";
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
index 989f61f4592..7b20d230b9f 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages, libreoffice }:
+{ lib, fetchurl, pythonPackages, libreoffice }:
 
 pythonPackages.buildPythonApplication rec {
 
diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index 29fd21ed31f..2f6d169d0cb 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }:
+{ lib, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }:
 
 mkDerivation {
   pname = "tikzit";
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
index ba28ef08c8f..88ec2f22b89 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages }:
+{ lib, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "vnc2flv";
diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index 3faf90ab4ac..061dd486e0d 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "awless";
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index fa8e96def24..796ea36eacf 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3, glibcLocales }:
+{ lib, python3, glibcLocales }:
 let
 
   localPython = python3.override {
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index a7de9ae8b59..d06a2b4a17e 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkg-config, buildGoPackage, fetchFromGitHub
+{ lib, pkg-config, 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 371a867d4dd..88e83f42733 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, python2Packages }:
+{ lib, fetchgit, python2Packages }:
 
 let
   inherit (python2Packages) buildPythonApplication boto m2crypto;
diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix
index 6f036795e72..fe31c64952a 100644
--- a/pkgs/tools/virtualization/marathonctl/default.nix
+++ b/pkgs/tools/virtualization/marathonctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage {
   pname = "marathonctl-unstable";
diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix
index c971dfcb1bd..fb067de8212 100644
--- a/pkgs/tools/virtualization/udocker/default.nix
+++ b/pkgs/tools/virtualization/udocker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }:
+{ lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }:
 
 buildPythonApplication rec {
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0d24da0ca8..8b86a0631a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19276,7 +19276,7 @@ in
       kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
     in linuxPackagesFor (kernel.override {
       structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
-        inherit lib stdenv;
+        inherit lib;
         inherit (kernel) version;
       };
       kernelPatches = kernel.kernelPatches ++ [

From 41f4784e652a179ce0bcad662c7b00f3f35e50d2 Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Sun, 24 Jan 2021 12:27:35 +0100
Subject: [PATCH 925/956] bacula: add types

---
 nixos/modules/services/backup/bacula.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index b485602aab8..cc8b77cbfbe 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -1,5 +1,6 @@
 { config, lib, pkgs, ... }:
 
+
 # TODO: test configuration when building nixexpr (use -t parameter)
 # TODO: support sqlite3 (it's deprecate?) and mysql
 
@@ -111,6 +112,7 @@ let
   {
     options = {
       password = mkOption {
+        type = types.str;
         # TODO: required?
         description = ''
           Specifies the password that must be supplied for the default Bacula
@@ -130,6 +132,7 @@ let
       };
 
       monitor = mkOption {
+        type = types.enum [ "no" "yes" ];
         default = "no";
         example = "yes";
         description = ''
@@ -150,6 +153,7 @@ let
   {
     options = {
       changerDevice = mkOption {
+        type = types.str;
         description = ''
           The specified name-string must be the generic SCSI device name of the
           autochanger that corresponds to the normal read/write Archive Device
@@ -168,6 +172,7 @@ let
       };
 
       changerCommand = mkOption {
+        type = types.str;
         description = ''
           The name-string specifies an external program to be called that will
           automatically change volumes as required by Bacula. Normally, this
@@ -191,10 +196,12 @@ let
 
       devices = mkOption {
         description = "";
+        type = types.listOf types.str;
       };
 
       extraAutochangerConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Extra configuration to be passed in Autochanger directive.
         '';
@@ -211,6 +218,7 @@ let
     options = {
       archiveDevice = mkOption {
         # TODO: required?
+        type = types.str;
         description = ''
           The specified name-string gives the system file name of the storage
           device managed by this storage daemon. This will usually be the
@@ -227,6 +235,7 @@ let
 
       mediaType = mkOption {
         # TODO: required?
+        type = types.str;
         description = ''
           The specified name-string names the type of media supported by this
           device, for example, <literal>DLT7000</literal>. Media type names are
@@ -264,6 +273,7 @@ let
 
       extraDeviceConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Extra configuration to be passed in Device directive.
         '';
@@ -292,6 +302,7 @@ in {
 
       name = mkOption {
         default = "${config.networking.hostName}-fd";
+        type = types.str;
         description = ''
           The client name that must be used by the Director when connecting.
           Generally, it is a good idea to use a name related to the machine so
@@ -320,6 +331,7 @@ in {
 
       extraClientConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Extra configuration to be passed in Client directive.
         '';
@@ -331,6 +343,7 @@ in {
 
       extraMessagesConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Extra configuration to be passed in Messages directive.
         '';
@@ -351,6 +364,7 @@ in {
 
       name = mkOption {
         default = "${config.networking.hostName}-sd";
+        type = types.str;
         description = ''
           Specifies the Name of the Storage daemon.
         '';
@@ -391,6 +405,7 @@ in {
 
       extraStorageConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Extra configuration to be passed in Storage directive.
         '';
@@ -402,6 +417,7 @@ in {
 
       extraMessagesConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Extra configuration to be passed in Messages directive.
         '';
@@ -423,6 +439,7 @@ in {
 
       name = mkOption {
         default = "${config.networking.hostName}-dir";
+        type = types.str;
         description = ''
           The director name used by the system administrator. This directive is
           required.
@@ -444,6 +461,7 @@ in {
 
       password = mkOption {
         # TODO: required?
+        type = types.str;
         description = ''
            Specifies the password that must be supplied for a Director.
         '';
@@ -451,6 +469,7 @@ in {
 
       extraMessagesConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Extra configuration to be passed in Messages directive.
         '';
@@ -461,6 +480,7 @@ in {
 
       extraDirectorConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Extra configuration to be passed in Director directive.
         '';

From 9ae9e1e2dc8755a2361d26cde17a469867f525b1 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 25 Jan 2021 19:05:13 +0100
Subject: [PATCH 926/956] pikopixel: 1.0-b9e -> 1.0-b10

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

diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix
index a20a0a2db61..97a3684682d 100644
--- a/pkgs/applications/graphics/pikopixel/default.nix
+++ b/pkgs/applications/graphics/pikopixel/default.nix
@@ -11,11 +11,11 @@ let
 
 in gnustep'.gsmakeDerivation rec {
   pname = "pikopixel";
-  version = "1.0-b9e";
+  version = "1.0-b10";
 
   src = fetchurl {
     url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz";
-    sha256 = "1gmgb5ch7s6fwvg85l6pl6fsx0maqwd8yvg7sz3r9lj32g2pz5wn";
+    sha256 = "1b27npgsan2nx1p581b9q2krx4506yyd6s34r4sf1r9x9adshm77";
   };
 
   sourceRoot = "PikoPixel.Sources.${version}/PikoPixel";

From 51bc6bdf8c3437c35946cf888643fc44f569c190 Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Mon, 25 Jan 2021 19:05:30 +0100
Subject: [PATCH 927/956] factorio-headless-experimental,
 factorio-experimental: 1.1.12 -> 1.1.16

---
 pkgs/games/factorio/versions.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index 10a3e55a94f..24bd47cc423 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -2,12 +2,12 @@
   "x86_64-linux": {
     "alpha": {
       "experimental": {
-        "name": "factorio_alpha_x64-1.1.12.tar.xz",
+        "name": "factorio_alpha_x64-1.1.16.tar.xz",
         "needsAuth": true,
-        "sha256": "1b6rccm3vvvgs1sky0nrm001hsrzahrd8hc0pgldgyk0i6g5bmss",
+        "sha256": "000n19mm7xc1qvc93kakvayjd0j749hv5nrdmsp7vdixcd773vjn",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.12/alpha/linux64",
-        "version": "1.1.12"
+        "url": "https://factorio.com/get-download/1.1.16/alpha/linux64",
+        "version": "1.1.16"
       },
       "stable": {
         "name": "factorio_alpha_x64-1.0.0.tar.xz",
@@ -20,12 +20,12 @@
     },
     "demo": {
       "experimental": {
-        "name": "factorio_demo_x64-1.1.12.tar.xz",
+        "name": "factorio_demo_x64-1.1.16.tar.xz",
         "needsAuth": false,
-        "sha256": "037lipqxgfxycjsjffgd6rnx3xv62r40fmkyarcclww3yi596zrw",
+        "sha256": "11nkpx8f3a30i06q7iqds12fiy1q67h64vh72y8x5l4mjg16j1js",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.12/demo/linux64",
-        "version": "1.1.12"
+        "url": "https://factorio.com/get-download/1.1.16/demo/linux64",
+        "version": "1.1.16"
       },
       "stable": {
         "name": "factorio_demo_x64-1.0.0.tar.xz",
@@ -38,12 +38,12 @@
     },
     "headless": {
       "experimental": {
-        "name": "factorio_headless_x64-1.1.12.tar.xz",
+        "name": "factorio_headless_x64-1.1.16.tar.xz",
         "needsAuth": false,
-        "sha256": "0chgv7ymsiz4rrjmp04ckdhk2yzgi4ly7rwl0nv2fswajhl7ngmf",
+        "sha256": "02w92sgw4i3k1zywdg30mkr7nfylynsdn7sz5jzslyp0mkglrixi",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.12/headless/linux64",
-        "version": "1.1.12"
+        "url": "https://factorio.com/get-download/1.1.16/headless/linux64",
+        "version": "1.1.16"
       },
       "stable": {
         "name": "factorio_headless_x64-1.0.0.tar.xz",

From 63b02e55dbf929366543d0cd7ebdf5b68e18d794 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 25 Jan 2021 13:06:12 -0500
Subject: [PATCH 928/956] nixos treewide: Fix references to linux-kernel.target

Thanks @ajs124 in
https://github.com/NixOS/nixpkgs/pull/110544#discussion_r563828722 for
catching this. According to:

    git grep 'inherit.*Platform.*platform'
    git grep ' linux-kernel'

We now don't have any remaining problems of this sort, thankfully.
---
 .../system/boot/loader/generations-dir/generations-dir.nix   | 5 +----
 nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index fee567a510b..1437ab38770 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -12,9 +12,6 @@ let
     inherit (config.boot.loader.generationsDir) copyKernels;
   };
 
-  # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
-  inherit (pkgs.stdenv.hostPlatform) platform;
-
 in
 
 {
@@ -59,7 +56,7 @@ in
 
     system.build.installBootLoader = generationsDirBuilder;
     system.boot.loader.id = "generationsDir";
-    system.boot.loader.kernelFile = linux-kernel.target;
+    system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
 
   };
 }
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 061f2967350..1023361f0b1 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -5,8 +5,6 @@ with lib;
 let
   cfg = config.boot.loader.raspberryPi;
 
-  inherit (pkgs.stdenv.hostPlatform) platform;
-
   builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
   builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
 
@@ -102,6 +100,6 @@ in
 
     system.build.installBootLoader = builder;
     system.boot.loader.id = "raspberrypi";
-    system.boot.loader.kernelFile = linux-kernel.target;
+    system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
   };
 }

From 2af45faca49b1aa802b3965fd93165df3d213dd9 Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Mon, 25 Jan 2021 19:13:07 +0100
Subject: [PATCH 929/956] sqldeveloper: 20.2.0.175.1842 -> 20.4.0.379.2205

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

diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 6017d704fc1..c42197e13cf 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
 
 let
-  version = "20.2.0.175.1842";
+  version = "20.4.0.379.2205";
 
   desktopItem = makeDesktopItem {
     name = "sqldeveloper";
@@ -46,7 +46,7 @@ in
 
         nix-prefetch-url --type sha256 file:///path/to/${name}
     '';
-    sha256 = "1fcaq7ffn1q35f7rvp3ybs2191lvfc0jgjx7y4wn1nqglgj7zy7n";
+    sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";
   };
 
   buildInputs = [ makeWrapper unzip ];

From 80027b2272b9c41d601a8bb86ed546589ed67739 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 25 Jan 2021 17:38:04 +0100
Subject: [PATCH 930/956] gnu-cobol: 2.2 -> 3.1.2

Fixes:
 * CVE-2019-14468
 * CVE-2019-14486
 * CVE-2019-14528
 * CVE-2019-14541
 * CVE-2019-16395
 * CVE-2019-16396
---
 pkgs/development/compilers/gnu-cobol/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix
index e208f262ebe..44c966fa974 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@@ -1,16 +1,13 @@
 { lib, stdenv, fetchurl, gcc, makeWrapper
 , db, gmp, ncurses }:
 
-let
-  version = "2.2";
-in
 stdenv.mkDerivation rec {
   pname = "gnu-cobol";
-  inherit version;
+  version = "3.1.2";
 
   src = fetchurl {
-    url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version}/gnucobol-${version}.tar.gz";
-    sha256 = "1jrjmdx0swssjh388pp08awhiisbrs2i7gx4lcm4p1k5rpg3hn4j";
+    url = "mirror://sourceforge/gnucobol/${lib.versions.majorMinor version}/gnucobol-${version}.tar.xz";
+    sha256 = "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -31,9 +28,9 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "An open-source COBOL compiler";
-    homepage = "https://sourceforge.net/projects/open-cobol/";
-    license = licenses.gpl3;
+    homepage = "https://sourceforge.net/projects/gnucobol/";
+    license = with licenses; [ gpl3Only lgpl3Only ];
     maintainers = with maintainers; [ ericsagnes ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.all;
   };
 }

From b002d7455d1a543b09a6c5305b53af9e6f30d926 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 25 Jan 2021 19:23:58 +0100
Subject: [PATCH 931/956] clightning: use system libsodium

---
 pkgs/applications/blockchains/clightning.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index fa4d8b8d4da..745ac349975 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -10,6 +10,7 @@
 , unzip
 , which
 , gmp
+, libsodium
 , python3
 , sqlite
 , zlib
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ];
 
-  buildInputs = [ gmp sqlite zlib ];
+  buildInputs = [ gmp libsodium sqlite zlib ];
 
   postPatch = ''
     patchShebangs \

From b7871c3f2da1a38bccd839401f6113f734f62e43 Mon Sep 17 00:00:00 2001
From: Milan <me@pbb.lc>
Date: Mon, 25 Jan 2021 19:24:32 +0100
Subject: [PATCH 932/956] qemu: fix build when desktop file does not exist
 (#110721)

The qemu-user variants as used by binfmt emulation through
`(lib.systems.elaborate lib.systems.examples.aarch64-multiplatform).emulator pkgs`
does not install a .desktop file since qemu 5.2.0. This change allows
the build to continue if deletion of the desktop file fails.
---
 pkgs/applications/virtualization/qemu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 61ebe2ceec7..d83c6d350e2 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     # the .desktop is both invalid and pointless
-    rm $out/share/applications/qemu.desktop
+    rm -f $out/share/applications/qemu.desktop
 
     # copy qemu-ga (guest agent) to separate output
     mkdir -p $ga/bin

From 41e13149f72bf1a5ef6a0f9b1da7c1c31cbc108a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 24 Jan 2021 11:33:41 +0100
Subject: [PATCH 933/956] lib/debug: add traceFnSeqN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Immensely helpful when you want to see the changes a function makes to
its value as it passes through.

Example:

```
$ nix-instantiate --strict --eval -E '(with import ./lib; traceFnSeqN 2 "id" (x: x) { a.b.c = 3; })'
trace: {
  fn = "id";
  from = {
    a = {
      b = {…};
    };
  };
  to = {
    a = {
      b = {…};
    };
  };
}
{ a = { b = { c = 3; }; }; }
```
---
 lib/debug.nix   | 22 ++++++++++++++++++++++
 lib/default.nix |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index ea6aed60ab4..e3ca3352397 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -148,6 +148,28 @@ rec {
   /* A combination of `traceVal` and `traceSeqN`. */
   traceValSeqN = traceValSeqNFn id;
 
+  /* Trace the input and output of a function `f` named `name`,
+  both down to `depth`.
+
+  This is useful for adding around a function call,
+  to see the before/after of values as they are transformed.
+
+     Example:
+       traceFnSeqN 2 "id" (x: x) { a.b.c = 3; }
+       trace: { fn = "id"; from = { a.b = {…}; }; to = { a.b = {…}; }; }
+       => { a.b.c = 3; }
+  */
+  traceFnSeqN = depth: name: f: v:
+    let res = f v;
+    in lib.traceSeqN
+        (depth + 1)
+        {
+          fn = name;
+          from = v;
+          to = res;
+        }
+        res;
+
 
   # -- TESTING --
 
diff --git a/lib/default.nix b/lib/default.nix
index f985266ed93..803f1f76564 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -130,7 +130,7 @@ let
       assertMsg assertOneOf;
     inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn
       traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
-      traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
+      traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN traceShowVal
       traceShowValMarked showVal traceCall traceCall2 traceCall3
       traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr;
     inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs

From 8863518f456247ad77a6892889383c624011b653 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 25 Jan 2021 19:27:47 +0100
Subject: [PATCH 934/956] pdfarranger: 1.6.2 -> 1.7.0

---
 pkgs/applications/misc/pdfarranger/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix
index 8c8413b2ce6..aab785e0a72 100644
--- a/pkgs/applications/misc/pdfarranger/default.nix
+++ b/pkgs/applications/misc/pdfarranger/default.nix
@@ -5,13 +5,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pdfarranger";
-  version = "1.6.2";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "wJ6ImWpszfgErfLh7YgHirVKFIt0ij8A/CdYJmkNBP0=";
+    sha256 = "0dmgmvpghsm938iznalbg8h8k17a5h3q466yfc67mcll428n4nx3";
   };
 
   nativeBuildInputs = [
@@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec {
     pikepdf
     img2pdf
     setuptools
+    dateutil
   ];
 
   # incompatible with wrapGAppsHook
@@ -45,6 +46,6 @@ python3Packages.buildPythonApplication rec {
     description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface";
     platforms = platforms.linux;
     maintainers = with maintainers; [ symphorien ];
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
   };
 }

From 9ce1caa63c9c806e705cd0d282a4aa920dce76fd Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 25 Jan 2021 18:39:38 +0000
Subject: [PATCH 935/956] mindustry,mindustry-server: 122.1 -> 123.1 (#110793)

---
 pkgs/games/mindustry/default.nix | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index b9969b84fb7..fb6b9d70a9c 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -3,7 +3,6 @@
 , makeDesktopItem
 , copyDesktopItems
 , fetchFromGitHub
-, fetchpatch
 , gradleGen
 , jdk
 , perl
@@ -30,45 +29,31 @@ let
   # Note: when raising the version, ensure that all SNAPSHOT versions in
   # build.gradle are replaced by a fixed version
   # (the current one at the time of release) (see postPatch).
-  version = "122.1";
+  version = "123.1";
   buildVersion = makeBuildVersion version;
 
   Mindustry = fetchFromGitHub {
     owner = "Anuken";
     repo = "Mindustry";
     rev = "v${version}";
-    sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y";
+    sha256 = "0qpgilb0v93zcik12idwzdd5b5lw74431iywq4d55gn5i6gb6bh1";
   };
   Arc = fetchFromGitHub {
     owner = "Anuken";
     repo = "Arc";
     rev = "v${version}";
-    sha256 = "0inzyj01442da7794cpxlaab7di9gv1snc97cbffqsdxgin16i7d";
+    sha256 = "146wvm0dahygnq327pspr62lq29irwrhc8ylgwdwwasrvlsscdp5";
   };
   soloud = fetchFromGitHub {
     owner = "Anuken";
     repo = "soloud";
     # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39
-    rev = "8553049c6fb0d1eaa7f57c1793b96219c84e8ba5";
-    sha256 = "076vnjs2qxd65qq5i37gbmj5v5i04a1vw0kznq986gv9190jj531";
+    rev = "73860909189c9c42924eb82e9b4a0eab2a4d5e1c";
+    sha256 = "1gm3r16a539hm8jbc14mfxn7v88dv40vr7nzwmpifnz54qarkg3m";
   };
 
   patches = [
     ./0001-fix-include-path-for-SDL2-on-linux.patch
-    # upstream fix for https://github.com/Anuken/Arc/issues/40, remove on next release
-    (fetchpatch {
-      url = "https://github.com/Anuken/Arc/commit/b2f3d212c1a88a62f140f5cb04f4c86e61332d1c.patch";
-      sha256 = "1yjp4drv7lk3kinzy47g8jhb2qazr92b85vbc79vsqrs8sycskan";
-      extraPrefix = "Arc/";
-      stripLen = 1;
-    })
-    # add resolveDependencies task, remove when and if it gets added upstream in a future release
-    (fetchpatch {
-      url = "https://github.com/Anuken/Mindustry/pull/4302.patch";
-      sha256 = "0yp42sray4fxkajhpdljal0wss8jh9rvmclysw6cixsa94pw5khq";
-      extraPrefix = "Mindustry/";
-      stripLen = 1;
-    })
   ];
 
   unpackPhase = ''
@@ -129,7 +114,7 @@ let
     '';
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "09rwyrg2yv8r499b0dk1bzvymsf98d4j5b95bwd9s4xvrz71is3l";
+    outputHash = "18r2gd1y79cy571f5hvlablfwrlz10cf7ssc9ckkvkk92i0323gk";
   };
 
 in

From 5cc3d7cf8d768cae6a508a5e0b9d56764f90ca8e Mon Sep 17 00:00:00 2001
From: Sam Hofius <sam@samhofi.us>
Date: Mon, 25 Jan 2021 13:53:21 -0500
Subject: [PATCH 936/956] keybase,keybase-gui,kbfs: 5.5.2 -> 5.6.1

---
 pkgs/tools/security/keybase/default.nix | 4 ++--
 pkgs/tools/security/keybase/gui.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 50724d1199a..f1268717a91 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "keybase";
-  version = "5.5.2";
+  version = "5.6.1";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "client";
     rev = "v${version}";
-    sha256 = "01k50mank6cdc7q3yd8m7xi8vmyklsqlmz7hw17a35lqcsjzy9zj";
+    sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g";
   };
 
   patches = [
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 54be692b007..cfc282c303c 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,17 +4,17 @@
 , runtimeShell, gsettings-desktop-schemas }:
 
 let
-  versionSuffix = "20201016183637.d4ebf7d999";
+  versionSuffix = "20210125164223.f3b21527b9";
 in
 
 stdenv.mkDerivation rec {
   pname = "keybase-gui";
-  version = "5.5.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+  version = "5.6.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
 
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
-    sha256 = "0qwbqnc6dhfnx3gdwl1lyhdsbclaxpkv3zr3dmxfx1242s64v0c1";
+    sha256 = "12ckfd02j0f3p3pdlwc640f61z1wzblf2414h6fkf5vzd289h35p";
   };
 
   nativeBuildInputs = [

From 1f274be90d243a317fb83070139fc2d2e0a0bb86 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Mon, 25 Jan 2021 20:23:05 +0100
Subject: [PATCH 937/956] ryujinx: 1.0.5551 -> 1.0.6416

---
 pkgs/misc/emulators/ryujinx/default.nix   |  16 +--
 pkgs/misc/emulators/ryujinx/deps.nix      | 126 +++++++++++++---------
 pkgs/misc/emulators/ryujinx/fetch-deps.sh |   2 +-
 3 files changed, 82 insertions(+), 62 deletions(-)

diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix
index 79d71301163..c30ab195180 100644
--- a/pkgs/misc/emulators/ryujinx/default.nix
+++ b/pkgs/misc/emulators/ryujinx/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
-, dotnet-sdk_3, dotnetPackages, dotnetCorePackages
+, dotnet-sdk_5, dotnetPackages, dotnetCorePackages
 , SDL2, libX11, openal
-, gtk3, gobject-introspection, wrapGAppsHook
+, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
 }:
 
 let
@@ -13,16 +13,16 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "ryujinx";
-  version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
+  version = "1.0.6416"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
 
   src = fetchFromGitHub {
     owner = "Ryujinx";
     repo = "Ryujinx";
-    rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf";
-    sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf";
+    rev = "ad491b5570ec428d0d87d56426b03125e2ca5220";
+    sha256 = "0gjrvdh6n26r9kkljiw9xvmvb47vmpwsjxi4iv41ir3nsdigdvsn";
   };
 
-  nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ];
+  nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
 
   nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {
     fetchNuGet = { name, version, sha256 }: fetchurl {
@@ -73,12 +73,12 @@ in stdenv.mkDerivation rec {
     shopt -s extglob
 
     makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \
-      --set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \
+      --set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \
       --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \
       ''${gappsWrapperArgs[@]}
 
     for i in 16 32 48 64 96 128 256 512 1024; do
-      install -D ${src}/Ryujinx/Ui/assets/Icon.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png
+      install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png
     done
     cp -r ${makeDesktopItem {
       desktopName = "Ryujinx";
diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix
index 4f30b159a28..737bd876e13 100644
--- a/pkgs/misc/emulators/ryujinx/deps.nix
+++ b/pkgs/misc/emulators/ryujinx/deps.nix
@@ -1,13 +1,13 @@
 { fetchNuGet }: [
   (fetchNuGet {
     name = "AtkSharp";
-    version = "3.22.25.56";
-    sha256 = "069fm4wplxb4s1i6mdj00b22zqpz6pg9miglcj8mkf1b4lnn09g0";
+    version = "3.22.25.128";
+    sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94";
   })
   (fetchNuGet {
     name = "CairoSharp";
-    version = "3.22.25.56";
-    sha256 = "0b7p4yj88wgayh464j3rkbc4js8z57wxy3mprgvx86i3rc2v5jd9";
+    version = "3.22.25.128";
+    sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9";
   })
   (fetchNuGet {
     name = "Concentus";
@@ -21,8 +21,8 @@
   })
   (fetchNuGet {
     name = "DiscordRichPresence";
-    version = "1.0.150";
-    sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79";
+    version = "1.0.166";
+    sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a";
   })
   (fetchNuGet {
     name = "FFmpeg.AutoGen";
@@ -31,18 +31,18 @@
   })
   (fetchNuGet {
     name = "GdkSharp";
-    version = "3.22.25.56";
-    sha256 = "0f708dwy6i9hghxs711scwkww28lvfjd6gykk7xv921vich5xvy6";
+    version = "3.22.25.128";
+    sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7";
   })
   (fetchNuGet {
     name = "GioSharp";
-    version = "3.22.25.56";
-    sha256 = "1i7x1bakv5sq27ppl6w79c1wbvnfhf1713plc9ixaznh1fclcnwr";
+    version = "3.22.25.128";
+    sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv";
   })
   (fetchNuGet {
     name = "GLibSharp";
-    version = "3.22.25.56";
-    sha256 = "12czfm0lgjcy9hgqsiycwfv124dq619svrnsi036246i5hycj37w";
+    version = "3.22.25.128";
+    sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5";
   })
   (fetchNuGet {
     name = "GLWidget";
@@ -51,8 +51,8 @@
   })
   (fetchNuGet {
     name = "GtkSharp";
-    version = "3.22.25.56";
-    sha256 = "18dbn834wimdmxmgsqd81hyvjyyzgbnayzvz9f714cgw4yjkjyqs";
+    version = "3.22.25.128";
+    sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy";
   })
   (fetchNuGet {
     name = "GtkSharp.Dependencies";
@@ -66,23 +66,23 @@
   })
   (fetchNuGet {
     name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-    version = "3.1.8";
-    sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135";
+    version = "5.0.0";
+    sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw";
   })
   (fetchNuGet {
     name = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-    version = "3.1.8";
-    sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4";
+    version = "5.0.0";
+    sha256 = "1mmklq1fwq4km9y9jgk63wmwjlarx4npkpvjaiwdzv83vdv104ja";
   })
   (fetchNuGet {
     name = "Microsoft.AspNetCore.App.Runtime.win-x64";
-    version = "3.1.8";
-    sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f";
+    version = "5.0.0";
+    sha256 = "0k7q89w3nky4m0j5jsk95c8gczlyp5jl9982gf1hli3gqpl2q4jr";
   })
   (fetchNuGet {
     name = "Microsoft.CodeCoverage";
-    version = "16.7.0";
-    sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1";
+    version = "16.8.0";
+    sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8";
   })
   (fetchNuGet {
     name = "Microsoft.CSharp";
@@ -96,28 +96,28 @@
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.App.Host.osx-x64";
-    version = "3.1.8";
-    sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb";
+    version = "5.0.0";
+    sha256 = "1nirb155gzn2ws1ayaqspjmjaizw87jq2684mzkn18jv4si0hbpf";
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.App.Host.win-x64";
-    version = "3.1.8";
-    sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb";
+    version = "5.0.0";
+    sha256 = "0nghghcapc28ixg21wb30ccjirc9wz83h0y3bn5zyfanxv2m2ypx";
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.App.Runtime.linux-x64";
-    version = "3.1.8";
-    sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa";
+    version = "5.0.0";
+    sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq";
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.App.Runtime.osx-x64";
-    version = "3.1.8";
-    sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w";
+    version = "5.0.0";
+    sha256 = "0lvpf4zz617y94zz3zsmzrg6zcdd6z3z9gz2bd5kq1l8y1pmq77y";
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.App.Runtime.win-x64";
-    version = "3.1.8";
-    sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz";
+    version = "5.0.0";
+    sha256 = "1486654z369857h45v73jz8pwr8ibb97fiw5mfm7f01kdbyjdsdd";
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.Platforms";
@@ -139,6 +139,11 @@
     version = "3.1.0";
     sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
   })
+  (fetchNuGet {
+    name = "Microsoft.NETCore.Platforms";
+    version = "5.0.0";
+    sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc";
+  })
   (fetchNuGet {
     name = "Microsoft.NETCore.Targets";
     version = "1.0.1";
@@ -151,18 +156,18 @@
   })
   (fetchNuGet {
     name = "Microsoft.NET.Test.Sdk";
-    version = "16.7.0";
-    sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy";
+    version = "16.8.0";
+    sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9";
   })
   (fetchNuGet {
     name = "Microsoft.TestPlatform.ObjectModel";
-    version = "16.7.0";
-    sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz";
+    version = "16.8.0";
+    sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m";
   })
   (fetchNuGet {
     name = "Microsoft.TestPlatform.TestHost";
-    version = "16.7.0";
-    sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs";
+    version = "16.8.0";
+    sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a";
   })
   (fetchNuGet {
     name = "Microsoft.Win32.Primitives";
@@ -189,6 +194,11 @@
     version = "4.7.0";
     sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs";
   })
+  (fetchNuGet {
+    name = "Microsoft.Win32.Registry";
+    version = "5.0.0";
+    sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n";
+  })
   (fetchNuGet {
     name = "Microsoft.Win32.SystemEvents";
     version = "4.5.0";
@@ -241,13 +251,13 @@
   })
   (fetchNuGet {
     name = "OpenTK.NetStandard";
-    version = "1.0.5.22";
-    sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23";
+    version = "1.0.5.32";
+    sha256 = "12y8kg73llmq3zibcp6j3hhiw04g7mqlm1nslmb74gfkzx0b4m9f";
   })
   (fetchNuGet {
     name = "PangoSharp";
-    version = "3.22.25.56";
-    sha256 = "12b0761nfsci4rvzcba4hrh5rcn6q24qaxwwz66myb82c999qj8w";
+    version = "3.22.25.128";
+    sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp";
   })
   (fetchNuGet {
     name = "runtime.any.System.Collections";
@@ -489,6 +499,11 @@
     version = "4.3.0";
     sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr";
   })
+  (fetchNuGet {
+    name = "Ryujinx.Audio.OpenAL.Dependencies";
+    version = "1.21.0.1";
+    sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l";
+  })
   (fetchNuGet {
     name = "Ryujinx.Graphics.Nvdec.Dependencies";
     version = "4.3.0";
@@ -496,8 +511,8 @@
   })
   (fetchNuGet {
     name = "SharpZipLib";
-    version = "1.2.0";
-    sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5";
+    version = "1.3.0";
+    sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4";
   })
   (fetchNuGet {
     name = "System.AppContext";
@@ -521,8 +536,8 @@
   })
   (fetchNuGet {
     name = "System.CodeDom";
-    version = "4.7.0";
-    sha256 = "1lch8gwmw420wsvbv9ir4v5g1ij2ag23cbgi3c9gramj1h4vhlz2";
+    version = "5.0.0";
+    sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh";
   })
   (fetchNuGet {
     name = "System.Collections";
@@ -701,8 +716,8 @@
   })
   (fetchNuGet {
     name = "System.Management";
-    version = "4.7.0";
-    sha256 = "0aw61jl6l78liiq04afxplz0ad5qbyg6vmyjaqrlnrv7whb58n66";
+    version = "5.0.0";
+    sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s";
   })
   (fetchNuGet {
     name = "System.Net.Http";
@@ -829,11 +844,6 @@
     version = "4.3.0";
     sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
   })
-  (fetchNuGet {
-    name = "System.Runtime.CompilerServices.Unsafe";
-    version = "4.6.0";
-    sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m";
-  })
   (fetchNuGet {
     name = "System.Runtime.CompilerServices.Unsafe";
     version = "5.0.0-preview.7.20364.11";
@@ -899,6 +909,11 @@
     version = "4.7.0";
     sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
   })
+  (fetchNuGet {
+    name = "System.Security.AccessControl";
+    version = "5.0.0";
+    sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
+  })
   (fetchNuGet {
     name = "System.Security.Claims";
     version = "4.3.0";
@@ -959,6 +974,11 @@
     version = "4.7.0";
     sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
   })
+  (fetchNuGet {
+    name = "System.Security.Principal.Windows";
+    version = "5.0.0";
+    sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
+  })
   (fetchNuGet {
     name = "System.Text.Encoding";
     version = "4.0.11";
diff --git a/pkgs/misc/emulators/ryujinx/fetch-deps.sh b/pkgs/misc/emulators/ryujinx/fetch-deps.sh
index ce9873a1692..d5c9b0eb934 100755
--- a/pkgs/misc/emulators/ryujinx/fetch-deps.sh
+++ b/pkgs/misc/emulators/ryujinx/fetch-deps.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3
+#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5
 set -eo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 

From b76c3427cfe6c9867be56abec96362cb956a5477 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 25 Jan 2021 19:08:10 +0100
Subject: [PATCH 938/956] tkrzw: init at 0.9.3

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

diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix
new file mode 100644
index 00000000000..17375125bd2
--- /dev/null
+++ b/pkgs/development/libraries/tkrzw/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "tkrzw";
+  version = "0.9.3";
+  # TODO: defeat multi-output reference cycles
+
+  src = fetchurl {
+    url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz";
+    sha256 = "1ap93fsw7vhn329kvy8g20l8p4jdygfl8r8mrgsfcpa20a29fnwl";
+  };
+
+  enableParallelBuilding = true;
+
+  doCheck = false; # memory intensive
+
+  meta = with lib; {
+    description = "A set of implementations of DBM";
+    homepage = "https://dbmx.net/tkrzw/";
+    maintainers = with maintainers; [ ehmry ];
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ce78cd298a..a758f91d35f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16812,6 +16812,8 @@ in
   tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
   tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
 
+  tkrzw = callPackage ../development/libraries/tkrzw { };
+
   tl-expected = callPackage ../development/libraries/tl-expected { };
 
   tnt = callPackage ../development/libraries/tnt { };

From 8da624e2312e3579eac210f6185949c61b6968a3 Mon Sep 17 00:00:00 2001
From: Souvik Sen <souviksen44@gmail.com>
Date: Tue, 26 Jan 2021 01:47:52 +0530
Subject: [PATCH 939/956] javacc: init at 7.0.10 (#110783)

Co-authored-by: Souvik Sen <nixpkgs-commits@deshaw.com>
---
 .../tools/parsing/javacc/default.nix          | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/javacc/default.nix

diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/development/tools/parsing/javacc/default.nix
new file mode 100644
index 00000000000..d074e3dda93
--- /dev/null
+++ b/pkgs/development/tools/parsing/javacc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, ant, jdk }:
+
+stdenv.mkDerivation rec {
+  pname = "javacc";
+  version = "7.0.10";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "${pname}-${version}";
+    sha256 = "120jva4sw1kylkwgqf869zxddss01mcn1nmimx9vmd4xaadz7cf2";
+  };
+
+  nativeBuildInputs = [ ant jdk ];
+
+  buildPhase = ''
+    ant jar
+  '';
+
+  installPhase = ''
+    mkdir -p $out/target
+    mv scripts $out/bin
+    mv target/javacc.jar $out/target/
+  '';
+
+  meta = with lib; {
+    homepage = "https://javacc.github.io/javacc";
+    description = "A parser generator for building parsers from grammars";
+    license = licenses.bsd2;
+    maintainers = [ teams.deshaw.members ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1787d55a05..d580731014e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12249,6 +12249,10 @@ in
 
   jam = callPackage ../development/tools/build-managers/jam { };
 
+  javacc = callPackage ../development/tools/parsing/javacc {
+    jdk = jdk8;
+  };
+
   jbake = callPackage ../development/tools/jbake { };
 
   jbang = callPackage ../development/tools/jbang { };

From 92365d5dbcc0485be2ebf1c043d84c53bc828be7 Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Mon, 25 Jan 2021 15:19:10 -0500
Subject: [PATCH 940/956] tilt: 0.18.1 -> 0.18.5

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

diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index 2a6a808b0c9..a185c64646f 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
   /* Do not use "dev" as a version. If you do, Tilt will consider itself
     running in development environment and try to serve assets from the
     source tree, which is not there once build completes.  */
-  version = "0.18.1";
+  version = "0.18.5";
 
   src = fetchFromGitHub {
     owner  = "tilt-dev";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1sdb2x06va0j9cxdwz95dklv2csq0s596wjsjqi4sq65y9bxjr7i";
+    sha256 = "0msfc2cgfq7dz02n2z898iw2bx98qsny3j4pzja767vcdpnzjmr5";
   };
   vendorSha256 = null;
 

From ed4a34a945ba36c26c7a45f75de897bc1973cefc Mon Sep 17 00:00:00 2001
From: Joseph Crail <jbcrail@gmail.com>
Date: Sat, 23 Jan 2021 20:33:12 -0800
Subject: [PATCH 941/956] zydis: init at 3.1.0

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

diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix
new file mode 100644
index 00000000000..dd3f4b91631
--- /dev/null
+++ b/pkgs/development/libraries/zydis/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "zydis";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "zyantific";
+    repo = "zydis";
+    rev = "bfee99f49274a0eec3ffea16ede3a5bda9cda88f";
+    sha256 = "0x2lpc33ynd0zzirdxp2lycvg3545wh1ssgy4qlv81471iwwzv6b";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    description = "Fast and lightweight x86/x86-64 disassembler library";
+    license = licenses.mit;
+    maintainers = [ maintainers.jbcrail ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 343531f71f2..6e8804fcd66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12876,6 +12876,8 @@ in
 
   ytt = callPackage ../development/tools/ytt {};
 
+  zydis = callPackage ../development/libraries/zydis { };
+
   winpdb = callPackage ../development/tools/winpdb { };
 
   grabserial = callPackage ../development/tools/grabserial { };

From 30d63caad6621c7c6550aab37f3dab948aeced76 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Jan 2021 21:28:29 +0100
Subject: [PATCH 942/956] python3Packages.brottsplatskartan: init at 1.0.5

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

diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix
new file mode 100644
index 00000000000..c1390416f07
--- /dev/null
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-cov
+, pytestCheckHook
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "brottsplatskartan";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "chrillux";
+    repo = pname;
+    rev = version;
+    sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "brottsplatskartan" ];
+
+  meta = with lib; {
+    description = "Python API wrapper for brottsplatskartan.se";
+    homepage = "https://github.com/chrillux/brottsplatskartan";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d37d837e4e1..38c9715f946 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1044,6 +1044,8 @@ in {
 
   brotlipy = callPackage ../development/python-modules/brotlipy { };
 
+  brottsplatskartan = callPackage ../development/python-modules/brottsplatskartan { };
+
   browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { };
 
   browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { });

From 416c13f9d938bf5e93ec2f42b57c2291262ec14c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Jan 2021 21:29:04 +0100
Subject: [PATCH 943/956] home-assistant: update component-packages

---
 pkgs/development/python-modules/brottsplatskartan/default.nix | 2 +-
 pkgs/servers/home-assistant/component-packages.nix            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix
index c1390416f07..8daf79f208d 100644
--- a/pkgs/development/python-modules/brottsplatskartan/default.nix
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python API wrapper for brottsplatskartan.se";
     homepage = "https://github.com/chrillux/brottsplatskartan";
-    license = with licenses; [ gpl2Only ];
+    license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 0f0737595af..b4c5660df46 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -96,7 +96,7 @@
     "braviatv" = ps: with ps; [ bravia-tv ];
     "broadlink" = ps: with ps; [ broadlink ];
     "brother" = ps: with ps; [ brother ];
-    "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
+    "brottsplatskartan" = ps: with ps; [ brottsplatskartan ];
     "browser" = ps: with ps; [ ];
     "brunt" = ps: with ps; [ ]; # missing inputs: brunt
     "bsblan" = ps: with ps; [ bsblan ];

From 18ae358e27feb1fc227229ffb6b57df461c2a0a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Jan 2021 21:50:39 +0100
Subject: [PATCH 944/956] python3Packages.pyedimax: init at 0.2.1

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

diff --git a/pkgs/development/python-modules/pyedimax/default.nix b/pkgs/development/python-modules/pyedimax/default.nix
new file mode 100644
index 00000000000..03229b30bdd
--- /dev/null
+++ b/pkgs/development/python-modules/pyedimax/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pyedimax";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1i3gr5vygqh2ryg67sl13aaql7nvf3nbybrg54628r4g7911b5rk";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # Project has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "pyedimax" ];
+
+  meta = with lib; {
+    description = "Python library for interfacing with the Edimax smart plugs";
+    homepage = "https://github.com/andreipop2005/pyedimax";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d37d837e4e1..587e995d15f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5301,6 +5301,8 @@ in {
 
   pyechonest = callPackage ../development/python-modules/pyechonest { };
 
+  pyedimax = callPackage ../development/python-modules/pyedimax { };
+
   pyee = callPackage ../development/python-modules/pyee { };
 
   pyelftools = callPackage ../development/python-modules/pyelftools { };

From 2d2a27ac110163c1dc4bb5e31668dde61b4f2e59 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Jan 2021 21:51:16 +0100
Subject: [PATCH 945/956] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 0f0737595af..8debc16d210 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -202,7 +202,7 @@
     "econet" = ps: with ps; [ ]; # missing inputs: pyeconet
     "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks
     "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan]
-    "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax
+    "edimax" = ps: with ps; [ pyedimax ];
     "edl21" = ps: with ps; [ ]; # missing inputs: pysml
     "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox
     "efergy" = ps: with ps; [ ];

From a7dda29d8aba00517d98d5c964dab280315c2345 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 26 Jan 2021 07:26:59 +1000
Subject: [PATCH 946/956] Revert "gh: enable tests"

This reverts commit c7deb49058baaeeba60065e62487476a7f35724c.

Fails with sandboxing.
---
 .../version-management/git-and-tools/gh/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 7c61c3329b2..38413f990a0 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -1,9 +1,4 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
-, installShellFiles
-, git
-}:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
 
 buildGoModule rec {
   pname = "gh";
@@ -35,10 +30,8 @@ buildGoModule rec {
     done
   '';
 
-  checkInputs = [ git ];
-  checkPhase = ''
-    make test
-  '';
+  # fails with `unable to find git executable in PATH`
+  doCheck = false;
 
   meta = with lib; {
     description = "GitHub CLI tool";

From b8a347db93fc0183b1a2e3b3226220d9ca5d8f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Mon, 25 Jan 2021 21:05:29 +0100
Subject: [PATCH 947/956] pifi: init at 0.4.11

---
 pkgs/applications/audio/pifi/Gemfile      |   2 +
 pkgs/applications/audio/pifi/Gemfile.lock |  39 ++++++
 pkgs/applications/audio/pifi/default.nix  |  18 +++
 pkgs/applications/audio/pifi/gemset.nix   | 137 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   2 +
 5 files changed, 198 insertions(+)
 create mode 100644 pkgs/applications/audio/pifi/Gemfile
 create mode 100644 pkgs/applications/audio/pifi/Gemfile.lock
 create mode 100644 pkgs/applications/audio/pifi/default.nix
 create mode 100644 pkgs/applications/audio/pifi/gemset.nix

diff --git a/pkgs/applications/audio/pifi/Gemfile b/pkgs/applications/audio/pifi/Gemfile
new file mode 100644
index 00000000000..da7d26e3760
--- /dev/null
+++ b/pkgs/applications/audio/pifi/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'pifi'
diff --git a/pkgs/applications/audio/pifi/Gemfile.lock b/pkgs/applications/audio/pifi/Gemfile.lock
new file mode 100644
index 00000000000..ddcdb537e6a
--- /dev/null
+++ b/pkgs/applications/audio/pifi/Gemfile.lock
@@ -0,0 +1,39 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    daemons (1.3.1)
+    eventmachine (1.2.7)
+    json (2.5.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    optimist (3.0.1)
+    pifi (0.4.11)
+      json (~> 2.2)
+      optimist (~> 3.0)
+      ruby-mpd (~> 0.3)
+      sinatra (~> 2.0)
+      thin (~> 1.7)
+    rack (2.2.3)
+    rack-protection (2.1.0)
+      rack
+    ruby-mpd (0.3.3)
+    ruby2_keywords (0.0.4)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    thin (1.8.0)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    tilt (2.0.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pifi
+
+BUNDLED WITH
+   2.1.4
diff --git a/pkgs/applications/audio/pifi/default.nix b/pkgs/applications/audio/pifi/default.nix
new file mode 100644
index 00000000000..856807608d7
--- /dev/null
+++ b/pkgs/applications/audio/pifi/default.nix
@@ -0,0 +1,18 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv rec {
+  pname = "pifi";
+
+  version = (import ./gemset.nix).pifi.version;
+  inherit ruby;
+  # expects Gemfile, Gemfile.lock and gemset.nix in the same directory
+  gemdir = ./.;
+
+  meta = with lib; {
+    description = "MPD web client to listen to radio, written in React and Sinatra";
+    homepage = "https://github.com/rccavalcanti/pifi-radio";
+    license = with licenses; gpl3Only;
+    maintainers = with maintainers; [ kmein ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/audio/pifi/gemset.nix b/pkgs/applications/audio/pifi/gemset.nix
new file mode 100644
index 00000000000..77dd8c55289
--- /dev/null
+++ b/pkgs/applications/audio/pifi/gemset.nix
@@ -0,0 +1,137 @@
+{
+  daemons = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  eventmachine = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+      type = "gem";
+    };
+    version = "1.2.7";
+  };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+      type = "gem";
+    };
+    version = "2.5.1";
+  };
+  mustermann = {
+    dependencies = ["ruby2_keywords"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
+  optimist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
+      type = "gem";
+    };
+    version = "3.0.1";
+  };
+  pifi = {
+    dependencies = ["json" "optimist" "ruby-mpd" "sinatra" "thin"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xwjaql852m0p7himc3pak1ibc8lfxi29bbgic153wp713xc2cga";
+      type = "gem";
+    };
+    version = "0.4.11";
+  };
+  rack = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
+      type = "gem";
+    };
+    version = "2.2.3";
+  };
+  rack-protection = {
+    dependencies = ["rack"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  ruby-mpd = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l80gbnma009pfcqgz4azbngkr5jn9nm46fflx5p7c4vz4kwshpc";
+      type = "gem";
+    };
+    version = "0.3.3";
+  };
+  ruby2_keywords = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
+  sinatra = {
+    dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  thin = {
+    dependencies = ["daemons" "eventmachine" "rack"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  tilt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
+      type = "gem";
+    };
+    version = "2.0.10";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 343531f71f2..202cdbcd6e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7145,6 +7145,8 @@ in
 
   pastebinit = callPackage ../tools/misc/pastebinit { };
 
+  pifi = callPackage ../applications/audio/pifi { };
+
   pmacct = callPackage ../tools/networking/pmacct { };
 
   pmix = callPackage ../development/libraries/pmix { };

From 97f7ae626c9a20a5de4aff99bbc9153a9b82f443 Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Mon, 25 Jan 2021 20:33:07 +0000
Subject: [PATCH 948/956] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8fcc4a089d1..e29f9114515 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -477,8 +477,8 @@ let
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "07b73e6e40951f4cecfc067dbf59dc9f34203802";
-      sha256 = "0c1wl6n89f2cxchjakcipx7sajbsr5ab1zbsjabhpnlpp9sn65jc";
+      rev = "c4330ee3a65658e2cdc2f57cb066064eb5bc93f7";
+      sha256 = "19dsidp13wj1n841zj2pw7xwwx17iw72rzlpdnvh319cmjfg44r7";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -2224,8 +2224,8 @@ let
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "lspsaga.nvim";
-      rev = "3e230bb8a5cd788d899d11b5528cd63ea47466a9";
-      sha256 = "0pnq8nbllk6ghjxxhnb5rbvxcj04pyplp58p58cw4dch7p4f82h5";
+      rev = "b0e99487b09fb11e16c25d3e1fda2900a8bbf3da";
+      sha256 = "0gvd6f25m7bcrs8wysssq1nf1xysfz6b7ximnlzyp2y1g9xiwx8f";
     };
     meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
   };
@@ -2868,12 +2868,12 @@ let
 
   nvim-dap-virtual-text = buildVimPluginFrom2Nix {
     pname = "nvim-dap-virtual-text";
-    version = "2021-01-23";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "nvim-dap-virtual-text";
-      rev = "ce5223283753f1583ebe547c197f2c52975d545f";
-      sha256 = "1nrzkyfdy01rw52mlr1xpf01yf8kqdmv8z9wrkl27q9240hklq9y";
+      rev = "664482b6d1133e0a82d71db08965f8a07208c638";
+      sha256 = "01nmpah4l99wv5kzm351qra8kacqdx77aplb4qqfmrmjzxgg6l5h";
     };
     meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
   };
@@ -2928,12 +2928,12 @@ let
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "9f3fee22c79c93610410cc81ddf3489c8ba1d007";
-      sha256 = "05cdym1fvbzs98khi6dj08h5gwkmp737a3cs1zbbx3hajvv3c8i6";
+      rev = "94a3e5137649a71f3356bf9eb3aa94b906e68066";
+      sha256 = "1758kx8nxm3aw6rxxfzbf1pfmihxbhvayq4qw4b2dnl0d5pdcpgw";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -3096,12 +3096,12 @@ let
 
   oceanic-next = buildVimPluginFrom2Nix {
     pname = "oceanic-next";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "mhartington";
       repo = "oceanic-next";
-      rev = "9f005681ce7c4664105832f23fc7c8516a13d8f5";
-      sha256 = "1fp0yq93b161qrmx5vxkxvd56xa3x5iyxly99sv0llk8ib8g7gy6";
+      rev = "0d5e2cbf88b4c1d312d30746496ca36d66de29e3";
+      sha256 = "0kh4ak8jfq5q1p2ig6c4a4n20bbh2arnas1z843lw3r3if5f9jvs";
     };
     meta.homepage = "https://github.com/mhartington/oceanic-next/";
   };
@@ -3156,12 +3156,12 @@ let
 
   packer-nvim = buildVimPluginFrom2Nix {
     pname = "packer-nvim";
-    version = "2021-01-22";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "wbthomason";
       repo = "packer.nvim";
-      rev = "3567ab93c60540407df7ce4faced7c454f89b941";
-      sha256 = "14k6iajrari85cl3bi8vn193khhchxn62mq0j2f49gn47pl47f4k";
+      rev = "9d2c03cec29d56827da8b63917a58567e1d9ab86";
+      sha256 = "12g3vi4hhm53sfnqn4h5x8vl3q1s0qh0gbr1vdshg76hylyv8qx4";
     };
     meta.homepage = "https://github.com/wbthomason/packer.nvim/";
   };
@@ -3252,12 +3252,12 @@ let
 
   plenary-nvim = buildVimPluginFrom2Nix {
     pname = "plenary-nvim";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "81dde2c7faf34a8afa2127151b067ebc2983f7d8";
-      sha256 = "0knz5xzsxpqjaybg6ywx0svdy91yjz1pbv3zm7y19avbks2jhd6f";
+      rev = "cf4537efbae62222d3cdd239b7105c8ed4361a14";
+      sha256 = "0fg2jwqchyvhx52wavwk90i6dk9vf4i4xlbhz26g4a3pv7i5mhwj";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -3999,12 +3999,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "951ede2a7007059cb4ebc6b6761030dfb52b6bc5";
-      sha256 = "176gz1mj6finfzgf86ra111sb5jbx1v45i0aalgr2znrr29f1a9z";
+      rev = "ccbb7f56384921a81813f0f9ebc85cdba0b7c255";
+      sha256 = "04s59yjkrz1apfb5ydi43v5q0wmpmgymjvakn3n88cxyxk9yl297";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -5384,8 +5384,8 @@ let
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "8cc3bd21080c027de91224e37d897293f1b14a0f";
-      sha256 = "1fnkidkvp4m95hxlhn874wc0xy179ydqb3ia5y8ijj8dddny8d67";
+      rev = "f1a48620a74478a0415d492ac22d2763d140a76c";
+      sha256 = "0h6c2zy2ikl0z0pa8n6kjl80ww13225mskrzaf0k07j20ks5dcf1";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
   };
@@ -5813,12 +5813,12 @@ let
 
   vim-illuminate = buildVimPluginFrom2Nix {
     pname = "vim-illuminate";
-    version = "2021-01-24";
+    version = "2021-01-25";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "a500e9fae73e433757c5d8a44da74e66373eb21e";
-      sha256 = "1mxl0aziakvialk0qgm0mnpqdk9iwqnss9wqj7584nfxvz9zck20";
+      rev = "929b68b008679dfbe1145da00b3de08fc4f041f2";
+      sha256 = "089kignrkhqxl8f2csckhc9pc1hsjmw2ds8zcskryjbzrbak5mhv";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
   };

From fa0eac3dff5757f6ca106d7325db6c75d22f7e5e Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Mon, 25 Jan 2021 20:33:29 +0000
Subject: [PATCH 949/956] vimPlugins.one-nvim: init at 2021-01-25

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e29f9114515..d6fcbebc1f9 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3106,6 +3106,18 @@ let
     meta.homepage = "https://github.com/mhartington/oceanic-next/";
   };
 
+  one-nvim = buildVimPluginFrom2Nix {
+    pname = "one-nvim";
+    version = "2021-01-25";
+    src = fetchFromGitHub {
+      owner = "Th3Whit3Wolf";
+      repo = "one-nvim";
+      rev = "c58db68bc16ab3eb50aaa81e54082f809d318194";
+      sha256 = "1m26qxa2hzkm03fw7vr547k7srawp0p533q7116c96gd3gsz3hxv";
+    };
+    meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
+  };
+
   onedark-vim = buildVimPluginFrom2Nix {
     pname = "onedark-vim";
     version = "2020-12-14";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e44b639a4db..c80c5ba453b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -548,6 +548,7 @@ ternjs/tern_for_vim
 terryma/vim-expand-region
 terryma/vim-multiple-cursors
 tex/vimpreviewpandoc
+Th3Whit3Wolf/one-nvim@main
 theHamsta/nvim-dap-virtual-text
 thinca/vim-ft-diff_fold
 thinca/vim-prettyprint

From 145ec470bdc2917ef188768f39aa3d93721705d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 25 Jan 2021 15:45:39 -0800
Subject: [PATCH 950/956] keycard-cli: 0.4.0 -> 0.6.0 (#110484)

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

diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix
index 4c276cb6e90..6e67358b675 100644
--- a/pkgs/tools/security/keycard-cli/default.nix
+++ b/pkgs/tools/security/keycard-cli/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "keycard-cli";
-  version = "0.4.0";
+  version = "0.6.0";
 
   goPackagePath = "github.com/status-im/keycard-cli";
   subPackages = [ "." ];
@@ -14,7 +14,7 @@ buildGoPackage rec {
     owner = "status-im";
     repo = pname;
     rev = version;
-    sha256 = "0917vl5lw8wgvyn5l8q6xa8bqh342fibaa38syr8hmz8b09qkh38";
+    sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU=";
   };
 
   buildFlagsArray = [

From 1e38f0bdf98e1089f8387c2845dbb7bf1fbcad04 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Tue, 26 Jan 2021 02:01:54 +0200
Subject: [PATCH 951/956] nixos/gitlab-runner: add support for 'docker+machine'
 and 'docker-ssh+machine' executors (#108763)

---
 .../modules/services/continuous-integration/gitlab-runner.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index c358a5db77c..2c6d9530a6b 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -66,10 +66,10 @@ let
             ++ optional service.debugTraceDisabled
             "--debug-trace-disabled"
             ++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables)
-            ++ optionals (service.executor == "docker") (
+            ++ optionals (hasPrefix "docker" service.executor) (
               assert (
                 assertMsg (service.dockerImage != null)
-                  "dockerImage option is required for docker executor (${name})");
+                  "dockerImage option is required for ${service.executor} executor (${name})");
               [ "--docker-image ${service.dockerImage}" ]
               ++ optional service.dockerDisableCache
               "--docker-disable-cache"

From eb6b3ab09f5aae747b3a49f718af3b0c6af0f9c1 Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@gmail.com>
Date: Mon, 25 Jan 2021 19:30:05 -0500
Subject: [PATCH 952/956] hhexen: init at 1.6.3 (#110792)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/games/hhexen/default.nix   | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/games/hhexen/default.nix

diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix
new file mode 100644
index 00000000000..0306c54ef4e
--- /dev/null
+++ b/pkgs/games/hhexen/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchurl, SDL, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "hhexen";
+  version = "1.6.3";
+  src = fetchurl {
+    url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz";
+    sha256 = "1jwccqawbdn0rjn5p59j21rjy460jdhps7zwn2z0gq9biggw325b";
+  };
+
+  buildInputs = [ SDL ];
+  installPhase = ''
+    install -Dm755 hhexen-gl -t $out/bin
+  '';
+
+  meta = with lib; {
+    description = "Linux port of Raven Game's Hexen";
+    homepage = "http://hhexen.sourceforge.net/hhexen.html";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ djanatyn ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5424c64e6a7..4f62fff175c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27254,6 +27254,8 @@ in
 
   gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { };
 
+  hhexen = callPackage ../games/hhexen { };
+
   hsetroot = callPackage ../tools/X11/hsetroot { };
 
   imwheel = callPackage ../tools/X11/imwheel { };

From 68953d0486ab5f536c9145b5355cbcaa7e3047dc Mon Sep 17 00:00:00 2001
From: chkno <scottworley@scottworley.com>
Date: Mon, 25 Jan 2021 16:37:32 -0800
Subject: [PATCH 953/956] m4acut: Init at 0.1.2 (#110660)

* m4acut: Init at 0.1.2

* Update pkgs/applications/audio/m4acut/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/applications/audio/m4acut/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/audio/m4acut/default.nix

diff --git a/pkgs/applications/audio/m4acut/default.nix b/pkgs/applications/audio/m4acut/default.nix
new file mode 100644
index 00000000000..f3ceee9227c
--- /dev/null
+++ b/pkgs/applications/audio/m4acut/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, autoreconfHook, fetchFromGitHub, l-smash }:
+
+stdenv.mkDerivation rec {
+  pname = "m4acut";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "nu774";
+    repo = "m4acut";
+    rev = "v${version}";
+    sha256 = "1hzf9f1fzmlpnxjaxhs2w22wzb28vd87ycaddnix1mmhvh3nvzkd";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ l-smash ];
+
+  meta = with lib; {
+    description = "Losslessly & gaplessly cut m4a (AAC in MP4) files.";
+    homepage = "https://github.com/nu774/m4acut";
+    license = with licenses; [ bsdOriginal zlib ];
+    maintainers = [ maintainers.chkno ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5d8b1ff3de..2e37677aca3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23254,6 +23254,8 @@ in
 
   lyx = libsForQt5.callPackage ../applications/misc/lyx { };
 
+  m4acut = callPackage ../applications/audio/m4acut { };
+
   mac = callPackage ../development/libraries/mac { };
 
   macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; };

From 8baac2af752450b20cb8b37520059ecd86490b8b Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Mon, 25 Jan 2021 17:55:04 -0800
Subject: [PATCH 954/956] lib/systems: fix linuxArch for power + riscv

Looks like these got left behind in the
kernelArch -> linuxArch migration.

Fixes:
* pkgsCross.powernv.linuxHeaders
* pkgsCross.riscv64.linuxHeaders
* pkgsCross.riscv32.linuxHeaders
and dependees
---
 lib/systems/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 1a89120e2bf..1bbe976c4d2 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -92,6 +92,8 @@ rec {
         else if final.isx86_32 then "i386"
         else if final.isx86_64 then "x86_64"
         else if final.isMips then "mips"
+        else if final.isPower then "powerpc"
+        else if final.isRiscV then "riscv"
         else final.parsed.cpu.name;
 
       qemuArch =

From 38e23aeda3f799b9f110f20d795167d54d56a03d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2020 23:06:26 +0000
Subject: [PATCH 955/956] freetds: 1.1.42 -> 1.2

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

diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 8e6904a94b2..5166efea21f 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
 
 stdenv.mkDerivation rec {
   pname = "freetds";
-  version = "1.1.42";
+  version = "1.2";
 
   src = fetchurl {
     url    = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
-    sha256 = "02phnk88zv4f8byx954784w8mh33knsslwvj266jfyrmxz6hxxxg";
+    sha256 = "0nilqf3cssi6z8bxxpmc7zxsh7apgwmx8mm7nfc6c5d40z3nyjpk";
   };
 
   buildInputs = [

From f0a821afc5c66c9878665073c2b247790f269088 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 6 Dec 2020 20:49:59 +0100
Subject: [PATCH 956/956] opam-installer: init at 2.0.7

---
 pkgs/development/tools/ocaml/opam/installer.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/opam/installer.nix

diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix
new file mode 100644
index 00000000000..4501ddd63f0
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/installer.nix
@@ -0,0 +1,17 @@
+{ lib, unzip, opam, ocamlPackages }:
+
+ocamlPackages.buildDunePackage {
+  pname = "opam-installer";
+
+  useDune2 = true;
+
+  inherit (opam) version src;
+  nativeBuildInputs = [ unzip ];
+
+  configureFlags = [ "--disable-checks" "--prefix=$out" ];
+  buildInputs = with ocamlPackages; [ opam-format cmdliner ];
+
+  meta = opam.meta // {
+    description = "Handle (un)installation from opam install files";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e37677aca3..bb16dd7c9ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10566,6 +10566,8 @@ in
     inherit (ocaml-ng.ocamlPackages_4_05) ocaml;
   };
 
+  opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { };
+
   open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { };
 
   pforth = callPackage ../development/compilers/pforth {};